From b9ad7e80a5ec37f59f39858dd5eef7e519afffa2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 17 Oct 2013 20:24:17 +0000
Subject: ZVISION: screenSpaceToImageSpace return 0,0 when pointer outside
 working window.

---
 engines/zvision/render_manager.cpp | 44 +++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index af8ca7fd64..cb13606b11 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -385,30 +385,34 @@ Common::Rect RenderManager::renderTextToWorkingWindow(uint32 idNumber, const Com
 }
 
 const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) {
-	// Convert from screen space to working window space
-	Common::Point newPoint(point - Common::Point(_workingWindow.left, _workingWindow.top));
+	if (_workingWindow.contains(point)) {
+		// Convert from screen space to working window space
+		Common::Point newPoint(point - Common::Point(_workingWindow.left, _workingWindow.top));
 
-	RenderTable::RenderState state = _renderTable.getRenderState();
-	if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-		newPoint = _renderTable.convertWarpedCoordToFlatCoord(newPoint);
-	}
+		RenderTable::RenderState state = _renderTable.getRenderState();
+		if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
+			newPoint = _renderTable.convertWarpedCoordToFlatCoord(newPoint);
+		}
 
-	if (state == RenderTable::PANORAMA) {
-		newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
-	} else if (state == RenderTable::TILT) {
-		newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
-	}
+		if (state == RenderTable::PANORAMA) {
+			newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
+		} else if (state == RenderTable::TILT) {
+			newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
+		}
 
-	if (newPoint.x < 0)
-		newPoint.x += _backgroundWidth;
-	else if (newPoint.x >= _backgroundWidth)
-		newPoint.x -= _backgroundWidth;
-	if (newPoint.y < 0)
-		newPoint.y += _backgroundHeight;
-	else if (newPoint.y >= _backgroundHeight)
-		newPoint.y -= _backgroundHeight;
+		if (newPoint.x < 0)
+			newPoint.x += _backgroundWidth;
+		else if (newPoint.x >= _backgroundWidth)
+			newPoint.x -= _backgroundWidth;
+		if (newPoint.y < 0)
+			newPoint.y += _backgroundHeight;
+		else if (newPoint.y >= _backgroundHeight)
+			newPoint.y -= _backgroundHeight;
 
-	return newPoint;
+		return newPoint;
+	} else {
+		return Common::Point(0, 0);
+	}
 }
 
 const Common::Point RenderManager::imageSpaceToWorkingWindowSpace(const Common::Point &point) {
-- 
cgit v1.2.3


From 4baa1801fe13e2dafe5317d57dfc9e4fe10bc809 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 15 Oct 2013 15:26:26 +0700
Subject: ZVISION: Don't need to set push flag in cursorDown because it's block
 change cursor image.

---
 engines/zvision/cursor_manager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index 595e7946dd..4c5ae5e80f 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -120,7 +120,6 @@ void CursorManager::cursorDown(bool pushed) {
 	if (_cursorIsPushed == pushed)
 		return;
 
-	_cursorIsPushed = pushed;
 	changeCursor(_currentCursor, pushed);
 }
 
-- 
cgit v1.2.3


From cf99a88322474f2412edc737b9a0c6a38f373610 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 15 Oct 2013 15:44:02 +0700
Subject: ZVISION: Change platform detection of ZGI, dos->win.

---
 engines/zvision/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 06e921dfa8..49664935e1 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -80,7 +80,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			0,
 			AD_ENTRY1s("SCRIPTS.ZFS", "81efd40ecc3d22531e211368b779f17f", 8336944),
 			Common::EN_ANY,
-			Common::kPlatformDOS,
+			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
-- 
cgit v1.2.3


From f1c6b58a943689c35bb448094577cfede19b92fc Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 17 Oct 2013 20:33:41 +0000
Subject: ZVISION: Select needed workingWindow for ZGI and Nemesis.

---
 engines/zvision/zvision.cpp |  4 +++-
 engines/zvision/zvision.h   | 14 +++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 6d8ae6d5a7..940e01ae20 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -51,7 +51,9 @@ namespace ZVision {
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 		: Engine(syst),
 		  _gameDescription(gameDesc),
-		  _workingWindow((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2) + WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2) + WORKING_WINDOW_HEIGHT),
+		  _workingWindow_ZGI((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2) + WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2) + WORKING_WINDOW_HEIGHT),
+		  _workingWindow_ZNM((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2) + ZNM_WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2) + ZNM_WORKING_WINDOW_HEIGHT),
+		  _workingWindow(gameDesc->gameId == GID_NEMESIS ? _workingWindow_ZNM : _workingWindow_ZGI),
 		  _pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /*RGB 565*/
 		  _desiredFrameTime(33), /* ~30 fps */
 		  _clock(_system),
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 84784d9a89..89aa60fe73 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -63,15 +63,21 @@ public:
 	 * are given in this coordinate space. Also, all images are clipped to the
 	 * edges of this Rectangle
 	 */
-	const Common::Rect _workingWindow;
+	const Common::Rect &_workingWindow;
 	const Graphics::PixelFormat _pixelFormat;
 
 private:
 	enum {
 		WINDOW_WIDTH = 640,
 		WINDOW_HEIGHT = 480,
-		WORKING_WINDOW_WIDTH = 512,
-		WORKING_WINDOW_HEIGHT = 320,
+
+		//Zork nemesis working window sizes
+		ZNM_WORKING_WINDOW_WIDTH  = 512,
+		ZNM_WORKING_WINDOW_HEIGHT = 320,
+
+		//ZGI(and default) working window sizes
+		WORKING_WINDOW_WIDTH  = 640,
+		WORKING_WINDOW_HEIGHT = 344,
 
 		ROTATION_SCREEN_EDGE_OFFSET = 60,
 		MAX_ROTATION_SPEED = 400 // Pixels per second
@@ -98,6 +104,8 @@ private:
 	// To prevent allocation every time we process events
 	Common::Event _event;
 
+	const Common::Rect _workingWindow_ZGI;
+	const Common::Rect _workingWindow_ZNM;
 public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
-- 
cgit v1.2.3


From 7a3518d7c3c81b2e34dcbba0682dd8dc6e43b80d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 17 Oct 2013 21:24:50 +0000
Subject: ZVISION: Streamvideo alwayas skippable. Skippable flag renamed to
 skipline.

---
 engines/zvision/actions.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index eae4ec2ed5..fbf2a58ad6 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -354,12 +354,12 @@ bool ActionSetScreen::execute(ZVision *engine) {
 
 ActionStreamVideo::ActionStreamVideo(const Common::String &line) {
 	char fileName[25];
-	uint skippable;
+	uint skipline;    //skipline - render video with skip every second line, not skippable.
 
-	sscanf(line.c_str(), "%*[^(](%25s %u %u %u %u %u %u)", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skippable);
+	sscanf(line.c_str(), "%*[^(](%25s %u %u %u %u %u %u)", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline);
 
 	_fileName = Common::String(fileName);
-	_skippable = (skippable == 0) ? false : true;
+	_skippable = true;
 }
 
 bool ActionStreamVideo::execute(ZVision *engine) {
-- 
cgit v1.2.3


From 2050987fa1ecc347bdc707b58d185804a875106d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 17 Oct 2013 21:03:08 +0000
Subject: ZVISION: Detach raw stream reader from RawZorkStream for creating
 correct avi raw reader.

---
 engines/zvision/zork_avi_decoder.cpp |   8 ++-
 engines/zvision/zork_avi_decoder.h   |  22 ++++--
 engines/zvision/zork_raw.cpp         | 130 ++++++++++++++++++++++-------------
 engines/zvision/zork_raw.h           |  51 +++++++++++---
 4 files changed, 145 insertions(+), 66 deletions(-)

diff --git a/engines/zvision/zork_avi_decoder.cpp b/engines/zvision/zork_avi_decoder.cpp
index a614f77bb7..0711cdf9d7 100644
--- a/engines/zvision/zork_avi_decoder.cpp
+++ b/engines/zvision/zork_avi_decoder.cpp
@@ -30,6 +30,7 @@
 #include "common/stream.h"
 
 #include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 
 
 namespace ZVision {
@@ -43,9 +44,14 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 	if (_audStream) {
 		if (_wvInfo.tag == kWaveFormatZorkPCM) {
 			assert(_wvInfo.size == 8);
-			_audStream->queueAudioStream(makeRawZorkStream(stream, _wvInfo.samplesPerSec, _audStream->isStereo(), DisposeAfterUse::YES), DisposeAfterUse::YES);
+			RawChunkStream::RawChunk chunk = decoder->readNextChunk(stream);
+			delete stream;
+
+			if (chunk.data)
+				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_STEREO);
 		}
 	} else {
+		warning("Got %d wave format in AVI\n", _wvInfo.tag);
 		delete stream;
 	}
 }
diff --git a/engines/zvision/zork_avi_decoder.h b/engines/zvision/zork_avi_decoder.h
index ec2be1bb13..dc3e3327ed 100644
--- a/engines/zvision/zork_avi_decoder.h
+++ b/engines/zvision/zork_avi_decoder.h
@@ -25,25 +25,35 @@
 #define ZORK_AVI_DECODER_H
 
 #include "video/avi_decoder.h"
- 
+#include "zork_raw.h"
 
 namespace ZVision {
 
 class ZorkAVIDecoder : public Video::AVIDecoder {
 public:
 	ZorkAVIDecoder(Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType) :
-	  Video::AVIDecoder(soundType) {}
+		Video::AVIDecoder(soundType) {}
 
-	  virtual ~ZorkAVIDecoder() {}
+	virtual ~ZorkAVIDecoder() {}
 
 private:
 	class ZorkAVIAudioTrack : public Video::AVIDecoder::AVIAudioTrack {
 	public:
 		ZorkAVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType) :
-			Video::AVIDecoder::AVIAudioTrack(streamHeader, waveFormat, soundType) {}
-		virtual ~ZorkAVIAudioTrack() {}
+			Video::AVIDecoder::AVIAudioTrack(streamHeader, waveFormat, soundType),
+			decoder(NULL) {
+			if (_audStream) {
+				decoder = new RawChunkStream(_audStream->isStereo());
+			}
+		}
+		virtual ~ZorkAVIAudioTrack() {
+			if (decoder)
+				delete decoder;
+		}
 
 		void queueSound(Common::SeekableReadStream *stream);
+	private:
+		RawChunkStream *decoder;
 	};
 
 	Video::AVIDecoder::AVIAudioTrack *createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo);
@@ -51,7 +61,7 @@ private:
 private:
 	// Audio Codecs
 	enum {
-		kWaveFormatZorkPCM = 17	// special Zork PCM audio format (clashes with MS IMA ADPCM)
+	    kWaveFormatZorkPCM = 17 // special Zork PCM audio format (clashes with MS IMA ADPCM)
 	};
 };
 
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 21613d9043..029600b758 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -41,65 +41,62 @@
 
 namespace ZVision {
 
-const int16 RawZorkStream::_stepAdjustmentTable[8] = {-1, -1, -1, 1, 4, 7, 10, 12};
-
-const int32 RawZorkStream::_amplitudeLookupTable[89] = {0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E,
-                                                        0x0010, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F,
-                                                        0x0022, 0x0025, 0x0029, 0x002D, 0x0032, 0x0037, 0x003C, 0x0042,
-                                                        0x0049, 0x0050, 0x0058, 0x0061, 0x006B, 0x0076, 0x0082, 0x008F,
-                                                        0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133, 
-                                                        0x0151, 0x0173, 0x0198, 0x01C1, 0x01EE, 0x0220, 0x0256, 0x0292,
-                                                        0x02D4, 0x031C, 0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583, 
-                                                        0x0610, 0x06AB, 0x0756, 0x0812, 0x08E0, 0x09C3, 0x0ABD, 0x0BD0,
-                                                        0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954, 
-                                                        0x1BDC, 0x1EA5, 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B,
-                                                        0x3BB9, 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF};
-
-const SoundParams RawZorkStream::_zNemSoundParamLookupTable[6] = {{'6', 0x2B11, false, false},
-                                                                  {'a', 0x5622, false,  true}, 
-                                                                  {'b', 0x5622, true,  true},
-                                                                  {'n', 0x2B11, false, true},
-                                                                  {'s', 0x5622, false, true},
-                                                                  {'t', 0x5622, true, true}
-};
-
-const SoundParams RawZorkStream::_zgiSoundParamLookupTable[5] = {{'a',0x5622, false, false},
-                                                                 {'k',0x2B11, true, true},
-                                                                 {'p',0x5622, false, true},
-                                                                 {'q',0x5622, true, true},
-                                                                 {'u',0xAC44, true, true}
-};
-
-RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream)
-		: _rate(rate),
-		  _stereo(0),
-		  _stream(stream, disposeStream),
-		  _endOfData(false) {
+const int16 RawChunkStream::_stepAdjustmentTable[8] = { -1, -1, -1, 1, 4, 7, 10, 12};
+
+const int32 RawChunkStream::_amplitudeLookupTable[89] = {0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E,
+                                                         0x0010, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F,
+                                                         0x0022, 0x0025, 0x0029, 0x002D, 0x0032, 0x0037, 0x003C, 0x0042,
+                                                         0x0049, 0x0050, 0x0058, 0x0061, 0x006B, 0x0076, 0x0082, 0x008F,
+                                                         0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133,
+                                                         0x0151, 0x0173, 0x0198, 0x01C1, 0x01EE, 0x0220, 0x0256, 0x0292,
+                                                         0x02D4, 0x031C, 0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583,
+                                                         0x0610, 0x06AB, 0x0756, 0x0812, 0x08E0, 0x09C3, 0x0ABD, 0x0BD0,
+                                                         0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954,
+                                                         0x1BDC, 0x1EA5, 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B,
+                                                         0x3BB9, 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF
+                                                        };
+
+RawChunkStream::RawChunkStream(bool stereo) {
 	if (stereo)
 		_stereo = 1;
+	else
+		_stereo = 0;
+
+	init();
+}
 
+void RawChunkStream::init() {
 	_lastSample[0].index = 0;
 	_lastSample[0].sample = 0;
 	_lastSample[1].index = 0;
 	_lastSample[1].sample = 0;
+}
 
-	// Calculate the total playtime of the stream
-	if (stereo)
-		_playtime = Audio::Timestamp(0, _stream->size() / 2, rate);
-	else
-		_playtime = Audio::Timestamp(0, _stream->size(), rate);
+RawChunkStream::RawChunk RawChunkStream::readNextChunk(Common::SeekableReadStream *stream) {
+	RawChunk tmp;
+	tmp.size = 0;
+	tmp.data = NULL;
+
+	if (stream && (stream->size() == 0 || stream->eos()))
+		return tmp;
+
+	tmp.size = (stream->size() - stream->pos()) * 2;
+	tmp.data = (int16 *)calloc(tmp.size, 1);
+
+	readBuffer(tmp.data, stream, stream->size() - stream->pos());
+
+	return tmp;
 }
 
-int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) {
-	int bytesRead = 0;
+int RawChunkStream::readBuffer(int16 *buffer, Common::SeekableReadStream *stream, const int numSamples) {
+	int32 bytesRead = 0;
 
 	// 0: Left, 1: Right
 	uint channel = 0;
 
 	while (bytesRead < numSamples) {
-		byte encodedSample = _stream->readByte();
-		if (_stream->eos()) {
-			_endOfData = true;
+		byte encodedSample = stream->readByte();
+		if (stream->eos()) {
 			return bytesRead;
 		}
 		bytesRead++;
@@ -140,6 +137,46 @@ int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) {
 		// Increment and wrap the channel
 		channel = (channel + 1) & _stereo;
 	}
+	return bytesRead;
+}
+
+const SoundParams RawZorkStream::_zNemSoundParamLookupTable[6] = {{'6', 0x2B11, false, false},
+	{'a', 0x5622, false,  true},
+	{'b', 0x5622, true,  true},
+	{'n', 0x2B11, false, true},
+	{'s', 0x5622, false, true},
+	{'t', 0x5622, true, true}
+};
+
+const SoundParams RawZorkStream::_zgiSoundParamLookupTable[5] = {{'a', 0x5622, false, false},
+	{'k', 0x2B11, true, true},
+	{'p', 0x5622, false, true},
+	{'q', 0x5622, true, true},
+	{'u', 0xAC44, true, true}
+};
+
+RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream)
+	: _rate(rate),
+	  _stereo(0),
+	  _stream(stream, disposeStream),
+	  _endOfData(false),
+	  _streamReader(stereo) {
+	if (stereo)
+		_stereo = 1;
+
+	// Calculate the total playtime of the stream
+	if (stereo)
+		_playtime = Audio::Timestamp(0, _stream->size() / 2, rate);
+	else
+		_playtime = Audio::Timestamp(0, _stream->size(), rate);
+}
+
+int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) {
+
+	int32 bytesRead = _streamReader.readBuffer(buffer, _stream.get(), numSamples);
+
+	if (_stream->eos())
+		_endOfData = true;
 
 	return bytesRead;
 }
@@ -148,10 +185,7 @@ bool RawZorkStream::rewind() {
 	_stream->seek(0, 0);
 	_stream->clearErr();
 	_endOfData = false;
-	_lastSample[0].index = 0;
-	_lastSample[0].sample = 0;
-	_lastSample[1].index = 0;
-	_lastSample[1].sample = 0;
+	_streamReader.init();
 
 	return true;
 }
diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h
index 481ea79f2d..1f261ae139 100644
--- a/engines/zvision/zork_raw.h
+++ b/engines/zvision/zork_raw.h
@@ -41,6 +41,45 @@ struct SoundParams {
 	bool packed;
 };
 
+
+/**
+ * This is a ADPCM stream-reader, this class holds context for multi-chunk reading and no buffers.
+ */
+class RawChunkStream {
+public:
+	RawChunkStream(bool stereo);
+
+	~RawChunkStream() {
+	}
+private:
+	uint _stereo;
+
+	/**
+	 * Holds the frequency and index from the last sample
+	 * 0 holds the left channel, 1 holds the right channel
+	 */
+	struct {
+		int32 sample;
+		int16 index;
+	} _lastSample[2];
+
+	static const int16 _stepAdjustmentTable[8];
+	static const int32 _amplitudeLookupTable[89];
+
+public:
+
+	struct RawChunk {
+		int16 *data;
+		uint32 size;
+	};
+
+	void init();
+	//Read next audio portion in new stream (needed for avi), return structure with buffer
+	RawChunk readNextChunk(Common::SeekableReadStream *stream);
+	//Read numSamples from stream to buffer
+	int readBuffer(int16 *buffer, Common::SeekableReadStream *stream, const int numSamples);
+};
+
 /**
  * This is a stream, which allows for playing raw ADPCM data from a stream.
  */
@@ -62,17 +101,7 @@ private:
 	bool _endOfData;                                           // Whether the stream end has been reached
 	uint _stereo;
 
-	/** 
-	 * Holds the frequency and index from the last sample
-	 * 0 holds the left channel, 1 holds the right channel
-	 */
-	struct {
-		int32 sample;
-		int16 index;
-	} _lastSample[2];
-
-	static const int16 _stepAdjustmentTable[8];
-	static const int32 _amplitudeLookupTable[89];
+	RawChunkStream _streamReader;
 
 public:
 	int readBuffer(int16 *buffer, const int numSamples);
-- 
cgit v1.2.3


From 82348a74df8edd2f9e628ec939ba515c1703bc70 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 18 Oct 2013 18:44:40 +0000
Subject: ZVISION: New base class similar to control for handling timers,
 music, etc...

---
 engines/zvision/module.mk  |  3 +-
 engines/zvision/sidefx.cpp | 36 ++++++++++++++++++
 engines/zvision/sidefx.h   | 95 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 engines/zvision/sidefx.cpp
 create mode 100644 engines/zvision/sidefx.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 261168f133..edd08c8e9f 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -29,7 +29,8 @@ MODULE_OBJS := \
 	zvision.o \
 	zfs_archive.o \
 	zork_avi_decoder.o \
-	zork_raw.o
+	zork_raw.o \
+	sidefx.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/sidefx.cpp b/engines/zvision/sidefx.cpp
new file mode 100644
index 0000000000..3874c86485
--- /dev/null
+++ b/engines/zvision/sidefx.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/sidefx.h"
+
+#include "zvision/zvision.h"
+#include "zvision/render_manager.h"
+#include "zvision/utility.h"
+
+#include "common/stream.h"
+
+namespace ZVision {
+
+
+} // End of namespace ZVision
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
new file mode 100644
index 0000000000..7047982fda
--- /dev/null
+++ b/engines/zvision/sidefx.h
@@ -0,0 +1,95 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SIDEFX_H_INCLUDED
+#define SIDEFX_H_INCLUDED
+
+namespace Common {
+class SeekableReadStream;
+struct Point;
+class WriteStream;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+class SideFX {
+public:
+	SideFX() : _engine(0), _key(0) {}
+	SideFX(ZVision *engine, uint32 key) : _engine(engine), _key(key) {}
+	virtual ~SideFX() {}
+
+	uint32 getKey() { return _key; }
+
+	virtual bool process(uint32 deltaTimeInMillis) { return false; }
+	/**
+	 * Serialize a Control for save game use. This should only be used if a Control needs
+	 * to save values that would be different from initialization. AKA a TimerNode needs to
+	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
+	 * their key as the first data outputted. The default implementation is NOP.
+	 *
+	 * NOTE: If this method is overridden, you MUST also override deserialize()
+	 * and needsSerialization()
+	 *
+	 * @param stream    Stream to write any needed data to
+	 */
+	virtual void serialize(Common::WriteStream *stream) {}
+	/**
+	 * De-serialize data from a save game stream. This should only be implemented if the
+	 * Control also implements serialize(). The calling method assumes the size of the
+	 * data read from the stream exactly equals that written in serialize(). The default
+	 * implementation is NOP.
+	 *
+	 * NOTE: If this method is overridden, you MUST also override serialize()
+	 * and needsSerialization()
+	 *
+	 * @param stream    Save game file stream
+	 */
+	virtual void deserialize(Common::SeekableReadStream *stream) {}
+	/**
+	 * If a Control overrides serialize() and deserialize(), this should return true
+	 *
+	 * @return    Does the Control need save game serialization?
+	 */
+	virtual inline bool needsSerialization() { return false; }
+
+protected:
+	ZVision * _engine;
+	uint32 _key;
+
+// Static member functions
+public:
+};
+
+// TODO: Implement InputControl
+// TODO: Implement SaveControl
+// TODO: Implement SlotControl
+// TODO: Implement SafeControl
+// TODO: Implement FistControl
+// TODO: Implement HotMovieControl
+// TODO: Implement PaintControl
+// TODO: Implement TilterControl
+
+} // End of namespace ZVision
+
+#endif // SIDEFX_H_INCLUDED
-- 
cgit v1.2.3


From a6f025c74f7aac95154d56dc23a7b62eca965dd4 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 18 Oct 2013 20:11:33 +0000
Subject: ZVISION: Basic integration of SideFX into scriptManager.

---
 engines/zvision/script_manager.cpp | 26 +++++++++++++++++++++++++-
 engines/zvision/script_manager.h   |  9 ++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 66a54088fd..4b4f1303aa 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -108,6 +108,16 @@ void ScriptManager::createReferenceTable() {
 }
 
 void ScriptManager::updateNodes(uint deltaTimeMillis) {
+    // If process() returns true, it means the node can be deleted
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end();) {
+		if ((*iter)->process(deltaTimeMillis)) {
+			delete (*iter);
+			// Remove the node
+			iter = _activeSideFx.erase(iter);
+		} else {
+			++iter;
+		}
+	}
 	// If process() returns true, it means the node can be deleted
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end();) {
 		if ((*iter)->process(deltaTimeMillis)) {
@@ -262,7 +272,7 @@ void ScriptManager::disableControl(uint32 key) {
 void ScriptManager::focusControl(uint32 key) {
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
 		uint32 controlKey = (*iter)->getKey();
-		
+
 		if (controlKey == key) {
 			(*iter)->focus();
 		} else if (controlKey == _currentlyFocusedControl) {
@@ -273,6 +283,20 @@ void ScriptManager::focusControl(uint32 key) {
 	_currentlyFocusedControl = key;
 }
 
+void ScriptManager::addSideFX(SideFX *fx) {
+	_activeSideFx.push_back(fx);
+}
+
+SideFX *ScriptManager::getSideFX(uint32 key) {
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter) {
+		if ((*iter)->getKey() == key) {
+			return (*iter);
+		}
+	}
+
+	return nullptr;
+}
+
 void ScriptManager::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
 		(*iter)->onMouseDown(screenSpacePos, backgroundImageSpacePos);
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 388d0805e0..c29bc57d03 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -25,6 +25,7 @@
 
 #include "zvision/puzzle.h"
 #include "zvision/control.h"
+#include "zvision/sidefx.h"
 
 #include "common/hashmap.h"
 #include "common/queue.h"
@@ -54,6 +55,7 @@ typedef Common::List<Puzzle *> PuzzleList;
 typedef Common::Queue<Puzzle *> PuzzleQueue;
 typedef Common::List<Control *> ControlList;
 typedef Common::HashMap<uint32, uint32> StateMap;
+typedef Common::List<SideFX *> SideFXList;
 
 class ScriptManager {
 public:
@@ -78,6 +80,8 @@ private:
 	PuzzleList _globalPuzzles;
 	/** Holds the currently active controls */
 	ControlList _activeControls;
+	/** Holds the currently active timers, musics, other */
+	SideFXList _activeSideFx;
 
 	Location _currentLocation;
 
@@ -99,6 +103,9 @@ public:
 
 	void focusControl(uint32 key);
 
+	void addSideFX(SideFX *fx);
+	SideFX *getSideFX(uint32 key);
+
 	/**
 	 * Called when LeftMouse is pushed.
 	 *
@@ -140,7 +147,7 @@ public:
 	void deserializeStateTable(Common::SeekableReadStream *stream);
 	void serializeControls(Common::WriteStream *stream);
 	void deserializeControls(Common::SeekableReadStream *stream);
-	
+
 	Location getCurrentLocation() const;
 
 private:
-- 
cgit v1.2.3


From 96ac92aae3bd3cb195abcc73f4df16864c0e3738 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 18 Oct 2013 20:43:04 +0000
Subject: ZVISION: Added type field for SideFX

---
 engines/zvision/sidefx.h | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index 7047982fda..35d25d4431 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -35,15 +35,21 @@ class ZVision;
 
 class SideFX {
 public:
-	SideFX() : _engine(0), _key(0) {}
-	SideFX(ZVision *engine, uint32 key) : _engine(engine), _key(key) {}
+
+	enum SideFXType{
+		SIDEFX_UNK   = 0
+	};
+
+	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
+	SideFX(ZVision *engine, uint32 key, SideFXType type) : _engine(engine), _key(key), _type(type) {}
 	virtual ~SideFX() {}
 
 	uint32 getKey() { return _key; }
+	SideFXType getType() { return _type; }
 
 	virtual bool process(uint32 deltaTimeInMillis) { return false; }
 	/**
-	 * Serialize a Control for save game use. This should only be used if a Control needs
+	 * Serialize a SideFX for save game use. This should only be used if a SideFX needs
 	 * to save values that would be different from initialization. AKA a TimerNode needs to
 	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
 	 * their key as the first data outputted. The default implementation is NOP.
@@ -56,7 +62,7 @@ public:
 	virtual void serialize(Common::WriteStream *stream) {}
 	/**
 	 * De-serialize data from a save game stream. This should only be implemented if the
-	 * Control also implements serialize(). The calling method assumes the size of the
+	 * SideFX also implements serialize(). The calling method assumes the size of the
 	 * data read from the stream exactly equals that written in serialize(). The default
 	 * implementation is NOP.
 	 *
@@ -67,18 +73,20 @@ public:
 	 */
 	virtual void deserialize(Common::SeekableReadStream *stream) {}
 	/**
-	 * If a Control overrides serialize() and deserialize(), this should return true
+	 * If a SideFX overrides serialize() and deserialize(), this should return true
 	 *
-	 * @return    Does the Control need save game serialization?
+	 * @return    Does the SideFX need save game serialization?
 	 */
 	virtual inline bool needsSerialization() { return false; }
 
 protected:
 	ZVision * _engine;
 	uint32 _key;
+	SideFXType _type;
 
 // Static member functions
 public:
+
 };
 
 // TODO: Implement InputControl
-- 
cgit v1.2.3


From 4ac2c3e93bd78d4e151035fcde0dae9f17eeb11a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 18 Oct 2013 22:44:33 +0000
Subject: ZVISION: Move TimerNode to SideFX-based class.

---
 engines/zvision/actions.cpp    | 2 +-
 engines/zvision/sidefx.h       | 3 ++-
 engines/zvision/timer_node.cpp | 5 +++--
 engines/zvision/timer_node.h   | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index fbf2a58ad6..fb4034fbdb 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -387,7 +387,7 @@ ActionTimer::ActionTimer(const Common::String &line) {
 }
 
 bool ActionTimer::execute(ZVision *engine) {
-	engine->getScriptManager()->addControl(new TimerNode(engine, _key, _time));
+	engine->getScriptManager()->addSideFX(new TimerNode(engine, _key, _time));
 	return true;
 }
 
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index 35d25d4431..d495655a22 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -37,7 +37,8 @@ class SideFX {
 public:
 
 	enum SideFXType{
-		SIDEFX_UNK   = 0
+		SIDEFX_UNK   = 0,
+		SIDEFX_TIMER = 1
 	};
 
 	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index 55dfa51dfe..7fc3199a8a 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -32,8 +32,9 @@
 
 namespace ZVision {
 
-TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds) 
-	: Control(engine, key), _timeLeft(timeInSeconds * 1000) {
+TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
+	: SideFX(engine, key, SIDEFX_TIMER) {
+        _timeLeft = timeInSeconds * 1000;
 }
 
 bool TimerNode::process(uint32 deltaTimeInMillis) {
diff --git a/engines/zvision/timer_node.h b/engines/zvision/timer_node.h
index 32dca71548..afdbd39803 100644
--- a/engines/zvision/timer_node.h
+++ b/engines/zvision/timer_node.h
@@ -23,13 +23,13 @@
 #ifndef ZVISION_TIMER_NODE_H
 #define ZVISION_TIMER_NODE_H
 
-#include "zvision/control.h"
+#include "zvision/sidefx.h"
 
 namespace ZVision {
 
 class ZVision;
 
-class TimerNode : public Control {
+class TimerNode : public SideFX {
 public:
 	TimerNode(ZVision *engine, uint32 key, uint timeInSeconds);
 
-- 
cgit v1.2.3


From aefa58f5a4470b1ba2e275c62aa1a7a0cec76539 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 18 Oct 2013 22:58:02 +0000
Subject: ZVISION: Correcting TimerNode behavior.

---
 engines/zvision/timer_node.cpp | 15 ++++++++++++---
 engines/zvision/timer_node.h   |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index 7fc3199a8a..dc7dd5b38c 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -34,16 +34,25 @@ namespace ZVision {
 
 TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
 	: SideFX(engine, key, SIDEFX_TIMER) {
+    if (_engine->getGameId() == GID_NEMESIS)
         _timeLeft = timeInSeconds * 1000;
+    else if (_engine->getGameId() == GID_GRANDINQUISITOR)
+        _timeLeft = timeInSeconds * 100;
+    _engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+TimerNode::~TimerNode() {
+    if (_timeLeft <= 0)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	else
+        _engine->getScriptManager()->setStateValue(_key, _timeLeft); // If timer was stopped by stop or kill
 }
 
 bool TimerNode::process(uint32 deltaTimeInMillis) {
 	_timeLeft -= deltaTimeInMillis;
 
-	if (_timeLeft <= 0) {
-		_engine->getScriptManager()->setStateValue(_key, 0);
+	if (_timeLeft <= 0)
 		return true;
-	}
 
 	return false;
 }
diff --git a/engines/zvision/timer_node.h b/engines/zvision/timer_node.h
index afdbd39803..2caf43ad3c 100644
--- a/engines/zvision/timer_node.h
+++ b/engines/zvision/timer_node.h
@@ -32,6 +32,7 @@ class ZVision;
 class TimerNode : public SideFX {
 public:
 	TimerNode(ZVision *engine, uint32 key, uint timeInSeconds);
+	~TimerNode();
 
 	/**
 	 * Decrement the timer by the delta time. If the timer is finished, set the status
-- 
cgit v1.2.3


From 25834faf0738ae6c33819b196fdfb8ab5e8f1888 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 20 Oct 2013 18:39:06 +0000
Subject: ZVISION: Style modifing by astyle.

---
 engines/zvision/actions.cpp              |  18 ++---
 engines/zvision/actions.h                |   2 +-
 engines/zvision/animation_control.cpp    |  14 ++--
 engines/zvision/animation_control.h      |  22 ++++--
 engines/zvision/clock.cpp                |   2 +-
 engines/zvision/clock.h                  |  12 ++--
 engines/zvision/control.h                |  20 ++++--
 engines/zvision/cursor.cpp               |  12 ++--
 engines/zvision/cursor.h                 |  26 +++++--
 engines/zvision/cursor_manager.cpp       |  15 ++--
 engines/zvision/cursor_manager.h         |   8 +--
 engines/zvision/detection.cpp            | 116 +++++++++++++++----------------
 engines/zvision/detection.h              |   6 +-
 engines/zvision/input_control.cpp        |  12 ++--
 engines/zvision/input_control.h          |   8 ++-
 engines/zvision/lever_control.cpp        |  32 ++++-----
 engines/zvision/lever_control.h          |   8 +--
 engines/zvision/lzss_read_stream.cpp     |  12 ++--
 engines/zvision/lzss_read_stream.h       |   6 +-
 engines/zvision/push_toggle_control.cpp  |   6 +-
 engines/zvision/puzzle.h                 |  16 ++---
 engines/zvision/render_manager.cpp       |  34 ++++-----
 engines/zvision/render_manager.h         |  28 +++++---
 engines/zvision/render_table.cpp         |  20 +++---
 engines/zvision/render_table.h           |  12 ++--
 engines/zvision/rlf_animation.cpp        |  28 ++++----
 engines/zvision/rlf_animation.h          |  24 +++++--
 engines/zvision/save_manager.cpp         |   4 +-
 engines/zvision/save_manager.h           |   4 +-
 engines/zvision/scr_file_handling.cpp    |   6 +-
 engines/zvision/script_manager.cpp       |  18 ++---
 engines/zvision/script_manager.h         |  12 ++--
 engines/zvision/sidefx.h                 |  24 ++++---
 engines/zvision/single_value_container.h |  44 ++++++------
 engines/zvision/string_manager.cpp       |   6 +-
 engines/zvision/string_manager.h         |   2 +-
 engines/zvision/timer_node.cpp           |  14 ++--
 engines/zvision/timer_node.h             |   4 +-
 engines/zvision/truetype_font.cpp        |  12 ++--
 engines/zvision/truetype_font.h          |   6 +-
 engines/zvision/utility.cpp              |  12 ++--
 engines/zvision/utility.h                |   6 +-
 engines/zvision/video.cpp                |   2 +-
 engines/zvision/zfs_archive.cpp          |   6 +-
 engines/zvision/zfs_archive.h            |   2 +-
 engines/zvision/zork_avi_decoder.h       |   2 +-
 engines/zvision/zork_raw.cpp             |  17 +++--
 engines/zvision/zork_raw.h               |  28 +++++---
 engines/zvision/zvision.cpp              |  40 +++++------
 engines/zvision/zvision.h                |  52 +++++++++-----
 50 files changed, 465 insertions(+), 377 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index fb4034fbdb..1d4ce9c604 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -103,8 +103,8 @@ bool ActionChangeLocation::execute(ZVision *engine) {
 
 ActionCrossfade::ActionCrossfade(const Common::String &line) {
 	sscanf(line.c_str(),
-           "%*[^(](%u %u %u %u %u %u %u)",
-           &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
+	       "%*[^(](%u %u %u %u %u %u %u)",
+	       &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
 }
 
 bool ActionCrossfade::execute(ZVision *engine) {
@@ -123,7 +123,7 @@ ActionDisableControl::ActionDisableControl(const Common::String &line) {
 
 bool ActionDisableControl::execute(ZVision *engine) {
 	debug("Disabling control %u", _key);
-	
+
 	engine->getScriptManager()->disableControl(_key);
 
 	return true;
@@ -189,7 +189,7 @@ bool ActionMusic::execute(ZVision *engine) {
 	} else {
 		audioStream = makeRawZorkStream(_fileName, engine);
 	}
-	
+
 	if (_loop) {
 		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
 		engine->_mixer->playStream(_soundType, 0, loopingAudioStream, -1, _volume);
@@ -235,8 +235,8 @@ ActionPlayAnimation::ActionPlayAnimation(const Common::String &line) {
 
 	// The two %*u are always 0 and dont seem to have a use
 	sscanf(line.c_str(),
-           "%*[^:]:%*[^:]:%u(%25s %u %u %u %u %u %u %u %*u %*u %u %u)",
-           &_key, fileName, &_x, &_y, &_width, &_height, &_start, &_end, &_loopCount, &_mask, &_framerate);
+	       "%*[^:]:%*[^:]:%u(%25s %u %u %u %u %u %u %u %*u %*u %u %u)",
+	       &_key, fileName, &_x, &_y, &_width, &_height, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
 	_fileName = Common::String(fileName);
 }
@@ -253,8 +253,8 @@ bool ActionPlayAnimation::execute(ZVision *engine) {
 
 ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(const Common::String &line) {
 	sscanf(line.c_str(),
-		   "%*[^:]:%*[^:]:%u(%u %u %u %u %u %u %u %u)",
-		   &_animationKey, &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount);
+	       "%*[^:]:%*[^:]:%u(%u %u %u %u %u %u %u %u)",
+	       &_animationKey, &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount);
 }
 
 bool ActionPlayPreloadAnimation::execute(ZVision *engine) {
@@ -320,7 +320,7 @@ ActionSetPartialScreen::ActionSetPartialScreen(const Common::String &line) {
 
 bool ActionSetPartialScreen::execute(ZVision *engine) {
 	RenderManager *renderManager = engine->getRenderManager();
-	
+
 	if (_backgroundColor > 0) {
 		renderManager->clearWorkingWindowTo555Color(_backgroundColor);
 	}
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index afa3e3a2ac..e7a4ea302f 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -319,7 +319,7 @@ public:
 
 private:
 	enum {
-		DIFFERENT_DIMENSIONS = 0x1 // 0x1 flags that the destRect dimensions are different from the original video dimensions
+	    DIFFERENT_DIMENSIONS = 0x1 // 0x1 flags that the destRect dimensions are different from the original video dimensions
 	};
 
 	Common::String _fileName;
diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
index 1143380501..66eefd7ce6 100644
--- a/engines/zvision/animation_control.cpp
+++ b/engines/zvision/animation_control.cpp
@@ -38,13 +38,13 @@
 namespace ZVision {
 
 AnimationControl::AnimationControl(ZVision *engine, uint32 controlKey, const Common::String &fileName)
-		: Control(engine, controlKey), 
-		  _fileType(RLF),
-		  _loopCount(1),
-		  _currentLoop(0),
-		  _accumulatedTime(0),
-		  _cachedFrame(0),
-		  _cachedFrameNeedsDeletion(false) {
+	: Control(engine, controlKey),
+	  _fileType(RLF),
+	  _loopCount(1),
+	  _currentLoop(0),
+	  _accumulatedTime(0),
+	  _cachedFrame(0),
+	  _cachedFrameNeedsDeletion(false) {
 	if (fileName.hasSuffix(".rlf")) {
 		_fileType = RLF;
 		_animation.rlf = new RlfAnimation(fileName, false);
diff --git a/engines/zvision/animation_control.h b/engines/zvision/animation_control.h
index 2ac3691483..247fbf765d 100644
--- a/engines/zvision/animation_control.h
+++ b/engines/zvision/animation_control.h
@@ -50,13 +50,13 @@ public:
 
 private:
 	enum FileType {
-		RLF = 1,
-		AVI = 2
+	    RLF = 1,
+	    AVI = 2
 	};
 
 private:
 	uint32 _animationKey;
-	
+
 	union {
 		RlfAnimation *rlf;
 		Video::VideoDecoder *avi;
@@ -76,10 +76,18 @@ private:
 public:
 	bool process(uint32 deltaTimeInMillis);
 
-	void setAnimationKey(uint32 animationKey) { _animationKey = animationKey; }
-	void setLoopCount(uint loopCount) { _loopCount = loopCount; }
-	void setXPos(int32 x) { _x = x; }
-	void setYPost(int32 y) { _y = y; }
+	void setAnimationKey(uint32 animationKey) {
+		_animationKey = animationKey;
+	}
+	void setLoopCount(uint loopCount) {
+		_loopCount = loopCount;
+	}
+	void setXPos(int32 x) {
+		_x = x;
+	}
+	void setYPost(int32 y) {
+		_y = y;
+	}
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/clock.cpp b/engines/zvision/clock.cpp
index c8ee717a33..d78cf6e2c1 100644
--- a/engines/zvision/clock.cpp
+++ b/engines/zvision/clock.cpp
@@ -30,7 +30,7 @@
 
 namespace ZVision {
 
-Clock::Clock(OSystem *system) 
+Clock::Clock(OSystem *system)
 	: _system(system),
 	  _lastTime(0),
 	  _deltaTime(0),
diff --git a/engines/zvision/clock.h b/engines/zvision/clock.h
index 3939ba1612..3740e07881 100644
--- a/engines/zvision/clock.h
+++ b/engines/zvision/clock.h
@@ -53,22 +53,26 @@ public:
 	 *
 	 * @return    Delta time since the last frame (in milliseconds)
 	 */
-	uint32 getDeltaTime() const { return _deltaTime; }
+	uint32 getDeltaTime() const {
+		return _deltaTime;
+	}
 	/**
 	 * Get the time from the program starting to the last update() call
 	 *
 	 * @return Time from program start to last update() call (in milliseconds)
 	 */
-	uint32 getLastMeasuredTime() { return _lastTime; }
+	uint32 getLastMeasuredTime() {
+		return _lastTime;
+	}
 
 	/**
 	 * Pause the clock. Any future delta times will take this pause into account.
-	 * Has no effect if the clock is already paused.    
+	 * Has no effect if the clock is already paused.
 	 */
 	void start();
 	/**
 	 * Un-pause the clock.
-	 * Has no effect if the clock is already un-paused.    
+	 * Has no effect if the clock is already un-paused.
 	 */
 	void stop();
 };
diff --git a/engines/zvision/control.h b/engines/zvision/control.h
index 770c540a12..ab55763a20 100644
--- a/engines/zvision/control.h
+++ b/engines/zvision/control.h
@@ -42,7 +42,9 @@ public:
 	Control(ZVision *engine, uint32 key) : _engine(engine), _key(key), _enabled(false) {}
 	virtual ~Control() {}
 
-	uint32 getKey() { return _key; }
+	uint32 getKey() {
+		return _key;
+	}
 
 	virtual void enable();
 	virtual void disable();
@@ -69,7 +71,9 @@ public:
 	 * @param backgroundImageSpacePos    The position of the mouse in background image space
 	 * @return                           Was the cursor changed?
 	 */
-	virtual bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) { return false; }
+	virtual bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+		return false;
+	}
 	/**
 	 * Called when a key is pressed. Default is NOP.
 	 *
@@ -88,14 +92,16 @@ public:
 	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
 	 * @return                     If true, the node can be deleted after process() finishes
 	 */
-	virtual bool process(uint32 deltaTimeInMillis) { return false; }
+	virtual bool process(uint32 deltaTimeInMillis) {
+		return false;
+	}
 	/**
 	 * Serialize a Control for save game use. This should only be used if a Control needs
 	 * to save values that would be different from initialization. AKA a TimerNode needs to
 	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
 	 * their key as the first data outputted. The default implementation is NOP.
 	 *
-	 * NOTE: If this method is overridden, you MUST also override deserialize() 
+	 * NOTE: If this method is overridden, you MUST also override deserialize()
 	 * and needsSerialization()
 	 *
 	 * @param stream    Stream to write any needed data to
@@ -118,10 +124,12 @@ public:
 	 *
 	 * @return    Does the Control need save game serialization?
 	 */
-	virtual inline bool needsSerialization() { return false; }
+	virtual inline bool needsSerialization() {
+		return false;
+	}
 
 protected:
-	ZVision * _engine;
+	ZVision *_engine;
 	uint32 _key;
 	bool _enabled;
 
diff --git a/engines/zvision/cursor.cpp b/engines/zvision/cursor.cpp
index 9023d97e0d..5386c8ead6 100644
--- a/engines/zvision/cursor.cpp
+++ b/engines/zvision/cursor.cpp
@@ -30,18 +30,18 @@
 
 namespace ZVision {
 
-ZorkCursor::ZorkCursor() 
+ZorkCursor::ZorkCursor()
 	: _width(0),
 	  _height(0),
 	  _hotspotX(0),
 	  _hotspotY(0) {
 }
 
-ZorkCursor::ZorkCursor(const Common::String &fileName) 
-		: _width(0),
-		  _height(0),
-		  _hotspotX(0),
-		  _hotspotY(0) {
+ZorkCursor::ZorkCursor(const Common::String &fileName)
+	: _width(0),
+	  _height(0),
+	  _hotspotX(0),
+	  _hotspotY(0) {
 	Common::File file;
 	if (!file.open(fileName))
 		return;
diff --git a/engines/zvision/cursor.h b/engines/zvision/cursor.h
index 18ac28ce8b..8f119c8982 100644
--- a/engines/zvision/cursor.h
+++ b/engines/zvision/cursor.h
@@ -32,7 +32,7 @@ class String;
 
 namespace ZVision {
 
-/** 
+/**
  * Utility class to parse and hold cursor data
  * Modeled off Graphics::Cursor
  */
@@ -53,12 +53,24 @@ private:
 public:
 	ZorkCursor &operator=(const ZorkCursor &other);
 
-	uint16 getWidth() const { return _width; }
-	uint16 getHeight() const { return _height; }
-	uint16 getHotspotX() const { return _hotspotX; }
-	uint16 getHotspotY() const { return _hotspotY; }
-	byte getKeyColor() const { return 0; }
-	const byte *getSurface() const { return (const byte *)_surface.getPixels(); }
+	uint16 getWidth() const {
+		return _width;
+	}
+	uint16 getHeight() const {
+		return _height;
+	}
+	uint16 getHotspotX() const {
+		return _hotspotX;
+	}
+	uint16 getHotspotY() const {
+		return _hotspotY;
+	}
+	byte getKeyColor() const {
+		return 0;
+	}
+	const byte *getSurface() const {
+		return (const byte *)_surface.getPixels();
+	}
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index 4c5ae5e80f..015e2b014f 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -35,19 +35,22 @@
 namespace ZVision {
 
 const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "backward", "downarrow", "forward", "handpt", "handpu", "hdown", "hleft",
-                                                         "hright", "hup", "idle", "leftarrow", "rightarrow", "suggest_surround", "suggest_tilt", "turnaround", "zuparrow" };
+                                                         "hright", "hup", "idle", "leftarrow", "rightarrow", "suggest_surround", "suggest_tilt", "turnaround", "zuparrow"
+                                                       };
 
 const char *CursorManager::_zgiCursorFileNames[NUM_CURSORS] = { "g0gbc011.zcr", "g0gac001.zcr", "g0gac021.zcr", "g0gac031.zcr", "g0gac041.zcr", "g0gac051.zcr", "g0gac061.zcr", "g0gac071.zcr", "g0gac081.zcr",
-                                                                "g0gac091.zcr", "g0gac101.zcr", "g0gac011.zcr", "g0gac111.zcr", "g0gac121.zcr", "g0gac131.zcr", "g0gac141.zcr", "g0gac151.zcr", "g0gac161.zcr" };
+                                                                "g0gac091.zcr", "g0gac101.zcr", "g0gac011.zcr", "g0gac111.zcr", "g0gac121.zcr", "g0gac131.zcr", "g0gac141.zcr", "g0gac151.zcr", "g0gac161.zcr"
+                                                              };
 
 const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow", "back", "down", "forw", "handpt", "handpu", "hdown", "hleft",
-                                                                 "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up" };
+                                                                 "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
+                                                               };
 
 
 CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
-		: _engine(engine),
-		  _pixelFormat(pixelFormat),
-		  _cursorIsPushed(false) {
+	: _engine(engine),
+	  _pixelFormat(pixelFormat),
+	  _cursorIsPushed(false) {
 	// WARNING: The index IDLE_CURSOR_INDEX is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
 	if (_engine->getGameId() == GID_NEMESIS) {
 		Common::String name(Common::String::format("%sa.zcr", _zNemCursorFileNames[IDLE_CURSOR_INDEX]));
diff --git a/engines/zvision/cursor_manager.h b/engines/zvision/cursor_manager.h
index 0a369aaf9e..0173bf810c 100644
--- a/engines/zvision/cursor_manager.h
+++ b/engines/zvision/cursor_manager.h
@@ -48,9 +48,9 @@ public:
 
 private:
 	enum {
-		NUM_CURSORS = 18,
-		// WARNING: The index 11 is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
-		IDLE_CURSOR_INDEX = 11
+	    NUM_CURSORS = 18,
+	    // WARNING: The index 11 is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
+	    IDLE_CURSOR_INDEX = 11
 	};
 
 	ZVision *_engine;
@@ -77,7 +77,7 @@ public:
 	/**
 	 * Parses a cursor name into a cursor file then creates and shows that cursor.
 	 *
-	 * @param cursorName    The name of a cursor. This *HAS* to correspond to one of the entries in _cursorNames[] 
+	 * @param cursorName    The name of a cursor. This *HAS* to correspond to one of the entries in _cursorNames[]
 	 * @param pushed        Should the cursor be pushed (true) or not pushed (false) (Another way to say it: down or up)
 	 */
 	void changeCursor(const Common::String &cursorName, bool pushed);
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 49664935e1..4ab0d6c85d 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -134,22 +134,22 @@ public:
 
 bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return false;
-		/*
-		(f == kSupportsListSaves) ||
-		(f == kSupportsLoadingDuringStartup) ||
-		(f == kSupportsDeleteSave) ||
-		(f == kSavesSupportMetaInfo) ||
-		(f == kSavesSupportThumbnail) ||
-		(f == kSavesSupportCreationDate) ||
-		(f == kSavesSupportPlayTime);
-		*/
+	/*
+	(f == kSupportsListSaves) ||
+	(f == kSupportsLoadingDuringStartup) ||
+	(f == kSupportsDeleteSave) ||
+	(f == kSavesSupportMetaInfo) ||
+	(f == kSavesSupportThumbnail) ||
+	(f == kSavesSupportCreationDate) ||
+	(f == kSavesSupportPlayTime);
+	*/
 }
 
 /*bool ZVision::ZVision::hasFeature(EngineFeature f) const {
-	return
-		(f == kSupportsRTL) ||
-		(f == kSupportsLoadingDuringRuntime) ||
-		(f == kSupportsSavingDuringRuntime);
+    return
+        (f == kSupportsRTL) ||
+        (f == kSupportsLoadingDuringRuntime) ||
+        (f == kSupportsSavingDuringRuntime);
 }*/
 
 bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
@@ -174,23 +174,23 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
 
 	Common::StringArray filenames;
 	filenames = saveFileMan->listSavefiles(pattern.c_str());
-	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)*/
+	Common::sort(filenames.begin(), filenames.end());   // Sort (hopefully ensuring we are sorted numerically..)*/
 
 	SaveStateList saveList;
-/*	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
-		// Obtain the last 3 digits of the filename, since they correspond to the save slot
-		int slotNum = atoi(file->c_str() + file->size() - 3);
-
-		if (slotNum >= 0 && slotNum <= 999) {
-			Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
-			if (in) {
-				if (ZVision::ZVision::readSaveHeader(in, false, header) == ZVision::ZVision::kRSHENoError) {
-					saveList.push_back(SaveStateDescriptor(slotNum, header.description));
-				}
-				delete in;
-			}
-		}
-	}*/
+	/*  for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
+	        // Obtain the last 3 digits of the filename, since they correspond to the save slot
+	        int slotNum = atoi(file->c_str() + file->size() - 3);
+
+	        if (slotNum >= 0 && slotNum <= 999) {
+	            Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
+	            if (in) {
+	                if (ZVision::ZVision::readSaveHeader(in, false, header) == ZVision::ZVision::kRSHENoError) {
+	                    saveList.push_back(SaveStateDescriptor(slotNum, header.description));
+	                }
+	                delete in;
+	            }
+	        }
+	    }*/
 
 	return saveList;
 }
@@ -210,17 +210,17 @@ void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {
 	Common::String pattern = target;
 	pattern += ".???";
 	filenames = saveFileMan->listSavefiles(pattern.c_str());
-	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
+	Common::sort(filenames.begin(), filenames.end());   // Sort (hopefully ensuring we are sorted numerically..)
 
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
-		// Obtain the last 3 digits of the filename, since they correspond to the save slot
-		int slotNum = atoi(file->c_str() + file->size() - 3);
-
-		// Rename every slot greater than the deleted slot,
-		if (slotNum > slot) {
-			saveFileMan->renameSavefile(file->c_str(), filename.c_str());
-			filename = ZVision::ZVision::getSavegameFilename(target, ++slot);
-		}
+	    // Obtain the last 3 digits of the filename, since they correspond to the save slot
+	    int slotNum = atoi(file->c_str() + file->size() - 3);
+
+	    // Rename every slot greater than the deleted slot,
+	    if (slotNum > slot) {
+	        saveFileMan->renameSavefile(file->c_str(), filename.c_str());
+	        filename = ZVision::ZVision::getSavegameFilename(target, ++slot);
+	    }
 	}
 	*/
 }
@@ -231,34 +231,34 @@ SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, in
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
 
 	if (in) {
-		ZVision::ZVision::SaveHeader header;
-		ZVision::ZVision::kReadSaveHeaderError error;
+	    ZVision::ZVision::SaveHeader header;
+	    ZVision::ZVision::kReadSaveHeaderError error;
 
-		error = ZVision::ZVision::readSaveHeader(in, true, header);
-		delete in;
+	    error = ZVision::ZVision::readSaveHeader(in, true, header);
+	    delete in;
 
-		if (error == ZVision::ZVision::kRSHENoError) {
-			SaveStateDescriptor desc(slot, header.description);
+	    if (error == ZVision::ZVision::kRSHENoError) {
+	        SaveStateDescriptor desc(slot, header.description);
 
-			desc.setThumbnail(header.thumbnail);
+	        desc.setThumbnail(header.thumbnail);
 
-			if (header.version > 0) {
-				int day = (header.saveDate >> 24) & 0xFF;
-				int month = (header.saveDate >> 16) & 0xFF;
-				int year = header.saveDate & 0xFFFF;
+	        if (header.version > 0) {
+	            int day = (header.saveDate >> 24) & 0xFF;
+	            int month = (header.saveDate >> 16) & 0xFF;
+	            int year = header.saveDate & 0xFFFF;
 
-				desc.setSaveDate(year, month, day);
+	            desc.setSaveDate(year, month, day);
 
-				int hour = (header.saveTime >> 16) & 0xFF;
-				int minutes = (header.saveTime >> 8) & 0xFF;
+	            int hour = (header.saveTime >> 16) & 0xFF;
+	            int minutes = (header.saveTime >> 8) & 0xFF;
 
-				desc.setSaveTime(hour, minutes);
+	            desc.setSaveTime(hour, minutes);
 
-				desc.setPlayTime(header.playTime * 1000);
-			}
+	            desc.setPlayTime(header.playTime * 1000);
+	        }
 
-			return desc;
-		}
+	        return desc;
+	    }
 	}
 	*/
 
@@ -266,7 +266,7 @@ SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, in
 }
 
 #if PLUGIN_ENABLED_DYNAMIC(ZVISION)
-	REGISTER_PLUGIN_DYNAMIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);
+REGISTER_PLUGIN_DYNAMIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);
 #else
-	REGISTER_PLUGIN_STATIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);
+REGISTER_PLUGIN_STATIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine);
 #endif
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index 34417601e8..1f430dac1c 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -29,9 +29,9 @@
 namespace ZVision {
 
 enum ZVisionGameId {
-	GID_NONE = 0,
-	GID_NEMESIS = 1,
-	GID_GRANDINQUISITOR = 2
+    GID_NONE = 0,
+    GID_NEMESIS = 1,
+    GID_GRANDINQUISITOR = 2
 };
 
 struct ZVisionGameDescription {
diff --git a/engines/zvision/input_control.cpp b/engines/zvision/input_control.cpp
index a445e1aae5..5723a4e4a4 100644
--- a/engines/zvision/input_control.cpp
+++ b/engines/zvision/input_control.cpp
@@ -37,12 +37,12 @@
 
 namespace ZVision {
 
-InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) 
-		: Control(engine, key),
-		  _nextTabstop(0),
-		  _focused(false),
-		  _textChanged(false),
-		  _cursorOffset(0) {
+InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key),
+	  _nextTabstop(0),
+	  _focused(false),
+	  _textChanged(false),
+	  _cursorOffset(0) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
diff --git a/engines/zvision/input_control.h b/engines/zvision/input_control.h
index aab2c991dc..3d7db747d7 100644
--- a/engines/zvision/input_control.h
+++ b/engines/zvision/input_control.h
@@ -48,8 +48,12 @@ private:
 	uint _cursorOffset;
 
 public:
-	void focus() { _focused = true; }
-	void unfocus() { _focused = false; }
+	void focus() {
+		_focused = true;
+	}
+	void unfocus() {
+		_focused = false;
+	}
 	void onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	void onKeyDown(Common::KeyState keyState);
 	bool process(uint32 deltaTimeInMillis);
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 79049b8fcb..b0f9417042 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -43,16 +43,16 @@
 namespace ZVision {
 
 LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-		: Control(engine, key),
-		  _frameInfo(0),
-		  _frameCount(0),
-		  _startFrame(0),
-		  _currentFrame(0),
-		  _lastRenderedFrame(0),
-		  _mouseIsCaptured(false),
-		  _isReturning(false),
-		  _accumulatedTime(0),
-		  _returnRoutesCurrentFrame(0) {
+	: Control(engine, key),
+	  _frameInfo(0),
+	  _frameCount(0),
+	  _startFrame(0),
+	  _currentFrame(0),
+	  _lastRenderedFrame(0),
+	  _mouseIsCaptured(false),
+	  _isReturning(false),
+	  _accumulatedTime(0),
+	  _returnRoutesCurrentFrame(0) {
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
@@ -84,7 +84,7 @@ LeverControl::~LeverControl() {
 	} else if (_fileType == RLF) {
 		delete _animation.rlf;
 	}
-	
+
 	delete[] _frameInfo;
 }
 
@@ -194,7 +194,7 @@ void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 	if (!_enabled) {
 		return;
 	}
-	
+
 	if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_mouseIsCaptured = true;
 		_lastMousePos = backgroundImageSpacePos;
@@ -205,7 +205,7 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 	if (!_enabled) {
 		return;
 	}
-	
+
 	if (_mouseIsCaptured) {
 		_mouseIsCaptured = false;
 		_engine->getScriptManager()->setStateValue(_key, _currentFrame);
@@ -220,7 +220,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 	if (!_enabled) {
 		return false;
 	}
-	
+
 	bool cursorWasChanged = false;
 
 	if (_mouseIsCaptured) {
@@ -276,7 +276,7 @@ bool LeverControl::process(uint32 deltaTimeInMillis) {
 			renderFrame(_returnRoutesCurrentFrame);
 		}
 	}
-	
+
 	return false;
 }
 
@@ -387,7 +387,7 @@ void LeverControl::renderFrame(uint frameNumber) {
 		// getFrameData() will automatically optimize to getNextFrame() / getPreviousFrame() if it can
 		frameData = (const uint16 *)_animation.rlf->getFrameData(frameNumber)->getPixels();
 		width = _animation.rlf->width(); // Use the animation width instead of _animationCoords.width()
-		height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()			
+		height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()
 	} else if (_fileType == AVI) {
 		_animation.avi->seekToFrame(frameNumber);
 		const Graphics::Surface *surface = _animation.avi->decodeNextFrame();
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 8ef8f06fec..94d23c1f95 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -41,8 +41,8 @@ public:
 
 private:
 	enum FileType {
-		RLF = 1,
-		AVI = 2
+	    RLF = 1,
+	    AVI = 2
 	};
 
 	struct Direction {
@@ -59,8 +59,8 @@ private:
 	};
 
 	enum {
-		ANGLE_DELTA = 30, // How far off a mouse angle can be and still be considered valid. This is in both directions, so the total buffer zone is (2 * ANGLE_DELTA)
-		ANIMATION_FRAME_TIME = 30 // In millis
+	    ANGLE_DELTA = 30, // How far off a mouse angle can be and still be considered valid. This is in both directions, so the total buffer zone is (2 * ANGLE_DELTA)
+	    ANIMATION_FRAME_TIME = 30 // In millis
 	};
 
 private:
diff --git a/engines/zvision/lzss_read_stream.cpp b/engines/zvision/lzss_read_stream.cpp
index bbbda6f526..b36bf5f7c0 100644
--- a/engines/zvision/lzss_read_stream.cpp
+++ b/engines/zvision/lzss_read_stream.cpp
@@ -28,10 +28,10 @@
 namespace ZVision {
 
 LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)
-		: _source(source),
-		  // It's convention to set the starting cursor position to blockSize - 16
-		  _windowCursor(0x0FEE),
-		  _eosFlag(false) {
+	: _source(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);
 }
@@ -69,9 +69,9 @@ uint32 LzssReadStream::decompressBytes(byte *destination, uint32 numberOfBytes)
 				}
 
 				uint16 length = (high & 0xF) + 2;
-				uint16 offset = low | ((high & 0xF0)<<4);
+				uint16 offset = low | ((high & 0xF0) << 4);
 
-				for(int j = 0; j <= length; ++j) {
+				for (int j = 0; j <= length; ++j) {
 					byte temp = _window[(offset + j) & 0xFFF];
 					_window[_windowCursor] = temp;
 					destination[destinationCursor++] = temp;
diff --git a/engines/zvision/lzss_read_stream.h b/engines/zvision/lzss_read_stream.h
index f6b1eb1a65..1f7df9d4e0 100644
--- a/engines/zvision/lzss_read_stream.h
+++ b/engines/zvision/lzss_read_stream.h
@@ -36,7 +36,7 @@ namespace ZVision {
 class LzssReadStream : public Common::ReadStream {
 public:
 	/**
-	 * A class that decompresses LZSS data and implements ReadStream for easy access 
+	 * A class that decompresses LZSS data and implements ReadStream for easy access
 	 * to the decompiled data.
 	 *
 	 * @param source              The source data
@@ -45,7 +45,7 @@ public:
 
 private:
 	enum {
-		BLOCK_SIZE = 0x1000
+	    BLOCK_SIZE = 0x1000
 	};
 
 private:
@@ -64,7 +64,7 @@ private:
 	 *
 	 * @param numberOfBytes    How many bytes to decompress. This is a count of source bytes, not destination bytes
 	 */
-	uint32 decompressBytes(byte* destination, uint32 numberOfBytes);
+	uint32 decompressBytes(byte *destination, uint32 numberOfBytes);
 };
 
 }
diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index 689311ba5b..21a1c41548 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -35,7 +35,7 @@
 namespace ZVision {
 
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-		: Control(engine, key) {
+	: Control(engine, key) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
@@ -76,7 +76,7 @@ void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Com
 	if (!_enabled) {
 		return;
 	}
-	
+
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getScriptManager()->setStateValue(_key, 1);
 	}
@@ -86,7 +86,7 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
 	if (!_enabled) {
 		return false;
 	}
-	
+
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_hoverCursor);
 		return true;
diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index 1e730365dc..2eea52f80b 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -42,17 +42,17 @@ struct Puzzle {
 
 	/** How criteria should be decided */
 	enum CriteriaOperator {
-		EQUAL_TO,
-		NOT_EQUAL_TO,
-		GREATER_THAN,
-		LESS_THAN
+	    EQUAL_TO,
+	    NOT_EQUAL_TO,
+	    GREATER_THAN,
+	    LESS_THAN
 	};
 
 	/** Criteria for a Puzzle result to be fired */
 	struct CriteriaEntry {
 		/** The key of a global state */
 		uint32 key;
-		/**  
+		/**
 		 * What we're comparing the value of the global state against
 		 * This can either be a pure value or it can be the key of another global state
 		 */
@@ -64,9 +64,9 @@ struct Puzzle {
 	};
 
 	enum StateFlags {
-		ONCE_PER_INST = 0x01,
-		DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
-		DISABLED = 0x04
+	    ONCE_PER_INST = 0x01,
+	    DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
+	    DISABLED = 0x04
 	};
 
 	uint32 key;
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index cb13606b11..1406fbc828 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -38,19 +38,19 @@
 namespace ZVision {
 
 RenderManager::RenderManager(OSystem *system, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
-		: _system(system),
-		  _workingWidth(workingWindow.width()),
-		  _workingHeight(workingWindow.height()),
-		  _screenCenterX(_workingWidth / 2),
-		  _screenCenterY(_workingHeight / 2),
-		  _workingWindow(workingWindow),
-		  _pixelFormat(pixelFormat),
-		  _backgroundWidth(0),
-		  _backgroundHeight(0),
-		  _backgroundInverseVelocity(0),
-		  _backgroundOffset(0, 0),
-		  _accumulatedVelocityMilliseconds(0),
-		  _renderTable(_workingWidth, _workingHeight) {
+	: _system(system),
+	  _workingWidth(workingWindow.width()),
+	  _workingHeight(workingWindow.height()),
+	  _screenCenterX(_workingWidth / 2),
+	  _screenCenterY(_workingHeight / 2),
+	  _workingWindow(workingWindow),
+	  _pixelFormat(pixelFormat),
+	  _backgroundWidth(0),
+	  _backgroundHeight(0),
+	  _backgroundInverseVelocity(0),
+	  _backgroundOffset(0, 0),
+	  _accumulatedVelocityMilliseconds(0),
+	  _renderTable(_workingWidth, _workingHeight) {
 
 	_workingWindowBuffer.create(_workingWidth, _workingHeight, _pixelFormat);
 	_backBuffer.create(windowWidth, windowHeight, pixelFormat);
@@ -159,7 +159,7 @@ void RenderManager::clearWorkingWindowTo555Color(uint16 color) {
 	}
 }
 
-void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {	
+void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {
 	int16 subRectX = 0;
 	int16 subRectY = 0;
 
@@ -184,8 +184,8 @@ void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 dest
 	if (wrap) {
 		_backgroundWidth = surface.w;
 		_backgroundHeight = surface.h;
-	
-		if (destinationX > 0) { 
+
+		if (destinationX > 0) {
 			// Move destinationX to 0
 			subRectX = surface.w - destinationX;
 			destinationX = 0;
@@ -373,7 +373,7 @@ Common::Rect RenderManager::renderTextToWorkingWindow(uint32 idNumber, const Com
 	entry.alphaColor = 0;
 	entry.destX = destX;
 	entry.destY = destY;
-	
+
 	// Draw the text to the working window
 	entry.data = font->drawTextToSurface(text, textColor, maxWidth, maxHeight, align, wrap);
 	entry.width = entry.data->w;
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 111bf6276c..9fedd1d8dd 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -89,7 +89,7 @@ private:
 	/** Center of the screen in the y direction */
 	const int _screenCenterY;
 
-	/** 
+	/**
 	 * A Rectangle centered inside the actual window. All in-game coordinates
 	 * are given in this coordinate space. Also, all images are clipped to the
 	 * edges of this Rectangle
@@ -106,7 +106,7 @@ private:
 	/** The height of the current background image */
 	uint16 _backgroundHeight;
 
-	/** 
+	/**
 	 * The "velocity" at which the background image is panning. We actually store the inverse of velocity (ms/pixel instead of pixels/ms)
 	 * because it allows you to accumulate whole pixels 'steps' instead of rounding pixels every frame
 	 */
@@ -135,13 +135,17 @@ public:
 	/**
 	 * Clears the AlphaEntry list
 	 */
-	void clearAlphaEntries() { _alphaDataEntries.clear(); }
+	void clearAlphaEntries() {
+		_alphaDataEntries.clear();
+	}
 	/**
 	 * Removes a specific AlphaEntry from the list
 	 *
 	 * @param idNumber    The id number identifing the AlphaEntry
 	 */
-	void removeAlphaEntry(uint32 idNumber) { _alphaDataEntries.erase(idNumber); }
+	void removeAlphaEntry(uint32 idNumber) {
+		_alphaDataEntries.erase(idNumber);
+	}
 
 	/**
 	 * Copies a sub-rectangle of a buffer to the working window
@@ -224,17 +228,17 @@ public:
 	/**
 	 * Set the background position (_backgroundOffset). If the current RenderState is PANORAMA, the offset
 	 * will be in the horizontal direction. If the current RenderState is TILT, the offset will be in the
-	 * vertical direction. 
+	 * vertical direction.
 	 *
-	 * This method will not render anything on the screen. So if nothing else is called that renders the 
+	 * This method will not render anything on the screen. So if nothing else is called that renders the
 	 * background, the change won't be seen until next frame.
 	 *
 	 * @param offset The amount to offset the background
 	 */
 	void setBackgroundPosition(int offset);
-	
+
 	/**
-	 * Set the background scroll velocity. Negative velocities correspond to left / up scrolling and 
+	 * Set the background scroll velocity. Negative velocities correspond to left / up scrolling and
 	 * positive velocities correspond to right / down scrolling
 	 *
 	 * @param velocity    Velocity
@@ -249,7 +253,7 @@ public:
 	 */
 	const Common::Point screenSpaceToImageSpace(const Common::Point &point);
 	/**
-	 * Converts a point in image coordinate space to ***PRE-WARP*** 
+	 * Converts a point in image coordinate space to ***PRE-WARP***
 	 * working window coordinate space
 	 *
 	 * @param point    Point in image coordinate space
@@ -268,7 +272,9 @@ public:
 
 	RenderTable *getRenderTable();
 	uint32 getCurrentBackgroundOffset();
-	const Graphics::Surface *getBackBuffer() { return &_backBuffer; }
+	const Graphics::Surface *getBackBuffer() {
+		return &_backBuffer;
+	}
 
 	/**
 	 * Creates a copy of surface and transposes the data.
@@ -313,7 +319,7 @@ private:
 	 * Move the background image by an offset. If we are currently in Panorama mode,
 	 * the offset will correspond to a horizontal motion. If we are currently in Tilt mode,
 	 * the offset will correspond to a vertical motion. This function should not be called
-	 * if we are in Flat mode. 
+	 * if we are in Flat mode.
 	 *
 	 * The RenderManager will take care of wrapping the image.
 	 * Ex: If the image has width 1400px, it is legal to offset 1500px.
diff --git a/engines/zvision/render_table.cpp b/engines/zvision/render_table.cpp
index b6a6a3d2bb..5a0bae7c22 100644
--- a/engines/zvision/render_table.cpp
+++ b/engines/zvision/render_table.cpp
@@ -32,9 +32,9 @@
 namespace ZVision {
 
 RenderTable::RenderTable(uint numColumns, uint numRows)
-		: _numRows(numRows),
-		  _numColumns(numColumns),
-		  _renderState(FLAT) {
+	: _numRows(numRows),
+	  _numColumns(numColumns),
+	  _renderState(FLAT) {
 	assert(numRows != 0 && numColumns != 0);
 
 	_internalBuffer = new Common::Point[numRows * numColumns];
@@ -97,12 +97,12 @@ uint16 mixTwoRGB(uint16 colorOne, uint16 colorTwo, float percentColorOne) {
 
 	uint16 returnColor = (byte(rFinal + 0.5f) << Graphics::ColorMasks<555>::kRedShift) |
 	                     (byte(gFinal + 0.5f) << Graphics::ColorMasks<555>::kGreenShift) |
-						 (byte(bFinal + 0.5f) << Graphics::ColorMasks<555>::kBlueShift);
+	                     (byte(bFinal + 0.5f) << Graphics::ColorMasks<555>::kBlueShift);
 
 	return returnColor;
 }
 
-void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, uint32 destWidth, const Common::Rect &subRect) {
+void RenderTable::mutateImage(uint16 *sourceBuffer, uint16 *destBuffer, uint32 destWidth, const Common::Rect &subRect) {
 	uint32 destOffset = 0;
 
 	for (int16 y = subRect.top; y < subRect.bottom; ++y) {
@@ -115,7 +115,7 @@ void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, uint32 d
 			// RenderTable only stores offsets from the original coordinates
 			uint32 sourceYIndex = y + _internalBuffer[index].y;
 			uint32 sourceXIndex = x + _internalBuffer[index].x;
-			
+
 			destBuffer[destOffset + normalizedX] = sourceBuffer[sourceYIndex * _numColumns + sourceXIndex];
 		}
 
@@ -154,11 +154,11 @@ void RenderTable::generatePanoramaLookupTable() {
 		// To get x in cylinder coordinates, we just need to calculate the arc length
 		// We also scale it by _panoramaOptions.linearScale
 		int32 xInCylinderCoords = int32(floor((cylinderRadius * _panoramaOptions.linearScale * alpha) + halfWidth));
-		
+
 		float cosAlpha = cos(alpha);
 
 		for (uint y = 0; y < _numRows; ++y) {
-			// To calculate y in cylinder coordinates, we can do similar triangles comparison, 
+			// To calculate y in cylinder coordinates, we can do similar triangles comparison,
 			// comparing the triangle from the center to the screen and from the center to the edge of the cylinder
 			int32 yInCylinderCoords = int32(floor(halfHeight + ((float)y - halfHeight) * cosAlpha));
 
@@ -179,7 +179,7 @@ void RenderTable::generateTiltLookupTable() {
 	float cylinderRadius = halfWidth / tan(fovInRadians);
 
 	for (uint y = 0; y < _numRows; ++y) {
-	
+
 		// Add an offset of 0.01 to overcome zero tan/atan issue (horizontal line on half of screen)
 		// Alpha represents the vertical angle between the viewer at the center of a cylinder and y
 		float alpha = atan(((float)y - halfHeight + 0.01f) / cylinderRadius);
@@ -192,7 +192,7 @@ void RenderTable::generateTiltLookupTable() {
 		uint32 columnIndex = y * _numColumns;
 
 		for (uint x = 0; x < _numColumns; ++x) {
-			// To calculate x in cylinder coordinates, we can do similar triangles comparison, 
+			// To calculate x in cylinder coordinates, we can do similar triangles comparison,
 			// comparing the triangle from the center to the screen and from the center to the edge of the cylinder
 			int32 xInCylinderCoords = int32(floor(halfWidth + ((float)x - halfWidth) * cosAlpha));
 
diff --git a/engines/zvision/render_table.h b/engines/zvision/render_table.h
index 898091193a..401e627747 100644
--- a/engines/zvision/render_table.h
+++ b/engines/zvision/render_table.h
@@ -35,9 +35,9 @@ public:
 
 public:
 	enum RenderState {
-		PANORAMA,
-		TILT,
-		FLAT
+	    PANORAMA,
+	    TILT,
+	    FLAT
 	};
 
 private:
@@ -59,12 +59,14 @@ private:
 	} _tiltOptions;
 
 public:
-	RenderState getRenderState() { return _renderState; }
+	RenderState getRenderState() {
+		return _renderState;
+	}
 	void setRenderState(RenderState newState);
 
 	const Common::Point convertWarpedCoordToFlatCoord(const Common::Point &point);
 
-	void mutateImage(uint16 *sourceBuffer, uint16* destBuffer, uint32 destWidth, const Common::Rect &subRect);
+	void mutateImage(uint16 *sourceBuffer, uint16 *destBuffer, uint32 destWidth, const Common::Rect &subRect);
 	void generateRenderTable();
 
 	void setPanoramaFoV(float fov);
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index 5f1d41daae..795167e572 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -35,16 +35,16 @@
 
 namespace ZVision {
 
-RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream) 
-		: _stream(stream),
-		  _lastFrameRead(0),
-		  _frameCount(0),
-		  _width(0),
-		  _height(0),
-		  _frameTime(0),
-		  _frames(0),
-		  _currentFrame(-1),
-		  _frameBufferByteSize(0) {
+RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
+	: _stream(stream),
+	  _lastFrameRead(0),
+	  _frameCount(0),
+	  _width(0),
+	  _height(0),
+	  _frameTime(0),
+	  _frames(0),
+	  _currentFrame(-1),
+	  _frameBufferByteSize(0) {
 	if (!_file.open(fileName)) {
 		warning("RLF animation file %s could not be opened", fileName.c_str());
 		return;
@@ -255,8 +255,8 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3
 				numberOfSamples--;
 			}
 
-		// If numberOfSamples is >= 0, move destOffset forward ((numberOfSamples * 2) + 2)
-		// This function assumes the dest buffer has been memset with 0's.
+			// If numberOfSamples is >= 0, move destOffset forward ((numberOfSamples * 2) + 2)
+			// This function assumes the dest buffer has been memset with 0's.
 		} else {
 			if (sourceOffset + 1 >= sourceSize) {
 				return;
@@ -301,8 +301,8 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3
 				numberOfSamples--;
 			}
 
-		// If numberOfSamples is >= 0, copy one sample from source to the 
-		// next (numberOfSamples + 2) dest spots
+			// If numberOfSamples is >= 0, copy one sample from source to the
+			// next (numberOfSamples + 2) dest spots
 		} else {
 			if (sourceOffset + 1 >= sourceSize) {
 				return;
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index fe5b0d68b4..b0f7ee204e 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -41,8 +41,8 @@ public:
 
 private:
 	enum EncodingType {
-		Masked,
-		Simple
+	    Masked,
+	    Simple
 	};
 
 	struct Frame {
@@ -68,10 +68,18 @@ private:
 	uint32 _frameBufferByteSize;
 
 public:
-	uint frameCount() { return _frameCount; }
-	uint width() { return _width; }
-	uint height() { return _height; }
-	uint32 frameTime() { return _frameTime; }
+	uint frameCount() {
+		return _frameCount;
+	}
+	uint width() {
+		return _width;
+	}
+	uint height() {
+		return _height;
+	}
+	uint32 frameTime() {
+		return _frameTime;
+	}
 
 	/**
 	 * Seeks to the frameNumber and updates the internal Surface with
@@ -104,7 +112,9 @@ public:
 	/**
 	 * @return Is the currentFrame is the last frame in the animation?
 	 */
-	bool endOfAnimation() { return _currentFrame == (int)_frameCount - 1; }
+	bool endOfAnimation() {
+		return _currentFrame == (int)_frameCount - 1;
+	}
 
 private:
 	/**
diff --git a/engines/zvision/save_manager.cpp b/engines/zvision/save_manager.cpp
index c3deadd703..528dd0f35b 100644
--- a/engines/zvision/save_manager.cpp
+++ b/engines/zvision/save_manager.cpp
@@ -106,7 +106,7 @@ void SaveManager::autoSave() {
 void SaveManager::writeSaveGameData(Common::OutSaveFile *file) {
 	// Create a thumbnail and save it
 	Graphics::saveThumbnail(*file);
-	
+
 	// Write out the save date/time
 	TimeDate td;
 	g_system->getTimeAndDate(td);
@@ -171,7 +171,7 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 		warning("File is not a ZVision save file. Aborting load");
 		return false;
 	}
-	
+
 	// Read in the version
 	header.version = in->readByte();
 
diff --git a/engines/zvision/save_manager.h b/engines/zvision/save_manager.h
index b4770e68b2..9de1c51900 100644
--- a/engines/zvision/save_manager.h
+++ b/engines/zvision/save_manager.h
@@ -54,13 +54,13 @@ private:
 	static const uint32 SAVEGAME_ID;
 
 	enum {
-		SAVE_VERSION = 1
+	    SAVE_VERSION = 1
 	};
 
 public:
 	/**
 	 * Called every room change. Saves the state of the room just before
-	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to 
+	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to
 	 * create the save file name.
 	 */
 	void autoSave();
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index e90408cf0d..5fed820103 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -44,7 +44,7 @@ void ScriptManager::parseScrFile(const Common::String &fileName, bool isGlobal)
 		return;
 	}
 
-	while(!file.eos()) {
+	while (!file.eos()) {
 		Common::String line = file.readLine();
 		if (file.err()) {
 			warning("Error parsing scr file: %s", fileName.c_str());
@@ -57,7 +57,7 @@ void ScriptManager::parseScrFile(const Common::String &fileName, bool isGlobal)
 
 		if (line.matchString("puzzle:*", true)) {
 			Puzzle *puzzle = new Puzzle();
-			sscanf(line.c_str(),"puzzle:%u",&(puzzle->key));
+			sscanf(line.c_str(), "puzzle:%u", &(puzzle->key));
 
 			parsePuzzle(puzzle, file);
 			if (isGlobal) {
@@ -236,7 +236,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:ttytext*", true)) {
 			// TODO: Implement ActionTTYText
 		} else if (line.matchString("*:universe_music*", true)) {
-			// TODO: Implement ActionUniverseMusic		
+			// TODO: Implement ActionUniverseMusic
 		} else if (line.matchString("*:copy_file*", true)) {
 			// Not used. Purposely left empty
 		} else {
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 4b4f1303aa..72e67bfa7f 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -46,13 +46,13 @@ ScriptManager::ScriptManager(ZVision *engine)
 
 ScriptManager::~ScriptManager() {
 	for (PuzzleList::iterator iter = _activePuzzles.begin(); iter != _activePuzzles.end(); ++iter) {
-		delete (*iter);
+		delete(*iter);
 	}
 	for (PuzzleList::iterator iter = _globalPuzzles.begin(); iter != _globalPuzzles.end(); ++iter) {
-		delete (*iter);
+		delete(*iter);
 	}
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		delete (*iter);
+		delete(*iter);
 	}
 }
 
@@ -108,10 +108,10 @@ void ScriptManager::createReferenceTable() {
 }
 
 void ScriptManager::updateNodes(uint deltaTimeMillis) {
-    // If process() returns true, it means the node can be deleted
+	// If process() returns true, it means the node can be deleted
 	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end();) {
 		if ((*iter)->process(deltaTimeMillis)) {
-			delete (*iter);
+			delete(*iter);
 			// Remove the node
 			iter = _activeSideFx.erase(iter);
 		} else {
@@ -121,7 +121,7 @@ void ScriptManager::updateNodes(uint deltaTimeMillis) {
 	// If process() returns true, it means the node can be deleted
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end();) {
 		if ((*iter)->process(deltaTimeMillis)) {
-			delete (*iter);
+			delete(*iter);
 			// Remove the node
 			iter = _activeControls.erase(iter);
 		} else {
@@ -137,7 +137,7 @@ void ScriptManager::checkPuzzleCriteria() {
 		// Check if the puzzle is already finished
 		// Also check that the puzzle isn't disabled
 		if (getStateValue(puzzle->key) == 1 &&
-			(puzzle->flags & Puzzle::DISABLED) == 0) {
+		        (puzzle->flags & Puzzle::DISABLED) == 0) {
 			continue;
 		}
 
@@ -341,11 +341,11 @@ void ScriptManager::changeLocation(char world, char room, char node, char view,
 	_referenceTable.clear();
 	_puzzlesToCheck.clear();
 	for (PuzzleList::iterator iter = _activePuzzles.begin(); iter != _activePuzzles.end(); ++iter) {
-		delete (*iter);
+		delete(*iter);
 	}
 	_activePuzzles.clear();
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		delete (*iter);
+		delete(*iter);
 	}
 	_activeControls.clear();
 
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index c29bc57d03..d47ee94da4 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -64,9 +64,9 @@ public:
 
 private:
 	ZVision *_engine;
-	/** 
-	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and 
-	 * mutators getStateValue() and setStateValue(). This ensures that Puzzles that reference a 
+	/**
+	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and
+	 * mutators getStateValue() and setStateValue(). This ensures that Puzzles that reference a
 	 * particular state key are checked after the key is modified.
 	 */
 	StateMap _globalState;
@@ -169,7 +169,7 @@ public:
 private:
 	/**
 	 * Parses the stream into a Puzzle object
-	 * Helper method for parseScrFile. 
+	 * Helper method for parseScrFile.
 	 *
 	 * @param puzzle    The object to store what is parsed
 	 * @param stream    Scr file stream
@@ -178,7 +178,7 @@ private:
 
 	/**
 	 * Parses the stream into a Criteria object
-	 * Helper method for parsePuzzle. 
+	 * Helper method for parsePuzzle.
 	 *
 	 * @param criteria    Pointer to the Criteria object to fill
 	 * @param stream      Scr file stream
@@ -188,7 +188,7 @@ private:
 
 	/**
 	 * Parses the stream into a ResultAction objects
-	 * Helper method for parsePuzzle. 
+	 * Helper method for parsePuzzle.
 	 *
 	 * @param stream        Scr file stream
 	 * @param actionList    The list where the results will be added
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index d495655a22..6f75ad6649 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -36,19 +36,25 @@ class ZVision;
 class SideFX {
 public:
 
-	enum SideFXType{
-		SIDEFX_UNK   = 0,
-		SIDEFX_TIMER = 1
+	enum SideFXType {
+	    SIDEFX_UNK   = 0,
+	    SIDEFX_TIMER = 1
 	};
 
 	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
 	SideFX(ZVision *engine, uint32 key, SideFXType type) : _engine(engine), _key(key), _type(type) {}
 	virtual ~SideFX() {}
 
-	uint32 getKey() { return _key; }
-	SideFXType getType() { return _type; }
+	uint32 getKey() {
+		return _key;
+	}
+	SideFXType getType() {
+		return _type;
+	}
 
-	virtual bool process(uint32 deltaTimeInMillis) { return false; }
+	virtual bool process(uint32 deltaTimeInMillis) {
+		return false;
+	}
 	/**
 	 * Serialize a SideFX for save game use. This should only be used if a SideFX needs
 	 * to save values that would be different from initialization. AKA a TimerNode needs to
@@ -78,10 +84,12 @@ public:
 	 *
 	 * @return    Does the SideFX need save game serialization?
 	 */
-	virtual inline bool needsSerialization() { return false; }
+	virtual inline bool needsSerialization() {
+		return false;
+	}
 
 protected:
-	ZVision * _engine;
+	ZVision *_engine;
 	uint32 _key;
 	SideFXType _type;
 
diff --git a/engines/zvision/single_value_container.h b/engines/zvision/single_value_container.h
index 45b5a89e95..33fe69d760 100644
--- a/engines/zvision/single_value_container.h
+++ b/engines/zvision/single_value_container.h
@@ -30,21 +30,21 @@ class String;
 namespace ZVision {
 
 /**
- * A generic single value storage class. It is useful for storing different 
+ * A generic single value storage class. It is useful for storing different
  * value types in a single List, Hashmap, etc.
  */
 class SingleValueContainer {
 public:
 	enum ValueType {
-		BOOL,
-		BYTE,
-		INT16,
-		UINT16,
-		INT32,
-		UINT32,
-		FLOAT,
-		DOUBLE,
-		STRING
+	    BOOL,
+	    BYTE,
+	    INT16,
+	    UINT16,
+	    INT32,
+	    UINT32,
+	    FLOAT,
+	    DOUBLE,
+	    STRING
 	};
 
 	// Constructors
@@ -60,7 +60,7 @@ public:
 	explicit SingleValueContainer(Common::String value);
 
 	// Copy constructor
-	explicit SingleValueContainer(const SingleValueContainer& other);
+	explicit SingleValueContainer(const SingleValueContainer &other);
 
 	// Destructor
 	~SingleValueContainer();
@@ -91,10 +91,10 @@ public:
 	SingleValueContainer &operator=(const double &rhs);
 	SingleValueContainer &operator=(const Common::String &rhs);
 
-	SingleValueContainer& operator=(const SingleValueContainer &rhs);
+	SingleValueContainer &operator=(const SingleValueContainer &rhs);
 
 	/**
-	 * Retrieve a bool from the container. If the container is not storing a 
+	 * Retrieve a bool from the container. If the container is not storing a
 	 * bool, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -102,7 +102,7 @@ public:
 	 */
 	bool getBoolValue(bool *returnValue) const;
 	/**
-	 * Retrieve a byte from the container. If the container is not storing a 
+	 * Retrieve a byte from the container. If the container is not storing a
 	 * byte, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -110,7 +110,7 @@ public:
 	 */
 	bool getByteValue(byte *returnValue) const;
 	/**
-	 * Retrieve an int16 from the container. If the container is not storing an 
+	 * Retrieve an int16 from the container. If the container is not storing an
 	 * int16, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -118,7 +118,7 @@ public:
 	 */
 	bool getInt16Value(int16 *returnValue) const;
 	/**
-	 * Retrieve a uint16 from the container. If the container is not storing a 
+	 * Retrieve a uint16 from the container. If the container is not storing a
 	 * uint16, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -126,7 +126,7 @@ public:
 	 */
 	bool getUInt16Value(uint16 *returnValue) const;
 	/**
-	 * Retrieve an int32 from the container. If the container is not storing an 
+	 * Retrieve an int32 from the container. If the container is not storing an
 	 * int32, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -134,7 +134,7 @@ public:
 	 */
 	bool getInt32Value(int32 *returnValue) const;
 	/**
-	 * Retrieve a uint32 from the container. If the container is not storing a 
+	 * Retrieve a uint32 from the container. If the container is not storing a
 	 * uint32, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -142,7 +142,7 @@ public:
 	 */
 	bool getUInt32Value(uint32 *returnValue) const;
 	/**
-	 * Retrieve a float from the container. If the container is not storing a 
+	 * Retrieve a float from the container. If the container is not storing a
 	 * float, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -150,7 +150,7 @@ public:
 	 */
 	bool getFloatValue(float *returnValue) const;
 	/**
-	 * Retrieve a double from the container. If the container is not storing a 
+	 * Retrieve a double from the container. If the container is not storing a
 	 * double, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -158,9 +158,9 @@ public:
 	 */
 	bool getDoubleValue(double *returnValue) const;
 	/**
-	 * Retrieve a String from the container. If the container is not storing a 
+	 * Retrieve a String from the container. If the container is not storing a
 	 * string, this will return false and display a warning().
-	 * 
+	 *
 	 * Caution: Strings are internally stored as char[]. getStringValue uses
 	 * Common::String::operator=(char *) to do the assigment, which uses both
 	 * strlen() AND memmove().
diff --git a/engines/zvision/string_manager.cpp b/engines/zvision/string_manager.cpp
index ab42f3d3e0..f8a48682ac 100644
--- a/engines/zvision/string_manager.cpp
+++ b/engines/zvision/string_manager.cpp
@@ -36,7 +36,7 @@
 
 namespace ZVision {
 
-StringManager::StringManager(ZVision *engine) 
+StringManager::StringManager(ZVision *engine)
 	: _engine(engine) {
 }
 
@@ -218,7 +218,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
 	// Don't spam the user with warnings about UTF-16 support.
 	// Just do one warning per String
 	bool charOverflowWarning = false;
-	
+
 	uint16 value = stream.readUint16LE();
 	while (!stream.eos()) {
 		// Check for CRLF
@@ -235,7 +235,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
 			value = '?';
 		}
 		char charValue = (char)value;
-		
+
 		asciiString += charValue;
 
 		value = stream.readUint16LE();
diff --git a/engines/zvision/string_manager.h b/engines/zvision/string_manager.h
index 9cfed5261b..a6ae6d20d6 100644
--- a/engines/zvision/string_manager.h
+++ b/engines/zvision/string_manager.h
@@ -59,7 +59,7 @@ private:
 	};
 
 	enum {
-		NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
+	    NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
 	};
 
 private:
diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index dc7dd5b38c..c7cefd6150 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -34,18 +34,18 @@ namespace ZVision {
 
 TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
 	: SideFX(engine, key, SIDEFX_TIMER) {
-    if (_engine->getGameId() == GID_NEMESIS)
-        _timeLeft = timeInSeconds * 1000;
-    else if (_engine->getGameId() == GID_GRANDINQUISITOR)
-        _timeLeft = timeInSeconds * 100;
-    _engine->getScriptManager()->setStateValue(_key, 1);
+	if (_engine->getGameId() == GID_NEMESIS)
+		_timeLeft = timeInSeconds * 1000;
+	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
+		_timeLeft = timeInSeconds * 100;
+	_engine->getScriptManager()->setStateValue(_key, 1);
 }
 
 TimerNode::~TimerNode() {
-    if (_timeLeft <= 0)
+	if (_timeLeft <= 0)
 		_engine->getScriptManager()->setStateValue(_key, 2);
 	else
-        _engine->getScriptManager()->setStateValue(_key, _timeLeft); // If timer was stopped by stop or kill
+		_engine->getScriptManager()->setStateValue(_key, _timeLeft); // If timer was stopped by stop or kill
 }
 
 bool TimerNode::process(uint32 deltaTimeInMillis) {
diff --git a/engines/zvision/timer_node.h b/engines/zvision/timer_node.h
index 2caf43ad3c..4a9c95d72b 100644
--- a/engines/zvision/timer_node.h
+++ b/engines/zvision/timer_node.h
@@ -44,7 +44,9 @@ public:
 	bool process(uint32 deltaTimeInMillis);
 	void serialize(Common::WriteStream *stream);
 	void deserialize(Common::SeekableReadStream *stream);
-	inline bool needsSerialization() { return true; }
+	inline bool needsSerialization() {
+		return true;
+	}
 
 private:
 	int32 _timeLeft;
diff --git a/engines/zvision/truetype_font.cpp b/engines/zvision/truetype_font.cpp
index 289b5fbbaf..dde3b2dee5 100644
--- a/engines/zvision/truetype_font.cpp
+++ b/engines/zvision/truetype_font.cpp
@@ -39,12 +39,12 @@
 namespace ZVision {
 
 TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
-		: _engine(engine),
-		  _fontHeight(fontHeight),
-		  _font(0),
-		  _lineHeight(0),
-		  _maxCharWidth(0),
-		  _maxCharHeight(0) {
+	: _engine(engine),
+	  _fontHeight(fontHeight),
+	  _font(0),
+	  _lineHeight(0),
+	  _maxCharWidth(0),
+	  _maxCharHeight(0) {
 }
 
 TruetypeFont::~TruetypeFont(void) {
diff --git a/engines/zvision/truetype_font.h b/engines/zvision/truetype_font.h
index 33f016cffd..762657a5fb 100644
--- a/engines/zvision/truetype_font.h
+++ b/engines/zvision/truetype_font.h
@@ -60,10 +60,10 @@ public:
 	 *
 	 * @param filename    The file name of the .ttf file to load
 	 */
-	bool loadFile(const Common::String &filename);	
+	bool loadFile(const Common::String &filename);
 	/**
-	 * Renders the supplied text to a Surface using 0x0 as the 
-	 * background color. 
+	 * Renders the supplied text to a Surface using 0x0 as the
+	 * background color.
 	 *
 	 * @param text         The to render
 	 * @param textColor    The color to render the text with
diff --git a/engines/zvision/utility.cpp b/engines/zvision/utility.cpp
index d973cb2f4c..1d96b33021 100644
--- a/engines/zvision/utility.cpp
+++ b/engines/zvision/utility.cpp
@@ -39,7 +39,7 @@ void writeFileContentsToFile(const Common::String &sourceFile, const Common::Str
 		return;
 	}
 
-	byte* buffer = new byte[f.size()];
+	byte *buffer = new byte[f.size()];
 	f.read(buffer, f.size());
 
 	Common::DumpFile dumpFile;
@@ -63,10 +63,10 @@ void trimCommentsAndWhiteSpace(Common::String *string) {
 }
 
 void tryToDumpLine(const Common::String &key,
-				   Common::String &line,
-				   Common::HashMap<Common::String, byte> *count,
-				   Common::HashMap<Common::String, bool> *fileAlreadyUsed,
-				   Common::DumpFile &output) {
+                   Common::String &line,
+                   Common::HashMap<Common::String, byte> *count,
+                   Common::HashMap<Common::String, bool> *fileAlreadyUsed,
+                   Common::DumpFile &output) {
 	const byte numberOfExamplesPerType = 8;
 
 	if ((*count)[key] < numberOfExamplesPerType && !(*fileAlreadyUsed)[key]) {
@@ -203,7 +203,7 @@ void convertRawToWav(const Common::String &inputFile, ZVision *engine, const Com
 		return;
 
 	Audio::AudioStream *audioStream = makeRawZorkStream(inputFile, engine);
-	
+
 	Common::DumpFile output;
 	output.open(outputFile);
 
diff --git a/engines/zvision/utility.h b/engines/zvision/utility.h
index fb571f3fe8..8da88cf28c 100644
--- a/engines/zvision/utility.h
+++ b/engines/zvision/utility.h
@@ -72,8 +72,8 @@ void removeDuplicateEntries(Common::Array<T> &container) {
 	uint newLength = 1;
 	uint j;
 
-	for(uint i = 1; i < container.size(); i++) {
-		for(j = 0; j < newLength; j++) {
+	for (uint i = 1; i < container.size(); i++) {
+		for (j = 0; j < newLength; j++) {
 			if (container[i] == container[j]) {
 				break;
 			}
@@ -93,7 +93,7 @@ void removeDuplicateEntries(Common::Array<T> &container) {
 }
 
 /**
- * Gets the name of the file (including extension). Forward or back slashes 
+ * Gets the name of the file (including extension). Forward or back slashes
  * are interpreted as directory changes
  *
  * @param fullPath    A full or partial path to the file. Ex: folderOne/folderTwo/file.txt
diff --git a/engines/zvision/video.cpp b/engines/zvision/video.cpp
index cd11618e67..6b7299ea84 100644
--- a/engines/zvision/video.cpp
+++ b/engines/zvision/video.cpp
@@ -66,7 +66,7 @@ void scaleBuffer(const byte *src, byte *dst, uint32 srcWidth, uint32 srcHeight,
 				const byte color2 = *srcPtr++;
 
 				for (uint i = 0; i < scaleAmount; ++i) {
-					uint index = i *2;
+					uint index = i * 2;
 
 					dst[index] = color;
 					dst[index + 1] = color2;
diff --git a/engines/zvision/zfs_archive.cpp b/engines/zvision/zfs_archive.cpp
index 24cff27fc4..3f5ff5a0d4 100644
--- a/engines/zvision/zfs_archive.cpp
+++ b/engines/zvision/zfs_archive.cpp
@@ -52,7 +52,7 @@ ZfsArchive::ZfsArchive(const Common::String &fileName, Common::SeekableReadStrea
 ZfsArchive::~ZfsArchive() {
 	debug(1, "ZfsArchive Destructor Called");
 	ZfsEntryHeaderMap::iterator it = _entryHeaders.begin();
-	for ( ; it != _entryHeaders.end(); ++it) {
+	for (; it != _entryHeaders.end(); ++it) {
 		delete it->_value;
 	}
 }
@@ -79,7 +79,7 @@ void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
 		// Read in each entry header
 		for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
 			ZfsEntryHeader entryHeader;
-			
+
 			entryHeader.name = readEntryName(stream);
 			entryHeader.offset = stream->readUint32LE();
 			entryHeader.id = stream->readUint32LE();
@@ -138,7 +138,7 @@ Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::
 	zfsArchive.seek(entryHeader->offset);
 
 	// This *HAS* to be malloc (not new[]) because MemoryReadStream uses free() to free the memory
-	byte* buffer = (byte *)malloc(entryHeader->size);
+	byte *buffer = (byte *)malloc(entryHeader->size);
 	zfsArchive.read(buffer, entryHeader->size);
 	// Decrypt the data in place
 	if (_header.xorKey != 0)
diff --git a/engines/zvision/zfs_archive.h b/engines/zvision/zfs_archive.h
index d7b45e4b47..fc4be5aa1b 100644
--- a/engines/zvision/zfs_archive.h
+++ b/engines/zvision/zfs_archive.h
@@ -53,7 +53,7 @@ struct ZfsEntryHeader {
 	uint32 unknown;
 };
 
-typedef Common::HashMap<Common::String, ZfsEntryHeader*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
+typedef Common::HashMap<Common::String, ZfsEntryHeader *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
 
 class ZfsArchive : public Common::Archive {
 public:
diff --git a/engines/zvision/zork_avi_decoder.h b/engines/zvision/zork_avi_decoder.h
index dc3e3327ed..7ddecce694 100644
--- a/engines/zvision/zork_avi_decoder.h
+++ b/engines/zvision/zork_avi_decoder.h
@@ -66,5 +66,5 @@ private:
 };
 
 } // End of namespace ZVision
- 
+
 #endif
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 029600b758..ce83add1df 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -191,9 +191,9 @@ bool RawZorkStream::rewind() {
 }
 
 Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stream,
-                                                int rate,
-								                bool stereo,
-                                                DisposeAfterUse::Flag disposeAfterUse) {
+        int rate,
+        bool stereo,
+        DisposeAfterUse::Flag disposeAfterUse) {
 	if (stereo)
 		assert(stream->size() % 2 == 0);
 
@@ -201,9 +201,9 @@ Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stre
 }
 
 Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
-                                                int rate,
-								                bool stereo,
-                                                DisposeAfterUse::Flag disposeAfterUse) {
+        int rate,
+        bool stereo,
+        DisposeAfterUse::Flag disposeAfterUse) {
 	return makeRawZorkStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, stereo, DisposeAfterUse::YES);
 }
 
@@ -221,14 +221,13 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 			if (RawZorkStream::_zNemSoundParamLookupTable[i].identifier == (fileName[6]))
 				soundParams = RawZorkStream::_zNemSoundParamLookupTable[i];
 		}
-	}
-	else if (engine->getGameId() == GID_GRANDINQUISITOR) {
+	} else if (engine->getGameId() == GID_GRANDINQUISITOR) {
 		for (int i = 0; i < 6; ++i) {
 			if (RawZorkStream::_zgiSoundParamLookupTable[i].identifier == (fileName[7]))
 				soundParams = RawZorkStream::_zgiSoundParamLookupTable[i];
 		}
 	}
-	
+
 	if (soundParams.packed) {
 		return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES);
 	} else {
diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h
index 1f261ae139..29b555912d 100644
--- a/engines/zvision/zork_raw.h
+++ b/engines/zvision/zork_raw.h
@@ -106,11 +106,19 @@ private:
 public:
 	int readBuffer(int16 *buffer, const int numSamples);
 
-	bool isStereo() const { return true; }
-	bool endOfData() const { return _endOfData; }
+	bool isStereo() const {
+		return true;
+	}
+	bool endOfData() const {
+		return _endOfData;
+	}
 
-	int getRate() const { return _rate; }
-	Audio::Timestamp getLength() const { return _playtime; }
+	int getRate() const {
+		return _rate;
+	}
+	Audio::Timestamp getLength() const {
+		return _playtime;
+	}
 
 	bool rewind();
 };
@@ -125,9 +133,9 @@ public:
  * @return           The new SeekableAudioStream (or 0 on failure).
  */
 Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
-                                                int rate,
-                                                bool stereo,
-                                                DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
+        int rate,
+        bool stereo,
+        DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
 
 /**
  * Creates an audio stream, which plays from the given stream.
@@ -138,9 +146,9 @@ Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
  * @return           The new SeekableAudioStream (or 0 on failure).
  */
 Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stream,
-                                                int rate,
-                                                bool stereo,
-                                                DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
+        int rate,
+        bool stereo,
+        DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
 
 Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine);
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 940e01ae20..8be85d39d4 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -47,28 +47,28 @@
 
 
 namespace ZVision {
- 
+
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
-		: Engine(syst),
-		  _gameDescription(gameDesc),
-		  _workingWindow_ZGI((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2) + WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2) + WORKING_WINDOW_HEIGHT),
-		  _workingWindow_ZNM((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2) + ZNM_WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2) + ZNM_WORKING_WINDOW_HEIGHT),
-		  _workingWindow(gameDesc->gameId == GID_NEMESIS ? _workingWindow_ZNM : _workingWindow_ZGI),
-		  _pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /*RGB 565*/
-		  _desiredFrameTime(33), /* ~30 fps */
-		  _clock(_system),
-		  _scriptManager(nullptr),
-		  _renderManager(nullptr),
-		  _saveManager(nullptr),
-		  _stringManager(nullptr),
-		  _cursorManager(nullptr) {
- 
+	: Engine(syst),
+	  _gameDescription(gameDesc),
+	  _workingWindow_ZGI((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2) + WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2) + WORKING_WINDOW_HEIGHT),
+	  _workingWindow_ZNM((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2) + ZNM_WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2) + ZNM_WORKING_WINDOW_HEIGHT),
+	  _workingWindow(gameDesc->gameId == GID_NEMESIS ? _workingWindow_ZNM : _workingWindow_ZGI),
+	  _pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /*RGB 565*/
+	  _desiredFrameTime(33), /* ~30 fps */
+	  _clock(_system),
+	  _scriptManager(nullptr),
+	  _renderManager(nullptr),
+	  _saveManager(nullptr),
+	  _stringManager(nullptr),
+	  _cursorManager(nullptr) {
+
 	debug(1, "ZVision::ZVision");
 }
 
 ZVision::~ZVision() {
 	debug(1, "ZVision::~ZVision");
- 
+
 	// Dispose of resources
 	delete _console;
 	delete _cursorManager;
@@ -77,15 +77,15 @@ ZVision::~ZVision() {
 	delete _renderManager;
 	delete _scriptManager;
 	delete _rnd;
- 
+
 	// Remove all of our debug levels
 	DebugMan.clearAllDebugChannels();
 }
 
 void ZVision::initialize() {
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
-	// TODO: There are 10 file clashes when we flatten the directories. 
-	// From a quick look, the files are exactly the same, so it shouldn't matter. 
+	// TODO: There are 10 file clashes when we flatten the directories.
+	// From a quick look, the files are exactly the same, so it shouldn't matter.
 	// But I'm noting it here just in-case it does become a problem.
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4, true);
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4, true);
@@ -143,7 +143,7 @@ Common::Error ZVision::run() {
 
 		processEvents();
 
-		// Call _renderManager->update() first so the background renders 
+		// Call _renderManager->update() first so the background renders
 		// before anything that puzzles/controls will render
 		_renderManager->update(deltaTime);
 		_scriptManager->update(deltaTime);
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 89aa60fe73..10711b1605 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -51,7 +51,7 @@ class CursorManager;
 class StringManager;
 class SaveManager;
 class RlfAnimation;
- 
+
 class ZVision : public Engine {
 public:
 	ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc);
@@ -68,19 +68,19 @@ public:
 
 private:
 	enum {
-		WINDOW_WIDTH = 640,
-		WINDOW_HEIGHT = 480,
+	    WINDOW_WIDTH = 640,
+	    WINDOW_HEIGHT = 480,
 
-		//Zork nemesis working window sizes
-		ZNM_WORKING_WINDOW_WIDTH  = 512,
-		ZNM_WORKING_WINDOW_HEIGHT = 320,
+	    //Zork nemesis working window sizes
+	    ZNM_WORKING_WINDOW_WIDTH  = 512,
+	    ZNM_WORKING_WINDOW_HEIGHT = 320,
 
-		//ZGI(and default) working window sizes
-		WORKING_WINDOW_WIDTH  = 640,
-		WORKING_WINDOW_HEIGHT = 344,
+	    //ZGI(and default) working window sizes
+	    WORKING_WINDOW_WIDTH  = 640,
+	    WORKING_WINDOW_HEIGHT = 344,
 
-		ROTATION_SCREEN_EDGE_OFFSET = 60,
-		MAX_ROTATION_SPEED = 400 // Pixels per second
+	    ROTATION_SCREEN_EDGE_OFFSET = 60,
+	    MAX_ROTATION_SPEED = 400 // Pixels per second
 	};
 
 	Console *_console;
@@ -112,13 +112,27 @@ public:
 	Common::Error run();
 	void pauseEngineIntern(bool pause);
 
-	ScriptManager *getScriptManager() const { return _scriptManager; }
-	RenderManager *getRenderManager() const { return _renderManager; }
-	CursorManager *getCursorManager() const { return _cursorManager; }
-	SaveManager *getSaveManager() const { return _saveManager; }
-	StringManager *getStringManager() const { return _stringManager; }
-	Common::RandomSource *getRandomSource() const { return _rnd; }
-	ZVisionGameId getGameId() const { return _gameDescription->gameId; }
+	ScriptManager *getScriptManager() const {
+		return _scriptManager;
+	}
+	RenderManager *getRenderManager() const {
+		return _renderManager;
+	}
+	CursorManager *getCursorManager() const {
+		return _cursorManager;
+	}
+	SaveManager *getSaveManager() const {
+		return _saveManager;
+	}
+	StringManager *getStringManager() const {
+		return _stringManager;
+	}
+	Common::RandomSource *getRandomSource() const {
+		return _rnd;
+	}
+	ZVisionGameId getGameId() const {
+		return _gameDescription->gameId;
+	}
 
 	/**
 	 * Play a video until it is finished. This is a blocking call. It will call
@@ -149,5 +163,5 @@ private:
 };
 
 } // End of namespace ZVision
- 
+
 #endif
-- 
cgit v1.2.3


From bbe29500ccf0dd6d31ebb5bfcbbf707c74a4500a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 20 Oct 2013 18:35:11 +0000
Subject: ZVISION: Forgotten change cursos to pressed in ZGI code.

---
 engines/zvision/cursor_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index 015e2b014f..385e4dcc9c 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -105,6 +105,7 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed)
 					char buffer[25];
 					strcpy(buffer, _zgiCursorFileNames[i]);
 					buffer[3] += 2;
+					changeCursor(ZorkCursor(buffer));
 				}
 				return;
 			}
-- 
cgit v1.2.3


From dbdefe23e9861781af63608cd450cfaed86de89a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 20 Oct 2013 20:06:12 +0000
Subject: ZVISION: New render functions for rendering surface-to-surface.

---
 engines/zvision/render_manager.cpp | 167 +++++++++++++++++++++++++++++++++++++
 engines/zvision/render_manager.h   |  80 ++++++++++++++++++
 2 files changed, 247 insertions(+)

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index 1406fbc828..a240e766df 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -159,6 +159,173 @@ void RenderManager::clearWorkingWindowTo555Color(uint16 color) {
 	}
 }
 
+void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect) {
+	if (src.format != dst.format)
+		return;
+
+	Common::Rect dstRect = _dstRect;
+	if (dstRect.isEmpty())
+		dstRect = Common::Rect(dst.w, dst.h);
+	dstRect.clip(dst.w, dst.h);
+
+	Common::Rect srcRect = _srcRect;
+	if (srcRect.isEmpty())
+		srcRect = Common::Rect(src.w, src.h);
+	srcRect.clip(src.w, src.h);
+
+	if (!srcRect.isValidRect() || !dstRect.isValidRect())
+		return;
+
+	Common::Rect rendRect = srcRect;
+	rendRect.clip(dstRect.width(), dstRect.height());
+
+	if (rendRect.isEmpty() || !rendRect.isValidRect())
+		return;
+
+	// Copy rendRect from src surface to dst surface
+	byte *src_buf = (byte *)src.getBasePtr(rendRect.left, rendRect.top);
+	byte *dst_buf = (byte *)dst.getBasePtr(dstRect.left, dstRect.top);
+
+	int32 w = rendRect.width();
+	int32 h = rendRect.height();
+
+	for (int32 y = 0; y < h; y++) {
+		memcpy(dst_buf, src_buf, w * src.format.bytesPerPixel);
+		src_buf += src.pitch;
+		dst_buf += dst.pitch;
+	}
+}
+
+void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect, uint32 keycolor) {
+	if (src.format != dst.format)
+		return;
+
+	Common::Rect dstRect = _dstRect;
+	if (dstRect.isEmpty())
+		dstRect = Common::Rect(dst.w, dst.h);
+	dstRect.clip(dst.w, dst.h);
+
+	Common::Rect srcRect = _srcRect;
+	if (srcRect.isEmpty())
+		srcRect = Common::Rect(src.w, src.h);
+	srcRect.clip(src.w, src.h);
+
+	if (!srcRect.isValidRect() || !dstRect.isValidRect())
+		return;
+
+	Common::Rect rendRect = srcRect;
+	rendRect.clip(dstRect.width(), dstRect.height());
+
+	if (rendRect.isEmpty() || !rendRect.isValidRect())
+		return;
+
+	uint32 _keycolor = keycolor & ((1 << (src.format.bytesPerPixel << 3)) - 1);
+
+	// Copy rendRect from src surface to dst surface
+	byte *src_buf = (byte *)src.getBasePtr(rendRect.left, rendRect.top);
+	byte *dst_buf = (byte *)dst.getBasePtr(dstRect.left, dstRect.top);
+
+	int32 w = rendRect.width();
+	int32 h = rendRect.height();
+
+	for (int32 y = 0; y < h; y++) {
+		switch (src.format.bytesPerPixel) {
+		case 1: {
+			uint *src_tmp = (uint *)src_buf;
+			uint *dst_tmp = (uint *)dst_buf;
+			for (int32 x = 0; x < w; x++) {
+				if (*src_tmp != _keycolor)
+					*dst_tmp = *src_tmp;
+				src_tmp++;
+				dst_tmp++;
+			}
+		}
+		break;
+
+		case 2: {
+			uint16 *src_tmp = (uint16 *)src_buf;
+			uint16 *dst_tmp = (uint16 *)dst_buf;
+			for (int32 x = 0; x < w; x++) {
+				if (*src_tmp != _keycolor)
+					*dst_tmp = *src_tmp;
+				src_tmp++;
+				dst_tmp++;
+			}
+		}
+		break;
+
+		case 4: {
+			uint32 *src_tmp = (uint32 *)src_buf;
+			uint32 *dst_tmp = (uint32 *)dst_buf;
+			for (int32 x = 0; x < w; x++) {
+				if (*src_tmp != _keycolor)
+					*dst_tmp = *src_tmp;
+				src_tmp++;
+				dst_tmp++;
+			}
+		}
+		break;
+
+		default:
+			break;
+		}
+		src_buf += src.pitch;
+		dst_buf += dst.pitch;
+	}
+}
+
+void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt) {
+	if (!Common::Rect(dst.w, dst.h).contains(dstPt))
+		return;
+	Common::Rect dstRect(dstPt.x, dstPt.y, dst.w, dst.h);
+	copyRectToSurface(src, dst, srcRect, dstRect);
+}
+
+void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 keycolor) {
+	if (!Common::Rect(dst.w, dst.h).contains(dstPt))
+		return;
+	Common::Rect dstRect(dstPt.x, dstPt.y, dst.w, dst.h);
+	copyRectToSurface(src, dst, srcRect, dstRect, keycolor);
+}
+
+void RenderManager::renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY) {
+	Graphics::Surface surface;
+	readImageToSurface(fileName, surface);
+
+	Common::Rect srcRect(surface.w, surface.h);
+	Common::Point dstPt(destX, destY);
+
+	copyRectToSurface(surface, _currentBackground, srcRect, dstPt);
+	moveBackground(0);
+}
+
+void RenderManager::renderImageToBackground(Graphics::Surface &surface, int16 destX, int16 destY) {
+	Common::Rect srcRect(surface.w, surface.h);
+	Common::Point dstPt(destX, destY);
+
+	copyRectToSurface(surface, _currentBackground, srcRect, dstPt);
+	moveBackground(0);
+}
+
+void RenderManager::renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, uint32 keycolor) {
+	Graphics::Surface surface;
+	readImageToSurface(fileName, surface);
+
+	Common::Rect srcRect(surface.w, surface.h);
+	Common::Point dstPt(destX, destY);
+
+	copyRectToSurface(surface, _currentBackground, srcRect, dstPt, keycolor);
+	moveBackground(0);
+}
+
+void RenderManager::renderImageToBackground(Graphics::Surface &surface, int16 destX, int16 destY, uint32 keycolor) {
+	Common::Rect srcRect(surface.w, surface.h);
+	Common::Point dstPt(destX, destY);
+
+	copyRectToSurface(surface, _currentBackground, srcRect, dstPt, keycolor);
+	moveBackground(0);
+}
+
 void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {
 	int16 subRectX = 0;
 	int16 subRectY = 0;
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 9fedd1d8dd..37bfcfa20d 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -217,6 +217,86 @@ public:
 	 */
 	void renderImageToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap = false);
 
+	/**
+	 * Copies a rectangla of source surface and copy to destination rect.
+	 *
+	 * @param src        Source surface
+	 * @param dst        Destenation surface
+	 * @param srcRect    Rect of source surface
+	 * @param dstRect    Rect for destenation surface
+	 */
+	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect);
+
+	/**
+	 * Copies a rectangla of source surface and copy to destination rect.
+	 *
+	 * @param src        Source surface
+	 * @param dst        Destenation surface
+	 * @param srcRect    Rect of source surface
+	 * @param dstRect    Rect for destenation surface
+	 * @param colorkey   Transparent color
+	 */
+	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect, uint32 colorkey);
+
+	/**
+	 * Copies a rectangla of source surface and copy to destination rect.
+	 *
+	 * @param src        Source surface
+	 * @param dst        Destenation surface
+	 * @param srcRect    Rect of source surface
+	 * @param dstPt      Point for destenation surface
+	 */
+	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt);
+
+	/**
+	 * Copies a rectangla of source surface and copy to destination rect.
+	 *
+	 * @param src        Source surface
+	 * @param dst        Destenation surface
+	 * @param srcRect    Rect of source surface
+	 * @param dstPt      Point for destenation surface
+	 * @param colorkey   Transparent color
+	 */
+	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 colorkey);
+
+	/**
+	 * Blits the image or a portion of the image to the background.
+	 *
+	 * @param fileName        Name of the image file
+	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
+	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
+	 */
+	void renderImageToBackground(const Common::String &fileName, int16 destinationX, int16 destinationY);
+
+	/**
+	 * Blits the image or a portion of the image to the background.
+	 *
+	 * @param surface          Surface to read the image data from
+	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
+	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
+	 */
+	void renderImageToBackground(Graphics::Surface &surface, int16 destinationX, int16 destinationY);
+
+	/**
+	 * Blits the image or a portion of the image to the background.
+	 *
+	 * @param fileName        Name of the image file
+	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
+	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
+	 * @param colorkey   Transparent color
+	 */
+	void renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, uint32 colorkey);
+
+	/**
+	 * Blits the image or a portion of the image to the background.
+	 *
+	 * @param surface          Surface to read the image data from
+	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
+	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
+	 * @param colorkey   Transparent color
+	 */
+	void renderImageToBackground(Graphics::Surface &surface, int16 destX, int16 destY, uint32 colorkey);
+
 	/**
 	 * Sets the current background image to be used by the RenderManager and immediately
 	 * blits it to the screen. (It won't show up until the end of the frame)
-- 
cgit v1.2.3


From db3d154c63669752d0b1d75dd8f75707b671d862 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 20 Oct 2013 20:07:31 +0000
Subject: ZVISION: SetPartialScreen must update part of currentBackground
 image.

---
 engines/zvision/actions.cpp | 8 ++++----
 engines/zvision/actions.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 1d4ce9c604..21c01546fd 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -321,10 +321,10 @@ ActionSetPartialScreen::ActionSetPartialScreen(const Common::String &line) {
 bool ActionSetPartialScreen::execute(ZVision *engine) {
 	RenderManager *renderManager = engine->getRenderManager();
 
-	if (_backgroundColor > 0) {
-		renderManager->clearWorkingWindowTo555Color(_backgroundColor);
-	}
-	renderManager->renderImageToScreen(_fileName, _x, _y);
+	if (_backgroundColor >= 0)
+		renderManager->renderImageToBackground(_fileName, _x, _y, _backgroundColor);
+	else
+		renderManager->renderImageToBackground(_fileName, _x, _y);
 
 	return true;
 }
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index e7a4ea302f..15923d66d1 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -300,7 +300,7 @@ private:
 	uint _x;
 	uint _y;
 	Common::String _fileName;
-	uint16 _backgroundColor;
+	int32 _backgroundColor;
 };
 
 class ActionSetScreen : public ResultAction {
-- 
cgit v1.2.3


From 2e0e9dc1f64451485532bbd5b3532b6155288f6c Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 21 Oct 2013 16:39:40 +0700
Subject: ZVISION: Fix changelocation sscanf format string to original format.

---
 engines/zvision/actions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 21c01546fd..4976bd4862 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -86,7 +86,7 @@ bool ActionAttenuate::execute(ZVision *engine) {
 //////////////////////////////////////////////////////////////////////////////
 
 ActionChangeLocation::ActionChangeLocation(const Common::String &line) {
-	sscanf(line.c_str(), "%*[^(](%c,%c,%c%c,%u)", &_world, &_room, &_node, &_view, &_offset);
+	sscanf(line.c_str(), "%*[^(](%c, %c, %c%c, %u)", &_world, &_room, &_node, &_view, &_offset);
 }
 
 bool ActionChangeLocation::execute(ZVision *engine) {
-- 
cgit v1.2.3


From 9888e66603e1377ff370cbf667efba9d49d5e45d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 22 Oct 2013 08:24:30 +0000
Subject: ZVISION: Added system StateKey names enum.

---
 engines/zvision/script_manager.h | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index d47ee94da4..767919ef0e 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -40,6 +40,61 @@ namespace ZVision {
 
 class ZVision;
 
+enum StateKey {
+	StateKey_World = 3,
+	StateKey_Room  = 4,
+	StateKey_Node  = 5,
+	StateKey_View  = 6,
+	StateKey_ViewPos = 7,
+	StateKey_KeyPress = 8,
+	StateKey_InventoryItem = 9,
+	StateKey_LMouse = 10,
+	StateKey_Rounds = 12,
+	StateKey_Venus = 13,
+	StateKey_RMouse = 18,
+	StateKey_MenuState = 19,
+	StateKey_RestoreFlag = 20,
+	StateKey_Quitting = 39,
+	StateKey_LastWorld = 40,
+	StateKey_LastRoom = 41,
+	StateKey_LastNode = 42,
+	StateKey_LastView = 43,
+	StateKey_LastViewPos = 44,
+	StateKey_Menu_LastWorld = 45,
+	StateKey_Menu_LastRoom = 46,
+	StateKey_Menu_LastNode = 47,
+	StateKey_Menu_LastView = 48,
+	StateKey_Menu_LastViewPos = 49,
+	StateKey_KbdRotateSpeed = 50,
+	StateKey_Subtitles = 51,
+	StateKey_StreamSkipKey = 52,
+	StateKey_RotateSpeed = 53,
+	StateKey_Volume = 56,
+	StateKey_Qsound = 57,
+	StateKey_VenusEnable = 58,
+	StateKey_HighQuality = 59,
+	StateKey_VideoLineSkip = 65,
+	StateKey_Platform = 66,
+	StateKey_InstallLevel = 67,
+	StateKey_CountryCode = 68,
+	StateKey_CPU = 69,
+	StateKey_MovieCursor = 70,
+	StateKey_NoTurnAnim = 71,
+	StateKey_WIN958 = 72,
+	StateKey_ShowErrorDlg = 73,
+	StateKey_DebugCheats = 74,
+	StateKey_JapanFonts = 75,
+	StateKey_Brightness = 77,
+	StateKey_EF9_B = 91,
+	StateKey_EF9_G = 92,
+	StateKey_EF9_R = 93,
+	StateKey_EF9_Speed = 94,
+	StateKey_Inv_0_Slot = 100,
+	StateKey_Inv_1_Slot = 101,
+	StateKey_Inv_49_Slot = 149,
+	StateKey_Inv_TotalSlots = 150
+};
+
 struct Location {
 	Location() : world('g'), room('a'), node('r'), view('y'), offset(0) {}
 
-- 
cgit v1.2.3


From 3e51ed6a785ffb1871ffdbfff6aaad309959a1ee Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 22 Oct 2013 12:02:03 +0700
Subject: ZVISION: Set right reaction for mouse up/down events.

---
 engines/zvision/events.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp
index 1103dc3000..ede91273e6 100644
--- a/engines/zvision/events.cpp
+++ b/engines/zvision/events.cpp
@@ -43,17 +43,28 @@ void ZVision::processEvents() {
 	while (_eventMan->pollEvent(_event)) {
 		switch (_event.type) {
 		case Common::EVENT_LBUTTONDOWN:
+			_cursorManager->cursorDown(true);
+			_scriptManager->setStateValue(StateKey_LMouse, 1);
 			onMouseDown(_event.mouse);
 			break;
 
 		case Common::EVENT_LBUTTONUP:
+			_cursorManager->cursorDown(false);
+			_scriptManager->setStateValue(StateKey_LMouse, 0);
 			onMouseUp(_event.mouse);
 			break;
 
 		case Common::EVENT_RBUTTONDOWN:
+			_cursorManager->cursorDown(true);
+			_scriptManager->setStateValue(StateKey_RMouse, 1);
 			// TODO: Inventory logic
 			break;
 
+		case Common::EVENT_RBUTTONUP:
+			_cursorManager->cursorDown(false);
+			_scriptManager->setStateValue(StateKey_RMouse, 0);
+			break;
+
 		case Common::EVENT_MOUSEMOVE:
 			onMouseMove(_event.mouse);
 			break;
@@ -87,15 +98,11 @@ void ZVision::processEvents() {
 }
 
 void ZVision::onMouseDown(const Common::Point &pos) {
-	_cursorManager->cursorDown(true);
-
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
 	_scriptManager->onMouseDown(pos, imageCoord);
 }
 
 void ZVision::onMouseUp(const Common::Point &pos) {
-	_cursorManager->cursorDown(false);
-
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
 	_scriptManager->onMouseUp(pos, imageCoord);
 }
-- 
cgit v1.2.3


From 803ff02136ddc102084094430aabc366192afe99 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 24 Oct 2013 22:25:34 +0000
Subject: ZVISION: New data types for script files and puzzle reference.

---
 engines/zvision/script_manager.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 767919ef0e..6dd2190cf1 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -119,6 +119,24 @@ public:
 
 private:
 	ZVision *_engine;
+
+	struct script_scope {
+		uint32 proc_count;
+
+		PuzzleList *scope_queue; // For adding puzzles to queue
+		PuzzleList *exec_queue;  // Switch to it when execute
+		PuzzleList _priv_queue_one;
+		PuzzleList _priv_queue_two;
+
+		PuzzleList  _puzzles;
+		ControlList _controls;
+	};
+
+	struct puzzle_ref {
+		Puzzle *puz;
+		script_scope *scope;
+	};
+
 	/**
 	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and
 	 * mutators getStateValue() and setStateValue(). This ensures that Puzzles that reference a
-- 
cgit v1.2.3


From d8ad0e5235b036a69bdcae68ec99020de95c47bc Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 24 Oct 2013 22:45:55 +0000
Subject: ZVISION: Added clean function for script scope and body for queue
 routine.

---
 engines/zvision/script_manager.cpp | 21 +++++++++++++++++++++
 engines/zvision/script_manager.h   |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 72e67bfa7f..515fd7a450 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -216,6 +216,24 @@ void ScriptManager::cleanStateTable() {
 	}
 }
 
+void ScriptManager::cleanScriptScope(script_scope &scope) {
+	scope._priv_queue_one.clear();
+	scope._priv_queue_two.clear();
+	scope.scope_queue = &scope._priv_queue_one;
+	scope.exec_queue = &scope._priv_queue_two;
+	for (PuzzleList::iterator iter = scope._puzzles.begin(); iter != scope._puzzles.end(); ++iter)
+		delete(*iter);
+
+	scope._puzzles.clear();
+
+	for (ControlList::iterator iter = scope._controls.begin(); iter != scope._controls.end(); ++iter)
+		delete(*iter);
+
+	scope._controls.clear();
+
+	scope.proc_count = 0;
+}
+
 uint ScriptManager::getStateValue(uint32 key) {
 	if (_globalState.contains(key))
 		return _globalState[key];
@@ -223,6 +241,9 @@ uint ScriptManager::getStateValue(uint32 key) {
 		return 0;
 }
 
+void ScriptManager::queuePuzzles(uint32 key) {
+}
+
 void ScriptManager::setStateValue(uint32 key, uint value) {
 	_globalState[key] = value;
 
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 6dd2190cf1..a5324533c0 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -163,6 +163,7 @@ private:
 public:
 	void initialize();
 	void update(uint deltaTimeMillis);
+	void queuePuzzles(uint32 key);
 
 	uint getStateValue(uint32 key);
 	void setStateValue(uint32 key, uint value);
@@ -228,6 +229,7 @@ private:
 	void updateNodes(uint deltaTimeMillis);
 	void checkPuzzleCriteria();
 	void cleanStateTable();
+	void cleanScriptScope(script_scope &scope);
 
 // TODO: Make this private. It was only made public so Console::cmdParseAllScrFiles() could use it
 public:
-- 
cgit v1.2.3


From c87ca1bc9c9023b2f85b5151e790f6ebe60ea2c2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 08:13:59 +0000
Subject: ZVISION: Add flag to puzzle structure for use with new
 referenceTable.

---
 engines/zvision/puzzle.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index 2eea52f80b..1b30829462 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -74,6 +74,7 @@ struct Puzzle {
 	// This has to be list of pointers because ResultAction is abstract
 	Common::List<ResultAction *> resultActions;
 	uint flags;
+	bool addedBySetState;
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 91cbb1ec790a604309c766ef38f6a2704922365b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 14:52:40 +0700
Subject: ZVISION: Move setState to use queuePuzzle.

---
 engines/zvision/script_manager.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 515fd7a450..7531182e95 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -245,13 +245,12 @@ void ScriptManager::queuePuzzles(uint32 key) {
 }
 
 void ScriptManager::setStateValue(uint32 key, uint value) {
-	_globalState[key] = value;
-
-	if (_referenceTable.contains(key)) {
-		for (Common::Array<Puzzle *>::iterator iter = _referenceTable[key].begin(); iter != _referenceTable[key].end(); ++iter) {
-			_puzzlesToCheck.push((*iter));
-		}
-	}
+	if (value == 0)
+		_globalState.erase(key);
+	else
+		_globalState[key] = value;
+	debug("setStateValue %d %d\n", key , value);
+	queuePuzzles(key);
 }
 
 void ScriptManager::addToStateValue(uint32 key, uint valueToAdd) {
-- 
cgit v1.2.3


From 8e4070c68b9a6a5e81d80f6805a199c2872089fe Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 15:39:38 +0700
Subject: ZVISION: Added global StateFlags and set/get/unset functions.

---
 engines/zvision/script_manager.cpp | 24 ++++++++++++++++++++++++
 engines/zvision/script_manager.h   |  6 ++++++
 2 files changed, 30 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 7531182e95..01a6e6d09e 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -253,6 +253,30 @@ void ScriptManager::setStateValue(uint32 key, uint value) {
 	queuePuzzles(key);
 }
 
+uint ScriptManager::getStateFlag(uint32 key) {
+	if (_globalStateFlags.contains(key))
+		return _globalStateFlags[key];
+	else
+		return 0;
+}
+
+void ScriptManager::setStateFlag(uint32 key, uint value) {
+	queuePuzzles(key);
+
+	_globalStateFlags[key] |= value;
+}
+
+void ScriptManager::unsetStateFlag(uint32 key, uint value) {
+	queuePuzzles(key);
+
+	if (_globalStateFlags.contains(key)) {
+		_globalStateFlags[key] &= ~value;
+
+		if (_globalStateFlags[key] == 0)
+			_globalStateFlags.erase(key);
+	}
+}
+
 void ScriptManager::addToStateValue(uint32 key, uint valueToAdd) {
 	_globalState[key] += valueToAdd;
 }
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index a5324533c0..71fefaf41f 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -143,6 +143,8 @@ private:
 	 * particular state key are checked after the key is modified.
 	 */
 	StateMap _globalState;
+	/** Holds execute flags */
+	StateMap _globalStateFlags;
 	/** References _globalState keys to Puzzles */
 	PuzzleMap _referenceTable;
 	/** Holds the Puzzles that should be checked this frame */
@@ -169,6 +171,10 @@ public:
 	void setStateValue(uint32 key, uint value);
 	void addToStateValue(uint32 key, uint valueToAdd);
 
+	uint getStateFlag(uint32 key);
+	void setStateFlag(uint32 key, uint value);
+	void unsetStateFlag(uint32 key, uint value);
+
 	void addControl(Control *control);
 	Control *getControl(uint32 key);
 
-- 
cgit v1.2.3


From c0a709dc23c689b094c2dab1038447267d6fb8bd Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 17:12:08 +0700
Subject: ZVISION: Refactoring script manager, massive changes.

---
 engines/zvision/actions.cpp           |   7 -
 engines/zvision/console.cpp           |   1 -
 engines/zvision/save_manager.cpp      |   5 -
 engines/zvision/scr_file_handling.cpp |  36 +--
 engines/zvision/script_manager.cpp    | 410 +++++++++++++++-------------------
 engines/zvision/script_manager.h      |  34 +--
 6 files changed, 222 insertions(+), 271 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 4976bd4862..3c0adb4082 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -124,7 +124,6 @@ ActionDisableControl::ActionDisableControl(const Common::String &line) {
 bool ActionDisableControl::execute(ZVision *engine) {
 	debug("Disabling control %u", _key);
 
-	engine->getScriptManager()->disableControl(_key);
 
 	return true;
 }
@@ -141,7 +140,6 @@ ActionEnableControl::ActionEnableControl(const Common::String &line) {
 bool ActionEnableControl::execute(ZVision *engine) {
 	debug("Enabling control %u", _key);
 
-	engine->getScriptManager()->enableControl(_key);
 
 	return true;
 }
@@ -220,8 +218,6 @@ bool ActionPreloadAnimation::execute(ZVision *engine) {
 	// TODO: Check if the Control already exists
 
 	// Create the control, but disable it until PlayPreload is called
-	engine->getScriptManager()->addControl(new AnimationControl(engine, _key, _fileName));
-	engine->getScriptManager()->disableControl(_key);
 	return true;
 }
 
@@ -267,9 +263,6 @@ bool ActionPlayPreloadAnimation::execute(ZVision *engine) {
 	control->setXPos(_x1);
 	control->setYPost(_y1);
 
-	// Enable the control. ScriptManager will take care of the rest
-	control->enable();
-
 	return true;
 }
 
diff --git a/engines/zvision/console.cpp b/engines/zvision/console.cpp
index a095d3fa6a..400dcb3f39 100644
--- a/engines/zvision/console.cpp
+++ b/engines/zvision/console.cpp
@@ -197,7 +197,6 @@ bool Console::cmdParseAllScrFiles(int argc, const char **argv) {
 	SearchMan.listMatchingMembers(list, "*.scr");
 
 	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		_engine->getScriptManager()->parseScrFile((*iter)->getName());
 	}
 
 	return true;
diff --git a/engines/zvision/save_manager.cpp b/engines/zvision/save_manager.cpp
index 528dd0f35b..e8947d8d16 100644
--- a/engines/zvision/save_manager.cpp
+++ b/engines/zvision/save_manager.cpp
@@ -128,8 +128,6 @@ void SaveManager::writeSaveGameData(Common::OutSaveFile *file) {
 	// Write out the current state table values
 	scriptManager->serializeStateTable(file);
 
-	// Write out any controls needing to save state
-	scriptManager->serializeControls(file);
 }
 
 Common::Error SaveManager::loadGame(uint slot) {
@@ -160,9 +158,6 @@ Common::Error SaveManager::loadGame(uint slot) {
 	// Load the room
 	scriptManager->changeLocation(world, room, node, view, offset);
 
-	// Update the controls
-	scriptManager->deserializeControls(saveFile);
-
 	return Common::kNoError;
 }
 
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 5fed820103..4d18306ce4 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -37,7 +37,7 @@
 
 namespace ZVision {
 
-void ScriptManager::parseScrFile(const Common::String &fileName, bool isGlobal) {
+void ScriptManager::parseScrFile(const Common::String &fileName, script_scope &scope) {
 	Common::File file;
 	if (!file.open(fileName)) {
 		warning("Script file not found: %s", fileName.c_str());
@@ -58,17 +58,18 @@ void ScriptManager::parseScrFile(const Common::String &fileName, bool isGlobal)
 		if (line.matchString("puzzle:*", true)) {
 			Puzzle *puzzle = new Puzzle();
 			sscanf(line.c_str(), "puzzle:%u", &(puzzle->key));
-
+			if (getStateFlag(puzzle->key) & Puzzle::ONCE_PER_INST)
+				setStateValue(puzzle->key, 0);
 			parsePuzzle(puzzle, file);
-			if (isGlobal) {
-				_globalPuzzles.push_back(puzzle);
-			} else {
-				_activePuzzles.push_back(puzzle);
-			}
+			scope._puzzles.push_back(puzzle);
+
 		} else if (line.matchString("control:*", true)) {
-			parseControl(line, file);
+			Control *ctrl = parseControl(line, file);
+			if (ctrl)
+				scope._controls.push_back(ctrl);
 		}
 	}
+	scope.proc_count = 0;
 }
 
 void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stream) {
@@ -81,12 +82,14 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
 		} else if (line.matchString("results {", true)) {
 			parseResults(stream, puzzle->resultActions);
 		} else if (line.matchString("flags {", true)) {
-			puzzle->flags = parseFlags(stream);
+			setStateFlag(puzzle->key, parseFlags(stream));
 		}
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
 	}
+
+	puzzle->addedBySetState = 0;
 }
 
 bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList) const {
@@ -273,7 +276,7 @@ uint ScriptManager::parseFlags(Common::SeekableReadStream &stream) const {
 	return flags;
 }
 
-void ScriptManager::parseControl(Common::String &line, Common::SeekableReadStream &stream) {
+Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadStream &stream) {
 	uint32 key;
 	char controlTypeBuffer[20];
 
@@ -282,21 +285,20 @@ void ScriptManager::parseControl(Common::String &line, Common::SeekableReadStrea
 	Common::String controlType(controlTypeBuffer);
 
 	if (controlType.equalsIgnoreCase("push_toggle")) {
-		_activeControls.push_back(new PushToggleControl(_engine, key, stream));
-		return;
+		return new PushToggleControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("flat")) {
 		Control::parseFlatControl(_engine);
-		return;
+		return NULL;
 	} else if (controlType.equalsIgnoreCase("pana")) {
 		Control::parsePanoramaControl(_engine, stream);
-		return;
+		return NULL;
 	} else if (controlType.equalsIgnoreCase("tilt")) {
 		Control::parseTiltControl(_engine, stream);
-		return;
+		return NULL;
 	} else if (controlType.equalsIgnoreCase("lever")) {
-		_activeControls.push_back(new LeverControl(_engine, key, stream));
-		return;
+		return new LeverControl(_engine, key, stream);
 	}
+	return NULL;
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 01a6e6d09e..74035fd41f 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -41,69 +41,86 @@ namespace ZVision {
 
 ScriptManager::ScriptManager(ZVision *engine)
 	: _engine(engine),
-	  _currentlyFocusedControl(0) {
+	  _currentlyFocusedControl(0),
+	  _activeControls(NULL) {
 }
 
 ScriptManager::~ScriptManager() {
-	for (PuzzleList::iterator iter = _activePuzzles.begin(); iter != _activePuzzles.end(); ++iter) {
-		delete(*iter);
-	}
-	for (PuzzleList::iterator iter = _globalPuzzles.begin(); iter != _globalPuzzles.end(); ++iter) {
-		delete(*iter);
-	}
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		delete(*iter);
-	}
+	cleanScriptScope(universe);
+	cleanScriptScope(world);
+	cleanScriptScope(room);
+	cleanScriptScope(nodeview);
 }
 
 void ScriptManager::initialize() {
-	parseScrFile("universe.scr", true);
+	cleanScriptScope(universe);
+	cleanScriptScope(world);
+	cleanScriptScope(room);
+	cleanScriptScope(nodeview);
+
+	_currentLocation.node = '0';
+	_currentLocation.world = '0';
+	_currentLocation.room = '0';
+	_currentLocation.view = '0';
+
+	parseScrFile("universe.scr", universe);
 	changeLocation('g', 'a', 'r', 'y', 0);
 }
 
 void ScriptManager::update(uint deltaTimeMillis) {
+	if (_currentLocation.node != _nextLocation.node ||
+	        _currentLocation.room != _nextLocation.room ||
+	        _currentLocation.view != _nextLocation.view ||
+	        _currentLocation.world != _nextLocation.world)
+		do_changeLocation();
+
 	updateNodes(deltaTimeMillis);
-	checkPuzzleCriteria();
+	execScope(nodeview);
+	execScope(room);
+	execScope(world);
+	execScope(universe);
+	updateControls(deltaTimeMillis);
+}
+
+void ScriptManager::execScope(script_scope &scope) {
+	// Swap queues
+	PuzzleList *tmp = scope.exec_queue;
+	scope.exec_queue = scope.scope_queue;
+	scope.scope_queue = tmp;
+
+	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
+		(*PuzzleIter)->addedBySetState = 0;
+
+	if (scope.proc_count < 2 || getStateValue(76)) {
+		for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
+			checkPuzzleCriteria(*PuzzleIter, scope.proc_count);
+	} else {
+		for (PuzzleList::iterator PuzzleIter = scope.exec_queue->begin(); PuzzleIter != scope.exec_queue->end(); ++PuzzleIter)
+			checkPuzzleCriteria(*PuzzleIter, scope.proc_count);
+	}
+
+	scope.exec_queue->clear();
+
+	if (scope.proc_count < 2) {
+		scope.proc_count++;
+	}
 }
 
-void ScriptManager::createReferenceTable() {
+void ScriptManager::addPuzzlesToReferenceTable(script_scope &scope) {
 	// Iterate through each local Puzzle
-	for (PuzzleList::iterator activePuzzleIter = _activePuzzles.begin(); activePuzzleIter != _activePuzzles.end(); ++activePuzzleIter) {
-		Puzzle *puzzlePtr = (*activePuzzleIter);
+	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter) {
+		Puzzle *puzzlePtr = (*PuzzleIter);
 
-		// Iterate through each CriteriaEntry and add a reference from the criteria key to the Puzzle
-		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*activePuzzleIter)->criteriaList.begin(); criteriaIter != (*activePuzzleIter)->criteriaList.end(); ++criteriaIter) {
-			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
-				_referenceTable[entryIter->key].push_back(puzzlePtr);
-
-				// If the argument is a key, add a reference to it as well
-				if (entryIter->argumentIsAKey) {
-					_referenceTable[entryIter->argument].push_back(puzzlePtr);
-				}
-			}
-		}
-	}
+		puzzle_ref ref;
+		ref.scope = &scope;
+		ref.puz = puzzlePtr;
 
-	// Iterate through each global Puzzle
-	for (PuzzleList::iterator globalPuzzleIter = _globalPuzzles.begin(); globalPuzzleIter != _globalPuzzles.end(); ++globalPuzzleIter) {
-		Puzzle *puzzlePtr = (*globalPuzzleIter);
+		_referenceTable[puzzlePtr->key].push_back(ref);
 
 		// Iterate through each CriteriaEntry and add a reference from the criteria key to the Puzzle
-		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*globalPuzzleIter)->criteriaList.begin(); criteriaIter != (*globalPuzzleIter)->criteriaList.end(); ++criteriaIter) {
-			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
-				_referenceTable[entryIter->key].push_back(puzzlePtr);
-
-				// If the argument is a key, add a reference to it as well
-				if (entryIter->argumentIsAKey) {
-					_referenceTable[entryIter->argument].push_back(puzzlePtr);
-				}
-			}
-		}
-	}
-
-	// Remove duplicate entries
-	for (PuzzleMap::iterator referenceTableIter = _referenceTable.begin(); referenceTableIter != _referenceTable.end(); ++referenceTableIter) {
-		removeDuplicateEntries(referenceTableIter->_value);
+		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*PuzzleIter)->criteriaList.begin(); criteriaIter != (*PuzzleIter)->criteriaList.end(); ++criteriaIter)
+			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter)
+				_referenceTable[entryIter->key].push_back(ref);
 	}
 }
 
@@ -118,90 +135,85 @@ void ScriptManager::updateNodes(uint deltaTimeMillis) {
 			++iter;
 		}
 	}
-	// If process() returns true, it means the node can be deleted
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end();) {
-		if ((*iter)->process(deltaTimeMillis)) {
-			delete(*iter);
-			// Remove the node
-			iter = _activeControls.erase(iter);
-		} else {
-			++iter;
-		}
-	}
 }
 
-void ScriptManager::checkPuzzleCriteria() {
-	while (!_puzzlesToCheck.empty()) {
-		Puzzle *puzzle = _puzzlesToCheck.pop();
+void ScriptManager::updateControls(uint deltaTimeMillis) {
+	if (!_activeControls)
+		return;
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
+		(*iter)->process(deltaTimeMillis);
+}
 
-		// Check if the puzzle is already finished
-		// Also check that the puzzle isn't disabled
-		if (getStateValue(puzzle->key) == 1 &&
-		        (puzzle->flags & Puzzle::DISABLED) == 0) {
-			continue;
-		}
+void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
+	// Check if the puzzle is already finished
+	// Also check that the puzzle isn't disabled
+	if (getStateValue(puzzle->key) == 1 &&
+	        (getStateFlag(puzzle->key) & Puzzle::DISABLED) == 0) {
+		return;
+	}
 
-		// Check each Criteria
-
-		bool criteriaMet = false;
-		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = puzzle->criteriaList.begin(); criteriaIter != puzzle->criteriaList.end(); ++criteriaIter) {
-			criteriaMet = false;
-
-			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
-				// Get the value to compare against
-				uint argumentValue;
-				if (entryIter->argumentIsAKey)
-					argumentValue = getStateValue(entryIter->argument);
-				else
-					argumentValue = entryIter->argument;
-
-				// Do the comparison
-				switch (entryIter->criteriaOperator) {
-				case Puzzle::EQUAL_TO:
-					criteriaMet = getStateValue(entryIter->key) == argumentValue;
-					break;
-				case Puzzle::NOT_EQUAL_TO:
-					criteriaMet = getStateValue(entryIter->key) != argumentValue;
-					break;
-				case Puzzle::GREATER_THAN:
-					criteriaMet = getStateValue(entryIter->key) > argumentValue;
-					break;
-				case Puzzle::LESS_THAN:
-					criteriaMet = getStateValue(entryIter->key) < argumentValue;
-					break;
-				}
-
-				// If one check returns false, don't keep checking
-				if (!criteriaMet) {
-					break;
-				}
+	// Check each Criteria
+	if (counter == 0 && (getStateFlag(puzzle->key) & Puzzle::DO_ME_NOW) == 0)
+		return;
+
+	bool criteriaMet = false;
+	for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = puzzle->criteriaList.begin(); criteriaIter != puzzle->criteriaList.end(); ++criteriaIter) {
+		criteriaMet = false;
+
+		for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
+			// Get the value to compare against
+			uint argumentValue;
+			if (entryIter->argumentIsAKey)
+				argumentValue = getStateValue(entryIter->argument);
+			else
+				argumentValue = entryIter->argument;
+
+			// Do the comparison
+			switch (entryIter->criteriaOperator) {
+			case Puzzle::EQUAL_TO:
+				criteriaMet = getStateValue(entryIter->key) == argumentValue;
+				break;
+			case Puzzle::NOT_EQUAL_TO:
+				criteriaMet = getStateValue(entryIter->key) != argumentValue;
+				break;
+			case Puzzle::GREATER_THAN:
+				criteriaMet = getStateValue(entryIter->key) > argumentValue;
+				break;
+			case Puzzle::LESS_THAN:
+				criteriaMet = getStateValue(entryIter->key) < argumentValue;
+				break;
 			}
 
-			// If any of the Criteria are *fully* met, then execute the results
-			if (criteriaMet) {
+			// If one check returns false, don't keep checking
+			if (!criteriaMet) {
 				break;
 			}
 		}
 
-		// criteriaList can be empty. Aka, the puzzle should be executed immediately
-		if (puzzle->criteriaList.empty() || criteriaMet) {
-			debug(1, "Puzzle %u criteria passed. Executing its ResultActions", puzzle->key);
+		// If any of the Criteria are *fully* met, then execute the results
+		if (criteriaMet) {
+			break;
+		}
+	}
 
-			// Set the puzzle as completed
-			setStateValue(puzzle->key, 1);
+	// criteriaList can be empty. Aka, the puzzle should be executed immediately
+	if (puzzle->criteriaList.empty() || criteriaMet) {
+		debug(1, "Puzzle %u criteria passed. Executing its ResultActions", puzzle->key);
 
-			bool shouldContinue = true;
-			for (Common::List<ResultAction *>::iterator resultIter = puzzle->resultActions.begin(); resultIter != puzzle->resultActions.end(); ++resultIter) {
-				shouldContinue = shouldContinue && (*resultIter)->execute(_engine);
-				if (!shouldContinue) {
-					break;
-				}
-			}
+		// Set the puzzle as completed
+		setStateValue(puzzle->key, 1);
 
+		bool shouldContinue = true;
+		for (Common::List<ResultAction *>::iterator resultIter = puzzle->resultActions.begin(); resultIter != puzzle->resultActions.end(); ++resultIter) {
+			shouldContinue = shouldContinue && (*resultIter)->execute(_engine);
 			if (!shouldContinue) {
 				break;
 			}
 		}
+
+		if (!shouldContinue) {
+			return;
+		}
 	}
 }
 
@@ -242,6 +254,13 @@ uint ScriptManager::getStateValue(uint32 key) {
 }
 
 void ScriptManager::queuePuzzles(uint32 key) {
+	if (_referenceTable.contains(key)) {
+		for (Common::Array<puzzle_ref>::iterator iter = _referenceTable[key].begin(); iter != _referenceTable[key].end(); ++iter)
+			if (!iter->puz->addedBySetState) {
+				iter->scope->scope_queue->push_back(iter->puz);
+				iter->puz->addedBySetState = true;
+			}
+	}
 }
 
 void ScriptManager::setStateValue(uint32 key, uint value) {
@@ -281,40 +300,16 @@ void ScriptManager::addToStateValue(uint32 key, uint valueToAdd) {
 	_globalState[key] += valueToAdd;
 }
 
-void ScriptManager::addControl(Control *control) {
-	_activeControls.push_back(control);
-}
 
 Control *ScriptManager::getControl(uint32 key) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		if ((*iter)->getKey() == key) {
-			return (*iter);
-		}
-	}
 
 	return nullptr;
 }
 
-void ScriptManager::enableControl(uint32 key) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		if ((*iter)->getKey() == key) {
-			(*iter)->enable();
-			break;
-		}
-	}
-}
-
-void ScriptManager::disableControl(uint32 key) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		if ((*iter)->getKey() == key) {
-			(*iter)->disable();
-			break;
-		}
-	}
-}
-
 void ScriptManager::focusControl(uint32 key) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
+	if (!_activeControls)
+		return;
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		uint32 controlKey = (*iter)->getKey();
 
 		if (controlKey == key) {
@@ -342,20 +337,26 @@ SideFX *ScriptManager::getSideFX(uint32 key) {
 }
 
 void ScriptManager::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
+	if (!_activeControls)
+		return;
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		(*iter)->onMouseDown(screenSpacePos, backgroundImageSpacePos);
 	}
 }
 
 void ScriptManager::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
+	if (!_activeControls)
+		return;
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		(*iter)->onMouseUp(screenSpacePos, backgroundImageSpacePos);
 	}
 }
 
 bool ScriptManager::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (!_activeControls)
+		return false;
 	bool cursorWasChanged = false;
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		cursorWasChanged = cursorWasChanged || (*iter)->onMouseMove(screenSpacePos, backgroundImageSpacePos);
 	}
 
@@ -363,35 +364,56 @@ bool ScriptManager::onMouseMove(const Common::Point &screenSpacePos, const Commo
 }
 
 void ScriptManager::onKeyDown(Common::KeyState keyState) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
+	if (!_activeControls)
+		return;
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		(*iter)->onKeyDown(keyState);
 	}
 }
 
 void ScriptManager::onKeyUp(Common::KeyState keyState) {
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
+	if (!_activeControls)
+		return;
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		(*iter)->onKeyUp(keyState);
 	}
 }
 
-void ScriptManager::changeLocation(char world, char room, char node, char view, uint32 offset) {
-	assert(world != 0);
-	debug(1, "Changing location to: %c %c %c %c %u", world, room, node, view, offset);
+void ScriptManager::changeLocation(char _world, char _room, char _node, char _view, uint32 offset) {
+	_nextLocation.world = _world;
+	_nextLocation.room = _room;
+	_nextLocation.node = _node;
+	_nextLocation.view = _view;
+	_nextLocation.offset = offset;
+}
+
+void ScriptManager::do_changeLocation() {
+	assert(_nextLocation.world != 0);
+	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
 	// Auto save
-	_engine->getSaveManager()->autoSave();
+	//_engine->getSaveManager()->autoSave();
 
 	// Clear all the containers
 	_referenceTable.clear();
-	_puzzlesToCheck.clear();
-	for (PuzzleList::iterator iter = _activePuzzles.begin(); iter != _activePuzzles.end(); ++iter) {
-		delete(*iter);
-	}
-	_activePuzzles.clear();
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		delete(*iter);
-	}
-	_activeControls.clear();
+	cleanScriptScope(nodeview);
+	cleanScriptScope(room);
+	cleanScriptScope(world);
+
+	// Parse into puzzles and controls
+	Common::String fileName = Common::String::format("%c%c%c%c.scr", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view);
+	parseScrFile(fileName, nodeview);
+	addPuzzlesToReferenceTable(nodeview);
+
+	fileName = Common::String::format("%c%c.scr", _nextLocation.world, _nextLocation.room);
+	parseScrFile(fileName, room);
+	addPuzzlesToReferenceTable(room);
+
+	fileName = Common::String::format("%c.scr", _nextLocation.world);
+	parseScrFile(fileName, world);
+	addPuzzlesToReferenceTable(world);
+
+	_activeControls = &nodeview._controls;
 
 	// Revert to the idle cursor
 	_engine->getCursorManager()->revertToIdle();
@@ -402,50 +424,14 @@ void ScriptManager::changeLocation(char world, char room, char node, char view,
 	// Remove any alphaEntries
 	_engine->getRenderManager()->clearAlphaEntries();
 
-	// Clean the global state table
-	cleanStateTable();
-
-	// Parse into puzzles and controls
-	Common::String fileName = Common::String::format("%c%c%c%c.scr", world, room, node, view);
-	parseScrFile(fileName);
-
 	// Change the background position
-	_engine->getRenderManager()->setBackgroundPosition(offset);
+	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
 
-	// Enable all the controls
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		(*iter)->enable();
-	}
-
-	// Add all the local puzzles to the queue to be checked
-	for (PuzzleList::iterator iter = _activePuzzles.begin(); iter != _activePuzzles.end(); ++iter) {
-		// Reset any Puzzles that have the flag ONCE_PER_INST
-		if (((*iter)->flags & Puzzle::ONCE_PER_INST) == Puzzle::ONCE_PER_INST) {
-			setStateValue((*iter)->key, 0);
-		}
-
-		_puzzlesToCheck.push((*iter));
-	}
-
-	// Add all the global puzzles to the queue to be checked
-	for (PuzzleList::iterator iter = _globalPuzzles.begin(); iter != _globalPuzzles.end(); ++iter) {
-		// Reset any Puzzles that have the flag ONCE_PER_INST
-		if (((*iter)->flags & Puzzle::ONCE_PER_INST) == Puzzle::ONCE_PER_INST) {
-			setStateValue((*iter)->key, 0);
-		}
-
-		_puzzlesToCheck.push((*iter));
-	}
-
-	// Create the puzzle reference table
-	createReferenceTable();
+	execScope(room);
+	execScope(nodeview);
 
 	// Update _currentLocation
-	_currentLocation.world = world;
-	_currentLocation.room = room;
-	_currentLocation.node = node;
-	_currentLocation.view = view;
-	_currentLocation.offset = offset;
+	_currentLocation = _nextLocation;
 }
 
 void ScriptManager::serializeStateTable(Common::WriteStream *stream) {
@@ -474,36 +460,6 @@ void ScriptManager::deserializeStateTable(Common::SeekableReadStream *stream) {
 	}
 }
 
-void ScriptManager::serializeControls(Common::WriteStream *stream) {
-	// Count how many controls need to save their data
-	// Because WriteStream isn't seekable
-	uint32 numberOfControlsNeedingSerialization = 0;
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		if ((*iter)->needsSerialization()) {
-			numberOfControlsNeedingSerialization++;
-		}
-	}
-	stream->writeUint32LE(numberOfControlsNeedingSerialization);
-
-	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-		(*iter)->serialize(stream);
-	}
-}
-
-void ScriptManager::deserializeControls(Common::SeekableReadStream *stream) {
-	uint32 numberOfControls = stream->readUint32LE();
-
-	for (uint32 i = 0; i < numberOfControls; ++i) {
-		uint32 key = stream->readUint32LE();
-		for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
-			if ((*iter)->getKey() == key) {
-				(*iter)->deserialize(stream);
-				break;
-			}
-		}
-	}
-}
-
 Location ScriptManager::getCurrentLocation() const {
 	Location location = _currentLocation;
 	location.offset = _engine->getRenderManager()->getCurrentBackgroundOffset();
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 71fefaf41f..90df2ccee5 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -105,7 +105,6 @@ struct Location {
 	uint32 offset;
 };
 
-typedef Common::HashMap<uint32, Common::Array<Puzzle *> > PuzzleMap;
 typedef Common::List<Puzzle *> PuzzleList;
 typedef Common::Queue<Puzzle *> PuzzleQueue;
 typedef Common::List<Control *> ControlList;
@@ -137,6 +136,8 @@ private:
 		script_scope *scope;
 	};
 
+	typedef Common::HashMap<uint32, Common::Array<puzzle_ref> > PuzzleMap;
+
 	/**
 	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and
 	 * mutators getStateValue() and setStateValue(). This ensures that Puzzles that reference a
@@ -147,18 +148,19 @@ private:
 	StateMap _globalStateFlags;
 	/** References _globalState keys to Puzzles */
 	PuzzleMap _referenceTable;
-	/** Holds the Puzzles that should be checked this frame */
-	PuzzleQueue _puzzlesToCheck;
-	/** Holds the currently active puzzles */
-	PuzzleList _activePuzzles;
-	/** Holds the global puzzles */
-	PuzzleList _globalPuzzles;
 	/** Holds the currently active controls */
-	ControlList _activeControls;
+	ControlList *_activeControls;
+
+	script_scope universe;
+	script_scope world;
+	script_scope room;
+	script_scope nodeview;
+
 	/** Holds the currently active timers, musics, other */
 	SideFXList _activeSideFx;
 
 	Location _currentLocation;
+	Location _nextLocation;
 
 	uint32 _currentlyFocusedControl;
 
@@ -221,21 +223,25 @@ public:
 	 */
 	void onKeyUp(Common::KeyState keyState);
 
+	/** Mark next location */
 	void changeLocation(char world, char room, char node, char view, uint32 offset);
 
 	void serializeStateTable(Common::WriteStream *stream);
 	void deserializeStateTable(Common::SeekableReadStream *stream);
-	void serializeControls(Common::WriteStream *stream);
-	void deserializeControls(Common::SeekableReadStream *stream);
 
 	Location getCurrentLocation() const;
 
 private:
-	void createReferenceTable();
+	void addPuzzlesToReferenceTable(script_scope &scope);
 	void updateNodes(uint deltaTimeMillis);
-	void checkPuzzleCriteria();
+	void updateControls(uint deltaTimeMillis);
+	void checkPuzzleCriteria(Puzzle *puzzle, uint counter);
 	void cleanStateTable();
 	void cleanScriptScope(script_scope &scope);
+	void execScope(script_scope &scope);
+
+	/** Perform change location */
+	void do_changeLocation();
 
 // TODO: Make this private. It was only made public so Console::cmdParseAllScrFiles() could use it
 public:
@@ -245,7 +251,7 @@ public:
 	 * @param fileName    Name of the .scr file
 	 * @param isGlobal    Are the puzzles included in the file global (true). AKA, the won't be purged during location changes
 	 */
-	void parseScrFile(const Common::String &fileName, bool isGlobal = false);
+	void parseScrFile(const Common::String &fileName, script_scope &scope);
 
 private:
 	/**
@@ -291,7 +297,7 @@ private:
 	 * @param line      The line initially read
 	 * @param stream    Scr file stream
 	 */
-	void parseControl(Common::String &line, Common::SeekableReadStream &stream);
+	Control *parseControl(Common::String &line, Common::SeekableReadStream &stream);
 };
 
 
-- 
cgit v1.2.3


From 6d5e8cb10569eec6b42e41197227ed1652e57900 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 20:42:14 +0000
Subject: ZVISION: Replace disable/enable control functions by call to
 getStateFlag.

---
 engines/zvision/animation_control.cpp   |  4 ----
 engines/zvision/control.cpp             | 18 ------------------
 engines/zvision/control.h               |  7 ++-----
 engines/zvision/lever_control.cpp       | 12 ++++--------
 engines/zvision/push_toggle_control.cpp |  6 ++----
 5 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
index 66eefd7ce6..3f9a2e9cc7 100644
--- a/engines/zvision/animation_control.cpp
+++ b/engines/zvision/animation_control.cpp
@@ -71,9 +71,6 @@ AnimationControl::~AnimationControl() {
 }
 
 bool AnimationControl::process(uint32 deltaTimeInMillis) {
-	if (!_enabled) {
-		return false;
-	}
 
 	bool finished = false;
 
@@ -253,7 +250,6 @@ bool AnimationControl::process(uint32 deltaTimeInMillis) {
 	// Then disable the control. DON'T delete it. It can be re-used
 	if (finished) {
 		_engine->getScriptManager()->setStateValue(_animationKey, 2);
-		disable();
 		_currentLoop = 0;
 	}
 
diff --git a/engines/zvision/control.cpp b/engines/zvision/control.cpp
index bcbdabc143..0346228681 100644
--- a/engines/zvision/control.cpp
+++ b/engines/zvision/control.cpp
@@ -33,24 +33,6 @@
 
 namespace ZVision {
 
-void Control::enable() {
-	if (!_enabled) {
-		_enabled = true;
-		return;
-	}
-
-	debug("Control %u is already enabled", _key);
-}
-
-void Control::disable() {
-	if (_enabled) {
-		_enabled = false;
-		return;
-	}
-
-	debug("Control %u is already disabled", _key);
-}
-
 void Control::parseFlatControl(ZVision *engine) {
 	engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::FLAT);
 }
diff --git a/engines/zvision/control.h b/engines/zvision/control.h
index ab55763a20..66fdbfee19 100644
--- a/engines/zvision/control.h
+++ b/engines/zvision/control.h
@@ -38,16 +38,14 @@ class ZVision;
 
 class Control {
 public:
-	Control() : _engine(0), _key(0), _enabled(false) {}
-	Control(ZVision *engine, uint32 key) : _engine(engine), _key(key), _enabled(false) {}
+	Control() : _engine(0), _key(0) {}
+	Control(ZVision *engine, uint32 key) : _engine(engine), _key(key) {}
 	virtual ~Control() {}
 
 	uint32 getKey() {
 		return _key;
 	}
 
-	virtual void enable();
-	virtual void disable();
 	virtual void focus() {}
 	virtual void unfocus() {}
 	/**
@@ -131,7 +129,6 @@ public:
 protected:
 	ZVision *_engine;
 	uint32 _key;
-	bool _enabled;
 
 // Static member functions
 public:
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index b0f9417042..bd2c186ffe 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -191,9 +191,8 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 }
 
 void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_enabled) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return;
-	}
 
 	if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_mouseIsCaptured = true;
@@ -202,9 +201,8 @@ void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 }
 
 void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_enabled) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return;
-	}
 
 	if (_mouseIsCaptured) {
 		_mouseIsCaptured = false;
@@ -217,9 +215,8 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 }
 
 bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_enabled) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
-	}
 
 	bool cursorWasChanged = false;
 
@@ -248,9 +245,8 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 }
 
 bool LeverControl::process(uint32 deltaTimeInMillis) {
-	if (!_enabled) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
-	}
 
 	if (_isReturning) {
 		_accumulatedTime += deltaTimeInMillis;
diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index 21a1c41548..2cea5db2d2 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -73,9 +73,8 @@ PushToggleControl::~PushToggleControl() {
 }
 
 void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_enabled) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return;
-	}
 
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getScriptManager()->setStateValue(_key, 1);
@@ -83,9 +82,8 @@ void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Com
 }
 
 bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_enabled) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
-	}
 
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_hoverCursor);
-- 
cgit v1.2.3


From 4d02fe42fdbddb4fb6f5d97611b31410c170082d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 20:44:40 +0000
Subject: ZVISION: Remove not needed (de)serialize functions from controls
 class.

---
 engines/zvision/control.h | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/engines/zvision/control.h b/engines/zvision/control.h
index 66fdbfee19..32c59d6f27 100644
--- a/engines/zvision/control.h
+++ b/engines/zvision/control.h
@@ -93,38 +93,6 @@ public:
 	virtual bool process(uint32 deltaTimeInMillis) {
 		return false;
 	}
-	/**
-	 * Serialize a Control for save game use. This should only be used if a Control needs
-	 * to save values that would be different from initialization. AKA a TimerNode needs to
-	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
-	 * their key as the first data outputted. The default implementation is NOP.
-	 *
-	 * NOTE: If this method is overridden, you MUST also override deserialize()
-	 * and needsSerialization()
-	 *
-	 * @param stream    Stream to write any needed data to
-	 */
-	virtual void serialize(Common::WriteStream *stream) {}
-	/**
-	 * De-serialize data from a save game stream. This should only be implemented if the
-	 * Control also implements serialize(). The calling method assumes the size of the
-	 * data read from the stream exactly equals that written in serialize(). The default
-	 * implementation is NOP.
-	 *
-	 * NOTE: If this method is overridden, you MUST also override serialize()
-	 * and needsSerialization()
-	 *
-	 * @param stream    Save game file stream
-	 */
-	virtual void deserialize(Common::SeekableReadStream *stream) {}
-	/**
-	 * If a Control overrides serialize() and deserialize(), this should return true
-	 *
-	 * @return    Does the Control need save game serialization?
-	 */
-	virtual inline bool needsSerialization() {
-		return false;
-	}
 
 protected:
 	ZVision *_engine;
-- 
cgit v1.2.3


From 6ace820da623b8579972ae58c50ec782dfcf2589 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 25 Oct 2013 20:47:36 +0000
Subject: ZVISION: Remove field "flags" from puzzle structure.

---
 engines/zvision/puzzle.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index 1b30829462..c02f60c8f0 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -32,7 +32,7 @@
 namespace ZVision {
 
 struct Puzzle {
-	Puzzle() : key(0), flags(0) {}
+	Puzzle() : key(0) {}
 
 	~Puzzle() {
 		for (Common::List<ResultAction *>::iterator iter = resultActions.begin(); iter != resultActions.end(); ++iter) {
@@ -73,7 +73,6 @@ struct Puzzle {
 	Common::List<Common::List <CriteriaEntry> > criteriaList;
 	// This has to be list of pointers because ResultAction is abstract
 	Common::List<ResultAction *> resultActions;
-	uint flags;
 	bool addedBySetState;
 };
 
-- 
cgit v1.2.3


From 66c9d1d0fd8c9df57bcf986dd124c879eae2f35d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 29 Oct 2013 18:33:37 +0000
Subject: ZVISION: Add engine pointer to actionResult for manipulations with
 engine.

---
 engines/zvision/actions.cpp           | 112 +++++++++++++++++++---------------
 engines/zvision/actions.h             | 101 +++++++++++++++---------------
 engines/zvision/scr_file_handling.cpp |  32 +++++-----
 engines/zvision/script_manager.cpp    |   2 +-
 4 files changed, 133 insertions(+), 114 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 3c0adb4082..68c279754d 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -43,12 +43,13 @@ namespace ZVision {
 // ActionAdd
 //////////////////////////////////////////////////////////////////////////////
 
-ActionAdd::ActionAdd(const Common::String &line) {
+ActionAdd::ActionAdd(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^(](%u,%u)", &_key, &_value);
 }
 
-bool ActionAdd::execute(ZVision *engine) {
-	engine->getScriptManager()->addToStateValue(_key, _value);
+bool ActionAdd::execute() {
+	_engine->getScriptManager()->addToStateValue(_key, _value);
 	return true;
 }
 
@@ -57,12 +58,13 @@ bool ActionAdd::execute(ZVision *engine) {
 // ActionAssign
 //////////////////////////////////////////////////////////////////////////////
 
-ActionAssign::ActionAssign(const Common::String &line) {
+ActionAssign::ActionAssign(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^(](%u, %u)", &_key, &_value);
 }
 
-bool ActionAssign::execute(ZVision *engine) {
-	engine->getScriptManager()->setStateValue(_key, _value);
+bool ActionAssign::execute() {
+	_engine->getScriptManager()->setStateValue(_key, _value);
 	return true;
 }
 
@@ -71,11 +73,12 @@ bool ActionAssign::execute(ZVision *engine) {
 // ActionAttenuate
 //////////////////////////////////////////////////////////////////////////////
 
-ActionAttenuate::ActionAttenuate(const Common::String &line) {
+ActionAttenuate::ActionAttenuate(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^(](%u, %d)", &_key, &_attenuation);
 }
 
-bool ActionAttenuate::execute(ZVision *engine) {
+bool ActionAttenuate::execute() {
 	// TODO: Implement
 	return true;
 }
@@ -85,13 +88,14 @@ bool ActionAttenuate::execute(ZVision *engine) {
 // ActionChangeLocation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionChangeLocation::ActionChangeLocation(const Common::String &line) {
+ActionChangeLocation::ActionChangeLocation(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^(](%c, %c, %c%c, %u)", &_world, &_room, &_node, &_view, &_offset);
 }
 
-bool ActionChangeLocation::execute(ZVision *engine) {
+bool ActionChangeLocation::execute() {
 	// We can't directly call ScriptManager::ChangeLocationIntern() because doing so clears all the Puzzles, and thus would corrupt the current puzzle checking
-	engine->getScriptManager()->changeLocation(_world, _room, _node, _view, _offset);
+	_engine->getScriptManager()->changeLocation(_world, _room, _node, _view, _offset);
 	// Tell the puzzle system to stop checking any more puzzles
 	return false;
 }
@@ -101,13 +105,14 @@ bool ActionChangeLocation::execute(ZVision *engine) {
 // ActionCrossfade
 //////////////////////////////////////////////////////////////////////////////
 
-ActionCrossfade::ActionCrossfade(const Common::String &line) {
+ActionCrossfade::ActionCrossfade(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(),
 	       "%*[^(](%u %u %u %u %u %u %u)",
 	       &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
 }
 
-bool ActionCrossfade::execute(ZVision *engine) {
+bool ActionCrossfade::execute() {
 	// TODO: Implement
 	return true;
 }
@@ -117,11 +122,12 @@ bool ActionCrossfade::execute(ZVision *engine) {
 // ActionDisableControl
 //////////////////////////////////////////////////////////////////////////////
 
-ActionDisableControl::ActionDisableControl(const Common::String &line) {
+ActionDisableControl::ActionDisableControl(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^(](%u)", &_key);
 }
 
-bool ActionDisableControl::execute(ZVision *engine) {
+bool ActionDisableControl::execute() {
 	debug("Disabling control %u", _key);
 
 
@@ -133,11 +139,12 @@ bool ActionDisableControl::execute(ZVision *engine) {
 // ActionEnableControl
 //////////////////////////////////////////////////////////////////////////////
 
-ActionEnableControl::ActionEnableControl(const Common::String &line) {
+ActionEnableControl::ActionEnableControl(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^(](%u)", &_key);
 }
 
-bool ActionEnableControl::execute(ZVision *engine) {
+bool ActionEnableControl::execute() {
 	debug("Enabling control %u", _key);
 
 
@@ -149,7 +156,9 @@ bool ActionEnableControl::execute(ZVision *engine) {
 // ActionMusic
 //////////////////////////////////////////////////////////////////////////////
 
-ActionMusic::ActionMusic(const Common::String &line) : _volume(255) {
+ActionMusic::ActionMusic(ZVision *engine, const Common::String &line) :
+	ResultAction(engine),
+	_volume(255) {
 	uint type;
 	char fileNameBuffer[25];
 	uint loop;
@@ -176,7 +185,7 @@ ActionMusic::ActionMusic(const Common::String &line) : _volume(255) {
 	}
 }
 
-bool ActionMusic::execute(ZVision *engine) {
+bool ActionMusic::execute() {
 	Audio::RewindableAudioStream *audioStream;
 
 	if (_fileName.contains(".wav")) {
@@ -185,14 +194,14 @@ bool ActionMusic::execute(ZVision *engine) {
 			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
 		}
 	} else {
-		audioStream = makeRawZorkStream(_fileName, engine);
+		audioStream = makeRawZorkStream(_fileName, _engine);
 	}
 
 	if (_loop) {
 		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-		engine->_mixer->playStream(_soundType, 0, loopingAudioStream, -1, _volume);
+		_engine->_mixer->playStream(_soundType, 0, loopingAudioStream, -1, _volume);
 	} else {
-		engine->_mixer->playStream(_soundType, 0, audioStream, -1, _volume);
+		_engine->_mixer->playStream(_soundType, 0, audioStream, -1, _volume);
 	}
 
 	return true;
@@ -203,7 +212,8 @@ bool ActionMusic::execute(ZVision *engine) {
 // ActionPreloadAnimation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionPreloadAnimation::ActionPreloadAnimation(const Common::String &line) {
+ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
@@ -212,7 +222,7 @@ ActionPreloadAnimation::ActionPreloadAnimation(const Common::String &line) {
 	_fileName = Common::String(fileName);
 }
 
-bool ActionPreloadAnimation::execute(ZVision *engine) {
+bool ActionPreloadAnimation::execute() {
 	// TODO: We ignore the mask and framerate atm. Mask refers to a key color used for binary alpha. We assume the framerate is the default framerate embedded in the videos
 
 	// TODO: Check if the Control already exists
@@ -226,7 +236,8 @@ bool ActionPreloadAnimation::execute(ZVision *engine) {
 // ActionPlayAnimation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionPlayAnimation::ActionPlayAnimation(const Common::String &line) {
+ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
@@ -237,7 +248,7 @@ ActionPlayAnimation::ActionPlayAnimation(const Common::String &line) {
 	_fileName = Common::String(fileName);
 }
 
-bool ActionPlayAnimation::execute(ZVision *engine) {
+bool ActionPlayAnimation::execute() {
 	// TODO: Implement
 	return true;
 }
@@ -247,15 +258,16 @@ bool ActionPlayAnimation::execute(ZVision *engine) {
 // ActionPlayPreloadAnimation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(const Common::String &line) {
+ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(),
 	       "%*[^:]:%*[^:]:%u(%u %u %u %u %u %u %u %u)",
 	       &_animationKey, &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount);
 }
 
-bool ActionPlayPreloadAnimation::execute(ZVision *engine) {
+bool ActionPlayPreloadAnimation::execute() {
 	// Find the control
-	AnimationControl *control = (AnimationControl *)engine->getScriptManager()->getControl(_controlKey);
+	AnimationControl *control = (AnimationControl *)_engine->getScriptManager()->getControl(_controlKey);
 
 	// Set the needed values within the control
 	control->setAnimationKey(_animationKey);
@@ -271,8 +283,8 @@ bool ActionPlayPreloadAnimation::execute(ZVision *engine) {
 // ActionQuit
 //////////////////////////////////////////////////////////////////////////////
 
-bool ActionQuit::execute(ZVision *engine) {
-	engine->quitGame();
+bool ActionQuit::execute() {
+	_engine->quitGame();
 
 	return true;
 }
@@ -282,13 +294,14 @@ bool ActionQuit::execute(ZVision *engine) {
 // ActionRandom
 //////////////////////////////////////////////////////////////////////////////
 
-ActionRandom::ActionRandom(const Common::String &line) {
+ActionRandom::ActionRandom(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u, %u)", &_key, &_max);
 }
 
-bool ActionRandom::execute(ZVision *engine) {
-	uint randNumber = engine->getRandomSource()->getRandomNumber(_max);
-	engine->getScriptManager()->setStateValue(_key, randNumber);
+bool ActionRandom::execute() {
+	uint randNumber = _engine->getRandomSource()->getRandomNumber(_max);
+	_engine->getScriptManager()->setStateValue(_key, randNumber);
 	return true;
 }
 
@@ -297,7 +310,8 @@ bool ActionRandom::execute(ZVision *engine) {
 // ActionSetPartialScreen
 //////////////////////////////////////////////////////////////////////////////
 
-ActionSetPartialScreen::ActionSetPartialScreen(const Common::String &line) {
+ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	char fileName[25];
 	uint color;
 
@@ -311,9 +325,8 @@ ActionSetPartialScreen::ActionSetPartialScreen(const Common::String &line) {
 	_backgroundColor = color;
 }
 
-bool ActionSetPartialScreen::execute(ZVision *engine) {
-	RenderManager *renderManager = engine->getRenderManager();
-
+bool ActionSetPartialScreen::execute() {
+	RenderManager *renderManager = _engine->getRenderManager();
 	if (_backgroundColor >= 0)
 		renderManager->renderImageToBackground(_fileName, _x, _y, _backgroundColor);
 	else
@@ -327,15 +340,16 @@ bool ActionSetPartialScreen::execute(ZVision *engine) {
 // ActionSetScreen
 //////////////////////////////////////////////////////////////////////////////
 
-ActionSetScreen::ActionSetScreen(const Common::String &line) {
+ActionSetScreen::ActionSetScreen(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	char fileName[25];
 	sscanf(line.c_str(), "%*[^(](%25[^)])", fileName);
 
 	_fileName = Common::String(fileName);
 }
 
-bool ActionSetScreen::execute(ZVision *engine) {
-	engine->getRenderManager()->setBackgroundImage(_fileName);
+bool ActionSetScreen::execute() {
+	_engine->getRenderManager()->setBackgroundImage(_fileName);
 
 	return true;
 }
@@ -345,7 +359,8 @@ bool ActionSetScreen::execute(ZVision *engine) {
 // ActionStreamVideo
 //////////////////////////////////////////////////////////////////////////////
 
-ActionStreamVideo::ActionStreamVideo(const Common::String &line) {
+ActionStreamVideo::ActionStreamVideo(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	char fileName[25];
 	uint skipline;    //skipline - render video with skip every second line, not skippable.
 
@@ -355,7 +370,7 @@ ActionStreamVideo::ActionStreamVideo(const Common::String &line) {
 	_skippable = true;
 }
 
-bool ActionStreamVideo::execute(ZVision *engine) {
+bool ActionStreamVideo::execute() {
 	ZorkAVIDecoder decoder;
 	if (!decoder.loadFile(_fileName)) {
 		return true;
@@ -366,7 +381,7 @@ bool ActionStreamVideo::execute(ZVision *engine) {
 		destRect = Common::Rect(_x1, _y1, _x2, _y2);
 	}
 
-	engine->playVideo(decoder, destRect, _skippable);
+	_engine->playVideo(decoder, destRect, _skippable);
 	return true;
 }
 
@@ -375,12 +390,13 @@ bool ActionStreamVideo::execute(ZVision *engine) {
 // ActionTimer
 //////////////////////////////////////////////////////////////////////////////
 
-ActionTimer::ActionTimer(const Common::String &line) {
+ActionTimer::ActionTimer(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
 	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%u)", &_key, &_time);
 }
 
-bool ActionTimer::execute(ZVision *engine) {
-	engine->getScriptManager()->addSideFX(new TimerNode(engine, _key, _time));
+bool ActionTimer::execute() {
+	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _key, _time));
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 15923d66d1..f779c1fa2f 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -39,6 +39,7 @@ class ZVision;
   */
 class ResultAction {
 public:
+	ResultAction(ZVision *engine) : _engine(engine) {}
 	virtual ~ResultAction() {}
 	/**
 	 * This is called by the script system whenever a Puzzle's criteria are found to be true.
@@ -48,7 +49,9 @@ public:
 	 * @param engine    A pointer to the base engine so the ResultAction can access all the necessary methods
 	 * @return          Should the script system continue to test any remaining puzzles (true) or immediately break and go on to the next frame (false)
 	 */
-	virtual bool execute(ZVision *engine) = 0;
+	virtual bool execute() = 0;
+protected:
+	ZVision *_engine;
 };
 
 
@@ -85,8 +88,8 @@ public:
 
 class ActionAdd : public ResultAction {
 public:
-	ActionAdd(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionAdd(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -95,8 +98,8 @@ private:
 
 class ActionAssign : public ResultAction {
 public:
-	ActionAssign(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionAssign(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -105,8 +108,8 @@ private:
 
 class ActionAttenuate : public ResultAction {
 public:
-	ActionAttenuate(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionAttenuate(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -115,8 +118,8 @@ private:
 
 class ActionChangeLocation : public ResultAction {
 public:
-	ActionChangeLocation(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionChangeLocation(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	char _world;
@@ -128,8 +131,8 @@ private:
 
 class ActionCrossfade : public ResultAction {
 public:
-	ActionCrossfade(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionCrossfade(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _keyOne;
@@ -143,16 +146,16 @@ private:
 
 class ActionDebug : public ResultAction {
 public:
-	ActionDebug(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionDebug(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 };
 
 class ActionDelayRender : public ResultAction {
 public:
-	ActionDelayRender(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionDelayRender(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	// TODO: Check if this should actually be frames or if it should be milliseconds/seconds
@@ -161,8 +164,8 @@ private:
 
 class ActionDisableControl : public ResultAction {
 public:
-	ActionDisableControl(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionDisableControl(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -170,38 +173,38 @@ private:
 
 class ActionDisableVenus : public ResultAction {
 public:
-	ActionDisableVenus(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionDisableVenus(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 };
 
 class ActionDisplayMessage : public ResultAction {
 public:
-	ActionDisplayMessage(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionDisplayMessage(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 };
 
 class ActionDissolve : public ResultAction {
 public:
-	ActionDissolve();
-	bool execute(ZVision *engine);
+	ActionDissolve(ZVision *engine);
+	bool execute();
 };
 
 class ActionDistort : public ResultAction {
 public:
-	ActionDistort(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionDistort(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 };
 
 class ActionEnableControl : public ResultAction {
 public:
-	ActionEnableControl(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionEnableControl(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -209,8 +212,8 @@ private:
 
 class ActionMusic : public ResultAction {
 public:
-	ActionMusic(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionMusic(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -222,8 +225,8 @@ private:
 
 class ActionPlayAnimation : public ResultAction {
 public:
-	ActionPlayAnimation(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionPlayAnimation(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -241,8 +244,8 @@ private:
 
 class ActionPlayPreloadAnimation : public ResultAction {
 public:
-	ActionPlayPreloadAnimation(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionPlayPreloadAnimation(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _animationKey;
@@ -258,8 +261,8 @@ private:
 
 class ActionPreloadAnimation : public ResultAction {
 public:
-	ActionPreloadAnimation(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionPreloadAnimation(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -270,21 +273,21 @@ private:
 
 class ActionQuit : public ResultAction {
 public:
-	ActionQuit() {}
-	bool execute(ZVision *engine);
+	ActionQuit(ZVision *engine) : ResultAction(engine) {}
+	bool execute();
 };
 
 // TODO: See if this exists in ZGI. It doesn't in ZNem
 class ActionUnloadAnimation : public ResultAction {
 public:
-	ActionUnloadAnimation(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionUnloadAnimation(ZVision *engine, const Common::String &line);
+	bool execute();
 };
 
 class ActionRandom : public ResultAction {
 public:
-	ActionRandom(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionRandom(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
@@ -293,8 +296,8 @@ private:
 
 class ActionSetPartialScreen : public ResultAction {
 public:
-	ActionSetPartialScreen(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionSetPartialScreen(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint _x;
@@ -305,8 +308,8 @@ private:
 
 class ActionSetScreen : public ResultAction {
 public:
-	ActionSetScreen(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionSetScreen(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	Common::String _fileName;
@@ -314,8 +317,8 @@ private:
 
 class ActionStreamVideo : public ResultAction {
 public:
-	ActionStreamVideo(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionStreamVideo(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	enum {
@@ -333,8 +336,8 @@ private:
 
 class ActionTimer : public ResultAction {
 public:
-	ActionTimer(const Common::String &line);
-	bool execute(ZVision *engine);
+	ActionTimer(ZVision *engine, const Common::String &line);
+	bool execute();
 
 private:
 	uint32 _key;
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 4d18306ce4..5a96a569ec 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -163,19 +163,19 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 
 		// Parse for the action type
 		if (line.matchString("*:add*", true)) {
-			actionList.push_back(new ActionAdd(line));
+			actionList.push_back(new ActionAdd(_engine, line));
 		} else if (line.matchString("*:animplay*", true)) {
-			actionList.push_back(new ActionPlayAnimation(line));
+			actionList.push_back(new ActionPlayAnimation(_engine, line));
 		} else if (line.matchString("*:animpreload*", true)) {
-			actionList.push_back(new ActionPreloadAnimation(line));
+			actionList.push_back(new ActionPreloadAnimation(_engine, line));
 		} else if (line.matchString("*:animunload*", true)) {
-			//actionList.push_back(new ActionUnloadAnimation(line));
+			//actionList.push_back(new ActionUnloadAnimation(_engine, line));
 		} else if (line.matchString("*:attenuate*", true)) {
 			// TODO: Implement ActionAttenuate
 		} else if (line.matchString("*:assign*", true)) {
-			actionList.push_back(new ActionAssign(line));
+			actionList.push_back(new ActionAssign(_engine, line));
 		} else if (line.matchString("*:change_location*", true)) {
-			actionList.push_back(new ActionChangeLocation(line));
+			actionList.push_back(new ActionChangeLocation(_engine, line));
 		} else if (line.matchString("*:crossfade*", true)) {
 			// TODO: Implement ActionCrossfade
 		} else if (line.matchString("*:debug*", true)) {
@@ -183,7 +183,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:delay_render*", true)) {
 			// TODO: Implement ActionDelayRender
 		} else if (line.matchString("*:disable_control*", true)) {
-			actionList.push_back(new ActionDisableControl(line));
+			actionList.push_back(new ActionDisableControl(_engine, line));
 		} else if (line.matchString("*:disable_venus*", true)) {
 			// TODO: Implement ActionDisableVenus
 		} else if (line.matchString("*:display_message*", true)) {
@@ -193,7 +193,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:distort*", true)) {
 			// TODO: Implement ActionDistort
 		} else if (line.matchString("*:enable_control*", true)) {
-			actionList.push_back(new ActionEnableControl(line));
+			actionList.push_back(new ActionEnableControl(_engine, line));
 		} else if (line.matchString("*:flush_mouse_events*", true)) {
 			// TODO: Implement ActionFlushMouseEvents
 		} else if (line.matchString("*:inventory*", true)) {
@@ -203,17 +203,17 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:menu_bar_enable*", true)) {
 			// TODO: Implement ActionMenuBarEnable
 		} else if (line.matchString("*:music*", true)) {
-			actionList.push_back(new ActionMusic(line));
+			actionList.push_back(new ActionMusic(_engine, line));
 		} else if (line.matchString("*:pan_track*", true)) {
 			// TODO: Implement ActionPanTrack
 		} else if (line.matchString("*:playpreload*", true)) {
-			actionList.push_back(new ActionPlayPreloadAnimation(line));
+			actionList.push_back(new ActionPlayPreloadAnimation(_engine, line));
 		} else if (line.matchString("*:preferences*", true)) {
 			// TODO: Implement ActionPreferences
 		} else if (line.matchString("*:quit*", true)) {
-			actionList.push_back(new ActionQuit());
+			actionList.push_back(new ActionQuit(_engine));
 		} else if (line.matchString("*:random*", true)) {
-			actionList.push_back(new ActionRandom(line));
+			actionList.push_back(new ActionRandom(_engine, line));
 		} else if (line.matchString("*:region*", true)) {
 			// TODO: Implement ActionRegion
 		} else if (line.matchString("*:restore_game*", true)) {
@@ -223,19 +223,19 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:save_game*", true)) {
 			// TODO: Implement ActionSaveGame
 		} else if (line.matchString("*:set_partial_screen*", true)) {
-			actionList.push_back(new ActionSetPartialScreen(line));
+			actionList.push_back(new ActionSetPartialScreen(_engine, line));
 		} else if (line.matchString("*:set_screen*", true)) {
-			actionList.push_back(new ActionSetScreen(line));
+			actionList.push_back(new ActionSetScreen(_engine, line));
 		} else if (line.matchString("*:set_venus*", true)) {
 			// TODO: Implement ActionSetVenus
 		} else if (line.matchString("*:stop*", true)) {
 			// TODO: Implement ActionStop
 		} else if (line.matchString("*:streamvideo*", true)) {
-			actionList.push_back(new ActionStreamVideo(line));
+			actionList.push_back(new ActionStreamVideo(_engine, line));
 		} else if (line.matchString("*:syncsound*", true)) {
 			// TODO: Implement ActionSyncSound
 		} else if (line.matchString("*:timer*", true)) {
-			actionList.push_back(new ActionTimer(line));
+			actionList.push_back(new ActionTimer(_engine, line));
 		} else if (line.matchString("*:ttytext*", true)) {
 			// TODO: Implement ActionTTYText
 		} else if (line.matchString("*:universe_music*", true)) {
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 74035fd41f..3054466cd0 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -205,7 +205,7 @@ void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 
 		bool shouldContinue = true;
 		for (Common::List<ResultAction *>::iterator resultIter = puzzle->resultActions.begin(); resultIter != puzzle->resultActions.end(); ++resultIter) {
-			shouldContinue = shouldContinue && (*resultIter)->execute(_engine);
+			shouldContinue = shouldContinue && (*resultIter)->execute();
 			if (!shouldContinue) {
 				break;
 			}
-- 
cgit v1.2.3


From 41088f5516ba9566dcd558a103216c3798bcf9d4 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 29 Oct 2013 19:41:38 +0000
Subject: ZVISION: Make setPartialScreen use mask color correctly.

---
 engines/zvision/actions.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 68c279754d..8340c02428 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -313,16 +313,23 @@ bool ActionRandom::execute() {
 ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, const Common::String &line) :
 	ResultAction(engine) {
 	char fileName[25];
-	uint color;
+	int color;
 
-	sscanf(line.c_str(), "%*[^(](%u %u %25s %*u %u)", &_x, &_y, fileName, &color);
+	sscanf(line.c_str(), "%*[^(](%u %u %25s %*u %d)", &_x, &_y, fileName, &color);
 
 	_fileName = Common::String(fileName);
 
-	if (color > 0xFFFF) {
+	if (color >= 0) {
+		byte r, g, b;
+		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(color, r, g, b);
+		_backgroundColor = _engine->_pixelFormat.RGBToColor(r, g, b);
+	} else {
+		_backgroundColor = color;
+	}
+
+	if (color > 65535) {
 		warning("Background color for ActionSetPartialScreen is bigger than a uint16");
 	}
-	_backgroundColor = color;
 }
 
 bool ActionSetPartialScreen::execute() {
-- 
cgit v1.2.3


From fa74bcc4d50c746c3f06b156200a064a11369baa Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 30 Oct 2013 07:51:05 +0000
Subject: ZVISION: Add to sidefx and scriptManager classes stop and kill
 methods

---
 engines/zvision/script_manager.cpp | 46 ++++++++++++++++++++++++++++++++++++++
 engines/zvision/script_manager.h   |  4 ++++
 engines/zvision/sidefx.h           |  5 +++++
 3 files changed, 55 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 3054466cd0..111865302a 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -336,6 +336,52 @@ SideFX *ScriptManager::getSideFX(uint32 key) {
 	return nullptr;
 }
 
+void ScriptManager::deleteSideFx(uint32 key) {
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter) {
+		if ((*iter)->getKey() == key) {
+			delete(*iter);
+			_activeSideFx.erase(iter);
+			break;
+		}
+	}
+}
+
+void ScriptManager::stopSideFx(uint32 key) {
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter) {
+		if ((*iter)->getKey() == key) {
+			bool ret = (*iter)->stop();
+			if (ret) {
+				delete(*iter);
+				_activeSideFx.erase(iter);
+			}
+			break;
+		}
+	}
+}
+
+void ScriptManager::killSideFx(uint32 key) {
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter) {
+		if ((*iter)->getKey() == key) {
+			(*iter)->kill();
+			delete(*iter);
+			_activeSideFx.erase(iter);
+			break;
+		}
+	}
+}
+
+void ScriptManager::killSideFxType(SideFX::SideFXType type) {
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end();) {
+		if ((*iter)->getType() & type) {
+			(*iter)->kill();
+			delete(*iter);
+			_activeSideFx.erase(iter);
+		} else {
+			++iter;
+		}
+	}
+}
+
 void ScriptManager::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (!_activeControls)
 		return;
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 90df2ccee5..3399484970 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -187,6 +187,10 @@ public:
 
 	void addSideFX(SideFX *fx);
 	SideFX *getSideFX(uint32 key);
+	void deleteSideFx(uint32 key);
+	void stopSideFx(uint32 key);
+	void killSideFx(uint32 key);
+	void killSideFxType(SideFX::SideFXType type);
 
 	/**
 	 * Called when LeftMouse is pushed.
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index 6f75ad6649..9c18371ef4 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -88,6 +88,11 @@ public:
 		return false;
 	}
 
+	virtual bool stop() {
+		return true;
+	}
+	virtual void kill() {}
+
 protected:
 	ZVision *_engine;
 	uint32 _key;
-- 
cgit v1.2.3


From b0f74feb41dfd732480a49dd233b59f33a43be88 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 30 Oct 2013 07:53:47 +0000
Subject: ZVISION: Define all sidefx types.

---
 engines/zvision/sidefx.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index 9c18371ef4..210d98effb 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -37,8 +37,15 @@ class SideFX {
 public:
 
 	enum SideFXType {
-	    SIDEFX_UNK   = 0,
-	    SIDEFX_TIMER = 1
+	    SIDEFX_ANIM  = 1,
+	    SIDEFX_AUDIO = 2,
+	    SIDEFX_DISTORT = 4,
+	    SIDEFX_PANTRACK = 8,
+	    SIDEFX_REGION = 16,
+	    SIDEFX_TIMER = 32,
+	    SIDEFX_TTYTXT = 64,
+	    SIDEFX_UNK = 128,
+	    SIDEFX_ALL = 255
 	};
 
 	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
-- 
cgit v1.2.3


From a8feff10b883d686b37a709c483129602187c155 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 30 Oct 2013 07:57:39 +0000
Subject: ZVISION: Add universe scope of puzzles to reference table.

---
 engines/zvision/script_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 111865302a..fe8ec897b9 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -446,6 +446,8 @@ void ScriptManager::do_changeLocation() {
 	cleanScriptScope(room);
 	cleanScriptScope(world);
 
+	addPuzzlesToReferenceTable(universe);
+
 	// Parse into puzzles and controls
 	Common::String fileName = Common::String::format("%c%c%c%c.scr", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view);
 	parseScrFile(fileName, nodeview);
-- 
cgit v1.2.3


From e38ca6e7a952b79e1432e322905687c9e11ebb47 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 30 Oct 2013 16:17:29 +0700
Subject: ZVISION: New class for handle values and values from [slots].

---
 engines/zvision/script_manager.cpp | 23 +++++++++++++++++++++++
 engines/zvision/script_manager.h   | 10 ++++++++++
 2 files changed, 33 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index fe8ec897b9..e88c1ebca7 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -515,4 +515,27 @@ Location ScriptManager::getCurrentLocation() const {
 	return location;
 }
 
+ValueSlot::ValueSlot(ScriptManager *sc_man, const char *slot_val):
+	_sc_man(sc_man) {
+	value = 0;
+	slot = false;
+	const char *is_slot = strstr(slot_val, "[");
+	if (is_slot) {
+		slot = true;
+		value = atoi(is_slot + 1);
+	} else {
+		slot = false;
+		value = atoi(slot_val);
+	}
+}
+int16 ValueSlot::getValue() {
+	if (slot) {
+		if (value >= 0)
+			return _sc_man->getStateValue(value);
+		else
+			return 0;
+	} else
+		return value;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 3399484970..dd995f4661 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -304,6 +304,16 @@ private:
 	Control *parseControl(Common::String &line, Common::SeekableReadStream &stream);
 };
 
+class ValueSlot {
+public:
+	ValueSlot(ScriptManager *sc_man, const char *slot_val);
+	int16 getValue();
+private:
+	int16 value;
+	bool slot;
+	ScriptManager *_sc_man;
+};
+
 
 } // End of namespace ZVision
 
-- 
cgit v1.2.3


From fa943f1044e78ad9b1305f2d91085c25a945aaa9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 30 Oct 2013 16:21:38 +0700
Subject: ZVISION: Move actionTimer to use ValueSlot class.

---
 engines/zvision/actions.cpp | 12 ++++++++++--
 engines/zvision/actions.h   |  5 +++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 8340c02428..08e99dc501 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -399,11 +399,19 @@ bool ActionStreamVideo::execute() {
 
 ActionTimer::ActionTimer(ZVision *engine, const Common::String &line) :
 	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%u)", &_key, &_time);
+	char time_buf[64];
+	memset(time_buf, 0, 64);
+	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%s)", &_key, time_buf);
+	_time = new ValueSlot(_engine->getScriptManager(), time_buf);
+}
+
+ActionTimer::~ActionTimer() {
+	if (_time)
+		delete _time;
 }
 
 bool ActionTimer::execute() {
-	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _key, _time));
+	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _key, _time->getValue()));
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index f779c1fa2f..e900167068 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -32,6 +32,7 @@ namespace ZVision {
 
 // Forward declaration of ZVision. This file is included before ZVision is declared
 class ZVision;
+class ValueSlot;
 
 /**
   * The base class that represents any action that a Puzzle can take.
@@ -337,11 +338,11 @@ private:
 class ActionTimer : public ResultAction {
 public:
 	ActionTimer(ZVision *engine, const Common::String &line);
+	~ActionTimer();
 	bool execute();
-
 private:
 	uint32 _key;
-	uint _time;
+	ValueSlot *_time;
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From b2aa30afebe9c799ad2513f6c22cd798c1818eb0 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 31 Oct 2013 07:45:43 +0000
Subject: ZVISION: Correct timer code to match original.

---
 engines/zvision/actions.cpp      |  1 +
 engines/zvision/script_manager.h |  1 +
 engines/zvision/timer_node.cpp   | 19 ++++++++++++++-----
 engines/zvision/timer_node.h     |  2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 08e99dc501..d7921d3653 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -408,6 +408,7 @@ ActionTimer::ActionTimer(ZVision *engine, const Common::String &line) :
 ActionTimer::~ActionTimer() {
 	if (_time)
 		delete _time;
+	_engine->getScriptManager()->killSideFx(_key);
 }
 
 bool ActionTimer::execute() {
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index dd995f4661..c75296b586 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -49,6 +49,7 @@ enum StateKey {
 	StateKey_KeyPress = 8,
 	StateKey_InventoryItem = 9,
 	StateKey_LMouse = 10,
+	StateKey_NotSet = 11, // This key doesn't set
 	StateKey_Rounds = 12,
 	StateKey_Venus = 13,
 	StateKey_RMouse = 18,
diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index c7cefd6150..f8da0bcf37 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -38,25 +38,34 @@ TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
 		_timeLeft = timeInSeconds * 1000;
 	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
 		_timeLeft = timeInSeconds * 100;
-	_engine->getScriptManager()->setStateValue(_key, 1);
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
 }
 
 TimerNode::~TimerNode() {
-	if (_timeLeft <= 0)
+	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 2);
-	else
-		_engine->getScriptManager()->setStateValue(_key, _timeLeft); // If timer was stopped by stop or kill
+	int32 timeLeft = _timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100);
+	if (timeLeft > 0)
+		_engine->getScriptManager()->setStateValue(_key, timeLeft); // If timer was stopped by stop or kill
 }
 
 bool TimerNode::process(uint32 deltaTimeInMillis) {
 	_timeLeft -= deltaTimeInMillis;
 
 	if (_timeLeft <= 0)
-		return true;
+		return stop();
 
 	return false;
 }
 
+bool TimerNode::stop() {
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	return true;
+}
+
 void TimerNode::serialize(Common::WriteStream *stream) {
 	stream->writeUint32LE(_key);
 	stream->writeUint32LE(_timeLeft);
diff --git a/engines/zvision/timer_node.h b/engines/zvision/timer_node.h
index 4a9c95d72b..f6584becda 100644
--- a/engines/zvision/timer_node.h
+++ b/engines/zvision/timer_node.h
@@ -48,6 +48,8 @@ public:
 		return true;
 	}
 
+	bool stop();
+
 private:
 	int32 _timeLeft;
 };
-- 
cgit v1.2.3


From 0b61b653aea21bf0329bcd5738617611d7109ee8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 31 Oct 2013 08:20:57 +0000
Subject: ZVISION: Handle go to 0000 - previous location.

---
 engines/zvision/script_manager.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index e88c1ebca7..c4ea8be9a2 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -431,15 +431,53 @@ void ScriptManager::changeLocation(char _world, char _room, char _node, char _vi
 	_nextLocation.node = _node;
 	_nextLocation.view = _view;
 	_nextLocation.offset = offset;
+	// If next location 0000 - it's indicate to go to previous location.
+	if (_nextLocation.world == '0' && _nextLocation.room == '0' && _nextLocation.node == '0' && _nextLocation.view == '0') {
+		if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
+			_nextLocation.world = getStateValue(StateKey_LastWorld);
+			_nextLocation.room = getStateValue(StateKey_LastRoom);
+			_nextLocation.node = getStateValue(StateKey_LastNode);
+			_nextLocation.view = getStateValue(StateKey_LastView);
+			_nextLocation.offset = getStateValue(StateKey_LastViewPos);
+		} else {
+			_nextLocation.world = getStateValue(StateKey_Menu_LastWorld);
+			_nextLocation.room = getStateValue(StateKey_Menu_LastRoom);
+			_nextLocation.node = getStateValue(StateKey_Menu_LastNode);
+			_nextLocation.view = getStateValue(StateKey_Menu_LastView);
+			_nextLocation.offset = getStateValue(StateKey_Menu_LastViewPos);
+		}
+	}
 }
 
 void ScriptManager::do_changeLocation() {
 	assert(_nextLocation.world != 0);
 	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
+	if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
+		if (_nextLocation.world != 'g' || _nextLocation.room != 'j') {
+			setStateValue(StateKey_LastWorld, getStateValue(StateKey_World));
+			setStateValue(StateKey_LastRoom, getStateValue(StateKey_Room));
+			setStateValue(StateKey_LastNode, getStateValue(StateKey_Node));
+			setStateValue(StateKey_LastView, getStateValue(StateKey_View));
+			setStateValue(StateKey_LastViewPos, getStateValue(StateKey_ViewPos));
+		} else {
+			setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
+			setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
+			setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
+			setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
+			setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
+		}
+	}
+
 	// Auto save
 	//_engine->getSaveManager()->autoSave();
 
+	setStateValue(StateKey_World, _nextLocation.world);
+	setStateValue(StateKey_Room, _nextLocation.room);
+	setStateValue(StateKey_Node, _nextLocation.node);
+	setStateValue(StateKey_View, _nextLocation.view);
+	setStateValue(StateKey_ViewPos, _nextLocation.offset);
+
 	// Clear all the containers
 	_referenceTable.clear();
 	cleanScriptScope(nodeview);
-- 
cgit v1.2.3


From 44464ce686f26128a37ef3b8da17ed01f436b928 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 31 Oct 2013 09:53:17 +0700
Subject: ZVISION: Fix actionRandom parameter reader.

---
 engines/zvision/actions.cpp | 12 ++++++++++--
 engines/zvision/actions.h   |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index d7921d3653..5fbfbd6436 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -296,11 +296,19 @@ bool ActionQuit::execute() {
 
 ActionRandom::ActionRandom(ZVision *engine, const Common::String &line) :
 	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u, %u)", &_key, &_max);
+	char max_buf[64];
+	memset(max_buf, 0, 64);
+	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%s)", &_key, max_buf);
+	_max = new ValueSlot(_engine->getScriptManager(), max_buf);
+}
+
+ActionRandom::~ActionRandom() {
+	if (_max)
+		delete _max;
 }
 
 bool ActionRandom::execute() {
-	uint randNumber = _engine->getRandomSource()->getRandomNumber(_max);
+	uint randNumber = _engine->getRandomSource()->getRandomNumber(_max->getValue());
 	_engine->getScriptManager()->setStateValue(_key, randNumber);
 	return true;
 }
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index e900167068..cc32cc0b43 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -288,11 +288,12 @@ public:
 class ActionRandom : public ResultAction {
 public:
 	ActionRandom(ZVision *engine, const Common::String &line);
+	~ActionRandom();
 	bool execute();
 
 private:
 	uint32 _key;
-	uint _max;
+	ValueSlot *_max;
 };
 
 class ActionSetPartialScreen : public ResultAction {
-- 
cgit v1.2.3


From 1477192e8c46918bd56d2430fc04b14495e3e8dd Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:05:15 +0700
Subject: ZVISION: Fix ZorkRaw stream decoder return true instead of real flag.

---
 engines/zvision/zork_raw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h
index 29b555912d..5a07afad05 100644
--- a/engines/zvision/zork_raw.h
+++ b/engines/zvision/zork_raw.h
@@ -107,7 +107,7 @@ public:
 	int readBuffer(int16 *buffer, const int numSamples);
 
 	bool isStereo() const {
-		return true;
+		return _stereo;
 	}
 	bool endOfData() const {
 		return _endOfData;
-- 
cgit v1.2.3


From a5430c7703331e6180c17b89c95372feb73f0092 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:23:08 +0700
Subject: ZVISION: Don't use unneeded function.

---
 engines/zvision/actions.cpp        | 2 +-
 engines/zvision/script_manager.cpp | 5 -----
 engines/zvision/script_manager.h   | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 5fbfbd6436..ea0d06b1d7 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -49,7 +49,7 @@ ActionAdd::ActionAdd(ZVision *engine, const Common::String &line) :
 }
 
 bool ActionAdd::execute() {
-	_engine->getScriptManager()->addToStateValue(_key, _value);
+	_engine->getScriptManager()->setStateValue(_key, _engine->getScriptManager()->getStateValue(_key) + _value);
 	return true;
 }
 
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index c4ea8be9a2..e7ec34f9e7 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -296,11 +296,6 @@ void ScriptManager::unsetStateFlag(uint32 key, uint value) {
 	}
 }
 
-void ScriptManager::addToStateValue(uint32 key, uint valueToAdd) {
-	_globalState[key] += valueToAdd;
-}
-
-
 Control *ScriptManager::getControl(uint32 key) {
 
 	return nullptr;
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index c75296b586..07c09c513e 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -172,7 +172,6 @@ public:
 
 	uint getStateValue(uint32 key);
 	void setStateValue(uint32 key, uint value);
-	void addToStateValue(uint32 key, uint valueToAdd);
 
 	uint getStateFlag(uint32 key);
 	void setStateFlag(uint32 key, uint value);
-- 
cgit v1.2.3


From d3ef75dac9a1ac9f091ccc75bf1bc51647a8ba02 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:43:33 +0700
Subject: ZVISION: Replace ZorkRaw audio parameters table by fully implemented
 with 16bit flag.

---
 engines/zvision/zork_raw.cpp | 73 ++++++++++++++++++++++++++++++++++++--------
 engines/zvision/zork_raw.h   |  5 +--
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index ce83add1df..e7cc71a70b 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -140,19 +140,64 @@ int RawChunkStream::readBuffer(int16 *buffer, Common::SeekableReadStream *stream
 	return bytesRead;
 }
 
-const SoundParams RawZorkStream::_zNemSoundParamLookupTable[6] = {{'6', 0x2B11, false, false},
-	{'a', 0x5622, false,  true},
-	{'b', 0x5622, true,  true},
-	{'n', 0x2B11, false, true},
-	{'s', 0x5622, false, true},
-	{'t', 0x5622, true, true}
+const SoundParams RawZorkStream::_zNemSoundParamLookupTable[32] = {{'0', 0x1F40, false, false, false},
+	{'1', 0x1F40, true, false, false},
+	{'2', 0x1F40, false, false, true},
+	{'3', 0x1F40, true, false, true},
+	{'4', 0x2B11, false, false, false},
+	{'5', 0x2B11, true, false, false},
+	{'6', 0x2B11, false, false, true},
+	{'7', 0x2B11, true, false, true},
+	{'8', 0x5622, false, false, false},
+	{'9', 0x5622, true, false, false},
+	{'a', 0x5622, false, false, true},
+	{'b', 0x5622, true, false, true},
+	{'c', 0xAC44, false, false, false},
+	{'d', 0xAC44, true, false, false},
+	{'e', 0xAC44, false, false, true},
+	{'f', 0xAC44, true, false, true},
+	{'g', 0x1F40, false, true, false},
+	{'h', 0x1F40, true, true, false},
+	{'j', 0x1F40, false, true, true},
+	{'k', 0x1F40, true, true, true},
+	{'l', 0x2B11, false, true, false},
+	{'m', 0x2B11, true, true, false},
+	{'n', 0x2B11, false, true, true},
+	{'p', 0x2B11, true, true, true},
+	{'q', 0x5622, false, true, false},
+	{'r', 0x5622, true, true, false},
+	{'s', 0x5622, false, true, true},
+	{'t', 0x5622, true, true, true},
+	{'u', 0xAC44, false, true, false},
+	{'v', 0xAC44, true, true, false},
+	{'w', 0xAC44, false, true, true},
+	{'x', 0xAC44, true, true, true}
 };
 
-const SoundParams RawZorkStream::_zgiSoundParamLookupTable[5] = {{'a', 0x5622, false, false},
-	{'k', 0x2B11, true, true},
-	{'p', 0x5622, false, true},
-	{'q', 0x5622, true, true},
-	{'u', 0xAC44, true, true}
+const SoundParams RawZorkStream::_zgiSoundParamLookupTable[24] = {{'4', 0x2B11, false, false, false},
+	{'5', 0x2B11, true, false, false},
+	{'6', 0x2B11, false, false, true},
+	{'7', 0x2B11, true, false, true},
+	{'8', 0x5622, false, false, false},
+	{'9', 0x5622, true, false, false},
+	{'a', 0x5622, false, false, true},
+	{'b', 0x5622, true, false, true},
+	{'c', 0xAC44, false, false, false},
+	{'d', 0xAC44, true, false, false},
+	{'e', 0xAC44, false, false, true},
+	{'f', 0xAC44, true, false, true},
+	{'g', 0x2B11, false, true, false},
+	{'h', 0x2B11, true, true, false},
+	{'j', 0x2B11, false, true, true},
+	{'k', 0x2B11, true, true, true},
+	{'m', 0x5622, false, true, false},
+	{'n', 0x5622, true, true, false},
+	{'p', 0x5622, false, true, true},
+	{'q', 0x5622, true, true, true},
+	{'r', 0xAC44, false, true, false},
+	{'s', 0xAC44, true, true, false},
+	{'t', 0xAC44, false, true, true},
+	{'u', 0xAC44, true, true, true}
 };
 
 RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream)
@@ -217,12 +262,12 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 	SoundParams soundParams;
 
 	if (engine->getGameId() == GID_NEMESIS) {
-		for (int i = 0; i < 6; ++i) {
+		for (int i = 0; i < 32; ++i) {
 			if (RawZorkStream::_zNemSoundParamLookupTable[i].identifier == (fileName[6]))
 				soundParams = RawZorkStream::_zNemSoundParamLookupTable[i];
 		}
 	} else if (engine->getGameId() == GID_GRANDINQUISITOR) {
-		for (int i = 0; i < 6; ++i) {
+		for (int i = 0; i < 24; ++i) {
 			if (RawZorkStream::_zgiSoundParamLookupTable[i].identifier == (fileName[7]))
 				soundParams = RawZorkStream::_zgiSoundParamLookupTable[i];
 		}
@@ -232,6 +277,8 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 		return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES);
 	} else {
 		byte flags = 0;
+		if (soundParams.bits16)
+			flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
 		if (soundParams.stereo)
 			flags |= Audio::FLAG_STEREO;
 
diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h
index 5a07afad05..a5e346dfbb 100644
--- a/engines/zvision/zork_raw.h
+++ b/engines/zvision/zork_raw.h
@@ -39,6 +39,7 @@ struct SoundParams {
 	uint32 rate;
 	bool stereo;
 	bool packed;
+	bool bits16;
 };
 
 
@@ -91,8 +92,8 @@ public:
 	}
 
 public:
-	static const SoundParams _zNemSoundParamLookupTable[6];
-	static const SoundParams _zgiSoundParamLookupTable[5];
+	static const SoundParams _zNemSoundParamLookupTable[32];
+	static const SoundParams _zgiSoundParamLookupTable[24];
 
 private:
 	const int _rate;                                           // Sample rate of stream
-- 
cgit v1.2.3


From f46d63d35c61c9076a3c4ef9936bd88dbf8b8218 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:44:44 +0700
Subject: ZVISION: Implement engine-wide method for selecting new audio ID.

---
 engines/zvision/zvision.cpp | 10 +++++++++-
 engines/zvision/zvision.h   |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 8be85d39d4..9a93259ff4 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -61,7 +61,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _renderManager(nullptr),
 	  _saveManager(nullptr),
 	  _stringManager(nullptr),
-	  _cursorManager(nullptr) {
+	  _cursorManager(nullptr),
+	  _aud_id(0) {
 
 	debug(1, "ZVision::ZVision");
 }
@@ -182,4 +183,11 @@ Common::String ZVision::generateAutoSaveFileName() {
 	return Common::String::format("%s.auto", _targetName.c_str());
 }
 
+int ZVision::getAudioId() {
+	_aud_id++;
+	if (_aud_id < 0)
+		_aud_id = 0;
+	return _aud_id;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 10711b1605..e7709283ae 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -101,6 +101,9 @@ private:
 	// Clock
 	Clock _clock;
 
+	// Audio ID
+	int _aud_id;
+
 	// To prevent allocation every time we process events
 	Common::Event _event;
 
@@ -145,6 +148,8 @@ public:
 	 */
 	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true);
 
+	int getAudioId();
+
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
-- 
cgit v1.2.3


From 7f166720372ef8e4fd95cc4622801d420a8669d6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:46:24 +0700
Subject: ZVISION: StateValue must be signed.

---
 engines/zvision/script_manager.cpp | 6 +++---
 engines/zvision/script_manager.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index e7ec34f9e7..b58056ab29 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -162,7 +162,7 @@ void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 
 		for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
 			// Get the value to compare against
-			uint argumentValue;
+			int argumentValue;
 			if (entryIter->argumentIsAKey)
 				argumentValue = getStateValue(entryIter->argument);
 			else
@@ -246,7 +246,7 @@ void ScriptManager::cleanScriptScope(script_scope &scope) {
 	scope.proc_count = 0;
 }
 
-uint ScriptManager::getStateValue(uint32 key) {
+int ScriptManager::getStateValue(uint32 key) {
 	if (_globalState.contains(key))
 		return _globalState[key];
 	else
@@ -263,7 +263,7 @@ void ScriptManager::queuePuzzles(uint32 key) {
 	}
 }
 
-void ScriptManager::setStateValue(uint32 key, uint value) {
+void ScriptManager::setStateValue(uint32 key, int value) {
 	if (value == 0)
 		_globalState.erase(key);
 	else
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 07c09c513e..487a27cf05 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -109,7 +109,7 @@ struct Location {
 typedef Common::List<Puzzle *> PuzzleList;
 typedef Common::Queue<Puzzle *> PuzzleQueue;
 typedef Common::List<Control *> ControlList;
-typedef Common::HashMap<uint32, uint32> StateMap;
+typedef Common::HashMap<uint32, int32> StateMap;
 typedef Common::List<SideFX *> SideFXList;
 
 class ScriptManager {
@@ -170,8 +170,8 @@ public:
 	void update(uint deltaTimeMillis);
 	void queuePuzzles(uint32 key);
 
-	uint getStateValue(uint32 key);
-	void setStateValue(uint32 key, uint value);
+	int getStateValue(uint32 key);
+	void setStateValue(uint32 key, int value);
 
 	uint getStateFlag(uint32 key);
 	void setStateFlag(uint32 key, uint value);
-- 
cgit v1.2.3


From a35900142f6a316fde6463b470dbf97ce8426752 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:47:47 +0700
Subject: ZVISION: ActionAdd must handle negative vallues.

---
 engines/zvision/actions.cpp | 2 +-
 engines/zvision/actions.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index ea0d06b1d7..5af637f9be 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -45,7 +45,7 @@ namespace ZVision {
 
 ActionAdd::ActionAdd(ZVision *engine, const Common::String &line) :
 	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%u,%u)", &_key, &_value);
+	sscanf(line.c_str(), "%*[^(](%u,%d)", &_key, &_value);
 }
 
 bool ActionAdd::execute() {
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index cc32cc0b43..e2e57c3a74 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -94,7 +94,7 @@ public:
 
 private:
 	uint32 _key;
-	uint _value;
+	int _value;
 };
 
 class ActionAssign : public ResultAction {
-- 
cgit v1.2.3


From e1df572ab848f64826fc5cb4a0f22ccddd135871 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:53:46 +0700
Subject: ZVISION: Implement ActionKill.

---
 engines/zvision/actions.cpp           | 40 +++++++++++++++++++++++++++++++++++
 engines/zvision/actions.h             | 10 +++++++++
 engines/zvision/scr_file_handling.cpp |  2 +-
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 5af637f9be..2a79500427 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -152,6 +152,46 @@ bool ActionEnableControl::execute() {
 }
 
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionKill
+//////////////////////////////////////////////////////////////////////////////
+
+ActionKill::ActionKill(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
+	_key = 0;
+	_type = 0;
+	char keytype[25];
+	sscanf(line.c_str(), "%*[^(](%25s)", keytype);
+	if (keytype[0] == '"') {
+		if (!scumm_stricmp(keytype, "\"ANIM\""))
+			_type = SideFX::SIDEFX_ANIM;
+		else if (!scumm_stricmp(keytype, "\"AUDIO\""))
+			_type = SideFX::SIDEFX_AUDIO;
+		else if (!scumm_stricmp(keytype, "\"DISTORT\""))
+			_type = SideFX::SIDEFX_DISTORT;
+		else if (!scumm_stricmp(keytype, "\"PANTRACK\""))
+			_type = SideFX::SIDEFX_PANTRACK;
+		else if (!scumm_stricmp(keytype, "\"REGION\""))
+			_type = SideFX::SIDEFX_REGION;
+		else if (!scumm_stricmp(keytype, "\"TIMER\""))
+			_type = SideFX::SIDEFX_TIMER;
+		else if (!scumm_stricmp(keytype, "\"TTYTEXT\""))
+			_type = SideFX::SIDEFX_TTYTXT;
+		else if (!scumm_stricmp(keytype, "\"ALL\""))
+			_type = SideFX::SIDEFX_ALL;
+	} else
+		_key = atoi(keytype);
+}
+
+bool ActionKill::execute() {
+	if (_type)
+		_engine->getScriptManager()->killSideFxType((SideFX::SideFXType)_type);
+	else
+		_engine->getScriptManager()->killSideFx(_key);
+	return true;
+}
+
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionMusic
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index e2e57c3a74..bcd7848c10 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -211,6 +211,16 @@ private:
 	uint32 _key;
 };
 
+class ActionKill : public ResultAction {
+public:
+	ActionKill(ZVision *engine, const Common::String &line);
+	bool execute();
+
+private:
+	uint32 _key;
+	uint32 _type;
+};
+
 class ActionMusic : public ResultAction {
 public:
 	ActionMusic(ZVision *engine, const Common::String &line);
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 5a96a569ec..edb496a0eb 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -199,7 +199,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:inventory*", true)) {
 			// TODO: Implement ActionInventory
 		} else if (line.matchString("*:kill*", true)) {
-			// TODO: Implement ActionKill
+			actionList.push_back(new ActionKill(_engine, line));
 		} else if (line.matchString("*:menu_bar_enable*", true)) {
 			// TODO: Implement ActionMenuBarEnable
 		} else if (line.matchString("*:music*", true)) {
-- 
cgit v1.2.3


From be93d7d67dcea18532917a6c1bd6004665973f4f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 16:55:19 +0700
Subject: ZVISION: Implement ActionStop.

---
 engines/zvision/actions.cpp           | 15 +++++++++++++++
 engines/zvision/actions.h             |  9 +++++++++
 engines/zvision/scr_file_handling.cpp |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 2a79500427..06ceea2573 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -409,6 +409,21 @@ bool ActionSetScreen::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionStop
+//////////////////////////////////////////////////////////////////////////////
+
+ActionStop::ActionStop(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
+	_key = 0;
+	sscanf(line.c_str(), "%*[^(](%u)", &_key);
+}
+
+bool ActionStop::execute() {
+	_engine->getScriptManager()->stopSideFx(_key);
+	return true;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionStreamVideo
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index bcd7848c10..8a8412fed5 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -327,6 +327,15 @@ private:
 	Common::String _fileName;
 };
 
+class ActionStop : public ResultAction {
+public:
+	ActionStop(ZVision *engine, const Common::String &line);
+	bool execute();
+
+private:
+	uint32 _key;
+};
+
 class ActionStreamVideo : public ResultAction {
 public:
 	ActionStreamVideo(ZVision *engine, const Common::String &line);
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index edb496a0eb..bfa1481007 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -229,7 +229,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:set_venus*", true)) {
 			// TODO: Implement ActionSetVenus
 		} else if (line.matchString("*:stop*", true)) {
-			// TODO: Implement ActionStop
+			actionList.push_back(new ActionStop(_engine, line));
 		} else if (line.matchString("*:streamvideo*", true)) {
 			actionList.push_back(new ActionStreamVideo(_engine, line));
 		} else if (line.matchString("*:syncsound*", true)) {
-- 
cgit v1.2.3


From 9dc0533f4f077a2a5edce902e8d93860c68c3fda Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 17:00:20 +0700
Subject: ZVISION: Implement MusicNode and move ActionMusic to work with it.

---
 engines/zvision/actions.cpp           | 47 ++++++++++++-------
 engines/zvision/actions.h             |  4 +-
 engines/zvision/module.mk             |  3 +-
 engines/zvision/music_node.cpp        | 86 +++++++++++++++++++++++++++++++++++
 engines/zvision/music_node.h          | 62 +++++++++++++++++++++++++
 engines/zvision/scr_file_handling.cpp |  4 +-
 6 files changed, 185 insertions(+), 21 deletions(-)
 create mode 100644 engines/zvision/music_node.cpp
 create mode 100644 engines/zvision/music_node.h

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 06ceea2573..3dd6382060 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -30,6 +30,7 @@
 #include "zvision/zork_raw.h"
 #include "zvision/zork_avi_decoder.h"
 #include "zvision/timer_node.h"
+#include "zvision/music_node.h"
 #include "zvision/animation_control.h"
 
 #include "common/file.h"
@@ -196,9 +197,10 @@ bool ActionKill::execute() {
 // ActionMusic
 //////////////////////////////////////////////////////////////////////////////
 
-ActionMusic::ActionMusic(ZVision *engine, const Common::String &line) :
+ActionMusic::ActionMusic(ZVision *engine, const Common::String &line, bool global) :
 	ResultAction(engine),
-	_volume(255) {
+	_volume(255),
+	_universe(global) {
 	uint type;
 	char fileNameBuffer[25];
 	uint loop;
@@ -225,24 +227,35 @@ ActionMusic::ActionMusic(ZVision *engine, const Common::String &line) :
 	}
 }
 
-bool ActionMusic::execute() {
-	Audio::RewindableAudioStream *audioStream;
+ActionMusic::~ActionMusic() {
+	if (!_universe)
+		_engine->getScriptManager()->killSideFx(_key);
+}
 
-	if (_fileName.contains(".wav")) {
-		Common::File *file = new Common::File();
-		if (file->open(_fileName)) {
-			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+bool ActionMusic::execute() {
+	if (_engine->getScriptManager()->getSideFX(_key))
+		return true;
+	Common::File *file = new Common::File();
+	if (!file->exists(_fileName) && _fileName.size() >= 12) {
+		_fileName.setChar('r', 9);
+		_fileName.setChar('a', 10);
+		_fileName.setChar('w', 11);
+		if (!file->exists(_fileName)) {
+			_fileName.setChar('i', 9);
+			_fileName.setChar('f', 10);
+			_fileName.setChar('p', 11);
+			if (!file->exists(_fileName)) {
+				_fileName.setChar('s', 9);
+				_fileName.setChar('r', 10);
+				_fileName.setChar('c', 11);
+				if (!file->exists(_fileName))
+					return true;
+			}
 		}
-	} else {
-		audioStream = makeRawZorkStream(_fileName, _engine);
-	}
-
-	if (_loop) {
-		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-		_engine->_mixer->playStream(_soundType, 0, loopingAudioStream, -1, _volume);
-	} else {
-		_engine->_mixer->playStream(_soundType, 0, audioStream, -1, _volume);
 	}
+	if (file->exists(_fileName))
+		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _key, _fileName, _loop, _volume));
+	delete file;
 
 	return true;
 }
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 8a8412fed5..7464d83b09 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -223,7 +223,8 @@ private:
 
 class ActionMusic : public ResultAction {
 public:
-	ActionMusic(ZVision *engine, const Common::String &line);
+	ActionMusic(ZVision *engine, const Common::String &line, bool global);
+	~ActionMusic();
 	bool execute();
 
 private:
@@ -232,6 +233,7 @@ private:
 	Common::String _fileName;
 	bool _loop;
 	byte _volume;
+	bool _universe;
 };
 
 class ActionPlayAnimation : public ResultAction {
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index edd08c8e9f..8d37311462 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -30,7 +30,8 @@ MODULE_OBJS := \
 	zfs_archive.o \
 	zork_avi_decoder.o \
 	zork_raw.o \
-	sidefx.o
+	sidefx.o \
+	music_node.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
new file mode 100644
index 0000000000..6be4683178
--- /dev/null
+++ b/engines/zvision/music_node.cpp
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/music_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/script_manager.h"
+#include "zvision/zork_raw.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "audio/decoders/wave.h"
+
+
+namespace ZVision {
+
+MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
+	: SideFX(engine, key, SIDEFX_AUDIO) {
+	_loop = loop;
+	_volume = volume;
+	_crossfade = false;
+	_crossfade_delta = 0;
+	_crossfade_time = 0;
+	_attenuate = 0;
+	_pantrack = false;
+	_pantrack_X = 0;
+
+	Audio::RewindableAudioStream *audioStream;
+
+	if (filename.contains(".wav")) {
+		Common::File *file = new Common::File();
+		if (file->open(filename)) {
+			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+		}
+	} else {
+		audioStream = makeRawZorkStream(filename, _engine);
+	}
+
+	_id = _engine->getAudioId();
+
+	if (_loop) {
+		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
+		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, 0, loopingAudioStream, _id, _volume);
+	} else {
+		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, 0, audioStream, _id, _volume);
+	}
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+MusicNode::~MusicNode() {
+	_engine->_mixer->stopID(_id);
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	debug(1, "MusicNode: %d destroyed\n", _key);
+}
+
+bool MusicNode::process(uint32 deltaTimeInMillis) {
+	if (! _engine->_mixer->isSoundIDActive(_id))
+		return stop();
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
new file mode 100644
index 0000000000..6aed4556fa
--- /dev/null
+++ b/engines/zvision/music_node.h
@@ -0,0 +1,62 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_MUSIC_NODE_H
+#define ZVISION_MUSIC_NODE_H
+
+#include "zvision/sidefx.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class MusicNode : public SideFX {
+public:
+	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
+	~MusicNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	int32 _timeLeft;
+	bool _pantrack;
+	int32 _pantrack_X;
+	int32 _attenuate;
+	int8 _volume;
+	int32 _id;
+	bool _loop;
+	bool _crossfade;
+	int32 _crossfade_delta;
+	int32 _crossfade_time;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index bfa1481007..0df3143a51 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -203,7 +203,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:menu_bar_enable*", true)) {
 			// TODO: Implement ActionMenuBarEnable
 		} else if (line.matchString("*:music*", true)) {
-			actionList.push_back(new ActionMusic(_engine, line));
+			actionList.push_back(new ActionMusic(_engine, line, false));
 		} else if (line.matchString("*:pan_track*", true)) {
 			// TODO: Implement ActionPanTrack
 		} else if (line.matchString("*:playpreload*", true)) {
@@ -239,7 +239,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:ttytext*", true)) {
 			// TODO: Implement ActionTTYText
 		} else if (line.matchString("*:universe_music*", true)) {
-			// TODO: Implement ActionUniverseMusic
+			actionList.push_back(new ActionMusic(_engine, line, true));
 		} else if (line.matchString("*:copy_file*", true)) {
 			// Not used. Purposely left empty
 		} else {
-- 
cgit v1.2.3


From 6a135c677920184db0d055230c596fc4bd0a5960 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 1 Nov 2013 17:01:07 +0700
Subject: ZVISION: Add zgi_mx directory for files search

---
 engines/zvision/zvision.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 9a93259ff4..62061bfab6 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -95,6 +95,7 @@ void ZVision::initialize() {
 	SearchMan.addSubDirectoryMatching(gameDataDir, "zassets2", 0, 2, true);
 	SearchMan.addSubDirectoryMatching(gameDataDir, "znemmx", 0, 1, true);
 	SearchMan.addSubDirectoryMatching(gameDataDir, "zgi", 0, 4, true);
+	SearchMan.addSubDirectoryMatching(gameDataDir, "zgi_mx", 0, 1, true);
 	SearchMan.addSubDirectoryMatching(gameDataDir, "fonts", 0, 1, true);
 
 	// Find zfs archive files
-- 
cgit v1.2.3


From 5da10e99b25bfd866b1ef73cadee71bf9b825c52 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 7 Nov 2013 16:43:45 +0700
Subject: ZVISION: Make source surface const type for read-only access.

---
 engines/zvision/render_manager.cpp | 22 +++++++++++-----------
 engines/zvision/render_manager.h   | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index a240e766df..58df5a8d11 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -159,7 +159,7 @@ void RenderManager::clearWorkingWindowTo555Color(uint16 color) {
 	}
 }
 
-void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect) {
+void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect) {
 	if (src.format != dst.format)
 		return;
 
@@ -183,7 +183,7 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 		return;
 
 	// Copy rendRect from src surface to dst surface
-	byte *src_buf = (byte *)src.getBasePtr(rendRect.left, rendRect.top);
+	const byte *src_buf = (const byte *)src.getBasePtr(rendRect.left, rendRect.top);
 	byte *dst_buf = (byte *)dst.getBasePtr(dstRect.left, dstRect.top);
 
 	int32 w = rendRect.width();
@@ -196,7 +196,7 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 	}
 }
 
-void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect, uint32 keycolor) {
+void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect, uint32 keycolor) {
 	if (src.format != dst.format)
 		return;
 
@@ -222,7 +222,7 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 	uint32 _keycolor = keycolor & ((1 << (src.format.bytesPerPixel << 3)) - 1);
 
 	// Copy rendRect from src surface to dst surface
-	byte *src_buf = (byte *)src.getBasePtr(rendRect.left, rendRect.top);
+	const byte *src_buf = (const byte *)src.getBasePtr(rendRect.left, rendRect.top);
 	byte *dst_buf = (byte *)dst.getBasePtr(dstRect.left, dstRect.top);
 
 	int32 w = rendRect.width();
@@ -231,7 +231,7 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 	for (int32 y = 0; y < h; y++) {
 		switch (src.format.bytesPerPixel) {
 		case 1: {
-			uint *src_tmp = (uint *)src_buf;
+			const uint *src_tmp = (const uint *)src_buf;
 			uint *dst_tmp = (uint *)dst_buf;
 			for (int32 x = 0; x < w; x++) {
 				if (*src_tmp != _keycolor)
@@ -243,7 +243,7 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 		break;
 
 		case 2: {
-			uint16 *src_tmp = (uint16 *)src_buf;
+			const uint16 *src_tmp = (const uint16 *)src_buf;
 			uint16 *dst_tmp = (uint16 *)dst_buf;
 			for (int32 x = 0; x < w; x++) {
 				if (*src_tmp != _keycolor)
@@ -255,7 +255,7 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 		break;
 
 		case 4: {
-			uint32 *src_tmp = (uint32 *)src_buf;
+			const uint32 *src_tmp = (const uint32 *)src_buf;
 			uint32 *dst_tmp = (uint32 *)dst_buf;
 			for (int32 x = 0; x < w; x++) {
 				if (*src_tmp != _keycolor)
@@ -274,14 +274,14 @@ void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface
 	}
 }
 
-void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt) {
+void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt) {
 	if (!Common::Rect(dst.w, dst.h).contains(dstPt))
 		return;
 	Common::Rect dstRect(dstPt.x, dstPt.y, dst.w, dst.h);
 	copyRectToSurface(src, dst, srcRect, dstRect);
 }
 
-void RenderManager::copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 keycolor) {
+void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 keycolor) {
 	if (!Common::Rect(dst.w, dst.h).contains(dstPt))
 		return;
 	Common::Rect dstRect(dstPt.x, dstPt.y, dst.w, dst.h);
@@ -299,7 +299,7 @@ void RenderManager::renderImageToBackground(const Common::String &fileName, int1
 	moveBackground(0);
 }
 
-void RenderManager::renderImageToBackground(Graphics::Surface &surface, int16 destX, int16 destY) {
+void RenderManager::renderImageToBackground(const Graphics::Surface &surface, int16 destX, int16 destY) {
 	Common::Rect srcRect(surface.w, surface.h);
 	Common::Point dstPt(destX, destY);
 
@@ -318,7 +318,7 @@ void RenderManager::renderImageToBackground(const Common::String &fileName, int1
 	moveBackground(0);
 }
 
-void RenderManager::renderImageToBackground(Graphics::Surface &surface, int16 destX, int16 destY, uint32 keycolor) {
+void RenderManager::renderImageToBackground(const Graphics::Surface &surface, int16 destX, int16 destY, uint32 keycolor) {
 	Common::Rect srcRect(surface.w, surface.h);
 	Common::Point dstPt(destX, destY);
 
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 37bfcfa20d..c302844117 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -225,7 +225,7 @@ public:
 	 * @param srcRect    Rect of source surface
 	 * @param dstRect    Rect for destenation surface
 	 */
-	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect);
+	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect);
 
 	/**
 	 * Copies a rectangla of source surface and copy to destination rect.
@@ -236,7 +236,7 @@ public:
 	 * @param dstRect    Rect for destenation surface
 	 * @param colorkey   Transparent color
 	 */
-	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect, uint32 colorkey);
+	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect, uint32 colorkey);
 
 	/**
 	 * Copies a rectangla of source surface and copy to destination rect.
@@ -246,7 +246,7 @@ public:
 	 * @param srcRect    Rect of source surface
 	 * @param dstPt      Point for destenation surface
 	 */
-	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt);
+	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt);
 
 	/**
 	 * Copies a rectangla of source surface and copy to destination rect.
@@ -257,7 +257,7 @@ public:
 	 * @param dstPt      Point for destenation surface
 	 * @param colorkey   Transparent color
 	 */
-	void copyRectToSurface(Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 colorkey);
+	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 colorkey);
 
 	/**
 	 * Blits the image or a portion of the image to the background.
@@ -275,7 +275,7 @@ public:
 	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
 	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
 	 */
-	void renderImageToBackground(Graphics::Surface &surface, int16 destinationX, int16 destinationY);
+	void renderImageToBackground(const Graphics::Surface &surface, int16 destinationX, int16 destinationY);
 
 	/**
 	 * Blits the image or a portion of the image to the background.
@@ -295,7 +295,7 @@ public:
 	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
 	 * @param colorkey   Transparent color
 	 */
-	void renderImageToBackground(Graphics::Surface &surface, int16 destX, int16 destY, uint32 colorkey);
+	void renderImageToBackground(const Graphics::Surface &surface, int16 destX, int16 destY, uint32 colorkey);
 
 	/**
 	 * Sets the current background image to be used by the RenderManager and immediately
-- 
cgit v1.2.3


From b635fab6e663b0fac154d4fa75d221db4aabb1f5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 7 Nov 2013 16:46:54 +0700
Subject: ZVISION: ActionAssign value can be another slot, ValueSlot must be
 used.

---
 engines/zvision/actions.cpp | 12 ++++++++++--
 engines/zvision/actions.h   |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 3dd6382060..4fe288d228 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -61,11 +61,19 @@ bool ActionAdd::execute() {
 
 ActionAssign::ActionAssign(ZVision *engine, const Common::String &line) :
 	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%u, %u)", &_key, &_value);
+	char buf[64];
+	memset(buf, 0, 64);
+	sscanf(line.c_str(), "%*[^(](%u, %s)", &_key, buf);
+	_value = new ValueSlot(_engine->getScriptManager(), buf);
+}
+
+ActionAssign::~ActionAssign() {
+	if (_value)
+		delete _value;
 }
 
 bool ActionAssign::execute() {
-	_engine->getScriptManager()->setStateValue(_key, _value);
+	_engine->getScriptManager()->setStateValue(_key, _value->getValue());
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 7464d83b09..1d7a815819 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -100,11 +100,12 @@ private:
 class ActionAssign : public ResultAction {
 public:
 	ActionAssign(ZVision *engine, const Common::String &line);
+	~ActionAssign();
 	bool execute();
 
 private:
 	uint32 _key;
-	uint _value;
+	ValueSlot *_value;
 };
 
 class ActionAttenuate : public ResultAction {
-- 
cgit v1.2.3


From 7bd57a9ad6bfa551ce2fb605b71fa78e38c5fe88 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 7 Nov 2013 17:06:25 +0700
Subject: ZVISION: Make rlf animation logic equivalent to video decoder
 methods.

---
 engines/zvision/animation_control.cpp |  2 +-
 engines/zvision/rlf_animation.cpp     | 31 ++++++++++++++++++-------------
 engines/zvision/rlf_animation.h       | 11 +++++------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
index 3f9a2e9cc7..5b35a4a468 100644
--- a/engines/zvision/animation_control.cpp
+++ b/engines/zvision/animation_control.cpp
@@ -94,7 +94,7 @@ bool AnimationControl::process(uint32 deltaTimeInMillis) {
 					return false;
 				}
 
-				const Graphics::Surface *frame = _animation.rlf->getNextFrame();
+				const Graphics::Surface *frame = _animation.rlf->decodeNextFrame();
 
 				// Animation frames for PANORAMAs are transposed, so un-transpose them
 				RenderTable::RenderState state = renderManager->getRenderTable()->getRenderState();
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index 795167e572..dab32aed17 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -43,7 +43,7 @@ RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _currentFrame(-1),
+	  _currentFrame(0),
 	  _frameBufferByteSize(0) {
 	if (!_file.open(fileName)) {
 		warning("RLF animation file %s could not be opened", fileName.c_str());
@@ -157,8 +157,11 @@ void RlfAnimation::seekToFrame(int frameNumber) {
 	assert(!_stream);
 	assert(frameNumber < (int)_frameCount || frameNumber >= -1);
 
-	if (frameNumber == -1) {
-		_currentFrame = -1;
+	if (_currentFrame == frameNumber)
+		return;
+
+	if (frameNumber < 0) {
+		_currentFrame = 0;
 		return;
 	}
 
@@ -166,13 +169,15 @@ void RlfAnimation::seekToFrame(int frameNumber) {
 	int distance = (int)frameNumber - _currentFrame;
 	for (uint i = 0; i < _completeFrames.size(); ++i) {
 		int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
-		if (newDistance > 0 && (closestFrame == -1 || newDistance < distance)) {
+		if (newDistance < 0)
+			break;
+		if (newDistance > 0 && newDistance < distance) {
 			closestFrame = _completeFrames[i];
 			distance = newDistance;
 		}
 	}
 
-	for (int i = closestFrame; i <= frameNumber; ++i) {
+	for (int i = closestFrame; i < frameNumber; ++i) {
 		applyFrameToCurrent(i);
 	}
 
@@ -184,24 +189,24 @@ const Graphics::Surface *RlfAnimation::getFrameData(uint frameNumber) {
 	assert(frameNumber < _frameCount);
 
 	// Since this method is so expensive, first check to see if we can use
-	// getNextFrame() it's cheap.
-	if ((int)frameNumber == _currentFrame) {
+	// decodeNextFrame() it's cheap.
+	if ((int)frameNumber == _currentFrame - 1) {
 		return &_currentFrameBuffer;
-	} else if (_currentFrame + 1 == (int)frameNumber) {
-		return getNextFrame();
+	} else if (_currentFrame == (int)frameNumber) {
+		return decodeNextFrame();
 	}
 
 	seekToFrame(frameNumber);
-	return &_currentFrameBuffer;
+	return decodeNextFrame();
 }
 
-const Graphics::Surface *RlfAnimation::getNextFrame() {
-	assert(_currentFrame + 1 < (int)_frameCount);
+const Graphics::Surface *RlfAnimation::decodeNextFrame() {
+	assert(_currentFrame < (int)_frameCount);
 
 	if (_stream) {
 		applyFrameToCurrent(readNextFrame());
 	} else {
-		applyFrameToCurrent(_currentFrame + 1);
+		applyFrameToCurrent(_currentFrame);
 	}
 
 	_currentFrame++;
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index b0f7ee204e..35916de6cb 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -92,7 +92,7 @@ public:
 
 	/**
 	 * Returns the pixel data of the frame specified. It will try to use
-	 * getNextFrame() if possible. If not, it uses seekToFrame() to
+	 * decodeNextFrame() if possible. If not, it uses seekToFrame() to
 	 * update the internal Surface and then returns a pointer to it.
 	 * This function requires _stream = false
 	 *
@@ -101,19 +101,18 @@ public:
 	 */
 	const Graphics::Surface *getFrameData(uint frameNumber);
 	/**
-	 * Returns the pixel data of the next frame. It is up to the user to
-	 * check if the next frame is valid before calling this.
+	 * Returns the pixel data of current frame and go to next. It is up to the user to
+	 * check if the current frame is valid before calling this.
 	 * IE. Use endOfAnimation()
 	 *
 	 * @return    A pointer to the pixel data. Do NOT delete this.
 	 */
-	const Graphics::Surface *getNextFrame();
-
+	const Graphics::Surface *decodeNextFrame();
 	/**
 	 * @return Is the currentFrame is the last frame in the animation?
 	 */
 	bool endOfAnimation() {
-		return _currentFrame == (int)_frameCount - 1;
+		return _currentFrame == (int)_frameCount;
 	}
 
 private:
-- 
cgit v1.2.3


From a0d73c34cf21403be85af43a5f1020ae910edde7 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 13 Nov 2013 22:38:57 +0000
Subject: ZVISION: Code for ActionDisableControl and ActionEnableControl.

---
 engines/zvision/actions.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 4fe288d228..ea33736b5d 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -137,9 +137,7 @@ ActionDisableControl::ActionDisableControl(ZVision *engine, const Common::String
 }
 
 bool ActionDisableControl::execute() {
-	debug("Disabling control %u", _key);
-
-
+	_engine->getScriptManager()->setStateFlag(_key, Puzzle::DISABLED);
 	return true;
 }
 
@@ -154,9 +152,7 @@ ActionEnableControl::ActionEnableControl(ZVision *engine, const Common::String &
 }
 
 bool ActionEnableControl::execute() {
-	debug("Enabling control %u", _key);
-
-
+	_engine->getScriptManager()->unsetStateFlag(_key, Puzzle::DISABLED);
 	return true;
 }
 
-- 
cgit v1.2.3


From 29fc5be12ee5e28e1b74402065858698f4b8eb16 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:02:18 +0000
Subject: ZVISION: Don't add puzzle to referencetable[key] twice.

---
 engines/zvision/script_manager.cpp | 15 +++++++++++++--
 engines/zvision/script_manager.h   |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index b58056ab29..13fb58b022 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -106,6 +106,17 @@ void ScriptManager::execScope(script_scope &scope) {
 	}
 }
 
+void ScriptManager::referenceTableAddPuzzle(uint32 key, puzzle_ref ref) {
+	if (_referenceTable.contains(key)) {
+		Common::Array<puzzle_ref> *arr = &_referenceTable[key];
+		for (uint32 i = 0; i < arr->size(); i++)
+			if ((*arr)[i].puz == ref.puz)
+				return;
+	}
+
+	_referenceTable[key].push_back(ref);
+}
+
 void ScriptManager::addPuzzlesToReferenceTable(script_scope &scope) {
 	// Iterate through each local Puzzle
 	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter) {
@@ -115,12 +126,12 @@ void ScriptManager::addPuzzlesToReferenceTable(script_scope &scope) {
 		ref.scope = &scope;
 		ref.puz = puzzlePtr;
 
-		_referenceTable[puzzlePtr->key].push_back(ref);
+		referenceTableAddPuzzle(puzzlePtr->key, ref);
 
 		// Iterate through each CriteriaEntry and add a reference from the criteria key to the Puzzle
 		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*PuzzleIter)->criteriaList.begin(); criteriaIter != (*PuzzleIter)->criteriaList.end(); ++criteriaIter)
 			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter)
-				_referenceTable[entryIter->key].push_back(ref);
+				referenceTableAddPuzzle(entryIter->key, ref);
 	}
 }
 
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 487a27cf05..38d398248e 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -236,6 +236,7 @@ public:
 	Location getCurrentLocation() const;
 
 private:
+	void referenceTableAddPuzzle(uint32 key, puzzle_ref ref);
 	void addPuzzlesToReferenceTable(script_scope &scope);
 	void updateNodes(uint deltaTimeMillis);
 	void updateControls(uint deltaTimeMillis);
-- 
cgit v1.2.3


From 9363a0d07115368f8964dfca5f48730552ef9855 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:05:11 +0000
Subject: ZVISION: Reverse queue puzzles adding to end->begin

---
 engines/zvision/script_manager.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 13fb58b022..28850857df 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -266,10 +266,11 @@ int ScriptManager::getStateValue(uint32 key) {
 
 void ScriptManager::queuePuzzles(uint32 key) {
 	if (_referenceTable.contains(key)) {
-		for (Common::Array<puzzle_ref>::iterator iter = _referenceTable[key].begin(); iter != _referenceTable[key].end(); ++iter)
-			if (!iter->puz->addedBySetState) {
-				iter->scope->scope_queue->push_back(iter->puz);
-				iter->puz->addedBySetState = true;
+		Common::Array<puzzle_ref> *arr = &_referenceTable[key];
+		for (int32 i = arr->size() - 1; i >= 0; i--)
+			if (!(*arr)[i].puz->addedBySetState) {
+				(*arr)[i].scope->scope_queue->push_back((*arr)[i].puz);
+				(*arr)[i].puz->addedBySetState = true;
 			}
 	}
 }
-- 
cgit v1.2.3


From 468c44581f4a051d435f8574fa4f689b97188ae2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:10:27 +0000
Subject: ZVISION: MouseUp and MouseDown now will return break process loop
 flag.

---
 engines/zvision/control.h               |  8 ++++++--
 engines/zvision/input_control.cpp       |  3 ++-
 engines/zvision/input_control.h         |  2 +-
 engines/zvision/lever_control.cpp       | 10 ++++++----
 engines/zvision/lever_control.h         |  4 ++--
 engines/zvision/push_toggle_control.cpp |  6 ++++--
 engines/zvision/push_toggle_control.h   |  2 +-
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/engines/zvision/control.h b/engines/zvision/control.h
index 32c59d6f27..65d76da5c4 100644
--- a/engines/zvision/control.h
+++ b/engines/zvision/control.h
@@ -54,14 +54,18 @@ public:
 	 * @param screenSpacePos             The position of the mouse in screen space
 	 * @param backgroundImageSpacePos    The position of the mouse in background image space
 	 */
-	virtual void onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {}
+	virtual bool onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+		return false;
+	}
 	/**
 	 * Called when LeftMouse is lifted. Default is NOP.
 	 *
 	 * @param screenSpacePos             The position of the mouse in screen space
 	 * @param backgroundImageSpacePos    The position of the mouse in background image space
 	 */
-	virtual void onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {}
+	virtual bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+		return false;
+	}
 	/**
 	 * Called on every MouseMove. Default is NOP.
 	 *
diff --git a/engines/zvision/input_control.cpp b/engines/zvision/input_control.cpp
index 5723a4e4a4..8d9d79ba09 100644
--- a/engines/zvision/input_control.cpp
+++ b/engines/zvision/input_control.cpp
@@ -93,8 +93,9 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	}
 }
 
-void InputControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+bool InputControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	_engine->getScriptManager()->focusControl(_key);
+	return false;
 }
 
 void InputControl::onKeyDown(Common::KeyState keyState) {
diff --git a/engines/zvision/input_control.h b/engines/zvision/input_control.h
index 3d7db747d7..0179bd9006 100644
--- a/engines/zvision/input_control.h
+++ b/engines/zvision/input_control.h
@@ -54,7 +54,7 @@ public:
 	void unfocus() {
 		_focused = false;
 	}
-	void onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	void onKeyDown(Common::KeyState keyState);
 	bool process(uint32 deltaTimeInMillis);
 };
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index bd2c186ffe..6d13d60b3e 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -190,19 +190,20 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 	}
 }
 
-void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+bool LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
-		return;
+		return false;
 
 	if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_mouseIsCaptured = true;
 		_lastMousePos = backgroundImageSpacePos;
 	}
+	return false;
 }
 
-void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+bool LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
-		return;
+		return false;
 
 	if (_mouseIsCaptured) {
 		_mouseIsCaptured = false;
@@ -212,6 +213,7 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 		_returnRoutesCurrentProgress = _frameInfo[_currentFrame].returnRoute.begin();
 		_returnRoutesCurrentFrame = _currentFrame;
 	}
+	return false;
 }
 
 bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 94d23c1f95..19ecc7b9ac 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -88,8 +88,8 @@ private:
 	uint32 _accumulatedTime;
 
 public:
-	void onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
-	void onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	bool process(uint32 deltaTimeInMillis);
 
diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index 2cea5db2d2..88619e8f97 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -72,13 +72,15 @@ PushToggleControl::~PushToggleControl() {
 	_engine->getScriptManager()->setStateValue(_key, 0);
 }
 
-void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+bool PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
-		return;
+		return false;
 
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getScriptManager()->setStateValue(_key, 1);
+		return true;
 	}
+	return false;
 }
 
 bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
diff --git a/engines/zvision/push_toggle_control.h b/engines/zvision/push_toggle_control.h
index 2a407cada9..1de279aa08 100644
--- a/engines/zvision/push_toggle_control.h
+++ b/engines/zvision/push_toggle_control.h
@@ -41,7 +41,7 @@ public:
 	 * @param screenSpacePos             The position of the mouse in screen space
 	 * @param backgroundImageSpacePos    The position of the mouse in background image space
 	 */
-	void onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	/**
 	 * Called on every MouseMove. Tests if the mouse is inside _hotspot, and if so, sets the cursor.
 	 *
-- 
cgit v1.2.3


From 677c74d59ffe43e618911f84c2dd4302cd11478f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:12:51 +0000
Subject: ZVISION: Now onMouse functions handle return results and processing
 control list from end to beginning

---
 engines/zvision/script_manager.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 28850857df..c8ef86556a 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -392,28 +392,31 @@ void ScriptManager::killSideFxType(SideFX::SideFXType type) {
 void ScriptManager::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (!_activeControls)
 		return;
-	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		(*iter)->onMouseDown(screenSpacePos, backgroundImageSpacePos);
+	for (ControlList::iterator iter = _activeControls->reverse_begin(); iter != _activeControls->end(); iter--) {
+		if ((*iter)->onMouseDown(screenSpacePos, backgroundImageSpacePos))
+			return;
 	}
 }
 
 void ScriptManager::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (!_activeControls)
 		return;
-	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		(*iter)->onMouseUp(screenSpacePos, backgroundImageSpacePos);
+	for (ControlList::iterator iter = _activeControls->reverse_begin(); iter != _activeControls->end(); iter--) {
+		if ((*iter)->onMouseUp(screenSpacePos, backgroundImageSpacePos))
+			return;
 	}
 }
 
 bool ScriptManager::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (!_activeControls)
 		return false;
-	bool cursorWasChanged = false;
-	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		cursorWasChanged = cursorWasChanged || (*iter)->onMouseMove(screenSpacePos, backgroundImageSpacePos);
+
+	for (ControlList::iterator iter = _activeControls->reverse_begin(); iter != _activeControls->end(); iter--) {
+		if ((*iter)->onMouseMove(screenSpacePos, backgroundImageSpacePos))
+			return true;
 	}
 
-	return cursorWasChanged;
+	return false;
 }
 
 void ScriptManager::onKeyDown(Common::KeyState keyState) {
-- 
cgit v1.2.3


From 5fd15be0a2810c7c18dca982685c118ee83349e7 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:14:09 +0000
Subject: ZVISION: Don't output setStateValue debug information.

---
 engines/zvision/script_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index c8ef86556a..861f0e47dc 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -280,7 +280,7 @@ void ScriptManager::setStateValue(uint32 key, int value) {
 		_globalState.erase(key);
 	else
 		_globalState[key] = value;
-	debug("setStateValue %d %d\n", key , value);
+
 	queuePuzzles(key);
 }
 
-- 
cgit v1.2.3


From e3b9f84d8179a69be011f7351fb50635f854bf73 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:15:12 +0000
Subject: ZVISION: Change _currentLocation to new location before execute first
 scripts.

---
 engines/zvision/script_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 861f0e47dc..b121eaa6a7 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -523,11 +523,11 @@ void ScriptManager::do_changeLocation() {
 	// Change the background position
 	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
 
-	execScope(room);
-	execScope(nodeview);
-
 	// Update _currentLocation
 	_currentLocation = _nextLocation;
+
+	execScope(room);
+	execScope(nodeview);
 }
 
 void ScriptManager::serializeStateTable(Common::WriteStream *stream) {
-- 
cgit v1.2.3


From 30ee8ed0fd1e983f5472bd5f382c39ba7e400cb2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:34:11 +0000
Subject: ZVISION: Refactore AnimationControl to AnimationNode + changes for
 correct use it from actions.

---
 engines/zvision/actions.cpp           |  58 ++++++--
 engines/zvision/actions.h             |  12 +-
 engines/zvision/animation_control.cpp | 268 ++++++++++++----------------------
 engines/zvision/animation_control.h   |  51 ++++---
 4 files changed, 168 insertions(+), 221 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index ea33736b5d..f83d295dde 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -274,17 +274,29 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, const Common::St
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%25s %*u %*u %u %u)", &_key, fileName, &_mask, &_framerate);
+	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%25s %*u %*u %d %d)", &_key, fileName, &_mask, &_framerate);
+
+	if (_mask > 0) {
+		byte r, g, b;
+		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(_mask, r, g, b);
+		_mask = _engine->_pixelFormat.RGBToColor(r, g, b);
+	}
 
 	_fileName = Common::String(fileName);
 }
 
-bool ActionPreloadAnimation::execute() {
-	// TODO: We ignore the mask and framerate atm. Mask refers to a key color used for binary alpha. We assume the framerate is the default framerate embedded in the videos
+ActionPreloadAnimation::~ActionPreloadAnimation() {
+	_engine->getScriptManager()->deleteSideFx(_key);
+}
 
-	// TODO: Check if the Control already exists
+bool ActionPreloadAnimation::execute() {
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_key);
 
-	// Create the control, but disable it until PlayPreload is called
+	if (!nod) {
+		nod = new AnimationNode(_engine, _key, _fileName, _mask, _framerate, false);
+		_engine->getScriptManager()->addSideFX(nod);
+	} else
+		nod->stop();
 	return true;
 }
 
@@ -299,14 +311,34 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, const Common::String &
 
 	// The two %*u are always 0 and dont seem to have a use
 	sscanf(line.c_str(),
-	       "%*[^:]:%*[^:]:%u(%25s %u %u %u %u %u %u %u %*u %*u %u %u)",
+	       "%*[^:]:%*[^:]:%u(%25s %u %u %u %u %u %u %d %*u %*u %d %d)",
 	       &_key, fileName, &_x, &_y, &_width, &_height, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
+	if (_mask > 0) {
+		byte r, g, b;
+		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(_mask, r, g, b);
+		_mask = _engine->_pixelFormat.RGBToColor(r, g, b);
+	}
+
 	_fileName = Common::String(fileName);
 }
 
+ActionPlayAnimation::~ActionPlayAnimation() {
+	_engine->getScriptManager()->deleteSideFx(_key);
+}
+
 bool ActionPlayAnimation::execute() {
-	// TODO: Implement
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_key);
+
+	if (!nod) {
+		nod = new AnimationNode(_engine, _key, _fileName, _mask, _framerate);
+		_engine->getScriptManager()->addSideFX(nod);
+	} else
+		nod->stop();
+
+	if (nod)
+		nod->addPlayNode(_key, _x, _y, _width, _height, _start, _end, _loopCount);
+
 	return true;
 }
 
@@ -323,14 +355,10 @@ ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, const Co
 }
 
 bool ActionPlayPreloadAnimation::execute() {
-	// Find the control
-	AnimationControl *control = (AnimationControl *)_engine->getScriptManager()->getControl(_controlKey);
-
-	// Set the needed values within the control
-	control->setAnimationKey(_animationKey);
-	control->setLoopCount(_loopCount);
-	control->setXPos(_x1);
-	control->setYPost(_y1);
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_animationKey);
+
+	if (nod)
+		nod->addPlayNode(_controlKey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
 
 	return true;
 }
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 1d7a815819..b75c201d99 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -240,6 +240,7 @@ private:
 class ActionPlayAnimation : public ResultAction {
 public:
 	ActionPlayAnimation(ZVision *engine, const Common::String &line);
+	~ActionPlayAnimation();
 	bool execute();
 
 private:
@@ -251,9 +252,9 @@ private:
 	uint32 _height;
 	uint32 _start;
 	uint32 _end;
-	uint _mask;
-	uint _framerate;
-	uint _loopCount;
+	int32 _mask;
+	int32 _framerate;
+	int32 _loopCount;
 };
 
 class ActionPlayPreloadAnimation : public ResultAction {
@@ -276,13 +277,14 @@ private:
 class ActionPreloadAnimation : public ResultAction {
 public:
 	ActionPreloadAnimation(ZVision *engine, const Common::String &line);
+	~ActionPreloadAnimation();
 	bool execute();
 
 private:
 	uint32 _key;
 	Common::String _fileName;
-	uint _mask;
-	uint _framerate;
+	int32 _mask;
+	int32 _framerate;
 };
 
 class ActionQuit : public ResultAction {
diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
index 5b35a4a468..f825bbedfc 100644
--- a/engines/zvision/animation_control.cpp
+++ b/engines/zvision/animation_control.cpp
@@ -37,222 +37,140 @@
 
 namespace ZVision {
 
-AnimationControl::AnimationControl(ZVision *engine, uint32 controlKey, const Common::String &fileName)
-	: Control(engine, controlKey),
+AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
+	: SideFX(engine, controlKey, SIDEFX_ANIM),
 	  _fileType(RLF),
-	  _loopCount(1),
-	  _currentLoop(0),
-	  _accumulatedTime(0),
-	  _cachedFrame(0),
-	  _cachedFrameNeedsDeletion(false) {
+	  _DisposeAfterUse(DisposeAfterUse),
+	  _mask(mask) {
 	if (fileName.hasSuffix(".rlf")) {
 		_fileType = RLF;
 		_animation.rlf = new RlfAnimation(fileName, false);
+		_frmDelay = _animation.rlf->frameTime();
 	} else if (fileName.hasSuffix(".avi")) {
 		_fileType = AVI;
 		_animation.avi = new ZorkAVIDecoder();
 		_animation.avi->loadFile(fileName);
+		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
 	} else {
 		warning("Unrecognized animation file type: %s", fileName.c_str());
 	}
 
-	_cachedFrame = new Graphics::Surface();
+	if (frate > 0)
+		_frmDelay = 1000.0 / frate;
 }
 
-AnimationControl::~AnimationControl() {
+AnimationNode::~AnimationNode() {
 	if (_fileType == RLF) {
 		delete _animation.rlf;
 	} else if (_fileType == AVI) {
 		delete _animation.avi;
 	}
 
-	_cachedFrame->free();
-	delete _cachedFrame;
-}
-
-bool AnimationControl::process(uint32 deltaTimeInMillis) {
-
-	bool finished = false;
+	_engine->getScriptManager()->setStateValue(_key, 2);
 
-	if (_fileType == RLF) {
-		_accumulatedTime += deltaTimeInMillis;
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end())
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
 
-		uint32 frameTime = _animation.rlf->frameTime();
-		if (_accumulatedTime >= frameTime) {
-			while (_accumulatedTime >= frameTime) {
-				_accumulatedTime -= frameTime;
+	_playList.clear();
+}
 
-				// Make sure the frame is inside the working window
-				// If it's not, then just return
+bool AnimationNode::process(uint32 deltaTimeInMillis) {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		playnode *nod = &(*it);
+
+		nod->_delay -= deltaTimeInMillis;
+		if (nod->_delay <= 0) {
+			nod->_delay += _frmDelay;
+
+			const Graphics::Surface *frame = NULL;
+
+			if (nod->_cur_frm == -1) { // Start of new playlist node
+				nod->_cur_frm = nod->start;
+				if (_fileType == RLF) {
+					_animation.rlf->seekToFrame(nod->_cur_frm);
+					frame = _animation.rlf->decodeNextFrame();
+				} else if (_fileType == AVI) {
+					_animation.avi->seekToFrame(nod->_cur_frm);
+					frame = _animation.avi->decodeNextFrame();
+				}
 
-				RenderManager *renderManager = _engine->getRenderManager();
-				Common::Point workingWindowPoint = renderManager->imageSpaceToWorkingWindowSpace(Common::Point(_x, _y));
-				Common::Rect subRect(workingWindowPoint.x, workingWindowPoint.y, workingWindowPoint.x + _animation.rlf->width(), workingWindowPoint.y + _animation.rlf->height());
+				nod->_delay = _frmDelay;
+				if (nod->slot)
+					_engine->getScriptManager()->setStateValue(nod->slot, 1);
+			} else {
+				nod->_cur_frm++;
 
-				// If the clip returns false, it means the animation is outside the working window
-				if (!renderManager->clipRectToWorkingWindow(subRect)) {
-					return false;
-				}
+				if (nod->_cur_frm > nod->stop) {
+					nod->loop--;
 
-				const Graphics::Surface *frame = _animation.rlf->decodeNextFrame();
-
-				// Animation frames for PANORAMAs are transposed, so un-transpose them
-				RenderTable::RenderState state = renderManager->getRenderTable()->getRenderState();
-				if (state == RenderTable::PANORAMA) {
-					Graphics::Surface *tranposedFrame = RenderManager::tranposeSurface(frame);
-
-					renderManager->copyRectToWorkingWindow((uint16 *)tranposedFrame->getBasePtr(tranposedFrame->w - subRect.width(), tranposedFrame->h - subRect.height()), subRect.left, subRect.top, _animation.rlf->width(), subRect.width(), subRect.height());
-
-					// If the background can move, we need to cache the last frame so it can be rendered during background movement
-					if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-						if (_cachedFrameNeedsDeletion) {
-							_cachedFrame->free();
-							delete _cachedFrame;
-							_cachedFrameNeedsDeletion = false;
-						}
-						_cachedFrame = tranposedFrame;
-						_cachedFrameNeedsDeletion = true;
-					} else {
-						// Cleanup
-						tranposedFrame->free();
-						delete tranposedFrame;
+					if (nod->loop == 0) {
+						if (nod->slot >= 0)
+							_engine->getScriptManager()->setStateValue(nod->slot, 2);
+						_playList.erase(it);
+						return _DisposeAfterUse;
 					}
-				} else {
-					renderManager->copyRectToWorkingWindow((const uint16 *)frame->getBasePtr(frame->w - subRect.width(), frame->h - subRect.height()), subRect.left, subRect.top, _animation.rlf->width(), subRect.width(), subRect.height());
-
-					// If the background can move, we need to cache the last frame so it can be rendered during background movement
-					if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-						if (_cachedFrameNeedsDeletion) {
-							_cachedFrame->free();
-							delete _cachedFrame;
-							_cachedFrameNeedsDeletion = false;
-						}
-						_cachedFrame->copyFrom(*frame);
-					}
-				}
 
-				// Check if we should continue looping
-				if (_animation.rlf->endOfAnimation()) {
-					_animation.rlf->seekToFrame(-1);
-					if (_loopCount > 0) {
-						_currentLoop++;
-						if (_currentLoop >= _loopCount) {
-							finished = true;
-						}
+					nod->_cur_frm = nod->start;
+					if (_fileType == RLF) {
+						_animation.rlf->seekToFrame(nod->_cur_frm);
+						frame = _animation.rlf->decodeNextFrame();
+					} else if (_fileType == AVI) {
+						_animation.avi->seekToFrame(nod->_cur_frm);
+						frame = _animation.avi->decodeNextFrame();
 					}
+				} else {
+					if (_fileType == RLF)
+						frame = _animation.rlf->decodeNextFrame();
+					else if (_fileType == AVI)
+						frame = _animation.avi->decodeNextFrame();
 				}
 			}
-		} else {
-			// If the background can move, we have to keep rendering animation frames, otherwise the animation flickers during background movement
-			RenderManager *renderManager = _engine->getRenderManager();
-			RenderTable::RenderState state = renderManager->getRenderTable()->getRenderState();
-
-			if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-				Common::Point workingWindowPoint = renderManager->imageSpaceToWorkingWindowSpace(Common::Point(_x, _y));
-				Common::Rect subRect(workingWindowPoint.x, workingWindowPoint.y, workingWindowPoint.x + _cachedFrame->w, workingWindowPoint.y + _cachedFrame->h);
-
-				// If the clip returns false, it means the animation is outside the working window
-				if (!renderManager->clipRectToWorkingWindow(subRect)) {
-					return false;
-				}
-
-				renderManager->copyRectToWorkingWindow((uint16 *)_cachedFrame->getBasePtr(_cachedFrame->w - subRect.width(), _cachedFrame->h - subRect.height()), subRect.left, subRect.top, _cachedFrame->w, subRect.width(), subRect.height());
-			}
-		}
-	} else if (_fileType == AVI) {
-		if (!_animation.avi->isPlaying()) {
-			_animation.avi->start();
-		}
-
-		if (_animation.avi->needsUpdate()) {
-			const Graphics::Surface *frame = _animation.avi->decodeNextFrame();
 
 			if (frame) {
-				// Make sure the frame is inside the working window
-				// If it's not, then just return
-
-				RenderManager *renderManager = _engine->getRenderManager();
-				Common::Point workingWindowPoint = renderManager->imageSpaceToWorkingWindowSpace(Common::Point(_x, _y));
-				Common::Rect subRect(workingWindowPoint.x, workingWindowPoint.y, workingWindowPoint.x + frame->w, workingWindowPoint.y + frame->h);
-
-				// If the clip returns false, it means the animation is outside the working window
-				if (!renderManager->clipRectToWorkingWindow(subRect)) {
-					return false;
-				}
-
-				// Animation frames for PANORAMAs are transposed, so un-transpose them
-				RenderTable::RenderState state = renderManager->getRenderTable()->getRenderState();
-				if (state == RenderTable::PANORAMA) {
-					Graphics::Surface *tranposedFrame = RenderManager::tranposeSurface(frame);
-
-					renderManager->copyRectToWorkingWindow((uint16 *)tranposedFrame->getBasePtr(tranposedFrame->w - subRect.width(), tranposedFrame->h - subRect.height()), subRect.left, subRect.top, frame->w, subRect.width(), subRect.height());
-
-					// If the background can move, we need to cache the last frame so it can be rendered during background movement
-					if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-						if (_cachedFrameNeedsDeletion) {
-							_cachedFrame->free();
-							delete _cachedFrame;
-							_cachedFrameNeedsDeletion = false;
-						}
-						_cachedFrame = tranposedFrame;
-						_cachedFrameNeedsDeletion = true;
-					} else {
-						// Cleanup
-						tranposedFrame->free();
-						delete tranposedFrame;
-					}
+				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
+					if (_mask > 0)
+						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top, _mask);
+					else
+						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top);
+					delete transposed;
 				} else {
-					renderManager->copyRectToWorkingWindow((const uint16 *)frame->getBasePtr(frame->w - subRect.width(), frame->h - subRect.height()), subRect.left, subRect.top, frame->w, subRect.width(), subRect.height());
-
-					// If the background can move, we need to cache the last frame so it can be rendered during background movement
-					if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-						if (_cachedFrameNeedsDeletion) {
-							_cachedFrame->free();
-							delete _cachedFrame;
-							_cachedFrameNeedsDeletion = false;
-						}
-						_cachedFrame->copyFrom(*frame);
-					}
+					if (_mask > 0)
+						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top, _mask);
+					else
+						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top);
 				}
-			} else {
-				// If the background can move, we have to keep rendering animation frames, otherwise the animation flickers during background movement
-				RenderManager *renderManager = _engine->getRenderManager();
-				RenderTable::RenderState state = renderManager->getRenderTable()->getRenderState();
+			}
+		}
+	}
 
-				if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-					Common::Point workingWindowPoint = renderManager->imageSpaceToWorkingWindowSpace(Common::Point(_x, _y));
-					Common::Rect subRect(workingWindowPoint.x, workingWindowPoint.y, workingWindowPoint.x + _cachedFrame->w, workingWindowPoint.y + _cachedFrame->h);
+	return false;
+}
 
-					// If the clip returns false, it means the animation is outside the working window
-					if (!renderManager->clipRectToWorkingWindow(subRect)) {
-						return false;
-					}
 
-					renderManager->copyRectToWorkingWindow((uint16 *)_cachedFrame->getBasePtr(_cachedFrame->w - subRect.width(), _cachedFrame->h - subRect.height()), subRect.left, subRect.top, _cachedFrame->w, subRect.width(), subRect.height());
-				}
-			}
-		}
 
-		// Check if we should continue looping
-		if (_animation.avi->endOfVideo()) {
-			_animation.avi->rewind();
-			if (_loopCount > 0) {
-				_currentLoop++;
-				if (_currentLoop >= _loopCount) {
-					_animation.avi->stop();
-					finished = true;
-				}
-			}
-		}
-	}
+void AnimationNode::addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops) {
+	playnode nod;
+	nod.loop = loops;
+	nod.pos = Common::Rect(x, y, x + w - 1, y + h - 1);
+	nod.start = start_frame;
+	nod.stop = end_frame;
+	nod.slot = slot;
+	nod._cur_frm = -1;
+	nod._delay = 0;
+	_playList.push_back(nod);
+}
 
-	// If we're done, set _animation key = 2 (Why 2? I don't know. It's just the value that they used)
-	// Then disable the control. DON'T delete it. It can be re-used
-	if (finished) {
-		_engine->getScriptManager()->setStateValue(_animationKey, 2);
-		_currentLoop = 0;
-	}
+bool AnimationNode::stop() {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end())
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+
+	_playList.clear();
 
+	// We don't need to delete, it's may be reused
 	return false;
 }
 
diff --git a/engines/zvision/animation_control.h b/engines/zvision/animation_control.h
index 247fbf765d..e63824f34b 100644
--- a/engines/zvision/animation_control.h
+++ b/engines/zvision/animation_control.h
@@ -23,7 +23,9 @@
 #ifndef ZVISION_ANIMATION_CONTROL_H
 #define ZVISION_ANIMATION_CONTROL_H
 
-#include "zvision/control.h"
+#include "zvision/sidefx.h"
+#include "common/rect.h"
+#include "common/list.h"
 
 
 namespace Common {
@@ -43,10 +45,20 @@ namespace ZVision {
 class ZVision;
 class RlfAnimation;
 
-class AnimationControl : public Control {
+class AnimationNode : public SideFX {
 public:
-	AnimationControl(ZVision *engine, uint32 controlKey, const Common::String &fileName);
-	~AnimationControl();
+	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse = true);
+	~AnimationNode();
+
+	struct playnode {
+		Common::Rect pos;
+		int32 slot;
+		int32 start;
+		int32 stop;
+		int32 loop;
+		int32 _cur_frm;
+		int32 _delay;
+	};
 
 private:
 	enum FileType {
@@ -55,7 +67,9 @@ private:
 	};
 
 private:
-	uint32 _animationKey;
+	typedef Common::List<playnode> PlayNodes;
+
+	PlayNodes _playList;
 
 	union {
 		RlfAnimation *rlf;
@@ -63,31 +77,16 @@ private:
 	} _animation;
 
 	FileType _fileType;
-	uint _loopCount;
-	int32 _x;
-	int32 _y;
-
-	uint _accumulatedTime;
-	uint _currentLoop;
-
-	Graphics::Surface *_cachedFrame;
-	bool _cachedFrameNeedsDeletion;
+	int32 _frmDelay;
+	int32 _mask;
+	bool _DisposeAfterUse;
 
 public:
 	bool process(uint32 deltaTimeInMillis);
 
-	void setAnimationKey(uint32 animationKey) {
-		_animationKey = animationKey;
-	}
-	void setLoopCount(uint loopCount) {
-		_loopCount = loopCount;
-	}
-	void setXPos(int32 x) {
-		_x = x;
-	}
-	void setYPost(int32 y) {
-		_y = y;
-	}
+	void addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops = 1);
+
+	bool stop();
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 5ab767cb37da791aa0ca4a1354d405a7ac85f7e6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:46:57 +0000
Subject: ZVISION: Rename animation_control files to animation_node.

---
 engines/zvision/actions.cpp           |   2 +-
 engines/zvision/animation_control.cpp | 177 ----------------------------------
 engines/zvision/animation_control.h   |  94 ------------------
 engines/zvision/animation_node.cpp    | 177 ++++++++++++++++++++++++++++++++++
 engines/zvision/animation_node.h      |  94 ++++++++++++++++++
 engines/zvision/module.mk             |   2 +-
 6 files changed, 273 insertions(+), 273 deletions(-)
 delete mode 100644 engines/zvision/animation_control.cpp
 delete mode 100644 engines/zvision/animation_control.h
 create mode 100644 engines/zvision/animation_node.cpp
 create mode 100644 engines/zvision/animation_node.h

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index f83d295dde..f540e3e34a 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -31,7 +31,7 @@
 #include "zvision/zork_avi_decoder.h"
 #include "zvision/timer_node.h"
 #include "zvision/music_node.h"
-#include "zvision/animation_control.h"
+#include "zvision/animation_node.h"
 
 #include "common/file.h"
 
diff --git a/engines/zvision/animation_control.cpp b/engines/zvision/animation_control.cpp
deleted file mode 100644
index f825bbedfc..0000000000
--- a/engines/zvision/animation_control.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/animation_control.h"
-
-#include "zvision/zvision.h"
-#include "zvision/render_manager.h"
-#include "zvision/script_manager.h"
-#include "zvision/rlf_animation.h"
-#include "zvision/zork_avi_decoder.h"
-
-#include "video/video_decoder.h"
-
-#include "graphics/surface.h"
-
-
-namespace ZVision {
-
-AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
-	: SideFX(engine, controlKey, SIDEFX_ANIM),
-	  _fileType(RLF),
-	  _DisposeAfterUse(DisposeAfterUse),
-	  _mask(mask) {
-	if (fileName.hasSuffix(".rlf")) {
-		_fileType = RLF;
-		_animation.rlf = new RlfAnimation(fileName, false);
-		_frmDelay = _animation.rlf->frameTime();
-	} else if (fileName.hasSuffix(".avi")) {
-		_fileType = AVI;
-		_animation.avi = new ZorkAVIDecoder();
-		_animation.avi->loadFile(fileName);
-		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
-	} else {
-		warning("Unrecognized animation file type: %s", fileName.c_str());
-	}
-
-	if (frate > 0)
-		_frmDelay = 1000.0 / frate;
-}
-
-AnimationNode::~AnimationNode() {
-	if (_fileType == RLF) {
-		delete _animation.rlf;
-	} else if (_fileType == AVI) {
-		delete _animation.avi;
-	}
-
-	_engine->getScriptManager()->setStateValue(_key, 2);
-
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end())
-		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-
-	_playList.clear();
-}
-
-bool AnimationNode::process(uint32 deltaTimeInMillis) {
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		playnode *nod = &(*it);
-
-		nod->_delay -= deltaTimeInMillis;
-		if (nod->_delay <= 0) {
-			nod->_delay += _frmDelay;
-
-			const Graphics::Surface *frame = NULL;
-
-			if (nod->_cur_frm == -1) { // Start of new playlist node
-				nod->_cur_frm = nod->start;
-				if (_fileType == RLF) {
-					_animation.rlf->seekToFrame(nod->_cur_frm);
-					frame = _animation.rlf->decodeNextFrame();
-				} else if (_fileType == AVI) {
-					_animation.avi->seekToFrame(nod->_cur_frm);
-					frame = _animation.avi->decodeNextFrame();
-				}
-
-				nod->_delay = _frmDelay;
-				if (nod->slot)
-					_engine->getScriptManager()->setStateValue(nod->slot, 1);
-			} else {
-				nod->_cur_frm++;
-
-				if (nod->_cur_frm > nod->stop) {
-					nod->loop--;
-
-					if (nod->loop == 0) {
-						if (nod->slot >= 0)
-							_engine->getScriptManager()->setStateValue(nod->slot, 2);
-						_playList.erase(it);
-						return _DisposeAfterUse;
-					}
-
-					nod->_cur_frm = nod->start;
-					if (_fileType == RLF) {
-						_animation.rlf->seekToFrame(nod->_cur_frm);
-						frame = _animation.rlf->decodeNextFrame();
-					} else if (_fileType == AVI) {
-						_animation.avi->seekToFrame(nod->_cur_frm);
-						frame = _animation.avi->decodeNextFrame();
-					}
-				} else {
-					if (_fileType == RLF)
-						frame = _animation.rlf->decodeNextFrame();
-					else if (_fileType == AVI)
-						frame = _animation.avi->decodeNextFrame();
-				}
-			}
-
-			if (frame) {
-				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
-					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
-					if (_mask > 0)
-						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top, _mask);
-					else
-						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top);
-					delete transposed;
-				} else {
-					if (_mask > 0)
-						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top, _mask);
-					else
-						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top);
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-
-
-void AnimationNode::addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops) {
-	playnode nod;
-	nod.loop = loops;
-	nod.pos = Common::Rect(x, y, x + w - 1, y + h - 1);
-	nod.start = start_frame;
-	nod.stop = end_frame;
-	nod.slot = slot;
-	nod._cur_frm = -1;
-	nod._delay = 0;
-	_playList.push_back(nod);
-}
-
-bool AnimationNode::stop() {
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end())
-		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-
-	_playList.clear();
-
-	// We don't need to delete, it's may be reused
-	return false;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/animation_control.h b/engines/zvision/animation_control.h
deleted file mode 100644
index e63824f34b..0000000000
--- a/engines/zvision/animation_control.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_ANIMATION_CONTROL_H
-#define ZVISION_ANIMATION_CONTROL_H
-
-#include "zvision/sidefx.h"
-#include "common/rect.h"
-#include "common/list.h"
-
-
-namespace Common {
-class String;
-}
-
-namespace Video {
-class VideoDecoder;
-}
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-class RlfAnimation;
-
-class AnimationNode : public SideFX {
-public:
-	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse = true);
-	~AnimationNode();
-
-	struct playnode {
-		Common::Rect pos;
-		int32 slot;
-		int32 start;
-		int32 stop;
-		int32 loop;
-		int32 _cur_frm;
-		int32 _delay;
-	};
-
-private:
-	enum FileType {
-	    RLF = 1,
-	    AVI = 2
-	};
-
-private:
-	typedef Common::List<playnode> PlayNodes;
-
-	PlayNodes _playList;
-
-	union {
-		RlfAnimation *rlf;
-		Video::VideoDecoder *avi;
-	} _animation;
-
-	FileType _fileType;
-	int32 _frmDelay;
-	int32 _mask;
-	bool _DisposeAfterUse;
-
-public:
-	bool process(uint32 deltaTimeInMillis);
-
-	void addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops = 1);
-
-	bool stop();
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
new file mode 100644
index 0000000000..72afeabac6
--- /dev/null
+++ b/engines/zvision/animation_node.cpp
@@ -0,0 +1,177 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/animation_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/render_manager.h"
+#include "zvision/script_manager.h"
+#include "zvision/rlf_animation.h"
+#include "zvision/zork_avi_decoder.h"
+
+#include "video/video_decoder.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
+	: SideFX(engine, controlKey, SIDEFX_ANIM),
+	  _fileType(RLF),
+	  _DisposeAfterUse(DisposeAfterUse),
+	  _mask(mask) {
+	if (fileName.hasSuffix(".rlf")) {
+		_fileType = RLF;
+		_animation.rlf = new RlfAnimation(fileName, false);
+		_frmDelay = _animation.rlf->frameTime();
+	} else if (fileName.hasSuffix(".avi")) {
+		_fileType = AVI;
+		_animation.avi = new ZorkAVIDecoder();
+		_animation.avi->loadFile(fileName);
+		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
+	} else {
+		warning("Unrecognized animation file type: %s", fileName.c_str());
+	}
+
+	if (frate > 0)
+		_frmDelay = 1000.0 / frate;
+}
+
+AnimationNode::~AnimationNode() {
+	if (_fileType == RLF) {
+		delete _animation.rlf;
+	} else if (_fileType == AVI) {
+		delete _animation.avi;
+	}
+
+	_engine->getScriptManager()->setStateValue(_key, 2);
+
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end())
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+
+	_playList.clear();
+}
+
+bool AnimationNode::process(uint32 deltaTimeInMillis) {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		playnode *nod = &(*it);
+
+		nod->_delay -= deltaTimeInMillis;
+		if (nod->_delay <= 0) {
+			nod->_delay += _frmDelay;
+
+			const Graphics::Surface *frame = NULL;
+
+			if (nod->_cur_frm == -1) { // Start of new playlist node
+				nod->_cur_frm = nod->start;
+				if (_fileType == RLF) {
+					_animation.rlf->seekToFrame(nod->_cur_frm);
+					frame = _animation.rlf->decodeNextFrame();
+				} else if (_fileType == AVI) {
+					_animation.avi->seekToFrame(nod->_cur_frm);
+					frame = _animation.avi->decodeNextFrame();
+				}
+
+				nod->_delay = _frmDelay;
+				if (nod->slot)
+					_engine->getScriptManager()->setStateValue(nod->slot, 1);
+			} else {
+				nod->_cur_frm++;
+
+				if (nod->_cur_frm > nod->stop) {
+					nod->loop--;
+
+					if (nod->loop == 0) {
+						if (nod->slot >= 0)
+							_engine->getScriptManager()->setStateValue(nod->slot, 2);
+						_playList.erase(it);
+						return _DisposeAfterUse;
+					}
+
+					nod->_cur_frm = nod->start;
+					if (_fileType == RLF) {
+						_animation.rlf->seekToFrame(nod->_cur_frm);
+						frame = _animation.rlf->decodeNextFrame();
+					} else if (_fileType == AVI) {
+						_animation.avi->seekToFrame(nod->_cur_frm);
+						frame = _animation.avi->decodeNextFrame();
+					}
+				} else {
+					if (_fileType == RLF)
+						frame = _animation.rlf->decodeNextFrame();
+					else if (_fileType == AVI)
+						frame = _animation.avi->decodeNextFrame();
+				}
+			}
+
+			if (frame) {
+				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
+					if (_mask > 0)
+						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top, _mask);
+					else
+						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top);
+					delete transposed;
+				} else {
+					if (_mask > 0)
+						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top, _mask);
+					else
+						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top);
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+
+
+void AnimationNode::addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops) {
+	playnode nod;
+	nod.loop = loops;
+	nod.pos = Common::Rect(x, y, x + w - 1, y + h - 1);
+	nod.start = start_frame;
+	nod.stop = end_frame;
+	nod.slot = slot;
+	nod._cur_frm = -1;
+	nod._delay = 0;
+	_playList.push_back(nod);
+}
+
+bool AnimationNode::stop() {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end())
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+
+	_playList.clear();
+
+	// We don't need to delete, it's may be reused
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/animation_node.h b/engines/zvision/animation_node.h
new file mode 100644
index 0000000000..76c961ceb1
--- /dev/null
+++ b/engines/zvision/animation_node.h
@@ -0,0 +1,94 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_ANIMATION_NODE_H
+#define ZVISION_ANIMATION_NODE_H
+
+#include "zvision/sidefx.h"
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace Common {
+class String;
+}
+
+namespace Video {
+class VideoDecoder;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+class RlfAnimation;
+
+class AnimationNode : public SideFX {
+public:
+	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse = true);
+	~AnimationNode();
+
+	struct playnode {
+		Common::Rect pos;
+		int32 slot;
+		int32 start;
+		int32 stop;
+		int32 loop;
+		int32 _cur_frm;
+		int32 _delay;
+	};
+
+private:
+	enum FileType {
+	    RLF = 1,
+	    AVI = 2
+	};
+
+private:
+	typedef Common::List<playnode> PlayNodes;
+
+	PlayNodes _playList;
+
+	union {
+		RlfAnimation *rlf;
+		Video::VideoDecoder *avi;
+	} _animation;
+
+	FileType _fileType;
+	int32 _frmDelay;
+	int32 _mask;
+	bool _DisposeAfterUse;
+
+public:
+	bool process(uint32 deltaTimeInMillis);
+
+	void addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops = 1);
+
+	bool stop();
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 8d37311462..b66f02da8e 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -2,7 +2,7 @@ MODULE := engines/zvision
  
 MODULE_OBJS := \
 	actions.o \
-	animation_control.o \
+	animation_node.o \
 	clock.o \
 	console.o \
 	control.o \
-- 
cgit v1.2.3


From ff541a0d021796d0c42d627dc4dcfe91c1335487 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 20 Nov 2013 11:44:43 +0000
Subject: ZVISION: Impliment inventory functions and ActionInventory.

---
 engines/zvision/actions.cpp           |  49 ++++++++++++++
 engines/zvision/actions.h             |   9 +++
 engines/zvision/inventory_manager.cpp | 123 ++++++++++++++++++++++++++++++++++
 engines/zvision/inventory_manager.h   |  28 --------
 engines/zvision/module.mk             |   3 +-
 engines/zvision/scr_file_handling.cpp |   2 +-
 engines/zvision/script_manager.h      |  14 +++-
 7 files changed, 196 insertions(+), 32 deletions(-)
 create mode 100644 engines/zvision/inventory_manager.cpp
 delete mode 100644 engines/zvision/inventory_manager.h

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index f540e3e34a..5568e39bdb 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -156,6 +156,55 @@ bool ActionEnableControl::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionInventory
+//////////////////////////////////////////////////////////////////////////////
+
+ActionInventory::ActionInventory(ZVision *engine, const Common::String &line) :
+	ResultAction(engine) {
+	char buf[25];
+	sscanf(line.c_str(), "%*[^(](%25s %d)", buf, &_key);
+
+	if (strcmp(buf, "add") == 0) {
+		_type = 0;
+	} else if (strcmp(buf, "addi") == 0) {
+		_type = 1;
+	} else if (strcmp(buf, "drop") == 0) {
+		_type = 2;
+	} else if (strcmp(buf, "dropi") == 0) {
+		_type = 3;
+	} else if (strcmp(buf, "cycle") == 0) {
+		_type = 4;
+	}
+
+}
+
+bool ActionInventory::execute() {
+	switch (_type) {
+	case 0: // add
+		_engine->getScriptManager()->invertory_add(_key);
+		break;
+	case 1: // addi
+		_engine->getScriptManager()->invertory_add(_engine->getScriptManager()->getStateValue(_key));
+		break;
+	case 2: // drop
+		if (_key >= 0)
+			_engine->getScriptManager()->invertory_drop(_key);
+		else
+			_engine->getScriptManager()->invertory_drop(_engine->getScriptManager()->getStateValue(StateKey_InventoryItem));
+		break;
+	case 3: // dropi
+		_engine->getScriptManager()->invertory_drop(_engine->getScriptManager()->getStateValue(_key));
+		break;
+	case 4: // cycle
+		_engine->getScriptManager()->invertory_cycle();
+		break;
+	default:
+		break;
+	}
+	return true;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionKill
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index b75c201d99..50224aaaf5 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -212,6 +212,15 @@ private:
 	uint32 _key;
 };
 
+class ActionInventory : public ResultAction {
+public:
+	ActionInventory(ZVision *engine, const Common::String &line);
+	bool execute();
+private:
+	uint8 _type;
+	int32 _key;
+};
+
 class ActionKill : public ResultAction {
 public:
 	ActionKill(ZVision *engine, const Common::String &line);
diff --git a/engines/zvision/inventory_manager.cpp b/engines/zvision/inventory_manager.cpp
new file mode 100644
index 0000000000..3924c6b51a
--- /dev/null
+++ b/engines/zvision/inventory_manager.cpp
@@ -0,0 +1,123 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "common/scummsys.h"
+
+#include "zvision/script_manager.h"
+
+
+namespace ZVision {
+
+int8 ScriptManager::invertory_getCount() {
+	return getStateValue(StateKey_Inv_Cnt_Slot);
+}
+
+void ScriptManager::invertory_setCount(int8 cnt) {
+	setStateValue(StateKey_Inv_Cnt_Slot, cnt);
+}
+
+int16 ScriptManager::invertory_getItem(int8 id) {
+	if (id < 49 && id >= 0)
+		return getStateValue(StateKey_Inv_1_Slot + id);
+	return -1;
+}
+
+void ScriptManager::invertory_setItem(int8 id, int16 item) {
+	if (id < 49 && id >= 0)
+		setStateValue(StateKey_Inv_1_Slot + id, item);
+}
+
+void ScriptManager::invertory_add(int16 item) {
+	int8 cnt = invertory_getCount();
+
+	if (cnt < 49) {
+		bool not_exist = true;
+
+		if (cnt == 0) {
+			invertory_setItem(0, 0);
+			invertory_setCount(1); // we needed empty item for cycle code
+			cnt = 1;
+		}
+
+		for (int8 cur = 0; cur < cnt; cur++)
+			if (invertory_getItem(cur) == item) {
+				not_exist = false;
+				break;
+			}
+
+		if (not_exist) {
+			for (int8 i = cnt; i > 0; i--)
+				invertory_setItem(i, invertory_getItem(i - 1));
+
+			invertory_setItem(0, item);
+
+			setStateValue(StateKey_InventoryItem, item);
+
+			invertory_setCount(cnt + 1);
+		}
+	}
+}
+
+void ScriptManager::invertory_drop(int16 item) {
+	int8 items_cnt = invertory_getCount();
+
+	// if items in inventory > 0
+	if (items_cnt != 0) {
+		int8 index = 0;
+
+		// finding needed item
+		while (index < items_cnt) {
+			if (invertory_getItem(index) == item)
+				break;
+
+			index++;
+		}
+
+		// if item in the inventory
+		if (items_cnt != index) {
+			// shift all items left with rewrite founded item
+			for (int8 v = index; v < items_cnt - 1 ; v++)
+				invertory_setItem(v, invertory_getItem(v + 1));
+
+			// del last item
+			invertory_setItem(items_cnt - 1, 0);
+			invertory_setCount(invertory_getCount() - 1);
+
+			setStateValue(StateKey_InventoryItem, invertory_getItem(0));
+		}
+	}
+}
+void ScriptManager::invertory_cycle() {
+	int8 item_cnt = invertory_getCount();
+	int8 cur_item = invertory_getItem(0);
+	if (item_cnt > 1) {
+		for (int8 i = 0; i < item_cnt - 1; i++)
+			invertory_setItem(i, invertory_getItem(i + 1));
+
+		invertory_setItem(item_cnt - 1, cur_item);
+
+		setStateValue(StateKey_InventoryItem, invertory_getItem(0));
+
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/inventory_manager.h b/engines/zvision/inventory_manager.h
deleted file mode 100644
index ae6d116b18..0000000000
--- a/engines/zvision/inventory_manager.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_INVENTORY_MANAGER_H
-#define ZVISION_INVENTORY_MANAGER_H
-
-// TODO: Implement InventoryManager
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index b66f02da8e..ffdef16335 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -31,7 +31,8 @@ MODULE_OBJS := \
 	zork_avi_decoder.o \
 	zork_raw.o \
 	sidefx.o \
-	music_node.o
+	music_node.o \
+	inventory_manager.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 0df3143a51..769c94921b 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -197,7 +197,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:flush_mouse_events*", true)) {
 			// TODO: Implement ActionFlushMouseEvents
 		} else if (line.matchString("*:inventory*", true)) {
-			// TODO: Implement ActionInventory
+			actionList.push_back(new ActionInventory(_engine, line));
 		} else if (line.matchString("*:kill*", true)) {
 			actionList.push_back(new ActionKill(_engine, line));
 		} else if (line.matchString("*:menu_bar_enable*", true)) {
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 38d398248e..2f585b6291 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -90,7 +90,7 @@ enum StateKey {
 	StateKey_EF9_G = 92,
 	StateKey_EF9_R = 93,
 	StateKey_EF9_Speed = 94,
-	StateKey_Inv_0_Slot = 100,
+	StateKey_Inv_Cnt_Slot = 100,
 	StateKey_Inv_1_Slot = 101,
 	StateKey_Inv_49_Slot = 149,
 	StateKey_Inv_TotalSlots = 150
@@ -248,8 +248,18 @@ private:
 	/** Perform change location */
 	void do_changeLocation();
 
-// TODO: Make this private. It was only made public so Console::cmdParseAllScrFiles() could use it
+	int8 invertory_getCount();
+	void invertory_setCount(int8 cnt);
+	int16 invertory_getItem(int8 id);
+	void invertory_setItem(int8 id, int16 item);
+
+
 public:
+	void invertory_add(int16 item);
+	void invertory_drop(int16 item);
+	void invertory_cycle();
+
+	// TODO: Make this private. It was only made public so Console::cmdParseAllScrFiles() could use it
 	/**
 	 * Parses a script file into triggers and events
 	 *
-- 
cgit v1.2.3


From f877410feef2e0030dd6c0664d615cc86118ca29 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 20 Nov 2013 11:45:52 +0000
Subject: ZVISION: Add new ChangeCursor method for load items icons.

---
 engines/zvision/cursor_manager.cpp | 17 +++++++++++++++++
 engines/zvision/cursor_manager.h   |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index 385e4dcc9c..de229a38d8 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -116,6 +116,23 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed)
 	warning("No cursor found for identifier %s", cursorName.c_str());
 }
 
+void CursorManager::changeCursor(int id, bool active, bool pushed) {
+	Common::String file;
+	if (_engine->getGameId() == GID_NEMESIS) {
+		file = Common::String::format("%2.2d%s%c.zcr", id, active ? "act" : "idle", pushed ? 'b' : 'a');
+	} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
+		file = Common::String::format("g0b%cc%2.2x1.zcr", active ? (pushed ? 'd' : 'c') : (pushed ? 'b' : 'a')  , id);
+	} else
+		return;
+
+	if (_currentCursor.equals(file))
+		return;
+
+	_currentCursor = file;
+
+	changeCursor(ZorkCursor(file));
+}
+
 void CursorManager::changeCursor(const ZorkCursor &cursor) {
 	CursorMan.replaceCursor(cursor.getSurface(), cursor.getWidth(), cursor.getHeight(), cursor.getHotspotX(), cursor.getHotspotY(), cursor.getKeyColor(), false, _pixelFormat);
 }
diff --git a/engines/zvision/cursor_manager.h b/engines/zvision/cursor_manager.h
index 0173bf810c..ac79b259fa 100644
--- a/engines/zvision/cursor_manager.h
+++ b/engines/zvision/cursor_manager.h
@@ -81,6 +81,8 @@ public:
 	 * @param pushed        Should the cursor be pushed (true) or not pushed (false) (Another way to say it: down or up)
 	 */
 	void changeCursor(const Common::String &cursorName, bool pushed);
+
+	void changeCursor(int id, bool active, bool pushed);
 	/**
 	 * Change the cursor to a certain push state. If the cursor is already in the specified push state, nothing will happen.
 	 *
-- 
cgit v1.2.3


From 4cb006f2602199a3f201f918392f3e66a385df0e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 24 Nov 2013 14:48:45 +0000
Subject: ZVISION: Animation nodes now scaleable.

---
 engines/zvision/actions.cpp        |  4 ++--
 engines/zvision/actions.h          |  4 ++--
 engines/zvision/animation_node.cpp | 45 ++++++++++++++++++++++++++++++++++----
 engines/zvision/animation_node.h   |  3 ++-
 engines/zvision/render_manager.cpp | 27 +++++++++++++++++++++++
 engines/zvision/render_manager.h   |  2 ++
 6 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 5568e39bdb..2fbec2945a 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -361,7 +361,7 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, const Common::String &
 	// The two %*u are always 0 and dont seem to have a use
 	sscanf(line.c_str(),
 	       "%*[^:]:%*[^:]:%u(%25s %u %u %u %u %u %u %d %*u %*u %d %d)",
-	       &_key, fileName, &_x, &_y, &_width, &_height, &_start, &_end, &_loopCount, &_mask, &_framerate);
+	       &_key, fileName, &_x, &_y, &_x2, &_y2, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
 	if (_mask > 0) {
 		byte r, g, b;
@@ -386,7 +386,7 @@ bool ActionPlayAnimation::execute() {
 		nod->stop();
 
 	if (nod)
-		nod->addPlayNode(_key, _x, _y, _width, _height, _start, _end, _loopCount);
+		nod->addPlayNode(_key, _x, _y, _x2, _y2, _start, _end, _loopCount);
 
 	return true;
 }
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 50224aaaf5..d9871328cb 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -257,8 +257,8 @@ private:
 	Common::String _fileName;
 	uint32 _x;
 	uint32 _y;
-	uint32 _width;
-	uint32 _height;
+	uint32 _x2;
+	uint32 _y2;
 	uint32 _start;
 	uint32 _end;
 	int32 _mask;
diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 72afeabac6..73e419ee19 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -69,9 +69,13 @@ AnimationNode::~AnimationNode() {
 	_engine->getScriptManager()->setStateValue(_key, 2);
 
 	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end())
+	if (it != _playList.end()) {
 		_engine->getScriptManager()->setStateValue((*it).slot, 2);
 
+		if ((*it)._scaled)
+			delete(*it)._scaled;
+	}
+
 	_playList.clear();
 }
 
@@ -108,6 +112,8 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 					if (nod->loop == 0) {
 						if (nod->slot >= 0)
 							_engine->getScriptManager()->setStateValue(nod->slot, 2);
+						if (nod->_scaled)
+							delete nod->_scaled;
 						_playList.erase(it);
 						return _DisposeAfterUse;
 					}
@@ -129,6 +135,33 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 			}
 
 			if (frame) {
+
+				uint32 dstw;
+				uint32 dsth;
+				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+					dstw = nod->pos.height();
+					dsth = nod->pos.width();
+				} else {
+					dstw = nod->pos.width();
+					dsth = nod->pos.height();
+				}
+
+				if (frame->w != dstw || frame->h != dsth) {
+					if (nod->_scaled)
+						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
+							delete nod->_scaled;
+							nod->_scaled = NULL;
+						}
+
+					if (!nod->_scaled) {
+						nod->_scaled = new Graphics::Surface;
+						nod->_scaled->create(dstw, dsth, frame->format);
+					}
+
+					_engine->getRenderManager()->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
+					frame = nod->_scaled;
+				}
+
 				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
 					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
 					if (_mask > 0)
@@ -151,22 +184,26 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 
 
-void AnimationNode::addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops) {
+void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops) {
 	playnode nod;
 	nod.loop = loops;
-	nod.pos = Common::Rect(x, y, x + w - 1, y + h - 1);
+	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = start_frame;
 	nod.stop = end_frame;
 	nod.slot = slot;
 	nod._cur_frm = -1;
 	nod._delay = 0;
+	nod._scaled = NULL;
 	_playList.push_back(nod);
 }
 
 bool AnimationNode::stop() {
 	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end())
+	if (it != _playList.end()) {
 		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+		if ((*it)._scaled)
+			delete(*it)._scaled;
+	}
 
 	_playList.clear();
 
diff --git a/engines/zvision/animation_node.h b/engines/zvision/animation_node.h
index 76c961ceb1..843e59236b 100644
--- a/engines/zvision/animation_node.h
+++ b/engines/zvision/animation_node.h
@@ -58,6 +58,7 @@ public:
 		int32 loop;
 		int32 _cur_frm;
 		int32 _delay;
+		Graphics::Surface *_scaled;
 	};
 
 private:
@@ -84,7 +85,7 @@ private:
 public:
 	bool process(uint32 deltaTimeInMillis);
 
-	void addPlayNode(int32 slot, int x, int y, int w, int h, int start_frame, int end_frame, int loops = 1);
+	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops = 1);
 
 	bool stop();
 };
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index 58df5a8d11..fc15e18fd0 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -694,4 +694,31 @@ Graphics::Surface *RenderManager::tranposeSurface(const Graphics::Surface *surfa
 	return tranposedSurface;
 }
 
+void RenderManager::scaleBuffer(const void *src, void *dst, uint32 srcWidth, uint32 srcHeight, byte bytesPerPixel, uint32 dstWidth, uint32 dstHeight) {
+	assert(bytesPerPixel == 1 || bytesPerPixel == 2);
+
+	const float  xscale = (float)srcWidth / (float)dstWidth;
+	const float  yscale = (float)srcHeight / (float)dstHeight;
+
+	if (bytesPerPixel == 1) {
+		const byte *srcPtr = (const byte *)src;
+		byte *dstPtr = (byte *)dst;
+		for (uint32 y = 0; y < dstHeight; ++y) {
+			for (uint32 x = 0; x < dstWidth; ++x) {
+				*dstPtr = srcPtr[(int)(x * xscale) + (int)(y * yscale) * srcWidth];
+				dstPtr++;
+			}
+		}
+	} else if (bytesPerPixel == 2) {
+		const uint16 *srcPtr = (const uint16 *)src;
+		uint16 *dstPtr = (uint16 *)dst;
+		for (uint32 y = 0; y < dstHeight; ++y) {
+			for (uint32 x = 0; x < dstWidth; ++x) {
+				*dstPtr = srcPtr[(int)(x * xscale) + (int)(y * yscale) * srcWidth];
+				dstPtr++;
+			}
+		}
+	}
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index c302844117..14ca704ce1 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -367,6 +367,8 @@ public:
 	 */
 	static Graphics::Surface *tranposeSurface(const Graphics::Surface *surface);
 
+	void scaleBuffer(const void *src, void *dst, uint32 srcWidth, uint32 srcHeight, byte bytesPerPixel, uint32 dstWidth, uint32 dstHeight);
+
 private:
 	/**
 	 * Renders a subRectangle of an image to the backbuffer. The destinationRect and SubRect
-- 
cgit v1.2.3


From 1dbb6e807a3b70fc1cdcf7ff1a4949fc69913a05 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 25 Nov 2013 13:30:29 +0000
Subject: ZVISION: Refactor parsing actions, it must handle presence/miss of
 slot key in same actions.

---
 engines/zvision/actions.cpp           | 148 ++++++++++++------------
 engines/zvision/actions.h             |  55 ++++-----
 engines/zvision/scr_file_handling.cpp | 209 ++++++++++++++++++++--------------
 3 files changed, 228 insertions(+), 184 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 2fbec2945a..9670016d74 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -44,9 +44,9 @@ namespace ZVision {
 // ActionAdd
 //////////////////////////////////////////////////////////////////////////////
 
-ActionAdd::ActionAdd(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%u,%d)", &_key, &_value);
+ActionAdd::ActionAdd(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%u,%d", &_key, &_value);
 }
 
 bool ActionAdd::execute() {
@@ -59,11 +59,11 @@ bool ActionAdd::execute() {
 // ActionAssign
 //////////////////////////////////////////////////////////////////////////////
 
-ActionAssign::ActionAssign(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionAssign::ActionAssign(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char buf[64];
 	memset(buf, 0, 64);
-	sscanf(line.c_str(), "%*[^(](%u, %s)", &_key, buf);
+	sscanf(line.c_str(), "%u, %s", &_key, buf);
 	_value = new ValueSlot(_engine->getScriptManager(), buf);
 }
 
@@ -82,9 +82,9 @@ bool ActionAssign::execute() {
 // ActionAttenuate
 //////////////////////////////////////////////////////////////////////////////
 
-ActionAttenuate::ActionAttenuate(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%u, %d)", &_key, &_attenuation);
+ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%u, %d", &_key, &_attenuation);
 }
 
 bool ActionAttenuate::execute() {
@@ -97,9 +97,9 @@ bool ActionAttenuate::execute() {
 // ActionChangeLocation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionChangeLocation::ActionChangeLocation(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%c, %c, %c%c, %u)", &_world, &_room, &_node, &_view, &_offset);
+ActionChangeLocation::ActionChangeLocation(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%c, %c, %c%c, %u", &_world, &_room, &_node, &_view, &_offset);
 }
 
 bool ActionChangeLocation::execute() {
@@ -114,10 +114,10 @@ bool ActionChangeLocation::execute() {
 // ActionCrossfade
 //////////////////////////////////////////////////////////////////////////////
 
-ActionCrossfade::ActionCrossfade(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionCrossfade::ActionCrossfade(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	sscanf(line.c_str(),
-	       "%*[^(](%u %u %u %u %u %u %u)",
+	       "%u %u %u %u %u %u %u",
 	       &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
 }
 
@@ -131,9 +131,9 @@ bool ActionCrossfade::execute() {
 // ActionDisableControl
 //////////////////////////////////////////////////////////////////////////////
 
-ActionDisableControl::ActionDisableControl(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%u)", &_key);
+ActionDisableControl::ActionDisableControl(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%u", &_key);
 }
 
 bool ActionDisableControl::execute() {
@@ -146,9 +146,9 @@ bool ActionDisableControl::execute() {
 // ActionEnableControl
 //////////////////////////////////////////////////////////////////////////////
 
-ActionEnableControl::ActionEnableControl(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
-	sscanf(line.c_str(), "%*[^(](%u)", &_key);
+ActionEnableControl::ActionEnableControl(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%u", &_key);
 }
 
 bool ActionEnableControl::execute() {
@@ -160,10 +160,10 @@ bool ActionEnableControl::execute() {
 // ActionInventory
 //////////////////////////////////////////////////////////////////////////////
 
-ActionInventory::ActionInventory(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionInventory::ActionInventory(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char buf[25];
-	sscanf(line.c_str(), "%*[^(](%25s %d)", buf, &_key);
+	sscanf(line.c_str(), "%25s %d", buf, &_key);
 
 	if (strcmp(buf, "add") == 0) {
 		_type = 0;
@@ -210,12 +210,12 @@ bool ActionInventory::execute() {
 // ActionKill
 //////////////////////////////////////////////////////////////////////////////
 
-ActionKill::ActionKill(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionKill::ActionKill(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	_key = 0;
 	_type = 0;
 	char keytype[25];
-	sscanf(line.c_str(), "%*[^(](%25s)", keytype);
+	sscanf(line.c_str(), "%25s", keytype);
 	if (keytype[0] == '"') {
 		if (!scumm_stricmp(keytype, "\"ANIM\""))
 			_type = SideFX::SIDEFX_ANIM;
@@ -250,8 +250,8 @@ bool ActionKill::execute() {
 // ActionMusic
 //////////////////////////////////////////////////////////////////////////////
 
-ActionMusic::ActionMusic(ZVision *engine, const Common::String &line, bool global) :
-	ResultAction(engine),
+ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &line, bool global) :
+	ResultAction(engine, slotkey),
 	_volume(255),
 	_universe(global) {
 	uint type;
@@ -259,7 +259,7 @@ ActionMusic::ActionMusic(ZVision *engine, const Common::String &line, bool globa
 	uint loop;
 	uint volume = 255;
 
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%u %25s %u %u)", &_key, &type, fileNameBuffer, &loop, &volume);
+	sscanf(line.c_str(), "%u %25s %u %u", &type, fileNameBuffer, &loop, &volume);
 
 	// type 4 are midi sound effect files
 	if (type == 4) {
@@ -282,11 +282,11 @@ ActionMusic::ActionMusic(ZVision *engine, const Common::String &line, bool globa
 
 ActionMusic::~ActionMusic() {
 	if (!_universe)
-		_engine->getScriptManager()->killSideFx(_key);
+		_engine->getScriptManager()->killSideFx(_slotkey);
 }
 
 bool ActionMusic::execute() {
-	if (_engine->getScriptManager()->getSideFX(_key))
+	if (_engine->getScriptManager()->getSideFX(_slotkey))
 		return true;
 	Common::File *file = new Common::File();
 	if (!file->exists(_fileName) && _fileName.size() >= 12) {
@@ -307,7 +307,7 @@ bool ActionMusic::execute() {
 		}
 	}
 	if (file->exists(_fileName))
-		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _key, _fileName, _loop, _volume));
+		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotkey, _fileName, _loop, _volume));
 	delete file;
 
 	return true;
@@ -318,12 +318,12 @@ bool ActionMusic::execute() {
 // ActionPreloadAnimation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%25s %*u %*u %d %d)", &_key, fileName, &_mask, &_framerate);
+	sscanf(line.c_str(), "%25s %*u %*u %d %d", fileName, &_mask, &_framerate);
 
 	if (_mask > 0) {
 		byte r, g, b;
@@ -335,14 +335,14 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, const Common::St
 }
 
 ActionPreloadAnimation::~ActionPreloadAnimation() {
-	_engine->getScriptManager()->deleteSideFx(_key);
+	_engine->getScriptManager()->deleteSideFx(_slotkey);
 }
 
 bool ActionPreloadAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_key);
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotkey);
 
 	if (!nod) {
-		nod = new AnimationNode(_engine, _key, _fileName, _mask, _framerate, false);
+		nod = new AnimationNode(_engine, _slotkey, _fileName, _mask, _framerate, false);
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
@@ -354,14 +354,14 @@ bool ActionPreloadAnimation::execute() {
 // ActionPlayAnimation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
 	sscanf(line.c_str(),
-	       "%*[^:]:%*[^:]:%u(%25s %u %u %u %u %u %u %d %*u %*u %d %d)",
-	       &_key, fileName, &_x, &_y, &_x2, &_y2, &_start, &_end, &_loopCount, &_mask, &_framerate);
+	       "%25s %u %u %u %u %u %u %d %*u %*u %d %d",
+	       fileName, &_x, &_y, &_x2, &_y2, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
 	if (_mask > 0) {
 		byte r, g, b;
@@ -373,20 +373,20 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, const Common::String &
 }
 
 ActionPlayAnimation::~ActionPlayAnimation() {
-	_engine->getScriptManager()->deleteSideFx(_key);
+	_engine->getScriptManager()->deleteSideFx(_slotkey);
 }
 
 bool ActionPlayAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_key);
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotkey);
 
 	if (!nod) {
-		nod = new AnimationNode(_engine, _key, _fileName, _mask, _framerate);
+		nod = new AnimationNode(_engine, _slotkey, _fileName, _mask, _framerate);
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
 
 	if (nod)
-		nod->addPlayNode(_key, _x, _y, _x2, _y2, _start, _end, _loopCount);
+		nod->addPlayNode(_slotkey, _x, _y, _x2, _y2, _start, _end, _loopCount);
 
 	return true;
 }
@@ -396,18 +396,18 @@ bool ActionPlayAnimation::execute() {
 // ActionPlayPreloadAnimation
 //////////////////////////////////////////////////////////////////////////////
 
-ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	sscanf(line.c_str(),
-	       "%*[^:]:%*[^:]:%u(%u %u %u %u %u %u %u %u)",
-	       &_animationKey, &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount);
+	       "%u %u %u %u %u %u %u %u",
+	       &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount);
 }
 
 bool ActionPlayPreloadAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_animationKey);
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_controlKey);
 
 	if (nod)
-		nod->addPlayNode(_controlKey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
+		nod->addPlayNode(_slotkey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
 
 	return true;
 }
@@ -428,11 +428,11 @@ bool ActionQuit::execute() {
 // ActionRandom
 //////////////////////////////////////////////////////////////////////////////
 
-ActionRandom::ActionRandom(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionRandom::ActionRandom(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char max_buf[64];
 	memset(max_buf, 0, 64);
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%s)", &_key, max_buf);
+	sscanf(line.c_str(), "%s", max_buf);
 	_max = new ValueSlot(_engine->getScriptManager(), max_buf);
 }
 
@@ -443,7 +443,7 @@ ActionRandom::~ActionRandom() {
 
 bool ActionRandom::execute() {
 	uint randNumber = _engine->getRandomSource()->getRandomNumber(_max->getValue());
-	_engine->getScriptManager()->setStateValue(_key, randNumber);
+	_engine->getScriptManager()->setStateValue(_slotkey, randNumber);
 	return true;
 }
 
@@ -452,12 +452,12 @@ bool ActionRandom::execute() {
 // ActionSetPartialScreen
 //////////////////////////////////////////////////////////////////////////////
 
-ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char fileName[25];
 	int color;
 
-	sscanf(line.c_str(), "%*[^(](%u %u %25s %*u %d)", &_x, &_y, fileName, &color);
+	sscanf(line.c_str(), "%u %u %25s %*u %d", &_x, &_y, fileName, &color);
 
 	_fileName = Common::String(fileName);
 
@@ -489,10 +489,10 @@ bool ActionSetPartialScreen::execute() {
 // ActionSetScreen
 //////////////////////////////////////////////////////////////////////////////
 
-ActionSetScreen::ActionSetScreen(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionSetScreen::ActionSetScreen(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char fileName[25];
-	sscanf(line.c_str(), "%*[^(](%25[^)])", fileName);
+	sscanf(line.c_str(), "%25s", fileName);
 
 	_fileName = Common::String(fileName);
 }
@@ -507,10 +507,10 @@ bool ActionSetScreen::execute() {
 // ActionStop
 //////////////////////////////////////////////////////////////////////////////
 
-ActionStop::ActionStop(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionStop::ActionStop(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	_key = 0;
-	sscanf(line.c_str(), "%*[^(](%u)", &_key);
+	sscanf(line.c_str(), "%u", &_key);
 }
 
 bool ActionStop::execute() {
@@ -523,12 +523,12 @@ bool ActionStop::execute() {
 // ActionStreamVideo
 //////////////////////////////////////////////////////////////////////////////
 
-ActionStreamVideo::ActionStreamVideo(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char fileName[25];
 	uint skipline;    //skipline - render video with skip every second line, not skippable.
 
-	sscanf(line.c_str(), "%*[^(](%25s %u %u %u %u %u %u)", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline);
+	sscanf(line.c_str(), "%25s %u %u %u %u %u %u", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline);
 
 	_fileName = Common::String(fileName);
 	_skippable = true;
@@ -554,22 +554,22 @@ bool ActionStreamVideo::execute() {
 // ActionTimer
 //////////////////////////////////////////////////////////////////////////////
 
-ActionTimer::ActionTimer(ZVision *engine, const Common::String &line) :
-	ResultAction(engine) {
+ActionTimer::ActionTimer(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
 	char time_buf[64];
 	memset(time_buf, 0, 64);
-	sscanf(line.c_str(), "%*[^:]:%*[^:]:%u(%s)", &_key, time_buf);
+	sscanf(line.c_str(), "%s", time_buf);
 	_time = new ValueSlot(_engine->getScriptManager(), time_buf);
 }
 
 ActionTimer::~ActionTimer() {
 	if (_time)
 		delete _time;
-	_engine->getScriptManager()->killSideFx(_key);
+	_engine->getScriptManager()->killSideFx(_slotkey);
 }
 
 bool ActionTimer::execute() {
-	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _key, _time->getValue()));
+	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _slotkey, _time->getValue()));
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index d9871328cb..aadb97fc9b 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -40,7 +40,7 @@ class ValueSlot;
   */
 class ResultAction {
 public:
-	ResultAction(ZVision *engine) : _engine(engine) {}
+	ResultAction(ZVision *engine, int32 slotkey) : _engine(engine), _slotkey(slotkey) {}
 	virtual ~ResultAction() {}
 	/**
 	 * This is called by the script system whenever a Puzzle's criteria are found to be true.
@@ -53,6 +53,7 @@ public:
 	virtual bool execute() = 0;
 protected:
 	ZVision *_engine;
+	int32 _slotkey;
 };
 
 
@@ -89,7 +90,7 @@ protected:
 
 class ActionAdd : public ResultAction {
 public:
-	ActionAdd(ZVision *engine, const Common::String &line);
+	ActionAdd(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -99,7 +100,7 @@ private:
 
 class ActionAssign : public ResultAction {
 public:
-	ActionAssign(ZVision *engine, const Common::String &line);
+	ActionAssign(ZVision *engine, int32 slotkey, const Common::String &line);
 	~ActionAssign();
 	bool execute();
 
@@ -110,7 +111,7 @@ private:
 
 class ActionAttenuate : public ResultAction {
 public:
-	ActionAttenuate(ZVision *engine, const Common::String &line);
+	ActionAttenuate(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -120,7 +121,7 @@ private:
 
 class ActionChangeLocation : public ResultAction {
 public:
-	ActionChangeLocation(ZVision *engine, const Common::String &line);
+	ActionChangeLocation(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -133,7 +134,7 @@ private:
 
 class ActionCrossfade : public ResultAction {
 public:
-	ActionCrossfade(ZVision *engine, const Common::String &line);
+	ActionCrossfade(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -148,7 +149,7 @@ private:
 
 class ActionDebug : public ResultAction {
 public:
-	ActionDebug(ZVision *engine, const Common::String &line);
+	ActionDebug(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -156,7 +157,7 @@ private:
 
 class ActionDelayRender : public ResultAction {
 public:
-	ActionDelayRender(ZVision *engine, const Common::String &line);
+	ActionDelayRender(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -166,7 +167,7 @@ private:
 
 class ActionDisableControl : public ResultAction {
 public:
-	ActionDisableControl(ZVision *engine, const Common::String &line);
+	ActionDisableControl(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -175,7 +176,7 @@ private:
 
 class ActionDisableVenus : public ResultAction {
 public:
-	ActionDisableVenus(ZVision *engine, const Common::String &line);
+	ActionDisableVenus(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -183,7 +184,7 @@ private:
 
 class ActionDisplayMessage : public ResultAction {
 public:
-	ActionDisplayMessage(ZVision *engine, const Common::String &line);
+	ActionDisplayMessage(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -197,7 +198,7 @@ public:
 
 class ActionDistort : public ResultAction {
 public:
-	ActionDistort(ZVision *engine, const Common::String &line);
+	ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -205,7 +206,7 @@ private:
 
 class ActionEnableControl : public ResultAction {
 public:
-	ActionEnableControl(ZVision *engine, const Common::String &line);
+	ActionEnableControl(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -214,7 +215,7 @@ private:
 
 class ActionInventory : public ResultAction {
 public:
-	ActionInventory(ZVision *engine, const Common::String &line);
+	ActionInventory(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 private:
 	uint8 _type;
@@ -223,7 +224,7 @@ private:
 
 class ActionKill : public ResultAction {
 public:
-	ActionKill(ZVision *engine, const Common::String &line);
+	ActionKill(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -233,7 +234,7 @@ private:
 
 class ActionMusic : public ResultAction {
 public:
-	ActionMusic(ZVision *engine, const Common::String &line, bool global);
+	ActionMusic(ZVision *engine, int32 slotkey, const Common::String &line, bool global);
 	~ActionMusic();
 	bool execute();
 
@@ -248,7 +249,7 @@ private:
 
 class ActionPlayAnimation : public ResultAction {
 public:
-	ActionPlayAnimation(ZVision *engine, const Common::String &line);
+	ActionPlayAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
 	~ActionPlayAnimation();
 	bool execute();
 
@@ -268,7 +269,7 @@ private:
 
 class ActionPlayPreloadAnimation : public ResultAction {
 public:
-	ActionPlayPreloadAnimation(ZVision *engine, const Common::String &line);
+	ActionPlayPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -285,7 +286,7 @@ private:
 
 class ActionPreloadAnimation : public ResultAction {
 public:
-	ActionPreloadAnimation(ZVision *engine, const Common::String &line);
+	ActionPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
 	~ActionPreloadAnimation();
 	bool execute();
 
@@ -298,20 +299,20 @@ private:
 
 class ActionQuit : public ResultAction {
 public:
-	ActionQuit(ZVision *engine) : ResultAction(engine) {}
+	ActionQuit(ZVision *engine, int32 slotkey) : ResultAction(engine, slotkey) {}
 	bool execute();
 };
 
 // TODO: See if this exists in ZGI. It doesn't in ZNem
 class ActionUnloadAnimation : public ResultAction {
 public:
-	ActionUnloadAnimation(ZVision *engine, const Common::String &line);
+	ActionUnloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 };
 
 class ActionRandom : public ResultAction {
 public:
-	ActionRandom(ZVision *engine, const Common::String &line);
+	ActionRandom(ZVision *engine, int32 slotkey, const Common::String &line);
 	~ActionRandom();
 	bool execute();
 
@@ -322,7 +323,7 @@ private:
 
 class ActionSetPartialScreen : public ResultAction {
 public:
-	ActionSetPartialScreen(ZVision *engine, const Common::String &line);
+	ActionSetPartialScreen(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -334,7 +335,7 @@ private:
 
 class ActionSetScreen : public ResultAction {
 public:
-	ActionSetScreen(ZVision *engine, const Common::String &line);
+	ActionSetScreen(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -343,7 +344,7 @@ private:
 
 class ActionStop : public ResultAction {
 public:
-	ActionStop(ZVision *engine, const Common::String &line);
+	ActionStop(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -352,7 +353,7 @@ private:
 
 class ActionStreamVideo : public ResultAction {
 public:
-	ActionStreamVideo(ZVision *engine, const Common::String &line);
+	ActionStreamVideo(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 
 private:
@@ -371,7 +372,7 @@ private:
 
 class ActionTimer : public ResultAction {
 public:
-	ActionTimer(ZVision *engine, const Common::String &line);
+	ActionTimer(ZVision *engine, int32 slotkey, const Common::String &line);
 	~ActionTimer();
 	bool execute();
 private:
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 769c94921b..0149347c4e 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -161,89 +161,132 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 			continue;
 		}
 
-		// Parse for the action type
-		if (line.matchString("*:add*", true)) {
-			actionList.push_back(new ActionAdd(_engine, line));
-		} else if (line.matchString("*:animplay*", true)) {
-			actionList.push_back(new ActionPlayAnimation(_engine, line));
-		} else if (line.matchString("*:animpreload*", true)) {
-			actionList.push_back(new ActionPreloadAnimation(_engine, line));
-		} else if (line.matchString("*:animunload*", true)) {
-			//actionList.push_back(new ActionUnloadAnimation(_engine, line));
-		} else if (line.matchString("*:attenuate*", true)) {
-			// TODO: Implement ActionAttenuate
-		} else if (line.matchString("*:assign*", true)) {
-			actionList.push_back(new ActionAssign(_engine, line));
-		} else if (line.matchString("*:change_location*", true)) {
-			actionList.push_back(new ActionChangeLocation(_engine, line));
-		} else if (line.matchString("*:crossfade*", true)) {
-			// TODO: Implement ActionCrossfade
-		} else if (line.matchString("*:debug*", true)) {
-			// TODO: Implement ActionDebug
-		} else if (line.matchString("*:delay_render*", true)) {
-			// TODO: Implement ActionDelayRender
-		} else if (line.matchString("*:disable_control*", true)) {
-			actionList.push_back(new ActionDisableControl(_engine, line));
-		} else if (line.matchString("*:disable_venus*", true)) {
-			// TODO: Implement ActionDisableVenus
-		} else if (line.matchString("*:display_message*", true)) {
-			// TODO: Implement ActionDisplayMessage
-		} else if (line.matchString("*:dissolve*", true)) {
-			// TODO: Implement ActionDissolve
-		} else if (line.matchString("*:distort*", true)) {
-			// TODO: Implement ActionDistort
-		} else if (line.matchString("*:enable_control*", true)) {
-			actionList.push_back(new ActionEnableControl(_engine, line));
-		} else if (line.matchString("*:flush_mouse_events*", true)) {
-			// TODO: Implement ActionFlushMouseEvents
-		} else if (line.matchString("*:inventory*", true)) {
-			actionList.push_back(new ActionInventory(_engine, line));
-		} else if (line.matchString("*:kill*", true)) {
-			actionList.push_back(new ActionKill(_engine, line));
-		} else if (line.matchString("*:menu_bar_enable*", true)) {
-			// TODO: Implement ActionMenuBarEnable
-		} else if (line.matchString("*:music*", true)) {
-			actionList.push_back(new ActionMusic(_engine, line, false));
-		} else if (line.matchString("*:pan_track*", true)) {
-			// TODO: Implement ActionPanTrack
-		} else if (line.matchString("*:playpreload*", true)) {
-			actionList.push_back(new ActionPlayPreloadAnimation(_engine, line));
-		} else if (line.matchString("*:preferences*", true)) {
-			// TODO: Implement ActionPreferences
-		} else if (line.matchString("*:quit*", true)) {
-			actionList.push_back(new ActionQuit(_engine));
-		} else if (line.matchString("*:random*", true)) {
-			actionList.push_back(new ActionRandom(_engine, line));
-		} else if (line.matchString("*:region*", true)) {
-			// TODO: Implement ActionRegion
-		} else if (line.matchString("*:restore_game*", true)) {
-			// TODO: Implement ActionRestoreGame
-		} else if (line.matchString("*:rotate_to*", true)) {
-			// TODO: Implement ActionRotateTo
-		} else if (line.matchString("*:save_game*", true)) {
-			// TODO: Implement ActionSaveGame
-		} else if (line.matchString("*:set_partial_screen*", true)) {
-			actionList.push_back(new ActionSetPartialScreen(_engine, line));
-		} else if (line.matchString("*:set_screen*", true)) {
-			actionList.push_back(new ActionSetScreen(_engine, line));
-		} else if (line.matchString("*:set_venus*", true)) {
-			// TODO: Implement ActionSetVenus
-		} else if (line.matchString("*:stop*", true)) {
-			actionList.push_back(new ActionStop(_engine, line));
-		} else if (line.matchString("*:streamvideo*", true)) {
-			actionList.push_back(new ActionStreamVideo(_engine, line));
-		} else if (line.matchString("*:syncsound*", true)) {
-			// TODO: Implement ActionSyncSound
-		} else if (line.matchString("*:timer*", true)) {
-			actionList.push_back(new ActionTimer(_engine, line));
-		} else if (line.matchString("*:ttytext*", true)) {
-			// TODO: Implement ActionTTYText
-		} else if (line.matchString("*:universe_music*", true)) {
-			actionList.push_back(new ActionMusic(_engine, line, true));
-		} else if (line.matchString("*:copy_file*", true)) {
-			// Not used. Purposely left empty
-		} else {
-			warning("Unhandled result action type: %s", line.c_str());
+		const char *chrs = line.c_str();
+		uint pos;
+		for (pos = 0; pos < line.size(); pos++)
+			if (chrs[pos] == ':')
+				break;
+
+		if (pos < line.size()) {
+
+			uint startpos = pos + 1;
+
+			for (pos = startpos; pos < line.size(); pos++)
+				if (chrs[pos] == ':' || chrs[pos] == '(')
+					break;
+
+			if (pos < line.size()) {
+				int32 slot = 11;
+				Common::String args = "";
+				Common::String act(chrs + startpos, chrs + pos);
+
+				startpos = pos + 1;
+
+				if (chrs[pos] == ':') {
+					for (pos = startpos; pos < line.size(); pos++)
+						if (chrs[pos] == '(')
+							break;
+					Common::String s_slot(chrs + startpos, chrs + pos);
+					slot = atoi(s_slot.c_str());
+
+					startpos = pos + 1;
+				}
+
+				if (pos < line.size()) {
+					for (pos = startpos; pos < line.size(); pos++)
+						if (chrs[pos] == ')')
+							break;
+
+					args = Common::String(chrs + startpos, chrs + pos);
+				}
+
+
+
+				// Parse for the action type
+				if (act.matchString("add", true)) {
+					actionList.push_back(new ActionAdd(_engine, slot, args));
+				} else if (act.matchString("animplay", true)) {
+					actionList.push_back(new ActionPlayAnimation(_engine, slot, args));
+				} else if (act.matchString("animpreload", true)) {
+					actionList.push_back(new ActionPreloadAnimation(_engine, slot, args));
+				} else if (act.matchString("animunload", true)) {
+					//actionList.push_back(new ActionUnloadAnimation(_engine, slot, args));
+				} else if (act.matchString("attenuate", true)) {
+					// TODO: Implement ActionAttenuate
+				} else if (act.matchString("assign", true)) {
+					actionList.push_back(new ActionAssign(_engine, slot, args));
+				} else if (act.matchString("change_location", true)) {
+					actionList.push_back(new ActionChangeLocation(_engine, slot, args));
+				} else if (act.matchString("crossfade", true)) {
+					// TODO: Implement ActionCrossfade
+				} else if (act.matchString("debug", true)) {
+					// TODO: Implement ActionDebug
+				} else if (act.matchString("delay_render", true)) {
+					// TODO: Implement ActionDelayRender
+				} else if (act.matchString("disable_control", true)) {
+					actionList.push_back(new ActionDisableControl(_engine, slot, args));
+				} else if (act.matchString("disable_venus", true)) {
+					// TODO: Implement ActionDisableVenus
+				} else if (act.matchString("display_message", true)) {
+					// TODO: Implement ActionDisplayMessage
+				} else if (act.matchString("dissolve", true)) {
+					// TODO: Implement ActionDissolve
+				} else if (act.matchString("distort", true)) {
+					// TODO: Implement ActionDistort
+				} else if (act.matchString("enable_control", true)) {
+					actionList.push_back(new ActionEnableControl(_engine, slot, args));
+				} else if (act.matchString("flush_mouse_events", true)) {
+					// TODO: Implement ActionFlushMouseEvents
+				} else if (act.matchString("inventory", true)) {
+					actionList.push_back(new ActionInventory(_engine, slot, args));
+				} else if (act.matchString("kill", true)) {
+					actionList.push_back(new ActionKill(_engine, slot, args));
+				} else if (act.matchString("menu_bar_enable", true)) {
+					// TODO: Implement ActionMenuBarEnable
+				} else if (act.matchString("music", true)) {
+					actionList.push_back(new ActionMusic(_engine, slot, args, false));
+				} else if (act.matchString("pan_track", true)) {
+					// TODO: Implement ActionPanTrack
+				} else if (act.matchString("playpreload", true)) {
+					actionList.push_back(new ActionPlayPreloadAnimation(_engine, slot, args));
+				} else if (act.matchString("preferences", true)) {
+					// TODO: Implement ActionPreferences
+				} else if (act.matchString("quit", true)) {
+					actionList.push_back(new ActionQuit(_engine, slot));
+				} else if (act.matchString("random", true)) {
+					actionList.push_back(new ActionRandom(_engine, slot, args));
+				} else if (act.matchString("region", true)) {
+					// TODO: Implement ActionRegion
+				} else if (act.matchString("restore_game", true)) {
+					// TODO: Implement ActionRestoreGame
+				} else if (act.matchString("rotate_to", true)) {
+					// TODO: Implement ActionRotateTo
+				} else if (act.matchString("save_game", true)) {
+					// TODO: Implement ActionSaveGame
+				} else if (act.matchString("set_partial_screen", true)) {
+					actionList.push_back(new ActionSetPartialScreen(_engine, slot, args));
+				} else if (act.matchString("set_screen", true)) {
+					actionList.push_back(new ActionSetScreen(_engine, slot, args));
+				} else if (act.matchString("set_venus", true)) {
+					// TODO: Implement ActionSetVenus
+				} else if (act.matchString("stop", true)) {
+					actionList.push_back(new ActionStop(_engine, slot, args));
+				} else if (act.matchString("streamvideo", true)) {
+					actionList.push_back(new ActionStreamVideo(_engine, slot, args));
+				} else if (act.matchString("syncsound", true)) {
+					// TODO: Implement ActionSyncSound
+				} else if (act.matchString("timer", true)) {
+					actionList.push_back(new ActionTimer(_engine, slot, args));
+				} else if (act.matchString("ttytext", true)) {
+					// TODO: Implement ActionTTYText
+				} else if (act.matchString("universe_music", true)) {
+					actionList.push_back(new ActionMusic(_engine, slot, args, true));
+				} else if (act.matchString("copy_file", true)) {
+					// Not used. Purposely left empty
+				} else {
+					warning("Unhandled result action type: %s", line.c_str());
+				}
+			}
 		}
 
 		line = stream.readLine();
-- 
cgit v1.2.3


From 9f39b1e819a94d56c2dd6ecbca1488f7e0cd553a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 25 Nov 2013 13:34:44 +0000
Subject: ZVISION: PreloadAnimation must indicate that the animation is loaded.

---
 engines/zvision/actions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 9670016d74..ccae6fd47c 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -346,6 +346,7 @@ bool ActionPreloadAnimation::execute() {
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
+	_engine->getScriptManager()->setStateValue(_slotkey, 2);
 	return true;
 }
 
-- 
cgit v1.2.3


From feabdc60179452973cc329520b3539f5dc22841a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 25 Nov 2013 13:41:37 +0000
Subject: ZVISION: Change clear queued list firstly, not exec list.

---
 engines/zvision/script_manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index b121eaa6a7..f62cbd86c3 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -87,6 +87,7 @@ void ScriptManager::execScope(script_scope &scope) {
 	PuzzleList *tmp = scope.exec_queue;
 	scope.exec_queue = scope.scope_queue;
 	scope.scope_queue = tmp;
+	scope.scope_queue->clear();
 
 	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
 		(*PuzzleIter)->addedBySetState = 0;
@@ -99,8 +100,6 @@ void ScriptManager::execScope(script_scope &scope) {
 			checkPuzzleCriteria(*PuzzleIter, scope.proc_count);
 	}
 
-	scope.exec_queue->clear();
-
 	if (scope.proc_count < 2) {
 		scope.proc_count++;
 	}
-- 
cgit v1.2.3


From f3e2857cde044019dc322eba46bbdcc854fd4839 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 26 Nov 2013 15:02:38 +0000
Subject: ZVISION: Some scripts action arguments can be uppercased, make all
 lowercase.

---
 engines/zvision/scr_file_handling.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 0149347c4e..f80700cc0d 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -151,13 +151,14 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
+	line.toLowercase();
 
 	// TODO: Re-order the if-then statements in order of highest occurrence
 	while (!stream.eos() && !line.contains('}')) {
 		if (line.empty()) {
 			line = stream.readLine();
 			trimCommentsAndWhiteSpace(&line);
-
+			line.toLowercase();
 			continue;
 		}
 
@@ -291,6 +292,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
+		line.toLowercase();
 	}
 
 	return;
-- 
cgit v1.2.3


From 066cc74d9690222cb6af8cfc08b840eaffd57764 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 4 Dec 2013 14:00:48 +0000
Subject: ZVISION: Refactoring cursor manager into simple and
 full-functionally.

---
 engines/zvision/cursor_manager.cpp      | 163 ++++++++++++++------------------
 engines/zvision/cursor_manager.h        |  73 ++++++++------
 engines/zvision/events.cpp              |  10 +-
 engines/zvision/lever_control.cpp       |   2 +-
 engines/zvision/push_toggle_control.cpp |   2 +-
 engines/zvision/script_manager.cpp      |   2 +-
 engines/zvision/zvision.cpp             |   2 +
 7 files changed, 129 insertions(+), 125 deletions(-)

diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index de229a38d8..aaf3bb8ee4 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -50,87 +50,59 @@ const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow
 CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
 	: _engine(engine),
 	  _pixelFormat(pixelFormat),
-	  _cursorIsPushed(false) {
-	// WARNING: The index IDLE_CURSOR_INDEX is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
-	if (_engine->getGameId() == GID_NEMESIS) {
-		Common::String name(Common::String::format("%sa.zcr", _zNemCursorFileNames[IDLE_CURSOR_INDEX]));
-		_idleCursor = ZorkCursor(name);
-	} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-		_idleCursor = ZorkCursor(_zgiCursorFileNames[IDLE_CURSOR_INDEX]);
+	  _cursorIsPushed(false),
+	  _item(0),
+	  _lastitem(0) {
+	for (int i = 0; i < NUM_CURSORS; i++) {
+		if (_engine->getGameId() == GID_NEMESIS) {
+			Common::String name;
+			name = Common::String::format("%sa.zcr", _zNemCursorFileNames[i]);
+			_cursors[i][0] = ZorkCursor(name); // Up cursor
+			name = Common::String::format("%sb.zcr", _zNemCursorFileNames[i]);
+			_cursors[i][1] = ZorkCursor(name); // Down cursor
+		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
+			_cursors[i][0] = ZorkCursor(_zgiCursorFileNames[i]); // Up cursor
+			char buffer[25];
+			strcpy(buffer, _zgiCursorFileNames[i]);
+			buffer[3] += 2;
+			_cursors[i][1] = ZorkCursor(buffer); // Down cursor
+		}
 	}
 }
 
-void CursorManager::initialize() {
-	revertToIdle();
-	CursorMan.showMouse(true);
-}
-
-void CursorManager::changeCursor(const Common::String &cursorName) {
-	changeCursor(cursorName, _cursorIsPushed);
-}
-
-void CursorManager::changeCursor(const Common::String &cursorName, bool pushed) {
-	if (_currentCursor.equals(cursorName) && _cursorIsPushed == pushed)
-		return;
-
-	if (_cursorIsPushed != pushed)
-		_cursorIsPushed = pushed;
-
-	if (cursorName == "idle" && !pushed) {
-		CursorMan.replaceCursor(_idleCursor.getSurface(), _idleCursor.getWidth(), _idleCursor.getHeight(), _idleCursor.getHotspotX(), _idleCursor.getHotspotY(), _idleCursor.getKeyColor(), false, _pixelFormat);
-		return;
-	}
-
-	for (int i = 0; i < NUM_CURSORS; ++i) {
-		if (_engine->getGameId() == GID_NEMESIS) {
-			if (cursorName.equals(_cursorNames[i])) {
-				_currentCursor = cursorName;
-
-				// ZNem uses a/b at the end of the file to signify not pushed/pushed respectively
-				Common::String pushedFlag = pushed ? "b" : "a";
-				Common::String name = Common::String::format("%s%s.zcr", _zNemCursorFileNames[i], pushedFlag.c_str());
-
-				changeCursor(ZorkCursor(name));
-				return;
-			}
-		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-			if (cursorName.equals(_cursorNames[i])) {
-				_currentCursor = cursorName;
-
-				if (!pushed) {
-					changeCursor(ZorkCursor(_zgiCursorFileNames[i]));
-				} else {
-					// ZGI flips not pushed/pushed between a/c and b/d
-					// It flips the 4th character of the name
-					char buffer[25];
-					strcpy(buffer, _zgiCursorFileNames[i]);
-					buffer[3] += 2;
-					changeCursor(ZorkCursor(buffer));
-				}
+void CursorManager::setItemID(int id) {
+	if (id != _item) {
+		if (id) {
+			Common::String file;
+			if (_engine->getGameId() == GID_NEMESIS) {
+				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'a');
+				_cursors[NUM_CURSORS][0] = ZorkCursor(file);
+				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'b');
+				_cursors[NUM_CURSORS][1] = ZorkCursor(file);
+				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'a');
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(file);
+				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'b');
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(file);
+			} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'a' , id);
+				_cursors[NUM_CURSORS][0] = ZorkCursor(file);
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'c' , id);
+				_cursors[NUM_CURSORS][1] = ZorkCursor(file);
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'b' , id);
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(file);
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'd' , id);
+				_cursors[NUM_CURSORS + 1][1] = ZorkCursor(file);
+			} else
 				return;
-			}
 		}
+		_item = id;
+		changeCursor(CursorIndex_Idle);
 	}
-
-	// If we get here, something went wrong
-	warning("No cursor found for identifier %s", cursorName.c_str());
 }
 
-void CursorManager::changeCursor(int id, bool active, bool pushed) {
-	Common::String file;
-	if (_engine->getGameId() == GID_NEMESIS) {
-		file = Common::String::format("%2.2d%s%c.zcr", id, active ? "act" : "idle", pushed ? 'b' : 'a');
-	} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-		file = Common::String::format("g0b%cc%2.2x1.zcr", active ? (pushed ? 'd' : 'c') : (pushed ? 'b' : 'a')  , id);
-	} else
-		return;
-
-	if (_currentCursor.equals(file))
-		return;
-
-	_currentCursor = file;
-
-	changeCursor(ZorkCursor(file));
+void CursorManager::initialize() {
+	changeCursor(_cursors[CursorIndex_Idle][_cursorIsPushed]);
+	showMouse(true);
 }
 
 void CursorManager::changeCursor(const ZorkCursor &cursor) {
@@ -141,31 +113,42 @@ void CursorManager::cursorDown(bool pushed) {
 	if (_cursorIsPushed == pushed)
 		return;
 
-	changeCursor(_currentCursor, pushed);
-}
+	_cursorIsPushed = pushed;
 
-void CursorManager::setLeftCursor() {
-	changeCursor("leftarrow");
+	changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
 }
 
-void CursorManager::setRightCursor() {
-	changeCursor("rightarrow");
-}
+void CursorManager::changeCursor(int id) {
+	int _id = id;
 
-void CursorManager::setUpCursor() {
-	changeCursor("zuparrow");
+	if (_item &&
+	        (_id == CursorIndex_Active ||
+	         _id == CursorIndex_Idle ||
+	         _id == CursorIndex_HandPu)) {
+
+		if (_id == CursorIndex_Idle)
+			_id = CursorIndex_ItemIdle;
+		else
+			_id = CursorIndex_ItemAct;
+	}
+
+	if (_currentCursor != _id ||
+	        ((_id == CursorIndex_ItemAct || _id == CursorIndex_ItemIdle) && _lastitem != _item)) {
+		_currentCursor = _id;
+		_lastitem = _item;
+		changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
+	}
 }
 
-void CursorManager::setDownCursor() {
-	changeCursor("downarrow");
+int CursorManager::getCursorId(Common::String &name) {
+	for (int i = 0; i < NUM_CURSORS; i++)
+		if (name.equals(_cursorNames[i]))
+			return i;
+	return CursorIndex_Idle;
 }
 
-void CursorManager::revertToIdle() {
-	_currentCursor = "idle";
-	if (!_cursorIsPushed)
-		CursorMan.replaceCursor(_idleCursor.getSurface(), _idleCursor.getWidth(), _idleCursor.getHeight(), _idleCursor.getHotspotX(), _idleCursor.getHotspotY(), _idleCursor.getKeyColor(), false, _pixelFormat);
-	else
-		changeCursor(_currentCursor, _cursorIsPushed);
+void CursorManager::showMouse(bool vis) {
+	CursorMan.showMouse(vis);
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/cursor_manager.h b/engines/zvision/cursor_manager.h
index ac79b259fa..7bd1c4240f 100644
--- a/engines/zvision/cursor_manager.h
+++ b/engines/zvision/cursor_manager.h
@@ -36,6 +36,21 @@ namespace ZVision {
 
 class ZVision;
 
+/**
+ * Mostly usable cursors
+ */
+enum CursorIndex {
+    CursorIndex_Active = 0,
+    CursorIndex_DownArr = 3,
+    CursorIndex_HandPu = 6,
+    CursorIndex_Idle = 11,
+    CursorIndex_Left = 12,
+    CursorIndex_Right = 13,
+    CursorIndex_UpArr = 17,
+    CursorIndex_ItemIdle = 18,
+    CursorIndex_ItemAct = 19
+};
+
 /**
  * Class to manage cursor changes. The actual changes have to be done
  * through CursorMan. Otherwise the cursor will disappear after GMM
@@ -47,17 +62,17 @@ public:
 	CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat);
 
 private:
-	enum {
-	    NUM_CURSORS = 18,
-	    // WARNING: The index 11 is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
-	    IDLE_CURSOR_INDEX = 11
-	};
+	static const int NUM_CURSORS = 18;
+
+	// 18 default cursors in up/down states, +2 for items idle/act cursors
+	ZorkCursor _cursors[NUM_CURSORS + 2][2];
 
 	ZVision *_engine;
 	const Graphics::PixelFormat *_pixelFormat;
-	ZorkCursor _idleCursor;
-	Common::String _currentCursor;
 	bool _cursorIsPushed;
+	int _item;
+	int _lastitem;
+	int _currentCursor;
 
 	static const char *_cursorNames[];
 	static const char *_zgiCursorFileNames[];
@@ -68,21 +83,30 @@ public:
 	void initialize();
 
 	/**
-	 * Parses a cursor name into a cursor file then creates and shows that cursor.
-	 * It will use the current _isCursorPushed state to choose the correct cursor
+	 * Change cursor to specified cursor ID. If item setted to not 0 and cursor id idle/acrive/handpu change cursor to item.
+	 *
+	 * @param id    Wanted cursor id.
+	 */
+
+	void changeCursor(int id);
+
+	/**
+	 * Return founded id for string contains cursor name
 	 *
-	 * @param cursorName    The name of a cursor. This *HAS* to correspond to one of the entries in _cursorNames[]
+	 * @param name    Cursor name
+	 * @return        Id of cursor or idle cursor id if not found
 	 */
-	void changeCursor(const Common::String &cursorName);
+
+	int getCursorId(Common::String &name);
+
 	/**
-	 * Parses a cursor name into a cursor file then creates and shows that cursor.
+	 * Load cursor for item by id, and try to change cursor to item cursor if it's not 0
 	 *
-	 * @param cursorName    The name of a cursor. This *HAS* to correspond to one of the entries in _cursorNames[]
-	 * @param pushed        Should the cursor be pushed (true) or not pushed (false) (Another way to say it: down or up)
+	 * @param id    Item id or 0 for no item cursor
 	 */
-	void changeCursor(const Common::String &cursorName, bool pushed);
 
-	void changeCursor(int id, bool active, bool pushed);
+	void setItemID(int id);
+
 	/**
 	 * Change the cursor to a certain push state. If the cursor is already in the specified push state, nothing will happen.
 	 *
@@ -90,17 +114,12 @@ public:
 	 */
 	void cursorDown(bool pushed);
 
-	/** Set the cursor to 'Left Arrow'. It will retain the current _isCursorPushed state */
-	void setLeftCursor();
-	/** Set the cursor to 'Right Arrow'. It will retain the current _isCursorPushed state */
-	void setRightCursor();
-	/** Set the cursor to 'Up Arrow'. It will retain the current _isCursorPushed state */
-	void setUpCursor();
-	/** Set the cursor to 'Down Arrow'. It will retain the current _isCursorPushed state */
-	void setDownCursor();
-
-	/** Set the cursor to 'Idle'. It will retain the current _isCursorPushed state */
-	void revertToIdle();
+	/**
+	 * Show or hide mouse cursor.
+	 *
+	 * @param vis    Should the cursor be showed (true) or hide (false)
+	 */
+	void showMouse(bool vis);
 
 private:
 	/**
diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp
index ede91273e6..69f5ffec24 100644
--- a/engines/zvision/events.cpp
+++ b/engines/zvision/events.cpp
@@ -150,14 +150,14 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				// We use fixed point math to get better accuracy
 				Common::Rational velocity = (Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.x - _workingWindow.left)) - MAX_ROTATION_SPEED;
 				_renderManager->setBackgroundVelocity(velocity.toInt());
-				_cursorManager->setLeftCursor();
+				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
 			} else if (pos.x <= _workingWindow.right && pos.x > _workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET) {
 				// Linear function of distance to the right edge (y = mx)
 				// We use fixed point math to get better accuracy
 				Common::Rational velocity = Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.x - _workingWindow.right + ROTATION_SCREEN_EDGE_OFFSET);
 				_renderManager->setBackgroundVelocity(velocity.toInt());
-				_cursorManager->setRightCursor();
+				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
 			} else {
 				_renderManager->setBackgroundVelocity(0);
@@ -168,14 +168,14 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				// We use fixed point math to get better accuracy
 				Common::Rational velocity = (Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.top)) - MAX_ROTATION_SPEED;
 				_renderManager->setBackgroundVelocity(velocity.toInt());
-				_cursorManager->setUpCursor();
+				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
 			} else if (pos.y <= _workingWindow.bottom && pos.y > _workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET) {
 				// Linear function of distance to the bottom edge (y = mx)
 				// We use fixed point math to get better accuracy
 				Common::Rational velocity = Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.bottom + ROTATION_SCREEN_EDGE_OFFSET);
 				_renderManager->setBackgroundVelocity(velocity.toInt());
-				_cursorManager->setDownCursor();
+				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
 			} else {
 				_renderManager->setBackgroundVelocity(0);
@@ -186,7 +186,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 	}
 
 	if (!cursorWasChanged) {
-		_cursorManager->revertToIdle();
+		_cursorManager->changeCursor(CursorIndex_Idle);
 	}
 }
 
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 6d13d60b3e..fa8475f457 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -239,7 +239,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 			}
 		}
 	} else if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
-		_engine->getCursorManager()->changeCursor(_cursorName);
+		_engine->getCursorManager()->changeCursor(_engine->getCursorManager()->getCursorId(_cursorName));
 		cursorWasChanged = true;
 	}
 
diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index 88619e8f97..86f499739c 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -88,7 +88,7 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
 		return false;
 
 	if (_hotspot.contains(backgroundImageSpacePos)) {
-		_engine->getCursorManager()->changeCursor(_hoverCursor);
+		_engine->getCursorManager()->changeCursor(_engine->getCursorManager()->getCursorId(_hoverCursor));
 		return true;
 	}
 
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index f62cbd86c3..e2397abc59 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -511,7 +511,7 @@ void ScriptManager::do_changeLocation() {
 	_activeControls = &nodeview._controls;
 
 	// Revert to the idle cursor
-	_engine->getCursorManager()->revertToIdle();
+	_engine->getCursorManager()->changeCursor(CursorIndex_Idle);
 
 	// Reset the background velocity
 	_engine->getRenderManager()->setBackgroundVelocity(0);
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 62061bfab6..39d61d9a89 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -143,6 +143,8 @@ Common::Error ZVision::run() {
 		uint32 currentTime = _clock.getLastMeasuredTime();
 		uint32 deltaTime = _clock.getDeltaTime();
 
+		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
+
 		processEvents();
 
 		// Call _renderManager->update() first so the background renders
-- 
cgit v1.2.3


From 570630ee3df60e1dd22fbab1595a4d9dfaa38774 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 24 Dec 2013 14:38:11 +0700
Subject: ZVISION: Make update screen delayed for updates.

---
 engines/zvision/script_manager.cpp |  2 ++
 engines/zvision/zvision.cpp        | 16 ++++++++++++++--
 engines/zvision/zvision.h          |  5 +++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index e2397abc59..e30861aa98 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -462,6 +462,8 @@ void ScriptManager::do_changeLocation() {
 	assert(_nextLocation.world != 0);
 	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
+	_engine->setRenderDelay(2);
+
 	if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
 		if (_nextLocation.world != 'g' || _nextLocation.room != 'j') {
 			setStateValue(StateKey_LastWorld, getStateValue(StateKey_World));
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 39d61d9a89..65064d8a66 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -62,7 +62,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _saveManager(nullptr),
 	  _stringManager(nullptr),
 	  _cursorManager(nullptr),
-	  _aud_id(0) {
+	  _aud_id(0),
+	  _rendDelay(2) {
 
 	debug(1, "ZVision::ZVision");
 }
@@ -156,7 +157,10 @@ Common::Error ZVision::run() {
 		_renderManager->renderBackbufferToScreen();
 
 		// Update the screen
-		_system->updateScreen();
+		if (_rendDelay <= 0)
+			_system->updateScreen();
+		else
+			_rendDelay--;
 
 		// Calculate the frame delay based off a desired frame time
 		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
@@ -193,4 +197,12 @@ int ZVision::getAudioId() {
 	return _aud_id;
 }
 
+void ZVision::setRenderDelay(uint delay) {
+	_rendDelay = delay;
+}
+
+bool ZVision::canRender() {
+	return _rendDelay <= 0;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index e7709283ae..05c5fcd3a4 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -109,6 +109,8 @@ private:
 
 	const Common::Rect _workingWindow_ZGI;
 	const Common::Rect _workingWindow_ZNM;
+
+	int _rendDelay;
 public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
@@ -153,6 +155,9 @@ public:
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
+	void setRenderDelay(uint);
+	bool canRender();
+
 private:
 	void initialize();
 	void initFonts();
-- 
cgit v1.2.3


From 621818836e6a1100bbed2dbc1520a1005f1ad9ed Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 24 Dec 2013 14:43:42 +0700
Subject: ZVISION: New easy-to-use render functions for next rendermanager
 generation.

---
 engines/zvision/render_manager.cpp | 56 ++++++++++++++++++++++++++++++++++++++
 engines/zvision/render_manager.h   | 10 +++++++
 2 files changed, 66 insertions(+)

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index fc15e18fd0..6578c850f6 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -721,4 +721,60 @@ void RenderManager::scaleBuffer(const void *src, void *dst, uint32 srcWidth, uin
 	}
 }
 
+void RenderManager::blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y) {
+	Common::Rect pos(x, y, x + src.w, y + src.h);
+	pos.clip(dst.w, dst.h);
+	copyRectToSurface(src, dst, Common::Rect(), pos);
+}
+
+void RenderManager::blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey) {
+	Common::Rect pos(x, y, x + src.w, y + src.h);
+	pos.clip(dst.w, dst.h);
+	copyRectToSurface(src, dst, Common::Rect(), pos, colorkey);
+}
+
+void RenderManager::blitSurfaceToBkg(Graphics::Surface &src, int x, int y) {
+	blitSurfaceToSurface(src, _currentBackground, x, y);
+	moveBackground(0); // Temporary workaround
+}
+
+void RenderManager::blitSurfaceToBkg(Graphics::Surface &src, int x, int y, uint32 colorkey) {
+	blitSurfaceToSurface(src, _currentBackground, x, y, colorkey);
+	moveBackground(0); // Temporary workaround
+}
+
+void RenderManager::blitSurfaceUpBkg(Graphics::Surface &src, int x, int y) {
+	blitSurfaceToSurface(src, _workingWindowBuffer, x, y);
+}
+
+void RenderManager::blitSurfaceUpBkg(Graphics::Surface &src, int x, int y, uint32 colorkey) {
+	blitSurfaceToSurface(src, _workingWindowBuffer, x, y, colorkey);
+}
+
+Graphics::Surface *RenderManager::getBkgRect(Common::Rect &rect) {
+	Common::Rect dst = rect;
+	dst.clip(_currentBackground.w, _currentBackground.h);
+
+	if (dst.isEmpty() || !dst.isValidRect())
+		return NULL;
+
+	Graphics::Surface *srf = new Graphics::Surface;
+	srf->create(dst.width(), dst.height(), _currentBackground.format);
+
+	srf->copyRectToSurface(_currentBackground, 0, 0, Common::Rect(dst));
+
+	return srf;
+}
+
+Graphics::Surface *RenderManager::loadImage(Common::String &file) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	readImageToSurface(file, *tmp);
+	return tmp;
+}
+
+Graphics::Surface *RenderManager::loadImage(const char *file) {
+	Common::String str = Common::String(file);
+	return loadImage(str);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 14ca704ce1..e16d3562dc 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -369,6 +369,16 @@ public:
 
 	void scaleBuffer(const void *src, void *dst, uint32 srcWidth, uint32 srcHeight, byte bytesPerPixel, uint32 dstWidth, uint32 dstHeight);
 
+	void blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y);
+	void blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey);
+	void blitSurfaceToBkg(Graphics::Surface &src, int x, int y);
+	void blitSurfaceToBkg(Graphics::Surface &src, int x, int y, uint32 colorkey);
+	void blitSurfaceUpBkg(Graphics::Surface &src, int x, int y);
+	void blitSurfaceUpBkg(Graphics::Surface &src, int x, int y, uint32 colorkey);
+	Graphics::Surface *getBkgRect(Common::Rect &rect);
+	Graphics::Surface *loadImage(const char *file);
+	Graphics::Surface *loadImage(Common::String &file);
+
 private:
 	/**
 	 * Renders a subRectangle of an image to the backbuffer. The destinationRect and SubRect
-- 
cgit v1.2.3


From fd325d49f9103408f7d2fc10cc99dae7fab9a0a1 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 24 Dec 2013 15:05:23 +0700
Subject: ZVISION: Add splitter function into controls class.

---
 engines/zvision/control.cpp | 24 ++++++++++++++++++++++++
 engines/zvision/control.h   |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/engines/zvision/control.cpp b/engines/zvision/control.cpp
index 0346228681..ef2e90f8ce 100644
--- a/engines/zvision/control.cpp
+++ b/engines/zvision/control.cpp
@@ -103,4 +103,28 @@ void Control::parseTiltControl(ZVision *engine, Common::SeekableReadStream &stre
 	renderTable->generateRenderTable();
 }
 
+void Control::getParams(Common::String &input_str, Common::String &parameter, Common::String &values) {
+	const char *chrs = input_str.c_str();
+	uint lbr;
+
+	for (lbr = 0; lbr < input_str.size(); lbr++)
+		if (chrs[lbr] == '(')
+			break;
+
+	if (lbr >= input_str.size())
+		return;
+
+	uint rbr;
+
+	for (rbr = lbr + 1; rbr < input_str.size(); rbr++)
+		if (chrs[rbr] == ')')
+			break;
+
+	if (rbr >= input_str.size())
+		return;
+
+	parameter = Common::String(chrs, chrs + lbr);
+	values = Common::String(chrs + lbr + 1, chrs + rbr);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/control.h b/engines/zvision/control.h
index 65d76da5c4..93ad5f5df1 100644
--- a/engines/zvision/control.h
+++ b/engines/zvision/control.h
@@ -24,6 +24,7 @@
 #define ZVISION_CONTROL_H
 
 #include "common/keyboard.h"
+#include "common/str.h"
 
 
 namespace Common {
@@ -102,6 +103,7 @@ protected:
 	ZVision *_engine;
 	uint32 _key;
 
+	void getParams(Common::String &input_str, Common::String &parameter, Common::String &values);
 // Static member functions
 public:
 	static void parseFlatControl(ZVision *engine);
-- 
cgit v1.2.3


From 0c7d1d2d3691f93701e33f40cb665d87004e5499 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 24 Dec 2013 15:11:39 +0700
Subject: ZVISION: Slot control code.

---
 engines/zvision/module.mk             |   3 +-
 engines/zvision/scr_file_handling.cpp |   3 +
 engines/zvision/slot_control.cpp      | 215 ++++++++++++++++++++++++++++++++++
 engines/zvision/slot_control.h        |  86 ++++++++++++++
 4 files changed, 306 insertions(+), 1 deletion(-)
 create mode 100644 engines/zvision/slot_control.cpp
 create mode 100644 engines/zvision/slot_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index ffdef16335..b5512636c3 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -32,7 +32,8 @@ MODULE_OBJS := \
 	zork_raw.o \
 	sidefx.o \
 	music_node.o \
-	inventory_manager.o
+	inventory_manager.o \
+	slot_control.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index f80700cc0d..4f1c3631bd 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -29,6 +29,7 @@
 #include "zvision/actions.h"
 #include "zvision/push_toggle_control.h"
 #include "zvision/lever_control.h"
+#include "zvision/slot_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -342,6 +343,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return NULL;
 	} else if (controlType.equalsIgnoreCase("lever")) {
 		return new LeverControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("slot")) {
+		return new SlotControl(_engine, key, stream);
 	}
 	return NULL;
 }
diff --git a/engines/zvision/slot_control.cpp b/engines/zvision/slot_control.cpp
new file mode 100644
index 0000000000..418aa8fad2
--- /dev/null
+++ b/engines/zvision/slot_control.cpp
@@ -0,0 +1,215 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/slot_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/script_manager.h"
+#include "zvision/cursor_manager.h"
+#include "zvision/render_manager.h"
+#include "zvision/utility.h"
+
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key) {
+
+	_rendered_item = 0;
+	_bkg = NULL;
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("hotspot", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_hotspot = Common::Rect(x, y, width, height);
+		} else if (param.matchString("rectangle", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_rectangle = Common::Rect(x, y, width, height);
+		} else if (param.matchString("cursor", true)) {
+			_cursor = _engine->getCursorManager()->getCursorId(values);
+		} else if (param.matchString("distance_id", true)) {
+			sscanf(values.c_str(), "%c", &_distance_id);
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
+		} else if (param.matchString("eligible_objects", true)) {
+			char buf[256];
+			memset(buf, 0, 256);
+			strcpy(buf, values.c_str());
+
+			char *curpos = buf;
+			char *strend = buf + strlen(buf);
+			while (true) {
+				char *st = curpos;
+
+				if (st >= strend)
+					break;
+
+				while (*curpos != ' ' && curpos < strend)
+					curpos++;
+
+				*curpos = 0;
+				curpos++;
+
+				int obj = atoi(st);
+
+				_eligible_objects.push_back(obj);
+			}
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+
+	if (_hotspot.isEmpty() || _rectangle.isEmpty()) {
+		warning("Slot %u was parsed incorrectly", key);
+	}
+}
+
+SlotControl::~SlotControl() {
+	// Clear the state value back to 0
+	//_engine->getScriptManager()->setStateValue(_key, 0);
+
+	if (_bkg)
+		delete _bkg;
+}
+
+bool SlotControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_hotspot.contains(backgroundImageSpacePos)) {
+		//ctrl_setvenus(ct);
+
+		int item = _engine->getScriptManager()->getStateValue(_key);
+		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+		if (item != 0) {
+			if (mouse_item != 0) {
+				if (eligeblity(mouse_item)) {
+					_engine->getScriptManager()->invertory_drop(mouse_item);
+					_engine->getScriptManager()->invertory_add(item);
+					_engine->getScriptManager()->setStateValue(_key, mouse_item);
+				}
+			} else {
+				_engine->getScriptManager()->invertory_add(item);
+				_engine->getScriptManager()->setStateValue(_key, 0);
+			}
+		} else if (mouse_item == 0) {
+			if (eligeblity(0)) {
+				_engine->getScriptManager()->invertory_drop(0);
+				_engine->getScriptManager()->setStateValue(_key, 0);
+			}
+		} else if (eligeblity(mouse_item)) {
+			_engine->getScriptManager()->setStateValue(_key, mouse_item);
+			_engine->getScriptManager()->invertory_drop(mouse_item);
+		}
+	}
+	return false;
+}
+
+bool SlotControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_hotspot.contains(backgroundImageSpacePos)) {
+		_engine->getCursorManager()->changeCursor(_cursor);
+		return true;
+	}
+
+	return false;
+}
+
+bool SlotControl::process(uint32 deltaTimeInMillis) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_engine->canRender()) {
+		int cur_item = _engine->getScriptManager()->getStateValue(_key);
+		if (cur_item != _rendered_item) {
+			if (_rendered_item == 0) {
+				if (_bkg)
+					delete _bkg;
+
+				_bkg = _engine->getRenderManager()->getBkgRect(_rectangle);
+
+				char buf[16];
+				if (_engine->getGameId() == GID_NEMESIS)
+					sprintf(buf, "%d%cobj.tga", cur_item, _distance_id);
+				else
+					sprintf(buf, "g0z%cu%2.2x1.tga", _distance_id, cur_item);
+
+				Graphics::Surface *srf = _engine->getRenderManager()->loadImage(buf);
+
+				int16 drawx = _rectangle.left;
+				int16 drawy = _rectangle.top;
+
+				if (_rectangle.width() > srf->w)
+					drawx = _rectangle.left + (_rectangle.width() - srf->w) / 2;
+
+				if (_rectangle.height() > srf->h)
+					drawy = _rectangle.top + (_rectangle.height() - srf->h) / 2;
+
+				_engine->getRenderManager()->blitSurfaceToBkg(*srf, drawx, drawy, 0);
+
+				delete srf;
+
+				_rendered_item = cur_item;
+			} else {
+				_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
+				_rendered_item = cur_item;
+			}
+		}
+	}
+	return false;
+}
+
+bool SlotControl::eligeblity(int item_id) {
+	for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++)
+		if (*it == item_id)
+			return true;
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/slot_control.h b/engines/zvision/slot_control.h
new file mode 100644
index 0000000000..eec2d04518
--- /dev/null
+++ b/engines/zvision/slot_control.h
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SLOT_CONTROL_H
+#define ZVISION_SLOT_CONTROL_H
+
+#include "zvision/control.h"
+
+#include "graphics/surface.h"
+
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace ZVision {
+
+class SlotControl : public Control {
+public:
+	SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~SlotControl();
+
+	/**
+	 * Called when LeftMouse is lifted. Calls ScriptManager::setStateValue(_key, 1);
+	 *
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 */
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	/**
+	 * Called on every MouseMove. Tests if the mouse is inside _hotspot, and if so, sets the cursor.
+	 *
+	 * @param engine                     The base engine
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 * @return                           Was the cursor changed?
+	 */
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	/**
+	 * The area that will trigger the event
+	 * This is in image space coordinates, NOT screen space
+	 */
+	Common::Rect _rectangle;
+	Common::Rect _hotspot;
+
+	int _cursor;
+	char _distance_id;
+	int _venus_id;
+
+	int _rendered_item;
+
+	Common::List<int> _eligible_objects;
+
+	bool eligeblity(int item_id);
+
+	Graphics::Surface *_bkg;
+
+	/** The cursor to use when hovering over _hotspot */
+	Common::String _hoverCursor;
+};
+
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From 48156debaf148b50acd3eb6e3de7020498016a5f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 24 Dec 2013 15:37:11 +0700
Subject: ZVISION: Fix animation_node upper frame.

---
 engines/zvision/animation_node.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 73e419ee19..967dee2c4a 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -190,6 +190,13 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = start_frame;
 	nod.stop = end_frame;
+	if (_fileType == RLF) {
+        if (nod.stop >= (int)_animation.rlf->frameCount())
+            nod.stop = _animation.rlf->frameCount() - 1;
+	} else if (_fileType == AVI) {
+	    if (nod.stop > (int)_animation.avi->getFrameCount())
+            nod.stop = _animation.avi->getFrameCount();
+	}
 	nod.slot = slot;
 	nod._cur_frm = -1;
 	nod._delay = 0;
-- 
cgit v1.2.3


From 1428cb8950e5bdcfad9d15d0fb2e32ff1dbc0bae Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 7 Jan 2014 18:39:16 +0700
Subject: ZVISION: Refactoring of renderManager.

---
 engines/zvision/animation_node.cpp |   8 +-
 engines/zvision/console.cpp        |  16 +-
 engines/zvision/events.cpp         |  48 ++-
 engines/zvision/input_control.cpp  |   4 +-
 engines/zvision/lever_control.cpp  |  14 +-
 engines/zvision/render_manager.cpp | 863 ++++++++++++++++---------------------
 engines/zvision/render_manager.h   | 320 ++++----------
 engines/zvision/render_table.cpp   |  22 +
 engines/zvision/render_table.h     |   2 +
 engines/zvision/script_manager.cpp |   4 +-
 engines/zvision/zvision.cpp        |  50 ++-
 engines/zvision/zvision.h          |   2 +
 12 files changed, 577 insertions(+), 776 deletions(-)

diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 967dee2c4a..74b532b2ef 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -165,15 +165,15 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
 					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
 					if (_mask > 0)
-						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top, _mask);
+						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
 					else
-						_engine->getRenderManager()->renderImageToBackground(*transposed, nod->pos.left, nod->pos.top);
+						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top);
 					delete transposed;
 				} else {
 					if (_mask > 0)
-						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top, _mask);
+						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
 					else
-						_engine->getRenderManager()->renderImageToBackground(*frame, nod->pos.left, nod->pos.top);
+						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top);
 				}
 			}
 		}
diff --git a/engines/zvision/console.cpp b/engines/zvision/console.cpp
index 400dcb3f39..252a4b75ef 100644
--- a/engines/zvision/console.cpp
+++ b/engines/zvision/console.cpp
@@ -60,12 +60,12 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 }
 
 bool Console::cmdLoadImage(int argc, const char **argv) {
-	if (argc == 4)
-		_engine->getRenderManager()->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]));
-	else {
-		DebugPrintf("Use loadimage <fileName> <destinationX> <destinationY> to load an image to the screen\n");
-		return true;
-	}
+//	if (argc == 4)
+//		_engine->getRenderManager()->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]));
+//	else {
+//		DebugPrintf("Use loadimage <fileName> <destinationX> <destinationY> to load an image to the screen\n");
+//		return true;
+//	}
 
 	return true;
 }
@@ -208,8 +208,8 @@ bool Console::cmdRenderText(int argc, const char **argv) {
 		return true;
 	}
 
-	StringManager::TextStyle style = _engine->getStringManager()->getTextStyle(atoi(argv[2]));
-	_engine->getRenderManager()->renderTextToWorkingWindow(333, Common::String(argv[1]), style.font, atoi(argv[3]), atoi(argv[4]), style.color, atoi(argv[5]), -1, Graphics::kTextAlignLeft, atoi(argv[6]) == 0 ? false : true);
+	//StringManager::TextStyle style = _engine->getStringManager()->getTextStyle(atoi(argv[2]));
+	//_engine->getRenderManager()->renderTextToWorkingWindow(333, Common::String(argv[1]), style.font, atoi(argv[3]), atoi(argv[4]), style.color, atoi(argv[5]), -1, Graphics::kTextAlignLeft, atoi(argv[6]) == 0 ? false : true);
 
 	return true;
 }
diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp
index 69f5ffec24..d8828867b0 100644
--- a/engines/zvision/events.cpp
+++ b/engines/zvision/events.cpp
@@ -146,43 +146,53 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
 		if (renderState == RenderTable::PANORAMA) {
 			if (pos.x >= _workingWindow.left && pos.x < _workingWindow.left + ROTATION_SCREEN_EDGE_OFFSET) {
-				// Linear function of distance to the left edge (y = -mx + b)
-				// We use fixed point math to get better accuracy
-				Common::Rational velocity = (Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.x - _workingWindow.left)) - MAX_ROTATION_SPEED;
-				_renderManager->setBackgroundVelocity(velocity.toInt());
+
+				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
+				if (mspeed <= 0)
+					mspeed = 400 >> 4;
+				_velocity  = (((pos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+
 				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
 			} else if (pos.x <= _workingWindow.right && pos.x > _workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET) {
-				// Linear function of distance to the right edge (y = mx)
-				// We use fixed point math to get better accuracy
-				Common::Rational velocity = Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.x - _workingWindow.right + ROTATION_SCREEN_EDGE_OFFSET);
-				_renderManager->setBackgroundVelocity(velocity.toInt());
+
+				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
+				if (mspeed <= 0)
+					mspeed = 400 >> 4;
+				_velocity  = (((pos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+
 				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
 			} else {
-				_renderManager->setBackgroundVelocity(0);
+				_velocity = 0;
 			}
 		} else if (renderState == RenderTable::TILT) {
 			if (pos.y >= _workingWindow.top && pos.y < _workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET) {
-				// Linear function of distance to top edge
-				// We use fixed point math to get better accuracy
-				Common::Rational velocity = (Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.top)) - MAX_ROTATION_SPEED;
-				_renderManager->setBackgroundVelocity(velocity.toInt());
+
+				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
+				if (mspeed <= 0)
+					mspeed = 400 >> 4;
+				_velocity  = (((pos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+
 				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
 			} else if (pos.y <= _workingWindow.bottom && pos.y > _workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET) {
-				// Linear function of distance to the bottom edge (y = mx)
-				// We use fixed point math to get better accuracy
-				Common::Rational velocity = Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.bottom + ROTATION_SCREEN_EDGE_OFFSET);
-				_renderManager->setBackgroundVelocity(velocity.toInt());
+
+				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
+				if (mspeed <= 0)
+					mspeed = 400 >> 4;
+				_velocity  = (((pos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+
 				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
 			} else {
-				_renderManager->setBackgroundVelocity(0);
+				_velocity = 0;
 			}
+		} else {
+			_velocity = 0;
 		}
 	} else {
-		_renderManager->setBackgroundVelocity(0);
+		_velocity = 0;
 	}
 
 	if (!cursorWasChanged) {
diff --git a/engines/zvision/input_control.cpp b/engines/zvision/input_control.cpp
index 8d9d79ba09..a366e06923 100644
--- a/engines/zvision/input_control.cpp
+++ b/engines/zvision/input_control.cpp
@@ -129,9 +129,9 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 	// First see if we need to render the text
 	if (_textChanged) {
 		// Blit the text using the RenderManager
-		Common::Rect destRect = _engine->getRenderManager()->renderTextToWorkingWindow(_key, _currentInputText, _textStyle.font, _textRectangle.left, _textRectangle.top, _textStyle.color, _textRectangle.width());
+		//Common::Rect destRect = _engine->getRenderManager()->renderTextToWorkingWindow(_key, _currentInputText, _textStyle.font, _textRectangle.left, _textRectangle.top, _textStyle.color, _textRectangle.width());
 
-		_cursorOffset = destRect.left - _textRectangle.left;
+		//_cursorOffset = destRect.left - _textRectangle.left;
 	}
 
 	// Render the next frame of the animation
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index fa8475f457..9cd36cf653 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -375,26 +375,20 @@ void LeverControl::renderFrame(uint frameNumber) {
 		_lastRenderedFrame = frameNumber;
 	}
 
-	const uint16 *frameData;
+	const Graphics::Surface *frameData;
 	int x = _animationCoords.left;
 	int y = _animationCoords.top;
-	int width;
-	int height;
 
 	if (_fileType == RLF) {
 		// getFrameData() will automatically optimize to getNextFrame() / getPreviousFrame() if it can
-		frameData = (const uint16 *)_animation.rlf->getFrameData(frameNumber)->getPixels();
-		width = _animation.rlf->width(); // Use the animation width instead of _animationCoords.width()
-		height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()
+		frameData = _animation.rlf->getFrameData(frameNumber);
 	} else if (_fileType == AVI) {
 		_animation.avi->seekToFrame(frameNumber);
 		const Graphics::Surface *surface = _animation.avi->decodeNextFrame();
-		frameData = (const uint16 *)surface->getPixels();
-		width = surface->w;
-		height = surface->h;
+		frameData = surface;
 	}
 
-	_engine->getRenderManager()->copyRectToWorkingWindow(frameData, x, y, width, width, height);
+	_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index 6578c850f6..bc4d169569 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -39,356 +39,75 @@ namespace ZVision {
 
 RenderManager::RenderManager(OSystem *system, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
 	: _system(system),
-	  _workingWidth(workingWindow.width()),
-	  _workingHeight(workingWindow.height()),
-	  _screenCenterX(_workingWidth / 2),
-	  _screenCenterY(_workingHeight / 2),
+	  _wrkWidth(workingWindow.width()),
+	  _wrkHeight(workingWindow.height()),
+	  _screenCenterX(_wrkWidth / 2),
+	  _screenCenterY(_wrkHeight / 2),
 	  _workingWindow(workingWindow),
 	  _pixelFormat(pixelFormat),
-	  _backgroundWidth(0),
-	  _backgroundHeight(0),
-	  _backgroundInverseVelocity(0),
-	  _backgroundOffset(0, 0),
-	  _accumulatedVelocityMilliseconds(0),
-	  _renderTable(_workingWidth, _workingHeight) {
+	  _bkgWidth(0),
+	  _bkgHeight(0),
+	  _bkgOff(0),
+	  _renderTable(_wrkWidth, _wrkHeight) {
 
-	_workingWindowBuffer.create(_workingWidth, _workingHeight, _pixelFormat);
-	_backBuffer.create(windowWidth, windowHeight, pixelFormat);
-}
+	_wrkWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
+	_outWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
+	_menuWnd.create(windowWidth, workingWindow.top, _pixelFormat);
+	_subWnd.create(windowWidth, windowHeight - workingWindow.bottom, _pixelFormat);
 
-RenderManager::~RenderManager() {
-	_workingWindowBuffer.free();
-	_currentBackground.free();
-	_backBuffer.free();
+	_menuWndRect = Common::Rect(0, 0, windowWidth, workingWindow.top);
+	_subWndRect = Common::Rect(0, workingWindow.bottom, windowWidth, windowHeight);
 
-	for (AlphaEntryMap::iterator iter = _alphaDataEntries.begin(); iter != _alphaDataEntries.end(); ++iter) {
-		iter->_value.data->free();
-		delete iter->_value.data;
-	}
+	_subid = 0;
 }
 
-void RenderManager::update(uint deltaTimeInMillis) {
-	// An inverse velocity of 0 would be infinitely fast, so we'll let 0 mean no velocity.
-	if (_backgroundInverseVelocity != 0) {
-		_accumulatedVelocityMilliseconds += deltaTimeInMillis;
-
-		uint absVelocity = uint(abs(_backgroundInverseVelocity));
-
-		int numberOfSteps = 0;
-		while (_accumulatedVelocityMilliseconds >= absVelocity) {
-			_accumulatedVelocityMilliseconds -= absVelocity;
-			numberOfSteps++;
-		}
-
-		// Choose the direction of movement using the sign of the velocity
-		moveBackground(_backgroundInverseVelocity < 0 ? -numberOfSteps : numberOfSteps);
-	}
+RenderManager::~RenderManager() {
+	_curBkg.free();
+	_wrkWnd.free();
+	_outWnd.free();
 }
 
 void RenderManager::renderBackbufferToScreen() {
-	if (!_workingWindowDirtyRect.isEmpty()) {
-		RenderTable::RenderState state = _renderTable.getRenderState();
-		if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-			_renderTable.mutateImage((uint16 *)_workingWindowBuffer.getPixels(), (uint16 *)_backBuffer.getBasePtr(_workingWindow.left + _workingWindowDirtyRect.left, _workingWindow.top + _workingWindowDirtyRect.top), _backBuffer.w, _workingWindowDirtyRect);
-		} else {
-			_backBuffer.copyRectToSurface(_workingWindowBuffer.getBasePtr(_workingWindowDirtyRect.left, _workingWindowDirtyRect.top), _workingWindowBuffer.pitch, _workingWindow.left + _workingWindowDirtyRect.left, _workingWindow.top + _workingWindowDirtyRect.top, _workingWindowDirtyRect.width(), _workingWindowDirtyRect.height());
-		}
-
-		// Translate the working window dirty rect to screen coords
-		_workingWindowDirtyRect.translate(_workingWindow.left, _workingWindow.top);
-		// Then extend the backbuffer dirty rect to contain it
-		if (_backBufferDirtyRect.isEmpty()) {
-			_backBufferDirtyRect = _workingWindowDirtyRect;
-		} else {
-			_backBufferDirtyRect.extend(_workingWindowDirtyRect);
-		}
-
-		// Clear the dirty rect
-		_workingWindowDirtyRect = Common::Rect();
-	}
-
-	// TODO: Add menu rendering
-
-	// Render alpha entries
-	processAlphaEntries();
-
-	if (!_backBufferDirtyRect.isEmpty()) {
-		_system->copyRectToScreen(_backBuffer.getBasePtr(_backBufferDirtyRect.left, _backBufferDirtyRect.top), _backBuffer.pitch, _backBufferDirtyRect.left, _backBufferDirtyRect.top, _backBufferDirtyRect.width(), _backBufferDirtyRect.height());
-		_backBufferDirtyRect = Common::Rect();
-	}
-}
-
-void RenderManager::processAlphaEntries() {
-	// TODO: Add dirty rectangling support. AKA only draw an entry if the _backbufferDirtyRect intersects/contains the entry Rect
+	Graphics::Surface *out = &_outWnd;
 
-	for (AlphaEntryMap::iterator iter = _alphaDataEntries.begin(); iter != _alphaDataEntries.end(); ++iter) {
-		uint32 destOffset = 0;
-		uint32 sourceOffset = 0;
-		uint16 *backbufferPtr = (uint16 *)_backBuffer.getBasePtr(iter->_value.destX + _workingWindow.left, iter->_value.destY + _workingWindow.top);
-		uint16 *entryPtr = (uint16 *)iter->_value.data->getPixels();
-
-		for (int32 y = 0; y < iter->_value.height; ++y) {
-			for (int32 x = 0; x < iter->_value.width; ++x) {
-				uint16 color = entryPtr[sourceOffset + x];
-				if (color != iter->_value.alphaColor) {
-					backbufferPtr[destOffset + x] = color;
-				}
-			}
-
-			destOffset += _backBuffer.w;
-			sourceOffset += iter->_value.width;
-		}
-
-		if (_backBufferDirtyRect.isEmpty()) {
-			_backBufferDirtyRect = Common::Rect(iter->_value.destX + _workingWindow.left, iter->_value.destY + _workingWindow.top, iter->_value.destX + _workingWindow.left + iter->_value.width, iter->_value.destY + _workingWindow.top + iter->_value.height);
-		} else {
-			_backBufferDirtyRect.extend(Common::Rect(iter->_value.destX + _workingWindow.left, iter->_value.destY + _workingWindow.top, iter->_value.destX + _workingWindow.left + iter->_value.width, iter->_value.destY + _workingWindow.top + iter->_value.height));
+	RenderTable::RenderState state = _renderTable.getRenderState();
+	if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
+		if (!_wrkWndDirtyRect.isEmpty()) {
+			_renderTable.mutateImage(&_outWnd, &_wrkWnd);
+			out = &_outWnd;
+			_outWndDirtyRect = Common::Rect(_wrkWidth, _wrkHeight);
 		}
+	} else {
+		out = &_wrkWnd;
+		_outWndDirtyRect = _wrkWndDirtyRect;
 	}
-}
-
-void RenderManager::clearWorkingWindowTo555Color(uint16 color) {
-	uint32 workingWindowSize = _workingWidth * _workingHeight;
-	byte r, g, b;
-	Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(color, r, g, b);
-	uint16 colorIn565 = _pixelFormat.RGBToColor(r, g, b);
-	uint16 *bufferPtr = (uint16 *)_workingWindowBuffer.getPixels();
-
-	for (uint32 i = 0; i < workingWindowSize; ++i) {
-		bufferPtr[i] = colorIn565;
-	}
-}
-
-void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect) {
-	if (src.format != dst.format)
-		return;
-
-	Common::Rect dstRect = _dstRect;
-	if (dstRect.isEmpty())
-		dstRect = Common::Rect(dst.w, dst.h);
-	dstRect.clip(dst.w, dst.h);
-
-	Common::Rect srcRect = _srcRect;
-	if (srcRect.isEmpty())
-		srcRect = Common::Rect(src.w, src.h);
-	srcRect.clip(src.w, src.h);
-
-	if (!srcRect.isValidRect() || !dstRect.isValidRect())
-		return;
-
-	Common::Rect rendRect = srcRect;
-	rendRect.clip(dstRect.width(), dstRect.height());
-
-	if (rendRect.isEmpty() || !rendRect.isValidRect())
-		return;
 
-	// Copy rendRect from src surface to dst surface
-	const byte *src_buf = (const byte *)src.getBasePtr(rendRect.left, rendRect.top);
-	byte *dst_buf = (byte *)dst.getBasePtr(dstRect.left, dstRect.top);
 
-	int32 w = rendRect.width();
-	int32 h = rendRect.height();
+	if (!_outWndDirtyRect.isEmpty()) {
+		_system->copyRectToScreen(out->getBasePtr(_outWndDirtyRect.left, _outWndDirtyRect.top), out->pitch,
+		                          _outWndDirtyRect.left + _workingWindow.left,
+		                          _outWndDirtyRect.top + _workingWindow.top,
+		                          _outWndDirtyRect.width(),
+		                          _outWndDirtyRect.height());
 
-	for (int32 y = 0; y < h; y++) {
-		memcpy(dst_buf, src_buf, w * src.format.bytesPerPixel);
-		src_buf += src.pitch;
-		dst_buf += dst.pitch;
+		_outWndDirtyRect = Common::Rect();
 	}
 }
 
-void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &_srcRect, const Common::Rect &_dstRect, uint32 keycolor) {
-	if (src.format != dst.format)
-		return;
-
-	Common::Rect dstRect = _dstRect;
-	if (dstRect.isEmpty())
-		dstRect = Common::Rect(dst.w, dst.h);
-	dstRect.clip(dst.w, dst.h);
-
-	Common::Rect srcRect = _srcRect;
-	if (srcRect.isEmpty())
-		srcRect = Common::Rect(src.w, src.h);
-	srcRect.clip(src.w, src.h);
-
-	if (!srcRect.isValidRect() || !dstRect.isValidRect())
-		return;
-
-	Common::Rect rendRect = srcRect;
-	rendRect.clip(dstRect.width(), dstRect.height());
-
-	if (rendRect.isEmpty() || !rendRect.isValidRect())
-		return;
-
-	uint32 _keycolor = keycolor & ((1 << (src.format.bytesPerPixel << 3)) - 1);
-
-	// Copy rendRect from src surface to dst surface
-	const byte *src_buf = (const byte *)src.getBasePtr(rendRect.left, rendRect.top);
-	byte *dst_buf = (byte *)dst.getBasePtr(dstRect.left, dstRect.top);
-
-	int32 w = rendRect.width();
-	int32 h = rendRect.height();
-
-	for (int32 y = 0; y < h; y++) {
-		switch (src.format.bytesPerPixel) {
-		case 1: {
-			const uint *src_tmp = (const uint *)src_buf;
-			uint *dst_tmp = (uint *)dst_buf;
-			for (int32 x = 0; x < w; x++) {
-				if (*src_tmp != _keycolor)
-					*dst_tmp = *src_tmp;
-				src_tmp++;
-				dst_tmp++;
-			}
-		}
-		break;
-
-		case 2: {
-			const uint16 *src_tmp = (const uint16 *)src_buf;
-			uint16 *dst_tmp = (uint16 *)dst_buf;
-			for (int32 x = 0; x < w; x++) {
-				if (*src_tmp != _keycolor)
-					*dst_tmp = *src_tmp;
-				src_tmp++;
-				dst_tmp++;
-			}
-		}
-		break;
-
-		case 4: {
-			const uint32 *src_tmp = (const uint32 *)src_buf;
-			uint32 *dst_tmp = (uint32 *)dst_buf;
-			for (int32 x = 0; x < w; x++) {
-				if (*src_tmp != _keycolor)
-					*dst_tmp = *src_tmp;
-				src_tmp++;
-				dst_tmp++;
-			}
-		}
-		break;
-
-		default:
-			break;
-		}
-		src_buf += src.pitch;
-		dst_buf += dst.pitch;
-	}
-}
-
-void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt) {
-	if (!Common::Rect(dst.w, dst.h).contains(dstPt))
-		return;
-	Common::Rect dstRect(dstPt.x, dstPt.y, dst.w, dst.h);
-	copyRectToSurface(src, dst, srcRect, dstRect);
-}
-
-void RenderManager::copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 keycolor) {
-	if (!Common::Rect(dst.w, dst.h).contains(dstPt))
-		return;
-	Common::Rect dstRect(dstPt.x, dstPt.y, dst.w, dst.h);
-	copyRectToSurface(src, dst, srcRect, dstRect, keycolor);
-}
-
 void RenderManager::renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY) {
 	Graphics::Surface surface;
 	readImageToSurface(fileName, surface);
 
-	Common::Rect srcRect(surface.w, surface.h);
-	Common::Point dstPt(destX, destY);
-
-	copyRectToSurface(surface, _currentBackground, srcRect, dstPt);
-	moveBackground(0);
-}
-
-void RenderManager::renderImageToBackground(const Graphics::Surface &surface, int16 destX, int16 destY) {
-	Common::Rect srcRect(surface.w, surface.h);
-	Common::Point dstPt(destX, destY);
-
-	copyRectToSurface(surface, _currentBackground, srcRect, dstPt);
-	moveBackground(0);
+	blitSurfaceToBkg(surface, destX, destY);
+	surface.free();
 }
 
 void RenderManager::renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, uint32 keycolor) {
 	Graphics::Surface surface;
 	readImageToSurface(fileName, surface);
 
-	Common::Rect srcRect(surface.w, surface.h);
-	Common::Point dstPt(destX, destY);
-
-	copyRectToSurface(surface, _currentBackground, srcRect, dstPt, keycolor);
-	moveBackground(0);
-}
-
-void RenderManager::renderImageToBackground(const Graphics::Surface &surface, int16 destX, int16 destY, uint32 keycolor) {
-	Common::Rect srcRect(surface.w, surface.h);
-	Common::Point dstPt(destX, destY);
-
-	copyRectToSurface(surface, _currentBackground, srcRect, dstPt, keycolor);
-	moveBackground(0);
-}
-
-void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {
-	int16 subRectX = 0;
-	int16 subRectY = 0;
-
-	// Take care of negative destinations
-	if (destinationX < 0) {
-		subRectX = -destinationX;
-		destinationX = 0;
-	} else if (destinationX >= surface.w) {
-		// Take care of extreme positive destinations
-		destinationX -= surface.w;
-	}
-
-	// Take care of negative destinations
-	if (destinationY < 0) {
-		subRectY = -destinationY;
-		destinationY = 0;
-	} else if (destinationY >= surface.h) {
-		// Take care of extreme positive destinations
-		destinationY -= surface.h;
-	}
-
-	if (wrap) {
-		_backgroundWidth = surface.w;
-		_backgroundHeight = surface.h;
-
-		if (destinationX > 0) {
-			// Move destinationX to 0
-			subRectX = surface.w - destinationX;
-			destinationX = 0;
-		}
-
-		if (destinationY > 0) {
-			// Move destinationY to 0
-			subRectY = surface.h - destinationY;
-			destinationY = 0;
-		}
-	}
-
-	// Clip subRect to working window bounds
-	Common::Rect subRect(subRectX, subRectY, subRectX + _workingWidth, subRectY + _workingHeight);
-
-	if (!wrap) {
-		// Clip to image bounds
-		subRect.clip(surface.w, surface.h);
-	}
-
-	// Check destRect for validity
-	if (!subRect.isValidRect() || subRect.isEmpty())
-		return;
-
-	copyRectToWorkingWindow((const uint16 *)surface.getBasePtr(subRect.left, subRect.top), destinationX, destinationY, surface.w, subRect.width(), subRect.height());
-}
-
-void RenderManager::renderImageToScreen(const Common::String &fileName, int16 destinationX, int16 destinationY, bool wrap) {
-	Graphics::Surface surface;
-	readImageToSurface(fileName, surface);
-
-	renderSubRectToScreen(surface, destinationX, destinationY, wrap);
-}
-
-void RenderManager::renderImageToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {
-	renderSubRectToScreen(surface, destinationX, destinationY, wrap);
+	blitSurfaceToBkg(surface, destX, destY, keycolor);
+	surface.free();
 }
 
 void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination) {
@@ -485,72 +204,6 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 	destination.convertToInPlace(_pixelFormat);
 }
 
-void RenderManager::copyRectToWorkingWindow(const uint16 *buffer, int32 destX, int32 destY, int32 imageWidth, int32 width, int32 height) {
-	uint32 destOffset = 0;
-	uint32 sourceOffset = 0;
-	uint16 *workingWindowBufferPtr = (uint16 *)_workingWindowBuffer.getBasePtr(destX, destY);
-
-	for (int32 y = 0; y < height; ++y) {
-		for (int32 x = 0; x < width; ++x) {
-			workingWindowBufferPtr[destOffset + x] = buffer[sourceOffset + x];
-		}
-
-		destOffset += _workingWidth;
-		sourceOffset += imageWidth;
-	}
-
-	if (_workingWindowDirtyRect.isEmpty()) {
-		_workingWindowDirtyRect = Common::Rect(destX, destY, destX + width, destY + height);
-	} else {
-		_workingWindowDirtyRect.extend(Common::Rect(destX, destY, destX + width, destY + height));
-	}
-
-	// TODO: Remove this from release. It's here to make sure code that uses this function clips their destinations correctly
-	assert(_workingWindowDirtyRect.width() <= _workingWidth && _workingWindowDirtyRect.height() <= _workingHeight);
-}
-
-void RenderManager::copyRectToWorkingWindow(const uint16 *buffer, int32 destX, int32 destY, int32 imageWidth, int32 width, int32 height, int16 alphaColor, uint32 idNumber) {
-	AlphaDataEntry entry;
-	entry.alphaColor = alphaColor;
-	entry.data = new Graphics::Surface();
-	entry.data->create(width, height, _pixelFormat);
-	entry.destX = destX;
-	entry.destY = destY;
-	entry.width = width;
-	entry.height = height;
-
-	uint32 sourceOffset = 0;
-	uint32 destOffset = 0;
-	uint16 *surfacePtr = (uint16 *)entry.data->getPixels();
-
-	for (int32 y = 0; y < height; ++y) {
-		for (int32 x = 0; x < width; ++x) {
-			surfacePtr[destOffset + x] = buffer[sourceOffset + x];
-		}
-
-		destOffset += width;
-		sourceOffset += imageWidth;
-	}
-
-	_alphaDataEntries[idNumber] = entry;
-}
-
-Common::Rect RenderManager::renderTextToWorkingWindow(uint32 idNumber, const Common::String &text, TruetypeFont *font, int destX, int destY, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap) {
-	AlphaDataEntry entry;
-	entry.alphaColor = 0;
-	entry.destX = destX;
-	entry.destY = destY;
-
-	// Draw the text to the working window
-	entry.data = font->drawTextToSurface(text, textColor, maxWidth, maxHeight, align, wrap);
-	entry.width = entry.data->w;
-	entry.height = entry.data->h;
-
-	_alphaDataEntries[idNumber] = entry;
-
-	return Common::Rect(destX, destY, destX + entry.width, destY + entry.height);
-}
-
 const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) {
 	if (_workingWindow.contains(point)) {
 		// Convert from screen space to working window space
@@ -562,19 +215,20 @@ const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &
 		}
 
 		if (state == RenderTable::PANORAMA) {
-			newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
+			newPoint += (Common::Point(_bkgOff - _screenCenterX, 0));
 		} else if (state == RenderTable::TILT) {
-			newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
+			newPoint += (Common::Point(0, _bkgOff - _screenCenterY));
 		}
 
+		if (_bkgWidth)
+			newPoint.x %= _bkgWidth;
+		if (_bkgHeight)
+			newPoint.y %= _bkgHeight;
+
 		if (newPoint.x < 0)
-			newPoint.x += _backgroundWidth;
-		else if (newPoint.x >= _backgroundWidth)
-			newPoint.x -= _backgroundWidth;
+			newPoint.x += _bkgWidth;
 		if (newPoint.y < 0)
-			newPoint.y += _backgroundHeight;
-		else if (newPoint.y >= _backgroundHeight)
-			newPoint.y -= _backgroundHeight;
+			newPoint.y += _bkgHeight;
 
 		return newPoint;
 	} else {
@@ -582,95 +236,32 @@ const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &
 	}
 }
 
-const Common::Point RenderManager::imageSpaceToWorkingWindowSpace(const Common::Point &point) {
-	Common::Point newPoint(point);
-
-	RenderTable::RenderState state = _renderTable.getRenderState();
-	if (state == RenderTable::PANORAMA) {
-		newPoint += (Common::Point(_screenCenterX, 0) - _backgroundOffset);
-	} else if (state == RenderTable::TILT) {
-		newPoint += (Common::Point(0, _screenCenterY) - _backgroundOffset);
-	}
-
-	return newPoint;
-}
-
-bool RenderManager::clipRectToWorkingWindow(Common::Rect &rect) {
-	if (!_workingWindow.contains(rect)) {
-		return false;
-	}
-
-	// We can't clip against the actual working window rect because it's in screen space
-	// But rect is in working window space
-	rect.clip(_workingWidth, _workingHeight);
-	return true;
-}
-
 RenderTable *RenderManager::getRenderTable() {
 	return &_renderTable;
 }
 
 void RenderManager::setBackgroundImage(const Common::String &fileName) {
-	readImageToSurface(fileName, _currentBackground);
-
-	moveBackground(0);
+	readImageToSurface(fileName, _curBkg);
+	_bkgWidth = _curBkg.w;
+	_bkgHeight = _curBkg.h;
+	_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
 }
 
 void RenderManager::setBackgroundPosition(int offset) {
 	RenderTable::RenderState state = _renderTable.getRenderState();
-	if (state == RenderTable::TILT) {
-		_backgroundOffset.x = 0;
-		_backgroundOffset.y = offset;
-	} else if (state == RenderTable::PANORAMA) {
-		_backgroundOffset.x = offset;
-		_backgroundOffset.y = 0;
-	} else {
-		_backgroundOffset.x = 0;
-		_backgroundOffset.y = 0;
-	}
-}
-
-void RenderManager::setBackgroundVelocity(int velocity) {
-	// setBackgroundVelocity(0) will be called quite often, so make sure
-	// _backgroundInverseVelocity isn't already 0 to prevent an extraneous assignment
-	if (velocity == 0) {
-		if (_backgroundInverseVelocity != 0) {
-			_backgroundInverseVelocity = 0;
-		}
-	} else {
-		_backgroundInverseVelocity = 1000 / velocity;
-	}
-}
-
-void RenderManager::moveBackground(int offset) {
-	RenderTable::RenderState state = _renderTable.getRenderState();
-	if (state == RenderTable::TILT) {
-		_backgroundOffset += Common::Point(0, offset);
-
-		_backgroundOffset.y = CLIP<int16>(_backgroundOffset.y, _screenCenterY, (int16)_backgroundHeight - _screenCenterY);
-
-		renderImageToScreen(_currentBackground, 0, _screenCenterY - _backgroundOffset.y, true);
-	} else if (state == RenderTable::PANORAMA) {
-		_backgroundOffset += Common::Point(offset, 0);
-
-		if (_backgroundOffset.x <= -_backgroundWidth)
-			_backgroundOffset.x += _backgroundWidth;
-		else if (_backgroundOffset.x >= _backgroundWidth)
-			_backgroundOffset.x -= _backgroundWidth;
-
-		renderImageToScreen(_currentBackground, _screenCenterX - _backgroundOffset.x, 0, true);
-	} else {
-		renderImageToScreen(_currentBackground, 0, 0);
-	}
+	if (state == RenderTable::TILT || state == RenderTable::PANORAMA)
+		if (_bkgOff != offset)
+			_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
+	_bkgOff = offset;
 }
 
 uint32 RenderManager::getCurrentBackgroundOffset() {
 	RenderTable::RenderState state = _renderTable.getRenderState();
 
 	if (state == RenderTable::PANORAMA) {
-		return _backgroundOffset.x;
+		return _bkgOff;
 	} else if (state == RenderTable::TILT) {
-		return _backgroundOffset.y;
+		return _bkgOff;
 	} else {
 		return 0;
 	}
@@ -721,47 +312,196 @@ void RenderManager::scaleBuffer(const void *src, void *dst, uint32 srcWidth, uin
 	}
 }
 
-void RenderManager::blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y) {
-	Common::Rect pos(x, y, x + src.w, y + src.h);
-	pos.clip(dst.w, dst.h);
-	copyRectToSurface(src, dst, Common::Rect(), pos);
+void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y) {
+
+	if (src.format != dst.format)
+		return;
+
+	Common::Rect srcRect = _srcRect;
+	if (srcRect.isEmpty())
+		srcRect = Common::Rect(src.w, src.h);
+	srcRect.clip(src.w, src.h);
+	Common::Rect dstRect = Common::Rect(-_x + srcRect.left , -_y + srcRect.top, -_x + srcRect.left + dst.w, -_y + srcRect.top + dst.h);
+	srcRect.clip(dstRect);
+
+	if (srcRect.isEmpty() || !srcRect.isValidRect())
+		return;
+
+	// Copy srcRect from src surface to dst surface
+	const byte *src_buf = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
+
+	int xx = _x;
+	int yy = _y;
+
+	if (xx < 0)
+		xx = 0;
+	if (yy < 0)
+		yy = 0;
+
+	if (_x >= dst.w || _y >= dst.h)
+		return;
+
+	byte *dst_buf = (byte *)dst.getBasePtr(xx, yy);
+
+	int32 w = srcRect.width();
+	int32 h = srcRect.height();
+
+	for (int32 y = 0; y < h; y++) {
+		memcpy(dst_buf, src_buf, w * src.format.bytesPerPixel);
+		src_buf += src.pitch;
+		dst_buf += dst.pitch;
+	}
 }
 
-void RenderManager::blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey) {
-	Common::Rect pos(x, y, x + src.w, y + src.h);
-	pos.clip(dst.w, dst.h);
-	copyRectToSurface(src, dst, Common::Rect(), pos, colorkey);
+void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y, uint32 colorkey) {
+
+	if (src.format != dst.format)
+		return;
+
+	Common::Rect srcRect = _srcRect;
+	if (srcRect.isEmpty())
+		srcRect = Common::Rect(src.w, src.h);
+	srcRect.clip(src.w, src.h);
+	Common::Rect dstRect = Common::Rect(-_x + srcRect.left , -_y + srcRect.top, -_x + srcRect.left + dst.w, -_y + srcRect.top + dst.h);
+	srcRect.clip(dstRect);
+
+	if (srcRect.isEmpty() || !srcRect.isValidRect())
+		return;
+
+
+
+	uint32 _keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
+
+	// Copy srcRect from src surface to dst surface
+	const byte *src_buf = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
+
+	int xx = _x;
+	int yy = _y;
+
+	if (xx < 0)
+		xx = 0;
+	if (yy < 0)
+		yy = 0;
+
+	if (_x >= dst.w || _y >= dst.h)
+		return;
+
+	byte *dst_buf = (byte *)dst.getBasePtr(xx, yy);
+
+	int32 w = srcRect.width();
+	int32 h = srcRect.height();
+
+	for (int32 y = 0; y < h; y++) {
+		switch (src.format.bytesPerPixel) {
+		case 1: {
+			const uint *src_tmp = (const uint *)src_buf;
+			uint *dst_tmp = (uint *)dst_buf;
+			for (int32 x = 0; x < w; x++) {
+				if (*src_tmp != _keycolor)
+					*dst_tmp = *src_tmp;
+				src_tmp++;
+				dst_tmp++;
+			}
+		}
+		break;
+
+		case 2: {
+			const uint16 *src_tmp = (const uint16 *)src_buf;
+			uint16 *dst_tmp = (uint16 *)dst_buf;
+			for (int32 x = 0; x < w; x++) {
+				if (*src_tmp != _keycolor)
+					*dst_tmp = *src_tmp;
+				src_tmp++;
+				dst_tmp++;
+			}
+		}
+		break;
+
+		case 4: {
+			const uint32 *src_tmp = (const uint32 *)src_buf;
+			uint32 *dst_tmp = (uint32 *)dst_buf;
+			for (int32 x = 0; x < w; x++) {
+				if (*src_tmp != _keycolor)
+					*dst_tmp = *src_tmp;
+				src_tmp++;
+				dst_tmp++;
+			}
+		}
+		break;
+
+		default:
+			break;
+		}
+		src_buf += src.pitch;
+		dst_buf += dst.pitch;
+	}
+}
+
+void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y) {
+	Common::Rect empt;
+	blitSurfaceToSurface(src, empt, dst, x, y);
+}
+
+void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey) {
+	Common::Rect empt;
+	blitSurfaceToSurface(src, empt, dst, x, y, colorkey);
 }
 
-void RenderManager::blitSurfaceToBkg(Graphics::Surface &src, int x, int y) {
-	blitSurfaceToSurface(src, _currentBackground, x, y);
-	moveBackground(0); // Temporary workaround
+void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y) {
+	Common::Rect empt;
+	blitSurfaceToSurface(src, empt, _curBkg, x, y);
+	Common::Rect dirty(src.w, src.h);
+	dirty.translate(x, y);
+	if (_bkgDirtyRect.isEmpty())
+		_bkgDirtyRect = dirty;
+	else
+		_bkgDirtyRect.extend(dirty);
 }
 
-void RenderManager::blitSurfaceToBkg(Graphics::Surface &src, int x, int y, uint32 colorkey) {
-	blitSurfaceToSurface(src, _currentBackground, x, y, colorkey);
-	moveBackground(0); // Temporary workaround
+void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey) {
+	Common::Rect empt;
+	blitSurfaceToSurface(src, empt, _curBkg, x, y, colorkey);
+	Common::Rect dirty(src.w, src.h);
+	dirty.translate(x, y);
+	if (_bkgDirtyRect.isEmpty())
+		_bkgDirtyRect = dirty;
+	else
+		_bkgDirtyRect.extend(dirty);
 }
 
-void RenderManager::blitSurfaceUpBkg(Graphics::Surface &src, int x, int y) {
-	blitSurfaceToSurface(src, _workingWindowBuffer, x, y);
+void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y) {
+	Common::Rect empt;
+	blitSurfaceToSurface(src, empt, _menuWnd, x, y);
+	Common::Rect dirty(src.w, src.h);
+	dirty.translate(x, y);
+	if (_menuWndDirtyRect.isEmpty())
+		_menuWndDirtyRect = dirty;
+	else
+		_menuWndDirtyRect.extend(dirty);
 }
 
-void RenderManager::blitSurfaceUpBkg(Graphics::Surface &src, int x, int y, uint32 colorkey) {
-	blitSurfaceToSurface(src, _workingWindowBuffer, x, y, colorkey);
+void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey) {
+	Common::Rect empt;
+	blitSurfaceToSurface(src, empt, _menuWnd, x, y, colorkey);
+	Common::Rect dirty(src.w, src.h);
+	dirty.translate(x, y);
+	if (_menuWndDirtyRect.isEmpty())
+		_menuWndDirtyRect = dirty;
+	else
+		_menuWndDirtyRect.extend(dirty);
 }
 
 Graphics::Surface *RenderManager::getBkgRect(Common::Rect &rect) {
 	Common::Rect dst = rect;
-	dst.clip(_currentBackground.w, _currentBackground.h);
+	dst.clip(_bkgWidth, _bkgHeight);
 
 	if (dst.isEmpty() || !dst.isValidRect())
 		return NULL;
 
 	Graphics::Surface *srf = new Graphics::Surface;
-	srf->create(dst.width(), dst.height(), _currentBackground.format);
+	srf->create(dst.width(), dst.height(), _curBkg.format);
 
-	srf->copyRectToSurface(_currentBackground, 0, 0, Common::Rect(dst));
+	srf->copyRectToSurface(_curBkg, 0, 0, Common::Rect(dst));
 
 	return srf;
 }
@@ -777,4 +517,149 @@ Graphics::Surface *RenderManager::loadImage(const char *file) {
 	return loadImage(str);
 }
 
+void RenderManager::prepareBkg() {
+	_bkgDirtyRect.clip(_bkgWidth, _bkgHeight);
+	RenderTable::RenderState state = _renderTable.getRenderState();
+
+	if (state == RenderTable::PANORAMA) {
+		Common::Rect viewPort(_wrkWidth, _wrkHeight);
+		viewPort.translate(-(_screenCenterX - _bkgOff), 0);
+		Common::Rect drawRect = _bkgDirtyRect;
+		drawRect.clip(viewPort);
+
+		if (!drawRect.isEmpty())
+			blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, _screenCenterX - _bkgOff + drawRect.left, drawRect.top);
+
+		_wrkWndDirtyRect = _bkgDirtyRect;
+		_wrkWndDirtyRect.translate(_screenCenterX - _bkgOff, 0);
+
+		if (_bkgOff < _screenCenterX) {
+			viewPort.moveTo(-(_screenCenterX - (_bkgOff + _bkgWidth)), 0);
+			drawRect = _bkgDirtyRect;
+			drawRect.clip(viewPort);
+
+			if (!drawRect.isEmpty())
+				blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, _screenCenterX - (_bkgOff + _bkgWidth) + drawRect.left, drawRect.top);
+
+			Common::Rect tmp = _bkgDirtyRect;
+			tmp.translate(_screenCenterX - (_bkgOff + _bkgWidth), 0);
+			if (!tmp.isEmpty())
+				_wrkWndDirtyRect.extend(tmp);
+
+		} else if (_bkgWidth - _bkgOff < _screenCenterX) {
+			viewPort.moveTo(-(_screenCenterX + _bkgWidth - _bkgOff), 0);
+			drawRect = _bkgDirtyRect;
+			drawRect.clip(viewPort);
+
+			if (!drawRect.isEmpty())
+				blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, _screenCenterX + _bkgWidth - _bkgOff + drawRect.left, drawRect.top);
+
+			Common::Rect tmp = _bkgDirtyRect;
+			tmp.translate(_screenCenterX + _bkgWidth - _bkgOff, 0);
+			if (!tmp.isEmpty())
+				_wrkWndDirtyRect.extend(tmp);
+
+		}
+	} else if (state == RenderTable::TILT) {
+		Common::Rect viewPort(_wrkWidth, _wrkHeight);
+		viewPort.translate(0, -(_screenCenterY - _bkgOff));
+		Common::Rect drawRect = _bkgDirtyRect;
+		drawRect.clip(viewPort);
+		if (!drawRect.isEmpty())
+			blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, drawRect.left, _screenCenterY - _bkgOff + drawRect.top);
+
+		_wrkWndDirtyRect = _bkgDirtyRect;
+		_wrkWndDirtyRect.translate(0, _screenCenterY - _bkgOff);
+
+	} else {
+		if (!_bkgDirtyRect.isEmpty())
+			blitSurfaceToSurface(_curBkg, _bkgDirtyRect, _wrkWnd, _bkgDirtyRect.left, _bkgDirtyRect.top);
+		_wrkWndDirtyRect = _bkgDirtyRect;
+	}
+
+	_bkgDirtyRect = Common::Rect();
+
+	_wrkWndDirtyRect.clip(_wrkWidth, _wrkHeight);
+}
+
+void RenderManager::clearMenuSurface() {
+	_menuWndDirtyRect = Common::Rect(0, 0, _menuWnd.w, _menuWnd.h);
+	_menuWnd.fillRect(_menuWndDirtyRect, 0);
+}
+
+void RenderManager::renderMenuToScreen() {
+	if (!_menuWndDirtyRect.isEmpty()) {
+		_menuWndDirtyRect.clip(Common::Rect(_menuWnd.w, _menuWnd.h));
+
+		_system->copyRectToScreen(_menuWnd.getBasePtr(_menuWndDirtyRect.left, _menuWndDirtyRect.top), _menuWnd.pitch,
+		                          _menuWndDirtyRect.left + _menuWndRect.left,
+		                          _menuWndDirtyRect.top + _menuWndRect.top,
+		                          _menuWndDirtyRect.width(),
+		                          _menuWndDirtyRect.height());
+		_menuWndDirtyRect = Common::Rect();
+	}
+}
+
+uint16 RenderManager::createSubArea(const Common::Rect &area) {
+	_subid++;
+
+	oneSub sub;
+	sub.redraw = false;
+	sub.timer = -1;
+	sub.todelete = false;
+	sub._r = area;
+
+	_subsList[_subid] = sub;
+
+	return _subid;
+}
+
+void RenderManager::deleteSubArea(uint16 id) {
+	if (_subsList.contains(id))
+		_subsList[id].todelete = true;
+}
+
+void RenderManager::deleteSubArea(uint16 id, int16 delay) {
+	if (_subsList.contains(id))
+		_subsList[id].timer = delay;
+}
+
+void RenderManager::updateSubArea(uint16 id, const Common::String &txt) {
+	if (_subsList.contains(id)) {
+		oneSub *sub = &_subsList[id];
+		sub->_txt = txt;
+		sub->redraw = true;
+	}
+}
+
+void RenderManager::renderSubsToScreen() {
+	bool redraw = false;
+	for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
+		if (it->_value.todelete) {
+			_subsList.erase(it);
+			redraw = true;
+		} else if (it->_value.redraw) {
+			redraw = true;
+		}
+	}
+
+	if (redraw) {
+		_subWnd.fillRect(Common::Rect(_subWnd.w, _subWnd.h), 0);
+
+		for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
+			//draw subs
+		}
+
+		_system->copyRectToScreen(_subWnd.getPixels(), _subWnd.pitch,
+		                          _subWndRect.left,
+		                          _subWndRect.top,
+		                          _subWnd.w,
+		                          _subWnd.h);
+	}
+}
+
+Common::Point RenderManager::getBkgSize() {
+	return Common::Point(_bkgWidth, _bkgHeight);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index e16d3562dc..de53481be0 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -51,39 +51,66 @@ public:
 	~RenderManager();
 
 private:
-	struct AlphaDataEntry {
-		Graphics::Surface *data;
-		uint16 alphaColor;
-		uint16 destX;
-		uint16 destY;
-		uint16 width;
-		uint16 height;
+	struct oneSub {
+		Common::Rect _r;
+		Common::String _txt;
+		int16  timer;
+		bool todelete;
+		bool redraw;
 	};
-
-	typedef Common::HashMap<uint32, AlphaDataEntry> AlphaEntryMap;
+//	struct AlphaDataEntry {
+//		Graphics::Surface *data;
+//		uint16 alphaColor;
+//		uint16 destX;
+//		uint16 destY;
+//		uint16 width;
+//		uint16 height;
+//	};
+//
+	typedef Common::HashMap<uint16, oneSub> subMap;
 
 private:
 	OSystem *_system;
 	const Graphics::PixelFormat _pixelFormat;
 
+	// A buffer for blitting background image to working window
+	Graphics::Surface _wrkWnd;
+
+	Common::Rect _wrkWndDirtyRect;
+
+	Graphics::Surface _outWnd;
+
+	Common::Rect _outWndDirtyRect;
+
+	Common::Rect _bkgDirtyRect;
+
+	Graphics::Surface _subWnd;
+
+	Common::Rect _subWndDirtyRect;
+
+	Graphics::Surface _menuWnd;
+
+	Common::Rect _menuWndDirtyRect;
+
+
 	// A buffer the exact same size as the workingWindow
 	// This buffer stores everything un-warped, then does a warp at the end of the frame
-	Graphics::Surface _workingWindowBuffer;
+	//Graphics::Surface _workingWindowBuffer;
 	// A buffer representing the entire screen. Any graphical updates are first done with this buffer
 	// before actually being blitted to the screen
-	Graphics::Surface _backBuffer;
+	//Graphics::Surface _backBuffer;
 	// A list of Alpha Entries that need to be blitted to the backbuffer
-	AlphaEntryMap _alphaDataEntries;
+	//AlphaEntryMap _alphaDataEntries;
 
 	// A rectangle representing the portion of the working window where the pixels have been changed since last frame
-	Common::Rect _workingWindowDirtyRect;
+	//Common::Rect _workingWindowDirtyRect;
 	// A rectangle representing the portion of the backbuffer where the pixels have been changed since last frame
-	Common::Rect _backBufferDirtyRect;
+	//Common::Rect _backBufferDirtyRect;
 
 	/** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */
-	const int _workingWidth;
+	const int _wrkWidth;
 	/** Height of the working window. Saved to prevent extraneous calls to _workingWindow.height() */
-	const int _workingHeight;
+	const int _wrkHeight;
 	/** Center of the screen in the x direction */
 	const int _screenCenterX;
 	/** Center of the screen in the y direction */
@@ -95,170 +122,42 @@ private:
 	 * edges of this Rectangle
 	 */
 	const Common::Rect _workingWindow;
+
+	Common::Rect _subWndRect;
+
+	Common::Rect _menuWndRect;
+
 	/** Used to warp the background image */
 	RenderTable _renderTable;
 
-	Graphics::Surface _currentBackground;
+	Graphics::Surface _curBkg;
 	/** The (x1,y1) coordinates of the subRectangle of the background that is currently displayed on the screen */
-	Common::Point _backgroundOffset;
+	int16 _bkgOff;
 	/** The width of the current background image */
-	uint16 _backgroundWidth;
+	uint16 _bkgWidth;
 	/** The height of the current background image */
-	uint16 _backgroundHeight;
+	uint16 _bkgHeight;
+
+	uint16 _subid;
+
+	subMap _subsList;
 
 	/**
 	 * The "velocity" at which the background image is panning. We actually store the inverse of velocity (ms/pixel instead of pixels/ms)
 	 * because it allows you to accumulate whole pixels 'steps' instead of rounding pixels every frame
 	 */
-	int _backgroundInverseVelocity;
+	//int _backgroundInverseVelocity;
 	/** Holds any 'leftover' milliseconds between frames */
-	uint _accumulatedVelocityMilliseconds;
+	//uint _accumulatedVelocityMilliseconds;
 
 public:
 	void initialize();
-	/**
-	 * Rotates the background image in accordance to the current _backgroundInverseVelocity
-	 *
-	 * @param deltaTimeInMillis    The amount of time that has passed since the last frame
-	 */
-	void update(uint deltaTimeInMillis);
 
 	/**
 	 * Renders the current state of the backbuffer to the screen
 	 */
 	void renderBackbufferToScreen();
 
-	/**
-	 * Renders all AlphaEntries to the backbuffer
-	 */
-	void processAlphaEntries();
-	/**
-	 * Clears the AlphaEntry list
-	 */
-	void clearAlphaEntries() {
-		_alphaDataEntries.clear();
-	}
-	/**
-	 * Removes a specific AlphaEntry from the list
-	 *
-	 * @param idNumber    The id number identifing the AlphaEntry
-	 */
-	void removeAlphaEntry(uint32 idNumber) {
-		_alphaDataEntries.erase(idNumber);
-	}
-
-	/**
-	 * Copies a sub-rectangle of a buffer to the working window
-	 *
-	 * @param buffer        The pixel data to copy to the working window
-	 * @param destX         The X destination in the working window where the subRect of data should be put
-	 * @param destY         The Y destination in the working window where the subRect of data should be put
-	 * @param imageWidth    The width of the source image
-	 * @param width         The width of the sub rectangle
-	 * @param height        The height of the sub rectangle
-	 */
-	void copyRectToWorkingWindow(const uint16 *buffer, int32 destX, int32 destY, int32 imageWidth, int32 width, int32 height);
-	/**
-	 * Copies a sub-rectangle of a buffer to the working window with binary alpha support.
-	 *
-	 * @param buffer        The pixel data to copy to the working window
-	 * @param destX         The X destination in the working window where the subRect of data should be put
-	 * @param destY         The Y destination in the working window where the subRect of data should be put
-	 * @param imageWidth    The width of the source image
-	 * @param width         The width of the sub rectangle
-	 * @param height        The height of the sub rectangle
-	 * @param alphaColor    The color to interpret as meaning 'transparent'
-	 * @param idNumber      A unique identifier for the data being copied over.
-	 */
-	void copyRectToWorkingWindow(const uint16 *buffer, int32 destX, int32 destY, int32 imageWidth, int32 width, int32 height, int16 alphaColor, uint32 idNumber);
-
-	/**
-	 * Renders the supplied text to the working window
-	 *
-	 * @param idNumber     A unique identifier for the text
-	 * @param text         The text to be rendered
-	 * @param font         The font to use to render the text
-	 * @param destX        The X destination in the working window where the text should be rendered
-	 * @param destY        The Y destination in the working window where the text should be rendered
-	 * @param textColor    The color to render the text with (in RBG 565)
-	 * @param maxWidth     The max width the text should take up.
-	 * @param maxHeight    The max height the text should take up.
-	 * @param align        The alignment of the text within the bounds of maxWidth
-	 * @param wrap         If true, any words extending past maxWidth will wrap to a new line. If false, ellipses will be rendered to show that the text didn't fit
-	 * @return             A rectangle representing where the text was drawn in the working window
-	 */
-	Common::Rect renderTextToWorkingWindow(uint32 idNumber, const Common::String &text, TruetypeFont *font, int destX, int destY, uint16 textColor, int maxWidth, int maxHeight = -1, Graphics::TextAlign align = Graphics::kTextAlignLeft, bool wrap = true);
-
-	/**
-	 * Fills the entire workingWindow with the specified color. Internally, the color
-	 * will be converted to RGB 565 and then blitted.
-	 *
-	 * @param color    The color to fill the working window with. (In RGB 555)
-	 */
-	void clearWorkingWindowTo555Color(uint16 color);
-
-	/**
-	 * Blits the image or a portion of the image to the backbuffer. Actual screen updates won't happen until the end of the frame.
-	 * The image will be clipped to fit inside the working window. Coords are in working window space, not screen space!
-	 *
-	 * @param fileName        Name of the image file
-	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
-	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
-	 */
-	void renderImageToScreen(const Common::String &fileName, int16 destinationX, int16 destinationY, bool wrap = false);
-
-	/**
-	 * Blits the image or a portion of the image to the backbuffer. Actual screen updates won't happen until the end of the frame.
-	 * The image will be clipped to fit inside the working window. Coords are in working window space, not screen space!
-	 *
-	 * @param stream          Surface to read the image data from
-	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
-	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
-	 */
-	void renderImageToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap = false);
-
-	/**
-	 * Copies a rectangla of source surface and copy to destination rect.
-	 *
-	 * @param src        Source surface
-	 * @param dst        Destenation surface
-	 * @param srcRect    Rect of source surface
-	 * @param dstRect    Rect for destenation surface
-	 */
-	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect);
-
-	/**
-	 * Copies a rectangla of source surface and copy to destination rect.
-	 *
-	 * @param src        Source surface
-	 * @param dst        Destenation surface
-	 * @param srcRect    Rect of source surface
-	 * @param dstRect    Rect for destenation surface
-	 * @param colorkey   Transparent color
-	 */
-	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Rect &dstRect, uint32 colorkey);
-
-	/**
-	 * Copies a rectangla of source surface and copy to destination rect.
-	 *
-	 * @param src        Source surface
-	 * @param dst        Destenation surface
-	 * @param srcRect    Rect of source surface
-	 * @param dstPt      Point for destenation surface
-	 */
-	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt);
-
-	/**
-	 * Copies a rectangla of source surface and copy to destination rect.
-	 *
-	 * @param src        Source surface
-	 * @param dst        Destenation surface
-	 * @param srcRect    Rect of source surface
-	 * @param dstPt      Point for destenation surface
-	 * @param colorkey   Transparent color
-	 */
-	void copyRectToSurface(const Graphics::Surface &src, Graphics::Surface &dst, const Common::Rect &srcRect, const Common::Point &dstPt, uint32 colorkey);
-
 	/**
 	 * Blits the image or a portion of the image to the background.
 	 *
@@ -268,15 +167,6 @@ public:
 	 */
 	void renderImageToBackground(const Common::String &fileName, int16 destinationX, int16 destinationY);
 
-	/**
-	 * Blits the image or a portion of the image to the background.
-	 *
-	 * @param surface          Surface to read the image data from
-	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
-	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
-	 */
-	void renderImageToBackground(const Graphics::Surface &surface, int16 destinationX, int16 destinationY);
-
 	/**
 	 * Blits the image or a portion of the image to the background.
 	 *
@@ -287,16 +177,6 @@ public:
 	 */
 	void renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, uint32 colorkey);
 
-	/**
-	 * Blits the image or a portion of the image to the background.
-	 *
-	 * @param surface          Surface to read the image data from
-	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
-	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
-	 * @param colorkey   Transparent color
-	 */
-	void renderImageToBackground(const Graphics::Surface &surface, int16 destX, int16 destY, uint32 colorkey);
-
 	/**
 	 * Sets the current background image to be used by the RenderManager and immediately
 	 * blits it to the screen. (It won't show up until the end of the frame)
@@ -317,14 +197,6 @@ public:
 	 */
 	void setBackgroundPosition(int offset);
 
-	/**
-	 * Set the background scroll velocity. Negative velocities correspond to left / up scrolling and
-	 * positive velocities correspond to right / down scrolling
-	 *
-	 * @param velocity    Velocity
-	 */
-	void setBackgroundVelocity(int velocity);
-
 	/**
 	 * Converts a point in screen coordinate space to image coordinate space
 	 *
@@ -332,29 +204,9 @@ public:
 	 * @return         Point in image coordinate space
 	 */
 	const Common::Point screenSpaceToImageSpace(const Common::Point &point);
-	/**
-	 * Converts a point in image coordinate space to ***PRE-WARP***
-	 * working window coordinate space
-	 *
-	 * @param point    Point in image coordinate space
-	 * @return         Point in PRE-WARP working window coordinate space
-	 */
-	const Common::Point imageSpaceToWorkingWindowSpace(const Common::Point &point);
-
-	/**
-	 * Clip a rectangle to the working window. If it returns false, the original rect
-	 * is not inside the working window.
-	 *
-	 * @param rect    The rectangle to clip against the working window
-	 * @return        Is rect at least partially inside the working window (true) or completely outside (false)
-	 */
-	bool clipRectToWorkingWindow(Common::Rect &rect);
 
 	RenderTable *getRenderTable();
 	uint32 getCurrentBackgroundOffset();
-	const Graphics::Surface *getBackBuffer() {
-		return &_backBuffer;
-	}
 
 	/**
 	 * Creates a copy of surface and transposes the data.
@@ -369,31 +221,32 @@ public:
 
 	void scaleBuffer(const void *src, void *dst, uint32 srcWidth, uint32 srcHeight, byte bytesPerPixel, uint32 dstWidth, uint32 dstHeight);
 
-	void blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y);
-	void blitSurfaceToSurface(Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey);
-	void blitSurfaceToBkg(Graphics::Surface &src, int x, int y);
-	void blitSurfaceToBkg(Graphics::Surface &src, int x, int y, uint32 colorkey);
-	void blitSurfaceUpBkg(Graphics::Surface &src, int x, int y);
-	void blitSurfaceUpBkg(Graphics::Surface &src, int x, int y, uint32 colorkey);
+
+	void blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int x, int y);
+	void blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y, uint32 colorkey);
+	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y);
+	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey);
+	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y);
+	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey);
+	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y);
+	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey);
+
+	uint16 createSubArea(const Common::Rect &area);
+	void deleteSubArea(uint16 id);
+	void deleteSubArea(uint16 id, int16 delay);
+	void updateSubArea(uint16 id, const Common::String &txt);
+	void renderSubsToScreen();
+
+	Common::Point getBkgSize();
+
 	Graphics::Surface *getBkgRect(Common::Rect &rect);
 	Graphics::Surface *loadImage(const char *file);
 	Graphics::Surface *loadImage(Common::String &file);
 
-private:
-	/**
-	 * Renders a subRectangle of an image to the backbuffer. The destinationRect and SubRect
-	 * will be clipped to image bound and to working window bounds
-	 *
-	 * @param buffer             Pointer to (0, 0) of the image data
-	 * @param imageWidth         The width of the original image (not of the subRectangle)
-	 * @param imageHeight        The width of the original image (not of the subRectangle)
-	 * @param horizontalPitch    The horizontal pitch of the original image
-	 * @param destinationX       The x coordinate (in working window space) of where to put the final image
-	 * @param destinationY       The y coordinate (in working window space) of where to put the final image
-	 * @param subRectangle       A rectangle representing the part of the image that should be rendered
-	 * @param wrap               Should the image wrap (tile) if it doesn't completely fill the screen?
-	 */
-	void renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap);
+	void clearMenuSurface();
+	void renderMenuToScreen();
+
+	void prepareBkg();
 
 	/**
 	 * Reads an image file pixel data into a Surface buffer. In the process
@@ -406,19 +259,6 @@ private:
 	 * @param destination    A reference to the Surface to store the pixel data in
 	 */
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination);
-
-	/**
-	 * Move the background image by an offset. If we are currently in Panorama mode,
-	 * the offset will correspond to a horizontal motion. If we are currently in Tilt mode,
-	 * the offset will correspond to a vertical motion. This function should not be called
-	 * if we are in Flat mode.
-	 *
-	 * The RenderManager will take care of wrapping the image.
-	 * Ex: If the image has width 1400px, it is legal to offset 1500px.
-	 *
-	 * @param offset    The amount to move the background
-	 */
-	void moveBackground(int offset);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/render_table.cpp b/engines/zvision/render_table.cpp
index 5a0bae7c22..210c4fc1fb 100644
--- a/engines/zvision/render_table.cpp
+++ b/engines/zvision/render_table.cpp
@@ -123,6 +123,28 @@ void RenderTable::mutateImage(uint16 *sourceBuffer, uint16 *destBuffer, uint32 d
 	}
 }
 
+void RenderTable::mutateImage(Graphics::Surface *dstBuf, Graphics::Surface *srcBuf) {
+	uint32 destOffset = 0;
+
+	uint16 *sourceBuffer = (uint16 *)srcBuf->getPixels();
+	uint16 *destBuffer = (uint16 *)dstBuf->getPixels();
+
+	for (int16 y = 0; y < srcBuf->h; ++y) {
+		uint32 sourceOffset = y * _numColumns;
+
+		for (int16 x = 0; x < srcBuf->w; ++x) {
+			uint32 index = sourceOffset + x;
+
+			// RenderTable only stores offsets from the original coordinates
+			uint32 sourceYIndex = y + _internalBuffer[index].y;
+			uint32 sourceXIndex = x + _internalBuffer[index].x;
+
+			destBuffer[destOffset] = sourceBuffer[sourceYIndex * _numColumns + sourceXIndex];
+			destOffset++;
+		}
+	}
+}
+
 void RenderTable::generateRenderTable() {
 	switch (_renderState) {
 	case ZVision::RenderTable::PANORAMA:
diff --git a/engines/zvision/render_table.h b/engines/zvision/render_table.h
index 401e627747..db9ab08f7c 100644
--- a/engines/zvision/render_table.h
+++ b/engines/zvision/render_table.h
@@ -24,6 +24,7 @@
 #define ZVISION_RENDER_TABLE_H
 
 #include "common/rect.h"
+#include "graphics/surface.h"
 
 
 namespace ZVision {
@@ -67,6 +68,7 @@ public:
 	const Common::Point convertWarpedCoordToFlatCoord(const Common::Point &point);
 
 	void mutateImage(uint16 *sourceBuffer, uint16 *destBuffer, uint32 destWidth, const Common::Rect &subRect);
+	void mutateImage(Graphics::Surface *dstBuf, Graphics::Surface *srcBuf);
 	void generateRenderTable();
 
 	void setPanoramaFoV(float fov);
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index e30861aa98..ddb57c80da 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -516,10 +516,10 @@ void ScriptManager::do_changeLocation() {
 	_engine->getCursorManager()->changeCursor(CursorIndex_Idle);
 
 	// Reset the background velocity
-	_engine->getRenderManager()->setBackgroundVelocity(0);
+	//_engine->getRenderManager()->setBackgroundVelocity(0);
 
 	// Remove any alphaEntries
-	_engine->getRenderManager()->clearAlphaEntries();
+	//_engine->getRenderManager()->clearAlphaEntries();
 
 	// Change the background position
 	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 65064d8a66..787b3ee3da 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -63,7 +63,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _stringManager(nullptr),
 	  _cursorManager(nullptr),
 	  _aud_id(0),
-	  _rendDelay(2) {
+	  _rendDelay(2),
+	  _velocity(0) {
 
 	debug(1, "ZVision::ZVision");
 }
@@ -147,13 +148,16 @@ Common::Error ZVision::run() {
 		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
 
 		processEvents();
+		updateRotation();
 
 		// Call _renderManager->update() first so the background renders
 		// before anything that puzzles/controls will render
-		_renderManager->update(deltaTime);
 		_scriptManager->update(deltaTime);
 
 		// Render the backBuffer to the screen
+		_renderManager->prepareBkg();
+		_renderManager->renderMenuToScreen();
+		_renderManager->renderSubsToScreen();
 		_renderManager->renderBackbufferToScreen();
 
 		// Update the screen
@@ -205,4 +209,46 @@ bool ZVision::canRender() {
 	return _rendDelay <= 0;
 }
 
+void ZVision::updateRotation() {
+	if (_velocity) {
+		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
+		if (renderState == RenderTable::PANORAMA) {
+			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+
+			int16 new_pos = st_pos + _velocity * (1 - 2 * 0);
+
+			int16 zero_point = 0;
+			if (st_pos >= zero_point && new_pos < zero_point)
+				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) - 1);
+			if (st_pos <= zero_point && new_pos > zero_point)
+				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) + 1);
+
+			int16 scr_width = _renderManager->getBkgSize().x;
+			if (scr_width)
+				new_pos %= scr_width;
+
+			if (new_pos < 0)
+				new_pos += scr_width;
+
+			_scriptManager->setStateValue(StateKey_ViewPos, new_pos);
+			_renderManager->setBackgroundPosition(new_pos);
+		} else if (renderState == RenderTable::TILT) {
+			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+
+			int16 new_pos = st_pos + _velocity * (1 - 2 * 0);
+
+			int16 scr_height = _renderManager->getBkgSize().y;
+			int16 tilt_gap = _workingWindow.height() / 2;
+
+			if (new_pos >= (scr_height - tilt_gap))
+				new_pos = scr_height - tilt_gap;
+			if (new_pos <= tilt_gap)
+				new_pos = tilt_gap;
+
+			_scriptManager->setStateValue(StateKey_ViewPos, new_pos);
+			_renderManager->setBackgroundPosition(new_pos);
+		}
+	}
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 05c5fcd3a4..974384c7ff 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -111,6 +111,7 @@ private:
 	const Common::Rect _workingWindow_ZNM;
 
 	int _rendDelay;
+	int16 _velocity;
 public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
@@ -170,6 +171,7 @@ private:
 	void onMouseDown(const Common::Point &pos);
 	void onMouseUp(const Common::Point &pos);
 	void onMouseMove(const Common::Point &pos);
+	void updateRotation();
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From e2dc6d31d27760bae85b1e00eba32011a07da178 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 12 Jan 2014 19:19:11 +0700
Subject: ZVISION: Correct RenderManager methods for support menu.

---
 engines/zvision/render_manager.cpp | 124 +++++++++++++++++++++++++++++++++++--
 engines/zvision/render_manager.h   |   4 ++
 2 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index bc4d169569..f5d6847cf3 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -204,6 +204,99 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 	destination.convertToInPlace(_pixelFormat);
 }
 
+void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed) {
+	Common::File file;
+
+	if (!file.open(fileName)) {
+		warning("Could not open file %s", fileName.c_str());
+		return;
+	}
+
+	// Read the magic number
+	// Some files are true TGA, while others are TGZ
+	uint32 fileType = file.readUint32BE();
+
+	uint32 imageWidth;
+	uint32 imageHeight;
+	Graphics::TGADecoder tga;
+	uint16 *buffer;
+	// All ZVision images are in RGB 555
+	Graphics::PixelFormat pixelFormat555 = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
+	destination.format = pixelFormat555;
+
+	bool isTGZ;
+
+	// Check for TGZ files
+	if (fileType == MKTAG('T', 'G', 'Z', '\0')) {
+		isTGZ = true;
+
+		// TGZ files have a header and then Bitmap data that is compressed with LZSS
+		uint32 decompressedSize = file.readSint32LE();
+		imageWidth = file.readSint32LE();
+		imageHeight = file.readSint32LE();
+
+		LzssReadStream lzssStream(&file);
+		buffer = (uint16 *)(new uint16[decompressedSize]);
+		lzssStream.read(buffer, decompressedSize);
+	} else {
+		isTGZ = false;
+
+		// Reset the cursor
+		file.seek(0);
+
+		// Decode
+		if (!tga.loadStream(file)) {
+			warning("Error while reading TGA image");
+			return;
+		}
+
+		Graphics::Surface tgaSurface = *(tga.getSurface());
+		imageWidth = tgaSurface.w;
+		imageHeight = tgaSurface.h;
+
+		buffer = (uint16 *)tgaSurface.getPixels();
+	}
+
+	// Flip the width and height if transposed
+	if (transposed) {
+		uint16 temp = imageHeight;
+		imageHeight = imageWidth;
+		imageWidth = temp;
+	}
+
+	// If the destination internal buffer is the same size as what we're copying into it,
+	// there is no need to free() and re-create
+	if (imageWidth != destination.w || imageHeight != destination.h) {
+		destination.create(imageWidth, imageHeight, pixelFormat555);
+	}
+
+	// If transposed, 'un-transpose' the data while copying it to the destination
+	// Otherwise, just do a simple copy
+	if (transposed) {
+		uint16 *dest = (uint16 *)destination.getPixels();
+
+		for (uint32 y = 0; y < imageHeight; ++y) {
+			uint32 columnIndex = y * imageWidth;
+
+			for (uint32 x = 0; x < imageWidth; ++x) {
+				dest[columnIndex + x] = buffer[x * imageHeight + y];
+			}
+		}
+	} else {
+		memcpy(destination.getPixels(), buffer, imageWidth * imageHeight * _pixelFormat.bytesPerPixel);
+	}
+
+	// Cleanup
+	if (isTGZ) {
+		delete[] buffer;
+	} else {
+		tga.destroy();
+	}
+
+	// Convert in place to RGB 565 from RGB 555
+	destination.convertToInPlace(_pixelFormat);
+}
+
 const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) {
 	if (_workingWindow.contains(point)) {
 		// Convert from screen space to working window space
@@ -517,6 +610,17 @@ Graphics::Surface *RenderManager::loadImage(const char *file) {
 	return loadImage(str);
 }
 
+Graphics::Surface *RenderManager::loadImage(Common::String &file, bool transposed) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	readImageToSurface(file, *tmp, transposed);
+	return tmp;
+}
+
+Graphics::Surface *RenderManager::loadImage(const char *file, bool transposed) {
+	Common::String str = Common::String(file);
+	return loadImage(str, transposed);
+}
+
 void RenderManager::prepareBkg() {
 	_bkgDirtyRect.clip(_bkgWidth, _bkgHeight);
 	RenderTable::RenderState state = _renderTable.getRenderState();
@@ -587,15 +691,23 @@ void RenderManager::clearMenuSurface() {
 	_menuWnd.fillRect(_menuWndDirtyRect, 0);
 }
 
+void RenderManager::clearMenuSurface(const Common::Rect &r) {
+	if (_menuWndDirtyRect.isEmpty())
+		_menuWndDirtyRect = r;
+	else
+		_menuWndDirtyRect.extend(r);
+	_menuWnd.fillRect(r, 0);
+}
+
 void RenderManager::renderMenuToScreen() {
 	if (!_menuWndDirtyRect.isEmpty()) {
 		_menuWndDirtyRect.clip(Common::Rect(_menuWnd.w, _menuWnd.h));
-
-		_system->copyRectToScreen(_menuWnd.getBasePtr(_menuWndDirtyRect.left, _menuWndDirtyRect.top), _menuWnd.pitch,
-		                          _menuWndDirtyRect.left + _menuWndRect.left,
-		                          _menuWndDirtyRect.top + _menuWndRect.top,
-		                          _menuWndDirtyRect.width(),
-		                          _menuWndDirtyRect.height());
+		if (!_menuWndDirtyRect.isEmpty())
+			_system->copyRectToScreen(_menuWnd.getBasePtr(_menuWndDirtyRect.left, _menuWndDirtyRect.top), _menuWnd.pitch,
+			                          _menuWndDirtyRect.left + _menuWndRect.left,
+			                          _menuWndDirtyRect.top + _menuWndRect.top,
+			                          _menuWndDirtyRect.width(),
+			                          _menuWndDirtyRect.height());
 		_menuWndDirtyRect = Common::Rect();
 	}
 }
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index de53481be0..901385b453 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -242,8 +242,11 @@ public:
 	Graphics::Surface *getBkgRect(Common::Rect &rect);
 	Graphics::Surface *loadImage(const char *file);
 	Graphics::Surface *loadImage(Common::String &file);
+	Graphics::Surface *loadImage(const char *file, bool transposed);
+	Graphics::Surface *loadImage(Common::String &file, bool transposed);
 
 	void clearMenuSurface();
+	void clearMenuSurface(const Common::Rect &r);
 	void renderMenuToScreen();
 
 	void prepareBkg();
@@ -259,6 +262,7 @@ public:
 	 * @param destination    A reference to the Surface to store the pixel data in
 	 */
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination);
+	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 52bcd6224813410aab3935a3f02de07b60abefe5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 12 Jan 2014 19:20:49 +0700
Subject: ZVISION: Fix onMouseMove rectangle for scriptManager.

---
 engines/zvision/events.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp
index d8828867b0..34b72e81d0 100644
--- a/engines/zvision/events.cpp
+++ b/engines/zvision/events.cpp
@@ -110,7 +110,7 @@ void ZVision::onMouseUp(const Common::Point &pos) {
 void ZVision::onMouseMove(const Common::Point &pos) {
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
 
-	bool cursorWasChanged = _scriptManager->onMouseMove(pos, imageCoord);
+	bool cursorWasChanged = false;
 
 	// Graph of the function governing rotation velocity:
 	//
@@ -143,6 +143,8 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 	//               ^
 
 	if (_workingWindow.contains(pos)) {
+		cursorWasChanged = _scriptManager->onMouseMove(pos, imageCoord);
+
 		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
 		if (renderState == RenderTable::PANORAMA) {
 			if (pos.x >= _workingWindow.left && pos.x < _workingWindow.left + ROTATION_SCREEN_EDGE_OFFSET) {
-- 
cgit v1.2.3


From aef9c68f3c99908ae6027c059652b46ee758ca7b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 12 Jan 2014 19:27:11 +0700
Subject: ZVISION: Implement menus.

---
 engines/zvision/events.cpp  |   6 +
 engines/zvision/menu.cpp    | 774 ++++++++++++++++++++++++++++++++++++++++++++
 engines/zvision/menu.h      |  94 +++++-
 engines/zvision/module.mk   |   3 +-
 engines/zvision/zvision.cpp |   7 +
 engines/zvision/zvision.h   |   2 +
 6 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 engines/zvision/menu.cpp

diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp
index 34b72e81d0..189bf007c1 100644
--- a/engines/zvision/events.cpp
+++ b/engines/zvision/events.cpp
@@ -29,6 +29,7 @@
 #include "zvision/render_manager.h"
 #include "zvision/script_manager.h"
 #include "zvision/rlf_animation.h"
+#include "zvision/menu.h"
 
 #include "common/events.h"
 #include "common/system.h"
@@ -98,16 +99,21 @@ void ZVision::processEvents() {
 }
 
 void ZVision::onMouseDown(const Common::Point &pos) {
+	_menu->onMouseDown(pos);
+
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
 	_scriptManager->onMouseDown(pos, imageCoord);
 }
 
 void ZVision::onMouseUp(const Common::Point &pos) {
+	_menu->onMouseUp(pos);
+
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
 	_scriptManager->onMouseUp(pos, imageCoord);
 }
 
 void ZVision::onMouseMove(const Common::Point &pos) {
+	_menu->onMouseMove(pos);
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
 
 	bool cursorWasChanged = false;
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
new file mode 100644
index 0000000000..4c84271c47
--- /dev/null
+++ b/engines/zvision/menu.cpp
@@ -0,0 +1,774 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/menu.h"
+
+#include "zvision/render_manager.h"
+
+
+namespace ZVision {
+
+enum {
+	SLOT_START_SLOT = 151,
+	SLOT_SPELL_1 = 191,
+	SLOT_USER_CHOSE_THIS_SPELL = 205,
+	SLOT_REVERSED_SPELLBOOK = 206
+};
+
+enum {
+	menu_MAIN_SAVE = 0,
+	menu_MAIN_REST = 1,
+	menu_MAIN_PREF = 2,
+	menu_MAIN_EXIT = 3
+};
+
+menuHandler::menuHandler(ZVision *engine) {
+	_engine = engine;
+	menu_bar_flag = 0xFFFF;
+}
+
+menuZgi::menuZgi(ZVision *engine) :
+	menuHandler(engine) {
+	menu_mousefocus = -1;
+	inmenu = false;
+	scrolled[0] = false;
+	scrolled[1] = false;
+	scrolled[2] = false;
+	scrollPos[0] = 0.0;
+	scrollPos[1] = 0.0;
+	scrollPos[2] = 0.0;
+	mouse_on_item = -1;
+
+	char buf[24];
+	for (int i = 1; i < 4; i++) {
+		sprintf(buf, "gmzau%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][0], false);
+		sprintf(buf, "gmzau%2.2x1.tga", i + 0x10);
+		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][1], false);
+	}
+	for (int i = 0; i < 4; i++) {
+		sprintf(buf, "gmzmu%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][0], false);
+		sprintf(buf, "gmznu%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][1], false);
+	}
+
+	for (int i = 0; i < 50; i++) {
+		items[i][0] = NULL;
+		items[i][1] = NULL;
+		item_id[i] = 0;
+	}
+
+	for (int i = 0; i < 12; i++) {
+		magic[i][0] = NULL;
+		magic[i][1] = NULL;
+		magic_id[i] = 0;
+	}
+}
+
+menuZgi::~menuZgi() {
+	for (int i = 0; i < 3; i++) {
+		menuback[i][0].free();
+		menuback[i][1].free();
+	}
+	for (int i = 0; i < 4; i++) {
+		menubar[i][0].free();
+		menubar[i][1].free();
+	}
+	for (int i = 0; i < 50; i++) {
+		if (items[i][0]) {
+			items[i][0]->free();
+			delete items[i][0];
+		}
+		if (items[i][1]) {
+			items[i][1]->free();
+			delete items[i][1];
+		}
+	}
+	for (int i = 0; i < 12; i++) {
+		if (magic[i][0]) {
+			magic[i][0]->free();
+			delete magic[i][0];
+		}
+		if (magic[i][1]) {
+			magic[i][1]->free();
+			delete magic[i][1];
+		}
+	}
+}
+
+void menuZgi::onMouseUp(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+		switch (menu_mousefocus) {
+		case menu_ITEM:
+			if (menu_bar_flag & menuBar_Items) {
+				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (item_count == 0)
+					item_count = 20;
+
+				for (int i = 0; i < item_count; i++) {
+					int itemspace = (600 - 28) / item_count;
+
+					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
+					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+						int32 mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+						if (mouse_item >= 0  && mouse_item < 0xE0) {
+							_engine->getScriptManager()->invertory_drop(mouse_item);
+							_engine->getScriptManager()->invertory_add(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
+							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouse_item);
+
+							redraw = true;
+						}
+					}
+				}
+			}
+			break;
+
+		case menu_MAGIC:
+			if (menu_bar_flag & menuBar_Magic) {
+				for (int i = 0; i < 12; i++) {
+
+					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+					if (itemnum != 0) {
+						if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+							itemnum = 0xEE + i;
+						else
+							itemnum = 0xE0 + i;
+					}
+					if (itemnum)
+						if (_engine->getScriptManager()->getStateValue(StateKey_InventoryItem) == 0 || _engine->getScriptManager()->getStateValue(StateKey_InventoryItem) >= 0xE0)
+							if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
+							                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos))
+								_engine->getScriptManager()->setStateValue(SLOT_USER_CHOSE_THIS_SPELL, itemnum);
+				}
+
+			}
+			break;
+
+		case menu_MAIN:
+
+			// Exit
+			if (menu_bar_flag & menuBar_Exit)
+				if (Common::Rect(320 + 135,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					// ifquit();
+				}
+
+			// Settings
+			if (menu_bar_flag & menuBar_Settings)
+				if (Common::Rect(320 ,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
+				}
+
+			// Load
+			if (menu_bar_flag & menuBar_Restore)
+				if (Common::Rect(320 - 135,
+				                 scrollPos[menu_MAIN],
+				                 320,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
+				}
+
+			// Save
+			if (menu_bar_flag & menuBar_Save)
+				if (Common::Rect(320 - 135 * 2,
+				                 scrollPos[menu_MAIN],
+				                 320 - 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
+				}
+			break;
+		}
+	}
+}
+
+void menuZgi::onMouseMove(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+
+		if (!inmenu)
+			redraw = true;
+		inmenu = true;
+		switch (menu_mousefocus) {
+		case menu_ITEM:
+			if (menu_bar_flag & menuBar_Items) {
+				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (item_count == 0)
+					item_count = 20;
+				else if (item_count > 50)
+					item_count = 50;
+
+				int last_item = mouse_on_item;
+
+				mouse_on_item = -1;
+
+				for (int i = 0; i < item_count; i++) {
+					int itemspace = (600 - 28) / item_count;
+
+					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
+					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+						mouse_on_item = i;
+						break;
+					}
+				}
+
+				if (last_item != mouse_on_item)
+					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouse_on_item) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + last_item))
+						redraw = true;
+			}
+			break;
+
+		case menu_MAGIC:
+			if (menu_bar_flag & menuBar_Magic) {
+				int last_item = mouse_on_item;
+				mouse_on_item = -1;
+				for (int i = 0; i < 12; i++) {
+					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
+					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
+						mouse_on_item = i;
+						break;
+					}
+				}
+
+				if (last_item != mouse_on_item)
+					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouse_on_item) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + last_item))
+						redraw = true;
+
+			}
+			break;
+
+		case menu_MAIN:
+		{
+			int last_item = mouse_on_item;
+			mouse_on_item = -1;
+
+			// Exit
+			if (menu_bar_flag & menuBar_Exit)
+				if (Common::Rect(320 + 135,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_EXIT;
+				}
+
+			// Settings
+			if (menu_bar_flag & menuBar_Settings)
+				if (Common::Rect(320 ,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_PREF;
+				}
+
+			// Load
+			if (menu_bar_flag & menuBar_Restore)
+				if (Common::Rect(320 - 135,
+				                 scrollPos[menu_MAIN],
+				                 320,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_REST;
+				}
+
+			// Save
+			if (menu_bar_flag & menuBar_Save)
+				if (Common::Rect(320 - 135 * 2,
+				                 scrollPos[menu_MAIN],
+				                 320 - 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_SAVE;
+				}
+
+			if (last_item != mouse_on_item)
+				redraw = true;
+		}
+		break;
+
+		default:
+			int cur_menu = menu_mousefocus;
+			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
+				menu_mousefocus = menu_MAIN;
+				scrolled[menu_MAIN]  = false;
+				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
+				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
+			}
+
+			if (menu_bar_flag & menuBar_Magic)
+				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
+					menu_mousefocus = menu_MAGIC;
+					scrolled[menu_MAGIC]  = false;
+					scrollPos[menu_MAGIC] = 28;
+					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
+				}
+
+			if (menu_bar_flag & menuBar_Items)
+				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
+					menu_mousefocus = menu_ITEM;
+					scrolled[menu_ITEM]  = false;
+					scrollPos[menu_ITEM] = 28 - 600;
+					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
+				}
+
+			if (cur_menu != menu_mousefocus)
+				clean = true;
+
+			break;
+		}
+	} else {
+		if (inmenu)
+			clean = true;
+		inmenu = false;
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
+		menu_mousefocus = -1;
+	}
+}
+
+void menuZgi::process(uint32 deltatime) {
+	if (clean) {
+		_engine->getRenderManager()->clearMenuSurface();
+		clean = false;
+	}
+	switch (menu_mousefocus) {
+	case menu_ITEM:
+		if (menu_bar_flag & menuBar_Items)
+			if (!scrolled[menu_ITEM]) {
+				redraw = true;
+				float scrl = 600.0 * (deltatime / 1000.0);
+
+				if (scrl == 0)
+					scrl = 1.0;
+
+				scrollPos [menu_ITEM] += scrl;
+
+				if (scrollPos[menu_ITEM] >= 0) {
+					scrolled[menu_ITEM] = true;
+					scrollPos [menu_ITEM] = 0;
+				}
+			}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
+
+			int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+			if (item_count == 0)
+				item_count = 20;
+			else if (item_count > 50)
+				item_count = 50;
+
+
+			for (int i = 0; i < item_count; i++) {
+				int itemspace = (600 - 28) / item_count;
+
+				bool inrect = false;
+
+				if (mouse_on_item == i)
+					inrect = true;
+
+				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
+
+				if (cur_item_id != 0) {
+					if (item_id[i] != cur_item_id) {
+						char buf[16];
+						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
+						items[i][0] = _engine->getRenderManager()->loadImage(buf, false);
+						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
+						items[i][1] = _engine->getRenderManager()->loadImage(buf, false);
+						item_id[i] = cur_item_id;
+					}
+
+					if (inrect)
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+					else
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+
+				} else {
+					if (items[i][0]) {
+						items[i][0]->free();
+						delete items[i][0];
+						items[i][0] = NULL;
+					}
+					if (items[i][1]) {
+						items[i][1]->free();
+						delete items[i][1];
+						items[i][1] = NULL;
+					}
+					item_id[i] = 0;
+				}
+			}
+
+			redraw = false;
+		}
+		break;
+
+	case menu_MAGIC:
+		if (menu_bar_flag & menuBar_Magic)
+			if (!scrolled[menu_MAGIC]) {
+				redraw = true;
+				float scrl = 600.0 * (deltatime / 1000.0);
+
+				if (scrl == 0)
+					scrl = 1.0;
+
+				scrollPos [menu_MAGIC] += scrl;
+
+				if (scrollPos[menu_MAGIC] >= 600) {
+					scrolled[menu_MAGIC] = true;
+					scrollPos [menu_MAGIC] = 600;
+				}
+			}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][0], 640 - scrollPos[menu_MAGIC], 0);
+
+			for (int i = 0; i < 12; i++) {
+				bool inrect = false;
+
+				if (mouse_on_item == i)
+					inrect = true;
+
+				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+				if (cur_item_id) {
+					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+						cur_item_id = 0xEE + i;
+					else
+						cur_item_id = 0xE0 + i;
+				}
+
+				if (cur_item_id != 0) {
+					if (item_id[i] != cur_item_id) {
+						char buf[16];
+						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
+						magic[i][0] = _engine->getRenderManager()->loadImage(buf, false);
+						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
+						magic[i][1] = _engine->getRenderManager()->loadImage(buf, false);
+						magic_id[i] = cur_item_id;
+					}
+
+					if (inrect)
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+					else
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+
+				} else {
+					if (magic[i][0]) {
+						magic[i][0]->free();
+						delete magic[i][0];
+						magic[i][0] = NULL;
+					}
+					if (magic[i][1]) {
+						magic[i][1]->free();
+						delete magic[i][1];
+						magic[i][1] = NULL;
+					}
+					magic_id[i] = 0;
+				}
+			}
+			redraw = false;
+		}
+		break;
+
+	case menu_MAIN:
+		if (!scrolled[menu_MAIN]) {
+			redraw = true;
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			scrollPos [menu_MAIN] += scrl;
+
+			if (scrollPos[menu_MAIN] >= 0) {
+				scrolled[menu_MAIN] = true;
+				scrollPos [menu_MAIN] = 0;
+			}
+		}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
+
+			if (menu_bar_flag & menuBar_Exit)
+			{
+				if (mouse_on_item == menu_MAIN_EXIT)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
+			}
+			if (menu_bar_flag & menuBar_Settings)
+			{
+				if (mouse_on_item == menu_MAIN_PREF)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
+			}
+			if (menu_bar_flag & menuBar_Restore)
+			{
+				if (mouse_on_item == menu_MAIN_REST)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
+			}
+			if (menu_bar_flag & menuBar_Save)
+			{
+				if (mouse_on_item == menu_MAIN_SAVE)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
+			}
+			redraw = false;
+		}
+		break;
+	default:
+		if (redraw) {
+			if (inmenu) {
+				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
+
+				if (menu_bar_flag & menuBar_Items)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
+
+				if (menu_bar_flag & menuBar_Magic)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
+			}
+			redraw = false;
+		}
+		break;
+	}
+}
+
+
+menuNem::menuNem(ZVision *engine) :
+	menuHandler(engine) {
+	inmenu = false;
+	scrolled = false;
+	scrollPos = 0.0;
+	mouse_on_item = -1;
+
+	char buf[24];
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 6; j++) {
+			sprintf(buf, "butfrm%d%d.tga", i + 1, j);
+			_engine->getRenderManager()->readImageToSurface(buf, but[i][j], false);
+		}
+
+	_engine->getRenderManager()->readImageToSurface("bar.tga", menubar, false);
+
+	frm = 0;
+}
+
+menuNem::~menuNem() {
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 6; j++)
+			but[i][j].free();
+
+	menubar.free();
+}
+
+static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456} };
+
+void menuNem::onMouseUp(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+		// Exit
+		if (menu_bar_flag & menuBar_Exit)
+			if (Common::Rect(buts[3][1],
+			                 scrollPos,
+			                 buts[3][0] + buts[3][1],
+			                 scrollPos + 32).contains(Pos)) {
+				// ifquit();
+				frm = 5;
+				redraw = true;
+			}
+
+		// Settings
+		if (menu_bar_flag & menuBar_Settings)
+			if (Common::Rect(buts[2][1],
+			                 scrollPos,
+			                 buts[2][0] + buts[2][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+
+		// Load
+		if (menu_bar_flag & menuBar_Restore)
+			if (Common::Rect(buts[1][1],
+			                 scrollPos,
+			                 buts[1][0] + buts[1][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+
+		// Save
+		if (menu_bar_flag & menuBar_Save)
+			if (Common::Rect(buts[0][1],
+			                 scrollPos,
+			                 buts[0][0] + buts[0][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+	}
+}
+
+void menuNem::onMouseMove(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+
+		inmenu = true;
+
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 2)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
+
+		int last_item = mouse_on_item;
+		mouse_on_item = -1;
+
+		// Exit
+		if (menu_bar_flag & menuBar_Exit)
+			if (Common::Rect(buts[3][1],
+			                 scrollPos,
+			                 buts[3][0] + buts[3][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_EXIT;
+			}
+
+		// Settings
+		if (menu_bar_flag & menuBar_Settings)
+			if (Common::Rect(buts[2][1],
+			                 scrollPos,
+			                 buts[2][0] + buts[2][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_PREF;
+			}
+
+		// Load
+		if (menu_bar_flag & menuBar_Restore)
+			if (Common::Rect(buts[1][1],
+			                 scrollPos,
+			                 buts[1][0] + buts[1][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_REST;
+			}
+
+		// Save
+		if (menu_bar_flag & menuBar_Save)
+			if (Common::Rect(buts[0][1],
+			                 scrollPos,
+			                 buts[0][0] + buts[0][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_SAVE;
+			}
+
+		if (last_item != mouse_on_item) {
+			redraw = true;
+			frm = 0;
+			delay = 200;
+		}
+	} else {
+		inmenu = false;
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
+		mouse_on_item = -1;
+	}
+}
+
+void menuNem::process(uint32 deltatime) {
+	if (inmenu) {
+		if (!scrolled)
+		{
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			scrollPos += scrl;
+			redraw = true;
+		}
+
+		if (scrollPos >= 0)
+		{
+			scrolled = true;
+			scrollPos = 0;
+		}
+
+		if (mouse_on_item != -1) {
+			delay -= deltatime;
+			if (delay <= 0 && frm < 4) {
+				delay = 200;
+				frm++;
+				redraw = true;
+			}
+		}
+
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
+
+			if (menu_bar_flag & menuBar_Exit)
+				if (mouse_on_item == menu_MAIN_EXIT)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
+
+			if (menu_bar_flag & menuBar_Settings)
+				if (mouse_on_item == menu_MAIN_PREF)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
+
+			if (menu_bar_flag & menuBar_Restore)
+				if (mouse_on_item == menu_MAIN_REST)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
+
+			if (menu_bar_flag & menuBar_Save)
+				if (mouse_on_item == menu_MAIN_SAVE)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
+
+			redraw = false;
+		}
+	} else {
+		scrolled = false;
+		if (scrollPos > -32)
+		{
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			Common::Rect cl(64, 32 + scrollPos - scrl, 64 + 512, 32 + scrollPos + 1);
+			_engine->getRenderManager()->clearMenuSurface(cl);
+
+			scrollPos -= scrl;
+			redraw = true;
+		}
+		else
+			scrollPos = -32;
+
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
+			redraw = false;
+		}
+	}
+}
+
+
+} // End of namespace ZVision
diff --git a/engines/zvision/menu.h b/engines/zvision/menu.h
index affc69abd5..c5938cdc3d 100644
--- a/engines/zvision/menu.h
+++ b/engines/zvision/menu.h
@@ -23,6 +23,98 @@
 #ifndef ZVISION_MENU_H
 #define ZVISION_MENU_H
 
-// TODO: Implement MenuHandler
+#include "graphics/surface.h"
+#include "common/rect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/script_manager.h"
+
+namespace ZVision {
+
+enum menuBar {
+	menuBar_Exit = 0x1,
+	menuBar_Settings = 0x2,
+	menuBar_Restore = 0x4,
+	menuBar_Save = 0x8,
+	menuBar_Items = 0x100,
+	menuBar_Magic = 0x200
+};
+
+class menuHandler {
+public:
+	menuHandler(ZVision *engine);
+	virtual ~menuHandler() {};
+	virtual void onMouseMove(const Common::Point &Pos) {};
+	virtual void onMouseDown(const Common::Point &Pos) {};
+	virtual void onMouseUp(const Common::Point &Pos) {};
+	virtual void process(uint32 deltaTimeInMillis) {};
+protected:
+	uint16 menu_bar_flag;
+	ZVision *_engine;
+};
+
+class menuZgi: public menuHandler {
+public:
+	menuZgi(ZVision *engine);
+	~menuZgi();
+	void onMouseMove(const Common::Point &Pos);
+	void onMouseUp(const Common::Point &Pos);
+	void process(uint32 deltaTimeInMillis);
+private:
+	Graphics::Surface menuback[3][2];
+	Graphics::Surface menubar[4][2];
+
+
+	Graphics::Surface *items[50][2];
+	uint item_id[50];
+
+	Graphics::Surface *magic[12][2];
+	uint magic_id[12];
+
+	int menu_mousefocus;
+	bool inmenu;
+
+	int mouse_on_item;
+
+	bool   scrolled[3];
+	float scrollPos[3];
+
+	enum {
+		menu_ITEM = 0,
+		menu_MAGIC = 1,
+		menu_MAIN = 2
+	};
+
+	bool clean;
+	bool redraw;
+
+};
+
+class menuNem: public menuHandler {
+public:
+	menuNem(ZVision *engine);
+	~menuNem();
+	void onMouseMove(const Common::Point &Pos);
+	void onMouseUp(const Common::Point &Pos);
+	void process(uint32 deltaTimeInMillis);
+private:
+	Graphics::Surface but[4][6];
+	Graphics::Surface menubar;
+
+	bool inmenu;
+
+	int mouse_on_item;
+
+	bool   scrolled;
+	float scrollPos;
+
+	bool redraw;
+
+	int frm;
+	int16 delay;
+
+};
+
+}
 
 #endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index b5512636c3..af90923f9a 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -33,7 +33,8 @@ MODULE_OBJS := \
 	sidefx.o \
 	music_node.o \
 	inventory_manager.o \
-	slot_control.o
+	slot_control.o \
+	menu.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 787b3ee3da..05923ce079 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -32,6 +32,7 @@
 #include "zvision/string_manager.h"
 #include "zvision/zfs_archive.h"
 #include "zvision/detection.h"
+#include "zvision/menu.h"
 
 #include "common/config-manager.h"
 #include "common/debug.h"
@@ -127,6 +128,11 @@ void ZVision::initialize() {
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, &_pixelFormat);
 
+	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
+		_menu = new menuZgi(this);
+	else
+		_menu = new menuNem(this);
+
 	// Initialize the managers
 	_cursorManager->initialize();
 	_scriptManager->initialize();
@@ -153,6 +159,7 @@ Common::Error ZVision::run() {
 		// Call _renderManager->update() first so the background renders
 		// before anything that puzzles/controls will render
 		_scriptManager->update(deltaTime);
+		_menu->process(deltaTime);
 
 		// Render the backBuffer to the screen
 		_renderManager->prepareBkg();
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 974384c7ff..23c5f60a4a 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -51,6 +51,7 @@ class CursorManager;
 class StringManager;
 class SaveManager;
 class RlfAnimation;
+class menuHandler;
 
 class ZVision : public Engine {
 public:
@@ -97,6 +98,7 @@ private:
 	CursorManager *_cursorManager;
 	SaveManager *_saveManager;
 	StringManager *_stringManager;
+	menuHandler *_menu;
 
 	// Clock
 	Clock _clock;
-- 
cgit v1.2.3


From 4ced9c07e0ce55fd77c7a31261a3179b5abb7a8c Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 13 Jan 2014 07:53:36 +0700
Subject: ZVISION: Fix killSideFxType iterator.

---
 engines/zvision/script_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index ddb57c80da..a1003197ef 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -381,7 +381,7 @@ void ScriptManager::killSideFxType(SideFX::SideFXType type) {
 		if ((*iter)->getType() & type) {
 			(*iter)->kill();
 			delete(*iter);
-			_activeSideFx.erase(iter);
+			iter = _activeSideFx.erase(iter);
 		} else {
 			++iter;
 		}
-- 
cgit v1.2.3


From 9803f7e6c045d625ee41e5b2769b1b2de3ab8ee3 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 13 Jan 2014 09:07:44 +0700
Subject: ZVISION: Fix code style with astyle.

---
 engines/zvision/animation_node.cpp |   8 +--
 engines/zvision/menu.cpp           |  16 +++---
 engines/zvision/menu.h             |  18 +++----
 engines/zvision/script_manager.h   | 106 ++++++++++++++++++-------------------
 4 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 74b532b2ef..27ee873f98 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -191,11 +191,11 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.start = start_frame;
 	nod.stop = end_frame;
 	if (_fileType == RLF) {
-        if (nod.stop >= (int)_animation.rlf->frameCount())
-            nod.stop = _animation.rlf->frameCount() - 1;
+		if (nod.stop >= (int)_animation.rlf->frameCount())
+			nod.stop = _animation.rlf->frameCount() - 1;
 	} else if (_fileType == AVI) {
-	    if (nod.stop > (int)_animation.avi->getFrameCount())
-            nod.stop = _animation.avi->getFrameCount();
+		if (nod.stop > (int)_animation.avi->getFrameCount())
+			nod.stop = _animation.avi->getFrameCount();
 	}
 	nod.slot = slot;
 	nod._cur_frm = -1;
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
index 4c84271c47..8e1dea183b 100644
--- a/engines/zvision/menu.cpp
+++ b/engines/zvision/menu.cpp
@@ -30,17 +30,17 @@
 namespace ZVision {
 
 enum {
-	SLOT_START_SLOT = 151,
-	SLOT_SPELL_1 = 191,
-	SLOT_USER_CHOSE_THIS_SPELL = 205,
-	SLOT_REVERSED_SPELLBOOK = 206
+    SLOT_START_SLOT = 151,
+    SLOT_SPELL_1 = 191,
+    SLOT_USER_CHOSE_THIS_SPELL = 205,
+    SLOT_REVERSED_SPELLBOOK = 206
 };
 
 enum {
-	menu_MAIN_SAVE = 0,
-	menu_MAIN_REST = 1,
-	menu_MAIN_PREF = 2,
-	menu_MAIN_EXIT = 3
+    menu_MAIN_SAVE = 0,
+    menu_MAIN_REST = 1,
+    menu_MAIN_PREF = 2,
+    menu_MAIN_EXIT = 3
 };
 
 menuHandler::menuHandler(ZVision *engine) {
diff --git a/engines/zvision/menu.h b/engines/zvision/menu.h
index c5938cdc3d..35e7347a3b 100644
--- a/engines/zvision/menu.h
+++ b/engines/zvision/menu.h
@@ -32,12 +32,12 @@
 namespace ZVision {
 
 enum menuBar {
-	menuBar_Exit = 0x1,
-	menuBar_Settings = 0x2,
-	menuBar_Restore = 0x4,
-	menuBar_Save = 0x8,
-	menuBar_Items = 0x100,
-	menuBar_Magic = 0x200
+    menuBar_Exit = 0x1,
+    menuBar_Settings = 0x2,
+    menuBar_Restore = 0x4,
+    menuBar_Save = 0x8,
+    menuBar_Items = 0x100,
+    menuBar_Magic = 0x200
 };
 
 class menuHandler {
@@ -80,9 +80,9 @@ private:
 	float scrollPos[3];
 
 	enum {
-		menu_ITEM = 0,
-		menu_MAGIC = 1,
-		menu_MAIN = 2
+	    menu_ITEM = 0,
+	    menu_MAGIC = 1,
+	    menu_MAIN = 2
 	};
 
 	bool clean;
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 2f585b6291..3e671aa3db 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -41,59 +41,59 @@ namespace ZVision {
 class ZVision;
 
 enum StateKey {
-	StateKey_World = 3,
-	StateKey_Room  = 4,
-	StateKey_Node  = 5,
-	StateKey_View  = 6,
-	StateKey_ViewPos = 7,
-	StateKey_KeyPress = 8,
-	StateKey_InventoryItem = 9,
-	StateKey_LMouse = 10,
-	StateKey_NotSet = 11, // This key doesn't set
-	StateKey_Rounds = 12,
-	StateKey_Venus = 13,
-	StateKey_RMouse = 18,
-	StateKey_MenuState = 19,
-	StateKey_RestoreFlag = 20,
-	StateKey_Quitting = 39,
-	StateKey_LastWorld = 40,
-	StateKey_LastRoom = 41,
-	StateKey_LastNode = 42,
-	StateKey_LastView = 43,
-	StateKey_LastViewPos = 44,
-	StateKey_Menu_LastWorld = 45,
-	StateKey_Menu_LastRoom = 46,
-	StateKey_Menu_LastNode = 47,
-	StateKey_Menu_LastView = 48,
-	StateKey_Menu_LastViewPos = 49,
-	StateKey_KbdRotateSpeed = 50,
-	StateKey_Subtitles = 51,
-	StateKey_StreamSkipKey = 52,
-	StateKey_RotateSpeed = 53,
-	StateKey_Volume = 56,
-	StateKey_Qsound = 57,
-	StateKey_VenusEnable = 58,
-	StateKey_HighQuality = 59,
-	StateKey_VideoLineSkip = 65,
-	StateKey_Platform = 66,
-	StateKey_InstallLevel = 67,
-	StateKey_CountryCode = 68,
-	StateKey_CPU = 69,
-	StateKey_MovieCursor = 70,
-	StateKey_NoTurnAnim = 71,
-	StateKey_WIN958 = 72,
-	StateKey_ShowErrorDlg = 73,
-	StateKey_DebugCheats = 74,
-	StateKey_JapanFonts = 75,
-	StateKey_Brightness = 77,
-	StateKey_EF9_B = 91,
-	StateKey_EF9_G = 92,
-	StateKey_EF9_R = 93,
-	StateKey_EF9_Speed = 94,
-	StateKey_Inv_Cnt_Slot = 100,
-	StateKey_Inv_1_Slot = 101,
-	StateKey_Inv_49_Slot = 149,
-	StateKey_Inv_TotalSlots = 150
+    StateKey_World = 3,
+    StateKey_Room  = 4,
+    StateKey_Node  = 5,
+    StateKey_View  = 6,
+    StateKey_ViewPos = 7,
+    StateKey_KeyPress = 8,
+    StateKey_InventoryItem = 9,
+    StateKey_LMouse = 10,
+    StateKey_NotSet = 11, // This key doesn't set
+    StateKey_Rounds = 12,
+    StateKey_Venus = 13,
+    StateKey_RMouse = 18,
+    StateKey_MenuState = 19,
+    StateKey_RestoreFlag = 20,
+    StateKey_Quitting = 39,
+    StateKey_LastWorld = 40,
+    StateKey_LastRoom = 41,
+    StateKey_LastNode = 42,
+    StateKey_LastView = 43,
+    StateKey_LastViewPos = 44,
+    StateKey_Menu_LastWorld = 45,
+    StateKey_Menu_LastRoom = 46,
+    StateKey_Menu_LastNode = 47,
+    StateKey_Menu_LastView = 48,
+    StateKey_Menu_LastViewPos = 49,
+    StateKey_KbdRotateSpeed = 50,
+    StateKey_Subtitles = 51,
+    StateKey_StreamSkipKey = 52,
+    StateKey_RotateSpeed = 53,
+    StateKey_Volume = 56,
+    StateKey_Qsound = 57,
+    StateKey_VenusEnable = 58,
+    StateKey_HighQuality = 59,
+    StateKey_VideoLineSkip = 65,
+    StateKey_Platform = 66,
+    StateKey_InstallLevel = 67,
+    StateKey_CountryCode = 68,
+    StateKey_CPU = 69,
+    StateKey_MovieCursor = 70,
+    StateKey_NoTurnAnim = 71,
+    StateKey_WIN958 = 72,
+    StateKey_ShowErrorDlg = 73,
+    StateKey_DebugCheats = 74,
+    StateKey_JapanFonts = 75,
+    StateKey_Brightness = 77,
+    StateKey_EF9_B = 91,
+    StateKey_EF9_G = 92,
+    StateKey_EF9_R = 93,
+    StateKey_EF9_Speed = 94,
+    StateKey_Inv_Cnt_Slot = 100,
+    StateKey_Inv_1_Slot = 101,
+    StateKey_Inv_49_Slot = 149,
+    StateKey_Inv_TotalSlots = 150
 };
 
 struct Location {
-- 
cgit v1.2.3


From 61224e7225061551765c07b691e8d8c5da3434df Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 09:32:06 +0700
Subject: ZVISION: Move MusicNode to use Audio::SoundHandle.

---
 engines/zvision/music_node.cpp | 9 ++++-----
 engines/zvision/music_node.h   | 2 ++
 engines/zvision/zvision.cpp    | 7 -------
 engines/zvision/zvision.h      | 2 --
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index 6be4683178..709b554823 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -57,13 +57,12 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 		audioStream = makeRawZorkStream(filename, _engine);
 	}
 
-	_id = _engine->getAudioId();
 
 	if (_loop) {
 		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, 0, loopingAudioStream, _id, _volume);
+		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
 	} else {
-		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, 0, audioStream, _id, _volume);
+		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
 	}
 
 	if (_key != StateKey_NotSet)
@@ -71,14 +70,14 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 }
 
 MusicNode::~MusicNode() {
-	_engine->_mixer->stopID(_id);
+	_engine->_mixer->stopHandle(_handle);
 	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 2);
 	debug(1, "MusicNode: %d destroyed\n", _key);
 }
 
 bool MusicNode::process(uint32 deltaTimeInMillis) {
-	if (! _engine->_mixer->isSoundIDActive(_id))
+	if (! _engine->_mixer->isSoundHandleActive(_handle))
 		return stop();
 	return false;
 }
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
index 6aed4556fa..973feaf175 100644
--- a/engines/zvision/music_node.h
+++ b/engines/zvision/music_node.h
@@ -23,6 +23,7 @@
 #ifndef ZVISION_MUSIC_NODE_H
 #define ZVISION_MUSIC_NODE_H
 
+#include "audio/mixer.h"
 #include "zvision/sidefx.h"
 
 namespace Common {
@@ -55,6 +56,7 @@ private:
 	bool _crossfade;
 	int32 _crossfade_delta;
 	int32 _crossfade_time;
+	Audio::SoundHandle _handle;
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 05923ce079..f21498c315 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -201,13 +201,6 @@ Common::String ZVision::generateAutoSaveFileName() {
 	return Common::String::format("%s.auto", _targetName.c_str());
 }
 
-int ZVision::getAudioId() {
-	_aud_id++;
-	if (_aud_id < 0)
-		_aud_id = 0;
-	return _aud_id;
-}
-
 void ZVision::setRenderDelay(uint delay) {
 	_rendDelay = delay;
 }
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 23c5f60a4a..26d7644eb0 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -153,8 +153,6 @@ public:
 	 */
 	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true);
 
-	int getAudioId();
-
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
-- 
cgit v1.2.3


From 41415002b223e5ae0e53fb351ee41d8a99fbc920 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 10:57:29 +0700
Subject: ZVISION: Implement PanTrack.

---
 engines/zvision/actions.cpp           | 24 +++++++++++
 engines/zvision/actions.h             | 11 +++++
 engines/zvision/music_node.cpp        | 75 ++++++++++++++++++++++++++++++++++-
 engines/zvision/music_node.h          | 19 +++++++--
 engines/zvision/scr_file_handling.cpp |  2 +-
 5 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index ccae6fd47c..3eec70d1ba 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -313,6 +313,30 @@ bool ActionMusic::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionPanTrack
+//////////////////////////////////////////////////////////////////////////////
+
+ActionPanTrack::ActionPanTrack(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey),
+	_pos(0),
+	_mus_slot(0) {
+
+	sscanf(line.c_str(), "%u %d", &_mus_slot, &_pos);
+}
+
+ActionPanTrack::~ActionPanTrack() {
+	_engine->getScriptManager()->killSideFx(_slotkey);
+}
+
+bool ActionPanTrack::execute() {
+	if (_engine->getScriptManager()->getSideFX(_slotkey))
+		return true;
+
+	_engine->getScriptManager()->addSideFX(new PanTrackNode(_engine, _slotkey, _mus_slot, _pos));
+
+	return true;
+}
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionPreloadAnimation
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index aadb97fc9b..417c1ada1a 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -247,6 +247,17 @@ private:
 	bool _universe;
 };
 
+class ActionPanTrack : public ResultAction {
+public:
+	ActionPanTrack(ZVision *engine, int32 slotkey, const Common::String &line);
+	~ActionPanTrack();
+	bool execute();
+
+private:
+	int32 _pos;
+	uint32 _mus_slot;
+};
+
 class ActionPlayAnimation : public ResultAction {
 public:
 	ActionPlayAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index 709b554823..081c9dbcca 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -26,6 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/script_manager.h"
+#include "zvision/render_manager.h"
 #include "zvision/zork_raw.h"
 
 #include "common/stream.h"
@@ -40,7 +41,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	_loop = loop;
 	_volume = volume;
 	_crossfade = false;
-	_crossfade_delta = 0;
+	_crossfade_target = 0;
 	_crossfade_time = 0;
 	_attenuate = 0;
 	_pantrack = false;
@@ -57,6 +58,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 		audioStream = makeRawZorkStream(filename, _engine);
 	}
 
+	_stereo = audioStream->isStereo();
 
 	if (_loop) {
 		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
@@ -76,10 +78,81 @@ MusicNode::~MusicNode() {
 	debug(1, "MusicNode: %d destroyed\n", _key);
 }
 
+void MusicNode::setPanTrack(int16 pos) {
+	if (!_stereo) {
+		_pantrack = true;
+		_pantrack_X = pos;
+		setVolume(_volume);
+	}
+}
+
+void MusicNode::unsetPanTrack() {
+	_pantrack = false;
+	setVolume(_volume);
+}
+
 bool MusicNode::process(uint32 deltaTimeInMillis) {
 	if (! _engine->_mixer->isSoundHandleActive(_handle))
 		return stop();
+	else {
+		uint8 _newvol = _volume;
+
+		if (_pantrack || _volume != _newvol)
+			setVolume(_newvol);
+	}
 	return false;
 }
 
+void MusicNode::setVolume(uint8 new_volume) {
+	if (_pantrack) {
+		int cur_x = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
+		cur_x -= _pantrack_X;
+		int32 _width = _engine->getRenderManager()->getBkgSize().x;
+		if (cur_x < (-_width) / 2)
+			cur_x += _width;
+		else if (cur_x >= _width / 2)
+			cur_x -= _width;
+
+		float norm = (float)cur_x / ((float)_width / 2.0);
+		float lvl = fabs(norm);
+		if (lvl > 0.5)
+			lvl = (lvl - 0.5) * 1.7;
+		else
+			lvl = 1.0;
+
+		float bal = sin(-norm * 3.1415926) * 127.0;
+
+		if (_engine->_mixer->isSoundHandleActive(_handle)) {
+			_engine->_mixer->setChannelBalance(_handle, bal);
+			_engine->_mixer->setChannelVolume(_handle, new_volume * lvl);
+		}
+	} else {
+		if (_engine->_mixer->isSoundHandleActive(_handle)) {
+			_engine->_mixer->setChannelBalance(_handle, 0);
+			_engine->_mixer->setChannelVolume(_handle, new_volume);
+		}
+	}
+
+	_volume = new_volume;
+}
+
+PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
+	: SideFX(engine, key, SIDEFX_PANTRACK) {
+	_slot = slot;
+
+	SideFX *fx = _engine->getScriptManager()->getSideFX(slot);
+	if (fx && fx->getType() == SIDEFX_AUDIO) {
+		MusicNode *mus = (MusicNode *)fx;
+		mus->setPanTrack(pos);
+	}
+}
+
+PanTrackNode::~PanTrackNode() {
+	SideFX *fx = _engine->getScriptManager()->getSideFX(_slot);
+	if (fx && fx->getType() == SIDEFX_AUDIO) {
+		MusicNode *mus = (MusicNode *)fx;
+		mus->unsetPanTrack();
+	}
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
index 973feaf175..9ccf9ab657 100644
--- a/engines/zvision/music_node.h
+++ b/engines/zvision/music_node.h
@@ -45,20 +45,33 @@ public:
 	 */
 	bool process(uint32 deltaTimeInMillis);
 
+	void setVolume(uint8 volume);
+
+	void setPanTrack(int16 pos);
+	void unsetPanTrack();
 private:
 	int32 _timeLeft;
 	bool _pantrack;
 	int32 _pantrack_X;
 	int32 _attenuate;
-	int8 _volume;
-	int32 _id;
+	uint8 _volume;
 	bool _loop;
 	bool _crossfade;
-	int32 _crossfade_delta;
+	uint8 _crossfade_target;
 	int32 _crossfade_time;
+	bool _stereo;
 	Audio::SoundHandle _handle;
 };
 
+class PanTrackNode : public SideFX {
+public:
+	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
+	~PanTrackNode();
+
+private:
+	uint32 _slot;
+};
+
 } // End of namespace ZVision
 
 #endif
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 4f1c3631bd..83f25a8954 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -248,7 +248,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("music", true)) {
 					actionList.push_back(new ActionMusic(_engine, slot, args, false));
 				} else if (act.matchString("pan_track", true)) {
-					// TODO: Implement ActionPanTrack
+					actionList.push_back(new ActionPanTrack(_engine, slot, args));
 				} else if (act.matchString("playpreload", true)) {
 					actionList.push_back(new ActionPlayPreloadAnimation(_engine, slot, args));
 				} else if (act.matchString("preferences", true)) {
-- 
cgit v1.2.3


From d973b1fb1bde603b3b2436a58afcf043b178c407 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 11:07:58 +0700
Subject: ZVISION: Implement attenuate code.

---
 engines/zvision/actions.cpp           | 6 +++++-
 engines/zvision/actions.h             | 2 +-
 engines/zvision/scr_file_handling.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 3eec70d1ba..92d6f6c389 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -88,7 +88,11 @@ ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::S
 }
 
 bool ActionAttenuate::execute() {
-	// TODO: Implement
+	SideFX *fx = _engine->getScriptManager()->getSideFX(_key);
+	if (fx && fx->getType() == SideFX::SIDEFX_AUDIO) {
+		MusicNode *mus = (MusicNode *)fx;
+		mus->setVolume(255 - (abs(_attenuation) >> 7));
+	}
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 417c1ada1a..b204fbeb28 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -116,7 +116,7 @@ public:
 
 private:
 	uint32 _key;
-	int _attenuation;
+	int32 _attenuation;
 };
 
 class ActionChangeLocation : public ResultAction {
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 83f25a8954..002871af0b 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -214,7 +214,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("animunload", true)) {
 					//actionList.push_back(new ActionUnloadAnimation(_engine, slot, args));
 				} else if (act.matchString("attenuate", true)) {
-					// TODO: Implement ActionAttenuate
+					actionList.push_back(new ActionAttenuate(_engine, slot, args));
 				} else if (act.matchString("assign", true)) {
 					actionList.push_back(new ActionAssign(_engine, slot, args));
 				} else if (act.matchString("change_location", true)) {
-- 
cgit v1.2.3


From 7b7ae43f7fe30782201fba691beee1bad18db60a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 11:10:17 +0700
Subject: ZVISION: Implement crossfade.

---
 engines/zvision/actions.cpp           | 24 ++++++++++++++++++++++--
 engines/zvision/actions.h             | 10 +++++-----
 engines/zvision/music_node.cpp        | 19 +++++++++++++++++++
 engines/zvision/music_node.h          |  3 +++
 engines/zvision/scr_file_handling.cpp |  2 +-
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 92d6f6c389..5d1dc9a608 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -121,12 +121,32 @@ bool ActionChangeLocation::execute() {
 ActionCrossfade::ActionCrossfade(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
 	sscanf(line.c_str(),
-	       "%u %u %u %u %u %u %u",
+	       "%u %u %d %d %d %d %d",
 	       &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
 }
 
 bool ActionCrossfade::execute() {
-	// TODO: Implement
+	if (_keyOne) {
+		SideFX *fx = _engine->getScriptManager()->getSideFX(_keyOne);
+		if (fx && fx->getType() == SideFX::SIDEFX_AUDIO) {
+			MusicNode *mus = (MusicNode *)fx;
+			if (_oneStartVolume >= 0)
+				mus->setVolume((_oneStartVolume * 255) / 100);
+
+			mus->setFade(_timeInMillis, (_oneEndVolume * 255) / 100);
+		}
+	}
+
+	if (_keyTwo) {
+		SideFX *fx = _engine->getScriptManager()->getSideFX(_keyTwo);
+		if (fx && fx->getType() == SideFX::SIDEFX_AUDIO) {
+			MusicNode *mus = (MusicNode *)fx;
+			if (_twoStartVolume >= 0)
+				mus->setVolume((_twoStartVolume * 255) / 100);
+
+			mus->setFade(_timeInMillis, (_twoEndVolume * 255) / 100);
+		}
+	}
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index b204fbeb28..5c6cf6c35f 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -140,11 +140,11 @@ public:
 private:
 	uint32 _keyOne;
 	uint32 _keyTwo;
-	uint _oneStartVolume;
-	uint _twoStartVolume;
-	uint _oneEndVolume;
-	uint _twoEndVolume;
-	uint _timeInMillis;
+	int32 _oneStartVolume;
+	int32 _twoStartVolume;
+	int32 _oneEndVolume;
+	int32 _twoEndVolume;
+	int32 _timeInMillis;
 };
 
 class ActionDebug : public ResultAction {
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index 081c9dbcca..30271480c1 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -91,12 +91,31 @@ void MusicNode::unsetPanTrack() {
 	setVolume(_volume);
 }
 
+void MusicNode::setFade(int32 time, uint8 target) {
+	_crossfade_target = target;
+	_crossfade_time = time;
+	_crossfade = true;
+}
+
 bool MusicNode::process(uint32 deltaTimeInMillis) {
 	if (! _engine->_mixer->isSoundHandleActive(_handle))
 		return stop();
 	else {
 		uint8 _newvol = _volume;
 
+		if (_crossfade) {
+			if (_crossfade_time > 0) {
+				if ((int32)deltaTimeInMillis > _crossfade_time)
+					deltaTimeInMillis = _crossfade_time;
+				_newvol += floor(((float)(_crossfade_target - _newvol) / (float)_crossfade_time)) * (float)deltaTimeInMillis;
+				_crossfade_time -= deltaTimeInMillis;
+			}
+			else {
+				_crossfade = false;
+				_newvol = _crossfade_target;
+			}
+		}
+
 		if (_pantrack || _volume != _newvol)
 			setVolume(_newvol);
 	}
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
index 9ccf9ab657..6e3033f6b0 100644
--- a/engines/zvision/music_node.h
+++ b/engines/zvision/music_node.h
@@ -49,6 +49,9 @@ public:
 
 	void setPanTrack(int16 pos);
 	void unsetPanTrack();
+
+	void setFade(int32 time, uint8 target);
+
 private:
 	int32 _timeLeft;
 	bool _pantrack;
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 002871af0b..833db11ad1 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -220,7 +220,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("change_location", true)) {
 					actionList.push_back(new ActionChangeLocation(_engine, slot, args));
 				} else if (act.matchString("crossfade", true)) {
-					// TODO: Implement ActionCrossfade
+					actionList.push_back(new ActionCrossfade(_engine, slot, args));
 				} else if (act.matchString("debug", true)) {
 					// TODO: Implement ActionDebug
 				} else if (act.matchString("delay_render", true)) {
-- 
cgit v1.2.3


From 3a1fda6d5760b25acb3bb561b567f6402685bcc6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 16:52:26 +0700
Subject: ZVISION: New class for handle rlf and avi animations.

---
 engines/zvision/meta_animation.cpp | 129 +++++++++++++++++++++++++++++++++++++
 engines/zvision/meta_animation.h   |  98 ++++++++++++++++++++++++++++
 engines/zvision/module.mk          |   3 +-
 3 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 engines/zvision/meta_animation.cpp
 create mode 100644 engines/zvision/meta_animation.h

diff --git a/engines/zvision/meta_animation.cpp b/engines/zvision/meta_animation.cpp
new file mode 100644
index 0000000000..430b1436cb
--- /dev/null
+++ b/engines/zvision/meta_animation.cpp
@@ -0,0 +1,129 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/meta_animation.h"
+
+#include "zvision/zvision.h"
+#include "zvision/render_manager.h"
+#include "zvision/script_manager.h"
+#include "zvision/rlf_animation.h"
+#include "zvision/zork_avi_decoder.h"
+
+#include "video/video_decoder.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+MetaAnimation::MetaAnimation(const Common::String &fileName)
+	: _fileType(RLF),
+	  _cur_frame(NULL) {
+	if (fileName.hasSuffix(".rlf")) {
+		_fileType = RLF;
+		_animation.rlf = new RlfAnimation(fileName, false);
+		_frmDelay = _animation.rlf->frameTime();
+	} else if (fileName.hasSuffix(".avi")) {
+		_fileType = AVI;
+		_animation.avi = new ZorkAVIDecoder();
+		_animation.avi->loadFile(fileName);
+		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
+	} else {
+		warning("Unrecognized animation file type: %s", fileName.c_str());
+	}
+}
+
+MetaAnimation::~MetaAnimation() {
+	if (_fileType == RLF) {
+		delete _animation.rlf;
+	} else if (_fileType == AVI) {
+		delete _animation.avi;
+	}
+}
+
+uint MetaAnimation::frameCount() {
+	if (_fileType == RLF) {
+		return _animation.rlf->frameCount();
+	} else
+		return _animation.avi->getFrameCount();
+
+}
+
+uint MetaAnimation::width() {
+	if (_fileType == RLF) {
+		return _animation.rlf->width();
+	} else
+		return _animation.avi->getWidth();
+}
+uint MetaAnimation::height() {
+	if (_fileType == RLF) {
+		return _animation.rlf->height();
+	} else
+		return _animation.avi->getHeight();
+}
+uint32 MetaAnimation::frameTime() {
+	return _frmDelay;
+}
+
+void MetaAnimation::seekToFrame(int frameNumber) {
+	if (frameNumber >= (int)frameCount())
+		frameNumber = frameCount() - 1;
+
+	if (_fileType == RLF) {
+		_animation.rlf->seekToFrame(frameNumber);
+	} else
+		_animation.avi->seekToFrame(frameNumber);
+}
+
+const Graphics::Surface *MetaAnimation::decodeNextFrame() {
+	if (_fileType == RLF)
+		_cur_frame = _animation.rlf->decodeNextFrame();
+	else
+		_cur_frame = _animation.avi->decodeNextFrame();
+
+	return _cur_frame;
+}
+
+const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) {
+	if (frameNumber >= frameCount())
+		frameNumber = frameCount() - 1;
+
+	if (_fileType == RLF) {
+		_cur_frame = _animation.rlf->getFrameData(frameNumber);
+		return _cur_frame;
+	} else {
+		_animation.avi->seekToFrame(frameNumber);
+		_cur_frame = _animation.avi->decodeNextFrame();
+		return _cur_frame;
+	}
+}
+
+bool MetaAnimation::endOfAnimation() {
+	if (_fileType == RLF) {
+		return _animation.rlf->endOfAnimation();
+	} else
+		return _animation.avi->endOfVideo();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/meta_animation.h b/engines/zvision/meta_animation.h
new file mode 100644
index 0000000000..fea7a6a6c1
--- /dev/null
+++ b/engines/zvision/meta_animation.h
@@ -0,0 +1,98 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_METAANIM_NODE_H
+#define ZVISION_METAANIM_NODE_H
+
+#include "zvision/sidefx.h"
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace Common {
+class String;
+}
+
+namespace Video {
+class VideoDecoder;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+class RlfAnimation;
+
+class MetaAnimation {
+public:
+	MetaAnimation(const Common::String &fileName);
+	~MetaAnimation();
+
+	struct playnode {
+		Common::Rect pos;
+		int32 slot;
+		int32 start;
+		int32 stop;
+		int32 loop;
+		int32 _cur_frm;
+		int32 _delay;
+		Graphics::Surface *_scaled;
+	};
+
+private:
+	enum FileType {
+	    RLF = 1,
+	    AVI = 2
+	};
+
+private:
+	union {
+		RlfAnimation *rlf;
+		Video::VideoDecoder *avi;
+	} _animation;
+
+	FileType _fileType;
+	int32 _frmDelay;
+
+	const Graphics::Surface *_cur_frame;
+
+public:
+
+	uint frameCount();
+	uint width();
+	uint height();
+	uint32 frameTime();
+
+	void seekToFrame(int frameNumber);
+
+	const Graphics::Surface *decodeNextFrame();
+	const Graphics::Surface *getFrameData(uint frameNumber);
+
+	bool endOfAnimation();
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index af90923f9a..62a1293663 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -34,7 +34,8 @@ MODULE_OBJS := \
 	music_node.o \
 	inventory_manager.o \
 	slot_control.o \
-	menu.o
+	menu.o \
+	meta_animation.o
  
 MODULE_DIRS += \
 	engines/zvision
-- 
cgit v1.2.3


From ff2a20889cfead5075c252dd5cdcdba658a40844 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 16:54:59 +0700
Subject: ZVISION: Move code of animation_node to use meta_animation.

---
 engines/zvision/animation_node.cpp | 65 +++++++++++---------------------------
 engines/zvision/animation_node.h   | 22 +++----------
 2 files changed, 23 insertions(+), 64 deletions(-)

diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 27ee873f98..11275b5c7d 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -27,10 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/render_manager.h"
 #include "zvision/script_manager.h"
-#include "zvision/rlf_animation.h"
-#include "zvision/zork_avi_decoder.h"
-
-#include "video/video_decoder.h"
+#include "zvision/meta_animation.h"
 
 #include "graphics/surface.h"
 
@@ -39,18 +36,13 @@ namespace ZVision {
 
 AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
 	: SideFX(engine, controlKey, SIDEFX_ANIM),
-	  _fileType(RLF),
 	  _DisposeAfterUse(DisposeAfterUse),
-	  _mask(mask) {
-	if (fileName.hasSuffix(".rlf")) {
-		_fileType = RLF;
-		_animation.rlf = new RlfAnimation(fileName, false);
-		_frmDelay = _animation.rlf->frameTime();
-	} else if (fileName.hasSuffix(".avi")) {
-		_fileType = AVI;
-		_animation.avi = new ZorkAVIDecoder();
-		_animation.avi->loadFile(fileName);
-		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
+	  _mask(mask),
+	  _animation(NULL) {
+
+	if (fileName.hasSuffix(".rlf") || fileName.hasSuffix(".avi")) {
+		_animation = new MetaAnimation(fileName);
+		_frmDelay = _animation->frameTime();
 	} else {
 		warning("Unrecognized animation file type: %s", fileName.c_str());
 	}
@@ -60,11 +52,8 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 }
 
 AnimationNode::~AnimationNode() {
-	if (_fileType == RLF) {
-		delete _animation.rlf;
-	} else if (_fileType == AVI) {
-		delete _animation.avi;
-	}
+	if (_animation)
+		delete _animation;
 
 	_engine->getScriptManager()->setStateValue(_key, 2);
 
@@ -92,13 +81,9 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 			if (nod->_cur_frm == -1) { // Start of new playlist node
 				nod->_cur_frm = nod->start;
-				if (_fileType == RLF) {
-					_animation.rlf->seekToFrame(nod->_cur_frm);
-					frame = _animation.rlf->decodeNextFrame();
-				} else if (_fileType == AVI) {
-					_animation.avi->seekToFrame(nod->_cur_frm);
-					frame = _animation.avi->decodeNextFrame();
-				}
+
+				_animation->seekToFrame(nod->_cur_frm);
+				frame = _animation->decodeNextFrame();
 
 				nod->_delay = _frmDelay;
 				if (nod->slot)
@@ -119,19 +104,10 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 					}
 
 					nod->_cur_frm = nod->start;
-					if (_fileType == RLF) {
-						_animation.rlf->seekToFrame(nod->_cur_frm);
-						frame = _animation.rlf->decodeNextFrame();
-					} else if (_fileType == AVI) {
-						_animation.avi->seekToFrame(nod->_cur_frm);
-						frame = _animation.avi->decodeNextFrame();
-					}
-				} else {
-					if (_fileType == RLF)
-						frame = _animation.rlf->decodeNextFrame();
-					else if (_fileType == AVI)
-						frame = _animation.avi->decodeNextFrame();
+					_animation->seekToFrame(nod->_cur_frm);
 				}
+
+				frame = _animation->decodeNextFrame();
 			}
 
 			if (frame) {
@@ -190,13 +166,10 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = start_frame;
 	nod.stop = end_frame;
-	if (_fileType == RLF) {
-		if (nod.stop >= (int)_animation.rlf->frameCount())
-			nod.stop = _animation.rlf->frameCount() - 1;
-	} else if (_fileType == AVI) {
-		if (nod.stop > (int)_animation.avi->getFrameCount())
-			nod.stop = _animation.avi->getFrameCount();
-	}
+
+	if (nod.stop >= (int)_animation->frameCount())
+		nod.stop = _animation->frameCount() - 1;
+
 	nod.slot = slot;
 	nod._cur_frm = -1;
 	nod._delay = 0;
diff --git a/engines/zvision/animation_node.h b/engines/zvision/animation_node.h
index 843e59236b..556ab8a51f 100644
--- a/engines/zvision/animation_node.h
+++ b/engines/zvision/animation_node.h
@@ -32,10 +32,6 @@ namespace Common {
 class String;
 }
 
-namespace Video {
-class VideoDecoder;
-}
-
 namespace Graphics {
 struct Surface;
 }
@@ -43,7 +39,7 @@ struct Surface;
 namespace ZVision {
 
 class ZVision;
-class RlfAnimation;
+class MetaAnimation;
 
 class AnimationNode : public SideFX {
 public:
@@ -61,27 +57,17 @@ public:
 		Graphics::Surface *_scaled;
 	};
 
-private:
-	enum FileType {
-	    RLF = 1,
-	    AVI = 2
-	};
-
 private:
 	typedef Common::List<playnode> PlayNodes;
 
 	PlayNodes _playList;
 
-	union {
-		RlfAnimation *rlf;
-		Video::VideoDecoder *avi;
-	} _animation;
-
-	FileType _fileType;
-	int32 _frmDelay;
 	int32 _mask;
 	bool _DisposeAfterUse;
 
+	MetaAnimation *_animation;
+	int32 _frmDelay;
+
 public:
 	bool process(uint32 deltaTimeInMillis);
 
-- 
cgit v1.2.3


From 9c9f59d57060617d1acec71bd0d4066504f17c7a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 17 Jan 2014 16:56:49 +0700
Subject: ZVISION: Move lever code to use MetaAnimation.

---
 engines/zvision/lever_control.cpp | 34 +++++++++-------------------------
 engines/zvision/lever_control.h   | 12 ++----------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 9cd36cf653..e96c873033 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -28,8 +28,7 @@
 #include "zvision/script_manager.h"
 #include "zvision/render_manager.h"
 #include "zvision/cursor_manager.h"
-#include "zvision/rlf_animation.h"
-#include "zvision/zork_avi_decoder.h"
+#include "zvision/meta_animation.h"
 #include "zvision/utility.h"
 
 #include "common/stream.h"
@@ -79,11 +78,8 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 }
 
 LeverControl::~LeverControl() {
-	if (_fileType == AVI) {
-		delete _animation.avi;
-	} else if (_fileType == RLF) {
-		delete _animation.rlf;
-	}
+	if (_animation)
+		delete _animation;
 
 	delete[] _frameInfo;
 }
@@ -106,14 +102,9 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 
 			Common::String animationFileName(fileNameBuffer);
 
-			if (animationFileName.hasSuffix(".avi")) {
-				_animation.avi = new ZorkAVIDecoder();
-				_animation.avi->loadFile(animationFileName);
-				_fileType = AVI;
-			} else if (animationFileName.hasSuffix(".rlf")) {
-				_animation.rlf = new RlfAnimation(animationFileName, false);
-				_fileType = RLF;
-			}
+			if (animationFileName.hasSuffix(".avi") || animationFileName.hasSuffix(".rlf"))
+				_animation = new MetaAnimation(animationFileName);
+
 		} else if (line.matchString("*skipcolor*", true)) {
 			// Not used
 		} else if (line.matchString("*anim_coords*", true)) {
@@ -379,16 +370,9 @@ void LeverControl::renderFrame(uint frameNumber) {
 	int x = _animationCoords.left;
 	int y = _animationCoords.top;
 
-	if (_fileType == RLF) {
-		// getFrameData() will automatically optimize to getNextFrame() / getPreviousFrame() if it can
-		frameData = _animation.rlf->getFrameData(frameNumber);
-	} else if (_fileType == AVI) {
-		_animation.avi->seekToFrame(frameNumber);
-		const Graphics::Surface *surface = _animation.avi->decodeNextFrame();
-		frameData = surface;
-	}
-
-	_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
+	frameData = _animation->getFrameData(frameNumber);
+	if (frameData)
+		_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 19ecc7b9ac..591d64e949 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -32,7 +32,7 @@
 namespace ZVision {
 
 class ZorkAVIDecoder;
-class RlfAnimation;
+class MetaAnimation;
 
 class LeverControl : public Control {
 public:
@@ -40,10 +40,6 @@ public:
 	~LeverControl();
 
 private:
-	enum FileType {
-	    RLF = 1,
-	    AVI = 2
-	};
 
 	struct Direction {
 		Direction(uint a, uint t) : angle(a), toFrame(t) {}
@@ -64,11 +60,7 @@ private:
 	};
 
 private:
-	union {
-		RlfAnimation *rlf;
-		ZorkAVIDecoder *avi;
-	} _animation;
-	FileType _fileType;
+	MetaAnimation *_animation;
 
 	Common::String _cursorName;
 	Common::Rect _animationCoords;
-- 
cgit v1.2.3


From 4a454ed763c24f94062be5dd57f43e0a84c1b0a2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 4 Feb 2014 08:32:02 +0700
Subject: ZVISION: New search manager for handle right handle for ZIX-files.

---
 engines/zvision/actions.cpp           |  45 +++---
 engines/zvision/animation_node.cpp    |   2 +-
 engines/zvision/cursor.cpp            |  29 ++++
 engines/zvision/cursor.h              |   2 +
 engines/zvision/cursor_manager.cpp    |  24 +--
 engines/zvision/lever_control.cpp     |   4 +-
 engines/zvision/meta_animation.cpp    |   8 +-
 engines/zvision/meta_animation.h      |   3 +-
 engines/zvision/module.mk             |   3 +-
 engines/zvision/music_node.cpp        |   2 +-
 engines/zvision/render_manager.cpp    |  10 +-
 engines/zvision/render_manager.h      |   3 +-
 engines/zvision/rlf_animation.cpp     | 116 +++++++++-----
 engines/zvision/rlf_animation.h       |   3 +-
 engines/zvision/scr_file_handling.cpp |   3 +-
 engines/zvision/search_manager.cpp    | 274 ++++++++++++++++++++++++++++++++++
 engines/zvision/search_manager.h      |  51 +++++++
 engines/zvision/zork_raw.cpp          |   2 +-
 engines/zvision/zvision.cpp           |  27 +++-
 engines/zvision/zvision.h             |   5 +
 20 files changed, 518 insertions(+), 98 deletions(-)
 create mode 100644 engines/zvision/search_manager.cpp
 create mode 100644 engines/zvision/search_manager.h

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 5d1dc9a608..7b9050f47a 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -312,27 +312,11 @@ ActionMusic::~ActionMusic() {
 bool ActionMusic::execute() {
 	if (_engine->getScriptManager()->getSideFX(_slotkey))
 		return true;
-	Common::File *file = new Common::File();
-	if (!file->exists(_fileName) && _fileName.size() >= 12) {
-		_fileName.setChar('r', 9);
-		_fileName.setChar('a', 10);
-		_fileName.setChar('w', 11);
-		if (!file->exists(_fileName)) {
-			_fileName.setChar('i', 9);
-			_fileName.setChar('f', 10);
-			_fileName.setChar('p', 11);
-			if (!file->exists(_fileName)) {
-				_fileName.setChar('s', 9);
-				_fileName.setChar('r', 10);
-				_fileName.setChar('c', 11);
-				if (!file->exists(_fileName))
-					return true;
-			}
-		}
-	}
-	if (file->exists(_fileName))
-		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotkey, _fileName, _loop, _volume));
-	delete file;
+
+	if (!_engine->getSearchManager()->hasFile(_fileName))
+		return true;
+
+	_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotkey, _fileName, _loop, _volume));
 
 	return true;
 }
@@ -585,16 +569,21 @@ ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Commo
 
 bool ActionStreamVideo::execute() {
 	ZorkAVIDecoder decoder;
-	if (!decoder.loadFile(_fileName)) {
-		return true;
-	}
+	Common::File *_file = _engine->getSearchManager()->openFile(_fileName);
+
+	if (_file) {
+		if (!decoder.loadStream(_file)) {
+			return true;
+		}
+
+		Common::Rect destRect;
+		if ((_flags & DIFFERENT_DIMENSIONS) == DIFFERENT_DIMENSIONS) {
+			destRect = Common::Rect(_x1, _y1, _x2, _y2);
+		}
 
-	Common::Rect destRect;
-	if ((_flags & DIFFERENT_DIMENSIONS) == DIFFERENT_DIMENSIONS) {
-		destRect = Common::Rect(_x1, _y1, _x2, _y2);
+		_engine->playVideo(decoder, destRect, _skippable);
 	}
 
-	_engine->playVideo(decoder, destRect, _skippable);
 	return true;
 }
 
diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 11275b5c7d..89d0f5e451 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -41,7 +41,7 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	  _animation(NULL) {
 
 	if (fileName.hasSuffix(".rlf") || fileName.hasSuffix(".avi")) {
-		_animation = new MetaAnimation(fileName);
+		_animation = new MetaAnimation(fileName, engine);
 		_frmDelay = _animation->frameTime();
 	} else {
 		warning("Unrecognized animation file type: %s", fileName.c_str());
diff --git a/engines/zvision/cursor.cpp b/engines/zvision/cursor.cpp
index 5386c8ead6..e2e3d7ee72 100644
--- a/engines/zvision/cursor.cpp
+++ b/engines/zvision/cursor.cpp
@@ -66,6 +66,35 @@ ZorkCursor::ZorkCursor(const Common::String &fileName)
 	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
 }
 
+ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
+	: _width(0),
+	  _height(0),
+	  _hotspotX(0),
+	  _hotspotY(0) {
+	Common::File file;
+	if (!engine->getSearchManager()->openFile(file, fileName))
+		return;
+
+	uint32 magic = file.readUint32BE();
+	if (magic != MKTAG('Z', 'C', 'R', '1')) {
+		warning("%s is not a Zork Cursor file", fileName.c_str());
+		return;
+	}
+
+	_hotspotX = file.readUint16LE();
+	_hotspotY = file.readUint16LE();
+	_width = file.readUint16LE();
+	_height = file.readUint16LE();
+
+	uint dataSize = _width * _height * sizeof(uint16);
+	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
+	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
+	assert(bytesRead == dataSize);
+
+	// Convert to RGB 565
+	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
+}
+
 ZorkCursor::ZorkCursor(const ZorkCursor &other) {
 	_width = other._width;
 	_height = other._height;
diff --git a/engines/zvision/cursor.h b/engines/zvision/cursor.h
index 8f119c8982..2304bf4c82 100644
--- a/engines/zvision/cursor.h
+++ b/engines/zvision/cursor.h
@@ -24,6 +24,7 @@
 #define ZVISION_CURSOR_H
 
 #include "graphics/surface.h"
+#include "zvision/zvision.h"
 
 
 namespace Common {
@@ -40,6 +41,7 @@ class ZorkCursor {
 public:
 	ZorkCursor();
 	ZorkCursor(const Common::String &fileName);
+	ZorkCursor(ZVision *engine, const Common::String &fileName);
 	ZorkCursor(const ZorkCursor &other);
 	~ZorkCursor();
 
diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index aaf3bb8ee4..c66fa650a8 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -57,15 +57,15 @@ CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixel
 		if (_engine->getGameId() == GID_NEMESIS) {
 			Common::String name;
 			name = Common::String::format("%sa.zcr", _zNemCursorFileNames[i]);
-			_cursors[i][0] = ZorkCursor(name); // Up cursor
+			_cursors[i][0] = ZorkCursor(_engine, name); // Up cursor
 			name = Common::String::format("%sb.zcr", _zNemCursorFileNames[i]);
-			_cursors[i][1] = ZorkCursor(name); // Down cursor
+			_cursors[i][1] = ZorkCursor(_engine, name); // Down cursor
 		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-			_cursors[i][0] = ZorkCursor(_zgiCursorFileNames[i]); // Up cursor
+			_cursors[i][0] = ZorkCursor(_engine, _zgiCursorFileNames[i]); // Up cursor
 			char buffer[25];
 			strcpy(buffer, _zgiCursorFileNames[i]);
 			buffer[3] += 2;
-			_cursors[i][1] = ZorkCursor(buffer); // Down cursor
+			_cursors[i][1] = ZorkCursor(_engine, buffer); // Down cursor
 		}
 	}
 }
@@ -76,22 +76,22 @@ void CursorManager::setItemID(int id) {
 			Common::String file;
 			if (_engine->getGameId() == GID_NEMESIS) {
 				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'a');
-				_cursors[NUM_CURSORS][0] = ZorkCursor(file);
+				_cursors[NUM_CURSORS][0] = ZorkCursor(_engine, file);
 				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'b');
-				_cursors[NUM_CURSORS][1] = ZorkCursor(file);
+				_cursors[NUM_CURSORS][1] = ZorkCursor(_engine, file);
 				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'a');
-				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(file);
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
 				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'b');
-				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(file);
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
 			} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
 				file = Common::String::format("g0b%cc%2.2x1.zcr", 'a' , id);
-				_cursors[NUM_CURSORS][0] = ZorkCursor(file);
+				_cursors[NUM_CURSORS][0] = ZorkCursor(_engine, file);
 				file = Common::String::format("g0b%cc%2.2x1.zcr", 'c' , id);
-				_cursors[NUM_CURSORS][1] = ZorkCursor(file);
+				_cursors[NUM_CURSORS][1] = ZorkCursor(_engine, file);
 				file = Common::String::format("g0b%cc%2.2x1.zcr", 'b' , id);
-				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(file);
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
 				file = Common::String::format("g0b%cc%2.2x1.zcr", 'd' , id);
-				_cursors[NUM_CURSORS + 1][1] = ZorkCursor(file);
+				_cursors[NUM_CURSORS + 1][1] = ZorkCursor(_engine, file);
 			} else
 				return;
 		}
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index e96c873033..33aa2be592 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -86,7 +86,7 @@ LeverControl::~LeverControl() {
 
 void LeverControl::parseLevFile(const Common::String &fileName) {
 	Common::File file;
-	if (!file.open(fileName)) {
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
 		warning("LEV file %s could could be opened", fileName.c_str());
 		return;
 	}
@@ -103,7 +103,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 			Common::String animationFileName(fileNameBuffer);
 
 			if (animationFileName.hasSuffix(".avi") || animationFileName.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(animationFileName);
+				_animation = new MetaAnimation(animationFileName, _engine);
 
 		} else if (line.matchString("*skipcolor*", true)) {
 			// Not used
diff --git a/engines/zvision/meta_animation.cpp b/engines/zvision/meta_animation.cpp
index 430b1436cb..33ae92a523 100644
--- a/engines/zvision/meta_animation.cpp
+++ b/engines/zvision/meta_animation.cpp
@@ -37,17 +37,19 @@
 
 namespace ZVision {
 
-MetaAnimation::MetaAnimation(const Common::String &fileName)
+MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
 	: _fileType(RLF),
 	  _cur_frame(NULL) {
 	if (fileName.hasSuffix(".rlf")) {
 		_fileType = RLF;
-		_animation.rlf = new RlfAnimation(fileName, false);
+		Common::File *_file = engine->getSearchManager()->openFile(fileName);
+		_animation.rlf = new RlfAnimation(_file, false);
 		_frmDelay = _animation.rlf->frameTime();
 	} else if (fileName.hasSuffix(".avi")) {
 		_fileType = AVI;
+		Common::File *_file = engine->getSearchManager()->openFile(fileName);
 		_animation.avi = new ZorkAVIDecoder();
-		_animation.avi->loadFile(fileName);
+		_animation.avi->loadStream(_file);
 		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
 	} else {
 		warning("Unrecognized animation file type: %s", fileName.c_str());
diff --git a/engines/zvision/meta_animation.h b/engines/zvision/meta_animation.h
index fea7a6a6c1..e259955891 100644
--- a/engines/zvision/meta_animation.h
+++ b/engines/zvision/meta_animation.h
@@ -24,6 +24,7 @@
 #define ZVISION_METAANIM_NODE_H
 
 #include "zvision/sidefx.h"
+#include "zvision/zvision.h"
 #include "common/rect.h"
 #include "common/list.h"
 
@@ -47,7 +48,7 @@ class RlfAnimation;
 
 class MetaAnimation {
 public:
-	MetaAnimation(const Common::String &fileName);
+	MetaAnimation(const Common::String &fileName, ZVision *engine);
 	~MetaAnimation();
 
 	struct playnode {
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 62a1293663..b8dca9e63a 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -35,7 +35,8 @@ MODULE_OBJS := \
 	inventory_manager.o \
 	slot_control.o \
 	menu.o \
-	meta_animation.o
+	meta_animation.o \
+	search_manager.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index 30271480c1..d47a796382 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -51,7 +51,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 
 	if (filename.contains(".wav")) {
 		Common::File *file = new Common::File();
-		if (file->open(filename)) {
+		if (_engine->getSearchManager()->openFile(*file, filename)) {
 			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
 		}
 	} else {
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index f5d6847cf3..6cfc0509c7 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zvision.h"
 #include "zvision/render_manager.h"
 
 #include "zvision/lzss_read_stream.h"
@@ -37,8 +38,9 @@
 
 namespace ZVision {
 
-RenderManager::RenderManager(OSystem *system, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
-	: _system(system),
+RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
+	: _engine(engine),
+	  _system(engine->_system),
 	  _wrkWidth(workingWindow.width()),
 	  _wrkHeight(workingWindow.height()),
 	  _screenCenterX(_wrkWidth / 2),
@@ -113,7 +115,7 @@ void RenderManager::renderImageToBackground(const Common::String &fileName, int1
 void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination) {
 	Common::File file;
 
-	if (!file.open(fileName)) {
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
 		warning("Could not open file %s", fileName.c_str());
 		return;
 	}
@@ -207,7 +209,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed) {
 	Common::File file;
 
-	if (!file.open(fileName)) {
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
 		warning("Could not open file %s", fileName.c_str());
 		return;
 	}
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 901385b453..3c03331d0f 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -47,7 +47,7 @@ namespace ZVision {
 
 class RenderManager {
 public:
-	RenderManager(OSystem *system, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat);
+	RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat);
 	~RenderManager();
 
 private:
@@ -70,6 +70,7 @@ private:
 	typedef Common::HashMap<uint16, oneSub> subMap;
 
 private:
+	ZVision *_engine;
 	OSystem *_system;
 	const Graphics::PixelFormat _pixelFormat;
 
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index dab32aed17..f23f569d98 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -37,6 +37,7 @@ namespace ZVision {
 
 RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 	: _stream(stream),
+	  _readStream(NULL),
 	  _lastFrameRead(0),
 	  _frameCount(0),
 	  _width(0),
@@ -45,11 +46,15 @@ RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 	  _frames(0),
 	  _currentFrame(0),
 	  _frameBufferByteSize(0) {
-	if (!_file.open(fileName)) {
+
+	Common::File *_file = new Common::File;
+	if (!_file->open(fileName)) {
 		warning("RLF animation file %s could not be opened", fileName.c_str());
 		return;
 	}
 
+	_readStream = _file;
+
 	if (!readHeader()) {
 		warning("%s is not a RLF animation file. Wrong magic number", fileName.c_str());
 		return;
@@ -68,59 +73,90 @@ RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 	}
 }
 
+RlfAnimation::RlfAnimation(Common::SeekableReadStream *rstream, bool stream)
+	: _stream(stream),
+	  _readStream(rstream),
+	  _lastFrameRead(0),
+	  _frameCount(0),
+	  _width(0),
+	  _height(0),
+	  _frameTime(0),
+	  _frames(0),
+	  _currentFrame(0),
+	  _frameBufferByteSize(0) {
+
+	if (!readHeader()) {
+		warning("Stream is not a RLF animation. Wrong magic number");
+		return;
+	}
+
+	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
+	_frameBufferByteSize = _width * _height * sizeof(uint16);
+
+	if (!stream) {
+		_frames = new Frame[_frameCount];
+
+		// Read in each frame
+		for (uint i = 0; i < _frameCount; ++i) {
+			_frames[i] = readNextFrame();
+		}
+	}
+}
+
 RlfAnimation::~RlfAnimation() {
 	for (uint i = 0; i < _frameCount; ++i) {
 		delete[] _frames[i].encodedData;
 	}
 	delete[] _frames;
+	delete _readStream;
 	_currentFrameBuffer.free();
 }
 
 bool RlfAnimation::readHeader() {
-	if (_file.readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
+	if (_readStream->readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
 		return false;
 	}
 
 	// Read the header
-	_file.readUint32LE();                // Size1
-	_file.readUint32LE();                // Unknown1
-	_file.readUint32LE();                // Unknown2
-	_frameCount = _file.readUint32LE();  // Frame count
+	_readStream->readUint32LE();                // Size1
+	_readStream->readUint32LE();                // Unknown1
+	_readStream->readUint32LE();                // Unknown2
+	_frameCount = _readStream->readUint32LE();  // Frame count
 
 	// Since we don't need any of the data, we can just seek right to the
 	// entries we need rather than read in all the individual entries.
-	_file.seek(136, SEEK_CUR);
+	_readStream->seek(136, SEEK_CUR);
 
 	//// Read CIN header
-	//_file.readUint32BE();          // Magic number FNIC
-	//_file.readUint32LE();          // Size2
-	//_file.readUint32LE();          // Unknown3
-	//_file.readUint32LE();          // Unknown4
-	//_file.readUint32LE();          // Unknown5
-	//_file.seek(0x18, SEEK_CUR);    // VRLE
-	//_file.readUint32LE();          // LRVD
-	//_file.readUint32LE();          // Unknown6
-	//_file.seek(0x18, SEEK_CUR);    // HRLE
-	//_file.readUint32LE();          // ELHD
-	//_file.readUint32LE();          // Unknown7
-	//_file.seek(0x18, SEEK_CUR);    // HKEY
-	//_file.readUint32LE();          // ELRH
+	//_readStream->readUint32BE();          // Magic number FNIC
+	//_readStream->readUint32LE();          // Size2
+	//_readStream->readUint32LE();          // Unknown3
+	//_readStream->readUint32LE();          // Unknown4
+	//_readStream->readUint32LE();          // Unknown5
+	//_readStream->seek(0x18, SEEK_CUR);    // VRLE
+	//_readStream->readUint32LE();          // LRVD
+	//_readStream->readUint32LE();          // Unknown6
+	//_readStream->seek(0x18, SEEK_CUR);    // HRLE
+	//_readStream->readUint32LE();          // ELHD
+	//_readStream->readUint32LE();          // Unknown7
+	//_readStream->seek(0x18, SEEK_CUR);    // HKEY
+	//_readStream->readUint32LE();          // ELRH
 
 	//// Read MIN info header
-	//_file.readUint32BE();          // Magic number FNIM
-	//_file.readUint32LE();          // Size3
-	//_file.readUint32LE();          // OEDV
-	//_file.readUint32LE();          // Unknown8
-	//_file.readUint32LE();          // Unknown9
-	//_file.readUint32LE();          // Unknown10
-	_width = _file.readUint32LE();   // Width
-	_height = _file.readUint32LE();  // Height
+	//_readStream->readUint32BE();          // Magic number FNIM
+	//_readStream->readUint32LE();          // Size3
+	//_readStream->readUint32LE();          // OEDV
+	//_readStream->readUint32LE();          // Unknown8
+	//_readStream->readUint32LE();          // Unknown9
+	//_readStream->readUint32LE();          // Unknown10
+	_width = _readStream->readUint32LE();   // Width
+	_height = _readStream->readUint32LE();  // Height
 
 	// Read time header
-	_file.readUint32BE();                    // Magic number EMIT
-	_file.readUint32LE();                    // Size4
-	_file.readUint32LE();                    // Unknown11
-	_frameTime = _file.readUint32LE() / 10;  // Frame time in microseconds
+	_readStream->readUint32BE();                    // Magic number EMIT
+	_readStream->readUint32LE();                    // Size4
+	_readStream->readUint32LE();                    // Unknown11
+	_frameTime = _readStream->readUint32LE() / 10;  // Frame time in microseconds
 
 	return true;
 }
@@ -128,17 +164,17 @@ bool RlfAnimation::readHeader() {
 RlfAnimation::Frame RlfAnimation::readNextFrame() {
 	RlfAnimation::Frame frame;
 
-	_file.readUint32BE();                        // Magic number MARF
-	uint32 size = _file.readUint32LE();          // Size
-	_file.readUint32LE();                        // Unknown1
-	_file.readUint32LE();                        // Unknown2
-	uint32 type = _file.readUint32BE();          // Either ELHD or ELRH
-	uint32 headerSize = _file.readUint32LE();    // Offset from the beginning of this frame to the frame data. Should always be 28
-	_file.readUint32LE();                        // Unknown3
+	_readStream->readUint32BE();                        // Magic number MARF
+	uint32 size = _readStream->readUint32LE();          // Size
+	_readStream->readUint32LE();                        // Unknown1
+	_readStream->readUint32LE();                        // Unknown2
+	uint32 type = _readStream->readUint32BE();          // Either ELHD or ELRH
+	uint32 headerSize = _readStream->readUint32LE();    // Offset from the beginning of this frame to the frame data. Should always be 28
+	_readStream->readUint32LE();                        // Unknown3
 
 	frame.encodedSize = size - headerSize;
 	frame.encodedData = new int8[frame.encodedSize];
-	_file.read(frame.encodedData, frame.encodedSize);
+	_readStream->read(frame.encodedData, frame.encodedSize);
 
 	if (type == MKTAG('E', 'L', 'H', 'D')) {
 		frame.type = Masked;
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index 35916de6cb..3764465786 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -37,6 +37,7 @@ namespace ZVision {
 class RlfAnimation {
 public:
 	RlfAnimation(const Common::String &fileName, bool stream = true);
+	RlfAnimation(Common::SeekableReadStream *rstream, bool stream);
 	~RlfAnimation();
 
 private:
@@ -52,7 +53,7 @@ private:
 	};
 
 private:
-	Common::File _file;
+	Common::SeekableReadStream *_readStream;
 	bool _stream;
 	uint _lastFrameRead;
 
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 833db11ad1..db4e8fa9b1 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zvision.h"
 #include "zvision/script_manager.h"
 
 #include "zvision/utility.h"
@@ -40,7 +41,7 @@ namespace ZVision {
 
 void ScriptManager::parseScrFile(const Common::String &fileName, script_scope &scope) {
 	Common::File file;
-	if (!file.open(fileName)) {
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
 		warning("Script file not found: %s", fileName.c_str());
 		return;
 	}
diff --git a/engines/zvision/search_manager.cpp b/engines/zvision/search_manager.cpp
new file mode 100644
index 0000000000..5c94ff0a26
--- /dev/null
+++ b/engines/zvision/search_manager.cpp
@@ -0,0 +1,274 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+#include "common/debug.h"
+
+#include "zvision/search_manager.h"
+#include "zvision/zfs_archive.h"
+#include "common/fs.h"
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+sManager::sManager(const Common::String &root_path, int depth) {
+	_root = root_path;
+	if (_root[_root.size() - 1] == '\\' || _root[_root.size() - 1] == '/')
+		_root.deleteLastChar();
+
+	Common::FSNode fs_node(_root);
+
+	list_dir_recursive(dir_list, fs_node, depth);
+
+	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end();)
+		if (it->size() == _root.size())
+			it = dir_list.erase(it);
+		else if (it->size() > _root.size()) {
+			*it = Common::String(it->c_str() + _root.size() + 1);
+			it++;
+		} else
+			it++;
+}
+
+sManager::~sManager() {
+	Common::List<Common::Archive *>::iterator it = archList.begin();
+	while (it != archList.end()) {
+		delete *it;
+		it++;
+	}
+
+	archList.clear();
+}
+
+void sManager::addPatch(const Common::String &src, const Common::String &dst) {
+	Common::String lw_name = dst;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator it = files.find(lw_name);
+
+	if (it != files.end()) {
+		lw_name = src;
+		lw_name.toLowercase();
+		files[lw_name] = it->_value;
+	}
+}
+
+void sManager::addFile(const Common::String &name, Common::Archive *arch) {
+	bool addArch = true;
+	Common::List<Common::Archive *>::iterator it = archList.begin();
+	while (it != archList.end()) {
+		if (*it == arch) {
+			addArch = false;
+			break;
+		}
+		it++;
+	}
+	if (addArch)
+		archList.push_back(arch);
+
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::Node nod;
+	nod.name = lw_name;
+	nod.arch = arch;
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit == files.end()) {
+		files[lw_name] = nod;
+	} else {
+		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
+		if (stream) {
+			if (stream->size() < 10)
+				fit->_value.arch = arch;
+			delete stream;
+		} else {
+			files[lw_name] = nod;
+		}
+	}
+}
+
+Common::File *sManager::openFile(const Common::String &name) {
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit != files.end()) {
+		Common::File *tmp = new Common::File();
+		tmp->open(fit->_value.name, *fit->_value.arch);
+		return tmp;
+	}
+	return NULL;
+}
+
+bool sManager::openFile(Common::File &file, const Common::String &name) {
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit != files.end())
+		return file.open(fit->_value.name, *fit->_value.arch);
+	return false;
+}
+
+bool sManager::hasFile(const Common::String &name) {
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit != files.end())
+		return true;
+	return false;
+}
+
+void sManager::loadZix(const Common::String &name) {
+	Common::File file;
+	file.open(name);
+
+	Common::String line;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		if (line.matchString("----------*", true))
+			break;
+	}
+
+	if (file.eos())
+		return;
+
+	Common::Array<Common::Archive *> archives;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		line.trim();
+		if (line.matchString("----------*", true))
+			break;
+		else if (line.matchString("DIR:*", true)) {
+			Common::String path(line.c_str() + 5);
+			Common::Archive *arc;
+			char n_path[128];
+			strcpy(n_path, path.c_str());
+			for (uint i = 0; i < path.size(); i++)
+				if (n_path[i] == '\\')
+					n_path[i] = '/';
+
+			path = Common::String(n_path);
+			if (path.size() && path[0] == '.')
+				path.deleteChar(0);
+			if (path.size() && path[0] == '/')
+				path.deleteChar(0);
+
+			if (path.matchString("*.zfs", true))
+				arc = new ZfsArchive(path);
+			else {
+				if (path.size()) {
+					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
+						path.deleteLastChar();
+					if (path.size())
+						for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
+							if (path.equalsIgnoreCase(*it)) {
+								path = *it;
+								break;
+							}
+				}
+
+				path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
+
+				arc = new Common::FSDirectory(path);
+			}
+			archives.push_back(arc);
+		}
+	}
+
+	if (file.eos())
+		return;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		line.trim();
+		uint dr = 0;
+		char buf[32];
+		if (sscanf(line.c_str(), "%u %s", &dr, buf) == 2) {
+			if (dr < archives.size() && dr > 0) {
+				addFile(Common::String(buf), archives[dr - 1]);
+			}
+		}
+	}
+}
+
+void sManager::addDir(const Common::String &name) {
+	Common::String path;
+	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
+		if (name.equalsIgnoreCase(*it)) {
+			path = *it;
+			break;
+		}
+
+	if (path.size() == 0)
+		return;
+
+	path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
+
+	Common::FSDirectory *dir = new Common::FSDirectory(path);
+
+	Common::ArchiveMemberList list;
+	dir->listMatchingMembers(list, "*.zfs");
+
+
+	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+		Common::String flname = (*iter)->getName();
+
+		ZfsArchive *zfs = new ZfsArchive(Common::String::format("%s/%s", name.c_str(), flname.c_str()));
+
+		Common::ArchiveMemberList zfslist;
+		zfs->listMembers(zfslist);
+
+		for (Common::ArchiveMemberList::iterator ziter = zfslist.begin(); ziter != zfslist.end(); ++ziter) {
+			Common::String z_name = (*ziter)->getName();
+			addFile(z_name, zfs);
+		}
+	}
+
+	list.clear();
+	dir->listMembers(list);
+
+	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+		Common::String flname = (*iter)->getName();
+		addFile(flname, dir);
+	}
+}
+
+void sManager::list_dir_recursive(Common::List<Common::String> &_list, const Common::FSNode &fs_node, int depth) {
+	Common::FSList fs_list;
+	fs_node.getChildren(fs_list);
+
+	_list.push_back(fs_node.getPath());
+
+	if (depth > 1)
+		for (Common::FSList::const_iterator it = fs_list.begin(); it != fs_list.end(); ++it)
+			list_dir_recursive(_list, *it, depth - 1);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/search_manager.h b/engines/zvision/search_manager.h
new file mode 100644
index 0000000000..c768cb8b00
--- /dev/null
+++ b/engines/zvision/search_manager.h
@@ -0,0 +1,51 @@
+#ifndef SEARCH_MANAGER_H_INCLUDED
+#define SEARCH_MANAGER_H_INCLUDED
+
+#include "common/str.h"
+#include "common/hash-str.h"
+#include "common/hashmap.h"
+#include "common/archive.h"
+#include "common/file.h"
+#include "common/list.h"
+
+namespace ZVision {
+
+class sManager {
+public:
+	sManager(const Common::String &root_path, int depth);
+	~sManager();
+
+	void addFile(const Common::String &name, Common::Archive *arch);
+	void addDir(const Common::String &name);
+	void addPatch(const Common::String &src, const Common::String &dst);
+
+	Common::File *openFile(const Common::String &name);
+	bool openFile(Common::File &file, const Common::String &name);
+	bool hasFile(const Common::String &name);
+
+	void loadZix(const Common::String &name);
+
+private:
+
+	void list_dir_recursive(Common::List<Common::String> &dir_list, const Common::FSNode &fs_node, int depth);
+
+	struct Node {
+		Common::String name;
+		Common::Archive *arch;
+	};
+
+	Common::List<Common::String> dir_list;
+
+	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
+
+	Common::List<Common::Archive *> archList;
+	MatchList files;
+
+	Common::String _root;
+
+private:
+};
+
+}
+
+#endif // SEARCH_MANAGER_H_INCLUDED
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index e7cc71a70b..a4d091f3c0 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -254,7 +254,7 @@ Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
 
 Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine) {
 	Common::File *file = new Common::File();
-	assert(file->open(filePath));
+	assert(engine->getSearchManager()->openFile(*file, filePath));
 
 	Common::String fileName = getFileName(filePath);
 	fileName.toLowercase();
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f21498c315..bf945f859a 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -33,8 +33,10 @@
 #include "zvision/zfs_archive.h"
 #include "zvision/detection.h"
 #include "zvision/menu.h"
+#include "zvision/search_manager.h"
 
 #include "common/config-manager.h"
+#include "common/str.h"
 #include "common/debug.h"
 #include "common/debug-channels.h"
 #include "common/textconsole.h"
@@ -88,6 +90,29 @@ ZVision::~ZVision() {
 
 void ZVision::initialize() {
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+	_searchManager = new sManager(ConfMan.get("path"), 6);
+
+	_searchManager->addDir("addon");
+
+	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
+		_searchManager->loadZix("INQUIS.ZIX");
+		_searchManager->addPatch("C000H01Q.RAW", "C000H01Q.SRC");
+		_searchManager->addPatch("CM00H01Q.RAW", "CM00H01Q.SRC");
+		_searchManager->addPatch("DM00H01Q.RAW", "DM00H01Q.SRC");
+		_searchManager->addPatch("E000H01Q.RAW", "E000H01Q.SRC");
+		_searchManager->addPatch("EM00H50Q.RAW", "EM00H50Q.SRC");
+		_searchManager->addPatch("GJNPH65P.RAW", "GJNPH65P.SRC");
+		_searchManager->addPatch("GJNPH72P.RAW", "GJNPH72P.SRC");
+		_searchManager->addPatch("H000H01Q.RAW", "H000H01Q.SRC");
+		_searchManager->addPatch("M000H01Q.RAW", "M000H01Q.SRC");
+		_searchManager->addPatch("P000H01Q.RAW", "P000H01Q.SRC");
+		_searchManager->addPatch("Q000H01Q.RAW", "Q000H01Q.SRC");
+		_searchManager->addPatch("SW00H01Q.RAW", "SW00H01Q.SRC");
+		_searchManager->addPatch("T000H01Q.RAW", "T000H01Q.SRC");
+		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
+	} else if (_gameDescription->gameId == GID_NEMESIS)
+		_searchManager->loadZix("NEMESIS.ZIX");
 	// TODO: There are 10 file clashes when we flatten the directories.
 	// From a quick look, the files are exactly the same, so it shouldn't matter.
 	// But I'm noting it here just in-case it does become a problem.
@@ -123,7 +148,7 @@ void ZVision::initialize() {
 
 	// Create managers
 	_scriptManager = new ScriptManager(this);
-	_renderManager = new RenderManager(_system, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _pixelFormat);
+	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _pixelFormat);
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, &_pixelFormat);
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 26d7644eb0..c9e14e8651 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -26,6 +26,7 @@
 
 #include "zvision/detection.h"
 #include "zvision/clock.h"
+#include "zvision/search_manager.h"
 
 #include "common/random.h"
 #include "common/events.h"
@@ -99,6 +100,7 @@ private:
 	SaveManager *_saveManager;
 	StringManager *_stringManager;
 	menuHandler *_menu;
+	sManager *_searchManager;
 
 	// Clock
 	Clock _clock;
@@ -135,6 +137,9 @@ public:
 	StringManager *getStringManager() const {
 		return _stringManager;
 	}
+	sManager *getSearchManager() const {
+		return _searchManager;
+	}
 	Common::RandomSource *getRandomSource() const {
 		return _rnd;
 	}
-- 
cgit v1.2.3


From 00337400010efc1012e95ec0c14a77423bb3a0ee Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 7 Feb 2014 16:07:52 +0700
Subject: ZVISION: Fix lever code;

---
 engines/zvision/lever_control.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 33aa2be592..f68f256229 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -91,9 +91,11 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 		return;
 	}
 
-	Common::String line = file.readLine();
+	Common::String line;
 
 	while (!file.eos()) {
+		line = file.readLine();
+
 		if (line.matchString("*animation_id*", true)) {
 			// Not used
 		} else if (line.matchString("*filename*", true)) {
@@ -142,6 +144,8 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 			uint frameNumber;
 			uint x, y;
 
+			line.toLowercase();
+
 			if (sscanf(line.c_str(), "%u:%u %u", &frameNumber, &x, &y) == 3) {
 				_frameInfo[frameNumber].hotspot.left = x;
 				_frameInfo[frameNumber].hotspot.top = y;
@@ -149,13 +153,13 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 				_frameInfo[frameNumber].hotspot.bottom = y + _hotspotDelta.y;
 			}
 
-			Common::StringTokenizer tokenizer(line, " ^=()");
+			Common::StringTokenizer tokenizer(line, " ^=()~");
 			tokenizer.nextToken();
 			tokenizer.nextToken();
 
 			Common::String token = tokenizer.nextToken();
 			while (!tokenizer.empty()) {
-				if (token == "D") {
+				if (token == "d") {
 					token = tokenizer.nextToken();
 
 					uint angle;
@@ -163,7 +167,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 					sscanf(token.c_str(), "%u,%u", &toFrame, &angle);
 
 					_frameInfo[frameNumber].directions.push_back(Direction(angle, toFrame));
-				} else if (token.hasPrefix("P")) {
+				} else if (token.hasPrefix("p")) {
 					// Format: P(<from> to <to>)
 					tokenizer.nextToken();
 					tokenizer.nextToken();
@@ -177,7 +181,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 			}
 		}
 
-		line = file.readLine();
+		// Don't read lines in this place because last will not be parsed.
 	}
 }
 
@@ -290,7 +294,7 @@ int LeverControl::calculateVectorAngle(const Common::Point &pointOne, const Comm
 
 		// Calculate the angle using arctan
 		// Then convert to degrees. (180 / 3.14159 = 57.2958)
-		int angle = int(atan((float)yDist / (float)xDist) * 57);
+		int angle = int(atan((float)yDist / (float)abs(xDist)) * 57);
 
 		// Calculate what quadrant pointTwo is in
 		uint quadrant = ((yDist > 0 ? 1 : 0) << 1) | (xDist < 0 ? 1 : 0);
@@ -339,16 +343,16 @@ int LeverControl::calculateVectorAngle(const Common::Point &pointOne, const Comm
 		// Convert the local angles to unit circle angles
 		switch (quadrant) {
 		case 0:
-			angle = 180 + angle;
+			angle = -angle;
 			break;
 		case 1:
-			// Do nothing
+			angle = angle + 180;
 			break;
 		case 2:
-			angle = 180 + angle;
+			angle = 360 - angle;
 			break;
 		case 3:
-			angle = 360 + angle;
+			angle = 180 + angle;
 			break;
 		}
 
-- 
cgit v1.2.3


From cb2503aa9dd5d76a12aaf0522ddea810907a97a5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 7 Feb 2014 23:03:02 +0700
Subject: ZVISION: Refactor of pushtoggle code, now full functional
 implementation.

---
 engines/zvision/push_toggle_control.cpp | 51 ++++++++++++++++++++++++++++++---
 engines/zvision/push_toggle_control.h   | 12 ++++++++
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index 86f499739c..0ba6dd7d25 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -35,10 +35,13 @@
 namespace ZVision {
 
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key) {
+	: Control(engine, key),
+	  _countTo(2),
+	  _event(Common::EVENT_LBUTTONUP) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
+	line.toLowercase();
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (line.matchString("*_hotspot*", true)) {
@@ -56,6 +59,27 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 			sscanf(line.c_str(), "%*[^(](%25[^)])", nameBuffer);
 
 			_hoverCursor = Common::String(nameBuffer);
+		} else if (line.matchString("animation*", true)) {
+			// Not used
+		} else if (line.matchString("sound*", true)) {
+			// Not used
+		} else if (line.matchString("count_to*", true)) {
+			sscanf(line.c_str(), "%*[^(](%u)", &_countTo);
+		} else if (line.matchString("mouse_event*", true)) {
+			char nameBuffer[25];
+
+			sscanf(line.c_str(), "%*[^(](%25[^)])", nameBuffer);
+
+			Common::String evntStr(nameBuffer);
+			if (evntStr.equalsIgnoreCase("up")) {
+				_event = Common::EVENT_LBUTTONUP;
+			} else if (evntStr.equalsIgnoreCase("down")) {
+				_event = Common::EVENT_LBUTTONDOWN;
+			} else if (evntStr.equalsIgnoreCase("double")) {
+				// Not used
+			}
+		} else if (line.matchString("venus_id*", true)) {
+			// Not used
 		}
 
 		line = stream.readLine();
@@ -68,16 +92,35 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 }
 
 PushToggleControl::~PushToggleControl() {
-	// Clear the state value back to 0
-	_engine->getScriptManager()->setStateValue(_key, 0);
 }
 
 bool PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
+	if (_event != Common::EVENT_LBUTTONUP)
+		return false;
+
+	if (_hotspot.contains(backgroundImageSpacePos)) {
+		int32 val = _engine->getScriptManager()->getStateValue(_key);
+		val = (val + 1) % _countTo;
+		_engine->getScriptManager()->setStateValue(_key, val);
+		return true;
+	}
+	return false;
+}
+
+bool PushToggleControl::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_event != Common::EVENT_LBUTTONDOWN)
+		return false;
+
 	if (_hotspot.contains(backgroundImageSpacePos)) {
-		_engine->getScriptManager()->setStateValue(_key, 1);
+		int32 val = _engine->getScriptManager()->getStateValue(_key);
+		val = (val + 1) % _countTo;
+		_engine->getScriptManager()->setStateValue(_key, val);
 		return true;
 	}
 	return false;
diff --git a/engines/zvision/push_toggle_control.h b/engines/zvision/push_toggle_control.h
index 1de279aa08..17ff850e32 100644
--- a/engines/zvision/push_toggle_control.h
+++ b/engines/zvision/push_toggle_control.h
@@ -26,6 +26,7 @@
 #include "zvision/control.h"
 
 #include "common/rect.h"
+#include "common/events.h"
 
 
 namespace ZVision {
@@ -35,6 +36,13 @@ public:
 	PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
 	~PushToggleControl();
 
+	/**
+	 * Called when LeftMouse is pushed. Default is NOP.
+	 *
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 */
+	bool onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	/**
 	 * Called when LeftMouse is lifted. Calls ScriptManager::setStateValue(_key, 1);
 	 *
@@ -60,6 +68,10 @@ private:
 	Common::Rect _hotspot;
 	/** The cursor to use when hovering over _hotspot */
 	Common::String _hoverCursor;
+	/** Button maximal values count */
+	uint _countTo;
+
+	Common::EventType _event;
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 6210ead126ea81727e6a68398366c4cbe8da9e79 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 20:37:58 +0700
Subject: ZVISION: Fix wrong style.

---
 engines/zvision/actions.h                |   2 +-
 engines/zvision/cursor_manager.h         |  18 +++---
 engines/zvision/detection.h              |   6 +-
 engines/zvision/lever_control.h          |   4 +-
 engines/zvision/lzss_read_stream.h       |   2 +-
 engines/zvision/menu.cpp                 |  43 +++++--------
 engines/zvision/menu.h                   |  18 +++---
 engines/zvision/meta_animation.h         |   4 +-
 engines/zvision/music_node.cpp           |   3 +-
 engines/zvision/puzzle.h                 |  14 ++--
 engines/zvision/render_table.h           |   6 +-
 engines/zvision/rlf_animation.h          |   4 +-
 engines/zvision/save_manager.h           |   2 +-
 engines/zvision/script_manager.h         | 106 +++++++++++++++----------------
 engines/zvision/sidefx.h                 |  18 +++---
 engines/zvision/single_value_container.h |  18 +++---
 engines/zvision/string_manager.h         |   2 +-
 engines/zvision/zork_avi_decoder.h       |   2 +-
 engines/zvision/zvision.h                |  20 +++---
 19 files changed, 141 insertions(+), 151 deletions(-)

diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 5c6cf6c35f..f4a2c0f387 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -369,7 +369,7 @@ public:
 
 private:
 	enum {
-	    DIFFERENT_DIMENSIONS = 0x1 // 0x1 flags that the destRect dimensions are different from the original video dimensions
+		DIFFERENT_DIMENSIONS = 0x1 // 0x1 flags that the destRect dimensions are different from the original video dimensions
 	};
 
 	Common::String _fileName;
diff --git a/engines/zvision/cursor_manager.h b/engines/zvision/cursor_manager.h
index 7bd1c4240f..0521a17337 100644
--- a/engines/zvision/cursor_manager.h
+++ b/engines/zvision/cursor_manager.h
@@ -40,15 +40,15 @@ class ZVision;
  * Mostly usable cursors
  */
 enum CursorIndex {
-    CursorIndex_Active = 0,
-    CursorIndex_DownArr = 3,
-    CursorIndex_HandPu = 6,
-    CursorIndex_Idle = 11,
-    CursorIndex_Left = 12,
-    CursorIndex_Right = 13,
-    CursorIndex_UpArr = 17,
-    CursorIndex_ItemIdle = 18,
-    CursorIndex_ItemAct = 19
+	CursorIndex_Active = 0,
+	CursorIndex_DownArr = 3,
+	CursorIndex_HandPu = 6,
+	CursorIndex_Idle = 11,
+	CursorIndex_Left = 12,
+	CursorIndex_Right = 13,
+	CursorIndex_UpArr = 17,
+	CursorIndex_ItemIdle = 18,
+	CursorIndex_ItemAct = 19
 };
 
 /**
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index 1f430dac1c..34417601e8 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -29,9 +29,9 @@
 namespace ZVision {
 
 enum ZVisionGameId {
-    GID_NONE = 0,
-    GID_NEMESIS = 1,
-    GID_GRANDINQUISITOR = 2
+	GID_NONE = 0,
+	GID_NEMESIS = 1,
+	GID_GRANDINQUISITOR = 2
 };
 
 struct ZVisionGameDescription {
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 591d64e949..ac7ee8b5c7 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -55,8 +55,8 @@ private:
 	};
 
 	enum {
-	    ANGLE_DELTA = 30, // How far off a mouse angle can be and still be considered valid. This is in both directions, so the total buffer zone is (2 * ANGLE_DELTA)
-	    ANIMATION_FRAME_TIME = 30 // In millis
+		ANGLE_DELTA = 30, // How far off a mouse angle can be and still be considered valid. This is in both directions, so the total buffer zone is (2 * ANGLE_DELTA)
+		ANIMATION_FRAME_TIME = 30 // In millis
 	};
 
 private:
diff --git a/engines/zvision/lzss_read_stream.h b/engines/zvision/lzss_read_stream.h
index 1f7df9d4e0..73e848b9f6 100644
--- a/engines/zvision/lzss_read_stream.h
+++ b/engines/zvision/lzss_read_stream.h
@@ -45,7 +45,7 @@ public:
 
 private:
 	enum {
-	    BLOCK_SIZE = 0x1000
+		BLOCK_SIZE = 0x1000
 	};
 
 private:
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
index 8e1dea183b..bf422b300f 100644
--- a/engines/zvision/menu.cpp
+++ b/engines/zvision/menu.cpp
@@ -30,17 +30,17 @@
 namespace ZVision {
 
 enum {
-    SLOT_START_SLOT = 151,
-    SLOT_SPELL_1 = 191,
-    SLOT_USER_CHOSE_THIS_SPELL = 205,
-    SLOT_REVERSED_SPELLBOOK = 206
+	SLOT_START_SLOT = 151,
+	SLOT_SPELL_1 = 191,
+	SLOT_USER_CHOSE_THIS_SPELL = 205,
+	SLOT_REVERSED_SPELLBOOK = 206
 };
 
 enum {
-    menu_MAIN_SAVE = 0,
-    menu_MAIN_REST = 1,
-    menu_MAIN_PREF = 2,
-    menu_MAIN_EXIT = 3
+	menu_MAIN_SAVE = 0,
+	menu_MAIN_REST = 1,
+	menu_MAIN_PREF = 2,
+	menu_MAIN_EXIT = 3
 };
 
 menuHandler::menuHandler(ZVision *engine) {
@@ -264,8 +264,7 @@ void menuZgi::onMouseMove(const Common::Point &Pos) {
 			}
 			break;
 
-		case menu_MAIN:
-		{
+		case menu_MAIN: {
 			int last_item = mouse_on_item;
 			mouse_on_item = -1;
 
@@ -510,29 +509,25 @@ void menuZgi::process(uint32 deltatime) {
 		if (redraw) {
 			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
 
-			if (menu_bar_flag & menuBar_Exit)
-			{
+			if (menu_bar_flag & menuBar_Exit) {
 				if (mouse_on_item == menu_MAIN_EXIT)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
 			}
-			if (menu_bar_flag & menuBar_Settings)
-			{
+			if (menu_bar_flag & menuBar_Settings) {
 				if (mouse_on_item == menu_MAIN_PREF)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
 			}
-			if (menu_bar_flag & menuBar_Restore)
-			{
+			if (menu_bar_flag & menuBar_Restore) {
 				if (mouse_on_item == menu_MAIN_REST)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
 			}
-			if (menu_bar_flag & menuBar_Save)
-			{
+			if (menu_bar_flag & menuBar_Save) {
 				if (mouse_on_item == menu_MAIN_SAVE)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
 				else
@@ -698,8 +693,7 @@ void menuNem::onMouseMove(const Common::Point &Pos) {
 
 void menuNem::process(uint32 deltatime) {
 	if (inmenu) {
-		if (!scrolled)
-		{
+		if (!scrolled) {
 			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
 
 			if (scrl == 0)
@@ -709,8 +703,7 @@ void menuNem::process(uint32 deltatime) {
 			redraw = true;
 		}
 
-		if (scrollPos >= 0)
-		{
+		if (scrollPos >= 0) {
 			scrolled = true;
 			scrollPos = 0;
 		}
@@ -747,8 +740,7 @@ void menuNem::process(uint32 deltatime) {
 		}
 	} else {
 		scrolled = false;
-		if (scrollPos > -32)
-		{
+		if (scrollPos > -32) {
 			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
 
 			if (scrl == 0)
@@ -759,8 +751,7 @@ void menuNem::process(uint32 deltatime) {
 
 			scrollPos -= scrl;
 			redraw = true;
-		}
-		else
+		} else
 			scrollPos = -32;
 
 		if (redraw) {
diff --git a/engines/zvision/menu.h b/engines/zvision/menu.h
index 35e7347a3b..c5938cdc3d 100644
--- a/engines/zvision/menu.h
+++ b/engines/zvision/menu.h
@@ -32,12 +32,12 @@
 namespace ZVision {
 
 enum menuBar {
-    menuBar_Exit = 0x1,
-    menuBar_Settings = 0x2,
-    menuBar_Restore = 0x4,
-    menuBar_Save = 0x8,
-    menuBar_Items = 0x100,
-    menuBar_Magic = 0x200
+	menuBar_Exit = 0x1,
+	menuBar_Settings = 0x2,
+	menuBar_Restore = 0x4,
+	menuBar_Save = 0x8,
+	menuBar_Items = 0x100,
+	menuBar_Magic = 0x200
 };
 
 class menuHandler {
@@ -80,9 +80,9 @@ private:
 	float scrollPos[3];
 
 	enum {
-	    menu_ITEM = 0,
-	    menu_MAGIC = 1,
-	    menu_MAIN = 2
+		menu_ITEM = 0,
+		menu_MAGIC = 1,
+		menu_MAIN = 2
 	};
 
 	bool clean;
diff --git a/engines/zvision/meta_animation.h b/engines/zvision/meta_animation.h
index e259955891..3754aae058 100644
--- a/engines/zvision/meta_animation.h
+++ b/engines/zvision/meta_animation.h
@@ -64,8 +64,8 @@ public:
 
 private:
 	enum FileType {
-	    RLF = 1,
-	    AVI = 2
+		RLF = 1,
+		AVI = 2
 	};
 
 private:
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index d47a796382..31d222aead 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -109,8 +109,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 					deltaTimeInMillis = _crossfade_time;
 				_newvol += floor(((float)(_crossfade_target - _newvol) / (float)_crossfade_time)) * (float)deltaTimeInMillis;
 				_crossfade_time -= deltaTimeInMillis;
-			}
-			else {
+			} else {
 				_crossfade = false;
 				_newvol = _crossfade_target;
 			}
diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index c02f60c8f0..e06b087aca 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -42,10 +42,10 @@ struct Puzzle {
 
 	/** How criteria should be decided */
 	enum CriteriaOperator {
-	    EQUAL_TO,
-	    NOT_EQUAL_TO,
-	    GREATER_THAN,
-	    LESS_THAN
+		EQUAL_TO,
+		NOT_EQUAL_TO,
+		GREATER_THAN,
+		LESS_THAN
 	};
 
 	/** Criteria for a Puzzle result to be fired */
@@ -64,9 +64,9 @@ struct Puzzle {
 	};
 
 	enum StateFlags {
-	    ONCE_PER_INST = 0x01,
-	    DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
-	    DISABLED = 0x04
+		ONCE_PER_INST = 0x01,
+		DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
+		DISABLED = 0x04
 	};
 
 	uint32 key;
diff --git a/engines/zvision/render_table.h b/engines/zvision/render_table.h
index db9ab08f7c..86afd1fff9 100644
--- a/engines/zvision/render_table.h
+++ b/engines/zvision/render_table.h
@@ -36,9 +36,9 @@ public:
 
 public:
 	enum RenderState {
-	    PANORAMA,
-	    TILT,
-	    FLAT
+		PANORAMA,
+		TILT,
+		FLAT
 	};
 
 private:
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index 3764465786..bc5fdc5d90 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -42,8 +42,8 @@ public:
 
 private:
 	enum EncodingType {
-	    Masked,
-	    Simple
+		Masked,
+		Simple
 	};
 
 	struct Frame {
diff --git a/engines/zvision/save_manager.h b/engines/zvision/save_manager.h
index 9de1c51900..ec80b37e20 100644
--- a/engines/zvision/save_manager.h
+++ b/engines/zvision/save_manager.h
@@ -54,7 +54,7 @@ private:
 	static const uint32 SAVEGAME_ID;
 
 	enum {
-	    SAVE_VERSION = 1
+		SAVE_VERSION = 1
 	};
 
 public:
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 3e671aa3db..2f585b6291 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -41,59 +41,59 @@ namespace ZVision {
 class ZVision;
 
 enum StateKey {
-    StateKey_World = 3,
-    StateKey_Room  = 4,
-    StateKey_Node  = 5,
-    StateKey_View  = 6,
-    StateKey_ViewPos = 7,
-    StateKey_KeyPress = 8,
-    StateKey_InventoryItem = 9,
-    StateKey_LMouse = 10,
-    StateKey_NotSet = 11, // This key doesn't set
-    StateKey_Rounds = 12,
-    StateKey_Venus = 13,
-    StateKey_RMouse = 18,
-    StateKey_MenuState = 19,
-    StateKey_RestoreFlag = 20,
-    StateKey_Quitting = 39,
-    StateKey_LastWorld = 40,
-    StateKey_LastRoom = 41,
-    StateKey_LastNode = 42,
-    StateKey_LastView = 43,
-    StateKey_LastViewPos = 44,
-    StateKey_Menu_LastWorld = 45,
-    StateKey_Menu_LastRoom = 46,
-    StateKey_Menu_LastNode = 47,
-    StateKey_Menu_LastView = 48,
-    StateKey_Menu_LastViewPos = 49,
-    StateKey_KbdRotateSpeed = 50,
-    StateKey_Subtitles = 51,
-    StateKey_StreamSkipKey = 52,
-    StateKey_RotateSpeed = 53,
-    StateKey_Volume = 56,
-    StateKey_Qsound = 57,
-    StateKey_VenusEnable = 58,
-    StateKey_HighQuality = 59,
-    StateKey_VideoLineSkip = 65,
-    StateKey_Platform = 66,
-    StateKey_InstallLevel = 67,
-    StateKey_CountryCode = 68,
-    StateKey_CPU = 69,
-    StateKey_MovieCursor = 70,
-    StateKey_NoTurnAnim = 71,
-    StateKey_WIN958 = 72,
-    StateKey_ShowErrorDlg = 73,
-    StateKey_DebugCheats = 74,
-    StateKey_JapanFonts = 75,
-    StateKey_Brightness = 77,
-    StateKey_EF9_B = 91,
-    StateKey_EF9_G = 92,
-    StateKey_EF9_R = 93,
-    StateKey_EF9_Speed = 94,
-    StateKey_Inv_Cnt_Slot = 100,
-    StateKey_Inv_1_Slot = 101,
-    StateKey_Inv_49_Slot = 149,
-    StateKey_Inv_TotalSlots = 150
+	StateKey_World = 3,
+	StateKey_Room  = 4,
+	StateKey_Node  = 5,
+	StateKey_View  = 6,
+	StateKey_ViewPos = 7,
+	StateKey_KeyPress = 8,
+	StateKey_InventoryItem = 9,
+	StateKey_LMouse = 10,
+	StateKey_NotSet = 11, // This key doesn't set
+	StateKey_Rounds = 12,
+	StateKey_Venus = 13,
+	StateKey_RMouse = 18,
+	StateKey_MenuState = 19,
+	StateKey_RestoreFlag = 20,
+	StateKey_Quitting = 39,
+	StateKey_LastWorld = 40,
+	StateKey_LastRoom = 41,
+	StateKey_LastNode = 42,
+	StateKey_LastView = 43,
+	StateKey_LastViewPos = 44,
+	StateKey_Menu_LastWorld = 45,
+	StateKey_Menu_LastRoom = 46,
+	StateKey_Menu_LastNode = 47,
+	StateKey_Menu_LastView = 48,
+	StateKey_Menu_LastViewPos = 49,
+	StateKey_KbdRotateSpeed = 50,
+	StateKey_Subtitles = 51,
+	StateKey_StreamSkipKey = 52,
+	StateKey_RotateSpeed = 53,
+	StateKey_Volume = 56,
+	StateKey_Qsound = 57,
+	StateKey_VenusEnable = 58,
+	StateKey_HighQuality = 59,
+	StateKey_VideoLineSkip = 65,
+	StateKey_Platform = 66,
+	StateKey_InstallLevel = 67,
+	StateKey_CountryCode = 68,
+	StateKey_CPU = 69,
+	StateKey_MovieCursor = 70,
+	StateKey_NoTurnAnim = 71,
+	StateKey_WIN958 = 72,
+	StateKey_ShowErrorDlg = 73,
+	StateKey_DebugCheats = 74,
+	StateKey_JapanFonts = 75,
+	StateKey_Brightness = 77,
+	StateKey_EF9_B = 91,
+	StateKey_EF9_G = 92,
+	StateKey_EF9_R = 93,
+	StateKey_EF9_Speed = 94,
+	StateKey_Inv_Cnt_Slot = 100,
+	StateKey_Inv_1_Slot = 101,
+	StateKey_Inv_49_Slot = 149,
+	StateKey_Inv_TotalSlots = 150
 };
 
 struct Location {
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index 210d98effb..2c53467559 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -37,15 +37,15 @@ class SideFX {
 public:
 
 	enum SideFXType {
-	    SIDEFX_ANIM  = 1,
-	    SIDEFX_AUDIO = 2,
-	    SIDEFX_DISTORT = 4,
-	    SIDEFX_PANTRACK = 8,
-	    SIDEFX_REGION = 16,
-	    SIDEFX_TIMER = 32,
-	    SIDEFX_TTYTXT = 64,
-	    SIDEFX_UNK = 128,
-	    SIDEFX_ALL = 255
+		SIDEFX_ANIM  = 1,
+		SIDEFX_AUDIO = 2,
+		SIDEFX_DISTORT = 4,
+		SIDEFX_PANTRACK = 8,
+		SIDEFX_REGION = 16,
+		SIDEFX_TIMER = 32,
+		SIDEFX_TTYTXT = 64,
+		SIDEFX_UNK = 128,
+		SIDEFX_ALL = 255
 	};
 
 	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
diff --git a/engines/zvision/single_value_container.h b/engines/zvision/single_value_container.h
index 33fe69d760..32b4d6c6dc 100644
--- a/engines/zvision/single_value_container.h
+++ b/engines/zvision/single_value_container.h
@@ -36,15 +36,15 @@ namespace ZVision {
 class SingleValueContainer {
 public:
 	enum ValueType {
-	    BOOL,
-	    BYTE,
-	    INT16,
-	    UINT16,
-	    INT32,
-	    UINT32,
-	    FLOAT,
-	    DOUBLE,
-	    STRING
+		BOOL,
+		BYTE,
+		INT16,
+		UINT16,
+		INT32,
+		UINT32,
+		FLOAT,
+		DOUBLE,
+		STRING
 	};
 
 	// Constructors
diff --git a/engines/zvision/string_manager.h b/engines/zvision/string_manager.h
index a6ae6d20d6..9cfed5261b 100644
--- a/engines/zvision/string_manager.h
+++ b/engines/zvision/string_manager.h
@@ -59,7 +59,7 @@ private:
 	};
 
 	enum {
-	    NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
+		NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
 	};
 
 private:
diff --git a/engines/zvision/zork_avi_decoder.h b/engines/zvision/zork_avi_decoder.h
index 7ddecce694..d8937ac057 100644
--- a/engines/zvision/zork_avi_decoder.h
+++ b/engines/zvision/zork_avi_decoder.h
@@ -61,7 +61,7 @@ private:
 private:
 	// Audio Codecs
 	enum {
-	    kWaveFormatZorkPCM = 17 // special Zork PCM audio format (clashes with MS IMA ADPCM)
+		kWaveFormatZorkPCM = 17 // special Zork PCM audio format (clashes with MS IMA ADPCM)
 	};
 };
 
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index c9e14e8651..983d5a56eb 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -70,19 +70,19 @@ public:
 
 private:
 	enum {
-	    WINDOW_WIDTH = 640,
-	    WINDOW_HEIGHT = 480,
+		WINDOW_WIDTH = 640,
+		WINDOW_HEIGHT = 480,
 
-	    //Zork nemesis working window sizes
-	    ZNM_WORKING_WINDOW_WIDTH  = 512,
-	    ZNM_WORKING_WINDOW_HEIGHT = 320,
+		//Zork nemesis working window sizes
+		ZNM_WORKING_WINDOW_WIDTH  = 512,
+		ZNM_WORKING_WINDOW_HEIGHT = 320,
 
-	    //ZGI(and default) working window sizes
-	    WORKING_WINDOW_WIDTH  = 640,
-	    WORKING_WINDOW_HEIGHT = 344,
+		//ZGI(and default) working window sizes
+		WORKING_WINDOW_WIDTH  = 640,
+		WORKING_WINDOW_HEIGHT = 344,
 
-	    ROTATION_SCREEN_EDGE_OFFSET = 60,
-	    MAX_ROTATION_SPEED = 400 // Pixels per second
+		ROTATION_SCREEN_EDGE_OFFSET = 60,
+		MAX_ROTATION_SPEED = 400 // Pixels per second
 	};
 
 	Console *_console;
-- 
cgit v1.2.3


From 226ccb0de7ed702d4b41625c8a2211fac9cc0787 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 20:40:20 +0700
Subject: ZVISION: Don't add new timer if sidefx with same key exist

---
 engines/zvision/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 7b9050f47a..c3f85fe247 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -607,6 +607,8 @@ ActionTimer::~ActionTimer() {
 }
 
 bool ActionTimer::execute() {
+	if (_engine->getScriptManager()->getSideFX(_slotkey))
+		return true;
 	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _slotkey, _time->getValue()));
 	return true;
 }
-- 
cgit v1.2.3


From dcfe35c8ac1cd2c9139f5d7a59f0f554e3c5082b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 20:44:22 +0700
Subject: ZVISION: Implement sTTFont class for handle ttf with styles.

---
 engines/zvision/truetype_font.cpp | 226 ++++++++++++++++++++++++++++++++++++++
 engines/zvision/truetype_font.h   |  42 +++++++
 2 files changed, 268 insertions(+)

diff --git a/engines/zvision/truetype_font.cpp b/engines/zvision/truetype_font.cpp
index dde3b2dee5..5e1bc7a81d 100644
--- a/engines/zvision/truetype_font.cpp
+++ b/engines/zvision/truetype_font.cpp
@@ -27,9 +27,11 @@
 #include "zvision/zvision.h"
 #include "zvision/render_manager.h"
 
+#include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/system.h"
+#include "common/unzip.h"
 
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
@@ -113,4 +115,228 @@ Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, u
 	return surface;
 }
 
+sTTFont::sTTFont(ZVision *engine) {
+	_engine = engine;
+	_style = 0;
+	_font = NULL;
+	_lineHeight = 0;
+}
+
+sTTFont::~sTTFont() {
+	if (_font)
+		delete _font;
+}
+
+bool sTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
+	_style = style;
+	return loadFont(fontName, point);
+}
+
+bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
+	Common::String newFontName;
+	if (fontName.matchString("*times new roman*", true) || fontName.matchString("*times*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "timesbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "timesbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "timesi.ttf";
+		else
+			newFontName = "times.ttf";
+
+	} else if (fontName.matchString("*courier new*", true) || fontName.matchString("*courier*", true) || fontName.matchString("*ZorkDeath*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "courbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "courbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "couri.ttf";
+		else
+			newFontName = "cour.ttf";
+
+	} else if (fontName.matchString("*century schoolbook*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "censcbkbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "censcbkbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "censcbki.ttf";
+		else
+			newFontName = "censcbk.ttf";
+
+	} else if (fontName.matchString("*garamond*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "garabi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "garabd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "garai.ttf";
+		else
+			newFontName = "gara.ttf";
+
+	} else if (fontName.matchString("*arial*", true) || fontName.matchString("*ZorkNormal*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "arialbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "arialbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "ariali.ttf";
+		else
+			newFontName = "arial.ttf";
+
+	} else {
+		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
+		newFontName = "arial.ttf";
+	}
+
+	Common::File *file = _engine->getSearchManager()->openFile(newFontName);
+
+	if (!file) {
+		Common::SeekableReadStream *themeFile = nullptr;
+		if (ConfMan.hasKey("themepath")) {
+			Common::FSNode themePath(ConfMan.get("themepath"));
+			if (themePath.exists()) {
+				Common::FSNode scummModern = themePath.getChild("scummmodern.zip");
+				if (scummModern.exists()) {
+					themeFile = scummModern.createReadStream();
+				}
+			}
+		}
+		if (!themeFile) { // Fallback 2.5: Search for ScummModern.zip in SearchMan.
+			themeFile = SearchMan.createReadStreamForMember("scummmodern.zip");
+		}
+		if (themeFile) {
+			Common::Archive *themeArchive = Common::makeZipArchive(themeFile);
+			if (themeArchive->hasFile("FreeSans.ttf")) {
+				Common::SeekableReadStream *stream = nullptr;
+				stream = themeArchive->createReadStreamForMember("FreeSans.ttf");
+				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60); // 66 dpi for 640 x 480 on 14" display
+				if (_newFont) {
+					if (!_font)
+						delete _font;
+					_font = _newFont;
+				}
+				if (stream)
+					delete stream;
+			}
+			delete themeArchive;
+			themeArchive = nullptr;
+		}
+	} else {
+		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60); // 66 dpi for 640 x 480 on 14" display
+		if (_newFont) {
+			if (!_font)
+				delete _font;
+			_font = _newFont;
+		}
+		delete file;
+	}
+
+	_fntName = fontName;
+	_lineHeight = point;
+
+	if (_font)
+		return true;
+	return false;
+}
+
+void sTTFont::setStyle(uint newStyle) {
+	if ((_style & (STTF_BOLD | STTF_ITALIC)) != (newStyle & (STTF_BOLD | STTF_ITALIC))) {
+		_style = newStyle;
+		loadFont(_fntName, _lineHeight);
+	} else {
+		_style = newStyle;
+	}
+}
+
+int sTTFont::getFontHeight() {
+	if (_font)
+		return _font->getFontHeight();
+	return 0;
+}
+
+int sTTFont::getMaxCharWidth() {
+	if (_font)
+		return _font->getMaxCharWidth();
+	return 0;
+}
+
+int sTTFont::getCharWidth(byte chr) {
+	if (_font)
+		return _font->getCharWidth(chr);
+	return 0;
+}
+
+int sTTFont::getKerningOffset(byte left, byte right) {
+	if (_font)
+		return _font->getKerningOffset(left, right);
+	return 0;
+}
+
+void sTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
+	if (_font) {
+		_font->drawChar(dst, chr, x, y, color);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+	}
+}
+
+void sTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
+	if (_font) {
+		_font->drawString(dst, str, x, y, w, color, align);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+	}
+}
+
+int sTTFont::getStringWidth(const Common::String &str) {
+	if (_font)
+		return _font->getStringWidth(str);
+	return 0;
+}
+
+Graphics::Surface *sTTFont::renderSolidText(const Common::String &str, uint32 color) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	if (_font) {
+		int16 w = _font->getStringWidth(str);
+		if (w && w < 1024) {
+			tmp->create(w, _font->getFontHeight(), _engine->_pixelFormat);
+			drawString(tmp, str, 0, 0, w, color);
+		}
+	}
+	return tmp;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/truetype_font.h b/engines/zvision/truetype_font.h
index 762657a5fb..0462f35aff 100644
--- a/engines/zvision/truetype_font.h
+++ b/engines/zvision/truetype_font.h
@@ -76,6 +76,48 @@ public:
 	Graphics::Surface *drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap);
 };
 
+// Styled TTF
+class sTTFont {
+public:
+	sTTFont(ZVision *engine);
+	~sTTFont();
+
+	enum {
+		STTF_BOLD = 1,
+		STTF_ITALIC = 2,
+		STTF_UNDERLINE = 4,
+		STTF_STRIKEOUT = 8
+	};
+
+private:
+	ZVision *_engine;
+	Graphics::Font *_font;
+	int _lineHeight;
+	uint _style;
+	Common::String _fntName;
+
+public:
+	bool loadFont(const Common::String &fontName, int32 point);
+	bool loadFont(const Common::String &fontName, int32 point, uint style);
+	void setStyle(uint newStyle);
+
+	int getFontHeight();
+	int getMaxCharWidth();
+	int getCharWidth(byte chr);
+	int getKerningOffset(byte left, byte right);
+
+	void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color);
+
+	void drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align = Graphics::kTextAlignLeft);
+	int getStringWidth(const Common::String &str);
+
+	Graphics::Surface *renderSolidText(const Common::String &str, uint32 color);
+
+	bool isLoaded() {
+		return _font != NULL;
+	};
+};
+
 } // End of namespace ZVision
 
 #endif
-- 
cgit v1.2.3


From cf08849147905ffd12cd9571b617033ded5a95fb Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 22:31:06 +0700
Subject: ZVISION: Implement textRender with tags parser.

---
 engines/zvision/module.mk   |   3 +-
 engines/zvision/text.cpp    | 512 ++++++++++++++++++++++++++++++++++++++++++++
 engines/zvision/text.h      |  97 +++++++++
 engines/zvision/zvision.cpp |   3 +
 engines/zvision/zvision.h   |   5 +
 5 files changed, 619 insertions(+), 1 deletion(-)
 create mode 100644 engines/zvision/text.cpp
 create mode 100644 engines/zvision/text.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index b8dca9e63a..ea70b4b831 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -36,7 +36,8 @@ MODULE_OBJS := \
 	slot_control.o \
 	menu.o \
 	meta_animation.o \
-	search_manager.o
+	search_manager.o \
+	text.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/text.cpp b/engines/zvision/text.cpp
new file mode 100644
index 0000000000..575ca03d10
--- /dev/null
+++ b/engines/zvision/text.cpp
@@ -0,0 +1,512 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/text.h"
+
+#include "zvision/truetype_font.h"
+
+#include "common/file.h"
+#include "common/tokenizer.h"
+#include "common/debug.h"
+#include "common/rect.h"
+
+#include "graphics/fontman.h"
+#include "graphics/colormasks.h"
+#include "graphics/surface.h"
+#include "graphics/font.h"
+#include "graphics/fonts/ttf.h"
+
+#include "zvision/render_manager.h"
+#include "zvision/script_manager.h"
+
+
+namespace ZVision {
+
+cTxtStyle::cTxtStyle() {
+	fontname = "Arial";
+	blue = 255;
+	green = 255;
+	red = 255;
+	bold = false;
+	escapement = 0;
+	italic = false;
+	justify = TXT_JUSTIFY_LEFT;
+	newline = false;
+	size = 12;
+	skipcolor = false;
+	strikeout = false;
+	underline = false;
+	statebox = 0;
+}
+
+txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
+	Common::String buf = Common::String(strin.c_str(), ln);
+
+	int8 retval = TXT_RET_NOTHING;
+
+	Common::StringTokenizer tokenizer(buf, " ");
+	Common::String token;
+
+	while (!tokenizer.empty()) {
+		token = tokenizer.nextToken();
+
+		if (token.matchString("font", true)) {
+			token = tokenizer.nextToken();
+			if (token[0] == '"') {
+				Common::String _tmp = Common::String(token.c_str() + 1);
+
+				while (token.lastChar() != '"' && !tokenizer.empty()) {
+					token = tokenizer.nextToken();
+					_tmp += " " + token;
+				}
+
+				if (_tmp.lastChar() == '"')
+					_tmp.deleteLastChar();
+
+				fontname = _tmp;
+			} else {
+				if (!tokenizer.empty())
+					fontname = token;
+			}
+			retval |= TXT_RET_FNTCHG;
+
+		} else if (token.matchString("blue", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (blue != tmp) {
+					blue = tmp;
+					retval |= TXT_RET_FNTSTL;
+				}
+			}
+		} else if (token.matchString("red", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (red != tmp) {
+					red = tmp;
+					retval |= TXT_RET_FNTSTL;
+				}
+			}
+		} else if (token.matchString("green", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (green != tmp) {
+					green = tmp;
+					retval |= TXT_RET_FNTSTL;
+				}
+			}
+		} else if (token.matchString("newline", true)) {
+			if ((retval & TXT_RET_NEWLN) == 0)
+				newline = 0;
+
+			newline++;
+			retval |= TXT_RET_NEWLN;
+		} else if (token.matchString("point", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (size != tmp) {
+					size = tmp;
+					retval |= TXT_RET_FNTCHG;
+				}
+			}
+		} else if (token.matchString("escapement", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				escapement = tmp;
+			}
+		} else if (token.matchString("italic", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (italic != true) {
+						italic = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (italic != false) {
+						italic = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("underline", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (underline != true) {
+						underline = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (underline != false) {
+						underline = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("strikeout", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (strikeout != true) {
+						strikeout = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (strikeout != false) {
+						strikeout = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("bold", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (bold != true) {
+						bold = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (bold != false) {
+						bold = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("skipcolor", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					skipcolor = true;
+				} else if (token.matchString("off", true)) {
+					skipcolor = false;
+				}
+			}
+		} else if (token.matchString("image", true)) {
+			// Not used
+		} else if (token.matchString("statebox", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				statebox = atoi(token.c_str());
+				retval |= TXT_RET_HASSTBOX;
+			}
+		} else if (token.matchString("justify", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("center", true))
+					justify = TXT_JUSTIFY_CENTER;
+				else if (token.matchString("left", true))
+					justify = TXT_JUSTIFY_LEFT;
+				else if (token.matchString("right", true))
+					justify = TXT_JUSTIFY_RIGHT;
+			}
+		}
+	}
+	return (txtReturn)retval;
+}
+
+void cTxtStyle::readAllStyle(const Common::String &txt) {
+	int16 strt = -1;
+	int16 endt = -1;
+
+	for (uint16 i = 0; i < txt.size(); i++) {
+		if (txt[i] == '<')
+			strt = i;
+		else if (txt[i] == '>') {
+			endt = i;
+			if (strt != -1)
+				if ((endt - strt - 1) > 0)
+					parseStyle(Common::String(txt.c_str() + strt + 1), endt - strt - 1);
+		}
+
+	}
+}
+
+void cTxtStyle::setFontStyle(sTTFont &font) {
+	uint temp_stl = 0;
+
+	if (bold)
+		temp_stl |= sTTFont::STTF_BOLD;
+
+	if (italic)
+		temp_stl |= sTTFont::STTF_ITALIC;
+
+	if (underline)
+		temp_stl |= sTTFont::STTF_UNDERLINE;
+
+	if (strikeout)
+		temp_stl |= sTTFont::STTF_STRIKEOUT;
+
+	font.setStyle(temp_stl);
+}
+
+void cTxtStyle::setFont(sTTFont &font) {
+	uint temp_stl = 0;
+
+	if (bold)
+		temp_stl |= sTTFont::STTF_BOLD;
+
+	if (italic)
+		temp_stl |= sTTFont::STTF_ITALIC;
+
+	if (underline)
+		temp_stl |= sTTFont::STTF_UNDERLINE;
+
+	if (strikeout)
+		temp_stl |= sTTFont::STTF_STRIKEOUT;
+
+	font.loadFont(fontname, size, temp_stl);
+}
+
+Graphics::Surface *textRenderer::render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
+	style.setFontStyle(fnt);
+	uint32 clr = _engine->_pixelFormat.RGBToColor(style.red, style.green, style.blue);
+	return fnt.renderSolidText(txt, clr);
+}
+
+void textRenderer::drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify) {
+	if (justify == TXT_JUSTIFY_LEFT)
+		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignLeft);
+	else if (justify == TXT_JUSTIFY_CENTER)
+		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignCenter);
+	else if (justify == TXT_JUSTIFY_RIGHT)
+		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignRight);
+}
+
+int32 textRenderer::drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst) {
+	sTTFont font(_engine);
+	fnt_stl.setFont(font);
+
+	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
+
+	uint32 clr = _engine->_pixelFormat.RGBToColor(fnt_stl.red, fnt_stl.green, fnt_stl.blue);
+
+	int16 w;
+
+	w = font.getStringWidth(txt);
+
+	drawTxtWithJustify(txt, font, clr, dst, fnt_stl.size, fnt_stl.justify);
+
+	return w;
+}
+
+void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surface &dst) {
+	const int16 TXT_CFG_TEXTURES_LINES = 256; // For now I don't want remake it
+	const int TXT_CFG_TEXTURES_PER_LINE = 6;
+	cTxtStyle style, style2;
+	int16 strt = -1;
+	int16 endt = -1;
+	int16 i = 0;
+	int16 dx = 0, dy = 0;
+	int16 txt_w;
+	int16 txtpos = 0;
+	Common::String buf;
+	Common::String buf2;
+
+	Graphics::Surface *TxtSurfaces[TXT_CFG_TEXTURES_LINES][TXT_CFG_TEXTURES_PER_LINE];
+	int16 currentline = 0, currentlineitm = 0;
+
+	int TxtJustify[TXT_CFG_TEXTURES_LINES];
+	int TxtPoint[TXT_CFG_TEXTURES_LINES];
+
+	for (int16 k = 0; k < TXT_CFG_TEXTURES_LINES; k++) {
+		TxtPoint[k] = 0;
+		for (int j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
+			TxtSurfaces[k][j] = NULL;
+	}
+
+	int16 stringlen = text.size();
+
+	sTTFont font(_engine);
+
+	style.setFont(font);
+
+	int16 prevbufspace = 0, prevtxtspace = 0;
+
+	while (i < stringlen) {
+		TxtJustify[currentline] = style.justify;
+		if (text[i] == '<') {
+			int16 ret = 0;
+
+			strt = i;
+			while (i < stringlen && text[i] != '>')
+				i++;
+			endt = i;
+			if (strt != -1)
+				if ((endt - strt - 1) > 0) {
+					style2 = style;
+					ret = style.parseStyle(Common::String(text.c_str() + strt + 1), endt - strt - 1);
+				}
+
+			if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
+				if (buf.size() > 0) {
+					txt_w = font.getStringWidth(buf);
+
+					TxtSurfaces[currentline][currentlineitm] = render(font, buf, style2);
+					TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+
+					currentlineitm++;
+
+					buf.clear();
+					prevbufspace = 0;
+					txtpos = 0;
+					dx += txt_w;
+
+				}
+				if (ret & TXT_RET_FNTCHG) {
+					style.setFont(font);
+				}
+				if (ret & TXT_RET_FNTSTL)
+					style.setFontStyle(font);
+
+				if (ret & TXT_RET_NEWLN) {
+					currentline++;
+					currentlineitm = 0;
+					dx = 0;
+				}
+			}
+
+			if (ret & TXT_RET_HASSTBOX) {
+				Common::String buf3;
+				buf3.format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
+				buf += buf3;
+				txtpos += buf3.size();
+			}
+
+		} else {
+
+			buf += text[i];
+			txtpos++;
+
+			if (text[i] == ' ') {
+				prevbufspace = txtpos - 1;
+				prevtxtspace = i;
+			}
+
+			if (font.isLoaded()) {
+				txt_w = font.getStringWidth(buf);
+				if (txt_w + dx > dst.w) {
+					if (prevbufspace == 0) {
+						prevtxtspace = i;
+						prevbufspace = txtpos - 1;
+					}
+					buf2 = Common::String(buf.c_str(), prevbufspace + 1);
+
+					if (buf2.size() > 0) {
+						TxtSurfaces[currentline][currentlineitm] = render(font, buf2, style);
+						TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+					}
+
+					buf.clear();
+					i = prevtxtspace;
+					prevbufspace = 0;
+					txtpos = 0;
+					currentline++;
+					currentlineitm = 0;
+					dx = 0;
+				}
+			}
+		}
+		i++;
+	}
+
+	if (buf.size() > 0) {
+		TxtSurfaces[currentline][currentlineitm] = render(font, buf, style);
+		TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+	}
+
+	dy = 0;
+	for (i = 0; i <= currentline; i++) {
+		int16 j = 0;
+		int16 width = 0;
+		while (TxtSurfaces[i][j] != NULL) {
+			width += TxtSurfaces[i][j]->w;
+			j++;
+		}
+		dx = 0;
+		for (int32_t jj = 0; jj < j; jj++) {
+			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+
+			else if (TxtJustify[i] == TXT_JUSTIFY_CENTER)
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, ((dst.w - width) / 2) + dx,  dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+
+			else if (TxtJustify[i] == TXT_JUSTIFY_RIGHT)
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dst.w - width + dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+
+			dx += TxtSurfaces[i][jj]->w;
+		}
+
+		dy += TxtPoint[i];
+	}
+
+	for (i = 0; i < TXT_CFG_TEXTURES_LINES; i++)
+		for (int32_t j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
+			if (TxtSurfaces[i][j] != NULL) {
+				TxtSurfaces[i][j]->free();
+				delete TxtSurfaces[i][j];
+			}
+}
+
+Common::String readWideLine(Common::SeekableReadStream &stream) {
+	Common::String asciiString;
+
+	while (!stream.eos()) {
+		uint32 value = stream.readUint16LE();
+		// Check for CRLF
+		if (value == 0x0A0D) {
+			// Read in the extra NULL char
+			stream.readByte(); // \0
+			// End of the line. Break
+			break;
+		}
+
+		// Crush each octet pair to a single octet with a simple cast
+		if (value < 0x80) {
+			asciiString += (char)(value & 0x7F);
+		} else if (value >= 0x80 && value < 0x800) {
+			asciiString += (char)(0xC0 | ((value >> 6) & 0x1F));
+			asciiString += (char)(0x80 | (value & 0x3F));
+		} else if (value >= 0x800 && value < 0x10000) {
+			asciiString += (char)(0xE0 | ((value >> 12) & 0xF));
+			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
+			asciiString += (char)(0x80 | (value & 0x3F));
+		} else if (value >= 0x10000 && value < 0x200000) {
+			asciiString += (char)(0xF0);
+			asciiString += (char)(0x80 | ((value >> 12) & 0x3F));
+			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
+			asciiString += (char)(0x80 | (value & 0x3F));
+		}
+	}
+
+	return asciiString;
+}
+
+
+} // End of namespace ZVision
diff --git a/engines/zvision/text.h b/engines/zvision/text.h
new file mode 100644
index 0000000000..40244f7f0c
--- /dev/null
+++ b/engines/zvision/text.h
@@ -0,0 +1,97 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ */
+
+#ifndef ZVISION_TEXT_H
+#define ZVISION_TEXT_H
+
+#include "zvision/detection.h"
+#include "zvision/truetype_font.h"
+#include "zvision/zvision.h"
+
+
+namespace Graphics {
+class FontManager;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+enum txtJustify {
+	TXT_JUSTIFY_CENTER = 0,
+	TXT_JUSTIFY_LEFT = 1,
+	TXT_JUSTIFY_RIGHT = 2
+};
+
+enum txtReturn {
+	TXT_RET_NOTHING = 0x0,
+	TXT_RET_FNTCHG = 0x1,
+	TXT_RET_FNTSTL = 0x2,
+	TXT_RET_NEWLN = 0x4,
+	TXT_RET_HASSTBOX = 0x8
+};
+
+class cTxtStyle {
+public:
+	cTxtStyle();
+	txtReturn parseStyle(const Common::String &strin, int16 len);
+	void readAllStyle(const Common::String &txt);
+	void setFontStyle(sTTFont &font);
+	void setFont(sTTFont &font);
+
+public:
+	Common::String fontname;
+	txtJustify justify;  // 0 - center, 1-left, 2-right
+	int16 size;
+	uint8 red;     // 0-255
+	uint8 green;   // 0-255
+	uint8 blue;    // 0-255
+	int8 newline;
+	int8 escapement;
+	bool italic;
+	bool bold;
+	bool underline;
+	bool strikeout;
+	bool skipcolor;
+	int32 statebox;
+	// char image ??
+};
+
+class textRenderer {
+public:
+	textRenderer(ZVision *engine): _engine(engine) {};
+
+	void drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify);
+	int32 drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst);
+	Graphics::Surface *render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style);
+	void drawTxtInOneLine(const Common::String &txt, Graphics::Surface &dst);
+
+private:
+	ZVision *_engine;
+};
+
+Common::String readWideLine(Common::SeekableReadStream &stream);
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index bf945f859a..178c7978ae 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -34,6 +34,7 @@
 #include "zvision/detection.h"
 #include "zvision/menu.h"
 #include "zvision/search_manager.h"
+#include "zvision/text.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
@@ -93,6 +94,7 @@ void ZVision::initialize() {
 
 	_searchManager = new sManager(ConfMan.get("path"), 6);
 
+	_searchManager->addDir("FONTS");
 	_searchManager->addDir("addon");
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
@@ -152,6 +154,7 @@ void ZVision::initialize() {
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, &_pixelFormat);
+	_textRenderer = new textRenderer(this);
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
 		_menu = new menuZgi(this);
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 983d5a56eb..bbcaf3c952 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -53,6 +53,7 @@ class StringManager;
 class SaveManager;
 class RlfAnimation;
 class menuHandler;
+class textRenderer;
 
 class ZVision : public Engine {
 public:
@@ -101,6 +102,7 @@ private:
 	StringManager *_stringManager;
 	menuHandler *_menu;
 	sManager *_searchManager;
+	textRenderer *_textRenderer;
 
 	// Clock
 	Clock _clock;
@@ -140,6 +142,9 @@ public:
 	sManager *getSearchManager() const {
 		return _searchManager;
 	}
+	textRenderer *getTextRenderer() const {
+		return _textRenderer;
+	}
 	Common::RandomSource *getRandomSource() const {
 		return _rnd;
 	}
-- 
cgit v1.2.3


From ac9b74dd16fb5950cdaa6c540b1e0d2e968ed129 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 22:43:09 +0700
Subject: ZVISION: Implement subtitle handle class

---
 engines/zvision/module.mk     |   3 +-
 engines/zvision/subtitles.cpp | 108 ++++++++++++++++++++++++++++++++++++++++++
 engines/zvision/subtitles.h   |  26 +++++++++-
 3 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 engines/zvision/subtitles.cpp

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index ea70b4b831..c8f629de1f 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -37,7 +37,8 @@ MODULE_OBJS := \
 	menu.o \
 	meta_animation.o \
 	search_manager.o \
-	text.o
+	text.o \
+	subtitles.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/subtitles.cpp b/engines/zvision/subtitles.cpp
new file mode 100644
index 0000000000..1942e3c979
--- /dev/null
+++ b/engines/zvision/subtitles.cpp
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "zvision/subtitles.h"
+#include "zvision/render_manager.h"
+#include "zvision/search_manager.h"
+#include "zvision/text.h"
+
+namespace ZVision {
+
+Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
+	_engine(engine),
+	_areaId(-1),
+	_subId(-1) {
+	Common::File file;
+	if (_engine->getSearchManager()->openFile(file, subname)) {
+		while (!file.eos()) {
+			Common::String str = file.readLine();
+			if (str.lastChar() == '~')
+				str.deleteLastChar();
+
+			if (str.matchString("*Initialization*", true)) {
+				// Not used
+			} else if (str.matchString("*Rectangle*", true)) {
+				int32 x1, y1, x2, y2;
+				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
+				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
+				_areaId = _engine->getRenderManager()->createSubArea(rct);
+			} else if (str.matchString("*TextFile*", true)) {
+				char filename[64];
+				sscanf(str.c_str(), "%*[^:]:%s", filename);
+				Common::File txt;
+				if (_engine->getSearchManager()->openFile(txt, filename)) {
+					while (!txt.eos()) {
+						Common::String txtline = readWideLine(txt);
+						sub cur_sub;
+						cur_sub.start = -1;
+						cur_sub.stop = -1;
+						cur_sub.sub = txtline;
+
+						_subs.push_back(cur_sub);
+					}
+					txt.close();
+				}
+			} else {
+				int32 st;
+				int32 en;
+				int32 sb;
+				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
+					if (sb <= (int32)_subs.size()) {
+						_subs[sb].start = st;
+						_subs[sb].stop = en;
+					}
+				}
+			}
+		}
+	}
+}
+
+Subtitle::~Subtitle() {
+	if (_areaId != -1)
+		_engine->getRenderManager()->deleteSubArea(_areaId);
+
+	_subs.clear();
+}
+
+void Subtitle::process(int32 time) {
+	int16 j = -1;
+	for (uint16 i = 0; i < _subs.size(); i++)
+		if (time >= _subs[i].start && time <= _subs[i].stop) {
+			j = i;
+			break;
+		}
+
+	if (j == -1 && _subId != -1) {
+		if (_areaId != -1)
+			_engine->getRenderManager()->updateSubArea(_areaId, "");
+		_subId = -1;
+	}
+
+	if (j != -1 && j != _subId) {
+		if (_subs[j].sub.size())
+			if (_areaId != -1)
+				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].sub);
+		_subId = j;
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/subtitles.h b/engines/zvision/subtitles.h
index 13426e03e4..d14cb6f052 100644
--- a/engines/zvision/subtitles.h
+++ b/engines/zvision/subtitles.h
@@ -24,6 +24,30 @@
 #ifndef ZVISION_SUBTITLES_H
 #define ZVISION_SUBTITLES_H
 
-// TODO: Implement Subtitles
+#include "zvision/zvision.h"
+
+namespace ZVision {
+
+class Subtitle {
+public:
+	Subtitle(ZVision *engine, const Common::String &subname);
+	~Subtitle();
+
+	void process(int32 time);
+private:
+	ZVision *_engine;
+	int32 _areaId;
+	int16 _subId;
+
+	struct sub {
+		int start;
+		int stop;
+		Common::String sub;
+	};
+
+	Common::Array<sub> _subs;
+};
+
+}
 
 #endif
-- 
cgit v1.2.3


From 8e02e06db153a68e86239c09b79565b0372cd789 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 22:46:00 +0700
Subject: ZVISION: Change rendermanager code for correct subtitles handle.

---
 engines/zvision/render_manager.cpp | 19 +++++++++++++++++--
 engines/zvision/render_manager.h   |  2 +-
 engines/zvision/zvision.cpp        |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index 6cfc0509c7..071affffab 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -24,6 +24,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/render_manager.h"
+#include "zvision/text.h"
 
 #include "zvision/lzss_read_stream.h"
 
@@ -746,9 +747,14 @@ void RenderManager::updateSubArea(uint16 id, const Common::String &txt) {
 	}
 }
 
-void RenderManager::renderSubsToScreen() {
+void RenderManager::processSubs(uint16 deltatime) {
 	bool redraw = false;
 	for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
+		if (it->_value.timer != -1) {
+			it->_value.timer -= deltatime;
+			if (it->_value.timer <= 0)
+				it->_value.todelete = true;
+		}
 		if (it->_value.todelete) {
 			_subsList.erase(it);
 			redraw = true;
@@ -761,7 +767,16 @@ void RenderManager::renderSubsToScreen() {
 		_subWnd.fillRect(Common::Rect(_subWnd.w, _subWnd.h), 0);
 
 		for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
-			//draw subs
+			oneSub *sub = &it->_value;
+			if (sub->_txt.size()) {
+				Graphics::Surface *rndr = new Graphics::Surface();
+				rndr->create(sub->_r.width(), sub->_r.height(), _pixelFormat);
+				_engine->getTextRenderer()->drawTxtInOneLine(sub->_txt, *rndr);
+				blitSurfaceToSurface(*rndr, _subWnd, sub->_r.left - _subWndRect.left + _workingWindow.left, sub->_r.top - _subWndRect.top + _workingWindow.top);
+				rndr->free();
+				delete rndr;
+			}
+			sub->redraw = false;
 		}
 
 		_system->copyRectToScreen(_subWnd.getPixels(), _subWnd.pitch,
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index 3c03331d0f..668c8acc41 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -236,7 +236,7 @@ public:
 	void deleteSubArea(uint16 id);
 	void deleteSubArea(uint16 id, int16 delay);
 	void updateSubArea(uint16 id, const Common::String &txt);
-	void renderSubsToScreen();
+	void processSubs(uint16 deltatime);
 
 	Common::Point getBkgSize();
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 178c7978ae..4c5164cd6e 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -192,7 +192,7 @@ Common::Error ZVision::run() {
 		// Render the backBuffer to the screen
 		_renderManager->prepareBkg();
 		_renderManager->renderMenuToScreen();
-		_renderManager->renderSubsToScreen();
+		_renderManager->processSubs(deltaTime);
 		_renderManager->renderBackbufferToScreen();
 
 		// Update the screen
-- 
cgit v1.2.3


From 1af6f404f441a7a2d77bb0f23d1dbb1c838cf56c Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 22:47:28 +0700
Subject: ZVISION: Add subtitles support for MusicNode.

---
 engines/zvision/music_node.cpp | 14 ++++++++++++++
 engines/zvision/music_node.h   |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index 31d222aead..b716b3ead1 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -46,6 +46,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	_attenuate = 0;
 	_pantrack = false;
 	_pantrack_X = 0;
+	_sub = NULL;
 
 	Audio::RewindableAudioStream *audioStream;
 
@@ -69,12 +70,22 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 
 	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 1);
+
+	Common::String subname = filename;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
+
+	if (_engine->getSearchManager()->hasFile(subname))
+		_sub = new Subtitle(_engine, subname);
 }
 
 MusicNode::~MusicNode() {
 	_engine->_mixer->stopHandle(_handle);
 	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 2);
+	if (_sub)
+		delete _sub;
 	debug(1, "MusicNode: %d destroyed\n", _key);
 }
 
@@ -117,6 +128,9 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 
 		if (_pantrack || _volume != _newvol)
 			setVolume(_newvol);
+
+		if (_sub)
+			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
 	}
 	return false;
 }
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
index 6e3033f6b0..d24496fc02 100644
--- a/engines/zvision/music_node.h
+++ b/engines/zvision/music_node.h
@@ -25,6 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/sidefx.h"
+#include "zvision/subtitles.h"
 
 namespace Common {
 class String;
@@ -64,6 +65,7 @@ private:
 	int32 _crossfade_time;
 	bool _stereo;
 	Audio::SoundHandle _handle;
+	Subtitle *_sub;
 };
 
 class PanTrackNode : public SideFX {
-- 
cgit v1.2.3


From 3608a0f6c6be65cc86aac7b75dbed5505859f267 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 24 Feb 2014 22:49:44 +0700
Subject: ZVISION: Change changelocation code for identical work to original.

---
 engines/zvision/script_manager.cpp | 89 +++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 30 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index a1003197ef..54d126f8cb 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -58,10 +58,10 @@ void ScriptManager::initialize() {
 	cleanScriptScope(room);
 	cleanScriptScope(nodeview);
 
-	_currentLocation.node = '0';
-	_currentLocation.world = '0';
-	_currentLocation.room = '0';
-	_currentLocation.view = '0';
+	_currentLocation.node = 0;
+	_currentLocation.world = 0;
+	_currentLocation.room = 0;
+	_currentLocation.view = 0;
 
 	parseScrFile("universe.scr", universe);
 	changeLocation('g', 'a', 'r', 'y', 0);
@@ -489,46 +489,75 @@ void ScriptManager::do_changeLocation() {
 	setStateValue(StateKey_View, _nextLocation.view);
 	setStateValue(StateKey_ViewPos, _nextLocation.offset);
 
-	// Clear all the containers
 	_referenceTable.clear();
-	cleanScriptScope(nodeview);
-	cleanScriptScope(room);
-	cleanScriptScope(world);
-
 	addPuzzlesToReferenceTable(universe);
 
-	// Parse into puzzles and controls
-	Common::String fileName = Common::String::format("%c%c%c%c.scr", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view);
-	parseScrFile(fileName, nodeview);
-	addPuzzlesToReferenceTable(nodeview);
+	if (_nextLocation.world != _currentLocation.world) {
+		cleanScriptScope(nodeview);
+		cleanScriptScope(room);
+		cleanScriptScope(world);
+
+		Common::String fileName = Common::String::format("%c%c%c%c.scr", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view);
+		parseScrFile(fileName, nodeview);
+		addPuzzlesToReferenceTable(nodeview);
+
+		fileName = Common::String::format("%c%c.scr", _nextLocation.world, _nextLocation.room);
+		parseScrFile(fileName, room);
+		addPuzzlesToReferenceTable(room);
+
+		fileName = Common::String::format("%c.scr", _nextLocation.world);
+		parseScrFile(fileName, world);
+		addPuzzlesToReferenceTable(world);
+	} else if (_nextLocation.room != _currentLocation.room) {
+		cleanScriptScope(nodeview);
+		cleanScriptScope(room);
+
+		addPuzzlesToReferenceTable(world);
+
+		Common::String fileName = Common::String::format("%c%c%c%c.scr", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view);
+		parseScrFile(fileName, nodeview);
+		addPuzzlesToReferenceTable(nodeview);
 
-	fileName = Common::String::format("%c%c.scr", _nextLocation.world, _nextLocation.room);
-	parseScrFile(fileName, room);
-	addPuzzlesToReferenceTable(room);
+		fileName = Common::String::format("%c%c.scr", _nextLocation.world, _nextLocation.room);
+		parseScrFile(fileName, room);
+		addPuzzlesToReferenceTable(room);
 
-	fileName = Common::String::format("%c.scr", _nextLocation.world);
-	parseScrFile(fileName, world);
-	addPuzzlesToReferenceTable(world);
+	} else if (_nextLocation.node != _currentLocation.node || _nextLocation.view != _currentLocation.view) {
+		cleanScriptScope(nodeview);
+
+		addPuzzlesToReferenceTable(room);
+		addPuzzlesToReferenceTable(world);
+
+		Common::String fileName = Common::String::format("%c%c%c%c.scr", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view);
+		parseScrFile(fileName, nodeview);
+		addPuzzlesToReferenceTable(nodeview);
+	}
 
 	_activeControls = &nodeview._controls;
 
 	// Revert to the idle cursor
 	_engine->getCursorManager()->changeCursor(CursorIndex_Idle);
 
-	// Reset the background velocity
-	//_engine->getRenderManager()->setBackgroundVelocity(0);
-
-	// Remove any alphaEntries
-	//_engine->getRenderManager()->clearAlphaEntries();
-
 	// Change the background position
 	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
 
-	// Update _currentLocation
-	_currentLocation = _nextLocation;
-
-	execScope(room);
-	execScope(nodeview);
+	if (_currentLocation.world == 0 && _currentLocation.room == 0 && _currentLocation.node == 0 && _currentLocation.view == 0) {
+		_currentLocation = _nextLocation;
+		execScope(world);
+		execScope(room);
+		execScope(nodeview);
+	} else if (_nextLocation.world != _currentLocation.world) {
+		_currentLocation = _nextLocation;
+		execScope(room);
+		execScope(nodeview);
+	} else if (_nextLocation.room != _currentLocation.room) {
+		_currentLocation = _nextLocation;
+		execScope(room);
+		execScope(nodeview);
+	} else if (_nextLocation.node != _currentLocation.node || _nextLocation.view != _currentLocation.view) {
+		_currentLocation = _nextLocation;
+		execScope(nodeview);
+	}
 }
 
 void ScriptManager::serializeStateTable(Common::WriteStream *stream) {
-- 
cgit v1.2.3


From 665014033d2163f5029a3284c3dd3cbad8d7bf1d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 1 Mar 2014 20:39:24 +0700
Subject: ZVISION: Add functions for framedelay controlling in animation_node

---
 engines/zvision/animation_node.cpp | 17 +++++++++++++++++
 engines/zvision/animation_node.h   |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 89d0f5e451..365ff747f4 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -191,4 +191,21 @@ bool AnimationNode::stop() {
 	return false;
 }
 
+void AnimationNode::setNewFrameDelay(int32 newDelay) {
+	if (newDelay > 0) {
+		PlayNodes::iterator it = _playList.begin();
+		if (it != _playList.end()) {
+			playnode *nod = &(*it);
+			float percent = (float)nod->_delay / (float)_frmDelay;
+			nod->_delay = percent * newDelay; // Scale to new max
+		}
+
+		_frmDelay = newDelay;
+	}
+}
+
+int32 AnimationNode::getFrameDelay() {
+	return _frmDelay;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/animation_node.h b/engines/zvision/animation_node.h
index 556ab8a51f..ff7636a31f 100644
--- a/engines/zvision/animation_node.h
+++ b/engines/zvision/animation_node.h
@@ -74,6 +74,9 @@ public:
 	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops = 1);
 
 	bool stop();
+
+	void setNewFrameDelay(int32 newDelay);
+	int32 getFrameDelay();
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From d90b325a3b0ec5ab455f8b8ae90bef9a528600df Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 1 Mar 2014 20:41:13 +0700
Subject: ZVISION: Implement syncsound sidefx class and action class.

---
 engines/zvision/actions.cpp           | 30 ++++++++++++
 engines/zvision/actions.h             | 10 ++++
 engines/zvision/module.mk             |  3 +-
 engines/zvision/scr_file_handling.cpp |  2 +-
 engines/zvision/syncsound_node.cpp    | 86 +++++++++++++++++++++++++++++++++++
 engines/zvision/syncsound_node.h      | 56 +++++++++++++++++++++++
 6 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 engines/zvision/syncsound_node.cpp
 create mode 100644 engines/zvision/syncsound_node.h

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index c3f85fe247..bab1a5e1a1 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -31,6 +31,7 @@
 #include "zvision/zork_avi_decoder.h"
 #include "zvision/timer_node.h"
 #include "zvision/music_node.h"
+#include "zvision/syncsound_node.h"
 #include "zvision/animation_node.h"
 
 #include "common/file.h"
@@ -587,6 +588,35 @@ bool ActionStreamVideo::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionSyncSound
+//////////////////////////////////////////////////////////////////////////////
+
+ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	char fileName[25];
+	int not_used;
+
+	sscanf(line.c_str(), "%d %d %25s", &_syncto, &not_used, fileName);
+
+	_fileName = Common::String(fileName);
+}
+
+bool ActionSyncSound::execute() {
+	SideFX *fx = _engine->getScriptManager()->getSideFX(_syncto);
+	if (!fx)
+		return true;
+
+	if (!(fx->getType() & SideFX::SIDEFX_ANIM))
+		return true;
+
+	AnimationNode *animnode = (AnimationNode *)fx;
+	if (animnode->getFrameDelay() > 200) // Hack for fix incorrect framedelay in some animpreload
+		animnode->setNewFrameDelay(66); // ~15fps
+
+	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotkey, _fileName, _syncto));
+	return true;
+}
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionTimer
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index f4a2c0f387..bc88a6d67f 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -381,6 +381,16 @@ private:
 	bool _skippable;
 };
 
+class ActionSyncSound : public ResultAction {
+public:
+	ActionSyncSound(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	int _syncto;
+	Common::String _fileName;
+};
+
 class ActionTimer : public ResultAction {
 public:
 	ActionTimer(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index c8f629de1f..90a297591c 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -38,7 +38,8 @@ MODULE_OBJS := \
 	meta_animation.o \
 	search_manager.o \
 	text.o \
-	subtitles.o
+	subtitles.o \
+	syncsound_node.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index db4e8fa9b1..347c3a6712 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -277,7 +277,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("streamvideo", true)) {
 					actionList.push_back(new ActionStreamVideo(_engine, slot, args));
 				} else if (act.matchString("syncsound", true)) {
-					// TODO: Implement ActionSyncSound
+					actionList.push_back(new ActionSyncSound(_engine, slot, args));
 				} else if (act.matchString("timer", true)) {
 					actionList.push_back(new ActionTimer(_engine, slot, args));
 				} else if (act.matchString("ttytext", true)) {
diff --git a/engines/zvision/syncsound_node.cpp b/engines/zvision/syncsound_node.cpp
new file mode 100644
index 0000000000..5d04c1fb70
--- /dev/null
+++ b/engines/zvision/syncsound_node.cpp
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/syncsound_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/script_manager.h"
+#include "zvision/render_manager.h"
+#include "zvision/zork_raw.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "audio/decoders/wave.h"
+
+
+namespace ZVision {
+
+SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)
+	: SideFX(engine, key, SIDEFX_AUDIO) {
+	_syncto = syncto;
+	_sub = NULL;
+
+	Audio::RewindableAudioStream *audioStream;
+
+	if (filename.contains(".wav")) {
+		Common::File *file = new Common::File();
+		if (_engine->getSearchManager()->openFile(*file, filename)) {
+			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+		}
+	} else {
+		audioStream = makeRawZorkStream(filename, _engine);
+	}
+
+	_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream);
+
+	Common::String subname = filename;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
+
+	if (_engine->getSearchManager()->hasFile(subname))
+		_sub = new Subtitle(_engine, subname);
+}
+
+SyncSoundNode::~SyncSoundNode() {
+	_engine->_mixer->stopHandle(_handle);
+	if (_sub)
+		delete _sub;
+}
+
+bool SyncSoundNode::process(uint32 deltaTimeInMillis) {
+	if (! _engine->_mixer->isSoundHandleActive(_handle))
+		return stop();
+	else {
+
+		if (_engine->getScriptManager()->getSideFX(_syncto) == NULL)
+			return stop();
+
+		if (_sub)
+			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
+	}
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/syncsound_node.h b/engines/zvision/syncsound_node.h
new file mode 100644
index 0000000000..7d875f2797
--- /dev/null
+++ b/engines/zvision/syncsound_node.h
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SYNCSOUND_NODE_H
+#define ZVISION_SYNCSOUND_NODE_H
+
+#include "audio/mixer.h"
+#include "zvision/sidefx.h"
+#include "zvision/subtitles.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class SyncSoundNode : public SideFX {
+public:
+	SyncSoundNode(ZVision *engine, uint32 key, Common::String &file, int32 syncto);
+	~SyncSoundNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+private:
+	int32 _syncto;
+	Audio::SoundHandle _handle;
+	Subtitle *_sub;
+};
+
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From eb9061e580ce7c055c4f7cafe9bd81823367f39d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 2 Mar 2014 00:03:25 +0700
Subject: ZVISION: Refactor video-play and correct streamvideo for use
 subtitles and correct scale.

---
 engines/zvision/actions.cpp |  20 ++++++--
 engines/zvision/subtitles.h |   2 +
 engines/zvision/video.cpp   | 116 ++++++++++++--------------------------------
 engines/zvision/zvision.cpp |   1 +
 engines/zvision/zvision.h   |   3 +-
 5 files changed, 51 insertions(+), 91 deletions(-)

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index bab1a5e1a1..99fa6a646d 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -577,12 +577,22 @@ bool ActionStreamVideo::execute() {
 			return true;
 		}
 
-		Common::Rect destRect;
-		if ((_flags & DIFFERENT_DIMENSIONS) == DIFFERENT_DIMENSIONS) {
-			destRect = Common::Rect(_x1, _y1, _x2, _y2);
-		}
+		Common::Rect destRect = Common::Rect(_x1, _y1, _x2 + 1, _y2 + 1);
+
+		Common::String subname = _fileName;
+		subname.setChar('s', subname.size() - 3);
+		subname.setChar('u', subname.size() - 2);
+		subname.setChar('b', subname.size() - 1);
+
+		Subtitle *sub = NULL;
+
+		if (_engine->getSearchManager()->hasFile(subname))
+			sub = new Subtitle(_engine, subname);
+
+		_engine->playVideo(decoder, destRect, _skippable, sub);
 
-		_engine->playVideo(decoder, destRect, _skippable);
+		if (sub)
+			delete sub;
 	}
 
 	return true;
diff --git a/engines/zvision/subtitles.h b/engines/zvision/subtitles.h
index d14cb6f052..698561b655 100644
--- a/engines/zvision/subtitles.h
+++ b/engines/zvision/subtitles.h
@@ -28,6 +28,8 @@
 
 namespace ZVision {
 
+class ZVision;
+
 class Subtitle {
 public:
 	Subtitle(ZVision *engine, const Common::String &subname);
diff --git a/engines/zvision/video.cpp b/engines/zvision/video.cpp
index 6b7299ea84..0ad9000fcb 100644
--- a/engines/zvision/video.cpp
+++ b/engines/zvision/video.cpp
@@ -26,6 +26,7 @@
 
 #include "zvision/clock.h"
 #include "zvision/render_manager.h"
+#include "zvision/subtitles.h"
 
 #include "common/system.h"
 
@@ -38,90 +39,32 @@
 
 namespace ZVision {
 
-// Taken/modified from SCI
-void scaleBuffer(const byte *src, byte *dst, uint32 srcWidth, uint32 srcHeight, byte bytesPerPixel, uint scaleAmount) {
-	assert(bytesPerPixel == 1 || bytesPerPixel == 2);
-
-	const uint32 newWidth = srcWidth * scaleAmount;
-	const uint32 pitch = newWidth * bytesPerPixel;
-	const byte *srcPtr = src;
-
-	if (bytesPerPixel == 1) {
-		for (uint32 y = 0; y < srcHeight; ++y) {
-			for (uint32 x = 0; x < srcWidth; ++x) {
-				const byte color = *srcPtr++;
-
-				for (uint i = 0; i < scaleAmount; ++i) {
-					dst[i] = color;
-					dst[pitch + i] = color;
-				}
-				dst += scaleAmount;
-			}
-			dst += pitch;
-		}
-	} else if (bytesPerPixel == 2) {
-		for (uint32 y = 0; y < srcHeight; ++y) {
-			for (uint32 x = 0; x < srcWidth; ++x) {
-				const byte color = *srcPtr++;
-				const byte color2 = *srcPtr++;
-
-				for (uint i = 0; i < scaleAmount; ++i) {
-					uint index = i * 2;
-
-					dst[index] = color;
-					dst[index + 1] = color2;
-					dst[pitch + index] = color;
-					dst[pitch + index + 1] = color2;
-				}
-				dst += 2 * scaleAmount;
-			}
-			dst += pitch;
-		}
-	}
-}
-
-void ZVision::playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect, bool skippable) {
-	byte bytesPerPixel = videoDecoder.getPixelFormat().bytesPerPixel;
-
-	uint16 origWidth = videoDecoder.getWidth();
-	uint16 origHeight = videoDecoder.getHeight();
-
-	uint scale = 1;
+void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect, bool skippable, Subtitle *sub) {
+	Common::Rect dst = destRect;
 	// If destRect is empty, no specific scaling was requested. However, we may choose to do scaling anyway
-	if (destRect.isEmpty()) {
-		// Most videos are very small. Therefore we do a simple 2x scale
-		if (origWidth * 2 <= 640 && origHeight * 2 <= 480) {
-			scale = 2;
-		}
-	} else {
-		// Assume bilinear scaling. AKA calculate the scale from just the width.
-		// Also assume that the scaling is in integral intervals. AKA no 1.5x scaling
-		// TODO: Test ^these^ assumptions
-		scale = destRect.width() / origWidth;
+	if (dst.isEmpty())
+		dst = Common::Rect(vid.getWidth(), vid.getHeight());
 
-		// TODO: Test if we need to support downscale.
-	}
-
-	uint16 pitch = origWidth * bytesPerPixel;
+	Graphics::Surface *scaled = NULL;
 
-	uint16 finalWidth = origWidth * scale;
-	uint16 finalHeight = origHeight * scale;
-
-	byte *scaledVideoFrameBuffer;
-	if (scale != 1) {
-		scaledVideoFrameBuffer = new byte[finalWidth * finalHeight * bytesPerPixel];
+	if (vid.getWidth() != dst.width() || vid.getHeight() != dst.height()) {
+		scaled = new Graphics::Surface;
+		scaled->create(dst.width(), dst.height(), vid.getPixelFormat());
 	}
 
-	uint16 x = ((WINDOW_WIDTH - finalWidth) / 2) + destRect.left;
-	uint16 y = ((WINDOW_HEIGHT - finalHeight) / 2) + destRect.top;
+
+	uint16 x = _workingWindow.left + dst.left;
+	uint16 y = _workingWindow.top + dst.top;
+	uint16 finalWidth = dst.width() < _workingWindow.width() ? dst.width() : _workingWindow.width();
+	uint16 finalHeight = dst.height() < _workingWindow.height() ? dst.height() : _workingWindow.height();
 
 	_clock.stop();
-	videoDecoder.start();
+	vid.start();
 
 	// Only continue while the video is still playing
-	while (!shouldQuit() && !videoDecoder.endOfVideo() && videoDecoder.isPlaying()) {
+	while (!shouldQuit() && !vid.endOfVideo() && vid.isPlaying()) {
 		// Check for engine quit and video stop key presses
-		while (!videoDecoder.endOfVideo() && videoDecoder.isPlaying() && _eventMan->pollEvent(_event)) {
+		while (_eventMan->pollEvent(_event)) {
 			switch (_event.type) {
 			case Common::EVENT_KEYDOWN:
 				switch (_event.kbd.keycode) {
@@ -131,7 +74,7 @@ void ZVision::playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &d
 					break;
 				case Common::KEYCODE_SPACE:
 					if (skippable) {
-						videoDecoder.stop();
+						vid.stop();
 					}
 					break;
 				default:
@@ -142,29 +85,32 @@ void ZVision::playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &d
 			}
 		}
 
-		if (videoDecoder.needsUpdate()) {
-			const Graphics::Surface *frame = videoDecoder.decodeNextFrame();
+		if (vid.needsUpdate()) {
+			const Graphics::Surface *frame = vid.decodeNextFrame();
+			if (sub)
+				sub->process(vid.getCurFrame());
 
 			if (frame) {
-				if (scale != 1) {
-					scaleBuffer((const byte *)frame->getPixels(), scaledVideoFrameBuffer, origWidth, origHeight, bytesPerPixel, scale);
-					_system->copyRectToScreen(scaledVideoFrameBuffer, pitch * 2, x, y, finalWidth, finalHeight);
-				} else {
-					_system->copyRectToScreen((const byte *)frame->getPixels(), pitch, x, y, finalWidth, finalHeight);
+				if (scaled) {
+					_renderManager->scaleBuffer(frame->getPixels(), scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, scaled->w, scaled->h);
+					frame = scaled;
 				}
+				_system->copyRectToScreen((const byte *)frame->getPixels(), frame->pitch, x, y, finalWidth, finalHeight);
+				_renderManager->processSubs(0);
 			}
 		}
 
 		// Always update the screen so the mouse continues to render
 		_system->updateScreen();
 
-		_system->delayMillis(videoDecoder.getTimeToNextFrame());
+		_system->delayMillis(vid.getTimeToNextFrame() / 2);
 	}
 
 	_clock.start();
 
-	if (scale != 1) {
-		delete[] scaledVideoFrameBuffer;
+	if (scaled) {
+		scaled->free();
+		delete scaled;
 	}
 }
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 4c5164cd6e..b1615aa7b4 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -35,6 +35,7 @@
 #include "zvision/menu.h"
 #include "zvision/search_manager.h"
 #include "zvision/text.h"
+#include "zvision/truetype_font.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index bbcaf3c952..982d3fd98b 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -54,6 +54,7 @@ class SaveManager;
 class RlfAnimation;
 class menuHandler;
 class textRenderer;
+class Subtitle;
 
 class ZVision : public Engine {
 public:
@@ -161,7 +162,7 @@ public:
 	 * @param destRect        Where to put the video. (In working window coords)
 	 * @param skippable       If true, the video can be skipped at any time using [Spacebar]
 	 */
-	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true);
+	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true, Subtitle *sub = NULL);
 
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
-- 
cgit v1.2.3


From 2a4e9a63588bc462c2a71195bb7597fe81ab0617 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 5 Mar 2014 16:21:03 +0700
Subject: ZVISION: Refactor of save functions

---
 engines/zvision/save_manager.cpp   | 157 ++++++++++++++++++++++---------------
 engines/zvision/save_manager.h     |   9 ++-
 engines/zvision/script_manager.cpp | 131 +++++++++++++++++++++++++++----
 engines/zvision/script_manager.h   |   6 +-
 engines/zvision/timer_node.cpp     |   4 +-
 5 files changed, 224 insertions(+), 83 deletions(-)

diff --git a/engines/zvision/save_manager.cpp b/engines/zvision/save_manager.cpp
index e8947d8d16..15b7424de7 100644
--- a/engines/zvision/save_manager.cpp
+++ b/engines/zvision/save_manager.cpp
@@ -42,44 +42,27 @@ const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');
 
 void SaveManager::saveGame(uint slot, const Common::String &saveName) {
 	// The games only support 20 slots
-	assert(slot <= 1 && slot <= 20);
+	//assert(slot <= 1 && slot <= 20);
 
 	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
 	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
 
-	// Write out the savegame header
-	file->writeUint32BE(SAVEGAME_ID);
-
-	// Write version
-	file->writeByte(SAVE_VERSION);
+	writeSaveGameHeader(file, saveName);
 
-	// Write savegame name
-	file->writeString(saveName);
-	file->writeByte(0);
+	_engine->getScriptManager()->serialize(file);
 
-	// We can't call writeGameSaveData because the save menu is actually
-	// a room, so writeGameSaveData would save us in the save menu.
-	// However, an auto save is performed before each room change, so we
-	// can copy the data from there. We can guarantee that an auto save file will
-	// exist before this is called because the save menu can only be accessed
-	// after the first room (the main menu) has loaded.
-	Common::InSaveFile *autoSaveFile = saveFileManager->openForLoading(_engine->generateAutoSaveFileName());
+	file->finalize();
+	delete file;
+}
 
-	// Skip over the header info
-	autoSaveFile->readSint32BE(); // SAVEGAME_ID
-	autoSaveFile->readByte(); // Version
-	autoSaveFile->seek(5, SEEK_CUR); // The string "auto" with terminating NULL
+void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream) {
+	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
+	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
 
-	// Read the rest to a buffer
-	uint32 size = autoSaveFile->size() - autoSaveFile->pos();
-	byte *buffer = new byte[size];
-	autoSaveFile->read(buffer, size);
+	writeSaveGameHeader(file, saveName);
 
-	// Then write the buffer to the new file
-	file->write(buffer, size);
+	file->write(stream->getData(), stream->size());
 
-	// Cleanup
-	delete[] buffer;
 	file->finalize();
 	delete file;
 }
@@ -87,23 +70,26 @@ void SaveManager::saveGame(uint slot, const Common::String &saveName) {
 void SaveManager::autoSave() {
 	Common::OutSaveFile *file = g_system->getSavefileManager()->openForSaving(_engine->generateAutoSaveFileName());
 
-	// Write out the savegame header
-	file->writeUint32BE(SAVEGAME_ID);
-
-	// Version
-	file->writeByte(SAVE_VERSION);
+	writeSaveGameHeader(file, "auto");
 
-	file->writeString("auto");
-	file->writeByte(0);
-
-	writeSaveGameData(file);
+	_engine->getScriptManager()->serialize(file);
 
 	// Cleanup
 	file->finalize();
 	delete file;
 }
 
-void SaveManager::writeSaveGameData(Common::OutSaveFile *file) {
+void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName) {
+
+	file->writeUint32BE(SAVEGAME_ID);
+
+	// Write version
+	file->writeByte(SAVE_VERSION);
+
+	// Write savegame name
+	file->writeString(saveName);
+	file->writeByte(0);
+
 	// Create a thumbnail and save it
 	Graphics::saveThumbnail(*file);
 
@@ -115,26 +101,13 @@ void SaveManager::writeSaveGameData(Common::OutSaveFile *file) {
 	file->writeSint16LE(td.tm_mday);
 	file->writeSint16LE(td.tm_hour);
 	file->writeSint16LE(td.tm_min);
-
-	ScriptManager *scriptManager = _engine->getScriptManager();
-	// Write out the current location
-	Location currentLocation = scriptManager->getCurrentLocation();
-	file->writeByte(currentLocation.world);
-	file->writeByte(currentLocation.room);
-	file->writeByte(currentLocation.node);
-	file->writeByte(currentLocation.view);
-	file->writeUint32LE(currentLocation.offset);
-
-	// Write out the current state table values
-	scriptManager->serializeStateTable(file);
-
 }
 
 Common::Error SaveManager::loadGame(uint slot) {
 	// The games only support 20 slots
-	assert(slot <= 1 && slot <= 20);
+	//assert(slot <= 1 && slot <= 20);
 
-	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(_engine->generateSaveFileName(slot));
+	Common::SeekableReadStream *saveFile = getSlotFile(slot);
 	if (saveFile == 0) {
 		return Common::kPathDoesNotExist;
 	}
@@ -145,24 +118,59 @@ Common::Error SaveManager::loadGame(uint slot) {
 		return Common::kUnknownError;
 	}
 
-	char world = (char)saveFile->readByte();
-	char room = (char)saveFile->readByte();
-	char node = (char)saveFile->readByte();
-	char view = (char)saveFile->readByte();
-	uint32 offset = (char)saveFile->readUint32LE();
+	ScriptManager *scriptManager = _engine->getScriptManager();
+	// Update the state table values
+	scriptManager->deserialize(saveFile);
+
+	delete saveFile;
+	if (header.thumbnail)
+		delete header.thumbnail;
+
+	return Common::kNoError;
+}
+
+Common::Error SaveManager::loadGame(const Common::String &saveName) {
+	Common::File *saveFile = _engine->getSearchManager()->openFile(saveName);
+	if (saveFile == NULL) {
+		saveFile = new Common::File;
+		if (!saveFile->open(saveName)) {
+			delete saveFile;
+			return Common::kPathDoesNotExist;
+		}
+	}
+
+	// Read the header
+	SaveGameHeader header;
+	if (!readSaveGameHeader(saveFile, header)) {
+		return Common::kUnknownError;
+	}
 
 	ScriptManager *scriptManager = _engine->getScriptManager();
 	// Update the state table values
-	scriptManager->deserializeStateTable(saveFile);
+	scriptManager->deserialize(saveFile);
 
-	// Load the room
-	scriptManager->changeLocation(world, room, node, view, offset);
+	delete saveFile;
+	if (header.thumbnail)
+		delete header.thumbnail;
 
 	return Common::kNoError;
 }
 
 bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header) {
-	if (in->readUint32BE() != SAVEGAME_ID) {
+	uint32 tag = in->readUint32BE();
+	if (tag == MKTAG('Z', 'N', 'S', 'G')) {
+		header.saveYear = 0;
+		header.saveMonth = 0;
+		header.saveDay = 0;
+		header.saveHour = 0;
+		header.saveMinutes = 0;
+		header.saveName = "Original Save";
+		header.thumbnail = NULL;
+		header.version = SAVE_ORIGINAL;
+		in->seek(-4, SEEK_CUR);
+		return true;
+	}
+	if (tag != SAVEGAME_ID) {
 		warning("File is not a ZVision save file. Aborting load");
 		return false;
 	}
@@ -198,4 +206,29 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 	return true;
 }
 
+Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
+	Common::SeekableReadStream *saveFile = g_system->getSavefileManager()->openForLoading(_engine->generateSaveFileName(slot));
+	if (saveFile == NULL) {
+		// Try to load standart save file
+		Common::String filename;
+		if (_engine->getGameId() == GID_GRANDINQUISITOR)
+			filename.format("inqsav%u.sav", slot);
+		else if (_engine->getGameId() == GID_NEMESIS)
+			filename.format("nemsav%u.sav", slot);
+
+		saveFile = _engine->getSearchManager()->openFile(filename);
+		if (saveFile == NULL) {
+			Common::File *tmpFile = new Common::File;
+			if (!tmpFile->open(filename)) {
+				delete tmpFile;
+			} else {
+				saveFile = tmpFile;
+			}
+		}
+
+	}
+
+	return saveFile;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/save_manager.h b/engines/zvision/save_manager.h
index ec80b37e20..84afc8cb13 100644
--- a/engines/zvision/save_manager.h
+++ b/engines/zvision/save_manager.h
@@ -24,6 +24,7 @@
 #define ZVISION_SAVE_MANAGER_H
 
 #include "common/savefile.h"
+#include "common/memstream.h"
 
 namespace Common {
 class String;
@@ -54,6 +55,7 @@ private:
 	static const uint32 SAVEGAME_ID;
 
 	enum {
+		SAVE_ORIGINAL = 0,
 		SAVE_VERSION = 1
 	};
 
@@ -73,6 +75,7 @@ public:
 	 * @param saveName    The internal name for this save. This is NOT the name of the actual save file.
 	 */
 	void saveGame(uint slot, const Common::String &saveName);
+	void saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream);
 	/**
 	 * Loads the state data from the save file that slot references. Uses
 	 * ZVision::generateSaveFileName(slot) to get the save file name.
@@ -80,10 +83,12 @@ public:
 	 * @param slot    The save slot to load. Must be [1, 20]
 	 */
 	Common::Error loadGame(uint slot);
+	Common::Error loadGame(const Common::String &saveName);
 
+	Common::SeekableReadStream *getSlotFile(uint slot);
+	bool readSaveGameHeader(Common::SeekableReadStream *in, SaveGameHeader &header);
 private:
-	void writeSaveGameData(Common::OutSaveFile *file);
-	bool readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header);
+	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 54d126f8cb..5e101cb58f 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -30,6 +30,7 @@
 #include "zvision/save_manager.h"
 #include "zvision/actions.h"
 #include "zvision/utility.h"
+#include "zvision/timer_node.h"
 
 #include "common/algorithm.h"
 #include "common/hashmap.h"
@@ -283,6 +284,13 @@ void ScriptManager::setStateValue(uint32 key, int value) {
 	queuePuzzles(key);
 }
 
+void ScriptManager::setStateValueSilent(uint32 key, int value) {
+	if (value == 0)
+		_globalState.erase(key);
+	else
+		_globalState[key] = value;
+}
+
 uint ScriptManager::getStateFlag(uint32 key) {
 	if (_globalStateFlags.contains(key))
 		return _globalStateFlags[key];
@@ -296,6 +304,13 @@ void ScriptManager::setStateFlag(uint32 key, uint value) {
 	_globalStateFlags[key] |= value;
 }
 
+void ScriptManager::setStateFlagSilent(uint32 key, uint value) {
+	if (value == 0)
+		_globalStateFlags.erase(key);
+	else
+		_globalStateFlags[key] = value;
+}
+
 void ScriptManager::unsetStateFlag(uint32 key, uint value) {
 	queuePuzzles(key);
 
@@ -560,30 +575,114 @@ void ScriptManager::do_changeLocation() {
 	}
 }
 
-void ScriptManager::serializeStateTable(Common::WriteStream *stream) {
-	// Write the number of state value entries
-	stream->writeUint32LE(_globalState.size());
+void ScriptManager::serialize(Common::WriteStream *stream) {
+	stream->writeUint32BE(MKTAG('Z', 'N', 'S', 'G'));
+	stream->writeUint32LE(4);
+	stream->writeUint32LE(0);
+	stream->writeUint32BE(MKTAG('L', 'O', 'C', ' '));
+	stream->writeUint32LE(8);
+	stream->writeByte(getStateValue(StateKey_World));
+	stream->writeByte(getStateValue(StateKey_Room));
+	stream->writeByte(getStateValue(StateKey_Node));
+	stream->writeByte(getStateValue(StateKey_View));
+	stream->writeUint32LE(getStateValue(StateKey_ViewPos));
 
-	for (StateMap::iterator iter = _globalState.begin(); iter != _globalState.end(); ++iter) {
-		// Write out the key/value pair
-		stream->writeUint32LE(iter->_key);
-		stream->writeUint32LE(iter->_value);
-	}
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter)
+		(*iter)->serialize(stream);
+
+	stream->writeUint32BE(MKTAG('F', 'L', 'A', 'G'));
+
+	int32 slots = 20000;
+	if (_engine->getGameId() == GID_NEMESIS)
+		slots = 30000;
+
+	stream->writeUint32LE(slots * 2);
+
+	for (int32 i = 0; i < slots; i++)
+		stream->writeUint16LE(getStateFlag(i));
+
+	stream->writeUint32BE(MKTAG('P', 'U', 'Z', 'Z'));
+
+	stream->writeUint32LE(slots * 2);
+
+	for (int32 i = 0; i < slots; i++)
+		stream->writeSint16LE(getStateValue(i));
 }
 
-void ScriptManager::deserializeStateTable(Common::SeekableReadStream *stream) {
+void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	// Clear out the current table values
 	_globalState.clear();
+	_globalStateFlags.clear();
 
-	// Read the number of key/value pairs
-	uint32 numberOfPairs = stream->readUint32LE();
+	cleanScriptScope(nodeview);
+	cleanScriptScope(room);
+	cleanScriptScope(world);
 
-	for (uint32 i = 0; i < numberOfPairs; ++i) {
-		uint32 key = stream->readUint32LE();
-		uint32 value = stream->readUint32LE();
-		// Directly access the state table so we don't trigger Puzzle checks
-		_globalState[key] = value;
+	_currentLocation.node = 0;
+	_currentLocation.world = 0;
+	_currentLocation.room = 0;
+	_currentLocation.view = 0;
+
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); iter++)
+		delete(*iter);
+
+	_activeSideFx.clear();
+
+	_referenceTable.clear();
+
+	if (stream->readUint32BE() != MKTAG('Z', 'N', 'S', 'G') || stream->readUint32LE() != 4) {
+		changeLocation('g', 'a', 'r', 'y', 0);
+		debug("ZNSG");
+		return;
 	}
+
+	stream->seek(4, SEEK_CUR);
+
+	if (stream->readUint32BE() != MKTAG('L', 'O', 'C', ' ') || stream->readUint32LE() != 8) {
+		changeLocation('g', 'a', 'r', 'y', 0);
+		debug("LOC");
+		return;
+	}
+
+	Location next_loc;
+
+	next_loc.world = stream->readByte();
+	next_loc.room = stream->readByte();
+	next_loc.node = stream->readByte();
+	next_loc.view = stream->readByte();
+	next_loc.offset = stream->readUint32LE() & 0x0000FFFF;
+
+	// What the fck, eos is not 'return pos >= size'
+	// while (!stream->eos()) {*/
+	while (stream->pos() < stream->size()) {
+		uint32 tag = stream->readUint32BE();
+		uint32 tag_size = stream->readUint32LE();
+		switch (tag) {
+		case MKTAG('T', 'I', 'M', 'R'): {
+			uint32 key = stream->readUint32LE();
+			uint32 time = stream->readUint32LE();
+			addSideFX(new TimerNode(_engine, key, time));
+		}
+		break;
+		case MKTAG('F', 'L', 'A', 'G'):
+			for (uint32 i = 0; i < tag_size / 2; i++)
+				setStateFlagSilent(i, stream->readUint16LE());
+			break;
+		case MKTAG('P', 'U', 'Z', 'Z'):
+			for (uint32 i = 0; i < tag_size / 2; i++)
+				setStateValueSilent(i, stream->readUint16LE());
+			break;
+		default:
+			stream->seek(tag_size, SEEK_CUR);
+		}
+	}
+
+	_nextLocation = next_loc;
+
+	do_changeLocation();
+	// Place for read prefs
+	_engine->setRenderDelay(10);
+	setStateValue(StateKey_RestoreFlag, 1);
 }
 
 Location ScriptManager::getCurrentLocation() const {
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 2f585b6291..6adade5745 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -230,8 +230,8 @@ public:
 	/** Mark next location */
 	void changeLocation(char world, char room, char node, char view, uint32 offset);
 
-	void serializeStateTable(Common::WriteStream *stream);
-	void deserializeStateTable(Common::SeekableReadStream *stream);
+	void serialize(Common::WriteStream *stream);
+	void deserialize(Common::SeekableReadStream *stream);
 
 	Location getCurrentLocation() const;
 
@@ -253,6 +253,8 @@ private:
 	int16 invertory_getItem(int8 id);
 	void invertory_setItem(int8 id, int16 item);
 
+	void setStateFlagSilent(uint32 key, uint value);
+	void setStateValueSilent(uint32 key, int value);
 
 public:
 	void invertory_add(int16 item);
diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index f8da0bcf37..0d7f9b1114 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -67,8 +67,10 @@ bool TimerNode::stop() {
 }
 
 void TimerNode::serialize(Common::WriteStream *stream) {
+	stream->writeUint32BE(MKTAG('T', 'I', 'M', 'R'));
+	stream->writeUint32LE(8); // size
 	stream->writeUint32LE(_key);
-	stream->writeUint32LE(_timeLeft);
+	stream->writeUint32LE(_timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100));
 }
 
 void TimerNode::deserialize(Common::SeekableReadStream *stream) {
-- 
cgit v1.2.3


From 5eb6462d60a27ef158afbfc23b578b6f57f8f789 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 5 Mar 2014 18:29:55 +0700
Subject: ZVISION: Remove forgotten debug prints

---
 engines/zvision/script_manager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 5e101cb58f..2178887469 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -632,7 +632,6 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 
 	if (stream->readUint32BE() != MKTAG('Z', 'N', 'S', 'G') || stream->readUint32LE() != 4) {
 		changeLocation('g', 'a', 'r', 'y', 0);
-		debug("ZNSG");
 		return;
 	}
 
@@ -640,7 +639,6 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 
 	if (stream->readUint32BE() != MKTAG('L', 'O', 'C', ' ') || stream->readUint32LE() != 8) {
 		changeLocation('g', 'a', 'r', 'y', 0);
-		debug("LOC");
 		return;
 	}
 
-- 
cgit v1.2.3


From 5f92871a9c76d5f8bda74c10ef304c3ec1a328f5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 5 Mar 2014 18:44:23 +0700
Subject: ZVISION: Fix timer values for savegame

---
 engines/zvision/script_manager.cpp | 4 ++++
 engines/zvision/timer_node.cpp     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 2178887469..1a567397a8 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -659,6 +659,10 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 		case MKTAG('T', 'I', 'M', 'R'): {
 			uint32 key = stream->readUint32LE();
 			uint32 time = stream->readUint32LE();
+			if (_engine->getGameId() == GID_GRANDINQUISITOR)
+				time /= 100;
+			else if (_engine->getGameId() == GID_NEMESIS)
+				time /= 1000;
 			addSideFX(new TimerNode(_engine, key, time));
 		}
 		break;
diff --git a/engines/zvision/timer_node.cpp b/engines/zvision/timer_node.cpp
index 0d7f9b1114..a94f6db19b 100644
--- a/engines/zvision/timer_node.cpp
+++ b/engines/zvision/timer_node.cpp
@@ -70,7 +70,7 @@ void TimerNode::serialize(Common::WriteStream *stream) {
 	stream->writeUint32BE(MKTAG('T', 'I', 'M', 'R'));
 	stream->writeUint32LE(8); // size
 	stream->writeUint32LE(_key);
-	stream->writeUint32LE(_timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100));
+	stream->writeUint32LE(_timeLeft);
 }
 
 void TimerNode::deserialize(Common::SeekableReadStream *stream) {
-- 
cgit v1.2.3


From 26d923e354d22a3d8aeb007f4d6f1e5dc669efb4 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 5 Mar 2014 18:47:52 +0700
Subject: ZVISION: Fix incompatibility of puzzle flugs with original saves.

---
 engines/zvision/puzzle.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index e06b087aca..4d50756b87 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -65,8 +65,8 @@ struct Puzzle {
 
 	enum StateFlags {
 		ONCE_PER_INST = 0x01,
-		DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
-		DISABLED = 0x04
+		DISABLED = 0x02,
+		DO_ME_NOW = 0x04
 	};
 
 	uint32 key;
-- 
cgit v1.2.3


From 7d1c4ec27cb197ea729ab468ecd7f4cbd4594202 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 6 Mar 2014 15:22:05 +0700
Subject: ZVISION: Fix rlf incorrect ABS -128 issue

---
 engines/zvision/rlf_animation.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp
index f23f569d98..5784df0dac 100644
--- a/engines/zvision/rlf_animation.cpp
+++ b/engines/zvision/rlf_animation.cpp
@@ -268,6 +268,7 @@ void RlfAnimation::applyFrameToCurrent(const RlfAnimation::Frame &frame) {
 void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
 	uint32 sourceOffset = 0;
 	uint32 destOffset = 0;
+	int16 numberOfCopy = 0;
 
 	while (sourceOffset < sourceSize) {
 		int8 numberOfSamples = source[sourceOffset];
@@ -276,9 +277,9 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3
 		// If numberOfSamples is negative, the next abs(numberOfSamples) samples should
 		// be copied directly from source to dest
 		if (numberOfSamples < 0) {
-			numberOfSamples = ABS(numberOfSamples);
+			numberOfCopy = -numberOfSamples;
 
-			while (numberOfSamples > 0) {
+			while (numberOfCopy > 0) {
 				if (sourceOffset + 1 >= sourceSize) {
 					return;
 				} else if (destOffset + 1 >= destSize) {
@@ -293,7 +294,7 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3
 
 				sourceOffset += 2;
 				destOffset += 2;
-				numberOfSamples--;
+				numberOfCopy--;
 			}
 
 			// If numberOfSamples is >= 0, move destOffset forward ((numberOfSamples * 2) + 2)
@@ -314,6 +315,7 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3
 void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
 	uint32 sourceOffset = 0;
 	uint32 destOffset = 0;
+	int16 numberOfCopy = 0;
 
 	while (sourceOffset < sourceSize) {
 		int8 numberOfSamples = source[sourceOffset];
@@ -322,9 +324,9 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3
 		// If numberOfSamples is negative, the next abs(numberOfSamples) samples should
 		// be copied directly from source to dest
 		if (numberOfSamples < 0) {
-			numberOfSamples = ABS(numberOfSamples);
+			numberOfCopy = -numberOfSamples;
 
-			while (numberOfSamples > 0) {
+			while (numberOfCopy > 0) {
 				if (sourceOffset + 1 >= sourceSize) {
 					return;
 				} else if (destOffset + 1 >= destSize) {
@@ -339,7 +341,7 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3
 
 				sourceOffset += 2;
 				destOffset += 2;
-				numberOfSamples--;
+				numberOfCopy--;
 			}
 
 			// If numberOfSamples is >= 0, copy one sample from source to the
@@ -354,8 +356,8 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3
 			uint16 sampleColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
 			sourceOffset += 2;
 
-			numberOfSamples += 2;
-			while (numberOfSamples > 0) {
+			numberOfCopy = numberOfSamples + 2;
+			while (numberOfCopy > 0) {
 				if (destOffset + 1 >= destSize) {
 					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
 					return;
@@ -363,7 +365,7 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3
 
 				WRITE_UINT16(dest + destOffset, sampleColor);
 				destOffset += 2;
-				numberOfSamples--;
+				numberOfCopy--;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 84681a2439047b9c6a5fd0c89f9be383bd51ad7e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 6 Mar 2014 15:24:18 +0700
Subject: ZVISION: SearchManager dir index in ZIX-file started from 1 not 0,
 include up border

---
 engines/zvision/search_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/search_manager.cpp b/engines/zvision/search_manager.cpp
index 5c94ff0a26..124a49912d 100644
--- a/engines/zvision/search_manager.cpp
+++ b/engines/zvision/search_manager.cpp
@@ -211,7 +211,7 @@ void sManager::loadZix(const Common::String &name) {
 		uint dr = 0;
 		char buf[32];
 		if (sscanf(line.c_str(), "%u %s", &dr, buf) == 2) {
-			if (dr < archives.size() && dr > 0) {
+			if (dr <= archives.size() && dr > 0) {
 				addFile(Common::String(buf), archives[dr - 1]);
 			}
 		}
-- 
cgit v1.2.3


From 74fe47748e11cc58aee46e986d6670636c027e32 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 7 Mar 2014 08:16:17 +0700
Subject: ZVISION: Fix slot rendering for item-to-item click

---
 engines/zvision/slot_control.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/slot_control.cpp b/engines/zvision/slot_control.cpp
index 418aa8fad2..111a7c63e8 100644
--- a/engines/zvision/slot_control.cpp
+++ b/engines/zvision/slot_control.cpp
@@ -168,11 +168,18 @@ bool SlotControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->canRender()) {
 		int cur_item = _engine->getScriptManager()->getStateValue(_key);
 		if (cur_item != _rendered_item) {
-			if (_rendered_item == 0) {
-				if (_bkg)
-					delete _bkg;
+			if (_rendered_item != 0 && cur_item == 0) {
+				_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
+				_rendered_item = cur_item;
+			} else {
+				if (_rendered_item == 0) {
+					if (_bkg)
+						delete _bkg;
 
-				_bkg = _engine->getRenderManager()->getBkgRect(_rectangle);
+					_bkg = _engine->getRenderManager()->getBkgRect(_rectangle);
+				} else {
+					_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
+				}
 
 				char buf[16];
 				if (_engine->getGameId() == GID_NEMESIS)
@@ -195,9 +202,6 @@ bool SlotControl::process(uint32 deltaTimeInMillis) {
 
 				delete srf;
 
-				_rendered_item = cur_item;
-			} else {
-				_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
 				_rendered_item = cur_item;
 			}
 		}
-- 
cgit v1.2.3


From ea6e151047641563f588b6578aea80141f51bbd0 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 9 Mar 2014 23:18:05 +0700
Subject: ZVISION: Add support for sharp(monochrome) font loading

---
 engines/zvision/text.cpp          | 7 +++++++
 engines/zvision/text.h            | 1 +
 engines/zvision/truetype_font.cpp | 8 +++++---
 engines/zvision/truetype_font.h   | 3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/text.cpp b/engines/zvision/text.cpp
index 575ca03d10..e96bf4b32c 100644
--- a/engines/zvision/text.cpp
+++ b/engines/zvision/text.cpp
@@ -58,6 +58,7 @@ cTxtStyle::cTxtStyle() {
 	strikeout = false;
 	underline = false;
 	statebox = 0;
+	sharp = false;
 }
 
 txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
@@ -263,6 +264,9 @@ void cTxtStyle::setFontStyle(sTTFont &font) {
 	if (strikeout)
 		temp_stl |= sTTFont::STTF_STRIKEOUT;
 
+	if (sharp)
+		temp_stl |= sTTFont::STTF_SHARP;
+
 	font.setStyle(temp_stl);
 }
 
@@ -281,6 +285,9 @@ void cTxtStyle::setFont(sTTFont &font) {
 	if (strikeout)
 		temp_stl |= sTTFont::STTF_STRIKEOUT;
 
+	if (sharp)
+		temp_stl |= sTTFont::STTF_SHARP;
+
 	font.loadFont(fontname, size, temp_stl);
 }
 
diff --git a/engines/zvision/text.h b/engines/zvision/text.h
index 40244f7f0c..6937832335 100644
--- a/engines/zvision/text.h
+++ b/engines/zvision/text.h
@@ -74,6 +74,7 @@ public:
 	bool strikeout;
 	bool skipcolor;
 	int32 statebox;
+	bool sharp;
 	// char image ??
 };
 
diff --git a/engines/zvision/truetype_font.cpp b/engines/zvision/truetype_font.cpp
index 5e1bc7a81d..e3eea403b6 100644
--- a/engines/zvision/truetype_font.cpp
+++ b/engines/zvision/truetype_font.cpp
@@ -189,6 +189,8 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 		newFontName = "arial.ttf";
 	}
 
+	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
+
 	Common::File *file = _engine->getSearchManager()->openFile(newFontName);
 
 	if (!file) {
@@ -210,7 +212,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 			if (themeArchive->hasFile("FreeSans.ttf")) {
 				Common::SeekableReadStream *stream = nullptr;
 				stream = themeArchive->createReadStreamForMember("FreeSans.ttf");
-				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60); // 66 dpi for 640 x 480 on 14" display
+				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, sharp); // 66 dpi for 640 x 480 on 14" display
 				if (_newFont) {
 					if (!_font)
 						delete _font;
@@ -223,7 +225,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 			themeArchive = nullptr;
 		}
 	} else {
-		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60); // 66 dpi for 640 x 480 on 14" display
+		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, sharp); // 66 dpi for 640 x 480 on 14" display
 		if (_newFont) {
 			if (!_font)
 				delete _font;
@@ -241,7 +243,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 }
 
 void sTTFont::setStyle(uint newStyle) {
-	if ((_style & (STTF_BOLD | STTF_ITALIC)) != (newStyle & (STTF_BOLD | STTF_ITALIC))) {
+	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
 		_style = newStyle;
 		loadFont(_fntName, _lineHeight);
 	} else {
diff --git a/engines/zvision/truetype_font.h b/engines/zvision/truetype_font.h
index 0462f35aff..497ac763c1 100644
--- a/engines/zvision/truetype_font.h
+++ b/engines/zvision/truetype_font.h
@@ -86,7 +86,8 @@ public:
 		STTF_BOLD = 1,
 		STTF_ITALIC = 2,
 		STTF_UNDERLINE = 4,
-		STTF_STRIKEOUT = 8
+		STTF_STRIKEOUT = 8,
+		STTF_SHARP = 16
 	};
 
 private:
-- 
cgit v1.2.3


From 6ca301c3205cf04e4aa37c16e21224223233ea9b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 9 Mar 2014 23:19:17 +0700
Subject: ZVISION: Add utf8 char length and utf8->uint16 functions

---
 engines/zvision/text.cpp | 30 ++++++++++++++++++++++++++++++
 engines/zvision/text.h   |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/engines/zvision/text.cpp b/engines/zvision/text.cpp
index e96bf4b32c..2fdfafcdf6 100644
--- a/engines/zvision/text.cpp
+++ b/engines/zvision/text.cpp
@@ -515,5 +515,35 @@ Common::String readWideLine(Common::SeekableReadStream &stream) {
 	return asciiString;
 }
 
+int8 getUtf8CharSize(char chr) {
+	if ((chr & 0x80) == 0)
+		return 1;
+	else if ((chr & 0xE0) == 0xC0)
+		return 2;
+	else if ((chr & 0xF0) == 0xE0)
+		return 3;
+	else if ((chr & 0xF8) == 0xF0)
+		return 4;
+	else if ((chr & 0xFC) == 0xF8)
+		return 5;
+	else if ((chr & 0xFE) == 0xFC)
+		return 6;
+
+	return 1;
+}
+
+uint16 readUtf8Char(const char *chr) {
+	uint16 result = 0;
+	if ((chr[0] & 0x80) == 0)
+		result = chr[0];
+	else if ((chr[0] & 0xE0) == 0xC0)
+		result = ((chr[0] & 0x1F) << 6) | (chr[1] & 0x3F);
+	else if ((chr[0] & 0xF0) == 0xE0)
+		result = ((chr[0] & 0x0F) << 12) | ((chr[1] & 0x3F) << 6) | (chr[2] & 0x3F);
+	else
+		result = chr[0];
+
+	return result;
+}
 
 } // End of namespace ZVision
diff --git a/engines/zvision/text.h b/engines/zvision/text.h
index 6937832335..c1dc0c167c 100644
--- a/engines/zvision/text.h
+++ b/engines/zvision/text.h
@@ -92,6 +92,8 @@ private:
 };
 
 Common::String readWideLine(Common::SeekableReadStream &stream);
+int8 getUtf8CharSize(char chr);
+uint16 readUtf8Char(const char *chr);
 
 } // End of namespace ZVision
 
-- 
cgit v1.2.3


From 48360645dcd5f8fddb135b6e31ae5cae4be8d77f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sun, 9 Mar 2014 23:20:27 +0700
Subject: ZVISION: Implement ttyText action

---
 engines/zvision/actions.cpp           |  25 +++++
 engines/zvision/actions.h             |  12 +++
 engines/zvision/module.mk             |   3 +-
 engines/zvision/scr_file_handling.cpp |   2 +-
 engines/zvision/ttytext_node.cpp      | 175 ++++++++++++++++++++++++++++++++++
 engines/zvision/ttytext_node.h        |  76 +++++++++++++++
 6 files changed, 291 insertions(+), 2 deletions(-)
 create mode 100644 engines/zvision/ttytext_node.cpp
 create mode 100644 engines/zvision/ttytext_node.h

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 99fa6a646d..f60a69744a 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -33,6 +33,7 @@
 #include "zvision/music_node.h"
 #include "zvision/syncsound_node.h"
 #include "zvision/animation_node.h"
+#include "zvision/ttytext_node.h"
 
 #include "common/file.h"
 
@@ -653,4 +654,28 @@ bool ActionTimer::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionTtyText
+//////////////////////////////////////////////////////////////////////////////
+
+ActionTtyText::ActionTtyText(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	char filename[64];
+	int32 x1, y1, x2, y2;
+	sscanf(line.c_str(), "%d %d %d %d %s %u", &x1, &y1, &x2, &y2, filename, &_delay);
+	_r = Common::Rect(x1, y1, x2, y2);
+	_filename = Common::String(filename);
+}
+
+ActionTtyText::~ActionTtyText() {
+	_engine->getScriptManager()->killSideFx(_slotkey);
+}
+
+bool ActionTtyText::execute() {
+	if (_engine->getScriptManager()->getSideFX(_slotkey))
+		return true;
+	_engine->getScriptManager()->addSideFX(new ttyTextNode(_engine, _slotkey, _filename, _r, _delay));
+	return true;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index bc88a6d67f..82532cef99 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -24,6 +24,7 @@
 #define ZVISION_ACTIONS_H
 
 #include "common/str.h"
+#include "common/rect.h"
 
 #include "audio/mixer.h"
 
@@ -401,6 +402,17 @@ private:
 	ValueSlot *_time;
 };
 
+class ActionTtyText : public ResultAction {
+public:
+	ActionTtyText(ZVision *engine, int32 slotkey, const Common::String &line);
+	~ActionTtyText();
+	bool execute();
+
+private:
+	Common::String _filename;
+	uint32 _delay;
+	Common::Rect _r;
+};
 } // End of namespace ZVision
 
 #endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 90a297591c..d6d0dd7b5a 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -39,7 +39,8 @@ MODULE_OBJS := \
 	search_manager.o \
 	text.o \
 	subtitles.o \
-	syncsound_node.o
+	syncsound_node.o \
+	ttytext_node.o
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index 347c3a6712..9d1d0bf856 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -281,7 +281,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("timer", true)) {
 					actionList.push_back(new ActionTimer(_engine, slot, args));
 				} else if (act.matchString("ttytext", true)) {
-					// TODO: Implement ActionTTYText
+					actionList.push_back(new ActionTtyText(_engine, slot, args));
 				} else if (act.matchString("universe_music", true)) {
 					actionList.push_back(new ActionMusic(_engine, slot, args, true));
 				} else if (act.matchString("copy_file", true)) {
diff --git a/engines/zvision/ttytext_node.cpp b/engines/zvision/ttytext_node.cpp
new file mode 100644
index 0000000000..4f64800cd7
--- /dev/null
+++ b/engines/zvision/ttytext_node.cpp
@@ -0,0 +1,175 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/ttytext_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/script_manager.h"
+#include "zvision/render_manager.h"
+#include "zvision/text.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+
+
+namespace ZVision {
+
+ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :
+	SideFX(engine, key, SIDEFX_TTYTXT),
+	_fnt(engine) {
+	_delay = delay;
+	_r = r;
+	_txtpos = 0;
+	_nexttime = 0;
+	_dx = 0;
+	_dy = 0;
+
+	Common::File *infile = _engine->getSearchManager()->openFile(file);
+	if (infile) {
+		while (!infile->eos()) {
+			Common::String asciiLine = readWideLine(*infile);
+			if (asciiLine.empty()) {
+				continue;
+			}
+			_txtbuf += asciiLine;
+		}
+
+		delete infile;
+	}
+	_img.create(_r.width(), _r.height(), _engine->_pixelFormat);
+	_style.sharp = true;
+	_style.readAllStyle(_txtbuf);
+	_style.setFont(_fnt);
+	_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+ttyTextNode::~ttyTextNode() {
+	_engine->getScriptManager()->setStateValue(_key, 2);
+	_img.free();
+}
+
+bool ttyTextNode::process(uint32 deltaTimeInMillis) {
+	_nexttime -= deltaTimeInMillis;
+
+	if (_nexttime < 0) {
+		if (_txtpos < _txtbuf.size()) {
+			if (_txtbuf[_txtpos] == '<') {
+				int32 strt = _txtpos;
+				int32 endt = 0;
+				int16 ret = 0;
+				while (_txtbuf[_txtpos] != '>' && _txtpos < _txtbuf.size())
+					_txtpos++;
+				endt = _txtpos;
+				if (strt != -1)
+					if ((endt - strt - 1) > 0)
+						ret = _style.parseStyle(_txtbuf.c_str() + strt + 1, endt - strt - 1);
+
+				if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
+					if (ret & TXT_RET_FNTCHG)
+						_style.setFont(_fnt);
+					if (ret & TXT_RET_FNTSTL)
+						_style.setFontStyle(_fnt);
+
+					if (ret & TXT_RET_NEWLN)
+						newline();
+				}
+
+				if (ret & TXT_RET_HASSTBOX) {
+					Common::String buf;
+					buf.format("%d", _style.statebox);
+
+					for (uint8 j = 0; j < buf.size(); j++)
+						outchar(buf[j]);
+				}
+
+				_txtpos++;
+			} else {
+				int8 charsz = getUtf8CharSize(_txtbuf[_txtpos]);
+
+				uint16 chr = readUtf8Char(_txtbuf.c_str() + _txtpos);
+
+				if (chr == ' ') {
+					uint32 i = _txtpos + charsz;
+					uint16 width = _fnt.getCharWidth(chr);
+
+					while (i < _txtbuf.size() && _txtbuf[i] != ' ' && _txtbuf[i] != '<') {
+
+						int8 chsz   = getUtf8CharSize(_txtbuf[i]);
+						uint16 uchr = readUtf8Char(_txtbuf.c_str() + _txtpos);
+
+						width += _fnt.getCharWidth(uchr);
+
+						i += chsz;
+					}
+
+					if (_dx + width > _r.width())
+						newline();
+					else
+						outchar(chr);
+				} else
+					outchar(chr);
+
+				_txtpos += charsz;
+			}
+			_nexttime = _delay;
+			_engine->getRenderManager()->blitSurfaceToBkg(_img, _r.left, _r.top);
+		} else
+			return stop();
+	}
+
+	return false;
+}
+
+void ttyTextNode::scroll() {
+	int32 scrl = 0;
+	while (_dy - scrl > _r.height() - _fnt.getFontHeight())
+		scrl += _fnt.getFontHeight();
+	int8 *pixels = (int8 *)_img.getPixels();
+	for (uint16 h = scrl; h < _img.h; h++)
+		memcpy(pixels + _img.pitch * (h - scrl), pixels + _img.pitch * h, _img.pitch);
+
+	_img.fillRect(Common::Rect(0, _img.h - scrl, _img.w, _img.h), 0);
+	_dy -= scrl;
+}
+
+void ttyTextNode::newline() {
+	_dy += _fnt.getFontHeight();
+	_dx = 0;
+}
+
+void ttyTextNode::outchar(uint16 chr) {
+	uint32 clr = _engine->_pixelFormat.RGBToColor(_style.red, _style.green, _style.blue);
+
+	if (_dx + _fnt.getCharWidth(chr) > _r.width())
+		newline();
+
+	if (_dy + _fnt.getFontHeight() >= _r.height())
+		scroll();
+
+	_fnt.drawChar(&_img, chr, _dx, _dy, clr);
+
+	_dx += _fnt.getCharWidth(chr);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/ttytext_node.h b/engines/zvision/ttytext_node.h
new file mode 100644
index 0000000000..6c3e6f46af
--- /dev/null
+++ b/engines/zvision/ttytext_node.h
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_TTYTEXT_NODE_H
+#define ZVISION_TTYTEXT_NODE_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+#include "zvision/sidefx.h"
+#include "zvision/text.h"
+#include "zvision/truetype_font.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class ttyTextNode : public SideFX {
+public:
+	ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay);
+	~ttyTextNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+private:
+	Common::Rect _r;
+	//int16 x;
+	//int16 y;
+	//uint16 w;
+	//uint16 h;
+	cTxtStyle _style;
+	sTTFont _fnt;
+	Common::String _txtbuf;
+	uint32 _txtpos;
+	//int32 txtsize;
+	int32 _delay;
+	int32 _nexttime;
+	Graphics::Surface _img;
+	int16 _dx;
+	int16 _dy;
+private:
+
+	void newline();
+	void scroll();
+	void outchar(uint16 chr);
+};
+
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From ace0e5e88f63f34dad94962c95f57f3ec42258ae Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 14 Jun 2014 15:18:24 +0700
Subject: ZVISION: Fix compilation errors with latest scummvm

---
 engines/zvision/animation/rlf_animation.cpp        |  2 +-
 engines/zvision/animation_node.cpp                 |  4 +-
 engines/zvision/core/console.cpp                   | 62 +++++++++++-----------
 engines/zvision/core/events.cpp                    | 12 ++---
 engines/zvision/core/menu.h                        |  2 +-
 engines/zvision/cursors/cursor.cpp                 |  2 +-
 engines/zvision/cursors/cursor_manager.cpp         |  2 +-
 engines/zvision/cursors/cursor_manager.h           |  2 +-
 engines/zvision/fonts/truetype_font.cpp            |  8 +--
 engines/zvision/fonts/truetype_font.h              |  6 +--
 engines/zvision/graphics/render_manager.cpp        | 10 ++--
 engines/zvision/graphics/render_manager.h          |  4 +-
 engines/zvision/inventory_manager.cpp              |  2 +-
 engines/zvision/menu.cpp                           |  4 +-
 engines/zvision/meta_animation.cpp                 |  8 +--
 engines/zvision/module.mk                          | 52 +++++++++---------
 engines/zvision/music_node.cpp                     |  6 +--
 engines/zvision/music_node.h                       |  2 +-
 engines/zvision/scripting/actions.cpp              | 12 ++---
 .../zvision/scripting/controls/input_control.cpp   | 10 ++--
 .../zvision/scripting/controls/lever_control.cpp   | 10 ++--
 engines/zvision/scripting/controls/timer_node.cpp  |  4 +-
 engines/zvision/scripting/puzzle.h                 |  2 +-
 engines/zvision/scripting/scr_file_handling.cpp    | 12 ++---
 engines/zvision/scripting/script_manager.cpp       | 14 ++---
 engines/zvision/scripting/script_manager.h         |  4 +-
 engines/zvision/search_manager.cpp                 |  2 +-
 engines/zvision/sidefx.cpp                         |  4 +-
 engines/zvision/slot_control.cpp                   |  8 +--
 engines/zvision/slot_control.h                     |  2 +-
 engines/zvision/sound/zork_raw.cpp                 |  4 +-
 engines/zvision/subtitles.cpp                      |  4 +-
 engines/zvision/syncsound_node.cpp                 |  6 +--
 engines/zvision/syncsound_node.h                   |  2 +-
 engines/zvision/text.cpp                           |  6 +--
 engines/zvision/text.h                             |  2 +-
 engines/zvision/ttytext_node.cpp                   |  4 +-
 engines/zvision/ttytext_node.h                     |  2 +-
 engines/zvision/video/video.cpp                    |  6 +--
 engines/zvision/video/zork_avi_decoder.h           |  2 +-
 engines/zvision/zvision.cpp                        | 18 +++----
 engines/zvision/zvision.h                          |  2 +-
 42 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
index 5784df0dac..2bb0271966 100644
--- a/engines/zvision/animation/rlf_animation.cpp
+++ b/engines/zvision/animation/rlf_animation.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/rlf_animation.h"
+#include "zvision/animation/rlf_animation.h"
 
 #include "common/str.h"
 #include "common/file.h"
diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 365ff747f4..49ef22bb51 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -25,8 +25,8 @@
 #include "zvision/animation_node.h"
 
 #include "zvision/zvision.h"
-#include "zvision/render_manager.h"
-#include "zvision/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
 #include "zvision/meta_animation.h"
 
 #include "graphics/surface.h"
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 252a4b75ef..ef088f7553 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -22,16 +22,16 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/console.h"
+#include "zvision/core/console.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/string_manager.h"
-#include "zvision/zork_avi_decoder.h"
-#include "zvision/zork_raw.h"
-#include "zvision/utility.h"
-#include "zvision/cursor.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/strings/string_manager.h"
+#include "zvision/video/zork_avi_decoder.h"
+#include "zvision/sound/zork_raw.h"
+#include "zvision/utility/utility.h"
+#include "zvision/cursors/cursor.h"
 
 #include "common/system.h"
 #include "common/file.h"
@@ -45,18 +45,18 @@
 namespace ZVision {
 
 Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
-	DCmd_Register("loadimage", WRAP_METHOD(Console, cmdLoadImage));
-	DCmd_Register("loadvideo", WRAP_METHOD(Console, cmdLoadVideo));
-	DCmd_Register("loadsound", WRAP_METHOD(Console, cmdLoadSound));
-	DCmd_Register("raw2wav", WRAP_METHOD(Console, cmdRawToWav));
-	DCmd_Register("setrenderstate", WRAP_METHOD(Console, cmdSetRenderState));
-	DCmd_Register("generaterendertable", WRAP_METHOD(Console, cmdGenerateRenderTable));
-	DCmd_Register("setpanoramafov", WRAP_METHOD(Console, cmdSetPanoramaFoV));
-	DCmd_Register("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale));
-	DCmd_Register("changelocation", WRAP_METHOD(Console, cmdChangeLocation));
-	DCmd_Register("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
-	DCmd_Register("parseallscrfiles", WRAP_METHOD(Console, cmdParseAllScrFiles));
-	DCmd_Register("rendertext", WRAP_METHOD(Console, cmdRenderText));
+	registerCmd("loadimage", WRAP_METHOD(Console, cmdLoadImage));
+	registerCmd("loadvideo", WRAP_METHOD(Console, cmdLoadVideo));
+	registerCmd("loadsound", WRAP_METHOD(Console, cmdLoadSound));
+	registerCmd("raw2wav", WRAP_METHOD(Console, cmdRawToWav));
+	registerCmd("setrenderstate", WRAP_METHOD(Console, cmdSetRenderState));
+	registerCmd("generaterendertable", WRAP_METHOD(Console, cmdGenerateRenderTable));
+	registerCmd("setpanoramafov", WRAP_METHOD(Console, cmdSetPanoramaFoV));
+	registerCmd("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale));
+	registerCmd("changelocation", WRAP_METHOD(Console, cmdChangeLocation));
+	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
+	registerCmd("parseallscrfiles", WRAP_METHOD(Console, cmdParseAllScrFiles));
+	registerCmd("rendertext", WRAP_METHOD(Console, cmdRenderText));
 }
 
 bool Console::cmdLoadImage(int argc, const char **argv) {
@@ -72,7 +72,7 @@ bool Console::cmdLoadImage(int argc, const char **argv) {
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Use loadvideo <fileName> to load a video to the screen\n");
+		debugPrintf("Use loadvideo <fileName> to load a video to the screen\n");
 		return true;
 	}
 
@@ -86,7 +86,7 @@ bool Console::cmdLoadVideo(int argc, const char **argv) {
 
 bool Console::cmdLoadSound(int argc, const char **argv) {
 	if (!Common::File::exists(argv[1])) {
-		DebugPrintf("File does not exist\n");
+		debugPrintf("File does not exist\n");
 		return true;
 	}
 
@@ -105,7 +105,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) {
 		Audio::SoundHandle handle;
 		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, soundStream, -1, 100, 0, DisposeAfterUse::YES, false, false);
 	} else {
-		DebugPrintf("Use loadsound <fileName> [<rate> <isStereo: 1 or 0>] to load a sound\n");
+		debugPrintf("Use loadsound <fileName> [<rate> <isStereo: 1 or 0>] to load a sound\n");
 		return true;
 	}
 
@@ -114,7 +114,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) {
 
 bool Console::cmdRawToWav(int argc, const char **argv) {
 	if (argc != 3) {
-		DebugPrintf("Use raw2wav <rawFilePath> <wavFileName> to dump a .RAW file to .WAV\n");
+		debugPrintf("Use raw2wav <rawFilePath> <wavFileName> to dump a .RAW file to .WAV\n");
 		return true;
 	}
 
@@ -124,7 +124,7 @@ bool Console::cmdRawToWav(int argc, const char **argv) {
 
 bool Console::cmdSetRenderState(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n");
+		debugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n");
 		return true;
 	}
 
@@ -137,7 +137,7 @@ bool Console::cmdSetRenderState(int argc, const char **argv) {
 	else if (renderState.matchString("flat", true))
 		_engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::FLAT);
 	else
-		DebugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n");
+		debugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n");
 
 	return true;
 }
@@ -150,7 +150,7 @@ bool Console::cmdGenerateRenderTable(int argc, const char **argv) {
 
 bool Console::cmdSetPanoramaFoV(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Use setpanoramafov <fieldOfView> to change the current panorama field of view\n");
+		debugPrintf("Use setpanoramafov <fieldOfView> to change the current panorama field of view\n");
 		return true;
 	}
 
@@ -161,7 +161,7 @@ bool Console::cmdSetPanoramaFoV(int argc, const char **argv) {
 
 bool Console::cmdSetPanoramaScale(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Use setpanoramascale <scale> to change the current panorama scale\n");
+		debugPrintf("Use setpanoramascale <scale> to change the current panorama scale\n");
 		return true;
 	}
 
@@ -172,7 +172,7 @@ bool Console::cmdSetPanoramaScale(int argc, const char **argv) {
 
 bool Console::cmdChangeLocation(int argc, const char **argv) {
 	if (argc != 6) {
-		DebugPrintf("Use changelocation <char: world> <char: room> <char:node> <char:view> <int: x position> to change your location\n");
+		debugPrintf("Use changelocation <char: world> <char: room> <char:node> <char:view> <int: x position> to change your location\n");
 		return true;
 	}
 
@@ -183,7 +183,7 @@ bool Console::cmdChangeLocation(int argc, const char **argv) {
 
 bool Console::cmdDumpFile(int argc, const char **argv) {
 	if (argc != 2) {
-		DebugPrintf("Use dumpfile <fileName> to dump a file\n");
+		debugPrintf("Use dumpfile <fileName> to dump a file\n");
 		return true;
 	}
 
@@ -204,7 +204,7 @@ bool Console::cmdParseAllScrFiles(int argc, const char **argv) {
 
 bool Console::cmdRenderText(int argc, const char **argv) {
 	if (argc != 7) {
-		DebugPrintf("Use rendertext <text> <fontNumber> <destX> <destY> <maxWidth> <1 or 0: wrap> to render text\n");
+		debugPrintf("Use rendertext <text> <fontNumber> <destX> <destY> <maxWidth> <1 or 0: wrap> to render text\n");
 		return true;
 	}
 
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 189bf007c1..943f8ff279 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -24,12 +24,12 @@
 
 #include "zvision/zvision.h"
 
-#include "zvision/console.h"
-#include "zvision/cursor_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/script_manager.h"
-#include "zvision/rlf_animation.h"
-#include "zvision/menu.h"
+#include "zvision/core/console.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/animation/rlf_animation.h"
+#include "zvision/core/menu.h"
 
 #include "common/events.h"
 #include "common/system.h"
diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
index 7be03f62ef..cc802ee5f5 100644
--- a/engines/zvision/core/menu.h
+++ b/engines/zvision/core/menu.h
@@ -27,7 +27,7 @@
 #include "common/rect.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
+#include "zvision/scripting/script_manager.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/cursors/cursor.cpp b/engines/zvision/cursors/cursor.cpp
index e2e3d7ee72..8c6027a1bb 100644
--- a/engines/zvision/cursors/cursor.cpp
+++ b/engines/zvision/cursors/cursor.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/cursor.h"
+#include "zvision/cursors/cursor.h"
 
 #include "common/str.h"
 #include "common/file.h"
diff --git a/engines/zvision/cursors/cursor_manager.cpp b/engines/zvision/cursors/cursor_manager.cpp
index c66fa650a8..cfb4baf636 100644
--- a/engines/zvision/cursors/cursor_manager.cpp
+++ b/engines/zvision/cursors/cursor_manager.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/cursor_manager.h"
+#include "zvision/cursors/cursor_manager.h"
 
 #include "zvision/zvision.h"
 
diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h
index 0521a17337..5392fd5e03 100644
--- a/engines/zvision/cursors/cursor_manager.h
+++ b/engines/zvision/cursors/cursor_manager.h
@@ -23,7 +23,7 @@
 #ifndef ZVISION_CURSOR_MANAGER_H
 #define ZVISION_CURSOR_MANAGER_H
 
-#include "zvision/cursor.h"
+#include "zvision/cursors/cursor.h"
 
 #include "common/str.h"
 
diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp
index e3eea403b6..224603c469 100644
--- a/engines/zvision/fonts/truetype_font.cpp
+++ b/engines/zvision/fonts/truetype_font.cpp
@@ -22,10 +22,10 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/truetype_font.h"
+#include "zvision/fonts/truetype_font.h"
 
 #include "zvision/zvision.h"
-#include "zvision/render_manager.h"
+#include "zvision/graphics/render_manager.h"
 
 #include "common/config-manager.h"
 #include "common/debug.h"
@@ -212,7 +212,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 			if (themeArchive->hasFile("FreeSans.ttf")) {
 				Common::SeekableReadStream *stream = nullptr;
 				stream = themeArchive->createReadStreamForMember("FreeSans.ttf");
-				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, sharp); // 66 dpi for 640 x 480 on 14" display
+				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
 				if (_newFont) {
 					if (!_font)
 						delete _font;
@@ -225,7 +225,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 			themeArchive = nullptr;
 		}
 	} else {
-		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, sharp); // 66 dpi for 640 x 480 on 14" display
+		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
 		if (_newFont) {
 			if (!_font)
 				delete _font;
diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h
index bed1d5513e..0fed3ccbc4 100644
--- a/engines/zvision/fonts/truetype_font.h
+++ b/engines/zvision/fonts/truetype_font.h
@@ -43,12 +43,12 @@ public:
 	~TruetypeFont();
 
 private:
-//	ZVision *_engine;
+	ZVision *_engine;
 	Graphics::Font *_font;
 	int _lineHeight;
 
-//	size_t _maxCharWidth;
-//	size_t _maxCharHeight;
+	size_t _maxCharWidth;
+	size_t _maxCharHeight;
 
 public:
 	int32 _fontHeight;
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 071affffab..c9dc5d37b2 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -23,10 +23,10 @@
 #include "common/scummsys.h"
 
 #include "zvision/zvision.h"
-#include "zvision/render_manager.h"
+#include "zvision/graphics/render_manager.h"
 #include "zvision/text.h"
 
-#include "zvision/lzss_read_stream.h"
+#include "zvision/utility/lzss_read_stream.h"
 
 #include "common/file.h"
 #include "common/system.h"
@@ -34,7 +34,7 @@
 
 #include "engines/util.h"
 
-#include "graphics/decoders/tga.h"
+#include "image/tga.h"
 
 
 namespace ZVision {
@@ -127,7 +127,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 
 	uint32 imageWidth;
 	uint32 imageHeight;
-	Graphics::TGADecoder tga;
+	Image::TGADecoder tga;
 	uint16 *buffer;
 	bool isTransposed = _renderTable.getRenderState() == RenderTable::PANORAMA;
 	// All ZVision images are in RGB 555
@@ -221,7 +221,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 
 	uint32 imageWidth;
 	uint32 imageHeight;
-	Graphics::TGADecoder tga;
+	Image::TGADecoder tga;
 	uint16 *buffer;
 	// All ZVision images are in RGB 555
 	Graphics::PixelFormat pixelFormat555 = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 668c8acc41..ca2e715e8a 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -23,8 +23,8 @@
 #ifndef ZVISION_RENDER_MANAGER_H
 #define ZVISION_RENDER_MANAGER_H
 
-#include "zvision/render_table.h"
-#include "zvision/truetype_font.h"
+#include "zvision/graphics/render_table.h"
+#include "zvision/fonts/truetype_font.h"
 
 #include "common/rect.h"
 #include "common/hashmap.h"
diff --git a/engines/zvision/inventory_manager.cpp b/engines/zvision/inventory_manager.cpp
index 3924c6b51a..f8b22970c4 100644
--- a/engines/zvision/inventory_manager.cpp
+++ b/engines/zvision/inventory_manager.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/script_manager.h"
+#include "zvision/scripting/script_manager.h"
 
 
 namespace ZVision {
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
index bf422b300f..bf311c4577 100644
--- a/engines/zvision/menu.cpp
+++ b/engines/zvision/menu.cpp
@@ -22,9 +22,9 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/menu.h"
+#include "zvision/core/menu.h"
 
-#include "zvision/render_manager.h"
+#include "zvision/graphics/render_manager.h"
 
 
 namespace ZVision {
diff --git a/engines/zvision/meta_animation.cpp b/engines/zvision/meta_animation.cpp
index 33ae92a523..dddc238379 100644
--- a/engines/zvision/meta_animation.cpp
+++ b/engines/zvision/meta_animation.cpp
@@ -25,10 +25,10 @@
 #include "zvision/meta_animation.h"
 
 #include "zvision/zvision.h"
-#include "zvision/render_manager.h"
-#include "zvision/script_manager.h"
-#include "zvision/rlf_animation.h"
-#include "zvision/zork_avi_decoder.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/animation/rlf_animation.h"
+#include "zvision/video/zork_avi_decoder.h"
 
 #include "video/video_decoder.h"
 
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index d6d0dd7b5a..a386f6fac6 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -1,35 +1,35 @@
 MODULE := engines/zvision
  
 MODULE_OBJS := \
-	actions.o \
+	scripting/actions.o \
 	animation_node.o \
-	clock.o \
-	console.o \
-	control.o \
-	cursor.o \
-	cursor_manager.o \
+	utility/clock.o \
+	core/console.o \
+	scripting/control.o \
+	cursors/cursor.o \
+	cursors/cursor_manager.o \
 	detection.o \
-	events.o \
-	input_control.o \
-	lever_control.o \
-	lzss_read_stream.o \
-	push_toggle_control.o \
-	render_manager.o \
-	render_table.o \
-	rlf_animation.o \
-	save_manager.o \
-	scr_file_handling.o \
-	script_manager.o \
-	single_value_container.o \
-	string_manager.o \
-	timer_node.o \
-	truetype_font.o \
-	utility.o \
-	video.o \
+	core/events.o \
+	scripting/controls/input_control.o \
+	scripting/controls/lever_control.o \
+	utility/lzss_read_stream.o \
+	scripting/controls/push_toggle_control.o \
+	graphics/render_manager.o \
+	graphics/render_table.o \
+	animation/rlf_animation.o \
+	core/save_manager.o \
+	scripting/scr_file_handling.o \
+	scripting/script_manager.o \
+	utility/single_value_container.o \
+	strings/string_manager.o \
+	scripting/controls/timer_node.o \
+	fonts/truetype_font.o \
+	utility/utility.o \
+	video/video.o \
 	zvision.o \
-	zfs_archive.o \
-	zork_avi_decoder.o \
-	zork_raw.o \
+	archives/zfs_archive.o \
+	video/zork_avi_decoder.o \
+	sound/zork_raw.o \
 	sidefx.o \
 	music_node.o \
 	inventory_manager.o \
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index b716b3ead1..f8fd08b285 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -25,9 +25,9 @@
 #include "zvision/music_node.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/zork_raw.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/zork_raw.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
index d24496fc02..0dad22614b 100644
--- a/engines/zvision/music_node.h
+++ b/engines/zvision/music_node.h
@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/sidefx.h"
-#include "zvision/subtitles.h"
+#include "zvision/subtitles/subtitles.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index f60a69744a..3c341fbc80 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -22,14 +22,14 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/actions.h"
+#include "zvision/scripting/actions.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/zork_raw.h"
-#include "zvision/zork_avi_decoder.h"
-#include "zvision/timer_node.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/zork_raw.h"
+#include "zvision/video/zork_avi_decoder.h"
+#include "zvision/scripting/controls/timer_node.h"
 #include "zvision/music_node.h"
 #include "zvision/syncsound_node.h"
 #include "zvision/animation_node.h"
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index a366e06923..ca707b5ab0 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -22,13 +22,13 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/input_control.h"
+#include "zvision/scripting/controls/input_control.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/string_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/utility.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/strings/string_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
 
 #include "common/str.h"
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index f68f256229..121fab97e1 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -22,14 +22,14 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/lever_control.h"
+#include "zvision/scripting/controls/lever_control.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/cursor_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/cursors/cursor_manager.h"
 #include "zvision/meta_animation.h"
-#include "zvision/utility.h"
+#include "zvision/utility/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/timer_node.cpp b/engines/zvision/scripting/controls/timer_node.cpp
index a94f6db19b..e68610f537 100644
--- a/engines/zvision/scripting/controls/timer_node.cpp
+++ b/engines/zvision/scripting/controls/timer_node.cpp
@@ -22,10 +22,10 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/timer_node.h"
+#include "zvision/scripting/controls/timer_node.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
+#include "zvision/scripting/script_manager.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h
index 4d50756b87..ab38c5fc5d 100644
--- a/engines/zvision/scripting/puzzle.h
+++ b/engines/zvision/scripting/puzzle.h
@@ -23,7 +23,7 @@
 #ifndef ZVISION_PUZZLE_H
 #define ZVISION_PUZZLE_H
 
-#include "zvision/actions.h"
+#include "zvision/scripting/actions.h"
 
 #include "common/list.h"
 #include "common/ptr.h"
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 9d1d0bf856..fff187d369 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -23,13 +23,13 @@
 #include "common/scummsys.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
+#include "zvision/scripting/script_manager.h"
 
-#include "zvision/utility.h"
-#include "zvision/puzzle.h"
-#include "zvision/actions.h"
-#include "zvision/push_toggle_control.h"
-#include "zvision/lever_control.h"
+#include "zvision/utility/utility.h"
+#include "zvision/scripting/puzzle.h"
+#include "zvision/scripting/actions.h"
+#include "zvision/scripting/controls/push_toggle_control.h"
+#include "zvision/scripting/controls/lever_control.h"
 #include "zvision/slot_control.h"
 
 #include "common/textconsole.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 1a567397a8..9713a34733 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -22,15 +22,15 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/script_manager.h"
+#include "zvision/scripting/script_manager.h"
 
 #include "zvision/zvision.h"
-#include "zvision/render_manager.h"
-#include "zvision/cursor_manager.h"
-#include "zvision/save_manager.h"
-#include "zvision/actions.h"
-#include "zvision/utility.h"
-#include "zvision/timer_node.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/core/save_manager.h"
+#include "zvision/scripting/actions.h"
+#include "zvision/utility/utility.h"
+#include "zvision/scripting/controls/timer_node.h"
 
 #include "common/algorithm.h"
 #include "common/hashmap.h"
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 6adade5745..a835c13951 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -23,8 +23,8 @@
 #ifndef ZVISION_SCRIPT_MANAGER_H
 #define ZVISION_SCRIPT_MANAGER_H
 
-#include "zvision/puzzle.h"
-#include "zvision/control.h"
+#include "zvision/scripting/puzzle.h"
+#include "zvision/scripting/control.h"
 #include "zvision/sidefx.h"
 
 #include "common/hashmap.h"
diff --git a/engines/zvision/search_manager.cpp b/engines/zvision/search_manager.cpp
index 124a49912d..db120f2a4b 100644
--- a/engines/zvision/search_manager.cpp
+++ b/engines/zvision/search_manager.cpp
@@ -22,7 +22,7 @@
 #include "common/debug.h"
 
 #include "zvision/search_manager.h"
-#include "zvision/zfs_archive.h"
+#include "zvision/archives/zfs_archive.h"
 #include "common/fs.h"
 #include "common/stream.h"
 
diff --git a/engines/zvision/sidefx.cpp b/engines/zvision/sidefx.cpp
index 3874c86485..7ba1959db7 100644
--- a/engines/zvision/sidefx.cpp
+++ b/engines/zvision/sidefx.cpp
@@ -25,8 +25,8 @@
 #include "zvision/sidefx.h"
 
 #include "zvision/zvision.h"
-#include "zvision/render_manager.h"
-#include "zvision/utility.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/slot_control.cpp b/engines/zvision/slot_control.cpp
index 111a7c63e8..d3d9c2ec4b 100644
--- a/engines/zvision/slot_control.cpp
+++ b/engines/zvision/slot_control.cpp
@@ -25,10 +25,10 @@
 #include "zvision/slot_control.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/cursor_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/utility.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/slot_control.h b/engines/zvision/slot_control.h
index eec2d04518..0ac8ec9ce0 100644
--- a/engines/zvision/slot_control.h
+++ b/engines/zvision/slot_control.h
@@ -23,7 +23,7 @@
 #ifndef ZVISION_SLOT_CONTROL_H
 #define ZVISION_SLOT_CONTROL_H
 
-#include "zvision/control.h"
+#include "zvision/scripting/control.h"
 
 #include "graphics/surface.h"
 
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index a4d091f3c0..a0f660f65f 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -22,11 +22,11 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/zork_raw.h"
+#include "zvision/sound/zork_raw.h"
 
 #include "zvision/zvision.h"
 #include "zvision/detection.h"
-#include "zvision/utility.h"
+#include "zvision/utility/utility.h"
 
 #include "common/file.h"
 #include "common/str.h"
diff --git a/engines/zvision/subtitles.cpp b/engines/zvision/subtitles.cpp
index 1942e3c979..da9b0fc1c9 100644
--- a/engines/zvision/subtitles.cpp
+++ b/engines/zvision/subtitles.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "zvision/subtitles.h"
-#include "zvision/render_manager.h"
+#include "zvision/subtitles/subtitles.h"
+#include "zvision/graphics/render_manager.h"
 #include "zvision/search_manager.h"
 #include "zvision/text.h"
 
diff --git a/engines/zvision/syncsound_node.cpp b/engines/zvision/syncsound_node.cpp
index 5d04c1fb70..7bd520d475 100644
--- a/engines/zvision/syncsound_node.cpp
+++ b/engines/zvision/syncsound_node.cpp
@@ -25,9 +25,9 @@
 #include "zvision/syncsound_node.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/zork_raw.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/zork_raw.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/syncsound_node.h b/engines/zvision/syncsound_node.h
index 7d875f2797..1f63ec48dd 100644
--- a/engines/zvision/syncsound_node.h
+++ b/engines/zvision/syncsound_node.h
@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/sidefx.h"
-#include "zvision/subtitles.h"
+#include "zvision/subtitles/subtitles.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/text.cpp b/engines/zvision/text.cpp
index 2fdfafcdf6..6b0ff0712b 100644
--- a/engines/zvision/text.cpp
+++ b/engines/zvision/text.cpp
@@ -24,7 +24,7 @@
 
 #include "zvision/text.h"
 
-#include "zvision/truetype_font.h"
+#include "zvision/fonts/truetype_font.h"
 
 #include "common/file.h"
 #include "common/tokenizer.h"
@@ -37,8 +37,8 @@
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 
-#include "zvision/render_manager.h"
-#include "zvision/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
 
 
 namespace ZVision {
diff --git a/engines/zvision/text.h b/engines/zvision/text.h
index c1dc0c167c..4b318fdef0 100644
--- a/engines/zvision/text.h
+++ b/engines/zvision/text.h
@@ -25,7 +25,7 @@
 #define ZVISION_TEXT_H
 
 #include "zvision/detection.h"
-#include "zvision/truetype_font.h"
+#include "zvision/fonts/truetype_font.h"
 #include "zvision/zvision.h"
 
 
diff --git a/engines/zvision/ttytext_node.cpp b/engines/zvision/ttytext_node.cpp
index 4f64800cd7..6741d28a56 100644
--- a/engines/zvision/ttytext_node.cpp
+++ b/engines/zvision/ttytext_node.cpp
@@ -25,8 +25,8 @@
 #include "zvision/ttytext_node.h"
 
 #include "zvision/zvision.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
 #include "zvision/text.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/ttytext_node.h b/engines/zvision/ttytext_node.h
index 6c3e6f46af..e25fdb0c07 100644
--- a/engines/zvision/ttytext_node.h
+++ b/engines/zvision/ttytext_node.h
@@ -28,7 +28,7 @@
 
 #include "zvision/sidefx.h"
 #include "zvision/text.h"
-#include "zvision/truetype_font.h"
+#include "zvision/fonts/truetype_font.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 0ad9000fcb..7a120df76b 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -24,9 +24,9 @@
 
 #include "zvision/zvision.h"
 
-#include "zvision/clock.h"
-#include "zvision/render_manager.h"
-#include "zvision/subtitles.h"
+#include "zvision/utility/clock.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/subtitles/subtitles.h"
 
 #include "common/system.h"
 
diff --git a/engines/zvision/video/zork_avi_decoder.h b/engines/zvision/video/zork_avi_decoder.h
index d8937ac057..db1ad312c7 100644
--- a/engines/zvision/video/zork_avi_decoder.h
+++ b/engines/zvision/video/zork_avi_decoder.h
@@ -25,7 +25,7 @@
 #define ZORK_AVI_DECODER_H
 
 #include "video/avi_decoder.h"
-#include "zork_raw.h"
+#include "zvision/sound/zork_raw.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b1615aa7b4..580f8c4367 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -24,18 +24,18 @@
 
 #include "zvision/zvision.h"
 
-#include "zvision/console.h"
-#include "zvision/script_manager.h"
-#include "zvision/render_manager.h"
-#include "zvision/cursor_manager.h"
-#include "zvision/save_manager.h"
-#include "zvision/string_manager.h"
-#include "zvision/zfs_archive.h"
+#include "zvision/core/console.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/core/save_manager.h"
+#include "zvision/strings/string_manager.h"
+#include "zvision/archives/zfs_archive.h"
 #include "zvision/detection.h"
-#include "zvision/menu.h"
+#include "zvision/core/menu.h"
 #include "zvision/search_manager.h"
 #include "zvision/text.h"
-#include "zvision/truetype_font.h"
+#include "zvision/fonts/truetype_font.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 982d3fd98b..2674df27e0 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -25,7 +25,7 @@
 #define ZVISION_ZVISION_H
 
 #include "zvision/detection.h"
-#include "zvision/clock.h"
+#include "zvision/utility/clock.h"
 #include "zvision/search_manager.h"
 
 #include "common/random.h"
-- 
cgit v1.2.3


From 84fb3e816d3c66105a0291834c8ab8bed352b4af Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Tue, 17 Jun 2014 09:34:15 +0200
Subject: TONY: Switch to 565 screen format.

The old (555) screen format is not supported by some backends.

This leaves the savegame thumbnails as 555 (for compatibility).
---
 engines/tony/game.cpp    |   4 +-
 engines/tony/gfxcore.cpp | 119 ++++++++++++++++++++++++++---------------------
 engines/tony/window.cpp  |  12 ++---
 3 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index c102242dfd..0a2c62330b 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -1557,14 +1557,14 @@ void RMPointer::updateCursor() {
 		for (int i = 0; i < 64; i++) {
 			uint16 *lineP = src;
 			for (int j = 0; j < 64; j++) {
-				lineP[j] = RMGfxTargetBuffer::_precalcTable[lineP[j] & 0x7FFF];
+				lineP[j] = RMGfxTargetBuffer::_precalcTable[lineP[j]];
 			}
 			src += 64;
 		}
 	}
 
 	// Get the raw pixel data and set the cursor to it
-	Graphics::PixelFormat pixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
+	Graphics::PixelFormat pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
 	CursorMan.replaceCursor(cursorData, 64, 64, _cursorHotspot._x, _cursorHotspot._y, 0, 1, &pixelFormat);
 }
 
diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index 9254d59df6..b8350eb8d7 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -422,11 +422,11 @@ uint16 *RMGfxTargetBuffer::_precalcTable = NULL;
  * called if the user selects the black & white option.
  */
 void RMGfxTargetBuffer::createBWPrecalcTable() {
-	_precalcTable = new uint16[0x8000];
+	_precalcTable = new uint16[0x10000];
 
-	for (int i = 0; i < 0x8000; i++) {
-		int r = (i >> 10) & 0x1F;
-		int g = (i >> 5) & 0x1F;
+	for (int i = 0; i < 0x10000; i++) {
+		int r = (i >> 11) & 0x1F;
+		int g = (i >> 6) & 0x1F;
 		int b = i & 0x1F;
 
 		int min = MIN(r, MIN(g, b));
@@ -434,11 +434,11 @@ void RMGfxTargetBuffer::createBWPrecalcTable() {
 
 		min = (min + max) / 2;
 
-		r = CLIP(min + 8 - 8, 0, 31);
-		g = CLIP(min + 5 - 8, 0, 31);
-		b = CLIP(min + 0 - 8, 0, 31);
+		r = CLIP(min + 8 - 8, 0, 0x1f);
+		g = CLIP(min + 5 - 8, 0, 0x1f);
+		b = CLIP(min + 0 - 8, 0, 0x1f);
 
-		_precalcTable[i] = (r << 10) | (g << 5) | b;
+		_precalcTable[i] = (r << 11) | (g << 6) | b;
 	}
 }
 
@@ -512,8 +512,9 @@ int RMGfxSourceBufferPal::loadPalette(const byte *buf) {
 
 void RMGfxSourceBufferPal::preparePalette() {
 	for (int i = 0; i < 256; i++) {
-		_palFinal[i] = (((int)_pal[i * 3 + 0] >> 3) <<  10) |
-		                (((int)_pal[i * 3 + 1] >> 3) <<  5) |
+		// we convert 555 to 565 here.
+		_palFinal[i] = (((int)_pal[i * 3 + 0] >> 3) <<  11) |
+		                (((int)_pal[i * 3 + 1] >> 3) <<  6) |
 		                (((int)_pal[i * 3 + 2] >> 3) <<  0);
 	}
 }
@@ -665,8 +666,8 @@ void RMGfxSourceBuffer8::create(int dimx, int dimy) {
 	RMGfxBuffer::create(dimx, dimy, 8);
 }
 
-#define GETRED(x)   (((x) >> 10) & 0x1F)
-#define GETGREEN(x) (((x) >> 5) & 0x1F)
+#define GETRED(x)   (((x) >> 11) & 0x1F)
+#define GETGREEN(x) (((x) >> 5) & 0x3F)
 #define GETBLUE(x)   ((x) & 0x1F)
 
 /****************************************************************************\
@@ -684,13 +685,13 @@ int RMGfxSourceBuffer8AB::calcTrasp(int fore, int back) {
 	if (r > 0x1F)
 		r = 0x1F;
 
-	if (g > 0x1F)
-		g = 0x1F;
+	if (g > 0x3F)
+		g = 0x3F;
 
 	if (b > 0x1F)
 		b = 0x1F;
 
-	return (r << 10) | (g << 5) | b;
+	return (r << 11) | (g << 5) | b;
 }
 
 void RMGfxSourceBuffer8AB::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
@@ -802,8 +803,8 @@ void RMGfxSourceBuffer8RLE::preparePalette() {
 
 	// Handle RGB alpha blending
 	if (_alphaBlendColor != -1) {
-		_alphaR = (_palFinal[_alphaBlendColor] >> 10) & 0x1F;
-		_alphaG = (_palFinal[_alphaBlendColor] >> 5) & 0x1F;
+		_alphaR = (_palFinal[_alphaBlendColor] >> 11) & 0x1F;
+		_alphaG = (_palFinal[_alphaBlendColor] >> 5) & 0x3F;
 		_alphaB = (_palFinal[_alphaBlendColor]) & 0x1F;
 	}
 }
@@ -1054,15 +1055,15 @@ RLEByteDoAlpha2:
 		if (n > nLength)
 			n = nLength;
 		for (int i = 0; i < n; i++) {
-			int r = (*dst >> 10) & 0x1F;
-			int g = (*dst >> 5) & 0x1F;
+			int r = (*dst >> 11) & 0x1F;
+			int g = (*dst >> 5) & 0x3F;
 			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
 			b = (b >> 2) + (_alphaB >> 1);
 
-			*dst ++ = (r << 10) | (g << 5) | b;
+			*dst ++ = (r << 11) | (g << 5) | b;
 		}
 
 		nLength -= n;
@@ -1158,15 +1159,15 @@ RLEByteFlippedDoAlpha2:
 		if (n > nLength)
 			n = nLength;
 		for (int i = 0; i < n; i++) {
-			int r = (*dst >> 10) & 0x1F;
-			int g = (*dst >> 5) & 0x1F;
+			int r = (*dst >> 11) & 0x1F;
+			int g = (*dst >> 5) & 0x3F;
 			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
 			b = (b >> 2) + (_alphaB >> 1);
 
-			*dst-- = (r << 10) | (g << 5) | b;
+			*dst-- = (r << 11) | (g << 5) | b;
 		}
 
 		nLength -= n;
@@ -1302,15 +1303,15 @@ RLEWordDoAlpha2:
 			n = nLength;
 
 		for (int i = 0; i < n; i++) {
-			int r = (*dst >> 10) & 0x1F;
-			int g = (*dst >> 5) & 0x1F;
+			int r = (*dst >> 11) & 0x1F;
+			int g = (*dst >> 5) & 0x3F;
 			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
 			b = (b >> 2) + (_alphaB >> 1);
 
-			*dst++ = (r << 10) | (g << 5) | b;
+			*dst++ = (r << 11) | (g << 5) | b;
 		}
 
 		nLength -= n;
@@ -1416,15 +1417,15 @@ RLEWordFlippedDoAlpha2:
 			n = nLength;
 
 		for (int i = 0; i < n; i++) {
-			int r = (*dst >> 10) & 0x1F;
-			int g = (*dst >> 5) & 0x1F;
+			int r = (*dst >> 11) & 0x1F;
+			int g = (*dst >> 5) & 0x3F;
 			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
 			b = (b >> 2) + (_alphaB >> 1);
 
-			*dst-- = (r << 10) | (g << 5) | b;
+			*dst-- = (r << 11) | (g << 5) | b;
 		}
 
 		nLength -= n;
@@ -1543,15 +1544,15 @@ RLEWordDoAlpha2:
 
 		// @@@ SHOULD NOT BE THERE !!!!!
 		for (int i = 0; i < n; i++) {
-			int r = (*dst >> 10) & 0x1F;
-			int g = (*dst >> 5) & 0x1F;
+			int r = (*dst >> 11) & 0x1F;
+			int g = (*dst >> 5) & 0x3F;
 			int b = *dst & 0x1F;
 
 			r = (r >> 2) + (_alphaR >> 1);
 			g = (g >> 2) + (_alphaG >> 1);
 			b = (b >> 2) + (_alphaB >> 1);
 
-			*dst++ = (r << 10) | (g << 5) | b;
+			*dst++ = (r << 11) | (g << 5) | b;
 		}
 
 		nLength -= n;
@@ -1570,19 +1571,19 @@ RLEWordDoCopy2:
 			n = nLength;
 
 		for (int i = 0; i < n; i++) {
-			int r = (*dst >> 10) & 0x1F;
-			int g = (*dst >> 5) & 0x1F;
+			int r = (*dst >> 11) & 0x1F;
+			int g = (*dst >> 5) & 0x3F;
 			int b = *dst & 0x1F;
 
-			int r2 = (_palFinal[*src] >> 10) & 0x1F;
-			int g2 = (_palFinal[*src] >> 5) & 0x1F;
+			int r2 = (_palFinal[*src] >> 11) & 0x1F;
+			int g2 = (_palFinal[*src] >> 5) & 0x3F;
 			int b2 = _palFinal[*src] & 0x1F;
 
 			r = (r >> 1) + (r2 >> 1);
 			g = (g >> 1) + (g2 >> 1);
 			b = (b >> 1) + (b2 >> 1);
 
-			*dst ++ = (r << 10) | (g << 5) | b;
+			*dst ++ = (r << 11) | (g << 5) | b;
 			src++;
 		}
 
@@ -1732,14 +1733,14 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 				g /= 5;
 				b /= 5;
 
-				if (r > 31)
-					r = 31;
-				if (g > 31)
-					g = 31;
-				if (b > 31)
-					b = 31;
+				if (r > 0x1f)
+					r = 0x1f;
+				if (g > 0x3f)
+					g = 0x3f;
+				if (b > 0x1f)
+					b = 0x1f;
 
-				mybuf[0] = (r << 10) | (g << 5) | b;
+				mybuf[0] = (r << 11) | (g << 5) | b;
 			}
 		}
 
@@ -1773,14 +1774,14 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 				g /= 6;
 				b /= 6;
 
-				if (r > 31)
-					r = 31;
-				if (g > 31)
-					g = 31;
-				if (b > 31)
-					b = 31;
+				if (r > 0x1f)
+					r = 0x1f;
+				if (g > 0x3f)
+					g = 0x3f;
+				if (b > 0x1f)
+					b = 0x1f;
 
-				mybuf[0] = (r << 10) | (g << 5) | b;
+				mybuf[0] = (r << 11) | (g << 5) | b;
 			}
 		}
 
@@ -1948,8 +1949,17 @@ void RMGfxSourceBuffer16::prepareImage() {
 	// Color space conversion if necessary!
 	uint16 *buf = (uint16 *)_buf;
 
-	for (int i = 0; i < _dimx * _dimy; i++)
-		buf[i] = FROM_LE_16(buf[i]) & 0x7FFF;
+	// convert 555 to 565
+	for (int i = 0; i < _dimx * _dimy; i++) {
+		uint16 pixel = FROM_LE_16(buf[i]);
+		int r = (pixel >> 10) & 0x1F;
+		int g = (pixel >> 5) & 0x1F;
+		int b = pixel & 0x1F;
+
+		pixel = (r << 11) | (g << 6) | b;
+
+		WRITE_LE_UINT16(&buf[i], pixel);
+	}
 }
 
 RMGfxSourceBuffer16::RMGfxSourceBuffer16(int dimx, int dimy)
@@ -1983,7 +1993,8 @@ void RMGfxBox::setColor(byte r, byte g, byte b) {
 	r >>= 3;
 	g >>= 3;
 	b >>= 3;
-	_wFillColor = (r << 10) | (g << 5) | b;
+	// These are hard-coded colors, so we convert 555 to 565.
+	_wFillColor = (r << 11) | (g << 6) | b;
 }
 
 void RMGfxBox::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp
index 5c50a50a57..c62f483a35 100644
--- a/engines/tony/window.cpp
+++ b/engines/tony/window.cpp
@@ -53,7 +53,7 @@ RMWindow::~RMWindow() {
  * Initializes the graphics window
  */
 void RMWindow::init() {
-	Graphics::PixelFormat pixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
+	Graphics::PixelFormat pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
 	initGraphics(RM_SX, RM_SY, true, &pixelFormat);
 	
 	reset();
@@ -83,7 +83,7 @@ void RMWindow::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w,
 		for (int i = 0; i < h; i++) {
 			uint16 *dst = (uint16 *)screen->getBasePtr(x, y + i);
 			for (int j = 0; j < w; j++) {
-				dst[j] = RMGfxTargetBuffer::_precalcTable[src[j] & 0x7FFF];
+				dst[j] = RMGfxTargetBuffer::_precalcTable[src[j]];
 			}
 			src += (pitch / 2);
 		}
@@ -291,8 +291,8 @@ void RMSnapshot::grabScreenshot(byte *lpBuf, int dezoom, uint16 *lpDestBuf) {
 				cursrc = &src[RM_SKIPX + x];
 
 				*curOut++ = ((*cursrc) & 0x1F) << 3;
-				*curOut++ = (((*cursrc) >> 5) & 0x1F) << 3;
-				*curOut++ = (((*cursrc) >> 10) & 0x1F) << 3;
+				*curOut++ = (((*cursrc) >> 5) & 0x3F) << 3;
+				*curOut++ = (((*cursrc) >> 11) & 0x1F) << 3;
 
 				if (lpDestBuf)
 					*lpDestBuf++ = *cursrc;
@@ -319,8 +319,8 @@ void RMSnapshot::grabScreenshot(byte *lpBuf, int dezoom, uint16 *lpDestBuf) {
 							curv = v;
 
 						sommab += cursrc[curv * RM_BBX + u] & 0x1F;
-						sommag += (cursrc[curv * RM_BBX + u] >> 5) & 0x1F;
-						sommar += (cursrc[curv * RM_BBX + u] >> 10) & 0x1F;
+						sommag += (cursrc[curv * RM_BBX + u] >> 6) & 0x1F;
+						sommar += (cursrc[curv * RM_BBX + u] >> 11) & 0x1F;
 					}
 				}
 				_rgb[k + 0] = (byte)(sommab * 8 / (dezoom * dezoom));
-- 
cgit v1.2.3


From 23c1b508611d5fa4e7dfc47f8f5ec10a7de177e3 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 2 Jul 2014 19:50:55 +0000
Subject: ZVISION: Reorgonize source files into directories.

---
 engines/zvision/animation/meta_animation.cpp       | 131 ++++
 engines/zvision/animation/meta_animation.h         |  99 +++
 engines/zvision/animation_node.cpp                 | 211 ------
 engines/zvision/animation_node.h                   |  84 ---
 engines/zvision/core/console.cpp                   |   2 +-
 engines/zvision/core/menu.cpp                      | 765 +++++++++++++++++++++
 engines/zvision/core/search_manager.cpp            | 274 ++++++++
 engines/zvision/core/search_manager.h              |  51 ++
 engines/zvision/graphics/render_manager.cpp        |   2 +-
 engines/zvision/inventory_manager.cpp              | 123 ----
 engines/zvision/menu.cpp                           | 765 ---------------------
 engines/zvision/meta_animation.cpp                 | 131 ----
 engines/zvision/meta_animation.h                   |  99 ---
 engines/zvision/module.mk                          |  56 +-
 engines/zvision/music_node.cpp                     | 190 -----
 engines/zvision/music_node.h                       |  82 ---
 engines/zvision/scripting/actions.cpp              |  10 +-
 .../zvision/scripting/controls/input_control.cpp   |   2 +-
 engines/zvision/scripting/controls/input_control.h |   2 +-
 .../zvision/scripting/controls/lever_control.cpp   |   2 +-
 .../zvision/scripting/controls/slot_control.cpp    | 219 ++++++
 engines/zvision/scripting/controls/slot_control.h  |  86 +++
 engines/zvision/scripting/controls/timer_node.cpp  |  80 ---
 engines/zvision/scripting/controls/timer_node.h    |  59 --
 engines/zvision/scripting/inventory.cpp            | 123 ++++
 engines/zvision/scripting/scr_file_handling.cpp    |   2 +-
 engines/zvision/scripting/script_manager.cpp       |   2 +-
 engines/zvision/scripting/script_manager.h         |   2 +-
 engines/zvision/scripting/sidefx.cpp               |  36 +
 engines/zvision/scripting/sidefx.h                 | 124 ++++
 .../zvision/scripting/sidefx/animation_node.cpp    | 211 ++++++
 engines/zvision/scripting/sidefx/animation_node.h  |  84 +++
 engines/zvision/scripting/sidefx/music_node.cpp    | 190 +++++
 engines/zvision/scripting/sidefx/music_node.h      |  82 +++
 .../zvision/scripting/sidefx/syncsound_node.cpp    |  86 +++
 engines/zvision/scripting/sidefx/syncsound_node.h  |  56 ++
 engines/zvision/scripting/sidefx/timer_node.cpp    |  80 +++
 engines/zvision/scripting/sidefx/timer_node.h      |  59 ++
 engines/zvision/scripting/sidefx/ttytext_node.cpp  | 175 +++++
 engines/zvision/scripting/sidefx/ttytext_node.h    |  76 ++
 engines/zvision/search_manager.cpp                 | 274 --------
 engines/zvision/search_manager.h                   |  51 --
 engines/zvision/sidefx.cpp                         |  36 -
 engines/zvision/sidefx.h                           | 124 ----
 engines/zvision/slot_control.cpp                   | 219 ------
 engines/zvision/slot_control.h                     |  86 ---
 engines/zvision/strings/string_manager.cpp         | 255 -------
 engines/zvision/strings/string_manager.h           |  84 ---
 engines/zvision/subtitles.cpp                      | 108 ---
 engines/zvision/subtitles/subtitles.cpp            | 108 +++
 engines/zvision/syncsound_node.cpp                 |  86 ---
 engines/zvision/syncsound_node.h                   |  56 --
 engines/zvision/text.cpp                           | 549 ---------------
 engines/zvision/text.h                             | 100 ---
 engines/zvision/text/string_manager.cpp            | 255 +++++++
 engines/zvision/text/string_manager.h              |  84 +++
 engines/zvision/text/text.cpp                      | 549 +++++++++++++++
 engines/zvision/text/text.h                        | 100 +++
 engines/zvision/ttytext_node.cpp                   | 175 -----
 engines/zvision/ttytext_node.h                     |  76 --
 engines/zvision/zvision.cpp                        |   6 +-
 engines/zvision/zvision.h                          |   2 +-
 62 files changed, 4148 insertions(+), 4148 deletions(-)
 create mode 100644 engines/zvision/animation/meta_animation.cpp
 create mode 100644 engines/zvision/animation/meta_animation.h
 delete mode 100644 engines/zvision/animation_node.cpp
 delete mode 100644 engines/zvision/animation_node.h
 create mode 100644 engines/zvision/core/menu.cpp
 create mode 100644 engines/zvision/core/search_manager.cpp
 create mode 100644 engines/zvision/core/search_manager.h
 delete mode 100644 engines/zvision/inventory_manager.cpp
 delete mode 100644 engines/zvision/menu.cpp
 delete mode 100644 engines/zvision/meta_animation.cpp
 delete mode 100644 engines/zvision/meta_animation.h
 delete mode 100644 engines/zvision/music_node.cpp
 delete mode 100644 engines/zvision/music_node.h
 create mode 100644 engines/zvision/scripting/controls/slot_control.cpp
 create mode 100644 engines/zvision/scripting/controls/slot_control.h
 delete mode 100644 engines/zvision/scripting/controls/timer_node.cpp
 delete mode 100644 engines/zvision/scripting/controls/timer_node.h
 create mode 100644 engines/zvision/scripting/inventory.cpp
 create mode 100644 engines/zvision/scripting/sidefx.cpp
 create mode 100644 engines/zvision/scripting/sidefx.h
 create mode 100644 engines/zvision/scripting/sidefx/animation_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/animation_node.h
 create mode 100644 engines/zvision/scripting/sidefx/music_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/music_node.h
 create mode 100644 engines/zvision/scripting/sidefx/syncsound_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/syncsound_node.h
 create mode 100644 engines/zvision/scripting/sidefx/timer_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/timer_node.h
 create mode 100644 engines/zvision/scripting/sidefx/ttytext_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/ttytext_node.h
 delete mode 100644 engines/zvision/search_manager.cpp
 delete mode 100644 engines/zvision/search_manager.h
 delete mode 100644 engines/zvision/sidefx.cpp
 delete mode 100644 engines/zvision/sidefx.h
 delete mode 100644 engines/zvision/slot_control.cpp
 delete mode 100644 engines/zvision/slot_control.h
 delete mode 100644 engines/zvision/strings/string_manager.cpp
 delete mode 100644 engines/zvision/strings/string_manager.h
 delete mode 100644 engines/zvision/subtitles.cpp
 create mode 100644 engines/zvision/subtitles/subtitles.cpp
 delete mode 100644 engines/zvision/syncsound_node.cpp
 delete mode 100644 engines/zvision/syncsound_node.h
 delete mode 100644 engines/zvision/text.cpp
 delete mode 100644 engines/zvision/text.h
 create mode 100644 engines/zvision/text/string_manager.cpp
 create mode 100644 engines/zvision/text/string_manager.h
 create mode 100644 engines/zvision/text/text.cpp
 create mode 100644 engines/zvision/text/text.h
 delete mode 100644 engines/zvision/ttytext_node.cpp
 delete mode 100644 engines/zvision/ttytext_node.h

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
new file mode 100644
index 0000000000..38f56699bb
--- /dev/null
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -0,0 +1,131 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/animation/meta_animation.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/animation/rlf_animation.h"
+#include "zvision/video/zork_avi_decoder.h"
+
+#include "video/video_decoder.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
+	: _fileType(RLF),
+	  _cur_frame(NULL) {
+	if (fileName.hasSuffix(".rlf")) {
+		_fileType = RLF;
+		Common::File *_file = engine->getSearchManager()->openFile(fileName);
+		_animation.rlf = new RlfAnimation(_file, false);
+		_frmDelay = _animation.rlf->frameTime();
+	} else if (fileName.hasSuffix(".avi")) {
+		_fileType = AVI;
+		Common::File *_file = engine->getSearchManager()->openFile(fileName);
+		_animation.avi = new ZorkAVIDecoder();
+		_animation.avi->loadStream(_file);
+		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
+	} else {
+		warning("Unrecognized animation file type: %s", fileName.c_str());
+	}
+}
+
+MetaAnimation::~MetaAnimation() {
+	if (_fileType == RLF) {
+		delete _animation.rlf;
+	} else if (_fileType == AVI) {
+		delete _animation.avi;
+	}
+}
+
+uint MetaAnimation::frameCount() {
+	if (_fileType == RLF) {
+		return _animation.rlf->frameCount();
+	} else
+		return _animation.avi->getFrameCount();
+
+}
+
+uint MetaAnimation::width() {
+	if (_fileType == RLF) {
+		return _animation.rlf->width();
+	} else
+		return _animation.avi->getWidth();
+}
+uint MetaAnimation::height() {
+	if (_fileType == RLF) {
+		return _animation.rlf->height();
+	} else
+		return _animation.avi->getHeight();
+}
+uint32 MetaAnimation::frameTime() {
+	return _frmDelay;
+}
+
+void MetaAnimation::seekToFrame(int frameNumber) {
+	if (frameNumber >= (int)frameCount())
+		frameNumber = frameCount() - 1;
+
+	if (_fileType == RLF) {
+		_animation.rlf->seekToFrame(frameNumber);
+	} else
+		_animation.avi->seekToFrame(frameNumber);
+}
+
+const Graphics::Surface *MetaAnimation::decodeNextFrame() {
+	if (_fileType == RLF)
+		_cur_frame = _animation.rlf->decodeNextFrame();
+	else
+		_cur_frame = _animation.avi->decodeNextFrame();
+
+	return _cur_frame;
+}
+
+const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) {
+	if (frameNumber >= frameCount())
+		frameNumber = frameCount() - 1;
+
+	if (_fileType == RLF) {
+		_cur_frame = _animation.rlf->getFrameData(frameNumber);
+		return _cur_frame;
+	} else {
+		_animation.avi->seekToFrame(frameNumber);
+		_cur_frame = _animation.avi->decodeNextFrame();
+		return _cur_frame;
+	}
+}
+
+bool MetaAnimation::endOfAnimation() {
+	if (_fileType == RLF) {
+		return _animation.rlf->endOfAnimation();
+	} else
+		return _animation.avi->endOfVideo();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h
new file mode 100644
index 0000000000..2ea00310f9
--- /dev/null
+++ b/engines/zvision/animation/meta_animation.h
@@ -0,0 +1,99 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_METAANIM_NODE_H
+#define ZVISION_METAANIM_NODE_H
+
+#include "zvision/scripting/sidefx.h"
+#include "zvision/zvision.h"
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace Common {
+class String;
+}
+
+namespace Video {
+class VideoDecoder;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+class RlfAnimation;
+
+class MetaAnimation {
+public:
+	MetaAnimation(const Common::String &fileName, ZVision *engine);
+	~MetaAnimation();
+
+	struct playnode {
+		Common::Rect pos;
+		int32 slot;
+		int32 start;
+		int32 stop;
+		int32 loop;
+		int32 _cur_frm;
+		int32 _delay;
+		Graphics::Surface *_scaled;
+	};
+
+private:
+	enum FileType {
+		RLF = 1,
+		AVI = 2
+	};
+
+private:
+	union {
+		RlfAnimation *rlf;
+		Video::VideoDecoder *avi;
+	} _animation;
+
+	FileType _fileType;
+	int32 _frmDelay;
+
+	const Graphics::Surface *_cur_frame;
+
+public:
+
+	uint frameCount();
+	uint width();
+	uint height();
+	uint32 frameTime();
+
+	void seekToFrame(int frameNumber);
+
+	const Graphics::Surface *decodeNextFrame();
+	const Graphics::Surface *getFrameData(uint frameNumber);
+
+	bool endOfAnimation();
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
deleted file mode 100644
index 49ef22bb51..0000000000
--- a/engines/zvision/animation_node.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/animation_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/meta_animation.h"
-
-#include "graphics/surface.h"
-
-
-namespace ZVision {
-
-AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
-	: SideFX(engine, controlKey, SIDEFX_ANIM),
-	  _DisposeAfterUse(DisposeAfterUse),
-	  _mask(mask),
-	  _animation(NULL) {
-
-	if (fileName.hasSuffix(".rlf") || fileName.hasSuffix(".avi")) {
-		_animation = new MetaAnimation(fileName, engine);
-		_frmDelay = _animation->frameTime();
-	} else {
-		warning("Unrecognized animation file type: %s", fileName.c_str());
-	}
-
-	if (frate > 0)
-		_frmDelay = 1000.0 / frate;
-}
-
-AnimationNode::~AnimationNode() {
-	if (_animation)
-		delete _animation;
-
-	_engine->getScriptManager()->setStateValue(_key, 2);
-
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-
-		if ((*it)._scaled)
-			delete(*it)._scaled;
-	}
-
-	_playList.clear();
-}
-
-bool AnimationNode::process(uint32 deltaTimeInMillis) {
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		playnode *nod = &(*it);
-
-		nod->_delay -= deltaTimeInMillis;
-		if (nod->_delay <= 0) {
-			nod->_delay += _frmDelay;
-
-			const Graphics::Surface *frame = NULL;
-
-			if (nod->_cur_frm == -1) { // Start of new playlist node
-				nod->_cur_frm = nod->start;
-
-				_animation->seekToFrame(nod->_cur_frm);
-				frame = _animation->decodeNextFrame();
-
-				nod->_delay = _frmDelay;
-				if (nod->slot)
-					_engine->getScriptManager()->setStateValue(nod->slot, 1);
-			} else {
-				nod->_cur_frm++;
-
-				if (nod->_cur_frm > nod->stop) {
-					nod->loop--;
-
-					if (nod->loop == 0) {
-						if (nod->slot >= 0)
-							_engine->getScriptManager()->setStateValue(nod->slot, 2);
-						if (nod->_scaled)
-							delete nod->_scaled;
-						_playList.erase(it);
-						return _DisposeAfterUse;
-					}
-
-					nod->_cur_frm = nod->start;
-					_animation->seekToFrame(nod->_cur_frm);
-				}
-
-				frame = _animation->decodeNextFrame();
-			}
-
-			if (frame) {
-
-				uint32 dstw;
-				uint32 dsth;
-				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
-					dstw = nod->pos.height();
-					dsth = nod->pos.width();
-				} else {
-					dstw = nod->pos.width();
-					dsth = nod->pos.height();
-				}
-
-				if (frame->w != dstw || frame->h != dsth) {
-					if (nod->_scaled)
-						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
-							delete nod->_scaled;
-							nod->_scaled = NULL;
-						}
-
-					if (!nod->_scaled) {
-						nod->_scaled = new Graphics::Surface;
-						nod->_scaled->create(dstw, dsth, frame->format);
-					}
-
-					_engine->getRenderManager()->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
-					frame = nod->_scaled;
-				}
-
-				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
-					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
-					if (_mask > 0)
-						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
-					else
-						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top);
-					delete transposed;
-				} else {
-					if (_mask > 0)
-						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
-					else
-						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top);
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-
-
-void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops) {
-	playnode nod;
-	nod.loop = loops;
-	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
-	nod.start = start_frame;
-	nod.stop = end_frame;
-
-	if (nod.stop >= (int)_animation->frameCount())
-		nod.stop = _animation->frameCount() - 1;
-
-	nod.slot = slot;
-	nod._cur_frm = -1;
-	nod._delay = 0;
-	nod._scaled = NULL;
-	_playList.push_back(nod);
-}
-
-bool AnimationNode::stop() {
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-		if ((*it)._scaled)
-			delete(*it)._scaled;
-	}
-
-	_playList.clear();
-
-	// We don't need to delete, it's may be reused
-	return false;
-}
-
-void AnimationNode::setNewFrameDelay(int32 newDelay) {
-	if (newDelay > 0) {
-		PlayNodes::iterator it = _playList.begin();
-		if (it != _playList.end()) {
-			playnode *nod = &(*it);
-			float percent = (float)nod->_delay / (float)_frmDelay;
-			nod->_delay = percent * newDelay; // Scale to new max
-		}
-
-		_frmDelay = newDelay;
-	}
-}
-
-int32 AnimationNode::getFrameDelay() {
-	return _frmDelay;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/animation_node.h b/engines/zvision/animation_node.h
deleted file mode 100644
index ff7636a31f..0000000000
--- a/engines/zvision/animation_node.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_ANIMATION_NODE_H
-#define ZVISION_ANIMATION_NODE_H
-
-#include "zvision/sidefx.h"
-#include "common/rect.h"
-#include "common/list.h"
-
-
-namespace Common {
-class String;
-}
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-class MetaAnimation;
-
-class AnimationNode : public SideFX {
-public:
-	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse = true);
-	~AnimationNode();
-
-	struct playnode {
-		Common::Rect pos;
-		int32 slot;
-		int32 start;
-		int32 stop;
-		int32 loop;
-		int32 _cur_frm;
-		int32 _delay;
-		Graphics::Surface *_scaled;
-	};
-
-private:
-	typedef Common::List<playnode> PlayNodes;
-
-	PlayNodes _playList;
-
-	int32 _mask;
-	bool _DisposeAfterUse;
-
-	MetaAnimation *_animation;
-	int32 _frmDelay;
-
-public:
-	bool process(uint32 deltaTimeInMillis);
-
-	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops = 1);
-
-	bool stop();
-
-	void setNewFrameDelay(int32 newDelay);
-	int32 getFrameDelay();
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index ef088f7553..aac4e7b2bc 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/utility/utility.h"
diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
new file mode 100644
index 0000000000..bf311c4577
--- /dev/null
+++ b/engines/zvision/core/menu.cpp
@@ -0,0 +1,765 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/core/menu.h"
+
+#include "zvision/graphics/render_manager.h"
+
+
+namespace ZVision {
+
+enum {
+	SLOT_START_SLOT = 151,
+	SLOT_SPELL_1 = 191,
+	SLOT_USER_CHOSE_THIS_SPELL = 205,
+	SLOT_REVERSED_SPELLBOOK = 206
+};
+
+enum {
+	menu_MAIN_SAVE = 0,
+	menu_MAIN_REST = 1,
+	menu_MAIN_PREF = 2,
+	menu_MAIN_EXIT = 3
+};
+
+menuHandler::menuHandler(ZVision *engine) {
+	_engine = engine;
+	menu_bar_flag = 0xFFFF;
+}
+
+menuZgi::menuZgi(ZVision *engine) :
+	menuHandler(engine) {
+	menu_mousefocus = -1;
+	inmenu = false;
+	scrolled[0] = false;
+	scrolled[1] = false;
+	scrolled[2] = false;
+	scrollPos[0] = 0.0;
+	scrollPos[1] = 0.0;
+	scrollPos[2] = 0.0;
+	mouse_on_item = -1;
+
+	char buf[24];
+	for (int i = 1; i < 4; i++) {
+		sprintf(buf, "gmzau%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][0], false);
+		sprintf(buf, "gmzau%2.2x1.tga", i + 0x10);
+		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][1], false);
+	}
+	for (int i = 0; i < 4; i++) {
+		sprintf(buf, "gmzmu%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][0], false);
+		sprintf(buf, "gmznu%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][1], false);
+	}
+
+	for (int i = 0; i < 50; i++) {
+		items[i][0] = NULL;
+		items[i][1] = NULL;
+		item_id[i] = 0;
+	}
+
+	for (int i = 0; i < 12; i++) {
+		magic[i][0] = NULL;
+		magic[i][1] = NULL;
+		magic_id[i] = 0;
+	}
+}
+
+menuZgi::~menuZgi() {
+	for (int i = 0; i < 3; i++) {
+		menuback[i][0].free();
+		menuback[i][1].free();
+	}
+	for (int i = 0; i < 4; i++) {
+		menubar[i][0].free();
+		menubar[i][1].free();
+	}
+	for (int i = 0; i < 50; i++) {
+		if (items[i][0]) {
+			items[i][0]->free();
+			delete items[i][0];
+		}
+		if (items[i][1]) {
+			items[i][1]->free();
+			delete items[i][1];
+		}
+	}
+	for (int i = 0; i < 12; i++) {
+		if (magic[i][0]) {
+			magic[i][0]->free();
+			delete magic[i][0];
+		}
+		if (magic[i][1]) {
+			magic[i][1]->free();
+			delete magic[i][1];
+		}
+	}
+}
+
+void menuZgi::onMouseUp(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+		switch (menu_mousefocus) {
+		case menu_ITEM:
+			if (menu_bar_flag & menuBar_Items) {
+				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (item_count == 0)
+					item_count = 20;
+
+				for (int i = 0; i < item_count; i++) {
+					int itemspace = (600 - 28) / item_count;
+
+					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
+					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+						int32 mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+						if (mouse_item >= 0  && mouse_item < 0xE0) {
+							_engine->getScriptManager()->invertory_drop(mouse_item);
+							_engine->getScriptManager()->invertory_add(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
+							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouse_item);
+
+							redraw = true;
+						}
+					}
+				}
+			}
+			break;
+
+		case menu_MAGIC:
+			if (menu_bar_flag & menuBar_Magic) {
+				for (int i = 0; i < 12; i++) {
+
+					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+					if (itemnum != 0) {
+						if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+							itemnum = 0xEE + i;
+						else
+							itemnum = 0xE0 + i;
+					}
+					if (itemnum)
+						if (_engine->getScriptManager()->getStateValue(StateKey_InventoryItem) == 0 || _engine->getScriptManager()->getStateValue(StateKey_InventoryItem) >= 0xE0)
+							if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
+							                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos))
+								_engine->getScriptManager()->setStateValue(SLOT_USER_CHOSE_THIS_SPELL, itemnum);
+				}
+
+			}
+			break;
+
+		case menu_MAIN:
+
+			// Exit
+			if (menu_bar_flag & menuBar_Exit)
+				if (Common::Rect(320 + 135,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					// ifquit();
+				}
+
+			// Settings
+			if (menu_bar_flag & menuBar_Settings)
+				if (Common::Rect(320 ,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
+				}
+
+			// Load
+			if (menu_bar_flag & menuBar_Restore)
+				if (Common::Rect(320 - 135,
+				                 scrollPos[menu_MAIN],
+				                 320,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
+				}
+
+			// Save
+			if (menu_bar_flag & menuBar_Save)
+				if (Common::Rect(320 - 135 * 2,
+				                 scrollPos[menu_MAIN],
+				                 320 - 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
+				}
+			break;
+		}
+	}
+}
+
+void menuZgi::onMouseMove(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+
+		if (!inmenu)
+			redraw = true;
+		inmenu = true;
+		switch (menu_mousefocus) {
+		case menu_ITEM:
+			if (menu_bar_flag & menuBar_Items) {
+				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (item_count == 0)
+					item_count = 20;
+				else if (item_count > 50)
+					item_count = 50;
+
+				int last_item = mouse_on_item;
+
+				mouse_on_item = -1;
+
+				for (int i = 0; i < item_count; i++) {
+					int itemspace = (600 - 28) / item_count;
+
+					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
+					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+						mouse_on_item = i;
+						break;
+					}
+				}
+
+				if (last_item != mouse_on_item)
+					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouse_on_item) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + last_item))
+						redraw = true;
+			}
+			break;
+
+		case menu_MAGIC:
+			if (menu_bar_flag & menuBar_Magic) {
+				int last_item = mouse_on_item;
+				mouse_on_item = -1;
+				for (int i = 0; i < 12; i++) {
+					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
+					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
+						mouse_on_item = i;
+						break;
+					}
+				}
+
+				if (last_item != mouse_on_item)
+					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouse_on_item) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + last_item))
+						redraw = true;
+
+			}
+			break;
+
+		case menu_MAIN: {
+			int last_item = mouse_on_item;
+			mouse_on_item = -1;
+
+			// Exit
+			if (menu_bar_flag & menuBar_Exit)
+				if (Common::Rect(320 + 135,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_EXIT;
+				}
+
+			// Settings
+			if (menu_bar_flag & menuBar_Settings)
+				if (Common::Rect(320 ,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_PREF;
+				}
+
+			// Load
+			if (menu_bar_flag & menuBar_Restore)
+				if (Common::Rect(320 - 135,
+				                 scrollPos[menu_MAIN],
+				                 320,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_REST;
+				}
+
+			// Save
+			if (menu_bar_flag & menuBar_Save)
+				if (Common::Rect(320 - 135 * 2,
+				                 scrollPos[menu_MAIN],
+				                 320 - 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouse_on_item = menu_MAIN_SAVE;
+				}
+
+			if (last_item != mouse_on_item)
+				redraw = true;
+		}
+		break;
+
+		default:
+			int cur_menu = menu_mousefocus;
+			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
+				menu_mousefocus = menu_MAIN;
+				scrolled[menu_MAIN]  = false;
+				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
+				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
+			}
+
+			if (menu_bar_flag & menuBar_Magic)
+				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
+					menu_mousefocus = menu_MAGIC;
+					scrolled[menu_MAGIC]  = false;
+					scrollPos[menu_MAGIC] = 28;
+					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
+				}
+
+			if (menu_bar_flag & menuBar_Items)
+				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
+					menu_mousefocus = menu_ITEM;
+					scrolled[menu_ITEM]  = false;
+					scrollPos[menu_ITEM] = 28 - 600;
+					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
+				}
+
+			if (cur_menu != menu_mousefocus)
+				clean = true;
+
+			break;
+		}
+	} else {
+		if (inmenu)
+			clean = true;
+		inmenu = false;
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
+		menu_mousefocus = -1;
+	}
+}
+
+void menuZgi::process(uint32 deltatime) {
+	if (clean) {
+		_engine->getRenderManager()->clearMenuSurface();
+		clean = false;
+	}
+	switch (menu_mousefocus) {
+	case menu_ITEM:
+		if (menu_bar_flag & menuBar_Items)
+			if (!scrolled[menu_ITEM]) {
+				redraw = true;
+				float scrl = 600.0 * (deltatime / 1000.0);
+
+				if (scrl == 0)
+					scrl = 1.0;
+
+				scrollPos [menu_ITEM] += scrl;
+
+				if (scrollPos[menu_ITEM] >= 0) {
+					scrolled[menu_ITEM] = true;
+					scrollPos [menu_ITEM] = 0;
+				}
+			}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
+
+			int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+			if (item_count == 0)
+				item_count = 20;
+			else if (item_count > 50)
+				item_count = 50;
+
+
+			for (int i = 0; i < item_count; i++) {
+				int itemspace = (600 - 28) / item_count;
+
+				bool inrect = false;
+
+				if (mouse_on_item == i)
+					inrect = true;
+
+				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
+
+				if (cur_item_id != 0) {
+					if (item_id[i] != cur_item_id) {
+						char buf[16];
+						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
+						items[i][0] = _engine->getRenderManager()->loadImage(buf, false);
+						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
+						items[i][1] = _engine->getRenderManager()->loadImage(buf, false);
+						item_id[i] = cur_item_id;
+					}
+
+					if (inrect)
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+					else
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+
+				} else {
+					if (items[i][0]) {
+						items[i][0]->free();
+						delete items[i][0];
+						items[i][0] = NULL;
+					}
+					if (items[i][1]) {
+						items[i][1]->free();
+						delete items[i][1];
+						items[i][1] = NULL;
+					}
+					item_id[i] = 0;
+				}
+			}
+
+			redraw = false;
+		}
+		break;
+
+	case menu_MAGIC:
+		if (menu_bar_flag & menuBar_Magic)
+			if (!scrolled[menu_MAGIC]) {
+				redraw = true;
+				float scrl = 600.0 * (deltatime / 1000.0);
+
+				if (scrl == 0)
+					scrl = 1.0;
+
+				scrollPos [menu_MAGIC] += scrl;
+
+				if (scrollPos[menu_MAGIC] >= 600) {
+					scrolled[menu_MAGIC] = true;
+					scrollPos [menu_MAGIC] = 600;
+				}
+			}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][0], 640 - scrollPos[menu_MAGIC], 0);
+
+			for (int i = 0; i < 12; i++) {
+				bool inrect = false;
+
+				if (mouse_on_item == i)
+					inrect = true;
+
+				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+				if (cur_item_id) {
+					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+						cur_item_id = 0xEE + i;
+					else
+						cur_item_id = 0xE0 + i;
+				}
+
+				if (cur_item_id != 0) {
+					if (item_id[i] != cur_item_id) {
+						char buf[16];
+						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
+						magic[i][0] = _engine->getRenderManager()->loadImage(buf, false);
+						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
+						magic[i][1] = _engine->getRenderManager()->loadImage(buf, false);
+						magic_id[i] = cur_item_id;
+					}
+
+					if (inrect)
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+					else
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+
+				} else {
+					if (magic[i][0]) {
+						magic[i][0]->free();
+						delete magic[i][0];
+						magic[i][0] = NULL;
+					}
+					if (magic[i][1]) {
+						magic[i][1]->free();
+						delete magic[i][1];
+						magic[i][1] = NULL;
+					}
+					magic_id[i] = 0;
+				}
+			}
+			redraw = false;
+		}
+		break;
+
+	case menu_MAIN:
+		if (!scrolled[menu_MAIN]) {
+			redraw = true;
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			scrollPos [menu_MAIN] += scrl;
+
+			if (scrollPos[menu_MAIN] >= 0) {
+				scrolled[menu_MAIN] = true;
+				scrollPos [menu_MAIN] = 0;
+			}
+		}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
+
+			if (menu_bar_flag & menuBar_Exit) {
+				if (mouse_on_item == menu_MAIN_EXIT)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
+			}
+			if (menu_bar_flag & menuBar_Settings) {
+				if (mouse_on_item == menu_MAIN_PREF)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
+			}
+			if (menu_bar_flag & menuBar_Restore) {
+				if (mouse_on_item == menu_MAIN_REST)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
+			}
+			if (menu_bar_flag & menuBar_Save) {
+				if (mouse_on_item == menu_MAIN_SAVE)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
+			}
+			redraw = false;
+		}
+		break;
+	default:
+		if (redraw) {
+			if (inmenu) {
+				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
+
+				if (menu_bar_flag & menuBar_Items)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
+
+				if (menu_bar_flag & menuBar_Magic)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
+			}
+			redraw = false;
+		}
+		break;
+	}
+}
+
+
+menuNem::menuNem(ZVision *engine) :
+	menuHandler(engine) {
+	inmenu = false;
+	scrolled = false;
+	scrollPos = 0.0;
+	mouse_on_item = -1;
+
+	char buf[24];
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 6; j++) {
+			sprintf(buf, "butfrm%d%d.tga", i + 1, j);
+			_engine->getRenderManager()->readImageToSurface(buf, but[i][j], false);
+		}
+
+	_engine->getRenderManager()->readImageToSurface("bar.tga", menubar, false);
+
+	frm = 0;
+}
+
+menuNem::~menuNem() {
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 6; j++)
+			but[i][j].free();
+
+	menubar.free();
+}
+
+static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456} };
+
+void menuNem::onMouseUp(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+		// Exit
+		if (menu_bar_flag & menuBar_Exit)
+			if (Common::Rect(buts[3][1],
+			                 scrollPos,
+			                 buts[3][0] + buts[3][1],
+			                 scrollPos + 32).contains(Pos)) {
+				// ifquit();
+				frm = 5;
+				redraw = true;
+			}
+
+		// Settings
+		if (menu_bar_flag & menuBar_Settings)
+			if (Common::Rect(buts[2][1],
+			                 scrollPos,
+			                 buts[2][0] + buts[2][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+
+		// Load
+		if (menu_bar_flag & menuBar_Restore)
+			if (Common::Rect(buts[1][1],
+			                 scrollPos,
+			                 buts[1][0] + buts[1][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+
+		// Save
+		if (menu_bar_flag & menuBar_Save)
+			if (Common::Rect(buts[0][1],
+			                 scrollPos,
+			                 buts[0][0] + buts[0][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+	}
+}
+
+void menuNem::onMouseMove(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+
+		inmenu = true;
+
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 2)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
+
+		int last_item = mouse_on_item;
+		mouse_on_item = -1;
+
+		// Exit
+		if (menu_bar_flag & menuBar_Exit)
+			if (Common::Rect(buts[3][1],
+			                 scrollPos,
+			                 buts[3][0] + buts[3][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_EXIT;
+			}
+
+		// Settings
+		if (menu_bar_flag & menuBar_Settings)
+			if (Common::Rect(buts[2][1],
+			                 scrollPos,
+			                 buts[2][0] + buts[2][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_PREF;
+			}
+
+		// Load
+		if (menu_bar_flag & menuBar_Restore)
+			if (Common::Rect(buts[1][1],
+			                 scrollPos,
+			                 buts[1][0] + buts[1][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_REST;
+			}
+
+		// Save
+		if (menu_bar_flag & menuBar_Save)
+			if (Common::Rect(buts[0][1],
+			                 scrollPos,
+			                 buts[0][0] + buts[0][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouse_on_item = menu_MAIN_SAVE;
+			}
+
+		if (last_item != mouse_on_item) {
+			redraw = true;
+			frm = 0;
+			delay = 200;
+		}
+	} else {
+		inmenu = false;
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
+		mouse_on_item = -1;
+	}
+}
+
+void menuNem::process(uint32 deltatime) {
+	if (inmenu) {
+		if (!scrolled) {
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			scrollPos += scrl;
+			redraw = true;
+		}
+
+		if (scrollPos >= 0) {
+			scrolled = true;
+			scrollPos = 0;
+		}
+
+		if (mouse_on_item != -1) {
+			delay -= deltatime;
+			if (delay <= 0 && frm < 4) {
+				delay = 200;
+				frm++;
+				redraw = true;
+			}
+		}
+
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
+
+			if (menu_bar_flag & menuBar_Exit)
+				if (mouse_on_item == menu_MAIN_EXIT)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
+
+			if (menu_bar_flag & menuBar_Settings)
+				if (mouse_on_item == menu_MAIN_PREF)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
+
+			if (menu_bar_flag & menuBar_Restore)
+				if (mouse_on_item == menu_MAIN_REST)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
+
+			if (menu_bar_flag & menuBar_Save)
+				if (mouse_on_item == menu_MAIN_SAVE)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
+
+			redraw = false;
+		}
+	} else {
+		scrolled = false;
+		if (scrollPos > -32) {
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			Common::Rect cl(64, 32 + scrollPos - scrl, 64 + 512, 32 + scrollPos + 1);
+			_engine->getRenderManager()->clearMenuSurface(cl);
+
+			scrollPos -= scrl;
+			redraw = true;
+		} else
+			scrollPos = -32;
+
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
+			redraw = false;
+		}
+	}
+}
+
+
+} // End of namespace ZVision
diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
new file mode 100644
index 0000000000..fe99772b9b
--- /dev/null
+++ b/engines/zvision/core/search_manager.cpp
@@ -0,0 +1,274 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+#include "common/debug.h"
+
+#include "zvision/core/search_manager.h"
+#include "zvision/archives/zfs_archive.h"
+#include "common/fs.h"
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+sManager::sManager(const Common::String &root_path, int depth) {
+	_root = root_path;
+	if (_root[_root.size() - 1] == '\\' || _root[_root.size() - 1] == '/')
+		_root.deleteLastChar();
+
+	Common::FSNode fs_node(_root);
+
+	list_dir_recursive(dir_list, fs_node, depth);
+
+	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end();)
+		if (it->size() == _root.size())
+			it = dir_list.erase(it);
+		else if (it->size() > _root.size()) {
+			*it = Common::String(it->c_str() + _root.size() + 1);
+			it++;
+		} else
+			it++;
+}
+
+sManager::~sManager() {
+	Common::List<Common::Archive *>::iterator it = archList.begin();
+	while (it != archList.end()) {
+		delete *it;
+		it++;
+	}
+
+	archList.clear();
+}
+
+void sManager::addPatch(const Common::String &src, const Common::String &dst) {
+	Common::String lw_name = dst;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator it = files.find(lw_name);
+
+	if (it != files.end()) {
+		lw_name = src;
+		lw_name.toLowercase();
+		files[lw_name] = it->_value;
+	}
+}
+
+void sManager::addFile(const Common::String &name, Common::Archive *arch) {
+	bool addArch = true;
+	Common::List<Common::Archive *>::iterator it = archList.begin();
+	while (it != archList.end()) {
+		if (*it == arch) {
+			addArch = false;
+			break;
+		}
+		it++;
+	}
+	if (addArch)
+		archList.push_back(arch);
+
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::Node nod;
+	nod.name = lw_name;
+	nod.arch = arch;
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit == files.end()) {
+		files[lw_name] = nod;
+	} else {
+		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
+		if (stream) {
+			if (stream->size() < 10)
+				fit->_value.arch = arch;
+			delete stream;
+		} else {
+			files[lw_name] = nod;
+		}
+	}
+}
+
+Common::File *sManager::openFile(const Common::String &name) {
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit != files.end()) {
+		Common::File *tmp = new Common::File();
+		tmp->open(fit->_value.name, *fit->_value.arch);
+		return tmp;
+	}
+	return NULL;
+}
+
+bool sManager::openFile(Common::File &file, const Common::String &name) {
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit != files.end())
+		return file.open(fit->_value.name, *fit->_value.arch);
+	return false;
+}
+
+bool sManager::hasFile(const Common::String &name) {
+	Common::String lw_name = name;
+	lw_name.toLowercase();
+
+	sManager::MatchList::iterator fit = files.find(lw_name);
+
+	if (fit != files.end())
+		return true;
+	return false;
+}
+
+void sManager::loadZix(const Common::String &name) {
+	Common::File file;
+	file.open(name);
+
+	Common::String line;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		if (line.matchString("----------*", true))
+			break;
+	}
+
+	if (file.eos())
+		return;
+
+	Common::Array<Common::Archive *> archives;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		line.trim();
+		if (line.matchString("----------*", true))
+			break;
+		else if (line.matchString("DIR:*", true)) {
+			Common::String path(line.c_str() + 5);
+			Common::Archive *arc;
+			char n_path[128];
+			strcpy(n_path, path.c_str());
+			for (uint i = 0; i < path.size(); i++)
+				if (n_path[i] == '\\')
+					n_path[i] = '/';
+
+			path = Common::String(n_path);
+			if (path.size() && path[0] == '.')
+				path.deleteChar(0);
+			if (path.size() && path[0] == '/')
+				path.deleteChar(0);
+
+			if (path.matchString("*.zfs", true))
+				arc = new ZfsArchive(path);
+			else {
+				if (path.size()) {
+					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
+						path.deleteLastChar();
+					if (path.size())
+						for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
+							if (path.equalsIgnoreCase(*it)) {
+								path = *it;
+								break;
+							}
+				}
+
+				path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
+
+				arc = new Common::FSDirectory(path);
+			}
+			archives.push_back(arc);
+		}
+	}
+
+	if (file.eos())
+		return;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		line.trim();
+		uint dr = 0;
+		char buf[32];
+		if (sscanf(line.c_str(), "%u %s", &dr, buf) == 2) {
+			if (dr <= archives.size() && dr > 0) {
+				addFile(Common::String(buf), archives[dr - 1]);
+			}
+		}
+	}
+}
+
+void sManager::addDir(const Common::String &name) {
+	Common::String path;
+	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
+		if (name.equalsIgnoreCase(*it)) {
+			path = *it;
+			break;
+		}
+
+	if (path.size() == 0)
+		return;
+
+	path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
+
+	Common::FSDirectory *dir = new Common::FSDirectory(path);
+
+	Common::ArchiveMemberList list;
+	dir->listMatchingMembers(list, "*.zfs");
+
+
+	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+		Common::String flname = (*iter)->getName();
+
+		ZfsArchive *zfs = new ZfsArchive(Common::String::format("%s/%s", name.c_str(), flname.c_str()));
+
+		Common::ArchiveMemberList zfslist;
+		zfs->listMembers(zfslist);
+
+		for (Common::ArchiveMemberList::iterator ziter = zfslist.begin(); ziter != zfslist.end(); ++ziter) {
+			Common::String z_name = (*ziter)->getName();
+			addFile(z_name, zfs);
+		}
+	}
+
+	list.clear();
+	dir->listMembers(list);
+
+	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+		Common::String flname = (*iter)->getName();
+		addFile(flname, dir);
+	}
+}
+
+void sManager::list_dir_recursive(Common::List<Common::String> &_list, const Common::FSNode &fs_node, int depth) {
+	Common::FSList fs_list;
+	fs_node.getChildren(fs_list);
+
+	_list.push_back(fs_node.getPath());
+
+	if (depth > 1)
+		for (Common::FSList::const_iterator it = fs_list.begin(); it != fs_list.end(); ++it)
+			list_dir_recursive(_list, *it, depth - 1);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/core/search_manager.h b/engines/zvision/core/search_manager.h
new file mode 100644
index 0000000000..c768cb8b00
--- /dev/null
+++ b/engines/zvision/core/search_manager.h
@@ -0,0 +1,51 @@
+#ifndef SEARCH_MANAGER_H_INCLUDED
+#define SEARCH_MANAGER_H_INCLUDED
+
+#include "common/str.h"
+#include "common/hash-str.h"
+#include "common/hashmap.h"
+#include "common/archive.h"
+#include "common/file.h"
+#include "common/list.h"
+
+namespace ZVision {
+
+class sManager {
+public:
+	sManager(const Common::String &root_path, int depth);
+	~sManager();
+
+	void addFile(const Common::String &name, Common::Archive *arch);
+	void addDir(const Common::String &name);
+	void addPatch(const Common::String &src, const Common::String &dst);
+
+	Common::File *openFile(const Common::String &name);
+	bool openFile(Common::File &file, const Common::String &name);
+	bool hasFile(const Common::String &name);
+
+	void loadZix(const Common::String &name);
+
+private:
+
+	void list_dir_recursive(Common::List<Common::String> &dir_list, const Common::FSNode &fs_node, int depth);
+
+	struct Node {
+		Common::String name;
+		Common::Archive *arch;
+	};
+
+	Common::List<Common::String> dir_list;
+
+	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
+
+	Common::List<Common::Archive *> archList;
+	MatchList files;
+
+	Common::String _root;
+
+private:
+};
+
+}
+
+#endif // SEARCH_MANAGER_H_INCLUDED
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index c9dc5d37b2..f3b01b7e30 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -24,7 +24,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/text.h"
+#include "zvision/text/text.h"
 
 #include "zvision/utility/lzss_read_stream.h"
 
diff --git a/engines/zvision/inventory_manager.cpp b/engines/zvision/inventory_manager.cpp
deleted file mode 100644
index f8b22970c4..0000000000
--- a/engines/zvision/inventory_manager.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/script_manager.h"
-
-
-namespace ZVision {
-
-int8 ScriptManager::invertory_getCount() {
-	return getStateValue(StateKey_Inv_Cnt_Slot);
-}
-
-void ScriptManager::invertory_setCount(int8 cnt) {
-	setStateValue(StateKey_Inv_Cnt_Slot, cnt);
-}
-
-int16 ScriptManager::invertory_getItem(int8 id) {
-	if (id < 49 && id >= 0)
-		return getStateValue(StateKey_Inv_1_Slot + id);
-	return -1;
-}
-
-void ScriptManager::invertory_setItem(int8 id, int16 item) {
-	if (id < 49 && id >= 0)
-		setStateValue(StateKey_Inv_1_Slot + id, item);
-}
-
-void ScriptManager::invertory_add(int16 item) {
-	int8 cnt = invertory_getCount();
-
-	if (cnt < 49) {
-		bool not_exist = true;
-
-		if (cnt == 0) {
-			invertory_setItem(0, 0);
-			invertory_setCount(1); // we needed empty item for cycle code
-			cnt = 1;
-		}
-
-		for (int8 cur = 0; cur < cnt; cur++)
-			if (invertory_getItem(cur) == item) {
-				not_exist = false;
-				break;
-			}
-
-		if (not_exist) {
-			for (int8 i = cnt; i > 0; i--)
-				invertory_setItem(i, invertory_getItem(i - 1));
-
-			invertory_setItem(0, item);
-
-			setStateValue(StateKey_InventoryItem, item);
-
-			invertory_setCount(cnt + 1);
-		}
-	}
-}
-
-void ScriptManager::invertory_drop(int16 item) {
-	int8 items_cnt = invertory_getCount();
-
-	// if items in inventory > 0
-	if (items_cnt != 0) {
-		int8 index = 0;
-
-		// finding needed item
-		while (index < items_cnt) {
-			if (invertory_getItem(index) == item)
-				break;
-
-			index++;
-		}
-
-		// if item in the inventory
-		if (items_cnt != index) {
-			// shift all items left with rewrite founded item
-			for (int8 v = index; v < items_cnt - 1 ; v++)
-				invertory_setItem(v, invertory_getItem(v + 1));
-
-			// del last item
-			invertory_setItem(items_cnt - 1, 0);
-			invertory_setCount(invertory_getCount() - 1);
-
-			setStateValue(StateKey_InventoryItem, invertory_getItem(0));
-		}
-	}
-}
-void ScriptManager::invertory_cycle() {
-	int8 item_cnt = invertory_getCount();
-	int8 cur_item = invertory_getItem(0);
-	if (item_cnt > 1) {
-		for (int8 i = 0; i < item_cnt - 1; i++)
-			invertory_setItem(i, invertory_getItem(i + 1));
-
-		invertory_setItem(item_cnt - 1, cur_item);
-
-		setStateValue(StateKey_InventoryItem, invertory_getItem(0));
-
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
deleted file mode 100644
index bf311c4577..0000000000
--- a/engines/zvision/menu.cpp
+++ /dev/null
@@ -1,765 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/core/menu.h"
-
-#include "zvision/graphics/render_manager.h"
-
-
-namespace ZVision {
-
-enum {
-	SLOT_START_SLOT = 151,
-	SLOT_SPELL_1 = 191,
-	SLOT_USER_CHOSE_THIS_SPELL = 205,
-	SLOT_REVERSED_SPELLBOOK = 206
-};
-
-enum {
-	menu_MAIN_SAVE = 0,
-	menu_MAIN_REST = 1,
-	menu_MAIN_PREF = 2,
-	menu_MAIN_EXIT = 3
-};
-
-menuHandler::menuHandler(ZVision *engine) {
-	_engine = engine;
-	menu_bar_flag = 0xFFFF;
-}
-
-menuZgi::menuZgi(ZVision *engine) :
-	menuHandler(engine) {
-	menu_mousefocus = -1;
-	inmenu = false;
-	scrolled[0] = false;
-	scrolled[1] = false;
-	scrolled[2] = false;
-	scrollPos[0] = 0.0;
-	scrollPos[1] = 0.0;
-	scrollPos[2] = 0.0;
-	mouse_on_item = -1;
-
-	char buf[24];
-	for (int i = 1; i < 4; i++) {
-		sprintf(buf, "gmzau%2.2x1.tga", i);
-		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][0], false);
-		sprintf(buf, "gmzau%2.2x1.tga", i + 0x10);
-		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][1], false);
-	}
-	for (int i = 0; i < 4; i++) {
-		sprintf(buf, "gmzmu%2.2x1.tga", i);
-		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][0], false);
-		sprintf(buf, "gmznu%2.2x1.tga", i);
-		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][1], false);
-	}
-
-	for (int i = 0; i < 50; i++) {
-		items[i][0] = NULL;
-		items[i][1] = NULL;
-		item_id[i] = 0;
-	}
-
-	for (int i = 0; i < 12; i++) {
-		magic[i][0] = NULL;
-		magic[i][1] = NULL;
-		magic_id[i] = 0;
-	}
-}
-
-menuZgi::~menuZgi() {
-	for (int i = 0; i < 3; i++) {
-		menuback[i][0].free();
-		menuback[i][1].free();
-	}
-	for (int i = 0; i < 4; i++) {
-		menubar[i][0].free();
-		menubar[i][1].free();
-	}
-	for (int i = 0; i < 50; i++) {
-		if (items[i][0]) {
-			items[i][0]->free();
-			delete items[i][0];
-		}
-		if (items[i][1]) {
-			items[i][1]->free();
-			delete items[i][1];
-		}
-	}
-	for (int i = 0; i < 12; i++) {
-		if (magic[i][0]) {
-			magic[i][0]->free();
-			delete magic[i][0];
-		}
-		if (magic[i][1]) {
-			magic[i][1]->free();
-			delete magic[i][1];
-		}
-	}
-}
-
-void menuZgi::onMouseUp(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-		switch (menu_mousefocus) {
-		case menu_ITEM:
-			if (menu_bar_flag & menuBar_Items) {
-				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-				if (item_count == 0)
-					item_count = 20;
-
-				for (int i = 0; i < item_count; i++) {
-					int itemspace = (600 - 28) / item_count;
-
-					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
-					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
-						int32 mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
-						if (mouse_item >= 0  && mouse_item < 0xE0) {
-							_engine->getScriptManager()->invertory_drop(mouse_item);
-							_engine->getScriptManager()->invertory_add(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
-							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouse_item);
-
-							redraw = true;
-						}
-					}
-				}
-			}
-			break;
-
-		case menu_MAGIC:
-			if (menu_bar_flag & menuBar_Magic) {
-				for (int i = 0; i < 12; i++) {
-
-					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
-					if (itemnum != 0) {
-						if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
-							itemnum = 0xEE + i;
-						else
-							itemnum = 0xE0 + i;
-					}
-					if (itemnum)
-						if (_engine->getScriptManager()->getStateValue(StateKey_InventoryItem) == 0 || _engine->getScriptManager()->getStateValue(StateKey_InventoryItem) >= 0xE0)
-							if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
-							                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos))
-								_engine->getScriptManager()->setStateValue(SLOT_USER_CHOSE_THIS_SPELL, itemnum);
-				}
-
-			}
-			break;
-
-		case menu_MAIN:
-
-			// Exit
-			if (menu_bar_flag & menuBar_Exit)
-				if (Common::Rect(320 + 135,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					// ifquit();
-				}
-
-			// Settings
-			if (menu_bar_flag & menuBar_Settings)
-				if (Common::Rect(320 ,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
-				}
-
-			// Load
-			if (menu_bar_flag & menuBar_Restore)
-				if (Common::Rect(320 - 135,
-				                 scrollPos[menu_MAIN],
-				                 320,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
-				}
-
-			// Save
-			if (menu_bar_flag & menuBar_Save)
-				if (Common::Rect(320 - 135 * 2,
-				                 scrollPos[menu_MAIN],
-				                 320 - 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
-				}
-			break;
-		}
-	}
-}
-
-void menuZgi::onMouseMove(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-
-		if (!inmenu)
-			redraw = true;
-		inmenu = true;
-		switch (menu_mousefocus) {
-		case menu_ITEM:
-			if (menu_bar_flag & menuBar_Items) {
-				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-				if (item_count == 0)
-					item_count = 20;
-				else if (item_count > 50)
-					item_count = 50;
-
-				int last_item = mouse_on_item;
-
-				mouse_on_item = -1;
-
-				for (int i = 0; i < item_count; i++) {
-					int itemspace = (600 - 28) / item_count;
-
-					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
-					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
-						mouse_on_item = i;
-						break;
-					}
-				}
-
-				if (last_item != mouse_on_item)
-					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouse_on_item) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + last_item))
-						redraw = true;
-			}
-			break;
-
-		case menu_MAGIC:
-			if (menu_bar_flag & menuBar_Magic) {
-				int last_item = mouse_on_item;
-				mouse_on_item = -1;
-				for (int i = 0; i < 12; i++) {
-					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
-					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
-						mouse_on_item = i;
-						break;
-					}
-				}
-
-				if (last_item != mouse_on_item)
-					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouse_on_item) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + last_item))
-						redraw = true;
-
-			}
-			break;
-
-		case menu_MAIN: {
-			int last_item = mouse_on_item;
-			mouse_on_item = -1;
-
-			// Exit
-			if (menu_bar_flag & menuBar_Exit)
-				if (Common::Rect(320 + 135,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_EXIT;
-				}
-
-			// Settings
-			if (menu_bar_flag & menuBar_Settings)
-				if (Common::Rect(320 ,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_PREF;
-				}
-
-			// Load
-			if (menu_bar_flag & menuBar_Restore)
-				if (Common::Rect(320 - 135,
-				                 scrollPos[menu_MAIN],
-				                 320,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_REST;
-				}
-
-			// Save
-			if (menu_bar_flag & menuBar_Save)
-				if (Common::Rect(320 - 135 * 2,
-				                 scrollPos[menu_MAIN],
-				                 320 - 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_SAVE;
-				}
-
-			if (last_item != mouse_on_item)
-				redraw = true;
-		}
-		break;
-
-		default:
-			int cur_menu = menu_mousefocus;
-			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
-				menu_mousefocus = menu_MAIN;
-				scrolled[menu_MAIN]  = false;
-				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
-				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
-			}
-
-			if (menu_bar_flag & menuBar_Magic)
-				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
-					menu_mousefocus = menu_MAGIC;
-					scrolled[menu_MAGIC]  = false;
-					scrollPos[menu_MAGIC] = 28;
-					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
-				}
-
-			if (menu_bar_flag & menuBar_Items)
-				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
-					menu_mousefocus = menu_ITEM;
-					scrolled[menu_ITEM]  = false;
-					scrollPos[menu_ITEM] = 28 - 600;
-					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
-				}
-
-			if (cur_menu != menu_mousefocus)
-				clean = true;
-
-			break;
-		}
-	} else {
-		if (inmenu)
-			clean = true;
-		inmenu = false;
-		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
-			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
-		menu_mousefocus = -1;
-	}
-}
-
-void menuZgi::process(uint32 deltatime) {
-	if (clean) {
-		_engine->getRenderManager()->clearMenuSurface();
-		clean = false;
-	}
-	switch (menu_mousefocus) {
-	case menu_ITEM:
-		if (menu_bar_flag & menuBar_Items)
-			if (!scrolled[menu_ITEM]) {
-				redraw = true;
-				float scrl = 600.0 * (deltatime / 1000.0);
-
-				if (scrl == 0)
-					scrl = 1.0;
-
-				scrollPos [menu_ITEM] += scrl;
-
-				if (scrollPos[menu_ITEM] >= 0) {
-					scrolled[menu_ITEM] = true;
-					scrollPos [menu_ITEM] = 0;
-				}
-			}
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
-
-			int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-			if (item_count == 0)
-				item_count = 20;
-			else if (item_count > 50)
-				item_count = 50;
-
-
-			for (int i = 0; i < item_count; i++) {
-				int itemspace = (600 - 28) / item_count;
-
-				bool inrect = false;
-
-				if (mouse_on_item == i)
-					inrect = true;
-
-				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
-
-				if (cur_item_id != 0) {
-					if (item_id[i] != cur_item_id) {
-						char buf[16];
-						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
-						items[i][0] = _engine->getRenderManager()->loadImage(buf, false);
-						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
-						items[i][1] = _engine->getRenderManager()->loadImage(buf, false);
-						item_id[i] = cur_item_id;
-					}
-
-					if (inrect)
-						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
-					else
-						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
-
-				} else {
-					if (items[i][0]) {
-						items[i][0]->free();
-						delete items[i][0];
-						items[i][0] = NULL;
-					}
-					if (items[i][1]) {
-						items[i][1]->free();
-						delete items[i][1];
-						items[i][1] = NULL;
-					}
-					item_id[i] = 0;
-				}
-			}
-
-			redraw = false;
-		}
-		break;
-
-	case menu_MAGIC:
-		if (menu_bar_flag & menuBar_Magic)
-			if (!scrolled[menu_MAGIC]) {
-				redraw = true;
-				float scrl = 600.0 * (deltatime / 1000.0);
-
-				if (scrl == 0)
-					scrl = 1.0;
-
-				scrollPos [menu_MAGIC] += scrl;
-
-				if (scrollPos[menu_MAGIC] >= 600) {
-					scrolled[menu_MAGIC] = true;
-					scrollPos [menu_MAGIC] = 600;
-				}
-			}
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][0], 640 - scrollPos[menu_MAGIC], 0);
-
-			for (int i = 0; i < 12; i++) {
-				bool inrect = false;
-
-				if (mouse_on_item == i)
-					inrect = true;
-
-				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
-				if (cur_item_id) {
-					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
-						cur_item_id = 0xEE + i;
-					else
-						cur_item_id = 0xE0 + i;
-				}
-
-				if (cur_item_id != 0) {
-					if (item_id[i] != cur_item_id) {
-						char buf[16];
-						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
-						magic[i][0] = _engine->getRenderManager()->loadImage(buf, false);
-						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
-						magic[i][1] = _engine->getRenderManager()->loadImage(buf, false);
-						magic_id[i] = cur_item_id;
-					}
-
-					if (inrect)
-						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
-					else
-						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
-
-				} else {
-					if (magic[i][0]) {
-						magic[i][0]->free();
-						delete magic[i][0];
-						magic[i][0] = NULL;
-					}
-					if (magic[i][1]) {
-						magic[i][1]->free();
-						delete magic[i][1];
-						magic[i][1] = NULL;
-					}
-					magic_id[i] = 0;
-				}
-			}
-			redraw = false;
-		}
-		break;
-
-	case menu_MAIN:
-		if (!scrolled[menu_MAIN]) {
-			redraw = true;
-			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
-
-			if (scrl == 0)
-				scrl = 1.0;
-
-			scrollPos [menu_MAIN] += scrl;
-
-			if (scrollPos[menu_MAIN] >= 0) {
-				scrolled[menu_MAIN] = true;
-				scrollPos [menu_MAIN] = 0;
-			}
-		}
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
-
-			if (menu_bar_flag & menuBar_Exit) {
-				if (mouse_on_item == menu_MAIN_EXIT)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
-			}
-			if (menu_bar_flag & menuBar_Settings) {
-				if (mouse_on_item == menu_MAIN_PREF)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
-			}
-			if (menu_bar_flag & menuBar_Restore) {
-				if (mouse_on_item == menu_MAIN_REST)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
-			}
-			if (menu_bar_flag & menuBar_Save) {
-				if (mouse_on_item == menu_MAIN_SAVE)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
-			}
-			redraw = false;
-		}
-		break;
-	default:
-		if (redraw) {
-			if (inmenu) {
-				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
-
-				if (menu_bar_flag & menuBar_Items)
-					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
-
-				if (menu_bar_flag & menuBar_Magic)
-					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
-			}
-			redraw = false;
-		}
-		break;
-	}
-}
-
-
-menuNem::menuNem(ZVision *engine) :
-	menuHandler(engine) {
-	inmenu = false;
-	scrolled = false;
-	scrollPos = 0.0;
-	mouse_on_item = -1;
-
-	char buf[24];
-	for (int i = 0; i < 4; i++)
-		for (int j = 0; j < 6; j++) {
-			sprintf(buf, "butfrm%d%d.tga", i + 1, j);
-			_engine->getRenderManager()->readImageToSurface(buf, but[i][j], false);
-		}
-
-	_engine->getRenderManager()->readImageToSurface("bar.tga", menubar, false);
-
-	frm = 0;
-}
-
-menuNem::~menuNem() {
-	for (int i = 0; i < 4; i++)
-		for (int j = 0; j < 6; j++)
-			but[i][j].free();
-
-	menubar.free();
-}
-
-static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456} };
-
-void menuNem::onMouseUp(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-		// Exit
-		if (menu_bar_flag & menuBar_Exit)
-			if (Common::Rect(buts[3][1],
-			                 scrollPos,
-			                 buts[3][0] + buts[3][1],
-			                 scrollPos + 32).contains(Pos)) {
-				// ifquit();
-				frm = 5;
-				redraw = true;
-			}
-
-		// Settings
-		if (menu_bar_flag & menuBar_Settings)
-			if (Common::Rect(buts[2][1],
-			                 scrollPos,
-			                 buts[2][0] + buts[2][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
-				frm = 5;
-				redraw = true;
-			}
-
-		// Load
-		if (menu_bar_flag & menuBar_Restore)
-			if (Common::Rect(buts[1][1],
-			                 scrollPos,
-			                 buts[1][0] + buts[1][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
-				frm = 5;
-				redraw = true;
-			}
-
-		// Save
-		if (menu_bar_flag & menuBar_Save)
-			if (Common::Rect(buts[0][1],
-			                 scrollPos,
-			                 buts[0][0] + buts[0][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
-				frm = 5;
-				redraw = true;
-			}
-	}
-}
-
-void menuNem::onMouseMove(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-
-		inmenu = true;
-
-		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 2)
-			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
-
-		int last_item = mouse_on_item;
-		mouse_on_item = -1;
-
-		// Exit
-		if (menu_bar_flag & menuBar_Exit)
-			if (Common::Rect(buts[3][1],
-			                 scrollPos,
-			                 buts[3][0] + buts[3][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_EXIT;
-			}
-
-		// Settings
-		if (menu_bar_flag & menuBar_Settings)
-			if (Common::Rect(buts[2][1],
-			                 scrollPos,
-			                 buts[2][0] + buts[2][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_PREF;
-			}
-
-		// Load
-		if (menu_bar_flag & menuBar_Restore)
-			if (Common::Rect(buts[1][1],
-			                 scrollPos,
-			                 buts[1][0] + buts[1][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_REST;
-			}
-
-		// Save
-		if (menu_bar_flag & menuBar_Save)
-			if (Common::Rect(buts[0][1],
-			                 scrollPos,
-			                 buts[0][0] + buts[0][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_SAVE;
-			}
-
-		if (last_item != mouse_on_item) {
-			redraw = true;
-			frm = 0;
-			delay = 200;
-		}
-	} else {
-		inmenu = false;
-		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
-			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
-		mouse_on_item = -1;
-	}
-}
-
-void menuNem::process(uint32 deltatime) {
-	if (inmenu) {
-		if (!scrolled) {
-			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
-
-			if (scrl == 0)
-				scrl = 1.0;
-
-			scrollPos += scrl;
-			redraw = true;
-		}
-
-		if (scrollPos >= 0) {
-			scrolled = true;
-			scrollPos = 0;
-		}
-
-		if (mouse_on_item != -1) {
-			delay -= deltatime;
-			if (delay <= 0 && frm < 4) {
-				delay = 200;
-				frm++;
-				redraw = true;
-			}
-		}
-
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
-
-			if (menu_bar_flag & menuBar_Exit)
-				if (mouse_on_item == menu_MAIN_EXIT)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
-
-			if (menu_bar_flag & menuBar_Settings)
-				if (mouse_on_item == menu_MAIN_PREF)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
-
-			if (menu_bar_flag & menuBar_Restore)
-				if (mouse_on_item == menu_MAIN_REST)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
-
-			if (menu_bar_flag & menuBar_Save)
-				if (mouse_on_item == menu_MAIN_SAVE)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
-
-			redraw = false;
-		}
-	} else {
-		scrolled = false;
-		if (scrollPos > -32) {
-			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
-
-			if (scrl == 0)
-				scrl = 1.0;
-
-			Common::Rect cl(64, 32 + scrollPos - scrl, 64 + 512, 32 + scrollPos + 1);
-			_engine->getRenderManager()->clearMenuSurface(cl);
-
-			scrollPos -= scrl;
-			redraw = true;
-		} else
-			scrollPos = -32;
-
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
-			redraw = false;
-		}
-	}
-}
-
-
-} // End of namespace ZVision
diff --git a/engines/zvision/meta_animation.cpp b/engines/zvision/meta_animation.cpp
deleted file mode 100644
index dddc238379..0000000000
--- a/engines/zvision/meta_animation.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/meta_animation.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/animation/rlf_animation.h"
-#include "zvision/video/zork_avi_decoder.h"
-
-#include "video/video_decoder.h"
-
-#include "graphics/surface.h"
-
-
-namespace ZVision {
-
-MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
-	: _fileType(RLF),
-	  _cur_frame(NULL) {
-	if (fileName.hasSuffix(".rlf")) {
-		_fileType = RLF;
-		Common::File *_file = engine->getSearchManager()->openFile(fileName);
-		_animation.rlf = new RlfAnimation(_file, false);
-		_frmDelay = _animation.rlf->frameTime();
-	} else if (fileName.hasSuffix(".avi")) {
-		_fileType = AVI;
-		Common::File *_file = engine->getSearchManager()->openFile(fileName);
-		_animation.avi = new ZorkAVIDecoder();
-		_animation.avi->loadStream(_file);
-		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
-	} else {
-		warning("Unrecognized animation file type: %s", fileName.c_str());
-	}
-}
-
-MetaAnimation::~MetaAnimation() {
-	if (_fileType == RLF) {
-		delete _animation.rlf;
-	} else if (_fileType == AVI) {
-		delete _animation.avi;
-	}
-}
-
-uint MetaAnimation::frameCount() {
-	if (_fileType == RLF) {
-		return _animation.rlf->frameCount();
-	} else
-		return _animation.avi->getFrameCount();
-
-}
-
-uint MetaAnimation::width() {
-	if (_fileType == RLF) {
-		return _animation.rlf->width();
-	} else
-		return _animation.avi->getWidth();
-}
-uint MetaAnimation::height() {
-	if (_fileType == RLF) {
-		return _animation.rlf->height();
-	} else
-		return _animation.avi->getHeight();
-}
-uint32 MetaAnimation::frameTime() {
-	return _frmDelay;
-}
-
-void MetaAnimation::seekToFrame(int frameNumber) {
-	if (frameNumber >= (int)frameCount())
-		frameNumber = frameCount() - 1;
-
-	if (_fileType == RLF) {
-		_animation.rlf->seekToFrame(frameNumber);
-	} else
-		_animation.avi->seekToFrame(frameNumber);
-}
-
-const Graphics::Surface *MetaAnimation::decodeNextFrame() {
-	if (_fileType == RLF)
-		_cur_frame = _animation.rlf->decodeNextFrame();
-	else
-		_cur_frame = _animation.avi->decodeNextFrame();
-
-	return _cur_frame;
-}
-
-const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) {
-	if (frameNumber >= frameCount())
-		frameNumber = frameCount() - 1;
-
-	if (_fileType == RLF) {
-		_cur_frame = _animation.rlf->getFrameData(frameNumber);
-		return _cur_frame;
-	} else {
-		_animation.avi->seekToFrame(frameNumber);
-		_cur_frame = _animation.avi->decodeNextFrame();
-		return _cur_frame;
-	}
-}
-
-bool MetaAnimation::endOfAnimation() {
-	if (_fileType == RLF) {
-		return _animation.rlf->endOfAnimation();
-	} else
-		return _animation.avi->endOfVideo();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/meta_animation.h b/engines/zvision/meta_animation.h
deleted file mode 100644
index 3754aae058..0000000000
--- a/engines/zvision/meta_animation.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_METAANIM_NODE_H
-#define ZVISION_METAANIM_NODE_H
-
-#include "zvision/sidefx.h"
-#include "zvision/zvision.h"
-#include "common/rect.h"
-#include "common/list.h"
-
-
-namespace Common {
-class String;
-}
-
-namespace Video {
-class VideoDecoder;
-}
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-class RlfAnimation;
-
-class MetaAnimation {
-public:
-	MetaAnimation(const Common::String &fileName, ZVision *engine);
-	~MetaAnimation();
-
-	struct playnode {
-		Common::Rect pos;
-		int32 slot;
-		int32 start;
-		int32 stop;
-		int32 loop;
-		int32 _cur_frm;
-		int32 _delay;
-		Graphics::Surface *_scaled;
-	};
-
-private:
-	enum FileType {
-		RLF = 1,
-		AVI = 2
-	};
-
-private:
-	union {
-		RlfAnimation *rlf;
-		Video::VideoDecoder *avi;
-	} _animation;
-
-	FileType _fileType;
-	int32 _frmDelay;
-
-	const Graphics::Surface *_cur_frame;
-
-public:
-
-	uint frameCount();
-	uint width();
-	uint height();
-	uint32 frameTime();
-
-	void seekToFrame(int frameNumber);
-
-	const Graphics::Surface *decodeNextFrame();
-	const Graphics::Surface *getFrameData(uint frameNumber);
-
-	bool endOfAnimation();
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index a386f6fac6..9d5072a64d 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -1,46 +1,46 @@
 MODULE := engines/zvision
  
 MODULE_OBJS := \
-	scripting/actions.o \
-	animation_node.o \
-	utility/clock.o \
+	animation/meta_animation.o \
+	animation/rlf_animation.o \
+	archives/zfs_archive.o \
 	core/console.o \
-	scripting/control.o \
-	cursors/cursor.o \
+	core/events.o \
+	core/menu.o \
+	core/save_manager.o \
+	core/search_manager.o \
 	cursors/cursor_manager.o \
+	cursors/cursor.o \
 	detection.o \
-	core/events.o \
+	fonts/truetype_font.o \
+	graphics/render_manager.o \
+	graphics/render_table.o \
+	scripting/actions.o \
+	scripting/control.o \
 	scripting/controls/input_control.o \
 	scripting/controls/lever_control.o \
-	utility/lzss_read_stream.o \
 	scripting/controls/push_toggle_control.o \
-	graphics/render_manager.o \
-	graphics/render_table.o \
-	animation/rlf_animation.o \
-	core/save_manager.o \
+	scripting/controls/slot_control.o \
+	scripting/inventory.o \
 	scripting/scr_file_handling.o \
 	scripting/script_manager.o \
+	scripting/sidefx.o \
+	scripting/sidefx/animation_node.o \
+	scripting/sidefx/music_node.o \
+	scripting/sidefx/syncsound_node.o \
+	scripting/sidefx/timer_node.o \
+	scripting/sidefx/ttytext_node.o \
+	sound/zork_raw.o \
+	subtitles/subtitles.o \
+	text/string_manager.o \
+	text/text.o \
+	utility/clock.o \
+	utility/lzss_read_stream.o \
 	utility/single_value_container.o \
-	strings/string_manager.o \
-	scripting/controls/timer_node.o \
-	fonts/truetype_font.o \
 	utility/utility.o \
 	video/video.o \
-	zvision.o \
-	archives/zfs_archive.o \
 	video/zork_avi_decoder.o \
-	sound/zork_raw.o \
-	sidefx.o \
-	music_node.o \
-	inventory_manager.o \
-	slot_control.o \
-	menu.o \
-	meta_animation.o \
-	search_manager.o \
-	text.o \
-	subtitles.o \
-	syncsound_node.o \
-	ttytext_node.o
+	zvision.o 
  
 MODULE_DIRS += \
 	engines/zvision
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
deleted file mode 100644
index f8fd08b285..0000000000
--- a/engines/zvision/music_node.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/music_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/sound/zork_raw.h"
-
-#include "common/stream.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
-
-
-namespace ZVision {
-
-MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
-	: SideFX(engine, key, SIDEFX_AUDIO) {
-	_loop = loop;
-	_volume = volume;
-	_crossfade = false;
-	_crossfade_target = 0;
-	_crossfade_time = 0;
-	_attenuate = 0;
-	_pantrack = false;
-	_pantrack_X = 0;
-	_sub = NULL;
-
-	Audio::RewindableAudioStream *audioStream;
-
-	if (filename.contains(".wav")) {
-		Common::File *file = new Common::File();
-		if (_engine->getSearchManager()->openFile(*file, filename)) {
-			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
-		}
-	} else {
-		audioStream = makeRawZorkStream(filename, _engine);
-	}
-
-	_stereo = audioStream->isStereo();
-
-	if (_loop) {
-		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
-	} else {
-		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
-	}
-
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 1);
-
-	Common::String subname = filename;
-	subname.setChar('s', subname.size() - 3);
-	subname.setChar('u', subname.size() - 2);
-	subname.setChar('b', subname.size() - 1);
-
-	if (_engine->getSearchManager()->hasFile(subname))
-		_sub = new Subtitle(_engine, subname);
-}
-
-MusicNode::~MusicNode() {
-	_engine->_mixer->stopHandle(_handle);
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-	if (_sub)
-		delete _sub;
-	debug(1, "MusicNode: %d destroyed\n", _key);
-}
-
-void MusicNode::setPanTrack(int16 pos) {
-	if (!_stereo) {
-		_pantrack = true;
-		_pantrack_X = pos;
-		setVolume(_volume);
-	}
-}
-
-void MusicNode::unsetPanTrack() {
-	_pantrack = false;
-	setVolume(_volume);
-}
-
-void MusicNode::setFade(int32 time, uint8 target) {
-	_crossfade_target = target;
-	_crossfade_time = time;
-	_crossfade = true;
-}
-
-bool MusicNode::process(uint32 deltaTimeInMillis) {
-	if (! _engine->_mixer->isSoundHandleActive(_handle))
-		return stop();
-	else {
-		uint8 _newvol = _volume;
-
-		if (_crossfade) {
-			if (_crossfade_time > 0) {
-				if ((int32)deltaTimeInMillis > _crossfade_time)
-					deltaTimeInMillis = _crossfade_time;
-				_newvol += floor(((float)(_crossfade_target - _newvol) / (float)_crossfade_time)) * (float)deltaTimeInMillis;
-				_crossfade_time -= deltaTimeInMillis;
-			} else {
-				_crossfade = false;
-				_newvol = _crossfade_target;
-			}
-		}
-
-		if (_pantrack || _volume != _newvol)
-			setVolume(_newvol);
-
-		if (_sub)
-			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
-	}
-	return false;
-}
-
-void MusicNode::setVolume(uint8 new_volume) {
-	if (_pantrack) {
-		int cur_x = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
-		cur_x -= _pantrack_X;
-		int32 _width = _engine->getRenderManager()->getBkgSize().x;
-		if (cur_x < (-_width) / 2)
-			cur_x += _width;
-		else if (cur_x >= _width / 2)
-			cur_x -= _width;
-
-		float norm = (float)cur_x / ((float)_width / 2.0);
-		float lvl = fabs(norm);
-		if (lvl > 0.5)
-			lvl = (lvl - 0.5) * 1.7;
-		else
-			lvl = 1.0;
-
-		float bal = sin(-norm * 3.1415926) * 127.0;
-
-		if (_engine->_mixer->isSoundHandleActive(_handle)) {
-			_engine->_mixer->setChannelBalance(_handle, bal);
-			_engine->_mixer->setChannelVolume(_handle, new_volume * lvl);
-		}
-	} else {
-		if (_engine->_mixer->isSoundHandleActive(_handle)) {
-			_engine->_mixer->setChannelBalance(_handle, 0);
-			_engine->_mixer->setChannelVolume(_handle, new_volume);
-		}
-	}
-
-	_volume = new_volume;
-}
-
-PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
-	: SideFX(engine, key, SIDEFX_PANTRACK) {
-	_slot = slot;
-
-	SideFX *fx = _engine->getScriptManager()->getSideFX(slot);
-	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNode *mus = (MusicNode *)fx;
-		mus->setPanTrack(pos);
-	}
-}
-
-PanTrackNode::~PanTrackNode() {
-	SideFX *fx = _engine->getScriptManager()->getSideFX(_slot);
-	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNode *mus = (MusicNode *)fx;
-		mus->unsetPanTrack();
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/music_node.h b/engines/zvision/music_node.h
deleted file mode 100644
index 0dad22614b..0000000000
--- a/engines/zvision/music_node.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_MUSIC_NODE_H
-#define ZVISION_MUSIC_NODE_H
-
-#include "audio/mixer.h"
-#include "zvision/sidefx.h"
-#include "zvision/subtitles/subtitles.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-class MusicNode : public SideFX {
-public:
-	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
-	~MusicNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-
-	void setVolume(uint8 volume);
-
-	void setPanTrack(int16 pos);
-	void unsetPanTrack();
-
-	void setFade(int32 time, uint8 target);
-
-private:
-	int32 _timeLeft;
-	bool _pantrack;
-	int32 _pantrack_X;
-	int32 _attenuate;
-	uint8 _volume;
-	bool _loop;
-	bool _crossfade;
-	uint8 _crossfade_target;
-	int32 _crossfade_time;
-	bool _stereo;
-	Audio::SoundHandle _handle;
-	Subtitle *_sub;
-};
-
-class PanTrackNode : public SideFX {
-public:
-	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
-	~PanTrackNode();
-
-private:
-	uint32 _slot;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 3c341fbc80..22fbd4ff16 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -29,11 +29,11 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/video/zork_avi_decoder.h"
-#include "zvision/scripting/controls/timer_node.h"
-#include "zvision/music_node.h"
-#include "zvision/syncsound_node.h"
-#include "zvision/animation_node.h"
-#include "zvision/ttytext_node.h"
+#include "zvision/scripting/sidefx/timer_node.h"
+#include "zvision/scripting/sidefx/music_node.h"
+#include "zvision/scripting/sidefx/syncsound_node.h"
+#include "zvision/scripting/sidefx/animation_node.h"
+#include "zvision/scripting/sidefx/ttytext_node.h"
 
 #include "common/file.h"
 
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index ca707b5ab0..ba1b634d42 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/utility/utility.h"
 
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 4a63f228a0..6fcdb2ca54 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -24,7 +24,7 @@
 #define ZVISION_INPUT_CONTROL_H
 
 #include "zvision/scripting/control.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 
 #include "common/rect.h"
 
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 121fab97e1..7e3ee775fb 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
-#include "zvision/meta_animation.h"
+#include "zvision/animation/meta_animation.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
new file mode 100644
index 0000000000..c85b02b3cd
--- /dev/null
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -0,0 +1,219 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/slot_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
+
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key) {
+
+	_rendered_item = 0;
+	_bkg = NULL;
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("hotspot", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_hotspot = Common::Rect(x, y, width, height);
+		} else if (param.matchString("rectangle", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_rectangle = Common::Rect(x, y, width, height);
+		} else if (param.matchString("cursor", true)) {
+			_cursor = _engine->getCursorManager()->getCursorId(values);
+		} else if (param.matchString("distance_id", true)) {
+			sscanf(values.c_str(), "%c", &_distance_id);
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
+		} else if (param.matchString("eligible_objects", true)) {
+			char buf[256];
+			memset(buf, 0, 256);
+			strcpy(buf, values.c_str());
+
+			char *curpos = buf;
+			char *strend = buf + strlen(buf);
+			while (true) {
+				char *st = curpos;
+
+				if (st >= strend)
+					break;
+
+				while (*curpos != ' ' && curpos < strend)
+					curpos++;
+
+				*curpos = 0;
+				curpos++;
+
+				int obj = atoi(st);
+
+				_eligible_objects.push_back(obj);
+			}
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+
+	if (_hotspot.isEmpty() || _rectangle.isEmpty()) {
+		warning("Slot %u was parsed incorrectly", key);
+	}
+}
+
+SlotControl::~SlotControl() {
+	// Clear the state value back to 0
+	//_engine->getScriptManager()->setStateValue(_key, 0);
+
+	if (_bkg)
+		delete _bkg;
+}
+
+bool SlotControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_hotspot.contains(backgroundImageSpacePos)) {
+		//ctrl_setvenus(ct);
+
+		int item = _engine->getScriptManager()->getStateValue(_key);
+		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+		if (item != 0) {
+			if (mouse_item != 0) {
+				if (eligeblity(mouse_item)) {
+					_engine->getScriptManager()->invertory_drop(mouse_item);
+					_engine->getScriptManager()->invertory_add(item);
+					_engine->getScriptManager()->setStateValue(_key, mouse_item);
+				}
+			} else {
+				_engine->getScriptManager()->invertory_add(item);
+				_engine->getScriptManager()->setStateValue(_key, 0);
+			}
+		} else if (mouse_item == 0) {
+			if (eligeblity(0)) {
+				_engine->getScriptManager()->invertory_drop(0);
+				_engine->getScriptManager()->setStateValue(_key, 0);
+			}
+		} else if (eligeblity(mouse_item)) {
+			_engine->getScriptManager()->setStateValue(_key, mouse_item);
+			_engine->getScriptManager()->invertory_drop(mouse_item);
+		}
+	}
+	return false;
+}
+
+bool SlotControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_hotspot.contains(backgroundImageSpacePos)) {
+		_engine->getCursorManager()->changeCursor(_cursor);
+		return true;
+	}
+
+	return false;
+}
+
+bool SlotControl::process(uint32 deltaTimeInMillis) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_engine->canRender()) {
+		int cur_item = _engine->getScriptManager()->getStateValue(_key);
+		if (cur_item != _rendered_item) {
+			if (_rendered_item != 0 && cur_item == 0) {
+				_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
+				_rendered_item = cur_item;
+			} else {
+				if (_rendered_item == 0) {
+					if (_bkg)
+						delete _bkg;
+
+					_bkg = _engine->getRenderManager()->getBkgRect(_rectangle);
+				} else {
+					_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
+				}
+
+				char buf[16];
+				if (_engine->getGameId() == GID_NEMESIS)
+					sprintf(buf, "%d%cobj.tga", cur_item, _distance_id);
+				else
+					sprintf(buf, "g0z%cu%2.2x1.tga", _distance_id, cur_item);
+
+				Graphics::Surface *srf = _engine->getRenderManager()->loadImage(buf);
+
+				int16 drawx = _rectangle.left;
+				int16 drawy = _rectangle.top;
+
+				if (_rectangle.width() > srf->w)
+					drawx = _rectangle.left + (_rectangle.width() - srf->w) / 2;
+
+				if (_rectangle.height() > srf->h)
+					drawy = _rectangle.top + (_rectangle.height() - srf->h) / 2;
+
+				_engine->getRenderManager()->blitSurfaceToBkg(*srf, drawx, drawy, 0);
+
+				delete srf;
+
+				_rendered_item = cur_item;
+			}
+		}
+	}
+	return false;
+}
+
+bool SlotControl::eligeblity(int item_id) {
+	for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++)
+		if (*it == item_id)
+			return true;
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h
new file mode 100644
index 0000000000..0ac8ec9ce0
--- /dev/null
+++ b/engines/zvision/scripting/controls/slot_control.h
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SLOT_CONTROL_H
+#define ZVISION_SLOT_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "graphics/surface.h"
+
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace ZVision {
+
+class SlotControl : public Control {
+public:
+	SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~SlotControl();
+
+	/**
+	 * Called when LeftMouse is lifted. Calls ScriptManager::setStateValue(_key, 1);
+	 *
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 */
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	/**
+	 * Called on every MouseMove. Tests if the mouse is inside _hotspot, and if so, sets the cursor.
+	 *
+	 * @param engine                     The base engine
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 * @return                           Was the cursor changed?
+	 */
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	/**
+	 * The area that will trigger the event
+	 * This is in image space coordinates, NOT screen space
+	 */
+	Common::Rect _rectangle;
+	Common::Rect _hotspot;
+
+	int _cursor;
+	char _distance_id;
+	int _venus_id;
+
+	int _rendered_item;
+
+	Common::List<int> _eligible_objects;
+
+	bool eligeblity(int item_id);
+
+	Graphics::Surface *_bkg;
+
+	/** The cursor to use when hovering over _hotspot */
+	Common::String _hoverCursor;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/controls/timer_node.cpp b/engines/zvision/scripting/controls/timer_node.cpp
deleted file mode 100644
index e68610f537..0000000000
--- a/engines/zvision/scripting/controls/timer_node.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/controls/timer_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-
-#include "common/stream.h"
-
-
-namespace ZVision {
-
-TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
-	: SideFX(engine, key, SIDEFX_TIMER) {
-	if (_engine->getGameId() == GID_NEMESIS)
-		_timeLeft = timeInSeconds * 1000;
-	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
-		_timeLeft = timeInSeconds * 100;
-
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 1);
-}
-
-TimerNode::~TimerNode() {
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-	int32 timeLeft = _timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100);
-	if (timeLeft > 0)
-		_engine->getScriptManager()->setStateValue(_key, timeLeft); // If timer was stopped by stop or kill
-}
-
-bool TimerNode::process(uint32 deltaTimeInMillis) {
-	_timeLeft -= deltaTimeInMillis;
-
-	if (_timeLeft <= 0)
-		return stop();
-
-	return false;
-}
-
-bool TimerNode::stop() {
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-	return true;
-}
-
-void TimerNode::serialize(Common::WriteStream *stream) {
-	stream->writeUint32BE(MKTAG('T', 'I', 'M', 'R'));
-	stream->writeUint32LE(8); // size
-	stream->writeUint32LE(_key);
-	stream->writeUint32LE(_timeLeft);
-}
-
-void TimerNode::deserialize(Common::SeekableReadStream *stream) {
-	_timeLeft = stream->readUint32LE();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/timer_node.h b/engines/zvision/scripting/controls/timer_node.h
deleted file mode 100644
index f6584becda..0000000000
--- a/engines/zvision/scripting/controls/timer_node.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_TIMER_NODE_H
-#define ZVISION_TIMER_NODE_H
-
-#include "zvision/sidefx.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class TimerNode : public SideFX {
-public:
-	TimerNode(ZVision *engine, uint32 key, uint timeInSeconds);
-	~TimerNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-	void serialize(Common::WriteStream *stream);
-	void deserialize(Common::SeekableReadStream *stream);
-	inline bool needsSerialization() {
-		return true;
-	}
-
-	bool stop();
-
-private:
-	int32 _timeLeft;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/inventory.cpp b/engines/zvision/scripting/inventory.cpp
new file mode 100644
index 0000000000..f8b22970c4
--- /dev/null
+++ b/engines/zvision/scripting/inventory.cpp
@@ -0,0 +1,123 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/script_manager.h"
+
+
+namespace ZVision {
+
+int8 ScriptManager::invertory_getCount() {
+	return getStateValue(StateKey_Inv_Cnt_Slot);
+}
+
+void ScriptManager::invertory_setCount(int8 cnt) {
+	setStateValue(StateKey_Inv_Cnt_Slot, cnt);
+}
+
+int16 ScriptManager::invertory_getItem(int8 id) {
+	if (id < 49 && id >= 0)
+		return getStateValue(StateKey_Inv_1_Slot + id);
+	return -1;
+}
+
+void ScriptManager::invertory_setItem(int8 id, int16 item) {
+	if (id < 49 && id >= 0)
+		setStateValue(StateKey_Inv_1_Slot + id, item);
+}
+
+void ScriptManager::invertory_add(int16 item) {
+	int8 cnt = invertory_getCount();
+
+	if (cnt < 49) {
+		bool not_exist = true;
+
+		if (cnt == 0) {
+			invertory_setItem(0, 0);
+			invertory_setCount(1); // we needed empty item for cycle code
+			cnt = 1;
+		}
+
+		for (int8 cur = 0; cur < cnt; cur++)
+			if (invertory_getItem(cur) == item) {
+				not_exist = false;
+				break;
+			}
+
+		if (not_exist) {
+			for (int8 i = cnt; i > 0; i--)
+				invertory_setItem(i, invertory_getItem(i - 1));
+
+			invertory_setItem(0, item);
+
+			setStateValue(StateKey_InventoryItem, item);
+
+			invertory_setCount(cnt + 1);
+		}
+	}
+}
+
+void ScriptManager::invertory_drop(int16 item) {
+	int8 items_cnt = invertory_getCount();
+
+	// if items in inventory > 0
+	if (items_cnt != 0) {
+		int8 index = 0;
+
+		// finding needed item
+		while (index < items_cnt) {
+			if (invertory_getItem(index) == item)
+				break;
+
+			index++;
+		}
+
+		// if item in the inventory
+		if (items_cnt != index) {
+			// shift all items left with rewrite founded item
+			for (int8 v = index; v < items_cnt - 1 ; v++)
+				invertory_setItem(v, invertory_getItem(v + 1));
+
+			// del last item
+			invertory_setItem(items_cnt - 1, 0);
+			invertory_setCount(invertory_getCount() - 1);
+
+			setStateValue(StateKey_InventoryItem, invertory_getItem(0));
+		}
+	}
+}
+void ScriptManager::invertory_cycle() {
+	int8 item_cnt = invertory_getCount();
+	int8 cur_item = invertory_getItem(0);
+	if (item_cnt > 1) {
+		for (int8 i = 0; i < item_cnt - 1; i++)
+			invertory_setItem(i, invertory_getItem(i + 1));
+
+		invertory_setItem(item_cnt - 1, cur_item);
+
+		setStateValue(StateKey_InventoryItem, invertory_getItem(0));
+
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index fff187d369..5d697bd841 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -30,7 +30,7 @@
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/controls/push_toggle_control.h"
 #include "zvision/scripting/controls/lever_control.h"
-#include "zvision/slot_control.h"
+#include "zvision/scripting/controls/slot_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 9713a34733..a27ae4dbf0 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -30,7 +30,7 @@
 #include "zvision/core/save_manager.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/utility/utility.h"
-#include "zvision/scripting/controls/timer_node.h"
+#include "zvision/scripting/sidefx/timer_node.h"
 
 #include "common/algorithm.h"
 #include "common/hashmap.h"
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index a835c13951..8ec364b35f 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -25,7 +25,7 @@
 
 #include "zvision/scripting/puzzle.h"
 #include "zvision/scripting/control.h"
-#include "zvision/sidefx.h"
+#include "zvision/scripting/sidefx.h"
 
 #include "common/hashmap.h"
 #include "common/queue.h"
diff --git a/engines/zvision/scripting/sidefx.cpp b/engines/zvision/scripting/sidefx.cpp
new file mode 100644
index 0000000000..c0b8a4d12f
--- /dev/null
+++ b/engines/zvision/scripting/sidefx.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
+
+#include "common/stream.h"
+
+namespace ZVision {
+
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx.h b/engines/zvision/scripting/sidefx.h
new file mode 100644
index 0000000000..2c53467559
--- /dev/null
+++ b/engines/zvision/scripting/sidefx.h
@@ -0,0 +1,124 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SIDEFX_H_INCLUDED
+#define SIDEFX_H_INCLUDED
+
+namespace Common {
+class SeekableReadStream;
+struct Point;
+class WriteStream;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+class SideFX {
+public:
+
+	enum SideFXType {
+		SIDEFX_ANIM  = 1,
+		SIDEFX_AUDIO = 2,
+		SIDEFX_DISTORT = 4,
+		SIDEFX_PANTRACK = 8,
+		SIDEFX_REGION = 16,
+		SIDEFX_TIMER = 32,
+		SIDEFX_TTYTXT = 64,
+		SIDEFX_UNK = 128,
+		SIDEFX_ALL = 255
+	};
+
+	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
+	SideFX(ZVision *engine, uint32 key, SideFXType type) : _engine(engine), _key(key), _type(type) {}
+	virtual ~SideFX() {}
+
+	uint32 getKey() {
+		return _key;
+	}
+	SideFXType getType() {
+		return _type;
+	}
+
+	virtual bool process(uint32 deltaTimeInMillis) {
+		return false;
+	}
+	/**
+	 * Serialize a SideFX for save game use. This should only be used if a SideFX needs
+	 * to save values that would be different from initialization. AKA a TimerNode needs to
+	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
+	 * their key as the first data outputted. The default implementation is NOP.
+	 *
+	 * NOTE: If this method is overridden, you MUST also override deserialize()
+	 * and needsSerialization()
+	 *
+	 * @param stream    Stream to write any needed data to
+	 */
+	virtual void serialize(Common::WriteStream *stream) {}
+	/**
+	 * De-serialize data from a save game stream. This should only be implemented if the
+	 * SideFX also implements serialize(). The calling method assumes the size of the
+	 * data read from the stream exactly equals that written in serialize(). The default
+	 * implementation is NOP.
+	 *
+	 * NOTE: If this method is overridden, you MUST also override serialize()
+	 * and needsSerialization()
+	 *
+	 * @param stream    Save game file stream
+	 */
+	virtual void deserialize(Common::SeekableReadStream *stream) {}
+	/**
+	 * If a SideFX overrides serialize() and deserialize(), this should return true
+	 *
+	 * @return    Does the SideFX need save game serialization?
+	 */
+	virtual inline bool needsSerialization() {
+		return false;
+	}
+
+	virtual bool stop() {
+		return true;
+	}
+	virtual void kill() {}
+
+protected:
+	ZVision *_engine;
+	uint32 _key;
+	SideFXType _type;
+
+// Static member functions
+public:
+
+};
+
+// TODO: Implement InputControl
+// TODO: Implement SaveControl
+// TODO: Implement SlotControl
+// TODO: Implement SafeControl
+// TODO: Implement FistControl
+// TODO: Implement HotMovieControl
+// TODO: Implement PaintControl
+// TODO: Implement TilterControl
+
+} // End of namespace ZVision
+
+#endif // SIDEFX_H_INCLUDED
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
new file mode 100644
index 0000000000..4a606adc9e
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -0,0 +1,211 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/animation_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/animation/meta_animation.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
+	: SideFX(engine, controlKey, SIDEFX_ANIM),
+	  _DisposeAfterUse(DisposeAfterUse),
+	  _mask(mask),
+	  _animation(NULL) {
+
+	if (fileName.hasSuffix(".rlf") || fileName.hasSuffix(".avi")) {
+		_animation = new MetaAnimation(fileName, engine);
+		_frmDelay = _animation->frameTime();
+	} else {
+		warning("Unrecognized animation file type: %s", fileName.c_str());
+	}
+
+	if (frate > 0)
+		_frmDelay = 1000.0 / frate;
+}
+
+AnimationNode::~AnimationNode() {
+	if (_animation)
+		delete _animation;
+
+	_engine->getScriptManager()->setStateValue(_key, 2);
+
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+
+		if ((*it)._scaled)
+			delete(*it)._scaled;
+	}
+
+	_playList.clear();
+}
+
+bool AnimationNode::process(uint32 deltaTimeInMillis) {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		playnode *nod = &(*it);
+
+		nod->_delay -= deltaTimeInMillis;
+		if (nod->_delay <= 0) {
+			nod->_delay += _frmDelay;
+
+			const Graphics::Surface *frame = NULL;
+
+			if (nod->_cur_frm == -1) { // Start of new playlist node
+				nod->_cur_frm = nod->start;
+
+				_animation->seekToFrame(nod->_cur_frm);
+				frame = _animation->decodeNextFrame();
+
+				nod->_delay = _frmDelay;
+				if (nod->slot)
+					_engine->getScriptManager()->setStateValue(nod->slot, 1);
+			} else {
+				nod->_cur_frm++;
+
+				if (nod->_cur_frm > nod->stop) {
+					nod->loop--;
+
+					if (nod->loop == 0) {
+						if (nod->slot >= 0)
+							_engine->getScriptManager()->setStateValue(nod->slot, 2);
+						if (nod->_scaled)
+							delete nod->_scaled;
+						_playList.erase(it);
+						return _DisposeAfterUse;
+					}
+
+					nod->_cur_frm = nod->start;
+					_animation->seekToFrame(nod->_cur_frm);
+				}
+
+				frame = _animation->decodeNextFrame();
+			}
+
+			if (frame) {
+
+				uint32 dstw;
+				uint32 dsth;
+				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+					dstw = nod->pos.height();
+					dsth = nod->pos.width();
+				} else {
+					dstw = nod->pos.width();
+					dsth = nod->pos.height();
+				}
+
+				if (frame->w != dstw || frame->h != dsth) {
+					if (nod->_scaled)
+						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
+							delete nod->_scaled;
+							nod->_scaled = NULL;
+						}
+
+					if (!nod->_scaled) {
+						nod->_scaled = new Graphics::Surface;
+						nod->_scaled->create(dstw, dsth, frame->format);
+					}
+
+					_engine->getRenderManager()->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
+					frame = nod->_scaled;
+				}
+
+				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
+					if (_mask > 0)
+						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
+					else
+						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top);
+					delete transposed;
+				} else {
+					if (_mask > 0)
+						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
+					else
+						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top);
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+
+
+void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops) {
+	playnode nod;
+	nod.loop = loops;
+	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
+	nod.start = start_frame;
+	nod.stop = end_frame;
+
+	if (nod.stop >= (int)_animation->frameCount())
+		nod.stop = _animation->frameCount() - 1;
+
+	nod.slot = slot;
+	nod._cur_frm = -1;
+	nod._delay = 0;
+	nod._scaled = NULL;
+	_playList.push_back(nod);
+}
+
+bool AnimationNode::stop() {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+		if ((*it)._scaled)
+			delete(*it)._scaled;
+	}
+
+	_playList.clear();
+
+	// We don't need to delete, it's may be reused
+	return false;
+}
+
+void AnimationNode::setNewFrameDelay(int32 newDelay) {
+	if (newDelay > 0) {
+		PlayNodes::iterator it = _playList.begin();
+		if (it != _playList.end()) {
+			playnode *nod = &(*it);
+			float percent = (float)nod->_delay / (float)_frmDelay;
+			nod->_delay = percent * newDelay; // Scale to new max
+		}
+
+		_frmDelay = newDelay;
+	}
+}
+
+int32 AnimationNode::getFrameDelay() {
+	return _frmDelay;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
new file mode 100644
index 0000000000..4d1c74bccf
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_ANIMATION_NODE_H
+#define ZVISION_ANIMATION_NODE_H
+
+#include "zvision/scripting/sidefx.h"
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace Common {
+class String;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+class MetaAnimation;
+
+class AnimationNode : public SideFX {
+public:
+	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse = true);
+	~AnimationNode();
+
+	struct playnode {
+		Common::Rect pos;
+		int32 slot;
+		int32 start;
+		int32 stop;
+		int32 loop;
+		int32 _cur_frm;
+		int32 _delay;
+		Graphics::Surface *_scaled;
+	};
+
+private:
+	typedef Common::List<playnode> PlayNodes;
+
+	PlayNodes _playList;
+
+	int32 _mask;
+	bool _DisposeAfterUse;
+
+	MetaAnimation *_animation;
+	int32 _frmDelay;
+
+public:
+	bool process(uint32 deltaTimeInMillis);
+
+	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops = 1);
+
+	bool stop();
+
+	void setNewFrameDelay(int32 newDelay);
+	int32 getFrameDelay();
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
new file mode 100644
index 0000000000..0351867dd9
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -0,0 +1,190 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/music_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/zork_raw.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "audio/decoders/wave.h"
+
+
+namespace ZVision {
+
+MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
+	: SideFX(engine, key, SIDEFX_AUDIO) {
+	_loop = loop;
+	_volume = volume;
+	_crossfade = false;
+	_crossfade_target = 0;
+	_crossfade_time = 0;
+	_attenuate = 0;
+	_pantrack = false;
+	_pantrack_X = 0;
+	_sub = NULL;
+
+	Audio::RewindableAudioStream *audioStream;
+
+	if (filename.contains(".wav")) {
+		Common::File *file = new Common::File();
+		if (_engine->getSearchManager()->openFile(*file, filename)) {
+			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+		}
+	} else {
+		audioStream = makeRawZorkStream(filename, _engine);
+	}
+
+	_stereo = audioStream->isStereo();
+
+	if (_loop) {
+		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
+		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
+	} else {
+		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
+	}
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+
+	Common::String subname = filename;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
+
+	if (_engine->getSearchManager()->hasFile(subname))
+		_sub = new Subtitle(_engine, subname);
+}
+
+MusicNode::~MusicNode() {
+	_engine->_mixer->stopHandle(_handle);
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	if (_sub)
+		delete _sub;
+	debug(1, "MusicNode: %d destroyed\n", _key);
+}
+
+void MusicNode::setPanTrack(int16 pos) {
+	if (!_stereo) {
+		_pantrack = true;
+		_pantrack_X = pos;
+		setVolume(_volume);
+	}
+}
+
+void MusicNode::unsetPanTrack() {
+	_pantrack = false;
+	setVolume(_volume);
+}
+
+void MusicNode::setFade(int32 time, uint8 target) {
+	_crossfade_target = target;
+	_crossfade_time = time;
+	_crossfade = true;
+}
+
+bool MusicNode::process(uint32 deltaTimeInMillis) {
+	if (! _engine->_mixer->isSoundHandleActive(_handle))
+		return stop();
+	else {
+		uint8 _newvol = _volume;
+
+		if (_crossfade) {
+			if (_crossfade_time > 0) {
+				if ((int32)deltaTimeInMillis > _crossfade_time)
+					deltaTimeInMillis = _crossfade_time;
+				_newvol += floor(((float)(_crossfade_target - _newvol) / (float)_crossfade_time)) * (float)deltaTimeInMillis;
+				_crossfade_time -= deltaTimeInMillis;
+			} else {
+				_crossfade = false;
+				_newvol = _crossfade_target;
+			}
+		}
+
+		if (_pantrack || _volume != _newvol)
+			setVolume(_newvol);
+
+		if (_sub)
+			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
+	}
+	return false;
+}
+
+void MusicNode::setVolume(uint8 new_volume) {
+	if (_pantrack) {
+		int cur_x = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
+		cur_x -= _pantrack_X;
+		int32 _width = _engine->getRenderManager()->getBkgSize().x;
+		if (cur_x < (-_width) / 2)
+			cur_x += _width;
+		else if (cur_x >= _width / 2)
+			cur_x -= _width;
+
+		float norm = (float)cur_x / ((float)_width / 2.0);
+		float lvl = fabs(norm);
+		if (lvl > 0.5)
+			lvl = (lvl - 0.5) * 1.7;
+		else
+			lvl = 1.0;
+
+		float bal = sin(-norm * 3.1415926) * 127.0;
+
+		if (_engine->_mixer->isSoundHandleActive(_handle)) {
+			_engine->_mixer->setChannelBalance(_handle, bal);
+			_engine->_mixer->setChannelVolume(_handle, new_volume * lvl);
+		}
+	} else {
+		if (_engine->_mixer->isSoundHandleActive(_handle)) {
+			_engine->_mixer->setChannelBalance(_handle, 0);
+			_engine->_mixer->setChannelVolume(_handle, new_volume);
+		}
+	}
+
+	_volume = new_volume;
+}
+
+PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
+	: SideFX(engine, key, SIDEFX_PANTRACK) {
+	_slot = slot;
+
+	SideFX *fx = _engine->getScriptManager()->getSideFX(slot);
+	if (fx && fx->getType() == SIDEFX_AUDIO) {
+		MusicNode *mus = (MusicNode *)fx;
+		mus->setPanTrack(pos);
+	}
+}
+
+PanTrackNode::~PanTrackNode() {
+	SideFX *fx = _engine->getScriptManager()->getSideFX(_slot);
+	if (fx && fx->getType() == SIDEFX_AUDIO) {
+		MusicNode *mus = (MusicNode *)fx;
+		mus->unsetPanTrack();
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
new file mode 100644
index 0000000000..066b8f80f4
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -0,0 +1,82 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_MUSIC_NODE_H
+#define ZVISION_MUSIC_NODE_H
+
+#include "audio/mixer.h"
+#include "zvision/scripting/sidefx.h"
+#include "zvision/subtitles/subtitles.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class MusicNode : public SideFX {
+public:
+	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
+	~MusicNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+	void setVolume(uint8 volume);
+
+	void setPanTrack(int16 pos);
+	void unsetPanTrack();
+
+	void setFade(int32 time, uint8 target);
+
+private:
+	int32 _timeLeft;
+	bool _pantrack;
+	int32 _pantrack_X;
+	int32 _attenuate;
+	uint8 _volume;
+	bool _loop;
+	bool _crossfade;
+	uint8 _crossfade_target;
+	int32 _crossfade_time;
+	bool _stereo;
+	Audio::SoundHandle _handle;
+	Subtitle *_sub;
+};
+
+class PanTrackNode : public SideFX {
+public:
+	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
+	~PanTrackNode();
+
+private:
+	uint32 _slot;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
new file mode 100644
index 0000000000..2bfdc349d1
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/syncsound_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/zork_raw.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "audio/decoders/wave.h"
+
+
+namespace ZVision {
+
+SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)
+	: SideFX(engine, key, SIDEFX_AUDIO) {
+	_syncto = syncto;
+	_sub = NULL;
+
+	Audio::RewindableAudioStream *audioStream;
+
+	if (filename.contains(".wav")) {
+		Common::File *file = new Common::File();
+		if (_engine->getSearchManager()->openFile(*file, filename)) {
+			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+		}
+	} else {
+		audioStream = makeRawZorkStream(filename, _engine);
+	}
+
+	_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream);
+
+	Common::String subname = filename;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
+
+	if (_engine->getSearchManager()->hasFile(subname))
+		_sub = new Subtitle(_engine, subname);
+}
+
+SyncSoundNode::~SyncSoundNode() {
+	_engine->_mixer->stopHandle(_handle);
+	if (_sub)
+		delete _sub;
+}
+
+bool SyncSoundNode::process(uint32 deltaTimeInMillis) {
+	if (! _engine->_mixer->isSoundHandleActive(_handle))
+		return stop();
+	else {
+
+		if (_engine->getScriptManager()->getSideFX(_syncto) == NULL)
+			return stop();
+
+		if (_sub)
+			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
+	}
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.h b/engines/zvision/scripting/sidefx/syncsound_node.h
new file mode 100644
index 0000000000..c16ffebe7f
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/syncsound_node.h
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SYNCSOUND_NODE_H
+#define ZVISION_SYNCSOUND_NODE_H
+
+#include "audio/mixer.h"
+#include "zvision/scripting/sidefx.h"
+#include "zvision/subtitles/subtitles.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class SyncSoundNode : public SideFX {
+public:
+	SyncSoundNode(ZVision *engine, uint32 key, Common::String &file, int32 syncto);
+	~SyncSoundNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+private:
+	int32 _syncto;
+	Audio::SoundHandle _handle;
+	Subtitle *_sub;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/sidefx/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp
new file mode 100644
index 0000000000..6e71101acd
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/timer_node.cpp
@@ -0,0 +1,80 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/timer_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
+	: SideFX(engine, key, SIDEFX_TIMER) {
+	if (_engine->getGameId() == GID_NEMESIS)
+		_timeLeft = timeInSeconds * 1000;
+	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
+		_timeLeft = timeInSeconds * 100;
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+TimerNode::~TimerNode() {
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	int32 timeLeft = _timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100);
+	if (timeLeft > 0)
+		_engine->getScriptManager()->setStateValue(_key, timeLeft); // If timer was stopped by stop or kill
+}
+
+bool TimerNode::process(uint32 deltaTimeInMillis) {
+	_timeLeft -= deltaTimeInMillis;
+
+	if (_timeLeft <= 0)
+		return stop();
+
+	return false;
+}
+
+bool TimerNode::stop() {
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	return true;
+}
+
+void TimerNode::serialize(Common::WriteStream *stream) {
+	stream->writeUint32BE(MKTAG('T', 'I', 'M', 'R'));
+	stream->writeUint32LE(8); // size
+	stream->writeUint32LE(_key);
+	stream->writeUint32LE(_timeLeft);
+}
+
+void TimerNode::deserialize(Common::SeekableReadStream *stream) {
+	_timeLeft = stream->readUint32LE();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/timer_node.h b/engines/zvision/scripting/sidefx/timer_node.h
new file mode 100644
index 0000000000..7a26aff251
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/timer_node.h
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_TIMER_NODE_H
+#define ZVISION_TIMER_NODE_H
+
+#include "zvision/scripting/sidefx.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class TimerNode : public SideFX {
+public:
+	TimerNode(ZVision *engine, uint32 key, uint timeInSeconds);
+	~TimerNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+	void serialize(Common::WriteStream *stream);
+	void deserialize(Common::SeekableReadStream *stream);
+	inline bool needsSerialization() {
+		return true;
+	}
+
+	bool stop();
+
+private:
+	int32 _timeLeft;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
new file mode 100644
index 0000000000..68636eb422
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp
@@ -0,0 +1,175 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/ttytext_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/text/text.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+
+
+namespace ZVision {
+
+ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :
+	SideFX(engine, key, SIDEFX_TTYTXT),
+	_fnt(engine) {
+	_delay = delay;
+	_r = r;
+	_txtpos = 0;
+	_nexttime = 0;
+	_dx = 0;
+	_dy = 0;
+
+	Common::File *infile = _engine->getSearchManager()->openFile(file);
+	if (infile) {
+		while (!infile->eos()) {
+			Common::String asciiLine = readWideLine(*infile);
+			if (asciiLine.empty()) {
+				continue;
+			}
+			_txtbuf += asciiLine;
+		}
+
+		delete infile;
+	}
+	_img.create(_r.width(), _r.height(), _engine->_pixelFormat);
+	_style.sharp = true;
+	_style.readAllStyle(_txtbuf);
+	_style.setFont(_fnt);
+	_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+ttyTextNode::~ttyTextNode() {
+	_engine->getScriptManager()->setStateValue(_key, 2);
+	_img.free();
+}
+
+bool ttyTextNode::process(uint32 deltaTimeInMillis) {
+	_nexttime -= deltaTimeInMillis;
+
+	if (_nexttime < 0) {
+		if (_txtpos < _txtbuf.size()) {
+			if (_txtbuf[_txtpos] == '<') {
+				int32 strt = _txtpos;
+				int32 endt = 0;
+				int16 ret = 0;
+				while (_txtbuf[_txtpos] != '>' && _txtpos < _txtbuf.size())
+					_txtpos++;
+				endt = _txtpos;
+				if (strt != -1)
+					if ((endt - strt - 1) > 0)
+						ret = _style.parseStyle(_txtbuf.c_str() + strt + 1, endt - strt - 1);
+
+				if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
+					if (ret & TXT_RET_FNTCHG)
+						_style.setFont(_fnt);
+					if (ret & TXT_RET_FNTSTL)
+						_style.setFontStyle(_fnt);
+
+					if (ret & TXT_RET_NEWLN)
+						newline();
+				}
+
+				if (ret & TXT_RET_HASSTBOX) {
+					Common::String buf;
+					buf.format("%d", _style.statebox);
+
+					for (uint8 j = 0; j < buf.size(); j++)
+						outchar(buf[j]);
+				}
+
+				_txtpos++;
+			} else {
+				int8 charsz = getUtf8CharSize(_txtbuf[_txtpos]);
+
+				uint16 chr = readUtf8Char(_txtbuf.c_str() + _txtpos);
+
+				if (chr == ' ') {
+					uint32 i = _txtpos + charsz;
+					uint16 width = _fnt.getCharWidth(chr);
+
+					while (i < _txtbuf.size() && _txtbuf[i] != ' ' && _txtbuf[i] != '<') {
+
+						int8 chsz   = getUtf8CharSize(_txtbuf[i]);
+						uint16 uchr = readUtf8Char(_txtbuf.c_str() + _txtpos);
+
+						width += _fnt.getCharWidth(uchr);
+
+						i += chsz;
+					}
+
+					if (_dx + width > _r.width())
+						newline();
+					else
+						outchar(chr);
+				} else
+					outchar(chr);
+
+				_txtpos += charsz;
+			}
+			_nexttime = _delay;
+			_engine->getRenderManager()->blitSurfaceToBkg(_img, _r.left, _r.top);
+		} else
+			return stop();
+	}
+
+	return false;
+}
+
+void ttyTextNode::scroll() {
+	int32 scrl = 0;
+	while (_dy - scrl > _r.height() - _fnt.getFontHeight())
+		scrl += _fnt.getFontHeight();
+	int8 *pixels = (int8 *)_img.getPixels();
+	for (uint16 h = scrl; h < _img.h; h++)
+		memcpy(pixels + _img.pitch * (h - scrl), pixels + _img.pitch * h, _img.pitch);
+
+	_img.fillRect(Common::Rect(0, _img.h - scrl, _img.w, _img.h), 0);
+	_dy -= scrl;
+}
+
+void ttyTextNode::newline() {
+	_dy += _fnt.getFontHeight();
+	_dx = 0;
+}
+
+void ttyTextNode::outchar(uint16 chr) {
+	uint32 clr = _engine->_pixelFormat.RGBToColor(_style.red, _style.green, _style.blue);
+
+	if (_dx + _fnt.getCharWidth(chr) > _r.width())
+		newline();
+
+	if (_dy + _fnt.getFontHeight() >= _r.height())
+		scroll();
+
+	_fnt.drawChar(&_img, chr, _dx, _dy, clr);
+
+	_dx += _fnt.getCharWidth(chr);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
new file mode 100644
index 0000000000..a6326c733b
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/ttytext_node.h
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_TTYTEXT_NODE_H
+#define ZVISION_TTYTEXT_NODE_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+#include "zvision/scripting/sidefx.h"
+#include "zvision/text/text.h"
+#include "zvision/fonts/truetype_font.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class ttyTextNode : public SideFX {
+public:
+	ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay);
+	~ttyTextNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+private:
+	Common::Rect _r;
+	//int16 x;
+	//int16 y;
+	//uint16 w;
+	//uint16 h;
+	cTxtStyle _style;
+	sTTFont _fnt;
+	Common::String _txtbuf;
+	uint32 _txtpos;
+	//int32 txtsize;
+	int32 _delay;
+	int32 _nexttime;
+	Graphics::Surface _img;
+	int16 _dx;
+	int16 _dy;
+private:
+
+	void newline();
+	void scroll();
+	void outchar(uint16 chr);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/search_manager.cpp b/engines/zvision/search_manager.cpp
deleted file mode 100644
index db120f2a4b..0000000000
--- a/engines/zvision/search_manager.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-#include "common/debug.h"
-
-#include "zvision/search_manager.h"
-#include "zvision/archives/zfs_archive.h"
-#include "common/fs.h"
-#include "common/stream.h"
-
-
-namespace ZVision {
-
-sManager::sManager(const Common::String &root_path, int depth) {
-	_root = root_path;
-	if (_root[_root.size() - 1] == '\\' || _root[_root.size() - 1] == '/')
-		_root.deleteLastChar();
-
-	Common::FSNode fs_node(_root);
-
-	list_dir_recursive(dir_list, fs_node, depth);
-
-	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end();)
-		if (it->size() == _root.size())
-			it = dir_list.erase(it);
-		else if (it->size() > _root.size()) {
-			*it = Common::String(it->c_str() + _root.size() + 1);
-			it++;
-		} else
-			it++;
-}
-
-sManager::~sManager() {
-	Common::List<Common::Archive *>::iterator it = archList.begin();
-	while (it != archList.end()) {
-		delete *it;
-		it++;
-	}
-
-	archList.clear();
-}
-
-void sManager::addPatch(const Common::String &src, const Common::String &dst) {
-	Common::String lw_name = dst;
-	lw_name.toLowercase();
-
-	sManager::MatchList::iterator it = files.find(lw_name);
-
-	if (it != files.end()) {
-		lw_name = src;
-		lw_name.toLowercase();
-		files[lw_name] = it->_value;
-	}
-}
-
-void sManager::addFile(const Common::String &name, Common::Archive *arch) {
-	bool addArch = true;
-	Common::List<Common::Archive *>::iterator it = archList.begin();
-	while (it != archList.end()) {
-		if (*it == arch) {
-			addArch = false;
-			break;
-		}
-		it++;
-	}
-	if (addArch)
-		archList.push_back(arch);
-
-	Common::String lw_name = name;
-	lw_name.toLowercase();
-
-	sManager::Node nod;
-	nod.name = lw_name;
-	nod.arch = arch;
-
-	sManager::MatchList::iterator fit = files.find(lw_name);
-
-	if (fit == files.end()) {
-		files[lw_name] = nod;
-	} else {
-		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
-		if (stream) {
-			if (stream->size() < 10)
-				fit->_value.arch = arch;
-			delete stream;
-		} else {
-			files[lw_name] = nod;
-		}
-	}
-}
-
-Common::File *sManager::openFile(const Common::String &name) {
-	Common::String lw_name = name;
-	lw_name.toLowercase();
-
-	sManager::MatchList::iterator fit = files.find(lw_name);
-
-	if (fit != files.end()) {
-		Common::File *tmp = new Common::File();
-		tmp->open(fit->_value.name, *fit->_value.arch);
-		return tmp;
-	}
-	return NULL;
-}
-
-bool sManager::openFile(Common::File &file, const Common::String &name) {
-	Common::String lw_name = name;
-	lw_name.toLowercase();
-
-	sManager::MatchList::iterator fit = files.find(lw_name);
-
-	if (fit != files.end())
-		return file.open(fit->_value.name, *fit->_value.arch);
-	return false;
-}
-
-bool sManager::hasFile(const Common::String &name) {
-	Common::String lw_name = name;
-	lw_name.toLowercase();
-
-	sManager::MatchList::iterator fit = files.find(lw_name);
-
-	if (fit != files.end())
-		return true;
-	return false;
-}
-
-void sManager::loadZix(const Common::String &name) {
-	Common::File file;
-	file.open(name);
-
-	Common::String line;
-
-	while (!file.eos()) {
-		line = file.readLine();
-		if (line.matchString("----------*", true))
-			break;
-	}
-
-	if (file.eos())
-		return;
-
-	Common::Array<Common::Archive *> archives;
-
-	while (!file.eos()) {
-		line = file.readLine();
-		line.trim();
-		if (line.matchString("----------*", true))
-			break;
-		else if (line.matchString("DIR:*", true)) {
-			Common::String path(line.c_str() + 5);
-			Common::Archive *arc;
-			char n_path[128];
-			strcpy(n_path, path.c_str());
-			for (uint i = 0; i < path.size(); i++)
-				if (n_path[i] == '\\')
-					n_path[i] = '/';
-
-			path = Common::String(n_path);
-			if (path.size() && path[0] == '.')
-				path.deleteChar(0);
-			if (path.size() && path[0] == '/')
-				path.deleteChar(0);
-
-			if (path.matchString("*.zfs", true))
-				arc = new ZfsArchive(path);
-			else {
-				if (path.size()) {
-					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
-						path.deleteLastChar();
-					if (path.size())
-						for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
-							if (path.equalsIgnoreCase(*it)) {
-								path = *it;
-								break;
-							}
-				}
-
-				path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
-
-				arc = new Common::FSDirectory(path);
-			}
-			archives.push_back(arc);
-		}
-	}
-
-	if (file.eos())
-		return;
-
-	while (!file.eos()) {
-		line = file.readLine();
-		line.trim();
-		uint dr = 0;
-		char buf[32];
-		if (sscanf(line.c_str(), "%u %s", &dr, buf) == 2) {
-			if (dr <= archives.size() && dr > 0) {
-				addFile(Common::String(buf), archives[dr - 1]);
-			}
-		}
-	}
-}
-
-void sManager::addDir(const Common::String &name) {
-	Common::String path;
-	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
-		if (name.equalsIgnoreCase(*it)) {
-			path = *it;
-			break;
-		}
-
-	if (path.size() == 0)
-		return;
-
-	path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
-
-	Common::FSDirectory *dir = new Common::FSDirectory(path);
-
-	Common::ArchiveMemberList list;
-	dir->listMatchingMembers(list, "*.zfs");
-
-
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::String flname = (*iter)->getName();
-
-		ZfsArchive *zfs = new ZfsArchive(Common::String::format("%s/%s", name.c_str(), flname.c_str()));
-
-		Common::ArchiveMemberList zfslist;
-		zfs->listMembers(zfslist);
-
-		for (Common::ArchiveMemberList::iterator ziter = zfslist.begin(); ziter != zfslist.end(); ++ziter) {
-			Common::String z_name = (*ziter)->getName();
-			addFile(z_name, zfs);
-		}
-	}
-
-	list.clear();
-	dir->listMembers(list);
-
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::String flname = (*iter)->getName();
-		addFile(flname, dir);
-	}
-}
-
-void sManager::list_dir_recursive(Common::List<Common::String> &_list, const Common::FSNode &fs_node, int depth) {
-	Common::FSList fs_list;
-	fs_node.getChildren(fs_list);
-
-	_list.push_back(fs_node.getPath());
-
-	if (depth > 1)
-		for (Common::FSList::const_iterator it = fs_list.begin(); it != fs_list.end(); ++it)
-			list_dir_recursive(_list, *it, depth - 1);
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/search_manager.h b/engines/zvision/search_manager.h
deleted file mode 100644
index c768cb8b00..0000000000
--- a/engines/zvision/search_manager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef SEARCH_MANAGER_H_INCLUDED
-#define SEARCH_MANAGER_H_INCLUDED
-
-#include "common/str.h"
-#include "common/hash-str.h"
-#include "common/hashmap.h"
-#include "common/archive.h"
-#include "common/file.h"
-#include "common/list.h"
-
-namespace ZVision {
-
-class sManager {
-public:
-	sManager(const Common::String &root_path, int depth);
-	~sManager();
-
-	void addFile(const Common::String &name, Common::Archive *arch);
-	void addDir(const Common::String &name);
-	void addPatch(const Common::String &src, const Common::String &dst);
-
-	Common::File *openFile(const Common::String &name);
-	bool openFile(Common::File &file, const Common::String &name);
-	bool hasFile(const Common::String &name);
-
-	void loadZix(const Common::String &name);
-
-private:
-
-	void list_dir_recursive(Common::List<Common::String> &dir_list, const Common::FSNode &fs_node, int depth);
-
-	struct Node {
-		Common::String name;
-		Common::Archive *arch;
-	};
-
-	Common::List<Common::String> dir_list;
-
-	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
-
-	Common::List<Common::Archive *> archList;
-	MatchList files;
-
-	Common::String _root;
-
-private:
-};
-
-}
-
-#endif // SEARCH_MANAGER_H_INCLUDED
diff --git a/engines/zvision/sidefx.cpp b/engines/zvision/sidefx.cpp
deleted file mode 100644
index 7ba1959db7..0000000000
--- a/engines/zvision/sidefx.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/sidefx.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
-
-#include "common/stream.h"
-
-namespace ZVision {
-
-
-} // End of namespace ZVision
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
deleted file mode 100644
index 2c53467559..0000000000
--- a/engines/zvision/sidefx.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SIDEFX_H_INCLUDED
-#define SIDEFX_H_INCLUDED
-
-namespace Common {
-class SeekableReadStream;
-struct Point;
-class WriteStream;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-class SideFX {
-public:
-
-	enum SideFXType {
-		SIDEFX_ANIM  = 1,
-		SIDEFX_AUDIO = 2,
-		SIDEFX_DISTORT = 4,
-		SIDEFX_PANTRACK = 8,
-		SIDEFX_REGION = 16,
-		SIDEFX_TIMER = 32,
-		SIDEFX_TTYTXT = 64,
-		SIDEFX_UNK = 128,
-		SIDEFX_ALL = 255
-	};
-
-	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
-	SideFX(ZVision *engine, uint32 key, SideFXType type) : _engine(engine), _key(key), _type(type) {}
-	virtual ~SideFX() {}
-
-	uint32 getKey() {
-		return _key;
-	}
-	SideFXType getType() {
-		return _type;
-	}
-
-	virtual bool process(uint32 deltaTimeInMillis) {
-		return false;
-	}
-	/**
-	 * Serialize a SideFX for save game use. This should only be used if a SideFX needs
-	 * to save values that would be different from initialization. AKA a TimerNode needs to
-	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
-	 * their key as the first data outputted. The default implementation is NOP.
-	 *
-	 * NOTE: If this method is overridden, you MUST also override deserialize()
-	 * and needsSerialization()
-	 *
-	 * @param stream    Stream to write any needed data to
-	 */
-	virtual void serialize(Common::WriteStream *stream) {}
-	/**
-	 * De-serialize data from a save game stream. This should only be implemented if the
-	 * SideFX also implements serialize(). The calling method assumes the size of the
-	 * data read from the stream exactly equals that written in serialize(). The default
-	 * implementation is NOP.
-	 *
-	 * NOTE: If this method is overridden, you MUST also override serialize()
-	 * and needsSerialization()
-	 *
-	 * @param stream    Save game file stream
-	 */
-	virtual void deserialize(Common::SeekableReadStream *stream) {}
-	/**
-	 * If a SideFX overrides serialize() and deserialize(), this should return true
-	 *
-	 * @return    Does the SideFX need save game serialization?
-	 */
-	virtual inline bool needsSerialization() {
-		return false;
-	}
-
-	virtual bool stop() {
-		return true;
-	}
-	virtual void kill() {}
-
-protected:
-	ZVision *_engine;
-	uint32 _key;
-	SideFXType _type;
-
-// Static member functions
-public:
-
-};
-
-// TODO: Implement InputControl
-// TODO: Implement SaveControl
-// TODO: Implement SlotControl
-// TODO: Implement SafeControl
-// TODO: Implement FistControl
-// TODO: Implement HotMovieControl
-// TODO: Implement PaintControl
-// TODO: Implement TilterControl
-
-} // End of namespace ZVision
-
-#endif // SIDEFX_H_INCLUDED
diff --git a/engines/zvision/slot_control.cpp b/engines/zvision/slot_control.cpp
deleted file mode 100644
index d3d9c2ec4b..0000000000
--- a/engines/zvision/slot_control.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/slot_control.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/cursors/cursor_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
-
-#include "common/stream.h"
-
-
-namespace ZVision {
-
-SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key) {
-
-	_rendered_item = 0;
-	_bkg = NULL;
-
-	// Loop until we find the closing brace
-	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
-	Common::String param;
-	Common::String values;
-	getParams(line, param, values);
-
-	while (!stream.eos() && !line.contains('}')) {
-		if (param.matchString("hotspot", true)) {
-			int x;
-			int y;
-			int width;
-			int height;
-
-			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
-
-			_hotspot = Common::Rect(x, y, width, height);
-		} else if (param.matchString("rectangle", true)) {
-			int x;
-			int y;
-			int width;
-			int height;
-
-			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
-
-			_rectangle = Common::Rect(x, y, width, height);
-		} else if (param.matchString("cursor", true)) {
-			_cursor = _engine->getCursorManager()->getCursorId(values);
-		} else if (param.matchString("distance_id", true)) {
-			sscanf(values.c_str(), "%c", &_distance_id);
-		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
-		} else if (param.matchString("eligible_objects", true)) {
-			char buf[256];
-			memset(buf, 0, 256);
-			strcpy(buf, values.c_str());
-
-			char *curpos = buf;
-			char *strend = buf + strlen(buf);
-			while (true) {
-				char *st = curpos;
-
-				if (st >= strend)
-					break;
-
-				while (*curpos != ' ' && curpos < strend)
-					curpos++;
-
-				*curpos = 0;
-				curpos++;
-
-				int obj = atoi(st);
-
-				_eligible_objects.push_back(obj);
-			}
-		}
-
-		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
-		getParams(line, param, values);
-	}
-
-	if (_hotspot.isEmpty() || _rectangle.isEmpty()) {
-		warning("Slot %u was parsed incorrectly", key);
-	}
-}
-
-SlotControl::~SlotControl() {
-	// Clear the state value back to 0
-	//_engine->getScriptManager()->setStateValue(_key, 0);
-
-	if (_bkg)
-		delete _bkg;
-}
-
-bool SlotControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
-		return false;
-
-	if (_hotspot.contains(backgroundImageSpacePos)) {
-		//ctrl_setvenus(ct);
-
-		int item = _engine->getScriptManager()->getStateValue(_key);
-		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
-		if (item != 0) {
-			if (mouse_item != 0) {
-				if (eligeblity(mouse_item)) {
-					_engine->getScriptManager()->invertory_drop(mouse_item);
-					_engine->getScriptManager()->invertory_add(item);
-					_engine->getScriptManager()->setStateValue(_key, mouse_item);
-				}
-			} else {
-				_engine->getScriptManager()->invertory_add(item);
-				_engine->getScriptManager()->setStateValue(_key, 0);
-			}
-		} else if (mouse_item == 0) {
-			if (eligeblity(0)) {
-				_engine->getScriptManager()->invertory_drop(0);
-				_engine->getScriptManager()->setStateValue(_key, 0);
-			}
-		} else if (eligeblity(mouse_item)) {
-			_engine->getScriptManager()->setStateValue(_key, mouse_item);
-			_engine->getScriptManager()->invertory_drop(mouse_item);
-		}
-	}
-	return false;
-}
-
-bool SlotControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
-		return false;
-
-	if (_hotspot.contains(backgroundImageSpacePos)) {
-		_engine->getCursorManager()->changeCursor(_cursor);
-		return true;
-	}
-
-	return false;
-}
-
-bool SlotControl::process(uint32 deltaTimeInMillis) {
-	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
-		return false;
-
-	if (_engine->canRender()) {
-		int cur_item = _engine->getScriptManager()->getStateValue(_key);
-		if (cur_item != _rendered_item) {
-			if (_rendered_item != 0 && cur_item == 0) {
-				_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
-				_rendered_item = cur_item;
-			} else {
-				if (_rendered_item == 0) {
-					if (_bkg)
-						delete _bkg;
-
-					_bkg = _engine->getRenderManager()->getBkgRect(_rectangle);
-				} else {
-					_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
-				}
-
-				char buf[16];
-				if (_engine->getGameId() == GID_NEMESIS)
-					sprintf(buf, "%d%cobj.tga", cur_item, _distance_id);
-				else
-					sprintf(buf, "g0z%cu%2.2x1.tga", _distance_id, cur_item);
-
-				Graphics::Surface *srf = _engine->getRenderManager()->loadImage(buf);
-
-				int16 drawx = _rectangle.left;
-				int16 drawy = _rectangle.top;
-
-				if (_rectangle.width() > srf->w)
-					drawx = _rectangle.left + (_rectangle.width() - srf->w) / 2;
-
-				if (_rectangle.height() > srf->h)
-					drawy = _rectangle.top + (_rectangle.height() - srf->h) / 2;
-
-				_engine->getRenderManager()->blitSurfaceToBkg(*srf, drawx, drawy, 0);
-
-				delete srf;
-
-				_rendered_item = cur_item;
-			}
-		}
-	}
-	return false;
-}
-
-bool SlotControl::eligeblity(int item_id) {
-	for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++)
-		if (*it == item_id)
-			return true;
-	return false;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/slot_control.h b/engines/zvision/slot_control.h
deleted file mode 100644
index 0ac8ec9ce0..0000000000
--- a/engines/zvision/slot_control.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SLOT_CONTROL_H
-#define ZVISION_SLOT_CONTROL_H
-
-#include "zvision/scripting/control.h"
-
-#include "graphics/surface.h"
-
-#include "common/rect.h"
-#include "common/list.h"
-
-
-namespace ZVision {
-
-class SlotControl : public Control {
-public:
-	SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
-	~SlotControl();
-
-	/**
-	 * Called when LeftMouse is lifted. Calls ScriptManager::setStateValue(_key, 1);
-	 *
-	 * @param screenSpacePos             The position of the mouse in screen space
-	 * @param backgroundImageSpacePos    The position of the mouse in background image space
-	 */
-	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
-	/**
-	 * Called on every MouseMove. Tests if the mouse is inside _hotspot, and if so, sets the cursor.
-	 *
-	 * @param engine                     The base engine
-	 * @param screenSpacePos             The position of the mouse in screen space
-	 * @param backgroundImageSpacePos    The position of the mouse in background image space
-	 * @return                           Was the cursor changed?
-	 */
-	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
-
-	bool process(uint32 deltaTimeInMillis);
-
-private:
-	/**
-	 * The area that will trigger the event
-	 * This is in image space coordinates, NOT screen space
-	 */
-	Common::Rect _rectangle;
-	Common::Rect _hotspot;
-
-	int _cursor;
-	char _distance_id;
-	int _venus_id;
-
-	int _rendered_item;
-
-	Common::List<int> _eligible_objects;
-
-	bool eligeblity(int item_id);
-
-	Graphics::Surface *_bkg;
-
-	/** The cursor to use when hovering over _hotspot */
-	Common::String _hoverCursor;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/strings/string_manager.cpp b/engines/zvision/strings/string_manager.cpp
deleted file mode 100644
index 22331d8a24..0000000000
--- a/engines/zvision/strings/string_manager.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/strings/string_manager.h"
-
-#include "zvision/fonts/truetype_font.h"
-
-#include "common/file.h"
-#include "common/tokenizer.h"
-#include "common/debug.h"
-
-#include "graphics/fontman.h"
-#include "graphics/colormasks.h"
-
-
-namespace ZVision {
-
-StringManager::StringManager(ZVision *engine)
-	: _engine(engine) {
-}
-
-StringManager::~StringManager() {
-	for (Common::HashMap<Common::String, TruetypeFont *>::iterator iter = _fonts.begin(); iter != _fonts.end(); ++iter) {
-		delete iter->_value;
-	}
-}
-
-void StringManager::initialize(ZVisionGameId gameId) {
-	if (gameId == GID_NEMESIS) {
-		// TODO: Check this hardcoded filename against all versions of Nemesis
-		parseStrFile("nemesis.str");
-	} else if (gameId == GID_GRANDINQUISITOR) {
-		// TODO: Check this hardcoded filename against all versions of Grand Inquisitor
-		parseStrFile("inquis.str");
-	}
-}
-
-void StringManager::parseStrFile(const Common::String &fileName) {
-	Common::File file;
-	if (!file.open(fileName)) {
-		warning("%s does not exist. String parsing failed", fileName.c_str());
-		return;
-	}
-
-	uint lineNumber = 0;
-	while (!file.eos()) {
-		_lastStyle.align = Graphics::kTextAlignLeft;
-		_lastStyle.color = 0;
-		_lastStyle.font = nullptr;
-
-		Common::String asciiLine = readWideLine(file);
-		if (asciiLine.empty()) {
-			continue;
-		}
-
-		char tagString[150];
-		uint tagStringCursor = 0;
-		char textString[150];
-		uint textStringCursor = 0;
-		bool inTag = false;
-
-		for (uint i = 0; i < asciiLine.size(); ++i) {
-			switch (asciiLine[i]) {
-			case '<':
-				inTag = true;
-				if (!_inGameText[lineNumber].fragments.empty()) {
-					_inGameText[lineNumber].fragments.back().text = Common::String(textString, textStringCursor);
-					textStringCursor = 0;
-				}
-				break;
-			case '>':
-				inTag = false;
-				parseTag(Common::String(tagString, tagStringCursor), lineNumber);
-				tagStringCursor = 0;
-				break;
-			default:
-				if (inTag) {
-					tagString[tagStringCursor] = asciiLine[i];
-					tagStringCursor++;
-				} else {
-					textString[textStringCursor] = asciiLine[i];
-					textStringCursor++;
-				}
-				break;
-			}
-		}
-
-		if (textStringCursor > 0) {
-			_inGameText[lineNumber].fragments.back().text = Common::String(textString, textStringCursor);
-		}
-
-		lineNumber++;
-		assert(lineNumber <= NUM_TEXT_LINES);
-	}
-}
-
-void StringManager::parseTag(const Common::String &tagString, uint lineNumber) {
-	Common::StringTokenizer tokenizer(tagString);
-
-	Common::String token = tokenizer.nextToken();
-
-	Common::String fontName;
-	bool bold = false;
-	Graphics::TextAlign align = _lastStyle.align;
-	int point = _lastStyle.font != nullptr ? _lastStyle.font->_fontHeight : 12;
-	int red = 0;
-	int green = 0;
-	int blue = 0;
-
-	while (!token.empty()) {
-		if (token.matchString("font", true)) {
-			fontName = tokenizer.nextToken();
-		} else if (token.matchString("bold", true)) {
-			token = tokenizer.nextToken();
-			if (token.matchString("on", false)) {
-				bold = true;
-			}
-		} else if (token.matchString("justify", true)) {
-			token = tokenizer.nextToken();
-			if (token.matchString("center", false)) {
-				align = Graphics::kTextAlignCenter;
-			} else if (token.matchString("right", false)) {
-				align = Graphics::kTextAlignRight;
-			}
-		} else if (token.matchString("point", true)) {
-			point = atoi(tokenizer.nextToken().c_str());
-		} else if (token.matchString("red", true)) {
-			red = atoi(tokenizer.nextToken().c_str());
-		} else if (token.matchString("green", true)) {
-			green = atoi(tokenizer.nextToken().c_str());
-		} else if (token.matchString("blue", true)) {
-			blue = atoi(tokenizer.nextToken().c_str());
-		}
-
-		token = tokenizer.nextToken();
-	}
-
-	TextFragment fragment;
-
-	if (fontName.empty()) {
-		fragment.style.font = _lastStyle.font;
-	} else {
-		Common::String newFontName;
-		if (fontName.matchString("*times new roman*", true)) {
-			if (bold) {
-				newFontName = "timesbd.ttf";
-			} else {
-				newFontName = "times.ttf";
-			}
-		} else if (fontName.matchString("*courier new*", true)) {
-			if (bold) {
-				newFontName = "courbd.ttf";
-			} else {
-				newFontName = "cour.ttf";
-			}
-		} else if (fontName.matchString("*century schoolbook*", true)) {
-			if (bold) {
-				newFontName = "censcbkbd.ttf";
-			} else {
-				newFontName = "censcbk.ttf";
-			}
-		} else if (fontName.matchString("*garamond*", true)) {
-			if (bold) {
-				newFontName = "garabd.ttf";
-			} else {
-				newFontName = "gara.ttf";
-			}
-		} else {
-			debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
-			if (bold) {
-				newFontName = "zorknorm.ttf";
-			} else {
-				newFontName = "arial.ttf";
-			}
-		}
-
-		Common::String fontKey = Common::String::format("%s-%d", newFontName.c_str(), point);
-		if (_fonts.contains(fontKey)) {
-			fragment.style.font = _fonts[fontKey];
-		} else {
-			fragment.style.font = new TruetypeFont(_engine, point);
-			fragment.style.font->loadFile(newFontName);
-			_fonts[fontKey] = fragment.style.font;
-		}
-	}
-
-	fragment.style.align = align;
-	fragment.style.color = Graphics::ARGBToColor<Graphics::ColorMasks<565> >(0, red, green, blue);
-	_inGameText[lineNumber].fragments.push_back(fragment);
-
-	_lastStyle = fragment.style;
-}
-
-Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
-	Common::String asciiString;
-
-	// Don't spam the user with warnings about UTF-16 support.
-	// Just do one warning per String
-	bool charOverflowWarning = false;
-
-	uint16 value = stream.readUint16LE();
-	while (!stream.eos()) {
-		// Check for CRLF
-		if (value == 0x0A0D) {
-			// Read in the extra NULL char
-			stream.readByte(); // \0
-			// End of the line. Break
-			break;
-		}
-
-		// Crush each octet pair to a single octet with a simple cast
-		if (value > 255) {
-			charOverflowWarning = true;
-			value = '?';
-		}
-		char charValue = (char)value;
-
-		asciiString += charValue;
-
-		value = stream.readUint16LE();
-	}
-
-	if (charOverflowWarning) {
-		warning("UTF-16 is not supported. Characters greater than 255 are replaced with '?'");
-	}
-
-	return asciiString;
-}
-
-StringManager::TextStyle StringManager::getTextStyle(uint stringNumber) {
-	return _inGameText[stringNumber].fragments.front().style;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/strings/string_manager.h b/engines/zvision/strings/string_manager.h
deleted file mode 100644
index af8324b890..0000000000
--- a/engines/zvision/strings/string_manager.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_STRING_MANAGER_H
-#define ZVISION_STRING_MANAGER_H
-
-#include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
-
-
-namespace Graphics {
-class FontManager;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-class StringManager {
-public:
-	StringManager(ZVision *engine);
-	~StringManager();
-
-public:
-	struct TextStyle {
-		TruetypeFont *font;
-		uint16 color; // In RBG 565
-		Graphics::TextAlign align;
-	};
-
-	struct TextFragment {
-		TextStyle style;
-		Common::String text;
-	};
-
-private:
-	struct InGameText {
-		Common::List<TextFragment> fragments;
-	};
-
-	enum {
-		NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
-	};
-
-private:
-	ZVision *_engine;
-	InGameText _inGameText[NUM_TEXT_LINES];
-	Common::HashMap<Common::String, TruetypeFont *> _fonts;
-
-	TextStyle _lastStyle;
-
-public:
-	void initialize(ZVisionGameId gameId);
-	StringManager::TextStyle getTextStyle(uint stringNumber);
-
-private:
-	void parseStrFile(const Common::String &fileName);
-	void parseTag(const Common::String &tagString, uint lineNumber);
-
-	static Common::String readWideLine(Common::SeekableReadStream &stream);
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/subtitles.cpp b/engines/zvision/subtitles.cpp
deleted file mode 100644
index da9b0fc1c9..0000000000
--- a/engines/zvision/subtitles.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "zvision/subtitles/subtitles.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/search_manager.h"
-#include "zvision/text.h"
-
-namespace ZVision {
-
-Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
-	_engine(engine),
-	_areaId(-1),
-	_subId(-1) {
-	Common::File file;
-	if (_engine->getSearchManager()->openFile(file, subname)) {
-		while (!file.eos()) {
-			Common::String str = file.readLine();
-			if (str.lastChar() == '~')
-				str.deleteLastChar();
-
-			if (str.matchString("*Initialization*", true)) {
-				// Not used
-			} else if (str.matchString("*Rectangle*", true)) {
-				int32 x1, y1, x2, y2;
-				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
-				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
-				_areaId = _engine->getRenderManager()->createSubArea(rct);
-			} else if (str.matchString("*TextFile*", true)) {
-				char filename[64];
-				sscanf(str.c_str(), "%*[^:]:%s", filename);
-				Common::File txt;
-				if (_engine->getSearchManager()->openFile(txt, filename)) {
-					while (!txt.eos()) {
-						Common::String txtline = readWideLine(txt);
-						sub cur_sub;
-						cur_sub.start = -1;
-						cur_sub.stop = -1;
-						cur_sub.sub = txtline;
-
-						_subs.push_back(cur_sub);
-					}
-					txt.close();
-				}
-			} else {
-				int32 st;
-				int32 en;
-				int32 sb;
-				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
-					if (sb <= (int32)_subs.size()) {
-						_subs[sb].start = st;
-						_subs[sb].stop = en;
-					}
-				}
-			}
-		}
-	}
-}
-
-Subtitle::~Subtitle() {
-	if (_areaId != -1)
-		_engine->getRenderManager()->deleteSubArea(_areaId);
-
-	_subs.clear();
-}
-
-void Subtitle::process(int32 time) {
-	int16 j = -1;
-	for (uint16 i = 0; i < _subs.size(); i++)
-		if (time >= _subs[i].start && time <= _subs[i].stop) {
-			j = i;
-			break;
-		}
-
-	if (j == -1 && _subId != -1) {
-		if (_areaId != -1)
-			_engine->getRenderManager()->updateSubArea(_areaId, "");
-		_subId = -1;
-	}
-
-	if (j != -1 && j != _subId) {
-		if (_subs[j].sub.size())
-			if (_areaId != -1)
-				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].sub);
-		_subId = j;
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp
new file mode 100644
index 0000000000..4ca48f7b42
--- /dev/null
+++ b/engines/zvision/subtitles/subtitles.cpp
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "zvision/subtitles/subtitles.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/text.h"
+
+namespace ZVision {
+
+Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
+	_engine(engine),
+	_areaId(-1),
+	_subId(-1) {
+	Common::File file;
+	if (_engine->getSearchManager()->openFile(file, subname)) {
+		while (!file.eos()) {
+			Common::String str = file.readLine();
+			if (str.lastChar() == '~')
+				str.deleteLastChar();
+
+			if (str.matchString("*Initialization*", true)) {
+				// Not used
+			} else if (str.matchString("*Rectangle*", true)) {
+				int32 x1, y1, x2, y2;
+				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
+				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
+				_areaId = _engine->getRenderManager()->createSubArea(rct);
+			} else if (str.matchString("*TextFile*", true)) {
+				char filename[64];
+				sscanf(str.c_str(), "%*[^:]:%s", filename);
+				Common::File txt;
+				if (_engine->getSearchManager()->openFile(txt, filename)) {
+					while (!txt.eos()) {
+						Common::String txtline = readWideLine(txt);
+						sub cur_sub;
+						cur_sub.start = -1;
+						cur_sub.stop = -1;
+						cur_sub.sub = txtline;
+
+						_subs.push_back(cur_sub);
+					}
+					txt.close();
+				}
+			} else {
+				int32 st;
+				int32 en;
+				int32 sb;
+				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
+					if (sb <= (int32)_subs.size()) {
+						_subs[sb].start = st;
+						_subs[sb].stop = en;
+					}
+				}
+			}
+		}
+	}
+}
+
+Subtitle::~Subtitle() {
+	if (_areaId != -1)
+		_engine->getRenderManager()->deleteSubArea(_areaId);
+
+	_subs.clear();
+}
+
+void Subtitle::process(int32 time) {
+	int16 j = -1;
+	for (uint16 i = 0; i < _subs.size(); i++)
+		if (time >= _subs[i].start && time <= _subs[i].stop) {
+			j = i;
+			break;
+		}
+
+	if (j == -1 && _subId != -1) {
+		if (_areaId != -1)
+			_engine->getRenderManager()->updateSubArea(_areaId, "");
+		_subId = -1;
+	}
+
+	if (j != -1 && j != _subId) {
+		if (_subs[j].sub.size())
+			if (_areaId != -1)
+				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].sub);
+		_subId = j;
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/syncsound_node.cpp b/engines/zvision/syncsound_node.cpp
deleted file mode 100644
index 7bd520d475..0000000000
--- a/engines/zvision/syncsound_node.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/syncsound_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/sound/zork_raw.h"
-
-#include "common/stream.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
-
-
-namespace ZVision {
-
-SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)
-	: SideFX(engine, key, SIDEFX_AUDIO) {
-	_syncto = syncto;
-	_sub = NULL;
-
-	Audio::RewindableAudioStream *audioStream;
-
-	if (filename.contains(".wav")) {
-		Common::File *file = new Common::File();
-		if (_engine->getSearchManager()->openFile(*file, filename)) {
-			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
-		}
-	} else {
-		audioStream = makeRawZorkStream(filename, _engine);
-	}
-
-	_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream);
-
-	Common::String subname = filename;
-	subname.setChar('s', subname.size() - 3);
-	subname.setChar('u', subname.size() - 2);
-	subname.setChar('b', subname.size() - 1);
-
-	if (_engine->getSearchManager()->hasFile(subname))
-		_sub = new Subtitle(_engine, subname);
-}
-
-SyncSoundNode::~SyncSoundNode() {
-	_engine->_mixer->stopHandle(_handle);
-	if (_sub)
-		delete _sub;
-}
-
-bool SyncSoundNode::process(uint32 deltaTimeInMillis) {
-	if (! _engine->_mixer->isSoundHandleActive(_handle))
-		return stop();
-	else {
-
-		if (_engine->getScriptManager()->getSideFX(_syncto) == NULL)
-			return stop();
-
-		if (_sub)
-			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
-	}
-	return false;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/syncsound_node.h b/engines/zvision/syncsound_node.h
deleted file mode 100644
index 1f63ec48dd..0000000000
--- a/engines/zvision/syncsound_node.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SYNCSOUND_NODE_H
-#define ZVISION_SYNCSOUND_NODE_H
-
-#include "audio/mixer.h"
-#include "zvision/sidefx.h"
-#include "zvision/subtitles/subtitles.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-class SyncSoundNode : public SideFX {
-public:
-	SyncSoundNode(ZVision *engine, uint32 key, Common::String &file, int32 syncto);
-	~SyncSoundNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-private:
-	int32 _syncto;
-	Audio::SoundHandle _handle;
-	Subtitle *_sub;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/text.cpp b/engines/zvision/text.cpp
deleted file mode 100644
index 6b0ff0712b..0000000000
--- a/engines/zvision/text.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/text.h"
-
-#include "zvision/fonts/truetype_font.h"
-
-#include "common/file.h"
-#include "common/tokenizer.h"
-#include "common/debug.h"
-#include "common/rect.h"
-
-#include "graphics/fontman.h"
-#include "graphics/colormasks.h"
-#include "graphics/surface.h"
-#include "graphics/font.h"
-#include "graphics/fonts/ttf.h"
-
-#include "zvision/graphics/render_manager.h"
-#include "zvision/scripting/script_manager.h"
-
-
-namespace ZVision {
-
-cTxtStyle::cTxtStyle() {
-	fontname = "Arial";
-	blue = 255;
-	green = 255;
-	red = 255;
-	bold = false;
-	escapement = 0;
-	italic = false;
-	justify = TXT_JUSTIFY_LEFT;
-	newline = false;
-	size = 12;
-	skipcolor = false;
-	strikeout = false;
-	underline = false;
-	statebox = 0;
-	sharp = false;
-}
-
-txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
-	Common::String buf = Common::String(strin.c_str(), ln);
-
-	int8 retval = TXT_RET_NOTHING;
-
-	Common::StringTokenizer tokenizer(buf, " ");
-	Common::String token;
-
-	while (!tokenizer.empty()) {
-		token = tokenizer.nextToken();
-
-		if (token.matchString("font", true)) {
-			token = tokenizer.nextToken();
-			if (token[0] == '"') {
-				Common::String _tmp = Common::String(token.c_str() + 1);
-
-				while (token.lastChar() != '"' && !tokenizer.empty()) {
-					token = tokenizer.nextToken();
-					_tmp += " " + token;
-				}
-
-				if (_tmp.lastChar() == '"')
-					_tmp.deleteLastChar();
-
-				fontname = _tmp;
-			} else {
-				if (!tokenizer.empty())
-					fontname = token;
-			}
-			retval |= TXT_RET_FNTCHG;
-
-		} else if (token.matchString("blue", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				int32 tmp = atoi(token.c_str());
-				if (blue != tmp) {
-					blue = tmp;
-					retval |= TXT_RET_FNTSTL;
-				}
-			}
-		} else if (token.matchString("red", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				int32 tmp = atoi(token.c_str());
-				if (red != tmp) {
-					red = tmp;
-					retval |= TXT_RET_FNTSTL;
-				}
-			}
-		} else if (token.matchString("green", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				int32 tmp = atoi(token.c_str());
-				if (green != tmp) {
-					green = tmp;
-					retval |= TXT_RET_FNTSTL;
-				}
-			}
-		} else if (token.matchString("newline", true)) {
-			if ((retval & TXT_RET_NEWLN) == 0)
-				newline = 0;
-
-			newline++;
-			retval |= TXT_RET_NEWLN;
-		} else if (token.matchString("point", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				int32 tmp = atoi(token.c_str());
-				if (size != tmp) {
-					size = tmp;
-					retval |= TXT_RET_FNTCHG;
-				}
-			}
-		} else if (token.matchString("escapement", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				int32 tmp = atoi(token.c_str());
-				escapement = tmp;
-			}
-		} else if (token.matchString("italic", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				if (token.matchString("on", true)) {
-					if (italic != true) {
-						italic = true;
-						retval |= TXT_RET_FNTSTL;
-					}
-				} else if (token.matchString("off", true)) {
-					if (italic != false) {
-						italic = false;
-						retval |= TXT_RET_FNTSTL;
-					}
-				}
-			}
-		} else if (token.matchString("underline", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				if (token.matchString("on", true)) {
-					if (underline != true) {
-						underline = true;
-						retval |= TXT_RET_FNTSTL;
-					}
-				} else if (token.matchString("off", true)) {
-					if (underline != false) {
-						underline = false;
-						retval |= TXT_RET_FNTSTL;
-					}
-				}
-			}
-		} else if (token.matchString("strikeout", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				if (token.matchString("on", true)) {
-					if (strikeout != true) {
-						strikeout = true;
-						retval |= TXT_RET_FNTSTL;
-					}
-				} else if (token.matchString("off", true)) {
-					if (strikeout != false) {
-						strikeout = false;
-						retval |= TXT_RET_FNTSTL;
-					}
-				}
-			}
-		} else if (token.matchString("bold", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				if (token.matchString("on", true)) {
-					if (bold != true) {
-						bold = true;
-						retval |= TXT_RET_FNTSTL;
-					}
-				} else if (token.matchString("off", true)) {
-					if (bold != false) {
-						bold = false;
-						retval |= TXT_RET_FNTSTL;
-					}
-				}
-			}
-		} else if (token.matchString("skipcolor", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				if (token.matchString("on", true)) {
-					skipcolor = true;
-				} else if (token.matchString("off", true)) {
-					skipcolor = false;
-				}
-			}
-		} else if (token.matchString("image", true)) {
-			// Not used
-		} else if (token.matchString("statebox", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				statebox = atoi(token.c_str());
-				retval |= TXT_RET_HASSTBOX;
-			}
-		} else if (token.matchString("justify", true)) {
-			if (!tokenizer.empty()) {
-				token = tokenizer.nextToken();
-				if (token.matchString("center", true))
-					justify = TXT_JUSTIFY_CENTER;
-				else if (token.matchString("left", true))
-					justify = TXT_JUSTIFY_LEFT;
-				else if (token.matchString("right", true))
-					justify = TXT_JUSTIFY_RIGHT;
-			}
-		}
-	}
-	return (txtReturn)retval;
-}
-
-void cTxtStyle::readAllStyle(const Common::String &txt) {
-	int16 strt = -1;
-	int16 endt = -1;
-
-	for (uint16 i = 0; i < txt.size(); i++) {
-		if (txt[i] == '<')
-			strt = i;
-		else if (txt[i] == '>') {
-			endt = i;
-			if (strt != -1)
-				if ((endt - strt - 1) > 0)
-					parseStyle(Common::String(txt.c_str() + strt + 1), endt - strt - 1);
-		}
-
-	}
-}
-
-void cTxtStyle::setFontStyle(sTTFont &font) {
-	uint temp_stl = 0;
-
-	if (bold)
-		temp_stl |= sTTFont::STTF_BOLD;
-
-	if (italic)
-		temp_stl |= sTTFont::STTF_ITALIC;
-
-	if (underline)
-		temp_stl |= sTTFont::STTF_UNDERLINE;
-
-	if (strikeout)
-		temp_stl |= sTTFont::STTF_STRIKEOUT;
-
-	if (sharp)
-		temp_stl |= sTTFont::STTF_SHARP;
-
-	font.setStyle(temp_stl);
-}
-
-void cTxtStyle::setFont(sTTFont &font) {
-	uint temp_stl = 0;
-
-	if (bold)
-		temp_stl |= sTTFont::STTF_BOLD;
-
-	if (italic)
-		temp_stl |= sTTFont::STTF_ITALIC;
-
-	if (underline)
-		temp_stl |= sTTFont::STTF_UNDERLINE;
-
-	if (strikeout)
-		temp_stl |= sTTFont::STTF_STRIKEOUT;
-
-	if (sharp)
-		temp_stl |= sTTFont::STTF_SHARP;
-
-	font.loadFont(fontname, size, temp_stl);
-}
-
-Graphics::Surface *textRenderer::render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
-	style.setFontStyle(fnt);
-	uint32 clr = _engine->_pixelFormat.RGBToColor(style.red, style.green, style.blue);
-	return fnt.renderSolidText(txt, clr);
-}
-
-void textRenderer::drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify) {
-	if (justify == TXT_JUSTIFY_LEFT)
-		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignLeft);
-	else if (justify == TXT_JUSTIFY_CENTER)
-		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignCenter);
-	else if (justify == TXT_JUSTIFY_RIGHT)
-		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignRight);
-}
-
-int32 textRenderer::drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst) {
-	sTTFont font(_engine);
-	fnt_stl.setFont(font);
-
-	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
-
-	uint32 clr = _engine->_pixelFormat.RGBToColor(fnt_stl.red, fnt_stl.green, fnt_stl.blue);
-
-	int16 w;
-
-	w = font.getStringWidth(txt);
-
-	drawTxtWithJustify(txt, font, clr, dst, fnt_stl.size, fnt_stl.justify);
-
-	return w;
-}
-
-void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surface &dst) {
-	const int16 TXT_CFG_TEXTURES_LINES = 256; // For now I don't want remake it
-	const int TXT_CFG_TEXTURES_PER_LINE = 6;
-	cTxtStyle style, style2;
-	int16 strt = -1;
-	int16 endt = -1;
-	int16 i = 0;
-	int16 dx = 0, dy = 0;
-	int16 txt_w;
-	int16 txtpos = 0;
-	Common::String buf;
-	Common::String buf2;
-
-	Graphics::Surface *TxtSurfaces[TXT_CFG_TEXTURES_LINES][TXT_CFG_TEXTURES_PER_LINE];
-	int16 currentline = 0, currentlineitm = 0;
-
-	int TxtJustify[TXT_CFG_TEXTURES_LINES];
-	int TxtPoint[TXT_CFG_TEXTURES_LINES];
-
-	for (int16 k = 0; k < TXT_CFG_TEXTURES_LINES; k++) {
-		TxtPoint[k] = 0;
-		for (int j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
-			TxtSurfaces[k][j] = NULL;
-	}
-
-	int16 stringlen = text.size();
-
-	sTTFont font(_engine);
-
-	style.setFont(font);
-
-	int16 prevbufspace = 0, prevtxtspace = 0;
-
-	while (i < stringlen) {
-		TxtJustify[currentline] = style.justify;
-		if (text[i] == '<') {
-			int16 ret = 0;
-
-			strt = i;
-			while (i < stringlen && text[i] != '>')
-				i++;
-			endt = i;
-			if (strt != -1)
-				if ((endt - strt - 1) > 0) {
-					style2 = style;
-					ret = style.parseStyle(Common::String(text.c_str() + strt + 1), endt - strt - 1);
-				}
-
-			if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
-				if (buf.size() > 0) {
-					txt_w = font.getStringWidth(buf);
-
-					TxtSurfaces[currentline][currentlineitm] = render(font, buf, style2);
-					TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
-
-					currentlineitm++;
-
-					buf.clear();
-					prevbufspace = 0;
-					txtpos = 0;
-					dx += txt_w;
-
-				}
-				if (ret & TXT_RET_FNTCHG) {
-					style.setFont(font);
-				}
-				if (ret & TXT_RET_FNTSTL)
-					style.setFontStyle(font);
-
-				if (ret & TXT_RET_NEWLN) {
-					currentline++;
-					currentlineitm = 0;
-					dx = 0;
-				}
-			}
-
-			if (ret & TXT_RET_HASSTBOX) {
-				Common::String buf3;
-				buf3.format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
-				buf += buf3;
-				txtpos += buf3.size();
-			}
-
-		} else {
-
-			buf += text[i];
-			txtpos++;
-
-			if (text[i] == ' ') {
-				prevbufspace = txtpos - 1;
-				prevtxtspace = i;
-			}
-
-			if (font.isLoaded()) {
-				txt_w = font.getStringWidth(buf);
-				if (txt_w + dx > dst.w) {
-					if (prevbufspace == 0) {
-						prevtxtspace = i;
-						prevbufspace = txtpos - 1;
-					}
-					buf2 = Common::String(buf.c_str(), prevbufspace + 1);
-
-					if (buf2.size() > 0) {
-						TxtSurfaces[currentline][currentlineitm] = render(font, buf2, style);
-						TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
-					}
-
-					buf.clear();
-					i = prevtxtspace;
-					prevbufspace = 0;
-					txtpos = 0;
-					currentline++;
-					currentlineitm = 0;
-					dx = 0;
-				}
-			}
-		}
-		i++;
-	}
-
-	if (buf.size() > 0) {
-		TxtSurfaces[currentline][currentlineitm] = render(font, buf, style);
-		TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
-	}
-
-	dy = 0;
-	for (i = 0; i <= currentline; i++) {
-		int16 j = 0;
-		int16 width = 0;
-		while (TxtSurfaces[i][j] != NULL) {
-			width += TxtSurfaces[i][j]->w;
-			j++;
-		}
-		dx = 0;
-		for (int32_t jj = 0; jj < j; jj++) {
-			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
-
-			else if (TxtJustify[i] == TXT_JUSTIFY_CENTER)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, ((dst.w - width) / 2) + dx,  dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
-
-			else if (TxtJustify[i] == TXT_JUSTIFY_RIGHT)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dst.w - width + dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
-
-			dx += TxtSurfaces[i][jj]->w;
-		}
-
-		dy += TxtPoint[i];
-	}
-
-	for (i = 0; i < TXT_CFG_TEXTURES_LINES; i++)
-		for (int32_t j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
-			if (TxtSurfaces[i][j] != NULL) {
-				TxtSurfaces[i][j]->free();
-				delete TxtSurfaces[i][j];
-			}
-}
-
-Common::String readWideLine(Common::SeekableReadStream &stream) {
-	Common::String asciiString;
-
-	while (!stream.eos()) {
-		uint32 value = stream.readUint16LE();
-		// Check for CRLF
-		if (value == 0x0A0D) {
-			// Read in the extra NULL char
-			stream.readByte(); // \0
-			// End of the line. Break
-			break;
-		}
-
-		// Crush each octet pair to a single octet with a simple cast
-		if (value < 0x80) {
-			asciiString += (char)(value & 0x7F);
-		} else if (value >= 0x80 && value < 0x800) {
-			asciiString += (char)(0xC0 | ((value >> 6) & 0x1F));
-			asciiString += (char)(0x80 | (value & 0x3F));
-		} else if (value >= 0x800 && value < 0x10000) {
-			asciiString += (char)(0xE0 | ((value >> 12) & 0xF));
-			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
-			asciiString += (char)(0x80 | (value & 0x3F));
-		} else if (value >= 0x10000 && value < 0x200000) {
-			asciiString += (char)(0xF0);
-			asciiString += (char)(0x80 | ((value >> 12) & 0x3F));
-			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
-			asciiString += (char)(0x80 | (value & 0x3F));
-		}
-	}
-
-	return asciiString;
-}
-
-int8 getUtf8CharSize(char chr) {
-	if ((chr & 0x80) == 0)
-		return 1;
-	else if ((chr & 0xE0) == 0xC0)
-		return 2;
-	else if ((chr & 0xF0) == 0xE0)
-		return 3;
-	else if ((chr & 0xF8) == 0xF0)
-		return 4;
-	else if ((chr & 0xFC) == 0xF8)
-		return 5;
-	else if ((chr & 0xFE) == 0xFC)
-		return 6;
-
-	return 1;
-}
-
-uint16 readUtf8Char(const char *chr) {
-	uint16 result = 0;
-	if ((chr[0] & 0x80) == 0)
-		result = chr[0];
-	else if ((chr[0] & 0xE0) == 0xC0)
-		result = ((chr[0] & 0x1F) << 6) | (chr[1] & 0x3F);
-	else if ((chr[0] & 0xF0) == 0xE0)
-		result = ((chr[0] & 0x0F) << 12) | ((chr[1] & 0x3F) << 6) | (chr[2] & 0x3F);
-	else
-		result = chr[0];
-
-	return result;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/text.h b/engines/zvision/text.h
deleted file mode 100644
index 4b318fdef0..0000000000
--- a/engines/zvision/text.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- */
-
-#ifndef ZVISION_TEXT_H
-#define ZVISION_TEXT_H
-
-#include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
-#include "zvision/zvision.h"
-
-
-namespace Graphics {
-class FontManager;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-enum txtJustify {
-	TXT_JUSTIFY_CENTER = 0,
-	TXT_JUSTIFY_LEFT = 1,
-	TXT_JUSTIFY_RIGHT = 2
-};
-
-enum txtReturn {
-	TXT_RET_NOTHING = 0x0,
-	TXT_RET_FNTCHG = 0x1,
-	TXT_RET_FNTSTL = 0x2,
-	TXT_RET_NEWLN = 0x4,
-	TXT_RET_HASSTBOX = 0x8
-};
-
-class cTxtStyle {
-public:
-	cTxtStyle();
-	txtReturn parseStyle(const Common::String &strin, int16 len);
-	void readAllStyle(const Common::String &txt);
-	void setFontStyle(sTTFont &font);
-	void setFont(sTTFont &font);
-
-public:
-	Common::String fontname;
-	txtJustify justify;  // 0 - center, 1-left, 2-right
-	int16 size;
-	uint8 red;     // 0-255
-	uint8 green;   // 0-255
-	uint8 blue;    // 0-255
-	int8 newline;
-	int8 escapement;
-	bool italic;
-	bool bold;
-	bool underline;
-	bool strikeout;
-	bool skipcolor;
-	int32 statebox;
-	bool sharp;
-	// char image ??
-};
-
-class textRenderer {
-public:
-	textRenderer(ZVision *engine): _engine(engine) {};
-
-	void drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify);
-	int32 drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst);
-	Graphics::Surface *render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style);
-	void drawTxtInOneLine(const Common::String &txt, Graphics::Surface &dst);
-
-private:
-	ZVision *_engine;
-};
-
-Common::String readWideLine(Common::SeekableReadStream &stream);
-int8 getUtf8CharSize(char chr);
-uint16 readUtf8Char(const char *chr);
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
new file mode 100644
index 0000000000..cadfbf1f49
--- /dev/null
+++ b/engines/zvision/text/string_manager.cpp
@@ -0,0 +1,255 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/text/string_manager.h"
+
+#include "zvision/fonts/truetype_font.h"
+
+#include "common/file.h"
+#include "common/tokenizer.h"
+#include "common/debug.h"
+
+#include "graphics/fontman.h"
+#include "graphics/colormasks.h"
+
+
+namespace ZVision {
+
+StringManager::StringManager(ZVision *engine)
+	: _engine(engine) {
+}
+
+StringManager::~StringManager() {
+	for (Common::HashMap<Common::String, TruetypeFont *>::iterator iter = _fonts.begin(); iter != _fonts.end(); ++iter) {
+		delete iter->_value;
+	}
+}
+
+void StringManager::initialize(ZVisionGameId gameId) {
+	if (gameId == GID_NEMESIS) {
+		// TODO: Check this hardcoded filename against all versions of Nemesis
+		parseStrFile("nemesis.str");
+	} else if (gameId == GID_GRANDINQUISITOR) {
+		// TODO: Check this hardcoded filename against all versions of Grand Inquisitor
+		parseStrFile("inquis.str");
+	}
+}
+
+void StringManager::parseStrFile(const Common::String &fileName) {
+	Common::File file;
+	if (!file.open(fileName)) {
+		warning("%s does not exist. String parsing failed", fileName.c_str());
+		return;
+	}
+
+	uint lineNumber = 0;
+	while (!file.eos()) {
+		_lastStyle.align = Graphics::kTextAlignLeft;
+		_lastStyle.color = 0;
+		_lastStyle.font = nullptr;
+
+		Common::String asciiLine = readWideLine(file);
+		if (asciiLine.empty()) {
+			continue;
+		}
+
+		char tagString[150];
+		uint tagStringCursor = 0;
+		char textString[150];
+		uint textStringCursor = 0;
+		bool inTag = false;
+
+		for (uint i = 0; i < asciiLine.size(); ++i) {
+			switch (asciiLine[i]) {
+			case '<':
+				inTag = true;
+				if (!_inGameText[lineNumber].fragments.empty()) {
+					_inGameText[lineNumber].fragments.back().text = Common::String(textString, textStringCursor);
+					textStringCursor = 0;
+				}
+				break;
+			case '>':
+				inTag = false;
+				parseTag(Common::String(tagString, tagStringCursor), lineNumber);
+				tagStringCursor = 0;
+				break;
+			default:
+				if (inTag) {
+					tagString[tagStringCursor] = asciiLine[i];
+					tagStringCursor++;
+				} else {
+					textString[textStringCursor] = asciiLine[i];
+					textStringCursor++;
+				}
+				break;
+			}
+		}
+
+		if (textStringCursor > 0) {
+			_inGameText[lineNumber].fragments.back().text = Common::String(textString, textStringCursor);
+		}
+
+		lineNumber++;
+		assert(lineNumber <= NUM_TEXT_LINES);
+	}
+}
+
+void StringManager::parseTag(const Common::String &tagString, uint lineNumber) {
+	Common::StringTokenizer tokenizer(tagString);
+
+	Common::String token = tokenizer.nextToken();
+
+	Common::String fontName;
+	bool bold = false;
+	Graphics::TextAlign align = _lastStyle.align;
+	int point = _lastStyle.font != nullptr ? _lastStyle.font->_fontHeight : 12;
+	int red = 0;
+	int green = 0;
+	int blue = 0;
+
+	while (!token.empty()) {
+		if (token.matchString("font", true)) {
+			fontName = tokenizer.nextToken();
+		} else if (token.matchString("bold", true)) {
+			token = tokenizer.nextToken();
+			if (token.matchString("on", false)) {
+				bold = true;
+			}
+		} else if (token.matchString("justify", true)) {
+			token = tokenizer.nextToken();
+			if (token.matchString("center", false)) {
+				align = Graphics::kTextAlignCenter;
+			} else if (token.matchString("right", false)) {
+				align = Graphics::kTextAlignRight;
+			}
+		} else if (token.matchString("point", true)) {
+			point = atoi(tokenizer.nextToken().c_str());
+		} else if (token.matchString("red", true)) {
+			red = atoi(tokenizer.nextToken().c_str());
+		} else if (token.matchString("green", true)) {
+			green = atoi(tokenizer.nextToken().c_str());
+		} else if (token.matchString("blue", true)) {
+			blue = atoi(tokenizer.nextToken().c_str());
+		}
+
+		token = tokenizer.nextToken();
+	}
+
+	TextFragment fragment;
+
+	if (fontName.empty()) {
+		fragment.style.font = _lastStyle.font;
+	} else {
+		Common::String newFontName;
+		if (fontName.matchString("*times new roman*", true)) {
+			if (bold) {
+				newFontName = "timesbd.ttf";
+			} else {
+				newFontName = "times.ttf";
+			}
+		} else if (fontName.matchString("*courier new*", true)) {
+			if (bold) {
+				newFontName = "courbd.ttf";
+			} else {
+				newFontName = "cour.ttf";
+			}
+		} else if (fontName.matchString("*century schoolbook*", true)) {
+			if (bold) {
+				newFontName = "censcbkbd.ttf";
+			} else {
+				newFontName = "censcbk.ttf";
+			}
+		} else if (fontName.matchString("*garamond*", true)) {
+			if (bold) {
+				newFontName = "garabd.ttf";
+			} else {
+				newFontName = "gara.ttf";
+			}
+		} else {
+			debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
+			if (bold) {
+				newFontName = "zorknorm.ttf";
+			} else {
+				newFontName = "arial.ttf";
+			}
+		}
+
+		Common::String fontKey = Common::String::format("%s-%d", newFontName.c_str(), point);
+		if (_fonts.contains(fontKey)) {
+			fragment.style.font = _fonts[fontKey];
+		} else {
+			fragment.style.font = new TruetypeFont(_engine, point);
+			fragment.style.font->loadFile(newFontName);
+			_fonts[fontKey] = fragment.style.font;
+		}
+	}
+
+	fragment.style.align = align;
+	fragment.style.color = Graphics::ARGBToColor<Graphics::ColorMasks<565> >(0, red, green, blue);
+	_inGameText[lineNumber].fragments.push_back(fragment);
+
+	_lastStyle = fragment.style;
+}
+
+Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
+	Common::String asciiString;
+
+	// Don't spam the user with warnings about UTF-16 support.
+	// Just do one warning per String
+	bool charOverflowWarning = false;
+
+	uint16 value = stream.readUint16LE();
+	while (!stream.eos()) {
+		// Check for CRLF
+		if (value == 0x0A0D) {
+			// Read in the extra NULL char
+			stream.readByte(); // \0
+			// End of the line. Break
+			break;
+		}
+
+		// Crush each octet pair to a single octet with a simple cast
+		if (value > 255) {
+			charOverflowWarning = true;
+			value = '?';
+		}
+		char charValue = (char)value;
+
+		asciiString += charValue;
+
+		value = stream.readUint16LE();
+	}
+
+	if (charOverflowWarning) {
+		warning("UTF-16 is not supported. Characters greater than 255 are replaced with '?'");
+	}
+
+	return asciiString;
+}
+
+StringManager::TextStyle StringManager::getTextStyle(uint stringNumber) {
+	return _inGameText[stringNumber].fragments.front().style;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
new file mode 100644
index 0000000000..af8324b890
--- /dev/null
+++ b/engines/zvision/text/string_manager.h
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_STRING_MANAGER_H
+#define ZVISION_STRING_MANAGER_H
+
+#include "zvision/detection.h"
+#include "zvision/fonts/truetype_font.h"
+
+
+namespace Graphics {
+class FontManager;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+class StringManager {
+public:
+	StringManager(ZVision *engine);
+	~StringManager();
+
+public:
+	struct TextStyle {
+		TruetypeFont *font;
+		uint16 color; // In RBG 565
+		Graphics::TextAlign align;
+	};
+
+	struct TextFragment {
+		TextStyle style;
+		Common::String text;
+	};
+
+private:
+	struct InGameText {
+		Common::List<TextFragment> fragments;
+	};
+
+	enum {
+		NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
+	};
+
+private:
+	ZVision *_engine;
+	InGameText _inGameText[NUM_TEXT_LINES];
+	Common::HashMap<Common::String, TruetypeFont *> _fonts;
+
+	TextStyle _lastStyle;
+
+public:
+	void initialize(ZVisionGameId gameId);
+	StringManager::TextStyle getTextStyle(uint stringNumber);
+
+private:
+	void parseStrFile(const Common::String &fileName);
+	void parseTag(const Common::String &tagString, uint lineNumber);
+
+	static Common::String readWideLine(Common::SeekableReadStream &stream);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
new file mode 100644
index 0000000000..cad2723d13
--- /dev/null
+++ b/engines/zvision/text/text.cpp
@@ -0,0 +1,549 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/text/text.h"
+
+#include "zvision/fonts/truetype_font.h"
+
+#include "common/file.h"
+#include "common/tokenizer.h"
+#include "common/debug.h"
+#include "common/rect.h"
+
+#include "graphics/fontman.h"
+#include "graphics/colormasks.h"
+#include "graphics/surface.h"
+#include "graphics/font.h"
+#include "graphics/fonts/ttf.h"
+
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+
+
+namespace ZVision {
+
+cTxtStyle::cTxtStyle() {
+	fontname = "Arial";
+	blue = 255;
+	green = 255;
+	red = 255;
+	bold = false;
+	escapement = 0;
+	italic = false;
+	justify = TXT_JUSTIFY_LEFT;
+	newline = false;
+	size = 12;
+	skipcolor = false;
+	strikeout = false;
+	underline = false;
+	statebox = 0;
+	sharp = false;
+}
+
+txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
+	Common::String buf = Common::String(strin.c_str(), ln);
+
+	int8 retval = TXT_RET_NOTHING;
+
+	Common::StringTokenizer tokenizer(buf, " ");
+	Common::String token;
+
+	while (!tokenizer.empty()) {
+		token = tokenizer.nextToken();
+
+		if (token.matchString("font", true)) {
+			token = tokenizer.nextToken();
+			if (token[0] == '"') {
+				Common::String _tmp = Common::String(token.c_str() + 1);
+
+				while (token.lastChar() != '"' && !tokenizer.empty()) {
+					token = tokenizer.nextToken();
+					_tmp += " " + token;
+				}
+
+				if (_tmp.lastChar() == '"')
+					_tmp.deleteLastChar();
+
+				fontname = _tmp;
+			} else {
+				if (!tokenizer.empty())
+					fontname = token;
+			}
+			retval |= TXT_RET_FNTCHG;
+
+		} else if (token.matchString("blue", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (blue != tmp) {
+					blue = tmp;
+					retval |= TXT_RET_FNTSTL;
+				}
+			}
+		} else if (token.matchString("red", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (red != tmp) {
+					red = tmp;
+					retval |= TXT_RET_FNTSTL;
+				}
+			}
+		} else if (token.matchString("green", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (green != tmp) {
+					green = tmp;
+					retval |= TXT_RET_FNTSTL;
+				}
+			}
+		} else if (token.matchString("newline", true)) {
+			if ((retval & TXT_RET_NEWLN) == 0)
+				newline = 0;
+
+			newline++;
+			retval |= TXT_RET_NEWLN;
+		} else if (token.matchString("point", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				if (size != tmp) {
+					size = tmp;
+					retval |= TXT_RET_FNTCHG;
+				}
+			}
+		} else if (token.matchString("escapement", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				int32 tmp = atoi(token.c_str());
+				escapement = tmp;
+			}
+		} else if (token.matchString("italic", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (italic != true) {
+						italic = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (italic != false) {
+						italic = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("underline", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (underline != true) {
+						underline = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (underline != false) {
+						underline = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("strikeout", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (strikeout != true) {
+						strikeout = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (strikeout != false) {
+						strikeout = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("bold", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					if (bold != true) {
+						bold = true;
+						retval |= TXT_RET_FNTSTL;
+					}
+				} else if (token.matchString("off", true)) {
+					if (bold != false) {
+						bold = false;
+						retval |= TXT_RET_FNTSTL;
+					}
+				}
+			}
+		} else if (token.matchString("skipcolor", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("on", true)) {
+					skipcolor = true;
+				} else if (token.matchString("off", true)) {
+					skipcolor = false;
+				}
+			}
+		} else if (token.matchString("image", true)) {
+			// Not used
+		} else if (token.matchString("statebox", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				statebox = atoi(token.c_str());
+				retval |= TXT_RET_HASSTBOX;
+			}
+		} else if (token.matchString("justify", true)) {
+			if (!tokenizer.empty()) {
+				token = tokenizer.nextToken();
+				if (token.matchString("center", true))
+					justify = TXT_JUSTIFY_CENTER;
+				else if (token.matchString("left", true))
+					justify = TXT_JUSTIFY_LEFT;
+				else if (token.matchString("right", true))
+					justify = TXT_JUSTIFY_RIGHT;
+			}
+		}
+	}
+	return (txtReturn)retval;
+}
+
+void cTxtStyle::readAllStyle(const Common::String &txt) {
+	int16 strt = -1;
+	int16 endt = -1;
+
+	for (uint16 i = 0; i < txt.size(); i++) {
+		if (txt[i] == '<')
+			strt = i;
+		else if (txt[i] == '>') {
+			endt = i;
+			if (strt != -1)
+				if ((endt - strt - 1) > 0)
+					parseStyle(Common::String(txt.c_str() + strt + 1), endt - strt - 1);
+		}
+
+	}
+}
+
+void cTxtStyle::setFontStyle(sTTFont &font) {
+	uint temp_stl = 0;
+
+	if (bold)
+		temp_stl |= sTTFont::STTF_BOLD;
+
+	if (italic)
+		temp_stl |= sTTFont::STTF_ITALIC;
+
+	if (underline)
+		temp_stl |= sTTFont::STTF_UNDERLINE;
+
+	if (strikeout)
+		temp_stl |= sTTFont::STTF_STRIKEOUT;
+
+	if (sharp)
+		temp_stl |= sTTFont::STTF_SHARP;
+
+	font.setStyle(temp_stl);
+}
+
+void cTxtStyle::setFont(sTTFont &font) {
+	uint temp_stl = 0;
+
+	if (bold)
+		temp_stl |= sTTFont::STTF_BOLD;
+
+	if (italic)
+		temp_stl |= sTTFont::STTF_ITALIC;
+
+	if (underline)
+		temp_stl |= sTTFont::STTF_UNDERLINE;
+
+	if (strikeout)
+		temp_stl |= sTTFont::STTF_STRIKEOUT;
+
+	if (sharp)
+		temp_stl |= sTTFont::STTF_SHARP;
+
+	font.loadFont(fontname, size, temp_stl);
+}
+
+Graphics::Surface *textRenderer::render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
+	style.setFontStyle(fnt);
+	uint32 clr = _engine->_pixelFormat.RGBToColor(style.red, style.green, style.blue);
+	return fnt.renderSolidText(txt, clr);
+}
+
+void textRenderer::drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify) {
+	if (justify == TXT_JUSTIFY_LEFT)
+		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignLeft);
+	else if (justify == TXT_JUSTIFY_CENTER)
+		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignCenter);
+	else if (justify == TXT_JUSTIFY_RIGHT)
+		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignRight);
+}
+
+int32 textRenderer::drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst) {
+	sTTFont font(_engine);
+	fnt_stl.setFont(font);
+
+	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
+
+	uint32 clr = _engine->_pixelFormat.RGBToColor(fnt_stl.red, fnt_stl.green, fnt_stl.blue);
+
+	int16 w;
+
+	w = font.getStringWidth(txt);
+
+	drawTxtWithJustify(txt, font, clr, dst, fnt_stl.size, fnt_stl.justify);
+
+	return w;
+}
+
+void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surface &dst) {
+	const int16 TXT_CFG_TEXTURES_LINES = 256; // For now I don't want remake it
+	const int TXT_CFG_TEXTURES_PER_LINE = 6;
+	cTxtStyle style, style2;
+	int16 strt = -1;
+	int16 endt = -1;
+	int16 i = 0;
+	int16 dx = 0, dy = 0;
+	int16 txt_w;
+	int16 txtpos = 0;
+	Common::String buf;
+	Common::String buf2;
+
+	Graphics::Surface *TxtSurfaces[TXT_CFG_TEXTURES_LINES][TXT_CFG_TEXTURES_PER_LINE];
+	int16 currentline = 0, currentlineitm = 0;
+
+	int TxtJustify[TXT_CFG_TEXTURES_LINES];
+	int TxtPoint[TXT_CFG_TEXTURES_LINES];
+
+	for (int16 k = 0; k < TXT_CFG_TEXTURES_LINES; k++) {
+		TxtPoint[k] = 0;
+		for (int j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
+			TxtSurfaces[k][j] = NULL;
+	}
+
+	int16 stringlen = text.size();
+
+	sTTFont font(_engine);
+
+	style.setFont(font);
+
+	int16 prevbufspace = 0, prevtxtspace = 0;
+
+	while (i < stringlen) {
+		TxtJustify[currentline] = style.justify;
+		if (text[i] == '<') {
+			int16 ret = 0;
+
+			strt = i;
+			while (i < stringlen && text[i] != '>')
+				i++;
+			endt = i;
+			if (strt != -1)
+				if ((endt - strt - 1) > 0) {
+					style2 = style;
+					ret = style.parseStyle(Common::String(text.c_str() + strt + 1), endt - strt - 1);
+				}
+
+			if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
+				if (buf.size() > 0) {
+					txt_w = font.getStringWidth(buf);
+
+					TxtSurfaces[currentline][currentlineitm] = render(font, buf, style2);
+					TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+
+					currentlineitm++;
+
+					buf.clear();
+					prevbufspace = 0;
+					txtpos = 0;
+					dx += txt_w;
+
+				}
+				if (ret & TXT_RET_FNTCHG) {
+					style.setFont(font);
+				}
+				if (ret & TXT_RET_FNTSTL)
+					style.setFontStyle(font);
+
+				if (ret & TXT_RET_NEWLN) {
+					currentline++;
+					currentlineitm = 0;
+					dx = 0;
+				}
+			}
+
+			if (ret & TXT_RET_HASSTBOX) {
+				Common::String buf3;
+				buf3.format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
+				buf += buf3;
+				txtpos += buf3.size();
+			}
+
+		} else {
+
+			buf += text[i];
+			txtpos++;
+
+			if (text[i] == ' ') {
+				prevbufspace = txtpos - 1;
+				prevtxtspace = i;
+			}
+
+			if (font.isLoaded()) {
+				txt_w = font.getStringWidth(buf);
+				if (txt_w + dx > dst.w) {
+					if (prevbufspace == 0) {
+						prevtxtspace = i;
+						prevbufspace = txtpos - 1;
+					}
+					buf2 = Common::String(buf.c_str(), prevbufspace + 1);
+
+					if (buf2.size() > 0) {
+						TxtSurfaces[currentline][currentlineitm] = render(font, buf2, style);
+						TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+					}
+
+					buf.clear();
+					i = prevtxtspace;
+					prevbufspace = 0;
+					txtpos = 0;
+					currentline++;
+					currentlineitm = 0;
+					dx = 0;
+				}
+			}
+		}
+		i++;
+	}
+
+	if (buf.size() > 0) {
+		TxtSurfaces[currentline][currentlineitm] = render(font, buf, style);
+		TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+	}
+
+	dy = 0;
+	for (i = 0; i <= currentline; i++) {
+		int16 j = 0;
+		int16 width = 0;
+		while (TxtSurfaces[i][j] != NULL) {
+			width += TxtSurfaces[i][j]->w;
+			j++;
+		}
+		dx = 0;
+		for (int32_t jj = 0; jj < j; jj++) {
+			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+
+			else if (TxtJustify[i] == TXT_JUSTIFY_CENTER)
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, ((dst.w - width) / 2) + dx,  dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+
+			else if (TxtJustify[i] == TXT_JUSTIFY_RIGHT)
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dst.w - width + dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+
+			dx += TxtSurfaces[i][jj]->w;
+		}
+
+		dy += TxtPoint[i];
+	}
+
+	for (i = 0; i < TXT_CFG_TEXTURES_LINES; i++)
+		for (int32_t j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
+			if (TxtSurfaces[i][j] != NULL) {
+				TxtSurfaces[i][j]->free();
+				delete TxtSurfaces[i][j];
+			}
+}
+
+Common::String readWideLine(Common::SeekableReadStream &stream) {
+	Common::String asciiString;
+
+	while (!stream.eos()) {
+		uint32 value = stream.readUint16LE();
+		// Check for CRLF
+		if (value == 0x0A0D) {
+			// Read in the extra NULL char
+			stream.readByte(); // \0
+			// End of the line. Break
+			break;
+		}
+
+		// Crush each octet pair to a single octet with a simple cast
+		if (value < 0x80) {
+			asciiString += (char)(value & 0x7F);
+		} else if (value >= 0x80 && value < 0x800) {
+			asciiString += (char)(0xC0 | ((value >> 6) & 0x1F));
+			asciiString += (char)(0x80 | (value & 0x3F));
+		} else if (value >= 0x800 && value < 0x10000) {
+			asciiString += (char)(0xE0 | ((value >> 12) & 0xF));
+			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
+			asciiString += (char)(0x80 | (value & 0x3F));
+		} else if (value >= 0x10000 && value < 0x200000) {
+			asciiString += (char)(0xF0);
+			asciiString += (char)(0x80 | ((value >> 12) & 0x3F));
+			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
+			asciiString += (char)(0x80 | (value & 0x3F));
+		}
+	}
+
+	return asciiString;
+}
+
+int8 getUtf8CharSize(char chr) {
+	if ((chr & 0x80) == 0)
+		return 1;
+	else if ((chr & 0xE0) == 0xC0)
+		return 2;
+	else if ((chr & 0xF0) == 0xE0)
+		return 3;
+	else if ((chr & 0xF8) == 0xF0)
+		return 4;
+	else if ((chr & 0xFC) == 0xF8)
+		return 5;
+	else if ((chr & 0xFE) == 0xFC)
+		return 6;
+
+	return 1;
+}
+
+uint16 readUtf8Char(const char *chr) {
+	uint16 result = 0;
+	if ((chr[0] & 0x80) == 0)
+		result = chr[0];
+	else if ((chr[0] & 0xE0) == 0xC0)
+		result = ((chr[0] & 0x1F) << 6) | (chr[1] & 0x3F);
+	else if ((chr[0] & 0xF0) == 0xE0)
+		result = ((chr[0] & 0x0F) << 12) | ((chr[1] & 0x3F) << 6) | (chr[2] & 0x3F);
+	else
+		result = chr[0];
+
+	return result;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
new file mode 100644
index 0000000000..4b318fdef0
--- /dev/null
+++ b/engines/zvision/text/text.h
@@ -0,0 +1,100 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ */
+
+#ifndef ZVISION_TEXT_H
+#define ZVISION_TEXT_H
+
+#include "zvision/detection.h"
+#include "zvision/fonts/truetype_font.h"
+#include "zvision/zvision.h"
+
+
+namespace Graphics {
+class FontManager;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+enum txtJustify {
+	TXT_JUSTIFY_CENTER = 0,
+	TXT_JUSTIFY_LEFT = 1,
+	TXT_JUSTIFY_RIGHT = 2
+};
+
+enum txtReturn {
+	TXT_RET_NOTHING = 0x0,
+	TXT_RET_FNTCHG = 0x1,
+	TXT_RET_FNTSTL = 0x2,
+	TXT_RET_NEWLN = 0x4,
+	TXT_RET_HASSTBOX = 0x8
+};
+
+class cTxtStyle {
+public:
+	cTxtStyle();
+	txtReturn parseStyle(const Common::String &strin, int16 len);
+	void readAllStyle(const Common::String &txt);
+	void setFontStyle(sTTFont &font);
+	void setFont(sTTFont &font);
+
+public:
+	Common::String fontname;
+	txtJustify justify;  // 0 - center, 1-left, 2-right
+	int16 size;
+	uint8 red;     // 0-255
+	uint8 green;   // 0-255
+	uint8 blue;    // 0-255
+	int8 newline;
+	int8 escapement;
+	bool italic;
+	bool bold;
+	bool underline;
+	bool strikeout;
+	bool skipcolor;
+	int32 statebox;
+	bool sharp;
+	// char image ??
+};
+
+class textRenderer {
+public:
+	textRenderer(ZVision *engine): _engine(engine) {};
+
+	void drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify);
+	int32 drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst);
+	Graphics::Surface *render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style);
+	void drawTxtInOneLine(const Common::String &txt, Graphics::Surface &dst);
+
+private:
+	ZVision *_engine;
+};
+
+Common::String readWideLine(Common::SeekableReadStream &stream);
+int8 getUtf8CharSize(char chr);
+uint16 readUtf8Char(const char *chr);
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/ttytext_node.cpp b/engines/zvision/ttytext_node.cpp
deleted file mode 100644
index 6741d28a56..0000000000
--- a/engines/zvision/ttytext_node.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/ttytext_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/text.h"
-
-#include "common/stream.h"
-#include "common/file.h"
-
-
-namespace ZVision {
-
-ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :
-	SideFX(engine, key, SIDEFX_TTYTXT),
-	_fnt(engine) {
-	_delay = delay;
-	_r = r;
-	_txtpos = 0;
-	_nexttime = 0;
-	_dx = 0;
-	_dy = 0;
-
-	Common::File *infile = _engine->getSearchManager()->openFile(file);
-	if (infile) {
-		while (!infile->eos()) {
-			Common::String asciiLine = readWideLine(*infile);
-			if (asciiLine.empty()) {
-				continue;
-			}
-			_txtbuf += asciiLine;
-		}
-
-		delete infile;
-	}
-	_img.create(_r.width(), _r.height(), _engine->_pixelFormat);
-	_style.sharp = true;
-	_style.readAllStyle(_txtbuf);
-	_style.setFont(_fnt);
-	_engine->getScriptManager()->setStateValue(_key, 1);
-}
-
-ttyTextNode::~ttyTextNode() {
-	_engine->getScriptManager()->setStateValue(_key, 2);
-	_img.free();
-}
-
-bool ttyTextNode::process(uint32 deltaTimeInMillis) {
-	_nexttime -= deltaTimeInMillis;
-
-	if (_nexttime < 0) {
-		if (_txtpos < _txtbuf.size()) {
-			if (_txtbuf[_txtpos] == '<') {
-				int32 strt = _txtpos;
-				int32 endt = 0;
-				int16 ret = 0;
-				while (_txtbuf[_txtpos] != '>' && _txtpos < _txtbuf.size())
-					_txtpos++;
-				endt = _txtpos;
-				if (strt != -1)
-					if ((endt - strt - 1) > 0)
-						ret = _style.parseStyle(_txtbuf.c_str() + strt + 1, endt - strt - 1);
-
-				if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
-					if (ret & TXT_RET_FNTCHG)
-						_style.setFont(_fnt);
-					if (ret & TXT_RET_FNTSTL)
-						_style.setFontStyle(_fnt);
-
-					if (ret & TXT_RET_NEWLN)
-						newline();
-				}
-
-				if (ret & TXT_RET_HASSTBOX) {
-					Common::String buf;
-					buf.format("%d", _style.statebox);
-
-					for (uint8 j = 0; j < buf.size(); j++)
-						outchar(buf[j]);
-				}
-
-				_txtpos++;
-			} else {
-				int8 charsz = getUtf8CharSize(_txtbuf[_txtpos]);
-
-				uint16 chr = readUtf8Char(_txtbuf.c_str() + _txtpos);
-
-				if (chr == ' ') {
-					uint32 i = _txtpos + charsz;
-					uint16 width = _fnt.getCharWidth(chr);
-
-					while (i < _txtbuf.size() && _txtbuf[i] != ' ' && _txtbuf[i] != '<') {
-
-						int8 chsz   = getUtf8CharSize(_txtbuf[i]);
-						uint16 uchr = readUtf8Char(_txtbuf.c_str() + _txtpos);
-
-						width += _fnt.getCharWidth(uchr);
-
-						i += chsz;
-					}
-
-					if (_dx + width > _r.width())
-						newline();
-					else
-						outchar(chr);
-				} else
-					outchar(chr);
-
-				_txtpos += charsz;
-			}
-			_nexttime = _delay;
-			_engine->getRenderManager()->blitSurfaceToBkg(_img, _r.left, _r.top);
-		} else
-			return stop();
-	}
-
-	return false;
-}
-
-void ttyTextNode::scroll() {
-	int32 scrl = 0;
-	while (_dy - scrl > _r.height() - _fnt.getFontHeight())
-		scrl += _fnt.getFontHeight();
-	int8 *pixels = (int8 *)_img.getPixels();
-	for (uint16 h = scrl; h < _img.h; h++)
-		memcpy(pixels + _img.pitch * (h - scrl), pixels + _img.pitch * h, _img.pitch);
-
-	_img.fillRect(Common::Rect(0, _img.h - scrl, _img.w, _img.h), 0);
-	_dy -= scrl;
-}
-
-void ttyTextNode::newline() {
-	_dy += _fnt.getFontHeight();
-	_dx = 0;
-}
-
-void ttyTextNode::outchar(uint16 chr) {
-	uint32 clr = _engine->_pixelFormat.RGBToColor(_style.red, _style.green, _style.blue);
-
-	if (_dx + _fnt.getCharWidth(chr) > _r.width())
-		newline();
-
-	if (_dy + _fnt.getFontHeight() >= _r.height())
-		scroll();
-
-	_fnt.drawChar(&_img, chr, _dx, _dy, clr);
-
-	_dx += _fnt.getCharWidth(chr);
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/ttytext_node.h b/engines/zvision/ttytext_node.h
deleted file mode 100644
index e25fdb0c07..0000000000
--- a/engines/zvision/ttytext_node.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_TTYTEXT_NODE_H
-#define ZVISION_TTYTEXT_NODE_H
-
-#include "common/rect.h"
-#include "graphics/surface.h"
-
-#include "zvision/sidefx.h"
-#include "zvision/text.h"
-#include "zvision/fonts/truetype_font.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-class ttyTextNode : public SideFX {
-public:
-	ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay);
-	~ttyTextNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-private:
-	Common::Rect _r;
-	//int16 x;
-	//int16 y;
-	//uint16 w;
-	//uint16 h;
-	cTxtStyle _style;
-	sTTFont _fnt;
-	Common::String _txtbuf;
-	uint32 _txtpos;
-	//int32 txtsize;
-	int32 _delay;
-	int32 _nexttime;
-	Graphics::Surface _img;
-	int16 _dx;
-	int16 _dy;
-private:
-
-	void newline();
-	void scroll();
-	void outchar(uint16 chr);
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 580f8c4367..0eb14257f2 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -29,12 +29,12 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
-#include "zvision/strings/string_manager.h"
+#include "zvision/text/string_manager.h"
 #include "zvision/archives/zfs_archive.h"
 #include "zvision/detection.h"
 #include "zvision/core/menu.h"
-#include "zvision/search_manager.h"
-#include "zvision/text.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/text.h"
 #include "zvision/fonts/truetype_font.h"
 
 #include "common/config-manager.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 2674df27e0..db2c646fda 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -26,7 +26,7 @@
 
 #include "zvision/detection.h"
 #include "zvision/utility/clock.h"
-#include "zvision/search_manager.h"
+#include "zvision/core/search_manager.h"
 
 #include "common/random.h"
 #include "common/events.h"
-- 
cgit v1.2.3


From 628d6cb4ee92aa15dbdf5029b8675cb09d18f3e9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 5 Jul 2014 17:15:04 +0000
Subject: ZVISION: Fix puzzle disable condition check

---
 engines/zvision/scripting/script_manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a27ae4dbf0..fc765f0bfb 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -158,8 +158,7 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 	// Check if the puzzle is already finished
 	// Also check that the puzzle isn't disabled
-	if (getStateValue(puzzle->key) == 1 &&
-	        (getStateFlag(puzzle->key) & Puzzle::DISABLED) == 0) {
+	if (getStateValue(puzzle->key) == 1 || (getStateFlag(puzzle->key) & Puzzle::DISABLED) == Puzzle::DISABLED) {
 		return;
 	}
 
-- 
cgit v1.2.3


From bbaebdf680179dca103b0ed635e791aa602d610d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 5 Jul 2014 17:27:08 +0000
Subject: ZVISION: Process events for controls similar to original engine, fix
 some errors.

---
 engines/zvision/core/events.cpp              | 24 +++++---------------
 engines/zvision/scripting/script_manager.cpp | 33 ++++++++++++++++++++++++++++
 engines/zvision/scripting/script_manager.h   |  6 +++++
 engines/zvision/zvision.h                    |  2 --
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 943f8ff279..c977125f55 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -46,13 +46,15 @@ void ZVision::processEvents() {
 		case Common::EVENT_LBUTTONDOWN:
 			_cursorManager->cursorDown(true);
 			_scriptManager->setStateValue(StateKey_LMouse, 1);
-			onMouseDown(_event.mouse);
+			_menu->onMouseDown(_event.mouse);
+			_scriptManager->addEvent(_event);
 			break;
 
 		case Common::EVENT_LBUTTONUP:
 			_cursorManager->cursorDown(false);
 			_scriptManager->setStateValue(StateKey_LMouse, 0);
-			onMouseUp(_event.mouse);
+			_menu->onMouseUp(_event.mouse);
+			_scriptManager->addEvent(_event);
 			break;
 
 		case Common::EVENT_RBUTTONDOWN:
@@ -87,10 +89,10 @@ void ZVision::processEvents() {
 				break;
 			}
 
-			_scriptManager->onKeyDown(_event.kbd);
+			_scriptManager->addEvent(_event);
 			break;
 		case Common::EVENT_KEYUP:
-			_scriptManager->onKeyUp(_event.kbd);
+			_scriptManager->addEvent(_event);
 			break;
 		default:
 			break;
@@ -98,20 +100,6 @@ void ZVision::processEvents() {
 	}
 }
 
-void ZVision::onMouseDown(const Common::Point &pos) {
-	_menu->onMouseDown(pos);
-
-	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
-	_scriptManager->onMouseDown(pos, imageCoord);
-}
-
-void ZVision::onMouseUp(const Common::Point &pos) {
-	_menu->onMouseUp(pos);
-
-	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
-	_scriptManager->onMouseUp(pos, imageCoord);
-}
-
 void ZVision::onMouseMove(const Common::Point &pos) {
 	_menu->onMouseMove(pos);
 	Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos));
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index fc765f0bfb..7c124b6eca 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -51,6 +51,7 @@ ScriptManager::~ScriptManager() {
 	cleanScriptScope(world);
 	cleanScriptScope(room);
 	cleanScriptScope(nodeview);
+	_controlEvents.clear();
 }
 
 void ScriptManager::initialize() {
@@ -66,6 +67,8 @@ void ScriptManager::initialize() {
 
 	parseScrFile("universe.scr", universe);
 	changeLocation('g', 'a', 'r', 'y', 0);
+
+	_controlEvents.clear();
 }
 
 void ScriptManager::update(uint deltaTimeMillis) {
@@ -151,6 +154,32 @@ void ScriptManager::updateNodes(uint deltaTimeMillis) {
 void ScriptManager::updateControls(uint deltaTimeMillis) {
 	if (!_activeControls)
 		return;
+
+	// Process only one event
+	if (!_controlEvents.empty()) {
+		Common::Event _event = _controlEvents.front();
+		Common::Point imageCoord;
+		switch (_event.type) {
+			case Common::EVENT_LBUTTONDOWN:
+				imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
+				onMouseDown(_event.mouse, imageCoord);
+				break;
+			case Common::EVENT_LBUTTONUP:
+				imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
+				onMouseUp(_event.mouse, imageCoord);
+				break;
+			case Common::EVENT_KEYDOWN:
+				onKeyDown(_event.kbd);
+				break;
+			case Common::EVENT_KEYUP:
+				onKeyUp(_event.kbd);
+				break;
+			default:
+				break;
+		}
+		_controlEvents.pop_front();
+	}
+
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
 		(*iter)->process(deltaTimeMillis);
 }
@@ -693,6 +722,10 @@ Location ScriptManager::getCurrentLocation() const {
 	return location;
 }
 
+void ScriptManager::addEvent(Common::Event event) {
+	_controlEvents.push_back(event);
+}
+
 ValueSlot::ValueSlot(ScriptManager *sc_man, const char *slot_val):
 	_sc_man(sc_man) {
 	value = 0;
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 8ec364b35f..316b50ab26 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -29,6 +29,7 @@
 
 #include "common/hashmap.h"
 #include "common/queue.h"
+#include "common/events.h"
 
 
 namespace Common {
@@ -111,6 +112,7 @@ typedef Common::Queue<Puzzle *> PuzzleQueue;
 typedef Common::List<Control *> ControlList;
 typedef Common::HashMap<uint32, int32> StateMap;
 typedef Common::List<SideFX *> SideFXList;
+typedef Common::List<Common::Event> EventList;
 
 class ScriptManager {
 public:
@@ -152,6 +154,8 @@ private:
 	/** Holds the currently active controls */
 	ControlList *_activeControls;
 
+	EventList _controlEvents;
+
 	script_scope universe;
 	script_scope world;
 	script_scope room;
@@ -192,6 +196,8 @@ public:
 	void killSideFx(uint32 key);
 	void killSideFxType(SideFX::SideFXType type);
 
+	void addEvent(Common::Event);
+
 	/**
 	 * Called when LeftMouse is pushed.
 	 *
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index db2c646fda..57e7339da6 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -179,8 +179,6 @@ private:
 	/** Called every frame from ZVision::run() to process any events from EventMan */
 	void processEvents();
 
-	void onMouseDown(const Common::Point &pos);
-	void onMouseUp(const Common::Point &pos);
 	void onMouseMove(const Common::Point &pos);
 	void updateRotation();
 };
-- 
cgit v1.2.3


From b9103b8d19a5da396d217e8d9bcc5c1502b89837 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 19:09:08 +0000
Subject: ZVISION: Implement functions for system messaging.

---
 engines/zvision/graphics/render_manager.cpp | 15 +++++++
 engines/zvision/graphics/render_manager.h   |  1 +
 engines/zvision/zvision.cpp                 | 65 +++++++++++++++++++++++++++++
 engines/zvision/zvision.h                   |  4 ++
 4 files changed, 85 insertions(+)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index f3b01b7e30..c89444df13 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -729,6 +729,21 @@ uint16 RenderManager::createSubArea(const Common::Rect &area) {
 	return _subid;
 }
 
+uint16 RenderManager::createSubArea() {
+	_subid++;
+
+	oneSub sub;
+	sub.redraw = false;
+	sub.timer = -1;
+	sub.todelete = false;
+	sub._r = Common::Rect(_subWndRect.left, _subWndRect.top, _subWndRect.right, _subWndRect.bottom);
+	sub._r.translate(-_workingWindow.left, -_workingWindow.top);
+
+	_subsList[_subid] = sub;
+
+	return _subid;
+}
+
 void RenderManager::deleteSubArea(uint16 id) {
 	if (_subsList.contains(id))
 		_subsList[id].todelete = true;
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index ca2e715e8a..b4c6c76a6e 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -233,6 +233,7 @@ public:
 	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey);
 
 	uint16 createSubArea(const Common::Rect &area);
+	uint16 createSubArea();
 	void deleteSubArea(uint16 id);
 	void deleteSubArea(uint16 id, int16 delay);
 	void updateSubArea(uint16 id, const Common::String &txt);
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 0eb14257f2..24e15e0c86 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -212,6 +212,71 @@ Common::Error ZVision::run() {
 	return Common::kNoError;
 }
 
+bool ZVision::askQuestion(const Common::String &str) {
+	uint16 msgid = _renderManager->createSubArea();
+	_renderManager->updateSubArea(msgid, str);
+	_renderManager->processSubs(0);
+	_renderManager->renderBackbufferToScreen();
+	_clock.stop();
+
+	int result = 0;
+
+	while (result == 0) {
+		Common::Event evnt;
+		while (_eventMan->pollEvent(evnt)) {
+			if (evnt.type == Common::EVENT_KEYDOWN) {
+				switch (evnt.kbd.keycode) {
+				case Common::KEYCODE_y:
+					result = 2;
+					break;
+				case Common::KEYCODE_n:
+					result = 1;
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		_system->updateScreen();
+		_system->delayMillis(66);
+	}
+	_renderManager->deleteSubArea(msgid);
+	_clock.start();
+	return result == 2;
+}
+
+void ZVision::delayedMessage(const Common::String &str, uint16 milsecs) {
+	uint16 msgid = _renderManager->createSubArea();
+	_renderManager->updateSubArea(msgid, str);
+	_renderManager->processSubs(0);
+	_renderManager->renderBackbufferToScreen();
+	_clock.stop();
+
+	uint32 stop_time = _system->getMillis() + milsecs;
+	while (_system->getMillis() < stop_time) {
+		Common::Event evnt;
+		while (_eventMan->pollEvent(evnt)) {
+			if (evnt.type == Common::EVENT_KEYDOWN &&
+			        (evnt.kbd.keycode == Common::KEYCODE_SPACE ||
+			         evnt.kbd.keycode == Common::KEYCODE_RETURN ||
+			         evnt.kbd.keycode == Common::KEYCODE_ESCAPE))
+				break;
+		}
+		_system->updateScreen();
+		_system->delayMillis(66);
+	}
+	_renderManager->deleteSubArea(msgid);
+	_clock.start();
+}
+
+void ZVision::timedMessage(const Common::String &str, uint16 milsecs) {
+	uint16 msgid = _renderManager->createSubArea();
+	_renderManager->updateSubArea(msgid, str);
+	_renderManager->processSubs(0);
+	_renderManager->renderBackbufferToScreen();
+	_renderManager->deleteSubArea(msgid, milsecs);
+}
+
 void ZVision::pauseEngineIntern(bool pause) {
 	_mixer->pauseAll(pause);
 
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 57e7339da6..e5d32bf678 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -167,6 +167,10 @@ public:
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
+	bool askQuestion(const Common::String &str);
+	void delayedMessage(const Common::String &str, uint16 milsecs);
+	void timedMessage(const Common::String &str, uint16 milsecs);
+
 	void setRenderDelay(uint);
 	bool canRender();
 
-- 
cgit v1.2.3


From 57857a1d768fc9b226326efe2294f73e847c816e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 21:35:50 +0000
Subject: ZVISION: Controls now can return type of control.

---
 engines/zvision/scripting/control.h                | 23 +++++++++++++++++++++-
 .../zvision/scripting/controls/input_control.cpp   |  2 +-
 .../zvision/scripting/controls/lever_control.cpp   |  2 +-
 .../scripting/controls/push_toggle_control.cpp     |  2 +-
 .../zvision/scripting/controls/slot_control.cpp    |  2 +-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 93ad5f5df1..6ec47c6455 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -39,14 +39,33 @@ class ZVision;
 
 class Control {
 public:
+
+    enum ControlType {
+		CONTROL_UNKNOW,
+		CONTROL_INPUT,
+		CONTROL_PUSHTGL,
+		CONTROL_SLOT,
+		CONTROL_LEVER,
+		CONTROL_SAVE,
+		CONTROL_SAFE,
+		CONTROL_FIST,
+		CONTROL_TITLER,
+		CONTROL_HOTMOV,
+		CONTROL_PAINT
+	};
+
 	Control() : _engine(0), _key(0) {}
-	Control(ZVision *engine, uint32 key) : _engine(engine), _key(key) {}
+	Control(ZVision *engine, uint32 key, ControlType type) : _engine(engine), _key(key), _type(type) {}
 	virtual ~Control() {}
 
 	uint32 getKey() {
 		return _key;
 	}
 
+	ControlType getType() {
+	    return _type;
+	}
+
 	virtual void focus() {}
 	virtual void unfocus() {}
 	/**
@@ -109,6 +128,8 @@ public:
 	static void parseFlatControl(ZVision *engine);
 	static void parsePanoramaControl(ZVision *engine, Common::SeekableReadStream &stream);
 	static void parseTiltControl(ZVision *engine, Common::SeekableReadStream &stream);
+private:
+    ControlType _type;
 };
 
 // TODO: Implement InputControl
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index ba1b634d42..0bca01bf47 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -38,7 +38,7 @@
 namespace ZVision {
 
 InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key),
+	: Control(engine, key, CONTROL_INPUT),
 	  _nextTabstop(0),
 	  _focused(false),
 	  _textChanged(false),
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 7e3ee775fb..87fbb433dd 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -42,7 +42,7 @@
 namespace ZVision {
 
 LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key),
+	: Control(engine, key, CONTROL_LEVER),
 	  _frameInfo(0),
 	  _frameCount(0),
 	  _startFrame(0),
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 16cd971ad5..2f4af0d843 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -35,7 +35,7 @@
 namespace ZVision {
 
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key),
+	: Control(engine, key, CONTROL_PUSHTGL),
 	  _countTo(2),
 	  _event(Common::EVENT_LBUTTONUP) {
 	// Loop until we find the closing brace
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index c85b02b3cd..f78061ac13 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -36,7 +36,7 @@
 namespace ZVision {
 
 SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key) {
+	: Control(engine, key, CONTROL_SLOT) {
 
 	_rendered_item = 0;
 	_bkg = NULL;
-- 
cgit v1.2.3


From 9dd9bfce808cacb90bdea1ee7cc371e698c1eca9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 21:38:11 +0000
Subject: ZVISION: String manager only load text lines without parsing text
 styles.

---
 engines/zvision/text/string_manager.cpp | 25 +++++++++++++++++++++++--
 engines/zvision/text/string_manager.h   |  4 ++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index cadfbf1f49..114f298505 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -22,6 +22,8 @@
 
 #include "common/scummsys.h"
 
+#include "zvision/zvision.h"
+#include "zvision/core/search_manager.h"
 #include "zvision/text/string_manager.h"
 
 #include "zvision/fonts/truetype_font.h"
@@ -49,10 +51,25 @@ StringManager::~StringManager() {
 void StringManager::initialize(ZVisionGameId gameId) {
 	if (gameId == GID_NEMESIS) {
 		// TODO: Check this hardcoded filename against all versions of Nemesis
-		parseStrFile("nemesis.str");
+		loadStrFile("nemesis.str");
 	} else if (gameId == GID_GRANDINQUISITOR) {
 		// TODO: Check this hardcoded filename against all versions of Grand Inquisitor
-		parseStrFile("inquis.str");
+		loadStrFile("inquis.str");
+	}
+}
+
+void StringManager::loadStrFile(const Common::String &fileName) {
+	Common::File file;
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
+		warning("%s does not exist. String parsing failed", fileName.c_str());
+		return;
+	}
+	uint lineNumber = 0;
+	while (!file.eos()) {
+		_lines[lineNumber] = readWideLine(file);
+
+		lineNumber++;
+		assert(lineNumber <= NUM_TEXT_LINES);
 	}
 }
 
@@ -252,4 +269,8 @@ StringManager::TextStyle StringManager::getTextStyle(uint stringNumber) {
 	return _inGameText[stringNumber].fragments.front().style;
 }
 
+const Common::String StringManager::getTextLine(uint stringNumber) {
+	return _lines[stringNumber];
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index af8324b890..e226fbeae8 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -63,6 +63,8 @@ private:
 
 private:
 	ZVision *_engine;
+	Common::String _lines[NUM_TEXT_LINES];
+
 	InGameText _inGameText[NUM_TEXT_LINES];
 	Common::HashMap<Common::String, TruetypeFont *> _fonts;
 
@@ -71,8 +73,10 @@ private:
 public:
 	void initialize(ZVisionGameId gameId);
 	StringManager::TextStyle getTextStyle(uint stringNumber);
+	const Common::String getTextLine(uint stringNumber);
 
 private:
+	void loadStrFile(const Common::String &fileName);
 	void parseStrFile(const Common::String &fileName);
 	void parseTag(const Common::String &tagString, uint lineNumber);
 
-- 
cgit v1.2.3


From bc4b0b5bf6145be02071410e044c9f27040c856b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 21:39:02 +0000
Subject: ZVISION: Implement code for getControl

---
 engines/zvision/scripting/script_manager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 7c124b6eca..25fa13866a 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -351,7 +351,9 @@ void ScriptManager::unsetStateFlag(uint32 key, uint value) {
 }
 
 Control *ScriptManager::getControl(uint32 key) {
-
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter)
+		if ((*iter)->getKey() == key)
+			return *iter;
 	return nullptr;
 }
 
-- 
cgit v1.2.3


From ce248644b813d7a722f2c6250f723331fd119e55 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 21:41:49 +0000
Subject: ZVISION: Fix drawTxt y-position.

---
 engines/zvision/text/text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index cad2723d13..efb0fb42f9 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -318,7 +318,7 @@ int32 textRenderer::drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graph
 
 	w = font.getStringWidth(txt);
 
-	drawTxtWithJustify(txt, font, clr, dst, fnt_stl.size, fnt_stl.justify);
+	drawTxtWithJustify(txt, font, clr, dst, 0, fnt_stl.justify);
 
 	return w;
 }
-- 
cgit v1.2.3


From 7f2d4d9a6c72b4f0e88c86d5fe04eb059ec107a8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 21:44:10 +0000
Subject: ZVISION: Implement fuctionality for change focus without of calling
 focus/unfocus

---
 engines/zvision/scripting/script_manager.cpp | 4 ++++
 engines/zvision/scripting/script_manager.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 25fa13866a..ada06a5b51 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -373,6 +373,10 @@ void ScriptManager::focusControl(uint32 key) {
 	_currentlyFocusedControl = key;
 }
 
+void ScriptManager::setFocusControlKey(uint32 key) {
+	_currentlyFocusedControl = key;
+}
+
 void ScriptManager::addSideFX(SideFX *fx) {
 	_activeSideFx.push_back(fx);
 }
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 316b50ab26..6cc957874b 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -188,6 +188,8 @@ public:
 	void disableControl(uint32 key);
 
 	void focusControl(uint32 key);
+	// Only change focus control without call focus/unfocus.
+	void setFocusControlKey(uint32 key);
 
 	void addSideFX(SideFX *fx);
 	SideFX *getSideFX(uint32 key);
-- 
cgit v1.2.3


From 5a870100bd62ce3913bb4a3adb6bd12ce97f1675 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 12 Jul 2014 21:52:56 +0000
Subject: ZVISION: Bool results for keyUp and keyDown events for controls.

---
 engines/zvision/scripting/control.h                  | 4 ++--
 engines/zvision/scripting/controls/input_control.cpp | 5 +++--
 engines/zvision/scripting/controls/input_control.h   | 2 +-
 engines/zvision/scripting/script_manager.cpp         | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 6ec47c6455..ac245054ee 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -101,13 +101,13 @@ public:
 	 *
 	 * @param keycode    The key that was pressed
 	 */
-	virtual void onKeyDown(Common::KeyState keyState) {}
+	virtual bool onKeyDown(Common::KeyState keyState) {return false;}
 	/**
 	 * Called when a key is released. Default is NOP.
 	 *
 	 * @param keycode    The key that was pressed
 	 */
-	virtual void onKeyUp(Common::KeyState keyState) {}
+	virtual bool onKeyUp(Common::KeyState keyState) {return false;}
 	/**
 	 * Processes the node given the deltaTime since last frame. Default is NOP.
 	 *
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 0bca01bf47..bebf3fae11 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -98,9 +98,9 @@ bool InputControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 	return false;
 }
 
-void InputControl::onKeyDown(Common::KeyState keyState) {
+bool InputControl::onKeyDown(Common::KeyState keyState) {
 	if (!_focused) {
-		return;
+		return false;
 	}
 
 	if (keyState.keycode == Common::KEYCODE_BACKSPACE) {
@@ -119,6 +119,7 @@ void InputControl::onKeyDown(Common::KeyState keyState) {
 			_textChanged = true;
 		}
 	}
+	return false;
 }
 
 bool InputControl::process(uint32 deltaTimeInMillis) {
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 6fcdb2ca54..91fcd364cd 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -55,7 +55,7 @@ public:
 		_focused = false;
 	}
 	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
-	void onKeyDown(Common::KeyState keyState);
+	bool onKeyDown(Common::KeyState keyState);
 	bool process(uint32 deltaTimeInMillis);
 };
 
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index ada06a5b51..53fa5832d9 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -471,7 +471,8 @@ void ScriptManager::onKeyDown(Common::KeyState keyState) {
 	if (!_activeControls)
 		return;
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		(*iter)->onKeyDown(keyState);
+		if ((*iter)->onKeyDown(keyState))
+			return;
 	}
 }
 
@@ -479,7 +480,8 @@ void ScriptManager::onKeyUp(Common::KeyState keyState) {
 	if (!_activeControls)
 		return;
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		(*iter)->onKeyUp(keyState);
+		if ((*iter)->onKeyUp(keyState))
+			return;
 	}
 }
 
-- 
cgit v1.2.3


From 563d83701313fcd71ac7090deb61e7f3910e6070 Mon Sep 17 00:00:00 2001
From: Joel Teichroeb
Date: Wed, 22 Jan 2014 14:23:30 -0800
Subject: ANDROID: Modernize build system

Written originally by @Botje for ResidualVM
---
 backends/platform/android/android.mk | 193 +++++++++--------------------------
 dists/android/custom_rules.xml       |  31 ++++++
 dists/android/jni/Android.mk         |   9 ++
 dists/android/project.properties     |  11 ++
 dists/android/res/layout/main.xml    |   4 -
 5 files changed, 102 insertions(+), 146 deletions(-)
 create mode 100644 dists/android/custom_rules.xml
 create mode 100644 dists/android/jni/Android.mk
 create mode 100644 dists/android/project.properties

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 69aa9d8303..f9a2bc9813 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -2,183 +2,92 @@
 
 # These must be incremented for each market upload
 ANDROID_VERSIONCODE = 6
-ANDROID_PLUGIN_VERSIONCODE = 6
 
-JAVA_FILES = \
-	ScummVM.java \
-	ScummVMEvents.java \
-	ScummVMEventsHoneycomb.java \
-	ScummVMApplication.java \
-	ScummVMActivity.java \
-	EditableSurfaceView.java \
-	MouseHelper.java \
-	Unpacker.java
+ANDROID_TARGET_VERSION = 14
 
-JAVA_FILES_PLUGIN = \
-	PluginProvider.java
-
-JAVA_FILES_GEN = \
-	Manifest.java \
-	R.java
+NDK_BUILD = $(ANDROID_NDK)/ndk-build
+SDK_ANDROID = $(ANDROID_SDK)/tools/android
 
 PATH_DIST = $(srcdir)/dists/android
 PATH_RESOURCES = $(PATH_DIST)/res
 
 PORT_DISTFILES = $(PATH_DIST)/README.Android
+DIST_JAVA_SRC_DIR = $(srcdir)/backends/platform/android/org
 
 RESOURCES = \
-	$(PATH_RESOURCES)/values/strings.xml \
-	$(PATH_RESOURCES)/values/margins.xml \
-	$(PATH_RESOURCES)/values-television/margins.xml \
-	$(PATH_RESOURCES)/layout/main.xml \
-	$(PATH_RESOURCES)/layout/splash.xml \
-	$(PATH_RESOURCES)/drawable/gradient.xml \
-	$(PATH_RESOURCES)/drawable/scummvm.png \
-	$(PATH_RESOURCES)/drawable/scummvm_big.png \
-	$(PATH_RESOURCES)/drawable-xhdpi/ouya_icon.png
-
-PLUGIN_RESOURCES = \
-	$(PATH_RESOURCES)/values/strings.xml \
-	$(PATH_RESOURCES)/drawable/scummvm.png
-
-# FIXME: find/mark plugin entry points and add all this back again:
-#LDFLAGS += -Wl,--gc-sections
-#CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden
-
-AAPT = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/aapt
-ADB = $(ANDROID_SDK)/platform-tools/adb
-DX = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/dx
-APKBUILDER = java -Xmx128M -classpath $(ANDROID_SDK)/tools/lib/sdklib.jar com.android.sdklib.build.ApkBuilderMain
-JAVAC ?= javac
-JAVACFLAGS = -source 1.5 -target 1.5
-
-ANDROID_JAR = $(ANDROID_SDK)/platforms/android-14/android.jar
+	$(PATH_BUILD_RES)/values/strings.xml \
+	$(PATH_BUILD_RES)/values-television/margins.xml \
+	$(PATH_BUILD_RES)/layout/main.xml \
+	$(PATH_BUILD_RES)/layout/splash.xml \
+	$(PATH_BUILD_RES)/drawable/gradient.xml \
+	$(PATH_BUILD_RES)/drawable/scummvm.png \
+	$(PATH_BUILD_RES)/drawable/scummvm_big.png \
+	$(PATH_BUILD_RES)/drawable-xhdpi/ouya_icon.png
+
+DIST_ANDROID_MK = $(PATH_DIST)/jni/Android.mk
+DIST_BUILD_XML = $(PATH_DIST)/custom_rules.xml
 
 PATH_BUILD = ./build.tmp
 PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
-PATH_BUILD_CLASSES_MAIN_TOP = $(PATH_BUILD)/classes.main
-PATH_BUILD_CLASSES_PLUGIN_TOP = $(PATH_BUILD)/classes.plugin
-
-PATH_STAGE_PREFIX = build.stage
-PATH_STAGE_MAIN = $(PATH_STAGE_PREFIX).main
-
-PATH_REL = org/scummvm/scummvm
-PATH_SRC_TOP = $(srcdir)/backends/platform/android
-PATH_SRC = $(PATH_SRC_TOP)/$(PATH_REL)
-
-PATH_GEN_TOP = $(PATH_BUILD)/java
-PATH_GEN = $(PATH_GEN_TOP)/$(PATH_REL)
-PATH_CLASSES_MAIN = $(PATH_BUILD_CLASSES_MAIN_TOP)/$(PATH_REL)
-PATH_CLASSES_PLUGIN = $(PATH_BUILD_CLASSES_PLUGIN_TOP)/$(PATH_REL)
+PATH_BUILD_RES = $(PATH_BUILD)/res
+PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/mylib/armeabi/libscummvm.so
 
 FILE_MANIFEST_SRC = $(srcdir)/dists/android/AndroidManifest.xml
 FILE_MANIFEST = $(PATH_BUILD)/AndroidManifest.xml
-FILE_DEX = $(PATH_BUILD)/classes.dex
-FILE_DEX_PLUGIN = $(PATH_BUILD)/plugins/classes.dex
-FILE_RESOURCES = resources.ap_
-FILE_RESOURCES_MAIN = $(PATH_BUILD)/$(FILE_RESOURCES)
-
-SRC_GEN = $(addprefix $(PATH_GEN)/, $(JAVA_FILES_GEN))
-
-CLASSES_MAIN = $(addprefix $(PATH_CLASSES_MAIN)/, $(JAVA_FILES:%.java=%.class))
-CLASSES_GEN = $(addprefix $(PATH_CLASSES_MAIN)/, $(JAVA_FILES_GEN:%.java=%.class))
-CLASSES_PLUGIN = $(addprefix $(PATH_CLASSES_PLUGIN)/, $(JAVA_FILES_PLUGIN:%.java=%.class))
 
-APK_MAIN = scummvm.apk
+APK_MAIN = ScummVM-debug.apk
+APK_MAIN_RELEASE = ScummVM-release-unsigned.apk
 APK_PLUGINS = $(patsubst plugins/lib%.so, scummvm-engine-%.apk, $(PLUGINS))
 
-$(FILE_MANIFEST): $(FILE_MANIFEST_SRC)
+$(FILE_MANIFEST): $(FILE_MANIFEST_SRC) | $(PATH_BUILD)
 	@$(MKDIR) -p $(@D)
 	sed "s/@ANDROID_VERSIONCODE@/$(ANDROID_VERSIONCODE)/" < $< > $@
 
-$(SRC_GEN): $(FILE_MANIFEST) $(filter %.xml,$(RESOURCES)) $(ANDROID_JAR)
-	@$(MKDIR) -p $(PATH_GEN_TOP)
-	$(AAPT) package -m -J $(PATH_GEN_TOP) -M $< -S $(PATH_RESOURCES) -I $(ANDROID_JAR)
-
-$(PATH_CLASSES_MAIN)/%.class: $(PATH_GEN)/%.java $(SRC_GEN)
+$(PATH_BUILD)/res/%: $(PATH_DIST)/res/% | $(PATH_BUILD)
 	@$(MKDIR) -p $(@D)
-	$(JAVAC) $(JAVACFLAGS) -cp $(PATH_SRC_TOP) -d $(PATH_BUILD_CLASSES_MAIN_TOP) -bootclasspath $(ANDROID_JAR) $<
+	$(CP) $< $@
 
-$(PATH_CLASSES_MAIN)/%.class: $(PATH_SRC)/%.java $(SRC_GEN)
+$(PATH_BUILD)/libs/%: $(PATH_DIST)/libs/% | $(PATH_BUILD)
 	@$(MKDIR) -p $(@D)
-	$(JAVAC) $(JAVACFLAGS) -cp $(PATH_SRC_TOP):$(PATH_GEN_TOP) -d $(PATH_BUILD_CLASSES_MAIN_TOP) -bootclasspath $(ANDROID_JAR) $<
+	$(CP) $< $@
 
-$(PATH_CLASSES_PLUGIN)/%.class: $(PATH_SRC)/%.java
-	@$(MKDIR) -p $(@D)
-	$(JAVAC) $(JAVACFLAGS) -cp $(PATH_SRC_TOP) -d $(PATH_BUILD_CLASSES_PLUGIN_TOP) -bootclasspath $(ANDROID_JAR) $<
+$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_SHADERS) $(DIST_BUILD_XML) | $(PATH_BUILD)
+	$(INSTALL) -d $(PATH_BUILD_ASSETS)
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(PATH_BUILD_ASSETS)/
+	$(INSTALL) -d $(PATH_BUILD)/jni
+	$(INSTALL) -c -m 644 $(DIST_ANDROID_MK) $(PATH_BUILD)/jni
+	$(INSTALL) -c -m 644 $(DIST_BUILD_XML) $(PATH_BUILD)
 
-$(FILE_DEX): $(CLASSES_MAIN) $(CLASSES_GEN)
-	$(DX) --dex --output=$@ $(PATH_BUILD_CLASSES_MAIN_TOP)
+$(PATH_BUILD): $(DIST_ANDROID_MK)
+	$(MKDIR) -p $(PATH_BUILD) $(PATH_BUILD)/res
+	$(MKDIR) -p $(PATH_BUILD)/libs
 
-$(FILE_DEX_PLUGIN): $(CLASSES_PLUGIN)
-	@$(MKDIR) -p $(@D)
-	$(DX) --dex --output=$@ $(PATH_BUILD_CLASSES_PLUGIN_TOP)
+$(PATH_BUILD_LIBSCUMMVM): libscummvm.so | $(PATH_BUILD)
+	$(INSTALL) -c -m 644 libscummvm.so $(PATH_BUILD)
+	$(STRIP) $(PATH_BUILD)/libscummvm.so
+	cd $(PATH_BUILD); $(NDK_BUILD)
 
-$(PATH_BUILD)/%/AndroidManifest.xml: $(PATH_DIST)/mkplugin.sh $(srcdir)/configure $(PATH_DIST)/plugin-manifest.xml
-	@$(MKDIR) -p $(@D)
-	$(PATH_DIST)/mkplugin.sh $(srcdir)/configure $* $(PATH_DIST)/plugin-manifest.xml $(ANDROID_PLUGIN_VERSIONCODE) $@
+$(PATH_BUILD_RES): $(RESOURCES) | $(PATH_BUILD)
 
-$(PATH_STAGE_PREFIX).%/res/values/strings.xml: $(PATH_DIST)/mkplugin.sh $(srcdir)/configure $(PATH_DIST)/plugin-manifest.xml
-	@$(MKDIR) -p $(@D)
-	$(PATH_DIST)/mkplugin.sh $(srcdir)/configure $* $(PATH_DIST)/plugin-strings.xml $(ANDROID_PLUGIN_VERSIONCODE) $@
+setupapk: $(FILE_MANIFEST) $(PATH_BUILD_RES) $(PATH_BUILD_ASSETS) $(PATH_BUILD_LIBSCUMMVM) | $(PATH_BUILD)
+	$(SDK_ANDROID) update project -p $(PATH_BUILD) -t android-$(ANDROID_TARGET_VERSION) -n ScummVM
 
-$(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png: $(PATH_RESOURCES)/drawable/scummvm.png
-	@$(MKDIR) -p $(@D)
-	$(CP) $< $@
+$(APK_MAIN): setupapk | $(PATH_BUILD)
+	(cd $(PATH_BUILD); ant debug -Dsource.dir="$(realpath $(DIST_JAVA_SRC_DIR))")
+	$(CP) $(PATH_BUILD)/bin/ScummVM-debug.apk $@
 
-$(FILE_RESOURCES_MAIN): $(FILE_MANIFEST) $(RESOURCES) $(ANDROID_JAR) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA)
-	$(INSTALL) -d $(PATH_BUILD_ASSETS)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(PATH_BUILD_ASSETS)/
-	work_dir=`pwd`; \
-	for i in $(PATH_BUILD_ASSETS)/*.zip; do \
-		echo "recompress $$i"; \
-		cd "$$work_dir"; \
-		$(RM) -rf $(PATH_BUILD_ASSETS)/tmp; \
-		$(MKDIR) $(PATH_BUILD_ASSETS)/tmp; \
-		unzip -q $$i -d $(PATH_BUILD_ASSETS)/tmp; \
-		cd $(PATH_BUILD_ASSETS)/tmp; \
-		zip -r ../`basename $$i` *; \
-	done
-	@$(RM) -rf $(PATH_BUILD_ASSETS)/tmp
-	$(AAPT) package -f -0 zip -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR) -F $@
-
-$(PATH_BUILD)/%/$(FILE_RESOURCES): $(PATH_BUILD)/%/AndroidManifest.xml $(PATH_STAGE_PREFIX).%/res/values/strings.xml $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png plugins/lib%.so $(ANDROID_JAR)
-	$(AAPT) package -f -M $< -S $(PATH_STAGE_PREFIX).$*/res -I $(ANDROID_JAR) -F $@
-
-# Package installer won't delete old libscummvm.so on upgrade so
-# replace it with a zero size file
-$(APK_MAIN): $(EXECUTABLE) $(FILE_RESOURCES_MAIN) $(FILE_DEX)
-	$(INSTALL) -d $(PATH_STAGE_MAIN)/common/lib/armeabi
-	touch $(PATH_STAGE_MAIN)/common/lib/armeabi/libscummvm.so
-	$(INSTALL) -d $(PATH_STAGE_MAIN)/common/mylib/armeabi
-	$(INSTALL) -c -m 644 libscummvm.so $(PATH_STAGE_MAIN)/common/mylib/armeabi/
-	$(STRIP) $(PATH_STAGE_MAIN)/common/mylib/armeabi/libscummvm.so
-	$(APKBUILDER) $@ -z $(FILE_RESOURCES_MAIN) -f $(FILE_DEX) -rf $(PATH_STAGE_MAIN)/common || { $(RM) $@; exit 1; }
-
-scummvm-engine-%.apk: plugins/lib%.so $(PATH_BUILD)/%/$(FILE_RESOURCES) $(FILE_DEX_PLUGIN)
-	$(INSTALL) -d $(PATH_STAGE_PREFIX).$*/apk/mylib/armeabi/
-	$(INSTALL) -c -m 644 plugins/lib$*.so $(PATH_STAGE_PREFIX).$*/apk/mylib/armeabi/
-	$(STRIP) $(PATH_STAGE_PREFIX).$*/apk/mylib/armeabi/lib$*.so
-	$(APKBUILDER) $@ -z $(PATH_BUILD)/$*/$(FILE_RESOURCES) -f $(FILE_DEX_PLUGIN) -rf $(PATH_STAGE_PREFIX).$*/apk || { $(RM) $@; exit 1; }
-
-all: $(APK_MAIN) $(APK_PLUGINS)
+$(APK_MAIN_RELEASE): setupapk | $(PATH_BUILD)
+	(cd $(PATH_BUILD); ant release -Dsource.dir="$(realpath $(DIST_JAVA_SRC_DIR))")
+	$(CP) $(PATH_BUILD)/bin/ScummVM-release-unsigned.apk $@
+
+all: $(APK_MAIN)
 
 clean: androidclean
 
 androidclean:
-	@$(RM) -rf $(PATH_BUILD) $(PATH_STAGE_PREFIX).* *.apk release
-
-# remove debugging signature
-release/%.apk: %.apk
-	@$(MKDIR) -p $(@D)
-	@$(RM) $@
-	$(CP) $< $@.tmp
-	zip -d $@.tmp META-INF/\*
-	jarsigner $(JARSIGNER_FLAGS) $@.tmp release
-	zipalign 4 $@.tmp $@
-	$(RM) $@.tmp
+	@$(RM) -rf $(PATH_BUILD) *.apk release
 
-androidrelease: $(addprefix release/, $(APK_MAIN) $(APK_PLUGINS))
+androidrelease: $(APK_MAIN_RELEASE)
 
 androidtestmain: $(APK_MAIN)
 	$(ADB) install -r $(APK_MAIN)
@@ -198,4 +107,4 @@ androiddistdebug: all
 		sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \
 	done
 
-.PHONY: androidrelease androidtest
+.PHONY: androidrelease androidtest $(PATH_BUILD_SRC)
diff --git a/dists/android/custom_rules.xml b/dists/android/custom_rules.xml
new file mode 100644
index 0000000000..5ed81b7273
--- /dev/null
+++ b/dists/android/custom_rules.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="custom_rules">
+    <!-- Override the built-in aapt task, don't compress assets. -->
+    <target name="-package-resources" depends="-crunch">
+        <!-- only package resources if *not* a library project -->
+        <do-only-if-not-library elseText="Library project: do not package resources..." >
+            <aapt executable="${aapt}"
+                    command="package"
+                    versioncode="${version.code}"
+                    versionname="${version.name}"
+                    debug="${build.is.packaging.debug}"
+                    manifest="${out.manifest.abs.file}"
+                    assets="${asset.absolute.dir}"
+                    androidjar="${project.target.android.jar}"
+                    apkfolder="${out.absolute.dir}"
+                    nocrunch="${build.packaging.nocrunch}"
+                    resourcefilename="${resource.package.file.name}"
+                    resourcefilter="${aapt.resource.filter}"
+                    libraryResFolderPathRefid="project.library.res.folder.path"
+                    libraryPackagesRefid="project.library.packages"
+                    libraryRFileRefid="project.library.bin.r.file.path"
+                    previousBuildType="${build.last.target}"
+                    buildType="${build.target}"
+                    ignoreAssets="${aapt.ignore.assets}">
+                <res path="${out.res.absolute.dir}" />
+                <res path="${resource.absolute.dir}" />
+                <nocompress /> <!-- forces no compression on any files in assets or res/raw -->
+            </aapt>
+        </do-only-if-not-library>
+    </target>
+</project>
diff --git a/dists/android/jni/Android.mk b/dists/android/jni/Android.mk
new file mode 100644
index 0000000000..d5b398412f
--- /dev/null
+++ b/dists/android/jni/Android.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+APP_ABI := armeabi
+LOCAL_MODULE := scummvm
+LOCAL_SRC_FILES := ../libscummvm.so
+
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/dists/android/project.properties b/dists/android/project.properties
new file mode 100644
index 0000000000..730e911f2f
--- /dev/null
+++ b/dists/android/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-14
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 31aa345cc7..8b0d515d62 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -9,8 +9,4 @@
 	android:keepScreenOn="true"
 	android:focusable="true"
 	android:focusableInTouchMode="true"
-	android:layout_marginTop="@dimen/verticalMargin"
-	android:layout_marginLeft="@dimen/horizontalMargin"
-	android:layout_marginBottom="@dimen/verticalMargin"
-	android:layout_marginRight="@dimen/horizontalMargin"
 />
-- 
cgit v1.2.3


From 8480f53d6005b5873964ca1015644ae6925e6ede Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 29 Jul 2014 21:02:28 -0400
Subject: ACCESS: Initial engine skeleton

---
 engines/access/access.cpp         |  61 ++++++++++++++++
 engines/access/access.h           |  94 ++++++++++++++++++++++++
 engines/access/configure.engine   |   3 +
 engines/access/debugger.cpp       |  33 +++++++++
 engines/access/debugger.h         |  45 ++++++++++++
 engines/access/detection.cpp      | 146 ++++++++++++++++++++++++++++++++++++++
 engines/access/detection_tables.h |  47 ++++++++++++
 engines/access/module.mk          |  14 ++++
 8 files changed, 443 insertions(+)
 create mode 100644 engines/access/access.cpp
 create mode 100644 engines/access/access.h
 create mode 100644 engines/access/configure.engine
 create mode 100644 engines/access/debugger.cpp
 create mode 100644 engines/access/debugger.h
 create mode 100644 engines/access/detection.cpp
 create mode 100644 engines/access/detection_tables.h
 create mode 100644 engines/access/module.mk

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
new file mode 100644
index 0000000000..f3615e10da
--- /dev/null
+++ b/engines/access/access.cpp
@@ -0,0 +1,61 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/debug-channels.h"
+#include "common/events.h"
+#include "engines/util.h"
+#include "access/access.h"
+
+namespace Access {
+
+AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
+		_gameDescription(gameDesc), Engine(syst), _randomSource("Access") {
+	_debugger = nullptr;
+}
+
+AccessEngine::~AccessEngine() {
+	delete _debugger;
+}
+
+void AccessEngine::initialize() {
+	// Set up debug channels
+	DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
+	DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
+	DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
+
+	_debugger = new Debugger(this);
+}
+
+Common::Error AccessEngine::run() {
+	initGraphics(320, 200, false);
+	initialize();
+
+	return Common::kNoError;
+}
+
+int AccessEngine::getRandomNumber(int maxNumber) {
+	return _randomSource.getRandomNumber(maxNumber);
+}
+
+} // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
new file mode 100644
index 0000000000..f46cf0094c
--- /dev/null
+++ b/engines/access/access.h
@@ -0,0 +1,94 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_ACCESS_H
+#define ACCESS_ACCESS_H
+
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "common/error.h"
+#include "common/random.h"
+#include "common/util.h"
+#include "engines/engine.h"
+#include "graphics/surface.h"
+#include "access/debugger.h"
+
+/**
+ * This is the namespace of the Access engine.
+ *
+ * Status of this engine: In Development
+ *
+ * Games using this engine:
+ * - Amazon: Guardians of Eden
+ */
+namespace Access {
+
+#define DEBUG_BASIC 1
+#define DEBUG_INTERMEDIATE 2
+#define DEBUG_DETAILED 3
+
+enum AccessDebugChannels {
+	kDebugPath      = 1 << 0,
+	kDebugScripts	= 1 << 1,
+	kDebugGraphics	= 1 << 2
+};
+
+enum {
+	GType_Amazon = 0,
+	GType_MeanStreets = 1
+};
+
+struct AccessGameDescription;
+
+
+class AccessEngine : public Engine {
+private:
+	const AccessGameDescription *_gameDescription;
+	Common::RandomSource _randomSource;
+
+	/**
+	 * Handles basic initialisation
+	 */
+	void initialize();
+protected:
+	// Engine APIs
+	virtual Common::Error run();
+	virtual bool hasFeature(EngineFeature f) const;
+public:
+	Debugger *_debugger;
+public:
+	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
+	virtual ~AccessEngine();
+
+	uint32 getFeatures() const;
+	Common::Language getLanguage() const;
+	Common::Platform getPlatform() const;
+	uint16 getVersion() const;
+	uint32 getGameID() const;
+	uint32 getGameFeatures() const;
+
+	int getRandomNumber(int maxNumber);
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_ACCESS_H */
diff --git a/engines/access/configure.engine b/engines/access/configure.engine
new file mode 100644
index 0000000000..b1defce946
--- /dev/null
+++ b/engines/access/configure.engine
@@ -0,0 +1,3 @@
+# This file is included from the main "configure" script
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+add_engine access "Access" no
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
new file mode 100644
index 0000000000..e92e3402ac
--- /dev/null
+++ b/engines/access/debugger.cpp
@@ -0,0 +1,33 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/file.h"
+#include "access/access.h"
+#include "access/debugger.h"
+
+namespace Access {
+
+Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
+	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
+}
+
+} // End of namespace Access
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
new file mode 100644
index 0000000000..dcf49c4ecd
--- /dev/null
+++ b/engines/access/debugger.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_DEBUGGER_H
+#define ACCESS_DEBUGGER_H
+
+#include "common/scummsys.h"
+#include "gui/debugger.h"
+
+namespace Access {
+
+class AccessEngine;
+
+class Debugger : public GUI::Debugger {
+private:
+	AccessEngine *_vm;
+protected:
+public:
+public:
+	Debugger(AccessEngine *vm);
+	virtual ~Debugger() {}
+};
+
+} // End of namespace Access
+
+#endif	/* ACCESS_DEBUGGER_H */
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
new file mode 100644
index 0000000000..aca594d60d
--- /dev/null
+++ b/engines/access/detection.cpp
@@ -0,0 +1,146 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ */
+
+#include "access/access.h"
+
+#include "base/plugins.h"
+#include "common/savefile.h"
+#include "common/str-array.h"
+#include "common/memstream.h"
+#include "engines/advancedDetector.h"
+#include "common/system.h"
+#include "graphics/colormasks.h"
+#include "graphics/surface.h"
+
+#define MAX_SAVES 99
+
+namespace Access {
+
+struct AccessGameDescription {
+	ADGameDescription desc;
+
+	int gameID;
+	uint32 features;
+};
+
+uint32 AccessEngine::getGameID() const {
+	return _gameDescription->gameID;
+}
+
+uint32 AccessEngine::getGameFeatures() const {
+	return _gameDescription->features;
+}
+
+uint32 AccessEngine::getFeatures() const {
+	return _gameDescription->desc.flags;
+}
+
+Common::Language AccessEngine::getLanguage() const {
+	return _gameDescription->desc.language;
+}
+
+Common::Platform AccessEngine::getPlatform() const {
+	return _gameDescription->desc.platform;
+}
+
+} // End of namespace Access
+
+static const PlainGameDescriptor AccessGames[] = {
+	{"Access", "Access"},
+	{"amazon", "Amazon: Guardians of Eden"},
+	{0, 0}
+};
+
+#include "access/detection_tables.h"
+
+class AccessMetaEngine : public AdvancedMetaEngine {
+public:
+	AccessMetaEngine() : AdvancedMetaEngine(Access::gameDescriptions, sizeof(Access::AccessGameDescription), AccessGames) {
+		_maxScanDepth = 3;
+	}
+
+	virtual const char *getName() const {
+		return "Access Engine";
+	}
+
+	virtual const char *getOriginalCopyright() const {
+		return "Access (c)";
+	}
+
+	virtual bool hasFeature(MetaEngineFeature f) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+	virtual SaveStateList listSaves(const char *target) const;
+	virtual int getMaximumSaveSlot() const;
+	virtual void removeSaveState(const char *target, int slot) const;
+	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+};
+
+bool AccessMetaEngine::hasFeature(MetaEngineFeature f) const {
+	return
+	    (f == kSupportsListSaves) ||
+		(f == kSupportsLoadingDuringStartup) ||
+		(f == kSupportsDeleteSave) ||
+		(f == kSavesSupportMetaInfo) ||
+		(f == kSavesSupportThumbnail);
+}
+
+bool Access::AccessEngine::hasFeature(EngineFeature f) const {
+	return
+		(f == kSupportsRTL) ||
+		(f == kSupportsLoadingDuringRuntime) ||
+		(f == kSupportsSavingDuringRuntime);
+}
+
+bool AccessMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+	const Access::AccessGameDescription *gd = (const Access::AccessGameDescription *)desc;
+	if (gd) {
+		*engine = new Access::AccessEngine(syst, gd);
+	}
+	return gd != 0;
+}
+
+SaveStateList AccessMetaEngine::listSaves(const char *target) const {
+	SaveStateList saveList;
+
+	return saveList;
+}
+
+int AccessMetaEngine::getMaximumSaveSlot() const {
+	return MAX_SAVES;
+}
+
+void AccessMetaEngine::removeSaveState(const char *target, int slot) const {
+	Common::String filename = Common::String::format("%s.%03d", target, slot);
+	g_system->getSavefileManager()->removeSavefile(filename);
+}
+
+SaveStateDescriptor AccessMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+	return SaveStateDescriptor();
+}
+
+
+#if PLUGIN_ENABLED_DYNAMIC(ACCESS)
+	REGISTER_PLUGIN_DYNAMIC(ACCESS, PLUGIN_TYPE_ENGINE, AccessMetaEngine);
+#else
+	REGISTER_PLUGIN_STATIC(ACCESS, PLUGIN_TYPE_ENGINE, AccessMetaEngine);
+#endif
diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
new file mode 100644
index 0000000000..9100e52e30
--- /dev/null
+++ b/engines/access/detection_tables.h
@@ -0,0 +1,47 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+namespace Access {
+
+static const AccessGameDescription gameDescriptions[] = {
+	{
+		// Amazon Guadians of Eden
+		{
+			"amazon",
+			0,
+			{
+				{"amazon", 0, "00000000000000000000000000000000", 1},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+		GType_Amazon,
+		0
+	},
+
+	{ AD_TABLE_END_MARKER, 0, 0 }
+};
+
+} // End of namespace Access
diff --git a/engines/access/module.mk b/engines/access/module.mk
new file mode 100644
index 0000000000..c61ab50fae
--- /dev/null
+++ b/engines/access/module.mk
@@ -0,0 +1,14 @@
+MODULE := engines/access
+
+MODULE_OBJS := \
+	access.o \
+	debugger.o \
+	detection.o
+
+# This module can be built as a plugin
+ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
+PLUGIN := 1
+endif
+
+# Include common rules
+include $(srcdir)/rules.mk
-- 
cgit v1.2.3


From 83f55f737b3eab7be2236de1bf31035024400e43 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 29 Jul 2014 22:49:45 -0400
Subject: ACCESS: Main engine skeleton and events manager

---
 engines/access/access.cpp |   3 ++
 engines/access/access.h   |   7 +++
 engines/access/events.cpp | 106 ++++++++++++++++++++++++++++++++++++++++++++++
 engines/access/events.h   |  86 +++++++++++++++++++++++++++++++++++++
 engines/access/module.mk  |   3 +-
 5 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 engines/access/events.cpp
 create mode 100644 engines/access/events.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index f3615e10da..23b8fb9f45 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -32,10 +32,12 @@ namespace Access {
 AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 		_gameDescription(gameDesc), Engine(syst), _randomSource("Access") {
 	_debugger = nullptr;
+	_events = nullptr;
 }
 
 AccessEngine::~AccessEngine() {
 	delete _debugger;
+	delete _events;
 }
 
 void AccessEngine::initialize() {
@@ -45,6 +47,7 @@ void AccessEngine::initialize() {
 	DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
 
 	_debugger = new Debugger(this);
+	_events = new EventsManager(this);
 }
 
 Common::Error AccessEngine::run() {
diff --git a/engines/access/access.h b/engines/access/access.h
index f46cf0094c..ef9960e007 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -31,6 +31,7 @@
 #include "engines/engine.h"
 #include "graphics/surface.h"
 #include "access/debugger.h"
+#include "access/events.h"
 
 /**
  * This is the namespace of the Access engine.
@@ -64,6 +65,11 @@ class AccessEngine : public Engine {
 private:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
+	
+	Graphics::Surface _buffer1;
+	Graphics::Surface _buffer2;
+	Graphics::Surface _vidbuf;
+	Graphics::Surface _plotBuf;
 
 	/**
 	 * Handles basic initialisation
@@ -75,6 +81,7 @@ protected:
 	virtual bool hasFeature(EngineFeature f) const;
 public:
 	Debugger *_debugger;
+	EventsManager *_events;
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
new file mode 100644
index 0000000000..47908ff1cb
--- /dev/null
+++ b/engines/access/events.cpp
@@ -0,0 +1,106 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "graphics/cursorman.h"
+#include "common/events.h"
+#include "engines/util.h"
+#include "access/access.h"
+#include "access/events.h"
+
+namespace Access {
+
+EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
+	_cursorId = CURSOR_NONE;
+	_frameCounter = 10;
+	_priorFrameTime = 0;
+	_leftButton = false;
+}
+
+EventsManager::~EventsManager() {
+}
+
+void EventsManager::setCursor(CursorType cursorId) {
+	_cursorId = cursorId;
+}
+
+void EventsManager::showCursor() {
+	CursorMan.showMouse(true);
+}
+
+void EventsManager::hideCursor() {
+	CursorMan.showMouse(false);
+}
+
+bool EventsManager::isCursorVisible() {
+	return CursorMan.isVisible();
+}
+
+void EventsManager::pollEvents() {
+	checkForNextFrameCounter();
+
+	Common::Event event;
+	while (g_system->getEventManager()->pollEvent(event)) {
+		// Handle keypress
+		switch (event.type) {
+		case Common::EVENT_QUIT:
+		case Common::EVENT_RTL:
+			return;
+
+		case Common::EVENT_KEYDOWN:
+			// Check for debugger
+			if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL)) {
+				// Attach to the debugger
+				_vm->_debugger->attach();
+				_vm->_debugger->onFrame();
+			}
+			return;
+		case Common::EVENT_KEYUP:
+			return;
+		case Common::EVENT_LBUTTONDOWN:
+			_leftButton = true;
+			break;
+		case Common::EVENT_LBUTTONUP:
+			_leftButton = false;
+			break;
+		default:
+ 			break;
+		}
+	}
+}
+
+void EventsManager::checkForNextFrameCounter() {
+	// Check for next game frame
+	uint32 milli = g_system->getMillis();
+	if ((milli - _priorFrameTime) >= GAME_FRAME_TIME) {
+		++_frameCounter;
+		_priorFrameTime = milli;
+
+		// Give time to the debugger
+		_vm->_debugger->onFrame();
+
+		// Signal the ScummVM debugger
+		_vm->_debugger->onFrame();
+	}
+}
+
+} // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
new file mode 100644
index 0000000000..b30670cdbc
--- /dev/null
+++ b/engines/access/events.h
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_EVENTS_H
+#define ACCESS_EVENTS_H
+
+#include "common/scummsys.h"
+#include "common/events.h"
+#include "common/stack.h"
+
+namespace Access {
+
+enum CursorType { CURSOR_NONE = 0 };
+
+#define GAME_FRAME_RATE 50
+#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
+
+class AccessEngine;
+
+class EventsManager {
+private:
+	AccessEngine *_vm;
+	uint32 _frameCounter;
+	uint32 _priorFrameTime;
+	Common::Point _mousePos;
+
+	void checkForNextFrameCounter();
+public:
+	CursorType _cursorId;
+	bool _leftButton;
+public:
+	/**
+	 * Constructor
+	 */
+	EventsManager(AccessEngine *vm);
+
+	/**
+	 * Destructor
+	 */
+	~EventsManager();
+
+	/**
+	 * Sets the cursor
+	 */
+	void setCursor(CursorType cursorId);
+
+	/**
+	 * Show the mouse cursor
+	 */
+	void showCursor();
+
+	/**
+	 * Hide the mouse cursor
+	 */
+	void hideCursor();
+
+	/**
+	 * Returns if the mouse cursor is visible
+	 */
+	bool isCursorVisible();
+
+	void pollEvents();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_EVENTS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index c61ab50fae..a6f352f1a5 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -3,7 +3,8 @@ MODULE := engines/access
 MODULE_OBJS := \
 	access.o \
 	debugger.o \
-	detection.o
+	detection.o \
+	events.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
-- 
cgit v1.2.3


From c2451b57bccc2a425a6e1376c2a116df48b1fcc6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 Aug 2014 15:21:21 -0400
Subject: ACCESS: Added resources for cursors

---
 engines/access/module.mk     |   3 +-
 engines/access/resources.cpp | 156 +++++++++++++++++++++++++++++++++++++++++++
 engines/access/resources.h   |  49 ++++++++++++++
 3 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 engines/access/resources.cpp
 create mode 100644 engines/access/resources.h

diff --git a/engines/access/module.mk b/engines/access/module.mk
index a6f352f1a5..11630335d1 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -4,7 +4,8 @@ MODULE_OBJS := \
 	access.o \
 	debugger.o \
 	detection.o \
-	events.o
+	events.o \
+	resources.o \
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
new file mode 100644
index 0000000000..4ab3dd9513
--- /dev/null
+++ b/engines/access/resources.cpp
@@ -0,0 +1,156 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, 0xwhose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, 0xor (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, 0xwrite to the Free Software
+ * Foundation, 0xInc., 0x51 Franklin Street, 0xFifth Floor, 0xBoston, 0xMA 02110-1301, 0xUSA.
+ *
+ */
+
+#include "access/resources.h"
+
+namespace Access {
+
+namespace Amazon {
+
+const byte *CURSORS[10] = {
+	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
+};
+
+const byte MOUSE0[] = {
+	0, 0, 0, 0, 0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
+	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
+	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
+	6, 6, 6, 6, 6, 1, 0, 7, 6, 6, 6, 6, 6, 6, 1, 0, 6, 6,
+	6, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6, 1, 2, 3, 6, 6, 1, 3,
+	3, 6, 6, 1, 3, 3, 6, 6, 1, 4, 2, 6, 1
+};
+const byte MOUSE1[] = {
+	0x07, 0x00, 0x07, 0x00, 0x06, 0x01, 0x05, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x03, 0x07,
+	0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
+	0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01,
+	0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x0D, 0x05, 0x00,
+	0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05, 0x01, 0x0B, 0xFF, 0x00, 0x00,
+	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
+	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+	0x06, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte MOUSE2[] = {
+	0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x02, 0x0C, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02,
+	0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+const byte MOUSE3[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05, 0x00,
+	0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 0x00, 0x0C, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00,
+	0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x01, 0x0B, 0x05, 0x05, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte CURSEYE[] = {
+	0x01, 0x00, 0x08, 0x00, 0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x03, 0x09, 0x0E, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D, 0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33,
+	0x34, 0x01, 0x01, 0x0D, 0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04,
+	0x04, 0x01, 0x0D, 0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07,
+	0x07, 0x06, 0x01, 0x0E, 0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07,
+	0x06, 0x0F, 0x0E, 0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x01, 0x01,
+	0x07, 0x00, 0x03, 0x07, 0x01, 0x07, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte CURSHAND[] = {
+	0x02, 0x00, 0x03, 0x00, 0x07, 0x02, 0x17, 0x0E, 0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17,
+	0x0E, 0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17, 0x01,
+	0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E, 0x02,
+	0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E, 0x04, 0x0B,
+	0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x04, 0x0B, 0x17, 0x0E, 0x12,
+	0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F,
+	0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F, 0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F,
+	0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E,
+	0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, 0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E,
+	0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12, 0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F,
+	0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F,
+	0x0F, 0x0E, 0x0D, 0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x08,
+	0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E,
+	0x0D
+};
+const byte CURSGET[] = {
+	0x07, 0x00, 0x0E, 0x00, 0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x08, 0x08, 0x1C, 0x07, 0x0F,
+	0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+	0x0C, 0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x03, 0x0C, 0x07,
+	0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x02, 0x0D, 0x1C, 0x0F, 0x0E,
+	0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0E, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0E,
+	0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C, 0x00, 0x0D, 0x1C, 0x0D,
+	0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C, 0x01, 0x0B, 0x0E, 0x0F, 0x0E,
+	0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C, 0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07,
+	0x0E, 0x0F, 0x0C, 0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07, 0x07, 0x01, 0x07
+};
+const byte CURSCLIMB[] = {
+	0x03, 0x00, 0x0E, 0x00, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
+	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01, 0x07, 0x02, 0x0F, 0x0D, 0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00,
+	0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11, 0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14,
+	0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E, 0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13,
+	0x12, 0x11, 0x11, 0x0E, 0x0D, 0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00,
+	0x00, 0x0E, 0x0D, 0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
+	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E, 0x03,
+	0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20, 0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
+	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20, 0x03, 0x09, 0x07, 0x01, 0x01,
+	0x00, 0x00, 0x00, 0x22, 0x04, 0x20, 0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x01, 0x20, 0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
+};
+const byte CURSTALK[] = {
+	0x02, 0x00, 0x0B, 0x00, 0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x0C,
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x00, 0x0E, 0x06, 0x06,
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x00, 0x0F, 0x06, 0x08,
+	0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x00, 0x0F, 0x06,
+	0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06, 0x00, 0x0F,
+	0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x01,
+	0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x02,
+	0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 0x09, 0x06,
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x02, 0x08,
+	0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
+	0x02, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte CURSHELP[] = {
+	0x02, 0x00, 0x0B, 0x00, 0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x02, 0x0A, 0x24, 0x24,
+	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20,
+	0x20, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00,
+	0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
+	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
+	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24,
+	0x22, 0x22, 0x22, 0x22, 0x20, 0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x05, 0x07, 0x24,
+	0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20, 0x02, 0x07, 0x07,
+	0x00, 0x24, 0x20, 0x20, 0x20, 0x20, 0x01, 0x03, 0x07, 0x01, 0x07, 0x02, 0x07, 0x07, 0x00, 0x00,
+	0x24, 0x24, 0x24, 0x24, 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x04, 0x06, 0x24, 0x22,
+	0x22, 0x22, 0x22, 0x20, 0x05, 0x04, 0x20, 0x20, 0x20, 0x20
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
new file mode 100644
index 0000000000..cabaac96a1
--- /dev/null
+++ b/engines/access/resources.h
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_RESOURCES_H
+#define ACCESS_RESOURCES_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+namespace Amazon {
+
+extern const byte MOUSE0[];
+extern const byte MOUSE1[];
+extern const byte MOUSE2[];
+extern const byte MOUSE3[];
+extern const byte CURSEYE[];
+extern const byte CURSHAND[];
+extern const byte CURSGET[];
+extern const byte CURSCLIMB[];
+extern const byte CURSTALK[];
+extern const byte CURSHELP[];
+
+extern const byte *CURSORS[10];
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_EVENTS_H */
-- 
cgit v1.2.3


From 4d24209eae5e776fe150775771e7cd70579a518e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 Aug 2014 16:20:24 -0400
Subject: ACCESS: Add Amazon floppy detection and skeleton for Amazon engine

---
 engines/access/access.cpp             |  6 ++++-
 engines/access/access.h               |  7 ++----
 engines/access/amazon/amazon_game.cpp | 35 ++++++++++++++++++++++++++++
 engines/access/amazon/amazon_game.h   | 43 +++++++++++++++++++++++++++++++++++
 engines/access/detection.cpp          |  9 +++++++-
 engines/access/detection_tables.h     |  9 ++++++--
 engines/access/module.mk              |  1 +
 7 files changed, 101 insertions(+), 9 deletions(-)
 create mode 100644 engines/access/amazon/amazon_game.cpp
 create mode 100644 engines/access/amazon/amazon_game.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 23b8fb9f45..e4b4159f9b 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -51,7 +51,6 @@ void AccessEngine::initialize() {
 }
 
 Common::Error AccessEngine::run() {
-	initGraphics(320, 200, false);
 	initialize();
 
 	return Common::kNoError;
@@ -61,4 +60,9 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
+void AccessEngine::SETVGA() {
+	initGraphics(320, 200, false);
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index ef9960e007..5c9207db22 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -53,11 +53,6 @@ enum AccessDebugChannels {
 	kDebugGraphics	= 1 << 2
 };
 
-enum {
-	GType_Amazon = 0,
-	GType_MeanStreets = 1
-};
-
 struct AccessGameDescription;
 
 
@@ -75,6 +70,8 @@ private:
 	 * Handles basic initialisation
 	 */
 	void initialize();
+
+	void SETVGA();
 protected:
 	// Engine APIs
 	virtual Common::Error run();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
new file mode 100644
index 0000000000..2b4196a406
--- /dev/null
+++ b/engines/access/amazon/amazon_game.cpp
@@ -0,0 +1,35 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/amazon/amazon_game.h"
+
+namespace Access {
+
+namespace Amazon {
+
+AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
+		AccessEngine(syst, gameDesc) {
+}
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
new file mode 100644
index 0000000000..1bccd1cedc
--- /dev/null
+++ b/engines/access/amazon/amazon_game.h
@@ -0,0 +1,43 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_GAME_H
+#define ACCESS_AMAZON_GAME_H
+
+#include "access/access.h"
+
+namespace Access {
+
+namespace Amazon {
+
+class AmazonEngine : public AccessEngine {
+public:
+	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
+
+	virtual ~AmazonEngine() {}
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_ACCESS_H */
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index aca594d60d..ca04a64b0d 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "access/access.h"
+#include "access/amazon/amazon_game.h"
 
 #include "base/plugins.h"
 #include "common/savefile.h"
@@ -114,7 +115,13 @@ bool Access::AccessEngine::hasFeature(EngineFeature f) const {
 bool AccessMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Access::AccessGameDescription *gd = (const Access::AccessGameDescription *)desc;
 	if (gd) {
-		*engine = new Access::AccessEngine(syst, gd);
+		switch (gd->gameID) {
+		case Access::GType_Amazon:
+			*engine = new Access::Amazon::AmazonEngine(syst, gd);
+			break;
+		default:
+			error("Unknown game");
+		}
 	}
 	return gd != 0;
 }
diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index 9100e52e30..90304290f1 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -22,14 +22,19 @@
 
 namespace Access {
 
+enum {
+	GType_Amazon = 1,
+	GType_MeanStreets = 2
+};
+
 static const AccessGameDescription gameDescriptions[] = {
 	{
-		// Amazon Guadians of Eden
+		// Amazon Guadians of Eden - Floppy English
 		{
 			"amazon",
 			0,
 			{
-				{"amazon", 0, "00000000000000000000000000000000", 1},
+				{ "c00.ap", 0, "dcabf69d5a0d911168cb73511ebaead0", 331481 },
 				AD_LISTEND
 			},
 			Common::EN_ANY,
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 11630335d1..f04e51630e 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -6,6 +6,7 @@ MODULE_OBJS := \
 	detection.o \
 	events.o \
 	resources.o \
+	amazon\amazon_game.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
-- 
cgit v1.2.3


From 857f94423fcf4464df44e5b46241f68e33f800a3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 Aug 2014 21:32:05 -0400
Subject: ACCESS: Implement decoding of game cursors

---
 engines/access/access.cpp    | 27 +++++++++++++++++++++-
 engines/access/access.h      | 20 ++++++++--------
 engines/access/events.cpp    | 54 +++++++++++++++++++++++++++++++++++++++++---
 engines/access/events.h      | 11 ++++++++-
 engines/access/graphics.cpp  | 46 +++++++++++++++++++++++++++++++++++++
 engines/access/graphics.h    | 51 +++++++++++++++++++++++++++++++++++++++++
 engines/access/module.mk     |  1 +
 engines/access/resources.cpp | 24 +++++++++++++++++++-
 engines/access/resources.h   |  2 ++
 9 files changed, 221 insertions(+), 15 deletions(-)
 create mode 100644 engines/access/graphics.cpp
 create mode 100644 engines/access/graphics.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index e4b4159f9b..8aabac2b0b 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -33,11 +33,13 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		_gameDescription(gameDesc), Engine(syst), _randomSource("Access") {
 	_debugger = nullptr;
 	_events = nullptr;
+	_graphics = nullptr;
 }
 
 AccessEngine::~AccessEngine() {
 	delete _debugger;
 	delete _events;
+	delete _graphics;
 }
 
 void AccessEngine::initialize() {
@@ -48,19 +50,42 @@ void AccessEngine::initialize() {
 
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
+	_graphics = new GraphicsManager(this);
 }
 
 Common::Error AccessEngine::run() {
 	initialize();
 
+	setVGA();
+	_graphics->setPalettte();
+	_graphics->setPanel(0);
+	_events->setCursor(CURSOR_0);
+	_events->showCursor();
+
+	dummyLoop();
 	return Common::kNoError;
 }
 
+void AccessEngine::dummyLoop() {
+	// Dummy game loop
+	while (!shouldQuit()) {
+		_events->pollEvents();
+		g_system->delayMillis(50);
+		g_system->updateScreen();
+
+		if (_events->_leftButton) {
+			CursorType cursorId = _events->getCursor();
+			_events->setCursor((cursorId == CURSOR_HELP) ? CURSOR_0 : (CursorType)(cursorId + 1));
+		}
+	}
+
+}
+
 int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
-void AccessEngine::SETVGA() {
+void AccessEngine::setVGA() {
 	initGraphics(320, 200, false);
 }
 
diff --git a/engines/access/access.h b/engines/access/access.h
index 5c9207db22..16487ea64f 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -32,6 +32,7 @@
 #include "graphics/surface.h"
 #include "access/debugger.h"
 #include "access/events.h"
+#include "access/graphics.h"
 
 /**
  * This is the namespace of the Access engine.
@@ -58,27 +59,28 @@ struct AccessGameDescription;
 
 class AccessEngine : public Engine {
 private:
-	const AccessGameDescription *_gameDescription;
-	Common::RandomSource _randomSource;
-	
-	Graphics::Surface _buffer1;
-	Graphics::Surface _buffer2;
-	Graphics::Surface _vidbuf;
-	Graphics::Surface _plotBuf;
-
 	/**
 	 * Handles basic initialisation
 	 */
 	void initialize();
 
-	void SETVGA();
+	/**
+	 * Set VGA mode
+	 */
+	void setVGA();
+
+	void dummyLoop();
 protected:
+	const AccessGameDescription *_gameDescription;
+	Common::RandomSource _randomSource;
+
 	// Engine APIs
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
 public:
 	Debugger *_debugger;
 	EventsManager *_events;
+	GraphicsManager *_graphics;
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 47908ff1cb..29f6270387 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -23,9 +23,14 @@
 #include "common/scummsys.h"
 #include "graphics/cursorman.h"
 #include "common/events.h"
+#include "common/endian.h"
 #include "engines/util.h"
 #include "access/access.h"
 #include "access/events.h"
+#include "access/resources.h"
+
+#define CURSOR_WIDTH 16
+#define CURSOR_HEIGHT 16
 
 namespace Access {
 
@@ -40,7 +45,49 @@ EventsManager::~EventsManager() {
 }
 
 void EventsManager::setCursor(CursorType cursorId) {
+	if (cursorId == _cursorId)
+		return;	
 	_cursorId = cursorId;
+	
+	// Get a pointer to the mouse data to use, and get the cursor hotspot
+	const byte *srcP = Amazon::CURSORS[cursorId];
+	int hotspotX = (int16)READ_LE_UINT16(srcP);
+	int hotspotY = (int16)READ_LE_UINT16(srcP + 2);
+	srcP += 4;
+
+	// Create a surface to build up the cursor on
+	Graphics::Surface cursorSurface;
+	cursorSurface.create(16, 16, Graphics::PixelFormat::createFormatCLUT8());
+	byte *destP = (byte *)cursorSurface.getPixels();
+	Common::fill(destP, destP + CURSOR_WIDTH * CURSOR_HEIGHT, 0);
+
+	// Loop to build up the cursor
+	for (int y = 0; y < CURSOR_HEIGHT; ++y) {
+		destP = (byte *)cursorSurface.getBasePtr(0, y);
+		int width = CURSOR_WIDTH;
+		int skip = *srcP++;
+		int plot = *srcP++;
+		if (skip >= width)
+			break;
+
+		// Skip over pixels
+		destP += skip;
+		width -= skip;
+
+		// Write out the pixels to plot
+		while (plot > 0 && width > 0) {
+			*destP++ = *srcP++;
+			--plot;
+			--width;
+		}
+	}
+
+	// Set the cursor
+	CursorMan.replaceCursor(cursorSurface.getPixels(), CURSOR_WIDTH, CURSOR_HEIGHT,
+		hotspotX, hotspotY, 0);
+
+	// Free the cursor surface
+	cursorSurface.free();
 }
 
 void EventsManager::showCursor() {
@@ -58,6 +105,8 @@ bool EventsManager::isCursorVisible() {
 void EventsManager::pollEvents() {
 	checkForNextFrameCounter();
 
+	_leftButton = false;
+
 	Common::Event event;
 	while (g_system->getEventManager()->pollEvent(event)) {
 		// Handle keypress
@@ -78,10 +127,9 @@ void EventsManager::pollEvents() {
 			return;
 		case Common::EVENT_LBUTTONDOWN:
 			_leftButton = true;
-			break;
+			return;
 		case Common::EVENT_LBUTTONUP:
-			_leftButton = false;
-			break;
+			return;
 		default:
  			break;
 		}
diff --git a/engines/access/events.h b/engines/access/events.h
index b30670cdbc..3cf610ece6 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -29,7 +29,11 @@
 
 namespace Access {
 
-enum CursorType { CURSOR_NONE = 0 };
+enum CursorType { 
+	CURSOR_NONE = -1,
+	CURSOR_0 = 0, CURSOR_1, CURSOR_2, CURSOR_3, CURSOR_EYE, CURSOR_HAND, 
+	CURSOR_GET, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
+};
 
 #define GAME_FRAME_RATE 50
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
@@ -63,6 +67,11 @@ public:
 	 */
 	void setCursor(CursorType cursorId);
 
+	/**
+	 * Return the current cursor Id
+	 */
+	CursorType getCursor() const { return _cursorId; }
+
 	/**
 	 * Show the mouse cursor
 	 */
diff --git a/engines/access/graphics.cpp b/engines/access/graphics.cpp
new file mode 100644
index 0000000000..8f0e22f2b1
--- /dev/null
+++ b/engines/access/graphics.cpp
@@ -0,0 +1,46 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "graphics/palette.h"
+#include "access/access.h"
+#include "access/graphics.h"
+#include "access/resources.h"
+
+namespace Access {
+
+GraphicsManager::GraphicsManager(AccessEngine *vm) : _vm(vm) {
+	_vesaCurrentWin = 0;
+	_currentPanel = 0;
+	_hideFlag = true;
+}
+
+void GraphicsManager::setPanel(int num) {
+	assert(num < 4);
+	_currentPanel = num;
+	_msVirtualOffset = _virtualOffsetsTable[num];
+}
+
+void GraphicsManager::setPalettte() {
+	g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18);
+}
+
+} // End of namespace Access
diff --git a/engines/access/graphics.h b/engines/access/graphics.h
new file mode 100644
index 0000000000..c7d2acd54e
--- /dev/null
+++ b/engines/access/graphics.h
@@ -0,0 +1,51 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_GRAPHICS_H
+#define ACCESS_GRAPHICS_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+namespace Access {
+
+class AccessEngine;
+
+class GraphicsManager {
+private:
+	AccessEngine *_vm;
+public:
+	int _vesaCurrentWin;
+	int _currentPanel;
+	Common::Point _msVirtualOffset;
+	Common::Point _virtualOffsetsTable[4];
+	bool _hideFlag;
+public:
+	GraphicsManager(AccessEngine *vm);
+
+	void setPanel(int num);
+	void setPalettte();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_GRAPHICS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index f04e51630e..d8867bc593 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	debugger.o \
 	detection.o \
 	events.o \
+	graphics.o \
 	resources.o \
 	amazon\amazon_game.o
 
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 4ab3dd9513..cf8b491900 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -24,6 +24,27 @@
 
 namespace Access {
 
+const byte INITIAL_PALETTE[18 * 3] = {
+	0x00, 0x00, 0x00, 
+	0xff, 0xff, 0xff,
+	0xf0, 0xf0, 0xf0,
+	0xe0, 0xe0, 0xe0,
+	0xd0, 0xd0, 0xd0,
+	0xc0, 0xc0, 0xc0,
+	0xb0, 0xb0, 0xb0,
+	0xa0, 0xa0, 0xa0,
+	0x90, 0x90, 0x90,
+	0x80, 0x80, 0x80,
+	0x70, 0x70, 0x70,
+	0x60, 0x60, 0x60,
+	0x50, 0x50, 0x50,
+	0x40, 0x40, 0x40,
+	0x30, 0x30, 0x30,
+	0x20, 0x20, 0x20,
+	0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00
+};
+
 namespace Amazon {
 
 const byte *CURSORS[10] = {
@@ -31,7 +52,8 @@ const byte *CURSORS[10] = {
 };
 
 const byte MOUSE0[] = {
-	0, 0, 0, 0, 0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
+	0, 0, 0, 0, 
+	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
 	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
 	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
 	6, 6, 6, 6, 6, 1, 0, 7, 6, 6, 6, 6, 6, 6, 1, 0, 6, 6,
diff --git a/engines/access/resources.h b/engines/access/resources.h
index cabaac96a1..7bd2354c06 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -27,6 +27,8 @@
 
 namespace Access {
 
+extern const byte INITIAL_PALETTE[18 * 3];
+
 namespace Amazon {
 
 extern const byte MOUSE0[];
-- 
cgit v1.2.3


From a94bf197ef512eb7bf4dcb96ffcd459959c0d57c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Aug 2014 10:07:54 -0400
Subject: ACCESS: Implement fading routines

---
 engines/access/access.cpp             |   8 ++-
 engines/access/access.h               |   7 +++
 engines/access/amazon/amazon_game.cpp |   7 +++
 engines/access/amazon/amazon_game.h   |   2 +
 engines/access/graphics.cpp           |   4 --
 engines/access/graphics.h             |   1 -
 engines/access/module.mk              |   1 +
 engines/access/screen.cpp             | 100 ++++++++++++++++++++++++++++++++++
 engines/access/screen.h               |  72 ++++++++++++++++++++++++
 9 files changed, 195 insertions(+), 7 deletions(-)
 create mode 100644 engines/access/screen.cpp
 create mode 100644 engines/access/screen.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 8aabac2b0b..3acd4c530a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,12 +34,14 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_debugger = nullptr;
 	_events = nullptr;
 	_graphics = nullptr;
+	_screen = nullptr;
 }
 
 AccessEngine::~AccessEngine() {
 	delete _debugger;
 	delete _events;
 	delete _graphics;
+	delete _screen;
 }
 
 void AccessEngine::initialize() {
@@ -51,16 +53,18 @@ void AccessEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_graphics = new GraphicsManager(this);
+	_screen = new Screen(this);
 }
 
 Common::Error AccessEngine::run() {
 	initialize();
 
 	setVGA();
-	_graphics->setPalettte();
-	_graphics->setPanel(0);
+	_screen->setInitialPalettte();
 	_events->setCursor(CURSOR_0);
 	_events->showCursor();
+	_graphics->setPanel(0);
+	doTitle();
 
 	dummyLoop();
 	return Common::kNoError;
diff --git a/engines/access/access.h b/engines/access/access.h
index 16487ea64f..4676d73d1d 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -33,6 +33,7 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/graphics.h"
+#include "access/screen.h"
 
 /**
  * This is the namespace of the Access engine.
@@ -77,10 +78,16 @@ protected:
 	// Engine APIs
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
+protected:
+	/**
+	 * Show game title
+	 */
+	virtual void doTitle() = 0;
 public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	GraphicsManager *_graphics;
+	Screen *_screen;
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 2b4196a406..37441411d6 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -30,6 +30,13 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		AccessEngine(syst, gameDesc) {
 }
 
+void AmazonEngine::doTitle() {
+	_screen->setDisplayScan();
+	_screen->forceFadeOut();
+	_events->hideCursor();
+
+}
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 1bccd1cedc..30ec2c6519 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -30,6 +30,8 @@ namespace Access {
 namespace Amazon {
 
 class AmazonEngine : public AccessEngine {
+protected:
+	virtual void doTitle();
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/graphics.cpp b/engines/access/graphics.cpp
index 8f0e22f2b1..c1187f2eb3 100644
--- a/engines/access/graphics.cpp
+++ b/engines/access/graphics.cpp
@@ -39,8 +39,4 @@ void GraphicsManager::setPanel(int num) {
 	_msVirtualOffset = _virtualOffsetsTable[num];
 }
 
-void GraphicsManager::setPalettte() {
-	g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18);
-}
-
 } // End of namespace Access
diff --git a/engines/access/graphics.h b/engines/access/graphics.h
index c7d2acd54e..df626176fa 100644
--- a/engines/access/graphics.h
+++ b/engines/access/graphics.h
@@ -43,7 +43,6 @@ public:
 	GraphicsManager(AccessEngine *vm);
 
 	void setPanel(int num);
-	void setPalettte();
 };
 
 } // End of namespace Access
diff --git a/engines/access/module.mk b/engines/access/module.mk
index d8867bc593..a4fb8646ba 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -7,6 +7,7 @@ MODULE_OBJS := \
 	events.o \
 	graphics.o \
 	resources.o \
+	screen.o \
 	amazon\amazon_game.o
 
 # This module can be built as a plugin
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
new file mode 100644
index 0000000000..3f8dc4ecda
--- /dev/null
+++ b/engines/access/screen.cpp
@@ -0,0 +1,100 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/algorithm.h"
+#include "common/textconsole.h"
+#include "common/system.h"
+#include "graphics/palette.h"
+#include "access/screen.h"
+#include "access/resources.h"
+
+namespace Access {
+
+Screen::Screen(AccessEngine *vm) : _vm(vm) {
+	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
+	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
+}
+
+void Screen::setDisplayScan() {
+	warning("TODO: setDisplayScan");
+}
+
+void Screen::updateScreen() {
+	g_system->updateScreen();
+}
+
+void Screen::setInitialPalettte() {
+	Common::copy(&INITIAL_PALETTE[0], &INITIAL_PALETTE[18 * 3], _rawPalette);
+	Common::fill(&_rawPalette[18 * 3], &_rawPalette[PALETTE_SIZE], 0);
+
+	g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18);
+}
+
+void Screen::updatePalette() {
+	g_system->getPaletteManager()->setPalette(&_tempPalette[0], 0, PALETTE_COUNT);
+	updateScreen();
+}
+
+void Screen::forceFadeOut() {
+	const int FADE_AMOUNT = 2;
+	bool repeatFlag;
+	byte *srcP;
+	int count;
+
+	do {
+		repeatFlag = false;
+		for (srcP = &_tempPalette[0], count = 0; count < PALETTE_COUNT; ++count, ++srcP) {
+			int v = *srcP;
+			if (v) {
+				repeatFlag = true;
+				*srcP = MAX(*srcP - FADE_AMOUNT, 0);
+			}
+		}
+
+		updatePalette();
+		g_system->delayMillis(10);
+	} while (repeatFlag);
+}
+
+void Screen::forceFadeIn() {
+	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
+
+	const int FADE_AMOUNT = 2;
+	bool repeatFlag;
+	do {
+		repeatFlag = false;
+		const byte *srcP = &_rawPalette[0];
+		byte *destP = &_tempPalette[0];
+
+		for (int idx = 0; idx < PALETTE_SIZE; ++idx, ++srcP, ++destP) {
+			if (*destP != *srcP) {
+				repeatFlag = true;
+				*destP = MAX((int)*destP + FADE_AMOUNT, (int)*srcP);
+			}
+		}
+
+		updatePalette();
+		g_system->delayMillis(10);
+	} while (repeatFlag);
+}
+
+} // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
new file mode 100644
index 0000000000..f8e0dab1b1
--- /dev/null
+++ b/engines/access/screen.h
@@ -0,0 +1,72 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_SCREEN_H
+#define ACCESS_SCREEN_H
+
+#include "common/scummsys.h"
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+namespace Access {
+
+class AccessEngine;
+
+#define PALETTE_COUNT 256
+#define PALETTE_SIZE (256 * 3)
+
+class Screen: public Graphics::Surface {
+private:
+	AccessEngine *_vm;
+	byte _tempPalette[PALETTE_SIZE];
+	byte _rawPalette[PALETTE_SIZE];
+
+	void updatePalette();
+public:
+	Screen(AccessEngine *vm);
+
+	void setDisplayScan();
+
+	/**
+	 * Update the underlying screen
+	 */
+	void updateScreen();
+
+	/**
+	 * Fade out screen
+	 */
+	void forceFadeOut();
+
+	/**
+	 * Fade in screen
+	 */
+	void forceFadeIn();
+
+	/**
+	 * Set the initial palette
+	 */
+	void setInitialPalettte();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_SCREEN_H */
-- 
cgit v1.2.3


From a35ba4caf96ab29a184787a859aea2918a74975c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Aug 2014 15:14:42 -0400
Subject: ACCESS: Adding file loading

---
 engines/access/access.cpp             |   6 ++
 engines/access/access.h               |   9 +++
 engines/access/amazon/amazon_game.cpp |   2 +
 engines/access/detection_tables.h     |   5 --
 engines/access/files.cpp              | 111 ++++++++++++++++++++++++++++++++++
 engines/access/files.h                |  76 +++++++++++++++++++++++
 engines/access/module.mk              |   2 +
 engines/access/resources.cpp          |  25 ++++++++
 engines/access/resources.h            |   2 +
 engines/access/sound.cpp              |  29 +++++++++
 engines/access/sound.h                |  43 +++++++++++++
 11 files changed, 305 insertions(+), 5 deletions(-)
 create mode 100644 engines/access/files.cpp
 create mode 100644 engines/access/files.h
 create mode 100644 engines/access/sound.cpp
 create mode 100644 engines/access/sound.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 3acd4c530a..25d9fcc99e 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -33,15 +33,19 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		_gameDescription(gameDesc), Engine(syst), _randomSource("Access") {
 	_debugger = nullptr;
 	_events = nullptr;
+	_files = nullptr;
 	_graphics = nullptr;
 	_screen = nullptr;
+	_sound = nullptr;
 }
 
 AccessEngine::~AccessEngine() {
 	delete _debugger;
 	delete _events;
+	delete _files;
 	delete _graphics;
 	delete _screen;
+	delete _sound;
 }
 
 void AccessEngine::initialize() {
@@ -52,8 +56,10 @@ void AccessEngine::initialize() {
 
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
+	_files = new FileManager(this);
 	_graphics = new GraphicsManager(this);
 	_screen = new Screen(this);
+	_sound = new SoundManager(this);
 }
 
 Common::Error AccessEngine::run() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 4676d73d1d..3386cd9e11 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -32,8 +32,10 @@
 #include "graphics/surface.h"
 #include "access/debugger.h"
 #include "access/events.h"
+#include "access/files.h"
 #include "access/graphics.h"
 #include "access/screen.h"
+#include "access/sound.h"
 
 /**
  * This is the namespace of the Access engine.
@@ -49,6 +51,11 @@ namespace Access {
 #define DEBUG_INTERMEDIATE 2
 #define DEBUG_DETAILED 3
 
+enum {
+	GType_Amazon = 1,
+	GType_MeanStreets = 2
+};
+
 enum AccessDebugChannels {
 	kDebugPath      = 1 << 0,
 	kDebugScripts	= 1 << 1,
@@ -86,8 +93,10 @@ protected:
 public:
 	Debugger *_debugger;
 	EventsManager *_events;
+	FileManager *_files;
 	GraphicsManager *_graphics;
 	Screen *_screen;
+	SoundManager *_sound;
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 37441411d6..53ddde9f68 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -35,6 +35,8 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeOut();
 	_events->hideCursor();
 
+	_sound->loadSound(98, 30);
+
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index 90304290f1..cbef1d3b63 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -22,11 +22,6 @@
 
 namespace Access {
 
-enum {
-	GType_Amazon = 1,
-	GType_MeanStreets = 2
-};
-
 static const AccessGameDescription gameDescriptions[] = {
 	{
 		// Amazon Guadians of Eden - Floppy English
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
new file mode 100644
index 0000000000..7da7574df2
--- /dev/null
+++ b/engines/access/files.cpp
@@ -0,0 +1,111 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, 0xwhose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, 0xor (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, 0xwrite to the Free Software
+ * Foundation, 0xInc., 0x51 Franklin Street, 0xFifth Floor, 0xBoston, 0xMA 02110-1301, 0xUSA.
+ *
+ */
+
+#include "access/files.h"
+#include "access/resources.h"
+#include "access/access.h"
+
+namespace Access {
+
+FileManager::FileManager(AccessEngine *vm): _vm(vm) {
+	switch (vm->getGameID()) {
+	case GType_Amazon:
+		_filenames = &Amazon::FILENAMES[0];
+		break;
+	default:
+		error("Unknown game");
+	}
+
+	_fileNumber = -1;
+	_stream = nullptr;
+}
+
+FileManager::~FileManager() {
+	delete _stream;
+	_file.close();
+}
+
+void FileManager::loadFile(int fileNum, int subfile) {
+	setAppended(fileNum);
+	gotoAppended(subfile);
+
+	handleFile();
+}
+
+void FileManager::loadFile(const Common::String &filename) {
+	// Open up the file
+	_fileNumber = -1;
+	_file.close();
+	if (_file.open(filename))
+		error("Could not open file - %s", filename.c_str());
+
+	// Get a stream for the entire file
+	delete _stream;
+	_stream = _file.readStream(_file.size());
+
+	handleFile();
+}
+
+void FileManager::handleFile() {
+	char header[3];
+	_stream->read(&header[0], 3);
+
+	if (!strncmp(header, "BDE", 3))
+		// Decompress the resource
+		decompressFile();
+	else
+		// Not compressed, so move back to start of data
+		_stream->seek(0);
+}
+
+void FileManager::decompressFile() {
+	// TODO
+}
+
+void FileManager::setAppended(int fileNum) {
+	if (_fileNumber != fileNum) {
+		_fileNumber = fileNum;
+
+		_file.close();
+		if (!_file.open(_filenames[fileNum]))
+			error("Could not open file %s", _filenames[fileNum]);
+
+		// Read in the file index
+		_fileIndex.resize(50);
+		for (int i = 0; i < 50; ++i) {
+			_fileIndex[i]._offset = _file.readUint32LE();
+			_fileIndex[i]._nextOffset = _file.readUint32LE();
+		}
+	}
+}
+
+void FileManager::gotoAppended(int subfile) {
+	uint32 offset = _fileIndex[subfile]._offset;
+	uint32 size = _fileIndex[subfile]._nextOffset - offset;
+
+	_file.seek(offset);
+	delete _stream;
+	_stream = _file.readStream(size);
+}
+
+
+} // End of namespace Access
diff --git a/engines/access/files.h b/engines/access/files.h
new file mode 100644
index 0000000000..fcd24808a3
--- /dev/null
+++ b/engines/access/files.h
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_FILES_H
+#define ACCESS_FILES_H
+
+#include "common/scummsys.h"
+#include "common/file.h"
+
+namespace Access {
+
+class AccessEngine;
+
+struct FileEntry {
+	uint32 _offset;
+	uint32 _nextOffset;
+};
+
+class FileManager {
+private:
+	AccessEngine *_vm;
+	const char * const *_filenames;
+
+	void handleFile();
+
+	void decompressFile();
+
+public:
+	int _fileNumber;
+	Common::File _file;
+	Common::SeekableReadStream *_stream;
+	Common::Array<FileEntry> _fileIndex;
+	uint32 _entryOffset;
+	uint32 _nextOffset;
+public:
+	FileManager(AccessEngine *vm);
+	~FileManager();
+
+	void loadFile(int fileNum, int subfile);
+
+	void loadFile(const Common::String &filename);
+
+	/**
+	 * Open up a sub-file container file
+	 */
+	void setAppended(int fileNum);
+
+
+	/**
+	 * Open up a sub-file resource within an alrady opened container file.
+	 */
+	void gotoAppended(int subfile);
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_FILES_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index a4fb8646ba..7e23ede512 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -5,9 +5,11 @@ MODULE_OBJS := \
 	debugger.o \
 	detection.o \
 	events.o \
+	files.o \
 	graphics.o \
 	resources.o \
 	screen.o \
+	sound.o \
 	amazon\amazon_game.o
 
 # This module can be built as a plugin
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index cf8b491900..a47abf2b06 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "access/resources.h"
+#include "access/access.h"
 
 namespace Access {
 
@@ -47,6 +48,30 @@ const byte INITIAL_PALETTE[18 * 3] = {
 
 namespace Amazon {
 
+const char *const FILENAMES[] = {
+	"S00.AP", "S01.AP", "S02.AP", "R03.AP", "S04.AP", "S05.AP",
+	"S06.AP", "S07.AP", "S08.AP", "S09.AP", "S10.AP", "S11.AP",
+	"S12.AP", "S13.AP", "S14.AP", "S15.AP", "S16.AP", "S17.AP",
+	"S18.AP", "S19.AP", "S20.AP", "S21.AP", "S22.AP", "S23.AP",
+	"S24.AP", "S25.AP", "S26.AP", "S27.AP", "S28.AP", "S29.AP",
+	"S30.AP", "S31.AP", "S32.AP", "S33.AP", "S34.AP", "R35.AP",
+	"S36.AP", "S37.AP", "S38.AP", "S39.AP", "S40.AP", "C26.AP",
+	"S42.AP", "S01.AP", "S44.AP", "S45.AP", "S46.AP", "S47.AP",
+	"C36.AP", nullptr,  "S50.AP", nullptr,  nullptr,  "S53.AP",
+	"S54.AP", "S55.AP", "C35.AP", "S57.AP", "S58.AP", nullptr,
+	nullptr,  "S61.AP", nullptr,  nullptr,  "S64.AP", "C00.AP",
+	"C01.AP", "C06.AP", "C07.AP", "C08.AP", "C05.AP", "C09.AP",
+	"C12.AP", "C03.AP", "C13.AP", "C15.AP", "C14.AP", "C16.AP",
+	"C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP",
+	"C24.AP", "C25.AP", "C29.AP", "C30.AP", "C32.AP", "C33.AP",
+	"C34.AP", "CREDITS.AP", "MIDIDRV.AP", "SUMMARY.AP", "DEAD.AP",
+	"EST.AP", "CHAPTER.AP", "MIDI.AP", "SOUND.AP", "INV.AP",
+	"NARATE01.AP", "NARATE02.AP", "NARATE03.AP", "NARATE04.AP",
+	"NARATE05.AP", "NARATE06.AP", "NARATE07.AP", "NARATE08.AP",
+	"NARATE09.AP", "NARATE10.AP", "NARATE11.AP", "NARATE12.AP",
+	"NARATE13.AP", "NARATE14.AP"
+};
+
 const byte *CURSORS[10] = {
 	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
 };
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 7bd2354c06..ba335cd0ec 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -31,6 +31,8 @@ extern const byte INITIAL_PALETTE[18 * 3];
 
 namespace Amazon {
 
+extern const char *const FILENAMES[];
+
 extern const byte MOUSE0[];
 extern const byte MOUSE1[];
 extern const byte MOUSE2[];
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
new file mode 100644
index 0000000000..d04d915cc9
--- /dev/null
+++ b/engines/access/sound.cpp
@@ -0,0 +1,29 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/sound.h"
+
+namespace Access {
+
+SoundManager::SoundManager(AccessEngine *vm) : _vm(vm) {}
+
+} // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
new file mode 100644
index 0000000000..e35e64795d
--- /dev/null
+++ b/engines/access/sound.h
@@ -0,0 +1,43 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_SOUND_H
+#define ACCESS_SOUND_H
+
+namespace Access {
+
+class AccessEngine;
+
+class SoundManager {
+private:
+	AccessEngine *_vm;
+public:
+	int _soundPriority;
+public:
+	SoundManager(AccessEngine *vm);
+
+	void loadSound(int fileNum, int subfile) {}
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_SOUND_H*/
-- 
cgit v1.2.3


From 7a63e12edb98f47d9a262601d9d26d9444975314 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Aug 2014 17:09:28 -0400
Subject: ACCESS: Added screen loading and file index load fixes

---
 engines/access/amazon/amazon_game.cpp | 10 ++++-
 engines/access/files.cpp              | 71 +++++++++++++++++++++++++----------
 engines/access/files.h                | 35 +++++++++++------
 engines/access/screen.cpp             | 17 +++++++++
 engines/access/screen.h               | 12 ++++++
 engines/access/sound.cpp              | 17 ++++++++-
 engines/access/sound.h                | 10 ++++-
 7 files changed, 136 insertions(+), 36 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 53ddde9f68..3f8ae73faa 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -35,8 +35,14 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeOut();
 	_events->hideCursor();
 
-	_sound->loadSound(98, 30);
-
+	_sound->_soundTable[0] = _sound->loadSound(98, 30);
+	_sound->_soundPriority[0] = 1;
+	_sound->_soundTable[1] = _sound->loadSound(98, 8);
+	_sound->_soundPriority[1] = 2;
+
+	_screen->_loadPalFlag = false;
+	byte *scr = _files->loadScreen(0, 3);
+	_screen->copyBuffer(scr);
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 7da7574df2..549429b154 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -44,41 +44,72 @@ FileManager::~FileManager() {
 	_file.close();
 }
 
-void FileManager::loadFile(int fileNum, int subfile) {
+byte *FileManager::loadFile(int fileNum, int subfile) {
 	setAppended(fileNum);
 	gotoAppended(subfile);
 
-	handleFile();
+	return handleFile();
 }
 
-void FileManager::loadFile(const Common::String &filename) {
+byte *FileManager::loadFile(const Common::String &filename) {
+	// Open the file
+	openFile(filename);
+
+	// Get a stream for the entire file
+	delete _stream;
+	_stream = _file.readStream(_file.size());
+
+	return handleFile();
+}
+
+void FileManager::openFile(const Common::String &filename) {
 	// Open up the file
 	_fileNumber = -1;
 	_file.close();
 	if (_file.open(filename))
 		error("Could not open file - %s", filename.c_str());
+}
 
-	// Get a stream for the entire file
+byte *FileManager::loadScreen(int fileNum, int subfile) {
+	setAppended(fileNum);
+	gotoAppended(subfile);
+	_vm->_screen->loadPalette(_stream);
+
+	return handleFile();
+}
+
+byte *FileManager::loadScreen(const Common::String &filename) {
+	// Open the file
+	openFile(filename);
+
+	// Get the palette
+	_vm->_screen->loadPalette(_stream);
+
+	// Get a stream for the remainder of the file
 	delete _stream;
 	_stream = _file.readStream(_file.size());
 
-	handleFile();
+	return handleFile();
 }
 
-void FileManager::handleFile() {
+byte *FileManager::handleFile() {
 	char header[3];
 	_stream->read(&header[0], 3);
 
-	if (!strncmp(header, "BDE", 3))
+	if (!strncmp(header, "DBE", 3))
 		// Decompress the resource
-		decompressFile();
-	else
-		// Not compressed, so move back to start of data
-		_stream->seek(0);
+		return decompressFile();
+	
+	// Not compressed, so pass out all of the file
+	_stream->seek(0);
+	byte *data = new byte[_stream->size()];
+	_stream->read(data, _stream->size());
+
+	return data;
 }
 
-void FileManager::decompressFile() {
-	// TODO
+byte *FileManager::decompressFile() {
+	error("TODO: decompression");
 }
 
 void FileManager::setAppended(int fileNum) {
@@ -90,17 +121,17 @@ void FileManager::setAppended(int fileNum) {
 			error("Could not open file %s", _filenames[fileNum]);
 
 		// Read in the file index
-		_fileIndex.resize(50);
-		for (int i = 0; i < 50; ++i) {
-			_fileIndex[i]._offset = _file.readUint32LE();
-			_fileIndex[i]._nextOffset = _file.readUint32LE();
-		}
+		int count = _file.readUint16LE();
+		assert(count <= 100);
+		_fileIndex.resize(count);
+		for (int i = 0; i < count; ++i)
+			_fileIndex[i] = _file.readUint32LE();
 	}
 }
 
 void FileManager::gotoAppended(int subfile) {
-	uint32 offset = _fileIndex[subfile]._offset;
-	uint32 size = _fileIndex[subfile]._nextOffset - offset;
+	uint32 offset = _fileIndex[subfile];
+	uint32 size = _fileIndex[subfile + 1] - offset;
 
 	_file.seek(offset);
 	delete _stream;
diff --git a/engines/access/files.h b/engines/access/files.h
index fcd24808a3..42b439ce45 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -24,47 +24,60 @@
 #define ACCESS_FILES_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
 #include "common/file.h"
 
 namespace Access {
 
 class AccessEngine;
 
-struct FileEntry {
-	uint32 _offset;
-	uint32 _nextOffset;
-};
-
 class FileManager {
 private:
 	AccessEngine *_vm;
 	const char * const *_filenames;
 
-	void handleFile();
+	void openFile(const Common::String &filename);
+
+	byte *handleFile();
 
-	void decompressFile();
+	byte *decompressFile();
 
 public:
 	int _fileNumber;
 	Common::File _file;
 	Common::SeekableReadStream *_stream;
-	Common::Array<FileEntry> _fileIndex;
+	Common::Array<uint32> _fileIndex;
 	uint32 _entryOffset;
 	uint32 _nextOffset;
 public:
 	FileManager(AccessEngine *vm);
 	~FileManager();
 
-	void loadFile(int fileNum, int subfile);
+	/**
+	 * Load a given subfile from a container file
+	 */
+	byte *loadFile(int fileNum, int subfile);
+
+	/**
+	 * Load a given file by name
+	 */
+	byte *loadFile(const Common::String &filename);
 
-	void loadFile(const Common::String &filename);
+	/**
+	 * Load a given scren from a container file
+	 */
+	byte *loadScreen(int fileNum, int subfile);
+
+	/**
+	* Load a given screen by name
+	*/
+	byte *loadScreen(const Common::String &filename);
 
 	/**
 	 * Open up a sub-file container file
 	 */
 	void setAppended(int fileNum);
 
-
 	/**
 	 * Open up a sub-file resource within an alrady opened container file.
 	 */
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 3f8dc4ecda..4059cab070 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -32,6 +32,7 @@ namespace Access {
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
+	_loadPalFlag = false;
 }
 
 void Screen::setDisplayScan() {
@@ -49,6 +50,16 @@ void Screen::setInitialPalettte() {
 	g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18);
 }
 
+void Screen::loadPalette(Common::SeekableReadStream *stream) {
+	stream->read(&_rawPalette[0], PALETTE_SIZE);
+	setPalette();
+	_loadPalFlag = true;
+}
+
+void Screen::setPalette() {
+	g_system->getPaletteManager()->setPalette(&_rawPalette[0], 0, PALETTE_COUNT);
+}
+
 void Screen::updatePalette() {
 	g_system->getPaletteManager()->setPalette(&_tempPalette[0], 0, PALETTE_COUNT);
 	updateScreen();
@@ -97,4 +108,10 @@ void Screen::forceFadeIn() {
 	} while (repeatFlag);
 }
 
+void Screen::copyBuffer(const byte *data) {
+	byte *destP = (byte *)getPixels();
+	Common::copy(data, data + (h * w), destP);
+	g_system->copyRectToScreen(destP, w, 0, 0, w, h);
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index f8e0dab1b1..d16333c46e 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
+#include "common/stream.h"
 #include "graphics/surface.h"
 
 namespace Access {
@@ -40,7 +41,11 @@ private:
 	byte _tempPalette[PALETTE_SIZE];
 	byte _rawPalette[PALETTE_SIZE];
 
+	void setPalette();
+
 	void updatePalette();
+public:
+	bool _loadPalFlag;
 public:
 	Screen(AccessEngine *vm);
 
@@ -65,6 +70,13 @@ public:
 	 * Set the initial palette
 	 */
 	void setInitialPalettte();
+
+	void loadPalette(Common::SeekableReadStream *stream);
+
+	/**
+	 * Copy a buffer to the screen
+	 */
+	void copyBuffer(const byte *data);
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index d04d915cc9..baad6352b8 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -20,10 +20,25 @@
  *
  */
 
+#include "common/algorithm.h"
+#include "access/access.h"
 #include "access/sound.h"
 
 namespace Access {
 
-SoundManager::SoundManager(AccessEngine *vm) : _vm(vm) {}
+SoundManager::SoundManager(AccessEngine *vm) : _vm(vm) {
+	Common::fill(&_soundTable[0], &_soundTable[MAX_SOUNDS], (byte *)nullptr);
+	Common::fill(&_soundPriority[0], &_soundPriority[MAX_SOUNDS], 0);
+}
+
+SoundManager::~SoundManager() {
+	for (int i = 0; i < MAX_SOUNDS; ++i)
+		delete _soundTable[i];
+}
+
+byte *SoundManager::loadSound(int fileNum, int subfile) {
+	return _vm->_files->loadFile(fileNum, subfile);
+}
+
 
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index e35e64795d..5d173e2e2b 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -23,6 +23,10 @@
 #ifndef ACCESS_SOUND_H
 #define ACCESS_SOUND_H
 
+#include "common/scummsys.h"
+
+#define MAX_SOUNDS 20
+
 namespace Access {
 
 class AccessEngine;
@@ -31,11 +35,13 @@ class SoundManager {
 private:
 	AccessEngine *_vm;
 public:
-	int _soundPriority;
+	byte *_soundTable[MAX_SOUNDS];
+	int _soundPriority[MAX_SOUNDS];
 public:
 	SoundManager(AccessEngine *vm);
+	~SoundManager();
 
-	void loadSound(int fileNum, int subfile) {}
+	byte *loadSound(int fileNum, int subfile);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From d41c5cd7407a99fde350f2c9fbe9b4d6e73d1ba6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 Aug 2014 16:59:22 -0400
Subject: ACCESS: Added decompression code

---
 engines/access/decompress.cpp | 127 ++++++++++++++++++++++++++++++++++++++++++
 engines/access/decompress.h   |  48 ++++++++++++++++
 engines/access/files.cpp      |  33 ++++++-----
 engines/access/files.h        |   7 +--
 engines/access/module.mk      |   1 +
 5 files changed, 196 insertions(+), 20 deletions(-)
 create mode 100644 engines/access/decompress.cpp
 create mode 100644 engines/access/decompress.h

diff --git a/engines/access/decompress.cpp b/engines/access/decompress.cpp
new file mode 100644
index 0000000000..45ae07d712
--- /dev/null
+++ b/engines/access/decompress.cpp
@@ -0,0 +1,127 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/debug.h"
+#include "common/endian.h"
+#include "common/util.h"
+
+#include "access/decompress.h"
+
+namespace Access {
+
+void LzwDecompressor::decompress(byte *source, byte *dest) {
+
+	_source = source;
+	
+	byte litByte;
+	uint16 copyLength, maxCodeValue, code, nextCode, lastCode, oldCode;
+
+	byte *copyBuf = new byte[8192];
+
+	struct { uint16 code; byte value; } codeTable[8192];
+	memset(codeTable, 0, sizeof(codeTable));
+
+	_codeLength = 9;
+	nextCode = 258;
+	maxCodeValue = 512;
+
+	copyLength = 0;
+	_bitPos = 0;
+
+	while (1) {
+
+		code = getCode();
+
+		if (code == 257)
+			break;
+
+		if (code == 256) {
+			_codeLength = 9;
+			nextCode = 258;
+			maxCodeValue = 512;
+			lastCode = getCode();
+			oldCode = lastCode;
+			litByte = lastCode;
+			*dest++ = litByte;
+		} else {
+			lastCode = code;
+			if (code >= nextCode) {
+				lastCode = oldCode;
+				copyBuf[copyLength++] = litByte;
+			}
+			while (lastCode > 255) {
+				copyBuf[copyLength++] = codeTable[lastCode].value;
+				lastCode = codeTable[lastCode].code;
+			}
+			litByte = lastCode;
+			copyBuf[copyLength++] = lastCode;
+			while (copyLength > 0)
+				*dest++ = copyBuf[--copyLength];
+			codeTable[nextCode].value = lastCode;
+			codeTable[nextCode].code = oldCode;
+			nextCode++;
+			oldCode = code;
+			if (nextCode >= maxCodeValue && _codeLength <= 12) {
+				_codeLength++;
+				maxCodeValue <<= 1;
+			}
+		}
+
+	}
+
+	delete[] copyBuf;
+
+}
+
+uint16 LzwDecompressor::getCode() {
+	const byte bitMasks[9] = {
+		0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0x0FF
+	};
+	uint16 bits, loCode, hiCode;
+	loCode = (READ_LE_UINT16(_source) >> _bitPos) & 0xFF;
+	_source++;
+	bits = _codeLength - 8;
+	hiCode = (READ_LE_UINT16(_source) >> _bitPos) & bitMasks[bits];
+	_bitPos += bits;
+	if (_bitPos > 8) {
+		_source++;
+		_bitPos -= 8;
+	}
+	return (hiCode << 8) | loCode;
+}
+
+uint32 decompressDBE(byte *source, byte **dest) {
+
+	uint32 destSize = READ_LE_UINT32(source + 4);
+	*dest = new byte[destSize];
+
+	debug(1, "decompressDBE() destSize = %d", destSize);
+
+	LzwDecompressor dec;
+	dec.decompress(source + 16, *dest);
+
+	debug(1, "decompressDBE() ok");
+
+	return destSize;
+}
+
+} // End of namespace Access
diff --git a/engines/access/decompress.h b/engines/access/decompress.h
new file mode 100644
index 0000000000..522bfb2acf
--- /dev/null
+++ b/engines/access/decompress.h
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_DECOMPRESS_H
+#define ACCESS_DECOMPRESS_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+class LzwDecompressor {
+public:
+	void decompress(byte *source, byte *dest);
+private:
+	byte *_source;
+	byte _codeLength, _bitPos;
+	uint16 getCode();
+};
+
+uint32 decompressDBE(byte *source, byte **dest);
+
+} // End of namespace Access
+
+#endif
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 549429b154..7b4a23d0e8 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -68,6 +68,8 @@ void FileManager::openFile(const Common::String &filename) {
 	_file.close();
 	if (_file.open(filename))
 		error("Could not open file - %s", filename.c_str());
+
+	_filesize = _file.size();
 }
 
 byte *FileManager::loadScreen(int fileNum, int subfile) {
@@ -83,11 +85,11 @@ byte *FileManager::loadScreen(const Common::String &filename) {
 	openFile(filename);
 
 	// Get the palette
-	_vm->_screen->loadPalette(_stream);
+	_vm->_screen->loadPalette(&_file);
 
 	// Get a stream for the remainder of the file
 	delete _stream;
-	_stream = _file.readStream(_file.size());
+	_stream = _file.readStream(_file.size() - _file.pos());
 
 	return handleFile();
 }
@@ -95,21 +97,23 @@ byte *FileManager::loadScreen(const Common::String &filename) {
 byte *FileManager::handleFile() {
 	char header[3];
 	_stream->read(&header[0], 3);
+	_stream->seek(-3, SEEK_CUR);
 
-	if (!strncmp(header, "DBE", 3))
-		// Decompress the resource
-		return decompressFile();
-	
-	// Not compressed, so pass out all of the file
-	_stream->seek(0);
-	byte *data = new byte[_stream->size()];
-	_stream->read(data, _stream->size());
+	bool isCompressed = !strncmp(header, "DBE", 3);
 
-	return data;
-}
+	// Get the data from the file or resource
+	_filesize = _stream->size() - _stream->pos();
+	byte *data = new byte[_filesize];
+	_stream->read(data, _filesize);
 
-byte *FileManager::decompressFile() {
-	error("TODO: decompression");
+	// If the data is compressed, uncompress it
+	if (isCompressed) {
+		byte *src = data;
+		_filesize = decompressDBE(src, &data);
+		delete[] src;
+	}
+
+	return data;
 }
 
 void FileManager::setAppended(int fileNum) {
@@ -138,5 +142,4 @@ void FileManager::gotoAppended(int subfile) {
 	_stream = _file.readStream(size);
 }
 
-
 } // End of namespace Access
diff --git a/engines/access/files.h b/engines/access/files.h
index 42b439ce45..9224b29429 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/file.h"
+#include "access/decompress.h"
 
 namespace Access {
 
@@ -39,16 +40,12 @@ private:
 	void openFile(const Common::String &filename);
 
 	byte *handleFile();
-
-	byte *decompressFile();
-
 public:
 	int _fileNumber;
 	Common::File _file;
 	Common::SeekableReadStream *_stream;
 	Common::Array<uint32> _fileIndex;
-	uint32 _entryOffset;
-	uint32 _nextOffset;
+	uint32 _filesize;
 public:
 	FileManager(AccessEngine *vm);
 	~FileManager();
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 7e23ede512..c9d593de22 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/access
 MODULE_OBJS := \
 	access.o \
 	debugger.o \
+	decompress.o \
 	detection.o \
 	events.o \
 	files.o \
-- 
cgit v1.2.3


From fb62b9477b5a9d887eb3484d82a7ef67efb6bfa5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:29:58 +0700
Subject: ZVISION: Make controls processing breakeable.

---
 engines/zvision/scripting/script_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 53fa5832d9..4dd51816a0 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -181,7 +181,8 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 	}
 
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
-		(*iter)->process(deltaTimeMillis);
+		if ( (*iter)->process(deltaTimeMillis) )
+			break;
 }
 
 void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
-- 
cgit v1.2.3


From d7d058cd60aae2c898f285b183416d1393c4a7ad Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:32:48 +0700
Subject: ZVISION: New scriptManager location methods

---
 engines/zvision/scripting/script_manager.cpp | 26 ++++++++++++++++++++++++++
 engines/zvision/scripting/script_manager.h   |  3 +++
 2 files changed, 29 insertions(+)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 4dd51816a0..6a9398d356 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -486,6 +486,10 @@ void ScriptManager::onKeyUp(Common::KeyState keyState) {
 	}
 }
 
+void ScriptManager::changeLocation(const Location &_newLocation) {
+	changeLocation(_newLocation.world, _newLocation.room, _newLocation.node, _newLocation.view, _newLocation.offset);
+}
+
 void ScriptManager::changeLocation(char _world, char _room, char _node, char _view, uint32 offset) {
 	_nextLocation.world = _world;
 	_nextLocation.room = _room;
@@ -731,6 +735,28 @@ Location ScriptManager::getCurrentLocation() const {
 	return location;
 }
 
+Location ScriptManager::getLastLocation() {
+	Location location;
+	location.world = getStateValue(StateKey_LastWorld);
+	location.room = getStateValue(StateKey_LastRoom);
+	location.node = getStateValue(StateKey_LastNode);
+	location.view = getStateValue(StateKey_LastView);
+	location.offset = getStateValue(StateKey_LastViewPos);
+
+	return location;
+}
+
+Location ScriptManager::getLastMenuLocation() {
+	Location location;
+	location.world = getStateValue(StateKey_Menu_LastWorld);
+	location.room = getStateValue(StateKey_Menu_LastRoom);
+	location.node = getStateValue(StateKey_Menu_LastNode);
+	location.view = getStateValue(StateKey_Menu_LastView);
+	location.offset = getStateValue(StateKey_Menu_LastViewPos);
+
+	return location;
+}
+
 void ScriptManager::addEvent(Common::Event event) {
 	_controlEvents.push_back(event);
 }
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 6cc957874b..4d82f36aea 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -237,11 +237,14 @@ public:
 
 	/** Mark next location */
 	void changeLocation(char world, char room, char node, char view, uint32 offset);
+	void changeLocation(const Location &_newLocation);
 
 	void serialize(Common::WriteStream *stream);
 	void deserialize(Common::SeekableReadStream *stream);
 
 	Location getCurrentLocation() const;
+	Location getLastLocation();
+	Location getLastMenuLocation();
 
 private:
 	void referenceTableAddPuzzle(uint32 key, puzzle_ref ref);
-- 
cgit v1.2.3


From 73d26bc2337e8afd03bfd73e6ccc0c0fb44a5950 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:33:36 +0700
Subject: ZVISION: Don't focus on already focused control

---
 engines/zvision/scripting/script_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 6a9398d356..380141490a 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -361,6 +361,8 @@ Control *ScriptManager::getControl(uint32 key) {
 void ScriptManager::focusControl(uint32 key) {
 	if (!_activeControls)
 		return;
+	if (_currentlyFocusedControl == key)
+		return;
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		uint32 controlKey = (*iter)->getKey();
 
-- 
cgit v1.2.3


From 550c4dbc359ece732684e0733e1925283f31c257 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:35:54 +0700
Subject: ZVISION: Implement full code for input control

---
 .../zvision/scripting/controls/input_control.cpp   | 149 +++++++++++++++++----
 engines/zvision/scripting/controls/input_control.h |  20 ++-
 engines/zvision/scripting/scr_file_handling.cpp    |   3 +
 3 files changed, 147 insertions(+), 25 deletions(-)

diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index bebf3fae11..e35b300cb9 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 
 #include "zvision/scripting/controls/input_control.h"
+#include "zvision/cursors/cursor_manager.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
@@ -42,7 +43,11 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _nextTabstop(0),
 	  _focused(false),
 	  _textChanged(false),
-	  _cursorOffset(0) {
+	  _cursorOffset(0),
+	  _enterPressed(false),
+	  _readOnly(false),
+	  _txtWidth(0),
+	  _animation(NULL) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
@@ -71,21 +76,30 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 			sscanf(line.c_str(), "%*[^(](%u)", &fontFormatNumber);
 
-			_textStyle = _engine->getStringManager()->getTextStyle(fontFormatNumber);
+			_string_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
+		} else if (line.matchString("*chooser_init_string*", true)) {
+			uint fontFormatNumber;
+
+			sscanf(line.c_str(), "%*[^(](%u)", &fontFormatNumber);
+
+			_string_chooser_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
 		} else if (line.matchString("*next_tabstop*", true)) {
 			sscanf(line.c_str(), "%*[^(](%u)", &_nextTabstop);
+		} else if (line.matchString("*cursor_dimensions*", true)) {
+			// Ignore, use the dimensions in the animation file
+		} else if (line.matchString("*cursor_animation_frames*", true)) {
+			// Ignore, use the frame count in the animation file
 		} else if (line.matchString("*cursor_animation*", true)) {
 			char fileName[25];
 
 			sscanf(line.c_str(), "%*[^(](%25s %*u)", fileName);
 
-			_cursorAnimationFileName = Common::String(fileName);
-		} else if (line.matchString("*cursor_dimensions*", true)) {
-			// Ignore, use the dimensions in the animation file
-		} else if (line.matchString("*cursor_animation_frames*", true)) {
-			// Ignore, use the frame count in the animation file
+			_animation = new MetaAnimation(fileName, _engine);
+			_frame = -1;
+			_frameDelay = 0;
 		} else if (line.matchString("*focus*", true)) {
 			_focused = true;
+			_engine->getScriptManager()->setFocusControlKey(_key);
 		}
 
 		line = stream.readLine();
@@ -94,51 +108,140 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 }
 
 bool InputControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	_engine->getScriptManager()->focusControl(_key);
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_textRectangle.contains(backgroundImageSpacePos)) {
+		if (!_readOnly) {
+			// Save
+			_engine->getScriptManager()->focusControl(_key);
+		} else {
+			// Restore
+			if (_currentInputText.size())
+				_enterPressed = true;
+		}
+	}
+	return false;
+}
+
+bool InputControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_textRectangle.contains(backgroundImageSpacePos)) {
+		if (!_readOnly) {
+			// Save
+			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
+			return true;
+		} else {
+			// Restore
+			if (_currentInputText.size()) {
+				_engine->getCursorManager()->changeCursor(CursorIndex_Active);
+				_engine->getScriptManager()->focusControl(_key);
+				return true;
+			}
+		}
+	}
 	return false;
 }
 
 bool InputControl::onKeyDown(Common::KeyState keyState) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
 	if (!_focused) {
 		return false;
 	}
 
 	if (keyState.keycode == Common::KEYCODE_BACKSPACE) {
-		_currentInputText.deleteLastChar();
+		if (!_readOnly) {
+			_currentInputText.deleteLastChar();
+			_textChanged = true;
+		}
+	} else if (keyState.keycode == Common::KEYCODE_RETURN) {
+		_enterPressed = true;
 	} else if (keyState.keycode == Common::KEYCODE_TAB) {
-		_focused = false;
+		unfocus();
 		// Focus the next input control
 		_engine->getScriptManager()->focusControl(_nextTabstop);
+		// Don't process this event for other controls
+		return true;
 	} else {
-		// Otherwise, append the new character to the end of the current text
-
-		uint16 asciiValue = keyState.ascii;
-		// We only care about text values
-		if (asciiValue >= 32 && asciiValue <= 126) {
-			_currentInputText += (char)asciiValue;
-			_textChanged = true;
+		if (!_readOnly) {
+			// Otherwise, append the new character to the end of the current text
+			uint16 asciiValue = keyState.ascii;
+			// We only care about text values
+			if (asciiValue >= 32 && asciiValue <= 126) {
+				_currentInputText += (char)asciiValue;
+				_textChanged = true;
+			}
 		}
 	}
 	return false;
 }
 
 bool InputControl::process(uint32 deltaTimeInMillis) {
-	if (!_focused) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
-	}
 
 	// First see if we need to render the text
 	if (_textChanged) {
 		// Blit the text using the RenderManager
-		//Common::Rect destRect = _engine->getRenderManager()->renderTextToWorkingWindow(_key, _currentInputText, _textStyle.font, _textRectangle.left, _textRectangle.top, _textStyle.color, _textRectangle.width());
 
-		//_cursorOffset = destRect.left - _textRectangle.left;
+		Graphics::Surface txt;
+		txt.create(_textRectangle.width(), _textRectangle.height(), _engine->_pixelFormat);
+
+		if (!_readOnly || !_focused)
+			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _string_init, txt);
+		else
+			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _string_chooser_init, txt);
+
+		_engine->getRenderManager()->blitSurfaceToBkg(txt, _textRectangle.left, _textRectangle.top);
+
+		txt.free();
+	}
+
+	if (_animation && !_readOnly && _focused) {
+		bool need_draw = true;// = _textChanged;
+		_frameDelay -= deltaTimeInMillis;
+		if (_frameDelay <= 0) {
+			_frame = (_frame + 1) % _animation->frameCount();
+			_frameDelay = _animation->frameTime();
+			need_draw = true;
+		}
+
+		if (need_draw) {
+			const Graphics::Surface *srf = _animation->getFrameData(_frame);
+			uint32 xx = _textRectangle.left + _txtWidth;
+			if (xx >= _textRectangle.left + (_textRectangle.width() - _animation->width()))
+				xx = _textRectangle.left + _textRectangle.width() - _animation->width();
+			_engine->getRenderManager()->blitSurfaceToBkg(*srf, xx, _textRectangle.top);
+		}
 	}
 
-	// Render the next frame of the animation
-	// TODO: Implement animation handling
+	_textChanged = false;
+	return false;
+}
 
+bool InputControl::enterPress() {
+	if (_enterPressed) {
+		_enterPressed = false;
+		return true;
+	}
 	return false;
 }
 
+void InputControl::setText(const Common::String &_str) {
+	_currentInputText = _str;
+	_textChanged = true;
+}
+
+const Common::String InputControl::getText() {
+	return _currentInputText;
+}
+
+void InputControl::setReadOnly(bool readonly) {
+	_readOnly = readonly;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 91fcd364cd..5e2190f369 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -24,6 +24,8 @@
 #define ZVISION_INPUT_CONTROL_H
 
 #include "zvision/scripting/control.h"
+#include "zvision/animation/meta_animation.h"
+#include "zvision/text/text.h"
 #include "zvision/text/string_manager.h"
 
 #include "common/rect.h"
@@ -38,25 +40,39 @@ public:
 private:
 	Common::Rect _textRectangle;
 	Common::Rect _headerRectangle;
-	StringManager::TextStyle _textStyle;
+	cTxtStyle _string_init;
+	cTxtStyle _string_chooser_init;
 	uint32 _nextTabstop;
-	Common::String _cursorAnimationFileName;
 	bool _focused;
 
 	Common::String _currentInputText;
 	bool _textChanged;
 	uint _cursorOffset;
+	bool _enterPressed;
+	bool _readOnly;
+
+	int16 _txtWidth;
+	MetaAnimation *_animation;
+	int32 _frameDelay;
+	int16 _frame;
 
 public:
 	void focus() {
 		_focused = true;
+		_textChanged = true;
 	}
 	void unfocus() {
 		_focused = false;
+		_textChanged = true;
 	}
 	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	bool onKeyDown(Common::KeyState keyState);
 	bool process(uint32 deltaTimeInMillis);
+	void setText(const Common::String &_str);
+	const Common::String getText();
+	bool enterPress();
+	void setReadOnly(bool);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 5d697bd841..d1d6e2862d 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -31,6 +31,7 @@
 #include "zvision/scripting/controls/push_toggle_control.h"
 #include "zvision/scripting/controls/lever_control.h"
 #include "zvision/scripting/controls/slot_control.h"
+#include "zvision/scripting/controls/input_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -346,6 +347,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new LeverControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("slot")) {
 		return new SlotControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("input")) {
+		return new InputControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 5a5a32c84a67ce4c8466b069b6bb1c844d014577 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:39:14 +0700
Subject: ZVISION: New SaveManager methods for pre-buffering save data

---
 engines/zvision/core/save_manager.cpp | 23 +++++++++++++++++++++++
 engines/zvision/core/save_manager.h   |  9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 8ec4f4d628..6e8b6b5ff3 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -67,6 +67,13 @@ void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::Me
 	delete file;
 }
 
+void SaveManager::saveGameBuffered(uint slot, const Common::String &saveName) {
+	if (_tempSave) {
+		saveGame(slot, saveName, _tempSave);
+		flushSaveBuffer();
+	}
+}
+
 void SaveManager::autoSave() {
 	Common::OutSaveFile *file = g_system->getSavefileManager()->openForSaving(_engine->generateAutoSaveFileName());
 
@@ -231,4 +238,20 @@ Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
 	return saveFile;
 }
 
+void SaveManager::prepareSaveBuffer() {
+	if (_tempSave)
+		delete _tempSave;
+
+	_tempSave = new Common::MemoryWriteStreamDynamic;
+
+	_engine->getScriptManager()->serialize(_tempSave);
+}
+
+void SaveManager::flushSaveBuffer() {
+	if (_tempSave)
+		delete _tempSave;
+
+	_tempSave = NULL;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/core/save_manager.h b/engines/zvision/core/save_manager.h
index 8ed64a3fdc..c7c1297062 100644
--- a/engines/zvision/core/save_manager.h
+++ b/engines/zvision/core/save_manager.h
@@ -48,7 +48,8 @@ struct SaveGameHeader {
 
 class SaveManager {
 public:
-	SaveManager(ZVision *engine) : _engine(engine) {}
+	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL) {}
+	~SaveManager() { flushSaveBuffer(); }
 
 private:
 	ZVision *_engine;
@@ -59,6 +60,8 @@ private:
 		SAVE_VERSION = 1
 	};
 
+	Common::MemoryWriteStreamDynamic *_tempSave;
+
 public:
 	/**
 	 * Called every room change. Saves the state of the room just before
@@ -76,6 +79,7 @@ public:
 	 */
 	void saveGame(uint slot, const Common::String &saveName);
 	void saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream);
+	void saveGameBuffered(uint slot, const Common::String &saveName);
 	/**
 	 * Loads the state data from the save file that slot references. Uses
 	 * ZVision::generateSaveFileName(slot) to get the save file name.
@@ -87,6 +91,9 @@ public:
 
 	Common::SeekableReadStream *getSlotFile(uint slot);
 	bool readSaveGameHeader(Common::SeekableReadStream *in, SaveGameHeader &header);
+
+	void prepareSaveBuffer();
+	void flushSaveBuffer();
 private:
 	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName);
 };
-- 
cgit v1.2.3


From 49fc9eb5e665ad77512c3ea466ec34330022b776 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:41:08 +0700
Subject: ZVISION: Define ID's for system strings

---
 engines/zvision/text/string_manager.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index e226fbeae8..5420e1f3ee 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -52,6 +52,13 @@ public:
 		Common::String text;
 	};
 
+	enum {
+		ZVISION_STR_SAVEEXIST = 23,
+		ZVISION_STR_SAVED = 4,
+		ZVISION_STR_SAVEEMPTY = 21,
+		ZVISION_STR_EXITPROMT = 6
+	};
+
 private:
 	struct InGameText {
 		Common::List<TextFragment> fragments;
-- 
cgit v1.2.3


From e9676f5d7aa0a77b649ee99f4222f571894f96c2 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:42:16 +0700
Subject: ZVISION: Implementation of save control

---
 engines/zvision/module.mk                          |   1 +
 .../zvision/scripting/controls/save_control.cpp    | 122 +++++++++++++++++++++
 engines/zvision/scripting/controls/save_control.h  |  56 ++++++++++
 engines/zvision/scripting/scr_file_handling.cpp    |   3 +
 4 files changed, 182 insertions(+)
 create mode 100644 engines/zvision/scripting/controls/save_control.cpp
 create mode 100644 engines/zvision/scripting/controls/save_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 9d5072a64d..ee4a2331a0 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -20,6 +20,7 @@ MODULE_OBJS := \
 	scripting/controls/input_control.o \
 	scripting/controls/lever_control.o \
 	scripting/controls/push_toggle_control.o \
+	scripting/controls/save_control.o \
 	scripting/controls/slot_control.o \
 	scripting/inventory.o \
 	scripting/scr_file_handling.o \
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
new file mode 100644
index 0000000000..fda8a70114
--- /dev/null
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -0,0 +1,122 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/input_control.h"
+#include "zvision/scripting/controls/save_control.h"
+#include "zvision/utility/utility.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/text/string_manager.h"
+
+#include "zvision/core/save_manager.h"
+
+#include "common/str.h"
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key, CONTROL_SAVE),
+	  _saveControl(false) {
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (line.matchString("*savebox*", true)) {
+			int save_id;
+			int input_id;
+
+			sscanf(line.c_str(), "%*[^(](%d %d)", &save_id, &input_id);
+			save_elmnt elmnt;
+			elmnt.input_key = input_id;
+			elmnt.save_id = save_id;
+			elmnt.exist = false;
+			_inputs.push_back(elmnt);
+		} else if (line.matchString("*control_type*", true)) {
+			char buf[32];
+
+			sscanf(line.c_str(), "%*[^(](%s)", buf);
+			if (Common::String(buf).contains("save"))
+				_saveControl = true;
+			else
+				_saveControl = false;
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+	}
+
+	for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) {
+		Control *ctrl = _engine->getScriptManager()->getControl(iter->input_key);
+		if (ctrl && ctrl->getType() == Control::CONTROL_INPUT) {
+			InputControl *inp = (InputControl *)ctrl;
+			inp->setReadOnly(!_saveControl);
+			Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->save_id);
+			if (save) {
+				SaveGameHeader header;
+				_engine->getSaveManager()->readSaveGameHeader(save, header);
+				delete save;
+				inp->setText(header.saveName);
+				iter->exist = true;
+			}
+		}
+	}
+}
+
+bool SaveControl::process(uint32 deltaTimeInMillis) {
+	for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) {
+		Control *ctrl = _engine->getScriptManager()->getControl(iter->input_key);
+		if (ctrl && ctrl->getType() == Control::CONTROL_INPUT) {
+			InputControl *inp = (InputControl *)ctrl;
+			if (inp->enterPress()) {
+				if (_saveControl) {
+					if (inp->getText().size() > 0) {
+						bool toSave = true;
+						if (iter->exist)
+							if (!_engine->askQuestion(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEXIST)))
+								toSave = false;
+
+						if (toSave) {
+							_engine->getSaveManager()->saveGameBuffered(iter->save_id, inp->getText());
+							_engine->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
+							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
+						}
+					} else {
+						_engine->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000);
+					}
+				} else {
+					_engine->getSaveManager()->loadGame(iter->save_id);
+					return true;
+				}
+				break;
+			}
+		}
+	}
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h
new file mode 100644
index 0000000000..942b9c9269
--- /dev/null
+++ b/engines/zvision/scripting/controls/save_control.h
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SAVE_CONTROL_H
+#define ZVISION_SAVE_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "common/list.h"
+
+
+namespace ZVision {
+
+class SaveControl : public Control {
+public:
+	SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+
+private:
+	struct save_elmnt {
+		int save_id;
+		int input_key;
+		bool exist;
+	};
+	typedef Common::List<save_elmnt> saveElmntList;
+	saveElmntList _inputs;
+
+	bool _saveControl;
+
+public:
+
+	bool process(uint32 deltaTimeInMillis);
+
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index d1d6e2862d..cacde9b3ca 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -31,6 +31,7 @@
 #include "zvision/scripting/controls/push_toggle_control.h"
 #include "zvision/scripting/controls/lever_control.h"
 #include "zvision/scripting/controls/slot_control.h"
+#include "zvision/scripting/controls/save_control.h"
 #include "zvision/scripting/controls/input_control.h"
 
 #include "common/textconsole.h"
@@ -349,6 +350,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new SlotControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("input")) {
 		return new InputControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("save")) {
+		return new SaveControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 1696e0dd9675f087608fdfabb7b5c93d7d2820df Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 4 Aug 2014 16:43:15 +0700
Subject: ZVISION: Prepare save data while changing location

---
 engines/zvision/scripting/script_manager.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 380141490a..7a2854d230 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -538,8 +538,18 @@ void ScriptManager::do_changeLocation() {
 		}
 	}
 
-	// Auto save
-	//_engine->getSaveManager()->autoSave();
+	if (_nextLocation.world == 'g' && _nextLocation.room == 'j') {
+		if (_nextLocation.node == 's' && _nextLocation.view == 'e' &&
+		    _currentLocation.world != 'g' && _currentLocation.room != 'j')
+			_engine->getSaveManager()->prepareSaveBuffer();
+	} else {
+		if (_currentLocation.world == 'g' && _currentLocation.room == 'j')
+			_engine->getSaveManager()->flushSaveBuffer();
+		else {
+			// Auto save
+			//_engine->getSaveManager()->autoSave();
+		}
+	}
 
 	setStateValue(StateKey_World, _nextLocation.world);
 	setStateValue(StateKey_Room, _nextLocation.room);
-- 
cgit v1.2.3


From 04d42638cde9022523910b9ec75130bd85ec1fa5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 4 Aug 2014 09:21:39 -0400
Subject: ACCESS: Fleshed out beginning of title sequence, added Screen::clip

---
 engines/access/access.cpp             | 23 +++++++++-----
 engines/access/access.h               |  7 +++++
 engines/access/amazon/amazon_game.cpp | 37 +++++++++++++++++++---
 engines/access/amazon/amazon_game.h   |  2 +-
 engines/access/files.cpp              | 14 ++++++---
 engines/access/files.h                |  4 +--
 engines/access/screen.cpp             | 59 +++++++++++++++++++++++++++++++++++
 engines/access/screen.h               |  8 +++++
 engines/access/sound.cpp              | 29 +++++++++++++++--
 engines/access/sound.h                | 19 +++++++++--
 10 files changed, 177 insertions(+), 25 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 25d9fcc99e..1470842e1b 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -37,6 +37,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_graphics = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
+
+	_destIn = nullptr;
+	_objectsTable = nullptr;
 }
 
 AccessEngine::~AccessEngine() {
@@ -46,6 +49,14 @@ AccessEngine::~AccessEngine() {
 	delete _graphics;
 	delete _screen;
 	delete _sound;
+
+	_buffer1.free();
+	_buffer2.free();
+	delete[] _objectsTable;
+}
+
+void AccessEngine::setVGA() {
+	initGraphics(320, 200, false);
 }
 
 void AccessEngine::initialize() {
@@ -59,13 +70,16 @@ void AccessEngine::initialize() {
 	_files = new FileManager(this);
 	_graphics = new GraphicsManager(this);
 	_screen = new Screen(this);
-	_sound = new SoundManager(this);
+	_sound = new SoundManager(this, _mixer);
+
+	_buffer1.create(g_system->getWidth(), g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
+	_buffer2.create(g_system->getWidth(), g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
 }
 
 Common::Error AccessEngine::run() {
+	setVGA();
 	initialize();
 
-	setVGA();
 	_screen->setInitialPalettte();
 	_events->setCursor(CURSOR_0);
 	_events->showCursor();
@@ -95,9 +109,4 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
-void AccessEngine::setVGA() {
-	initGraphics(320, 200, false);
-}
-
-
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 3386cd9e11..05ef545e38 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -97,6 +97,13 @@ public:
 	GraphicsManager *_graphics;
 	Screen *_screen;
 	SoundManager *_sound;
+
+	byte *_destIn;
+	Graphics::Surface _buffer1;
+	Graphics::Surface _buffer2;
+	byte *_objectsTable;
+	int _pCount;
+
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 3f8ae73faa..30733087dd 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -30,19 +30,46 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		AccessEngine(syst, gameDesc) {
 }
 
+AmazonEngine::~AmazonEngine() {
+}
+
+
 void AmazonEngine::doTitle() {
 	_screen->setDisplayScan();
+	_destIn = (byte *)_buffer2.getPixels();
+
 	_screen->forceFadeOut();
 	_events->hideCursor();
 
-	_sound->_soundTable[0] = _sound->loadSound(98, 30);
+	_sound->queueSound(0, 98, 30);
 	_sound->_soundPriority[0] = 1;
-	_sound->_soundTable[1] = _sound->loadSound(98, 8);
-	_sound->_soundPriority[1] = 2;
 
 	_screen->_loadPalFlag = false;
-	byte *scr = _files->loadScreen(0, 3);
-	_screen->copyBuffer(scr);
+	_files->loadScreen(0, 3);
+	
+	_buffer2.copyFrom(*_screen);
+	_buffer1.copyFrom(*_screen);
+	_screen->forceFadeIn();
+	_sound->playSound(1);
+
+	_objectsTable = _files->loadFile(0, 2);
+	_sound->playSound(1);
+
+	_screen->_loadPalFlag = false;
+	_files->loadScreen(0, 4);
+	_sound->playSound(1);
+
+	_buffer2.copyFrom(*_screen);
+	_buffer1.copyFrom(*_screen);
+	_sound->playSound(1);
+
+	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
+	for (int _pCount = 0; _pCount < 3; ++_pCount) {
+		_buffer2.copyFrom(_buffer1);
+		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
+		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
+		_screen->plotImage(_objectsTable, id, Common::Point(xp, 71));
+	}
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 30ec2c6519..33d7833670 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -35,7 +35,7 @@ protected:
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
-	virtual ~AmazonEngine() {}
+	virtual ~AmazonEngine();
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 7b4a23d0e8..37b2578cea 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -72,15 +72,18 @@ void FileManager::openFile(const Common::String &filename) {
 	_filesize = _file.size();
 }
 
-byte *FileManager::loadScreen(int fileNum, int subfile) {
+void FileManager::loadScreen(int fileNum, int subfile) {
 	setAppended(fileNum);
 	gotoAppended(subfile);
 	_vm->_screen->loadPalette(_stream);
 
-	return handleFile();
+	// Get the data for the screen, and copy it over
+	byte *pSrc = handleFile();
+	Common::copy(pSrc, pSrc + _filesize, (byte *)_vm->_screen->getPixels());
+	delete[] pSrc;
 }
 
-byte *FileManager::loadScreen(const Common::String &filename) {
+void FileManager::loadScreen(const Common::String &filename) {
 	// Open the file
 	openFile(filename);
 
@@ -91,7 +94,10 @@ byte *FileManager::loadScreen(const Common::String &filename) {
 	delete _stream;
 	_stream = _file.readStream(_file.size() - _file.pos());
 
-	return handleFile();
+	// Get the data for the screen, and copy it over
+	byte *pSrc = handleFile();
+	Common::copy(pSrc, pSrc + _filesize, (byte *)_vm->_screen->getPixels());
+	delete[] pSrc;
 }
 
 byte *FileManager::handleFile() {
diff --git a/engines/access/files.h b/engines/access/files.h
index 9224b29429..848ee0d2ca 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -63,12 +63,12 @@ public:
 	/**
 	 * Load a given scren from a container file
 	 */
-	byte *loadScreen(int fileNum, int subfile);
+	void loadScreen(int fileNum, int subfile);
 
 	/**
 	* Load a given screen by name
 	*/
-	byte *loadScreen(const Common::String &filename);
+	void loadScreen(const Common::String &filename);
 
 	/**
 	 * Open up a sub-file container file
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 4059cab070..cb0154d56e 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "common/algorithm.h"
+#include "common/endian.h"
+#include "common/rect.h"
 #include "common/textconsole.h"
 #include "common/system.h"
 #include "graphics/palette.h"
@@ -33,6 +35,9 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
 	_loadPalFlag = false;
+	_leftSkip = _rightSkip = 0;
+	_topSkip = _bottomSkip = 0;
+	_clipWidth = _clipHeight = 0;
 }
 
 void Screen::setDisplayScan() {
@@ -114,4 +119,58 @@ void Screen::copyBuffer(const byte *data) {
 	g_system->copyRectToScreen(destP, w, 0, 0, w, h);
 }
 
+void Screen::plotImage(const byte *pData, int idx, const Common::Point &pt) {
+	const byte *sizeP = pData + READ_LE_UINT16(pData + idx * 4);
+	int w = READ_LE_UINT16(sizeP);
+	int h = READ_LE_UINT16(sizeP + 2);
+	Common::Rect r(pt.x, pt.y, pt.x + w, pt.y + h);
+
+	if (!clip(r)) {
+		_lastBounds = r;
+		//plotf();
+	}
+}
+
+bool Screen::clip(Common::Rect &r) {
+	int skip;
+	_leftSkip = _rightSkip = 0;
+	_topSkip = _bottomSkip = 0;
+
+	if (r.left > _clipWidth) {
+		skip = -r.left;
+		r.setWidth(r.width() - skip);
+		_leftSkip = skip;
+		r.moveTo(0, r.top);
+	} else if (r.left >= 0)
+		return true;
+
+	int right = r.right - 1;
+	if (right < 0)
+		return true;
+	else if (right > _clipWidth) {
+		skip = right - _clipWidth;
+		r.setWidth(r.width() - skip);
+		_rightSkip = skip;
+	}
+
+	if (r.top > _clipHeight) {
+		skip = -r.top;
+		r.setHeight(r.height() - skip);
+		_topSkip = skip;
+		r.moveTo(r.left, 0);
+	} else if (r.top >= 0)
+		return true;
+
+	int bottom = r.bottom - 1;
+	if (bottom < 0)
+		return true;
+	else if (bottom > _clipHeight) {
+		skip = bottom - _clipHeight;
+		_bottomSkip = skip;
+		r.setHeight(r.height() - skip);
+	}
+
+	return false;
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index d16333c46e..0d68c1bc7e 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -40,10 +40,16 @@ private:
 	AccessEngine *_vm;
 	byte _tempPalette[PALETTE_SIZE];
 	byte _rawPalette[PALETTE_SIZE];
+	Common::Rect _lastBounds;
+	int _leftSkip, _rightSkip;
+	int _topSkip, _bottomSkip;
+	int _clipWidth, _clipHeight;
 
 	void setPalette();
 
 	void updatePalette();
+
+	bool clip(Common::Rect &r);
 public:
 	bool _loadPalFlag;
 public:
@@ -77,6 +83,8 @@ public:
 	 * Copy a buffer to the screen
 	 */
 	void copyBuffer(const byte *data);
+
+	void plotImage(const byte *pData, int idx, const Common::Point &pt);
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index baad6352b8..5375485695 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -21,24 +21,47 @@
  */
 
 #include "common/algorithm.h"
+#include "audio/audiostream.h"
 #include "access/access.h"
 #include "access/sound.h"
 
 namespace Access {
 
-SoundManager::SoundManager(AccessEngine *vm) : _vm(vm) {
-	Common::fill(&_soundTable[0], &_soundTable[MAX_SOUNDS], (byte *)nullptr);
+SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : 
+		_vm(vm), _mixer(mixer) {
 	Common::fill(&_soundPriority[0], &_soundPriority[MAX_SOUNDS], 0);
+	for (int i = 0; i < MAX_SOUNDS; ++i)
+		_soundTable[i]._data = nullptr;
 }
 
 SoundManager::~SoundManager() {
 	for (int i = 0; i < MAX_SOUNDS; ++i)
-		delete _soundTable[i];
+		delete _soundTable[i]._data;
+}
+
+void SoundManager::queueSound(int idx, int fileNum, int subfile) {
+	/*
+	_soundTable[idx]._data = _vm->_files->loadFile(fileNum, subfile);
+	_soundTable[idx]._size = _vm->_files->_filesize;
+	*/
 }
 
 byte *SoundManager::loadSound(int fileNum, int subfile) {
 	return _vm->_files->loadFile(fileNum, subfile);
 }
 
+void SoundManager::playSound(int soundIndex) {
+	int idx = _soundPriority[soundIndex - 1] - 1;
+	playSound(_soundTable[idx]._data, _soundTable[idx]._size);
+}
+
+void SoundManager::playSound(byte *data, uint32 size) {
+	/*
+	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
+	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream, -1, 
+		Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::YES, false);
+		*/
+}
 
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 5d173e2e2b..d3d5052c0e 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -24,6 +24,7 @@
 #define ACCESS_SOUND_H
 
 #include "common/scummsys.h"
+#include "audio/mixer.h"
 
 #define MAX_SOUNDS 20
 
@@ -32,16 +33,28 @@ namespace Access {
 class AccessEngine;
 
 class SoundManager {
+	struct SoundEntry {
+		byte *_data;
+		uint32 _size;
+	};
 private:
 	AccessEngine *_vm;
+	Audio::Mixer *_mixer;
+	Audio::SoundHandle _soundHandle;
+
+	byte *loadSound(int fileNum, int subfile);
+
+	void playSound(byte *data, uint32 size);
 public:
-	byte *_soundTable[MAX_SOUNDS];
+	SoundEntry _soundTable[MAX_SOUNDS];
 	int _soundPriority[MAX_SOUNDS];
 public:
-	SoundManager(AccessEngine *vm);
+	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
 
-	byte *loadSound(int fileNum, int subfile);
+	void queueSound(int idx, int fileNum, int subfile);
+
+	void playSound(int soundIndex);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From bb48a153a6479e08fe37c3547e14622226efeeb2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 4 Aug 2014 21:35:49 -0400
Subject: ACCESS: Remove graphics manager, and added more skeleton for Amazon
 intro

---
 engines/access/access.cpp             |  9 +------
 engines/access/access.h               |  6 ++---
 engines/access/amazon/amazon_game.cpp | 39 +++++++++++++++++++++++++++
 engines/access/amazon/amazon_game.h   | 22 ++++++++++++++-
 engines/access/asurface.cpp           | 33 +++++++++++++++++++++++
 engines/access/asurface.h             | 38 ++++++++++++++++++++++++++
 engines/access/graphics.cpp           | 42 -----------------------------
 engines/access/graphics.h             | 50 -----------------------------------
 engines/access/module.mk              |  2 +-
 engines/access/screen.cpp             |  9 +++++++
 engines/access/screen.h               | 13 +++++++--
 11 files changed, 155 insertions(+), 108 deletions(-)
 create mode 100644 engines/access/asurface.cpp
 create mode 100644 engines/access/asurface.h
 delete mode 100644 engines/access/graphics.cpp
 delete mode 100644 engines/access/graphics.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 1470842e1b..af64612e01 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,7 +34,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
-	_graphics = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
 
@@ -46,7 +45,6 @@ AccessEngine::~AccessEngine() {
 	delete _debugger;
 	delete _events;
 	delete _files;
-	delete _graphics;
 	delete _screen;
 	delete _sound;
 
@@ -68,7 +66,6 @@ void AccessEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
-	_graphics = new GraphicsManager(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
 
@@ -80,11 +77,7 @@ Common::Error AccessEngine::run() {
 	setVGA();
 	initialize();
 
-	_screen->setInitialPalettte();
-	_events->setCursor(CURSOR_0);
-	_events->showCursor();
-	_graphics->setPanel(0);
-	doTitle();
+	playGame();
 
 	dummyLoop();
 	return Common::kNoError;
diff --git a/engines/access/access.h b/engines/access/access.h
index 05ef545e38..f6d51cc744 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -33,7 +33,6 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
-#include "access/graphics.h"
 #include "access/screen.h"
 #include "access/sound.h"
 
@@ -87,14 +86,13 @@ protected:
 	virtual bool hasFeature(EngineFeature f) const;
 protected:
 	/**
-	 * Show game title
+	 * Play the game
 	 */
-	virtual void doTitle() = 0;
+	virtual void playGame() = 0;
 public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
-	GraphicsManager *_graphics;
 	Screen *_screen;
 	SoundManager *_sound;
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 30733087dd..681819f602 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -28,11 +28,41 @@ namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 		AccessEngine(syst, gameDesc) {
+	_skipStart = false;
 }
 
 AmazonEngine::~AmazonEngine() {
 }
 
+void AmazonEngine::playGame() {
+	_screen->setInitialPalettte();
+	_events->setCursor(CURSOR_0);
+	_events->showCursor();
+	_screen->setPanel(0);
+	
+	doTitle();
+	if (shouldQuit())
+		return;
+
+	if (!_skipStart) {
+		_screen->setPanel(3);
+		doOpening();
+		if (shouldQuit())
+			return;
+
+		if (!_skipStart) {
+			doTent();
+			if (shouldQuit())
+				return;
+		}
+	}
+
+	doTitle();
+	if (shouldQuit())
+		return;
+
+	_screen->clearScreen();
+}
 
 void AmazonEngine::doTitle() {
 	_screen->setDisplayScan();
@@ -70,6 +100,15 @@ void AmazonEngine::doTitle() {
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
 		_screen->plotImage(_objectsTable, id, Common::Point(xp, 71));
 	}
+	// TODO: More to do
+}
+
+void AmazonEngine::doOpening() {
+	// TODO
+}
+
+void AmazonEngine::doTent() {
+	// TODO
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 33d7833670..79a74b329f 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -30,8 +30,28 @@ namespace Access {
 namespace Amazon {
 
 class AmazonEngine : public AccessEngine {
+private:
+	bool _skipStart;
+
+	/**
+	 * Do title sequence
+	 */
+	void doTitle();
+
+	/**
+	 * Do opening sequence
+	 */
+	void doOpening();
+
+	/**
+	 * Do tent scene of introduction
+	 */
+	void doTent();
 protected:
-	virtual void doTitle();
+	/**
+	 * Play the game
+	 */
+	virtual void playGame();
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
new file mode 100644
index 0000000000..a0a790dbdc
--- /dev/null
+++ b/engines/access/asurface.cpp
@@ -0,0 +1,33 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/algorithm.h"
+#include "access/asurface.h"
+
+namespace Access {
+
+void ASurface::clearBuffer() {
+	byte *pSrc = (byte *)getPixels();
+	Common::fill(pSrc, pSrc + w * h, 0);
+}
+
+} // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
new file mode 100644
index 0000000000..ecd04b9682
--- /dev/null
+++ b/engines/access/asurface.h
@@ -0,0 +1,38 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_ASURFACE_H
+#define ACCESS_ASURFACE_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+namespace Access {
+
+class ASurface : public Graphics::Surface {
+public:
+	void clearBuffer();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_ASURFACE_H */
diff --git a/engines/access/graphics.cpp b/engines/access/graphics.cpp
deleted file mode 100644
index c1187f2eb3..0000000000
--- a/engines/access/graphics.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "graphics/palette.h"
-#include "access/access.h"
-#include "access/graphics.h"
-#include "access/resources.h"
-
-namespace Access {
-
-GraphicsManager::GraphicsManager(AccessEngine *vm) : _vm(vm) {
-	_vesaCurrentWin = 0;
-	_currentPanel = 0;
-	_hideFlag = true;
-}
-
-void GraphicsManager::setPanel(int num) {
-	assert(num < 4);
-	_currentPanel = num;
-	_msVirtualOffset = _virtualOffsetsTable[num];
-}
-
-} // End of namespace Access
diff --git a/engines/access/graphics.h b/engines/access/graphics.h
deleted file mode 100644
index df626176fa..0000000000
--- a/engines/access/graphics.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ACCESS_GRAPHICS_H
-#define ACCESS_GRAPHICS_H
-
-#include "common/rect.h"
-#include "graphics/surface.h"
-
-namespace Access {
-
-class AccessEngine;
-
-class GraphicsManager {
-private:
-	AccessEngine *_vm;
-public:
-	int _vesaCurrentWin;
-	int _currentPanel;
-	Common::Point _msVirtualOffset;
-	Common::Point _virtualOffsetsTable[4];
-	bool _hideFlag;
-public:
-	GraphicsManager(AccessEngine *vm);
-
-	void setPanel(int num);
-};
-
-} // End of namespace Access
-
-#endif /* ACCESS_GRAPHICS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index c9d593de22..ff4cedbdc6 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -1,13 +1,13 @@
 MODULE := engines/access
 
 MODULE_OBJS := \
+	asurface.o \
 	access.o \
 	debugger.o \
 	decompress.o \
 	detection.o \
 	events.o \
 	files.o \
-	graphics.o \
 	resources.o \
 	screen.o \
 	sound.o \
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index cb0154d56e..591bb67a7f 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -34,6 +34,9 @@ namespace Access {
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
+	_vesaCurrentWin = 0;
+	_currentPanel = 0;
+	_hideFlag = true;
 	_loadPalFlag = false;
 	_leftSkip = _rightSkip = 0;
 	_topSkip = _bottomSkip = 0;
@@ -44,6 +47,12 @@ void Screen::setDisplayScan() {
 	warning("TODO: setDisplayScan");
 }
 
+void Screen::setPanel(int num) {
+	assert(num < 4);
+	_currentPanel = num;
+	_msVirtualOffset = _virtualOffsetsTable[num];
+}
+
 void Screen::updateScreen() {
 	g_system->updateScreen();
 }
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 0d68c1bc7e..295372770a 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/stream.h"
-#include "graphics/surface.h"
+#include "access/asurface.h"
 
 namespace Access {
 
@@ -35,11 +35,16 @@ class AccessEngine;
 #define PALETTE_COUNT 256
 #define PALETTE_SIZE (256 * 3)
 
-class Screen: public Graphics::Surface {
+class Screen: public ASurface {
 private:
 	AccessEngine *_vm;
 	byte _tempPalette[PALETTE_SIZE];
 	byte _rawPalette[PALETTE_SIZE];
+	int _vesaCurrentWin;
+	int _currentPanel;
+	Common::Point _msVirtualOffset;
+	Common::Point _virtualOffsetsTable[4];
+	bool _hideFlag;
 	Common::Rect _lastBounds;
 	int _leftSkip, _rightSkip;
 	int _topSkip, _bottomSkip;
@@ -57,6 +62,8 @@ public:
 
 	void setDisplayScan();
 
+	void setPanel(int num);
+
 	/**
 	 * Update the underlying screen
 	 */
@@ -72,6 +79,8 @@ public:
 	 */
 	void forceFadeIn();
 
+	void clearScreen() { clearBuffer(); }
+
 	/**
 	 * Set the initial palette
 	 */
-- 
cgit v1.2.3


From e6b1d148ce184a53598fbf9cefa28689678b47a9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 4 Aug 2014 22:38:50 -0400
Subject: ACCESS: Added Globals classes

---
 engines/access/access.cpp                | 19 ++++++++
 engines/access/access.h                  | 19 ++++++++
 engines/access/amazon/amazon_game.cpp    |  8 +++
 engines/access/amazon/amazon_game.h      |  6 +++
 engines/access/amazon/amazon_globals.cpp | 48 ++++++++++++++++++
 engines/access/amazon/amazon_globals.h   | 58 ++++++++++++++++++++++
 engines/access/globals.cpp               | 75 ++++++++++++++++++++++++++++
 engines/access/globals.h                 | 84 ++++++++++++++++++++++++++++++++
 engines/access/module.mk                 |  4 +-
 9 files changed, 320 insertions(+), 1 deletion(-)
 create mode 100644 engines/access/amazon/amazon_globals.cpp
 create mode 100644 engines/access/amazon/amazon_globals.h
 create mode 100644 engines/access/globals.cpp
 create mode 100644 engines/access/globals.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index af64612e01..3639115455 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,11 +34,30 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
+	_globals = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
 
 	_destIn = nullptr;
 	_objectsTable = nullptr;
+	_pCount = 0;
+	_currentMan = 0;
+	_currentManOld = -1;
+	_man1 = nullptr;
+	_manPal1 = nullptr;
+	_music = nullptr;
+	_playField = nullptr;
+	_script = nullptr;
+	_anim = nullptr;
+	_title = nullptr;
+	_converseMode = 0;
+	_startInvItem = 0;
+	_startAboutItem = 0;
+	_startTravelItem = 0;
+	_startInvBox = 0;
+	_startAboutBox = 0;
+	_startTravelBox = 0;
+
 }
 
 AccessEngine::~AccessEngine() {
diff --git a/engines/access/access.h b/engines/access/access.h
index f6d51cc744..34287116ba 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -33,6 +33,7 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
+#include "access/globals.h"
 #include "access/screen.h"
 #include "access/sound.h"
 
@@ -93,6 +94,7 @@ public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
+	Globals *_globals;
 	Screen *_screen;
 	SoundManager *_sound;
 
@@ -102,6 +104,23 @@ public:
 	byte *_objectsTable;
 	int _pCount;
 
+	int _currentMan;
+	int _currentManOld;
+	byte *_man1;
+	byte *_manPal1;
+	byte *_music;
+	byte *_playField;
+	byte *_script;
+	byte *_anim;
+	byte *_title;
+	int _converseMode;
+	int _startInvItem;
+	int _startAboutItem;
+	int _startTravelItem;
+	int _startInvBox;
+	int _startAboutBox;
+	int _startTravelBox;
+
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 681819f602..af7b77e743 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "access/amazon/amazon_game.h"
+#include "access/amazon/amazon_globals.h"
 
 namespace Access {
 
@@ -28,10 +29,12 @@ namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 		AccessEngine(syst, gameDesc) {
+	_globals = new AmazonGlobals();
 	_skipStart = false;
 }
 
 AmazonEngine::~AmazonEngine() {
+	delete _globals;
 }
 
 void AmazonEngine::playGame() {
@@ -62,6 +65,10 @@ void AmazonEngine::playGame() {
 		return;
 
 	_screen->clearScreen();
+	_screen->setPanel(0);
+	_screen->forceFadeOut();
+
+
 }
 
 void AmazonEngine::doTitle() {
@@ -111,6 +118,7 @@ void AmazonEngine::doTent() {
 	// TODO
 }
 
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 79a74b329f..42fc31d724 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -24,6 +24,7 @@
 #define ACCESS_AMAZON_GAME_H
 
 #include "access/access.h"
+#include "access/amazon/amazon_globals.h"
 
 namespace Access {
 
@@ -47,6 +48,11 @@ private:
 	 * Do tent scene of introduction
 	 */
 	void doTent();
+
+	/**
+	 * Get globals reference
+	 */
+	AmazonGlobals &globals() { return *(AmazonGlobals *)_globals; }
 protected:
 	/**
 	 * Play the game
diff --git a/engines/access/amazon/amazon_globals.cpp b/engines/access/amazon/amazon_globals.cpp
new file mode 100644
index 0000000000..7982233730
--- /dev/null
+++ b/engines/access/amazon/amazon_globals.cpp
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software = 0; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation = 0; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY = 0; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program = 0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/algorithm.h"
+#include "access/amazon/amazon_globals.h"
+
+namespace Access {
+
+namespace Amazon {
+
+AmazonGlobals::AmazonGlobals() : Globals() {
+	_canoeLane = 0;
+	_canoeYPos = 0;
+	_hitCount = 0;
+	_saveRiver = 0;
+	_hitSafe = 0;
+	_chapter = 0;
+	_topList = 0;
+	_botList = 0;
+	_riverIndex = 0;
+	_rawInactiveX = 0;
+	_rawInactiveY = 0;
+	_inactiveYOff = 0;
+	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
+}
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_globals.h b/engines/access/amazon/amazon_globals.h
new file mode 100644
index 0000000000..d9631f7450
--- /dev/null
+++ b/engines/access/amazon/amazon_globals.h
@@ -0,0 +1,58 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_GLOBALS_H
+#define ACCESS_AMAZON_GLOBALS_H
+
+#include "common/scummsys.h"
+#include "access/globals.h"
+
+namespace Access {
+
+namespace Amazon {
+
+class AmazonGlobals: public Globals {
+public:
+	int _canoeLane;
+	int _canoeYPos;
+	int _hitCount;
+	int _saveRiver;
+	int _hitSafe;
+	int _chapter;
+	int _topList;
+	int _botList;
+	int _riverIndex;
+	int _rawInactiveX;
+	int _rawInactiveY;
+	int _inactiveYOff;
+	int _esTabTable[100];
+public:
+	AmazonGlobals();
+
+	virtual ~AmazonGlobals() {}
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_GLOBALS_H */
diff --git a/engines/access/globals.cpp b/engines/access/globals.cpp
new file mode 100644
index 0000000000..ab0c37b168
--- /dev/null
+++ b/engines/access/globals.cpp
@@ -0,0 +1,75 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software = 0; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation = 0; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY = 0; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program = 0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/algorithm.h"
+#include "access/globals.h"
+
+namespace Access {
+
+Globals::Globals() {
+	_startData = 0;
+	_rawPlayerXLow = 0;
+	_rawPlayerX = 0;
+	_rawPlayerYLow = 0;
+	_rawPlayerY = 0;
+	_conversation = 0;
+	_currentMan = 0;
+	_newTime = 0;
+	_newDate = 0;
+	_intTim[3] = 0;
+	_timer[3] = 0;
+	_timerFlag = false;
+	Common::fill(&_flags[0], &_flags[99], 0);
+	Common::fill(&_useItem[0], &_useItem[23], 0);
+	_guardLoc = 0;
+	_guardFind = 0;
+	_helpLevel = 0;
+	_jasMayaFlag = 0;
+	_moreHelp = 0;
+	_startup = 0;
+	_flashbackFlag = false;
+	_manScaleOff = 0;
+	_riverFlag = false;
+	_antOutFlag = false;
+	_badEnd = 0;
+	_noHints = false;
+	_antFlag = false;
+	_allenFlag = false;
+	_noSound = false;
+	Common::fill(&inv[0], &inv[85], 0);
+	Common::fill(&_help1[0], &_help1[366], 0);
+	Common::fill(&_help2[0], &_help2[366], 0);
+	Common::fill(&_help1[0], &_help3[366], 0);
+	_travel = 0;
+	_ask = 0;
+	_rScrollRow = 0;
+	_rScrollCol = 0;
+	_rSrcollX = 0;
+	_rScrollY = 0;
+	_rOldRectCount = 0;
+	_rNewRectCount = 0;
+	_rKeyFlag = 0;
+	_mapOffset = 0;
+	_screenVirtX = 0;
+}
+
+} // End of namespace Access
diff --git a/engines/access/globals.h b/engines/access/globals.h
new file mode 100644
index 0000000000..30dbd46ad8
--- /dev/null
+++ b/engines/access/globals.h
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_GLOBALS_H
+#define ACCESS_GLOBALS_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+class Globals {
+public:
+	int _startData;
+	int _rawPlayerXLow;
+	int _rawPlayerX;
+	int _rawPlayerYLow;
+	int _rawPlayerY;
+	int _conversation;
+	int _currentMan;
+	uint32 _newTime;
+	uint32 _newDate;
+	int _intTim[3];
+	int _timer[3];
+	bool _timerFlag;
+	byte _flags[99];
+	byte _useItem[23];
+	int _guardLoc;
+	int _guardFind;
+	int _helpLevel;
+	int _jasMayaFlag;
+	int _moreHelp;
+	int _startup;
+	bool _flashbackFlag;
+	int _manScaleOff;
+	bool _riverFlag;
+	bool _antOutFlag;
+	int _badEnd;
+	bool _noHints;
+	bool _antFlag;
+	bool _allenFlag;
+	bool _noSound;
+	int inv[85];
+	byte _help1[366];
+	byte _help2[366];
+	byte _help3[366];
+	int _travel;
+	int _ask;
+	int _rScrollRow;
+	int _rScrollCol;
+	int _rSrcollX;
+	int _rScrollY;
+	int _rOldRectCount;
+	int _rNewRectCount;
+	int _rKeyFlag;
+	int _mapOffset;
+	int _screenVirtX;
+public:
+	Globals();
+
+	virtual ~Globals() {}
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_GLOBALS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index ff4cedbdc6..e49a11be41 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -8,10 +8,12 @@ MODULE_OBJS := \
 	detection.o \
 	events.o \
 	files.o \
+	globals.o \
 	resources.o \
 	screen.o \
 	sound.o \
-	amazon\amazon_game.o
+	amazon\amazon_game.o \
+	amazon\amazon_globals.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
-- 
cgit v1.2.3


From c4fb766811d523a28630c98ca535cb9c6000acf5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 5 Aug 2014 20:04:41 -0400
Subject: ACCESS: Moved globals into the main engine classes

---
 engines/access/access.cpp                | 45 ++++++++++++++++-
 engines/access/access.h                  | 48 ++++++++++++++++--
 engines/access/amazon/amazon_game.cpp    | 17 +++++--
 engines/access/amazon/amazon_game.h      | 22 ++++++---
 engines/access/amazon/amazon_globals.cpp | 48 ------------------
 engines/access/amazon/amazon_globals.h   | 58 ----------------------
 engines/access/globals.cpp               | 75 ----------------------------
 engines/access/globals.h                 | 84 --------------------------------
 engines/access/module.mk                 |  4 +-
 9 files changed, 120 insertions(+), 281 deletions(-)
 delete mode 100644 engines/access/amazon/amazon_globals.cpp
 delete mode 100644 engines/access/amazon/amazon_globals.h
 delete mode 100644 engines/access/globals.cpp
 delete mode 100644 engines/access/globals.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 3639115455..fdf6cd03b0 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,7 +34,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
-	_globals = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
 
@@ -58,6 +57,50 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_startAboutBox = 0;
 	_startTravelBox = 0;
 
+	_startData = 0;
+	_rawPlayerXLow = 0;
+	_rawPlayerX = 0;
+	_rawPlayerYLow = 0;
+	_rawPlayerY = 0;
+	_conversation = 0;
+	_currentMan = 0;
+	_newTime = 0;
+	_newDate = 0;
+	_intTim[3] = 0;
+	_timer[3] = 0;
+	_timerFlag = false;
+	Common::fill(&_flags[0], &_flags[99], 0);
+	Common::fill(&_useItem[0], &_useItem[23], 0);
+	_guardLoc = 0;
+	_guardFind = 0;
+	_helpLevel = 0;
+	_jasMayaFlag = 0;
+	_moreHelp = 0;
+	_startup = 0;
+	_flashbackFlag = false;
+	_manScaleOff = 0;
+	_riverFlag = false;
+	_antOutFlag = false;
+	_badEnd = 0;
+	_noHints = false;
+	_antFlag = false;
+	_allenFlag = false;
+	_noSound = false;
+	Common::fill(&inv[0], &inv[85], 0);
+	Common::fill(&_help1[0], &_help1[366], 0);
+	Common::fill(&_help2[0], &_help2[366], 0);
+	Common::fill(&_help1[0], &_help3[366], 0);
+	_travel = 0;
+	_ask = 0;
+	_rScrollRow = 0;
+	_rScrollCol = 0;
+	_rSrcollX = 0;
+	_rScrollY = 0;
+	_rOldRectCount = 0;
+	_rNewRectCount = 0;
+	_rKeyFlag = 0;
+	_mapOffset = 0;
+	_screenVirtX = 0;
 }
 
 AccessEngine::~AccessEngine() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 34287116ba..fd95c912bc 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -33,7 +33,6 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
-#include "access/globals.h"
 #include "access/screen.h"
 #include "access/sound.h"
 
@@ -94,7 +93,6 @@ public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
-	Globals *_globals;
 	Screen *_screen;
 	SoundManager *_sound;
 
@@ -104,7 +102,6 @@ public:
 	byte *_objectsTable;
 	int _pCount;
 
-	int _currentMan;
 	int _currentManOld;
 	byte *_man1;
 	byte *_manPal1;
@@ -121,6 +118,51 @@ public:
 	int _startAboutBox;
 	int _startTravelBox;
 
+	// Fields that are included in savegames
+	int _startData;
+	int _rawPlayerXLow;
+	int _rawPlayerX;
+	int _rawPlayerYLow;
+	int _rawPlayerY;
+	int _conversation;
+	int _currentMan;
+	uint32 _newTime;
+	uint32 _newDate;
+	int _intTim[3];
+	int _timer[3];
+	bool _timerFlag;
+	byte _flags[99];
+	byte _useItem[23];
+	int _guardLoc;
+	int _guardFind;
+	int _helpLevel;
+	int _jasMayaFlag;
+	int _moreHelp;
+	int _startup;
+	bool _flashbackFlag;
+	int _manScaleOff;
+	bool _riverFlag;
+	bool _antOutFlag;
+	int _badEnd;
+	bool _noHints;
+	bool _antFlag;
+	bool _allenFlag;
+	bool _noSound;
+	int inv[85];
+	byte _help1[366];
+	byte _help2[366];
+	byte _help3[366];
+	int _travel;
+	int _ask;
+	int _rScrollRow;
+	int _rScrollCol;
+	int _rSrcollX;
+	int _rScrollY;
+	int _rOldRectCount;
+	int _rNewRectCount;
+	int _rKeyFlag;
+	int _mapOffset;
+	int _screenVirtX;
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index af7b77e743..068d3bf6f8 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "access/amazon/amazon_game.h"
-#include "access/amazon/amazon_globals.h"
 
 namespace Access {
 
@@ -29,12 +28,24 @@ namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 		AccessEngine(syst, gameDesc) {
-	_globals = new AmazonGlobals();
 	_skipStart = false;
+
+	_canoeLane = 0;
+	_canoeYPos = 0;
+	_hitCount = 0;
+	_saveRiver = 0;
+	_hitSafe = 0;
+	_chapter = 0;
+	_topList = 0;
+	_botList = 0;
+	_riverIndex = 0;
+	_rawInactiveX = 0;
+	_rawInactiveY = 0;
+	_inactiveYOff = 0;
+	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 }
 
 AmazonEngine::~AmazonEngine() {
-	delete _globals;
 }
 
 void AmazonEngine::playGame() {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 42fc31d724..1b5397b033 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -24,7 +24,6 @@
 #define ACCESS_AMAZON_GAME_H
 
 #include "access/access.h"
-#include "access/amazon/amazon_globals.h"
 
 namespace Access {
 
@@ -34,6 +33,22 @@ class AmazonEngine : public AccessEngine {
 private:
 	bool _skipStart;
 
+	// Fields that are included in savegames
+	int _canoeLane;
+	int _canoeYPos;
+	int _hitCount;
+	int _saveRiver;
+	int _hitSafe;
+	int _chapter;
+	int _topList;
+	int _botList;
+	int _riverIndex;
+	int _rawInactiveX;
+	int _rawInactiveY;
+	int _inactiveYOff;
+	int _esTabTable[100];
+
+
 	/**
 	 * Do title sequence
 	 */
@@ -48,11 +63,6 @@ private:
 	 * Do tent scene of introduction
 	 */
 	void doTent();
-
-	/**
-	 * Get globals reference
-	 */
-	AmazonGlobals &globals() { return *(AmazonGlobals *)_globals; }
 protected:
 	/**
 	 * Play the game
diff --git a/engines/access/amazon/amazon_globals.cpp b/engines/access/amazon/amazon_globals.cpp
deleted file mode 100644
index 7982233730..0000000000
--- a/engines/access/amazon/amazon_globals.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software = 0; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation = 0; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY = 0; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program = 0; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/algorithm.h"
-#include "access/amazon/amazon_globals.h"
-
-namespace Access {
-
-namespace Amazon {
-
-AmazonGlobals::AmazonGlobals() : Globals() {
-	_canoeLane = 0;
-	_canoeYPos = 0;
-	_hitCount = 0;
-	_saveRiver = 0;
-	_hitSafe = 0;
-	_chapter = 0;
-	_topList = 0;
-	_botList = 0;
-	_riverIndex = 0;
-	_rawInactiveX = 0;
-	_rawInactiveY = 0;
-	_inactiveYOff = 0;
-	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
-}
-
-} // End of namespace Amazon
-
-} // End of namespace Access
diff --git a/engines/access/amazon/amazon_globals.h b/engines/access/amazon/amazon_globals.h
deleted file mode 100644
index d9631f7450..0000000000
--- a/engines/access/amazon/amazon_globals.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ACCESS_AMAZON_GLOBALS_H
-#define ACCESS_AMAZON_GLOBALS_H
-
-#include "common/scummsys.h"
-#include "access/globals.h"
-
-namespace Access {
-
-namespace Amazon {
-
-class AmazonGlobals: public Globals {
-public:
-	int _canoeLane;
-	int _canoeYPos;
-	int _hitCount;
-	int _saveRiver;
-	int _hitSafe;
-	int _chapter;
-	int _topList;
-	int _botList;
-	int _riverIndex;
-	int _rawInactiveX;
-	int _rawInactiveY;
-	int _inactiveYOff;
-	int _esTabTable[100];
-public:
-	AmazonGlobals();
-
-	virtual ~AmazonGlobals() {}
-};
-
-} // End of namespace Amazon
-
-} // End of namespace Access
-
-#endif /* ACCESS_AMAZON_GLOBALS_H */
diff --git a/engines/access/globals.cpp b/engines/access/globals.cpp
deleted file mode 100644
index ab0c37b168..0000000000
--- a/engines/access/globals.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software = 0; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation = 0; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY = 0; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program = 0; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/algorithm.h"
-#include "access/globals.h"
-
-namespace Access {
-
-Globals::Globals() {
-	_startData = 0;
-	_rawPlayerXLow = 0;
-	_rawPlayerX = 0;
-	_rawPlayerYLow = 0;
-	_rawPlayerY = 0;
-	_conversation = 0;
-	_currentMan = 0;
-	_newTime = 0;
-	_newDate = 0;
-	_intTim[3] = 0;
-	_timer[3] = 0;
-	_timerFlag = false;
-	Common::fill(&_flags[0], &_flags[99], 0);
-	Common::fill(&_useItem[0], &_useItem[23], 0);
-	_guardLoc = 0;
-	_guardFind = 0;
-	_helpLevel = 0;
-	_jasMayaFlag = 0;
-	_moreHelp = 0;
-	_startup = 0;
-	_flashbackFlag = false;
-	_manScaleOff = 0;
-	_riverFlag = false;
-	_antOutFlag = false;
-	_badEnd = 0;
-	_noHints = false;
-	_antFlag = false;
-	_allenFlag = false;
-	_noSound = false;
-	Common::fill(&inv[0], &inv[85], 0);
-	Common::fill(&_help1[0], &_help1[366], 0);
-	Common::fill(&_help2[0], &_help2[366], 0);
-	Common::fill(&_help1[0], &_help3[366], 0);
-	_travel = 0;
-	_ask = 0;
-	_rScrollRow = 0;
-	_rScrollCol = 0;
-	_rSrcollX = 0;
-	_rScrollY = 0;
-	_rOldRectCount = 0;
-	_rNewRectCount = 0;
-	_rKeyFlag = 0;
-	_mapOffset = 0;
-	_screenVirtX = 0;
-}
-
-} // End of namespace Access
diff --git a/engines/access/globals.h b/engines/access/globals.h
deleted file mode 100644
index 30dbd46ad8..0000000000
--- a/engines/access/globals.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ACCESS_GLOBALS_H
-#define ACCESS_GLOBALS_H
-
-#include "common/scummsys.h"
-
-namespace Access {
-
-class Globals {
-public:
-	int _startData;
-	int _rawPlayerXLow;
-	int _rawPlayerX;
-	int _rawPlayerYLow;
-	int _rawPlayerY;
-	int _conversation;
-	int _currentMan;
-	uint32 _newTime;
-	uint32 _newDate;
-	int _intTim[3];
-	int _timer[3];
-	bool _timerFlag;
-	byte _flags[99];
-	byte _useItem[23];
-	int _guardLoc;
-	int _guardFind;
-	int _helpLevel;
-	int _jasMayaFlag;
-	int _moreHelp;
-	int _startup;
-	bool _flashbackFlag;
-	int _manScaleOff;
-	bool _riverFlag;
-	bool _antOutFlag;
-	int _badEnd;
-	bool _noHints;
-	bool _antFlag;
-	bool _allenFlag;
-	bool _noSound;
-	int inv[85];
-	byte _help1[366];
-	byte _help2[366];
-	byte _help3[366];
-	int _travel;
-	int _ask;
-	int _rScrollRow;
-	int _rScrollCol;
-	int _rSrcollX;
-	int _rScrollY;
-	int _rOldRectCount;
-	int _rNewRectCount;
-	int _rKeyFlag;
-	int _mapOffset;
-	int _screenVirtX;
-public:
-	Globals();
-
-	virtual ~Globals() {}
-};
-
-} // End of namespace Access
-
-#endif /* ACCESS_GLOBALS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index e49a11be41..ff4cedbdc6 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -8,12 +8,10 @@ MODULE_OBJS := \
 	detection.o \
 	events.o \
 	files.o \
-	globals.o \
 	resources.o \
 	screen.o \
 	sound.o \
-	amazon\amazon_game.o \
-	amazon\amazon_globals.o
+	amazon\amazon_game.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
-- 
cgit v1.2.3


From f1309a7b0b7e98256b45e9977c62f040452d54c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 5 Aug 2014 20:59:44 -0400
Subject: ACCESS: Remainder of Amazon game initialization added

---
 engines/access/access.cpp             | 16 ++++++--
 engines/access/access.h               | 21 ++++++++--
 engines/access/amazon/amazon_game.cpp | 54 ++++++++++++++++++++------
 engines/access/amazon/amazon_game.h   | 10 +++++
 engines/access/data.cpp               | 46 ++++++++++++++++++++++
 engines/access/data.h                 | 72 +++++++++++++++++++++++++++++++++++
 engines/access/module.mk              |  1 +
 engines/access/resources.cpp          | 69 +++++++++++++++++++++++++++++++++
 engines/access/resources.h            |  2 +
 9 files changed, 274 insertions(+), 17 deletions(-)
 create mode 100644 engines/access/data.cpp
 create mode 100644 engines/access/data.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index fdf6cd03b0..2a61a8ff8a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -38,8 +38,11 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_sound = nullptr;
 
 	_destIn = nullptr;
-	_objectsTable = nullptr;
+	clearCellTable();
 	_pCount = 0;
+	_selectCommand = 0;
+	_normalMouse = true;
+	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
 	_man1 = nullptr;
@@ -57,7 +60,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_startAboutBox = 0;
 	_startTravelBox = 0;
 
-	_startData = 0;
+	_roomNumber = 0;
 	_rawPlayerXLow = 0;
 	_rawPlayerX = 0;
 	_rawPlayerYLow = 0;
@@ -112,7 +115,6 @@ AccessEngine::~AccessEngine() {
 
 	_buffer1.free();
 	_buffer2.free();
-	delete[] _objectsTable;
 }
 
 void AccessEngine::setVGA() {
@@ -164,4 +166,12 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
+void AccessEngine::clearCellTable() {
+	Common::fill(&_objectsTable[0], &_objectsTable[100], (byte *)nullptr);
+}
+
+void AccessEngine::doRoom() {
+	// TODO
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index fd95c912bc..869441e96b 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -30,6 +30,7 @@
 #include "common/util.h"
 #include "engines/engine.h"
 #include "graphics/surface.h"
+#include "access/data.h"
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
@@ -63,7 +64,6 @@ enum AccessDebugChannels {
 
 struct AccessGameDescription;
 
-
 class AccessEngine : public Engine {
 private:
 	/**
@@ -81,6 +81,16 @@ protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
 
+	/**
+	 * Clear the cell table
+	 */
+	void clearCellTable();
+
+	/**
+	 * Main handler for showing game rooms
+	 */
+	void doRoom();
+
 	// Engine APIs
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
@@ -99,8 +109,13 @@ public:
 	byte *_destIn;
 	Graphics::Surface _buffer1;
 	Graphics::Surface _buffer2;
-	byte *_objectsTable;
+	byte *_objectsTable[100];
+	Common::Array<TimerEntry> _timers;
+	Player _player;
 	int _pCount;
+	int _selectCommand;
+	bool _normalMouse;
+	int _mouseMode;
 
 	int _currentManOld;
 	byte *_man1;
@@ -119,7 +134,7 @@ public:
 	int _startTravelBox;
 
 	// Fields that are included in savegames
-	int _startData;
+	int _roomNumber;
 	int _rawPlayerXLow;
 	int _rawPlayerX;
 	int _rawPlayerYLow;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 068d3bf6f8..6eef2cf93e 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "access/amazon/amazon_game.h"
+#include "access/resources.h"
 
 namespace Access {
 
@@ -49,11 +50,30 @@ AmazonEngine::~AmazonEngine() {
 }
 
 void AmazonEngine::playGame() {
+	doIntroduction();
+	if (shouldQuit())
+		return;
+
+	// Setup the game
+	setupGame();
+
+	_screen->clearScreen();
+	_screen->setPanel(0);
+	_screen->forceFadeOut();
+
+	_events->showCursor();
+	doRoom();
+}
+
+void AmazonEngine::doIntroduction() {
 	_screen->setInitialPalettte();
 	_events->setCursor(CURSOR_0);
 	_events->showCursor();
 	_screen->setPanel(0);
-	
+
+	// TODO: Worry about implementing full intro sequence later
+	return;
+
 	doTitle();
 	if (shouldQuit())
 		return;
@@ -72,14 +92,6 @@ void AmazonEngine::playGame() {
 	}
 
 	doTitle();
-	if (shouldQuit())
-		return;
-
-	_screen->clearScreen();
-	_screen->setPanel(0);
-	_screen->forceFadeOut();
-
-
 }
 
 void AmazonEngine::doTitle() {
@@ -100,7 +112,7 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->playSound(1);
 
-	_objectsTable = _files->loadFile(0, 2);
+	_objectsTable[0] = _files->loadFile(0, 2);
 	_sound->playSound(1);
 
 	_screen->_loadPalFlag = false;
@@ -116,7 +128,7 @@ void AmazonEngine::doTitle() {
 		_buffer2.copyFrom(_buffer1);
 		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
-		_screen->plotImage(_objectsTable, id, Common::Point(xp, 71));
+		_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
 	}
 	// TODO: More to do
 }
@@ -129,6 +141,26 @@ void AmazonEngine::doTent() {
 	// TODO
 }
 
+void AmazonEngine::setupGame() {
+	_chapter = 1;
+	clearCellTable();
+
+	// Setup timers
+	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
+	for (int i = 0; i < 32; ++i) {
+		TimerEntry te;
+		te._initTm = te._timer = (i < 8) ? TIMER_DEFAULTS[i] : 1;
+		te._flag = true;
+
+		_timers.push_back(te);
+	}
+
+	// Set miscellaneous fields
+	_roomNumber = 4;
+	_player._playerX = _rawPlayerX = TRAVEL_POS[_roomNumber][0];
+	_player._playerY = _rawPlayerY = TRAVEL_POS[_roomNumber][1];
+	_selectCommand = -1;
+}
 
 } // End of namespace Amazon
 
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 1b5397b033..b998b1de83 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -48,6 +48,10 @@ private:
 	int _inactiveYOff;
 	int _esTabTable[100];
 
+	/**
+	 * Do the game introduction
+	 */
+	void doIntroduction();
 
 	/**
 	 * Do title sequence
@@ -63,6 +67,12 @@ private:
 	 * Do tent scene of introduction
 	 */
 	void doTent();
+
+	/**
+	 * Setup variables for the game
+	 */
+	void setupGame();
+
 protected:
 	/**
 	 * Play the game
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
new file mode 100644
index 0000000000..e5ee1e1e7f
--- /dev/null
+++ b/engines/access/data.cpp
@@ -0,0 +1,46 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/data.h"
+#include "common/algorithm.h"
+
+namespace Access {
+
+Player::Player() {
+	_field0 = 0;
+	_monData = nullptr;
+	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
+	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
+	Common::fill(&_walkOffUp[0], &_walkOffUp[PLAYER_DATA_COUNT], 0);
+	Common::fill(&_walkOffDown[0], &_walkOffDown[PLAYER_DATA_COUNT], 0);
+	_rawTempL = 0;
+	_rawXTemp = 0;
+	_rawYTempL = 0;
+	_rawYTemp = 0;
+	_playerXLow = 0;
+	_playerX = 0;
+	_playerYLow = 0;
+	_playerY = 0;
+	_frame = 0;
+}
+
+} // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
new file mode 100644
index 0000000000..069d543cb8
--- /dev/null
+++ b/engines/access/data.h
@@ -0,0 +1,72 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_DATA_H
+#define ACCESS_DATA_H
+
+#include "common/scummsys.h"
+#include "common/rect.h"
+
+namespace Access {
+
+struct TimerEntry {
+	int _initTm;
+	int _timer;
+	bool _flag;
+
+	TimerEntry() {
+		_initTm = _timer = 0;
+		_flag = false;
+	}
+};
+
+#define PLAYER_DATA_COUNT 8
+
+class Player {
+public:
+	int _field0;
+	byte *_monData;
+	int _walkOffRight[PLAYER_DATA_COUNT];
+	int _walkOffLeft[PLAYER_DATA_COUNT];
+	int _walkOffUp[PLAYER_DATA_COUNT];
+	int _walkOffDown[PLAYER_DATA_COUNT];
+	Common::Point _walkOffUR[PLAYER_DATA_COUNT];
+	Common::Point _walkOffDR[PLAYER_DATA_COUNT];
+	Common::Point _walkOffUL[PLAYER_DATA_COUNT];
+	Common::Point _walkOffDL[PLAYER_DATA_COUNT];
+	int _rawTempL;
+	int _rawXTemp;
+	int _rawYTempL;
+	int _rawYTemp;
+	Common::Point _playerOffset;
+	int _playerXLow;
+	int _playerX;
+	int _playerYLow;
+	int _playerY;
+	int _frame;
+public:
+	Player();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_DATA_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index ff4cedbdc6..bab2476a4a 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/access
 MODULE_OBJS := \
 	asurface.o \
 	access.o \
+	data.o \
 	debugger.o \
 	decompress.o \
 	detection.o \
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index a47abf2b06..70d4a698b1 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -198,6 +198,75 @@ const byte CURSHELP[] = {
 	0x22, 0x22, 0x22, 0x20, 0x05, 0x04, 0x20, 0x20, 0x20, 0x20
 };
 
+const int TRAVEL_POS[][2] = {
+	{ -1, 0 },
+	{ 228, 117 },
+	{ 28, 98 },
+	{ 161, 140 },
+	{ 130, 139 },
+	{ 884, 95 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 41, 185 },
+	{ 60, 138 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 170, 155 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 108, 95 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 100, 115 },
+	{ 480, 90 },
+	{ 154, 63 },
+	{ 0, 0 },
+	{ 145, 85 },
+	{ 0, 0 },
+	{ 110, 107 },
+	{ 0, 0 },
+	{ 105, 154 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 20, 160 },
+	{ 130, 314 },
+	{ 0, 0 },
+	{ 50, 125 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 123, 123 },
+	{ -1, 7 },
+	{ 266, 168 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ -1, 18 },
+	{ -1, 19 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 203, 160 },
+	{ 0, 0 },
+	{ 283, 163 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 180, 165 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 }
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
index ba335cd0ec..e73088102d 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -46,6 +46,8 @@ extern const byte CURSHELP[];
 
 extern const byte *CURSORS[10];
 
+extern const int TRAVEL_POS[][2];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 7d605ce57316c86a247cf978e6b123b23045659c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 5 Aug 2014 22:17:30 -0400
Subject: ACCESS: Implement outer room handler

---
 engines/access/access.cpp             |  13 ++--
 engines/access/access.h               |  10 ++-
 engines/access/amazon/amazon_game.cpp |   6 +-
 engines/access/data.cpp               |  17 -----
 engines/access/data.h                 |  28 --------
 engines/access/events.h               |   2 +-
 engines/access/module.mk              |   2 +
 engines/access/player.cpp             |  53 ++++++++++++++
 engines/access/player.h               |  71 +++++++++++++++++++
 engines/access/room.cpp               | 130 ++++++++++++++++++++++++++++++++++
 engines/access/room.h                 |  53 ++++++++++++++
 engines/access/screen.cpp             |  25 +++++++
 engines/access/screen.h               |  15 ++++
 engines/access/sound.cpp              |   5 ++
 engines/access/sound.h                |   2 +
 15 files changed, 378 insertions(+), 54 deletions(-)
 create mode 100644 engines/access/player.cpp
 create mode 100644 engines/access/player.h
 create mode 100644 engines/access/room.cpp
 create mode 100644 engines/access/room.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 2a61a8ff8a..fa1775feca 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,6 +34,8 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
+	_player = nullptr;
+	_room = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
 
@@ -59,6 +61,10 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_startInvBox = 0;
 	_startAboutBox = 0;
 	_startTravelBox = 0;
+	_numImages = 0;
+	_nextImage = 0;
+	_numAnimTimers = 0;
+	_startup = 0;
 
 	_roomNumber = 0;
 	_rawPlayerXLow = 0;
@@ -110,6 +116,8 @@ AccessEngine::~AccessEngine() {
 	delete _debugger;
 	delete _events;
 	delete _files;
+	delete _player;
+	delete _room;
 	delete _screen;
 	delete _sound;
 
@@ -130,6 +138,7 @@ void AccessEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
+	_player = new Player(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
 
@@ -170,8 +179,4 @@ void AccessEngine::clearCellTable() {
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (byte *)nullptr);
 }
 
-void AccessEngine::doRoom() {
-	// TODO
-}
-
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 869441e96b..fce6c443f4 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -34,6 +34,8 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
+#include "access/player.h"
+#include "access/room.h"
 #include "access/screen.h"
 #include "access/sound.h"
 
@@ -103,6 +105,8 @@ public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
+	Player *_player;
+	Room *_room;
 	Screen *_screen;
 	SoundManager *_sound;
 
@@ -110,12 +114,16 @@ public:
 	Graphics::Surface _buffer1;
 	Graphics::Surface _buffer2;
 	byte *_objectsTable[100];
+	int _numAnimTimers;
 	Common::Array<TimerEntry> _timers;
-	Player _player;
+	Common::Array<Common::Rect> _newRect;
+	Common::Array<Common::Rect> _oldRect;
 	int _pCount;
 	int _selectCommand;
 	bool _normalMouse;
 	int _mouseMode;
+	int _numImages;
+	int _nextImage;
 
 	int _currentManOld;
 	byte *_man1;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 6eef2cf93e..8cbd0767b2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -62,7 +62,7 @@ void AmazonEngine::playGame() {
 	_screen->forceFadeOut();
 
 	_events->showCursor();
-	doRoom();
+	_room->doRoom();
 }
 
 void AmazonEngine::doIntroduction() {
@@ -157,8 +157,8 @@ void AmazonEngine::setupGame() {
 
 	// Set miscellaneous fields
 	_roomNumber = 4;
-	_player._playerX = _rawPlayerX = TRAVEL_POS[_roomNumber][0];
-	_player._playerY = _rawPlayerY = TRAVEL_POS[_roomNumber][1];
+	_player->_playerX = _rawPlayerX = TRAVEL_POS[_roomNumber][0];
+	_player->_playerY = _rawPlayerY = TRAVEL_POS[_roomNumber][1];
 	_selectCommand = -1;
 }
 
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index e5ee1e1e7f..0ef1845892 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -25,22 +25,5 @@
 
 namespace Access {
 
-Player::Player() {
-	_field0 = 0;
-	_monData = nullptr;
-	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
-	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
-	Common::fill(&_walkOffUp[0], &_walkOffUp[PLAYER_DATA_COUNT], 0);
-	Common::fill(&_walkOffDown[0], &_walkOffDown[PLAYER_DATA_COUNT], 0);
-	_rawTempL = 0;
-	_rawXTemp = 0;
-	_rawYTempL = 0;
-	_rawYTemp = 0;
-	_playerXLow = 0;
-	_playerX = 0;
-	_playerYLow = 0;
-	_playerY = 0;
-	_frame = 0;
-}
 
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 069d543cb8..7e10e992d9 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -39,34 +39,6 @@ struct TimerEntry {
 	}
 };
 
-#define PLAYER_DATA_COUNT 8
-
-class Player {
-public:
-	int _field0;
-	byte *_monData;
-	int _walkOffRight[PLAYER_DATA_COUNT];
-	int _walkOffLeft[PLAYER_DATA_COUNT];
-	int _walkOffUp[PLAYER_DATA_COUNT];
-	int _walkOffDown[PLAYER_DATA_COUNT];
-	Common::Point _walkOffUR[PLAYER_DATA_COUNT];
-	Common::Point _walkOffDR[PLAYER_DATA_COUNT];
-	Common::Point _walkOffUL[PLAYER_DATA_COUNT];
-	Common::Point _walkOffDL[PLAYER_DATA_COUNT];
-	int _rawTempL;
-	int _rawXTemp;
-	int _rawYTempL;
-	int _rawYTemp;
-	Common::Point _playerOffset;
-	int _playerXLow;
-	int _playerX;
-	int _playerYLow;
-	int _playerY;
-	int _frame;
-public:
-	Player();
-};
-
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
diff --git a/engines/access/events.h b/engines/access/events.h
index 3cf610ece6..2e6b06b5e2 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -45,12 +45,12 @@ private:
 	AccessEngine *_vm;
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
-	Common::Point _mousePos;
 
 	void checkForNextFrameCounter();
 public:
 	CursorType _cursorId;
 	bool _leftButton;
+	Common::Point _mousePos;
 public:
 	/**
 	 * Constructor
diff --git a/engines/access/module.mk b/engines/access/module.mk
index bab2476a4a..791abcc861 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -9,7 +9,9 @@ MODULE_OBJS := \
 	detection.o \
 	events.o \
 	files.o \
+	player.o \
 	resources.o \
+	room.o \
 	screen.o \
 	sound.o \
 	amazon\amazon_game.o
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
new file mode 100644
index 0000000000..f7429bd9b5
--- /dev/null
+++ b/engines/access/player.cpp
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/player.h"
+#include "common/algorithm.h"
+#include "common/textconsole.h"
+
+namespace Access {
+
+Player::Player(AccessEngine *vm): _vm(vm) {
+	_field0 = 0;
+	_monData = nullptr;
+	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
+	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
+	Common::fill(&_walkOffUp[0], &_walkOffUp[PLAYER_DATA_COUNT], 0);
+	Common::fill(&_walkOffDown[0], &_walkOffDown[PLAYER_DATA_COUNT], 0);
+	_rawTempL = 0;
+	_rawXTemp = 0;
+	_rawYTempL = 0;
+	_rawYTemp = 0;
+	_playerXLow = 0;
+	_playerX = 0;
+	_playerYLow = 0;
+	_playerY = 0;
+	_frame = 0;
+
+	_playerOff = false;
+}
+
+void Player::walk() {
+	warning("TODO: Player::walk");
+}
+
+} // End of namespace Access
diff --git a/engines/access/player.h b/engines/access/player.h
new file mode 100644
index 0000000000..94ae9872b5
--- /dev/null
+++ b/engines/access/player.h
@@ -0,0 +1,71 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_PLAYER_H
+#define ACCESS_PLAYER_H
+
+#include "common/scummsys.h"
+#include "common/rect.h"
+
+namespace Access {
+
+#define PLAYER_DATA_COUNT 8
+
+class AccessEngine;
+
+class Player {
+private:
+	AccessEngine *_vm;
+public:
+	// Fields in original Player structure
+	int _field0;
+	byte *_monData;
+	int _walkOffRight[PLAYER_DATA_COUNT];
+	int _walkOffLeft[PLAYER_DATA_COUNT];
+	int _walkOffUp[PLAYER_DATA_COUNT];
+	int _walkOffDown[PLAYER_DATA_COUNT];
+	Common::Point _walkOffUR[PLAYER_DATA_COUNT];
+	Common::Point _walkOffDR[PLAYER_DATA_COUNT];
+	Common::Point _walkOffUL[PLAYER_DATA_COUNT];
+	Common::Point _walkOffDL[PLAYER_DATA_COUNT];
+	int _rawTempL;
+	int _rawXTemp;
+	int _rawYTempL;
+	int _rawYTemp;
+	Common::Point _playerOffset;
+	int _playerXLow;
+	int _playerX;
+	int _playerYLow;
+	int _playerY;
+	int _frame;
+
+	// Additional globals we've added to new Player class
+	bool _playerOff;
+public:
+	Player(AccessEngine *vm);
+
+	void walk();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_PLAYER_H */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
new file mode 100644
index 0000000000..25d3584ede
--- /dev/null
+++ b/engines/access/room.cpp
@@ -0,0 +1,130 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/room.h"
+
+namespace Access {
+
+Room::Room(AccessEngine *vm) : _vm(vm) {
+	_function = 0;
+}
+
+void Room::doRoom() {
+	bool reloadFlag = false;
+
+	while (!_vm->shouldQuit()) {
+		if (!reloadFlag) {
+			_vm->_numImages = 0;
+			_vm->_newRect.clear();
+			_vm->_oldRect.clear();
+			_vm->_nextImage = 0;
+			_vm->_numAnimTimers = 0;
+		}
+
+		reloadFlag = false;
+		_vm->_startup = 0;
+		_function = 0;
+
+		while (!_vm->shouldQuit()) {
+			_vm->_numImages = 0;
+			if (_vm->_startup != -1 && --_vm->_startup != 0) {
+				--_vm->_startup;
+				_vm->_events->showCursor();
+				_vm->_screen->fadeIn();
+			}
+
+			_vm->_events->pollEvents();
+			_vm->_nextImage = 0;
+			_vm->_player->walk();
+			_vm->_sound->midiRepeat();
+			_vm->_screen->checkScroll();
+			doCommands();
+
+			// DOROOMFLASHBACK jump point
+			if (_function == 1) {
+				clearRoom();
+				break;
+			} else if (_function == 2) {
+				clearRoom();
+				return;
+			} else if (_function == 3) {
+				reloadRoom1();
+				reloadFlag = true;
+				break;
+			} else if (_function == 4) {
+				break;
+			}
+
+			if (_vm->_screen->_scrollFlag) {
+				_vm->_screen->copyBF1BF2();
+				_vm->_newRect.clear();
+				_function = 0;
+				roomLoop();
+
+				if (_function == 1) {
+					clearRoom();
+					break;
+				} else {
+					_vm->_screen->plotList();
+					_vm->_screen->copyRects();
+
+					_vm->_screen->copyBF2Vid();
+				}
+			} else {
+				_vm->_screen->copyBF1BF2();
+				_vm->_newRect.clear();
+				_function = 0;
+				roomLoop();
+
+				if (_function == 1) {
+					clearRoom();
+					break;
+				} else {
+					_vm->_screen->plotList();
+					_vm->_screen->copyBlocks();
+				}
+			}
+		}
+	}
+}
+
+void Room::clearRoom() {
+	// TODO
+}
+
+void Room::reloadRoom1() {
+	// TODO
+}
+
+void Room::roomLoop() {
+	// TODO
+}
+
+
+void Room::doCommands() {
+
+}
+
+
+} // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
new file mode 100644
index 0000000000..3b1a3347f9
--- /dev/null
+++ b/engines/access/room.h
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_ROOM_H
+#define ACCESS_ROOM_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+class AccessEngine;
+
+class Room {
+private:
+	AccessEngine *_vm;
+
+	void roomLoop();
+public:
+	int _function;
+public:
+	Room(AccessEngine *vm);
+
+	void doRoom();
+
+	void doCommands();
+
+	void clearRoom();
+
+	void reloadRoom1();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_ROOM_H */
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 591bb67a7f..8c87638937 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -41,6 +41,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_leftSkip = _rightSkip = 0;
 	_topSkip = _bottomSkip = 0;
 	_clipWidth = _clipHeight = 0;
+	_scrollFlag = false;
 }
 
 void Screen::setDisplayScan() {
@@ -182,4 +183,28 @@ bool Screen::clip(Common::Rect &r) {
 	return false;
 }
 
+void Screen::checkScroll() {
+	// TODO
+}
+
+void Screen::copyBF1BF2() {
+	// TODO
+}
+
+void Screen::copyBF2Vid() {
+	// TODO
+}
+
+void Screen::plotList() {
+	// TODO
+}
+
+void Screen::copyBlocks() {
+	// TODO
+}
+
+void Screen::copyRects() {
+	// TODO
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 295372770a..5f9fff058e 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -57,6 +57,7 @@ private:
 	bool clip(Common::Rect &r);
 public:
 	bool _loadPalFlag;
+	bool _scrollFlag;
 public:
 	Screen(AccessEngine *vm);
 
@@ -79,6 +80,8 @@ public:
 	 */
 	void forceFadeIn();
 
+	void fadeOut() { forceFadeOut(); }
+	void fadeIn() { forceFadeIn(); }
 	void clearScreen() { clearBuffer(); }
 
 	/**
@@ -94,6 +97,18 @@ public:
 	void copyBuffer(const byte *data);
 
 	void plotImage(const byte *pData, int idx, const Common::Point &pt);
+
+	void checkScroll();
+
+	void copyBF1BF2();
+
+	void copyBF2Vid();
+
+	void plotList();
+
+	void copyBlocks();
+
+	void copyRects();
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 5375485695..2a008d8c53 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -64,4 +64,9 @@ void SoundManager::playSound(byte *data, uint32 size) {
 		*/
 }
 
+void SoundManager::midiRepeat() {
+	// TODO
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index d3d5052c0e..613eca49ab 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -55,6 +55,8 @@ public:
 	void queueSound(int idx, int fileNum, int subfile);
 
 	void playSound(int soundIndex);
+
+	void midiRepeat();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 8e43a6c5280e2b695753d4a0b6810811f1bd393f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 5 Aug 2014 23:23:49 -0400
Subject: ACCESS: Add scripts classes and Amazon room setup

---
 engines/access/access.cpp                |   6 +-
 engines/access/access.h                  |   6 +-
 engines/access/amazon/amazon_game.cpp    |   9 ++-
 engines/access/amazon/amazon_room.cpp    | 121 +++++++++++++++++++++++++++++++
 engines/access/amazon/amazon_room.h      |  54 ++++++++++++++
 engines/access/amazon/amazon_scripts.cpp |  36 +++++++++
 engines/access/amazon/amazon_scripts.h   |  42 +++++++++++
 engines/access/module.mk                 |   5 +-
 engines/access/player.cpp                |   8 ++
 engines/access/player.h                  |   4 +
 engines/access/room.cpp                  |  48 ++++++++++++
 engines/access/room.h                    |  13 +++-
 engines/access/screen.cpp                |   4 +
 engines/access/screen.h                  |   6 +-
 engines/access/scripts.cpp               |  42 +++++++++++
 engines/access/scripts.h                 |  48 ++++++++++++
 16 files changed, 444 insertions(+), 8 deletions(-)
 create mode 100644 engines/access/amazon/amazon_room.cpp
 create mode 100644 engines/access/amazon/amazon_room.h
 create mode 100644 engines/access/amazon/amazon_scripts.cpp
 create mode 100644 engines/access/amazon/amazon_scripts.h
 create mode 100644 engines/access/scripts.cpp
 create mode 100644 engines/access/scripts.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index fa1775feca..e175b1c081 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -37,6 +37,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_player = nullptr;
 	_room = nullptr;
 	_screen = nullptr;
+	_scripts = nullptr;
 	_sound = nullptr;
 
 	_destIn = nullptr;
@@ -48,10 +49,10 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_currentMan = 0;
 	_currentManOld = -1;
 	_man1 = nullptr;
+	_inactive = nullptr;
 	_manPal1 = nullptr;
 	_music = nullptr;
 	_playField = nullptr;
-	_script = nullptr;
 	_anim = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
@@ -65,6 +66,8 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_nextImage = 0;
 	_numAnimTimers = 0;
 	_startup = 0;
+	_currentCharFlag = false;
+	_boxSelect = false;
 
 	_roomNumber = 0;
 	_rawPlayerXLow = 0;
@@ -119,6 +122,7 @@ AccessEngine::~AccessEngine() {
 	delete _player;
 	delete _room;
 	delete _screen;
+	delete _scripts;
 	delete _sound;
 
 	_buffer1.free();
diff --git a/engines/access/access.h b/engines/access/access.h
index fce6c443f4..21f8072311 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -37,6 +37,7 @@
 #include "access/player.h"
 #include "access/room.h"
 #include "access/screen.h"
+#include "access/scripts.h"
 #include "access/sound.h"
 
 /**
@@ -108,6 +109,7 @@ public:
 	Player *_player;
 	Room *_room;
 	Screen *_screen;
+	Scripts *_scripts;
 	SoundManager *_sound;
 
 	byte *_destIn;
@@ -127,10 +129,10 @@ public:
 
 	int _currentManOld;
 	byte *_man1;
+	byte *_inactive;
 	byte *_manPal1;
 	byte *_music;
 	byte *_playField;
-	byte *_script;
 	byte *_anim;
 	byte *_title;
 	int _converseMode;
@@ -140,6 +142,8 @@ public:
 	int _startInvBox;
 	int _startAboutBox;
 	int _startTravelBox;
+	bool _currentCharFlag;
+	bool _boxSelect;
 
 	// Fields that are included in savegames
 	int _roomNumber;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 8cbd0767b2..ffe4cb56f1 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -20,8 +20,10 @@
  *
  */
 
-#include "access/amazon/amazon_game.h"
 #include "access/resources.h"
+#include "access/amazon/amazon_game.h"
+#include "access/amazon/amazon_room.h"
+#include "access/amazon/amazon_scripts.h"
 
 namespace Access {
 
@@ -50,6 +52,7 @@ AmazonEngine::~AmazonEngine() {
 }
 
 void AmazonEngine::playGame() {
+	// Do introduction
 	doIntroduction();
 	if (shouldQuit())
 		return;
@@ -62,6 +65,10 @@ void AmazonEngine::playGame() {
 	_screen->forceFadeOut();
 
 	_events->showCursor();
+
+	// Setup and execute the room
+	_room = new AmazonRoom(this);
+	_scripts = new AmazonScripts(this);
 	_room->doRoom();
 }
 
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
new file mode 100644
index 0000000000..ce0683f124
--- /dev/null
+++ b/engines/access/amazon/amazon_room.cpp
@@ -0,0 +1,121 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/amazon/amazon_room.h"
+
+namespace Access {
+
+namespace Amazon {
+
+AmazonRoom::AmazonRoom(AccessEngine *vm): Room(vm) {
+	_antOutFlag = false;
+}
+
+void AmazonRoom::reloadRoom() {
+	loadRoom(_vm->_roomNumber);
+
+	if (_roomFlag != 1) {
+		_vm->_currentMan = _roomFlag;
+		_vm->_currentManOld = _roomFlag;
+		_vm->_manScaleOff = 0;
+		
+		switch (_vm->_currentMan) {
+		case 0:
+			_vm->_man1 = _vm->_files->loadFile("MAN.LZ");
+			break;
+
+		case 2:
+			_vm->_man1 = _vm->_files->loadFile("JMAN.LZ");
+			break;
+
+		case 3:
+			_vm->_man1 = _vm->_files->loadFile("OVERHEAD.LZ");
+			_vm->_manScaleOff = 1;
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	reloadRoom1();
+}
+
+void AmazonRoom::reloadRoom1() {
+	if (_vm->_roomNumber == 22 || _vm->_roomNumber == 31 
+			|| _vm->_roomNumber == 42 || _vm->_roomNumber == 44) {
+		_vm->_inactive = _vm->_files->loadFile("MAYA.LZ");
+		_vm->_currentCharFlag = false;
+	}
+
+	_vm->_selectCommand = -1;
+	_vm->_normalMouse = 1;
+	_vm->_mouseMode = 0;
+	_vm->_boxSelect = true;
+	_vm->_player->_playerOff = 0;
+
+	_vm->_screen->fadeOut();
+	_vm->_screen->clearScreen();
+	roomSet();
+
+	if (!_roomFlag && (_vm->_roomNumber != 61 || !_antOutFlag)) {
+		_vm->_player->load();
+		_vm->_player->calcManScale();
+	}
+
+	if (_vm->_roomNumber != 20 && _vm->_roomNumber != 24
+			&& _vm->_roomNumber != 33 && _vm->_roomNumber != 45) {
+		roomMenu();
+	}
+
+	_vm->_screen->setBufferScan();
+	setupRoom();
+	setWallCodes();
+	buildScreen();
+
+	if (_vm->_roomNumber != 20 && _vm->_roomNumber != 24
+			&& _vm->_roomNumber != 33) {
+		_vm->_screen->setPalette();
+		_vm->_screen->copyBF2Vid();
+	}
+
+	_vm->_player->_frame = 0;
+	_vm->_oldRect.clear();
+	_vm->_newRect.clear();
+}
+
+void AmazonRoom::roomSet() {
+	_vm->_numAnimTimers = 0;
+	_vm->_scripts->_sequence = 1000;
+	_vm->_scripts->searchForSeq();
+	_vm->_scripts->executeCommand();
+}
+
+void AmazonRoom::roomMenu() {
+	// TODO
+}
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
new file mode 100644
index 0000000000..6d13a4e52c
--- /dev/null
+++ b/engines/access/amazon/amazon_room.h
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_ROOM_H
+#define ACCESS_AMAZON_ROOM_H
+
+#include "common/scummsys.h"
+#include "access/room.h"
+
+namespace Access {
+
+class AccessEngine;
+
+namespace Amazon {
+
+class AmazonRoom : public Room {
+private:
+	bool _antOutFlag;
+
+	void roomSet();
+
+	void roomMenu();
+protected:
+	virtual void reloadRoom();
+
+	virtual void reloadRoom1();
+public:
+	AmazonRoom(AccessEngine *vm);
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_ROOM_H */
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
new file mode 100644
index 0000000000..1d3e7b4b76
--- /dev/null
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/amazon/amazon_scripts.h"
+
+namespace Access {
+
+namespace Amazon {
+
+AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
+}
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
new file mode 100644
index 0000000000..08fbc3a0f2
--- /dev/null
+++ b/engines/access/amazon/amazon_scripts.h
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_SCRIPTS_H
+#define ACCESS_AMAZON_SCRIPTS_H
+
+#include "common/scummsys.h"
+#include "access/scripts.h"
+
+namespace Access {
+
+namespace Amazon {
+
+class AmazonScripts: public Scripts {
+public:
+	AmazonScripts(AccessEngine *vm);
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_SCRIPTS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 791abcc861..5c9203fde2 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -13,8 +13,11 @@ MODULE_OBJS := \
 	resources.o \
 	room.o \
 	screen.o \
+	scripts.o \
 	sound.o \
-	amazon\amazon_game.o
+	amazon\amazon_game.o \
+	amazon\amazon_room.o \
+	amazon\amazon_scripts.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index f7429bd9b5..a85df0320b 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -46,6 +46,14 @@ Player::Player(AccessEngine *vm): _vm(vm) {
 	_playerOff = false;
 }
 
+void Player::load() {
+	// TODO
+}
+
+void Player::calcManScale() {
+	// TODO
+}
+
 void Player::walk() {
 	warning("TODO: Player::walk");
 }
diff --git a/engines/access/player.h b/engines/access/player.h
index 94ae9872b5..4d19601230 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -63,6 +63,10 @@ public:
 public:
 	Player(AccessEngine *vm);
 
+	void load();
+
+	void calcManScale();
+
 	void walk();
 };
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 25d3584ede..c3a3a9f8e2 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -28,6 +28,7 @@ namespace Access {
 
 Room::Room(AccessEngine *vm) : _vm(vm) {
 	_function = 0;
+	_roomFlag = 0;
 }
 
 void Room::doRoom() {
@@ -40,6 +41,8 @@ void Room::doRoom() {
 			_vm->_oldRect.clear();
 			_vm->_nextImage = 0;
 			_vm->_numAnimTimers = 0;
+
+			reloadRoom();
 		}
 
 		reloadFlag = false;
@@ -113,18 +116,63 @@ void Room::clearRoom() {
 	// TODO
 }
 
+void Room::reloadRoom() {
+	loadRoom(_vm->_roomNumber);
+
+	if (_roomFlag != 1) {
+		_vm->_currentMan = _roomFlag;
+		_vm->_currentManOld = _roomFlag;
+		_vm->_manScaleOff = 0;
+		
+		switch (_vm->_currentMan) {
+		case 0:
+			_vm->_man1 = _vm->_files->loadFile("MAN.LZ");
+			break;
+
+		case 2:
+			_vm->_man1 = _vm->_files->loadFile("JMAN.LZ");
+			break;
+
+		case 3:
+			_vm->_man1 = _vm->_files->loadFile("OVERHEAD.LZ");
+			_vm->_manScaleOff = 1;
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	reloadRoom1();
+}
+
 void Room::reloadRoom1() {
 	// TODO
 }
 
+void Room::loadRoom(int room) {
+	// TODO
+}
+
 void Room::roomLoop() {
 	// TODO
 }
 
 
 void Room::doCommands() {
+	// TODO
+}
+
+void Room::setupRoom() {
+	// TODO
+}
 
+void Room::setWallCodes() {
+	// TODO
 }
 
+void Room::buildScreen() {
+	// TODO
+}
 
 } // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
index 3b1a3347f9..fd5e602348 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -31,11 +31,20 @@ class AccessEngine;
 
 class Room {
 private:
+	void roomLoop();
+protected:
 	AccessEngine *_vm;
 
-	void roomLoop();
+	void setupRoom();
+	void setWallCodes();
+	void buildScreen();
+
+	virtual void reloadRoom() = 0;
+
+	virtual void reloadRoom1() = 0;
 public:
 	int _function;
+	int _roomFlag;
 public:
 	Room(AccessEngine *vm);
 
@@ -45,7 +54,7 @@ public:
 
 	void clearRoom();
 
-	void reloadRoom1();
+	void loadRoom(int room);
 };
 
 } // End of namespace Access
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 8c87638937..8dcc9f1db9 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -207,4 +207,8 @@ void Screen::copyRects() {
 	// TODO
 }
 
+void Screen::setBufferScan() {
+	// TODO
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 5f9fff058e..1b03d261cf 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -50,8 +50,6 @@ private:
 	int _topSkip, _bottomSkip;
 	int _clipWidth, _clipHeight;
 
-	void setPalette();
-
 	void updatePalette();
 
 	bool clip(Common::Rect &r);
@@ -91,6 +89,8 @@ public:
 
 	void loadPalette(Common::SeekableReadStream *stream);
 
+	void setPalette();
+
 	/**
 	 * Copy a buffer to the screen
 	 */
@@ -109,6 +109,8 @@ public:
 	void copyBlocks();
 
 	void copyRects();
+
+	void setBufferScan();
 };
 
 } // End of namespace Access
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
new file mode 100644
index 0000000000..e31cd0cf5c
--- /dev/null
+++ b/engines/access/scripts.cpp
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/scripts.h"
+
+namespace Access {
+
+Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
+	_script = nullptr;
+	_sequence = 0;
+}
+
+void Scripts::searchForSeq() {
+	// TODO
+}
+
+void Scripts::executeCommand() {
+	// TODO
+}
+
+} // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
new file mode 100644
index 0000000000..b3e898f512
--- /dev/null
+++ b/engines/access/scripts.h
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_SCRIPTS_H
+#define ACCESS_SCRIPTS_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+class AccessEngine;
+
+class Scripts {
+protected:
+	AccessEngine *_vm;
+public:
+	byte *_script;
+	int _sequence;
+public:
+	Scripts(AccessEngine *vm);
+
+	void searchForSeq();
+	
+	void executeCommand();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_SCRIPTS_H */
-- 
cgit v1.2.3


From c4d6dc376382de9b2d91d93ac9061f600b6a8696 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 Aug 2014 08:28:20 -0400
Subject: ACCESS: Added room clearing

---
 engines/access/access.cpp  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 engines/access/access.h    | 39 ++++++++++++++++++++++++++++++++++-----
 engines/access/room.cpp    | 44 ++++++++++++--------------------------------
 engines/access/room.h      |  3 +++
 engines/access/scripts.cpp |  9 +++++++++
 engines/access/scripts.h   |  4 ++++
 engines/access/sound.cpp   |  9 +++++++++
 engines/access/sound.h     |  5 +++++
 8 files changed, 121 insertions(+), 37 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index e175b1c081..6b805e4069 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -48,11 +48,13 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
+	_man = nullptr;
 	_man1 = nullptr;
 	_inactive = nullptr;
 	_manPal1 = nullptr;
 	_music = nullptr;
 	_playField = nullptr;
+	_tile = nullptr;
 	_anim = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
@@ -127,6 +129,17 @@ AccessEngine::~AccessEngine() {
 
 	_buffer1.free();
 	_buffer2.free();
+
+	freeCells();
+	delete[] _man;
+	delete[] _man1;
+	delete[] _inactive;
+	delete[] _manPal1;
+	delete[] _music;
+	delete[] _playField;
+	delete[] _tile;
+	delete[] _anim;
+	delete[] _title;
 }
 
 void AccessEngine::setVGA() {
@@ -183,4 +196,36 @@ void AccessEngine::clearCellTable() {
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (byte *)nullptr);
 }
 
+void AccessEngine::freeCells() {
+	for (int i = 0; i < 100; ++i) {
+		delete[] _objectsTable[i];
+		_objectsTable[i] = nullptr;
+	}
+}
+
+void AccessEngine::freeAnimationData() {
+	delete[] _anim;
+	_anim = nullptr;
+}
+
+void AccessEngine::freePlayField() {
+	delete[] _playField;
+	_playField = nullptr;
+}
+
+void AccessEngine::freeTileData() {
+	delete[] _tile;
+	_tile = nullptr;
+}
+
+void AccessEngine::freeInactiveData() {
+	delete[] _inactive;
+	_inactive = nullptr;
+}
+
+void AccessEngine::freeManData() {
+	delete[] _man;
+	_man = nullptr;
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 21f8072311..2e605e49ab 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -84,11 +84,6 @@ protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
 
-	/**
-	 * Clear the cell table
-	 */
-	void clearCellTable();
-
 	/**
 	 * Main handler for showing game rooms
 	 */
@@ -128,11 +123,13 @@ public:
 	int _nextImage;
 
 	int _currentManOld;
+	byte *_man;
 	byte *_man1;
 	byte *_inactive;
 	byte *_manPal1;
 	byte *_music;
 	byte *_playField;
+	byte *_tile;
 	byte *_anim;
 	byte *_title;
 	int _converseMode;
@@ -202,6 +199,38 @@ public:
 	uint32 getGameFeatures() const;
 
 	int getRandomNumber(int maxNumber);
+
+	void freeAnimationData();
+
+	/**
+	* Clear the cell table
+	*/
+	void clearCellTable();
+
+	/**
+	* Free the cell data
+	*/
+	void freeCells();
+
+	/**
+	 * Free the playfield data
+	 */
+	void freePlayField();
+
+	/**
+	 * Free tile data
+	 */
+	void freeTileData();
+
+	/**
+	 * Free the inactive data
+	 */
+	void freeInactiveData();
+
+	/**
+	 * Free animation data
+	 */
+	void freeManData();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index c3a3a9f8e2..0515b50ab2 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -113,41 +113,21 @@ void Room::doRoom() {
 }
 
 void Room::clearRoom() {
-	// TODO
-}
-
-void Room::reloadRoom() {
-	loadRoom(_vm->_roomNumber);
-
-	if (_roomFlag != 1) {
-		_vm->_currentMan = _roomFlag;
-		_vm->_currentManOld = _roomFlag;
-		_vm->_manScaleOff = 0;
-		
-		switch (_vm->_currentMan) {
-		case 0:
-			_vm->_man1 = _vm->_files->loadFile("MAN.LZ");
-			break;
-
-		case 2:
-			_vm->_man1 = _vm->_files->loadFile("JMAN.LZ");
-			break;
-
-		case 3:
-			_vm->_man1 = _vm->_files->loadFile("OVERHEAD.LZ");
-			_vm->_manScaleOff = 1;
-			break;
-
-		default:
-			break;
-		}
+	if (_vm->_sound->_music) {
+		_vm->_sound->stopSong();
+		delete[] _vm->_sound->_music;
+		_vm->_sound->_music = nullptr;
 	}
 
-	reloadRoom1();
-}
+	_vm->_sound->freeSounds();
+	_vm->_numAnimTimers = 0;
 
-void Room::reloadRoom1() {
-	// TODO
+	_vm->freeAnimationData();
+	_vm->_scripts->freeScriptData();
+	_vm->freeCells();
+	_vm->freePlayField();
+	_vm->freeInactiveData();
+	_vm->freeManData();
 }
 
 void Room::loadRoom(int room) {
diff --git a/engines/access/room.h b/engines/access/room.h
index fd5e602348..28506db7d6 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -52,6 +52,9 @@ public:
 
 	void doCommands();
 
+	/**
+	 * Clear all the data used by the room
+	 */
 	void clearRoom();
 
 	void loadRoom(int room);
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index e31cd0cf5c..bd480b8b64 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -31,6 +31,10 @@ Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
 	_sequence = 0;
 }
 
+Scripts::~Scripts() {
+	freeScriptData();
+}
+
 void Scripts::searchForSeq() {
 	// TODO
 }
@@ -39,4 +43,9 @@ void Scripts::executeCommand() {
 	// TODO
 }
 
+void Scripts::freeScriptData() {
+	delete[] _script;
+	_script = nullptr;
+}
+
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index b3e898f512..995f12930f 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -38,9 +38,13 @@ public:
 public:
 	Scripts(AccessEngine *vm);
 
+	virtual ~Scripts();
+
 	void searchForSeq();
 	
 	void executeCommand();
+
+	void freeScriptData();
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 2a008d8c53..2f64465f8f 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -32,6 +32,8 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 	Common::fill(&_soundPriority[0], &_soundPriority[MAX_SOUNDS], 0);
 	for (int i = 0; i < MAX_SOUNDS; ++i)
 		_soundTable[i]._data = nullptr;
+
+	_music = nullptr;
 }
 
 SoundManager::~SoundManager() {
@@ -68,5 +70,12 @@ void SoundManager::midiRepeat() {
 	// TODO
 }
 
+void SoundManager::stopSong() {
+	// TODO
+}
+
+void SoundManager::freeSounds() {
+	// TODO
+}
 
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 613eca49ab..37d263eecd 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -48,6 +48,7 @@ private:
 public:
 	SoundEntry _soundTable[MAX_SOUNDS];
 	int _soundPriority[MAX_SOUNDS];
+	byte *_music;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
@@ -57,6 +58,10 @@ public:
 	void playSound(int soundIndex);
 
 	void midiRepeat();
+
+	void stopSong();
+
+	void freeSounds();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 3bd0f0f3394e87ee3e18c1bfda80a99ccc31c61c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 Aug 2014 08:55:56 -0400
Subject: ACCESS: Split resources into a seperate file just for Amazon
 resources

---
 engines/access/amazon/amazon_game.cpp      |   1 +
 engines/access/amazon/amazon_resources.cpp | 250 +++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |  42 +++++
 engines/access/events.cpp                  |   2 +-
 engines/access/files.cpp                   |   2 +-
 engines/access/module.mk                   |   1 +
 engines/access/resources.cpp               | 223 -------------------------
 engines/access/resources.h                 |  23 +--
 engines/access/room.cpp                    |   1 +
 9 files changed, 298 insertions(+), 247 deletions(-)
 create mode 100644 engines/access/amazon/amazon_resources.cpp
 create mode 100644 engines/access/amazon/amazon_resources.h

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index ffe4cb56f1..eccfc4dae7 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -22,6 +22,7 @@
 
 #include "access/resources.h"
 #include "access/amazon/amazon_game.h"
+#include "access/amazon/amazon_resources.h"
 #include "access/amazon/amazon_room.h"
 #include "access/amazon/amazon_scripts.h"
 
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
new file mode 100644
index 0000000000..4d798db560
--- /dev/null
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -0,0 +1,250 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, 0xwhose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, 0xor (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, 0xwrite to the Free Software
+ * Foundation, 0xInc., 0x51 Franklin Street, 0xFifth Floor, 0xBoston, 0xMA 02110-1301, 0xUSA.
+ *
+ */
+
+#include "access/amazon/amazon_resources.h"
+#include "access/access.h"
+
+namespace Access {
+
+namespace Amazon {
+
+const char *const FILENAMES[] = {
+	"S00.AP", "S01.AP", "S02.AP", "R03.AP", "S04.AP", "S05.AP",
+	"S06.AP", "S07.AP", "S08.AP", "S09.AP", "S10.AP", "S11.AP",
+	"S12.AP", "S13.AP", "S14.AP", "S15.AP", "S16.AP", "S17.AP",
+	"S18.AP", "S19.AP", "S20.AP", "S21.AP", "S22.AP", "S23.AP",
+	"S24.AP", "S25.AP", "S26.AP", "S27.AP", "S28.AP", "S29.AP",
+	"S30.AP", "S31.AP", "S32.AP", "S33.AP", "S34.AP", "R35.AP",
+	"S36.AP", "S37.AP", "S38.AP", "S39.AP", "S40.AP", "C26.AP",
+	"S42.AP", "S01.AP", "S44.AP", "S45.AP", "S46.AP", "S47.AP",
+	"C36.AP", nullptr,  "S50.AP", nullptr,  nullptr,  "S53.AP",
+	"S54.AP", "S55.AP", "C35.AP", "S57.AP", "S58.AP", nullptr,
+	nullptr,  "S61.AP", nullptr,  nullptr,  "S64.AP", "C00.AP",
+	"C01.AP", "C06.AP", "C07.AP", "C08.AP", "C05.AP", "C09.AP",
+	"C12.AP", "C03.AP", "C13.AP", "C15.AP", "C14.AP", "C16.AP",
+	"C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP",
+	"C24.AP", "C25.AP", "C29.AP", "C30.AP", "C32.AP", "C33.AP",
+	"C34.AP", "CREDITS.AP", "MIDIDRV.AP", "SUMMARY.AP", "DEAD.AP",
+	"EST.AP", "CHAPTER.AP", "MIDI.AP", "SOUND.AP", "INV.AP",
+	"NARATE01.AP", "NARATE02.AP", "NARATE03.AP", "NARATE04.AP",
+	"NARATE05.AP", "NARATE06.AP", "NARATE07.AP", "NARATE08.AP",
+	"NARATE09.AP", "NARATE10.AP", "NARATE11.AP", "NARATE12.AP",
+	"NARATE13.AP", "NARATE14.AP"
+};
+
+const byte MOUSE0[] = {
+	0, 0, 0, 0, 
+	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
+	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
+	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
+	6, 6, 6, 6, 6, 1, 0, 7, 6, 6, 6, 6, 6, 6, 1, 0, 6, 6,
+	6, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6, 1, 2, 3, 6, 6, 1, 3,
+	3, 6, 6, 1, 3, 3, 6, 6, 1, 4, 2, 6, 1
+};
+const byte MOUSE1[] = {
+	0x07, 0x00, 0x07, 0x00, 0x06, 0x01, 0x05, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x03, 0x07,
+	0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
+	0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01,
+	0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x0D, 0x05, 0x00,
+	0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05, 0x01, 0x0B, 0xFF, 0x00, 0x00,
+	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
+	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+	0x06, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte MOUSE2[] = {
+	0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x02, 0x0C, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02,
+	0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+const byte MOUSE3[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05, 0x00,
+	0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 0x00, 0x0C, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00,
+	0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x01, 0x0B, 0x05, 0x05, 0x05,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte CURSEYE[] = {
+	0x01, 0x00, 0x08, 0x00, 0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x03, 0x09, 0x0E, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D, 0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33,
+	0x34, 0x01, 0x01, 0x0D, 0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04,
+	0x04, 0x01, 0x0D, 0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07,
+	0x07, 0x06, 0x01, 0x0E, 0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07,
+	0x06, 0x0F, 0x0E, 0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x01, 0x01,
+	0x07, 0x00, 0x03, 0x07, 0x01, 0x07, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte CURSHAND[] = {
+	0x02, 0x00, 0x03, 0x00, 0x07, 0x02, 0x17, 0x0E, 0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17,
+	0x0E, 0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17, 0x01,
+	0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E, 0x02,
+	0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E, 0x04, 0x0B,
+	0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x04, 0x0B, 0x17, 0x0E, 0x12,
+	0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F,
+	0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F, 0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F,
+	0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E,
+	0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, 0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E,
+	0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12, 0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F,
+	0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F,
+	0x0F, 0x0E, 0x0D, 0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x08,
+	0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E,
+	0x0D
+};
+const byte CURSGET[] = {
+	0x07, 0x00, 0x0E, 0x00, 0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x08, 0x08, 0x1C, 0x07, 0x0F,
+	0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+	0x0C, 0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x03, 0x0C, 0x07,
+	0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x02, 0x0D, 0x1C, 0x0F, 0x0E,
+	0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0E, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0D,
+	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0E,
+	0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C, 0x00, 0x0D, 0x1C, 0x0D,
+	0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C, 0x01, 0x0B, 0x0E, 0x0F, 0x0E,
+	0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C, 0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07,
+	0x0E, 0x0F, 0x0C, 0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07, 0x07, 0x01, 0x07
+};
+const byte CURSCLIMB[] = {
+	0x03, 0x00, 0x0E, 0x00, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
+	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01, 0x07, 0x02, 0x0F, 0x0D, 0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00,
+	0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11, 0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14,
+	0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E, 0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13,
+	0x12, 0x11, 0x11, 0x0E, 0x0D, 0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00,
+	0x00, 0x0E, 0x0D, 0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
+	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E, 0x03,
+	0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20, 0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
+	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20, 0x03, 0x09, 0x07, 0x01, 0x01,
+	0x00, 0x00, 0x00, 0x22, 0x04, 0x20, 0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x01, 0x20, 0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
+};
+const byte CURSTALK[] = {
+	0x02, 0x00, 0x0B, 0x00, 0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x0C,
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x00, 0x0E, 0x06, 0x06,
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x00, 0x0F, 0x06, 0x08,
+	0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x00, 0x0F, 0x06,
+	0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06, 0x00, 0x0F,
+	0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x01,
+	0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x02,
+	0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 0x09, 0x06,
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x02, 0x08,
+	0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
+	0x02, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+const byte CURSHELP[] = {
+	0x02, 0x00, 0x0B, 0x00, 0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x02, 0x0A, 0x24, 0x24,
+	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20,
+	0x20, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00,
+	0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
+	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
+	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24,
+	0x22, 0x22, 0x22, 0x22, 0x20, 0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x05, 0x07, 0x24,
+	0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20, 0x02, 0x07, 0x07,
+	0x00, 0x24, 0x20, 0x20, 0x20, 0x20, 0x01, 0x03, 0x07, 0x01, 0x07, 0x02, 0x07, 0x07, 0x00, 0x00,
+	0x24, 0x24, 0x24, 0x24, 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x04, 0x06, 0x24, 0x22,
+	0x22, 0x22, 0x22, 0x20, 0x05, 0x04, 0x20, 0x20, 0x20, 0x20
+};
+const byte *CURSORS[10] = {
+	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
+};
+
+const int TRAVEL_POS[][2] = {
+	{ -1, 0 },
+	{ 228, 117 },
+	{ 28, 98 },
+	{ 161, 140 },
+	{ 130, 139 },
+	{ 884, 95 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 41, 185 },
+	{ 60, 138 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 170, 155 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 108, 95 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 100, 115 },
+	{ 480, 90 },
+	{ 154, 63 },
+	{ 0, 0 },
+	{ 145, 85 },
+	{ 0, 0 },
+	{ 110, 107 },
+	{ 0, 0 },
+	{ 105, 154 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 20, 160 },
+	{ 130, 314 },
+	{ 0, 0 },
+	{ 50, 125 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 123, 123 },
+	{ -1, 7 },
+	{ 266, 168 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ -1, 18 },
+	{ -1, 19 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 203, 160 },
+	{ 0, 0 },
+	{ 283, 163 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 180, 165 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 0, 0 }
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
new file mode 100644
index 0000000000..fba3bc2747
--- /dev/null
+++ b/engines/access/amazon/amazon_resources.h
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_RESOURCES_H
+#define ACCESS_AMAZON_RESOURCES_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+namespace Amazon {
+
+extern const char *const FILENAMES[];
+
+extern const byte *CURSORS[10];
+
+extern const int TRAVEL_POS[][2];
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_RESOURCES_H */
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 29f6270387..1184128ffd 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -27,7 +27,7 @@
 #include "engines/util.h"
 #include "access/access.h"
 #include "access/events.h"
-#include "access/resources.h"
+#include "access/amazon/amazon_resources.h"
 
 #define CURSOR_WIDTH 16
 #define CURSOR_HEIGHT 16
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 37b2578cea..c72d0adb7a 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "access/files.h"
-#include "access/resources.h"
+#include "access/amazon/amazon_resources.h"
 #include "access/access.h"
 
 namespace Access {
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 5c9203fde2..042e84ad86 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -16,6 +16,7 @@ MODULE_OBJS := \
 	scripts.o \
 	sound.o \
 	amazon\amazon_game.o \
+	amazon\amazon_resources.o \
 	amazon\amazon_room.o \
 	amazon\amazon_scripts.o
 
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 70d4a698b1..8aa44b470b 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -46,227 +46,4 @@ const byte INITIAL_PALETTE[18 * 3] = {
 	0x00, 0x00, 0x00
 };
 
-namespace Amazon {
-
-const char *const FILENAMES[] = {
-	"S00.AP", "S01.AP", "S02.AP", "R03.AP", "S04.AP", "S05.AP",
-	"S06.AP", "S07.AP", "S08.AP", "S09.AP", "S10.AP", "S11.AP",
-	"S12.AP", "S13.AP", "S14.AP", "S15.AP", "S16.AP", "S17.AP",
-	"S18.AP", "S19.AP", "S20.AP", "S21.AP", "S22.AP", "S23.AP",
-	"S24.AP", "S25.AP", "S26.AP", "S27.AP", "S28.AP", "S29.AP",
-	"S30.AP", "S31.AP", "S32.AP", "S33.AP", "S34.AP", "R35.AP",
-	"S36.AP", "S37.AP", "S38.AP", "S39.AP", "S40.AP", "C26.AP",
-	"S42.AP", "S01.AP", "S44.AP", "S45.AP", "S46.AP", "S47.AP",
-	"C36.AP", nullptr,  "S50.AP", nullptr,  nullptr,  "S53.AP",
-	"S54.AP", "S55.AP", "C35.AP", "S57.AP", "S58.AP", nullptr,
-	nullptr,  "S61.AP", nullptr,  nullptr,  "S64.AP", "C00.AP",
-	"C01.AP", "C06.AP", "C07.AP", "C08.AP", "C05.AP", "C09.AP",
-	"C12.AP", "C03.AP", "C13.AP", "C15.AP", "C14.AP", "C16.AP",
-	"C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP",
-	"C24.AP", "C25.AP", "C29.AP", "C30.AP", "C32.AP", "C33.AP",
-	"C34.AP", "CREDITS.AP", "MIDIDRV.AP", "SUMMARY.AP", "DEAD.AP",
-	"EST.AP", "CHAPTER.AP", "MIDI.AP", "SOUND.AP", "INV.AP",
-	"NARATE01.AP", "NARATE02.AP", "NARATE03.AP", "NARATE04.AP",
-	"NARATE05.AP", "NARATE06.AP", "NARATE07.AP", "NARATE08.AP",
-	"NARATE09.AP", "NARATE10.AP", "NARATE11.AP", "NARATE12.AP",
-	"NARATE13.AP", "NARATE14.AP"
-};
-
-const byte *CURSORS[10] = {
-	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
-};
-
-const byte MOUSE0[] = {
-	0, 0, 0, 0, 
-	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
-	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
-	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
-	6, 6, 6, 6, 6, 1, 0, 7, 6, 6, 6, 6, 6, 6, 1, 0, 6, 6,
-	6, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6, 1, 2, 3, 6, 6, 1, 3,
-	3, 6, 6, 1, 3, 3, 6, 6, 1, 4, 2, 6, 1
-};
-const byte MOUSE1[] = {
-	0x07, 0x00, 0x07, 0x00, 0x06, 0x01, 0x05, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x03, 0x07,
-	0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
-	0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01,
-	0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x0D, 0x05, 0x00,
-	0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05, 0x01, 0x0B, 0xFF, 0x00, 0x00,
-	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
-	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
-	0x06, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-const byte MOUSE2[] = {
-	0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05,
-	0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x02, 0x0C, 0x04, 0x04,
-	0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02,
-	0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00
-};
-const byte MOUSE3[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05, 0x00,
-	0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 0x00, 0x0C, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05,
-	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00,
-	0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x01, 0x0B, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-const byte CURSEYE[] = {
-	0x01, 0x00, 0x08, 0x00, 0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x03, 0x09, 0x0E, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D, 0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33,
-	0x34, 0x01, 0x01, 0x0D, 0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04,
-	0x04, 0x01, 0x0D, 0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07,
-	0x07, 0x06, 0x01, 0x0E, 0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07,
-	0x06, 0x0F, 0x0E, 0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x01, 0x01,
-	0x07, 0x00, 0x03, 0x07, 0x01, 0x07, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00
-};
-const byte CURSHAND[] = {
-	0x02, 0x00, 0x03, 0x00, 0x07, 0x02, 0x17, 0x0E, 0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17,
-	0x0E, 0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17, 0x01,
-	0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E, 0x02,
-	0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E, 0x04, 0x0B,
-	0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x04, 0x0B, 0x17, 0x0E, 0x12,
-	0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F,
-	0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F, 0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F,
-	0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E,
-	0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, 0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E,
-	0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12, 0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F,
-	0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F,
-	0x0F, 0x0E, 0x0D, 0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x08,
-	0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E,
-	0x0D
-};
-const byte CURSGET[] = {
-	0x07, 0x00, 0x0E, 0x00, 0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x08, 0x08, 0x1C, 0x07, 0x0F,
-	0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
-	0x0C, 0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x03, 0x0C, 0x07,
-	0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x02, 0x0D, 0x1C, 0x0F, 0x0E,
-	0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0E,
-	0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C, 0x00, 0x0D, 0x1C, 0x0D,
-	0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C, 0x01, 0x0B, 0x0E, 0x0F, 0x0E,
-	0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C, 0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07,
-	0x0E, 0x0F, 0x0C, 0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07, 0x07, 0x01, 0x07
-};
-const byte CURSCLIMB[] = {
-	0x03, 0x00, 0x0E, 0x00, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
-	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01, 0x07, 0x02, 0x0F, 0x0D, 0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00,
-	0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11, 0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14,
-	0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E, 0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13,
-	0x12, 0x11, 0x11, 0x0E, 0x0D, 0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00,
-	0x00, 0x0E, 0x0D, 0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
-	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E, 0x03,
-	0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20, 0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
-	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20, 0x03, 0x09, 0x07, 0x01, 0x01,
-	0x00, 0x00, 0x00, 0x22, 0x04, 0x20, 0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x01, 0x20, 0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
-};
-const byte CURSTALK[] = {
-	0x02, 0x00, 0x0B, 0x00, 0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x0C,
-	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x00, 0x0E, 0x06, 0x06,
-	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x00, 0x0F, 0x06, 0x08,
-	0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x00, 0x0F, 0x06,
-	0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06, 0x00, 0x0F,
-	0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x01,
-	0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x02,
-	0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 0x09, 0x06,
-	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x02, 0x08,
-	0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
-	0x02, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-const byte CURSHELP[] = {
-	0x02, 0x00, 0x0B, 0x00, 0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x02, 0x0A, 0x24, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20,
-	0x20, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00,
-	0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
-	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
-	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x20, 0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x05, 0x07, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20, 0x02, 0x07, 0x07,
-	0x00, 0x24, 0x20, 0x20, 0x20, 0x20, 0x01, 0x03, 0x07, 0x01, 0x07, 0x02, 0x07, 0x07, 0x00, 0x00,
-	0x24, 0x24, 0x24, 0x24, 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x04, 0x06, 0x24, 0x22,
-	0x22, 0x22, 0x22, 0x20, 0x05, 0x04, 0x20, 0x20, 0x20, 0x20
-};
-
-const int TRAVEL_POS[][2] = {
-	{ -1, 0 },
-	{ 228, 117 },
-	{ 28, 98 },
-	{ 161, 140 },
-	{ 130, 139 },
-	{ 884, 95 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 41, 185 },
-	{ 60, 138 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 170, 155 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 108, 95 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 100, 115 },
-	{ 480, 90 },
-	{ 154, 63 },
-	{ 0, 0 },
-	{ 145, 85 },
-	{ 0, 0 },
-	{ 110, 107 },
-	{ 0, 0 },
-	{ 105, 154 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 20, 160 },
-	{ 130, 314 },
-	{ 0, 0 },
-	{ 50, 125 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 123, 123 },
-	{ -1, 7 },
-	{ 266, 168 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ -1, 18 },
-	{ -1, 19 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 203, 160 },
-	{ 0, 0 },
-	{ 283, 163 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 180, 165 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 }
-};
-
-} // End of namespace Amazon
-
 } // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
index e73088102d..47d4e3ac8c 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -29,27 +29,6 @@ namespace Access {
 
 extern const byte INITIAL_PALETTE[18 * 3];
 
-namespace Amazon {
-
-extern const char *const FILENAMES[];
-
-extern const byte MOUSE0[];
-extern const byte MOUSE1[];
-extern const byte MOUSE2[];
-extern const byte MOUSE3[];
-extern const byte CURSEYE[];
-extern const byte CURSHAND[];
-extern const byte CURSGET[];
-extern const byte CURSCLIMB[];
-extern const byte CURSTALK[];
-extern const byte CURSHELP[];
-
-extern const byte *CURSORS[10];
-
-extern const int TRAVEL_POS[][2];
-
-} // End of namespace Amazon
-
 } // End of namespace Access
 
-#endif /* ACCESS_EVENTS_H */
+#endif /* ACCESS_RESOURCES_H */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 0515b50ab2..f735fdb167 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 #include "access/access.h"
+#include "access/resources.h"
 #include "access/room.h"
 
 namespace Access {
-- 
cgit v1.2.3


From 3645aad6fb02e0430c4ff3b325e1c0012042f4b7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 Aug 2014 20:19:15 -0400
Subject: ACCESS: Add Amazon character and room resource lists

---
 engines/access/amazon/amazon_resources.cpp | 741 +++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |   4 +
 2 files changed, 745 insertions(+)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 4d798db560..2f9fe0277a 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -245,6 +245,747 @@ const int TRAVEL_POS[][2] = {
 	{ 0, 0 }
 };
 
+const byte CREDITS[] = {
+	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x3, 0x0, 0x30, 0x22, 0x30, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF,
+	0x0, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ALLISTER[] = {
+	0x0, 0xFF, 0xFF, 0x61, 0x0, 0x0, 0x0, 0x36, 0x0F, 0x5E, 0x4, 0x0, 0x0,
+	0x0, 0x4, 0x4, 0x0, 0x3, 0x0, 0xFF, 0x4, 0x0, 0x2, 0x0, 0x4, 0x0, 0x1, 0x0, 0x8C,
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0,
+	0x1, 0x0, 0x62, 0x0, 0x0B, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0C, 0x0, 0x1, 0x0, 0x62,
+	0x0, 0x0D, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte HALL[] = {
+	0x0, 0xFF, 0xFF, 0x61, 0x0, 0x0, 0x0, 0x40, 0x3E, 0x1A, 0x5, 0x0, 0x0,
+	0x0, 0x5, 0x5, 0x0, 0x3, 0x0, 0xFF, 0x5, 0x0, 0x2, 0x0, 0x5, 0x0, 0x1, 0x0, 0xFF,
+	0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0, 0x62, 0x0, 0x13, 0x0, 0x1, 0x0,
+	0x62, 0x0, 0x14, 0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte JASONLAB[] = {
+	0x1, 0x6, 0x0, 0x61, 0x0, 0x0D, 0x0, 0x40, 0x20, 0x0C4, 0x6, 0x0, 0x0, 0x0,
+	0x6, 0x6, 0x0, 0x3, 0x0, 0xFF, 0x6, 0x0, 0x2, 0x0, 0x6, 0x0, 0x1, 0x0, 0xFF, 0x0,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x1,
+	0x0, 0x62, 0x0, 0x1, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x26, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0,
+	0x62, 0x0, 0x35, 0x0, 0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte ALLENLAB[] = {
+	0x1, 0x8, 0x0, 0x61, 0x0, 0x0D, 0x0, 0x40, 0x20, 0x0C4, 0x8, 0x0, 0x0, 0x0,
+	0x8, 0x8, 0x0, 0x3, 0x0, 0xFF, 0x8, 0x0, 0x2, 0x0, 0x8, 0x0, 0x1, 0x0, 0xFF, 0x0,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x1,
+	0x0, 0x62, 0x0, 0x7, 0x0, 0x1, 0x0, 0x62, 0x0, 0x8, 0x0, 0x2, 0x0, 0x62, 0x0, 0x9,
+	0x0, 0x1, 0x0, 0x62, 0x0, 0x0A, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0,
+	0xFF, 0xFF
+};
+
+const byte OUTVAULT[] = {
+	0x0, 0x9, 0x0, 0x61, 0x0, 0x2B, 0x0, 0x30, 0x18, 0x9B, 0x9, 0x0, 0x0, 0x0,
+	0x9, 0x9, 0x0, 0x3, 0x0, 0xFF, 0x9, 0x0, 0x2, 0x0, 0x9, 0x0, 0x1, 0x0, 0x0B4, 0x10,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x3,
+	0x0, 0x62, 0x0, 0x4, 0x0, 0x1, 0x0, 0x62, 0x0, 0x5, 0x0, 0x2, 0x0, 0x62, 0x0, 0x6,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x36, 0x0, 0x1, 0x0, 0x62, 0x0, 0x47, 0x0, 0x1, 0x0,
+	0xFF, 0xFF
+};
+
+const byte VAULT[] = {
+	0x0, 0xFF, 0xFF, 0x61, 0x0, 0x29, 0x0, 0x40, 0x3A, 0x37, 0x0A, 0x0,
+	0x0, 0x0, 0x0A, 0x0A, 0x0, 0x3, 0x0, 0xFF, 0x0A, 0x0, 0x2, 0x0, 0x0A, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x37, 0x0, 0x2, 0x0, 0x62, 0x0, 0x39, 0x0,
+	0x1, 0x0, 0x62, 0x0, 0x38, 0x0, 0x2, 0x0, 0x62, 0x0, 0x15, 0x0, 0x2, 0x0, 0xFF,
+	0xFF
+};
+
+const byte LIBRARY[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x0C, 0x0, 0x40, 0x3A, 0x22, 0x0B, 0x0,
+	0x0, 0x0, 0x0B, 0x0B, 0x0, 0x3, 0x0, 0xFF, 0x0B, 0x0, 0x2, 0x0, 0x0B, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x1, 0x0, 0x1, 0x0, 0xFF, 0xFF,
+};
+
+const byte JASAPT[] = {
+	0x1, 0x0C, 0x0, 0x61, 0x0, 0x19, 0x0, 0x40, 0x30, 0x14, 0x0C, 0x0, 0x0,
+	0x0, 0x0C, 0x0C, 0x0, 0x3, 0x0, 0xFF, 0x0C, 0x0, 0x2, 0x0, 0x0C, 0x0, 0x1,
+	0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x18, 0x0, 0x2, 0x0, 0x62, 0x0, 0x17, 0x0, 0x1, 0x0, 0x62, 0x0, 0x11,
+	0x0, 0x1, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte RANSACKED[] = {
+	0x1, 0x0D, 0x0, 0x61, 0x0, 0x2D, 0x0, 0x40, 0x36, 0x2C, 0x0D, 0x0, 0x0,
+	0x0, 0x0D, 0x0D, 0x0, 0x3, 0x0, 0xFF, 0x0D, 0x0, 0x2, 0x0, 0x0D, 0x0, 0x1,
+	0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x17, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte MEAN1[] = {
+	0x1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x3E, 0x33,
+	0xFF, 0xFF, 0x0, 0x0, 0xFF, 0x0E, 0x0, 0x5, 0x0, 0x0E, 0x0, 0x4, 0x0,
+	0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte FLYSOUTH[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x10, 0x0, 0x28, 0x0C, 0x5E, 0x0F, 0x0,
+	0x0, 0x0, 0x0F, 0x0F, 0x0, 0x2, 0x0, 0xFF, 0x0F, 0x0, 0x1, 0x0, 0xFF, 0xFF,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x44, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte CUZCO[] = {
+	0x2, 0x10, 0x0, 0x61, 0x0, 0x10, 0x0, 0x40, 0x20, 0x30, 0x10, 0x0, 0x0,
+	0x0, 0x10, 0x10, 0x0, 0x3, 0x0, 0xFF, 0x10, 0x0, 0x2, 0x0, 0x10, 0x0, 0x1,
+	0x0, 0x6E, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x44, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte INAIR[] = {
+	0x1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x19, 0x2B,
+	0x11, 0x0, 0x0, 0x0, 0x11, 0x11, 0x0, 0x3, 0x0, 0xFF, 0x11, 0x0, 0x2, 0x0,
+	0x11, 0x0, 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF
+};
+
+const byte GREENMONKEY[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x11, 0x0, 0x2D, 0x14, 0x3C, 0x12, 0x0,
+	0x0, 0x0, 0x12, 0x12, 0x0, 0x3, 0x0, 0xFF, 0x12, 0x0, 0x2, 0x0, 0x12, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte INPLANE[] = {
+	0x2, 0x13, 0x0, 0x61, 0x0, 0x26, 0x0, 0x2D, 0x28, 0x28, 0x13, 0x0, 0x0,
+	0x0, 0x13, 0x13, 0x0, 0x3, 0x0, 0xFF, 0x13, 0x0, 0x2, 0x0, 0x13, 0x0, 0x1,
+	0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0,
+	0x2, 0x0, 0x62, 0x0, 0x29, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0,
+	0x62, 0x0, 0x38, 0x0, 0x2, 0x0, 0x62, 0x0, 0x33, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte PILFALL[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x16, 0x0, 0x28, 0x0C, 0x5E, 0x14, 0x0,
+	0x0, 0x0, 0x14, 0x14, 0x0, 0x2, 0x0, 0xFF, 0x14, 0x0, 0x1, 0x0, 0xFF, 0xFF,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte COCKPIT[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x12, 0x0, 0x3C, 0x2A, 0x29, 0x15, 0x0,
+	0x0, 0x0, 0x15, 0x15, 0x0, 0x3, 0x0, 0xFF, 0x15, 0x0, 0x2, 0x0, 0x15, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x23, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte CRASH[] = {
+	0x1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x2D, 0x64,
+	0x16, 0x0, 0x0, 0x0, 0xFF, 0x16, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0x0, 0x0,
+	0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x16, 0x0, 0x2, 0x0, 0xFF,
+	0xFF, 0x62, 0x0, 0x2A, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte SINKING[] = {
+	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x14, 0x0, 0x40, 0x3C, 0x19, 0x17, 0x0,
+	0x0, 0x0, 0x17, 0x17, 0x0, 0x3, 0x0, 0xFF, 0x17, 0x0, 0x2, 0x0, 0x17, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x48, 0x0, 0x1, 0x0, 0x62, 0x0, 0x17, 0x0,
+	0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte JNGLWLK[] = {
+	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x17, 0x0, 0x40, 0x3F, 0x5A, 0x18, 0x0,
+	0x0, 0x0, 0x18, 0x18, 0x0, 0x2, 0x0, 0xFF, 0x18, 0x0, 0x1, 0x0, 0xFF, 0xFF,
+	0x0, 0x0, 0x0DC, 0x0A0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x62, 0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte TOWN[] = {
+	0x2, 0x19, 0x0, 0x61, 0x0, 0x18, 0x0, 0x3E, 0x32, 0x80, 0x19, 0x0, 0x0,
+	0x0, 0x19, 0x19, 0x0, 0x3, 0x0, 0xFF, 0x19, 0x0, 0x2, 0x0, 0x19, 0x0, 0x1,
+	0x0, 0x64, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3D, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3B, 0x0,
+	0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte HOTEL[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x19, 0x0, 0x34, 0x28, 0x28, 0x1A, 0x0,
+	0x0, 0x0, 0x1A, 0x1A, 0x0, 0x3, 0x0, 0xFF, 0x1A, 0x0, 0x2, 0x0, 0x1A, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x28, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2B, 0x0, 0x1, 0x0, 0x62, 0x0, 0x46,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x45, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0E, 0x0, 0x1, 0x0,
+	0xFF, 0xFF
+};
+
+const byte CANTINA[] = {
+	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x27, 0x0, 0x40, 0x3A, 0x6C, 0x1B, 0x0,
+	0x0, 0x0, 0x1B, 0x1B, 0x0, 0x3, 0x0, 0xFF, 0x1B, 0x0, 0x2, 0x0, 0x1B, 0x0,
+	0x1, 0x0, 0x0C8, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte MASSACRE[] = {
+	0x2, 0x1D, 0x0, 0x61, 0x0, 0x32, 0x0, 0x20, 0x18, 0x73, 0x1D, 0x0, 0x0,
+	0x0, 0x1D, 0x1D, 0x0, 0x3, 0x0, 0xFF, 0x1D, 0x0, 0x2, 0x0, 0x1D, 0x0, 0x1,
+	0x0, 0x96, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0C, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3, 0x0, 0x2,
+	0x0, 0x62, 0x0, 0x49, 0x0, 0x2, 0x0, 0x62, 0x0, 0x4A, 0x0, 0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte TRADE[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x18, 0x0, 0x3F, 0x1C, 0x27, 0x1E, 0x0,
+	0x0, 0x0, 0x1E, 0x1E, 0x0, 0x3, 0x0, 0xFF, 0x1E, 0x0, 0x2, 0x0, 0x1E, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte BRIDGE[] = {
+	0x2, 0x1F, 0x0, 0x61, 0x0, 0x1B, 0x0, 0x40, 0x3F, 0x78, 0x1F, 0x0, 0x0,
+	0x0, 0x1F, 0x1F, 0x0, 0x3, 0x0, 0xFF, 0x1F, 0x0, 0x2, 0x0, 0x1F, 0x0, 0x1,
+	0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte DOCK[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x1E, 0x0, 0x40, 0x3B, 0x4B, 0x20, 0x0,
+	0x0, 0x0, 0xFF, 0x20, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0x0,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte DRIVER[] = {
+	0x1, 0x21, 0x0, 0x61, 0x0, 0x28, 0x0, 0x30, 0x10, 0x51, 0x21, 0x0, 0x0,
+	0x0, 0x21, 0x21, 0x0, 0x2, 0x0, 0xFF, 0x21, 0x0, 0x1, 0x0, 0xFF, 0xFF,
+	0x0, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x2E, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2F, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte SHORE[] = {
+	0x2, 0x24, 0x0, 0x61, 0x0, 0x4, 0x0, 0x3E, 0x3A, 0x32, 0x24, 0x0, 0x0, 0x0,
+	0x24, 0x24, 0x0, 0x3, 0x0, 0xFF, 0x24, 0x0, 0x2, 0x0, 0x24, 0x0, 0x1, 0x0,
+	0x0B4, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0,
+	0x2D, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2E, 0x0,
+	0x1, 0x0, 0x62, 0x0, 0x2F, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte BOAT[] = {
+	0x3, 0xFF, 0xFF, 0x61, 0x0, 0x8, 0x0, 0x3F, 0x3F, 0xFF, 0x25, 0x0,
+	0x0, 0x0, 0x25, 0x25, 0x0, 0x3, 0x0, 0xFF, 0x25, 0x0, 0x2, 0x0, 0x25, 0x0,
+	0x1, 0x0, 0xFF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x62, 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x21, 0x0, 0x1, 0x0, 0x62, 0x0, 0x25,
+	0x0, 0x1, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x30, 0x0, 0x1, 0x0,
+	0x62, 0x0, 0x32, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte CABIN[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x8, 0x0, 0x40, 0x32, 0x50, 0x26, 0x0,
+	0x0, 0x0, 0x26, 0x26, 0x0, 0x3, 0x0, 0xFF, 0x26, 0x0, 0x2, 0x0, 0x26, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x22, 0x0, 0x2, 0x0, 0x62, 0x0, 0x31, 0x0,
+	0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte CAPTIVE[] = {
+	0x2, 0x27, 0x0, 0x61, 0x0, 0x9, 0x0, 0x40, 0x3F, 0x37, 0x27, 0x0, 0x0, 0x0,
+	0x27, 0x27, 0x0, 0x3, 0x0, 0xFF, 0x27, 0x0, 0x2, 0x0, 0x27, 0x0, 0x1, 0x0,
+	0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0,
+	0x0, 0x0, 0x4, 0x0, 0x62, 0x0, 0x1B, 0x0, 0x3, 0x0, 0x62, 0x0, 0x1C, 0x0, 0x1,
+	0x0, 0x62, 0x0, 0x1F, 0x0, 0x2, 0x0, 0x62, 0x0, 0x23, 0x0, 0x1, 0x0, 0x62,
+	0x0, 0x32, 0x0, 0x1, 0x0, 0x62, 0x0, 0x33, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte VILLAGE[] = {
+	0x2, 0x2A, 0x0, 0x61, 0x0, 0x2E, 0x0, 0x1E, 0x1B, 0x6E, 0x2A, 0x0, 0x0,
+	0x0, 0x2A, 0x2A, 0x0, 0x3, 0x0, 0xFF, 0x2A, 0x0, 0x2, 0x0, 0x2A, 0x0, 0x1,
+	0x0, 0x0A5, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x2D, 0x0, 0x3, 0x0, 0x62, 0x0, 0x3F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x40,
+	0x0, 0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte TREE[] = {
+	0x2, 0x2C, 0x0, 0x61, 0x0, 0x31, 0x0, 0x1E, 0x1D, 0x0BE, 0x2C, 0x0, 0x0,
+	0x0, 0x2C, 0x2C, 0x0, 0x3, 0x0, 0xFF, 0x2C, 0x0, 0x2, 0x0, 0x2C, 0x0, 0x1,
+	0x0, 0x50, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x2E, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2F, 0x0,
+	0x1, 0x0, 0x62, 0x0, 0x4, 0x0, 0x1, 0x0, 0x62, 0x0, 0x42, 0x0, 0x1, 0x0, 0xFF,
+	0xFF
+};
+
+const byte CANOE[] = {
+	0x1, 0x2D, 0x0, 0x61, 0x0, 0x2F, 0x0, 0x1E, 0x1D, 0x78, 0x2D, 0x0, 0x0,
+	0x0, 0x2D, 0x2D, 0x0, 0x3, 0x0, 0xFF, 0x2D, 0x0, 0x2, 0x0, 0x2D, 0x0, 0x1,
+	0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x40, 0x0, 0x3, 0x0, 0x62, 0x0, 0x41, 0x0, 0x2, 0x0, 0x62, 0x0, 0x2E,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x2F, 0x0, 0x2, 0x0, 0x62, 0x0, 0x16, 0x0, 0x1, 0x0,
+	0xFF, 0xFF
+};
+
+const byte INTREE[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x33, 0x0, 0x28, 0x1E, 0x32, 0x2E, 0x0,
+	0x0, 0x0, 0x2E, 0x2E, 0x0, 0x3, 0x0, 0xFF, 0x2E, 0x0, 0x2, 0x0, 0x2E, 0x0,
+	0x1, 0x0, 0x0F0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte FALLS[] = {
+	0x1, 0xFF, 0xFF, 0x61, 0x0, 0x3B, 0x0, 0x28, 0x1E, 0x32, 0x2F, 0x0,
+	0x0, 0x0, 0x2F, 0x2F, 0x0, 0x3, 0x0, 0xFF, 0x2F, 0x0, 0x2, 0x0, 0x2F, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x4, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2A, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte WATERFALL[] = {
+	0x1, 0x36, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x6E, 0x36,
+	0x0, 0x0, 0x0, 0x36, 0x36, 0x0, 0x3, 0x0, 0xFF, 0x36, 0x0, 0x2, 0x0, 0x36,
+	0x0, 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x36, 0x0, 0x4,
+	0x0, 0xFF, 0xFF, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte INWATER[] = {
+	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x36, 0x0, 0x40, 0x3F, 0x2A, 0x37, 0x0,
+	0x0, 0x0, 0x37, 0x37, 0x0, 0x3, 0x0, 0xFF, 0x37, 0x0, 0x2, 0x0, 0x37, 0x0,
+	0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x38, 0x0, 0x1, 0x0, 0xFF, 0xFF
+};
+
+const byte CAVE[] = {
+	0x2, 0x39, 0x0, 0x61, 0x0, 0x37, 0x0, 0x32, 0x14, 0x73, 0x39, 0x0, 0x0,
+	0x0, 0x39, 0x39, 0x0, 0x3, 0x0, 0xFF, 0x39, 0x0, 0x2, 0x0, 0x39, 0x0, 0x1,
+	0x0, 0x0B4, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x4B, 0x0,
+	0x2, 0x0, 0x62, 0x0, 0x4C, 0x0, 0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte PIT[] = {
+	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x38, 0x0, 0x41, 0x3F, 0x19, 0x3D, 0x0,
+	0x0, 0x0, 0x3D, 0x3D, 0x0, 0x3, 0x0, 0x3E, 0x3D, 0x0, 0x4, 0x0, 0xFF, 0x3D,
+	0x0, 0x2, 0x0, 0x3D, 0x0, 0x1, 0x0, 0x0BE, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x27, 0x0, 0x1, 0x0,
+	0x62, 0x0, 0x4D, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0x0
+};
+
+const byte *ROOM_TABLE[] = {
+	CREDITS, nullptr, nullptr, nullptr, ALLISTER, HALL, JASONLAB, nullptr,
+	ALLENLAB, OUTVAULT, VAULT, LIBRARY, JASAPT, RANSACKED, MEAN1, FLYSOUTH,
+	CUZCO, INAIR, GREENMONKEY, INPLANE, PILFALL, COCKPIT, CRASH, SINKING,
+	JNGLWLK, TOWN, HOTEL, CANTINA, nullptr, MASSACRE, TRADE, BRIDGE, DOCK,
+	DRIVER, nullptr, nullptr, SHORE, BOAT, CABIN, CAPTIVE, nullptr,
+	nullptr, VILLAGE, nullptr, TREE, CANOE, INTREE, FALLS, nullptr,
+	nullptr, nullptr, nullptr, nullptr, nullptr, WATERFALL, INWATER, nullptr,
+	CAVE, nullptr, nullptr, nullptr, PIT, nullptr, nullptr
+};
+
+const byte ELAINE[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x41, 0x41, 0x0, 0x1, 0x0, 0xFF, 0x41, 0x0, 0x2,
+	0x0, 0x41, 0x0, 0x0, 0x0, 0x41, 0x0, 0x3, 0x0, 0x41, 0x0, 0x25, 0x0, 0x41,
+	0x0, 0x4, 0x0, 0x41, 0x0, 0x26, 0x0, 0x41, 0x0, 0x5, 0x0, 0x41, 0x0, 0x27,
+	0x0, 0x41, 0x0, 0x6, 0x0, 0x41, 0x0, 0x28, 0x0, 0x41, 0x0, 0x7, 0x0, 0x41,
+	0x0, 0x29, 0x0, 0x41, 0x0, 0x8, 0x0, 0x41, 0x0, 0x2A, 0x0, 0x41, 0x0, 0x9,
+	0x0, 0x41, 0x0, 0x2B, 0x0, 0x41, 0x0, 0x0A, 0x0, 0x41, 0x0, 0x2C, 0x0, 0x41,
+	0x0, 0x0B, 0x0, 0x41, 0x0, 0x2D, 0x0, 0x41, 0x0, 0x0C, 0x0, 0x41, 0x0, 0x2E,
+	0x0, 0x41, 0x0, 0x0D, 0x0, 0x41, 0x0, 0x2F, 0x0, 0x41, 0x0, 0x0E, 0x0, 0x41,
+	0x0, 0x30, 0x0, 0x41, 0x0, 0x0F, 0x0, 0x41, 0x0, 0x31, 0x0, 0x41, 0x0, 0x10,
+	0x0, 0x41, 0x0, 0x32, 0x0, 0x41, 0x0, 0x11, 0x0, 0x41, 0x0, 0x33, 0x0, 0x41,
+	0x0, 0x12, 0x0, 0x41, 0x0, 0x34, 0x0, 0x41, 0x0, 0x13, 0x0, 0x41, 0x0, 0x35,
+	0x0, 0x41, 0x0, 0x14, 0x0, 0x41, 0x0, 0x36, 0x0, 0x41, 0x0, 0x15, 0x0, 0x41,
+	0x0, 0x37, 0x0, 0x41, 0x0, 0x16, 0x0, 0x41, 0x0, 0x38, 0x0, 0x41, 0x0, 0x17,
+	0x0, 0x41, 0x0, 0x39, 0x0, 0x41, 0x0, 0x18, 0x0, 0x41, 0x0, 0x3A, 0x0, 0x41,
+	0x0, 0x19, 0x0, 0x41, 0x0, 0x3B, 0x0, 0x41, 0x0, 0x1A, 0x0, 0x41, 0x0, 0x3C,
+	0x0, 0x41, 0x0, 0x1B, 0x0, 0x41, 0x0, 0x3D, 0x0, 0x41, 0x0, 0x1C, 0x0, 0x41,
+	0x0, 0x3E, 0x0, 0x41, 0x0, 0x1D, 0x0, 0x41, 0x0, 0x3F, 0x0, 0x41, 0x0, 0x1E,
+	0x0, 0x41, 0x0, 0x40, 0x0, 0x41, 0x0, 0x1F, 0x0, 0x41, 0x0, 0x41, 0x0, 0x41,
+	0x0, 0x20, 0x0, 0x41, 0x0, 0x42, 0x0, 0x41, 0x0, 0x21, 0x0, 0x41, 0x0, 0x43,
+	0x0, 0x41, 0x0, 0x22, 0x0, 0x41, 0x0, 0x44, 0x0, 0x41, 0x0, 0x23, 0x0, 0x41,
+	0x0, 0x45, 0x0, 0x41, 0x0, 0x24, 0x0, 0x41, 0x0, 0x46, 0x0, 0xFF, 0xFF
+};
+
+const byte LIB[] = {
+	0x1, 0xFF, 0xFF, 0x42, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x42, 0x42, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2,
+	0x0, 0x42, 0x0, 0x0, 0x0, 0x42, 0x0, 0x3, 0x0, 0x42, 0x0, 0x18, 0x0, 0x42,
+	0x0, 0x4, 0x0, 0x42, 0x0, 0x19, 0x0, 0x42, 0x0, 0x5, 0x0, 0x42, 0x0, 0x1A,
+	0x0, 0x42, 0x0, 0x6, 0x0, 0x42, 0x0, 0x1B, 0x0, 0x42, 0x0, 0x7, 0x0, 0x42,
+	0x0, 0x1C, 0x0, 0x42, 0x0, 0x8, 0x0, 0x42, 0x0, 0x1D, 0x0, 0x42, 0x0, 0x9,
+	0x0, 0x42, 0x0, 0x1E, 0x0, 0x42, 0x0, 0x0A, 0x0, 0x42, 0x0, 0x1F, 0x0, 0x42,
+	0x0, 0x0B, 0x0, 0x42, 0x0, 0x20, 0x0, 0x42, 0x0, 0x0C, 0x0, 0x42, 0x0, 0x21,
+	0x0, 0x42, 0x0, 0x0D, 0x0, 0x42, 0x0, 0x22, 0x0, 0x42, 0x0, 0x0E, 0x0, 0x42,
+	0x0, 0x23, 0x0, 0x42, 0x0, 0x0F, 0x0, 0x42, 0x0, 0x24, 0x0, 0x42, 0x0, 0x10,
+	0x0, 0x42, 0x0, 0x25, 0x0, 0x42, 0x0, 0x11, 0x0, 0x42, 0x0, 0x26, 0x0, 0x42,
+	0x0, 0x12, 0x0, 0x42, 0x0, 0x27, 0x0, 0x42, 0x0, 0x13, 0x0, 0x42, 0x0, 0x28,
+	0x0, 0x42, 0x0, 0x14, 0x0, 0x42, 0x0, 0x29, 0x0, 0x42, 0x0, 0x15, 0x0, 0x42,
+	0x0, 0x2A, 0x0, 0x42, 0x0, 0x16, 0x0, 0x42, 0x0, 0x2B, 0x0, 0x42, 0x0, 0x17,
+	0x0, 0x42, 0x0, 0x2C, 0x0, 0xFF, 0xFF
+};
+
+const byte FLASHBACK[] = {
+	0x2, 0x1B, 0x0, 0x1C, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x26, 0x0, 0x1C, 0x0, 0x0, 0x0, 0x1C,
+	0x0, 0x5, 0x0, 0x1C, 0x0, 0x0E, 0x0, 0x1C, 0x0, 0x6, 0x0, 0x1C, 0x0, 0x0F,
+	0x0, 0x1C, 0x0, 0x7, 0x0, 0x1C, 0x0, 0x0C, 0x0, 0x1C, 0x0, 0x8, 0x0, 0x1C,
+	0x0, 0x0D, 0x0, 0x2, 0x0, 0x1, 0x0, 0x1C, 0x0, 0x10, 0x0, 0x2, 0x0, 0x2, 0x0, 0x1C,
+	0x0, 0x11, 0x0, 0x1C, 0x0, 0x9, 0x0, 0x1C, 0x0, 0x12, 0x0, 0x1C, 0x0, 0x0A,
+	0x0, 0x1C, 0x0, 0x13, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x14, 0x0, 0x1C,
+	0x0, 0x0B, 0x0, 0x1C, 0x0, 0x15, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x16,
+	0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x17, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C,
+	0x0, 0x18, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x19, 0x0, 0x1C, 0x0, 0x0B,
+	0x0, 0x1C, 0x0, 0x1A, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1B, 0x0, 0x1C,
+	0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1C, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1D,
+	0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1E, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C,
+	0x0, 0x1F, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x20, 0x0, 0x1C, 0x0, 0x0B,
+	0x0, 0x1C, 0x0, 0x21, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x22, 0x0, 0x1C,
+	0x0, 0x0B, 0x0, 0x1C, 0x0, 0x23, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x24,
+	0x0, 0xFF, 0xFF
+};
+
+const byte ALLENDIE[] = {
+	0x2, 0xFF, 0xFF, 0x49, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x49,
+	0x0, 0x4, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x49, 0x0, 0x5, 0x0, 0x62, 0x0, 0x3A,
+	0x0, 0x49, 0x0, 0x6, 0x0, 0x49, 0x0, 0x7, 0x0, 0xFF, 0xFF
+};
+
+const byte OVERBOARD[] = {
+	0x2, 0xFF, 0xFF, 0x22, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x22, 0x22, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x22, 0x0, 0x0, 0x0, 0x22, 0x0, 0x3, 0x0, 0x22, 0x0, 0x6, 0x0, 0x22,
+	0x0, 0x4, 0x0, 0x22, 0x0, 0x7, 0x0, 0x22, 0x0, 0x5, 0x0, 0x62, 0x0, 0x1D, 0x0,
+	0x22, 0x0, 0x5, 0x0, 0x62, 0x0, 0x24, 0x0, 0xFF, 0xFF
+};
+
+const byte PILOT2[] = {
+	0x0, 0x12, 0x0, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x46, 0x46, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x46, 0x0, 0x0, 0x0, 0x46, 0x0, 0x2, 0x0, 0x46, 0x0, 0x0A, 0x0, 0x46,
+	0x0, 0x3, 0x0, 0x46, 0x0, 0x0B, 0x0, 0x46, 0x0, 0x4, 0x0, 0x46, 0x0, 0x0C,
+	0x0, 0x46, 0x0, 0x5, 0x0, 0x46, 0x0, 0x0D, 0x0, 0x46, 0x0, 0x6, 0x0, 0x46,
+	0x0, 0x0E, 0x0, 0x46, 0x0, 0x7, 0x0, 0x46, 0x0, 0x0F, 0x0, 0x46, 0x0, 0x8,
+	0x0, 0x46, 0x0, 0x10, 0x0, 0x46, 0x0, 0x9, 0x0, 0x46, 0x0, 0x11, 0x0, 0x46,
+	0x0, 0x9, 0x0, 0x62, 0x0, 0x1F, 0x0, 0xFF, 0xFF
+};
+
+const byte TIKAGENT[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x43, 0x43, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2,
+	0x0, 0x43, 0x0, 0x0, 0x0, 0x43, 0x0, 0x2, 0x0, 0x43, 0x0, 0x12, 0x0, 0x43,
+	0x0, 0x3, 0x0, 0x43, 0x0, 0x13, 0x0, 0x43, 0x0, 0x4, 0x0, 0x43, 0x0, 0x14,
+	0x0, 0x43, 0x0, 0x5, 0x0, 0x43, 0x0, 0x15, 0x0, 0x43, 0x0, 0x6, 0x0, 0x43,
+	0x0, 0x16, 0x0, 0x43, 0x0, 0x7, 0x0, 0x43, 0x0, 0x17, 0x0, 0x43, 0x0, 0x8,
+	0x0, 0x43, 0x0, 0x18, 0x0, 0x43, 0x0, 0x9, 0x0, 0x43, 0x0, 0x19, 0x0, 0x43,
+	0x0, 0x0A, 0x0, 0x43, 0x0, 0x1A, 0x0, 0x43, 0x0, 0x0B, 0x0, 0x43, 0x0, 0x1B,
+	0x0, 0x43, 0x0, 0x0C, 0x0, 0x43, 0x0, 0x1C, 0x0, 0x43, 0x0, 0x0D, 0x0, 0x43,
+	0x0, 0x1D, 0x0, 0x43, 0x0, 0x0E, 0x0, 0x43, 0x0, 0x1E, 0x0, 0x43, 0x0, 0x0F,
+	0x0, 0x43, 0x0, 0x1F, 0x0, 0x43, 0x0, 0x10, 0x0, 0x43, 0x0, 0x20, 0x0, 0x43,
+	0x0, 0x11, 0x0, 0x43, 0x0, 0x21, 0x0, 0xFF, 0xFF
+};
+
+const byte BARTENDER[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x44, 0x44, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x44, 0x0, 0x0, 0x0, 0x44, 0x0, 0x2, 0x0, 0x44, 0x0, 0x8, 0x0, 0x44, 0x0,
+	0x3, 0x0, 0x44, 0x0, 0x9, 0x0, 0x44, 0x0, 0x4, 0x0, 0x44, 0x0, 0x0A, 0x0, 0x44,
+	0x0, 0x5, 0x0, 0x44, 0x0, 0x0B, 0x0, 0x44, 0x0, 0x6, 0x0, 0x44, 0x0, 0x0C,
+	0x0, 0x44, 0x0, 0x7, 0x0, 0x44, 0x0, 0x0D, 0x0, 0xFF, 0xFF
+};
+
+const byte PILOT1[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x45, 0x45, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x45, 0x0, 0x0, 0x0, 0x45, 0x0, 0x2, 0x0, 0x45, 0x0, 0x3, 0x0, 0xFF, 0xFF
+};
+
+const byte COOK[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x47, 0x47, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
+	0x2, 0x0, 0x47, 0x0, 0x0, 0x0, 0x47, 0x0, 0x2, 0x0, 0x47, 0x0, 0x10, 0x0, 0x47,
+	0x0, 0x3, 0x0, 0x47, 0x0, 0x11, 0x0, 0x47, 0x0, 0x4, 0x0, 0x47, 0x0, 0x12,
+	0x0, 0x47, 0x0, 0x5, 0x0, 0x47, 0x0, 0x13, 0x0, 0x47, 0x0, 0x6, 0x0, 0x47,
+	0x0, 0x14, 0x0, 0x47, 0x0, 0x7, 0x0, 0x47, 0x0, 0x15, 0x0, 0x47, 0x0, 0x8,
+	0x0, 0x47, 0x0, 0x16, 0x0, 0x47, 0x0, 0x9, 0x0, 0x47, 0x0, 0x17, 0x0, 0x47,
+	0x0, 0x0A, 0x0, 0x47, 0x0, 0x18, 0x0, 0x47, 0x0, 0x0B, 0x0, 0x47, 0x0, 0x19,
+	0x0, 0x47, 0x0, 0x0C, 0x0, 0x47, 0x0, 0x1A, 0x0, 0x47, 0x0, 0x0D, 0x0, 0x47,
+	0x0, 0x1B, 0x0, 0x47, 0x0, 0x0E, 0x0, 0x47, 0x0, 0x1C, 0x0, 0x47, 0x0, 0x0F,
+	0x0, 0x47, 0x0, 0x1D, 0x0, 0xFF, 0xFF
+};
+
+const byte BEXPLODE[] = {
+	0x2, 0xFF, 0xFF, 0x28, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x28, 0x28, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x28, 0x0, 0x0, 0x0, 0x28, 0x0, 0x3, 0x0, 0x28, 0x0, 0x9, 0x0, 0x28,
+	0x0, 0x4, 0x0, 0x28, 0x0, 0x0A, 0x0, 0x28, 0x0, 0x5, 0x0, 0x28, 0x0, 0x0B,
+	0x0, 0x28, 0x0, 0x6, 0x0, 0x62, 0x0, 0x23, 0x0, 0x28, 0x0, 0x7, 0x0, 0x62,
+	0x0, 0x23, 0x0, 0x28, 0x0, 0x8, 0x0, 0x62, 0x0, 0x23, 0x0, 0xFF, 0xFF
+};
+
+const byte THORNICK[] = {
+	0x2, 0x7, 0x0, 0x7, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x0,
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x0, 0x0, 0x0, 0x7, 0x0, 0x2, 0x0, 
+	0x7, 0x0, 0x5, 0x0, 0x7, 0x0, 0x3, 0x0, 0x7, 0x0, 0x6, 0x0, 0x7, 0x0, 0x3, 
+	0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x4, 0x0, 0x7, 0x0, 0x8, 0x0, 0xFF, 0xFF
+};
+
+const byte MAYA[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 
+	0x0, 0x0, 0x0, 0x48, 0x48, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 
+	0x48, 0x0, 0x0, 0x0, 0x48, 0x0, 0x2, 0x0, 0x48, 0x0, 0x13, 0x0, 0x48,
+	0x0, 0x3, 0x0, 0x48, 0x0, 0x14, 0x0, 0x48, 0x0, 0x4, 0x0, 0x48, 0x0, 0x15,
+	0x0, 0x48, 0x0, 0x5, 0x0, 0x48, 0x0, 0x16, 0x0, 0x48, 0x0, 0x6, 0x0, 0x48,
+	0x0, 0x17, 0x0, 0x48, 0x0, 0x7, 0x0, 0x48, 0x0, 0x18, 0x0, 0x48, 0x0, 0x8,
+	0x0, 0x48, 0x0, 0x19, 0x0, 0x48, 0x0, 0x9, 0x0, 0x48, 0x0, 0x1A, 0x0, 0x48,
+	0x0, 0x0A, 0x0, 0x48, 0x0, 0x1B, 0x0, 0x48, 0x0, 0x0B, 0x0, 0x48, 0x0, 0x1C,
+	0x0, 0x48, 0x0, 0x0C, 0x0, 0x48, 0x0, 0x1D, 0x0, 0x48, 0x0, 0x0D, 0x0, 0x48,
+	0x0, 0x1E, 0x0, 0x48, 0x0, 0x0E, 0x0, 0x48, 0x0, 0x1F, 0x0, 0x48, 0x0, 0x0F,
+	0x0, 0x48, 0x0, 0x20, 0x0, 0x48, 0x0, 0x10, 0x0, 0x48, 0x0, 0x21, 0x0, 0x48,
+	0x0, 0x11, 0x0, 0x48, 0x0, 0x22, 0x0, 0x48, 0x0, 0x12, 0x0, 0x48, 0x0, 0x23,
+	0x0, 0xFF, 0xFF
+};
+
+const byte CAPTAIN[] = {
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x4A, 0x4A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
+	0x2, 0x0, 0x4A, 0x0, 0x0, 0x0, 0x4A, 0x0, 0x2, 0x0, 0x4A, 0x0, 0x0E, 0x0, 0x4A,
+	0x0, 0x3, 0x0, 0x4A, 0x0, 0x0F, 0x0, 0x4A, 0x0, 0x4, 0x0, 0x4A, 0x0, 0x10,
+	0x0, 0x4A, 0x0, 0x5, 0x0, 0x4A, 0x0, 0x11, 0x0, 0x4A, 0x0, 0x6, 0x0, 0x4A,
+	0x0, 0x12, 0x0, 0x4A, 0x0, 0x7, 0x0, 0x4A, 0x0, 0x13, 0x0, 0x4A, 0x0, 0x8,
+	0x0, 0x4A, 0x0, 0x14, 0x0, 0x4A, 0x0, 0x9, 0x0, 0x4A, 0x0, 0x15, 0x0, 0x4A,
+	0x0, 0x0A, 0x0, 0x4A, 0x0, 0x16, 0x0, 0x4A, 0x0, 0x0B, 0x0, 0x4A, 0x0, 0x17,
+	0x0, 0x4A, 0x0, 0x0C, 0x0, 0x4A, 0x0, 0x18, 0x0, 0x4A, 0x0, 0x0D, 0x0, 0x4A,
+	0x0, 0x19, 0x0, 0xFF, 0xFF
+};
+
+const byte ALLEN[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x1E, 0x4C, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x4C, 0x0, 0x0, 0x0, 0x4C, 0x0, 0x2, 0x0, 0x4C, 0x0, 0x3, 0x0,
+	0xFF, 0xFF
+};
+
+const byte ARCH[] = {
+	0x1, 0x2B, 0x0, 0x4B, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x2B, 0x4B, 0x0, 0x40, 0x0, 0xFF, 0x4B, 0x0, 0x41, 0x0,
+	0x4B, 0x0, 0x0, 0x0, 0x4B, 0x0, 0x2, 0x0, 0x4B, 0x0, 0x4, 0x0, 0x4B, 0x0, 0x3,
+	0x0, 0x4B, 0x0, 0x5, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x6, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x7, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x8, 0x0, 0x4B,
+	0x0, 0x3, 0x0, 0x4B, 0x0, 0x9, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0A, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0B, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x0C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0D, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x0E, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0F, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x10, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x11, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x12, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x13, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x14, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x15, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x16, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x17, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x18, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x19, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x1A, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x1B, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x1C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x1D, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x1E, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x1F, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x20, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x21, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x22, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x23, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x24, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x25, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x26, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x27, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x28, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x29, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x2A, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x2B, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x2C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x2D, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x2E, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x2F, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x30, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x31, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x32, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x33, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x34, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x35, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x36, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x37, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x38, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x39, 0x0, 0x4B, 0x0,
+	0x3, 0x0, 0x4B, 0x0, 0x3A, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x3B, 0x0,
+	0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x3C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0,
+	0x3D, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x3E, 0x0, 0x4B, 0x0, 0x3, 0x0,
+	0x4B, 0x0, 0x3F, 0x0, 0xFF, 0xFF
+};
+
+const byte GUARD1[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x4D, 0x4D, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x4D, 0x0, 0x0, 0x0, 0x4D, 0x0, 0x2, 0x0, 0x4D, 0x0, 0x3, 0x0,
+	0xFF, 0xFF
+};
+
+const byte MCANOE[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x4E, 0x4E, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x4E, 0x0, 0x0, 0x0, 0x4E, 0x0, 0x2, 0x0, 0x4E, 0x0, 0x3, 0x0,
+	0xFF, 0xFF
+};
+
+const byte CAMPFIRE[] = {
+	0x2, 0x35, 0x0, 0x35, 0x0, 0x3, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x35, 0x35, 0x0, 0x1, 0x0, 0xFF, 0x35, 0x0, 0x2, 0x0, 0x35,
+	0x0, 0x0, 0x0, 0x35, 0x0, 0x4, 0x0, 0x35, 0x0, 0x18, 0x0, 0x35, 0x0, 0x5, 0x0,
+	0x35, 0x0, 0x19, 0x0, 0x35, 0x0, 0x6, 0x0, 0x35, 0x0, 0x1A, 0x0, 0x35, 0x0,
+	0x7, 0x0, 0x35, 0x0, 0x1B, 0x0, 0x35, 0x0, 0x8, 0x0, 0x35, 0x0, 0x1C, 0x0,
+	0x35, 0x0, 0x9, 0x0, 0x35, 0x0, 0x1D, 0x0, 0x35, 0x0, 0x0A, 0x0, 0x35, 0x0,
+	0x1E, 0x0, 0x35, 0x0, 0x0B, 0x0, 0x35, 0x0, 0x1F, 0x0, 0x35, 0x0, 0x0C,
+	0x0, 0x35, 0x0, 0x20, 0x0, 0x35, 0x0, 0x0D, 0x0, 0x35, 0x0, 0x21, 0x0, 0x35,
+	0x0, 0x0E, 0x0, 0x35, 0x0, 0x22, 0x0, 0x35, 0x0, 0x0F, 0x0, 0x35, 0x0, 0x23,
+	0x0, 0x35, 0x0, 0x10, 0x0, 0x35, 0x0, 0x24, 0x0, 0x35, 0x0, 0x11, 0x0, 0x35,
+	0x0, 0x25, 0x0, 0x35, 0x0, 0x12, 0x0, 0x35, 0x0, 0x26, 0x0, 0x35, 0x0, 0x13,
+	0x0, 0x35, 0x0, 0x27, 0x0, 0x35, 0x0, 0x14, 0x0, 0x35, 0x0, 0x28, 0x0, 0x35,
+	0x0, 0x15, 0x0, 0x35, 0x0, 0x29, 0x0, 0x35, 0x0, 0x16, 0x0, 0x35, 0x0, 0x2A,
+	0x0, 0x35, 0x0, 0x17, 0x0, 0x35, 0x0, 0x2B, 0x0, 0xFF, 0xFF
+};
+
+const byte COLONEL[] = {
+	0x2, 0xFF, 0xFF, 0x0E, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x0E, 0x0E, 0x0, 0x5, 0x0, 0xFF, 0xFF, 0xFF, 0x2,
+	0x0, 0x4F, 0x0, 0x0, 0x0, 0x4F, 0x0, 0x1, 0x0, 0x4F, 0x0, 0x2, 0x0, 0x0E, 0x0,
+	0x8, 0x0, 0x4F, 0x0, 0x3, 0x0, 0xFF, 0xFF
+};
+
+const byte SOLDIERS[] = {
+	0x2, 0xFF, 0xFF, 0x50, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x50, 0x0, 0x0, 0x0, 0x50,
+	0x0, 0x2, 0x0, 0x50, 0x0, 0x0, 0x0, 0xFF, 0xFF
+};
+
+const byte JWATER[] = {
+	0x2, 0xFF, 0xFF, 0x51, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x51, 0x0, 0x0, 0x0, 0x51,
+	0x0, 0x2, 0x0, 0x51, 0x0, 0x3, 0x0, 0xFF, 0xFF
+};
+
+const byte SHOOT[] = {
+	0x2, 0xFF, 0xFF, 0x52, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x38, 0x52, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x52, 0x0, 0x0, 0x0, 0x52, 0x0, 0x3, 0x0, 0x52, 0x0, 0x5, 0x0, 0x52, 
+	0x0, 0x4, 0x0, 0x62, 0x0, 0x1F, 0x0, 0xFF, 0xFF
+};
+
+const byte ADIE[] = {
+	0x2, 0xFF, 0xFF, 0x53, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 0x53, 0x0, 0x0, 0x0, 0x53,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x53, 0x0, 0x3, 0x0, 0x62, 0x0, 0x4, 
+	0x0, 0x53, 0x0, 0x4, 0x0, 0x62, 0x0, 0x4, 0x0, 0xFF, 0xFF
+};
+
+const byte DYNAMITE[] = {
+	0x2, 0xFF, 0xFF, 0x54, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 0x54, 0x0, 0x0, 0x0, 0x54,
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x23, 0x0, 0xFF, 0xFF
+};
+
+const byte MAYASHOT[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x0, 0x0, 0x0, 0x0, 0x36, 0x55, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
+	0x3, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 
+	0x0, 0xFF, 0xFF
+};
+
+const byte OFFKEV[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 
+	0x0, 0x0, 0x0, 0x4D, 0x29, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
+	0x29, 0x0, 0x0, 0x0, 0x29, 0x0, 0x2, 0x0, 0x29, 0x0, 0x3, 0x0, 0xFF, 0xFF
+};
+
+const byte VALLEY[] = {
+	0x2, 0x3A, 0x0, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x3A, 0x3A, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0x3, 0x0,
+	0x3A, 0x0, 0x0, 0x0, 0x3A, 0x0, 0x3, 0x0, 0x3A, 0x0, 0x5, 0x0, 0x3A, 0x0, 
+	0x4, 0x0, 0x62, 0x0, 0x27, 0x0, 0xFF, 0xFF
+};
+
+const byte MEANWHILE1[] = {
+	0x2, 0xFF, 0xFF, 0x0E, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x0E, 0x0E, 0x0, 0x5, 0x0, 0xFF, 0xFF, 0xFF, 0x3,
+	0x0, 0x0E, 0x0, 0x0, 0x0, 0x0E, 0x0, 0x6, 0x0, 0x0E, 0x0, 0x0A, 0x0, 0x0E,
+	0x0, 0x7, 0x0, 0x0E, 0x0, 0x0B, 0x0, 0x0E, 0x0, 0x8, 0x0, 0x0E, 0x0, 0x0C,
+	0x0, 0x0E, 0x0, 0x8, 0x0, 0x0E, 0x0, 0x0D, 0x0, 0x0E, 0x0, 0x8, 0x0, 0x0E,
+	0x0, 0x0E, 0x0, 0x0E, 0x0, 0x9, 0x0, 0x0E, 0x0, 0x0F, 0x0, 0x0E, 0x0, 0x9,
+	0x0, 0x0E, 0x0, 0x10, 0x0, 0x0E, 0x0, 0x9, 0x0, 0x0E, 0x0, 0x11, 0x0, 0x0E,
+	0x0, 0x9, 0x0, 0x0E, 0x0, 0x12, 0x0, 0x0E, 0x0, 0x9, 0x0, 0x62, 0x0, 0x1A,
+	0x0, 0xFF, 0xFF
+};
+
+const byte MAYATREE[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x30, 0x56, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x56, 0x0, 0x0, 0x0, 0x56, 0x0, 0x2, 0x0, 0x56, 0x0, 0x3, 0x0, 0xFF, 0xFF
+};
+
+const byte LOCO[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x31, 0x57, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x57, 0x0, 0x0, 0x0, 0x57, 0x0, 0x2, 0x0, 0x57, 0x0, 0x3, 0x0, 0xFF, 0xFF
+};
+
+const byte KISS[] = {
+	0x2, 0xFF, 0xFF, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x40, 0x40, 0x0, 0x5, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x40, 0x0, 0x0, 0x0, 0x40, 0x0, 0x6, 0x0, 0x40, 0x0, 0x26, 0x0, 0x40,
+	0x0, 0x7, 0x0, 0x40, 0x0, 0x27, 0x0, 0x40, 0x0, 0x8, 0x0, 0x40, 0x0, 0x28,
+	0x0, 0x40, 0x0, 0x9, 0x0, 0x62, 0x0, 0x4E, 0x0, 0x40, 0x0, 0x0A, 0x0, 0x40,
+	0x0, 0x29, 0x0, 0x40, 0x0, 0x0B, 0x0, 0x40, 0x0, 0x2A, 0x0, 0x40, 0x0, 0x0C,
+	0x0, 0x40, 0x0, 0x2B, 0x0, 0x40, 0x0, 0x0D, 0x0, 0x40, 0x0, 0x2C, 0x0, 0x40,
+	0x0, 0x0E, 0x0, 0x40, 0x0, 0x2D, 0x0, 0x40, 0x0, 0x0F, 0x0, 0x40, 0x0, 0x2E,
+	0x0, 0x40, 0x0, 0x10, 0x0, 0x40, 0x0, 0x2F, 0x0, 0x40, 0x0, 0x11, 0x0, 0x40,
+	0x0, 0x30, 0x0, 0x40, 0x0, 0x12, 0x0, 0x40, 0x0, 0x31, 0x0, 0x40, 0x0, 0x13,
+	0x0, 0x40, 0x0, 0x32, 0x0, 0x40, 0x0, 0x14, 0x0, 0x40, 0x0, 0x33, 0x0, 0x40,
+	0x0, 0x15, 0x0, 0x40, 0x0, 0x34, 0x0, 0x40, 0x0, 0x16, 0x0, 0x40, 0x0, 0x35,
+	0x0, 0x40, 0x0, 0x17, 0x0, 0x40, 0x0, 0x36, 0x0, 0x40, 0x0, 0x18, 0x0, 0x40,
+	0x0, 0x37, 0x0, 0x40, 0x0, 0x19, 0x0, 0x40, 0x0, 0x38, 0x0, 0x40, 0x0, 0x1A,
+	0x0, 0x40, 0x0, 0x39, 0x0, 0x40, 0x0, 0x1B, 0x0, 0x40, 0x0, 0x3A, 0x0, 0x40,
+	0x0, 0x1C, 0x0, 0x40, 0x0, 0x3B, 0x0, 0x40, 0x0, 0x1D, 0x0, 0x40, 0x0, 0x3C,
+	0x0, 0x40, 0x0, 0x1E, 0x0, 0x40, 0x0, 0x3D, 0x0, 0x40, 0x0, 0x1F, 0x0, 0x40,
+	0x0, 0x3E, 0x0, 0x40, 0x0, 0x20, 0x0, 0x40, 0x0, 0x3F, 0x0, 0x40, 0x0, 0x21,
+	0x0, 0x40, 0x0, 0x40, 0x0, 0x40, 0x0, 0x22, 0x0, 0x40, 0x0, 0x41, 0x0, 0x40,
+	0x0, 0x23, 0x0, 0x40, 0x0, 0x42, 0x0, 0x40, 0x0, 0x24, 0x0, 0x40, 0x0, 0x43,
+	0x0, 0x40, 0x0, 0x25, 0x0, 0x40, 0x0, 0x44, 0x0, 0x40, 0x0, 0x25, 0x0, 0x40,
+	0x0, 0x45, 0x0, 0x40, 0x0, 0x25, 0x0, 0x40, 0x0, 0x46, 0x0, 0x40, 0x0, 0x25,
+	0x0, 0x40, 0x0, 0x47, 0x0, 0xFF, 0xFF
+};
+
+const byte ROBOT[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0x9, 0x58, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0,
+	0x58, 0x0, 0x0, 0x0, 0x58, 0x0, 0x0, 0x0, 0x58, 0x0, 0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte ANTKILL[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 
+	0x0, 0x0, 0x3C, 0x59, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x59, 
+	0x0, 0x0, 0x0, 0x59, 0x0, 0x2, 0x0, 0x62, 0x0, 0x0E, 0x0, 0xFF, 0xFF
+};
+
+const byte LOCOHOT[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 
+	0x0, 0x0, 0x19, 0x5A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x5A, 
+	0x0, 0x0, 0x0, 0x5A, 0x0, 0x2, 0x0, 0x62, 0x0, 0x3C, 0x0, 0xFF, 0xFF
+};
+
+const byte CRACK[] = {
+	0x2, 0x38, 0x0, 0x38, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x38,
+	0x0, 0x0, 0x0, 0x38, 0x0, 0x2, 0x0, 0xFF, 0xFF
+};
+
+const byte LETTER[] = {
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30,
+	0x0, 0x0, 0x0, 0x30, 0x0, 0x1, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x6, 0x0, 0x30,
+	0x0, 0x0, 0x0, 0x30, 0x0, 0x7, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x8, 0x0, 0x30,
+	0x0, 0x0, 0x0, 0x30, 0x0, 0x9, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0A, 0x0,
+	0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0B, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0,
+	0x0C, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0D, 0x0, 0x30, 0x0, 0x0, 0x0,
+	0x30, 0x0, 0x0E, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0F, 0x0, 0x30, 0x0,
+	0x0, 0x0, 0x30, 0x0, 0x10, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x2, 0x0, 0x30,
+	0x0, 0x0, 0x0, 0x30, 0x0, 0x3, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x4, 0x0, 0x30,
+	0x0, 0x0, 0x0, 0x30, 0x0, 0x5, 0x0, 0xFF, 0xFF
+};
+
+extern const byte *CHARTBL[] = {
+	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT,
+	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
+	ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS,
+	JWATER, SHOOT, ADIE, DYNAMITE, MAYASHOT, OFFKEV, VALLEY,
+	MEANWHILE1, MAYATREE, LOCO, KISS, ROBOT, ANTKILL, LOCOHOT,
+	CRACK, LETTER
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index fba3bc2747..7601138835 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -35,6 +35,10 @@ extern const byte *CURSORS[10];
 
 extern const int TRAVEL_POS[][2];
 
+extern const byte *ROOM_TABLE[];
+
+extern const byte *CHARTBL[];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 031cc32c847bf7387859e273069f8efd3b6d4ed0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 Aug 2014 22:43:40 -0400
Subject: ACCESS: Implemented room data loading

---
 engines/access/access.cpp             |  48 +++++++++++++
 engines/access/access.h               |  26 ++++++-
 engines/access/amazon/amazon_room.cpp |   5 ++
 engines/access/amazon/amazon_room.h   |   2 +
 engines/access/asurface.h             |   2 +
 engines/access/data.h                 |   8 +++
 engines/access/room.cpp               | 127 +++++++++++++++++++++++++++++++++-
 engines/access/room.h                 |  35 +++++++++-
 engines/access/screen.cpp             |   9 +++
 engines/access/screen.h               |   4 ++
 engines/access/sound.cpp              |  15 ++++
 engines/access/sound.h                |   9 +++
 12 files changed, 285 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6b805e4069..98f5529863 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -70,6 +70,13 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_startup = 0;
 	_currentCharFlag = false;
 	_boxSelect = false;
+	_charFlag = 0;
+	_scaleH1 = _scaleH2 = 0;
+	_scaleN1 = 0;
+	_scaleT1 = 0;
+	_scaleMaxY = 0;
+	_scaleI = 0;
+	_playFieldHeight = 0;
 
 	_roomNumber = 0;
 	_rawPlayerXLow = 0;
@@ -85,6 +92,10 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_timerFlag = false;
 	Common::fill(&_flags[0], &_flags[99], 0);
 	Common::fill(&_useItem[0], &_useItem[23], 0);
+	Common::fill(&_establishTable[0], &_establishTable[100], 0);
+	_establishFlag = false;
+	_establishMode = 0;
+	_establishGroup = 0;
 	_guardLoc = 0;
 	_guardFind = 0;
 	_helpLevel = 0;
@@ -192,6 +203,13 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
+void AccessEngine::loadCells(Common::Array<CellIdent> &cells) {
+	for (uint i = 0; i < cells.size(); ++i) {
+		_objectsTable[cells[i]._cell] = _files->loadFile(
+			cells[i]._fileNum, cells[i]._subfile);
+	}
+}
+
 void AccessEngine::clearCellTable() {
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (byte *)nullptr);
 }
@@ -228,4 +246,34 @@ void AccessEngine::freeManData() {
 	_man = nullptr;
 }
 
+void AccessEngine::establish(int v) {
+	_establishMode = 0;
+	_establishGroup = 0;
+	doEstablish(v);
+}
+
+void AccessEngine::establishCenter(int v) {
+	_establishMode = 1;
+	doEstablish(v);
+}
+
+void AccessEngine::doEstablish(int v) {
+	_screen->forceFadeOut();
+	_screen->clearScreen();
+	_screen->setPanel(3);
+
+	if (v != -1) {
+		_files->loadScreen(95, v);
+		_buffer2.copyBuffer(_screen);
+	}
+
+	warning("TODO: doEstablish");
+}
+
+void AccessEngine::loadPlayField(int fileNum, int subfile) {
+	// TODO
+}
+
+
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 2e605e49ab..1451e21296 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -80,6 +80,8 @@ private:
 	void setVGA();
 
 	void dummyLoop();
+
+	void doEstablish(int v);
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -108,13 +110,18 @@ public:
 	SoundManager *_sound;
 
 	byte *_destIn;
-	Graphics::Surface _buffer1;
-	Graphics::Surface _buffer2;
+	ASurface _buffer1;
+	ASurface _buffer2;
 	byte *_objectsTable[100];
+	int _establishTable[100];
+	bool _establishFlag;
+	int _establishMode;
+	int _establishGroup;
 	int _numAnimTimers;
 	Common::Array<TimerEntry> _timers;
 	Common::Array<Common::Rect> _newRect;
 	Common::Array<Common::Rect> _oldRect;
+	Common::Array<ExtraCell> _extraCells;
 	int _pCount;
 	int _selectCommand;
 	bool _normalMouse;
@@ -141,6 +148,13 @@ public:
 	int _startTravelBox;
 	bool _currentCharFlag;
 	bool _boxSelect;
+	int _charFlag;
+	int _scaleH1, _scaleH2;
+	int _scaleN1;
+	int _scaleT1;
+	int _scaleMaxY;
+	int _scaleI;
+	int _playFieldHeight;
 
 	// Fields that are included in savegames
 	int _roomNumber;
@@ -202,6 +216,8 @@ public:
 
 	void freeAnimationData();
 
+	void loadCells(Common::Array<CellIdent> &cells);
+
 	/**
 	* Clear the cell table
 	*/
@@ -231,6 +247,12 @@ public:
 	 * Free animation data
 	 */
 	void freeManData();
+
+	void establish(int v);
+
+	void establishCenter(int v);
+
+	void loadPlayField(int fileNum, int subfile);
 };
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index ce0683f124..21d9c6097e 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 #include "access/access.h"
+#include "access/amazon/amazon_resources.h"
 #include "access/amazon/amazon_room.h"
 
 namespace Access {
@@ -32,6 +33,10 @@ AmazonRoom::AmazonRoom(AccessEngine *vm): Room(vm) {
 	_antOutFlag = false;
 }
 
+void AmazonRoom::loadRoom(int roomNumber) {
+	loadRoomData(ROOM_TABLE[roomNumber]);
+}
+
 void AmazonRoom::reloadRoom() {
 	loadRoom(_vm->_roomNumber);
 
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 6d13a4e52c..006aef54f6 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -40,6 +40,8 @@ private:
 
 	void roomMenu();
 protected:
+	virtual void loadRoom(int roomNumber);
+
 	virtual void reloadRoom();
 
 	virtual void reloadRoom1();
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index ecd04b9682..830a493977 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -31,6 +31,8 @@ namespace Access {
 class ASurface : public Graphics::Surface {
 public:
 	void clearBuffer();
+
+	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
 };
 
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 7e10e992d9..8b77e7c5b3 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -39,6 +39,14 @@ struct TimerEntry {
 	}
 };
 
+class ExtraCell {
+public:
+	int _vidTable;
+	int _vidTable1;
+	int _vidSTable;
+	int _vidSTable1;
+};
+
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f735fdb167..1e9eec79b0 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/scummsys.h"
+#include "common/memstream.h"
 #include "access/access.h"
 #include "access/resources.h"
 #include "access/room.h"
@@ -131,8 +132,77 @@ void Room::clearRoom() {
 	_vm->freeManData();
 }
 
-void Room::loadRoom(int room) {
-	// TODO
+void Room::loadRoomData(const byte *roomData) {
+	RoomInfo roomInfo(roomData);
+
+	_roomFlag = roomInfo._roomFlag;
+
+	_vm->_establishFlag = false;
+	if (roomInfo._estIndex != -1) {
+		_vm->_establishFlag = true;
+		if (_vm->_establishTable[roomInfo._estIndex] != 1) {
+			_vm->_establishTable[roomInfo._estIndex] = 1;
+			_vm->establish(0);
+		}
+	}
+
+	_vm->_sound->freeMusic();
+	if (roomInfo._musicFile._fileNum != -1) {
+		_vm->_sound->_music = _vm->_files->loadFile(roomInfo._musicFile._fileNum,
+			roomInfo._musicFile._subfile);
+		_vm->_sound->_midiSize = _vm->_files->_filesize;
+		_vm->_sound->midiPlay();
+		_vm->_sound->_musicRepeat = true;
+	}
+
+	_vm->_scaleH1 = roomInfo._scaleH1;
+	_vm->_scaleH2 = roomInfo._scaleH2;
+	_vm->_scaleN1 = roomInfo._scaleN1;
+	_vm->_scaleT1 = ((_vm->_scaleH2 - _vm->_scaleH1) << 8) / _vm->_scaleN1;
+
+	if (roomInfo._playFieldFile._fileNum != -1) {
+		_vm->loadPlayField(roomInfo._playFieldFile._fileNum,
+			roomInfo._playFieldFile._subfile);
+		setupRoom();
+
+		_vm->_scaleMaxY = _vm->_playFieldHeight << 4;
+	}
+
+	// Load cells
+	_vm->loadCells(roomInfo._cells);
+
+	// Load script data
+	_vm->_scripts->freeScriptData();
+	if (roomInfo._scriptFile._fileNum != -1)
+		_vm->_scripts->_script = _vm->_files->loadFile(roomInfo._scriptFile._fileNum,
+		roomInfo._scriptFile._subfile);
+
+	// Load animation data
+	_vm->freeAnimationData();
+	if (roomInfo._animFile._fileNum != -1)
+		_vm->_anim = _vm->_files->loadFile(roomInfo._animFile._fileNum,
+		roomInfo._animFile._subfile);
+
+	_vm->_scaleI = roomInfo._scaleI;
+	_vm->_screen->_scrollThreshold = roomInfo._scrollThreshold;
+
+	_vm->_screen->_startColor = roomInfo._startColor;
+	_vm->_screen->_numColors = roomInfo._numColors;
+	_vm->_screen->loadPalette(roomInfo._paletteFile._fileNum,
+		roomInfo._paletteFile._subfile);
+
+	// Load extra cells
+	_vm->_extraCells.clear();
+	for (uint i = 0; i < roomInfo._vidTable.size(); ++i) {
+		ExtraCell ec;
+		ec._vidTable = roomInfo._vidTable[i] & 0xffff;
+		ec._vidTable1 = roomInfo._vidTable[i] >> 16;
+
+		_vm->_extraCells.push_back(ec);
+	}
+
+	// Load sounds for the scene
+	_vm->_sound->loadSounds(roomInfo._sounds);
 }
 
 void Room::roomLoop() {
@@ -156,4 +226,57 @@ void Room::buildScreen() {
 	// TODO
 }
 
+/*------------------------------------------------------------------------*/
+
+RoomInfo::RoomInfo(const byte *data) {
+	Common::MemoryReadStream stream(data, 999);
+
+	_roomFlag = stream.readByte() != 0;
+	_estIndex = (int16)stream.readUint16LE();
+	_musicFile._fileNum = (int16)stream.readUint16LE();
+	_musicFile._subfile = stream.readUint16LE();
+	_scaleH1 = stream.readByte();
+	_scaleH2 = stream.readByte();
+	_scaleN1 = stream.readByte();
+	_playFieldFile._fileNum = (int16)stream.readUint16LE();
+	_playFieldFile._subfile = stream.readUint16LE();
+
+	for (byte cell = stream.readByte(); cell != 0xff; cell = stream.readByte()) {
+		CellIdent ci;
+		ci._cell = cell;
+		ci._fileNum = (int16)stream.readUint16LE();
+		ci._subfile = stream.readUint16LE();
+
+		_cells.push_back(ci);
+	}
+
+	_scriptFile._fileNum = (int16)stream.readUint16LE();
+	_scriptFile._subfile = stream.readUint16LE();
+	_animFile._fileNum = (int16)stream.readUint16LE();
+	_animFile._subfile = stream.readUint16LE();
+	_scaleI = stream.readByte();
+	_scrollThreshold = stream.readByte();
+	_paletteFile._fileNum = (int16)stream.readUint16LE();
+	_paletteFile._subfile = stream.readUint16LE();
+	_startColor = stream.readUint16LE();
+	_numColors = stream.readUint16LE();
+
+	for (int16 v = (int16)stream.readUint16LE(); v != -1;
+			v = (int16)stream.readUint16LE()) {
+		uint16 v2 = stream.readUint16LE();
+
+		_vidTable.push_back(v | ((uint32)v2 << 16));
+	}
+
+	for (int16 fileNum = (int16)stream.readUint16LE(); fileNum != -1;
+			fileNum = (int16)stream.readUint16LE()) {
+		FileIdent fi;
+		fi._fileNum = fileNum;
+		fi._subfile = stream.readUint16LE();
+
+		_sounds.push_back(fi);
+	}
+};
+
+
 } // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
index 28506db7d6..1b803667af 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -35,10 +35,13 @@ private:
 protected:
 	AccessEngine *_vm;
 
+	void loadRoomData(const byte *roomData);
 	void setupRoom();
 	void setWallCodes();
 	void buildScreen();
 
+	virtual void loadRoom(int roomNumber) = 0;
+
 	virtual void reloadRoom() = 0;
 
 	virtual void reloadRoom1() = 0;
@@ -56,8 +59,38 @@ public:
 	 * Clear all the data used by the room
 	 */
 	void clearRoom();
+};
+
+struct FileIdent {
+	int _fileNum;
+	int _subfile;
+};
 
-	void loadRoom(int room);
+struct CellIdent : FileIdent {
+	byte _cell;
+};
+
+class RoomInfo {
+public:
+	bool _roomFlag;
+	int _estIndex;
+	FileIdent _musicFile;
+	int _scaleH1;
+	int _scaleH2;
+	int _scaleN1;
+	FileIdent _playFieldFile;
+	Common::Array<CellIdent> _cells;
+	FileIdent _scriptFile;
+	FileIdent _animFile;
+	int _scaleI;
+	int _scrollThreshold;
+	FileIdent _paletteFile;
+	int _startColor;
+	int _numColors;
+	Common::Array<uint32> _vidTable;
+	Common::Array<FileIdent> _sounds;
+public:
+	RoomInfo(const byte *data);
 };
 
 } // End of namespace Access
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 8dcc9f1db9..3823267bc0 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -26,6 +26,7 @@
 #include "common/textconsole.h"
 #include "common/system.h"
 #include "graphics/palette.h"
+#include "access/access.h"
 #include "access/screen.h"
 #include "access/resources.h"
 
@@ -42,6 +43,8 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_topSkip = _bottomSkip = 0;
 	_clipWidth = _clipHeight = 0;
 	_scrollFlag = false;
+	_scrollThreshold = 0;
+	_startColor = _numColors = 0;
 }
 
 void Screen::setDisplayScan() {
@@ -71,6 +74,12 @@ void Screen::loadPalette(Common::SeekableReadStream *stream) {
 	_loadPalFlag = true;
 }
 
+void Screen::loadPalette(int fileNum, int subfile) {
+	byte *palette = _vm->_files->loadFile(fileNum, subfile);
+	Common::copy(palette, palette + (_numColors * 3), &_rawPalette[_startColor * 3]);
+	delete[] palette;
+}
+
 void Screen::setPalette() {
 	g_system->getPaletteManager()->setPalette(&_rawPalette[0], 0, PALETTE_COUNT);
 }
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 1b03d261cf..57d773504f 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -56,6 +56,8 @@ private:
 public:
 	bool _loadPalFlag;
 	bool _scrollFlag;
+	int _scrollThreshold;
+	int _startColor, _numColors;
 public:
 	Screen(AccessEngine *vm);
 
@@ -89,6 +91,8 @@ public:
 
 	void loadPalette(Common::SeekableReadStream *stream);
 
+	void loadPalette(int fileNum, int subfile);
+
 	void setPalette();
 
 	/**
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 2f64465f8f..7ac0e4d558 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -34,6 +34,8 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 		_soundTable[i]._data = nullptr;
 
 	_music = nullptr;
+	_midiSize = 0;
+	_musicRepeat = false;
 }
 
 SoundManager::~SoundManager() {
@@ -66,6 +68,14 @@ void SoundManager::playSound(byte *data, uint32 size) {
 		*/
 }
 
+void SoundManager::loadSounds(Common::Array<FileIdent> &sounds) {
+	// TODO
+}
+
+void SoundManager::midiPlay() {
+	// TODO
+}
+
 void SoundManager::midiRepeat() {
 	// TODO
 }
@@ -78,4 +88,9 @@ void SoundManager::freeSounds() {
 	// TODO
 }
 
+void SoundManager::freeMusic() {
+	delete[] _music;
+	_music = nullptr;
+}
+
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 37d263eecd..a127051b29 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -49,6 +49,9 @@ public:
 	SoundEntry _soundTable[MAX_SOUNDS];
 	int _soundPriority[MAX_SOUNDS];
 	byte *_music;
+	int _midiSize;
+	bool _musicRepeat;
+
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
@@ -57,11 +60,17 @@ public:
 
 	void playSound(int soundIndex);
 
+	void loadSounds(Common::Array<FileIdent> &sounds);
+
+	void midiPlay();
+
 	void midiRepeat();
 
 	void stopSong();
 
 	void freeSounds();
+
+	void freeMusic();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 7378443e38e2d9ad037cb3c96e28625939c1b7a9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 7 Aug 2014 15:52:43 +0700
Subject: ZVISION: Implement safe control

---
 engines/zvision/module.mk                          |   1 +
 .../zvision/scripting/controls/safe_control.cpp    | 208 +++++++++++++++++++++
 engines/zvision/scripting/controls/safe_control.h  |  71 +++++++
 engines/zvision/scripting/scr_file_handling.cpp    |   3 +
 4 files changed, 283 insertions(+)
 create mode 100644 engines/zvision/scripting/controls/safe_control.cpp
 create mode 100644 engines/zvision/scripting/controls/safe_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index ee4a2331a0..457444c5e2 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -20,6 +20,7 @@ MODULE_OBJS := \
 	scripting/controls/input_control.o \
 	scripting/controls/lever_control.o \
 	scripting/controls/push_toggle_control.o \
+	scripting/controls/safe_control.o \
 	scripting/controls/save_control.o \
 	scripting/controls/slot_control.o \
 	scripting/inventory.o \
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
new file mode 100644
index 0000000000..a6be20bce8
--- /dev/null
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -0,0 +1,208 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/safe_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/animation/meta_animation.h"
+#include "zvision/utility/utility.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "common/tokenizer.h"
+#include "common/system.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key, CONTROL_SAFE) {
+	_num_states = 0;
+	_cur_state = 0;
+	_animation = NULL;
+	_radius_inner = 0;
+	_radius_inner_sq = 0;
+	_radius_outer = 0;
+	_radius_outer_sq = 0;
+	_zero_pointer = 0;
+	_start_pointer = 0;
+	_cur_frame = -1;
+	_to_frame = 0;
+	_frame_time = 0;
+	_lastRenderedFrame = -1;
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("animation", true)) {
+			if (values.hasSuffix(".avi") || values.hasSuffix(".rlf"))
+				_animation = new MetaAnimation(values, _engine);
+		} else if (param.matchString("rectangle", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_rectangle = Common::Rect(x, y, width, height);
+		} else if (param.matchString("num_states", true)) {
+			_num_states = atoi(values.c_str());
+		} else if (param.matchString("center", true)) {
+			int x;
+			int y;
+
+			sscanf(values.c_str(), "%d %d", &x, &y);
+			_center = Common::Point(x,y);
+		} else if (param.matchString("dial_inner_radius", true)) {
+			_radius_inner = atoi(values.c_str());
+			_radius_inner_sq = _radius_inner * _radius_inner;
+		} else if (param.matchString("radius", true)) {
+			_radius_outer = atoi(values.c_str());
+			_radius_outer_sq = _radius_outer * _radius_outer;
+		} else if (param.matchString("zero_radians_offset", true)) {
+			_zero_pointer = atoi(values.c_str());
+		} else if (param.matchString("pointer_offset", true)) {
+			_start_pointer = atoi(values.c_str());
+			_cur_state = _start_pointer;
+		} else if (param.matchString("cursor", true)) {
+			// Not used
+		} else if (param.matchString("mirrored", true)) {
+			// Not used
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+	renderFrame(_cur_state);
+}
+
+SafeControl::~SafeControl() {
+	if (_animation)
+		delete _animation;
+
+}
+
+void SafeControl::renderFrame(uint frameNumber) {
+	if (frameNumber == 0) {
+		_lastRenderedFrame = frameNumber;
+	} else if ((int16)frameNumber < _lastRenderedFrame) {
+		_lastRenderedFrame = frameNumber;
+		frameNumber = (_num_states * 2) - frameNumber;
+	} else {
+		_lastRenderedFrame = frameNumber;
+	}
+
+	const Graphics::Surface *frameData;
+	int x = _rectangle.left;
+	int y = _rectangle.top;
+
+	frameData = _animation->getFrameData(frameNumber);
+	if (frameData)
+		_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
+}
+
+bool SafeControl::process(uint32 deltaTimeInMillis) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_cur_frame != _to_frame) {
+		_frame_time -= deltaTimeInMillis;
+
+		if (_frame_time <= 0) {
+			if (_cur_frame < _to_frame) {
+				_cur_frame++;
+				renderFrame(_cur_frame);
+			} else if (_cur_frame > _to_frame) {
+				_cur_frame--;
+				renderFrame(_cur_frame);
+			}
+			_frame_time = _animation->frameTime();
+		}
+	}
+
+	return false;
+}
+
+bool SafeControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_rectangle.contains(backgroundImageSpacePos)) {
+		int32 mR = backgroundImageSpacePos.sqrDist(_center);
+		if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) {
+			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_rectangle.contains(backgroundImageSpacePos)) {
+		int32 mR = backgroundImageSpacePos.sqrDist(_center);
+		if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) {
+
+			Common::Point tmp = backgroundImageSpacePos - _center;
+
+			float dd = atan2(tmp.x, tmp.y) * 57.29578;
+
+			int16 dp_state = 360 / _num_states;
+
+			int16 m_state = (_num_states - ((((int16)dd + 540) % 360) / dp_state)) % _num_states;
+
+			int16 tmp2 = (m_state + _cur_state - _zero_pointer + _num_states - 1 ) % _num_states;
+
+			_cur_frame = (_cur_state + _num_states - _start_pointer) % _num_states;
+
+			_cur_state = (_num_states * 2 + tmp2) % _num_states;
+
+			_to_frame = (_cur_state + _num_states - _start_pointer) % _num_states;
+
+			_engine->getScriptManager()->setStateValue(_key, _cur_state);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h
new file mode 100644
index 0000000000..2477d8c26d
--- /dev/null
+++ b/engines/zvision/scripting/controls/safe_control.h
@@ -0,0 +1,71 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SAFE_CONTROL_H
+#define ZVISION_SAFE_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "common/list.h"
+#include "common/rect.h"
+
+
+namespace ZVision {
+
+class ZorkAVIDecoder;
+class MetaAnimation;
+
+class SafeControl : public Control {
+public:
+	SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~SafeControl();
+
+private:
+	int16  _num_states;
+	int16  _cur_state;
+	MetaAnimation *_animation;
+	Common::Point _center;
+	Common::Rect _rectangle;
+	int16  _radius_inner;
+	int32  _radius_inner_sq;
+	int16  _radius_outer;
+	int32  _radius_outer_sq;
+	int16  _zero_pointer;
+	int16  _start_pointer;
+	int16  _cur_frame;
+	int16  _to_frame;
+	int32  _frame_time;
+
+	int16 _lastRenderedFrame;
+
+public:
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	void renderFrame(uint frameNumber);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index cacde9b3ca..b8046c0fe8 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -33,6 +33,7 @@
 #include "zvision/scripting/controls/slot_control.h"
 #include "zvision/scripting/controls/save_control.h"
 #include "zvision/scripting/controls/input_control.h"
+#include "zvision/scripting/controls/safe_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -352,6 +353,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new InputControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("save")) {
 		return new SaveControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("safe")) {
+		return new SafeControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 2cfef440d7a9d3f50ebddd3e662175c0e0bd4e94 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 7 Aug 2014 15:58:27 +0700
Subject: ZVISION: venus_id now in base control class

---
 engines/zvision/scripting/control.h               | 1 +
 engines/zvision/scripting/controls/slot_control.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index ac245054ee..7c8a273419 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -121,6 +121,7 @@ public:
 protected:
 	ZVision *_engine;
 	uint32 _key;
+	int32 _venus_id;
 
 	void getParams(Common::String &input_str, Common::String &parameter, Common::String &values);
 // Static member functions
diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h
index 0ac8ec9ce0..7799785aa5 100644
--- a/engines/zvision/scripting/controls/slot_control.h
+++ b/engines/zvision/scripting/controls/slot_control.h
@@ -67,7 +67,6 @@ private:
 
 	int _cursor;
 	char _distance_id;
-	int _venus_id;
 
 	int _rendered_item;
 
-- 
cgit v1.2.3


From bea93f3441154197a8f599912a1102ac11688d7f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 09:23:31 -0400
Subject: ACCESS: Implemented setupRoom method

---
 engines/access/access.cpp             |  7 +-----
 engines/access/access.h               |  7 ++----
 engines/access/amazon/amazon_game.cpp |  6 ++---
 engines/access/amazon/amazon_room.cpp | 16 ++++++-------
 engines/access/asurface.cpp           |  9 ++++++++
 engines/access/asurface.h             |  6 +++++
 engines/access/player.cpp             |  2 ++
 engines/access/player.h               |  5 ++++
 engines/access/room.cpp               | 43 +++++++++++++++++++++++++++++++++--
 engines/access/room.h                 |  2 ++
 engines/access/screen.cpp             |  3 +++
 engines/access/screen.h               |  3 +++
 12 files changed, 85 insertions(+), 24 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 98f5529863..c263ae88fa 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -71,18 +71,13 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_currentCharFlag = false;
 	_boxSelect = false;
 	_charFlag = 0;
+	_scale = 0;
 	_scaleH1 = _scaleH2 = 0;
 	_scaleN1 = 0;
 	_scaleT1 = 0;
 	_scaleMaxY = 0;
 	_scaleI = 0;
-	_playFieldHeight = 0;
 
-	_roomNumber = 0;
-	_rawPlayerXLow = 0;
-	_rawPlayerX = 0;
-	_rawPlayerYLow = 0;
-	_rawPlayerY = 0;
 	_conversation = 0;
 	_currentMan = 0;
 	_newTime = 0;
diff --git a/engines/access/access.h b/engines/access/access.h
index 1451e21296..87de9ee4e6 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -136,6 +136,7 @@ public:
 	byte *_manPal1;
 	byte *_music;
 	byte *_playField;
+	Common::Point _playFieldSize;
 	byte *_tile;
 	byte *_anim;
 	byte *_title;
@@ -149,6 +150,7 @@ public:
 	bool _currentCharFlag;
 	bool _boxSelect;
 	int _charFlag;
+	int _scale;
 	int _scaleH1, _scaleH2;
 	int _scaleN1;
 	int _scaleT1;
@@ -157,11 +159,6 @@ public:
 	int _playFieldHeight;
 
 	// Fields that are included in savegames
-	int _roomNumber;
-	int _rawPlayerXLow;
-	int _rawPlayerX;
-	int _rawPlayerYLow;
-	int _rawPlayerY;
 	int _conversation;
 	int _currentMan;
 	uint32 _newTime;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index eccfc4dae7..7a16036ff3 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -164,9 +164,9 @@ void AmazonEngine::setupGame() {
 	}
 
 	// Set miscellaneous fields
-	_roomNumber = 4;
-	_player->_playerX = _rawPlayerX = TRAVEL_POS[_roomNumber][0];
-	_player->_playerY = _rawPlayerY = TRAVEL_POS[_roomNumber][1];
+	_player->_roomNumber = 4;
+	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
+	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
 	_selectCommand = -1;
 }
 
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 21d9c6097e..c2a0332e17 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -38,7 +38,7 @@ void AmazonRoom::loadRoom(int roomNumber) {
 }
 
 void AmazonRoom::reloadRoom() {
-	loadRoom(_vm->_roomNumber);
+	loadRoom(_vm->_player->_roomNumber);
 
 	if (_roomFlag != 1) {
 		_vm->_currentMan = _roomFlag;
@@ -68,8 +68,8 @@ void AmazonRoom::reloadRoom() {
 }
 
 void AmazonRoom::reloadRoom1() {
-	if (_vm->_roomNumber == 22 || _vm->_roomNumber == 31 
-			|| _vm->_roomNumber == 42 || _vm->_roomNumber == 44) {
+	if (_vm->_player->_roomNumber == 22 || _vm->_player->_roomNumber == 31 
+			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		_vm->_inactive = _vm->_files->loadFile("MAYA.LZ");
 		_vm->_currentCharFlag = false;
 	}
@@ -84,13 +84,13 @@ void AmazonRoom::reloadRoom1() {
 	_vm->_screen->clearScreen();
 	roomSet();
 
-	if (!_roomFlag && (_vm->_roomNumber != 61 || !_antOutFlag)) {
+	if (!_roomFlag && (_vm->_player->_roomNumber != 61 || !_antOutFlag)) {
 		_vm->_player->load();
 		_vm->_player->calcManScale();
 	}
 
-	if (_vm->_roomNumber != 20 && _vm->_roomNumber != 24
-			&& _vm->_roomNumber != 33 && _vm->_roomNumber != 45) {
+	if (_vm->_player->_roomNumber != 20 && _vm->_player->_roomNumber != 24
+			&& _vm->_player->_roomNumber != 33 && _vm->_player->_roomNumber != 45) {
 		roomMenu();
 	}
 
@@ -99,8 +99,8 @@ void AmazonRoom::reloadRoom1() {
 	setWallCodes();
 	buildScreen();
 
-	if (_vm->_roomNumber != 20 && _vm->_roomNumber != 24
-			&& _vm->_roomNumber != 33) {
+	if (_vm->_player->_roomNumber != 20 && _vm->_player->_roomNumber != 24
+			&& _vm->_player->_roomNumber != 33) {
 		_vm->_screen->setPalette();
 		_vm->_screen->copyBF2Vid();
 	}
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index a0a790dbdc..b791186e03 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -30,4 +30,13 @@ void ASurface::clearBuffer() {
 	Common::fill(pSrc, pSrc + w * h, 0);
 }
 
+void ASurface::setScaleTable(int scale) {
+	int total = 0;
+	for (int idx = 0; idx < 256; ++idx) {
+		_scaleTable1[idx] = total >> 8;
+		_scaleTable2[idx] = total & 0xff;
+		total += scale;
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 830a493977..857067684f 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -23,16 +23,22 @@
 #ifndef ACCESS_ASURFACE_H
 #define ACCESS_ASURFACE_H
 
+#include "common/scummsys.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
 
 namespace Access {
 
 class ASurface : public Graphics::Surface {
+private:
+	byte _scaleTable1[256];
+	byte _scaleTable2[256];
 public:
 	void clearBuffer();
 
 	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
+
+	void setScaleTable(int scale);
 };
 
 } // End of namespace Access
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index a85df0320b..e4ef0eb48e 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -44,6 +44,8 @@ Player::Player(AccessEngine *vm): _vm(vm) {
 	_frame = 0;
 
 	_playerOff = false;
+
+	_roomNumber = 0;
 }
 
 void Player::load() {
diff --git a/engines/access/player.h b/engines/access/player.h
index 4d19601230..ec6b53fc2a 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -60,6 +60,11 @@ public:
 
 	// Additional globals we've added to new Player class
 	bool _playerOff;
+
+	// Additional globals that need to be saved
+	int _roomNumber;
+	Common::Point _rawPlayerLow;
+	Common::Point _rawPlayer;
 public:
 	Player(AccessEngine *vm);
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 1e9eec79b0..9ead04b2ac 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -206,7 +206,9 @@ void Room::loadRoomData(const byte *roomData) {
 }
 
 void Room::roomLoop() {
-	// TODO
+	_vm->_scripts->_sequence = 2000;
+	_vm->_scripts->searchForSeq();
+	_vm->_scripts->executeCommand();
 }
 
 
@@ -215,7 +217,44 @@ void Room::doCommands() {
 }
 
 void Room::setupRoom() {
-	// TODO
+	_vm->_screen->setScaleTable(_vm->_scale);
+	_vm->_screen->setBufferScan();
+
+	if (_roomFlag != 2)
+		setIconPalette();
+
+	if (_vm->_screen->_vWindowSize.x == _vm->_playFieldSize.x) {
+		_vm->_screen->_scrollX = 0;
+		_vm->_screen->_scrollCol = 0;
+	} else {
+		_vm->_screen->_scrollX = _vm->_player->_rawPlayer.x -
+			(_vm->_player->_rawPlayer.x >> 4);
+		int xp = MAX((_vm->_player->_rawPlayer.x >> 4) -
+			(_vm->_screen->_vWindowSize.x / 2), 0);
+		_vm->_screen->_scrollCol = xp;
+
+		xp = xp + _vm->_screen->_vWindowSize.x - _vm->_playFieldSize.x;
+		if (xp >= 0) {
+			_vm->_screen->_scrollCol = xp + 1;
+		}
+	}
+	
+	if (_vm->_screen->_vWindowSize.y == _vm->_playFieldSize.y) {
+		_vm->_screen->_scrollY = 0;
+		_vm->_screen->_scrollRow = 0;
+	}
+	else {
+		_vm->_screen->_scrollY = _vm->_player->_rawPlayer.y -
+			(_vm->_player->_rawPlayer.y >> 4);
+		int yp = MAX((_vm->_player->_rawPlayer.y >> 4) -
+			(_vm->_screen->_vWindowSize.y / 2), 0);
+		_vm->_screen->_scrollRow = yp;
+
+		yp = yp + _vm->_screen->_vWindowSize.y - _vm->_playFieldSize.y;
+		if (yp >= 0) {
+			_vm->_screen->_scrollRow = yp + 1;
+		}
+	}
 }
 
 void Room::setWallCodes() {
diff --git a/engines/access/room.h b/engines/access/room.h
index 1b803667af..70803b4f70 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -45,6 +45,8 @@ protected:
 	virtual void reloadRoom() = 0;
 
 	virtual void reloadRoom1() = 0;
+
+	virtual void setIconPalette() {}
 public:
 	int _function;
 	int _roomFlag;
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 3823267bc0..1974b1a981 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -45,6 +45,9 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_scrollFlag = false;
 	_scrollThreshold = 0;
 	_startColor = _numColors = 0;
+	_scrollX = _scrollY = 0;
+	_scrollCol = _scrollRow = 0;
+
 }
 
 void Screen::setDisplayScan() {
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 57d773504f..c32ae18e82 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -58,6 +58,9 @@ public:
 	bool _scrollFlag;
 	int _scrollThreshold;
 	int _startColor, _numColors;
+	Common::Point _vWindowSize;
+	int _scrollX, _scrollY;
+	int _scrollCol, _scrollRow;
 public:
 	Screen(AccessEngine *vm);
 
-- 
cgit v1.2.3


From 010ba5b1262f58eabd6e8fbca710309cf7e2c003 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 19:43:42 -0400
Subject: ACCESS: Fix reading last resource of container files

---
 engines/access/files.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index c72d0adb7a..23171dcfe7 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -141,7 +141,8 @@ void FileManager::setAppended(int fileNum) {
 
 void FileManager::gotoAppended(int subfile) {
 	uint32 offset = _fileIndex[subfile];
-	uint32 size = _fileIndex[subfile + 1] - offset;
+	uint32 size = (subfile == _fileIndex.size() - 1) ? _file.size() - offset :
+		_fileIndex[subfile + 1] - offset;
 
 	_file.seek(offset);
 	delete _stream;
-- 
cgit v1.2.3


From 0183007d0b4f3b951ef2c704894655e894ce4a71 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 20:31:42 -0400
Subject: ACCESS: Fixes for loading room data

---
 engines/access/access.cpp |  2 +-
 engines/access/access.h   |  2 +-
 engines/access/files.cpp  |  2 +-
 engines/access/room.cpp   | 24 ++++++++++++++++--------
 engines/access/room.h     | 25 +++++++++++++++----------
 engines/access/sound.cpp  |  2 +-
 engines/access/sound.h    |  2 +-
 7 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index c263ae88fa..ce5d8640f0 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -198,7 +198,7 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
-void AccessEngine::loadCells(Common::Array<CellIdent> &cells) {
+void AccessEngine::loadCells(Common::Array<RoomInfo::CellIdent> &cells) {
 	for (uint i = 0; i < cells.size(); ++i) {
 		_objectsTable[cells[i]._cell] = _files->loadFile(
 			cells[i]._fileNum, cells[i]._subfile);
diff --git a/engines/access/access.h b/engines/access/access.h
index 87de9ee4e6..a30c905dd7 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -213,7 +213,7 @@ public:
 
 	void freeAnimationData();
 
-	void loadCells(Common::Array<CellIdent> &cells);
+	void loadCells(Common::Array<RoomInfo::CellIdent> &cells);
 
 	/**
 	* Clear the cell table
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 23171dcfe7..017102b92a 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -141,7 +141,7 @@ void FileManager::setAppended(int fileNum) {
 
 void FileManager::gotoAppended(int subfile) {
 	uint32 offset = _fileIndex[subfile];
-	uint32 size = (subfile == _fileIndex.size() - 1) ? _file.size() - offset :
+	uint32 size = (subfile == (int)_fileIndex.size() - 1) ? _file.size() - offset :
 		_fileIndex[subfile + 1] - offset;
 
 	_file.seek(offset);
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 9ead04b2ac..afa42c82f0 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -186,10 +186,13 @@ void Room::loadRoomData(const byte *roomData) {
 	_vm->_scaleI = roomInfo._scaleI;
 	_vm->_screen->_scrollThreshold = roomInfo._scrollThreshold;
 
-	_vm->_screen->_startColor = roomInfo._startColor;
-	_vm->_screen->_numColors = roomInfo._numColors;
-	_vm->_screen->loadPalette(roomInfo._paletteFile._fileNum,
-		roomInfo._paletteFile._subfile);
+	// Handle loading scene palette data
+	if (roomInfo._paletteFile._fileNum != -1) {
+		_vm->_screen->_startColor = roomInfo._startColor;
+		_vm->_screen->_numColors = roomInfo._numColors;
+		_vm->_screen->loadPalette(roomInfo._paletteFile._fileNum,
+			roomInfo._paletteFile._subfile);
+	}
 
 	// Load extra cells
 	_vm->_extraCells.clear();
@@ -270,7 +273,7 @@ void Room::buildScreen() {
 RoomInfo::RoomInfo(const byte *data) {
 	Common::MemoryReadStream stream(data, 999);
 
-	_roomFlag = stream.readByte() != 0;
+	_roomFlag = stream.readByte();
 	_estIndex = (int16)stream.readUint16LE();
 	_musicFile._fileNum = (int16)stream.readUint16LE();
 	_musicFile._subfile = stream.readUint16LE();
@@ -297,8 +300,12 @@ RoomInfo::RoomInfo(const byte *data) {
 	_scrollThreshold = stream.readByte();
 	_paletteFile._fileNum = (int16)stream.readUint16LE();
 	_paletteFile._subfile = stream.readUint16LE();
-	_startColor = stream.readUint16LE();
-	_numColors = stream.readUint16LE();
+	if (_paletteFile._fileNum == -1) {
+		_startColor = _numColors = 0;
+	} else {
+		_startColor = stream.readUint16LE();
+		_numColors = stream.readUint16LE();
+	}
 
 	for (int16 v = (int16)stream.readUint16LE(); v != -1;
 			v = (int16)stream.readUint16LE()) {
@@ -309,9 +316,10 @@ RoomInfo::RoomInfo(const byte *data) {
 
 	for (int16 fileNum = (int16)stream.readUint16LE(); fileNum != -1;
 			fileNum = (int16)stream.readUint16LE()) {
-		FileIdent fi;
+		SoundIdent fi;
 		fi._fileNum = fileNum;
 		fi._subfile = stream.readUint16LE();
+		fi._priority = stream.readUint16LE();
 
 		_sounds.push_back(fi);
 	}
diff --git a/engines/access/room.h b/engines/access/room.h
index 70803b4f70..c42c3f1142 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -63,18 +63,23 @@ public:
 	void clearRoom();
 };
 
-struct FileIdent {
-	int _fileNum;
-	int _subfile;
-};
-
-struct CellIdent : FileIdent {
-	byte _cell;
-};
 
 class RoomInfo {
 public:
-	bool _roomFlag;
+	struct FileIdent {
+		int _fileNum;
+		int _subfile;
+	};
+
+	struct CellIdent : FileIdent {
+		byte _cell;
+	};
+	
+	struct SoundIdent : FileIdent {
+		int _priority;
+	};
+public:
+	int _roomFlag;
 	int _estIndex;
 	FileIdent _musicFile;
 	int _scaleH1;
@@ -90,7 +95,7 @@ public:
 	int _startColor;
 	int _numColors;
 	Common::Array<uint32> _vidTable;
-	Common::Array<FileIdent> _sounds;
+	Common::Array<SoundIdent> _sounds;
 public:
 	RoomInfo(const byte *data);
 };
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 7ac0e4d558..c6897282fa 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -68,7 +68,7 @@ void SoundManager::playSound(byte *data, uint32 size) {
 		*/
 }
 
-void SoundManager::loadSounds(Common::Array<FileIdent> &sounds) {
+void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
 	// TODO
 }
 
diff --git a/engines/access/sound.h b/engines/access/sound.h
index a127051b29..dd94396fa9 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -60,7 +60,7 @@ public:
 
 	void playSound(int soundIndex);
 
-	void loadSounds(Common::Array<FileIdent> &sounds);
+	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
 
 	void midiPlay();
 
-- 
cgit v1.2.3


From 0c38730f3fd4965fbf1b854f76ff936dddf9f931 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 21:54:22 -0400
Subject: ACCESS: Implement buildScreen

---
 engines/access/data.h   |  9 +++++++++
 engines/access/room.cpp | 38 +++++++++++++++++++++++++++++++++++---
 engines/access/room.h   | 30 ++++++++++++++++++++++++++++--
 3 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/engines/access/data.h b/engines/access/data.h
index 8b77e7c5b3..cf8394baf9 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -28,6 +28,15 @@
 
 namespace Access {
 
+class AccessEngine;
+
+class Manager {
+protected:
+	AccessEngine *_vm;
+public:
+	Manager(AccessEngine *vm) : _vm(vm) {}
+};
+
 struct TimerEntry {
 	int _initTm;
 	int _timer;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index afa42c82f0..7a07f58bcb 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -26,9 +26,12 @@
 #include "access/resources.h"
 #include "access/room.h"
 
+#define TILE_WIDTH 16
+#define TILE_HEIGHT 16
+
 namespace Access {
 
-Room::Room(AccessEngine *vm) : _vm(vm) {
+Room::Room(AccessEngine *vm) : Manager(vm) {
 	_function = 0;
 	_roomFlag = 0;
 }
@@ -261,11 +264,40 @@ void Room::setupRoom() {
 }
 
 void Room::setWallCodes() {
-	// TODO
+	_jetFrame.clear();
+	_jetFrame.resize(_plotter._walls.size());
+
+	_vm->_player->_rawXTemp = _vm->_player->_rawPlayer.x;
+	_vm->_player->_rawYTemp = _vm->_player->_rawPlayer.y;
 }
 
 void Room::buildScreen() {
-	// TODO
+	int scrollCol = _vm->_screen->_scrollCol;
+	int cnt = _vm->_screen->_vWindowSize.x + 1;
+	int offset = 0;
+
+	for (int idx = 0; idx < cnt, offset += TILE_WIDTH; ++idx) {
+		buildColumn(_vm->_screen->_scrollCol, offset);
+		++_vm->_screen->_scrollCol;
+	}
+
+	_vm->_screen->_scrollCol = scrollCol;
+	_vm->_screen->copyBF1BF2();
+}
+
+void Room::buildColumn(int playX, int screenX) {
+	const byte *pSrc = _vm->_playField + _vm->_screen->_scrollRow * 
+		_vm->_playFieldSize.x + playX;
+	byte *pDest = (byte *)_vm->_buffer1.getPixels();
+
+	for (int y = 0; y <= _vm->_screen->_vWindowSize.y; ++y) {
+		byte *pTile = _vm->_tile + (*pSrc << 8);
+
+		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
+			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
+			pDest += _vm->_screen->_vWindowSize.x;
+		}
+	}
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/access/room.h b/engines/access/room.h
index c42c3f1142..fa41d32552 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -24,12 +24,34 @@
 #define ACCESS_ROOM_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "access/data.h"
 
 namespace Access {
 
-class AccessEngine;
+class Plotter {
+public:
+	Common::Array<Common::Rect> _walls;
+	Common::Array<Common::Rect> _blocks;
+	int _blockIn;
+	int _delta;
+};
+
+class JetFrame {
+public:
+	int _wallCode;
+	int _wallCodeOld;
+	int _wallCode1;
+	int _wallCode1Old;
+
+	JetFrame() {
+		_wallCode = _wallCodeOld = 0;
+		_wallCode1 = _wallCode1Old = 0;
+	}
+};
 
-class Room {
+class Room: public Manager {
 private:
 	void roomLoop();
 protected:
@@ -48,6 +70,8 @@ protected:
 
 	virtual void setIconPalette() {}
 public:
+	Plotter _plotter;
+	Common::Array<JetFrame> _jetFrame;
 	int _function;
 	int _roomFlag;
 public:
@@ -61,6 +85,8 @@ public:
 	 * Clear all the data used by the room
 	 */
 	void clearRoom();
+
+	void buildColumn(int playX, int screenX);
 };
 
 
-- 
cgit v1.2.3


From 6715bb0864212edaf88076dce88e5df1138333da Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 21:59:45 -0400
Subject: ACCESS: Move playField and tile data to Room class

---
 engines/access/access.cpp | 14 --------------
 engines/access/access.h   | 13 -------------
 engines/access/room.cpp   | 33 +++++++++++++++++++++++++--------
 engines/access/room.h     | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index ce5d8640f0..78274f1d59 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -53,8 +53,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_inactive = nullptr;
 	_manPal1 = nullptr;
 	_music = nullptr;
-	_playField = nullptr;
-	_tile = nullptr;
 	_anim = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
@@ -142,8 +140,6 @@ AccessEngine::~AccessEngine() {
 	delete[] _inactive;
 	delete[] _manPal1;
 	delete[] _music;
-	delete[] _playField;
-	delete[] _tile;
 	delete[] _anim;
 	delete[] _title;
 }
@@ -221,16 +217,6 @@ void AccessEngine::freeAnimationData() {
 	_anim = nullptr;
 }
 
-void AccessEngine::freePlayField() {
-	delete[] _playField;
-	_playField = nullptr;
-}
-
-void AccessEngine::freeTileData() {
-	delete[] _tile;
-	_tile = nullptr;
-}
-
 void AccessEngine::freeInactiveData() {
 	delete[] _inactive;
 	_inactive = nullptr;
diff --git a/engines/access/access.h b/engines/access/access.h
index a30c905dd7..a0099402fd 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -135,9 +135,6 @@ public:
 	byte *_inactive;
 	byte *_manPal1;
 	byte *_music;
-	byte *_playField;
-	Common::Point _playFieldSize;
-	byte *_tile;
 	byte *_anim;
 	byte *_title;
 	int _converseMode;
@@ -225,16 +222,6 @@ public:
 	*/
 	void freeCells();
 
-	/**
-	 * Free the playfield data
-	 */
-	void freePlayField();
-
-	/**
-	 * Free tile data
-	 */
-	void freeTileData();
-
 	/**
 	 * Free the inactive data
 	 */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 7a07f58bcb..136d6027e6 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -34,6 +34,23 @@ namespace Access {
 Room::Room(AccessEngine *vm) : Manager(vm) {
 	_function = 0;
 	_roomFlag = 0;
+	_playField = nullptr;
+	_tile = nullptr;
+}
+
+Room::~Room() {
+	delete[] _playField;
+	delete[] _tile;
+}
+
+void Room::freePlayField() {
+	delete[] _playField;
+	_playField = nullptr;
+}
+
+void Room::freeTileData() {
+	delete[] _tile;
+	_tile = nullptr;
 }
 
 void Room::doRoom() {
@@ -130,7 +147,7 @@ void Room::clearRoom() {
 	_vm->freeAnimationData();
 	_vm->_scripts->freeScriptData();
 	_vm->freeCells();
-	_vm->freePlayField();
+	freePlayField();
 	_vm->freeInactiveData();
 	_vm->freeManData();
 }
@@ -229,7 +246,7 @@ void Room::setupRoom() {
 	if (_roomFlag != 2)
 		setIconPalette();
 
-	if (_vm->_screen->_vWindowSize.x == _vm->_playFieldSize.x) {
+	if (_vm->_screen->_vWindowSize.x == _playFieldSize.x) {
 		_vm->_screen->_scrollX = 0;
 		_vm->_screen->_scrollCol = 0;
 	} else {
@@ -239,13 +256,13 @@ void Room::setupRoom() {
 			(_vm->_screen->_vWindowSize.x / 2), 0);
 		_vm->_screen->_scrollCol = xp;
 
-		xp = xp + _vm->_screen->_vWindowSize.x - _vm->_playFieldSize.x;
+		xp = xp + _vm->_screen->_vWindowSize.x - _playFieldSize.x;
 		if (xp >= 0) {
 			_vm->_screen->_scrollCol = xp + 1;
 		}
 	}
 	
-	if (_vm->_screen->_vWindowSize.y == _vm->_playFieldSize.y) {
+	if (_vm->_screen->_vWindowSize.y == _playFieldSize.y) {
 		_vm->_screen->_scrollY = 0;
 		_vm->_screen->_scrollRow = 0;
 	}
@@ -256,7 +273,7 @@ void Room::setupRoom() {
 			(_vm->_screen->_vWindowSize.y / 2), 0);
 		_vm->_screen->_scrollRow = yp;
 
-		yp = yp + _vm->_screen->_vWindowSize.y - _vm->_playFieldSize.y;
+		yp = yp + _vm->_screen->_vWindowSize.y - _playFieldSize.y;
 		if (yp >= 0) {
 			_vm->_screen->_scrollRow = yp + 1;
 		}
@@ -286,12 +303,12 @@ void Room::buildScreen() {
 }
 
 void Room::buildColumn(int playX, int screenX) {
-	const byte *pSrc = _vm->_playField + _vm->_screen->_scrollRow * 
-		_vm->_playFieldSize.x + playX;
+	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
+		_playFieldSize.x + playX;
 	byte *pDest = (byte *)_vm->_buffer1.getPixels();
 
 	for (int y = 0; y <= _vm->_screen->_vWindowSize.y; ++y) {
-		byte *pTile = _vm->_tile + (*pSrc << 8);
+		byte *pTile = _tile + (*pSrc << 8);
 
 		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
 			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
diff --git a/engines/access/room.h b/engines/access/room.h
index fa41d32552..a202e437bb 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -62,6 +62,17 @@ protected:
 	void setWallCodes();
 	void buildScreen();
 
+	/**
+	* Free the playfield data
+	*/
+	void freePlayField();
+
+	/**
+	* Free tile data
+	*/
+	void freeTileData();
+
+
 	virtual void loadRoom(int roomNumber) = 0;
 
 	virtual void reloadRoom() = 0;
@@ -74,9 +85,14 @@ public:
 	Common::Array<JetFrame> _jetFrame;
 	int _function;
 	int _roomFlag;
+	byte *_playField;
+	Common::Point _playFieldSize;
+	byte *_tile;
 public:
 	Room(AccessEngine *vm);
 
+	virtual ~Room();
+
 	void doRoom();
 
 	void doCommands();
-- 
cgit v1.2.3


From 52721cf2cb666affa7ae7ab952987d51c35fe0e7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 22:04:01 -0400
Subject: ACCESS: General cleanup of Room class

---
 engines/access/room.cpp | 6 ------
 engines/access/room.h   | 6 ++----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 136d6027e6..de9a41c2d3 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -234,11 +234,6 @@ void Room::roomLoop() {
 	_vm->_scripts->executeCommand();
 }
 
-
-void Room::doCommands() {
-	// TODO
-}
-
 void Room::setupRoom() {
 	_vm->_screen->setScaleTable(_vm->_scale);
 	_vm->_screen->setBufferScan();
@@ -374,5 +369,4 @@ RoomInfo::RoomInfo(const byte *data) {
 	}
 };
 
-
 } // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
index a202e437bb..c01a753d0a 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -55,8 +55,6 @@ class Room: public Manager {
 private:
 	void roomLoop();
 protected:
-	AccessEngine *_vm;
-
 	void loadRoomData(const byte *roomData);
 	void setupRoom();
 	void setWallCodes();
@@ -80,6 +78,8 @@ protected:
 	virtual void reloadRoom1() = 0;
 
 	virtual void setIconPalette() {}
+
+	virtual void doCommands() {}
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
@@ -95,8 +95,6 @@ public:
 
 	void doRoom();
 
-	void doCommands();
-
 	/**
 	 * Clear all the data used by the room
 	 */
-- 
cgit v1.2.3


From 745aa3daf9934846e183d5c5034d1ec8801fa5bc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 22:53:02 -0400
Subject: ACCESS: Implemented skeleton script command method list

---
 engines/access/amazon/amazon_room.cpp |   2 +-
 engines/access/room.cpp               |   2 +-
 engines/access/scripts.cpp            | 132 ++++++++++++++++++++++++++++++++--
 engines/access/scripts.h              |  85 ++++++++++++++++++++--
 4 files changed, 208 insertions(+), 13 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index c2a0332e17..da7b7e18ee 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -113,7 +113,7 @@ void AmazonRoom::reloadRoom1() {
 void AmazonRoom::roomSet() {
 	_vm->_numAnimTimers = 0;
 	_vm->_scripts->_sequence = 1000;
-	_vm->_scripts->searchForSeq();
+	_vm->_scripts->searchForSequence();
 	_vm->_scripts->executeCommand();
 }
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index de9a41c2d3..e3e3700b51 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -230,7 +230,7 @@ void Room::loadRoomData(const byte *roomData) {
 
 void Room::roomLoop() {
 	_vm->_scripts->_sequence = 2000;
-	_vm->_scripts->searchForSeq();
+	_vm->_scripts->searchForSequence();
 	_vm->_scripts->executeCommand();
 }
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index bd480b8b64..6652b2922c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -24,28 +24,146 @@
 #include "access/access.h"
 #include "access/scripts.h"
 
+#define SCRIPT_START_BYTE 0xE0
+
 namespace Access {
 
+const ScriptMethodPtr COMMAND_LIST[] = {
+	&Scripts::CMDENDOBJECT, &Scripts::CMDJUMPLOOK, &Scripts::CMDJUMPHELP, &Scripts::CMDJUMPGET, &Scripts::CMDJUMPMOVE, 
+	&Scripts::CMDJUMPUSE, &Scripts::CMDJUMPTALK, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM, 
+	&Scripts::CMDSETFLAG, &Scripts::CMDCHECKFLAG, &Scripts::CMDGOTO, &Scripts::CMDSETINV, &Scripts::CMDSETINV, 
+	&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME, 
+	&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::CMDRETPOS, &Scripts::CMDCHECKLOC, &Scripts::CMDSETANIM, 
+	&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL, 
+	&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, &Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY, 
+	&Scripts::CMDSETBUFFER, &Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, &Scripts::CMDSETBUFVID, 
+	&Scripts::CMDPLAYBUFVID, &Scripts::CMDREMOVELAST, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, 
+	&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, &Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, 
+	&Scripts::CMDWAIT, &Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, &Scripts::CMDRETURNCHOICE, 
+	&Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, &Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND, 
+	&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
+	&Scripts::CMDPUSHLOCATION, &Scripts::CMDPLAYEROFF, &Scripts::CMDPLAYERON, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT, 
+	&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, &Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL, 
+	&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
+};
+
 Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
+	_commandList = COMMAND_LIST;
+
 	_script = nullptr;
+	_scriptLoc = nullptr;
 	_sequence = 0;
+	_endFlag = false;
+	_returnCode = 0;
 }
 
 Scripts::~Scripts() {
 	freeScriptData();
 }
 
-void Scripts::searchForSeq() {
-	// TODO
+void Scripts::freeScriptData() {
+	delete[] _script;
+	_script = nullptr;
 }
 
-void Scripts::executeCommand() {
-	// TODO
+void Scripts::searchForSequence() {
+	assert(_script);
+	byte *pSrc = _script;
+	int sequenceId;
+	do {
+		while (*pSrc++ != SCRIPT_START_BYTE) ;
+		sequenceId = READ_LE_UINT16(pSrc);
+		pSrc += 2;
+	} while (sequenceId != _sequence);
+
+	_scriptLoc = pSrc;
 }
 
-void Scripts::freeScriptData() {
-	delete[] _script;
-	_script = nullptr;
+int Scripts::executeCommand() {
+	assert(_scriptLoc);
+	_endFlag = 0;
+	_returnCode = 0;
+
+	do {
+		byte *pSrc = _scriptLoc;
+		for (pSrc = _scriptLoc; *pSrc == SCRIPT_START_BYTE; pSrc += 3) ;	
+		_scriptCommand = *pSrc++;
+
+		(this->*_commandList[_scriptCommand - 0x80])();
+		_scriptLoc = pSrc;
+	} while (!_endFlag);
+
+	return _returnCode;
 }
 
+void Scripts::CMDENDOBJECT() { }
+void Scripts::CMDJUMPLOOK() { }
+void Scripts::CMDJUMPHELP() { }
+void Scripts::CMDJUMPGET() { }
+void Scripts::CMDJUMPMOVE() { }
+void Scripts::CMDJUMPUSE() { }
+void Scripts::CMDJUMPTALK() { }
+void Scripts::CMDNULL() { }
+void Scripts::CMDPRINT() { }
+void Scripts::CMDRETPOS() { }
+void Scripts::CMDANIM() { }
+void Scripts::CMDSETFLAG() { }
+void Scripts::CMDCHECKFLAG() { }
+void Scripts::CMDGOTO() { }
+void Scripts::CMDSETINV() { }
+void Scripts::CMDCHECKINV() { }
+void Scripts::CMDSETTEX() { }
+void Scripts::CMDNEWROOM() { }
+void Scripts::CMDCONVERSE() { }
+void Scripts::CMDCHECKFRAME() { }
+void Scripts::CMDCHECKANIM() { }
+void Scripts::CMDSND() { }
+void Scripts::CMDRETNEG() { }
+void Scripts::CMDCHECKLOC() { }
+void Scripts::CMDSETANIM() { }
+void Scripts::CMDDISPINV() { }
+void Scripts::CMDSETTIMER() { }
+void Scripts::CMDCHECKTIMER() { }
+void Scripts::CMDSETTRAVEL() { }
+void Scripts::CMDSETVID() { }
+void Scripts::CMDPLAYVID() { }
+void Scripts::CMDPLOTIMAGE() { }
+void Scripts::CMDSETDISPLAY() { }
+void Scripts::CMDSETBUFFER() { }
+void Scripts::CMDSETSCROLL() { }
+void Scripts::CMDSAVERECT() { }
+void Scripts::CMDSETBUFVID() { }
+void Scripts::CMDPLAYBUFVID() { }
+void Scripts::CMDREMOVELAST() { }
+void Scripts::CMDSPECIAL() { }
+void Scripts::CMDSETCYCLE() { }
+void Scripts::CMDCYCLE() { }
+void Scripts::CMDCHARSPEAK() { }
+void Scripts::CMDTEXSPEAK() { }
+void Scripts::CMDTEXCHOICE() { }
+void Scripts::CMDWAIT() { }
+void Scripts::CMDSETCONPOS() { }
+void Scripts::CMDCHECKVFRAME() { }
+void Scripts::CMDJUMPCHOICE() { }
+void Scripts::CMDRETURNCHOICE() { }
+void Scripts::CMDCLEARBLOCK() { }
+void Scripts::CMDLOADSOUND() { }
+void Scripts::CMDFREESOUND() { }
+void Scripts::CMDSETVIDSND() { }
+void Scripts::CMDPLAYVIDSND() { }
+void Scripts::CMDPUSHLOCATION() { }
+void Scripts::CMDPLAYEROFF() { }
+void Scripts::CMDPLAYERON() { }
+void Scripts::CMDDEAD() { }
+void Scripts::CMDFADEOUT() { }
+void Scripts::CMDENDVID() { }
+void Scripts::CMDHELP() { }
+void Scripts::CMDCYCLEBACK() { }
+void Scripts::CMDCHAPTER() { }
+void Scripts::CMDSETHELP() { }
+void Scripts::CMDCENTERPANEL() { }
+void Scripts::CMDMAINPANEL() { }
+void Scripts::CMDRETFLASH() { }
+
+
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 995f12930f..99e35384a7 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -28,23 +28,100 @@
 namespace Access {
 
 class AccessEngine;
+class Scripts;
+
+typedef void(Scripts::*ScriptMethodPtr)();
 
 class Scripts {
 protected:
 	AccessEngine *_vm;
+	const ScriptMethodPtr *_commandList;
+public:
+	void CMDENDOBJECT();
+	void CMDJUMPLOOK();
+	void CMDJUMPHELP();
+	void CMDJUMPGET();
+	void CMDJUMPMOVE();
+	void CMDJUMPUSE();
+	void CMDJUMPTALK();
+	void CMDNULL();
+	void CMDPRINT();
+	void CMDRETPOS();
+	void CMDANIM();
+	void CMDSETFLAG();
+	void CMDCHECKFLAG();
+	void CMDGOTO();
+	void CMDSETINV();
+	void CMDCHECKINV();
+	void CMDSETTEX();
+	void CMDNEWROOM();
+	void CMDCONVERSE();
+	void CMDCHECKFRAME();
+	void CMDCHECKANIM();
+	void CMDSND();
+	void CMDRETNEG();
+	void CMDCHECKLOC();
+	void CMDSETANIM();
+	void CMDDISPINV();
+	void CMDSETTIMER();
+	void CMDCHECKTIMER();
+	void CMDSETTRAVEL();
+	void CMDSETVID();
+	void CMDPLAYVID();
+	void CMDPLOTIMAGE();
+	void CMDSETDISPLAY();
+	void CMDSETBUFFER();
+	void CMDSETSCROLL();
+	void CMDSAVERECT();
+	void CMDSETBUFVID();
+	void CMDPLAYBUFVID();
+	void CMDREMOVELAST();
+	void CMDSPECIAL();
+	void CMDSETCYCLE();
+	void CMDCYCLE();
+	void CMDCHARSPEAK();
+	void CMDTEXSPEAK();
+	void CMDTEXCHOICE();
+	void CMDWAIT();
+	void CMDSETCONPOS();
+	void CMDCHECKVFRAME();
+	void CMDJUMPCHOICE();
+	void CMDRETURNCHOICE();
+	void CMDCLEARBLOCK();
+	void CMDLOADSOUND();
+	void CMDFREESOUND();
+	void CMDSETVIDSND();
+	void CMDPLAYVIDSND();
+	void CMDPUSHLOCATION();
+	void CMDPLAYEROFF();
+	void CMDPLAYERON();
+	void CMDDEAD();
+	void CMDFADEOUT();
+	void CMDENDVID();
+	void CMDHELP();
+	void CMDCYCLEBACK();
+	void CMDCHAPTER();
+	void CMDSETHELP();
+	void CMDCENTERPANEL();
+	void CMDMAINPANEL();
+	void CMDRETFLASH();
 public:
 	byte *_script;
+	byte *_scriptLoc;
 	int _sequence;
+	bool _endFlag;
+	int _returnCode;
+	int _scriptCommand;
 public:
 	Scripts(AccessEngine *vm);
 
 	virtual ~Scripts();
 
-	void searchForSeq();
-	
-	void executeCommand();
-
 	void freeScriptData();
+
+	void searchForSequence();
+	
+	int executeCommand();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 9aefd90939de855fa5533a9501b0d23e109cc385 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 Aug 2014 09:13:41 -0400
Subject: ACCESS: Fix opening files by name

---
 engines/access/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 017102b92a..1ebc2fa8eb 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -66,7 +66,7 @@ void FileManager::openFile(const Common::String &filename) {
 	// Open up the file
 	_fileNumber = -1;
 	_file.close();
-	if (_file.open(filename))
+	if (!_file.open(filename))
 		error("Could not open file - %s", filename.c_str());
 
 	_filesize = _file.size();
-- 
cgit v1.2.3


From 80c8fbe024230aaba63d93f9a2ff1c1bf25ae922 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 Aug 2014 09:19:38 -0400
Subject: ACCESS: Simplify command list array to use a virtual method

---
 engines/access/amazon/amazon_room.cpp |  2 +-
 engines/access/room.cpp               |  2 +-
 engines/access/scripts.cpp            | 48 ++++++++++++++++++-----------------
 engines/access/scripts.h              |  6 ++---
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index da7b7e18ee..df2a6b759d 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -114,7 +114,7 @@ void AmazonRoom::roomSet() {
 	_vm->_numAnimTimers = 0;
 	_vm->_scripts->_sequence = 1000;
 	_vm->_scripts->searchForSequence();
-	_vm->_scripts->executeCommand();
+	_vm->_scripts->executeScript();
 }
 
 void AmazonRoom::roomMenu() {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e3e3700b51..80ab3329ac 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -231,7 +231,7 @@ void Room::loadRoomData(const byte *roomData) {
 void Room::roomLoop() {
 	_vm->_scripts->_sequence = 2000;
 	_vm->_scripts->searchForSequence();
-	_vm->_scripts->executeCommand();
+	_vm->_scripts->executeScript();
 }
 
 void Room::setupRoom() {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 6652b2922c..6513f34a86 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -28,28 +28,7 @@
 
 namespace Access {
 
-const ScriptMethodPtr COMMAND_LIST[] = {
-	&Scripts::CMDENDOBJECT, &Scripts::CMDJUMPLOOK, &Scripts::CMDJUMPHELP, &Scripts::CMDJUMPGET, &Scripts::CMDJUMPMOVE, 
-	&Scripts::CMDJUMPUSE, &Scripts::CMDJUMPTALK, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM, 
-	&Scripts::CMDSETFLAG, &Scripts::CMDCHECKFLAG, &Scripts::CMDGOTO, &Scripts::CMDSETINV, &Scripts::CMDSETINV, 
-	&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME, 
-	&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::CMDRETPOS, &Scripts::CMDCHECKLOC, &Scripts::CMDSETANIM, 
-	&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL, 
-	&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, &Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY, 
-	&Scripts::CMDSETBUFFER, &Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, &Scripts::CMDSETBUFVID, 
-	&Scripts::CMDPLAYBUFVID, &Scripts::CMDREMOVELAST, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, 
-	&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, &Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, 
-	&Scripts::CMDWAIT, &Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, &Scripts::CMDRETURNCHOICE, 
-	&Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, &Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND, 
-	&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
-	&Scripts::CMDPUSHLOCATION, &Scripts::CMDPLAYEROFF, &Scripts::CMDPLAYERON, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT, 
-	&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, &Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL, 
-	&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
-};
-
 Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
-	_commandList = COMMAND_LIST;
-
 	_script = nullptr;
 	_scriptLoc = nullptr;
 	_sequence = 0;
@@ -79,7 +58,7 @@ void Scripts::searchForSequence() {
 	_scriptLoc = pSrc;
 }
 
-int Scripts::executeCommand() {
+int Scripts::executeScript() {
 	assert(_scriptLoc);
 	_endFlag = 0;
 	_returnCode = 0;
@@ -89,13 +68,36 @@ int Scripts::executeCommand() {
 		for (pSrc = _scriptLoc; *pSrc == SCRIPT_START_BYTE; pSrc += 3) ;	
 		_scriptCommand = *pSrc++;
 
-		(this->*_commandList[_scriptCommand - 0x80])();
+		executeCommand(_scriptCommand - 0x80);
 		_scriptLoc = pSrc;
 	} while (!_endFlag);
 
 	return _returnCode;
 }
 
+void Scripts::executeCommand(int commandIndex) {
+	static const ScriptMethodPtr COMMAND_LIST[] = {
+		&Scripts::CMDENDOBJECT, &Scripts::CMDJUMPLOOK, &Scripts::CMDJUMPHELP, &Scripts::CMDJUMPGET, &Scripts::CMDJUMPMOVE,
+		&Scripts::CMDJUMPUSE, &Scripts::CMDJUMPTALK, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM,
+		&Scripts::CMDSETFLAG, &Scripts::CMDCHECKFLAG, &Scripts::CMDGOTO, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
+		&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME,
+		&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::CMDRETPOS, &Scripts::CMDCHECKLOC, &Scripts::CMDSETANIM,
+		&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
+		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, &Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY,
+		&Scripts::CMDSETBUFFER, &Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, &Scripts::CMDSETBUFVID,
+		&Scripts::CMDPLAYBUFVID, &Scripts::CMDREMOVELAST, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
+		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, &Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE,
+		&Scripts::CMDWAIT, &Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, &Scripts::CMDRETURNCHOICE,
+		&Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, &Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
+		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION,
+		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPLAYEROFF, &Scripts::CMDPLAYERON, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
+		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, &Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
+		&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
+	};
+
+	(this->*COMMAND_LIST[commandIndex])();
+}
+
 void Scripts::CMDENDOBJECT() { }
 void Scripts::CMDJUMPLOOK() { }
 void Scripts::CMDJUMPHELP() { }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 99e35384a7..b9c8b2cd56 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -35,8 +35,8 @@ typedef void(Scripts::*ScriptMethodPtr)();
 class Scripts {
 protected:
 	AccessEngine *_vm;
-	const ScriptMethodPtr *_commandList;
-public:
+
+	virtual void executeCommand(int commandIndex);
 	void CMDENDOBJECT();
 	void CMDJUMPLOOK();
 	void CMDJUMPHELP();
@@ -121,7 +121,7 @@ public:
 
 	void searchForSequence();
 	
-	int executeCommand();
+	int executeScript();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From fb0a1f5597145581cf082f0ef3ffcf9bea141cc9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 Aug 2014 09:30:16 -0400
Subject: ACCESS: Implemented cmdGoto script command

---
 engines/access/scripts.cpp | 156 +++++++++++++++++++++++----------------------
 engines/access/scripts.h   | 151 ++++++++++++++++++++++---------------------
 2 files changed, 159 insertions(+), 148 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 6513f34a86..337aa43eb5 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -45,9 +45,9 @@ void Scripts::freeScriptData() {
 	_script = nullptr;
 }
 
-void Scripts::searchForSequence() {
+const byte *Scripts::searchForSequence() {
 	assert(_script);
-	byte *pSrc = _script;
+	const byte *pSrc = _script;
 	int sequenceId;
 	do {
 		while (*pSrc++ != SCRIPT_START_BYTE) ;
@@ -56,6 +56,7 @@ void Scripts::searchForSequence() {
 	} while (sequenceId != _sequence);
 
 	_scriptLoc = pSrc;
+	return pSrc;
 }
 
 int Scripts::executeScript() {
@@ -64,22 +65,22 @@ int Scripts::executeScript() {
 	_returnCode = 0;
 
 	do {
-		byte *pSrc = _scriptLoc;
+		const byte *pSrc = _scriptLoc;
 		for (pSrc = _scriptLoc; *pSrc == SCRIPT_START_BYTE; pSrc += 3) ;	
 		_scriptCommand = *pSrc++;
 
-		executeCommand(_scriptCommand - 0x80);
+		executeCommand(_scriptCommand - 0x80, pSrc);
 		_scriptLoc = pSrc;
 	} while (!_endFlag);
 
 	return _returnCode;
 }
 
-void Scripts::executeCommand(int commandIndex) {
+void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
 		&Scripts::CMDENDOBJECT, &Scripts::CMDJUMPLOOK, &Scripts::CMDJUMPHELP, &Scripts::CMDJUMPGET, &Scripts::CMDJUMPMOVE,
 		&Scripts::CMDJUMPUSE, &Scripts::CMDJUMPTALK, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM,
-		&Scripts::CMDSETFLAG, &Scripts::CMDCHECKFLAG, &Scripts::CMDGOTO, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
+		&Scripts::CMDSETFLAG, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
 		&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME,
 		&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::CMDRETPOS, &Scripts::CMDCHECKLOC, &Scripts::CMDSETANIM,
 		&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
@@ -95,77 +96,82 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
 	};
 
-	(this->*COMMAND_LIST[commandIndex])();
+	(this->*COMMAND_LIST[commandIndex])(pScript);
 }
 
-void Scripts::CMDENDOBJECT() { }
-void Scripts::CMDJUMPLOOK() { }
-void Scripts::CMDJUMPHELP() { }
-void Scripts::CMDJUMPGET() { }
-void Scripts::CMDJUMPMOVE() { }
-void Scripts::CMDJUMPUSE() { }
-void Scripts::CMDJUMPTALK() { }
-void Scripts::CMDNULL() { }
-void Scripts::CMDPRINT() { }
-void Scripts::CMDRETPOS() { }
-void Scripts::CMDANIM() { }
-void Scripts::CMDSETFLAG() { }
-void Scripts::CMDCHECKFLAG() { }
-void Scripts::CMDGOTO() { }
-void Scripts::CMDSETINV() { }
-void Scripts::CMDCHECKINV() { }
-void Scripts::CMDSETTEX() { }
-void Scripts::CMDNEWROOM() { }
-void Scripts::CMDCONVERSE() { }
-void Scripts::CMDCHECKFRAME() { }
-void Scripts::CMDCHECKANIM() { }
-void Scripts::CMDSND() { }
-void Scripts::CMDRETNEG() { }
-void Scripts::CMDCHECKLOC() { }
-void Scripts::CMDSETANIM() { }
-void Scripts::CMDDISPINV() { }
-void Scripts::CMDSETTIMER() { }
-void Scripts::CMDCHECKTIMER() { }
-void Scripts::CMDSETTRAVEL() { }
-void Scripts::CMDSETVID() { }
-void Scripts::CMDPLAYVID() { }
-void Scripts::CMDPLOTIMAGE() { }
-void Scripts::CMDSETDISPLAY() { }
-void Scripts::CMDSETBUFFER() { }
-void Scripts::CMDSETSCROLL() { }
-void Scripts::CMDSAVERECT() { }
-void Scripts::CMDSETBUFVID() { }
-void Scripts::CMDPLAYBUFVID() { }
-void Scripts::CMDREMOVELAST() { }
-void Scripts::CMDSPECIAL() { }
-void Scripts::CMDSETCYCLE() { }
-void Scripts::CMDCYCLE() { }
-void Scripts::CMDCHARSPEAK() { }
-void Scripts::CMDTEXSPEAK() { }
-void Scripts::CMDTEXCHOICE() { }
-void Scripts::CMDWAIT() { }
-void Scripts::CMDSETCONPOS() { }
-void Scripts::CMDCHECKVFRAME() { }
-void Scripts::CMDJUMPCHOICE() { }
-void Scripts::CMDRETURNCHOICE() { }
-void Scripts::CMDCLEARBLOCK() { }
-void Scripts::CMDLOADSOUND() { }
-void Scripts::CMDFREESOUND() { }
-void Scripts::CMDSETVIDSND() { }
-void Scripts::CMDPLAYVIDSND() { }
-void Scripts::CMDPUSHLOCATION() { }
-void Scripts::CMDPLAYEROFF() { }
-void Scripts::CMDPLAYERON() { }
-void Scripts::CMDDEAD() { }
-void Scripts::CMDFADEOUT() { }
-void Scripts::CMDENDVID() { }
-void Scripts::CMDHELP() { }
-void Scripts::CMDCYCLEBACK() { }
-void Scripts::CMDCHAPTER() { }
-void Scripts::CMDSETHELP() { }
-void Scripts::CMDCENTERPANEL() { }
-void Scripts::CMDMAINPANEL() { }
-void Scripts::CMDRETFLASH() { }
+void Scripts::CMDENDOBJECT(const byte *&pScript) { }
+void Scripts::CMDJUMPLOOK(const byte *&pScript) { }
+void Scripts::CMDJUMPHELP(const byte *&pScript) { }
+void Scripts::CMDJUMPGET(const byte *&pScript) { }
+void Scripts::CMDJUMPMOVE(const byte *&pScript) { }
+void Scripts::CMDJUMPUSE(const byte *&pScript) { }
+void Scripts::CMDJUMPTALK(const byte *&pScript) { }
+void Scripts::CMDNULL(const byte *&pScript) { }
+void Scripts::CMDPRINT(const byte *&pScript) { }
+void Scripts::CMDRETPOS(const byte *&pScript) { }
+void Scripts::CMDANIM(const byte *&pScript) { }
+void Scripts::CMDSETFLAG(const byte *&pScript) { }
+void Scripts::CMDCHECKFLAG(const byte *&pScript) { }
+
+void Scripts::cmdGoto(const byte *&pScript) { 
+	_sequence = READ_LE_UINT16(pScript);
+	pScript = searchForSequence();
+}
+
+void Scripts::CMDSETINV(const byte *&pScript) { }
+void Scripts::CMDCHECKINV(const byte *&pScript) { }
+void Scripts::CMDSETTEX(const byte *&pScript) { }
+void Scripts::CMDNEWROOM(const byte *&pScript) { }
+void Scripts::CMDCONVERSE(const byte *&pScript) { }
+void Scripts::CMDCHECKFRAME(const byte *&pScript) { }
+void Scripts::CMDCHECKANIM(const byte *&pScript) { }
+void Scripts::CMDSND(const byte *&pScript) { }
+void Scripts::CMDRETNEG(const byte *&pScript) { }
+void Scripts::CMDCHECKLOC(const byte *&pScript) { }
+void Scripts::CMDSETANIM(const byte *&pScript) { }
+void Scripts::CMDDISPINV(const byte *&pScript) { }
+void Scripts::CMDSETTIMER(const byte *&pScript) { }
+void Scripts::CMDCHECKTIMER(const byte *&pScript) { }
+void Scripts::CMDSETTRAVEL(const byte *&pScript) { }
+void Scripts::CMDSETVID(const byte *&pScript) { }
+void Scripts::CMDPLAYVID(const byte *&pScript) { }
+void Scripts::CMDPLOTIMAGE(const byte *&pScript) { }
+void Scripts::CMDSETDISPLAY(const byte *&pScript) { }
+void Scripts::CMDSETBUFFER(const byte *&pScript) { }
+void Scripts::CMDSETSCROLL(const byte *&pScript) { }
+void Scripts::CMDSAVERECT(const byte *&pScript) { }
+void Scripts::CMDSETBUFVID(const byte *&pScript) { }
+void Scripts::CMDPLAYBUFVID(const byte *&pScript) { }
+void Scripts::CMDREMOVELAST(const byte *&pScript) { }
+void Scripts::CMDSPECIAL(const byte *&pScript) { }
+void Scripts::CMDSETCYCLE(const byte *&pScript) { }
+void Scripts::CMDCYCLE(const byte *&pScript) { }
+void Scripts::CMDCHARSPEAK(const byte *&pScript) { }
+void Scripts::CMDTEXSPEAK(const byte *&pScript) { }
+void Scripts::CMDTEXCHOICE(const byte *&pScript) { }
+void Scripts::CMDWAIT(const byte *&pScript) { }
+void Scripts::CMDSETCONPOS(const byte *&pScript) { }
+void Scripts::CMDCHECKVFRAME(const byte *&pScript) { }
+void Scripts::CMDJUMPCHOICE(const byte *&pScript) { }
+void Scripts::CMDRETURNCHOICE(const byte *&pScript) { }
+void Scripts::CMDCLEARBLOCK(const byte *&pScript) { }
+void Scripts::CMDLOADSOUND(const byte *&pScript) { }
+void Scripts::CMDFREESOUND(const byte *&pScript) { }
+void Scripts::CMDSETVIDSND(const byte *&pScript) { }
+void Scripts::CMDPLAYVIDSND(const byte *&pScript) { }
+void Scripts::CMDPUSHLOCATION(const byte *&pScript) { }
+void Scripts::CMDPLAYEROFF(const byte *&pScript) { }
+void Scripts::CMDPLAYERON(const byte *&pScript) { }
+void Scripts::CMDDEAD(const byte *&pScript) { }
+void Scripts::CMDFADEOUT(const byte *&pScript) { }
+void Scripts::CMDENDVID(const byte *&pScript) { }
+void Scripts::CMDHELP(const byte *&pScript) { }
+void Scripts::CMDCYCLEBACK(const byte *&pScript) { }
+void Scripts::CMDCHAPTER(const byte *&pScript) { }
+void Scripts::CMDSETHELP(const byte *&pScript) { }
+void Scripts::CMDCENTERPANEL(const byte *&pScript) { }
+void Scripts::CMDMAINPANEL(const byte *&pScript) { }
+void Scripts::CMDRETFLASH(const byte *&pScript) { }
 
 
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index b9c8b2cd56..fc75e9e9ab 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -30,84 +30,89 @@ namespace Access {
 class AccessEngine;
 class Scripts;
 
-typedef void(Scripts::*ScriptMethodPtr)();
+typedef void(Scripts::*ScriptMethodPtr)(const byte *&pScript);
 
 class Scripts {
 protected:
 	AccessEngine *_vm;
 
-	virtual void executeCommand(int commandIndex);
-	void CMDENDOBJECT();
-	void CMDJUMPLOOK();
-	void CMDJUMPHELP();
-	void CMDJUMPGET();
-	void CMDJUMPMOVE();
-	void CMDJUMPUSE();
-	void CMDJUMPTALK();
-	void CMDNULL();
-	void CMDPRINT();
-	void CMDRETPOS();
-	void CMDANIM();
-	void CMDSETFLAG();
-	void CMDCHECKFLAG();
-	void CMDGOTO();
-	void CMDSETINV();
-	void CMDCHECKINV();
-	void CMDSETTEX();
-	void CMDNEWROOM();
-	void CMDCONVERSE();
-	void CMDCHECKFRAME();
-	void CMDCHECKANIM();
-	void CMDSND();
-	void CMDRETNEG();
-	void CMDCHECKLOC();
-	void CMDSETANIM();
-	void CMDDISPINV();
-	void CMDSETTIMER();
-	void CMDCHECKTIMER();
-	void CMDSETTRAVEL();
-	void CMDSETVID();
-	void CMDPLAYVID();
-	void CMDPLOTIMAGE();
-	void CMDSETDISPLAY();
-	void CMDSETBUFFER();
-	void CMDSETSCROLL();
-	void CMDSAVERECT();
-	void CMDSETBUFVID();
-	void CMDPLAYBUFVID();
-	void CMDREMOVELAST();
-	void CMDSPECIAL();
-	void CMDSETCYCLE();
-	void CMDCYCLE();
-	void CMDCHARSPEAK();
-	void CMDTEXSPEAK();
-	void CMDTEXCHOICE();
-	void CMDWAIT();
-	void CMDSETCONPOS();
-	void CMDCHECKVFRAME();
-	void CMDJUMPCHOICE();
-	void CMDRETURNCHOICE();
-	void CMDCLEARBLOCK();
-	void CMDLOADSOUND();
-	void CMDFREESOUND();
-	void CMDSETVIDSND();
-	void CMDPLAYVIDSND();
-	void CMDPUSHLOCATION();
-	void CMDPLAYEROFF();
-	void CMDPLAYERON();
-	void CMDDEAD();
-	void CMDFADEOUT();
-	void CMDENDVID();
-	void CMDHELP();
-	void CMDCYCLEBACK();
-	void CMDCHAPTER();
-	void CMDSETHELP();
-	void CMDCENTERPANEL();
-	void CMDMAINPANEL();
-	void CMDRETFLASH();
+	virtual void executeCommand(int commandIndex, const byte *&pScript);
+	void CMDENDOBJECT(const byte *&pScript);
+	void CMDJUMPLOOK(const byte *&pScript);
+	void CMDJUMPHELP(const byte *&pScript);
+	void CMDJUMPGET(const byte *&pScript);
+	void CMDJUMPMOVE(const byte *&pScript);
+	void CMDJUMPUSE(const byte *&pScript);
+	void CMDJUMPTALK(const byte *&pScript);
+	void CMDNULL(const byte *&pScript);
+	void CMDPRINT(const byte *&pScript);
+	void CMDRETPOS(const byte *&pScript);
+	void CMDANIM(const byte *&pScript);
+	void CMDSETFLAG(const byte *&pScript);
+	void CMDCHECKFLAG(const byte *&pScript);
+	
+	/**
+	 * Jump to another script
+	 */
+	void cmdGoto(const byte *&pScript);
+	
+	void CMDSETINV(const byte *&pScript);
+	void CMDCHECKINV(const byte *&pScript);
+	void CMDSETTEX(const byte *&pScript);
+	void CMDNEWROOM(const byte *&pScript);
+	void CMDCONVERSE(const byte *&pScript);
+	void CMDCHECKFRAME(const byte *&pScript);
+	void CMDCHECKANIM(const byte *&pScript);
+	void CMDSND(const byte *&pScript);
+	void CMDRETNEG(const byte *&pScript);
+	void CMDCHECKLOC(const byte *&pScript);
+	void CMDSETANIM(const byte *&pScript);
+	void CMDDISPINV(const byte *&pScript);
+	void CMDSETTIMER(const byte *&pScript);
+	void CMDCHECKTIMER(const byte *&pScript);
+	void CMDSETTRAVEL(const byte *&pScript);
+	void CMDSETVID(const byte *&pScript);
+	void CMDPLAYVID(const byte *&pScript);
+	void CMDPLOTIMAGE(const byte *&pScript);
+	void CMDSETDISPLAY(const byte *&pScript);
+	void CMDSETBUFFER(const byte *&pScript);
+	void CMDSETSCROLL(const byte *&pScript);
+	void CMDSAVERECT(const byte *&pScript);
+	void CMDSETBUFVID(const byte *&pScript);
+	void CMDPLAYBUFVID(const byte *&pScript);
+	void CMDREMOVELAST(const byte *&pScript);
+	void CMDSPECIAL(const byte *&pScript);
+	void CMDSETCYCLE(const byte *&pScript);
+	void CMDCYCLE(const byte *&pScript);
+	void CMDCHARSPEAK(const byte *&pScript);
+	void CMDTEXSPEAK(const byte *&pScript);
+	void CMDTEXCHOICE(const byte *&pScript);
+	void CMDWAIT(const byte *&pScript);
+	void CMDSETCONPOS(const byte *&pScript);
+	void CMDCHECKVFRAME(const byte *&pScript);
+	void CMDJUMPCHOICE(const byte *&pScript);
+	void CMDRETURNCHOICE(const byte *&pScript);
+	void CMDCLEARBLOCK(const byte *&pScript);
+	void CMDLOADSOUND(const byte *&pScript);
+	void CMDFREESOUND(const byte *&pScript);
+	void CMDSETVIDSND(const byte *&pScript);
+	void CMDPLAYVIDSND(const byte *&pScript);
+	void CMDPUSHLOCATION(const byte *&pScript);
+	void CMDPLAYEROFF(const byte *&pScript);
+	void CMDPLAYERON(const byte *&pScript);
+	void CMDDEAD(const byte *&pScript);
+	void CMDFADEOUT(const byte *&pScript);
+	void CMDENDVID(const byte *&pScript);
+	void CMDHELP(const byte *&pScript);
+	void CMDCYCLEBACK(const byte *&pScript);
+	void CMDCHAPTER(const byte *&pScript);
+	void CMDSETHELP(const byte *&pScript);
+	void CMDCENTERPANEL(const byte *&pScript);
+	void CMDMAINPANEL(const byte *&pScript);
+	void CMDRETFLASH(const byte *&pScript);
 public:
-	byte *_script;
-	byte *_scriptLoc;
+	const byte *_script;
+	const byte *_scriptLoc;
 	int _sequence;
 	bool _endFlag;
 	int _returnCode;
@@ -119,7 +124,7 @@ public:
 
 	void freeScriptData();
 
-	void searchForSequence();
+	const byte *searchForSequence();
 	
 	int executeScript();
 };
-- 
cgit v1.2.3


From a9b8369274c74e2364e40b8ac3e0fb735443ae51 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 Aug 2014 23:29:17 -0400
Subject: ACCESS: Implemented several script commands

---
 engines/access/scripts.cpp | 76 +++++++++++++++++++++++++++++++++++++++-------
 engines/access/scripts.h   | 14 ++++-----
 2 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 337aa43eb5..38f9f92329 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -78,9 +78,9 @@ int Scripts::executeScript() {
 
 void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
-		&Scripts::CMDENDOBJECT, &Scripts::CMDJUMPLOOK, &Scripts::CMDJUMPHELP, &Scripts::CMDJUMPGET, &Scripts::CMDJUMPMOVE,
-		&Scripts::CMDJUMPUSE, &Scripts::CMDJUMPTALK, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM,
-		&Scripts::CMDSETFLAG, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
+		&Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, &Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
+		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM,
+		&Scripts::cmdSetFlag, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
 		&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME,
 		&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::CMDRETPOS, &Scripts::CMDCHECKLOC, &Scripts::CMDSETANIM,
 		&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
@@ -100,18 +100,72 @@ void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 }
 
 void Scripts::CMDENDOBJECT(const byte *&pScript) { }
-void Scripts::CMDJUMPLOOK(const byte *&pScript) { }
-void Scripts::CMDJUMPHELP(const byte *&pScript) { }
-void Scripts::CMDJUMPGET(const byte *&pScript) { }
-void Scripts::CMDJUMPMOVE(const byte *&pScript) { }
-void Scripts::CMDJUMPUSE(const byte *&pScript) { }
-void Scripts::CMDJUMPTALK(const byte *&pScript) { }
+
+void Scripts::cmdJumpLook(const byte *&pScript) {
+	if (_vm->_selectCommand == 0)
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
+void Scripts::cmdJumpHelp(const byte *&pScript) { 
+	if (_vm->_selectCommand == 8)
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
+void Scripts::cmdJumpGet(const byte *&pScript) { 
+	if (_vm->_selectCommand == 3)
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
+void Scripts::cmdJumpMove(const byte *&pScript) { 
+	if (_vm->_selectCommand == 2)
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
+void Scripts::cmdJumpUse(const byte *&pScript) { 
+	if (_vm->_selectCommand == 4)
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
+void Scripts::cmdJumpTalk(const byte *&pScript) { 
+	if (_vm->_selectCommand == 6)
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
 void Scripts::CMDNULL(const byte *&pScript) { }
 void Scripts::CMDPRINT(const byte *&pScript) { }
 void Scripts::CMDRETPOS(const byte *&pScript) { }
 void Scripts::CMDANIM(const byte *&pScript) { }
-void Scripts::CMDSETFLAG(const byte *&pScript) { }
-void Scripts::CMDCHECKFLAG(const byte *&pScript) { }
+
+void Scripts::cmdSetFlag(const byte *&pScript) { 
+	int flagNum = *pScript++;
+	byte flagVal = *pScript++;
+	assert(flagNum < 100);
+	_vm->_flags[flagNum] = flagVal;
+}
+
+void Scripts::CMDCHECKFLAG(const byte *&pScript) { 
+	int flagNum = READ_LE_UINT16(pScript);
+	int flagVal = READ_LE_UINT16(pScript + 2);
+	pScript += 4;
+	assert(flagNum < 100);
+
+	if (_vm->_flags[flagNum] == (flagVal & 0xff))
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
 
 void Scripts::cmdGoto(const byte *&pScript) { 
 	_sequence = READ_LE_UINT16(pScript);
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index fc75e9e9ab..5e733dbd47 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -38,17 +38,17 @@ protected:
 
 	virtual void executeCommand(int commandIndex, const byte *&pScript);
 	void CMDENDOBJECT(const byte *&pScript);
-	void CMDJUMPLOOK(const byte *&pScript);
-	void CMDJUMPHELP(const byte *&pScript);
-	void CMDJUMPGET(const byte *&pScript);
-	void CMDJUMPMOVE(const byte *&pScript);
-	void CMDJUMPUSE(const byte *&pScript);
-	void CMDJUMPTALK(const byte *&pScript);
+	void cmdJumpLook(const byte *&pScript);
+	void cmdJumpHelp(const byte *&pScript);
+	void cmdJumpGet(const byte *&pScript);
+	void cmdJumpMove(const byte *&pScript);
+	void cmdJumpUse(const byte *&pScript);
+	void cmdJumpTalk(const byte *&pScript);
 	void CMDNULL(const byte *&pScript);
 	void CMDPRINT(const byte *&pScript);
 	void CMDRETPOS(const byte *&pScript);
 	void CMDANIM(const byte *&pScript);
-	void CMDSETFLAG(const byte *&pScript);
+	void cmdSetFlag(const byte *&pScript);
 	void CMDCHECKFLAG(const byte *&pScript);
 	
 	/**
-- 
cgit v1.2.3


From c930c7e6ed0128ea012d7cc09ce855e7a06b6c3c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 Aug 2014 15:38:40 +0200
Subject: ACCESS: Implement some script opcodes

---
 engines/access/scripts.cpp | 45 +++++++++++++++++++++++++++++++++++++--------
 engines/access/scripts.h   | 10 +++++-----
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 38f9f92329..c78ecf573d 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -79,10 +79,10 @@ int Scripts::executeScript() {
 void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
 		&Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, &Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
-		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::CMDNULL, &Scripts::CMDPRINT, &Scripts::CMDRETPOS, &Scripts::CMDANIM,
+		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, &Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::CMDANIM,
 		&Scripts::cmdSetFlag, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
 		&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME,
-		&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::CMDRETPOS, &Scripts::CMDCHECKLOC, &Scripts::CMDSETANIM,
+		&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, &Scripts::CMDSETANIM,
 		&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
 		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, &Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY,
 		&Scripts::CMDSETBUFFER, &Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, &Scripts::CMDSETBUFVID,
@@ -91,7 +91,7 @@ void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 		&Scripts::CMDWAIT, &Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, &Scripts::CMDRETURNCHOICE,
 		&Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, &Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION,
-		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPLAYEROFF, &Scripts::CMDPLAYERON, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
+		&Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, &Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
 		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, &Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
 		&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
 	};
@@ -143,9 +143,16 @@ void Scripts::cmdJumpTalk(const byte *&pScript) {
 		pScript += 2;
 }
 
-void Scripts::CMDNULL(const byte *&pScript) { }
+void Scripts::cmdNull(const byte *&pScript) {
+}
+
 void Scripts::CMDPRINT(const byte *&pScript) { }
-void Scripts::CMDRETPOS(const byte *&pScript) { }
+
+void Scripts::cmdRetPos(const byte *&pScript) {
+	_endFlag = true;
+	_returnCode = 0;
+}
+
 void Scripts::CMDANIM(const byte *&pScript) { }
 
 void Scripts::cmdSetFlag(const byte *&pScript) { 
@@ -181,7 +188,22 @@ void Scripts::CMDCHECKFRAME(const byte *&pScript) { }
 void Scripts::CMDCHECKANIM(const byte *&pScript) { }
 void Scripts::CMDSND(const byte *&pScript) { }
 void Scripts::CMDRETNEG(const byte *&pScript) { }
-void Scripts::CMDCHECKLOC(const byte *&pScript) { }
+
+void Scripts::cmdCheckLoc(const byte *&pScript) {
+	int minX = READ_LE_UINT16(pScript);
+	int minY = READ_LE_UINT16(pScript);
+	int maxX = READ_LE_UINT16(pScript);
+	int maxY = READ_LE_UINT16(pScript);
+
+	int curX = _vm->_player->_rawPlayer.x + _vm->_player->_playerOffset.x;
+	int curY = _vm->_player->_rawPlayer.y;
+
+	if ((curX > minX) && (curX < maxX) && (curY > minY) && (curY < maxY))
+		cmdGoto(pScript);
+	else
+		pScript += 2;
+}
+
 void Scripts::CMDSETANIM(const byte *&pScript) { }
 void Scripts::CMDDISPINV(const byte *&pScript) { }
 void Scripts::CMDSETTIMER(const byte *&pScript) { }
@@ -214,8 +236,15 @@ void Scripts::CMDFREESOUND(const byte *&pScript) { }
 void Scripts::CMDSETVIDSND(const byte *&pScript) { }
 void Scripts::CMDPLAYVIDSND(const byte *&pScript) { }
 void Scripts::CMDPUSHLOCATION(const byte *&pScript) { }
-void Scripts::CMDPLAYEROFF(const byte *&pScript) { }
-void Scripts::CMDPLAYERON(const byte *&pScript) { }
+
+void Scripts::cmdPlayerOff(const byte *&pScript) {
+	_vm->_player->_playerOff = true;
+}
+
+void Scripts::cmdPlayerOn(const byte *&pScript) {
+	_vm->_player->_playerOff = false;
+}
+
 void Scripts::CMDDEAD(const byte *&pScript) { }
 void Scripts::CMDFADEOUT(const byte *&pScript) { }
 void Scripts::CMDENDVID(const byte *&pScript) { }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 5e733dbd47..a65c36530f 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -44,9 +44,9 @@ protected:
 	void cmdJumpMove(const byte *&pScript);
 	void cmdJumpUse(const byte *&pScript);
 	void cmdJumpTalk(const byte *&pScript);
-	void CMDNULL(const byte *&pScript);
+	void cmdNull(const byte *&pScript);
 	void CMDPRINT(const byte *&pScript);
-	void CMDRETPOS(const byte *&pScript);
+	void cmdRetPos(const byte *&pScript);
 	void CMDANIM(const byte *&pScript);
 	void cmdSetFlag(const byte *&pScript);
 	void CMDCHECKFLAG(const byte *&pScript);
@@ -65,7 +65,7 @@ protected:
 	void CMDCHECKANIM(const byte *&pScript);
 	void CMDSND(const byte *&pScript);
 	void CMDRETNEG(const byte *&pScript);
-	void CMDCHECKLOC(const byte *&pScript);
+	void cmdCheckLoc(const byte *&pScript);
 	void CMDSETANIM(const byte *&pScript);
 	void CMDDISPINV(const byte *&pScript);
 	void CMDSETTIMER(const byte *&pScript);
@@ -98,8 +98,8 @@ protected:
 	void CMDSETVIDSND(const byte *&pScript);
 	void CMDPLAYVIDSND(const byte *&pScript);
 	void CMDPUSHLOCATION(const byte *&pScript);
-	void CMDPLAYEROFF(const byte *&pScript);
-	void CMDPLAYERON(const byte *&pScript);
+	void cmdPlayerOff(const byte *&pScript);
+	void cmdPlayerOn(const byte *&pScript);
 	void CMDDEAD(const byte *&pScript);
 	void CMDFADEOUT(const byte *&pScript);
 	void CMDENDVID(const byte *&pScript);
-- 
cgit v1.2.3


From 5a3dfb1a7bd27bef578479b3666a6dbf9a08ce3b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 Aug 2014 15:54:08 +0200
Subject: ACCESS: Fix implementation of cmdCheckLoc()

---
 engines/access/scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index c78ecf573d..01fb73ecb4 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -198,7 +198,7 @@ void Scripts::cmdCheckLoc(const byte *&pScript) {
 	int curX = _vm->_player->_rawPlayer.x + _vm->_player->_playerOffset.x;
 	int curY = _vm->_player->_rawPlayer.y;
 
-	if ((curX > minX) && (curX < maxX) && (curY > minY) && (curY < maxY))
+	if ((curX >= minX) && (curX <= maxX) && (curY >= minY) && (curY <= maxY))
 		cmdGoto(pScript);
 	else
 		pScript += 2;
-- 
cgit v1.2.3


From 814d4ebdd01163f0a21d8eb4d04f8201e98cf57f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 12:12:39 -0400
Subject: ACCESS: Add detection entry and subfolder adding for CD version

---
 engines/access/access.cpp         | 12 ++++++++++++
 engines/access/access.h           |  1 +
 engines/access/detection.cpp      |  4 ++++
 engines/access/detection_tables.h | 18 ++++++++++++++++++
 4 files changed, 35 insertions(+)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 78274f1d59..cb1977a7f1 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -154,6 +154,18 @@ void AccessEngine::initialize() {
 	DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
 	DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
 
+	if (isCD()) {
+		const Common::FSNode gameDataDir(ConfMan.get("path"));
+		const Common::FSNode cdromDir = gameDataDir.getChild("cdrom");
+
+		for (int idx = 0; idx < 15; ++idx) {
+			Common::String folder = (idx == 0) ? "game" :
+				Common::String::format("chap%.2d", idx);
+			SearchMan.addSubDirectoryMatching(cdromDir, folder);
+		}
+	}
+
+	// Create sub-objects of the engine
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
diff --git a/engines/access/access.h b/engines/access/access.h
index a0099402fd..18278bf56b 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -200,6 +200,7 @@ public:
 	virtual ~AccessEngine();
 
 	uint32 getFeatures() const;
+	bool isCD() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 	uint16 getVersion() const;
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index ca04a64b0d..47f7af6191 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -56,6 +56,10 @@ uint32 AccessEngine::getFeatures() const {
 	return _gameDescription->desc.flags;
 }
 
+bool AccessEngine::isCD() const {
+	return (bool)(_gameDescription->desc.flags & ADGF_CD);
+}
+
 Common::Language AccessEngine::getLanguage() const {
 	return _gameDescription->desc.language;
 }
diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index cbef1d3b63..ad962f47b2 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -41,6 +41,24 @@ static const AccessGameDescription gameDescriptions[] = {
 		0
 	},
 
+	{
+		// Amazon Guadians of Eden - CD English
+		{
+			"amazon",
+			"CD",
+			{
+				{ "checksum.crc", 0, "bef85478132fec74cb5d9067f3a37d24", 8 },
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_CD,
+			GUIO1(GUIO_NONE)
+		},
+		GType_Amazon,
+		0
+	},
+
 	{ AD_TABLE_END_MARKER, 0, 0 }
 };
 
-- 
cgit v1.2.3


From 3fb6c99017a0dd1502f3f01352a401c30ee3132b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 12:25:52 -0400
Subject: ACCESS: Add missing CMDOBJECT method to script command list

---
 engines/access/scripts.cpp | 43 ++++++++++++++++++++++++++++---------------
 engines/access/scripts.h   |  1 +
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 01fb73ecb4..98ab7f8a54 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -78,27 +78,40 @@ int Scripts::executeScript() {
 
 void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
-		&Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, &Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
-		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, &Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::CMDANIM,
-		&Scripts::cmdSetFlag, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, &Scripts::CMDSETINV, &Scripts::CMDSETINV,
-		&Scripts::CMDCHECKINV, &Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, &Scripts::CMDCHECKFRAME,
-		&Scripts::CMDCHECKANIM, &Scripts::CMDSND, &Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, &Scripts::CMDSETANIM,
-		&Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, &Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
-		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, &Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY,
-		&Scripts::CMDSETBUFFER, &Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, &Scripts::CMDSETBUFVID,
-		&Scripts::CMDPLAYBUFVID, &Scripts::CMDREMOVELAST, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
-		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, &Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE,
-		&Scripts::CMDWAIT, &Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, &Scripts::CMDRETURNCHOICE,
-		&Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, &Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
-		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION,
-		&Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, &Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
-		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, &Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
+		&Scripts::CMDOBJECT, &Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, 
+		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
+		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
+		&Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::CMDANIM,
+		&Scripts::cmdSetFlag, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, 
+		&Scripts::CMDSETINV, &Scripts::CMDSETINV, &Scripts::CMDCHECKINV, 
+		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
+		&Scripts::CMDCHECKFRAME, &Scripts::CMDCHECKANIM, &Scripts::CMDSND, 
+		&Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
+		&Scripts::CMDSETANIM, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
+		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
+		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
+		&Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY, &Scripts::CMDSETBUFFER, 
+		&Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
+		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::CMDREMOVELAST, 
+		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
+		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, 
+		&Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
+		&Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, 
+		&Scripts::CMDRETURNCHOICE, &Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, 
+		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
+		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
+		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
+		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
+		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, 
+		&Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
 		&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
 	};
 
 	(this->*COMMAND_LIST[commandIndex])(pScript);
 }
 
+void Scripts::CMDOBJECT(const byte *&pScript) { }
+
 void Scripts::CMDENDOBJECT(const byte *&pScript) { }
 
 void Scripts::cmdJumpLook(const byte *&pScript) {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index a65c36530f..8035450881 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -37,6 +37,7 @@ protected:
 	AccessEngine *_vm;
 
 	virtual void executeCommand(int commandIndex, const byte *&pScript);
+	void CMDOBJECT(const byte *&pScript);
 	void CMDENDOBJECT(const byte *&pScript);
 	void cmdJumpLook(const byte *&pScript);
 	void cmdJumpHelp(const byte *&pScript);
-- 
cgit v1.2.3


From 1171400ccb65025a77f04dae3a224a3aec5920a3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 15:54:35 -0400
Subject: ACCESS: Beginnings of animation manager

---
 engines/access/access.cpp    | 10 ++----
 engines/access/access.h      |  5 ++-
 engines/access/animation.cpp | 79 ++++++++++++++++++++++++++++++++++++++++++++
 engines/access/animation.h   | 68 ++++++++++++++++++++++++++++++++++++++
 engines/access/module.mk     |  1 +
 engines/access/room.cpp      | 10 ++++--
 engines/access/room.h        |  2 ++
 engines/access/screen.cpp    |  1 +
 engines/access/screen.h      |  1 +
 engines/access/scripts.cpp   | 20 ++++++++---
 engines/access/scripts.h     |  4 +--
 11 files changed, 182 insertions(+), 19 deletions(-)
 create mode 100644 engines/access/animation.cpp
 create mode 100644 engines/access/animation.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index cb1977a7f1..c98588f5ce 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -31,6 +31,7 @@ namespace Access {
 
 AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 		_gameDescription(gameDesc), Engine(syst), _randomSource("Access") {
+	_animation = nullptr;
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
@@ -53,7 +54,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_inactive = nullptr;
 	_manPal1 = nullptr;
 	_music = nullptr;
-	_anim = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
 	_startInvItem = 0;
@@ -122,6 +122,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 }
 
 AccessEngine::~AccessEngine() {
+	delete _animation;
 	delete _debugger;
 	delete _events;
 	delete _files;
@@ -140,7 +141,6 @@ AccessEngine::~AccessEngine() {
 	delete[] _inactive;
 	delete[] _manPal1;
 	delete[] _music;
-	delete[] _anim;
 	delete[] _title;
 }
 
@@ -166,6 +166,7 @@ void AccessEngine::initialize() {
 	}
 
 	// Create sub-objects of the engine
+	_animation = new AnimationManager(this);
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
@@ -224,11 +225,6 @@ void AccessEngine::freeCells() {
 	}
 }
 
-void AccessEngine::freeAnimationData() {
-	delete[] _anim;
-	_anim = nullptr;
-}
-
 void AccessEngine::freeInactiveData() {
 	delete[] _inactive;
 	_inactive = nullptr;
diff --git a/engines/access/access.h b/engines/access/access.h
index 18278bf56b..56600e4fb8 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -30,6 +30,7 @@
 #include "common/util.h"
 #include "engines/engine.h"
 #include "graphics/surface.h"
+#include "access\/animation.h"
 #include "access/data.h"
 #include "access/debugger.h"
 #include "access/events.h"
@@ -100,6 +101,7 @@ protected:
 	 */
 	virtual void playGame() = 0;
 public:
+	AnimationManager *_animation;
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
@@ -135,7 +137,6 @@ public:
 	byte *_inactive;
 	byte *_manPal1;
 	byte *_music;
-	byte *_anim;
 	byte *_title;
 	int _converseMode;
 	int _startInvItem;
@@ -209,8 +210,6 @@ public:
 
 	int getRandomNumber(int maxNumber);
 
-	void freeAnimationData();
-
 	void loadCells(Common::Array<RoomInfo::CellIdent> &cells);
 
 	/**
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
new file mode 100644
index 0000000000..4d73801e5d
--- /dev/null
+++ b/engines/access/animation.cpp
@@ -0,0 +1,79 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/endian.h"
+#include "access/animation.h"
+
+namespace Access {
+
+AnimationManager::AnimationManager(AccessEngine *vm) : Manager(vm) {
+	_anim = nullptr;
+	_animation = nullptr;
+}
+
+AnimationManager::~AnimationManager() {
+	delete[] _anim;
+	delete _animation;
+}
+
+void AnimationManager::freeAnimationData() {
+	delete[] _anim;
+	_anim = nullptr;
+	_animation = nullptr;
+}
+
+void AnimationManager::clearTimers() {
+	for (uint i = 0; i < _animationTimers.size(); ++i)
+		delete _animationTimers[i];
+
+	_animationTimers.clear();
+}
+
+Animation *AnimationManager::setAnimation(int animId) {
+	Animation *anim = findAnimation(animId);
+
+	anim->_countdownTicks = anim->_ticks;
+	anim->_frameNumber = 0;
+
+	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 : 
+		anim->_loopCount;
+	anim->_field10 = 0;
+		
+	return anim;
+}
+
+void AnimationManager::setAnimTimer(Animation *anim) {
+
+}
+
+Animation *AnimationManager::findAnimation(int animId) {
+	_animation = new Animation(_anim + READ_LE_UINT16(_anim + animId * 4 + 2));
+	return _animation;
+}
+
+/*------------------------------------------------------------------------*/
+
+Animation::Animation(const byte *data) {
+
+}
+
+} // End of namespace Access
diff --git a/engines/access/animation.h b/engines/access/animation.h
new file mode 100644
index 0000000000..010fab98ac
--- /dev/null
+++ b/engines/access/animation.h
@@ -0,0 +1,68 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_ANIMATION_H
+#define ACCESS_ANIMATION_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "access/data.h"
+
+namespace Access {
+
+class Animation;
+
+class AnimationManager : public Manager {
+private:
+	Animation *findAnimation(int animId);
+public:
+	const byte *_anim;
+	Animation *_animation;
+	Common::Array<Animation *> _animationTimers;
+public:
+	AnimationManager(AccessEngine *vm);
+	~AnimationManager();
+	void freeAnimationData();
+	void clearTimers();
+
+	Animation *setAnimation(int animId);
+
+	void setAnimTimer(Animation *anim);
+};
+
+class Animation {
+public:
+	int _type;
+	int _scaling;
+	int _frameNumber;
+	int _ticks;
+	int _loopCount;
+	int _countdownTicks;
+	int _currentLoopCount;
+	int _field10;
+public:
+	Animation(const byte *data);
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_ANIMATION_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 042e84ad86..24c237a18f 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -1,6 +1,7 @@
 MODULE := engines/access
 
 MODULE_OBJS := \
+	animation.o \
 	asurface.o \
 	access.o \
 	data.o \
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 80ab3329ac..fb70e35ee0 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -144,7 +144,7 @@ void Room::clearRoom() {
 	_vm->_sound->freeSounds();
 	_vm->_numAnimTimers = 0;
 
-	_vm->freeAnimationData();
+	_vm->_animation->freeAnimationData();
 	_vm->_scripts->freeScriptData();
 	_vm->freeCells();
 	freePlayField();
@@ -198,9 +198,9 @@ void Room::loadRoomData(const byte *roomData) {
 		roomInfo._scriptFile._subfile);
 
 	// Load animation data
-	_vm->freeAnimationData();
+	_vm->_animation->freeAnimationData();
 	if (roomInfo._animFile._fileNum != -1)
-		_vm->_anim = _vm->_files->loadFile(roomInfo._animFile._fileNum,
+		_vm->_animation->_anim = _vm->_files->loadFile(roomInfo._animFile._fileNum,
 		roomInfo._animFile._subfile);
 
 	_vm->_scaleI = roomInfo._scaleI;
@@ -312,6 +312,10 @@ void Room::buildColumn(int playX, int screenX) {
 	}
 }
 
+void Room::init4Quads() {
+	error("TODO: init4Quads");
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
diff --git a/engines/access/room.h b/engines/access/room.h
index c01a753d0a..72963371d6 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -101,6 +101,8 @@ public:
 	void clearRoom();
 
 	void buildColumn(int playX, int screenX);
+
+	void init4Quads();
 };
 
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 1974b1a981..428c3d5df8 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -35,6 +35,7 @@ namespace Access {
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
+	_vesaMode = 0;
 	_vesaCurrentWin = 0;
 	_currentPanel = 0;
 	_hideFlag = true;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index c32ae18e82..c4beacf17c 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -54,6 +54,7 @@ private:
 
 	bool clip(Common::Rect &r);
 public:
+	int _vesaMode;
 	bool _loadPalFlag;
 	bool _scrollFlag;
 	int _scrollThreshold;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 98ab7f8a54..2705d70d9f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -87,7 +87,7 @@ void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::CMDCHECKFRAME, &Scripts::CMDCHECKANIM, &Scripts::CMDSND, 
 		&Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
-		&Scripts::CMDSETANIM, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
+		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
 		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
 		&Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY, &Scripts::CMDSETBUFFER, 
@@ -104,7 +104,7 @@ void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
 		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, 
 		&Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
-		&Scripts::CMDMAINPANEL, &Scripts::CMDRETFLASH
+		&Scripts::cmdMainPanel, &Scripts::CMDRETFLASH
 	};
 
 	(this->*COMMAND_LIST[commandIndex])(pScript);
@@ -217,7 +217,12 @@ void Scripts::cmdCheckLoc(const byte *&pScript) {
 		pScript += 2;
 }
 
-void Scripts::CMDSETANIM(const byte *&pScript) { }
+void Scripts::cmdSetAnim(const byte *&pScript) { 
+	int animId = *pScript++;
+	Animation *anim = _vm->_animation->setAnimation(animId);
+	_vm->_animation->setAnimTimer(anim);
+}
+
 void Scripts::CMDDISPINV(const byte *&pScript) { }
 void Scripts::CMDSETTIMER(const byte *&pScript) { }
 void Scripts::CMDCHECKTIMER(const byte *&pScript) { }
@@ -266,7 +271,14 @@ void Scripts::CMDCYCLEBACK(const byte *&pScript) { }
 void Scripts::CMDCHAPTER(const byte *&pScript) { }
 void Scripts::CMDSETHELP(const byte *&pScript) { }
 void Scripts::CMDCENTERPANEL(const byte *&pScript) { }
-void Scripts::CMDMAINPANEL(const byte *&pScript) { }
+
+void Scripts::cmdMainPanel(const byte *&pScript) { 
+	if (_vm->_screen->_vesaMode) {
+		_vm->_room->init4Quads();
+		_vm->_screen->setPanel(0);
+	}
+}
+
 void Scripts::CMDRETFLASH(const byte *&pScript) { }
 
 
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 8035450881..d78b74840d 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -67,7 +67,7 @@ protected:
 	void CMDSND(const byte *&pScript);
 	void CMDRETNEG(const byte *&pScript);
 	void cmdCheckLoc(const byte *&pScript);
-	void CMDSETANIM(const byte *&pScript);
+	void cmdSetAnim(const byte *&pScript);
 	void CMDDISPINV(const byte *&pScript);
 	void CMDSETTIMER(const byte *&pScript);
 	void CMDCHECKTIMER(const byte *&pScript);
@@ -109,7 +109,7 @@ protected:
 	void CMDCHAPTER(const byte *&pScript);
 	void CMDSETHELP(const byte *&pScript);
 	void CMDCENTERPANEL(const byte *&pScript);
-	void CMDMAINPANEL(const byte *&pScript);
+	void cmdMainPanel(const byte *&pScript);
 	void CMDRETFLASH(const byte *&pScript);
 public:
 	const byte *_script;
-- 
cgit v1.2.3


From 00633b94be93bd80fc8d1244f59647002f12fbe1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 16:31:23 -0400
Subject: ACCESS: Convert Scripts class to use a MemoryReadStream

---
 engines/access/room.cpp    |   8 +-
 engines/access/scripts.cpp | 245 +++++++++++++++++++++++----------------------
 engines/access/scripts.h   | 152 ++++++++++++++--------------
 3 files changed, 207 insertions(+), 198 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index fb70e35ee0..e0acf1c32a 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -193,9 +193,11 @@ void Room::loadRoomData(const byte *roomData) {
 
 	// Load script data
 	_vm->_scripts->freeScriptData();
-	if (roomInfo._scriptFile._fileNum != -1)
-		_vm->_scripts->_script = _vm->_files->loadFile(roomInfo._scriptFile._fileNum,
-		roomInfo._scriptFile._subfile);
+	if (roomInfo._scriptFile._fileNum != -1) {
+		const byte *data = _vm->_files->loadFile(roomInfo._scriptFile._fileNum,
+			roomInfo._scriptFile._subfile);
+		_vm->_scripts->setScript(data, _vm->_files->_filesize);
+	}
 
 	// Load animation data
 	_vm->_animation->freeAnimationData();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2705d70d9f..bc86e09fcb 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -29,8 +29,8 @@
 namespace Access {
 
 Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
-	_script = nullptr;
-	_scriptLoc = nullptr;
+	_rawData = nullptr;
+	_data = nullptr;
 	_sequence = 0;
 	_endFlag = false;
 	_returnCode = 0;
@@ -40,43 +40,47 @@ Scripts::~Scripts() {
 	freeScriptData();
 }
 
+void Scripts::setScript(const byte *data, int size) {
+	_rawData = data;
+	_data = new Common::MemoryReadStream(data, size, DisposeAfterUse::NO);
+}
+
 void Scripts::freeScriptData() {
-	delete[] _script;
-	_script = nullptr;
+	delete[] _rawData;
+	delete _data;
+	_data = nullptr;
+	_rawData = nullptr;
 }
 
-const byte *Scripts::searchForSequence() {
-	assert(_script);
-	const byte *pSrc = _script;
+void Scripts::searchForSequence() {
+	assert(_data);
+
+	_data->seek(0);
 	int sequenceId;
 	do {
-		while (*pSrc++ != SCRIPT_START_BYTE) ;
-		sequenceId = READ_LE_UINT16(pSrc);
-		pSrc += 2;
+		while (_data->readByte() != SCRIPT_START_BYTE) ;
+		sequenceId = _data->readUint16LE();
 	} while (sequenceId != _sequence);
-
-	_scriptLoc = pSrc;
-	return pSrc;
 }
 
 int Scripts::executeScript() {
-	assert(_scriptLoc);
-	_endFlag = 0;
+	assert(_data);
+	_endFlag = false;
 	_returnCode = 0;
 
 	do {
-		const byte *pSrc = _scriptLoc;
-		for (pSrc = _scriptLoc; *pSrc == SCRIPT_START_BYTE; pSrc += 3) ;	
-		_scriptCommand = *pSrc++;
+		// Get next command, skipping over script start start if it's being pointed to
+		for (_scriptCommand = _data->readByte(); _scriptCommand == SCRIPT_START_BYTE;
+			_data->skip(2));
 
-		executeCommand(_scriptCommand - 0x80, pSrc);
-		_scriptLoc = pSrc;
+		assert(_scriptCommand >= 0x80);
+		executeCommand(_scriptCommand - 0x80);
 	} while (!_endFlag);
 
 	return _returnCode;
 }
 
-void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
+void Scripts::executeCommand(int commandIndex) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
 		&Scripts::CMDOBJECT, &Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, 
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
@@ -107,179 +111,178 @@ void Scripts::executeCommand(int commandIndex, const byte *&pScript) {
 		&Scripts::cmdMainPanel, &Scripts::CMDRETFLASH
 	};
 
-	(this->*COMMAND_LIST[commandIndex])(pScript);
+	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::CMDOBJECT(const byte *&pScript) { }
+void Scripts::CMDOBJECT() { }
 
-void Scripts::CMDENDOBJECT(const byte *&pScript) { }
+void Scripts::CMDENDOBJECT() { }
 
-void Scripts::cmdJumpLook(const byte *&pScript) {
+void Scripts::cmdJumpLook() {
 	if (_vm->_selectCommand == 0)
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdJumpHelp(const byte *&pScript) { 
+void Scripts::cmdJumpHelp() { 
 	if (_vm->_selectCommand == 8)
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdJumpGet(const byte *&pScript) { 
+void Scripts::cmdJumpGet() { 
 	if (_vm->_selectCommand == 3)
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdJumpMove(const byte *&pScript) { 
+void Scripts::cmdJumpMove() { 
 	if (_vm->_selectCommand == 2)
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdJumpUse(const byte *&pScript) { 
+void Scripts::cmdJumpUse() { 
 	if (_vm->_selectCommand == 4)
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdJumpTalk(const byte *&pScript) { 
+void Scripts::cmdJumpTalk() { 
 	if (_vm->_selectCommand == 6)
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdNull(const byte *&pScript) {
+void Scripts::cmdNull() {
 }
 
-void Scripts::CMDPRINT(const byte *&pScript) { }
+void Scripts::CMDPRINT() { }
 
-void Scripts::cmdRetPos(const byte *&pScript) {
+void Scripts::cmdRetPos() {
 	_endFlag = true;
 	_returnCode = 0;
 }
 
-void Scripts::CMDANIM(const byte *&pScript) { }
+void Scripts::CMDANIM() { }
 
-void Scripts::cmdSetFlag(const byte *&pScript) { 
-	int flagNum = *pScript++;
-	byte flagVal = *pScript++;
+void Scripts::cmdSetFlag() { 
+	int flagNum = _data->readByte();
+	byte flagVal = _data->readByte();
 	assert(flagNum < 100);
 	_vm->_flags[flagNum] = flagVal;
 }
 
-void Scripts::CMDCHECKFLAG(const byte *&pScript) { 
-	int flagNum = READ_LE_UINT16(pScript);
-	int flagVal = READ_LE_UINT16(pScript + 2);
-	pScript += 4;
+void Scripts::CMDCHECKFLAG() { 
+	int flagNum = _data->readUint16LE();
+	int flagVal = _data->readUint16LE();
 	assert(flagNum < 100);
 
 	if (_vm->_flags[flagNum] == (flagVal & 0xff))
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdGoto(const byte *&pScript) { 
-	_sequence = READ_LE_UINT16(pScript);
-	pScript = searchForSequence();
+void Scripts::cmdGoto() { 
+	_sequence = _data->readUint16LE();
+	searchForSequence();
 }
 
-void Scripts::CMDSETINV(const byte *&pScript) { }
-void Scripts::CMDCHECKINV(const byte *&pScript) { }
-void Scripts::CMDSETTEX(const byte *&pScript) { }
-void Scripts::CMDNEWROOM(const byte *&pScript) { }
-void Scripts::CMDCONVERSE(const byte *&pScript) { }
-void Scripts::CMDCHECKFRAME(const byte *&pScript) { }
-void Scripts::CMDCHECKANIM(const byte *&pScript) { }
-void Scripts::CMDSND(const byte *&pScript) { }
-void Scripts::CMDRETNEG(const byte *&pScript) { }
-
-void Scripts::cmdCheckLoc(const byte *&pScript) {
-	int minX = READ_LE_UINT16(pScript);
-	int minY = READ_LE_UINT16(pScript);
-	int maxX = READ_LE_UINT16(pScript);
-	int maxY = READ_LE_UINT16(pScript);
+void Scripts::CMDSETINV() { }
+void Scripts::CMDCHECKINV() { }
+void Scripts::CMDSETTEX() { }
+void Scripts::CMDNEWROOM() { }
+void Scripts::CMDCONVERSE() { }
+void Scripts::CMDCHECKFRAME() { }
+void Scripts::CMDCHECKANIM() { }
+void Scripts::CMDSND() { }
+void Scripts::CMDRETNEG() { }
+
+void Scripts::cmdCheckLoc() {
+	int minX = _data->readUint16LE();
+	int minY = _data->readUint16LE();
+	int maxX = _data->readUint16LE();
+	int maxY = _data->readUint16LE();
 
 	int curX = _vm->_player->_rawPlayer.x + _vm->_player->_playerOffset.x;
 	int curY = _vm->_player->_rawPlayer.y;
 
 	if ((curX >= minX) && (curX <= maxX) && (curY >= minY) && (curY <= maxY))
-		cmdGoto(pScript);
+		cmdGoto();
 	else
-		pScript += 2;
+		_data->skip(2);
 }
 
-void Scripts::cmdSetAnim(const byte *&pScript) { 
-	int animId = *pScript++;
+void Scripts::cmdSetAnim() { 
+	int animId = _data->readByte();
 	Animation *anim = _vm->_animation->setAnimation(animId);
 	_vm->_animation->setAnimTimer(anim);
 }
 
-void Scripts::CMDDISPINV(const byte *&pScript) { }
-void Scripts::CMDSETTIMER(const byte *&pScript) { }
-void Scripts::CMDCHECKTIMER(const byte *&pScript) { }
-void Scripts::CMDSETTRAVEL(const byte *&pScript) { }
-void Scripts::CMDSETVID(const byte *&pScript) { }
-void Scripts::CMDPLAYVID(const byte *&pScript) { }
-void Scripts::CMDPLOTIMAGE(const byte *&pScript) { }
-void Scripts::CMDSETDISPLAY(const byte *&pScript) { }
-void Scripts::CMDSETBUFFER(const byte *&pScript) { }
-void Scripts::CMDSETSCROLL(const byte *&pScript) { }
-void Scripts::CMDSAVERECT(const byte *&pScript) { }
-void Scripts::CMDSETBUFVID(const byte *&pScript) { }
-void Scripts::CMDPLAYBUFVID(const byte *&pScript) { }
-void Scripts::CMDREMOVELAST(const byte *&pScript) { }
-void Scripts::CMDSPECIAL(const byte *&pScript) { }
-void Scripts::CMDSETCYCLE(const byte *&pScript) { }
-void Scripts::CMDCYCLE(const byte *&pScript) { }
-void Scripts::CMDCHARSPEAK(const byte *&pScript) { }
-void Scripts::CMDTEXSPEAK(const byte *&pScript) { }
-void Scripts::CMDTEXCHOICE(const byte *&pScript) { }
-void Scripts::CMDWAIT(const byte *&pScript) { }
-void Scripts::CMDSETCONPOS(const byte *&pScript) { }
-void Scripts::CMDCHECKVFRAME(const byte *&pScript) { }
-void Scripts::CMDJUMPCHOICE(const byte *&pScript) { }
-void Scripts::CMDRETURNCHOICE(const byte *&pScript) { }
-void Scripts::CMDCLEARBLOCK(const byte *&pScript) { }
-void Scripts::CMDLOADSOUND(const byte *&pScript) { }
-void Scripts::CMDFREESOUND(const byte *&pScript) { }
-void Scripts::CMDSETVIDSND(const byte *&pScript) { }
-void Scripts::CMDPLAYVIDSND(const byte *&pScript) { }
-void Scripts::CMDPUSHLOCATION(const byte *&pScript) { }
-
-void Scripts::cmdPlayerOff(const byte *&pScript) {
+void Scripts::CMDDISPINV() { }
+void Scripts::CMDSETTIMER() { }
+void Scripts::CMDCHECKTIMER() { }
+void Scripts::CMDSETTRAVEL() { }
+void Scripts::CMDSETVID() { }
+void Scripts::CMDPLAYVID() { }
+void Scripts::CMDPLOTIMAGE() { }
+void Scripts::CMDSETDISPLAY() { }
+void Scripts::CMDSETBUFFER() { }
+void Scripts::CMDSETSCROLL() { }
+void Scripts::CMDSAVERECT() { }
+void Scripts::CMDSETBUFVID() { }
+void Scripts::CMDPLAYBUFVID() { }
+void Scripts::CMDREMOVELAST() { }
+void Scripts::CMDSPECIAL() { }
+void Scripts::CMDSETCYCLE() { }
+void Scripts::CMDCYCLE() { }
+void Scripts::CMDCHARSPEAK() { }
+void Scripts::CMDTEXSPEAK() { }
+void Scripts::CMDTEXCHOICE() { }
+void Scripts::CMDWAIT() { }
+void Scripts::CMDSETCONPOS() { }
+void Scripts::CMDCHECKVFRAME() { }
+void Scripts::CMDJUMPCHOICE() { }
+void Scripts::CMDRETURNCHOICE() { }
+void Scripts::CMDCLEARBLOCK() { }
+void Scripts::CMDLOADSOUND() { }
+void Scripts::CMDFREESOUND() { }
+void Scripts::CMDSETVIDSND() { }
+void Scripts::CMDPLAYVIDSND() { }
+void Scripts::CMDPUSHLOCATION() { }
+
+void Scripts::cmdPlayerOff() {
 	_vm->_player->_playerOff = true;
 }
 
-void Scripts::cmdPlayerOn(const byte *&pScript) {
+void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::CMDDEAD(const byte *&pScript) { }
-void Scripts::CMDFADEOUT(const byte *&pScript) { }
-void Scripts::CMDENDVID(const byte *&pScript) { }
-void Scripts::CMDHELP(const byte *&pScript) { }
-void Scripts::CMDCYCLEBACK(const byte *&pScript) { }
-void Scripts::CMDCHAPTER(const byte *&pScript) { }
-void Scripts::CMDSETHELP(const byte *&pScript) { }
-void Scripts::CMDCENTERPANEL(const byte *&pScript) { }
+void Scripts::CMDDEAD() { }
+void Scripts::CMDFADEOUT() { }
+void Scripts::CMDENDVID() { }
+void Scripts::CMDHELP() { }
+void Scripts::CMDCYCLEBACK() { }
+void Scripts::CMDCHAPTER() { }
+void Scripts::CMDSETHELP() { }
+void Scripts::CMDCENTERPANEL() { }
 
-void Scripts::cmdMainPanel(const byte *&pScript) { 
+void Scripts::cmdMainPanel() { 
 	if (_vm->_screen->_vesaMode) {
 		_vm->_room->init4Quads();
 		_vm->_screen->setPanel(0);
 	}
 }
 
-void Scripts::CMDRETFLASH(const byte *&pScript) { }
+void Scripts::CMDRETFLASH() { }
 
 
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index d78b74840d..4375934b7c 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -24,96 +24,98 @@
 #define ACCESS_SCRIPTS_H
 
 #include "common/scummsys.h"
+#include "common/memstream.h"
 
 namespace Access {
 
 class AccessEngine;
 class Scripts;
 
-typedef void(Scripts::*ScriptMethodPtr)(const byte *&pScript);
+typedef void(Scripts::*ScriptMethodPtr)();
 
 class Scripts {
+private:
+	const byte *_rawData;
+	Common::MemoryReadStream *_data;
 protected:
 	AccessEngine *_vm;
 
-	virtual void executeCommand(int commandIndex, const byte *&pScript);
-	void CMDOBJECT(const byte *&pScript);
-	void CMDENDOBJECT(const byte *&pScript);
-	void cmdJumpLook(const byte *&pScript);
-	void cmdJumpHelp(const byte *&pScript);
-	void cmdJumpGet(const byte *&pScript);
-	void cmdJumpMove(const byte *&pScript);
-	void cmdJumpUse(const byte *&pScript);
-	void cmdJumpTalk(const byte *&pScript);
-	void cmdNull(const byte *&pScript);
-	void CMDPRINT(const byte *&pScript);
-	void cmdRetPos(const byte *&pScript);
-	void CMDANIM(const byte *&pScript);
-	void cmdSetFlag(const byte *&pScript);
-	void CMDCHECKFLAG(const byte *&pScript);
+	virtual void executeCommand(int commandIndex);
+	void CMDOBJECT();
+	void CMDENDOBJECT();
+	void cmdJumpLook();
+	void cmdJumpHelp();
+	void cmdJumpGet();
+	void cmdJumpMove();
+	void cmdJumpUse();
+	void cmdJumpTalk();
+	void cmdNull();
+	void CMDPRINT();
+	void cmdRetPos();
+	void CMDANIM();
+	void cmdSetFlag();
+	void CMDCHECKFLAG();
 	
 	/**
 	 * Jump to another script
 	 */
-	void cmdGoto(const byte *&pScript);
+	void cmdGoto();
 	
-	void CMDSETINV(const byte *&pScript);
-	void CMDCHECKINV(const byte *&pScript);
-	void CMDSETTEX(const byte *&pScript);
-	void CMDNEWROOM(const byte *&pScript);
-	void CMDCONVERSE(const byte *&pScript);
-	void CMDCHECKFRAME(const byte *&pScript);
-	void CMDCHECKANIM(const byte *&pScript);
-	void CMDSND(const byte *&pScript);
-	void CMDRETNEG(const byte *&pScript);
-	void cmdCheckLoc(const byte *&pScript);
-	void cmdSetAnim(const byte *&pScript);
-	void CMDDISPINV(const byte *&pScript);
-	void CMDSETTIMER(const byte *&pScript);
-	void CMDCHECKTIMER(const byte *&pScript);
-	void CMDSETTRAVEL(const byte *&pScript);
-	void CMDSETVID(const byte *&pScript);
-	void CMDPLAYVID(const byte *&pScript);
-	void CMDPLOTIMAGE(const byte *&pScript);
-	void CMDSETDISPLAY(const byte *&pScript);
-	void CMDSETBUFFER(const byte *&pScript);
-	void CMDSETSCROLL(const byte *&pScript);
-	void CMDSAVERECT(const byte *&pScript);
-	void CMDSETBUFVID(const byte *&pScript);
-	void CMDPLAYBUFVID(const byte *&pScript);
-	void CMDREMOVELAST(const byte *&pScript);
-	void CMDSPECIAL(const byte *&pScript);
-	void CMDSETCYCLE(const byte *&pScript);
-	void CMDCYCLE(const byte *&pScript);
-	void CMDCHARSPEAK(const byte *&pScript);
-	void CMDTEXSPEAK(const byte *&pScript);
-	void CMDTEXCHOICE(const byte *&pScript);
-	void CMDWAIT(const byte *&pScript);
-	void CMDSETCONPOS(const byte *&pScript);
-	void CMDCHECKVFRAME(const byte *&pScript);
-	void CMDJUMPCHOICE(const byte *&pScript);
-	void CMDRETURNCHOICE(const byte *&pScript);
-	void CMDCLEARBLOCK(const byte *&pScript);
-	void CMDLOADSOUND(const byte *&pScript);
-	void CMDFREESOUND(const byte *&pScript);
-	void CMDSETVIDSND(const byte *&pScript);
-	void CMDPLAYVIDSND(const byte *&pScript);
-	void CMDPUSHLOCATION(const byte *&pScript);
-	void cmdPlayerOff(const byte *&pScript);
-	void cmdPlayerOn(const byte *&pScript);
-	void CMDDEAD(const byte *&pScript);
-	void CMDFADEOUT(const byte *&pScript);
-	void CMDENDVID(const byte *&pScript);
-	void CMDHELP(const byte *&pScript);
-	void CMDCYCLEBACK(const byte *&pScript);
-	void CMDCHAPTER(const byte *&pScript);
-	void CMDSETHELP(const byte *&pScript);
-	void CMDCENTERPANEL(const byte *&pScript);
-	void cmdMainPanel(const byte *&pScript);
-	void CMDRETFLASH(const byte *&pScript);
+	void CMDSETINV();
+	void CMDCHECKINV();
+	void CMDSETTEX();
+	void CMDNEWROOM();
+	void CMDCONVERSE();
+	void CMDCHECKFRAME();
+	void CMDCHECKANIM();
+	void CMDSND();
+	void CMDRETNEG();
+	void cmdCheckLoc();
+	void cmdSetAnim();
+	void CMDDISPINV();
+	void CMDSETTIMER();
+	void CMDCHECKTIMER();
+	void CMDSETTRAVEL();
+	void CMDSETVID();
+	void CMDPLAYVID();
+	void CMDPLOTIMAGE();
+	void CMDSETDISPLAY();
+	void CMDSETBUFFER();
+	void CMDSETSCROLL();
+	void CMDSAVERECT();
+	void CMDSETBUFVID();
+	void CMDPLAYBUFVID();
+	void CMDREMOVELAST();
+	void CMDSPECIAL();
+	void CMDSETCYCLE();
+	void CMDCYCLE();
+	void CMDCHARSPEAK();
+	void CMDTEXSPEAK();
+	void CMDTEXCHOICE();
+	void CMDWAIT();
+	void CMDSETCONPOS();
+	void CMDCHECKVFRAME();
+	void CMDJUMPCHOICE();
+	void CMDRETURNCHOICE();
+	void CMDCLEARBLOCK();
+	void CMDLOADSOUND();
+	void CMDFREESOUND();
+	void CMDSETVIDSND();
+	void CMDPLAYVIDSND();
+	void CMDPUSHLOCATION();
+	void cmdPlayerOff();
+	void cmdPlayerOn();
+	void CMDDEAD();
+	void CMDFADEOUT();
+	void CMDENDVID();
+	void CMDHELP();
+	void CMDCYCLEBACK();
+	void CMDCHAPTER();
+	void CMDSETHELP();
+	void CMDCENTERPANEL();
+	void cmdMainPanel();
+	void CMDRETFLASH();
 public:
-	const byte *_script;
-	const byte *_scriptLoc;
 	int _sequence;
 	bool _endFlag;
 	int _returnCode;
@@ -123,9 +125,11 @@ public:
 
 	virtual ~Scripts();
 
+	void setScript(const byte *data, int size);
+
 	void freeScriptData();
 
-	const byte *searchForSequence();
+	void searchForSequence();
 	
 	int executeScript();
 };
-- 
cgit v1.2.3


From d04a6d2d7a9bfc3bcfd3ad94c48f878d1143ee32 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 17:57:34 -0400
Subject: ACCESS: Beginnings of inventory management

---
 engines/access/access.cpp                  |  8 ++--
 engines/access/access.h                    |  7 ++--
 engines/access/amazon/amazon_game.cpp      |  1 +
 engines/access/amazon/amazon_resources.cpp | 21 ++++++++++
 engines/access/amazon/amazon_resources.h   |  2 +
 engines/access/inventory.cpp               | 61 ++++++++++++++++++++++++++++++
 engines/access/inventory.h                 | 56 +++++++++++++++++++++++++++
 engines/access/module.mk                   |  1 +
 engines/access/scripts.cpp                 | 26 +++++++++++--
 engines/access/scripts.h                   |  4 +-
 10 files changed, 172 insertions(+), 15 deletions(-)
 create mode 100644 engines/access/inventory.cpp
 create mode 100644 engines/access/inventory.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index c98588f5ce..ee524d7afe 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -35,6 +35,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
+	_inventory = nullptr;
 	_player = nullptr;
 	_room = nullptr;
 	_screen = nullptr;
@@ -56,10 +57,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_music = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
-	_startInvItem = 0;
-	_startAboutItem = 0;
-	_startTravelItem = 0;
-	_startInvBox = 0;
 	_startAboutBox = 0;
 	_startTravelBox = 0;
 	_numImages = 0;
@@ -104,7 +101,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_antFlag = false;
 	_allenFlag = false;
 	_noSound = false;
-	Common::fill(&inv[0], &inv[85], 0);
 	Common::fill(&_help1[0], &_help1[366], 0);
 	Common::fill(&_help2[0], &_help2[366], 0);
 	Common::fill(&_help1[0], &_help3[366], 0);
@@ -126,6 +122,7 @@ AccessEngine::~AccessEngine() {
 	delete _debugger;
 	delete _events;
 	delete _files;
+	delete _inventory;
 	delete _player;
 	delete _room;
 	delete _screen;
@@ -170,6 +167,7 @@ void AccessEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
+	_inventory = new InventoryManager(this);
 	_player = new Player(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
diff --git a/engines/access/access.h b/engines/access/access.h
index 56600e4fb8..0fa2c149cd 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -35,6 +35,7 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
+#include "access/inventory.h"
 #include "access/player.h"
 #include "access/room.h"
 #include "access/screen.h"
@@ -105,6 +106,7 @@ public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
+	InventoryManager *_inventory;
 	Player *_player;
 	Room *_room;
 	Screen *_screen;
@@ -139,10 +141,8 @@ public:
 	byte *_music;
 	byte *_title;
 	int _converseMode;
-	int _startInvItem;
 	int _startAboutItem;
 	int _startTravelItem;
-	int _startInvBox;
 	int _startAboutBox;
 	int _startTravelBox;
 	bool _currentCharFlag;
@@ -164,7 +164,7 @@ public:
 	int _intTim[3];
 	int _timer[3];
 	bool _timerFlag;
-	byte _flags[99];
+	Common::Array<int> _flags;
 	byte _useItem[23];
 	int _guardLoc;
 	int _guardFind;
@@ -181,7 +181,6 @@ public:
 	bool _antFlag;
 	bool _allenFlag;
 	bool _noSound;
-	int inv[85];
 	byte _help1[366];
 	byte _help2[366];
 	byte _help3[366];
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 7a16036ff3..8267c8549a 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -47,6 +47,7 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
+	_flags.resize(122);
 }
 
 AmazonEngine::~AmazonEngine() {
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 2f9fe0277a..87f2966d8e 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -986,6 +986,27 @@ extern const byte *CHARTBL[] = {
 	CRACK, LETTER
 };
 
+const char *const INVENTORY_NAMES[] = {
+	"RAT", "ALCOHOL", "SAFE COMBINATION", "BEAKER", "MICROFILM",
+	"VAULT KEY", "BOLT CUTTERS", "BLOWGUN", "LOVE POTION", "MONEY",
+	"DARTS", "TAPE", "JUNGLE POTION", "MOVIE", "CABINET KEY",
+	"DISPLAY CASE KEY", "FLITCH', 27h, 'S CAR KEYS", "COAT HANGER",
+	"CROWBAR", "COMPASS", "MAP", "LETTER OPENER", "LETTER",
+	"DECODER", "DIPPED DART", "LOADED BLOWGUN", "CARD", "JERRYCAN",
+	"CIGARETTES", "BIKE PUMP", "PARACHUTE", "PESO", "PEPPERS",
+	"MACHETE", "POISON ROOT", "AMMUNITION", "PADDLE", "FISHING NET",
+	"RAT TRAP", "CHEESE", "LOADED TRAP", "KNIFE", "CHOPPED PEPPERS",
+	"LIGHTER", "LADDER", "SMALL POLE", "JEEP KEY", "CHAIN", "ARROW",
+	"FILLED JERRY CAN", "EXPLOSIVES", "GEIGER COUNTER", "VINE",
+	"GOLD NUGGET", "HOLLOW REED", "AMAZON QUEEN KEYS", "FISHING POLE",
+	"HARPOON", "RAG", "BOTTLE OF RUM", "RAG IN BOTTLE", "MOLOTOV COCKTAIL",
+	"JUNGLE PLANT", "LADLE", "WORM", "FISH", "FIREWORKS", "BAITED POLE",
+	"FILLED LADLE", "EMERALD", "SMALL KEY", "SCROLL", "LIT EXPLOSIVES",
+	"LIGHTER", "BROKEN SPEAR", "SHOE LACES", "TORCH", "LACES AND SPEAR",
+	"KNIFE SPEAR", "GARBAGE CAN", "RAFT", "INFLATED RAFT",
+	"JASON'S CAR KEYS", "PESO BILLS", "PLANK"
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 7601138835..c9e3fe98e6 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -39,6 +39,8 @@ extern const byte *ROOM_TABLE[];
 
 extern const byte *CHARTBL[];
 
+extern const char *const INVENTORY_NAMES[];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
new file mode 100644
index 0000000000..b36c5346a5
--- /dev/null
+++ b/engines/access/inventory.cpp
@@ -0,0 +1,61 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/inventory.h"
+#include "access/access.h"
+#include "access/amazon/amazon_resources.h"
+
+namespace Access {
+
+InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
+	_startInvItem = 0;
+	_startInvBox = 0;
+	_invChangeFlag = true;
+	_startAboutItem = 0;
+	_startTravelItem = 0;
+
+	const char *const *names = Amazon::INVENTORY_NAMES;
+	switch (vm->getGameID()) {
+	case GType_Amazon:
+		_inv.resize(85);
+		break;
+	default:
+		error("Unknown game");
+	}
+
+	for (uint i = 0; i < _inv.size(); ++i)
+		_names.push_back(names[i]);
+}
+
+int &InventoryManager::operator[](int idx) {
+	return _inv[idx];
+}
+
+int InventoryManager::useItem() { 
+	return _vm->_flags[USE_ITEM_FLAG_INDEX]; 
+}
+
+void InventoryManager::setUseItem(int itemId) { 
+	_vm->_flags[USE_ITEM_FLAG_INDEX] = itemId; 
+}
+
+} // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
new file mode 100644
index 0000000000..2f1248e8b2
--- /dev/null
+++ b/engines/access/inventory.h
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_INVENTORY_H
+#define ACCESS_INVENTORY_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "common/str-array.h"
+#include "access/data.h"
+
+namespace Access {
+
+#define USE_ITEM_FLAG_INDEX 100
+
+class InventoryManager : public Manager {
+public:
+	Common::Array<int> _inv;
+	Common::StringArray _names;
+	int _startInvItem;
+	int _startInvBox;
+	bool _invChangeFlag;
+	int _startAboutItem;
+	int _startTravelItem;
+public:
+	InventoryManager(AccessEngine *vm);
+	
+	int &operator[](int idx);
+
+	int useItem();
+	void setUseItem(int itemId);
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_INVENTORY_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 24c237a18f..7c089fefb3 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -10,6 +10,7 @@ MODULE_OBJS := \
 	detection.o \
 	events.o \
 	files.o \
+	inventory.o \
 	player.o \
 	resources.o \
 	room.o \
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index bc86e09fcb..66b16e9826 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -87,7 +87,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
 		&Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::CMDANIM,
 		&Scripts::cmdSetFlag, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, 
-		&Scripts::CMDSETINV, &Scripts::CMDSETINV, &Scripts::CMDCHECKINV, 
+		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::CMDCHECKFRAME, &Scripts::CMDCHECKANIM, &Scripts::CMDSND, 
 		&Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
@@ -175,7 +175,7 @@ void Scripts::CMDANIM() { }
 void Scripts::cmdSetFlag() { 
 	int flagNum = _data->readByte();
 	byte flagVal = _data->readByte();
-	assert(flagNum < 100);
+
 	_vm->_flags[flagNum] = flagVal;
 }
 
@@ -195,8 +195,26 @@ void Scripts::cmdGoto() {
 	searchForSequence();
 }
 
-void Scripts::CMDSETINV() { }
-void Scripts::CMDCHECKINV() { }
+void Scripts::cmdSetInventory() { 
+	int itemId = _data->readByte();
+	int itemVal = _data->readByte();
+
+	(*_vm->_inventory)[itemId] = itemVal;
+	_vm->_inventory->_startInvItem = 0;
+	_vm->_inventory->_startInvBox = 0;
+	_vm->_inventory->_invChangeFlag = true;
+}
+
+void Scripts::cmdCheckInventory() { 
+	int itemId = _data->readUint16LE();
+	int itemVal = _data->readUint16LE();
+
+	if ((*_vm->_inventory)[itemId] == itemVal)
+		cmdGoto();
+	else
+		_data->skip(2);
+}
+
 void Scripts::CMDSETTEX() { }
 void Scripts::CMDNEWROOM() { }
 void Scripts::CMDCONVERSE() { }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 4375934b7c..6bf69c4ee3 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -61,8 +61,8 @@ protected:
 	 */
 	void cmdGoto();
 	
-	void CMDSETINV();
-	void CMDCHECKINV();
+	void cmdSetInventory();
+	void cmdCheckInventory();
 	void CMDSETTEX();
 	void CMDNEWROOM();
 	void CMDCONVERSE();
-- 
cgit v1.2.3


From 127a0eeadd16719e212c19d7938158d75f51568e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 18:28:33 -0400
Subject: ACCESS: Cleanup of Amazon game flags

---
 engines/access/access.cpp             | 21 +++------------------
 engines/access/access.h               | 24 +++++++-----------------
 engines/access/amazon/amazon_game.cpp |  8 ++++++--
 engines/access/amazon/amazon_game.h   | 15 +++++++++++++++
 engines/access/inventory.cpp          |  4 ++--
 engines/access/inventory.h            |  2 --
 6 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index ee524d7afe..122a8a0882 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -30,7 +30,8 @@
 namespace Access {
 
 AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
-		_gameDescription(gameDesc), Engine(syst), _randomSource("Access") {
+		_gameDescription(gameDesc), Engine(syst), _randomSource("Access"),
+		_useItem(_flags[100]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
 	_animation = nullptr;
 	_debugger = nullptr;
 	_events = nullptr;
@@ -80,27 +81,11 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_intTim[3] = 0;
 	_timer[3] = 0;
 	_timerFlag = false;
-	Common::fill(&_flags[0], &_flags[99], 0);
-	Common::fill(&_useItem[0], &_useItem[23], 0);
 	Common::fill(&_establishTable[0], &_establishTable[100], 0);
+	Common::fill(&_flags[0], &_flags[256], 0);
 	_establishFlag = false;
 	_establishMode = 0;
 	_establishGroup = 0;
-	_guardLoc = 0;
-	_guardFind = 0;
-	_helpLevel = 0;
-	_jasMayaFlag = 0;
-	_moreHelp = 0;
-	_startup = 0;
-	_flashbackFlag = false;
-	_manScaleOff = 0;
-	_riverFlag = false;
-	_antOutFlag = false;
-	_badEnd = 0;
-	_noHints = false;
-	_antFlag = false;
-	_allenFlag = false;
-	_noSound = false;
 	Common::fill(&_help1[0], &_help1[366], 0);
 	Common::fill(&_help2[0], &_help2[366], 0);
 	Common::fill(&_help1[0], &_help3[366], 0);
diff --git a/engines/access/access.h b/engines/access/access.h
index 0fa2c149cd..99bc201b07 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -164,23 +164,7 @@ public:
 	int _intTim[3];
 	int _timer[3];
 	bool _timerFlag;
-	Common::Array<int> _flags;
-	byte _useItem[23];
-	int _guardLoc;
-	int _guardFind;
-	int _helpLevel;
-	int _jasMayaFlag;
-	int _moreHelp;
-	int _startup;
-	bool _flashbackFlag;
-	int _manScaleOff;
-	bool _riverFlag;
-	bool _antOutFlag;
-	int _badEnd;
-	bool _noHints;
-	bool _antFlag;
-	bool _allenFlag;
-	bool _noSound;
+	int _flags[256];
 	byte _help1[366];
 	byte _help2[366];
 	byte _help3[366];
@@ -195,6 +179,12 @@ public:
 	int _rKeyFlag;
 	int _mapOffset;
 	int _screenVirtX;
+
+	// Fields mapped into the flags array
+	int &_useItem;
+	int &_startup;
+	int &_manScaleOff;
+
 public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 8267c8549a..9c516168de 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -31,7 +31,12 @@ namespace Access {
 namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
-		AccessEngine(syst, gameDesc) {
+		AccessEngine(syst, gameDesc),
+		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]), 
+		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
+		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), 
+		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]), 
+		_noSound(_flags[239]) {
 	_skipStart = false;
 
 	_canoeLane = 0;
@@ -47,7 +52,6 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
-	_flags.resize(122);
 }
 
 AmazonEngine::~AmazonEngine() {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index b998b1de83..c927ad90d7 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -48,6 +48,21 @@ private:
 	int _inactiveYOff;
 	int _esTabTable[100];
 
+	// Fields that are mapped to flags
+	int &_guardLocation;
+	int &_guardFind;
+	int &_helpLevel;
+	int &_jasMayaFlag;
+	int &_moreHelp;
+	int &_flashbackFlag;
+	int &_riverFlag;
+	int &_aniOutFlag;
+	int &_badEnd;
+	int &_noHints;
+	int &_aniFlag;
+	int &_allenFlag;
+	int &_noSound;
+
 	/**
 	 * Do the game introduction
 	 */
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index b36c5346a5..5d2957bd30 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -51,11 +51,11 @@ int &InventoryManager::operator[](int idx) {
 }
 
 int InventoryManager::useItem() { 
-	return _vm->_flags[USE_ITEM_FLAG_INDEX]; 
+	return _vm->_useItem;
 }
 
 void InventoryManager::setUseItem(int itemId) { 
-	_vm->_flags[USE_ITEM_FLAG_INDEX] = itemId; 
+	_vm->_useItem = itemId; 
 }
 
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 2f1248e8b2..1f229dd8ee 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -31,8 +31,6 @@
 
 namespace Access {
 
-#define USE_ITEM_FLAG_INDEX 100
-
 class InventoryManager : public Manager {
 public:
 	Common::Array<int> _inv;
-- 
cgit v1.2.3


From 33f432d9891fd07a9d8d6130ef76a8bb14b13a4b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 19:18:10 -0400
Subject: ACCESS: Fix skipping bytes in executeScript method

---
 engines/access/scripts.cpp | 11 ++++++-----
 engines/access/scripts.h   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 66b16e9826..dc3c62a9c1 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -70,8 +70,8 @@ int Scripts::executeScript() {
 
 	do {
 		// Get next command, skipping over script start start if it's being pointed to
-		for (_scriptCommand = _data->readByte(); _scriptCommand == SCRIPT_START_BYTE;
-			_data->skip(2));
+		while ((_scriptCommand = _data->readByte()) == SCRIPT_START_BYTE)
+			_data->skip(2);
 
 		assert(_scriptCommand >= 0x80);
 		executeCommand(_scriptCommand - 0x80);
@@ -86,7 +86,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
 		&Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::CMDANIM,
-		&Scripts::cmdSetFlag, &Scripts::CMDCHECKFLAG, &Scripts::cmdGoto, 
+		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::CMDCHECKFRAME, &Scripts::CMDCHECKANIM, &Scripts::CMDSND, 
@@ -176,15 +176,16 @@ void Scripts::cmdSetFlag() {
 	int flagNum = _data->readByte();
 	byte flagVal = _data->readByte();
 
+	assert(flagNum < 256);
 	_vm->_flags[flagNum] = flagVal;
 }
 
-void Scripts::CMDCHECKFLAG() { 
+void Scripts::cmdCheckFlag() { 
 	int flagNum = _data->readUint16LE();
 	int flagVal = _data->readUint16LE();
 	assert(flagNum < 100);
 
-	if (_vm->_flags[flagNum] == (flagVal & 0xff))
+	if (_vm->_flags[flagNum] == flagVal)
 		cmdGoto();
 	else
 		_data->skip(2);
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 6bf69c4ee3..30bffe8112 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -54,7 +54,7 @@ protected:
 	void cmdRetPos();
 	void CMDANIM();
 	void cmdSetFlag();
-	void CMDCHECKFLAG();
+	void cmdCheckFlag();
 	
 	/**
 	 * Jump to another script
-- 
cgit v1.2.3


From f495d390993a8a0d1e785c71fa36553fab17f90b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 Aug 2014 01:44:24 +0200
Subject: ACCESS: Implement some more opcodes

---
 engines/access/animation.h |  3 +--
 engines/access/scripts.cpp | 31 +++++++++++++++++++++++++------
 engines/access/scripts.h   |  6 +++---
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/engines/access/animation.h b/engines/access/animation.h
index 010fab98ac..879d1e9318 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -32,8 +32,6 @@ namespace Access {
 class Animation;
 
 class AnimationManager : public Manager {
-private:
-	Animation *findAnimation(int animId);
 public:
 	const byte *_anim;
 	Animation *_animation;
@@ -44,6 +42,7 @@ public:
 	void freeAnimationData();
 	void clearTimers();
 
+	Animation *findAnimation(int animId);
 	Animation *setAnimation(int animId);
 
 	void setAnimTimer(Animation *anim);
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index dc3c62a9c1..fe53c675c2 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -89,14 +89,14 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
-		&Scripts::CMDCHECKFRAME, &Scripts::CMDCHECKANIM, &Scripts::CMDSND, 
+		&Scripts::CMDCHECKFRAME, &Scripts::cmdCheckAnim, &Scripts::CMDSND, 
 		&Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
 		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
 		&Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY, &Scripts::CMDSETBUFFER, 
 		&Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
-		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::CMDREMOVELAST, 
+		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmeRemoveLast, 
 		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, 
 		&Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
@@ -105,7 +105,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
-		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::CMDFADEOUT,
+		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
 		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, 
 		&Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
 		&Scripts::cmdMainPanel, &Scripts::CMDRETFLASH
@@ -220,7 +220,18 @@ void Scripts::CMDSETTEX() { }
 void Scripts::CMDNEWROOM() { }
 void Scripts::CMDCONVERSE() { }
 void Scripts::CMDCHECKFRAME() { }
-void Scripts::CMDCHECKANIM() { }
+
+void Scripts::cmdCheckAnim() {
+	int id = _data->readUint16LE();
+	Animation *anim = _vm->_animation->findAnimation(id);
+
+	if (anim->_currentLoopCount == -1) {
+		_data->skip(2);
+		cmdGoto();
+	} else
+		_data->skip(4);
+}
+
 void Scripts::CMDSND() { }
 void Scripts::CMDRETNEG() { }
 
@@ -258,7 +269,11 @@ void Scripts::CMDSETSCROLL() { }
 void Scripts::CMDSAVERECT() { }
 void Scripts::CMDSETBUFVID() { }
 void Scripts::CMDPLAYBUFVID() { }
-void Scripts::CMDREMOVELAST() { }
+
+void Scripts::cmeRemoveLast() {
+	--_vm->_numAnimTimers;
+}
+
 void Scripts::CMDSPECIAL() { }
 void Scripts::CMDSETCYCLE() { }
 void Scripts::CMDCYCLE() { }
@@ -286,7 +301,11 @@ void Scripts::cmdPlayerOn() {
 }
 
 void Scripts::CMDDEAD() { }
-void Scripts::CMDFADEOUT() { }
+
+void Scripts::cmdFadeOut() {
+	_vm->_screen->forceFadeOut();
+}
+
 void Scripts::CMDENDVID() { }
 void Scripts::CMDHELP() { }
 void Scripts::CMDCYCLEBACK() { }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 30bffe8112..79ae478cc9 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -67,7 +67,7 @@ protected:
 	void CMDNEWROOM();
 	void CMDCONVERSE();
 	void CMDCHECKFRAME();
-	void CMDCHECKANIM();
+	void cmdCheckAnim();
 	void CMDSND();
 	void CMDRETNEG();
 	void cmdCheckLoc();
@@ -85,7 +85,7 @@ protected:
 	void CMDSAVERECT();
 	void CMDSETBUFVID();
 	void CMDPLAYBUFVID();
-	void CMDREMOVELAST();
+	void cmeRemoveLast();
 	void CMDSPECIAL();
 	void CMDSETCYCLE();
 	void CMDCYCLE();
@@ -106,7 +106,7 @@ protected:
 	void cmdPlayerOff();
 	void cmdPlayerOn();
 	void CMDDEAD();
-	void CMDFADEOUT();
+	void cmdFadeOut();
 	void CMDENDVID();
 	void CMDHELP();
 	void CMDCYCLEBACK();
-- 
cgit v1.2.3


From c1613178c3c89d6a088814eeeeffc6935852140f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 22:07:28 -0400
Subject: ACCESS: Implemented player loading

---
 engines/access/access.cpp    |   1 -
 engines/access/asurface.cpp  |   9 ----
 engines/access/asurface.h    |   5 ---
 engines/access/player.cpp    | 103 +++++++++++++++++++++++++++++++++++++++----
 engines/access/player.h      |  13 +++++-
 engines/access/resources.cpp |  25 +++++++++++
 engines/access/resources.h   |  25 +++++++++++
 engines/access/screen.cpp    |  12 +++++
 engines/access/screen.h      |   5 +++
 9 files changed, 173 insertions(+), 25 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 122a8a0882..d0bc1a8846 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -118,7 +118,6 @@ AccessEngine::~AccessEngine() {
 	_buffer2.free();
 
 	freeCells();
-	delete[] _man;
 	delete[] _man1;
 	delete[] _inactive;
 	delete[] _manPal1;
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index b791186e03..a0a790dbdc 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -30,13 +30,4 @@ void ASurface::clearBuffer() {
 	Common::fill(pSrc, pSrc + w * h, 0);
 }
 
-void ASurface::setScaleTable(int scale) {
-	int total = 0;
-	for (int idx = 0; idx < 256; ++idx) {
-		_scaleTable1[idx] = total >> 8;
-		_scaleTable2[idx] = total & 0xff;
-		total += scale;
-	}
-}
-
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 857067684f..ace1b2382c 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -30,15 +30,10 @@
 namespace Access {
 
 class ASurface : public Graphics::Surface {
-private:
-	byte _scaleTable1[256];
-	byte _scaleTable2[256];
 public:
 	void clearBuffer();
 
 	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
-
-	void setScaleTable(int scale);
 };
 
 } // End of namespace Access
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index e4ef0eb48e..f0cceb7180 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -20,19 +20,22 @@
  *
  */
 
-#include "access/player.h"
 #include "common/algorithm.h"
 #include "common/textconsole.h"
+#include "access/player.h"
+#include "access/access.h"
+#include "access/resources.h"
 
 namespace Access {
 
-Player::Player(AccessEngine *vm): _vm(vm) {
-	_field0 = 0;
-	_monData = nullptr;
+Player::Player(AccessEngine *vm): Manager(vm) {
 	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffUp[0], &_walkOffUp[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffDown[0], &_walkOffDown[PLAYER_DATA_COUNT], 0);
+
+	_field0 = 0;
+	_monData = nullptr;
 	_rawTempL = 0;
 	_rawXTemp = 0;
 	_rawYTempL = 0;
@@ -42,18 +45,102 @@ Player::Player(AccessEngine *vm): _vm(vm) {
 	_playerYLow = 0;
 	_playerY = 0;
 	_frame = 0;
-
 	_playerOff = false;
-
+	_leftDelta = _rightDelta = 0;
+	_upDelta = _downDelta = 0;
+	_scrollConst = 0;
 	_roomNumber = 0;
 }
 
 void Player::load() {
-	// TODO
+	if (_vm->_room->_roomFlag == 3) {
+		_playerOffset.x = _vm->_screen->_scaleTable1[8];
+		_playerOffset.y = _vm->_screen->_scaleTable1[11];
+		_leftDelta = 0;
+		_rightDelta = 8;
+		_upDelta = 2;
+		_downDelta = -2;
+		_scrollConst = 2;
+
+		for (int i = 0; i < PLAYER_DATA_COUNT; ++i) {
+			_walkOffRight[i] = OVEROFFR[i];
+			_walkOffLeft[i] = OVEROFFL[i];
+			_walkOffUp[i] = OVEROFFU[i];
+			_walkOffDown[i] = OVEROFFD[i];
+			_walkOffUR[i].x = OVEROFFURX[i];
+			_walkOffUR[i].y = OVEROFFURY[i];
+			_walkOffDR[i].x = OVEROFFDRX[i];
+			_walkOffDR[i].y = OVEROFFDRY[i];
+			_walkOffUL[i].x = OVEROFFULX[i];
+			_walkOffUL[i].y = OVEROFFULY[i];
+			_walkOffDL[i].x = OVEROFFDLX[i];
+			_walkOffDL[i].y = OVEROFFDLY[i];
+		}
+
+		_vm->_timers[8]._initTm = 7;
+		_vm->_timers[8]._timer = 7;
+		_vm->_timers[8]._flag = true;
+
+		_sideWalkMin = 0;
+		_sideWalkMax = 5;
+		_upWalkMin = 12;
+		_upWalkMax = 17;
+		_downWalkMin = 6;
+		_downWalkMax = 11;
+		_diagUpWalkMin = 0;
+		_diagUpWalkMax = 5;
+		_diagDownWalkMin = 0;
+		_diagDownWalkMax = 5;
+		_guard = Common::Point(56, 190);
+	} else {
+		_playerOffset.x = _vm->_screen->_scaleTable1[25];
+		_playerOffset.y = _vm->_screen->_scaleTable1[67];
+		_leftDelta = -3;
+		_rightDelta = 33;
+		_upDelta = 5;
+		_downDelta = -10;
+		_scrollConst = 5;
+
+		for (int i = 0; i < PLAYER_DATA_COUNT; ++i) {
+			_walkOffRight[i] = SIDEOFFR[i];
+			_walkOffLeft[i] = SIDEOFFL[i];
+			_walkOffUp[i] = SIDEOFFU[i];
+			_walkOffDown[i] = SIDEOFFD[i];
+			_walkOffUR[i].x = DIAGOFFURX[i];
+			_walkOffUR[i].y = DIAGOFFURY[i];
+			_walkOffDR[i].x = DIAGOFFDRX[i];
+			_walkOffDR[i].y = DIAGOFFDRY[i];
+			_walkOffUL[i].x = DIAGOFFULX[i];
+			_walkOffUL[i].y = DIAGOFFULY[i];
+			_walkOffDL[i].x = DIAGOFFDLX[i];
+			_walkOffDL[i].y = DIAGOFFDLY[i];
+		}
+
+		_sideWalkMin = 0;
+		_sideWalkMax = 7;
+		_upWalkMin = 16;
+		_upWalkMax = 23;
+		_downWalkMin = 8;
+		_downWalkMax = 15;
+		_diagUpWalkMin = 0;
+		_diagUpWalkMax = 7;
+		_diagDownWalkMin = 0;
+		_diagDownWalkMax = 7;
+	}
+
+	_vm->_man = _vm->_man1;
+	Common::copy(_vm->_manPal1 + 0x270, _vm->_manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
 }
 
 void Player::calcManScale() {
-	// TODO
+	if (!_vm->_manScaleOff) {
+		_vm->_scale = (((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
+			_vm->_scaleT1 + (_vm->_scaleH2 << 8)) / _vm->_scaleH1 * _vm->_scaleI) >> 8;
+		_vm->_screen->setScaleTable(_vm->_scale);
+
+		_playerOffset.x = _vm->_screen->_scaleTable1[20];
+		_playerOffset.y = _vm->_screen->_scaleTable1[67];
+	}
 }
 
 void Player::walk() {
diff --git a/engines/access/player.h b/engines/access/player.h
index ec6b53fc2a..7625fa2cc7 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
+#include "access/data.h"
 
 namespace Access {
 
@@ -32,9 +33,17 @@ namespace Access {
 
 class AccessEngine;
 
-class Player {
+class Player: public Manager {
 private:
-	AccessEngine *_vm;
+	int _leftDelta, _rightDelta;
+	int _upDelta, _downDelta;
+	int _scrollConst;
+	int _sideWalkMin, _sideWalkMax;
+	int _upWalkMin, _upWalkMax;
+	int _downWalkMin, _downWalkMax;
+	int _diagUpWalkMin, _diagUpWalkMax;
+	int _diagDownWalkMin, _diagDownWalkMax;
+	Common::Point _guard;
 public:
 	// Fields in original Player structure
 	int _field0;
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 8aa44b470b..841ab70f04 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -46,4 +46,29 @@ const byte INITIAL_PALETTE[18 * 3] = {
 	0x00, 0x00, 0x00
 };
 
+const int SIDEOFFR[] = { 5, 5, 5, 5, 5, 5, 5, 5, 0 };
+const int SIDEOFFL[] = { 5, 5, 5, 5, 5, 5, 5, 5, 0 };
+const int SIDEOFFU[] = { 2, 2, 2, 2, 2, 2, 2, 2, 0 };
+const int SIDEOFFD[] = { 2, 2, 2, 2, 2, 2, 2, 2, 0 };
+const int DIAGOFFURX[] = { 4, 5, 2, 2, 3, 4, 2, 2, 0 };
+const int DIAGOFFURY[] = { 2, 3, 2, 2, 2, 3, 1, 1, 0 };
+const int DIAGOFFDRX[] = { 4, 5, 4, 3, 5, 4, 5, 1, 0 };
+const int DIAGOFFDRY[] = { 3, 2, 1, 2, 2, 1, 2, 1, 0 };
+const int DIAGOFFULX[] = { 4, 5, 4, 3, 3, 2, 2, 2, 0 };
+const int DIAGOFFULY[] = { 3, 3, 1, 2, 2, 1, 1, 1, 0 };
+const int DIAGOFFDLX[] = { 4, 5, 3, 3, 5, 4, 6, 1, 0 };
+const int DIAGOFFDLY[] = { 2, 2, 1, 2, 3, 1, 2, 1, 0 };
+const int OVEROFFR[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 };
+const int OVEROFFL[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 };
+const int OVEROFFU[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 };
+const int OVEROFFD[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 };
+const int OVEROFFURX[] = { 3, 1, 1, 2, 2, 1, 0, 0, 0 };
+const int OVEROFFURY[] = { 1, 0, 0, 1, 1, 0, 0, 0, 0 };
+const int OVEROFFDRX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
+const int OVEROFFDRY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
+const int OVEROFFULX[] = { 2, 1, 1, 1, 2, 1, 0, 0, 0 };
+const int OVEROFFULY[] = { 1, 0, 0, 2, 1, 0, 0, 0, 0 };
+const int OVEROFFDLX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
+const int OVEROFFDLY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
+
 } // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 47d4e3ac8c..1b49b598ca 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -29,6 +29,31 @@ namespace Access {
 
 extern const byte INITIAL_PALETTE[18 * 3];
 
+extern const int SIDEOFFR[];
+extern const int SIDEOFFL[];
+extern const int SIDEOFFU[];
+extern const int SIDEOFFD[];
+extern const int DIAGOFFURX[];
+extern const int DIAGOFFURY[];
+extern const int DIAGOFFDRX[];
+extern const int DIAGOFFDRY[];
+extern const int DIAGOFFULX[];
+extern const int DIAGOFFULY[];
+extern const int DIAGOFFDLX[];
+extern const int DIAGOFFDLY[];
+extern const int OVEROFFR[];
+extern const int OVEROFFL[];
+extern const int OVEROFFU[];
+extern const int OVEROFFD[];
+extern const int OVEROFFURX[];
+extern const int OVEROFFURY[];
+extern const int OVEROFFDRX[];
+extern const int OVEROFFDRY[];
+extern const int OVEROFFULX[];
+extern const int OVEROFFULY[];
+extern const int OVEROFFDLX[];
+extern const int OVEROFFDLY[];
+
 } // End of namespace Access
 
 #endif /* ACCESS_RESOURCES_H */
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 428c3d5df8..45379b6a51 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -35,6 +35,9 @@ namespace Access {
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
+	Common::fill(&_manPal[0], &_manPal[0x60], 0);
+	Common::fill(&_scaleTable1[0], &_scaleTable1[256], 0);
+	Common::fill(&_scaleTable2[0], &_scaleTable2[256], 0);
 	_vesaMode = 0;
 	_vesaCurrentWin = 0;
 	_currentPanel = 0;
@@ -224,4 +227,13 @@ void Screen::setBufferScan() {
 	// TODO
 }
 
+void Screen::setScaleTable(int scale) {
+	int total = 0;
+	for (int idx = 0; idx < 256; ++idx) {
+		_scaleTable1[idx] = total >> 8;
+		_scaleTable2[idx] = total & 0xff;
+		total += scale;
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index c4beacf17c..69a28bdce1 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -62,6 +62,9 @@ public:
 	Common::Point _vWindowSize;
 	int _scrollX, _scrollY;
 	int _scrollCol, _scrollRow;
+	byte _manPal[0x60];
+	byte _scaleTable1[256];
+	byte _scaleTable2[256];
 public:
 	Screen(AccessEngine *vm);
 
@@ -119,6 +122,8 @@ public:
 	void copyRects();
 
 	void setBufferScan();
+
+	void setScaleTable(int scale);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 9d590687e99cfee4b20dce5224edd78b33d61fd5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Aug 2014 22:24:35 -0400
Subject: ACCESS: Implemented roomMenu

---
 engines/access/access.h               |  2 +-
 engines/access/amazon/amazon_game.cpp |  2 +-
 engines/access/amazon/amazon_room.cpp | 15 ++++++++++++++-
 engines/access/amazon/amazon_room.h   |  3 +++
 engines/access/screen.cpp             | 22 +++++++++++++++-------
 engines/access/screen.h               |  4 ++++
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 99bc201b07..e6a3f332c6 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -113,7 +113,7 @@ public:
 	Scripts *_scripts;
 	SoundManager *_sound;
 
-	byte *_destIn;
+	ASurface *_destIn;
 	ASurface _buffer1;
 	ASurface _buffer2;
 	byte *_objectsTable[100];
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 9c516168de..d1ba0e0258 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -109,7 +109,7 @@ void AmazonEngine::doIntroduction() {
 
 void AmazonEngine::doTitle() {
 	_screen->setDisplayScan();
-	_destIn = (byte *)_buffer2.getPixels();
+	_destIn = &_buffer2;
 
 	_screen->forceFadeOut();
 	_events->hideCursor();
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index df2a6b759d..565b1ccada 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -31,6 +31,10 @@ namespace Amazon {
 
 AmazonRoom::AmazonRoom(AccessEngine *vm): Room(vm) {
 	_antOutFlag = false;
+	_icon = nullptr;
+}
+
+AmazonRoom::~AmazonRoom() {
 }
 
 void AmazonRoom::loadRoom(int roomNumber) {
@@ -118,7 +122,16 @@ void AmazonRoom::roomSet() {
 }
 
 void AmazonRoom::roomMenu() {
-	// TODO
+	_icon = _vm->_files->loadFile("ICONS.LZ");
+	_vm->_screen->saveScreen();
+	_vm->_screen->setDisplayScan();
+	_vm->_destIn = _vm->_screen;
+	_vm->_screen->plotImage(_icon, 0, Common::Point(0, 177));
+	_vm->_screen->plotImage(_icon, 1, Common::Point(143, 177));
+
+	_vm->_screen->restoreScan();
+	delete[] _icon;
+	_icon = nullptr;
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 006aef54f6..546ea9698a 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -35,6 +35,7 @@ namespace Amazon {
 class AmazonRoom : public Room {
 private:
 	bool _antOutFlag;
+	const byte *_icon;
 
 	void roomSet();
 
@@ -47,6 +48,8 @@ protected:
 	virtual void reloadRoom1();
 public:
 	AmazonRoom(AccessEngine *vm);
+
+	virtual ~AmazonRoom();
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 45379b6a51..6a241d0c2b 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -200,31 +200,35 @@ bool Screen::clip(Common::Rect &r) {
 }
 
 void Screen::checkScroll() {
-	// TODO
+	warning("TODO");
 }
 
 void Screen::copyBF1BF2() {
-	// TODO
+	warning("TODO");
 }
 
 void Screen::copyBF2Vid() {
-	// TODO
+	warning("TODO");
 }
 
 void Screen::plotList() {
-	// TODO
+	warning("TODO: plotList");
 }
 
 void Screen::copyBlocks() {
-	// TODO
+	warning("TODO: copyBlocks");
 }
 
 void Screen::copyRects() {
-	// TODO
+	warning("TODO: copyRects");
 }
 
 void Screen::setBufferScan() {
-	// TODO
+	warning("TODO: setBufferScan");
+}
+
+void Screen::restoreScan() {
+	warning("TODO: restoreScan");
 }
 
 void Screen::setScaleTable(int scale) {
@@ -236,4 +240,8 @@ void Screen::setScaleTable(int scale) {
 	}
 }
 
+void Screen::saveScreen() {
+	warning("TODO: saveScreen");
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 69a28bdce1..a2eac29312 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -70,6 +70,8 @@ public:
 
 	void setDisplayScan();
 
+	void restoreScan();
+
 	void setPanel(int num);
 
 	/**
@@ -124,6 +126,8 @@ public:
 	void setBufferScan();
 
 	void setScaleTable(int scale);
+
+	void saveScreen();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 00901b200bffcbff69694ff6b54d55908fd74180 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 Aug 2014 14:49:46 +0200
Subject: ACCESS: Fix bug in reloadRoom1

---
 engines/access/amazon/amazon_room.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 565b1ccada..5627325f6e 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -72,7 +72,7 @@ void AmazonRoom::reloadRoom() {
 }
 
 void AmazonRoom::reloadRoom1() {
-	if (_vm->_player->_roomNumber == 22 || _vm->_player->_roomNumber == 31 
+	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		_vm->_inactive = _vm->_files->loadFile("MAYA.LZ");
 		_vm->_currentCharFlag = false;
-- 
cgit v1.2.3


From cce0c2ff97878b2b0b8a87e25395c3ef98bc584e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 11:47:15 -0400
Subject: ACCESS: Adding sprite resources and screen saving

---
 engines/access/access.h               |  3 +-
 engines/access/amazon/amazon_game.cpp |  6 ++-
 engines/access/amazon/amazon_room.cpp | 16 ++++---
 engines/access/asurface.cpp           | 76 +++++++++++++++++++++++++++++
 engines/access/asurface.h             | 14 ++++++
 engines/access/data.cpp               | 39 ++++++++++++++-
 engines/access/data.h                 | 23 +++++++++
 engines/access/player.cpp             |  6 ++-
 engines/access/screen.cpp             | 90 +++++++++++------------------------
 engines/access/screen.h               | 34 +++++++++----
 10 files changed, 223 insertions(+), 84 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index e6a3f332c6..c93a1b32e5 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -58,7 +58,8 @@ namespace Access {
 
 enum {
 	GType_Amazon = 1,
-	GType_MeanStreets = 2
+	GType_MeanStreets = 2,
+	GType_Noctropolis = 3
 };
 
 enum AccessDebugChannels {
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d1ba0e0258..5c2cda61aa 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -126,6 +126,8 @@ void AmazonEngine::doTitle() {
 	_sound->playSound(1);
 
 	_objectsTable[0] = _files->loadFile(0, 2);
+	SpriteResource *spr = new SpriteResource(this, _objectsTable[0], _files->_filesize);
+
 	_sound->playSound(1);
 
 	_screen->_loadPalFlag = false;
@@ -141,9 +143,11 @@ void AmazonEngine::doTitle() {
 		_buffer2.copyFrom(_buffer1);
 		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
-		_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
+		_screen->plotImage(spr, id, Common::Point(xp, 71));
 	}
 	// TODO: More to do
+
+	delete spr;
 }
 
 void AmazonEngine::doOpening() {
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 5627325f6e..056fa8f1eb 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -122,16 +122,18 @@ void AmazonRoom::roomSet() {
 }
 
 void AmazonRoom::roomMenu() {
-	_icon = _vm->_files->loadFile("ICONS.LZ");
+	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, _icon, _vm->_files->_filesize);
+	delete[] iconData;
+
 	_vm->_screen->saveScreen();
 	_vm->_screen->setDisplayScan();
-	_vm->_destIn = _vm->_screen;
-	_vm->_screen->plotImage(_icon, 0, Common::Point(0, 177));
-	_vm->_screen->plotImage(_icon, 1, Common::Point(143, 177));
+	_vm->_destIn = _vm->_screen;	// TODO: Redundant
+	_vm->_screen->plotImage(spr, 0, Common::Point(0, 177));
+	_vm->_screen->plotImage(spr, 1, Common::Point(143, 177));
 
-	_vm->_screen->restoreScan();
-	delete[] _icon;
-	_icon = nullptr;
+	_vm->_screen->restoreScreen();
+	delete spr;
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index a0a790dbdc..0fb8f7d43a 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -25,9 +25,85 @@
 
 namespace Access {
 
+
+/*------------------------------------------------------------------------*/
+
+int ASurface::_leftSkip;
+int ASurface::_rightSkip;
+int ASurface::_topSkip;
+int ASurface::_bottomSkip;
+int ASurface::_clipWidth;
+int ASurface::_clipHeight;
+int ASurface::_lastBoundsX;
+int ASurface::_lastBoundsY;
+int ASurface::_lastBoundsW;
+int ASurface::_lastBoundsH;
+
 void ASurface::clearBuffer() {
 	byte *pSrc = (byte *)getPixels();
 	Common::fill(pSrc, pSrc + w * h, 0);
 }
 
+bool ASurface::clip(Common::Rect &r) {
+	int skip;
+	_leftSkip = _rightSkip = 0;
+	_topSkip = _bottomSkip = 0;
+
+	if (r.left > _clipWidth) {
+		skip = -r.left;
+		r.setWidth(r.width() - skip);
+		_leftSkip = skip;
+		r.moveTo(0, r.top);
+	}
+	else if (r.left >= 0)
+		return true;
+
+	int right = r.right - 1;
+	if (right < 0)
+		return true;
+	else if (right > _clipWidth) {
+		skip = right - _clipWidth;
+		r.setWidth(r.width() - skip);
+		_rightSkip = skip;
+	}
+
+	if (r.top > _clipHeight) {
+		skip = -r.top;
+		r.setHeight(r.height() - skip);
+		_topSkip = skip;
+		r.moveTo(r.left, 0);
+	}
+	else if (r.top >= 0)
+		return true;
+
+	int bottom = r.bottom - 1;
+	if (bottom < 0)
+		return true;
+	else if (bottom > _clipHeight) {
+		skip = bottom - _clipHeight;
+		_bottomSkip = skip;
+		r.setHeight(r.height() - skip);
+	}
+
+	return false;
+}
+
+void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt) {
+	SpriteFrame *frame = sprite->getFrame(frameNum);
+	Common::Rect r(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h);
+
+	if (!clip(r)) {
+		_lastBoundsX = r.left;
+		_lastBoundsY = r.top;
+		_lastBoundsW = r.width();
+		_lastBoundsH = r.height();
+
+//		plotImage(frame, , )
+	}
+}
+
+void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
+
+}
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index ace1b2382c..7d1ee6c57a 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -24,16 +24,30 @@
 #define ACCESS_ASURFACE_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
+#include "access/data.h"
 
 namespace Access {
 
 class ASurface : public Graphics::Surface {
+public:
+	static int _leftSkip, _rightSkip;
+	static int _topSkip, _bottomSkip;
+	static int _clipWidth, _clipHeight;
+	static int _lastBoundsX, _lastBoundsY;
+	static int _lastBoundsW, _lastBoundsH;
+protected:
+	virtual void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt);
 public:
 	void clearBuffer();
 
 	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
+
+	bool clip(Common::Rect &r);
+
+	void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
 };
 
 } // End of namespace Access
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 0ef1845892..ed913c9be9 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -20,10 +20,47 @@
  *
  */
 
-#include "access/data.h"
 #include "common/algorithm.h"
+#include "common/endian.h"
+#include "common/memstream.h"
+#include "access/access.h"
+#include "access/data.h"
 
 namespace Access {
 
+SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size) {
+	Common::MemoryReadStream stream(data, size);
+	Common::Array<uint32> offsets;
+	int count = stream.readUint16LE();
+
+	for (int i = 0; i < count; i++)
+		offsets.push_back(stream.readUint32LE());
+	offsets.push_back(size);	// For easier calculations of Noctropolis sizes
+
+	// Build up the frames
+	for (int i = 0; i < count; ++i) {
+		stream.seek(offsets[i]);
+
+		SpriteFrame *frame = new SpriteFrame();
+		frame->_width = stream.readUint16LE();
+		frame->_height = stream.readUint16LE();
+		frame->_size = (vm->getGameID() == GType_MeanStreets) ? stream.readUint16LE() :
+			offsets[i + 1] - offsets[i];
+
+		frame->_data = new byte[frame->_size];
+		stream.read(frame->_data, frame->_size);
+
+		_frames.push_back(frame);
+	}
+}
+
+SpriteResource::~SpriteResource() {
+	for (uint i = 0; i < _frames.size(); ++i)
+		delete _frames[i];
+}
+
+SpriteFrame::~SpriteFrame() {
+	delete[] _data;
+}
 
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index cf8394baf9..bd1e1563fc 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -24,7 +24,9 @@
 #define ACCESS_DATA_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
 #include "common/rect.h"
+#include "graphics/surface.h"
 
 namespace Access {
 
@@ -56,6 +58,27 @@ public:
 	int _vidSTable1;
 };
 
+class SpriteFrame : public Graphics::Surface {
+public:
+	uint16 _width, _height;
+	byte *_data;
+	uint32 _size;
+
+	~SpriteFrame();
+};
+
+class SpriteResource {
+public:
+	Common::Array<SpriteFrame *> _frames;
+public:
+	SpriteResource(AccessEngine *vm, const byte *data, uint32 size);
+	~SpriteResource();
+
+	int getCount() { return _frames.size(); }
+
+	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
+};
+
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index f0cceb7180..b28e6c92bc 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -129,7 +129,11 @@ void Player::load() {
 	}
 
 	_vm->_man = _vm->_man1;
-	Common::copy(_vm->_manPal1 + 0x270, _vm->_manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
+	if (_vm->_manPal1) {
+		Common::copy(_vm->_manPal1 + 0x270, _vm->_manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
+	} else {
+		Common::fill(_vm->_screen->_manPal + 0x270, _vm->_screen->_manPal + 0x270 + 0x60, 0);
+	}
 }
 
 void Player::calcManScale() {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 6a241d0c2b..c1a4d9143c 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -43,15 +43,13 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_currentPanel = 0;
 	_hideFlag = true;
 	_loadPalFlag = false;
-	_leftSkip = _rightSkip = 0;
-	_topSkip = _bottomSkip = 0;
-	_clipWidth = _clipHeight = 0;
 	_scrollFlag = false;
 	_scrollThreshold = 0;
 	_startColor = _numColors = 0;
 	_scrollX = _scrollY = 0;
 	_scrollCol = _scrollRow = 0;
-
+	_windowXAdd = _windowYAdd = 0;
+	_screenYOff = 0;
 }
 
 void Screen::setDisplayScan() {
@@ -145,60 +143,6 @@ void Screen::copyBuffer(const byte *data) {
 	g_system->copyRectToScreen(destP, w, 0, 0, w, h);
 }
 
-void Screen::plotImage(const byte *pData, int idx, const Common::Point &pt) {
-	const byte *sizeP = pData + READ_LE_UINT16(pData + idx * 4);
-	int w = READ_LE_UINT16(sizeP);
-	int h = READ_LE_UINT16(sizeP + 2);
-	Common::Rect r(pt.x, pt.y, pt.x + w, pt.y + h);
-
-	if (!clip(r)) {
-		_lastBounds = r;
-		//plotf();
-	}
-}
-
-bool Screen::clip(Common::Rect &r) {
-	int skip;
-	_leftSkip = _rightSkip = 0;
-	_topSkip = _bottomSkip = 0;
-
-	if (r.left > _clipWidth) {
-		skip = -r.left;
-		r.setWidth(r.width() - skip);
-		_leftSkip = skip;
-		r.moveTo(0, r.top);
-	} else if (r.left >= 0)
-		return true;
-
-	int right = r.right - 1;
-	if (right < 0)
-		return true;
-	else if (right > _clipWidth) {
-		skip = right - _clipWidth;
-		r.setWidth(r.width() - skip);
-		_rightSkip = skip;
-	}
-
-	if (r.top > _clipHeight) {
-		skip = -r.top;
-		r.setHeight(r.height() - skip);
-		_topSkip = skip;
-		r.moveTo(r.left, 0);
-	} else if (r.top >= 0)
-		return true;
-
-	int bottom = r.bottom - 1;
-	if (bottom < 0)
-		return true;
-	else if (bottom > _clipHeight) {
-		skip = bottom - _clipHeight;
-		_bottomSkip = skip;
-		r.setHeight(r.height() - skip);
-	}
-
-	return false;
-}
-
 void Screen::checkScroll() {
 	warning("TODO");
 }
@@ -227,10 +171,6 @@ void Screen::setBufferScan() {
 	warning("TODO: setBufferScan");
 }
 
-void Screen::restoreScan() {
-	warning("TODO: restoreScan");
-}
-
 void Screen::setScaleTable(int scale) {
 	int total = 0;
 	for (int idx = 0; idx < 256; ++idx) {
@@ -241,7 +181,31 @@ void Screen::setScaleTable(int scale) {
 }
 
 void Screen::saveScreen() {
-	warning("TODO: saveScreen");
+	_screenSave._clipWidth = _clipWidth;
+	_screenSave._clipHeight = _clipHeight;
+	_screenSave._windowXAdd = _windowXAdd;
+	_screenSave._windowYAdd = _windowYAdd;
+	_screenSave._scroll.x = _scrollX;
+	_screenSave._scroll.y = _scrollY;
+	_screenSave._scrollCol = _scrollCol;
+	_screenSave._scrollRow = _scrollRow;
+	_screenSave._bufferStart.x = _bufferStart.x;
+	_screenSave._bufferStart.y = _bufferStart.y;
+	_screenSave._screenYOff = _screenYOff;
+}
+
+void Screen::restoreScreen() {
+	_clipWidth = _screenSave._clipWidth;
+	_clipHeight = _screenSave._clipHeight;
+	_windowXAdd = _screenSave._windowXAdd;
+	_windowYAdd = _screenSave._windowYAdd;
+	_scrollX = _screenSave._scroll.x;
+	_scrollY = _screenSave._scroll.y;
+	_scrollCol = _screenSave._scrollCol;
+	_scrollRow = _screenSave._scrollRow;
+	_bufferStart.x = _screenSave._bufferStart.x;
+	_bufferStart.y = _screenSave._bufferStart.y;
+	_screenYOff = _screenSave._screenYOff;
 }
 
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index a2eac29312..8dc56d273c 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -35,6 +35,18 @@ class AccessEngine;
 #define PALETTE_COUNT 256
 #define PALETTE_SIZE (256 * 3)
 
+struct ScreenSave {
+	int _clipWidth;
+	int _clipHeight;
+	int _windowXAdd;
+	int _windowYAdd;
+	Common::Point _scroll;
+	int _scrollCol;
+	int _scrollRow;
+	Common::Point _bufferStart;
+	int _screenYOff;
+};
+
 class Screen: public ASurface {
 private:
 	AccessEngine *_vm;
@@ -45,14 +57,9 @@ private:
 	Common::Point _msVirtualOffset;
 	Common::Point _virtualOffsetsTable[4];
 	bool _hideFlag;
-	Common::Rect _lastBounds;
-	int _leftSkip, _rightSkip;
-	int _topSkip, _bottomSkip;
-	int _clipWidth, _clipHeight;
+	ScreenSave _screenSave;
 
 	void updatePalette();
-
-	bool clip(Common::Rect &r);
 public:
 	int _vesaMode;
 	bool _loadPalFlag;
@@ -60,8 +67,11 @@ public:
 	int _scrollThreshold;
 	int _startColor, _numColors;
 	Common::Point _vWindowSize;
+	Common::Point _bufferStart;
 	int _scrollX, _scrollY;
 	int _scrollCol, _scrollRow;
+	int _windowXAdd, _windowYAdd;
+	int _screenYOff;
 	byte _manPal[0x60];
 	byte _scaleTable1[256];
 	byte _scaleTable2[256];
@@ -70,8 +80,6 @@ public:
 
 	void setDisplayScan();
 
-	void restoreScan();
-
 	void setPanel(int num);
 
 	/**
@@ -109,8 +117,6 @@ public:
 	 */
 	void copyBuffer(const byte *data);
 
-	void plotImage(const byte *pData, int idx, const Common::Point &pt);
-
 	void checkScroll();
 
 	void copyBF1BF2();
@@ -127,7 +133,15 @@ public:
 
 	void setScaleTable(int scale);
 
+	/**
+	 * Save all the screen display state variables
+	 */
 	void saveScreen();
+
+	/**
+	 * Restores previously saved screen display state variables
+	 */
+	void restoreScreen();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 00f7a3404db0598429f6c733a15d766675624b36 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 Aug 2014 17:49:44 +0200
Subject: ACCESS: Implement 3 more opcodes

---
 engines/access/access.cpp  |  1 +
 engines/access/access.h    |  1 +
 engines/access/scripts.cpp | 29 ++++++++++++++++++++++++-----
 engines/access/scripts.h   |  6 +++---
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index d0bc1a8846..dc9bf527eb 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -44,6 +44,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_sound = nullptr;
 
 	_destIn = nullptr;
+	_current = nullptr;
 	clearCellTable();
 	_pCount = 0;
 	_selectCommand = 0;
diff --git a/engines/access/access.h b/engines/access/access.h
index c93a1b32e5..0733ab4bef 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -115,6 +115,7 @@ public:
 	SoundManager *_sound;
 
 	ASurface *_destIn;
+	ASurface *_current;
 	ASurface _buffer1;
 	ASurface _buffer2;
 	byte *_objectsTable[100];
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index fe53c675c2..2a825212fd 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -90,11 +90,11 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::CMDCHECKFRAME, &Scripts::cmdCheckAnim, &Scripts::CMDSND, 
-		&Scripts::CMDRETNEG, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
+		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
 		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
-		&Scripts::CMDPLOTIMAGE, &Scripts::CMDSETDISPLAY, &Scripts::CMDSETBUFFER, 
+		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::CMDSETBUFFER, 
 		&Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmeRemoveLast, 
 		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
@@ -233,7 +233,11 @@ void Scripts::cmdCheckAnim() {
 }
 
 void Scripts::CMDSND() { }
-void Scripts::CMDRETNEG() { }
+
+void Scripts::cmdRetNeg() {
+	_endFlag = true;
+	_returnCode = -1;
+}
 
 void Scripts::cmdCheckLoc() {
 	int minX = _data->readUint16LE();
@@ -262,8 +266,23 @@ void Scripts::CMDCHECKTIMER() { }
 void Scripts::CMDSETTRAVEL() { }
 void Scripts::CMDSETVID() { }
 void Scripts::CMDPLAYVID() { }
-void Scripts::CMDPLOTIMAGE() { }
-void Scripts::CMDSETDISPLAY() { }
+
+void Scripts::cmdPlotImage() {
+	_vm->_destIn = _vm->_current;
+
+	int destX = _data->readUint16LE();
+	int destY = _data->readUint16LE();
+	int objId = _data->readUint16LE();
+	int imgId = _data->readUint16LE();
+
+	_vm->_screen->plotImage(_vm->_objectsTable[objId], imgId, Common::Point(destX, destY));
+}
+
+void Scripts::cmdSetDisplay() {
+	_vm->_screen->setDisplayScan();
+	_vm->_current = _vm->_screen;
+}
+
 void Scripts::CMDSETBUFFER() { }
 void Scripts::CMDSETSCROLL() { }
 void Scripts::CMDSAVERECT() { }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 79ae478cc9..0bdc746d78 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -69,7 +69,7 @@ protected:
 	void CMDCHECKFRAME();
 	void cmdCheckAnim();
 	void CMDSND();
-	void CMDRETNEG();
+	void cmdRetNeg();
 	void cmdCheckLoc();
 	void cmdSetAnim();
 	void CMDDISPINV();
@@ -78,8 +78,8 @@ protected:
 	void CMDSETTRAVEL();
 	void CMDSETVID();
 	void CMDPLAYVID();
-	void CMDPLOTIMAGE();
-	void CMDSETDISPLAY();
+	void cmdPlotImage();
+	void cmdSetDisplay();
 	void CMDSETBUFFER();
 	void CMDSETSCROLL();
 	void CMDSAVERECT();
-- 
cgit v1.2.3


From ba1f8b2f6bf7362d011d01aa7106e5bd6d38366d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 Aug 2014 17:52:34 +0200
Subject: ACCESS: Fix typo in variable name

---
 engines/access/access.cpp | 2 +-
 engines/access/access.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index dc9bf527eb..d194d8497f 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -94,7 +94,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_ask = 0;
 	_rScrollRow = 0;
 	_rScrollCol = 0;
-	_rSrcollX = 0;
+	_rScrollX = 0;
 	_rScrollY = 0;
 	_rOldRectCount = 0;
 	_rNewRectCount = 0;
diff --git a/engines/access/access.h b/engines/access/access.h
index 0733ab4bef..873eb3d0f7 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -174,7 +174,7 @@ public:
 	int _ask;
 	int _rScrollRow;
 	int _rScrollCol;
-	int _rSrcollX;
+	int _rScrollX;
 	int _rScrollY;
 	int _rOldRectCount;
 	int _rNewRectCount;
-- 
cgit v1.2.3


From 0e3f9e983d51759e0d6373e95c71b2130e7f181c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 11:56:14 -0400
Subject: ACCESS: Changed _objectsTable from raw data array to SpriteResource
 array

---
 engines/access/access.cpp             | 10 +++++++---
 engines/access/access.h               |  2 +-
 engines/access/amazon/amazon_game.cpp |  9 +++++----
 engines/access/data.cpp               |  6 +++++-
 engines/access/data.h                 |  4 +++-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index d194d8497f..27300f86a2 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -192,13 +192,17 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 
 void AccessEngine::loadCells(Common::Array<RoomInfo::CellIdent> &cells) {
 	for (uint i = 0; i < cells.size(); ++i) {
-		_objectsTable[cells[i]._cell] = _files->loadFile(
-			cells[i]._fileNum, cells[i]._subfile);
+		byte *spriteData = _files->loadFile(cells[i]._fileNum, cells[i]._subfile);
+		_objectsTable[cells[i]._cell] = new SpriteResource(this, 
+			spriteData, _files->_filesize, DisposeAfterUse::YES);
 	}
 }
 
 void AccessEngine::clearCellTable() {
-	Common::fill(&_objectsTable[0], &_objectsTable[100], (byte *)nullptr);
+	for (int i = 0; i < 100; ++i) {
+		delete _objectsTable[i];
+		_objectsTable[i] = nullptr;
+	}
 }
 
 void AccessEngine::freeCells() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 873eb3d0f7..5fa0aed1c7 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -118,7 +118,7 @@ public:
 	ASurface *_current;
 	ASurface _buffer1;
 	ASurface _buffer2;
-	byte *_objectsTable[100];
+	SpriteResource *_objectsTable[100];
 	int _establishTable[100];
 	bool _establishFlag;
 	int _establishMode;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 5c2cda61aa..fe158125b5 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -125,8 +125,9 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->playSound(1);
 
-	_objectsTable[0] = _files->loadFile(0, 2);
-	SpriteResource *spr = new SpriteResource(this, _objectsTable[0], _files->_filesize);
+	byte *spriteData = _files->loadFile(0, 2);
+	_objectsTable[0] = new SpriteResource(this, spriteData, _files->_filesize,
+		DisposeAfterUse::YES);
 
 	_sound->playSound(1);
 
@@ -143,11 +144,11 @@ void AmazonEngine::doTitle() {
 		_buffer2.copyFrom(_buffer1);
 		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
-		_screen->plotImage(spr, id, Common::Point(xp, 71));
+		_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
 	}
 	// TODO: More to do
 
-	delete spr;
+	delete _objectsTable[0];
 }
 
 void AmazonEngine::doOpening() {
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index ed913c9be9..3203020322 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -28,7 +28,8 @@
 
 namespace Access {
 
-SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size) {
+SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
+		DisposeAfterUse::Flag disposeMemory) {
 	Common::MemoryReadStream stream(data, size);
 	Common::Array<uint32> offsets;
 	int count = stream.readUint16LE();
@@ -52,6 +53,9 @@ SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size)
 
 		_frames.push_back(frame);
 	}
+
+	if (disposeMemory == DisposeAfterUse::YES)
+		delete[] data;
 }
 
 SpriteResource::~SpriteResource() {
diff --git a/engines/access/data.h b/engines/access/data.h
index bd1e1563fc..bb5ef90e55 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/types.h"
 #include "graphics/surface.h"
 
 namespace Access {
@@ -71,7 +72,8 @@ class SpriteResource {
 public:
 	Common::Array<SpriteFrame *> _frames;
 public:
-	SpriteResource(AccessEngine *vm, const byte *data, uint32 size);
+	SpriteResource(AccessEngine *vm, const byte *data, uint32 size, 
+		DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
 	~SpriteResource();
 
 	int getCount() { return _frames.size(); }
-- 
cgit v1.2.3


From 47d75ae128d2b29ace73925373901cf7bbc6325d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 15:50:22 -0400
Subject: ACCESS: Beginnings of logic for drawing sprite frames

---
 engines/access/access.cpp   |  1 +
 engines/access/asurface.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++--
 engines/access/asurface.h   |  5 ++++-
 engines/access/screen.cpp   |  1 -
 engines/access/screen.h     |  1 -
 5 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 27300f86a2..f625fa096a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -148,6 +148,7 @@ void AccessEngine::initialize() {
 	}
 
 	// Create sub-objects of the engine
+	ASurface::init();
 	_animation = new AnimationManager(this);
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 0fb8f7d43a..438bfbf852 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -38,6 +38,17 @@ int ASurface::_lastBoundsX;
 int ASurface::_lastBoundsY;
 int ASurface::_lastBoundsW;
 int ASurface::_lastBoundsH;
+int ASurface::_scrollX;
+int ASurface::_scrollY;
+
+void ASurface::init() {
+	_leftSkip = _rightSkip = 0;
+	_topSkip = _bottomSkip = 0;
+	_clipWidth = _clipHeight = 0;
+	_lastBoundsX = _lastBoundsY = 0;
+	_lastBoundsW = _lastBoundsH = 0;
+	_scrollX = _scrollY = 0;
+}
 
 void ASurface::clearBuffer() {
 	byte *pSrc = (byte *)getPixels();
@@ -98,12 +109,41 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 		_lastBoundsW = r.width();
 		_lastBoundsH = r.height();
 
-//		plotImage(frame, , )
+		plotFrame(frame, pt);
 	}
 }
 
-void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
+void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
+	byte *destP = (byte *)getBasePtr(pt.x, _scrollY + pt.y);
+	byte *srcP = frame->_data;
+	
+	int8 leftVal1 = 18;
+	int8 leftVal2 = -8;
+	if (_leftSkip) {
+		++leftVal2;
+		leftVal1 = -12;
+	}
+	int8 rightVal = (_rightSkip) ? -7 : -8;
 
+	// Skip over any lines of the frame
+	for (int yp = 0; yp < _topSkip; ++yp) {
+		srcP += *(srcP + 1) + 2;
+	}
+	
+	byte *srcLineP = srcP;
+	byte *destLineP = destP;
+	for (int yp = 0; yp < frame->h; ++yp, srcP = srcLineP, destP = destLineP) {
+		// Get length of line
+		int v = *srcP++;
+		int len = *srcP++;
+		srcLineP = srcP + len;
+		destLineP = destP + this->pitch;
+
+		// Draw the line of the frame
+		if (v != 0 || len != 0) {
+			warning("TODO: Line draw");
+		}
+	}
 }
 
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 7d1ee6c57a..d1e6b64a9e 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -38,8 +38,11 @@ public:
 	static int _clipWidth, _clipHeight;
 	static int _lastBoundsX, _lastBoundsY;
 	static int _lastBoundsW, _lastBoundsH;
+	static int _scrollX, _scrollY;
+
+	static void init();
 protected:
-	virtual void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt);
+	virtual void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt);
 public:
 	void clearBuffer();
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index c1a4d9143c..63fd98b566 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -46,7 +46,6 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_scrollFlag = false;
 	_scrollThreshold = 0;
 	_startColor = _numColors = 0;
-	_scrollX = _scrollY = 0;
 	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 8dc56d273c..f32761347b 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -68,7 +68,6 @@ public:
 	int _startColor, _numColors;
 	Common::Point _vWindowSize;
 	Common::Point _bufferStart;
-	int _scrollX, _scrollY;
 	int _scrollCol, _scrollRow;
 	int _windowXAdd, _windowYAdd;
 	int _screenYOff;
-- 
cgit v1.2.3


From 6801cb0855cef796ea22c969c9c9f25866cdfa72 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 16:55:06 -0400
Subject: ACCESS: Decompress sprite resource frames immediately on creation

---
 engines/access/access.cpp             |  2 +-
 engines/access/amazon/amazon_room.cpp |  2 +-
 engines/access/asurface.cpp           | 58 +++++++++++++++++++++++++++++++++++
 engines/access/asurface.h             | 20 ++++++++++++
 engines/access/data.cpp               | 42 -------------------------
 engines/access/data.h                 | 22 -------------
 6 files changed, 80 insertions(+), 66 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index f625fa096a..2f505c2ffa 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -45,7 +45,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 
 	_destIn = nullptr;
 	_current = nullptr;
-	clearCellTable();
 	_pCount = 0;
 	_selectCommand = 0;
 	_normalMouse = true;
@@ -82,6 +81,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_intTim[3] = 0;
 	_timer[3] = 0;
 	_timerFlag = false;
+	Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
 	Common::fill(&_establishTable[0], &_establishTable[100], 0);
 	Common::fill(&_flags[0], &_flags[256], 0);
 	_establishFlag = false;
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 056fa8f1eb..5b840afc2e 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -123,7 +123,7 @@ void AmazonRoom::roomSet() {
 
 void AmazonRoom::roomMenu() {
 	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
-	SpriteResource *spr = new SpriteResource(_vm, _icon, _vm->_files->_filesize);
+	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
 	delete[] iconData;
 
 	_vm->_screen->saveScreen();
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 438bfbf852..a9d97aa48c 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -21,10 +21,64 @@
  */
 
 #include "common/algorithm.h"
+#include "common/endian.h"
+#include "common/memstream.h"
+#include "access/access.h"
 #include "access/asurface.h"
 
 namespace Access {
 
+SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
+		DisposeAfterUse::Flag disposeMemory) {
+	Common::MemoryReadStream stream(data, size);
+	Common::Array<uint32> offsets;
+	int count = stream.readUint16LE();
+
+	for (int i = 0; i < count; i++)
+		offsets.push_back(stream.readUint32LE());
+	offsets.push_back(size);	// For easier calculations of Noctropolis sizes
+
+	// Build up the frames
+	for (int i = 0; i < count; ++i) {
+		stream.seek(offsets[i]);
+		int frameSize = offsets[i + 1] - offsets[i];
+
+		SpriteFrame *frame = new SpriteFrame(vm, stream, frameSize);
+		_frames.push_back(frame);
+	}
+
+	if (disposeMemory == DisposeAfterUse::YES)
+		delete[] data;
+}
+
+SpriteResource::~SpriteResource() {
+	for (uint i = 0; i < _frames.size(); ++i)
+		delete _frames[i];
+}
+
+SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize) {
+	int w = stream.readUint16LE();
+	int h = stream.readUint16LE();
+	create(w, h, Graphics::PixelFormat::createFormatCLUT8());
+	
+	// Empty surface
+	byte *data = (byte *)getPixels();
+	Common::fill(data, data + w * h, 0);
+	
+	// Decode the data
+	for (int y = 0; y < h; ++y) {
+		int offset = stream.readByte();
+		int len = stream.readByte();
+		assert((offset + len) <= w);
+
+		byte *destP = (byte *)getBasePtr(offset, y);
+		stream.read(destP, len);
+	}
+}
+
+SpriteFrame::~SpriteFrame() {
+	free();
+}
 
 /*------------------------------------------------------------------------*/
 
@@ -114,6 +168,9 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 }
 
 void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
+	return;
+
+/*
 	byte *destP = (byte *)getBasePtr(pt.x, _scrollY + pt.y);
 	byte *srcP = frame->_data;
 	
@@ -144,6 +201,7 @@ void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
 			warning("TODO: Line draw");
 		}
 	}
+	*/
 }
 
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index d1e6b64a9e..d726e6aeae 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -25,12 +25,32 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/memstream.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
 #include "access/data.h"
 
 namespace Access {
 
+class SpriteFrame : public Graphics::Surface {
+public:
+	SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize);
+	~SpriteFrame();
+};
+
+class SpriteResource {
+public:
+	Common::Array<SpriteFrame *> _frames;
+public:
+	SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
+		DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
+	~SpriteResource();
+
+	int getCount() { return _frames.size(); }
+
+	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
+};
+
 class ASurface : public Graphics::Surface {
 public:
 	static int _leftSkip, _rightSkip;
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 3203020322..c3a6bb3d90 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -21,50 +21,8 @@
  */
 
 #include "common/algorithm.h"
-#include "common/endian.h"
-#include "common/memstream.h"
-#include "access/access.h"
 #include "access/data.h"
 
 namespace Access {
 
-SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
-		DisposeAfterUse::Flag disposeMemory) {
-	Common::MemoryReadStream stream(data, size);
-	Common::Array<uint32> offsets;
-	int count = stream.readUint16LE();
-
-	for (int i = 0; i < count; i++)
-		offsets.push_back(stream.readUint32LE());
-	offsets.push_back(size);	// For easier calculations of Noctropolis sizes
-
-	// Build up the frames
-	for (int i = 0; i < count; ++i) {
-		stream.seek(offsets[i]);
-
-		SpriteFrame *frame = new SpriteFrame();
-		frame->_width = stream.readUint16LE();
-		frame->_height = stream.readUint16LE();
-		frame->_size = (vm->getGameID() == GType_MeanStreets) ? stream.readUint16LE() :
-			offsets[i + 1] - offsets[i];
-
-		frame->_data = new byte[frame->_size];
-		stream.read(frame->_data, frame->_size);
-
-		_frames.push_back(frame);
-	}
-
-	if (disposeMemory == DisposeAfterUse::YES)
-		delete[] data;
-}
-
-SpriteResource::~SpriteResource() {
-	for (uint i = 0; i < _frames.size(); ++i)
-		delete _frames[i];
-}
-
-SpriteFrame::~SpriteFrame() {
-	delete[] _data;
-}
-
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index bb5ef90e55..b9da858216 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -59,28 +59,6 @@ public:
 	int _vidSTable1;
 };
 
-class SpriteFrame : public Graphics::Surface {
-public:
-	uint16 _width, _height;
-	byte *_data;
-	uint32 _size;
-
-	~SpriteFrame();
-};
-
-class SpriteResource {
-public:
-	Common::Array<SpriteFrame *> _frames;
-public:
-	SpriteResource(AccessEngine *vm, const byte *data, uint32 size, 
-		DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
-	~SpriteResource();
-
-	int getCount() { return _frames.size(); }
-
-	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
-};
-
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
-- 
cgit v1.2.3


From b2596cab0edc0a4709fba872ca0c20a782caabe4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 18:36:34 -0400
Subject: ACCESS: Implement loadPlayField

---
 engines/access/access.cpp |  6 ----
 engines/access/access.h   |  2 --
 engines/access/room.cpp   | 92 +++++++++++++++++++++++++++++++++++++++++------
 engines/access/room.h     | 16 ++++++++-
 engines/access/screen.cpp |  6 +++-
 engines/access/screen.h   |  3 +-
 6 files changed, 103 insertions(+), 22 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 2f505c2ffa..a21a97c0b0 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -247,10 +247,4 @@ void AccessEngine::doEstablish(int v) {
 	warning("TODO: doEstablish");
 }
 
-void AccessEngine::loadPlayField(int fileNum, int subfile) {
-	// TODO
-}
-
-
-
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 5fa0aed1c7..26ae88e6fb 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -226,8 +226,6 @@ public:
 	void establish(int v);
 
 	void establishCenter(int v);
-
-	void loadPlayField(int fileNum, int subfile);
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e0acf1c32a..6f449268c6 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -35,7 +35,13 @@ Room::Room(AccessEngine *vm) : Manager(vm) {
 	_function = 0;
 	_roomFlag = 0;
 	_playField = nullptr;
+	_playFieldWidth = _playFieldHeight = 0;
+	_matrixSize = 0;
 	_tile = nullptr;
+	_vWindowWidth = _vWindowHeight = 0;
+	_vWindowBytesWide = 0;
+	_bufferBytesWide = 0;
+	_vWindowLinesTall = 0;
 }
 
 Room::~Room() {
@@ -181,7 +187,7 @@ void Room::loadRoomData(const byte *roomData) {
 	_vm->_scaleT1 = ((_vm->_scaleH2 - _vm->_scaleH1) << 8) / _vm->_scaleN1;
 
 	if (roomInfo._playFieldFile._fileNum != -1) {
-		_vm->loadPlayField(roomInfo._playFieldFile._fileNum,
+		loadPlayField(roomInfo._playFieldFile._fileNum,
 			roomInfo._playFieldFile._subfile);
 		setupRoom();
 
@@ -243,23 +249,23 @@ void Room::setupRoom() {
 	if (_roomFlag != 2)
 		setIconPalette();
 
-	if (_vm->_screen->_vWindowSize.x == _playFieldSize.x) {
+	if (_vWindowWidth == _playFieldWidth) {
 		_vm->_screen->_scrollX = 0;
 		_vm->_screen->_scrollCol = 0;
 	} else {
 		_vm->_screen->_scrollX = _vm->_player->_rawPlayer.x -
 			(_vm->_player->_rawPlayer.x >> 4);
 		int xp = MAX((_vm->_player->_rawPlayer.x >> 4) -
-			(_vm->_screen->_vWindowSize.x / 2), 0);
+			(_vWindowWidth / 2), 0);
 		_vm->_screen->_scrollCol = xp;
 
-		xp = xp + _vm->_screen->_vWindowSize.x - _playFieldSize.x;
+		xp = xp + _vWindowWidth - _playFieldWidth;
 		if (xp >= 0) {
 			_vm->_screen->_scrollCol = xp + 1;
 		}
 	}
 	
-	if (_vm->_screen->_vWindowSize.y == _playFieldSize.y) {
+	if (_vWindowHeight == _playFieldHeight) {
 		_vm->_screen->_scrollY = 0;
 		_vm->_screen->_scrollRow = 0;
 	}
@@ -267,10 +273,10 @@ void Room::setupRoom() {
 		_vm->_screen->_scrollY = _vm->_player->_rawPlayer.y -
 			(_vm->_player->_rawPlayer.y >> 4);
 		int yp = MAX((_vm->_player->_rawPlayer.y >> 4) -
-			(_vm->_screen->_vWindowSize.y / 2), 0);
+			(_vWindowHeight / 2), 0);
 		_vm->_screen->_scrollRow = yp;
 
-		yp = yp + _vm->_screen->_vWindowSize.y - _playFieldSize.y;
+		yp = yp + _vWindowHeight - _playFieldHeight;
 		if (yp >= 0) {
 			_vm->_screen->_scrollRow = yp + 1;
 		}
@@ -287,7 +293,7 @@ void Room::setWallCodes() {
 
 void Room::buildScreen() {
 	int scrollCol = _vm->_screen->_scrollCol;
-	int cnt = _vm->_screen->_vWindowSize.x + 1;
+	int cnt = _vWindowWidth + 1;
 	int offset = 0;
 
 	for (int idx = 0; idx < cnt, offset += TILE_WIDTH; ++idx) {
@@ -301,15 +307,15 @@ void Room::buildScreen() {
 
 void Room::buildColumn(int playX, int screenX) {
 	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
-		_playFieldSize.x + playX;
+		_playFieldWidth + playX;
 	byte *pDest = (byte *)_vm->_buffer1.getPixels();
 
-	for (int y = 0; y <= _vm->_screen->_vWindowSize.y; ++y) {
+	for (int y = 0; y <= _vWindowHeight; ++y) {
 		byte *pTile = _tile + (*pSrc << 8);
 
 		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
 			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
-			pDest += _vm->_screen->_vWindowSize.x;
+			pDest += _vWindowWidth;
 		}
 	}
 }
@@ -318,6 +324,70 @@ void Room::init4Quads() {
 	error("TODO: init4Quads");
 }
 
+void Room::loadPlayField(int fileNum, int subfile) {
+	byte *playData = _vm->_files->loadFile(fileNum, subfile);
+	Common::MemoryReadStream stream(playData + 0x10, _vm->_files->_filesize - 0x10);
+
+	// Copy the new palette
+	_vm->_screen->loadRawPalette(&stream);
+
+	// Copy off the tile data
+	_tileSize = playData[2] << 8;
+	_tile = new byte[_tileSize];
+	stream.read(_tile, _tileSize);
+
+	// Copy off the playfield data
+	_matrixSize = playData[0] * playData[1];
+	_playField = new byte[_matrixSize];
+	stream.read(_playField, _matrixSize);
+
+	// Load the plotter data
+	int numWalls = READ_LE_UINT16(playData + 6);
+	int numBlocks = playData[8];
+	_plotter.load(&stream, numWalls, numBlocks);
+
+	_vWindowWidth = playData[3];
+	_vWindowBytesWide = _vWindowWidth << 4;
+	_bufferBytesWide = _vWindowBytesWide + 16;
+	_vWindowHeight = playData[4];
+	_vWindowLinesTall = _vWindowHeight << 4;
+
+	_vm->_screen->setBufferScan();
+	delete[] playData;
+}
+
+/*------------------------------------------------------------------------*/
+
+Plotter::Plotter() {
+	_delta = _blockIn = 0;
+}
+
+void Plotter::load(Common::SeekableReadStream *stream, int wallCount, int blockCount) {
+	// Load the wall count
+	_walls.resize(wallCount);
+	
+	for (int i = 0; i < wallCount; ++i)
+		_walls[i].left = stream->readSint16LE();
+	for (int i = 0; i < wallCount; ++i)
+		_walls[i].top = stream->readSint16LE();
+	for (int i = 0; i < wallCount; ++i)
+		_walls[i].right = stream->readSint16LE();
+	for (int i = 0; i < wallCount; ++i)
+		_walls[i].bottom = stream->readSint16LE();
+
+	// Load the block list
+	_blocks.resize(blockCount);
+
+	for (int i = 0; i < blockCount; ++i)
+		_blocks[i].left = stream->readSint16LE();
+	for (int i = 0; i < blockCount; ++i)
+		_blocks[i].top = stream->readSint16LE();
+	for (int i = 0; i < blockCount; ++i)
+		_blocks[i].right = stream->readSint16LE();
+	for (int i = 0; i < blockCount; ++i)
+		_blocks[i].bottom = stream->readSint16LE();
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
diff --git a/engines/access/room.h b/engines/access/room.h
index 72963371d6..0c19308469 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -36,6 +36,10 @@ public:
 	Common::Array<Common::Rect> _blocks;
 	int _blockIn;
 	int _delta;
+public:
+	Plotter();
+
+	void load(Common::SeekableReadStream *stream, int wallCount, int blockCount);
 };
 
 class JetFrame {
@@ -54,6 +58,8 @@ public:
 class Room: public Manager {
 private:
 	void roomLoop();
+
+	void loadPlayField(int fileNum, int subfile);
 protected:
 	void loadRoomData(const byte *roomData);
 	void setupRoom();
@@ -86,8 +92,16 @@ public:
 	int _function;
 	int _roomFlag;
 	byte *_playField;
-	Common::Point _playFieldSize;
+	int _matrixSize;
+	int _playFieldWidth;
+	int _playFieldHeight;
 	byte *_tile;
+	int _tileSize;
+	int _vWindowWidth;
+	int _vWindowHeight;
+	int _vWindowBytesWide;
+	int _bufferBytesWide;
+	int _vWindowLinesTall;
 public:
 	Room(AccessEngine *vm);
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 63fd98b566..b2cb7da8cc 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -73,7 +73,7 @@ void Screen::setInitialPalettte() {
 }
 
 void Screen::loadPalette(Common::SeekableReadStream *stream) {
-	stream->read(&_rawPalette[0], PALETTE_SIZE);
+	loadRawPalette(stream);
 	setPalette();
 	_loadPalFlag = true;
 }
@@ -88,6 +88,10 @@ void Screen::setPalette() {
 	g_system->getPaletteManager()->setPalette(&_rawPalette[0], 0, PALETTE_COUNT);
 }
 
+void Screen::loadRawPalette(Common::SeekableReadStream *stream) {
+	stream->read(&_rawPalette[0], PALETTE_SIZE);
+}
+
 void Screen::updatePalette() {
 	g_system->getPaletteManager()->setPalette(&_tempPalette[0], 0, PALETTE_COUNT);
 	updateScreen();
diff --git a/engines/access/screen.h b/engines/access/screen.h
index f32761347b..45db7d0fb1 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -66,7 +66,6 @@ public:
 	bool _scrollFlag;
 	int _scrollThreshold;
 	int _startColor, _numColors;
-	Common::Point _vWindowSize;
 	Common::Point _bufferStart;
 	int _scrollCol, _scrollRow;
 	int _windowXAdd, _windowYAdd;
@@ -111,6 +110,8 @@ public:
 
 	void setPalette();
 
+	void loadRawPalette(Common::SeekableReadStream *stream);
+
 	/**
 	 * Copy a buffer to the screen
 	 */
-- 
cgit v1.2.3


From 6f2bc7fc1f5426a01d196e5a61faafbb7b40ad13 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 11 Aug 2014 00:52:03 +0200
Subject: ACCESS: Implement 2 opcodes

---
 engines/access/scripts.cpp | 24 +++++++++++++++++++-----
 engines/access/scripts.h   |  4 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2a825212fd..a6ecfa3eff 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -92,10 +92,10 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDCHECKFRAME, &Scripts::cmdCheckAnim, &Scripts::CMDSND, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
-		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::CMDSETTRAVEL,
-		&Scripts::CMDSETTRAVEL, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
+		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::cmdSetTravel,
+		&Scripts::cmdSetTravel, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::CMDSETBUFFER, 
-		&Scripts::CMDSETSCROLL, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
+		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmeRemoveLast, 
 		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, 
@@ -263,7 +263,14 @@ void Scripts::cmdSetAnim() {
 void Scripts::CMDDISPINV() { }
 void Scripts::CMDSETTIMER() { }
 void Scripts::CMDCHECKTIMER() { }
-void Scripts::CMDSETTRAVEL() { }
+
+void Scripts::cmdSetTravel() {
+	if (_vm->_selectCommand == 5)
+		cmdGoto();
+	else
+		_data->skip(2);
+}
+
 void Scripts::CMDSETVID() { }
 void Scripts::CMDPLAYVID() { }
 
@@ -284,7 +291,14 @@ void Scripts::cmdSetDisplay() {
 }
 
 void Scripts::CMDSETBUFFER() { }
-void Scripts::CMDSETSCROLL() { }
+
+void Scripts::cmdSetScroll() {
+	_vm->_screen->_scrollCol = _data->readUint16LE();
+	_vm->_screen->_scrollRow = _data->readUint16LE();
+	_vm->_screen->_scrollX = 0;
+	_vm->_screen->_scrollY = 0;
+}
+
 void Scripts::CMDSAVERECT() { }
 void Scripts::CMDSETBUFVID() { }
 void Scripts::CMDPLAYBUFVID() { }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 0bdc746d78..3173c8a587 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -75,13 +75,13 @@ protected:
 	void CMDDISPINV();
 	void CMDSETTIMER();
 	void CMDCHECKTIMER();
-	void CMDSETTRAVEL();
+	void cmdSetTravel();
 	void CMDSETVID();
 	void CMDPLAYVID();
 	void cmdPlotImage();
 	void cmdSetDisplay();
 	void CMDSETBUFFER();
-	void CMDSETSCROLL();
+	void cmdSetScroll();
 	void CMDSAVERECT();
 	void CMDSETBUFVID();
 	void CMDPLAYBUFVID();
-- 
cgit v1.2.3


From e833ae66e2a90e539ad004983acbdae2e4ee94f3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 19:19:32 -0400
Subject: ACCESS: Fix loop in buildScreen

---
 engines/access/asurface.cpp | 18 +++++++++++++++++-
 engines/access/asurface.h   | 42 ++++++++++++++++++++++++------------------
 engines/access/room.cpp     |  2 +-
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index a9d97aa48c..3a381a10e5 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -168,7 +168,10 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 }
 
 void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
-	return;
+	frame->copyTo(this, pt);
+//	g_system->copyRectToScreen((byte *)getPixels(), 320, 0, 0, 320, 200);
+//	g_system->updateScreen();
+
 
 /*
 	byte *destP = (byte *)getBasePtr(pt.x, _scrollY + pt.y);
@@ -204,4 +207,17 @@ void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
 	*/
 }
 
+void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
+	for (int yp = 0; yp < h; ++yp) {
+		byte *srcP = (byte *)getBasePtr(0, yp);
+		byte *destP = (byte *)dest->getBasePtr(destPos.x, destPos.y + yp);
+
+		for (int xp = 0; xp < this->w; ++xp, ++srcP, ++destP) {
+			if (*srcP != 0)
+				*destP = *srcP;
+		}
+	}
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index d726e6aeae..c4dfc5442d 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -32,24 +32,8 @@
 
 namespace Access {
 
-class SpriteFrame : public Graphics::Surface {
-public:
-	SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize);
-	~SpriteFrame();
-};
-
-class SpriteResource {
-public:
-	Common::Array<SpriteFrame *> _frames;
-public:
-	SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
-		DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
-	~SpriteResource();
-
-	int getCount() { return _frames.size(); }
-
-	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
-};
+class SpriteResource;
+class SpriteFrame;
 
 class ASurface : public Graphics::Surface {
 public:
@@ -71,8 +55,30 @@ public:
 	bool clip(Common::Rect &r);
 
 	void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
+
+	void copyTo(ASurface *dest, const Common::Point &destPos);
 };
 
+class SpriteFrame : public ASurface {
+public:
+	SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize);
+	~SpriteFrame();
+};
+
+class SpriteResource {
+public:
+	Common::Array<SpriteFrame *> _frames;
+public:
+	SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
+		DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
+	~SpriteResource();
+
+	int getCount() { return _frames.size(); }
+
+	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
+};
+
+
 } // End of namespace Access
 
 #endif /* ACCESS_ASURFACE_H */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 6f449268c6..371b714467 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -296,7 +296,7 @@ void Room::buildScreen() {
 	int cnt = _vWindowWidth + 1;
 	int offset = 0;
 
-	for (int idx = 0; idx < cnt, offset += TILE_WIDTH; ++idx) {
+	for (int idx = 0; idx < cnt; offset += TILE_WIDTH, ++idx) {
 		buildColumn(_vm->_screen->_scrollCol, offset);
 		++_vm->_screen->_scrollCol;
 	}
-- 
cgit v1.2.3


From b6c946003198d84112e87cc2974eac6e9dc7c4f4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 19:42:33 -0400
Subject: ACCESS: Fix palette translation during loading

---
 engines/access/screen.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index b2cb7da8cc..bc913c5e78 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -32,6 +32,8 @@
 
 namespace Access {
 
+#define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
+
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
@@ -90,6 +92,8 @@ void Screen::setPalette() {
 
 void Screen::loadRawPalette(Common::SeekableReadStream *stream) {
 	stream->read(&_rawPalette[0], PALETTE_SIZE);
+	for (byte *p = &_rawPalette[0]; p < &_rawPalette[PALETTE_SIZE]; ++p)
+		*p = VGA_COLOR_TRANS(*p);
 }
 
 void Screen::updatePalette() {
-- 
cgit v1.2.3


From 69ecc15c028208f6b0f28d6df4d86d1a8ba7e26a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 22:25:30 -0400
Subject: ACCESS: Add decoding of animation resources

---
 engines/access/animation.cpp | 129 +++++++++++++++++++++++++++++++++++++++----
 engines/access/animation.h   |  53 ++++++++++++++++--
 engines/access/room.cpp      |   8 ++-
 engines/access/scripts.cpp   |  91 +++++++++++++++---------------
 engines/access/scripts.h     |   2 +-
 5 files changed, 219 insertions(+), 64 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 4d73801e5d..0d8589d4f1 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -21,24 +21,123 @@
  */
 
 #include "common/endian.h"
+#include "common/memstream.h"
 #include "access/animation.h"
 
 namespace Access {
 
+AnimationResource::AnimationResource(const byte *data, int size) {
+	Common::MemoryReadStream stream(data, size);
+	int count = stream.readUint16LE();
+
+	Common::Array<int> offsets;
+	for (int i = 0; i < count; ++i)
+		offsets.push_back(stream.readUint32LE());
+
+	_animations.reserve(count);
+	for (int i = 0; i < count; ++i) {
+		stream.seek(offsets[i]);
+		Animation *anim = new Animation(stream);
+		_animations.push_back(anim);
+	}
+}
+
+AnimationResource::~AnimationResource() {
+	for (int i = 0; i < (int)_animations.size(); ++i)
+		delete _animations[i];
+}
+
+/*------------------------------------------------------------------------*/
+
+Animation::Animation(Common::MemoryReadStream &stream) {
+	uint32 startOfs = stream.pos();
+
+	_type = stream.readByte();
+	_scaling = stream.readByte();
+	stream.readByte(); // unk
+	_frameNumber = stream.readByte();
+	_initialTicks = stream.readUint16LE();
+	stream.readUint16LE(); // unk
+	stream.readUint16LE(); // unk
+	_loopCount = stream.readUint16LE();
+	_countdownTicks = stream.readUint16LE();
+	_currentLoopCount = stream.readUint16LE();
+	stream.readUint16LE(); // unk
+
+	Common::Array<uint16> frameOffsets;
+	uint16 ofs;
+	while ((ofs = stream.readUint16LE()) != 0)
+		frameOffsets.push_back(ofs);
+
+	for (int i = 0; i < (int)frameOffsets.size(); i++) {
+		stream.seek(startOfs + frameOffsets[i]);
+
+		AnimationFrame *frame = new AnimationFrame(stream, startOfs);
+		_frames.push_back(frame);
+	}
+}
+
+Animation::~Animation() {
+	for (int i = 0; i < (int)_frames.size(); ++i)
+		delete _frames[i];
+}
+
+void Animation::animate() {
+	error("TODO");
+}
+
+/*------------------------------------------------------------------------*/
+
+AnimationFrame::AnimationFrame(Common::MemoryReadStream &stream, int startOffset) {
+	uint16 nextOffset;
+
+	stream.readByte(); // unk
+	_baseX = stream.readUint16LE();
+	_baseY = stream.readUint16LE();
+	_frameDelay = stream.readUint16LE();
+	nextOffset = stream.readUint16LE();
+
+	while (nextOffset != 0) {
+		stream.seek(startOffset + nextOffset);
+
+		AnimationFramePart *framePart = new AnimationFramePart(stream);
+		_parts.push_back(framePart);
+
+		nextOffset = stream.readUint16LE();
+	}
+}
+
+AnimationFrame::~AnimationFrame() {
+	for (int i = 0; i < (int)_parts.size(); ++i)
+		delete _parts[i];
+}
+
+/*------------------------------------------------------------------------*/
+
+AnimationFramePart::AnimationFramePart(Common::MemoryReadStream &stream) {
+	_flags = stream.readByte();
+	_slotIndex = stream.readByte();
+	_spriteIndex = stream.readByte();
+	_position.x = stream.readUint16LE();
+	_position.y = stream.readUint16LE();
+	_priority = stream.readUint16LE();
+}
+
+/*------------------------------------------------------------------------*/
+
 AnimationManager::AnimationManager(AccessEngine *vm) : Manager(vm) {
-	_anim = nullptr;
 	_animation = nullptr;
+	_animStart = nullptr;
 }
 
 AnimationManager::~AnimationManager() {
-	delete[] _anim;
 	delete _animation;
 }
 
 void AnimationManager::freeAnimationData() {
-	delete[] _anim;
-	_anim = nullptr;
+	delete _animation;
 	_animation = nullptr;
+	_animStart = nullptr;
 }
 
 void AnimationManager::clearTimers() {
@@ -48,10 +147,17 @@ void AnimationManager::clearTimers() {
 	_animationTimers.clear();
 }
 
+void AnimationManager::loadAnimations(const byte *data, int size) {
+	_animationTimers.clear();
+	delete _animation;
+	_animation = new AnimationResource(data,  size);
+}
+
+
 Animation *AnimationManager::setAnimation(int animId) {
 	Animation *anim = findAnimation(animId);
 
-	anim->_countdownTicks = anim->_ticks;
+	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
 
 	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 : 
@@ -62,18 +168,17 @@ Animation *AnimationManager::setAnimation(int animId) {
 }
 
 void AnimationManager::setAnimTimer(Animation *anim) {
-
+	_animationTimers.push_back(anim);
 }
 
 Animation *AnimationManager::findAnimation(int animId) {
-	_animation = new Animation(_anim + READ_LE_UINT16(_anim + animId * 4 + 2));
-	return _animation;
+	_animStart = _animation->getAnimation(animId);
+	return _animStart;
 }
 
-/*------------------------------------------------------------------------*/
-
-Animation::Animation(const byte *data) {
-
+void AnimationManager::animate(int animId) {
+	Animation *anim = findAnimation(animId);
+	anim->animate();
 }
 
 } // End of namespace Access
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 879d1e9318..45a59efb68 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -25,41 +25,86 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/memstream.h"
 #include "access/data.h"
 
 namespace Access {
 
+class AnimationResource;
 class Animation;
+class AnimationFrame;
+class AnimationFramePart;
 
 class AnimationManager : public Manager {
 public:
-	const byte *_anim;
-	Animation *_animation;
 	Common::Array<Animation *> _animationTimers;
+	AnimationResource *_animation;
+	Animation *_animStart;
 public:
 	AnimationManager(AccessEngine *vm);
 	~AnimationManager();
 	void freeAnimationData();
+	void loadAnimations(const byte *data, int size);
+	
 	void clearTimers();
 
 	Animation *findAnimation(int animId);
 	Animation *setAnimation(int animId);
 
 	void setAnimTimer(Animation *anim);
+
+	void animate(int animId);
+};
+
+class AnimationResource {
+private:
+	Common::Array<Animation *> _animations;
+public:
+	AnimationResource(const byte *data, int size);
+	~AnimationResource();
+
+	int getCount() { return _animations.size(); }
+	Animation *getAnimation(int idx) { return _animations[idx]; }
 };
 
 class Animation {
+private:
+	Common::Array<AnimationFrame *> _frames;
 public:
 	int _type;
 	int _scaling;
 	int _frameNumber;
-	int _ticks;
+	int _initialTicks;
 	int _loopCount;
 	int _countdownTicks;
 	int _currentLoopCount;
 	int _field10;
 public:
-	Animation(const byte *data);
+	Animation(Common::MemoryReadStream &stream);
+	~Animation();
+
+	void animate();
+};
+
+class AnimationFrame {
+public:
+	int _baseX, _baseY;
+	int _frameDelay;
+	Common::Array<AnimationFramePart *> _parts;
+public:
+	AnimationFrame(Common::MemoryReadStream &stream, int startOffset);
+	~AnimationFrame();
+};
+
+class AnimationFramePart {
+public:
+	byte _flags;
+	int _slotIndex;
+	int _spriteIndex;
+	Common::Point _position;
+	int _priority;
+public:
+	AnimationFramePart(Common::MemoryReadStream &stream);
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 371b714467..98e9d5ed6f 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -207,9 +207,11 @@ void Room::loadRoomData(const byte *roomData) {
 
 	// Load animation data
 	_vm->_animation->freeAnimationData();
-	if (roomInfo._animFile._fileNum != -1)
-		_vm->_animation->_anim = _vm->_files->loadFile(roomInfo._animFile._fileNum,
-		roomInfo._animFile._subfile);
+	if (roomInfo._animFile._fileNum != -1) {
+		byte *data = _vm->_files->loadFile(roomInfo._animFile._fileNum,
+			roomInfo._animFile._subfile);
+		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
+	}
 
 	_vm->_scaleI = roomInfo._scaleI;
 	_vm->_screen->_scrollThreshold = roomInfo._scrollThreshold;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index a6ecfa3eff..fd42530eb9 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -85,7 +85,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDOBJECT, &Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, 
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
-		&Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::CMDANIM,
+		&Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::cmdAnim,
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
@@ -114,9 +114,9 @@ void Scripts::executeCommand(int commandIndex) {
 	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::CMDOBJECT() { }
+void Scripts::CMDOBJECT() { error("TODO"); }
 
-void Scripts::CMDENDOBJECT() { }
+void Scripts::CMDENDOBJECT() { error("TODO"); }
 
 void Scripts::cmdJumpLook() {
 	if (_vm->_selectCommand == 0)
@@ -163,14 +163,17 @@ void Scripts::cmdJumpTalk() {
 void Scripts::cmdNull() {
 }
 
-void Scripts::CMDPRINT() { }
+void Scripts::CMDPRINT() { error("TODO"); }
 
 void Scripts::cmdRetPos() {
 	_endFlag = true;
 	_returnCode = 0;
 }
 
-void Scripts::CMDANIM() { }
+void Scripts::cmdAnim() { 
+	int animId = _data->readUint16LE();
+	_vm->_animation->animate(animId);
+}
 
 void Scripts::cmdSetFlag() { 
 	int flagNum = _data->readByte();
@@ -216,10 +219,10 @@ void Scripts::cmdCheckInventory() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSETTEX() { }
-void Scripts::CMDNEWROOM() { }
-void Scripts::CMDCONVERSE() { }
-void Scripts::CMDCHECKFRAME() { }
+void Scripts::CMDSETTEX() { error("TODO"); }
+void Scripts::CMDNEWROOM() { error("TODO"); }
+void Scripts::CMDCONVERSE() { error("TODO"); }
+void Scripts::CMDCHECKFRAME() { error("TODO"); }
 
 void Scripts::cmdCheckAnim() {
 	int id = _data->readUint16LE();
@@ -232,7 +235,7 @@ void Scripts::cmdCheckAnim() {
 		_data->skip(4);
 }
 
-void Scripts::CMDSND() { }
+void Scripts::CMDSND() { error("TODO"); }
 
 void Scripts::cmdRetNeg() {
 	_endFlag = true;
@@ -260,9 +263,9 @@ void Scripts::cmdSetAnim() {
 	_vm->_animation->setAnimTimer(anim);
 }
 
-void Scripts::CMDDISPINV() { }
-void Scripts::CMDSETTIMER() { }
-void Scripts::CMDCHECKTIMER() { }
+void Scripts::CMDDISPINV() { error("TODO"); }
+void Scripts::CMDSETTIMER() { error("TODO"); }
+void Scripts::CMDCHECKTIMER() { error("TODO"); }
 
 void Scripts::cmdSetTravel() {
 	if (_vm->_selectCommand == 5)
@@ -271,8 +274,8 @@ void Scripts::cmdSetTravel() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSETVID() { }
-void Scripts::CMDPLAYVID() { }
+void Scripts::CMDSETVID() { error("TODO"); }
+void Scripts::CMDPLAYVID() { error("TODO"); }
 
 void Scripts::cmdPlotImage() {
 	_vm->_destIn = _vm->_current;
@@ -290,7 +293,7 @@ void Scripts::cmdSetDisplay() {
 	_vm->_current = _vm->_screen;
 }
 
-void Scripts::CMDSETBUFFER() { }
+void Scripts::CMDSETBUFFER() { error("TODO"); }
 
 void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollCol = _data->readUint16LE();
@@ -299,31 +302,31 @@ void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollY = 0;
 }
 
-void Scripts::CMDSAVERECT() { }
-void Scripts::CMDSETBUFVID() { }
-void Scripts::CMDPLAYBUFVID() { }
+void Scripts::CMDSAVERECT() { error("TODO"); }
+void Scripts::CMDSETBUFVID() { error("TODO"); }
+void Scripts::CMDPLAYBUFVID() { error("TODO"); }
 
 void Scripts::cmeRemoveLast() {
 	--_vm->_numAnimTimers;
 }
 
-void Scripts::CMDSPECIAL() { }
-void Scripts::CMDSETCYCLE() { }
-void Scripts::CMDCYCLE() { }
-void Scripts::CMDCHARSPEAK() { }
-void Scripts::CMDTEXSPEAK() { }
-void Scripts::CMDTEXCHOICE() { }
-void Scripts::CMDWAIT() { }
-void Scripts::CMDSETCONPOS() { }
-void Scripts::CMDCHECKVFRAME() { }
-void Scripts::CMDJUMPCHOICE() { }
-void Scripts::CMDRETURNCHOICE() { }
-void Scripts::CMDCLEARBLOCK() { }
-void Scripts::CMDLOADSOUND() { }
-void Scripts::CMDFREESOUND() { }
-void Scripts::CMDSETVIDSND() { }
-void Scripts::CMDPLAYVIDSND() { }
-void Scripts::CMDPUSHLOCATION() { }
+void Scripts::CMDSPECIAL() { error("TODO"); }
+void Scripts::CMDSETCYCLE() { error("TODO"); }
+void Scripts::CMDCYCLE() { error("TODO"); }
+void Scripts::CMDCHARSPEAK() { error("TODO"); }
+void Scripts::CMDTEXSPEAK() { error("TODO"); }
+void Scripts::CMDTEXCHOICE() { error("TODO"); }
+void Scripts::CMDWAIT() { error("TODO"); }
+void Scripts::CMDSETCONPOS() { error("TODO"); }
+void Scripts::CMDCHECKVFRAME() { error("TODO"); }
+void Scripts::CMDJUMPCHOICE() { error("TODO"); }
+void Scripts::CMDRETURNCHOICE() { error("TODO"); }
+void Scripts::CMDCLEARBLOCK() { error("TODO"); }
+void Scripts::CMDLOADSOUND() { error("TODO"); }
+void Scripts::CMDFREESOUND() { error("TODO"); }
+void Scripts::CMDSETVIDSND() { error("TODO"); }
+void Scripts::CMDPLAYVIDSND() { error("TODO"); }
+void Scripts::CMDPUSHLOCATION() { error("TODO"); }
 
 void Scripts::cmdPlayerOff() {
 	_vm->_player->_playerOff = true;
@@ -333,18 +336,18 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::CMDDEAD() { }
+void Scripts::CMDDEAD() { error("TODO"); }
 
 void Scripts::cmdFadeOut() {
 	_vm->_screen->forceFadeOut();
 }
 
-void Scripts::CMDENDVID() { }
-void Scripts::CMDHELP() { }
-void Scripts::CMDCYCLEBACK() { }
-void Scripts::CMDCHAPTER() { }
-void Scripts::CMDSETHELP() { }
-void Scripts::CMDCENTERPANEL() { }
+void Scripts::CMDENDVID() { error("TODO"); }
+void Scripts::CMDHELP() { error("TODO"); }
+void Scripts::CMDCYCLEBACK() { error("TODO"); }
+void Scripts::CMDCHAPTER() { error("TODO"); }
+void Scripts::CMDSETHELP() { error("TODO"); }
+void Scripts::CMDCENTERPANEL() { error("TODO"); }
 
 void Scripts::cmdMainPanel() { 
 	if (_vm->_screen->_vesaMode) {
@@ -353,7 +356,7 @@ void Scripts::cmdMainPanel() {
 	}
 }
 
-void Scripts::CMDRETFLASH() { }
+void Scripts::CMDRETFLASH() { error("TODO"); }
 
 
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 3173c8a587..c8f951deae 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -52,7 +52,7 @@ protected:
 	void cmdNull();
 	void CMDPRINT();
 	void cmdRetPos();
-	void CMDANIM();
+	void cmdAnim();
 	void cmdSetFlag();
 	void cmdCheckFlag();
 	
-- 
cgit v1.2.3


From a0b9afded37693673485549d41d3b3513bcb2dab Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Aug 2014 23:17:53 -0400
Subject: ACCESS: Implemented animation anim methods

---
 engines/access/animation.cpp | 143 +++++++++++++++++++++++++++++++++++++++++--
 engines/access/animation.h   |  22 +++++--
 engines/access/scripts.cpp   |   2 +-
 3 files changed, 158 insertions(+), 9 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 0d8589d4f1..705fd7bf8f 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -22,11 +22,12 @@
 
 #include "common/endian.h"
 #include "common/memstream.h"
+#include "access/access.h"
 #include "access/animation.h"
 
 namespace Access {
 
-AnimationResource::AnimationResource(const byte *data, int size) {
+AnimationResource::AnimationResource(AccessEngine *vm, const byte *data, int size) {
 	Common::MemoryReadStream stream(data, size);
 	int count = stream.readUint16LE();
 
@@ -37,7 +38,7 @@ AnimationResource::AnimationResource(const byte *data, int size) {
 	_animations.reserve(count);
 	for (int i = 0; i < count; ++i) {
 		stream.seek(offsets[i]);
-		Animation *anim = new Animation(stream);
+		Animation *anim = new Animation(vm, stream);
 		_animations.push_back(anim);
 	}
 }
@@ -49,7 +50,8 @@ AnimationResource::~AnimationResource() {
 
 /*------------------------------------------------------------------------*/
 
-Animation::Animation(Common::MemoryReadStream &stream) {
+Animation::Animation(AccessEngine *vm, Common::MemoryReadStream &stream):
+		Manager(vm) {
 	uint32 startOfs = stream.pos();
 
 	_type = stream.readByte();
@@ -82,10 +84,143 @@ Animation::~Animation() {
 		delete _frames[i];
 }
 
+typedef void(Animation::*AnimationMethodPtr)();
+
 void Animation::animate() {
+	static const AnimationMethodPtr METHODS[8] =
+	{ &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3, 
+	&Animation::anim4, &Animation::animNone, &Animation::animNone, &Animation::anim7 };
+
+	(this->*METHODS[_type])();
+}
+
+void Animation::anim0() {
+	if (_currentLoopCount != -1) {
+		if (_countdownTicks != 0) {
+			calcFrame();
+			setFrame1();
+		} else {
+			_countdownTicks = _initialTicks;
+			++_frameNumber;
+			calcFrame();
+
+			if (this == _vm->_animation->_animStart) {
+				_frameNumber = 0;
+				_currentLoopCount = -1;
+			}
+
+			setFrame();
+		}
+	}
+}
+
+void Animation::anim1() {
+	if (_currentLoopCount == -1 || _countdownTicks != 0) {
+		calcFrame();
+		setFrame1();
+	} else {
+		_countdownTicks = _initialTicks;
+		++_frameNumber;
+		calcFrame();
+
+		if (this == _vm->_animation->_animStart) {
+			--_frameNumber;
+			_currentLoopCount = -1;
+		}
+
+		setFrame();
+	}
+}
+
+void Animation::anim2() {
+	if (_countdownTicks != 0) {
+		calcFrame();
+		setFrame1();
+	} else {
+		_countdownTicks = _initialTicks;
+		++_frameNumber;
+		calcFrame();
+
+		if (this == _vm->_animation->_animStart) {
+			_frameNumber = 0;
+			calcFrame();
+		}
+
+		setFrame();
+	}
+}
+
+void Animation::anim3() {
+	if (_currentLoopCount != -1) {
+		if (_countdownTicks != 0) {
+			calcFrame();
+			setFrame1();
+		} else {
+			_countdownTicks = _initialTicks;
+			++_frameNumber;
+			calcFrame();
+
+			if (this == _vm->_animation->_animStart) {
+				--_currentLoopCount;
+				_frameNumber = 0;
+				calcFrame();
+			}
+
+			setFrame();
+		}
+	}
+}
+
+void Animation::anim4() {
+	if (_currentLoopCount == -1 || _countdownTicks != 0) {
+		calcFrame();
+		setFrame1();
+	} else {
+		_countdownTicks = _initialTicks;
+		++_frameNumber;
+		calcFrame();
+
+		if (this == _vm->_animation->_animStart) {
+			if (--_currentLoopCount == -1) {
+				calcFrame();
+				setFrame1();
+				return;
+			} else {
+				_frameNumber = 0;
+				calcFrame();
+			}
+		}
+
+		setFrame();
+	}
+}
+
+void Animation::animNone() {
+	// No implementation
+}
+
+void Animation::anim7() {
+	calcFrame1();
+	setFrame();
+}
+
+void Animation::calcFrame() {
+	error("TODO");
+}
+
+void Animation::calcFrame1() {
+	error("TODO");
+}
+
+void Animation::setFrame() {
 	error("TODO");
 }
 
+void Animation::setFrame1() {
+	error("TODO");
+}
+
+
 /*------------------------------------------------------------------------*/
 
 AnimationFrame::AnimationFrame(Common::MemoryReadStream &stream, int startOffset) {
@@ -150,7 +285,7 @@ void AnimationManager::clearTimers() {
 void AnimationManager::loadAnimations(const byte *data, int size) {
 	_animationTimers.clear();
 	delete _animation;
-	_animation = new AnimationResource(data,  size);
+	_animation = new AnimationResource(_vm, data,  size);
 }
 
 
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 45a59efb68..38065bb4c9 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -36,9 +36,10 @@ class AnimationFrame;
 class AnimationFramePart;
 
 class AnimationManager : public Manager {
-public:
+private:
 	Common::Array<Animation *> _animationTimers;
 	AnimationResource *_animation;
+public:
 	Animation *_animStart;
 public:
 	AnimationManager(AccessEngine *vm);
@@ -60,16 +61,29 @@ class AnimationResource {
 private:
 	Common::Array<Animation *> _animations;
 public:
-	AnimationResource(const byte *data, int size);
+	AnimationResource(AccessEngine *vm, const byte *data, int size);
 	~AnimationResource();
 
 	int getCount() { return _animations.size(); }
 	Animation *getAnimation(int idx) { return _animations[idx]; }
 };
 
-class Animation {
+class Animation: public Manager {
 private:
 	Common::Array<AnimationFrame *> _frames;
+
+	void anim0();
+	void anim1();
+	void anim2();
+	void anim3();
+	void anim4();
+	void animNone();
+	void anim7();
+
+	void calcFrame();
+	void calcFrame1();
+	void setFrame();
+	void setFrame1();
 public:
 	int _type;
 	int _scaling;
@@ -80,7 +94,7 @@ public:
 	int _currentLoopCount;
 	int _field10;
 public:
-	Animation(Common::MemoryReadStream &stream);
+	Animation(AccessEngine *vm, Common::MemoryReadStream &stream);
 	~Animation();
 
 	void animate();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index fd42530eb9..8018f503a3 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -171,7 +171,7 @@ void Scripts::cmdRetPos() {
 }
 
 void Scripts::cmdAnim() { 
-	int animId = _data->readUint16LE();
+	int animId = _data->readByte();
 	_vm->_animation->animate(animId);
 }
 
-- 
cgit v1.2.3


From 5344143027b87fa38203dbdd97f2f6fd68a566b2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 11 Aug 2014 23:03:49 +0200
Subject: ACCESS: Implement cmdCheckFrame

---
 engines/access/scripts.cpp | 14 ++++++++++++--
 engines/access/scripts.h   |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 8018f503a3..aa1bfcd71c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -89,7 +89,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
-		&Scripts::CMDCHECKFRAME, &Scripts::cmdCheckAnim, &Scripts::CMDSND, 
+		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::CMDSND, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::cmdSetTravel,
@@ -222,7 +222,17 @@ void Scripts::cmdCheckInventory() {
 void Scripts::CMDSETTEX() { error("TODO"); }
 void Scripts::CMDNEWROOM() { error("TODO"); }
 void Scripts::CMDCONVERSE() { error("TODO"); }
-void Scripts::CMDCHECKFRAME() { error("TODO"); }
+
+void Scripts::cmdCheckFrame() {
+	int id = _data->readUint16LE();
+	Animation *anim = _vm->_animation->findAnimation(id);
+
+	int frame = _data->readUint16LE();
+	if (anim->_frameNumber == frame)
+		cmdGoto();
+	else
+		_data->skip(2);
+}
 
 void Scripts::cmdCheckAnim() {
 	int id = _data->readUint16LE();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index c8f951deae..3832f0d0e1 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -66,7 +66,7 @@ protected:
 	void CMDSETTEX();
 	void CMDNEWROOM();
 	void CMDCONVERSE();
-	void CMDCHECKFRAME();
+	void cmdCheckFrame();
 	void cmdCheckAnim();
 	void CMDSND();
 	void cmdRetNeg();
-- 
cgit v1.2.3


From 69c7f989b12de26ada8d399233e95777421ee65b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 11 Aug 2014 23:05:48 +0200
Subject: ACCESS: Fix the implementation of cmdCheckAnim

---
 engines/access/scripts.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index aa1bfcd71c..e7827fba01 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -238,11 +238,10 @@ void Scripts::cmdCheckAnim() {
 	int id = _data->readUint16LE();
 	Animation *anim = _vm->_animation->findAnimation(id);
 
-	if (anim->_currentLoopCount == -1) {
-		_data->skip(2);
+	if (anim->_currentLoopCount == -1)
 		cmdGoto();
-	} else
-		_data->skip(4);
+	else
+		_data->skip(2);
 }
 
 void Scripts::CMDSND() { error("TODO"); }
-- 
cgit v1.2.3


From 5c7699799d4d35ac863470b0ad52817de170f4f9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 11 Aug 2014 23:43:27 +0200
Subject: ACCESS: Implement 3 more opcodes, fix a typo

---
 engines/access/scripts.cpp | 35 ++++++++++++++++++++++++++---------
 engines/access/scripts.h   | 10 ++++++----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index e7827fba01..bb45cd44d2 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -34,6 +34,8 @@ Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
 	_sequence = 0;
 	_endFlag = false;
 	_returnCode = 0;
+	_choice = 0;
+	_choiceStart = 0;
 }
 
 Scripts::~Scripts() {
@@ -94,14 +96,14 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::cmdSetTravel,
 		&Scripts::cmdSetTravel, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
-		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::CMDSETBUFFER, 
+		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
-		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmeRemoveLast, 
+		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, 
 		&Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
-		&Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::CMDJUMPCHOICE, 
-		&Scripts::CMDRETURNCHOICE, &Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, 
+		&Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
+		&Scripts::cmdReturnChoice, &Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, 
 		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
@@ -302,7 +304,9 @@ void Scripts::cmdSetDisplay() {
 	_vm->_current = _vm->_screen;
 }
 
-void Scripts::CMDSETBUFFER() { error("TODO"); }
+void Scripts::cmdSetBuffer() {
+	_vm->_current = &_vm->_buffer2;
+}
 
 void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollCol = _data->readUint16LE();
@@ -315,7 +319,7 @@ void Scripts::CMDSAVERECT() { error("TODO"); }
 void Scripts::CMDSETBUFVID() { error("TODO"); }
 void Scripts::CMDPLAYBUFVID() { error("TODO"); }
 
-void Scripts::cmeRemoveLast() {
+void Scripts::cmdRemoveLast() {
 	--_vm->_numAnimTimers;
 }
 
@@ -324,12 +328,25 @@ void Scripts::CMDSETCYCLE() { error("TODO"); }
 void Scripts::CMDCYCLE() { error("TODO"); }
 void Scripts::CMDCHARSPEAK() { error("TODO"); }
 void Scripts::CMDTEXSPEAK() { error("TODO"); }
-void Scripts::CMDTEXCHOICE() { error("TODO"); }
+void Scripts::CMDTEXCHOICE() { error("TODO"); } // _choiceStart = _data->pos() - 1;
 void Scripts::CMDWAIT() { error("TODO"); }
 void Scripts::CMDSETCONPOS() { error("TODO"); }
 void Scripts::CMDCHECKVFRAME() { error("TODO"); }
-void Scripts::CMDJUMPCHOICE() { error("TODO"); }
-void Scripts::CMDRETURNCHOICE() { error("TODO"); }
+
+void Scripts::cmdJumpChoice() {
+	int val = (_data->readUint16LE() && 0xFF);
+	
+	if (val == _choice) {
+		_sequence = _data->readUint16LE();
+		searchForSequence();
+	} else
+		_data->skip(2);
+}
+
+void Scripts::cmdReturnChoice() {
+	_data->seek(_choiceStart);
+}
+
 void Scripts::CMDCLEARBLOCK() { error("TODO"); }
 void Scripts::CMDLOADSOUND() { error("TODO"); }
 void Scripts::CMDFREESOUND() { error("TODO"); }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 3832f0d0e1..25f4dc192d 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -80,12 +80,12 @@ protected:
 	void CMDPLAYVID();
 	void cmdPlotImage();
 	void cmdSetDisplay();
-	void CMDSETBUFFER();
+	void cmdSetBuffer();
 	void cmdSetScroll();
 	void CMDSAVERECT();
 	void CMDSETBUFVID();
 	void CMDPLAYBUFVID();
-	void cmeRemoveLast();
+	void cmdRemoveLast();
 	void CMDSPECIAL();
 	void CMDSETCYCLE();
 	void CMDCYCLE();
@@ -95,8 +95,8 @@ protected:
 	void CMDWAIT();
 	void CMDSETCONPOS();
 	void CMDCHECKVFRAME();
-	void CMDJUMPCHOICE();
-	void CMDRETURNCHOICE();
+	void cmdJumpChoice();
+	void cmdReturnChoice();
 	void CMDCLEARBLOCK();
 	void CMDLOADSOUND();
 	void CMDFREESOUND();
@@ -120,6 +120,8 @@ public:
 	bool _endFlag;
 	int _returnCode;
 	int _scriptCommand;
+	int _choice;
+	int32 _choiceStart;
 public:
 	Scripts(AccessEngine *vm);
 
-- 
cgit v1.2.3


From 617aa98ede4167fe2f9a7a419738d0030d8c48ff Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 11 Aug 2014 23:57:06 +0200
Subject: ACCESS: Implement cmdSnd()

---
 engines/access/scripts.cpp | 7 +++++--
 engines/access/scripts.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index bb45cd44d2..19633544f4 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -91,7 +91,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
-		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::CMDSND, 
+		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::cmdSetTravel,
@@ -246,7 +246,10 @@ void Scripts::cmdCheckAnim() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSND() { error("TODO"); }
+void Scripts::cmdSnd() {
+	int id = _data->readByte();
+	_vm->_sound->playSound(id);
+}
 
 void Scripts::cmdRetNeg() {
 	_endFlag = true;
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 25f4dc192d..495c4c5f9f 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -68,7 +68,7 @@ protected:
 	void CMDCONVERSE();
 	void cmdCheckFrame();
 	void cmdCheckAnim();
-	void CMDSND();
+	void cmdSnd();
 	void cmdRetNeg();
 	void cmdCheckLoc();
 	void cmdSetAnim();
-- 
cgit v1.2.3


From 768e144683847734cc16c9a7ec786379be6301e2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 11 Aug 2014 20:27:19 -0400
Subject: ACCESS: Properly implement Animation calcFrame/calcFrame1 methods

---
 engines/access/animation.cpp | 69 ++++++++++++++++++++------------------------
 engines/access/animation.h   |  8 ++---
 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 705fd7bf8f..6c9f300931 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -97,101 +97,95 @@ void Animation::animate() {
 void Animation::anim0() {
 	if (_currentLoopCount != -1) {
 		if (_countdownTicks != 0) {
-			calcFrame();
-			setFrame1();
+			setFrame1(calcFrame());
 		} else {
 			_countdownTicks = _initialTicks;
 			++_frameNumber;
-			calcFrame();
+			AnimationFrame *frame = calcFrame();
 
-			if (this == _vm->_animation->_animStart) {
+			if (frame == nullptr) {
 				_frameNumber = 0;
 				_currentLoopCount = -1;
 			}
 
-			setFrame();
+			setFrame(frame);
 		}
 	}
 }
 
 void Animation::anim1() {
 	if (_currentLoopCount == -1 || _countdownTicks != 0) {
-		calcFrame();
-		setFrame1();
+		setFrame1(calcFrame());
 	} else {
 		_countdownTicks = _initialTicks;
 		++_frameNumber;
-		calcFrame();
+		AnimationFrame *frame = calcFrame();
 
-		if (this == _vm->_animation->_animStart) {
+		if (frame == nullptr) {
 			--_frameNumber;
 			_currentLoopCount = -1;
 		}
 
-		setFrame();
+		setFrame(frame);
 	}
 }
 
 void Animation::anim2() {
 	if (_countdownTicks != 0) {
-		calcFrame();
-		setFrame1();
+		setFrame1(calcFrame());
 	} else {
 		_countdownTicks = _initialTicks;
 		++_frameNumber;
-		calcFrame();
+		AnimationFrame *frame = calcFrame();
 
-		if (this == _vm->_animation->_animStart) {
+		if (frame == nullptr) {
 			_frameNumber = 0;
-			calcFrame();
+			frame = calcFrame();
 		}
 
-		setFrame();
+		setFrame(frame);
 	}
 }
 
 void Animation::anim3() {
 	if (_currentLoopCount != -1) {
 		if (_countdownTicks != 0) {
-			calcFrame();
-			setFrame1();
+			setFrame1(calcFrame());
 		} else {
 			_countdownTicks = _initialTicks;
 			++_frameNumber;
-			calcFrame();
+			AnimationFrame *frame = calcFrame();
 
-			if (this == _vm->_animation->_animStart) {
+			if (frame == nullptr) {
 				--_currentLoopCount;
 				_frameNumber = 0;
-				calcFrame();
+				frame = calcFrame();
 			}
 
-			setFrame();
+			setFrame(frame);
 		}
 	}
 }
 
 void Animation::anim4() {
 	if (_currentLoopCount == -1 || _countdownTicks != 0) {
-		calcFrame();
-		setFrame1();
+		setFrame1(calcFrame());
 	} else {
 		_countdownTicks = _initialTicks;
 		++_frameNumber;
-		calcFrame();
+		AnimationFrame *frame = calcFrame();
 
-		if (this == _vm->_animation->_animStart) {
+		if (frame == nullptr) {
 			if (--_currentLoopCount == -1) {
-				calcFrame();
-				setFrame1();
+				setFrame1(calcFrame());
 				return;
 			} else {
 				_frameNumber = 0;
-				calcFrame();
+				frame = calcFrame();
 			}
 		}
 
-		setFrame();
+		setFrame(frame);
 	}
 }
 
@@ -200,23 +194,22 @@ void Animation::animNone() {
 }
 
 void Animation::anim7() {
-	calcFrame1();
-	setFrame();
+	setFrame(calcFrame1());
 }
 
-void Animation::calcFrame() {
-	error("TODO");
+AnimationFrame *Animation::calcFrame() {
+	return _frames[_frameNumber];
 }
 
-void Animation::calcFrame1() {
-	error("TODO");
+AnimationFrame *Animation::calcFrame1() {
+	return _frames[0];
 }
 
-void Animation::setFrame() {
+void Animation::setFrame(AnimationFrame *frame) {
 	error("TODO");
 }
 
-void Animation::setFrame1() {
+void Animation::setFrame1(AnimationFrame *frame) {
 	error("TODO");
 }
 
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 38065bb4c9..d9b10085ce 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -80,10 +80,10 @@ private:
 	void animNone();
 	void anim7();
 
-	void calcFrame();
-	void calcFrame1();
-	void setFrame();
-	void setFrame1();
+	AnimationFrame *calcFrame();
+	AnimationFrame *calcFrame1();
+	void setFrame(AnimationFrame *frame);
+	void setFrame1(AnimationFrame *frame);
 public:
 	int _type;
 	int _scaling;
-- 
cgit v1.2.3


From 7d4180c3e2b70ab3efa8d82f071e427a71adb1f0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 11 Aug 2014 21:34:39 -0400
Subject: ACCESS: Implemented Animation setFrame code

---
 engines/access/access.h      | 10 ++++++++++
 engines/access/animation.cpp | 44 ++++++++++++++++++++++++++++++++++++--------
 engines/access/animation.h   |  6 ++++--
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 26ae88e6fb..f84a7bd1ca 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -70,6 +70,15 @@ enum AccessDebugChannels {
 
 struct AccessGameDescription;
 
+class ImageEntry {
+public:
+	int _field0;
+	SpriteResource *_spritesPtr;
+	int _priority;
+	Common::Point _position;
+	int _flags;
+};
+
 class AccessEngine : public Engine {
 private:
 	/**
@@ -128,6 +137,7 @@ public:
 	Common::Array<Common::Rect> _newRect;
 	Common::Array<Common::Rect> _oldRect;
 	Common::Array<ExtraCell> _extraCells;
+	Common::Array<ImageEntry> _images;
 	int _pCount;
 	int _selectCommand;
 	bool _normalMouse;
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 6c9f300931..a17c30f495 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -55,15 +55,15 @@ Animation::Animation(AccessEngine *vm, Common::MemoryReadStream &stream):
 	uint32 startOfs = stream.pos();
 
 	_type = stream.readByte();
-	_scaling = stream.readByte();
+	_scaling = stream.readSByte();
 	stream.readByte(); // unk
 	_frameNumber = stream.readByte();
 	_initialTicks = stream.readUint16LE();
 	stream.readUint16LE(); // unk
 	stream.readUint16LE(); // unk
-	_loopCount = stream.readUint16LE();
+	_loopCount = stream.readSint16LE();
 	_countdownTicks = stream.readUint16LE();
-	_currentLoopCount = stream.readUint16LE();
+	_currentLoopCount = stream.readSint16LE();
 	stream.readUint16LE(); // unk
 
 	Common::Array<uint16> frameOffsets;
@@ -206,13 +206,39 @@ AnimationFrame *Animation::calcFrame1() {
 }
 
 void Animation::setFrame(AnimationFrame *frame) {
-	error("TODO");
+	_countdownTicks += frame->_frameDelay;
+	setFrame1(frame);
 }
 
-void Animation::setFrame1(AnimationFrame *frame) {
-	error("TODO");
+static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
+	return ie1._priority < ie2._priority;
 }
 
+void Animation::setFrame1(AnimationFrame *frame) {
+	_vm->_animation->_base.x = frame->_baseX;
+	_vm->_animation->_base.y = frame->_baseY;
+
+	// Loop to add image draw requests for the parts of the frame
+	for (uint i = 0; i < frame->_parts.size(); ++i) {
+		AnimationFramePart *part = frame->_parts[i];
+		ImageEntry ie;
+
+		// Set the flags
+		ie._flags = part->_flags & 0xF7;
+		if (_vm->_animation->_frameScale == -1)
+			ie._flags |= 8;
+
+		// Set the other fields
+		ie._spritesPtr = _vm->_objectsTable[part->_spritesIndex];
+		ie._field0 = part->_frameIndex;
+		ie._position = part->_position + _vm->_animation->_base;
+		ie._priority = part->_priority - ie._position.y;
+
+		assert(_vm->_images.size() < 35);
+		_vm->_images.push_back(ie);
+		Common::sort(_vm->_images.begin(), _vm->_images.end(), sortImagesY);
+	}
+}
 
 /*------------------------------------------------------------------------*/
 
@@ -244,8 +270,8 @@ AnimationFrame::~AnimationFrame() {
 
 AnimationFramePart::AnimationFramePart(Common::MemoryReadStream &stream) {
 	_flags = stream.readByte();
-	_slotIndex = stream.readByte();
-	_spriteIndex = stream.readByte();
+	_spritesIndex = stream.readByte();
+	_frameIndex = stream.readByte();
 	_position.x = stream.readUint16LE();
 	_position.y = stream.readUint16LE();
 	_priority = stream.readUint16LE();
@@ -256,6 +282,7 @@ AnimationFramePart::AnimationFramePart(Common::MemoryReadStream &stream) {
 AnimationManager::AnimationManager(AccessEngine *vm) : Manager(vm) {
 	_animation = nullptr;
 	_animStart = nullptr;
+	_frameScale = 0;
 }
 
 AnimationManager::~AnimationManager() {
@@ -306,6 +333,7 @@ Animation *AnimationManager::findAnimation(int animId) {
 
 void AnimationManager::animate(int animId) {
 	Animation *anim = findAnimation(animId);
+	_frameScale = anim->_scaling;
 	anim->animate();
 }
 
diff --git a/engines/access/animation.h b/engines/access/animation.h
index d9b10085ce..c1b44a5621 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -41,6 +41,8 @@ private:
 	AnimationResource *_animation;
 public:
 	Animation *_animStart;
+	Common::Point _base;
+	int _frameScale;
 public:
 	AnimationManager(AccessEngine *vm);
 	~AnimationManager();
@@ -113,8 +115,8 @@ public:
 class AnimationFramePart {
 public:
 	byte _flags;
-	int _slotIndex;
-	int _spriteIndex;
+	int _spritesIndex;
+	int _frameIndex;
 	Common::Point _position;
 	int _priority;
 public:
-- 
cgit v1.2.3


From eee84b8760dd38079fe97f263a6fa9361ad5696f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 11 Aug 2014 23:12:53 -0400
Subject: ACCESS: Implemented plotList

---
 engines/access/access.cpp    | 51 ++++++++++++++++++++++++++++++++++++++++++++
 engines/access/access.h      |  6 +++++-
 engines/access/animation.cpp |  2 +-
 engines/access/asurface.cpp  | 11 ++++++++++
 engines/access/asurface.h    |  8 ++++++-
 engines/access/player.cpp    |  8 +++++++
 engines/access/player.h      |  2 ++
 engines/access/room.cpp      |  4 ++--
 engines/access/screen.cpp    |  4 ----
 engines/access/screen.h      |  2 --
 10 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a21a97c0b0..9fb0287883 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -73,6 +73,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleT1 = 0;
 	_scaleMaxY = 0;
 	_scaleI = 0;
+	_scaleFlag = false;
 
 	_conversation = 0;
 	_currentMan = 0;
@@ -247,4 +248,54 @@ void AccessEngine::doEstablish(int v) {
 	warning("TODO: doEstablish");
 }
 
+void AccessEngine::plotList() {
+	_player->calcPlayer();
+	plotList1();
+}
+
+void AccessEngine::plotList1() {
+	for (uint idx = 0; idx < _images.size(); ++idx) {
+		ImageEntry &ie = _images[idx];
+
+		_scaleFlag = (ie._flags & 8) != 0;
+		Common::Point pt = ie._position - _screen->_bufferStart;
+		SpriteResource *sprites = ie._spritesPtr;
+		SpriteFrame *frame = sprites->getFrame(ie._frameNumber);
+
+		Common::Rect bounds(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h);
+		if (!_scaleFlag) {
+			bounds.setWidth(_screen->_scaleTable1[frame->w]);
+			bounds.setHeight(_screen->_scaleTable1[frame->h]);
+		}
+
+		if (_buffer2.clip(bounds)) {
+			ie._flags |= 1;
+		} else {
+			ie._flags &= ~1;
+			if (_buffer2._leftSkip != 0 ||  _buffer2._rightSkip != 0
+				|| _buffer2._topSkip != 0 || _buffer2._bottomSkip != 0)
+				ie._flags |= 1;
+
+			_newRect.push_back(bounds);
+
+			if (!_scaleFlag) {
+				_buffer2._rightSkip /= _scale;
+				bounds.setWidth(bounds.width() / _scale);
+
+				if (ie._flags & 2) {
+					_buffer2.sPlotB(frame, Common::Point(bounds.left, bounds.top));
+				} else {
+					_buffer2.sPlotF(frame, Common::Point(bounds.left, bounds.top));
+				}
+			} else {
+				if (ie._flags & 2) {
+					_buffer2.plotB(frame, Common::Point(bounds.left, bounds.top));
+				} else {
+					_buffer2.plotFrame(frame, Common::Point(bounds.left, bounds.top));
+				}
+			}
+		}
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index f84a7bd1ca..819f7faaa7 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -72,7 +72,7 @@ struct AccessGameDescription;
 
 class ImageEntry {
 public:
-	int _field0;
+	int _frameNumber;
 	SpriteResource *_spritesPtr;
 	int _priority;
 	Common::Point _position;
@@ -166,6 +166,7 @@ public:
 	int _scaleT1;
 	int _scaleMaxY;
 	int _scaleI;
+	bool _scaleFlag;
 	int _playFieldHeight;
 
 	// Fields that are included in savegames
@@ -236,6 +237,9 @@ public:
 	void establish(int v);
 
 	void establishCenter(int v);
+
+	void plotList();
+	void plotList1();
 };
 
 } // End of namespace Access
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index a17c30f495..20772af8f0 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -230,7 +230,7 @@ void Animation::setFrame1(AnimationFrame *frame) {
 
 		// Set the other fields
 		ie._spritesPtr = _vm->_objectsTable[part->_spritesIndex];
-		ie._field0 = part->_frameIndex;
+		ie._frameNumber = part->_frameIndex;
 		ie._position = part->_position + _vm->_animation->_base;
 		ie._priority = part->_priority - ie._position.y;
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 3a381a10e5..fe11612075 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -219,5 +219,16 @@ void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
 	}
 }
 
+void ASurface::sPlotB(SpriteFrame *frame, const Common::Point &pt) {
+	error("TODO");
+}
+
+void ASurface::sPlotF(SpriteFrame *frame, const Common::Point &pt) {
+	error("TODO");
+}
+
+void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
+	error("TODO");
+}
 
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index c4dfc5442d..99f99ae696 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -45,7 +45,7 @@ public:
 	static int _scrollX, _scrollY;
 
 	static void init();
-protected:
+public:
 	virtual void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt);
 public:
 	void clearBuffer();
@@ -56,6 +56,12 @@ public:
 
 	void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
 
+	void sPlotB(SpriteFrame *frame, const Common::Point &pt);
+
+	void sPlotF(SpriteFrame *frame, const Common::Point &pt);
+
+	void plotB(SpriteFrame *frame, const Common::Point &pt);
+
 	void copyTo(ASurface *dest, const Common::Point &destPos);
 };
 
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index b28e6c92bc..794fc08fa4 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -151,4 +151,12 @@ void Player::walk() {
 	warning("TODO: Player::walk");
 }
 
+void Player::calcPlayer() {
+	Screen &scr = *_vm->_screen;
+	scr._bufferStart.x = (scr._scrollCol << 4) + scr._scrollX;
+	scr._bufferStart.y = (scr._scrollRow << 4) + scr._scrollY;
+	_playerX = _rawPlayer.x - scr._bufferStart.x;
+	_playerY = _rawPlayer.y - scr._bufferStart.y;
+}
+
 } // End of namespace Access
diff --git a/engines/access/player.h b/engines/access/player.h
index 7625fa2cc7..b491ed7e85 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -82,6 +82,8 @@ public:
 	void calcManScale();
 
 	void walk();
+
+	void calcPlayer();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 98e9d5ed6f..b39e99815b 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -117,7 +117,7 @@ void Room::doRoom() {
 					clearRoom();
 					break;
 				} else {
-					_vm->_screen->plotList();
+					_vm->plotList();
 					_vm->_screen->copyRects();
 
 					_vm->_screen->copyBF2Vid();
@@ -132,7 +132,7 @@ void Room::doRoom() {
 					clearRoom();
 					break;
 				} else {
-					_vm->_screen->plotList();
+					_vm->plotList();
 					_vm->_screen->copyBlocks();
 				}
 			}
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index bc913c5e78..2dc86982b7 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -162,10 +162,6 @@ void Screen::copyBF2Vid() {
 	warning("TODO");
 }
 
-void Screen::plotList() {
-	warning("TODO: plotList");
-}
-
 void Screen::copyBlocks() {
 	warning("TODO: copyBlocks");
 }
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 45db7d0fb1..6c1d96e360 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -123,8 +123,6 @@ public:
 
 	void copyBF2Vid();
 
-	void plotList();
-
 	void copyBlocks();
 
 	void copyRects();
-- 
cgit v1.2.3


From c0cb03cea276832b2d178155786c0418eccfd21d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Aug 2014 08:38:12 -0400
Subject: ACCESS: Implemented copyBlocks

---
 engines/access/access.cpp             | 16 +++++++++++++++-
 engines/access/access.h               |  6 ++++--
 engines/access/amazon/amazon_room.cpp |  4 ++--
 engines/access/asurface.cpp           | 11 +++++++++++
 engines/access/asurface.h             |  2 ++
 engines/access/room.cpp               | 10 +++++-----
 engines/access/screen.cpp             |  4 ----
 engines/access/screen.h               |  2 --
 8 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9fb0287883..29e5188fb3 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -276,7 +276,7 @@ void AccessEngine::plotList1() {
 				|| _buffer2._topSkip != 0 || _buffer2._bottomSkip != 0)
 				ie._flags |= 1;
 
-			_newRect.push_back(bounds);
+			_newRects.push_back(bounds);
 
 			if (!_scaleFlag) {
 				_buffer2._rightSkip /= _scale;
@@ -298,4 +298,18 @@ void AccessEngine::plotList1() {
 	}
 }
 
+void AccessEngine::copyBlocks() {
+	// Copy the block list from the previous frame
+	for (uint i = 0; i < _oldRects.size(); ++i) {
+		_screen->copyBlock(&_buffer2, _oldRects[i]);
+	}
+
+	// Copy the new block list, replacing the old one at the same time
+	_oldRects.clear();
+	for (uint i = 0; i < _newRects.size(); ++i) {
+		_screen->copyBlock(&_buffer2, _newRects[i]);
+		_oldRects.push_back(_newRects[i]);
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 819f7faaa7..3cd98f0c45 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -134,8 +134,8 @@ public:
 	int _establishGroup;
 	int _numAnimTimers;
 	Common::Array<TimerEntry> _timers;
-	Common::Array<Common::Rect> _newRect;
-	Common::Array<Common::Rect> _oldRect;
+	Common::Array<Common::Rect> _newRects;
+	Common::Array<Common::Rect> _oldRects;
 	Common::Array<ExtraCell> _extraCells;
 	Common::Array<ImageEntry> _images;
 	int _pCount;
@@ -240,6 +240,8 @@ public:
 
 	void plotList();
 	void plotList1();
+
+	void copyBlocks();
 };
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 5b840afc2e..b8ed0d20de 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -110,8 +110,8 @@ void AmazonRoom::reloadRoom1() {
 	}
 
 	_vm->_player->_frame = 0;
-	_vm->_oldRect.clear();
-	_vm->_newRect.clear();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
 }
 
 void AmazonRoom::roomSet() {
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index fe11612075..5a090afaca 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -231,4 +231,15 @@ void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
 	error("TODO");
 }
 
+void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
+	byte *srcP = (byte *)getBasePtr(bounds.left, bounds.top + _scrollY);
+	byte *destP = (byte *)getBasePtr(bounds.left, bounds.top); /* + _windowYAdd */
+
+	for (int y = 0; y < bounds.height(); ++y) {
+		Common::copy(srcP, srcP + bounds.width(), destP);
+		srcP += src->pitch;
+		destP += this->pitch;
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 99f99ae696..776b9506e9 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -62,6 +62,8 @@ public:
 
 	void plotB(SpriteFrame *frame, const Common::Point &pt);
 
+	void copyBlock(ASurface *src, const Common::Rect &bounds);
+
 	void copyTo(ASurface *dest, const Common::Point &destPos);
 };
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b39e99815b..ab3592a247 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -65,8 +65,8 @@ void Room::doRoom() {
 	while (!_vm->shouldQuit()) {
 		if (!reloadFlag) {
 			_vm->_numImages = 0;
-			_vm->_newRect.clear();
-			_vm->_oldRect.clear();
+			_vm->_newRects.clear();
+			_vm->_oldRects.clear();
 			_vm->_nextImage = 0;
 			_vm->_numAnimTimers = 0;
 
@@ -109,7 +109,7 @@ void Room::doRoom() {
 
 			if (_vm->_screen->_scrollFlag) {
 				_vm->_screen->copyBF1BF2();
-				_vm->_newRect.clear();
+				_vm->_newRects.clear();
 				_function = 0;
 				roomLoop();
 
@@ -124,7 +124,7 @@ void Room::doRoom() {
 				}
 			} else {
 				_vm->_screen->copyBF1BF2();
-				_vm->_newRect.clear();
+				_vm->_newRects.clear();
 				_function = 0;
 				roomLoop();
 
@@ -133,7 +133,7 @@ void Room::doRoom() {
 					break;
 				} else {
 					_vm->plotList();
-					_vm->_screen->copyBlocks();
+					_vm->copyBlocks();
 				}
 			}
 		}
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 2dc86982b7..b47cd3e005 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -162,10 +162,6 @@ void Screen::copyBF2Vid() {
 	warning("TODO");
 }
 
-void Screen::copyBlocks() {
-	warning("TODO: copyBlocks");
-}
-
 void Screen::copyRects() {
 	warning("TODO: copyRects");
 }
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 6c1d96e360..670da8282d 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -123,8 +123,6 @@ public:
 
 	void copyBF2Vid();
 
-	void copyBlocks();
-
 	void copyRects();
 
 	void setBufferScan();
-- 
cgit v1.2.3


From 94eda108eb36594329c20ecbc525d9934083e535 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Aug 2014 09:01:29 -0400
Subject: ACCESS: Fix incorrect decrementing of _startup

---
 engines/access/room.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index ab3592a247..4996527b74 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -80,12 +80,13 @@ void Room::doRoom() {
 		while (!_vm->shouldQuit()) {
 			_vm->_numImages = 0;
 			if (_vm->_startup != -1 && --_vm->_startup != 0) {
-				--_vm->_startup;
 				_vm->_events->showCursor();
 				_vm->_screen->fadeIn();
 			}
 
+			// Handle any events
 			_vm->_events->pollEvents();
+
 			_vm->_nextImage = 0;
 			_vm->_player->walk();
 			_vm->_sound->midiRepeat();
-- 
cgit v1.2.3


From 9107cc103fa8ca65e12d0213c7b915ec990fb6cf Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Aug 2014 09:16:14 -0400
Subject: ACCESS: Added a temporary frame delay and screen update

---
 engines/access/events.cpp | 8 ++++++++
 engines/access/events.h   | 2 ++
 engines/access/room.cpp   | 4 ++++
 engines/access/screen.cpp | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 1184128ffd..73feefee97 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -148,7 +148,15 @@ void EventsManager::checkForNextFrameCounter() {
 
 		// Signal the ScummVM debugger
 		_vm->_debugger->onFrame();
+
+		// TODO: Refactor for dirty rects
+		_vm->_screen->updateScreen();
 	}
 }
 
+void EventsManager::delay(int time) {
+	g_system->delayMillis(time);
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index 2e6b06b5e2..55f04f17af 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -88,6 +88,8 @@ public:
 	bool isCursorVisible();
 
 	void pollEvents();
+
+	void delay(int time);
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 4996527b74..d3f0f8ff06 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -84,6 +84,10 @@ void Room::doRoom() {
 				_vm->_screen->fadeIn();
 			}
 
+			// TODO: Game loop doesn't seem to have any delay. For now,
+			// introduce a slight delay here
+			_vm->_events->delay(50);
+
 			// Handle any events
 			_vm->_events->pollEvents();
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index b47cd3e005..cdd5f2021e 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -64,6 +64,8 @@ void Screen::setPanel(int num) {
 }
 
 void Screen::updateScreen() {
+	g_system->copyRectToScreen((byte *)getPixels(), this->pitch, 0, 0,
+		this->w, this->h);
 	g_system->updateScreen();
 }
 
-- 
cgit v1.2.3


From b579dbb71b4aafa533b06589ced928d788a1c2e6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Aug 2014 21:12:11 -0400
Subject: ACCESS: Fixes for clipping

---
 engines/access/asurface.cpp | 10 ++++++----
 engines/access/screen.cpp   | 10 +++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 5a090afaca..ba75607637 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -115,13 +115,14 @@ bool ASurface::clip(Common::Rect &r) {
 	_topSkip = _bottomSkip = 0;
 
 	if (r.left > _clipWidth) {
+		if (r.left >= 0)
+			return true;
+
 		skip = -r.left;
 		r.setWidth(r.width() - skip);
 		_leftSkip = skip;
 		r.moveTo(0, r.top);
 	}
-	else if (r.left >= 0)
-		return true;
 
 	int right = r.right - 1;
 	if (right < 0)
@@ -133,13 +134,14 @@ bool ASurface::clip(Common::Rect &r) {
 	}
 
 	if (r.top > _clipHeight) {
+		if (r.top >= 0)
+			return true;
+
 		skip = -r.top;
 		r.setHeight(r.height() - skip);
 		_topSkip = skip;
 		r.moveTo(r.left, 0);
 	}
-	else if (r.top >= 0)
-		return true;
 
 	int bottom = r.bottom - 1;
 	if (bottom < 0)
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index cdd5f2021e..9cefa356ef 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -51,10 +51,18 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
+
+	setDisplayScan();
 }
 
 void Screen::setDisplayScan() {
-	warning("TODO: setDisplayScan");
+	_clipWidth = this->w - 1;
+	_clipHeight = this->h - 1;
+	_windowXAdd = _windowYAdd = 0;
+	_scrollX = _scrollY = 0;
+	_scrollCol = _scrollRow = 0;
+	_bufferStart.x = _bufferStart.y = 0;
+	_screenYOff = 0;
 }
 
 void Screen::setPanel(int num) {
-- 
cgit v1.2.3


From 483bc1eb03b54db70d3136f3265fca1989b5b417 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Aug 2014 21:40:14 -0400
Subject: ACCESS: Implemented setBufferScan and copyRects

---
 engines/access/access.cpp | 5 ++++-
 engines/access/access.h   | 2 ++
 engines/access/room.cpp   | 3 +--
 engines/access/screen.cpp | 9 ++++-----
 engines/access/screen.h   | 2 --
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 29e5188fb3..75a3b8d47b 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -304,7 +304,10 @@ void AccessEngine::copyBlocks() {
 		_screen->copyBlock(&_buffer2, _oldRects[i]);
 	}
 
-	// Copy the new block list, replacing the old one at the same time
+	copyRects();
+}
+
+void AccessEngine::copyRects() {
 	_oldRects.clear();
 	for (uint i = 0; i < _newRects.size(); ++i) {
 		_screen->copyBlock(&_buffer2, _newRects[i]);
diff --git a/engines/access/access.h b/engines/access/access.h
index 3cd98f0c45..4efe1b4349 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -242,6 +242,8 @@ public:
 	void plotList1();
 
 	void copyBlocks();
+
+	void copyRects();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index d3f0f8ff06..22ced20f08 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -123,8 +123,7 @@ void Room::doRoom() {
 					break;
 				} else {
 					_vm->plotList();
-					_vm->_screen->copyRects();
-
+					_vm->copyRects();
 					_vm->_screen->copyBF2Vid();
 				}
 			} else {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 9cefa356ef..d450cc1067 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -172,12 +172,11 @@ void Screen::copyBF2Vid() {
 	warning("TODO");
 }
 
-void Screen::copyRects() {
-	warning("TODO: copyRects");
-}
-
 void Screen::setBufferScan() {
-	warning("TODO: setBufferScan");
+	_clipWidth = _vm->_room->_vWindowBytesWide - 1;
+	_windowXAdd = (320 - _clipWidth) >> 1;
+	_clipHeight = _vm->_room->_vWindowLinesTall - 1;
+	_windowYAdd = (176 - _clipHeight) >> 1;
 }
 
 void Screen::setScaleTable(int scale) {
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 670da8282d..875b665c18 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -123,8 +123,6 @@ public:
 
 	void copyBF2Vid();
 
-	void copyRects();
-
 	void setBufferScan();
 
 	void setScaleTable(int scale);
-- 
cgit v1.2.3


From 89772d55a5c97b3c58bdf685e2419e78335ba02d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 Aug 2014 23:34:23 -0400
Subject: ACCESS: Implemented window size fields setup and copyBF2Vid

---
 engines/access/access.cpp             | 16 ++++++++++++
 engines/access/access.h               |  4 +++
 engines/access/amazon/amazon_room.cpp |  6 +++--
 engines/access/player.cpp             |  2 +-
 engines/access/room.cpp               | 46 ++++++++++++++++-------------------
 engines/access/room.h                 |  5 ----
 engines/access/screen.cpp             | 17 +++++--------
 engines/access/screen.h               |  9 ++++---
 8 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 75a3b8d47b..9c0df1ac30 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -315,4 +315,20 @@ void AccessEngine::copyRects() {
 	}
 }
 
+void AccessEngine::copyBF1BF2() {
+	_buffer2.copyFrom(_buffer1);
+}
+
+void AccessEngine::copyBF2Vid() {
+	const byte *srcP = (const byte *)_buffer2.getPixels();
+	byte *destP = (byte *)_screen->getBasePtr(_screen->_windowXAdd, 
+		_screen->_windowYAdd + _screen->_screenYOff);
+
+	for (int yp = 0; yp < _screen->_vWindowLinesTall; ++yp) {
+		Common::copy(srcP, srcP + _screen->_vWindowBytesWide, destP);
+		srcP += _buffer2.pitch;
+		destP += _screen->pitch;
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 4efe1b4349..770bd030ff 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -244,6 +244,10 @@ public:
 	void copyBlocks();
 
 	void copyRects();
+
+	void copyBF1BF2();
+
+	void copyBF2Vid();
 };
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index b8ed0d20de..db163977ca 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -103,10 +103,12 @@ void AmazonRoom::reloadRoom1() {
 	setWallCodes();
 	buildScreen();
 
-	if (_vm->_player->_roomNumber != 20 && _vm->_player->_roomNumber != 24
+	if (!_vm->_screen->_vesaMode) {
+		_vm->copyBF2Vid();
+	} else if (_vm->_player->_roomNumber != 20 && _vm->_player->_roomNumber != 24
 			&& _vm->_player->_roomNumber != 33) {
 		_vm->_screen->setPalette();
-		_vm->_screen->copyBF2Vid();
+		_vm->copyBF2Vid();
 	}
 
 	_vm->_player->_frame = 0;
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 794fc08fa4..969df0025f 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -132,7 +132,7 @@ void Player::load() {
 	if (_vm->_manPal1) {
 		Common::copy(_vm->_manPal1 + 0x270, _vm->_manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
 	} else {
-		Common::fill(_vm->_screen->_manPal + 0x270, _vm->_screen->_manPal + 0x270 + 0x60, 0);
+		Common::fill(_vm->_screen->_manPal, _vm->_screen->_manPal + 0x60, 0);
 	}
 }
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 22ced20f08..c258e076d8 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -38,10 +38,6 @@ Room::Room(AccessEngine *vm) : Manager(vm) {
 	_playFieldWidth = _playFieldHeight = 0;
 	_matrixSize = 0;
 	_tile = nullptr;
-	_vWindowWidth = _vWindowHeight = 0;
-	_vWindowBytesWide = 0;
-	_bufferBytesWide = 0;
-	_vWindowLinesTall = 0;
 }
 
 Room::~Room() {
@@ -113,7 +109,7 @@ void Room::doRoom() {
 			}
 
 			if (_vm->_screen->_scrollFlag) {
-				_vm->_screen->copyBF1BF2();
+				_vm->copyBF1BF2();
 				_vm->_newRects.clear();
 				_function = 0;
 				roomLoop();
@@ -124,10 +120,10 @@ void Room::doRoom() {
 				} else {
 					_vm->plotList();
 					_vm->copyRects();
-					_vm->_screen->copyBF2Vid();
+					_vm->copyBF2Vid();
 				}
 			} else {
-				_vm->_screen->copyBF1BF2();
+				_vm->copyBF1BF2();
 				_vm->_newRects.clear();
 				_function = 0;
 				roomLoop();
@@ -255,34 +251,33 @@ void Room::setupRoom() {
 	if (_roomFlag != 2)
 		setIconPalette();
 
-	if (_vWindowWidth == _playFieldWidth) {
+	if (_vm->_screen->_vWindowWidth == _playFieldWidth) {
 		_vm->_screen->_scrollX = 0;
 		_vm->_screen->_scrollCol = 0;
 	} else {
 		_vm->_screen->_scrollX = _vm->_player->_rawPlayer.x -
 			(_vm->_player->_rawPlayer.x >> 4);
 		int xp = MAX((_vm->_player->_rawPlayer.x >> 4) -
-			(_vWindowWidth / 2), 0);
+			(_vm->_screen->_vWindowWidth / 2), 0);
 		_vm->_screen->_scrollCol = xp;
 
-		xp = xp + _vWindowWidth - _playFieldWidth;
+		xp = xp + _vm->_screen->_vWindowWidth - _playFieldWidth;
 		if (xp >= 0) {
 			_vm->_screen->_scrollCol = xp + 1;
 		}
 	}
 	
-	if (_vWindowHeight == _playFieldHeight) {
+	if (_vm->_screen->_vWindowHeight == _playFieldHeight) {
 		_vm->_screen->_scrollY = 0;
 		_vm->_screen->_scrollRow = 0;
-	}
-	else {
+	} else {
 		_vm->_screen->_scrollY = _vm->_player->_rawPlayer.y -
 			(_vm->_player->_rawPlayer.y >> 4);
 		int yp = MAX((_vm->_player->_rawPlayer.y >> 4) -
-			(_vWindowHeight / 2), 0);
+			(_vm->_screen->_vWindowHeight / 2), 0);
 		_vm->_screen->_scrollRow = yp;
 
-		yp = yp + _vWindowHeight - _playFieldHeight;
+		yp = yp + _vm->_screen->_vWindowHeight - _playFieldHeight;
 		if (yp >= 0) {
 			_vm->_screen->_scrollRow = yp + 1;
 		}
@@ -299,7 +294,7 @@ void Room::setWallCodes() {
 
 void Room::buildScreen() {
 	int scrollCol = _vm->_screen->_scrollCol;
-	int cnt = _vWindowWidth + 1;
+	int cnt = _vm->_screen->_vWindowWidth + 1;
 	int offset = 0;
 
 	for (int idx = 0; idx < cnt; offset += TILE_WIDTH, ++idx) {
@@ -308,7 +303,7 @@ void Room::buildScreen() {
 	}
 
 	_vm->_screen->_scrollCol = scrollCol;
-	_vm->_screen->copyBF1BF2();
+	_vm->copyBF1BF2();
 }
 
 void Room::buildColumn(int playX, int screenX) {
@@ -316,12 +311,12 @@ void Room::buildColumn(int playX, int screenX) {
 		_playFieldWidth + playX;
 	byte *pDest = (byte *)_vm->_buffer1.getPixels();
 
-	for (int y = 0; y <= _vWindowHeight; ++y) {
+	for (int y = 0; y <= _vm->_screen->_vWindowHeight; ++y) {
 		byte *pTile = _tile + (*pSrc << 8);
 
 		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
 			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
-			pDest += _vWindowWidth;
+			pDest += _vm->_screen->_vWindowWidth;
 		}
 	}
 }
@@ -333,9 +328,10 @@ void Room::init4Quads() {
 void Room::loadPlayField(int fileNum, int subfile) {
 	byte *playData = _vm->_files->loadFile(fileNum, subfile);
 	Common::MemoryReadStream stream(playData + 0x10, _vm->_files->_filesize - 0x10);
+	Screen &screen = *_vm->_screen;
 
 	// Copy the new palette
-	_vm->_screen->loadRawPalette(&stream);
+	screen.loadRawPalette(&stream);
 
 	// Copy off the tile data
 	_tileSize = playData[2] << 8;
@@ -352,11 +348,11 @@ void Room::loadPlayField(int fileNum, int subfile) {
 	int numBlocks = playData[8];
 	_plotter.load(&stream, numWalls, numBlocks);
 
-	_vWindowWidth = playData[3];
-	_vWindowBytesWide = _vWindowWidth << 4;
-	_bufferBytesWide = _vWindowBytesWide + 16;
-	_vWindowHeight = playData[4];
-	_vWindowLinesTall = _vWindowHeight << 4;
+	screen._vWindowWidth = playData[3];
+	screen._vWindowBytesWide = screen._vWindowWidth << 4;
+	screen._bufferBytesWide = screen._vWindowBytesWide + 16;
+	screen._vWindowHeight = playData[4];
+	screen._vWindowLinesTall = screen._vWindowHeight << 4;
 
 	_vm->_screen->setBufferScan();
 	delete[] playData;
diff --git a/engines/access/room.h b/engines/access/room.h
index 0c19308469..ce3c4dc36e 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -97,11 +97,6 @@ public:
 	int _playFieldHeight;
 	byte *_tile;
 	int _tileSize;
-	int _vWindowWidth;
-	int _vWindowHeight;
-	int _vWindowBytesWide;
-	int _bufferBytesWide;
-	int _vWindowLinesTall;
 public:
 	Room(AccessEngine *vm);
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index d450cc1067..6f9b53994d 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -52,7 +52,10 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
 
-	setDisplayScan();
+	_bufferBytesWide = _vWindowBytesWide = this->w;
+	_vWindowLinesTall = this->h;
+	_clipWidth = _vWindowBytesWide - 1;
+	_clipHeight = _vWindowLinesTall - 1;
 }
 
 void Screen::setDisplayScan() {
@@ -164,18 +167,10 @@ void Screen::checkScroll() {
 	warning("TODO");
 }
 
-void Screen::copyBF1BF2() {
-	warning("TODO");
-}
-
-void Screen::copyBF2Vid() {
-	warning("TODO");
-}
-
 void Screen::setBufferScan() {
-	_clipWidth = _vm->_room->_vWindowBytesWide - 1;
+	_clipWidth = _vWindowBytesWide - 1;
 	_windowXAdd = (320 - _clipWidth) >> 1;
-	_clipHeight = _vm->_room->_vWindowLinesTall - 1;
+	_clipHeight = _vWindowLinesTall - 1;
 	_windowYAdd = (176 - _clipHeight) >> 1;
 }
 
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 875b665c18..6ede482e61 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -73,6 +73,11 @@ public:
 	byte _manPal[0x60];
 	byte _scaleTable1[256];
 	byte _scaleTable2[256];
+	int _vWindowWidth;
+	int _vWindowHeight;
+	int _vWindowBytesWide;
+	int _bufferBytesWide;
+	int _vWindowLinesTall;
 public:
 	Screen(AccessEngine *vm);
 
@@ -119,10 +124,6 @@ public:
 
 	void checkScroll();
 
-	void copyBF1BF2();
-
-	void copyBF2Vid();
-
 	void setBufferScan();
 
 	void setScaleTable(int scale);
-- 
cgit v1.2.3


From 146f6b5df40d2800432866389f549838921203d2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 20:56:06 -0400
Subject: ACCESS: Fix rendering of scene background

---
 engines/access/access.cpp |  7 +++++--
 engines/access/room.cpp   | 12 +++++++-----
 engines/access/room.h     |  3 +++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9c0df1ac30..9b10e4f8c3 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -159,7 +159,7 @@ void AccessEngine::initialize() {
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
 
-	_buffer1.create(g_system->getWidth(), g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
+	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
 	_buffer2.create(g_system->getWidth(), g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
 }
 
@@ -316,7 +316,10 @@ void AccessEngine::copyRects() {
 }
 
 void AccessEngine::copyBF1BF2() {
-	_buffer2.copyFrom(_buffer1);
+	_buffer2.copyRectToSurface(_buffer1, 0, 0,
+		Common::Rect(_buffer1._scrollX, _buffer1._scrollY,
+		_buffer1._scrollX + _screen->_vWindowBytesWide,
+		_buffer1._scrollY + _screen->_vWindowLinesTall));
 }
 
 void AccessEngine::copyBF2Vid() {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index c258e076d8..cd39109e63 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -26,9 +26,6 @@
 #include "access/resources.h"
 #include "access/room.h"
 
-#define TILE_WIDTH 16
-#define TILE_HEIGHT 16
-
 namespace Access {
 
 Room::Room(AccessEngine *vm) : Manager(vm) {
@@ -309,15 +306,18 @@ void Room::buildScreen() {
 void Room::buildColumn(int playX, int screenX) {
 	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
 		_playFieldWidth + playX;
-	byte *pDest = (byte *)_vm->_buffer1.getPixels();
 
 	for (int y = 0; y <= _vm->_screen->_vWindowHeight; ++y) {
 		byte *pTile = _tile + (*pSrc << 8);
+		byte *pDest = (byte *)_vm->_buffer1.getBasePtr(screenX, y * TILE_HEIGHT);
 
 		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
 			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
-			pDest += _vm->_screen->_vWindowWidth;
+			pTile += TILE_WIDTH;
+			pDest += _vm->_buffer1.pitch;
 		}
+
+		pSrc += _playFieldWidth;
 	}
 }
 
@@ -348,6 +348,8 @@ void Room::loadPlayField(int fileNum, int subfile) {
 	int numBlocks = playData[8];
 	_plotter.load(&stream, numWalls, numBlocks);
 
+	_playFieldWidth = playData[0];
+	_playFieldHeight = playData[1];
 	screen._vWindowWidth = playData[3];
 	screen._vWindowBytesWide = screen._vWindowWidth << 4;
 	screen._bufferBytesWide = screen._vWindowBytesWide + 16;
diff --git a/engines/access/room.h b/engines/access/room.h
index ce3c4dc36e..18637e4283 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -28,6 +28,9 @@
 #include "common/rect.h"
 #include "access/data.h"
 
+#define TILE_WIDTH 16
+#define TILE_HEIGHT 16
+
 namespace Access {
 
 class Plotter {
-- 
cgit v1.2.3


From ed645e435a641cc3be95bfe946d2c08d2ab3836b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 21:07:27 -0400
Subject: ACCESS: Fix clearing pending images list each frame

---
 engines/access/access.cpp | 2 --
 engines/access/access.h   | 2 --
 engines/access/room.cpp   | 6 ++----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9b10e4f8c3..3a773a94c1 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -60,8 +60,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_converseMode = 0;
 	_startAboutBox = 0;
 	_startTravelBox = 0;
-	_numImages = 0;
-	_nextImage = 0;
 	_numAnimTimers = 0;
 	_startup = 0;
 	_currentCharFlag = false;
diff --git a/engines/access/access.h b/engines/access/access.h
index 770bd030ff..08b5ae3935 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -142,8 +142,6 @@ public:
 	int _selectCommand;
 	bool _normalMouse;
 	int _mouseMode;
-	int _numImages;
-	int _nextImage;
 
 	int _currentManOld;
 	byte *_man;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index cd39109e63..3e9e9e65aa 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -57,10 +57,9 @@ void Room::doRoom() {
 
 	while (!_vm->shouldQuit()) {
 		if (!reloadFlag) {
-			_vm->_numImages = 0;
+			_vm->_images.clear();
 			_vm->_newRects.clear();
 			_vm->_oldRects.clear();
-			_vm->_nextImage = 0;
 			_vm->_numAnimTimers = 0;
 
 			reloadRoom();
@@ -71,7 +70,7 @@ void Room::doRoom() {
 		_function = 0;
 
 		while (!_vm->shouldQuit()) {
-			_vm->_numImages = 0;
+			_vm->_images.clear();
 			if (_vm->_startup != -1 && --_vm->_startup != 0) {
 				_vm->_events->showCursor();
 				_vm->_screen->fadeIn();
@@ -84,7 +83,6 @@ void Room::doRoom() {
 			// Handle any events
 			_vm->_events->pollEvents();
 
-			_vm->_nextImage = 0;
 			_vm->_player->walk();
 			_vm->_sound->midiRepeat();
 			_vm->_screen->checkScroll();
-- 
cgit v1.2.3


From 28bfe7374930cd78f722451b8754822a11dd500d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 22:23:08 -0400
Subject: ACCESS: Implemented cmdSpecial script opcode

---
 engines/access/amazon/amazon_scripts.cpp |  5 +++++
 engines/access/amazon/amazon_scripts.h   |  2 ++
 engines/access/screen.cpp                | 18 ++++++++++++++++++
 engines/access/screen.h                  |  6 ++++++
 engines/access/scripts.cpp               | 21 ++++++++++++++++++++-
 engines/access/scripts.h                 |  2 ++
 6 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 1d3e7b4b76..d7e84394b5 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -31,6 +31,11 @@ namespace Amazon {
 AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 }
 
+void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
+	warning("TODO");
+}
+
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 08fbc3a0f2..b8fdaaa7f3 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -31,6 +31,8 @@ namespace Access {
 namespace Amazon {
 
 class AmazonScripts: public Scripts {
+protected:
+	virtual void executeSpecial(int commandIndex, int param1, int param2);
 public:
 	AmazonScripts(AccessEngine *vm);
 };
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 6f9b53994d..4673bb6136 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -40,6 +40,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	Common::fill(&_manPal[0], &_manPal[0x60], 0);
 	Common::fill(&_scaleTable1[0], &_scaleTable1[256], 0);
 	Common::fill(&_scaleTable2[0], &_scaleTable2[256], 0);
+	_savedPaletteCount = 0;
 	_vesaMode = 0;
 	_vesaCurrentWin = 0;
 	_currentPanel = 0;
@@ -114,6 +115,23 @@ void Screen::updatePalette() {
 	updateScreen();
 }
 
+void Screen::savePalette() {
+	Common::copy(&_rawPalette[0], &_rawPalette[PALETTE_SIZE],
+		&_savedPalettes[_savedPaletteCount][0]);
+
+	if (++_savedPaletteCount == 2)
+		_savedPaletteCount = 1;
+}
+
+void Screen::restorePalette() {
+	if (--_savedPaletteCount < 0)
+		_savedPaletteCount = 0;
+
+	Common::copy(&_savedPalettes[_savedPaletteCount][0],
+		&_savedPalettes[_savedPaletteCount][PALETTE_SIZE], &_rawPalette[0]);
+}
+
+
 void Screen::forceFadeOut() {
 	const int FADE_AMOUNT = 2;
 	bool repeatFlag;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 6ede482e61..d759ae119e 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -52,6 +52,8 @@ private:
 	AccessEngine *_vm;
 	byte _tempPalette[PALETTE_SIZE];
 	byte _rawPalette[PALETTE_SIZE];
+	byte _savedPalettes[2][PALETTE_SIZE];
+	int _savedPaletteCount;
 	int _vesaCurrentWin;
 	int _currentPanel;
 	Common::Point _msVirtualOffset;
@@ -117,6 +119,10 @@ public:
 
 	void loadRawPalette(Common::SeekableReadStream *stream);
 
+	void savePalette();
+
+	void restorePalette();
+
 	/**
 	 * Copy a buffer to the screen
 	 */
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 19633544f4..0e1d421c34 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -326,7 +326,26 @@ void Scripts::cmdRemoveLast() {
 	--_vm->_numAnimTimers;
 }
 
-void Scripts::CMDSPECIAL() { error("TODO"); }
+void Scripts::CMDSPECIAL() { 
+	_specialFunction = _data->readUint16LE();
+	int p1 = _data->readUint16LE();
+	int p2 = _data->readUint16LE();
+
+	if (_specialFunction == 1) {
+		if (_vm->_establishTable[p2] == 1)
+			return;
+
+		_vm->_screen->savePalette();
+	}
+
+	executeSpecial(_specialFunction, p1, p2);
+
+	if (_specialFunction == 1) {
+		_vm->_screen->restorePalette();
+		_vm->_room->_function = 3;
+	}
+}
+
 void Scripts::CMDSETCYCLE() { error("TODO"); }
 void Scripts::CMDCYCLE() { error("TODO"); }
 void Scripts::CMDCHARSPEAK() { error("TODO"); }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 495c4c5f9f..0916b9e9b1 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -37,9 +37,11 @@ class Scripts {
 private:
 	const byte *_rawData;
 	Common::MemoryReadStream *_data;
+	int _specialFunction;
 protected:
 	AccessEngine *_vm;
 
+	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
 	void CMDOBJECT();
 	void CMDENDOBJECT();
-- 
cgit v1.2.3


From d6404a10adc4a1b6973894291ffbc6d87ac96071 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 22:45:15 -0400
Subject: ACCESS: Fix compiler warnings and deallocation crash on exit

---
 engines/access/access.cpp             | 12 +-----------
 engines/access/access.h               |  9 ++-------
 engines/access/amazon/amazon_game.cpp |  1 -
 engines/access/asurface.cpp           |  4 ++++
 engines/access/asurface.h             |  4 +++-
 engines/access/screen.h               |  2 ++
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 3a773a94c1..2ffc479748 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -114,9 +114,6 @@ AccessEngine::~AccessEngine() {
 	delete _scripts;
 	delete _sound;
 
-	_buffer1.free();
-	_buffer2.free();
-
 	freeCells();
 	delete[] _man1;
 	delete[] _inactive;
@@ -198,16 +195,9 @@ void AccessEngine::loadCells(Common::Array<RoomInfo::CellIdent> &cells) {
 	}
 }
 
-void AccessEngine::clearCellTable() {
-	for (int i = 0; i < 100; ++i) {
-		delete _objectsTable[i];
-		_objectsTable[i] = nullptr;
-	}
-}
-
 void AccessEngine::freeCells() {
 	for (int i = 0; i < 100; ++i) {
-		delete[] _objectsTable[i];
+		delete _objectsTable[i];
 		_objectsTable[i] = nullptr;
 	}
 }
diff --git a/engines/access/access.h b/engines/access/access.h
index 08b5ae3935..d919ae83f9 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -30,7 +30,7 @@
 #include "common/util.h"
 #include "engines/engine.h"
 #include "graphics/surface.h"
-#include "access\/animation.h"
+#include "access/animation.h"
 #include "access/data.h"
 #include "access/debugger.h"
 #include "access/events.h"
@@ -213,12 +213,7 @@ public:
 	void loadCells(Common::Array<RoomInfo::CellIdent> &cells);
 
 	/**
-	* Clear the cell table
-	*/
-	void clearCellTable();
-
-	/**
-	* Free the cell data
+	* Free the sprites list
 	*/
 	void freeCells();
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index fe158125b5..d0a5b6eecc 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -161,7 +161,6 @@ void AmazonEngine::doTent() {
 
 void AmazonEngine::setupGame() {
 	_chapter = 1;
-	clearCellTable();
 
 	// Setup timers
 	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index ba75607637..619c4499e9 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -104,6 +104,10 @@ void ASurface::init() {
 	_scrollX = _scrollY = 0;
 }
 
+ASurface::~ASurface() {
+	free();
+}
+
 void ASurface::clearBuffer() {
 	byte *pSrc = (byte *)getPixels();
 	Common::fill(pSrc, pSrc + w * h, 0);
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 776b9506e9..4f172ae309 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -46,8 +46,10 @@ public:
 
 	static void init();
 public:
-	virtual void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt);
+	virtual void plotFrame(SpriteFrame *frame, const Common::Point &pt);
 public:
+	virtual ~ASurface();
+
 	void clearBuffer();
 
 	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
diff --git a/engines/access/screen.h b/engines/access/screen.h
index d759ae119e..ba1c22931c 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -83,6 +83,8 @@ public:
 public:
 	Screen(AccessEngine *vm);
 
+	virtual ~Screen() {}
+
 	void setDisplayScan();
 
 	void setPanel(int num);
-- 
cgit v1.2.3


From 79e743ba82b14dce808f3dcda6e173fa6f138137 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 22:54:04 -0400
Subject: ACCESS: Fix more gcc compiler warnings

---
 engines/access/amazon/amazon_game.cpp      | 2 +-
 engines/access/amazon/amazon_resources.cpp | 2 +-
 engines/access/asurface.cpp                | 6 +++---
 engines/access/decompress.h                | 5 -----
 engines/access/module.mk                   | 8 ++++----
 engines/access/room.cpp                    | 2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d0a5b6eecc..49ae766325 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -140,7 +140,7 @@ void AmazonEngine::doTitle() {
 	_sound->playSound(1);
 
 	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (int _pCount = 0; _pCount < 3; ++_pCount) {
+	for (_pCount = 0; _pCount < 3; ++_pCount) {
 		_buffer2.copyFrom(_buffer1);
 		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 87f2966d8e..15cf190d4a 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -977,7 +977,7 @@ const byte LETTER[] = {
 	0x0, 0x0, 0x0, 0x30, 0x0, 0x5, 0x0, 0xFF, 0xFF
 };
 
-extern const byte *CHARTBL[] = {
+const byte *CHARTBL[] = {
 	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT,
 	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
 	ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS,
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 619c4499e9..6df8a4ae3d 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -57,9 +57,9 @@ SpriteResource::~SpriteResource() {
 }
 
 SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize) {
-	int w = stream.readUint16LE();
-	int h = stream.readUint16LE();
-	create(w, h, Graphics::PixelFormat::createFormatCLUT8());
+	int xSize = stream.readUint16LE();
+	int ySize = stream.readUint16LE();
+	create(xSize, ySize, Graphics::PixelFormat::createFormatCLUT8());
 	
 	// Empty surface
 	byte *data = (byte *)getPixels();
diff --git a/engines/access/decompress.h b/engines/access/decompress.h
index 522bfb2acf..400aee476c 100644
--- a/engines/access/decompress.h
+++ b/engines/access/decompress.h
@@ -1,8 +1,3 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
 /* ScummVM - Graphic Adventure Engine
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 7c089fefb3..6f906a9c21 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -17,10 +17,10 @@ MODULE_OBJS := \
 	screen.o \
 	scripts.o \
 	sound.o \
-	amazon\amazon_game.o \
-	amazon\amazon_resources.o \
-	amazon\amazon_room.o \
-	amazon\amazon_scripts.o
+	amazon/amazon_game.o \
+	amazon/amazon_resources.o \
+	amazon/amazon_room.o \
+	amazon/amazon_scripts.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 3e9e9e65aa..66231e60e1 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -445,6 +445,6 @@ RoomInfo::RoomInfo(const byte *data) {
 
 		_sounds.push_back(fi);
 	}
-};
+}
 
 } // End of namespace Access
-- 
cgit v1.2.3


From cf901ae142044227f5c34c33ab45eb8a0351ce93 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 Aug 2014 23:03:18 -0400
Subject: ACCESS: Give default draw implementations for sprite drawing routines

---
 engines/access/asurface.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 6df8a4ae3d..5824545af7 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -226,26 +226,19 @@ void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
 }
 
 void ASurface::sPlotB(SpriteFrame *frame, const Common::Point &pt) {
-	error("TODO");
+	frame->copyTo(this, pt);
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Point &pt) {
-	error("TODO");
+	frame->copyTo(this, pt);
 }
 
 void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
-	error("TODO");
+	frame->copyTo(this, pt);
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
-	byte *srcP = (byte *)getBasePtr(bounds.left, bounds.top + _scrollY);
-	byte *destP = (byte *)getBasePtr(bounds.left, bounds.top); /* + _windowYAdd */
-
-	for (int y = 0; y < bounds.height(); ++y) {
-		Common::copy(srcP, srcP + bounds.width(), destP);
-		srcP += src->pitch;
-		destP += this->pitch;
-	}
+	copyRectToSurface(*src, bounds.left, bounds.top, bounds);
 }
 
 } // End of namespace Access
-- 
cgit v1.2.3


From f66f01bf89b4ae071bdb299e43fd34c1bcb8a3ea Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 14 Aug 2014 20:49:30 -0400
Subject: ACCESS: Implemented player walk methods

---
 engines/access/events.cpp |   1 +
 engines/access/events.h   |   1 +
 engines/access/player.cpp | 400 +++++++++++++++++++++++++++++++++++++++++++++-
 engines/access/player.h   |  22 +++
 engines/access/screen.cpp |   1 +
 engines/access/screen.h   |   1 +
 6 files changed, 425 insertions(+), 1 deletion(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 73feefee97..88e783e6d2 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -39,6 +39,7 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_frameCounter = 10;
 	_priorFrameTime = 0;
 	_leftButton = false;
+	_mouseMove = false;
 }
 
 EventsManager::~EventsManager() {
diff --git a/engines/access/events.h b/engines/access/events.h
index 55f04f17af..aa01543381 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -51,6 +51,7 @@ public:
 	CursorType _cursorId;
 	bool _leftButton;
 	Common::Point _mousePos;
+	bool _mouseMove;
 public:
 	/**
 	 * Constructor
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 969df0025f..6fab689ee0 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -50,6 +50,9 @@ Player::Player(AccessEngine *vm): Manager(vm) {
 	_upDelta = _downDelta = 0;
 	_scrollConst = 0;
 	_roomNumber = 0;
+	_collideFlag = false;
+	_move = NONE;
+	_playerDirection = NONE;
 }
 
 void Player::load() {
@@ -148,7 +151,53 @@ void Player::calcManScale() {
 }
 
 void Player::walk() {
-	warning("TODO: Player::walk");
+	_collideFlag = false;
+	_playerDirection = NONE;
+	
+	if (_playerOff != 0)
+		return;
+	else if (_vm->_timerFlag) {
+		plotCom3();
+		return;
+	}
+
+	switch (_move) {
+	case UP:
+		_vm->_events->_mouseMove = false;
+		walkUp();
+		break;
+	case DOWN:
+		_vm->_events->_mouseMove = false;
+		walkDown();
+		break;
+	case LEFT:
+		_vm->_events->_mouseMove = false;
+		walkLeft();
+		break;
+	case RIGHT:
+		_vm->_events->_mouseMove = false;
+		walkRight();
+		break;
+	case UPLEFT:
+		_vm->_events->_mouseMove = false;
+		walkUpLeft();
+		break;
+	case DOWNLEFT:
+		_vm->_events->_mouseMove = false;
+		walkDownLeft();
+		break;
+	case UPRIGHT:
+		_vm->_events->_mouseMove = false;
+		walkUpRight();
+		break;
+	case DOWNRIGHT:
+		_vm->_events->_mouseMove = false;
+		walkDownRight();
+		break;
+	default:
+		checkMove();
+		break;
+	}
 }
 
 void Player::calcPlayer() {
@@ -159,4 +208,353 @@ void Player::calcPlayer() {
 	_playerY = _rawPlayer.y - scr._bufferStart.y;
 }
 
+void Player::walkUp() {
+	if (_frame > _upWalkMax || _frame < _upWalkMin)
+		_frame = _upWalkMin;
+
+	_playerDirection = UP;
+	int walkOff = _walkOffUp[_frame - _upWalkMin];
+	_rawYTempL = _vm->_screen->_scaleTable2[walkOff];
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff];
+	_rawXTemp = _rawPlayer.x;
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.y = _rawYTemp;
+		_rawPlayerLow.y = _rawYTempL;
+		
+		calcManScale();
+		if (_vm->_currentMan != 3 && (_frame == 17 || _frame == 21)) {
+			error("TODO: si = 0?");
+			// si = 0
+		}
+
+		if (++_frame > _upWalkMax)
+			_frame = _upWalkMin;
+
+		plotCom(0);
+	}
+}
+
+void Player::walkDown() {
+	if (_frame > _downWalkMax || _frame < _downWalkMin)
+		_frame = _downWalkMin;
+
+	_playerDirection = DOWN;
+	int walkOff = _walkOffDown[_frame - _downWalkMin];
+	_rawYTempL = _vm->_screen->_scaleTable2[walkOff];
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff];
+	_rawXTemp = _rawPlayer.x;
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.y = _rawYTemp;
+		_rawPlayerLow.y = _rawYTempL;
+
+		calcManScale();
+		if (_vm->_currentMan != 3 && (_frame == 10 || _frame == 14)) {
+			error("TODO: si = 0?");
+			// si = 0
+		}
+
+		if (++_frame > _upWalkMax)
+			_frame = _upWalkMin;
+
+		plotCom(0);
+	}
+}
+
+void Player::walkLeft() {
+	if (_frame > _sideWalkMax || _frame < _sideWalkMin)
+		_frame = _sideWalkMin;
+
+	_playerDirection = LEFT;
+
+	bool flag = _vm->_screen->_scrollEnd == 1;
+	if (!flag) {
+		calcPlayer();
+		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+			_vm->_screen->_scrollThreshold) > 0;
+	}
+	if (flag) {
+		int walkOffset = _walkOffLeft[_frame - _sideWalkMin];
+		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+	} else {
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+	}	
+	_rawYTemp = _rawPlayer.y;
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.x = _rawXTemp;
+		_rawPlayerLow.x = _rawTempL;
+		++_frame;
+
+		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
+			error("TODO: si = 0?");
+		}
+
+		if (_frame > _sideWalkMax)
+			_frame = _sideWalkMin;
+
+		plotCom1();
+	}
+}
+
+void Player::walkRight() {
+	if (_frame > _sideWalkMax || _frame < _sideWalkMin)
+		_frame = _sideWalkMin;
+
+	_playerDirection = RIGHT;
+
+	bool flag = _vm->_screen->_scrollEnd == 2;
+	if (!flag) {
+		calcPlayer();
+		flag = (_vm->_screen->_clipWidth - _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+			_vm->_screen->_scrollThreshold) > 0;
+	}
+	if (flag) {
+		int walkOffset = _walkOffLeft[_frame - _sideWalkMin];
+		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+	} else {
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+	}
+	_rawYTemp = _rawPlayer.y;
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.x = _rawXTemp;
+		_rawPlayerLow.x = _rawTempL;
+		++_frame;
+
+		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
+			error("TODO: si = 0?");
+		}
+
+		if (_frame > _sideWalkMax)
+			_frame = _sideWalkMin;
+
+		plotCom1();
+	}
+}
+
+void Player::walkUpLeft() {
+	if (_frame > _diagUpWalkMax || _frame < _diagUpWalkMin)
+		_frame = _diagUpWalkMin;
+
+	_playerDirection = UPLEFT;
+
+	int walkOffset;
+	bool flag = _vm->_screen->_scrollEnd == 1;
+	if (!flag) {
+		calcPlayer();
+		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+			_vm->_screen->_scrollThreshold) > 0;
+	}
+	if (flag) {
+		walkOffset = _walkOffUL[_frame - _diagUpWalkMin].x;
+		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+	} else {
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+	}
+	
+	walkOffset = _walkOffUL[_frame - _diagUpWalkMin].y;
+	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.x = _rawXTemp;
+		_rawPlayer.y = _rawYTemp;
+		_rawPlayerLow.x = _rawTempL;
+		_rawPlayerLow.y = _rawYTempL;
+
+		++_frame;
+		calcManScale();
+
+		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
+			error("TODO: si = 0?");
+		}
+
+		if (_frame > _diagUpWalkMax)
+			_frame = _diagUpWalkMin;
+
+		plotCom1();
+	}
+}
+
+void Player::walkDownLeft() {
+	if (_frame > _diagDownWalkMax || _frame < _diagDownWalkMin)
+		_frame = _diagDownWalkMin;
+
+	_playerDirection = DOWNLEFT;
+
+	int walkOffset;
+	bool flag = _vm->_screen->_scrollEnd == 1;
+	if (!flag) {
+		calcPlayer();
+		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+			_vm->_screen->_scrollThreshold) > 0;
+	}
+	if (flag) {
+		walkOffset = _walkOffDL[_frame - _sideWalkMin].x;
+		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+	} else {
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+	}
+
+	walkOffset = _walkOffDL[_frame - _diagDownWalkMin].y;
+	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.x = _rawXTemp;
+		_rawPlayer.y = _rawYTemp;
+		_rawPlayerLow.x = _rawTempL;
+		_rawPlayerLow.y = _rawYTempL;
+
+		++_frame;
+		calcManScale();
+		
+		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
+			error("TODO: si = 0?");
+		}
+
+		if (_frame > _diagDownWalkMax)
+			_frame = _diagDownWalkMin;
+
+		plotCom1();
+	}
+}
+
+void Player::walkUpRight() {
+	if (_frame > _diagUpWalkMax || _frame < _diagUpWalkMin)
+		_frame = _diagUpWalkMin;
+
+	_playerDirection = UPLEFT;
+
+	int walkOffset;
+	bool flag = _vm->_screen->_scrollEnd == 1;
+	if (!flag) {
+		calcPlayer();
+		flag = (_vm->_screen->_clipWidth - _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+			_vm->_screen->_scrollThreshold) > 0;
+	}
+	if (flag) {
+		walkOffset = _walkOffUR[_frame - _diagUpWalkMin].x;
+		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+	} else {
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+	}
+
+	walkOffset = _walkOffUL[_frame - _diagUpWalkMin].y;
+	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.x = _rawXTemp;
+		_rawPlayer.y = _rawYTemp;
+		_rawPlayerLow.x = _rawTempL;
+		_rawPlayerLow.y = _rawYTempL;
+
+		++_frame;
+		calcManScale();
+
+		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
+			error("TODO: si = 0?");
+		}
+
+		if (_frame > _diagUpWalkMax)
+			_frame = _diagUpWalkMin;
+
+		plotCom(0);
+	}
+}
+
+void Player::walkDownRight() {
+	if (_frame > _diagDownWalkMax || _frame < _diagDownWalkMin)
+		_frame = _diagDownWalkMin;
+
+	_playerDirection = DOWNRIGHT;
+
+	int walkOffset;
+	bool flag = _vm->_screen->_scrollEnd == 1;
+	if (!flag) {
+		calcPlayer();
+		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+			_vm->_screen->_scrollThreshold) > 0;
+	}
+	if (flag) {
+		walkOffset = _walkOffUR[_frame - _sideWalkMin].x;
+		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+	}
+	else {
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+	}
+
+	walkOffset = _walkOffDR[_frame - _diagDownWalkMin].y;
+	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+
+	if (codeWalls()) {
+		plotCom2();
+	} else {
+		_rawPlayer.x = _rawXTemp;
+		_rawPlayer.y = _rawYTemp;
+		_rawPlayerLow.x = _rawTempL;
+		_rawPlayerLow.y = _rawYTempL;
+
+		++_frame;
+		calcManScale();
+
+		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
+			error("TODO: si = 0?");
+		}
+
+		if (_frame > _diagDownWalkMax)
+			_frame = _diagDownWalkMin;
+
+		plotCom1();
+	}
+}
+
+void Player::checkMove() {
+	error("TODO");
+}
+
+void Player::plotCom(int v) {
+	error("TODO");
+}
+
+void Player::plotCom1() {
+	plotCom(2);
+}
+
+void Player::plotCom2() {
+	error("TODO");
+}
+
+void Player::plotCom3() {
+	error("TODO");
+}
+
+bool Player::codeWalls() {
+	error("TODO");
+}
+
 } // End of namespace Access
diff --git a/engines/access/player.h b/engines/access/player.h
index b491ed7e85..28189706de 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -31,6 +31,9 @@ namespace Access {
 
 #define PLAYER_DATA_COUNT 8
 
+enum Direction { NONE = 0, UP = 1, DOWN = 2, LEFT = 3, RIGHT = 4,
+	UPRIGHT = 5, DOWNRIGHT = 6, UPLEFT = 7, DOWNLEFT = 8 };
+
 class AccessEngine;
 
 class Player: public Manager {
@@ -44,6 +47,25 @@ private:
 	int _diagUpWalkMin, _diagUpWalkMax;
 	int _diagDownWalkMin, _diagDownWalkMax;
 	Common::Point _guard;
+	bool _collideFlag;
+	Direction _playerDirection;
+	Direction _move;
+
+	bool codeWalls();
+	void checkMove();
+	void plotCom(int v1);
+	void plotCom1();
+	void plotCom2();
+	void plotCom3();
+
+	void walkUp();
+	void walkDown();
+	void walkLeft();
+	void walkRight();
+	void walkUpLeft();
+	void walkDownLeft();
+	void walkUpRight();
+	void walkDownRight();
 public:
 	// Fields in original Player structure
 	int _field0;
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 4673bb6136..ca87784458 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -52,6 +52,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
+	_scrollEnd = 0;
 
 	_bufferBytesWide = _vWindowBytesWide = this->w;
 	_vWindowLinesTall = this->h;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index ba1c22931c..5ac6931b63 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -80,6 +80,7 @@ public:
 	int _vWindowBytesWide;
 	int _bufferBytesWide;
 	int _vWindowLinesTall;
+	int _scrollEnd;
 public:
 	Screen(AccessEngine *vm);
 
-- 
cgit v1.2.3


From 9547efad776899d1ff49a22e1baa5893080e5830 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 14 Aug 2014 22:02:47 -0400
Subject: ACCESS: Implemented player plotting methods

---
 engines/access/access.cpp             |  10 ---
 engines/access/access.h               |  19 +-----
 engines/access/amazon/amazon_room.cpp |   6 +-
 engines/access/animation.cpp          |   8 +--
 engines/access/asurface.cpp           |  12 ++++
 engines/access/asurface.h             |  13 ++++
 engines/access/player.cpp             | 119 +++++++++++++++++++++++++++++++---
 engines/access/player.h               |  14 +++-
 engines/access/room.cpp               |   2 +-
 9 files changed, 152 insertions(+), 51 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 2ffc479748..ad8405800b 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -51,10 +51,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
-	_man = nullptr;
-	_man1 = nullptr;
 	_inactive = nullptr;
-	_manPal1 = nullptr;
 	_music = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
@@ -115,9 +112,7 @@ AccessEngine::~AccessEngine() {
 	delete _sound;
 
 	freeCells();
-	delete[] _man1;
 	delete[] _inactive;
-	delete[] _manPal1;
 	delete[] _music;
 	delete[] _title;
 }
@@ -207,11 +202,6 @@ void AccessEngine::freeInactiveData() {
 	_inactive = nullptr;
 }
 
-void AccessEngine::freeManData() {
-	delete[] _man;
-	_man = nullptr;
-}
-
 void AccessEngine::establish(int v) {
 	_establishMode = 0;
 	_establishGroup = 0;
diff --git a/engines/access/access.h b/engines/access/access.h
index d919ae83f9..1e83c6e97c 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -70,15 +70,6 @@ enum AccessDebugChannels {
 
 struct AccessGameDescription;
 
-class ImageEntry {
-public:
-	int _frameNumber;
-	SpriteResource *_spritesPtr;
-	int _priority;
-	Common::Point _position;
-	int _flags;
-};
-
 class AccessEngine : public Engine {
 private:
 	/**
@@ -137,17 +128,14 @@ public:
 	Common::Array<Common::Rect> _newRects;
 	Common::Array<Common::Rect> _oldRects;
 	Common::Array<ExtraCell> _extraCells;
-	Common::Array<ImageEntry> _images;
+	ImageEntryList _images;
 	int _pCount;
 	int _selectCommand;
 	bool _normalMouse;
 	int _mouseMode;
 
 	int _currentManOld;
-	byte *_man;
-	byte *_man1;
 	byte *_inactive;
-	byte *_manPal1;
 	byte *_music;
 	byte *_title;
 	int _converseMode;
@@ -222,11 +210,6 @@ public:
 	 */
 	void freeInactiveData();
 
-	/**
-	 * Free animation data
-	 */
-	void freeManData();
-
 	void establish(int v);
 
 	void establishCenter(int v);
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index db163977ca..5cb1dfe59c 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -51,15 +51,15 @@ void AmazonRoom::reloadRoom() {
 		
 		switch (_vm->_currentMan) {
 		case 0:
-			_vm->_man1 = _vm->_files->loadFile("MAN.LZ");
+			_vm->_player->loadSprites("MAN.LZ");
 			break;
 
 		case 2:
-			_vm->_man1 = _vm->_files->loadFile("JMAN.LZ");
+			_vm->_player->loadSprites("JMAN.LZ");
 			break;
 
 		case 3:
-			_vm->_man1 = _vm->_files->loadFile("OVERHEAD.LZ");
+			_vm->_player->loadSprites("OVERHEAD.LZ");
 			_vm->_manScaleOff = 1;
 			break;
 
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 20772af8f0..4965f41105 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -210,10 +210,6 @@ void Animation::setFrame(AnimationFrame *frame) {
 	setFrame1(frame);
 }
 
-static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
-	return ie1._priority < ie2._priority;
-}
-
 void Animation::setFrame1(AnimationFrame *frame) {
 	_vm->_animation->_base.x = frame->_baseX;
 	_vm->_animation->_base.y = frame->_baseY;
@@ -234,9 +230,7 @@ void Animation::setFrame1(AnimationFrame *frame) {
 		ie._position = part->_position + _vm->_animation->_base;
 		ie._priority = part->_priority - ie._position.y;
 
-		assert(_vm->_images.size() < 35);
-		_vm->_images.push_back(ie);
-		Common::sort(_vm->_images.begin(), _vm->_images.end(), sortImagesY);
+		_vm->_images.addToList(&ie);
 	}
 }
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 5824545af7..ed614df974 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -82,6 +82,18 @@ SpriteFrame::~SpriteFrame() {
 
 /*------------------------------------------------------------------------*/
 
+static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
+	return ie1._priority < ie2._priority;
+}
+
+void ImageEntryList::addToList(ImageEntry *ie) {
+	assert(size() < 35);
+	push_back(*ie);
+	Common::sort(begin(), end(), sortImagesY);
+}
+
+/*------------------------------------------------------------------------*/
+
 int ASurface::_leftSkip;
 int ASurface::_rightSkip;
 int ASurface::_topSkip;
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 4f172ae309..d660ff60b6 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -88,6 +88,19 @@ public:
 	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
 };
 
+class ImageEntry {
+public:
+	int _frameNumber;
+	SpriteResource *_spritesPtr;
+	int _priority;
+	Common::Point _position;
+	int _flags;
+};
+
+class ImageEntryList : public Common::Array<ImageEntry> {
+public:
+	void addToList(ImageEntry *ie);
+};
 
 } // End of namespace Access
 
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 6fab689ee0..7c07c69b1a 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -28,13 +28,16 @@
 
 namespace Access {
 
-Player::Player(AccessEngine *vm): Manager(vm) {
+Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
 	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffUp[0], &_walkOffUp[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffDown[0], &_walkOffDown[PLAYER_DATA_COUNT], 0);
 
-	_field0 = 0;
+	_playerSprites = nullptr;
+	_playerSprites1 = nullptr;
+	_manPal1 = nullptr;
+	_frameNumber = 0;
 	_monData = nullptr;
 	_rawTempL = 0;
 	_rawXTemp = 0;
@@ -53,6 +56,12 @@ Player::Player(AccessEngine *vm): Manager(vm) {
 	_collideFlag = false;
 	_move = NONE;
 	_playerDirection = NONE;
+	_xFlag = _yFlag = 0;
+}
+
+Player::~Player() {
+	delete _playerSprites1;
+	delete[] _manPal1;
 }
 
 void Player::load() {
@@ -131,14 +140,28 @@ void Player::load() {
 		_diagDownWalkMax = 7;
 	}
 
-	_vm->_man = _vm->_man1;
-	if (_vm->_manPal1) {
-		Common::copy(_vm->_manPal1 + 0x270, _vm->_manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
+	_playerSprites = _playerSprites1;
+	if (_manPal1) {
+		Common::copy(_manPal1 + 0x270, _manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
 	} else {
 		Common::fill(_vm->_screen->_manPal, _vm->_screen->_manPal + 0x60, 0);
 	}
 }
 
+void Player::loadSprites(const Common::String &name) {
+	delete _playerSprites1;
+	_playerSprites = nullptr;
+
+	const byte *data = _vm->_files->loadFile(name);
+	_playerSprites1 = new SpriteResource(_vm, data, _vm->_files->_filesize,
+		DisposeAfterUse::YES);
+}
+
+void Player::freeSprites() {
+	delete _playerSprites;
+	_playerSprites = nullptr;
+}
+
 void Player::calcManScale() {
 	if (!_vm->_manScaleOff) {
 		_vm->_scale = (((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
@@ -534,11 +557,80 @@ void Player::walkDownRight() {
 }
 
 void Player::checkMove() {
-	error("TODO");
+	if (!_vm->_events->_mouseMove)
+		return;
+
+	if (_xFlag == 0 && _yFlag == 0) {
+		int xp = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
+		if (xp < 0)
+			xp = -xp;
+		int yp = _rawPlayer.y - _moveTo.y;
+		if (yp < 0)
+			yp = -yp;
+
+		if (xp < yp)
+			_xFlag = 1;
+		else
+			_yFlag = 1;
+	}
+
+	if (_yFlag == 1) {
+		int yd = _rawPlayer.y - _moveTo.y;
+		if ((yd >= 0 && yd <= _upDelta) || (yd < 0 && -yd <= _upDelta)) {
+			++_yFlag;
+			if (_xFlag) {
+				_vm->_events->_mouseMove = false;
+				_xFlag = _yFlag = 0;
+			} else {
+				++_xFlag;
+			}
+		} else {
+			if (yd >= 0)
+				walkUp();
+			else
+				walkDown();
+
+			if (_collideFlag) {
+				_vm->_events->_mouseMove = false;
+				_xFlag = _yFlag = 0;
+			}
+		}
+	} else if (_xFlag == 1) {
+		int xd = _rawPlayer.x - _moveTo.x;
+		if ((xd >= 0 && xd <= -_leftDelta) || (xd < 0 && -xd <= -_leftDelta)) {
+			++_xFlag;
+
+			if (_yFlag) {
+				_vm->_events->_mouseMove = false;
+				_xFlag = _yFlag = 0;
+			}
+		} else {
+			if (xd >= 0)
+				walkLeft();
+			else
+				walkRight();
+
+			if (_collideFlag) {
+				_vm->_events->_mouseMove = false;
+				_xFlag = _yFlag = 0;
+			}
+		}
+	} else if (!_yFlag) {
+		++_yFlag;
+	} else {
+		_vm->_events->_mouseMove = false;
+		_xFlag = _yFlag = 0;
+	}
+	
+	plotCom3();
 }
 
-void Player::plotCom(int v) {
-	error("TODO");
+void Player::plotCom(int flags) {
+	_flags &= ~2;
+	_flags &= ~8;
+	_flags |= flags;
+
+	plotCom3();
 }
 
 void Player::plotCom1() {
@@ -546,11 +638,18 @@ void Player::plotCom1() {
 }
 
 void Player::plotCom2() {
-	error("TODO");
+	if (_playerOff != 1)
+		_vm->_images.addToList(this);
 }
 
 void Player::plotCom3() {
-	error("TODO");
+	// Update the base ImageEntry fields for the player
+	_position = _rawPlayer;
+	_priority = _playerOffset.y;
+	_spritesPtr = _playerSprites;
+	_frameNumber = _frame;
+
+	plotCom2();
 }
 
 bool Player::codeWalls() {
diff --git a/engines/access/player.h b/engines/access/player.h
index 28189706de..a0167838a0 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
+#include "access/asurface.h"
 #include "access/data.h"
 
 namespace Access {
@@ -36,7 +37,7 @@ enum Direction { NONE = 0, UP = 1, DOWN = 2, LEFT = 3, RIGHT = 4,
 
 class AccessEngine;
 
-class Player: public Manager {
+class Player: public ImageEntry, Manager {
 private:
 	int _leftDelta, _rightDelta;
 	int _upDelta, _downDelta;
@@ -50,6 +51,11 @@ private:
 	bool _collideFlag;
 	Direction _playerDirection;
 	Direction _move;
+	int _xFlag, _yFlag;
+	Common::Point _moveTo;
+	SpriteResource *_playerSprites;
+	SpriteResource *_playerSprites1;
+	byte *_manPal1;
 
 	bool codeWalls();
 	void checkMove();
@@ -68,7 +74,6 @@ private:
 	void walkDownRight();
 public:
 	// Fields in original Player structure
-	int _field0;
 	byte *_monData;
 	int _walkOffRight[PLAYER_DATA_COUNT];
 	int _walkOffLeft[PLAYER_DATA_COUNT];
@@ -98,9 +103,14 @@ public:
 	Common::Point _rawPlayer;
 public:
 	Player(AccessEngine *vm);
+	~Player();
 
 	void load();
 
+	void loadSprites(const Common::String &name);
+
+	void freeSprites();
+
 	void calcManScale();
 
 	void walk();
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 66231e60e1..80bcc0082b 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -150,7 +150,7 @@ void Room::clearRoom() {
 	_vm->freeCells();
 	freePlayField();
 	_vm->freeInactiveData();
-	_vm->freeManData();
+	_vm->_player->freeSprites();
 }
 
 void Room::loadRoomData(const byte *roomData) {
-- 
cgit v1.2.3


From 66b2d471cf9cd23afe7b9d409a1cc5bd9f92464b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 14 Aug 2014 22:06:19 -0400
Subject: ACCESS: Change walking errors to TODO comments

---
 engines/access/player.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 7c07c69b1a..8cd129f0b2 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -249,8 +249,7 @@ void Player::walkUp() {
 		
 		calcManScale();
 		if (_vm->_currentMan != 3 && (_frame == 17 || _frame == 21)) {
-			error("TODO: si = 0?");
-			// si = 0
+			// TODO: si = 0?
 		}
 
 		if (++_frame > _upWalkMax)
@@ -278,8 +277,7 @@ void Player::walkDown() {
 
 		calcManScale();
 		if (_vm->_currentMan != 3 && (_frame == 10 || _frame == 14)) {
-			error("TODO: si = 0?");
-			// si = 0
+			// TODO: si = 0?
 		}
 
 		if (++_frame > _upWalkMax)
@@ -318,7 +316,7 @@ void Player::walkLeft() {
 		++_frame;
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			error("TODO: si = 0?");
+			// TODO: si = 0?
 		}
 
 		if (_frame > _sideWalkMax)
@@ -357,7 +355,7 @@ void Player::walkRight() {
 		++_frame;
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			error("TODO: si = 0?");
+			// TODO: si = 0?
 		}
 
 		if (_frame > _sideWalkMax)
@@ -404,7 +402,7 @@ void Player::walkUpLeft() {
 		calcManScale();
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			error("TODO: si = 0?");
+			// TODO: si = 0?
 		}
 
 		if (_frame > _diagUpWalkMax)
@@ -451,7 +449,7 @@ void Player::walkDownLeft() {
 		calcManScale();
 		
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			error("TODO: si = 0?");
+			// TODO: si = 0?
 		}
 
 		if (_frame > _diagDownWalkMax)
@@ -498,7 +496,7 @@ void Player::walkUpRight() {
 		calcManScale();
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			error("TODO: si = 0?");
+			// TODO: si = 0?
 		}
 
 		if (_frame > _diagUpWalkMax)
@@ -546,7 +544,7 @@ void Player::walkDownRight() {
 		calcManScale();
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			error("TODO: si = 0?");
+			// TODO: si = 0?
 		}
 
 		if (_frame > _diagDownWalkMax)
-- 
cgit v1.2.3


From 4a3ce2d27dabc2abe6e562089df4f37859e410f9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 Aug 2014 09:27:05 -0400
Subject: ACCESS: Implementing checkScroll

---
 engines/access/player.cpp | 175 ++++++++++++++++++++++++++++++++++++++++++----
 engines/access/player.h   |  12 +++-
 engines/access/room.cpp   |  10 ++-
 engines/access/room.h     |   2 +
 engines/access/screen.cpp |  19 +++--
 engines/access/screen.h   |  11 +--
 6 files changed, 201 insertions(+), 28 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 8cd129f0b2..a50b835e3e 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -52,6 +52,10 @@ Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
 	_leftDelta = _rightDelta = 0;
 	_upDelta = _downDelta = 0;
 	_scrollConst = 0;
+	_scrollFlag = false;
+	_scrollThreshold = 0;
+	_scrollAmount = 0;
+	_scrollEnd = 0;
 	_roomNumber = 0;
 	_collideFlag = false;
 	_move = NONE;
@@ -293,11 +297,11 @@ void Player::walkLeft() {
 
 	_playerDirection = LEFT;
 
-	bool flag = _vm->_screen->_scrollEnd == 1;
+	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
 		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
-			_vm->_screen->_scrollThreshold) > 0;
+			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
 		int walkOffset = _walkOffLeft[_frame - _sideWalkMin];
@@ -332,11 +336,11 @@ void Player::walkRight() {
 
 	_playerDirection = RIGHT;
 
-	bool flag = _vm->_screen->_scrollEnd == 2;
+	bool flag = _scrollEnd == 2;
 	if (!flag) {
 		calcPlayer();
 		flag = (_vm->_screen->_clipWidth - _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
-			_vm->_screen->_scrollThreshold) > 0;
+			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
 		int walkOffset = _walkOffLeft[_frame - _sideWalkMin];
@@ -372,11 +376,11 @@ void Player::walkUpLeft() {
 	_playerDirection = UPLEFT;
 
 	int walkOffset;
-	bool flag = _vm->_screen->_scrollEnd == 1;
+	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
 		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
-			_vm->_screen->_scrollThreshold) > 0;
+			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
 		walkOffset = _walkOffUL[_frame - _diagUpWalkMin].x;
@@ -419,11 +423,11 @@ void Player::walkDownLeft() {
 	_playerDirection = DOWNLEFT;
 
 	int walkOffset;
-	bool flag = _vm->_screen->_scrollEnd == 1;
+	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
 		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
-			_vm->_screen->_scrollThreshold) > 0;
+			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
 		walkOffset = _walkOffDL[_frame - _sideWalkMin].x;
@@ -466,11 +470,11 @@ void Player::walkUpRight() {
 	_playerDirection = UPLEFT;
 
 	int walkOffset;
-	bool flag = _vm->_screen->_scrollEnd == 1;
+	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
 		flag = (_vm->_screen->_clipWidth - _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
-			_vm->_screen->_scrollThreshold) > 0;
+			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
 		walkOffset = _walkOffUR[_frame - _diagUpWalkMin].x;
@@ -513,11 +517,11 @@ void Player::walkDownRight() {
 	_playerDirection = DOWNRIGHT;
 
 	int walkOffset;
-	bool flag = _vm->_screen->_scrollEnd == 1;
+	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
 		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
-			_vm->_screen->_scrollThreshold) > 0;
+			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
 		walkOffset = _walkOffUR[_frame - _sideWalkMin].x;
@@ -654,4 +658,151 @@ bool Player::codeWalls() {
 	error("TODO");
 }
 
+void Player::checkScroll() {
+	_scrollFlag = false;
+	if (_playerDirection == NONE)
+		return;
+
+	if ((_playerDirection == UPLEFT || _playerDirection == DOWNLEFT ||
+			_playerDirection == LEFT) && _playerX <= _scrollThreshold) {
+		// Scroll right
+		_scrollAmount = -(_playerX - _scrollThreshold);
+		_scrollFlag = true;
+		_vm->_screen->_scrollX -= _scrollAmount;
+		if (_vm->_screen->_scrollX < 0) {
+			_scrollFlag = true;
+			_vm->_screen->_scrollX += _scrollAmount;
+
+			while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
+				_vm->_screen->_scrollX -= TILE_WIDTH;
+				_vm->_screen->moveBufferLeft();
+				_vm->_room->buildColumn(_vm->_screen->_scrollCol -
+					_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+
+				if (_vm->_screen->_scrollX < TILE_WIDTH && _playerDirection != UPRIGHT) {
+					if (_playerDirection != DOWNRIGHT)
+						return;
+					goto finish;
+				}
+			}
+
+			_scrollEnd = 1;
+			_vm->_screen->_scrollX = 0;
+			_vm->_screen->_scrollCol = 0;
+		}
+	} else if ((_playerDirection == UPRIGHT || _playerDirection == DOWNRIGHT ||
+			_playerDirection == RIGHT) && (_vm->_screen->_clipWidth -
+			_playerX - _scrollThreshold) <= 0) {
+		// Scroll left
+		_scrollAmount = -(_vm->_screen->_clipWidth - _playerX - _scrollThreshold);
+		if ((_vm->_rScrollCol + _vm->_screen->_vWindowWidth) == _vm->_room->_playFieldWidth) {
+			_scrollEnd = 2;
+			_vm->_screen->_scrollX = 0;
+			_scrollFlag = true;
+		} else {
+			_scrollFlag = true;
+			_vm->_screen->_scrollX = _vm->_screen->_scrollX + _scrollAmount;
+
+			while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
+				_vm->_screen->_scrollX -= TILE_WIDTH;
+				++_vm->_screen->_scrollCol;
+				_vm->_screen->moveBufferLeft();
+				_vm->_room->buildColumn(_vm->_screen->_scrollCol +
+					_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+
+				if (_vm->_screen->_scrollX < TILE_WIDTH && _playerDirection != UPRIGHT) {
+					if (_playerDirection != DOWNRIGHT)
+						return;
+					goto finish;
+				}
+			}
+
+			_scrollEnd = 2;
+			_vm->_screen->_scrollX = 0;
+			_scrollFlag = true;
+		}
+	}
+
+	if ((_playerDirection == UPRIGHT || _playerDirection == UPLEFT ||
+			_playerDirection == UP) && _playerY <= _scrollThreshold) {
+		_scrollAmount = -(_playerY - _scrollThreshold);
+		_scrollFlag = true;
+		_vm->_screen->_scrollY -= _scrollAmount;
+		if (_vm->_screen->_scrollY >= 0)
+			return;
+
+		do {
+			_vm->_screen->_scrollY += TILE_HEIGHT;
+			if (--_vm->_screen->_scrollRow < 0)
+				break;
+
+			_vm->_screen->moveBufferDown();
+			_vm->_room->buildRow(_vm->_screen->_scrollRow, 0);
+
+			if (_vm->_screen->_scrollY >= 0)
+				return;
+		} while (!_vm->shouldQuit());
+
+		_scrollEnd = 3;
+		_vm->_screen->_scrollY = 0;
+		_vm->_screen->_scrollRow = 0;
+		return;
+	}
+
+finish:
+	if ((_playerDirection == DOWNRIGHT || _playerDirection == DOWNLEFT ||
+			_playerDirection == DOWN) && (_vm->_screen->_clipHeight -
+			_playerY - _scrollThreshold) <= 0) {
+		// Scroll up
+		if (scrollUp()) {
+			_scrollEnd = 4;
+			_vm->_screen->_scrollY = TILE_HEIGHT;
+			_scrollFlag = true;
+		}
+	}
+}
+
+bool Player::scrollUp() {
+	_scrollAmount = -(_vm->_screen->_clipHeight - _playerY - _scrollThreshold);
+	if ((_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight) >=
+			_vm->_room->_playFieldHeight)
+		return true;
+
+	_scrollFlag = true;
+	_vm->_screen->_scrollY = _vm->_screen->_scrollY + _scrollAmount;
+
+	while (_vm->_screen->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
+			_vm->_screen->_scrollY -= TILE_HEIGHT;
+		++_vm->_screen->_scrollRow;
+		_vm->_screen->moveBufferUp();
+
+		_vm->_room->buildRow(_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight,
+			_vm->_screen->_vWindowLinesTall * _vm->_screen->_bufferBytesWide);
+
+		if ((_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight) >=
+			_vm->_room->_playFieldHeight)
+			return true;
+
+		if (_vm->_screen->_scrollY <= TILE_HEIGHT)
+			return false;
+	}
+
+	return false;
+}
+
+bool Player::scrollDown() {
+	// TODO: Refactor checkScroll code here
+	return false;
+}
+
+bool Player::scrollLeft() {
+	// TODO: Refactor checkScroll code here
+	return false;
+}
+
+bool Player::scrollRight() {
+	// TODO: Refactor checkScroll code here
+	return false;
+}
+
 } // End of namespace Access
diff --git a/engines/access/player.h b/engines/access/player.h
index a0167838a0..a291f4589d 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -56,6 +56,7 @@ private:
 	SpriteResource *_playerSprites;
 	SpriteResource *_playerSprites1;
 	byte *_manPal1;
+	int _scrollEnd;
 
 	bool codeWalls();
 	void checkMove();
@@ -72,6 +73,10 @@ private:
 	void walkDownLeft();
 	void walkUpRight();
 	void walkDownRight();
+	bool scrollUp();
+	bool scrollDown();
+	bool scrollLeft();
+	bool scrollRight();
 public:
 	// Fields in original Player structure
 	byte *_monData;
@@ -94,8 +99,11 @@ public:
 	int _playerY;
 	int _frame;
 
-	// Additional globals we've added to new Player class
+	// Additional public globals we've added to new Player class
 	bool _playerOff;
+	bool _scrollFlag;
+	int _scrollThreshold;
+	int _scrollAmount;
 
 	// Additional globals that need to be saved
 	int _roomNumber;
@@ -116,6 +124,8 @@ public:
 	void walk();
 
 	void calcPlayer();
+
+	void checkScroll();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 80bcc0082b..1eeedb7c29 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -85,7 +85,7 @@ void Room::doRoom() {
 
 			_vm->_player->walk();
 			_vm->_sound->midiRepeat();
-			_vm->_screen->checkScroll();
+			_vm->_player->checkScroll();
 			doCommands();
 
 			// DOROOMFLASHBACK jump point
@@ -103,7 +103,7 @@ void Room::doRoom() {
 				break;
 			}
 
-			if (_vm->_screen->_scrollFlag) {
+			if (_vm->_player->_scrollFlag) {
 				_vm->copyBF1BF2();
 				_vm->_newRects.clear();
 				_function = 0;
@@ -209,7 +209,7 @@ void Room::loadRoomData(const byte *roomData) {
 	}
 
 	_vm->_scaleI = roomInfo._scaleI;
-	_vm->_screen->_scrollThreshold = roomInfo._scrollThreshold;
+	_vm->_player->_scrollThreshold = roomInfo._scrollThreshold;
 
 	// Handle loading scene palette data
 	if (roomInfo._paletteFile._fileNum != -1) {
@@ -319,6 +319,10 @@ void Room::buildColumn(int playX, int screenX) {
 	}
 }
 
+void Room::buildRow(int playY, int screenY) {
+	error("TODO: buildRow");
+}
+
 void Room::init4Quads() {
 	error("TODO: init4Quads");
 }
diff --git a/engines/access/room.h b/engines/access/room.h
index 18637e4283..0569a925c9 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -114,6 +114,8 @@ public:
 
 	void buildColumn(int playX, int screenX);
 
+	void buildRow(int playY, int screenY);
+
 	void init4Quads();
 };
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index ca87784458..771cfef7d2 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -46,13 +46,10 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_currentPanel = 0;
 	_hideFlag = true;
 	_loadPalFlag = false;
-	_scrollFlag = false;
-	_scrollThreshold = 0;
 	_startColor = _numColors = 0;
 	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
-	_scrollEnd = 0;
 
 	_bufferBytesWide = _vWindowBytesWide = this->w;
 	_vWindowLinesTall = this->h;
@@ -182,10 +179,6 @@ void Screen::copyBuffer(const byte *data) {
 	g_system->copyRectToScreen(destP, w, 0, 0, w, h);
 }
 
-void Screen::checkScroll() {
-	warning("TODO");
-}
-
 void Screen::setBufferScan() {
 	_clipWidth = _vWindowBytesWide - 1;
 	_windowXAdd = (320 - _clipWidth) >> 1;
@@ -230,4 +223,16 @@ void Screen::restoreScreen() {
 	_screenYOff = _screenSave._screenYOff;
 }
 
+void Screen::moveBufferLeft() {
+	error("TODO: LEFT");
+}
+
+void Screen::moveBufferDown() {
+	error("TODO: LEFT");
+}
+
+void Screen::moveBufferUp() {
+	error("TODO: UP");
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 5ac6931b63..79c978f1d0 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -65,8 +65,6 @@ private:
 public:
 	int _vesaMode;
 	bool _loadPalFlag;
-	bool _scrollFlag;
-	int _scrollThreshold;
 	int _startColor, _numColors;
 	Common::Point _bufferStart;
 	int _scrollCol, _scrollRow;
@@ -80,7 +78,6 @@ public:
 	int _vWindowBytesWide;
 	int _bufferBytesWide;
 	int _vWindowLinesTall;
-	int _scrollEnd;
 public:
 	Screen(AccessEngine *vm);
 
@@ -131,8 +128,6 @@ public:
 	 */
 	void copyBuffer(const byte *data);
 
-	void checkScroll();
-
 	void setBufferScan();
 
 	void setScaleTable(int scale);
@@ -146,6 +141,12 @@ public:
 	 * Restores previously saved screen display state variables
 	 */
 	void restoreScreen();
+
+	void moveBufferLeft();
+
+	void moveBufferDown();
+
+	void moveBufferUp();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From e3687ea12347f65d3e6e9927e161e076774ad252 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 Aug 2014 20:09:56 -0400
Subject: ACCESS: Refactored scroll direction code into separate methods

---
 engines/access/player.cpp | 171 +++++++++++++++++++++++-----------------------
 1 file changed, 85 insertions(+), 86 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index a50b835e3e..6f1df97072 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -666,98 +666,38 @@ void Player::checkScroll() {
 	if ((_playerDirection == UPLEFT || _playerDirection == DOWNLEFT ||
 			_playerDirection == LEFT) && _playerX <= _scrollThreshold) {
 		// Scroll right
-		_scrollAmount = -(_playerX - _scrollThreshold);
-		_scrollFlag = true;
-		_vm->_screen->_scrollX -= _scrollAmount;
-		if (_vm->_screen->_scrollX < 0) {
-			_scrollFlag = true;
-			_vm->_screen->_scrollX += _scrollAmount;
-
-			while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
-				_vm->_screen->_scrollX -= TILE_WIDTH;
-				_vm->_screen->moveBufferLeft();
-				_vm->_room->buildColumn(_vm->_screen->_scrollCol -
-					_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
-
-				if (_vm->_screen->_scrollX < TILE_WIDTH && _playerDirection != UPRIGHT) {
-					if (_playerDirection != DOWNRIGHT)
-						return;
-					goto finish;
-				}
-			}
-
-			_scrollEnd = 1;
-			_vm->_screen->_scrollX = 0;
-			_vm->_screen->_scrollCol = 0;
+		if (!scrollRight()) {
+			if (_playerDirection == DOWNLEFT)
+				goto scrollUp;
+			
+			return;
 		}
 	} else if ((_playerDirection == UPRIGHT || _playerDirection == DOWNRIGHT ||
 			_playerDirection == RIGHT) && (_vm->_screen->_clipWidth -
 			_playerX - _scrollThreshold) <= 0) {
 		// Scroll left
-		_scrollAmount = -(_vm->_screen->_clipWidth - _playerX - _scrollThreshold);
-		if ((_vm->_rScrollCol + _vm->_screen->_vWindowWidth) == _vm->_room->_playFieldWidth) {
-			_scrollEnd = 2;
-			_vm->_screen->_scrollX = 0;
-			_scrollFlag = true;
-		} else {
-			_scrollFlag = true;
-			_vm->_screen->_scrollX = _vm->_screen->_scrollX + _scrollAmount;
-
-			while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
-				_vm->_screen->_scrollX -= TILE_WIDTH;
-				++_vm->_screen->_scrollCol;
-				_vm->_screen->moveBufferLeft();
-				_vm->_room->buildColumn(_vm->_screen->_scrollCol +
-					_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
-
-				if (_vm->_screen->_scrollX < TILE_WIDTH && _playerDirection != UPRIGHT) {
-					if (_playerDirection != DOWNRIGHT)
-						return;
-					goto finish;
-				}
-			}
-
-			_scrollEnd = 2;
-			_vm->_screen->_scrollX = 0;
-			_scrollFlag = true;
+		if (!scrollLeft()) {
+			if (_playerDirection == DOWNRIGHT)
+				goto scrollUp;
+	
+			return;
 		}
 	}
 
 	if ((_playerDirection == UPRIGHT || _playerDirection == UPLEFT ||
 			_playerDirection == UP) && _playerY <= _scrollThreshold) {
-		_scrollAmount = -(_playerY - _scrollThreshold);
-		_scrollFlag = true;
-		_vm->_screen->_scrollY -= _scrollAmount;
-		if (_vm->_screen->_scrollY >= 0)
-			return;
-
-		do {
-			_vm->_screen->_scrollY += TILE_HEIGHT;
-			if (--_vm->_screen->_scrollRow < 0)
-				break;
-
-			_vm->_screen->moveBufferDown();
-			_vm->_room->buildRow(_vm->_screen->_scrollRow, 0);
-
-			if (_vm->_screen->_scrollY >= 0)
-				return;
-		} while (!_vm->shouldQuit());
-
-		_scrollEnd = 3;
-		_vm->_screen->_scrollY = 0;
-		_vm->_screen->_scrollRow = 0;
-		return;
-	}
-
-finish:
-	if ((_playerDirection == DOWNRIGHT || _playerDirection == DOWNLEFT ||
+		scrollDown();
+	} else {
+scrollUp:
+		if ((_playerDirection == DOWNRIGHT || _playerDirection == DOWNLEFT ||
 			_playerDirection == DOWN) && (_vm->_screen->_clipHeight -
 			_playerY - _scrollThreshold) <= 0) {
-		// Scroll up
-		if (scrollUp()) {
-			_scrollEnd = 4;
-			_vm->_screen->_scrollY = TILE_HEIGHT;
-			_scrollFlag = true;
+			// Scroll up
+			if (scrollUp()) {
+				_scrollEnd = 4;
+				_vm->_screen->_scrollY = TILE_HEIGHT;
+				_scrollFlag = true;
+			}
 		}
 	}
 }
@@ -791,18 +731,77 @@ bool Player::scrollUp() {
 }
 
 bool Player::scrollDown() {
-	// TODO: Refactor checkScroll code here
-	return false;
+	_scrollAmount = -(_playerY - _scrollThreshold);
+	_scrollFlag = true;
+	_vm->_screen->_scrollY -= _scrollAmount;
+	if (_vm->_screen->_scrollY >= 0)
+		return true;
+
+	do {
+		_vm->_screen->_scrollY += TILE_HEIGHT;
+		if (--_vm->_screen->_scrollRow < 0)
+			break;
+
+		_vm->_screen->moveBufferDown();
+		_vm->_room->buildRow(_vm->_screen->_scrollRow, 0);
+
+		if (_vm->_screen->_scrollY >= 0)
+			return false;
+	} while (!_vm->shouldQuit());
+
+	_scrollEnd = 3;
+	_vm->_screen->_scrollY = 0;
+	_vm->_screen->_scrollRow = 0;
+	return true;
 }
 
 bool Player::scrollLeft() {
-	// TODO: Refactor checkScroll code here
-	return false;
+	_scrollAmount = -(_vm->_screen->_clipWidth - _playerX - _scrollThreshold);
+	if ((_vm->_rScrollCol + _vm->_screen->_vWindowWidth) == _vm->_room->_playFieldWidth) {
+		_scrollEnd = 2;
+		_vm->_screen->_scrollX = 0;
+		_scrollFlag = true;
+		return true;
+	} else {
+		_scrollFlag = true;
+		_vm->_screen->_scrollX = _vm->_screen->_scrollX + _scrollAmount;
+
+		while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
+			_vm->_screen->_scrollX -= TILE_WIDTH;
+			++_vm->_screen->_scrollCol;
+			_vm->_screen->moveBufferLeft();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol +
+				_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+
+			if (_vm->_screen->_scrollX < TILE_WIDTH)
+				return _playerDirection == UPRIGHT;
+		}
+
+		return true;
+	}
 }
 
 bool Player::scrollRight() {
-	// TODO: Refactor checkScroll code here
-	return false;
+	_scrollAmount = -(_playerX - _scrollThreshold);
+	_scrollFlag = true;
+	_vm->_screen->_scrollX -= _scrollAmount;
+
+	if (_vm->_screen->_scrollX < 0) {
+		_scrollFlag = true;
+		_vm->_screen->_scrollX += _scrollAmount;
+
+		while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
+			_vm->_screen->_scrollX -= TILE_WIDTH;
+			_vm->_screen->moveBufferLeft();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol -
+				_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+
+			if (_vm->_screen->_scrollX < TILE_WIDTH)
+				return _playerDirection == UPLEFT;
+		}
+	}
+
+	return true;
 }
 
 } // End of namespace Access
-- 
cgit v1.2.3


From f8d64ae6bc47c0d1ea6efea45c28dd4902780ecb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 Aug 2014 20:26:09 -0400
Subject: ACCESS: Added code to update animations each frame

---
 engines/access/animation.cpp |  7 +++++++
 engines/access/animation.h   | 17 ++++++++++++++---
 engines/access/events.cpp    | 19 ++++++++++++-------
 engines/access/events.h      |  2 ++
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 4965f41105..31e53e5cf0 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -331,4 +331,11 @@ void AnimationManager::animate(int animId) {
 	anim->animate();
 }
 
+void AnimationManager::updateTimers() {
+	for (uint idx = 0; idx < _animationTimers.size(); ++idx) {
+		if (_animationTimers[idx]->_countdownTicks > 0)
+			_animationTimers[idx]->_countdownTicks--;
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/animation.h b/engines/access/animation.h
index c1b44a5621..f70aa3239d 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -49,14 +49,25 @@ public:
 	void freeAnimationData();
 	void loadAnimations(const byte *data, int size);
 	
-	void clearTimers();
-
 	Animation *findAnimation(int animId);
 	Animation *setAnimation(int animId);
 
+	void animate(int animId);
+
+	/**
+	 * Clear the list of currently active animations
+	 */
+	void clearTimers();
+
+	/**
+	 * Add an animation to the list of currently animating ones
+	 */
 	void setAnimTimer(Animation *anim);
 
-	void animate(int animId);
+	/**
+	 * Update the timing of all currently active animation
+	 */
+	void updateTimers();
 };
 
 class AnimationResource {
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 88e783e6d2..db69f7ba2d 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -144,15 +144,20 @@ void EventsManager::checkForNextFrameCounter() {
 		++_frameCounter;
 		_priorFrameTime = milli;
 
-		// Give time to the debugger
-		_vm->_debugger->onFrame();
+		nextFrame();
+	}
+}
 
-		// Signal the ScummVM debugger
-		_vm->_debugger->onFrame();
+void EventsManager::nextFrame() {
 
-		// TODO: Refactor for dirty rects
-		_vm->_screen->updateScreen();
-	}
+	// Give time to the debugger
+	_vm->_debugger->onFrame();
+
+	// Update timers
+	_vm->_animation->updateTimers();
+
+	// TODO: Refactor for dirty rects
+	_vm->_screen->updateScreen();
 }
 
 void EventsManager::delay(int time) {
diff --git a/engines/access/events.h b/engines/access/events.h
index aa01543381..c3faf6333b 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -47,6 +47,8 @@ private:
 	uint32 _priorFrameTime;
 
 	void checkForNextFrameCounter();
+
+	void nextFrame();
 public:
 	CursorType _cursorId;
 	bool _leftButton;
-- 
cgit v1.2.3


From 3475fda076779fa79f931b98d24e300fc02b479b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 Aug 2014 20:34:09 -0400
Subject: ACCESS: Fixes for updating animation frames

---
 engines/access/animation.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 31e53e5cf0..3a7424f1d0 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -106,6 +106,7 @@ void Animation::anim0() {
 			if (frame == nullptr) {
 				_frameNumber = 0;
 				_currentLoopCount = -1;
+				frame = calcFrame();
 			}
 
 			setFrame(frame);
@@ -124,6 +125,7 @@ void Animation::anim1() {
 		if (frame == nullptr) {
 			--_frameNumber;
 			_currentLoopCount = -1;
+			frame = calcFrame();
 		}
 
 		setFrame(frame);
@@ -198,7 +200,7 @@ void Animation::anim7() {
 }
 
 AnimationFrame *Animation::calcFrame() {
-	return _frames[_frameNumber];
+	return (_frameNumber < (int)_frames.size()) ? _frames[_frameNumber] : nullptr;
 }
 
 AnimationFrame *Animation::calcFrame1() {
@@ -206,6 +208,7 @@ AnimationFrame *Animation::calcFrame1() {
 }
 
 void Animation::setFrame(AnimationFrame *frame) {
+	assert(frame);
 	_countdownTicks += frame->_frameDelay;
 	setFrame1(frame);
 }
-- 
cgit v1.2.3


From a347435f26b32464944c3e304369c4c7df663478 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 Aug 2014 21:32:16 -0400
Subject: ACCESS: Added extra mouse handling to pollEvents

---
 engines/access/events.cpp | 12 +++++++++++-
 engines/access/events.h   |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index db69f7ba2d..f373c8b829 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -38,7 +38,7 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_cursorId = CURSOR_NONE;
 	_frameCounter = 10;
 	_priorFrameTime = 0;
-	_leftButton = false;
+	_leftButton = _rightButton = false;
 	_mouseMove = false;
 }
 
@@ -126,10 +126,20 @@ void EventsManager::pollEvents() {
 			return;
 		case Common::EVENT_KEYUP:
 			return;
+		case Common::EVENT_MOUSEMOVE:
+			_mousePos = event.mouse;
+			break;
 		case Common::EVENT_LBUTTONDOWN:
 			_leftButton = true;
 			return;
 		case Common::EVENT_LBUTTONUP:
+			_leftButton = false;
+			return;
+		case Common::EVENT_RBUTTONDOWN:
+			_rightButton = true;
+			return;
+		case Common::EVENT_RBUTTONUP:
+			_rightButton = false;
 			return;
 		default:
  			break;
diff --git a/engines/access/events.h b/engines/access/events.h
index c3faf6333b..7ee03ac21e 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -51,7 +51,7 @@ private:
 	void nextFrame();
 public:
 	CursorType _cursorId;
-	bool _leftButton;
+	bool _leftButton, _rightButton;
 	Common::Point _mousePos;
 	bool _mouseMove;
 public:
-- 
cgit v1.2.3


From fab6d7883e56a4fdebcabaaf0f911265fbd06a30 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 16 Aug 2014 11:27:37 +0200
Subject: ACCESS: Update TODOs

---
 engines/access/amazon/amazon_game.cpp    |  4 +-
 engines/access/amazon/amazon_scripts.cpp |  2 +-
 engines/access/player.cpp                |  2 +-
 engines/access/screen.cpp                |  2 +-
 engines/access/scripts.cpp               | 72 ++++++++++++++++----------------
 5 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 49ae766325..0497dd8d4d 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -152,11 +152,11 @@ void AmazonEngine::doTitle() {
 }
 
 void AmazonEngine::doOpening() {
-	// TODO
+	warning("TODO doOpening");
 }
 
 void AmazonEngine::doTent() {
-	// TODO
+	warning("TODO doTent");
 }
 
 void AmazonEngine::setupGame() {
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d7e84394b5..bc86c95a6d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -32,7 +32,7 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 }
 
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
-	warning("TODO");
+	warning("TODO executeSpecial");
 }
 
 
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 6f1df97072..0e005f936e 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -655,7 +655,7 @@ void Player::plotCom3() {
 }
 
 bool Player::codeWalls() {
-	error("TODO");
+	error("TODO codeWalls");
 }
 
 void Player::checkScroll() {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 771cfef7d2..9871fb1c3e 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -228,7 +228,7 @@ void Screen::moveBufferLeft() {
 }
 
 void Screen::moveBufferDown() {
-	error("TODO: LEFT");
+	error("TODO: DOWN");
 }
 
 void Screen::moveBufferUp() {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 0e1d421c34..ea93a04e9b 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -116,9 +116,9 @@ void Scripts::executeCommand(int commandIndex) {
 	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::CMDOBJECT() { error("TODO"); }
+void Scripts::CMDOBJECT() { error("TODO CMDOBJECT"); }
 
-void Scripts::CMDENDOBJECT() { error("TODO"); }
+void Scripts::CMDENDOBJECT() { error("TODO ENDOBJECT"); }
 
 void Scripts::cmdJumpLook() {
 	if (_vm->_selectCommand == 0)
@@ -165,7 +165,7 @@ void Scripts::cmdJumpTalk() {
 void Scripts::cmdNull() {
 }
 
-void Scripts::CMDPRINT() { error("TODO"); }
+void Scripts::CMDPRINT() { error("TODO CMDPRINT"); }
 
 void Scripts::cmdRetPos() {
 	_endFlag = true;
@@ -221,9 +221,9 @@ void Scripts::cmdCheckInventory() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSETTEX() { error("TODO"); }
-void Scripts::CMDNEWROOM() { error("TODO"); }
-void Scripts::CMDCONVERSE() { error("TODO"); }
+void Scripts::CMDSETTEX() { error("TODO CMDSETTEX"); }
+void Scripts::CMDNEWROOM() { error("TODO CMDNEWROOM"); }
+void Scripts::CMDCONVERSE() { error("TODO CMDCONVERSE"); }
 
 void Scripts::cmdCheckFrame() {
 	int id = _data->readUint16LE();
@@ -277,9 +277,9 @@ void Scripts::cmdSetAnim() {
 	_vm->_animation->setAnimTimer(anim);
 }
 
-void Scripts::CMDDISPINV() { error("TODO"); }
-void Scripts::CMDSETTIMER() { error("TODO"); }
-void Scripts::CMDCHECKTIMER() { error("TODO"); }
+void Scripts::CMDDISPINV() { error("TODO CMDDISPINV"); }
+void Scripts::CMDSETTIMER() { error("TODO CMDSETTIMER"); }
+void Scripts::CMDCHECKTIMER() { error("TODO CMDCHECKTIMER"); }
 
 void Scripts::cmdSetTravel() {
 	if (_vm->_selectCommand == 5)
@@ -288,8 +288,8 @@ void Scripts::cmdSetTravel() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSETVID() { error("TODO"); }
-void Scripts::CMDPLAYVID() { error("TODO"); }
+void Scripts::CMDSETVID() { error("TODO CMDSETVID"); }
+void Scripts::CMDPLAYVID() { error("TODO CMDPLAYVID"); }
 
 void Scripts::cmdPlotImage() {
 	_vm->_destIn = _vm->_current;
@@ -318,9 +318,9 @@ void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollY = 0;
 }
 
-void Scripts::CMDSAVERECT() { error("TODO"); }
-void Scripts::CMDSETBUFVID() { error("TODO"); }
-void Scripts::CMDPLAYBUFVID() { error("TODO"); }
+void Scripts::CMDSAVERECT() { error("TODO CMDSAVERECT"); }
+void Scripts::CMDSETBUFVID() { error("TODO CMDSETBUFVID"); }
+void Scripts::CMDPLAYBUFVID() { error("TODO CMDPLAYBUFVID"); }
 
 void Scripts::cmdRemoveLast() {
 	--_vm->_numAnimTimers;
@@ -346,14 +346,14 @@ void Scripts::CMDSPECIAL() {
 	}
 }
 
-void Scripts::CMDSETCYCLE() { error("TODO"); }
-void Scripts::CMDCYCLE() { error("TODO"); }
-void Scripts::CMDCHARSPEAK() { error("TODO"); }
-void Scripts::CMDTEXSPEAK() { error("TODO"); }
-void Scripts::CMDTEXCHOICE() { error("TODO"); } // _choiceStart = _data->pos() - 1;
-void Scripts::CMDWAIT() { error("TODO"); }
-void Scripts::CMDSETCONPOS() { error("TODO"); }
-void Scripts::CMDCHECKVFRAME() { error("TODO"); }
+void Scripts::CMDSETCYCLE() { error("TODO CMDSETCYCLE"); }
+void Scripts::CMDCYCLE() { error("TODO CMDCYCLE"); }
+void Scripts::CMDCHARSPEAK() { error("TODO CMDCHARSPEAK"); }
+void Scripts::CMDTEXSPEAK() { error("TODO CMDTEXSPEAK"); }
+void Scripts::CMDTEXCHOICE() { error("TODO CMDTEXCHOICE"); } // _choiceStart = _data->pos() - 1;
+void Scripts::CMDWAIT() { error("TODO CMDWAIT"); }
+void Scripts::CMDSETCONPOS() { error("TODO CMDSETCONPOS"); }
+void Scripts::CMDCHECKVFRAME() { error("TODO CMDCHECKVFRAME"); }
 
 void Scripts::cmdJumpChoice() {
 	int val = (_data->readUint16LE() && 0xFF);
@@ -369,12 +369,12 @@ void Scripts::cmdReturnChoice() {
 	_data->seek(_choiceStart);
 }
 
-void Scripts::CMDCLEARBLOCK() { error("TODO"); }
-void Scripts::CMDLOADSOUND() { error("TODO"); }
-void Scripts::CMDFREESOUND() { error("TODO"); }
-void Scripts::CMDSETVIDSND() { error("TODO"); }
-void Scripts::CMDPLAYVIDSND() { error("TODO"); }
-void Scripts::CMDPUSHLOCATION() { error("TODO"); }
+void Scripts::CMDCLEARBLOCK() { error("TODO CMDCLEARBLOCK"); }
+void Scripts::CMDLOADSOUND() { error("TODO CMDLOADSOUND"); }
+void Scripts::CMDFREESOUND() { error("TODO CMDFREESOUND"); }
+void Scripts::CMDSETVIDSND() { error("TODO CMDSETVIDSND"); }
+void Scripts::CMDPLAYVIDSND() { error("TODO CMDPLAYVIDSND"); }
+void Scripts::CMDPUSHLOCATION() { error("TODO CMDPUSHLOCATION"); }
 
 void Scripts::cmdPlayerOff() {
 	_vm->_player->_playerOff = true;
@@ -384,18 +384,18 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::CMDDEAD() { error("TODO"); }
+void Scripts::CMDDEAD() { error("TODO CMDDEAD"); }
 
 void Scripts::cmdFadeOut() {
 	_vm->_screen->forceFadeOut();
 }
 
-void Scripts::CMDENDVID() { error("TODO"); }
-void Scripts::CMDHELP() { error("TODO"); }
-void Scripts::CMDCYCLEBACK() { error("TODO"); }
-void Scripts::CMDCHAPTER() { error("TODO"); }
-void Scripts::CMDSETHELP() { error("TODO"); }
-void Scripts::CMDCENTERPANEL() { error("TODO"); }
+void Scripts::CMDENDVID() { error("TODO CMDENDVID"); }
+void Scripts::CMDHELP() { error("TODO CMDHELP"); }
+void Scripts::CMDCYCLEBACK() { error("TODO CMDCYCLEBACK"); }
+void Scripts::CMDCHAPTER() { error("TODO CMDCHAPTER"); }
+void Scripts::CMDSETHELP() { error("TODO CMDSETHELP"); }
+void Scripts::CMDCENTERPANEL() { error("TODO CMDCENTERPANEL"); }
 
 void Scripts::cmdMainPanel() { 
 	if (_vm->_screen->_vesaMode) {
@@ -404,7 +404,7 @@ void Scripts::cmdMainPanel() {
 	}
 }
 
-void Scripts::CMDRETFLASH() { error("TODO"); }
+void Scripts::CMDRETFLASH() { error("TODO CMDRETFLASH"); }
 
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 0b0d16d6a5793f8ae73da9c64527cda05850416e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 16 Aug 2014 11:47:13 +0200
Subject: ACCESS: Add details in executeSpecial TODO

---
 engines/access/amazon/amazon_scripts.cpp | 38 +++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index bc86c95a6d..f0c580ec34 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -32,7 +32,43 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 }
 
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
-	warning("TODO executeSpecial");
+	switch (commandIndex) {
+	case 1:
+		warning("TODO ESTABLISH");
+		break;
+	case 2:
+		warning("TODO LOADBACKGROUND");
+		break;
+	case 3:
+		warning("TODO DOCAST");
+		break;
+	case 4:
+		warning("TODO SETINACTIVE");
+		break;
+	case 6:
+		warning("TODO MWHILE");
+		break;
+	case 9:
+		warning("TODO GUARD");
+		break;
+	case 10:
+		warning("TODO NEWMUSIC");
+		break;
+	case 11:
+		warning("TODO PLOTINACTIVE");
+		break;
+	case 13:
+		warning("TODO RIVER");
+		break;
+	case 14:
+		warning("TODO ANT");
+		break;
+	case 15:
+		warning("TODO BOATWALLS");
+		break;
+	default:
+		warning("Unexpected Special code %d - Skipped", commandIndex);
+	}
 }
 
 
-- 
cgit v1.2.3


From 86484802589f547348ca9ff7fc771801c5b7123e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 16 Aug 2014 12:24:26 +0200
Subject: ACCESS: Add a second parameter to doEstablish()

---
 engines/access/access.cpp                | 14 +++++++-------
 engines/access/access.h                  |  6 +++---
 engines/access/amazon/amazon_scripts.cpp |  2 +-
 engines/access/room.cpp                  |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index ad8405800b..eaa65c7545 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -202,24 +202,24 @@ void AccessEngine::freeInactiveData() {
 	_inactive = nullptr;
 }
 
-void AccessEngine::establish(int v) {
+void AccessEngine::establish(int v1, int v2) {
 	_establishMode = 0;
 	_establishGroup = 0;
-	doEstablish(v);
+	doEstablish(v1, v2);
 }
 
-void AccessEngine::establishCenter(int v) {
+void AccessEngine::establishCenter(int v1, int v2) {
 	_establishMode = 1;
-	doEstablish(v);
+	doEstablish(v1, v2);
 }
 
-void AccessEngine::doEstablish(int v) {
+void AccessEngine::doEstablish(int v1, int v2) {
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (v != -1) {
-		_files->loadScreen(95, v);
+	if (v1 != -1) {
+		_files->loadScreen(95, v1);
 		_buffer2.copyBuffer(_screen);
 	}
 
diff --git a/engines/access/access.h b/engines/access/access.h
index 1e83c6e97c..921d064a1d 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -84,7 +84,7 @@ private:
 
 	void dummyLoop();
 
-	void doEstablish(int v);
+	void doEstablish(int v1, int v2);
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -210,9 +210,9 @@ public:
 	 */
 	void freeInactiveData();
 
-	void establish(int v);
+	void establish(int v1, int v2);
 
-	void establishCenter(int v);
+	void establishCenter(int v1, int v2);
 
 	void plotList();
 	void plotList1();
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index f0c580ec34..2fdbcc94a2 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -34,7 +34,7 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
-		warning("TODO ESTABLISH");
+		_vm->establish(param1, param2);
 		break;
 	case 2:
 		warning("TODO LOADBACKGROUND");
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 1eeedb7c29..f42c8b092c 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -163,7 +163,7 @@ void Room::loadRoomData(const byte *roomData) {
 		_vm->_establishFlag = true;
 		if (_vm->_establishTable[roomInfo._estIndex] != 1) {
 			_vm->_establishTable[roomInfo._estIndex] = 1;
-			_vm->establish(0);
+			_vm->establish(0, roomInfo._estIndex);
 		}
 	}
 
-- 
cgit v1.2.3


From b3ab8a42a6bf77d99b6b349793f1fa7393359d24 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 09:35:38 -0400
Subject: ACCESS: Implementing doCommand

---
 engines/access/access.cpp             |   5 +-
 engines/access/access.h               |   3 +-
 engines/access/amazon/amazon_game.cpp |   2 +-
 engines/access/amazon/amazon_room.cpp |   7 +-
 engines/access/amazon/amazon_room.h   |   6 +-
 engines/access/events.cpp             |  33 +++++++-
 engines/access/events.h               |  13 +++-
 engines/access/inventory.cpp          |   9 +++
 engines/access/inventory.h            |   4 +
 engines/access/resources.cpp          |   5 ++
 engines/access/resources.h            |   2 +
 engines/access/room.cpp               | 141 +++++++++++++++++++++++++++++++++-
 engines/access/room.h                 |  19 ++++-
 engines/access/screen.cpp             |   1 +
 engines/access/screen.h               |   1 +
 engines/access/scripts.cpp            |  18 ++---
 16 files changed, 245 insertions(+), 24 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index eaa65c7545..d6f19924b7 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -46,7 +46,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_destIn = nullptr;
 	_current = nullptr;
 	_pCount = 0;
-	_selectCommand = 0;
 	_normalMouse = true;
 	_mouseMode = 0;
 	_currentMan = 0;
@@ -312,4 +311,8 @@ void AccessEngine::copyBF2Vid() {
 	}
 }
 
+void AccessEngine::doLoadSave() {
+	error("TODO: doLoadSave");
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 921d064a1d..81b1185922 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -130,7 +130,6 @@ public:
 	Common::Array<ExtraCell> _extraCells;
 	ImageEntryList _images;
 	int _pCount;
-	int _selectCommand;
 	bool _normalMouse;
 	int _mouseMode;
 
@@ -224,6 +223,8 @@ public:
 	void copyBF1BF2();
 
 	void copyBF2Vid();
+
+	void doLoadSave();
 };
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 0497dd8d4d..36d6d80e47 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -176,7 +176,7 @@ void AmazonEngine::setupGame() {
 	_player->_roomNumber = 4;
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
-	_selectCommand = -1;
+	_room->_selectCommand = -1;
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 5cb1dfe59c..cb6c8140ef 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 #include "access/access.h"
+#include "access/resources.h"
 #include "access/amazon/amazon_resources.h"
 #include "access/amazon/amazon_room.h"
 
@@ -78,7 +79,7 @@ void AmazonRoom::reloadRoom1() {
 		_vm->_currentCharFlag = false;
 	}
 
-	_vm->_selectCommand = -1;
+	_selectCommand = -1;
 	_vm->_normalMouse = 1;
 	_vm->_mouseMode = 0;
 	_vm->_boxSelect = true;
@@ -138,6 +139,10 @@ void AmazonRoom::roomMenu() {
 	delete spr;
 }
 
+void AmazonRoom::mainAreaClick() {
+
+}
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 546ea9698a..838b108fb5 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -38,14 +38,16 @@ private:
 	const byte *_icon;
 
 	void roomSet();
-
-	void roomMenu();
 protected:
 	virtual void loadRoom(int roomNumber);
 
 	virtual void reloadRoom();
 
 	virtual void reloadRoom1();
+
+	virtual void roomMenu();
+
+	virtual void mainAreaClick();
 public:
 	AmazonRoom(AccessEngine *vm);
 
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index f373c8b829..8f02d41547 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -40,6 +40,10 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_priorFrameTime = 0;
 	_leftButton = _rightButton = false;
 	_mouseMove = false;
+	_mouseCol = _mouseRow = 0;
+	_normalMouse = 0;
+	_mouseMode = 0;
+	_cursorExitFlag = false;
 }
 
 EventsManager::~EventsManager() {
@@ -103,10 +107,9 @@ bool EventsManager::isCursorVisible() {
 	return CursorMan.isVisible();
 }
 
-void EventsManager::pollEvents() {
-	checkForNextFrameCounter();
-
-	_leftButton = false;
+void EventsManager::pollEvents(bool suppressFrames) {
+	if (!suppressFrames)
+		checkForNextFrameCounter();
 
 	Common::Event event;
 	while (g_system->getEventManager()->pollEvent(event)) {
@@ -122,6 +125,8 @@ void EventsManager::pollEvents() {
 				// Attach to the debugger
 				_vm->_debugger->attach();
 				_vm->_debugger->onFrame();
+			} else {
+				
 			}
 			return;
 		case Common::EVENT_KEYUP:
@@ -174,5 +179,25 @@ void EventsManager::delay(int time) {
 	g_system->delayMillis(time);
 }
 
+void EventsManager::zeroKeys() {
+	_keypresses.clear();
+}
+
+bool EventsManager::getKey(Common::KeyState &key) {
+	if (_keypresses.empty()) {
+		return false;
+	} else {
+		key = _keypresses.pop();
+		return true;
+	}
+}
+
+void EventsManager::debounceLeft() {
+	while (_leftButton && !_vm->shouldQuit()) {
+		pollEvents(true);
+		g_system->delayMillis(10);
+	}
+}
+
 
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index 7ee03ac21e..5ca08068f1 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -53,7 +53,12 @@ public:
 	CursorType _cursorId;
 	bool _leftButton, _rightButton;
 	Common::Point _mousePos;
+	int _mouseCol, _mouseRow;
 	bool _mouseMove;
+	int _normalMouse;
+	int _mouseMode;
+	bool _cursorExitFlag;
+	Common::FixedStack<Common::KeyState> _keypresses;
 public:
 	/**
 	 * Constructor
@@ -90,9 +95,15 @@ public:
 	 */
 	bool isCursorVisible();
 
-	void pollEvents();
+	void pollEvents(bool suppressFrames = false);
+
+	void zeroKeys();
+
+	bool getKey(Common::KeyState &key);
 
 	void delay(int time);
+
+	void debounceLeft();
 };
 
 } // End of namespace Access
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 5d2957bd30..e784b873c9 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -58,4 +58,13 @@ void InventoryManager::setUseItem(int itemId) {
 	_vm->_useItem = itemId; 
 }
 
+void InventoryManager::refreshInventory() {
+	error("TODO: refreshInventory");
+}
+
+int InventoryManager::newDisplayInv() {
+	error("TODO: newDisplayInv");
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 1f229dd8ee..399c763483 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -47,6 +47,10 @@ public:
 
 	int useItem();
 	void setUseItem(int itemId);
+
+	void refreshInventory();
+
+	int newDisplayInv();
 };
 
 } // End of namespace Access
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 841ab70f04..40daf2b121 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -71,4 +71,9 @@ const int OVEROFFULY[] = { 1, 0, 0, 2, 1, 0, 0, 0, 0 };
 const int OVEROFFDLX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
 const int OVEROFFDLY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
 
+const int RMOUSE[10][2] = {
+	{ 0, 35 }, { 0, 0 }, { 36, 70 }, { 71, 106 }, { 107, 141 },
+	{ 142, 177 }, { 178, 212 }, { 213, 248 }, { 249, 283 }, { 284, 318 }
+};
+
 } // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 1b49b598ca..678cbc0614 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -54,6 +54,8 @@ extern const int OVEROFFULY[];
 extern const int OVEROFFDLX[];
 extern const int OVEROFFDLY[];
 
+extern const int RMOUSE[10][2];
+
 } // End of namespace Access
 
 #endif /* ACCESS_RESOURCES_H */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f42c8b092c..773a42b9d4 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -35,6 +35,8 @@ Room::Room(AccessEngine *vm) : Manager(vm) {
 	_playFieldWidth = _playFieldHeight = 0;
 	_matrixSize = 0;
 	_tile = nullptr;
+	_selectCommand = 0;
+	_conFlag = false;
 }
 
 Room::~Room() {
@@ -394,6 +396,138 @@ void Plotter::load(Common::SeekableReadStream *stream, int wallCount, int blockC
 		_blocks[i].bottom = stream->readSint16LE();
 }
 
+void Room::doCommands() {
+	int commandId = 0;
+	Common::KeyState keyState;
+
+	if (_vm->_startup != -1)
+		return;
+
+	if (_vm->_inventory->_invChangeFlag)
+		_vm->_inventory->refreshInventory();
+
+	if (_vm->_screen->_screenChangeFlag) {
+		_vm->_screen->_screenChangeFlag = false;
+		_vm->_events->_cursorExitFlag = true;
+		executeCommand(4);
+	} else if (_vm->_events->_leftButton) {
+		if (_vm->_events->_mouseRow >= 22) {
+			// Mouse in user interface area
+			for (commandId = 0; commandId < 10; ++commandId) {
+				if (_vm->_events->_mousePos.x >= RMOUSE[commandId][0] &&
+					_vm->_events->_mousePos.x < RMOUSE[commandId][1])
+					break;
+			}
+			if (commandId < 10)
+				handleCommand(commandId);
+
+		} else {
+			// Mouse click in main game area
+			mainAreaClick();
+		}
+	} else if (_vm->_events->getKey(keyState)) {
+		if (keyState.ascii >= ';' && keyState.ascii <= 'D') {
+			handleCommand((int)keyState.ascii - ';');
+		}
+	}
+}
+
+void Room::handleCommand(int commandId) {
+	if (commandId == 1)
+		--commandId;
+
+	if (commandId == 9)
+		_vm->doLoadSave();
+	else if (commandId == _selectCommand) {
+		_vm->_events->debounceLeft();
+		commandOff();
+	} else {
+		_vm->_events->debounceLeft();
+		executeCommand(commandId);
+	}
+}
+
+void Room::executeCommand(int commandId) {
+	_selectCommand = commandId;
+
+	switch (commandId) {
+	case 0:
+		_vm->_events->_normalMouse = 4;
+		_vm->_events->_mouseMode = 0;
+		break;
+	case 2:
+		_vm->_events->_normalMouse = 5;
+		_vm->_events->_mouseMode = 0;
+		break;
+	case 3:
+		_vm->_events->_normalMouse = 6;
+		_vm->_events->_mouseMode = 0;
+		break;
+	case 4:
+		_vm->_events->_normalMouse = 1;
+		_vm->_events->setCursor(CURSOR_0);
+		if (_vm->_inventory->newDisplayInv() == 2) {
+			commandOff();
+			return;
+		} else {
+			warning("TODO: al = _useItem");
+		}
+		break;
+	case 5:
+		_vm->_events->_normalMouse = 7;
+		_vm->_events->_mouseMode = 0;
+		break;
+	case 6:
+		_vm->_events->_normalMouse = 8;
+		_vm->_events->_mouseMode = 0;
+		break;
+	case 7:
+		_vm->_events->_normalMouse = 1;
+		_vm->_scripts->_sequence = 5000;
+		_vm->_scripts->searchForSequence();
+		roomMenu();
+		_selectCommand = -1;
+		_vm->_events->_normalMouse = 1;
+		_vm->_events->_mouseMode = 0;
+
+		_conFlag = true;
+		while (_conFlag && !_vm->shouldQuit()) {
+			_conFlag = false;
+			_vm->_scripts->executeScript();
+		}
+		_vm->_boxSelect = true;
+		break;
+	case 8:
+		_vm->_events->_normalMouse = 9;
+		_vm->_events->_mouseMode = 0;
+		break;
+	default:
+		break;
+	}
+
+	roomMenu();
+	_vm->_screen->saveScreen();
+	_vm->_screen->setDisplayScan();
+
+	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
+	delete[] iconData;
+
+	// Draw the button as selected
+	_vm->_screen->plotImage(spr, _selectCommand + 2, 
+		Common::Point(RMOUSE[_selectCommand][0], 176));
+
+	_vm->_screen->restoreScreen();
+	_vm->_boxSelect = true;
+}
+
+void Room::commandOff() {
+	_selectCommand = -1;
+	_vm->_events->_normalMouse = 1;
+	_vm->_events->_mouseMode = 4;
+	roomMenu();
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
@@ -428,20 +562,21 @@ RoomInfo::RoomInfo(const byte *data) {
 	_paletteFile._subfile = stream.readUint16LE();
 	if (_paletteFile._fileNum == -1) {
 		_startColor = _numColors = 0;
-	} else {
+	}
+	else {
 		_startColor = stream.readUint16LE();
 		_numColors = stream.readUint16LE();
 	}
 
 	for (int16 v = (int16)stream.readUint16LE(); v != -1;
-			v = (int16)stream.readUint16LE()) {
+		v = (int16)stream.readUint16LE()) {
 		uint16 v2 = stream.readUint16LE();
 
 		_vidTable.push_back(v | ((uint32)v2 << 16));
 	}
 
 	for (int16 fileNum = (int16)stream.readUint16LE(); fileNum != -1;
-			fileNum = (int16)stream.readUint16LE()) {
+		fileNum = (int16)stream.readUint16LE()) {
 		SoundIdent fi;
 		fi._fileNum = fileNum;
 		fi._subfile = stream.readUint16LE();
diff --git a/engines/access/room.h b/engines/access/room.h
index 0569a925c9..00de53f0a7 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -63,6 +63,8 @@ private:
 	void roomLoop();
 
 	void loadPlayField(int fileNum, int subfile);
+
+	void commandOff();
 protected:
 	void loadRoomData(const byte *roomData);
 	void setupRoom();
@@ -79,6 +81,15 @@ protected:
 	*/
 	void freeTileData();
 
+	/**
+	* Switch to a given command mode
+	*/
+	void handleCommand(int commandId);
+
+	/**
+	 * Inner handler for switching to a given command mode
+	 */
+	void executeCommand(int commandId);
 
 	virtual void loadRoom(int roomNumber) = 0;
 
@@ -88,7 +99,11 @@ protected:
 
 	virtual void setIconPalette() {}
 
-	virtual void doCommands() {}
+	virtual void doCommands();
+
+	virtual void roomMenu() = 0;
+
+	virtual void mainAreaClick() = 0;
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
@@ -100,6 +115,8 @@ public:
 	int _playFieldHeight;
 	byte *_tile;
 	int _tileSize;
+	int _selectCommand;
+	bool _conFlag;
 public:
 	Room(AccessEngine *vm);
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 9871fb1c3e..8e9b08234f 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -50,6 +50,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
+	_screenChangeFlag = false;
 
 	_bufferBytesWide = _vWindowBytesWide = this->w;
 	_vWindowLinesTall = this->h;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 79c978f1d0..98e77b4cf4 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -78,6 +78,7 @@ public:
 	int _vWindowBytesWide;
 	int _bufferBytesWide;
 	int _vWindowLinesTall;
+	bool _screenChangeFlag;
 public:
 	Screen(AccessEngine *vm);
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index ea93a04e9b..0cfce787a9 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -121,42 +121,42 @@ void Scripts::CMDOBJECT() { error("TODO CMDOBJECT"); }
 void Scripts::CMDENDOBJECT() { error("TODO ENDOBJECT"); }
 
 void Scripts::cmdJumpLook() {
-	if (_vm->_selectCommand == 0)
+	if (_vm->_room->_selectCommand == 0)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
 void Scripts::cmdJumpHelp() { 
-	if (_vm->_selectCommand == 8)
+	if (_vm->_room->_selectCommand == 8)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
 void Scripts::cmdJumpGet() { 
-	if (_vm->_selectCommand == 3)
+	if (_vm->_room->_selectCommand == 3)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
 void Scripts::cmdJumpMove() { 
-	if (_vm->_selectCommand == 2)
+	if (_vm->_room->_selectCommand == 2)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
 void Scripts::cmdJumpUse() { 
-	if (_vm->_selectCommand == 4)
+	if (_vm->_room->_selectCommand == 4)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
 void Scripts::cmdJumpTalk() { 
-	if (_vm->_selectCommand == 6)
+	if (_vm->_room->_selectCommand == 6)
 		cmdGoto();
 	else
 		_data->skip(2);
@@ -180,15 +180,15 @@ void Scripts::cmdAnim() {
 void Scripts::cmdSetFlag() { 
 	int flagNum = _data->readByte();
 	byte flagVal = _data->readByte();
-
 	assert(flagNum < 256);
+
 	_vm->_flags[flagNum] = flagVal;
 }
 
 void Scripts::cmdCheckFlag() { 
 	int flagNum = _data->readUint16LE();
 	int flagVal = _data->readUint16LE();
-	assert(flagNum < 100);
+	assert(flagNum < 256);
 
 	if (_vm->_flags[flagNum] == flagVal)
 		cmdGoto();
@@ -282,7 +282,7 @@ void Scripts::CMDSETTIMER() { error("TODO CMDSETTIMER"); }
 void Scripts::CMDCHECKTIMER() { error("TODO CMDCHECKTIMER"); }
 
 void Scripts::cmdSetTravel() {
-	if (_vm->_selectCommand == 5)
+	if (_vm->_room->_selectCommand == 5)
 		cmdGoto();
 	else
 		_data->skip(2);
-- 
cgit v1.2.3


From dc5500e2464d3457d9dee70993ecd4340963946e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 10:33:03 -0400
Subject: ACCESS: Cleanup of timer flags and some inventory logic

---
 engines/access/access.cpp             |  1 -
 engines/access/access.h               |  3 +--
 engines/access/amazon/amazon_game.cpp |  1 -
 engines/access/amazon/amazon_room.cpp |  2 +-
 engines/access/data.cpp               | 19 +++++++++++++++++++
 engines/access/data.h                 | 19 +++++++++++++++++++
 engines/access/inventory.cpp          | 10 ++++++++--
 engines/access/inventory.h            |  2 ++
 engines/access/player.cpp             |  6 +++---
 engines/access/room.cpp               |  1 +
 10 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index d6f19924b7..6a61527ef9 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -75,7 +75,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_newDate = 0;
 	_intTim[3] = 0;
 	_timer[3] = 0;
-	_timerFlag = false;
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
 	Common::fill(&_establishTable[0], &_establishTable[100], 0);
 	Common::fill(&_flags[0], &_flags[256], 0);
diff --git a/engines/access/access.h b/engines/access/access.h
index 81b1185922..105b00b0ff 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -124,7 +124,7 @@ public:
 	int _establishMode;
 	int _establishGroup;
 	int _numAnimTimers;
-	Common::Array<TimerEntry> _timers;
+	TimerList _timers;
 	Common::Array<Common::Rect> _newRects;
 	Common::Array<Common::Rect> _oldRects;
 	Common::Array<ExtraCell> _extraCells;
@@ -161,7 +161,6 @@ public:
 	uint32 _newDate;
 	int _intTim[3];
 	int _timer[3];
-	bool _timerFlag;
 	int _flags[256];
 	byte _help1[366];
 	byte _help2[366];
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 36d6d80e47..1b824ac730 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -176,7 +176,6 @@ void AmazonEngine::setupGame() {
 	_player->_roomNumber = 4;
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
-	_room->_selectCommand = -1;
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index cb6c8140ef..405889fe1a 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -83,7 +83,7 @@ void AmazonRoom::reloadRoom1() {
 	_vm->_normalMouse = 1;
 	_vm->_mouseMode = 0;
 	_vm->_boxSelect = true;
-	_vm->_player->_playerOff = 0;
+	_vm->_player->_playerOff = false;
 
 	_vm->_screen->fadeOut();
 	_vm->_screen->clearScreen();
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index c3a6bb3d90..f5dbbb367f 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -25,4 +25,23 @@
 
 namespace Access {
 
+TimerList::TimerList() : Common::Array<TimerEntry>() {
+	_timersSavedFlag = false;
+}
+
+void TimerList::saveTimers() {
+	if (!_timersSavedFlag /* && !_flashbackFlag */) {
+		_savedTimers = *this;
+		_timersSavedFlag = true;
+	}
+}
+
+void TimerList::restoreTimers() {
+	if (_timersSavedFlag /* && !_flashbackFlag */) {
+		clear();
+		*static_cast<Common::Array<TimerEntry> *>(this) = _savedTimers;
+		_timersSavedFlag = false;
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index b9da858216..67b9cfe9fd 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -51,6 +51,25 @@ struct TimerEntry {
 	}
 };
 
+class TimerList : public Common::Array<TimerEntry> {
+private:
+	Common::Array<TimerEntry> _savedTimers;
+public:
+	bool _timersSavedFlag;
+public:
+	TimerList();
+
+	/**
+	 * Save a copy of all current timers
+	 */
+	void saveTimers();
+
+	/**
+	 * Resetore the set of previously saved timers
+	 */
+	void restoreTimers();
+};
+
 class ExtraCell {
 public:
 	int _vidTable;
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index e784b873c9..15668b0bc2 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -30,6 +30,8 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_startInvItem = 0;
 	_startInvBox = 0;
 	_invChangeFlag = true;
+	_invRefreshFlag = false;
+	_invModeFlag = false;
 	_startAboutItem = 0;
 	_startTravelItem = 0;
 
@@ -59,11 +61,15 @@ void InventoryManager::setUseItem(int itemId) {
 }
 
 void InventoryManager::refreshInventory() {
-	error("TODO: refreshInventory");
+	if (_vm->_screen->_vesaMode) {
+		_invRefreshFlag = true;
+		newDisplayInv();
+	}
 }
 
 int InventoryManager::newDisplayInv() {
-	error("TODO: newDisplayInv");
+	warning("TODO: newDisplayInv");
+	return 0;
 }
 
 
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 399c763483..dddfe2eda1 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -38,6 +38,8 @@ public:
 	int _startInvItem;
 	int _startInvBox;
 	bool _invChangeFlag;
+	bool _invRefreshFlag;
+	bool _invModeFlag;
 	int _startAboutItem;
 	int _startTravelItem;
 public:
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 0e005f936e..72cafde243 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -181,9 +181,9 @@ void Player::walk() {
 	_collideFlag = false;
 	_playerDirection = NONE;
 	
-	if (_playerOff != 0)
+	if (_playerOff)
 		return;
-	else if (_vm->_timerFlag) {
+	else if (_vm->_timers[0]._flag) {
 		plotCom3();
 		return;
 	}
@@ -640,7 +640,7 @@ void Player::plotCom1() {
 }
 
 void Player::plotCom2() {
-	if (_playerOff != 1)
+	if (!_playerOff)
 		_vm->_images.addToList(this);
 }
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 773a42b9d4..cf8da17f05 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -37,6 +37,7 @@ Room::Room(AccessEngine *vm) : Manager(vm) {
 	_tile = nullptr;
 	_selectCommand = 0;
 	_conFlag = false;
+	_selectCommand = -1;
 }
 
 Room::~Room() {
-- 
cgit v1.2.3


From 5ff004b2d839a4e3a06112916efe0412a5112903 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 11:58:59 -0400
Subject: ACCESS: Fix initialisation of player positioning and scaling values

---
 engines/access/access.h   |  3 ---
 engines/access/player.cpp | 10 +++++++---
 engines/access/player.h   |  1 +
 engines/access/room.cpp   |  7 ++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 105b00b0ff..32be053089 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -138,8 +138,6 @@ public:
 	byte *_music;
 	byte *_title;
 	int _converseMode;
-	int _startAboutItem;
-	int _startTravelItem;
 	int _startAboutBox;
 	int _startTravelBox;
 	bool _currentCharFlag;
@@ -152,7 +150,6 @@ public:
 	int _scaleMaxY;
 	int _scaleI;
 	bool _scaleFlag;
-	int _playFieldHeight;
 
 	// Fields that are included in savegames
 	int _conversation;
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 72cafde243..79ce2190f3 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -61,6 +61,7 @@ Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
 	_move = NONE;
 	_playerDirection = NONE;
 	_xFlag = _yFlag = 0;
+	_inactiveYOff = 0;
 }
 
 Player::~Player() {
@@ -168,12 +169,13 @@ void Player::freeSprites() {
 
 void Player::calcManScale() {
 	if (!_vm->_manScaleOff) {
-		_vm->_scale = (((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
-			_vm->_scaleT1 + (_vm->_scaleH2 << 8)) / _vm->_scaleH1 * _vm->_scaleI) >> 8;
+		_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
+			_vm->_scaleT1 + (_vm->_scaleH2 << 8)) & 0xff00) / _vm->_scaleH1 * _vm->_scaleI) >> 8;
 		_vm->_screen->setScaleTable(_vm->_scale);
 
 		_playerOffset.x = _vm->_screen->_scaleTable1[20];
 		_playerOffset.y = _vm->_screen->_scaleTable1[67];
+		_inactiveYOff = _playerOffset.y;
 	}
 }
 
@@ -188,6 +190,7 @@ void Player::walk() {
 		return;
 	}
 
+	_vm->_timers[0]._flag = true;
 	switch (_move) {
 	case UP:
 		_vm->_events->_mouseMove = false;
@@ -646,7 +649,8 @@ void Player::plotCom2() {
 
 void Player::plotCom3() {
 	// Update the base ImageEntry fields for the player
-	_position = _rawPlayer;
+	_position.x = _rawPlayer.x;
+	_position.y = _rawPlayer.y - _playerOffset.y;
 	_priority = _playerOffset.y;
 	_spritesPtr = _playerSprites;
 	_frameNumber = _frame;
diff --git a/engines/access/player.h b/engines/access/player.h
index a291f4589d..a9efff2433 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -57,6 +57,7 @@ private:
 	SpriteResource *_playerSprites1;
 	byte *_manPal1;
 	int _scrollEnd;
+	int _inactiveYOff;
 
 	bool codeWalls();
 	void checkMove();
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index cf8da17f05..ccd19b0ed9 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -182,14 +182,14 @@ void Room::loadRoomData(const byte *roomData) {
 	_vm->_scaleH1 = roomInfo._scaleH1;
 	_vm->_scaleH2 = roomInfo._scaleH2;
 	_vm->_scaleN1 = roomInfo._scaleN1;
-	_vm->_scaleT1 = ((_vm->_scaleH2 - _vm->_scaleH1) << 8) / _vm->_scaleN1;
+	_vm->_scaleT1 = ((_vm->_scaleH1 - _vm->_scaleH2) << 8) / _vm->_scaleN1;
 
 	if (roomInfo._playFieldFile._fileNum != -1) {
 		loadPlayField(roomInfo._playFieldFile._fileNum,
 			roomInfo._playFieldFile._subfile);
 		setupRoom();
 
-		_vm->_scaleMaxY = _vm->_playFieldHeight << 4;
+		_vm->_scaleMaxY = _playFieldHeight << 4;
 	}
 
 	// Load cells
@@ -211,7 +211,8 @@ void Room::loadRoomData(const byte *roomData) {
 		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
 	}
 
-	_vm->_scaleI = roomInfo._scaleI;
+	_vm->_scale = _vm->_scaleI = roomInfo._scaleI;
+	_vm->_screen->setScaleTable(_vm->_scale);
 	_vm->_player->_scrollThreshold = roomInfo._scrollThreshold;
 
 	// Handle loading scene palette data
-- 
cgit v1.2.3


From fa099b848094388225b4f7e84ad4a15d7c42ce34 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 15:47:25 -0400
Subject: ACCESS: Implement routine for scaled drawing of player

---
 engines/access/access.cpp   |  6 ++++-
 engines/access/asurface.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++--
 engines/access/asurface.h   |  6 ++++-
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6a61527ef9..1503e380c2 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -244,6 +244,10 @@ void AccessEngine::plotList1() {
 			bounds.setHeight(_screen->_scaleTable1[frame->h]);
 		}
 
+		// Make a copy - some of the drawing methods I've adapted need the full
+		// scaled dimensions on-screen, and handle clipping themselves
+		Common::Rect destBounds = bounds;
+
 		if (_buffer2.clip(bounds)) {
 			ie._flags |= 1;
 		} else {
@@ -261,7 +265,7 @@ void AccessEngine::plotList1() {
 				if (ie._flags & 2) {
 					_buffer2.sPlotB(frame, Common::Point(bounds.left, bounds.top));
 				} else {
-					_buffer2.sPlotF(frame, Common::Point(bounds.left, bounds.top));
+					_buffer2.sPlotF(frame, destBounds);
 				}
 			} else {
 				if (ie._flags & 2) {
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index ed614df974..4abd1aab26 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -82,6 +82,15 @@ SpriteFrame::~SpriteFrame() {
 
 /*------------------------------------------------------------------------*/
 
+ImageEntry::ImageEntry() {
+	_frameNumber = 0;
+	_spritesPtr = nullptr;
+	_priority = 0;
+	_flags = 0;
+}
+
+/*------------------------------------------------------------------------*/
+
 static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
 	return ie1._priority < ie2._priority;
 }
@@ -237,12 +246,59 @@ void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
 	}
 }
 
+void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
+	const int SCALE_LIMIT = 0x100;
+	int scaleX = SCALE_LIMIT * bounds.width() / this->w;
+	int scaleY = SCALE_LIMIT * bounds.height() / this->h;
+	int scaleXCtr = 0, scaleYCtr = 0;
+
+	int y = bounds.top;
+	for (int yCtr = 0, y = bounds.top; yCtr < this->h; ++yCtr) {
+		// Handle skipping lines if Y scaling 
+		scaleYCtr += scaleY;
+		if (scaleYCtr < SCALE_LIMIT)
+			continue;
+		scaleYCtr -= SCALE_LIMIT;
+
+		// Handle off-screen lines
+		if (y < 0)
+			continue;
+		else if (y >= dest->h)
+			break;
+
+		// Handle drawing the line
+		byte *pSrc = (byte *)getBasePtr(0, yCtr);
+		byte *pDest = (byte *)dest->getBasePtr(bounds.left, y);
+		scaleXCtr = 0;
+		int x = bounds.left;
+
+		for (int xCtr = 0; xCtr < this->w; ++xCtr, ++pSrc) {
+			// Handle horizontal scaling
+			scaleXCtr += scaleX;
+			if (scaleXCtr < SCALE_LIMIT)
+				continue;
+			scaleXCtr -= SCALE_LIMIT;
+
+			// Only handle on-scren pixels
+			if (x >= dest->w)
+				break;	
+			if (x >= 0 && *pSrc != 0)
+				*pDest = *pSrc;
+			
+			++pDest;
+			++x;
+		}
+
+		++y;
+	}
+}
+
 void ASurface::sPlotB(SpriteFrame *frame, const Common::Point &pt) {
 	frame->copyTo(this, pt);
 }
 
-void ASurface::sPlotF(SpriteFrame *frame, const Common::Point &pt) {
-	frame->copyTo(this, pt);
+void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
+	frame->copyTo(this, bounds);
 }
 
 void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index d660ff60b6..365852dadf 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -60,13 +60,15 @@ public:
 
 	void sPlotB(SpriteFrame *frame, const Common::Point &pt);
 
-	void sPlotF(SpriteFrame *frame, const Common::Point &pt);
+	void sPlotF(SpriteFrame *frame, const Common::Rect &bounds);
 
 	void plotB(SpriteFrame *frame, const Common::Point &pt);
 
 	void copyBlock(ASurface *src, const Common::Rect &bounds);
 
 	void copyTo(ASurface *dest, const Common::Point &destPos);
+
+	void copyTo(ASurface *dest, const Common::Rect &bounds);
 };
 
 class SpriteFrame : public ASurface {
@@ -95,6 +97,8 @@ public:
 	int _priority;
 	Common::Point _position;
 	int _flags;
+public:
+	ImageEntry();
 };
 
 class ImageEntryList : public Common::Array<ImageEntry> {
-- 
cgit v1.2.3


From bca9f14719dda5185c443cae6c16b6a374f50ab2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 16:04:09 -0400
Subject: ACCESS: Fix display of mouse cursor

---
 engines/access/access.cpp             |  2 +-
 engines/access/amazon/amazon_game.cpp |  2 +-
 engines/access/events.cpp             |  7 ++++++-
 engines/access/events.h               |  6 +++---
 engines/access/room.cpp               | 28 +++++++++++++++++-----------
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 1503e380c2..fde5ab8754 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -170,7 +170,7 @@ void AccessEngine::dummyLoop() {
 
 		if (_events->_leftButton) {
 			CursorType cursorId = _events->getCursor();
-			_events->setCursor((cursorId == CURSOR_HELP) ? CURSOR_0 : (CursorType)(cursorId + 1));
+			_events->setCursor((cursorId == CURSOR_HELP) ? CURSOR_ARROW : (CursorType)(cursorId + 1));
 		}
 	}
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 1b824ac730..042fd415da 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -80,7 +80,7 @@ void AmazonEngine::playGame() {
 
 void AmazonEngine::doIntroduction() {
 	_screen->setInitialPalettte();
-	_events->setCursor(CURSOR_0);
+	_events->setCursor(CURSOR_ARROW);
 	_events->showCursor();
 	_screen->setPanel(0);
 
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 8f02d41547..9c6b45737d 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -36,12 +36,12 @@ namespace Access {
 
 EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_cursorId = CURSOR_NONE;
+	_normalMouse = CURSOR_CROSSHAIRS;
 	_frameCounter = 10;
 	_priorFrameTime = 0;
 	_leftButton = _rightButton = false;
 	_mouseMove = false;
 	_mouseCol = _mouseRow = 0;
-	_normalMouse = 0;
 	_mouseMode = 0;
 	_cursorExitFlag = false;
 }
@@ -54,6 +54,11 @@ void EventsManager::setCursor(CursorType cursorId) {
 		return;	
 	_cursorId = cursorId;
 	
+	if (_mouseMode == 1 && cursorId == CURSOR_ARROW)
+		_mouseMode = 2;
+	else if (_mouseMode == 2 && cursorId != CURSOR_ARROW)
+		_mouseMode = 1;
+
 	// Get a pointer to the mouse data to use, and get the cursor hotspot
 	const byte *srcP = Amazon::CURSORS[cursorId];
 	int hotspotX = (int16)READ_LE_UINT16(srcP);
diff --git a/engines/access/events.h b/engines/access/events.h
index 5ca08068f1..c76f62b265 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -31,8 +31,8 @@ namespace Access {
 
 enum CursorType { 
 	CURSOR_NONE = -1,
-	CURSOR_0 = 0, CURSOR_1, CURSOR_2, CURSOR_3, CURSOR_EYE, CURSOR_HAND, 
-	CURSOR_GET, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
+	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_EYE, 
+	CURSOR_HAND, CURSOR_GET, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
 };
 
 #define GAME_FRAME_RATE 50
@@ -51,11 +51,11 @@ private:
 	void nextFrame();
 public:
 	CursorType _cursorId;
+	CursorType _normalMouse;
 	bool _leftButton, _rightButton;
 	Common::Point _mousePos;
 	int _mouseCol, _mouseRow;
 	bool _mouseMove;
-	int _normalMouse;
 	int _mouseMode;
 	bool _cursorExitFlag;
 	Common::FixedStack<Common::KeyState> _keypresses;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index ccd19b0ed9..dd6f21877c 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -131,6 +131,12 @@ void Room::doRoom() {
 					break;
 				} else {
 					_vm->plotList();
+
+					if (_vm->_events->_mousePos.y < 177) {
+						_vm->_events->setCursor(_vm->_events->_normalMouse);
+					} else {
+						_vm->_events->setCursor(CURSOR_ARROW);
+					}
 					_vm->copyBlocks();
 				}
 			}
@@ -454,20 +460,20 @@ void Room::executeCommand(int commandId) {
 
 	switch (commandId) {
 	case 0:
-		_vm->_events->_normalMouse = 4;
+		_vm->_events->_normalMouse = CURSOR_EYE;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 2:
-		_vm->_events->_normalMouse = 5;
+		_vm->_events->_normalMouse = CURSOR_HAND;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 3:
-		_vm->_events->_normalMouse = 6;
+		_vm->_events->_normalMouse = CURSOR_GET;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 4:
-		_vm->_events->_normalMouse = 1;
-		_vm->_events->setCursor(CURSOR_0);
+		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
+		_vm->_events->setCursor(CURSOR_ARROW);
 		if (_vm->_inventory->newDisplayInv() == 2) {
 			commandOff();
 			return;
@@ -476,20 +482,20 @@ void Room::executeCommand(int commandId) {
 		}
 		break;
 	case 5:
-		_vm->_events->_normalMouse = 7;
+		_vm->_events->_normalMouse = CURSOR_CLIMB;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 6:
-		_vm->_events->_normalMouse = 8;
+		_vm->_events->_normalMouse = CURSOR_TALK;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 7:
-		_vm->_events->_normalMouse = 1;
+		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 		_vm->_scripts->_sequence = 5000;
 		_vm->_scripts->searchForSequence();
 		roomMenu();
 		_selectCommand = -1;
-		_vm->_events->_normalMouse = 1;
+		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 		_vm->_events->_mouseMode = 0;
 
 		_conFlag = true;
@@ -500,7 +506,7 @@ void Room::executeCommand(int commandId) {
 		_vm->_boxSelect = true;
 		break;
 	case 8:
-		_vm->_events->_normalMouse = 9;
+		_vm->_events->_normalMouse = CURSOR_HELP;
 		_vm->_events->_mouseMode = 0;
 		break;
 	default:
@@ -525,7 +531,7 @@ void Room::executeCommand(int commandId) {
 
 void Room::commandOff() {
 	_selectCommand = -1;
-	_vm->_events->_normalMouse = 1;
+	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 	_vm->_events->_mouseMode = 4;
 	roomMenu();
 }
-- 
cgit v1.2.3


From 0b7078397417a3f54d33cebcd602034c8d0d1a1e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 16:15:48 -0400
Subject: ACCESS: Fix selecting buttons from the bottom of the screen

---
 engines/access/events.cpp | 6 +++---
 engines/access/events.h   | 6 +++---
 engines/access/room.cpp   | 8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 9c6b45737d..765d57cf35 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -118,7 +118,6 @@ void EventsManager::pollEvents(bool suppressFrames) {
 
 	Common::Event event;
 	while (g_system->getEventManager()->pollEvent(event)) {
-		// Handle keypress
 		switch (event.type) {
 		case Common::EVENT_QUIT:
 		case Common::EVENT_RTL:
@@ -131,13 +130,15 @@ void EventsManager::pollEvents(bool suppressFrames) {
 				_vm->_debugger->attach();
 				_vm->_debugger->onFrame();
 			} else {
-				
+				_keypresses.push(event.kbd);
 			}
 			return;
 		case Common::EVENT_KEYUP:
 			return;
 		case Common::EVENT_MOUSEMOVE:
 			_mousePos = event.mouse;
+			_mouseCol = _mousePos.x / 8;
+			_mouseRow = _mousePos.y / 8;
 			break;
 		case Common::EVENT_LBUTTONDOWN:
 			_leftButton = true;
@@ -169,7 +170,6 @@ void EventsManager::checkForNextFrameCounter() {
 }
 
 void EventsManager::nextFrame() {
-
 	// Give time to the debugger
 	_vm->_debugger->onFrame();
 
diff --git a/engines/access/events.h b/engines/access/events.h
index c76f62b265..b442b1507b 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -31,11 +31,11 @@ namespace Access {
 
 enum CursorType { 
 	CURSOR_NONE = -1,
-	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_EYE, 
-	CURSOR_HAND, CURSOR_GET, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
+	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_LOOK, 
+	CURSOR_USE, CURSOR_TAKE, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
 };
 
-#define GAME_FRAME_RATE 50
+#define GAME_FRAME_RATE 40
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
 class AccessEngine;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index dd6f21877c..796a441a25 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -460,15 +460,15 @@ void Room::executeCommand(int commandId) {
 
 	switch (commandId) {
 	case 0:
-		_vm->_events->_normalMouse = CURSOR_EYE;
+		_vm->_events->_normalMouse = CURSOR_LOOK;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 2:
-		_vm->_events->_normalMouse = CURSOR_HAND;
+		_vm->_events->_normalMouse = CURSOR_USE;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 3:
-		_vm->_events->_normalMouse = CURSOR_GET;
+		_vm->_events->_normalMouse = CURSOR_TAKE;
 		_vm->_events->_mouseMode = 0;
 		break;
 	case 4:
@@ -513,10 +513,12 @@ void Room::executeCommand(int commandId) {
 		break;
 	}
 
+	// Draw the default toolbar menu at the bottom of the screen
 	roomMenu();
 	_vm->_screen->saveScreen();
 	_vm->_screen->setDisplayScan();
 
+	// Get the toolbar icons resource
 	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
 	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
 	delete[] iconData;
-- 
cgit v1.2.3


From a42e52fb5baa2d9ed9e2d726cfdf0365acd15472 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 17:24:22 -0400
Subject: ACCESS: Implemented code for clicking in room area

---
 engines/access/amazon/amazon_game.h   | 30 +++++++++++------------
 engines/access/amazon/amazon_room.cpp | 25 ++++++++++++++++++-
 engines/access/amazon/amazon_room.h   |  3 +++
 engines/access/room.cpp               | 46 +++++++++++++++++++++++++++++++++++
 engines/access/room.h                 |  7 ++++++
 5 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index c927ad90d7..848af85f30 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -48,21 +48,6 @@ private:
 	int _inactiveYOff;
 	int _esTabTable[100];
 
-	// Fields that are mapped to flags
-	int &_guardLocation;
-	int &_guardFind;
-	int &_helpLevel;
-	int &_jasMayaFlag;
-	int &_moreHelp;
-	int &_flashbackFlag;
-	int &_riverFlag;
-	int &_aniOutFlag;
-	int &_badEnd;
-	int &_noHints;
-	int &_aniFlag;
-	int &_allenFlag;
-	int &_noSound;
-
 	/**
 	 * Do the game introduction
 	 */
@@ -93,6 +78,21 @@ protected:
 	 * Play the game
 	 */
 	virtual void playGame();
+public:
+	// Fields that are mapped to flags
+	int &_guardLocation;
+	int &_guardFind;
+	int &_helpLevel;
+	int &_jasMayaFlag;
+	int &_moreHelp;
+	int &_flashbackFlag;
+	int &_riverFlag;
+	int &_aniOutFlag;
+	int &_badEnd;
+	int &_noHints;
+	int &_aniFlag;
+	int &_allenFlag;
+	int &_noSound;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 405889fe1a..bf3c2501bb 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 #include "access/access.h"
 #include "access/resources.h"
+#include "access/amazon/amazon_game.h"
 #include "access/amazon/amazon_resources.h"
 #include "access/amazon/amazon_room.h"
 
@@ -31,6 +32,7 @@ namespace Access {
 namespace Amazon {
 
 AmazonRoom::AmazonRoom(AccessEngine *vm): Room(vm) {
+	_game = (AmazonEngine *)vm;
 	_antOutFlag = false;
 	_icon = nullptr;
 }
@@ -140,7 +142,28 @@ void AmazonRoom::roomMenu() {
 }
 
 void AmazonRoom::mainAreaClick() {
-
+	if (_selectCommand == -1) {
+		if (_vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44 ||
+				_vm->_player->_roomNumber == 31 || _vm->_player->_roomNumber == 29) {
+			switch (checkBoxes1(_vm->_events->_mousePos)) {
+			case 0:
+				_game->_jasMayaFlag = 0;
+				break;
+			case 1:
+				_game->_jasMayaFlag = 1;
+				break;
+			default:
+				break;
+			}
+		}
+	} else if (_vm->_events->_mousePos.x >= _vm->_screen->_windowXAdd &&
+			_vm->_events->_mousePos.x <= _vm->_screen->_vWindowBytesWide &&
+			_vm->_events->_mousePos.y >= _vm->_screen->_windowYAdd &&
+			_vm->_events->_mousePos.y <= _vm->_screen->_vWindowLinesTall) {
+		if (checkBoxes1(_vm->_events->_mousePos) >= 0) {
+			checkBoxes3();
+		}
+	}
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 838b108fb5..c7d8e0c0ae 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -32,8 +32,11 @@ class AccessEngine;
 
 namespace Amazon {
 
+class AmazonEngine;
+
 class AmazonRoom : public Room {
 private:
+	AmazonEngine *_game;
 	bool _antOutFlag;
 	const byte *_icon;
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 796a441a25..4da207b290 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -538,6 +538,52 @@ void Room::commandOff() {
 	roomMenu();
 }
 
+int Room::checkBoxes() {
+	return checkBoxes1(_vm->_player->_rawPlayer);
+}
+
+int Room::checkBoxes1(const Common::Point &pt) {
+	return checkBoxes2(pt, 0, _plotter._blocks.size());
+}
+
+int Room::checkBoxes2(const Common::Point &pt, int start, int count) {
+	for (; count > 0; --count, ++start) {
+		if (_plotter._blocks[start].contains(pt)) {
+			_plotter._blockIn = start;
+			return start;
+		}
+	}
+
+	return -1;
+}
+
+void Room::checkBoxes3() {
+	for (int start = 0; start < _plotter._blocks.size(); ++start) {
+		if (_plotter._blocks[start].contains(_vm->_events->_mousePos)) {
+			_plotter._blockIn = start;
+			if (!(validateBox(start) & 0x80)) {
+				_vm->_events->debounceLeft();
+				_vm->_boxSelect = start;
+
+				_conFlag = true;
+				while (_conFlag && !_vm->shouldQuit()) {
+					_conFlag = false;
+					_vm->_scripts->executeScript();
+				}
+
+				_vm->_boxSelect = -1;
+				return;
+			}
+		}
+	}
+}
+
+int Room::validateBox(int boxId) {
+	_vm->_scripts->_sequence = boxId;
+	_vm->_scripts->searchForSequence();
+	return _vm->_scripts->executeScript();
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
diff --git a/engines/access/room.h b/engines/access/room.h
index 00de53f0a7..19c3cc423b 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -86,6 +86,13 @@ protected:
 	*/
 	void handleCommand(int commandId);
 
+	int checkBoxes();
+	int checkBoxes1(const Common::Point &pt);
+	int checkBoxes2(const Common::Point &pt, int start, int count);
+	void checkBoxes3();
+
+	int validateBox(int boxId);
+
 	/**
 	 * Inner handler for switching to a given command mode
 	 */
-- 
cgit v1.2.3


From 8d6c8ed452bc60a963774ea7a26ff92472752d63 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 20:26:17 -0400
Subject: ACCESS: Beginnings of code for text bubble drawing

---
 engines/access/access.h     |  1 +
 engines/access/asurface.cpp | 21 ++++++++++++++++++
 engines/access/asurface.h   | 12 +++++++++-
 engines/access/data.h       | 13 +++++++++++
 engines/access/events.cpp   |  3 +++
 engines/access/events.h     |  2 ++
 engines/access/room.cpp     | 54 +++++++++++++++++++++++++++++++++++++++++++++
 engines/access/room.h       | 24 ++++++++++++++++++++
 engines/access/scripts.cpp  | 27 ++++++++++++++++++++---
 engines/access/scripts.h    |  2 +-
 10 files changed, 154 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 32be053089..511cce835c 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -125,6 +125,7 @@ public:
 	int _establishGroup;
 	int _numAnimTimers;
 	TimerList _timers;
+	Font _font;
 	Common::Array<Common::Rect> _newRects;
 	Common::Array<Common::Rect> _oldRects;
 	Common::Array<ExtraCell> _extraCells;
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 4abd1aab26..32e54036ad 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -127,6 +127,7 @@ void ASurface::init() {
 
 ASurface::~ASurface() {
 	free();
+	_savedBlock.free();
 }
 
 void ASurface::clearBuffer() {
@@ -309,4 +310,24 @@ void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
 	copyRectToSurface(*src, bounds.left, bounds.top, bounds);
 }
 
+void ASurface::saveBlock(const Common::Rect &bounds) {
+	_savedBounds = bounds;
+	_savedBounds.clip(Common::Rect(0, 0, this->w, this->h));
+
+	_savedBlock.free();
+	_savedBlock.create(bounds.width(), bounds.height(),
+		Graphics::PixelFormat::createFormatCLUT8());
+	_savedBlock.copyRectToSurface(*this, 0, 0, _savedBounds);
+}
+
+void ASurface::restoreBlock() {
+	if (!_savedBounds.isEmpty()) {
+		copyRectToSurface(_savedBlock, _savedBounds.left, _savedBounds.top,
+			Common::Rect(0, 0, _savedBlock.w, _savedBlock.h));
+
+		_savedBlock.free();
+		_savedBounds = Common::Rect(0, 0, 0, 0);
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 365852dadf..1efee28494 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -36,6 +36,9 @@ class SpriteResource;
 class SpriteFrame;
 
 class ASurface : public Graphics::Surface {
+private:
+	Graphics::Surface _savedBlock;
+	Common::Rect _savedBounds;
 public:
 	static int _leftSkip, _rightSkip;
 	static int _topSkip, _bottomSkip;
@@ -46,7 +49,8 @@ public:
 
 	static void init();
 public:
-	virtual void plotFrame(SpriteFrame *frame, const Common::Point &pt);
+	Common::Point _printOrg;
+	Common::Point _printStart;
 public:
 	virtual ~ASurface();
 
@@ -69,6 +73,12 @@ public:
 	void copyTo(ASurface *dest, const Common::Point &destPos);
 
 	void copyTo(ASurface *dest, const Common::Rect &bounds);
+
+	void saveBlock(const Common::Rect &bounds);
+
+	void restoreBlock();
+
+	virtual void plotFrame(SpriteFrame *frame, const Common::Point &pt);
 };
 
 class SpriteFrame : public ASurface {
diff --git a/engines/access/data.h b/engines/access/data.h
index 67b9cfe9fd..93184563c4 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -78,6 +78,19 @@ public:
 	int _vidSTable1;
 };
 
+struct FontVal {
+public:
+	int _lo, _hi;
+
+	FontVal() { _lo = _hi = 0; }
+};
+
+class Font {
+public:
+	FontVal _charSet;
+	FontVal _charFor;
+};
+
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 765d57cf35..521e8895c8 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -204,5 +204,8 @@ void EventsManager::debounceLeft() {
 	}
 }
 
+void EventsManager::waitKeyMouse() {
+	error("TODO: waitKeyPress");
+}
 
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index b442b1507b..dc89829312 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -104,6 +104,8 @@ public:
 	void delay(int time);
 
 	void debounceLeft();
+
+	void waitKeyMouse();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 4da207b290..9969f336fd 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -584,6 +584,34 @@ int Room::validateBox(int boxId) {
 	return _vm->_scripts->executeScript();
 }
 
+void Room::placeBubble() {
+	_bubbleBox._maxChars = 27;
+	placeBubble1();
+}
+
+void Room::placeBubble1() {
+	_bubbleBox.clearBubbles();
+	_vm->_font._charSet._lo = 1;
+	_vm->_font._charSet._hi = 8;
+	_vm->_font._charFor._lo = 29;
+	_vm->_font._charFor._hi = 32;
+	
+	calcBubble();
+
+	Common::Rect r = _bubbleBox._bubbles[0];
+	r.translate(-2, 0);
+	_vm->_screen->saveBlock(r);
+	printBubble();
+}
+
+void Room::calcBubble() {
+	error("TODO: calcBubble");
+}
+
+void Room::printBubble() {
+	error("TODO: printBubble");
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
@@ -642,4 +670,30 @@ RoomInfo::RoomInfo(const byte *data) {
 	}
 }
 
+/*------------------------------------------------------------------------*/
+
+BubbleBox::BubbleBox() {
+	_field0 = 2;
+	_bounds = Common::Rect(64, 32, 130, 122);
+	_bubblePtr = -1;
+	_maxChars = 0;
+}
+
+void BubbleBox::load(Common::SeekableReadStream *stream) {
+	_bubbleTit.clear();
+
+	byte v;
+	do {
+		v = stream->readByte();
+		_bubbleTit.push_back(v);
+	} while (v != 0);
+
+	_bubblePtr = 0;
+}
+
+void BubbleBox::clearBubbles() {
+	_bubbles.clear();
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
index 19c3cc423b..9b26ed24e8 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -58,6 +58,22 @@ public:
 	}
 };
 
+class BubbleBox {
+public:
+	int _field0;
+	Common::Rect _bounds;
+	Common::Array<int> _bubbleTit;
+	int _bubblePtr;
+	int _maxChars;
+	Common::Array<Common::Rect> _bubbles;
+public:
+	BubbleBox();
+
+	void load(Common::SeekableReadStream *stream);
+
+	void clearBubbles();
+};
+
 class Room: public Manager {
 private:
 	void roomLoop();
@@ -114,6 +130,7 @@ protected:
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
+	BubbleBox _bubbleBox;
 	int _function;
 	int _roomFlag;
 	byte *_playField;
@@ -141,6 +158,13 @@ public:
 	void buildRow(int playY, int screenY);
 
 	void init4Quads();
+
+	void placeBubble();
+	void placeBubble1();
+
+	void calcBubble();
+
+	void printBubble();
 };
 
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 0cfce787a9..0c3cd2e92a 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -87,7 +87,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDOBJECT, &Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, 
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
-		&Scripts::CMDPRINT, &Scripts::cmdRetPos, &Scripts::cmdAnim,
+		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
@@ -116,7 +116,11 @@ void Scripts::executeCommand(int commandIndex) {
 	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::CMDOBJECT() { error("TODO CMDOBJECT"); }
+void Scripts::CMDOBJECT() { 
+	byte id;
+	
+	_vm->_room->_bubbleBox.load(_data);
+}
 
 void Scripts::CMDENDOBJECT() { error("TODO ENDOBJECT"); }
 
@@ -165,7 +169,24 @@ void Scripts::cmdJumpTalk() {
 void Scripts::cmdNull() {
 }
 
-void Scripts::CMDPRINT() { error("TODO CMDPRINT"); }
+#define PRINT_TIMER 25
+
+void Scripts::cmdPrint() { 
+	_vm->_screen->_printOrg = Common::Point(20, 42);
+	_vm->_screen->_printStart = Common::Point(20, 42);
+	_vm->_timers[PRINT_TIMER]._timer = 50;
+	_vm->_timers[PRINT_TIMER]._initTm = 50;
+	_vm->_timers[PRINT_TIMER]._flag = true;
+
+	_vm->_room->placeBubble();
+	_vm->_events->waitKeyMouse();
+
+	while (_vm->_timers[PRINT_TIMER]._flag) {
+		_vm->_events->pollEvents();
+	}
+
+	_vm->_screen->restoreBlock();
+}
 
 void Scripts::cmdRetPos() {
 	_endFlag = true;
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 0916b9e9b1..78e54f56c6 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -52,7 +52,7 @@ protected:
 	void cmdJumpUse();
 	void cmdJumpTalk();
 	void cmdNull();
-	void CMDPRINT();
+	void cmdPrint();
 	void cmdRetPos();
 	void cmdAnim();
 	void cmdSetFlag();
-- 
cgit v1.2.3


From f784b4efba7518806195f96d0177ccdc6e2dbaf8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 22:18:53 -0400
Subject: ACCESS: Added data for font2 and font6x6

---
 engines/access/access.h                    |   2 +-
 engines/access/amazon/amazon_game.cpp      |   6 +-
 engines/access/amazon/amazon_resources.cpp | 180 +++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |   8 ++
 engines/access/asurface.h                  |   3 -
 engines/access/data.cpp                    |  34 ++++++
 engines/access/data.h                      |  31 +++++
 engines/access/room.cpp                    |  25 +++-
 engines/access/scripts.cpp                 |   4 +-
 9 files changed, 281 insertions(+), 12 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 511cce835c..fa2d24ec44 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -125,7 +125,7 @@ public:
 	int _establishGroup;
 	int _numAnimTimers;
 	TimerList _timers;
-	Font _font;
+	FontManager _fonts;
 	Common::Array<Common::Rect> _newRects;
 	Common::Array<Common::Rect> _oldRects;
 	Common::Array<ExtraCell> _extraCells;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 042fd415da..072675c55e 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -172,7 +172,11 @@ void AmazonEngine::setupGame() {
 		_timers.push_back(te);
 	}
 
-	// Set miscellaneous fields
+	// Miscellaenous
+	_fonts._font6x6.load(FONT6x6_INDEX, FONT6x6_DATA);
+	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
+
+	// Set player room and position
 	_player->_roomNumber = 4;
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 15cf190d4a..b7a2472a3c 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1007,6 +1007,186 @@ const char *const INVENTORY_NAMES[] = {
 	"JASON'S CAR KEYS", "PESO BILLS", "PLANK"
 };
 
+const int FONT2_INDEX[] = {
+	62, 2, 6,
+	0x0000, 0x0019, 0x0021, 0x002e, 0x0041, 0x005a, 0x0073, 0x008c, 0x0093, 0x009b,
+	0x00a3, 0x00bc, 0x00d5, 0x00dd, 0x00ea, 0x00f1, 0x00fe, 0x010b, 0x0118, 0x0125,
+	0x0132, 0x013f, 0x014c, 0x0159, 0x0166, 0x0173, 0x0180, 0x0187, 0x018e, 0x01a7,
+	0x01b4, 0x01cd, 0x01dc, 0x01f5, 0x0208, 0x0215, 0x0222, 0x022f, 0x023c, 0x0249,
+	0x025c, 0x0269, 0x0276, 0x0285, 0x0292, 0x029f, 0x02b2, 0x02c5, 0x02d2, 0x02df,
+	0x02ee, 0x02fb, 0x0308, 0x0315, 0x0322, 0x032f, 0x0342, 0x034f, 0x0362, 0x036f,
+	0x0388, 0x03a1,
+};
+
+const byte FONT2_DATA[] = {
+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xf0, 0xf0, 0xf0,
+	0x00, 0xf0, 0x00, 0x06, 0xf3, 0xc0, 0xc3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x07, 0x1c, 0x00,
+	0x67, 0x9e, 0xc0, 0x07, 0x1c, 0x00, 0x67, 0x9e, 0xc0, 0x07,
+	0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x02, 0xc0, 0x00, 0x3f,
+	0xfc, 0x00, 0xb2, 0xc0, 0x00, 0x3f, 0xfc, 0x00, 0x02, 0xcb,
+	0x00, 0x3f, 0xfc, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x03, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x60,
+	0x70, 0x70, 0x60, 0x1c, 0x00, 0x04, 0x60, 0x18, 0x1c, 0x1c,
+	0x1c, 0x70, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x30,
+	0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf0, 0xf0,
+	0x00, 0x07, 0x00, 0xf0, 0x03, 0xc0, 0x0f, 0x00, 0x3c, 0x00,
+	0xf0, 0x00, 0x00, 0x00, 0x07, 0x3f, 0xc0, 0x70, 0x70, 0x70,
+	0x70, 0x70, 0x70, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0x1f, 0x00,
+	0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0xff, 0xf0, 0x00, 0x00,
+	0x08, 0x2b, 0xf0, 0xb0, 0x2c, 0x00, 0xa0, 0x0a, 0x00, 0xff,
+	0xfc, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x70, 0x03, 0xc0,
+	0x00, 0x70, 0xff, 0xc0, 0x00, 0x00, 0x07, 0x0b, 0xc0, 0x2d,
+	0xc0, 0xb1, 0xc0, 0xaa, 0xa0, 0x01, 0xc0, 0x00, 0x00, 0x07,
+	0xff, 0xf0, 0x70, 0x00, 0x7f, 0xc0, 0x00, 0xb0, 0xbf, 0xc0,
+	0x00, 0x00, 0x07, 0x2f, 0xc0, 0x70, 0x00, 0x7f, 0xc0, 0x70,
+	0x70, 0x3f, 0xc0, 0x00, 0x00, 0x08, 0xff, 0xfc, 0x00, 0xb0,
+	0x02, 0xc0, 0x02, 0xc0, 0x0b, 0x00, 0x00, 0x00, 0x08, 0x2f,
+	0xf0, 0xb0, 0x1c, 0x2f, 0xf0, 0xb0, 0x1c, 0x2f, 0xf0, 0x00,
+	0x00, 0x07, 0x3f, 0xc0, 0x70, 0x70, 0x3f, 0xf0, 0x00, 0x70,
+	0x3f, 0xc0, 0x00, 0x00, 0x03, 0xf0, 0xf0, 0x00, 0xf0, 0xf0,
+	0x00, 0x03, 0xf0, 0xf0, 0x00, 0xf0, 0x30, 0x00, 0x09, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00,
+	0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x06, 0xff, 0x00, 0x03, 0xc0, 0x0f, 0x00, 0x3c, 0x00,
+	0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x0a, 0x00, 0x40, 0x00, 0x01, 0xf0, 0x00, 0x07, 0x1c,
+	0x00, 0x1f, 0xff, 0x00, 0x70, 0x01, 0xc0, 0x00, 0x00, 0x00,
+	0x08, 0x7f, 0xf0, 0x70, 0x1c, 0x7f, 0xf0, 0x70, 0x1c, 0x6a,
+	0xb0, 0x00, 0x00, 0x08, 0x2f, 0xfc, 0x70, 0x00, 0x70, 0x00,
+	0x70, 0x00, 0x2a, 0xa8, 0x00, 0x00, 0x08, 0x7f, 0xf0, 0x70,
+	0x1c, 0x70, 0x1c, 0x70, 0x1c, 0x6a, 0xb0, 0x00, 0x00, 0x07,
+	0x7f, 0xf0, 0x70, 0x00, 0x7f, 0xc0, 0x70, 0x00, 0x6a, 0xa0,
+	0x00, 0x00, 0x07, 0x7f, 0xf0, 0x70, 0x00, 0x7f, 0xc0, 0x70,
+	0x00, 0x60, 0x00, 0x00, 0x00, 0x09, 0x3f, 0xfc, 0x00, 0x70,
+	0x00, 0x00, 0x70, 0xff, 0x00, 0x70, 0x1c, 0x00, 0x2a, 0xbc,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x70, 0x1c, 0x70, 0x1c, 0x7f,
+	0xfc, 0x70, 0x1c, 0x70, 0x1c, 0x00, 0x00, 0x07, 0xff, 0xf0,
+	0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0xaa, 0xa0, 0x00, 0x00,
+	0x08, 0x0f, 0xfc, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x70,
+	0x70, 0x2a, 0x40, 0x00, 0x00, 0x08, 0x70, 0x2c, 0x72, 0xc0,
+	0x7f, 0x00, 0x72, 0xc0, 0x70, 0x28, 0x00, 0x00, 0x07, 0x70,
+	0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6a, 0xa0, 0x00,
+	0x00, 0x0a, 0x70, 0x02, 0xc0, 0x7c, 0x09, 0xc0, 0x77, 0x2d,
+	0xc0, 0x71, 0xb1, 0xc0, 0x60, 0xc1, 0x80, 0x00, 0x00, 0x00,
+	0x09, 0x70, 0x07, 0x00, 0x77, 0x07, 0x00, 0x71, 0xc7, 0x00,
+	0x70, 0x77, 0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x08,
+	0x2f, 0xf0, 0x70, 0x1c, 0x70, 0x1c, 0x70, 0x1c, 0x2a, 0xa0,
+	0x00, 0x00, 0x08, 0x7f, 0xf0, 0x70, 0x1c, 0x7f, 0xf0, 0x70,
+	0x00, 0x60, 0x00, 0x00, 0x00, 0x08, 0x2f, 0xf0, 0x70, 0x1c,
+	0x70, 0x1c, 0x71, 0xdc, 0x2a, 0xa0, 0x00, 0x1c, 0x00, 0x00,
+	0x08, 0x7f, 0xf0, 0x70, 0x1c, 0x7f, 0xc0, 0x70, 0x70, 0x60,
+	0x18, 0x00, 0x00, 0x07, 0x2f, 0xf0, 0x70, 0x00, 0x2f, 0xc0,
+	0x00, 0xb0, 0xbf, 0xc0, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x0b,
+	0x00, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08,
+	0x70, 0x1c, 0x70, 0x1c, 0x70, 0x1c, 0x70, 0xdc, 0x1f, 0x1c,
+	0x00, 0x00, 0x08, 0xf0, 0x1c, 0xb0, 0x1c, 0x70, 0xb0, 0x72,
+	0xc0, 0x7f, 0x00, 0x00, 0x00, 0x0b, 0xf0, 0x00, 0xb0, 0xb0,
+	0x00, 0x70, 0x70, 0xc0, 0x70, 0x72, 0x72, 0xc0, 0x7c, 0x1f,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0xf0, 0x3c, 0x1c, 0xe0, 0x07,
+	0xc0, 0x1c, 0x70, 0x70, 0x1c, 0x00, 0x00, 0x09, 0x70, 0x07,
+	0x00, 0x1c, 0x1c, 0x00, 0x07, 0xf0, 0x00, 0x01, 0xc0, 0x00,
+	0x01, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xfc, 0x00,
+	0x70, 0x07, 0x00, 0x1c, 0x00, 0xaa, 0xac, 0x00, 0x00, 0x09,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+const int FONT6x6_INDEX[] = {
+	62, 1, 6,
+	0x0000, 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x002a, 0x0031, 0x0038, 0x003f,
+	0x0046, 0x004d, 0x0054, 0x005b, 0x0062, 0x0069, 0x0070, 0x0077, 0x007e, 0x0085,
+	0x008c, 0x0093, 0x009a, 0x00a1, 0x00a8, 0x00af, 0x00b6, 0x00bd, 0x00c4, 0x00cb,
+	0x00d2, 0x00d9, 0x00e0, 0x00e7, 0x00ee, 0x00f5, 0x00fc, 0x0103, 0x010a, 0x0111,
+	0x0118, 0x011f, 0x0126, 0x012d, 0x0134, 0x013b, 0x0142, 0x0149, 0x0150, 0x0157,
+	0x015e, 0x0165, 0x016c, 0x0173, 0x017a, 0x0181, 0x0188, 0x018f, 0x0196, 0x019d,
+	0x01a4, 0x01ab,
+};
+
+const byte FONT6x6_DATA[] = {
+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x30, 0x30,
+	0x30, 0x30, 0x00, 0x30, 0x06, 0xd8, 0xd8, 0x90, 0x00, 0x00,
+	0x00, 0x06, 0x50, 0xf8, 0x50, 0xf8, 0x50, 0x00, 0x06, 0x78,
+	0xa0, 0x70, 0x28, 0xf0, 0x20, 0x06, 0xc8, 0xd0, 0x20, 0x58,
+	0x98, 0x00, 0x06, 0x60, 0xd0, 0x60, 0xe8, 0xd0, 0x68, 0x06,
+	0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x06, 0x30, 0x60, 0x60,
+	0x60, 0x30, 0x00, 0x07, 0x30, 0x18, 0x18, 0x18, 0x30, 0x00,
+	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x20,
+	0xf8, 0x20, 0x20, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x30,
+	0x60, 0x06, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x06, 0x00,
+	0x00, 0x00, 0x60, 0x60, 0x00, 0x06, 0x18, 0x30, 0x60, 0xc0,
+	0x80, 0x00, 0x06, 0x70, 0x98, 0xa8, 0xc8, 0x70, 0x00, 0x06,
+	0x10, 0x30, 0x10, 0x10, 0x10, 0x00, 0x06, 0xf0, 0x08, 0x70,
+	0x80, 0xf8, 0x00, 0x06, 0xf0, 0x08, 0x70, 0x08, 0xf0, 0x00,
+	0x06, 0x30, 0x50, 0x90, 0xf8, 0x10, 0x00, 0x06, 0xf0, 0x80,
+	0xf0, 0x08, 0xf0, 0x00, 0x06, 0x70, 0x80, 0xf0, 0x88, 0x70,
+	0x00, 0x06, 0xf8, 0x08, 0x10, 0x20, 0x20, 0x00, 0x06, 0x70,
+	0x88, 0x70, 0x88, 0x70, 0x00, 0x06, 0x70, 0x88, 0x78, 0x08,
+	0x70, 0x00, 0x06, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x06,
+	0x60, 0x60, 0x00, 0x60, 0x20, 0x40, 0x06, 0x18, 0x30, 0x60,
+	0x30, 0x18, 0x00, 0x06, 0x00, 0x78, 0x00, 0x78, 0x00, 0x00,
+	0x06, 0x60, 0x30, 0x18, 0x30, 0x60, 0x00, 0x06, 0x70, 0x98,
+	0x30, 0x30, 0x00, 0x30, 0x06, 0x70, 0x88, 0xb8, 0xb0, 0x80,
+	0x78, 0x06, 0x70, 0x88, 0xf8, 0x88, 0x88, 0x00, 0x06, 0xf0,
+	0x88, 0xf0, 0x88, 0xf0, 0x00, 0x06, 0x78, 0x80, 0x80, 0x80,
+	0x78, 0x00, 0x06, 0xf0, 0x88, 0x88, 0x88, 0xf0, 0x00, 0x06,
+	0xf8, 0x80, 0xf0, 0x80, 0xf8, 0x00, 0x06, 0xf8, 0x80, 0xf0,
+	0x80, 0x80, 0x00, 0x06, 0x78, 0x80, 0x98, 0x88, 0x78, 0x00,
+	0x06, 0x88, 0x88, 0xf8, 0x88, 0x88, 0x00, 0x06, 0x70, 0x20,
+	0x20, 0x20, 0x70, 0x00, 0x06, 0x08, 0x08, 0x08, 0x88, 0x70,
+	0x00, 0x06, 0x90, 0xa0, 0xc0, 0xa0, 0x90, 0x00, 0x06, 0x80,
+	0x80, 0x80, 0x80, 0xf0, 0x00, 0x06, 0x88, 0xd8, 0xa8, 0x88,
+	0x88, 0x00, 0x06, 0x88, 0xc8, 0xa8, 0x98, 0x88, 0x00, 0x06,
+	0x70, 0x88, 0x88, 0x88, 0x70, 0x00, 0x06, 0xf0, 0x88, 0xf0,
+	0x80, 0x80, 0x00, 0x06, 0x70, 0x88, 0x88, 0x88, 0x70, 0x18,
+	0x06, 0xf0, 0x88, 0xf0, 0xa0, 0x98, 0x00, 0x06, 0x78, 0x80,
+	0x70, 0x08, 0xf0, 0x00, 0x06, 0xf8, 0x20, 0x20, 0x20, 0x20,
+	0x00, 0x06, 0x88, 0x88, 0x88, 0x88, 0x78, 0x00, 0x06, 0x88,
+	0x88, 0x88, 0x50, 0x20, 0x00, 0x06, 0x88, 0x88, 0xa8, 0xd8,
+	0x88, 0x00, 0x06, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00, 0x06,
+	0x88, 0x88, 0x50, 0x20, 0x20, 0x00, 0x06, 0xf8, 0x10, 0x20,
+	0x40, 0xf8, 0x00, 0x06, 0x78, 0x60, 0x60, 0x60, 0x78, 0x00,
+	0x06, 0xc0, 0x60, 0x30, 0x18, 0x08, 0x00, 0x06, 0x78, 0x18,
+	0x18, 0x18, 0x78, 0x00, 0x00, 0x52, 0x41, 0x54, 0x00, 0x41,
+	0x4c, 0x43, 0x4f, 0x48, 0x4f, 0x4c, 0x00, 0x53, 0x41, 0x46,
+	0x45, 0x20, 0x43, 0x4f, 0x4d, 0x42, 0x49, 0x4e, 0x41, 0x54,
+	0x49, 0x4f, 0x4e, 0x00, 0x42, 0x45, 0x41, 0x4b, 0x45, 0x52,
+	0x00, 0x4d, 0x49, 0x43, 0x52, 0x4f, 0x46, 0x49, 0x4c, 0x4d,
+	0x00, 0x56, 0x41, 0x55, 0x4c, 0x54, 0x20, 0x4b, 0x45, 0x59,
+	0x00, 0x42, 0x4f, 0x4c, 0x54, 0x20, 0x43, 0x55, 0x54, 0x54,
+	0x45, 0x52, 0x53, 0x00, 0x42, 0x4c, 0x4f, 0x57, 0x47, 0x55,
+	0x4e, 0x00, 0x4c, 0x4f, 0x56, 0x45, 0x20, 0x50, 0x4f, 0x54,
+	0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x4e, 0x45, 0x59, 0x00,
+	0x44, 0x41, 0x52, 0x54, 0x53, 0x00, 0x54, 0x41, 0x50, 0x45,
+	0x00, 0x4a, 0x55, 0x4e, 0x47, 0x4c, 0x45, 0x20, 0x50, 0x4f,
+	0x54, 0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x56, 0x49,
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index c9e3fe98e6..838bd29b70 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -41,6 +41,14 @@ extern const byte *CHARTBL[];
 
 extern const char *const INVENTORY_NAMES[];
 
+extern const int FONT2_INDEX[];
+
+extern const byte FONT2_DATA[];
+
+extern const int FONT6x6_INDEX[];
+
+extern const byte FONT6x6_DATA[];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 1efee28494..85550d9eee 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -48,9 +48,6 @@ public:
 	static int _scrollX, _scrollY;
 
 	static void init();
-public:
-	Common::Point _printOrg;
-	Common::Point _printStart;
 public:
 	virtual ~ASurface();
 
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index f5dbbb367f..1f8b33ef43 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -44,4 +44,38 @@ void TimerList::restoreTimers() {
 	}
 }
 
+/*------------------------------------------------------------------------*/
+
+Font::Font() {
+}
+
+void Font::load(const int *index, const byte *data) {
+	int count = index[0];
+	_v1 = index[1];
+	_v2 = index[2];
+
+	_chars.clear();
+	for (int idx = 0; idx < count; ++idx)
+		_chars.push_back(data + index[idx + 3]);
+}
+
+int Font::charWidth(char c) {
+	error("TODO");
+}
+
+int Font::stringWidth(const Common::String &msg) {
+	int total = 0;
+
+	for (const char *c = msg.c_str(); *c != '\0'; ++c)
+		total += charWidth(*c);
+
+	return 0;
+}
+
+/*------------------------------------------------------------------------*/
+
+FontManager::FontManager() {
+	_printMaxX = 0;
+}
+
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 93184563c4..6d783b15dc 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -86,9 +86,40 @@ public:
 };
 
 class Font {
+private:
+	int _v1;
+	int _v2;
+	Common::Array<const byte *> _chars;
+public:
+	Font();
+
+	/**
+	 * Load the given font data
+	 */
+	void load(const int *index, const byte *data);
+
+	/**
+	 * Get the width of a given character
+	 */
+	int charWidth(char c);
+
+	/**
+	 * Get the width of a given string
+	 */
+	int stringWidth(const Common::String &msg);
+};
+
+class FontManager {
 public:
 	FontVal _charSet;
 	FontVal _charFor;
+	Common::Point _printOrg;
+	Common::Point _printStart;
+	int _printMaxX;
+	Font _font6x6;
+	Font _font2;
+public:
+	FontManager();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 9969f336fd..74a30d8f2a 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -591,10 +591,10 @@ void Room::placeBubble() {
 
 void Room::placeBubble1() {
 	_bubbleBox.clearBubbles();
-	_vm->_font._charSet._lo = 1;
-	_vm->_font._charSet._hi = 8;
-	_vm->_font._charFor._lo = 29;
-	_vm->_font._charFor._hi = 32;
+	_vm->_fonts._charSet._lo = 1;
+	_vm->_fonts._charSet._hi = 8;
+	_vm->_fonts._charFor._lo = 29;
+	_vm->_fonts._charFor._hi = 32;
 	
 	calcBubble();
 
@@ -605,10 +605,25 @@ void Room::placeBubble1() {
 }
 
 void Room::calcBubble() {
-	error("TODO: calcBubble");
+	Common::Point printOrg = _vm->_fonts._printOrg;
+	Common::Point printStart = _vm->_fonts._printStart;
+
+	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
+
+	if (_bubbleBox._field0 == 4) {
+		_vm->_fonts._printMaxX = 110;
+	} else {
+
+	}
+
+
+
+	_vm->_fonts._printOrg = printOrg;
+	_vm->_fonts._printStart = printStart;
 }
 
 void Room::printBubble() {
+	//drawBubble(_bubbleBox._bubbles.size() - 1);
 	error("TODO: printBubble");
 }
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 0c3cd2e92a..2f221d9f52 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -172,8 +172,8 @@ void Scripts::cmdNull() {
 #define PRINT_TIMER 25
 
 void Scripts::cmdPrint() { 
-	_vm->_screen->_printOrg = Common::Point(20, 42);
-	_vm->_screen->_printStart = Common::Point(20, 42);
+	_vm->_fonts._printOrg = Common::Point(20, 42);
+	_vm->_fonts._printStart = Common::Point(20, 42);
 	_vm->_timers[PRINT_TIMER]._timer = 50;
 	_vm->_timers[PRINT_TIMER]._initTm = 50;
 	_vm->_timers[PRINT_TIMER]._flag = true;
-- 
cgit v1.2.3


From ff01ee6807ccd6e5a71ddc945196d68b87f3aa65 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 Aug 2014 23:18:53 -0400
Subject: ACCESS: Added code for bubble box size calculations

---
 engines/access/data.cpp | 41 ++++++++++++++++++++++++++-
 engines/access/data.h   | 11 ++++++++
 engines/access/room.cpp | 73 +++++++++++++++++++++++++++++++++++++++----------
 engines/access/room.h   | 10 +++++--
 4 files changed, 117 insertions(+), 18 deletions(-)

diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 1f8b33ef43..65702db9f1 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -60,7 +60,7 @@ void Font::load(const int *index, const byte *data) {
 }
 
 int Font::charWidth(char c) {
-	error("TODO");
+	return *_chars[c - ' '];
 }
 
 int Font::stringWidth(const Common::String &msg) {
@@ -72,6 +72,45 @@ int Font::stringWidth(const Common::String &msg) {
 	return 0;
 }
 
+bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &width) {
+	width = 0;
+	const char *src = s.c_str();
+	char c;
+
+	while ((c = *src) != '\0') {
+		if (c == '\r') {
+			// End of line, so return calculated line
+			line = Common::String(s.c_str(), src - 1);
+			s = Common::String(src + 1);
+			return false;
+		}
+
+		++src;
+		width += charWidth(c);
+		if (width < maxWidth)
+			continue;
+
+		// Reached maximum allowed. Work backwards to find space at the
+		// start of the current word as a point to split the line on
+		while (*src != ' ' && src >= s.c_str()) {
+			width -= charWidth(*src);
+			--src;
+		}
+		if (src < s.c_str())
+			error("Could not fit line");
+
+		// Split the line around the space
+		line = Common::String(s.c_str(), src - 1);
+		s = Common::String(src + 1);
+		return false;
+	}
+
+	// Return entire string
+	line = s;
+	s = Common::String();
+	return true;
+}
+
 /*------------------------------------------------------------------------*/
 
 FontManager::FontManager() {
diff --git a/engines/access/data.h b/engines/access/data.h
index 6d783b15dc..910e2523d1 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -107,6 +107,17 @@ public:
 	 * Get the width of a given string
 	 */
 	int stringWidth(const Common::String &msg);
+
+	/**
+	 * Get a partial string that will fit in a given width
+	 * @param s			Source string. Modified to remove line
+	 * @param maxWidth	Maximum width allowed
+	 * @param line		Output line
+	 * @param width		Calculated width of returned line
+	 * @returns			True if last line
+	 */
+	bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width);
+
 };
 
 class FontManager {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 74a30d8f2a..b46363b32d 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -558,7 +558,7 @@ int Room::checkBoxes2(const Common::Point &pt, int start, int count) {
 }
 
 void Room::checkBoxes3() {
-	for (int start = 0; start < _plotter._blocks.size(); ++start) {
+	for (uint start = 0; start < _plotter._blocks.size(); ++start) {
 		if (_plotter._blocks[start].contains(_vm->_events->_mousePos)) {
 			_plotter._blockIn = start;
 			if (!(validateBox(start) & 0x80)) {
@@ -571,7 +571,7 @@ void Room::checkBoxes3() {
 					_vm->_scripts->executeScript();
 				}
 
-				_vm->_boxSelect = -1;
+				_vm->_boxSelect = true;
 				return;
 			}
 		}
@@ -605,19 +605,57 @@ void Room::placeBubble1() {
 }
 
 void Room::calcBubble() {
+	// Save points
 	Common::Point printOrg = _vm->_fonts._printOrg;
 	Common::Point printStart = _vm->_fonts._printStart;
 
-	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
-
-	if (_bubbleBox._field0 == 4) {
+	// Figure out maximum width allowed
+	if (_bubbleBox._type == 4) {
 		_vm->_fonts._printMaxX = 110;
 	} else {
-
+		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubbleBox._bubblePtr);
 	}
 
+	// Start of with a rect with the given starting x and y
+	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
+
+	// Loop through getting lines
+	Common::String msg(_bubbleBox._bubblePtr);
+	Common::String line;
+	int width = 0;
+	bool lastLine;
+	do {
+		lastLine = _vm->_fonts._font2.getLine(msg, _vm->_fonts._printMaxX, line, width);
+		width = MIN(width, _vm->_fonts._printMaxX);
+
+		_vm->_fonts._printOrg.y += 6;
+		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
+	} while (!lastLine);
+
+	if (_bubbleBox._type == 4)
+		++_vm->_fonts._printOrg.y += 6;
 
+	// Determine the width for the area
+	width = (((_vm->_fonts._printMaxX >> 4) + 1) << 4) + 5;
+	if (width >= 24)
+		width += 20 - ((width - 24) % 20);
+	bounds.setWidth(width);
 
+	// Determine the height for area
+	int y = _vm->_fonts._printOrg.y + 6;
+	if (_bubbleBox._type == 4)
+		y += 6;
+	int height = y - bounds.top;
+	bounds.setHeight(height);
+
+	height -= (_bubbleBox._type == 4) ? 30 : 24;
+	if (height >= 0)
+		bounds.setHeight(bounds.height() + 13 - (height % 13));
+
+	// Add the new bounds to the bubbles list
+	_bubbleBox._bubbles.push_back(bounds);
+
+	// Restore points
 	_vm->_fonts._printOrg = printOrg;
 	_vm->_fonts._printStart = printStart;
 }
@@ -627,6 +665,15 @@ void Room::printBubble() {
 	error("TODO: printBubble");
 }
 
+void Room::drawBubble(int index) {
+	_bubbleBox._bounds = _bubbleBox._bubbles[index];
+	doBox();
+}
+
+void Room::doBox() {
+	error("TODO: doBox");
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
@@ -688,22 +735,20 @@ RoomInfo::RoomInfo(const byte *data) {
 /*------------------------------------------------------------------------*/
 
 BubbleBox::BubbleBox() {
-	_field0 = 2;
+	_type = 2;
 	_bounds = Common::Rect(64, 32, 130, 122);
-	_bubblePtr = -1;
+	_bubblePtr = nullptr;
 	_maxChars = 0;
 }
 
 void BubbleBox::load(Common::SeekableReadStream *stream) {
-	_bubbleTit.clear();
+	_bubbleTitle.clear();
 
 	byte v;
-	do {
-		v = stream->readByte();
-		_bubbleTit.push_back(v);
-	} while (v != 0);
+	while ((v = stream->readByte()) != 0)
+		_bubbleTitle += (char)v;
 
-	_bubblePtr = 0;
+	_bubblePtr = _bubbleTitle.c_str();
 }
 
 void BubbleBox::clearBubbles() {
diff --git a/engines/access/room.h b/engines/access/room.h
index 9b26ed24e8..3035561892 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -60,10 +60,10 @@ public:
 
 class BubbleBox {
 public:
-	int _field0;
+	int _type;
 	Common::Rect _bounds;
-	Common::Array<int> _bubbleTit;
-	int _bubblePtr;
+	Common::String _bubbleTitle;
+	const char *_bubblePtr;
 	int _maxChars;
 	Common::Array<Common::Rect> _bubbles;
 public:
@@ -165,6 +165,10 @@ public:
 	void calcBubble();
 
 	void printBubble();
+
+	void drawBubble(int index);
+
+	void doBox();
 };
 
 
-- 
cgit v1.2.3


From 1ab89400e52da33207a14051410fad01c257d14c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 Aug 2014 10:39:00 +0200
Subject: ACCESS: Remove two unused variables

---
 engines/access/asurface.cpp | 1 -
 engines/access/scripts.cpp  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 32e54036ad..08caa8a3b2 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -253,7 +253,6 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	int scaleY = SCALE_LIMIT * bounds.height() / this->h;
 	int scaleXCtr = 0, scaleYCtr = 0;
 
-	int y = bounds.top;
 	for (int yCtr = 0, y = bounds.top; yCtr < this->h; ++yCtr) {
 		// Handle skipping lines if Y scaling 
 		scaleYCtr += scaleY;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2f221d9f52..a4d67c87f1 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -117,8 +117,6 @@ void Scripts::executeCommand(int commandIndex) {
 }
 
 void Scripts::CMDOBJECT() { 
-	byte id;
-	
 	_vm->_room->_bubbleBox.load(_data);
 }
 
-- 
cgit v1.2.3


From 3e61eb9cc3f233fabf34f54069a1a1209e257008 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 Aug 2014 11:16:31 +0200
Subject: ACCESS: Implement some opcodes

---
 engines/access/access.cpp  |  6 ++++++
 engines/access/access.h    |  1 +
 engines/access/room.h      |  3 +--
 engines/access/scripts.cpp | 38 +++++++++++++++++++++++++++++++-------
 engines/access/scripts.h   |  8 ++++----
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index fde5ab8754..d2967c0377 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -84,6 +84,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	Common::fill(&_help1[0], &_help1[366], 0);
 	Common::fill(&_help2[0], &_help2[366], 0);
 	Common::fill(&_help1[0], &_help3[366], 0);
+	_helpTbl[0] = _help1;
+	_helpTbl[1] = _help2;
+	_helpTbl[2] = _help3;
 	_travel = 0;
 	_ask = 0;
 	_rScrollRow = 0;
@@ -221,6 +224,9 @@ void AccessEngine::doEstablish(int v1, int v2) {
 		_buffer2.copyBuffer(_screen);
 	}
 
+	_room->setIconPalette();
+	_screen->forceFadeIn();
+
 	warning("TODO: doEstablish");
 }
 
diff --git a/engines/access/access.h b/engines/access/access.h
index fa2d24ec44..37be9cfc36 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -163,6 +163,7 @@ public:
 	byte _help1[366];
 	byte _help2[366];
 	byte _help3[366];
+	byte *_helpTbl[3];
 	int _travel;
 	int _ask;
 	int _rScrollRow;
diff --git a/engines/access/room.h b/engines/access/room.h
index 3035561892..22dbd16411 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -120,8 +120,6 @@ protected:
 
 	virtual void reloadRoom1() = 0;
 
-	virtual void setIconPalette() {}
-
 	virtual void doCommands();
 
 	virtual void roomMenu() = 0;
@@ -159,6 +157,7 @@ public:
 
 	void init4Quads();
 
+	virtual void setIconPalette() {}
 	void placeBubble();
 	void placeBubble1();
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index a4d67c87f1..f781ec14d0 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -93,7 +93,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
-		&Scripts::cmdSetAnim, &Scripts::CMDDISPINV, &Scripts::CMDSETTIMER, 
+		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::CMDSETTIMER, 
 		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::cmdSetTravel,
 		&Scripts::cmdSetTravel, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
@@ -103,13 +103,13 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, 
 		&Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
 		&Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
-		&Scripts::cmdReturnChoice, &Scripts::CMDCLEARBLOCK, &Scripts::CMDLOADSOUND, 
+		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::CMDLOADSOUND, 
 		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
 		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, 
-		&Scripts::CMDCHAPTER, &Scripts::CMDSETHELP, &Scripts::CMDCENTERPANEL,
+		&Scripts::CMDCHAPTER, &Scripts::cmdSetHelp, &Scripts::cmdCenterPanel,
 		&Scripts::cmdMainPanel, &Scripts::CMDRETFLASH
 	};
 
@@ -296,7 +296,10 @@ void Scripts::cmdSetAnim() {
 	_vm->_animation->setAnimTimer(anim);
 }
 
-void Scripts::CMDDISPINV() { error("TODO CMDDISPINV"); }
+void Scripts::cmdDispInv() {
+	_vm->_inventory->newDisplayInv();
+}
+
 void Scripts::CMDSETTIMER() { error("TODO CMDSETTIMER"); }
 void Scripts::CMDCHECKTIMER() { error("TODO CMDCHECKTIMER"); }
 
@@ -388,7 +391,10 @@ void Scripts::cmdReturnChoice() {
 	_data->seek(_choiceStart);
 }
 
-void Scripts::CMDCLEARBLOCK() { error("TODO CMDCLEARBLOCK"); }
+void Scripts::cmdClearBlock() {
+	_vm->_screen->restoreBlock();
+}
+
 void Scripts::CMDLOADSOUND() { error("TODO CMDLOADSOUND"); }
 void Scripts::CMDFREESOUND() { error("TODO CMDFREESOUND"); }
 void Scripts::CMDSETVIDSND() { error("TODO CMDSETVIDSND"); }
@@ -413,8 +419,26 @@ void Scripts::CMDENDVID() { error("TODO CMDENDVID"); }
 void Scripts::CMDHELP() { error("TODO CMDHELP"); }
 void Scripts::CMDCYCLEBACK() { error("TODO CMDCYCLEBACK"); }
 void Scripts::CMDCHAPTER() { error("TODO CMDCHAPTER"); }
-void Scripts::CMDSETHELP() { error("TODO CMDSETHELP"); }
-void Scripts::CMDCENTERPANEL() { error("TODO CMDCENTERPANEL"); }
+
+void Scripts::cmdSetHelp() {
+	int arrayId = (_data->readUint16LE() && 0xFF) - 1;
+	int helpId = _data->readUint16LE() && 0xFF;
+
+	byte *help = _vm->_helpTbl[arrayId];
+	help[helpId] = 1;
+
+	if (_vm->_useItem == 0) {
+		_sequence = 11000;
+		searchForSequence();
+	}
+}
+
+void Scripts::cmdCenterPanel() {
+	if (_vm->_screen->_vesaMode) {
+		_vm->_screen->clearScreen();
+		_vm->_screen->setPanel(3);
+	}
+}
 
 void Scripts::cmdMainPanel() { 
 	if (_vm->_screen->_vesaMode) {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 78e54f56c6..4cf969e8c9 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -74,7 +74,7 @@ protected:
 	void cmdRetNeg();
 	void cmdCheckLoc();
 	void cmdSetAnim();
-	void CMDDISPINV();
+	void cmdDispInv();
 	void CMDSETTIMER();
 	void CMDCHECKTIMER();
 	void cmdSetTravel();
@@ -99,7 +99,7 @@ protected:
 	void CMDCHECKVFRAME();
 	void cmdJumpChoice();
 	void cmdReturnChoice();
-	void CMDCLEARBLOCK();
+	void cmdClearBlock();
 	void CMDLOADSOUND();
 	void CMDFREESOUND();
 	void CMDSETVIDSND();
@@ -113,8 +113,8 @@ protected:
 	void CMDHELP();
 	void CMDCYCLEBACK();
 	void CMDCHAPTER();
-	void CMDSETHELP();
-	void CMDCENTERPANEL();
+	void cmdSetHelp();
+	void cmdCenterPanel();
 	void cmdMainPanel();
 	void CMDRETFLASH();
 public:
-- 
cgit v1.2.3


From 404c7cd5d33e81c7724cb78dfce5701b26b4659b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 11:14:30 -0400
Subject: ACCESS: Split the bubble box code from Room into it's own file

---
 engines/access/access.cpp     |   3 +
 engines/access/access.h       |   2 +
 engines/access/bubble_box.cpp | 144 ++++++++++++++++++++++++++++++++++++++++++
 engines/access/bubble_box.h   |  75 ++++++++++++++++++++++
 engines/access/module.mk      |   1 +
 engines/access/room.cpp       | 114 ---------------------------------
 engines/access/room.h         |  32 +---------
 engines/access/scripts.cpp    |   4 +-
 8 files changed, 229 insertions(+), 146 deletions(-)
 create mode 100644 engines/access/bubble_box.cpp
 create mode 100644 engines/access/bubble_box.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index d2967c0377..7d12ba5b35 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -33,6 +33,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		_gameDescription(gameDesc), Engine(syst), _randomSource("Access"),
 		_useItem(_flags[100]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
 	_animation = nullptr;
+	_bubbleBox = nullptr;
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
@@ -102,6 +103,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 
 AccessEngine::~AccessEngine() {
 	delete _animation;
+	delete _bubbleBox;
 	delete _debugger;
 	delete _events;
 	delete _files;
@@ -142,6 +144,7 @@ void AccessEngine::initialize() {
 	// Create sub-objects of the engine
 	ASurface::init();
 	_animation = new AnimationManager(this);
+	_bubbleBox = new BubbleBox(this);
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
diff --git a/engines/access/access.h b/engines/access/access.h
index 37be9cfc36..88b6c837a5 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -31,6 +31,7 @@
 #include "engines/engine.h"
 #include "graphics/surface.h"
 #include "access/animation.h"
+#include "access/bubble_box.h"
 #include "access/data.h"
 #include "access/debugger.h"
 #include "access/events.h"
@@ -104,6 +105,7 @@ protected:
 	virtual void playGame() = 0;
 public:
 	AnimationManager *_animation;
+	BubbleBox *_bubbleBox;
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
new file mode 100644
index 0000000000..2b6d9dd11a
--- /dev/null
+++ b/engines/access/bubble_box.cpp
@@ -0,0 +1,144 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/algorithm.h"
+#include "access/bubble_box.h"
+#include "access/access.h"
+
+namespace Access {
+
+Box::Box(AccessEngine *vm) : Manager(vm) {
+	_edgeSize = 0;
+}
+
+void Box::doBox(int item, int box) {
+	error("TODO: doBox");
+}
+
+/*------------------------------------------------------------------------*/
+
+BubbleBox::BubbleBox(AccessEngine *vm) : Box(vm) {
+	_bubblePtr = nullptr;
+	_maxChars = 0;
+}
+
+void BubbleBox::load(Common::SeekableReadStream *stream) {
+	_bubbleTitle.clear();
+
+	byte v;
+	while ((v = stream->readByte()) != 0)
+		_bubbleTitle += (char)v;
+
+	_bubblePtr = _bubbleTitle.c_str();
+}
+
+void BubbleBox::clearBubbles() {
+	_bubbles.clear();
+}
+
+void BubbleBox::placeBubble() {
+	BubbleBox::_maxChars = 27;
+	placeBubble1();
+}
+
+void BubbleBox::placeBubble1() {
+	BubbleBox::clearBubbles();
+	_vm->_fonts._charSet._lo = 1;
+	_vm->_fonts._charSet._hi = 8;
+	_vm->_fonts._charFor._lo = 29;
+	_vm->_fonts._charFor._hi = 32;
+
+	calcBubble();
+
+	Common::Rect r = BubbleBox::_bubbles[0];
+	r.translate(-2, 0);
+	_vm->_screen->saveBlock(r);
+	printBubble();
+}
+
+void BubbleBox::calcBubble() {
+	// Save points
+	Common::Point printOrg = _vm->_fonts._printOrg;
+	Common::Point printStart = _vm->_fonts._printStart;
+
+	// Figure out maximum width allowed
+	if (_edgeSize == 4) {
+		_vm->_fonts._printMaxX = 110;
+	} else {
+		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(BubbleBox::_bubblePtr);
+	}
+
+	// Start of with a rect with the given starting x and y
+	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
+
+	// Loop through getting lines
+	Common::String msg(BubbleBox::_bubblePtr);
+	Common::String line;
+	int width = 0;
+	bool lastLine;
+	do {
+		lastLine = _vm->_fonts._font2.getLine(msg, _vm->_fonts._printMaxX, line, width);
+		width = MIN(width, _vm->_fonts._printMaxX);
+
+		_vm->_fonts._printOrg.y += 6;
+		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
+	} while (!lastLine);
+
+	if (_edgeSize == 4)
+		++_vm->_fonts._printOrg.y += 6;
+
+	// Determine the width for the area
+	width = (((_vm->_fonts._printMaxX >> 4) + 1) << 4) + 5;
+	if (width >= 24)
+		width += 20 - ((width - 24) % 20);
+	bounds.setWidth(width);
+
+	// Determine the height for area
+	int y = _vm->_fonts._printOrg.y + 6;
+	if (_edgeSize == 4)
+		y += 6;
+	int height = y - bounds.top;
+	bounds.setHeight(height);
+
+	height -= (_edgeSize == 4) ? 30 : 24;
+	if (height >= 0)
+		bounds.setHeight(bounds.height() + 13 - (height % 13));
+
+	// Add the new bounds to the bubbles list
+	BubbleBox::_bubbles.push_back(bounds);
+
+	// Restore points
+	_vm->_fonts._printOrg = printOrg;
+	_vm->_fonts._printStart = printStart;
+}
+
+void BubbleBox::printBubble() {
+	//drawBubble(BubbleBox::_bubbles.size() - 1);
+	error("TODO: printBubble");
+}
+
+void BubbleBox::drawBubble(int index) {
+	_bounds = BubbleBox::_bubbles[index];
+	doBox(0, 0);
+}
+
+} // End of namespace Access
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
new file mode 100644
index 0000000000..e02fa7c572
--- /dev/null
+++ b/engines/access/bubble_box.h
@@ -0,0 +1,75 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_BUBBLE_BOX_H
+#define ACCESS_BUBBLE_BOX_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "common/stream.h"
+#include "common/types.h"
+#include "graphics/surface.h"
+#include "access/data.h"
+
+namespace Access {
+
+class AccessEngine;
+
+class Box: public Manager {
+public:
+	int _edgeSize;
+	Common::Rect _bounds;
+public:
+	Box(AccessEngine *vm);
+
+	void doBox(int item, int box);
+};
+
+class BubbleBox: public Box {
+public:
+	Common::String _bubbleTitle;
+	const char *_bubblePtr;
+	int _maxChars;
+	Common::Array<Common::Rect> _bubbles;
+public:
+	BubbleBox(AccessEngine *vm);
+
+	void load(Common::SeekableReadStream *stream);
+
+	void clearBubbles();
+
+	void placeBubble();
+	void placeBubble1();
+
+	void calcBubble();
+
+	void printBubble();
+
+	void drawBubble(int index);
+
+
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_BUBBLE_BOX_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 6f906a9c21..d74892c241 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -4,6 +4,7 @@ MODULE_OBJS := \
 	animation.o \
 	asurface.o \
 	access.o \
+	bubble_box.o \
 	data.o \
 	debugger.o \
 	decompress.o \
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b46363b32d..0405e7c4ac 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -584,96 +584,6 @@ int Room::validateBox(int boxId) {
 	return _vm->_scripts->executeScript();
 }
 
-void Room::placeBubble() {
-	_bubbleBox._maxChars = 27;
-	placeBubble1();
-}
-
-void Room::placeBubble1() {
-	_bubbleBox.clearBubbles();
-	_vm->_fonts._charSet._lo = 1;
-	_vm->_fonts._charSet._hi = 8;
-	_vm->_fonts._charFor._lo = 29;
-	_vm->_fonts._charFor._hi = 32;
-	
-	calcBubble();
-
-	Common::Rect r = _bubbleBox._bubbles[0];
-	r.translate(-2, 0);
-	_vm->_screen->saveBlock(r);
-	printBubble();
-}
-
-void Room::calcBubble() {
-	// Save points
-	Common::Point printOrg = _vm->_fonts._printOrg;
-	Common::Point printStart = _vm->_fonts._printStart;
-
-	// Figure out maximum width allowed
-	if (_bubbleBox._type == 4) {
-		_vm->_fonts._printMaxX = 110;
-	} else {
-		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubbleBox._bubblePtr);
-	}
-
-	// Start of with a rect with the given starting x and y
-	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
-
-	// Loop through getting lines
-	Common::String msg(_bubbleBox._bubblePtr);
-	Common::String line;
-	int width = 0;
-	bool lastLine;
-	do {
-		lastLine = _vm->_fonts._font2.getLine(msg, _vm->_fonts._printMaxX, line, width);
-		width = MIN(width, _vm->_fonts._printMaxX);
-
-		_vm->_fonts._printOrg.y += 6;
-		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
-	} while (!lastLine);
-
-	if (_bubbleBox._type == 4)
-		++_vm->_fonts._printOrg.y += 6;
-
-	// Determine the width for the area
-	width = (((_vm->_fonts._printMaxX >> 4) + 1) << 4) + 5;
-	if (width >= 24)
-		width += 20 - ((width - 24) % 20);
-	bounds.setWidth(width);
-
-	// Determine the height for area
-	int y = _vm->_fonts._printOrg.y + 6;
-	if (_bubbleBox._type == 4)
-		y += 6;
-	int height = y - bounds.top;
-	bounds.setHeight(height);
-
-	height -= (_bubbleBox._type == 4) ? 30 : 24;
-	if (height >= 0)
-		bounds.setHeight(bounds.height() + 13 - (height % 13));
-
-	// Add the new bounds to the bubbles list
-	_bubbleBox._bubbles.push_back(bounds);
-
-	// Restore points
-	_vm->_fonts._printOrg = printOrg;
-	_vm->_fonts._printStart = printStart;
-}
-
-void Room::printBubble() {
-	//drawBubble(_bubbleBox._bubbles.size() - 1);
-	error("TODO: printBubble");
-}
-
-void Room::drawBubble(int index) {
-	_bubbleBox._bounds = _bubbleBox._bubbles[index];
-	doBox();
-}
-
-void Room::doBox() {
-	error("TODO: doBox");
-}
-
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
@@ -732,28 +642,4 @@ RoomInfo::RoomInfo(const byte *data) {
 	}
 }
 
-/*------------------------------------------------------------------------*/
-
-BubbleBox::BubbleBox() {
-	_type = 2;
-	_bounds = Common::Rect(64, 32, 130, 122);
-	_bubblePtr = nullptr;
-	_maxChars = 0;
-}
-
-void BubbleBox::load(Common::SeekableReadStream *stream) {
-	_bubbleTitle.clear();
-
-	byte v;
-	while ((v = stream->readByte()) != 0)
-		_bubbleTitle += (char)v;
-
-	_bubblePtr = _bubbleTitle.c_str();
-}
-
-void BubbleBox::clearBubbles() {
-	_bubbles.clear();
-}
-
-
 } // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
index 22dbd16411..f76db6f681 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -58,22 +58,6 @@ public:
 	}
 };
 
-class BubbleBox {
-public:
-	int _type;
-	Common::Rect _bounds;
-	Common::String _bubbleTitle;
-	const char *_bubblePtr;
-	int _maxChars;
-	Common::Array<Common::Rect> _bubbles;
-public:
-	BubbleBox();
-
-	void load(Common::SeekableReadStream *stream);
-
-	void clearBubbles();
-};
-
 class Room: public Manager {
 private:
 	void roomLoop();
@@ -125,10 +109,11 @@ protected:
 	virtual void roomMenu() = 0;
 
 	virtual void mainAreaClick() = 0;
+public:
+	virtual void setIconPalette() {}
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
-	BubbleBox _bubbleBox;
 	int _function;
 	int _roomFlag;
 	byte *_playField;
@@ -156,21 +141,8 @@ public:
 	void buildRow(int playY, int screenY);
 
 	void init4Quads();
-
-	virtual void setIconPalette() {}
-	void placeBubble();
-	void placeBubble1();
-
-	void calcBubble();
-
-	void printBubble();
-
-	void drawBubble(int index);
-
-	void doBox();
 };
 
-
 class RoomInfo {
 public:
 	struct FileIdent {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index f781ec14d0..f91b49c9ef 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -117,7 +117,7 @@ void Scripts::executeCommand(int commandIndex) {
 }
 
 void Scripts::CMDOBJECT() { 
-	_vm->_room->_bubbleBox.load(_data);
+	_vm->_bubbleBox->load(_data);
 }
 
 void Scripts::CMDENDOBJECT() { error("TODO ENDOBJECT"); }
@@ -176,7 +176,7 @@ void Scripts::cmdPrint() {
 	_vm->_timers[PRINT_TIMER]._initTm = 50;
 	_vm->_timers[PRINT_TIMER]._flag = true;
 
-	_vm->_room->placeBubble();
+	_vm->_bubbleBox->placeBubble();
 	_vm->_events->waitKeyMouse();
 
 	while (_vm->_timers[PRINT_TIMER]._flag) {
-- 
cgit v1.2.3


From 77626b72a59f0a9bf35da3f77032c018fe5d7963 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 12:01:28 -0400
Subject: ACCESS: Add missing string parameters to bubble box methods

---
 engines/access/bubble_box.cpp | 22 +++++++++++-----------
 engines/access/bubble_box.h   | 24 +++++++++++++++++-------
 engines/access/scripts.cpp    | 11 ++++++++++-
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 2b6d9dd11a..5f0cb9443b 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -55,27 +55,27 @@ void BubbleBox::clearBubbles() {
 	_bubbles.clear();
 }
 
-void BubbleBox::placeBubble() {
+void BubbleBox::placeBubble(const Common::String &msg) {
 	BubbleBox::_maxChars = 27;
-	placeBubble1();
+	placeBubble1(msg);
 }
 
-void BubbleBox::placeBubble1() {
+void BubbleBox::placeBubble1(const Common::String &msg) {
 	BubbleBox::clearBubbles();
 	_vm->_fonts._charSet._lo = 1;
 	_vm->_fonts._charSet._hi = 8;
 	_vm->_fonts._charFor._lo = 29;
 	_vm->_fonts._charFor._hi = 32;
 
-	calcBubble();
+	calcBubble(msg);
 
 	Common::Rect r = BubbleBox::_bubbles[0];
 	r.translate(-2, 0);
 	_vm->_screen->saveBlock(r);
-	printBubble();
+	printBubble(msg);
 }
 
-void BubbleBox::calcBubble() {
+void BubbleBox::calcBubble(const Common::String &msg) {
 	// Save points
 	Common::Point printOrg = _vm->_fonts._printOrg;
 	Common::Point printStart = _vm->_fonts._printStart;
@@ -84,19 +84,19 @@ void BubbleBox::calcBubble() {
 	if (_edgeSize == 4) {
 		_vm->_fonts._printMaxX = 110;
 	} else {
-		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(BubbleBox::_bubblePtr);
+		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubblePtr);
 	}
 
 	// Start of with a rect with the given starting x and y
 	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
 
 	// Loop through getting lines
-	Common::String msg(BubbleBox::_bubblePtr);
+	Common::String s = msg;
 	Common::String line;
 	int width = 0;
 	bool lastLine;
 	do {
-		lastLine = _vm->_fonts._font2.getLine(msg, _vm->_fonts._printMaxX, line, width);
+		lastLine = _vm->_fonts._font2.getLine(s, _vm->_fonts._printMaxX, line, width);
 		width = MIN(width, _vm->_fonts._printMaxX);
 
 		_vm->_fonts._printOrg.y += 6;
@@ -131,8 +131,8 @@ void BubbleBox::calcBubble() {
 	_vm->_fonts._printStart = printStart;
 }
 
-void BubbleBox::printBubble() {
-	//drawBubble(BubbleBox::_bubbles.size() - 1);
+void BubbleBox::printBubble(const Common::String &msg) {
+	drawBubble(BubbleBox::_bubbles.size() - 1);
 	error("TODO: printBubble");
 }
 
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index e02fa7c572..189e0b1c04 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -58,13 +58,23 @@ public:
 
 	void clearBubbles();
 
-	void placeBubble();
-	void placeBubble1();
-
-	void calcBubble();
-
-	void printBubble();
-
+	void placeBubble(const Common::String &msg);
+	void placeBubble1(const Common::String &msg);
+
+	/**
+	 * Calculate the size of a bubble needed to hold a given string
+	 */
+	void calcBubble(const Common::String &msg);
+
+	/**
+	 * Prints a text bubble and it's contents 
+	 */
+	void printBubble(const Common::String &msg);
+
+	/*
+	 * Draws the background for a text bubble
+	 * @param index		Index of bounds in _bubbles array
+	 */
 	void drawBubble(int index);
 
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index f91b49c9ef..640514aca7 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -176,13 +176,22 @@ void Scripts::cmdPrint() {
 	_vm->_timers[PRINT_TIMER]._initTm = 50;
 	_vm->_timers[PRINT_TIMER]._flag = true;
 
-	_vm->_bubbleBox->placeBubble();
+	// Get a text line for display
+	Common::String msg;
+	byte c;
+	while ((c = (char)_data->readByte()) != '\0')
+		msg += c;
+
+	// Display the text in a bubble, and wait for a keypress or mouse click
+	_vm->_bubbleBox->placeBubble(msg);
 	_vm->_events->waitKeyMouse();
 
+	// Wait until the bubble display is expired
 	while (_vm->_timers[PRINT_TIMER]._flag) {
 		_vm->_events->pollEvents();
 	}
 
+	// Restore the original screen over the text bubble
 	_vm->_screen->restoreBlock();
 }
 
-- 
cgit v1.2.3


From 1b69da3d17c7dce0c64eb23e7c5499a20c60cd47 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 Aug 2014 21:49:07 +0200
Subject: ACCESS: Implement some more opcodes

---
 engines/access/scripts.cpp | 55 +++++++++++++++++++++++++++++++++++++++++-----
 engines/access/scripts.h   |  9 +++++---
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 640514aca7..a209efcd04 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -36,6 +36,8 @@ Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
 	_returnCode = 0;
 	_choice = 0;
 	_choiceStart = 0;
+	_charsOrg = Common::Point(0, 0);
+	_texsOrg = Common::Point(0, 0);
 }
 
 Scripts::~Scripts() {
@@ -65,6 +67,10 @@ void Scripts::searchForSequence() {
 	} while (sequenceId != _sequence);
 }
 
+void Scripts::findNull() {
+	// No implementation required in ScummVM, the strings in the script files are already skipped by the use of readByte()
+}
+
 int Scripts::executeScript() {
 	assert(_data);
 	_endFlag = false;
@@ -100,9 +106,9 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
-		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::CMDCHARSPEAK, 
-		&Scripts::CMDTEXSPEAK, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
-		&Scripts::CMDSETCONPOS, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
+		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
+		&Scripts::cmdTexSpeak, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
+		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::CMDLOADSOUND, 
 		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
@@ -379,11 +385,48 @@ void Scripts::CMDSPECIAL() {
 
 void Scripts::CMDSETCYCLE() { error("TODO CMDSETCYCLE"); }
 void Scripts::CMDCYCLE() { error("TODO CMDCYCLE"); }
-void Scripts::CMDCHARSPEAK() { error("TODO CMDCHARSPEAK"); }
-void Scripts::CMDTEXSPEAK() { error("TODO CMDTEXSPEAK"); }
+
+void Scripts::cmdCharSpeak() {
+	_vm->_fonts._printOrg = _charsOrg;
+	_vm->_fonts._printStart = _charsOrg;
+
+	byte v;
+	Common::String tmpStr = "";
+	while ((v = _data->readByte()) != 0)
+		tmpStr += (char)v;
+
+	_vm->_bubbleBox->placeBubble(tmpStr);
+	findNull();
+}
+
+void Scripts::cmdTexSpeak() {
+	_vm->_fonts._printOrg = _texsOrg;
+	_vm->_fonts._printStart = _texsOrg;
+	_vm->_bubbleBox->_maxChars = 20;
+
+	byte v;
+	Common::String tmpStr = "";
+	while ((v = _data->readByte()) != 0)
+		tmpStr += (char)v;
+
+	_vm->_bubbleBox->_bubblePtr = Common::String("JASON").c_str();
+	_vm->_bubbleBox->placeBubble1(tmpStr);
+	findNull();
+}
+
 void Scripts::CMDTEXCHOICE() { error("TODO CMDTEXCHOICE"); } // _choiceStart = _data->pos() - 1;
 void Scripts::CMDWAIT() { error("TODO CMDWAIT"); }
-void Scripts::CMDSETCONPOS() { error("TODO CMDSETCONPOS"); }
+
+void Scripts::cmdSetConPos() {
+	int x = _data->readSint16LE();
+	int y = _data->readSint16LE();
+	_charsOrg = Common::Point(x, y);
+
+	x = _data->readSint16LE();
+	y = _data->readSint16LE();
+	_texsOrg = Common::Point(x, y);
+}
+
 void Scripts::CMDCHECKVFRAME() { error("TODO CMDCHECKVFRAME"); }
 
 void Scripts::cmdJumpChoice() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 4cf969e8c9..aae31464bf 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -91,11 +91,11 @@ protected:
 	void CMDSPECIAL();
 	void CMDSETCYCLE();
 	void CMDCYCLE();
-	void CMDCHARSPEAK();
-	void CMDTEXSPEAK();
+	void cmdCharSpeak();
+	void cmdTexSpeak();
 	void CMDTEXCHOICE();
 	void CMDWAIT();
-	void CMDSETCONPOS();
+	void cmdSetConPos();
 	void CMDCHECKVFRAME();
 	void cmdJumpChoice();
 	void cmdReturnChoice();
@@ -124,6 +124,7 @@ public:
 	int _scriptCommand;
 	int _choice;
 	int32 _choiceStart;
+	Common::Point _charsOrg, _texsOrg;
 public:
 	Scripts(AccessEngine *vm);
 
@@ -136,6 +137,8 @@ public:
 	void searchForSequence();
 	
 	int executeScript();
+
+	void findNull();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 4ea9339d183cb53f465d7752e739cf8a153a7978 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 Aug 2014 22:42:28 +0200
Subject: ACCESS: Implement cmdSetTex()

---
 engines/access/player.h    |  4 ++--
 engines/access/room.h      |  3 ++-
 engines/access/scripts.cpp | 36 ++++++++++++++++++++++++++++++++----
 engines/access/scripts.h   |  4 ++--
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/engines/access/player.h b/engines/access/player.h
index a9efff2433..b904e46170 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -49,11 +49,9 @@ private:
 	int _diagDownWalkMin, _diagDownWalkMax;
 	Common::Point _guard;
 	bool _collideFlag;
-	Direction _playerDirection;
 	Direction _move;
 	int _xFlag, _yFlag;
 	Common::Point _moveTo;
-	SpriteResource *_playerSprites;
 	SpriteResource *_playerSprites1;
 	byte *_manPal1;
 	int _scrollEnd;
@@ -79,6 +77,8 @@ private:
 	bool scrollLeft();
 	bool scrollRight();
 public:
+	Direction _playerDirection;
+	SpriteResource *_playerSprites;
 	// Fields in original Player structure
 	byte *_monData;
 	int _walkOffRight[PLAYER_DATA_COUNT];
diff --git a/engines/access/room.h b/engines/access/room.h
index f76db6f681..a90c6e400e 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -68,7 +68,6 @@ private:
 protected:
 	void loadRoomData(const byte *roomData);
 	void setupRoom();
-	void setWallCodes();
 	void buildScreen();
 
 	/**
@@ -110,6 +109,8 @@ protected:
 
 	virtual void mainAreaClick() = 0;
 public:
+	void setWallCodes();
+
 	virtual void setIconPalette() {}
 public:
 	Plotter _plotter;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index a209efcd04..0d232cc779 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -96,7 +96,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
-		&Scripts::CMDSETTEX, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
+		&Scripts::cmdSetTex, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::CMDSETTIMER, 
@@ -105,7 +105,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
-		&Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL, &Scripts::CMDSPECIAL,
+		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
 		&Scripts::cmdTexSpeak, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
@@ -255,7 +255,35 @@ void Scripts::cmdCheckInventory() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSETTEX() { error("TODO CMDSETTEX"); }
+void Scripts::cmdSetTex() {
+	_vm->_player->_playerDirection = RIGHT;
+	int posX = _data->readSint16LE() - (_vm->_player->_playerOffset.x / 2);
+	if (posX <= _vm->_player->_rawPlayer.x)
+		_vm->_player->_playerDirection = LEFT;
+
+	_vm->_player->_rawPlayer.x = posX;
+	_vm->_player->checkScroll();
+	bool scrlTemp = _vm->_player->_scrollFlag;
+
+	_vm->_player->_playerDirection = UP;
+	int posY = _data->readSint16LE();
+	if (posY <= _vm->_player->_rawPlayer.y)
+		_vm->_player->_playerDirection = DOWN;
+
+	_vm->_player->_rawPlayer.y = posY;
+	_vm->_player->_frame = 5;
+	_vm->_player->checkScroll();
+
+	_vm->_player->_scrollFlag |= scrlTemp;
+
+	_vm->_player->_position = Common::Point(_vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y - _vm->_player->_playerOffset.y);
+	_vm->_player->_priority = _vm->_player->_playerOffset.y;
+	_vm->_player->_spritesPtr = _vm->_player->_playerSprites;
+	_vm->_player->_frameNumber = _vm->_player->_frame;
+
+	_vm->_room->setWallCodes();
+}
+
 void Scripts::CMDNEWROOM() { error("TODO CMDNEWROOM"); }
 void Scripts::CMDCONVERSE() { error("TODO CMDCONVERSE"); }
 
@@ -363,7 +391,7 @@ void Scripts::cmdRemoveLast() {
 	--_vm->_numAnimTimers;
 }
 
-void Scripts::CMDSPECIAL() { 
+void Scripts::cmdSpecial() { 
 	_specialFunction = _data->readUint16LE();
 	int p1 = _data->readUint16LE();
 	int p2 = _data->readUint16LE();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index aae31464bf..70d79c4b65 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -65,7 +65,7 @@ protected:
 	
 	void cmdSetInventory();
 	void cmdCheckInventory();
-	void CMDSETTEX();
+	void cmdSetTex();
 	void CMDNEWROOM();
 	void CMDCONVERSE();
 	void cmdCheckFrame();
@@ -88,7 +88,7 @@ protected:
 	void CMDSETBUFVID();
 	void CMDPLAYBUFVID();
 	void cmdRemoveLast();
-	void CMDSPECIAL();
+	void cmdSpecial();
 	void CMDSETCYCLE();
 	void CMDCYCLE();
 	void cmdCharSpeak();
-- 
cgit v1.2.3


From 9393f6d7559653a28166fe74da9745e95b76f85b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 18:56:05 -0400
Subject: ACCESS: Implemented bubble box drawing code

---
 engines/access/asurface.cpp   |  12 +++
 engines/access/asurface.h     |   7 +-
 engines/access/bubble_box.cpp | 167 ++++++++++++++++++++++++++++++++++++------
 engines/access/bubble_box.h   |  27 ++++---
 engines/access/data.cpp       |  85 ++++++++++++++++++---
 engines/access/data.h         |  19 ++++-
 6 files changed, 271 insertions(+), 46 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 08caa8a3b2..99292278f3 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -115,6 +115,11 @@ int ASurface::_lastBoundsW;
 int ASurface::_lastBoundsH;
 int ASurface::_scrollX;
 int ASurface::_scrollY;
+int ASurface::_orgX1;
+int ASurface::_orgY1;
+int ASurface::_orgX2;
+int ASurface::_orgY2;
+int ASurface::_lColor;
 
 void ASurface::init() {
 	_leftSkip = _rightSkip = 0;
@@ -123,6 +128,9 @@ void ASurface::init() {
 	_lastBoundsX = _lastBoundsY = 0;
 	_lastBoundsW = _lastBoundsH = 0;
 	_scrollX = _scrollY = 0;
+	_orgX1 = _orgY1 = 0;
+	_orgX2 = _orgY2 = 0;
+	_lColor = 0;
 }
 
 ASurface::~ASurface() {
@@ -329,4 +337,8 @@ void ASurface::restoreBlock() {
 	}
 }
 
+void ASurface::drawRect() {
+	Graphics::Surface::fillRect(Common::Rect(_orgX1, _orgY1, _orgX2, _orgY2), _lColor);
+}
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 85550d9eee..400dd07b4d 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -46,8 +46,13 @@ public:
 	static int _lastBoundsX, _lastBoundsY;
 	static int _lastBoundsW, _lastBoundsH;
 	static int _scrollX, _scrollY;
+	static int _orgX1, _orgY1;
+	static int _orgX2, _orgY2;
+	static int _lColor;
 
 	static void init();
+public:
+	virtual void plotFrame(SpriteFrame *frame, const Common::Point &pt);
 public:
 	virtual ~ASurface();
 
@@ -75,7 +80,7 @@ public:
 
 	void restoreBlock();
 
-	virtual void plotFrame(SpriteFrame *frame, const Common::Point &pt);
+	void drawRect();
 };
 
 class SpriteFrame : public ASurface {
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 5f0cb9443b..f910028fc5 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -26,18 +26,15 @@
 
 namespace Access {
 
-Box::Box(AccessEngine *vm) : Manager(vm) {
-	_edgeSize = 0;
-}
-
-void Box::doBox(int item, int box) {
-	error("TODO: doBox");
-}
-
-/*------------------------------------------------------------------------*/
-
-BubbleBox::BubbleBox(AccessEngine *vm) : Box(vm) {
+BubbleBox::BubbleBox(AccessEngine *vm) : Manager(vm) {
+	_type = TYPE_2;
+	_bounds = Common::Rect(64, 32, 64 + 130, 32 + 122);
 	_bubblePtr = nullptr;
+	_fieldD = 0;
+	_fieldE = 0;
+	_fieldF = 0;
+	_field10 = 0;
+
 	_maxChars = 0;
 }
 
@@ -69,7 +66,7 @@ void BubbleBox::placeBubble1(const Common::String &msg) {
 
 	calcBubble(msg);
 
-	Common::Rect r = BubbleBox::_bubbles[0];
+	Common::Rect r = _bubbles[0];
 	r.translate(-2, 0);
 	_vm->_screen->saveBlock(r);
 	printBubble(msg);
@@ -81,7 +78,7 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	Common::Point printStart = _vm->_fonts._printStart;
 
 	// Figure out maximum width allowed
-	if (_edgeSize == 4) {
+	if (_type == TYPE_4) {
 		_vm->_fonts._printMaxX = 110;
 	} else {
 		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubblePtr);
@@ -96,14 +93,14 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	int width = 0;
 	bool lastLine;
 	do {
-		lastLine = _vm->_fonts._font2.getLine(s, _vm->_fonts._printMaxX, line, width);
-		width = MIN(width, _vm->_fonts._printMaxX);
+		lastLine = _vm->_fonts._font2.getLine(s, _maxChars * 6, line, width);
+		width = MAX(width, _vm->_fonts._printMaxX);
 
 		_vm->_fonts._printOrg.y += 6;
 		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
 	} while (!lastLine);
 
-	if (_edgeSize == 4)
+	if (_type == TYPE_4)
 		++_vm->_fonts._printOrg.y += 6;
 
 	// Determine the width for the area
@@ -114,17 +111,17 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 
 	// Determine the height for area
 	int y = _vm->_fonts._printOrg.y + 6;
-	if (_edgeSize == 4)
+	if (_type == TYPE_4)
 		y += 6;
 	int height = y - bounds.top;
 	bounds.setHeight(height);
 
-	height -= (_edgeSize == 4) ? 30 : 24;
+	height -= (_type == TYPE_4) ? 30 : 24;
 	if (height >= 0)
 		bounds.setHeight(bounds.height() + 13 - (height % 13));
 
 	// Add the new bounds to the bubbles list
-	BubbleBox::_bubbles.push_back(bounds);
+	_bubbles.push_back(bounds);
 
 	// Restore points
 	_vm->_fonts._printOrg = printOrg;
@@ -132,13 +129,139 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 }
 
 void BubbleBox::printBubble(const Common::String &msg) {
-	drawBubble(BubbleBox::_bubbles.size() - 1);
-	error("TODO: printBubble");
+	drawBubble(_bubbles.size() - 1);
+
+	// Loop through drawing the lines
+	Common::String s = msg;
+	Common::String line;
+	int width = 0;
+	bool lastLine;
+	do {
+		// Get next line
+		Font &font2 = _vm->_fonts._font2;
+		lastLine = font2.getLine(s, _maxChars * 6, line, width);
+
+		// Set font colors
+		font2._fontColors[0] = 0;
+		font2._fontColors[1] = 0;
+		font2._fontColors[2] = 0;
+		font2._fontColors[3] = 0;
+
+		int xp = _vm->_fonts._printOrg.x;
+		if (_type == TYPE_4)
+			xp = (_bounds.width() - width) / 2 + _bounds.left - 4;
+
+		// Draw the text
+		font2.drawString(_vm->_screen, line, Common::Point(xp, _vm->_fonts._printOrg.y));
+
+		// Move print position
+		_vm->_fonts._printOrg.y += 6;
+		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
+	} while (!lastLine);
 }
 
 void BubbleBox::drawBubble(int index) {
-	_bounds = BubbleBox::_bubbles[index];
+	_bounds = _bubbles[index];
 	doBox(0, 0);
 }
 
+void BubbleBox::doBox(int item, int box) {
+	FontManager &fonts = _vm->_fonts;
+	ASurface &screen = *_vm->_screen;
+
+	_startItem = item;
+	_startBox = box;
+
+	// Save state information
+	FontVal charSet = fonts._charSet;
+	FontVal charFor = fonts._charFor;
+	Common::Point printOrg = fonts._printOrg;
+	Common::Point printStart = fonts._printStart;
+	int charCol = _charCol;
+	int rowOff = _rowOff;
+
+	_vm->_screen->saveScreen();
+	_vm->_screen->setDisplayScan();
+	fonts._charFor._hi = 0xff;
+	fonts._charSet._lo = 1;
+	fonts._charSet._hi = 0;
+
+	if (_type == TYPE_4) {
+		fonts._charFor._lo = 0xFF;
+		error("TODO: filename listing");
+		return;
+	}
+
+	// Get icons data
+	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *icons = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
+	delete[] iconData;
+
+	// Set the up boundaries and color to use for the box background
+	_vm->_screen->_orgX1 = _bounds.left;
+	_vm->_screen->_orgY1 = _bounds.top;
+	_vm->_screen->_orgX2 = _bounds.right;
+	_vm->_screen->_orgY2 = _bounds.bottom;
+	_vm->_screen->_lColor = 1;
+
+	int h = _bounds.height() - (_type == TYPE_4) ? 30 : 24;
+	int ySize = (h < 0) ? 0 : (h + 12) / 13;
+	int w = _bounds.width() - 24;
+	int xSize = (w < 0) ? 0 : (w + 19) / 20;
+
+	// Draw a background for the entire area
+	screen.drawRect();
+
+	// Draw images to form the top border
+	int xp, yp;
+	screen.plotImage(icons, 20, Common::Point(screen._orgX1, screen._orgY1));
+	xp = screen._orgX1 + 12;
+	for (int x = 0; x < xSize; ++x, xp += 20)
+		screen.plotImage(icons, 24 + x, Common::Point(xp, screen._orgY1));
+	screen.plotImage(icons, 21, Common::Point(xp, screen._orgY1));
+
+	// Draw images to form the bottom border
+	yp = screen._orgY2 - (_type == TYPE_4) ? 18 : 12;
+	screen.plotImage(icons, (_type == TYPE_4) ? 72 : 22,
+		Common::Point(screen._orgX1, yp));
+	xp = screen._orgX1 + 12;
+	yp += (_type == TYPE_4) ? 4 : 8;
+
+	for (int x = 0; x < xSize; ++x, xp += 20) {
+		screen.plotImage(icons, (_type == TYPE_4 ? 62 : 34) + x, 
+			Common::Point(xp, yp));
+	}
+	
+	yp -= (_type == TYPE_4) ? 18 : 12;
+	screen.plotImage(icons, (_type == TYPE_4) ? 73 : 23,
+		Common::Point(screen._orgX1, yp));
+
+	if (_type == TYPE_4) {
+		// Further stuff
+		warning("YSIZE not yet used %d", ySize);
+		error("TODO: Box type 4");
+	}
+
+	// Handle drawing title
+	int titleWidth = _vm->_fonts._font2.stringWidth(_bubblePtr);
+	Font &font2 = _vm->_fonts._font2;
+	font2._fontColors[0] = 0;
+	font2._fontColors[1] = 3;
+	font2._fontColors[2] = 2;
+	font2._fontColors[3] = 1;
+	font2.drawString(_vm->_screen, _bubblePtr, Common::Point(
+		_bounds.left + (_bounds.width() / 2) - (titleWidth / 2), _bounds.top + 1));
+
+	// Restore positional state
+	fonts._charSet = charSet;
+	fonts._charFor = charFor;
+	fonts._printOrg = printOrg;
+	fonts._printStart = printStart;
+	_charCol = charCol;
+	_rowOff = rowOff;
+	
+	// Free icons data
+	delete icons;
+}
+
 } // End of namespace Access
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 189e0b1c04..3ddb2f72e3 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/str-array.h"
 #include "common/stream.h"
 #include "common/types.h"
 #include "graphics/surface.h"
@@ -35,20 +36,24 @@ namespace Access {
 
 class AccessEngine;
 
-class Box: public Manager {
-public:
-	int _edgeSize;
-	Common::Rect _bounds;
-public:
-	Box(AccessEngine *vm);
-
-	void doBox(int item, int box);
-};
+enum BoxType { TYPE_2 = 2, TYPE_4 = 4 };
 
-class BubbleBox: public Box {
+class BubbleBox: public Manager {
+private:
+	int _startItem, _startBox;
+	int _charCol, _rowOff;
+	Common::Point _fileStart;
 public:
+	BoxType _type;
+	Common::Rect _bounds;
+	Common::StringArray _nameIndex;
 	Common::String _bubbleTitle;
 	const char *_bubblePtr;
+	int _fieldD;
+	int _fieldE;
+	int _fieldF;
+	int _field10;
+
 	int _maxChars;
 	Common::Array<Common::Rect> _bubbles;
 public:
@@ -77,7 +82,7 @@ public:
 	 */
 	void drawBubble(int index);
 
-
+	void doBox(int item, int box);
 };
 
 } // End of namespace Access
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 65702db9f1..1fba854f19 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -46,21 +46,57 @@ void TimerList::restoreTimers() {
 
 /*------------------------------------------------------------------------*/
 
+byte Font::_fontColors[4];
+
 Font::Font() {
 }
 
+Font::~Font() {
+	for (uint i = 0; i < _chars.size(); ++i)
+		_chars[i].free();
+}
+
 void Font::load(const int *index, const byte *data) {
+	assert(_chars.size() == 0);
 	int count = index[0];
-	_v1 = index[1];
-	_v2 = index[2];
-
-	_chars.clear();
-	for (int idx = 0; idx < count; ++idx)
-		_chars.push_back(data + index[idx + 3]);
+	_bitWidth = index[1];
+	_height = index[2];
+
+	_chars.resize(count);
+
+	for (int i = 0; i < count; ++i) {
+		const byte *pData = data + index[i + 3];
+		_chars[i].create(*pData++, _height, Graphics::PixelFormat::createFormatCLUT8());
+
+		for (int y = 0; y < _height; ++y) {
+			int bitsLeft = 0;
+			byte srcByte = 0;
+			byte pixel;
+			
+			byte *pDest = (byte *)_chars[i].getBasePtr(0, y);
+			for (int x = 0; x < _chars[i].w; ++x, ++pDest) {
+				// Get the pixel
+				pixel = 0;
+				for (int pixelCtr = 0; pixelCtr < _bitWidth; ++pixelCtr) {
+					// No bits in current byte left, so get next byte
+					if (bitsLeft == 0) {
+						bitsLeft = 8;
+						srcByte = *pData++;
+					}
+
+					pixel = (pixel << 1) | (srcByte >> 7);
+					srcByte <<= 1;
+				}
+
+				// Write out the pixel
+				*pDest = pixel;
+			}
+		}
+	}
 }
 
 int Font::charWidth(char c) {
-	return *_chars[c - ' '];
+	return _chars[c - ' '].w;
 }
 
 int Font::stringWidth(const Common::String &msg) {
@@ -69,10 +105,11 @@ int Font::stringWidth(const Common::String &msg) {
 	for (const char *c = msg.c_str(); *c != '\0'; ++c)
 		total += charWidth(*c);
 
-	return 0;
+	return total;
 }
 
 bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &width) {
+	assert(maxWidth > 0);
 	width = 0;
 	const char *src = s.c_str();
 	char c;
@@ -92,7 +129,8 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 
 		// Reached maximum allowed. Work backwards to find space at the
 		// start of the current word as a point to split the line on
-		while (*src != ' ' && src >= s.c_str()) {
+		--src;
+		while (src >= s.c_str() && *src != ' ') {
 			width -= charWidth(*src);
 			--src;
 		}
@@ -111,10 +149,39 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 	return true;
 }
 
+void Font::drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt) {
+	Common::Point currPt = pt;
+	const char *msgP = msg.c_str();
+
+	while (*msgP) {
+		currPt.x += drawChar(s, *msgP, currPt);
+		++msgP;
+	}
+}
+
+int Font::drawChar(Graphics::Surface *s, char c, Common::Point &pt) {
+	Graphics::Surface &ch = _chars[c - ' '];
+
+	// Loop through the lines of the character
+	for (int y = 0; y < ch.h; ++y) {
+		byte *pSrc = (byte *)ch.getBasePtr(0, y);
+		byte *pDest = (byte *)s->getBasePtr(pt.x, pt.y + y);
+
+		// Loop through the horizontal pixels of the line
+		for (int x = 0; x < ch.w; ++x, ++pSrc, ++pDest) {
+			if (*pSrc != 0)
+				*pDest = _fontColors[*pSrc];
+		}
+	}
+
+	return ch.w;
+}
+
 /*------------------------------------------------------------------------*/
 
 FontManager::FontManager() {
 	_printMaxX = 0;
+	Common::fill(&Font::_fontColors[0], &Font::_fontColors[4], 0);
 }
 
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 910e2523d1..fd3c889ddb 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -87,12 +87,16 @@ public:
 
 class Font {
 private:
-	int _v1;
-	int _v2;
-	Common::Array<const byte *> _chars;
+	int _bitWidth;
+	int _height;
+	Common::Array<Graphics::Surface> _chars;
+public:
+	static byte _fontColors[4];
 public:
 	Font();
 
+	~Font();
+
 	/**
 	 * Load the given font data
 	 */
@@ -118,6 +122,15 @@ public:
 	 */
 	bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width);
 
+	/**
+	 * Draw a string on a given surface
+	 */
+	void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt);
+
+	/**
+	 * Draw a character on a given surface
+	 */
+	int drawChar(Graphics::Surface *s, char c, Common::Point &pt);
 };
 
 class FontManager {
-- 
cgit v1.2.3


From 483bca3d96b7012774d13875e78cfd8b649657f7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 20:17:38 -0400
Subject: ACCESS: Fixes for drawing bubble box backgrounds

---
 engines/access/bubble_box.cpp | 21 +++++++++++++--------
 engines/access/events.cpp     | 29 +++++++++++++++++++----------
 engines/access/events.h       |  4 ++--
 engines/access/scripts.cpp    |  2 +-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index f910028fc5..b896e5ef1a 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -94,7 +94,7 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	bool lastLine;
 	do {
 		lastLine = _vm->_fonts._font2.getLine(s, _maxChars * 6, line, width);
-		width = MAX(width, _vm->_fonts._printMaxX);
+		_vm->_fonts._printMaxX = MAX(width, _vm->_fonts._printMaxX);
 
 		_vm->_fonts._printOrg.y += 6;
 		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
@@ -150,10 +150,10 @@ void BubbleBox::printBubble(const Common::String &msg) {
 		int xp = _vm->_fonts._printOrg.x;
 		if (_type == TYPE_4)
 			xp = (_bounds.width() - width) / 2 + _bounds.left - 4;
-
+		
 		// Draw the text
 		font2.drawString(_vm->_screen, line, Common::Point(xp, _vm->_fonts._printOrg.y));
-
+		
 		// Move print position
 		_vm->_fonts._printOrg.y += 6;
 		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
@@ -221,7 +221,7 @@ void BubbleBox::doBox(int item, int box) {
 	screen.plotImage(icons, 21, Common::Point(xp, screen._orgY1));
 
 	// Draw images to form the bottom border
-	yp = screen._orgY2 - (_type == TYPE_4) ? 18 : 12;
+	yp = screen._orgY2 - (_type == TYPE_4 ? 18 : 12);
 	screen.plotImage(icons, (_type == TYPE_4) ? 72 : 22,
 		Common::Point(screen._orgX1, yp));
 	xp = screen._orgX1 + 12;
@@ -232,16 +232,21 @@ void BubbleBox::doBox(int item, int box) {
 			Common::Point(xp, yp));
 	}
 	
-	yp -= (_type == TYPE_4) ? 18 : 12;
-	screen.plotImage(icons, (_type == TYPE_4) ? 73 : 23,
-		Common::Point(screen._orgX1, yp));
+	yp = screen._orgY2 - (_type == TYPE_4 ? 18 : 12);
+	screen.plotImage(icons, (_type == TYPE_4) ? 73 : 23, Common::Point(xp, yp));
 
 	if (_type == TYPE_4) {
 		// Further stuff
-		warning("YSIZE not yet used %d", ySize);
 		error("TODO: Box type 4");
 	}
 
+	// Draw images to form the sides
+	yp = screen._orgY1 + 12;
+	for (int y = 0; y < ySize; ++y) {
+		screen.plotImage(icons, 44 + y, Common::Point(screen._orgX1, yp));
+		screen.plotImage(icons, 53 + y, Common::Point(screen._orgX2 - 4, yp));
+	}
+
 	// Handle drawing title
 	int titleWidth = _vm->_fonts._font2.stringWidth(_bubblePtr);
 	Font &font2 = _vm->_fonts._font2;
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 521e8895c8..71ed5f433e 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -112,9 +112,10 @@ bool EventsManager::isCursorVisible() {
 	return CursorMan.isVisible();
 }
 
-void EventsManager::pollEvents(bool suppressFrames) {
-	if (!suppressFrames)
-		checkForNextFrameCounter();
+void EventsManager::pollEvents() {
+	if (checkForNextFrameCounter()) {
+		nextFrame();
+	}
 
 	Common::Event event;
 	while (g_system->getEventManager()->pollEvent(event)) {
@@ -158,24 +159,26 @@ void EventsManager::pollEvents(bool suppressFrames) {
 	}
 }
 
-void EventsManager::checkForNextFrameCounter() {
+bool EventsManager::checkForNextFrameCounter() {
 	// Check for next game frame
 	uint32 milli = g_system->getMillis();
 	if ((milli - _priorFrameTime) >= GAME_FRAME_TIME) {
 		++_frameCounter;
 		_priorFrameTime = milli;
 
-		nextFrame();
+		return true;
 	}
+
+	return false;
 }
 
 void EventsManager::nextFrame() {
-	// Give time to the debugger
-	_vm->_debugger->onFrame();
-
 	// Update timers
 	_vm->_animation->updateTimers();
 
+	// Give time to the debugger
+	_vm->_debugger->onFrame();
+
 	// TODO: Refactor for dirty rects
 	_vm->_screen->updateScreen();
 }
@@ -199,13 +202,19 @@ bool EventsManager::getKey(Common::KeyState &key) {
 
 void EventsManager::debounceLeft() {
 	while (_leftButton && !_vm->shouldQuit()) {
-		pollEvents(true);
+		pollEvents();
 		g_system->delayMillis(10);
 	}
 }
 
 void EventsManager::waitKeyMouse() {
-	error("TODO: waitKeyPress");
+	while (!_vm->shouldQuit() && !_leftButton && _keypresses.size() == 0) {
+		pollEvents();
+		g_system->delayMillis(10);
+	}
+
+	zeroKeys();
+	debounceLeft();
 }
 
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index dc89829312..c6702ec7af 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -46,7 +46,7 @@ private:
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
 
-	void checkForNextFrameCounter();
+	bool checkForNextFrameCounter();
 
 	void nextFrame();
 public:
@@ -95,7 +95,7 @@ public:
 	 */
 	bool isCursorVisible();
 
-	void pollEvents(bool suppressFrames = false);
+	void pollEvents();
 
 	void zeroKeys();
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 0d232cc779..2e4e2adca6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -193,7 +193,7 @@ void Scripts::cmdPrint() {
 	_vm->_events->waitKeyMouse();
 
 	// Wait until the bubble display is expired
-	while (_vm->_timers[PRINT_TIMER]._flag) {
+	while (!_vm->shouldQuit() && _vm->_timers[PRINT_TIMER]._flag) {
 		_vm->_events->pollEvents();
 	}
 
-- 
cgit v1.2.3


From be4639802c469c8b85e1f801a7cac1897a18863b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 20:32:25 -0400
Subject: ACCESS: Fix positioning of bubble boxes

---
 engines/access/bubble_box.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index b896e5ef1a..4bd4b74588 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -85,7 +85,7 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	}
 
 	// Start of with a rect with the given starting x and y
-	Common::Rect bounds(printOrg.x - 2, printOrg.y, printOrg.x - 2, printOrg.y);
+	Common::Rect bounds(printOrg.x - 2, printOrg.y - 10, printOrg.x - 2, printOrg.y - 10);
 
 	// Loop through getting lines
 	Common::String s = msg;
-- 
cgit v1.2.3


From c576b201f6638fa3702593cdb45cff64057d35ef Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 21:08:58 -0400
Subject: ACCESS: Fix decoding of font data

---
 engines/access/amazon/amazon_game.cpp |  2 +-
 engines/access/data.cpp               | 12 ++++++------
 engines/access/data.h                 |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 072675c55e..663d6996d2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -173,8 +173,8 @@ void AmazonEngine::setupGame() {
 	}
 
 	// Miscellaenous
-	_fonts._font6x6.load(FONT6x6_INDEX, FONT6x6_DATA);
 	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
+	_fonts._font6x6.load(FONT6x6_INDEX, FONT6x6_DATA);
 
 	// Set player room and position
 	_player->_roomNumber = 4;
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 1fba854f19..36797b62ea 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -56,16 +56,16 @@ Font::~Font() {
 		_chars[i].free();
 }
 
-void Font::load(const int *index, const byte *data) {
+void Font::load(const int *fontIndex, const byte *fontData) {
 	assert(_chars.size() == 0);
-	int count = index[0];
-	_bitWidth = index[1];
-	_height = index[2];
+	int count = fontIndex[0];
+	_bitWidth = fontIndex[1];
+	_height = fontIndex[2];
 
 	_chars.resize(count);
 
 	for (int i = 0; i < count; ++i) {
-		const byte *pData = data + index[i + 3];
+		const byte *pData = fontData + fontIndex[i + 3];
 		_chars[i].create(*pData++, _height, Graphics::PixelFormat::createFormatCLUT8());
 
 		for (int y = 0; y < _height; ++y) {
@@ -77,7 +77,7 @@ void Font::load(const int *index, const byte *data) {
 			for (int x = 0; x < _chars[i].w; ++x, ++pDest) {
 				// Get the pixel
 				pixel = 0;
-				for (int pixelCtr = 0; pixelCtr < _bitWidth; ++pixelCtr) {
+				for (int pixelCtr = 0; pixelCtr < _bitWidth; ++pixelCtr, --bitsLeft) {
 					// No bits in current byte left, so get next byte
 					if (bitsLeft == 0) {
 						bitsLeft = 8;
diff --git a/engines/access/data.h b/engines/access/data.h
index fd3c889ddb..7ddc5d610e 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -100,7 +100,7 @@ public:
 	/**
 	 * Load the given font data
 	 */
-	void load(const int *index, const byte *data);
+	void load(const int *fontIndex, const byte *fontData);
 
 	/**
 	 * Get the width of a given character
-- 
cgit v1.2.3


From a8a7018926f68d4792f3114ea8496ae721c2490c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 21:53:46 -0400
Subject: ACCESS: Fix showing bubble box text correctly

---
 engines/access/bubble_box.cpp |  6 +++---
 engines/access/data.cpp       | 14 ++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 4bd4b74588..5a17b3b1a3 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -143,9 +143,9 @@ void BubbleBox::printBubble(const Common::String &msg) {
 
 		// Set font colors
 		font2._fontColors[0] = 0;
-		font2._fontColors[1] = 0;
-		font2._fontColors[2] = 0;
-		font2._fontColors[3] = 0;
+		font2._fontColors[1] = 27;
+		font2._fontColors[2] = 28;
+		font2._fontColors[3] = 29;
 
 		int xp = _vm->_fonts._printOrg.x;
 		if (_type == TYPE_4)
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 36797b62ea..90f712af3b 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -22,6 +22,8 @@
 
 #include "common/algorithm.h"
 #include "access/data.h"
+#include "graphics/palette.h"
+#include "common/system.h"
 
 namespace Access {
 
@@ -127,9 +129,13 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 		if (width < maxWidth)
 			continue;
 
-		// Reached maximum allowed. Work backwards to find space at the
-		// start of the current word as a point to split the line on
-		--src;
+		// Reached maximum allowed size
+		// If this was the last character of the string, let it go
+		if (*src == '\0')
+			break;
+		
+		// Work backwards to find space at the start of the current word 
+		// as a point to split the line on
 		while (src >= s.c_str() && *src != ' ') {
 			width -= charWidth(*src);
 			--src;
@@ -138,7 +144,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 			error("Could not fit line");
 
 		// Split the line around the space
-		line = Common::String(s.c_str(), src - 1);
+		line = Common::String(s.c_str(), src);
 		s = Common::String(src + 1);
 		return false;
 	}
-- 
cgit v1.2.3


From 38acce33fd95171a5d3a7a00cad57bb4a5711bad Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 22:09:03 -0400
Subject: ACCESS: Add updateTimers so bubble boxes can be removed

---
 engines/access/bubble_box.cpp |  4 ++--
 engines/access/data.cpp       | 12 ++++++++++++
 engines/access/data.h         |  5 +++++
 engines/access/events.cpp     |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 5a17b3b1a3..6ea7ed8a0b 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -198,9 +198,9 @@ void BubbleBox::doBox(int item, int box) {
 	delete[] iconData;
 
 	// Set the up boundaries and color to use for the box background
-	_vm->_screen->_orgX1 = _bounds.left;
+	_vm->_screen->_orgX1 = _bounds.left - 2;
 	_vm->_screen->_orgY1 = _bounds.top;
-	_vm->_screen->_orgX2 = _bounds.right;
+	_vm->_screen->_orgX2 = _bounds.right - 2;
 	_vm->_screen->_orgY2 = _bounds.bottom;
 	_vm->_screen->_lColor = 1;
 
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 90f712af3b..124bfbca5a 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -46,6 +46,18 @@ void TimerList::restoreTimers() {
 	}
 }
 
+void TimerList::updateTimers() {
+	for (uint i = 0; i < size(); ++i) {
+		TimerEntry &te = (*this)[i];
+		if (te._flag) {
+			if (!--te._timer) {
+				te._timer = te._initTm;
+				te._flag = false;
+			}
+		}
+	}
+}
+
 /*------------------------------------------------------------------------*/
 
 byte Font::_fontColors[4];
diff --git a/engines/access/data.h b/engines/access/data.h
index 7ddc5d610e..8ba3c58c82 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -68,6 +68,11 @@ public:
 	 * Resetore the set of previously saved timers
 	 */
 	void restoreTimers();
+
+	/**
+	 * Update the timer list
+	 */
+	void updateTimers();
 };
 
 class ExtraCell {
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 71ed5f433e..25a77f82de 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -175,6 +175,7 @@ bool EventsManager::checkForNextFrameCounter() {
 void EventsManager::nextFrame() {
 	// Update timers
 	_vm->_animation->updateTimers();
+	_vm->_timers.updateTimers();
 
 	// Give time to the debugger
 	_vm->_debugger->onFrame();
-- 
cgit v1.2.3


From 9e98a1edcc7610e9ccdb00026a7d9eb349b0c2ee Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 22:13:45 -0400
Subject: ACCESS: Correct drawing the vertical edges of bubble boxes

---
 engines/access/bubble_box.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 6ea7ed8a0b..21e104028c 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -204,7 +204,7 @@ void BubbleBox::doBox(int item, int box) {
 	_vm->_screen->_orgY2 = _bounds.bottom;
 	_vm->_screen->_lColor = 1;
 
-	int h = _bounds.height() - (_type == TYPE_4) ? 30 : 24;
+	int h = _bounds.height() - (_type == TYPE_4 ? 30 : 24);
 	int ySize = (h < 0) ? 0 : (h + 12) / 13;
 	int w = _bounds.width() - 24;
 	int xSize = (w < 0) ? 0 : (w + 19) / 20;
@@ -242,7 +242,7 @@ void BubbleBox::doBox(int item, int box) {
 
 	// Draw images to form the sides
 	yp = screen._orgY1 + 12;
-	for (int y = 0; y < ySize; ++y) {
+	for (int y = 0; y < ySize; ++y, yp += 13) {
 		screen.plotImage(icons, 44 + y, Common::Point(screen._orgX1, yp));
 		screen.plotImage(icons, 53 + y, Common::Point(screen._orgX2 - 4, yp));
 	}
-- 
cgit v1.2.3


From 7fef53b68ccddcb8ed93c567456c73fe503ee006 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 22:32:26 -0400
Subject: ACCESS: Implemented cmdEndObject

---
 engines/access/resources.cpp | 13 +++++++++++++
 engines/access/resources.h   |  2 ++
 engines/access/scripts.cpp   | 25 ++++++++++++++++---------
 engines/access/scripts.h     |  4 +++-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 40daf2b121..f0d74ccd2a 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -76,4 +76,17 @@ const int RMOUSE[10][2] = {
 	{ 142, 177 }, { 178, 212 }, { 213, 248 }, { 249, 283 }, { 284, 318 }
 };
 
+const char *LOOK_MESSAGE = "LOOKING THERE REVEALS NOTHING OF INTEREST.";
+const char *GET_MESSAGE = "YOU CAN'T TAKE THAT.";
+const char *OPEN_MESSAGE = "THAT DOESN'T OPEN.";
+const char *MOVE_MESSAGE = "THAT WON'T MOVE.";
+const char *USE_MESSAGE = "THAT DOESN'T SEEM TO WORK.";
+const char *GO_MESSAGE = "YOU CAN'T CLIMB THAT.";
+const char *HELP_MESSAGE = "THIS OBJECT REQUIRES NO HINTS";
+const char *TALK_MESSAGE      = "THERE SEEMS TO BE NO RESPONSE.";
+const char *const GENERAL_MESSAGES[] = {
+	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE, 
+	GO_MESSAGE, TALK_MESSAGE, HELP_MESSAGE, HELP_MESSAGE, USE_MESSAGE
+};
+
 } // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 678cbc0614..241ed3a636 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -56,6 +56,8 @@ extern const int OVEROFFDLY[];
 
 extern const int RMOUSE[10][2];
 
+extern const char *const GENERAL_MESSAGES[];
+
 } // End of namespace Access
 
 #endif /* ACCESS_RESOURCES_H */
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2e4e2adca6..fba947a174 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 #include "access/access.h"
+#include "access/resources.h"
 #include "access/scripts.h"
 
 #define SCRIPT_START_BYTE 0xE0
@@ -90,7 +91,7 @@ int Scripts::executeScript() {
 
 void Scripts::executeCommand(int commandIndex) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
-		&Scripts::CMDOBJECT, &Scripts::CMDENDOBJECT, &Scripts::cmdJumpLook, 
+		&Scripts::CMDOBJECT, &Scripts::cmdEndObject, &Scripts::cmdJumpLook, 
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
@@ -126,7 +127,9 @@ void Scripts::CMDOBJECT() {
 	_vm->_bubbleBox->load(_data);
 }
 
-void Scripts::CMDENDOBJECT() { error("TODO ENDOBJECT"); }
+void Scripts::cmdEndObject() { 
+	printString(GENERAL_MESSAGES[_vm->_room->_selectCommand]);
+}
 
 void Scripts::cmdJumpLook() {
 	if (_vm->_room->_selectCommand == 0)
@@ -175,18 +178,22 @@ void Scripts::cmdNull() {
 
 #define PRINT_TIMER 25
 
-void Scripts::cmdPrint() { 
-	_vm->_fonts._printOrg = Common::Point(20, 42);
-	_vm->_fonts._printStart = Common::Point(20, 42);
-	_vm->_timers[PRINT_TIMER]._timer = 50;
-	_vm->_timers[PRINT_TIMER]._initTm = 50;
-	_vm->_timers[PRINT_TIMER]._flag = true;
-
+void Scripts::cmdPrint() {
 	// Get a text line for display
 	Common::String msg;
 	byte c;
 	while ((c = (char)_data->readByte()) != '\0')
 		msg += c;
+	
+	printString(msg);
+}
+
+void Scripts::printString(const Common::String &msg) {
+	_vm->_fonts._printOrg = Common::Point(20, 42);
+	_vm->_fonts._printStart = Common::Point(20, 42);
+	_vm->_timers[PRINT_TIMER]._timer = 50;
+	_vm->_timers[PRINT_TIMER]._initTm = 50;
+	_vm->_timers[PRINT_TIMER]._flag = true;
 
 	// Display the text in a bubble, and wait for a keypress or mouse click
 	_vm->_bubbleBox->placeBubble(msg);
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 70d79c4b65..ac2bae005c 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -38,13 +38,15 @@ private:
 	const byte *_rawData;
 	Common::MemoryReadStream *_data;
 	int _specialFunction;
+
+	void printString(const Common::String &msg);
 protected:
 	AccessEngine *_vm;
 
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
 	void CMDOBJECT();
-	void CMDENDOBJECT();
+	void cmdEndObject();
 	void cmdJumpLook();
 	void cmdJumpHelp();
 	void cmdJumpGet();
-- 
cgit v1.2.3


From 9150e1816c57e3852fd86123ba8e0d1c9dee8ff4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 22:44:31 -0400
Subject: ACCESS: Shifted some Amazon specific opcodes to the AmazonScripts
 class

---
 engines/access/amazon/amazon_scripts.cpp | 57 ++++++++++++++++++++++++++++++++
 engines/access/amazon/amazon_scripts.h   |  9 +++++
 engines/access/scripts.cpp               | 41 +++--------------------
 engines/access/scripts.h                 | 15 ++-------
 4 files changed, 73 insertions(+), 49 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 2fdbcc94a2..38cf9d6a84 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -71,6 +71,63 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	}
 }
 
+typedef void(AmazonScripts::*AmazonScriptMethodPtr)();
+
+void AmazonScripts::executeCommand(int commandIndex) {
+	static const AmazonScriptMethodPtr COMMAND_LIST[] = {
+		&AmazonScripts::CMDHELP, &AmazonScripts::CMDCYCLEBACK,
+		&AmazonScripts::CMDCHAPTER, &AmazonScripts::cmdSetHelp,
+		&AmazonScripts::cmdCenterPanel, &AmazonScripts::cmdMainPanel,
+		&AmazonScripts::CMDRETFLASH
+	};
+
+	if (commandIndex >= 73)
+		(this->*COMMAND_LIST[commandIndex - 73])();
+	else
+		Scripts::executeCommand(commandIndex);
+}
+
+void AmazonScripts::CMDHELP() { 
+	error("TODO CMDHELP"); 
+}
+
+void AmazonScripts::CMDCYCLEBACK() { 
+	error("TODO CMDCYCLEBACK"); 
+}
+void AmazonScripts::CMDCHAPTER() { 
+	error("TODO CMDCHAPTER"); 
+}
+
+void AmazonScripts::cmdSetHelp() {
+	int arrayId = (_data->readUint16LE() && 0xFF) - 1;
+	int helpId = _data->readUint16LE() && 0xFF;
+
+	byte *help = _vm->_helpTbl[arrayId];
+	help[helpId] = 1;
+
+	if (_vm->_useItem == 0) {
+		_sequence = 11000;
+		searchForSequence();
+	}
+}
+
+void AmazonScripts::cmdCenterPanel() {
+	if (_vm->_screen->_vesaMode) {
+		_vm->_screen->clearScreen();
+		_vm->_screen->setPanel(3);
+	}
+}
+
+void AmazonScripts::cmdMainPanel() {
+	if (_vm->_screen->_vesaMode) {
+		_vm->_room->init4Quads();
+		_vm->_screen->setPanel(0);
+	}
+}
+
+void AmazonScripts::CMDRETFLASH() { 
+	error("TODO CMDRETFLASH"); 
+}
 
 } // End of namespace Amazon
 
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index b8fdaaa7f3..c9a889e3ad 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -33,6 +33,15 @@ namespace Amazon {
 class AmazonScripts: public Scripts {
 protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
+	virtual void executeCommand(int commandIndex);
+
+	void CMDHELP();
+	void CMDCYCLEBACK();
+	void CMDCHAPTER();
+	void cmdSetHelp();
+	void cmdCenterPanel();
+	void cmdMainPanel();
+	void CMDRETFLASH();
 public:
 	AmazonScripts(AccessEngine *vm);
 };
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index fba947a174..3c60065bfe 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -29,7 +29,7 @@
 
 namespace Access {
 
-Scripts::Scripts(AccessEngine *vm) : _vm(vm) {
+Scripts::Scripts(AccessEngine *vm) : Manager(vm) {
 	_rawData = nullptr;
 	_data = nullptr;
 	_sequence = 0;
@@ -89,6 +89,8 @@ int Scripts::executeScript() {
 	return _returnCode;
 }
 
+typedef void(Scripts::*ScriptMethodPtr)();
+
 void Scripts::executeCommand(int commandIndex) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
 		&Scripts::CMDOBJECT, &Scripts::cmdEndObject, &Scripts::cmdJumpLook, 
@@ -115,9 +117,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
-		&Scripts::CMDENDVID, &Scripts::CMDHELP, &Scripts::CMDCYCLEBACK, 
-		&Scripts::CMDCHAPTER, &Scripts::cmdSetHelp, &Scripts::cmdCenterPanel,
-		&Scripts::cmdMainPanel, &Scripts::CMDRETFLASH
+		&Scripts::CMDENDVID
 	};
 
 	(this->*COMMAND_LIST[commandIndex])();
@@ -503,38 +503,5 @@ void Scripts::cmdFadeOut() {
 }
 
 void Scripts::CMDENDVID() { error("TODO CMDENDVID"); }
-void Scripts::CMDHELP() { error("TODO CMDHELP"); }
-void Scripts::CMDCYCLEBACK() { error("TODO CMDCYCLEBACK"); }
-void Scripts::CMDCHAPTER() { error("TODO CMDCHAPTER"); }
-
-void Scripts::cmdSetHelp() {
-	int arrayId = (_data->readUint16LE() && 0xFF) - 1;
-	int helpId = _data->readUint16LE() && 0xFF;
-
-	byte *help = _vm->_helpTbl[arrayId];
-	help[helpId] = 1;
-
-	if (_vm->_useItem == 0) {
-		_sequence = 11000;
-		searchForSequence();
-	}
-}
-
-void Scripts::cmdCenterPanel() {
-	if (_vm->_screen->_vesaMode) {
-		_vm->_screen->clearScreen();
-		_vm->_screen->setPanel(3);
-	}
-}
-
-void Scripts::cmdMainPanel() { 
-	if (_vm->_screen->_vesaMode) {
-		_vm->_room->init4Quads();
-		_vm->_screen->setPanel(0);
-	}
-}
-
-void Scripts::CMDRETFLASH() { error("TODO CMDRETFLASH"); }
-
 
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index ac2bae005c..1f0bf84443 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -25,23 +25,21 @@
 
 #include "common/scummsys.h"
 #include "common/memstream.h"
+#include "access/data.h"
 
 namespace Access {
 
 class AccessEngine;
 class Scripts;
 
-typedef void(Scripts::*ScriptMethodPtr)();
-
-class Scripts {
+class Scripts: public Manager {
 private:
 	const byte *_rawData;
-	Common::MemoryReadStream *_data;
 	int _specialFunction;
 
 	void printString(const Common::String &msg);
 protected:
-	AccessEngine *_vm;
+	Common::MemoryReadStream *_data;
 
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
@@ -112,13 +110,6 @@ protected:
 	void CMDDEAD();
 	void cmdFadeOut();
 	void CMDENDVID();
-	void CMDHELP();
-	void CMDCYCLEBACK();
-	void CMDCHAPTER();
-	void cmdSetHelp();
-	void cmdCenterPanel();
-	void cmdMainPanel();
-	void CMDRETFLASH();
 public:
 	int _sequence;
 	bool _endFlag;
-- 
cgit v1.2.3


From d31b27ba1b26a38401387f85ca2ce46be455d0a2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 23:04:05 -0400
Subject: ACCESS: Partially implement cmdHelp

---
 engines/access/amazon/amazon_game.cpp      |  6 ++++++
 engines/access/amazon/amazon_game.h        |  5 +++++
 engines/access/amazon/amazon_resources.cpp |  7 +++++++
 engines/access/amazon/amazon_resources.h   |  3 +++
 engines/access/amazon/amazon_scripts.cpp   | 29 ++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h     |  6 +++++-
 engines/access/scripts.cpp                 | 15 ++++++++++-----
 engines/access/scripts.h                   | 12 +++++++++++-
 8 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 663d6996d2..857d1b3551 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -51,7 +51,9 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_rawInactiveX = 0;
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
+
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
+	_hintLevel = 0;
 }
 
 AmazonEngine::~AmazonEngine() {
@@ -182,6 +184,10 @@ void AmazonEngine::setupGame() {
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
 }
 
+void AmazonEngine::drawHelp() {
+	error("TODO: drawHelp");
+}
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 848af85f30..c331830501 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -93,10 +93,15 @@ public:
 	int &_aniFlag;
 	int &_allenFlag;
 	int &_noSound;
+
+	// Other game specific fields
+	int _hintLevel;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
 	virtual ~AmazonEngine();
+
+	void drawHelp();
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index b7a2472a3c..1f666e1abb 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1187,6 +1187,13 @@ const byte FONT6x6_DATA[] = {
 	0x54, 0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x56, 0x49,
 };
 
+const char *const NO_HELP_MESSAGE = 
+	"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \
+HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \
+YOU CAN UNDERSTAND.";
+const char *const NO_HINTS_MESSAGE =
+	"THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME.";
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 838bd29b70..d618ca54c2 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -49,6 +49,9 @@ extern const int FONT6x6_INDEX[];
 
 extern const byte FONT6x6_DATA[];
 
+extern const char *const NO_HELP_MESSAGE;
+extern const char *const NO_HINTS_MESSAGE;
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 38cf9d6a84..104473ac7d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -22,6 +22,8 @@
 
 #include "common/scummsys.h"
 #include "access/access.h"
+#include "access/amazon/amazon_game.h"
+#include "access/amazon/amazon_resources.h"
 #include "access/amazon/amazon_scripts.h"
 
 namespace Access {
@@ -29,6 +31,7 @@ namespace Access {
 namespace Amazon {
 
 AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
+	_game = (AmazonEngine *)_vm;
 }
 
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
@@ -75,7 +78,7 @@ typedef void(AmazonScripts::*AmazonScriptMethodPtr)();
 
 void AmazonScripts::executeCommand(int commandIndex) {
 	static const AmazonScriptMethodPtr COMMAND_LIST[] = {
-		&AmazonScripts::CMDHELP, &AmazonScripts::CMDCYCLEBACK,
+		&AmazonScripts::cmdHelp, &AmazonScripts::CMDCYCLEBACK,
 		&AmazonScripts::CMDCHAPTER, &AmazonScripts::cmdSetHelp,
 		&AmazonScripts::cmdCenterPanel, &AmazonScripts::cmdMainPanel,
 		&AmazonScripts::CMDRETFLASH
@@ -87,8 +90,28 @@ void AmazonScripts::executeCommand(int commandIndex) {
 		Scripts::executeCommand(commandIndex);
 }
 
-void AmazonScripts::CMDHELP() { 
-	error("TODO CMDHELP"); 
+void AmazonScripts::cmdHelp() {
+	Common::String helpMessage = readString();
+
+	if (_game->_helpLevel == 0) {
+		_game->_timers.saveTimers();
+		_game->_useItem = 0;
+
+		if (_game->_noHints) {
+			printString(NO_HELP_MESSAGE);
+			return;
+		} else if (_game->_hintLevel == 0) {
+			printString(NO_HINTS_MESSAGE);
+			return;
+		}
+	}
+
+	int level = _game->_hintLevel - 1;
+	if (level < _game->_helpLevel)
+		_game->_moreHelp = 0;
+
+	_game->drawHelp();
+	error("TODO: more cmdHelp");
 }
 
 void AmazonScripts::CMDCYCLEBACK() { 
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index c9a889e3ad..978ef0105c 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -30,12 +30,16 @@ namespace Access {
 
 namespace Amazon {
 
+class AmazonEngine;
+
 class AmazonScripts: public Scripts {
+private:
+	AmazonEngine *_game;
 protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
 	virtual void executeCommand(int commandIndex);
 
-	void CMDHELP();
+	void cmdHelp();
 	void CMDCYCLEBACK();
 	void CMDCHAPTER();
 	void cmdSetHelp();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 3c60065bfe..958696e09d 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -180,11 +180,7 @@ void Scripts::cmdNull() {
 
 void Scripts::cmdPrint() {
 	// Get a text line for display
-	Common::String msg;
-	byte c;
-	while ((c = (char)_data->readByte()) != '\0')
-		msg += c;
-	
+	Common::String msg = readString();
 	printString(msg);
 }
 
@@ -208,6 +204,15 @@ void Scripts::printString(const Common::String &msg) {
 	_vm->_screen->restoreBlock();
 }
 
+Common::String Scripts::readString() {
+	Common::String msg;
+	byte c;
+	while ((c = (char)_data->readByte()) != '\0')
+		msg += c;
+
+	return msg;
+}
+
 void Scripts::cmdRetPos() {
 	_endFlag = true;
 	_returnCode = 0;
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 1f0bf84443..5f849410dc 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -37,12 +37,22 @@ private:
 	const byte *_rawData;
 	int _specialFunction;
 
-	void printString(const Common::String &msg);
 protected:
 	Common::MemoryReadStream *_data;
 
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
+
+	/**
+	 * Print a given message to the screen in a bubble box
+	 */
+	void printString(const Common::String &msg);
+
+	/**
+	 * Read a null terminated string from the script
+	 */
+	Common::String readString();
+
 	void CMDOBJECT();
 	void cmdEndObject();
 	void cmdJumpLook();
-- 
cgit v1.2.3


From 5ec8c445bd21e9b7fd592bf1cc8785a0d44bde23 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 23:08:14 -0400
Subject: ACCESS: Fix player flickering

---
 engines/access/player.cpp | 113 +++++++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 79ce2190f3..dfbee48134 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -562,71 +562,70 @@ void Player::walkDownRight() {
 }
 
 void Player::checkMove() {
-	if (!_vm->_events->_mouseMove)
-		return;
-
-	if (_xFlag == 0 && _yFlag == 0) {
-		int xp = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
-		if (xp < 0)
-			xp = -xp;
-		int yp = _rawPlayer.y - _moveTo.y;
-		if (yp < 0)
-			yp = -yp;
-
-		if (xp < yp)
-			_xFlag = 1;
-		else
-			_yFlag = 1;
-	}
+	if (_vm->_events->_mouseMove) {
+		if (_xFlag == 0 && _yFlag == 0) {
+			int xp = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
+			if (xp < 0)
+				xp = -xp;
+			int yp = _rawPlayer.y - _moveTo.y;
+			if (yp < 0)
+				yp = -yp;
+
+			if (xp < yp)
+				_xFlag = 1;
+			else
+				_yFlag = 1;
+		}
 
-	if (_yFlag == 1) {
-		int yd = _rawPlayer.y - _moveTo.y;
-		if ((yd >= 0 && yd <= _upDelta) || (yd < 0 && -yd <= _upDelta)) {
-			++_yFlag;
-			if (_xFlag) {
-				_vm->_events->_mouseMove = false;
-				_xFlag = _yFlag = 0;
+		if (_yFlag == 1) {
+			int yd = _rawPlayer.y - _moveTo.y;
+			if ((yd >= 0 && yd <= _upDelta) || (yd < 0 && -yd <= _upDelta)) {
+				++_yFlag;
+				if (_xFlag) {
+					_vm->_events->_mouseMove = false;
+					_xFlag = _yFlag = 0;
+				} else {
+					++_xFlag;
+				}
 			} else {
-				++_xFlag;
+				if (yd >= 0)
+					walkUp();
+				else
+					walkDown();
+
+				if (_collideFlag) {
+					_vm->_events->_mouseMove = false;
+					_xFlag = _yFlag = 0;
+				}
 			}
-		} else {
-			if (yd >= 0)
-				walkUp();
-			else
-				walkDown();
+		} else if (_xFlag == 1) {
+			int xd = _rawPlayer.x - _moveTo.x;
+			if ((xd >= 0 && xd <= -_leftDelta) || (xd < 0 && -xd <= -_leftDelta)) {
+				++_xFlag;
 
-			if (_collideFlag) {
-				_vm->_events->_mouseMove = false;
-				_xFlag = _yFlag = 0;
-			}
-		}
-	} else if (_xFlag == 1) {
-		int xd = _rawPlayer.x - _moveTo.x;
-		if ((xd >= 0 && xd <= -_leftDelta) || (xd < 0 && -xd <= -_leftDelta)) {
-			++_xFlag;
-
-			if (_yFlag) {
-				_vm->_events->_mouseMove = false;
-				_xFlag = _yFlag = 0;
+				if (_yFlag) {
+					_vm->_events->_mouseMove = false;
+					_xFlag = _yFlag = 0;
+				}
+			} else {
+				if (xd >= 0)
+					walkLeft();
+				else
+					walkRight();
+
+				if (_collideFlag) {
+					_vm->_events->_mouseMove = false;
+					_xFlag = _yFlag = 0;
+				}
 			}
+		} else if (!_yFlag) {
+			++_yFlag;
 		} else {
-			if (xd >= 0)
-				walkLeft();
-			else
-				walkRight();
-
-			if (_collideFlag) {
-				_vm->_events->_mouseMove = false;
-				_xFlag = _yFlag = 0;
-			}
+			_vm->_events->_mouseMove = false;
+			_xFlag = _yFlag = 0;
 		}
-	} else if (!_yFlag) {
-		++_yFlag;
-	} else {
-		_vm->_events->_mouseMove = false;
-		_xFlag = _yFlag = 0;
 	}
-	
+
 	plotCom3();
 }
 
-- 
cgit v1.2.3


From d570da065ec422132b4dd409b9b4ecf9cea92fc8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Aug 2014 23:15:32 -0400
Subject: ACCESS: Fix selecting location for player to walk to

---
 engines/access/amazon/amazon_room.cpp |  9 ++++++---
 engines/access/events.cpp             |  1 -
 engines/access/events.h               |  1 -
 engines/access/player.cpp             | 29 +++++++++++++++--------------
 engines/access/player.h               |  3 ++-
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index bf3c2501bb..79c70c0b33 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -148,14 +148,17 @@ void AmazonRoom::mainAreaClick() {
 			switch (checkBoxes1(_vm->_events->_mousePos)) {
 			case 0:
 				_game->_jasMayaFlag = 0;
-				break;
+				return;
 			case 1:
 				_game->_jasMayaFlag = 1;
-				break;
+				return;
 			default:
 				break;
 			}
-		}
+		} 
+
+		_vm->_player->_moveTo = _vm->_events->_mousePos;
+		_vm->_player->_playerMove = true;
 	} else if (_vm->_events->_mousePos.x >= _vm->_screen->_windowXAdd &&
 			_vm->_events->_mousePos.x <= _vm->_screen->_vWindowBytesWide &&
 			_vm->_events->_mousePos.y >= _vm->_screen->_windowYAdd &&
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 25a77f82de..1afc5515b0 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -40,7 +40,6 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_frameCounter = 10;
 	_priorFrameTime = 0;
 	_leftButton = _rightButton = false;
-	_mouseMove = false;
 	_mouseCol = _mouseRow = 0;
 	_mouseMode = 0;
 	_cursorExitFlag = false;
diff --git a/engines/access/events.h b/engines/access/events.h
index c6702ec7af..4c052f96f0 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -55,7 +55,6 @@ public:
 	bool _leftButton, _rightButton;
 	Common::Point _mousePos;
 	int _mouseCol, _mouseRow;
-	bool _mouseMove;
 	int _mouseMode;
 	bool _cursorExitFlag;
 	Common::FixedStack<Common::KeyState> _keypresses;
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index dfbee48134..cde1a74de2 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -49,6 +49,7 @@ Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
 	_playerY = 0;
 	_frame = 0;
 	_playerOff = false;
+	_playerMove = false;
 	_leftDelta = _rightDelta = 0;
 	_upDelta = _downDelta = 0;
 	_scrollConst = 0;
@@ -193,35 +194,35 @@ void Player::walk() {
 	_vm->_timers[0]._flag = true;
 	switch (_move) {
 	case UP:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkUp();
 		break;
 	case DOWN:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkDown();
 		break;
 	case LEFT:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkLeft();
 		break;
 	case RIGHT:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkRight();
 		break;
 	case UPLEFT:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkUpLeft();
 		break;
 	case DOWNLEFT:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkDownLeft();
 		break;
 	case UPRIGHT:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkUpRight();
 		break;
 	case DOWNRIGHT:
-		_vm->_events->_mouseMove = false;
+		_playerMove = false;
 		walkDownRight();
 		break;
 	default:
@@ -562,7 +563,7 @@ void Player::walkDownRight() {
 }
 
 void Player::checkMove() {
-	if (_vm->_events->_mouseMove) {
+	if (_playerMove) {
 		if (_xFlag == 0 && _yFlag == 0) {
 			int xp = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
 			if (xp < 0)
@@ -582,7 +583,7 @@ void Player::checkMove() {
 			if ((yd >= 0 && yd <= _upDelta) || (yd < 0 && -yd <= _upDelta)) {
 				++_yFlag;
 				if (_xFlag) {
-					_vm->_events->_mouseMove = false;
+					_playerMove = false;
 					_xFlag = _yFlag = 0;
 				} else {
 					++_xFlag;
@@ -594,7 +595,7 @@ void Player::checkMove() {
 					walkDown();
 
 				if (_collideFlag) {
-					_vm->_events->_mouseMove = false;
+					_playerMove = false;
 					_xFlag = _yFlag = 0;
 				}
 			}
@@ -604,7 +605,7 @@ void Player::checkMove() {
 				++_xFlag;
 
 				if (_yFlag) {
-					_vm->_events->_mouseMove = false;
+					_playerMove = false;
 					_xFlag = _yFlag = 0;
 				}
 			} else {
@@ -614,14 +615,14 @@ void Player::checkMove() {
 					walkRight();
 
 				if (_collideFlag) {
-					_vm->_events->_mouseMove = false;
+					_playerMove = false;
 					_xFlag = _yFlag = 0;
 				}
 			}
 		} else if (!_yFlag) {
 			++_yFlag;
 		} else {
-			_vm->_events->_mouseMove = false;
+			_playerMove = false;
 			_xFlag = _yFlag = 0;
 		}
 	}
diff --git a/engines/access/player.h b/engines/access/player.h
index b904e46170..b11cc4a826 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -51,7 +51,6 @@ private:
 	bool _collideFlag;
 	Direction _move;
 	int _xFlag, _yFlag;
-	Common::Point _moveTo;
 	SpriteResource *_playerSprites1;
 	byte *_manPal1;
 	int _scrollEnd;
@@ -102,6 +101,8 @@ public:
 
 	// Additional public globals we've added to new Player class
 	bool _playerOff;
+	bool _playerMove;
+	Common::Point _moveTo;
 	bool _scrollFlag;
 	int _scrollThreshold;
 	int _scrollAmount;
-- 
cgit v1.2.3


From 17315a4dd71d4f9151724166bb5ddd7fdc0074f7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Aug 2014 00:29:01 -0400
Subject: ACCESS: Implemented wall checks for pathfinding

---
 engines/access/player.cpp |  20 +++----
 engines/access/player.h   |   3 +-
 engines/access/room.cpp   | 135 ++++++++++++++++++++++++++++++++++++++++++++++
 engines/access/room.h     |  12 ++++-
 4 files changed, 154 insertions(+), 16 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index cde1a74de2..0733e80c7d 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -249,7 +249,7 @@ void Player::walkUp() {
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff];
 	_rawXTemp = _rawPlayer.x;
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.y = _rawYTemp;
@@ -277,7 +277,7 @@ void Player::walkDown() {
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff];
 	_rawXTemp = _rawPlayer.x;
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.y = _rawYTemp;
@@ -316,7 +316,7 @@ void Player::walkLeft() {
 	}	
 	_rawYTemp = _rawPlayer.y;
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.x = _rawXTemp;
@@ -355,7 +355,7 @@ void Player::walkRight() {
 	}
 	_rawYTemp = _rawPlayer.y;
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.x = _rawXTemp;
@@ -398,7 +398,7 @@ void Player::walkUpLeft() {
 	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.x = _rawXTemp;
@@ -445,7 +445,7 @@ void Player::walkDownLeft() {
 	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.x = _rawXTemp;
@@ -492,7 +492,7 @@ void Player::walkUpRight() {
 	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.x = _rawXTemp;
@@ -540,7 +540,7 @@ void Player::walkDownRight() {
 	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
 
-	if (codeWalls()) {
+	if (_vm->_room->codeWalls()) {
 		plotCom2();
 	} else {
 		_rawPlayer.x = _rawXTemp;
@@ -658,10 +658,6 @@ void Player::plotCom3() {
 	plotCom2();
 }
 
-bool Player::codeWalls() {
-	error("TODO codeWalls");
-}
-
 void Player::checkScroll() {
 	_scrollFlag = false;
 	if (_playerDirection == NONE)
diff --git a/engines/access/player.h b/engines/access/player.h
index b11cc4a826..876c0e5ea4 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -48,7 +48,6 @@ private:
 	int _diagUpWalkMin, _diagUpWalkMax;
 	int _diagDownWalkMin, _diagDownWalkMax;
 	Common::Point _guard;
-	bool _collideFlag;
 	Direction _move;
 	int _xFlag, _yFlag;
 	SpriteResource *_playerSprites1;
@@ -56,7 +55,6 @@ private:
 	int _scrollEnd;
 	int _inactiveYOff;
 
-	bool codeWalls();
 	void checkMove();
 	void plotCom(int v1);
 	void plotCom1();
@@ -103,6 +101,7 @@ public:
 	bool _playerOff;
 	bool _playerMove;
 	Common::Point _moveTo;
+	bool _collideFlag;
 	bool _scrollFlag;
 	int _scrollThreshold;
 	int _scrollAmount;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 0405e7c4ac..9c2bd01650 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -584,6 +584,141 @@ int Room::validateBox(int boxId) {
 	return _vm->_scripts->executeScript();
 }
 
+void Room::swapOrg() {
+	SWAP<int>(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
+	SWAP<int>(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
+}
+
+int Room::calcLR(int yp) {
+	const Screen &screen = *_vm->_screen;
+
+	int yv = (yp - screen._orgY1) * (screen._orgX2 - screen._orgX1);
+	int yd = screen._orgY2 - screen._orgY1;
+
+	int rem = (yv % yd) << 1;
+	yv /= yd;
+	if (rem >= yd)
+		++yv;
+
+	return yv + screen._orgX1;
+}
+
+int Room::calcUD(int xp) {
+	const Screen &screen = *_vm->_screen;
+
+	int xv = (xp - screen._orgX1) * (screen._orgY2 - screen._orgY1);
+	int xd = screen._orgX2 - screen._orgX1;
+
+	int rem = (xv % xd) << 1;
+	xv /= xd;
+	if (rem >= xd)
+		++xv;
+
+	return xv + screen._orgY1;
+}
+
+bool Room::codeWalls() {
+	Screen &screen = *_vm->_screen;
+	Player &player = *_vm->_player;
+
+	if (_plotter._walls.size() == 0)
+		return false;
+
+	for (uint i = 0; i < _plotter._walls.size(); ++i) {
+		Common::Rect &r = _plotter._walls[i];
+		JetFrame &jf = _jetFrame[i];
+
+		jf._wallCode = 0;
+		jf._wallCode1 = 0;
+		screen._orgX1 = r.left;
+		screen._orgY1 = r.top;
+		screen._orgX2 = r.right;
+		screen._orgY2 = r.bottom;
+
+		if (screen._orgY2 != screen._orgY1) {
+			if (screen._orgY2 < screen._orgY1)
+				swapOrg();
+
+			if ((player._rawYTemp >= screen._orgY1) &&
+					(player._rawYTemp <= screen._orgY2)) {
+				jf._wallCode |= (calcLR(player._rawYTemp) - player._rawXTemp) < 0 ? 2 : 1;
+				jf._wallCode1 |= (calcLR(player._rawYTemp) - player._playerOffset.x) < 0 ? 2 : 1;
+			}
+		}
+
+		if (screen._orgX2 != screen._orgX1) {
+			if (screen._orgX2 < screen._orgX1)
+				swapOrg();
+
+			if ((player._rawXTemp >= screen._orgX1) &&
+					(player._rawXTemp <= screen._orgX2)) {
+				int y = screen._orgY2;
+				if (y == screen._orgY1)
+					y = calcUD(player._rawXTemp);
+
+				jf._wallCode |= (player._rawYTemp - y) < 0 ? 4 : 8;
+			}
+
+			int x = player._rawXTemp + player._playerOffset.x;
+			if ((x >= screen._orgX1) && (x <= screen._orgX2)) {
+				int y = screen._orgY2;
+				if (screen._orgY2 != screen._orgY1)
+					y = calcUD(player._rawXTemp + player._playerOffset.x);
+
+				jf._wallCode1 |= (player._rawYTemp - y) < 0 ? 4 : 8;
+			}
+		}
+	}
+
+	for (uint i = 0; i < _jetFrame.size(); ++i) {
+		JetFrame &jf = _jetFrame[i];
+		if (checkCode(jf._wallCode, jf._wallCodeOld) ||
+			checkCode(jf._wallCode1, jf._wallCode1Old))
+			return true;
+	}
+
+	// Copy the current wall calculations to the old properties
+	for (uint i = 0; i < _jetFrame.size(); ++i) {
+		JetFrame &jf = _jetFrame[i];
+		jf._wallCodeOld = jf._wallCode;
+		jf._wallCode1Old = jf._wallCode1;
+	}
+
+	return false;
+}
+
+bool Room::checkCode(int v1, int v2) {
+	Player &p = *_vm->_player;
+
+	if (!v1) {
+		p._collideFlag = true;
+		return true;
+	} if (!v2 || (v1 == v2)) {
+	} else if (v1 & 1) {
+		if (v2 & 2) {
+			p._collideFlag = true;
+			return true;
+		}
+	} else if (v1 & 2) {
+		if (v2 & 1) {
+			p._collideFlag = true;
+			return true;
+		}
+	} else if (v1 & 4) {
+		if (v2 & 8) {
+			p._collideFlag = true;
+			return true;
+		}
+	} else if (v1 & 8) {
+		if (v2 & 4) {
+			p._collideFlag = true;
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /*------------------------------------------------------------------------*/
 
 RoomInfo::RoomInfo(const byte *data) {
diff --git a/engines/access/room.h b/engines/access/room.h
index a90c6e400e..c76bd7021b 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -65,6 +65,12 @@ private:
 	void loadPlayField(int fileNum, int subfile);
 
 	void commandOff();
+
+	void swapOrg();
+	int calcLR(int yp);
+	int calcUD(int xp);
+
+	bool checkCode(int v1, int v2);
 protected:
 	void loadRoomData(const byte *roomData);
 	void setupRoom();
@@ -109,8 +115,6 @@ protected:
 
 	virtual void mainAreaClick() = 0;
 public:
-	void setWallCodes();
-
 	virtual void setIconPalette() {}
 public:
 	Plotter _plotter;
@@ -142,6 +146,10 @@ public:
 	void buildRow(int playY, int screenY);
 
 	void init4Quads();
+
+	void setWallCodes();
+
+	bool codeWalls();
 };
 
 class RoomInfo {
-- 
cgit v1.2.3


From 080a030116862ee21e0ebcec019fdc3f8e073650 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Aug 2014 07:32:17 -0400
Subject: ACCESS: Some initial pathfinding bugfixes

---
 engines/access/player.cpp | 6 ++++--
 engines/access/player.h   | 4 ++--
 engines/access/room.cpp   | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 0733e80c7d..44dd0d2182 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -565,6 +565,8 @@ void Player::walkDownRight() {
 void Player::checkMove() {
 	if (_playerMove) {
 		if (_xFlag == 0 && _yFlag == 0) {
+			// Figure out whether a greater horizontal movement than vertical
+			// movement will be required, or vice versa
 			int xp = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
 			if (xp < 0)
 				xp = -xp;
@@ -572,7 +574,7 @@ void Player::checkMove() {
 			if (yp < 0)
 				yp = -yp;
 
-			if (xp < yp)
+			if (xp > yp)
 				_xFlag = 1;
 			else
 				_yFlag = 1;
@@ -600,7 +602,7 @@ void Player::checkMove() {
 				}
 			}
 		} else if (_xFlag == 1) {
-			int xd = _rawPlayer.x - _moveTo.x;
+			int xd = _playerOffset.x / 2 +  _rawPlayer.x - _moveTo.x;
 			if ((xd >= 0 && xd <= -_leftDelta) || (xd < 0 && -xd <= -_leftDelta)) {
 				++_xFlag;
 
diff --git a/engines/access/player.h b/engines/access/player.h
index 876c0e5ea4..7ba0c05b21 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -86,9 +86,9 @@ public:
 	Common::Point _walkOffDR[PLAYER_DATA_COUNT];
 	Common::Point _walkOffUL[PLAYER_DATA_COUNT];
 	Common::Point _walkOffDL[PLAYER_DATA_COUNT];
-	int _rawTempL;
+	byte _rawTempL;
 	int _rawXTemp;
-	int _rawYTempL;
+	byte _rawYTempL;
 	int _rawYTemp;
 	Common::Point _playerOffset;
 	int _playerXLow;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 9c2bd01650..5e3a4d743d 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -653,7 +653,7 @@ bool Room::codeWalls() {
 			if ((player._rawXTemp >= screen._orgX1) &&
 					(player._rawXTemp <= screen._orgX2)) {
 				int y = screen._orgY2;
-				if (y == screen._orgY1)
+				if (y != screen._orgY1)
 					y = calcUD(player._rawXTemp);
 
 				jf._wallCode |= (player._rawYTemp - y) < 0 ? 4 : 8;
@@ -691,8 +691,6 @@ bool Room::checkCode(int v1, int v2) {
 	Player &p = *_vm->_player;
 
 	if (!v1) {
-		p._collideFlag = true;
-		return true;
 	} if (!v2 || (v1 == v2)) {
 	} else if (v1 & 1) {
 		if (v2 & 2) {
-- 
cgit v1.2.3


From 46d1c106ca560c285c556a0b02b54d76bc6a29ba Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 18 Aug 2014 13:45:20 +0200
Subject: AGOS: Give each MIDI track its own loop flag

This is needed because the MIDI resources have their own loop flag
that overrides the global one. This makes a difference for games
that use MIDI both for music and sound effects, such as (limited
to?) the floppy version of Simon the Sorcerer 1.
---
 engines/agos/midi.cpp | 22 ++++++++++++----------
 engines/agos/midi.h   |  4 +++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index c26fbe3331..045fd9dac5 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -52,7 +52,7 @@ MidiPlayer::MidiPlayer() {
 	_paused = false;
 
 	_currentTrack = 255;
-	_loopTrack = 0;
+	_loopTrackDefault = false;
 	_queuedTrack = 255;
 	_loopQueuedTrack = 0;
 }
@@ -166,13 +166,13 @@ void MidiPlayer::metaEvent(byte type, byte *data, uint16 length) {
 		return;
 	} else if (_current == &_sfx) {
 		clearConstructs(_sfx);
-	} else if (_loopTrack) {
+	} else if (_current->loopTrack) {
 		_current->parser->jumpToTick(0);
 	} else if (_queuedTrack != 255) {
 		_currentTrack = 255;
 		byte destination = _queuedTrack;
 		_queuedTrack = 255;
-		_loopTrack = _loopQueuedTrack;
+		_current->loopTrack = _loopQueuedTrack;
 		_loopQueuedTrack = false;
 
 		// Remember, we're still inside the locked mutex.
@@ -300,7 +300,7 @@ void MidiPlayer::setVolume(int musicVol, int sfxVol) {
 void MidiPlayer::setLoop(bool loop) {
 	Common::StackLock lock(_mutex);
 
-	_loopTrack = loop;
+	_loopTrackDefault = loop;
 }
 
 void MidiPlayer::queueTrack(int track, bool loop) {
@@ -405,7 +405,7 @@ void MidiPlayer::loadSMF(Common::File *in, int song, bool sfx) {
 
 	uint32 timerRate = _driver->getBaseTempo();
 
-	if (!memcmp(p->data, "GMF\x1", 4)) {
+	if (isGMF) {
 		// The GMF header
 		// 3 BYTES: 'GMF'
 		// 1 BYTE : Major version
@@ -426,11 +426,9 @@ void MidiPlayer::loadSMF(Common::File *in, int song, bool sfx) {
 		// It seems that 4 corresponds to our base tempo, so
 		// this should be the right way to calculate it.
 		timerRate = (4 * _driver->getBaseTempo()) / p->data[5];
-
-		// According to bug #1004919 calling setLoop() from
-		// within a lock causes a lockup, though I have no
-		// idea when this actually happens.
-		_loopTrack = (p->data[6] != 0);
+		p->loopTrack = (p->data[6] != 0);
+	} else {
+		p->loopTrack = _loopTrackDefault;
 	}
 
 	MidiParser *parser = MidiParser::createParser_SMF();
@@ -500,6 +498,8 @@ void MidiPlayer::loadMultipleSMF(Common::File *in, bool sfx) {
 		p->song_sizes[i] = size;
 	}
 
+	p->loopTrack = _loopTrackDefault;
+
 	if (!sfx) {
 		_currentTrack = 255;
 		resetVolumeTable();
@@ -531,6 +531,7 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) {
 		in->seek(pos, 0);
 		p->data = (byte *)calloc(size, 1);
 		in->read(p->data, size);
+		p->loopTrack = _loopTrackDefault;
 	} else {
 		error("Expected 'FORM' tag but found '%c%c%c%c' instead", buf[0], buf[1], buf[2], buf[3]);
 	}
@@ -575,6 +576,7 @@ void MidiPlayer::loadS1D(Common::File *in, bool sfx) {
 		_currentTrack = 255;
 		resetVolumeTable();
 	}
+	p->loopTrack = _loopTrackDefault;
 	p->parser = parser; // That plugs the power cord into the wall
 }
 
diff --git a/engines/agos/midi.h b/engines/agos/midi.h
index 3efadddc2f..398e445535 100644
--- a/engines/agos/midi.h
+++ b/engines/agos/midi.h
@@ -36,6 +36,7 @@ namespace AGOS {
 struct MusicInfo {
 	MidiParser *parser;
 	byte *data;
+	bool loopTrack;
 	byte num_songs;           // For Type 1 SMF resources
 	byte *songs[16];          // For Type 1 SMF resources
 	uint32 song_sizes[16];    // For Type 1 SMF resources
@@ -46,6 +47,7 @@ struct MusicInfo {
 	MusicInfo() { clear(); }
 	void clear() {
 		parser = 0; data = 0; num_songs = 0;
+		loopTrack = false;
 		memset(songs, 0, sizeof(songs));
 		memset(song_sizes, 0, sizeof(song_sizes));
 		memset(channel, 0, sizeof(channel));
@@ -71,7 +73,7 @@ protected:
 
 	// These are only used for music.
 	byte _currentTrack;
-	bool _loopTrack;
+	bool _loopTrackDefault;
 	byte _queuedTrack;
 	bool _loopQueuedTrack;
 
-- 
cgit v1.2.3


From b6dc7a1dd4bdbc020254943e73355a17d521487c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 Aug 2014 00:18:42 +0200
Subject: ACCESS: Implement two more opcodes

---
 engines/access/scripts.cpp | 117 +++++++++++++++++++++++++++++++++++++++++++--
 engines/access/scripts.h   |   6 ++-
 2 files changed, 117 insertions(+), 6 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 958696e09d..1e5bbc8982 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -110,9 +110,9 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
-		&Scripts::cmdTexSpeak, &Scripts::CMDTEXCHOICE, &Scripts::CMDWAIT, 
+		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::CMDWAIT, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
-		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::CMDLOADSOUND, 
+		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
 		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
@@ -454,7 +454,111 @@ void Scripts::cmdTexSpeak() {
 	findNull();
 }
 
-void Scripts::CMDTEXCHOICE() { error("TODO CMDTEXCHOICE"); } // _choiceStart = _data->pos() - 1;
+int Scripts::checkMouseBox1(Common::Rect *rectArr) {
+	int i = 0;
+	for (i = 0; ; i++){
+		if (rectArr[i].left == -1)
+			return -1;
+
+		if ((_vm->_events->_mousePos.x > rectArr[i].left) && (_vm->_events->_mousePos.x < rectArr[i].right) 
+			&& (_vm->_events->_mousePos.y > rectArr[i].top) && (_vm->_events->_mousePos.y < rectArr[i].bottom))
+			return i;
+	}
+}
+
+void Scripts::cmdTexChoice() {
+	static Common::Point cMouse[7] = {
+		Common::Point(0, 76), Common::Point(77, 154), Common::Point(155, 232),
+		Common::Point(233, 276), Common::Point(0, 0), Common::Point(277, 319),
+		Common::Point(297, 319)
+	};
+
+	_vm->_oldRects.clear();
+	_choiceStart = _data->pos() - 1;
+	_vm->_fonts._charSet._lo = 1;
+	_vm->_fonts._charSet._hi = 8;
+	_vm->_fonts._charFor._lo = 55;
+	_vm->_fonts._charFor._hi = 255;
+	_vm->_bubbleBox->_maxChars = 20;
+
+	_vm->_fonts._printOrg = _texsOrg;
+	_vm->_fonts._printStart = _texsOrg;
+
+	_vm->_bubbleBox->clearBubbles();
+	_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 1").c_str();
+
+	byte v;
+	Common::String tmpStr = "";
+	while ((v = _data->readByte()) != 0)
+		tmpStr += (char)v;
+
+	_vm->_bubbleBox->calcBubble(tmpStr);
+	_vm->_bubbleBox->printBubble(tmpStr);
+
+	Common::Rect responseCoords[2];
+	responseCoords[0] = _vm->_bubbleBox->_bounds;
+	responseCoords[1] = Common::Rect(0, 0, 0, 0);
+	_vm->_fonts._printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
+
+	findNull();
+
+	bool choice2Fl = false;
+	tmpStr = "";
+	while ((v = _data->readByte()) != 0)
+		tmpStr += (char)v;
+
+	Common::Rect termResponse2 = Common::Rect(-1, 0, 0, 0);
+	if (tmpStr.size() != 0) {
+		choice2Fl = true;
+		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 2").c_str();
+		_vm->_bubbleBox->calcBubble(tmpStr);
+		_vm->_bubbleBox->printBubble(tmpStr);
+		responseCoords[1] = _vm->_bubbleBox->_bounds;
+		_vm->_fonts._printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
+	}
+
+	findNull();
+
+	bool choice3Fl = false;
+	tmpStr = "";
+	while ((v = _data->readByte()) != 0)
+		tmpStr += (char)v;
+
+	if (tmpStr.size() != 0) {
+		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 3").c_str();
+		_vm->_bubbleBox->calcBubble(tmpStr);
+		_vm->_bubbleBox->printBubble(tmpStr);
+		termResponse2 = _vm->_bubbleBox->_bounds;
+		_vm->_fonts._printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
+	}
+
+	findNull();
+
+	int choice = -1;
+	do {
+		warning("TODO CHARLOOP");
+		_vm->_bubbleBox->_bubblePtr = _vm->_bubbleBox->_bubbleTitle.c_str();
+		if (_vm->_events->_leftButton) {
+			if (_vm->_events->_mouseRow >= 22) {
+				_vm->_events->debounceLeft();
+				int x = _vm->_events->_mousePos.x;
+				for (int i = 0; i < 7; i++) {
+					if ((x >= cMouse->x) && (x < cMouse->y)) {
+						choice = i;
+						break;
+					}
+				}
+			} else {
+				_vm->_events->debounceLeft();
+				choice = checkMouseBox1(responseCoords);
+			}
+		}
+	} while ((choice == -1) || ((choice == 2) && choice3Fl));
+	
+	_choice = choice + 1;
+	_vm->_bubbleBox->clearBubbles();
+}
+
 void Scripts::CMDWAIT() { error("TODO CMDWAIT"); }
 
 void Scripts::cmdSetConPos() {
@@ -487,7 +591,12 @@ void Scripts::cmdClearBlock() {
 	_vm->_screen->restoreBlock();
 }
 
-void Scripts::CMDLOADSOUND() { error("TODO CMDLOADSOUND"); }
+void Scripts::cmdLoadSound() {
+	int idx = _data->readSint16LE();
+	_vm->_sound->_soundTable[0]._data = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSTable, _vm->_extraCells[idx]._vidSTable1);
+	_vm->_sound->_soundPriority[0] = 1;
+}
+
 void Scripts::CMDFREESOUND() { error("TODO CMDFREESOUND"); }
 void Scripts::CMDSETVIDSND() { error("TODO CMDSETVIDSND"); }
 void Scripts::CMDPLAYVIDSND() { error("TODO CMDPLAYVIDSND"); }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 5f849410dc..6941c047d1 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -43,6 +43,8 @@ protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
 
+	int checkMouseBox1(Common::Rect *rectArr);
+
 	/**
 	 * Print a given message to the screen in a bubble box
 	 */
@@ -103,14 +105,14 @@ protected:
 	void CMDCYCLE();
 	void cmdCharSpeak();
 	void cmdTexSpeak();
-	void CMDTEXCHOICE();
+	void cmdTexChoice();
 	void CMDWAIT();
 	void cmdSetConPos();
 	void CMDCHECKVFRAME();
 	void cmdJumpChoice();
 	void cmdReturnChoice();
 	void cmdClearBlock();
-	void CMDLOADSOUND();
+	void cmdLoadSound();
 	void CMDFREESOUND();
 	void CMDSETVIDSND();
 	void CMDPLAYVIDSND();
-- 
cgit v1.2.3


From ad0be89459f318147f47e9c2bda29583a64592aa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Aug 2014 20:15:43 -0400
Subject: ACCESS: Simplified surface creation, added drawing for scaled flipped
 images

---
 engines/access/access.cpp   |  6 +++---
 engines/access/asurface.cpp | 24 +++++++++++++++++++++---
 engines/access/asurface.h   | 14 ++++++++++++--
 engines/access/screen.cpp   |  2 +-
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 7d12ba5b35..ab58f8effc 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -153,8 +153,8 @@ void AccessEngine::initialize() {
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
 
-	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
-	_buffer2.create(g_system->getWidth(), g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
+	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight());
+	_buffer2.create(g_system->getWidth(), g_system->getHeight());
 }
 
 Common::Error AccessEngine::run() {
@@ -272,7 +272,7 @@ void AccessEngine::plotList1() {
 				bounds.setWidth(bounds.width() / _scale);
 
 				if (ie._flags & 2) {
-					_buffer2.sPlotB(frame, Common::Point(bounds.left, bounds.top));
+					_buffer2.sPlotB(frame, destBounds);
 				} else {
 					_buffer2.sPlotF(frame, destBounds);
 				}
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 99292278f3..746e8d0f5a 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -59,7 +59,7 @@ SpriteResource::~SpriteResource() {
 SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize) {
 	int xSize = stream.readUint16LE();
 	int ySize = stream.readUint16LE();
-	create(xSize, ySize, Graphics::PixelFormat::createFormatCLUT8());
+	create(xSize, ySize);
 	
 	// Empty surface
 	byte *data = (byte *)getPixels();
@@ -138,6 +138,10 @@ ASurface::~ASurface() {
 	_savedBlock.free();
 }
 
+void ASurface::create(uint16 width, uint16 height) {
+	Graphics::Surface::create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+}
+
 void ASurface::clearBuffer() {
 	byte *pSrc = (byte *)getPixels();
 	Common::fill(pSrc, pSrc + w * h, 0);
@@ -301,8 +305,10 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	}
 }
 
-void ASurface::sPlotB(SpriteFrame *frame, const Common::Point &pt) {
-	frame->copyTo(this, pt);
+void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
+	ASurface flippedFrame;
+	frame->flipHorizontal(flippedFrame);
+	flippedFrame.copyTo(this, bounds);
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
@@ -341,4 +347,16 @@ void ASurface::drawRect() {
 	Graphics::Surface::fillRect(Common::Rect(_orgX1, _orgY1, _orgX2, _orgY2), _lColor);
 }
 
+void ASurface::flipHorizontal(ASurface &dest) {
+	dest.create(this->w, this->h);
+	for (int y = 0; y < h; ++y) {
+		const byte *pSrc = (const byte *)getBasePtr(this->w - 1, y);
+		byte *pDest = (byte *)dest.getBasePtr(0, y);
+
+		for (int x = 0; x < w; ++x, --pSrc, ++pDest)
+			*pDest = *pSrc;
+	}
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 400dd07b4d..460f73d2c0 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -39,6 +39,8 @@ class ASurface : public Graphics::Surface {
 private:
 	Graphics::Surface _savedBlock;
 	Common::Rect _savedBounds;
+
+	void flipHorizontal(ASurface &dest);
 public:
 	static int _leftSkip, _rightSkip;
 	static int _topSkip, _bottomSkip;
@@ -56,6 +58,8 @@ public:
 public:
 	virtual ~ASurface();
 
+	void create(uint16 width, uint16 height);
+
 	void clearBuffer();
 
 	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
@@ -64,10 +68,16 @@ public:
 
 	void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
 
-	void sPlotB(SpriteFrame *frame, const Common::Point &pt);
-
+	/**
+	 * Scaled draw frame
+	 */
 	void sPlotF(SpriteFrame *frame, const Common::Rect &bounds);
 
+	/**
+	 * Scaled flipped horizontal draw frame
+	 */
+	void sPlotB(SpriteFrame *frame, const Common::Rect &bounds);
+
 	void plotB(SpriteFrame *frame, const Common::Point &pt);
 
 	void copyBlock(ASurface *src, const Common::Rect &bounds);
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 8e9b08234f..3092d7e152 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -35,7 +35,7 @@ namespace Access {
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
 
 Screen::Screen(AccessEngine *vm) : _vm(vm) {
-	create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
+	create(320, 200);
 	Common::fill(&_tempPalette[0], &_tempPalette[PALETTE_SIZE], 0);
 	Common::fill(&_manPal[0], &_manPal[0x60], 0);
 	Common::fill(&_scaleTable1[0], &_scaleTable1[256], 0);
-- 
cgit v1.2.3


From c4a3770cfea0169b24ff46317febaa5ba82a5359 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Aug 2014 22:15:23 -0400
Subject: ACCESS: Bugfixes for walking

---
 engines/access/player.cpp | 98 +++++++++++++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 38 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 44dd0d2182..13c99eefc3 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -245,8 +245,11 @@ void Player::walkUp() {
 
 	_playerDirection = UP;
 	int walkOff = _walkOffUp[_frame - _upWalkMin];
-	_rawYTempL = _vm->_screen->_scaleTable2[walkOff];
-	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff];
+	int tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOff];
+	_rawYTempL = (byte)tempL;
+	int yTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff] - 
+		(tempL < 0 ? 1 : 0);
+	_rawYTemp = yTemp;
 	_rawXTemp = _rawPlayer.x;
 
 	if (_vm->_room->codeWalls()) {
@@ -273,8 +276,9 @@ void Player::walkDown() {
 
 	_playerDirection = DOWN;
 	int walkOff = _walkOffDown[_frame - _downWalkMin];
-	_rawYTempL = _vm->_screen->_scaleTable2[walkOff];
-	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff];
+	int tempL = _vm->_screen->_scaleTable2[walkOff] + _rawPlayerLow.y;
+	_rawYTempL = (byte)tempL;
+	_rawYTemp = _vm->_screen->_scaleTable1[walkOff] + _rawPlayer.y + (tempL >= 0x100 ? 1 : 0);
 	_rawXTemp = _rawPlayer.x;
 
 	if (_vm->_room->codeWalls()) {
@@ -288,8 +292,8 @@ void Player::walkDown() {
 			// TODO: si = 0?
 		}
 
-		if (++_frame > _upWalkMax)
-			_frame = _upWalkMin;
+		if (++_frame > _downWalkMax)
+			_frame = _downWalkMin;
 
 		plotCom(0);
 	}
@@ -309,8 +313,10 @@ void Player::walkLeft() {
 	}
 	if (flag) {
 		int walkOffset = _walkOffLeft[_frame - _sideWalkMin];
-		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+		int tempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawTempL = (byte)tempL;
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset] -
+			(tempL < 0 ? 1 : 0);
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
 	}	
@@ -347,11 +353,13 @@ void Player::walkRight() {
 			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
-		int walkOffset = _walkOffLeft[_frame - _sideWalkMin];
-		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+		int walkOffset = _walkOffRight[_frame - _sideWalkMin];
+		int tempL = _rawPlayerLow.x + _vm->_screen->_scaleTable2[walkOffset];
+		_rawTempL = (byte)tempL;
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] -
+			(tempL >= 0x100 ? 1 : 0);
 	} else {
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[_scrollConst];
 	}
 	_rawYTemp = _rawPlayer.y;
 
@@ -379,7 +387,7 @@ void Player::walkUpLeft() {
 
 	_playerDirection = UPLEFT;
 
-	int walkOffset;
+	int walkOffset, tempL;
 	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
@@ -388,15 +396,19 @@ void Player::walkUpLeft() {
 	}
 	if (flag) {
 		walkOffset = _walkOffUL[_frame - _diagUpWalkMin].x;
-		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+		tempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawTempL = (byte)tempL;
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset] -
+			(tempL < 0 ? 1 : 0);
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
 	}
 	
 	walkOffset = _walkOffUL[_frame - _diagUpWalkMin].y;
-	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
-	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTempL = (byte)tempL;
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset] -
+		(tempL < 0 ? 1 : 0);;
 
 	if (_vm->_room->codeWalls()) {
 		plotCom2();
@@ -426,7 +438,7 @@ void Player::walkDownLeft() {
 
 	_playerDirection = DOWNLEFT;
 
-	int walkOffset;
+	int walkOffset, tempL;
 	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
@@ -435,15 +447,19 @@ void Player::walkDownLeft() {
 	}
 	if (flag) {
 		walkOffset = _walkOffDL[_frame - _sideWalkMin].x;
-		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+		tempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
+		_rawTempL = (byte)tempL;
+		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset] -
+			(tempL < 0 ? 1 : 0);
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
 	}
 
 	walkOffset = _walkOffDL[_frame - _diagDownWalkMin].y;
-	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
-	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+	tempL = _rawPlayerLow.y + _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTempL = (byte)tempL;
+	_rawYTemp = _rawPlayer.y + _vm->_screen->_scaleTable1[walkOffset] +
+		(tempL >= 0x100 ? 1 : 0);
 
 	if (_vm->_room->codeWalls()) {
 		plotCom2();
@@ -473,7 +489,7 @@ void Player::walkUpRight() {
 
 	_playerDirection = UPLEFT;
 
-	int walkOffset;
+	int walkOffset, tempL;
 	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
@@ -482,15 +498,19 @@ void Player::walkUpRight() {
 	}
 	if (flag) {
 		walkOffset = _walkOffUR[_frame - _diagUpWalkMin].x;
-		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+		tempL = _rawPlayerLow.x + _vm->_screen->_scaleTable2[walkOffset];
+		_rawTempL = (byte)tempL;
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] +
+			(tempL >= 0x100 ? 1 : 0);
 	} else {
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[_scrollConst];
 	}
 
 	walkOffset = _walkOffUL[_frame - _diagUpWalkMin].y;
-	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
-	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTempL = (byte)tempL;
+	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset] -
+		(tempL < 0 ? 1 : 0);
 
 	if (_vm->_room->codeWalls()) {
 		plotCom2();
@@ -520,7 +540,7 @@ void Player::walkDownRight() {
 
 	_playerDirection = DOWNRIGHT;
 
-	int walkOffset;
+	int walkOffset, tempL;
 	bool flag = _scrollEnd == 1;
 	if (!flag) {
 		calcPlayer();
@@ -529,16 +549,20 @@ void Player::walkDownRight() {
 	}
 	if (flag) {
 		walkOffset = _walkOffUR[_frame - _sideWalkMin].x;
-		_rawTempL = _rawPlayerLow.x - _vm->_screen->_scaleTable2[walkOffset];
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[walkOffset];
+		tempL = _rawPlayerLow.x + _vm->_screen->_scaleTable2[walkOffset];
+		_rawTempL = (byte)tempL;
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] +
+			(tempL >= 0x100 ? 1 : 0);
 	}
 	else {
-		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[_scrollConst];
 	}
 
 	walkOffset = _walkOffDR[_frame - _diagDownWalkMin].y;
-	_rawYTempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
-	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset];
+	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	_rawYTempL = (byte)tempL;
+	_rawYTemp = _rawPlayer.y + _vm->_screen->_scaleTable1[walkOffset] +
+		(tempL >= 0x100 ? 1 : 0);
 
 	if (_vm->_room->codeWalls()) {
 		plotCom2();
@@ -565,8 +589,6 @@ void Player::walkDownRight() {
 void Player::checkMove() {
 	if (_playerMove) {
 		if (_xFlag == 0 && _yFlag == 0) {
-			// Figure out whether a greater horizontal movement than vertical
-			// movement will be required, or vice versa
 			int xp = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
 			if (xp < 0)
 				xp = -xp;
@@ -574,7 +596,7 @@ void Player::checkMove() {
 			if (yp < 0)
 				yp = -yp;
 
-			if (xp > yp)
+			if (xp >= yp)
 				_xFlag = 1;
 			else
 				_yFlag = 1;
@@ -602,7 +624,7 @@ void Player::checkMove() {
 				}
 			}
 		} else if (_xFlag == 1) {
-			int xd = _playerOffset.x / 2 +  _rawPlayer.x - _moveTo.x;
+			int xd = _rawPlayer.x - _moveTo.x;
 			if ((xd >= 0 && xd <= -_leftDelta) || (xd < 0 && -xd <= -_leftDelta)) {
 				++_xFlag;
 
-- 
cgit v1.2.3


From 8d45ad265d0da07a1d2541cb74140185a8847417 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Aug 2014 22:53:58 -0400
Subject: ACCESS: Fix walking right

---
 engines/access/player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 13c99eefc3..72d6389602 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -356,7 +356,7 @@ void Player::walkRight() {
 		int walkOffset = _walkOffRight[_frame - _sideWalkMin];
 		int tempL = _rawPlayerLow.x + _vm->_screen->_scaleTable2[walkOffset];
 		_rawTempL = (byte)tempL;
-		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] -
+		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] +
 			(tempL >= 0x100 ? 1 : 0);
 	} else {
 		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[_scrollConst];
@@ -377,7 +377,7 @@ void Player::walkRight() {
 		if (_frame > _sideWalkMax)
 			_frame = _sideWalkMin;
 
-		plotCom1();
+		plotCom(0);
 	}
 }
 
-- 
cgit v1.2.3


From 992ea95cd796aafeb1a1c61fcf29d57c7ecba8db Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 Aug 2014 07:48:00 +0200
Subject: ACCESS: Implement two opcodes

---
 engines/access/data.h      |  2 +-
 engines/access/scripts.cpp | 33 +++++++++++++++++++++++++++++----
 engines/access/scripts.h   |  4 ++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/engines/access/data.h b/engines/access/data.h
index 8ba3c58c82..1d1f85966a 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -43,7 +43,7 @@ public:
 struct TimerEntry {
 	int _initTm;
 	int _timer;
-	bool _flag;
+	byte _flag;
 
 	TimerEntry() {
 		_initTm = _timer = 0;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 1e5bbc8982..b4a231c784 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -102,8 +102,8 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetTex, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
 		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
-		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::CMDSETTIMER, 
-		&Scripts::CMDSETTIMER, &Scripts::CMDCHECKTIMER, &Scripts::cmdSetTravel,
+		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetTimer, 
+		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
 		&Scripts::cmdSetTravel, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
@@ -355,8 +355,33 @@ void Scripts::cmdDispInv() {
 	_vm->_inventory->newDisplayInv();
 }
 
-void Scripts::CMDSETTIMER() { error("TODO CMDSETTIMER"); }
-void Scripts::CMDCHECKTIMER() { error("TODO CMDCHECKTIMER"); }
+void Scripts::cmdSetTimer() {
+	int idx = _data->readUint16LE();
+	int val = _data->readUint16LE();
+
+	++_vm->_timers[idx]._flag;
+	_vm->_timers[idx]._timer = val;
+	_vm->_timers[idx]._initTm = val;
+
+	_vm->_events->debounceLeft();
+	_vm->_events->zeroKeys();
+}
+
+void Scripts::cmdCheckTimer() {
+	int idx = _data->readUint16LE();
+
+	if ((idx == 9) && (_vm->_events->_keypresses.size() > 0)) {
+		_vm->_events->zeroKeys();
+		_vm->_timers[9]._timer = 0;
+		_vm->_timers[9]._flag = 0;
+	}
+
+	int val = _data->readUint16LE() & 0xFF;
+	if (_vm->_timers[idx]._flag == val)
+		cmdGoto();
+	else
+		_data->skip(2);
+}
 
 void Scripts::cmdSetTravel() {
 	if (_vm->_room->_selectCommand == 5)
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 6941c047d1..40f667a2f1 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -87,8 +87,8 @@ protected:
 	void cmdCheckLoc();
 	void cmdSetAnim();
 	void cmdDispInv();
-	void CMDSETTIMER();
-	void CMDCHECKTIMER();
+	void cmdSetTimer();
+	void cmdCheckTimer();
 	void cmdSetTravel();
 	void CMDSETVID();
 	void CMDPLAYVID();
-- 
cgit v1.2.3


From b4f74b9b5e3b5eebcd695f8c07dd2d78e6a53a61 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 20 Aug 2014 01:46:46 +0200
Subject: ACCESS: Use a variable delay of up to 20ms instead of a fix 50ms

---
 engines/access/access.cpp | 13 ++++++++++++-
 engines/access/access.h   |  2 ++
 engines/access/room.cpp   |  4 ----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index ab58f8effc..71271230dd 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -99,6 +99,8 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_rKeyFlag = 0;
 	_mapOffset = 0;
 	_screenVirtX = 0;
+	_lastTime = g_system->getMillis();
+	_curTime = 0;
 }
 
 AccessEngine::~AccessEngine() {
@@ -171,7 +173,16 @@ void AccessEngine::dummyLoop() {
 	// Dummy game loop
 	while (!shouldQuit()) {
 		_events->pollEvents();
-		g_system->delayMillis(50);
+
+		_curTime = g_system->getMillis();
+		// Process machine once every tick
+		while (_curTime - _lastTime < 20) {
+			g_system->delayMillis(5);
+			_curTime = g_system->getMillis();
+		}
+
+		_lastTime = _curTime;
+
 		g_system->updateScreen();
 
 		if (_events->_leftButton) {
diff --git a/engines/access/access.h b/engines/access/access.h
index 88b6c837a5..f775310805 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -73,6 +73,8 @@ struct AccessGameDescription;
 
 class AccessEngine : public Engine {
 private:
+	uint32 _lastTime, _curTime;
+
 	/**
 	 * Handles basic initialisation
 	 */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 5e3a4d743d..e40c6b7096 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -79,10 +79,6 @@ void Room::doRoom() {
 				_vm->_screen->fadeIn();
 			}
 
-			// TODO: Game loop doesn't seem to have any delay. For now,
-			// introduce a slight delay here
-			_vm->_events->delay(50);
-
 			// Handle any events
 			_vm->_events->pollEvents();
 
-- 
cgit v1.2.3


From 6066afb020b6213bc6f9ef5ba5c3d7171c695340 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 Aug 2014 20:31:23 -0400
Subject: ACCESS: Fix z ordering of sprites on the screen

---
 engines/access/animation.cpp | 4 ++--
 engines/access/animation.h   | 2 +-
 engines/access/asurface.cpp  | 4 ++--
 engines/access/asurface.h    | 2 +-
 engines/access/events.h      | 2 +-
 engines/access/player.cpp    | 2 +-
 engines/access/scripts.cpp   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 3a7424f1d0..d9a24e7a58 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -231,7 +231,7 @@ void Animation::setFrame1(AnimationFrame *frame) {
 		ie._spritesPtr = _vm->_objectsTable[part->_spritesIndex];
 		ie._frameNumber = part->_frameIndex;
 		ie._position = part->_position + _vm->_animation->_base;
-		ie._priority = part->_priority - ie._position.y;
+		ie._offsetY = part->_offsetY - ie._position.y;
 
 		_vm->_images.addToList(&ie);
 	}
@@ -271,7 +271,7 @@ AnimationFramePart::AnimationFramePart(Common::MemoryReadStream &stream) {
 	_frameIndex = stream.readByte();
 	_position.x = stream.readUint16LE();
 	_position.y = stream.readUint16LE();
-	_priority = stream.readUint16LE();
+	_offsetY = stream.readUint16LE();
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/access/animation.h b/engines/access/animation.h
index f70aa3239d..7e94f58cbd 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -129,7 +129,7 @@ public:
 	int _spritesIndex;
 	int _frameIndex;
 	Common::Point _position;
-	int _priority;
+	int _offsetY;
 public:
 	AnimationFramePart(Common::MemoryReadStream &stream);
 };
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 746e8d0f5a..44686ab8f4 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -85,14 +85,14 @@ SpriteFrame::~SpriteFrame() {
 ImageEntry::ImageEntry() {
 	_frameNumber = 0;
 	_spritesPtr = nullptr;
-	_priority = 0;
+	_offsetY = 0;
 	_flags = 0;
 }
 
 /*------------------------------------------------------------------------*/
 
 static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
-	return ie1._priority < ie2._priority;
+	return (ie1._position.y + ie1._offsetY) < (ie2._position.y + ie2._offsetY);
 }
 
 void ImageEntryList::addToList(ImageEntry *ie) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 460f73d2c0..88e156100b 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -116,7 +116,7 @@ class ImageEntry {
 public:
 	int _frameNumber;
 	SpriteResource *_spritesPtr;
-	int _priority;
+	int _offsetY;
 	Common::Point _position;
 	int _flags;
 public:
diff --git a/engines/access/events.h b/engines/access/events.h
index 4c052f96f0..f7a5e9ce53 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -35,7 +35,7 @@ enum CursorType {
 	CURSOR_USE, CURSOR_TAKE, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
 };
 
-#define GAME_FRAME_RATE 40
+#define GAME_FRAME_RATE 100
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
 class AccessEngine;
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 72d6389602..f3593d5dfc 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -675,7 +675,7 @@ void Player::plotCom3() {
 	// Update the base ImageEntry fields for the player
 	_position.x = _rawPlayer.x;
 	_position.y = _rawPlayer.y - _playerOffset.y;
-	_priority = _playerOffset.y;
+	_offsetY = _playerOffset.y;
 	_spritesPtr = _playerSprites;
 	_frameNumber = _frame;
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index b4a231c784..57f5788022 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -289,7 +289,7 @@ void Scripts::cmdSetTex() {
 	_vm->_player->_scrollFlag |= scrlTemp;
 
 	_vm->_player->_position = Common::Point(_vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y - _vm->_player->_playerOffset.y);
-	_vm->_player->_priority = _vm->_player->_playerOffset.y;
+	_vm->_player->_offsetY = _vm->_player->_playerOffset.y;
 	_vm->_player->_spritesPtr = _vm->_player->_playerSprites;
 	_vm->_player->_frameNumber = _vm->_player->_frame;
 
-- 
cgit v1.2.3


From 23a442443f22f63a32e602b4e796981dbb9ee561 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 Aug 2014 20:43:32 -0400
Subject: ACCESS: Implemented cmdNewRoom opcode

---
 engines/access/access.cpp  |  6 ++++++
 engines/access/access.h    |  2 ++
 engines/access/scripts.cpp | 16 ++++++++++++++--
 engines/access/scripts.h   |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 71271230dd..6fcd64ecca 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -338,4 +338,10 @@ void AccessEngine::doLoadSave() {
 	error("TODO: doLoadSave");
 }
 
+void AccessEngine::freeChar() {
+	_scripts->freeScriptData();
+	_animation->clearTimers();
+	_animation->freeAnimationData();
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index f775310805..8cb1e72cfc 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -227,6 +227,8 @@ public:
 	void copyBF2Vid();
 
 	void doLoadSave();
+
+	void freeChar();
 };
 
 } // End of namespace Access
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 57f5788022..3a3fb06b1a 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -99,7 +99,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
-		&Scripts::cmdSetTex, &Scripts::CMDNEWROOM, &Scripts::CMDCONVERSE, 
+		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::CMDCONVERSE, 
 		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetTimer, 
@@ -296,7 +296,19 @@ void Scripts::cmdSetTex() {
 	_vm->_room->setWallCodes();
 }
 
-void Scripts::CMDNEWROOM() { error("TODO CMDNEWROOM"); }
+#define CURRENT_ROOM 0xFF
+
+void Scripts::cmdNewRoom() { 
+	int roomNumber = _data->readByte();
+	if (roomNumber != CURRENT_ROOM)
+		_vm->_player->_roomNumber = roomNumber;
+
+	_vm->_room->_function = 1;
+	_vm->freeChar();
+	_vm->_converseMode = 0;
+	cmdRetPos();
+}
+
 void Scripts::CMDCONVERSE() { error("TODO CMDCONVERSE"); }
 
 void Scripts::cmdCheckFrame() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 40f667a2f1..4b224c32bd 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -78,7 +78,7 @@ protected:
 	void cmdSetInventory();
 	void cmdCheckInventory();
 	void cmdSetTex();
-	void CMDNEWROOM();
+	void cmdNewRoom();
 	void CMDCONVERSE();
 	void cmdCheckFrame();
 	void cmdCheckAnim();
-- 
cgit v1.2.3


From 70b8efacfbe4c314e73dcb946f16db4c49eab85b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 20 Aug 2014 23:04:04 +0200
Subject: ACCESS: Finish moving timer flag from bool to byte based on the
 assembly, modify some comments and TODOs

---
 engines/access/amazon/amazon_game.cpp |  4 ++--
 engines/access/data.cpp               |  2 +-
 engines/access/data.h                 |  2 +-
 engines/access/player.cpp             | 20 ++++++++++----------
 engines/access/scripts.cpp            |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 857d1b3551..c7fa6a7bdc 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -169,12 +169,12 @@ void AmazonEngine::setupGame() {
 	for (int i = 0; i < 32; ++i) {
 		TimerEntry te;
 		te._initTm = te._timer = (i < 8) ? TIMER_DEFAULTS[i] : 1;
-		te._flag = true;
+		te._flag = 1;
 
 		_timers.push_back(te);
 	}
 
-	// Miscellaenous
+	// Miscellaneous
 	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
 	_fonts._font6x6.load(FONT6x6_INDEX, FONT6x6_DATA);
 
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 124bfbca5a..094272b05c 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -52,7 +52,7 @@ void TimerList::updateTimers() {
 		if (te._flag) {
 			if (!--te._timer) {
 				te._timer = te._initTm;
-				te._flag = false;
+				te._flag = 0;
 			}
 		}
 	}
diff --git a/engines/access/data.h b/engines/access/data.h
index 1d1f85966a..e7a6d13fa1 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -47,7 +47,7 @@ struct TimerEntry {
 
 	TimerEntry() {
 		_initTm = _timer = 0;
-		_flag = false;
+		_flag = 0;
 	}
 };
 
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index f3593d5dfc..420404bf48 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -97,7 +97,7 @@ void Player::load() {
 
 		_vm->_timers[8]._initTm = 7;
 		_vm->_timers[8]._timer = 7;
-		_vm->_timers[8]._flag = true;
+		++_vm->_timers[8]._flag;
 
 		_sideWalkMin = 0;
 		_sideWalkMax = 5;
@@ -191,7 +191,7 @@ void Player::walk() {
 		return;
 	}
 
-	_vm->_timers[0]._flag = true;
+	++_vm->_timers[0]._flag;
 	switch (_move) {
 	case UP:
 		_playerMove = false;
@@ -260,7 +260,7 @@ void Player::walkUp() {
 		
 		calcManScale();
 		if (_vm->_currentMan != 3 && (_frame == 17 || _frame == 21)) {
-			// TODO: si = 0?
+			warning("TODO: walkUp - si = 0?");
 		}
 
 		if (++_frame > _upWalkMax)
@@ -289,7 +289,7 @@ void Player::walkDown() {
 
 		calcManScale();
 		if (_vm->_currentMan != 3 && (_frame == 10 || _frame == 14)) {
-			// TODO: si = 0?
+			warning("TODO: walkDown - si = 0?");
 		}
 
 		if (++_frame > _downWalkMax)
@@ -330,7 +330,7 @@ void Player::walkLeft() {
 		++_frame;
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			// TODO: si = 0?
+			warning("TODO: walkLeft - si = 0?");
 		}
 
 		if (_frame > _sideWalkMax)
@@ -371,7 +371,7 @@ void Player::walkRight() {
 		++_frame;
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			// TODO: si = 0?
+			warning("TODO: walkRight - si = 0?");
 		}
 
 		if (_frame > _sideWalkMax)
@@ -422,7 +422,7 @@ void Player::walkUpLeft() {
 		calcManScale();
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			// TODO: si = 0?
+			warning("TODO: walkUpLeft - si = 0?");
 		}
 
 		if (_frame > _diagUpWalkMax)
@@ -473,7 +473,7 @@ void Player::walkDownLeft() {
 		calcManScale();
 		
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			// TODO: si = 0?
+			warning("TODO: walkDownLeft - si = 0?");
 		}
 
 		if (_frame > _diagDownWalkMax)
@@ -524,7 +524,7 @@ void Player::walkUpRight() {
 		calcManScale();
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			// TODO: si = 0?
+			warning("TODO: walkUpRight - si = 0?");
 		}
 
 		if (_frame > _diagUpWalkMax)
@@ -576,7 +576,7 @@ void Player::walkDownRight() {
 		calcManScale();
 
 		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			// TODO: si = 0?
+			warning("TODO: walkDownRight - si = 0?");
 		}
 
 		if (_frame > _diagDownWalkMax)
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 3a3fb06b1a..70a8d6a7a9 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -189,7 +189,7 @@ void Scripts::printString(const Common::String &msg) {
 	_vm->_fonts._printStart = Common::Point(20, 42);
 	_vm->_timers[PRINT_TIMER]._timer = 50;
 	_vm->_timers[PRINT_TIMER]._initTm = 50;
-	_vm->_timers[PRINT_TIMER]._flag = true;
+	++_vm->_timers[PRINT_TIMER]._flag;
 
 	// Display the text in a bubble, and wait for a keypress or mouse click
 	_vm->_bubbleBox->placeBubble(msg);
-- 
cgit v1.2.3


From c7d4958984f199e4f3a6677056c9904d7f235fbe Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 21 Aug 2014 00:32:11 +0200
Subject: ACCESS: Implement partially doEstablish

---
 engines/access/access.cpp | 39 +++++++++++++++++++++++++++++++++------
 engines/access/access.h   | 13 ++++++++++---
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6fcd64ecca..32835a01c8 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -217,18 +217,23 @@ void AccessEngine::freeInactiveData() {
 	_inactive = nullptr;
 }
 
-void AccessEngine::establish(int v1, int v2) {
+void AccessEngine::establish(int v1, int sub) {
 	_establishMode = 0;
 	_establishGroup = 0;
-	doEstablish(v1, v2);
+	doEstablish(v1, sub);
 }
 
-void AccessEngine::establishCenter(int v1, int v2) {
+void AccessEngine::establishCenter(int v1, int sub) {
 	_establishMode = 1;
-	doEstablish(v1, v2);
+	doEstablish(v1, sub);
 }
 
-void AccessEngine::doEstablish(int v1, int v2) {
+byte *AccessEngine::loadEstablish(int sub) {
+	warning("TODO: loadEstablish");
+	return nullptr;
+}
+
+void AccessEngine::doEstablish(int v1, int sub) {
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);
@@ -241,7 +246,29 @@ void AccessEngine::doEstablish(int v1, int v2) {
 	_room->setIconPalette();
 	_screen->forceFadeIn();
 
-	warning("TODO: doEstablish");
+	_fonts._charSet._lo = 1;
+	_fonts._charSet._hi = 10;
+	_fonts._charFor._lo = 29;
+	_fonts._charFor._hi = 32;
+
+	_bubbleBox->_maxChars = 37;
+	_fonts._printOrg = _fonts._printStart = Common::Point(48, 35);
+	_eseg = loadEstablish(sub);
+	_et = sub;
+	warning("CHECKME: Use of di");
+	_printEnd = 155;
+	if (_txtPages == 0)
+		warning("TODO: printText();");
+	else
+		warning("TODO: speakText();");
+
+	_screen->forceFadeOut();
+	_screen->clearScreen();
+
+	free(_eseg);
+	if (_establishMode == 0) {
+		warning("TODO: init4Quads();");
+	}
 }
 
 void AccessEngine::plotList() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 8cb1e72cfc..5423354800 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -87,7 +87,7 @@ private:
 
 	void dummyLoop();
 
-	void doEstablish(int v1, int v2);
+	void doEstablish(int v1, int sub);
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -156,6 +156,11 @@ public:
 	int _scaleI;
 	bool _scaleFlag;
 
+	byte *_eseg;
+	int _et;
+	int _printEnd;
+	int _txtPages;
+
 	// Fields that are included in savegames
 	int _conversation;
 	int _currentMan;
@@ -211,9 +216,11 @@ public:
 	 */
 	void freeInactiveData();
 
-	void establish(int v1, int v2);
+	byte *AccessEngine::loadEstablish(int sub);
+
+	void establish(int v1, int sub);
 
-	void establishCenter(int v1, int v2);
+	void establishCenter(int v1, int sub);
 
 	void plotList();
 	void plotList1();
-- 
cgit v1.2.3


From 5870b18e175b8beee29654978d711d94ad92ddf5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 Aug 2014 20:02:17 -0400
Subject: ACCESS: Fix for collision detection

---
 engines/access/player.cpp | 2 +-
 engines/access/room.cpp   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 420404bf48..063aa76c56 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -624,7 +624,7 @@ void Player::checkMove() {
 				}
 			}
 		} else if (_xFlag == 1) {
-			int xd = _rawPlayer.x - _moveTo.x;
+			int xd = (_playerOffset.x / 2) + _rawPlayer.x - _moveTo.x;
 			if ((xd >= 0 && xd <= -_leftDelta) || (xd < 0 && -xd <= -_leftDelta)) {
 				++_xFlag;
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e40c6b7096..e7008c5ab7 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -593,7 +593,7 @@ int Room::calcLR(int yp) {
 
 	int rem = (yv % yd) << 1;
 	yv /= yd;
-	if (rem >= yd)
+	if (rem >= yd || rem < 0)
 		++yv;
 
 	return yv + screen._orgX1;
@@ -607,7 +607,7 @@ int Room::calcUD(int xp) {
 
 	int rem = (xv % xd) << 1;
 	xv /= xd;
-	if (rem >= xd)
+	if (rem >= xd || rem < 0)
 		++xv;
 
 	return xv + screen._orgY1;
@@ -638,7 +638,8 @@ bool Room::codeWalls() {
 			if ((player._rawYTemp >= screen._orgY1) &&
 					(player._rawYTemp <= screen._orgY2)) {
 				jf._wallCode |= (calcLR(player._rawYTemp) - player._rawXTemp) < 0 ? 2 : 1;
-				jf._wallCode1 |= (calcLR(player._rawYTemp) - player._playerOffset.x) < 0 ? 2 : 1;
+				jf._wallCode1 |= (calcLR(player._rawYTemp) - 
+					(player._rawXTemp + player._playerOffset.x)) < 0 ? 2 : 1;
 			}
 		}
 
-- 
cgit v1.2.3


From 4e5eb04e47c96f98cdc6519ae79b908efc9888e7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 Aug 2014 20:22:35 -0400
Subject: ACCESS: Fix freeing player sprites when the scene changes

---
 engines/access/animation.cpp |  3 ---
 engines/access/player.cpp    |  6 +++---
 engines/access/room.cpp      | 12 ++++++------
 engines/access/room.h        |  2 ++
 engines/access/scripts.cpp   |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index d9a24e7a58..b286237bfb 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -293,9 +293,6 @@ void AnimationManager::freeAnimationData() {
 }
 
 void AnimationManager::clearTimers() {
-	for (uint i = 0; i < _animationTimers.size(); ++i)
-		delete _animationTimers[i];
-
 	_animationTimers.clear();
 }
 
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 063aa76c56..e85b68a24d 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -155,8 +155,7 @@ void Player::load() {
 }
 
 void Player::loadSprites(const Common::String &name) {
-	delete _playerSprites1;
-	_playerSprites = nullptr;
+	freeSprites();
 
 	const byte *data = _vm->_files->loadFile(name);
 	_playerSprites1 = new SpriteResource(_vm, data, _vm->_files->_filesize,
@@ -164,7 +163,8 @@ void Player::loadSprites(const Common::String &name) {
 }
 
 void Player::freeSprites() {
-	delete _playerSprites;
+	delete _playerSprites1;
+	_playerSprites1 = nullptr;
 	_playerSprites = nullptr;
 }
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e7008c5ab7..f45ffe7afb 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -88,17 +88,17 @@ void Room::doRoom() {
 			doCommands();
 
 			// DOROOMFLASHBACK jump point
-			if (_function == 1) {
+			if (_function == FN_CLEAR1) {
 				clearRoom();
 				break;
-			} else if (_function == 2) {
+			} else if (_function == FN_CLEAR2) {
 				clearRoom();
 				return;
-			} else if (_function == 3) {
+			} else if (_function == FN_RELOAD) {
 				reloadRoom1();
 				reloadFlag = true;
 				break;
-			} else if (_function == 4) {
+			} else if (_function == FN_BREAK) {
 				break;
 			}
 
@@ -108,7 +108,7 @@ void Room::doRoom() {
 				_function = 0;
 				roomLoop();
 
-				if (_function == 1) {
+				if (_function == FN_CLEAR1) {
 					clearRoom();
 					break;
 				} else {
@@ -122,7 +122,7 @@ void Room::doRoom() {
 				_function = 0;
 				roomLoop();
 
-				if (_function == 1) {
+				if (_function == FN_CLEAR1) {
 					clearRoom();
 					break;
 				} else {
diff --git a/engines/access/room.h b/engines/access/room.h
index c76bd7021b..9b3f922528 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -58,6 +58,8 @@ public:
 	}
 };
 
+enum Function { FN_NONE = 0, FN_CLEAR1 = 1, FN_CLEAR2 = 2, FN_RELOAD = 3, FN_BREAK = 4 };
+
 class Room: public Manager {
 private:
 	void roomLoop();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 70a8d6a7a9..f6879584f3 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -303,7 +303,7 @@ void Scripts::cmdNewRoom() {
 	if (roomNumber != CURRENT_ROOM)
 		_vm->_player->_roomNumber = roomNumber;
 
-	_vm->_room->_function = 1;
+	_vm->_room->_function = FN_CLEAR1;
 	_vm->freeChar();
 	_vm->_converseMode = 0;
 	cmdRetPos();
-- 
cgit v1.2.3


From a8dd2defaa3a6680102e230d091d705d54f87d7e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 Aug 2014 20:27:52 -0400
Subject: ACCESS: Added scene debugger command

---
 engines/access/debugger.cpp | 36 ++++++++++++++++++++++++++++++++++++
 engines/access/debugger.h   |  1 +
 2 files changed, 37 insertions(+)

diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index e92e3402ac..d20b5d3e6b 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -28,6 +28,42 @@ namespace Access {
 
 Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
+	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
+}
+
+static int strToInt(const char *s) {
+	if (!*s)
+		// No string at all
+		return 0;
+	else if (toupper(s[strlen(s) - 1]) != 'H')
+		// Standard decimal string
+		return atoi(s);
+
+	// Hexadecimal string
+	uint tmp = 0;
+	int read = sscanf(s, "%xh", &tmp);
+	if (read < 1)
+		error("strToInt failed on string \"%s\"", s);
+	return (int)tmp;
+}
+
+bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
+	if (argc != 2) {
+		debugPrintf("Current scene is: %d\n", _vm->_player->_roomNumber);
+		debugPrintf("Usage: %s <scene number>\n", argv[0]);
+		return true;
+	}
+	else {
+		_vm->_player->_roomNumber = strToInt(argv[1]);
+
+		_vm->_room->_function = FN_CLEAR1;
+		_vm->freeChar();
+		_vm->_converseMode = 0;
+		_vm->_scripts->_endFlag = true;
+		_vm->_scripts->_returnCode = 0;
+
+		return false;
+	}
 }
 
 } // End of namespace Access
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
index dcf49c4ecd..6c8424dac4 100644
--- a/engines/access/debugger.h
+++ b/engines/access/debugger.h
@@ -34,6 +34,7 @@ class Debugger : public GUI::Debugger {
 private:
 	AccessEngine *_vm;
 protected:
+	bool Cmd_LoadScene(int argc, const char **argv);
 public:
 public:
 	Debugger(AccessEngine *vm);
-- 
cgit v1.2.3


From afc41c7eecc5c8d6b410534b5c66aa02807d11cb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 Aug 2014 23:36:57 -0400
Subject: ACCESS: Added initial resources and detection entry for Martian
 Memorandum

---
 engines/access/access.h                      |   2 +-
 engines/access/amazon/amazon_game.cpp        |   2 +-
 engines/access/data.h                        |   2 +-
 engines/access/detection.cpp                 |   5 +
 engines/access/detection_tables.h            |  18 +
 engines/access/files.cpp                     |   4 +
 engines/access/inventory.cpp                 |   8 +-
 engines/access/martian/martian_game.cpp      | 172 +++++++
 engines/access/martian/martian_game.h        |  79 ++++
 engines/access/martian/martian_resources.cpp | 649 +++++++++++++++++++++++++++
 engines/access/martian/martian_resources.h   |  48 ++
 engines/access/martian/martian_room.cpp      | 139 ++++++
 engines/access/martian/martian_room.h        |  62 +++
 engines/access/martian/martian_scripts.cpp   |  48 ++
 engines/access/martian/martian_scripts.h     |  49 ++
 engines/access/module.mk                     |   6 +-
 16 files changed, 1288 insertions(+), 5 deletions(-)
 create mode 100644 engines/access/martian/martian_game.cpp
 create mode 100644 engines/access/martian/martian_game.h
 create mode 100644 engines/access/martian/martian_resources.cpp
 create mode 100644 engines/access/martian/martian_resources.h
 create mode 100644 engines/access/martian/martian_room.cpp
 create mode 100644 engines/access/martian/martian_room.h
 create mode 100644 engines/access/martian/martian_scripts.cpp
 create mode 100644 engines/access/martian/martian_scripts.h

diff --git a/engines/access/access.h b/engines/access/access.h
index 5423354800..2185916c5a 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -59,7 +59,7 @@ namespace Access {
 
 enum {
 	GType_Amazon = 1,
-	GType_MeanStreets = 2,
+	GType_MartianMemorandum = 2,
 	GType_Noctropolis = 3
 };
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index c7fa6a7bdc..286a7126bc 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -175,8 +175,8 @@ void AmazonEngine::setupGame() {
 	}
 
 	// Miscellaneous
+	_fonts._font1.load(FONT6x6_INDEX, FONT6x6_DATA);
 	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
-	_fonts._font6x6.load(FONT6x6_INDEX, FONT6x6_DATA);
 
 	// Set player room and position
 	_player->_roomNumber = 4;
diff --git a/engines/access/data.h b/engines/access/data.h
index e7a6d13fa1..1601c689bf 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -145,7 +145,7 @@ public:
 	Common::Point _printOrg;
 	Common::Point _printStart;
 	int _printMaxX;
-	Font _font6x6;
+	Font _font1;
 	Font _font2;
 public:
 	FontManager();
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 47f7af6191..dd75b28177 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -23,6 +23,7 @@
 
 #include "access/access.h"
 #include "access/amazon/amazon_game.h"
+#include "access/martian/martian_game.h"
 
 #include "base/plugins.h"
 #include "common/savefile.h"
@@ -73,6 +74,7 @@ Common::Platform AccessEngine::getPlatform() const {
 static const PlainGameDescriptor AccessGames[] = {
 	{"Access", "Access"},
 	{"amazon", "Amazon: Guardians of Eden"},
+	{ "martian", "Martian Memorandum"},
 	{0, 0}
 };
 
@@ -123,6 +125,9 @@ bool AccessMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
 		case Access::GType_Amazon:
 			*engine = new Access::Amazon::AmazonEngine(syst, gd);
 			break;
+		case Access::GType_MartianMemorandum:
+			*engine = new Access::Martian::MartianEngine(syst, gd);
+			break;
 		default:
 			error("Unknown game");
 		}
diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index ad962f47b2..6a281a7e96 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -59,6 +59,24 @@ static const AccessGameDescription gameDescriptions[] = {
 		0
 	},
 
+	{
+		// Martian Memorandum
+		{
+			"martian",
+			nullptr,
+			{
+				{ "r00.ap", 0, "af98db5ee7f9ef86c6b1f43187a3691b", 31 },
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+		GType_MartianMemorandum,
+		0
+	},
+
 	{ AD_TABLE_END_MARKER, 0, 0 }
 };
 
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 1ebc2fa8eb..970b0b9019 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -22,6 +22,7 @@
 
 #include "access/files.h"
 #include "access/amazon/amazon_resources.h"
+#include "access/martian/martian_resources.h"
 #include "access/access.h"
 
 namespace Access {
@@ -31,6 +32,9 @@ FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	case GType_Amazon:
 		_filenames = &Amazon::FILENAMES[0];
 		break;
+	case GType_MartianMemorandum:
+		_filenames = &Martian::FILENAMES[0];
+		break;
 	default:
 		error("Unknown game");
 	}
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 15668b0bc2..e90ad62344 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -23,6 +23,7 @@
 #include "access/inventory.h"
 #include "access/access.h"
 #include "access/amazon/amazon_resources.h"
+#include "access/martian/martian_resources.h"
 
 namespace Access {
 
@@ -35,11 +36,16 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_startAboutItem = 0;
 	_startTravelItem = 0;
 
-	const char *const *names = Amazon::INVENTORY_NAMES;
+	const char *const *names;
 	switch (vm->getGameID()) {
 	case GType_Amazon:
+		names = Amazon::INVENTORY_NAMES;
 		_inv.resize(85);
 		break;
+	case GType_MartianMemorandum:
+		names = Martian::INVENTORY_NAMES;
+		_inv.resize(54);
+		break;
 	default:
 		error("Unknown game");
 	}
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
new file mode 100644
index 0000000000..f087b56ac6
--- /dev/null
+++ b/engines/access/martian/martian_game.cpp
@@ -0,0 +1,172 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/resources.h"
+#include "access/martian/martian_game.h"
+#include "access/martian/martian_resources.h"
+#include "access/martian/martian_room.h"
+#include "access/martian/martian_scripts.h"
+#include "access/amazon/amazon_resources.h"
+
+namespace Access {
+
+namespace Martian {
+
+MartianEngine::MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
+		AccessEngine(syst, gameDesc) {
+}
+
+MartianEngine::~MartianEngine() {
+}
+
+void MartianEngine::playGame() {
+	// Do introduction
+	doIntroduction();
+	if (shouldQuit())
+		return;
+
+	// Setup the game
+	setupGame();
+
+	_screen->clearScreen();
+	_screen->setPanel(0);
+	_screen->forceFadeOut();
+
+	_events->showCursor();
+
+	// Setup and execute the room
+	_room = new MartianRoom(this);
+	_scripts = new MartianScripts(this);
+	_room->doRoom();
+}
+
+void MartianEngine::doIntroduction() {
+	_screen->setInitialPalettte();
+	_events->setCursor(CURSOR_ARROW);
+	_events->showCursor();
+	_screen->setPanel(0);
+
+	// TODO: Worry about implementing full intro sequence later
+	return;
+
+	doTitle();
+	if (shouldQuit())
+		return;
+
+	if (!_skipStart) {
+		_screen->setPanel(3);
+		doOpening();
+		if (shouldQuit())
+			return;
+
+		if (!_skipStart) {
+			doTent();
+			if (shouldQuit())
+				return;
+		}
+	}
+
+	doTitle();
+}
+
+void MartianEngine::doTitle() {
+	_screen->setDisplayScan();
+	_destIn = &_buffer2;
+
+	_screen->forceFadeOut();
+	_events->hideCursor();
+
+	_sound->queueSound(0, 98, 30);
+	_sound->_soundPriority[0] = 1;
+
+	_screen->_loadPalFlag = false;
+	_files->loadScreen(0, 3);
+	
+	_buffer2.copyFrom(*_screen);
+	_buffer1.copyFrom(*_screen);
+	_screen->forceFadeIn();
+	_sound->playSound(1);
+
+	byte *spriteData = _files->loadFile(0, 2);
+	_objectsTable[0] = new SpriteResource(this, spriteData, _files->_filesize,
+		DisposeAfterUse::YES);
+
+	_sound->playSound(1);
+
+	_screen->_loadPalFlag = false;
+	_files->loadScreen(0, 4);
+	_sound->playSound(1);
+
+	_buffer2.copyFrom(*_screen);
+	_buffer1.copyFrom(*_screen);
+	_sound->playSound(1);
+
+	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
+	for (_pCount = 0; _pCount < 3; ++_pCount) {
+		_buffer2.copyFrom(_buffer1);
+		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
+		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
+		_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
+	}
+	// TODO: More to do
+
+	delete _objectsTable[0];
+}
+
+void MartianEngine::doOpening() {
+	warning("TODO doOpening");
+}
+
+void MartianEngine::doTent() {
+	warning("TODO doTent");
+}
+
+void MartianEngine::setupGame() {
+
+	// Setup timers
+	const int TIMER_DEFAULTS[] = { 4, 10, 8, 1, 1, 1, 1, 2 };
+	for (int i = 0; i < 32; ++i) {
+		TimerEntry te;
+		te._initTm = te._timer = (i < 8) ? TIMER_DEFAULTS[i] : 1;
+		te._flag = 1;
+
+		_timers.push_back(te);
+	}
+
+	// Miscellaneous
+	// TODO: Replace with Martian fonts when located
+	_fonts._font1.load(Amazon::FONT6x6_INDEX, Amazon::FONT6x6_DATA);
+	_fonts._font2.load(Amazon::FONT2_INDEX, Amazon::FONT2_DATA);
+
+	// Set player room and position
+	_player->_roomNumber = 7;
+	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
+	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
+}
+
+void MartianEngine::drawHelp() {
+	error("TODO: drawHelp");
+}
+
+} // End of namespace Martian
+
+} // End of namespace Access
diff --git a/engines/access/martian/martian_game.h b/engines/access/martian/martian_game.h
new file mode 100644
index 0000000000..29fdd1b2ce
--- /dev/null
+++ b/engines/access/martian/martian_game.h
@@ -0,0 +1,79 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_MARTIAN_GAME_H
+#define ACCESS_MARTIAN_GAME_H
+
+#include "access/access.h"
+
+namespace Access {
+
+namespace Martian {
+
+class MartianEngine : public AccessEngine {
+private:
+	bool _skipStart;
+
+	/**
+	 * Do the game introduction
+	 */
+	void doIntroduction();
+
+	/**
+	 * Do title sequence
+	 */
+	void doTitle();
+
+	/**
+	 * Do opening sequence
+	 */
+	void doOpening();
+
+	/**
+	 * Do tent scene of introduction
+	 */
+	void doTent();
+
+	/**
+	 * Setup variables for the game
+	 */
+	void setupGame();
+
+protected:
+	/**
+	 * Play the game
+	 */
+	virtual void playGame();
+public:
+public:
+	MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc);
+
+	virtual ~MartianEngine();
+
+	void drawHelp();
+};
+
+} // End of namespace Martian
+
+} // End of namespace Access
+
+#endif /* ACCESS_MARTIAN_GAME_H */
diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
new file mode 100644
index 0000000000..6e881f3b36
--- /dev/null
+++ b/engines/access/martian/martian_resources.cpp
@@ -0,0 +1,649 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/martian/martian_resources.h"
+#include "access/access.h"
+
+namespace Access {
+
+namespace Martian {
+
+const char *const FILENAMES[] = {
+	"R00.AP", "R01.AP", "R02.AP", "R03.AP", "R04.AP", "R05.AP", "R06.AP", "R07.AP",
+	"R08.AP", "R09.AP", "R10.AP", "R11.AP", "R12.AP", "R13.AP", "R14.AP", "R15.AP",
+	"R16.AP", "R17.AP", "R18.AP", "R19.AP", "R20.AP", "R21.AP", "R22.AP", "R23.AP",
+	"R24.AP", "R25.AP", "R26.AP", "R27.AP", "R28.AP", "R29.AP", "R30.AP", "R31.AP",
+	"R32.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP", "R40.AP",
+	"TITLE.AP","R42.AP","S01.AP", "R45.AP","SOUND.AP","MUSIC.AP","DEAD.AP","EST.AP",
+	"W02.AP", "C02.AP", "C05.AP", "C04.AP", "C10.AP", "C03.AP", "C07.AP", "LOVE.AP",
+	"CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP", "C12.AP", "C16.AP",
+	"CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP", "C16A.AP","C09.AP",
+	"R45.AP", "R46.AP", "R47.AP", "R48.AP", "R49.AP"
+};
+
+const byte MOUSE0[] = {
+	0, 0, 0, 0, 0, 2, 0xF7, 5, 0, 3, 0xF7, 0xF7, 5, 0, 3,
+	0xF7, 0xF7, 5, 0, 4, 0xF7, 0xF7, 0xF7, 5, 0, 4, 0xF7,
+	0xF7, 0xF7, 5, 0, 5, 0xF7, 0xF7, 0xF7, 0xF7, 5, 0, 5,
+	0xF7, 0xF7, 0xF7, 0xF7, 5, 0, 6, 0xF7, 0xF7, 0xF7, 0xF7,
+	0xF7, 5, 0, 6, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 5, 0, 7,
+	0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 5, 0, 6, 0xF7, 0xF7,
+	0xF7, 0xF7, 0xF7, 5, 0, 5, 0xF7, 0xF7, 0xF7, 0xF7, 5,
+	2, 3, 0xF7, 0xF7, 5, 3, 3, 0xF7, 0xF7, 5, 3, 3, 0xF7,
+	0xF7, 5, 4, 2, 0xF7, 5
+};
+const byte MOUSE1[] = {
+	7, 0, 7, 0, 6, 1, 0xF7, 4, 5, 0xFF, 0xFF, 0, 0xFF, 0xFF,
+	3, 7, 0xFF, 0, 0, 0, 0, 0, 0xFF, 2, 9, 0xFF, 0, 0, 0,
+	0xF7, 0, 0, 0, 0xFF, 1, 11, 0xFF, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0xFF, 1, 11, 0xFF, 0, 0, 0, 0, 0xF7, 0, 0,
+	0, 0, 0xFF, 0, 13, 0xF7, 0, 0, 0xF7, 0, 0xF7, 0, 0xF7,
+	0, 0xF7, 0, 0, 0xF7, 1, 11, 0xFF, 0, 0, 0, 0, 0xF7,
+	0, 0, 0, 0, 0xFF, 1, 11, 0xFF, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0xFF, 2, 9, 0xFF, 0, 0, 0, 0xF7, 0, 0, 0, 0xFF,
+	3, 7, 0xFF, 0, 0, 0, 0, 0, 0xFF, 4, 5, 0xFF, 0xFF, 0,
+	0xFF, 0xFF, 6, 1, 0xF7, 0, 0, 0, 0, 0, 0
+};
+const byte MOUSE2[] = {
+	8, 0, 8, 0, 0, 0, 0, 0, 7, 2, 4, 5, 7, 2, 4, 5, 7, 2,
+	4, 5, 7, 2, 4, 5, 7, 2, 4, 5, 2, 12, 4, 4, 4, 4, 4,
+	0, 4, 4, 4, 4, 4, 5, 7, 2, 4, 5, 7, 2, 4, 5, 7, 2, 4,
+	5, 7, 2, 4, 5, 7, 2, 4, 5, 0, 0, 0, 0, 0, 0
+};
+const byte MOUSE3[] = {
+	0, 0, 0, 0, 0, 11, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	0, 12, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 5, 0, 12,
+	6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, 0, 12, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 5, 0, 12, 6, 6, 6, 6, 6, 5,
+	6, 6, 6, 6, 6, 5, 0, 12, 6, 6, 6, 6, 5, 0, 0, 6, 6,
+	6, 6, 5, 0, 12, 6, 6, 6, 6, 6, 0, 6, 6, 6, 6, 6, 5,
+	0, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 0, 12,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 0, 12, 6, 6, 6,
+	6, 6, 5, 6, 6, 6, 6, 6, 5, 0, 12, 6, 6, 6, 6, 6, 5,
+	6, 6, 6, 6, 6, 5, 0, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 5, 1, 11, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0,
+	0, 0, 0, 0, 0
+};
+const byte *CURSORS[4] = { MOUSE0, MOUSE1, MOUSE2, MOUSE3 };
+
+const int TRAVEL_POS[][2] = {
+	{ -1, 0 },
+	{ 228, 117 },
+	{ 28, 98 },
+	{ 161, 140 },
+	{ 160, 116 },
+	{ 34, 119 },
+	{ 166, 105 },
+	{ 260, 126 },
+	{ 37, 107 },
+	{ 78, 139 },
+	{ 0, 0 },
+	{ 13, 112 },
+	{ 0, 0 },
+	{ 16, 122 },
+	{ 33, 126 },
+	{ 10, 160 },
+	{ 150, 102 },
+	{ 134, 160 },
+	{ 160, 76 },
+	{ 0, 0 },
+	{ 0, 0 },
+	{ 36, 116 },
+	{ 214, 113 },
+	{ 30, 127 },
+	{ 143, 131 },
+	{ 163, 103 },
+	{ 254, 106 },
+	{ 28, 161 },
+	{ 11, 164 },
+	{ 276, 134 },
+	{ 93, 118 },
+	{ 22, 150 },
+	{ 282, 156 },
+	{ 149, 92 },
+	{ 0, 0 },
+	{ 43, 410 },
+	{ 0, 0 },
+	{ 10, 136 },
+	{ 41, 100 },
+	{ 157, 97 },
+	{ -1, 5 },
+	{ -1, 4 },
+	{ -1, 10 },
+	{ -1, 7 },
+	{ -1, 3 },
+	{ -1, 8 },
+	{ -1, 6 },
+	{ -1, 20 },
+	{ -1, 18 },
+	{ -1, 19 },
+	{ -1, 21 }
+};
+
+const char *const INVENTORY_NAMES[] = {
+	"CAMERA", "LENS", "PHOTOS", "MAIL", "GUN", "CASH", "COMLINK", "AMMO",
+	"LOCKPICK KIT", "EARRING", "RECIEPTS", "PAPER", "LADDER", "BOOTS",
+	"DOCUMENTS", "KNIFE", "DAGGER", "KEYS", "ROCK", "LOG", "SHOVEL",
+	"STONE", "REMOTE CONTROL", "FOOD AND WATER", "DOOR CARD KEY",
+	"FLASHLIGHT", "INTERLOCK KEY", "TOOLS", "REBREATHER", "JET PACK",
+	"ROD", "HCL2", "SAFE CARD KEY", "TUNING FORK", "STONE", "ROSE",
+	"KEY", "NOTE", "ALLEN WRENCH", "HOVER BOARD", "BLUE PRINTS",
+	"LETTER", "MEMORANDUM", "MARKERS", "FILM", "ANDRETTI FILM",
+	"GLASSES", "AMULET", "FACIAL KIT", "CAT FOOD", "MONKEY WRENCH",
+	"BIG DICK CARD", "BRA", "BOLT"
+};
+
+const byte ROOM_TABLE1[] = {
+	0x00, 0x2f, 0x00, 0x0d, 0x00, 0x30, 0x22, 0x30, 0x01, 0x00,
+	0x00, 0x00, 0x01, 0x01, 0x00, 0x03, 0x00, 0xff, 0x01, 0x00,
+	0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xc0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE2[] = {
+	0x00, 0x2f, 0x00, 0x0d, 0x00, 0x32, 0x28, 0x25, 0x02, 0x00,
+	0x00, 0x00, 0x02, 0x02, 0x00, 0x03, 0x00, 0xff, 0x02, 0x00,
+	0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x06, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE3[] = {
+	0x00, 0x2f, 0x00, 0x0f, 0x00, 0x1e, 0x19, 0x24, 0x03, 0x00,
+	0x00, 0x00, 0x03, 0x03, 0x00, 0x03, 0x00, 0xff, 0x03, 0x00,
+	0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x78, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x02, 0x00,
+	0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x05, 0x00,
+	0x01, 0x00, 0x03, 0x00, 0x06, 0x00, 0x01, 0x00, 0x2e, 0x00,
+	0x01, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE4[] = {
+	0x00, 0x2f, 0x00, 0x06, 0x00, 0x36, 0x27, 0x32, 0x04, 0x00,
+	0x00, 0x00, 0x04, 0x04, 0x00, 0x03, 0x00, 0xff, 0x04, 0x00,
+	0x02, 0x00, 0x04, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x05, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE5[] = {
+	0x00, 0x2f, 0x00, 0x00, 0x00, 0x28, 0x19, 0x36, 0x05, 0x00,
+	0x00, 0x00, 0x05, 0x05, 0x00, 0x03, 0x00, 0xff, 0x05, 0x00,
+	0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0xa0, 0x20, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x02, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE6[] = {
+	0x00, 0x2f, 0x00, 0x07, 0x00, 0x40, 0x36, 0x36, 0x06, 0x00,
+	0x00, 0x00, 0x06, 0x06, 0x00, 0x03, 0x00, 0xff, 0x06, 0x00,
+	0x02, 0x00, 0x06, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x13, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x08, 0x00,
+	0x01, 0x00, 0x2e, 0x00, 0x14, 0x00, 0x01, 0x00, 0x2e, 0x00,
+	0x07, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE7[] = {
+	0x00, 0x2f, 0x00, 0x0e, 0x00, 0x40, 0x32, 0x3b, 0x07, 0x00,
+	0x00, 0x00, 0x07, 0x07, 0x00, 0x03, 0x00, 0xff, 0x07, 0x00,
+	0x02, 0x00, 0x07, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x14, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE8[] = {
+	0x00, 0x2f, 0x00, 0x0a, 0x00, 0x30, 0x22, 0x46, 0x08, 0x00,
+	0x00, 0x00, 0x08, 0x08, 0x00, 0x03, 0x00, 0xff, 0x08, 0x00,
+	0x02, 0x00, 0x08, 0x00, 0x01, 0x00, 0xc0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xff, 0xff,
+};
+const byte ROOM_TABLE9[] = {
+	0x00, 0x2f, 0x00, 0x07, 0x00, 0x32, 0x0c, 0x29, 0x09, 0x00,
+	0x00, 0x00, 0x09, 0x09, 0x00, 0x03, 0x00, 0xff, 0x09, 0x00,
+	0x02, 0x00, 0x09, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xff, 0xff,
+};
+const byte ROOM_TABLE11[] = {
+	0x00, 0x2f, 0x00, 0x00, 0x00, 0x40, 0x3a, 0x22, 0x0b, 0x00,
+	0x00, 0x00, 0x0b, 0x0b, 0x00, 0x03, 0x00, 0xff, 0x0b, 0x00,
+	0x02, 0x00, 0x0b, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xff, 0xff,
+};
+const byte ROOM_TABLE13[] = {
+	0x00, 0x2f, 0x00, 0x0c, 0x00, 0x40, 0x36, 0x2c, 0x0d, 0x00,
+	0x00, 0x00, 0x0d, 0x0d, 0x00, 0x03, 0x00, 0xff, 0x0d, 0x00,
+	0x02, 0x00, 0x0d, 0x00, 0x01, 0x00, 0xe6, 0x40, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0x2e, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x2e, 0x00,
+	0x15, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE14[] = {
+	0x00, 0x2f, 0x00, 0x05, 0x00, 0x40, 0x3e, 0x33, 0x0e, 0x00,
+	0x00, 0x00, 0x0e, 0x0e, 0x00, 0x03, 0x00, 0xff, 0x0e, 0x00,
+	0x02, 0x00, 0x0e, 0x00, 0x01, 0x00, 0xfe, 0x40, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x09, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0x2e, 0x00, 0x13, 0x00, 0x01, 0x00, 0x2e, 0x00,
+	0x0a, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE15[] = {
+	0x00, 0x2f, 0x00, 0x0c, 0x00, 0x28, 0x0c, 0x5e, 0x0f, 0x00,
+	0x00, 0x00, 0x0f, 0x0f, 0x00, 0x03, 0x00, 0xff, 0x0f, 0x00,
+	0x02, 0x00, 0x0f, 0x00, 0x01, 0x00, 0xb4, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x11, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE16[] = {
+	0x00, 0x2f, 0x00, 0x05, 0x00, 0x28, 0x1e, 0x24, 0x10, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x00, 0x03, 0x00, 0xff, 0x10, 0x00,
+	0x02, 0x00, 0x10, 0x00, 0x01, 0x00, 0xa0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE17[] = {
+	0x00, 0x2f, 0x00, 0x06, 0x00, 0x28, 0x19, 0x2b, 0x11, 0x00,
+	0x00, 0x00, 0x11, 0x11, 0x00, 0x03, 0x00, 0xff, 0x11, 0x00,
+	0x02, 0x00, 0x11, 0x00, 0x01, 0x00, 0xa0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE18[] = {
+	0x00, 0x2f, 0x00, 0x00, 0x00, 0x2d, 0x14, 0x3c, 0x12, 0x00,
+	0x00, 0x00, 0x12, 0x12, 0x00, 0x03, 0x00, 0xff, 0x12, 0x00,
+	0x02, 0x00, 0x12, 0x00, 0x01, 0x00, 0xb1, 0x40, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE21[] = {
+	0x00, 0x2f, 0x00, 0x07, 0x00, 0x3c, 0x2a, 0x29, 0x15, 0x00,
+	0x00, 0x00, 0x15, 0x15, 0x00, 0x03, 0x00, 0xff, 0x15, 0x00,
+	0x02, 0x00, 0x15, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x12, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE22[] = {
+	0x00, 0x2f, 0x00, 0x0a, 0x00, 0x40, 0x2d, 0x27, 0x16, 0x00,
+	0x00, 0x00, 0x16, 0x16, 0x00, 0x03, 0x00, 0xff, 0x16, 0x00,
+	0x02, 0x00, 0x16, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x16, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE23[] = {
+	0x00, 0x2f, 0x00, 0x0a, 0x00, 0x40, 0x38, 0x24, 0x17, 0x00,
+	0x00, 0x00, 0x17, 0x17, 0x00, 0x03, 0x00, 0xff, 0x17, 0x00,
+	0x02, 0x00, 0x17, 0x00, 0x01, 0x00, 0xfe, 0x40, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x17, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE24[] = {
+	0x00, 0x2f, 0x00, 0x06, 0x00, 0x3e, 0x10, 0x62, 0x18, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x00, 0x03, 0x00, 0xff, 0x18, 0x00,
+	0x02, 0x00, 0x18, 0x00, 0x01, 0x00, 0xf8, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x16, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE25[] = {
+	0x00, 0x2f, 0x00, 0x0e, 0x00, 0x3e, 0x37, 0x19, 0x19, 0x00,
+	0x00, 0x00, 0x19, 0x19, 0x00, 0x03, 0x00, 0xff, 0x19, 0x00,
+	0x02, 0x00, 0x19, 0x00, 0x01, 0x00, 0xf8, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x10, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE26[] = {
+	0x00, 0x2f, 0x00, 0x06, 0x00, 0x34, 0x28, 0x28, 0x1a, 0x00,
+	0x00, 0x00, 0x1a, 0x1a, 0x00, 0x03, 0x00, 0xff, 0x1a, 0x00,
+	0x02, 0x00, 0x1a, 0x00, 0x01, 0x00, 0xd0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE27[] = {
+	0x00, 0x2f, 0x00, 0x0f, 0x00, 0x1b, 0x16, 0x18, 0x1b, 0x00,
+	0x00, 0x00, 0x1b, 0x1b, 0x00, 0x03, 0x00, 0xff, 0x1b, 0x00,
+	0x02, 0x00, 0x1b, 0x00, 0x01, 0x00, 0x70, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE28[] = {
+	0x00, 0x2f, 0x00, 0x09, 0x00, 0x25, 0x10, 0x43, 0x1c, 0x00,
+	0x00, 0x00, 0x1c, 0x1c, 0x00, 0x03, 0x00, 0xff, 0x1c, 0x00,
+	0x02, 0x00, 0x1c, 0x00, 0x01, 0x00, 0x94, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xff, 0xff,
+};
+const byte ROOM_TABLE29[] = {
+	0x00, 0x2f, 0x00, 0x0a, 0x00, 0x20, 0x18, 0x56, 0x1d, 0x00,
+	0x00, 0x00, 0x1d, 0x1d, 0x00, 0x03, 0x00, 0xff, 0x1d, 0x00,
+	0x02, 0x00, 0x1d, 0x00, 0x01, 0x00, 0x80, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x17, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x10, 0x00,
+	0x02, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE30[] = {
+	0x00, 0x2f, 0x00, 0x07, 0x00, 0x3f, 0x1c, 0x27, 0x1e, 0x00,
+	0x00, 0x00, 0x1e, 0x1e, 0x00, 0x03, 0x00, 0xff, 0x1e, 0x00,
+	0x02, 0x00, 0x1e, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0x1e, 0x00, 0x04, 0x00, 0xff, 0xff, 0x2e, 0x00,
+	0x00, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x15, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE31[] = {
+	0x00, 0x2f, 0x00, 0x0d, 0x00, 0x32, 0x2e, 0x69, 0x1f, 0x00,
+	0x00, 0x00, 0x1f, 0x1f, 0x00, 0x03, 0x00, 0xff, 0x1f, 0x00,
+	0x02, 0x00, 0x1f, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xff, 0xff,
+};
+const byte ROOM_TABLE32[] = {
+	0x00, 0x2f, 0x00, 0x07, 0x00, 0x40, 0x3b, 0x4b, 0x20, 0x00,
+	0x00, 0x00, 0x20, 0x20, 0x00, 0x03, 0x00, 0xff, 0x20, 0x00,
+	0x02, 0x00, 0x20, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE33[] = {
+	0x00, 0x2f, 0x00, 0x0b, 0x00, 0x30, 0x10, 0x51, 0x21, 0x00,
+	0x00, 0x00, 0x21, 0x21, 0x00, 0x03, 0x00, 0xff, 0x21, 0x00,
+	0x02, 0x00, 0x21, 0x00, 0x01, 0x00, 0xc0, 0x40, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xff, 0xff,
+};
+const byte ROOM_TABLE35[] = {
+	0x00, 0x2f, 0x00, 0x0f, 0x00, 0x1e, 0x18, 0x25, 0x23, 0x00,
+	0x00, 0x00, 0x23, 0x23, 0x00, 0x03, 0x00, 0xff, 0x23, 0x00,
+	0x02, 0x00, 0x23, 0x00, 0x01, 0x00, 0x78, 0x18, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00,
+	0x01, 0x00, 0x2e, 0x00, 0x16, 0x00, 0x01, 0x00, 0x2e, 0x00,
+	0x0c, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE37[] = {
+	0x00, 0x2f, 0x00, 0x0f, 0x00, 0x3f, 0x3a, 0x1a, 0x25, 0x00,
+	0x00, 0x00, 0x25, 0x25, 0x00, 0x03, 0x00, 0xff, 0x25, 0x00,
+	0x02, 0x00, 0x25, 0x00, 0x01, 0x00, 0xfe, 0x40, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x0d, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE38[] = {
+	0x00, 0x2f, 0x00, 0x0d, 0x00, 0x40, 0x32, 0x32, 0x26, 0x00,
+	0x00, 0x00, 0x26, 0x26, 0x00, 0x03, 0x00, 0xff, 0x26, 0x00,
+	0x02, 0x00, 0x26, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x0b, 0x00, 0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE39[] = {
+	0x00, 0x2f, 0x00, 0x0a, 0x00, 0x3c, 0x10, 0x4c, 0x27, 0x00,
+	0x00, 0x00, 0x27, 0x27, 0x00, 0x03, 0x00, 0xff, 0x27, 0x00,
+	0x02, 0x00, 0x27, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x2e, 0x00, 0x11, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x0f, 0x00,
+	0x01, 0x00, 0xff, 0xff,
+};
+const byte ROOM_TABLE47[] = {
+	0x00, 0x2f, 0x00, 0x06, 0x00, 0x28, 0x1e, 0x32, 0x2b, 0x00,
+	0x00, 0x00, 0x46, 0x2b, 0x00, 0x03, 0x00, 0xff, 0x2b, 0x00,
+	0x02, 0x00, 0x2b, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0x2b, 0x00, 0x04, 0x00, 0xff, 0xff, 0x2e, 0x00,
+	0x04, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00,
+};
+const byte *ROOM_TABLE[] = {
+	nullptr, ROOM_TABLE1, ROOM_TABLE2, ROOM_TABLE3, ROOM_TABLE4, ROOM_TABLE5, ROOM_TABLE6,
+	ROOM_TABLE7, ROOM_TABLE8, ROOM_TABLE9, nullptr, ROOM_TABLE11, nullptr, ROOM_TABLE13,
+	ROOM_TABLE14, ROOM_TABLE15, ROOM_TABLE16, ROOM_TABLE17, ROOM_TABLE18, nullptr, nullptr,
+	ROOM_TABLE21, ROOM_TABLE22, ROOM_TABLE23, ROOM_TABLE24, ROOM_TABLE25, ROOM_TABLE26, ROOM_TABLE27,
+	ROOM_TABLE28, ROOM_TABLE29, ROOM_TABLE30, ROOM_TABLE31, ROOM_TABLE32, ROOM_TABLE33, nullptr,
+	ROOM_TABLE35, nullptr, ROOM_TABLE37, ROOM_TABLE38, ROOM_TABLE39, nullptr, nullptr,
+	nullptr, nullptr, nullptr, nullptr, nullptr, ROOM_TABLE47
+};
+
+const byte CHAR_TABLE0[] = {
+	0x02, 0x31, 0x00, 0x08, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE2[] = {
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x32, 0x33, 0x00, 0x01, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x33, 0x00, 0x00, 0x00, 0x33,
+	0x00, 0x02, 0x00, 0x33, 0x00, 0x0b, 0x00, 0x33, 0x00, 0x03,
+	0x00, 0x33, 0x00, 0x0c, 0x00, 0x33, 0x00, 0x04, 0x00, 0x33,
+	0x00, 0x0d, 0x00, 0x33, 0x00, 0x05, 0x00, 0x33, 0x00, 0x0e,
+	0x00, 0x33, 0x00, 0x06, 0x00, 0x33, 0x00, 0x0f, 0x00, 0x33,
+	0x00, 0x07, 0x00, 0x33, 0x00, 0x10, 0x00, 0x33, 0x00, 0x08,
+	0x00, 0x33, 0x00, 0x11, 0x00, 0x33, 0x00, 0x09, 0x00, 0x33,
+	0x00, 0x12, 0x00, 0x33, 0x00, 0x0a, 0x00, 0x33, 0x00, 0x13,
+	0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE3[] = {
+	0x02, 0x31, 0x00, 0x03, 0x00, 0x35, 0x00, 0x37, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x4b, 0x37, 0x00, 0x01, 0x00,
+	0xff, 0x37, 0x00, 0x03, 0x00, 0x37, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE4[] = {
+	0x01, 0x31, 0x00, 0x0a, 0x00, 0x36, 0x00, 0x35, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x49, 0x35, 0x00, 0x01, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x35, 0x00, 0x00, 0x00, 0x35,
+	0x00, 0x03, 0x00, 0x35, 0x00, 0x0c, 0x00, 0x35, 0x00, 0x04,
+	0x00, 0x35, 0x00, 0x0d, 0x00, 0x35, 0x00, 0x05, 0x00, 0x35,
+	0x00, 0x0e, 0x00, 0x35, 0x00, 0x06, 0x00, 0x35, 0x00, 0x0f,
+	0x00, 0x35, 0x00, 0x07, 0x00, 0x35, 0x00, 0x10, 0x00, 0x35,
+	0x00, 0x08, 0x00, 0x35, 0x00, 0x11, 0x00, 0x35, 0x00, 0x09,
+	0x00, 0x35, 0x00, 0x12, 0x00, 0x35, 0x00, 0x0a, 0x00, 0x35,
+	0x00, 0x13, 0x00, 0x35, 0x00, 0x0b, 0x00, 0x35, 0x00, 0x14,
+	0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE5[] = {
+	0x01, 0x31, 0x00, 0x08, 0x00, 0x37, 0x00, 0x34, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x48, 0x34, 0x00, 0x01, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x34, 0x00, 0x00, 0x00, 0x43,
+	0x00, 0x00, 0x00, 0x34, 0x00, 0x03, 0x00, 0x43, 0x00, 0x01,
+	0x00, 0x34, 0x00, 0x04, 0x00, 0x43, 0x00, 0x02, 0x00, 0x34,
+	0x00, 0x05, 0x00, 0x43, 0x00, 0x03, 0x00, 0x34, 0x00, 0x06,
+	0x00, 0x43, 0x00, 0x04, 0x00, 0x34, 0x00, 0x07, 0x00, 0x43,
+	0x00, 0x05, 0x00, 0x34, 0x00, 0x08, 0x00, 0x43, 0x00, 0x06,
+	0x00, 0x34, 0x00, 0x09, 0x00, 0x43, 0x00, 0x07, 0x00, 0x34,
+	0x00, 0x0a, 0x00, 0x43, 0x00, 0x08, 0x00, 0x34, 0x00, 0x0b,
+	0x00, 0x43, 0x00, 0x09, 0x00, 0x34, 0x00, 0x0c, 0x00, 0x43,
+	0x00, 0x0a, 0x00, 0x34, 0x00, 0x0d, 0x00, 0x43, 0x00, 0x0b,
+	0x00, 0x34, 0x00, 0x0e, 0x00, 0x43, 0x00, 0x0c, 0x00, 0x34,
+	0x00, 0x0f, 0x00, 0x43, 0x00, 0x0d, 0x00, 0x34, 0x00, 0x10,
+	0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE6[] = {
+	0x02, 0x31, 0x00, 0x03, 0x00, 0x38, 0x00, 0x44, 0x00, 0x03,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x4e, 0x44, 0x00, 0x01, 0x00,
+	0xff, 0x44, 0x00, 0x02, 0x00, 0x44, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE7[] = {
+	0x02, 0x31, 0x00, 0x01, 0x00, 0x39, 0x00, 0x38, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x4c, 0x38, 0x00, 0x01, 0x00,
+	0xff, 0x38, 0x00, 0x03, 0x00, 0x38, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE8[] = {
+	0x03, 0xff, 0xff, 0xff, 0xff, 0x3a, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x3b, 0x00, 0x01, 0x00,
+	0xff, 0x3b, 0x00, 0x02, 0x00, 0x3b, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE9[] = {
+	0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x59, 0x4a, 0x00, 0x01, 0x00,
+	0xff, 0x4a, 0x00, 0x02, 0x00, 0x4a, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE10[] = {
+	0x01, 0x31, 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x36, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x4a, 0x36, 0x00, 0x01, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x36, 0x00, 0x00, 0x00, 0x36,
+	0x00, 0x03, 0x00, 0x36, 0x00, 0x13, 0x00, 0x36, 0x00, 0x04,
+	0x00, 0x36, 0x00, 0x14, 0x00, 0x36, 0x00, 0x05, 0x00, 0x36,
+	0x00, 0x15, 0x00, 0x36, 0x00, 0x06, 0x00, 0x36, 0x00, 0x16,
+	0x00, 0x36, 0x00, 0x07, 0x00, 0x36, 0x00, 0x17, 0x00, 0x36,
+	0x00, 0x08, 0x00, 0x36, 0x00, 0x18, 0x00, 0x36, 0x00, 0x09,
+	0x00, 0x36, 0x00, 0x19, 0x00, 0x36, 0x00, 0x0a, 0x00, 0x36,
+	0x00, 0x1a, 0x00, 0x36, 0x00, 0x0b, 0x00, 0x36, 0x00, 0x1b,
+	0x00, 0x36, 0x00, 0x0c, 0x00, 0x36, 0x00, 0x1c, 0x00, 0x36,
+	0x00, 0x0d, 0x00, 0x36, 0x00, 0x1d, 0x00, 0x36, 0x00, 0x0e,
+	0x00, 0x36, 0x00, 0x1e, 0x00, 0x36, 0x00, 0x0f, 0x00, 0x36,
+	0x00, 0x1f, 0x00, 0x36, 0x00, 0x10, 0x00, 0x36, 0x00, 0x20,
+	0x00, 0x36, 0x00, 0x11, 0x00, 0x36, 0x00, 0x21, 0x00, 0x36,
+	0x00, 0x12, 0x00, 0x36, 0x00, 0x22, 0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE11[] = {
+	0x03, 0xff, 0xff, 0xff, 0xff, 0x3d, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x55, 0x45, 0x00, 0x01, 0x00,
+	0xff, 0x45, 0x00, 0x02, 0x00, 0x45, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE12[] = {
+	0x03, 0xff, 0xff, 0xff, 0xff, 0x3e, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0x00, 0x01, 0x00,
+	0xff, 0x40, 0x00, 0x02, 0x00, 0x40, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE13[] = {
+	0x00, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x46, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x56, 0x46, 0x00, 0x01, 0x00,
+	0xff, 0x46, 0x00, 0x03, 0x00, 0x46, 0x00, 0x00, 0x00, 0x46,
+	0x00, 0x04, 0x00, 0x46, 0x00, 0x0d, 0x00, 0x46, 0x00, 0x05,
+	0x00, 0x46, 0x00, 0x0e, 0x00, 0x46, 0x00, 0x06, 0x00, 0x46,
+	0x00, 0x0f, 0x00, 0x46, 0x00, 0x07, 0x00, 0x46, 0x00, 0x10,
+	0x00, 0x46, 0x00, 0x08, 0x00, 0x46, 0x00, 0x11, 0x00, 0x46,
+	0x00, 0x09, 0x00, 0x46, 0x00, 0x12, 0x00, 0x46, 0x00, 0x0a,
+	0x00, 0x46, 0x00, 0x13, 0x00, 0x46, 0x00, 0x0b, 0x00, 0x46,
+	0x00, 0x14, 0x00, 0x46, 0x00, 0x0c, 0x00, 0x46, 0x00, 0x15,
+	0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE15[] = {
+	0x00, 0xff, 0xff, 0xff, 0xff, 0x41, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x57, 0x47, 0x00, 0x01, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x47, 0x00, 0x00, 0x00, 0x47,
+	0x00, 0x02, 0x00, 0x47, 0x00, 0x05, 0x00, 0x47, 0x00, 0x03,
+	0x00, 0x47, 0x00, 0x06, 0x00, 0x47, 0x00, 0x04, 0x00, 0x47,
+	0x00, 0x07, 0x00, 0xff, 0xff,
+};
+const byte CHAR_TABLE16[] = {
+	0x03, 0xff, 0xff, 0xff, 0xff, 0x42, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x54, 0x41, 0x00, 0x01, 0x00,
+	0xff, 0x41, 0x00, 0x02, 0x00, 0x41, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE18[] = {
+	0x02, 0x31, 0x00, 0x07, 0x00, 0x44, 0x00, 0x3c, 0x00, 0x03,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x50, 0x3c, 0x00, 0x01, 0x00,
+	0xff, 0x3c, 0x00, 0x02, 0x00, 0x3c, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE19[] = {
+	0x02, 0x31, 0x00, 0x07, 0x00, 0x45, 0x00, 0x3d, 0x00, 0x03,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x51, 0x3d, 0x00, 0x01, 0x00,
+	0xff, 0x3d, 0x00, 0x02, 0x00, 0x3d, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE20[] = {
+	0x02, 0x31, 0x00, 0x02, 0x00, 0x46, 0x00, 0x48, 0x00, 0x02,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x58, 0x48, 0x00, 0x01, 0x00,
+	0xff, 0x48, 0x00, 0x03, 0x00, 0x48, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE21[] = {
+	0x02, 0x31, 0x00, 0x07, 0x00, 0x47, 0x00, 0x3e, 0x00, 0x03,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x52, 0x3e, 0x00, 0x01, 0x00,
+	0xff, 0x3e, 0x00, 0x02, 0x00, 0x3e, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE23[] = {
+	0x02, 0x31, 0x00, 0x08, 0x00, 0x49, 0x00, 0x3f, 0x00, 0x03,
+	0x00, 0x80, 0x00, 0xf7, 0x00, 0x53, 0x3f, 0x00, 0x01, 0x00,
+	0xff, 0x3f, 0x00, 0x02, 0x00, 0x3f, 0x00, 0x00, 0x00, 0xff,
+	0xff,
+};
+const byte CHAR_TABLE24[] = {
+	0x02, 0x32, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x47, 0x32, 0x00, 0x02, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x32, 0x00, 0x01, 0x00, 0x32,
+	0x00, 0x03, 0x00, 0x32, 0x00, 0x0a, 0x00, 0x32, 0x00, 0x04,
+	0x00, 0x32, 0x00, 0x0b, 0x00, 0x32, 0x00, 0x05, 0x00, 0x32,
+	0x00, 0x0c, 0x00, 0x32, 0x00, 0x06, 0x00, 0x32, 0x00, 0x0d,
+	0x00, 0x32, 0x00, 0x07, 0x00, 0x32, 0x00, 0x0e, 0x00, 0x32,
+	0x00, 0x08, 0x00, 0x32, 0x00, 0x0f, 0x00, 0x32, 0x00, 0x09,
+	0x00, 0x32, 0x00, 0x10, 0x00, 0xff, 0xff
+};
+const byte CHAR_TABLE25[] = {
+	0x02, 0x39, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x39, 0x00, 0x00, 0x00, 0x39, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xFF, 0xFF
+};
+const byte CHAR_TABLE26[] = {
+	0x01, 0x3a, 0x00, 0x01, 0x00, 0x0a, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x3a, 0x00, 0x02, 0x00,
+	0xff, 0x3a, 0x00, 0x03, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x42,
+	0x00, 0x00, 0x00, 0x3a, 0x00, 0x04, 0x00, 0x42, 0x00, 0x01,
+	0x00, 0x3a, 0x00, 0x05, 0x00, 0x42, 0x00, 0x02, 0x00, 0x3a,
+	0x00, 0x06, 0x00, 0x42, 0x00, 0x03, 0x00, 0x3a, 0x00, 0x07,
+	0x00, 0x42, 0x00, 0x04, 0x00, 0x3a, 0x00, 0x08, 0x00, 0x42,
+	0x00, 0x05, 0x00, 0x3a, 0x00, 0x09, 0x00, 0x42, 0x00, 0x06,
+	0x00, 0x3a, 0x00, 0x0a, 0x00, 0x42, 0x00, 0x07, 0x00, 0x3a,
+	0x00, 0x0b, 0x00, 0x42, 0x00, 0x08, 0x00, 0x3a, 0x00, 0x0c,
+	0x00, 0x42, 0x00, 0x09, 0x00, 0x3a, 0x00, 0x0d, 0x00, 0x42,
+	0x00, 0x0a, 0x00, 0x3a, 0x00, 0x0e, 0x00, 0x42, 0x00, 0x0b,
+	0x00, 0x3a, 0x00, 0x0f, 0x00, 0x42, 0x00, 0x0c, 0x00, 0x3a,
+	0x00, 0x10, 0x00, 0x42, 0x00, 0x0d, 0x00, 0x3a, 0x00, 0x11,
+	0x00, 0x42, 0x00, 0x0e, 0x00, 0x3a, 0x00, 0x12, 0x00, 0x42,
+	0x00, 0x0f, 0x00, 0x3a, 0x00, 0x13, 0x00, 0x42, 0x00, 0x10,
+	0x00, 0x3a, 0x00, 0x14, 0x00, 0x42, 0x00, 0x11, 0x00, 0x3a,
+	0x00, 0x15, 0x00, 0xff, 0xff
+};
+const byte CHAR_TABLE27[] = {
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x58, 0x49, 0x00, 0x01, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x49, 0x00, 0x00, 0x00, 0x49,
+	0x00, 0x02, 0x00, 0x49, 0x00, 0x0a, 0x00, 0x49, 0x00, 0x03,
+	0x00, 0x49, 0x00, 0x0b, 0x00, 0x49, 0x00, 0x04, 0x00, 0x49,
+	0x00, 0x0c, 0x00, 0x49, 0x00, 0x05, 0x00, 0x49, 0x00, 0x0d,
+	0x00, 0x49, 0x00, 0x06, 0x00, 0x49, 0x00, 0x0e, 0x00, 0x49,
+	0x00, 0x07, 0x00, 0x49, 0x00, 0x0f, 0x00, 0x49, 0x00, 0x08,
+	0x00, 0x49, 0x00, 0x10, 0x00, 0x49, 0x00, 0x09, 0x00, 0x49,
+	0x00, 0x11, 0x00, 0xff, 0xff,
+};
+const byte *CHAR_TABLE[] = {
+	CHAR_TABLE0, nullptr, CHAR_TABLE2, CHAR_TABLE3, CHAR_TABLE4, CHAR_TABLE5,
+	CHAR_TABLE6, CHAR_TABLE7, CHAR_TABLE8, CHAR_TABLE9, CHAR_TABLE10,
+	CHAR_TABLE11, CHAR_TABLE12, CHAR_TABLE13, nullptr, CHAR_TABLE15, 
+	CHAR_TABLE16, nullptr, CHAR_TABLE18, CHAR_TABLE19, CHAR_TABLE20, 
+	CHAR_TABLE21, nullptr, CHAR_TABLE23, CHAR_TABLE24, CHAR_TABLE25, 
+	CHAR_TABLE26, CHAR_TABLE27
+};
+
+} // End of namespace Martian
+
+} // End of namespace Access
diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h
new file mode 100644
index 0000000000..a6ababeec3
--- /dev/null
+++ b/engines/access/martian/martian_resources.h
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_MARTIAN_RESOURCES_H
+#define ACCESS_MARTIAN_RESOURCES_H
+
+#include "common/scummsys.h"
+
+namespace Access {
+
+namespace Martian {
+
+extern const char *const FILENAMES[];
+
+extern const byte *CURSORS[4];
+
+extern const int TRAVEL_POS[][2];
+
+extern const char *const INVENTORY_NAMES[];
+
+extern const byte *ROOM_TABLE[];
+
+extern const byte *CHAR_TABLE[];
+
+} // End of namespace Martian
+
+} // End of namespace Access
+
+#endif /* ACCESS_MARTIAN_RESOURCES_H */
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
new file mode 100644
index 0000000000..80eaf59fec
--- /dev/null
+++ b/engines/access/martian/martian_room.cpp
@@ -0,0 +1,139 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/resources.h"
+#include "access/martian/martian_game.h"
+#include "access/martian/martian_resources.h"
+#include "access/martian/martian_room.h"
+
+namespace Access {
+
+namespace Martian {
+
+MartianRoom::MartianRoom(AccessEngine *vm): Room(vm) {
+	_game = (MartianEngine *)vm;
+}
+
+MartianRoom::~MartianRoom() {
+}
+
+void MartianRoom::loadRoom(int roomNumber) {
+	loadRoomData(ROOM_TABLE[roomNumber]);
+}
+
+void MartianRoom::reloadRoom() {
+	loadRoom(_vm->_player->_roomNumber);
+
+	if (_roomFlag != 1) {
+		_vm->_currentMan = _roomFlag;
+		_vm->_currentManOld = _roomFlag;
+		_vm->_manScaleOff = 0;
+		
+		switch (_vm->_currentMan) {
+		case 0:
+			_vm->_player->loadSprites("MAN.LZ");
+			break;
+
+		case 2:
+			_vm->_player->loadSprites("JMAN.LZ");
+			break;
+
+		case 3:
+			_vm->_player->loadSprites("OVERHEAD.LZ");
+			_vm->_manScaleOff = 1;
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	reloadRoom1();
+}
+
+void MartianRoom::reloadRoom1() {
+	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
+			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
+		_vm->_inactive = _vm->_files->loadFile("MAYA.LZ");
+		_vm->_currentCharFlag = false;
+	}
+
+	_selectCommand = -1;
+	_vm->_normalMouse = 1;
+	_vm->_mouseMode = 0;
+	_vm->_boxSelect = true;
+	_vm->_player->_playerOff = false;
+
+	_vm->_screen->fadeOut();
+	_vm->_screen->clearScreen();
+	roomSet();
+
+	// TODO: Refactor
+
+	_vm->_screen->setBufferScan();
+	setupRoom();
+	setWallCodes();
+	buildScreen();
+
+	if (!_vm->_screen->_vesaMode) {
+		_vm->copyBF2Vid();
+	} else if (_vm->_player->_roomNumber != 20 && _vm->_player->_roomNumber != 24
+			&& _vm->_player->_roomNumber != 33) {
+		_vm->_screen->setPalette();
+		_vm->copyBF2Vid();
+	}
+
+	_vm->_player->_frame = 0;
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+}
+
+void MartianRoom::roomSet() {
+	_vm->_numAnimTimers = 0;
+	_vm->_scripts->_sequence = 1000;
+	_vm->_scripts->searchForSequence();
+	_vm->_scripts->executeScript();
+}
+
+void MartianRoom::roomMenu() {
+	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
+	delete[] iconData;
+
+	_vm->_screen->saveScreen();
+	_vm->_screen->setDisplayScan();
+	_vm->_destIn = _vm->_screen;	// TODO: Redundant
+	_vm->_screen->plotImage(spr, 0, Common::Point(0, 177));
+	_vm->_screen->plotImage(spr, 1, Common::Point(143, 177));
+
+	_vm->_screen->restoreScreen();
+	delete spr;
+}
+
+void MartianRoom::mainAreaClick() {
+}
+
+} // End of namespace Martian
+
+} // End of namespace Access
diff --git a/engines/access/martian/martian_room.h b/engines/access/martian/martian_room.h
new file mode 100644
index 0000000000..526de56240
--- /dev/null
+++ b/engines/access/martian/martian_room.h
@@ -0,0 +1,62 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_MARTIAN_ROOM_H
+#define ACCESS_MARTIAN_ROOM_H
+
+#include "common/scummsys.h"
+#include "access/room.h"
+
+namespace Access {
+
+class AccessEngine;
+
+namespace Martian {
+
+class MartianEngine;
+
+class MartianRoom : public Room {
+private:
+	MartianEngine *_game;
+
+	void roomSet();
+protected:
+	virtual void loadRoom(int roomNumber);
+
+	virtual void reloadRoom();
+
+	virtual void reloadRoom1();
+
+	virtual void roomMenu();
+
+	virtual void mainAreaClick();
+public:
+	MartianRoom(AccessEngine *vm);
+
+	virtual ~MartianRoom();
+};
+
+} // End of namespace Martian
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_ROOM_H */
diff --git a/engines/access/martian/martian_scripts.cpp b/engines/access/martian/martian_scripts.cpp
new file mode 100644
index 0000000000..0578872092
--- /dev/null
+++ b/engines/access/martian/martian_scripts.cpp
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/martian/martian_game.h"
+#include "access/martian/martian_resources.h"
+#include "access/martian/martian_scripts.h"
+
+namespace Access {
+
+namespace Martian {
+
+MartianScripts::MartianScripts(AccessEngine *vm) : Scripts(vm) {
+	_game = (MartianEngine *)_vm;
+}
+
+void MartianScripts::executeSpecial(int commandIndex, int param1, int param2) {
+}
+
+typedef void(MartianScripts::*MartianScriptMethodPtr)();
+
+void MartianScripts::executeCommand(int commandIndex) {
+	Scripts::executeCommand(commandIndex);
+}
+
+} // End of namespace Martian
+
+} // End of namespace Access
diff --git a/engines/access/martian/martian_scripts.h b/engines/access/martian/martian_scripts.h
new file mode 100644
index 0000000000..9f90643e22
--- /dev/null
+++ b/engines/access/martian/martian_scripts.h
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_MARTIAN_SCRIPTS_H
+#define ACCESS_MARTIAN_SCRIPTS_H
+
+#include "common/scummsys.h"
+#include "access/scripts.h"
+
+namespace Access {
+
+namespace Martian {
+
+class MartianEngine;
+
+class MartianScripts: public Scripts {
+private:
+	MartianEngine *_game;
+protected:
+	virtual void executeSpecial(int commandIndex, int param1, int param2);
+	virtual void executeCommand(int commandIndex);
+public:
+	MartianScripts(AccessEngine *vm);
+};
+
+} // End of namespace Martian
+
+} // End of namespace Access
+
+#endif /* ACCESS_MARTIAN_SCRIPTS_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index d74892c241..46f96693fa 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -21,7 +21,11 @@ MODULE_OBJS := \
 	amazon/amazon_game.o \
 	amazon/amazon_resources.o \
 	amazon/amazon_room.o \
-	amazon/amazon_scripts.o
+	amazon/amazon_scripts.o \
+	martian/martian_game.o \
+	martian/martian_resources.o \
+	martian/martian_room.o \
+	martian/martian_scripts.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)
-- 
cgit v1.2.3


From 966515a7d0f0e9bccc8ad2a761020372d4bae19f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 Aug 2014 07:44:41 -0400
Subject: ACCESS: Fix room data loading for MM

---
 engines/access/martian/martian_resources.cpp | 12 ++++++------
 engines/access/room.cpp                      | 14 +++++++++-----
 engines/access/room.h                        |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index 6e881f3b36..b596797ab5 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -32,12 +32,12 @@ const char *const FILENAMES[] = {
 	"R08.AP", "R09.AP", "R10.AP", "R11.AP", "R12.AP", "R13.AP", "R14.AP", "R15.AP",
 	"R16.AP", "R17.AP", "R18.AP", "R19.AP", "R20.AP", "R21.AP", "R22.AP", "R23.AP",
 	"R24.AP", "R25.AP", "R26.AP", "R27.AP", "R28.AP", "R29.AP", "R30.AP", "R31.AP",
-	"R32.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP", "R40.AP",
-	"TITLE.AP","R42.AP","S01.AP", "R45.AP","SOUND.AP","MUSIC.AP","DEAD.AP","EST.AP",
-	"W02.AP", "C02.AP", "C05.AP", "C04.AP", "C10.AP", "C03.AP", "C07.AP", "LOVE.AP",
-	"CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP", "C12.AP", "C16.AP",
-	"CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP", "C16A.AP","C09.AP",
-	"R45.AP", "R46.AP", "R47.AP", "R48.AP", "R49.AP"
+	"R32.AP", "R33.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP", 
+	"R40.AP","TITLE.AP","R42.AP","S01.AP",  "R44.AP", "R45.AP","SOUND.AP","MUSIC.AP",
+	"DEAD.AP","EST.AP", "W02.AP", "C02.AP", "C05.AP", "C04.AP", "C10.AP", "C03.AP",
+	"C07.AP", "LOVE.AP","CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP", 
+	"C12.AP", "C16.AP","CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP", 
+	"C16A.AP","C09.AP", "R45.AP", "R46.AP", "R47.AP", "R48.AP", "R49.AP"
 };
 
 const byte MOUSE0[] = {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f45ffe7afb..0e6cba052d 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -159,7 +159,7 @@ void Room::clearRoom() {
 }
 
 void Room::loadRoomData(const byte *roomData) {
-	RoomInfo roomInfo(roomData);
+	RoomInfo roomInfo(roomData, _vm->getGameID());
 
 	_roomFlag = roomInfo._roomFlag;
 
@@ -716,11 +716,16 @@ bool Room::checkCode(int v1, int v2) {
 
 /*------------------------------------------------------------------------*/
 
-RoomInfo::RoomInfo(const byte *data) {
+RoomInfo::RoomInfo(const byte *data, int gameType) {
 	Common::MemoryReadStream stream(data, 999);
 
 	_roomFlag = stream.readByte();
-	_estIndex = (int16)stream.readUint16LE();
+
+	if (gameType != GType_MartianMemorandum)
+		_estIndex = (int16)stream.readUint16LE();
+	else
+		_estIndex = -1;
+
 	_musicFile._fileNum = (int16)stream.readUint16LE();
 	_musicFile._subfile = stream.readUint16LE();
 	_scaleH1 = stream.readByte();
@@ -748,8 +753,7 @@ RoomInfo::RoomInfo(const byte *data) {
 	_paletteFile._subfile = stream.readUint16LE();
 	if (_paletteFile._fileNum == -1) {
 		_startColor = _numColors = 0;
-	}
-	else {
+	} else {
 		_startColor = stream.readUint16LE();
 		_numColors = stream.readUint16LE();
 	}
diff --git a/engines/access/room.h b/engines/access/room.h
index 9b3f922528..e1a26a4e4e 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -187,7 +187,7 @@ public:
 	Common::Array<uint32> _vidTable;
 	Common::Array<SoundIdent> _sounds;
 public:
-	RoomInfo(const byte *data);
+	RoomInfo(const byte *data, int gameType);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 8d1d1f6739b3b9f456d618a8740d754ddac2eb41 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 Aug 2014 21:03:44 -0400
Subject: ACCESS: Fix displaying background in scrolling rooms

---
 engines/access/room.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 0e6cba052d..83fcce1a15 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -256,15 +256,13 @@ void Room::setupRoom() {
 		_vm->_screen->_scrollX = 0;
 		_vm->_screen->_scrollCol = 0;
 	} else {
-		_vm->_screen->_scrollX = _vm->_player->_rawPlayer.x -
-			(_vm->_player->_rawPlayer.x >> 4);
-		int xp = MAX((_vm->_player->_rawPlayer.x >> 4) -
-			(_vm->_screen->_vWindowWidth / 2), 0);
-		_vm->_screen->_scrollCol = xp;
-
-		xp = xp + _vm->_screen->_vWindowWidth - _playFieldWidth;
-		if (xp >= 0) {
-			_vm->_screen->_scrollCol = xp + 1;
+		int xv = _vm->_player->_rawPlayer.x / TILE_WIDTH;
+		_vm->_screen->_scrollX = _vm->_player->_rawPlayer.x % TILE_WIDTH;
+		_vm->_screen->_scrollCol = MAX(xv - (_vm->_screen->_vWindowWidth / 2), 0);
+
+		int sx = _vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth - _playFieldWidth;
+		if (sx >= 0) {
+			_vm->_screen->_scrollCol -= sx + 1;
 		}
 	}
 	
-- 
cgit v1.2.3


From 41df7734db18cf1cb7a2fe4004e3adef98a8cb41 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 Aug 2014 22:15:00 -0400
Subject: ACCESS: Standardise plotting methods and added comments

---
 engines/access/access.cpp   |  2 +-
 engines/access/asurface.cpp | 63 ++++++++++++---------------------------------
 engines/access/asurface.h   | 14 +++++++---
 3 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 32835a01c8..ae03dfc7fa 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -318,7 +318,7 @@ void AccessEngine::plotList1() {
 				if (ie._flags & 2) {
 					_buffer2.plotB(frame, Common::Point(bounds.left, bounds.top));
 				} else {
-					_buffer2.plotFrame(frame, Common::Point(bounds.left, bounds.top));
+					_buffer2.plotF(frame, Common::Point(bounds.left, bounds.top));
 				}
 			}
 		}
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 44686ab8f4..d3503ef645 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -203,50 +203,10 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 		_lastBoundsW = r.width();
 		_lastBoundsH = r.height();
 
-		plotFrame(frame, pt);
+		plotF(frame, pt);
 	}
 }
 
-void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
-	frame->copyTo(this, pt);
-//	g_system->copyRectToScreen((byte *)getPixels(), 320, 0, 0, 320, 200);
-//	g_system->updateScreen();
-
-
-/*
-	byte *destP = (byte *)getBasePtr(pt.x, _scrollY + pt.y);
-	byte *srcP = frame->_data;
-	
-	int8 leftVal1 = 18;
-	int8 leftVal2 = -8;
-	if (_leftSkip) {
-		++leftVal2;
-		leftVal1 = -12;
-	}
-	int8 rightVal = (_rightSkip) ? -7 : -8;
-
-	// Skip over any lines of the frame
-	for (int yp = 0; yp < _topSkip; ++yp) {
-		srcP += *(srcP + 1) + 2;
-	}
-	
-	byte *srcLineP = srcP;
-	byte *destLineP = destP;
-	for (int yp = 0; yp < frame->h; ++yp, srcP = srcLineP, destP = destLineP) {
-		// Get length of line
-		int v = *srcP++;
-		int len = *srcP++;
-		srcLineP = srcP + len;
-		destLineP = destP + this->pitch;
-
-		// Draw the line of the frame
-		if (v != 0 || len != 0) {
-			warning("TODO: Line draw");
-		}
-	}
-	*/
-}
-
 void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
 	for (int yp = 0; yp < h; ++yp) {
 		byte *srcP = (byte *)getBasePtr(0, yp);
@@ -305,22 +265,33 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	}
 }
 
-void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
+
+void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
+	frame->copyTo(this, pt);
+}
+
+void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
 	ASurface flippedFrame;
 	frame->flipHorizontal(flippedFrame);
-	flippedFrame.copyTo(this, bounds);
+	flippedFrame.copyTo(this, pt);
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
 	frame->copyTo(this, bounds);
 }
 
-void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
-	frame->copyTo(this, pt);
+void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
+	ASurface flippedFrame;
+	frame->flipHorizontal(flippedFrame);
+	flippedFrame.copyTo(this, bounds);
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
-	copyRectToSurface(*src, bounds.left, bounds.top, bounds);
+	Common::Rect r = bounds;
+	r.clip(Common::Rect(0, 0, this->w, this->h));
+
+	if (r.isValidRect())
+		copyRectToSurface(*src, r.left, r.top, r);
 }
 
 void ASurface::saveBlock(const Common::Rect &bounds) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 88e156100b..be3597d217 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -53,8 +53,6 @@ public:
 	static int _lColor;
 
 	static void init();
-public:
-	virtual void plotFrame(SpriteFrame *frame, const Common::Point &pt);
 public:
 	virtual ~ASurface();
 
@@ -69,15 +67,23 @@ public:
 	void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
 
 	/**
-	 * Scaled draw frame
+	 * Scaled draw frame in forward orientation
 	 */
 	void sPlotF(SpriteFrame *frame, const Common::Rect &bounds);
 
 	/**
-	 * Scaled flipped horizontal draw frame
+	 * Scaled draw frame in backwards orientation
 	 */
 	void sPlotB(SpriteFrame *frame, const Common::Rect &bounds);
 
+	/**
+	 * Draw an image full-size in forward orientation
+	 */
+	void plotF(SpriteFrame *frame, const Common::Point &pt);
+
+	/**
+	 * Draw an image full-size in backwards orientation
+	 */
 	void plotB(SpriteFrame *frame, const Common::Point &pt);
 
 	void copyBlock(ASurface *src, const Common::Rect &bounds);
-- 
cgit v1.2.3


From e5130bcc6c2c813fa2ab9238fce277f51a999990 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 22 Aug 2014 22:15:53 -0400
Subject: ACCESS: Remapping of plotting methods

---
 engines/access/asurface.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index d3503ef645..f023f9342d 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -267,13 +267,11 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 
 
 void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
-	frame->copyTo(this, pt);
+	sPlotF(frame, Common::Rect(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h));
 }
 
 void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
-	ASurface flippedFrame;
-	frame->flipHorizontal(flippedFrame);
-	flippedFrame.copyTo(this, pt);
+	sPlotB(frame, Common::Rect(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h));
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
@@ -287,11 +285,10 @@ void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
-	Common::Rect r = bounds;
-	r.clip(Common::Rect(0, 0, this->w, this->h));
+	Common::Rect destBounds = bounds;
+	//destBounds.translate(src->_scrollX, src->_scrollY);
 
-	if (r.isValidRect())
-		copyRectToSurface(*src, r.left, r.top, r);
+	copyRectToSurface(*src, destBounds.left, destBounds.top, bounds);
 }
 
 void ASurface::saveBlock(const Common::Rect &bounds) {
-- 
cgit v1.2.3


From b4d2484633e80ac2a1caccfedb51980cd7926c11 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 22 Aug 2014 22:55:17 -0400
Subject: ACCESS: Fixes for drawing scrolling scenes

---
 engines/access/asurface.cpp | 9 +++------
 engines/access/asurface.h   | 2 +-
 engines/access/room.cpp     | 4 ++++
 engines/access/screen.cpp   | 7 +++++++
 engines/access/screen.h     | 2 ++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index f023f9342d..e88bd27c91 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -152,7 +152,7 @@ bool ASurface::clip(Common::Rect &r) {
 	_leftSkip = _rightSkip = 0;
 	_topSkip = _bottomSkip = 0;
 
-	if (r.left > _clipWidth) {
+	if (r.left > _clipWidth || r.left < 0) {
 		if (r.left >= 0)
 			return true;
 
@@ -171,7 +171,7 @@ bool ASurface::clip(Common::Rect &r) {
 		_rightSkip = skip;
 	}
 
-	if (r.top > _clipHeight) {
+	if (r.top > _clipHeight || r.top < 0) {
 		if (r.top >= 0)
 			return true;
 
@@ -285,10 +285,7 @@ void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
-	Common::Rect destBounds = bounds;
-	//destBounds.translate(src->_scrollX, src->_scrollY);
-
-	copyRectToSurface(*src, destBounds.left, destBounds.top, bounds);
+	copyRectToSurface(*src, bounds.left, bounds.top, bounds);
 }
 
 void ASurface::saveBlock(const Common::Rect &bounds) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index be3597d217..84fe90dbbd 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -86,7 +86,7 @@ public:
 	 */
 	void plotB(SpriteFrame *frame, const Common::Point &pt);
 
-	void copyBlock(ASurface *src, const Common::Rect &bounds);
+	virtual void copyBlock(ASurface *src, const Common::Rect &bounds);
 
 	void copyTo(ASurface *dest, const Common::Point &destPos);
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 83fcce1a15..225cd80548 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -296,6 +296,10 @@ void Room::buildScreen() {
 	int cnt = _vm->_screen->_vWindowWidth + 1;
 	int offset = 0;
 
+	// Clear current background buffer
+	_vm->_buffer1.clearBuffer();
+
+	// Loop through drawing each column of tiles forming the background
 	for (int idx = 0; idx < cnt; offset += TILE_WIDTH, ++idx) {
 		buildColumn(_vm->_screen->_scrollCol, offset);
 		++_vm->_screen->_scrollCol;
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 3092d7e152..af97e2e236 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -236,4 +236,11 @@ void Screen::moveBufferUp() {
 	error("TODO: UP");
 }
 
+void Screen::copyBlock(ASurface *src, const Common::Rect &bounds) {
+	Common::Rect destBounds = bounds;
+	destBounds.translate(_windowXAdd, _windowYAdd + _screenYOff);
+
+	copyRectToSurface(*src, destBounds.left, destBounds.top, bounds);
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 98e77b4cf4..e66a7a3759 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -79,6 +79,8 @@ public:
 	int _bufferBytesWide;
 	int _vWindowLinesTall;
 	bool _screenChangeFlag;
+public:
+	virtual void copyBlock(ASurface *src, const Common::Rect &bounds);
 public:
 	Screen(AccessEngine *vm);
 
-- 
cgit v1.2.3


From 44436def8328accecf756d34103f5322d0fe0f6f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 22 Aug 2014 22:58:44 -0400
Subject: ACCESS: Stop player moving when scene changes

---
 engines/access/amazon/amazon_room.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 79c70c0b33..bc0f605d8e 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -114,7 +114,11 @@ void AmazonRoom::reloadRoom1() {
 		_vm->copyBF2Vid();
 	}
 
+	// Stop player moving
+	_vm->_player->_playerMove = false;
 	_vm->_player->_frame = 0;
+
+	// Clear any dirty rects from the old scene
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
 }
-- 
cgit v1.2.3


From 6343ff72c462219afb2f11fea69539725794efd6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 10:21:50 -0400
Subject: ACCESS: Fix cursor positioning in scrolled screens, and background
 restores

---
 engines/access/amazon/amazon_room.cpp | 17 ++++++++++-------
 engines/access/bubble_box.cpp         |  3 ++-
 engines/access/events.cpp             | 12 ++++++++++++
 engines/access/events.h               |  4 ++++
 engines/access/room.cpp               |  4 +++-
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index bc0f605d8e..c0076fd78a 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -146,10 +146,13 @@ void AmazonRoom::roomMenu() {
 }
 
 void AmazonRoom::mainAreaClick() {
+	Common::Point &mousePos = _vm->_events->_mousePos;
+	Common::Point pt = _vm->_events->calcRawMouse();
+
 	if (_selectCommand == -1) {
 		if (_vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44 ||
 				_vm->_player->_roomNumber == 31 || _vm->_player->_roomNumber == 29) {
-			switch (checkBoxes1(_vm->_events->_mousePos)) {
+			switch (checkBoxes1(pt)) {
 			case 0:
 				_game->_jasMayaFlag = 0;
 				return;
@@ -161,13 +164,13 @@ void AmazonRoom::mainAreaClick() {
 			}
 		} 
 
-		_vm->_player->_moveTo = _vm->_events->_mousePos;
+		_vm->_player->_moveTo = pt;
 		_vm->_player->_playerMove = true;
-	} else if (_vm->_events->_mousePos.x >= _vm->_screen->_windowXAdd &&
-			_vm->_events->_mousePos.x <= _vm->_screen->_vWindowBytesWide &&
-			_vm->_events->_mousePos.y >= _vm->_screen->_windowYAdd &&
-			_vm->_events->_mousePos.y <= _vm->_screen->_vWindowLinesTall) {
-		if (checkBoxes1(_vm->_events->_mousePos) >= 0) {
+	} else if (mousePos.x >= _vm->_screen->_windowXAdd &&
+			mousePos.x <= _vm->_screen->_vWindowBytesWide &&
+			mousePos.y >= _vm->_screen->_windowYAdd &&
+			mousePos.y <= _vm->_screen->_vWindowLinesTall) {
+		if (checkBoxes1(pt) >= 0) {
 			checkBoxes3();
 		}
 	}
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 21e104028c..a709fbd92d 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -236,7 +236,7 @@ void BubbleBox::doBox(int item, int box) {
 	screen.plotImage(icons, (_type == TYPE_4) ? 73 : 23, Common::Point(xp, yp));
 
 	if (_type == TYPE_4) {
-		// Further stuff
+		// Further stuff for filename dialog
 		error("TODO: Box type 4");
 	}
 
@@ -264,6 +264,7 @@ void BubbleBox::doBox(int item, int box) {
 	fonts._printStart = printStart;
 	_charCol = charCol;
 	_rowOff = rowOff;
+	_vm->_screen->restoreScreen();
 	
 	// Free icons data
 	delete icons;
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 1afc5515b0..78bbdbf1ea 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -217,4 +217,16 @@ void EventsManager::waitKeyMouse() {
 	debounceLeft();
 }
 
+Common::Point EventsManager::calcRawMouse() {
+	Screen &screen = *_vm->_screen;
+	Common::Point pt;
+	pt.x = _mousePos.x - screen._windowXAdd +
+		(screen._scrollCol * TILE_WIDTH) + screen._scrollX;
+	pt.y = _mousePos.y - screen._screenYOff - screen._windowYAdd +
+		(screen._scrollRow * TILE_HEIGHT) + screen._scrollY;
+
+	return pt;
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index f7a5e9ce53..2ced71f50e 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -105,6 +105,10 @@ public:
 	void debounceLeft();
 
 	void waitKeyMouse();
+
+	Common::Point &getMousePos() { return _mousePos; }
+
+	Common::Point calcRawMouse();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 225cd80548..b5f8554612 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -556,8 +556,10 @@ int Room::checkBoxes2(const Common::Point &pt, int start, int count) {
 }
 
 void Room::checkBoxes3() {
+	Common::Point pt = _vm->_events->calcRawMouse();
+
 	for (uint start = 0; start < _plotter._blocks.size(); ++start) {
-		if (_plotter._blocks[start].contains(_vm->_events->_mousePos)) {
+		if (_plotter._blocks[start].contains(pt)) {
 			_plotter._blockIn = start;
 			if (!(validateBox(start) & 0x80)) {
 				_vm->_events->debounceLeft();
-- 
cgit v1.2.3


From 7aa2c7fe5cca8eaa9c68c471cef4595b99021206 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 12:09:27 -0400
Subject: ACCESS: Beginnings of character/converse manager

---
 engines/access/access.cpp  |  9 ++++-
 engines/access/access.h    |  7 +++-
 engines/access/char.cpp    | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 engines/access/char.h      | 58 ++++++++++++++++++++++++++++++
 engines/access/data.h      | 14 ++++++++
 engines/access/module.mk   |  1 +
 engines/access/room.cpp    | 38 ++++++++++----------
 engines/access/room.h      | 11 +-----
 engines/access/scripts.cpp | 19 ++++++++--
 engines/access/scripts.h   |  2 +-
 10 files changed, 213 insertions(+), 35 deletions(-)
 create mode 100644 engines/access/char.cpp
 create mode 100644 engines/access/char.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index ae03dfc7fa..c84ac8b28d 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,6 +34,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		_useItem(_flags[100]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
 	_animation = nullptr;
 	_bubbleBox = nullptr;
+	_char = nullptr;
 	_debugger = nullptr;
 	_events = nullptr;
 	_files = nullptr;
@@ -106,6 +107,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 AccessEngine::~AccessEngine() {
 	delete _animation;
 	delete _bubbleBox;
+	delete _char;
 	delete _debugger;
 	delete _events;
 	delete _files;
@@ -147,6 +149,7 @@ void AccessEngine::initialize() {
 	ASurface::init();
 	_animation = new AnimationManager(this);
 	_bubbleBox = new BubbleBox(this);
+	_char = new CharManager(this);
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
@@ -197,7 +200,7 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
 
-void AccessEngine::loadCells(Common::Array<RoomInfo::CellIdent> &cells) {
+void AccessEngine::loadCells(Common::Array<CellIdent> &cells) {
 	for (uint i = 0; i < cells.size(); ++i) {
 		byte *spriteData = _files->loadFile(cells[i]._fileNum, cells[i]._subfile);
 		_objectsTable[cells[i]._cell] = new SpriteResource(this, 
@@ -371,4 +374,8 @@ void AccessEngine::freeChar() {
 	_animation->freeAnimationData();
 }
 
+void AccessEngine::loadChar(int charId) {
+	
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 2185916c5a..974277280c 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -32,6 +32,7 @@
 #include "graphics/surface.h"
 #include "access/animation.h"
 #include "access/bubble_box.h"
+#include "access/char.h"
 #include "access/data.h"
 #include "access/debugger.h"
 #include "access/events.h"
@@ -108,6 +109,7 @@ protected:
 public:
 	AnimationManager *_animation;
 	BubbleBox *_bubbleBox;
+	CharManager *_char;
 	Debugger *_debugger;
 	EventsManager *_events;
 	FileManager *_files;
@@ -122,6 +124,7 @@ public:
 	ASurface *_current;
 	ASurface _buffer1;
 	ASurface _buffer2;
+	Common::Array<CharEntry *> _charTable;
 	SpriteResource *_objectsTable[100];
 	int _establishTable[100];
 	bool _establishFlag;
@@ -204,7 +207,7 @@ public:
 
 	int getRandomNumber(int maxNumber);
 
-	void loadCells(Common::Array<RoomInfo::CellIdent> &cells);
+	void loadCells(Common::Array<CellIdent> &cells);
 
 	/**
 	* Free the sprites list
@@ -236,6 +239,8 @@ public:
 	void doLoadSave();
 
 	void freeChar();
+
+	void loadChar(int charId);
 };
 
 } // End of namespace Access
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
new file mode 100644
index 0000000000..a01643b651
--- /dev/null
+++ b/engines/access/char.cpp
@@ -0,0 +1,89 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/memstream.h"
+#include "access/access.h"
+#include "access/char.h"
+#include "access/amazon/amazon_resources.h"
+
+namespace Access {
+
+CharEntry::CharEntry(const byte *data) {
+	Common::MemoryReadStream s(data, 999);
+
+	_charFlag = s.readByte();
+	_estabFlag = s.readSint16LE();
+	_screenFile._fileNum = s.readSint16LE();
+	_screenFile._subfile = s.readSint16LE();
+
+	_paletteFile._fileNum = s.readSint16LE();
+	_paletteFile._subfile = s.readUint16LE();
+	_startColor = s.readUint16LE();
+	_numColors = s.readUint16LE();
+
+	// Load cells
+	for (byte cell = s.readByte(); cell != 0xff; cell = s.readByte()) {
+		CellIdent ci;
+		ci._cell = cell;
+		ci._fileNum = s.readSint16LE();
+		ci._subfile = s.readUint16LE();
+
+		_cells.push_back(ci);
+	}
+
+	_animFile._fileNum = s.readSint16LE();
+	_animFile._subfile = s.readUint16LE();
+	_scriptFile._fileNum = s.readSint16LE();
+	_scriptFile._subfile = s.readUint16LE();
+
+	for (int16 v = s.readSint16LE(); v != -1; v = s.readSint16LE()) {
+		ExtraCell ec;
+		ec._vidTable = v;
+		ec._vidTable1 = s.readSint16LE();
+		ec._vidSTable = s.readSint16LE();
+		ec._vidSTable1 = s.readSint16LE();
+
+		_extraCells.push_back(ec);
+	}
+}
+
+CharEntry::CharEntry() {
+	_charFlag = 0;
+	_estabFlag = 0;
+	_startColor = _numColors = 0;
+}
+
+/*------------------------------------------------------------------------*/
+
+CharManager::CharManager(AccessEngine *vm) : Manager(vm) {
+	switch (vm->getGameID()) {
+	case GType_Amazon:
+		// Setup character list
+		for (int i = 0; i < 37; ++i)
+			_charTable.push_back(CharEntry(Amazon::CHARTBL[i]));
+		break;
+	default:
+		error("Unknown game");
+	}
+}
+
+} // End of namespace Access
diff --git a/engines/access/char.h b/engines/access/char.h
new file mode 100644
index 0000000000..8d6c49d47a
--- /dev/null
+++ b/engines/access/char.h
@@ -0,0 +1,58 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_CHAR_H
+#define ACCESS_CHAR_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "access/data.h"
+
+namespace Access {
+
+class CharEntry {
+public:
+	int _charFlag;
+	int _estabFlag;
+	FileIdent _screenFile;
+	FileIdent _paletteFile;
+	int _startColor, _numColors;
+	Common::Array<CellIdent> _cells;
+	FileIdent _animFile;
+	FileIdent _scriptFile;
+	Common::Array<ExtraCell> _extraCells;
+public:
+	CharEntry(const byte *data);
+
+	CharEntry();
+};
+
+class CharManager: public Manager {
+public:
+	Common::Array<CharEntry> _charTable;
+public:
+	CharManager(AccessEngine *vm);
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_CHAR_H */
diff --git a/engines/access/data.h b/engines/access/data.h
index 1601c689bf..c10b2b7f17 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -40,6 +40,20 @@ public:
 	Manager(AccessEngine *vm) : _vm(vm) {}
 };
 
+struct FileIdent {
+	int _fileNum;
+	int _subfile;
+
+	FileIdent() {
+		_fileNum = -1;
+		_subfile = 0;
+	}
+};
+
+struct CellIdent : FileIdent {
+	byte _cell;
+};
+
 struct TimerEntry {
 	int _initTm;
 	int _timer;
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 46f96693fa..31f0760491 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	asurface.o \
 	access.o \
 	bubble_box.o \
+	char.o \
 	data.o \
 	debugger.o \
 	decompress.o \
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b5f8554612..d703114090 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -227,13 +227,8 @@ void Room::loadRoomData(const byte *roomData) {
 
 	// Load extra cells
 	_vm->_extraCells.clear();
-	for (uint i = 0; i < roomInfo._vidTable.size(); ++i) {
-		ExtraCell ec;
-		ec._vidTable = roomInfo._vidTable[i] & 0xffff;
-		ec._vidTable1 = roomInfo._vidTable[i] >> 16;
-
-		_vm->_extraCells.push_back(ec);
-	}
+	for (uint i = 0; i < roomInfo._extraCells.size(); ++i)
+		_vm->_extraCells.push_back(roomInfo._extraCells[i]);
 
 	// Load sounds for the scene
 	_vm->_sound->loadSounds(roomInfo._sounds);
@@ -726,34 +721,34 @@ RoomInfo::RoomInfo(const byte *data, int gameType) {
 	_roomFlag = stream.readByte();
 
 	if (gameType != GType_MartianMemorandum)
-		_estIndex = (int16)stream.readUint16LE();
+		_estIndex = stream.readSint16LE();
 	else
 		_estIndex = -1;
 
-	_musicFile._fileNum = (int16)stream.readUint16LE();
+	_musicFile._fileNum = stream.readSint16LE();
 	_musicFile._subfile = stream.readUint16LE();
 	_scaleH1 = stream.readByte();
 	_scaleH2 = stream.readByte();
 	_scaleN1 = stream.readByte();
-	_playFieldFile._fileNum = (int16)stream.readUint16LE();
+	_playFieldFile._fileNum = stream.readSint16LE();
 	_playFieldFile._subfile = stream.readUint16LE();
 
 	for (byte cell = stream.readByte(); cell != 0xff; cell = stream.readByte()) {
 		CellIdent ci;
 		ci._cell = cell;
-		ci._fileNum = (int16)stream.readUint16LE();
+		ci._fileNum = stream.readSint16LE();
 		ci._subfile = stream.readUint16LE();
 
 		_cells.push_back(ci);
 	}
 
-	_scriptFile._fileNum = (int16)stream.readUint16LE();
+	_scriptFile._fileNum = stream.readSint16LE();
 	_scriptFile._subfile = stream.readUint16LE();
-	_animFile._fileNum = (int16)stream.readUint16LE();
+	_animFile._fileNum = stream.readSint16LE();
 	_animFile._subfile = stream.readUint16LE();
 	_scaleI = stream.readByte();
 	_scrollThreshold = stream.readByte();
-	_paletteFile._fileNum = (int16)stream.readUint16LE();
+	_paletteFile._fileNum = stream.readSint16LE();
 	_paletteFile._subfile = stream.readUint16LE();
 	if (_paletteFile._fileNum == -1) {
 		_startColor = _numColors = 0;
@@ -762,15 +757,18 @@ RoomInfo::RoomInfo(const byte *data, int gameType) {
 		_numColors = stream.readUint16LE();
 	}
 
-	for (int16 v = (int16)stream.readUint16LE(); v != -1;
-		v = (int16)stream.readUint16LE()) {
-		uint16 v2 = stream.readUint16LE();
+	for (int16 v = stream.readSint16LE(); v != -1; v = stream.readSint16LE()) {
+		ExtraCell ec;
+		ec._vidTable = v;
+		ec._vidTable1 = stream.readSint16LE();
+		ec._vidSTable = stream.readSint16LE();
+		ec._vidSTable1 = stream.readSint16LE();
 
-		_vidTable.push_back(v | ((uint32)v2 << 16));
+		_extraCells.push_back(ec);
 	}
 
-	for (int16 fileNum = (int16)stream.readUint16LE(); fileNum != -1;
-		fileNum = (int16)stream.readUint16LE()) {
+	for (int16 fileNum = stream.readSint16LE(); fileNum != -1;
+		fileNum = stream.readSint16LE()) {
 		SoundIdent fi;
 		fi._fileNum = fileNum;
 		fi._subfile = stream.readUint16LE();
diff --git a/engines/access/room.h b/engines/access/room.h
index e1a26a4e4e..40290956cd 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -156,15 +156,6 @@ public:
 
 class RoomInfo {
 public:
-	struct FileIdent {
-		int _fileNum;
-		int _subfile;
-	};
-
-	struct CellIdent : FileIdent {
-		byte _cell;
-	};
-	
 	struct SoundIdent : FileIdent {
 		int _priority;
 	};
@@ -184,7 +175,7 @@ public:
 	FileIdent _paletteFile;
 	int _startColor;
 	int _numColors;
-	Common::Array<uint32> _vidTable;
+	Common::Array<ExtraCell> _extraCells;
 	Common::Array<SoundIdent> _sounds;
 public:
 	RoomInfo(const byte *data, int gameType);
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index f6879584f3..f4934d45a3 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -99,7 +99,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
 		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
-		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::CMDCONVERSE, 
+		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::cmdConverse, 
 		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetTimer, 
@@ -309,7 +309,22 @@ void Scripts::cmdNewRoom() {
 	cmdRetPos();
 }
 
-void Scripts::CMDCONVERSE() { error("TODO CMDCONVERSE"); }
+void Scripts::cmdConverse() { 
+	_vm->_conversation = _data->readUint16LE();
+	_vm->_room->clearRoom();
+	_vm->freeChar();
+	_vm->loadChar(_vm->_conversation);
+	_vm->_events->setCursor(CURSOR_ARROW);
+
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 0;
+	searchForSequence();
+
+	if (_vm->_screen->_vesaMode) {
+		_vm->_converseMode = 1;
+	}
+}
 
 void Scripts::cmdCheckFrame() {
 	int id = _data->readUint16LE();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 4b224c32bd..ae4c7559e0 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -79,7 +79,7 @@ protected:
 	void cmdCheckInventory();
 	void cmdSetTex();
 	void cmdNewRoom();
-	void CMDCONVERSE();
+	void cmdConverse();
 	void cmdCheckFrame();
 	void cmdCheckAnim();
 	void cmdSnd();
-- 
cgit v1.2.3


From 31c8a524a35c19291bbd7bed3d117791a90c7401 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 13:13:56 -0400
Subject: ACCESS: More implementation of CharManager

---
 engines/access/access.cpp  | 25 ++++++++---------
 engines/access/access.h    | 11 +++-----
 engines/access/char.cpp    | 67 ++++++++++++++++++++++++++++++++++++++++++++--
 engines/access/char.h      | 11 +++++++-
 engines/access/room.cpp    | 37 ++++++++++++-------------
 engines/access/room.h      |  2 --
 engines/access/screen.h    |  5 ++++
 engines/access/scripts.cpp |  2 +-
 8 files changed, 115 insertions(+), 45 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index c84ac8b28d..0718fd697e 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -62,7 +62,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_startup = 0;
 	_currentCharFlag = false;
 	_boxSelect = false;
-	_charFlag = 0;
 	_scale = 0;
 	_scaleH1 = _scaleH2 = 0;
 	_scaleN1 = 0;
@@ -78,7 +77,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_intTim[3] = 0;
 	_timer[3] = 0;
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
-	Common::fill(&_establishTable[0], &_establishTable[100], 0);
+	Common::fill(&_establishTable[0], &_establishTable[100], false);
 	Common::fill(&_flags[0], &_flags[256], 0);
 	_establishFlag = false;
 	_establishMode = 0;
@@ -220,15 +219,15 @@ void AccessEngine::freeInactiveData() {
 	_inactive = nullptr;
 }
 
-void AccessEngine::establish(int v1, int sub) {
+void AccessEngine::establish(int esatabIndex, int sub) {
 	_establishMode = 0;
 	_establishGroup = 0;
-	doEstablish(v1, sub);
+	doEstablish(esatabIndex, sub);
 }
 
-void AccessEngine::establishCenter(int v1, int sub) {
+void AccessEngine::establishCenter(int esatabIndex, int sub) {
 	_establishMode = 1;
-	doEstablish(v1, sub);
+	doEstablish(esatabIndex, sub);
 }
 
 byte *AccessEngine::loadEstablish(int sub) {
@@ -236,17 +235,19 @@ byte *AccessEngine::loadEstablish(int sub) {
 	return nullptr;
 }
 
-void AccessEngine::doEstablish(int v1, int sub) {
+void AccessEngine::doEstablish(int esatabIndex, int sub) {
+	_establishMode = 1;
+
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (v1 != -1) {
-		_files->loadScreen(95, v1);
+	if (esatabIndex != -1) {
+		_files->loadScreen(95, esatabIndex);
 		_buffer2.copyBuffer(_screen);
 	}
 
-	_room->setIconPalette();
+	_screen->setIconPalette();
 	_screen->forceFadeIn();
 
 	_fonts._charSet._lo = 1;
@@ -374,8 +375,4 @@ void AccessEngine::freeChar() {
 	_animation->freeAnimationData();
 }
 
-void AccessEngine::loadChar(int charId) {
-	
-}
-
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 974277280c..2e2358f268 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -88,7 +88,7 @@ private:
 
 	void dummyLoop();
 
-	void doEstablish(int v1, int sub);
+	void doEstablish(int esatabIndex, int sub);
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -126,7 +126,7 @@ public:
 	ASurface _buffer2;
 	Common::Array<CharEntry *> _charTable;
 	SpriteResource *_objectsTable[100];
-	int _establishTable[100];
+	bool _establishTable[100];
 	bool _establishFlag;
 	int _establishMode;
 	int _establishGroup;
@@ -150,7 +150,6 @@ public:
 	int _startTravelBox;
 	bool _currentCharFlag;
 	bool _boxSelect;
-	int _charFlag;
 	int _scale;
 	int _scaleH1, _scaleH2;
 	int _scaleN1;
@@ -221,9 +220,9 @@ public:
 
 	byte *AccessEngine::loadEstablish(int sub);
 
-	void establish(int v1, int sub);
+	void establish(int esatabIndex, int sub);
 
-	void establishCenter(int v1, int sub);
+	void establishCenter(int esatabIndex, int sub);
 
 	void plotList();
 	void plotList1();
@@ -239,8 +238,6 @@ public:
 	void doLoadSave();
 
 	void freeChar();
-
-	void loadChar(int charId);
 };
 
 } // End of namespace Access
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index a01643b651..40f3bf376a 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -31,7 +31,7 @@ CharEntry::CharEntry(const byte *data) {
 	Common::MemoryReadStream s(data, 999);
 
 	_charFlag = s.readByte();
-	_estabFlag = s.readSint16LE();
+	_estabIndex = s.readSint16LE();
 	_screenFile._fileNum = s.readSint16LE();
 	_screenFile._subfile = s.readSint16LE();
 
@@ -68,7 +68,7 @@ CharEntry::CharEntry(const byte *data) {
 
 CharEntry::CharEntry() {
 	_charFlag = 0;
-	_estabFlag = 0;
+	_estabIndex = 0;
 	_startColor = _numColors = 0;
 }
 
@@ -84,6 +84,69 @@ CharManager::CharManager(AccessEngine *vm) : Manager(vm) {
 	default:
 		error("Unknown game");
 	}
+
+	_charFlag = 0;
+}
+
+void CharManager::loadChar(int charId) {
+	CharEntry &ce = _charTable[charId];
+	_charFlag = ce._charFlag;
+
+	_vm->_establishFlag = false;
+	if (ce._estabIndex != -1) {
+		_vm->_establishFlag = true;
+		if (!_vm->_establishTable[ce._estabIndex]) {
+			_vm->_establishTable[ce._estabIndex] = true;
+			_vm->establish(ce._estabIndex, 0);
+		}
+	}
+
+	if (_charFlag != 0 && _charFlag != 3) {
+		if (!_vm->_establishFlag)
+			_vm->_screen->fadeOut();
+
+		_vm->_files->loadScreen(ce._screenFile._fileNum, ce._screenFile._subfile);
+		_vm->_screen->setIconPalette();
+		_vm->_screen->fadeIn();
+	}
+
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_screen->copyFrom(_vm->_buffer2);
+	_vm->_screen->setDisplayScan();
+
+	if (_charFlag != 2 && _charFlag != 3) {
+		charMenu();
+	}
+
+	_vm->_screen->_startColor = ce._startColor;
+	_vm->_screen->_numColors = ce._numColors;
+	if (ce._paletteFile._fileNum != -1) {
+		_vm->_screen->loadPalette(ce._paletteFile._fileNum, ce._paletteFile._subfile);
+	}
+	_vm->_screen->setIconPalette();
+	_vm->_screen->setPalette();
+
+	_vm->loadCells(ce._cells);
+	if (ce._animFile._fileNum != -1) {
+		byte *data = _vm->_files->loadFile(ce._animFile._fileNum, ce._animFile._subfile);
+		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
+	}
+
+	// Load script data
+	_vm->_scripts->freeScriptData();
+	if (ce._scriptFile._fileNum != -1) {
+		const byte *data = _vm->_files->loadFile(ce._scriptFile._fileNum, ce._scriptFile._subfile);
+		_vm->_scripts->setScript(data, _vm->_files->_filesize);
+	}
+
+	// Load extra cells
+	_vm->_extraCells.clear();
+	for (uint i = 0; i < ce._extraCells.size(); ++i)
+		_vm->_extraCells.push_back(ce._extraCells[i]);
+}
+
+void CharManager::charMenu() {
+	error("TODO: charMenu");
 }
 
 } // End of namespace Access
diff --git a/engines/access/char.h b/engines/access/char.h
index 8d6c49d47a..4bd38d7c6d 100644
--- a/engines/access/char.h
+++ b/engines/access/char.h
@@ -32,7 +32,7 @@ namespace Access {
 class CharEntry {
 public:
 	int _charFlag;
-	int _estabFlag;
+	int _estabIndex;
 	FileIdent _screenFile;
 	FileIdent _paletteFile;
 	int _startColor, _numColors;
@@ -47,10 +47,19 @@ public:
 };
 
 class CharManager: public Manager {
+private:
+	void charMenu();
 public:
 	Common::Array<CharEntry> _charTable;
+	int _converseMode;
+	int _charFlag;
+
+	// Fields that are included in savegames
+	int _conversation;
 public:
 	CharManager(AccessEngine *vm);
+
+	void loadChar(int charId);
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index d703114090..3ff4d66337 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -241,39 +241,40 @@ void Room::roomLoop() {
 }
 
 void Room::setupRoom() {
-	_vm->_screen->setScaleTable(_vm->_scale);
-	_vm->_screen->setBufferScan();
+	Screen &screen = *_vm->_screen;
+	screen.setScaleTable(_vm->_scale);
+	screen.setBufferScan();
 
 	if (_roomFlag != 2)
-		setIconPalette();
+		screen.setIconPalette();
 
-	if (_vm->_screen->_vWindowWidth == _playFieldWidth) {
-		_vm->_screen->_scrollX = 0;
-		_vm->_screen->_scrollCol = 0;
+	if (screen._vWindowWidth == _playFieldWidth) {
+		screen._scrollX = 0;
+		screen._scrollCol = 0;
 	} else {
 		int xv = _vm->_player->_rawPlayer.x / TILE_WIDTH;
-		_vm->_screen->_scrollX = _vm->_player->_rawPlayer.x % TILE_WIDTH;
-		_vm->_screen->_scrollCol = MAX(xv - (_vm->_screen->_vWindowWidth / 2), 0);
+		screen._scrollX = _vm->_player->_rawPlayer.x % TILE_WIDTH;
+		screen._scrollCol = MAX(xv - (screen._vWindowWidth / 2), 0);
 
-		int sx = _vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth - _playFieldWidth;
+		int sx = screen._scrollCol + screen._vWindowWidth - _playFieldWidth;
 		if (sx >= 0) {
-			_vm->_screen->_scrollCol -= sx + 1;
+			screen._scrollCol -= sx + 1;
 		}
 	}
 	
-	if (_vm->_screen->_vWindowHeight == _playFieldHeight) {
-		_vm->_screen->_scrollY = 0;
-		_vm->_screen->_scrollRow = 0;
+	if (screen._vWindowHeight == _playFieldHeight) {
+		screen._scrollY = 0;
+		screen._scrollRow = 0;
 	} else {
-		_vm->_screen->_scrollY = _vm->_player->_rawPlayer.y -
+		screen._scrollY = _vm->_player->_rawPlayer.y -
 			(_vm->_player->_rawPlayer.y >> 4);
 		int yp = MAX((_vm->_player->_rawPlayer.y >> 4) -
-			(_vm->_screen->_vWindowHeight / 2), 0);
-		_vm->_screen->_scrollRow = yp;
+			(screen._vWindowHeight / 2), 0);
+		screen._scrollRow = yp;
 
-		yp = yp + _vm->_screen->_vWindowHeight - _playFieldHeight;
+		yp = yp + screen._vWindowHeight - _playFieldHeight;
 		if (yp >= 0) {
-			_vm->_screen->_scrollRow = yp + 1;
+			screen._scrollRow = yp + 1;
 		}
 	}
 }
diff --git a/engines/access/room.h b/engines/access/room.h
index 40290956cd..d876a30875 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -116,8 +116,6 @@ protected:
 	virtual void roomMenu() = 0;
 
 	virtual void mainAreaClick() = 0;
-public:
-	virtual void setIconPalette() {}
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index e66a7a3759..5ffba5ad3e 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -114,6 +114,11 @@ public:
 	 */
 	void setInitialPalettte();
 
+	/**
+	 * Set icon palette
+	 */
+	void setIconPalette() {}
+
 	void loadPalette(Common::SeekableReadStream *stream);
 
 	void loadPalette(int fileNum, int subfile);
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index f4934d45a3..985f5cba66 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -313,7 +313,7 @@ void Scripts::cmdConverse() {
 	_vm->_conversation = _data->readUint16LE();
 	_vm->_room->clearRoom();
 	_vm->freeChar();
-	_vm->loadChar(_vm->_conversation);
+	_vm->_char->loadChar(_vm->_conversation);
 	_vm->_events->setCursor(CURSOR_ARROW);
 
 	_vm->_images.clear();
-- 
cgit v1.2.3


From 1e2d79eb598a0ed73a59cc540cddbaddf0bc90dd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 14:13:26 -0400
Subject: ACCESS: Implement more opcodes, stubbed beginning of video player

---
 engines/access/access.cpp  |  5 ++++-
 engines/access/access.h    |  2 ++
 engines/access/char.cpp    | 41 +++++++++++++++++++++++------------------
 engines/access/data.cpp    |  5 +++--
 engines/access/data.h      | 21 +++------------------
 engines/access/files.cpp   | 16 ++++++++++++++++
 engines/access/files.h     | 18 ++++++++++++++++++
 engines/access/module.mk   |  1 +
 engines/access/room.cpp    | 34 ++++++++++++----------------------
 engines/access/scripts.cpp | 29 ++++++++++++++++++++++++-----
 engines/access/scripts.h   |  4 ++--
 engines/access/sound.cpp   |  2 ++
 engines/access/sound.h     |  3 ++-
 engines/access/video.cpp   | 35 +++++++++++++++++++++++++++++++++++
 engines/access/video.h     | 41 +++++++++++++++++++++++++++++++++++++++++
 15 files changed, 188 insertions(+), 69 deletions(-)
 create mode 100644 engines/access/video.cpp
 create mode 100644 engines/access/video.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 0718fd697e..4035870dad 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -44,6 +44,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_screen = nullptr;
 	_scripts = nullptr;
 	_sound = nullptr;
+	_video = nullptr;
 
 	_destIn = nullptr;
 	_current = nullptr;
@@ -116,6 +117,7 @@ AccessEngine::~AccessEngine() {
 	delete _screen;
 	delete _scripts;
 	delete _sound;
+	delete _video;
 
 	freeCells();
 	delete[] _inactive;
@@ -156,6 +158,7 @@ void AccessEngine::initialize() {
 	_player = new Player(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
+	_video = new VideoPlayer(this);
 
 	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight());
 	_buffer2.create(g_system->getWidth(), g_system->getHeight());
@@ -201,7 +204,7 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 
 void AccessEngine::loadCells(Common::Array<CellIdent> &cells) {
 	for (uint i = 0; i < cells.size(); ++i) {
-		byte *spriteData = _files->loadFile(cells[i]._fileNum, cells[i]._subfile);
+		byte *spriteData = _files->loadFile(cells[i]);
 		_objectsTable[cells[i]._cell] = new SpriteResource(this, 
 			spriteData, _files->_filesize, DisposeAfterUse::YES);
 	}
diff --git a/engines/access/access.h b/engines/access/access.h
index 2e2358f268..0d4ad19452 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -43,6 +43,7 @@
 #include "access/screen.h"
 #include "access/scripts.h"
 #include "access/sound.h"
+#include "access/video.h"
 
 /**
  * This is the namespace of the Access engine.
@@ -119,6 +120,7 @@ public:
 	Screen *_screen;
 	Scripts *_scripts;
 	SoundManager *_sound;
+	VideoPlayer *_video;
 
 	ASurface *_destIn;
 	ASurface *_current;
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index 40f3bf376a..09335fc017 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -32,11 +32,8 @@ CharEntry::CharEntry(const byte *data) {
 
 	_charFlag = s.readByte();
 	_estabIndex = s.readSint16LE();
-	_screenFile._fileNum = s.readSint16LE();
-	_screenFile._subfile = s.readSint16LE();
-
-	_paletteFile._fileNum = s.readSint16LE();
-	_paletteFile._subfile = s.readUint16LE();
+	_screenFile.load(s);
+	_paletteFile.load(s);
 	_startColor = s.readUint16LE();
 	_numColors = s.readUint16LE();
 
@@ -44,23 +41,19 @@ CharEntry::CharEntry(const byte *data) {
 	for (byte cell = s.readByte(); cell != 0xff; cell = s.readByte()) {
 		CellIdent ci;
 		ci._cell = cell;
-		ci._fileNum = s.readSint16LE();
-		ci._subfile = s.readUint16LE();
+		ci.load(s);
 
 		_cells.push_back(ci);
 	}
 
-	_animFile._fileNum = s.readSint16LE();
-	_animFile._subfile = s.readUint16LE();
-	_scriptFile._fileNum = s.readSint16LE();
-	_scriptFile._subfile = s.readUint16LE();
+	_animFile.load(s);
+	_scriptFile.load(s);
 
 	for (int16 v = s.readSint16LE(); v != -1; v = s.readSint16LE()) {
 		ExtraCell ec;
-		ec._vidTable = v;
-		ec._vidTable1 = s.readSint16LE();
-		ec._vidSTable = s.readSint16LE();
-		ec._vidSTable1 = s.readSint16LE();
+		ec._vid._fileNum = v;
+		ec._vid._subfile = s.readSint16LE();
+		ec._vidSound.load(s);
 
 		_extraCells.push_back(ec);
 	}
@@ -128,14 +121,14 @@ void CharManager::loadChar(int charId) {
 
 	_vm->loadCells(ce._cells);
 	if (ce._animFile._fileNum != -1) {
-		byte *data = _vm->_files->loadFile(ce._animFile._fileNum, ce._animFile._subfile);
+		byte *data = _vm->_files->loadFile(ce._animFile);
 		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
 	}
 
 	// Load script data
 	_vm->_scripts->freeScriptData();
 	if (ce._scriptFile._fileNum != -1) {
-		const byte *data = _vm->_files->loadFile(ce._scriptFile._fileNum, ce._scriptFile._subfile);
+		const byte *data = _vm->_files->loadFile(ce._scriptFile);
 		_vm->_scripts->setScript(data, _vm->_files->_filesize);
 	}
 
@@ -146,7 +139,19 @@ void CharManager::loadChar(int charId) {
 }
 
 void CharManager::charMenu() {
-	error("TODO: charMenu");
+	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
+	delete[] iconData;
+
+	Screen &screen = *_vm->_screen;
+	screen.saveScreen();
+	screen.setDisplayScan();
+
+	screen.plotImage(spr, 17, Common::Point(0, 176));
+	screen.plotImage(spr, 18, Common::Point(155, 176));
+
+	screen.restoreScreen();
+	delete spr;
 }
 
 } // End of namespace Access
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 094272b05c..a13c6d9a67 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "common/algorithm.h"
-#include "access/data.h"
-#include "graphics/palette.h"
+#include "common/stream.h"
 #include "common/system.h"
+#include "graphics/palette.h"
+#include "access/data.h"
 
 namespace Access {
 
diff --git a/engines/access/data.h b/engines/access/data.h
index c10b2b7f17..3238dafa33 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -28,6 +28,7 @@
 #include "common/rect.h"
 #include "common/types.h"
 #include "graphics/surface.h"
+#include "access/files.h"
 
 namespace Access {
 
@@ -40,20 +41,6 @@ public:
 	Manager(AccessEngine *vm) : _vm(vm) {}
 };
 
-struct FileIdent {
-	int _fileNum;
-	int _subfile;
-
-	FileIdent() {
-		_fileNum = -1;
-		_subfile = 0;
-	}
-};
-
-struct CellIdent : FileIdent {
-	byte _cell;
-};
-
 struct TimerEntry {
 	int _initTm;
 	int _timer;
@@ -91,10 +78,8 @@ public:
 
 class ExtraCell {
 public:
-	int _vidTable;
-	int _vidTable1;
-	int _vidSTable;
-	int _vidSTable1;
+	FileIdent _vid;
+	FileIdent _vidSound;
 };
 
 struct FontVal {
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 970b0b9019..c805121d50 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -27,6 +27,18 @@
 
 namespace Access {
 
+FileIdent::FileIdent() {
+	_fileNum = -1;
+	_subfile = 0;
+}
+
+void FileIdent::load(Common::SeekableReadStream &s) {
+	_fileNum = s.readSint16LE();
+	_subfile = s.readUint16LE();
+}
+
+/*------------------------------------------------------------------------*/
+
 FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	switch (vm->getGameID()) {
 	case GType_Amazon:
@@ -55,6 +67,10 @@ byte *FileManager::loadFile(int fileNum, int subfile) {
 	return handleFile();
 }
 
+byte *FileManager::loadFile(FileIdent &fileIdent) {
+	return loadFile(fileIdent._fileNum, fileIdent._subfile);
+}
+
 byte *FileManager::loadFile(const Common::String &filename) {
 	// Open the file
 	openFile(filename);
diff --git a/engines/access/files.h b/engines/access/files.h
index 848ee0d2ca..38d9179195 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -32,6 +32,19 @@ namespace Access {
 
 class AccessEngine;
 
+struct FileIdent {
+	int _fileNum;
+	int _subfile;
+
+	FileIdent();
+
+	void load(Common::SeekableReadStream &s);
+};
+
+struct CellIdent : FileIdent {
+	byte _cell;
+};
+
 class FileManager {
 private:
 	AccessEngine *_vm;
@@ -55,6 +68,11 @@ public:
 	 */
 	byte *loadFile(int fileNum, int subfile);
 
+	/**
+	 * Loads a resource specified by a file identifier
+	 */
+	byte *loadFile(FileIdent &fileIdent);
+
 	/**
 	 * Load a given file by name
 	 */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 31f0760491..e92c2cc564 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -19,6 +19,7 @@ MODULE_OBJS := \
 	screen.o \
 	scripts.o \
 	sound.o \
+	video.o \
 	amazon/amazon_game.o \
 	amazon/amazon_resources.o \
 	amazon/amazon_room.o \
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 3ff4d66337..90ef3470db 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -174,8 +174,7 @@ void Room::loadRoomData(const byte *roomData) {
 
 	_vm->_sound->freeMusic();
 	if (roomInfo._musicFile._fileNum != -1) {
-		_vm->_sound->_music = _vm->_files->loadFile(roomInfo._musicFile._fileNum,
-			roomInfo._musicFile._subfile);
+		_vm->_sound->_music = _vm->_files->loadFile(roomInfo._musicFile);
 		_vm->_sound->_midiSize = _vm->_files->_filesize;
 		_vm->_sound->midiPlay();
 		_vm->_sound->_musicRepeat = true;
@@ -200,16 +199,14 @@ void Room::loadRoomData(const byte *roomData) {
 	// Load script data
 	_vm->_scripts->freeScriptData();
 	if (roomInfo._scriptFile._fileNum != -1) {
-		const byte *data = _vm->_files->loadFile(roomInfo._scriptFile._fileNum,
-			roomInfo._scriptFile._subfile);
+		const byte *data = _vm->_files->loadFile(roomInfo._scriptFile);
 		_vm->_scripts->setScript(data, _vm->_files->_filesize);
 	}
 
 	// Load animation data
 	_vm->_animation->freeAnimationData();
 	if (roomInfo._animFile._fileNum != -1) {
-		byte *data = _vm->_files->loadFile(roomInfo._animFile._fileNum,
-			roomInfo._animFile._subfile);
+		byte *data = _vm->_files->loadFile(roomInfo._animFile);
 		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
 	}
 
@@ -726,31 +723,25 @@ RoomInfo::RoomInfo(const byte *data, int gameType) {
 	else
 		_estIndex = -1;
 
-	_musicFile._fileNum = stream.readSint16LE();
-	_musicFile._subfile = stream.readUint16LE();
+	_musicFile.load(stream);
 	_scaleH1 = stream.readByte();
 	_scaleH2 = stream.readByte();
 	_scaleN1 = stream.readByte();
-	_playFieldFile._fileNum = stream.readSint16LE();
-	_playFieldFile._subfile = stream.readUint16LE();
+	_playFieldFile.load(stream);
 
 	for (byte cell = stream.readByte(); cell != 0xff; cell = stream.readByte()) {
 		CellIdent ci;
 		ci._cell = cell;
-		ci._fileNum = stream.readSint16LE();
-		ci._subfile = stream.readUint16LE();
+		ci.load(stream);
 
 		_cells.push_back(ci);
 	}
 
-	_scriptFile._fileNum = stream.readSint16LE();
-	_scriptFile._subfile = stream.readUint16LE();
-	_animFile._fileNum = stream.readSint16LE();
-	_animFile._subfile = stream.readUint16LE();
+	_scriptFile.load(stream);
+	_animFile.load(stream);
 	_scaleI = stream.readByte();
 	_scrollThreshold = stream.readByte();
-	_paletteFile._fileNum = stream.readSint16LE();
-	_paletteFile._subfile = stream.readUint16LE();
+	_paletteFile.load(stream);
 	if (_paletteFile._fileNum == -1) {
 		_startColor = _numColors = 0;
 	} else {
@@ -760,10 +751,9 @@ RoomInfo::RoomInfo(const byte *data, int gameType) {
 
 	for (int16 v = stream.readSint16LE(); v != -1; v = stream.readSint16LE()) {
 		ExtraCell ec;
-		ec._vidTable = v;
-		ec._vidTable1 = stream.readSint16LE();
-		ec._vidSTable = stream.readSint16LE();
-		ec._vidSTable1 = stream.readSint16LE();
+		ec._vid._fileNum = v;
+		ec._vid._subfile = stream.readSint16LE();
+		ec._vidSound.load(stream);
 
 		_extraCells.push_back(ec);
 	}
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 985f5cba66..2a834f8855 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -104,7 +104,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetTimer, 
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
-		&Scripts::cmdSetTravel, &Scripts::CMDSETVID, &Scripts::CMDPLAYVID, 
+		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::CMDPLAYVID, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
@@ -113,7 +113,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::CMDWAIT, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
-		&Scripts::CMDFREESOUND, &Scripts::CMDSETVIDSND, &Scripts::CMDPLAYVIDSND,
+		&Scripts::CMDFREESOUND, &Scripts::cmdSetVideoSound, &Scripts::CMDPLAYVIDSND,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
@@ -417,7 +417,16 @@ void Scripts::cmdSetTravel() {
 		_data->skip(2);
 }
 
-void Scripts::CMDSETVID() { error("TODO CMDSETVID"); }
+void Scripts::cmdSetVideo() { 
+	FileIdent fi;
+	fi._fileNum = _data->readSint16LE();
+	fi._subfile = _data->readUint16LE();
+	int cellIndex = _data->readUint16LE();
+	int rate = _data->readUint16LE();
+
+	_vm->_video->setVideo(_vm->_extraCells[cellIndex]._vid, fi, rate);
+}
+
 void Scripts::CMDPLAYVID() { error("TODO CMDPLAYVID"); }
 
 void Scripts::cmdPlotImage() {
@@ -645,12 +654,22 @@ void Scripts::cmdClearBlock() {
 
 void Scripts::cmdLoadSound() {
 	int idx = _data->readSint16LE();
-	_vm->_sound->_soundTable[0]._data = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSTable, _vm->_extraCells[idx]._vidSTable1);
+	_vm->_sound->_soundTable[0]._data = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSound);
 	_vm->_sound->_soundPriority[0] = 1;
 }
 
 void Scripts::CMDFREESOUND() { error("TODO CMDFREESOUND"); }
-void Scripts::CMDSETVIDSND() { error("TODO CMDSETVIDSND"); }
+
+void Scripts::cmdSetVideoSound() { 
+	_data->skip(4);
+	cmdLoadSound();
+	_data->skip(-6);
+	cmdSetVideo();
+
+	_vm->_sound->_soundFrame = _data->readUint16LE();
+	_vm->_sound->_soundFlag = false;
+}
+
 void Scripts::CMDPLAYVIDSND() { error("TODO CMDPLAYVIDSND"); }
 void Scripts::CMDPUSHLOCATION() { error("TODO CMDPUSHLOCATION"); }
 
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index ae4c7559e0..93cd495be6 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -90,7 +90,7 @@ protected:
 	void cmdSetTimer();
 	void cmdCheckTimer();
 	void cmdSetTravel();
-	void CMDSETVID();
+	void cmdSetVideo();
 	void CMDPLAYVID();
 	void cmdPlotImage();
 	void cmdSetDisplay();
@@ -114,7 +114,7 @@ protected:
 	void cmdClearBlock();
 	void cmdLoadSound();
 	void CMDFREESOUND();
-	void CMDSETVIDSND();
+	void cmdSetVideoSound();
 	void CMDPLAYVIDSND();
 	void CMDPUSHLOCATION();
 	void cmdPlayerOff();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index c6897282fa..aebd76fe84 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -36,6 +36,8 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 	_music = nullptr;
 	_midiSize = 0;
 	_musicRepeat = false;
+	_soundFrame = 0;
+	_soundFlag = false;
 }
 
 SoundManager::~SoundManager() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index dd94396fa9..cb73bae52c 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -51,7 +51,8 @@ public:
 	byte *_music;
 	int _midiSize;
 	bool _musicRepeat;
-
+	int _soundFrame;
+	bool _soundFlag;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
new file mode 100644
index 0000000000..a025d31022
--- /dev/null
+++ b/engines/access/video.cpp
@@ -0,0 +1,35 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/video.h"
+
+namespace Access {
+
+VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
+
+}
+
+void VideoPlayer::setVideo(FileIdent &fi1, FileIdent &fi2, int rate) {
+	error("TODO: setVideo");
+}
+
+} // End of namespace Access
diff --git a/engines/access/video.h b/engines/access/video.h
new file mode 100644
index 0000000000..b21f006a97
--- /dev/null
+++ b/engines/access/video.h
@@ -0,0 +1,41 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_VIDEO_H
+#define ACCESS_VIDEO_H
+
+#include "common/scummsys.h"
+#include "access/data.h"
+#include "access/files.h"
+
+namespace Access {
+
+class VideoPlayer: public Manager {
+public:
+	VideoPlayer(AccessEngine *vm);
+
+	void setVideo(FileIdent &fi1, FileIdent &fi2, int rate);
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_VIDEO_H */
-- 
cgit v1.2.3


From 148eb972abad3d1ac8b8685a25b88f74fb5dae5e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 14:28:07 -0400
Subject: ACCESS: Fix fade outs

---
 engines/access/screen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index af97e2e236..f62c2f5baf 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -139,7 +139,7 @@ void Screen::forceFadeOut() {
 
 	do {
 		repeatFlag = false;
-		for (srcP = &_tempPalette[0], count = 0; count < PALETTE_COUNT; ++count, ++srcP) {
+		for (srcP = &_tempPalette[0], count = 0; count < PALETTE_SIZE; ++count, ++srcP) {
 			int v = *srcP;
 			if (v) {
 				repeatFlag = true;
@@ -149,7 +149,7 @@ void Screen::forceFadeOut() {
 
 		updatePalette();
 		g_system->delayMillis(10);
-	} while (repeatFlag);
+	} while (repeatFlag && !_vm->shouldQuit());
 }
 
 void Screen::forceFadeIn() {
-- 
cgit v1.2.3


From ec70f3feaf3f2e81376d0bbb0ab6c11554ef1fbc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 14:47:06 -0400
Subject: ACCESS: Fix graphic glitch when scrolling up

---
 engines/access/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index e85b68a24d..4be24f4253 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -719,7 +719,7 @@ scrollUp:
 			// Scroll up
 			if (scrollUp()) {
 				_scrollEnd = 4;
-				_vm->_screen->_scrollY = TILE_HEIGHT;
+				_vm->_screen->_scrollY &= TILE_HEIGHT;
 				_scrollFlag = true;
 			}
 		}
-- 
cgit v1.2.3


From f98d4668d718b04713ebe9ed2abc41f8bcaed609 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 17:19:54 -0400
Subject: ACCESS: Improvements for horizontal scrolling

---
 engines/access/asurface.cpp | 20 ++++++++++++++++++
 engines/access/asurface.h   |  8 +++++++
 engines/access/player.cpp   | 51 ++++++++++++++++++++++-----------------------
 engines/access/screen.cpp   | 12 -----------
 engines/access/screen.h     |  6 ------
 5 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index e88bd27c91..138978f9d9 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -324,4 +324,24 @@ void ASurface::flipHorizontal(ASurface &dest) {
 }
 
 
+void ASurface::moveBufferLeft() {
+	byte *p = (byte *)getPixels();
+	Common::copy(p + TILE_WIDTH, p + (w * h), p);
+}
+
+void ASurface::moveBufferRight() {
+	byte *p = (byte *)getPixels();
+	Common::copy_backward(p, p + (w * h) - TILE_WIDTH, p + (w * h));
+}
+
+void ASurface::moveBufferUp() {
+	byte *p = (byte *)getPixels();
+	Common::copy(p + w, p + (w * h), p);
+}
+
+void ASurface::moveBufferDown() {
+	byte *p = (byte *)getPixels();
+	Common::copy_backward(p, p + (w * (h - 1)), p + (w * h));
+}
+
 } // End of namespace Access
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 84fe90dbbd..62e292334d 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -97,6 +97,14 @@ public:
 	void restoreBlock();
 
 	void drawRect();
+
+	void moveBufferLeft();
+
+	void moveBufferRight();
+
+	void moveBufferUp();
+
+	void moveBufferDown();
 };
 
 class SpriteFrame : public ASurface {
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 4be24f4253..7df277c3a0 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -738,7 +738,7 @@ bool Player::scrollUp() {
 	while (_vm->_screen->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
 			_vm->_screen->_scrollY -= TILE_HEIGHT;
 		++_vm->_screen->_scrollRow;
-		_vm->_screen->moveBufferUp();
+		_vm->_buffer1.moveBufferUp();
 
 		_vm->_room->buildRow(_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight,
 			_vm->_screen->_vWindowLinesTall * _vm->_screen->_bufferBytesWide);
@@ -766,7 +766,7 @@ bool Player::scrollDown() {
 		if (--_vm->_screen->_scrollRow < 0)
 			break;
 
-		_vm->_screen->moveBufferDown();
+		_vm->_buffer1.moveBufferDown();
 		_vm->_room->buildRow(_vm->_screen->_scrollRow, 0);
 
 		if (_vm->_screen->_scrollY >= 0)
@@ -780,28 +780,29 @@ bool Player::scrollDown() {
 }
 
 bool Player::scrollLeft() {
-	_scrollAmount = -(_vm->_screen->_clipWidth - _playerX - _scrollThreshold);
-	if ((_vm->_rScrollCol + _vm->_screen->_vWindowWidth) == _vm->_room->_playFieldWidth) {
+	Screen &screen = *_vm->_screen;
+	_scrollAmount = -(screen._clipWidth - _playerX - _scrollThreshold);
+	if ((_vm->_rScrollCol + screen._vWindowWidth) == _vm->_room->_playFieldWidth) {
 		_scrollEnd = 2;
-		_vm->_screen->_scrollX = 0;
+		screen._scrollX = 0;
 		_scrollFlag = true;
 		return true;
 	} else {
 		_scrollFlag = true;
-		_vm->_screen->_scrollX = _vm->_screen->_scrollX + _scrollAmount;
+		screen._scrollX = screen._scrollX + _scrollAmount;
 
-		while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
-			_vm->_screen->_scrollX -= TILE_WIDTH;
-			++_vm->_screen->_scrollCol;
-			_vm->_screen->moveBufferLeft();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol +
-				_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+		do {
+			if (screen._scrollX < TILE_WIDTH)
+				return true;
 
-			if (_vm->_screen->_scrollX < TILE_WIDTH)
-				return _playerDirection == UPRIGHT;
-		}
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth,
+				screen._vWindowBytesWide);
+		} while (!_vm->shouldQuit() && (screen._scrollX >= TILE_WIDTH));
 
-		return true;
+		return (_playerDirection == UPRIGHT);
 	}
 }
 
@@ -811,18 +812,16 @@ bool Player::scrollRight() {
 	_vm->_screen->_scrollX -= _scrollAmount;
 
 	if (_vm->_screen->_scrollX < 0) {
-		_scrollFlag = true;
-		_vm->_screen->_scrollX += _scrollAmount;
+		do {
+			_vm->_screen->_scrollX += TILE_WIDTH;
+			if (--_vm->_screen->_scrollCol < 0)
+				return true;
 
-		while (_vm->_screen->_scrollX >= TILE_WIDTH && !_vm->shouldQuit()) {
-			_vm->_screen->_scrollX -= TILE_WIDTH;
-			_vm->_screen->moveBufferLeft();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol -
-				_vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+			_vm->_buffer1.moveBufferRight();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
+		} while (!_vm->shouldQuit() && (_vm->_screen->_scrollX >= 0));
 
-			if (_vm->_screen->_scrollX < TILE_WIDTH)
-				return _playerDirection == UPLEFT;
-		}
+		return false;
 	}
 
 	return true;
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index f62c2f5baf..57002c0f7c 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -224,18 +224,6 @@ void Screen::restoreScreen() {
 	_screenYOff = _screenSave._screenYOff;
 }
 
-void Screen::moveBufferLeft() {
-	error("TODO: LEFT");
-}
-
-void Screen::moveBufferDown() {
-	error("TODO: DOWN");
-}
-
-void Screen::moveBufferUp() {
-	error("TODO: UP");
-}
-
 void Screen::copyBlock(ASurface *src, const Common::Rect &bounds) {
 	Common::Rect destBounds = bounds;
 	destBounds.translate(_windowXAdd, _windowYAdd + _screenYOff);
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 5ffba5ad3e..3935f2c149 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -149,12 +149,6 @@ public:
 	 * Restores previously saved screen display state variables
 	 */
 	void restoreScreen();
-
-	void moveBufferLeft();
-
-	void moveBufferDown();
-
-	void moveBufferUp();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 955df7a94ce21d311d6e34d263d96070548d855e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 23 Aug 2014 23:49:08 +0200
Subject: ACCESS: Start implementing loadEstablish

---
 engines/access/access.cpp | 34 ++++++++++++++++++++++++++++++----
 engines/access/access.h   |  8 +++++++-
 engines/access/files.cpp  |  4 ++++
 engines/access/files.h    |  5 +++++
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 4035870dad..e90e5bad22 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -83,6 +83,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_establishFlag = false;
 	_establishMode = 0;
 	_establishGroup = 0;
+	_establishCtrlTblOfs = 0;
 	Common::fill(&_help1[0], &_help1[366], 0);
 	Common::fill(&_help2[0], &_help2[366], 0);
 	Common::fill(&_help1[0], &_help3[366], 0);
@@ -102,6 +103,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_screenVirtX = 0;
 	_lastTime = g_system->getMillis();
 	_curTime = 0;
+	_narateFile = 0;
+	_txtPages = 0;
+	_sndSubFile = 0;
 }
 
 AccessEngine::~AccessEngine() {
@@ -233,9 +237,31 @@ void AccessEngine::establishCenter(int esatabIndex, int sub) {
 	doEstablish(esatabIndex, sub);
 }
 
-byte *AccessEngine::loadEstablish(int sub) {
-	warning("TODO: loadEstablish");
-	return nullptr;
+const char *const _estTable[] = { "ETEXT0.DAT", "ETEXT1.DAT", "ETEXT2.DAT", "ETEXT3.DAT" };
+
+void AccessEngine::loadEstablish(int sub) {
+	if (!_files->existFile("ETEXT.DAT")) {
+		int oldGroup = _establishGroup;
+		_establishGroup = 0;
+		
+		_eseg = _files->loadFile(_estTable[oldGroup]);
+	} else {
+		_eseg = _files->loadFile("ETEXT.DAT");
+	}
+
+	_establishCtrlTblOfs = READ_LE_UINT16(_eseg);
+
+	int ofs = _establishCtrlTblOfs + (sub * 2);
+	int idx = READ_LE_UINT16(_eseg + ofs);
+	_narateFile = READ_LE_UINT16(_eseg + idx);
+	_txtPages = READ_LE_UINT16(_eseg + idx + 2);
+
+	if (!_txtPages)
+		return;
+
+	_sndSubFile = READ_LE_UINT16(_eseg + idx + 4);
+	for (int i = 0; i < _txtPages; ++i)
+		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
 }
 
 void AccessEngine::doEstablish(int esatabIndex, int sub) {
@@ -260,7 +286,7 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 
 	_bubbleBox->_maxChars = 37;
 	_fonts._printOrg = _fonts._printStart = Common::Point(48, 35);
-	_eseg = loadEstablish(sub);
+	loadEstablish(sub);
 	_et = sub;
 	warning("CHECKME: Use of di");
 	_printEnd = 155;
diff --git a/engines/access/access.h b/engines/access/access.h
index 0d4ad19452..db969357aa 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -73,6 +73,8 @@ enum AccessDebugChannels {
 
 struct AccessGameDescription;
 
+extern const char *const _estTable[];
+
 class AccessEngine : public Engine {
 private:
 	uint32 _lastTime, _curTime;
@@ -132,6 +134,7 @@ public:
 	bool _establishFlag;
 	int _establishMode;
 	int _establishGroup;
+	int _establishCtrlTblOfs;
 	int _numAnimTimers;
 	TimerList _timers;
 	FontManager _fonts;
@@ -164,6 +167,9 @@ public:
 	int _et;
 	int _printEnd;
 	int _txtPages;
+	int _narateFile;
+	int _sndSubFile;
+	int _countTbl[6];
 
 	// Fields that are included in savegames
 	int _conversation;
@@ -220,7 +226,7 @@ public:
 	 */
 	void freeInactiveData();
 
-	byte *AccessEngine::loadEstablish(int sub);
+	void AccessEngine::loadEstablish(int sub);
 
 	void establish(int esatabIndex, int sub);
 
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index c805121d50..da3842492c 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -82,6 +82,10 @@ byte *FileManager::loadFile(const Common::String &filename) {
 	return handleFile();
 }
 
+bool FileManager::existFile(const Common::String &filename) {
+	return _file.exists(filename);
+}
+
 void FileManager::openFile(const Common::String &filename) {
 	// Open up the file
 	_fileNumber = -1;
diff --git a/engines/access/files.h b/engines/access/files.h
index 38d9179195..b91da7d6ff 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -63,6 +63,11 @@ public:
 	FileManager(AccessEngine *vm);
 	~FileManager();
 
+	/**
+	 * Check the existence of a given file
+	 */
+	bool FileManager::existFile(const Common::String &filename);
+
 	/**
 	 * Load a given subfile from a container file
 	 */
-- 
cgit v1.2.3


From ee62d6c1cfce009331050fb9bf8bfecbb8f51472 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Aug 2014 23:21:17 -0400
Subject: ACCESS: In progress inventory display screen

---
 engines/access/asurface.cpp  |   3 +
 engines/access/asurface.h    |   2 +
 engines/access/events.cpp    |  88 ++++++++++---------
 engines/access/events.h      |  10 ++-
 engines/access/files.cpp     |   8 ++
 engines/access/files.h       |   3 +
 engines/access/inventory.cpp | 202 ++++++++++++++++++++++++++++++++++++++++++-
 engines/access/inventory.h   |  41 +++++++++
 engines/access/resources.cpp |  29 +++++++
 engines/access/resources.h   |   2 +
 engines/access/room.cpp      |  27 ++----
 engines/access/room.h        |  12 ++-
 12 files changed, 363 insertions(+), 64 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 138978f9d9..ce977f6d83 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -265,6 +265,9 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	}
 }
 
+void ASurface::copyTo(ASurface *dest) {
+	copyTo(dest, Common::Point());
+}
 
 void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
 	sPlotF(frame, Common::Rect(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h));
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 62e292334d..f5e5f48e7b 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -92,6 +92,8 @@ public:
 
 	void copyTo(ASurface *dest, const Common::Rect &bounds);
 
+	void copyTo(ASurface *dest);
+
 	void saveBlock(const Common::Rect &bounds);
 
 	void restoreBlock();
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 78bbdbf1ea..15c8f8cff0 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -41,11 +41,11 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_priorFrameTime = 0;
 	_leftButton = _rightButton = false;
 	_mouseCol = _mouseRow = 0;
-	_mouseMode = 0;
 	_cursorExitFlag = false;
 }
 
 EventsManager::~EventsManager() {
+	_invCursor.free();
 }
 
 void EventsManager::setCursor(CursorType cursorId) {
@@ -53,50 +53,56 @@ void EventsManager::setCursor(CursorType cursorId) {
 		return;	
 	_cursorId = cursorId;
 	
-	if (_mouseMode == 1 && cursorId == CURSOR_ARROW)
-		_mouseMode = 2;
-	else if (_mouseMode == 2 && cursorId != CURSOR_ARROW)
-		_mouseMode = 1;
-
-	// Get a pointer to the mouse data to use, and get the cursor hotspot
-	const byte *srcP = Amazon::CURSORS[cursorId];
-	int hotspotX = (int16)READ_LE_UINT16(srcP);
-	int hotspotY = (int16)READ_LE_UINT16(srcP + 2);
-	srcP += 4;
-
-	// Create a surface to build up the cursor on
-	Graphics::Surface cursorSurface;
-	cursorSurface.create(16, 16, Graphics::PixelFormat::createFormatCLUT8());
-	byte *destP = (byte *)cursorSurface.getPixels();
-	Common::fill(destP, destP + CURSOR_WIDTH * CURSOR_HEIGHT, 0);
-
-	// Loop to build up the cursor
-	for (int y = 0; y < CURSOR_HEIGHT; ++y) {
-		destP = (byte *)cursorSurface.getBasePtr(0, y);
-		int width = CURSOR_WIDTH;
-		int skip = *srcP++;
-		int plot = *srcP++;
-		if (skip >= width)
-			break;
+	if (cursorId == CURSOR_INVENTORY) {
+		// Set the cursor
+		CursorMan.replaceCursor(_invCursor.getPixels(), _invCursor.w, _invCursor.h,
+			0, 0, 0);
+	} else {
+		// Get a pointer to the mouse data to use, and get the cursor hotspot
+		const byte *srcP = Amazon::CURSORS[cursorId];
+		int hotspotX = (int16)READ_LE_UINT16(srcP);
+		int hotspotY = (int16)READ_LE_UINT16(srcP + 2);
+		srcP += 4;
+
+		// Create a surface to build up the cursor on
+		Graphics::Surface cursorSurface;
+		cursorSurface.create(16, 16, Graphics::PixelFormat::createFormatCLUT8());
+		byte *destP = (byte *)cursorSurface.getPixels();
+		Common::fill(destP, destP + CURSOR_WIDTH * CURSOR_HEIGHT, 0);
+
+		// Loop to build up the cursor
+		for (int y = 0; y < CURSOR_HEIGHT; ++y) {
+			destP = (byte *)cursorSurface.getBasePtr(0, y);
+			int width = CURSOR_WIDTH;
+			int skip = *srcP++;
+			int plot = *srcP++;
+			if (skip >= width)
+				break;
+
+			// Skip over pixels
+			destP += skip;
+			width -= skip;
+
+			// Write out the pixels to plot
+			while (plot > 0 && width > 0) {
+				*destP++ = *srcP++;
+				--plot;
+				--width;
+			}
+		}
 
-		// Skip over pixels
-		destP += skip;
-		width -= skip;
+		// Set the cursor
+		CursorMan.replaceCursor(cursorSurface.getPixels(), CURSOR_WIDTH, CURSOR_HEIGHT,
+			hotspotX, hotspotY, 0);
 
-		// Write out the pixels to plot
-		while (plot > 0 && width > 0) {
-			*destP++ = *srcP++;
-			--plot;
-			--width;
-		}
+		// Free the cursor surface
+		cursorSurface.free();
 	}
+}
 
-	// Set the cursor
-	CursorMan.replaceCursor(cursorSurface.getPixels(), CURSOR_WIDTH, CURSOR_HEIGHT,
-		hotspotX, hotspotY, 0);
-
-	// Free the cursor surface
-	cursorSurface.free();
+void EventsManager::setCursorData(Graphics::Surface *src, const Common::Rect &r) {
+	_invCursor.create(r.width(), r.height(), Graphics::PixelFormat::createFormatCLUT8());
+	_invCursor.copyRectToSurface(*src, 0, 0, r);
 }
 
 void EventsManager::showCursor() {
diff --git a/engines/access/events.h b/engines/access/events.h
index 2ced71f50e..fdfb0a5043 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -32,7 +32,8 @@ namespace Access {
 enum CursorType { 
 	CURSOR_NONE = -1,
 	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_LOOK, 
-	CURSOR_USE, CURSOR_TAKE, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP
+	CURSOR_USE, CURSOR_TAKE, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP,
+	CURSOR_INVENTORY = 99
 };
 
 #define GAME_FRAME_RATE 100
@@ -45,6 +46,7 @@ private:
 	AccessEngine *_vm;
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
+	Graphics::Surface _invCursor;
 
 	bool checkForNextFrameCounter();
 
@@ -55,7 +57,6 @@ public:
 	bool _leftButton, _rightButton;
 	Common::Point _mousePos;
 	int _mouseCol, _mouseRow;
-	int _mouseMode;
 	bool _cursorExitFlag;
 	Common::FixedStack<Common::KeyState> _keypresses;
 public:
@@ -74,6 +75,11 @@ public:
 	 */
 	void setCursor(CursorType cursorId);
 
+	/**
+	 * Set the image for the inventory cursor
+	 */
+	void setCursorData(Graphics::Surface *src, const Common::Rect &r);
+
 	/**
 	 * Return the current cursor Id
 	 */
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index da3842492c..230d2a8715 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -39,6 +39,14 @@ void FileIdent::load(Common::SeekableReadStream &s) {
 
 /*------------------------------------------------------------------------*/
 
+CellIdent::CellIdent(int cell, int fileNum, int subfile) {
+	_cell = cell;
+	_fileNum = fileNum;
+	_subfile = subfile;
+}
+
+/*------------------------------------------------------------------------*/
+
 FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	switch (vm->getGameID()) {
 	case GType_Amazon:
diff --git a/engines/access/files.h b/engines/access/files.h
index b91da7d6ff..d1a4d5aafd 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -43,6 +43,9 @@ struct FileIdent {
 
 struct CellIdent : FileIdent {
 	byte _cell;
+
+	CellIdent() {}
+	CellIdent(int cell, int fileNum, int subfile);
 };
 
 class FileManager {
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index e90ad62344..6c56f6b90b 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -22,6 +22,7 @@
 
 #include "access/inventory.h"
 #include "access/access.h"
+#include "access/resources.h"
 #include "access/amazon/amazon_resources.h"
 #include "access/martian/martian_resources.h"
 
@@ -35,6 +36,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_invModeFlag = false;
 	_startAboutItem = 0;
 	_startTravelItem = 0;
+	_iconDisplayFlag = false;
 
 	const char *const *names;
 	switch (vm->getGameID()) {
@@ -74,9 +76,205 @@ void InventoryManager::refreshInventory() {
 }
 
 int InventoryManager::newDisplayInv() {
-	warning("TODO: newDisplayInv");
-	return 0;
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+	Room &room = *_vm->_room;
+	FileManager &files = *_vm->_files;
+
+	_invModeFlag = true;
+	_vm->_timers.saveTimers();
+	
+	if (room._tile && !_invRefreshFlag) {
+		_vm->_buffer1.copyTo(&_savedBuffer1);
+		screen.copyTo(&_savedScreen);
+	}
+
+	savedFields();
+	screen.setPanel(1);
+	events._cursorExitFlag = false;
+	getList();
+	initFields();
+
+	files.loadScreen(99, 0);
+	_vm->_buffer1.copyTo(&_vm->_buffer2);
+	_vm->copyBF2Vid();
+
+	// Set cells
+	Common::Array<CellIdent> cells;
+	cells.push_back(CellIdent(99, 99, 1));
+	_vm->loadCells(cells);
+
+	showAllItems();
+
+	if (!_invRefreshFlag) {
+		chooseItem();
+		if (_vm->_useItem != -1) {
+			int savedScale = _vm->_scale;
+			_vm->_scale = 153;
+			_vm->_screen->setScaleTable(_vm->_scale);
+			_vm->_buffer1.clearBuffer();
+
+			SpriteResource *spr = _vm->_objectsTable[99];
+			SpriteFrame *frame = spr->getFrame(_vm->_useItem);
+
+			int w = screen._scaleTable1[46];
+			int h = screen._scaleTable1[35];
+			_vm->_buffer1.sPlotF(frame, Common::Rect(0, 0, w, h));
+			events.setCursorData(&_vm->_buffer1, Common::Rect(0, 0, w, h));
+
+			_vm->_scale = savedScale;
+			screen.setScaleTable(_vm->_scale);
+		}
+	}
+
+	freeInvCells();
+	screen.setPanel(0);
+	events.debounceLeft();
+
+	restoreFields();
+	screen.restorePalette();
+	if (!screen._vesaMode && !_invRefreshFlag) {
+		screen.clearBuffer();
+		screen.setPalette();
+	}
+
+	if (!room._tile && !_invRefreshFlag) {
+		_savedBuffer1.copyTo(&_vm->_buffer1);
+		_savedScreen.copyTo(_vm->_screen);
+	} else {
+		screen.setBufferScan();
+		room.buildScreen();
+
+		if (!screen._vesaMode) {
+			screen.fadeOut();
+			_vm->copyBF2Vid();
+		}
+	}
+
+	events._cursorExitFlag = false;
+	screen._screenChangeFlag = false;
+	_invModeFlag = false;
+	events.debounceLeft();
+	_vm->_timers.restoreTimers();
+	_vm->_startup = 1;
+
+	int result = 0;
+	if (!_invRefreshFlag) {
+		if (_vm->_useItem == -1) {
+			result = 2;
+		}
+	}
+
+	_invRefreshFlag = false;
+	_invChangeFlag = false;
+	return result;
+}
+
+void InventoryManager::savedFields() {
+	Screen &screen = *_vm->_screen;
+	Room &room = *_vm->_room;
+
+	_fields._vWindowHeight = screen._vWindowHeight;
+	_fields._vWindowLinesTall = screen._vWindowLinesTall;
+	_fields._vWindowWidth = screen._vWindowWidth;
+	_fields._vWindowBytesWide = screen._vWindowBytesWide;
+	_fields._playFieldHeight = room._playFieldHeight;
+	_fields._playFieldWidth = room._playFieldWidth;
+	_fields._windowXAdd = screen._windowXAdd;
+	_fields._windowYAdd = screen._windowYAdd;
+	_fields._screenYOff = screen._screenYOff;
+	_fields._scrollX = screen._scrollX;
+	_fields._scrollY = screen._scrollY;
+	_fields._clipWidth = screen._clipWidth;
+	_fields._clipHeight = screen._clipHeight;
+	_fields._bufferStart = screen._bufferStart;
+	_fields._scrollCol = screen._scrollCol;
+	_fields._scrollRow = screen._scrollRow;
+}
+
+void InventoryManager::restoreFields() {
+	Screen &screen = *_vm->_screen;
+	Room &room = *_vm->_room;
+
+	screen._vWindowHeight = _fields._vWindowHeight;
+	screen._vWindowLinesTall = _fields._vWindowLinesTall;
+	screen._vWindowWidth = _fields._vWindowWidth;
+	screen._vWindowBytesWide = _fields._vWindowBytesWide;
+	room._playFieldHeight = _fields._playFieldHeight;
+	room._playFieldWidth = _fields._playFieldWidth;
+	screen._windowXAdd = _fields._windowXAdd;
+	screen._windowYAdd = _fields._windowYAdd;
+	screen._screenYOff = _fields._screenYOff;
+	screen._scrollX = _fields._scrollX;
+	screen._scrollY = _fields._scrollY;
+	screen._clipWidth = _fields._clipWidth;
+	screen._clipHeight = _fields._clipHeight;
+	screen._bufferStart = _fields._bufferStart;
+	screen._scrollCol = _fields._scrollCol;
+	screen._scrollRow = _fields._scrollRow;
+}
+
+void InventoryManager::initFields() {
+	Screen &screen = *_vm->_screen;
+	Room &room = *_vm->_room;
+
+	screen._vWindowHeight = screen.h;
+	room._playFieldHeight = screen.h;
+	screen._vWindowLinesTall = screen.h;
+	screen._clipHeight = screen.h;
+	room._playFieldWidth = screen.w;
+	screen._vWindowWidth = screen.w;
+	screen._vWindowBytesWide = screen.w;
+	screen._clipWidth = screen.w;
+
+	screen._windowXAdd = 0;
+	screen._windowYAdd = 0;
+	screen._screenYOff = 0;
+	screen._scrollX = screen._scrollY = 0;
+	screen._bufferStart.x = 0;
+	screen._bufferStart.y = 0;
+
+	_vm->_buffer1.clearBuffer();
+	_vm->_buffer2.clearBuffer();
+	if (!_invRefreshFlag && !screen._vesaMode)
+		screen.clearBuffer();
+
+	screen.savePalette();
+}
+
+void InventoryManager::getList() {
+	_items.clear();
+	for (uint i = 0; i < _inv.size(); ++i) {
+		if (_inv[i])
+			_items.push_back(i);
+	}
+}
+
+void InventoryManager::showAllItems() {
+	for (uint i = 0; i < _items.size(); ++i)
+		putInvIcon(i, _items[i]);
+}
+
+void InventoryManager::putInvIcon(int itemIndex, int itemId) {
+	SpriteResource *spr = _vm->_objectsTable[99];
+	assert(spr);
+	Common::Point pt((itemIndex % 6) * 46 + 23, (itemIndex / 6) * 35 + 15);
+	_vm->_buffer2.plotImage(spr, itemId, pt);
+
+	if (_iconDisplayFlag) {
+		_vm->_buffer1.copyBlock(&_vm->_buffer2, Common::Rect(pt.x, pt.y, pt.x + 46, pt.y + 35));
+	}
+}
+
+void InventoryManager::chooseItem() {
+	_vm->_useItem = -1;
+
+	error("TODO: chooseItem");
 }
 
+void InventoryManager::freeInvCells() {
+	delete _vm->_objectsTable[99];
+	_vm->_objectsTable[99] = nullptr;
+}
 
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index dddfe2eda1..019d7f4215 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -28,10 +28,51 @@
 #include "common/rect.h"
 #include "common/str-array.h"
 #include "access/data.h"
+#include "access/asurface.h"
 
 namespace Access {
 
 class InventoryManager : public Manager {
+	struct SavedFields {
+		int _vWindowHeight;
+		int _vWindowLinesTall;
+		int _vWindowWidth;
+		int _vWindowBytesWide;
+		int _playFieldHeight;
+		int _playFieldWidth;
+		int _windowXAdd;
+		int _windowYAdd;
+		int _screenYOff;
+		int _scrollX;
+		int _scrollY;
+		int _clipWidth;
+		int _clipHeight;
+		Common::Point _bufferStart;
+		int _scrollCol;
+		int _scrollRow;
+	};
+private:
+	Common::Array<int> _items;
+	ASurface _savedBuffer1;
+	ASurface _savedScreen;
+	SavedFields _fields;
+	bool _iconDisplayFlag;
+
+	void savedFields();
+
+	void restoreFields();
+
+	void initFields();
+
+	void getList();
+
+	void showAllItems();
+
+	void putInvIcon(int itemIndex, int itemId);
+
+	void chooseItem();
+
+	void freeInvCells();
 public:
 	Common::Array<int> _inv;
 	Common::StringArray _names;
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index f0d74ccd2a..e5a27a8ba1 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -89,4 +89,33 @@ const char *const GENERAL_MESSAGES[] = {
 	GO_MESSAGE, TALK_MESSAGE, HELP_MESSAGE, HELP_MESSAGE, USE_MESSAGE
 };
 
+const int INVCOORDS[][4] = {
+	{ 23, 68, 15, 49 },
+	{ 69, 114, 15, 49 },
+	{ 115, 160, 15, 49 },
+	{ 161, 206, 15, 49 },
+	{ 207, 252, 15, 49 },
+	{ 253, 298, 15, 49 },
+	{ 23, 68, 50, 84 },
+	{ 69, 114, 50, 84 },
+	{ 115, 160, 50, 84 },
+	{ 161, 206, 50, 84 },
+	{ 207, 252, 50, 84 },
+	{ 253, 298, 50, 84 },
+	{ 23, 68, 85, 119 },
+	{ 69, 114, 85, 119 },
+	{ 115, 160, 85, 119 },
+	{ 161, 206, 85, 119 },
+	{ 207, 252, 85, 119 },
+	{ 253, 298, 85, 119 },
+	{ 23, 68, 120, 154 },
+	{ 69, 114, 120, 154 },
+	{ 115, 160, 120, 154 },
+	{ 161, 206, 120, 154 },
+	{ 207, 252, 120, 154 },
+	{ 253, 298, 120, 154 },
+	{ 237, 298, 177, 193 },
+	{ 25, 85, 177, 193 }
+};
+
 } // End of namespace Access
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 241ed3a636..6fb781e0d1 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -58,6 +58,8 @@ extern const int RMOUSE[10][2];
 
 extern const char *const GENERAL_MESSAGES[];
 
+extern const int INVCOORDS[][4];
+
 } // End of namespace Access
 
 #endif /* ACCESS_RESOURCES_H */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 90ef3470db..a4be02d263 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -451,34 +451,28 @@ void Room::executeCommand(int commandId) {
 
 	switch (commandId) {
 	case 0:
-		_vm->_events->_normalMouse = CURSOR_LOOK;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_LOOK);
 		break;
 	case 2:
-		_vm->_events->_normalMouse = CURSOR_USE;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_USE);
 		break;
 	case 3:
-		_vm->_events->_normalMouse = CURSOR_TAKE;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_TAKE);
 		break;
 	case 4:
-		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 		_vm->_events->setCursor(CURSOR_ARROW);
 		if (_vm->_inventory->newDisplayInv() == 2) {
 			commandOff();
 			return;
 		} else {
-			warning("TODO: al = _useItem");
+			// TODO: al = _useItem?
 		}
 		break;
 	case 5:
-		_vm->_events->_normalMouse = CURSOR_CLIMB;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_CLIMB);
 		break;
 	case 6:
-		_vm->_events->_normalMouse = CURSOR_TALK;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_TALK);
 		break;
 	case 7:
 		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
@@ -486,8 +480,7 @@ void Room::executeCommand(int commandId) {
 		_vm->_scripts->searchForSequence();
 		roomMenu();
 		_selectCommand = -1;
-		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_CROSSHAIRS);
 
 		_conFlag = true;
 		while (_conFlag && !_vm->shouldQuit()) {
@@ -497,8 +490,7 @@ void Room::executeCommand(int commandId) {
 		_vm->_boxSelect = true;
 		break;
 	case 8:
-		_vm->_events->_normalMouse = CURSOR_HELP;
-		_vm->_events->_mouseMode = 0;
+		_vm->_events->setCursor(CURSOR_HELP);
 		break;
 	default:
 		break;
@@ -524,8 +516,7 @@ void Room::executeCommand(int commandId) {
 
 void Room::commandOff() {
 	_selectCommand = -1;
-	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
-	_vm->_events->_mouseMode = 4;
+	_vm->_events->setCursor(CURSOR_CROSSHAIRS);
 	roomMenu();
 }
 
diff --git a/engines/access/room.h b/engines/access/room.h
index d876a30875..6cd3b8cad0 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -76,7 +76,6 @@ private:
 protected:
 	void loadRoomData(const byte *roomData);
 	void setupRoom();
-	void buildScreen();
 
 	/**
 	* Free the playfield data
@@ -141,8 +140,19 @@ public:
 	 */
 	void clearRoom();
 
+	/**
+	 * Builds up a game screen
+	 */
+	void buildScreen();
+
+	/**
+	 * Draw a column of a game scene
+	 */
 	void buildColumn(int playX, int screenX);
 
+	/**
+	 * Draw a row of a game scene
+	 */
 	void buildRow(int playY, int screenY);
 
 	void init4Quads();
-- 
cgit v1.2.3


From 7b1d0064fe3718142af2d764699d705cd2258669 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 24 Aug 2014 11:02:14 +0200
Subject: ACCESS: Fix the loading of text in doEstablish

---
 engines/access/access.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index e90e5bad22..0db3376697 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -289,11 +289,16 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 	loadEstablish(sub);
 	_et = sub;
 	warning("CHECKME: Use of di");
+	Common::String msg;
+	int idx = READ_LE_UINT16(_eseg + (sub * 2) + 2);
+	for (int i = idx; _eseg[i] != 0; ++i)
+		msg += _eseg[i];
+
 	_printEnd = 155;
 	if (_txtPages == 0)
-		warning("TODO: printText();");
+		warning("TODO: printText(%s)", msg.c_str());
 	else
-		warning("TODO: speakText();");
+		warning("TODO: speakText(%s)", msg.c_str());
 
 	_screen->forceFadeOut();
 	_screen->clearScreen();
-- 
cgit v1.2.3


From 1073646c8e20940ec606edac06ffd3e2eb015f49 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 12:18:41 -0400
Subject: ACCESS: Fix negative seek in cmdSetVideoSound

---
 engines/access/scripts.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2a834f8855..37d1d50899 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -660,12 +660,14 @@ void Scripts::cmdLoadSound() {
 
 void Scripts::CMDFREESOUND() { error("TODO CMDFREESOUND"); }
 
-void Scripts::cmdSetVideoSound() { 
+void Scripts::cmdSetVideoSound() {
+	uint32 startPos = _data->pos();
 	_data->skip(4);
 	cmdLoadSound();
-	_data->skip(-6);
+	_data->seek(startPos);
 	cmdSetVideo();
 
+	_data->skip(2);
 	_vm->_sound->_soundFrame = _data->readUint16LE();
 	_vm->_sound->_soundFlag = false;
 }
-- 
cgit v1.2.3


From 89a3c43da1318644b14531b69ed1b38708a6413a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 12:32:11 -0400
Subject: ACCESS: More work on inventory screen setup

---
 engines/access/asurface.cpp  |  3 +++
 engines/access/files.cpp     |  8 ++++++--
 engines/access/files.h       |  6 ++++++
 engines/access/inventory.cpp | 40 +++++++++++++++++++++++++++++++++++++---
 engines/access/inventory.h   |  3 +++
 5 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index ce977f6d83..0db44c4934 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -208,6 +208,9 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 }
 
 void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
+	if (dest->getPixels() == nullptr)
+		dest->create(w, h);
+
 	for (int yp = 0; yp < h; ++yp) {
 		byte *srcP = (byte *)getBasePtr(0, yp);
 		byte *destP = (byte *)dest->getBasePtr(destPos.x, destPos.y + yp);
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 230d2a8715..5cf467077d 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -104,17 +104,21 @@ void FileManager::openFile(const Common::String &filename) {
 	_filesize = _file.size();
 }
 
-void FileManager::loadScreen(int fileNum, int subfile) {
+void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile) {
 	setAppended(fileNum);
 	gotoAppended(subfile);
 	_vm->_screen->loadPalette(_stream);
 
 	// Get the data for the screen, and copy it over
 	byte *pSrc = handleFile();
-	Common::copy(pSrc, pSrc + _filesize, (byte *)_vm->_screen->getPixels());
+	Common::copy(pSrc, pSrc + _filesize, (byte *)dest->getPixels());
 	delete[] pSrc;
 }
 
+void FileManager::loadScreen(int fileNum, int subfile) {
+	loadScreen(_vm->_screen, fileNum, subfile);
+}
+
 void FileManager::loadScreen(const Common::String &filename) {
 	// Open the file
 	openFile(filename);
diff --git a/engines/access/files.h b/engines/access/files.h
index d1a4d5aafd..b13a796925 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/file.h"
+#include "graphics/surface.h"
 #include "access/decompress.h"
 
 namespace Access {
@@ -96,6 +97,11 @@ public:
 	*/
 	void loadScreen(const Common::String &filename);
 
+	/**
+	 * Load a screen resource onto a designated surface
+	 */
+	void loadScreen(Graphics::Surface *dest, int fileNum, int subfile);
+
 	/**
 	 * Open up a sub-file container file
 	 */
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 6c56f6b90b..80336e4dcc 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -54,6 +54,11 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 
 	for (uint i = 0; i < _inv.size(); ++i)
 		_names.push_back(names[i]);
+
+	for (uint i = 0; i < 26; ++i) {
+		const int *r = INVCOORDS[i];
+		_invCoords.push_back(Common::Rect(r[0], r[1], r[0] + r[2], r[1] + r[3]));
+	}
 }
 
 int &InventoryManager::operator[](int idx) {
@@ -95,7 +100,7 @@ int InventoryManager::newDisplayInv() {
 	getList();
 	initFields();
 
-	files.loadScreen(99, 0);
+	_vm->_files->loadScreen(&_vm->_buffer1, 99, 0);
 	_vm->_buffer1.copyTo(&_vm->_buffer2);
 	_vm->copyBF2Vid();
 
@@ -267,9 +272,26 @@ void InventoryManager::putInvIcon(int itemIndex, int itemId) {
 }
 
 void InventoryManager::chooseItem() {
+	EventsManager &events = *_vm->_events;
 	_vm->_useItem = -1;
-
-	error("TODO: chooseItem");
+	int selIndex;
+
+	while (!_vm->shouldQuit()) {
+		g_system->delayMillis(10);
+
+		// Poll events and wait for a click on a known area
+		events.pollEvents();
+		if (!events._leftButton || ((selIndex = coordIndexOf()) == -1))
+			continue;
+
+		if (selIndex > 23) {
+			if (selIndex == 25)
+				_vm->_useItem = -1;
+			break;
+		} else if (selIndex < (int)_items.size()) {
+			warning("TODO: Combine items");
+		}
+	}
 }
 
 void InventoryManager::freeInvCells() {
@@ -277,4 +299,16 @@ void InventoryManager::freeInvCells() {
 	_vm->_objectsTable[99] = nullptr;
 }
 
+int InventoryManager::coordIndexOf() {
+	const Common::Point pt = _vm->_events->_mousePos;
+
+	for (int i = 0; i < (int)_invCoords.size(); ++i) {
+		if (_invCoords[i].contains(pt))
+			return i;
+	}
+
+	return -1;
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 019d7f4215..cf8167d76c 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -53,6 +53,7 @@ class InventoryManager : public Manager {
 	};
 private:
 	Common::Array<int> _items;
+	Common::Array<Common::Rect> _invCoords;
 	ASurface _savedBuffer1;
 	ASurface _savedScreen;
 	SavedFields _fields;
@@ -73,6 +74,8 @@ private:
 	void chooseItem();
 
 	void freeInvCells();
+
+	int coordIndexOf();
 public:
 	Common::Array<int> _inv;
 	Common::StringArray _names;
-- 
cgit v1.2.3


From 6774dd42467265e4083fd7f97447d7ce2f437529 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 24 Aug 2014 18:49:34 +0200
Subject: ACCESS: Implement speakText()

---
 engines/access/access.cpp  | 91 +++++++++++++++++++++++++++++++++++++++++++---
 engines/access/access.h    |  2 +
 engines/access/scripts.cpp |  2 +-
 engines/access/scripts.h   |  3 +-
 engines/access/sound.h     |  3 +-
 5 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 0db3376697..9cddd1ba46 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -264,6 +264,90 @@ void AccessEngine::loadEstablish(int sub) {
 		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
 }
 
+void AccessEngine::speakText(int idx) {
+	int curPage = 0;
+	int soundsLeft = 0;
+
+	Common::String msg;
+	for (int i = idx; _eseg[i] != 0; ++i)
+		msg += _eseg[i];
+
+	while(true) {
+		soundsLeft = _countTbl[curPage];
+		_events->zeroKeys();
+
+		Common::String line;
+		int width = 0;
+		bool lastLine = _fonts._font2.getLine(msg, _bubbleBox->_maxChars * 6, line, width);
+		// Set font colors
+		_fonts._font2._fontColors[0] = 0;
+		_fonts._font2._fontColors[1] = 28;
+		_fonts._font2._fontColors[2] = 29;
+		_fonts._font2._fontColors[3] = 30;
+
+		_fonts._font2.drawString(_screen, line, _fonts._printOrg);
+		_fonts._printOrg = Common::Point(_fonts._printStart.x, _fonts._printOrg.y + 9);
+
+		if ((_fonts._printOrg.y > _printEnd) && (!lastLine)) {
+			while (true) {
+				_sound->_soundTable[0]._data = _sound->loadSound(_narateFile + 99, _sndSubFile);
+				_sound->_soundPriority[0] = 1;
+				_sound->playSound(1);
+				_scripts->CMDFREESOUND();
+
+				_events->pollEvents();
+
+				if (_events->_leftButton) {
+					_events->debounceLeft();
+					_sndSubFile += soundsLeft;
+					break;
+				} else if (_events->_keypresses.size() != 0) {
+					_sndSubFile += soundsLeft;
+					break;
+				} else {
+					++_sndSubFile;
+					--soundsLeft;
+					if (soundsLeft == 0)
+						break;
+				}
+			}
+			_buffer2.copyBuffer(_screen);
+			_fonts._printOrg.y = _fonts._printStart.y;
+			++curPage;
+			soundsLeft = _countTbl[curPage];
+		}
+
+		if (lastLine)
+			break;
+	}
+
+	if (soundsLeft == 0)
+		return;
+
+	while(true) {
+		_sound->_soundTable[0]._data = _sound->loadSound(_narateFile + 99, _sndSubFile);
+		_sound->_soundPriority[0] = 1;
+		_sound->playSound(1);
+		_scripts->CMDFREESOUND();
+
+		_events->pollEvents();
+
+		if (_events->_leftButton) {
+			_events->debounceLeft();
+			_sndSubFile += soundsLeft;
+			break;
+		} else if (_events->_keypresses.size() != 0) {
+			_sndSubFile += soundsLeft;
+			break;
+		} else {
+			++_sndSubFile;
+			--soundsLeft;
+			if (soundsLeft == 0)
+				break;
+		}
+	}
+}
+
 void AccessEngine::doEstablish(int esatabIndex, int sub) {
 	_establishMode = 1;
 
@@ -289,16 +373,13 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 	loadEstablish(sub);
 	_et = sub;
 	warning("CHECKME: Use of di");
-	Common::String msg;
 	int idx = READ_LE_UINT16(_eseg + (sub * 2) + 2);
-	for (int i = idx; _eseg[i] != 0; ++i)
-		msg += _eseg[i];
 
 	_printEnd = 155;
 	if (_txtPages == 0)
-		warning("TODO: printText(%s)", msg.c_str());
+		warning("TODO: printText()");
 	else
-		warning("TODO: speakText(%s)", msg.c_str());
+		speakText(idx);
 
 	_screen->forceFadeOut();
 	_screen->clearScreen();
diff --git a/engines/access/access.h b/engines/access/access.h
index db969357aa..bd1269f3f9 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -91,6 +91,8 @@ private:
 
 	void dummyLoop();
 
+	void speakText(int idx);
+
 	void doEstablish(int esatabIndex, int sub);
 protected:
 	const AccessGameDescription *_gameDescription;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 37d1d50899..6ee8eb0da5 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -658,7 +658,7 @@ void Scripts::cmdLoadSound() {
 	_vm->_sound->_soundPriority[0] = 1;
 }
 
-void Scripts::CMDFREESOUND() { error("TODO CMDFREESOUND"); }
+void Scripts::CMDFREESOUND() { warning("TODO CMDFREESOUND"); }
 
 void Scripts::cmdSetVideoSound() {
 	uint32 startPos = _data->pos();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 93cd495be6..aa5c4063f6 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -113,7 +113,6 @@ protected:
 	void cmdReturnChoice();
 	void cmdClearBlock();
 	void cmdLoadSound();
-	void CMDFREESOUND();
 	void cmdSetVideoSound();
 	void CMDPLAYVIDSND();
 	void CMDPUSHLOCATION();
@@ -144,6 +143,8 @@ public:
 	int executeScript();
 
 	void findNull();
+
+	void CMDFREESOUND();
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index cb73bae52c..e0992db0e2 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -42,8 +42,6 @@ private:
 	Audio::Mixer *_mixer;
 	Audio::SoundHandle _soundHandle;
 
-	byte *loadSound(int fileNum, int subfile);
-
 	void playSound(byte *data, uint32 size);
 public:
 	SoundEntry _soundTable[MAX_SOUNDS];
@@ -61,6 +59,7 @@ public:
 
 	void playSound(int soundIndex);
 
+	byte *loadSound(int fileNum, int subfile);
 	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
 
 	void midiPlay();
-- 
cgit v1.2.3


From e53417f91a1305cfb69ef57dd97a5f8fe5311eee Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 14:42:26 -0400
Subject: ACCESS: Fix loading of inventory screen background

---
 engines/access/files.cpp     | 14 +++++++++++++-
 engines/access/inventory.cpp | 16 ++++++++++++----
 engines/access/inventory.h   |  4 ++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 5cf467077d..b1d6140e3e 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -111,7 +111,19 @@ void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile)
 
 	// Get the data for the screen, and copy it over
 	byte *pSrc = handleFile();
-	Common::copy(pSrc, pSrc + _filesize, (byte *)dest->getPixels());
+
+	if (dest != _vm->_screen)
+		dest->w = _vm->_screen->w;
+
+	if (dest->w == dest->pitch) {
+		Common::copy(pSrc, pSrc + _filesize, (byte *)dest->getPixels());
+	} else {
+		byte *pCurr = pSrc;
+		for (int y = 0; y < dest->h; ++y, pCurr += dest->w) {
+			byte *pDest = (byte *)dest->getBasePtr(0, y);
+			Common::copy(pCurr, pCurr + dest->w, pDest);
+		}
+	}
 	delete[] pSrc;
 }
 
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 80336e4dcc..1bafdf56c3 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -90,8 +90,7 @@ int InventoryManager::newDisplayInv() {
 	_vm->_timers.saveTimers();
 	
 	if (room._tile && !_invRefreshFlag) {
-		_vm->_buffer1.copyTo(&_savedBuffer1);
-		screen.copyTo(&_savedScreen);
+		saveScreens();
 	}
 
 	savedFields();
@@ -144,8 +143,7 @@ int InventoryManager::newDisplayInv() {
 	}
 
 	if (!room._tile && !_invRefreshFlag) {
-		_savedBuffer1.copyTo(&_vm->_buffer1);
-		_savedScreen.copyTo(_vm->_screen);
+		restoreScreens();
 	} else {
 		screen.setBufferScan();
 		room.buildScreen();
@@ -310,5 +308,15 @@ int InventoryManager::coordIndexOf() {
 	return -1;
 }
 
+void InventoryManager::saveScreens() {
+	_vm->_buffer1.copyTo(&_savedBuffer1);
+	_vm->_screen->copyTo(&_savedScreen);
+}
+
+void InventoryManager::restoreScreens() {
+	_vm->_buffer1.w = _vm->_buffer1.pitch;
+	_savedBuffer1.copyTo(&_vm->_buffer1);
+	_savedScreen.copyTo(_vm->_screen);
+}
 
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index cf8167d76c..255b6dce40 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -76,6 +76,10 @@ private:
 	void freeInvCells();
 
 	int coordIndexOf();
+
+	void saveScreens();
+
+	void restoreScreens();
 public:
 	Common::Array<int> _inv;
 	Common::StringArray _names;
-- 
cgit v1.2.3


From ce97ba5587daecd262f44cd240efb23f6bd24e8b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 16:49:57 -0400
Subject: ACCeSS: Fix display of items in inventory screen

---
 engines/access/inventory.cpp | 43 +++++++++++++++++++++++++++++++++++++------
 engines/access/inventory.h   |  9 ++++++++-
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 1bafdf56c3..f4236cc385 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -36,7 +36,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_invModeFlag = false;
 	_startAboutItem = 0;
 	_startTravelItem = 0;
-	_iconDisplayFlag = false;
+	_iconDisplayFlag = true;
 
 	const char *const *names;
 	switch (vm->getGameID()) {
@@ -57,7 +57,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 
 	for (uint i = 0; i < 26; ++i) {
 		const int *r = INVCOORDS[i];
-		_invCoords.push_back(Common::Rect(r[0], r[1], r[0] + r[2], r[1] + r[3]));
+		_invCoords.push_back(Common::Rect(r[0], r[2], r[1], r[3]));
 	}
 }
 
@@ -99,7 +99,7 @@ int InventoryManager::newDisplayInv() {
 	getList();
 	initFields();
 
-	_vm->_files->loadScreen(&_vm->_buffer1, 99, 0);
+	files.loadScreen(&_vm->_buffer1, 99, 0);
 	_vm->_buffer1.copyTo(&_vm->_buffer2);
 	_vm->copyBF2Vid();
 
@@ -247,9 +247,13 @@ void InventoryManager::initFields() {
 
 void InventoryManager::getList() {
 	_items.clear();
+	_tempLOff.clear();
+
 	for (uint i = 0; i < _inv.size(); ++i) {
-		if (_inv[i])
+		if (_inv[i]) {
 			_items.push_back(i);
+			_tempLOff.push_back(_names[i]);
+		}
 	}
 }
 
@@ -265,7 +269,7 @@ void InventoryManager::putInvIcon(int itemIndex, int itemId) {
 	_vm->_buffer2.plotImage(spr, itemId, pt);
 
 	if (_iconDisplayFlag) {
-		_vm->_buffer1.copyBlock(&_vm->_buffer2, Common::Rect(pt.x, pt.y, pt.x + 46, pt.y + 35));
+		_vm->_screen->copyBlock(&_vm->_buffer2, Common::Rect(pt.x, pt.y, pt.x + 46, pt.y + 35));
 	}
 }
 
@@ -287,7 +291,12 @@ void InventoryManager::chooseItem() {
 				_vm->_useItem = -1;
 			break;
 		} else if (selIndex < (int)_items.size()) {
-			warning("TODO: Combine items");
+			_boxNum = selIndex;
+			_vm->copyBF2Vid();
+			combineItems();
+			_vm->copyBF2Vid();
+			outlineIcon(_boxNum);
+			_vm->_useItem = _items[_boxNum];
 		}
 	}
 }
@@ -311,6 +320,8 @@ int InventoryManager::coordIndexOf() {
 void InventoryManager::saveScreens() {
 	_vm->_buffer1.copyTo(&_savedBuffer1);
 	_vm->_screen->copyTo(&_savedScreen);
+	_vm->_newRects.push_back(Common::Rect(0, 0, _savedScreen.w, _savedScreen.h));
+	
 }
 
 void InventoryManager::restoreScreens() {
@@ -319,4 +330,24 @@ void InventoryManager::restoreScreens() {
 	_savedScreen.copyTo(_vm->_screen);
 }
 
+void InventoryManager::outlineIcon(int itemIndex) {
+	Screen &screen = *_vm->_screen;
+	screen.frameRect(_invCoords[itemIndex], 7);
+
+	Common::String s = _tempLOff[itemIndex];
+	Font &font = _vm->_fonts._font2;
+	int strWidth = font.stringWidth(s);
+
+	font._fontColors[0] = 0;
+	font._fontColors[1] = 10;
+	font._fontColors[2] = 11;
+	font._fontColors[3] = 12;
+	font.drawString(&screen, s, Common::Point((screen.w - strWidth) / 2, 184));
+}
+
+void InventoryManager::combineItems() {
+	warning("TODO: combineItems");
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 255b6dce40..a95581c2d0 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -58,6 +58,10 @@ private:
 	ASurface _savedScreen;
 	SavedFields _fields;
 	bool _iconDisplayFlag;
+	Common::StringArray _names;
+	Common::Array<int> _tempLPtr;
+	Common::StringArray _tempLOff;
+	int _boxNum;
 
 	void savedFields();
 
@@ -80,9 +84,12 @@ private:
 	void saveScreens();
 
 	void restoreScreens();
+
+	void outlineIcon(int itemIndex);
+
+	void combineItems();
 public:
 	Common::Array<int> _inv;
-	Common::StringArray _names;
 	int _startInvItem;
 	int _startInvBox;
 	bool _invChangeFlag;
-- 
cgit v1.2.3


From 3e14e7b9663130d1a730aaf6821c766b505ebdba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 17:31:41 -0400
Subject: ACCESS: Fix selection of inventory items

---
 engines/access/inventory.cpp |  5 +++++
 engines/access/room.cpp      | 24 +++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index f4236cc385..dbc3cbac89 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -165,6 +165,11 @@ int InventoryManager::newDisplayInv() {
 	if (!_invRefreshFlag) {
 		if (_vm->_useItem == -1) {
 			result = 2;
+			events._normalMouse = CURSOR_CROSSHAIRS;
+			events.setCursor(CURSOR_CROSSHAIRS);
+		} else {
+			events.setCursor(CURSOR_INVENTORY);
+			events._normalMouse = CURSOR_INVENTORY;
 		}
 	}
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a4be02d263..b00b1cf83b 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -447,20 +447,24 @@ void Room::handleCommand(int commandId) {
 }
 
 void Room::executeCommand(int commandId) {
+	EventsManager &events = *_vm->_events;
 	_selectCommand = commandId;
 
 	switch (commandId) {
 	case 0:
-		_vm->_events->setCursor(CURSOR_LOOK);
+		events._normalMouse = CURSOR_LOOK;
+		events.setCursor(CURSOR_LOOK);
 		break;
 	case 2:
-		_vm->_events->setCursor(CURSOR_USE);
+		events._normalMouse = CURSOR_USE;
+		events.setCursor(CURSOR_USE);
 		break;
 	case 3:
-		_vm->_events->setCursor(CURSOR_TAKE);
+		events._normalMouse = CURSOR_TAKE;
+		events.setCursor(CURSOR_TAKE);
 		break;
 	case 4:
-		_vm->_events->setCursor(CURSOR_ARROW);
+		events.setCursor(CURSOR_ARROW);
 		if (_vm->_inventory->newDisplayInv() == 2) {
 			commandOff();
 			return;
@@ -469,18 +473,20 @@ void Room::executeCommand(int commandId) {
 		}
 		break;
 	case 5:
-		_vm->_events->setCursor(CURSOR_CLIMB);
+		events._normalMouse = CURSOR_CLIMB;
+		events.setCursor(CURSOR_CLIMB);
 		break;
 	case 6:
-		_vm->_events->setCursor(CURSOR_TALK);
+		events._normalMouse = CURSOR_TALK;
+		events.setCursor(CURSOR_TALK);
 		break;
 	case 7:
-		_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
+		events._normalMouse = CURSOR_CROSSHAIRS;
+		events.setCursor(CURSOR_CROSSHAIRS);
 		_vm->_scripts->_sequence = 5000;
 		_vm->_scripts->searchForSequence();
 		roomMenu();
 		_selectCommand = -1;
-		_vm->_events->setCursor(CURSOR_CROSSHAIRS);
 
 		_conFlag = true;
 		while (_conFlag && !_vm->shouldQuit()) {
@@ -490,7 +496,7 @@ void Room::executeCommand(int commandId) {
 		_vm->_boxSelect = true;
 		break;
 	case 8:
-		_vm->_events->setCursor(CURSOR_HELP);
+		events.setCursor(CURSOR_HELP);
 		break;
 	default:
 		break;
-- 
cgit v1.2.3


From d97cc677e106c39af278e6175d139d8a8ab0cc3e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 21:05:35 -0400
Subject: ACCESS: Fix mapping of _useItem onto flags array

---
 engines/access/access.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9cddd1ba46..cea5a73818 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -31,7 +31,7 @@ namespace Access {
 
 AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 		_gameDescription(gameDesc), Engine(syst), _randomSource("Access"),
-		_useItem(_flags[100]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
+		_useItem(_flags[99]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
 	_animation = nullptr;
 	_bubbleBox = nullptr;
 	_char = nullptr;
-- 
cgit v1.2.3


From b7ea1133b43f3640f44dc3e5f3a3136f72729770 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 21:42:02 -0400
Subject: ACCESS: Set hotspot for inventory item cursors to be their center

---
 engines/access/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 15c8f8cff0..7366905b0c 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -56,7 +56,7 @@ void EventsManager::setCursor(CursorType cursorId) {
 	if (cursorId == CURSOR_INVENTORY) {
 		// Set the cursor
 		CursorMan.replaceCursor(_invCursor.getPixels(), _invCursor.w, _invCursor.h,
-			0, 0, 0);
+			_invCursor.w / 2, _invCursor.h / 2, 0);
 	} else {
 		// Get a pointer to the mouse data to use, and get the cursor hotspot
 		const byte *srcP = Amazon::CURSORS[cursorId];
-- 
cgit v1.2.3


From f993c8dd46c240daa7022f359542e743d9c7a888 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 22:42:24 -0400
Subject: ACCESS: Improved right scrolling

---
 engines/access/player.cpp | 2 +-
 engines/access/room.cpp   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 7df277c3a0..336be0d462 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -819,7 +819,7 @@ bool Player::scrollRight() {
 
 			_vm->_buffer1.moveBufferRight();
 			_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
-		} while (!_vm->shouldQuit() && (_vm->_screen->_scrollX >= 0));
+		} while (!_vm->shouldQuit() && (_vm->_screen->_scrollX < 0));
 
 		return false;
 	}
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b00b1cf83b..29d9eef624 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -468,8 +468,6 @@ void Room::executeCommand(int commandId) {
 		if (_vm->_inventory->newDisplayInv() == 2) {
 			commandOff();
 			return;
-		} else {
-			// TODO: al = _useItem?
 		}
 		break;
 	case 5:
-- 
cgit v1.2.3


From 89993e128fe15efd16fdf89696682f0e24cb8593 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 Aug 2014 23:59:37 -0400
Subject: ACCESS: Split font code into a separate file

---
 engines/access/access.h  |   1 +
 engines/access/data.cpp  | 144 ----------------------------------------
 engines/access/data.h    |  68 -------------------
 engines/access/font.cpp  | 169 +++++++++++++++++++++++++++++++++++++++++++++++
 engines/access/font.h    | 104 +++++++++++++++++++++++++++++
 engines/access/module.mk |   1 +
 6 files changed, 275 insertions(+), 212 deletions(-)
 create mode 100644 engines/access/font.cpp
 create mode 100644 engines/access/font.h

diff --git a/engines/access/access.h b/engines/access/access.h
index bd1269f3f9..2aa41308c3 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -37,6 +37,7 @@
 #include "access/debugger.h"
 #include "access/events.h"
 #include "access/files.h"
+#include "access/font.h"
 #include "access/inventory.h"
 #include "access/player.h"
 #include "access/room.h"
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index a13c6d9a67..0279cd5052 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -59,148 +59,4 @@ void TimerList::updateTimers() {
 	}
 }
 
-/*------------------------------------------------------------------------*/
-
-byte Font::_fontColors[4];
-
-Font::Font() {
-}
-
-Font::~Font() {
-	for (uint i = 0; i < _chars.size(); ++i)
-		_chars[i].free();
-}
-
-void Font::load(const int *fontIndex, const byte *fontData) {
-	assert(_chars.size() == 0);
-	int count = fontIndex[0];
-	_bitWidth = fontIndex[1];
-	_height = fontIndex[2];
-
-	_chars.resize(count);
-
-	for (int i = 0; i < count; ++i) {
-		const byte *pData = fontData + fontIndex[i + 3];
-		_chars[i].create(*pData++, _height, Graphics::PixelFormat::createFormatCLUT8());
-
-		for (int y = 0; y < _height; ++y) {
-			int bitsLeft = 0;
-			byte srcByte = 0;
-			byte pixel;
-			
-			byte *pDest = (byte *)_chars[i].getBasePtr(0, y);
-			for (int x = 0; x < _chars[i].w; ++x, ++pDest) {
-				// Get the pixel
-				pixel = 0;
-				for (int pixelCtr = 0; pixelCtr < _bitWidth; ++pixelCtr, --bitsLeft) {
-					// No bits in current byte left, so get next byte
-					if (bitsLeft == 0) {
-						bitsLeft = 8;
-						srcByte = *pData++;
-					}
-
-					pixel = (pixel << 1) | (srcByte >> 7);
-					srcByte <<= 1;
-				}
-
-				// Write out the pixel
-				*pDest = pixel;
-			}
-		}
-	}
-}
-
-int Font::charWidth(char c) {
-	return _chars[c - ' '].w;
-}
-
-int Font::stringWidth(const Common::String &msg) {
-	int total = 0;
-
-	for (const char *c = msg.c_str(); *c != '\0'; ++c)
-		total += charWidth(*c);
-
-	return total;
-}
-
-bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &width) {
-	assert(maxWidth > 0);
-	width = 0;
-	const char *src = s.c_str();
-	char c;
-
-	while ((c = *src) != '\0') {
-		if (c == '\r') {
-			// End of line, so return calculated line
-			line = Common::String(s.c_str(), src - 1);
-			s = Common::String(src + 1);
-			return false;
-		}
-
-		++src;
-		width += charWidth(c);
-		if (width < maxWidth)
-			continue;
-
-		// Reached maximum allowed size
-		// If this was the last character of the string, let it go
-		if (*src == '\0')
-			break;
-		
-		// Work backwards to find space at the start of the current word 
-		// as a point to split the line on
-		while (src >= s.c_str() && *src != ' ') {
-			width -= charWidth(*src);
-			--src;
-		}
-		if (src < s.c_str())
-			error("Could not fit line");
-
-		// Split the line around the space
-		line = Common::String(s.c_str(), src);
-		s = Common::String(src + 1);
-		return false;
-	}
-
-	// Return entire string
-	line = s;
-	s = Common::String();
-	return true;
-}
-
-void Font::drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt) {
-	Common::Point currPt = pt;
-	const char *msgP = msg.c_str();
-
-	while (*msgP) {
-		currPt.x += drawChar(s, *msgP, currPt);
-		++msgP;
-	}
-}
-
-int Font::drawChar(Graphics::Surface *s, char c, Common::Point &pt) {
-	Graphics::Surface &ch = _chars[c - ' '];
-
-	// Loop through the lines of the character
-	for (int y = 0; y < ch.h; ++y) {
-		byte *pSrc = (byte *)ch.getBasePtr(0, y);
-		byte *pDest = (byte *)s->getBasePtr(pt.x, pt.y + y);
-
-		// Loop through the horizontal pixels of the line
-		for (int x = 0; x < ch.w; ++x, ++pSrc, ++pDest) {
-			if (*pSrc != 0)
-				*pDest = _fontColors[*pSrc];
-		}
-	}
-
-	return ch.w;
-}
-
-/*------------------------------------------------------------------------*/
-
-FontManager::FontManager() {
-	_printMaxX = 0;
-	Common::fill(&Font::_fontColors[0], &Font::_fontColors[4], 0);
-}
-
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 3238dafa33..1d64a6ff86 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -82,74 +82,6 @@ public:
 	FileIdent _vidSound;
 };
 
-struct FontVal {
-public:
-	int _lo, _hi;
-
-	FontVal() { _lo = _hi = 0; }
-};
-
-class Font {
-private:
-	int _bitWidth;
-	int _height;
-	Common::Array<Graphics::Surface> _chars;
-public:
-	static byte _fontColors[4];
-public:
-	Font();
-
-	~Font();
-
-	/**
-	 * Load the given font data
-	 */
-	void load(const int *fontIndex, const byte *fontData);
-
-	/**
-	 * Get the width of a given character
-	 */
-	int charWidth(char c);
-
-	/**
-	 * Get the width of a given string
-	 */
-	int stringWidth(const Common::String &msg);
-
-	/**
-	 * Get a partial string that will fit in a given width
-	 * @param s			Source string. Modified to remove line
-	 * @param maxWidth	Maximum width allowed
-	 * @param line		Output line
-	 * @param width		Calculated width of returned line
-	 * @returns			True if last line
-	 */
-	bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width);
-
-	/**
-	 * Draw a string on a given surface
-	 */
-	void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt);
-
-	/**
-	 * Draw a character on a given surface
-	 */
-	int drawChar(Graphics::Surface *s, char c, Common::Point &pt);
-};
-
-class FontManager {
-public:
-	FontVal _charSet;
-	FontVal _charFor;
-	Common::Point _printOrg;
-	Common::Point _printStart;
-	int _printMaxX;
-	Font _font1;
-	Font _font2;
-public:
-	FontManager();
-};
-
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
new file mode 100644
index 0000000000..d5ad3b3d24
--- /dev/null
+++ b/engines/access/font.cpp
@@ -0,0 +1,169 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "access/font.h"
+
+namespace Access {
+
+byte Font::_fontColors[4];
+
+Font::Font() {
+}
+
+Font::~Font() {
+	for (uint i = 0; i < _chars.size(); ++i)
+		_chars[i].free();
+}
+
+void Font::load(const int *fontIndex, const byte *fontData) {
+	assert(_chars.size() == 0);
+	int count = fontIndex[0];
+	_bitWidth = fontIndex[1];
+	_height = fontIndex[2];
+
+	_chars.resize(count);
+
+	for (int i = 0; i < count; ++i) {
+		const byte *pData = fontData + fontIndex[i + 3];
+		_chars[i].create(*pData++, _height, Graphics::PixelFormat::createFormatCLUT8());
+
+		for (int y = 0; y < _height; ++y) {
+			int bitsLeft = 0;
+			byte srcByte = 0;
+			byte pixel;
+			
+			byte *pDest = (byte *)_chars[i].getBasePtr(0, y);
+			for (int x = 0; x < _chars[i].w; ++x, ++pDest) {
+				// Get the pixel
+				pixel = 0;
+				for (int pixelCtr = 0; pixelCtr < _bitWidth; ++pixelCtr, --bitsLeft) {
+					// No bits in current byte left, so get next byte
+					if (bitsLeft == 0) {
+						bitsLeft = 8;
+						srcByte = *pData++;
+					}
+
+					pixel = (pixel << 1) | (srcByte >> 7);
+					srcByte <<= 1;
+				}
+
+				// Write out the pixel
+				*pDest = pixel;
+			}
+		}
+	}
+}
+
+int Font::charWidth(char c) {
+	return _chars[c - ' '].w;
+}
+
+int Font::stringWidth(const Common::String &msg) {
+	int total = 0;
+
+	for (const char *c = msg.c_str(); *c != '\0'; ++c)
+		total += charWidth(*c);
+
+	return total;
+}
+
+bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &width) {
+	assert(maxWidth > 0);
+	width = 0;
+	const char *src = s.c_str();
+	char c;
+
+	while ((c = *src) != '\0') {
+		if (c == '\r') {
+			// End of line, so return calculated line
+			line = Common::String(s.c_str(), src - 1);
+			s = Common::String(src + 1);
+			return false;
+		}
+
+		++src;
+		width += charWidth(c);
+		if (width < maxWidth)
+			continue;
+
+		// Reached maximum allowed size
+		// If this was the last character of the string, let it go
+		if (*src == '\0')
+			break;
+		
+		// Work backwards to find space at the start of the current word 
+		// as a point to split the line on
+		while (src >= s.c_str() && *src != ' ') {
+			width -= charWidth(*src);
+			--src;
+		}
+		if (src < s.c_str())
+			error("Could not fit line");
+
+		// Split the line around the space
+		line = Common::String(s.c_str(), src);
+		s = Common::String(src + 1);
+		return false;
+	}
+
+	// Return entire string
+	line = s;
+	s = Common::String();
+	return true;
+}
+
+void Font::drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt) {
+	Common::Point currPt = pt;
+	const char *msgP = msg.c_str();
+
+	while (*msgP) {
+		currPt.x += drawChar(s, *msgP, currPt);
+		++msgP;
+	}
+}
+
+int Font::drawChar(Graphics::Surface *s, char c, Common::Point &pt) {
+	Graphics::Surface &ch = _chars[c - ' '];
+
+	// Loop through the lines of the character
+	for (int y = 0; y < ch.h; ++y) {
+		byte *pSrc = (byte *)ch.getBasePtr(0, y);
+		byte *pDest = (byte *)s->getBasePtr(pt.x, pt.y + y);
+
+		// Loop through the horizontal pixels of the line
+		for (int x = 0; x < ch.w; ++x, ++pSrc, ++pDest) {
+			if (*pSrc != 0)
+				*pDest = _fontColors[*pSrc];
+		}
+	}
+
+	return ch.w;
+}
+
+/*------------------------------------------------------------------------*/
+
+FontManager::FontManager() {
+	_printMaxX = 0;
+	Common::fill(&Font::_fontColors[0], &Font::_fontColors[4], 0);
+}
+
+} // End of namespace Access
diff --git a/engines/access/font.h b/engines/access/font.h
new file mode 100644
index 0000000000..2c9ffd0f34
--- /dev/null
+++ b/engines/access/font.h
@@ -0,0 +1,104 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_FONT_H
+#define ACCESS_FONT_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "access/asurface.h"
+#include "access/data.h"
+
+namespace Access {
+
+struct FontVal {
+public:
+	int _lo, _hi;
+
+	FontVal() { _lo = _hi = 0; }
+};
+
+class Font {
+private:
+	int _bitWidth;
+	int _height;
+	Common::Array<Graphics::Surface> _chars;
+public:
+	static byte _fontColors[4];
+public:
+	Font();
+
+	~Font();
+
+	/**
+	 * Load the given font data
+	 */
+	void load(const int *fontIndex, const byte *fontData);
+
+	/**
+	 * Get the width of a given character
+	 */
+	int charWidth(char c);
+
+	/**
+	 * Get the width of a given string
+	 */
+	int stringWidth(const Common::String &msg);
+
+	/**
+	 * Get a partial string that will fit in a given width
+	 * @param s			Source string. Modified to remove line
+	 * @param maxWidth	Maximum width allowed
+	 * @param line		Output line
+	 * @param width		Calculated width of returned line
+	 * @returns			True if last line
+	 */
+	bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width);
+
+	/**
+	 * Draw a string on a given surface
+	 */
+	void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt);
+
+	/**
+	 * Draw a character on a given surface
+	 */
+	int drawChar(Graphics::Surface *s, char c, Common::Point &pt);
+};
+
+class FontManager {
+public:
+	FontVal _charSet;
+	FontVal _charFor;
+	Common::Point _printOrg;
+	Common::Point _printStart;
+	int _printMaxX;
+	Font _font1;
+	Font _font2;
+public:
+	FontManager();
+};
+
+} // End of namespace Access
+
+#endif /* ACCESS_FONT_H */
diff --git a/engines/access/module.mk b/engines/access/module.mk
index e92c2cc564..b6e73b66bd 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -12,6 +12,7 @@ MODULE_OBJS := \
 	detection.o \
 	events.o \
 	files.o \
+	font.o \
 	inventory.o \
 	player.o \
 	resources.o \
-- 
cgit v1.2.3


From 707a01cb38eb671f2fad29016f11268f8fab9084 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 Aug 2014 00:01:18 -0400
Subject: ACCESS: Change font method parameter types

---
 engines/access/font.cpp | 4 ++--
 engines/access/font.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index d5ad3b3d24..75add4129c 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -131,7 +131,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 	return true;
 }
 
-void Font::drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt) {
+void Font::drawString(ASurface *s, const Common::String &msg, const Common::Point &pt) {
 	Common::Point currPt = pt;
 	const char *msgP = msg.c_str();
 
@@ -141,7 +141,7 @@ void Font::drawString(Graphics::Surface *s, const Common::String &msg, const Com
 	}
 }
 
-int Font::drawChar(Graphics::Surface *s, char c, Common::Point &pt) {
+int Font::drawChar(ASurface *s, char c, Common::Point &pt) {
 	Graphics::Surface &ch = _chars[c - ' '];
 
 	// Loop through the lines of the character
diff --git a/engines/access/font.h b/engines/access/font.h
index 2c9ffd0f34..a32dd6b695 100644
--- a/engines/access/font.h
+++ b/engines/access/font.h
@@ -78,12 +78,12 @@ public:
 	/**
 	 * Draw a string on a given surface
 	 */
-	void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt);
+	void drawString(ASurface *s, const Common::String &msg, const Common::Point &pt);
 
 	/**
 	 * Draw a character on a given surface
 	 */
-	int drawChar(Graphics::Surface *s, char c, Common::Point &pt);
+	int drawChar(ASurface *s, char c, Common::Point &pt);
 };
 
 class FontManager {
-- 
cgit v1.2.3


From 33cdeb7a4005408b92366ae34a29589e3b0fa0cb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 Aug 2014 00:18:32 -0400
Subject: ACCESS: Stub for printText method

---
 engines/access/access.cpp     | 22 ++++++++++++----------
 engines/access/asurface.h     |  3 +++
 engines/access/bubble_box.cpp | 32 ++++++++++++++++----------------
 engines/access/font.cpp       |  4 ++++
 engines/access/font.h         |  7 +++++--
 engines/access/scripts.cpp    | 22 +++++++++++-----------
 6 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index cea5a73818..32a4e6cc8f 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -285,10 +285,10 @@ void AccessEngine::speakText(int idx) {
 		_fonts._font2._fontColors[2] = 29;
 		_fonts._font2._fontColors[3] = 30;
 
-		_fonts._font2.drawString(_screen, line, _fonts._printOrg);
-		_fonts._printOrg = Common::Point(_fonts._printStart.x, _fonts._printOrg.y + 9);
+		_fonts._font2.drawString(_screen, line, _screen->_printOrg);
+		_screen->_printOrg = Common::Point(_screen->_printStart.x, _screen->_printOrg.y + 9);
 
-		if ((_fonts._printOrg.y > _printEnd) && (!lastLine)) {
+		if ((_screen->_printOrg.y > _printEnd) && (!lastLine)) {
 			while (true) {
 				_sound->_soundTable[0]._data = _sound->loadSound(_narateFile + 99, _sndSubFile);
 				_sound->_soundPriority[0] = 1;
@@ -312,7 +312,7 @@ void AccessEngine::speakText(int idx) {
 				}
 			}
 			_buffer2.copyBuffer(_screen);
-			_fonts._printOrg.y = _fonts._printStart.y;
+			_screen->_printOrg.y = _screen->_printStart.y;
 			++curPage;
 			soundsLeft = _countTbl[curPage];
 		}
@@ -369,17 +369,19 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 	_fonts._charFor._hi = 32;
 
 	_bubbleBox->_maxChars = 37;
-	_fonts._printOrg = _fonts._printStart = Common::Point(48, 35);
+	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(sub);
 	_et = sub;
 	warning("CHECKME: Use of di");
-	int idx = READ_LE_UINT16(_eseg + (sub * 2) + 2);
+	uint16 msgOffset = READ_LE_UINT16(_eseg + (sub * 2) + 2);
+	Common::String msg((const char *)_eseg + msgOffset);
 
 	_printEnd = 155;
-	if (_txtPages == 0)
-		warning("TODO: printText()");
-	else
-		speakText(idx);
+	if (_txtPages == 0) {
+		_fonts._font2.printText(_screen, msg);
+	} else {
+//		speakText(msg);
+	}
 
 	_screen->forceFadeOut();
 	_screen->clearScreen();
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index f5e5f48e7b..262d41400a 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -52,6 +52,9 @@ public:
 	static int _orgX2, _orgY2;
 	static int _lColor;
 
+	Common::Point _printOrg;
+	Common::Point _printStart;
+
 	static void init();
 public:
 	virtual ~ASurface();
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index a709fbd92d..56d7157e8d 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -74,8 +74,8 @@ void BubbleBox::placeBubble1(const Common::String &msg) {
 
 void BubbleBox::calcBubble(const Common::String &msg) {
 	// Save points
-	Common::Point printOrg = _vm->_fonts._printOrg;
-	Common::Point printStart = _vm->_fonts._printStart;
+	Common::Point printOrg = _vm->_screen->_printOrg;
+	Common::Point printStart = _vm->_screen->_printStart;
 
 	// Figure out maximum width allowed
 	if (_type == TYPE_4) {
@@ -96,12 +96,12 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 		lastLine = _vm->_fonts._font2.getLine(s, _maxChars * 6, line, width);
 		_vm->_fonts._printMaxX = MAX(width, _vm->_fonts._printMaxX);
 
-		_vm->_fonts._printOrg.y += 6;
-		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
+		_vm->_screen->_printOrg.y += 6;
+		_vm->_screen->_printOrg.x = _vm->_screen->_printStart.x;
 	} while (!lastLine);
 
 	if (_type == TYPE_4)
-		++_vm->_fonts._printOrg.y += 6;
+		++_vm->_screen->_printOrg.y += 6;
 
 	// Determine the width for the area
 	width = (((_vm->_fonts._printMaxX >> 4) + 1) << 4) + 5;
@@ -110,7 +110,7 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	bounds.setWidth(width);
 
 	// Determine the height for area
-	int y = _vm->_fonts._printOrg.y + 6;
+	int y = _vm->_screen->_printOrg.y + 6;
 	if (_type == TYPE_4)
 		y += 6;
 	int height = y - bounds.top;
@@ -124,8 +124,8 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	_bubbles.push_back(bounds);
 
 	// Restore points
-	_vm->_fonts._printOrg = printOrg;
-	_vm->_fonts._printStart = printStart;
+	_vm->_screen->_printOrg = printOrg;
+	_vm->_screen->_printStart = printStart;
 }
 
 void BubbleBox::printBubble(const Common::String &msg) {
@@ -147,16 +147,16 @@ void BubbleBox::printBubble(const Common::String &msg) {
 		font2._fontColors[2] = 28;
 		font2._fontColors[3] = 29;
 
-		int xp = _vm->_fonts._printOrg.x;
+		int xp = _vm->_screen->_printOrg.x;
 		if (_type == TYPE_4)
 			xp = (_bounds.width() - width) / 2 + _bounds.left - 4;
 		
 		// Draw the text
-		font2.drawString(_vm->_screen, line, Common::Point(xp, _vm->_fonts._printOrg.y));
+		font2.drawString(_vm->_screen, line, Common::Point(xp, _vm->_screen->_printOrg.y));
 		
 		// Move print position
-		_vm->_fonts._printOrg.y += 6;
-		_vm->_fonts._printOrg.x = _vm->_fonts._printStart.x;
+		_vm->_screen->_printOrg.y += 6;
+		_vm->_screen->_printOrg.x = _vm->_screen->_printStart.x;
 	} while (!lastLine);
 }
 
@@ -175,8 +175,8 @@ void BubbleBox::doBox(int item, int box) {
 	// Save state information
 	FontVal charSet = fonts._charSet;
 	FontVal charFor = fonts._charFor;
-	Common::Point printOrg = fonts._printOrg;
-	Common::Point printStart = fonts._printStart;
+	Common::Point printOrg = screen._printOrg;
+	Common::Point printStart = screen._printStart;
 	int charCol = _charCol;
 	int rowOff = _rowOff;
 
@@ -260,8 +260,8 @@ void BubbleBox::doBox(int item, int box) {
 	// Restore positional state
 	fonts._charSet = charSet;
 	fonts._charFor = charFor;
-	fonts._printOrg = printOrg;
-	fonts._printStart = printStart;
+	screen._printOrg = printOrg;
+	screen._printStart = printStart;
 	_charCol = charCol;
 	_rowOff = rowOff;
 	_vm->_screen->restoreScreen();
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 75add4129c..ba17f19211 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -159,6 +159,10 @@ int Font::drawChar(ASurface *s, char c, Common::Point &pt) {
 	return ch.w;
 }
 
+void Font::printText(ASurface *s, const Common::String &msg) {
+	error("TODO: printText");
+}
+
 /*------------------------------------------------------------------------*/
 
 FontManager::FontManager() {
diff --git a/engines/access/font.h b/engines/access/font.h
index a32dd6b695..9285d323d1 100644
--- a/engines/access/font.h
+++ b/engines/access/font.h
@@ -84,14 +84,17 @@ public:
 	 * Draw a character on a given surface
 	 */
 	int drawChar(ASurface *s, char c, Common::Point &pt);
+
+	/**
+	 * Draw a string on a given surface and update text positioning
+	 */
+	void printText(ASurface *s, const Common::String &msg);
 };
 
 class FontManager {
 public:
 	FontVal _charSet;
 	FontVal _charFor;
-	Common::Point _printOrg;
-	Common::Point _printStart;
 	int _printMaxX;
 	Font _font1;
 	Font _font2;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 6ee8eb0da5..d6f65a69c9 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -185,8 +185,8 @@ void Scripts::cmdPrint() {
 }
 
 void Scripts::printString(const Common::String &msg) {
-	_vm->_fonts._printOrg = Common::Point(20, 42);
-	_vm->_fonts._printStart = Common::Point(20, 42);
+	_vm->_screen->_printOrg = Common::Point(20, 42);
+	_vm->_screen->_printStart = Common::Point(20, 42);
 	_vm->_timers[PRINT_TIMER]._timer = 50;
 	_vm->_timers[PRINT_TIMER]._initTm = 50;
 	++_vm->_timers[PRINT_TIMER]._flag;
@@ -488,8 +488,8 @@ void Scripts::CMDSETCYCLE() { error("TODO CMDSETCYCLE"); }
 void Scripts::CMDCYCLE() { error("TODO CMDCYCLE"); }
 
 void Scripts::cmdCharSpeak() {
-	_vm->_fonts._printOrg = _charsOrg;
-	_vm->_fonts._printStart = _charsOrg;
+	_vm->_screen->_printOrg = _charsOrg;
+	_vm->_screen->_printStart = _charsOrg;
 
 	byte v;
 	Common::String tmpStr = "";
@@ -501,8 +501,8 @@ void Scripts::cmdCharSpeak() {
 }
 
 void Scripts::cmdTexSpeak() {
-	_vm->_fonts._printOrg = _texsOrg;
-	_vm->_fonts._printStart = _texsOrg;
+	_vm->_screen->_printOrg = _texsOrg;
+	_vm->_screen->_printStart = _texsOrg;
 	_vm->_bubbleBox->_maxChars = 20;
 
 	byte v;
@@ -542,8 +542,8 @@ void Scripts::cmdTexChoice() {
 	_vm->_fonts._charFor._hi = 255;
 	_vm->_bubbleBox->_maxChars = 20;
 
-	_vm->_fonts._printOrg = _texsOrg;
-	_vm->_fonts._printStart = _texsOrg;
+	_vm->_screen->_printOrg = _texsOrg;
+	_vm->_screen->_printStart = _texsOrg;
 
 	_vm->_bubbleBox->clearBubbles();
 	_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 1").c_str();
@@ -559,7 +559,7 @@ void Scripts::cmdTexChoice() {
 	Common::Rect responseCoords[2];
 	responseCoords[0] = _vm->_bubbleBox->_bounds;
 	responseCoords[1] = Common::Rect(0, 0, 0, 0);
-	_vm->_fonts._printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
+	_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 
 	findNull();
 
@@ -575,7 +575,7 @@ void Scripts::cmdTexChoice() {
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
 		responseCoords[1] = _vm->_bubbleBox->_bounds;
-		_vm->_fonts._printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
+		_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 	}
 
 	findNull();
@@ -590,7 +590,7 @@ void Scripts::cmdTexChoice() {
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
 		termResponse2 = _vm->_bubbleBox->_bounds;
-		_vm->_fonts._printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
+		_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 	}
 
 	findNull();
-- 
cgit v1.2.3


From 8c059add8b25cbabd499fe9ef6e69da563a3b913 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 25 Aug 2014 22:46:56 +0200
Subject: ACCESS: Modify speakText so it takes a string array as parameter

---
 engines/access/access.cpp | 20 ++++++++++----------
 engines/access/access.h   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 32a4e6cc8f..97ffc134be 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -199,7 +199,6 @@ void AccessEngine::dummyLoop() {
 			_events->setCursor((cursorId == CURSOR_HELP) ? CURSOR_ARROW : (CursorType)(cursorId + 1));
 		}
 	}
-
 }
 
 int AccessEngine::getRandomNumber(int maxNumber) {
@@ -264,21 +263,17 @@ void AccessEngine::loadEstablish(int sub) {
 		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
 }
 
-void AccessEngine::speakText(int idx) {
+void AccessEngine::speakText(Common::Array<Common::String> msgArr) {
 	int curPage = 0;
 	int soundsLeft = 0;
 
-	Common::String msg;
-	for (int i = idx; _eseg[i] != 0; ++i)
-		msg += _eseg[i];
-
 	while(true) {
 		soundsLeft = _countTbl[curPage];
 		_events->zeroKeys();
 
 		Common::String line;
 		int width = 0;
-		bool lastLine = _fonts._font2.getLine(msg, _bubbleBox->_maxChars * 6, line, width);
+		bool lastLine = _fonts._font2.getLine(msgArr[curPage], _bubbleBox->_maxChars * 6, line, width);
 		// Set font colors
 		_fonts._font2._fontColors[0] = 0;
 		_fonts._font2._fontColors[1] = 28;
@@ -372,15 +367,20 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(sub);
 	_et = sub;
-	warning("CHECKME: Use of di");
 	uint16 msgOffset = READ_LE_UINT16(_eseg + (sub * 2) + 2);
-	Common::String msg((const char *)_eseg + msgOffset);
 
 	_printEnd = 155;
 	if (_txtPages == 0) {
+		Common::String msg((const char *)_eseg + msgOffset);
 		_fonts._font2.printText(_screen, msg);
 	} else {
-//		speakText(msg);
+		Common::Array<Common::String> msgArr;
+		for (int i = 0; i < _txtPages; ++i) {
+			Common::String msg((const char *)_eseg + msgOffset);
+			msgOffset += msg.size() + 1;
+			msgArr.push_back(msg);
+		}
+		speakText(msgArr);
 	}
 
 	_screen->forceFadeOut();
diff --git a/engines/access/access.h b/engines/access/access.h
index 2aa41308c3..70195d1e64 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -92,7 +92,7 @@ private:
 
 	void dummyLoop();
 
-	void speakText(int idx);
+	void speakText(Common::Array<Common::String>msgArr);
 
 	void doEstablish(int esatabIndex, int sub);
 protected:
-- 
cgit v1.2.3


From 7d0392aa83a44b075cedd8d669a61f26dcb82c3b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 25 Aug 2014 23:34:40 +0200
Subject: ACCESS: Move _maxChars to asurface

---
 engines/access/access.cpp     | 4 ++--
 engines/access/asurface.h     | 1 +
 engines/access/bubble_box.cpp | 8 +++-----
 engines/access/bubble_box.h   | 1 -
 engines/access/scripts.cpp    | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 97ffc134be..47d77e777c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -273,7 +273,7 @@ void AccessEngine::speakText(Common::Array<Common::String> msgArr) {
 
 		Common::String line;
 		int width = 0;
-		bool lastLine = _fonts._font2.getLine(msgArr[curPage], _bubbleBox->_maxChars * 6, line, width);
+		bool lastLine = _fonts._font2.getLine(msgArr[curPage], _screen->_maxChars * 6, line, width);
 		// Set font colors
 		_fonts._font2._fontColors[0] = 0;
 		_fonts._font2._fontColors[1] = 28;
@@ -363,7 +363,7 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 	_fonts._charFor._lo = 29;
 	_fonts._charFor._hi = 32;
 
-	_bubbleBox->_maxChars = 37;
+	_screen->_maxChars = 37;
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(sub);
 	_et = sub;
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 262d41400a..5d1f6fd307 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -54,6 +54,7 @@ public:
 
 	Common::Point _printOrg;
 	Common::Point _printStart;
+	int _maxChars;
 
 	static void init();
 public:
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 56d7157e8d..d3782a3125 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -34,8 +34,6 @@ BubbleBox::BubbleBox(AccessEngine *vm) : Manager(vm) {
 	_fieldE = 0;
 	_fieldF = 0;
 	_field10 = 0;
-
-	_maxChars = 0;
 }
 
 void BubbleBox::load(Common::SeekableReadStream *stream) {
@@ -53,7 +51,7 @@ void BubbleBox::clearBubbles() {
 }
 
 void BubbleBox::placeBubble(const Common::String &msg) {
-	BubbleBox::_maxChars = 27;
+	_vm->_screen->_maxChars = 27;
 	placeBubble1(msg);
 }
 
@@ -93,7 +91,7 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	int width = 0;
 	bool lastLine;
 	do {
-		lastLine = _vm->_fonts._font2.getLine(s, _maxChars * 6, line, width);
+		lastLine = _vm->_fonts._font2.getLine(s, _vm->_screen->_maxChars * 6, line, width);
 		_vm->_fonts._printMaxX = MAX(width, _vm->_fonts._printMaxX);
 
 		_vm->_screen->_printOrg.y += 6;
@@ -139,7 +137,7 @@ void BubbleBox::printBubble(const Common::String &msg) {
 	do {
 		// Get next line
 		Font &font2 = _vm->_fonts._font2;
-		lastLine = font2.getLine(s, _maxChars * 6, line, width);
+		lastLine = font2.getLine(s, _vm->_screen->_maxChars * 6, line, width);
 
 		// Set font colors
 		font2._fontColors[0] = 0;
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 3ddb2f72e3..7b25a58183 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -54,7 +54,6 @@ public:
 	int _fieldF;
 	int _field10;
 
-	int _maxChars;
 	Common::Array<Common::Rect> _bubbles;
 public:
 	BubbleBox(AccessEngine *vm);
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index d6f65a69c9..833aff337a 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -503,7 +503,7 @@ void Scripts::cmdCharSpeak() {
 void Scripts::cmdTexSpeak() {
 	_vm->_screen->_printOrg = _texsOrg;
 	_vm->_screen->_printStart = _texsOrg;
-	_vm->_bubbleBox->_maxChars = 20;
+	_vm->_screen->_maxChars = 20;
 
 	byte v;
 	Common::String tmpStr = "";
@@ -540,8 +540,8 @@ void Scripts::cmdTexChoice() {
 	_vm->_fonts._charSet._hi = 8;
 	_vm->_fonts._charFor._lo = 55;
 	_vm->_fonts._charFor._hi = 255;
-	_vm->_bubbleBox->_maxChars = 20;
 
+	_vm->_screen->_maxChars = 20;
 	_vm->_screen->_printOrg = _texsOrg;
 	_vm->_screen->_printStart = _texsOrg;
 
-- 
cgit v1.2.3


From a47b10c1c01d6ff332a11dfb61bef3e0bb8e2672 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 25 Aug 2014 23:44:55 +0200
Subject: ACCESS: Add destination surface in speakText parameters

---
 engines/access/access.cpp   | 16 ++++++++--------
 engines/access/access.h     |  4 ++--
 engines/access/asurface.cpp |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 47d77e777c..361b8b3577 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -263,7 +263,7 @@ void AccessEngine::loadEstablish(int sub) {
 		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
 }
 
-void AccessEngine::speakText(Common::Array<Common::String> msgArr) {
+void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr) {
 	int curPage = 0;
 	int soundsLeft = 0;
 
@@ -273,17 +273,17 @@ void AccessEngine::speakText(Common::Array<Common::String> msgArr) {
 
 		Common::String line;
 		int width = 0;
-		bool lastLine = _fonts._font2.getLine(msgArr[curPage], _screen->_maxChars * 6, line, width);
+		bool lastLine = _fonts._font2.getLine(msgArr[curPage], s->_maxChars * 6, line, width);
 		// Set font colors
 		_fonts._font2._fontColors[0] = 0;
 		_fonts._font2._fontColors[1] = 28;
 		_fonts._font2._fontColors[2] = 29;
 		_fonts._font2._fontColors[3] = 30;
 
-		_fonts._font2.drawString(_screen, line, _screen->_printOrg);
-		_screen->_printOrg = Common::Point(_screen->_printStart.x, _screen->_printOrg.y + 9);
+		_fonts._font2.drawString(s, line, s->_printOrg);
+		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
-		if ((_screen->_printOrg.y > _printEnd) && (!lastLine)) {
+		if ((s->_printOrg.y > _printEnd) && (!lastLine)) {
 			while (true) {
 				_sound->_soundTable[0]._data = _sound->loadSound(_narateFile + 99, _sndSubFile);
 				_sound->_soundPriority[0] = 1;
@@ -306,8 +306,8 @@ void AccessEngine::speakText(Common::Array<Common::String> msgArr) {
 						break;
 				}
 			}
-			_buffer2.copyBuffer(_screen);
-			_screen->_printOrg.y = _screen->_printStart.y;
+			_buffer2.copyBuffer(s);
+			s->_printOrg.y = s->_printStart.y;
 			++curPage;
 			soundsLeft = _countTbl[curPage];
 		}
@@ -380,7 +380,7 @@ void AccessEngine::doEstablish(int esatabIndex, int sub) {
 			msgOffset += msg.size() + 1;
 			msgArr.push_back(msg);
 		}
-		speakText(msgArr);
+		speakText(_screen, msgArr);
 	}
 
 	_screen->forceFadeOut();
diff --git a/engines/access/access.h b/engines/access/access.h
index 70195d1e64..fb73b1fb9b 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -81,7 +81,7 @@ private:
 	uint32 _lastTime, _curTime;
 
 	/**
-	 * Handles basic initialisation
+	 * Handles basic initialization
 	 */
 	void initialize();
 
@@ -92,7 +92,7 @@ private:
 
 	void dummyLoop();
 
-	void speakText(Common::Array<Common::String>msgArr);
+	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
 
 	void doEstablish(int esatabIndex, int sub);
 protected:
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 0db44c4934..cdf8b3dd3f 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -329,7 +329,6 @@ void ASurface::flipHorizontal(ASurface &dest) {
 	}
 }
 
-
 void ASurface::moveBufferLeft() {
 	byte *p = (byte *)getPixels();
 	Common::copy(p + TILE_WIDTH, p + (w * h), p);
-- 
cgit v1.2.3


From 1568b4a433f8efc0b4e670d8e9714885aa8831c0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 26 Aug 2014 23:55:17 +0200
Subject: ACCESS: Move Establish functions to Amazon engine, start implementing
 init4Quads

---
 engines/access/access.cpp             | 87 -----------------------------------
 engines/access/access.h               | 14 ++----
 engines/access/amazon/amazon_game.cpp | 86 ++++++++++++++++++++++++++++++++++
 engines/access/amazon/amazon_game.h   |  6 +++
 engines/access/amazon/amazon_room.cpp | 12 +++++
 engines/access/amazon/amazon_room.h   |  3 ++
 engines/access/martian/martian_game.h |  2 +-
 engines/access/martian/martian_room.h |  5 ++
 engines/access/room.cpp               |  4 --
 engines/access/room.h                 |  2 +-
 engines/access/screen.cpp             |  6 +++
 engines/access/screen.h               |  2 +-
 12 files changed, 126 insertions(+), 103 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 361b8b3577..c19a37cdc3 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -225,44 +225,6 @@ void AccessEngine::freeInactiveData() {
 	_inactive = nullptr;
 }
 
-void AccessEngine::establish(int esatabIndex, int sub) {
-	_establishMode = 0;
-	_establishGroup = 0;
-	doEstablish(esatabIndex, sub);
-}
-
-void AccessEngine::establishCenter(int esatabIndex, int sub) {
-	_establishMode = 1;
-	doEstablish(esatabIndex, sub);
-}
-
-const char *const _estTable[] = { "ETEXT0.DAT", "ETEXT1.DAT", "ETEXT2.DAT", "ETEXT3.DAT" };
-
-void AccessEngine::loadEstablish(int sub) {
-	if (!_files->existFile("ETEXT.DAT")) {
-		int oldGroup = _establishGroup;
-		_establishGroup = 0;
-		
-		_eseg = _files->loadFile(_estTable[oldGroup]);
-	} else {
-		_eseg = _files->loadFile("ETEXT.DAT");
-	}
-
-	_establishCtrlTblOfs = READ_LE_UINT16(_eseg);
-
-	int ofs = _establishCtrlTblOfs + (sub * 2);
-	int idx = READ_LE_UINT16(_eseg + ofs);
-	_narateFile = READ_LE_UINT16(_eseg + idx);
-	_txtPages = READ_LE_UINT16(_eseg + idx + 2);
-
-	if (!_txtPages)
-		return;
-
-	_sndSubFile = READ_LE_UINT16(_eseg + idx + 4);
-	for (int i = 0; i < _txtPages; ++i)
-		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
-}
-
 void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr) {
 	int curPage = 0;
 	int soundsLeft = 0;
@@ -343,55 +305,6 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 	}
 }
 
-void AccessEngine::doEstablish(int esatabIndex, int sub) {
-	_establishMode = 1;
-
-	_screen->forceFadeOut();
-	_screen->clearScreen();
-	_screen->setPanel(3);
-
-	if (esatabIndex != -1) {
-		_files->loadScreen(95, esatabIndex);
-		_buffer2.copyBuffer(_screen);
-	}
-
-	_screen->setIconPalette();
-	_screen->forceFadeIn();
-
-	_fonts._charSet._lo = 1;
-	_fonts._charSet._hi = 10;
-	_fonts._charFor._lo = 29;
-	_fonts._charFor._hi = 32;
-
-	_screen->_maxChars = 37;
-	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
-	loadEstablish(sub);
-	_et = sub;
-	uint16 msgOffset = READ_LE_UINT16(_eseg + (sub * 2) + 2);
-
-	_printEnd = 155;
-	if (_txtPages == 0) {
-		Common::String msg((const char *)_eseg + msgOffset);
-		_fonts._font2.printText(_screen, msg);
-	} else {
-		Common::Array<Common::String> msgArr;
-		for (int i = 0; i < _txtPages; ++i) {
-			Common::String msg((const char *)_eseg + msgOffset);
-			msgOffset += msg.size() + 1;
-			msgArr.push_back(msg);
-		}
-		speakText(_screen, msgArr);
-	}
-
-	_screen->forceFadeOut();
-	_screen->clearScreen();
-
-	free(_eseg);
-	if (_establishMode == 0) {
-		warning("TODO: init4Quads();");
-	}
-}
-
 void AccessEngine::plotList() {
 	_player->calcPlayer();
 	plotList1();
diff --git a/engines/access/access.h b/engines/access/access.h
index fb73b1fb9b..f25effef06 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -91,10 +91,6 @@ private:
 	void setVGA();
 
 	void dummyLoop();
-
-	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
-
-	void doEstablish(int esatabIndex, int sub);
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -104,6 +100,8 @@ protected:
 	 */
 	void doRoom();
 
+	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
+
 	// Engine APIs
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
@@ -198,6 +196,8 @@ public:
 	int _mapOffset;
 	int _screenVirtX;
 
+	bool _clearSummaryFlag;
+
 	// Fields mapped into the flags array
 	int &_useItem;
 	int &_startup;
@@ -229,11 +229,7 @@ public:
 	 */
 	void freeInactiveData();
 
-	void AccessEngine::loadEstablish(int sub);
-
-	void establish(int esatabIndex, int sub);
-
-	void establishCenter(int esatabIndex, int sub);
+	virtual void establish(int esatabIndex, int sub) = 0;
 
 	void plotList();
 	void plotList1();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 286a7126bc..f7ed4146d8 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -184,6 +184,92 @@ void AmazonEngine::setupGame() {
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
 }
 
+void AmazonEngine::establish(int esatabIndex, int sub) {
+	_establishMode = 0;
+	_establishGroup = 0;
+	doEstablish(esatabIndex, sub);
+}
+
+void AmazonEngine::establishCenter(int esatabIndex, int sub) {
+	_establishMode = 1;
+	doEstablish(esatabIndex, sub);
+}
+
+const char *const _estTable[] = { "ETEXT0.DAT", "ETEXT1.DAT", "ETEXT2.DAT", "ETEXT3.DAT" };
+
+void AmazonEngine::loadEstablish(int sub) {
+	if (!_files->existFile("ETEXT.DAT")) {
+		int oldGroup = _establishGroup;
+		_establishGroup = 0;
+
+		_eseg = _files->loadFile(_estTable[oldGroup]);
+	} else {
+		_eseg = _files->loadFile("ETEXT.DAT");
+	}
+
+	_establishCtrlTblOfs = READ_LE_UINT16(_eseg);
+
+	int ofs = _establishCtrlTblOfs + (sub * 2);
+	int idx = READ_LE_UINT16(_eseg + ofs);
+	_narateFile = READ_LE_UINT16(_eseg + idx);
+	_txtPages = READ_LE_UINT16(_eseg + idx + 2);
+
+	if (!_txtPages)
+		return;
+
+	_sndSubFile = READ_LE_UINT16(_eseg + idx + 4);
+	for (int i = 0; i < _txtPages; ++i)
+		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
+}
+
+void AmazonEngine::doEstablish(int esatabIndex, int sub) {
+	_establishMode = 1;
+
+	_screen->forceFadeOut();
+	_screen->clearScreen();
+	_screen->setPanel(3);
+
+	if (esatabIndex != -1) {
+		_files->loadScreen(95, esatabIndex);
+		_buffer2.copyBuffer(_screen);
+	}
+
+	_screen->setIconPalette();
+	_screen->forceFadeIn();
+
+	_fonts._charSet._lo = 1;
+	_fonts._charSet._hi = 10;
+	_fonts._charFor._lo = 29;
+	_fonts._charFor._hi = 32;
+
+	_screen->_maxChars = 37;
+	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
+	loadEstablish(sub);
+	_et = sub;
+	uint16 msgOffset = READ_LE_UINT16(_eseg + (sub * 2) + 2);
+
+	_printEnd = 155;
+	if (_txtPages == 0) {
+		Common::String msg((const char *)_eseg + msgOffset);
+		_fonts._font2.printText(_screen, msg);
+	} else {
+		Common::Array<Common::String> msgArr;
+		for (int i = 0; i < _txtPages; ++i) {
+			Common::String msg((const char *)_eseg + msgOffset);
+			msgOffset += msg.size() + 1;
+			msgArr.push_back(msg);
+		}
+		speakText(_screen, msgArr);
+	}
+
+	_screen->forceFadeOut();
+	_screen->clearScreen();
+
+	free(_eseg);
+	if (_establishMode == 0)
+		_room->init4Quads();
+}
+
 void AmazonEngine::drawHelp() {
 	error("TODO: drawHelp");
 }
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index c331830501..5c4c472fb7 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -73,6 +73,10 @@ private:
 	 */
 	void setupGame();
 
+	void loadEstablish(int sub);
+	void doEstablish(int esatabIndex, int sub);
+	void establishCenter(int esatabIndex, int sub);
+
 protected:
 	/**
 	 * Play the game
@@ -102,6 +106,8 @@ public:
 	virtual ~AmazonEngine();
 
 	void drawHelp();
+
+	virtual void establish(int esatabIndex, int sub);
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index c0076fd78a..3666de5e09 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -176,6 +176,18 @@ void AmazonRoom::mainAreaClick() {
 	}
 }
 
+void AmazonRoom::init4Quads() {
+	if (!_vm->_screen->_vesaMode)
+		return;
+
+	warning("TILESCREEN(TILE.BLK);");
+	_vm->_inventory->refreshInventory();
+	warning("TODO: UPDATESUMMARY(chapter)");
+
+	_vm->_screen->setPanel(0);
+	_vm->_screen->clearScreen();
+}
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index c7d8e0c0ae..122eed991e 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -51,10 +51,13 @@ protected:
 	virtual void roomMenu();
 
 	virtual void mainAreaClick();
+
 public:
 	AmazonRoom(AccessEngine *vm);
 
 	virtual ~AmazonRoom();
+
+	virtual void init4Quads();
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/martian/martian_game.h b/engines/access/martian/martian_game.h
index 29fdd1b2ce..a99ece67cf 100644
--- a/engines/access/martian/martian_game.h
+++ b/engines/access/martian/martian_game.h
@@ -63,13 +63,13 @@ protected:
 	 * Play the game
 	 */
 	virtual void playGame();
-public:
 public:
 	MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
 	virtual ~MartianEngine();
 
 	void drawHelp();
+	virtual void establish(int esatabIndex, int sub) {};
 };
 
 } // End of namespace Martian
diff --git a/engines/access/martian/martian_room.h b/engines/access/martian/martian_room.h
index 526de56240..14744f5311 100644
--- a/engines/access/martian/martian_room.h
+++ b/engines/access/martian/martian_room.h
@@ -53,6 +53,11 @@ public:
 	MartianRoom(AccessEngine *vm);
 
 	virtual ~MartianRoom();
+
+	virtual void loadRoomData(const byte *roomData) { warning("TODO - loadRoomData"); }
+
+	virtual void init4Quads() { }
+
 };
 
 } // End of namespace Martian
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 29d9eef624..10146ff6c3 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -324,10 +324,6 @@ void Room::buildRow(int playY, int screenY) {
 	error("TODO: buildRow");
 }
 
-void Room::init4Quads() {
-	error("TODO: init4Quads");
-}
-
 void Room::loadPlayField(int fileNum, int subfile) {
 	byte *playData = _vm->_files->loadFile(fileNum, subfile);
 	Common::MemoryReadStream stream(playData + 0x10, _vm->_files->_filesize - 0x10);
diff --git a/engines/access/room.h b/engines/access/room.h
index 6cd3b8cad0..1d540840e3 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -155,7 +155,7 @@ public:
 	 */
 	void buildRow(int playY, int screenY);
 
-	void init4Quads();
+	virtual void init4Quads() = 0;
 
 	void setWallCodes();
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 57002c0f7c..025172464a 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -58,6 +58,12 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_clipHeight = _vWindowLinesTall - 1;
 }
 
+void Screen::clearScreen() {
+	clearBuffer();
+	if (_vesaMode)
+		_vm->_clearSummaryFlag = true;
+}
+
 void Screen::setDisplayScan() {
 	_clipWidth = this->w - 1;
 	_clipHeight = this->h - 1;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 3935f2c149..a166fded5e 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -107,7 +107,7 @@ public:
 
 	void fadeOut() { forceFadeOut(); }
 	void fadeIn() { forceFadeIn(); }
-	void clearScreen() { clearBuffer(); }
+	void clearScreen();
 
 	/**
 	 * Set the initial palette
-- 
cgit v1.2.3


From 610644c4a1fd386d6fde2c4c52b5aa9c1bdacc48 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 27 Aug 2014 01:25:18 +0200
Subject: ACCESS: Implement tileScreen

---
 engines/access/amazon/amazon_game.cpp | 40 ++++++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_game.h   |  5 +++++
 engines/access/amazon/amazon_room.cpp |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f7ed4146d8..608db5d573 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -44,15 +44,18 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_hitCount = 0;
 	_saveRiver = 0;
 	_hitSafe = 0;
-	_chapter = 0;
+	_oldTitleChap = _chapter = 0;
 	_topList = 0;
 	_botList = 0;
 	_riverIndex = 0;
 	_rawInactiveX = 0;
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
+	_tilePos = Common::Point(0, 0);
 
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
+	memset(_tileData, 0, sizeof(_tileData));
+
 	_hintLevel = 0;
 }
 
@@ -270,6 +273,41 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 		_room->init4Quads();
 }
 
+const char *const _tileFiles[] = {
+	"GRAY.BLK", "RED.BLK", "LTBROWN.BLK", "DKBROWN.BLK", "VIOLET.BLK", "LITEBLUE.BLK",
+	"DARKBLUE.BLK", "CYAN.BLK", "GREEN.BLK", "OLIVE.BLK", "GRAY.BLK", "RED.BLK",
+	"LTBROWN.BLK", "DKBROWN.BLK", "VIOLET.BLK", "OLIVE.BLK"
+};
+
+void AmazonEngine::tileScreen(Common::String filename) {
+	if (!_screen->_vesaMode)
+		return;
+
+	if (!_clearSummaryFlag && (_oldTitleChap == _chapter))
+		return;
+
+	_oldTitleChap = _chapter;
+	int idx = _chapter - 1;
+
+	if (!_files->existFile(_tileFiles[idx]))
+		return;
+
+	byte *data = _files->loadFile(_tileFiles[idx]);
+	int x = READ_LE_UINT16(data);
+	int y = READ_LE_UINT16(data + 2);
+	int size = ((x + 2) * y) + 10;
+	
+	for (int i = 0; i < size; ++i)
+		_tileData[i] = data[i + 4];
+
+	// CHECKME: Depending on the Vesa mode during initialization, 400 or 480
+	for (_tilePos.y = 0; _tilePos.y < 480; _tilePos.y += y) {
+		for (_tilePos.x = 0; _tilePos.x < 640; _tilePos.x += x)
+			warning("TODO: DRAWOBJECT");
+	}
+
+}
+
 void AmazonEngine::drawHelp() {
 	error("TODO: drawHelp");
 }
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 5c4c472fb7..5192e208d7 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -39,6 +39,7 @@ private:
 	int _hitCount;
 	int _saveRiver;
 	int _hitSafe;
+	int _oldTitleChap;
 	int _chapter;
 	int _topList;
 	int _botList;
@@ -47,6 +48,8 @@ private:
 	int _rawInactiveY;
 	int _inactiveYOff;
 	int _esTabTable[100];
+	Common::Point _tilePos;
+	byte _tileData[1455];
 
 	/**
 	 * Do the game introduction
@@ -108,6 +111,8 @@ public:
 	void drawHelp();
 
 	virtual void establish(int esatabIndex, int sub);
+
+	void tileScreen(Common::String filename);
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 3666de5e09..f8c8bc45a8 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -180,7 +180,7 @@ void AmazonRoom::init4Quads() {
 	if (!_vm->_screen->_vesaMode)
 		return;
 
-	warning("TILESCREEN(TILE.BLK);");
+	_game->tileScreen(Common::String("TILE.BLK"));
 	_vm->_inventory->refreshInventory();
 	warning("TODO: UPDATESUMMARY(chapter)");
 
-- 
cgit v1.2.3


From ff05b42e021ba12ce9ca86d118868cfa32d911eb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 27 Aug 2014 08:13:54 +0200
Subject: ACCESS: Implement updateSummary

---
 engines/access/amazon/amazon_game.cpp | 43 ++++++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_game.h   |  7 ++++--
 engines/access/amazon/amazon_room.cpp |  5 ++--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 608db5d573..f7f3611440 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -45,6 +45,7 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_saveRiver = 0;
 	_hitSafe = 0;
 	_oldTitleChap = _chapter = 0;
+	_updateChapter = -1;
 	_topList = 0;
 	_botList = 0;
 	_riverIndex = 0;
@@ -279,7 +280,7 @@ const char *const _tileFiles[] = {
 	"LTBROWN.BLK", "DKBROWN.BLK", "VIOLET.BLK", "OLIVE.BLK"
 };
 
-void AmazonEngine::tileScreen(Common::String filename) {
+void AmazonEngine::tileScreen() {
 	if (!_screen->_vesaMode)
 		return;
 
@@ -308,6 +309,46 @@ void AmazonEngine::tileScreen(Common::String filename) {
 
 }
 
+void AmazonEngine::updateSummary(int chap) {
+	if (!_screen->_vesaMode)
+		return;
+
+	int chapter = chap;
+	if (chapter > 16)
+		chapter = 16;
+
+	if (!_clearSummaryFlag && (chapter == _updateChapter))
+		return;
+
+	_clearSummaryFlag = false;
+	int celSubFile = 0;
+	_updateChapter = chapter;
+	Common::Array<CellIdent> summaryCells;
+	loadCells(summaryCells);
+	
+	for (int i = celSubFile; i < 16; ++i) {
+		if (i > 7)
+			warning("TODO: DRAWOBJECT");
+		else
+			warning("TODO: DRAWOBJECT");
+	}
+
+	delete _objectsTable[93];
+	_objectsTable[93] = nullptr;
+
+	for (int i = 1; i <= _updateChapter; ++i) {
+		celSubFile = i;
+		loadCells(summaryCells);
+		if (i > 8)
+			warning("TODO: DRAWOBJECT");
+		else
+			warning("TODO: DRAWOBJECT");
+
+		delete _objectsTable[93];
+		_objectsTable[93] = nullptr;
+	}
+}
+
 void AmazonEngine::drawHelp() {
 	error("TODO: drawHelp");
 }
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 5192e208d7..59511c4546 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -40,7 +40,6 @@ private:
 	int _saveRiver;
 	int _hitSafe;
 	int _oldTitleChap;
-	int _chapter;
 	int _topList;
 	int _botList;
 	int _riverIndex;
@@ -103,6 +102,9 @@ public:
 
 	// Other game specific fields
 	int _hintLevel;
+
+	int _chapter;
+	int _updateChapter;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
@@ -112,7 +114,8 @@ public:
 
 	virtual void establish(int esatabIndex, int sub);
 
-	void tileScreen(Common::String filename);
+	void tileScreen();
+	void updateSummary(int chap);
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index f8c8bc45a8..f64264f7d7 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -180,9 +180,10 @@ void AmazonRoom::init4Quads() {
 	if (!_vm->_screen->_vesaMode)
 		return;
 
-	_game->tileScreen(Common::String("TILE.BLK"));
+	// CHECKME: in the original, this call of tileScreen uses an useless parameter, "TILES.BLK"
+	_game->tileScreen();
 	_vm->_inventory->refreshInventory();
-	warning("TODO: UPDATESUMMARY(chapter)");
+	_game->updateSummary(_game->_chapter);
 
 	_vm->_screen->setPanel(0);
 	_vm->_screen->clearScreen();
-- 
cgit v1.2.3


From 21d6fddab43ff4adbd8c8b3d10b110576c197108 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 27 Aug 2014 14:57:35 +0700
Subject: ZVISION: Added scaled blitter to bkg

---
 engines/zvision/graphics/render_manager.cpp | 26 ++++++++++++++++++++++++++
 engines/zvision/graphics/render_manager.h   |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index c89444df13..5aa0d752d0 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -565,6 +565,32 @@ void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y,
 		_bkgDirtyRect.extend(dirty);
 }
 
+void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect) {
+	if (src.w == _dstRect.width() && src.h == _dstRect.height())
+		blitSurfaceToBkg(src, _dstRect.left, _dstRect.top);
+	else {
+		Graphics::Surface *tmp = new Graphics::Surface;
+		tmp->create(_dstRect.width(), _dstRect.height(), src.format);
+		scaleBuffer(src.getPixels(), tmp->getPixels(), src.w, src.h, src.format.bytesPerPixel, _dstRect.width(), _dstRect.height());
+		blitSurfaceToBkg(*tmp, _dstRect.left, _dstRect.top);
+		tmp->free();
+		delete tmp;
+	}
+}
+
+void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, uint32 colorkey) {
+	if (src.w == _dstRect.width() && src.h == _dstRect.height())
+		blitSurfaceToBkg(src, _dstRect.left, _dstRect.top, colorkey);
+	else {
+		Graphics::Surface *tmp = new Graphics::Surface;
+		tmp->create(_dstRect.width(), _dstRect.height(), src.format);
+		scaleBuffer(src.getPixels(), tmp->getPixels(), src.w, src.h, src.format.bytesPerPixel, _dstRect.width(), _dstRect.height());
+		blitSurfaceToBkg(*tmp, _dstRect.left, _dstRect.top, colorkey);
+		tmp->free();
+		delete tmp;
+	}
+}
+
 void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y) {
 	Common::Rect empt;
 	blitSurfaceToSurface(src, empt, _menuWnd, x, y);
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index b4c6c76a6e..24234e28e1 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -229,6 +229,8 @@ public:
 	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey);
 	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y);
 	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey);
+	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect);
+	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, uint32 colorkey);
 	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y);
 	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey);
 
-- 
cgit v1.2.3


From 2b6d65f83bdc26b3d07cfc3061a27882d87df67c Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 27 Aug 2014 14:59:18 +0700
Subject: ZVISION: Implemented hotmovie control

---
 engines/zvision/module.mk                          |   1 +
 .../zvision/scripting/controls/hotmov_control.cpp  | 201 +++++++++++++++++++++
 .../zvision/scripting/controls/hotmov_control.h    |  63 +++++++
 engines/zvision/scripting/scr_file_handling.cpp    |   3 +
 4 files changed, 268 insertions(+)
 create mode 100644 engines/zvision/scripting/controls/hotmov_control.cpp
 create mode 100644 engines/zvision/scripting/controls/hotmov_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 457444c5e2..0e6f1ce042 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -17,6 +17,7 @@ MODULE_OBJS := \
 	graphics/render_table.o \
 	scripting/actions.o \
 	scripting/control.o \
+	scripting/controls/hotmov_control.o \
 	scripting/controls/input_control.o \
 	scripting/controls/lever_control.o \
 	scripting/controls/push_toggle_control.o \
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
new file mode 100644
index 0000000000..1e1886e1a8
--- /dev/null
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -0,0 +1,201 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/hotmov_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/animation/meta_animation.h"
+#include "zvision/utility/utility.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "common/system.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key, CONTROL_HOTMOV) {
+	_animation = NULL;
+	_cycle = 0;
+	_cur_frame = -1;
+	_lastRenderedFrame = -1;
+	_frames.clear();
+	_frame_time = 0;
+	_num_cycles = 0;
+	_num_frames = 0;
+
+	_engine->getScriptManager()->setStateFlag(_key, 0);
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("hs_frame_list", true)) {
+			readHsFile(values);
+		} else if (param.matchString("rectangle", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_rectangle = Common::Rect(x, y, width, height);
+		} else if (param.matchString("num_frames", true)) {
+			_num_frames = atoi(values.c_str());
+		} else if (param.matchString("num_cycles", true)) {
+			_num_cycles = atoi(values.c_str());
+		} else if (param.matchString("animation", true)) {
+			char filename[64];
+			sscanf(values.c_str(), "%s", filename);
+			values = Common::String(filename);
+			if (values.hasSuffix(".avi") || values.hasSuffix(".rlf"))
+				_animation = new MetaAnimation(values, _engine);
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+}
+
+HotMovControl::~HotMovControl() {
+	if (_animation)
+		delete _animation;
+
+	_frames.clear();
+}
+
+void HotMovControl::renderFrame(uint frameNumber) {
+	if ((int)frameNumber == _lastRenderedFrame)
+		return;
+
+	_lastRenderedFrame = frameNumber;
+
+	const Graphics::Surface *frameData;
+
+	if (_animation) {
+		frameData = _animation->getFrameData(frameNumber);
+		if (frameData)
+			_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _rectangle);
+	}
+}
+
+bool HotMovControl::process(uint32 deltaTimeInMillis) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_cycle < _num_cycles) {
+		_frame_time -= deltaTimeInMillis;
+
+		if (_frame_time <= 0) {
+			_cur_frame++;
+			if (_cur_frame >= _num_frames) {
+				_cur_frame = 0;
+				_cycle++;
+			}
+			if (_cycle != _num_cycles)
+				renderFrame(_cur_frame);
+			else
+				_engine->getScriptManager()->setStateFlag(_key, 2);
+
+			_frame_time = _animation->frameTime();
+		}
+	}
+
+	return false;
+}
+
+bool HotMovControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_cycle < _num_cycles) {
+		if (_frames[_cur_frame].contains(backgroundImageSpacePos)) {
+			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_cycle < _num_cycles) {
+		if (_frames[_cur_frame].contains(backgroundImageSpacePos)) {
+			_engine->getScriptManager()->setStateValue(_key, 1);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void HotMovControl::readHsFile(const Common::String &fileName) {
+	if (_num_frames == 0)
+		return;
+
+	Common::File file;
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
+		warning("HS file %s could could be opened", fileName.c_str());
+		return;
+	}
+
+	Common::String line;
+
+	_frames.resize(_num_frames);
+
+	while (!file.eos()) {
+		line = file.readLine();
+
+		int frame;
+		int x;
+		int y;
+		int width;
+		int height;
+
+		sscanf(line.c_str(), "%d:%d %d %d %d~", &frame, &x, &y, &width, &height);
+
+		if (frame >= 0 && frame < _num_frames)
+			_frames[frame] = Common::Rect(x, y, width, height);
+	}
+	file.close();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
new file mode 100644
index 0000000000..ea12bab82b
--- /dev/null
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -0,0 +1,63 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_HOTMOV_CONTROL_H
+#define ZVISION_HOTMOV_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "common/array.h"
+#include "common/rect.h"
+
+
+namespace ZVision {
+
+class MetaAnimation;
+
+class HotMovControl : public Control {
+public:
+	HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~HotMovControl();
+
+private:
+	int32  _num_frames;
+	int32  _frame_time;
+	int32  _cur_frame;
+	int32  _lastRenderedFrame;
+	int32  _cycle;
+	int32  _num_cycles;
+	MetaAnimation *_animation;
+	Common::Rect _rectangle;
+	Common::Array<Common::Rect> _frames;
+public:
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	void renderFrame(uint frameNumber);
+	void readHsFile(const Common::String &fileName);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index b8046c0fe8..d6c5aa0cb5 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -34,6 +34,7 @@
 #include "zvision/scripting/controls/save_control.h"
 #include "zvision/scripting/controls/input_control.h"
 #include "zvision/scripting/controls/safe_control.h"
+#include "zvision/scripting/controls/hotmov_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -355,6 +356,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new SaveControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("safe")) {
 		return new SafeControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("hotmovie")) {
+		return new HotMovControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 1590f29d149df976e27df4a49c21ae4d23ab8663 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 28 Aug 2014 01:59:53 +0200
Subject: ACCESS: Use the hires version in Amazon CD

---
 engines/access/access.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index c19a37cdc3..6058800ddb 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -141,7 +141,11 @@ void AccessEngine::initialize() {
 
 	if (isCD()) {
 		const Common::FSNode gameDataDir(ConfMan.get("path"));
-		const Common::FSNode cdromDir = gameDataDir.getChild("cdrom");
+		// The CD version contains two versions of the game.
+		// - The MCGA version, in the CDROM folder
+		// - The VESA version, in the TDROM folder
+		// We use the hires version.
+		const Common::FSNode cdromDir = gameDataDir.getChild("tdrom");
 
 		for (int idx = 0; idx < 15; ++idx) {
 			Common::String folder = (idx == 0) ? "game" :
-- 
cgit v1.2.3


From 941b443195006a787f25143559bf793e863b9446 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 28 Aug 2014 02:01:05 +0200
Subject: ACCESS: Fix a crash in the intro

---
 engines/access/amazon/amazon_game.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f7f3611440..15869a4499 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -90,7 +90,7 @@ void AmazonEngine::doIntroduction() {
 	_events->showCursor();
 	_screen->setPanel(0);
 
-	// TODO: Worry about implementing full intro sequence later
+	//TODO: Implement the rest of the intro
 	return;
 
 	doTitle();
@@ -123,6 +123,9 @@ void AmazonEngine::doTitle() {
 	_sound->queueSound(0, 98, 30);
 	_sound->_soundPriority[0] = 1;
 
+	_sound->queueSound(1, 98, 8);
+	_sound->_soundPriority[1] = 1;
+
 	_screen->_loadPalFlag = false;
 	_files->loadScreen(0, 3);
 	
@@ -146,14 +149,18 @@ void AmazonEngine::doTitle() {
 	_sound->playSound(1);
 
 	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (_pCount = 0; _pCount < 3; ++_pCount) {
-		_buffer2.copyFrom(_buffer1);
-		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
-		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
-		_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
+	for (_pCount = 0; _pCount <= 3; ++_pCount) {
+		if (_pCount != 3) {
+			_buffer2.copyFrom(_buffer1);
+			int id = READ_LE_UINT16(COUNTDOWN + _pCount * 2);
+			int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 2 + 1);
+			_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
+			//TODO : more intro
+		} else {
+			//TODO : more intro
+		}
 	}
-	// TODO: More to do
-
+	//TODO : more intro
 	delete _objectsTable[0];
 }
 
-- 
cgit v1.2.3


From a0e54db08155f8cf8d56f66743ffa694c188e33b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 28 Aug 2014 02:01:33 +0200
Subject: ACCESS: Set Vesa mode when using the CD

---
 engines/access/screen.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 025172464a..4f2ee3e3ac 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -41,7 +41,11 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	Common::fill(&_scaleTable1[0], &_scaleTable1[256], 0);
 	Common::fill(&_scaleTable2[0], &_scaleTable2[256], 0);
 	_savedPaletteCount = 0;
-	_vesaMode = 0;
+	if (_vm->isCD())
+		_vesaMode = 0;
+	else
+		_vesaMode = 1;
+
 	_vesaCurrentWin = 0;
 	_currentPanel = 0;
 	_hideFlag = true;
-- 
cgit v1.2.3


From 455011c37e20fb2d859e1c3f04650e369844c921 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 28 Aug 2014 02:02:03 +0200
Subject: ACCESS: Fix typo in detection comment

---
 engines/access/detection_tables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index 6a281a7e96..95ac8fa47d 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -42,7 +42,7 @@ static const AccessGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Amazon Guadians of Eden - CD English
+		// Amazon: Guardians of Eden - CD English
 		{
 			"amazon",
 			"CD",
-- 
cgit v1.2.3


From c0a7852662be724077921bcf9b9bb0bf2da2dfff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 27 Aug 2014 22:13:43 -0400
Subject: ACCESS: Refactor the file manager to return resource structures

---
 engines/access/access.cpp               |  17 ++--
 engines/access/access.h                 |   8 +-
 engines/access/amazon/amazon_game.cpp   |  15 ++--
 engines/access/amazon/amazon_room.cpp   |   6 +-
 engines/access/animation.cpp            |  77 ++++++++--------
 engines/access/animation.h              |  11 +--
 engines/access/asurface.cpp             |  29 +++---
 engines/access/asurface.h               |   5 +-
 engines/access/bubble_box.cpp           |   6 +-
 engines/access/char.cpp                 |  14 +--
 engines/access/files.cpp                | 154 +++++++++++++++++---------------
 engines/access/files.h                  |  57 ++++++++----
 engines/access/martian/martian_game.cpp |   6 +-
 engines/access/martian/martian_room.cpp |   6 +-
 engines/access/player.cpp               |   6 +-
 engines/access/room.cpp                 |  44 ++++-----
 engines/access/screen.cpp               |   5 +-
 engines/access/scripts.cpp              |  23 +++--
 engines/access/scripts.h                |   6 +-
 engines/access/sound.cpp                |   9 +-
 engines/access/sound.h                  |  12 +--
 engines/access/video.cpp                |  26 +++++-
 engines/access/video.h                  |  13 ++-
 23 files changed, 307 insertions(+), 248 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6058800ddb..080cd36032 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -70,6 +70,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleMaxY = 0;
 	_scaleI = 0;
 	_scaleFlag = false;
+	_eseg = nullptr;
 
 	_conversation = 0;
 	_currentMan = 0;
@@ -124,9 +125,9 @@ AccessEngine::~AccessEngine() {
 	delete _video;
 
 	freeCells();
-	delete[] _inactive;
-	delete[] _music;
-	delete[] _title;
+	delete _inactive;
+	delete _music;
+	delete _title;
 }
 
 void AccessEngine::setVGA() {
@@ -211,9 +212,9 @@ int AccessEngine::getRandomNumber(int maxNumber) {
 
 void AccessEngine::loadCells(Common::Array<CellIdent> &cells) {
 	for (uint i = 0; i < cells.size(); ++i) {
-		byte *spriteData = _files->loadFile(cells[i]);
-		_objectsTable[cells[i]._cell] = new SpriteResource(this, 
-			spriteData, _files->_filesize, DisposeAfterUse::YES);
+		Resource *spriteData = _files->loadFile(cells[i]);
+		_objectsTable[cells[i]._cell] = new SpriteResource(this, spriteData);
+		delete spriteData;
 	}
 }
 
@@ -251,7 +252,7 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 
 		if ((s->_printOrg.y > _printEnd) && (!lastLine)) {
 			while (true) {
-				_sound->_soundTable[0]._data = _sound->loadSound(_narateFile + 99, _sndSubFile);
+				_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 				_sound->_soundPriority[0] = 1;
 				_sound->playSound(1);
 				_scripts->CMDFREESOUND();
@@ -286,7 +287,7 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 		return;
 
 	while(true) {
-		_sound->_soundTable[0]._data = _sound->loadSound(_narateFile + 99, _sndSubFile);
+		_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundPriority[0] = 1;
 		_sound->playSound(1);
 		_scripts->CMDFREESOUND();
diff --git a/engines/access/access.h b/engines/access/access.h
index f25effef06..55810e8a16 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -148,9 +148,9 @@ public:
 	int _mouseMode;
 
 	int _currentManOld;
-	byte *_inactive;
-	byte *_music;
-	byte *_title;
+	Resource *_inactive;
+	Resource *_music;
+	Resource *_title;
 	int _converseMode;
 	int _startAboutBox;
 	int _startTravelBox;
@@ -164,7 +164,7 @@ public:
 	int _scaleI;
 	bool _scaleFlag;
 
-	byte *_eseg;
+	Resource *_eseg;
 	int _et;
 	int _printEnd;
 	int _txtPages;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 15869a4499..cf383ce45a 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -134,9 +134,9 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->playSound(1);
 
-	byte *spriteData = _files->loadFile(0, 2);
-	_objectsTable[0] = new SpriteResource(this, spriteData, _files->_filesize,
-		DisposeAfterUse::YES);
+	Resource *spriteData = _files->loadFile(0, 2);
+	_objectsTable[0] = new SpriteResource(this, spriteData);
+	delete spriteData;
 
 	_sound->playSound(1);
 
@@ -300,13 +300,13 @@ void AmazonEngine::tileScreen() {
 	if (!_files->existFile(_tileFiles[idx]))
 		return;
 
-	byte *data = _files->loadFile(_tileFiles[idx]);
-	int x = READ_LE_UINT16(data);
-	int y = READ_LE_UINT16(data + 2);
+	Resource *res = _files->loadFile(_tileFiles[idx]);
+	int x = res->_stream->readSint16LE();
+	int y = res->_stream->readSint16LE();
 	int size = ((x + 2) * y) + 10;
 	
 	for (int i = 0; i < size; ++i)
-		_tileData[i] = data[i + 4];
+		_tileData[i] = res->_stream->readByte();
 
 	// CHECKME: Depending on the Vesa mode during initialization, 400 or 480
 	for (_tilePos.y = 0; _tilePos.y < 480; _tilePos.y += y) {
@@ -314,6 +314,7 @@ void AmazonEngine::tileScreen() {
 			warning("TODO: DRAWOBJECT");
 	}
 
+	delete res;
 }
 
 void AmazonEngine::updateSummary(int chap) {
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index f64264f7d7..227fc474cf 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -131,9 +131,9 @@ void AmazonRoom::roomSet() {
 }
 
 void AmazonRoom::roomMenu() {
-	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
-	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
-	delete[] iconData;
+	Resource *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData);
+	delete iconData;
 
 	_vm->_screen->saveScreen();
 	_vm->_screen->setDisplayScan();
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index b286237bfb..03f349e34a 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -27,18 +27,17 @@
 
 namespace Access {
 
-AnimationResource::AnimationResource(AccessEngine *vm, const byte *data, int size) {
-	Common::MemoryReadStream stream(data, size);
-	int count = stream.readUint16LE();
+AnimationResource::AnimationResource(AccessEngine *vm, Resource *res) {
+	int count = res->_stream->readUint16LE();
 
 	Common::Array<int> offsets;
 	for (int i = 0; i < count; ++i)
-		offsets.push_back(stream.readUint32LE());
+		offsets.push_back(res->_stream->readUint32LE());
 
 	_animations.reserve(count);
 	for (int i = 0; i < count; ++i) {
-		stream.seek(offsets[i]);
-		Animation *anim = new Animation(vm, stream);
+		res->_stream->seek(offsets[i]);
+		Animation *anim = new Animation(vm, res->_stream);
 		_animations.push_back(anim);
 	}
 }
@@ -50,29 +49,29 @@ AnimationResource::~AnimationResource() {
 
 /*------------------------------------------------------------------------*/
 
-Animation::Animation(AccessEngine *vm, Common::MemoryReadStream &stream):
+Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) :
 		Manager(vm) {
-	uint32 startOfs = stream.pos();
-
-	_type = stream.readByte();
-	_scaling = stream.readSByte();
-	stream.readByte(); // unk
-	_frameNumber = stream.readByte();
-	_initialTicks = stream.readUint16LE();
-	stream.readUint16LE(); // unk
-	stream.readUint16LE(); // unk
-	_loopCount = stream.readSint16LE();
-	_countdownTicks = stream.readUint16LE();
-	_currentLoopCount = stream.readSint16LE();
-	stream.readUint16LE(); // unk
+	uint32 startOfs = stream->pos();
+
+	_type = stream->readByte();
+	_scaling = stream->readSByte();
+	stream->readByte(); // unk
+	_frameNumber = stream->readByte();
+	_initialTicks = stream->readUint16LE();
+	stream->readUint16LE(); // unk
+	stream->readUint16LE(); // unk
+	_loopCount = stream->readSint16LE();
+	_countdownTicks = stream->readUint16LE();
+	_currentLoopCount = stream->readSint16LE();
+	stream->readUint16LE(); // unk
 
 	Common::Array<uint16> frameOffsets;
 	uint16 ofs;
-	while ((ofs = stream.readUint16LE()) != 0)
+	while ((ofs = stream->readUint16LE()) != 0)
 		frameOffsets.push_back(ofs);
 
 	for (int i = 0; i < (int)frameOffsets.size(); i++) {
-		stream.seek(startOfs + frameOffsets[i]);
+		stream->seek(startOfs + frameOffsets[i]);
 
 		AnimationFrame *frame = new AnimationFrame(stream, startOfs);
 		_frames.push_back(frame);
@@ -239,22 +238,22 @@ void Animation::setFrame1(AnimationFrame *frame) {
 
 /*------------------------------------------------------------------------*/
 
-AnimationFrame::AnimationFrame(Common::MemoryReadStream &stream, int startOffset) {
+AnimationFrame::AnimationFrame(Common::SeekableReadStream *stream, int startOffset) {
 	uint16 nextOffset;
 
-	stream.readByte(); // unk
-	_baseX = stream.readUint16LE();
-	_baseY = stream.readUint16LE();
-	_frameDelay = stream.readUint16LE();
-	nextOffset = stream.readUint16LE();
+	stream->readByte(); // unk
+	_baseX = stream->readUint16LE();
+	_baseY = stream->readUint16LE();
+	_frameDelay = stream->readUint16LE();
+	nextOffset = stream->readUint16LE();
 
 	while (nextOffset != 0) {
-		stream.seek(startOffset + nextOffset);
+		stream->seek(startOffset + nextOffset);
 
 		AnimationFramePart *framePart = new AnimationFramePart(stream);
 		_parts.push_back(framePart);
 
-		nextOffset = stream.readUint16LE();
+		nextOffset = stream->readUint16LE();
 	}
 }
 
@@ -265,13 +264,13 @@ AnimationFrame::~AnimationFrame() {
 
 /*------------------------------------------------------------------------*/
 
-AnimationFramePart::AnimationFramePart(Common::MemoryReadStream &stream) {
-	_flags = stream.readByte();
-	_spritesIndex = stream.readByte();
-	_frameIndex = stream.readByte();
-	_position.x = stream.readUint16LE();
-	_position.y = stream.readUint16LE();
-	_offsetY = stream.readUint16LE();
+AnimationFramePart::AnimationFramePart(Common::SeekableReadStream *stream) {
+	_flags = stream->readByte();
+	_spritesIndex = stream->readByte();
+	_frameIndex = stream->readByte();
+	_position.x = stream->readUint16LE();
+	_position.y = stream->readUint16LE();
+	_offsetY = stream->readUint16LE();
 }
 
 /*------------------------------------------------------------------------*/
@@ -296,10 +295,10 @@ void AnimationManager::clearTimers() {
 	_animationTimers.clear();
 }
 
-void AnimationManager::loadAnimations(const byte *data, int size) {
+void AnimationManager::loadAnimations(Resource *res) {
 	_animationTimers.clear();
 	delete _animation;
-	_animation = new AnimationResource(_vm, data,  size);
+	_animation = new AnimationResource(_vm, res);
 }
 
 
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 7e94f58cbd..8a39333764 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -27,6 +27,7 @@
 #include "common/array.h"
 #include "common/memstream.h"
 #include "access/data.h"
+#include "access/files.h"
 
 namespace Access {
 
@@ -47,7 +48,7 @@ public:
 	AnimationManager(AccessEngine *vm);
 	~AnimationManager();
 	void freeAnimationData();
-	void loadAnimations(const byte *data, int size);
+	void loadAnimations(Resource *res);
 	
 	Animation *findAnimation(int animId);
 	Animation *setAnimation(int animId);
@@ -74,7 +75,7 @@ class AnimationResource {
 private:
 	Common::Array<Animation *> _animations;
 public:
-	AnimationResource(AccessEngine *vm, const byte *data, int size);
+	AnimationResource(AccessEngine *vm, Resource *res);
 	~AnimationResource();
 
 	int getCount() { return _animations.size(); }
@@ -107,7 +108,7 @@ public:
 	int _currentLoopCount;
 	int _field10;
 public:
-	Animation(AccessEngine *vm, Common::MemoryReadStream &stream);
+	Animation(AccessEngine *vm, Common::SeekableReadStream *stream);
 	~Animation();
 
 	void animate();
@@ -119,7 +120,7 @@ public:
 	int _frameDelay;
 	Common::Array<AnimationFramePart *> _parts;
 public:
-	AnimationFrame(Common::MemoryReadStream &stream, int startOffset);
+	AnimationFrame(Common::SeekableReadStream *stream, int startOffset);
 	~AnimationFrame();
 };
 
@@ -131,7 +132,7 @@ public:
 	Common::Point _position;
 	int _offsetY;
 public:
-	AnimationFramePart(Common::MemoryReadStream &stream);
+	AnimationFramePart(Common::SeekableReadStream *stream);
 };
 
 } // End of namespace Access
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index cdf8b3dd3f..cf8bf0766f 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -28,27 +28,22 @@
 
 namespace Access {
 
-SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
-		DisposeAfterUse::Flag disposeMemory) {
-	Common::MemoryReadStream stream(data, size);
+SpriteResource::SpriteResource(AccessEngine *vm, Resource *res) {
 	Common::Array<uint32> offsets;
-	int count = stream.readUint16LE();
+	int count = res->_stream->readUint16LE();
 
 	for (int i = 0; i < count; i++)
-		offsets.push_back(stream.readUint32LE());
-	offsets.push_back(size);	// For easier calculations of Noctropolis sizes
+		offsets.push_back(res->_stream->readUint32LE());
+	offsets.push_back(res->_size);	// For easier calculations of Noctropolis sizes
 
 	// Build up the frames
 	for (int i = 0; i < count; ++i) {
-		stream.seek(offsets[i]);
+		res->_stream->seek(offsets[i]);
 		int frameSize = offsets[i + 1] - offsets[i];
 
-		SpriteFrame *frame = new SpriteFrame(vm, stream, frameSize);
+		SpriteFrame *frame = new SpriteFrame(vm, res->_stream, frameSize);
 		_frames.push_back(frame);
 	}
-
-	if (disposeMemory == DisposeAfterUse::YES)
-		delete[] data;
 }
 
 SpriteResource::~SpriteResource() {
@@ -56,9 +51,9 @@ SpriteResource::~SpriteResource() {
 		delete _frames[i];
 }
 
-SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize) {
-	int xSize = stream.readUint16LE();
-	int ySize = stream.readUint16LE();
+SpriteFrame::SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, int frameSize) {
+	int xSize = stream->readUint16LE();
+	int ySize = stream->readUint16LE();
 	create(xSize, ySize);
 	
 	// Empty surface
@@ -67,12 +62,12 @@ SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int
 	
 	// Decode the data
 	for (int y = 0; y < h; ++y) {
-		int offset = stream.readByte();
-		int len = stream.readByte();
+		int offset = stream->readByte();
+		int len = stream->readByte();
 		assert((offset + len) <= w);
 
 		byte *destP = (byte *)getBasePtr(offset, y);
-		stream.read(destP, len);
+		stream->read(destP, len);
 	}
 }
 
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 5d1f6fd307..5c164f0e59 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -115,7 +115,7 @@ public:
 
 class SpriteFrame : public ASurface {
 public:
-	SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize);
+	SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, int frameSize);
 	~SpriteFrame();
 };
 
@@ -123,8 +123,7 @@ class SpriteResource {
 public:
 	Common::Array<SpriteFrame *> _frames;
 public:
-	SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
-		DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
+	SpriteResource(AccessEngine *vm, Resource *res);
 	~SpriteResource();
 
 	int getCount() { return _frames.size(); }
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index d3782a3125..c4272b607a 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -191,9 +191,9 @@ void BubbleBox::doBox(int item, int box) {
 	}
 
 	// Get icons data
-	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
-	SpriteResource *icons = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
-	delete[] iconData;
+	Resource *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *icons = new SpriteResource(_vm, iconData);
+	delete iconData;
 
 	// Set the up boundaries and color to use for the box background
 	_vm->_screen->_orgX1 = _bounds.left - 2;
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index 09335fc017..767512f43e 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -121,15 +121,15 @@ void CharManager::loadChar(int charId) {
 
 	_vm->loadCells(ce._cells);
 	if (ce._animFile._fileNum != -1) {
-		byte *data = _vm->_files->loadFile(ce._animFile);
-		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
+		Resource *data = _vm->_files->loadFile(ce._animFile);
+		_vm->_animation->loadAnimations(data);
 	}
 
 	// Load script data
 	_vm->_scripts->freeScriptData();
 	if (ce._scriptFile._fileNum != -1) {
-		const byte *data = _vm->_files->loadFile(ce._scriptFile);
-		_vm->_scripts->setScript(data, _vm->_files->_filesize);
+		Resource *data = _vm->_files->loadFile(ce._scriptFile);
+		_vm->_scripts->setScript(data);
 	}
 
 	// Load extra cells
@@ -139,9 +139,9 @@ void CharManager::loadChar(int charId) {
 }
 
 void CharManager::charMenu() {
-	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
-	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
-	delete[] iconData;
+	Resource *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData);
+	delete iconData;
 
 	Screen &screen = *_vm->_screen;
 	screen.saveScreen();
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index b1d6140e3e..78cb3eff51 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/substream.h"
 #include "access/files.h"
 #include "access/amazon/amazon_resources.h"
 #include "access/martian/martian_resources.h"
@@ -47,6 +48,27 @@ CellIdent::CellIdent(int cell, int fileNum, int subfile) {
 
 /*------------------------------------------------------------------------*/
 
+Resource::Resource() {
+	_stream = nullptr;
+	_size = 0;
+}
+
+Resource::~Resource() {
+	delete _stream;
+}
+
+byte *Resource::data() {
+	if (_data == nullptr) {
+		_data = new byte[_size];
+		_stream->seek(0);
+		_stream->read(_data, _size);
+	}
+
+	return _data;
+}
+
+/*------------------------------------------------------------------------*/
+
 FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	switch (vm->getGameID()) {
 	case GType_Amazon:
@@ -60,71 +82,70 @@ FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	}
 
 	_fileNumber = -1;
-	_stream = nullptr;
 }
 
 FileManager::~FileManager() {
-	delete _stream;
-	_file.close();
 }
 
-byte *FileManager::loadFile(int fileNum, int subfile) {
-	setAppended(fileNum);
-	gotoAppended(subfile);
+Resource *FileManager::loadFile(int fileNum, int subfile) {
+	Resource *res = new Resource();
+	setAppended(res, fileNum);
+	gotoAppended(res, subfile);
 
-	return handleFile();
+	handleFile(res);
+	return res;
 }
 
-byte *FileManager::loadFile(FileIdent &fileIdent) {
+Resource *FileManager::loadFile(FileIdent &fileIdent) {
 	return loadFile(fileIdent._fileNum, fileIdent._subfile);
 }
 
-byte *FileManager::loadFile(const Common::String &filename) {
+Resource *FileManager::loadFile(const Common::String &filename) {
+	Resource *res = new Resource();
+
 	// Open the file
-	openFile(filename);
+	openFile(res, filename);
 
-	// Get a stream for the entire file
-	delete _stream;
-	_stream = _file.readStream(_file.size());
+	// Set up stream for the entire file
+	res->_size = res->_file.size();
+	res->_stream = res->_file.readStream(res->_size);
 
-	return handleFile();
+	handleFile(res);
+	return res;
 }
 
 bool FileManager::existFile(const Common::String &filename) {
-	return _file.exists(filename);
+	Common::File f;
+	return f.exists(filename);
 }
 
-void FileManager::openFile(const Common::String &filename) {
+void FileManager::openFile(Resource *res, const Common::String &filename) {
 	// Open up the file
 	_fileNumber = -1;
-	_file.close();
-	if (!_file.open(filename))
+	if (!res->_file.open(filename))
 		error("Could not open file - %s", filename.c_str());
-
-	_filesize = _file.size();
 }
 
 void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile) {
-	setAppended(fileNum);
-	gotoAppended(subfile);
-	_vm->_screen->loadPalette(_stream);
+	Resource *res = loadFile(fileNum, subfile);
+	handleScreen(dest, res);
+	delete res;
+}
 
-	// Get the data for the screen, and copy it over
-	byte *pSrc = handleFile();
+void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
+	_vm->_screen->loadPalette(res->_stream);
 
 	if (dest != _vm->_screen)
 		dest->w = _vm->_screen->w;
 
 	if (dest->w == dest->pitch) {
-		Common::copy(pSrc, pSrc + _filesize, (byte *)dest->getPixels());
+		res->_stream->read((byte *)dest->getPixels(), dest->w * dest->h);
 	} else {
-		byte *pCurr = pSrc;
-		for (int y = 0; y < dest->h; ++y, pCurr += dest->w) {
+		for (int y = 0; y < dest->h; ++y) {
 			byte *pDest = (byte *)dest->getBasePtr(0, y);
-			Common::copy(pCurr, pCurr + dest->w, pDest);
+			res->_stream->read(pDest, dest->w);
 		}
 	}
-	delete[] pSrc;
 }
 
 void FileManager::loadScreen(int fileNum, int subfile) {
@@ -132,69 +153,62 @@ void FileManager::loadScreen(int fileNum, int subfile) {
 }
 
 void FileManager::loadScreen(const Common::String &filename) {
-	// Open the file
-	openFile(filename);
-
-	// Get the palette
-	_vm->_screen->loadPalette(&_file);
-
-	// Get a stream for the remainder of the file
-	delete _stream;
-	_stream = _file.readStream(_file.size() - _file.pos());
-
-	// Get the data for the screen, and copy it over
-	byte *pSrc = handleFile();
-	Common::copy(pSrc, pSrc + _filesize, (byte *)_vm->_screen->getPixels());
-	delete[] pSrc;
+	Resource *res = loadFile(filename);
+	handleScreen(_vm->_screen, res);
+	delete res;
 }
 
-byte *FileManager::handleFile() {
+void FileManager::handleFile(Resource *res) {
 	char header[3];
-	_stream->read(&header[0], 3);
-	_stream->seek(-3, SEEK_CUR);
+	res->_stream->read(&header[0], 3);
+	res->_stream->seek(-3, SEEK_CUR);
 
 	bool isCompressed = !strncmp(header, "DBE", 3);
 
-	// Get the data from the file or resource
-	_filesize = _stream->size() - _stream->pos();
-	byte *data = new byte[_filesize];
-	_stream->read(data, _filesize);
-
-	// If the data is compressed, uncompress it
+	// If the data is compressed, uncompress it and replace the stream 
+	// in the resource with the decompressed one
 	if (isCompressed) {
-		byte *src = data;
-		_filesize = decompressDBE(src, &data);
+		// Read in the entire compressed data
+		byte *src = new byte[res->_size];
+		res->_stream->read(src, res->_size);
+
+		// Decompress the data
+		res->_size = decompressDBE(src, &res->_data);
+
+		// Replace the default resource stream with a stream for the decompressed data
+		delete res->_stream;
+		res->_file.close();
+		res->_stream = new Common::MemoryReadStream(res->_data, res->_size);
+
 		delete[] src;
 	}
-
-	return data;
 }
 
-void FileManager::setAppended(int fileNum) {
+void FileManager::setAppended(Resource *res, int fileNum) {
+	// Open the file for access
+	if (!res->_file.open(_filenames[fileNum]))
+		error("Could not open file %s", _filenames[fileNum]);
+
+	// If a different file has been opened then previously, load it's index
 	if (_fileNumber != fileNum) {
 		_fileNumber = fileNum;
-
-		_file.close();
-		if (!_file.open(_filenames[fileNum]))
-			error("Could not open file %s", _filenames[fileNum]);
-
+			
 		// Read in the file index
-		int count = _file.readUint16LE();
+		int count = res->_file.readUint16LE();
 		assert(count <= 100);
 		_fileIndex.resize(count);
 		for (int i = 0; i < count; ++i)
-			_fileIndex[i] = _file.readUint32LE();
+			_fileIndex[i] = res->_file.readUint32LE();
 	}
 }
 
-void FileManager::gotoAppended(int subfile) {
+void FileManager::gotoAppended(Resource *res, int subfile) {
 	uint32 offset = _fileIndex[subfile];
-	uint32 size = (subfile == (int)_fileIndex.size() - 1) ? _file.size() - offset :
+	uint32 size = (subfile == (int)_fileIndex.size() - 1) ? res->_file.size() - offset :
 		_fileIndex[subfile + 1] - offset;
 
-	_file.seek(offset);
-	delete _stream;
-	_stream = _file.readStream(size);
+	res->_size = size;
+	res->_stream = new Common::SeekableSubReadStream(&res->_file, offset, offset + size);
 }
 
 } // End of namespace Access
diff --git a/engines/access/files.h b/engines/access/files.h
index b13a796925..457cb81f86 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -49,20 +49,51 @@ struct CellIdent : FileIdent {
 	CellIdent(int cell, int fileNum, int subfile);
 };
 
+class FileManager;
+
+class Resource {
+	friend class FileManager;
+private:
+	Common::File _file;
+	byte *_data;
+public:
+	Common::SeekableReadStream *_stream;
+	int _size;
+
+	Resource();
+	~Resource();
+	byte *data();
+};
+
 class FileManager {
 private:
 	AccessEngine *_vm;
 	const char * const *_filenames;
 
-	void openFile(const Common::String &filename);
+	void openFile(Resource *res, const Common::String &filename);
+
+	/**
+	 * Handles setting up the resource with a stream for the located resource
+	 */
+	void handleFile(Resource *res);
+	
+	/**
+	 * Handles loading a screen surface and palette with decoded resource
+	 */
+	void handleScreen(Graphics::Surface *dest, Resource *res);
+
+	/**
+	* Open up a sub-file container file
+	*/
+	void setAppended(Resource *file, int fileNum);
 
-	byte *handleFile();
+	/**
+	* Open up a sub-file resource within an alrady opened container file.
+	*/
+	void gotoAppended(Resource *file, int subfile);
 public:
 	int _fileNumber;
-	Common::File _file;
-	Common::SeekableReadStream *_stream;
 	Common::Array<uint32> _fileIndex;
-	uint32 _filesize;
 public:
 	FileManager(AccessEngine *vm);
 	~FileManager();
@@ -75,17 +106,17 @@ public:
 	/**
 	 * Load a given subfile from a container file
 	 */
-	byte *loadFile(int fileNum, int subfile);
+	Resource *loadFile(int fileNum, int subfile);
 
 	/**
 	 * Loads a resource specified by a file identifier
 	 */
-	byte *loadFile(FileIdent &fileIdent);
+	Resource *loadFile(FileIdent &fileIdent);
 
 	/**
 	 * Load a given file by name
 	 */
-	byte *loadFile(const Common::String &filename);
+	Resource *loadFile(const Common::String &filename);
 
 	/**
 	 * Load a given scren from a container file
@@ -101,16 +132,6 @@ public:
 	 * Load a screen resource onto a designated surface
 	 */
 	void loadScreen(Graphics::Surface *dest, int fileNum, int subfile);
-
-	/**
-	 * Open up a sub-file container file
-	 */
-	void setAppended(int fileNum);
-
-	/**
-	 * Open up a sub-file resource within an alrady opened container file.
-	 */
-	void gotoAppended(int subfile);
 };
 
 } // End of namespace Access
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index f087b56ac6..969267f719 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -106,9 +106,9 @@ void MartianEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->playSound(1);
 
-	byte *spriteData = _files->loadFile(0, 2);
-	_objectsTable[0] = new SpriteResource(this, spriteData, _files->_filesize,
-		DisposeAfterUse::YES);
+	Resource *spriteData = _files->loadFile(0, 2);
+	_objectsTable[0] = new SpriteResource(this, spriteData);
+	delete spriteData;
 
 	_sound->playSound(1);
 
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 80eaf59fec..52eead7c0b 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -117,9 +117,9 @@ void MartianRoom::roomSet() {
 }
 
 void MartianRoom::roomMenu() {
-	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
-	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
-	delete[] iconData;
+	Resource *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData);
+	delete iconData;
 
 	_vm->_screen->saveScreen();
 	_vm->_screen->setDisplayScan();
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 336be0d462..df2ad67826 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -157,9 +157,9 @@ void Player::load() {
 void Player::loadSprites(const Common::String &name) {
 	freeSprites();
 
-	const byte *data = _vm->_files->loadFile(name);
-	_playerSprites1 = new SpriteResource(_vm, data, _vm->_files->_filesize,
-		DisposeAfterUse::YES);
+	Resource *data = _vm->_files->loadFile(name);
+	_playerSprites1 = new SpriteResource(_vm, data);
+	delete data;
 }
 
 void Player::freeSprites() {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 10146ff6c3..0c60f7b818 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -175,7 +175,6 @@ void Room::loadRoomData(const byte *roomData) {
 	_vm->_sound->freeMusic();
 	if (roomInfo._musicFile._fileNum != -1) {
 		_vm->_sound->_music = _vm->_files->loadFile(roomInfo._musicFile);
-		_vm->_sound->_midiSize = _vm->_files->_filesize;
 		_vm->_sound->midiPlay();
 		_vm->_sound->_musicRepeat = true;
 	}
@@ -199,15 +198,15 @@ void Room::loadRoomData(const byte *roomData) {
 	// Load script data
 	_vm->_scripts->freeScriptData();
 	if (roomInfo._scriptFile._fileNum != -1) {
-		const byte *data = _vm->_files->loadFile(roomInfo._scriptFile);
-		_vm->_scripts->setScript(data, _vm->_files->_filesize);
+		Resource *newScript = _vm->_files->loadFile(roomInfo._scriptFile);
+		_vm->_scripts->setScript(newScript);
 	}
 
 	// Load animation data
 	_vm->_animation->freeAnimationData();
 	if (roomInfo._animFile._fileNum != -1) {
-		byte *data = _vm->_files->loadFile(roomInfo._animFile);
-		_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
+		Resource *anim = _vm->_files->loadFile(roomInfo._animFile);
+		_vm->_animation->loadAnimations(anim);
 	}
 
 	_vm->_scale = _vm->_scaleI = roomInfo._scaleI;
@@ -325,38 +324,39 @@ void Room::buildRow(int playY, int screenY) {
 }
 
 void Room::loadPlayField(int fileNum, int subfile) {
-	byte *playData = _vm->_files->loadFile(fileNum, subfile);
-	Common::MemoryReadStream stream(playData + 0x10, _vm->_files->_filesize - 0x10);
+	Resource *playData = _vm->_files->loadFile(fileNum, subfile);
+	byte header[16];
+	playData->_stream->read(&header[0], 16);
 	Screen &screen = *_vm->_screen;
 
 	// Copy the new palette
-	screen.loadRawPalette(&stream);
+	screen.loadRawPalette(playData->_stream);
 
 	// Copy off the tile data
-	_tileSize = playData[2] << 8;
+	_tileSize = (int)header[2] << 8;
 	_tile = new byte[_tileSize];
-	stream.read(_tile, _tileSize);
+	playData->_stream->read(_tile, _tileSize);
 
 	// Copy off the playfield data
-	_matrixSize = playData[0] * playData[1];
+	_matrixSize = header[0] * header[1];
 	_playField = new byte[_matrixSize];
-	stream.read(_playField, _matrixSize);
+	playData->_stream->read(_playField, _matrixSize);
 
 	// Load the plotter data
 	int numWalls = READ_LE_UINT16(playData + 6);
-	int numBlocks = playData[8];
-	_plotter.load(&stream, numWalls, numBlocks);
+	int numBlocks = header[8];
+	_plotter.load(playData->_stream, numWalls, numBlocks);
 
-	_playFieldWidth = playData[0];
-	_playFieldHeight = playData[1];
-	screen._vWindowWidth = playData[3];
+	_playFieldWidth = header[0];
+	_playFieldHeight = header[1];
+	screen._vWindowWidth = header[3];
 	screen._vWindowBytesWide = screen._vWindowWidth << 4;
 	screen._bufferBytesWide = screen._vWindowBytesWide + 16;
-	screen._vWindowHeight = playData[4];
+	screen._vWindowHeight = header[4];
 	screen._vWindowLinesTall = screen._vWindowHeight << 4;
 
 	_vm->_screen->setBufferScan();
-	delete[] playData;
+	delete playData;
 }
 
 /*------------------------------------------------------------------------*/
@@ -502,9 +502,9 @@ void Room::executeCommand(int commandId) {
 	_vm->_screen->setDisplayScan();
 
 	// Get the toolbar icons resource
-	byte *iconData = _vm->_files->loadFile("ICONS.LZ");
-	SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
-	delete[] iconData;
+	Resource *iconData = _vm->_files->loadFile("ICONS.LZ");
+	SpriteResource *spr = new SpriteResource(_vm, iconData);
+	delete iconData;
 
 	// Draw the button as selected
 	_vm->_screen->plotImage(spr, _selectCommand + 2, 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 4f2ee3e3ac..4b1c6d824d 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -104,9 +104,10 @@ void Screen::loadPalette(Common::SeekableReadStream *stream) {
 }
 
 void Screen::loadPalette(int fileNum, int subfile) {
-	byte *palette = _vm->_files->loadFile(fileNum, subfile);
+	Resource *res = _vm->_files->loadFile(fileNum, subfile);
+	byte *palette = res->data();
 	Common::copy(palette, palette + (_numColors * 3), &_rawPalette[_startColor * 3]);
-	delete[] palette;
+	delete res;
 }
 
 void Screen::setPalette() {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 833aff337a..5e0986e379 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -30,7 +30,7 @@
 namespace Access {
 
 Scripts::Scripts(AccessEngine *vm) : Manager(vm) {
-	_rawData = nullptr;
+	_resource = nullptr;
 	_data = nullptr;
 	_sequence = 0;
 	_endFlag = false;
@@ -45,16 +45,15 @@ Scripts::~Scripts() {
 	freeScriptData();
 }
 
-void Scripts::setScript(const byte *data, int size) {
-	_rawData = data;
-	_data = new Common::MemoryReadStream(data, size, DisposeAfterUse::NO);
+void Scripts::setScript(Resource *res) {
+	_resource = res;
+	_data = res->_stream;
 }
 
 void Scripts::freeScriptData() {
-	delete[] _rawData;
-	delete _data;
+	delete _resource;
+	_resource = nullptr;
 	_data = nullptr;
-	_rawData = nullptr;
 }
 
 void Scripts::searchForSequence() {
@@ -418,13 +417,13 @@ void Scripts::cmdSetTravel() {
 }
 
 void Scripts::cmdSetVideo() { 
-	FileIdent fi;
-	fi._fileNum = _data->readSint16LE();
-	fi._subfile = _data->readUint16LE();
+	Common::Point pt;
+	pt.x = _data->readSint16LE();
+	pt.y = _data->readSint16LE();
 	int cellIndex = _data->readUint16LE();
 	int rate = _data->readUint16LE();
 
-	_vm->_video->setVideo(_vm->_extraCells[cellIndex]._vid, fi, rate);
+	_vm->_video->setVideo(_vm->_screen, pt, _vm->_extraCells[cellIndex]._vid, rate);
 }
 
 void Scripts::CMDPLAYVID() { error("TODO CMDPLAYVID"); }
@@ -654,7 +653,7 @@ void Scripts::cmdClearBlock() {
 
 void Scripts::cmdLoadSound() {
 	int idx = _data->readSint16LE();
-	_vm->_sound->_soundTable[0]._data = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSound);
+	_vm->_sound->_soundTable[0] = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSound);
 	_vm->_sound->_soundPriority[0] = 1;
 }
 
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index aa5c4063f6..ec386cf35a 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -34,11 +34,11 @@ class Scripts;
 
 class Scripts: public Manager {
 private:
-	const byte *_rawData;
+	Resource *_resource;
 	int _specialFunction;
 
 protected:
-	Common::MemoryReadStream *_data;
+	Common::SeekableReadStream *_data;
 
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
@@ -134,7 +134,7 @@ public:
 
 	virtual ~Scripts();
 
-	void setScript(const byte *data, int size);
+	void setScript(Resource *data);
 
 	void freeScriptData();
 
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index aebd76fe84..c032f6cfd2 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -31,10 +31,9 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 		_vm(vm), _mixer(mixer) {
 	Common::fill(&_soundPriority[0], &_soundPriority[MAX_SOUNDS], 0);
 	for (int i = 0; i < MAX_SOUNDS; ++i)
-		_soundTable[i]._data = nullptr;
+		_soundTable[i] = nullptr;
 
 	_music = nullptr;
-	_midiSize = 0;
 	_musicRepeat = false;
 	_soundFrame = 0;
 	_soundFlag = false;
@@ -42,7 +41,7 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 
 SoundManager::~SoundManager() {
 	for (int i = 0; i < MAX_SOUNDS; ++i)
-		delete _soundTable[i]._data;
+		delete _soundTable[i];
 }
 
 void SoundManager::queueSound(int idx, int fileNum, int subfile) {
@@ -52,13 +51,13 @@ void SoundManager::queueSound(int idx, int fileNum, int subfile) {
 	*/
 }
 
-byte *SoundManager::loadSound(int fileNum, int subfile) {
+Resource *SoundManager::loadSound(int fileNum, int subfile) {
 	return _vm->_files->loadFile(fileNum, subfile);
 }
 
 void SoundManager::playSound(int soundIndex) {
 	int idx = _soundPriority[soundIndex - 1] - 1;
-	playSound(_soundTable[idx]._data, _soundTable[idx]._size);
+	playSound(_soundTable[idx]->data(), _soundTable[idx]->_size);
 }
 
 void SoundManager::playSound(byte *data, uint32 size) {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index e0992db0e2..284fa845e7 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "audio/mixer.h"
+#include "access/files.h"
 
 #define MAX_SOUNDS 20
 
@@ -33,10 +34,6 @@ namespace Access {
 class AccessEngine;
 
 class SoundManager {
-	struct SoundEntry {
-		byte *_data;
-		uint32 _size;
-	};
 private:
 	AccessEngine *_vm;
 	Audio::Mixer *_mixer;
@@ -44,10 +41,9 @@ private:
 
 	void playSound(byte *data, uint32 size);
 public:
-	SoundEntry _soundTable[MAX_SOUNDS];
+	Resource *_soundTable[MAX_SOUNDS];
 	int _soundPriority[MAX_SOUNDS];
-	byte *_music;
-	int _midiSize;
+	Resource *_music;
 	bool _musicRepeat;
 	int _soundFrame;
 	bool _soundFlag;
@@ -59,7 +55,7 @@ public:
 
 	void playSound(int soundIndex);
 
-	byte *loadSound(int fileNum, int subfile);
+	Resource *loadSound(int fileNum, int subfile);
 	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
 
 	void midiPlay();
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index a025d31022..4774703a03 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -21,15 +21,37 @@
  */
 
 #include "access/video.h"
+#include "access/access.h"
 
 namespace Access {
 
 VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
+	_vidSurface = nullptr;
+}
 
+VideoPlayer::~VideoPlayer() {
+	freeVideo();
 }
 
-void VideoPlayer::setVideo(FileIdent &fi1, FileIdent &fi2, int rate) {
-	error("TODO: setVideo");
+
+void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, FileIdent &videoFile, int rate) {
+	_vidSurface = vidSurface;
+	vidSurface->_orgX1 = pt.x;
+	vidSurface->_orgY1 = pt.y;
+	_vm->_timers[31]._timer = rate;
+	_vm->_timers[31]._initTm = rate;
+
+	// Open up video stream
+	_videoData = _vm->_files->loadFile(videoFile);
+
+	// Load in header
+	
 }
 
+void VideoPlayer::freeVideo() {
+	delete _videoData;
+	_videoData = nullptr;
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/video.h b/engines/access/video.h
index b21f006a97..a87c90ccb8 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -24,16 +24,27 @@
 #define ACCESS_VIDEO_H
 
 #include "common/scummsys.h"
+#include "common/memstream.h"
 #include "access/data.h"
+#include "access/asurface.h"
 #include "access/files.h"
 
 namespace Access {
 
 class VideoPlayer: public Manager {
+private:
+	ASurface *_vidSurface;
+	Resource *_videoData;
+	int _frameCount;
+	int _width, _height;
+	int _flags;
 public:
 	VideoPlayer(AccessEngine *vm);
+	~VideoPlayer();
 
-	void setVideo(FileIdent &fi1, FileIdent &fi2, int rate);
+	void setVideo(ASurface *vidSurface, const Common::Point &pt, FileIdent &videoFile, int rate);
+
+	void freeVideo();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 35923890ccb26d958d33c6c472a1b16659718392 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 27 Aug 2014 22:22:33 -0400
Subject: ACCESS: Fix incorrect use of delete[] on Resources

---
 engines/access/access.cpp | 2 +-
 engines/access/room.cpp   | 2 +-
 engines/access/sound.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 080cd36032..7189ebb799 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -226,7 +226,7 @@ void AccessEngine::freeCells() {
 }
 
 void AccessEngine::freeInactiveData() {
-	delete[] _inactive;
+	delete _inactive;
 	_inactive = nullptr;
 }
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 0c60f7b818..0de6497422 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -143,7 +143,7 @@ void Room::doRoom() {
 void Room::clearRoom() {
 	if (_vm->_sound->_music) {
 		_vm->_sound->stopSong();
-		delete[] _vm->_sound->_music;
+		delete _vm->_sound->_music;
 		_vm->_sound->_music = nullptr;
 	}
 
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index c032f6cfd2..bdf8c224e4 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -90,7 +90,7 @@ void SoundManager::freeSounds() {
 }
 
 void SoundManager::freeMusic() {
-	delete[] _music;
+	delete _music;
 	_music = nullptr;
 }
 
-- 
cgit v1.2.3


From 3bbec487a53243464030fe1946f833971d6e14c0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 27 Aug 2014 22:34:50 -0400
Subject: ACCESS: Fixes for memory leaks

---
 engines/access/files.cpp | 2 ++
 engines/access/files.h   | 2 +-
 engines/access/room.cpp  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 78cb3eff51..233d040745 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -51,9 +51,11 @@ CellIdent::CellIdent(int cell, int fileNum, int subfile) {
 Resource::Resource() {
 	_stream = nullptr;
 	_size = 0;
+	_data = nullptr;
 }
 
 Resource::~Resource() {
+	delete _data;
 	delete _stream;
 }
 
diff --git a/engines/access/files.h b/engines/access/files.h
index 457cb81f86..0a934de8aa 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -101,7 +101,7 @@ public:
 	/**
 	 * Check the existence of a given file
 	 */
-	bool FileManager::existFile(const Common::String &filename);
+	bool existFile(const Common::String &filename);
 
 	/**
 	 * Load a given subfile from a container file
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 0de6497422..a33bc76e66 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -207,6 +207,7 @@ void Room::loadRoomData(const byte *roomData) {
 	if (roomInfo._animFile._fileNum != -1) {
 		Resource *anim = _vm->_files->loadFile(roomInfo._animFile);
 		_vm->_animation->loadAnimations(anim);
+		delete anim;
 	}
 
 	_vm->_scale = _vm->_scaleI = roomInfo._scaleI;
-- 
cgit v1.2.3


From 5abe5b89932adfcc705beb7529d323aa15a85bbd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 27 Aug 2014 22:39:37 -0400
Subject: ACCESS: Fix loading of room playfield data

---
 engines/access/room.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a33bc76e66..b9a07ea2ed 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -344,7 +344,7 @@ void Room::loadPlayField(int fileNum, int subfile) {
 	playData->_stream->read(_playField, _matrixSize);
 
 	// Load the plotter data
-	int numWalls = READ_LE_UINT16(playData + 6);
+	int numWalls = READ_LE_UINT16(&header[6]);
 	int numBlocks = header[8];
 	_plotter.load(playData->_stream, numWalls, numBlocks);
 
-- 
cgit v1.2.3


From 819cad3a179260d0b0a973342765a0caff4b13b4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 07:36:11 -0400
Subject: ACCESS: Implemented setVideo

---
 engines/access/access.cpp |  3 +++
 engines/access/access.h   |  1 +
 engines/access/video.cpp  | 43 +++++++++++++++++++++++++++++++++++++++++++
 engines/access/video.h    | 20 ++++++++++++++++++--
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 7189ebb799..92ded4facf 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -71,6 +71,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleI = 0;
 	_scaleFlag = false;
 	_eseg = nullptr;
+	_plotBuffer = nullptr;
 
 	_conversation = 0;
 	_currentMan = 0;
@@ -128,6 +129,8 @@ AccessEngine::~AccessEngine() {
 	delete _inactive;
 	delete _music;
 	delete _title;
+	delete _eseg;
+	delete _plotBuffer;
 }
 
 void AccessEngine::setVGA() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 55810e8a16..8e05da7104 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -129,6 +129,7 @@ public:
 	ASurface *_current;
 	ASurface _buffer1;
 	ASurface _buffer2;
+	byte *_plotBuffer;
 	Common::Array<CharEntry *> _charTable;
 	SpriteResource *_objectsTable[100];
 	bool _establishTable[100];
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 4774703a03..da397a4359 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -45,7 +45,37 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, FileId
 	_videoData = _vm->_files->loadFile(videoFile);
 
 	// Load in header
+	_frameCount = _videoData->_stream->readUint16LE();
+	_header._width = _videoData->_stream->readUint16LE();
+	_header._height = _videoData->_stream->readUint16LE();
+	_videoData->_stream->skip(1);
+	_header._flags = (VideoFlags)_videoData->_stream->readByte();
 	
+	_startCoord = (byte *)vidSurface->getBasePtr(pt.x, pt.y);
+	_frameCount = _header._frameCount - 2;
+	_xCount = _header._width;
+	_scanCount = _header._height;
+	_vidFrame = 0;
+
+	getFrame();
+
+	if (_header._flags == VIDEOFLAG_BG) {
+		// Draw the background
+		const byte *pSrc = _vm->_plotBuffer;
+		for (int y = 0; y < _scanCount; ++y) {
+			byte *pDest = (byte *)vidSurface->getBasePtr(pt.x, pt.y + y);
+			Common::copy(pSrc, pSrc + _xCount, pDest);
+			pSrc += _xCount;
+		}
+
+		if (vidSurface == _vm->_screen)
+			_vm->_newRects.push_back(Common::Rect(pt.x, pt.y, pt.x + _xCount, pt.y + _scanCount));
+	
+	
+		getFrame();
+	}
+
+	_videoEnd = false;
 }
 
 void VideoPlayer::freeVideo() {
@@ -53,5 +83,18 @@ void VideoPlayer::freeVideo() {
 	_videoData = nullptr;
 }
 
+void VideoPlayer::getFrame() {
+	_frameSize = _videoData->_stream->readUint16LE();
+	_videoData->_stream->read(_vm->_plotBuffer, _frameSize);
+}
+
+void VideoPlayer::playVideo() {
+	if (_vm->_timers[31]._flag)
+		return;
+	++_vm->_timers[31]._flag;
+
+
+}
+
 
 } // End of namespace Access
diff --git a/engines/access/video.h b/engines/access/video.h
index a87c90ccb8..7fa1ad2d27 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -31,13 +31,29 @@
 
 namespace Access {
 
+enum VideoFlags { VIDEOFLAG_NONE = 0, VIDEOFLAG_BG = 1 };
+
 class VideoPlayer: public Manager {
+	struct VideoHeader {
+		int _frameCount;
+		int _width, _height;
+		VideoFlags _flags;
+	};
 private:
 	ASurface *_vidSurface;
 	Resource *_videoData;
+	VideoHeader _header;
+	byte *_startCoord;
 	int _frameCount;
-	int _width, _height;
-	int _flags;
+	int _xCount;
+	int _scanCount;
+	int _vidFrame;
+	int _frameSize;
+	bool _videoEnd;
+
+	void getFrame();
+
+	void playVideo();
 public:
 	VideoPlayer(AccessEngine *vm);
 	~VideoPlayer();
-- 
cgit v1.2.3


From e57d7e8782e1be66a23166b04d6bec658ed2be80 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 20:02:35 -0400
Subject: ACCESS: Implemented playVideo

---
 engines/access/access.cpp  |  2 --
 engines/access/access.h    |  1 -
 engines/access/scripts.cpp | 22 +++++++++++++++------
 engines/access/scripts.h   |  4 ++--
 engines/access/sound.cpp   |  2 --
 engines/access/sound.h     |  2 --
 engines/access/video.cpp   | 49 +++++++++++++++++++++++++++++++++++++---------
 engines/access/video.h     | 20 +++++++++++++++----
 8 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 92ded4facf..e02b0c0da8 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -71,7 +71,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleI = 0;
 	_scaleFlag = false;
 	_eseg = nullptr;
-	_plotBuffer = nullptr;
 
 	_conversation = 0;
 	_currentMan = 0;
@@ -130,7 +129,6 @@ AccessEngine::~AccessEngine() {
 	delete _music;
 	delete _title;
 	delete _eseg;
-	delete _plotBuffer;
 }
 
 void AccessEngine::setVGA() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 8e05da7104..55810e8a16 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -129,7 +129,6 @@ public:
 	ASurface *_current;
 	ASurface _buffer1;
 	ASurface _buffer2;
-	byte *_plotBuffer;
 	Common::Array<CharEntry *> _charTable;
 	SpriteResource *_objectsTable[100];
 	bool _establishTable[100];
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 5e0986e379..2d6fc5040b 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -103,7 +103,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
 		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetTimer, 
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
-		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::CMDPLAYVID, 
+		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
@@ -112,7 +112,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::CMDWAIT, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
-		&Scripts::CMDFREESOUND, &Scripts::cmdSetVideoSound, &Scripts::CMDPLAYVIDSND,
+		&Scripts::CMDFREESOUND, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
@@ -426,7 +426,9 @@ void Scripts::cmdSetVideo() {
 	_vm->_video->setVideo(_vm->_screen, pt, _vm->_extraCells[cellIndex]._vid, rate);
 }
 
-void Scripts::CMDPLAYVID() { error("TODO CMDPLAYVID"); }
+void Scripts::cmdPlayVideo() { 
+	_vm->_video->playVideo();
+}
 
 void Scripts::cmdPlotImage() {
 	_vm->_destIn = _vm->_current;
@@ -667,11 +669,19 @@ void Scripts::cmdSetVideoSound() {
 	cmdSetVideo();
 
 	_data->skip(2);
-	_vm->_sound->_soundFrame = _data->readUint16LE();
-	_vm->_sound->_soundFlag = false;
+	_vm->_video->_soundFrame = _data->readUint16LE();
+	_vm->_video->_soundFlag = false;
+}
+
+void Scripts::cmdPlayVideoSound() { 
+	_vm->_video->playVideo();
+	if (_vm->_video->_soundFrame == _vm->_video->_videoFrame &&
+			!_vm->_video->_soundFlag) {
+		_vm->_sound->playSound(0);
+		_vm->_video->_soundFlag = true;
+	}
 }
 
-void Scripts::CMDPLAYVIDSND() { error("TODO CMDPLAYVIDSND"); }
 void Scripts::CMDPUSHLOCATION() { error("TODO CMDPUSHLOCATION"); }
 
 void Scripts::cmdPlayerOff() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index ec386cf35a..414ba46f81 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -91,7 +91,7 @@ protected:
 	void cmdCheckTimer();
 	void cmdSetTravel();
 	void cmdSetVideo();
-	void CMDPLAYVID();
+	void cmdPlayVideo();
 	void cmdPlotImage();
 	void cmdSetDisplay();
 	void cmdSetBuffer();
@@ -114,7 +114,7 @@ protected:
 	void cmdClearBlock();
 	void cmdLoadSound();
 	void cmdSetVideoSound();
-	void CMDPLAYVIDSND();
+	void cmdPlayVideoSound();
 	void CMDPUSHLOCATION();
 	void cmdPlayerOff();
 	void cmdPlayerOn();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index bdf8c224e4..2b8e6a7bf1 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -35,8 +35,6 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 
 	_music = nullptr;
 	_musicRepeat = false;
-	_soundFrame = 0;
-	_soundFlag = false;
 }
 
 SoundManager::~SoundManager() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 284fa845e7..a534eac79f 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -45,8 +45,6 @@ public:
 	int _soundPriority[MAX_SOUNDS];
 	Resource *_music;
 	bool _musicRepeat;
-	int _soundFrame;
-	bool _soundFlag;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index da397a4359..4c380ff915 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -27,10 +27,13 @@ namespace Access {
 
 VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
 	_vidSurface = nullptr;
+	_videoFrame = 0;
+	_soundFlag = false;
+	_soundFrame = 0;
 }
 
 VideoPlayer::~VideoPlayer() {
-	freeVideo();
+	closeVideo();
 }
 
 
@@ -55,37 +58,33 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, FileId
 	_frameCount = _header._frameCount - 2;
 	_xCount = _header._width;
 	_scanCount = _header._height;
-	_vidFrame = 0;
+	_videoFrame = 0;
 
 	getFrame();
 
 	if (_header._flags == VIDEOFLAG_BG) {
 		// Draw the background
-		const byte *pSrc = _vm->_plotBuffer;
 		for (int y = 0; y < _scanCount; ++y) {
 			byte *pDest = (byte *)vidSurface->getBasePtr(pt.x, pt.y + y);
-			Common::copy(pSrc, pSrc + _xCount, pDest);
-			pSrc += _xCount;
+			_videoData->_stream->read(pDest, _xCount);
 		}
 
 		if (vidSurface == _vm->_screen)
 			_vm->_newRects.push_back(Common::Rect(pt.x, pt.y, pt.x + _xCount, pt.y + _scanCount));
-	
-	
+		
 		getFrame();
 	}
 
 	_videoEnd = false;
 }
 
-void VideoPlayer::freeVideo() {
+void VideoPlayer::closeVideo() {
 	delete _videoData;
 	_videoData = nullptr;
 }
 
 void VideoPlayer::getFrame() {
 	_frameSize = _videoData->_stream->readUint16LE();
-	_videoData->_stream->read(_vm->_plotBuffer, _frameSize);
 }
 
 void VideoPlayer::playVideo() {
@@ -93,7 +92,39 @@ void VideoPlayer::playVideo() {
 		return;
 	++_vm->_timers[31]._flag;
 
+	byte *pDest = _startCoord;
+	byte *pLine = _startCoord;
+	uint32 frameEnd = _videoData->_stream->pos() + _frameSize;
+
+	while ((uint32)_videoData->_stream->pos() < frameEnd) {
+		int count = _videoData->_stream->readByte();
+
+		if (count & 0x80) {
+			count &= 0x7f;
+
+			// Skip count number of pixels
+			// Loop across lines if necessary
+			while ((pDest - pLine + count) >= _xCount) {
+				pLine += _vidSurface->pitch;
+				pDest = pLine;
+				count -= _xCount;
+			}
+
+			// Skip any remaining pixels in the new line
+			pDest += count;
+		} else {
+			// Readcount number of pixels
+			assert(count <= (pDest - pLine));
+			_videoData->_stream->read(pDest, count);
+			pDest += count;
+		}
+	}
 
+	getFrame();
+	if (++_videoFrame == _frameCount) {
+		closeVideo();
+		_videoEnd = true;
+	}
 }
 
 
diff --git a/engines/access/video.h b/engines/access/video.h
index 7fa1ad2d27..20e5cfc10e 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -47,20 +47,32 @@ private:
 	int _frameCount;
 	int _xCount;
 	int _scanCount;
-	int _vidFrame;
 	int _frameSize;
 	bool _videoEnd;
 
 	void getFrame();
-
-	void playVideo();
+public:
+	int _videoFrame;
+	bool _soundFlag;
+	int _soundFrame;
 public:
 	VideoPlayer(AccessEngine *vm);
 	~VideoPlayer();
 
+	/**
+	 * Start up a video
+	 */
 	void setVideo(ASurface *vidSurface, const Common::Point &pt, FileIdent &videoFile, int rate);
 
-	void freeVideo();
+	/**
+	 * Decodes a frame of the video
+	 */
+	void playVideo();
+
+	/**
+	 * Frees the data for a previously loaded video
+	 */
+	void closeVideo();
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 1d8f23985aa8eaf718388ba3d6ccae5824a530aa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 20:24:25 -0400
Subject: ACCESS: Implement loadSounds

---
 engines/access/sound.cpp | 31 ++++++++++++++++++-------------
 engines/access/sound.h   |  8 +++++---
 engines/access/video.cpp |  1 +
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 2b8e6a7bf1..d932cc6e44 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -29,24 +29,24 @@ namespace Access {
 
 SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : 
 		_vm(vm), _mixer(mixer) {
-	Common::fill(&_soundPriority[0], &_soundPriority[MAX_SOUNDS], 0);
-	for (int i = 0; i < MAX_SOUNDS; ++i)
-		_soundTable[i] = nullptr;
-
 	_music = nullptr;
 	_musicRepeat = false;
 }
 
 SoundManager::~SoundManager() {
-	for (int i = 0; i < MAX_SOUNDS; ++i)
+	clearSounds();
+}
+
+void SoundManager::clearSounds() {
+	for (int i = 0; i < _soundTable.size(); ++i)
 		delete _soundTable[i];
+	_soundTable.clear();
+	_soundPriority.clear();
 }
 
 void SoundManager::queueSound(int idx, int fileNum, int subfile) {
-	/*
-	_soundTable[idx]._data = _vm->_files->loadFile(fileNum, subfile);
-	_soundTable[idx]._size = _vm->_files->_filesize;
-	*/
+	delete _soundTable[idx];
+	_soundTable[idx] = _vm->_files->loadFile(fileNum, subfile);
 }
 
 Resource *SoundManager::loadSound(int fileNum, int subfile) {
@@ -54,11 +54,11 @@ Resource *SoundManager::loadSound(int fileNum, int subfile) {
 }
 
 void SoundManager::playSound(int soundIndex) {
-	int idx = _soundPriority[soundIndex - 1] - 1;
-	playSound(_soundTable[idx]->data(), _soundTable[idx]->_size);
+	int idx = _soundPriority[soundIndex];
+	playSound(_soundTable[idx]);
 }
 
-void SoundManager::playSound(byte *data, uint32 size) {
+void SoundManager::playSound(Resource *res) {
 	/*
 	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
 	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
@@ -68,7 +68,12 @@ void SoundManager::playSound(byte *data, uint32 size) {
 }
 
 void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
-	// TODO
+	clearSounds();
+
+	for (uint i = 0; i < sounds.size(); ++i) {
+		_soundTable.push_back(loadSound(sounds[i]._fileNum, sounds[i]._subfile));
+		_soundPriority.push_back(sounds[i]._priority);
+	}
 }
 
 void SoundManager::midiPlay() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index a534eac79f..8fef9e35fb 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -39,10 +39,12 @@ private:
 	Audio::Mixer *_mixer;
 	Audio::SoundHandle _soundHandle;
 
-	void playSound(byte *data, uint32 size);
+	void clearSounds();
+
+	void playSound(Resource *res);
 public:
-	Resource *_soundTable[MAX_SOUNDS];
-	int _soundPriority[MAX_SOUNDS];
+	Common::Array<Resource *> _soundTable;
+	Common::Array<int> _soundPriority;
 	Resource *_music;
 	bool _musicRepeat;
 public:
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 4c380ff915..8197b91923 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -30,6 +30,7 @@ VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
 	_videoFrame = 0;
 	_soundFlag = false;
 	_soundFrame = 0;
+	_videoData = nullptr;
 }
 
 VideoPlayer::~VideoPlayer() {
-- 
cgit v1.2.3


From 729f03f42c88f2caaa6616e530cf4543a6cca536 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 21:36:48 -0400
Subject: ACCESS: Fixes for playVideo

---
 engines/access/scripts.cpp |  1 -
 engines/access/video.cpp   | 26 +++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2d6fc5040b..f92a6d73a5 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -668,7 +668,6 @@ void Scripts::cmdSetVideoSound() {
 	_data->seek(startPos);
 	cmdSetVideo();
 
-	_data->skip(2);
 	_vm->_video->_soundFrame = _data->readUint16LE();
 	_vm->_video->_soundFlag = false;
 }
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 8197b91923..4b9a875931 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -49,7 +49,7 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, FileId
 	_videoData = _vm->_files->loadFile(videoFile);
 
 	// Load in header
-	_frameCount = _videoData->_stream->readUint16LE();
+	_header._frameCount = _videoData->_stream->readUint16LE();
 	_header._width = _videoData->_stream->readUint16LE();
 	_header._height = _videoData->_stream->readUint16LE();
 	_videoData->_stream->skip(1);
@@ -105,19 +105,31 @@ void VideoPlayer::playVideo() {
 
 			// Skip count number of pixels
 			// Loop across lines if necessary
-			while ((pDest - pLine + count) >= _xCount) {
+			while (count >= (pLine + _xCount - pDest)) {
+				count -= (pLine + _xCount - pDest);
 				pLine += _vidSurface->pitch;
 				pDest = pLine;
-				count -= _xCount;
 			}
 
 			// Skip any remaining pixels in the new line
 			pDest += count;
 		} else {
-			// Readcount number of pixels
-			assert(count <= (pDest - pLine));
-			_videoData->_stream->read(pDest, count);
-			pDest += count;
+			// Read count number of pixels
+			
+			// Load across lines if necessary
+			while (count >= (pLine + _xCount - pDest)) {
+				int lineCount = (pLine + _xCount - pDest);
+				_videoData->_stream->read(pDest, lineCount);
+				count -= lineCount;
+				pLine += _vidSurface->pitch;
+				pDest = pLine;
+			}
+
+			// Load remainder of pixels on line
+			if (count > 0) {
+				_videoData->_stream->read(pDest, count);
+				pDest += count;
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 661a5694b4bf91e61d62fbabf0294c5815cf85f6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 21:40:59 -0400
Subject: ACCESS: Implemented cmdVideoEnded

---
 engines/access/scripts.cpp | 10 ++++++++--
 engines/access/scripts.h   |  2 +-
 engines/access/video.h     |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index f92a6d73a5..ad806de056 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -105,7 +105,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
 		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
-		&Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, 
+		&Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
@@ -457,7 +457,13 @@ void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollY = 0;
 }
 
-void Scripts::CMDSAVERECT() { error("TODO CMDSAVERECT"); }
+void Scripts::cmdVideoEnded() { 
+	if (_vm->_video->_videoEnd)
+		cmdGoto();
+	else
+		_data->skip(2);
+}
+
 void Scripts::CMDSETBUFVID() { error("TODO CMDSETBUFVID"); }
 void Scripts::CMDPLAYBUFVID() { error("TODO CMDPLAYBUFVID"); }
 
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 414ba46f81..7568e033c0 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -96,7 +96,7 @@ protected:
 	void cmdSetDisplay();
 	void cmdSetBuffer();
 	void cmdSetScroll();
-	void CMDSAVERECT();
+	void cmdVideoEnded();
 	void CMDSETBUFVID();
 	void CMDPLAYBUFVID();
 	void cmdRemoveLast();
diff --git a/engines/access/video.h b/engines/access/video.h
index 20e5cfc10e..bb9656b296 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -48,13 +48,13 @@ private:
 	int _xCount;
 	int _scanCount;
 	int _frameSize;
-	bool _videoEnd;
 
 	void getFrame();
 public:
 	int _videoFrame;
 	bool _soundFlag;
 	int _soundFrame;
+	bool _videoEnd;
 public:
 	VideoPlayer(AccessEngine *vm);
 	~VideoPlayer();
-- 
cgit v1.2.3


From a47457084f10faf49f002a0350bc9a832309e11d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 21:55:09 -0400
Subject: ACCESS: Add event polling to cmdVideoEnded to make videos play
 correctly

---
 engines/access/scripts.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index ad806de056..c5b7d952da 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -458,10 +458,14 @@ void Scripts::cmdSetScroll() {
 }
 
 void Scripts::cmdVideoEnded() { 
-	if (_vm->_video->_videoEnd)
+	_vm->_events->pollEvents();
+
+	if (_vm->_video->_videoEnd) {
 		cmdGoto();
-	else
+	} else {
+		g_system->delayMillis(10);
 		_data->skip(2);
+	}
 }
 
 void Scripts::CMDSETBUFVID() { error("TODO CMDSETBUFVID"); }
-- 
cgit v1.2.3


From d31a0f152ff0a80f382d0e868562867fcf7fe305 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 22:01:38 -0400
Subject: ACCESS: Fix background display during character conversations

---
 engines/access/char.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index 767512f43e..aebf63a131 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -104,7 +104,7 @@ void CharManager::loadChar(int charId) {
 	}
 
 	_vm->_buffer1.copyFrom(*_vm->_screen);
-	_vm->_screen->copyFrom(_vm->_buffer2);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_screen->setDisplayScan();
 
 	if (_charFlag != 2 && _charFlag != 3) {
-- 
cgit v1.2.3


From d2cb9d4c4318e9c1895e492539c755fb6e3cf052 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 Aug 2014 22:15:39 -0400
Subject: ACCESS: Implemented cmdFreeSound

---
 engines/access/access.cpp  |  4 ++--
 engines/access/scripts.cpp | 40 +++++++++++++++++++++++++++++++++++++---
 engines/access/scripts.h   |  3 ++-
 engines/access/sound.cpp   |  1 +
 engines/access/sound.h     |  1 +
 5 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index e02b0c0da8..3e8eff3614 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -256,7 +256,7 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 				_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 				_sound->_soundPriority[0] = 1;
 				_sound->playSound(1);
-				_scripts->CMDFREESOUND();
+				_scripts->cmdFreeSound();
 
 				_events->pollEvents();
 
@@ -291,7 +291,7 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 		_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundPriority[0] = 1;
 		_sound->playSound(1);
-		_scripts->CMDFREESOUND();
+		_scripts->cmdFreeSound();
 
 		_events->pollEvents();
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index c5b7d952da..a1ede67708 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -67,6 +67,24 @@ void Scripts::searchForSequence() {
 	} while (sequenceId != _sequence);
 }
 
+void Scripts::charLoop() {
+	bool endFlag = _endFlag;
+	int pos = _data->pos();
+
+	_sequence = 2000;
+	searchForSequence();
+	_vm->_images.clear();
+	_vm->_buffer2.copyFrom(_vm->_buffer1);
+	_vm->_newRects.clear();
+
+	executeScript();
+	_vm->plotList1();
+	_vm->copyBlocks();
+
+	_data->seek(pos);
+	_endFlag = endFlag;
+}
+
 void Scripts::findNull() {
 	// No implementation required in ScummVM, the strings in the script files are already skipped by the use of readByte()
 }
@@ -112,7 +130,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::CMDWAIT, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
-		&Scripts::CMDFREESOUND, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
+		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
@@ -608,7 +626,7 @@ void Scripts::cmdTexChoice() {
 
 	int choice = -1;
 	do {
-		warning("TODO CHARLOOP");
+		charLoop();
 		_vm->_bubbleBox->_bubblePtr = _vm->_bubbleBox->_bubbleTitle.c_str();
 		if (_vm->_events->_leftButton) {
 			if (_vm->_events->_mouseRow >= 22) {
@@ -669,7 +687,23 @@ void Scripts::cmdLoadSound() {
 	_vm->_sound->_soundPriority[0] = 1;
 }
 
-void Scripts::CMDFREESOUND() { warning("TODO CMDFREESOUND"); }
+void Scripts::cmdFreeSound() { 
+	SoundManager &sound = *_vm->_sound;
+
+	if (sound._soundTable.size() > 0 && sound._soundTable[0]) {
+		// Keep doing char display loop if playing sound for it
+		do {
+			if (_vm->_flags[236] == 1)
+				charLoop();
+
+			_vm->_events->pollEvents();
+		} while (!_vm->shouldQuit() && sound._playingSound);
+
+		// Free the sound
+		delete sound._soundTable[0];
+		sound._soundTable[0] = nullptr;
+	}
+}
 
 void Scripts::cmdSetVideoSound() {
 	uint32 startPos = _data->pos();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 7568e033c0..733c7f9dd7 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -37,6 +37,7 @@ private:
 	Resource *_resource;
 	int _specialFunction;
 
+	void charLoop();
 protected:
 	Common::SeekableReadStream *_data;
 
@@ -144,7 +145,7 @@ public:
 
 	void findNull();
 
-	void CMDFREESOUND();
+	void cmdFreeSound();
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index d932cc6e44..52d9d00e08 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -31,6 +31,7 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 		_vm(vm), _mixer(mixer) {
 	_music = nullptr;
 	_musicRepeat = false;
+	_playingSound = false;
 }
 
 SoundManager::~SoundManager() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 8fef9e35fb..1a94c46773 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -47,6 +47,7 @@ public:
 	Common::Array<int> _soundPriority;
 	Resource *_music;
 	bool _musicRepeat;
+	bool _playingSound;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
-- 
cgit v1.2.3


From bbe7616a198b0220a038028337127fecfea842ca Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 29 Aug 2014 07:21:44 -0400
Subject: ACCESS: Add event polling to cmdTexChoice so conversations work

---
 engines/access/scripts.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index a1ede67708..3b03a7ac41 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -626,7 +626,12 @@ void Scripts::cmdTexChoice() {
 
 	int choice = -1;
 	do {
+		_vm->_events->pollEvents();
+		if (_vm->shouldQuit())
+			return;
+
 		charLoop();
+
 		_vm->_bubbleBox->_bubblePtr = _vm->_bubbleBox->_bubbleTitle.c_str();
 		if (_vm->_events->_leftButton) {
 			if (_vm->_events->_mouseRow >= 22) {
-- 
cgit v1.2.3


From 0ef365ab025cb77ab40e95e5e9139a5f86168fa6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 29 Aug 2014 07:31:23 -0400
Subject: ACCESS: Fix errors in loadScreen since resource refactoring

---
 engines/access/files.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 233d040745..4ab98a2060 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -137,6 +137,11 @@ void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile)
 void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
 	_vm->_screen->loadPalette(res->_stream);
 
+	// The remainder of the file after the palette may be separately compressed,
+	// so call handleFile to handle it if it is
+	res->_size -= res->_stream->pos();
+	handleFile(res);
+
 	if (dest != _vm->_screen)
 		dest->w = _vm->_screen->w;
 
-- 
cgit v1.2.3


From 8b9faf7de563b5c3a00cc9935eccb5e60b816632 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 29 Aug 2014 21:03:11 -0400
Subject: ACCESS: Add synchronize method for savegames

---
 engines/access/access.cpp             | 58 +++++++++++++++++++----------------
 engines/access/access.h               |  9 ++++--
 engines/access/amazon/amazon_game.cpp | 40 ++++++++++++++++++++++--
 engines/access/amazon/amazon_game.h   | 48 +++++++++++++++++++++++++++--
 engines/access/data.cpp               | 14 +++++++++
 engines/access/data.h                 |  6 ++++
 engines/access/inventory.cpp          | 10 ++++++
 engines/access/inventory.h            |  5 +++
 engines/access/player.cpp             |  8 +++++
 engines/access/player.h               |  6 ++++
 engines/access/sound.cpp              |  2 +-
 11 files changed, 170 insertions(+), 36 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 3e8eff3614..9525608b2b 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -76,8 +76,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_currentMan = 0;
 	_newTime = 0;
 	_newDate = 0;
-	_intTim[3] = 0;
-	_timer[3] = 0;
 	Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
 	Common::fill(&_establishTable[0], &_establishTable[100], false);
 	Common::fill(&_flags[0], &_flags[256], 0);
@@ -180,33 +178,9 @@ Common::Error AccessEngine::run() {
 
 	playGame();
 
-	dummyLoop();
 	return Common::kNoError;
 }
 
-void AccessEngine::dummyLoop() {
-	// Dummy game loop
-	while (!shouldQuit()) {
-		_events->pollEvents();
-
-		_curTime = g_system->getMillis();
-		// Process machine once every tick
-		while (_curTime - _lastTime < 20) {
-			g_system->delayMillis(5);
-			_curTime = g_system->getMillis();
-		}
-
-		_lastTime = _curTime;
-
-		g_system->updateScreen();
-
-		if (_events->_leftButton) {
-			CursorType cursorId = _events->getCursor();
-			_events->setCursor((cursorId == CURSOR_HELP) ? CURSOR_ARROW : (CursorType)(cursorId + 1));
-		}
-	}
-}
-
 int AccessEngine::getRandomNumber(int maxNumber) {
 	return _randomSource.getRandomNumber(maxNumber);
 }
@@ -411,4 +385,36 @@ void AccessEngine::freeChar() {
 	_animation->freeAnimationData();
 }
 
+void AccessEngine::synchronize(Common::Serializer &s) {
+	s.syncAsUint16LE(_conversation);
+	s.syncAsUint16LE(_currentMan);
+	s.syncAsUint32LE(_newTime);
+	s.syncAsUint32LE(_newDate);
+
+	for (int i = 0; i < 256; ++i)
+		s.syncAsUint16LE(_flags[i]);
+	for (int i = 0; i < 366; ++i) {
+		s.syncAsByte(_help1[i]);
+		s.syncAsByte(_help2[i]);
+		s.syncAsByte(_help3[i]);
+	}
+
+	s.syncAsUint16LE(_travel);
+	s.syncAsUint16LE(_ask);
+	s.syncAsUint16LE(_rScrollRow);
+	s.syncAsUint16LE(_rScrollCol);
+	s.syncAsSint16LE(_rScrollX);
+	s.syncAsSint16LE(_rScrollY);
+	s.syncAsUint16LE(_rOldRectCount);
+	s.syncAsUint16LE(_rNewRectCount);
+	s.syncAsUint16LE(_rKeyFlag);
+	s.syncAsUint16LE(_mapOffset);
+	s.syncAsUint16LE(_screenVirtX);
+
+	// Synchronize sub-objects
+	_timers.synchronize(s);
+	_inventory->synchronize(s);
+	_player->synchronize(s);
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 55810e8a16..7d76be9039 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -27,6 +27,7 @@
 #include "common/system.h"
 #include "common/error.h"
 #include "common/random.h"
+#include "common/serializer.h"
 #include "common/util.h"
 #include "engines/engine.h"
 #include "graphics/surface.h"
@@ -90,7 +91,6 @@ private:
 	 */
 	void setVGA();
 
-	void dummyLoop();
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
@@ -110,6 +110,11 @@ protected:
 	 * Play the game
 	 */
 	virtual void playGame() = 0;
+
+	/**
+	* Synchronize savegame data
+	*/
+	virtual void synchronize(Common::Serializer &s);
 public:
 	AnimationManager *_animation;
 	BubbleBox *_bubbleBox;
@@ -177,8 +182,6 @@ public:
 	int _currentMan;
 	uint32 _newTime;
 	uint32 _newDate;
-	int _intTim[3];
-	int _timer[3];
 	int _flags[256];
 	byte _help1[366];
 	byte _help2[366];
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index cf383ce45a..0ccaae85dc 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -44,7 +44,7 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_hitCount = 0;
 	_saveRiver = 0;
 	_hitSafe = 0;
-	_oldTitleChap = _chapter = 0;
+	_oldTitleChapter = _chapter = 0;
 	_updateChapter = -1;
 	_topList = 0;
 	_botList = 0;
@@ -291,10 +291,10 @@ void AmazonEngine::tileScreen() {
 	if (!_screen->_vesaMode)
 		return;
 
-	if (!_clearSummaryFlag && (_oldTitleChap == _chapter))
+	if (!_clearSummaryFlag && (_oldTitleChapter == _chapter))
 		return;
 
-	_oldTitleChap = _chapter;
+	_oldTitleChapter = _chapter;
 	int idx = _chapter - 1;
 
 	if (!_files->existFile(_tileFiles[idx]))
@@ -361,6 +361,40 @@ void AmazonEngine::drawHelp() {
 	error("TODO: drawHelp");
 }
 
+void AmazonEngine::synchronize(Common::Serializer &s) {
+	AccessEngine::synchronize(s);
+
+	s.syncAsSint16LE(_canoeLane);
+	s.syncAsSint16LE(_canoeYPos);
+	s.syncAsSint16LE(_hitCount);
+	s.syncAsSint16LE(_saveRiver);
+	s.syncAsSint16LE(_hitSafe);
+	s.syncAsSint16LE(_chapter);
+	s.syncAsSint16LE(_topList);
+	s.syncAsSint16LE(_botList);
+	s.syncAsSint16LE(_riverIndex);
+	s.syncAsSint16LE(_rawInactiveX);
+	s.syncAsSint16LE(_rawInactiveY);
+	s.syncAsSint16LE(_inactiveYOff);
+	for (int i = 0; i < 100; ++i)
+		s.syncAsSint16LE(_esTabTable[i]);
+}
+
+/*------------------------------------------------------------------------*/
+
+Guard::Guard() {
+	_guardCel = 0;
+	_gCode1 = _gCode2 = 0;
+	_xMid = _yMid = 0;
+}
+
+Plane::Plane() {
+	_pCount = 0;
+	_planeCount = 0;
+	_propCount = 0;
+	_xCount = 0;
+}
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 59511c4546..6511b377ae 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -29,6 +29,29 @@ namespace Access {
 
 namespace Amazon {
 
+class Plane {
+public:
+	int _pCount;
+	Common::Point _position;
+	int _planeCount;
+	int _propCount;
+	int _xCount;
+public:
+	Plane();
+};
+
+class Guard {
+public:
+	int _guardCel;
+	Common::Point _position;
+	int _gCode1;
+	int _gCode2;
+	Common::Rect _bounds;
+	int _xMid, _yMid;
+public:
+	Guard();
+};
+
 class AmazonEngine : public AccessEngine {
 private:
 	bool _skipStart;
@@ -39,7 +62,6 @@ private:
 	int _hitCount;
 	int _saveRiver;
 	int _hitSafe;
-	int _oldTitleChap;
 	int _topList;
 	int _botList;
 	int _riverIndex;
@@ -47,6 +69,8 @@ private:
 	int _rawInactiveY;
 	int _inactiveYOff;
 	int _esTabTable[100];
+
+	// Other fields
 	Common::Point _tilePos;
 	byte _tileData[1455];
 
@@ -84,6 +108,11 @@ protected:
 	 * Play the game
 	 */
 	virtual void playGame();
+
+	/**
+	* Synchronize savegame data
+	*/
+	virtual void synchronize(Common::Serializer &s);
 public:
 	// Fields that are mapped to flags
 	int &_guardLocation;
@@ -100,11 +129,24 @@ public:
 	int &_allenFlag;
 	int &_noSound;
 
+	// Saved fields
+	int _chapter;
+
 	// Other game specific fields
+	Guard _guard;
+	Plane _plane;
 	int _hintLevel;
-
-	int _chapter;
 	int _updateChapter;
+	int _oldTitleChapter;
+	int _maxHits;
+	int _oldScrollCol;
+	bool _deathFlag;
+	int _deathCount;
+	int _deathType;
+	int _mapPtr;
+	int _canoeVXPos;
+	int _canoeMoveCount;
+	int _canoeFrame;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 0279cd5052..cbc52c0a26 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -59,4 +59,18 @@ void TimerList::updateTimers() {
 	}
 }
 
+void TimerList::synchronize(Common::Serializer &s) {
+	int count = size();
+	s.syncAsUint16LE(count);
+
+	if (!s.isSaving())
+		resize(count);
+
+	for (int i = 0; i < count; ++i) {
+		s.syncAsUint32LE((*this)[i]._initTm);
+		s.syncAsUint32LE((*this)[i]._timer);
+		s.syncAsByte((*this)[i]._flag);
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 1d64a6ff86..3b3485e459 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/serializer.h"
 #include "common/types.h"
 #include "graphics/surface.h"
 #include "access/files.h"
@@ -74,6 +75,11 @@ public:
 	 * Update the timer list
 	 */
 	void updateTimers();
+
+	/**
+	 * Synchronize savegame data 
+	 */
+	void synchronize(Common::Serializer &s);
 };
 
 class ExtraCell {
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index dbc3cbac89..25c906056f 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -354,5 +354,15 @@ void InventoryManager::combineItems() {
 	warning("TODO: combineItems");
 }
 
+void InventoryManager::synchronize(Common::Serializer &s) {
+	int count = _inv.size();
+	s.syncAsUint16LE(count);
+
+	if (!s.isSaving())
+		_inv.resize(count);
+
+	for (int i = 0; i < count; ++i)
+		s.syncAsUint16LE((*this)[i]);
+}
 
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index a95581c2d0..0ff9020250 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -108,6 +108,11 @@ public:
 	void refreshInventory();
 
 	int newDisplayInv();
+
+	/**
+	* Synchronize savegame data
+	*/
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Access
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index df2ad67826..b8eb08acd8 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -827,4 +827,12 @@ bool Player::scrollRight() {
 	return true;
 }
 
+void Player::synchronize(Common::Serializer &s) {
+	s.syncAsUint16LE(_roomNumber);
+	s.syncAsSint16LE(_rawPlayerLow.x);
+	s.syncAsSint16LE(_rawPlayer.x);
+	s.syncAsSint16LE(_rawPlayerLow.y);
+	s.syncAsSint16LE(_rawPlayer.y);
+}
+
 } // End of namespace Access
diff --git a/engines/access/player.h b/engines/access/player.h
index 7ba0c05b21..c5c9afa087 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
+#include "common/serializer.h"
 #include "access/asurface.h"
 #include "access/data.h"
 
@@ -127,6 +128,11 @@ public:
 	void calcPlayer();
 
 	void checkScroll();
+
+	/**
+	* Synchronize savegame data
+	*/
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Access
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 52d9d00e08..91910f2917 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -39,7 +39,7 @@ SoundManager::~SoundManager() {
 }
 
 void SoundManager::clearSounds() {
-	for (int i = 0; i < _soundTable.size(); ++i)
+	for (uint i = 0; i < _soundTable.size(); ++i)
 		delete _soundTable[i];
 	_soundTable.clear();
 	_soundPriority.clear();
-- 
cgit v1.2.3


From 83528083228ea45ec3105b7dbcb720a1ac0dba55 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 08:45:42 -0400
Subject: ACCESS: Added code for reading/writing savegame headers and list
 saves

---
 engines/access/access.cpp    | 69 ++++++++++++++++++++++++++++++++++++++++++++
 engines/access/access.h      | 16 ++++++++++
 engines/access/detection.cpp | 26 +++++++++++++++++
 engines/access/events.h      |  5 ++++
 engines/access/room.cpp      |  2 +-
 engines/access/screen.cpp    |  3 ++
 engines/access/screen.h      |  2 ++
 7 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9525608b2b..f6382262fd 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -25,6 +25,8 @@
 #include "common/debug-channels.h"
 #include "common/events.h"
 #include "engines/util.h"
+#include "graphics/scaler.h"
+#include "graphics/thumbnail.h"
 #include "access/access.h"
 
 namespace Access {
@@ -417,4 +419,71 @@ void AccessEngine::synchronize(Common::Serializer &s) {
 	_player->synchronize(s);
 }
 
+const char *const SAVEGAME_STR = "ACCESS";
+#define SAVEGAME_STR_SIZE 6
+
+bool AccessEngine::readSavegameHeader(Common::InSaveFile *in, AccessSavegameHeader &header) {
+	char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
+	header._thumbnail = nullptr;
+
+	// Validate the header Id
+	in->read(saveIdentBuffer, SAVEGAME_STR_SIZE + 1);
+	if (strncmp(saveIdentBuffer, SAVEGAME_STR, SAVEGAME_STR_SIZE))
+		return false;
+
+	header._version = in->readByte();
+	if (header._version > ACCESS_SAVEGAME_VERSION)
+		return false;
+
+	// Read in the string
+	header._saveName.clear();
+	char ch;
+	while ((ch = (char)in->readByte()) != '\0') header._saveName += ch;
+
+	// Get the thumbnail
+	header._thumbnail = Graphics::loadThumbnail(*in);
+	if (!header._thumbnail)
+		return false;
+
+	// Read in save date/time
+	header._year = in->readSint16LE();
+	header._month = in->readSint16LE();
+	header._day = in->readSint16LE();
+	header._hour = in->readSint16LE();
+	header._minute = in->readSint16LE();
+	header._totalFrames = in->readUint32LE();
+
+	return true;
+}
+
+void AccessEngine::writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameHeader &header) {
+	// Write out a savegame header
+	out->write(SAVEGAME_STR, SAVEGAME_STR_SIZE + 1);
+
+	out->writeByte(ACCESS_SAVEGAME_VERSION);
+
+	// Write savegame name
+	out->write(header._saveName.c_str(), header._saveName.size());
+	out->writeByte('\0');
+
+	// Write a thumbnail of the screen
+	uint8 thumbPalette[PALETTE_SIZE];
+	_screen->getPalette(thumbPalette);
+	Graphics::Surface saveThumb;
+	::createThumbnail(&saveThumb, (const byte *)_screen->getPixels(),
+		_screen->w, _screen->h, thumbPalette);
+	Graphics::saveThumbnail(*out, saveThumb);
+	saveThumb.free();
+
+	// Write out the save date/time
+	TimeDate td;
+	g_system->getTimeAndDate(td);
+	out->writeSint16LE(td.tm_year + 1900);
+	out->writeSint16LE(td.tm_mon + 1);
+	out->writeSint16LE(td.tm_mday);
+	out->writeSint16LE(td.tm_hour);
+	out->writeSint16LE(td.tm_min);
+	out->writeUint32LE(_events->getFrameCounter());
+}
+
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 7d76be9039..a192da3904 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -27,6 +27,7 @@
 #include "common/system.h"
 #include "common/error.h"
 #include "common/random.h"
+#include "common/savefile.h"
 #include "common/serializer.h"
 #include "common/util.h"
 #include "engines/engine.h"
@@ -77,6 +78,17 @@ struct AccessGameDescription;
 
 extern const char *const _estTable[];
 
+#define ACCESS_SAVEGAME_VERSION 1
+
+struct AccessSavegameHeader {
+	uint8 _version;
+	Common::String _saveName;
+	Graphics::Surface *_thumbnail;
+	int _year, _month, _day;
+	int _hour, _minute;
+	int _totalFrames;
+};
+
 class AccessEngine : public Engine {
 private:
 	uint32 _lastTime, _curTime;
@@ -248,6 +260,10 @@ public:
 	void doLoadSave();
 
 	void freeChar();
+
+	static bool readSavegameHeader(Common::InSaveFile *in, AccessSavegameHeader &header);
+
+	void writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameHeader &header);
 };
 
 } // End of namespace Access
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index dd75b28177..293cd3dccb 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -136,7 +136,33 @@ bool AccessMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
 }
 
 SaveStateList AccessMetaEngine::listSaves(const char *target) const {
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::StringArray filenames;
+	Common::String saveDesc;
+	Common::String pattern = Common::String::format("%s.0??", target);
+	Access::AccessSavegameHeader header;
+
+	filenames = saveFileMan->listSavefiles(pattern);
+	sort(filenames.begin(), filenames.end());   // Sort to get the files in numerical order
+
 	SaveStateList saveList;
+	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+		const char *ext = strrchr(file->c_str(), '.');
+		int slot = ext ? atoi(ext + 1) : -1;
+
+		if (slot >= 0 && slot < MAX_SAVES) {
+			Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file);
+
+			if (in) {
+				Access::AccessEngine::readSavegameHeader(in, header);
+				saveList.push_back(SaveStateDescriptor(slot, header._saveName));
+
+				header._thumbnail->free();
+				delete header._thumbnail;
+				delete in;
+			}
+		}
+	}
 
 	return saveList;
 }
diff --git a/engines/access/events.h b/engines/access/events.h
index fdfb0a5043..014ff239b9 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -70,6 +70,11 @@ public:
 	 */
 	~EventsManager();
 
+	/**
+	 * Return frame counter
+	 */
+	uint32 getFrameCounter() { return _frameCounter; }
+
 	/**
 	 * Sets the cursor
 	 */
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b9a07ea2ed..c9e150f8ea 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -433,7 +433,7 @@ void Room::handleCommand(int commandId) {
 		--commandId;
 
 	if (commandId == 9)
-		_vm->doLoadSave();
+		_vm->openMainMenuDialog();
 	else if (commandId == _selectCommand) {
 		_vm->_events->debounceLeft();
 		commandOff();
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 4b1c6d824d..26dd2e93ae 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -141,6 +141,9 @@ void Screen::restorePalette() {
 		&_savedPalettes[_savedPaletteCount][PALETTE_SIZE], &_rawPalette[0]);
 }
 
+void Screen::getPalette(byte *pal) {
+	g_system->getPaletteManager()->grabPalette(pal, 0, 256);
+}
 
 void Screen::forceFadeOut() {
 	const int FADE_AMOUNT = 2;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index a166fded5e..47e03de2b8 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -131,6 +131,8 @@ public:
 
 	void restorePalette();
 
+	void getPalette(byte *pal);
+
 	/**
 	 * Copy a buffer to the screen
 	 */
-- 
cgit v1.2.3


From f12fa2de07694d93a7035875f56f36ed4849275d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 09:57:51 -0400
Subject: ACCESS: Implement saving and loading savegames

---
 engines/access/access.cpp    | 61 ++++++++++++++++++++++++++++++++++++++++++++
 engines/access/access.h      | 33 ++++++++++++++++++++++++
 engines/access/detection.cpp | 18 +++++++++++++
 engines/access/room.cpp      |  9 +++++--
 4 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index f6382262fd..a039139f0a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -72,6 +72,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleMaxY = 0;
 	_scaleI = 0;
 	_scaleFlag = false;
+	_canSaveLoad = false;
 	_eseg = nullptr;
 
 	_conversation = 0;
@@ -387,6 +388,66 @@ void AccessEngine::freeChar() {
 	_animation->freeAnimationData();
 }
 
+Common::Error AccessEngine::saveGameState(int slot, const Common::String &desc) {
+	Common::OutSaveFile *out = g_system->getSavefileManager()->openForSaving(
+		generateSaveName(slot));
+	if (!out)
+		return Common::kCreatingFileFailed;
+
+	AccessSavegameHeader header;
+	header._saveName = desc;
+	writeSavegameHeader(out, header);
+
+	Common::Serializer s(nullptr, out);
+	synchronize(s);
+
+	out->finalize();
+	delete out;
+
+	return Common::kNoError;
+}
+
+Common::Error AccessEngine::loadGameState(int slot) {
+	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
+		generateSaveName(slot));
+	if (!saveFile)
+		return Common::kReadingFailed;
+
+	Common::Serializer s(saveFile, nullptr);
+
+	// Load the savaegame header
+	AccessSavegameHeader header;
+	if (!readSavegameHeader(saveFile, header))
+		error("Invalid savegame");
+
+	if (header._thumbnail) {
+		header._thumbnail->free();
+		delete header._thumbnail;
+	}
+
+	// Load most of the savegame data
+	synchronize(s);
+	delete saveFile;
+
+	// Set extra post-load state
+	_room->_function = 1;
+	_timers._timersSavedFlag = false;
+
+	return Common::kNoError;
+}
+
+Common::String AccessEngine::generateSaveName(int slot) {
+	return Common::String::format("%s.%03d", _targetName.c_str(), slot);
+}
+
+bool AccessEngine::canLoadGameStateCurrently() {
+	return _canSaveLoad;
+}
+
+bool AccessEngine::canSaveGameStateCurrently() {
+	return _canSaveLoad;
+}
+
 void AccessEngine::synchronize(Common::Serializer &s) {
 	s.syncAsUint16LE(_conversation);
 	s.syncAsUint16LE(_currentMan);
diff --git a/engines/access/access.h b/engines/access/access.h
index a192da3904..8e7c42f959 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -114,6 +114,12 @@ protected:
 
 	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
 
+	/**
+	* Support method that generates a savegame name
+	* @param slot		Slot number
+	*/
+	Common::String AccessEngine::generateSaveName(int slot);
+
 	// Engine APIs
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
@@ -180,6 +186,7 @@ public:
 	int _scaleMaxY;
 	int _scaleI;
 	bool _scaleFlag;
+	bool _canSaveLoad;
 
 	Resource *_eseg;
 	int _et;
@@ -261,8 +268,34 @@ public:
 
 	void freeChar();
 
+	/**
+	 * Load a savegame
+	 */
+	virtual Common::Error loadGameState(int slot);
+
+	/**
+	 * Save the game
+	 */
+	virtual Common::Error saveGameState(int slot, const Common::String &desc);
+
+	/**
+	 * Returns true if a savegame can currently be loaded
+	 */
+	bool canLoadGameStateCurrently();
+
+	/**
+	* Returns true if the game can currently be saved
+	*/
+	bool canSaveGameStateCurrently();
+
+	/**
+	 * Read in a savegame header
+	 */
 	static bool readSavegameHeader(Common::InSaveFile *in, AccessSavegameHeader &header);
 
+	/**
+	 * Write out a savegame header
+	 */
 	void writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameHeader &header);
 };
 
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 293cd3dccb..59c4bc4738 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -177,6 +177,24 @@ void AccessMetaEngine::removeSaveState(const char *target, int slot) const {
 }
 
 SaveStateDescriptor AccessMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+	Common::String filename = Common::String::format("%s.%03d", target, slot);
+	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(filename);
+
+	if (f) {
+		Access::AccessSavegameHeader header;
+		Access::AccessEngine::readSavegameHeader(f, header);
+		delete f;
+
+		// Create the return descriptor
+		SaveStateDescriptor desc(slot, header._saveName);
+		desc.setThumbnail(header._thumbnail);
+		desc.setSaveDate(header._year, header._month, header._day);
+		desc.setSaveTime(header._hour, header._minute);
+		desc.setPlayTime(header._totalFrames * GAME_FRAME_TIME);
+
+		return desc;
+	}
+
 	return SaveStateDescriptor();
 }
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index c9e150f8ea..d4e8886cac 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -80,7 +80,10 @@ void Room::doRoom() {
 			}
 
 			// Handle any events
+			_vm->_canSaveLoad = true;
 			_vm->_events->pollEvents();
+			_vm->_canSaveLoad = false;
+			g_system->delayMillis(5);
 
 			_vm->_player->walk();
 			_vm->_sound->midiRepeat();
@@ -432,9 +435,11 @@ void Room::handleCommand(int commandId) {
 	if (commandId == 1)
 		--commandId;
 
-	if (commandId == 9)
+	if (commandId == 9) {
+		_vm->_canSaveLoad = true;
 		_vm->openMainMenuDialog();
-	else if (commandId == _selectCommand) {
+		_vm->_canSaveLoad = false;
+	}  else if (commandId == _selectCommand) {
 		_vm->_events->debounceLeft();
 		commandOff();
 	} else {
-- 
cgit v1.2.3


From 949033ea9242f8ce0ae7c6906c8c5d6831929056 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 10:57:45 -0400
Subject: ACCESS: Implement loading savegames from launcher

---
 engines/access/access.cpp             |  8 ++++++++
 engines/access/access.h               |  1 +
 engines/access/amazon/amazon_game.cpp | 23 +++++++++++++++--------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a039139f0a..01bb3e3845 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -108,6 +108,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_narateFile = 0;
 	_txtPages = 0;
 	_sndSubFile = 0;
+	_loadSaveSlot = -1;
 }
 
 AccessEngine::~AccessEngine() {
@@ -173,6 +174,13 @@ void AccessEngine::initialize() {
 
 	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight());
 	_buffer2.create(g_system->getWidth(), g_system->getHeight());
+
+	// If requested, load a savegame instead of showing the intro
+	if (ConfMan.hasKey("save_slot")) {
+		int saveSlot = ConfMan.getInt("save_slot");
+		if (saveSlot >= 0 && saveSlot <= 999)
+			_loadSaveSlot = saveSlot;
+	}
 }
 
 Common::Error AccessEngine::run() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 8e7c42f959..2f557df7f8 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -106,6 +106,7 @@ private:
 protected:
 	const AccessGameDescription *_gameDescription;
 	Common::RandomSource _randomSource;
+	int _loadSaveSlot;
 
 	/**
 	 * Main handler for showing game rooms
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 0ccaae85dc..ecd9922f78 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -64,10 +64,16 @@ AmazonEngine::~AmazonEngine() {
 }
 
 void AmazonEngine::playGame() {
-	// Do introduction
-	doIntroduction();
-	if (shouldQuit())
-		return;
+	// Initialise Amazon game-specific objects
+	_room = new AmazonRoom(this);
+	_scripts = new AmazonScripts(this);
+
+	if (_loadSaveSlot != -1) {
+		// Do introduction
+		doIntroduction();
+		if (shouldQuit())
+			return;
+	}
 
 	// Setup the game
 	setupGame();
@@ -75,12 +81,13 @@ void AmazonEngine::playGame() {
 	_screen->clearScreen();
 	_screen->setPanel(0);
 	_screen->forceFadeOut();
-
 	_events->showCursor();
 
-	// Setup and execute the room
-	_room = new AmazonRoom(this);
-	_scripts = new AmazonScripts(this);
+	// If there's a pending savegame to load, load it
+	if (_loadSaveSlot != -1)
+		loadGameState(_loadSaveSlot);
+
+	// Execute the room
 	_room->doRoom();
 }
 
-- 
cgit v1.2.3


From 2cca520465dd8005aa3ee21b25961afbde227afd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 11:52:48 -0400
Subject: ACCESS: Add new support for mouse wheel for cycling through cursors

---
 engines/access/events.cpp | 16 ++++++++++++++++
 engines/access/events.h   |  2 ++
 engines/access/room.cpp   | 29 ++++++++++++++++++++++++++---
 engines/access/room.h     |  5 +++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 7366905b0c..0a754305b2 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -40,6 +40,8 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_frameCounter = 10;
 	_priorFrameTime = 0;
 	_leftButton = _rightButton = false;
+	_middleButton = false;
+	_wheelUp = _wheelDown = false;
 	_mouseCol = _mouseRow = 0;
 	_cursorExitFlag = false;
 }
@@ -122,6 +124,8 @@ void EventsManager::pollEvents() {
 		nextFrame();
 	}
 
+	_wheelUp = _wheelDown = false;
+
 	Common::Event event;
 	while (g_system->getEventManager()->pollEvent(event)) {
 		switch (event.type) {
@@ -158,6 +162,18 @@ void EventsManager::pollEvents() {
 		case Common::EVENT_RBUTTONUP:
 			_rightButton = false;
 			return;
+		case Common::EVENT_MBUTTONDOWN:
+			_middleButton = true;
+			return;
+		case Common::EVENT_MBUTTONUP:
+			_middleButton = false;
+			return;
+		case Common::EVENT_WHEELUP:
+			_wheelUp = true;
+			return;
+		case Common::EVENT_WHEELDOWN:
+			_wheelDown = true;
+			return;
 		default:
  			break;
 		}
diff --git a/engines/access/events.h b/engines/access/events.h
index 014ff239b9..6b46086d9a 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -55,6 +55,8 @@ public:
 	CursorType _cursorId;
 	CursorType _normalMouse;
 	bool _leftButton, _rightButton;
+	bool _middleButton;
+	bool _wheelUp, _wheelDown;
 	Common::Point _mousePos;
 	int _mouseCol, _mouseRow;
 	bool _cursorExitFlag;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index d4e8886cac..a7b619c238 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -79,7 +79,7 @@ void Room::doRoom() {
 				_vm->_screen->fadeIn();
 			}
 
-			// Handle any events
+			// Poll for events
 			_vm->_canSaveLoad = true;
 			_vm->_events->pollEvents();
 			_vm->_canSaveLoad = false;
@@ -408,7 +408,16 @@ void Room::doCommands() {
 	if (_vm->_screen->_screenChangeFlag) {
 		_vm->_screen->_screenChangeFlag = false;
 		_vm->_events->_cursorExitFlag = true;
-		executeCommand(4);
+		executeCommand(7);
+	}
+	else if (_vm->_events->_wheelUp || _vm->_events->_wheelDown) {
+		// Handle scrolling mouse wheel
+		cycleCommand(_vm->_events->_wheelUp ? 1 : -1);
+
+	} else if (_vm->_events->_middleButton) {
+		// Switch back to walking
+		handleCommand(7);
+
 	} else if (_vm->_events->_leftButton) {
 		if (_vm->_events->_mouseRow >= 22) {
 			// Mouse in user interface area
@@ -431,6 +440,20 @@ void Room::doCommands() {
 	}
 }
 
+void Room::cycleCommand(int incr) {	
+	int command = _selectCommand + incr;
+	if (command < -1)
+		command = 6;
+	else if (command == -1)
+		command = 7;
+	else  if (command == 1)
+		command = (incr == 1) ? 2 : 0;
+	else if (command == 4)
+		command = (incr == 1) ? 5 : 3;
+
+	handleCommand(command);
+}
+
 void Room::handleCommand(int commandId) {
 	if (commandId == 1)
 		--commandId;
@@ -494,7 +517,7 @@ void Room::executeCommand(int commandId) {
 			_vm->_scripts->executeScript();
 		}
 		_vm->_boxSelect = true;
-		break;
+		return;
 	case 8:
 		events.setCursor(CURSOR_HELP);
 		break;
diff --git a/engines/access/room.h b/engines/access/room.h
index 1d540840e3..321ace4fd1 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -72,6 +72,11 @@ private:
 	int calcLR(int yp);
 	int calcUD(int xp);
 
+	/**
+	 * Cycles forwards or backwards through the list of commands
+	 */
+	void cycleCommand(int incr);
+
 	bool checkCode(int v1, int v2);
 protected:
 	void loadRoomData(const byte *roomData);
-- 
cgit v1.2.3


From d38839d64209248e07b5464be8d44fa19ae93b92 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 11:55:02 -0400
Subject: ACCESS: Fix selecting the help cursor

---
 engines/access/room.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a7b619c238..c26a811225 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -519,6 +519,7 @@ void Room::executeCommand(int commandId) {
 		_vm->_boxSelect = true;
 		return;
 	case 8:
+		events._normalMouse = CURSOR_HELP;
 		events.setCursor(CURSOR_HELP);
 		break;
 	default:
-- 
cgit v1.2.3


From 67e52da359e41c350f8d79cfae3453ca70b8e6d3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 14:19:49 -0400
Subject: ACCESS: Fix non-scaled sprites appearing on-screen in scrolling
 scenes

---
 engines/access/access.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 01bb3e3845..a0de5c8e7c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -341,9 +341,9 @@ void AccessEngine::plotList1() {
 				}
 			} else {
 				if (ie._flags & 2) {
-					_buffer2.plotB(frame, Common::Point(bounds.left, bounds.top));
+					_buffer2.plotB(frame, Common::Point(destBounds.left, destBounds.top));
 				} else {
-					_buffer2.plotF(frame, Common::Point(bounds.left, bounds.top));
+					_buffer2.plotF(frame, Common::Point(destBounds.left, destBounds.top));
 				}
 			}
 		}
-- 
cgit v1.2.3


From be8d719a1a882792d3a28a2eb0f98f9ce442bbfd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 14:25:07 -0400
Subject: ACCESS: Fix ending game when a conversation is active

---
 engines/access/scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 3b03a7ac41..e74b1853a0 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -101,7 +101,7 @@ int Scripts::executeScript() {
 
 		assert(_scriptCommand >= 0x80);
 		executeCommand(_scriptCommand - 0x80);
-	} while (!_endFlag);
+	} while (!_endFlag && !_vm->shouldQuit());
 
 	return _returnCode;
 }
-- 
cgit v1.2.3


From f869019d30bbef118abb140d73bbd6ebc3a5be56 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 17:17:19 -0400
Subject: ACCESS: Implemented cmdDead

---
 engines/access/access.h                    |   1 +
 engines/access/amazon/amazon_game.cpp      |  14 +++-
 engines/access/amazon/amazon_resources.cpp | 120 +++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |   6 ++
 engines/access/data.h                      |  10 +++
 engines/access/files.cpp                   |   7 +-
 engines/access/files.h                     |   1 +
 engines/access/martian/martian_game.cpp    |   4 +-
 engines/access/screen.cpp                  |   3 +-
 engines/access/screen.h                    |   1 -
 engines/access/scripts.cpp                 |  70 ++++++++++++++++-
 engines/access/scripts.h                   |   2 +-
 engines/access/sound.cpp                   |   4 +
 engines/access/sound.h                     |   2 +
 14 files changed, 234 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 2f557df7f8..725e1fc87f 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -162,6 +162,7 @@ public:
 	int _establishCtrlTblOfs;
 	int _numAnimTimers;
 	TimerList _timers;
+	DeathList _deaths;
 	FontManager _fonts;
 	Common::Array<Common::Rect> _newRects;
 	Common::Array<Common::Rect> _oldRects;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index ecd9922f78..712a25289d 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -133,7 +133,7 @@ void AmazonEngine::doTitle() {
 	_sound->queueSound(1, 98, 8);
 	_sound->_soundPriority[1] = 1;
 
-	_screen->_loadPalFlag = false;
+	_files->_loadPalFlag = false;
 	_files->loadScreen(0, 3);
 	
 	_buffer2.copyFrom(*_screen);
@@ -147,7 +147,7 @@ void AmazonEngine::doTitle() {
 
 	_sound->playSound(1);
 
-	_screen->_loadPalFlag = false;
+	_files->_loadPalFlag = false;
 	_files->loadScreen(0, 4);
 	_sound->playSound(1);
 
@@ -192,6 +192,16 @@ void AmazonEngine::setupGame() {
 		_timers.push_back(te);
 	}
 
+	// Load death list
+	_deaths.resize(58);
+	for (int i = 0; i < 58; ++i) {
+		_deaths[i]._screenId = DEATH_SCREENS[i];
+		_deaths[i]._msg = DEATH_TEXT[i];
+	}
+	_deaths._cells.resize(12);
+	for (int i = 0; i < 12; ++i)
+		_deaths._cells[i] = CellIdent(DEATH_CELLS[i][0], DEATH_CELLS[i][1], DEATH_CELLS[i][2]);
+
 	// Miscellaneous
 	_fonts._font1.load(FONT6x6_INDEX, FONT6x6_DATA);
 	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 1f666e1abb..a51457522e 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1194,6 +1194,126 @@ YOU CAN UNDERSTAND.";
 const char *const NO_HINTS_MESSAGE =
 	"THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME.";
 
+
+const byte DEATH_SCREENS[58] = {
+	0,  1,  0,  0,  0,  0,  0,  0,  2,  0,
+	0,  2,  4,  2,  1,  0,  0,  0,  0,  0,
+	0,  2,  7,  7,  4,  6,  7, 10,  4,  2,
+	0,  0,  0,  0,  5,  5,  3,  3,  3,  5,
+	8,  8, 11,  9,  8, 12,  0,  1,  9,  8,
+	8,  0,  5,  8,  0, 12, 12,  11
+};
+
+const char *const DEATH_TEXT[58] = {
+	"SAM SALVADOR SPOTS YOU AND LETS YOU HAVE IT.",
+	"WHILE TAKING A MOONLIGHT SWIM YOU DISCOVER THAT PIRANHA REALLY CAN STRIP FLESH TO THE BONE.",
+	"THE GUARD FILLS YOU FULL OF HOLES BEFORE TOSSING YOU TO THE PIRANHA.",
+	"YOU'RE ONLY ABLE TO SWIM HALFWAY ACROSS THE RIVER BEFORE RUNNING OUT OF AIR.  "
+		"YOU MAKE SO MUCH NOISE GASPING FOR BREATH THAT SAM EASILY FINDS YOU AND LEAVES "
+		"YOU IN THE RIVER PERMANENTLY.",
+	"SAM SALVADOR NOTICES SOMEONE HAS BEEN PLAYING WITH THE CARGO.  "
+		"HE TRACKS YOU DOWN AND LETS YOU HAVE IT.",
+	"THE GUARD COMES AROUND THE CORNER.  HE DECIDES THAT THREE LEAD SLUGS WILL "
+		"TEACH YOU TO BE MORE POLITE.",
+	"THE CAPTAIN IS WAITING OUTSIDE THE DOOR.",
+	"THE CAPTAIN'S RANDOM SHOOTING FINALLY FINDS ITS TARGET.",
+	"THE CRATE OUTSIDE THE WINDOW EXPLODES, DESTROYING THE SHIP.  "
+		"UNFORTUNATELY, YOU'RE STILL ABOARD.",
+	"THE DOOR WAS NOT BARRED AND THE CAPTAIN WALKS RIGHT IN AND PARTS YOUR HAIR.",
+
+	"",
+	"YOU RUN OUT ON DECK, THEN REALIZE THAT MAYA IS STILL TIED UP.  "
+		"AS YOU TURN TO GO BACK THE BOAT BLOWS UP.",
+	"AFTER YOU FAIL TO PROVE YOUR DIVINITY THE NATIVES EAT YOU FOR LUNCH.",
+	"THIS IS THE GENERIC DEATH SCENE",
+	"YOU ONLY MAKE IT HALFWAY ACROSS THE RIVER BEFORE THE PIRANHA STRIKE.",
+	"WITH NOTHING TO PROTECT HIM FROM THE HAIL OF BULLETS ALLEN IS QUICKLY GUNNED DOWN.  "
+		"JASON AND MAYA SOON FOLLOW...",
+	"THE COMBINATION OF THE WIND AND GUNFIRE KNOCK THE CORRUGATED IRON OVER, "
+		"LEAVING YOU WITHOUT PROTECTION.",
+	"WITHOUT SUFFICIENT AMMUNITION, ALLEN IS UNABLE TO HOLD OFF THE ATTACKERS FOR LONG.  "
+		"THIS RESULTS IN A SERIOUS CASE OF LEAD POISONING.  ADDITIONAL AMMUNITION SHOULD "
+		"HAVE BEEN PURCHASED AT THE RIO BLANCO TRADING POST (CHAPTER 6).",
+	"ALLEN IS A MARVELOUS SHOT, BUT HIS AMMUNITION IS NOT UNLIMITED.  "
+		"SOON IT IS ALL OVER.",
+	"THE PILOT FEELS YOU ARE TOO CLOSE AND PULLS THE TRIGGER.",
+
+	"THE PILOT SHOOTS YOU IN THE HEART, THEN TOSSES YOUR LIFELESS BODY OUT THE DOOR.",
+	"THE PLANE CRASHES INTO THE JUNGLE CANOPY AT 200 MPH.",
+	"THE CANOE HITS THE ROCKS AND CAPSIZES, AND THE PIRANHA MAKE YOU THEIR LUNCH GUESTS.",
+	"YOU TAKE THE WRONG BRANCH AND ACCIDENTALLY DISCOVER THE FOURTH TALLEST WATERFALL "
+		"IN SOUTH AMERICA.",
+	"YOU TAKE THE WRONG BRANCH AND DISCOVER A VERY HUNGRY TRIBE OF CANNIBALS.",
+	"YOU TAKE THE WRONG BRANCH AND BECOME LOST IN THE WINDING WATERWAYS.  "
+		"YOU WANDER UNTIL YOU STARVE TO DEATH.",
+	"YOU TAKE THE WRONG BRANCH AND BECOME TRAPPED IN THE RAPIDS.  "
+		"EVENTUALLY YOU AND MAYA ARE CRUSHED BETWEEN THE ROCKS.",
+	"YOU WAIT AROUND FOR SOME TIME, BUT HANS STROHEIM NEVER SPEAKS TO YOU AGAIN.  "
+		"FINALLY YOU RETURN HOME KNOWING YOU HAVE FAILED.",
+	"DECIDING THAT YOU THREATEN HIM AND HIS WORK, HANS STROHEIM HAS THE NATIVES "
+		"IN THE VILLAGE KILL YOU.",
+	"YOU DO NOT GET FAR ENOUGH AWAY BEFORE THE DYNAMITE EXPLODES AND YOU ARE BLOWN "
+		"INTO A THOUSAND PIECES.",
+
+	"YOU ARE STANDING SO CLOSE TO THE ENTRANCE WHEN SANCEZ AND HIS MEN BREAK THROUGH "
+		"THE WALL THAT YOU ARE QUICKLY SPOTTED AND SHOT",
+	"THE AMAZON SENTINELS SPOT YOU AND FILL YOU FULL OF ARROWS.",
+	"SAM MAY BE UGLY, BUT HE'S NOT DEAF.  HE HEARS ALL THE NOISE YOU ARE MAKING AND "
+		"CANCELS YOUR BOARDING PASS.",
+	"WITH THE BAR OFF THE DOOR THE CAPTAIN WALTZES IN AND BLOWS YOU AWAY",
+	"THE BEAR WANDERS OFF INTO THE WOODS AND DISTURBS THE TWO LOVEBIRDS.  "
+		"WHEN THEY COME OUT THEY FIND YOU AND PUT YOU IN THE BIG HOUSE FOR TWENTY YEARS.",
+	"WHEN YOU DO NOT LEAVE THE SECURITY AREA QUICKLY ENOUGH YOU ARE ARRESTED AND CONVICTED "
+		"AS A COMMIE SPY.  YOU EMBARK ON A NEW CAREER STAMPING OUT LICENSE PLATES.",
+	"THE HUNGRY BEAR SPOTS YOU AND DECIDES YOU WILL MAKE A NICE APPETIZER.",
+	"YOU DISTURB THE BEAR'S LUNCH AND HE EATS YOU FOR DESSERT.",
+	"AFTER FAILING TO FIND ANY LUNCH AT THE GARBAGE CAN THE BEAR EATS YOU INSTEAD.",
+	"THE SUSPICIOUS LIBRARIAN CALLS SECURITY AND YOU ARE SENT TO JAIL.",
+
+	"YOU PLUMMET 10,000 FEET TO YOUR DEATH.",
+	"EL LOCO FLIES INTO AN INSANE RAGE AND BEATS YOU TO A BLOODY PULP.",
+	"THE WOMAN WALKS OUT THE DOOR AND NEVER RETURNS.  YOU SPEND THE REST OF YOUR LIFE "
+		"IN A FUTILE ATTEMPT TO LOCATE ALLEN.",
+	"YOU SLIP OFF THE PLATFORM AND FALL TO YOUR DEATH.",
+	"YOU SLIP OFF THE PLATFORM AND FALL TO YOUR DEATH.",
+	"YOU COME TOO CLOSE TO THE POWERFUL JAWS OF THE ANT AND HE SNIPS YOU IN TWO BEFORE "
+		"DEVOURING YOU.",
+	"B.O.B. HAS A FLAW IN HIS PROGRAMMING THAT DIRECTS HIM TO SHOOT FIRST AND ASK QUESTIONS LATER.",
+	"THE PLANE SINKS AND THE PIRHANA ATTACK BEFORE YOU EVEN GET OUT THE DOOR.",
+	"MAYA FALLS OFF THE END OF THE BROKEN BRIDGE.",
+	"YOUR WEIGHT IS JUST ENOUGH TO CAUSE THE REMAINING SUPPORT CABLE TO SNAP AND YOU "
+		"FALL TO THE BOTTOM OF THE GORGE.",
+	
+	"EVEN WITH REPAIRS THE BRIDGE IS NOT STRONG ENOUGH TO HOLD TWO PEOPLE.",
+	"SANCHEZ AND HIS MEN FIND YOU AND HOLD FIRING SQUAD PRACTICE.",
+	"THE TWO GUARDS ARE DISTURBED IN THEIR LOVE NEST AND COME LOOKING FOR ANYONE ACTING SUSPICIOUS.  "
+		"THEY FIND YOU AND SEND YOU UP THE RIVER.",
+	"THE PARACHUTE IS NOT LARGE ENOUGH TO SUPPORT YOU, AND YOU HIT THE TREES AT 140 M.P.H.",
+	"SANCHEZ AND HIS MEN FOLLOW YOU ACROSS THE BRIDGE AND CUT YOU DOWN IN A HAIL OF GUNFIRE",
+	"YOU TRIED TO STAB THE ANT BUT HIS SHELL IS TOO DIFFICULT TO PENETRATE.  "
+		"YOU NOTICE A SLIGHT CUT IN THE SHELL UNDERNEATH BUT YOU CAN'T GET TO IT "
+		"AND HE SNIPS YOU INTO DELICIOUS MEATY CHUNKS.",
+	"AFTER THE ANT FINISHES SUCKING ALL OF THE SAP OUT OF THE VINE HE TURNS HIS ATTENTION BACK TO YOU "
+		"AND BITES YOUR HEAD OFF.",
+	"THE CANTINA OWNER NOTICES YOU ARE TRYING TO STEAL OBJECTS FROM THE TABLES.  "
+		"TWENTY YEARS LATER YOU ARE RELEASED FROM A SOUTH AMERICAN PRISON."
+};
+
+const int DEATH_CELLS[12][3] = {
+	{ 0, 94, 3 },
+	{ 0, 94, 4 },
+	{ 0, 94, 5 },
+	{ 0, 94, 6 },
+	{ 0, 94, 7 },
+	{ 0, 94, 8 },
+	{ 0, 94, 9 },
+	{ 0, 94, 10 },
+	{ 0, 94, 11 },
+	{ 0, 94, 12 },
+	{ 0, 94, 13 },
+	{ 0, 94, 14 }
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index d618ca54c2..17cca2a0b4 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -52,6 +52,12 @@ extern const byte FONT6x6_DATA[];
 extern const char *const NO_HELP_MESSAGE;
 extern const char *const NO_HINTS_MESSAGE;
 
+extern const byte DEATH_SCREENS[58];
+
+extern const char *const DEATH_TEXT[58];
+
+extern const int DEATH_CELLS[12][3];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/data.h b/engines/access/data.h
index 3b3485e459..08fbb40d68 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -88,6 +88,16 @@ public:
 	FileIdent _vidSound;
 };
 
+struct DeathEntry {
+	int _screenId;
+	Common::String _msg;
+};
+
+class DeathList : public Common::Array<DeathEntry> {
+public:
+	Common::Array<CellIdent> _cells;
+};
+
 } // End of namespace Access
 
 #endif /* ACCESS_DATA_H */
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 4ab98a2060..c449d906cd 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -84,6 +84,7 @@ FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	}
 
 	_fileNumber = -1;
+	_loadPalFlag = true;
 }
 
 FileManager::~FileManager() {
@@ -135,7 +136,11 @@ void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile)
 }
 
 void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
-	_vm->_screen->loadPalette(res->_stream);
+	if (_loadPalFlag) {
+		_vm->_screen->loadPalette(res->_stream);
+	} else {
+		res->_stream->skip(PALETTE_SIZE);
+	}
 
 	// The remainder of the file after the palette may be separately compressed,
 	// so call handleFile to handle it if it is
diff --git a/engines/access/files.h b/engines/access/files.h
index 0a934de8aa..a32ebbf88c 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -94,6 +94,7 @@ private:
 public:
 	int _fileNumber;
 	Common::Array<uint32> _fileIndex;
+	bool _loadPalFlag;
 public:
 	FileManager(AccessEngine *vm);
 	~FileManager();
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 969267f719..2f11d8b858 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -98,7 +98,7 @@ void MartianEngine::doTitle() {
 	_sound->queueSound(0, 98, 30);
 	_sound->_soundPriority[0] = 1;
 
-	_screen->_loadPalFlag = false;
+	_files->_loadPalFlag = false;
 	_files->loadScreen(0, 3);
 	
 	_buffer2.copyFrom(*_screen);
@@ -112,7 +112,7 @@ void MartianEngine::doTitle() {
 
 	_sound->playSound(1);
 
-	_screen->_loadPalFlag = false;
+	_files->_loadPalFlag = false;
 	_files->loadScreen(0, 4);
 	_sound->playSound(1);
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 26dd2e93ae..227d9d7d0c 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -49,7 +49,6 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_vesaCurrentWin = 0;
 	_currentPanel = 0;
 	_hideFlag = true;
-	_loadPalFlag = false;
 	_startColor = _numColors = 0;
 	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
@@ -100,7 +99,7 @@ void Screen::setInitialPalettte() {
 void Screen::loadPalette(Common::SeekableReadStream *stream) {
 	loadRawPalette(stream);
 	setPalette();
-	_loadPalFlag = true;
+	_vm->_files->_loadPalFlag = true;
 }
 
 void Screen::loadPalette(int fileNum, int subfile) {
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 47e03de2b8..b278062d13 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -64,7 +64,6 @@ private:
 	void updatePalette();
 public:
 	int _vesaMode;
-	bool _loadPalFlag;
 	int _startColor, _numColors;
 	Common::Point _bufferStart;
 	int _scrollCol, _scrollRow;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index e74b1853a0..8ac0de78fa 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -133,7 +133,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
-		&Scripts::cmdPlayerOn, &Scripts::CMDDEAD, &Scripts::cmdFadeOut,
+		&Scripts::cmdPlayerOn, &Scripts::cmdDead, &Scripts::cmdFadeOut,
 		&Scripts::CMDENDVID
 	};
 
@@ -740,7 +740,73 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::CMDDEAD() { error("TODO CMDDEAD"); }
+void Scripts::cmdDead() { 
+	int deathId = _data->readByte();
+	_vm->_events->hideCursor();
+	_vm->_screen->forceFadeOut();
+	cmdFreeSound();
+
+	_vm->_sound->_soundTable[0] = _vm->_files->loadFile(98, 44);
+	_vm->_sound->_soundPriority[1] = 1;
+	
+	_vm->_screen->clearScreen();
+	_vm->_screen->setPanel(3);
+
+	if (deathId != 10) {
+		_vm->_sound->newMusic(62, 0);
+		_vm->_files->_loadPalFlag = false;
+		_vm->_files->loadScreen(94, 0);
+		_vm->_files->_loadPalFlag = true;
+		_vm->_buffer2.copyFrom(*_vm->_screen);
+
+		for (int i = 0; i < 3; ++i) {
+			_vm->_sound->playSound(0);
+			_vm->_screen->forceFadeIn();
+			_vm->_sound->playSound(0);
+			_vm->_screen->forceFadeOut();
+		}
+		_vm->freeCells();
+
+		// Load the cell list for the death screen
+		DeathEntry &de = _vm->_deaths[deathId];
+		Common::Array<CellIdent> cells;
+		cells.push_back(_vm->_deaths._cells[de._screenId]);
+		_vm->loadCells(cells);
+
+		_vm->_screen->setDisplayScan();
+		_vm->_files->_loadPalFlag = false;
+		_vm->_files->loadScreen(&_vm->_buffer2, 94, 1);
+		_vm->_screen->setIconPalette();
+
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(105, 25));
+		_vm->_buffer2.copyTo(_vm->_screen);
+		_vm->_screen->forceFadeIn();
+
+		_vm->_fonts._charSet._hi = 10;
+		_vm->_fonts._charSet._lo = 1;
+		_vm->_fonts._charFor._lo = 55;
+		_vm->_fonts._charFor._hi = 255;
+		_vm->_screen->_maxChars = 46;
+		_vm->_screen->_printOrg = Common::Point(20, 155);
+		_vm->_screen->_printStart = Common::Point(20, 155);
+
+		Common::String &msg = de._msg;
+		_vm->_printEnd = 180;
+		_vm->_fonts._font2.printText(_vm->_screen, msg);
+		_vm->_screen->forceFadeOut();
+
+		_vm->_sound->newMusic(0, 1);
+		_vm->_events->showCursor();
+		_vm->_room->clearRoom();
+		_vm->freeChar();
+
+		warning("TODO: restart game");
+		_vm->quitGame();
+	}
+	else {
+		_vm->quitGame();
+	}
+}
 
 void Scripts::cmdFadeOut() {
 	_vm->_screen->forceFadeOut();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 733c7f9dd7..003f441234 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -119,7 +119,7 @@ protected:
 	void CMDPUSHLOCATION();
 	void cmdPlayerOff();
 	void cmdPlayerOn();
-	void CMDDEAD();
+	void cmdDead();
 	void cmdFadeOut();
 	void CMDENDVID();
 public:
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 91910f2917..0cdb380bb9 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -93,6 +93,10 @@ void SoundManager::freeSounds() {
 	// TODO
 }
 
+void SoundManager::newMusic(int musicId, int mode) {
+	warning("TODO: newMusic");
+}
+
 void SoundManager::freeMusic() {
 	delete _music;
 	_music = nullptr;
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 1a94c46773..ad1688a5a9 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -67,6 +67,8 @@ public:
 
 	void freeSounds();
 
+	void newMusic(int musicId, int mode);
+
 	void freeMusic();
 };
 
-- 
cgit v1.2.3


From adddb1377d927403abc406c09f1d76ac5700188a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 17:44:40 -0400
Subject: ACCESS: Fix loading sound in cmdLoadSound

---
 engines/access/scripts.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 8ac0de78fa..2fdb91e35b 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -688,8 +688,11 @@ void Scripts::cmdClearBlock() {
 
 void Scripts::cmdLoadSound() {
 	int idx = _data->readSint16LE();
-	_vm->_sound->_soundTable[0] = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSound);
-	_vm->_sound->_soundPriority[0] = 1;
+
+	_vm->_sound->_soundTable.clear();
+	_vm->_sound->_soundPriority.clear();
+	_vm->_sound->_soundTable.push_back(_vm->_files->loadFile(_vm->_extraCells[idx]._vidSound));
+	_vm->_sound->_soundPriority.push_back(1);
 }
 
 void Scripts::cmdFreeSound() { 
-- 
cgit v1.2.3


From aa755b9f3ff93e1e0918abe77b2a49b2e203e2a5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 31 Aug 2014 01:05:52 +0200
Subject: ACCESS: Fix loadEstablish for the CD version

---
 engines/access/amazon/amazon_game.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 712a25289d..8fbc4cf2ff 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -235,19 +235,19 @@ void AmazonEngine::loadEstablish(int sub) {
 		_eseg = _files->loadFile("ETEXT.DAT");
 	}
 
-	_establishCtrlTblOfs = READ_LE_UINT16(_eseg);
+	_establishCtrlTblOfs = READ_LE_UINT16(_eseg->data());
 
 	int ofs = _establishCtrlTblOfs + (sub * 2);
-	int idx = READ_LE_UINT16(_eseg + ofs);
-	_narateFile = READ_LE_UINT16(_eseg + idx);
-	_txtPages = READ_LE_UINT16(_eseg + idx + 2);
+	int idx = READ_LE_UINT16(_eseg->data() + ofs);
+	_narateFile = READ_LE_UINT16(_eseg->data() + idx);
+	_txtPages = READ_LE_UINT16(_eseg->data() + idx + 2);
 
 	if (!_txtPages)
 		return;
 
-	_sndSubFile = READ_LE_UINT16(_eseg + idx + 4);
+	_sndSubFile = READ_LE_UINT16(_eseg->data() + idx + 4);
 	for (int i = 0; i < _txtPages; ++i)
-		_countTbl[i] = READ_LE_UINT16(_eseg + idx + 6 + (2 * i));
+		_countTbl[i] = READ_LE_UINT16(_eseg->data() + idx + 6 + (2 * i));
 }
 
 void AmazonEngine::doEstablish(int esatabIndex, int sub) {
@@ -278,12 +278,12 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 
 	_printEnd = 155;
 	if (_txtPages == 0) {
-		Common::String msg((const char *)_eseg + msgOffset);
+		Common::String msg((const char *)_eseg->data() + msgOffset);
 		_fonts._font2.printText(_screen, msg);
 	} else {
 		Common::Array<Common::String> msgArr;
 		for (int i = 0; i < _txtPages; ++i) {
-			Common::String msg((const char *)_eseg + msgOffset);
+			Common::String msg((const char *)_eseg->data() + msgOffset);
 			msgOffset += msg.size() + 1;
 			msgArr.push_back(msg);
 		}
@@ -293,7 +293,7 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 
-	free(_eseg);
+	delete _eseg;
 	if (_establishMode == 0)
 		_room->init4Quads();
 }
-- 
cgit v1.2.3


From 2cc6d9299ae6a7037704dd72eeebc44ab2c3c1b4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 31 Aug 2014 01:09:29 +0200
Subject: ACCESS: Add a check to work around a difference in hardcoded data
 between the CD and the floppy version

---
 engines/access/room.cpp | 18 +++++++++++-------
 engines/access/room.h   |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index c26a811225..3696a4cadf 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -162,7 +162,7 @@ void Room::clearRoom() {
 }
 
 void Room::loadRoomData(const byte *roomData) {
-	RoomInfo roomInfo(roomData, _vm->getGameID());
+	RoomInfo roomInfo(roomData, _vm->getGameID(), _vm->isCD());
 
 	_roomFlag = roomInfo._roomFlag;
 
@@ -734,14 +734,19 @@ bool Room::checkCode(int v1, int v2) {
 
 /*------------------------------------------------------------------------*/
 
-RoomInfo::RoomInfo(const byte *data, int gameType) {
+RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD) {
 	Common::MemoryReadStream stream(data, 999);
 
 	_roomFlag = stream.readByte();
 
-	if (gameType != GType_MartianMemorandum)
-		_estIndex = stream.readSint16LE();
-	else
+	if (gameType == GType_Amazon) {
+		if (isCD)
+			_estIndex = stream.readSint16LE();
+		else {
+			_estIndex = -1;
+			stream.readSint16LE();
+		}
+	} else
 		_estIndex = -1;
 
 	_musicFile.load(stream);
@@ -779,8 +784,7 @@ RoomInfo::RoomInfo(const byte *data, int gameType) {
 		_extraCells.push_back(ec);
 	}
 
-	for (int16 fileNum = stream.readSint16LE(); fileNum != -1;
-		fileNum = stream.readSint16LE()) {
+	for (int16 fileNum = stream.readSint16LE(); fileNum != -1; fileNum = stream.readSint16LE()) {
 		SoundIdent fi;
 		fi._fileNum = fileNum;
 		fi._subfile = stream.readUint16LE();
diff --git a/engines/access/room.h b/engines/access/room.h
index 321ace4fd1..fdeccc87c8 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -191,7 +191,7 @@ public:
 	Common::Array<ExtraCell> _extraCells;
 	Common::Array<SoundIdent> _sounds;
 public:
-	RoomInfo(const byte *data, int gameType);
+	RoomInfo(const byte *data, int gameType, bool isCD);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 469e3273608d71964da8b1f492e9c66ba9194752 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 31 Aug 2014 01:11:44 +0200
Subject: ACCESS: Add a safeguard to avoid a potential issue when alternating
 stream and raw data use

---
 engines/access/files.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index c449d906cd..d8823c0510 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -62,8 +62,10 @@ Resource::~Resource() {
 byte *Resource::data() {
 	if (_data == nullptr) {
 		_data = new byte[_size];
+		int pos = _stream->pos();
 		_stream->seek(0);
 		_stream->read(_data, _size);
+		_stream->seek(pos);
 	}
 
 	return _data;
-- 
cgit v1.2.3


From 36b87d39cad736f55de62e7c0f6186e234c357e5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 19:15:34 -0400
Subject: ACCESS: Add a missing ->data() on _eseg

---
 engines/access/amazon/amazon_game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 8fbc4cf2ff..ab6fb3f5d9 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -274,7 +274,7 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(sub);
 	_et = sub;
-	uint16 msgOffset = READ_LE_UINT16(_eseg + (sub * 2) + 2);
+	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (sub * 2) + 2);
 
 	_printEnd = 155;
 	if (_txtPages == 0) {
-- 
cgit v1.2.3


From b39d7df7cb754b975bcbfdb523f451f021847e72 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 20:12:12 -0400
Subject: ACCESS: Fix background loading in doEstablish

---
 engines/access/amazon/amazon_game.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index ab6fb3f5d9..d18729aa19 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -257,8 +257,8 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (esatabIndex != -1) {
-		_files->loadScreen(95, esatabIndex);
+	if (sub != -1) {
+		_files->loadScreen(95, sub);
 		_buffer2.copyBuffer(_screen);
 	}
 
-- 
cgit v1.2.3


From 9d3460e9f707b1d53534e45c19e15bbb247eba70 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 31 Aug 2014 02:18:02 +0200
Subject: ACCESS: Implement printText()

---
 engines/access/access.cpp             | 29 +++++++++++++++++++++++++++++
 engines/access/access.h               |  8 ++++++--
 engines/access/amazon/amazon_game.cpp | 33 ++++++++++++++++++---------------
 engines/access/font.cpp               |  4 ----
 engines/access/font.h                 |  4 ----
 engines/access/scripts.cpp            |  2 +-
 6 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a0de5c8e7c..360d434670 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -296,6 +296,35 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 	}
 }
 
+void AccessEngine::printText(ASurface *s, Common::String &msg) {
+	Common::String line;
+	int width = 0;
+	while (true) {
+		bool lastLine = _fonts._font2.getLine(msg, s->_maxChars * 6, line, width);
+
+		// Set font colors
+		_fonts._font2._fontColors[0] = 0;
+		_fonts._font2._fontColors[1] = 28;
+		_fonts._font2._fontColors[2] = 29;
+		_fonts._font2._fontColors[3] = 30;
+
+		_fonts._font2.drawString(s, line, s->_printOrg);
+		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
+
+		if (lastLine)
+			break;
+
+		_events->waitKeyMouse();
+		_buffer2.copyBuffer(s);
+		s->_printOrg.y = s->_printStart.y;
+
+		if (lastLine)
+			break;
+	}
+	_events->waitKeyMouse();
+}
+
+
 void AccessEngine::plotList() {
 	_player->calcPlayer();
 	plotList1();
diff --git a/engines/access/access.h b/engines/access/access.h
index 725e1fc87f..42ba49fd5d 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -113,8 +113,6 @@ protected:
 	 */
 	void doRoom();
 
-	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
-
 	/**
 	* Support method that generates a savegame name
 	* @param slot		Slot number
@@ -270,6 +268,12 @@ public:
 
 	void freeChar();
 
+	/**
+	 * Draw a string on a given surface and update text positioning
+	 */
+	void printText(ASurface *s, Common::String &msg);
+	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
+
 	/**
 	 * Load a savegame
 	 */
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d18729aa19..f633cd8753 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -231,23 +231,26 @@ void AmazonEngine::loadEstablish(int sub) {
 		_establishGroup = 0;
 
 		_eseg = _files->loadFile(_estTable[oldGroup]);
-	} else {
-		_eseg = _files->loadFile("ETEXT.DAT");
-	}
+		_establishCtrlTblOfs = READ_LE_UINT16(_eseg->data());
 
-	_establishCtrlTblOfs = READ_LE_UINT16(_eseg->data());
+		int ofs = _establishCtrlTblOfs + (sub * 2);
+		int idx = READ_LE_UINT16(_eseg->data() + ofs);
+		_narateFile = READ_LE_UINT16(_eseg->data() + idx);
+		_txtPages = READ_LE_UINT16(_eseg->data() + idx + 2);
 
-	int ofs = _establishCtrlTblOfs + (sub * 2);
-	int idx = READ_LE_UINT16(_eseg->data() + ofs);
-	_narateFile = READ_LE_UINT16(_eseg->data() + idx);
-	_txtPages = READ_LE_UINT16(_eseg->data() + idx + 2);
-
-	if (!_txtPages)
-		return;
+		if (!_txtPages)
+			return;
 
-	_sndSubFile = READ_LE_UINT16(_eseg->data() + idx + 4);
-	for (int i = 0; i < _txtPages; ++i)
-		_countTbl[i] = READ_LE_UINT16(_eseg->data() + idx + 6 + (2 * i));
+		_sndSubFile = READ_LE_UINT16(_eseg->data() + idx + 4);
+		for (int i = 0; i < _txtPages; ++i)
+			_countTbl[i] = READ_LE_UINT16(_eseg->data() + idx + 6 + (2 * i));
+	} else {
+		_establishGroup = 0;
+		_narateFile = 0;
+		_txtPages = 0;
+		_sndSubFile = 0;
+		_eseg = _files->loadFile("ETEXT.DAT");
+	}
 }
 
 void AmazonEngine::doEstablish(int esatabIndex, int sub) {
@@ -279,7 +282,7 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 	_printEnd = 155;
 	if (_txtPages == 0) {
 		Common::String msg((const char *)_eseg->data() + msgOffset);
-		_fonts._font2.printText(_screen, msg);
+		printText(_screen, msg);
 	} else {
 		Common::Array<Common::String> msgArr;
 		for (int i = 0; i < _txtPages; ++i) {
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index ba17f19211..75add4129c 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -159,10 +159,6 @@ int Font::drawChar(ASurface *s, char c, Common::Point &pt) {
 	return ch.w;
 }
 
-void Font::printText(ASurface *s, const Common::String &msg) {
-	error("TODO: printText");
-}
-
 /*------------------------------------------------------------------------*/
 
 FontManager::FontManager() {
diff --git a/engines/access/font.h b/engines/access/font.h
index 9285d323d1..d8517e3720 100644
--- a/engines/access/font.h
+++ b/engines/access/font.h
@@ -85,10 +85,6 @@ public:
 	 */
 	int drawChar(ASurface *s, char c, Common::Point &pt);
 
-	/**
-	 * Draw a string on a given surface and update text positioning
-	 */
-	void printText(ASurface *s, const Common::String &msg);
 };
 
 class FontManager {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2fdb91e35b..0b2150a5a6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -795,7 +795,7 @@ void Scripts::cmdDead() {
 
 		Common::String &msg = de._msg;
 		_vm->_printEnd = 180;
-		_vm->_fonts._font2.printText(_vm->_screen, msg);
+		_vm->printText(_vm->_screen, msg);
 		_vm->_screen->forceFadeOut();
 
 		_vm->_sound->newMusic(0, 1);
-- 
cgit v1.2.3


From c092e0665271541719d34b40da5d856142c42a8e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 20:31:48 -0400
Subject: ACCESS: Fix parameter usage in doEstablish

---
 engines/access/amazon/amazon_game.cpp | 8 ++++----
 engines/access/amazon/amazon_game.h   | 2 +-
 engines/access/room.cpp               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f633cd8753..14ee9bc947 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -253,7 +253,7 @@ void AmazonEngine::loadEstablish(int sub) {
 	}
 }
 
-void AmazonEngine::doEstablish(int esatabIndex, int sub) {
+void AmazonEngine::doEstablish(int estabIndex, int sub) {
 	_establishMode = 1;
 
 	_screen->forceFadeOut();
@@ -275,9 +275,9 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
 
 	_screen->_maxChars = 37;
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
-	loadEstablish(sub);
-	_et = sub;
-	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (sub * 2) + 2);
+	loadEstablish(estabIndex);
+	_et = estabIndex;
+	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (estabIndex * 2) + 2);
 
 	_printEnd = 155;
 	if (_txtPages == 0) {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 6511b377ae..575b3d14b7 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -100,7 +100,7 @@ private:
 	void setupGame();
 
 	void loadEstablish(int sub);
-	void doEstablish(int esatabIndex, int sub);
+	void doEstablish(int estabIndex, int sub);
 	void establishCenter(int esatabIndex, int sub);
 
 protected:
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 3696a4cadf..7df7ca9251 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -171,7 +171,7 @@ void Room::loadRoomData(const byte *roomData) {
 		_vm->_establishFlag = true;
 		if (_vm->_establishTable[roomInfo._estIndex] != 1) {
 			_vm->_establishTable[roomInfo._estIndex] = 1;
-			_vm->establish(0, roomInfo._estIndex);
+			_vm->establish(roomInfo._estIndex, 0);
 		}
 	}
 
-- 
cgit v1.2.3


From 78bf011a8b5f9eb25c2b231752c30a3ca239cbc7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 20:50:25 -0400
Subject: ACCESS: Fix playSound stub

---
 engines/access/sound.cpp | 6 +++---
 engines/access/sound.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 0cdb380bb9..001d2f325b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -55,11 +55,11 @@ Resource *SoundManager::loadSound(int fileNum, int subfile) {
 }
 
 void SoundManager::playSound(int soundIndex) {
-	int idx = _soundPriority[soundIndex];
-	playSound(_soundTable[idx]);
+	int priority = _soundPriority[soundIndex];
+	playSound(_soundTable[soundIndex], priority);
 }
 
-void SoundManager::playSound(Resource *res) {
+void SoundManager::playSound(Resource *res, int priority) {
 	/*
 	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
 	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
diff --git a/engines/access/sound.h b/engines/access/sound.h
index ad1688a5a9..3d967c6af4 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -41,7 +41,7 @@ private:
 
 	void clearSounds();
 
-	void playSound(Resource *res);
+	void playSound(Resource *res, int priority);
 public:
 	Common::Array<Resource *> _soundTable;
 	Common::Array<int> _soundPriority;
-- 
cgit v1.2.3


From 2f5fb206d30a77b94aa81feb6b7292c0d3e5e481 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 21:02:22 -0400
Subject: ACCESS: Further cleanup of doEstablish parameters

---
 engines/access/access.cpp             |  2 +-
 engines/access/amazon/amazon_game.cpp | 18 +++++++++---------
 engines/access/amazon/amazon_game.h   |  6 +++---
 engines/access/char.cpp               |  2 +-
 engines/access/room.cpp               |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 360d434670..29b7fd6e5c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -240,7 +240,7 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 			while (true) {
 				_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 				_sound->_soundPriority[0] = 1;
-				_sound->playSound(1);
+				_sound->playSound(0);
 				_scripts->cmdFreeSound();
 
 				_events->pollEvents();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 14ee9bc947..d15587f32f 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -212,20 +212,20 @@ void AmazonEngine::setupGame() {
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
 }
 
-void AmazonEngine::establish(int esatabIndex, int sub) {
+void AmazonEngine::establish(int screenId, int esatabIndex) {
 	_establishMode = 0;
 	_establishGroup = 0;
-	doEstablish(esatabIndex, sub);
+	doEstablish(screenId, esatabIndex);
 }
 
-void AmazonEngine::establishCenter(int esatabIndex, int sub) {
+void AmazonEngine::establishCenter(int screenId, int esatabIndex) {
 	_establishMode = 1;
-	doEstablish(esatabIndex, sub);
+	doEstablish(screenId, esatabIndex);
 }
 
 const char *const _estTable[] = { "ETEXT0.DAT", "ETEXT1.DAT", "ETEXT2.DAT", "ETEXT3.DAT" };
 
-void AmazonEngine::loadEstablish(int sub) {
+void AmazonEngine::loadEstablish(int estabIndex) {
 	if (!_files->existFile("ETEXT.DAT")) {
 		int oldGroup = _establishGroup;
 		_establishGroup = 0;
@@ -233,7 +233,7 @@ void AmazonEngine::loadEstablish(int sub) {
 		_eseg = _files->loadFile(_estTable[oldGroup]);
 		_establishCtrlTblOfs = READ_LE_UINT16(_eseg->data());
 
-		int ofs = _establishCtrlTblOfs + (sub * 2);
+		int ofs = _establishCtrlTblOfs + (estabIndex * 2);
 		int idx = READ_LE_UINT16(_eseg->data() + ofs);
 		_narateFile = READ_LE_UINT16(_eseg->data() + idx);
 		_txtPages = READ_LE_UINT16(_eseg->data() + idx + 2);
@@ -253,15 +253,15 @@ void AmazonEngine::loadEstablish(int sub) {
 	}
 }
 
-void AmazonEngine::doEstablish(int estabIndex, int sub) {
+void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_establishMode = 1;
 
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (sub != -1) {
-		_files->loadScreen(95, sub);
+	if (screenId != -1) {
+		_files->loadScreen(95, screenId);
 		_buffer2.copyBuffer(_screen);
 	}
 
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 575b3d14b7..3929eb1485 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -99,9 +99,9 @@ private:
 	 */
 	void setupGame();
 
-	void loadEstablish(int sub);
-	void doEstablish(int estabIndex, int sub);
-	void establishCenter(int esatabIndex, int sub);
+	void loadEstablish(int estabIndex);
+	void doEstablish(int screenId, int estabIndex);
+	void establishCenter(int screenId, int esatabIndex);
 
 protected:
 	/**
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index aebf63a131..8ce43a5730 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -90,7 +90,7 @@ void CharManager::loadChar(int charId) {
 		_vm->_establishFlag = true;
 		if (!_vm->_establishTable[ce._estabIndex]) {
 			_vm->_establishTable[ce._estabIndex] = true;
-			_vm->establish(ce._estabIndex, 0);
+			_vm->establish(0, ce._estabIndex);
 		}
 	}
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 7df7ca9251..3696a4cadf 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -171,7 +171,7 @@ void Room::loadRoomData(const byte *roomData) {
 		_vm->_establishFlag = true;
 		if (_vm->_establishTable[roomInfo._estIndex] != 1) {
 			_vm->_establishTable[roomInfo._estIndex] = 1;
-			_vm->establish(roomInfo._estIndex, 0);
+			_vm->establish(0, roomInfo._estIndex);
 		}
 	}
 
-- 
cgit v1.2.3


From b5b298a5d5a6cf461d14c6f48bdd301df803da62 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 21:22:11 -0400
Subject: ACCESS: Fix playSound call

---
 engines/access/access.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 29b7fd6e5c..55af992dbb 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -275,7 +275,7 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 	while(true) {
 		_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundPriority[0] = 1;
-		_sound->playSound(1);
+		_sound->playSound(0);
 		_scripts->cmdFreeSound();
 
 		_events->pollEvents();
-- 
cgit v1.2.3


From f8778a5e04b5cc46a898d9d6c570f506e7d3b58c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 21:43:24 -0400
Subject: ACCESS: Fix getLine when \r occurs just after maximum line width
 reached

---
 engines/access/font.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 75add4129c..ffc1715c39 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -74,6 +74,9 @@ void Font::load(const int *fontIndex, const byte *fontData) {
 }
 
 int Font::charWidth(char c) {
+	if (c < ' ')
+		return 0;
+
 	return _chars[c - ' '].w;
 }
 
@@ -95,7 +98,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 	while ((c = *src) != '\0') {
 		if (c == '\r') {
 			// End of line, so return calculated line
-			line = Common::String(s.c_str(), src - 1);
+			line = Common::String(s.c_str(), src);
 			s = Common::String(src + 1);
 			return false;
 		}
-- 
cgit v1.2.3


From e854ec1bc98efcddc006fbf0078d15f51ffcb264 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 Aug 2014 21:44:28 -0400
Subject: ACCESS: Fix freeing _eseg correctly

---
 engines/access/amazon/amazon_game.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d15587f32f..0725863444 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -297,6 +297,8 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_screen->clearScreen();
 
 	delete _eseg;
+	_eseg = nullptr;
+
 	if (_establishMode == 0)
 		_room->init4Quads();
 }
-- 
cgit v1.2.3


From f1fae5373130c2c0986476f53a193f3ba2d760ab Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 1 Sep 2014 19:52:44 +0200
Subject: DEBUGGER: Add "md5" command, to get the MD5 sum of entire files

This may make it easier to ask users for the MD5 sum of a file, in
case we suspect a bug report is caused by damaged files.
---
 gui/debugger.cpp | 35 +++++++++++++++++++++++++++++++++++
 gui/debugger.h   |  3 +++
 2 files changed, 38 insertions(+)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index dcdc18d7b9..ff365b0fad 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -27,6 +27,12 @@
 #include "common/debug-channels.h"
 #include "common/system.h"
 
+#ifndef DISABLE_MD5
+#include "common/md5.h"
+#include "common/archive.h"
+#include "common/stream.h"
+#endif
+
 #include "engines/engine.h"
 
 #include "gui/debugger.h"
@@ -61,6 +67,9 @@ Debugger::Debugger() {
 
 	registerCmd("help",				WRAP_METHOD(Debugger, cmdHelp));
 	registerCmd("openlog",			WRAP_METHOD(Debugger, cmdOpenLog));
+#ifndef DISABLE_MD5
+	registerCmd("md5",				WRAP_METHOD(Debugger, cmdMd5));
+#endif
 
 	registerCmd("debuglevel",		WRAP_METHOD(Debugger, cmdDebugLevel));
 	registerCmd("debugflag_list",		WRAP_METHOD(Debugger, cmdDebugFlagsList));
@@ -502,6 +511,32 @@ bool Debugger::cmdOpenLog(int argc, const char **argv) {
 	return true;
 }
 
+#ifndef DISABLE_MD5
+bool Debugger::cmdMd5(int argc, const char **argv) {
+	if (argc < 2) {
+		debugPrintf("md5 <filename | pattern>\n");
+	} else {
+		// Assume that spaces are part of a single filename.
+		Common::String filename = argv[1];
+		for (int i = 2; i < argc; i++) {
+			filename = filename + " " + argv[i];
+		}
+		Common::ArchiveMemberList list;
+		SearchMan.listMatchingMembers(list, filename);
+		if (list.empty()) {
+			debugPrintf("File '%s' not found\n", filename.c_str());
+		} else {
+			for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+				Common::ReadStream *stream = (*iter)->createReadStream();
+				Common::String md5 = Common::computeStreamMD5AsString(*stream, 0);
+				debugPrintf("%s  %s\n", md5.c_str(), (*iter)->getDisplayName().c_str());
+				delete stream;
+			}
+		}
+	}
+	return true;
+}
+#endif
 
 bool Debugger::cmdDebugLevel(int argc, const char **argv) {
 	if (argc == 1) { // print level
diff --git a/gui/debugger.h b/gui/debugger.h
index 8c7481b61f..3a829506d9 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -213,6 +213,9 @@ protected:
 	bool cmdExit(int argc, const char **argv);
 	bool cmdHelp(int argc, const char **argv);
 	bool cmdOpenLog(int argc, const char **argv);
+#ifndef DISABLE_MD5
+	bool cmdMd5(int argc, const char **argv);
+#endif
 	bool cmdDebugLevel(int argc, const char **argv);
 	bool cmdDebugFlagsList(int argc, const char **argv);
 	bool cmdDebugFlagEnable(int argc, const char **argv);
-- 
cgit v1.2.3


From 84548847a13de7366875894243e9e5d5a46a4aec Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 1 Sep 2014 21:19:48 +0200
Subject: DEBUGGER: Add "md5mac" command to get MD5 sum of Mac resource fork.

---
 gui/debugger.cpp | 27 +++++++++++++++++++++++++++
 gui/debugger.h   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index ff365b0fad..e0b2db1f50 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -30,6 +30,7 @@
 #ifndef DISABLE_MD5
 #include "common/md5.h"
 #include "common/archive.h"
+#include "common/macresman.h"
 #include "common/stream.h"
 #endif
 
@@ -69,6 +70,7 @@ Debugger::Debugger() {
 	registerCmd("openlog",			WRAP_METHOD(Debugger, cmdOpenLog));
 #ifndef DISABLE_MD5
 	registerCmd("md5",				WRAP_METHOD(Debugger, cmdMd5));
+	registerCmd("md5mac",			WRAP_METHOD(Debugger, cmdMd5Mac));
 #endif
 
 	registerCmd("debuglevel",		WRAP_METHOD(Debugger, cmdDebugLevel));
@@ -536,6 +538,31 @@ bool Debugger::cmdMd5(int argc, const char **argv) {
 	}
 	return true;
 }
+
+bool Debugger::cmdMd5Mac(int argc, const char **argv) {
+	if (argc < 2) {
+		debugPrintf("md5mac <filename>\n");
+	} else {
+		// Assume that spaces are part of a single filename.
+		Common::String filename = argv[1];
+		for (int i = 2; i < argc; i++) {
+			filename = filename + " " + argv[i];
+		}
+		Common::MacResManager macResMan;
+		if (!macResMan.open(filename)) {
+			debugPrintf("Resource file '%s' not found\n", filename.c_str());
+		} else {
+			Common::String md5 = macResMan.computeResForkMD5AsString(0);
+			if (md5.empty()) {
+				debugPrintf("'%s' has no resource fork\n", filename.c_str());
+			} else {
+				debugPrintf("%s  %s\n", md5.c_str(), macResMan.getBaseFileName().c_str());
+			}
+			macResMan.close();
+		}
+	}
+	return true;
+}
 #endif
 
 bool Debugger::cmdDebugLevel(int argc, const char **argv) {
diff --git a/gui/debugger.h b/gui/debugger.h
index 3a829506d9..4539ba9efb 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -215,6 +215,7 @@ protected:
 	bool cmdOpenLog(int argc, const char **argv);
 #ifndef DISABLE_MD5
 	bool cmdMd5(int argc, const char **argv);
+	bool cmdMd5Mac(int argc, const char **argv);
 #endif
 	bool cmdDebugLevel(int argc, const char **argv);
 	bool cmdDebugFlagsList(int argc, const char **argv);
-- 
cgit v1.2.3


From daceff7b2d08aa57060592b6eb7a60fe960b048c Mon Sep 17 00:00:00 2001
From: Роман Донченко
Date: Fri, 5 Sep 2014 23:17:57 +0400
Subject: COMMON: Use true nullptr in Visual Studio 2010+ and true override in
 VS 2012+

Those compilers support these features despite not being fully C++11-compliant.

<http://msdn.microsoft.com/en-us/library/hh567368.aspx> says that VS 2010
has "partial" support for override. I don't know what that entails and I
can't test it, so I err on the side of caution and only enable it in 2012
and up.
---
 common/c++11-compat.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/c++11-compat.h b/common/c++11-compat.h
index 14e0642821..9fd252cc67 100644
--- a/common/c++11-compat.h
+++ b/common/c++11-compat.h
@@ -32,13 +32,17 @@
 // though.
 //
 #if !defined(nullptr)  // XCode 5.0.1 has __cplusplus=199711 but defines this
+#if !defined(_MSC_VER) || _MSC_VER < 1600
 #define nullptr 0
 #endif
+#endif
 
 //
 // Replacement for the override keyword. This allows compilation of code
 // which uses it, but does not feature any semantic.
 //
+#if !defined(_MSC_VER) || _MSC_VER < 1700
 #define override
+#endif
 
 #endif
-- 
cgit v1.2.3


From ce37e489f83d8f33af36bc09cefa4352e827ec03 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 7 Sep 2014 18:14:50 +0200
Subject: DEBUGGER: Sort "md5" output, when using wildcards.

---
 gui/debugger.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index e0b2db1f50..5db2b97523 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -514,6 +514,12 @@ bool Debugger::cmdOpenLog(int argc, const char **argv) {
 }
 
 #ifndef DISABLE_MD5
+struct ArchiveMemberLess {
+	bool operator()(const Common::ArchiveMemberPtr &x, const Common::ArchiveMemberPtr &y) const {
+		return (*x).getDisplayName().compareToIgnoreCase((*y).getDisplayName()) < 0;
+	}
+};
+
 bool Debugger::cmdMd5(int argc, const char **argv) {
 	if (argc < 2) {
 		debugPrintf("md5 <filename | pattern>\n");
@@ -528,6 +534,7 @@ bool Debugger::cmdMd5(int argc, const char **argv) {
 		if (list.empty()) {
 			debugPrintf("File '%s' not found\n", filename.c_str());
 		} else {
+			sort(list.begin(), list.end(), ArchiveMemberLess());
 			for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
 				Common::ReadStream *stream = (*iter)->createReadStream();
 				Common::String md5 = Common::computeStreamMD5AsString(*stream, 0);
-- 
cgit v1.2.3


From 37aa4c2d5955f7558bb06e89e50f017d6a87eac6 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 7 Sep 2014 18:30:40 +0200
Subject: DEBUGGER: Changed usage output from "md5mac"

I don't know of any good way of transforming file names to base
file names, so document that "md5mac" expects the base file name.
Even though it currently will accept MacBinary file names.
---
 gui/debugger.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 5db2b97523..48acda17ad 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -548,7 +548,7 @@ bool Debugger::cmdMd5(int argc, const char **argv) {
 
 bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 	if (argc < 2) {
-		debugPrintf("md5mac <filename>\n");
+		debugPrintf("md5mac <base filename>\n");
 	} else {
 		// Assume that spaces are part of a single filename.
 		Common::String filename = argv[1];
-- 
cgit v1.2.3


From 14ce84da9aec30aa89505f40d16e06df0b6725e4 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 7 Sep 2014 18:50:51 +0200
Subject: DEBUGGER: Let "md5mac" print the MD5 sum of both resource and data

---
 gui/debugger.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 48acda17ad..560e516a94 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -559,11 +559,19 @@ bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 		if (!macResMan.open(filename)) {
 			debugPrintf("Resource file '%s' not found\n", filename.c_str());
 		} else {
-			Common::String md5 = macResMan.computeResForkMD5AsString(0);
-			if (md5.empty()) {
-				debugPrintf("'%s' has no resource fork\n", filename.c_str());
+			if (!macResMan.hasResFork() && !macResMan.hasDataFork()) {
+				debugPrintf("'%s' has neither data not resource fork\n", macResMan.getBaseFileName().c_str());
 			} else {
-				debugPrintf("%s  %s\n", md5.c_str(), macResMan.getBaseFileName().c_str());
+				// The resource fork is probably the most relevant one.
+				if (macResMan.hasResFork()) {
+					Common::String md5 = macResMan.computeResForkMD5AsString(0);
+					debugPrintf("%s  %s (resource)\n", md5.c_str(), macResMan.getBaseFileName().c_str());
+				}
+				if (macResMan.hasDataFork()) {
+					Common::ReadStream *stream = macResMan.getDataFork();
+					Common::String md5 = Common::computeStreamMD5AsString(*stream, 0);
+					debugPrintf("%s  %s (data)\n", md5.c_str(), macResMan.getBaseFileName().c_str());
+				}
 			}
 			macResMan.close();
 		}
-- 
cgit v1.2.3


From 78552afdae3b7b27845d7ea4d2c2638fa3182333 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 9 Sep 2014 12:31:11 +0700
Subject: ZVISION: Check .avi and .rlf suffix only in MetaAnimation.

---
 engines/zvision/animation/meta_animation.cpp          | 10 ++++++----
 engines/zvision/scripting/controls/hotmov_control.cpp |  3 +--
 engines/zvision/scripting/controls/lever_control.cpp  |  3 +--
 engines/zvision/scripting/controls/safe_control.cpp   |  3 +--
 engines/zvision/scripting/sidefx/animation_node.cpp   |  8 ++------
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
index 38f56699bb..1ea6df6481 100644
--- a/engines/zvision/animation/meta_animation.cpp
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -40,14 +40,16 @@ namespace ZVision {
 MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
 	: _fileType(RLF),
 	  _cur_frame(NULL) {
-	if (fileName.hasSuffix(".rlf")) {
+	Common::String tmpFileName = fileName;
+	tmpFileName.toLowercase();
+	if (tmpFileName.hasSuffix(".rlf")) {
 		_fileType = RLF;
-		Common::File *_file = engine->getSearchManager()->openFile(fileName);
+		Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
 		_animation.rlf = new RlfAnimation(_file, false);
 		_frmDelay = _animation.rlf->frameTime();
-	} else if (fileName.hasSuffix(".avi")) {
+	} else if (tmpFileName.hasSuffix(".avi")) {
 		_fileType = AVI;
-		Common::File *_file = engine->getSearchManager()->openFile(fileName);
+		Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
 		_animation.avi = new ZorkAVIDecoder();
 		_animation.avi->loadStream(_file);
 		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 1e1886e1a8..8ffc3392be 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -80,8 +80,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 			char filename[64];
 			sscanf(values.c_str(), "%s", filename);
 			values = Common::String(filename);
-			if (values.hasSuffix(".avi") || values.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(values, _engine);
+			_animation = new MetaAnimation(values, _engine);
 		} else if (param.matchString("venus_id", true)) {
 			_venus_id = atoi(values.c_str());
 		}
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 87fbb433dd..8072079435 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -104,8 +104,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 
 			Common::String animationFileName(fileNameBuffer);
 
-			if (animationFileName.hasSuffix(".avi") || animationFileName.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(animationFileName, _engine);
+			_animation = new MetaAnimation(animationFileName, _engine);
 
 		} else if (line.matchString("*skipcolor*", true)) {
 			// Not used
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index a6be20bce8..d5eff09502 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -66,8 +66,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (param.matchString("animation", true)) {
-			if (values.hasSuffix(".avi") || values.hasSuffix(".rlf"))
-				_animation = new MetaAnimation(values, _engine);
+			_animation = new MetaAnimation(values, _engine);
 		} else if (param.matchString("rectangle", true)) {
 			int x;
 			int y;
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 4a606adc9e..bd9c543d52 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -40,12 +40,8 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	  _mask(mask),
 	  _animation(NULL) {
 
-	if (fileName.hasSuffix(".rlf") || fileName.hasSuffix(".avi")) {
-		_animation = new MetaAnimation(fileName, engine);
-		_frmDelay = _animation->frameTime();
-	} else {
-		warning("Unrecognized animation file type: %s", fileName.c_str());
-	}
+	_animation = new MetaAnimation(fileName, engine);
+	_frmDelay = _animation->frameTime();
 
 	if (frate > 0)
 		_frmDelay = 1000.0 / frate;
-- 
cgit v1.2.3


From bcb1aea0ff3fa45528ebf1dea8c9855cccf1e736 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 9 Sep 2014 12:34:20 +0700
Subject: ZVISION: FistControl implementation.

---
 engines/zvision/module.mk                          |   1 +
 .../zvision/scripting/controls/fist_control.cpp    | 294 +++++++++++++++++++++
 engines/zvision/scripting/controls/fist_control.h  |  86 ++++++
 engines/zvision/scripting/scr_file_handling.cpp    |   3 +
 4 files changed, 384 insertions(+)
 create mode 100644 engines/zvision/scripting/controls/fist_control.cpp
 create mode 100644 engines/zvision/scripting/controls/fist_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 0e6f1ce042..4cfb8f3182 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -17,6 +17,7 @@ MODULE_OBJS := \
 	graphics/render_table.o \
 	scripting/actions.o \
 	scripting/control.o \
+	scripting/controls/fist_control.o \
 	scripting/controls/hotmov_control.o \
 	scripting/controls/input_control.o \
 	scripting/controls/lever_control.o \
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
new file mode 100644
index 0000000000..46b87ddb79
--- /dev/null
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -0,0 +1,294 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/fist_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/animation/meta_animation.h"
+#include "zvision/utility/utility.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "common/system.h"
+
+#include "graphics/surface.h"
+
+
+namespace ZVision {
+
+FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key, CONTROL_FIST) {
+	_cursor = CursorIndex_Idle;
+	_animation = NULL;
+	_soundKey = 0;
+	_fiststatus = 0;
+	_order = 0;
+	_fistnum = 0;
+
+	_frameCur = -1;
+	_frameEnd = -1;
+	_frameTime = 0;
+	_lastRenderedFrame = -1;
+	_animationId = 0;
+
+	clearFistArray(_fistsUp);
+	clearFistArray(_fistsDwn);
+
+	_numEntries = 0;
+	_entries.clear();
+
+	_anmRect = Common::Rect();
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("sound_key", true)) {
+			_soundKey = atoi(values.c_str());
+		} else if (param.matchString("cursor", true)) {
+			_cursor = _engine->getCursorManager()->getCursorId(values);
+		} else if (param.matchString("descfile", true)) {
+			readDescFile(values);
+		} else if (param.matchString("animation_id", true)) {
+			_animationId = atoi(values.c_str());
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+}
+
+FistControl::~FistControl() {
+	if (_animation)
+		delete _animation;
+
+	clearFistArray(_fistsUp);
+	clearFistArray(_fistsDwn);
+	_entries.clear();
+}
+
+void FistControl::renderFrame(uint frameNumber) {
+	if ((int32)frameNumber == _lastRenderedFrame)
+		return;
+
+	_lastRenderedFrame = frameNumber;
+
+	const Graphics::Surface *frameData;
+
+	if (_animation) {
+		frameData = _animation->getFrameData(frameNumber);
+		if (frameData)
+			_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _anmRect);
+	}
+}
+
+bool FistControl::process(uint32 deltaTimeInMillis) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_frameCur >= 0 && _frameEnd >= 0)
+		if (_frameCur <= _frameEnd) {
+			_frameTime -= deltaTimeInMillis;
+
+		if (_frameTime <= 0) {
+			_frameTime = _animation->frameTime();
+
+                renderFrame(_frameCur);
+
+                _frameCur++;
+
+                if (_frameCur > _frameEnd)
+                    _engine->getScriptManager()->setStateValue(_animationId, 2);
+		}
+        }
+
+	return false;
+}
+
+bool FistControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (mouseIn(screenSpacePos, backgroundImageSpacePos) >= 0) {
+		_engine->getCursorManager()->changeCursor(_cursor);
+	        return true;
+	}
+
+	return false;
+}
+
+bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	int n_fist = mouseIn(screenSpacePos, backgroundImageSpacePos);
+
+	if (n_fist >= 0) {
+		//ctrl_setvenus(ct);
+
+		uint32 oldStatus = _fiststatus;
+		_fiststatus ^= (1 << n_fist);
+
+		for(int i = 0; i < _numEntries; i++)
+			if (_entries[i]._bitsStrt == oldStatus && _entries[i]._bitsEnd == _fiststatus) {
+				_frameCur = _entries[i]._anmStrt;
+				_frameEnd = _entries[i]._anmEnd;
+				_frameTime = 0;
+
+				_engine->getScriptManager()->setStateValue(_animationId, 1);
+				_engine->getScriptManager()->setStateValue(_soundKey, _entries[i]._sound);
+				break;
+			}
+
+		_engine->getScriptManager()->setStateValue(_key, _fiststatus);
+
+		//_engine->getScriptManager()->FlushMouseBtn(SDL_BUTTON_LEFT);
+	}
+
+	return false;
+}
+
+void FistControl::readDescFile(const Common::String &fileName) {
+	Common::File file;
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
+		warning("Desc file %s could could be opened", fileName.c_str());
+		return;
+	}
+
+	Common::String line;
+
+	while (!file.eos()) {
+		line = file.readLine();
+
+		for (int i = line.size() - 1; i >= 0; i--)
+			if (line[i] == '~')
+				line.deleteChar(i);
+
+		if (line.matchString("*animation_id*", true)) {
+			// Not used
+		} else if (line.matchString("*animation*", true)) {
+			char filename[64];
+			sscanf(line.c_str(), "animation:%s", filename);
+			_animation = new MetaAnimation(Common::String(filename), _engine);
+		} else if (line.matchString("*anim_rect*", true)) {
+			int left, top, right, bottom;
+			sscanf(line.c_str(), "anim_rect:%d %d %d %d", &left, &top, &right, &bottom);
+			_anmRect = Common::Rect(left, top, right, bottom);
+		} else if (line.matchString("*num_fingers*", true)) {
+			sscanf(line.c_str(), "num_fingers:%d", &_fistnum);
+			_fistsUp.resize(_fistnum);
+			_fistsDwn.resize(_fistnum);
+		} else if (line.matchString("*entries*", true)) {
+			sscanf(line.c_str(), "entries:%d", &_numEntries);
+			_entries.resize(_numEntries);
+		} else if (line.matchString("*eval_order_ascending*", true)) {
+			sscanf(line.c_str(), "eval_order_ascending:%d", &_order);
+		} else if (line.matchString("*up_hs_num_*", true)) {
+			int fist, num;
+			sscanf(line.c_str(), "up_hs_num_%d:%d", &fist, &num);
+			_fistsUp[fist].resize(num);
+		} else if (line.matchString("*up_hs_*", true)) {
+			int16 fist, box, x1, y1, x2, y2;
+			sscanf(line.c_str(), "up_hs_%hd_%hd:%hd %hd %hd %hd", &fist, &box, &x1, &y1, &x2, &y2);
+			(_fistsUp[fist])[box] = Common::Rect(x1, y1, x2, y2);
+		} else if (line.matchString("*down_hs_num_*", true)) {
+			int fist, num;
+			sscanf(line.c_str(), "down_hs_num_%d:%d", &fist, &num);
+			_fistsDwn[fist].resize(num);
+		} else if (line.matchString("*down_hs_*", true)) {
+			int16 fist, box, x1, y1, x2, y2;
+			sscanf(line.c_str(), "down_hs_%hd_%hd:%hd %hd %hd %hd", &fist, &box, &x1, &y1, &x2, &y2);
+			(_fistsDwn[fist])[box] = Common::Rect(x1, y1, x2, y2);
+		} else {
+			int  entry, start, end, sound;
+			char bits_start[33];
+			char bits_end[33];
+			if (sscanf(line.c_str(), "%d:%s %s %d %d (%d)", &entry, bits_start, bits_end, &start, &end, &sound) == 6) {
+				_entries[entry]._bitsStrt = readBits(bits_start);
+				_entries[entry]._bitsEnd = readBits(bits_end);
+				_entries[entry]._anmStrt = start;
+				_entries[entry]._anmEnd = end;
+				_entries[entry]._sound = sound;
+			}
+		}
+	}
+	file.close();
+}
+
+void FistControl::clearFistArray(Common::Array< Common::Array<Common::Rect> > &arr) {
+	for (uint i = 0; i < arr.size(); i++)
+		arr[i].clear();
+
+	arr.clear();
+}
+
+uint32 FistControl::readBits(const char *str) {
+	uint32 bfield = 0;
+	int len = strlen(str);
+	for (int i = 0; i < len; i++)
+		if (str[i] != '0')
+			bfield |= (1 << i);
+	return bfield;
+}
+
+int FistControl::mouseIn(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_order) {
+		for(int i = 0; i < _fistnum; i++) {
+			if (((_fiststatus >> i) & 1) == 1) {
+				for(uint j = 0; j < _fistsDwn[i].size(); j++)
+					if ((_fistsDwn[i])[j].contains(backgroundImageSpacePos))
+						return i;
+			} else {
+				for(uint j = 0; j < _fistsUp[i].size(); j++)
+					if ((_fistsUp[i])[j].contains(backgroundImageSpacePos))
+						return i;
+			}
+		}
+	} else {
+		for(int i = _fistnum - 1; i >= 0; i--) {
+			if (((_fiststatus >> i) & 1) == 1) {
+				for(uint j = 0; j < _fistsDwn[i].size(); j++)
+					if ((_fistsDwn[i])[j].contains(backgroundImageSpacePos))
+						return i;
+			} else {
+				for(uint j = 0; j < _fistsUp[i].size(); j++)
+					if ((_fistsUp[i])[j].contains(backgroundImageSpacePos))
+						return i;
+			}
+		}
+	}
+	return -1;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
new file mode 100644
index 0000000000..940bc96d69
--- /dev/null
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_FIST_CONTROL_H
+#define ZVISION_FIST_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "common/array.h"
+#include "common/rect.h"
+
+
+namespace ZVision {
+
+class MetaAnimation;
+
+class FistControl : public Control {
+public:
+	FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~FistControl();
+
+private:
+	uint32 _fiststatus;
+	int   _fistnum;
+	int16  _cursor;
+	int   _order;
+
+	Common::Array< Common::Array<Common::Rect> > _fistsUp;
+	Common::Array< Common::Array<Common::Rect> > _fistsDwn;
+
+	int32 _numEntries;
+
+	struct entries {
+		uint32 _bitsStrt;
+		uint32 _bitsEnd;
+		int32 _anmStrt;
+		int32 _anmEnd;
+		int32 _sound;
+	};
+
+	Common::Array<entries> _entries;
+
+	MetaAnimation *_animation;
+	Common::Rect _anmRect;
+	int32   _soundKey;
+	int32   _frameCur;
+	int32   _frameEnd;
+	int32   _frameTime;
+	int32   _lastRenderedFrame;
+	int32   _animationId;
+
+public:
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	void renderFrame(uint frameNumber);
+	void readDescFile(const Common::String &fileName);
+	void clearFistArray(Common::Array< Common::Array<Common::Rect> > &arr);
+	uint32 readBits(const char *str);
+	int mouseIn(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index d6c5aa0cb5..5afa5b2871 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -35,6 +35,7 @@
 #include "zvision/scripting/controls/input_control.h"
 #include "zvision/scripting/controls/safe_control.h"
 #include "zvision/scripting/controls/hotmov_control.h"
+#include "zvision/scripting/controls/fist_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -358,6 +359,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new SafeControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("hotmovie")) {
 		return new HotMovControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("fist")) {
+		return new FistControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 984858b6382de2e2788fca1469fb380b036989ba Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 9 Sep 2014 23:54:31 +0200
Subject: ACCESS: Fix an issue in checkCode

---
 engines/access/room.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 3696a4cadf..2c597609e1 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -705,9 +705,10 @@ bool Room::codeWalls() {
 bool Room::checkCode(int v1, int v2) {
 	Player &p = *_vm->_player;
 
-	if (!v1) {
-	} if (!v2 || (v1 == v2)) {
-	} else if (v1 & 1) {
+	if (!v1 || !v2 || (v1 == v2))
+		return false;
+
+	if (v1 & 1) {
 		if (v2 & 2) {
 			p._collideFlag = true;
 			return true;
-- 
cgit v1.2.3


From 6ae414fbde8421cc66a58a08ac3c8b9ca85f6c73 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 10 Sep 2014 11:42:26 +0700
Subject: ZVISION: PaintControl implemented

---
 engines/zvision/module.mk                          |   1 +
 .../zvision/scripting/controls/paint_control.cpp   | 215 +++++++++++++++++++++
 engines/zvision/scripting/controls/paint_control.h |  90 +++++++++
 engines/zvision/scripting/scr_file_handling.cpp    |   3 +
 4 files changed, 309 insertions(+)
 create mode 100644 engines/zvision/scripting/controls/paint_control.cpp
 create mode 100644 engines/zvision/scripting/controls/paint_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 4cfb8f3182..a7a9523893 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -21,6 +21,7 @@ MODULE_OBJS := \
 	scripting/controls/hotmov_control.o \
 	scripting/controls/input_control.o \
 	scripting/controls/lever_control.o \
+	scripting/controls/paint_control.o \
 	scripting/controls/push_toggle_control.o \
 	scripting/controls/safe_control.o \
 	scripting/controls/save_control.o \
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
new file mode 100644
index 0000000000..a350e9b599
--- /dev/null
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -0,0 +1,215 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/paint_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
+
+namespace ZVision {
+
+PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key, CONTROL_PAINT) {
+
+	_cursor = CursorIndex_Active;
+	_paint = NULL;
+	_bkg = NULL;
+	_brush = NULL;
+	_colorKey = 0;
+	_mouseDown = false;
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("rectangle", true)) {
+			int x;
+			int y;
+			int width;
+			int height;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &width, &height);
+
+			_rectangle = Common::Rect(x, y, width + x, height + y);
+		} else if (param.matchString("cursor", true)) {
+			_cursor = _engine->getCursorManager()->getCursorId(values);
+		} else if (param.matchString("brush_file", true)) {
+			_brush = _engine->getRenderManager()->loadImage(values, false);
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
+		} else if (param.matchString("paint_file", true)) {
+			_paint = _engine->getRenderManager()->loadImage(values, false);
+		} else if (param.matchString("eligible_objects", true)) {
+			char buf[256];
+			memset(buf, 0, 256);
+			strcpy(buf, values.c_str());
+
+			char *curpos = buf;
+			char *strend = buf + strlen(buf);
+			while (true) {
+				char *st = curpos;
+
+				if (st >= strend)
+					break;
+
+				while (*curpos != ' ' && curpos < strend)
+					curpos++;
+
+				*curpos = 0;
+				curpos++;
+
+				int obj = atoi(st);
+
+				_eligible_objects.push_back(obj);
+			}
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+
+	if (_paint) {
+		_colorKey = _paint->format.RGBToColor(255,0,255);
+		_bkg = new Graphics::Surface;
+		_bkg->create(_rectangle.width(), _rectangle.height(), _paint->format);
+		_bkg->fillRect(Common::Rect(_rectangle.width(), _rectangle.height()), _colorKey);
+
+		Graphics::Surface *tmp = new Graphics::Surface;
+		tmp->create(_rectangle.width(), _rectangle.height(), _paint->format);
+		_engine->getRenderManager()->blitSurfaceToSurface(*_paint, _rectangle, *tmp, 0, 0);
+		_paint->free();
+		delete _paint;
+		_paint = tmp;
+	}
+
+
+}
+
+PaintControl::~PaintControl() {
+	// Clear the state value back to 0
+	//_engine->getScriptManager()->setStateValue(_key, 0);
+	if (_paint)
+		delete _paint;
+	if (_brush)
+		delete _brush;
+	if (_bkg)
+		delete _bkg;
+}
+
+bool PaintControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	_mouseDown = false;
+
+	return false;
+}
+
+bool PaintControl::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_rectangle.contains(backgroundImageSpacePos)) {
+		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+
+		if (eligeblity(mouse_item)) {
+			_mouseDown = true;
+		}
+	}
+
+	return false;
+}
+
+bool PaintControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
+		return false;
+
+	if (_rectangle.contains(backgroundImageSpacePos)) {
+		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+
+		if (eligeblity(mouse_item)) {
+			_engine->getCursorManager()->changeCursor(_cursor);
+
+			if (_mouseDown) {
+				Common::Rect bkgRect = paint(backgroundImageSpacePos);
+				if (!bkgRect.isEmpty()) {
+					Common::Rect imgRect = bkgRect;
+					imgRect.translate(-_rectangle.left, -_rectangle.top);
+
+					Graphics::Surface imgUpdate = _bkg->getSubArea(imgRect);
+
+					_engine->getRenderManager()->blitSurfaceToBkg(imgUpdate, bkgRect.left, bkgRect.top, _colorKey);
+				}
+			}
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool PaintControl::eligeblity(int item_id) {
+	for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++)
+		if (*it == item_id)
+			return true;
+	return false;
+}
+
+Common::Rect PaintControl::paint(const Common::Point &point) {
+	Common::Rect paint_rect = Common::Rect(_brush->w, _brush->h);
+	paint_rect.moveTo(point);
+	paint_rect.clip(_rectangle);
+
+	if (!paint_rect.isEmpty()) {
+		Common::Rect brush_rect = paint_rect;
+		brush_rect.translate(-point.x, -point.y);
+
+		Common::Rect bkg_rect = paint_rect;
+		bkg_rect.translate( -_rectangle.left, -_rectangle.top );
+
+		for (int yy = 0; yy < brush_rect.height(); yy++) {
+			uint16 *mask = (uint16 *)_brush->getBasePtr(brush_rect.left, brush_rect.top + yy);
+			uint16 *from = (uint16 *)_paint->getBasePtr(bkg_rect.left, bkg_rect.top + yy);
+			uint16 *to   = (uint16 *)_bkg->getBasePtr(bkg_rect.left, bkg_rect.top + yy);
+			for (int xx = 0; xx < brush_rect.width(); xx++) {
+				if (*mask != 0)
+					*(to + xx) = *(from + xx);
+
+				mask++;
+			}
+		}
+
+	}
+	return paint_rect;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h
new file mode 100644
index 0000000000..c74431e681
--- /dev/null
+++ b/engines/zvision/scripting/controls/paint_control.h
@@ -0,0 +1,90 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_PAINT_CONTROL_H
+#define ZVISION_PAINT_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "graphics/surface.h"
+
+#include "common/rect.h"
+#include "common/list.h"
+
+
+namespace ZVision {
+
+class PaintControl : public Control {
+public:
+	PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~PaintControl();
+
+	/**
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 */
+	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+
+	/**
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 */
+	bool onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	/**
+	 * Called on every MouseMove. Tests if the mouse is inside _hotspot, and if so, sets the cursor.
+	 *
+	 * @param engine                     The base engine
+	 * @param screenSpacePos             The position of the mouse in screen space
+	 * @param backgroundImageSpacePos    The position of the mouse in background image space
+	 * @return                           Was the cursor changed?
+	 */
+	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+
+	bool process(uint32 deltaTimeInMillis) { return false; };
+
+private:
+	/**
+	 * The area that will trigger the event
+	 * This is in image space coordinates, NOT screen space
+	 */
+
+	uint32 _colorKey;
+
+	Graphics::Surface *_paint;
+	Graphics::Surface *_bkg;
+	Graphics::Surface *_brush;
+
+	Common::List<int> _eligible_objects;
+
+	int _cursor;
+	Common::Rect _rectangle;
+
+	bool _mouseDown;
+
+	bool eligeblity(int item_id);
+	Common::Rect paint(const Common::Point &point);
+
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 5afa5b2871..0e53eec182 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -36,6 +36,7 @@
 #include "zvision/scripting/controls/safe_control.h"
 #include "zvision/scripting/controls/hotmov_control.h"
 #include "zvision/scripting/controls/fist_control.h"
+#include "zvision/scripting/controls/paint_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -361,6 +362,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new HotMovControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("fist")) {
 		return new FistControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("paint")) {
+		return new PaintControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 39c3a26bfa50aae3b189773a75fe77cbebd17064 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 10 Sep 2014 16:17:30 +0700
Subject: ZVISION: Fix setStateFlag->setStateValue in HotMov control

---
 engines/zvision/scripting/controls/hotmov_control.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 8ffc3392be..b39292f1c5 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -51,7 +51,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 	_num_cycles = 0;
 	_num_frames = 0;
 
-	_engine->getScriptManager()->setStateFlag(_key, 0);
+	_engine->getScriptManager()->setStateValue(_key, 0);
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
@@ -129,7 +129,7 @@ bool HotMovControl::process(uint32 deltaTimeInMillis) {
 			if (_cycle != _num_cycles)
 				renderFrame(_cur_frame);
 			else
-				_engine->getScriptManager()->setStateFlag(_key, 2);
+				_engine->getScriptManager()->setStateValue(_key, 2);
 
 			_frame_time = _animation->frameTime();
 		}
-- 
cgit v1.2.3


From 2a6c2fdf4532e6f5ba3a2a6f8a0e78db4dcdc635 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 10 Sep 2014 16:20:50 +0700
Subject: ZVISION: Titler control and DisplayMessage action implemented

---
 engines/zvision/module.mk                          |   1 +
 engines/zvision/scripting/actions.cpp              |  18 ++++
 engines/zvision/scripting/actions.h                |   2 +
 .../zvision/scripting/controls/titler_control.cpp  | 108 +++++++++++++++++++++
 .../zvision/scripting/controls/titler_control.h    |  55 +++++++++++
 engines/zvision/scripting/scr_file_handling.cpp    |   5 +-
 6 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 engines/zvision/scripting/controls/titler_control.cpp
 create mode 100644 engines/zvision/scripting/controls/titler_control.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index a7a9523893..6734fde6e2 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -26,6 +26,7 @@ MODULE_OBJS := \
 	scripting/controls/safe_control.o \
 	scripting/controls/save_control.o \
 	scripting/controls/slot_control.o \
+	scripting/controls/titler_control.o \
 	scripting/inventory.o \
 	scripting/scr_file_handling.o \
 	scripting/script_manager.o \
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 22fbd4ff16..399a81d898 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -34,6 +34,7 @@
 #include "zvision/scripting/sidefx/syncsound_node.h"
 #include "zvision/scripting/sidefx/animation_node.h"
 #include "zvision/scripting/sidefx/ttytext_node.h"
+#include "zvision/scripting/controls/titler_control.h"
 
 #include "common/file.h"
 
@@ -167,6 +168,23 @@ bool ActionDisableControl::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionDisplayMessage
+//////////////////////////////////////////////////////////////////////////////
+
+ActionDisplayMessage::ActionDisplayMessage(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%hd %hd", &_control, &_msgid);
+}
+
+bool ActionDisplayMessage::execute() {
+	Control *ctrl = _engine->getScriptManager()->getControl(_control);
+	if (ctrl && ctrl->getType() == Control::CONTROL_TITLER) {
+		TitlerControl *titler = (TitlerControl *)ctrl;
+		titler->setString(_msgid);
+	}
+	return true;
+}
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionEnableControl
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index c60aedcdf3..de303a7b1b 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -189,6 +189,8 @@ public:
 	bool execute();
 
 private:
+	int16 _control;
+	int16 _msgid;
 };
 
 class ActionDissolve : public ResultAction {
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
new file mode 100644
index 0000000000..b803501033
--- /dev/null
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/controls/titler_control.h"
+
+#include "zvision/zvision.h"
+#include "zvision/text/text.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/utility/utility.h"
+
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
+	: Control(engine, key, CONTROL_TITLER) {
+
+	_surface = NULL;
+	_curString = -1;
+
+	// Loop until we find the closing brace
+	Common::String line = stream.readLine();
+	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
+	while (!stream.eos() && !line.contains('}')) {
+		if (param.matchString("string_resource_file", true)) {
+			readStringsFile(values);
+		} else if (param.matchString("rectangle", true)) {
+			int x;
+			int y;
+			int x2;
+			int y2;
+
+			sscanf(values.c_str(), "%d %d %d %d", &x, &y, &x2, &y2);
+
+			_rectangle = Common::Rect(x, y, x2, y2);
+		}
+
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
+	}
+
+	if (!_rectangle.isEmpty()) {
+		_surface = new Graphics::Surface;
+		_surface->create(_rectangle.width(), _rectangle.height(), _engine->_pixelFormat);
+		_surface->fillRect(Common::Rect(_surface->w, _surface->h), 0);
+	}
+}
+
+TitlerControl::~TitlerControl() {
+	if (_surface)
+		delete _surface;
+}
+
+void TitlerControl::setString(int strLine) {
+	if (strLine != _curString && strLine >= 0 && strLine < (int)_strings.size()) {
+		_surface->fillRect(Common::Rect(_surface->w, _surface->h), 0);
+		_engine->getTextRenderer()->drawTxtInOneLine(_strings[strLine], *_surface);
+		_engine->getRenderManager()->blitSurfaceToBkg(*_surface, _rectangle.left, _rectangle.top);
+		_curString = strLine;
+	}
+}
+
+void TitlerControl::readStringsFile(const Common::String &fileName) {
+	Common::File file;
+	if (!_engine->getSearchManager()->openFile(file, fileName)) {
+		warning("String_resource_file %s could could be opened", fileName.c_str());
+		return;
+	}
+
+	_strings.clear();
+
+	while (!file.eos()) {
+
+		Common::String line = readWideLine(file);
+		_strings.push_back(line);
+	}
+	file.close();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h
new file mode 100644
index 0000000000..ee230afa97
--- /dev/null
+++ b/engines/zvision/scripting/controls/titler_control.h
@@ -0,0 +1,55 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_TITLER_CONTROL_H
+#define ZVISION_TITLER_CONTROL_H
+
+#include "zvision/scripting/control.h"
+
+#include "graphics/surface.h"
+
+#include "common/rect.h"
+#include "common/array.h"
+
+
+namespace ZVision {
+
+class TitlerControl : public Control {
+public:
+	TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~TitlerControl();
+
+	void setString(int strLine);
+
+private:
+
+	Common::Array< Common::String > _strings;
+	Common::Rect _rectangle;
+	int16 _curString;
+	Graphics::Surface *_surface;
+
+	void readStringsFile(const Common::String &fileName);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 0e53eec182..04378f856f 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -37,6 +37,7 @@
 #include "zvision/scripting/controls/hotmov_control.h"
 #include "zvision/scripting/controls/fist_control.h"
 #include "zvision/scripting/controls/paint_control.h"
+#include "zvision/scripting/controls/titler_control.h"
 
 #include "common/textconsole.h"
 #include "common/file.h"
@@ -237,7 +238,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("disable_venus", true)) {
 					// TODO: Implement ActionDisableVenus
 				} else if (act.matchString("display_message", true)) {
-					// TODO: Implement ActionDisplayMessage
+					actionList.push_back(new ActionDisplayMessage(_engine, slot, args));
 				} else if (act.matchString("dissolve", true)) {
 					// TODO: Implement ActionDissolve
 				} else if (act.matchString("distort", true)) {
@@ -364,6 +365,8 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		return new FistControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("paint")) {
 		return new PaintControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("titler")) {
+		return new TitlerControl(_engine, key, stream);
 	}
 	return NULL;
 }
-- 
cgit v1.2.3


From 6f03127512a31db27a43e6ca899a909b618fff7f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 11 Sep 2014 23:59:17 +0200
Subject: ACCESS: Implement setInactive and mWhile

---
 engines/access/amazon/amazon_game.cpp    |  2 ++
 engines/access/amazon/amazon_game.h      |  7 ++++--
 engines/access/amazon/amazon_scripts.cpp | 43 ++++++++++++++++++++++++++++++--
 engines/access/amazon/amazon_scripts.h   |  3 +++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 0725863444..66b77d66d2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -37,7 +37,9 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), 
 		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]), 
 		_noSound(_flags[239]) {
+
 	_skipStart = false;
+	_charSegSwitch = false;
 
 	_canoeLane = 0;
 	_canoeYPos = 0;
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 3929eb1485..d0f1b2d043 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -65,8 +65,6 @@ private:
 	int _topList;
 	int _botList;
 	int _riverIndex;
-	int _rawInactiveX;
-	int _rawInactiveY;
 	int _inactiveYOff;
 	int _esTabTable[100];
 
@@ -114,6 +112,11 @@ protected:
 	*/
 	virtual void synchronize(Common::Serializer &s);
 public:
+	bool _charSegSwitch;
+
+	int _rawInactiveX;
+	int _rawInactiveY;
+
 	// Fields that are mapped to flags
 	int &_guardLocation;
 	int &_guardFind;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 104473ac7d..24cd8b9ab4 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -34,6 +34,45 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 	_game = (AmazonEngine *)_vm;
 }
 
+void AmazonScripts::mWhile(int param1) {
+	switch(param1) {
+	case 1:
+		warning("TODO MWHILE1");
+		break;
+	case 2:
+		warning("TODO FLY");
+		break;
+	case 3:
+		warning("TODO FALL");
+		break;
+	case 4:
+		warning("TODO JWALK");
+		break;
+	case 5:
+		warning("TODO DOOPEN");
+		break;
+	case 6:
+		warning("TODO DOWNRIVER");
+		break;
+	case 7:
+		warning("MWHILE2");
+		break;
+	case 8:
+		warning("JWALK2");
+		break;
+	default:
+		break;
+	}
+}
+
+void AmazonScripts::setInactive() {
+	_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
+	_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
+	_game->_charSegSwitch = false;
+
+	mWhile(_game->_rawInactiveY);
+}
+
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
@@ -46,10 +85,10 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		warning("TODO DOCAST");
 		break;
 	case 4:
-		warning("TODO SETINACTIVE");
+		setInactive();
 		break;
 	case 6:
-		warning("TODO MWHILE");
+		mWhile(param1);
 		break;
 	case 9:
 		warning("TODO GUARD");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 978ef0105c..45caa5fa6b 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -39,6 +39,9 @@ protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
 	virtual void executeCommand(int commandIndex);
 
+	void mWhile(int param1);
+	void setInactive();
+
 	void cmdHelp();
 	void CMDCYCLEBACK();
 	void CMDCHAPTER();
-- 
cgit v1.2.3


From 5016b2e768688d449b3fd9c42e243da61b12b1f4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Sep 2014 19:23:06 +0200
Subject: ACCESS: Implement a coupld of special commands

---
 engines/access/amazon/amazon_scripts.cpp | 22 +++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  2 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 24cd8b9ab4..c5b49ab630 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -65,6 +65,17 @@ void AmazonScripts::mWhile(int param1) {
 	}
 }
 
+void AmazonScripts::loadBackground(int param1, int param2) {
+	_vm->_files->_loadPalFlag = false;
+	_vm->_files->loadScreen(param1, param2);
+
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+
+	_vm->_screen->forceFadeOut();
+	
+}
+
 void AmazonScripts::setInactive() {
 	_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
 	_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
@@ -73,13 +84,22 @@ void AmazonScripts::setInactive() {
 	mWhile(_game->_rawInactiveY);
 }
 
+void AmazonScripts::boatWalls(int param1, int param2) {
+	if (param1 == 1)
+		_vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 87, 42);
+	else {
+		_vm->_room->_plotter._walls[39].bottom = _vm->_room->_plotter._walls[41].bottom = 106;
+		_vm->_room->_plotter._walls[40].left = 94;
+	}
+}
+
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
 		_vm->establish(param1, param2);
 		break;
 	case 2:
-		warning("TODO LOADBACKGROUND");
+		loadBackground(param1, param2);
 		break;
 	case 3:
 		warning("TODO DOCAST");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 45caa5fa6b..4845863a21 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -40,7 +40,9 @@ protected:
 	virtual void executeCommand(int commandIndex);
 
 	void mWhile(int param1);
+	void loadBackground(int param1, int param2);
 	void setInactive();
+	void boatWalls(int param1, int param2);
 
 	void cmdHelp();
 	void CMDCYCLEBACK();
-- 
cgit v1.2.3


From 7a1650b3d35e767a254e2ffb0d3bb84d358c37f1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Sep 2014 19:24:42 +0200
Subject: ACCESS: Add missing call to boatWalls

---
 engines/access/amazon/amazon_scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index c5b49ab630..7ab4a80063 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -126,7 +126,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		warning("TODO ANT");
 		break;
 	case 15:
-		warning("TODO BOATWALLS");
+		boatWalls(param1, param2);
 		break;
 	default:
 		warning("Unexpected Special code %d - Skipped", commandIndex);
-- 
cgit v1.2.3


From d37534fa9b5024cf8cb31b7009b1ac75bb660497 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Sep 2014 23:28:36 +0200
Subject: ACCESS: Implement mWhile1

---
 engines/access/amazon/amazon_scripts.cpp | 123 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |   2 +
 2 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7ab4a80063..4439a287c3 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -34,6 +34,125 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 	_game = (AmazonEngine *)_vm;
 }
 
+void AmazonScripts::cLoop() {
+	searchForSequence();
+	_vm->_images.clear();
+	_vm->_buffer2.copyFrom(_vm->_buffer1);
+	_vm->_oldRects.clear();
+	_vm->_scripts->executeScript();
+	_vm->plotList1();
+	_vm->copyBlocks();
+}
+
+void AmazonScripts::mWhile1() {
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->fadeOut();
+	_vm->_events->hideCursor();
+
+	_vm->_files->loadScreen(14, 0);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_events->showCursor();
+
+	_vm->_screen->setIconPalette();
+	_vm->_screen->forceFadeIn();
+	
+	Resource *spriteData = _vm->_files->loadFile(14, 6);
+	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 2100;
+
+	do {
+		cLoop();
+		_sequence = 2100;
+	} while (_vm->_flags[52] == 1);
+
+	_vm->_screen->copyFrom(_vm->_buffer1);
+	_vm->_buffer1.copyFrom(_vm->_buffer2);
+
+	_game->establish(-1, 14);
+
+	spriteData = _vm->_files->loadFile(14, 7);
+	_vm->_objectsTable[1] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_sound->playSound(0);
+	_vm->_screen->setDisplayScan();
+	_vm->_events->hideCursor();
+
+	_vm->_files->loadScreen(14, 1);
+	_vm->_screen->setPalette();
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_events->showCursor();
+
+	_vm->_screen->setIconPalette();
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 2200;
+
+	_vm->_sound->queueSound(0, 14, 15);
+	_vm->_sound->_soundPriority[0] = 1;
+
+	do {
+		cLoop();
+		_sequence = 2200;
+	} while (_vm->_flags[52] == 2);
+
+	_vm->_screen->setDisplayScan();
+	_vm->_events->hideCursor();
+
+	_vm->_files->loadScreen(14, 2);
+	_vm->_screen->setPalette();
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_events->showCursor();
+
+	_vm->_screen->setIconPalette();
+	_vm->freeCells();
+
+	spriteData = _vm->_files->loadFile(14, 8);
+	_vm->_objectsTable[2] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 2300;
+	_vm->_sound->playSound(0);
+
+	do {
+		cLoop();
+		_sequence = 2300;
+	} while (_vm->_flags[52] == 3);
+
+	_vm->freeCells();
+	spriteData = _vm->_files->loadFile(14, 9);
+	_vm->_objectsTable[3] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_screen->setDisplayScan();
+	_vm->_events->hideCursor();
+
+	_vm->_files->loadScreen(14, 3);
+	_vm->_screen->setPalette();
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_events->showCursor();
+
+	_vm->_screen->setIconPalette();
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 2400;
+
+	do {
+		cLoop();
+		_sequence = 2400;
+	} while (_vm->_flags[52] == 4);
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
@@ -55,10 +174,10 @@ void AmazonScripts::mWhile(int param1) {
 		warning("TODO DOWNRIVER");
 		break;
 	case 7:
-		warning("MWHILE2");
+		warning("TODO MWHILE2");
 		break;
 	case 8:
-		warning("JWALK2");
+		warning("TODO JWALK2");
 		break;
 	default:
 		break;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 4845863a21..735606f1da 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -39,6 +39,8 @@ protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
 	virtual void executeCommand(int commandIndex);
 
+	void cLoop();
+	void mWhile1();
 	void mWhile(int param1);
 	void loadBackground(int param1, int param2);
 	void setInactive();
-- 
cgit v1.2.3


From c58f7146102be3aac2cef5d69bdceb109da3f09f Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Tue, 16 Sep 2014 13:49:27 -0500
Subject: COMMON: Add support for endian-safe reading/writing of int64

---
 common/endian.h | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/stream.h |  66 +++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/common/endian.h b/common/endian.h
index 6d6563f802..a18e6f088b 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -49,6 +49,17 @@
 #	error No endianness defined
 #endif
 
+
+#define SWAP_CONSTANT_64(a) \
+	((uint64)((((a) >> 56) & 0x000000FF) | \
+	          (((a) >> 40) & 0x0000FF00) | \
+	          (((a) >> 24) & 0x00FF0000) | \
+	          (((a) >>  8) & 0xFF000000) | \
+	          (((a) & 0xFF000000) <<  8) | \
+	          (((a) & 0x00FF0000) << 24) | \
+	          (((a) & 0x0000FF00) << 40) | \
+	          (((a) & 0x000000FF) << 56) ))
+
 #define SWAP_CONSTANT_32(a) \
 	((uint32)((((a) >> 24) & 0x00FF) | \
 	          (((a) >>  8) & 0xFF00) | \
@@ -59,6 +70,62 @@
 	((uint16)((((a) >>  8) & 0x00FF) | \
 	          (((a) <<  8) & 0xFF00) ))
 
+/**
+ * Swap the bytes in a 64 bit word in order to convert LE encoded data to BE
+ * and vice versa.
+ */
+
+// machine/compiler-specific variants come first, fallback last
+
+// Test for GCC and if the target has the MIPS rel.2 instructions (we know the psp does)
+//
+// TODO: Fix this #if statement. It isn't changed from 32 bit. Is there a 64 bit swap instruction?
+#if defined(__GNUC__) && (defined(__psp__) || defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2))
+
+	FORCEINLINE uint32 SWAP_BYTES_32(const uint32 a) {
+		if (__builtin_constant_p(a)) {
+			return SWAP_CONSTANT_32(a);
+		} else {
+			uint32 result;
+#	if defined(__psp__)
+			// use special allegrex instruction
+			__asm__ ("wsbw %0,%1" : "=r" (result) : "r" (a));
+#	else
+			__asm__ ("wsbh %0,%1\n"
+			         "rotr %0,%0,16" : "=r" (result) : "r" (a));
+#	endif
+			return result;
+		}
+	}
+
+// Test for GCC >= 4.3.0 as this version added the bswap builtin
+#elif GCC_ATLEAST(4, 3)
+
+	FORCEINLINE uint64 SWAP_BYTES_64(uint64 a) {
+		return __builtin_bswap64(a);
+	}
+
+#elif defined(_MSC_VER)
+
+	FORCEINLINE uint64 SWAP_BYTES_64(uint64 a) {
+		return _byteswap_uint64(a);
+	}
+
+// generic fallback
+#else
+
+	inline uint64 SWAP_BYTES_64(uint64 a) {
+		uint32 low = (uint32)a, high = (uint32)(a >> 32);
+		uint16 lowLow = (uint16)low, lowHigh = (uint16)(low >> 16),
+		       highLow = (uint16)high, highHigh = (uint16)(high >> 16);
+
+		return ((uint64)(((uint32)(uint16)((lowLow   >> 8) | (lowLow   << 8)) << 16) |
+		                          (uint16)((lowHigh  >> 8) | (lowHigh  << 8))) << 32) |
+		                (((uint32)(uint16)((highLow  >> 8) | (highLow  << 8)) << 16) |
+		                          (uint16)((highHigh >> 8) | (highHigh << 8)))
+	}
+#endif
+
 /**
  * Swap the bytes in a 32 bit word in order to convert LE encoded data to BE
  * and vice versa.
@@ -173,6 +240,11 @@
 		return ((const Unaligned32 *)ptr)->val;
 	}
 
+	FORCEINLINE uint64 READ_UINT64(const void *ptr) {
+		struct Unaligned64 { uint64 val; } __attribute__ ((__packed__, __may_alias__));
+		return ((const Unaligned64 *)ptr)->val;
+	}
+
 	FORCEINLINE void WRITE_UINT16(void *ptr, uint16 value) {
 		struct Unaligned16 { uint16 val; } __attribute__ ((__packed__, __may_alias__));
 		((Unaligned16 *)ptr)->val = value;
@@ -183,6 +255,11 @@
 		((Unaligned32 *)ptr)->val = value;
 	}
 
+	FORCEINLINE void WRITE_UINT64(void *ptr, uint64 value) {
+		struct Unaligned64 { uint64 val; } __attribute__((__packed__, __may_alias__));
+		((Unaligned64 *)ptr)->val = value;
+	}
+
 #elif !defined(SCUMM_NEED_ALIGNMENT)
 
 	FORCEINLINE uint16 READ_UINT16(const void *ptr) {
@@ -193,6 +270,10 @@
 		return *(const uint32 *)(ptr);
 	}
 
+	FORCEINLINE uint64 READ_UINT64(const void *ptr) {
+		return *(const uint64 *)(ptr);
+	}
+
 	FORCEINLINE void WRITE_UINT16(void *ptr, uint16 value) {
 		*(uint16 *)(ptr) = value;
 	}
@@ -201,6 +282,10 @@
 		*(uint32 *)(ptr) = value;
 	}
 
+	FORCEINLINE void WRITE_UINT64(void *ptr, uint64 value) {
+		*(uint64 *)(ptr) = value;
+	}
+
 
 // use software fallback by loading each byte explicitely
 #else
@@ -215,6 +300,10 @@
 			const uint8 *b = (const uint8 *)ptr;
 			return (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
 		}
+		inline uint64 READ_UINT64(const void *ptr) {
+			const uint8 *b = (const uint8 *)ptr;
+			return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
+		}
 		inline void WRITE_UINT16(void *ptr, uint16 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 0);
@@ -227,6 +316,17 @@
 			b[2] = (uint8)(value >> 16);
 			b[3] = (uint8)(value >> 24);
 		}
+		inline void WRITE_UINT64(void *ptr, uint64 value) {
+			uint8 *b = (uint8 *)ptr;
+			b[0] = (uint8)(value >>  0);
+			b[1] = (uint8)(value >>  8);
+			b[2] = (uint8)(value >> 16);
+			b[3] = (uint8)(value >> 24);
+			b[4] = (uint8)(value >> 32);
+			b[5] = (uint8)(value >> 40);
+			b[6] = (uint8)(value >> 48);
+			b[7] = (uint8)(value >> 56);
+		}
 
 #	elif defined(SCUMM_BIG_ENDIAN)
 
@@ -238,6 +338,10 @@
 			const uint8 *b = (const uint8 *)ptr;
 			return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | (b[3]);
 		}
+		inline uint64 READ_UINT64(const void *ptr) {
+			const uint8 *b = (const uint8 *)ptr;
+			return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+		}
 		inline void WRITE_UINT16(void *ptr, uint16 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 8);
@@ -250,6 +354,17 @@
 			b[2] = (uint8)(value >>  8);
 			b[3] = (uint8)(value >>  0);
 		}
+		inline void WRITE_UINT64(void *ptr, uint64 value) {
+			uint8 *b = (uint8 *)ptr;
+			b[0] = (uint8)(value >> 56);
+			b[1] = (uint8)(value >> 48);
+			b[2] = (uint8)(value >> 40);
+			b[3] = (uint8)(value >> 32);
+			b[4] = (uint8)(value >> 24);
+			b[5] = (uint8)(value >> 16);
+			b[6] = (uint8)(value >>  8);
+			b[7] = (uint8)(value >>  0);
+		}
 
 #	endif
 
@@ -261,25 +376,33 @@
 
 	#define READ_LE_UINT16(a) READ_UINT16(a)
 	#define READ_LE_UINT32(a) READ_UINT32(a)
+	#define READ_LE_UINT64(a) READ_UINT64(a)
 
 	#define WRITE_LE_UINT16(a, v) WRITE_UINT16(a, v)
 	#define WRITE_LE_UINT32(a, v) WRITE_UINT32(a, v)
+	#define WRITE_LE_UINT64(a, v) WRITE_UINT64(a, v)
 
+	#define FROM_LE_64(a) ((uint64)(a))
 	#define FROM_LE_32(a) ((uint32)(a))
 	#define FROM_LE_16(a) ((uint16)(a))
 
+	#define FROM_BE_64(a) SWAP_BYTES_64(a)
 	#define FROM_BE_32(a) SWAP_BYTES_32(a)
 	#define FROM_BE_16(a) SWAP_BYTES_16(a)
 
+	#define TO_LE_64(a) ((uint64)(a))
 	#define TO_LE_32(a) ((uint32)(a))
 	#define TO_LE_16(a) ((uint16)(a))
 
+	#define TO_BE_64(a) SWAP_BYTES_64(a)
 	#define TO_BE_32(a) SWAP_BYTES_32(a)
 	#define TO_BE_16(a) SWAP_BYTES_16(a)
 
+	#define CONSTANT_LE_64(a) ((uint64)(a))
 	#define CONSTANT_LE_32(a) ((uint32)(a))
 	#define CONSTANT_LE_16(a) ((uint16)(a))
 
+	#define CONSTANT_BE_64(a) SWAP_CONSTANT_64(a)
 	#define CONSTANT_BE_32(a) SWAP_CONSTANT_32(a)
 	#define CONSTANT_BE_16(a) SWAP_CONSTANT_16(a)
 
@@ -294,6 +417,10 @@
 			const uint8 *b = (const uint8 *)ptr;
 			return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | (b[3]);
 		}
+		inline uint64 READ_BE_UINT64(const void *ptr) {
+			const uint8 *b = (const uint8 *)ptr;
+			return (b[0] << 56) | b[1] << 48) | b[2] << 40) | b[3] << 32) | b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+		}
 		inline void WRITE_BE_UINT16(void *ptr, uint16 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 8);
@@ -306,6 +433,17 @@
 			b[2] = (uint8)(value >>  8);
 			b[3] = (uint8)(value >>  0);
 		}
+		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
+			uint8 *b = (uint8 *)ptr;
+			b[0] = (uint8)(value >> 56);
+			b[1] = (uint8)(value >> 48);
+			b[2] = (uint8)(value >> 40);
+			b[3] = (uint8)(value >> 32);
+			b[4] = (uint8)(value >> 24);
+			b[5] = (uint8)(value >> 16);
+			b[6] = (uint8)(value >> 8);
+			b[7] = (uint8)(value >> 0);
+		}
 #	else
 
 		inline uint16 READ_BE_UINT16(const void *ptr) {
@@ -314,12 +452,18 @@
 		inline uint32 READ_BE_UINT32(const void *ptr) {
 			return SWAP_BYTES_32(READ_UINT32(ptr));
 		}
+		inline uint32 READ_BE_UINT64(const void *ptr) {
+			return SWAP_BYTES_64(READ_UINT64(ptr));
+		}
 		inline void WRITE_BE_UINT16(void *ptr, uint16 value) {
 			WRITE_UINT16(ptr, SWAP_BYTES_16(value));
 		}
 		inline void WRITE_BE_UINT32(void *ptr, uint32 value) {
 			WRITE_UINT32(ptr, SWAP_BYTES_32(value));
 		}
+		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
+			WRITE_UINT64(ptr, SWAP_BYTES_64(value));
+		}
 
 #	endif	// if defined(SCUMM_NEED_ALIGNMENT)
 
@@ -327,25 +471,33 @@
 
 	#define READ_BE_UINT16(a) READ_UINT16(a)
 	#define READ_BE_UINT32(a) READ_UINT32(a)
+	#define READ_BE_UINT64(a) READ_UINT64(a)
 
 	#define WRITE_BE_UINT16(a, v) WRITE_UINT16(a, v)
 	#define WRITE_BE_UINT32(a, v) WRITE_UINT32(a, v)
+	#define WRITE_BE_UINT64(a, v) WRITE_UINT64(a, v)
 
+	#define FROM_LE_64(a) SWAP_BYTES_64(a)
 	#define FROM_LE_32(a) SWAP_BYTES_32(a)
 	#define FROM_LE_16(a) SWAP_BYTES_16(a)
 
+	#define FROM_BE_64(a) ((uint64)(a))
 	#define FROM_BE_32(a) ((uint32)(a))
 	#define FROM_BE_16(a) ((uint16)(a))
 
+	#define TO_LE_64(a) SWAP_BYTES_64(a)
 	#define TO_LE_32(a) SWAP_BYTES_32(a)
 	#define TO_LE_16(a) SWAP_BYTES_16(a)
 
+	#define TO_BE_64(a) ((uint64)(a))	
 	#define TO_BE_32(a) ((uint32)(a))
 	#define TO_BE_16(a) ((uint16)(a))
 
+	#define CONSTANT_LE_64(a) SWAP_CONSTANT_64(a)	
 	#define CONSTANT_LE_32(a) SWAP_CONSTANT_32(a)
 	#define CONSTANT_LE_16(a) SWAP_CONSTANT_16(a)
 
+	#define CONSTANT_BE_64(a) ((uint64)(a))
 	#define CONSTANT_BE_32(a) ((uint32)(a))
 	#define CONSTANT_BE_16(a) ((uint16)(a))
 
@@ -360,6 +512,10 @@
 		const uint8 *b = (const uint8 *)ptr;
 		return (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
 	}
+	inline uint64 READ_LE_UINT64(const void *ptr) {
+		const uint8 *b = (const uint8 *)ptr;
+		return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
+	}
 	inline void WRITE_LE_UINT16(void *ptr, uint16 value) {
 		uint8 *b = (uint8 *)ptr;
 		b[0] = (uint8)(value >> 0);
@@ -372,6 +528,17 @@
 		b[2] = (uint8)(value >> 16);
 		b[3] = (uint8)(value >> 24);
 	}
+	inline void WRITE_LE_UINT64(void *ptr, uint64 value) {
+		uint8 *b = (uint8 *)ptr;
+		b[0] = (uint8)(value >>  0);
+		b[1] = (uint8)(value >>  8);
+		b[2] = (uint8)(value >> 16);
+		b[3] = (uint8)(value >> 24);
+		b[4] = (uint8)(value >> 32);
+		b[5] = (uint8)(value >> 40);
+		b[6] = (uint8)(value >> 48);
+		b[7] = (uint8)(value >> 56);
+	}
 #	else
 
 	inline uint16 READ_LE_UINT16(const void *ptr) {
@@ -380,12 +547,18 @@
 	inline uint32 READ_LE_UINT32(const void *ptr) {
 		return SWAP_BYTES_32(READ_UINT32(ptr));
 	}
+	inline uint64 READ_LE_UINT64(const void *ptr) {
+		return SWAP_BYTES_64(READ_UINT64(ptr));
+	}
 	inline void WRITE_LE_UINT16(void *ptr, uint16 value) {
 		WRITE_UINT16(ptr, SWAP_BYTES_16(value));
 	}
 	inline void WRITE_LE_UINT32(void *ptr, uint32 value) {
 		WRITE_UINT32(ptr, SWAP_BYTES_32(value));
 	}
+	inline void WRITE_LE_UINT64(void *ptr, uint64 value) {
+		WRITE_UINT64(ptr, SWAP_BYTES_64(value));
+	}
 
 #	endif	// if defined(SCUMM_NEED_ALIGNMENT)
 
diff --git a/common/stream.h b/common/stream.h
index 2702068cf3..5655f0fcb4 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -125,6 +125,11 @@ public:
 		write(&value, 4);
 	}
 
+	void writeUint64LE(uint64 value) {
+		value = TO_LE_64(value);
+		write(&value, 8);
+	}
+
 	void writeUint16BE(uint16 value) {
 		value = TO_BE_16(value);
 		write(&value, 2);
@@ -135,6 +140,11 @@ public:
 		write(&value, 4);
 	}
 
+	void writeUint64BE(uint64 value) {
+		value = TO_BE_64(value);
+		write(&value, 8);
+	}
+
 	FORCEINLINE void writeSint16LE(int16 value) {
 		writeUint16LE((uint16)value);
 	}
@@ -143,6 +153,10 @@ public:
 		writeUint32LE((uint32)value);
 	}
 
+	FORCEINLINE void writeSint64LE(int64 value) {
+		writeUint64LE((uint64)value);
+	}
+
 	FORCEINLINE void writeSint16BE(int16 value) {
 		writeUint16BE((uint16)value);
 	}
@@ -151,6 +165,10 @@ public:
 		writeUint32BE((uint32)value);
 	}
 
+	FORCEINLINE void writeSint64BE(int64 value) {
+		writeUint64BE((uint64)value);
+	}
+
 	/**
 	 * Write the given string to the stream.
 	 * This writes str.size() characters, but no terminating zero byte.
@@ -241,6 +259,19 @@ public:
 		return FROM_LE_32(val);
 	}
 
+	/**
+	 * Read an unsigned 64-bit word stored in little endian (LSB first) order
+	 * from the stream and return it.
+	 * Performs no error checking. The return value is undefined
+	 * if a read error occurred (for which client code can check by
+	 * calling err() and eos() ).
+	 */
+	uint32 readUint64LE() {
+		uint64 val;
+		read(&val, 8);
+		return FROM_LE_64(val);
+	}
+
 	/**
 	 * Read an unsigned 16-bit word stored in big endian (MSB first) order
 	 * from the stream and return it.
@@ -267,6 +298,19 @@ public:
 		return FROM_BE_32(val);
 	}
 
+	/**
+	 * Read an unsigned 64-bit word stored in big endian (MSB first) order
+	 * from the stream and return it.
+	 * Performs no error checking. The return value is undefined
+	 * if a read error occurred (for which client code can check by
+	 * calling err() and eos() ).
+	 */
+	uint32 readUint64BE() {
+		uint64 val;
+		read(&val, 8);
+		return FROM_BE_64(val);
+	}
+
 	/**
 	 * Read a signed 16-bit word stored in little endian (LSB first) order
 	 * from the stream and return it.
@@ -289,6 +333,17 @@ public:
 		return (int32)readUint32LE();
 	}
 
+	/**
+	 * Read a signed 64-bit word stored in little endian (LSB first) order
+	 * from the stream and return it.
+	 * Performs no error checking. The return value is undefined
+	 * if a read error occurred (for which client code can check by
+	 * calling err() and eos() ).
+	 */
+	FORCEINLINE int64 readSint64LE() {
+		return (int64)readUint64LE();
+	}
+
 	/**
 	 * Read a signed 16-bit word stored in big endian (MSB first) order
 	 * from the stream and return it.
@@ -311,6 +366,17 @@ public:
 		return (int32)readUint32BE();
 	}
 
+	/**
+	 * Read a signed 64-bit word stored in big endian (MSB first) order
+	 * from the stream and return it.
+	 * Performs no error checking. The return value is undefined
+	 * if a read error occurred (for which client code can check by
+	 * calling err() and eos() ).
+	 */
+	FORCEINLINE int64 readSint64BE() {
+		return (int64)readUint64BE();
+	}
+
 	/**
 	 * Read the specified amount of data into a malloc'ed buffer
 	 * which then is wrapped into a MemoryReadStream.
-- 
cgit v1.2.3


From 9accfdab6f48daa9dbe47de84f0bda84d4103546 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 16 Sep 2014 22:04:10 +0200
Subject: ACCESS: Implement mWhile2 and plotInactive, change _inactive from
 Resource* to ImageEntry

---
 engines/access/access.cpp                | 10 ++--
 engines/access/access.h                  |  2 +-
 engines/access/amazon/amazon_game.h      |  2 +-
 engines/access/amazon/amazon_room.cpp    |  4 +-
 engines/access/amazon/amazon_scripts.cpp | 96 +++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  2 +
 engines/access/martian/martian_room.cpp  |  4 +-
 7 files changed, 109 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 55af992dbb..5636654d03 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -55,7 +55,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
-	_inactive = nullptr;
+	_inactive._spritesPtr = nullptr;
+	_inactive._flags = _inactive._frameNumber = _inactive._offsetY = 0;
+	_inactive._position = Common::Point(0, 0);
 	_music = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
@@ -127,7 +129,7 @@ AccessEngine::~AccessEngine() {
 	delete _video;
 
 	freeCells();
-	delete _inactive;
+	delete _inactive._spritesPtr;
 	delete _music;
 	delete _title;
 	delete _eseg;
@@ -212,8 +214,8 @@ void AccessEngine::freeCells() {
 }
 
 void AccessEngine::freeInactiveData() {
-	delete _inactive;
-	_inactive = nullptr;
+	delete _inactive._spritesPtr;
+	_inactive._spritesPtr = nullptr;
 }
 
 void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr) {
diff --git a/engines/access/access.h b/engines/access/access.h
index 42ba49fd5d..157a33c723 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -171,7 +171,7 @@ public:
 	int _mouseMode;
 
 	int _currentManOld;
-	Resource *_inactive;
+	ImageEntry _inactive;
 	Resource *_music;
 	Resource *_title;
 	int _converseMode;
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index d0f1b2d043..0275ceec17 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -65,7 +65,6 @@ private:
 	int _topList;
 	int _botList;
 	int _riverIndex;
-	int _inactiveYOff;
 	int _esTabTable[100];
 
 	// Other fields
@@ -116,6 +115,7 @@ public:
 
 	int _rawInactiveX;
 	int _rawInactiveY;
+	int _inactiveYOff;
 
 	// Fields that are mapped to flags
 	int &_guardLocation;
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 227fc474cf..39cea9ae62 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -77,7 +77,9 @@ void AmazonRoom::reloadRoom() {
 void AmazonRoom::reloadRoom1() {
 	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
-		_vm->_inactive = _vm->_files->loadFile("MAYA.LZ");
+		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
+		_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
+		delete spriteData;
 		_vm->_currentCharFlag = false;
 	}
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 4439a287c3..8c172334a5 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -153,10 +153,62 @@ void AmazonScripts::mWhile1() {
 	} while (_vm->_flags[52] == 4);
 }
 
+void AmazonScripts::mWhile2() {
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->fadeOut();
+	_vm->_events->hideCursor();
+
+	_vm->_files->loadScreen(14, 0);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_events->showCursor();
+
+	_vm->_screen->setIconPalette();
+	_vm->_screen->forceFadeIn();
+
+	Resource *spriteData = _vm->_files->loadFile(14, 6);
+	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 2100;
+
+	do {
+		cLoop();
+		_sequence = 2100;
+	} while (_vm->_flags[52] == 1);
+
+	_vm->_screen->fadeOut();
+	_vm->freeCells();
+	spriteData = _vm->_files->loadFile(14, 9);
+	_vm->_objectsTable[3] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_screen->setDisplayScan();
+	_vm->_events->hideCursor();
+
+	_vm->_files->loadScreen(14, 3);
+	_vm->_screen->setPalette();
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_events->showCursor();
+
+	_vm->_screen->setIconPalette();
+	_vm->_images.clear();
+	_vm->_oldRects.clear();
+	_sequence = 2400;
+
+	do {
+		cLoop();
+		_sequence = 2400;
+	} while (_vm->_flags[52] == 4);
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
-		warning("TODO MWHILE1");
+		mWhile1();
 		break;
 	case 2:
 		warning("TODO FLY");
@@ -174,7 +226,7 @@ void AmazonScripts::mWhile(int param1) {
 		warning("TODO DOWNRIVER");
 		break;
 	case 7:
-		warning("TODO MWHILE2");
+		mWhile2();
 		break;
 	case 8:
 		warning("TODO JWALK2");
@@ -212,6 +264,44 @@ void AmazonScripts::boatWalls(int param1, int param2) {
 	}
 }
 
+void AmazonScripts::plotInactive() {
+	if (_game->_charSegSwitch) {
+		_game->_currentCharFlag = true;
+		SpriteResource *tmp = _vm->_inactive._spritesPtr;
+		_vm->_inactive._spritesPtr = _vm->_player->_playerSprites;
+		_vm->_player->_playerSprites = tmp;
+		_game->_charSegSwitch = false;
+	} else if (_game->_jasMayaFlag != _game->_currentCharFlag) {
+		if (_vm->_player->_playerOff) {
+			_game->_jasMayaFlag = _game->_currentCharFlag;
+		} else {
+			_game->_currentCharFlag = _game->_jasMayaFlag;
+			int tmpX = _game->_rawInactiveX;
+			int tmpY = _game->_rawInactiveY;
+			_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
+			_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
+			_vm->_player->_rawPlayer.x = tmpX;
+			_vm->_player->_rawPlayer.y = tmpY;
+			_game->_inactiveYOff = _vm->_player->_playerOffset.y;
+			_vm->_player->calcManScale();
+		}
+	}
+
+	if (_vm->_player->_roomNumber == 44) {
+		warning("CHECKME: Only sets useless(?) flags 155 and 160");
+	}
+
+	_vm->_inactive._flags &= 0xFD;
+	_vm->_inactive._flags &= 0xF7;
+	_vm->_inactive._position.x = _game->_rawInactiveX;
+	_vm->_inactive._position.y = _game->_rawInactiveY - _game->_inactiveYOff;
+	_vm->_inactive._offsetY = _game->_inactiveYOff;
+	_vm->_inactive._frameNumber = 0;
+
+	_vm->_images.addToList(&_vm->_inactive);
+
+}
+
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
@@ -236,7 +326,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		warning("TODO NEWMUSIC");
 		break;
 	case 11:
-		warning("TODO PLOTINACTIVE");
+		plotInactive();
 		break;
 	case 13:
 		warning("TODO RIVER");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 735606f1da..7afa0ea577 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -41,8 +41,10 @@ protected:
 
 	void cLoop();
 	void mWhile1();
+	void mWhile2();
 	void mWhile(int param1);
 	void loadBackground(int param1, int param2);
+	void plotInactive();
 	void setInactive();
 	void boatWalls(int param1, int param2);
 
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 52eead7c0b..e624b0abd5 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -75,7 +75,9 @@ void MartianRoom::reloadRoom() {
 void MartianRoom::reloadRoom1() {
 	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
-		_vm->_inactive = _vm->_files->loadFile("MAYA.LZ");
+		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
+		_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
+		delete spriteData;
 		_vm->_currentCharFlag = false;
 	}
 
-- 
cgit v1.2.3


From 2afca5a06eafff24b2892c7270ab994b04ffb8d4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 16 Sep 2014 22:12:24 +0200
Subject: ACCESS: Fix bool/int comparisons and assignments

---
 engines/access/amazon/amazon_scripts.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8c172334a5..8d63da2c8f 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -271,11 +271,11 @@ void AmazonScripts::plotInactive() {
 		_vm->_inactive._spritesPtr = _vm->_player->_playerSprites;
 		_vm->_player->_playerSprites = tmp;
 		_game->_charSegSwitch = false;
-	} else if (_game->_jasMayaFlag != _game->_currentCharFlag) {
+	} else if (_game->_jasMayaFlag != (_game->_currentCharFlag ? 1 : 0)) {
 		if (_vm->_player->_playerOff) {
-			_game->_jasMayaFlag = _game->_currentCharFlag;
+			_game->_jasMayaFlag = (_game->_currentCharFlag ? 1 : 0);
 		} else {
-			_game->_currentCharFlag = _game->_jasMayaFlag;
+			_game->_currentCharFlag = (_game->_jasMayaFlag == 1);
 			int tmpX = _game->_rawInactiveX;
 			int tmpY = _game->_rawInactiveY;
 			_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
-- 
cgit v1.2.3


From a597838490981e89ddefcc79fb21127044802b25 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 18 Sep 2014 08:34:47 +0200
Subject: ACCESS: Implement guard()

---
 engines/access/amazon/amazon_scripts.cpp | 69 +++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  3 ++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8d63da2c8f..a932dad216 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -236,6 +236,73 @@ void AmazonScripts::mWhile(int param1) {
 	}
 }
 
+void AmazonScripts::guardSee() {
+	warning("TODO: guardSee()");
+}
+
+void AmazonScripts::setGuardFrame() {
+	warning("TODO: setGuardFrame()");
+}
+
+void AmazonScripts::guard() {
+	if (_vm->_timers[8]._flag != 0)
+		return;
+
+	++_vm->_timers[8]._flag;
+	++_game->_guard._guardCel;
+	int curCel = _game->_guard._guardCel;
+
+	switch (_game->_guardLocation) {
+	case 1:
+		if (curCel <= 8 || curCel > 13)
+			_game->_guard._guardCel = curCel = 8;
+
+		_game->_guard._position.y = _vm->_player->_walkOffDown[curCel - 8];
+		guardSee();
+		if (_game->_guard._position.y >= 272) {
+			_game->_guard._position.y = 272;
+			_game->_guardLocation = 2;
+		}
+		break;
+	case 2:
+		if (curCel <= 43 || curCel > 48)
+			_game->_guard._guardCel = curCel = 43;
+
+		_game->_guard._position.x = _vm->_player->_walkOffLeft[curCel - 43];
+		guardSee();
+		if (_game->_guard._position.x <= 56) {
+			_game->_guard._position.x = 56;
+			_game->_guardLocation = 3;
+		}
+		break;
+	case 3:
+		if (curCel <= 0 || curCel > 5)
+			_game->_guard._guardCel = curCel = 0;
+
+		_game->_guard._position.y = _vm->_player->_walkOffUp[curCel];
+		guardSee();
+		if (_game->_guard._position.y <= 89) {
+			_game->_guard._position.y = 89;
+			_game->_guardLocation = 4;
+			warning("CHECME: unused flag121");
+		}
+		break;
+	default:
+		if (curCel <= 43 || curCel > 48)
+			_game->_guard._guardCel = curCel = 43;
+
+		_game->_guard._position.x = _vm->_player->_walkOffRight[curCel - 43];
+		guardSee();
+		if (_game->_guard._position.x >= 127) {
+			_game->_guard._position.x = 127;
+			_game->_guardLocation = 1;
+		}
+		break;
+	}
+
+	setGuardFrame();
+}
+
 void AmazonScripts::loadBackground(int param1, int param2) {
 	_vm->_files->_loadPalFlag = false;
 	_vm->_files->loadScreen(param1, param2);
@@ -320,7 +387,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		mWhile(param1);
 		break;
 	case 9:
-		warning("TODO GUARD");
+		guard();
 		break;
 	case 10:
 		warning("TODO NEWMUSIC");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 7afa0ea577..50bd2ac9b1 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -43,6 +43,9 @@ protected:
 	void mWhile1();
 	void mWhile2();
 	void mWhile(int param1);
+	void guardSee();
+	void setGuardFrame();
+	void guard();
 	void loadBackground(int param1, int param2);
 	void plotInactive();
 	void setInactive();
-- 
cgit v1.2.3


From cf63da941cf7b7162551f6d660f5dbbda3150239 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 10 Oct 2014 16:40:46 +0700
Subject: ZVISION: Action:region and visual effects implemented.

---
 engines/zvision/graphics/effect.h                |  83 +++++++++
 engines/zvision/graphics/effects/fog.cpp         | 174 ++++++++++++++++++
 engines/zvision/graphics/effects/fog.h           |  52 ++++++
 engines/zvision/graphics/effects/light.cpp       | 110 ++++++++++++
 engines/zvision/graphics/effects/light.h         |  53 ++++++
 engines/zvision/graphics/effects/wave.cpp        | 146 +++++++++++++++
 engines/zvision/graphics/effects/wave.h          |  51 ++++++
 engines/zvision/graphics/render_manager.cpp      | 218 ++++++++++++++++++++++-
 engines/zvision/graphics/render_manager.h        |  14 ++
 engines/zvision/module.mk                        |   4 +
 engines/zvision/scripting/actions.cpp            |  80 +++++++++
 engines/zvision/scripting/actions.h              |  16 ++
 engines/zvision/scripting/scr_file_handling.cpp  |   2 +-
 engines/zvision/scripting/script_manager.h       |   4 +-
 engines/zvision/scripting/sidefx/region_node.cpp |  56 ++++++
 engines/zvision/scripting/sidefx/region_node.h   |  57 ++++++
 16 files changed, 1115 insertions(+), 5 deletions(-)
 create mode 100644 engines/zvision/graphics/effect.h
 create mode 100644 engines/zvision/graphics/effects/fog.cpp
 create mode 100644 engines/zvision/graphics/effects/fog.h
 create mode 100644 engines/zvision/graphics/effects/light.cpp
 create mode 100644 engines/zvision/graphics/effects/light.h
 create mode 100644 engines/zvision/graphics/effects/wave.cpp
 create mode 100644 engines/zvision/graphics/effects/wave.h
 create mode 100644 engines/zvision/scripting/sidefx/region_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/region_node.h

diff --git a/engines/zvision/graphics/effect.h b/engines/zvision/graphics/effect.h
new file mode 100644
index 0000000000..c6653c6037
--- /dev/null
+++ b/engines/zvision/graphics/effect.h
@@ -0,0 +1,83 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef EFFECT_H_INCLUDED
+#define EFFECT_H_INCLUDED
+
+#include "common/rect.h"
+#include "common/list.h"
+#include "graphics/surface.h"
+
+#include "zvision/zvision.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class Effect {
+public:
+
+	Effect(ZVision *engine, uint32 key, Common::Rect region, bool ported) : _engine(engine), _key(key), _region(region), _ported(ported) {
+		_surface.create(_region.width(), _region.height(), _engine->_pixelFormat);
+	}
+	virtual ~Effect() {}
+
+	uint32 getKey() {
+		return _key;
+	}
+
+	Common::Rect getRegion() {
+		return _region;
+	}
+
+	bool isPort() {
+		return _ported;
+	}
+
+	virtual const Graphics::Surface *draw(const Graphics::Surface &srcSubRect) {
+		return &_surface;
+	}
+
+	virtual void update() {}
+
+protected:
+	ZVision *_engine;
+	uint32 _key;
+	Common::Rect _region;
+	bool _ported;
+	Graphics::Surface _surface;
+
+// Static member functions
+public:
+
+};
+
+struct EffectMapUnit {
+	uint32 count;
+	bool inEffect;
+};
+
+typedef Common::List<EffectMapUnit> EffectMap;
+
+} // End of namespace ZVision
+
+#endif // EFFECT_H_INCLUDED
diff --git a/engines/zvision/graphics/effects/fog.cpp b/engines/zvision/graphics/effects/fog.cpp
new file mode 100644
index 0000000000..b6c5e7b011
--- /dev/null
+++ b/engines/zvision/graphics/effects/fog.cpp
@@ -0,0 +1,174 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/graphics/effects/fog.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+
+
+namespace ZVision {
+
+FogFx::FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds):
+	Effect(engine, key, region, ported) {
+
+	_map = Map;
+
+	_r = 0;
+	_g = 0;
+	_b = 0;
+
+	_pos = 0;
+
+	if (_engine->getSearchManager()->hasFile(clouds))
+		_engine->getRenderManager()->readImageToSurface(clouds, _fog);
+	else
+		_engine->getRenderManager()->readImageToSurface("cloud.tga", _fog);
+
+	_mp.resize(_fog.h);
+	for (int16 i = 0; i < _fog.h; i++) {
+		_mp[i].resize(_fog.w);
+		for (int16 j = 0; j < _fog.w; j++)
+			_mp[i][j] = true;
+	}
+
+	for (uint8 i = 0; i < 32; i++)
+		_colorMap[i] = 0;
+}
+
+FogFx::~FogFx() {
+	if (_map)
+		delete _map;
+
+	for (uint16 i = 0; i < _mp.size(); i++)
+		_mp[i].clear();
+	_mp.clear();
+}
+
+const Graphics::Surface *FogFx::draw(const Graphics::Surface &srcSubRect) {
+	_surface.copyFrom(srcSubRect);
+	EffectMap::iterator it = _map->begin();
+
+	uint32 cnt = 0;
+
+	for (uint16 j = 0; j < _surface.h; j++) {
+		uint16 *lineBuf = (uint16 *)_surface.getBasePtr(0, j);
+
+		for (uint16 i = 0; i < _surface.w; i++) {
+			if (it->inEffect) {
+				// Not 100% equivalent, but looks nice and not buggy
+				uint8 sr, sg, sb;
+				_engine->_pixelFormat.colorToRGB(lineBuf[i], sr, sg, sb);
+				uint16 fogColor = *(uint16 *)_fog.getBasePtr((i + _pos) % _fog.w, j);
+				uint8 dr, dg, db;
+				_engine->_pixelFormat.colorToRGB(_colorMap[fogColor & 0x1F], dr, dg, db);
+				uint16 fr = dr + sr;
+				if (fr > 255)
+					fr = 255;
+				uint16 fg = dg + sg;
+				if (fg > 255)
+					fg = 255;
+				uint16 fb = db + sb;
+				if (fb > 255)
+					fb = 255;
+				lineBuf[i] = _engine->_pixelFormat.RGBToColor(fr, fg, fb);
+			}
+			cnt++;
+			if (cnt >= it->count) {
+				it++;
+				cnt = 0;
+			}
+			if (it == _map->end())
+				break;
+		}
+		if (it == _map->end())
+			break;
+	}
+
+	return &_surface;
+}
+
+void FogFx::update() {
+	_pos += _engine->getScriptManager()->getStateValue(StateKey_EF9_Speed);
+	_pos %= _fog.w;
+
+	uint8 dr = _engine->getScriptManager()->getStateValue(StateKey_EF9_R);
+	uint8 dg = _engine->getScriptManager()->getStateValue(StateKey_EF9_G);
+	uint8 db = _engine->getScriptManager()->getStateValue(StateKey_EF9_B);
+	dr = CLIP((int)dr, 0, 31);
+	dg = CLIP((int)dg, 0, 31);
+	db = CLIP((int)db, 0, 31);
+
+	if (dr != _r || dg != _g || db != _b) {
+		if (_r > dr)
+			_r--;
+		else if (_r < dr)
+			_r++;
+
+		if (_g > dg)
+			_g--;
+		else if (_g < dg)
+			_g++;
+
+		if (_b > db)
+			_b--;
+		else if (_b < db)
+			_b++;
+
+		// Not 100% equivalent, but looks nice and not buggy
+
+		_colorMap[31] = _engine->_pixelFormat.RGBToColor(_r << 3, _g << 3, _b << 3);
+
+		for (uint8 i = 0; i < 31; i++) {
+			float perc = (float)i / 31.0;
+			uint8 cr = (float)_r * perc;
+			uint8 cg = (float)_g * perc;
+			uint8 cb = (float)_b * perc;
+			_colorMap[i] = _engine->_pixelFormat.RGBToColor(cr << 3, cg << 3, cb << 3);
+		}
+	}
+
+	for (uint16 j = 0; j < _fog.h; j++) {
+		uint16 *pix = (uint16 *)_fog.getBasePtr(0, j);
+
+		for (uint16 i = 0; i < _fog.w; i++) {
+			if (_mp[j][i]) {
+				if ((pix[i] & 0x1F) == 0x1F) {
+					pix[i]--;
+					_mp[j][i] = false;
+				} else
+					pix[i]++;
+			} else {
+				if ((pix[i] & 0x1F) == 0) {
+					pix[i]++;
+					_mp[j][i] = true;
+				} else
+					pix[i]--;
+			}
+		}
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/effects/fog.h b/engines/zvision/graphics/effects/fog.h
new file mode 100644
index 0000000000..62dd1f9473
--- /dev/null
+++ b/engines/zvision/graphics/effects/fog.h
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef FOGFX_H_INCLUDED
+#define FOGFX_H_INCLUDED
+
+#include "zvision/graphics/effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class FogFx : public Effect {
+public:
+
+	FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds);
+	~FogFx();
+
+	const Graphics::Surface *draw(const Graphics::Surface &srcSubRect);
+
+	void update();
+
+private:
+	EffectMap *_map;
+	Graphics::Surface _fog;
+	uint8 _r, _g, _b;
+	int32 _pos;
+	Common::Array< Common::Array< bool > > _mp;
+	uint16 _colorMap[32];
+};
+} // End of namespace ZVision
+
+#endif // FOGFX_H_INCLUDED
diff --git a/engines/zvision/graphics/effects/light.cpp b/engines/zvision/graphics/effects/light.cpp
new file mode 100644
index 0000000000..9bff077051
--- /dev/null
+++ b/engines/zvision/graphics/effects/light.cpp
@@ -0,0 +1,110 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/graphics/effects/light.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+
+
+namespace ZVision {
+
+LightFx::LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD, int8 maxD):
+	Effect(engine, key, region, ported) {
+	_map = Map;
+	_delta = delta;
+	_up = true;
+	_pos = 0;
+
+	_minD = minD;
+	if (_minD < -delta)
+		_minD = -delta;
+
+	_maxD = maxD;
+	if (_maxD > delta)
+		_maxD = delta;
+}
+
+LightFx::~LightFx() {
+	if (_map)
+		delete _map;
+}
+
+const Graphics::Surface *LightFx::draw(const Graphics::Surface &srcSubRect) {
+	_surface.copyFrom(srcSubRect);
+	EffectMap::iterator it = _map->begin();
+	uint32 cnt = 0;
+
+	uint32 dcolor = 0;
+
+	if (_pos < 0) {
+		uint8 cc = ((-_pos) & 0x1F) << 3;
+		dcolor = _engine->_pixelFormat.RGBToColor(cc, cc, cc);
+	} else {
+		uint8 cc = (_pos & 0x1F) << 3;
+		dcolor = _engine->_pixelFormat.RGBToColor(cc, cc, cc);
+	}
+
+	for (uint16 j = 0; j < _surface.h; j++) {
+		uint16 *lineBuf = (uint16 *)_surface.getBasePtr(0, j);
+
+		for (uint16 i = 0; i < _surface.w; i++) {
+			if (it->inEffect) {
+				if (_pos < 0) {
+					lineBuf[i] -= dcolor;
+				} else {
+					lineBuf[i] += dcolor;
+				}
+			}
+			cnt++;
+			if (cnt >= it->count) {
+				it++;
+				cnt = 0;
+			}
+			if (it == _map->end())
+				break;
+		}
+		if (it == _map->end())
+			break;
+	}
+
+	return &_surface;
+}
+
+void LightFx::update() {
+	if (_up)
+		_pos++;
+	else
+		_pos--;
+
+	if (_pos <= _minD) {
+		_up = !_up;
+		_pos = _minD;
+	} else if (_pos >= _maxD) {
+		_up = !_up;
+		_pos = _maxD;
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/effects/light.h b/engines/zvision/graphics/effects/light.h
new file mode 100644
index 0000000000..ae87d66cb3
--- /dev/null
+++ b/engines/zvision/graphics/effects/light.h
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef LIGHTFX_H_INCLUDED
+#define LIGHTFX_H_INCLUDED
+
+#include "zvision/graphics/effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class LightFx : public Effect {
+public:
+
+	LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD = -127, int8 maxD = 127);
+	~LightFx();
+
+	const Graphics::Surface *draw(const Graphics::Surface &srcSubRect);
+
+	void update();
+
+private:
+	EffectMap *_map;
+	int32 _delta;
+	bool _up;
+	int32 _pos;
+
+	int8 _minD;
+	int8 _maxD;
+};
+} // End of namespace ZVision
+
+#endif // LIGHTFX_H_INCLUDED
diff --git a/engines/zvision/graphics/effects/wave.cpp b/engines/zvision/graphics/effects/wave.cpp
new file mode 100644
index 0000000000..88239f3cad
--- /dev/null
+++ b/engines/zvision/graphics/effects/wave.cpp
@@ -0,0 +1,146 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/graphics/effects/wave.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+
+
+namespace ZVision {
+
+WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 s_x, int16 s_y, float ampl, float waveln, float spd):
+	Effect(engine, key, region, ported) {
+
+	_frame = 0;
+	_frame_cnt = frames;
+
+	_ampls.resize(_frame_cnt);
+	_hw = _region.width() / 2;
+	_hh = _region.height() / 2;
+
+	int32 frmsize = _hw * _hh;
+
+	float phase = 0;
+
+	int16 w_4 = _hw / 2;
+	int16 h_4 = _hh / 2;
+
+	for (int16 i = 0; i < _frame_cnt; i++) {
+		_ampls[i].resize(frmsize);
+
+		for (int16 y = 0; y < _hh; y++)
+			for (int16 x = 0; x < _hw; x++) {
+				int16 dx = (x - w_4);
+				int16 dy = (y - h_4);
+
+				_ampls[i][x + y * _hw] = ampl * sin(sqrt(dx * dx / (float)s_x + dy * dy / (float)s_y) / (-waveln * 3.1415926) + phase);
+			}
+		phase += spd;
+	}
+}
+
+WaveFx::~WaveFx() {
+	for (uint16 i = 0; i < _ampls.size(); i++)
+		_ampls[i].clear();
+	_ampls.clear();
+}
+
+const Graphics::Surface *WaveFx::draw(const Graphics::Surface &srcSubRect) {
+	for (int16 y = 0; y < _hh; y++) {
+		uint16 *abc  = (uint16 *)_surface.getBasePtr(0, y);
+		uint16 *abc2  = (uint16 *)_surface.getBasePtr(0, _hh + y);
+		uint16 *abc3  = (uint16 *)_surface.getBasePtr(_hw, y);
+		uint16 *abc4  = (uint16 *)_surface.getBasePtr(_hw, _hh + y);
+
+		for (int16 x = 0; x < _hw; x++) {
+			int8 amnt = _ampls[_frame][x + _hw * y];
+
+			int16 n_x = x + amnt;
+			int16 n_y = y + amnt;
+
+			if (n_x < 0)
+				n_x = 0;
+			if (n_x >= _region.width())
+				n_x = _region.width() - 1;
+			if (n_y < 0)
+				n_y = 0;
+			if (n_y >= _region.height())
+				n_y = _region.height() - 1;
+			*abc = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
+
+			n_x = x + amnt + _hw;
+			n_y = y + amnt;
+
+			if (n_x < 0)
+				n_x = 0;
+			if (n_x >= _region.width())
+				n_x = _region.width() - 1;
+			if (n_y < 0)
+				n_y = 0;
+			if (n_y >= _region.height())
+				n_y = _region.height() - 1;
+			*abc3 = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
+
+			n_x = x + amnt;
+			n_y = y + amnt + _hh;
+
+			if (n_x < 0)
+				n_x = 0;
+			if (n_x >= _region.width())
+				n_x = _region.width() - 1;
+			if (n_y < 0)
+				n_y = 0;
+			if (n_y >= _region.height())
+				n_y = _region.height() - 1;
+			*abc2 = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
+
+			n_x = x + amnt + _hw;
+			n_y = y + amnt + _hh;
+
+			if (n_x < 0)
+				n_x = 0;
+			if (n_x >= _region.width())
+				n_x = _region.width() - 1;
+			if (n_y < 0)
+				n_y = 0;
+			if (n_y >= _region.height())
+				n_y = _region.height() - 1;
+			*abc4 = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
+
+			abc++;
+			abc2++;
+			abc3++;
+			abc4++;
+		}
+	}
+
+	return &_surface;
+}
+
+void WaveFx::update() {
+	_frame = (_frame + 1) % _frame_cnt;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/effects/wave.h b/engines/zvision/graphics/effects/wave.h
new file mode 100644
index 0000000000..0046dfceec
--- /dev/null
+++ b/engines/zvision/graphics/effects/wave.h
@@ -0,0 +1,51 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef WAVEFX_H_INCLUDED
+#define WAVEFX_H_INCLUDED
+
+#include "common/array.h"
+#include "zvision/graphics/effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class WaveFx : public Effect {
+public:
+
+	WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 s_x, int16 s_y, float ampl, float waveln, float spd);
+	~WaveFx();
+
+	const Graphics::Surface *draw(const Graphics::Surface &srcSubRect);
+
+	void update();
+
+private:
+	int16 _frame;
+	int16 _frame_cnt;
+	int16 _hw, _hh;
+	Common::Array< Common::Array< int8 > > _ampls;
+};
+} // End of namespace ZVision
+
+#endif // WAVEFX_H_INCLUDED
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 5aa0d752d0..0aa062214f 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -54,6 +54,7 @@ RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowH
 	  _renderTable(_wrkWidth, _wrkHeight) {
 
 	_wrkWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
+	_effectWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
 	_outWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
 	_menuWnd.create(windowWidth, workingWindow.top, _pixelFormat);
 	_subWnd.create(windowWidth, windowHeight - workingWindow.bottom, _pixelFormat);
@@ -67,21 +68,55 @@ RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowH
 RenderManager::~RenderManager() {
 	_curBkg.free();
 	_wrkWnd.free();
+	_effectWnd.free();
 	_outWnd.free();
+	_menuWnd.free();
+	_subWnd.free();
 }
 
 void RenderManager::renderBackbufferToScreen() {
 	Graphics::Surface *out = &_outWnd;
+	Graphics::Surface *in = &_wrkWnd;
+
+	if (!_effects.empty()) {
+		bool copied = false;
+		Common::Rect windRect(_wrkWidth, _wrkHeight);
+		for (effectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
+			Common::Rect rect = (*it)->getRegion();
+			Common::Rect scrPlace = rect;
+			if ((*it)->isPort())
+				scrPlace = bkgRectToScreen(scrPlace);
+			if (windRect.intersects(scrPlace)) {
+				if (!copied) {
+					copied = true;
+					_effectWnd.copyFrom(_wrkWnd);
+					in = &_effectWnd;
+				}
+				const Graphics::Surface *post;
+				if ((*it)->isPort())
+					post = (*it)->draw(_curBkg.getSubArea(rect));
+				else
+					post = (*it)->draw(_effectWnd.getSubArea(rect));
+				blitSurfaceToSurface(*post, _effectWnd, scrPlace.left, scrPlace.top);
+				scrPlace.clip(windRect);
+				if (_wrkWndDirtyRect .isEmpty()) {
+					_wrkWndDirtyRect = scrPlace;
+				} else {
+					_wrkWndDirtyRect.extend(scrPlace);
+				}
+			}
+		}
+	}
 
 	RenderTable::RenderState state = _renderTable.getRenderState();
 	if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
 		if (!_wrkWndDirtyRect.isEmpty()) {
-			_renderTable.mutateImage(&_outWnd, &_wrkWnd);
+			_renderTable.mutateImage(&_outWnd, in);
 			out = &_outWnd;
 			_outWndDirtyRect = Common::Rect(_wrkWidth, _wrkHeight);
 		}
 	} else {
-		out = &_wrkWnd;
+		out = in;
 		_outWndDirtyRect = _wrkWndDirtyRect;
 	}
 
@@ -832,4 +867,183 @@ Common::Point RenderManager::getBkgSize() {
 	return Common::Point(_bkgWidth, _bkgHeight);
 }
 
+void RenderManager::addEffect(Effect *_effect) {
+	_effects.push_back(_effect);
+}
+
+void RenderManager::deleteEffect(uint32 ID) {
+	for (effectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
+		if ((*it)->getKey() == ID) {
+			delete *it;
+			it = _effects.erase(it);
+		}
+	}
+}
+
+Common::Rect RenderManager::bkgRectToScreen(const Common::Rect &src) {
+	Common::Rect tmp = src;
+	RenderTable::RenderState state = _renderTable.getRenderState();
+
+	if (state == RenderTable::PANORAMA) {
+		if (_bkgOff < _screenCenterX) {
+			Common::Rect rScreen(_screenCenterX + _bkgOff, _wrkHeight);
+			Common::Rect lScreen(_wrkWidth - rScreen.width(), _wrkHeight);
+			lScreen.translate(_bkgWidth - lScreen.width(), 0);
+			lScreen.clip(src);
+			rScreen.clip(src);
+			if (rScreen.width() < lScreen.width()) {
+				tmp.translate(_screenCenterX - _bkgOff - _bkgWidth, 0);
+			} else {
+				tmp.translate(_screenCenterX - _bkgOff, 0);
+			}
+		} else if (_bkgWidth - _bkgOff < _screenCenterX) {
+			Common::Rect rScreen(_screenCenterX - (_bkgWidth - _bkgOff), _wrkHeight);
+			Common::Rect lScreen(_wrkWidth - rScreen.width(), _wrkHeight);
+			lScreen.translate(_bkgWidth - lScreen.width(), 0);
+			lScreen.clip(src);
+			rScreen.clip(src);
+			if (lScreen.width() < rScreen.width()) {
+				tmp.translate(_screenCenterX + (_bkgWidth - _bkgOff), 0);
+			} else {
+				tmp.translate(_screenCenterX - _bkgOff, 0);
+			}
+		} else {
+			tmp.translate(_screenCenterX - _bkgOff, 0);
+		}
+	} else if (state == RenderTable::TILT) {
+		tmp.translate(0, (_screenCenterY - _bkgOff));
+	}
+
+	return tmp;
+}
+
+EffectMap *RenderManager::makeEffectMap(const Common::Point &xy, int16 depth, const Common::Rect &rect, int8 *_minComp, int8 *_maxComp) {
+	Common::Rect bkgRect(_bkgWidth, _bkgHeight);
+	if (!bkgRect.contains(xy))
+		return NULL;
+
+	if (!bkgRect.intersects(rect))
+		return NULL;
+
+	uint16 color = *(uint16 *)_curBkg.getBasePtr(xy.x, xy.y);
+	uint8 stC1, stC2, stC3;
+	_curBkg.format.colorToRGB(color, stC1, stC2, stC3);
+	EffectMap *newMap = new EffectMap;
+
+	EffectMapUnit unit;
+	unit.count = 0;
+	unit.inEffect = false;
+
+	int16 w = rect.width();
+	int16 h = rect.height();
+
+	bool first = true;
+
+	uint8 minComp = MIN(MIN(stC1, stC2), stC3);
+	uint8 maxComp = MAX(MAX(stC1, stC2), stC3);
+
+	uint8 depth8 = depth << 3;
+
+	for (int16 j = 0; j < h; j++) {
+		uint16 *pix = (uint16 *)_curBkg.getBasePtr(rect.left, rect.top + j);
+		for (int16 i = 0; i < w; i++) {
+			uint16 curClr = pix[i];
+			uint8 cC1, cC2, cC3;
+			_curBkg.format.colorToRGB(curClr, cC1, cC2, cC3);
+
+			bool use = false;
+
+			if (curClr == color)
+				use = true;
+			else if (curClr > color) {
+				if ((cC1 - stC1 < depth8) &&
+				        (cC2 - stC2 < depth8) &&
+				        (cC3 - stC3 < depth8))
+					use = true;
+			} else { /* if (curClr < color) */
+				if ((stC1 - cC1 < depth8) &&
+				        (stC2 - cC2 < depth8) &&
+				        (stC3 - cC3 < depth8))
+					use = true;
+			}
+
+			if (first) {
+				unit.inEffect = use;
+				first = false;
+			}
+
+			if (use) {
+				uint8 cMinComp = MIN(MIN(cC1, cC2), cC3);
+				uint8 cMaxComp = MAX(MAX(cC1, cC2), cC3);
+				if (cMinComp < minComp)
+					minComp = cMinComp;
+				if (cMaxComp > maxComp)
+					maxComp = cMaxComp;
+			}
+
+			if (unit.inEffect == use)
+				unit.count++;
+			else {
+				newMap->push_back(unit);
+				unit.count = 1;
+				unit.inEffect = use;
+			}
+		}
+	}
+	newMap->push_back(unit);
+
+	if (_minComp) {
+		if (minComp - depth8 < 0)
+			*_minComp = -(minComp >> 3);
+		else
+			*_minComp = -depth;
+	}
+	if (_maxComp) {
+		if ((int16)maxComp + (int16)depth8 > 255)
+			*_maxComp = (255 - maxComp) >> 3;
+		else
+			*_maxComp = depth;
+	}
+
+	return newMap;
+}
+
+EffectMap *RenderManager::makeEffectMap(const Graphics::Surface &surf, uint16 transp) {
+	EffectMapUnit unit;
+	unit.count = 0;
+	unit.inEffect = false;
+
+	int16 w = surf.w;
+	int16 h = surf.h;
+
+	EffectMap *newMap = new EffectMap;
+
+	bool first = true;
+
+	for (int16 j = 0; j < h; j++) {
+		const uint16 *pix = (const uint16 *)surf.getBasePtr(0, j);
+		for (int16 i = 0; i < w; i++) {
+			bool use = false;
+			if (pix[i] != transp)
+				use = true;
+
+			if (first) {
+				unit.inEffect = use;
+				first = false;
+			}
+
+			if (unit.inEffect == use)
+				unit.count++;
+			else {
+				newMap->push_back(unit);
+				unit.count = 1;
+				unit.inEffect = use;
+			}
+		}
+	}
+	newMap->push_back(unit);
+
+	return newMap;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 24234e28e1..665a27bf64 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -31,6 +31,8 @@
 
 #include "graphics/surface.h"
 
+#include "effect.h"
+
 
 class OSystem;
 
@@ -68,6 +70,7 @@ private:
 //	};
 //
 	typedef Common::HashMap<uint16, oneSub> subMap;
+	typedef Common::List<Effect *> effectsList;
 
 private:
 	ZVision *_engine;
@@ -93,6 +96,8 @@ private:
 
 	Common::Rect _menuWndDirtyRect;
 
+	Graphics::Surface _effectWnd;
+
 
 	// A buffer the exact same size as the workingWindow
 	// This buffer stores everything un-warped, then does a warp at the end of the frame
@@ -151,6 +156,8 @@ private:
 	/** Holds any 'leftover' milliseconds between frames */
 	//uint _accumulatedVelocityMilliseconds;
 
+	effectsList _effects;
+
 public:
 	void initialize();
 
@@ -267,6 +274,13 @@ public:
 	 */
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination);
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed);
+
+	void addEffect(Effect *_effect);
+	void deleteEffect(uint32 ID);
+	EffectMap *makeEffectMap(const Common::Point &xy, int16 depth, const Common::Rect &rect, int8 *minD, int8 *maxD);
+	EffectMap *makeEffectMap(const Graphics::Surface &surf, uint16 transp);
+
+	Common::Rect bkgRectToScreen(const Common::Rect &src);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 6734fde6e2..872b48f775 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -13,6 +13,9 @@ MODULE_OBJS := \
 	cursors/cursor.o \
 	detection.o \
 	fonts/truetype_font.o \
+	graphics/effects/fog.o \
+	graphics/effects/light.o \
+	graphics/effects/wave.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
 	scripting/actions.o \
@@ -33,6 +36,7 @@ MODULE_OBJS := \
 	scripting/sidefx.o \
 	scripting/sidefx/animation_node.o \
 	scripting/sidefx/music_node.o \
+	scripting/sidefx/region_node.o \
 	scripting/sidefx/syncsound_node.o \
 	scripting/sidefx/timer_node.o \
 	scripting/sidefx/ttytext_node.o \
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 399a81d898..839eb1f92c 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -34,7 +34,13 @@
 #include "zvision/scripting/sidefx/syncsound_node.h"
 #include "zvision/scripting/sidefx/animation_node.h"
 #include "zvision/scripting/sidefx/ttytext_node.h"
+#include "zvision/scripting/sidefx/region_node.h"
 #include "zvision/scripting/controls/titler_control.h"
+#include "zvision/graphics/render_table.h"
+#include "zvision/graphics/effect.h"
+#include "zvision/graphics/effects/fog.h"
+#include "zvision/graphics/effects/light.h"
+#include "zvision/graphics/effects/wave.h"
 
 #include "common/file.h"
 
@@ -476,6 +482,80 @@ bool ActionQuit::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionRegion
+//////////////////////////////////////////////////////////////////////////////
+
+ActionRegion::ActionRegion(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+
+	char art[64];
+	char custom[64];
+
+	int32 x1, x2, y1, y2;
+
+	sscanf(line.c_str(), "%s %d %d %d %d %hu %hu %hu %hu %s", art, &x1, &y1, &x2, &y2, &_delay, &_type, &_unk1, &_unk2, custom);
+	_art = Common::String(art);
+	_custom = Common::String(custom);
+	_rect = Common::Rect(x1, y1, x2 + 1, y2 + 1);
+}
+
+ActionRegion::~ActionRegion() {
+	_engine->getScriptManager()->killSideFx(_slotkey);
+}
+
+bool ActionRegion::execute() {
+	if (_engine->getScriptManager()->getSideFX(_slotkey))
+		return true;
+
+	Effect *effct = NULL;
+	switch (_type) {
+	case 0: {
+		uint16 s_x, s_y, frames;
+		double amplitude, waveln, speed;
+		sscanf(_custom.c_str(), "%hu,%hu,%hu,%lf,%lf,%lf,", &s_x, &s_y, &frames, &amplitude, &waveln, &speed);
+		effct = new WaveFx(_engine, _slotkey, _rect, _unk1, frames, s_x, s_y, amplitude, waveln, speed);
+	}
+	break;
+	case 1: {
+		uint16 aX, aY, aD;
+		if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA)
+			sscanf(_art.c_str(), "useart[%hu,%hu,%hu]", &aY, &aX, &aD);
+		else
+			sscanf(_art.c_str(), "useart[%hu,%hu,%hu]", &aX, &aY, &aD);
+		int8 minD;
+		int8 maxD;
+		EffectMap *_map = _engine->getRenderManager()->makeEffectMap(Common::Point(aX, aY), aD, _rect, &minD, &maxD);
+		effct = new LightFx(_engine, _slotkey, _rect, _unk1, _map, atoi(_custom.c_str()), minD, maxD);
+	}
+	break;
+	case 9: {
+		int16 dum1;
+		int32 dum2;
+		char buf[64];
+		sscanf(_custom.c_str(), "%hd,%d,%s", &dum1, &dum2, buf);
+		Graphics::Surface tempMask;
+		_engine->getRenderManager()->readImageToSurface(_art, tempMask);
+		if (_rect.width() != tempMask.w)
+			_rect.setWidth(tempMask.w);
+		if (_rect.height() != tempMask.h)
+			_rect.setHeight(tempMask.h);
+
+		EffectMap *_map = _engine->getRenderManager()->makeEffectMap(tempMask, 0);
+		effct = new FogFx(_engine, _slotkey, _rect, _unk1, _map, Common::String(buf));
+	}
+	break;
+	default:
+		break;
+	}
+
+	if (effct) {
+		_engine->getScriptManager()->addSideFX(new RegionNode(_engine, _slotkey, effct, _delay));
+		_engine->getRenderManager()->addEffect(effct);
+	}
+
+	return true;
+}
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionRandom
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index de303a7b1b..5e34f6eaf0 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -317,6 +317,22 @@ public:
 	bool execute();
 };
 
+class ActionRegion : public ResultAction {
+public:
+	ActionRegion(ZVision *engine, int32 slotkey, const Common::String &line);
+	~ActionRegion();
+	bool execute();
+
+private:
+	Common::String _art;
+	Common::String _custom;
+	Common::Rect _rect;
+	uint16 _delay;
+	uint16 _type;
+	uint16 _unk1;
+	uint16 _unk2;
+};
+
 // TODO: See if this exists in ZGI. It doesn't in ZNem
 class ActionUnloadAnimation : public ResultAction {
 public:
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 04378f856f..8140d09a6a 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -266,7 +266,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("random", true)) {
 					actionList.push_back(new ActionRandom(_engine, slot, args));
 				} else if (act.matchString("region", true)) {
-					// TODO: Implement ActionRegion
+					actionList.push_back(new ActionRegion(_engine, slot, args));
 				} else if (act.matchString("restore_game", true)) {
 					// TODO: Implement ActionRestoreGame
 				} else if (act.matchString("rotate_to", true)) {
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 4d82f36aea..219cff9f45 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -87,9 +87,9 @@ enum StateKey {
 	StateKey_DebugCheats = 74,
 	StateKey_JapanFonts = 75,
 	StateKey_Brightness = 77,
-	StateKey_EF9_B = 91,
+	StateKey_EF9_R = 91,
 	StateKey_EF9_G = 92,
-	StateKey_EF9_R = 93,
+	StateKey_EF9_B = 93,
 	StateKey_EF9_Speed = 94,
 	StateKey_Inv_Cnt_Slot = 100,
 	StateKey_Inv_1_Slot = 101,
diff --git a/engines/zvision/scripting/sidefx/region_node.cpp b/engines/zvision/scripting/sidefx/region_node.cpp
new file mode 100644
index 0000000000..de613d8af2
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/region_node.cpp
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/region_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+
+namespace ZVision {
+
+RegionNode::RegionNode(ZVision *engine, uint32 key, Effect *effect, uint32 delay)
+	: SideFX(engine, key, SIDEFX_REGION) {
+	_effect = effect;
+	_delay = delay;
+	_timeLeft = 0;
+}
+
+RegionNode::~RegionNode() {
+	_engine->getRenderManager()->deleteEffect(_key);
+}
+
+bool RegionNode::process(uint32 deltaTimeInMillis) {
+	_timeLeft -= deltaTimeInMillis;
+
+	if (_timeLeft <= 0) {
+		_timeLeft = _delay;
+		if (_effect)
+			_effect->update();
+	}
+
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/region_node.h b/engines/zvision/scripting/sidefx/region_node.h
new file mode 100644
index 0000000000..ec716b6e3e
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/region_node.h
@@ -0,0 +1,57 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_REGION_NODE_H
+#define ZVISION_REGION_NODE_H
+
+#include "graphics/surface.h"
+
+#include "zvision/scripting/sidefx.h"
+#include "zvision/graphics/effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class RegionNode : public SideFX {
+public:
+	RegionNode(ZVision *engine, uint32 key, Effect *effect, uint32 delay);
+	~RegionNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	int32 _timeLeft;
+	uint32 _delay;
+	Effect *_effect;
+};
+
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From 002b8e692a9488ac91e043df2fe7dce34d52a771 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 10 Oct 2014 16:46:48 +0700
Subject: ZVISION: Fix default Tilt linScale

---
 engines/zvision/graphics/render_table.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 942420c700..2fc21b7566 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -55,7 +55,7 @@ void RenderTable::setRenderState(RenderState newState) {
 		break;
 	case TILT:
 		_tiltOptions.fieldOfView = 27.0f;
-		_tiltOptions.linearScale = 0.55f;
+		_tiltOptions.linearScale = 0.65f;
 		_tiltOptions.reverse = false;
 		break;
 	case FLAT:
-- 
cgit v1.2.3


From 7c9d8f22de461528ac5e3fbe9c1c69dcdaa1a908 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 10 Oct 2014 16:48:28 +0700
Subject: ZVISION: Implement dynamic tilt up/down border

---
 engines/zvision/graphics/render_table.cpp | 5 +++++
 engines/zvision/graphics/render_table.h   | 3 +++
 engines/zvision/zvision.cpp               | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 2fc21b7566..9bf40d3745 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -199,6 +199,7 @@ void RenderTable::generateTiltLookupTable() {
 
 	float fovInRadians = (_tiltOptions.fieldOfView * M_PI / 180.0f);
 	float cylinderRadius = halfWidth / tan(fovInRadians);
+	_tiltOptions.gap = cylinderRadius * atan2(halfHeight / cylinderRadius, 1.0) * _tiltOptions.linearScale;
 
 	for (uint y = 0; y < _numRows; ++y) {
 
@@ -259,4 +260,8 @@ void RenderTable::setTiltReverse(bool reverse) {
 	_tiltOptions.reverse = reverse;
 }
 
+float RenderTable::getTiltGap() {
+	return _tiltOptions.gap;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_table.h b/engines/zvision/graphics/render_table.h
index 0b4d6e3919..a268ee615f 100644
--- a/engines/zvision/graphics/render_table.h
+++ b/engines/zvision/graphics/render_table.h
@@ -57,6 +57,7 @@ private:
 		float fieldOfView;
 		float linearScale;
 		bool reverse;
+		float gap;
 	} _tiltOptions;
 
 public:
@@ -79,6 +80,8 @@ public:
 	void setTiltScale(float scale);
 	void setTiltReverse(bool reverse);
 
+	float getTiltGap();
+
 private:
 	void generatePanoramaLookupTable();
 	void generateTiltLookupTable();
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 24e15e0c86..a534e49c25 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -332,7 +332,7 @@ void ZVision::updateRotation() {
 			int16 new_pos = st_pos + _velocity * (1 - 2 * 0);
 
 			int16 scr_height = _renderManager->getBkgSize().y;
-			int16 tilt_gap = _workingWindow.height() / 2;
+			int16 tilt_gap = _renderManager->getRenderTable()->getTiltGap();
 
 			if (new_pos >= (scr_height - tilt_gap))
 				new_pos = scr_height - tilt_gap;
-- 
cgit v1.2.3


From ac74070af1d09cb9eb319b50716d2c3ee272c2a9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 10 Oct 2014 16:49:38 +0700
Subject: ZVISION: Lever blitter must scale image to rect

---
 engines/zvision/scripting/controls/lever_control.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 8072079435..84cd6fa598 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -370,12 +370,10 @@ void LeverControl::renderFrame(uint frameNumber) {
 	}
 
 	const Graphics::Surface *frameData;
-	int x = _animationCoords.left;
-	int y = _animationCoords.top;
 
 	frameData = _animation->getFrameData(frameNumber);
 	if (frameData)
-		_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
+		_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _animationCoords);
 }
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From a65ec38f8ddfb2a856619880d005ccd1a766623a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 10 Oct 2014 16:50:59 +0700
Subject: ZVISION: Fix code style

---
 engines/zvision/scripting/control.h                | 14 ++++++---
 .../zvision/scripting/controls/fist_control.cpp    | 30 +++++++++---------
 .../zvision/scripting/controls/paint_control.cpp   |  4 +--
 engines/zvision/scripting/controls/paint_control.h |  4 ++-
 .../zvision/scripting/controls/safe_control.cpp    |  4 +--
 engines/zvision/scripting/script_manager.cpp       | 36 +++++++++++-----------
 6 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 7c8a273419..8708f033af 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -40,7 +40,7 @@ class ZVision;
 class Control {
 public:
 
-    enum ControlType {
+	enum ControlType {
 		CONTROL_UNKNOW,
 		CONTROL_INPUT,
 		CONTROL_PUSHTGL,
@@ -63,7 +63,7 @@ public:
 	}
 
 	ControlType getType() {
-	    return _type;
+		return _type;
 	}
 
 	virtual void focus() {}
@@ -101,13 +101,17 @@ public:
 	 *
 	 * @param keycode    The key that was pressed
 	 */
-	virtual bool onKeyDown(Common::KeyState keyState) {return false;}
+	virtual bool onKeyDown(Common::KeyState keyState) {
+		return false;
+	}
 	/**
 	 * Called when a key is released. Default is NOP.
 	 *
 	 * @param keycode    The key that was pressed
 	 */
-	virtual bool onKeyUp(Common::KeyState keyState) {return false;}
+	virtual bool onKeyUp(Common::KeyState keyState) {
+		return false;
+	}
 	/**
 	 * Processes the node given the deltaTime since last frame. Default is NOP.
 	 *
@@ -130,7 +134,7 @@ public:
 	static void parsePanoramaControl(ZVision *engine, Common::SeekableReadStream &stream);
 	static void parseTiltControl(ZVision *engine, Common::SeekableReadStream &stream);
 private:
-    ControlType _type;
+	ControlType _type;
 };
 
 // TODO: Implement InputControl
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 46b87ddb79..89aeb53be6 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -121,17 +121,17 @@ bool FistControl::process(uint32 deltaTimeInMillis) {
 		if (_frameCur <= _frameEnd) {
 			_frameTime -= deltaTimeInMillis;
 
-		if (_frameTime <= 0) {
-			_frameTime = _animation->frameTime();
+			if (_frameTime <= 0) {
+				_frameTime = _animation->frameTime();
 
-                renderFrame(_frameCur);
+				renderFrame(_frameCur);
 
-                _frameCur++;
+				_frameCur++;
 
-                if (_frameCur > _frameEnd)
-                    _engine->getScriptManager()->setStateValue(_animationId, 2);
+				if (_frameCur > _frameEnd)
+					_engine->getScriptManager()->setStateValue(_animationId, 2);
+			}
 		}
-        }
 
 	return false;
 }
@@ -142,7 +142,7 @@ bool FistControl::onMouseMove(const Common::Point &screenSpacePos, const Common:
 
 	if (mouseIn(screenSpacePos, backgroundImageSpacePos) >= 0) {
 		_engine->getCursorManager()->changeCursor(_cursor);
-	        return true;
+		return true;
 	}
 
 	return false;
@@ -160,7 +160,7 @@ bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 		uint32 oldStatus = _fiststatus;
 		_fiststatus ^= (1 << n_fist);
 
-		for(int i = 0; i < _numEntries; i++)
+		for (int i = 0; i < _numEntries; i++)
 			if (_entries[i]._bitsStrt == oldStatus && _entries[i]._bitsEnd == _fiststatus) {
 				_frameCur = _entries[i]._anmStrt;
 				_frameEnd = _entries[i]._anmEnd;
@@ -264,25 +264,25 @@ uint32 FistControl::readBits(const char *str) {
 
 int FistControl::mouseIn(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (_order) {
-		for(int i = 0; i < _fistnum; i++) {
+		for (int i = 0; i < _fistnum; i++) {
 			if (((_fiststatus >> i) & 1) == 1) {
-				for(uint j = 0; j < _fistsDwn[i].size(); j++)
+				for (uint j = 0; j < _fistsDwn[i].size(); j++)
 					if ((_fistsDwn[i])[j].contains(backgroundImageSpacePos))
 						return i;
 			} else {
-				for(uint j = 0; j < _fistsUp[i].size(); j++)
+				for (uint j = 0; j < _fistsUp[i].size(); j++)
 					if ((_fistsUp[i])[j].contains(backgroundImageSpacePos))
 						return i;
 			}
 		}
 	} else {
-		for(int i = _fistnum - 1; i >= 0; i--) {
+		for (int i = _fistnum - 1; i >= 0; i--) {
 			if (((_fiststatus >> i) & 1) == 1) {
-				for(uint j = 0; j < _fistsDwn[i].size(); j++)
+				for (uint j = 0; j < _fistsDwn[i].size(); j++)
 					if ((_fistsDwn[i])[j].contains(backgroundImageSpacePos))
 						return i;
 			} else {
-				for(uint j = 0; j < _fistsUp[i].size(); j++)
+				for (uint j = 0; j < _fistsUp[i].size(); j++)
 					if ((_fistsUp[i])[j].contains(backgroundImageSpacePos))
 						return i;
 			}
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index a350e9b599..2891f1b1f9 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -98,7 +98,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	}
 
 	if (_paint) {
-		_colorKey = _paint->format.RGBToColor(255,0,255);
+		_colorKey = _paint->format.RGBToColor(255, 0, 255);
 		_bkg = new Graphics::Surface;
 		_bkg->create(_rectangle.width(), _rectangle.height(), _paint->format);
 		_bkg->fillRect(Common::Rect(_rectangle.width(), _rectangle.height()), _colorKey);
@@ -194,7 +194,7 @@ Common::Rect PaintControl::paint(const Common::Point &point) {
 		brush_rect.translate(-point.x, -point.y);
 
 		Common::Rect bkg_rect = paint_rect;
-		bkg_rect.translate( -_rectangle.left, -_rectangle.top );
+		bkg_rect.translate(-_rectangle.left, -_rectangle.top);
 
 		for (int yy = 0; yy < brush_rect.height(); yy++) {
 			uint16 *mask = (uint16 *)_brush->getBasePtr(brush_rect.left, brush_rect.top + yy);
diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h
index c74431e681..54b96e8e4e 100644
--- a/engines/zvision/scripting/controls/paint_control.h
+++ b/engines/zvision/scripting/controls/paint_control.h
@@ -59,7 +59,9 @@ public:
 	 */
 	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 
-	bool process(uint32 deltaTimeInMillis) { return false; };
+	bool process(uint32 deltaTimeInMillis) {
+		return false;
+	};
 
 private:
 	/**
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index d5eff09502..ba809148a3 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -83,7 +83,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 			int y;
 
 			sscanf(values.c_str(), "%d %d", &x, &y);
-			_center = Common::Point(x,y);
+			_center = Common::Point(x, y);
 		} else if (param.matchString("dial_inner_radius", true)) {
 			_radius_inner = atoi(values.c_str());
 			_radius_inner_sq = _radius_inner * _radius_inner;
@@ -188,7 +188,7 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 
 			int16 m_state = (_num_states - ((((int16)dd + 540) % 360) / dp_state)) % _num_states;
 
-			int16 tmp2 = (m_state + _cur_state - _zero_pointer + _num_states - 1 ) % _num_states;
+			int16 tmp2 = (m_state + _cur_state - _zero_pointer + _num_states - 1) % _num_states;
 
 			_cur_frame = (_cur_state + _num_states - _start_pointer) % _num_states;
 
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 7a2854d230..fea3c2e199 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -160,28 +160,28 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 		Common::Event _event = _controlEvents.front();
 		Common::Point imageCoord;
 		switch (_event.type) {
-			case Common::EVENT_LBUTTONDOWN:
-				imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
-				onMouseDown(_event.mouse, imageCoord);
-				break;
-			case Common::EVENT_LBUTTONUP:
-				imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
-				onMouseUp(_event.mouse, imageCoord);
-				break;
-			case Common::EVENT_KEYDOWN:
-				onKeyDown(_event.kbd);
-				break;
-			case Common::EVENT_KEYUP:
-				onKeyUp(_event.kbd);
-				break;
-			default:
-				break;
+		case Common::EVENT_LBUTTONDOWN:
+			imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
+			onMouseDown(_event.mouse, imageCoord);
+			break;
+		case Common::EVENT_LBUTTONUP:
+			imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
+			onMouseUp(_event.mouse, imageCoord);
+			break;
+		case Common::EVENT_KEYDOWN:
+			onKeyDown(_event.kbd);
+			break;
+		case Common::EVENT_KEYUP:
+			onKeyUp(_event.kbd);
+			break;
+		default:
+			break;
 		}
 		_controlEvents.pop_front();
 	}
 
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
-		if ( (*iter)->process(deltaTimeMillis) )
+		if ((*iter)->process(deltaTimeMillis))
 			break;
 }
 
@@ -540,7 +540,7 @@ void ScriptManager::do_changeLocation() {
 
 	if (_nextLocation.world == 'g' && _nextLocation.room == 'j') {
 		if (_nextLocation.node == 's' && _nextLocation.view == 'e' &&
-		    _currentLocation.world != 'g' && _currentLocation.room != 'j')
+		        _currentLocation.world != 'g' && _currentLocation.room != 'j')
 			_engine->getSaveManager()->prepareSaveBuffer();
 	} else {
 		if (_currentLocation.world == 'g' && _currentLocation.room == 'j')
-- 
cgit v1.2.3


From b58f6f397da29454e359384f6908b403f48d990e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 13 Oct 2014 20:28:34 -0400
Subject: MADS: New conversation message logic for cutscene animations

---
 engines/mads/animation.cpp            | 53 +++++++++++++++++++++++----------
 engines/mads/animation.h              |  6 +++-
 engines/mads/nebular/menu_nebular.cpp |  4 +--
 engines/mads/palette.cpp              | 56 +++++++++++++++++++++++++++++++++++
 engines/mads/palette.h                |  2 ++
 5 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 0807d8e409..bc3708b5f5 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -159,6 +159,7 @@ Animation *Animation::init(MADSEngine *vm, Scene *scene) {
 }
 
 Animation::Animation(MADSEngine *vm, Scene *scene) : _vm(vm), _scene(scene) {
+	_flags = 0;
 	_font = nullptr;
 	_resetFlag = false;
 	_messageCtr = 0;
@@ -174,6 +175,8 @@ Animation::Animation(MADSEngine *vm, Scene *scene) : _vm(vm), _scene(scene) {
 	_actionDetails._indirectObjectId = -1;
 	_currentFrame = 0;
 	_oldFrameEntry = 0;
+	_rgbResult = -1;
+	_palIndex1 = _palIndex2 = -1;
 }
 
 Animation::~Animation() {
@@ -204,6 +207,7 @@ void Animation::load(MSurface &backSurface, DepthSurface &depthSurface,
 
 	if (_header._bgType == ANIMBG_INTERFACE)
 		flags |= PALFLAG_RESERVED;
+	_flags = flags;
 
 	if (flags & ANIMFLAG_LOAD_BACKGROUND) {
 		loadBackground(backSurface, depthSurface, _header, flags, palCycles, sceneInfo);
@@ -414,6 +418,7 @@ bool Animation::hasScroll() const {
 
 void Animation::update() {
 	Scene &scene = _vm->_game->_scene;
+	Palette &palette = *_vm->_palette;
 
 	if (_header._manualFlag) {
 		int spriteListIndex = _spriteListIndexes[_header._spritesIndex];
@@ -532,26 +537,42 @@ void Animation::update() {
 		} else if ((_currentFrame >= _messages[idx]._startFrame) && (_currentFrame <= _messages[idx]._endFrame)) {
 			// Start displaying the message
 			AnimMessage &me = _messages[idx];
+			uint8 colIndex1, colIndex2;
+
+			if (_flags & ANIMFLAG_ANIMVIEW) {
+				_rgbResult = palette._paletteUsage.checkRGB(me._rgb1, -1, true, &_palIndex1);
+				_rgbResult = palette._paletteUsage.checkRGB(me._rgb2, _rgbResult, true, &_palIndex2);
+
+				// Update the palette with the two needed colors
+				int palCount = _palIndex2 - _palIndex1;
+				if (palCount < 0)
+					palCount = _palIndex1 - _palIndex2 + 1;
+				palette.setPalette(palette._mainPalette, MIN(_palIndex1, _palIndex2), palCount);
+
+				colIndex1 = _palIndex1;
+				colIndex2 = _palIndex2;
+			} else {
+				// The color index to use is dependant on how many messages are currently on-screen
+				switch (_messageCtr) {
+				case 1:
+					colIndex1 = 252;
+					break;
+				case 2:
+					colIndex1 = 16;
+					break;
+				default:
+					colIndex1 = 250;
+					break;
+				}
+				colIndex2 = colIndex1 + 1;
 
-			// The color index to use is dependant on how many messages are currently on-screen
-			uint8 colIndex;
-			switch (_messageCtr) {
-			case 1:
-				colIndex = 252;
-				break;
-			case 2:
-				colIndex = 16;
-				break;
-			default:
-				colIndex = 250;
-				break;
+				_vm->_palette->setEntry(colIndex1, me._rgb1[0], me._rgb1[1], me._rgb1[2]);
+				_vm->_palette->setEntry(colIndex2, me._rgb2[0], me._rgb2[1], me._rgb2[2]);
 			}
 
-			_vm->_palette->setEntry(colIndex, me._rgb1[0], me._rgb1[1], me._rgb1[2]);
-			_vm->_palette->setEntry(colIndex + 1, me._rgb2[0], me._rgb2[1], me._rgb2[2]);
-
 			// Add a kernel message to display the given text
-			me._kernelMsgIndex = scene._kernelMessages.add(me._pos, colIndex * 0x101 + 0x100,
+			me._kernelMsgIndex = scene._kernelMessages.add(me._pos,
+				colIndex1 | (colIndex2 << 8),
 				0, 0, INDEFINITE_TIMEOUT, me._msg);
 			assert(me._kernelMsgIndex >= 0);
 			++_messageCtr;
diff --git a/engines/mads/animation.h b/engines/mads/animation.h
index 917d899ec5..b7e98e72e4 100644
--- a/engines/mads/animation.h
+++ b/engines/mads/animation.h
@@ -37,7 +37,8 @@ enum AnimFlag {
 	ANIMFLAG_DITHER				= 0x1000,	// Dither to 16 colors
 	ANIMFLAG_CUSTOM_FONT		= 0x2000,	// Load ccustom font
 	ANIMFLAG_LOAD_BACKGROUND	= 0x0100,	// Load background
-	ANIMFLAG_LOAD_BACKGROUND_ONLY = 0x0200	// Load background only
+	ANIMFLAG_LOAD_BACKGROUND_ONLY = 0x0200,	// Load background only
+	ANIMFLAG_ANIMVIEW			= 0x8000	// Cutscene animation
 };
 
 enum AnimBgType {
@@ -155,6 +156,9 @@ private:
 	uint32 _nextScrollTimer;
 	int _messageCtr;
 	int _trigger;
+	int _flags;
+	int _rgbResult;
+	int _palIndex1, _palIndex2;
 	TriggerMode _triggerMode;
 	ActionDetails _actionDetails;
 
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 3919e70a09..0d7b11cf4b 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -890,9 +890,9 @@ void AnimationView::loadNextResource() {
 	// Load the new animation
 	delete _currentAnimation;
 	_currentAnimation = Animation::init(_vm, &scene);
+	int flags = ANIMFLAG_ANIMVIEW | (resEntry._bgFlag ? ANIMFLAG_LOAD_BACKGROUND : 0);
 	_currentAnimation->load(scene._backgroundSurface, scene._depthSurface, 
-		resEntry._resourceName, resEntry._bgFlag ? ANIMFLAG_LOAD_BACKGROUND : 0,
-		&paletteCycles, _sceneInfo);
+		resEntry._resourceName, flags, &paletteCycles, _sceneInfo);
 
 	// Signal for a screen refresh
 	scene._spriteSlots.fullRefresh();
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index c098e23bf9..1787b3c298 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -317,6 +317,62 @@ int PaletteUsage::rgbFactor(byte *palEntry, RGB6 &pal6) {
 	return total;
 }
 
+int PaletteUsage::checkRGB(const byte *rgb, int palStart, bool flag, int *palIndex) {
+	Palette &palette = *_vm->_palette;
+	bool match = false;
+	int result;
+	if (palStart >= 0) {
+		result = palStart;
+	} else {
+		result = -1;
+		for (int i = 0; i < palette._highRange; ++i) {
+			if (!palette._rgbList[i]) {
+				result = i;
+				break;
+			}
+		}
+	}
+
+	if (result >= 0) {
+		int mask = 1 << result;
+		byte *palP = &palette._mainPalette[0];
+		uint32 *flagsP = &palette._palFlags[0];
+
+		for (; flagsP < &palette._palFlags[PALETTE_COUNT]; ++flagsP, ++result) {
+			if ((!(*flagsP & 1) || flag) && !(*flagsP & 2)) {
+				if (!memcmp(palP, rgb, 3)) {
+					*flagsP |= mask;
+					
+					if (palIndex)
+						*palIndex = result;
+					match = true;
+					break;
+				}
+			}
+		}
+
+		if (!match) {
+			palP = &palette._mainPalette[0];
+			flagsP = &palette._palFlags[0];
+
+			for (int i = 0; i < PALETTE_COUNT; ++i, palP += 3, ++flagsP) {
+				if (!*flagsP) {
+					Common::copy(rgb, rgb + 3, palP);
+					*flagsP |= mask;
+
+					if (palIndex)
+						*palIndex = i;
+					match = true;
+					break;
+				}
+			}
+		}
+	}
+
+	assert(match);
+	return result;
+}
+
 /*------------------------------------------------------------------------*/
 
 void RGBList::clear() {
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 9b8b7146db..27d25f266b 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -136,6 +136,8 @@ public:
 	void updateUsage(Common::Array<int> &usageList, int sceneUsageIndex);
 
 	void resetPalFlags(int idx);
+
+	int checkRGB(const byte *rgb, int palStart, bool flag, int *palIndex);
 };
 
 class RGBList {
-- 
cgit v1.2.3


From d175d58ce1e534c77a1d8f4f4abd1fd17f26faff Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Oct 2014 17:57:02 +0200
Subject: TSAGE: R2R - Fix a bug when trying to exit the ship console after
 playing Outpost Alpha

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index b82565332a..573cbbb29a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -627,7 +627,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	_palette.loadPalette(0);
 
-	if (R2_GLOBALS._sceneManager._previousScene != 125)
+	if ((R2_GLOBALS._sceneManager._previousScene != 125) && (R2_GLOBALS._sceneManager._previousScene != 1337) && (R2_GLOBALS._sceneManager._previousScene != 1330))
 		// Save the prior scene to return to when the console is turned off
 		R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = R2_GLOBALS._sceneManager._previousScene;
 
-- 
cgit v1.2.3


From c4a829a7c61e55b98f926a079f4c06ba029f02fa Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 14 Oct 2014 21:43:41 +0100
Subject: CGE2: Add detection for English v1.0 version of the game

---
 engines/cge2/detection.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index c05ce70c3d..6e1b93d0b8 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -71,6 +71,16 @@ static const ADGameDescription gameDescriptions[] = {
 			Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
 		},
 
+		{
+			"sfinx", "Freeware v1.0",
+			{
+				{"vol.cat", 0, "f158e469dccbebc5a632eb848df89779", 129024},
+				{"vol.dat", 0, "d40a6b4ae173d6930be54ba56bee15d5", 34183443},
+				AD_LISTEND
+			},
+			Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
+		},
+
 		AD_TABLE_END_MARKER
 };
 
-- 
cgit v1.2.3


From b5fb32de5ea2a4f3dd4133c423d666d00f37744f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Oct 2014 21:26:00 -0400
Subject: MADS: Fix to exit game safely when sound driver hasn't been created

---
 engines/mads/sound.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index 9d0d9c8d20..d0aa770a4d 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -42,9 +42,11 @@ SoundManager::SoundManager(MADSEngine *vm, Audio::Mixer *mixer) {
 }
 
 SoundManager::~SoundManager() {
-	_driver->stop();
+	if (_driver) {
+		_driver->stop();
+		delete _driver;
+	}
 
-	delete _driver;
 	delete _opl;
 }
 
-- 
cgit v1.2.3


From ea9599b763e0e8aef55282d621828ebfc7b1a9f6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Oct 2014 21:37:00 -0400
Subject: MADS: Implement subtitles for animation cutscenes

---
 engines/mads/animation.cpp            | 27 +++++++++++----------------
 engines/mads/animation.h              |  2 +-
 engines/mads/nebular/menu_nebular.cpp |  2 ++
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index bc3708b5f5..9f0e0adb6d 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -537,49 +537,44 @@ void Animation::update() {
 		} else if ((_currentFrame >= _messages[idx]._startFrame) && (_currentFrame <= _messages[idx]._endFrame)) {
 			// Start displaying the message
 			AnimMessage &me = _messages[idx];
-			uint8 colIndex1, colIndex2;
 
 			if (_flags & ANIMFLAG_ANIMVIEW) {
 				_rgbResult = palette._paletteUsage.checkRGB(me._rgb1, -1, true, &_palIndex1);
 				_rgbResult = palette._paletteUsage.checkRGB(me._rgb2, _rgbResult, true, &_palIndex2);
 
 				// Update the palette with the two needed colors
-				int palCount = _palIndex2 - _palIndex1;
-				if (palCount < 0)
-					palCount = _palIndex1 - _palIndex2 + 1;
-				palette.setPalette(palette._mainPalette, MIN(_palIndex1, _palIndex2), palCount);
-
-				colIndex1 = _palIndex1;
-				colIndex2 = _palIndex2;
+				int palStart = MIN(_palIndex1, _palIndex2);
+				int palCount = ABS(_palIndex2 - _palIndex1) + 1;
+				palette.setPalette(&palette._mainPalette[palStart * 3], palStart, palCount);
 			} else {
 				// The color index to use is dependant on how many messages are currently on-screen
 				switch (_messageCtr) {
 				case 1:
-					colIndex1 = 252;
+					_palIndex1 = 252;
 					break;
 				case 2:
-					colIndex1 = 16;
+					_palIndex1 = 16;
 					break;
 				default:
-					colIndex1 = 250;
+					_palIndex1 = 250;
 					break;
 				}
-				colIndex2 = colIndex1 + 1;
+				_palIndex2 = _palIndex1 + 1;
 
-				_vm->_palette->setEntry(colIndex1, me._rgb1[0], me._rgb1[1], me._rgb1[2]);
-				_vm->_palette->setEntry(colIndex2, me._rgb2[0], me._rgb2[1], me._rgb2[2]);
+				_vm->_palette->setEntry(_palIndex1, me._rgb1[0], me._rgb1[1], me._rgb1[2]);
+				_vm->_palette->setEntry(_palIndex2, me._rgb2[0], me._rgb2[1], me._rgb2[2]);
 			}
 
 			// Add a kernel message to display the given text
 			me._kernelMsgIndex = scene._kernelMessages.add(me._pos,
-				colIndex1 | (colIndex2 << 8),
+				_palIndex1 | (_palIndex2 << 8),
 				0, 0, INDEFINITE_TIMEOUT, me._msg);
 			assert(me._kernelMsgIndex >= 0);
 			++_messageCtr;
 
 			// If there's an accompanying sound, also play it
 			if (me._soundId > 0)
-				_vm->_audio->playSound(me._soundId);
+				_vm->_audio->playSound(me._soundId - 1);
 		}
 	}
 
diff --git a/engines/mads/animation.h b/engines/mads/animation.h
index b7e98e72e4..8b85a5370d 100644
--- a/engines/mads/animation.h
+++ b/engines/mads/animation.h
@@ -38,7 +38,7 @@ enum AnimFlag {
 	ANIMFLAG_CUSTOM_FONT		= 0x2000,	// Load ccustom font
 	ANIMFLAG_LOAD_BACKGROUND	= 0x0100,	// Load background
 	ANIMFLAG_LOAD_BACKGROUND_ONLY = 0x0200,	// Load background only
-	ANIMFLAG_ANIMVIEW			= 0x8000	// Cutscene animation
+	ANIMFLAG_ANIMVIEW			= 0x4000	// Cutscene animation
 };
 
 enum AnimBgType {
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 0d7b11cf4b..64c91d5f1b 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -55,6 +55,8 @@ void MenuView::show() {
 
 	while (!_breakFlag && !_vm->shouldQuit()) {
 		if (_redrawFlag) {
+			scene._kernelMessages.update();
+
 			_vm->_game->_scene.drawElements(_vm->_game->_fx, _vm->_game->_fx);
 			_redrawFlag = false;
 		}
-- 
cgit v1.2.3


From 2048fe68d233cfff8523b1b2ee818088cb0fc939 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Oct 2014 21:49:14 -0400
Subject: MADS: Fix clearing on-screen messages when the cutscene animation
 changes

---
 engines/mads/nebular/menu_nebular.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 64c91d5f1b..6d014191e9 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -889,6 +889,9 @@ void AnimationView::loadNextResource() {
 	if (resEntry._bgFlag)
 		palette.resetGamePalette(1, 8);
 
+	// Free any previous messages
+	scene._kernelMessages.reset();
+
 	// Load the new animation
 	delete _currentAnimation;
 	_currentAnimation = Animation::init(_vm, &scene);
-- 
cgit v1.2.3


From 1658a34ef5e6e6d48e45c4f38d7d507eb0f4d5ff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Oct 2014 22:29:29 -0400
Subject: MADS: Correct the color for the top/bottom line bounding the cutscene

---
 engines/mads/nebular/menu_nebular.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 6d014191e9..a9ed6d3495 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -889,9 +889,24 @@ void AnimationView::loadNextResource() {
 	if (resEntry._bgFlag)
 		palette.resetGamePalette(1, 8);
 
+	palette._mainPalette[253 * 3] = palette._mainPalette[253 * 3 + 1] 
+		= palette._mainPalette[253 * 3 + 2] = 0xb4;
+	palette.setPalette(&palette._mainPalette[253 * 3], 253, 1);
+
 	// Free any previous messages
 	scene._kernelMessages.reset();
 
+	// Handle the bars at the top/bottom
+	if (resEntry._showWhiteBars) {
+		// For animations the screen has been clipped to the middle 156 rows.
+		// So although it's slightly messy, bypass our screen class entirely,
+		// and draw the horizontal lines directly on the physiacl screen surface
+		Graphics::Surface *s = g_system->lockScreen();
+		s->hLine(0, 20, MADS_SCREEN_WIDTH, 253);
+		s->hLine(0, 179, MADS_SCREEN_WIDTH, 253);
+		g_system->unlockScreen();
+	}
+
 	// Load the new animation
 	delete _currentAnimation;
 	_currentAnimation = Animation::init(_vm, &scene);
-- 
cgit v1.2.3


From 331488cae0909084a1e8800706cf102741e3043b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 15 Oct 2014 10:35:49 +0300
Subject: MADS: Bugfix for the text view debugger command

---
 engines/mads/debugger.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/debugger.cpp b/engines/mads/debugger.cpp
index ee967cb17e..3b77d5332b 100644
--- a/engines/mads/debugger.cpp
+++ b/engines/mads/debugger.cpp
@@ -381,7 +381,7 @@ bool Debugger::Cmd_PlayText(int argc, const char **argv) {
 			resName.deleteChar(0);
 
 		Common::File f;
-		if (f.exists(resName) || f.exists(resName + ".res")) {
+		if (f.exists(resName) || f.exists(resName + ".txr")) {
 			Nebular::TextView::execute(_vm, resName);
 			return false;
 		} else {
-- 
cgit v1.2.3


From 701d43b5c208a605465c59e9caf8767df18c3e04 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 14 Oct 2014 01:59:53 +0300
Subject: MADS: Initial implementation of sound driver handling for V2 games

---
 engines/mads/nebular/menu_nebular.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index a9ed6d3495..6a13cea195 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -922,7 +922,11 @@ void AnimationView::loadNextResource() {
 		const char *chP = strchr(_currentAnimation->_header._soundName.c_str(), '.');
 		assert(chP);
 
-		int driverNum = atoi(chP + 1);
+		// Handle both Rex naming (xxx.009) and naming in later games (e.g. xxx.ph9)
+		int driverNum = atoi(chP + 3);
+		// HACK for Dragon
+		if (_currentAnimation->_header._soundName == "#SOUND.DRG")
+			driverNum = 9;
 		_vm->_sound->init(driverNum);
 	}
 
-- 
cgit v1.2.3


From 33b770ac60354b3a8bea89bc5babe3f5c0ebf4dc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 15 Oct 2014 11:33:14 +0300
Subject: MADS: Move all the anim and text view code into a common class

The animation and text players are more or less common among all MADS
games
---
 engines/mads/debugger.cpp                |   4 +-
 engines/mads/dialogs.cpp                 |  73 +++
 engines/mads/dialogs.h                   |  32 ++
 engines/mads/menu_views.cpp              | 782 +++++++++++++++++++++++++++++++
 engines/mads/menu_views.h                | 226 +++++++++
 engines/mads/module.mk                   |   1 +
 engines/mads/nebular/dialogs_nebular.cpp |  61 ---
 engines/mads/nebular/dialogs_nebular.h   |  32 --
 engines/mads/nebular/menu_nebular.cpp    | 753 +----------------------------
 engines/mads/nebular/menu_nebular.h      | 190 +-------
 10 files changed, 1118 insertions(+), 1036 deletions(-)
 create mode 100644 engines/mads/menu_views.cpp
 create mode 100644 engines/mads/menu_views.h

diff --git a/engines/mads/debugger.cpp b/engines/mads/debugger.cpp
index 3b77d5332b..99251f9fbb 100644
--- a/engines/mads/debugger.cpp
+++ b/engines/mads/debugger.cpp
@@ -362,7 +362,7 @@ bool Debugger::Cmd_PlayAnim(int argc, const char **argv) {
 
 		Common::File f;
 		if (f.exists(resName) || f.exists(resName + ".res")) {
-			Nebular::AnimationView::execute(_vm, resName);
+			AnimationView::execute(_vm, resName);
 			return false;
 		} else {
 			debugPrintf("Could not find resource file\n");
@@ -382,7 +382,7 @@ bool Debugger::Cmd_PlayText(int argc, const char **argv) {
 
 		Common::File f;
 		if (f.exists(resName) || f.exists(resName + ".txr")) {
-			Nebular::TextView::execute(_vm, resName);
+			TextView::execute(_vm, resName);
 			return false;
 		} else {
 			debugPrintf("Could not find resource file\n");
diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 7e6909d113..5ea8fb115c 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -395,4 +395,77 @@ Dialogs::Dialogs(MADSEngine *vm)
 	_pendingDialog = DIALOG_NONE;
 }
 
+/*------------------------------------------------------------------------*/
+
+FullScreenDialog::FullScreenDialog(MADSEngine *vm) : _vm(vm) {
+	switch (_vm->getGameID()) {
+	case GType_RexNebular:
+		_screenId = 990;
+		break;
+	case GType_Phantom:
+		_screenId = 920;
+		break;
+	case GType_Dragonsphere:
+		_screenId = 922;
+		break;
+	default:
+		error("FullScreenDialog:Unknown game");
+	}
+	_palFlag = true;
+}
+
+FullScreenDialog::~FullScreenDialog() {
+	_vm->_screen.resetClipBounds();
+	_vm->_game->_scene.restrictScene();
+}
+
+void FullScreenDialog::display() {
+	Game &game = *_vm->_game;
+	Scene &scene = game._scene;
+
+	int nextSceneId = scene._nextSceneId;
+	int currentSceneId = scene._currentSceneId;
+	int priorSceneId = scene._priorSceneId;
+
+	if (_screenId > 0) {
+		SceneInfo *sceneInfo = SceneInfo::init(_vm);
+		sceneInfo->load(_screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
+	}
+
+	scene._priorSceneId = priorSceneId;
+	scene._currentSceneId = currentSceneId;
+	scene._nextSceneId = nextSceneId;
+
+	_vm->_events->initVars();
+	game._kernelMode = KERNEL_ROOM_INIT;
+
+	byte pal[768];
+	if (_vm->_screenFade) {
+		Common::fill(&pal[0], &pal[PALETTE_SIZE], 0);
+		_vm->_palette->setFullPalette(pal);
+	} else {
+		_vm->_palette->getFullPalette(pal);
+		_vm->_palette->fadeOut(pal, nullptr, 0, PALETTE_COUNT, 0, 1, 1, 16);
+	}
+
+	// Set Fx state and palette entries
+	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kCenterVertTransition;
+	game._trigger = 0;
+
+	// Clear the screen and draw the upper and lower horizontal lines
+	_vm->_screen.empty();
+	_vm->_palette->setLowRange();
+	_vm->_screen.hLine(0, 20, MADS_SCREEN_WIDTH, 2);
+	_vm->_screen.hLine(0, 179, MADS_SCREEN_WIDTH, 2);
+	_vm->_screen.copyRectToScreen(Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
+
+	// Restrict the screen to the area between the two lines
+	_vm->_screen.setClipBounds(Common::Rect(0, DIALOG_TOP, MADS_SCREEN_WIDTH,
+		DIALOG_TOP + MADS_SCENE_HEIGHT));
+	_vm->_game->_scene.restrictScene();
+
+	if (_screenId > 0)
+		scene._spriteSlots.fullRefresh();
+}
+
 } // End of namespace MADS
diff --git a/engines/mads/dialogs.h b/engines/mads/dialogs.h
index c586a6f1fe..317c7bd792 100644
--- a/engines/mads/dialogs.h
+++ b/engines/mads/dialogs.h
@@ -30,6 +30,8 @@
 
 namespace MADS {
 
+#define DIALOG_TOP 22
+
 class Dialog {
 private:
 	void setDialogPalette();
@@ -226,6 +228,36 @@ public:
 	virtual bool show(int messageId, int objectId = -1) = 0;
 };
 
+class FullScreenDialog: public EventTarget {
+protected:
+	/**
+	 * Engine reference
+	 */
+	MADSEngine *_vm;
+
+	/**
+	 * Screen/scene to show background from
+	 */
+	int _screenId;
+
+	/**
+	 * Flag for palette initialization
+	 */
+	bool _palFlag;
+
+	/**
+	 * Handles displaying the screen background and dialog
+	 */
+	virtual void display();
+public:
+	/**
+	 * Constructor
+	 */
+	FullScreenDialog(MADSEngine *vm);
+
+	virtual ~FullScreenDialog();
+};
+
 } // End of namespace MADS
 
 #endif /* MADS_DIALOGS_H */
diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
new file mode 100644
index 0000000000..6acf6cdf9f
--- /dev/null
+++ b/engines/mads/menu_views.cpp
@@ -0,0 +1,782 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "mads/game.h"
+#include "mads/mads.h"
+#include "mads/menu_views.h"
+#include "mads/resources.h"
+#include "mads/scene.h"
+#include "mads/screen.h"
+
+namespace MADS {
+
+MenuView::MenuView(MADSEngine *vm) : FullScreenDialog(vm) {
+	_breakFlag = false;
+	_redrawFlag = true;
+	_palFlag = false;
+}
+
+void MenuView::show() {
+ 	Scene &scene = _vm->_game->_scene;	
+	EventsManager &events = *_vm->_events;
+	_vm->_screenFade = SCREEN_FADE_FAST;
+
+	scene._spriteSlots.reset(true);
+	display();
+
+	events.setEventTarget(this);
+	events.hideCursor();
+
+	while (!_breakFlag && !_vm->shouldQuit()) {
+		if (_redrawFlag) {
+			scene._kernelMessages.update();
+
+			_vm->_game->_scene.drawElements(_vm->_game->_fx, _vm->_game->_fx);
+			_redrawFlag = false;
+		}
+
+		_vm->_events->waitForNextFrame();
+		_vm->_game->_fx = kTransitionNone;
+		doFrame();
+	}
+
+	events.setEventTarget(nullptr);
+	_vm->_sound->stop();
+}
+
+void MenuView::display() {
+	_vm->_palette->resetGamePalette(4, 8);
+
+	FullScreenDialog::display();
+}
+
+bool MenuView::onEvent(Common::Event &event) {
+	if (event.type == Common::EVENT_KEYDOWN || event.type == Common::EVENT_LBUTTONDOWN) {
+		_breakFlag = true;
+		_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
+		return true;
+	}
+
+	return false;
+}
+
+/*------------------------------------------------------------------------*/
+
+char TextView::_resourceName[100];
+#define TEXTVIEW_LINE_SPACING 2
+#define TEXT_ANIMATION_DELAY 100
+#define TV_NUM_FADE_STEPS 40
+#define TV_FADE_DELAY_MILLI 50
+
+void TextView::execute(MADSEngine *vm, const Common::String &resName) {
+	assert(resName.size() < 100);
+	Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName));
+	vm->_dialogs->_pendingDialog = DIALOG_TEXTVIEW;
+}
+
+TextView::TextView(MADSEngine *vm) : MenuView(vm) {
+	_animating = false;
+	_panSpeed = 0;
+	_spareScreen = nullptr;
+	_scrollCount = 0;
+	_lineY = -1;
+	_scrollTimeout = 0;
+	_panCountdown = 0;
+	_translationX = 0;
+	_screenId = -1;
+
+	_font = _vm->_font->getFont(FONT_CONVERSATION);
+	_vm->_palette->resetGamePalette(4, 0);
+
+	load();
+}
+
+TextView::~TextView() {
+}
+
+void TextView::load() {
+	Common::String scriptName(_resourceName);
+	scriptName += ".txr";
+
+	if (!_script.open(scriptName))
+		error("Could not open resource %s", _resourceName);
+
+	processLines();
+}
+
+void TextView::processLines() {
+	if (_script.eos())
+		error("Attempted to read past end of response file");
+
+	while (!_script.eos()) {
+		// Read in the next line
+		_script.readLine(_currentLine, 79);
+		char *p = _currentLine + strlen(_currentLine) - 1;
+		if (*p == '\n')
+			*p = '\0';
+
+		// Commented out line, so go loop for another
+		if (_currentLine[0] == '#')
+			continue;
+
+		// Process the line
+		char *cStart = strchr(_currentLine, '[');
+		if (cStart) {
+			while (cStart) {
+				// Loop for possible multiple commands on one line
+				char *cEnd = strchr(_currentLine, ']');
+				if (!cEnd)
+					error("Unterminated command '%s' in response file", _currentLine);
+
+				*cEnd = '\0';
+				processCommand();
+
+				// Copy rest of line (if any) to start of buffer
+				Common::strlcpy(_currentLine, cEnd + 1, sizeof(_currentLine));
+
+				cStart = strchr(_currentLine, '[');
+			}
+
+			if (_currentLine[0]) {
+				processText();
+				break;
+			}
+
+		} else {
+			processText();
+			break;
+		}
+	}
+}
+
+void TextView::processCommand() {
+	Scene &scene = _vm->_game->_scene;
+	Common::String scriptLine(_currentLine + 1);
+	scriptLine.toUppercase();
+	const char *paramP;
+	const char *commandStr = scriptLine.c_str();
+
+	if (!strncmp(commandStr, "BACKGROUND", 10)) {
+		// Set the background
+		paramP = commandStr + 10;
+		resetPalette();
+		int screenId = getParameter(&paramP);
+		
+		SceneInfo *sceneInfo = SceneInfo::init(_vm);
+		sceneInfo->load(screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
+		scene._spriteSlots.fullRefresh();
+		_redrawFlag = true;
+
+	} else if (!strncmp(commandStr, "GO", 2)) {
+		_animating = true;
+
+	} else if (!strncmp(commandStr, "PAN", 3)) {
+		// Set panning values
+		paramP = commandStr + 3;
+		int panX = getParameter(&paramP);
+		int panY = getParameter(&paramP);
+		int panSpeed = getParameter(&paramP);
+
+		if ((panX != 0) || (panY != 0)) {
+			_pan = Common::Point(panX, panY);
+			_panSpeed = panSpeed;
+		}
+
+	} else if (!strncmp(commandStr, "DRIVER", 6)) {
+		// Set the driver to use
+		paramP = commandStr + 7;
+
+		if (!strncmp(paramP, "#SOUND.00", 9)) {
+			int driverNum = paramP[9] - '0';
+			_vm->_sound->init(driverNum);
+		}
+	} else if (!strncmp(commandStr, "SOUND", 5)) {
+		// Set sound number
+		paramP = commandStr + 5;
+		int soundId = getParameter(&paramP);
+		_vm->_sound->command(soundId);
+
+	} else if (!strncmp(commandStr, "COLOR", 5) && ((commandStr[5] == '0') || 
+			(commandStr[5] == '1'))) {
+		// Set the text colors
+		int index = commandStr[5] - '0';
+		paramP = commandStr + 6;
+
+		byte r = getParameter(&paramP);
+		byte g = getParameter(&paramP);
+		byte b = getParameter(&paramP);
+
+		_vm->_palette->setEntry(5 + index, r, g, b);
+
+	} else if (!strncmp(commandStr, "SPARE", 5)) {
+		// Sets a secondary background number that can be later switched in with a PAGE command
+		paramP = commandStr + 6;
+		int spareIndex = commandStr[5] - '0';
+		assert(spareIndex < 4);
+		int screenId = getParameter(&paramP);
+
+		// Load the spare background
+		SceneInfo *sceneInfo = SceneInfo::init(_vm);
+		sceneInfo->_width = MADS_SCREEN_WIDTH;
+		sceneInfo->_height = MADS_SCENE_HEIGHT;
+		_spareScreens[spareIndex].setSize(MADS_SCREEN_WIDTH, MADS_SCENE_HEIGHT);
+		sceneInfo->loadMadsV1Background(screenId, "", SCENEFLAG_TRANSLATE, 
+			_spareScreens[spareIndex]);
+		delete sceneInfo;
+
+	} else if (!strncmp(commandStr, "PAGE", 4)) {
+		// Signals to change to a previous specified secondary background
+		paramP = commandStr + 4;
+		int spareIndex = getParameter(&paramP);
+
+		// Only allow background switches if one isn't currently in progress
+		if (!_spareScreen && _spareScreens[spareIndex].getPixels() != nullptr) {
+			_spareScreen = &_spareScreens[spareIndex];
+			_translationX = 0;
+		}
+
+	} else {
+		error("Unknown response command: '%s'", commandStr);
+	}
+}
+
+int TextView::getParameter(const char **paramP) {
+	if ((**paramP != '=') && (**paramP != ','))
+		return 0;
+
+	int result = 0;
+	++*paramP;
+	while ((**paramP >= '0') && (**paramP <= '9')) {
+		result = result * 10 + (**paramP - '0');
+		++*paramP;
+	}
+
+	return result;
+}
+
+void TextView::processText() {
+	int xStart;
+
+	if (!strcmp(_currentLine, "***")) {
+		// Special signifier for end of script
+		_scrollCount = _font->getHeight() * 13;
+		_lineY = -1;
+		return;
+	}
+
+	_lineY = 0;
+
+	// Lines are always centered, except if line contains a '@', in which case the
+	// '@' marks the position that must be horizontally centered
+	char *centerP = strchr(_currentLine, '@');
+	if (centerP) {
+		*centerP = '\0';
+		xStart = (MADS_SCREEN_WIDTH / 2) - _font->getWidth(_currentLine);
+
+		// Delete the @ character and shift back the remainder of the string
+		char *p = centerP + 1;
+		if (*p == ' ') ++p;
+		strcpy(centerP, p);
+
+	} else {
+		int lineWidth = _font->getWidth(_currentLine);
+		xStart = (MADS_SCREEN_WIDTH - lineWidth) / 2;
+	}
+
+	// Add the new line to the list of pending lines
+	TextLine tl;
+	tl._pos = Common::Point(xStart, MADS_SCENE_HEIGHT);
+	tl._line = _currentLine;
+	tl._textDisplayIndex = -1;
+	_textLines.push_back(tl);
+}
+
+void TextView::display() {
+	FullScreenDialog::display();
+}
+
+void TextView::resetPalette() {
+	_vm->_palette->resetGamePalette(8, 8);
+	_vm->_palette->setEntry(5, 0, 63, 63);
+	_vm->_palette->setEntry(6, 0, 45, 45);
+}
+
+void TextView::doFrame() {
+	Scene &scene = _vm->_game->_scene;
+	if (!_animating)
+		return;
+
+	// Only update state if wait period has expired
+	uint32 currTime = g_system->getMillis();
+
+	// If a screen transition is in progress and it's time for another column, handle it
+	if (_spareScreen) {
+		byte *srcP = _spareScreen->getBasePtr(_translationX, 0);
+		byte *bgP = scene._backgroundSurface.getBasePtr(_translationX, 0);
+		byte *screenP = (byte *)_vm->_screen.getBasePtr(_translationX, 0);
+
+		for (int y = 0; y < MADS_SCENE_HEIGHT; ++y, srcP += MADS_SCREEN_WIDTH,
+			bgP += MADS_SCREEN_WIDTH, screenP += MADS_SCREEN_WIDTH) {
+			*bgP = *srcP;
+			*screenP = *srcP;
+		}
+
+		// Flag the column of the screen is modified
+		_vm->_screen.copyRectToScreen(Common::Rect(_translationX, 0,
+			_translationX + 1, MADS_SCENE_HEIGHT));
+
+		// Keep moving the column to copy to the right
+		if (++_translationX == MADS_SCREEN_WIDTH) {
+			// Surface transition is complete
+			_spareScreen = nullptr;
+		}
+	}
+
+	// Make sure it's time for an update
+	if (currTime < _scrollTimeout)
+		return;
+	_scrollTimeout = g_system->getMillis() + TEXT_ANIMATION_DELAY;
+	_redrawFlag = true;
+
+	// If any panning values are set, pan the background surface
+	if ((_pan.x != 0) || (_pan.y != 0)) {
+		if (_panCountdown > 0) {
+			--_panCountdown;
+			return;
+		}
+
+		// Handle horizontal panning
+		if (_pan.x != 0) {
+			byte *lineTemp = new byte[_pan.x];
+			for (int y = 0; y < MADS_SCENE_HEIGHT; ++y) {
+				byte *pixelsP = (byte *)scene._backgroundSurface.getBasePtr(0, y);
+
+				// Copy the first X pixels into temp buffer, move the rest of the line
+				// to the start of the line, and then move temp buffer pixels to end of line
+				Common::copy(pixelsP, pixelsP + _pan.x, lineTemp);
+				Common::copy(pixelsP + _pan.x, pixelsP + MADS_SCREEN_WIDTH, pixelsP);
+				Common::copy(lineTemp, lineTemp + _pan.x, pixelsP + MADS_SCREEN_WIDTH - _pan.x);
+			}
+
+			delete[] lineTemp;
+		}
+
+		// Handle vertical panning
+		if (_pan.y != 0) {
+			// Store the bottom Y lines into a temp buffer, move the rest of the lines down,
+			// and then copy the stored lines back to the top of the screen
+			byte *linesTemp = new byte[_pan.y * MADS_SCREEN_WIDTH];
+			byte *pixelsP = (byte *)scene._backgroundSurface.getBasePtr(0, MADS_SCENE_HEIGHT - _pan.y);
+			Common::copy(pixelsP, pixelsP + MADS_SCREEN_WIDTH * _pan.y, linesTemp);
+
+			for (int y = MADS_SCENE_HEIGHT - 1; y >= _pan.y; --y) {
+				byte *destP = (byte *)scene._backgroundSurface.getBasePtr(0, y);
+				byte *srcP = (byte *)scene._backgroundSurface.getBasePtr(0, y - _pan.y);
+				Common::copy(srcP, srcP + MADS_SCREEN_WIDTH, destP);
+			}
+
+			Common::copy(linesTemp, linesTemp + _pan.y * MADS_SCREEN_WIDTH, 
+				(byte *)scene._backgroundSurface.getPixels());
+			delete[] linesTemp;
+		}
+
+		// Flag for a full screen refresh
+		scene._spriteSlots.fullRefresh();
+	}
+
+	// Scroll all active text lines up
+	for (int i = _textLines.size() - 1; i >= 0; --i) {
+		TextLine &tl = _textLines[i];
+		if (tl._textDisplayIndex != -1)
+			// Expire the text line that's already on-screen
+			scene._textDisplay.expire(tl._textDisplayIndex);
+
+		tl._pos.y--;
+		if (tl._pos.y < 0) {
+			_textLines.remove_at(i);
+		} else {
+			tl._textDisplayIndex = scene._textDisplay.add(tl._pos.x, tl._pos.y, 
+				0x605, -1, tl._line, _font);
+		}
+	}
+
+	if (_scrollCount > 0) {
+		// Handling final scrolling of text off of screen
+		if (--_scrollCount == 0) {
+			scriptDone();
+			return;
+		}
+	} else {
+		// Handling a text row
+		if (++_lineY == (_font->getHeight() + TEXTVIEW_LINE_SPACING))
+			processLines();
+	}
+}
+
+void TextView::scriptDone() {
+	_breakFlag = true;
+	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
+}
+
+/*------------------------------------------------------------------------*/
+
+char AnimationView::_resourceName[100];
+
+void AnimationView::execute(MADSEngine *vm, const Common::String &resName) {
+	assert(resName.size() < 100);
+	Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName));
+	vm->_dialogs->_pendingDialog = DIALOG_ANIMVIEW;
+}
+
+AnimationView::AnimationView(MADSEngine *vm) : MenuView(vm) {
+	_redrawFlag = false;
+
+	_soundDriverLoaded = false;
+	_previousUpdate = 0;
+	_screenId = -1;
+	_resetPalette = false;
+	_resyncMode = NEVER;
+	_v1 = 0;
+	_v2 = -1;
+	_resourceIndex = -1;
+	_currentAnimation = nullptr;
+	_sfx = 0;
+	_soundFlag = _bgLoadFlag = true;
+	_showWhiteBars = true;
+	_manualFrameNumber = 0;
+	_manualSpriteSet = nullptr;
+	_manualStartFrame = _manualEndFrame = 0;
+	_manualFrame2 = 0;
+	_animFrameNumber = 0;
+	_nextCyclingActive = false;
+	_sceneInfo = SceneInfo::init(_vm);
+
+	load();
+}
+
+AnimationView::~AnimationView() {
+	delete _currentAnimation;
+	delete _sceneInfo;
+}
+
+void AnimationView::load() {
+	Common::String resName(_resourceName);
+	if (!resName.hasSuffix("."))
+		resName += ".res";
+
+	if (!_script.open(resName))
+		error("Could not open resource %s", resName.c_str());
+
+	processLines();
+}
+
+void AnimationView::display() {
+	Scene &scene = _vm->_game->_scene;
+	_vm->_palette->initPalette();
+	Common::fill(&_vm->_palette->_cyclingPalette[0], &_vm->_palette->_cyclingPalette[PALETTE_SIZE], 0);
+
+	_vm->_palette->resetGamePalette(1, 8);
+	scene._spriteSlots.reset();
+	scene._paletteCycles.clear();
+
+	MenuView::display();
+}
+
+bool AnimationView::onEvent(Common::Event &event) {
+	// Wait for the Escape key or a mouse press
+	if (((event.type == Common::EVENT_KEYDOWN) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) ||
+			(event.type == Common::EVENT_RBUTTONUP)) {
+		scriptDone();
+		return true;
+	}
+
+	return false;
+}
+
+void AnimationView::doFrame() {
+	Scene &scene = _vm->_game->_scene;
+	
+	if (_resourceIndex == -1 || _currentAnimation->freeFlag()) {
+		if (++_resourceIndex == (int)_resources.size()) {
+			scriptDone();
+		} else {
+			scene._frameStartTime = 0;
+			loadNextResource();
+		}
+	} else if (_currentAnimation->getCurrentFrame() == 1) {
+		scene._cyclingActive = _nextCyclingActive;
+	}
+
+	if (_currentAnimation) {
+		++scene._frameStartTime;
+		_currentAnimation->update();
+		_redrawFlag = true;
+	}
+}
+
+void AnimationView::loadNextResource() {
+	Scene &scene = _vm->_game->_scene;
+	Palette &palette = *_vm->_palette;
+	ResourceEntry &resEntry = _resources[_resourceIndex];
+	Common::Array<PaletteCycle> paletteCycles;
+
+	if (resEntry._bgFlag)
+		palette.resetGamePalette(1, 8);
+
+	palette._mainPalette[253 * 3] = palette._mainPalette[253 * 3 + 1] 
+		= palette._mainPalette[253 * 3 + 2] = 0xb4;
+	palette.setPalette(&palette._mainPalette[253 * 3], 253, 1);
+
+	// Free any previous messages
+	scene._kernelMessages.reset();
+
+	// Handle the bars at the top/bottom
+	if (resEntry._showWhiteBars) {
+		// For animations the screen has been clipped to the middle 156 rows.
+		// So although it's slightly messy, bypass our screen class entirely,
+		// and draw the horizontal lines directly on the physiacl screen surface
+		Graphics::Surface *s = g_system->lockScreen();
+		s->hLine(0, 20, MADS_SCREEN_WIDTH, 253);
+		s->hLine(0, 179, MADS_SCREEN_WIDTH, 253);
+		g_system->unlockScreen();
+	}
+
+	// Load the new animation
+	delete _currentAnimation;
+	_currentAnimation = Animation::init(_vm, &scene);
+	int flags = ANIMFLAG_ANIMVIEW | (resEntry._bgFlag ? ANIMFLAG_LOAD_BACKGROUND : 0);
+	_currentAnimation->load(scene._backgroundSurface, scene._depthSurface, 
+		resEntry._resourceName, flags, &paletteCycles, _sceneInfo);
+
+	// Signal for a screen refresh
+	scene._spriteSlots.fullRefresh();
+
+	// If a sound driver has been specified, then load the correct one
+	if (!_currentAnimation->_header._soundName.empty()) {
+		const char *chP = strchr(_currentAnimation->_header._soundName.c_str(), '.');
+		assert(chP);
+
+		// Handle both Rex naming (xxx.009) and naming in later games (e.g. xxx.ph9)
+		int driverNum = atoi(chP + 3);
+		// HACK for Dragon
+		if (_currentAnimation->_header._soundName == "#SOUND.DRG")
+			driverNum = 9;
+		_vm->_sound->init(driverNum);
+	}
+
+	// Handle any manual setup
+	if (_currentAnimation->_header._manualFlag) {
+		_manualFrameNumber = _currentAnimation->_header._spritesIndex;
+		_manualSpriteSet = _currentAnimation->getSpriteSet(_manualFrameNumber);
+	}
+
+	// Set the sound data for the animation
+	_vm->_sound->setEnabled(resEntry._soundFlag);
+
+	Common::String dsrName = _currentAnimation->_header._dsrName;
+	if (!dsrName.empty())
+		_vm->_audio->setSoundGroup(dsrName);
+
+	// Start the new animation
+	_currentAnimation->startAnimation(0);
+
+	// Handle the palette and cycling palette
+	scene._cyclingActive = false;
+	Common::copy(&palette._mainPalette[0], &palette._mainPalette[PALETTE_SIZE],
+		&palette._cyclingPalette[0]);
+
+	_vm->_game->_fx = (ScreenTransition)resEntry._fx;
+	_nextCyclingActive = paletteCycles.size() > 0;
+	if (!_vm->_game->_fx) {
+		palette.setFullPalette(palette._mainPalette);
+	}
+
+	scene.initPaletteAnimation(paletteCycles, _nextCyclingActive && !_vm->_game->_fx);
+}
+
+void AnimationView::scriptDone() {
+	_breakFlag = true;
+	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
+}
+
+void AnimationView::processLines() {
+	if (_script.eos()) {
+		// end of script, end animation
+		scriptDone();
+		return;
+	}
+
+	while (!_script.eos()) {
+		// Get in next line
+		_currentLine.clear();
+		char c;
+		while (!_script.eos() && (c = _script.readByte()) != '\n') {
+			if (c != '\r' && c != '\0')
+				_currentLine += c;
+		}
+		
+		// Process the line
+		while (!_currentLine.empty()) {
+			if (_currentLine.hasPrefix("-")) {
+				_currentLine.deleteChar(0);
+
+				processCommand();
+			} else {
+				// Get resource name
+				Common::String resName;
+				while (!_currentLine.empty() && (c = _currentLine[0]) != ' ') {
+					_currentLine.deleteChar(0);
+					resName += c;
+				}
+
+				// Add resource into list along with any set state information
+				_resources.push_back(ResourceEntry(resName, _sfx, _soundFlag, 
+					_bgLoadFlag, _showWhiteBars));
+
+				// Fx resets between resource entries
+				_sfx = 0;
+			}
+
+			// Skip any spaces
+			while (_currentLine.hasPrefix(" "))
+				_currentLine.deleteChar(0);
+		}
+	}
+}
+
+void AnimationView::processCommand() {
+	// Get the command character
+	char commandChar = toupper(_currentLine[0]);
+	_currentLine.deleteChar(0);
+
+	// Handle the command
+	switch (commandChar) {
+	case 'B':
+		_soundFlag = !_soundFlag;
+		break;
+	case 'H':
+		// -h[:ex]  Disable EMS / XMS high memory support
+		if (_currentLine.hasPrefix(":"))
+			_currentLine.deleteChar(0);
+		while (_currentLine.hasPrefix("e") || _currentLine.hasPrefix("x"))
+			_currentLine.deleteChar(0);
+		break;
+	case 'O':
+		// -o:xxx  Specify opening special effect
+		assert(_currentLine[0] == ':');
+		_currentLine.deleteChar(0);
+		_sfx = getParameter();
+		break;
+	case 'P':
+		// Switch to CONCAT mode, which is ignored anyway
+		break;
+	case 'R': {
+		// Resynch timer (always, beginning, never)
+		assert(_currentLine[0] == ':');
+		_currentLine.deleteChar(0);
+
+		char v = toupper(_currentLine[0]);
+		_currentLine.deleteChar(0);
+		if (v == 'N')
+			_resyncMode = NEVER;
+		else if (v == 'A')
+			_resyncMode = ALWAYS;
+		else if (v == 'B')
+			_resyncMode = BEGINNING;
+		else
+			error("Unknown parameter");
+		break;
+	}
+	case 'W':
+		// Switch white bars being visible
+		_showWhiteBars = !_showWhiteBars;
+		break;
+	case 'X':
+		// Exit after animation finishes. Ignore
+		break;
+	case 'D':
+		// Unimplemented and ignored in the original. Ignore as well
+		break;
+	case 'Y':
+		// Reset palette on startup
+		_resetPalette = true;
+		break;
+	default:
+		error("Unknown command char: '%c'", commandChar);
+	}
+}
+
+int AnimationView::getParameter() {
+	int result = 0;
+
+	while (!_currentLine.empty()) {
+		char c = _currentLine[0];
+		
+		if (c >= '0' && c <= '9') {
+			_currentLine.deleteChar(0);
+			result = result * 10 + (c - '0');
+		} else {
+			break;
+		}
+	}
+
+	return result;
+}
+
+void AnimationView::checkResource(const Common::String &resourceName) {
+	//bool hasSuffix = false;
+	
+}
+
+int AnimationView::scanResourceIndex(const Common::String &resourceName) {
+	int foundIndex = -1;
+
+	if (_v1) {
+		const char *chP = strchr(resourceName.c_str(), '\\');
+		if (!chP) {
+			chP = strchr(resourceName.c_str(), '*');
+		}
+
+		Common::String resName = chP ? Common::String(chP + 1) : resourceName;
+
+		if (_v2 != 3) {
+			assert(_resIndex.size() == 0);
+		}
+
+		// Scan for the resource name
+		for (uint resIndex = 0; resIndex < _resIndex.size(); ++resIndex) {
+			ResIndexEntry &resEntry = _resIndex[resIndex];
+			if (resEntry._resourceName.compareToIgnoreCase(resourceName)) {
+				foundIndex = resIndex;
+				break;
+			}
+		}
+	}
+
+	if (foundIndex >= 0) {
+		// TODO
+	}
+	return -1;
+}
+
+} // End of namespace MADS
diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
new file mode 100644
index 0000000000..6faa665bff
--- /dev/null
+++ b/engines/mads/menu_views.h
@@ -0,0 +1,226 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef MADS_MENU_VIEWS_H
+#define MADS_MENU_VIEWS_H
+
+#include "common/scummsys.h"
+#include "mads/dialogs.h"
+#include "mads/game.h"
+#include "mads/msurface.h"
+
+namespace MADS {
+
+class MADSEngine;
+
+class MenuView: public FullScreenDialog {
+protected:
+	bool _breakFlag;
+	bool _redrawFlag;
+
+	virtual void doFrame() = 0;
+
+	virtual void display();
+
+	/**
+	* Event handler
+	*/
+	virtual bool onEvent(Common::Event &event);
+public:
+	MenuView(MADSEngine *vm);
+
+	virtual ~MenuView() {}
+
+	virtual void show();
+};
+
+struct TextLine {
+	Common::Point _pos;
+	Common::String _line;
+	int _textDisplayIndex;
+};
+
+/**
+ * Scrolling text view
+ */
+class TextView : public MenuView {
+private:
+	static char _resourceName[100];
+
+	bool _animating;
+	Common::Array<TextLine> _textLines;
+	Common::Point _pan;
+	int _panSpeed;
+	MSurface _spareScreens[4];
+	int _scrollCount;
+	int _lineY;
+	uint32 _scrollTimeout;
+	int _panCountdown;
+	int _translationX;
+	Common::File _script;
+	char _currentLine[80];
+	MSurface *_spareScreen;
+	Font *_font;
+private:
+	/**
+	 * Load the text resource
+	 */
+	void load();
+
+	/**
+	 * Process the lines
+	 */
+	void processLines();
+
+	/**
+	 * Process a command from the script file
+	 */
+	void processCommand();
+
+	/**
+	 * Process text from the script file
+	 */
+	void processText();
+
+	/**
+	 * Get a parameter from line
+	 */
+	int getParameter(const char **paramP);
+
+	/**
+	 * Called when the script is finished
+	 */
+	void scriptDone();
+
+	/**
+	 * Reset the game palette
+	 */
+	void resetPalette();
+protected:
+	virtual void display();
+
+	virtual void doFrame();
+public:
+	/**
+	 * Queue the given text resource for display
+	 */
+	static void execute(MADSEngine *vm, const Common::String &resName);
+
+	TextView(MADSEngine *vm);
+
+	virtual ~TextView();
+};
+
+enum ResyncMode { NEVER, ALWAYS, BEGINNING };
+
+struct ResourceEntry {
+	Common::String _resourceName;
+	int _fx;
+	bool _soundFlag;
+	bool _bgFlag;
+	bool _showWhiteBars;
+
+	ResourceEntry() {}
+	ResourceEntry(const Common::String &resName, int fx, bool soundFlag,
+			bool bgFlag, bool showWhiteBars) {
+		_resourceName = resName;
+		_fx = fx;
+		_soundFlag = soundFlag;
+		_bgFlag = bgFlag;
+		_showWhiteBars = showWhiteBars;
+	}
+};
+
+struct ResIndexEntry {
+	int _id;
+	int _v;
+	Common::String _resourceName;
+
+	ResIndexEntry() {}
+};
+
+/**
+* Animation cutscene view
+*/
+class AnimationView : public MenuView {
+private:
+	static char _resourceName[100];
+
+	Common::File _script;
+	uint32 _previousUpdate;
+	Common::String _currentLine;
+	bool _soundDriverLoaded;
+	bool _resetPalette;
+	ResyncMode _resyncMode;
+	int _sfx;
+	bool _soundFlag;
+	bool _bgLoadFlag;
+	bool _showWhiteBars;
+	Common::Array<ResourceEntry> _resources;
+	Common::Array<ResIndexEntry> _resIndex;
+	int _v1;
+	int _v2;
+	int _resourceIndex;
+	SceneInfo *_sceneInfo;
+	Animation *_currentAnimation;
+	int _manualFrameNumber;
+	SpriteAsset *_manualSpriteSet;
+	int _manualStartFrame, _manualEndFrame;
+	int _manualFrame2;
+	int _animFrameNumber;
+	bool _nextCyclingActive;
+private:
+	void checkResource(const Common::String &resourceName);
+
+	int scanResourceIndex(const Common::String &resourceName);
+
+	void load();
+
+	void processLines();
+
+	void processCommand();
+
+	int getParameter();
+
+	void scriptDone();
+
+	void loadNextResource();
+protected:
+	virtual void display();
+
+	virtual void doFrame();
+
+	virtual bool onEvent(Common::Event &event);
+public:
+	/**
+	* Queue the given text resource for display
+	*/
+	static void execute(MADSEngine *vm, const Common::String &resName);
+
+	AnimationView(MADSEngine *vm);
+
+	virtual ~AnimationView();
+};
+
+} // End of namespace MADS
+
+#endif /* MADS_MENU_VIEWS_H */
diff --git a/engines/mads/module.mk b/engines/mads/module.mk
index 96353e9ae5..fc04a2f8ba 100644
--- a/engines/mads/module.mk
+++ b/engines/mads/module.mk
@@ -35,6 +35,7 @@ MODULE_OBJS := \
 	hotspots.o \
 	inventory.o \
 	mads.o \
+	menu_views.o \
 	messages.o \
 	msurface.o \
 	palette.o \
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 35a7d3bdc6..86244bd3bb 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -553,67 +553,6 @@ void PictureDialog::restore() {
 
 /*------------------------------------------------------------------------*/
 
-FullScreenDialog::FullScreenDialog(MADSEngine *vm) : _vm(vm) {
-	_screenId = 990;
-	_palFlag = true;
-}
-
-FullScreenDialog::~FullScreenDialog() {
-	_vm->_screen.resetClipBounds();
-	_vm->_game->_scene.restrictScene();
-}
-
-void FullScreenDialog::display() {
-	Game &game = *_vm->_game;
-	Scene &scene = game._scene;
-
-	int nextSceneId = scene._nextSceneId;
-	int currentSceneId = scene._currentSceneId;
-	int priorSceneId = scene._priorSceneId;
-
-	if (_screenId > 0) {
-		SceneInfo *sceneInfo = SceneInfo::init(_vm);
-		sceneInfo->load(_screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
-	}
-
-	scene._priorSceneId = priorSceneId;
-	scene._currentSceneId = currentSceneId;
-	scene._nextSceneId = nextSceneId;
-
-	_vm->_events->initVars();
-	game._kernelMode = KERNEL_ROOM_INIT;
-
-	byte pal[768];
-	if (_vm->_screenFade) {
-		Common::fill(&pal[0], &pal[PALETTE_SIZE], 0);
-		_vm->_palette->setFullPalette(pal);
-	} else {
-		_vm->_palette->getFullPalette(pal);
-		_vm->_palette->fadeOut(pal, nullptr, 0, PALETTE_COUNT, 0, 1, 1, 16);
-	}
-
-	// Set Fx state and palette entries
-	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kCenterVertTransition;
-	game._trigger = 0;
-
-	// Clear the screen and draw the upper and lower horizontal lines
-	_vm->_screen.empty();
-	_vm->_palette->setLowRange();
-	_vm->_screen.hLine(0, 20, MADS_SCREEN_WIDTH, 2);
-	_vm->_screen.hLine(0, 179, MADS_SCREEN_WIDTH, 2);
-	_vm->_screen.copyRectToScreen(Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
-
-	// Restrict the screen to the area between the two lines
-	_vm->_screen.setClipBounds(Common::Rect(0, DIALOG_TOP, MADS_SCREEN_WIDTH,
-		DIALOG_TOP + MADS_SCENE_HEIGHT));
-	_vm->_game->_scene.restrictScene();
-
-	if (_screenId > 0)
-		scene._spriteSlots.fullRefresh();
-}
-
-/*------------------------------------------------------------------------*/
-
 GameDialog::DialogLine::DialogLine() {
 	_active = true;
 	_state = DLGSTATE_UNSELECTED;
diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h
index f64f992611..d00cd87ead 100644
--- a/engines/mads/nebular/dialogs_nebular.h
+++ b/engines/mads/nebular/dialogs_nebular.h
@@ -31,8 +31,6 @@ namespace MADS {
 
 namespace Nebular {
 
-#define DIALOG_TOP 22
-
 enum CapitalizationMode { kUppercase = 0, kLowercase = 1, kUpperAndLower = 2 };
 
 class DialogsNebular : public Dialogs {
@@ -109,36 +107,6 @@ enum DialogTextAlign { ALIGN_NONE = 0, ALIGN_CENTER = -1, ALIGN_AT_CENTER = -2,
 
 enum DialogState { DLGSTATE_UNSELECTED = 0, DLGSTATE_SELECTED = 1, DLGSTATE_FOCUSED = 2 };
 
-class FullScreenDialog: public EventTarget {
-protected:
-	/**
-	 * Engine reference
-	 */
-	MADSEngine *_vm;
-
-	/**
-	 * Screen/scene to show background from
-	 */
-	int _screenId;
-
-	/**
-	 * Flag for palette initialization
-	 */
-	bool _palFlag;
-
-	/**
-	 * Handles displaying the screen background and dialog
-	 */
-	virtual void display();
-public:
-	/**
-	 * Constructor
-	 */
-	FullScreenDialog(MADSEngine *vm);
-
-	virtual ~FullScreenDialog();
-};
-
 class GameDialog: public FullScreenDialog {
 	struct DialogLine {
 		bool _active;
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 6a13cea195..717e3f6cf9 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 #include "mads/game.h"
 #include "mads/mads.h"
+#include "mads/menu_views.h"
 #include "mads/resources.h"
 #include "mads/scene.h"
 #include "mads/screen.h"
@@ -36,58 +37,6 @@ namespace Nebular {
 #define MADS_MENU_Y ((MADS_SCREEN_HEIGHT - MADS_SCENE_HEIGHT) / 2)
 #define MADS_MENU_ANIM_DELAY 70
 
-MenuView::MenuView(MADSEngine *vm) : FullScreenDialog(vm) {
-	_breakFlag = false;
-	_redrawFlag = true;
-	_palFlag = false;
-}
-
-void MenuView::show() {
- 	Scene &scene = _vm->_game->_scene;	
-	EventsManager &events = *_vm->_events;
-	_vm->_screenFade = SCREEN_FADE_FAST;
-
-	scene._spriteSlots.reset(true);
-	display();
-
-	events.setEventTarget(this);
-	events.hideCursor();
-
-	while (!_breakFlag && !_vm->shouldQuit()) {
-		if (_redrawFlag) {
-			scene._kernelMessages.update();
-
-			_vm->_game->_scene.drawElements(_vm->_game->_fx, _vm->_game->_fx);
-			_redrawFlag = false;
-		}
-
-		_vm->_events->waitForNextFrame();
-		_vm->_game->_fx = kTransitionNone;
-		doFrame();
-	}
-
-	events.setEventTarget(nullptr);
-	_vm->_sound->stop();
-}
-
-void MenuView::display() {
-	_vm->_palette->resetGamePalette(4, 8);
-
-	FullScreenDialog::display();
-}
-
-bool MenuView::onEvent(Common::Event &event) {
-	if (event.type == Common::EVENT_KEYDOWN || event.type == Common::EVENT_LBUTTONDOWN) {
-		_breakFlag = true;
-		_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
-		return true;
-	}
-
-	return false;
-}
-
-/*------------------------------------------------------------------------*/
-
 MainMenu::MainMenu(MADSEngine *vm): MenuView(vm) {
 	Common::fill(&_menuItems[0], &_menuItems[7], (SpriteAsset *)nullptr);
 	Common::fill(&_menuItemIndexes[0], &_menuItemIndexes[7], -1);
@@ -426,706 +375,6 @@ bool AdvertView::onEvent(Common::Event &event) {
 	return false;
 }
 
-/*------------------------------------------------------------------------*/
-
-char TextView::_resourceName[100];
-#define TEXTVIEW_LINE_SPACING 2
-#define TEXT_ANIMATION_DELAY 100
-#define TV_NUM_FADE_STEPS 40
-#define TV_FADE_DELAY_MILLI 50
-
-void TextView::execute(MADSEngine *vm, const Common::String &resName) {
-	assert(resName.size() < 100);
-	Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName));
-	vm->_dialogs->_pendingDialog = DIALOG_TEXTVIEW;
-}
-
-TextView::TextView(MADSEngine *vm) : MenuView(vm) {
-	_animating = false;
-	_panSpeed = 0;
-	_spareScreen = nullptr;
-	_scrollCount = 0;
-	_lineY = -1;
-	_scrollTimeout = 0;
-	_panCountdown = 0;
-	_translationX = 0;
-	_screenId = -1;
-
-	_font = _vm->_font->getFont(FONT_CONVERSATION);
-	_vm->_palette->resetGamePalette(4, 0);
-
-	load();
-}
-
-TextView::~TextView() {
-}
-
-void TextView::load() {
-	Common::String scriptName(_resourceName);
-	scriptName += ".txr";
-
-	if (!_script.open(scriptName))
-		error("Could not open resource %s", _resourceName);
-
-	processLines();
-}
-
-void TextView::processLines() {
-	if (_script.eos())
-		error("Attempted to read past end of response file");
-
-	while (!_script.eos()) {
-		// Read in the next line
-		_script.readLine(_currentLine, 79);
-		char *p = _currentLine + strlen(_currentLine) - 1;
-		if (*p == '\n')
-			*p = '\0';
-
-		// Commented out line, so go loop for another
-		if (_currentLine[0] == '#')
-			continue;
-
-		// Process the line
-		char *cStart = strchr(_currentLine, '[');
-		if (cStart) {
-			while (cStart) {
-				// Loop for possible multiple commands on one line
-				char *cEnd = strchr(_currentLine, ']');
-				if (!cEnd)
-					error("Unterminated command '%s' in response file", _currentLine);
-
-				*cEnd = '\0';
-				processCommand();
-
-				// Copy rest of line (if any) to start of buffer
-				Common::strlcpy(_currentLine, cEnd + 1, sizeof(_currentLine));
-
-				cStart = strchr(_currentLine, '[');
-			}
-
-			if (_currentLine[0]) {
-				processText();
-				break;
-			}
-
-		} else {
-			processText();
-			break;
-		}
-	}
-}
-
-void TextView::processCommand() {
-	Scene &scene = _vm->_game->_scene;
-	Common::String scriptLine(_currentLine + 1);
-	scriptLine.toUppercase();
-	const char *paramP;
-	const char *commandStr = scriptLine.c_str();
-
-	if (!strncmp(commandStr, "BACKGROUND", 10)) {
-		// Set the background
-		paramP = commandStr + 10;
-		resetPalette();
-		int screenId = getParameter(&paramP);
-		
-		SceneInfo *sceneInfo = SceneInfo::init(_vm);
-		sceneInfo->load(screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
-		scene._spriteSlots.fullRefresh();
-		_redrawFlag = true;
-
-	} else if (!strncmp(commandStr, "GO", 2)) {
-		_animating = true;
-
-	} else if (!strncmp(commandStr, "PAN", 3)) {
-		// Set panning values
-		paramP = commandStr + 3;
-		int panX = getParameter(&paramP);
-		int panY = getParameter(&paramP);
-		int panSpeed = getParameter(&paramP);
-
-		if ((panX != 0) || (panY != 0)) {
-			_pan = Common::Point(panX, panY);
-			_panSpeed = panSpeed;
-		}
-
-	} else if (!strncmp(commandStr, "DRIVER", 6)) {
-		// Set the driver to use
-		paramP = commandStr + 7;
-
-		if (!strncmp(paramP, "#SOUND.00", 9)) {
-			int driverNum = paramP[9] - '0';
-			_vm->_sound->init(driverNum);
-		}
-	} else if (!strncmp(commandStr, "SOUND", 5)) {
-		// Set sound number
-		paramP = commandStr + 5;
-		int soundId = getParameter(&paramP);
-		_vm->_sound->command(soundId);
-
-	} else if (!strncmp(commandStr, "COLOR", 5) && ((commandStr[5] == '0') || 
-			(commandStr[5] == '1'))) {
-		// Set the text colors
-		int index = commandStr[5] - '0';
-		paramP = commandStr + 6;
-
-		byte r = getParameter(&paramP);
-		byte g = getParameter(&paramP);
-		byte b = getParameter(&paramP);
-
-		_vm->_palette->setEntry(5 + index, r, g, b);
-
-	} else if (!strncmp(commandStr, "SPARE", 5)) {
-		// Sets a secondary background number that can be later switched in with a PAGE command
-		paramP = commandStr + 6;
-		int spareIndex = commandStr[5] - '0';
-		assert(spareIndex < 4);
-		int screenId = getParameter(&paramP);
-
-		// Load the spare background
-		SceneInfo *sceneInfo = SceneInfo::init(_vm);
-		sceneInfo->_width = MADS_SCREEN_WIDTH;
-		sceneInfo->_height = MADS_SCENE_HEIGHT;
-		_spareScreens[spareIndex].setSize(MADS_SCREEN_WIDTH, MADS_SCENE_HEIGHT);
-		sceneInfo->loadMadsV1Background(screenId, "", SCENEFLAG_TRANSLATE, 
-			_spareScreens[spareIndex]);
-		delete sceneInfo;
-
-	} else if (!strncmp(commandStr, "PAGE", 4)) {
-		// Signals to change to a previous specified secondary background
-		paramP = commandStr + 4;
-		int spareIndex = getParameter(&paramP);
-
-		// Only allow background switches if one isn't currently in progress
-		if (!_spareScreen && _spareScreens[spareIndex].getPixels() != nullptr) {
-			_spareScreen = &_spareScreens[spareIndex];
-			_translationX = 0;
-		}
-
-	} else {
-		error("Unknown response command: '%s'", commandStr);
-	}
-}
-
-int TextView::getParameter(const char **paramP) {
-	if ((**paramP != '=') && (**paramP != ','))
-		return 0;
-
-	int result = 0;
-	++*paramP;
-	while ((**paramP >= '0') && (**paramP <= '9')) {
-		result = result * 10 + (**paramP - '0');
-		++*paramP;
-	}
-
-	return result;
-}
-
-void TextView::processText() {
-	int xStart;
-
-	if (!strcmp(_currentLine, "***")) {
-		// Special signifier for end of script
-		_scrollCount = _font->getHeight() * 13;
-		_lineY = -1;
-		return;
-	}
-
-	_lineY = 0;
-
-	// Lines are always centered, except if line contains a '@', in which case the
-	// '@' marks the position that must be horizontally centered
-	char *centerP = strchr(_currentLine, '@');
-	if (centerP) {
-		*centerP = '\0';
-		xStart = (MADS_SCREEN_WIDTH / 2) - _font->getWidth(_currentLine);
-
-		// Delete the @ character and shift back the remainder of the string
-		char *p = centerP + 1;
-		if (*p == ' ') ++p;
-		strcpy(centerP, p);
-
-	} else {
-		int lineWidth = _font->getWidth(_currentLine);
-		xStart = (MADS_SCREEN_WIDTH - lineWidth) / 2;
-	}
-
-	// Add the new line to the list of pending lines
-	TextLine tl;
-	tl._pos = Common::Point(xStart, MADS_SCENE_HEIGHT);
-	tl._line = _currentLine;
-	tl._textDisplayIndex = -1;
-	_textLines.push_back(tl);
-}
-
-void TextView::display() {
-	FullScreenDialog::display();
-}
-
-void TextView::resetPalette() {
-	_vm->_palette->resetGamePalette(8, 8);
-	_vm->_palette->setEntry(5, 0, 63, 63);
-	_vm->_palette->setEntry(6, 0, 45, 45);
-}
-
-void TextView::doFrame() {
-	Scene &scene = _vm->_game->_scene;
-	if (!_animating)
-		return;
-
-	// Only update state if wait period has expired
-	uint32 currTime = g_system->getMillis();
-
-	// If a screen transition is in progress and it's time for another column, handle it
-	if (_spareScreen) {
-		byte *srcP = _spareScreen->getBasePtr(_translationX, 0);
-		byte *bgP = scene._backgroundSurface.getBasePtr(_translationX, 0);
-		byte *screenP = (byte *)_vm->_screen.getBasePtr(_translationX, 0);
-
-		for (int y = 0; y < MADS_SCENE_HEIGHT; ++y, srcP += MADS_SCREEN_WIDTH,
-			bgP += MADS_SCREEN_WIDTH, screenP += MADS_SCREEN_WIDTH) {
-			*bgP = *srcP;
-			*screenP = *srcP;
-		}
-
-		// Flag the column of the screen is modified
-		_vm->_screen.copyRectToScreen(Common::Rect(_translationX, 0,
-			_translationX + 1, MADS_SCENE_HEIGHT));
-
-		// Keep moving the column to copy to the right
-		if (++_translationX == MADS_SCREEN_WIDTH) {
-			// Surface transition is complete
-			_spareScreen = nullptr;
-		}
-	}
-
-	// Make sure it's time for an update
-	if (currTime < _scrollTimeout)
-		return;
-	_scrollTimeout = g_system->getMillis() + TEXT_ANIMATION_DELAY;
-	_redrawFlag = true;
-
-	// If any panning values are set, pan the background surface
-	if ((_pan.x != 0) || (_pan.y != 0)) {
-		if (_panCountdown > 0) {
-			--_panCountdown;
-			return;
-		}
-
-		// Handle horizontal panning
-		if (_pan.x != 0) {
-			byte *lineTemp = new byte[_pan.x];
-			for (int y = 0; y < MADS_SCENE_HEIGHT; ++y) {
-				byte *pixelsP = (byte *)scene._backgroundSurface.getBasePtr(0, y);
-
-				// Copy the first X pixels into temp buffer, move the rest of the line
-				// to the start of the line, and then move temp buffer pixels to end of line
-				Common::copy(pixelsP, pixelsP + _pan.x, lineTemp);
-				Common::copy(pixelsP + _pan.x, pixelsP + MADS_SCREEN_WIDTH, pixelsP);
-				Common::copy(lineTemp, lineTemp + _pan.x, pixelsP + MADS_SCREEN_WIDTH - _pan.x);
-			}
-
-			delete[] lineTemp;
-		}
-
-		// Handle vertical panning
-		if (_pan.y != 0) {
-			// Store the bottom Y lines into a temp buffer, move the rest of the lines down,
-			// and then copy the stored lines back to the top of the screen
-			byte *linesTemp = new byte[_pan.y * MADS_SCREEN_WIDTH];
-			byte *pixelsP = (byte *)scene._backgroundSurface.getBasePtr(0, MADS_SCENE_HEIGHT - _pan.y);
-			Common::copy(pixelsP, pixelsP + MADS_SCREEN_WIDTH * _pan.y, linesTemp);
-
-			for (int y = MADS_SCENE_HEIGHT - 1; y >= _pan.y; --y) {
-				byte *destP = (byte *)scene._backgroundSurface.getBasePtr(0, y);
-				byte *srcP = (byte *)scene._backgroundSurface.getBasePtr(0, y - _pan.y);
-				Common::copy(srcP, srcP + MADS_SCREEN_WIDTH, destP);
-			}
-
-			Common::copy(linesTemp, linesTemp + _pan.y * MADS_SCREEN_WIDTH, 
-				(byte *)scene._backgroundSurface.getPixels());
-			delete[] linesTemp;
-		}
-
-		// Flag for a full screen refresh
-		scene._spriteSlots.fullRefresh();
-	}
-
-	// Scroll all active text lines up
-	for (int i = _textLines.size() - 1; i >= 0; --i) {
-		TextLine &tl = _textLines[i];
-		if (tl._textDisplayIndex != -1)
-			// Expire the text line that's already on-screen
-			scene._textDisplay.expire(tl._textDisplayIndex);
-
-		tl._pos.y--;
-		if (tl._pos.y < 0) {
-			_textLines.remove_at(i);
-		} else {
-			tl._textDisplayIndex = scene._textDisplay.add(tl._pos.x, tl._pos.y, 
-				0x605, -1, tl._line, _font);
-		}
-	}
-
-	if (_scrollCount > 0) {
-		// Handling final scrolling of text off of screen
-		if (--_scrollCount == 0) {
-			scriptDone();
-			return;
-		}
-	} else {
-		// Handling a text row
-		if (++_lineY == (_font->getHeight() + TEXTVIEW_LINE_SPACING))
-			processLines();
-	}
-}
-
-void TextView::scriptDone() {
-	_breakFlag = true;
-	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
-}
-
-/*------------------------------------------------------------------------*/
-
-char AnimationView::_resourceName[100];
-
-void AnimationView::execute(MADSEngine *vm, const Common::String &resName) {
-	assert(resName.size() < 100);
-	Common::strlcpy(_resourceName, resName.c_str(), sizeof(_resourceName));
-	vm->_dialogs->_pendingDialog = DIALOG_ANIMVIEW;
-}
-
-AnimationView::AnimationView(MADSEngine *vm) : MenuView(vm) {
-	_redrawFlag = false;
-
-	_soundDriverLoaded = false;
-	_previousUpdate = 0;
-	_screenId = -1;
-	_resetPalette = false;
-	_resyncMode = NEVER;
-	_v1 = 0;
-	_v2 = -1;
-	_resourceIndex = -1;
-	_currentAnimation = nullptr;
-	_sfx = 0;
-	_soundFlag = _bgLoadFlag = true;
-	_showWhiteBars = true;
-	_manualFrameNumber = 0;
-	_manualSpriteSet = nullptr;
-	_manualStartFrame = _manualEndFrame = 0;
-	_manualFrame2 = 0;
-	_animFrameNumber = 0;
-	_nextCyclingActive = false;
-	_sceneInfo = SceneInfo::init(_vm);
-
-	load();
-}
-
-AnimationView::~AnimationView() {
-	delete _currentAnimation;
-	delete _sceneInfo;
-}
-
-void AnimationView::load() {
-	Common::String resName(_resourceName);
-	if (!resName.hasSuffix("."))
-		resName += ".res";
-
-	if (!_script.open(resName))
-		error("Could not open resource %s", resName.c_str());
-
-	processLines();
-}
-
-void AnimationView::display() {
-	Scene &scene = _vm->_game->_scene;
-	_vm->_palette->initPalette();
-	Common::fill(&_vm->_palette->_cyclingPalette[0], &_vm->_palette->_cyclingPalette[PALETTE_SIZE], 0);
-
-	_vm->_palette->resetGamePalette(1, 8);
-	scene._spriteSlots.reset();
-	scene._paletteCycles.clear();
-
-	MenuView::display();
-}
-
-bool AnimationView::onEvent(Common::Event &event) {
-	// Wait for the Escape key or a mouse press
-	if (((event.type == Common::EVENT_KEYDOWN) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) ||
-			(event.type == Common::EVENT_RBUTTONUP)) {
-		scriptDone();
-		return true;
-	}
-
-	return false;
-}
-
-void AnimationView::doFrame() {
-	Scene &scene = _vm->_game->_scene;
-	
-	if (_resourceIndex == -1 || _currentAnimation->freeFlag()) {
-		if (++_resourceIndex == (int)_resources.size()) {
-			scriptDone();
-		} else {
-			scene._frameStartTime = 0;
-			loadNextResource();
-		}
-	} else if (_currentAnimation->getCurrentFrame() == 1) {
-		scene._cyclingActive = _nextCyclingActive;
-	}
-
-	if (_currentAnimation) {
-		++scene._frameStartTime;
-		_currentAnimation->update();
-		_redrawFlag = true;
-	}
-}
-
-void AnimationView::loadNextResource() {
-	Scene &scene = _vm->_game->_scene;
-	Palette &palette = *_vm->_palette;
-	ResourceEntry &resEntry = _resources[_resourceIndex];
-	Common::Array<PaletteCycle> paletteCycles;
-
-	if (resEntry._bgFlag)
-		palette.resetGamePalette(1, 8);
-
-	palette._mainPalette[253 * 3] = palette._mainPalette[253 * 3 + 1] 
-		= palette._mainPalette[253 * 3 + 2] = 0xb4;
-	palette.setPalette(&palette._mainPalette[253 * 3], 253, 1);
-
-	// Free any previous messages
-	scene._kernelMessages.reset();
-
-	// Handle the bars at the top/bottom
-	if (resEntry._showWhiteBars) {
-		// For animations the screen has been clipped to the middle 156 rows.
-		// So although it's slightly messy, bypass our screen class entirely,
-		// and draw the horizontal lines directly on the physiacl screen surface
-		Graphics::Surface *s = g_system->lockScreen();
-		s->hLine(0, 20, MADS_SCREEN_WIDTH, 253);
-		s->hLine(0, 179, MADS_SCREEN_WIDTH, 253);
-		g_system->unlockScreen();
-	}
-
-	// Load the new animation
-	delete _currentAnimation;
-	_currentAnimation = Animation::init(_vm, &scene);
-	int flags = ANIMFLAG_ANIMVIEW | (resEntry._bgFlag ? ANIMFLAG_LOAD_BACKGROUND : 0);
-	_currentAnimation->load(scene._backgroundSurface, scene._depthSurface, 
-		resEntry._resourceName, flags, &paletteCycles, _sceneInfo);
-
-	// Signal for a screen refresh
-	scene._spriteSlots.fullRefresh();
-
-	// If a sound driver has been specified, then load the correct one
-	if (!_currentAnimation->_header._soundName.empty()) {
-		const char *chP = strchr(_currentAnimation->_header._soundName.c_str(), '.');
-		assert(chP);
-
-		// Handle both Rex naming (xxx.009) and naming in later games (e.g. xxx.ph9)
-		int driverNum = atoi(chP + 3);
-		// HACK for Dragon
-		if (_currentAnimation->_header._soundName == "#SOUND.DRG")
-			driverNum = 9;
-		_vm->_sound->init(driverNum);
-	}
-
-	// Handle any manual setup
-	if (_currentAnimation->_header._manualFlag) {
-		_manualFrameNumber = _currentAnimation->_header._spritesIndex;
-		_manualSpriteSet = _currentAnimation->getSpriteSet(_manualFrameNumber);
-	}
-
-	// Set the sound data for the animation
-	_vm->_sound->setEnabled(resEntry._soundFlag);
-
-	Common::String dsrName = _currentAnimation->_header._dsrName;
-	if (!dsrName.empty())
-		_vm->_audio->setSoundGroup(dsrName);
-
-	// Start the new animation
-	_currentAnimation->startAnimation(0);
-
-	// Handle the palette and cycling palette
-	scene._cyclingActive = false;
-	Common::copy(&palette._mainPalette[0], &palette._mainPalette[PALETTE_SIZE],
-		&palette._cyclingPalette[0]);
-
-	_vm->_game->_fx = (ScreenTransition)resEntry._fx;
-	_nextCyclingActive = paletteCycles.size() > 0;
-	if (!_vm->_game->_fx) {
-		palette.setFullPalette(palette._mainPalette);
-	}
-
-	scene.initPaletteAnimation(paletteCycles, _nextCyclingActive && !_vm->_game->_fx);
-}
-
-void AnimationView::scriptDone() {
-	_breakFlag = true;
-	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
-}
-
-void AnimationView::processLines() {
-	if (_script.eos()) {
-		// end of script, end animation
-		scriptDone();
-		return;
-	}
-
-	while (!_script.eos()) {
-		// Get in next line
-		_currentLine.clear();
-		char c;
-		while (!_script.eos() && (c = _script.readByte()) != '\n') {
-			if (c != '\r' && c != '\0')
-				_currentLine += c;
-		}
-		
-		// Process the line
-		while (!_currentLine.empty()) {
-			if (_currentLine.hasPrefix("-")) {
-				_currentLine.deleteChar(0);
-
-				processCommand();
-			} else {
-				// Get resource name
-				Common::String resName;
-				while (!_currentLine.empty() && (c = _currentLine[0]) != ' ') {
-					_currentLine.deleteChar(0);
-					resName += c;
-				}
-
-				// Add resource into list along with any set state information
-				_resources.push_back(ResourceEntry(resName, _sfx, _soundFlag, 
-					_bgLoadFlag, _showWhiteBars));
-
-				// Fx resets between resource entries
-				_sfx = 0;
-			}
-
-			// Skip any spaces
-			while (_currentLine.hasPrefix(" "))
-				_currentLine.deleteChar(0);
-		}
-	}
-}
-
-void AnimationView::processCommand() {
-	// Get the command character
-	char commandChar = toupper(_currentLine[0]);
-	_currentLine.deleteChar(0);
-
-	// Handle the command
-	switch (commandChar) {
-	case 'B':
-		_soundFlag = !_soundFlag;
-		break;
-	case 'H':
-		// -h[:ex]  Disable EMS / XMS high memory support
-		if (_currentLine.hasPrefix(":"))
-			_currentLine.deleteChar(0);
-		while (_currentLine.hasPrefix("e") || _currentLine.hasPrefix("x"))
-			_currentLine.deleteChar(0);
-		break;
-	case 'O':
-		// -o:xxx  Specify opening special effect
-		assert(_currentLine[0] == ':');
-		_currentLine.deleteChar(0);
-		_sfx = getParameter();
-		break;
-	case 'P':
-		// Switch to CONCAT mode, which is ignored anyway
-		break;
-	case 'R': {
-		// Resynch timer (always, beginning, never)
-		assert(_currentLine[0] == ':');
-		_currentLine.deleteChar(0);
-
-		char v = toupper(_currentLine[0]);
-		_currentLine.deleteChar(0);
-		if (v == 'N')
-			_resyncMode = NEVER;
-		else if (v == 'A')
-			_resyncMode = ALWAYS;
-		else if (v == 'B')
-			_resyncMode = BEGINNING;
-		else
-			error("Unknown parameter");
-		break;
-	}
-	case 'W':
-		// Switch white bars being visible
-		_showWhiteBars = !_showWhiteBars;
-		break;
-	case 'X':
-		// Exit after animation finishes. Ignore
-		break;
-	case 'D':
-		// Unimplemented and ignored in the original. Ignore as well
-		break;
-	case 'Y':
-		// Reset palette on startup
-		_resetPalette = true;
-		break;
-	default:
-		error("Unknown command char: '%c'", commandChar);
-	}
-}
-
-int AnimationView::getParameter() {
-	int result = 0;
-
-	while (!_currentLine.empty()) {
-		char c = _currentLine[0];
-		
-		if (c >= '0' && c <= '9') {
-			_currentLine.deleteChar(0);
-			result = result * 10 + (c - '0');
-		} else {
-			break;
-		}
-	}
-
-	return result;
-}
-
-void AnimationView::checkResource(const Common::String &resourceName) {
-	//bool hasSuffix = false;
-	
-}
-
-int AnimationView::scanResourceIndex(const Common::String &resourceName) {
-	int foundIndex = -1;
-
-	if (_v1) {
-		const char *chP = strchr(resourceName.c_str(), '\\');
-		if (!chP) {
-			chP = strchr(resourceName.c_str(), '*');
-		}
-
-		Common::String resName = chP ? Common::String(chP + 1) : resourceName;
-
-		if (_v2 != 3) {
-			assert(_resIndex.size() == 0);
-		}
-
-		// Scan for the resource name
-		for (uint resIndex = 0; resIndex < _resIndex.size(); ++resIndex) {
-			ResIndexEntry &resEntry = _resIndex[resIndex];
-			if (resEntry._resourceName.compareToIgnoreCase(resourceName)) {
-				foundIndex = resIndex;
-				break;
-			}
-		}
-	}
-
-	if (foundIndex >= 0) {
-		// TODO
-	}
-	return -1;
-}
-
-
 } // End of namespace Nebular
 
 } // End of namespace MADS
diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h
index c05c87258e..29777a7a7c 100644
--- a/engines/mads/nebular/menu_nebular.h
+++ b/engines/mads/nebular/menu_nebular.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "mads/game.h"
+#include "mads/menu_views.h"
 #include "mads/msurface.h"
 #include "mads/nebular/dialogs_nebular.h"
 
@@ -36,27 +37,6 @@ namespace Nebular {
 
 enum MADSGameAction { START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT };
 
-class MenuView: public FullScreenDialog {
-protected:
-	bool _breakFlag;
-	bool _redrawFlag;
-
-	virtual void doFrame() = 0;
-
-	virtual void display();
-
-	/**
-	* Event handler
-	*/
-	virtual bool onEvent(Common::Event &event);
-public:
-	MenuView(MADSEngine *vm);
-
-	virtual ~MenuView() {}
-
-	virtual void show();
-};
-
 class MainMenu: public MenuView {
 private:
 	SpriteAsset *_menuItems[7];
@@ -148,174 +128,6 @@ public:
 	void show();
 };
 
-struct TextLine {
-	Common::Point _pos;
-	Common::String _line;
-	int _textDisplayIndex;
-};
-
-/**
- * Scrolling text view
- */
-class TextView : public MenuView {
-private:
-	static char _resourceName[100];
-
-	bool _animating;
-	Common::Array<TextLine> _textLines;
-	Common::Point _pan;
-	int _panSpeed;
-	MSurface _spareScreens[4];
-	int _scrollCount;
-	int _lineY;
-	uint32 _scrollTimeout;
-	int _panCountdown;
-	int _translationX;
-	Common::File _script;
-	char _currentLine[80];
-	MSurface *_spareScreen;
-	Font *_font;
-private:
-	/**
-	 * Load the text resource
-	 */
-	void load();
-
-	/**
-	 * Process the lines
-	 */
-	void processLines();
-
-	/**
-	 * Process a command from the script file
-	 */
-	void processCommand();
-
-	/**
-	 * Process text from the script file
-	 */
-	void processText();
-
-	/**
-	 * Get a parameter from line
-	 */
-	int getParameter(const char **paramP);
-
-	/**
-	 * Called when the script is finished
-	 */
-	void scriptDone();
-
-	/**
-	 * Reset the game palette
-	 */
-	void resetPalette();
-protected:
-	virtual void display();
-
-	virtual void doFrame();
-public:
-	/**
-	 * Queue the given text resource for display
-	 */
-	static void execute(MADSEngine *vm, const Common::String &resName);
-
-	TextView(MADSEngine *vm);
-
-	virtual ~TextView();
-};
-
-enum ResyncMode { NEVER, ALWAYS, BEGINNING };
-
-struct ResourceEntry {
-	Common::String _resourceName;
-	int _fx;
-	bool _soundFlag;
-	bool _bgFlag;
-	bool _showWhiteBars;
-
-	ResourceEntry() {}
-	ResourceEntry(const Common::String &resName, int fx, bool soundFlag,
-			bool bgFlag, bool showWhiteBars) {
-		_resourceName = resName;
-		_fx = fx;
-		_soundFlag = soundFlag;
-		_bgFlag = bgFlag;
-		_showWhiteBars = showWhiteBars;
-	}
-};
-
-struct ResIndexEntry {
-	int _id;
-	int _v;
-	Common::String _resourceName;
-
-	ResIndexEntry() {}
-};
-
-/**
-* Animation cutscene view
-*/
-class AnimationView : public MenuView {
-private:
-	static char _resourceName[100];
-
-	Common::File _script;
-	uint32 _previousUpdate;
-	Common::String _currentLine;
-	bool _soundDriverLoaded;
-	bool _resetPalette;
-	ResyncMode _resyncMode;
-	int _sfx;
-	bool _soundFlag;
-	bool _bgLoadFlag;
-	bool _showWhiteBars;
-	Common::Array<ResourceEntry> _resources;
-	Common::Array<ResIndexEntry> _resIndex;
-	int _v1;
-	int _v2;
-	int _resourceIndex;
-	SceneInfo *_sceneInfo;
-	Animation *_currentAnimation;
-	int _manualFrameNumber;
-	SpriteAsset *_manualSpriteSet;
-	int _manualStartFrame, _manualEndFrame;
-	int _manualFrame2;
-	int _animFrameNumber;
-	bool _nextCyclingActive;
-private:
-	void checkResource(const Common::String &resourceName);
-
-	int scanResourceIndex(const Common::String &resourceName);
-
-	void load();
-
-	void processLines();
-
-	void processCommand();
-
-	int getParameter();
-
-	void scriptDone();
-
-	void loadNextResource();
-protected:
-	virtual void display();
-
-	virtual void doFrame();
-
-	virtual bool onEvent(Common::Event &event);
-public:
-	/**
-	* Queue the given text resource for display
-	*/
-	static void execute(MADSEngine *vm, const Common::String &resName);
-
-	AnimationView(MADSEngine *vm);
-
-	virtual ~AnimationView();
-};
-
 } // End of namespace Nebular
 
 } // End of namespace MADS
-- 
cgit v1.2.3


From e6d1337e115d4a49d9103e33b1e75133d237e090 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 15 Oct 2014 18:51:14 +0300
Subject: SCI: Ignore most of the non-alphanumeric characters in the parser

This is a more proper handling of non-alphanumeric characters (e.g.
apostrophes) in SCI games with a parser - bug #6608
---
 engines/sci/parser/vocabulary.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 3344b79e26..7fc02dc9a0 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -535,9 +535,9 @@ bool Vocabulary::tokenizeString(ResultWordListList &retval, const char *sentence
 		if (Common::isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
 			currentWord[wordLen] = lowerCaseMap[c];
 			++wordLen;
-		} else if (c == '\'' && wordLen && (sentence[pos_in_sentence] == 's' || sentence[pos_in_sentence] == 'S')) {
-			// Skip apostrophe-s at the end of the word, if it exists
-			pos_in_sentence++;	// skip the 's'
+		} else if (!Common::isAlpha(c) && c != '-' && c != ' ' && c != '\0' && (g_sci->getLanguage() != Common::JA_JPN)) {
+			// Skip non-alphanumeric characters in the string.
+			// Note: hyphens ('-'), spaces and string terminators are handled in the other branches.
 		} else {
 			// Continue on this word. Words may contain a '-', but may not start with
 			// one.
-- 
cgit v1.2.3


From 740d1620f20511449c492190fa6432bb85439cc9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 15 Oct 2014 19:44:03 +0300
Subject: SCI: Simplify check for non-alphanumeric characters in the parser

This is also for bug #6608. Many thanks to wjp for his help with this
---
 engines/sci/parser/vocabulary.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 7fc02dc9a0..000b037b44 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -535,10 +535,7 @@ bool Vocabulary::tokenizeString(ResultWordListList &retval, const char *sentence
 		if (Common::isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
 			currentWord[wordLen] = lowerCaseMap[c];
 			++wordLen;
-		} else if (!Common::isAlpha(c) && c != '-' && c != ' ' && c != '\0' && (g_sci->getLanguage() != Common::JA_JPN)) {
-			// Skip non-alphanumeric characters in the string.
-			// Note: hyphens ('-'), spaces and string terminators are handled in the other branches.
-		} else {
+		} else if (c == ' ' || c == '\0') {
 			// Continue on this word. Words may contain a '-', but may not start with
 			// one.
 
-- 
cgit v1.2.3


From cc175b5af4e2e9117f1313e38304fa9343b0d095 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sun, 2 Feb 2014 22:26:29 +0100
Subject: WINTERMUTE: Import subtitle code from WME1

---
 engines/wintermute/module.mk                     |   2 +
 engines/wintermute/video/video_subtitle.cpp      |  59 +++++++
 engines/wintermute/video/video_subtitle.h        |  49 ++++++
 engines/wintermute/video/video_subtitler.cpp     | 213 +++++++++++++++++++++++
 engines/wintermute/video/video_subtitler.h       |  54 ++++++
 engines/wintermute/video/video_theora_player.cpp |   3 +-
 engines/wintermute/video/video_theora_player.h   |   3 +-
 7 files changed, 380 insertions(+), 3 deletions(-)
 create mode 100644 engines/wintermute/video/video_subtitle.cpp
 create mode 100644 engines/wintermute/video/video_subtitle.h
 create mode 100644 engines/wintermute/video/video_subtitler.cpp
 create mode 100644 engines/wintermute/video/video_subtitler.h

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 1b6c52e0b7..b4845b0552 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -109,6 +109,8 @@ MODULE_OBJS := \
 	utils/string_util.o \
 	utils/utils.o \
 	video/video_player.o \
+	video/video_subtitle.o \
+	video/video_subtitler.o \
 	video/video_theora_player.o \
 	debugger.o \
 	wintermute.o \
diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
new file mode 100644
index 0000000000..45b0ee65cf
--- /dev/null
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on Wintermute Engine
+ * http://dead-code.org/redir.php?target=wme
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+// #include "dcgf.h"
+#include "engines/wintermute/video/video_subtitle.h"
+
+namespace Wintermute {
+
+//////////////////////////////////////////////////////////////////////////
+CVidSubtitle::CVidSubtitle(BaseGame* inGame):BaseClass(inGame)
+{
+	m_Text = NULL;
+	m_StartFrame = m_EndFrame = 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CVidSubtitle::CVidSubtitle(BaseGame* inGame, char* Text, long StartFrame, long EndFrame):BaseClass(inGame)
+{
+	m_Text = new char[strlen(Text)+1];
+	strcpy(m_Text, Text);
+//	_gameRef->m_StringTable->Expand(&m_Text);
+
+	m_StartFrame = StartFrame;
+	m_EndFrame = EndFrame;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CVidSubtitle::~CVidSubtitle()
+{
+	// SAFE_DELETE_ARRAY(m_Text);
+}
+}
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
new file mode 100644
index 0000000000..0b3d591f6d
--- /dev/null
+++ b/engines/wintermute/video/video_subtitle.h
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on Wintermute Engine
+ * http://dead-code.org/redir.php?target=wme
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#ifndef WINTERMUTE_VIDSUBTITLE_H
+#define WINTERMUTE_VIDSUBTITLE_H
+
+#include "engines/wintermute/base/base.h"
+
+namespace Wintermute {
+
+class CVidSubtitle : public BaseClass
+{
+public:
+	long m_EndFrame;
+	long m_StartFrame;
+	char* m_Text;
+	CVidSubtitle(BaseGame* inGame);
+	CVidSubtitle(BaseGame* inGame, char* Text, long StartFrame, long EndFrame);
+	virtual ~CVidSubtitle();
+
+};
+}
+
+#endif
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
new file mode 100644
index 0000000000..ca812c57a1
--- /dev/null
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -0,0 +1,213 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on Wintermute Engine
+ * http://dead-code.org/redir.php?target=wme
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+
+//  #include "dcgf.h"
+#include "engines/wintermute/video/video_subtitler.h"
+#define S_OK 0
+#define BYTE byte
+#define LONG long
+#define MAX_PATH 127
+#define _MAX_DRIVE 127
+#define _MAX_DIR 127
+#define _MAX_FNAME 127
+#define DWORD byte
+
+namespace Wintermute {
+//////////////////////////////////////////////////////////////////////////
+CVidSubtitler::CVidSubtitler(BaseGame *inGame):BaseClass(inGame)
+{
+	m_LastSample = -1;
+	m_CurrentSubtitle = 0;
+	m_ShowSubtitle = false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+CVidSubtitler::~CVidSubtitler(void)
+{
+	for(int i=0; i<m_Subtitles.size(); i++) delete m_Subtitles[i];
+	m_Subtitles.clear();
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CVidSubtitler::LoadSubtitles(char* Filename, char* SubtitleFile)
+{
+	if(!Filename) return S_OK;
+
+	for(int i=0; i<m_Subtitles.size(); i++) delete m_Subtitles[i];
+	m_Subtitles.clear();
+
+	m_LastSample = -1;
+	m_CurrentSubtitle = 0;
+	m_ShowSubtitle = false;
+
+
+	char NewFile[MAX_PATH];
+	char drive[_MAX_DRIVE];
+	char dir[_MAX_DIR];
+	char fname[_MAX_FNAME];
+
+	if(SubtitleFile)
+	{
+		strcpy(NewFile, SubtitleFile);
+	}
+#if 0
+	else
+	{
+		_splitpath(Filename, drive, dir, fname, NULL);
+		_makepath(NewFile, drive, dir, fname, ".SUB");
+	}
+#endif
+	DWORD Size;
+
+#if 0
+	BYTE* Buffer = _gameRef->m_FileManager->ReadWholeFile(NewFile, &Size, false);
+
+	if(Buffer==NULL) return S_OK; // no subtitles
+
+
+	LONG Start, End;
+	bool InToken;
+	char* TokenStart;
+	int TokenLength;
+	int TokenPos;
+	int TextLength;
+
+	int Pos = 0;
+	int LineLength = 0;
+	while(Pos<Size){
+		Start = End = -1;
+		InToken = false;
+		TokenPos = -1;
+		TextLength = 0;
+
+		LineLength = 0;
+		while(Pos+LineLength < Size && Buffer[Pos+LineLength]!='\n' && Buffer[Pos+LineLength]!='\0') LineLength++;
+
+		int RealLength = LineLength - (Pos+LineLength>=Size?0:1);
+		char* Text = new char[RealLength+1];
+		char* line = (char*)&Buffer[Pos];
+
+		for(int i=0; i<RealLength; i++){
+			if(line[i]=='{'){
+				if(!InToken){
+					InToken = true;
+					TokenStart = line+i+1;
+					TokenLength = 0;
+					TokenPos++;
+				}
+				else TokenLength++;
+			}
+			else if(line[i]=='}'){
+				if(InToken){
+					InToken = false;
+					char* Token = new char[TokenLength+1];
+					strncpy(Token, TokenStart, TokenLength);
+					Token[TokenLength] = '\0';
+					if(TokenPos==0) Start = atoi(Token);
+					else if(TokenPos==1) End = atoi(Token);
+
+					delete [] Token;
+				}
+				else{
+					Text[TextLength] = line[i];
+					TextLength++;
+				}
+			}
+			else{
+				if(InToken){
+					TokenLength++;
+				}
+				else{
+					Text[TextLength] = line[i];
+					if(Text[TextLength]=='|') Text[TextLength] = '\n';
+					TextLength++;
+				}
+			}
+		}
+		Text[TextLength] = '\0';
+
+		if(Start!=-1 && TextLength>0 && (Start!=1 || End!=1)) m_Subtitles.Add(new CVidSubtitle(Game, Text, Start, End));
+
+		delete [] Text;
+
+		Pos+=LineLength+1;
+	}
+
+	delete [] Buffer;
+#endif
+	return S_OK;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CVidSubtitler::Display()
+{
+#if 0
+	if(m_ShowSubtitle)
+	{
+		CBFont* font = Game->m_VideoFont?Game->m_VideoFont:Game->m_SystemFont;
+		int Height = font->GetTextHeight((BYTE*)m_Subtitles[m_CurrentSubtitle]->m_Text, Game->m_Renderer->m_Width);
+		font->DrawText((BYTE*)m_Subtitles[m_CurrentSubtitle]->m_Text, 0, Game->m_Renderer->m_Height-Height-5, Game->m_Renderer->m_Width, TAL_CENTER);
+	}
+#endif
+	return S_OK;
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool CVidSubtitler::Update(LONG Frame)
+{
+	if(Frame != m_LastSample)
+	{
+		m_LastSample = Frame;
+
+		// process subtitles
+		m_ShowSubtitle = false;
+		while(m_CurrentSubtitle<m_Subtitles.size()){
+			int End = m_Subtitles[m_CurrentSubtitle]->m_EndFrame;
+
+			bool NextFrameOK = (m_CurrentSubtitle < m_Subtitles.size()-1 && m_Subtitles[m_CurrentSubtitle+1]->m_StartFrame <= Frame);
+
+			if(Frame > End){
+				if(NextFrameOK){
+					m_CurrentSubtitle++;
+				}
+				else{
+					m_ShowSubtitle = (End==0);
+					break;
+				}
+			}
+			else{
+				m_ShowSubtitle = true;
+				break;
+			}
+		}
+	}
+	return S_OK;
+}
+}
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
new file mode 100644
index 0000000000..144e90f228
--- /dev/null
+++ b/engines/wintermute/video/video_subtitler.h
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on Wintermute Engine
+ * http://dead-code.org/redir.php?target=wme
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#ifndef WINTERMUTE_VIDSUBTITLER_H
+#define WINTERMUTE_VIDSUBTITLER_H
+
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/video/video_subtitle.h"
+
+namespace Wintermute {
+
+class CVidSubtitler :
+	public BaseClass
+{
+public:
+	CVidSubtitler(BaseGame *inGame);
+	virtual ~CVidSubtitler(void);
+
+	bool m_ShowSubtitle;
+	int m_CurrentSubtitle;
+	bool LoadSubtitles(char* Filename, char* SubtitleFile);
+	bool Display();
+	bool Update(long Frame);
+	long m_LastSample;
+	Common::Array<CVidSubtitle*> m_Subtitles;
+};
+}
+
+#endif
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index e1553580ec..fc1571054c 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -85,8 +85,7 @@ void VideoTheoraPlayer::SetDefaults() {
 	_volume = 100;
 	_theoraDecoder = nullptr;
 
-	// TODO: Add subtitles-support
-	//_subtitler = nullptr;
+	_subtitler = new CVidSubtitler(_gameRef);
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 8274a1444f..2d79c5404b 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -31,6 +31,7 @@
 
 #include "engines/wintermute/base/base.h"
 #include "engines/wintermute/persistent.h"
+#include "engines/wintermute/video/video_subtitler.h"
 #include "video/video_decoder.h"
 #include "common/stream.h"
 #include "graphics/surface.h"
@@ -59,7 +60,7 @@ public:
 	Common::String _filename;
 
 	BaseSurface *_texture;
-	//CVidSubtitler *_subtitler;
+	CVidSubtitler *_subtitler;
 
 	// control methods
 	bool initialize(const Common::String &filename, const Common::String &subtitleFile = Common::String());
-- 
cgit v1.2.3


From 5ee11d6c21ad991ed30a043dd94656a9da0d6256 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 19:29:12 +0200
Subject: WINTERMUTE: Astyle imported WME subtitle code

---
 engines/wintermute/video/video_subtitle.cpp  |  11 +--
 engines/wintermute/video/video_subtitle.h    |   9 +--
 engines/wintermute/video/video_subtitler.cpp | 110 ++++++++++++---------------
 engines/wintermute/video/video_subtitler.h   |   7 +-
 4 files changed, 58 insertions(+), 79 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index 45b0ee65cf..74b3119503 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -32,17 +32,15 @@
 namespace Wintermute {
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitle::CVidSubtitle(BaseGame* inGame):BaseClass(inGame)
-{
+CVidSubtitle::CVidSubtitle(BaseGame *inGame): BaseClass(inGame) {
 	m_Text = NULL;
 	m_StartFrame = m_EndFrame = 0;
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitle::CVidSubtitle(BaseGame* inGame, char* Text, long StartFrame, long EndFrame):BaseClass(inGame)
-{
-	m_Text = new char[strlen(Text)+1];
+CVidSubtitle::CVidSubtitle(BaseGame *inGame, char *Text, long StartFrame, long EndFrame): BaseClass(inGame) {
+	m_Text = new char[strlen(Text) + 1];
 	strcpy(m_Text, Text);
 //	_gameRef->m_StringTable->Expand(&m_Text);
 
@@ -52,8 +50,7 @@ CVidSubtitle::CVidSubtitle(BaseGame* inGame, char* Text, long StartFrame, long E
 
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitle::~CVidSubtitle()
-{
+CVidSubtitle::~CVidSubtitle() {
 	// SAFE_DELETE_ARRAY(m_Text);
 }
 }
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 0b3d591f6d..e93007bd3b 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -33,14 +33,13 @@
 
 namespace Wintermute {
 
-class CVidSubtitle : public BaseClass
-{
+class CVidSubtitle : public BaseClass {
 public:
 	long m_EndFrame;
 	long m_StartFrame;
-	char* m_Text;
-	CVidSubtitle(BaseGame* inGame);
-	CVidSubtitle(BaseGame* inGame, char* Text, long StartFrame, long EndFrame);
+	char *m_Text;
+	CVidSubtitle(BaseGame *inGame);
+	CVidSubtitle(BaseGame *inGame, char *Text, long StartFrame, long EndFrame);
 	virtual ~CVidSubtitle();
 
 };
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index ca812c57a1..8c6d222cd3 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -40,27 +40,24 @@
 
 namespace Wintermute {
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitler::CVidSubtitler(BaseGame *inGame):BaseClass(inGame)
-{
+CVidSubtitler::CVidSubtitler(BaseGame *inGame): BaseClass(inGame) {
 	m_LastSample = -1;
 	m_CurrentSubtitle = 0;
 	m_ShowSubtitle = false;
 }
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitler::~CVidSubtitler(void)
-{
-	for(int i=0; i<m_Subtitles.size(); i++) delete m_Subtitles[i];
+CVidSubtitler::~CVidSubtitler(void) {
+	for (int i = 0; i < m_Subtitles.size(); i++) delete m_Subtitles[i];
 	m_Subtitles.clear();
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::LoadSubtitles(char* Filename, char* SubtitleFile)
-{
-	if(!Filename) return S_OK;
+bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
+	if (!Filename) return S_OK;
 
-	for(int i=0; i<m_Subtitles.size(); i++) delete m_Subtitles[i];
+	for (int i = 0; i < m_Subtitles.size(); i++) delete m_Subtitles[i];
 	m_Subtitles.clear();
 
 	m_LastSample = -1;
@@ -73,13 +70,11 @@ bool CVidSubtitler::LoadSubtitles(char* Filename, char* SubtitleFile)
 	char dir[_MAX_DIR];
 	char fname[_MAX_FNAME];
 
-	if(SubtitleFile)
-	{
+	if (SubtitleFile) {
 		strcpy(NewFile, SubtitleFile);
 	}
 #if 0
-	else
-	{
+	else {
 		_splitpath(Filename, drive, dir, fname, NULL);
 		_makepath(NewFile, drive, dir, fname, ".SUB");
 	}
@@ -87,77 +82,72 @@ bool CVidSubtitler::LoadSubtitles(char* Filename, char* SubtitleFile)
 	DWORD Size;
 
 #if 0
-	BYTE* Buffer = _gameRef->m_FileManager->ReadWholeFile(NewFile, &Size, false);
+	BYTE *Buffer = _gameRef->m_FileManager->ReadWholeFile(NewFile, &Size, false);
 
-	if(Buffer==NULL) return S_OK; // no subtitles
+	if (Buffer == NULL) return S_OK; // no subtitles
 
 
 	LONG Start, End;
 	bool InToken;
-	char* TokenStart;
+	char *TokenStart;
 	int TokenLength;
 	int TokenPos;
 	int TextLength;
 
 	int Pos = 0;
 	int LineLength = 0;
-	while(Pos<Size){
+	while (Pos < Size) {
 		Start = End = -1;
 		InToken = false;
 		TokenPos = -1;
 		TextLength = 0;
 
 		LineLength = 0;
-		while(Pos+LineLength < Size && Buffer[Pos+LineLength]!='\n' && Buffer[Pos+LineLength]!='\0') LineLength++;
+		while (Pos + LineLength < Size && Buffer[Pos + LineLength] != '\n' && Buffer[Pos + LineLength] != '\0') LineLength++;
 
-		int RealLength = LineLength - (Pos+LineLength>=Size?0:1);
-		char* Text = new char[RealLength+1];
-		char* line = (char*)&Buffer[Pos];
+		int RealLength = LineLength - (Pos + LineLength >= Size ? 0 : 1);
+		char *Text = new char[RealLength + 1];
+		char *line = (char *)&Buffer[Pos];
 
-		for(int i=0; i<RealLength; i++){
-			if(line[i]=='{'){
-				if(!InToken){
+		for (int i = 0; i < RealLength; i++) {
+			if (line[i] == '{') {
+				if (!InToken) {
 					InToken = true;
-					TokenStart = line+i+1;
+					TokenStart = line + i + 1;
 					TokenLength = 0;
 					TokenPos++;
-				}
-				else TokenLength++;
-			}
-			else if(line[i]=='}'){
-				if(InToken){
+				} else TokenLength++;
+			} else if (line[i] == '}') {
+				if (InToken) {
 					InToken = false;
-					char* Token = new char[TokenLength+1];
+					char *Token = new char[TokenLength + 1];
 					strncpy(Token, TokenStart, TokenLength);
 					Token[TokenLength] = '\0';
-					if(TokenPos==0) Start = atoi(Token);
-					else if(TokenPos==1) End = atoi(Token);
+					if (TokenPos == 0) Start = atoi(Token);
+					else if (TokenPos == 1) End = atoi(Token);
 
 					delete [] Token;
-				}
-				else{
+				} else {
 					Text[TextLength] = line[i];
 					TextLength++;
 				}
-			}
-			else{
-				if(InToken){
+			} else {
+				if (InToken) {
 					TokenLength++;
-				}
-				else{
+				} else {
 					Text[TextLength] = line[i];
-					if(Text[TextLength]=='|') Text[TextLength] = '\n';
+					if (Text[TextLength] == '|') Text[TextLength] = '\n';
 					TextLength++;
 				}
 			}
 		}
 		Text[TextLength] = '\0';
 
-		if(Start!=-1 && TextLength>0 && (Start!=1 || End!=1)) m_Subtitles.Add(new CVidSubtitle(Game, Text, Start, End));
+		if (Start != -1 && TextLength > 0 && (Start != 1 || End != 1)) m_Subtitles.Add(new CVidSubtitle(Game, Text, Start, End));
 
 		delete [] Text;
 
-		Pos+=LineLength+1;
+		Pos += LineLength + 1;
 	}
 
 	delete [] Buffer;
@@ -166,43 +156,37 @@ bool CVidSubtitler::LoadSubtitles(char* Filename, char* SubtitleFile)
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::Display()
-{
+bool CVidSubtitler::Display() {
 #if 0
-	if(m_ShowSubtitle)
-	{
-		CBFont* font = Game->m_VideoFont?Game->m_VideoFont:Game->m_SystemFont;
-		int Height = font->GetTextHeight((BYTE*)m_Subtitles[m_CurrentSubtitle]->m_Text, Game->m_Renderer->m_Width);
-		font->DrawText((BYTE*)m_Subtitles[m_CurrentSubtitle]->m_Text, 0, Game->m_Renderer->m_Height-Height-5, Game->m_Renderer->m_Width, TAL_CENTER);
+	if (m_ShowSubtitle) {
+		CBFont *font = Game->m_VideoFont ? Game->m_VideoFont : Game->m_SystemFont;
+		int Height = font->GetTextHeight((BYTE *)m_Subtitles[m_CurrentSubtitle]->m_Text, Game->m_Renderer->m_Width);
+		font->DrawText((BYTE *)m_Subtitles[m_CurrentSubtitle]->m_Text, 0, Game->m_Renderer->m_Height - Height - 5, Game->m_Renderer->m_Width, TAL_CENTER);
 	}
 #endif
 	return S_OK;
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::Update(LONG Frame)
-{
-	if(Frame != m_LastSample)
-	{
+bool CVidSubtitler::Update(LONG Frame) {
+	if (Frame != m_LastSample) {
 		m_LastSample = Frame;
 
 		// process subtitles
 		m_ShowSubtitle = false;
-		while(m_CurrentSubtitle<m_Subtitles.size()){
+		while (m_CurrentSubtitle < m_Subtitles.size()) {
 			int End = m_Subtitles[m_CurrentSubtitle]->m_EndFrame;
 
-			bool NextFrameOK = (m_CurrentSubtitle < m_Subtitles.size()-1 && m_Subtitles[m_CurrentSubtitle+1]->m_StartFrame <= Frame);
+			bool NextFrameOK = (m_CurrentSubtitle < m_Subtitles.size() - 1 && m_Subtitles[m_CurrentSubtitle + 1]->m_StartFrame <= Frame);
 
-			if(Frame > End){
-				if(NextFrameOK){
+			if (Frame > End) {
+				if (NextFrameOK) {
 					m_CurrentSubtitle++;
-				}
-				else{
-					m_ShowSubtitle = (End==0);
+				} else {
+					m_ShowSubtitle = (End == 0);
 					break;
 				}
-			}
-			else{
+			} else {
 				m_ShowSubtitle = true;
 				break;
 			}
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 144e90f228..fb3da8dc91 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -35,19 +35,18 @@
 namespace Wintermute {
 
 class CVidSubtitler :
-	public BaseClass
-{
+	public BaseClass {
 public:
 	CVidSubtitler(BaseGame *inGame);
 	virtual ~CVidSubtitler(void);
 
 	bool m_ShowSubtitle;
 	int m_CurrentSubtitle;
-	bool LoadSubtitles(char* Filename, char* SubtitleFile);
+	bool LoadSubtitles(char *Filename, char *SubtitleFile);
 	bool Display();
 	bool Update(long Frame);
 	long m_LastSample;
-	Common::Array<CVidSubtitle*> m_Subtitles;
+	Common::Array<CVidSubtitle *> m_Subtitles;
 };
 }
 
-- 
cgit v1.2.3


From ec3b8fdde24324fd4a2ad5c37735644a79f1e574 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 19:40:48 +0200
Subject: WINTERMUTE: Use long-style braces around blocks in imported subtitle
 code

---
 engines/wintermute/video/video_subtitler.cpp | 41 ++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 8c6d222cd3..537378963e 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -48,16 +48,23 @@ CVidSubtitler::CVidSubtitler(BaseGame *inGame): BaseClass(inGame) {
 
 //////////////////////////////////////////////////////////////////////////
 CVidSubtitler::~CVidSubtitler(void) {
-	for (int i = 0; i < m_Subtitles.size(); i++) delete m_Subtitles[i];
+	for (int i = 0; i < m_Subtitles.size(); i++) {
+		delete m_Subtitles[i];
+	}
 	m_Subtitles.clear();
 }
 
 
 //////////////////////////////////////////////////////////////////////////
 bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
-	if (!Filename) return S_OK;
+	if (!Filename) {
+		return S_OK;
+	}
+
+	for (int i = 0; i < m_Subtitles.size(); i++) {
+		delete m_Subtitles[i];
+	}
 
-	for (int i = 0; i < m_Subtitles.size(); i++) delete m_Subtitles[i];
 	m_Subtitles.clear();
 
 	m_LastSample = -1;
@@ -84,7 +91,9 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 #if 0
 	BYTE *Buffer = _gameRef->m_FileManager->ReadWholeFile(NewFile, &Size, false);
 
-	if (Buffer == NULL) return S_OK; // no subtitles
+	if (Buffer == NULL) {
+		return S_OK; // no subtitles
+	}
 
 
 	LONG Start, End;
@@ -103,7 +112,9 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 		TextLength = 0;
 
 		LineLength = 0;
-		while (Pos + LineLength < Size && Buffer[Pos + LineLength] != '\n' && Buffer[Pos + LineLength] != '\0') LineLength++;
+		while (Pos + LineLength < Size && Buffer[Pos + LineLength] != '\n' && Buffer[Pos + LineLength] != '\0') {
+			LineLength++;
+		}
 
 		int RealLength = LineLength - (Pos + LineLength >= Size ? 0 : 1);
 		char *Text = new char[RealLength + 1];
@@ -116,16 +127,20 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 					TokenStart = line + i + 1;
 					TokenLength = 0;
 					TokenPos++;
-				} else TokenLength++;
+				} else {
+					TokenLength++;
+				}
 			} else if (line[i] == '}') {
 				if (InToken) {
 					InToken = false;
 					char *Token = new char[TokenLength + 1];
 					strncpy(Token, TokenStart, TokenLength);
 					Token[TokenLength] = '\0';
-					if (TokenPos == 0) Start = atoi(Token);
-					else if (TokenPos == 1) End = atoi(Token);
-
+					if (TokenPos == 0) {
+						Start = atoi(Token);
+					} else if (TokenPos == 1) {
+						End = atoi(Token);
+					}
 					delete [] Token;
 				} else {
 					Text[TextLength] = line[i];
@@ -136,14 +151,18 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 					TokenLength++;
 				} else {
 					Text[TextLength] = line[i];
-					if (Text[TextLength] == '|') Text[TextLength] = '\n';
+					if (Text[TextLength] == '|') {
+						Text[TextLength] = '\n';
+					}
 					TextLength++;
 				}
 			}
 		}
 		Text[TextLength] = '\0';
 
-		if (Start != -1 && TextLength > 0 && (Start != 1 || End != 1)) m_Subtitles.Add(new CVidSubtitle(Game, Text, Start, End));
+		if (Start != -1 && TextLength > 0 && (Start != 1 || End != 1)) {
+			m_Subtitles.Add(new CVidSubtitle(Game, Text, Start, End));
+		}
 
 		delete [] Text;
 
-- 
cgit v1.2.3


From ba1862ecb8bb80751c58e70f233449dd05e4245c Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 19:43:26 +0200
Subject: WINTERMUTE: Use BaseFileManager to load SUB file

Conflicts:
	engines/wintermute/video/video_subtitler.cpp
---
 engines/wintermute/video/video_subtitler.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 537378963e..072d1e1c99 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -29,6 +29,8 @@
 
 //  #include "dcgf.h"
 #include "engines/wintermute/video/video_subtitler.h"
+#include "engines/wintermute/base/base_file_manager.h"
+
 #define S_OK 0
 #define BYTE byte
 #define LONG long
@@ -73,9 +75,6 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 
 
 	char NewFile[MAX_PATH];
-	char drive[_MAX_DRIVE];
-	char dir[_MAX_DIR];
-	char fname[_MAX_FNAME];
 
 	if (SubtitleFile) {
 		strcpy(NewFile, SubtitleFile);
@@ -88,13 +87,14 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 #endif
 	DWORD Size;
 
-#if 0
-	BYTE *Buffer = _gameRef->m_FileManager->ReadWholeFile(NewFile, &Size, false);
-
-	if (Buffer == NULL) {
+	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(NewFile, true, false);
+	if (file == nullptr) {
 		return S_OK; // no subtitles
 	}
 
+	Size = file->size();
+	BYTE *Buffer = new BYTE[Size];
+	file->read(Buffer, Size);
 
 	LONG Start, End;
 	bool InToken;
@@ -105,6 +105,7 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 
 	int Pos = 0;
 	int LineLength = 0;
+
 	while (Pos < Size) {
 		Start = End = -1;
 		InToken = false;
@@ -161,7 +162,7 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 		Text[TextLength] = '\0';
 
 		if (Start != -1 && TextLength > 0 && (Start != 1 || End != 1)) {
-			m_Subtitles.Add(new CVidSubtitle(Game, Text, Start, End));
+			m_Subtitles.push_back(new CVidSubtitle(_gameRef, Text, Start, End));
 		}
 
 		delete [] Text;
@@ -170,7 +171,7 @@ bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
 	}
 
 	delete [] Buffer;
-#endif
+
 	return S_OK;
 }
 
-- 
cgit v1.2.3


From d9d80db869b21e4625d445e4f00af6b03b09e6c8 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 14 Oct 2014 22:58:17 +0200
Subject: WINTERMUTE: Take const char in loadSubtitles

---
 engines/wintermute/video/video_subtitler.cpp | 2 +-
 engines/wintermute/video/video_subtitler.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 072d1e1c99..6d65adea74 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -58,7 +58,7 @@ CVidSubtitler::~CVidSubtitler(void) {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::LoadSubtitles(char *Filename, char *SubtitleFile) {
+bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile) {
 	if (!Filename) {
 		return S_OK;
 	}
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index fb3da8dc91..25641bc574 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -42,7 +42,7 @@ public:
 
 	bool m_ShowSubtitle;
 	int m_CurrentSubtitle;
-	bool LoadSubtitles(char *Filename, char *SubtitleFile);
+	bool LoadSubtitles(const char *Filename, const char *SubtitleFile);
 	bool Display();
 	bool Update(long Frame);
 	long m_LastSample;
-- 
cgit v1.2.3


From 532217bcee6ee33a189f71e6c37323442299c4e2 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 14 Oct 2014 23:00:11 +0200
Subject: WINTERMUTE: Reinstate subtitle loading

---
 engines/wintermute/video/video_theora_player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index fc1571054c..205ebe5035 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -129,6 +129,10 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 	warning("VideoTheoraPlayer::initialize - Theora support not compiled in, video will be skipped: %s", filename.c_str());
 	return STATUS_FAILED;
 #endif
+
+
+	_subtitler->LoadSubtitles(_filename.c_str(), subtitleFile.c_str());
+
 	_theoraDecoder->loadStream(_file);
 
 	if (!_theoraDecoder->isVideoLoaded()) {
-- 
cgit v1.2.3


From 6f6e49f4cf183d9cbdf75060f4c271a538c6d1d1 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 14 Oct 2014 23:00:34 +0200
Subject: WINTERMUTE: Display subtitles in console

---
 engines/wintermute/video/video_subtitler.cpp     | 1 +
 engines/wintermute/video/video_theora_player.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 6d65adea74..965f7f1979 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -177,6 +177,7 @@ bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile
 
 //////////////////////////////////////////////////////////////////////////
 bool CVidSubtitler::Display() {
+	warning((const char *)m_Subtitles[m_CurrentSubtitle]->m_Text);
 #if 0
 	if (m_ShowSubtitle) {
 		CBFont *font = Game->m_VideoFont ? Game->m_VideoFont : Game->m_SystemFont;
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 205ebe5035..232c4847b1 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -217,7 +217,8 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		_state = THEORA_STATE_PLAYING;
 		_looping = looping;
 		_playbackType = type;
-
+		_subtitler->Update(_theoraDecoder->getFrameCount());
+		_subtitler->Display();
 		_startTime = startTime;
 		_volume = volume;
 		_posX = x;
@@ -292,6 +293,9 @@ bool VideoTheoraPlayer::update() {
 	}
 
 	if (_theoraDecoder) {
+
+		_subtitler->Update(_theoraDecoder->getCurFrame());
+
 		if (_theoraDecoder->endOfVideo() && _looping) {
 			warning("Should loop movie %s, hacked for now", _filename.c_str());
 			_theoraDecoder->rewind();
@@ -419,6 +423,7 @@ bool VideoTheoraPlayer::display(uint32 alpha) {
 /*	if (m_Subtitler && _gameRef->m_VideoSubtitles) {
 		m_Subtitler->display();
 	}*/
+	_subtitler->Display();
 
 	return res;
 }
-- 
cgit v1.2.3


From 1715196325c5b5867fd9bc684ca5204655fc9573 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 14 Oct 2014 23:14:14 +0200
Subject: WINTERMUTE: Re-enable and use PathUtils for auto SRT detection

---
 engines/wintermute/video/video_subtitler.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 965f7f1979..facc7076ee 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -30,6 +30,7 @@
 //  #include "dcgf.h"
 #include "engines/wintermute/video/video_subtitler.h"
 #include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/utils/path_util.h"
 
 #define S_OK 0
 #define BYTE byte
@@ -74,17 +75,17 @@ bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile
 	m_ShowSubtitle = false;
 
 
-	char NewFile[MAX_PATH];
+	Common::String NewFile;
 
 	if (SubtitleFile) {
-		strcpy(NewFile, SubtitleFile);
+		NewFile = Common::String(SubtitleFile);
+	} else {
+		Common::String path = PathUtil::getDirectoryName(Filename);
+		Common::String name = PathUtil::getFileNameWithoutExtension(Filename);
+		Common::String ext = ".SUB";
+		NewFile = PathUtil::combine(path, name + ext);
 	}
-#if 0
-	else {
-		_splitpath(Filename, drive, dir, fname, NULL);
-		_makepath(NewFile, drive, dir, fname, ".SUB");
-	}
-#endif
+
 	DWORD Size;
 
 	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(NewFile, true, false);
-- 
cgit v1.2.3


From d8b432fe51d93edaff631792868489eb2bc3ec4a Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 14 Oct 2014 23:13:46 +0200
Subject: WINTERMUTE: Use native C types instead of macros

---
 engines/wintermute/video/video_subtitler.cpp | 39 ++++++++++------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index facc7076ee..24eda703ca 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -26,21 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-
-//  #include "dcgf.h"
 #include "engines/wintermute/video/video_subtitler.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/path_util.h"
 
-#define S_OK 0
-#define BYTE byte
-#define LONG long
-#define MAX_PATH 127
-#define _MAX_DRIVE 127
-#define _MAX_DIR 127
-#define _MAX_FNAME 127
-#define DWORD byte
-
 namespace Wintermute {
 //////////////////////////////////////////////////////////////////////////
 CVidSubtitler::CVidSubtitler(BaseGame *inGame): BaseClass(inGame) {
@@ -61,11 +50,7 @@ CVidSubtitler::~CVidSubtitler(void) {
 //////////////////////////////////////////////////////////////////////////
 bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile) {
 	if (!Filename) {
-		return S_OK;
-	}
-
-	for (int i = 0; i < m_Subtitles.size(); i++) {
-		delete m_Subtitles[i];
+		return false;
 	}
 
 	m_Subtitles.clear();
@@ -86,18 +71,20 @@ bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile
 		NewFile = PathUtil::combine(path, name + ext);
 	}
 
-	DWORD Size;
+	long Size;
 
 	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(NewFile, true, false);
+
 	if (file == nullptr) {
-		return S_OK; // no subtitles
+		return false; // no subtitles
 	}
 
 	Size = file->size();
-	BYTE *Buffer = new BYTE[Size];
+	char *Buffer = new char[Size];
+
 	file->read(Buffer, Size);
 
-	LONG Start, End;
+	long Start, End;
 	bool InToken;
 	char *TokenStart;
 	int TokenLength;
@@ -173,7 +160,7 @@ bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile
 
 	delete [] Buffer;
 
-	return S_OK;
+	return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -182,15 +169,15 @@ bool CVidSubtitler::Display() {
 #if 0
 	if (m_ShowSubtitle) {
 		CBFont *font = Game->m_VideoFont ? Game->m_VideoFont : Game->m_SystemFont;
-		int Height = font->GetTextHeight((BYTE *)m_Subtitles[m_CurrentSubtitle]->m_Text, Game->m_Renderer->m_Width);
-		font->DrawText((BYTE *)m_Subtitles[m_CurrentSubtitle]->m_Text, 0, Game->m_Renderer->m_Height - Height - 5, Game->m_Renderer->m_Width, TAL_CENTER);
+		int Height = font->GetTextHeight((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text, Game->m_Renderer->m_Width);
+		font->DrawText((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text, 0, Game->m_Renderer->m_Height - Height - 5, Game->m_Renderer->m_Width, TAL_CENTER);
 	}
 #endif
-	return S_OK;
+	return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::Update(LONG Frame) {
+bool CVidSubtitler::Update(long Frame) {
 	if (Frame != m_LastSample) {
 		m_LastSample = Frame;
 
@@ -214,6 +201,6 @@ bool CVidSubtitler::Update(LONG Frame) {
 			}
 		}
 	}
-	return S_OK;
+	return false;
 }
 }
-- 
cgit v1.2.3


From 472d3e3231ac0677cef6edd6417686800f167d29 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Mon, 3 Feb 2014 16:45:12 +0100
Subject: WINTERMUTE: Add getter for _videoFont

---
 engines/wintermute/base/base_game.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index cdbbff6c93..f62416ee1b 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -123,6 +123,7 @@ public:
 
 	inline BaseObject *getMainObject() { return _mainObject; }
 	inline BaseFont *getSystemFont() { return _systemFont; }
+	inline BaseFont *getVideoFont() { return _videoFont; }
 
 	bool initInput();
 	bool initLoop();
-- 
cgit v1.2.3


From 389e06bdfcecab07c2a48c8092b22b423e529ac4 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Mon, 3 Feb 2014 16:45:24 +0100
Subject: WINTERMUTE: Port actual subtitle display code.

---
 engines/wintermute/video/video_subtitler.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 24eda703ca..dd657876ba 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -29,6 +29,9 @@
 #include "engines/wintermute/video/video_subtitler.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 
 namespace Wintermute {
 //////////////////////////////////////////////////////////////////////////
@@ -165,14 +168,14 @@ bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile
 
 //////////////////////////////////////////////////////////////////////////
 bool CVidSubtitler::Display() {
-	warning((const char *)m_Subtitles[m_CurrentSubtitle]->m_Text);
-#if 0
 	if (m_ShowSubtitle) {
-		CBFont *font = Game->m_VideoFont ? Game->m_VideoFont : Game->m_SystemFont;
-		int Height = font->GetTextHeight((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text, Game->m_Renderer->m_Width);
-		font->DrawText((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text, 0, Game->m_Renderer->m_Height - Height - 5, Game->m_Renderer->m_Width, TAL_CENTER);
+		BaseFont *font = _gameRef->getVideoFont() ? _gameRef->getVideoFont() : _gameRef->getSystemFont();
+		int textHeight = font->getTextHeight((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text, _gameRef->_renderer->getWidth());
+		font->drawText((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text,
+		               0,
+		               (_gameRef->_renderer->getHeight() - textHeight - 5),
+		               (_gameRef->_renderer->getWidth(), TAL_CENTER));
 	}
-#endif
 	return false;
 }
 
-- 
cgit v1.2.3


From ad5fde9db3767bee7af4e8c23277a07cad705de7 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Feb 2014 14:35:23 +0100
Subject: WINTERMUTE: Reinstate CVidSubtitle destructor

---
 engines/wintermute/video/video_subtitle.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index 74b3119503..3d0688d975 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-// #include "dcgf.h"
 #include "engines/wintermute/video/video_subtitle.h"
 
 namespace Wintermute {
@@ -42,8 +41,7 @@ CVidSubtitle::CVidSubtitle(BaseGame *inGame): BaseClass(inGame) {
 CVidSubtitle::CVidSubtitle(BaseGame *inGame, char *Text, long StartFrame, long EndFrame): BaseClass(inGame) {
 	m_Text = new char[strlen(Text) + 1];
 	strcpy(m_Text, Text);
-//	_gameRef->m_StringTable->Expand(&m_Text);
-
+	// _gameRef->m_StringTable->Expand(&m_Text);
 	m_StartFrame = StartFrame;
 	m_EndFrame = EndFrame;
 }
@@ -51,6 +49,9 @@ CVidSubtitle::CVidSubtitle(BaseGame *inGame, char *Text, long StartFrame, long E
 
 //////////////////////////////////////////////////////////////////////////
 CVidSubtitle::~CVidSubtitle() {
-	// SAFE_DELETE_ARRAY(m_Text);
+	if (m_Text) {
+		delete [] m_Text;
+		m_Text = NULL;
+	}
 }
 }
-- 
cgit v1.2.3


From 621a068c0065783bba0430f57b71112d7e42a5a9 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 20:29:41 +0200
Subject: WINTERMUTE: Mass ScummVM-style renaming in subtitles code

---
 engines/wintermute/video/video_subtitle.cpp      |  27 ++--
 engines/wintermute/video/video_subtitle.h        |  15 +-
 engines/wintermute/video/video_subtitler.cpp     | 180 ++++++++++++-----------
 engines/wintermute/video/video_subtitler.h       |  23 ++-
 engines/wintermute/video/video_theora_player.cpp |  19 ++-
 engines/wintermute/video/video_theora_player.h   |   2 +-
 6 files changed, 134 insertions(+), 132 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index 3d0688d975..0fab6fb2b7 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -31,27 +31,26 @@
 namespace Wintermute {
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitle::CVidSubtitle(BaseGame *inGame): BaseClass(inGame) {
-	m_Text = NULL;
-	m_StartFrame = m_EndFrame = 0;
+VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
+	_text = NULL;
+	_startFrame = _endFrame = 0;
 }
 
-
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitle::CVidSubtitle(BaseGame *inGame, char *Text, long StartFrame, long EndFrame): BaseClass(inGame) {
-	m_Text = new char[strlen(Text) + 1];
-	strcpy(m_Text, Text);
-	// _gameRef->m_StringTable->Expand(&m_Text);
-	m_StartFrame = StartFrame;
-	m_EndFrame = EndFrame;
+VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, long startFrame, long endFrame): BaseClass(inGame) {
+	_text = new char[strlen(text) + 1];
+	strcpy(_text, text);
+	// _gameRef->m_StringTable->Expand(&this->text);
+	_startFrame = startFrame;
+	_endFrame = endFrame;
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitle::~CVidSubtitle() {
-	if (m_Text) {
-		delete [] m_Text;
-		m_Text = NULL;
+VideoSubtitle::~VideoSubtitle() {
+	if (_text) {
+		delete [] _text;
+		_text = NULL;
 	}
 }
 }
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index e93007bd3b..6d629b34d0 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -33,15 +33,14 @@
 
 namespace Wintermute {
 
-class CVidSubtitle : public BaseClass {
+class VideoSubtitle : public BaseClass {
 public:
-	long m_EndFrame;
-	long m_StartFrame;
-	char *m_Text;
-	CVidSubtitle(BaseGame *inGame);
-	CVidSubtitle(BaseGame *inGame, char *Text, long StartFrame, long EndFrame);
-	virtual ~CVidSubtitle();
-
+	long _endFrame;
+	long _startFrame;
+	char *_text;
+	VideoSubtitle(BaseGame *inGame);
+	VideoSubtitle(BaseGame *inGame, char *text, long startFrame, long endFrame);
+	virtual ~VideoSubtitle();
 };
 }
 
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index dd657876ba..9d0a066c20 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -35,143 +35,145 @@
 
 namespace Wintermute {
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitler::CVidSubtitler(BaseGame *inGame): BaseClass(inGame) {
-	m_LastSample = -1;
-	m_CurrentSubtitle = 0;
-	m_ShowSubtitle = false;
+VideoSubtitler::VideoSubtitler(BaseGame *inGame): BaseClass(inGame) {
+	_lastSample = -1;
+	_currentSubtitle = 0;
+	_showSubtitle = false;
 }
 
 //////////////////////////////////////////////////////////////////////////
-CVidSubtitler::~CVidSubtitler(void) {
-	for (int i = 0; i < m_Subtitles.size(); i++) {
-		delete m_Subtitles[i];
+VideoSubtitler::~VideoSubtitler(void) {
+	for (int i = 0; i < _subtitles.size(); i++) {
+		delete _subtitles[i];
 	}
-	m_Subtitles.clear();
+	_subtitles.clear();
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile) {
+bool VideoSubtitler::loadSubtitles(const char *Filename, const char *subtitleFile) {
 	if (!Filename) {
 		return false;
 	}
 
-	m_Subtitles.clear();
+	for (int i = 0; i < _subtitles.size(); i++) {
+		delete _subtitles[i];
+	}
+
+	_subtitles.clear();
 
-	m_LastSample = -1;
-	m_CurrentSubtitle = 0;
-	m_ShowSubtitle = false;
+	_lastSample = -1;
+	_currentSubtitle = 0;
+	_showSubtitle = false;
 
 
-	Common::String NewFile;
+	Common::String newFile;
 
-	if (SubtitleFile) {
-		NewFile = Common::String(SubtitleFile);
+	if (subtitleFile) {
+		newFile = Common::String(subtitleFile);
 	} else {
 		Common::String path = PathUtil::getDirectoryName(Filename);
 		Common::String name = PathUtil::getFileNameWithoutExtension(Filename);
 		Common::String ext = ".SUB";
-		NewFile = PathUtil::combine(path, name + ext);
+		newFile = PathUtil::combine(path, name + ext);
 	}
 
-	long Size;
+	long size;
 
-	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(NewFile, true, false);
+	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(newFile, true, false);
 
 	if (file == nullptr) {
 		return false; // no subtitles
 	}
 
-	Size = file->size();
-	char *Buffer = new char[Size];
+	size = file->size();
+	char *buffer = new char[size];
+	file->read(buffer, size);
 
-	file->read(Buffer, Size);
+	long start, end;
+	bool inToken;
+	char *tokenStart;
+	int tokenLength;
+	int tokenPos;
+	int textLength;
 
-	long Start, End;
-	bool InToken;
-	char *TokenStart;
-	int TokenLength;
-	int TokenPos;
-	int TextLength;
+	int pos = 0;
+	int lineLength = 0;
 
-	int Pos = 0;
-	int LineLength = 0;
+	while (pos < size) {
+		start = end = -1;
+		inToken = false;
+		tokenPos = -1;
+		textLength = 0;
 
-	while (Pos < Size) {
-		Start = End = -1;
-		InToken = false;
-		TokenPos = -1;
-		TextLength = 0;
+		lineLength = 0;
+		while (pos + lineLength < size && buffer[pos + lineLength] != '\n' && buffer[pos + lineLength] != '\0') lineLength++;
 
-		LineLength = 0;
-		while (Pos + LineLength < Size && Buffer[Pos + LineLength] != '\n' && Buffer[Pos + LineLength] != '\0') {
-			LineLength++;
-		}
+		int realLength = lineLength - (pos + lineLength >= size ? 0 : 1);
+		char *Text = new char[realLength + 1];
+		char *line = (char *)&buffer[pos];
 
-		int RealLength = LineLength - (Pos + LineLength >= Size ? 0 : 1);
-		char *Text = new char[RealLength + 1];
-		char *line = (char *)&Buffer[Pos];
-
-		for (int i = 0; i < RealLength; i++) {
+		for (int i = 0; i < realLength; i++) {
 			if (line[i] == '{') {
-				if (!InToken) {
-					InToken = true;
-					TokenStart = line + i + 1;
-					TokenLength = 0;
-					TokenPos++;
+				if (!inToken) {
+					inToken = true;
+					tokenStart = line + i + 1;
+					tokenLength = 0;
+					tokenPos++;
 				} else {
-					TokenLength++;
+					tokenLength++;
 				}
 			} else if (line[i] == '}') {
-				if (InToken) {
-					InToken = false;
-					char *Token = new char[TokenLength + 1];
-					strncpy(Token, TokenStart, TokenLength);
-					Token[TokenLength] = '\0';
-					if (TokenPos == 0) {
-						Start = atoi(Token);
-					} else if (TokenPos == 1) {
-						End = atoi(Token);
+				if (inToken) {
+					inToken = false;
+					char *token = new char[tokenLength + 1];
+					strncpy(token, tokenStart, tokenLength);
+					token[tokenLength] = '\0';
+					if (tokenPos == 0) {
+						start = atoi(token);
+					} else if (tokenPos == 1) {
+						end = atoi(token);
 					}
-					delete [] Token;
+
+					delete[] token;
 				} else {
-					Text[TextLength] = line[i];
-					TextLength++;
+					Text[textLength] = line[i];
+					textLength++;
 				}
 			} else {
-				if (InToken) {
-					TokenLength++;
+				if (inToken) {
+					tokenLength++;
 				} else {
-					Text[TextLength] = line[i];
-					if (Text[TextLength] == '|') {
-						Text[TextLength] = '\n';
+					Text[textLength] = line[i];
+					if (Text[textLength] == '|') {
+						Text[textLength] = '\n';
 					}
-					TextLength++;
+					textLength++;
 				}
 			}
 		}
-		Text[TextLength] = '\0';
+		Text[textLength] = '\0';
 
-		if (Start != -1 && TextLength > 0 && (Start != 1 || End != 1)) {
-			m_Subtitles.push_back(new CVidSubtitle(_gameRef, Text, Start, End));
+		if (start != -1 && textLength > 0 && (start != 1 || end != 1)) {
+			_subtitles.push_back(new VideoSubtitle(_gameRef, Text, start, end));
 		}
 
 		delete [] Text;
 
-		Pos += LineLength + 1;
+		pos += lineLength + 1;
 	}
 
-	delete [] Buffer;
+	delete[] buffer;
 
 	return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::Display() {
-	if (m_ShowSubtitle) {
+bool VideoSubtitler::display() {
+	if (_showSubtitle) {
 		BaseFont *font = _gameRef->getVideoFont() ? _gameRef->getVideoFont() : _gameRef->getSystemFont();
-		int textHeight = font->getTextHeight((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text, _gameRef->_renderer->getWidth());
-		font->drawText((byte *)m_Subtitles[m_CurrentSubtitle]->m_Text,
+		int textHeight = font->getTextHeight((byte *)_subtitles[_currentSubtitle]->_text, _gameRef->_renderer->getWidth());
+		font->drawText((byte *)_subtitles[_currentSubtitle]->_text,
 		               0,
 		               (_gameRef->_renderer->getHeight() - textHeight - 5),
 		               (_gameRef->_renderer->getWidth(), TAL_CENTER));
@@ -180,26 +182,26 @@ bool CVidSubtitler::Display() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool CVidSubtitler::Update(long Frame) {
-	if (Frame != m_LastSample) {
-		m_LastSample = Frame;
+bool VideoSubtitler::update(long frame) {
+	if (frame != _lastSample) {
+		_lastSample = frame;
 
 		// process subtitles
-		m_ShowSubtitle = false;
-		while (m_CurrentSubtitle < m_Subtitles.size()) {
-			int End = m_Subtitles[m_CurrentSubtitle]->m_EndFrame;
+		_showSubtitle = false;
+		while (_currentSubtitle < _subtitles.size()) {
+			int end = _subtitles[_currentSubtitle]->_endFrame;
 
-			bool NextFrameOK = (m_CurrentSubtitle < m_Subtitles.size() - 1 && m_Subtitles[m_CurrentSubtitle + 1]->m_StartFrame <= Frame);
+			bool nextFrameOK = (_currentSubtitle < _subtitles.size() - 1 && _subtitles[_currentSubtitle + 1]->_startFrame <= frame);
 
-			if (Frame > End) {
-				if (NextFrameOK) {
-					m_CurrentSubtitle++;
+			if (frame > end) {
+				if (nextFrameOK) {
+					_currentSubtitle++;
 				} else {
-					m_ShowSubtitle = (End == 0);
+					_showSubtitle = (end == 0);
 					break;
 				}
 			} else {
-				m_ShowSubtitle = true;
+				_showSubtitle = true;
 				break;
 			}
 		}
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 25641bc574..e42fbeb505 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -34,19 +34,18 @@
 
 namespace Wintermute {
 
-class CVidSubtitler :
-	public BaseClass {
+class VideoSubtitler : public BaseClass {
 public:
-	CVidSubtitler(BaseGame *inGame);
-	virtual ~CVidSubtitler(void);
-
-	bool m_ShowSubtitle;
-	int m_CurrentSubtitle;
-	bool LoadSubtitles(const char *Filename, const char *SubtitleFile);
-	bool Display();
-	bool Update(long Frame);
-	long m_LastSample;
-	Common::Array<CVidSubtitle *> m_Subtitles;
+	VideoSubtitler(BaseGame *inGame);
+	virtual ~VideoSubtitler(void);
+
+	bool _showSubtitle;
+	int _currentSubtitle;
+	bool loadSubtitles(const char *filename, const char *subtitleFile);
+	bool display();
+	bool update(long frame);
+	long _lastSample;
+	Common::Array<VideoSubtitle *> _subtitles;
 };
 }
 
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 232c4847b1..a90fb02033 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -85,13 +85,16 @@ void VideoTheoraPlayer::SetDefaults() {
 	_volume = 100;
 	_theoraDecoder = nullptr;
 
-	_subtitler = new CVidSubtitler(_gameRef);
+	_subtitler = new VideoSubtitler(_gameRef);
 }
 
 //////////////////////////////////////////////////////////////////////////
 VideoTheoraPlayer::~VideoTheoraPlayer(void) {
 	cleanup();
-//	SAFE_DELETE(_subtitler);
+	if(_subtitler) {
+		delete [] _subtitler;
+		_subtitler = NULL;
+	}
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -131,7 +134,7 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 #endif
 
 
-	_subtitler->LoadSubtitles(_filename.c_str(), subtitleFile.c_str());
+	_subtitler->loadSubtitles(_filename.c_str(), subtitleFile.c_str());
 
 	_theoraDecoder->loadStream(_file);
 
@@ -217,8 +220,8 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		_state = THEORA_STATE_PLAYING;
 		_looping = looping;
 		_playbackType = type;
-		_subtitler->Update(_theoraDecoder->getFrameCount());
-		_subtitler->Display();
+		_subtitler->update(_theoraDecoder->getFrameCount());
+		_subtitler->display();
 		_startTime = startTime;
 		_volume = volume;
 		_posX = x;
@@ -260,7 +263,7 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 #if 0 // Stubbed for now as theora isn't seekable
 	if (StartTime) SeekToTime(StartTime);
 
-	Update();
+	update();
 #endif
 	return STATUS_FAILED;
 }
@@ -294,7 +297,7 @@ bool VideoTheoraPlayer::update() {
 
 	if (_theoraDecoder) {
 
-		_subtitler->Update(_theoraDecoder->getCurFrame());
+		_subtitler->update(_theoraDecoder->getCurFrame());
 
 		if (_theoraDecoder->endOfVideo() && _looping) {
 			warning("Should loop movie %s, hacked for now", _filename.c_str());
@@ -423,7 +426,7 @@ bool VideoTheoraPlayer::display(uint32 alpha) {
 /*	if (m_Subtitler && _gameRef->m_VideoSubtitles) {
 		m_Subtitler->display();
 	}*/
-	_subtitler->Display();
+	_subtitler->display();
 
 	return res;
 }
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 2d79c5404b..698326c29c 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -60,7 +60,7 @@ public:
 	Common::String _filename;
 
 	BaseSurface *_texture;
-	CVidSubtitler *_subtitler;
+	VideoSubtitler *_subtitler;
 
 	// control methods
 	bool initialize(const Common::String &filename, const Common::String &subtitleFile = Common::String());
-- 
cgit v1.2.3


From 0475fd1a5c845fe785184bafa42b9302c814b654 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 20:35:46 +0200
Subject: WINTERMUTE: Declare counters as uint to match Array::size()

---
 engines/wintermute/video/video_subtitler.cpp | 4 ++--
 engines/wintermute/video/video_subtitler.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 9d0a066c20..3c607ce20d 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -43,7 +43,7 @@ VideoSubtitler::VideoSubtitler(BaseGame *inGame): BaseClass(inGame) {
 
 //////////////////////////////////////////////////////////////////////////
 VideoSubtitler::~VideoSubtitler(void) {
-	for (int i = 0; i < _subtitles.size(); i++) {
+	for (uint i = 0; i < _subtitles.size(); i++) {
 		delete _subtitles[i];
 	}
 	_subtitles.clear();
@@ -56,7 +56,7 @@ bool VideoSubtitler::loadSubtitles(const char *Filename, const char *subtitleFil
 		return false;
 	}
 
-	for (int i = 0; i < _subtitles.size(); i++) {
+	for (uint i = 0; i < _subtitles.size(); i++) {
 		delete _subtitles[i];
 	}
 
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index e42fbeb505..0025f19e84 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -40,7 +40,7 @@ public:
 	virtual ~VideoSubtitler(void);
 
 	bool _showSubtitle;
-	int _currentSubtitle;
+	uint _currentSubtitle;
 	bool loadSubtitles(const char *filename, const char *subtitleFile);
 	bool display();
 	bool update(long frame);
-- 
cgit v1.2.3


From 113e837d557d4316efc83b771480199a5cc023c8 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Feb 2014 16:22:21 +0100
Subject: WINTERMUTE: Correctly delete _subtitler (which is not an array)

---
 engines/wintermute/video/video_theora_player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index a90fb02033..600eae8349 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -92,7 +92,7 @@ void VideoTheoraPlayer::SetDefaults() {
 VideoTheoraPlayer::~VideoTheoraPlayer(void) {
 	cleanup();
 	if(_subtitler) {
-		delete [] _subtitler;
+		delete _subtitler;
 		_subtitler = NULL;
 	}
 }
-- 
cgit v1.2.3


From 647b7217444fbe88f21a99073cb2377092bef9ab Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Feb 2014 16:38:10 +0100
Subject: WINTERMUTE: Refactor/Reformat VideoSubtitler::update

---
 engines/wintermute/video/video_subtitler.cpp | 99 ++++++++++++++++++++--------
 engines/wintermute/video/video_subtitler.h   |  3 +-
 2 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 3c607ce20d..e4c55feb03 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -46,13 +46,14 @@ VideoSubtitler::~VideoSubtitler(void) {
 	for (uint i = 0; i < _subtitles.size(); i++) {
 		delete _subtitles[i];
 	}
+
 	_subtitles.clear();
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-bool VideoSubtitler::loadSubtitles(const char *Filename, const char *subtitleFile) {
-	if (!Filename) {
+bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFile) {
+	if (!filename) {
 		return false;
 	}
 
@@ -72,8 +73,8 @@ bool VideoSubtitler::loadSubtitles(const char *Filename, const char *subtitleFil
 	if (subtitleFile) {
 		newFile = Common::String(subtitleFile);
 	} else {
-		Common::String path = PathUtil::getDirectoryName(Filename);
-		Common::String name = PathUtil::getFileNameWithoutExtension(Filename);
+		Common::String path = PathUtil::getDirectoryName(filename);
+		Common::String name = PathUtil::getFileNameWithoutExtension(filename);
 		Common::String ext = ".SUB";
 		newFile = PathUtil::combine(path, name + ext);
 	}
@@ -107,10 +108,22 @@ bool VideoSubtitler::loadSubtitles(const char *Filename, const char *subtitleFil
 		textLength = 0;
 
 		lineLength = 0;
-		while (pos + lineLength < size && buffer[pos + lineLength] != '\n' && buffer[pos + lineLength] != '\0') lineLength++;
 
-		int realLength = lineLength - (pos + lineLength >= size ? 0 : 1);
-		char *Text = new char[realLength + 1];
+		while (pos + lineLength < size &&
+		        buffer[pos + lineLength] != '\n' &&
+		        buffer[pos + lineLength] != '\0') {
+			lineLength++;
+		}
+
+		int realLength;
+
+		if (pos + lineLength >= size) {
+			realLength = lineLength - 0;
+		} else {
+			realLength = lineLength - 1;
+		}
+
+		char *text = new char[realLength + 1];
 		char *line = (char *)&buffer[pos];
 
 		for (int i = 0; i < realLength; i++) {
@@ -134,31 +147,31 @@ bool VideoSubtitler::loadSubtitles(const char *Filename, const char *subtitleFil
 					} else if (tokenPos == 1) {
 						end = atoi(token);
 					}
-
 					delete[] token;
 				} else {
-					Text[textLength] = line[i];
+					text[textLength] = line[i];
 					textLength++;
 				}
 			} else {
 				if (inToken) {
 					tokenLength++;
 				} else {
-					Text[textLength] = line[i];
-					if (Text[textLength] == '|') {
-						Text[textLength] = '\n';
+					text[textLength] = line[i];
+					if (text[textLength] == '|') {
+						text[textLength] = '\n';
 					}
 					textLength++;
 				}
 			}
 		}
-		Text[textLength] = '\0';
+
+		text[textLength] = '\0';
 
 		if (start != -1 && textLength > 0 && (start != 1 || end != 1)) {
-			_subtitles.push_back(new VideoSubtitle(_gameRef, Text, start, end));
+			_subtitles.push_back(new VideoSubtitle(_gameRef, text, start, end));
 		}
 
-		delete [] Text;
+		delete [] text;
 
 		pos += lineLength + 1;
 	}
@@ -184,27 +197,57 @@ bool VideoSubtitler::display() {
 //////////////////////////////////////////////////////////////////////////
 bool VideoSubtitler::update(long frame) {
 	if (frame != _lastSample) {
+		/*
+		 * If the frame count hasn't advanced the previous state still matches
+		 * the current frame (obviously).
+		 */
+
 		_lastSample = frame;
+		// Otherwise, we update _lastSample; see above.
 
-		// process subtitles
 		_showSubtitle = false;
-		while (_currentSubtitle < _subtitles.size()) {
-			int end = _subtitles[_currentSubtitle]->_endFrame;
 
-			bool nextFrameOK = (_currentSubtitle < _subtitles.size() - 1 && _subtitles[_currentSubtitle + 1]->_startFrame <= frame);
+		bool overdue = (frame > _subtitles[_currentSubtitle]->_endFrame);
+		bool hasNext = (_currentSubtitle + 1 < _subtitles.size());
+		bool nextStarted = false;
+		if (hasNext) {
+			nextStarted = (_subtitles[_currentSubtitle + 1]->_startFrame <= frame);
+		}
 
-			if (frame > end) {
-				if (nextFrameOK) {
-					_currentSubtitle++;
-				} else {
-					_showSubtitle = (end == 0);
-					break;
-				}
+		while (_currentSubtitle < _subtitles.size() &&
+		        overdue && hasNext && nextStarted) {
+			/*
+			 *  We advance until we get past all overdue subtitles.
+			 *  We should exit the cycle when we either reach the first
+			 *  subtitle which is not overdue whose subsequent subtitle
+			 *  has not started yet (aka the one we must display now or
+			 *  the one which WILL be displayed when its time comes)
+			 *  and / or when we reach the last one.
+			 */
+
+			_currentSubtitle++;
+
+			overdue = (frame > _subtitles[_currentSubtitle]->_endFrame);
+			hasNext = (_currentSubtitle + 1 < _subtitles.size());
+			if (hasNext) {
+				nextStarted = (_subtitles[_currentSubtitle + 1]->_startFrame <= frame);
 			} else {
-				_showSubtitle = true;
-				break;
+				nextStarted = false;
 			}
 		}
+
+		bool currentValid = (_subtitles[_currentSubtitle]->_endFrame != 0);
+		/*
+		 * No idea why we do this check, carried over from Mnemonic's code.
+		 * Possibly a workaround for buggy subtitles or some kind of sentinel? :-\
+		 */
+
+		bool currentStarted = frame >= _subtitles[_currentSubtitle]->_startFrame;
+
+		if (currentStarted && !overdue && currentValid) {
+			_showSubtitle = true;
+		}
+
 	}
 	return false;
 }
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 0025f19e84..68964a4084 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -34,7 +34,8 @@
 
 namespace Wintermute {
 
-class VideoSubtitler : public BaseClass {
+class VideoSubtitler :
+	public BaseClass {
 public:
 	VideoSubtitler(BaseGame *inGame);
 	virtual ~VideoSubtitler(void);
-- 
cgit v1.2.3


From 6d16fdbf4ab9139d368ab7585f9ad1fae5c8a523 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Thu, 6 Feb 2014 00:42:22 +0100
Subject: WINTERMUTE: Expand subtitles by string table

---
 engines/wintermute/video/video_subtitle.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index 0fab6fb2b7..5be22de592 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/video/video_subtitle.h"
-
+#include "engines/wintermute/base/base_game.h"
 namespace Wintermute {
 
 //////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
 VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, long startFrame, long endFrame): BaseClass(inGame) {
 	_text = new char[strlen(text) + 1];
 	strcpy(_text, text);
-	// _gameRef->m_StringTable->Expand(&this->text);
+	_gameRef->expandStringByStringTable(&_text);
 	_startFrame = startFrame;
 	_endFrame = endFrame;
 }
-- 
cgit v1.2.3


From f2441da3da9ce4802ce12dc5c815095098e57ee2 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Thu, 6 Feb 2014 01:00:19 +0100
Subject: WINTERMUTE: Make sure subtitle files could be found before anything
 else

---
 engines/wintermute/video/video_subtitler.cpp     |  3 ++-
 engines/wintermute/video/video_theora_player.cpp | 28 +++++++++++++++---------
 engines/wintermute/video/video_theora_player.h   |  3 ++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index e4c55feb03..06b8bab1f4 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -177,8 +177,9 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 	}
 
 	delete[] buffer;
+	// Succeeded loading subtitles!
 
-	return false;
+	return true;
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 600eae8349..2af3ac1638 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -86,6 +86,7 @@ void VideoTheoraPlayer::SetDefaults() {
 	_theoraDecoder = nullptr;
 
 	_subtitler = new VideoSubtitler(_gameRef);
+	_subtitles = false;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -134,7 +135,13 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 #endif
 
 
-	_subtitler->loadSubtitles(_filename.c_str(), subtitleFile.c_str());
+	if (_subtitler->loadSubtitles(_filename.c_str(), subtitleFile.c_str())) {
+		// We have subtitles
+		_subtitles = true;
+	} else {
+		// We couldn't load subtitles...
+		_subtitles = false;
+	}
 
 	_theoraDecoder->loadStream(_file);
 
@@ -220,8 +227,10 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		_state = THEORA_STATE_PLAYING;
 		_looping = looping;
 		_playbackType = type;
-		_subtitler->update(_theoraDecoder->getFrameCount());
-		_subtitler->display();
+		if (_subtitler && _subtitles && _gameRef->_subtitles) {
+			_subtitler->update(_theoraDecoder->getFrameCount());
+			_subtitler->display();
+		}
 		_startTime = startTime;
 		_volume = volume;
 		_posX = x;
@@ -296,8 +305,9 @@ bool VideoTheoraPlayer::update() {
 	}
 
 	if (_theoraDecoder) {
-
-		_subtitler->update(_theoraDecoder->getCurFrame());
+		if (_subtitler && _subtitles && _gameRef->_subtitles) {
+			_subtitler->update(_theoraDecoder->getCurFrame());
+		}
 
 		if (_theoraDecoder->endOfVideo() && _looping) {
 			warning("Should loop movie %s, hacked for now", _filename.c_str());
@@ -422,12 +432,10 @@ bool VideoTheoraPlayer::display(uint32 alpha) {
 	} else {
 		res = STATUS_FAILED;
 	}
-	// TODO: Add subtitles-support
-/*	if (m_Subtitler && _gameRef->m_VideoSubtitles) {
-		m_Subtitler->display();
-	}*/
-	_subtitler->display();
 
+	if (_subtitler && _subtitles && _gameRef->_subtitles) {
+		_subtitler->display();
+	}
 	return res;
 }
 
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 698326c29c..48f75efd20 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -138,9 +138,10 @@ private:
 
 	bool _playbackStarted;
 
+	bool _subtitles;
+
 	// helpers
 	void SetDefaults();
-
 };
 
 } // End of namespace Wintermute
-- 
cgit v1.2.3


From 2eee488e364460772dcb8a85962f6c210810587b Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 20:49:59 +0200
Subject: WINTERMUTE: Do some refactoring over a bunch of attrs in
 VideoSubtitle

Conflicts:
	engines/wintermute/video/video_subtitler.cpp
---
 engines/wintermute/video/video_subtitle.cpp  | 23 ++++++++++++-----------
 engines/wintermute/video/video_subtitle.h    | 11 +++++++----
 engines/wintermute/video/video_subtitler.cpp | 16 ++++++++--------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index 5be22de592..bcaa293124 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -32,25 +32,26 @@ namespace Wintermute {
 
 //////////////////////////////////////////////////////////////////////////
 VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
-	_text = NULL;
 	_startFrame = _endFrame = 0;
 }
 
 //////////////////////////////////////////////////////////////////////////
-VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, long startFrame, long endFrame): BaseClass(inGame) {
-	_text = new char[strlen(text) + 1];
-	strcpy(_text, text);
-	_gameRef->expandStringByStringTable(&_text);
+VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, const long &startFrame, const long &endFrame): BaseClass(inGame) {
+	_gameRef->expandStringByStringTable(&text);
+	_text = Common::String(text);
 	_startFrame = startFrame;
 	_endFrame = endFrame;
 }
 
+long VideoSubtitle::getStartFrame() {
+	return _startFrame;
+}
 
-//////////////////////////////////////////////////////////////////////////
-VideoSubtitle::~VideoSubtitle() {
-	if (_text) {
-		delete [] _text;
-		_text = NULL;
-	}
+long VideoSubtitle::getEndFrame() {
+	return _endFrame;
+}
+
+Common::String VideoSubtitle::getText() {
+	return _text;
 }
 }
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 6d629b34d0..5df1348465 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -35,12 +35,15 @@ namespace Wintermute {
 
 class VideoSubtitle : public BaseClass {
 public:
+	VideoSubtitle(BaseGame *inGame);
+	VideoSubtitle(BaseGame *inGame, char *text, const long &startFrame, const long &endFrame);
+	long getEndFrame();
+	long getStartFrame();
+	Common::String getText();
+private:
 	long _endFrame;
 	long _startFrame;
-	char *_text;
-	VideoSubtitle(BaseGame *inGame);
-	VideoSubtitle(BaseGame *inGame, char *text, long startFrame, long endFrame);
-	virtual ~VideoSubtitle();
+	Common::String _text;
 };
 }
 
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 06b8bab1f4..a1294dd3d4 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -186,8 +186,8 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 bool VideoSubtitler::display() {
 	if (_showSubtitle) {
 		BaseFont *font = _gameRef->getVideoFont() ? _gameRef->getVideoFont() : _gameRef->getSystemFont();
-		int textHeight = font->getTextHeight((byte *)_subtitles[_currentSubtitle]->_text, _gameRef->_renderer->getWidth());
-		font->drawText((byte *)_subtitles[_currentSubtitle]->_text,
+		int textHeight = font->getTextHeight((byte *)_subtitles[_currentSubtitle]->getText().c_str(), _gameRef->_renderer->getWidth());
+		font->drawText((byte *)_subtitles[_currentSubtitle]->getText().c_str(),
 		               0,
 		               (_gameRef->_renderer->getHeight() - textHeight - 5),
 		               (_gameRef->_renderer->getWidth(), TAL_CENTER));
@@ -208,11 +208,11 @@ bool VideoSubtitler::update(long frame) {
 
 		_showSubtitle = false;
 
-		bool overdue = (frame > _subtitles[_currentSubtitle]->_endFrame);
+		bool overdue = (frame > _subtitles[_currentSubtitle]->getEndFrame());
 		bool hasNext = (_currentSubtitle + 1 < _subtitles.size());
 		bool nextStarted = false;
 		if (hasNext) {
-			nextStarted = (_subtitles[_currentSubtitle + 1]->_startFrame <= frame);
+			nextStarted = (_subtitles[_currentSubtitle + 1]->getStartFrame() <= frame);
 		}
 
 		while (_currentSubtitle < _subtitles.size() &&
@@ -228,22 +228,22 @@ bool VideoSubtitler::update(long frame) {
 
 			_currentSubtitle++;
 
-			overdue = (frame > _subtitles[_currentSubtitle]->_endFrame);
+			overdue = (frame > _subtitles[_currentSubtitle]->getEndFrame());
 			hasNext = (_currentSubtitle + 1 < _subtitles.size());
 			if (hasNext) {
-				nextStarted = (_subtitles[_currentSubtitle + 1]->_startFrame <= frame);
+				nextStarted = (_subtitles[_currentSubtitle + 1]->getStartFrame() <= frame);
 			} else {
 				nextStarted = false;
 			}
 		}
 
-		bool currentValid = (_subtitles[_currentSubtitle]->_endFrame != 0);
+		bool currentValid = (_subtitles[_currentSubtitle]->getEndFrame() != 0);
 		/*
 		 * No idea why we do this check, carried over from Mnemonic's code.
 		 * Possibly a workaround for buggy subtitles or some kind of sentinel? :-\
 		 */
 
-		bool currentStarted = frame >= _subtitles[_currentSubtitle]->_startFrame;
+		bool currentStarted = frame >= _subtitles[_currentSubtitle]->getStartFrame();
 
 		if (currentStarted && !overdue && currentValid) {
 			_showSubtitle = true;
-- 
cgit v1.2.3


From 8decf3d7424c8cb8eeae99d0aede78c445f18e9f Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Fri, 7 Feb 2014 12:14:23 +0100
Subject: WINTERMUTE: Remove ////-style separators from imported subtitle code

---
 engines/wintermute/video/video_subtitle.cpp  |  5 ++---
 engines/wintermute/video/video_subtitle.h    |  3 ++-
 engines/wintermute/video/video_subtitler.cpp | 10 +++-------
 engines/wintermute/video/video_subtitler.h   |  3 ++-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index bcaa293124..21fb5ec105 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -30,12 +30,10 @@
 #include "engines/wintermute/base/base_game.h"
 namespace Wintermute {
 
-//////////////////////////////////////////////////////////////////////////
 VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
 	_startFrame = _endFrame = 0;
 }
 
-//////////////////////////////////////////////////////////////////////////
 VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, const long &startFrame, const long &endFrame): BaseClass(inGame) {
 	_gameRef->expandStringByStringTable(&text);
 	_text = Common::String(text);
@@ -54,4 +52,5 @@ long VideoSubtitle::getEndFrame() {
 Common::String VideoSubtitle::getText() {
 	return _text;
 }
-}
+
+} // End of namespace Wintermute
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 5df1348465..3af0d06fa5 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -45,6 +45,7 @@ private:
 	long _startFrame;
 	Common::String _text;
 };
-}
+
+} // End of namespace Wintermute
 
 #endif
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index a1294dd3d4..b85e179b7c 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -34,14 +34,13 @@
 #include "engines/wintermute/base/gfx/base_renderer.h"
 
 namespace Wintermute {
-//////////////////////////////////////////////////////////////////////////
+
 VideoSubtitler::VideoSubtitler(BaseGame *inGame): BaseClass(inGame) {
 	_lastSample = -1;
 	_currentSubtitle = 0;
 	_showSubtitle = false;
 }
 
-//////////////////////////////////////////////////////////////////////////
 VideoSubtitler::~VideoSubtitler(void) {
 	for (uint i = 0; i < _subtitles.size(); i++) {
 		delete _subtitles[i];
@@ -50,8 +49,6 @@ VideoSubtitler::~VideoSubtitler(void) {
 	_subtitles.clear();
 }
 
-
-//////////////////////////////////////////////////////////////////////////
 bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFile) {
 	if (!filename) {
 		return false;
@@ -182,7 +179,6 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 	return true;
 }
 
-//////////////////////////////////////////////////////////////////////////
 bool VideoSubtitler::display() {
 	if (_showSubtitle) {
 		BaseFont *font = _gameRef->getVideoFont() ? _gameRef->getVideoFont() : _gameRef->getSystemFont();
@@ -195,7 +191,6 @@ bool VideoSubtitler::display() {
 	return false;
 }
 
-//////////////////////////////////////////////////////////////////////////
 bool VideoSubtitler::update(long frame) {
 	if (frame != _lastSample) {
 		/*
@@ -252,4 +247,5 @@ bool VideoSubtitler::update(long frame) {
 	}
 	return false;
 }
-}
+
+} // End of namespace Wintermute
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 68964a4084..977fc10066 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -48,6 +48,7 @@ public:
 	long _lastSample;
 	Common::Array<VideoSubtitle *> _subtitles;
 };
-}
+
+} // End of namespace Wintermute
 
 #endif
-- 
cgit v1.2.3


From a78a4d40dd1be6649f83a9411311d9210f1ddeea Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 20:51:55 +0200
Subject: WINTERMUTE: Use Common::String in place of char *text in
 loadSubtitles

---
 engines/wintermute/video/video_subtitle.cpp      |  9 +++++---
 engines/wintermute/video/video_subtitle.h        |  2 +-
 engines/wintermute/video/video_subtitler.cpp     | 27 +++++++++---------------
 engines/wintermute/video/video_subtitler.h       |  2 +-
 engines/wintermute/video/video_theora_player.cpp |  2 +-
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index 21fb5ec105..c9892b59a4 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -34,9 +34,12 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
 	_startFrame = _endFrame = 0;
 }
 
-VideoSubtitle::VideoSubtitle(BaseGame *inGame, char *text, const long &startFrame, const long &endFrame): BaseClass(inGame) {
-	_gameRef->expandStringByStringTable(&text);
-	_text = Common::String(text);
+VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const long &startFrame, const long &endFrame): BaseClass(inGame) {
+	// TODO: Fix expandStringByStringTable instead of this ugly hack
+	char *tmp = new char[text.size()];
+	strcpy(tmp, text.c_str());
+	_gameRef->expandStringByStringTable(&tmp);
+	_text = Common::String(tmp);
 	_startFrame = startFrame;
 	_endFrame = endFrame;
 }
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 3af0d06fa5..03d4b6bc05 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -36,7 +36,7 @@ namespace Wintermute {
 class VideoSubtitle : public BaseClass {
 public:
 	VideoSubtitle(BaseGame *inGame);
-	VideoSubtitle(BaseGame *inGame, char *text, const long &startFrame, const long &endFrame);
+	VideoSubtitle(BaseGame *inGame, const Common::String &text, const long &startFrame, const long &endFrame);
 	long getEndFrame();
 	long getStartFrame();
 	Common::String getText();
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index b85e179b7c..f1becb00b3 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -49,8 +49,8 @@ VideoSubtitler::~VideoSubtitler(void) {
 	_subtitles.clear();
 }
 
-bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFile) {
-	if (!filename) {
+bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common::String &subtitleFile) {
+	if (filename.size() == 0) {
 		return false;
 	}
 
@@ -67,7 +67,7 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 
 	Common::String newFile;
 
-	if (subtitleFile) {
+	if (subtitleFile.size() != 0) {
 		newFile = Common::String(subtitleFile);
 	} else {
 		Common::String path = PathUtil::getDirectoryName(filename);
@@ -93,7 +93,6 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 	char *tokenStart;
 	int tokenLength;
 	int tokenPos;
-	int textLength;
 
 	int pos = 0;
 	int lineLength = 0;
@@ -102,7 +101,6 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 		start = end = -1;
 		inToken = false;
 		tokenPos = -1;
-		textLength = 0;
 
 		lineLength = 0;
 
@@ -120,7 +118,7 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 			realLength = lineLength - 1;
 		}
 
-		char *text = new char[realLength + 1];
+		Common::String text;
 		char *line = (char *)&buffer[pos];
 
 		for (int i = 0; i < realLength; i++) {
@@ -146,30 +144,25 @@ bool VideoSubtitler::loadSubtitles(const char *filename, const char *subtitleFil
 					}
 					delete[] token;
 				} else {
-					text[textLength] = line[i];
-					textLength++;
+					text += line[i];
 				}
 			} else {
 				if (inToken) {
 					tokenLength++;
 				} else {
-					text[textLength] = line[i];
-					if (text[textLength] == '|') {
-						text[textLength] = '\n';
+					if (line[i] == '|') {
+						text += '\n';
+					} else {
+						text += line[i];
 					}
-					textLength++;
 				}
 			}
 		}
 
-		text[textLength] = '\0';
-
-		if (start != -1 && textLength > 0 && (start != 1 || end != 1)) {
+		if (start != -1 && text.size() > 0 && (start != 1 || end != 1)) {
 			_subtitles.push_back(new VideoSubtitle(_gameRef, text, start, end));
 		}
 
-		delete [] text;
-
 		pos += lineLength + 1;
 	}
 
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 977fc10066..38fdf89508 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -42,7 +42,7 @@ public:
 
 	bool _showSubtitle;
 	uint _currentSubtitle;
-	bool loadSubtitles(const char *filename, const char *subtitleFile);
+	bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
 	bool display();
 	bool update(long frame);
 	long _lastSample;
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 2af3ac1638..36d012ccb7 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -135,7 +135,7 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 #endif
 
 
-	if (_subtitler->loadSubtitles(_filename.c_str(), subtitleFile.c_str())) {
+	if (_subtitler->loadSubtitles(_filename, subtitleFile)) {
 		// We have subtitles
 		_subtitles = true;
 	} else {
-- 
cgit v1.2.3


From 581aff7f8f0938e71c3c7b8f197269e9a7146f93 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Fri, 7 Feb 2014 12:35:50 +0100
Subject: WINTERMUTE: Keep a bunch of attrs private in VideoSubtitler

---
 engines/wintermute/video/video_subtitler.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 38fdf89508..b369d0bff8 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -45,8 +45,9 @@ public:
 	bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
 	bool display();
 	bool update(long frame);
-	long _lastSample;
+private:
 	Common::Array<VideoSubtitle *> _subtitles;
+	long _lastSample;
 };
 
 } // End of namespace Wintermute
-- 
cgit v1.2.3


From afb3ae303461668d4807eaa047a5585a7c870adc Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Fri, 7 Feb 2014 12:40:59 +0100
Subject: WINTERMUTE: Treat edge case - prevents crash if SRT file is blank.

---
 engines/wintermute/video/video_subtitler.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index f1becb00b3..0ade366fb5 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -185,6 +185,12 @@ bool VideoSubtitler::display() {
 }
 
 bool VideoSubtitler::update(long frame) {
+
+	if (_subtitles.size() == 0) {
+		// Edge case: we have loaded subtitles early on... from a blank file.
+		return false;
+	}
+
 	if (frame != _lastSample) {
 		/*
 		 * If the frame count hasn't advanced the previous state still matches
-- 
cgit v1.2.3


From 7c6f9772d37e3ab7724d20c838883ee8abc2c2b3 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 8 Feb 2014 00:39:59 +0100
Subject: WINTERMUTE: Save frames as uint rather than long

It's just as good: at 30 FPS, this allows for
2 ^ 32 / 30 / 60 = 2386093 mins, which is, I guess, a reasonable limit.
---
 engines/wintermute/video/video_subtitle.cpp  |  6 +++---
 engines/wintermute/video/video_subtitle.h    | 10 +++++-----
 engines/wintermute/video/video_subtitler.cpp |  6 +++---
 engines/wintermute/video/video_subtitler.h   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index c9892b59a4..eb95f25944 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -34,7 +34,7 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
 	_startFrame = _endFrame = 0;
 }
 
-VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const long &startFrame, const long &endFrame): BaseClass(inGame) {
+VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame): BaseClass(inGame) {
 	// TODO: Fix expandStringByStringTable instead of this ugly hack
 	char *tmp = new char[text.size()];
 	strcpy(tmp, text.c_str());
@@ -44,11 +44,11 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const
 	_endFrame = endFrame;
 }
 
-long VideoSubtitle::getStartFrame() {
+uint VideoSubtitle::getStartFrame() {
 	return _startFrame;
 }
 
-long VideoSubtitle::getEndFrame() {
+uint VideoSubtitle::getEndFrame() {
 	return _endFrame;
 }
 
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 03d4b6bc05..4c80c0cdfd 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -36,13 +36,13 @@ namespace Wintermute {
 class VideoSubtitle : public BaseClass {
 public:
 	VideoSubtitle(BaseGame *inGame);
-	VideoSubtitle(BaseGame *inGame, const Common::String &text, const long &startFrame, const long &endFrame);
-	long getEndFrame();
-	long getStartFrame();
+	VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
+	uint getEndFrame();
+	uint getStartFrame();
 	Common::String getText();
 private:
-	long _endFrame;
-	long _startFrame;
+	uint _endFrame;
+	uint _startFrame;
 	Common::String _text;
 };
 
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 0ade366fb5..8f3032a95a 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -76,7 +76,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		newFile = PathUtil::combine(path, name + ext);
 	}
 
-	long size;
+	int size;
 
 	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(newFile, true, false);
 
@@ -88,7 +88,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 	char *buffer = new char[size];
 	file->read(buffer, size);
 
-	long start, end;
+	int start, end;
 	bool inToken;
 	char *tokenStart;
 	int tokenLength;
@@ -184,7 +184,7 @@ bool VideoSubtitler::display() {
 	return false;
 }
 
-bool VideoSubtitler::update(long frame) {
+bool VideoSubtitler::update(uint frame) {
 
 	if (_subtitles.size() == 0) {
 		// Edge case: we have loaded subtitles early on... from a blank file.
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index b369d0bff8..2940d69785 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -44,7 +44,7 @@ public:
 	uint _currentSubtitle;
 	bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
 	bool display();
-	bool update(long frame);
+	bool update(uint frame);
 private:
 	Common::Array<VideoSubtitle *> _subtitles;
 	long _lastSample;
-- 
cgit v1.2.3


From 40c5b01aad085f1cf69792f1ef945f54d5e844e1 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 8 Feb 2014 13:53:14 +0100
Subject: WINTERMUTE: Preserve const when handing chars over to drawText

---
 engines/wintermute/video/video_subtitler.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 8f3032a95a..a8ce86853a 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -64,7 +64,6 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 	_currentSubtitle = 0;
 	_showSubtitle = false;
 
-
 	Common::String newFile;
 
 	if (subtitleFile.size() != 0) {
@@ -174,18 +173,28 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 bool VideoSubtitler::display() {
 	if (_showSubtitle) {
-		BaseFont *font = _gameRef->getVideoFont() ? _gameRef->getVideoFont() : _gameRef->getSystemFont();
-		int textHeight = font->getTextHeight((byte *)_subtitles[_currentSubtitle]->getText().c_str(), _gameRef->_renderer->getWidth());
-		font->drawText((byte *)_subtitles[_currentSubtitle]->getText().c_str(),
+
+		BaseFont *font;
+
+		if (_gameRef->getVideoFont() == nullptr) {
+			font = _gameRef->getSystemFont();
+		} else {
+			font = _gameRef->getVideoFont();
+		}
+
+		int textHeight = font->getTextHeight(
+		                     (const byte *)_subtitles[_currentSubtitle]->getText().c_str(),
+		                     _gameRef->_renderer->getWidth());
+		font->drawText((const byte *)_subtitles[_currentSubtitle]->getText().c_str(),
 		               0,
 		               (_gameRef->_renderer->getHeight() - textHeight - 5),
-		               (_gameRef->_renderer->getWidth(), TAL_CENTER));
+		               (_gameRef->_renderer->getWidth()),
+		               TAL_CENTER);
 	}
 	return false;
 }
 
 bool VideoSubtitler::update(uint frame) {
-
 	if (_subtitles.size() == 0) {
 		// Edge case: we have loaded subtitles early on... from a blank file.
 		return false;
@@ -242,7 +251,6 @@ bool VideoSubtitler::update(uint frame) {
 		if (currentStarted && !overdue && currentValid) {
 			_showSubtitle = true;
 		}
-
 	}
 	return false;
 }
-- 
cgit v1.2.3


From 2acb2f558c4ee018ad30ce6fb6e8412d175b6c46 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 8 Feb 2014 13:59:37 +0100
Subject: WINTERMUTE: Add clarification comment in loadSubtitles

---
 engines/wintermute/video/video_subtitler.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index a8ce86853a..cc46ddf526 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -66,6 +66,13 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 	Common::String newFile;
 
+	/*
+	 * Okay, the expected behaviour is this: either we are
+	 * provided with a subtitle file to use by the script when
+	 * calling PlayTheora(), or we try to autodetect a suitable
+	 * one which, for /some/path/movie/ogg is to be called
+	 * /some/path/movie.sub
+	 */
 	if (subtitleFile.size() != 0) {
 		newFile = Common::String(subtitleFile);
 	} else {
-- 
cgit v1.2.3


From a4d5d1458102959bdc26fc73184e2cfc5f918894 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 21:15:07 +0200
Subject: WINTERMUTE: Turn display() and update() into void functions.

No idea why they were bools in the first place.
---
 engines/wintermute/video/video_subtitler.cpp | 9 ++++-----
 engines/wintermute/video/video_subtitler.h   | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index cc46ddf526..05c7b6c563 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -178,7 +178,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 	return true;
 }
 
-bool VideoSubtitler::display() {
+void VideoSubtitler::display() {
 	if (_showSubtitle) {
 
 		BaseFont *font;
@@ -192,19 +192,19 @@ bool VideoSubtitler::display() {
 		int textHeight = font->getTextHeight(
 		                     (const byte *)_subtitles[_currentSubtitle]->getText().c_str(),
 		                     _gameRef->_renderer->getWidth());
+
 		font->drawText((const byte *)_subtitles[_currentSubtitle]->getText().c_str(),
 		               0,
 		               (_gameRef->_renderer->getHeight() - textHeight - 5),
 		               (_gameRef->_renderer->getWidth()),
 		               TAL_CENTER);
 	}
-	return false;
 }
 
-bool VideoSubtitler::update(uint frame) {
+void VideoSubtitler::update(uint frame) {
 	if (_subtitles.size() == 0) {
 		// Edge case: we have loaded subtitles early on... from a blank file.
-		return false;
+		return;
 	}
 
 	if (frame != _lastSample) {
@@ -259,7 +259,6 @@ bool VideoSubtitler::update(uint frame) {
 			_showSubtitle = true;
 		}
 	}
-	return false;
 }
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 2940d69785..8c57fd290f 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -43,8 +43,8 @@ public:
 	bool _showSubtitle;
 	uint _currentSubtitle;
 	bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
-	bool display();
-	bool update(uint frame);
+	void display();
+	void update(uint frame);
 private:
 	Common::Array<VideoSubtitle *> _subtitles;
 	long _lastSample;
-- 
cgit v1.2.3


From 7b4084b7e0273b37f1fb0583431540d977c424ae Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 18 Feb 2014 22:10:06 +0100
Subject: WINTERMUTE: s/uint32 _lastSample/long _lastSample/

---
 engines/wintermute/video/video_subtitler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 8c57fd290f..3f62c05134 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -47,7 +47,7 @@ public:
 	void update(uint frame);
 private:
 	Common::Array<VideoSubtitle *> _subtitles;
-	long _lastSample;
+	uint32 _lastSample;
 };
 
 } // End of namespace Wintermute
-- 
cgit v1.2.3


From dd820a7a1e9adcb7c46d2cb2fe178c895e40b8c3 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 18 Feb 2014 22:23:42 +0100
Subject: WINTERMUTE: Turn a bunch of uint into uint32 in VideoSubtitle

---
 engines/wintermute/video/video_subtitle.cpp  | 4 ++--
 engines/wintermute/video/video_subtitle.h    | 8 ++++----
 engines/wintermute/video/video_subtitler.cpp | 2 +-
 engines/wintermute/video/video_subtitler.h   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
index eb95f25944..b02a3ec50f 100644
--- a/engines/wintermute/video/video_subtitle.cpp
+++ b/engines/wintermute/video/video_subtitle.cpp
@@ -44,11 +44,11 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const
 	_endFrame = endFrame;
 }
 
-uint VideoSubtitle::getStartFrame() {
+uint32 VideoSubtitle::getStartFrame() {
 	return _startFrame;
 }
 
-uint VideoSubtitle::getEndFrame() {
+uint32 VideoSubtitle::getEndFrame() {
 	return _endFrame;
 }
 
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
index 4c80c0cdfd..fb80a58a72 100644
--- a/engines/wintermute/video/video_subtitle.h
+++ b/engines/wintermute/video/video_subtitle.h
@@ -37,12 +37,12 @@ class VideoSubtitle : public BaseClass {
 public:
 	VideoSubtitle(BaseGame *inGame);
 	VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
-	uint getEndFrame();
-	uint getStartFrame();
+	uint32 getEndFrame();
+	uint32 getStartFrame();
 	Common::String getText();
 private:
-	uint _endFrame;
-	uint _startFrame;
+	uint32 _endFrame;
+	uint32 _startFrame;
 	Common::String _text;
 };
 
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 05c7b6c563..c8acbeb98b 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -201,7 +201,7 @@ void VideoSubtitler::display() {
 	}
 }
 
-void VideoSubtitler::update(uint frame) {
+void VideoSubtitler::update(uint32 frame) {
 	if (_subtitles.size() == 0) {
 		// Edge case: we have loaded subtitles early on... from a blank file.
 		return;
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 3f62c05134..655b1a5969 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -41,10 +41,10 @@ public:
 	virtual ~VideoSubtitler(void);
 
 	bool _showSubtitle;
-	uint _currentSubtitle;
+	uint32 _currentSubtitle;
 	bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
 	void display();
-	void update(uint frame);
+	void update(uint32 frame);
 private:
 	Common::Array<VideoSubtitle *> _subtitles;
 	uint32 _lastSample;
-- 
cgit v1.2.3


From 388fbdb6eb8df910c2fff2dc34954f34759c5b16 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 21:16:04 +0200
Subject: WINTERMUTE: Rename VideoSubtitle to SubtitleCard

---
 engines/wintermute/module.mk                 |  2 +-
 engines/wintermute/video/subtitle_card.cpp   | 59 ++++++++++++++++++++++++++++
 engines/wintermute/video/subtitle_card.h     | 51 ++++++++++++++++++++++++
 engines/wintermute/video/video_subtitle.cpp  | 59 ----------------------------
 engines/wintermute/video/video_subtitle.h    | 51 ------------------------
 engines/wintermute/video/video_subtitler.cpp |  2 +-
 engines/wintermute/video/video_subtitler.h   |  4 +-
 7 files changed, 114 insertions(+), 114 deletions(-)
 create mode 100644 engines/wintermute/video/subtitle_card.cpp
 create mode 100644 engines/wintermute/video/subtitle_card.h
 delete mode 100644 engines/wintermute/video/video_subtitle.cpp
 delete mode 100644 engines/wintermute/video/video_subtitle.h

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index b4845b0552..4c95314a02 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -108,8 +108,8 @@ MODULE_OBJS := \
 	utils/path_util.o \
 	utils/string_util.o \
 	utils/utils.o \
+	video/subtitle_card.o \
 	video/video_player.o \
-	video/video_subtitle.o \
 	video/video_subtitler.o \
 	video/video_theora_player.o \
 	debugger.o \
diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
new file mode 100644
index 0000000000..971b2c019c
--- /dev/null
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on Wintermute Engine
+ * http://dead-code.org/redir.php?target=wme
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#include "engines/wintermute/video/subtitle_card.h"
+#include "engines/wintermute/base/base_game.h"
+namespace Wintermute {
+
+SubtitleCard::SubtitleCard(BaseGame *inGame): BaseClass(inGame) {
+	_startFrame = _endFrame = 0;
+}
+
+SubtitleCard::SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame): BaseClass(inGame) {
+	// TODO: Fix expandStringByStringTable instead of this ugly hack
+	char *tmp = new char[text.size()];
+	strcpy(tmp, text.c_str());
+	_gameRef->expandStringByStringTable(&tmp);
+	_text = Common::String(tmp);
+	_startFrame = startFrame;
+	_endFrame = endFrame;
+}
+
+uint32 SubtitleCard::getStartFrame() {
+	return _startFrame;
+}
+
+uint32 SubtitleCard::getEndFrame() {
+	return _endFrame;
+}
+
+Common::String SubtitleCard::getText() {
+	return _text;
+}
+
+} // End of namespace Wintermute
diff --git a/engines/wintermute/video/subtitle_card.h b/engines/wintermute/video/subtitle_card.h
new file mode 100644
index 0000000000..5390d64fcb
--- /dev/null
+++ b/engines/wintermute/video/subtitle_card.h
@@ -0,0 +1,51 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on Wintermute Engine
+ * http://dead-code.org/redir.php?target=wme
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#ifndef WINTERMUTE_SUBTITLECARD_H
+#define WINTERMUTE_SUBTITLECARD_H
+
+#include "engines/wintermute/base/base.h"
+
+namespace Wintermute {
+
+class SubtitleCard : public BaseClass {
+public:
+	SubtitleCard(BaseGame *inGame);
+	SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
+	uint32 getEndFrame();
+	uint32 getStartFrame();
+	Common::String getText();
+private:
+	uint32 _endFrame;
+	uint32 _startFrame;
+	Common::String _text;
+};
+
+} // End of namespace Wintermute
+
+#endif
diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/video_subtitle.cpp
deleted file mode 100644
index b02a3ec50f..0000000000
--- a/engines/wintermute/video/video_subtitle.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This file is based on Wintermute Engine
- * http://dead-code.org/redir.php?target=wme
- * Copyright (c) 2011 Jan Nedoma
- */
-
-#include "engines/wintermute/video/video_subtitle.h"
-#include "engines/wintermute/base/base_game.h"
-namespace Wintermute {
-
-VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) {
-	_startFrame = _endFrame = 0;
-}
-
-VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame): BaseClass(inGame) {
-	// TODO: Fix expandStringByStringTable instead of this ugly hack
-	char *tmp = new char[text.size()];
-	strcpy(tmp, text.c_str());
-	_gameRef->expandStringByStringTable(&tmp);
-	_text = Common::String(tmp);
-	_startFrame = startFrame;
-	_endFrame = endFrame;
-}
-
-uint32 VideoSubtitle::getStartFrame() {
-	return _startFrame;
-}
-
-uint32 VideoSubtitle::getEndFrame() {
-	return _endFrame;
-}
-
-Common::String VideoSubtitle::getText() {
-	return _text;
-}
-
-} // End of namespace Wintermute
diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/video_subtitle.h
deleted file mode 100644
index fb80a58a72..0000000000
--- a/engines/wintermute/video/video_subtitle.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This file is based on Wintermute Engine
- * http://dead-code.org/redir.php?target=wme
- * Copyright (c) 2011 Jan Nedoma
- */
-
-#ifndef WINTERMUTE_VIDSUBTITLE_H
-#define WINTERMUTE_VIDSUBTITLE_H
-
-#include "engines/wintermute/base/base.h"
-
-namespace Wintermute {
-
-class VideoSubtitle : public BaseClass {
-public:
-	VideoSubtitle(BaseGame *inGame);
-	VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
-	uint32 getEndFrame();
-	uint32 getStartFrame();
-	Common::String getText();
-private:
-	uint32 _endFrame;
-	uint32 _startFrame;
-	Common::String _text;
-};
-
-} // End of namespace Wintermute
-
-#endif
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index c8acbeb98b..c57a70ec3b 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -166,7 +166,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		}
 
 		if (start != -1 && text.size() > 0 && (start != 1 || end != 1)) {
-			_subtitles.push_back(new VideoSubtitle(_gameRef, text, start, end));
+			_subtitles.push_back(new SubtitleCard(_gameRef, text, start, end));
 		}
 
 		pos += lineLength + 1;
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 655b1a5969..32e4368daf 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_VIDSUBTITLER_H
 
 #include "engines/wintermute/base/base.h"
-#include "engines/wintermute/video/video_subtitle.h"
+#include "engines/wintermute/video/subtitle_card.h"
 
 namespace Wintermute {
 
@@ -46,7 +46,7 @@ public:
 	void display();
 	void update(uint32 frame);
 private:
-	Common::Array<VideoSubtitle *> _subtitles;
+	Common::Array<SubtitleCard *> _subtitles;
 	uint32 _lastSample;
 };
 
-- 
cgit v1.2.3


From 1a571d9611ea21040f7b5ff971fcd7b70580a025 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Thu, 20 Feb 2014 19:50:51 +0100
Subject: WINTERMUTE: Avoid doing check before delete (deleting 0-pointer is
 safe)

---
 engines/wintermute/video/video_theora_player.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 36d012ccb7..d16b2edb8c 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -92,10 +92,7 @@ void VideoTheoraPlayer::SetDefaults() {
 //////////////////////////////////////////////////////////////////////////
 VideoTheoraPlayer::~VideoTheoraPlayer(void) {
 	cleanup();
-	if(_subtitler) {
-		delete _subtitler;
-		_subtitler = NULL;
-	}
+	delete _subtitler;
 }
 
 //////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 4742acf9395d069d8e9ee1752c3f8f09c1034b08 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Thu, 20 Feb 2014 20:00:14 +0100
Subject: WINTERMUTE: Rename VideoTheoraPlayer->_subtitles to _foundSubtitles
 for clarity

---
 engines/wintermute/video/video_theora_player.cpp | 12 ++++++------
 engines/wintermute/video/video_theora_player.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index d16b2edb8c..99fce7b6ad 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -86,7 +86,7 @@ void VideoTheoraPlayer::SetDefaults() {
 	_theoraDecoder = nullptr;
 
 	_subtitler = new VideoSubtitler(_gameRef);
-	_subtitles = false;
+	_foundSubtitles = false;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -134,10 +134,10 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 
 	if (_subtitler->loadSubtitles(_filename, subtitleFile)) {
 		// We have subtitles
-		_subtitles = true;
+		_foundSubtitles = true;
 	} else {
 		// We couldn't load subtitles...
-		_subtitles = false;
+		_foundSubtitles = false;
 	}
 
 	_theoraDecoder->loadStream(_file);
@@ -224,7 +224,7 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame,
 		_state = THEORA_STATE_PLAYING;
 		_looping = looping;
 		_playbackType = type;
-		if (_subtitler && _subtitles && _gameRef->_subtitles) {
+		if (_subtitler && _foundSubtitles && _gameRef->_subtitles) {
 			_subtitler->update(_theoraDecoder->getFrameCount());
 			_subtitler->display();
 		}
@@ -302,7 +302,7 @@ bool VideoTheoraPlayer::update() {
 	}
 
 	if (_theoraDecoder) {
-		if (_subtitler && _subtitles && _gameRef->_subtitles) {
+		if (_subtitler && _foundSubtitles && _gameRef->_subtitles) {
 			_subtitler->update(_theoraDecoder->getCurFrame());
 		}
 
@@ -430,7 +430,7 @@ bool VideoTheoraPlayer::display(uint32 alpha) {
 		res = STATUS_FAILED;
 	}
 
-	if (_subtitler && _subtitles && _gameRef->_subtitles) {
+	if (_subtitler && _foundSubtitles && _gameRef->_subtitles) {
 		_subtitler->display();
 	}
 	return res;
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 48f75efd20..0b9b3d487a 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -138,7 +138,7 @@ private:
 
 	bool _playbackStarted;
 
-	bool _subtitles;
+	bool _foundSubtitles;
 
 	// helpers
 	void SetDefaults();
-- 
cgit v1.2.3


From 599390a5ad5b0df7a480230a97b51b9ccb41a177 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 9 Sep 2014 19:26:02 +0200
Subject: WINTERMUTE: Lose unnecessary if() in VideoTheoraPlayer

---
 engines/wintermute/video/video_theora_player.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 99fce7b6ad..22c235c848 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -131,14 +131,7 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 	return STATUS_FAILED;
 #endif
 
-
-	if (_subtitler->loadSubtitles(_filename, subtitleFile)) {
-		// We have subtitles
-		_foundSubtitles = true;
-	} else {
-		// We couldn't load subtitles...
-		_foundSubtitles = false;
-	}
+	_foundSubtitles = _subtitler->loadSubtitles(_filename, subtitleFile);
 
 	_theoraDecoder->loadStream(_file);
 
-- 
cgit v1.2.3


From f1ae8e6e8d89f53e8fcd6ffb7eb3faf1e5ab8993 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 22 Feb 2014 12:10:27 +0100
Subject: WINTERMUTE: Introduce
 BaseGame->expandStringByStringTable(&Common::String)

---
 engines/wintermute/base/base_game.cpp          | 5 +++++
 engines/wintermute/base/base_game.h            | 1 +
 engines/wintermute/base/base_game_settings.cpp | 5 +++++
 engines/wintermute/base/base_game_settings.h   | 1 +
 engines/wintermute/base/base_string_table.cpp  | 9 +++++++++
 engines/wintermute/base/base_string_table.h    | 1 +
 6 files changed, 22 insertions(+)

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 8df39c825a..668053bb3a 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3896,6 +3896,11 @@ void BaseGame::expandStringByStringTable(char **str) const {
 	_settings->expandStringByStringTable(str);
 }
 
+//////////////////////////////////////////////////////////////////////////
+void BaseGame::expandStringByStringTable(Common::String &str) const {
+	_settings->expandStringByStringTable(str);
+}
+
 char *BaseGame::getKeyFromStringTable(const char *str) const {
 	return _settings->getKeyFromStringTable(str);
 }
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index f62416ee1b..e535cc9618 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -141,6 +141,7 @@ public:
 
 	// String Table
 	void expandStringByStringTable(char **str) const;
+	void expandStringByStringTable(Common::String &str) const;
 	char *getKeyFromStringTable(const char *str) const;
 
 	void LOG(bool res, const char *fmt, ...);
diff --git a/engines/wintermute/base/base_game_settings.cpp b/engines/wintermute/base/base_game_settings.cpp
index 61c5894be3..996bada997 100644
--- a/engines/wintermute/base/base_game_settings.cpp
+++ b/engines/wintermute/base/base_game_settings.cpp
@@ -215,6 +215,11 @@ void BaseGameSettings::expandStringByStringTable(char **str) const {
 	_stringTable->expand(str);
 }
 
+//////////////////////////////////////////////////////////////////////////
+void BaseGameSettings::expandStringByStringTable(Common::String &str) const {
+	_stringTable->expand(str);
+}
+
 char *BaseGameSettings::getKeyFromStringTable(const char *str) const {
 	return _stringTable->getKey(str);
 }
diff --git a/engines/wintermute/base/base_game_settings.h b/engines/wintermute/base/base_game_settings.h
index 2059cb075e..15afb06450 100644
--- a/engines/wintermute/base/base_game_settings.h
+++ b/engines/wintermute/base/base_game_settings.h
@@ -46,6 +46,7 @@ public:
 	bool loadSettings(const char *filename);
 	bool loadStringTable(const char *filename, bool clearOld);
 	void expandStringByStringTable(char **str) const;
+	void expandStringByStringTable(Common::String &str) const;
 	char *getKeyFromStringTable(const char *str) const;
 
 	bool persist(BasePersistenceManager *persistMgr);
diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index 89407a7b0e..8a9edbe198 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -147,6 +147,15 @@ void BaseStringTable::expand(char **str) const {
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////
+void BaseStringTable::expand(Common::String &str) const {
+	char *tmp = new char[str.size()];
+	strcpy(tmp, str.c_str());
+	expand(&tmp);
+	str = tmp;
+	delete tmp;
+}
+
 
 //////////////////////////////////////////////////////////////////////////
 const char *BaseStringTable::expandStatic(const char *string) const {
diff --git a/engines/wintermute/base/base_string_table.h b/engines/wintermute/base/base_string_table.h
index cdcf11917d..cfa3eeb226 100644
--- a/engines/wintermute/base/base_string_table.h
+++ b/engines/wintermute/base/base_string_table.h
@@ -41,6 +41,7 @@ class BaseStringTable : public BaseClass {
 public:
 	bool loadFile(const char *filename, bool deleteAll = true);
 	void expand(char **str) const;
+	void expand(Common::String &str) const;
 	const char *expandStatic(const char *string) const;
 	bool addString(const char *key, const char *val, bool reportDuplicities = true);
 	BaseStringTable(BaseGame *inGame);
-- 
cgit v1.2.3


From 5f25cf1bd731ed2bae852610c74a9917942ab883 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 22 Feb 2014 11:18:05 +0100
Subject: WINTERMUTE: Don't bother inheriting BaseGame in SubtitleCard

---
 engines/wintermute/video/subtitle_card.cpp | 7 +++++--
 engines/wintermute/video/subtitle_card.h   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
index 971b2c019c..c0ad8cc1d7 100644
--- a/engines/wintermute/video/subtitle_card.cpp
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -28,16 +28,19 @@
 
 #include "engines/wintermute/video/subtitle_card.h"
 #include "engines/wintermute/base/base_game.h"
+
 namespace Wintermute {
 
-SubtitleCard::SubtitleCard(BaseGame *inGame): BaseClass(inGame) {
+SubtitleCard::SubtitleCard(BaseGame *inGame) {
+	_gameRef = inGame;
 	_startFrame = _endFrame = 0;
 }
 
-SubtitleCard::SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame): BaseClass(inGame) {
+SubtitleCard::SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame) {
 	// TODO: Fix expandStringByStringTable instead of this ugly hack
 	char *tmp = new char[text.size()];
 	strcpy(tmp, text.c_str());
+	_gameRef = inGame;
 	_gameRef->expandStringByStringTable(&tmp);
 	_text = Common::String(tmp);
 	_startFrame = startFrame;
diff --git a/engines/wintermute/video/subtitle_card.h b/engines/wintermute/video/subtitle_card.h
index 5390d64fcb..94543d93fa 100644
--- a/engines/wintermute/video/subtitle_card.h
+++ b/engines/wintermute/video/subtitle_card.h
@@ -29,11 +29,13 @@
 #ifndef WINTERMUTE_SUBTITLECARD_H
 #define WINTERMUTE_SUBTITLECARD_H
 
-#include "engines/wintermute/base/base.h"
+#include "common/str.h"
 
 namespace Wintermute {
 
-class SubtitleCard : public BaseClass {
+class BaseGame;
+
+class SubtitleCard {
 public:
 	SubtitleCard(BaseGame *inGame);
 	SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
@@ -41,6 +43,7 @@ public:
 	uint32 getStartFrame();
 	Common::String getText();
 private:
+	BaseGame* _gameRef;
 	uint32 _endFrame;
 	uint32 _startFrame;
 	Common::String _text;
-- 
cgit v1.2.3


From 856e281bf17a7adca88ded8bc93fd2e892bfa973 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 22 Feb 2014 11:35:34 +0100
Subject: WINTERMUTE: Remove useless constructor from SubtitleCard.

---
 engines/wintermute/video/subtitle_card.cpp | 4 ----
 engines/wintermute/video/subtitle_card.h   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
index c0ad8cc1d7..a0a88b12be 100644
--- a/engines/wintermute/video/subtitle_card.cpp
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -31,10 +31,6 @@
 
 namespace Wintermute {
 
-SubtitleCard::SubtitleCard(BaseGame *inGame) {
-	_gameRef = inGame;
-	_startFrame = _endFrame = 0;
-}
 
 SubtitleCard::SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame) {
 	// TODO: Fix expandStringByStringTable instead of this ugly hack
diff --git a/engines/wintermute/video/subtitle_card.h b/engines/wintermute/video/subtitle_card.h
index 94543d93fa..6f2e47fe2b 100644
--- a/engines/wintermute/video/subtitle_card.h
+++ b/engines/wintermute/video/subtitle_card.h
@@ -37,7 +37,6 @@ class BaseGame;
 
 class SubtitleCard {
 public:
-	SubtitleCard(BaseGame *inGame);
 	SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
 	uint32 getEndFrame();
 	uint32 getStartFrame();
-- 
cgit v1.2.3


From 578edde66fc87eb1d4f630cbd1a9e402172440fa Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 22 Feb 2014 11:37:56 +0100
Subject: WINTERMUTE: Const'fy members of class SubtitleCard

---
 engines/wintermute/video/subtitle_card.cpp | 17 +++++++++--------
 engines/wintermute/video/subtitle_card.h   | 12 ++++++------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
index a0a88b12be..fb2ac06a84 100644
--- a/engines/wintermute/video/subtitle_card.cpp
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -31,27 +31,28 @@
 
 namespace Wintermute {
 
-
-SubtitleCard::SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame) {
+SubtitleCard::SubtitleCard(BaseGame *inGame, 
+			   const Common::String &text, 
+			   const uint &startFrame, 
+			   const uint &endFrame) : _gameRef(inGame), 
+						   _startFrame(startFrame), 
+						   _endFrame(endFrame) {
 	// TODO: Fix expandStringByStringTable instead of this ugly hack
 	char *tmp = new char[text.size()];
 	strcpy(tmp, text.c_str());
-	_gameRef = inGame;
 	_gameRef->expandStringByStringTable(&tmp);
 	_text = Common::String(tmp);
-	_startFrame = startFrame;
-	_endFrame = endFrame;
 }
 
-uint32 SubtitleCard::getStartFrame() {
+uint32 SubtitleCard::getStartFrame() const {
 	return _startFrame;
 }
 
-uint32 SubtitleCard::getEndFrame() {
+uint32 SubtitleCard::getEndFrame() const {
 	return _endFrame;
 }
 
-Common::String SubtitleCard::getText() {
+Common::String SubtitleCard::getText() const {
 	return _text;
 }
 
diff --git a/engines/wintermute/video/subtitle_card.h b/engines/wintermute/video/subtitle_card.h
index 6f2e47fe2b..7b372c76ad 100644
--- a/engines/wintermute/video/subtitle_card.h
+++ b/engines/wintermute/video/subtitle_card.h
@@ -38,13 +38,13 @@ class BaseGame;
 class SubtitleCard {
 public:
 	SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame);
-	uint32 getEndFrame();
-	uint32 getStartFrame();
-	Common::String getText();
+	uint32 getEndFrame() const;
+	uint32 getStartFrame() const;
+	Common::String getText() const;
 private:
-	BaseGame* _gameRef;
-	uint32 _endFrame;
-	uint32 _startFrame;
+	const BaseGame* _gameRef;
+	const uint32 _endFrame;
+	const uint32 _startFrame;
 	Common::String _text;
 };
 
-- 
cgit v1.2.3


From f525514da576be7f5c645c38ff121b764378349e Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sat, 22 Feb 2014 12:10:51 +0100
Subject: WINTERMUTE: Use BaseGame->expandStringByStringTable(&Common::String)
 in SubtitleCard

---
 engines/wintermute/video/subtitle_card.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
index fb2ac06a84..28fb6544f2 100644
--- a/engines/wintermute/video/subtitle_card.cpp
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -31,17 +31,14 @@
 
 namespace Wintermute {
 
-SubtitleCard::SubtitleCard(BaseGame *inGame, 
-			   const Common::String &text, 
-			   const uint &startFrame, 
-			   const uint &endFrame) : _gameRef(inGame), 
-						   _startFrame(startFrame), 
+SubtitleCard::SubtitleCard(BaseGame *inGame,
+			   const Common::String &text,
+			   const uint &startFrame,
+			   const uint &endFrame) : _gameRef(inGame),
+						   _startFrame(startFrame),
 						   _endFrame(endFrame) {
-	// TODO: Fix expandStringByStringTable instead of this ugly hack
-	char *tmp = new char[text.size()];
-	strcpy(tmp, text.c_str());
-	_gameRef->expandStringByStringTable(&tmp);
-	_text = Common::String(tmp);
+	_text = text;
+	_gameRef->expandStringByStringTable(_text);
 }
 
 uint32 SubtitleCard::getStartFrame() const {
-- 
cgit v1.2.3


From ebb48a1704b236d986539dbc716aae2d73921bb7 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Mon, 8 Sep 2014 16:27:40 +0200
Subject: WINTERMUTE: s/delete array/delete[] array/

---
 engines/wintermute/base/base_string_table.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index 8a9edbe198..bcdd7cb861 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -153,7 +153,7 @@ void BaseStringTable::expand(Common::String &str) const {
 	strcpy(tmp, str.c_str());
 	expand(&tmp);
 	str = tmp;
-	delete tmp;
+	delete[] tmp;
 }
 
 
-- 
cgit v1.2.3


From c6930d9a64d6d61ece2f0b531ad93459d2730150 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 9 Sep 2014 15:30:47 +0200
Subject: WINTERMUTE: Use int32 for _lastSample in VideoSubtitler

We are thus making room for the sentinel == -1
---
 engines/wintermute/video/video_subtitler.cpp | 2 +-
 engines/wintermute/video/video_subtitler.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index c57a70ec3b..2117832fad 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -207,7 +207,7 @@ void VideoSubtitler::update(uint32 frame) {
 		return;
 	}
 
-	if (frame != _lastSample) {
+	if ((int32)frame != _lastSample) {
 		/*
 		 * If the frame count hasn't advanced the previous state still matches
 		 * the current frame (obviously).
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 32e4368daf..f2dcdf161e 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -47,7 +47,7 @@ public:
 	void update(uint32 frame);
 private:
 	Common::Array<SubtitleCard *> _subtitles;
-	uint32 _lastSample;
+	int32 _lastSample;
 };
 
 } // End of namespace Wintermute
-- 
cgit v1.2.3


From 2fc69d770c7f80b0f6027dd66a8cf4be401b2853 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 9 Sep 2014 15:33:12 +0200
Subject: WINTERMUTE: Initialize tokenSomething vars in VideoSubtitler

MSVC complains otherwise.
---
 engines/wintermute/video/video_subtitler.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 2117832fad..2bd728c797 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -96,9 +96,9 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 	int start, end;
 	bool inToken;
-	char *tokenStart;
-	int tokenLength;
-	int tokenPos;
+	char *tokenStart = 0;
+	int tokenLength = 0;
+	int tokenPos = 0;
 
 	int pos = 0;
 	int lineLength = 0;
-- 
cgit v1.2.3


From d5ed8c29f1f97519bd72aec8585edf04ac46181f Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 21:18:00 +0200
Subject: WINTERMUTE: Turn _subtitles into Common::Array<SubtitleCard> in
 VideoSubtitler

This necessarily loses const in SubtitleCard's attributes
---
 engines/wintermute/video/subtitle_card.cpp   | 10 ++++----
 engines/wintermute/video/subtitle_card.h     |  6 ++---
 engines/wintermute/video/video_subtitler.cpp | 35 +++++++++++-----------------
 engines/wintermute/video/video_subtitler.h   |  2 +-
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
index 28fb6544f2..5d882502fd 100644
--- a/engines/wintermute/video/subtitle_card.cpp
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -32,11 +32,11 @@
 namespace Wintermute {
 
 SubtitleCard::SubtitleCard(BaseGame *inGame,
-			   const Common::String &text,
-			   const uint &startFrame,
-			   const uint &endFrame) : _gameRef(inGame),
-						   _startFrame(startFrame),
-						   _endFrame(endFrame) {
+                           const Common::String &text,
+                           const uint &startFrame,
+                           const uint &endFrame) : _gameRef(inGame),
+	_startFrame(startFrame),
+	_endFrame(endFrame) {
 	_text = text;
 	_gameRef->expandStringByStringTable(_text);
 }
diff --git a/engines/wintermute/video/subtitle_card.h b/engines/wintermute/video/subtitle_card.h
index 7b372c76ad..629df77287 100644
--- a/engines/wintermute/video/subtitle_card.h
+++ b/engines/wintermute/video/subtitle_card.h
@@ -42,9 +42,9 @@ public:
 	uint32 getStartFrame() const;
 	Common::String getText() const;
 private:
-	const BaseGame* _gameRef;
-	const uint32 _endFrame;
-	const uint32 _startFrame;
+	BaseGame *_gameRef;
+	uint32 _endFrame;
+	uint32 _startFrame;
 	Common::String _text;
 };
 
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 2bd728c797..2123991c03 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -42,10 +42,6 @@ VideoSubtitler::VideoSubtitler(BaseGame *inGame): BaseClass(inGame) {
 }
 
 VideoSubtitler::~VideoSubtitler(void) {
-	for (uint i = 0; i < _subtitles.size(); i++) {
-		delete _subtitles[i];
-	}
-
 	_subtitles.clear();
 }
 
@@ -54,10 +50,6 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		return false;
 	}
 
-	for (uint i = 0; i < _subtitles.size(); i++) {
-		delete _subtitles[i];
-	}
-
 	_subtitles.clear();
 
 	_lastSample = -1;
@@ -166,7 +158,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		}
 
 		if (start != -1 && text.size() > 0 && (start != 1 || end != 1)) {
-			_subtitles.push_back(new SubtitleCard(_gameRef, text, start, end));
+			_subtitles.push_back(SubtitleCard(_gameRef, text, start, end));
 		}
 
 		pos += lineLength + 1;
@@ -190,14 +182,15 @@ void VideoSubtitler::display() {
 		}
 
 		int textHeight = font->getTextHeight(
-		                     (const byte *)_subtitles[_currentSubtitle]->getText().c_str(),
+		                     (const byte *)_subtitles[_currentSubtitle].getText().c_str(),
 		                     _gameRef->_renderer->getWidth());
 
-		font->drawText((const byte *)_subtitles[_currentSubtitle]->getText().c_str(),
-		               0,
-		               (_gameRef->_renderer->getHeight() - textHeight - 5),
-		               (_gameRef->_renderer->getWidth()),
-		               TAL_CENTER);
+		font->drawText(
+		    (const byte *)_subtitles[_currentSubtitle].getText().c_str(),
+		    0,
+		    (_gameRef->_renderer->getHeight() - textHeight - 5),
+		    (_gameRef->_renderer->getWidth()),
+		    TAL_CENTER);
 	}
 }
 
@@ -218,11 +211,11 @@ void VideoSubtitler::update(uint32 frame) {
 
 		_showSubtitle = false;
 
-		bool overdue = (frame > _subtitles[_currentSubtitle]->getEndFrame());
+		bool overdue = (frame > _subtitles[_currentSubtitle].getEndFrame());
 		bool hasNext = (_currentSubtitle + 1 < _subtitles.size());
 		bool nextStarted = false;
 		if (hasNext) {
-			nextStarted = (_subtitles[_currentSubtitle + 1]->getStartFrame() <= frame);
+			nextStarted = (_subtitles[_currentSubtitle + 1].getStartFrame() <= frame);
 		}
 
 		while (_currentSubtitle < _subtitles.size() &&
@@ -238,22 +231,22 @@ void VideoSubtitler::update(uint32 frame) {
 
 			_currentSubtitle++;
 
-			overdue = (frame > _subtitles[_currentSubtitle]->getEndFrame());
+			overdue = (frame > _subtitles[_currentSubtitle].getEndFrame());
 			hasNext = (_currentSubtitle + 1 < _subtitles.size());
 			if (hasNext) {
-				nextStarted = (_subtitles[_currentSubtitle + 1]->getStartFrame() <= frame);
+				nextStarted = (_subtitles[_currentSubtitle + 1].getStartFrame() <= frame);
 			} else {
 				nextStarted = false;
 			}
 		}
 
-		bool currentValid = (_subtitles[_currentSubtitle]->getEndFrame() != 0);
+		bool currentValid = (_subtitles[_currentSubtitle].getEndFrame() != 0);
 		/*
 		 * No idea why we do this check, carried over from Mnemonic's code.
 		 * Possibly a workaround for buggy subtitles or some kind of sentinel? :-\
 		 */
 
-		bool currentStarted = frame >= _subtitles[_currentSubtitle]->getStartFrame();
+		bool currentStarted = frame >= _subtitles[_currentSubtitle].getStartFrame();
 
 		if (currentStarted && !overdue && currentValid) {
 			_showSubtitle = true;
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index f2dcdf161e..c1730c84fd 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -46,7 +46,7 @@ public:
 	void display();
 	void update(uint32 frame);
 private:
-	Common::Array<SubtitleCard *> _subtitles;
+	Common::Array<SubtitleCard> _subtitles;
 	int32 _lastSample;
 };
 
-- 
cgit v1.2.3


From 3cef639f911264547b08428110e33a3d5a595fee Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Tue, 9 Sep 2014 17:33:21 +0200
Subject: WINTERMUTE: new char[str.size()+1] in BaseStringTable::expand

This makes room for the EOS char.
---
 engines/wintermute/base/base_string_table.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index bcdd7cb861..4c750ebc93 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -149,7 +149,7 @@ void BaseStringTable::expand(char **str) const {
 
 //////////////////////////////////////////////////////////////////////////
 void BaseStringTable::expand(Common::String &str) const {
-	char *tmp = new char[str.size()];
+	char *tmp = new char[str.size()+1];
 	strcpy(tmp, str.c_str());
 	expand(&tmp);
 	str = tmp;
-- 
cgit v1.2.3


From e9b722278e5c893bd488bdb7d430598ba711d5ee Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 21:22:28 +0200
Subject: WINTERMUTE: Declare and init size in one place in VideoSubtitler

---
 engines/wintermute/video/video_subtitler.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 2123991c03..ed4677fffd 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -74,16 +74,15 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		newFile = PathUtil::combine(path, name + ext);
 	}
 
-	int size;
-
 	Common::SeekableReadStream *file = BaseFileManager::getEngineInstance()->openFile(newFile, true, false);
 
 	if (file == nullptr) {
 		return false; // no subtitles
 	}
 
-	size = file->size();
+	int size = file->size();
 	char *buffer = new char[size];
+
 	file->read(buffer, size);
 
 	int start, end;
-- 
cgit v1.2.3


From a4b9bc58775d6a0f2e6fbce8ac2eff872892830e Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 21:32:34 +0200
Subject: WINTERMUTE: Rename a bunch of variabiles in loadSubtitles

---
 engines/wintermute/video/video_subtitler.cpp | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index ed4677fffd..f540fddb5f 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -80,10 +80,10 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		return false; // no subtitles
 	}
 
-	int size = file->size();
-	char *buffer = new char[size];
+	int fileSize = file->size();
+	char *buffer = new char[fileSize];
 
-	file->read(buffer, size);
+	file->read(buffer, fileSize);
 
 	int start, end;
 	bool inToken;
@@ -93,42 +93,42 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 	int pos = 0;
 	int lineLength = 0;
-
-	while (pos < size) {
+	while (pos < fileSize) {
 		start = end = -1;
 		inToken = false;
 		tokenPos = -1;
 
 		lineLength = 0;
 
-		while (pos + lineLength < size &&
-		        buffer[pos + lineLength] != '\n' &&
-		        buffer[pos + lineLength] != '\0') {
+		while (pos + lineLength < fileSize &&
+				buffer[pos + lineLength] != '\n' &&
+				buffer[pos + lineLength] != '\0') {
+			// Measure the line until we hit EOL, EOS or just hit the boundary
 			lineLength++;
 		}
 
 		int realLength;
 
-		if (pos + lineLength >= size) {
+		if (pos + lineLength >= fileSize) {
 			realLength = lineLength - 0;
 		} else {
 			realLength = lineLength - 1;
 		}
 
-		Common::String text;
-		char *line = (char *)&buffer[pos];
+		Common::String cardText;
+		char *fileLine = (char *)&buffer[pos];
 
 		for (int i = 0; i < realLength; i++) {
-			if (line[i] == '{') {
+			if (fileLine[i] == '{') {
 				if (!inToken) {
 					inToken = true;
-					tokenStart = line + i + 1;
+					tokenStart = fileLine + i + 1;
 					tokenLength = 0;
 					tokenPos++;
 				} else {
 					tokenLength++;
 				}
-			} else if (line[i] == '}') {
+			} else if (fileLine[i] == '}') {
 				if (inToken) {
 					inToken = false;
 					char *token = new char[tokenLength + 1];
@@ -141,23 +141,23 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 					}
 					delete[] token;
 				} else {
-					text += line[i];
+					cardText += fileLine[i];
 				}
 			} else {
 				if (inToken) {
 					tokenLength++;
 				} else {
-					if (line[i] == '|') {
-						text += '\n';
+					if (fileLine[i] == '|') {
+						cardText += '\n';
 					} else {
-						text += line[i];
+						cardText += fileLine[i];
 					}
 				}
 			}
 		}
 
-		if (start != -1 && text.size() > 0 && (start != 1 || end != 1)) {
-			_subtitles.push_back(SubtitleCard(_gameRef, text, start, end));
+		if (start != -1 && cardText.size() > 0 && (start != 1 || end != 1)){
+			_subtitles.push_back(SubtitleCard(_gameRef, cardText, start, end));
 		}
 
 		pos += lineLength + 1;
-- 
cgit v1.2.3


From e12f30ed030fc719b56e2be8418707f258af05d5 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 15 Oct 2014 21:32:48 +0200
Subject: WINTERMUTE: Add a bunch of comments in loadSubtitles

---
 engines/wintermute/video/video_subtitler.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index f540fddb5f..52bae27d2d 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -93,6 +93,10 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 	int pos = 0;
 	int lineLength = 0;
+	/* This is where we parse .sub files.
+	 * Subtitles cards are in the form
+	 * {StartFrame}{EndFrame} FirstLine | SecondLine \n
+	 */
 	while (pos < fileSize) {
 		start = end = -1;
 		inToken = false;
@@ -112,6 +116,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		if (pos + lineLength >= fileSize) {
 			realLength = lineLength - 0;
 		} else {
+			// If we got here the above loop exited after hitting "\0" "\n"
 			realLength = lineLength - 1;
 		}
 
@@ -121,26 +126,32 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		for (int i = 0; i < realLength; i++) {
 			if (fileLine[i] == '{') {
 				if (!inToken) {
+					// We've hit the start of a Start/EndFrame token
 					inToken = true;
 					tokenStart = fileLine + i + 1;
 					tokenLength = 0;
 					tokenPos++;
 				} else {
+					// Actually, we were already inside an (invalid) one.
 					tokenLength++;
 				}
 			} else if (fileLine[i] == '}') {
 				if (inToken) {
+					// we were /inside/ a {.*} token, so this is the end of the block
 					inToken = false;
 					char *token = new char[tokenLength + 1];
 					strncpy(token, tokenStart, tokenLength);
 					token[tokenLength] = '\0';
 					if (tokenPos == 0) {
+						// Was this StartFrame...
 						start = atoi(token);
 					} else if (tokenPos == 1) {
+						// Or the EndFrame?
 						end = atoi(token);
 					}
 					delete[] token;
 				} else {
+					// This char is part of the plain text, just append it
 					cardText += fileLine[i];
 				}
 			} else {
@@ -148,8 +159,10 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 					tokenLength++;
 				} else {
 					if (fileLine[i] == '|') {
+						// The pipe character signals a linebreak in the text
 						cardText += '\n';
 					} else {
+						// This char is part of the plain text, just append it
 						cardText += fileLine[i];
 					}
 				}
@@ -157,6 +170,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 		}
 
 		if (start != -1 && cardText.size() > 0 && (start != 1 || end != 1)){
+			// Add a subtitlecard based on the line we have just parsed
 			_subtitles.push_back(SubtitleCard(_gameRef, cardText, start, end));
 		}
 
-- 
cgit v1.2.3


From 8ee1a85f3589bc5da2ad6d0b75a550f8df5d62dd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 15 Oct 2014 21:18:17 -0400
Subject: MADS: Save redundant reloads of digital audio when switching
 animations

---
 engines/mads/audio.cpp | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/engines/mads/audio.cpp b/engines/mads/audio.cpp
index 1c61e13957..9d62c3f615 100644
--- a/engines/mads/audio.cpp
+++ b/engines/mads/audio.cpp
@@ -37,6 +37,7 @@ AudioPlayer::AudioPlayer(Audio::Mixer *mixer, uint32 gameID) : _mixer(mixer), _g
 
 AudioPlayer::~AudioPlayer() {
 	_dsrEntries.clear();
+	_filename = "";
 }
 
 bool AudioPlayer::isPlaying() const {
@@ -65,25 +66,27 @@ void AudioPlayer::setDefaultSoundGroup() {
 }
 
 void AudioPlayer::setSoundGroup(const Common::String &filename) {
-	_dsrEntries.clear();
-
-	_filename = filename;
-	_dsrFile.open(filename);
-
-	// Read header
-	uint16 entryCount = _dsrFile.readUint16LE();
-
-	for (uint16 i = 0; i < entryCount; i++) {
-		DSREntry newEntry;
-		newEntry.frequency = _dsrFile.readUint16LE();
-		newEntry.channels = _dsrFile.readUint32LE();
-		newEntry.compSize = _dsrFile.readUint32LE();
-		newEntry.uncompSize = _dsrFile.readUint32LE();
-		newEntry.offset = _dsrFile.readUint32LE();
-		_dsrEntries.push_back(newEntry);
+	if (_filename != filename) {
+		_dsrEntries.clear();
+
+		_filename = filename;
+		_dsrFile.open(filename);
+
+		// Read header
+		uint16 entryCount = _dsrFile.readUint16LE();
+
+		for (uint16 i = 0; i < entryCount; i++) {
+			DSREntry newEntry;
+			newEntry.frequency = _dsrFile.readUint16LE();
+			newEntry.channels = _dsrFile.readUint32LE();
+			newEntry.compSize = _dsrFile.readUint32LE();
+			newEntry.uncompSize = _dsrFile.readUint32LE();
+			newEntry.offset = _dsrFile.readUint32LE();
+			_dsrEntries.push_back(newEntry);
+		}
+
+		_dsrFile.close();
 	}
-
-	_dsrFile.close();
 }
 
 void AudioPlayer::playSound(int soundIndex, bool loop) {
-- 
cgit v1.2.3


From c878731937a39f56cc63ef56d2190d2e02caa2d7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 16 Oct 2014 07:55:54 +0200
Subject: TSAGE: Move Air Duct and Vampire lair mazes in separate source files

---
 engines/tsage/module.mk                         |     4 +-
 engines/tsage/ringworld2/ringworld2_airduct.cpp |   914 ++
 engines/tsage/ringworld2/ringworld2_airduct.h   |    90 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |     2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 13520 +++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   184 -
 engines/tsage/ringworld2/ringworld2_vampire.cpp |  1821 +++
 engines/tsage/ringworld2/ringworld2_vampire.h   |   180 +
 8 files changed, 8435 insertions(+), 8280 deletions(-)
 create mode 100644 engines/tsage/ringworld2/ringworld2_airduct.cpp
 create mode 100644 engines/tsage/ringworld2/ringworld2_airduct.h
 create mode 100644 engines/tsage/ringworld2/ringworld2_vampire.cpp
 create mode 100644 engines/tsage/ringworld2/ringworld2_vampire.h

diff --git a/engines/tsage/module.mk b/engines/tsage/module.mk
index 3fc30f9f8f..d62f398c20 100644
--- a/engines/tsage/module.mk
+++ b/engines/tsage/module.mk
@@ -35,14 +35,16 @@ MODULE_OBJS := \
 	ringworld/ringworld_scenes8.o \
 	ringworld/ringworld_scenes10.o \
 	ringworld/ringworld_speakers.o \
+	ringworld2/ringworld2_airduct.o \
 	ringworld2/ringworld2_dialogs.o \
 	ringworld2/ringworld2_logic.o \
+	ringworld2/ringworld2_outpost.o \
 	ringworld2/ringworld2_scenes0.o \
 	ringworld2/ringworld2_scenes1.o \
 	ringworld2/ringworld2_scenes2.o \
 	ringworld2/ringworld2_scenes3.o \
-	ringworld2/ringworld2_outpost.o \
 	ringworld2/ringworld2_speakers.o \
+	ringworld2/ringworld2_vampire.o \
 	saveload.o \
 	scenes.o \
 	sound.o \
diff --git a/engines/tsage/ringworld2/ringworld2_airduct.cpp b/engines/tsage/ringworld2/ringworld2_airduct.cpp
new file mode 100644
index 0000000000..dc43dba1ae
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_airduct.cpp
@@ -0,0 +1,914 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "graphics/cursorman.h"
+
+#include "tsage/scenes.h"
+#include "tsage/tsage.h"
+#include "tsage/staticres.h"
+#include "tsage/ringworld2/ringworld2_airduct.h"
+
+namespace TsAGE {
+
+namespace Ringworld2 {
+
+/*--------------------------------------------------------------------------
+ * Scene 1200 - Air Ducts Maze
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene1200::Scene1200() {
+	_nextCrawlDirection = 0;
+	_field414 = 0;
+	_field416 = 0;
+	_field418 = 0;
+	_field41A = 0;
+	_fixupMaze = false;
+}
+
+void Scene1200::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_nextCrawlDirection);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+	s.syncAsSint16LE(_field418);
+	s.syncAsSint16LE(_field41A);
+	s.syncAsSint16LE(_fixupMaze);
+}
+
+Scene1200::LaserPanel::LaserPanel() {
+}
+
+void Scene1200::LaserPanel::Jumper::init(int state) {
+	_state = state;
+
+	SceneActor::postInit();
+	setup(1003, 1, 1);
+	fixPriority(255);
+
+	switch (_state) {
+	case 1:
+		switch (R2_GLOBALS._ductMazePanel1State) {
+		case 1:
+			setFrame2(2);
+			setPosition(Common::Point(129, 101));
+			break;
+		case 2:
+			setFrame2(3);
+			setPosition(Common::Point(135, 95));
+			break;
+		default:
+			break;
+		}
+		break;
+	case 2:
+		switch (R2_GLOBALS._ductMazePanel2State) {
+		case 1:
+			setFrame2(2);
+			setPosition(Common::Point(152, 101));
+			break;
+		case 2:
+			setFrame2(3);
+			setPosition(Common::Point(158, 122));
+			break;
+		case 3:
+			setFrame2(3);
+			setPosition(Common::Point(135, 122));
+			break;
+		default:
+			break;
+		}
+		break;
+	case 3:
+		switch (R2_GLOBALS._ductMazePanel3State) {
+		case 1:
+			setFrame2(3);
+			setPosition(Common::Point(158, 95));
+			break;
+		case 2:
+			setFrame2(2);
+			setPosition(Common::Point(175, 101));
+			break;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+
+	setDetails(1200, 12, -1, -1, 2, (SceneItem *) NULL);
+}
+
+bool Scene1200::LaserPanel::Jumper::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._sound2.play(260);
+	switch (_state) {
+	case 1:
+		if (R2_GLOBALS._ductMazePanel1State == 1) {
+			R2_GLOBALS._ductMazePanel1State = 2;
+			setFrame2(3);
+			setPosition(Common::Point(135, 95));
+		} else {
+			R2_GLOBALS._ductMazePanel1State = 1;
+			setFrame2(2);
+			setPosition(Common::Point(129, 101));
+		}
+		break;
+	case 2:
+		++R2_GLOBALS._ductMazePanel2State;
+		if (R2_GLOBALS._ductMazePanel2State == 4)
+			R2_GLOBALS._ductMazePanel2State = 1;
+
+		switch (R2_GLOBALS._ductMazePanel2State) {
+		case 1:
+			setFrame2(2);
+			setPosition(Common::Point(152, 101));
+			break;
+		case 2:
+			setFrame2(3);
+			setPosition(Common::Point(158, 122));
+			break;
+		case 3:
+			setFrame2(3);
+			setPosition(Common::Point(135, 122));
+			break;
+		default:
+			break;
+		}
+		break;
+	case 3:
+		if (R2_GLOBALS._ductMazePanel3State == 1) {
+			R2_GLOBALS._ductMazePanel3State = 2;
+			setFrame2(2);
+			setPosition(Common::Point(175, 101));
+		} else {
+			R2_GLOBALS._ductMazePanel3State = 1;
+			setFrame2(3);
+			setPosition(Common::Point(158, 95));
+		}
+		break;
+	default:
+		break;
+	}
+
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+	scene->_field418 = 0;
+
+	if ((R2_GLOBALS._ductMazePanel1State == 1) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
+		scene->_field418 = 1;
+	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
+		scene->_field418 = 2;
+	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 2))
+		scene->_field418 = 3;
+	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 3) && (R2_GLOBALS._ductMazePanel3State == 1))
+		scene->_field418 = 4;
+
+	return true;
+}
+
+void Scene1200::LaserPanel::postInit(SceneObjectList *OwnerList) {
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_field41A = 1;
+	R2_GLOBALS._events.setCursor(CURSOR_USE);
+	setup2(1003, 1, 1, 100, 40);
+	setup3(1200, 11, -1, -1);
+	R2_GLOBALS._sound2.play(259);
+	_jumper1.init(1);
+	_jumper2.init(2);
+	_jumper3.init(3);
+
+	R2_GLOBALS._player._canWalk = false;
+}
+
+void Scene1200::LaserPanel::remove() {
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_field41A = 0;
+	scene->_sceneAreas.remove(&_jumper1);
+	scene->_sceneAreas.remove(&_jumper2);
+	scene->_sceneAreas.remove(&_jumper3);
+	_jumper1.remove();
+	_jumper2.remove();
+	_jumper3.remove();
+
+	ModalWindow::remove();
+	R2_GLOBALS._player._canWalk = true;
+}
+
+void Scene1200::postInit(SceneObjectList *OwnerList) {
+	loadScene(1200);
+	SceneExt::postInit();
+
+	if (R2_GLOBALS._sceneManager._previousScene < 3200)
+		R2_GLOBALS._sound1.play(257);
+
+	_nextCrawlDirection = CRAWL_EAST;
+	_field414 = 0;
+	_field416 = 0;
+	_field418 = 0;
+	_field41A = 0;
+
+	if ((R2_GLOBALS._ductMazePanel1State == 1) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
+		_field418 = 1;
+	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
+		_field418 = 2;
+	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 2))
+		_field418 = 3;
+	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 3) && (R2_GLOBALS._ductMazePanel3State == 1))
+		_field418 = 4;
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.setup(3156, 1, 6);
+	R2_GLOBALS._player.setPosition(Common::Point(160, 70));
+	R2_GLOBALS._player._numFrames = 10;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 1200;
+
+	_actor1.postInit();
+	_actor1.hide();
+
+	_mazeUI.setDisplayBounds(Rect(110, 20, 210, 120));
+
+	_mazeUI.postInit();
+	_mazeUI.load(1);
+	_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
+
+	R2_GLOBALS._player.enableControl();
+	_item1.setDetails(Rect(0, 0, 320, 200), 1200, 0, 1, 2, 1, NULL);
+}
+
+void Scene1200::signal() {
+	switch (_sceneMode++) {
+	case 1:
+	// No break on purpose
+	case 1200:
+	// No break on purpose
+	case 1201:
+	// No break on purpose
+	case 1202:
+	// No break on purpose
+	case 1203:
+		R2_GLOBALS._player.enableControl();
+		// CHECKME: The original is calling _eventManager.waitEvent();
+		_sceneMode = 2;
+		break;
+	case 10:
+		_field416 = 1;
+		_field414 = 6;
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.setStrip(1);
+		R2_GLOBALS._player.setFrame(5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 11:
+	// No break on purpose
+	case 21:
+	// No break on purpose
+	case 31:
+	// No break on purpose
+	case 41:
+		_field416 = 0;
+		break;
+	case 12:
+		_field414 = 14;
+		R2_GLOBALS._player._numFrames = 10;
+		R2_GLOBALS._player.setup(3155, 1, 4);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
+		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
+		break;
+	case 13:
+	// No break on purpose
+	case 16:
+	// No break on purpose
+	case 23:
+	// No break on purpose
+	case 26:
+	// No break on purpose
+	case 33:
+	// No break on purpose
+	case 36:
+	// No break on purpose
+	case 43:
+	// No break on purpose
+	case 46:
+		R2_GLOBALS._player.setFrame(4);
+		_sceneMode = 1;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 15:
+	// No break on purpose
+	case 25:
+	// No break on purpose
+	case 35:
+	// No break on purpose
+	case 45:
+		_field414 = 20;
+		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
+		break;
+	case 20:
+		_field416 = 1;
+		_field414 = 6;
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.setStrip(2);
+		R2_GLOBALS._player.setFrame(5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 22:
+		_field414 = 14;
+		R2_GLOBALS._player._numFrames = 10;
+		R2_GLOBALS._player.setup(3155, 2, 4);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
+		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
+		break;
+	case 30:
+		_field416 = 1;
+		_field414 = 6;
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setFrame(5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 32:
+		_field414 = 14;
+		R2_GLOBALS._player._numFrames = 10;
+		R2_GLOBALS._player.setup(3155, 3, 4);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
+		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
+		break;
+	case 40:
+		_field416 = 1;
+		_field414 = 6;
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.setStrip(4);
+		R2_GLOBALS._player.setFrame(5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 42:
+		_field414 = 14;
+		R2_GLOBALS._player._numFrames = 10;
+		R2_GLOBALS._player.setup(3155, 4, 4);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
+		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
+		break;
+	case 50:
+	// No break on purpose
+	case 55:
+	// No break on purpose
+	case 60:
+		R2_GLOBALS._player.setup(3156, 5, 1);
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 51:
+	// No break on purpose
+	case 56:
+	// No break on purpose
+	case 117:
+		R2_GLOBALS._player.setup(3157, 1, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 52:
+	// No break on purpose
+	case 82:
+	// No break on purpose
+	case 118:
+		R2_GLOBALS._player.setup(3156, 3, 6);
+		_sceneMode = 1;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 57:
+	// No break on purpose
+	case 91:
+	// No break on purpose
+	case 96:
+		R2_GLOBALS._player.setup(3157, 2, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 58:
+	// No break on purpose
+	case 92:
+	// No break on purpose
+	case 122:
+		R2_GLOBALS._player.setup(3156, 2, 6);
+		_sceneMode = 1;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 61:
+		R2_GLOBALS._player.setup(3157, 4, 5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 62:
+	// No break on purpose
+	case 72:
+	// No break on purpose
+	case 98:
+		R2_GLOBALS._player.setup(3156, 4, 6);
+		_sceneMode = 1;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 70:
+	// No break on purpose
+	case 75:
+	// No break on purpose
+	case 80:
+		R2_GLOBALS._player.setup(3156, 6, 1);
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 71:
+	// No break on purpose
+	case 76:
+	// No break on purpose
+	case 97:
+		R2_GLOBALS._player.setup(3157, 3, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 77:
+	// No break on purpose
+	case 111:
+	// No break on purpose
+	case 116:
+		R2_GLOBALS._player.setup(3157, 4, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 78:
+	// No break on purpose
+	case 102:
+	// No break on purpose
+	case 112:
+		R2_GLOBALS._player.setup(3156, 1, 6);
+		_sceneMode = 1;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 81:
+		R2_GLOBALS._player.setup(3157, 2, 5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 90:
+	// No break on purpose
+	case 95:
+	// No break on purpose
+	case 100:
+		R2_GLOBALS._player.setup(3156, 7, 1);
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 101:
+		R2_GLOBALS._player.setup(3157, 1, 5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 110:
+	// No break on purpose
+	case 115:
+	// No break on purpose
+	case 120:
+		R2_GLOBALS._player.setup(3156, 8, 1);
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 121:
+		R2_GLOBALS._player.setup(3157, 3, 5);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	default:
+		// CHECKME: The original is walling _eventManager.waitEvent();
+		_sceneMode = 2;
+		break;
+	}
+}
+
+void Scene1200::process(Event &event) {
+	if (_field414 != 0)
+		return;
+
+	Scene::process(event);
+
+	if (!R2_GLOBALS._player._canWalk)
+		return;
+
+	if (event.eventType == EVENT_BUTTON_DOWN) {
+		Common::Point cellPos = R2_GLOBALS._ventCellPos;
+		_mazeUI.pixelToCellXY(cellPos);
+
+		int cellId = _mazeUI.getCellFromPixelXY(event.mousePos);
+		switch (R2_GLOBALS._events.getCursor()) {
+		case CURSOR_WALK:
+			event.handled = true;
+			if ((event.mousePos.x > 179) && (event.mousePos.x < 210) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
+				startCrawling(CRAWL_EAST);
+
+			if ((event.mousePos.x > 109) && (event.mousePos.x < 140) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
+				startCrawling(CRAWL_WEST);
+
+			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 89) && (event.mousePos.y < 120))
+				startCrawling(CRAWL_SOUTH);
+
+			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 19) && (event.mousePos.y < 50))
+				startCrawling(CRAWL_NORTH);
+			break;
+		case CURSOR_USE:
+			if (cellId > 36) {
+				if ( ((cellPos.x == 3)  && (cellPos.y == 33))
+					|| ((cellPos.x == 7)  && (cellPos.y == 33))
+					|| ((cellPos.x == 33) && (cellPos.y == 41))
+					|| ((cellPos.x == 5)  && (cellPos.y == 5))
+					|| ((cellPos.x == 13) && (cellPos.y == 21))
+					|| ((cellPos.x == 17) && (cellPos.y == 21))
+					|| ((cellPos.x == 17) && (cellPos.y == 5))
+					|| ((cellPos.x == 17) && (cellPos.y == 9))
+					|| ((cellPos.x == 29) && (cellPos.y == 17))
+					|| ((cellPos.x == 33) && (cellPos.y == 17))
+					|| ((cellPos.x == 35) && (cellPos.y == 17))
+					|| ((cellPos.x == 41) && (cellPos.y == 21)) ) {
+					_laserPanel.postInit();
+					event.handled = true;
+				}
+			}
+
+			if ((cellId == 1) || (cellId == 4) || (cellId == 11) || (cellId == 14)) {
+				if ( ((cellPos.x == 3)  && (cellPos.y == 9))
+				  || ((cellPos.x == 11)  && (cellPos.y == 27))
+				  || ((cellPos.x == 17)  && (cellPos.y == 7))
+				  || ((cellPos.x == 17)  && (cellPos.y == 27))
+				  || ((cellPos.x == 17)  && (cellPos.y == 33))
+				  || (cellPos.x == 33) ) {
+					switch (cellPos.x) {
+					case 3:
+						R2_GLOBALS._sceneManager.changeScene(3150);
+						break;
+					case 33:
+						if (R2_GLOBALS._scientistConvIndex >= 4)
+							R2_GLOBALS._sceneManager.changeScene(3250);
+						else
+							SceneItem::display(1200, 6, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, LIST_END);
+						break;
+					default:
+						SceneItem::display(1200, 5, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, LIST_END);
+						break;
+					}
+					event.handled = true;
+				}
+			}
+			break;
+		case CURSOR_LOOK:
+			if ((cellId == 1) || (cellId == 4) || (cellId == 11) || (cellId == 14)) {
+				event.handled = true;
+				switch (cellPos.x) {
+				case 3:
+					// It was your cell.
+					SceneItem::display(1200, 8, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+					break;
+				case 9:
+						R2_GLOBALS._sceneManager.changeScene(3240);
+						break;
+				case 11:
+					if (cellPos.y == 27)
+						R2_GLOBALS._sceneManager.changeScene(3210);
+					else
+						// A vent grill
+						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+					break;
+				case 17:
+					switch (cellPos.y) {
+					case 5:
+						R2_GLOBALS._sceneManager.changeScene(3230);
+						break;
+					case 21:
+						R2_GLOBALS._sceneManager.changeScene(3220);
+						break;
+					case 33:
+						R2_GLOBALS._sceneManager.changeScene(3200);
+						break;
+					default:
+						// A vent grill
+						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+						break;
+					}
+					break;
+				case 33:
+					R2_GLOBALS._sceneManager.changeScene(3245);
+					break;
+				default:
+					SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+					break;
+				}
+			}
+			if (cellId > 36) {
+				// "An anti-pest laser"
+				event.handled = true;
+				SceneItem::display(1200, 9, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+			}
+			break;
+		case CURSOR_TALK:
+			event.handled = true;
+			break;
+		default:
+			return;
+		}
+	} else if (event.eventType == EVENT_KEYPRESS) {
+		if (_field414) {
+			event.handled = false;
+			return;
+		}
+
+		switch (event.kbd.keycode) {
+		case Common::KEYCODE_KP8:
+		case Common::KEYCODE_UP:
+			startCrawling(CRAWL_NORTH);
+			break;
+		case Common::KEYCODE_KP4:
+		case Common::KEYCODE_LEFT:
+			startCrawling(CRAWL_WEST);
+			break;
+		case Common::KEYCODE_KP6:
+		case Common::KEYCODE_RIGHT:
+			startCrawling(CRAWL_EAST);
+			break;
+		case Common::KEYCODE_KP2:
+		case Common::KEYCODE_DOWN:
+			startCrawling(CRAWL_SOUTH);
+			break;
+		default:
+			event.handled = false;
+			return;
+			break;
+		}
+	} else
+		return;
+}
+
+void Scene1200::dispatch() {
+	Rect tmpRect;
+	Scene::dispatch();
+
+	if (_fixupMaze) {
+		_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
+		//_mazeUI.draw();
+		_fixupMaze = false;
+	}
+
+	if (_field414 != 0) {
+		tmpRect.set(110, 20, 210, 120);
+		_field414--;
+
+		switch (_nextCrawlDirection) {
+		case CRAWL_EAST:
+			R2_GLOBALS._ventCellPos.x += 2;
+			break;
+		case CRAWL_WEST:
+			R2_GLOBALS._ventCellPos.x -= 2;
+			break;
+		case CRAWL_SOUTH:
+			R2_GLOBALS._ventCellPos.y += 2;
+			break;
+		case CRAWL_NORTH:
+			R2_GLOBALS._ventCellPos.y -= 2;
+			break;
+		default:
+			break;
+		}
+
+		_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
+		//_mazeUI.draw();
+
+		if (_field416 != 0) {
+			switch(_nextCrawlDirection) {
+			case CRAWL_EAST:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x - 2, R2_GLOBALS._player._position.y));
+				break;
+			case CRAWL_WEST:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x + 2, R2_GLOBALS._player._position.y));
+				break;
+			case CRAWL_SOUTH:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 2));
+				break;
+			case CRAWL_NORTH:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 2));
+				break;
+			default:
+				break;
+			}
+		}
+		if (_field414 == 0) {
+			if (_field416 == 0)
+				R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
+			signal();
+		}
+	}
+}
+
+void Scene1200::saveCharacter(int characterIndex) {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::saveCharacter(characterIndex);
+}
+
+void Scene1200::startCrawling(CrawlDirection dir) {
+	Common::Point cellPos = R2_GLOBALS._ventCellPos;
+	_mazeUI.pixelToCellXY(cellPos);
+
+	switch (dir) {
+	case CRAWL_EAST:
+		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(200, 50)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(200, 88)) > 36))
+			&& ( ((cellPos.x == 3) && (cellPos.y == 33) && (_field418 != 4))
+				|| ((cellPos.x == 13) && (cellPos.y == 21) && (_field418 != 2))
+				|| ((cellPos.x == 29) && (cellPos.y == 17) && (_field418 != 1))
+				|| ((cellPos.x == 33) && (cellPos.y == 41)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1200;
+			setAction(&_sequenceManager, this, 1200, &_actor1, NULL);
+		} else if (_mazeUI.getCellFromPixelXY(Common::Point(200, 69)) == 36) {
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 15;
+				else
+					_sceneMode = 10;
+				break;
+			case CRAWL_WEST:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 76;
+				else
+					_sceneMode = 75;
+				break;
+			case CRAWL_SOUTH:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 101;
+				else
+					_sceneMode = 100;
+				break;
+			case CRAWL_NORTH:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 111;
+				else
+					_sceneMode = 110;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_nextCrawlDirection = 1;
+			signal();
+		}
+		break;
+	case CRAWL_WEST:
+		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(120, 50)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(120, 88)) > 36))
+			&& ( ((cellPos.x == 7) && (cellPos.y == 33) && (_field418 != 4))
+				|| ((cellPos.x == 17) && (cellPos.y == 21) && (_field418 != 2))
+				|| ((cellPos.x == 33) && (cellPos.y == 17) && (_field418 != 1))
+				|| ((cellPos.x == 5) && (cellPos.y == 5)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1201;
+			setAction(&_sequenceManager, this, 1201, &_actor1, NULL);
+		} else if (_mazeUI.getCellFromPixelXY(Common::Point(120, 69)) == 36) {
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 56;
+				else
+					_sceneMode = 55;
+				break;
+			case CRAWL_WEST:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 25;
+				else
+					_sceneMode = 20;
+				break;
+			case CRAWL_SOUTH:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 91;
+				else
+					_sceneMode = 90;
+				break;
+			case CRAWL_NORTH:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 121;
+				else
+					_sceneMode = 120;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_nextCrawlDirection = 2;
+			signal();
+		}
+		break;
+	case CRAWL_SOUTH:
+		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(140, 110)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(178, 110)) > 36))
+			&& ( ((cellPos.x == 17) && (cellPos.y == 5) && (_field418 != 3))
+				|| ((cellPos.x == 41) && (cellPos.y == 21)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1203;
+			setAction(&_sequenceManager, this, 1203, &_actor1, NULL);
+		} else if (_mazeUI.getCellFromPixelXY(Common::Point(160, 110)) == 36) {
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 51;
+				else
+					_sceneMode = 50;
+				break;
+			case CRAWL_WEST:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 81;
+				else
+					_sceneMode = 80;
+				break;
+			case CRAWL_SOUTH:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 35;
+				else
+					_sceneMode = 30;
+				break;
+			case CRAWL_NORTH:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 116;
+				else
+					_sceneMode = 115;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_nextCrawlDirection = 3;
+			signal();
+		}
+		break;
+	case CRAWL_NORTH:
+		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(140, 30)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(178, 30)) > 36))
+			&& ( ((cellPos.x == 17) && (cellPos.y == 9) && (_field418 != 3))
+				|| ((cellPos.x == 35) && (cellPos.y == 17)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1202;
+			setAction(&_sequenceManager, this, 1202, &_actor1, NULL);
+		} else if (_mazeUI.getCellFromPixelXY(Common::Point(160, 30)) == 36) {
+			switch (_nextCrawlDirection) {
+			case CRAWL_EAST:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 61;
+				else
+					_sceneMode = 60;
+				break;
+			case CRAWL_WEST:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 71;
+				else
+					_sceneMode = 70;
+				break;
+			case CRAWL_SOUTH:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 96;
+				else
+					_sceneMode = 95;
+				break;
+			case CRAWL_NORTH:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 45;
+				else
+					_sceneMode = 40;
+				break;
+			default:
+				_sceneMode = 1;
+				R2_GLOBALS._player.setup(3156, 4, 6);
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_nextCrawlDirection = 4;
+			signal();
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_airduct.h b/engines/tsage/ringworld2/ringworld2_airduct.h
new file mode 100644
index 0000000000..4a89f58c96
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_airduct.h
@@ -0,0 +1,90 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef TSAGE_RINGWORLD2_AIRDUCT_H
+#define TSAGE_RINGWORLD2_AIRDUCT_H
+
+#include "tsage/converse.h"
+#include "tsage/events.h"
+#include "tsage/core.h"
+#include "tsage/scenes.h"
+#include "tsage/globals.h"
+#include "tsage/sound.h"
+#include "tsage/ringworld2/ringworld2_logic.h"
+
+namespace TsAGE {
+
+namespace Ringworld2 {
+
+using namespace TsAGE;
+
+class Scene1200 : public SceneExt {
+	enum CrawlDirection { CRAWL_EAST = 1, CRAWL_WEST = 2, CRAWL_SOUTH = 3, CRAWL_NORTH = 4 };
+
+	class LaserPanel: public ModalWindow {
+	public:
+		class Jumper : public SceneActorExt {
+		public:
+			void init(int state);
+			virtual bool startAction(CursorType action, Event &event);
+		};
+
+		Jumper _jumper1;
+		Jumper _jumper2;
+		Jumper _jumper3;
+
+		LaserPanel();
+
+		virtual void postInit(SceneObjectList *OwnerList = NULL);
+		virtual void remove();
+	};
+
+public:
+	NamedHotspot _item1;
+	SceneActor _actor1;
+	LaserPanel _laserPanel;
+	MazeUI _mazeUI;
+	SequenceManager _sequenceManager;
+
+	int _nextCrawlDirection;
+	int _field414;
+	int _field416;
+	int _field418;
+	int _field41A;
+	bool _fixupMaze;
+
+	Scene1200();
+	void synchronize(Serializer &s);
+
+	void startCrawling(CrawlDirection dir);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+	virtual void saveCharacter(int characterIndex);
+};
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
+
+#endif
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index a04fd56917..d24541932f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -32,7 +32,9 @@
 #include "tsage/ringworld2/ringworld2_scenes1.h"
 #include "tsage/ringworld2/ringworld2_scenes2.h"
 #include "tsage/ringworld2/ringworld2_scenes3.h"
+#include "tsage/ringworld2/ringworld2_airduct.h"
 #include "tsage/ringworld2/ringworld2_outpost.h"
+#include "tsage/ringworld2/ringworld2_vampire.h"
 
 namespace TsAGE {
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 51879f1eed..81dc05e2a4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1321,1249 +1321,827 @@ void Scene1100::saveCharacter(int characterIndex) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1200 - Air Ducts Maze
+ * Scene 1500 - Cutscene: Ship landing
  *
  *--------------------------------------------------------------------------*/
 
-Scene1200::Scene1200() {
-	_nextCrawlDirection = 0;
-	_field414 = 0;
-	_field416 = 0;
-	_field418 = 0;
-	_field41A = 0;
-	_fixupMaze = false;
-}
+void Scene1500::postInit(SceneObjectList *OwnerList) {
+	loadScene(1500);
+	R2_GLOBALS._uiElements._active = false;
+	setZoomPercents(170, 13, 240, 100);
+	SceneExt::postInit();
+	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
 
-void Scene1200::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
+	scalePalette(65, 65, 65);
 
-	s.syncAsSint16LE(_nextCrawlDirection);
-	s.syncAsSint16LE(_field414);
-	s.syncAsSint16LE(_field416);
-	s.syncAsSint16LE(_field418);
-	s.syncAsSint16LE(_field41A);
-	s.syncAsSint16LE(_fixupMaze);
-}
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_starshipShadow.postInit();
+	_starshipShadow.setup(1401, 1, 1);
+	_starshipShadow._effect = EFFECT_SHADOW_MAP;
+	_starshipShadow.fixPriority(10);
+	_starshipShadow._shadowMap = _shadowPaletteMap;
+
+	_starship.postInit();
+	_starship.setup(1400, 1, 1);
+	_starship._moveDiff = Common::Point(1, 1);
+	_starship._linkedActor = &_starshipShadow;
+
+	if (R2_GLOBALS._sceneManager._previousScene != 1010) {
+		_smallShipShadow.postInit();
+		_smallShipShadow.setup(1401, 2, 1);
+		_smallShipShadow._effect = EFFECT_SHADOW_MAP;
+		_smallShipShadow.fixPriority(10);
+		_smallShipShadow._shadowMap = _shadowPaletteMap;
+
+		_smallShip.postInit();
+		_smallShip._moveRate = 30;
+		_smallShip._moveDiff = Common::Point(1, 1);
+		_smallShip._linkedActor = &_smallShipShadow;
+	}
+
+	if (R2_GLOBALS._sceneManager._previousScene == 300) {
+		_starship.setPosition(Common::Point(189, 139), 5);
+
+		_smallShip.setup(1400, 1, 2);
+		_smallShip.setPosition(Common::Point(148, 108), 0);
+
+		_sceneMode = 20;
+		R2_GLOBALS._sound1.play(110);
+	} else if (R2_GLOBALS._sceneManager._previousScene == 1550) {
+		_starship.setPosition(Common::Point(189, 139), 5);
+
+		_smallShip.setup(1400, 2, 1);
+		_smallShip.changeZoom(-1);
+		_smallShip.setPosition(Common::Point(298, 258), 5);
+
+		_sceneMode = 10;
+		R2_GLOBALS._sound1.play(106);
+	} else {
+		_starship.setPosition(Common::Point(289, 239), -30);
+		_sceneMode = 0;
+		R2_GLOBALS._sound1.play(102);
+	}
 
-Scene1200::LaserPanel::LaserPanel() {
+	signal();
 }
 
-void Scene1200::LaserPanel::Jumper::init(int state) {
-	_state = state;
+void Scene1500::remove() {
+	R2_GLOBALS._uiElements._active = true;
+	R2_GLOBALS._uiElements._visible = true;
 
-	SceneActor::postInit();
-	setup(1003, 1, 1);
-	fixPriority(255);
+	SceneExt::remove();
+}
 
-	switch (_state) {
+void Scene1500::signal() {
+	switch(_sceneMode++) {
+	case 0:
+		R2_GLOBALS.setFlag(25);
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+	// No break on purpose
 	case 1:
-		switch (R2_GLOBALS._ductMazePanel1State) {
-		case 1:
-			setFrame2(2);
-			setPosition(Common::Point(129, 101));
-			break;
-		case 2:
-			setFrame2(3);
-			setPosition(Common::Point(135, 95));
-			break;
-		default:
-			break;
+		if (_starship._yDiff < 50) {
+			_starship.setPosition(Common::Point(289, 239), _starship._yDiff + 1);
+			_sceneMode = 1;
 		}
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
 		break;
-	case 2:
-		switch (R2_GLOBALS._ductMazePanel2State) {
-		case 1:
-			setFrame2(2);
-			setPosition(Common::Point(152, 101));
-			break;
-		case 2:
-			setFrame2(3);
-			setPosition(Common::Point(158, 122));
-			break;
-		case 3:
-			setFrame2(3);
-			setPosition(Common::Point(135, 122));
-			break;
-		default:
-			break;
+	case 2: {
+		Common::Point pt(189, 139);
+		NpcMover *mover = new NpcMover();
+		_starship.addMover(mover, &pt, this);
 		}
 		break;
 	case 3:
-		switch (R2_GLOBALS._ductMazePanel3State) {
-		case 1:
-			setFrame2(3);
-			setPosition(Common::Point(158, 95));
-			break;
-		case 2:
-			setFrame2(2);
-			setPosition(Common::Point(175, 101));
-			break;
-		default:
-			break;
+		if (_starship._yDiff > 5) {
+			_starship.setPosition(Common::Point(189, 139), _starship._yDiff - 1);
+			_sceneMode = 3;
 		}
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
 		break;
-	default:
+	case 13:
+		R2_GLOBALS._player._characterIndex = R2_MIRANDA;
+	// No break on purpose
+	case 4:
+		R2_GLOBALS._sceneManager.changeScene(300);
 		break;
-	}
-
-	setDetails(1200, 12, -1, -1, 2, (SceneItem *) NULL);
-}
-
-bool Scene1200::LaserPanel::Jumper::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	R2_GLOBALS._sound2.play(260);
-	switch (_state) {
-	case 1:
-		if (R2_GLOBALS._ductMazePanel1State == 1) {
-			R2_GLOBALS._ductMazePanel1State = 2;
-			setFrame2(3);
-			setPosition(Common::Point(135, 95));
-		} else {
-			R2_GLOBALS._ductMazePanel1State = 1;
-			setFrame2(2);
-			setPosition(Common::Point(129, 101));
+	case 10:
+	// No break on purpose
+	case 20:
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 11: {
+		Common::Point pt(148, 108);
+		NpcMover *mover = new NpcMover();
+		_smallShip.addMover(mover, &pt, this);
 		}
 		break;
-	case 2:
-		++R2_GLOBALS._ductMazePanel2State;
-		if (R2_GLOBALS._ductMazePanel2State == 4)
-			R2_GLOBALS._ductMazePanel2State = 1;
-
-		switch (R2_GLOBALS._ductMazePanel2State) {
-		case 1:
-			setFrame2(2);
-			setPosition(Common::Point(152, 101));
-			break;
-		case 2:
-			setFrame2(3);
-			setPosition(Common::Point(158, 122));
-			break;
-		case 3:
-			setFrame2(3);
-			setPosition(Common::Point(135, 122));
-			break;
-		default:
-			break;
+	case 12:
+		setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
+		break;
+	case 21: {
+		Common::Point pt(-2, -42);
+		NpcMover *mover = new NpcMover();
+		_smallShip.addMover(mover, &pt, NULL);
+		signal();
 		}
 		break;
-	case 3:
-		if (R2_GLOBALS._ductMazePanel3State == 1) {
-			R2_GLOBALS._ductMazePanel3State = 2;
-			setFrame2(2);
-			setPosition(Common::Point(175, 101));
-		} else {
-			R2_GLOBALS._ductMazePanel3State = 1;
-			setFrame2(3);
-			setPosition(Common::Point(158, 95));
+	case 22:
+		if (_starship._yDiff < 50) {
+			_starship.setPosition(Common::Point(189, 139), _starship._yDiff + 1);
+			_sceneMode = 22;
+		}
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 23: {
+		Common::Point pt(-13, -61);
+		NpcMover *mover = new NpcMover();
+		_starship.addMover(mover, &pt, this);
 		}
 		break;
+	case 24:
+		R2_GLOBALS._sceneManager.changeScene(1550);
+		break;
 	default:
 		break;
 	}
-
-	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
-	scene->_field418 = 0;
-
-	if ((R2_GLOBALS._ductMazePanel1State == 1) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
-		scene->_field418 = 1;
-	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
-		scene->_field418 = 2;
-	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 2))
-		scene->_field418 = 3;
-	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 3) && (R2_GLOBALS._ductMazePanel3State == 1))
-		scene->_field418 = 4;
-
-	return true;
 }
 
-void Scene1200::LaserPanel::postInit(SceneObjectList *OwnerList) {
-	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
-
-	scene->_field41A = 1;
-	R2_GLOBALS._events.setCursor(CURSOR_USE);
-	setup2(1003, 1, 1, 100, 40);
-	setup3(1200, 11, -1, -1);
-	R2_GLOBALS._sound2.play(259);
-	_jumper1.init(1);
-	_jumper2.init(2);
-	_jumper3.init(3);
+void Scene1500::dispatch() {
+	if (_sceneMode > 10) {
+		float yDiff = sqrt((float) (_smallShip._position.x * _smallShip._position.x) + (_smallShip._position.y * _smallShip._position.y));
+		if (yDiff > 6)
+			_smallShip.setPosition(_smallShip._position, (int) yDiff);
+	}
 
-	R2_GLOBALS._player._canWalk = false;
+	Scene::dispatch();
 }
 
-void Scene1200::LaserPanel::remove() {
-	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
-
-	scene->_field41A = 0;
-	scene->_sceneAreas.remove(&_jumper1);
-	scene->_sceneAreas.remove(&_jumper2);
-	scene->_sceneAreas.remove(&_jumper3);
-	_jumper1.remove();
-	_jumper2.remove();
-	_jumper3.remove();
-
-	ModalWindow::remove();
-	R2_GLOBALS._player._canWalk = true;
-}
+/*--------------------------------------------------------------------------
+ * Scene 1525 - Cutscene - Ship
+ *
+ *--------------------------------------------------------------------------*/
 
-void Scene1200::postInit(SceneObjectList *OwnerList) {
-	loadScene(1200);
+void Scene1525::postInit(SceneObjectList *OwnerList) {
+	loadScene(1525);
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
-	if (R2_GLOBALS._sceneManager._previousScene < 3200)
-		R2_GLOBALS._sound1.play(257);
-
-	_nextCrawlDirection = CRAWL_EAST;
-	_field414 = 0;
-	_field416 = 0;
-	_field418 = 0;
-	_field41A = 0;
-
-	if ((R2_GLOBALS._ductMazePanel1State == 1) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
-		_field418 = 1;
-	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 1))
-		_field418 = 2;
-	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 1) && (R2_GLOBALS._ductMazePanel3State == 2))
-		_field418 = 3;
-	else if ((R2_GLOBALS._ductMazePanel1State == 2) && (R2_GLOBALS._ductMazePanel2State == 3) && (R2_GLOBALS._ductMazePanel3State == 1))
-		_field418 = 4;
-
 	R2_GLOBALS._player.postInit();
+	if (R2_GLOBALS._sceneManager._previousScene == 525)
+		R2_GLOBALS._player.setup(1525, 1, 1);
+	else
+		R2_GLOBALS._player.setup(1525, 1, 16);
+	R2_GLOBALS._player.setPosition(Common::Point(244, 148));
 	R2_GLOBALS._player.disableControl();
-	R2_GLOBALS._player.setup(3156, 1, 6);
-	R2_GLOBALS._player.setPosition(Common::Point(160, 70));
-	R2_GLOBALS._player._numFrames = 10;
-	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 1200;
-
-	_actor1.postInit();
-	_actor1.hide();
-
-	_mazeUI.setDisplayBounds(Rect(110, 20, 210, 120));
 
-	_mazeUI.postInit();
-	_mazeUI.load(1);
-	_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
-
-	R2_GLOBALS._player.enableControl();
-	_item1.setDetails(Rect(0, 0, 320, 200), 1200, 0, 1, 2, 1, NULL);
+	_sceneMode = 0;
+	setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
 }
 
-void Scene1200::signal() {
+void Scene1525::signal() {
 	switch (_sceneMode++) {
-	case 1:
-	// No break on purpose
-	case 1200:
-	// No break on purpose
-	case 1201:
-	// No break on purpose
-	case 1202:
-	// No break on purpose
-	case 1203:
-		R2_GLOBALS._player.enableControl();
-		// CHECKME: The original is calling _eventManager.waitEvent();
-		_sceneMode = 2;
-		break;
-	case 10:
-		_field416 = 1;
-		_field414 = 6;
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.setStrip(1);
-		R2_GLOBALS._player.setFrame(5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+	case 0:
+		if (R2_GLOBALS._sceneManager._previousScene == 525)
+			setAction(&_sequenceManager, this, 1525, &R2_GLOBALS._player, NULL);
+		else
+			setAction(&_sequenceManager, this, 1526, &R2_GLOBALS._player, NULL);
 		break;
-	case 11:
-	// No break on purpose
-	case 21:
-	// No break on purpose
-	case 31:
-	// No break on purpose
-	case 41:
-		_field416 = 0;
+	case 1:
+		setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
 		break;
-	case 12:
-		_field414 = 14;
-		R2_GLOBALS._player._numFrames = 10;
-		R2_GLOBALS._player.setup(3155, 1, 4);
-		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
-		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
-		break;
-	case 13:
-	// No break on purpose
-	case 16:
-	// No break on purpose
-	case 23:
-	// No break on purpose
-	case 26:
-	// No break on purpose
-	case 33:
-	// No break on purpose
-	case 36:
-	// No break on purpose
-	case 43:
-	// No break on purpose
-	case 46:
-		R2_GLOBALS._player.setFrame(4);
-		_sceneMode = 1;
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 15:
-	// No break on purpose
-	case 25:
-	// No break on purpose
-	case 35:
-	// No break on purpose
-	case 45:
-		_field414 = 20;
-		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
-		break;
-	case 20:
-		_field416 = 1;
-		_field414 = 6;
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.setStrip(2);
-		R2_GLOBALS._player.setFrame(5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 22:
-		_field414 = 14;
-		R2_GLOBALS._player._numFrames = 10;
-		R2_GLOBALS._player.setup(3155, 2, 4);
-		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
-		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
-		break;
-	case 30:
-		_field416 = 1;
-		_field414 = 6;
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.setStrip(3);
-		R2_GLOBALS._player.setFrame(5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 32:
-		_field414 = 14;
-		R2_GLOBALS._player._numFrames = 10;
-		R2_GLOBALS._player.setup(3155, 3, 4);
-		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
-		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
-		break;
-	case 40:
-		_field416 = 1;
-		_field414 = 6;
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.setStrip(4);
-		R2_GLOBALS._player.setFrame(5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 42:
-		_field414 = 14;
-		R2_GLOBALS._player._numFrames = 10;
-		R2_GLOBALS._player.setup(3155, 4, 4);
-		R2_GLOBALS._player.setPosition(Common::Point(160, 70));
-		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
-		break;
-	case 50:
-	// No break on purpose
-	case 55:
-	// No break on purpose
-	case 60:
-		R2_GLOBALS._player.setup(3156, 5, 1);
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 51:
-	// No break on purpose
-	case 56:
-	// No break on purpose
-	case 117:
-		R2_GLOBALS._player.setup(3157, 1, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 52:
-	// No break on purpose
-	case 82:
-	// No break on purpose
-	case 118:
-		R2_GLOBALS._player.setup(3156, 3, 6);
-		_sceneMode = 1;
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 57:
-	// No break on purpose
-	case 91:
-	// No break on purpose
-	case 96:
-		R2_GLOBALS._player.setup(3157, 2, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 58:
-	// No break on purpose
-	case 92:
-	// No break on purpose
-	case 122:
-		R2_GLOBALS._player.setup(3156, 2, 6);
-		_sceneMode = 1;
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 61:
-		R2_GLOBALS._player.setup(3157, 4, 5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 62:
-	// No break on purpose
-	case 72:
-	// No break on purpose
-	case 98:
-		R2_GLOBALS._player.setup(3156, 4, 6);
-		_sceneMode = 1;
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 70:
-	// No break on purpose
-	case 75:
-	// No break on purpose
-	case 80:
-		R2_GLOBALS._player.setup(3156, 6, 1);
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 71:
-	// No break on purpose
-	case 76:
-	// No break on purpose
-	case 97:
-		R2_GLOBALS._player.setup(3157, 3, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 77:
-	// No break on purpose
-	case 111:
-	// No break on purpose
-	case 116:
-		R2_GLOBALS._player.setup(3157, 4, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 78:
-	// No break on purpose
-	case 102:
-	// No break on purpose
-	case 112:
-		R2_GLOBALS._player.setup(3156, 1, 6);
-		_sceneMode = 1;
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 81:
-		R2_GLOBALS._player.setup(3157, 2, 5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 90:
-	// No break on purpose
-	case 95:
-	// No break on purpose
-	case 100:
-		R2_GLOBALS._player.setup(3156, 7, 1);
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 101:
-		R2_GLOBALS._player.setup(3157, 1, 5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 110:
-	// No break on purpose
-	case 115:
-	// No break on purpose
-	case 120:
-		R2_GLOBALS._player.setup(3156, 8, 1);
-		R2_GLOBALS._player._numFrames = 5;
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 121:
-		R2_GLOBALS._player.setup(3157, 3, 5);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	default:
-		// CHECKME: The original is walling _eventManager.waitEvent();
-		_sceneMode = 2;
+	case 2:
+		if (R2_GLOBALS._sceneManager._previousScene == 1530)
+			R2_GLOBALS._sceneManager.changeScene(1550);
+		else
+			R2_GLOBALS._sceneManager.changeScene(1530);
+	default:
 		break;
 	}
 }
 
-void Scene1200::process(Event &event) {
-	if (_field414 != 0)
-		return;
+/*--------------------------------------------------------------------------
+ * Scene 1530 - Cutscene - Crashing on Rimwall
+ *
+ *--------------------------------------------------------------------------*/
 
-	Scene::process(event);
+void Scene1530::postInit(SceneObjectList *OwnerList) {
+	if (R2_GLOBALS._sceneManager._previousScene == 1000)
+		loadScene(1650);
+	else if (R2_GLOBALS._sceneManager._previousScene == 1580)
+		loadScene(1550);
+	else
+		loadScene(1530);
 
-	if (!R2_GLOBALS._player._canWalk)
-		return;
+	R2_GLOBALS._uiElements._active = false;
+	SceneExt::postInit();
+	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
 
-	if (event.eventType == EVENT_BUTTON_DOWN) {
-		Common::Point cellPos = R2_GLOBALS._ventCellPos;
-		_mazeUI.pixelToCellXY(cellPos);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-		int cellId = _mazeUI.getCellFromPixelXY(event.mousePos);
-		switch (R2_GLOBALS._events.getCursor()) {
-		case CURSOR_WALK:
-			event.handled = true;
-			if ((event.mousePos.x > 179) && (event.mousePos.x < 210) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
-				startCrawling(CRAWL_EAST);
+	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.hide();
+		R2_GLOBALS._player.disableControl();
 
-			if ((event.mousePos.x > 109) && (event.mousePos.x < 140) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
-				startCrawling(CRAWL_WEST);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(538, this);
+		R2_GLOBALS._sound1.play(114);
 
-			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 89) && (event.mousePos.y < 120))
-				startCrawling(CRAWL_SOUTH);
+		_sceneMode = 3;
+	} else if (R2_GLOBALS._sceneManager._previousScene == 1580) {
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player._characterIndex = R2_QUINN;
+		R2_GLOBALS._player.setObjectWrapper(NULL);
+		R2_GLOBALS._player.setup(1516, 6, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 125));
+		R2_GLOBALS._player._moveRate = 30;
+		R2_GLOBALS._player._moveDiff = Common::Point(4, 1);
 
-			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 19) && (event.mousePos.y < 50))
-				startCrawling(CRAWL_NORTH);
-			break;
-		case CURSOR_USE:
-			if (cellId > 36) {
-				if ( ((cellPos.x == 3)  && (cellPos.y == 33))
-					|| ((cellPos.x == 7)  && (cellPos.y == 33))
-					|| ((cellPos.x == 33) && (cellPos.y == 41))
-					|| ((cellPos.x == 5)  && (cellPos.y == 5))
-					|| ((cellPos.x == 13) && (cellPos.y == 21))
-					|| ((cellPos.x == 17) && (cellPos.y == 21))
-					|| ((cellPos.x == 17) && (cellPos.y == 5))
-					|| ((cellPos.x == 17) && (cellPos.y == 9))
-					|| ((cellPos.x == 29) && (cellPos.y == 17))
-					|| ((cellPos.x == 33) && (cellPos.y == 17))
-					|| ((cellPos.x == 35) && (cellPos.y == 17))
-					|| ((cellPos.x == 41) && (cellPos.y == 21)) ) {
-					_laserPanel.postInit();
-					event.handled = true;
-				}
-			}
+		_leftReactor.postInit();
+		_leftReactor.setup(1516, 7, 1);
+		_leftReactor.setPosition(Common::Point(121, 41));
+		_leftReactor.animate(ANIM_MODE_2, NULL);
 
-			if ((cellId == 1) || (cellId == 4) || (cellId == 11) || (cellId == 14)) {
-				if ( ((cellPos.x == 3)  && (cellPos.y == 9))
-				  || ((cellPos.x == 11)  && (cellPos.y == 27))
-				  || ((cellPos.x == 17)  && (cellPos.y == 7))
-				  || ((cellPos.x == 17)  && (cellPos.y == 27))
-				  || ((cellPos.x == 17)  && (cellPos.y == 33))
-				  || (cellPos.x == 33) ) {
-					switch (cellPos.x) {
-					case 3:
-						R2_GLOBALS._sceneManager.changeScene(3150);
-						break;
-					case 33:
-						if (R2_GLOBALS._scientistConvIndex >= 4)
-							R2_GLOBALS._sceneManager.changeScene(3250);
-						else
-							SceneItem::display(1200, 6, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, LIST_END);
-						break;
-					default:
-						SceneItem::display(1200, 5, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, LIST_END);
-						break;
-					}
-					event.handled = true;
-				}
-			}
-			break;
-		case CURSOR_LOOK:
-			if ((cellId == 1) || (cellId == 4) || (cellId == 11) || (cellId == 14)) {
-				event.handled = true;
-				switch (cellPos.x) {
-				case 3:
-					// It was your cell.
-					SceneItem::display(1200, 8, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-					break;
-				case 9:
-						R2_GLOBALS._sceneManager.changeScene(3240);
-						break;
-				case 11:
-					if (cellPos.y == 27)
-						R2_GLOBALS._sceneManager.changeScene(3210);
-					else
-						// A vent grill
-						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-					break;
-				case 17:
-					switch (cellPos.y) {
-					case 5:
-						R2_GLOBALS._sceneManager.changeScene(3230);
-						break;
-					case 21:
-						R2_GLOBALS._sceneManager.changeScene(3220);
-						break;
-					case 33:
-						R2_GLOBALS._sceneManager.changeScene(3200);
-						break;
-					default:
-						// A vent grill
-						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-						break;
-					}
-					break;
-				case 33:
-					R2_GLOBALS._sceneManager.changeScene(3245);
-					break;
-				default:
-					SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-					break;
-				}
-			}
-			if (cellId > 36) {
-				// "An anti-pest laser"
-				event.handled = true;
-				SceneItem::display(1200, 9, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-			}
-			break;
-		case CURSOR_TALK:
-			event.handled = true;
-			break;
-		default:
-			return;
-		}
-	} else if (event.eventType == EVENT_KEYPRESS) {
-		if (_field414) {
-			event.handled = false;
-			return;
-		}
+		_rightReactor.postInit();
+		_rightReactor.setup(1516, 8, 1);
+		_rightReactor.setPosition(Common::Point(107, 116));
+		_rightReactor.animate(ANIM_MODE_2, NULL);
 
-		switch (event.kbd.keycode) {
-		case Common::KEYCODE_KP8:
-		case Common::KEYCODE_UP:
-			startCrawling(CRAWL_NORTH);
-			break;
-		case Common::KEYCODE_KP4:
-		case Common::KEYCODE_LEFT:
-			startCrawling(CRAWL_WEST);
-			break;
-		case Common::KEYCODE_KP6:
-		case Common::KEYCODE_RIGHT:
-			startCrawling(CRAWL_EAST);
-			break;
-		case Common::KEYCODE_KP2:
-		case Common::KEYCODE_DOWN:
-			startCrawling(CRAWL_SOUTH);
-			break;
-		default:
-			event.handled = false;
-			return;
-			break;
-		}
-	} else
-		return;
-}
+		R2_GLOBALS._player.disableControl();
+		Common::Point pt(480, 75);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		R2_GLOBALS._sound1.play(111);
 
-void Scene1200::dispatch() {
-	Rect tmpRect;
-	Scene::dispatch();
+		_sceneMode = 1;
+	} else {
+		_seeker.postInit();
+		_seeker._effect = EFFECT_SHADED;
 
-	if (_fixupMaze) {
-		_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
-		//_mazeUI.draw();
-		_fixupMaze = false;
-	}
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.disableControl();
 
-	if (_field414 != 0) {
-		tmpRect.set(110, 20, 210, 120);
-		_field414--;
+		setAction(&_sequenceManager, this, 1530, &R2_GLOBALS._player, &_seeker, NULL);
 
-		switch (_nextCrawlDirection) {
-		case CRAWL_EAST:
-			R2_GLOBALS._ventCellPos.x += 2;
-			break;
-		case CRAWL_WEST:
-			R2_GLOBALS._ventCellPos.x -= 2;
-			break;
-		case CRAWL_SOUTH:
-			R2_GLOBALS._ventCellPos.y += 2;
-			break;
-		case CRAWL_NORTH:
-			R2_GLOBALS._ventCellPos.y -= 2;
-			break;
-		default:
-			break;
-		}
+		_sceneMode = 2;
+	}
 
-		_mazeUI.setMazePosition(R2_GLOBALS._ventCellPos);
-		//_mazeUI.draw();
+}
 
-		if (_field416 != 0) {
-			switch(_nextCrawlDirection) {
-			case CRAWL_EAST:
-				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x - 2, R2_GLOBALS._player._position.y));
-				break;
-			case CRAWL_WEST:
-				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x + 2, R2_GLOBALS._player._position.y));
-				break;
-			case CRAWL_SOUTH:
-				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 2));
-				break;
-			case CRAWL_NORTH:
-				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 2));
-				break;
-			default:
-				break;
-			}
-		}
-		if (_field414 == 0) {
-			if (_field416 == 0)
-				R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
-			signal();
-		}
+void Scene1530::signal() {
+	switch (_sceneMode - 1) {
+	case 0:
+		R2_GLOBALS._sceneManager.changeScene(1000);
+		break;
+	case 1:
+		R2_GLOBALS._sceneManager.changeScene(1525);
+		break;
+	case 2:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 4;
+		R2_GLOBALS._player.show();
+		setAction(&_sequenceManager, this, 1650, &R2_GLOBALS._player, NULL);
+		break;
+	case 3:
+		R2_GLOBALS._sceneManager.changeScene(1700);
+		break;
+	default:
+		break;
 	}
 }
 
-void Scene1200::saveCharacter(int characterIndex) {
-	R2_GLOBALS._sound1.fadeOut2(NULL);
-	SceneExt::saveCharacter(characterIndex);
+void Scene1530::dispatch() {
+	int16 x = R2_GLOBALS._player._position.x;
+	int16 y = R2_GLOBALS._player._position.y;
+
+	_leftReactor.setPosition(Common::Point(x - 39, y - 85));
+	_rightReactor.setPosition(Common::Point(x - 53, y - 9));
+
+	Scene::dispatch();
 }
 
-void Scene1200::startCrawling(CrawlDirection dir) {
-	Common::Point cellPos = R2_GLOBALS._ventCellPos;
-	_mazeUI.pixelToCellXY(cellPos);
+/*--------------------------------------------------------------------------
+ * Scene 1550 - Spaceport
+ *
+ *--------------------------------------------------------------------------*/
 
-	switch (dir) {
-	case CRAWL_EAST:
-		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(200, 50)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(200, 88)) > 36))
-			&& ( ((cellPos.x == 3) && (cellPos.y == 33) && (_field418 != 4))
-				|| ((cellPos.x == 13) && (cellPos.y == 21) && (_field418 != 2))
-				|| ((cellPos.x == 29) && (cellPos.y == 17) && (_field418 != 1))
-				|| ((cellPos.x == 33) && (cellPos.y == 41)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1200;
-			setAction(&_sequenceManager, this, 1200, &_actor1, NULL);
-		} else if (_mazeUI.getCellFromPixelXY(Common::Point(200, 69)) == 36) {
-			switch (_nextCrawlDirection) {
-			case CRAWL_EAST:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 15;
-				else
-					_sceneMode = 10;
-				break;
-			case CRAWL_WEST:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 76;
-				else
-					_sceneMode = 75;
-				break;
-			case CRAWL_SOUTH:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 101;
-				else
-					_sceneMode = 100;
-				break;
-			case CRAWL_NORTH:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 111;
-				else
-					_sceneMode = 110;
-				break;
-			default:
-				break;
-			}
-			R2_GLOBALS._player.disableControl();
-			_nextCrawlDirection = 1;
-			signal();
-		}
-		break;
-	case CRAWL_WEST:
-		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(120, 50)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(120, 88)) > 36))
-			&& ( ((cellPos.x == 7) && (cellPos.y == 33) && (_field418 != 4))
-				|| ((cellPos.x == 17) && (cellPos.y == 21) && (_field418 != 2))
-				|| ((cellPos.x == 33) && (cellPos.y == 17) && (_field418 != 1))
-				|| ((cellPos.x == 5) && (cellPos.y == 5)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1201;
-			setAction(&_sequenceManager, this, 1201, &_actor1, NULL);
-		} else if (_mazeUI.getCellFromPixelXY(Common::Point(120, 69)) == 36) {
-			switch (_nextCrawlDirection) {
-			case CRAWL_EAST:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 56;
-				else
-					_sceneMode = 55;
-				break;
-			case CRAWL_WEST:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 25;
-				else
-					_sceneMode = 20;
-				break;
-			case CRAWL_SOUTH:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 91;
-				else
-					_sceneMode = 90;
-				break;
-			case CRAWL_NORTH:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 121;
-				else
-					_sceneMode = 120;
-				break;
-			default:
-				break;
-			}
+Scene1550::Junk::Junk() {
+	_junkNumber = 0;
+}
+
+void Scene1550::Junk::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_junkNumber);
+}
+
+bool Scene1550::Junk::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_visage == 1561) {
 			R2_GLOBALS._player.disableControl();
-			_nextCrawlDirection = 2;
-			signal();
+			scene->_sceneMode = 40;
+			Common::Point pt(_position.x + 5, _position.y + 20);
+			PlayerMover *mover = new PlayerMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			return true;
 		}
+		return SceneActor::startAction(action, event);
 		break;
-	case CRAWL_SOUTH:
-		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(140, 110)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(178, 110)) > 36))
-			&& ( ((cellPos.x == 17) && (cellPos.y == 5) && (_field418 != 3))
-				|| ((cellPos.x == 41) && (cellPos.y == 21)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1203;
-			setAction(&_sequenceManager, this, 1203, &_actor1, NULL);
-		} else if (_mazeUI.getCellFromPixelXY(Common::Point(160, 110)) == 36) {
-			switch (_nextCrawlDirection) {
-			case CRAWL_EAST:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 51;
-				else
-					_sceneMode = 50;
-				break;
-			case CRAWL_WEST:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 81;
-				else
-					_sceneMode = 80;
+	case CURSOR_LOOK:
+		if (_visage == 1561) {
+			switch (_frame) {
+			case 2:
+				SceneItem::display(1550, 23, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 				break;
-			case CRAWL_SOUTH:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 35;
-				else
-					_sceneMode = 30;
+			case 3:
+				SceneItem::display(1550, 26, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 				break;
-			case CRAWL_NORTH:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 116;
-				else
-					_sceneMode = 115;
+			case 4:
+				SceneItem::display(1550, 35, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 				break;
 			default:
 				break;
 			}
-			R2_GLOBALS._player.disableControl();
-			_nextCrawlDirection = 3;
-			signal();
-		}
-		break;
-	case CRAWL_NORTH:
-		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(140, 30)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(178, 30)) > 36))
-			&& ( ((cellPos.x == 17) && (cellPos.y == 9) && (_field418 != 3))
-				|| ((cellPos.x == 35) && (cellPos.y == 17)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1202;
-			setAction(&_sequenceManager, this, 1202, &_actor1, NULL);
-		} else if (_mazeUI.getCellFromPixelXY(Common::Point(160, 30)) == 36) {
-			switch (_nextCrawlDirection) {
-			case CRAWL_EAST:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 61;
-				else
-					_sceneMode = 60;
-				break;
-			case CRAWL_WEST:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 71;
-				else
-					_sceneMode = 70;
+		} else {
+			switch ((((_strip - 1) * 5) + _frame) % 3) {
+			case 0:
+				SceneItem::display(1550, 62, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 				break;
-			case CRAWL_SOUTH:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 96;
-				else
-					_sceneMode = 95;
+			case 1:
+				SceneItem::display(1550, 53, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 				break;
-			case CRAWL_NORTH:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 45;
-				else
-					_sceneMode = 40;
+			case 2:
+				SceneItem::display(1550, 76, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 				break;
 			default:
-				_sceneMode = 1;
-				R2_GLOBALS._player.setup(3156, 4, 6);
 				break;
 			}
-			R2_GLOBALS._player.disableControl();
-			_nextCrawlDirection = 4;
-			signal();
 		}
+		return true;
 		break;
 	default:
+		return SceneActor::startAction(action, event);
 		break;
 	}
 }
 
-/*--------------------------------------------------------------------------
- * Scene 1500 - Cutscene: Ship landing
- *
- *--------------------------------------------------------------------------*/
-
-void Scene1500::postInit(SceneObjectList *OwnerList) {
-	loadScene(1500);
-	R2_GLOBALS._uiElements._active = false;
-	setZoomPercents(170, 13, 240, 100);
-	SceneExt::postInit();
-	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
-
-	scalePalette(65, 65, 65);
-
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.hide();
-	R2_GLOBALS._player.disableControl();
-
-	_starshipShadow.postInit();
-	_starshipShadow.setup(1401, 1, 1);
-	_starshipShadow._effect = EFFECT_SHADOW_MAP;
-	_starshipShadow.fixPriority(10);
-	_starshipShadow._shadowMap = _shadowPaletteMap;
-
-	_starship.postInit();
-	_starship.setup(1400, 1, 1);
-	_starship._moveDiff = Common::Point(1, 1);
-	_starship._linkedActor = &_starshipShadow;
-
-	if (R2_GLOBALS._sceneManager._previousScene != 1010) {
-		_smallShipShadow.postInit();
-		_smallShipShadow.setup(1401, 2, 1);
-		_smallShipShadow._effect = EFFECT_SHADOW_MAP;
-		_smallShipShadow.fixPriority(10);
-		_smallShipShadow._shadowMap = _shadowPaletteMap;
-
-		_smallShip.postInit();
-		_smallShip._moveRate = 30;
-		_smallShip._moveDiff = Common::Point(1, 1);
-		_smallShip._linkedActor = &_smallShipShadow;
-	}
-
-	if (R2_GLOBALS._sceneManager._previousScene == 300) {
-		_starship.setPosition(Common::Point(189, 139), 5);
-
-		_smallShip.setup(1400, 1, 2);
-		_smallShip.setPosition(Common::Point(148, 108), 0);
-
-		_sceneMode = 20;
-		R2_GLOBALS._sound1.play(110);
-	} else if (R2_GLOBALS._sceneManager._previousScene == 1550) {
-		_starship.setPosition(Common::Point(189, 139), 5);
-
-		_smallShip.setup(1400, 2, 1);
-		_smallShip.changeZoom(-1);
-		_smallShip.setPosition(Common::Point(298, 258), 5);
-
-		_sceneMode = 10;
-		R2_GLOBALS._sound1.play(106);
-	} else {
-		_starship.setPosition(Common::Point(289, 239), -30);
-		_sceneMode = 0;
-		R2_GLOBALS._sound1.play(102);
-	}
-
-	signal();
+Scene1550::ShipComponent::ShipComponent() {
+	_componentId = 0;
 }
 
-void Scene1500::remove() {
-	R2_GLOBALS._uiElements._active = true;
-	R2_GLOBALS._uiElements._visible = true;
+void Scene1550::ShipComponent::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
 
-	SceneExt::remove();
+	s.syncAsSint16LE(_componentId);
 }
 
-void Scene1500::signal() {
-	switch(_sceneMode++) {
-	case 0:
-		R2_GLOBALS.setFlag(25);
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-	// No break on purpose
-	case 1:
-		if (_starship._yDiff < 50) {
-			_starship.setPosition(Common::Point(289, 239), _starship._yDiff + 1);
-			_sceneMode = 1;
-		}
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 2: {
-		Common::Point pt(189, 139);
-		NpcMover *mover = new NpcMover();
-		_starship.addMover(mover, &pt, this);
-		}
-		break;
-	case 3:
-		if (_starship._yDiff > 5) {
-			_starship.setPosition(Common::Point(189, 139), _starship._yDiff - 1);
-			_sceneMode = 3;
+bool Scene1550::ShipComponent::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_componentId == 8) {
+			scene->_dontExit = true;
+			R2_GLOBALS._player.disableControl();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				scene->_sceneMode = 1576;
+			else
+				scene->_sceneMode = 1584;
+			// strcpy(scene->_shipComponents[7]._actorName, 'hatch');
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[7], NULL);
+			return true;
 		}
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	case 13:
-		R2_GLOBALS._player._characterIndex = R2_MIRANDA;
-	// No break on purpose
-	case 4:
-		R2_GLOBALS._sceneManager.changeScene(300);
+		return SceneActor::startAction(action, event);
 		break;
-	case 10:
-	// No break on purpose
-	case 20:
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+	case CURSOR_LOOK:
+		if (_componentId == 8)
+			SceneItem::display(1550, 75, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		else if (_frame == 1)
+			SceneItem::display(1550, 70, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		else
+			SceneItem::display(1550, 71, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		return true;
 		break;
-	case 11: {
-		Common::Point pt(148, 108);
-		NpcMover *mover = new NpcMover();
-		_smallShip.addMover(mover, &pt, this);
+	case R2_FUEL_CELL:
+		scene->_dontExit = true;
+		if (_componentId == 6) {
+			R2_GLOBALS._player.disableControl();
+			scene->_wreckage2.postInit();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				scene->_sceneMode = 1574;
+			else
+				scene->_sceneMode = 1582;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[5], &scene->_wreckage2, NULL);
+			return true;
 		}
+		return SceneActor::startAction(action, event);
 		break;
-	case 12:
-		setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
-		break;
-	case 21: {
-		Common::Point pt(-2, -42);
-		NpcMover *mover = new NpcMover();
-		_smallShip.addMover(mover, &pt, NULL);
-		signal();
+	case R2_GYROSCOPE:
+		scene->_dontExit = true;
+		if (_componentId == 3) {
+			R2_GLOBALS._player.disableControl();
+			scene->_wreckage2.postInit();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				scene->_sceneMode = 1571;
+			else
+				scene->_sceneMode = 1581;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[2], &scene->_wreckage2, NULL);
+			return true;
 		}
+		return SceneActor::startAction(action, event);
 		break;
-	case 22:
-		if (_starship._yDiff < 50) {
-			_starship.setPosition(Common::Point(189, 139), _starship._yDiff + 1);
-			_sceneMode = 22;
+	case R2_GUIDANCE_MODULE:
+		scene->_dontExit = true;
+		if (_componentId == 1) {
+			R2_GLOBALS._player.disableControl();
+			scene->_wreckage2.postInit();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				scene->_sceneMode = 1569;
+			else
+				scene->_sceneMode = 1579;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[0], &scene->_wreckage2, NULL);
+			return true;
 		}
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		return SceneActor::startAction(action, event);
 		break;
-	case 23: {
-		Common::Point pt(-13, -61);
-		NpcMover *mover = new NpcMover();
-		_starship.addMover(mover, &pt, this);
+	case R2_THRUSTER_VALVE:
+		scene->_dontExit = true;
+		if (_componentId == 4) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1572;
+			scene->_wreckage2.postInit();
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[3], &scene->_wreckage2, NULL);
+			return true;
 		}
+		return SceneActor::startAction(action, event);
 		break;
-	case 24:
-		R2_GLOBALS._sceneManager.changeScene(1550);
+	case R2_RADAR_MECHANISM:
+		scene->_dontExit = true;
+		if (_componentId == 2) {
+			R2_GLOBALS._player.disableControl();
+			scene->_wreckage2.postInit();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				scene->_sceneMode = 1570;
+			else
+				scene->_sceneMode = 1580;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[1], &scene->_wreckage2, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_IGNITOR:
+		scene->_dontExit = true;
+		if (_componentId == 5) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1573;
+			scene->_wreckage2.postInit();
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[4], &scene->_wreckage2, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_BATTERY:
+		scene->_dontExit = true;
+		if (_componentId == 7) {
+			R2_GLOBALS._player.disableControl();
+			scene->_wreckage2.postInit();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				scene->_sceneMode = 1575;
+			else
+				scene->_sceneMode = 1583;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[6], &scene->_wreckage2, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
 		break;
 	default:
+		return SceneActor::startAction(action, event);
 		break;
 	}
 }
 
-void Scene1500::dispatch() {
-	if (_sceneMode > 10) {
-		float yDiff = sqrt((float) (_smallShip._position.x * _smallShip._position.x) + (_smallShip._position.y * _smallShip._position.y));
-		if (yDiff > 6)
-			_smallShip.setPosition(_smallShip._position, (int) yDiff);
+void Scene1550::ShipComponent::setupShipComponent(int componentId) {
+	_componentId = componentId;
+	postInit();
+	setup(1517, _componentId, 1);
+
+	switch (_componentId) {
+	case 1:
+		if (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) == 0)
+			setFrame(5);
+		setPosition(Common::Point(287, 85));
+		break;
+	case 2:
+		if (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) == 0)
+			setFrame(5);
+		setPosition(Common::Point(248, 100));
+		break;
+	case 3:
+		if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 0)
+			setFrame(5);
+		setPosition(Common::Point(217, 85));
+		break;
+	case 4:
+		if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 0)
+			setFrame(5);
+		setPosition(Common::Point(161, 121));
+		break;
+	case 5:
+		if (R2_INVENTORY.getObjectScene(R2_IGNITOR) == 0)
+			setFrame(5);
+		setPosition(Common::Point(117, 121));
+		break;
+	case 6:
+		if (R2_INVENTORY.getObjectScene(R2_FUEL_CELL) == 0)
+			setFrame(5);
+		setPosition(Common::Point(111, 85));
+		break;
+	case 7:
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 0)
+			setFrame(5);
+		setPosition(Common::Point(95, 84));
+		break;
+	case 8: {
+		setup(1516, 1, 1);
+		setPosition(Common::Point(201, 45));
+		Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+		if ((scene->_sceneMode == 1577) || (scene->_sceneMode == 1578))
+			hide();
+		fixPriority(92);
+		setDetails(1550, 70, -1, -1, 2, (SceneItem *) NULL);
+		}
+		break;
+	default:
+		break;
 	}
 
-	Scene::dispatch();
+	fixPriority(92);
+	setDetails(1550, 70, -1, -1, 2, (SceneItem *)NULL);
 }
 
-/*--------------------------------------------------------------------------
- * Scene 1525 - Cutscene - Ship
- *
- *--------------------------------------------------------------------------*/
-
-void Scene1525::postInit(SceneObjectList *OwnerList) {
-	loadScene(1525);
-	R2_GLOBALS._uiElements._active = false;
-	SceneExt::postInit();
+Scene1550::DishControlsWindow::DishControl::DishControl() {
+	_controlId = 0;
+}
 
-	R2_GLOBALS._player.postInit();
-	if (R2_GLOBALS._sceneManager._previousScene == 525)
-		R2_GLOBALS._player.setup(1525, 1, 1);
-	else
-		R2_GLOBALS._player.setup(1525, 1, 16);
-	R2_GLOBALS._player.setPosition(Common::Point(244, 148));
-	R2_GLOBALS._player.disableControl();
+void Scene1550::DishControlsWindow::DishControl::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
 
-	_sceneMode = 0;
-	setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
+	s.syncAsSint16LE(_controlId);
 }
 
-void Scene1525::signal() {
-	switch (_sceneMode++) {
-	case 0:
-		if (R2_GLOBALS._sceneManager._previousScene == 525)
-			setAction(&_sequenceManager, this, 1525, &R2_GLOBALS._player, NULL);
-		else
-			setAction(&_sequenceManager, this, 1526, &R2_GLOBALS._player, NULL);
-		break;
+bool Scene1550::DishControlsWindow::DishControl::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_controlId) {
 	case 1:
-		setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
+		// Button control
+		if (scene->_dish._frame == 5) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 25;
+			if (scene->_walkway._frame == 1) {
+				scene->setAction(&scene->_sequenceManager1, scene, 1560, &scene->_walkway, NULL);
+				R2_GLOBALS.setFlag(20);
+				setFrame(2);
+			} else {
+				scene->setAction(&scene->_sequenceManager1, scene, 1561, &scene->_walkway, NULL);
+				R2_GLOBALS.clearFlag(20);
+				setFrame(1);
+			}
+			scene->_dishControlsWindow.remove();
+		}
 		break;
 	case 2:
-		if (R2_GLOBALS._sceneManager._previousScene == 1530)
-			R2_GLOBALS._sceneManager.changeScene(1550);
-		else
-			R2_GLOBALS._sceneManager.changeScene(1530);
+		// Lever control
+		R2_GLOBALS._player.disableControl();
+		if (scene->_dish._frame == 1) {
+			scene->_sceneMode = 23;
+			scene->setAction(&scene->_sequenceManager1, scene, 1560, this, NULL);
+		} else {
+			if (scene->_walkway._frame == 1)
+				scene->_sceneMode = 24;
+			else
+				scene->_sceneMode = 22;
+			scene->setAction(&scene->_sequenceManager1, scene, 1561, this, NULL);
+		}
+	break;
 	default:
 		break;
 	}
+	return true;
 }
 
-/*--------------------------------------------------------------------------
- * Scene 1530 - Cutscene - Crashing on Rimwall
- *
- *--------------------------------------------------------------------------*/
+void Scene1550::DishControlsWindow::remove() {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
 
-void Scene1530::postInit(SceneObjectList *OwnerList) {
-	if (R2_GLOBALS._sceneManager._previousScene == 1000)
-		loadScene(1650);
-	else if (R2_GLOBALS._sceneManager._previousScene == 1580)
-		loadScene(1550);
-	else
-		loadScene(1530);
+	_button.remove();
+	_lever.remove();
 
-	R2_GLOBALS._uiElements._active = false;
-	SceneExt::postInit();
-	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
+	ModalWindow::remove();
 
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
+	if ((scene->_sceneMode >= 20) && (scene->_sceneMode <= 29))
+		return;
 
-	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
-		R2_GLOBALS._player.postInit();
-		R2_GLOBALS._player.hide();
-		R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.disableControl();
+	if (scene->_walkway._frame == 1) {
+		scene->_sceneMode = 1559;
+		scene->setAction(&scene->_sequenceManager1, scene, 1559, &R2_GLOBALS._player, NULL);
+	} else {
+		scene->_sceneMode = 1562;
+		scene->setAction(&scene->_sequenceManager1, scene, 1562, &R2_GLOBALS._player, NULL);
+	}
+}
 
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(538, this);
-		R2_GLOBALS._sound1.play(114);
+void Scene1550::DishControlsWindow::setup2(int visage, int stripFrameNum, int frameNum,
+		int posX, int posY) {
+	// Call inherited setup
+	ModalWindow::setup2(visage, stripFrameNum, frameNum, posX, posY);
 
-		_sceneMode = 3;
-	} else if (R2_GLOBALS._sceneManager._previousScene == 1580) {
-		R2_GLOBALS._player.postInit();
-		R2_GLOBALS._player._characterIndex = R2_QUINN;
-		R2_GLOBALS._player.setObjectWrapper(NULL);
-		R2_GLOBALS._player.setup(1516, 6, 1);
-		R2_GLOBALS._player.setPosition(Common::Point(160, 125));
-		R2_GLOBALS._player._moveRate = 30;
-		R2_GLOBALS._player._moveDiff = Common::Point(4, 1);
+	// Further setup
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+	setup3(1550, 67, -1, -1);
+	_button.postInit();
+	_button._controlId = 1;
+	if (scene->_walkway._frame == 1)
+		_button.setup(1559, 3, 1);
+	else
+		_button.setup(1559, 3, 2);
+	_button.setPosition(Common::Point(142, 79));
+	_button.fixPriority(251);
+	_button.setDetails(1550, 68, -1, -1, 2, (SceneItem *) NULL);
 
-		_leftReactor.postInit();
-		_leftReactor.setup(1516, 7, 1);
-		_leftReactor.setPosition(Common::Point(121, 41));
-		_leftReactor.animate(ANIM_MODE_2, NULL);
+	_lever.postInit();
+	_lever._numFrames = 5;
+	_lever._controlId = 2;
+	if (scene->_dish._frame == 1)
+		_lever.setup(1559, 2, 1);
+	else
+		_lever.setup(1559, 2, 5);
+	_lever.setPosition(Common::Point(156, 103));
+	_lever.fixPriority(251);
+	_lever.setDetails(1550, 69, -1, -1, 2, (SceneItem *) NULL);
+}
 
-		_rightReactor.postInit();
-		_rightReactor.setup(1516, 8, 1);
-		_rightReactor.setPosition(Common::Point(107, 116));
-		_rightReactor.animate(ANIM_MODE_2, NULL);
+bool Scene1550::WorkingShip::startAction(CursorType action, Event &event) {
+	return SceneHotspot::startAction(action, event);
+}
 
-		R2_GLOBALS._player.disableControl();
-		Common::Point pt(480, 75);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
-		R2_GLOBALS._sound1.play(111);
+bool Scene1550::Wreckage::startAction(CursorType action, Event &event) {
+	return SceneActor::startAction(action, event);
+}
 
-		_sceneMode = 1;
-	} else {
-		_seeker.postInit();
-		_seeker._effect = EFFECT_SHADED;
+bool Scene1550::Companion::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
 
-		R2_GLOBALS._player.postInit();
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._player.disableControl();
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+	scene->_sceneMode = 80;
+	scene->signal();
 
-		setAction(&_sequenceManager, this, 1530, &R2_GLOBALS._player, &_seeker, NULL);
+	return true;
+}
 
-		_sceneMode = 2;
-	}
+bool Scene1550::AirBag::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+	scene->_dontExit = true;
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		scene->_sceneMode = 1552;
+	else
+		scene->_sceneMode = 1588;
 
+	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_airbag, NULL);
+	return true;
 }
 
-void Scene1530::signal() {
-	switch (_sceneMode - 1) {
-	case 0:
-		R2_GLOBALS._sceneManager.changeScene(1000);
-		break;
-	case 1:
-		R2_GLOBALS._sceneManager.changeScene(1525);
-		break;
-	case 2:
+bool Scene1550::Joystick::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		scene->_sceneMode = 50;
 		R2_GLOBALS._player.disableControl();
-		_sceneMode = 4;
-		R2_GLOBALS._player.show();
-		setAction(&_sequenceManager, this, 1650, &R2_GLOBALS._player, NULL);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			scene->_stripManager.start(518, scene);
+		else
+			scene->_stripManager.start(520, scene);
+		return true;
 		break;
-	case 3:
-		R2_GLOBALS._sceneManager.changeScene(1700);
+	case CURSOR_LOOK:
+		SceneItem::display(1550, 41, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		return true;
 		break;
 	default:
-		break;
+		return SceneActor::startAction(action, event);
 	}
 }
 
-void Scene1530::dispatch() {
-	int16 x = R2_GLOBALS._player._position.x;
-	int16 y = R2_GLOBALS._player._position.y;
+bool Scene1550::Gyroscope::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
 
-	_leftReactor.setPosition(Common::Point(x - 39, y - 85));
-	_rightReactor.setPosition(Common::Point(x - 53, y - 9));
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+	R2_GLOBALS._player.disableControl();
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		scene->_sceneMode = 1555;
+	else
+		scene->_sceneMode = 1589;
 
-	Scene::dispatch();
+	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
+		&scene->_gyroscope, NULL);
+	return true;
 }
 
-/*--------------------------------------------------------------------------
- * Scene 1550 - Spaceport
- *
- *--------------------------------------------------------------------------*/
+bool Scene1550::DiagnosticsDisplay::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
 
-Scene1550::Junk::Junk() {
-	_junkNumber = 0;
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+	R2_GLOBALS._player.disableControl();
+	scene->_dontExit = true;
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		scene->_sceneMode = 1586;
+	else
+		scene->_sceneMode = 1587;
+
+	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
+		&scene->_diagnosticsDisplay, NULL);
+	return true;
 }
 
-void Scene1550::Junk::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+bool Scene1550::DishTower::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 1585;
+		scene->setAction(&scene->_sequenceManager1, scene, 1585, &R2_GLOBALS._player, NULL);
+	} else {
+		R2_GLOBALS._player.disableControl();
+		switch(scene->_dishMode) {
+		case 0:
+			scene->_dish.fixPriority(168);
+			scene->_walkway.fixPriority(125);
+			scene->_sceneMode = 1558;
+			scene->setAction(&scene->_sequenceManager1, scene, 1558, &R2_GLOBALS._player, NULL);
+			break;
+		case 1:
+			return SceneActor::startAction(action, event);
+			break;
+		case 2:
+			scene->_dishMode = 1;
+			scene->_sceneMode = 1563;
+			scene->setAction(&scene->_sequenceManager1, scene, 1563, &R2_GLOBALS._player, &scene->_walkway, NULL);
+			break;
+		default:
+			break;
+		}
+	}
+	return true;
 
-	s.syncAsSint16LE(_junkNumber);
 }
 
-bool Scene1550::Junk::startAction(CursorType action, Event &event) {
+bool Scene1550::Dish::startAction(CursorType action, Event &event) {
 	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
 	case CURSOR_USE:
-		if (_visage == 1561) {
+		if (scene->_dishMode != 2)
+			return SceneActor::startAction(action, event);
+
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
 			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 40;
-			Common::Point pt(_position.x + 5, _position.y + 20);
-			PlayerMover *mover = new PlayerMover();
-			R2_GLOBALS._player.addMover(mover, &pt, scene);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
+			scene->_sceneMode = 1564;
+			scene->setAction(&scene->_sequenceManager1, scene, 1564, &R2_GLOBALS._player, NULL);
+		} else
+			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		return true;
 		break;
 	case CURSOR_LOOK:
-		if (_visage == 1561) {
-			switch (_frame) {
-			case 2:
-				SceneItem::display(1550, 23, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-				break;
-			case 3:
-				SceneItem::display(1550, 26, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-				break;
-			case 4:
-				SceneItem::display(1550, 35, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-				break;
-			default:
-				break;
-			}
-		} else {
-			switch ((((_strip - 1) * 5) + _frame) % 3) {
-			case 0:
-				SceneItem::display(1550, 62, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-				break;
-			case 1:
-				SceneItem::display(1550, 53, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-				break;
-			case 2:
-				SceneItem::display(1550, 76, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-				break;
-			default:
-				break;
-			}
-		}
+		if (scene->_dishMode != 2)
+			return SceneActor::startAction(action, event);
+
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
+			SceneItem::display(1550, 74, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		} else
+			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 		return true;
 		break;
 	default:
@@ -2572,758 +2150,301 @@ bool Scene1550::Junk::startAction(CursorType action, Event &event) {
 	}
 }
 
-Scene1550::ShipComponent::ShipComponent() {
-	_componentId = 0;
+/*--------------------------------------------------------------------------*/
+
+Scene1550::Scene1550() {
+	_dontExit = false;
+	_wallType = 0;
+	_dishMode = 0;
+	_sceneResourceId = 0;
+	_walkRegionsId = 0;
 }
 
-void Scene1550::ShipComponent::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+void Scene1550::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
 
-	s.syncAsSint16LE(_componentId);
+	s.syncAsSint16LE(_dontExit);
+	s.syncAsByte(_wallType);
+	s.syncAsSint16LE(_dishMode);
+	s.syncAsSint16LE(_sceneResourceId);
+	s.syncAsSint16LE(_walkRegionsId);
 }
 
-bool Scene1550::ShipComponent::startAction(CursorType action, Event &event) {
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	switch (action) {
-	case CURSOR_USE:
-		if (_componentId == 8) {
-			scene->_dontExit = true;
-			R2_GLOBALS._player.disableControl();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				scene->_sceneMode = 1576;
-			else
-				scene->_sceneMode = 1584;
-			// strcpy(scene->_shipComponents[7]._actorName, 'hatch');
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[7], NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
-		break;
-	case CURSOR_LOOK:
-		if (_componentId == 8)
-			SceneItem::display(1550, 75, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		else if (_frame == 1)
-			SceneItem::display(1550, 70, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		else
-			SceneItem::display(1550, 71, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		return true;
-		break;
-	case R2_FUEL_CELL:
-		scene->_dontExit = true;
-		if (_componentId == 6) {
-			R2_GLOBALS._player.disableControl();
-			scene->_wreckage2.postInit();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				scene->_sceneMode = 1574;
-			else
-				scene->_sceneMode = 1582;
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[5], &scene->_wreckage2, NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
-		break;
-	case R2_GYROSCOPE:
-		scene->_dontExit = true;
-		if (_componentId == 3) {
-			R2_GLOBALS._player.disableControl();
-			scene->_wreckage2.postInit();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				scene->_sceneMode = 1571;
-			else
-				scene->_sceneMode = 1581;
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[2], &scene->_wreckage2, NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
-		break;
-	case R2_GUIDANCE_MODULE:
-		scene->_dontExit = true;
-		if (_componentId == 1) {
-			R2_GLOBALS._player.disableControl();
-			scene->_wreckage2.postInit();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				scene->_sceneMode = 1569;
-			else
-				scene->_sceneMode = 1579;
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[0], &scene->_wreckage2, NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
-		break;
-	case R2_THRUSTER_VALVE:
-		scene->_dontExit = true;
-		if (_componentId == 4) {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 1572;
-			scene->_wreckage2.postInit();
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[3], &scene->_wreckage2, NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
-		break;
-	case R2_RADAR_MECHANISM:
-		scene->_dontExit = true;
-		if (_componentId == 2) {
-			R2_GLOBALS._player.disableControl();
-			scene->_wreckage2.postInit();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				scene->_sceneMode = 1570;
-			else
-				scene->_sceneMode = 1580;
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[1], &scene->_wreckage2, NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
-		break;
-	case R2_IGNITOR:
-		scene->_dontExit = true;
-		if (_componentId == 5) {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 1573;
-			scene->_wreckage2.postInit();
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[4], &scene->_wreckage2, NULL);
-			return true;
-		}
-		return SceneActor::startAction(action, event);
+void Scene1550::postInit(SceneObjectList *OwnerList) {
+	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) &&
+			(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11))
+		// Exiting the intact spaceship
+		loadScene(1234);
+	else
+		// Normal scene entry
+		loadScene(1550);
+	SceneExt::postInit();
+
+	scalePalette(65, 65, 65);
+	setZoomPercents(30, 75, 170, 100);
+	_sceneResourceId = 1550;
+	_walkRegionsId = 0;
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS.setFlag(16);
+
+	if ((R2_GLOBALS._player._characterScene[R2_QUINN] != 1550) && (R2_GLOBALS._player._characterScene[R2_QUINN] != 1580)) {
+		R2_GLOBALS._player._characterScene[R2_QUINN] = 1550;
+		R2_GLOBALS._player._characterScene[R2_SEEKER] = 1550;
+	}
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player._effect = EFFECT_SHADED2;
+
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		R2_GLOBALS._player.setup(1500, 3, 1);
+	else
+		R2_GLOBALS._player.setup(1505, 3, 1);
+
+	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+
+	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) &&
+			(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11))
+		R2_GLOBALS._player.setPosition(Common::Point(157, 135));
+	else
+		R2_GLOBALS._player.setPosition(Common::Point(160, 100));
+
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_wallType = 0;
+	_companion.changeZoom(-1);
+	R2_GLOBALS._player.changeZoom(-1);
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 1530:
+		R2_GLOBALS._stripModifier = 0;
+	// No break on purpose
+	case 300:
+	// No break on purpose
+	case 1500:
+	// No break on purpose
+	case 3150:
+		R2_GLOBALS._sound1.play(105);
 		break;
-	case R2_BATTERY:
-		scene->_dontExit = true;
-		if (_componentId == 7) {
+	case 1580:
+		// Leaving intact ship
+		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1580) {
 			R2_GLOBALS._player.disableControl();
-			scene->_wreckage2.postInit();
+			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
+
+			_dontExit = true;
+
+			_wreckage2.postInit();
+			_shipComponents[7].setupShipComponent(8);
+			_shipComponents[7].hide();
 			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				scene->_sceneMode = 1575;
+				_sceneMode = 1577;
 			else
-				scene->_sceneMode = 1583;
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_shipComponents[6], &scene->_wreckage2, NULL);
-			return true;
+				_sceneMode = 1578;
+
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_wreckage2, &_shipComponents[7], NULL);
+			R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1550;
+		} else {
+			R2_GLOBALS._player.enableControl();
 		}
-		return SceneActor::startAction(action, event);
 		break;
 	default:
-		return SceneActor::startAction(action, event);
 		break;
 	}
-}
 
-void Scene1550::ShipComponent::setupShipComponent(int componentId) {
-	_componentId = componentId;
-	postInit();
-	setup(1517, _componentId, 1);
+	enterArea();
 
-	switch (_componentId) {
+	_intactHull1.setDetails(16, 1550, 10, -1, -1);
+	_intactHull2.setDetails(24, 1550, 10, -1, -1);
+	_background.setDetails(Rect(0, 0, 320, 200), 1550, 0, 1, -1, 1, NULL);
+
+	if ((R2_GLOBALS._sceneManager._previousScene == 1500) && (R2_GLOBALS.getFlag(16))) {
+		_sceneMode = 70;
+		if (!R2_GLOBALS._sceneObjects->contains(&_companion))
+			_companion.postInit();
+
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			_companion.setVisage(1505);
+		else
+			_companion.setVisage(1500);
+
+		_companion.changeZoom(77);
+		_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+
+		assert(_walkRegionsId >= 1550);
+		R2_GLOBALS._walkRegions.disableRegion(k5A750[_walkRegionsId - 1550]);
+
+		setAction(&_sequenceManager1, this, 1590, &_companion, NULL);
+	} else if ((_sceneMode != 1577) && (_sceneMode != 1578))
+		R2_GLOBALS._player.enableControl();
+}
+
+void Scene1550::signal() {
+	switch (_sceneMode) {
 	case 1:
-		if (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) == 0)
-			setFrame(5);
-		setPosition(Common::Point(287, 85));
-		break;
-	case 2:
-		if (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) == 0)
-			setFrame(5);
-		setPosition(Common::Point(248, 100));
-		break;
+	// No break on purpose
 	case 3:
-		if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 0)
-			setFrame(5);
-		setPosition(Common::Point(217, 85));
-		break;
-	case 4:
-		if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 0)
-			setFrame(5);
-		setPosition(Common::Point(161, 121));
-		break;
+	// No break on purpose
 	case 5:
-		if (R2_INVENTORY.getObjectScene(R2_IGNITOR) == 0)
-			setFrame(5);
-		setPosition(Common::Point(117, 121));
-		break;
-	case 6:
-		if (R2_INVENTORY.getObjectScene(R2_FUEL_CELL) == 0)
-			setFrame(5);
-		setPosition(Common::Point(111, 85));
-		break;
+	// No break on purpose
 	case 7:
-		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 0)
-			setFrame(5);
-		setPosition(Common::Point(95, 84));
-		break;
-	case 8: {
-		setup(1516, 1, 1);
-		setPosition(Common::Point(201, 45));
-		Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-		if ((scene->_sceneMode == 1577) || (scene->_sceneMode == 1578))
-			hide();
-		fixPriority(92);
-		setDetails(1550, 70, -1, -1, 2, (SceneItem *) NULL);
-		}
+		_dontExit = false;
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
-	default:
+	case 20:
+	// No break on purpose
+	case 21:
+	// No break on purpose
+	case 25:
+	// No break on purpose
+	case 1563:
+		// Show the communication dish controls window
+		R2_GLOBALS.clearFlag(20);
+		_dishControlsWindow.setup2(1559, 1, 1, 160, 125);
+		R2_GLOBALS._player.enableControl();
+		_sceneMode = 0;
 		break;
-	}
-
-	fixPriority(92);
-	setDetails(1550, 70, -1, -1, 2, (SceneItem *)NULL);
-}
-
-Scene1550::DishControlsWindow::DishControl::DishControl() {
-	_controlId = 0;
-}
-
-void Scene1550::DishControlsWindow::DishControl::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
-
-	s.syncAsSint16LE(_controlId);
-}
-
-bool Scene1550::DishControlsWindow::DishControl::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	switch (_controlId) {
-	case 1:
-		// Button control
-		if (scene->_dish._frame == 5) {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 25;
-			if (scene->_walkway._frame == 1) {
-				scene->setAction(&scene->_sequenceManager1, scene, 1560, &scene->_walkway, NULL);
-				R2_GLOBALS.setFlag(20);
-				setFrame(2);
-			} else {
-				scene->setAction(&scene->_sequenceManager1, scene, 1561, &scene->_walkway, NULL);
-				R2_GLOBALS.clearFlag(20);
-				setFrame(1);
-			}
-			scene->_dishControlsWindow.remove();
+	case 22:
+		_dishControlsWindow.remove();
+		_sceneMode = 24;
+		setAction(&_sequenceManager1, this, 1561, &_walkway, NULL);
+		R2_GLOBALS.clearFlag(20);
+		break;
+	case 23:
+		_dishControlsWindow.remove();
+		_sceneMode = 20;
+		setAction(&_sequenceManager1, this, 1566, &_dish, &_dishTowerShadow, NULL);
+		R2_GLOBALS.setFlag(19);
+		break;
+	case 24:
+		_dishControlsWindow.remove();
+		_sceneMode = 21;
+		setAction(&_sequenceManager1, this, 1567, &_dish, &_dishTowerShadow, NULL);
+		R2_GLOBALS.clearFlag(19);
+		break;
+	case 30:
+	// No break on purpose
+	case 1556:
+	// No break on purpose
+	case 1557:
+	// Nothing on purpose
+		break;
+	case 40: {
+			_sceneMode = 41;
+			Common::Point pt(_junk[0]._position.x, _junk[0]._position.y + 20);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
 		}
 		break;
-	case 2:
-		// Lever control
-		R2_GLOBALS._player.disableControl();
-		if (scene->_dish._frame == 1) {
-			scene->_sceneMode = 23;
-			scene->setAction(&scene->_sequenceManager1, scene, 1560, this, NULL);
+	case 41:
+		_sceneMode = 42;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._player.setup(1502, 8, 1);
 		} else {
-			if (scene->_walkway._frame == 1)
-				scene->_sceneMode = 24;
-			else
-				scene->_sceneMode = 22;
-			scene->setAction(&scene->_sequenceManager1, scene, 1561, this, NULL);
+			R2_GLOBALS._player.changeZoom(R2_GLOBALS._player._percent + 14);
+			R2_GLOBALS._player.setup(1516, 4, 1);
 		}
-	break;
-	default:
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
 		break;
-	}
-	return true;
-}
-
-void Scene1550::DishControlsWindow::remove() {
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	_button.remove();
-	_lever.remove();
 
-	ModalWindow::remove();
+	case 42: {
+		_sceneMode = 43;
+		int junkRegionIndex = R2_GLOBALS._scene1550JunkLocations[_junk[0]._junkNumber + 3];
+		R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[junkRegionIndex]);
 
-	if ((scene->_sceneMode >= 20) && (scene->_sceneMode <= 29))
-		return;
+		switch (_junk[0]._frame) {
+		case 1:
+			R2_INVENTORY.setObjectScene(R2_JOYSTICK, R2_GLOBALS._player._characterIndex);
+			break;
+		case 2:
+			R2_INVENTORY.setObjectScene(R2_FUEL_CELL, R2_GLOBALS._player._characterIndex);
+			break;
+		case 3:
+			R2_INVENTORY.setObjectScene(R2_GUIDANCE_MODULE, R2_GLOBALS._player._characterIndex);
+			break;
+		case 4:
+			R2_INVENTORY.setObjectScene(R2_RADAR_MECHANISM, R2_GLOBALS._player._characterIndex);
+			break;
+		case 5:
+			R2_INVENTORY.setObjectScene(R2_BATTERY, R2_GLOBALS._player._characterIndex);
+			break;
+		case 6:
+			R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, R2_GLOBALS._player._characterIndex);
+			break;
+		default:
+			break;
+		}
 
-	R2_GLOBALS._player.disableControl();
-	if (scene->_walkway._frame == 1) {
-		scene->_sceneMode = 1559;
-		scene->setAction(&scene->_sequenceManager1, scene, 1559, &R2_GLOBALS._player, NULL);
-	} else {
-		scene->_sceneMode = 1562;
-		scene->setAction(&scene->_sequenceManager1, scene, 1562, &R2_GLOBALS._player, NULL);
+		_junk[0].remove();
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
 	}
-}
-
-void Scene1550::DishControlsWindow::setup2(int visage, int stripFrameNum, int frameNum,
-		int posX, int posY) {
-	// Call inherited setup
-	ModalWindow::setup2(visage, stripFrameNum, frameNum, posX, posY);
-
-	// Further setup
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-	setup3(1550, 67, -1, -1);
-	_button.postInit();
-	_button._controlId = 1;
-	if (scene->_walkway._frame == 1)
-		_button.setup(1559, 3, 1);
-	else
-		_button.setup(1559, 3, 2);
-	_button.setPosition(Common::Point(142, 79));
-	_button.fixPriority(251);
-	_button.setDetails(1550, 68, -1, -1, 2, (SceneItem *) NULL);
-
-	_lever.postInit();
-	_lever._numFrames = 5;
-	_lever._controlId = 2;
-	if (scene->_dish._frame == 1)
-		_lever.setup(1559, 2, 1);
-	else
-		_lever.setup(1559, 2, 5);
-	_lever.setPosition(Common::Point(156, 103));
-	_lever.fixPriority(251);
-	_lever.setDetails(1550, 69, -1, -1, 2, (SceneItem *) NULL);
-}
-
-bool Scene1550::WorkingShip::startAction(CursorType action, Event &event) {
-	return SceneHotspot::startAction(action, event);
-}
-
-bool Scene1550::Wreckage::startAction(CursorType action, Event &event) {
-	return SceneActor::startAction(action, event);
-}
-
-bool Scene1550::Companion::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_TALK)
-		return SceneActor::startAction(action, event);
-
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-	scene->_sceneMode = 80;
-	scene->signal();
-
-	return true;
-}
-
-bool Scene1550::AirBag::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	R2_GLOBALS._player.disableControl();
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-	scene->_dontExit = true;
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		scene->_sceneMode = 1552;
-	else
-		scene->_sceneMode = 1588;
-
-	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_airbag, NULL);
-	return true;
-}
-
-bool Scene1550::Joystick::startAction(CursorType action, Event &event) {
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	switch (action) {
-	case CURSOR_USE:
-		scene->_sceneMode = 50;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+	case 43:
+		R2_GLOBALS._scene1550JunkLocations[_junk[0]._junkNumber + 2] = 0;
 		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			scene->_stripManager.start(518, scene);
-		else
-			scene->_stripManager.start(520, scene);
-		return true;
-		break;
-	case CURSOR_LOOK:
-		SceneItem::display(1550, 41, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		return true;
+			R2_GLOBALS._player.setVisage(1500);
+		else {
+			R2_GLOBALS._player.changeZoom(-1);
+			R2_GLOBALS._player.setVisage(1505);
+		}
+		R2_GLOBALS._player.animate(ANIM_MODE_1, this);
+		R2_GLOBALS._player.setStrip(8);
+		R2_GLOBALS._player.enableControl();
 		break;
-	default:
-		return SceneActor::startAction(action, event);
-	}
-}
-
-bool Scene1550::Gyroscope::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-	R2_GLOBALS._player.disableControl();
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		scene->_sceneMode = 1555;
-	else
-		scene->_sceneMode = 1589;
-
-	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
-		&scene->_gyroscope, NULL);
-	return true;
-}
-
-bool Scene1550::DiagnosticsDisplay::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-	R2_GLOBALS._player.disableControl();
-	scene->_dontExit = true;
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		scene->_sceneMode = 1586;
-	else
-		scene->_sceneMode = 1587;
-
-	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
-		&scene->_diagnosticsDisplay, NULL);
-	return true;
-}
-
-bool Scene1550::DishTower::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
-		R2_GLOBALS._player.disableControl();
-		scene->_sceneMode = 1585;
-		scene->setAction(&scene->_sequenceManager1, scene, 1585, &R2_GLOBALS._player, NULL);
-	} else {
-		R2_GLOBALS._player.disableControl();
-		switch(scene->_dishMode) {
-		case 0:
-			scene->_dish.fixPriority(168);
-			scene->_walkway.fixPriority(125);
-			scene->_sceneMode = 1558;
-			scene->setAction(&scene->_sequenceManager1, scene, 1558, &R2_GLOBALS._player, NULL);
-			break;
-		case 1:
-			return SceneActor::startAction(action, event);
-			break;
-		case 2:
-			scene->_dishMode = 1;
-			scene->_sceneMode = 1563;
-			scene->setAction(&scene->_sequenceManager1, scene, 1563, &R2_GLOBALS._player, &scene->_walkway, NULL);
-			break;
-		default:
-			break;
+	case 50:
+		// Removed (useless ?) call to sub_1D227
+		++_sceneMode;
+		setAction(&_sequenceManager1, this, 1591, &R2_GLOBALS._player, NULL);
+		if (g_globals->_sceneObjects->contains(&_companion))
+			signal();
+		else {
+			_companion.postInit();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				_companion.setVisage(1505);
+			else
+				_companion.setVisage(1500);
+			_companion.changeZoom(77);
+			_companion.setAction(&_sequenceManager2, this, 1590, &_companion, NULL);
+			_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
 		}
-	}
-	return true;
-
-}
-
-bool Scene1550::Dish::startAction(CursorType action, Event &event) {
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	switch (action) {
-	case CURSOR_USE:
-		if (scene->_dishMode != 2)
-			return SceneActor::startAction(action, event);
-
-		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 1564;
-			scene->setAction(&scene->_sequenceManager1, scene, 1564, &R2_GLOBALS._player, NULL);
-		} else
-			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		return true;
 		break;
-	case CURSOR_LOOK:
-		if (scene->_dishMode != 2)
-			return SceneActor::startAction(action, event);
-
-		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
-			SceneItem::display(1550, 74, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		} else
-			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		return true;
+	case 51:
+		++_sceneMode;
 		break;
-	default:
-		return SceneActor::startAction(action, event);
+	case 52:
+		_companion.changeZoom(-1);
+		_sceneMode = 1592;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			setAction(&_sequenceManager1, this, 1592, &R2_GLOBALS._player, &_companion,
+				&_junk[0], &_joystick, NULL);
+		else
+			setAction(&_sequenceManager1, this, 1593, &R2_GLOBALS._player, &_companion,
+				&_junk[0], &_joystick, NULL);
 		break;
-	}
-}
-
-/*--------------------------------------------------------------------------*/
-
-Scene1550::Scene1550() {
-	_dontExit = false;
-	_wallType = 0;
-	_dishMode = 0;
-	_sceneResourceId = 0;
-	_walkRegionsId = 0;
-}
-
-void Scene1550::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
-
-	s.syncAsSint16LE(_dontExit);
-	s.syncAsByte(_wallType);
-	s.syncAsSint16LE(_dishMode);
-	s.syncAsSint16LE(_sceneResourceId);
-	s.syncAsSint16LE(_walkRegionsId);
-}
-
-void Scene1550::postInit(SceneObjectList *OwnerList) {
-	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) &&
-			(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11))
-		// Exiting the intact spaceship
-		loadScene(1234);
-	else
-		// Normal scene entry
-		loadScene(1550);
-	SceneExt::postInit();
-
-	scalePalette(65, 65, 65);
-	setZoomPercents(30, 75, 170, 100);
-	_sceneResourceId = 1550;
-	_walkRegionsId = 0;
-
-	if (R2_GLOBALS._sceneManager._previousScene == -1)
-		R2_GLOBALS.setFlag(16);
-
-	if ((R2_GLOBALS._player._characterScene[R2_QUINN] != 1550) && (R2_GLOBALS._player._characterScene[R2_QUINN] != 1580)) {
-		R2_GLOBALS._player._characterScene[R2_QUINN] = 1550;
-		R2_GLOBALS._player._characterScene[R2_SEEKER] = 1550;
-	}
-
-	_stripManager.setColors(60, 255);
-	_stripManager.setFontNumber(3);
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
-
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player._effect = EFFECT_SHADED2;
-
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		R2_GLOBALS._player.setup(1500, 3, 1);
-	else
-		R2_GLOBALS._player.setup(1505, 3, 1);
-
-	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
-
-	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) &&
-			(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11))
-		R2_GLOBALS._player.setPosition(Common::Point(157, 135));
-	else
-		R2_GLOBALS._player.setPosition(Common::Point(160, 100));
-
-	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-	R2_GLOBALS._player.disableControl();
-
-	_wallType = 0;
-	_companion.changeZoom(-1);
-	R2_GLOBALS._player.changeZoom(-1);
-
-	switch (R2_GLOBALS._sceneManager._previousScene) {
-	case 1530:
-		R2_GLOBALS._stripModifier = 0;
-	// No break on purpose
-	case 300:
-	// No break on purpose
-	case 1500:
-	// No break on purpose
-	case 3150:
-		R2_GLOBALS._sound1.play(105);
+	case 61:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+		_dishMode = 2;
 		break;
-	case 1580:
-		// Leaving intact ship
-		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1580) {
-			R2_GLOBALS._player.disableControl();
-			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
-
-			_dontExit = true;
-
-			_wreckage2.postInit();
-			_shipComponents[7].setupShipComponent(8);
-			_shipComponents[7].hide();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				_sceneMode = 1577;
-			else
-				_sceneMode = 1578;
-
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_wreckage2, &_shipComponents[7], NULL);
-			R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1550;
-		} else {
-			R2_GLOBALS._player.enableControl();
+	case 62:
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		if (_dishMode == 2) {
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
 		}
 		break;
-	default:
-		break;
-	}
-
-	enterArea();
-
-	_intactHull1.setDetails(16, 1550, 10, -1, -1);
-	_intactHull2.setDetails(24, 1550, 10, -1, -1);
-	_background.setDetails(Rect(0, 0, 320, 200), 1550, 0, 1, -1, 1, NULL);
-
-	if ((R2_GLOBALS._sceneManager._previousScene == 1500) && (R2_GLOBALS.getFlag(16))) {
-		_sceneMode = 70;
-		if (!R2_GLOBALS._sceneObjects->contains(&_companion))
-			_companion.postInit();
-
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			_companion.setVisage(1505);
-		else
-			_companion.setVisage(1500);
-
-		_companion.changeZoom(77);
-		_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
-
-		assert(_walkRegionsId >= 1550);
-		R2_GLOBALS._walkRegions.disableRegion(k5A750[_walkRegionsId - 1550]);
-
-		setAction(&_sequenceManager1, this, 1590, &_companion, NULL);
-	} else if ((_sceneMode != 1577) && (_sceneMode != 1578))
-		R2_GLOBALS._player.enableControl();
-}
-
-void Scene1550::signal() {
-	switch (_sceneMode) {
-	case 1:
-	// No break on purpose
-	case 3:
-	// No break on purpose
-	case 5:
-	// No break on purpose
-	case 7:
-		_dontExit = false;
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		break;
-	case 20:
-	// No break on purpose
-	case 21:
-	// No break on purpose
-	case 25:
-	// No break on purpose
-	case 1563:
-		// Show the communication dish controls window
-		R2_GLOBALS.clearFlag(20);
-		_dishControlsWindow.setup2(1559, 1, 1, 160, 125);
-		R2_GLOBALS._player.enableControl();
-		_sceneMode = 0;
-		break;
-	case 22:
-		_dishControlsWindow.remove();
-		_sceneMode = 24;
-		setAction(&_sequenceManager1, this, 1561, &_walkway, NULL);
-		R2_GLOBALS.clearFlag(20);
-		break;
-	case 23:
-		_dishControlsWindow.remove();
-		_sceneMode = 20;
-		setAction(&_sequenceManager1, this, 1566, &_dish, &_dishTowerShadow, NULL);
-		R2_GLOBALS.setFlag(19);
-		break;
-	case 24:
-		_dishControlsWindow.remove();
-		_sceneMode = 21;
-		setAction(&_sequenceManager1, this, 1567, &_dish, &_dishTowerShadow, NULL);
-		R2_GLOBALS.clearFlag(19);
-		break;
-	case 30:
-	// No break on purpose
-	case 1556:
-	// No break on purpose
-	case 1557:
-	// Nothing on purpose
-		break;
-	case 40: {
-			_sceneMode = 41;
-			Common::Point pt(_junk[0]._position.x, _junk[0]._position.y + 20);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		}
-		break;
-	case 41:
-		_sceneMode = 42;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			R2_GLOBALS._player.setup(1502, 8, 1);
-		} else {
-			R2_GLOBALS._player.changeZoom(R2_GLOBALS._player._percent + 14);
-			R2_GLOBALS._player.setup(1516, 4, 1);
-		}
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-
-	case 42: {
-		_sceneMode = 43;
-		int junkRegionIndex = R2_GLOBALS._scene1550JunkLocations[_junk[0]._junkNumber + 3];
-		R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[junkRegionIndex]);
-
-		switch (_junk[0]._frame) {
-		case 1:
-			R2_INVENTORY.setObjectScene(R2_JOYSTICK, R2_GLOBALS._player._characterIndex);
-			break;
-		case 2:
-			R2_INVENTORY.setObjectScene(R2_FUEL_CELL, R2_GLOBALS._player._characterIndex);
-			break;
-		case 3:
-			R2_INVENTORY.setObjectScene(R2_GUIDANCE_MODULE, R2_GLOBALS._player._characterIndex);
-			break;
-		case 4:
-			R2_INVENTORY.setObjectScene(R2_RADAR_MECHANISM, R2_GLOBALS._player._characterIndex);
-			break;
-		case 5:
-			R2_INVENTORY.setObjectScene(R2_BATTERY, R2_GLOBALS._player._characterIndex);
-			break;
-		case 6:
-			R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, R2_GLOBALS._player._characterIndex);
-			break;
-		default:
-			break;
-		}
-
-		_junk[0].remove();
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	}
-	case 43:
-		R2_GLOBALS._scene1550JunkLocations[_junk[0]._junkNumber + 2] = 0;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			R2_GLOBALS._player.setVisage(1500);
-		else {
-			R2_GLOBALS._player.changeZoom(-1);
-			R2_GLOBALS._player.setVisage(1505);
-		}
-		R2_GLOBALS._player.animate(ANIM_MODE_1, this);
-		R2_GLOBALS._player.setStrip(8);
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 50:
-		// Removed (useless ?) call to sub_1D227
-		++_sceneMode;
-		setAction(&_sequenceManager1, this, 1591, &R2_GLOBALS._player, NULL);
-		if (g_globals->_sceneObjects->contains(&_companion))
-			signal();
-		else {
-			_companion.postInit();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				_companion.setVisage(1505);
-			else
-				_companion.setVisage(1500);
-			_companion.changeZoom(77);
-			_companion.setAction(&_sequenceManager2, this, 1590, &_companion, NULL);
-			_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
-		}
-		break;
-	case 51:
-		++_sceneMode;
-		break;
-	case 52:
-		_companion.changeZoom(-1);
-		_sceneMode = 1592;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			setAction(&_sequenceManager1, this, 1592, &R2_GLOBALS._player, &_companion,
-				&_junk[0], &_joystick, NULL);
-		else
-			setAction(&_sequenceManager1, this, 1593, &R2_GLOBALS._player, &_companion,
-				&_junk[0], &_joystick, NULL);
-		break;
-	case 61:
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		R2_GLOBALS._player._canWalk = false;
-		_dishMode = 2;
-		break;
-	case 62:
-		R2_GLOBALS._player.enableControl(CURSOR_TALK);
-		if (_dishMode == 2) {
-			R2_GLOBALS._player.enableControl(CURSOR_USE);
-			R2_GLOBALS._player._canWalk = false;
-		}
-		break;
-	case 70:
-		R2_GLOBALS._s1550PlayerArea[R2_SEEKER] = R2_GLOBALS._s1550PlayerArea[R2_QUINN];
-		//R2_GLOBALS._s1550PlayerAreas[0] = 1;
-		_sceneMode = 60;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(500, this);
+	case 70:
+		R2_GLOBALS._s1550PlayerArea[R2_SEEKER] = R2_GLOBALS._s1550PlayerArea[R2_QUINN];
+		//R2_GLOBALS._s1550PlayerAreas[0] = 1;
+		_sceneMode = 60;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(500, this);
 		break;
 	case 80:
 		if (R2_GLOBALS.getFlag(16)) {
@@ -3453,7191 +2574,5400 @@ void Scene1550::signal() {
 	// No break on purpose
 	case 1582:
 		_dontExit = false;
-		_wreckage2.remove();
-		R2_INVENTORY.setObjectScene(R2_FUEL_CELL, 0);
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1575:
-	// No break on purpose
-	case 1583:
-		_dontExit = false;
-		_wreckage2.remove();
-		R2_INVENTORY.setObjectScene(R2_BATTERY, 0);
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1576:
-	// No break on purpose
-	case 1584:
-		R2_GLOBALS._sceneManager.changeScene(1580);
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1577:
-	// No break on purpose
-	case 1578:
-		_sceneMode = 0;
-		_wreckage2.remove();
-		_dontExit = false;
-		R2_GLOBALS._player.fixPriority(-1);
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1585:
-		SceneItem::display(1550, 66, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1586:
-	// No break on purpose
-	case 1587:
-		R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, R2_GLOBALS._player._characterIndex);
-		_diagnosticsDisplay.remove();
-		_dontExit = false;
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1592:
-		_joystick.remove();
-		R2_INVENTORY.setObjectScene(R2_JOYSTICK, 1);
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			R2_GLOBALS._s1550PlayerArea[R2_SEEKER] = R2_GLOBALS._s1550PlayerArea[R2_QUINN];
-		} else {
-			R2_GLOBALS._s1550PlayerArea[R2_QUINN] = R2_GLOBALS._s1550PlayerArea[R2_SEEKER];
-		}
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		break;
-	default:
-		_sceneMode = 62;
-		setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
-		break;
-	}
-}
-
-void Scene1550::process(Event &event) {
-	if ((!R2_GLOBALS._player._canWalk) && (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN) && (event.eventType == EVENT_BUTTON_DOWN) && (this->_screenNumber == 1234)) {
-		int curReg = R2_GLOBALS._sceneRegions.indexOf(event.mousePos);
-		if (curReg == 0)
-			_dontExit = true;
-		else if (((R2_GLOBALS._player._position.y < 90) && (event.mousePos.y > 90)) || ((R2_GLOBALS._player._position.y > 90) && (event.mousePos.y < 90)))
-			_dontExit = true;
-		else
-			_dontExit = false;
-
-		if ((curReg == 13) || (curReg == 14))
-			_dontExit = false;
-	}
-
-	Scene::process(event);
-}
-
-void Scene1550::dispatch() {
-	Scene::dispatch();
-
-	// Arrays related to this scene are all hacky in the origina: they are based on the impossibility to use Miranda
-	assert ((R2_GLOBALS._player._characterIndex == R2_QUINN) || (R2_GLOBALS._player._characterIndex == R2_SEEKER));
-
-	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 15) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 16)) {
-		R2_GLOBALS._player._shade = 0;
-
-		// NOTE: Original game contains a switch based on an uninitialized variable.
-		// We're leaving this code here, but ifdef'ed out, in case we can ever figure out
-		// what the original programmers intended the value to come from
-#if 0
-		int missingVariable = 0;
-		switch (missingVariable) {
-		case 144:
-		// No break on purpose
-		case 146:
-			_dish._frame = 5;
-			R2_GLOBALS._player._shade = 3;
-			break;
-		case 148:
-		// No break on purpose
-		case 149:
-			_dish._frame = 1;
-		// No break on purpose
-		case 147:
-		// No break on purpose
-		case 150:
-			R2_GLOBALS._player._shade = 3;
-			break;
-		default:
-			break;
-		}
-#endif
-	}
-
-	if (_dontExit)
-		return;
-
-	switch (R2_GLOBALS._player.getRegionIndex() - 11) {
-	case 0:
-	// No break on purpose
-	case 5:
-		// Exiting the top of the screen
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1;
-		_dontExit = true;
-		--R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y;
-
-		enterArea();
-
-		R2_GLOBALS._player.setPosition(Common::Point( 160 - (((((160 - R2_GLOBALS._player._position.x) * 100) / 108) * 172) / 100), 145));
-		if (R2_GLOBALS._player._position.x < 160) {
-			Common::Point pt(R2_GLOBALS._player._position.x + 5, 135);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else if (R2_GLOBALS._player._position.x <= 160) { // the check is really in the original...
-			Common::Point pt(R2_GLOBALS._player._position.x, 135);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else {
-			Common::Point pt(R2_GLOBALS._player._position.x - 5, 135);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		}
-		break;
-	case 1:
-		// Exiting the bottom of the screen
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 3;
-		_dontExit = true;
-		++R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y;
-
-		enterArea();
-
-		R2_GLOBALS._player.setPosition(Common::Point( 160 - (((((160 - R2_GLOBALS._player._position.x) * 100) / 172) * 108) / 100), 19));
-		if (R2_GLOBALS._player._position.x < 160) {
-			Common::Point pt(R2_GLOBALS._player._position.x + 5, 29);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else if (R2_GLOBALS._player._position.x <= 160) { // the check is really in the original...
-			Common::Point pt(R2_GLOBALS._player._position.x, 29);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else {
-			Common::Point pt(R2_GLOBALS._player._position.x - 5, 29);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		}
-		break;
-	case 2:
-		// Exiting the right of the screen
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 5;
-		_dontExit = true;
-		++R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x;
-
-		enterArea();
-
-		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11) && (R2_GLOBALS._player._position.y > 50) && (R2_GLOBALS._player._position.y < 135)) {
-			if (R2_GLOBALS._player._position.y >= 85) {
-				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 10));
-				Common::Point pt(R2_GLOBALS._player._position.x + 30, R2_GLOBALS._player._position.y + 20);
-				NpcMover *mover = new NpcMover();
-				R2_GLOBALS._player.addMover(mover, &pt, this);
-			} else {
-				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 10));
-				Common::Point pt(R2_GLOBALS._player._position.x + 30, R2_GLOBALS._player._position.y - 20);
-				NpcMover *mover = new NpcMover();
-				R2_GLOBALS._player.addMover(mover, &pt, this);
-			}
-		} else {
-			R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y));
-			Common::Point pt(R2_GLOBALS._player._position.x + 10, R2_GLOBALS._player._position.y);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		}
-		break;
-	case 3:
-		// Exiting to the left of the screen
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 7;
-		_dontExit = true;
-		--R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x;
-
-		enterArea();
-
-		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 24) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11)) {
-			R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y / 2));
-			Common::Point pt(265, 29);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11) && (R2_GLOBALS._player._position.y > 50) && (R2_GLOBALS._player._position.y < 135)) {
-			if (R2_GLOBALS._player._position.y >= 85) {
-				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 10));
-				Common::Point pt(R2_GLOBALS._player._position.x - 30, R2_GLOBALS._player._position.y + 20);
-				NpcMover *mover = new NpcMover();
-				R2_GLOBALS._player.addMover(mover, &pt, this);
-			} else {
-				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 10));
-				Common::Point pt(R2_GLOBALS._player._position.x - 30, R2_GLOBALS._player._position.y - 20);
-				NpcMover *mover = new NpcMover();
-				R2_GLOBALS._player.addMover(mover, &pt, this);
-			}
-		} else {
-			R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y));
-			Common::Point pt(R2_GLOBALS._player._position.x - 10, R2_GLOBALS._player._position.y);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-void Scene1550::saveCharacter(int characterIndex) {
-	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
-		R2_GLOBALS._sound1.fadeOut2(NULL);
-
-	SceneExt::saveCharacter(characterIndex);
-}
-
-void Scene1550::Wall::setupWall(int frameNumber, int strip) {
-	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
-
-	postInit();
-	if (scene->_wallType == 2)
-		setup(1551, strip, frameNumber);
-	else
-		setup(1554, strip, frameNumber);
-
-	switch (strip) {
-	case 0:
-		switch (frameNumber - 1) {
-		case 0:
-			setup(1551, 1, 1);
-			setPosition(Common::Point(30, 67));
-			break;
-		case 1:
-			setup(1560, 1, 5);
-			setPosition(Common::Point(141, 54));
-			break;
-		case 2:
-			setup(1560, 2, 5);
-			setPosition(Common::Point(178, 54));
-			break;
-		case 3:
-			setup(1560, 2, 1);
-			setPosition(Common::Point(289, 67));
-			break;
-		case 4:
-			setup(1560, 2, 2);
-			setPosition(Common::Point(298, 132));
-			break;
-		case 5:
-			setup(1560, 1, 2);
-			setPosition(Common::Point(21, 132));
-			break;
-		case 6:
-			setup(1560, 2, 4);
-			setPosition(Common::Point(285, 123));
-			break;
-		case 7:
-			setup(1560, 1, 3);
-			setPosition(Common::Point(30, 111));
-			break;
-		case 8:
-			setup(1560, 2, 3);
-			setPosition(Common::Point(289, 111));
-			break;
-		case 9:
-			setup(1560, 1, 4);
-			setPosition(Common::Point(34, 123));
-			break;
-		default:
-			break;
-		}
-		fixPriority(1);
-		break;
-	case 1:
-		if (frameNumber == 3) {
-			setup(1553, 3, 1);
-			setPosition(Common::Point(48, 44));
-			fixPriority(2);
-		} else {
-			fixPriority(1);
-			setPosition(Common::Point(32, 17));
-		}
-
-		switch (frameNumber) {
-		case 2:
-			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		case 3:
-			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		default:
-			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		}
-		break;
-	case 2:
-		fixPriority(1);
-		switch (frameNumber) {
-		case 4:
-			setup(1553, 4, 1);
-			setPosition(Common::Point(48, 168));
-			break;
-		case 5:
-			setup(1553, 3, 2);
-			setPosition(Common::Point(20, 168));
-			fixPriority(250);
-			break;
-		default:
-			setPosition(Common::Point(28, 116));
-			break;
-		}
-
-		switch (frameNumber) {
-		case 2:
-			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		case 4:
-			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		case 5:
-			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		default:
-			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		}
-		break;
-	case 3:
-		switch (frameNumber) {
-		case 2:
-			fixPriority(2);
-			if (scene->_wallType == 2)
-				setup(1553, 2, 1);
-			else
-				setup(1556, 2, 1);
-			setPosition(Common::Point(160, 44));
-			break;
-		case 3:
-			fixPriority(2);
-			setup(1553, 5, 1);
-			setPosition(Common::Point(178, 44));
-			break;
-		default:
-			fixPriority(1);
-			setPosition(Common::Point(160, 17));
-			break;
-		}
-
-		if (frameNumber == 1)
-			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
-		else
-			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
-		break;
-	case 4:
-		if (frameNumber == 2) {
-			fixPriority(250);
-			if (scene->_wallType == 2)
-				setup(1553, 1, 1);
-			else
-				setup(1556, 1, 1);
-		} else {
-			fixPriority(2);
-		}
-
-		if (frameNumber != 1)
-			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
-
-		setPosition(Common::Point(160, 168));
-		break;
-	case 5:
-		fixPriority(1);
-		setPosition(Common::Point(287, 17));
-
-		switch (frameNumber) {
-		case 2:
-			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		case 3:
-			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		default:
-			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
-			break;
-		}
-		break;
-	case 6:
-		fixPriority(1);
-		setPosition(Common::Point(291, 116));
-
-		if (frameNumber == 2)
-			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
-		else
-			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
-		break;
-	default:
-		break;
-	}
-
-}
-
-void Scene1550::enterArea() {
-	_walkRegionsId = 0;
-	_dishMode = 0;
-
-	_wallCorner1.remove();
-	_westWall.remove();
-	_northWall.remove();
-	_southWall.remove();
-	_wallCorner2.remove();
-	_eastWall.remove();
-
-	for (int i = 0; i < 8; ++i)
-		_junk[i].remove();
-
-	_wreckage.remove();
-
-	for (int i = 0; i < 8; ++i)
-		_shipComponents[i].remove();
-
-	_airbag.remove();
-	_joystick.remove();
-	_gyroscope.remove();
-	_wreckage4.remove();
-	_diagnosticsDisplay.remove();
-
-	if ((_sceneMode != 1577) && (_sceneMode != 1578))
-		_wreckage2.remove();
-
-	_wreckage3.remove();
-	_companion.remove();
-	_dish.remove();
-	_dishTowerShadow.remove();
-	_dishTower.remove();
-	_walkway.remove();
-
-	// Set up of special walk regions for certain areas
-	switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y) {
-	case 0:
-		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
-		case 3:
-			R2_GLOBALS._walkRegions.load(1554);
-			_walkRegionsId = 1554;
-			break;
-		case 4:
-			R2_GLOBALS._walkRegions.load(1553);
-			_walkRegionsId = 1553;
-			break;
-		default:
-			break;
-		}
-		break;
-	case 3:
-	// No break on purpose
-	case 4:
-		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 23) || (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x)) {
-			if (!R2_GLOBALS.getFlag(16)) {
-				R2_GLOBALS._walkRegions.load(1559);
-				_walkRegionsId = 1559;
-			}
-		}
-		break;
-	case 7:
-		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
-		case 10:
-			R2_GLOBALS._walkRegions.load(1555);
-			_walkRegionsId = 1555;
-			break;
-		case 11:
-			R2_GLOBALS._walkRegions.load(1556);
-			_walkRegionsId = 1556;
-			break;
-		default:
-			break;
-		}
-		break;
-	case 11:
-		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
-		case 24:
-			R2_GLOBALS._walkRegions.load(1558);
-			_walkRegionsId = 1558;
-			break;
-		case 25:
-			R2_GLOBALS._walkRegions.load(1557);
-			_walkRegionsId = 1557;
-			break;
-		default:
-			break;
-		}
-		break;
-	case 16:
-		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
-		case 2:
-			R2_GLOBALS._walkRegions.load(1552);
-			_walkRegionsId = 1552;
-			break;
-		case 3:
-			R2_GLOBALS._walkRegions.load(1551);
-			_walkRegionsId = 1551;
-			break;
-		case 15:
-			R2_GLOBALS._walkRegions.load(1575);
-			_walkRegionsId = 1575;
-		default:
-			break;
-		}
-		break;
-	default:
-		break;
-	}
-
-	int varA = 0;
-
-	// This section handles checks if the ARM spacecraft have not yet seized
-	// control of Lance of Truth.
-	if (!R2_GLOBALS.getFlag(16)) {
-		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y - 2) {
-		case 0:
-			switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x - 22) {
-				case 0:
-					varA = 1553;
-					_northWall.setupWall(6, 0);
-					break;
-				case 1:
-				// No break on purpose
-				case 2:
-				// No break on purpose
-				case 3:
-				// No break on purpose
-				case 4:
-					varA = 1553;
-					break;
-				case 5:
-					varA = 1553;
-					_northWall.setupWall(6, 0);
-					break;
-				default:
-					break;
-			}
-			break;
-		case 1:
-		// No break on purpose
-		case 2:
-			switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x - 21) {
-			case 0:
-				varA = 1550;
-				_northWall.setupWall(9, 0);
-				break;
-			case 1:
-				varA = 1552;
-				_northWall.setupWall(10, 0);
-				break;
-			case 2:
-			// No break on purpose
-			case 3:
-			// No break on purpose
-			case 4:
-			// No break on purpose
-			case 5:
-				varA = 1552;
-				break;
-			case 6:
-				varA = 1552;
-				_northWall.setupWall(7, 0);
-				break;
-			case 7:
-				varA = 1550;
-				_northWall.setupWall(8, 0);
-				break;
-			default:
-				break;
-			}
-			break;
-		case 3:
-			switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x - 21) {
-			case 0:
-				varA = 1550;
-				_northWall.setupWall(4, 0);
-				break;
-			case 1:
-				varA = 1550;
-				_northWall.setupWall(3, 0);
-				break;
-			case 2:
-			// No break on purpose
-			case 3:
-			// No break on purpose
-			case 4:
-			// No break on purpose
-			case 5:
-				varA = 1551;
-				break;
-			case 6:
-				varA = 1550;
-				_northWall.setupWall(2, 0);
-				break;
-			case 7:
-				varA = 1550;
-				_northWall.setupWall(1, 0);
-				break;
-			default:
-				break;
-			}
-			break;
-		default:
-			break;
-		}
-		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 0) &&
-				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x <= 29) &&
-				((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x < 20) ||
-				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 7))) {
-			// In an area where the cutscene can be triggered, so start it
-			R2_GLOBALS.setFlag(16);
-			R2_GLOBALS._sceneManager.changeScene(1500);
-		}
-	}
-
-	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) &&
-			(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11)) {
-		if (_screenNumber != 1234) {
-			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
-			loadScene(1234);
-			R2_GLOBALS._sceneManager._hasPalette = false;
-			_wallType = 0;
-		}
-	} else if (_screenNumber == 1234) {
-		R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
-		loadScene(1550);
-		R2_GLOBALS._sceneManager._hasPalette = false;
-	}
-
-	if (_screenNumber == 1234)
-		_walkRegionsId = 1576;
-
-	if (_wallType == 0) {
-		_wallType = 1;
-	} else {
-		if (_wallType == 2) {
-			_wallType = 3;
-		} else {
-			_wallType = 2;
-		}
-
-		if (R2_GLOBALS._sceneManager._sceneNumber == 1550){
-#if 0
-			warning("Mouse_hideIfNeeded()");
-			warning("gfx_set_pane_p");
-			for (int i = 3; i != 168; ++i) {
-				warning("sub294D2(4, i, 312,  var14C)");
-				warning("missing for loop, to be implemented");
-				warning("gfx_draw_slice");
-			}
-			warning("gfx_flip_screen()");
-			warning("gfx_set_pane_p()");
-#endif
-			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
-
-			if (varA == 0) {
-				if (_sceneResourceId != 1550) {
-					g_globals->_scenePalette.loadPalette(1550);
-					R2_GLOBALS._sceneManager._hasPalette = true;
-				}
-			} else {
-				g_globals->_scenePalette.loadPalette(varA);
-				R2_GLOBALS._sceneManager._hasPalette = true;
-			}
-
-			if (R2_GLOBALS._sceneManager._hasPalette)
-				_sceneResourceId = varA;
-
-//			warning("sub_2C429()");
-		}
-	}
-
-	// Scene setup dependent on the type of cell specified in the scene map
-	switch (scene1550AreaMap[(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y * 30) +
-		R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x]) {
-	case 0:
-		// Standard cell
-		if (_walkRegionsId == 0) {
-			R2_GLOBALS._walkRegions.load(1550);
-			_walkRegionsId = 1550;
-		}
-		break;
-	case 1:
-		// North end of the spaceport
-		if (_walkRegionsId == 0) {
-			R2_GLOBALS._walkRegions.load(1560);
-			_walkRegionsId = 1560;
-		}
-		_wallCorner1.setupWall(2, 1);
-		_northWall.setupWall(1, 3);
-		_wallCorner2.setupWall(2, 5);
-		break;
-	case 2:
-		R2_GLOBALS._walkRegions.load(1561);
-		_walkRegionsId = 1561;
-		_wallCorner1.setupWall(2, 1);
-		_westWall.setupWall(2, 2);
-		_northWall.setupWall(1, 3);
-		_wallCorner2.setupWall(2, 5);
-		break;
-	case 3:
-		R2_GLOBALS._walkRegions.load(1562);
-		_walkRegionsId = 1562;
-		_wallCorner1.setupWall(2, 1);
-		_northWall.setupWall(1, 3);
-		_wallCorner2.setupWall(2, 5);
-		_eastWall.setupWall(2, 6);
-		break;
-	case 4:
-		R2_GLOBALS._walkRegions.load(1563);
-		_walkRegionsId = 1563;
-		_northWall.setupWall(2, 3);
-		break;
-	case 5:
-		R2_GLOBALS._walkRegions.load(1564);
-		_walkRegionsId = 1564;
-		_southWall.setupWall(2, 4);
-		break;
-	case 6:
-		R2_GLOBALS._walkRegions.load(1565);
-		_walkRegionsId = 1565;
-		_wallCorner1.setupWall(1, 1);
-		_westWall.setupWall(1, 2);
-		_northWall.setupWall(3, 3);
-		break;
-	case 7:
-		R2_GLOBALS._walkRegions.load(1566);
-		_walkRegionsId = 1566;
-		_wallCorner1.setupWall(1, 1);
-		_westWall.setupWall(1, 2);
-		_northWall.setupWall(2, 4);
-		break;
-	case 8:
-		R2_GLOBALS._walkRegions.load(1567);
-		_walkRegionsId = 1567;
-		_westWall.setupWall(5, 2);
-		break;
-	case 9:
-		R2_GLOBALS._walkRegions.load(1568);
-		_walkRegionsId = 1568;
-		_westWall.setupWall(4, 2);
-		break;
-	case 10:
-		R2_GLOBALS._walkRegions.load(1569);
-		_walkRegionsId = 1569;
-		_wallCorner1.setupWall(3, 1);
-		break;
-	case 11:
-		R2_GLOBALS._walkRegions.load(1570);
-		_walkRegionsId = 1570;
-		_wallCorner1.setupWall(1, 1);
-		_westWall.setupWall(1, 2);
-		break;
-	case 12:
-		R2_GLOBALS._walkRegions.load(1571);
-		_walkRegionsId = 1571;
-		_wallCorner2.setupWall(1, 5);
-		_eastWall.setupWall(1, 6);
-		break;
-	case 13:
-		R2_GLOBALS._walkRegions.load(1572);
-		_walkRegionsId = 1572;
-		_wallCorner1.setupWall(1, 1);
-		_westWall.setupWall(1, 2);
-		_southWall.setupWall(1, 4);
-		break;
-	case 14:
-		R2_GLOBALS._walkRegions.load(1573);
-		_walkRegionsId = 1573;
-		_southWall.setupWall(1, 4);
-		_wallCorner2.setupWall(1, 5);
-		_eastWall.setupWall(1, 6);
-		break;
-	case 15:
-		// South wall
-		R2_GLOBALS._walkRegions.load(1574);
-		_walkRegionsId = 1574;
-		_southWall.setupWall(1, 4);
-		break;
-	case 16:
-		R2_GLOBALS._walkRegions.load(1570);
-		_walkRegionsId = 1570;
-		_wallCorner1.setupWall(2, 1);
-		_westWall.setupWall(2, 2);
-		break;
-	case 17:
-		R2_GLOBALS._walkRegions.load(1570);
-		_walkRegionsId = 1570;
-		_wallCorner1.setupWall(2, 1);
-		_westWall.setupWall(3, 2);
-		break;
-	case 18:
-		R2_GLOBALS._walkRegions.load(1571);
-		_walkRegionsId = 1571;
-		_wallCorner2.setupWall(2, 5);
-		_eastWall.setupWall(2, 6);
-		break;
-	case 19:
-		R2_GLOBALS._walkRegions.load(1571);
-		_walkRegionsId = 1571;
-		_wallCorner2.setupWall(2, 5);
-		_eastWall.setupWall(3, 6);
-		break;
-	default:
-		break;
-	}
-
-	int di = 0;
-	int tmpIdx = 0;
-	for (int i = 0; i < 127 * 4; i += 4) {
-		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == R2_GLOBALS._scene1550JunkLocations[i]) &&
-				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == R2_GLOBALS._scene1550JunkLocations[i + 1]) &&
-				(R2_GLOBALS._scene1550JunkLocations[i + 2] != 0)) {
-			tmpIdx = R2_GLOBALS._scene1550JunkLocations[i + 3];
-			_junk[di].postInit();
-			_junk[di]._effect = EFFECT_SHADED2;
-			_junk[di]._shade = 0;
-			//_junk[di]._junkState = tmpIdx;
-			_junk[di]._junkNumber = i;
-			_junk[di].setDetails(1550, 62, -1, 63, 2, (SceneItem *) NULL);
-			if (R2_GLOBALS._scene1550JunkLocations[i + 2] == 41) {
-				_junk[di].changeZoom(-1);
-				_junk[di].setPosition(Common::Point(150, 70));
-				_junk[di].setup(1562, 1, 1);
-
-				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[2]);
-				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[3]);
-				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[6]);
-				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[7]);
-
-				if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) {
-					_joystick.postInit();
-					_joystick.setup(1562, 3, 1);
-					_joystick.setPosition(Common::Point(150, 70));
-					_joystick.fixPriority(10);
-					_joystick.setDetails(1550, 41, -1, 42, 2, (SceneItem *) NULL);
-				}
-			} else {
-				if (R2_GLOBALS._scene1550JunkLocations[i + 2] > 40) {
-					_junk[di].changeZoom(100);
-					_junk[di].setup(1561, 1, R2_GLOBALS._scene1550JunkLocations[i + 2] - 40);
-				} else {
-					_junk[di].changeZoom(-1);
-					_junk[di].setup(1552, ((R2_GLOBALS._scene1550JunkLocations[i + 2] - 1) / 5) + 1, ((R2_GLOBALS._scene1550JunkLocations[i + 2] - 1) % 5) + 1);
-				}
-				_junk[di].setPosition(Common::Point(scene1550JunkX[tmpIdx], scene1550JunkY[tmpIdx]));
-				if (scene1550JunkRegions[tmpIdx] != 0)
-					R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[tmpIdx]);
-				di++;
-			}
-		}
-	}
-
-	// Loop for detecting and setting up certain special areas within the map
-	for (int i = 0; i < 15 * 3; i += 3) {
-		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == scene1550SpecialAreas[i])
-				&& (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == scene1550SpecialAreas[i + 1])) {
-			int areaType = scene1550SpecialAreas[i + 2];
-			switch (areaType) {
-			case 1:
-				if (!R2_GLOBALS.getFlag(16)) {
-					_wreckage2.postInit();
-					if (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 3)
-						_wreckage2.setup(1555, 2, 1);
-					else
-						_wreckage2.setup(1555, 1, 1);
-					_wreckage2.setPosition(Common::Point(150, 100));
-					_wreckage2.fixPriority(92);
-					_wreckage2.setDetails(1550, 73, -1, -1, 2, (SceneItem *) NULL);
-				}
-				break;
-			case 2:
-				_dish.postInit();
-				if (R2_GLOBALS.getFlag(19))
-					_dish.setup(1556, 3, 5);
-				else
-					_dish.setup(1556, 3, 1);
-				_dish.changeZoom(95);
-				_dish.setPosition(Common::Point(165, 83));
-				_dish.fixPriority(168);
-				_dish.setDetails(1550, 17, -1, 19, 2, (SceneItem *) NULL);
-
-				_dishTower.postInit();
-				_dishTower.setup(1556, 4, 1);
-				_dishTower.setPosition(Common::Point(191, 123));
-				_dishTower.changeZoom(95);
-				_dishTower.setDetails(1550, 65, -1, 66, 2, (SceneItem *) NULL);
-
-				_dishTowerShadow.postInit();
-				_dishTowerShadow._numFrames = 5;
-				if (R2_GLOBALS.getFlag(19))
-					_dishTowerShadow.setup(1556, 8, 5);
-				else
-					_dishTowerShadow.setup(1556, 8, 1);
-
-				_dishTowerShadow.setPosition(Common::Point(156, 151));
-				_dishTowerShadow.fixPriority(10);
-
-				_walkway.postInit();
-				if (R2_GLOBALS.getFlag(20))
-					_walkway.setup(1558, 3, 10);
-				else
-					_walkway.setup(1558, 3, 1);
-
-				_walkway.setPosition(Common::Point(172, 48));
-				_walkway.fixPriority(169);
-				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[15]);
-				break;
-			case 3:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 1, 1);
-				_wreckage.setPosition(Common::Point(259, 55));
-				_wreckage.fixPriority(133);
-				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage2.postInit();
-				_wreckage2.setup(1550, 1, 2);
-				_wreckage2.setPosition(Common::Point(259, 133));
-				_wreckage2.fixPriority(105);
-				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 1550) {
-					_gyroscope.postInit();
-					_gyroscope.setup(1550, 7, 2);
-					_gyroscope.setPosition(Common::Point(227, 30));
-					_gyroscope.fixPriority(130);
-					_gyroscope.setDetails(1550, 29, -1, 63, 2, (SceneItem *) NULL);
-				}
-				break;
-			case 4:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 1, 4);
-				_wreckage.setPosition(Common::Point(76, 131));
-				_wreckage.fixPriority(10);
-				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage2.postInit();
-				_wreckage2.setup(1550, 1, 3);
-				_wreckage2.setPosition(Common::Point(76, 64));
-				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1550) {
-					_diagnosticsDisplay.postInit();
-					_diagnosticsDisplay.setup(1504, 4, 1);
-					_diagnosticsDisplay.setPosition(Common::Point(49, 35));
-					_diagnosticsDisplay.animate(ANIM_MODE_2, NULL);
-					_diagnosticsDisplay._numFrames = 4;
-					_diagnosticsDisplay.fixPriority(65);
-					_diagnosticsDisplay.setDetails(1550, 14, 15, 63, 2, (SceneItem *) NULL);
-				}
-				if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1550) {
-					_airbag.postInit();
-					_airbag.setup(1550, 7, 1);
-					_airbag.setPosition(Common::Point(45, 44));
-					_airbag.fixPriority(150);
-					_airbag.setDetails(1550, 44, -1, 63, 2, (SceneItem *) NULL);
-				}
-				break;
-			case 5:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 2, 4);
-				_wreckage.setPosition(Common::Point(243, 131));
-				_wreckage.fixPriority(10);
-				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage2.postInit();
-				_wreckage2.setup(1550, 2, 3);
-				_wreckage2.setPosition(Common::Point(243, 64));
-				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				break;
-			case 6:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 2, 1);
-				_wreckage.setPosition(Common::Point(60, 55));
-				_wreckage.fixPriority(133);
-				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage2.postInit();
-				_wreckage2.setup(1550, 2, 2);
-				_wreckage2.setPosition(Common::Point(60, 133));
-				_wreckage2.fixPriority(106);
-				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				break;
-			case 7:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 3, 1);
-				_wreckage.setPosition(Common::Point(281, 132));
-				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-				break;
-			case 8:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 3, 2);
-				_wreckage.setPosition(Common::Point(57, 96));
-				_wreckage.fixPriority(70);
-				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage2.postInit();
-				_wreckage2.setup(1550, 3, 3);
-				_wreckage2.setPosition(Common::Point(145, 88));
-				_wreckage2.fixPriority(55);
-				_wreckage2.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage3.postInit();
-				_wreckage3.setup(1550, 3, 4);
-				_wreckage3.setPosition(Common::Point(64, 137));
-				_wreckage3.fixPriority(115);
-				_wreckage3.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage4.postInit();
-				_wreckage4.setup(1550, 5, 1);
-				_wreckage4.setPosition(Common::Point(60, 90));
-				_wreckage4.fixPriority(45);
-				break;
-			case 9:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 4, 2);
-				_wreckage.setPosition(Common::Point(262, 96));
-				_wreckage.fixPriority(70);
-				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage2.postInit();
-				_wreckage2.setup(1550, 4, 3);
-				_wreckage2.setPosition(Common::Point(174, 88));
-				_wreckage2.fixPriority(55);
-				_wreckage2.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage3.postInit();
-				_wreckage3.setup(1550, 4, 4);
-				_wreckage3.setPosition(Common::Point(255, 137));
-				_wreckage3.fixPriority(115);
-				_wreckage3.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-
-				_wreckage4.postInit();
-				_wreckage4.setup(1550, 6, 1);
-				_wreckage4.setPosition(Common::Point(259, 90));
-				_wreckage4.fixPriority(45);
-				break;
-			case 10:
-				_wreckage.postInit();
-				_wreckage.setup(1550, 4, 1);
-				_wreckage.setPosition(Common::Point(38, 132));
-				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
-				break;
-			case 12:
-				// Intact ship
-				_shipComponents[7].setupShipComponent(8);
-				_shipComponents[0].setupShipComponent(1);
-				_shipComponents[1].setupShipComponent(2);
-				_shipComponents[2].setupShipComponent(3);
-				_shipComponents[3].setupShipComponent(4);
-				_shipComponents[4].setupShipComponent(5);
-				_shipComponents[5].setupShipComponent(6);
-				_shipComponents[6].setupShipComponent(7);
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	if (R2_GLOBALS._s1550PlayerArea[R2_QUINN] == R2_GLOBALS._s1550PlayerArea[R2_SEEKER]) {
-		_companion.postInit();
-		_companion._effect = EFFECT_SHADED2;
-		_companion.changeZoom(-1);
-
-		assert((_walkRegionsId >= 1550) && (_walkRegionsId <= 2008));
-		R2_GLOBALS._walkRegions.disableRegion(k5A750[_walkRegionsId - 1550]);
-		_companion.setPosition(Common::Point(scene1550JunkX[k5A76D[_walkRegionsId - 1550]], scene1550JunkY[k5A76D[_walkRegionsId - 1550]] + 8));
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			if (R2_GLOBALS._player._characterScene[R2_SEEKER] == 1580) {
-				_companion.setup(1516, 3, 17);
-				_companion.setPosition(Common::Point(272, 94));
-				_companion.fixPriority(91);
-				_companion.changeZoom(100);
-				_companion.setDetails(1550, -1, -1, -1, 5, &_shipComponents[7]);
-			} else {
-				_companion.setup(1505, 6, 1);
-				_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
-			}
-		} else {
-			if (R2_GLOBALS._player._characterScene[R2_QUINN] == 1580) {
-				_companion.setup(1516, 2, 14);
-				_companion.setPosition(Common::Point(276, 97));
-				_companion.fixPriority(91);
-				_companion.changeZoom(100);
-				_companion.setDetails(1550, -1, -1, -1, 5, &_shipComponents[7]);
-			} else {
-				_companion.setup(1500, 6, 1);
-				_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
-			}
-		}
-	}
-	R2_GLOBALS._uiElements.updateInventory();
-}
-
-/*--------------------------------------------------------------------------
- * Scene 1575 - Spaceport - unused ship scene
- *
- *--------------------------------------------------------------------------*/
-
-Scene1575::Button::Button() {
-	_buttonId = 0;
-	_pressed = false;
-}
-
-void Scene1575::Button::synchronize(Serializer &s) {
-	NamedHotspot::synchronize(s);
-
-	s.syncAsSint16LE(_buttonId);
-	s.syncAsSint16LE(_pressed);
-}
-
-void Scene1575::Button::process(Event &event) {
-	Scene1575 *scene = (Scene1575 *)R2_GLOBALS._sceneManager._scene;
-	bool isInBounds = _bounds.contains(event.mousePos);
-	CursorType cursor = R2_GLOBALS._events.getCursor();
-
-	if ((event.eventType == EVENT_BUTTON_DOWN && cursor == CURSOR_USE && isInBounds) ||
-		(_pressed && _buttonId != 1 && event.eventType == EVENT_BUTTON_UP && isInBounds)) {
-		// Button pressed
-		_pressed = true;
-		Common::Point pos = scene->_actor1._position;
-		event.handled = true;
-
-		if (!R2_GLOBALS.getFlag(18) || _buttonId <= 1 || _buttonId >= 6) {
-			switch (_buttonId) {
-			case 1:
-				if (R2_GLOBALS.getFlag(18)) {
-					scene->_actor14.hide();
-					scene->_actor15.hide();
-					R2_GLOBALS.clearFlag(18);
-				} else if ((scene->_actor12._position.x == 85) && (scene->_actor12._position.y == 123)) {
-					scene->_actor14.show();
-					scene->_actor15.show();
-					R2_GLOBALS.setFlag(18);
-				} else {
-					SceneItem::display("That's probably not a good thing, ya know!");
-				}
-				break;
-			case 2:
-				if (scene->_field41A < 780) {
-					if (pos.x > 54)
-						pos.x -= 65;
-					pos.x += 2;
-					scene->_field41A += 2;
-
-					for (int i = 0; i < 17; i++)
-						scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x + 2, scene->_arrActor[i]._position.y));
-
-					scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x + 2, scene->_actor13._position.y));
-					scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x + 2, scene->_actor12._position.y));
-					scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
-					scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
-					scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
-				}
-				break;
-			case 3:
-				if (scene->_field41A > 0) {
-					if (pos.x < -8)
-						pos.x += 65;
-
-					pos.x -= 2;
-					scene->_field41A -= 2;
-					for (int i = 0; i < 17; i++)
-						scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x - 2, scene->_arrActor[i]._position.y));
-
-					scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x - 2, scene->_actor13._position.y));
-					scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x - 2, scene->_actor12._position.y));
-					scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
-					scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
-					scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
-				}
-				break;
-			case 4: {
-					if (pos.y < 176) {
-						++pos.y;
-						for (int i = 0; i < 17; ++i)
-							scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x, scene->_arrActor[i]._position.y + 1));
-
-						scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x, scene->_actor13._position.y + 1));
-						scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x, scene->_actor12._position.y + 1));
-						scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
-						scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
-						scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
-					}
-				}
-				break;
-			case 5: {
-					if (pos.y > 145) {
-						--pos.y;
-						for (int i = 0; i < 17; ++i)
-							scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x, scene->_arrActor[i]._position.y - 1));
-
-						scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x, scene->_actor13._position.y - 1));
-						scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x, scene->_actor12._position.y - 1));
-						scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
-						scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
-						scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
-					}
-				}
-				break;
-			case 6:
-				R2_GLOBALS._sceneManager.changeScene(1550);
-				break;
-			default:
-				break;
-			}
-
-			int j = 0;
-			for (int i = 0; i < 17; i++) {
-				if (scene->_arrActor[i]._bounds.contains(85, 116))
-					j = i;
-			}
-
-			if (scene->_actor13._bounds.contains(85, 116))
-				j = 18;
-
-			if (scene->_actor12._bounds.contains(85, 116))
-				j = 19;
-
-			if (j)
-				scene->_actor11.show();
-			else
-				scene->_actor11.hide();
-		} else {
-			SceneItem::display("Better not move the laser while it's firing!");
-		}
-	} else {
-		_pressed = false;
-	}
-}
-
-bool Scene1575::Button::startAction(CursorType action, Event &event) {
-	if (action == CURSOR_USE)
-		return false;
-	return SceneHotspot::startAction(action, event);
-}
-
-void Scene1575::Button::initButton(int buttonId) {
-	_buttonId = buttonId;
-	_pressed = false;
-	EventHandler::postInit();
-
-	switch (_buttonId) {
-	case 1:
-		setDetails(Rect(53, 165, 117, 190), -1, -1, -1, 2, 1, NULL);
-		break;
-	case 2:
-		setDetails(Rect(151, 142, 189, 161), -1, -1, -1, 2, 1, NULL);
-		break;
-	case 3:
-		setDetails(Rect(225, 142, 263, 161), -1, -1, -1, 2, 1, NULL);
-		break;
-	case 4:
-		setDetails(Rect(188, 122, 226, 140), -1, -1, -1, 2, 1, NULL);
-		break;
-	case 5:
-		setDetails(Rect(188, 162, 226, 180), -1, -1, -1, 2, 1, NULL);
-		break;
-	case 6:
-		setDetails(Rect(269, 169, 301, 185), -1, -1, -1, 2, 1, NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-/*--------------------------------------------------------------------------*/
-
-Scene1575::Scene1575() {
-	_field412 = 0;
-	_field414 = 390;
-	_field416 = 0;
-	_field418 = 0;
-	_field41A = 0;
-}
-
-void Scene1575::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
-
-	s.syncAsSint16LE(_field412);
-	s.syncAsSint16LE(_field414);
-	s.syncAsSint16LE(_field416);
-	s.syncAsSint16LE(_field418);
-	s.syncAsSint16LE(_field41A);
-}
-
-double hypotenuse(double v1, double v2) {
-	return sqrt(v1 * v1 + v2 * v2);
-}
-
-void Scene1575::postInit(SceneObjectList *OwnerList) {
-	loadScene(1575);
-	R2_GLOBALS._uiElements._active = false;
-	SceneExt::postInit();
-	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
-
-	_actor1.postInit();
-	_actor1.setup(1575, 1, 1);
-	_actor1.setPosition(Common::Point(54, 161));
-	_actor1.fixPriority(5);
-
-	_actor2.postInit();
-	_actor2.setup(1575, 1, 1);
-	_actor2.setPosition(Common::Point(119, 161));
-	_actor2.fixPriority(5);
-
-	_actor3.postInit();
-	_actor3.setup(1575, 1, 1);
-	_actor3.setPosition(Common::Point(184, 161));
-	_actor3.fixPriority(5);
-
-	for (int i = 0; i < 17; i++) {
-		_arrActor[i].postInit();
-		_arrActor[i].setup(1575, 2, k5A7F6[3 * i + 2]);
-
-		double v1 = hypotenuse(2.0, 3 - k5A7F6[3 * i]);
-		v1 += hypotenuse(2.0, 3 - k5A7F6[3 * i + 1]);
-		int yp = (int)(sqrt(v1) * 75.0 / 17.0 - 161.0);
-
-		int angle = R2_GLOBALS._gfxManagerInstance.getAngle(
-			Common::Point(3, 16), Common::Point(k5A7F6[3 * i], k5A7F6[3 * i + 1]));
-		int xp = angle * 78 / 9 - 319;
-
-		_arrActor[i].setPosition(Common::Point(xp, yp));
-		_arrActor[i].fixPriority(6);
-	}
-
-	_actor4.postInit();
-	_actor4.setup(1575, 3, 1);
-	_actor4.setPosition(Common::Point(48, 81));
-
-	_actor5.postInit();
-	_actor5.setup(1575, 3,1);
-	_actor5.setPosition(Common::Point(121, 81));
-
-	_actor6.postInit();
-	_actor6.setup(1575, 3, 2);
-	_actor6.setPosition(Common::Point(203, 80));
-
-	_actor7.postInit();
-	_actor7.setup(1575, 3, 2);
-	_actor7.setPosition(Common::Point(217, 80));
-
-	_actor8.postInit();
-	_actor8.setup(1575, 3, 2);
-	_actor8.setPosition(Common::Point(231, 80));
-
-	_actor9.postInit();
-	_actor9.setup(1575, 3, 2);
-	_actor9.setPosition(Common::Point(273, 91));
-
-	_actor10.postInit();
-	_actor10.setup(1575, 3, 2);
-	_actor10.setPosition(Common::Point(287, 91));
-
-	// Initialize buttons
-	_button1.initButton(1);
-	_button2.initButton(2);
-	_button3.initButton(3);
-	_button4.initButton(4);
-	_button5.initButton(5);
-	_button6.initButton(6);
-
-	_actor11.postInit();
-	_actor11.setup(1575, 4, 2);
-	_actor11.setPosition(Common::Point(84, 116));
-	_actor11.hide();
-
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.hide();
-	R2_GLOBALS._player.enableControl();
-
-	do {
-		_field412 = R2_GLOBALS._randomSource.getRandomNumber(20) - 10;
-		_field414 = R2_GLOBALS._randomSource.getRandomNumber(20) - 10;
-	} while ((_field412) && (_field414));
-
-	if (_field412 < 0)
-		_actor4.hide();
-
-	if (_field414 < 0)
-		_actor5.hide();
-
-	_field416 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
-	_field418 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
-
-	_actor13.postInit();
-	_actor13.setup(1575, 2, 4);
-
-	// TODO
-	warning("TODO: another immense pile of floating operations");
-
-	_actor12.postInit();
-	_actor12.fixPriority(12);
-
-	if (R2_GLOBALS.getFlag(17)) {
-		_actor13.setPosition(Common::Point(_actor13._position.x + 5, _actor13._position.y));
-		_actor12.setPosition(Common::Point(_actor12._position.x + 5, _actor12._position.y));
-	}
-
-	_actor14.postInit();
-	_actor14.setup(1575, 5, 1);
-	_actor14.setPosition(Common::Point(85, 176));
-	_actor14.fixPriority(7);
-	_actor14.hide();
-
-	_actor15.postInit();
-	_actor15.setup(1575, 5, 2);
-	_actor15.setPosition(Common::Point(85, 147));
-	_actor15.fixPriority(7);
-	_actor15.hide();
-}
-
-void Scene1575::remove() {
-	SceneExt::remove();
-	R2_GLOBALS._uiElements._active = true;
-}
-
-void Scene1575::signal() {
-	R2_GLOBALS._player.enableControl();
-}
-
-void Scene1575::process(Event &event) {
-	Scene::process(event);
-
-	g_globals->_sceneObjects->recurse(SceneHandler::dispatchObject);
-}
-
-void Scene1575::dispatch() {
-	if (_field412 <= 0) {
-		++_field412;
-		if (_field412 == 0) {
-			_actor4.show();
-			_field412 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
-		}
-	} else {
-		_field412--;
-		if (_field412 ==0) {
-			_actor4.hide();
-			_field412 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
-		}
-	}
-
-	if (_field414 <= 0) {
-		++_field414;
-		if (_field414 == 0) {
-			_actor5.show();
-			_field414 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
-		}
-	} else {
-		_field414--;
-		if (_field414 == 0) {
-			_actor5.hide();
-			_field414 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
-		}
-	}
-
-	if (_field416 == 0) {
-		switch(R2_GLOBALS._randomSource.getRandomNumber(3)) {
-		case 0:
-			_actor6.hide();
-			_actor7.hide();
-			_actor8.hide();
-			break;
-		case 1:
-			_actor6.show();
-			_actor7.hide();
-			_actor8.hide();
-			break;
-		case 2:
-			_actor6.show();
-			_actor7.show();
-			_actor8.hide();
-			break;
-		case 3:
-			_actor6.show();
-			_actor7.show();
-			_actor8.show();
-			break;
-		default:
-			break;
-		}
-		_field416 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
-	} else {
-		--_field416;
-	}
-
-	if (_field418 == 0) {
-		switch(R2_GLOBALS._randomSource.getRandomNumber(2)) {
-		case 0:
-			_actor9.hide();
-			_actor10.hide();
-			break;
-		case 1:
-			_actor9.show();
-			_actor10.hide();
-			break;
-		case 2:
-			_actor9.show();
-			_actor10.show();
-			break;
-		default:
-			break;
+		_wreckage2.remove();
+		R2_INVENTORY.setObjectScene(R2_FUEL_CELL, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1575:
+	// No break on purpose
+	case 1583:
+		_dontExit = false;
+		_wreckage2.remove();
+		R2_INVENTORY.setObjectScene(R2_BATTERY, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1576:
+	// No break on purpose
+	case 1584:
+		R2_GLOBALS._sceneManager.changeScene(1580);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1577:
+	// No break on purpose
+	case 1578:
+		_sceneMode = 0;
+		_wreckage2.remove();
+		_dontExit = false;
+		R2_GLOBALS._player.fixPriority(-1);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1585:
+		SceneItem::display(1550, 66, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1586:
+	// No break on purpose
+	case 1587:
+		R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, R2_GLOBALS._player._characterIndex);
+		_diagnosticsDisplay.remove();
+		_dontExit = false;
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1592:
+		_joystick.remove();
+		R2_INVENTORY.setObjectScene(R2_JOYSTICK, 1);
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._s1550PlayerArea[R2_SEEKER] = R2_GLOBALS._s1550PlayerArea[R2_QUINN];
+		} else {
+			R2_GLOBALS._s1550PlayerArea[R2_QUINN] = R2_GLOBALS._s1550PlayerArea[R2_SEEKER];
 		}
-		_field418 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
-	} else {
-		_field418--;
-	}
-	Scene::dispatch();
-}
-
-/*--------------------------------------------------------------------------
- * Scene 1580 - Inside wreck
- *
- *--------------------------------------------------------------------------*/
-
-Scene1580::Scene1580() {
-}
-
-void Scene1580::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
-}
-
-bool Scene1580::JoystickPlug::startAction(CursorType action, Event &event) {
-	if (action == R2_JOYSTICK) {
-		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
-
-		R2_INVENTORY.setObjectScene(R2_JOYSTICK, 1580);
-		R2_GLOBALS._sceneItems.remove(&scene->_joystickPlug);
-		scene->_joystick.postInit();
-		scene->_joystick.setup(1580, 1, 4);
-		scene->_joystick.setPosition(Common::Point(159, 163));
-		scene->_joystick.setDetails(1550, 78, -1, -1, 2, (SceneItem *) NULL);
-
-		scene->_arrActor[5].remove();
-
-		return true;
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		break;
+	default:
+		_sceneMode = 62;
+		setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
+		break;
 	}
-
-	return SceneHotspot::startAction(action, event);
 }
 
-bool Scene1580::ScreenSlot::startAction(CursorType action, Event &event) {
-	if (action == R2_DIAGNOSTICS_DISPLAY) {
-		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
-
-		R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, 1580);
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._sceneItems.remove(&scene->_screenSlot);
-
-		scene->_screen.postInit();
-		scene->_screen.setup(1580, 1, 1);
-		scene->_screen.setPosition(Common::Point(124, 108));
-		scene->_screen.fixPriority(10);
-
-		if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1580)
-			scene->_screen.setDetails(1550, 14, -1, -1, 5, &scene->_joystick);
+void Scene1550::process(Event &event) {
+	if ((!R2_GLOBALS._player._canWalk) && (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN) && (event.eventType == EVENT_BUTTON_DOWN) && (this->_screenNumber == 1234)) {
+		int curReg = R2_GLOBALS._sceneRegions.indexOf(event.mousePos);
+		if (curReg == 0)
+			_dontExit = true;
+		else if (((R2_GLOBALS._player._position.y < 90) && (event.mousePos.y > 90)) || ((R2_GLOBALS._player._position.y > 90) && (event.mousePos.y < 90)))
+			_dontExit = true;
 		else
-			scene->_screen.setDetails(1550, 14, -1, -1, 2, (SceneItem *)NULL);
-
-		scene->_screenDisplay.postInit();
-		scene->_screenDisplay.setup(1580, 3, 1);
-		scene->_screenDisplay.setPosition(Common::Point(124, 109));
-		scene->_screenDisplay.fixPriority(20);
-		//scene->_field412 = 1;
-		scene->_sceneMode = 10;
-		scene->setAction(&scene->_sequenceManager, scene, 1, &R2_GLOBALS._player, NULL);
+			_dontExit = false;
 
-		return true;
+		if ((curReg == 13) || (curReg == 14))
+			_dontExit = false;
 	}
 
-	return SceneHotspot::startAction(action, event);
+	Scene::process(event);
 }
 
-bool Scene1580::Joystick::startAction(CursorType action, Event &event) {
-	if ( (action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1580)
-		&& (R2_INVENTORY.getObjectScene(R2_FUEL_CELL) == 0) && (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) == 0)
-		&& (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) == 0) && (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 0)
-		&& (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 0) && (R2_INVENTORY.getObjectScene(R2_IGNITOR) == 0)) {
-		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
-		scene->_sceneMode = 31;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			scene->_stripManager.start(536, scene);
-		else
-			scene->_stripManager.start(537, scene);
-
-		return true;
-	}
+void Scene1550::dispatch() {
+	Scene::dispatch();
 
-	return SceneActor::startAction(action, event);
-}
+	// Arrays related to this scene are all hacky in the origina: they are based on the impossibility to use Miranda
+	assert ((R2_GLOBALS._player._characterIndex == R2_QUINN) || (R2_GLOBALS._player._characterIndex == R2_SEEKER));
 
-bool Scene1580::Screen::startAction(CursorType action, Event &event) {
-	if ((action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(R2_BROKEN_DISPLAY) == 1580)) {
-		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 15) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 16)) {
+		R2_GLOBALS._player._shade = 0;
 
-		R2_INVENTORY.setObjectScene(R2_BROKEN_DISPLAY, R2_GLOBALS._player._characterIndex);
-		scene->_screenSlot.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 2, NULL);
-		scene->_screenDisplay.remove();
-		remove();
-		return true;
+		// NOTE: Original game contains a switch based on an uninitialized variable.
+		// We're leaving this code here, but ifdef'ed out, in case we can ever figure out
+		// what the original programmers intended the value to come from
+#if 0
+		int missingVariable = 0;
+		switch (missingVariable) {
+		case 144:
+		// No break on purpose
+		case 146:
+			_dish._frame = 5;
+			R2_GLOBALS._player._shade = 3;
+			break;
+		case 148:
+		// No break on purpose
+		case 149:
+			_dish._frame = 1;
+		// No break on purpose
+		case 147:
+		// No break on purpose
+		case 150:
+			R2_GLOBALS._player._shade = 3;
+			break;
+		default:
+			break;
+		}
+#endif
 	}
 
-	return SceneActor::startAction(action, event);
-}
-
-bool Scene1580::StorageCompartment::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	R2_GLOBALS._sceneItems.remove(&scene->_storageCompartment);
-	scene->_sceneMode = 0;
-	animate(ANIM_MODE_5, scene);
-
-	return true;
-}
-
-bool Scene1580::HatchButton::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	setFrame(2);
-	scene->_sceneMode = 20;
-	scene->setAction(&scene->_sequenceManager, scene, 2, &R2_GLOBALS._player, NULL);
+	if (_dontExit)
+		return;
 
-	return true;
-}
+	switch (R2_GLOBALS._player.getRegionIndex() - 11) {
+	case 0:
+	// No break on purpose
+	case 5:
+		// Exiting the top of the screen
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1;
+		_dontExit = true;
+		--R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y;
 
-bool Scene1580::ThrusterValve::startAction(CursorType action, Event &event) {
-	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+		enterArea();
 
-	switch (action) {
-	case CURSOR_USE:
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			R2_INVENTORY.setObjectScene(R2_THRUSTER_VALVE, 1);
-			remove();
-			return true;
-		}
-		break;
-	case R2_COM_SCANNER:
-		scene->_sceneMode = 30;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		scene->_stripManager.start(529, scene);
-		return true;
-		break;
-	case R2_COM_SCANNER_2:
-		scene->_sceneMode = 30;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		scene->_stripManager.start(527, scene);
-		return true;
-		break;
-	default:
+		R2_GLOBALS._player.setPosition(Common::Point( 160 - (((((160 - R2_GLOBALS._player._position.x) * 100) / 108) * 172) / 100), 145));
+		if (R2_GLOBALS._player._position.x < 160) {
+			Common::Point pt(R2_GLOBALS._player._position.x + 5, 135);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else if (R2_GLOBALS._player._position.x <= 160) { // the check is really in the original...
+			Common::Point pt(R2_GLOBALS._player._position.x, 135);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else {
+			Common::Point pt(R2_GLOBALS._player._position.x - 5, 135);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
 		break;
-	}
-
-	return SceneActor::startAction(action, event);
-}
+	case 1:
+		// Exiting the bottom of the screen
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 3;
+		_dontExit = true;
+		++R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y;
 
-bool Scene1580::Ignitor::startAction(CursorType action, Event &event) {
-	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+		enterArea();
 
-	switch (action) {
-	case CURSOR_USE:
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			R2_INVENTORY.setObjectScene(R2_IGNITOR, 1);
-			remove();
-			return true;
+		R2_GLOBALS._player.setPosition(Common::Point( 160 - (((((160 - R2_GLOBALS._player._position.x) * 100) / 172) * 108) / 100), 19));
+		if (R2_GLOBALS._player._position.x < 160) {
+			Common::Point pt(R2_GLOBALS._player._position.x + 5, 29);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else if (R2_GLOBALS._player._position.x <= 160) { // the check is really in the original...
+			Common::Point pt(R2_GLOBALS._player._position.x, 29);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else {
+			Common::Point pt(R2_GLOBALS._player._position.x - 5, 29);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
 		}
 		break;
-	case R2_COM_SCANNER:
-		scene->_sceneMode = 30;
+	case 2:
+		// Exiting the right of the screen
 		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		scene->_stripManager.start(529, scene);
-		return true;
+		_sceneMode = 5;
+		_dontExit = true;
+		++R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x;
+
+		enterArea();
+
+		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11) && (R2_GLOBALS._player._position.y > 50) && (R2_GLOBALS._player._position.y < 135)) {
+			if (R2_GLOBALS._player._position.y >= 85) {
+				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 10));
+				Common::Point pt(R2_GLOBALS._player._position.x + 30, R2_GLOBALS._player._position.y + 20);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+			} else {
+				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 10));
+				Common::Point pt(R2_GLOBALS._player._position.x + 30, R2_GLOBALS._player._position.y - 20);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+		} else {
+			R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y));
+			Common::Point pt(R2_GLOBALS._player._position.x + 10, R2_GLOBALS._player._position.y);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
 		break;
-	case R2_COM_SCANNER_2:
-		scene->_sceneMode = 30;
+	case 3:
+		// Exiting to the left of the screen
 		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		scene->_stripManager.start(527, scene);
-		return true;
+		_sceneMode = 7;
+		_dontExit = true;
+		--R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x;
+
+		enterArea();
+
+		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 24) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11)) {
+			R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y / 2));
+			Common::Point pt(265, 29);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11) && (R2_GLOBALS._player._position.y > 50) && (R2_GLOBALS._player._position.y < 135)) {
+			if (R2_GLOBALS._player._position.y >= 85) {
+				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 10));
+				Common::Point pt(R2_GLOBALS._player._position.x - 30, R2_GLOBALS._player._position.y + 20);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+			} else {
+				R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 10));
+				Common::Point pt(R2_GLOBALS._player._position.x - 30, R2_GLOBALS._player._position.y - 20);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+		} else {
+			R2_GLOBALS._player.setPosition(Common::Point(320 - R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y));
+			Common::Point pt(R2_GLOBALS._player._position.x - 10, R2_GLOBALS._player._position.y);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
 		break;
 	default:
 		break;
 	}
-
-	return SceneActor::startAction(action, event);
 }
 
-void Scene1580::postInit(SceneObjectList *OwnerList) {
-	loadScene(1580);
-	R2_GLOBALS._sceneManager._fadeMode = FADEMODE_GRADUAL;
-	SceneExt::postInit();
-
-	_stripManager.setColors(60, 255);
-	_stripManager.setFontNumber(3);
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
-
-	_sceneMode = 0;
-
-	R2_GLOBALS._player.disableControl();
-	if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1580) {
-		_joystick.postInit();
-		_joystick.setup(1580, 1, 4);
-		_joystick.setPosition(Common::Point(159, 163));
-		_joystick.setDetails(1550, 78, -1, -1, 1, (SceneItem *) NULL);
-	} else {
-		_joystickPlug.setDetails(Rect(141, 148, 179, 167), 1550, 79, -1, -1, 1, NULL);
-	}
-
-	if (R2_INVENTORY.getObjectScene(R2_BROKEN_DISPLAY) == 1580) {
-		_screen.postInit();
-		_screen.setup(1580, 1, 1);
-		_screen.setPosition(Common::Point(124, 108));
-		_screen.fixPriority(10);
-		_screen.setDetails(1550, 13, -1, -1, 1, (SceneItem *) NULL);
-
-		_screenDisplay.postInit();
-		_screenDisplay.setup(1580, 1, 3);
-		_screenDisplay.setPosition(Common::Point(124, 96));
-		_screenDisplay.fixPriority(20);
-	} else if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1580) {
-		_screen.postInit();
-		_screen.setup(1580, 1, 1);
-		_screen.setPosition(Common::Point(124, 108));
-		_screen.fixPriority(10);
-		_screen.setDetails(1550, 14, -1, -1, 1, (SceneItem *) NULL);
-
-		_screenDisplay.postInit();
-		_screenDisplay.setup(1580, 3, 1);
-		_screenDisplay.setPosition(Common::Point(124, 109));
-		_screenDisplay.fixPriority(20);
-
-		_sceneMode = 10;
-	} else {
-		_screenSlot.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 1, NULL);
-	}
-
-	_storageCompartment.postInit();
-	if (R2_GLOBALS.getFlag(58) == 0) {
-		_storageCompartment.setup(1580, 5, 1);
-		_storageCompartment.setDetails(1550, 80, -1, -1, 1, (SceneItem *) NULL);
-	} else {
-		_storageCompartment.setup(1580, 5, 6);
-	}
-
-	_storageCompartment.setPosition(Common::Point(216, 108));
-	_storageCompartment.fixPriority(100);
-
-	_hatchButton.postInit();
-	_hatchButton.setup(1580, 4, 1);
-	_hatchButton.setPosition(Common::Point(291, 147));
-	_hatchButton.fixPriority(100);
-	_hatchButton.setDetails(1550, 81, -1, -1, 1, (SceneItem *) NULL);
-
-	if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 1580) {
-		_thrusterValve.postInit();
-		_thrusterValve.setup(1580, 6, 2);
-		_thrusterValve.setPosition(Common::Point(222, 108));
-		_thrusterValve.fixPriority(50);
-		_thrusterValve.setDetails(1550, 32, -1, 34, 1, (SceneItem *) NULL);
-	}
-
-	if (R2_INVENTORY.getObjectScene(R2_IGNITOR) == 1580) {
-		_ignitor.postInit();
-		_ignitor.setup(1580, 6, 1);
-		_ignitor.setPosition(Common::Point(195, 108));
-		_ignitor.fixPriority(50);
-		_ignitor.setDetails(1550, 38, -1, 34, 1, (SceneItem *) NULL);
-	}
+void Scene1550::saveCharacter(int characterIndex) {
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
+		R2_GLOBALS._sound1.fadeOut2(NULL);
 
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.hide();
-	setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-	_background.setDetails(Rect(0, 0, 320, 200), 1550, 50, -1, -1, 1, NULL);
+	SceneExt::saveCharacter(characterIndex);
 }
 
-void Scene1580::signal() {
-	switch (_sceneMode++) {
-	case 10:
-		_screenDisplay.animate(ANIM_MODE_5, this);
-		break;
-	case 11:
-		_screenDisplay.setup(1580, 1, 2);
-		_screenDisplay.setPosition(Common::Point(124, 94));
+void Scene1550::Wall::setupWall(int frameNumber, int strip) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
 
-		if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) != 0) {
-			_arrActor[0].postInit();
-			_arrActor[0].setup(1580, 2, 1);
-			_arrActor[0].setPosition(Common::Point(138, 56));
+	postInit();
+	if (scene->_wallType == 2)
+		setup(1551, strip, frameNumber);
+	else
+		setup(1554, strip, frameNumber);
+
+	switch (strip) {
+	case 0:
+		switch (frameNumber - 1) {
+		case 0:
+			setup(1551, 1, 1);
+			setPosition(Common::Point(30, 67));
+			break;
+		case 1:
+			setup(1560, 1, 5);
+			setPosition(Common::Point(141, 54));
+			break;
+		case 2:
+			setup(1560, 2, 5);
+			setPosition(Common::Point(178, 54));
+			break;
+		case 3:
+			setup(1560, 2, 1);
+			setPosition(Common::Point(289, 67));
+			break;
+		case 4:
+			setup(1560, 2, 2);
+			setPosition(Common::Point(298, 132));
+			break;
+		case 5:
+			setup(1560, 1, 2);
+			setPosition(Common::Point(21, 132));
+			break;
+		case 6:
+			setup(1560, 2, 4);
+			setPosition(Common::Point(285, 123));
+			break;
+		case 7:
+			setup(1560, 1, 3);
+			setPosition(Common::Point(30, 111));
+			break;
+		case 8:
+			setup(1560, 2, 3);
+			setPosition(Common::Point(289, 111));
+			break;
+		case 9:
+			setup(1560, 1, 4);
+			setPosition(Common::Point(34, 123));
+			break;
+		default:
+			break;
 		}
-
-		if (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) != 0) {
-			_arrActor[1].postInit();
-			_arrActor[1].setup(1580, 2, 2);
-			_arrActor[1].setPosition(Common::Point(140, 66));
+		fixPriority(1);
+		break;
+	case 1:
+		if (frameNumber == 3) {
+			setup(1553, 3, 1);
+			setPosition(Common::Point(48, 44));
+			fixPriority(2);
+		} else {
+			fixPriority(1);
+			setPosition(Common::Point(32, 17));
 		}
 
-		if (R2_INVENTORY.getObjectScene(R2_IGNITOR) != 0) {
-			_arrActor[2].postInit();
-			_arrActor[2].setup(1580, 2, 3);
-			_arrActor[2].setPosition(Common::Point(142, 85));
+		switch (frameNumber) {
+		case 2:
+			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		case 3:
+			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		default:
+			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
+			break;
 		}
-
-		if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) != 0) {
-			_arrActor[3].postInit();
-			_arrActor[3].setup(1580, 2, 4);
-			_arrActor[3].setPosition(Common::Point(142, 92));
+		break;
+	case 2:
+		fixPriority(1);
+		switch (frameNumber) {
+		case 4:
+			setup(1553, 4, 1);
+			setPosition(Common::Point(48, 168));
+			break;
+		case 5:
+			setup(1553, 3, 2);
+			setPosition(Common::Point(20, 168));
+			fixPriority(250);
+			break;
+		default:
+			setPosition(Common::Point(28, 116));
+			break;
 		}
 
-		if (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) != 0) {
-			_arrActor[4].postInit();
-			_arrActor[4].setup(1580, 2, 5);
-			_arrActor[4].setPosition(Common::Point(108, 54));
+		switch (frameNumber) {
+		case 2:
+			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		case 4:
+			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		case 5:
+			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		default:
+			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
+			break;
 		}
-
-		if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) != 1580) {
-			_arrActor[5].postInit();
-			_arrActor[5].setup(1580, 2, 6);
-			_arrActor[5].setPosition(Common::Point(110, 64));
+		break;
+	case 3:
+		switch (frameNumber) {
+		case 2:
+			fixPriority(2);
+			if (scene->_wallType == 2)
+				setup(1553, 2, 1);
+			else
+				setup(1556, 2, 1);
+			setPosition(Common::Point(160, 44));
+			break;
+		case 3:
+			fixPriority(2);
+			setup(1553, 5, 1);
+			setPosition(Common::Point(178, 44));
+			break;
+		default:
+			fixPriority(1);
+			setPosition(Common::Point(160, 17));
+			break;
 		}
 
-		if (R2_INVENTORY.getObjectScene(R2_BATTERY) != 0) {
-			_arrActor[6].postInit();
-			_arrActor[6].setup(1580, 2, 7);
-			_arrActor[6].setPosition(Common::Point(108, 80));
+		if (frameNumber == 1)
+			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
+		else
+			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
+		break;
+	case 4:
+		if (frameNumber == 2) {
+			fixPriority(250);
+			if (scene->_wallType == 2)
+				setup(1553, 1, 1);
+			else
+				setup(1556, 1, 1);
+		} else {
+			fixPriority(2);
 		}
 
-		if (R2_INVENTORY.getObjectScene(R2_FUEL_CELL) != 0) {
-			_arrActor[7].postInit();
-			_arrActor[7].setup(1580, 2, 8);
-			_arrActor[7].setPosition(Common::Point(111, 92));
-		}
+		if (frameNumber != 1)
+			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
 
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		R2_GLOBALS._player._canWalk = false;
+		setPosition(Common::Point(160, 168));
 		break;
-	case 20:
-		R2_GLOBALS._sceneManager.changeScene(1550);
+	case 5:
+		fixPriority(1);
+		setPosition(Common::Point(287, 17));
+
+		switch (frameNumber) {
+		case 2:
+			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		case 3:
+			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		default:
+			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
+			break;
+		}
 		break;
-	case 31:
-		R2_GLOBALS._sceneManager.changeScene(1530);
+	case 6:
+		fixPriority(1);
+		setPosition(Common::Point(291, 116));
+
+		if (frameNumber == 2)
+			setDetails(1550, 3, -1, -1, 2, (SceneItem *) NULL);
+		else
+			setDetails(1550, 72, -1, -1, 2, (SceneItem *) NULL);
 		break;
 	default:
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		R2_GLOBALS._player._canWalk = false;
 		break;
 	}
-}
-
-/*--------------------------------------------------------------------------
- * Scene 1625 - Miranda being questioned
- *
- *--------------------------------------------------------------------------*/
-
-bool Scene1625::Wire::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1625 *scene = (Scene1625 *)R2_GLOBALS._sceneManager._scene;
-	R2_GLOBALS._player.disableControl();
-
-	scene->_sceneMode = 1631;
-	scene->_mirandaMouth.postInit();
-	scene->setAction(&scene->_sequenceManager, scene, 1631, &scene->_mirandaMouth, &scene->_wire, NULL);
-	return true;
-}
-
-Scene1625::Scene1625() {
-}
 
-void Scene1625::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
 }
 
-void Scene1625::postInit(SceneObjectList *OwnerList) {
-	loadScene(1625);
-	R2_GLOBALS._player._characterIndex = R2_MIRANDA;
-	SceneExt::postInit();
-
-	_stripManager.addSpeaker(&_mirandaSpeaker);
-	_stripManager.addSpeaker(&_tealSpeaker);
-	_stripManager.addSpeaker(&_soldierSpeaker);
-
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.hide();
-
-	_wire.postInit();
-	_wire.setup(1626, 2, 1);
-	_wire.setPosition(Common::Point(206, 133));
-	_wire.setDetails(1625, 0, -1, -1, 1, (SceneItem *) NULL);
-
-	_wristRestraints.postInit();
-	_wristRestraints.setup(1625, 8, 1);
-	_wristRestraints.setPosition(Common::Point(190, 131));
-	_wristRestraints.setDetails(1625, 6, -1, 2, 1, (SceneItem *) NULL);
+void Scene1550::enterArea() {
+	_walkRegionsId = 0;
+	_dishMode = 0;
 
-	if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 1625) {
-		if (!R2_GLOBALS.getFlag(83)) {
-			_glass.postInit();
-			_glass.setup(1626, 4, 1);
-			_glass.setPosition(Common::Point(96, 166));
-			_glass.setDetails(1625, -1, -1, -1, 1, (SceneItem *) NULL);
-		}
-		R2_GLOBALS._player.enableControl();
-		R2_GLOBALS._player._canWalk = false;
-	} else {
-		_teal.postInit();
-		_teal.fixPriority(10);
+	_wallCorner1.remove();
+	_westWall.remove();
+	_northWall.remove();
+	_southWall.remove();
+	_wallCorner2.remove();
+	_eastWall.remove();
 
-		_tealRightArm.postInit();
+	for (int i = 0; i < 8; ++i)
+		_junk[i].remove();
 
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1625;
-		setAction(&_sequenceManager, this, 1625, &_teal, &_tealRightArm, NULL);
-	}
+	_wreckage.remove();
 
-	R2_GLOBALS._sound1.play(245);
-	_background.setDetails(Rect(0, 0, 320, 200), 1625, 12, -1, -1, 1, NULL);
-	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 1625;
-	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 1625;
-}
+	for (int i = 0; i < 8; ++i)
+		_shipComponents[i].remove();
 
-void Scene1625::remove() {
-	R2_GLOBALS._sound1.fadeOut2(NULL);
-	SceneExt::remove();
-}
+	_airbag.remove();
+	_joystick.remove();
+	_gyroscope.remove();
+	_wreckage4.remove();
+	_diagnosticsDisplay.remove();
 
-void Scene1625::signal() {
-	switch (_sceneMode) {
-	case 10:
-		R2_GLOBALS._player.disableControl();
-		_glass.postInit();
-		_glass.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
-		_sceneMode = 1626;
-		setAction(&_sequenceManager, this, 1626, &_tealHead, &_glass, NULL);
-		break;
-	case 12:
-		MessageDialog::show(DONE_MSG, OK_BTN_STRING);
+	if ((_sceneMode != 1577) && (_sceneMode != 1578))
+		_wreckage2.remove();
+
+	_wreckage3.remove();
+	_companion.remove();
+	_dish.remove();
+	_dishTowerShadow.remove();
+	_dishTower.remove();
+	_walkway.remove();
+
+	// Set up of special walk regions for certain areas
+	switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y) {
+	case 0:
+		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
+		case 3:
+			R2_GLOBALS._walkRegions.load(1554);
+			_walkRegionsId = 1554;
+			break;
+		case 4:
+			R2_GLOBALS._walkRegions.load(1553);
+			_walkRegionsId = 1553;
+			break;
+		default:
+			break;
+		}
 		break;
-	case 14:
-		_tealHead.postInit();
-		_tealHead.setup(1627, 1, 1);
-		_tealHead.setPosition(Common::Point(68, 68));
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(831, this);
+	case 3:
+	// No break on purpose
+	case 4:
+		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 23) || (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x)) {
+			if (!R2_GLOBALS.getFlag(16)) {
+				R2_GLOBALS._walkRegions.load(1559);
+				_walkRegionsId = 1559;
+			}
+		}
 		break;
-	case 99:
-		R2_GLOBALS._player.disableControl();
-		switch (_stripManager._exitMode) {
-		case 1:
-			_sceneMode = 1627;
-			setAction(&_sequenceManager, this, 1627, &_mirandaMouth, &_glass, NULL);
-			break;
-		case 2:
-			_sceneMode = 1629;
-			setAction(&_sequenceManager, this, 1629, &_tealHead, &_wristRestraints, NULL);
+	case 7:
+		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
+		case 10:
+			R2_GLOBALS._walkRegions.load(1555);
+			_walkRegionsId = 1555;
 			break;
-		case 4:
-			R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3150;
-			R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3150;
-			R2_GLOBALS._player._characterIndex = R2_QUINN;
-			R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._player._characterScene[R2_QUINN]);
+		case 11:
+			R2_GLOBALS._walkRegions.load(1556);
+			_walkRegionsId = 1556;
 			break;
-		case 5:
-			_sceneMode = 1628;
-			_tealHead.remove();
-			setAction(&_sequenceManager, this, 1628, &_mirandaMouth, &_glass, NULL);
+		default:
 			break;
-		case 6:
-			_glass.postInit();
-			_glass.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
-			_sceneMode = 1632;
-			setAction(&_sequenceManager, this, 1632, &_glass, NULL);
+		}
+		break;
+	case 11:
+		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
+		case 24:
+			R2_GLOBALS._walkRegions.load(1558);
+			_walkRegionsId = 1558;
 			break;
-		case 7:
-			_sceneMode = 1633;
-			setAction(&_sequenceManager, this, 1633, &_glass, NULL);
+		case 25:
+			R2_GLOBALS._walkRegions.load(1557);
+			_walkRegionsId = 1557;
 			break;
-		case 8:
-			_sceneMode = 1635;
-			setAction(&_sequenceManager, this, 1635, &_mirandaMouth, &_wristRestraints, NULL);
+		default:
 			break;
-		case 9:
-			_glass.postInit();
-			_glass.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
-			_sceneMode = 1634;
-			setAction(&_sequenceManager, this, 1634, &_mirandaMouth, &_wristRestraints, NULL);
+		}
+		break;
+	case 16:
+		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x) {
+		case 2:
+			R2_GLOBALS._walkRegions.load(1552);
+			_walkRegionsId = 1552;
 			break;
 		case 3:
-		// No break on purpose
+			R2_GLOBALS._walkRegions.load(1551);
+			_walkRegionsId = 1551;
+			break;
+		case 15:
+			R2_GLOBALS._walkRegions.load(1575);
+			_walkRegionsId = 1575;
 		default:
-			_sceneMode = 1630;
-			_tealHead.remove();
-			setAction(&_sequenceManager, this, 1630, &_teal, &_tealRightArm, NULL);
 			break;
 		}
-		//_field412 = _stripManager._field2E8;
-		_stripManager._currObj44Id = 0;
-		break;
-	case 1625:
-		_tealHead.postInit();
-		_tealHead.setup(1627, 1, 1);
-		_tealHead.setPosition(Common::Point(68, 68));
-		_sceneMode = 10;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(800, this);
 		break;
-	case 1626:
-		_tealHead.setup(1627, 1, 1);
-		_tealHead.setPosition(Common::Point(68, 68));
-		_tealHead.show();
-
-		_mirandaMouth.postInit();
-		_mirandaMouth.setup(1627, 3, 1);
-		_mirandaMouth.setPosition(Common::Point(196, 65));
-
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(832, this);
+	default:
 		break;
-	case 1627:
-		_mirandaMouth.setup(1627, 3, 1);
-		_mirandaMouth.setPosition(Common::Point(196, 65));
-		_mirandaMouth.show();
+	}
 
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(833, this);
-		break;
-	case 1628:
-		R2_GLOBALS.setFlag(83);
-		_tealHead.postInit();
-		_tealHead.setup(1627, 1, 1);
-		_tealHead.setPosition(Common::Point(68, 68));
+	int varA = 0;
 
-		_mirandaMouth.setup(1627, 3, 1);
-		_mirandaMouth.setPosition(Common::Point(196, 65));
-		_mirandaMouth.show();
+	// This section handles checks if the ARM spacecraft have not yet seized
+	// control of Lance of Truth.
+	if (!R2_GLOBALS.getFlag(16)) {
+		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y - 2) {
+		case 0:
+			switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x - 22) {
+				case 0:
+					varA = 1553;
+					_northWall.setupWall(6, 0);
+					break;
+				case 1:
+				// No break on purpose
+				case 2:
+				// No break on purpose
+				case 3:
+				// No break on purpose
+				case 4:
+					varA = 1553;
+					break;
+				case 5:
+					varA = 1553;
+					_northWall.setupWall(6, 0);
+					break;
+				default:
+					break;
+			}
+			break;
+		case 1:
+		// No break on purpose
+		case 2:
+			switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x - 21) {
+			case 0:
+				varA = 1550;
+				_northWall.setupWall(9, 0);
+				break;
+			case 1:
+				varA = 1552;
+				_northWall.setupWall(10, 0);
+				break;
+			case 2:
+			// No break on purpose
+			case 3:
+			// No break on purpose
+			case 4:
+			// No break on purpose
+			case 5:
+				varA = 1552;
+				break;
+			case 6:
+				varA = 1552;
+				_northWall.setupWall(7, 0);
+				break;
+			case 7:
+				varA = 1550;
+				_northWall.setupWall(8, 0);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 3:
+			switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x - 21) {
+			case 0:
+				varA = 1550;
+				_northWall.setupWall(4, 0);
+				break;
+			case 1:
+				varA = 1550;
+				_northWall.setupWall(3, 0);
+				break;
+			case 2:
+			// No break on purpose
+			case 3:
+			// No break on purpose
+			case 4:
+			// No break on purpose
+			case 5:
+				varA = 1551;
+				break;
+			case 6:
+				varA = 1550;
+				_northWall.setupWall(2, 0);
+				break;
+			case 7:
+				varA = 1550;
+				_northWall.setupWall(1, 0);
+				break;
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 0) &&
+				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x <= 29) &&
+				((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x < 20) ||
+				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 7))) {
+			// In an area where the cutscene can be triggered, so start it
+			R2_GLOBALS.setFlag(16);
+			R2_GLOBALS._sceneManager.changeScene(1500);
+		}
+	}
 
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(834, this);
-		break;
-	case 1629:
-		_tealHead.setup(1627, 1, 1);
-		_tealHead.setPosition(Common::Point(68, 68));
-		_tealHead.show();
+	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 9) &&
+			(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 11)) {
+		if (_screenNumber != 1234) {
+			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
+			loadScene(1234);
+			R2_GLOBALS._sceneManager._hasPalette = false;
+			_wallType = 0;
+		}
+	} else if (_screenNumber == 1234) {
+		R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
+		loadScene(1550);
+		R2_GLOBALS._sceneManager._hasPalette = false;
+	}
 
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(805, this);
-		break;
-	case 1630:
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		R2_GLOBALS._player._canWalk = true;
-		break;
-	case 1631:
-		_mirandaMouth.setup(1627, 3, 1);
-		_mirandaMouth.setPosition(Common::Point(196, 65));
-		_mirandaMouth.show();
+	if (_screenNumber == 1234)
+		_walkRegionsId = 1576;
 
-		_wire.remove();
+	if (_wallType == 0) {
+		_wallType = 1;
+	} else {
+		if (_wallType == 2) {
+			_wallType = 3;
+		} else {
+			_wallType = 2;
+		}
 
-		_teal.postInit();
-		_teal.fixPriority(10);
+		if (R2_GLOBALS._sceneManager._sceneNumber == 1550){
+#if 0
+			warning("Mouse_hideIfNeeded()");
+			warning("gfx_set_pane_p");
+			for (int i = 3; i != 168; ++i) {
+				warning("sub294D2(4, i, 312,  var14C)");
+				warning("missing for loop, to be implemented");
+				warning("gfx_draw_slice");
+			}
+			warning("gfx_flip_screen()");
+			warning("gfx_set_pane_p()");
+#endif
+			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
 
-		_tealRightArm.postInit();
+			if (varA == 0) {
+				if (_sceneResourceId != 1550) {
+					g_globals->_scenePalette.loadPalette(1550);
+					R2_GLOBALS._sceneManager._hasPalette = true;
+				}
+			} else {
+				g_globals->_scenePalette.loadPalette(varA);
+				R2_GLOBALS._sceneManager._hasPalette = true;
+			}
 
-		R2_INVENTORY.setObjectScene(R2_SUPERCONDUCTOR_WIRE, 3);
-		_sceneMode = 14;
+			if (R2_GLOBALS._sceneManager._hasPalette)
+				_sceneResourceId = varA;
 
-		setAction(&_sequenceManager, this, 1625, &_teal, &_tealRightArm, NULL);
-		break;
-	case 1632:
-		_tealHead.setup(1627, 1, 1);
-		_tealHead.setPosition(Common::Point(68, 68));
-		_tealHead.show();
+//			warning("sub_2C429()");
+		}
+	}
 
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(835, this);
-		break;
-	case 1633:
-		_glass.remove();
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(818, this);
+	// Scene setup dependent on the type of cell specified in the scene map
+	switch (scene1550AreaMap[(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y * 30) +
+		R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x]) {
+	case 0:
+		// Standard cell
+		if (_walkRegionsId == 0) {
+			R2_GLOBALS._walkRegions.load(1550);
+			_walkRegionsId = 1550;
+		}
 		break;
-	case 1634:
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(836, this);
+	case 1:
+		// North end of the spaceport
+		if (_walkRegionsId == 0) {
+			R2_GLOBALS._walkRegions.load(1560);
+			_walkRegionsId = 1560;
+		}
+		_wallCorner1.setupWall(2, 1);
+		_northWall.setupWall(1, 3);
+		_wallCorner2.setupWall(2, 5);
 		break;
-	case 1635:
-		_mirandaMouth.setup(1627, 3, 1);
-		_mirandaMouth.setPosition(Common::Point(196, 65));
-		_mirandaMouth.show();
-
-		_sceneMode = 99;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(818, this);
+	case 2:
+		R2_GLOBALS._walkRegions.load(1561);
+		_walkRegionsId = 1561;
+		_wallCorner1.setupWall(2, 1);
+		_westWall.setupWall(2, 2);
+		_northWall.setupWall(1, 3);
+		_wallCorner2.setupWall(2, 5);
 		break;
-	default:
+	case 3:
+		R2_GLOBALS._walkRegions.load(1562);
+		_walkRegionsId = 1562;
+		_wallCorner1.setupWall(2, 1);
+		_northWall.setupWall(1, 3);
+		_wallCorner2.setupWall(2, 5);
+		_eastWall.setupWall(2, 6);
+		break;
+	case 4:
+		R2_GLOBALS._walkRegions.load(1563);
+		_walkRegionsId = 1563;
+		_northWall.setupWall(2, 3);
+		break;
+	case 5:
+		R2_GLOBALS._walkRegions.load(1564);
+		_walkRegionsId = 1564;
+		_southWall.setupWall(2, 4);
+		break;
+	case 6:
+		R2_GLOBALS._walkRegions.load(1565);
+		_walkRegionsId = 1565;
+		_wallCorner1.setupWall(1, 1);
+		_westWall.setupWall(1, 2);
+		_northWall.setupWall(3, 3);
+		break;
+	case 7:
+		R2_GLOBALS._walkRegions.load(1566);
+		_walkRegionsId = 1566;
+		_wallCorner1.setupWall(1, 1);
+		_westWall.setupWall(1, 2);
+		_northWall.setupWall(2, 4);
+		break;
+	case 8:
+		R2_GLOBALS._walkRegions.load(1567);
+		_walkRegionsId = 1567;
+		_westWall.setupWall(5, 2);
+		break;
+	case 9:
+		R2_GLOBALS._walkRegions.load(1568);
+		_walkRegionsId = 1568;
+		_westWall.setupWall(4, 2);
+		break;
+	case 10:
+		R2_GLOBALS._walkRegions.load(1569);
+		_walkRegionsId = 1569;
+		_wallCorner1.setupWall(3, 1);
+		break;
+	case 11:
+		R2_GLOBALS._walkRegions.load(1570);
+		_walkRegionsId = 1570;
+		_wallCorner1.setupWall(1, 1);
+		_westWall.setupWall(1, 2);
+		break;
+	case 12:
+		R2_GLOBALS._walkRegions.load(1571);
+		_walkRegionsId = 1571;
+		_wallCorner2.setupWall(1, 5);
+		_eastWall.setupWall(1, 6);
+		break;
+	case 13:
+		R2_GLOBALS._walkRegions.load(1572);
+		_walkRegionsId = 1572;
+		_wallCorner1.setupWall(1, 1);
+		_westWall.setupWall(1, 2);
+		_southWall.setupWall(1, 4);
+		break;
+	case 14:
+		R2_GLOBALS._walkRegions.load(1573);
+		_walkRegionsId = 1573;
+		_southWall.setupWall(1, 4);
+		_wallCorner2.setupWall(1, 5);
+		_eastWall.setupWall(1, 6);
+		break;
+	case 15:
+		// South wall
+		R2_GLOBALS._walkRegions.load(1574);
+		_walkRegionsId = 1574;
+		_southWall.setupWall(1, 4);
+		break;
+	case 16:
+		R2_GLOBALS._walkRegions.load(1570);
+		_walkRegionsId = 1570;
+		_wallCorner1.setupWall(2, 1);
+		_westWall.setupWall(2, 2);
+		break;
+	case 17:
+		R2_GLOBALS._walkRegions.load(1570);
+		_walkRegionsId = 1570;
+		_wallCorner1.setupWall(2, 1);
+		_westWall.setupWall(3, 2);
+		break;
+	case 18:
+		R2_GLOBALS._walkRegions.load(1571);
+		_walkRegionsId = 1571;
+		_wallCorner2.setupWall(2, 5);
+		_eastWall.setupWall(2, 6);
+		break;
+	case 19:
+		R2_GLOBALS._walkRegions.load(1571);
+		_walkRegionsId = 1571;
+		_wallCorner2.setupWall(2, 5);
+		_eastWall.setupWall(3, 6);
+		break;
+	default:
 		break;
 	}
-}
-
-void Scene1625::process(Event &event) {
-	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE))
-		event.handled = true;
-	else
-		Scene::process(event);
-}
-
-/*--------------------------------------------------------------------------
- * Scene 1700 - Rim
- *
- *--------------------------------------------------------------------------*/
-
-Scene1700::Scene1700() {
-	_walkFlag = 0;
-}
-
-void Scene1700::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
-
-	s.syncAsSint16LE(_walkFlag);
-}
-
-bool Scene1700::RimTransport::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
-
-	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	scene->_sceneMode = 4;
-
-	Common::Point pt(271, 90);
-	PlayerMover *mover = new PlayerMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-
-	return true;
-}
-
-bool Scene1700::Companion::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_TALK)
-		return SceneActor::startAction(action, event);
-
-	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
-	scene->_sceneMode = 30;
-	scene->signal();
-
-	return true;
-}
-
-void Scene1700::NorthExit::changeScene() {
-	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	_moving = false;
-	scene->_sceneMode = 1;
-
-	Common::Point pt(R2_GLOBALS._player._position.x, 0);
-	NpcMover *mover = new NpcMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-}
-
-void Scene1700::SouthExit::changeScene() {
-	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	_moving = false;
-	scene->_sceneMode = 2;
-
-	Common::Point pt(R2_GLOBALS._player._position.x, 170);
-	NpcMover *mover = new NpcMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-}
-
-void Scene1700::WestExit::changeScene() {
-	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	_moving = false;
-	scene->_sceneMode = 6;
-
-	Common::Point pt(0, R2_GLOBALS._player._position.y);
-	NpcMover *mover = new NpcMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-}
-
-void Scene1700::enterArea() {
-	Rect tmpRect;
-	R2_GLOBALS._walkRegions.load(1700);
-
-	_slabWest.remove();
-	_slabEast.remove();
-	_slabShadowWest.remove();
-	_slabShadowEast.remove();
-	_westPlatform.remove();
-	_rimTransportDoor.remove();
-	_rimTransport.remove();
-
-	if (_sceneMode != 40) {
-		_ledgeHopper.remove();
-		_hatch.remove();
-	}
-
-	// The original had manual code here to redraw the background manually when
-	// changing areas within the scene. Which seems to be totally redundant.
-
-	if (_sceneMode != 40 && R2_GLOBALS._rimLocation == 0) {
-		// Crashed ledge hopper
-		_ledgeHopper.postInit();
-		_ledgeHopper.setup(1701, 1, 1);
-		_ledgeHopper.setPosition(Common::Point(220, 137));
-		_ledgeHopper.setDetails(1700, 6, -1, -1, 2, (SceneItem *) NULL);
-		R2_GLOBALS._walkRegions.disableRegion(2);
-		R2_GLOBALS._walkRegions.disableRegion(12);
-	}
-
-	if ((R2_GLOBALS._rimLocation + 2) % 4 == 0) {
-		// The slabs forming the bottom of the regular rings the rim transport travels through
-		_slabWest.postInit();
-		_slabWest.setup(1700, 1, 1);
-		_slabWest.setPosition(Common::Point(222, 82));
-		_slabWest.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
-
-		_slabShadowWest.postInit();
-		_slabShadowWest.setup(1700, 2, 1);
-		_slabShadowWest.setPosition(Common::Point(177, 82));
-		_slabShadowWest.fixPriority(0);
-
-		_slabShadowEast.postInit();
-		_slabShadowEast.setup(1700, 2, 2);
-		_slabShadowEast.setPosition(Common::Point(332, 96));
-		_slabShadowEast.fixPriority(0);
-
-		_slabEast.postInit();
-		_slabEast.setup(1700, 1, 2);
-		_slabEast.setPosition(Common::Point(424, 84));
 
-		R2_GLOBALS._walkRegions.disableRegion(11);
-	}
+	int di = 0;
+	int tmpIdx = 0;
+	for (int i = 0; i < 127 * 4; i += 4) {
+		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == R2_GLOBALS._scene1550JunkLocations[i]) &&
+				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == R2_GLOBALS._scene1550JunkLocations[i + 1]) &&
+				(R2_GLOBALS._scene1550JunkLocations[i + 2] != 0)) {
+			tmpIdx = R2_GLOBALS._scene1550JunkLocations[i + 3];
+			_junk[di].postInit();
+			_junk[di]._effect = EFFECT_SHADED2;
+			_junk[di]._shade = 0;
+			//_junk[di]._junkState = tmpIdx;
+			_junk[di]._junkNumber = i;
+			_junk[di].setDetails(1550, 62, -1, 63, 2, (SceneItem *) NULL);
+			if (R2_GLOBALS._scene1550JunkLocations[i + 2] == 41) {
+				_junk[di].changeZoom(-1);
+				_junk[di].setPosition(Common::Point(150, 70));
+				_junk[di].setup(1562, 1, 1);
 
-	if ((R2_GLOBALS._rimLocation + 399) % 800 == 0) {
-		// Enable west exit to lift
-		_westPlatform.postInit();
-		_westPlatform.setup(1700, 3, 2);
-		_westPlatform.setPosition(Common::Point(51, 141));
-		_westPlatform.fixPriority(0);
-		_westPlatform.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
+				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[2]);
+				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[3]);
+				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[6]);
+				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[7]);
 
-		_westExit._enabled = true;
-	} else {
-		R2_GLOBALS._walkRegions.disableRegion(1);
-		_westExit._enabled = false;
+				if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) {
+					_joystick.postInit();
+					_joystick.setup(1562, 3, 1);
+					_joystick.setPosition(Common::Point(150, 70));
+					_joystick.fixPriority(10);
+					_joystick.setDetails(1550, 41, -1, 42, 2, (SceneItem *) NULL);
+				}
+			} else {
+				if (R2_GLOBALS._scene1550JunkLocations[i + 2] > 40) {
+					_junk[di].changeZoom(100);
+					_junk[di].setup(1561, 1, R2_GLOBALS._scene1550JunkLocations[i + 2] - 40);
+				} else {
+					_junk[di].changeZoom(-1);
+					_junk[di].setup(1552, ((R2_GLOBALS._scene1550JunkLocations[i + 2] - 1) / 5) + 1, ((R2_GLOBALS._scene1550JunkLocations[i + 2] - 1) % 5) + 1);
+				}
+				_junk[di].setPosition(Common::Point(scene1550JunkX[tmpIdx], scene1550JunkY[tmpIdx]));
+				if (scene1550JunkRegions[tmpIdx] != 0)
+					R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[tmpIdx]);
+				di++;
+			}
+		}
 	}
 
-	if (  ((!R2_GLOBALS.getFlag(15)) && ((R2_GLOBALS._rimLocation == 25) || (R2_GLOBALS._rimLocation == -3)))
-		 || ((R2_GLOBALS.getFlag(15)) && (R2_GLOBALS._rimLocation == R2_GLOBALS._rimTransportLocation))
-		 ) {
-		// Rim transport vechile located
-		R2_GLOBALS._rimTransportLocation = R2_GLOBALS._rimLocation;
-		if (!R2_GLOBALS.getFlag(15))
-			_walkFlag = true;
-
-		_rimTransport.postInit();
-		_rimTransport.setup(1700, 3, 1);
-		_rimTransport.setPosition(Common::Point(338, 150));
-		_rimTransport.setDetails(1700, 9, -1, -1, 2, (SceneItem *) NULL);
-		_rimTransport.fixPriority(15);
-
-		_rimTransportDoor.postInit();
-		_rimTransportDoor.setup(1700, 4, 1);
-		_rimTransportDoor.setPosition(Common::Point(312, 106));
-		_rimTransportDoor.fixPriority(130);
-	}
-}
+	// Loop for detecting and setting up certain special areas within the map
+	for (int i = 0; i < 15 * 3; i += 3) {
+		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == scene1550SpecialAreas[i])
+				&& (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == scene1550SpecialAreas[i + 1])) {
+			int areaType = scene1550SpecialAreas[i + 2];
+			switch (areaType) {
+			case 1:
+				if (!R2_GLOBALS.getFlag(16)) {
+					_wreckage2.postInit();
+					if (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 3)
+						_wreckage2.setup(1555, 2, 1);
+					else
+						_wreckage2.setup(1555, 1, 1);
+					_wreckage2.setPosition(Common::Point(150, 100));
+					_wreckage2.fixPriority(92);
+					_wreckage2.setDetails(1550, 73, -1, -1, 2, (SceneItem *) NULL);
+				}
+				break;
+			case 2:
+				_dish.postInit();
+				if (R2_GLOBALS.getFlag(19))
+					_dish.setup(1556, 3, 5);
+				else
+					_dish.setup(1556, 3, 1);
+				_dish.changeZoom(95);
+				_dish.setPosition(Common::Point(165, 83));
+				_dish.fixPriority(168);
+				_dish.setDetails(1550, 17, -1, 19, 2, (SceneItem *) NULL);
 
-void Scene1700::postInit(SceneObjectList *OwnerList) {
-	loadScene(1700);
-	SceneExt::postInit();
-	if (R2_GLOBALS._sceneManager._previousScene == -1)
-		R2_GLOBALS._sceneManager._previousScene = 1530;
+				_dishTower.postInit();
+				_dishTower.setup(1556, 4, 1);
+				_dishTower.setPosition(Common::Point(191, 123));
+				_dishTower.changeZoom(95);
+				_dishTower.setDetails(1550, 65, -1, 66, 2, (SceneItem *) NULL);
 
-	scalePalette(65, 65, 65);
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
+				_dishTowerShadow.postInit();
+				_dishTowerShadow._numFrames = 5;
+				if (R2_GLOBALS.getFlag(19))
+					_dishTowerShadow.setup(1556, 8, 5);
+				else
+					_dishTowerShadow.setup(1556, 8, 1);
 
-	_northExit.setDetails(Rect(94, 0, 319, 12), EXITCURSOR_N, 1700);
-	_southExit.setDetails(Rect(0, 161, 319, 168), EXITCURSOR_S, 1700);
-	_westExit.setDetails(Rect(0, 0, 12, 138), EXITCURSOR_W, 1800);
+				_dishTowerShadow.setPosition(Common::Point(156, 151));
+				_dishTowerShadow.fixPriority(10);
 
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.setPosition(Common::Point(0, 0));
-	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		R2_GLOBALS._player.setVisage(1501);
-		R2_GLOBALS._player._moveDiff = Common::Point(2, 1);
-	} else {
-		R2_GLOBALS._player.setVisage(1506);
-		R2_GLOBALS._player._moveDiff = Common::Point(3, 1);
-	}
+				_walkway.postInit();
+				if (R2_GLOBALS.getFlag(20))
+					_walkway.setup(1558, 3, 10);
+				else
+					_walkway.setup(1558, 3, 1);
 
-	_companion.postInit();
-	_companion.animate(ANIM_MODE_1, NULL);
-	_companion.setObjectWrapper(new SceneObjectWrapper());
+				_walkway.setPosition(Common::Point(172, 48));
+				_walkway.fixPriority(169);
+				R2_GLOBALS._walkRegions.disableRegion(scene1550JunkRegions[15]);
+				break;
+			case 3:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 1, 1);
+				_wreckage.setPosition(Common::Point(259, 55));
+				_wreckage.fixPriority(133);
+				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
 
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		_companion.setVisage(1506);
-		_companion._moveDiff = Common::Point(3, 1);
-		_companion.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
-	} else {
-		_companion.setVisage(1501);
-		_companion._moveDiff = Common::Point(2, 1);
-		_companion.setDetails(9001, 1, -1, -1, 1, (SceneItem *) NULL);
-	}
+				_wreckage2.postInit();
+				_wreckage2.setup(1550, 1, 2);
+				_wreckage2.setPosition(Common::Point(259, 133));
+				_wreckage2.fixPriority(105);
+				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 1550) {
+					_gyroscope.postInit();
+					_gyroscope.setup(1550, 7, 2);
+					_gyroscope.setPosition(Common::Point(227, 30));
+					_gyroscope.fixPriority(130);
+					_gyroscope.setDetails(1550, 29, -1, 63, 2, (SceneItem *) NULL);
+				}
+				break;
+			case 4:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 1, 4);
+				_wreckage.setPosition(Common::Point(76, 131));
+				_wreckage.fixPriority(10);
+				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
 
-	R2_GLOBALS._sound1.play(134);
+				_wreckage2.postInit();
+				_wreckage2.setup(1550, 1, 3);
+				_wreckage2.setPosition(Common::Point(76, 64));
+				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1550) {
+					_diagnosticsDisplay.postInit();
+					_diagnosticsDisplay.setup(1504, 4, 1);
+					_diagnosticsDisplay.setPosition(Common::Point(49, 35));
+					_diagnosticsDisplay.animate(ANIM_MODE_2, NULL);
+					_diagnosticsDisplay._numFrames = 4;
+					_diagnosticsDisplay.fixPriority(65);
+					_diagnosticsDisplay.setDetails(1550, 14, 15, 63, 2, (SceneItem *) NULL);
+				}
+				if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1550) {
+					_airbag.postInit();
+					_airbag.setup(1550, 7, 1);
+					_airbag.setPosition(Common::Point(45, 44));
+					_airbag.fixPriority(150);
+					_airbag.setDetails(1550, 44, -1, 63, 2, (SceneItem *) NULL);
+				}
+				break;
+			case 5:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 2, 4);
+				_wreckage.setPosition(Common::Point(243, 131));
+				_wreckage.fixPriority(10);
+				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
 
-	_playerShadow.postInit();
-	_playerShadow.fixPriority(10);
+				_wreckage2.postInit();
+				_wreckage2.setup(1550, 2, 3);
+				_wreckage2.setPosition(Common::Point(243, 64));
+				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 6:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 2, 1);
+				_wreckage.setPosition(Common::Point(60, 55));
+				_wreckage.fixPriority(133);
+				_wreckage.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
 
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		_playerShadow.setVisage(1112);
-	else
-		_playerShadow.setVisage(1111);
+				_wreckage2.postInit();
+				_wreckage2.setup(1550, 2, 2);
+				_wreckage2.setPosition(Common::Point(60, 133));
+				_wreckage2.fixPriority(106);
+				_wreckage2.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 7:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 3, 1);
+				_wreckage.setPosition(Common::Point(281, 132));
+				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 8:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 3, 2);
+				_wreckage.setPosition(Common::Point(57, 96));
+				_wreckage.fixPriority(70);
+				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 
-	_playerShadow._effect = EFFECT_SHADOW_MAP;
-	_playerShadow._shadowMap = _shadowPaletteMap;
-	R2_GLOBALS._player._linkedActor = &_playerShadow;
+				_wreckage2.postInit();
+				_wreckage2.setup(1550, 3, 3);
+				_wreckage2.setPosition(Common::Point(145, 88));
+				_wreckage2.fixPriority(55);
+				_wreckage2.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 
-	_companionShadow.postInit();
-	_companionShadow.fixPriority(10);
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		_companionShadow.setVisage(1111);
-	else
-		_companionShadow.setVisage(1112);
+				_wreckage3.postInit();
+				_wreckage3.setup(1550, 3, 4);
+				_wreckage3.setPosition(Common::Point(64, 137));
+				_wreckage3.fixPriority(115);
+				_wreckage3.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 
-	_companionShadow._effect = EFFECT_SHADOW_MAP;
-	_companionShadow._shadowMap = _shadowPaletteMap;
-	_companion._linkedActor = &_companionShadow;
+				_wreckage4.postInit();
+				_wreckage4.setup(1550, 5, 1);
+				_wreckage4.setPosition(Common::Point(60, 90));
+				_wreckage4.fixPriority(45);
+				break;
+			case 9:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 4, 2);
+				_wreckage.setPosition(Common::Point(262, 96));
+				_wreckage.fixPriority(70);
+				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 
-	R2_GLOBALS._sound1.play(134);
+				_wreckage2.postInit();
+				_wreckage2.setup(1550, 4, 3);
+				_wreckage2.setPosition(Common::Point(174, 88));
+				_wreckage2.fixPriority(55);
+				_wreckage2.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 
-	switch (R2_GLOBALS._sceneManager._previousScene) {
-	case 1530:
-		R2_GLOBALS._player._characterIndex = R2_QUINN;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._player.hide();
-		_companion.hide();
+				_wreckage3.postInit();
+				_wreckage3.setup(1550, 4, 4);
+				_wreckage3.setPosition(Common::Point(255, 137));
+				_wreckage3.fixPriority(115);
+				_wreckage3.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 
-		_hatch.postInit();
-		_hatch.hide();
+				_wreckage4.postInit();
+				_wreckage4.setup(1550, 6, 1);
+				_wreckage4.setPosition(Common::Point(259, 90));
+				_wreckage4.fixPriority(45);
+				break;
+			case 10:
+				_wreckage.postInit();
+				_wreckage.setup(1550, 4, 1);
+				_wreckage.setPosition(Common::Point(38, 132));
+				_wreckage.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 12:
+				// Intact ship
+				_shipComponents[7].setupShipComponent(8);
+				_shipComponents[0].setupShipComponent(1);
+				_shipComponents[1].setupShipComponent(2);
+				_shipComponents[2].setupShipComponent(3);
+				_shipComponents[3].setupShipComponent(4);
+				_shipComponents[4].setupShipComponent(5);
+				_shipComponents[5].setupShipComponent(6);
+				_shipComponents[6].setupShipComponent(7);
+				break;
+			default:
+				break;
+			}
+		}
+	}
 
-		_ledgeHopper.postInit();
-		_ledgeHopper.setup(1701, 1, 1);
-		_ledgeHopper.setPosition(Common::Point(220, 137));
-		_ledgeHopper.setDetails(1700, 6, -1, -1, 1, (SceneItem *) NULL);
+	if (R2_GLOBALS._s1550PlayerArea[R2_QUINN] == R2_GLOBALS._s1550PlayerArea[R2_SEEKER]) {
+		_companion.postInit();
+		_companion._effect = EFFECT_SHADED2;
+		_companion.changeZoom(-1);
 
-		_playerShadow.hide();
-		_companionShadow.hide();
-		R2_GLOBALS._events.setCursor(CURSOR_WALK);
-		_stripManager.start(539, this);
-		_sceneMode = 40;
-		break;
-	case 1750: {
-		R2_GLOBALS._player.setPosition(Common::Point(282, 121));
-		_companion.setPosition(Common::Point(282, 139));
-		_sceneMode = 8;
-		Common::Point pt(262, 101);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
-		Common::Point pt2(262, 119);
-		NpcMover *mover2 = new NpcMover();
-		_companion.addMover(mover2, &pt2, this);
-		}
-		break;
-	case 1800: {
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._player.setPosition(Common::Point(0, 86));
-		_companion.setPosition(Common::Point(0, 64));
-		_sceneMode = 7;
-		R2_GLOBALS._player.setObjectWrapper(NULL);
-		R2_GLOBALS._player._strip = 1;
-		Common::Point pt(64, 86);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
-		_companion.setObjectWrapper(NULL);
-		_companion._strip = 1;
-		Common::Point pt2(77, 64);
-		NpcMover *mover2 = new NpcMover();
-		_companion.addMover(mover2, &pt2, NULL);
-		}
-		break;
-	default:
+		assert((_walkRegionsId >= 1550) && (_walkRegionsId <= 2008));
+		R2_GLOBALS._walkRegions.disableRegion(k5A750[_walkRegionsId - 1550]);
+		_companion.setPosition(Common::Point(scene1550JunkX[k5A76D[_walkRegionsId - 1550]], scene1550JunkY[k5A76D[_walkRegionsId - 1550]] + 8));
 		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			R2_GLOBALS._player.setPosition(Common::Point(109, 160));
-			_companion.setPosition(Common::Point(156, 160));
-			R2_GLOBALS._walkRegions.disableRegion(15);
+			if (R2_GLOBALS._player._characterScene[R2_SEEKER] == 1580) {
+				_companion.setup(1516, 3, 17);
+				_companion.setPosition(Common::Point(272, 94));
+				_companion.fixPriority(91);
+				_companion.changeZoom(100);
+				_companion.setDetails(1550, -1, -1, -1, 5, &_shipComponents[7]);
+			} else {
+				_companion.setup(1505, 6, 1);
+				_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+			}
 		} else {
-			R2_GLOBALS._player.setPosition(Common::Point(156, 160));
-			_companion.setPosition(Common::Point(109, 160));
-			R2_GLOBALS._walkRegions.disableRegion(17);
+			if (R2_GLOBALS._player._characterScene[R2_QUINN] == 1580) {
+				_companion.setup(1516, 2, 14);
+				_companion.setPosition(Common::Point(276, 97));
+				_companion.fixPriority(91);
+				_companion.changeZoom(100);
+				_companion.setDetails(1550, -1, -1, -1, 5, &_shipComponents[7]);
+			} else {
+				_companion.setup(1500, 6, 1);
+				_companion.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+			}
 		}
-		_sceneMode = 50;
-		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
-		break;
 	}
-	R2_GLOBALS._player._characterScene[R2_QUINN] = 1700;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1700;
-	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1700;
-	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1700;
+	R2_GLOBALS._uiElements.updateInventory();
+}
 
-	enterArea();
+/*--------------------------------------------------------------------------
+ * Scene 1575 - Spaceport - unused ship scene
+ *
+ *--------------------------------------------------------------------------*/
 
-	_surface.setDetails(1, 1700, 3, -1, -1);
-	_background.setDetails(Rect(0, 0, 480, 200), 1700, 0, -1, -1, 1, NULL);
+Scene1575::Button::Button() {
+	_buttonId = 0;
+	_pressed = false;
 }
 
-void Scene1700::remove() {
-	R2_GLOBALS._sound1.fadeOut2(NULL);
-	SceneExt::remove();
+void Scene1575::Button::synchronize(Serializer &s) {
+	NamedHotspot::synchronize(s);
+
+	s.syncAsSint16LE(_buttonId);
+	s.syncAsSint16LE(_pressed);
 }
 
-void Scene1700::signal() {
-	switch (_sceneMode) {
-	case 1: {
-		_sceneMode = 3;
-		if (R2_GLOBALS._rimLocation < 2400)
-			++R2_GLOBALS._rimLocation;
-		enterArea();
-		R2_GLOBALS._player.setPosition(Common::Point(235 - (((((235 - R2_GLOBALS._player._position.x) * 100) / 103) * 167) / 100), 170));
-		Common::Point pt(R2_GLOBALS._player._position.x, 160);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
+void Scene1575::Button::process(Event &event) {
+	Scene1575 *scene = (Scene1575 *)R2_GLOBALS._sceneManager._scene;
+	bool isInBounds = _bounds.contains(event.mousePos);
+	CursorType cursor = R2_GLOBALS._events.getCursor();
 
-		if (R2_GLOBALS._player._position.x < 132) {
-			_companion.setPosition(Common::Point(156, 170));
-			Common::Point pt2(156, 160);
-			NpcMover *mover2 = new NpcMover();
-			_companion.addMover(mover2, &pt2, NULL);
-			R2_GLOBALS._walkRegions.disableRegion(15);
-		} else {
-			_companion.setPosition(Common::Point(109, 170));
-			Common::Point pt3(109, 160);
-			NpcMover *mover3 = new NpcMover();
-			_companion.addMover(mover3, &pt3, NULL);
-			R2_GLOBALS._walkRegions.disableRegion(17);
-		}
-		}
-		break;
-	case 2: {
-		_sceneMode = 3;
-		if (R2_GLOBALS._rimLocation > -2400)
-			--R2_GLOBALS._rimLocation;
-		enterArea();
-		R2_GLOBALS._player.setPosition(Common::Point(235 - (((((235 - R2_GLOBALS._player._position.x) * 100) / 167) * 103) / 100), 0));
-		Common::Point pt(R2_GLOBALS._player._position.x, 10);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
+	if ((event.eventType == EVENT_BUTTON_DOWN && cursor == CURSOR_USE && isInBounds) ||
+		(_pressed && _buttonId != 1 && event.eventType == EVENT_BUTTON_UP && isInBounds)) {
+		// Button pressed
+		_pressed = true;
+		Common::Point pos = scene->_actor1._position;
+		event.handled = true;
 
-		if (R2_GLOBALS._player._position.x >= 171) {
-			_companion.setPosition(Common::Point(155, 0));
-			Common::Point pt2(155, 10);
-			NpcMover *mover2 = new NpcMover();
-			_companion.addMover(mover2, &pt2, NULL);
-			R2_GLOBALS._walkRegions.disableRegion(15);
-		} else {
-			_companion.setPosition(Common::Point(188, 0));
-			Common::Point pt3(188, 10);
-			NpcMover *mover3 = new NpcMover();
-			_companion.addMover(mover3, &pt3, NULL);
-			R2_GLOBALS._walkRegions.disableRegion(17);
-		}
-		}
-		break;
-	case 3:
-		if (!_walkFlag) {
-			R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		} else {
-			R2_GLOBALS.setFlag(15);
-			_walkFlag = false;
-			_sceneMode = 31;
-			R2_GLOBALS._events.setCursor(CURSOR_WALK);
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-				_stripManager.start(542, this);
-			else
-				_stripManager.start(543, this);
-		}
-		break;
-	case 4: {
-		_sceneMode = 5;
-		Common::Point pt(271, 90);
-		PlayerMover *mover = new PlayerMover();
-		_companion.addMover(mover, &pt, NULL);
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			setAction(&_sequenceManager, this, 1700, &R2_GLOBALS._player, &_rimTransportDoor, NULL);
-		else
-			setAction(&_sequenceManager, this, 1701, &R2_GLOBALS._player, &_rimTransportDoor, NULL);
-		}
-		break;
-	case 5:
-		R2_GLOBALS._sceneManager.changeScene(1750);
-		break;
-	case 6:
-		R2_GLOBALS._sceneManager.changeScene(1800);
-		break;
-	case 7:
-		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
-		R2_GLOBALS._player._strip = 1;
-		_companion.setObjectWrapper(new SceneObjectWrapper());
-		_companion._strip = 1;
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		R2_GLOBALS._walkRegions.disableRegion(14);
-		break;
-	case 8:
-		R2_GLOBALS._player._strip = 2;
-		_companion._strip = 1;
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		R2_GLOBALS._walkRegions.disableRegion(12);
-		break;
-	case 30:
-		_sceneMode = 31;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			_stripManager.start(540, this);
-		else
-			_stripManager.start(541, this);
-		break;
-	case 31:
-		R2_GLOBALS._player.enableControl(CURSOR_TALK);
-		break;
-	case 40:
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1704;
-		setAction(&_sequenceManager, this, 1704, &R2_GLOBALS._player, &_companion,
-			&_hatch, &_ledgeHopper, &_playerShadow, &_companionShadow, NULL);
-		break;
-	case 50:
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			R2_GLOBALS._walkRegions.disableRegion(15);
-		else
-			R2_GLOBALS._walkRegions.disableRegion(17);
+		if (!R2_GLOBALS.getFlag(18) || _buttonId <= 1 || _buttonId >= 6) {
+			switch (_buttonId) {
+			case 1:
+				if (R2_GLOBALS.getFlag(18)) {
+					scene->_actor14.hide();
+					scene->_actor15.hide();
+					R2_GLOBALS.clearFlag(18);
+				} else if ((scene->_actor12._position.x == 85) && (scene->_actor12._position.y == 123)) {
+					scene->_actor14.show();
+					scene->_actor15.show();
+					R2_GLOBALS.setFlag(18);
+				} else {
+					SceneItem::display("That's probably not a good thing, ya know!");
+				}
+				break;
+			case 2:
+				if (scene->_field41A < 780) {
+					if (pos.x > 54)
+						pos.x -= 65;
+					pos.x += 2;
+					scene->_field41A += 2;
 
-		R2_GLOBALS._player.enableControl();
-		break;
-	case 1704:
-		R2_GLOBALS._sound1.play(134);
-		R2_GLOBALS._walkRegions.disableRegion(15);
-		R2_GLOBALS._walkRegions.disableRegion(2);
-		R2_GLOBALS._walkRegions.disableRegion(12);
-		R2_GLOBALS._player.fixPriority(-1);
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		break;
-	default:
-		R2_GLOBALS._player.enableControl();
-		break;
-	}
-}
+					for (int i = 0; i < 17; i++)
+						scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x + 2, scene->_arrActor[i]._position.y));
 
-/*--------------------------------------------------------------------------
- * Scene 1750 - Maintaiance Vechile
- *
- *--------------------------------------------------------------------------*/
+					scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x + 2, scene->_actor13._position.y));
+					scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x + 2, scene->_actor12._position.y));
+					scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
+					scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
+					scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
+				}
+				break;
+			case 3:
+				if (scene->_field41A > 0) {
+					if (pos.x < -8)
+						pos.x += 65;
+
+					pos.x -= 2;
+					scene->_field41A -= 2;
+					for (int i = 0; i < 17; i++)
+						scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x - 2, scene->_arrActor[i]._position.y));
+
+					scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x - 2, scene->_actor13._position.y));
+					scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x - 2, scene->_actor12._position.y));
+					scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
+					scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
+					scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
+				}
+				break;
+			case 4: {
+					if (pos.y < 176) {
+						++pos.y;
+						for (int i = 0; i < 17; ++i)
+							scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x, scene->_arrActor[i]._position.y + 1));
+
+						scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x, scene->_actor13._position.y + 1));
+						scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x, scene->_actor12._position.y + 1));
+						scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
+						scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
+						scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
+					}
+				}
+				break;
+			case 5: {
+					if (pos.y > 145) {
+						--pos.y;
+						for (int i = 0; i < 17; ++i)
+							scene->_arrActor[i].setPosition(Common::Point(scene->_arrActor[i]._position.x, scene->_arrActor[i]._position.y - 1));
+
+						scene->_actor13.setPosition(Common::Point(scene->_actor13._position.x, scene->_actor13._position.y - 1));
+						scene->_actor12.setPosition(Common::Point(scene->_actor12._position.x, scene->_actor12._position.y - 1));
+						scene->_actor1.setPosition(Common::Point(pos.x, pos.y));
+						scene->_actor2.setPosition(Common::Point(pos.x + 65, pos.y));
+						scene->_actor3.setPosition(Common::Point(pos.x + 130, pos.y));
+					}
+				}
+				break;
+			case 6:
+				R2_GLOBALS._sceneManager.changeScene(1550);
+				break;
+			default:
+				break;
+			}
 
-Scene1750::Button::Button() {
-	_buttonId = 0;
-}
+			int j = 0;
+			for (int i = 0; i < 17; i++) {
+				if (scene->_arrActor[i]._bounds.contains(85, 116))
+					j = i;
+			}
 
-void Scene1750::Button::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+			if (scene->_actor13._bounds.contains(85, 116))
+				j = 18;
 
-	s.syncAsSint16LE(_buttonId);
+			if (scene->_actor12._bounds.contains(85, 116))
+				j = 19;
+
+			if (j)
+				scene->_actor11.show();
+			else
+				scene->_actor11.hide();
+		} else {
+			SceneItem::display("Better not move the laser while it's firing!");
+		}
+	} else {
+		_pressed = false;
+	}
 }
 
-bool Scene1750::Button::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
+bool Scene1575::Button::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return false;
+	return SceneHotspot::startAction(action, event);
+}
 
-	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
+void Scene1575::Button::initButton(int buttonId) {
+	_buttonId = buttonId;
+	_pressed = false;
+	EventHandler::postInit();
 
 	switch (_buttonId) {
 	case 1:
-		// Forward button
-		show();
-		scene->_backwardButton.hide();
-		if (scene->_speed < 0)
-			scene->_speed = -scene->_speed;
-		scene->_direction = 1;
+		setDetails(Rect(53, 165, 117, 190), -1, -1, -1, 2, 1, NULL);
 		break;
 	case 2:
-		// Backwards button
-		show();
-		scene->_forwardButton.hide();
-		if (scene->_speed > 0)
-			scene->_speed = -scene->_speed;
-		scene->_direction = -1;
+		setDetails(Rect(151, 142, 189, 161), -1, -1, -1, 2, 1, NULL);
 		break;
 	case 3:
-		// Exit button
-		if (scene->_rotation->_idxChange == 0) {
-			show();
-			R2_GLOBALS._sceneManager.changeScene(1700);
-		} else {
-			scene->_speed = 0;
-			scene->_speedSlider._moveRate = 20;
-			scene->_forwardButton._moveDiff.y = 1;
-			Common::Point pt(286, 143);
-			NpcMover *mover = new NpcMover();
-			scene->_speedSlider.addMover(mover, &pt, NULL);
-		}
+		setDetails(Rect(225, 142, 263, 161), -1, -1, -1, 2, 1, NULL);
+		break;
+	case 4:
+		setDetails(Rect(188, 122, 226, 140), -1, -1, -1, 2, 1, NULL);
+		break;
+	case 5:
+		setDetails(Rect(188, 162, 226, 180), -1, -1, -1, 2, 1, NULL);
+		break;
+	case 6:
+		setDetails(Rect(269, 169, 301, 185), -1, -1, -1, 2, 1, NULL);
+		break;
 	default:
 		break;
 	}
-
-	return true;
-}
-
-/*------------------------------------------------------------------------*/
-
-Scene1750::SpeedSlider::SpeedSlider() {
-	_incrAmount = 0;
-	_xp = 0;
-	_ys = 0;
-	_height = 0;
-	_thumbHeight = 0;
-	_mouseDown = false;
 }
 
-void Scene1750::SpeedSlider::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+/*--------------------------------------------------------------------------*/
 
-	s.syncAsSint16LE(_incrAmount);
-	s.syncAsSint16LE(_xp);
-	s.syncAsSint16LE(_ys);
-	s.syncAsSint16LE(_height);
-	s.syncAsSint16LE(_thumbHeight);
-	s.syncAsSint16LE(_mouseDown);
+Scene1575::Scene1575() {
+	_field412 = 0;
+	_field414 = 390;
+	_field416 = 0;
+	_field418 = 0;
+	_field41A = 0;
 }
 
-void Scene1750::SpeedSlider::setupSlider(int incrAmount, int xp, int ys, int height, int thumbHeight) {
-	_mouseDown = false;
-	_incrAmount = incrAmount;
-	_xp = xp;
-	_ys = ys;
-	_height = height;
-	_thumbHeight = thumbHeight;
+void Scene1575::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
 
-	postInit();
-	setup(1750, 1, 1);
-	fixPriority(255);
-	setPosition(Common::Point(_xp, _ys + ((_height * (incrAmount - 1)) / (_thumbHeight - 1))));
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+	s.syncAsSint16LE(_field418);
+	s.syncAsSint16LE(_field41A);
 }
 
-void Scene1750::SpeedSlider::calculateSlider() {
-	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
-
-	int tmpVar = (_height / (_thumbHeight - 1)) / 2;
-	int tmpVar2 = ((_position.y - _ys + tmpVar) * _thumbHeight) / (_height + 2 * tmpVar);
-
-	setPosition(Common::Point(_xp, _ys + ((_height * tmpVar2) / (_thumbHeight - 1))));
-	scene->_speed = scene->_direction * tmpVar2;
+double hypotenuse(double v1, double v2) {
+	return sqrt(v1 * v1 + v2 * v2);
 }
 
-void Scene1750::SpeedSlider::process(Event &event) {
-	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) &&
-			(_bounds.contains(event.mousePos))) {
-		_mouseDown = true;
-		event.eventType = EVENT_NONE;
-	}
-
-	if ((event.eventType == EVENT_BUTTON_UP) && _mouseDown) {
-		_mouseDown = false;
-		event.handled = true;
-		addMover(NULL);
-		calculateSlider();
-	}
-
-	if (_mouseDown) {
-		event.handled = true;
-		if (event.mousePos.y >= _ys) {
-			if (_ys + _height >= event.mousePos.y)
-				setPosition(Common::Point(_xp, event.mousePos.y));
-			else
-				setPosition(Common::Point(_xp, _ys + _height));
-		} else {
-			setPosition(Common::Point(_xp, _ys));
-		}
-	}
-}
+void Scene1575::postInit(SceneObjectList *OwnerList) {
+	loadScene(1575);
+	R2_GLOBALS._uiElements._active = false;
+	SceneExt::postInit();
+	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
 
-bool Scene1750::SpeedSlider::startAction(CursorType action, Event &event) {
-	if (action == CURSOR_USE)
-		return SceneActor::startAction(action, event);
+	_actor1.postInit();
+	_actor1.setup(1575, 1, 1);
+	_actor1.setPosition(Common::Point(54, 161));
+	_actor1.fixPriority(5);
 
-	return false;
-}
+	_actor2.postInit();
+	_actor2.setup(1575, 1, 1);
+	_actor2.setPosition(Common::Point(119, 161));
+	_actor2.fixPriority(5);
 
-/*------------------------------------------------------------------------*/
+	_actor3.postInit();
+	_actor3.setup(1575, 1, 1);
+	_actor3.setPosition(Common::Point(184, 161));
+	_actor3.fixPriority(5);
 
-Scene1750::Scene1750() {
-	_direction = 0;
-	_speedCurrent = 0;
-	_speed = 0;
-	_speedDelta = 0;
-	_rotationSegment = 0;
-	_rotationSegCurrent = 0;
-	_newRotation = 0;
+	for (int i = 0; i < 17; i++) {
+		_arrActor[i].postInit();
+		_arrActor[i].setup(1575, 2, k5A7F6[3 * i + 2]);
 
-	_rotation = nullptr;
-}
+		double v1 = hypotenuse(2.0, 3 - k5A7F6[3 * i]);
+		v1 += hypotenuse(2.0, 3 - k5A7F6[3 * i + 1]);
+		int yp = (int)(sqrt(v1) * 75.0 / 17.0 - 161.0);
 
-void Scene1750::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
-	SYNC_POINTER(_rotation);
+		int angle = R2_GLOBALS._gfxManagerInstance.getAngle(
+			Common::Point(3, 16), Common::Point(k5A7F6[3 * i], k5A7F6[3 * i + 1]));
+		int xp = angle * 78 / 9 - 319;
 
-	s.syncAsSint16LE(_direction);
-	s.syncAsSint16LE(_speedCurrent);
-	s.syncAsSint16LE(_speed);
-	s.syncAsSint16LE(_speedDelta);
-	s.syncAsSint16LE(_rotationSegment);
-	s.syncAsSint16LE(_rotationSegCurrent);
-	s.syncAsSint16LE(_newRotation);
-}
+		_arrActor[i].setPosition(Common::Point(xp, yp));
+		_arrActor[i].fixPriority(6);
+	}
 
-void Scene1750::postInit(SceneObjectList *OwnerList) {
-	loadScene(1750);
-	R2_GLOBALS._sound1.play(115);
-	R2_GLOBALS._uiElements._active = false;
+	_actor4.postInit();
+	_actor4.setup(1575, 3, 1);
+	_actor4.setPosition(Common::Point(48, 81));
 
-	SceneExt::postInit();
-	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
+	_actor5.postInit();
+	_actor5.setup(1575, 3,1);
+	_actor5.setPosition(Common::Point(121, 81));
 
-	R2_GLOBALS._player._characterScene[R2_QUINN] = 1750;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1750;
-	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1750;
-	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1750;
+	_actor6.postInit();
+	_actor6.setup(1575, 3, 2);
+	_actor6.setPosition(Common::Point(203, 80));
 
-	_rotation = R2_GLOBALS._scenePalette.addRotation(224, 254, 1);
-	_rotation->setDelay(0);
-	_rotation->_idxChange = 0;
-	_rotation->_countdown = 2;
+	_actor7.postInit();
+	_actor7.setup(1575, 3, 2);
+	_actor7.setPosition(Common::Point(217, 80));
 
-	switch ((R2_GLOBALS._rimLocation + 2) % 4) {
-	case 0:
-		_rotation->_currIndex = 247;
-		break;
-	case 1:
-		_rotation->_currIndex = 235;
-		break;
-	case 2:
-		_rotation->_currIndex = 239;
-		break;
-	case 3:
-		_rotation->_currIndex = 243;
-		break;
-	default:
-		break;
-	}
+	_actor8.postInit();
+	_actor8.setup(1575, 3, 2);
+	_actor8.setPosition(Common::Point(231, 80));
 
-	byte tmpPal[768];
+	_actor9.postInit();
+	_actor9.setup(1575, 3, 2);
+	_actor9.setPosition(Common::Point(273, 91));
 
-	for (int i = 224; i < 255; i++) {
-		int tmpIndex = _rotation->_currIndex - 224;
-		if (tmpIndex > 254)
-			tmpIndex -= 31;
-		tmpPal[3 * i] = R2_GLOBALS._scenePalette._palette[3 * tmpIndex];
-		tmpPal[(3 * i) + 1] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 1];
-		tmpPal[(3 * i) + 2] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 2];
-	}
+	_actor10.postInit();
+	_actor10.setup(1575, 3, 2);
+	_actor10.setPosition(Common::Point(287, 91));
 
-	for (int i = 224; i < 255; i++) {
-		R2_GLOBALS._scenePalette._palette[3 * i] = tmpPal[3 * i];
-		R2_GLOBALS._scenePalette._palette[(3 * i) + 1] = tmpPal[(3 * i) + 1];
-		R2_GLOBALS._scenePalette._palette[(3 * i) + 2] = tmpPal[(3 * i) + 2];
-	}
+	// Initialize buttons
+	_button1.initButton(1);
+	_button2.initButton(2);
+	_button3.initButton(3);
+	_button4.initButton(4);
+	_button5.initButton(5);
+	_button6.initButton(6);
+
+	_actor11.postInit();
+	_actor11.setup(1575, 4, 2);
+	_actor11.setPosition(Common::Point(84, 116));
+	_actor11.hide();
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.hide();
 	R2_GLOBALS._player.enableControl();
 
-	_radarSweep.postInit();
-	_radarSweep.setup(1750, 3, 1);
-	_radarSweep.setPosition(Common::Point(49, 185));
-	_radarSweep.fixPriority(7);
-	_radarSweep.setDetails(1750, 30, -1, -1, 1, (SceneItem *) NULL);
-
-	_scannerIcon.postInit();
-	_scannerIcon.setup(1750, 2, 1);
-	_scannerIcon.setPosition(Common::Point(35, ((_rotation->_currIndex - 218) % 4) + ((R2_GLOBALS._rimLocation % 800) * 4) - 1440));
-	_scannerIcon.fixPriority(8);
+	do {
+		_field412 = R2_GLOBALS._randomSource.getRandomNumber(20) - 10;
+		_field414 = R2_GLOBALS._randomSource.getRandomNumber(20) - 10;
+	} while ((_field412) && (_field414));
 
-	_redLights.postInit();
-	_redLights.setup(1750, 1, 4);
+	if (_field412 < 0)
+		_actor4.hide();
 
-	int tmpVar = ABS(_scannerIcon._position.y - 158) / 100;
+	if (_field414 < 0)
+		_actor5.hide();
 
-	if (tmpVar >= 8)
-		_redLights.hide();
-	else if (_scannerIcon._position.y <= 158)
-		_redLights.setPosition(Common::Point(137, (tmpVar * 7) + 122));
-	else
-		_redLights.setPosition(Common::Point(148, (tmpVar * 7) + 122));
+	_field416 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
+	_field418 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
 
-	_speedSlider.setupSlider(1, 286, 143, 41, 15);
-	_speedSlider.setDetails(1750, 24, 1, -1, 1, (SceneItem *) NULL);
+	_actor13.postInit();
+	_actor13.setup(1575, 2, 4);
 
-	_forwardButton.postInit();
-	_forwardButton._buttonId = 1;
-	_forwardButton.setup(1750, 1, 2);
-	_forwardButton.setPosition(Common::Point(192, 140));
-	_forwardButton.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
+	// TODO
+	warning("TODO: another immense pile of floating operations");
 
-	_backwardButton.postInit();
-	_backwardButton._buttonId = 2;
-	_backwardButton.setup(1750, 1, 3);
-	_backwardButton.setPosition(Common::Point(192, 163));
-	_backwardButton.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
-	_backwardButton.hide();
+	_actor12.postInit();
+	_actor12.fixPriority(12);
 
-	_exitButton.postInit();
-	_exitButton._buttonId = 3;
-	_exitButton.setup(1750, 1, 5);
-	_exitButton.setPosition(Common::Point(230, 183));
-	_exitButton.setDetails(1750, 27, 1, -1, 1, (SceneItem *) NULL);
+	if (R2_GLOBALS.getFlag(17)) {
+		_actor13.setPosition(Common::Point(_actor13._position.x + 5, _actor13._position.y));
+		_actor12.setPosition(Common::Point(_actor12._position.x + 5, _actor12._position.y));
+	}
 
-	_direction = 1;		// Forward by default
-	_speedDelta = 0;
-	_speedCurrent = 0;
-	_speed = 0;
-	_rotationSegment = ((_rotation->_currIndex - 218) / 4) % 4;
+	_actor14.postInit();
+	_actor14.setup(1575, 5, 1);
+	_actor14.setPosition(Common::Point(85, 176));
+	_actor14.fixPriority(7);
+	_actor14.hide();
 
-	_redLightsDescr.setDetails(Rect(129, 112, 155, 175), 1750, 21, -1, -1, 1, NULL);
-	_greenLights.setDetails(Rect(93, 122, 126, 172), 1750, 15, -1, -1, 1, NULL);
-	_frontView.setDetails(Rect(3, 3, 157, 99), 1750, 9, -1, -1, 1, NULL);
-	_rearView.setDetails(Rect(162, 3, 316, 99), 1750, 12, -1, -1, 1, NULL);
-	_background.setDetails(Rect(0, 0, 320, 200), 1750, 6, 1, -1, 1, NULL);
+	_actor15.postInit();
+	_actor15.setup(1575, 5, 2);
+	_actor15.setPosition(Common::Point(85, 147));
+	_actor15.fixPriority(7);
+	_actor15.hide();
 }
 
-void Scene1750::remove() {
-	if (R2_GLOBALS._rimLocation == 2400)
-		R2_GLOBALS._rimLocation = 2399;
-
-	if (R2_GLOBALS._rimLocation == -2400)
-		R2_GLOBALS._rimLocation = -2399;
-
-	R2_GLOBALS._rimTransportLocation = R2_GLOBALS._rimLocation;
-
+void Scene1575::remove() {
 	SceneExt::remove();
-	R2_GLOBALS._sound1.fadeOut2(NULL);
 	R2_GLOBALS._uiElements._active = true;
 }
 
-void Scene1750::signal() {
+void Scene1575::signal() {
 	R2_GLOBALS._player.enableControl();
 }
 
-void Scene1750::process(Event &event) {
+void Scene1575::process(Event &event) {
 	Scene::process(event);
-	if (!event.handled)
-		_speedSlider.process(event);
-}
 
-void Scene1750::dispatch() {
-	if (_rotation) {
-		if (!_speedDelta && (_speed != _speedCurrent)) {
-			if (_speedCurrent >= _speed)
-				--_speedCurrent;
-			else
-				++_speedCurrent;
+	g_globals->_sceneObjects->recurse(SceneHandler::dispatchObject);
+}
 
-			_speedDelta = 21 - ABS(_speedCurrent);
+void Scene1575::dispatch() {
+	if (_field412 <= 0) {
+		++_field412;
+		if (_field412 == 0) {
+			_actor4.show();
+			_field412 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
 		}
-
-		if (_speedDelta == 1) {
-			if (_speedCurrent == 0) {
-				_radarSweep.show();
-				_rotation->_idxChange = 0;
-			} else {
-				if (_rotation->_idxChange == 0)
-					_radarSweep.hide();
-
-				if (_speedCurrent < -12) {
-					_rotation->setDelay(15 - ABS(_speedCurrent));
-					_rotation->_idxChange = -2;
-				} else if (_speedCurrent < 0) {
-					_rotation->setDelay(10 - ABS(_speedCurrent));
-					_rotation->_idxChange = -1;
-				} else if (_speedCurrent < 11) {
-					_rotation->setDelay(10 - _speedCurrent);
-					_rotation->_idxChange = 1;
-				} else {
-					_rotation->setDelay(15 - _speedCurrent);
-					_rotation->_idxChange = 2;
-				}
-			}
+	} else {
+		_field412--;
+		if (_field412 ==0) {
+			_actor4.hide();
+			_field412 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
 		}
+	}
 
-		if (_speedDelta)
-			--_speedDelta;
-
-		_rotationSegCurrent = _rotationSegment;
-		_rotationSegment = ((_rotation->_currIndex - 218) / 4) % 4;
-
-		if ((_rotationSegCurrent + 1) == _rotationSegment || (_rotationSegCurrent - 3)  == _rotationSegment) {
-			if (R2_GLOBALS._rimLocation < 2400) {
-				++R2_GLOBALS._rimLocation;
-			}
+	if (_field414 <= 0) {
+		++_field414;
+		if (_field414 == 0) {
+			_actor5.show();
+			_field414 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
 		}
-
-		if ((_rotationSegCurrent - 1) == _rotationSegment || (_rotationSegCurrent + 3) == _rotationSegment) {
-			if (R2_GLOBALS._rimLocation > -2400) {
-				--R2_GLOBALS._rimLocation;
-			}
+	} else {
+		_field414--;
+		if (_field414 == 0) {
+			_actor5.hide();
+			_field414 = R2_GLOBALS._randomSource.getRandomNumber(9) + 1;
 		}
+	}
 
-		if (_rotation->_currIndex != _newRotation) {
-			// Handle setting the position of the lift icon in the scanner display
-			_newRotation = _rotation->_currIndex;
-			_scannerIcon.setPosition(Common::Point(35, ((_rotation->_currIndex - 218) % 4) +
-				((R2_GLOBALS._rimLocation % 800) * 4) - 1440));
+	if (_field416 == 0) {
+		switch(R2_GLOBALS._randomSource.getRandomNumber(3)) {
+		case 0:
+			_actor6.hide();
+			_actor7.hide();
+			_actor8.hide();
+			break;
+		case 1:
+			_actor6.show();
+			_actor7.hide();
+			_actor8.hide();
+			break;
+		case 2:
+			_actor6.show();
+			_actor7.show();
+			_actor8.hide();
+			break;
+		case 3:
+			_actor6.show();
+			_actor7.show();
+			_actor8.show();
+			break;
+		default:
+			break;
 		}
+		_field416 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
+	} else {
+		--_field416;
 	}
 
-	int v = ABS(_scannerIcon._position.y - 158) / 100;
-	if (v < 8) {
-		// Show how close the user is to the lift on the second column of lights
-		_redLights.show();
-		_redLights.setPosition(Common::Point((_scannerIcon._position.y <= 158) ? 137 : 148,
-			v * 7 + 122));
+	if (_field418 == 0) {
+		switch(R2_GLOBALS._randomSource.getRandomNumber(2)) {
+		case 0:
+			_actor9.hide();
+			_actor10.hide();
+			break;
+		case 1:
+			_actor9.show();
+			_actor10.hide();
+			break;
+		case 2:
+			_actor9.show();
+			_actor10.show();
+			break;
+		default:
+			break;
+		}
+		_field418 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
 	} else {
-		_redLights.hide();
+		_field418--;
 	}
+	Scene::dispatch();
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1800 - Rim Lift Exterior
+ * Scene 1580 - Inside wreck
  *
  *--------------------------------------------------------------------------*/
 
-Scene1800::Scene1800() {
-	_locationMode = 0;
+Scene1580::Scene1580() {
 }
 
-void Scene1800::synchronize(Serializer &s) {
+void Scene1580::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
+}
 
-	s.syncAsSint16LE(_locationMode);
+bool Scene1580::JoystickPlug::startAction(CursorType action, Event &event) {
+	if (action == R2_JOYSTICK) {
+		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+
+		R2_INVENTORY.setObjectScene(R2_JOYSTICK, 1580);
+		R2_GLOBALS._sceneItems.remove(&scene->_joystickPlug);
+		scene->_joystick.postInit();
+		scene->_joystick.setup(1580, 1, 4);
+		scene->_joystick.setPosition(Common::Point(159, 163));
+		scene->_joystick.setDetails(1550, 78, -1, -1, 2, (SceneItem *) NULL);
+
+		scene->_arrActor[5].remove();
+
+		return true;
+	}
+
+	return SceneHotspot::startAction(action, event);
 }
 
-bool Scene1800::Background::startAction(CursorType action, Event &event) {
-	if ((action != R2_COM_SCANNER) && (action != R2_COM_SCANNER_2))
-		return false;
+bool Scene1580::ScreenSlot::startAction(CursorType action, Event &event) {
+	if (action == R2_DIAGNOSTICS_DISPLAY) {
+		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+		R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, 1580);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._sceneItems.remove(&scene->_screenSlot);
 
-	R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_screen.postInit();
+		scene->_screen.setup(1580, 1, 1);
+		scene->_screen.setPosition(Common::Point(124, 108));
+		scene->_screen.fixPriority(10);
 
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		if (R2_GLOBALS._rimLocation == 1201) {
-			scene->_stripManager.start(548, this);
-		} else if (R2_GLOBALS.getFlag(66)) {
-			return false;
-		} else {
-			scene->_stripManager.start(546, this);
-		}
-	} else {
-		if (R2_GLOBALS._rimLocation == 1201) {
-			scene->_stripManager.start(549, this);
-		} else if (R2_GLOBALS.getFlag(66)) {
-			return false;
-		} else {
-			scene->_stripManager.start(547, this);
-		}
+		if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1580)
+			scene->_screen.setDetails(1550, 14, -1, -1, 5, &scene->_joystick);
+		else
+			scene->_screen.setDetails(1550, 14, -1, -1, 2, (SceneItem *)NULL);
+
+		scene->_screenDisplay.postInit();
+		scene->_screenDisplay.setup(1580, 3, 1);
+		scene->_screenDisplay.setPosition(Common::Point(124, 109));
+		scene->_screenDisplay.fixPriority(20);
+		//scene->_field412 = 1;
+		scene->_sceneMode = 10;
+		scene->setAction(&scene->_sequenceManager, scene, 1, &R2_GLOBALS._player, NULL);
+
+		return true;
 	}
 
-	R2_GLOBALS.setFlag(66);
-	return true;
+	return SceneHotspot::startAction(action, event);
 }
 
-bool Scene1800::Lever::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
+bool Scene1580::Joystick::startAction(CursorType action, Event &event) {
+	if ( (action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1580)
+		&& (R2_INVENTORY.getObjectScene(R2_FUEL_CELL) == 0) && (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) == 0)
+		&& (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) == 0) && (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 0)
+		&& (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 0) && (R2_INVENTORY.getObjectScene(R2_IGNITOR) == 0)) {
+		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+		scene->_sceneMode = 31;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			scene->_stripManager.start(536, scene);
+		else
+			scene->_stripManager.start(537, scene);
 
-	if (!R2_GLOBALS.getFlag(14))
-		return false;
+		return true;
+	}
 
-	if (R2_GLOBALS._player._characterIndex != R2_QUINN)
-		return SceneActor::startAction(action, event);
+	return SceneActor::startAction(action, event);
+}
 
-	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
-	R2_GLOBALS._player.disableControl();
+bool Scene1580::Screen::startAction(CursorType action, Event &event) {
+	if ((action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(R2_BROKEN_DISPLAY) == 1580)) {
+		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (_frame == 1) {
-		R2_GLOBALS.setFlag(64);
-		scene->_sceneMode = 1810;
-		scene->setAction(&scene->_sequenceManager, scene, 1810, &R2_GLOBALS._player, &scene->_lever, &scene->_leftStaircase, &scene->_rightStaircase, NULL);
-	} else {
-		R2_GLOBALS.clearFlag(64);
-		scene->_sceneMode = 1811;
-		scene->setAction(&scene->_sequenceManager, scene, 1811, &R2_GLOBALS._player, &scene->_lever, &scene->_leftStaircase, &scene->_rightStaircase, NULL);
+		R2_INVENTORY.setObjectScene(R2_BROKEN_DISPLAY, R2_GLOBALS._player._characterIndex);
+		scene->_screenSlot.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 2, NULL);
+		scene->_screenDisplay.remove();
+		remove();
+		return true;
 	}
-	return true;
+
+	return SceneActor::startAction(action, event);
 }
 
-bool Scene1800::Doors::startAction(CursorType action, Event &event) {
+bool Scene1580::StorageCompartment::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
 
-	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
-		// Seeker trying to force open the door
-		R2_GLOBALS._player.disableControl();
-		if (scene->_locationMode >= 2) {
-			if (R2_GLOBALS.getFlag(14)) {
-				// Allow door to close
-				scene->_sceneMode = 1809;
-				scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_doors, NULL);
-				R2_GLOBALS.clearFlag(14);
-			} else {
-				// Force open door
-				scene->_sceneMode = 1808;
-				scene->setAction(&scene->_sequenceManager, scene, 1808, &R2_GLOBALS._player, &scene->_doors, NULL);
-				R2_GLOBALS.setFlag(14);
-			}
-		} else {
-			// Seeker failing to force open doors
-			scene->_sceneMode = 1813;
-			// Original was using 1813 in setAction too, but it somewhat broken.
-			// Seeker goes 2 pixels to high, hiding behind the door
-			scene->setAction(&scene->_sequenceManager, scene, 1808, &R2_GLOBALS._player, &scene->_doors, NULL);
-		}
-	} else if (R2_GLOBALS.getFlag(14)) {
-		return SceneActor::startAction(action, event);
-	} else {
-		// Quinn trying to force open doors
-		R2_GLOBALS._player.disableControl();
-		scene->_sceneMode = 1812;
-		scene->setAction(&scene->_sequenceManager, scene, 1812, &R2_GLOBALS._player, NULL);
-	}
+	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._sceneItems.remove(&scene->_storageCompartment);
+	scene->_sceneMode = 0;
+	animate(ANIM_MODE_5, scene);
 
 	return true;
 }
 
-bool Scene1800::PassengerDoor::startAction(CursorType action, Event &event) {
+bool Scene1580::HatchButton::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
 
-	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (_position.x < 160) {
-		if (scene->_leftStaircase._frame == 1) {
-			return SceneActor::startAction(action, event);
-		} else {
-			R2_GLOBALS.setFlag(29);
-			R2_GLOBALS._player.disableControl();
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-				if (R2_GLOBALS.getFlag(14)) {
-					scene->_sceneMode = 1;
-					scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_companion, &scene->_doors, NULL);
-					R2_GLOBALS.clearFlag(14);
-				} else {
-					scene->_sceneMode = 1804;
-					scene->setAction(&scene->_sequenceManager, scene, 1804, &R2_GLOBALS._player, &scene->_companion, &scene->_leftDoor, NULL);
-				}
-			} else {
-				if (R2_GLOBALS.getFlag(14)) {
-					scene->_sceneMode = 1;
-					scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_doors, NULL);
-					R2_GLOBALS.clearFlag(14);
-				} else {
-					scene->_sceneMode = 1805;
-					scene->setAction(&scene->_sequenceManager, scene, 1805, &R2_GLOBALS._player, &scene->_companion, &scene->_leftDoor, NULL);
-				}
-			}
-		}
-	} else if (scene->_leftStaircase._frame == 1) {
-		return SceneActor::startAction(action, event);
-	} else {
-		R2_GLOBALS.clearFlag(29);
-		R2_GLOBALS._player.disableControl();
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			if (R2_GLOBALS.getFlag(14)) {
-				scene->_sceneMode = 2;
-				scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_companion, &scene->_doors, NULL);
-				R2_GLOBALS.clearFlag(14);
-			} else {
-				scene->_sceneMode = 1806;
-				scene->setAction(&scene->_sequenceManager, scene, 1806, &R2_GLOBALS._player, &scene->_companion, &scene->_rightDoor, NULL);
-			}
-		} else {
-			if (R2_GLOBALS.getFlag(14)) {
-				scene->_sceneMode = 2;
-				scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_doors, NULL);
-				R2_GLOBALS.clearFlag(14);
-			} else {
-				scene->_sceneMode = 1807;
-				scene->setAction(&scene->_sequenceManager, scene, 1807, &R2_GLOBALS._player, &scene->_companion, &scene->_rightDoor, NULL);
-			}
-		}
-	}
+	R2_GLOBALS._player.disableControl();
+	setFrame(2);
+	scene->_sceneMode = 20;
+	scene->setAction(&scene->_sequenceManager, scene, 2, &R2_GLOBALS._player, NULL);
 
 	return true;
 }
 
-void Scene1800::SouthExit::changeScene() {
-	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+bool Scene1580::ThrusterValve::startAction(CursorType action, Event &event) {
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	_enabled = false;
-	R2_GLOBALS._events.setCursor(CURSOR_WALK);
-	R2_GLOBALS._player.disableControl();
-	if (R2_GLOBALS.getFlag(14)) {
-		scene->_sceneMode = 3;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_companion, &scene->_doors, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_doors, NULL);
-		R2_GLOBALS.clearFlag(14);
-	} else {
-		scene->_sceneMode = 1802;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			scene->setAction(&scene->_sequenceManager, scene, 1802, &R2_GLOBALS._player, &scene->_companion, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager, scene, 1803, &R2_GLOBALS._player, &scene->_companion, NULL);
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_INVENTORY.setObjectScene(R2_THRUSTER_VALVE, 1);
+			remove();
+			return true;
+		}
+		break;
+	case R2_COM_SCANNER:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(529, scene);
+		return true;
+		break;
+	case R2_COM_SCANNER_2:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(527, scene);
+		return true;
+		break;
+	default:
+		break;
 	}
-}
-
-void Scene1800::postInit(SceneObjectList *OwnerList) {
-	loadScene(1800);
-	SceneExt::postInit();
-	R2_GLOBALS._sound1.play(116);
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
 
-	if (R2_GLOBALS._sceneManager._previousScene == -1)
-		R2_GLOBALS._rimLocation = 1201;
-
-	// Set the mode based on whether this is the "correct" lift or not
-	if (R2_GLOBALS._rimLocation == 1201)
-		_locationMode = 2;
-	else
-		_locationMode = 0;
-
-	scalePalette(65, 65, 65);
-	_southExit.setDetails(Rect(0, 160, 319, 168), EXITCURSOR_S, 1800);
-	_background.setDetails(Rect(0, 0, 320, 200), -1, -1, -1, -1, 1, NULL);
+	return SceneActor::startAction(action, event);
+}
 
-	_lever.postInit();
-	_lever.setup(1801, 4, 1);
-	_lever.setPosition(Common::Point(170, 124));
-	_lever.setDetails(1800, 13, 14, 15, 1, (SceneItem *) NULL);
+bool Scene1580::Ignitor::startAction(CursorType action, Event &event) {
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	_doors.postInit();
-	_doors.setup(1801, 3, 1);
-	_doors.setPosition(Common::Point(160, 139));
-	_doors.setDetails(1800, 6, -1, -1, 1, (SceneItem *) NULL);
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_INVENTORY.setObjectScene(R2_IGNITOR, 1);
+			remove();
+			return true;
+		}
+		break;
+	case R2_COM_SCANNER:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(529, scene);
+		return true;
+		break;
+	case R2_COM_SCANNER_2:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(527, scene);
+		return true;
+		break;
+	default:
+		break;
+	}
 
-	_leftDoor.postInit();
-	_leftDoor.setup(1800, 1, 1);
-	_leftDoor.setPosition(Common::Point(110, 78));
-	_leftDoor.fixPriority(135);
-	_leftDoor.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
+	return SceneActor::startAction(action, event);
+}
 
-	_rightDoor.postInit();
-	_rightDoor.setup(1800, 2, 1);
-	_rightDoor.setPosition(Common::Point(209, 78));
-	_rightDoor.fixPriority(135);
-	_rightDoor.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
+void Scene1580::postInit(SceneObjectList *OwnerList) {
+	loadScene(1580);
+	R2_GLOBALS._sceneManager._fadeMode = FADEMODE_GRADUAL;
+	SceneExt::postInit();
 
-	_leftStaircase.postInit();
-	if ((_locationMode != 1) && (_locationMode != 3) && (!R2_GLOBALS.getFlag(64)))
-		_leftStaircase.setup(1801, 2, 1);
-	else
-		_leftStaircase.setup(1801, 2, 10);
-	_leftStaircase.setPosition(Common::Point(76, 142));
-	_leftStaircase.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-	_rightStaircase.postInit();
-	if ((_locationMode != 1) && (_locationMode != 3) && (!R2_GLOBALS.getFlag(64)))
-		_rightStaircase.setup(1801, 1, 1);
-	else
-		_rightStaircase.setup(1801, 1, 10);
-	_rightStaircase.setPosition(Common::Point(243, 142));
-	_rightStaircase.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
+	_sceneMode = 0;
 
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		// Standard Quinn setup
-		R2_GLOBALS._player.setVisage(1503);
-		R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
+	R2_GLOBALS._player.disableControl();
+	if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1580) {
+		_joystick.postInit();
+		_joystick.setup(1580, 1, 4);
+		_joystick.setPosition(Common::Point(159, 163));
+		_joystick.setDetails(1550, 78, -1, -1, 1, (SceneItem *) NULL);
 	} else {
-		// Seeker setup dependent on whether he's holding the doors or not
-		if (R2_GLOBALS.getFlag(14)) {
-			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
-			R2_GLOBALS._player.setObjectWrapper(NULL);
-			R2_GLOBALS._player.setup(1801, 5, 12);
-			R2_GLOBALS._player.setPosition(Common::Point(160, 139));
-			R2_GLOBALS._walkRegions.disableRegion(9);
-			_doors.hide();
-		} else {
-			R2_GLOBALS._player.setVisage(1507);
-		}
-		R2_GLOBALS._player._moveDiff = Common::Point(4, 2);
+		_joystickPlug.setDetails(Rect(141, 148, 179, 167), 1550, 79, -1, -1, 1, NULL);
 	}
 
-	_companion.postInit();
-	_companion.animate(ANIM_MODE_1, NULL);
-	_companion.setObjectWrapper(new SceneObjectWrapper());
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		if (R2_GLOBALS.getFlag(14)) {
-			_companion.animate(ANIM_MODE_NONE, NULL);
-			_companion.setObjectWrapper(NULL);
-			_companion.setup(1801, 5, 12);
+	if (R2_INVENTORY.getObjectScene(R2_BROKEN_DISPLAY) == 1580) {
+		_screen.postInit();
+		_screen.setup(1580, 1, 1);
+		_screen.setPosition(Common::Point(124, 108));
+		_screen.fixPriority(10);
+		_screen.setDetails(1550, 13, -1, -1, 1, (SceneItem *) NULL);
 
-			R2_GLOBALS._walkRegions.disableRegion(9);
-			_doors.hide();
-		} else {
-			_companion.setup(1507, 1, 1);
-			_companion.setPosition(Common::Point(180, 160));
-		}
-		_companion.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
-		_companion._moveDiff = Common::Point(4, 2);
+		_screenDisplay.postInit();
+		_screenDisplay.setup(1580, 1, 3);
+		_screenDisplay.setPosition(Common::Point(124, 96));
+		_screenDisplay.fixPriority(20);
+	} else if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1580) {
+		_screen.postInit();
+		_screen.setup(1580, 1, 1);
+		_screen.setPosition(Common::Point(124, 108));
+		_screen.fixPriority(10);
+		_screen.setDetails(1550, 14, -1, -1, 1, (SceneItem *) NULL);
+
+		_screenDisplay.postInit();
+		_screenDisplay.setup(1580, 3, 1);
+		_screenDisplay.setPosition(Common::Point(124, 109));
+		_screenDisplay.fixPriority(20);
+
+		_sceneMode = 10;
 	} else {
-		_companion.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
-		_companion.setVisage(1503);
-		_companion._moveDiff = Common::Point(2, 2);
+		_screenSlot.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 1, NULL);
 	}
 
-	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1800) {
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			R2_GLOBALS._player.setPosition(Common::Point(114, 150));
-			R2_GLOBALS._player.setStrip(5);
-			if (R2_GLOBALS.getFlag(14)) {
-				_companion.setPosition(Common::Point(160, 139));
-				R2_GLOBALS._walkRegions.disableRegion(8);
-			} else {
-				_companion.setPosition(Common::Point(209, 150));
-				_companion.setStrip(6);
-				R2_GLOBALS._walkRegions.disableRegion(8);
-			}
-		} else {
-			if (R2_GLOBALS.getFlag(14)) {
-				R2_GLOBALS._player.setup(1801, 5, 12);
-				R2_GLOBALS._player.setPosition(Common::Point(160, 139));
-			} else {
-				R2_GLOBALS._player.setPosition(Common::Point(209, 150));
-				R2_GLOBALS._player.setStrip(6);
-			}
-			_companion.setPosition(Common::Point(114, 150));
-			_companion.setStrip(5);
-			R2_GLOBALS._walkRegions.disableRegion(10);
-			R2_GLOBALS._walkRegions.disableRegion(11);
-		}
-	} else if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		R2_GLOBALS._player.setPosition(Common::Point(140, 160));
-		_companion.setPosition(Common::Point(180, 160));
+	_storageCompartment.postInit();
+	if (R2_GLOBALS.getFlag(58) == 0) {
+		_storageCompartment.setup(1580, 5, 1);
+		_storageCompartment.setDetails(1550, 80, -1, -1, 1, (SceneItem *) NULL);
 	} else {
-		R2_GLOBALS._player.setPosition(Common::Point(180, 160));
-		_companion.setPosition(Common::Point(140, 160));
+		_storageCompartment.setup(1580, 5, 6);
 	}
 
-	_playerShadow.postInit();
-	_playerShadow.fixPriority(10);
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		_playerShadow.setVisage(1111);
-	else
-		_playerShadow.setVisage(1110);
-
-	_playerShadow._effect = EFFECT_SHADOW_MAP;
-	_playerShadow._shadowMap = _shadowPaletteMap;
-
-	R2_GLOBALS._player._linkedActor = &_playerShadow;
+	_storageCompartment.setPosition(Common::Point(216, 108));
+	_storageCompartment.fixPriority(100);
 
-	_companionShadow.postInit();
-	_companionShadow.fixPriority(10);
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		_companionShadow.setVisage(1110);
-	else
-		_companionShadow.setVisage(1111);
+	_hatchButton.postInit();
+	_hatchButton.setup(1580, 4, 1);
+	_hatchButton.setPosition(Common::Point(291, 147));
+	_hatchButton.fixPriority(100);
+	_hatchButton.setDetails(1550, 81, -1, -1, 1, (SceneItem *) NULL);
 
-	_companionShadow._effect = EFFECT_SHADOW_MAP;
-	_companionShadow._shadowMap = _shadowPaletteMap;
+	if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 1580) {
+		_thrusterValve.postInit();
+		_thrusterValve.setup(1580, 6, 2);
+		_thrusterValve.setPosition(Common::Point(222, 108));
+		_thrusterValve.fixPriority(50);
+		_thrusterValve.setDetails(1550, 32, -1, 34, 1, (SceneItem *) NULL);
+	}
 
-	_companion._linkedActor = &_companionShadow;
+	if (R2_INVENTORY.getObjectScene(R2_IGNITOR) == 1580) {
+		_ignitor.postInit();
+		_ignitor.setup(1580, 6, 1);
+		_ignitor.setPosition(Common::Point(195, 108));
+		_ignitor.fixPriority(50);
+		_ignitor.setDetails(1550, 38, -1, 34, 1, (SceneItem *) NULL);
+	}
 
-	R2_GLOBALS._player._characterScene[R2_QUINN] = 1800;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1800;
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+	_background.setDetails(Rect(0, 0, 320, 200), 1550, 50, -1, -1, 1, NULL);
+}
 
-	_elevatorContents.setDetails(Rect(128, 95, 190, 135), 1800, 10, -1, -1, 1, NULL);
-	_elevator.setDetails(Rect(95, 3, 223, 135), 1800, 0, -1, -1, 1, NULL);
+void Scene1580::signal() {
+	switch (_sceneMode++) {
+	case 10:
+		_screenDisplay.animate(ANIM_MODE_5, this);
+		break;
+	case 11:
+		_screenDisplay.setup(1580, 1, 2);
+		_screenDisplay.setPosition(Common::Point(124, 94));
 
-	// Original was calling _item3.setDetails(Rect(1800, 11, 24, 23), 25, -1, -1, -1, 1, NULL);
-	// This is *wrong*. The following statement is a wild guess based on good common sense
-	_surface.setDetails(11, 1800, 23, 24, 25);
-	_secBackground.setDetails(Rect(0, 0, 320, 200), 1800, 17, -1, 19, 1, NULL);
+		if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) != 0) {
+			_arrActor[0].postInit();
+			_arrActor[0].setup(1580, 2, 1);
+			_arrActor[0].setPosition(Common::Point(138, 56));
+		}
 
-	R2_GLOBALS._player.disableControl();
-	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1800) {
-		if ((R2_GLOBALS.getFlag(14)) && (R2_GLOBALS._player._characterIndex == R2_SEEKER)) {
-			R2_GLOBALS._player.enableControl(CURSOR_USE);
-			R2_GLOBALS._player._canWalk = false;
-		} else {
-			R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		if (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) != 0) {
+			_arrActor[1].postInit();
+			_arrActor[1].setup(1580, 2, 2);
+			_arrActor[1].setPosition(Common::Point(140, 66));
 		}
-	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1850) {
-		if (R2_GLOBALS.getFlag(29)) {
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-				_sceneMode = 1814;
-				setAction(&_sequenceManager, this, 1814, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
-			} else {
-				_sceneMode = 1815;
-				setAction(&_sequenceManager, this, 1815, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
-			}
-		} else if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			_sceneMode = 1816;
-			setAction(&_sequenceManager, this, 1816, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
-		} else {
-			_sceneMode = 1817;
-			setAction(&_sequenceManager, this, 1817, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
+
+		if (R2_INVENTORY.getObjectScene(R2_IGNITOR) != 0) {
+			_arrActor[2].postInit();
+			_arrActor[2].setup(1580, 2, 3);
+			_arrActor[2].setPosition(Common::Point(142, 85));
 		}
-	} else if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		_sceneMode = 1800;
-		setAction(&_sequenceManager, this, 1800, &R2_GLOBALS._player, &_companion, NULL);
-	} else {
-		_sceneMode = 1801;
-		setAction(&_sequenceManager, this, 1801, &R2_GLOBALS._player, &_companion, NULL);
-	}
 
-	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1800;
-	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1800;
-}
+		if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) != 0) {
+			_arrActor[3].postInit();
+			_arrActor[3].setup(1580, 2, 4);
+			_arrActor[3].setPosition(Common::Point(142, 92));
+		}
 
-void Scene1800::signal() {
-	switch (_sceneMode) {
-	case 1:
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			_sceneMode = 1804;
-			setAction(&_sequenceManager, this, 1804, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
-		} else {
-			_sceneMode = 1805;
-			setAction(&_sequenceManager, this, 1805, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
+		if (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) != 0) {
+			_arrActor[4].postInit();
+			_arrActor[4].setup(1580, 2, 5);
+			_arrActor[4].setPosition(Common::Point(108, 54));
 		}
-		break;
-	case 2:
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			_sceneMode = 1806;
-			setAction(&_sequenceManager, this, 1806, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
-		} else {
-			_sceneMode = 1807;
-			setAction(&_sequenceManager, this, 1807, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
+
+		if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) != 1580) {
+			_arrActor[5].postInit();
+			_arrActor[5].setup(1580, 2, 6);
+			_arrActor[5].setPosition(Common::Point(110, 64));
 		}
-		break;
-	case 3:
-		_sceneMode = 1802;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			setAction(&_sequenceManager, this, 1802, &R2_GLOBALS._player, &_companion, NULL);
-		else
-			setAction(&_sequenceManager, this, 1803, &R2_GLOBALS._player, &_companion, NULL);
-		break;
-	case 10:
-	// No break on purpose
-	case 11:
-		R2_GLOBALS._player.enableControl(CURSOR_TALK);
-		break;
-	case 12:
-		R2_GLOBALS._player.enableControl(CURSOR_TALK);
-		R2_GLOBALS._player._canWalk = false;
-		break;
-	case 13:
-		_sceneMode = 14;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		R2_GLOBALS._player.setup(1801, 7, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_8, 0, NULL);
-		_stripManager.start(550, this);
-		break;
-	case 14:
-		_sceneMode = 15;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._player.setup(1801, 6, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
-		break;
-	case 15:
-		R2_GLOBALS._player.setup(1503, 4, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		break;
-	// Cases 23 and 24 have been added to fix missing hardcoded logic in the original,
-	// when Seeker tries to open the door
-	case 23:
-		_sceneMode = 24;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		R2_GLOBALS._player.setup(1801, 5, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_8, 0, NULL);
-		_stripManager.start(550, this);
-		break;
-	case 24:
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._player.setup(1507, 4, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
 
-		_doors.setup(1801, 3, 1);
-		_doors.setPosition(Common::Point(160, 139));
-		_doors.setDetails(1800, 6, -1, -1, 1, (SceneItem *) NULL);
-		_doors.show();
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) != 0) {
+			_arrActor[6].postInit();
+			_arrActor[6].setup(1580, 2, 7);
+			_arrActor[6].setPosition(Common::Point(108, 80));
+		}
 
-		R2_GLOBALS._player._position.y += 2;
-		R2_GLOBALS._player.show();
-		break;
-	case 1800:
-		R2_GLOBALS._walkRegions.disableRegion(8);
-		if (R2_GLOBALS.getFlag(63))
-			R2_GLOBALS._player.enableControl(CURSOR_USE);
-		else {
-			_sceneMode = 10;
-			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-			_stripManager.start(544, this);
+		if (R2_INVENTORY.getObjectScene(R2_FUEL_CELL) != 0) {
+			_arrActor[7].postInit();
+			_arrActor[7].setup(1580, 2, 8);
+			_arrActor[7].setPosition(Common::Point(111, 92));
 		}
+
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
 		break;
-	case 1801:
-		R2_GLOBALS._walkRegions.disableRegion(10);
-		R2_GLOBALS._walkRegions.disableRegion(11);
-		R2_GLOBALS.setFlag(63);
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		break;
-	case 1802:
-		R2_GLOBALS.clearFlag(14);
-		R2_GLOBALS._sceneManager.changeScene(1700);
-		break;
-	case 1804:
-	// No break on purpose
-	case 1805:
-	// No break on purpose
-	case 1806:
-	// No break on purpose
-	case 1807:
-		R2_GLOBALS.clearFlag(14);
-		R2_GLOBALS._sceneManager.changeScene(1850);
-		break;
-	case 1808:
-		_sceneMode = 12;
-		R2_GLOBALS._events.setCursor(CURSOR_WALK);
-		_stripManager.start(553, this);
-		break;
-	case 1812:
-		_sceneMode = 13;
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	// Case 1813 has been added to fix Seeker missing animation in the original game
-	case 1813:
-		_sceneMode = 23;
-		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-		break;
-	case 1814:
-	// No break on purpose
-	case 1815:
-		R2_GLOBALS._walkRegions.disableRegion(10);
-		R2_GLOBALS._walkRegions.disableRegion(11);
-		R2_GLOBALS._player.enableControl();
+	case 20:
+		R2_GLOBALS._sceneManager.changeScene(1550);
 		break;
-	case 1816:
-	// No break on purpose
-	case 1817:
-		R2_GLOBALS._walkRegions.disableRegion(8);
-		R2_GLOBALS._player.enableControl();
+	case 31:
+		R2_GLOBALS._sceneManager.changeScene(1530);
 		break;
 	default:
-		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
 		break;
 	}
 }
 
-void Scene1800::saveCharacter(int characterIndex) {
-	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
-		R2_GLOBALS._sound1.fadeOut2(NULL);
-
-	SceneExt::saveCharacter(characterIndex);
-}
-
 /*--------------------------------------------------------------------------
- * Scene 1850 - Rim Lift Interior
+ * Scene 1625 - Miranda being questioned
  *
  *--------------------------------------------------------------------------*/
 
-bool Scene1850::Button::startAction(CursorType action, Event &event) {
+bool Scene1625::Wire::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
-		return SceneHotspot::startAction(action, event);
-
-	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
+		return SceneActor::startAction(action, event);
 
+	Scene1625 *scene = (Scene1625 *)R2_GLOBALS._sceneManager._scene;
 	R2_GLOBALS._player.disableControl();
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		scene->_sceneMode = 1852;
-		if (R2_GLOBALS.getFlag(32))
-			scene->setAction(&scene->_sequenceManager1, scene, 1871, &R2_GLOBALS._player, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager1, scene, 1852, &R2_GLOBALS._player, NULL);
-	} else if (R2_GLOBALS.getFlag(30)) {
-		scene->_seqNumber = 1;
-		scene->_sceneMode = 1860;
 
-		if (R2_GLOBALS.getFlag(32))
-			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_robot, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_robot, NULL);
+	scene->_sceneMode = 1631;
+	scene->_mirandaMouth.postInit();
+	scene->setAction(&scene->_sequenceManager, scene, 1631, &scene->_mirandaMouth, &scene->_wire, NULL);
+	return true;
+}
+
+Scene1625::Scene1625() {
+}
+
+void Scene1625::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+}
+
+void Scene1625::postInit(SceneObjectList *OwnerList) {
+	loadScene(1625);
+	R2_GLOBALS._player._characterIndex = R2_MIRANDA;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+	_stripManager.addSpeaker(&_tealSpeaker);
+	_stripManager.addSpeaker(&_soldierSpeaker);
 
-		R2_GLOBALS.clearFlag(30);
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+
+	_wire.postInit();
+	_wire.setup(1626, 2, 1);
+	_wire.setPosition(Common::Point(206, 133));
+	_wire.setDetails(1625, 0, -1, -1, 1, (SceneItem *) NULL);
+
+	_wristRestraints.postInit();
+	_wristRestraints.setup(1625, 8, 1);
+	_wristRestraints.setPosition(Common::Point(190, 131));
+	_wristRestraints.setDetails(1625, 6, -1, 2, 1, (SceneItem *) NULL);
+
+	if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 1625) {
+		if (!R2_GLOBALS.getFlag(83)) {
+			_glass.postInit();
+			_glass.setup(1626, 4, 1);
+			_glass.setPosition(Common::Point(96, 166));
+			_glass.setDetails(1625, -1, -1, -1, 1, (SceneItem *) NULL);
+		}
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
 	} else {
-		scene->_sceneMode = 1853;
+		_teal.postInit();
+		_teal.fixPriority(10);
 
-		if (R2_GLOBALS.getFlag(32))
-			scene->setAction(&scene->_sequenceManager1, scene, 1872, &R2_GLOBALS._player, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager1, scene, 1853, &R2_GLOBALS._player, NULL);
+		_tealRightArm.postInit();
+
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1625;
+		setAction(&_sequenceManager, this, 1625, &_teal, &_tealRightArm, NULL);
 	}
 
-	return true;
+	R2_GLOBALS._sound1.play(245);
+	_background.setDetails(Rect(0, 0, 320, 200), 1625, 12, -1, -1, 1, NULL);
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 1625;
+	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 1625;
 }
 
-bool Scene1850::Robot::startAction(CursorType action, Event &event) {
-	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
-
-	switch (action) {
-	case CURSOR_USE:
-		if ((R2_GLOBALS._player._characterIndex != R2_SEEKER) || R2_GLOBALS.getFlag(33) || R2_GLOBALS.getFlag(30))
-			return SceneActor::startAction(action, event);
+void Scene1625::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
 
+void Scene1625::signal() {
+	switch (_sceneMode) {
+	case 10:
 		R2_GLOBALS._player.disableControl();
-		scene->_sceneMode = 1857;
+		_glass.postInit();
+		_glass.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
+		_sceneMode = 1626;
+		setAction(&_sequenceManager, this, 1626, &_tealHead, &_glass, NULL);
+		break;
+	case 12:
+		MessageDialog::show(DONE_MSG, OK_BTN_STRING);
+		break;
+	case 14:
+		_tealHead.postInit();
+		_tealHead.setup(1627, 1, 1);
+		_tealHead.setPosition(Common::Point(68, 68));
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(831, this);
+		break;
+	case 99:
+		R2_GLOBALS._player.disableControl();
+		switch (_stripManager._exitMode) {
+		case 1:
+			_sceneMode = 1627;
+			setAction(&_sequenceManager, this, 1627, &_mirandaMouth, &_glass, NULL);
+			break;
+		case 2:
+			_sceneMode = 1629;
+			setAction(&_sequenceManager, this, 1629, &_tealHead, &_wristRestraints, NULL);
+			break;
+		case 4:
+			R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3150;
+			R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3150;
+			R2_GLOBALS._player._characterIndex = R2_QUINN;
+			R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._player._characterScene[R2_QUINN]);
+			break;
+		case 5:
+			_sceneMode = 1628;
+			_tealHead.remove();
+			setAction(&_sequenceManager, this, 1628, &_mirandaMouth, &_glass, NULL);
+			break;
+		case 6:
+			_glass.postInit();
+			_glass.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
+			_sceneMode = 1632;
+			setAction(&_sequenceManager, this, 1632, &_glass, NULL);
+			break;
+		case 7:
+			_sceneMode = 1633;
+			setAction(&_sequenceManager, this, 1633, &_glass, NULL);
+			break;
+		case 8:
+			_sceneMode = 1635;
+			setAction(&_sequenceManager, this, 1635, &_mirandaMouth, &_wristRestraints, NULL);
+			break;
+		case 9:
+			_glass.postInit();
+			_glass.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
+			_sceneMode = 1634;
+			setAction(&_sequenceManager, this, 1634, &_mirandaMouth, &_wristRestraints, NULL);
+			break;
+		case 3:
+		// No break on purpose
+		default:
+			_sceneMode = 1630;
+			_tealHead.remove();
+			setAction(&_sequenceManager, this, 1630, &_teal, &_tealRightArm, NULL);
+			break;
+		}
+		//_field412 = _stripManager._field2E8;
+		_stripManager._currObj44Id = 0;
+		break;
+	case 1625:
+		_tealHead.postInit();
+		_tealHead.setup(1627, 1, 1);
+		_tealHead.setPosition(Common::Point(68, 68));
+		_sceneMode = 10;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(800, this);
+		break;
+	case 1626:
+		_tealHead.setup(1627, 1, 1);
+		_tealHead.setPosition(Common::Point(68, 68));
+		_tealHead.show();
 
-		if (R2_GLOBALS.getFlag(32))
-			scene->setAction(&scene->_sequenceManager1, scene, 1858, &R2_GLOBALS._player, &scene->_robot, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager1, scene, 1857, &R2_GLOBALS._player, &scene->_robot, NULL);
+		_mirandaMouth.postInit();
+		_mirandaMouth.setup(1627, 3, 1);
+		_mirandaMouth.setPosition(Common::Point(196, 65));
 
-		R2_GLOBALS.setFlag(30);
-		return true;
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(832, this);
 		break;
-	case CURSOR_LOOK:
-		if (R2_GLOBALS.getFlag(34))
-			SceneItem::display(1850, 2, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		else
-			SceneItem::display(1850, 1, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+	case 1627:
+		_mirandaMouth.setup(1627, 3, 1);
+		_mirandaMouth.setPosition(Common::Point(196, 65));
+		_mirandaMouth.show();
 
-		return true;
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(833, this);
 		break;
-	case R2_AIRBAG:
-		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
-			if (R2_GLOBALS.getFlag(70)) {
-				R2_GLOBALS._player.disableControl();
-				scene->_sceneMode = 30;
+	case 1628:
+		R2_GLOBALS.setFlag(83);
+		_tealHead.postInit();
+		_tealHead.setup(1627, 1, 1);
+		_tealHead.setPosition(Common::Point(68, 68));
 
-				R2_GLOBALS._events.setCursor(CURSOR_WALK);
-				scene->_stripManager.start(558, scene);
+		_mirandaMouth.setup(1627, 3, 1);
+		_mirandaMouth.setPosition(Common::Point(196, 65));
+		_mirandaMouth.show();
 
-				return true;
-			} else {
-				return SceneActor::startAction(action, event);
-			}
-		} else if (R2_GLOBALS.getFlag(30)) {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 1875;
-			scene->_airbag.postInit();
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(834, this);
+		break;
+	case 1629:
+		_tealHead.setup(1627, 1, 1);
+		_tealHead.setPosition(Common::Point(68, 68));
+		_tealHead.show();
 
-			if (R2_GLOBALS.getFlag(32))
-				scene->setAction(&scene->_sequenceManager1, scene, 1876,
-					&R2_GLOBALS._player, &scene->_airbag, NULL);
-			else
-				scene->setAction(&scene->_sequenceManager1, scene, 1875,
-					&R2_GLOBALS._player, &scene->_airbag, NULL);
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(805, this);
+		break;
+	case 1630:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = true;
+		break;
+	case 1631:
+		_mirandaMouth.setup(1627, 3, 1);
+		_mirandaMouth.setPosition(Common::Point(196, 65));
+		_mirandaMouth.show();
 
-			return true;
-		} else if (R2_GLOBALS.getFlag(70)) {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 20;
-			R2_GLOBALS._events.setCursor(CURSOR_WALK);
-			scene->_stripManager.start(557, scene);
-			R2_GLOBALS.setFlag(69);
+		_wire.remove();
 
-			return true;
-		} else {
-			return SceneActor::startAction(action, event);
-		}
+		_teal.postInit();
+		_teal.fixPriority(10);
+
+		_tealRightArm.postInit();
+
+		R2_INVENTORY.setObjectScene(R2_SUPERCONDUCTOR_WIRE, 3);
+		_sceneMode = 14;
+
+		setAction(&_sequenceManager, this, 1625, &_teal, &_tealRightArm, NULL);
+		break;
+	case 1632:
+		_tealHead.setup(1627, 1, 1);
+		_tealHead.setPosition(Common::Point(68, 68));
+		_tealHead.show();
+
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(835, this);
+		break;
+	case 1633:
+		_glass.remove();
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(818, this);
+		break;
+	case 1634:
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(836, this);
 		break;
-	case R2_REBREATHER_TANK:
-		if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
-			if (R2_GLOBALS.getFlag(30))
-				return SceneActor::startAction(action, event);
-
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 1878;
-			scene->setAction(&scene->_sequenceManager1, scene, 1878, &R2_GLOBALS._player,
-				&scene->_robot, &scene->_airbag, NULL);
-		}
+	case 1635:
+		_mirandaMouth.setup(1627, 3, 1);
+		_mirandaMouth.setPosition(Common::Point(196, 65));
+		_mirandaMouth.show();
 
-		return true;
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(818, this);
 		break;
 	default:
-		return SceneActor::startAction(action, event);
 		break;
 	}
 }
 
-bool Scene1850::Door::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneHotspot::startAction(action, event);
-
-	if (R2_GLOBALS.getFlag(32)) {
-		SceneItem::display(3240, 4, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		return true;
-	}
-
-	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	if (scene->_sceneMode == 1851)
-		R2_GLOBALS._player._effect = EFFECT_SHADED;
-
-	if (_position.x >= 160)
-		R2_GLOBALS.setFlag(29);
+void Scene1625::process(Event &event) {
+	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE))
+		event.handled = true;
 	else
-		R2_GLOBALS.clearFlag(29);
+		Scene::process(event);
+}
 
-	if ((R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
-		if (_position.x >= 160)
-			scene->_seqNumber = 3;
-		else
-			scene->_seqNumber = 2;
+/*--------------------------------------------------------------------------
+ * Scene 1700 - Rim
+ *
+ *--------------------------------------------------------------------------*/
 
-		scene->_sceneMode = 1860;
+Scene1700::Scene1700() {
+	_walkFlag = 0;
+}
 
-		if (R2_GLOBALS.getFlag(32)) {
-			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_robot, NULL);
-		} else {
-			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_robot, NULL);
-		}
-	} else {
-		scene->_sceneMode = 11;
-		if (_position.x >= 160) {
-			scene->setAction(&scene->_sequenceManager1, scene, 1866, &R2_GLOBALS._player, &scene->_rightDoor, NULL);
-		} else {
-			scene->setAction(&scene->_sequenceManager1, scene, 1865, &R2_GLOBALS._player, &scene->_leftDoor, NULL);
-		}
-	}
+void Scene1700::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
 
-	return true;
+	s.syncAsSint16LE(_walkFlag);
 }
 
-bool Scene1850::DisplayScreen::startAction(CursorType action, Event &event) {
-	if ((action != CURSOR_USE) || (_position.y != 120))
-		return SceneHotspot::startAction(action, event);
+bool Scene1700::RimTransport::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
 
-	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
+	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
 
 	R2_GLOBALS._player.disableControl();
-	scene->_sceneMode = 1881;
+	scene->_sceneMode = 4;
 
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		scene->setAction(&scene->_sequenceManager1, scene, 1881, &R2_GLOBALS._player, NULL);
-	} else {
-		scene->setAction(&scene->_sequenceManager1, scene, 1880, &R2_GLOBALS._player, NULL);
-	}
+	Common::Point pt(271, 90);
+	PlayerMover *mover = new PlayerMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
 
 	return true;
 }
 
-/*------------------------------------------------------------------------*/
-
-Scene1850::Scene1850() {
-	_sceneMode = 0;
-	_shadeCountdown = 0;
-	_shadeDirection = 0;
-	_shadeChanging = false;
-	_seqNumber = 0;
-}
+bool Scene1700::Companion::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
 
-void Scene1850::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
+	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
+	scene->_sceneMode = 30;
+	scene->signal();
 
-	s.syncAsSint16LE(_sceneMode);
-	s.syncAsSint16LE(_shadeCountdown);
-	s.syncAsSint16LE(_shadeDirection);
-	s.syncAsSint16LE(_shadeChanging);
-	s.syncAsSint16LE(_seqNumber);
-	s.syncAsSint16LE(_playerDest.x);
-	s.syncAsSint16LE(_playerDest.y);
+	return true;
 }
 
-void Scene1850::postInit(SceneObjectList *OwnerList) {
-	loadScene(1850);
-
-	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 1850)
-		R2_GLOBALS.clearFlag(31);
-
-	_palette1.loadPalette(0);
-
-	if (R2_GLOBALS.getFlag(31)) {
-		_sceneMode = 1850;
-		g_globals->_scenePalette.loadPalette(1850);
-	} else {
-		_sceneMode = 1851;
-		g_globals->_scenePalette.loadPalette(1851);
-	}
+void Scene1700::NorthExit::changeScene() {
+	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
 
-	SceneExt::postInit();
+	R2_GLOBALS._player.disableControl();
+	_moving = false;
+	scene->_sceneMode = 1;
 
-	if (R2_GLOBALS._sceneManager._previousScene == 3150)
-		R2_GLOBALS._sound1.play(116);
+	Common::Point pt(R2_GLOBALS._player._position.x, 0);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
 
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
+void Scene1700::SouthExit::changeScene() {
+	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
 
-	_shadeChanging = false;
-	_seqNumber = 0;
-	_playerDest = Common::Point(0, 0);
+	R2_GLOBALS._player.disableControl();
+	_moving = false;
+	scene->_sceneMode = 2;
 
-	R2_GLOBALS._player._characterScene[R2_QUINN] = 1850;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1850;
+	Common::Point pt(R2_GLOBALS._player._position.x, 170);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
 
-	_button.setDetails(Rect(101, 56, 111, 63), 1850, 19, -1, -1, 1, NULL);
+void Scene1700::WestExit::changeScene() {
+	Scene1700 *scene = (Scene1700 *)R2_GLOBALS._sceneManager._scene;
 
-	_leftDoor.postInit();
-	_leftDoor.setup(1850, 3, 1);
-	_leftDoor.setPosition(Common::Point(66, 102));
-	_leftDoor.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL);
+	R2_GLOBALS._player.disableControl();
+	_moving = false;
+	scene->_sceneMode = 6;
 
-	_rightDoor.postInit();
-	_rightDoor.setup(1850, 2, 1);
-	_rightDoor.setPosition(Common::Point(253, 102));
-	_rightDoor.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL);
+	Common::Point pt(0, R2_GLOBALS._player._position.y);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
 
-	R2_GLOBALS._walkRegions.disableRegion(1);
+void Scene1700::enterArea() {
+	Rect tmpRect;
+	R2_GLOBALS._walkRegions.load(1700);
 
-	_robot.postInit();
+	_slabWest.remove();
+	_slabEast.remove();
+	_slabShadowWest.remove();
+	_slabShadowEast.remove();
+	_westPlatform.remove();
+	_rimTransportDoor.remove();
+	_rimTransport.remove();
 
-	if (R2_GLOBALS.getFlag(34)) {
-		R2_GLOBALS._walkRegions.disableRegion(2);
-		_robot.setup(1851, 4, 3);
-	} else if (R2_GLOBALS.getFlag(30)) {
-		_robot.setup(1851, 2, 2);
-	} else {
-		R2_GLOBALS._walkRegions.disableRegion(5);
-		if (R2_GLOBALS.getFlag(33)) {
-			R2_GLOBALS._walkRegions.disableRegion(2);
-			_robot.setup(1851, 1, 3);
-		} else {
-			_robot.setup(1851, 2, 1);
-		}
+	if (_sceneMode != 40) {
+		_ledgeHopper.remove();
+		_hatch.remove();
 	}
 
-	_robot.setPosition(Common::Point(219, 130));
-	_robot.fixPriority(114);
-	_robot.setDetails(1850, -1, -1, -1, 1, (SceneItem *) NULL);
-
-	R2_GLOBALS._player.postInit();
+	// The original had manual code here to redraw the background manually when
+	// changing areas within the scene. Which seems to be totally redundant.
 
-	_companion.postInit();
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		_companion.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
-	} else {
-		_companion.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+	if (_sceneMode != 40 && R2_GLOBALS._rimLocation == 0) {
+		// Crashed ledge hopper
+		_ledgeHopper.postInit();
+		_ledgeHopper.setup(1701, 1, 1);
+		_ledgeHopper.setPosition(Common::Point(220, 137));
+		_ledgeHopper.setDetails(1700, 6, -1, -1, 2, (SceneItem *) NULL);
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(12);
 	}
 
-	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1850) {
-		R2_GLOBALS._player._effect = EFFECT_SHADED2;
-		_companion._effect = EFFECT_SHADED2;
-		if (R2_GLOBALS.getFlag(31)) {
-			R2_GLOBALS._player._shade = 0;
-			_companion._shade = 0;
-		} else {
-			R2_GLOBALS._player._shade = 6;
-			_companion._shade = 6;
-		}
-
-		if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
-			_airbag.postInit();
-			if (R2_GLOBALS.getFlag(34)) {
-				_airbag.setup(1851, 4, 2);
-				_airbag.fixPriority(114);
-			} else {
-				_airbag.setup(1851, 4, 1);
-			}
-
-			_airbag.setPosition(Common::Point(179, 113));
-
-			if ((_robot._strip == 1) && (_robot._frame == 3)){
-				_airbag.hide();
-			}
-
-			_airbag.setDetails(1850, 6, -1, -1, 1, (SceneItem *) NULL);
-		}
-
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			if (R2_GLOBALS.getFlag(32)) {
-				R2_GLOBALS._player.setVisage(1511);
-				_companion.setVisage(1508);
+	if ((R2_GLOBALS._rimLocation + 2) % 4 == 0) {
+		// The slabs forming the bottom of the regular rings the rim transport travels through
+		_slabWest.postInit();
+		_slabWest.setup(1700, 1, 1);
+		_slabWest.setPosition(Common::Point(222, 82));
+		_slabWest.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
 
-				_screen.postInit();
-				_screen.setup(1853, 3, 1);
-				_screen.setPosition(Common::Point(122, 113));
-				_screen.fixPriority(114);
-				_screen._effect = EFFECT_SHADED2;
-				_screen.setDetails(1850, 28, -1, -1, 2, (SceneItem *) NULL);
+		_slabShadowWest.postInit();
+		_slabShadowWest.setup(1700, 2, 1);
+		_slabShadowWest.setPosition(Common::Point(177, 82));
+		_slabShadowWest.fixPriority(0);
 
-				_helmet.postInit();
-				_helmet.setup(1853, 3, 2);
-				_helmet.setPosition(Common::Point(139, 111));
-				_helmet.fixPriority(114);
-				_helmet._effect = EFFECT_SHADED2;
-				_helmet.setDetails(1850, 29, -1, -1, 2, (SceneItem *) NULL);
+		_slabShadowEast.postInit();
+		_slabShadowEast.setup(1700, 2, 2);
+		_slabShadowEast.setPosition(Common::Point(332, 96));
+		_slabShadowEast.fixPriority(0);
 
-				if (R2_GLOBALS.getFlag(31)) {
-					_screen._shade = 0;
-					_helmet._shade = 0;
-				} else {
-					_screen._shade = 6;
-					_helmet._shade = 6;
-				}
-			} else {
-				R2_GLOBALS._player.setVisage(1500);
-				_companion.setVisage(1505);
-			}
-		} else if (R2_GLOBALS.getFlag(32)) {
-			// Not Quinn, flag 32
-			R2_GLOBALS._player.setVisage(1508);
-			_companion.setVisage(1511);
+		_slabEast.postInit();
+		_slabEast.setup(1700, 1, 2);
+		_slabEast.setPosition(Common::Point(424, 84));
 
-			_screen.postInit();
-			_screen.setup(1853, 3, 1);
-			_screen.setPosition(Common::Point(122, 113));
-			_screen.fixPriority(114);
-			_screen._effect = EFFECT_SHADED2;
-			_screen.setDetails(1850, 30, -1, -1, 2, (SceneItem *) NULL);
+		R2_GLOBALS._walkRegions.disableRegion(11);
+	}
 
-			_helmet.postInit();
-			_helmet.setup(1853, 3, 2);
-			_helmet.setPosition(Common::Point(139, 111));
-			_helmet.fixPriority(114);
-			_helmet._effect = EFFECT_SHADED2;
-			_helmet.setDetails(1850, 28, -1, -1, 1, (SceneItem *) NULL);
+	if ((R2_GLOBALS._rimLocation + 399) % 800 == 0) {
+		// Enable west exit to lift
+		_westPlatform.postInit();
+		_westPlatform.setup(1700, 3, 2);
+		_westPlatform.setPosition(Common::Point(51, 141));
+		_westPlatform.fixPriority(0);
+		_westPlatform.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
 
-			if (R2_GLOBALS.getFlag(31)) {
-				_screen._shade = 0;
-				_helmet._shade = 0;
-			} else {
-				_screen._shade = 6;
-				_helmet._shade = 6;
-			}
-		} else {
-			// Not Quinn, nor flag 32
-			R2_GLOBALS._player.setVisage(1505);
-			_companion.setVisage(1500);
-		}
+		_westExit._enabled = true;
+	} else {
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		_westExit._enabled = false;
+	}
 
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._player.setStrip(3);
-		R2_GLOBALS._player.setPosition(Common::Point(80, 114));
+	if (  ((!R2_GLOBALS.getFlag(15)) && ((R2_GLOBALS._rimLocation == 25) || (R2_GLOBALS._rimLocation == -3)))
+		 || ((R2_GLOBALS.getFlag(15)) && (R2_GLOBALS._rimLocation == R2_GLOBALS._rimTransportLocation))
+		 ) {
+		// Rim transport vechile located
+		R2_GLOBALS._rimTransportLocation = R2_GLOBALS._rimLocation;
+		if (!R2_GLOBALS.getFlag(15))
+			_walkFlag = true;
 
-		_companion.animate(ANIM_MODE_1, NULL);
-		_companion.setObjectWrapper(new SceneObjectWrapper());
-		_companion.setStrip(3);
-		_companion.setPosition(Common::Point(180, 96));
+		_rimTransport.postInit();
+		_rimTransport.setup(1700, 3, 1);
+		_rimTransport.setPosition(Common::Point(338, 150));
+		_rimTransport.setDetails(1700, 9, -1, -1, 2, (SceneItem *) NULL);
+		_rimTransport.fixPriority(15);
 
-		if (R2_GLOBALS.getFlag(30)) {
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-				_companion.animate(ANIM_MODE_NONE, NULL);
-				_companion.setObjectWrapper(NULL);
-				if (R2_GLOBALS.getFlag(32)) {
-					_companion.setup(1854, 1, 3);
-				} else {
-					_companion.setup(1854, 2, 3);
-				}
+		_rimTransportDoor.postInit();
+		_rimTransportDoor.setup(1700, 4, 1);
+		_rimTransportDoor.setPosition(Common::Point(312, 106));
+		_rimTransportDoor.fixPriority(130);
+	}
+}
 
-				_companion.setPosition(Common::Point(164, 106));
-			} else {
-				_companion.animate(ANIM_MODE_NONE, NULL);
-				_companion.setObjectWrapper(NULL);
-				if (R2_GLOBALS.getFlag(32)) {
-					R2_GLOBALS._player.setup(1854, 1, 3);
-				} else {
-					R2_GLOBALS._player.setup(1854, 2, 3);
-				}
+void Scene1700::postInit(SceneObjectList *OwnerList) {
+	loadScene(1700);
+	SceneExt::postInit();
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS._sceneManager._previousScene = 1530;
 
-				R2_GLOBALS._player.setPosition(Common::Point(164, 106));
-			}
-		}
+	scalePalette(65, 65, 65);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-		R2_GLOBALS._player.enableControl();
-	} else { // R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 1850
-		R2_GLOBALS._player._effect = EFFECT_SHADED;
-		_companion._effect = EFFECT_SHADED;
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 10;
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			if (R2_GLOBALS.getFlag(29)) {
-				setAction(&_sequenceManager1, this, 1863, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
-			} else {
-				setAction(&_sequenceManager1, this, 1861, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
-			}
-		} else {
-			if (R2_GLOBALS.getFlag(29)) {
-				setAction(&_sequenceManager1, this, 1864, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
-			} else {
-				setAction(&_sequenceManager1, this, 1862, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
-			}
-		}
-	}
+	_northExit.setDetails(Rect(94, 0, 319, 12), EXITCURSOR_N, 1700);
+	_southExit.setDetails(Rect(0, 161, 319, 168), EXITCURSOR_S, 1700);
+	_westExit.setDetails(Rect(0, 0, 12, 138), EXITCURSOR_W, 1800);
 
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setPosition(Common::Point(0, 0));
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
-		_companion._moveDiff = Common::Point(5, 3);
+		R2_GLOBALS._player.setVisage(1501);
+		R2_GLOBALS._player._moveDiff = Common::Point(2, 1);
 	} else {
-		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
-		_companion._moveDiff = Common::Point(3, 2);
+		R2_GLOBALS._player.setVisage(1506);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 1);
 	}
 
-	_displayScreen.postInit();
-	_displayScreen.setup(1850, 1, 1);
+	_companion.postInit();
+	_companion.animate(ANIM_MODE_1, NULL);
+	_companion.setObjectWrapper(new SceneObjectWrapper());
 
-	if (R2_GLOBALS.getFlag(62)) {
-		_displayScreen.setPosition(Common::Point(159, 120));
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		_companion.setVisage(1506);
+		_companion._moveDiff = Common::Point(3, 1);
+		_companion.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
 	} else {
-		_displayScreen.setPosition(Common::Point(159, 184));
+		_companion.setVisage(1501);
+		_companion._moveDiff = Common::Point(2, 1);
+		_companion.setDetails(9001, 1, -1, -1, 1, (SceneItem *) NULL);
 	}
 
-	_displayScreen.fixPriority(113);
+	R2_GLOBALS._sound1.play(134);
 
-	if (R2_GLOBALS.getFlag(34)) {
-		_displayScreen.setDetails(1850, 25, -1, -1, 4, &_robot);
-	} else {
-		_displayScreen.setDetails(1850, 25, -1, -1, 2, (SceneItem *) NULL);
-	}
+	_playerShadow.postInit();
+	_playerShadow.fixPriority(10);
 
-	if (!R2_GLOBALS.getFlag(62)) {
-		_displayScreen.hide();
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_playerShadow.setVisage(1112);
+	else
+		_playerShadow.setVisage(1111);
+
+	_playerShadow._effect = EFFECT_SHADOW_MAP;
+	_playerShadow._shadowMap = _shadowPaletteMap;
+	R2_GLOBALS._player._linkedActor = &_playerShadow;
+
+	_companionShadow.postInit();
+	_companionShadow.fixPriority(10);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_companionShadow.setVisage(1111);
+	else
+		_companionShadow.setVisage(1112);
+
+	_companionShadow._effect = EFFECT_SHADOW_MAP;
+	_companionShadow._shadowMap = _shadowPaletteMap;
+	_companion._linkedActor = &_companionShadow;
+
+	R2_GLOBALS._sound1.play(134);
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 1530:
+		R2_GLOBALS._player._characterIndex = R2_QUINN;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player.hide();
+		_companion.hide();
+
+		_hatch.postInit();
+		_hatch.hide();
+
+		_ledgeHopper.postInit();
+		_ledgeHopper.setup(1701, 1, 1);
+		_ledgeHopper.setPosition(Common::Point(220, 137));
+		_ledgeHopper.setDetails(1700, 6, -1, -1, 1, (SceneItem *) NULL);
+
+		_playerShadow.hide();
+		_companionShadow.hide();
+		R2_GLOBALS._events.setCursor(CURSOR_WALK);
+		_stripManager.start(539, this);
+		_sceneMode = 40;
+		break;
+	case 1750: {
+		R2_GLOBALS._player.setPosition(Common::Point(282, 121));
+		_companion.setPosition(Common::Point(282, 139));
+		_sceneMode = 8;
+		Common::Point pt(262, 101);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		Common::Point pt2(262, 119);
+		NpcMover *mover2 = new NpcMover();
+		_companion.addMover(mover2, &pt2, this);
+		}
+		break;
+	case 1800: {
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player.setPosition(Common::Point(0, 86));
+		_companion.setPosition(Common::Point(0, 64));
+		_sceneMode = 7;
+		R2_GLOBALS._player.setObjectWrapper(NULL);
+		R2_GLOBALS._player._strip = 1;
+		Common::Point pt(64, 86);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		_companion.setObjectWrapper(NULL);
+		_companion._strip = 1;
+		Common::Point pt2(77, 64);
+		NpcMover *mover2 = new NpcMover();
+		_companion.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	default:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._player.setPosition(Common::Point(109, 160));
+			_companion.setPosition(Common::Point(156, 160));
+			R2_GLOBALS._walkRegions.disableRegion(15);
+		} else {
+			R2_GLOBALS._player.setPosition(Common::Point(156, 160));
+			_companion.setPosition(Common::Point(109, 160));
+			R2_GLOBALS._walkRegions.disableRegion(17);
+		}
+		_sceneMode = 50;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
 	}
+	R2_GLOBALS._player._characterScene[R2_QUINN] = 1700;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1700;
+	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1700;
+	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1700;
 
-	_background.setDetails(Rect(0, 0, 320, 200), 1850, 16, -1, -1, 1, NULL);
+	enterArea();
 
-	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1850;
-	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1850;
+	_surface.setDetails(1, 1700, 3, -1, -1);
+	_background.setDetails(Rect(0, 0, 480, 200), 1700, 0, -1, -1, 1, NULL);
 }
 
-void Scene1850::remove() {
-	g_globals->_scenePalette.loadPalette(0);
-
-	R2_GLOBALS._scenePalette._palette[765] = 255;
-	R2_GLOBALS._scenePalette._palette[766] = 255;
-	R2_GLOBALS._scenePalette._palette[767] = 255;
-
+void Scene1700::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
 	SceneExt::remove();
 }
 
-void Scene1850::signal() {
+void Scene1700::signal() {
 	switch (_sceneMode) {
-	case 10:
-		R2_GLOBALS._player._effect = EFFECT_SHADED2;
-		R2_GLOBALS._player._shade = 6;
-
-		_companion._effect = EFFECT_SHADED2;
-		_companion._shade = 6;
+	case 1: {
+		_sceneMode = 3;
+		if (R2_GLOBALS._rimLocation < 2400)
+			++R2_GLOBALS._rimLocation;
+		enterArea();
+		R2_GLOBALS._player.setPosition(Common::Point(235 - (((((235 - R2_GLOBALS._player._position.x) * 100) / 103) * 167) / 100), 170));
+		Common::Point pt(R2_GLOBALS._player._position.x, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
 
-		R2_GLOBALS._walkRegions.disableRegion(5);
+		if (R2_GLOBALS._player._position.x < 132) {
+			_companion.setPosition(Common::Point(156, 170));
+			Common::Point pt2(156, 160);
+			NpcMover *mover2 = new NpcMover();
+			_companion.addMover(mover2, &pt2, NULL);
+			R2_GLOBALS._walkRegions.disableRegion(15);
+		} else {
+			_companion.setPosition(Common::Point(109, 170));
+			Common::Point pt3(109, 160);
+			NpcMover *mover3 = new NpcMover();
+			_companion.addMover(mover3, &pt3, NULL);
+			R2_GLOBALS._walkRegions.disableRegion(17);
+		}
+		}
+		break;
+	case 2: {
+		_sceneMode = 3;
+		if (R2_GLOBALS._rimLocation > -2400)
+			--R2_GLOBALS._rimLocation;
+		enterArea();
+		R2_GLOBALS._player.setPosition(Common::Point(235 - (((((235 - R2_GLOBALS._player._position.x) * 100) / 167) * 103) / 100), 0));
+		Common::Point pt(R2_GLOBALS._player._position.x, 10);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
 
-		if (R2_GLOBALS.getFlag(68)) {
-			R2_GLOBALS._player.enableControl();
+		if (R2_GLOBALS._player._position.x >= 171) {
+			_companion.setPosition(Common::Point(155, 0));
+			Common::Point pt2(155, 10);
+			NpcMover *mover2 = new NpcMover();
+			_companion.addMover(mover2, &pt2, NULL);
+			R2_GLOBALS._walkRegions.disableRegion(15);
 		} else {
-			R2_GLOBALS.setFlag(68);
-			_sceneMode = 20;
-			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-			_stripManager.start(554, this);
+			_companion.setPosition(Common::Point(188, 0));
+			Common::Point pt3(188, 10);
+			NpcMover *mover3 = new NpcMover();
+			_companion.addMover(mover3, &pt3, NULL);
+			R2_GLOBALS._walkRegions.disableRegion(17);
+		}
 		}
 		break;
-	case 11:
-		R2_GLOBALS.clearFlag(30);
+	case 3:
+		if (!_walkFlag) {
+			R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		} else {
+			R2_GLOBALS.setFlag(15);
+			_walkFlag = false;
+			_sceneMode = 31;
+			R2_GLOBALS._events.setCursor(CURSOR_WALK);
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+				_stripManager.start(542, this);
+			else
+				_stripManager.start(543, this);
+		}
+		break;
+	case 4: {
+		_sceneMode = 5;
+		Common::Point pt(271, 90);
+		PlayerMover *mover = new PlayerMover();
+		_companion.addMover(mover, &pt, NULL);
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			setAction(&_sequenceManager, this, 1700, &R2_GLOBALS._player, &_rimTransportDoor, NULL);
+		else
+			setAction(&_sequenceManager, this, 1701, &R2_GLOBALS._player, &_rimTransportDoor, NULL);
+		}
+		break;
+	case 5:
+		R2_GLOBALS._sceneManager.changeScene(1750);
+		break;
+	case 6:
 		R2_GLOBALS._sceneManager.changeScene(1800);
 		break;
-	case 15:
-		_sceneMode = 16;
+	case 7:
+		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
+		R2_GLOBALS._player._strip = 1;
+		_companion.setObjectWrapper(new SceneObjectWrapper());
+		_companion._strip = 1;
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		R2_GLOBALS._walkRegions.disableRegion(14);
 		break;
-	case 16:
-		_sceneMode = 1870;
-		setAction(&_sequenceManager1, this, 1870, &R2_GLOBALS._player, &_companion,
-			&_screen, &_helmet, NULL);
+	case 8:
+		R2_GLOBALS._player._strip = 2;
+		_companion._strip = 1;
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		R2_GLOBALS._walkRegions.disableRegion(12);
 		break;
-	case 20:
+	case 30:
+		_sceneMode = 31;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			_stripManager.start(540, this);
+		else
+			_stripManager.start(541, this);
+		break;
+	case 31:
 		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
-	case 21:
+	case 40:
 		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1877;
-		setAction(&_sequenceManager1, this, 1877, &R2_GLOBALS._player, &_companion,
-			&_robot, NULL);
+		_sceneMode = 1704;
+		setAction(&_sequenceManager, this, 1704, &R2_GLOBALS._player, &_companion,
+			&_hatch, &_ledgeHopper, &_playerShadow, &_companionShadow, NULL);
 		break;
-	case 30:
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1882;
-		setAction(&_sequenceManager1, this, 1882, &R2_GLOBALS._player, NULL);
+	case 50:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			R2_GLOBALS._walkRegions.disableRegion(15);
+		else
+			R2_GLOBALS._walkRegions.disableRegion(17);
+
+		R2_GLOBALS._player.enableControl();
 		break;
-	case 1852:
-	// No break on purpose:
-	case 1853:
-		if (_sceneMode == 1851) { // At this point, SceneMode can't be equal to 1851 => dead code
-			R2_GLOBALS.setFlag(31);
-			_palette1.loadPalette(1850);
-			_sceneMode = 1850;
+	case 1704:
+		R2_GLOBALS._sound1.play(134);
+		R2_GLOBALS._walkRegions.disableRegion(15);
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(12);
+		R2_GLOBALS._player.fixPriority(-1);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------
+ * Scene 1750 - Maintaiance Vechile
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene1750::Button::Button() {
+	_buttonId = 0;
+}
+
+void Scene1750::Button::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_buttonId);
+}
+
+bool Scene1750::Button::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_buttonId) {
+	case 1:
+		// Forward button
+		show();
+		scene->_backwardButton.hide();
+		if (scene->_speed < 0)
+			scene->_speed = -scene->_speed;
+		scene->_direction = 1;
+		break;
+	case 2:
+		// Backwards button
+		show();
+		scene->_forwardButton.hide();
+		if (scene->_speed > 0)
+			scene->_speed = -scene->_speed;
+		scene->_direction = -1;
+		break;
+	case 3:
+		// Exit button
+		if (scene->_rotation->_idxChange == 0) {
+			show();
+			R2_GLOBALS._sceneManager.changeScene(1700);
 		} else {
-			R2_GLOBALS.clearFlag(31);
-			_palette1.loadPalette(1851);
-			_sceneMode = 1851;
+			scene->_speed = 0;
+			scene->_speedSlider._moveRate = 20;
+			scene->_forwardButton._moveDiff.y = 1;
+			Common::Point pt(286, 143);
+			NpcMover *mover = new NpcMover();
+			scene->_speedSlider.addMover(mover, &pt, NULL);
 		}
+	default:
+		break;
+	}
 
-		_shadeChanging = true;
-		if (R2_GLOBALS.getFlag(30)) {
-			_displayScreen.setAction(&_sequenceManager2, NULL, 1867, &_displayScreen, NULL);
-		} else if (R2_GLOBALS.getFlag(34)) {
-			if (R2_GLOBALS.getFlag(62)) {
-				R2_GLOBALS.clearFlag(62);
-				_displayScreen.setAction(&_sequenceManager2, this, 1851, &_displayScreen, NULL);
-			} else {
-				R2_GLOBALS.setFlag(62);
-				_displayScreen.setAction(&_sequenceManager2, this, 1850, &_displayScreen, NULL);
-			}
-		} else if (R2_GLOBALS.getFlag(33)) {
-				R2_GLOBALS.setFlag(62);
-				R2_GLOBALS.setFlag(34);
-				R2_GLOBALS._walkRegions.disableRegion(2);
+	return true;
+}
 
-				_airbag.postInit();
-				_airbag.setDetails(1850, 6, -1, -1, 5, &_robot);
+/*------------------------------------------------------------------------*/
 
-				_sceneMode = 1879;
+Scene1750::SpeedSlider::SpeedSlider() {
+	_incrAmount = 0;
+	_xp = 0;
+	_ys = 0;
+	_height = 0;
+	_thumbHeight = 0;
+	_mouseDown = false;
+}
 
-				_displayScreen.setAction(&_sequenceManager2, this, 1879, &_robot,
-					&_displayScreen, &_airbag, NULL);
-		} else {
-			_displayScreen.setAction(&_sequenceManager2, NULL, 1867, &_displayScreen, NULL);
-		}
+void Scene1750::SpeedSlider::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
 
-		if (R2_GLOBALS.getFlag(34))
-			R2_GLOBALS._scenePalette.addFader(_palette1._palette, 256, 5, NULL);
-		else
-			R2_GLOBALS._scenePalette.addFader(_palette1._palette, 256, 5, this);
+	s.syncAsSint16LE(_incrAmount);
+	s.syncAsSint16LE(_xp);
+	s.syncAsSint16LE(_ys);
+	s.syncAsSint16LE(_height);
+	s.syncAsSint16LE(_thumbHeight);
+	s.syncAsSint16LE(_mouseDown);
+}
 
-		if (_sceneMode == 1851)
-			_shadeDirection = -20;
-		else
-			_shadeDirection = 20;
+void Scene1750::SpeedSlider::setupSlider(int incrAmount, int xp, int ys, int height, int thumbHeight) {
+	_mouseDown = false;
+	_incrAmount = incrAmount;
+	_xp = xp;
+	_ys = ys;
+	_height = height;
+	_thumbHeight = thumbHeight;
 
-		_shadeCountdown = 20;
+	postInit();
+	setup(1750, 1, 1);
+	fixPriority(255);
+	setPosition(Common::Point(_xp, _ys + ((_height * (incrAmount - 1)) / (_thumbHeight - 1))));
+}
 
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			if (_sceneMode == 1879)
-				_sceneMode = 1854;
+void Scene1750::SpeedSlider::calculateSlider() {
+	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
 
-			if (R2_GLOBALS.getFlag(32)) {
-				setAction(&_sequenceManager1, NULL, 1873, &R2_GLOBALS._player, NULL);
-			} else {
-				setAction(&_sequenceManager1, NULL, 1854, &R2_GLOBALS._player, NULL);
-			}
-		} else {
-			if (_sceneMode == 1879)
-				_sceneMode = 1855;
+	int tmpVar = (_height / (_thumbHeight - 1)) / 2;
+	int tmpVar2 = ((_position.y - _ys + tmpVar) * _thumbHeight) / (_height + 2 * tmpVar);
 
-			if (R2_GLOBALS.getFlag(32)) {
-				setAction(&_sequenceManager1, NULL, 1874, &R2_GLOBALS._player, NULL);
-			} else {
-				setAction(&_sequenceManager1, NULL, 1855, &R2_GLOBALS._player, NULL);
-			}
-		}
-		break;
-	case 1857:
-		if (R2_GLOBALS.getFlag(69)) {
-			R2_GLOBALS._player.enableControl();
-			R2_GLOBALS._player._canWalk = false;
+	setPosition(Common::Point(_xp, _ys + ((_height * tmpVar2) / (_thumbHeight - 1))));
+	scene->_speed = scene->_direction * tmpVar2;
+}
+
+void Scene1750::SpeedSlider::process(Event &event) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) &&
+			(_bounds.contains(event.mousePos))) {
+		_mouseDown = true;
+		event.eventType = EVENT_NONE;
+	}
+
+	if ((event.eventType == EVENT_BUTTON_UP) && _mouseDown) {
+		_mouseDown = false;
+		event.handled = true;
+		addMover(NULL);
+		calculateSlider();
+	}
+
+	if (_mouseDown) {
+		event.handled = true;
+		if (event.mousePos.y >= _ys) {
+			if (_ys + _height >= event.mousePos.y)
+				setPosition(Common::Point(_xp, event.mousePos.y));
+			else
+				setPosition(Common::Point(_xp, _ys + _height));
 		} else {
-			_sceneMode = 1858;
-			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-			_stripManager.start(555, this);
-			R2_GLOBALS.setFlag(69);
+			setPosition(Common::Point(_xp, _ys));
 		}
-		break;
-	case 1858:
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1859;
-		setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_robot, NULL);
-		R2_GLOBALS.clearFlag(30);
-		break;
-	case 1859:
-		R2_GLOBALS.setFlag(70);
-		_sceneMode = 20;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(575, this);
-		break;
-	case 1860:
-		if (_playerDest.x != 0) {
-			R2_GLOBALS._player.enableControl();
+	}
+}
 
-			PlayerMover *mover = new PlayerMover();
-			R2_GLOBALS._player.addMover(mover, &_playerDest, this);
+bool Scene1750::SpeedSlider::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return SceneActor::startAction(action, event);
 
-			_playerDest = Common::Point(0, 0);
-		}
+	return false;
+}
 
-		switch (_seqNumber) {
-		case 1:
-			_sceneMode = 1853;
-			if (R2_GLOBALS.getFlag(32)) {
-				setAction(&_sequenceManager1, this, 1872, &R2_GLOBALS._player, NULL);
-			} else {
-				setAction(&_sequenceManager1, this, 1853, &R2_GLOBALS._player, NULL);
-			}
-			break;
-		case 2:
-			_sceneMode = 11;
-			setAction(&_sequenceManager1, this, 1865, &R2_GLOBALS._player, &_leftDoor, NULL);
-			break;
-		case 3:
-			_sceneMode = 11;
-			setAction(&_sequenceManager1, this, 1866, &R2_GLOBALS._player, &_rightDoor, NULL);
-			break;
-		default:
-			break;
-		}
+/*------------------------------------------------------------------------*/
 
-		_seqNumber = 0;
-		break;
-	case 1870:
-		R2_GLOBALS._walkRegions.disableRegion(5);
-		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1);
-		R2_GLOBALS.setFlag(32);
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		break;
-	case 1875:
-		R2_INVENTORY.setObjectScene(R2_AIRBAG, 1850);
-		_sceneMode = 21;
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_stripManager.start(561, this);
-		break;
-	case 1877:
-		_screen.postInit();
-		_screen._effect = EFFECT_SHADED2;
+Scene1750::Scene1750() {
+	_direction = 0;
+	_speedCurrent = 0;
+	_speed = 0;
+	_speedDelta = 0;
+	_rotationSegment = 0;
+	_rotationSegCurrent = 0;
+	_newRotation = 0;
 
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			_screen.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
-		} else {
-			_screen.setDetails(1850, 30, -1, -1, 2, (SceneItem *)NULL);
-		}
+	_rotation = nullptr;
+}
 
-		_helmet.postInit();
-		_helmet._effect = EFFECT_SHADED2;
+void Scene1750::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	SYNC_POINTER(_rotation);
 
-		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-			_helmet.setDetails(1850, 29, -1, -1, 2, (SceneItem *)NULL);
-		} else {
-			_helmet.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
-		}
+	s.syncAsSint16LE(_direction);
+	s.syncAsSint16LE(_speedCurrent);
+	s.syncAsSint16LE(_speed);
+	s.syncAsSint16LE(_speedDelta);
+	s.syncAsSint16LE(_rotationSegment);
+	s.syncAsSint16LE(_rotationSegCurrent);
+	s.syncAsSint16LE(_newRotation);
+}
 
-		if (R2_GLOBALS.getFlag(31)) {
-			_screen._shade = 0;
-			_helmet._shade = 0;
-		} else {
-			_screen._shade = 6;
-			_helmet._shade = 6;
-		}
+void Scene1750::postInit(SceneObjectList *OwnerList) {
+	loadScene(1750);
+	R2_GLOBALS._sound1.play(115);
+	R2_GLOBALS._uiElements._active = false;
 
-		R2_GLOBALS.clearFlag(30);
-		_sceneMode = 15;
-		setAction(&_sequenceManager1, this, 1869, &R2_GLOBALS._player, &_screen, NULL);
-		_companion.setAction(&_sequenceManager2, this, 1868, &_companion, &_helmet, NULL);
-		break;
-	case 1878:
-		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1850);
-		R2_GLOBALS.setFlag(33);
-		R2_GLOBALS._walkRegions.disableRegion(2);
-		R2_GLOBALS._player.enableControl();
+	SceneExt::postInit();
+	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
+
+	R2_GLOBALS._player._characterScene[R2_QUINN] = 1750;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1750;
+	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1750;
+	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1750;
+
+	_rotation = R2_GLOBALS._scenePalette.addRotation(224, 254, 1);
+	_rotation->setDelay(0);
+	_rotation->_idxChange = 0;
+	_rotation->_countdown = 2;
+
+	switch ((R2_GLOBALS._rimLocation + 2) % 4) {
+	case 0:
+		_rotation->_currIndex = 247;
 		break;
-	case 1879:
-		R2_GLOBALS._player.enableControl();
+	case 1:
+		_rotation->_currIndex = 235;
 		break;
-	case 1881:
-		R2_GLOBALS._sceneManager.changeScene(1875);
+	case 2:
+		_rotation->_currIndex = 239;
 		break;
-	case 1882:
-		R2_INVENTORY.setObjectScene(R2_AIRBAG, 1);
-		R2_GLOBALS._player.enableControl();
+	case 3:
+		_rotation->_currIndex = 243;
 		break;
 	default:
-		R2_GLOBALS._player.enableControl();
 		break;
 	}
-}
 
-void Scene1850::process(Event &event) {
-	if ( (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_WALK)
-			&& (R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
-		_playerDest = event.mousePos;
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1860;
-		if (R2_GLOBALS.getFlag(32)) {
-			setAction(&_sequenceManager1, this, 1860, &R2_GLOBALS._player, &_robot, NULL);
-		} else {
-			setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_robot, NULL);
-		}
-		R2_GLOBALS.clearFlag(30);
-		event.handled = true;
+	byte tmpPal[768];
+
+	for (int i = 224; i < 255; i++) {
+		int tmpIndex = _rotation->_currIndex - 224;
+		if (tmpIndex > 254)
+			tmpIndex -= 31;
+		tmpPal[3 * i] = R2_GLOBALS._scenePalette._palette[3 * tmpIndex];
+		tmpPal[(3 * i) + 1] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 1];
+		tmpPal[(3 * i) + 2] = R2_GLOBALS._scenePalette._palette[(3 * tmpIndex) + 2];
 	}
 
-	Scene::process(event);
-}
+	for (int i = 224; i < 255; i++) {
+		R2_GLOBALS._scenePalette._palette[3 * i] = tmpPal[3 * i];
+		R2_GLOBALS._scenePalette._palette[(3 * i) + 1] = tmpPal[(3 * i) + 1];
+		R2_GLOBALS._scenePalette._palette[(3 * i) + 2] = tmpPal[(3 * i) + 2];
+	}
 
-void Scene1850::dispatch() {
-	if (_shadeChanging) {
-		_shadeCountdown--;
-		if (_shadeCountdown == 0)
-			_shadeChanging = false;
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.enableControl();
 
-		if (_shadeDirection >= 0) {
-			R2_GLOBALS._player._shade = (_shadeCountdown * 6) / _shadeDirection;
-		} else {
-			R2_GLOBALS._player._shade = ((_shadeCountdown * 6) / _shadeDirection) + 6;
-		}
-		R2_GLOBALS._player._flags |= OBJFLAG_PANES;
+	_radarSweep.postInit();
+	_radarSweep.setup(1750, 3, 1);
+	_radarSweep.setPosition(Common::Point(49, 185));
+	_radarSweep.fixPriority(7);
+	_radarSweep.setDetails(1750, 30, -1, -1, 1, (SceneItem *) NULL);
 
-		_companion._shade = R2_GLOBALS._player._shade;
-		_companion._flags |= OBJFLAG_PANES;
+	_scannerIcon.postInit();
+	_scannerIcon.setup(1750, 2, 1);
+	_scannerIcon.setPosition(Common::Point(35, ((_rotation->_currIndex - 218) % 4) + ((R2_GLOBALS._rimLocation % 800) * 4) - 1440));
+	_scannerIcon.fixPriority(8);
 
-		_screen._shade = R2_GLOBALS._player._shade;
-		_screen._flags |= OBJFLAG_PANES;
+	_redLights.postInit();
+	_redLights.setup(1750, 1, 4);
 
-		_helmet._shade = R2_GLOBALS._player._shade;
-		_helmet._flags |= OBJFLAG_PANES;
-	}
+	int tmpVar = ABS(_scannerIcon._position.y - 158) / 100;
 
-	if (R2_GLOBALS.getFlag(32)) {
-		_screen.setPosition(Common::Point(_displayScreen._position.x - 37, _displayScreen._position.y - 71));
-		_helmet.setPosition(Common::Point(_displayScreen._position.x - 20, _displayScreen._position.y - 73));
-	}
+	if (tmpVar >= 8)
+		_redLights.hide();
+	else if (_scannerIcon._position.y <= 158)
+		_redLights.setPosition(Common::Point(137, (tmpVar * 7) + 122));
+	else
+		_redLights.setPosition(Common::Point(148, (tmpVar * 7) + 122));
 
-	if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
-		_airbag.setPosition(Common::Point(_displayScreen._position.x + 20, _displayScreen._position.y - 71));
-	}
+	_speedSlider.setupSlider(1, 286, 143, 41, 15);
+	_speedSlider.setDetails(1750, 24, 1, -1, 1, (SceneItem *) NULL);
 
-	Scene::dispatch();
-}
+	_forwardButton.postInit();
+	_forwardButton._buttonId = 1;
+	_forwardButton.setup(1750, 1, 2);
+	_forwardButton.setPosition(Common::Point(192, 140));
+	_forwardButton.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
 
-/*--------------------------------------------------------------------------
- * Scene 1875 - Rim Lift Computer
- *
- *--------------------------------------------------------------------------*/
+	_backwardButton.postInit();
+	_backwardButton._buttonId = 2;
+	_backwardButton.setup(1750, 1, 3);
+	_backwardButton.setPosition(Common::Point(192, 163));
+	_backwardButton.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
+	_backwardButton.hide();
 
-Scene1875::Button::Button() {
-	_buttonId = 0;
-	_buttonDown = false;
+	_exitButton.postInit();
+	_exitButton._buttonId = 3;
+	_exitButton.setup(1750, 1, 5);
+	_exitButton.setPosition(Common::Point(230, 183));
+	_exitButton.setDetails(1750, 27, 1, -1, 1, (SceneItem *) NULL);
+
+	_direction = 1;		// Forward by default
+	_speedDelta = 0;
+	_speedCurrent = 0;
+	_speed = 0;
+	_rotationSegment = ((_rotation->_currIndex - 218) / 4) % 4;
+
+	_redLightsDescr.setDetails(Rect(129, 112, 155, 175), 1750, 21, -1, -1, 1, NULL);
+	_greenLights.setDetails(Rect(93, 122, 126, 172), 1750, 15, -1, -1, 1, NULL);
+	_frontView.setDetails(Rect(3, 3, 157, 99), 1750, 9, -1, -1, 1, NULL);
+	_rearView.setDetails(Rect(162, 3, 316, 99), 1750, 12, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, 320, 200), 1750, 6, 1, -1, 1, NULL);
 }
 
-void Scene1875::Button::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+void Scene1750::remove() {
+	if (R2_GLOBALS._rimLocation == 2400)
+		R2_GLOBALS._rimLocation = 2399;
 
-	s.syncAsSint16LE(_buttonId);
-	s.syncAsSint16LE(_buttonDown);
+	if (R2_GLOBALS._rimLocation == -2400)
+		R2_GLOBALS._rimLocation = -2399;
+
+	R2_GLOBALS._rimTransportLocation = R2_GLOBALS._rimLocation;
+
+	SceneExt::remove();
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._uiElements._active = true;
 }
 
-void Scene1875::Button::doButtonPress() {
-	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
+void Scene1750::signal() {
+	R2_GLOBALS._player.enableControl();
+}
 
-	R2_GLOBALS._sound1.play(227);
+void Scene1750::process(Event &event) {
+	Scene::process(event);
+	if (!event.handled)
+		_speedSlider.process(event);
+}
 
-	int newFrameNumber;
-	switch (_buttonId) {
-	case 3:
-		if ((scene->_map._frame == 1) && (scene->_button1._strip == 2)) {
-			R2_GLOBALS._player.disableControl();
-			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-			scene->_sceneMode = 10;
-			scene->_stripManager.start(576, scene);
-		} else {
-			R2_GLOBALS._player.disableControl();
-			scene->_sceneMode = 1890;
-			scene->_rimPosition.postInit();
-			scene->setAction(&scene->_sequenceManager, scene, 1890, &scene->_rimPosition, NULL);
+void Scene1750::dispatch() {
+	if (_rotation) {
+		if (!_speedDelta && (_speed != _speedCurrent)) {
+			if (_speedCurrent >= _speed)
+				--_speedCurrent;
+			else
+				++_speedCurrent;
+
+			_speedDelta = 21 - ABS(_speedCurrent);
 		}
-		break;
-	case 4:
-		newFrameNumber = scene->_map._frame + 1;
-		if (newFrameNumber > 6)
-			newFrameNumber = 1;
-		scene->_map.setFrame(newFrameNumber);
-		break;
-	case 5:
-		newFrameNumber = scene->_map._frame - 1;
-		if (newFrameNumber < 1)
-			newFrameNumber = 6;
-		scene->_map.setFrame(newFrameNumber);
-		break;
-	default:
-		break;
-	}
-}
 
-void Scene1875::Button::initButton(int buttonId) {
-	postInit();
-	_buttonId = buttonId;
-	_buttonDown = false;
-	setVisage(1855);
+		if (_speedDelta == 1) {
+			if (_speedCurrent == 0) {
+				_radarSweep.show();
+				_rotation->_idxChange = 0;
+			} else {
+				if (_rotation->_idxChange == 0)
+					_radarSweep.hide();
 
-	if (_buttonId == 1)
-		setStrip(2);
-	else
-		setStrip(1);
+				if (_speedCurrent < -12) {
+					_rotation->setDelay(15 - ABS(_speedCurrent));
+					_rotation->_idxChange = -2;
+				} else if (_speedCurrent < 0) {
+					_rotation->setDelay(10 - ABS(_speedCurrent));
+					_rotation->_idxChange = -1;
+				} else if (_speedCurrent < 11) {
+					_rotation->setDelay(10 - _speedCurrent);
+					_rotation->_idxChange = 1;
+				} else {
+					_rotation->setDelay(15 - _speedCurrent);
+					_rotation->_idxChange = 2;
+				}
+			}
+		}
 
-	setFrame(_buttonId);
-	switch (_buttonId) {
-	case 1:
-		setPosition(Common::Point(20, 144));
-		break;
-	case 2:
-		setPosition(Common::Point(82, 144));
-		break;
-	case 3:
-		setPosition(Common::Point(136, 144));
-		break;
-	case 4:
-		setPosition(Common::Point(237, 144));
-		break;
-	case 5:
-		setPosition(Common::Point(299, 144));
-		break;
-	default:
-		break;
-	}
+		if (_speedDelta)
+			--_speedDelta;
 
-	setDetails(1875, 6, 1, -1, 2, (SceneItem *) NULL);
-}
+		_rotationSegCurrent = _rotationSegment;
+		_rotationSegment = ((_rotation->_currIndex - 218) / 4) % 4;
 
-void Scene1875::Button::process(Event &event) {
-	if (!R2_GLOBALS._player._uiEnabled || event.handled)
-		return;
+		if ((_rotationSegCurrent + 1) == _rotationSegment || (_rotationSegCurrent - 3)  == _rotationSegment) {
+			if (R2_GLOBALS._rimLocation < 2400) {
+				++R2_GLOBALS._rimLocation;
+			}
+		}
 
-	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
+		if ((_rotationSegCurrent - 1) == _rotationSegment || (_rotationSegCurrent + 3) == _rotationSegment) {
+			if (R2_GLOBALS._rimLocation > -2400) {
+				--R2_GLOBALS._rimLocation;
+			}
+		}
 
-	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE)
-			&& (_bounds.contains(event.mousePos)) && !_buttonDown) {
-		setStrip(2);
-		switch (_buttonId) {
-		case 1:
-			R2_GLOBALS._sound2.play(227);
-			scene->_button2.setStrip(1);
-			break;
-		case 2:
-			R2_GLOBALS._sound2.play(227);
-			scene->_button1.setStrip(1);
-			break;
-		default:
-			break;
+		if (_rotation->_currIndex != _newRotation) {
+			// Handle setting the position of the lift icon in the scanner display
+			_newRotation = _rotation->_currIndex;
+			_scannerIcon.setPosition(Common::Point(35, ((_rotation->_currIndex - 218) % 4) +
+				((R2_GLOBALS._rimLocation % 800) * 4) - 1440));
 		}
-		_buttonDown = true;
-		event.handled = true;
 	}
 
-	if ((event.eventType == EVENT_BUTTON_UP) && _buttonDown) {
-		if ((_buttonId == 3) || (_buttonId == 4) || (_buttonId == 5)) {
-			setStrip(1);
-			doButtonPress();
-		}
-		_buttonDown = false;
-		event.handled = true;
+	int v = ABS(_scannerIcon._position.y - 158) / 100;
+	if (v < 8) {
+		// Show how close the user is to the lift on the second column of lights
+		_redLights.show();
+		_redLights.setPosition(Common::Point((_scannerIcon._position.y <= 158) ? 137 : 148,
+			v * 7 + 122));
+	} else {
+		_redLights.hide();
 	}
 }
 
-void Scene1875::postInit(SceneObjectList *OwnerList) {
-	loadScene(1875);
-	SceneExt::postInit();
+/*--------------------------------------------------------------------------
+ * Scene 1800 - Rim Lift Exterior
+ *
+ *--------------------------------------------------------------------------*/
 
-	R2_GLOBALS._player._characterScene[R2_QUINN] = 1875;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1875;
+Scene1800::Scene1800() {
+	_locationMode = 0;
+}
 
-	_stripManager.addSpeaker(&_quinnSpeaker);
-	_stripManager.addSpeaker(&_seekerSpeaker);
+void Scene1800::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
 
-	_button1.initButton(1);
-	_button2.initButton(2);
-	_button3.initButton(3);
-	_button4.initButton(4);
-	_button5.initButton(5);
+	s.syncAsSint16LE(_locationMode);
+}
 
-	_map.postInit();
-	_map.setup(1855, 4, 1);
-	_map.setPosition(Common::Point(160, 116));
+bool Scene1800::Background::startAction(CursorType action, Event &event) {
+	if ((action != R2_COM_SCANNER) && (action != R2_COM_SCANNER_2))
+		return false;
 
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.hide();
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
 
-	if (R2_GLOBALS._sceneManager._previousScene == 1625) {
-		R2_GLOBALS._sound1.play(122);
-		R2_GLOBALS._player.disableControl();
-		_sceneMode = 11;
-		_rimPosition.postInit();
-		setAction(&_sequenceManager, this, 1892, &_rimPosition, NULL);
+	R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		if (R2_GLOBALS._rimLocation == 1201) {
+			scene->_stripManager.start(548, this);
+		} else if (R2_GLOBALS.getFlag(66)) {
+			return false;
+		} else {
+			scene->_stripManager.start(546, this);
+		}
 	} else {
-		if (R2_GLOBALS._sceneManager._previousScene == 3150) {
-			R2_GLOBALS._sound1.play(116);
+		if (R2_GLOBALS._rimLocation == 1201) {
+			scene->_stripManager.start(549, this);
+		} else if (R2_GLOBALS.getFlag(66)) {
+			return false;
+		} else {
+			scene->_stripManager.start(547, this);
 		}
-
-		R2_GLOBALS._player.enableControl();
-		R2_GLOBALS._player._canWalk = false;
 	}
 
-	_screen.setDetails(Rect(43, 14, 275, 122), 1875, 9, 1, -1, 1, NULL);
-	_background.setDetails(Rect(0, 0, 320, 200), 1875, 3, -1, -1, 1, NULL);
+	R2_GLOBALS.setFlag(66);
+	return true;
+}
 
-	R2_GLOBALS._player._characterScene[R2_QUINN] = 1875;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1875;
-	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1875;
-	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1875;
+bool Scene1800::Lever::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if (!R2_GLOBALS.getFlag(14))
+		return false;
+
+	if (R2_GLOBALS._player._characterIndex != R2_QUINN)
+		return SceneActor::startAction(action, event);
+
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+	R2_GLOBALS._player.disableControl();
+
+	if (_frame == 1) {
+		R2_GLOBALS.setFlag(64);
+		scene->_sceneMode = 1810;
+		scene->setAction(&scene->_sequenceManager, scene, 1810, &R2_GLOBALS._player, &scene->_lever, &scene->_leftStaircase, &scene->_rightStaircase, NULL);
+	} else {
+		R2_GLOBALS.clearFlag(64);
+		scene->_sceneMode = 1811;
+		scene->setAction(&scene->_sequenceManager, scene, 1811, &R2_GLOBALS._player, &scene->_lever, &scene->_leftStaircase, &scene->_rightStaircase, NULL);
+	}
+	return true;
 }
 
-void Scene1875::signal() {
-	switch (_sceneMode) {
-	case 10:
+bool Scene1800::Doors::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
+		// Seeker trying to force open the door
 		R2_GLOBALS._player.disableControl();
-		_sceneMode = 1891;
-		_rimPosition.postInit();
-		setAction(&_sequenceManager, this, 1891, &_rimPosition, NULL);
-		break;
-	case 11:
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-		_sceneMode = 1892;
-		_stripManager.start(577, this);
-		break;
-	case 1890:
-		_rimPosition.remove();
-		R2_GLOBALS._player.enableControl();
-		R2_GLOBALS._player._canWalk = false;
-		break;
-	case 1891:
+		if (scene->_locationMode >= 2) {
+			if (R2_GLOBALS.getFlag(14)) {
+				// Allow door to close
+				scene->_sceneMode = 1809;
+				scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_doors, NULL);
+				R2_GLOBALS.clearFlag(14);
+			} else {
+				// Force open door
+				scene->_sceneMode = 1808;
+				scene->setAction(&scene->_sequenceManager, scene, 1808, &R2_GLOBALS._player, &scene->_doors, NULL);
+				R2_GLOBALS.setFlag(14);
+			}
+		} else {
+			// Seeker failing to force open doors
+			scene->_sceneMode = 1813;
+			// Original was using 1813 in setAction too, but it somewhat broken.
+			// Seeker goes 2 pixels to high, hiding behind the door
+			scene->setAction(&scene->_sequenceManager, scene, 1808, &R2_GLOBALS._player, &scene->_doors, NULL);
+		}
+	} else if (R2_GLOBALS.getFlag(14)) {
+		return SceneActor::startAction(action, event);
+	} else {
+		// Quinn trying to force open doors
 		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._sceneManager.changeScene(1625);
-		break;
-	case 1892:
+		scene->_sceneMode = 1812;
+		scene->setAction(&scene->_sequenceManager, scene, 1812, &R2_GLOBALS._player, NULL);
+	}
+
+	return true;
+}
+
+bool Scene1800::PassengerDoor::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+
+	if (_position.x < 160) {
+		if (scene->_leftStaircase._frame == 1) {
+			return SceneActor::startAction(action, event);
+		} else {
+			R2_GLOBALS.setFlag(29);
+			R2_GLOBALS._player.disableControl();
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				if (R2_GLOBALS.getFlag(14)) {
+					scene->_sceneMode = 1;
+					scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_companion, &scene->_doors, NULL);
+					R2_GLOBALS.clearFlag(14);
+				} else {
+					scene->_sceneMode = 1804;
+					scene->setAction(&scene->_sequenceManager, scene, 1804, &R2_GLOBALS._player, &scene->_companion, &scene->_leftDoor, NULL);
+				}
+			} else {
+				if (R2_GLOBALS.getFlag(14)) {
+					scene->_sceneMode = 1;
+					scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_doors, NULL);
+					R2_GLOBALS.clearFlag(14);
+				} else {
+					scene->_sceneMode = 1805;
+					scene->setAction(&scene->_sequenceManager, scene, 1805, &R2_GLOBALS._player, &scene->_companion, &scene->_leftDoor, NULL);
+				}
+			}
+		}
+	} else if (scene->_leftStaircase._frame == 1) {
+		return SceneActor::startAction(action, event);
+	} else {
+		R2_GLOBALS.clearFlag(29);
 		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._sceneManager.changeScene(1900);
-		break;
-	default:
-		R2_GLOBALS._player.enableControl();
-		R2_GLOBALS._player._canWalk = false;
-		break;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			if (R2_GLOBALS.getFlag(14)) {
+				scene->_sceneMode = 2;
+				scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_companion, &scene->_doors, NULL);
+				R2_GLOBALS.clearFlag(14);
+			} else {
+				scene->_sceneMode = 1806;
+				scene->setAction(&scene->_sequenceManager, scene, 1806, &R2_GLOBALS._player, &scene->_companion, &scene->_rightDoor, NULL);
+			}
+		} else {
+			if (R2_GLOBALS.getFlag(14)) {
+				scene->_sceneMode = 2;
+				scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_doors, NULL);
+				R2_GLOBALS.clearFlag(14);
+			} else {
+				scene->_sceneMode = 1807;
+				scene->setAction(&scene->_sequenceManager, scene, 1807, &R2_GLOBALS._player, &scene->_companion, &scene->_rightDoor, NULL);
+			}
+		}
 	}
-}
-
-void Scene1875::process(Event &event) {
-	Scene::process(event);
 
-	_button1.process(event);
-	_button2.process(event);
-	_button3.process(event);
-	_button4.process(event);
-	_button5.process(event);
+	return true;
 }
 
-/*--------------------------------------------------------------------------
- * Scene 1900 - Spill Mountains Elevator Exit
- *
- *--------------------------------------------------------------------------*/
-
-bool Scene1900::LiftDoor::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneActor::startAction(action, event);
+void Scene1800::SouthExit::changeScene() {
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((_frame != 1) || (R2_GLOBALS._player._characterIndex != R2_SEEKER)) {
+	_enabled = false;
+	R2_GLOBALS._events.setCursor(CURSOR_WALK);
+	R2_GLOBALS._player.disableControl();
+	if (R2_GLOBALS.getFlag(14)) {
+		scene->_sceneMode = 3;
 		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-			return SceneActor::startAction(action, event);
+			scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_companion, &scene->_doors, NULL);
 		else
-			return true;
-	}
-
-	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.enableControl(CURSOR_USE);
-
-	if (_position.x >= 160) {
-		scene->_sceneMode = 1905;
-		scene->setAction(&scene->_sequenceManager1, scene, 1905, &R2_GLOBALS._player, &scene->_rightDoor, NULL);
+			scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_doors, NULL);
+		R2_GLOBALS.clearFlag(14);
 	} else {
-		R2_GLOBALS.setFlag(29);
-		scene->_sceneMode = 1904;
-		scene->setAction(&scene->_sequenceManager1, scene, 1904, &R2_GLOBALS._player, &scene->_leftDoor, NULL);
+		scene->_sceneMode = 1802;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			scene->setAction(&scene->_sequenceManager, scene, 1802, &R2_GLOBALS._player, &scene->_companion, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager, scene, 1803, &R2_GLOBALS._player, &scene->_companion, NULL);
 	}
-
-	return true;
 }
 
-void Scene1900::WestExit::changeScene() {
-	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
+void Scene1800::postInit(SceneObjectList *OwnerList) {
+	loadScene(1800);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(116);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	scene->_sceneMode = 10;
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS._rimLocation = 1201;
 
-	Common::Point pt(-10, 135);
-	NpcMover *mover = new NpcMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-}
+	// Set the mode based on whether this is the "correct" lift or not
+	if (R2_GLOBALS._rimLocation == 1201)
+		_locationMode = 2;
+	else
+		_locationMode = 0;
 
-void Scene1900::EastExit::changeScene() {
-	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
+	scalePalette(65, 65, 65);
+	_southExit.setDetails(Rect(0, 160, 319, 168), EXITCURSOR_S, 1800);
+	_background.setDetails(Rect(0, 0, 320, 200), -1, -1, -1, -1, 1, NULL);
 
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	scene->_sceneMode = 11;
+	_lever.postInit();
+	_lever.setup(1801, 4, 1);
+	_lever.setPosition(Common::Point(170, 124));
+	_lever.setDetails(1800, 13, 14, 15, 1, (SceneItem *) NULL);
 
-	Common::Point pt(330, 135);
-	NpcMover *mover = new NpcMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-}
+	_doors.postInit();
+	_doors.setup(1801, 3, 1);
+	_doors.setPosition(Common::Point(160, 139));
+	_doors.setDetails(1800, 6, -1, -1, 1, (SceneItem *) NULL);
 
-void Scene1900::postInit(SceneObjectList *OwnerList) {
-	loadScene(1900);
-	SceneExt::postInit();
+	_leftDoor.postInit();
+	_leftDoor.setup(1800, 1, 1);
+	_leftDoor.setPosition(Common::Point(110, 78));
+	_leftDoor.fixPriority(135);
+	_leftDoor.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
 
-	// Debug message, skipped
+	_rightDoor.postInit();
+	_rightDoor.setup(1800, 2, 1);
+	_rightDoor.setPosition(Common::Point(209, 78));
+	_rightDoor.fixPriority(135);
+	_rightDoor.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
 
-	if (R2_GLOBALS._sceneManager._previousScene == -1) {
-		R2_GLOBALS._sceneManager._previousScene = 1925;
-		R2_GLOBALS._player._characterIndex = R2_SEEKER;
-		R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1925;
-	}
+	_leftStaircase.postInit();
+	if ((_locationMode != 1) && (_locationMode != 3) && (!R2_GLOBALS.getFlag(64)))
+		_leftStaircase.setup(1801, 2, 1);
+	else
+		_leftStaircase.setup(1801, 2, 10);
+	_leftStaircase.setPosition(Common::Point(76, 142));
+	_leftStaircase.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
 
-	if (R2_GLOBALS._sceneManager._previousScene != 1875)
-		R2_GLOBALS._sound1.play(200);
+	_rightStaircase.postInit();
+	if ((_locationMode != 1) && (_locationMode != 3) && (!R2_GLOBALS.getFlag(64)))
+		_rightStaircase.setup(1801, 1, 1);
+	else
+		_rightStaircase.setup(1801, 1, 10);
+	_rightStaircase.setPosition(Common::Point(243, 142));
+	_rightStaircase.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
 
-	_stripManager.setColors(60, 255);
-	_stripManager.setFontNumber(3);
-	_stripManager.addSpeaker(&_seekerSpeaker);
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		// Standard Quinn setup
+		R2_GLOBALS._player.setVisage(1503);
+		R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
+	} else {
+		// Seeker setup dependent on whether he's holding the doors or not
+		if (R2_GLOBALS.getFlag(14)) {
+			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
+			R2_GLOBALS._player.setObjectWrapper(NULL);
+			R2_GLOBALS._player.setup(1801, 5, 12);
+			R2_GLOBALS._player.setPosition(Common::Point(160, 139));
+			R2_GLOBALS._walkRegions.disableRegion(9);
+			_doors.hide();
+		} else {
+			R2_GLOBALS._player.setVisage(1507);
+		}
+		R2_GLOBALS._player._moveDiff = Common::Point(4, 2);
+	}
 
-	_westExit.setDetails(Rect(0, 105, 14, 145), EXITCURSOR_W, 2000);
-	_westExit.setDest(Common::Point(14, 135));
+	_companion.postInit();
+	_companion.animate(ANIM_MODE_1, NULL);
+	_companion.setObjectWrapper(new SceneObjectWrapper());
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		if (R2_GLOBALS.getFlag(14)) {
+			_companion.animate(ANIM_MODE_NONE, NULL);
+			_companion.setObjectWrapper(NULL);
+			_companion.setup(1801, 5, 12);
 
-	_eastExit.setDetails(Rect(305, 105, 320, 145), EXITCURSOR_E, 2000);
-	_eastExit.setDest(Common::Point(315, 135));
+			R2_GLOBALS._walkRegions.disableRegion(9);
+			_doors.hide();
+		} else {
+			_companion.setup(1507, 1, 1);
+			_companion.setPosition(Common::Point(180, 160));
+		}
+		_companion.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
+		_companion._moveDiff = Common::Point(4, 2);
+	} else {
+		_companion.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+		_companion.setVisage(1503);
+		_companion._moveDiff = Common::Point(2, 2);
+	}
 
-	R2_GLOBALS._player.postInit();
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		R2_GLOBALS._player.setup(2008, 3, 1);
-	else
-		R2_GLOBALS._player.setup(20, 3, 1);
-	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1800) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._player.setPosition(Common::Point(114, 150));
+			R2_GLOBALS._player.setStrip(5);
+			if (R2_GLOBALS.getFlag(14)) {
+				_companion.setPosition(Common::Point(160, 139));
+				R2_GLOBALS._walkRegions.disableRegion(8);
+			} else {
+				_companion.setPosition(Common::Point(209, 150));
+				_companion.setStrip(6);
+				R2_GLOBALS._walkRegions.disableRegion(8);
+			}
+		} else {
+			if (R2_GLOBALS.getFlag(14)) {
+				R2_GLOBALS._player.setup(1801, 5, 12);
+				R2_GLOBALS._player.setPosition(Common::Point(160, 139));
+			} else {
+				R2_GLOBALS._player.setPosition(Common::Point(209, 150));
+				R2_GLOBALS._player.setStrip(6);
+			}
+			_companion.setPosition(Common::Point(114, 150));
+			_companion.setStrip(5);
+			R2_GLOBALS._walkRegions.disableRegion(10);
+			R2_GLOBALS._walkRegions.disableRegion(11);
+		}
+	} else if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		R2_GLOBALS._player.setPosition(Common::Point(140, 160));
+		_companion.setPosition(Common::Point(180, 160));
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(180, 160));
+		_companion.setPosition(Common::Point(140, 160));
+	}
+
+	_playerShadow.postInit();
+	_playerShadow.fixPriority(10);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		_playerShadow.setVisage(1111);
 	else
-		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
-	R2_GLOBALS._player.disableControl();
+		_playerShadow.setVisage(1110);
 
-	if (R2_GLOBALS._sceneManager._previousScene != 1925)
-		R2_GLOBALS.clearFlag(29);
+	_playerShadow._effect = EFFECT_SHADOW_MAP;
+	_playerShadow._shadowMap = _shadowPaletteMap;
 
-	_leftDoor.postInit();
-	_leftDoor.setup(1901, 1, 1);
-	_leftDoor.setPosition(Common::Point(95, 109));
-	_leftDoor.fixPriority(100);
+	R2_GLOBALS._player._linkedActor = &_playerShadow;
 
+	_companionShadow.postInit();
+	_companionShadow.fixPriority(10);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		_leftDoor.setDetails(1900, 0, 1, 2, 1, (SceneItem *) NULL);
+		_companionShadow.setVisage(1110);
 	else
-		_leftDoor.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
+		_companionShadow.setVisage(1111);
 
-	_rightDoor.postInit();
-	_rightDoor.setup(1901, 2, 1);
-	_rightDoor.setPosition(Common::Point(225, 109));
-	_rightDoor.fixPriority(100);
-	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
-		_rightDoor.setDetails(1900, 0, 1, 2, 1, (SceneItem *) NULL);
-	else
-		_rightDoor.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
+	_companionShadow._effect = EFFECT_SHADOW_MAP;
+	_companionShadow._shadowMap = _shadowPaletteMap;
 
-	if (R2_GLOBALS._sceneManager._previousScene != 1875) {
-		_leftDoorFrame.postInit();
-		_leftDoorFrame.setup(1945, 6, 1);
-		_leftDoorFrame.setPosition(Common::Point(96, 109));
-		_leftDoorFrame.fixPriority(80);
+	_companion._linkedActor = &_companionShadow;
 
-		_rightDoorFrame.postInit();
-		_rightDoorFrame.setup(1945, 6, 2);
-		_rightDoorFrame.setPosition(Common::Point(223, 109));
-		_rightDoorFrame.fixPriority(80);
-	}
+	R2_GLOBALS._player._characterScene[R2_QUINN] = 1800;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1800;
 
-	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1875) {
-		R2_GLOBALS._player._characterIndex = R2_QUINN;
-		_companion.postInit();
-		_sceneMode = 20;
-		R2_GLOBALS._player.setAction(&_sequenceManager1, NULL, 1901, &R2_GLOBALS._player, &_leftDoor, NULL);
-		_companion.setAction(&_sequenceManager2, this, 1900, &_companion, &_rightDoor, NULL);
-	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1925) {
-		if (R2_GLOBALS.getFlag(29)) {
-			R2_GLOBALS.clearFlag(29);
-			_leftDoor.hide();
+	_elevatorContents.setDetails(Rect(128, 95, 190, 135), 1800, 10, -1, -1, 1, NULL);
+	_elevator.setDetails(Rect(95, 3, 223, 135), 1800, 0, -1, -1, 1, NULL);
 
-			R2_GLOBALS._player.setStrip(6);
-			R2_GLOBALS._player.setPosition(Common::Point(90, 106));
-			_sceneMode = 1906;
-			setAction(&_sequenceManager1, this, 1906, &R2_GLOBALS._player, &_leftDoor, NULL);
-		} else {
-			_rightDoor.hide();
-			R2_GLOBALS._player.setStrip(5);
-			R2_GLOBALS._player.setPosition(Common::Point(230, 106));
-			_sceneMode = 1907;
-			setAction(&_sequenceManager1, this, 1907, &R2_GLOBALS._player, &_rightDoor, NULL);
-		}
+	// Original was calling _item3.setDetails(Rect(1800, 11, 24, 23), 25, -1, -1, -1, 1, NULL);
+	// This is *wrong*. The following statement is a wild guess based on good common sense
+	_surface.setDetails(11, 1800, 23, 24, 25);
+	_secBackground.setDetails(Rect(0, 0, 320, 200), 1800, 17, -1, 19, 1, NULL);
 
-		if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
-			_companion.postInit();
-			_companion.setPosition(Common::Point(30, 110));
-			R2_GLOBALS._walkRegions.disableRegion(1);
-			_companion.setup(2008, 3, 1);
-			_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
-		}
-		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
-	} else {
-		if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
-			_companion.postInit();
-			_companion.setPosition(Common::Point(30, 110));
-			R2_GLOBALS._walkRegions.disableRegion(1);
-			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-				_companion.setup(20, 3, 1);
-				_companion.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
-			} else {
-				_companion.setup(2008, 3, 1);
-				_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
-			}
+	R2_GLOBALS._player.disableControl();
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1800) {
+		if ((R2_GLOBALS.getFlag(14)) && (R2_GLOBALS._player._characterIndex == R2_SEEKER)) {
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+		} else {
+			R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		}
-
-		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
+	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1850) {
+		if (R2_GLOBALS.getFlag(29)) {
 			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
-				if (R2_GLOBALS._spillLocation[R2_QUINN] == 5) {
-					_sceneMode = 1902;
-					setAction(&_sequenceManager1, this, 1902, &R2_GLOBALS._player, NULL);
-				} else {
-					_sceneMode = 1903;
-					setAction(&_sequenceManager1, this, 1903, &R2_GLOBALS._player, NULL);
-				}
+				_sceneMode = 1814;
+				setAction(&_sequenceManager, this, 1814, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
 			} else {
-				if (R2_GLOBALS._spillLocation[R2_SEEKER] == 5) {
-					_sceneMode = 1908;
-					setAction(&_sequenceManager1, this, 1908, &R2_GLOBALS._player, NULL);
-				} else {
-					_sceneMode = 1909;
-					setAction(&_sequenceManager1, this, 1909, &R2_GLOBALS._player, NULL);
-				}
+				_sceneMode = 1815;
+				setAction(&_sequenceManager, this, 1815, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
 			}
+		} else if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_sceneMode = 1816;
+			setAction(&_sequenceManager, this, 1816, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
 		} else {
-			R2_GLOBALS._player.setPosition(Common::Point(160, 135));
-			R2_GLOBALS._player.enableControl();
+			_sceneMode = 1817;
+			setAction(&_sequenceManager, this, 1817, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
 		}
-		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
+	} else if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		_sceneMode = 1800;
+		setAction(&_sequenceManager, this, 1800, &R2_GLOBALS._player, &_companion, NULL);
+	} else {
+		_sceneMode = 1801;
+		setAction(&_sequenceManager, this, 1801, &R2_GLOBALS._player, &_companion, NULL);
 	}
 
-	_elevator.setDetails(Rect(77, 2, 240, 103), 1900, 6, -1, -1, 1, NULL);
-	_background.setDetails(Rect(0, 0, 320, 200), 1900, 3, -1, -1, 1, NULL);
-}
-
-void Scene1900::remove() {
-	R2_GLOBALS._sound1.fadeOut(NULL);
-	SceneExt::remove();
+	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1800;
+	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1800;
 }
 
-void Scene1900::signal() {
+void Scene1800::signal() {
 	switch (_sceneMode) {
-	case 10:
-		R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] = 5;
-		R2_GLOBALS._sceneManager.changeScene(2000);
+	case 1:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_sceneMode = 1804;
+			setAction(&_sequenceManager, this, 1804, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
+		} else {
+			_sceneMode = 1805;
+			setAction(&_sequenceManager, this, 1805, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
+		}
+		break;
+	case 2:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_sceneMode = 1806;
+			setAction(&_sequenceManager, this, 1806, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
+		} else {
+			_sceneMode = 1807;
+			setAction(&_sequenceManager, this, 1807, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
+		}
 		break;
+	case 3:
+		_sceneMode = 1802;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			setAction(&_sequenceManager, this, 1802, &R2_GLOBALS._player, &_companion, NULL);
+		else
+			setAction(&_sequenceManager, this, 1803, &R2_GLOBALS._player, &_companion, NULL);
+		break;
+	case 10:
+	// No break on purpose
 	case 11:
-		R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] = 6;
-		R2_GLOBALS._sceneManager.changeScene(2000);
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
-	case 20:
-		++_sceneMode;
-		R2_GLOBALS._events.setCursor(CURSOR_WALK);
-		_stripManager.start(1300, this);
+	case 12:
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		R2_GLOBALS._player._canWalk = false;
 		break;
-	case 21:
-		++_sceneMode;
+	case 13:
+		_sceneMode = 14;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		R2_GLOBALS._player.setup(1801, 7, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_8, 0, NULL);
+		_stripManager.start(550, this);
+		break;
+	case 14:
+		_sceneMode = 15;
 		R2_GLOBALS._player.disableControl();
-		if (R2_GLOBALS._player._action)
-			R2_GLOBALS._player._action->_endHandler = this;
-		else
-			signal();
+		R2_GLOBALS._player.setup(1801, 6, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
 		break;
-	case 22:
-		_sceneMode = 1910;
-		_companion.setAction(&_sequenceManager2, this, 1910, &_companion, NULL);
+	case 15:
+		R2_GLOBALS._player.setup(1503, 4, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
 		break;
-	case 1904:
-		R2_GLOBALS._scene1925CurrLevel = -3;
+	// Cases 23 and 24 have been added to fix missing hardcoded logic in the original,
+	// when Seeker tries to open the door
+	case 23:
+		_sceneMode = 24;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		R2_GLOBALS._player.setup(1801, 5, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_8, 0, NULL);
+		_stripManager.start(550, this);
+		break;
+	case 24:
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player.setup(1507, 4, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+
+		_doors.setup(1801, 3, 1);
+		_doors.setPosition(Common::Point(160, 139));
+		_doors.setDetails(1800, 6, -1, -1, 1, (SceneItem *) NULL);
+		_doors.show();
+
+		R2_GLOBALS._player._position.y += 2;
+		R2_GLOBALS._player.show();
+		break;
+	case 1800:
+		R2_GLOBALS._walkRegions.disableRegion(8);
+		if (R2_GLOBALS.getFlag(63))
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+		else {
+			_sceneMode = 10;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			_stripManager.start(544, this);
+		}
+		break;
+	case 1801:
+		R2_GLOBALS._walkRegions.disableRegion(10);
+		R2_GLOBALS._walkRegions.disableRegion(11);
+		R2_GLOBALS.setFlag(63);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		break;
+	case 1802:
+		R2_GLOBALS.clearFlag(14);
+		R2_GLOBALS._sceneManager.changeScene(1700);
+		break;
+	case 1804:
 	// No break on purpose
-	case 1905:
-		R2_GLOBALS._player.disableControl(CURSOR_WALK);
-		R2_GLOBALS._sceneManager.changeScene(1925);
+	case 1805:
+	// No break on purpose
+	case 1806:
+	// No break on purpose
+	case 1807:
+		R2_GLOBALS.clearFlag(14);
+		R2_GLOBALS._sceneManager.changeScene(1850);
 		break;
-	case 1910:
-		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 2535);
-		R2_GLOBALS._player.disableControl(CURSOR_WALK);
-		R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1900;
-		R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1900;
-		R2_GLOBALS._sceneManager.changeScene(2450);
+	case 1808:
+		_sceneMode = 12;
+		R2_GLOBALS._events.setCursor(CURSOR_WALK);
+		_stripManager.start(553, this);
 		break;
-	case 1906:
-		R2_GLOBALS._scene1925CurrLevel = -3;
+	case 1812:
+		_sceneMode = 13;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	// Case 1813 has been added to fix Seeker missing animation in the original game
+	case 1813:
+		_sceneMode = 23;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 1814:
+	// No break on purpose
+	case 1815:
+		R2_GLOBALS._walkRegions.disableRegion(10);
+		R2_GLOBALS._walkRegions.disableRegion(11);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1816:
 	// No break on purpose
+	case 1817:
+		R2_GLOBALS._walkRegions.disableRegion(8);
+		R2_GLOBALS._player.enableControl();
+		break;
 	default:
 		R2_GLOBALS._player.enableControl();
 		break;
 	}
 }
 
-/*--------------------------------------------------------------------------
- * Scene 1925 - Spill Mountains Elevator Shaft
- *
- *--------------------------------------------------------------------------*/
+void Scene1800::saveCharacter(int characterIndex) {
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
+		R2_GLOBALS._sound1.fadeOut2(NULL);
 
-Scene1925::Scene1925() {
-	_newSceneMode = 0;
-	for (int i = 0; i < 5; i++)
-		_levelResNum[i] = 0;
+	SceneExt::saveCharacter(characterIndex);
 }
 
-void Scene1925::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
-
-	s.syncAsSint16LE(_newSceneMode);
-	for (int i = 0; i < 5; i++)
-		s.syncAsSint16LE(_levelResNum[i]);
-}
+/*--------------------------------------------------------------------------
+ * Scene 1850 - Rim Lift Interior
+ *
+ *--------------------------------------------------------------------------*/
 
-bool Scene1925::Button::startAction(CursorType action, Event &event) {
+bool Scene1850::Button::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneHotspot::startAction(action, event);
 
-	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100))
-		return SceneHotspot::startAction(action, event);
+	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
 
-	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+	R2_GLOBALS._player.disableControl();
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		scene->_sceneMode = 1852;
+		if (R2_GLOBALS.getFlag(32))
+			scene->setAction(&scene->_sequenceManager1, scene, 1871, &R2_GLOBALS._player, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 1852, &R2_GLOBALS._player, NULL);
+	} else if (R2_GLOBALS.getFlag(30)) {
+		scene->_seqNumber = 1;
+		scene->_sceneMode = 1860;
 
-	if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 20))
-		scene->_sceneMode = 1928;
-	else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 200))
-		scene->_sceneMode = 1929;
-	else
-		scene->_sceneMode = 1930;
+		if (R2_GLOBALS.getFlag(32))
+			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_robot, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_robot, NULL);
+
+		R2_GLOBALS.clearFlag(30);
+	} else {
+		scene->_sceneMode = 1853;
+
+		if (R2_GLOBALS.getFlag(32))
+			scene->setAction(&scene->_sequenceManager1, scene, 1872, &R2_GLOBALS._player, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 1853, &R2_GLOBALS._player, NULL);
+	}
 
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player,
-		&scene->_door, NULL);
 	return true;
 }
 
-bool Scene1925::Ladder::startAction(CursorType action, Event &event) {
-	if ((!R2_GLOBALS.getFlag(29)) || (action != CURSOR_USE))
-		return SceneHotspot::startAction(action, event);
+bool Scene1850::Robot::startAction(CursorType action, Event &event) {
+	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
 
-	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+	switch (action) {
+	case CURSOR_USE:
+		if ((R2_GLOBALS._player._characterIndex != R2_SEEKER) || R2_GLOBALS.getFlag(33) || R2_GLOBALS.getFlag(30))
+			return SceneActor::startAction(action, event);
 
-	R2_GLOBALS._player.disableControl(CURSOR_USE);
-	scene->_sceneMode = 0;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 1857;
 
-	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100)) {
-		scene->_westExit._enabled = false;
-		scene->_sceneMode = 1925;
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode,
-			&R2_GLOBALS._player, &scene->_door, NULL);
+		if (R2_GLOBALS.getFlag(32))
+			scene->setAction(&scene->_sequenceManager1, scene, 1858, &R2_GLOBALS._player, &scene->_robot, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 1857, &R2_GLOBALS._player, &scene->_robot, NULL);
+
+		R2_GLOBALS.setFlag(30);
 		return true;
-	}
+		break;
+	case CURSOR_LOOK:
+		if (R2_GLOBALS.getFlag(34))
+			SceneItem::display(1850, 2, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		else
+			SceneItem::display(1850, 1, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
 
-	if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 20) && (event.mousePos.y >= 30)) {
-		scene->_sceneMode = 1931;
-	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 200) && (event.mousePos.y < 140)) {
-		scene->_sceneMode = 1932;
-	} else if ( (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
-		         || ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))
-				 ) && (event.mousePos.y >= 100)) {
-		scene->_sceneMode = 1926;
-	} else if ( (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
-		         || ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))
-				 ) && (event.mousePos.y < 60)) {
-		scene->_sceneMode = 1927;
-	} else {
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		R2_GLOBALS._player._canWalk = false;
-	}
+		return true;
+		break;
+	case R2_AIRBAG:
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
+			if (R2_GLOBALS.getFlag(70)) {
+				R2_GLOBALS._player.disableControl();
+				scene->_sceneMode = 30;
 
-	if (scene->_sceneMode != 0)
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+				R2_GLOBALS._events.setCursor(CURSOR_WALK);
+				scene->_stripManager.start(558, scene);
 
-	return true;
-}
+				return true;
+			} else {
+				return SceneActor::startAction(action, event);
+			}
+		} else if (R2_GLOBALS.getFlag(30)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1875;
+			scene->_airbag.postInit();
 
-void Scene1925::ExitUp::changeScene() {
-	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+			if (R2_GLOBALS.getFlag(32))
+				scene->setAction(&scene->_sequenceManager1, scene, 1876,
+					&R2_GLOBALS._player, &scene->_airbag, NULL);
+			else
+				scene->setAction(&scene->_sequenceManager1, scene, 1875,
+					&R2_GLOBALS._player, &scene->_airbag, NULL);
 
-	_moving = false;
-	R2_GLOBALS._player.disableControl(CURSOR_USE);
-	scene->_sceneMode = 0;
+			return true;
+		} else if (R2_GLOBALS.getFlag(70)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 20;
+			R2_GLOBALS._events.setCursor(CURSOR_WALK);
+			scene->_stripManager.start(557, scene);
+			R2_GLOBALS.setFlag(69);
 
-	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100)) {
-		scene->_westExit._enabled = false;
-		scene->_newSceneMode = 1927;
-		scene->_sceneMode = 1925;
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode,
-			&R2_GLOBALS._player, &scene->_door, NULL);
-		return;
+			return true;
+		} else {
+			return SceneActor::startAction(action, event);
+		}
+		break;
+	case R2_REBREATHER_TANK:
+		if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
+			if (R2_GLOBALS.getFlag(30))
+				return SceneActor::startAction(action, event);
+
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1878;
+			scene->setAction(&scene->_sequenceManager1, scene, 1878, &R2_GLOBALS._player,
+				&scene->_robot, &scene->_airbag, NULL);
+		}
+
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
 	}
+}
 
-	if (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
-		|| ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))) {
-		scene->_sceneMode = 1927;
-	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 200)) {
-		scene->_sceneMode = 1932;
+bool Scene1850::Door::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneHotspot::startAction(action, event);
+
+	if (R2_GLOBALS.getFlag(32)) {
+		SceneItem::display(3240, 4, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		return true;
 	}
 
-	if (scene->_sceneMode != 0)
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
-	else {
-		scene->_sceneMode = 1932;
-		scene->signal();
+	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	if (scene->_sceneMode == 1851)
+		R2_GLOBALS._player._effect = EFFECT_SHADED;
+
+	if (_position.x >= 160)
+		R2_GLOBALS.setFlag(29);
+	else
+		R2_GLOBALS.clearFlag(29);
+
+	if ((R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
+		if (_position.x >= 160)
+			scene->_seqNumber = 3;
+		else
+			scene->_seqNumber = 2;
+
+		scene->_sceneMode = 1860;
+
+		if (R2_GLOBALS.getFlag(32)) {
+			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_robot, NULL);
+		} else {
+			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_robot, NULL);
+		}
+	} else {
+		scene->_sceneMode = 11;
+		if (_position.x >= 160) {
+			scene->setAction(&scene->_sequenceManager1, scene, 1866, &R2_GLOBALS._player, &scene->_rightDoor, NULL);
+		} else {
+			scene->setAction(&scene->_sequenceManager1, scene, 1865, &R2_GLOBALS._player, &scene->_leftDoor, NULL);
+		}
 	}
+
+	return true;
 }
 
-void Scene1925::ExitDown::changeScene() {
-	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+bool Scene1850::DisplayScreen::startAction(CursorType action, Event &event) {
+	if ((action != CURSOR_USE) || (_position.y != 120))
+		return SceneHotspot::startAction(action, event);
 
-	_moving = false;
-	R2_GLOBALS._player.disableControl(CURSOR_USE);
-	scene->_sceneMode = 0;
+	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100)) {
-		scene->_westExit._enabled = false;
-		scene->_newSceneMode = 1926;
-		scene->_sceneMode = 1925;
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode,
-			&R2_GLOBALS._player, &scene->_door, NULL);
-		return;
-	}
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 1881;
 
-	if (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
-		|| ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))) {
-		scene->_sceneMode = 1926;
-	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 20)) {
-		scene->_sceneMode = 1931;
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		scene->setAction(&scene->_sequenceManager1, scene, 1881, &R2_GLOBALS._player, NULL);
+	} else {
+		scene->setAction(&scene->_sequenceManager1, scene, 1880, &R2_GLOBALS._player, NULL);
 	}
 
-	if (scene->_sceneMode == 0) {
-		scene->_sceneMode = 1931;
-		scene->signal();
-	} else
-		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+	return true;
 }
 
-void Scene1925::WestExit::changeScene() {
-	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+/*------------------------------------------------------------------------*/
 
-	_moving = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	scene->_sceneMode = 1921;
-	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+Scene1850::Scene1850() {
+	_sceneMode = 0;
+	_shadeCountdown = 0;
+	_shadeDirection = 0;
+	_shadeChanging = false;
+	_seqNumber = 0;
 }
 
-void Scene1925::EastExit::changeScene() {
-	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+void Scene1850::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
 
-	_moving = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	scene->_sceneMode = 1920;
-	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+	s.syncAsSint16LE(_sceneMode);
+	s.syncAsSint16LE(_shadeCountdown);
+	s.syncAsSint16LE(_shadeDirection);
+	s.syncAsSint16LE(_shadeChanging);
+	s.syncAsSint16LE(_seqNumber);
+	s.syncAsSint16LE(_playerDest.x);
+	s.syncAsSint16LE(_playerDest.y);
 }
 
-void Scene1925::changeLevel(bool upFlag) {
-	if (R2_GLOBALS._scene1925CurrLevel < 0)
-		R2_GLOBALS._scene1925CurrLevel = 3;
+void Scene1850::postInit(SceneObjectList *OwnerList) {
+	loadScene(1850);
 
-	if (upFlag) {
-		R2_GLOBALS._player.setup(1925, 1, 1);
-		R2_GLOBALS._player.setPosition(Common::Point(154, 200));
-		++R2_GLOBALS._scene1925CurrLevel;
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 1850)
+		R2_GLOBALS.clearFlag(31);
+
+	_palette1.loadPalette(0);
+
+	if (R2_GLOBALS.getFlag(31)) {
+		_sceneMode = 1850;
+		g_globals->_scenePalette.loadPalette(1850);
 	} else {
-		R2_GLOBALS._player.setup(1925, 1, 1);
-		R2_GLOBALS._player.setPosition(Common::Point(154, 20));
-		R2_GLOBALS._scene1925CurrLevel--;
+		_sceneMode = 1851;
+		g_globals->_scenePalette.loadPalette(1851);
 	}
 
-	switch (R2_GLOBALS._scene1925CurrLevel) {
-	case -1:
-		R2_GLOBALS._sceneManager.changeScene(1945);
-		return;
-		break;
-	case 3:
-		loadScene(_levelResNum[4]);
-		_button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
-		_door.setDetails(1925, 0, 1, 2, 2, (SceneItem *) NULL);
-		_door.show();
-		break;
-	case 512:
-		R2_GLOBALS._scene1925CurrLevel = 508;
-	// No break on purpose
-	default:
-		loadScene(_levelResNum[(R2_GLOBALS._scene1925CurrLevel % 4)]);
-		R2_GLOBALS._sceneItems.remove(&_button);
-		R2_GLOBALS._sceneItems.remove(&_door);
-		_door.hide();
-		break;
-	}
+	SceneExt::postInit();
 
-	R2_GLOBALS._player.enableControl(CURSOR_USE);
-	R2_GLOBALS._player._canWalk = false;
-}
+	if (R2_GLOBALS._sceneManager._previousScene == 3150)
+		R2_GLOBALS._sound1.play(116);
 
-void Scene1925::postInit(SceneObjectList *OwnerList) {
-	_levelResNum[0] = 1930;
-	_levelResNum[1] = 1935;
-	_levelResNum[2] = 1940;
-	_levelResNum[3] = 1935;
-	_levelResNum[4] = 1925;
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-	if (R2_GLOBALS.getFlag(29)) {
-		if ((R2_GLOBALS._scene1925CurrLevel == -3) || (R2_GLOBALS._scene1925CurrLevel == 3))
-			loadScene(_levelResNum[4]);
-		else
-			loadScene(_levelResNum[R2_GLOBALS._scene1925CurrLevel % 4]);
-	} else {
-		R2_GLOBALS._scene1925CurrLevel = -2;
-		loadScene(1920);
-	}
-	SceneExt::postInit();
-	R2_GLOBALS._sound1.play(220);
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.disableControl();
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1925;
-	R2_GLOBALS._player._characterIndex = R2_SEEKER;
+	_shadeChanging = false;
+	_seqNumber = 0;
+	_playerDest = Common::Point(0, 0);
 
-	switch (R2_GLOBALS._scene1925CurrLevel) {
-	case -2:
-		_eastExit.setDetails(Rect(203, 44, 247, 111), EXITCURSOR_E, 1925);
-		_ladder.setDetails(Rect(31, 3, 45, 167), 1925, 6, -1, 8, 1, NULL);
-		break;
-	case 3:
-		_door.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL);
-		_button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
-	// No break on purpose
-	case -3:
-		_westExit.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
-	// No break on purpose
-	default:
-		_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925);
-		_exitDown.setDetails(Rect(128, 160, 190, 167), EXITCURSOR_S, 1925);
-		_ladder.setDetails(Rect(141, 11, 167, 159),	1925, 6, -1, -1, 1, NULL);
-		break;
-	}
+	R2_GLOBALS._player._characterScene[R2_QUINN] = 1850;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1850;
 
-	_door.postInit();
-	_door.setup(1925, 5, 1);
-	_door.setPosition(Common::Point(128, 35));
-	_door.hide();
+	_button.setDetails(Rect(101, 56, 111, 63), 1850, 19, -1, -1, 1, NULL);
 
-	if (R2_GLOBALS._scene1925CurrLevel == 3)
-		_door.show();
+	_leftDoor.postInit();
+	_leftDoor.setup(1850, 3, 1);
+	_leftDoor.setPosition(Common::Point(66, 102));
+	_leftDoor.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL);
 
-	R2_GLOBALS._player.enableControl(CURSOR_USE);
-	switch (R2_GLOBALS._scene1925CurrLevel) {
-	case -2:
-		R2_GLOBALS._player.setup(20, 6, 1);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._player.setPosition(Common::Point(224, 109));
-		break;
-	case -3:
-		_door.hide();
-		R2_GLOBALS._player.setup(20, 5, 1);
-		R2_GLOBALS._player.setPosition(Common::Point(110, 100));
-		break;
-	case 0:
-		R2_GLOBALS._player.setup(1925, 1, 1);
-		R2_GLOBALS._player.setPosition(Common::Point(154, 200));
-		break;
-	default:
-		R2_GLOBALS._player.setup(1925, 1, 3);
-		R2_GLOBALS._player.setPosition(Common::Point(154, 110));
-		break;
+	_rightDoor.postInit();
+	_rightDoor.setup(1850, 2, 1);
+	_rightDoor.setPosition(Common::Point(253, 102));
+	_rightDoor.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL);
+
+	R2_GLOBALS._walkRegions.disableRegion(1);
+
+	_robot.postInit();
+
+	if (R2_GLOBALS.getFlag(34)) {
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		_robot.setup(1851, 4, 3);
+	} else if (R2_GLOBALS.getFlag(30)) {
+		_robot.setup(1851, 2, 2);
+	} else {
+		R2_GLOBALS._walkRegions.disableRegion(5);
+		if (R2_GLOBALS.getFlag(33)) {
+			R2_GLOBALS._walkRegions.disableRegion(2);
+			_robot.setup(1851, 1, 3);
+		} else {
+			_robot.setup(1851, 2, 1);
+		}
 	}
 
-	R2_GLOBALS._player._canWalk = false;
-	_newSceneMode = 0;
-	R2_GLOBALS._sceneManager._previousScene = 1925;
-	_background.setDetails(Rect(27, 0, 292, 200), 1925, 9, -1, -1, 1, NULL);
-}
+	_robot.setPosition(Common::Point(219, 130));
+	_robot.fixPriority(114);
+	_robot.setDetails(1850, -1, -1, -1, 1, (SceneItem *) NULL);
 
-void Scene1925::remove() {
-	R2_GLOBALS._sound1.fadeOut2(NULL);
-	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1925;
-	SceneExt::remove();
-}
+	R2_GLOBALS._player.postInit();
 
-void Scene1925::signal() {
-	switch (_sceneMode) {
-	case 1920:
-	// No break on purpose
-	case 1921:
-	// No break on purpose
-	case 1928:
-	// No break on purpose
-	case 1929:
-	// No break on purpose
-	case 1930:
-		R2_GLOBALS._scene1925CurrLevel = -3;
-		R2_GLOBALS._sceneManager.changeScene(1900);
-		break;
-	case 1926:
-	// No break on purpose
-	case 1931:
-		// Change level, down
-		changeLevel(false);
-		break;
-	case 1927:
-	// No break on purpose
-	case 1932:
-		// Change level, up
-		changeLevel(true);
-		break;
-	case 1925:
-		_westExit._enabled = false;
-		if (_newSceneMode != 0) {
-			_sceneMode = _newSceneMode;
-			_newSceneMode = 0;
-			setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
+	_companion.postInit();
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		_companion.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
+	} else {
+		_companion.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+	}
+
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1850) {
+		R2_GLOBALS._player._effect = EFFECT_SHADED2;
+		_companion._effect = EFFECT_SHADED2;
+		if (R2_GLOBALS.getFlag(31)) {
+			R2_GLOBALS._player._shade = 0;
+			_companion._shade = 0;
+		} else {
+			R2_GLOBALS._player._shade = 6;
+			_companion._shade = 6;
+		}
+
+		if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
+			_airbag.postInit();
+			if (R2_GLOBALS.getFlag(34)) {
+				_airbag.setup(1851, 4, 2);
+				_airbag.fixPriority(114);
+			} else {
+				_airbag.setup(1851, 4, 1);
+			}
+
+			_airbag.setPosition(Common::Point(179, 113));
+
+			if ((_robot._strip == 1) && (_robot._frame == 3)){
+				_airbag.hide();
+			}
+
+			_airbag.setDetails(1850, 6, -1, -1, 1, (SceneItem *) NULL);
 		}
-	// No break on purpose
-	default:
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		break;
-	}
 
-	R2_GLOBALS._player._canWalk = false;
-}
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			if (R2_GLOBALS.getFlag(32)) {
+				R2_GLOBALS._player.setVisage(1511);
+				_companion.setVisage(1508);
 
-/*--------------------------------------------------------------------------
- * Scene 1945 - Spill Mountains Shaft Bottom
- *
- *--------------------------------------------------------------------------*/
+				_screen.postInit();
+				_screen.setup(1853, 3, 1);
+				_screen.setPosition(Common::Point(122, 113));
+				_screen.fixPriority(114);
+				_screen._effect = EFFECT_SHADED2;
+				_screen.setDetails(1850, 28, -1, -1, 2, (SceneItem *) NULL);
 
-Scene1945::Scene1945() {
-	_nextSceneMode1 = 0;
-	_nextSceneMode2 = 0;
-	_lampUsed = CURSOR_NONE;
-}
+				_helmet.postInit();
+				_helmet.setup(1853, 3, 2);
+				_helmet.setPosition(Common::Point(139, 111));
+				_helmet.fixPriority(114);
+				_helmet._effect = EFFECT_SHADED2;
+				_helmet.setDetails(1850, 29, -1, -1, 2, (SceneItem *) NULL);
 
-void Scene1945::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
+				if (R2_GLOBALS.getFlag(31)) {
+					_screen._shade = 0;
+					_helmet._shade = 0;
+				} else {
+					_screen._shade = 6;
+					_helmet._shade = 6;
+				}
+			} else {
+				R2_GLOBALS._player.setVisage(1500);
+				_companion.setVisage(1505);
+			}
+		} else if (R2_GLOBALS.getFlag(32)) {
+			// Not Quinn, flag 32
+			R2_GLOBALS._player.setVisage(1508);
+			_companion.setVisage(1511);
 
-	s.syncAsSint16LE(_nextSceneMode1);
-	s.syncAsSint16LE(_nextSceneMode2);
-	s.syncAsSint16LE(_lampUsed);
-}
+			_screen.postInit();
+			_screen.setup(1853, 3, 1);
+			_screen.setPosition(Common::Point(122, 113));
+			_screen.fixPriority(114);
+			_screen._effect = EFFECT_SHADED2;
+			_screen.setDetails(1850, 30, -1, -1, 2, (SceneItem *) NULL);
 
-bool Scene1945::Ice::startAction(CursorType action, Event &event) {
-	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+			_helmet.postInit();
+			_helmet.setup(1853, 3, 2);
+			_helmet.setPosition(Common::Point(139, 111));
+			_helmet.fixPriority(114);
+			_helmet._effect = EFFECT_SHADED2;
+			_helmet.setDetails(1850, 28, -1, -1, 1, (SceneItem *) NULL);
 
-	switch (action) {
-	case R2_GUNPOWDER:
-		R2_GLOBALS._player.disableControl();
-		scene->_sceneMode = 0;
-		if ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142))
-			scene->_sceneMode = 1942;
-		else {
-			scene->_sceneMode = 1940;
-			scene->_nextSceneMode1 = 1942;
-		}
-		// At this point the original check if _sceneMode != 0. Skipped.
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_gunpowder, NULL);
-		return true;
-		break;
-	case CURSOR_USE:
-		R2_GLOBALS._player.disableControl(CURSOR_USE);
-		scene->_sceneMode = 0;
-		if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50) && (event.mousePos.x >= 130)) {
-			scene->_sceneMode = 1940;
-			// At this point the original check if _sceneMode != 0. Skipped.
-			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
-			return true;
+			if (R2_GLOBALS.getFlag(31)) {
+				_screen._shade = 0;
+				_helmet._shade = 0;
+			} else {
+				_screen._shade = 6;
+				_helmet._shade = 6;
+			}
 		} else {
-			R2_GLOBALS._player.enableControl(CURSOR_USE);
-			R2_GLOBALS._player._canWalk = false;
-			if (event.mousePos.x > 130)
-				scene->_ice.setDetails(1945, 3, -1, -1, 3, (SceneItem *) NULL);
-			else
-				scene->_ice.setDetails(1945, 3, -1, 5, 3, (SceneItem *) NULL);
+			// Not Quinn, nor flag 32
+			R2_GLOBALS._player.setVisage(1505);
+			_companion.setVisage(1500);
 		}
-	// No break on purpose
-	default:
-		return SceneHotspot::startAction(action, event);
-		break;
-	}
-}
-
-bool Scene1945::Ladder::startAction(CursorType action, Event &event) {
-	if (action != CURSOR_USE)
-		return SceneHotspot::startAction(action, event);
-
-	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
-	R2_GLOBALS._player.disableControl(CURSOR_USE);
-	scene->_sceneMode = 0;
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setPosition(Common::Point(80, 114));
 
-	if ((R2_GLOBALS._player._position.x == 221) && (R2_GLOBALS._player._position.y == 142)) {
-		scene->_sceneMode = 1949;
-		scene->_nextSceneMode1 = 1947;
-	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
-		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
-		scene->_sceneMode = 1947;
-	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)
-			&& (event.mousePos.y >= 30)) {
-		scene->_sceneMode = 1940;
-	} else {
-		R2_GLOBALS._player.enableControl(CURSOR_USE);
-		R2_GLOBALS._player._canWalk = false;
-	}
+		_companion.animate(ANIM_MODE_1, NULL);
+		_companion.setObjectWrapper(new SceneObjectWrapper());
+		_companion.setStrip(3);
+		_companion.setPosition(Common::Point(180, 96));
 
-	if (scene->_sceneMode != 0)
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+		if (R2_GLOBALS.getFlag(30)) {
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				_companion.animate(ANIM_MODE_NONE, NULL);
+				_companion.setObjectWrapper(NULL);
+				if (R2_GLOBALS.getFlag(32)) {
+					_companion.setup(1854, 1, 3);
+				} else {
+					_companion.setup(1854, 2, 3);
+				}
 
-	return true;
-}
+				_companion.setPosition(Common::Point(164, 106));
+			} else {
+				_companion.animate(ANIM_MODE_NONE, NULL);
+				_companion.setObjectWrapper(NULL);
+				if (R2_GLOBALS.getFlag(32)) {
+					R2_GLOBALS._player.setup(1854, 1, 3);
+				} else {
+					R2_GLOBALS._player.setup(1854, 2, 3);
+				}
 
-bool Scene1945::Gunpowder::startAction(CursorType action, Event &event) {
-	if ((action == R2_ALCOHOL_LAMP_3) || (action == R2_ALCOHOL_LAMP_2)) {
-		Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+				R2_GLOBALS._player.setPosition(Common::Point(164, 106));
+			}
+		}
 
-		scene->_lampUsed = action;
+		R2_GLOBALS._player.enableControl();
+	} else { // R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 1850
+		R2_GLOBALS._player._effect = EFFECT_SHADED;
+		_companion._effect = EFFECT_SHADED;
 		R2_GLOBALS._player.disableControl();
-		scene->_sceneMode = 0;
-		if ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) {
-			scene->_sceneMode= 1947;
-			scene->_nextSceneMode1 = 1943;
-		} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)) {
-			scene->_sceneMode = 1940;
-			scene->_nextSceneMode1 = 1943;
+		_sceneMode = 10;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			if (R2_GLOBALS.getFlag(29)) {
+				setAction(&_sequenceManager1, this, 1863, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
+			} else {
+				setAction(&_sequenceManager1, this, 1861, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
+			}
 		} else {
-			scene->_sceneMode = 1949;
-			scene->_nextSceneMode1 = 1947;
-			scene->_nextSceneMode2 = 1943;
+			if (R2_GLOBALS.getFlag(29)) {
+				setAction(&_sequenceManager1, this, 1864, &R2_GLOBALS._player, &_companion, &_rightDoor, NULL);
+			} else {
+				setAction(&_sequenceManager1, this, 1862, &R2_GLOBALS._player, &_companion, &_leftDoor, NULL);
+			}
 		}
-		// At this point the original check if _sceneMode != 0. Skipped.
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
-		return true;
-	} else {
-		return SceneActor::startAction(action, event);
 	}
-}
-
-void Scene1945::ExitUp::changeScene() {
-	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
-
-	_moving = false;
-	R2_GLOBALS._player.disableControl(CURSOR_USE);
-	scene->_sceneMode = 0;
 
-	if ((R2_GLOBALS._player._position.x == 221) && (R2_GLOBALS._player._position.y == 142)) {
-		scene->_sceneMode = 1949;
-		scene->_nextSceneMode1 = 1947;
-	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
-		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
-		scene->_sceneMode = 1947;
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		_companion._moveDiff = Common::Point(5, 3);
+	} else {
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+		_companion._moveDiff = Common::Point(3, 2);
 	}
 
-	if (scene->_sceneMode == 0) {
-		scene->_sceneMode = 1941;
-		signal();
+	_displayScreen.postInit();
+	_displayScreen.setup(1850, 1, 1);
+
+	if (R2_GLOBALS.getFlag(62)) {
+		_displayScreen.setPosition(Common::Point(159, 120));
 	} else {
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+		_displayScreen.setPosition(Common::Point(159, 184));
 	}
-}
 
-void Scene1945::CorridorExit::changeScene() {
-	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
-
-	_moving = false;
-	R2_GLOBALS._player.disableControl(CURSOR_USE);
-	scene->_sceneMode = 0;
+	_displayScreen.fixPriority(113);
 
-	if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)) {
-		scene->_sceneMode = 1940;
-		scene->_nextSceneMode1 = 1945;
-	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
-		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
-		scene->_sceneMode = 1945;
+	if (R2_GLOBALS.getFlag(34)) {
+		_displayScreen.setDetails(1850, 25, -1, -1, 4, &_robot);
+	} else {
+		_displayScreen.setDetails(1850, 25, -1, -1, 2, (SceneItem *) NULL);
 	}
 
-	if (scene->_sceneMode != 0)
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
-}
+	if (!R2_GLOBALS.getFlag(62)) {
+		_displayScreen.hide();
+	}
 
-void Scene1945::postInit(SceneObjectList *OwnerList) {
-	loadScene(1945);
-	SceneExt::postInit();
-	R2_GLOBALS._sound1.play(220);
+	_background.setDetails(Rect(0, 0, 320, 200), 1850, 16, -1, -1, 1, NULL);
 
-	R2_GLOBALS._player.postInit();
-	R2_GLOBALS._player.enableControl(CURSOR_USE);
-	R2_GLOBALS._player._canWalk = false;
-	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1945;
-	R2_GLOBALS._player._characterIndex = R2_SEEKER;
+	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1850;
+	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1850;
+}
 
-	_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945);
-	_corridorExit.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945);
+void Scene1850::remove() {
+	g_globals->_scenePalette.loadPalette(0);
 
-	_ladder.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL);
+	R2_GLOBALS._scenePalette._palette[765] = 255;
+	R2_GLOBALS._scenePalette._palette[766] = 255;
+	R2_GLOBALS._scenePalette._palette[767] = 255;
 
-	if (!R2_GLOBALS.getFlag(43)) {
-		_corridorExit._enabled = false;
-		_gunpowder.postInit();
-		_gunpowder.setup(1945, 4, 1);
-		_gunpowder.setPosition(Common::Point(253, 169));
-		_gunpowder.fixPriority(150);
+	SceneExt::remove();
+}
 
-		if (R2_GLOBALS.getFlag(42))
-			_gunpowder.setDetails(1945, 15, -1, -1, 1, (SceneItem *) NULL);
-		else
-			_gunpowder.hide();
+void Scene1850::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._player._effect = EFFECT_SHADED2;
+		R2_GLOBALS._player._shade = 6;
 
-		_coveringIce.postInit();
-		_coveringIce.setup(1945, 8, 1);
-		_coveringIce.setPosition(Common::Point(253, 169));
-		_coveringIce.fixPriority(130);
+		_companion._effect = EFFECT_SHADED2;
+		_companion._shade = 6;
 
-		_alcoholLamp.postInit();
-		_alcoholLamp.setup(1945, 3, 1);
-		_alcoholLamp.hide();
-	} else {
-		_corridorExit._enabled = true;
-	}
+		R2_GLOBALS._walkRegions.disableRegion(5);
 
-	switch (R2_GLOBALS._sceneManager._previousScene) {
-	case 1925:
-		R2_GLOBALS._scene1925CurrLevel = 0;
-		R2_GLOBALS.clearFlag(29);
-		R2_GLOBALS._player.setup(1925, 1, 10);
-		R2_GLOBALS._player.setPosition(Common::Point(154, 50));
+		if (R2_GLOBALS.getFlag(68)) {
+			R2_GLOBALS._player.enableControl();
+		} else {
+			R2_GLOBALS.setFlag(68);
+			_sceneMode = 20;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			_stripManager.start(554, this);
+		}
 		break;
-	case 1950:
-		_sceneMode = 1944;
-		setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
-		R2_GLOBALS._player.disableControl(CURSOR_USE);
+	case 11:
+		R2_GLOBALS.clearFlag(30);
+		R2_GLOBALS._sceneManager.changeScene(1800);
 		break;
-	default:
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._player.setup(20, 5, 1);
-		R2_GLOBALS._player.setPosition(Common::Point(191, 142));
+	case 15:
+		_sceneMode = 16;
 		break;
-	}
+	case 16:
+		_sceneMode = 1870;
+		setAction(&_sequenceManager1, this, 1870, &R2_GLOBALS._player, &_companion,
+			&_screen, &_helmet, NULL);
+		break;
+	case 20:
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		break;
+	case 21:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1877;
+		setAction(&_sequenceManager1, this, 1877, &R2_GLOBALS._player, &_companion,
+			&_robot, NULL);
+		break;
+	case 30:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1882;
+		setAction(&_sequenceManager1, this, 1882, &R2_GLOBALS._player, NULL);
+		break;
+	case 1852:
+	// No break on purpose:
+	case 1853:
+		if (_sceneMode == 1851) { // At this point, SceneMode can't be equal to 1851 => dead code
+			R2_GLOBALS.setFlag(31);
+			_palette1.loadPalette(1850);
+			_sceneMode = 1850;
+		} else {
+			R2_GLOBALS.clearFlag(31);
+			_palette1.loadPalette(1851);
+			_sceneMode = 1851;
+		}
 
-	R2_GLOBALS._player._canWalk = false;
-	_nextSceneMode1 = 0;
-	_nextSceneMode2 = 0;
+		_shadeChanging = true;
+		if (R2_GLOBALS.getFlag(30)) {
+			_displayScreen.setAction(&_sequenceManager2, NULL, 1867, &_displayScreen, NULL);
+		} else if (R2_GLOBALS.getFlag(34)) {
+			if (R2_GLOBALS.getFlag(62)) {
+				R2_GLOBALS.clearFlag(62);
+				_displayScreen.setAction(&_sequenceManager2, this, 1851, &_displayScreen, NULL);
+			} else {
+				R2_GLOBALS.setFlag(62);
+				_displayScreen.setAction(&_sequenceManager2, this, 1850, &_displayScreen, NULL);
+			}
+		} else if (R2_GLOBALS.getFlag(33)) {
+				R2_GLOBALS.setFlag(62);
+				R2_GLOBALS.setFlag(34);
+				R2_GLOBALS._walkRegions.disableRegion(2);
 
-	_ice.setDetails(11, 1945, 3, -1, 5);
-	_hole.setDetails(Rect(238, 144, 274, 167), 1945, 0, -1, 2, 1, NULL);
-	_ice2.setDetails(Rect(27, 3, 292, 167), 1945, 3, -1, -1, 1, NULL);
-}
+				_airbag.postInit();
+				_airbag.setDetails(1850, 6, -1, -1, 5, &_robot);
 
-void Scene1945::remove() {
-	R2_GLOBALS._sound1.fadeOut2(NULL);
-	SceneExt::remove();
-}
+				_sceneMode = 1879;
 
-void Scene1945::signal() {
-	switch (_sceneMode) {
-	case 1940:
-		if (_nextSceneMode1 == 1943) {
-			_sceneMode = _nextSceneMode1;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
+				_displayScreen.setAction(&_sequenceManager2, this, 1879, &_robot,
+					&_displayScreen, &_airbag, NULL);
 		} else {
-			_sceneMode = 1946;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+			_displayScreen.setAction(&_sequenceManager2, NULL, 1867, &_displayScreen, NULL);
+		}
+
+		if (R2_GLOBALS.getFlag(34))
+			R2_GLOBALS._scenePalette.addFader(_palette1._palette, 256, 5, NULL);
+		else
+			R2_GLOBALS._scenePalette.addFader(_palette1._palette, 256, 5, this);
+
+		if (_sceneMode == 1851)
+			_shadeDirection = -20;
+		else
+			_shadeDirection = 20;
+
+		_shadeCountdown = 20;
+
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			if (_sceneMode == 1879)
+				_sceneMode = 1854;
+
+			if (R2_GLOBALS.getFlag(32)) {
+				setAction(&_sequenceManager1, NULL, 1873, &R2_GLOBALS._player, NULL);
+			} else {
+				setAction(&_sequenceManager1, NULL, 1854, &R2_GLOBALS._player, NULL);
+			}
+		} else {
+			if (_sceneMode == 1879)
+				_sceneMode = 1855;
+
+			if (R2_GLOBALS.getFlag(32)) {
+				setAction(&_sequenceManager1, NULL, 1874, &R2_GLOBALS._player, NULL);
+			} else {
+				setAction(&_sequenceManager1, NULL, 1855, &R2_GLOBALS._player, NULL);
+			}
 		}
-		return;
 		break;
-	case 1941:
-		if (_nextSceneMode1 == 0) {
-			R2_GLOBALS._scene1925CurrLevel = 0;
-			R2_GLOBALS.setFlag(29);
-			R2_GLOBALS._sceneManager.changeScene(1925);
+	case 1857:
+		if (R2_GLOBALS.getFlag(69)) {
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
 		} else {
-			_sceneMode = _nextSceneMode1;
-			_nextSceneMode1 = 0;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+			_sceneMode = 1858;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			_stripManager.start(555, this);
+			R2_GLOBALS.setFlag(69);
 		}
-		return;
-	case 1942:
-		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 0);
-		_gunpowder.setDetails(1945, 15, -1, -1, 2, (SceneItem *) NULL);
-		R2_GLOBALS.setFlag(42);
 		break;
-	case 1943:
-		R2_GLOBALS._sound1.fadeOut2(NULL);
-		R2_INVENTORY.setObjectScene(_lampUsed, 0);
-		_sceneMode = 1948;
-		setAction(&_sequenceManager1, this, _sceneMode, &_gunpowder, &_alcoholLamp, &_coveringIce, NULL);
-		R2_GLOBALS._player.setAction(&_sequenceManager2, NULL, 1941, &R2_GLOBALS._player, NULL);
-		return;
-	case 1944:
+	case 1858:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1859;
+		setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_robot, NULL);
+		R2_GLOBALS.clearFlag(30);
+		break;
+	case 1859:
+		R2_GLOBALS.setFlag(70);
+		_sceneMode = 20;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(575, this);
+		break;
+	case 1860:
+		if (_playerDest.x != 0) {
+			R2_GLOBALS._player.enableControl();
+
+			PlayerMover *mover = new PlayerMover();
+			R2_GLOBALS._player.addMover(mover, &_playerDest, this);
+
+			_playerDest = Common::Point(0, 0);
+		}
+
+		switch (_seqNumber) {
+		case 1:
+			_sceneMode = 1853;
+			if (R2_GLOBALS.getFlag(32)) {
+				setAction(&_sequenceManager1, this, 1872, &R2_GLOBALS._player, NULL);
+			} else {
+				setAction(&_sequenceManager1, this, 1853, &R2_GLOBALS._player, NULL);
+			}
+			break;
+		case 2:
+			_sceneMode = 11;
+			setAction(&_sequenceManager1, this, 1865, &R2_GLOBALS._player, &_leftDoor, NULL);
+			break;
+		case 3:
+			_sceneMode = 11;
+			setAction(&_sequenceManager1, this, 1866, &R2_GLOBALS._player, &_rightDoor, NULL);
+			break;
+		default:
+			break;
+		}
+
+		_seqNumber = 0;
+		break;
+	case 1870:
+		R2_GLOBALS._walkRegions.disableRegion(5);
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1);
+		R2_GLOBALS.setFlag(32);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
-	case 1945:
-		R2_GLOBALS._sceneManager.changeScene(1950);
-		return;
-	case 1946:
-		if (_nextSceneMode1 == 1942) {
-			_sceneMode = _nextSceneMode1;
-			_nextSceneMode1 = 0;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_gunpowder, NULL);
-			return;
-		}
-		_sceneMode = 0;
+	case 1875:
+		R2_INVENTORY.setObjectScene(R2_AIRBAG, 1850);
+		_sceneMode = 21;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(561, this);
 		break;
-	case 1947:
-		if (_nextSceneMode1 == 1943) {
-			_sceneMode = _nextSceneMode1;
-			_nextSceneMode1 = 1948;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
+	case 1877:
+		_screen.postInit();
+		_screen._effect = EFFECT_SHADED2;
+
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_screen.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
 		} else {
-			_sceneMode = 1941;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+			_screen.setDetails(1850, 30, -1, -1, 2, (SceneItem *)NULL);
 		}
-		return;
-	case 1948:
-		R2_GLOBALS._sound1.play(220);
-		_corridorExit._enabled = true;
-		R2_GLOBALS._sceneItems.remove(&_gunpowder);
-		R2_GLOBALS.clearFlag(42);
-		R2_GLOBALS.setFlag(43);
-		_nextSceneMode1 = 1940;
-	// No break on purpose
-	case 1949:
-		_sceneMode = _nextSceneMode1;
-		if (_nextSceneMode2 == 1943) {
-			_nextSceneMode1 = _nextSceneMode2;
-			_nextSceneMode2 = 0;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
+
+		_helmet.postInit();
+		_helmet._effect = EFFECT_SHADED2;
+
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_helmet.setDetails(1850, 29, -1, -1, 2, (SceneItem *)NULL);
 		} else {
-			_nextSceneMode1 = 0;
-			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+			_helmet.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
 		}
-		return;
+
+		if (R2_GLOBALS.getFlag(31)) {
+			_screen._shade = 0;
+			_helmet._shade = 0;
+		} else {
+			_screen._shade = 6;
+			_helmet._shade = 6;
+		}
+
+		R2_GLOBALS.clearFlag(30);
+		_sceneMode = 15;
+		setAction(&_sequenceManager1, this, 1869, &R2_GLOBALS._player, &_screen, NULL);
+		_companion.setAction(&_sequenceManager2, this, 1868, &_companion, &_helmet, NULL);
+		break;
+	case 1878:
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1850);
+		R2_GLOBALS.setFlag(33);
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1879:
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1881:
+		R2_GLOBALS._sceneManager.changeScene(1875);
+		break;
+	case 1882:
+		R2_INVENTORY.setObjectScene(R2_AIRBAG, 1);
+		R2_GLOBALS._player.enableControl();
+		break;
 	default:
+		R2_GLOBALS._player.enableControl();
 		break;
 	}
-
-	R2_GLOBALS._player.enableControl(CURSOR_USE);
-	R2_GLOBALS._player._canWalk = false;
-}
-
-/*--------------------------------------------------------------------------
- * Scene 1950 - Flup Tube Corridor Maze
- *
- *--------------------------------------------------------------------------*/
-
-Scene1950::KeypadWindow::KeypadWindow() {
-	_buttonIndex = 0;
 }
 
-void Scene1950::KeypadWindow::synchronize(Serializer &s) {
-	SceneArea::synchronize(s);
-
-	s.syncAsSint16LE(_buttonIndex);
-}
+void Scene1850::process(Event &event) {
+	if ( (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_WALK)
+			&& (R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
+		_playerDest = event.mousePos;
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1860;
+		if (R2_GLOBALS.getFlag(32)) {
+			setAction(&_sequenceManager1, this, 1860, &R2_GLOBALS._player, &_robot, NULL);
+		} else {
+			setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_robot, NULL);
+		}
+		R2_GLOBALS.clearFlag(30);
+		event.handled = true;
+	}
 
-Scene1950::KeypadWindow::KeypadButton::KeypadButton() {
-	_buttonIndex = 0;
-	_pressed = false;
-	_toggled = false;
+	Scene::process(event);
 }
 
-void Scene1950::KeypadWindow::KeypadButton::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+void Scene1850::dispatch() {
+	if (_shadeChanging) {
+		_shadeCountdown--;
+		if (_shadeCountdown == 0)
+			_shadeChanging = false;
 
-	s.syncAsSint16LE(_buttonIndex);
-	s.syncAsSint16LE(_pressed);
-	s.syncAsSint16LE(_toggled);
-}
+		if (_shadeDirection >= 0) {
+			R2_GLOBALS._player._shade = (_shadeCountdown * 6) / _shadeDirection;
+		} else {
+			R2_GLOBALS._player._shade = ((_shadeCountdown * 6) / _shadeDirection) + 6;
+		}
+		R2_GLOBALS._player._flags |= OBJFLAG_PANES;
 
-void Scene1950::KeypadWindow::KeypadButton::init(int indx) {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+		_companion._shade = R2_GLOBALS._player._shade;
+		_companion._flags |= OBJFLAG_PANES;
 
-	_buttonIndex = indx;
-	_pressed = false;
-	_toggled = false;
+		_screen._shade = R2_GLOBALS._player._shade;
+		_screen._flags |= OBJFLAG_PANES;
 
-	postInit();
-	setup(1971, 2, 1);
-	fixPriority(249);
-	setPosition(Common::Point(((_buttonIndex % 4) * 22) + 127, ((_buttonIndex / 4) * 19) + 71));
-	scene->_sceneAreas.push_front(this);
-}
+		_helmet._shade = R2_GLOBALS._player._shade;
+		_helmet._flags |= OBJFLAG_PANES;
+	}
 
-void Scene1950::KeypadWindow::KeypadButton::process(Event &event) {
-	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE)
-			&& (_bounds.contains(event.mousePos)) && !_pressed) {
-		R2_GLOBALS._sound2.play(227);
-		if (!_toggled) {
-			setFrame(2);
-			_toggled = true;
-		} else {
-			setFrame(1);
-			_toggled = false;
-		}
-		_pressed = true;
-		event.handled = true;
+	if (R2_GLOBALS.getFlag(32)) {
+		_screen.setPosition(Common::Point(_displayScreen._position.x - 37, _displayScreen._position.y - 71));
+		_helmet.setPosition(Common::Point(_displayScreen._position.x - 20, _displayScreen._position.y - 73));
 	}
 
-	if ((event.eventType == EVENT_BUTTON_UP) && _pressed) {
-		_pressed = false;
-		event.handled = true;
-		Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
-		scene->doButtonPress(_buttonIndex);
+	if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
+		_airbag.setPosition(Common::Point(_displayScreen._position.x + 20, _displayScreen._position.y - 71));
 	}
+
+	Scene::dispatch();
 }
 
-bool Scene1950::KeypadWindow::KeypadButton::startAction(CursorType action, Event &event) {
-	if (action == CURSOR_USE)
-		return false;
-	return SceneActor::startAction(action, event);
+/*--------------------------------------------------------------------------
+ * Scene 1875 - Rim Lift Computer
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene1875::Button::Button() {
+	_buttonId = 0;
+	_buttonDown = false;
 }
 
-void Scene1950::KeypadWindow::remove() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
-	for (_buttonIndex = 0; _buttonIndex < 16; ++_buttonIndex) {
-		scene->_sceneAreas.remove(&_buttons[_buttonIndex]);
-		_buttons[_buttonIndex].remove();
-	}
+void Scene1875::Button::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
 
-	ModalWindow::remove();
+	s.syncAsSint16LE(_buttonId);
+	s.syncAsSint16LE(_buttonDown);
+}
 
-	if (!R2_GLOBALS.getFlag(37))
-		R2_GLOBALS._sound2.play(278);
+void Scene1875::Button::doButtonPress() {
+	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
 
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	scene->_eastExit._enabled = true;
+	R2_GLOBALS._sound1.play(227);
 
-	if (!R2_GLOBALS.getFlag(37)) {
-		if (R2_GLOBALS.getFlag(36)) {
-			scene->_sceneMode = 1964;
-			scene->setAction(&scene->_sequenceManager, scene, 1964, &R2_GLOBALS._player, NULL);
+	int newFrameNumber;
+	switch (_buttonId) {
+	case 3:
+		if ((scene->_map._frame == 1) && (scene->_button1._strip == 2)) {
+			R2_GLOBALS._player.disableControl();
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			scene->_sceneMode = 10;
+			scene->_stripManager.start(576, scene);
 		} else {
-			scene->_sceneMode = 1965;
-			scene->setAction(&scene->_sequenceManager, scene, 1965, &R2_GLOBALS._player, NULL);
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1890;
+			scene->_rimPosition.postInit();
+			scene->setAction(&scene->_sequenceManager, scene, 1890, &scene->_rimPosition, NULL);
 		}
+		break;
+	case 4:
+		newFrameNumber = scene->_map._frame + 1;
+		if (newFrameNumber > 6)
+			newFrameNumber = 1;
+		scene->_map.setFrame(newFrameNumber);
+		break;
+	case 5:
+		newFrameNumber = scene->_map._frame - 1;
+		if (newFrameNumber < 1)
+			newFrameNumber = 6;
+		scene->_map.setFrame(newFrameNumber);
+		break;
+	default:
+		break;
 	}
 }
 
-void Scene1950::KeypadWindow::setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
-
-	if (R2_GLOBALS._player._mover)
-		R2_GLOBALS._player.addMover(NULL);
-	R2_GLOBALS._player._canWalk = false;
-
-	ModalWindow::setup2(visage, stripFrameNum, frameNum, posX, posY);
-
-	_object1.fixPriority(248);
-	scene->_eastExit._enabled = false;
-	setup3(1950, 27, 28, 27);
-
-	for (_buttonIndex = 0; _buttonIndex < 16; _buttonIndex++)
-		_buttons[_buttonIndex].init(_buttonIndex);
-}
-
-void Scene1950::KeypadWindow::setup3(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
-	// Copy of Scene1200::LaserPanel::proc13()
-	_areaActor.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
-}
-
-/*--------------------------------------------------------------------------*/
-
-bool Scene1950::Keypad::startAction(CursorType action, Event &event) {
-	if ((action != CURSOR_USE) || (R2_GLOBALS.getFlag(37)))
-		return SceneHotspot::startAction(action, event);
+void Scene1875::Button::initButton(int buttonId) {
+	postInit();
+	_buttonId = buttonId;
+	_buttonDown = false;
+	setVisage(1855);
 
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	if (_buttonId == 1)
+		setStrip(2);
+	else
+		setStrip(1);
 
-	R2_GLOBALS._player.disableControl();
-	if (R2_GLOBALS.getFlag(36)) {
-		scene->_sceneMode = 1962;
-		scene->setAction(&scene->_sequenceManager, scene, 1962, &R2_GLOBALS._player, NULL);
-	} else {
-		scene->_sceneMode = 1963;
-		scene->setAction(&scene->_sequenceManager, scene, 1963, &R2_GLOBALS._player, NULL);
+	setFrame(_buttonId);
+	switch (_buttonId) {
+	case 1:
+		setPosition(Common::Point(20, 144));
+		break;
+	case 2:
+		setPosition(Common::Point(82, 144));
+		break;
+	case 3:
+		setPosition(Common::Point(136, 144));
+		break;
+	case 4:
+		setPosition(Common::Point(237, 144));
+		break;
+	case 5:
+		setPosition(Common::Point(299, 144));
+		break;
+	default:
+		break;
 	}
-	return true;
-}
-
-bool Scene1950::Door::startAction(CursorType action, Event &event) {
-	if (action != R2_SCRITH_KEY)
-		return SceneActor::startAction(action, event);
-
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
-
-	R2_GLOBALS._player.disableControl();
-	R2_INVENTORY.setObjectScene(R2_SCRITH_KEY, 0);
-	scene->_sceneMode = 1958;
-	scene->setAction(&scene->_sequenceManager, scene, 1958, &R2_GLOBALS._player, &scene->_door, NULL);
-	return true;
-}
-
-bool Scene1950::Scrolls::startAction(CursorType action, Event &event) {
-	if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) != 1950))
-		return SceneActor::startAction(action, event);
-
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
 
-	R2_GLOBALS._player.disableControl();
-	scene->_sceneMode = 1968;
-	scene->setAction(&scene->_sequenceManager, scene, 1968, &R2_GLOBALS._player, NULL);
-
-	return true;
+	setDetails(1875, 6, 1, -1, 2, (SceneItem *) NULL);
 }
 
-bool Scene1950::Gem::startAction(CursorType action, Event &event) {
-	if ((action != CURSOR_USE) || (!R2_GLOBALS.getFlag(37)))
-		return SceneActor::startAction(action, event);
+void Scene1875::Button::process(Event &event) {
+	if (!R2_GLOBALS._player._uiEnabled || event.handled)
+		return;
 
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
 
-	R2_GLOBALS._player.disableControl();
-	scene->_sceneMode = 1967;
-	scene->setAction(&scene->_sequenceManager, scene, 1967, &R2_GLOBALS._player, NULL);
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE)
+			&& (_bounds.contains(event.mousePos)) && !_buttonDown) {
+		setStrip(2);
+		switch (_buttonId) {
+		case 1:
+			R2_GLOBALS._sound2.play(227);
+			scene->_button2.setStrip(1);
+			break;
+		case 2:
+			R2_GLOBALS._sound2.play(227);
+			scene->_button1.setStrip(1);
+			break;
+		default:
+			break;
+		}
+		_buttonDown = true;
+		event.handled = true;
+	}
 
-	return true;
+	if ((event.eventType == EVENT_BUTTON_UP) && _buttonDown) {
+		if ((_buttonId == 3) || (_buttonId == 4) || (_buttonId == 5)) {
+			setStrip(1);
+			doButtonPress();
+		}
+		_buttonDown = false;
+		event.handled = true;
+	}
 }
 
-/*--------------------------------------------------------------------------*/
+void Scene1875::postInit(SceneObjectList *OwnerList) {
+	loadScene(1875);
+	SceneExt::postInit();
 
-Scene1950::Vampire::Vampire() {
-	_deadPosition = Common::Point(0, 0);
-	_deltaX = 0;
-	_deltaY = 0;
-	_vampireMode = 0;
-}
+	R2_GLOBALS._player._characterScene[R2_QUINN] = 1875;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1875;
 
-void Scene1950::Vampire::synchronize(Serializer &s) {
-	SceneActor::synchronize(s);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-	s.syncAsSint16LE(_deadPosition.x);
-	s.syncAsSint16LE(_deadPosition.y);
-	s.syncAsSint16LE(_deltaX);
-	s.syncAsSint16LE(_deltaY);
-	s.syncAsSint16LE(_vampireMode);
-}
+	_button1.initButton(1);
+	_button2.initButton(2);
+	_button3.initButton(3);
+	_button4.initButton(4);
+	_button5.initButton(5);
 
-void Scene1950::Vampire::signal() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	_map.postInit();
+	_map.setup(1855, 4, 1);
+	_map.setPosition(Common::Point(160, 116));
 
-	switch (_vampireMode) {
-	case 19: {
-		_vampireMode = 0;
-		setVisage(1960);
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			setStrip(2);
-		else
-			setStrip(1);
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
 
-		NpcMover *mover = new NpcMover();
-		addMover(mover, &scene->_vampireDestPos, scene);
+	if (R2_GLOBALS._sceneManager._previousScene == 1625) {
+		R2_GLOBALS._sound1.play(122);
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 11;
+		_rimPosition.postInit();
+		setAction(&_sequenceManager, this, 1892, &_rimPosition, NULL);
+	} else {
+		if (R2_GLOBALS._sceneManager._previousScene == 3150) {
+			R2_GLOBALS._sound1.play(116);
 		}
-		break;
-	case 20: {
-		// Non fatal shot
-		_vampireMode = 19;
-		R2_GLOBALS._player.setVisage(22);
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			R2_GLOBALS._player.setStrip(1);
-		else
-			R2_GLOBALS._player.setStrip(2);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._shotsRequired--;
-
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			_deadPosition.x = _position.x + 10;
-		else
-			_deadPosition.x = _position.x - 10;
-		_deadPosition.y = _position.y - 4;
-
-		setVisage(1961);
-
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			setStrip(2);
-		else
-			setStrip(1);
-
-		animate(ANIM_MODE_2, NULL);
-		Common::Point pt = _deadPosition;
-		PlayerMover *mover = new PlayerMover();
-		addMover(mover, &pt, this);
 
 		R2_GLOBALS._player.enableControl();
-		}
-		break;
-	case 21: {
-		// Fatal shot
-		R2_GLOBALS._player.setVisage(22);
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			R2_GLOBALS._player.setStrip(1);
-		else
-			R2_GLOBALS._player.setStrip(2);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player._canWalk = false;
+	}
 
-		setVisage(1961);
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			setStrip(4);
-		else
-			setStrip(3);
-		setDetails(1950, 15, -1, 17, 2, (SceneItem *) NULL);
-		addMover(NULL);
-		_numFrames = 8;
-		R2_GLOBALS._sound2.play(226);
-		animate(ANIM_MODE_5, NULL);
-		fixPriority(10);
-
-		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._isAlive = false;
-		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._shotsRequired--;
-		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._position = _position;
-		_deltaX = (_position.x - R2_GLOBALS._player._position.x) / 2;
-		_deltaY = (_position.y - R2_GLOBALS._player._position.y) / 2;
-
-		byte vampireCount = 0;
-		for (byte i = 0; i < 18; ++i) {
-			if (!R2_GLOBALS._vampireData[i]._isAlive)
-				++vampireCount;
-		}
-
-		if (vampireCount == 18) {
-			R2_GLOBALS.setFlag(36);
-			_vampireMode = 23;
-			Common::Point pt(R2_GLOBALS._player._position.x + _deltaX, R2_GLOBALS._player._position.y + _deltaY);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else if (vampireCount == 1) {
-			_vampireMode = 22;
-			Common::Point pt(R2_GLOBALS._player._position.x + _deltaX, R2_GLOBALS._player._position.y + _deltaY);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
-		} else {
-			R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		}
+	_screen.setDetails(Rect(43, 14, 275, 122), 1875, 9, 1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, 320, 200), 1875, 3, -1, -1, 1, NULL);
 
-		if (R2_GLOBALS._flubMazeEntryDirection == 3)
-			scene->_eastExit._enabled = true;
-		else
-			scene->_westExit._enabled = true;
+	R2_GLOBALS._player._characterScene[R2_QUINN] = 1875;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1875;
+	R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1875;
+	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1875;
+}
 
-		scene->_vampireActive = false;
-		}
+void Scene1875::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1891;
+		_rimPosition.postInit();
+		setAction(&_sequenceManager, this, 1891, &_rimPosition, NULL);
 		break;
-	case 22:
-		SceneItem::display(1950, 18, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+	case 11:
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_sceneMode = 1892;
+		_stripManager.start(577, this);
 		break;
-	case 23:
-		SceneItem::display(1950, 25, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		scene->_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-		scene->setAction(&scene->_sequenceManager, scene, 1960, &R2_GLOBALS._player, NULL);
+	case 1890:
+		_rimPosition.remove();
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 1891:
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._sceneManager.changeScene(1625);
+		break;
+	case 1892:
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._sceneManager.changeScene(1900);
 		break;
 	default:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
 		break;
 	}
 }
 
-bool Scene1950::Vampire::startAction(CursorType action, Event &event) {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
-
-	if (!R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._isAlive ||
-			(action != R2_PHOTON_STUNNER))
-		return SceneActor::startAction(action, event);
+void Scene1875::process(Event &event) {
+	Scene::process(event);
 
-	R2_GLOBALS._player.disableControl();
+	_button1.process(event);
+	_button2.process(event);
+	_button3.process(event);
+	_button4.process(event);
+	_button5.process(event);
+}
 
-	if (R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._shotsRequired <= 1)
-		_vampireMode = 21;
-	else
-		_vampireMode = 20;
+/*--------------------------------------------------------------------------
+ * Scene 1900 - Spill Mountains Elevator Exit
+ *
+ *--------------------------------------------------------------------------*/
 
-	R2_GLOBALS._player.setVisage(25);
-	if (R2_GLOBALS._flubMazeEntryDirection == 3)
-		R2_GLOBALS._player.setStrip(2);
-	else
-		R2_GLOBALS._player.setStrip(1);
-	R2_GLOBALS._player.animate(ANIM_MODE_5, this);
-	R2_GLOBALS._sound3.play(99);
+bool Scene1900::LiftDoor::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
 
-	return true;
-}
+	if ((_frame != 1) || (R2_GLOBALS._player._characterIndex != R2_SEEKER)) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			return SceneActor::startAction(action, event);
+		else
+			return true;
+	}
 
-/*--------------------------------------------------------------------------*/
+	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
 
-void Scene1950::NorthExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
 
-	_enabled = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 1;
-	scene->_sceneMode = 11;
+	if (_position.x >= 160) {
+		scene->_sceneMode = 1905;
+		scene->setAction(&scene->_sequenceManager1, scene, 1905, &R2_GLOBALS._player, &scene->_rightDoor, NULL);
+	} else {
+		R2_GLOBALS.setFlag(29);
+		scene->_sceneMode = 1904;
+		scene->setAction(&scene->_sequenceManager1, scene, 1904, &R2_GLOBALS._player, &scene->_leftDoor, NULL);
+	}
 
-	Common::Point pt(160, 127);
-	PlayerMover *mover = new PlayerMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
+	return true;
 }
 
-void Scene1950::UpExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+void Scene1900::WestExit::changeScene() {
+	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
 
-	_enabled = false;
 	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 2;
-	scene->_sceneMode = 12;
+	scene->_sceneMode = 10;
 
-	if (!scene->_upExitStyle) {
-		if (R2_GLOBALS.getFlag(36))
-			scene->setAction(&scene->_sequenceManager, scene, 1953, &R2_GLOBALS._player, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager, scene, 1970, &R2_GLOBALS._player, NULL);
-	} else {
-		if (R2_GLOBALS.getFlag(36))
-			scene->setAction(&scene->_sequenceManager, scene, 1952, &R2_GLOBALS._player, NULL);
-		else
-			scene->setAction(&scene->_sequenceManager, scene, 1969, &R2_GLOBALS._player, NULL);
-	}
+	Common::Point pt(-10, 135);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
 }
 
-void Scene1950::EastExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+void Scene1900::EastExit::changeScene() {
+	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
 
-	_enabled = false;
 	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 3;
-	scene->_sceneMode = 13;
-
-	if (scene->_vampireActive)
-		R2_GLOBALS._player.animate(ANIM_MODE_9);
+	scene->_sceneMode = 11;
 
-	Common::Point pt(340, 160);
+	Common::Point pt(330, 135);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
 }
 
-void Scene1950::DownExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+void Scene1900::postInit(SceneObjectList *OwnerList) {
+	loadScene(1900);
+	SceneExt::postInit();
 
-	_enabled = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 4;
-	scene->_sceneMode = 14;
+	// Debug message, skipped
 
-	if (R2_GLOBALS.getFlag(36))
-		scene->setAction(&scene->_sequenceManager, scene, 1956, &R2_GLOBALS._player, NULL);
-	else
-		scene->setAction(&scene->_sequenceManager, scene, 1973, &R2_GLOBALS._player, NULL);
-}
+	if (R2_GLOBALS._sceneManager._previousScene == -1) {
+		R2_GLOBALS._sceneManager._previousScene = 1925;
+		R2_GLOBALS._player._characterIndex = R2_SEEKER;
+		R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1925;
+	}
 
-void Scene1950::SouthExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	if (R2_GLOBALS._sceneManager._previousScene != 1875)
+		R2_GLOBALS._sound1.play(200);
 
-	_enabled = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 5;
-	scene->_sceneMode = 15;
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_seekerSpeaker);
 
-	Common::Point pt(160, 213);
-	NpcMover *mover = new NpcMover();
-	R2_GLOBALS._player.addMover(mover, &pt, scene);
-}
+	_westExit.setDetails(Rect(0, 105, 14, 145), EXITCURSOR_W, 2000);
+	_westExit.setDest(Common::Point(14, 135));
 
-void Scene1950::WestExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	_eastExit.setDetails(Rect(305, 105, 320, 145), EXITCURSOR_E, 2000);
+	_eastExit.setDest(Common::Point(315, 135));
 
-	_enabled = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 6;
+	R2_GLOBALS._player.postInit();
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		R2_GLOBALS._player.setup(2008, 3, 1);
+	else
+		R2_GLOBALS._player.setup(20, 3, 1);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	else
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	R2_GLOBALS._player.disableControl();
 
-	if (R2_GLOBALS._flubMazeArea == 2) {
-		// In the very first corridor area after the Scrith Door
-		if ((R2_GLOBALS.getFlag(36)) && (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 2) && (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2)) {
-			scene->_sceneMode = 1961;
-			Common::Point pt(-20, 160);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, scene);
-		} else {
-			if (!R2_GLOBALS.getFlag(36))
-				SceneItem::display(1950, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-			if ((R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950) || (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 1950))
-				SceneItem::display(1950, 34, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-			scene->_sceneMode = 0;
-			Common::Point pt(30, 160);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, scene);
-		}
-	} else {
-		if (scene->_vampireActive)
-			R2_GLOBALS._player.animate(ANIM_MODE_9);
+	if (R2_GLOBALS._sceneManager._previousScene != 1925)
+		R2_GLOBALS.clearFlag(29);
 
-		scene->_sceneMode = 16;
-		Common::Point pt(-20, 160);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, scene);
-	}
-}
+	_leftDoor.postInit();
+	_leftDoor.setup(1901, 1, 1);
+	_leftDoor.setPosition(Common::Point(95, 109));
+	_leftDoor.fixPriority(100);
 
-void Scene1950::ShaftExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_leftDoor.setDetails(1900, 0, 1, 2, 1, (SceneItem *) NULL);
+	else
+		_leftDoor.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
 
-	_enabled = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 0;
-	scene->_sceneMode = 1951;
-	scene->setAction(&scene->_sequenceManager, scene, 1951, &R2_GLOBALS._player, NULL);
-}
+	_rightDoor.postInit();
+	_rightDoor.setup(1901, 2, 1);
+	_rightDoor.setPosition(Common::Point(225, 109));
+	_rightDoor.fixPriority(100);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_rightDoor.setDetails(1900, 0, 1, 2, 1, (SceneItem *) NULL);
+	else
+		_rightDoor.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
 
-void Scene1950::DoorExit::changeScene() {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	if (R2_GLOBALS._sceneManager._previousScene != 1875) {
+		_leftDoorFrame.postInit();
+		_leftDoorFrame.setup(1945, 6, 1);
+		_leftDoorFrame.setPosition(Common::Point(96, 109));
+		_leftDoorFrame.fixPriority(80);
 
-	_enabled = false;
-	R2_GLOBALS._player.disableControl(CURSOR_WALK);
-	R2_GLOBALS._flubMazeEntryDirection = 3;
-	if (R2_GLOBALS._player._visage == 22) {
-		scene->_sceneMode = 1975;
-		scene->setAction(&scene->_sequenceManager, scene, 1975, &R2_GLOBALS._player, NULL);
-	} else {
-		SceneItem::display(1950, 22, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		R2_GLOBALS._flubMazeEntryDirection = 0;
-		scene->_sceneMode = 0;
-		Common::Point pt(250, 150);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, scene);
-		_enabled = true;
+		_rightDoorFrame.postInit();
+		_rightDoorFrame.setup(1945, 6, 2);
+		_rightDoorFrame.setPosition(Common::Point(223, 109));
+		_rightDoorFrame.fixPriority(80);
 	}
-}
 
-/*--------------------------------------------------------------------------*/
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1875) {
+		R2_GLOBALS._player._characterIndex = R2_QUINN;
+		_companion.postInit();
+		_sceneMode = 20;
+		R2_GLOBALS._player.setAction(&_sequenceManager1, NULL, 1901, &R2_GLOBALS._player, &_leftDoor, NULL);
+		_companion.setAction(&_sequenceManager2, this, 1900, &_companion, &_rightDoor, NULL);
+	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1925) {
+		if (R2_GLOBALS.getFlag(29)) {
+			R2_GLOBALS.clearFlag(29);
+			_leftDoor.hide();
 
-Scene1950::Scene1950() {
-	_upExitStyle = false;
-	_removeFlag = false;
-	_vampireActive = false;
-	_vampireDestPos = Common::Point(0, 0);
-	_vampireIndex = 0;
-}
+			R2_GLOBALS._player.setStrip(6);
+			R2_GLOBALS._player.setPosition(Common::Point(90, 106));
+			_sceneMode = 1906;
+			setAction(&_sequenceManager1, this, 1906, &R2_GLOBALS._player, &_leftDoor, NULL);
+		} else {
+			_rightDoor.hide();
+			R2_GLOBALS._player.setStrip(5);
+			R2_GLOBALS._player.setPosition(Common::Point(230, 106));
+			_sceneMode = 1907;
+			setAction(&_sequenceManager1, this, 1907, &R2_GLOBALS._player, &_rightDoor, NULL);
+		}
 
-void Scene1950::synchronize(Serializer &s) {
-	SceneExt::synchronize(s);
+		if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
+			_companion.postInit();
+			_companion.setPosition(Common::Point(30, 110));
+			R2_GLOBALS._walkRegions.disableRegion(1);
+			_companion.setup(2008, 3, 1);
+			_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+		}
+		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
+	} else {
+		if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
+			_companion.postInit();
+			_companion.setPosition(Common::Point(30, 110));
+			R2_GLOBALS._walkRegions.disableRegion(1);
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				_companion.setup(20, 3, 1);
+				_companion.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
+			} else {
+				_companion.setup(2008, 3, 1);
+				_companion.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+			}
+		}
 
-	s.syncAsSint16LE(_upExitStyle);
-	s.syncAsSint16LE(_removeFlag);
-	s.syncAsSint16LE(_vampireActive);
-	s.syncAsSint16LE(_vampireDestPos.x);
-	s.syncAsSint16LE(_vampireDestPos.y);
-	s.syncAsSint16LE(_vampireIndex);
-}
-
-void Scene1950::initArea() {
-	_northExit._enabled = false;
-	_upExit._enabled = false;
-	_eastExit._enabled = false;
-	_downExit._enabled = false;
-	_southExit._enabled = false;
-	_westExit._enabled = false;
-	_shaftExit._enabled = false;
-	_doorExit._enabled = false;
-	_northExit._insideArea = false;
-	_upExit._insideArea = false;
-	_eastExit._insideArea = false;
-	_downExit._insideArea = false;
-	_southExit._insideArea = false;
-	_westExit._insideArea = false;
-	_shaftExit._insideArea = false;
-	_doorExit._insideArea = false;
-	_northExit._moving = false;
-	_upExit._moving = false;
-	_eastExit._moving = false;
-	_downExit._moving = false;
-	_southExit._moving = false;
-	_westExit._moving = false;
-	_shaftExit._moving = false;
-	_doorExit._moving = false;
-	_upExitStyle = false;
-
-	switch (R2_GLOBALS._flubMazeArea - 1) {
-	case 0:
-		loadScene(1948);
-		break;
-	case 1:
-	// No break on purpose
-	case 8:
-	// No break on purpose
-	case 10:
-	// No break on purpose
-	case 12:
-	// No break on purpose
-	case 16:
-	// No break on purpose
-	case 19:
-	// No break on purpose
-	case 23:
-	// No break on purpose
-	case 30:
-	// No break on purpose
-	case 44:
-	// No break on purpose
-	case 72:
-	// No break on purpose
-	case 74:
-	// No break on purpose
-	case 86:
-	// No break on purpose
-	case 96:
-	// No break on purpose
-	case 103:
-		loadScene(1950);
-		break;
-	case 2:
-	// No break on purpose
-	case 29:
-		loadScene(1965);
-		break;
-	case 3:
-	// No break on purpose
-	case 9:
-	// No break on purpose
-	case 11:
-	// No break on purpose
-	case 15:
-	// No break on purpose
-	case 24:
-	// No break on purpose
-	case 39:
-	// No break on purpose
-	case 45:
-	// No break on purpose
-	case 71:
-	// No break on purpose
-	case 73:
-	// No break on purpose
-	case 75:
-	// No break on purpose
-	case 79:
-	// No break on purpose
-	case 85:
-	// No break on purpose
-	case 87:
-	// No break on purpose
-	case 95:
-		loadScene(1955);
-		break;
-	case 4:
-	// No break on purpose
-	case 6:
-	// No break on purpose
-	case 13:
-	// No break on purpose
-	case 27:
-	// No break on purpose
-	case 41:
-	// No break on purpose
-	case 48:
-	// No break on purpose
-	case 50:
-	// No break on purpose
-	case 54:
-	// No break on purpose
-	case 76:
-	// No break on purpose
-	case 80:
-	// No break on purpose
-	case 90:
-	// No break on purpose
-	case 104:
-		loadScene(1975);
-		break;
-	case 5:
-	// No break on purpose
-	case 7:
-	// No break on purpose
-	case 14:
-	// No break on purpose
-	case 28:
-	// No break on purpose
-	case 32:
-	// No break on purpose
-	case 47:
-	// No break on purpose
-	case 53:
-		loadScene(1997);
-		break;
-	case 17:
-	// No break on purpose
-	case 20:
-	// No break on purpose
-	case 25:
-	// No break on purpose
-	case 31:
-	// No break on purpose
-	case 33:
-	// No break on purpose
-	case 46:
-		loadScene(1995);
-		break;
-	case 18:
-	// No break on purpose
-	case 22:
-	// No break on purpose
-	case 26:
-	// No break on purpose
-	case 36:
-	// No break on purpose
-	case 38:
-	// No break on purpose
-	case 43:
-	// No break on purpose
-	case 51:
-	// No break on purpose
-	case 70:
-	// No break on purpose
-	case 78:
-	// No break on purpose
-	case 84:
-	// No break on purpose
-	case 89:
-	// No break on purpose
-	case 101:
-		loadScene(1970);
-		break;
-	case 21:
-	// No break on purpose
-	case 34:
-	// No break on purpose
-	case 57:
-	// No break on purpose
-	case 58:
-	// No break on purpose
-	case 59:
-	// No break on purpose
-	case 62:
-	// No break on purpose
-	case 65:
-		loadScene(1980);
-		break;
-	case 35:
-	// No break on purpose
-	case 61:
-	// No break on purpose
-	case 77:
-	// No break on purpose
-	case 83:
-		loadScene(1982);
-		break;
-	case 37:
-	// No break on purpose
-	case 52:
-	// No break on purpose
-	case 82:
-	// No break on purpose
-	case 88:
-	// No break on purpose
-	case 92:
-	// No break on purpose
-	case 97:
-	// No break on purpose
-	case 100:
-		loadScene(1962);
-		break;
-	case 40:
-	// No break on purpose
-	case 102:
-		loadScene(1960);
-		break;
-	case 42:
-	// No break on purpose
-	case 55:
-	// No break on purpose
-	case 60:
-	// No break on purpose
-	case 66:
-	// No break on purpose
-	case 68:
-	// No break on purpose
-	case 69:
-	// No break on purpose
-	case 93:
-	// No break on purpose
-	case 98:
-		loadScene(1990);
-		break;
-	case 49:
-	// No break on purpose
-	case 81:
-	// No break on purpose
-	case 91:
-	// No break on purpose
-	case 94:
-	// No break on purpose
-	case 99:
-		loadScene(1967);
-		break;
-	case 56:
-	// No break on purpose
-	case 63:
-	// No break on purpose
-	case 64:
-	// No break on purpose
-	case 67:
-		loadScene(1985);
-		_upExitStyle = true;
-		break;
-	default:
-		break;
+		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				if (R2_GLOBALS._spillLocation[R2_QUINN] == 5) {
+					_sceneMode = 1902;
+					setAction(&_sequenceManager1, this, 1902, &R2_GLOBALS._player, NULL);
+				} else {
+					_sceneMode = 1903;
+					setAction(&_sequenceManager1, this, 1903, &R2_GLOBALS._player, NULL);
+				}
+			} else {
+				if (R2_GLOBALS._spillLocation[R2_SEEKER] == 5) {
+					_sceneMode = 1908;
+					setAction(&_sequenceManager1, this, 1908, &R2_GLOBALS._player, NULL);
+				} else {
+					_sceneMode = 1909;
+					setAction(&_sequenceManager1, this, 1909, &R2_GLOBALS._player, NULL);
+				}
+			}
+		} else {
+			R2_GLOBALS._player.setPosition(Common::Point(160, 135));
+			R2_GLOBALS._player.enableControl();
+		}
+		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
 	}
 
-	if (R2_GLOBALS._flubMazeArea != 1)
-		R2_GLOBALS._walkRegions.load(1950);
+	_elevator.setDetails(Rect(77, 2, 240, 103), 1900, 6, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, 320, 200), 1900, 3, -1, -1, 1, NULL);
+}
 
-	switch (R2_GLOBALS._flubMazeArea - 1) {
-	case 0:
-		_shaftExit._enabled = true;
-		if ((R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0) && (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950))
-			_doorExit._enabled = true;
-		R2_GLOBALS._walkRegions.disableRegion(2);
-		R2_GLOBALS._walkRegions.disableRegion(3);
-		R2_GLOBALS._walkRegions.disableRegion(4);
-		R2_GLOBALS._walkRegions.disableRegion(5);
-		R2_GLOBALS._walkRegions.disableRegion(6);
-		break;
-	case 1:
-	// No break on purpose
-	case 2:
-	// No break on purpose
-	case 3:
-	// No break on purpose
-	case 8:
-	// No break on purpose
-	case 9:
-	// No break on purpose
+void Scene1900::remove() {
+	R2_GLOBALS._sound1.fadeOut(NULL);
+	SceneExt::remove();
+}
+
+void Scene1900::signal() {
+	switch (_sceneMode) {
 	case 10:
-	// No break on purpose
+		R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] = 5;
+		R2_GLOBALS._sceneManager.changeScene(2000);
+		break;
 	case 11:
-	// No break on purpose
-	case 12:
-	// No break on purpose
-	case 15:
-	// No break on purpose
-	case 16:
-	// No break on purpose
-	case 19:
-	// No break on purpose
-	case 23:
-	// No break on purpose
-	case 24:
-	// No break on purpose
-	case 29:
-	// No break on purpose
-	case 30:
-	// No break on purpose
-	case 39:
-	// No break on purpose
-	case 40:
-	// No break on purpose
-	case 44:
-	// No break on purpose
-	case 45:
-	// No break on purpose
-	case 71:
-	// No break on purpose
-	case 72:
-	// No break on purpose
-	case 73:
-	// No break on purpose
-	case 74:
-	// No break on purpose
-	case 75:
-	// No break on purpose
-	case 79:
-	// No break on purpose
-	case 85:
-	// No break on purpose
-	case 86:
-	// No break on purpose
-	case 87:
-	// No break on purpose
-	case 95:
-	// No break on purpose
-	case 96:
-	// No break on purpose
-	case 102:
-	// No break on purpose
-	case 103:
-		_eastExit._enabled = true;
-		_westExit._enabled = true;
+		R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] = 6;
+		R2_GLOBALS._sceneManager.changeScene(2000);
 		break;
-	case 4:
-	// No break on purpose
-	case 6:
-	// No break on purpose
-	case 13:
-	// No break on purpose
-	case 17:
-	// No break on purpose
 	case 20:
-	// No break on purpose
-	case 25:
-	// No break on purpose
-	case 27:
-	// No break on purpose
-	case 31:
-	// No break on purpose
-	case 33:
-	// No break on purpose
-	case 37:
-	// No break on purpose
-	case 41:
-	// No break on purpose
-	case 46:
-	// No break on purpose
-	case 48:
-	// No break on purpose
-	case 50:
-	// No break on purpose
-	case 52:
-	// No break on purpose
-	case 54:
-	// No break on purpose
-	case 76:
-	// No break on purpose
-	case 80:
-	// No break on purpose
-	case 82:
-	// No break on purpose
-	case 88:
-	// No break on purpose
-	case 90:
-	// No break on purpose
-	case 92:
-	// No break on purpose
-	case 97:
-	// No break on purpose
-	case 100:
-	// No break on purpose
-	case 104:
-		_westExit._enabled = true;
-		R2_GLOBALS._walkRegions.disableRegion(6);
-		R2_GLOBALS._walkRegions.disableRegion(9);
+		++_sceneMode;
+		R2_GLOBALS._events.setCursor(CURSOR_WALK);
+		_stripManager.start(1300, this);
+		break;
+	case 21:
+		++_sceneMode;
+		R2_GLOBALS._player.disableControl();
+		if (R2_GLOBALS._player._action)
+			R2_GLOBALS._player._action->_endHandler = this;
+		else
+			signal();
 		break;
-	case 5:
-	// No break on purpose
-	case 7:
-	// No break on purpose
-	case 14:
-	// No break on purpose
-	case 18:
-	// No break on purpose
 	case 22:
+		_sceneMode = 1910;
+		_companion.setAction(&_sequenceManager2, this, 1910, &_companion, NULL);
+		break;
+	case 1904:
+		R2_GLOBALS._scene1925CurrLevel = -3;
 	// No break on purpose
-	case 26:
-	// No break on purpose
-	case 28:
-	// No break on purpose
-	case 32:
-	// No break on purpose
-	case 36:
-	// No break on purpose
-	case 38:
-	// No break on purpose
-	case 43:
-	// No break on purpose
-	case 47:
-	// No break on purpose
-	case 49:
-	// No break on purpose
-	case 51:
-	// No break on purpose
-	case 53:
-	// No break on purpose
-	case 70:
-	// No break on purpose
-	case 78:
-	// No break on purpose
-	case 81:
-	// No break on purpose
-	case 84:
-	// No break on purpose
-	case 89:
-	// No break on purpose
-	case 91:
-	// No break on purpose
-	case 94:
-	// No break on purpose
-	case 99:
-	// No break on purpose
-	case 101:
-		_eastExit._enabled = true;
-		R2_GLOBALS._walkRegions.disableRegion(1);
-		R2_GLOBALS._walkRegions.disableRegion(7);
-		R2_GLOBALS._walkRegions.disableRegion(13);
+	case 1905:
+		R2_GLOBALS._player.disableControl(CURSOR_WALK);
+		R2_GLOBALS._sceneManager.changeScene(1925);
+		break;
+	case 1910:
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 2535);
+		R2_GLOBALS._player.disableControl(CURSOR_WALK);
+		R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 1900;
+		R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1900;
+		R2_GLOBALS._sceneManager.changeScene(2450);
 		break;
+	case 1906:
+		R2_GLOBALS._scene1925CurrLevel = -3;
+	// No break on purpose
 	default:
-		R2_GLOBALS._walkRegions.disableRegion(1);
-		R2_GLOBALS._walkRegions.disableRegion(6);
-		R2_GLOBALS._walkRegions.disableRegion(7);
-		R2_GLOBALS._walkRegions.disableRegion(9);
-		R2_GLOBALS._walkRegions.disableRegion(13);
+		R2_GLOBALS._player.enableControl();
 		break;
 	}
+}
+
+/*--------------------------------------------------------------------------
+ * Scene 1925 - Spill Mountains Elevator Shaft
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene1925::Scene1925() {
+	_newSceneMode = 0;
+	for (int i = 0; i < 5; i++)
+		_levelResNum[i] = 0;
+}
+
+void Scene1925::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_newSceneMode);
+	for (int i = 0; i < 5; i++)
+		s.syncAsSint16LE(_levelResNum[i]);
+}
+
+bool Scene1925::Button::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneHotspot::startAction(action, event);
+
+	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100))
+		return SceneHotspot::startAction(action, event);
+
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 20))
+		scene->_sceneMode = 1928;
+	else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 200))
+		scene->_sceneMode = 1929;
+	else
+		scene->_sceneMode = 1930;
+
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player,
+		&scene->_door, NULL);
+	return true;
+}
+
+bool Scene1925::Ladder::startAction(CursorType action, Event &event) {
+	if ((!R2_GLOBALS.getFlag(29)) || (action != CURSOR_USE))
+		return SceneHotspot::startAction(action, event);
+
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl(CURSOR_USE);
+	scene->_sceneMode = 0;
+
+	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100)) {
+		scene->_westExit._enabled = false;
+		scene->_sceneMode = 1925;
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode,
+			&R2_GLOBALS._player, &scene->_door, NULL);
+		return true;
+	}
+
+	if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 20) && (event.mousePos.y >= 30)) {
+		scene->_sceneMode = 1931;
+	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 200) && (event.mousePos.y < 140)) {
+		scene->_sceneMode = 1932;
+	} else if ( (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
+		         || ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))
+				 ) && (event.mousePos.y >= 100)) {
+		scene->_sceneMode = 1926;
+	} else if ( (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
+		         || ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))
+				 ) && (event.mousePos.y < 60)) {
+		scene->_sceneMode = 1927;
+	} else {
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+	}
 
-	_northDoorway.remove();
-	_northDoorway.removeObject();
-	_southDoorway.remove();
+	if (scene->_sceneMode != 0)
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
 
-	switch (R2_GLOBALS._flubMazeArea - 4) {
-	case 0:
-	// No break on purpose
-	case 3:
-	// No break on purpose
-	case 16:
-	// No break on purpose
-	case 22:
-	// No break on purpose
-	case 24:
-	// No break on purpose
-	case 32:
-	// No break on purpose
-	case 33:
-	// No break on purpose
-	case 45:
-	// No break on purpose
-	case 46:
-	// No break on purpose
-	case 48:
-	// No break on purpose
-	case 51:
-	// No break on purpose
-	case 56:
-	// No break on purpose
-	case 59:
-	// No break on purpose
-	case 67:
-	// No break on purpose
-	case 68:
-	// No break on purpose
-	case 70:
-	// No break on purpose
-	case 73:
-	// No break on purpose
-	case 82:
-	// No break on purpose
-	case 90:
-		_northExit._enabled = true;
-		_northDoorway.setup(1950, (R2_GLOBALS._flubMazeArea % 2) + 1, 1, 160, 137, 25);
-		//visage,strip,frame,px,py,priority,effect
-		_southDoorway.postInit();
-		_southDoorway.setVisage(1950);
-		_southDoorway.setStrip((((R2_GLOBALS._flubMazeArea - 1) / 35) % 2) + 1);
-		_southDoorway.setFrame(2);
-		_southDoorway.setPosition(Common::Point(160, 167));
-		_southDoorway.fixPriority(220);
-		R2_GLOBALS._walkRegions.disableRegion(3);
-		R2_GLOBALS._walkRegions.disableRegion(4);
-		break;
-	case 7:
-	// No break on purpose
-	case 10:
-	// No break on purpose
-	case 23:
-	// No break on purpose
-	case 29:
-	// No break on purpose
-	case 31:
-	// No break on purpose
-	case 39:
-	// No break on purpose
-	case 40:
-	// No break on purpose
-	case 52:
-	// No break on purpose
-	case 53:
-	// No break on purpose
-	case 55:
-	// No break on purpose
-	case 63:
-	// No break on purpose
-	case 65:
-	// No break on purpose
-	case 66:
-	// No break on purpose
-	case 75:
-	// No break on purpose
-	case 77:
-	// No break on purpose
-	case 81:
-	// No break on purpose
-	case 87:
-	// No break on purpose
-	case 89:
-	// No break on purpose
-	case 97:
-		_southExit._enabled = true;
+	return true;
+}
 
-		_southDoorway.postInit();
-		_southDoorway.setVisage(1950);
-		_southDoorway.setStrip((((R2_GLOBALS._flubMazeArea - 1) / 35) % 2) + 1);
-		_southDoorway.setFrame(3);
-		_southDoorway.setPosition(Common::Point(160, 167));
-		_southDoorway.fixPriority(220);
-		break;
-	case 58:
-	// No break on purpose
-	case 74:
-	// No break on purpose
-	case 80:
-		_northExit._enabled = true;
-		_southExit._enabled = true;
+void Scene1925::ExitUp::changeScene() {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
 
-		_northDoorway.setup(1950, (R2_GLOBALS._flubMazeArea % 2) + 1, 1, 160, 137, 25);
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_USE);
+	scene->_sceneMode = 0;
 
-		_southDoorway.postInit();
-		_southDoorway.setVisage(1950);
-		_southDoorway.setStrip((((R2_GLOBALS._flubMazeArea - 1) / 35) % 2) + 1);
-		_southDoorway.setFrame(3);
-		_southDoorway.setPosition(Common::Point(160, 167));
-		_southDoorway.fixPriority(220);
-		R2_GLOBALS._walkRegions.disableRegion(3);
-		R2_GLOBALS._walkRegions.disableRegion(4);
-		break;
-	default:
-		_southDoorway.postInit();
-		_southDoorway.setVisage(1950);
-		_southDoorway.setStrip(((R2_GLOBALS._flubMazeArea - 1) / 35) % 2 + 1);
-		_southDoorway.setFrame(2);
-		_southDoorway.setPosition(Common::Point(160, 167));
-		_southDoorway.fixPriority(220);
-		break;
+	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100)) {
+		scene->_westExit._enabled = false;
+		scene->_newSceneMode = 1927;
+		scene->_sceneMode = 1925;
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode,
+			&R2_GLOBALS._player, &scene->_door, NULL);
+		return;
 	}
 
-	switch (R2_GLOBALS._flubMazeArea - 3) {
-	case 0:
-	// No break on purpose
+	if (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
+		|| ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))) {
+		scene->_sceneMode = 1927;
+	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 200)) {
+		scene->_sceneMode = 1932;
+	}
+
+	if (scene->_sceneMode != 0)
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+	else {
+		scene->_sceneMode = 1932;
+		scene->signal();
+	}
+}
+
+void Scene1925::ExitDown::changeScene() {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_USE);
+	scene->_sceneMode = 0;
+
+	if ((R2_GLOBALS._player._position.x == 110) && (R2_GLOBALS._player._position.y == 100)) {
+		scene->_westExit._enabled = false;
+		scene->_newSceneMode = 1926;
+		scene->_sceneMode = 1925;
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode,
+			&R2_GLOBALS._player, &scene->_door, NULL);
+		return;
+	}
+
+	if (   ((R2_GLOBALS._player._position.x == 112) && (R2_GLOBALS._player._position.y == 101))
+		|| ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 110))) {
+		scene->_sceneMode = 1926;
+	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 20)) {
+		scene->_sceneMode = 1931;
+	}
+
+	if (scene->_sceneMode == 0) {
+		scene->_sceneMode = 1931;
+		scene->signal();
+	} else
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1925::WestExit::changeScene() {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	scene->_sceneMode = 1921;
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1925::EastExit::changeScene() {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	scene->_sceneMode = 1920;
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1925::changeLevel(bool upFlag) {
+	if (R2_GLOBALS._scene1925CurrLevel < 0)
+		R2_GLOBALS._scene1925CurrLevel = 3;
+
+	if (upFlag) {
+		R2_GLOBALS._player.setup(1925, 1, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(154, 200));
+		++R2_GLOBALS._scene1925CurrLevel;
+	} else {
+		R2_GLOBALS._player.setup(1925, 1, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(154, 20));
+		R2_GLOBALS._scene1925CurrLevel--;
+	}
+
+	switch (R2_GLOBALS._scene1925CurrLevel) {
+	case -1:
+		R2_GLOBALS._sceneManager.changeScene(1945);
+		return;
+		break;
 	case 3:
-	// No break on purpose
-	case 5:
-	// No break on purpose
-	case 12:
-	// No break on purpose
-	case 15:
-	// No break on purpose
-	case 18:
-	// No break on purpose
-	case 19:
-	// No break on purpose
-	case 23:
-	// No break on purpose
-	case 26:
-	// No break on purpose
-	case 27:
-	// No break on purpose
-	case 29:
-	// No break on purpose
-	case 30:
-	// No break on purpose
-	case 31:
-	// No break on purpose
-	case 32:
-	// No break on purpose
-	case 44:
-	// No break on purpose
-	case 45:
-	// No break on purpose
-	case 51:
-	// No break on purpose
-	case 55:
-	// No break on purpose
-	case 56:
-	// No break on purpose
-	case 57:
-	// No break on purpose
-	case 60:
-	// No break on purpose
-	case 63:
-		_upExit._enabled = true;
+		loadScene(_levelResNum[4]);
+		_button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
+		_door.setDetails(1925, 0, 1, 2, 2, (SceneItem *) NULL);
+		_door.show();
 		break;
-	case 54:
-	// No break on purpose
-	case 61:
-	// No break on purpose
-	case 62:
-	// No break on purpose
-	case 65:
-		_upExit._enabled = true;
-	// No break on purpose
-	case 35:
-	// No break on purpose
-	case 38:
-	// No break on purpose
-	case 40:
-	// No break on purpose
-	case 47:
-	// No break on purpose
-	case 50:
-	// No break on purpose
-	case 53:
-	// No break on purpose
-	case 58:
-	// No break on purpose
-	case 64:
-	// No break on purpose
-	case 66:
-	// No break on purpose
-	case 67:
-	// No break on purpose
-	case 79:
-	// No break on purpose
-	case 80:
-	// No break on purpose
-	case 86:
-	// No break on purpose
-	case 89:
-	// No break on purpose
-	case 90:
-	// No break on purpose
-	case 91:
-	// No break on purpose
-	case 92:
-	// No break on purpose
-	case 95:
-	// No break on purpose
-	case 96:
+	case 512:
+		R2_GLOBALS._scene1925CurrLevel = 508;
 	// No break on purpose
-	case 97:
+	default:
+		loadScene(_levelResNum[(R2_GLOBALS._scene1925CurrLevel % 4)]);
+		R2_GLOBALS._sceneItems.remove(&_button);
+		R2_GLOBALS._sceneItems.remove(&_door);
+		_door.hide();
+		break;
+	}
+
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._canWalk = false;
+}
+
+void Scene1925::postInit(SceneObjectList *OwnerList) {
+	_levelResNum[0] = 1930;
+	_levelResNum[1] = 1935;
+	_levelResNum[2] = 1940;
+	_levelResNum[3] = 1935;
+	_levelResNum[4] = 1925;
+
+	if (R2_GLOBALS.getFlag(29)) {
+		if ((R2_GLOBALS._scene1925CurrLevel == -3) || (R2_GLOBALS._scene1925CurrLevel == 3))
+			loadScene(_levelResNum[4]);
+		else
+			loadScene(_levelResNum[R2_GLOBALS._scene1925CurrLevel % 4]);
+	} else {
+		R2_GLOBALS._scene1925CurrLevel = -2;
+		loadScene(1920);
+	}
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(220);
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1925;
+	R2_GLOBALS._player._characterIndex = R2_SEEKER;
+
+	switch (R2_GLOBALS._scene1925CurrLevel) {
+	case -2:
+		_eastExit.setDetails(Rect(203, 44, 247, 111), EXITCURSOR_E, 1925);
+		_ladder.setDetails(Rect(31, 3, 45, 167), 1925, 6, -1, 8, 1, NULL);
+		break;
+	case 3:
+		_door.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL);
+		_button.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
 	// No break on purpose
-	case 98:
+	case -3:
+		_westExit.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
 	// No break on purpose
-	case 100:
-		_downExit._enabled = true;
-		R2_GLOBALS._walkRegions.disableRegion(4);
-		R2_GLOBALS._walkRegions.disableRegion(5);
-		R2_GLOBALS._walkRegions.disableRegion(6);
-		R2_GLOBALS._walkRegions.disableRegion(10);
-		R2_GLOBALS._walkRegions.disableRegion(11);
 	default:
+		_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925);
+		_exitDown.setDetails(Rect(128, 160, 190, 167), EXITCURSOR_S, 1925);
+		_ladder.setDetails(Rect(141, 11, 167, 159),	1925, 6, -1, -1, 1, NULL);
 		break;
 	}
-	R2_GLOBALS._uiElements.draw();
-}
-
-void Scene1950::enterArea() {
-	R2_GLOBALS._player.disableControl();
-	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	_vampire.remove();
-	_door.remove();
-	_scrolls.remove();
+	_door.postInit();
+	_door.setup(1925, 5, 1);
+	_door.setPosition(Common::Point(128, 35));
+	_door.hide();
 
-	_vampireActive = false;
-	_vampireIndex = 0;
+	if (R2_GLOBALS._scene1925CurrLevel == 3)
+		_door.show();
 
-	// Certain areas have a vampire in them
-	switch (R2_GLOBALS._flubMazeArea) {
-	case 10:
-		_vampireIndex = 1;
-		break;
-	case 13:
-		_vampireIndex = 2;
-		break;
-	case 16:
-		_vampireIndex = 3;
-		break;
-	case 17:
-		_vampireIndex = 4;
-		break;
-	case 24:
-		_vampireIndex = 5;
-		break;
-	case 25:
-		_vampireIndex = 6;
-		break;
-	case 31:
-		_vampireIndex = 7;
-		break;
-	case 40:
-		_vampireIndex = 8;
-		break;
-	case 45:
-		_vampireIndex = 9;
-		break;
-	case 46:
-		_vampireIndex = 10;
-		break;
-	case 73:
-		_vampireIndex = 11;
-		break;
-	case 75:
-		_vampireIndex = 12;
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	switch (R2_GLOBALS._scene1925CurrLevel) {
+	case -2:
+		R2_GLOBALS._player.setup(20, 6, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(224, 109));
 		break;
-	case 80:
-		_vampireIndex = 13;
+	case -3:
+		_door.hide();
+		R2_GLOBALS._player.setup(20, 5, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(110, 100));
 		break;
-	case 87:
-		_vampireIndex = 14;
+	case 0:
+		R2_GLOBALS._player.setup(1925, 1, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(154, 200));
 		break;
-	case 88:
-		_vampireIndex = 15;
+	default:
+		R2_GLOBALS._player.setup(1925, 1, 3);
+		R2_GLOBALS._player.setPosition(Common::Point(154, 110));
 		break;
-	case 96:
-		_vampireIndex = 16;
+	}
+
+	R2_GLOBALS._player._canWalk = false;
+	_newSceneMode = 0;
+	R2_GLOBALS._sceneManager._previousScene = 1925;
+	_background.setDetails(Rect(27, 0, 292, 200), 1925, 9, -1, -1, 1, NULL);
+}
+
+void Scene1925::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._player._oldCharacterScene[R2_SEEKER] = 1925;
+	SceneExt::remove();
+}
+
+void Scene1925::signal() {
+	switch (_sceneMode) {
+	case 1920:
+	// No break on purpose
+	case 1921:
+	// No break on purpose
+	case 1928:
+	// No break on purpose
+	case 1929:
+	// No break on purpose
+	case 1930:
+		R2_GLOBALS._scene1925CurrLevel = -3;
+		R2_GLOBALS._sceneManager.changeScene(1900);
 		break;
-	case 97:
-		_vampireIndex = 17;
+	case 1926:
+	// No break on purpose
+	case 1931:
+		// Change level, down
+		changeLevel(false);
 		break;
-	case 104:
-		_vampireIndex = 18;
+	case 1927:
+	// No break on purpose
+	case 1932:
+		// Change level, up
+		changeLevel(true);
 		break;
+	case 1925:
+		_westExit._enabled = false;
+		if (_newSceneMode != 0) {
+			_sceneMode = _newSceneMode;
+			_newSceneMode = 0;
+			setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		}
+	// No break on purpose
 	default:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
 		break;
 	}
 
-	if (_vampireIndex != 0) {
-		_vampire.postInit();
-		_vampire._numFrames = 6;
-		_vampire._moveRate = 6;
-		_vampire._moveDiff = Common::Point(3, 2);
-		_vampire._effect = EFFECT_SHADED;
-
-		if (!R2_GLOBALS._vampireData[_vampireIndex - 1]._isAlive) {
-			// Show vampire ashes
-			_vampire.setPosition(Common::Point(R2_GLOBALS._vampireData[_vampireIndex - 1]._position));
-			_vampire.animate(ANIM_MODE_NONE, NULL);
-			_vampire.addMover(NULL);
-			_vampire.setVisage(1961);
-			_vampire.setStrip(4);
-			_vampire.setFrame(10);
-			_vampire.fixPriority(10);
-			_vampire.setDetails(1950, 15, -1, 17, 2, (SceneItem *) NULL);
-		} else {
-			// Start the vampire
-			_vampire.setVisage(1960);
-			_vampire.setPosition(Common::Point(160, 130));
-			_vampire.animate(ANIM_MODE_2, NULL);
-			_vampire.setDetails(1950, 12, -1, 14, 2, (SceneItem *) NULL);
-			_vampireActive = true;
-		}
-	}
-	if ((R2_GLOBALS._flubMazeArea == 1) && (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) != 0)) {
-		// Show doorway at the right hand side of the very first flub corridor
-		_door.postInit();
-		_door.setVisage(1948);
-		_door.setStrip(3);
-		_door.setPosition(Common::Point(278, 155));
-		_door.fixPriority(100);
-		_door.setDetails(1950, 19, 20, 23, 2, (SceneItem *) NULL);
-	}
-
-	if (R2_GLOBALS._flubMazeArea == 102) {
-		R2_GLOBALS._walkRegions.load(1951);
-		R2_GLOBALS._walkRegions.disableRegion(1);
-		R2_GLOBALS._walkRegions.disableRegion(5);
-		R2_GLOBALS._walkRegions.disableRegion(6);
-		R2_GLOBALS._walkRegions.disableRegion(7);
-
-		_cube.postInit();
-		_cube.setVisage(1970);
-		_cube.setStrip(1);
-		if (R2_GLOBALS.getFlag(37))
-			_cube.setFrame(3);
-		else
-			_cube.setFrame(1);
-		_cube.setPosition(Common::Point(193, 158));
-		_cube.setDetails(1950, 3, 4, 5, 2, (SceneItem *) NULL);
-
-		_pulsingLights.postInit();
-		_pulsingLights.setVisage(1970);
-		_pulsingLights.setStrip(3);
-		_pulsingLights.animate(ANIM_MODE_2, NULL);
-		_pulsingLights._numFrames = 6;
-		_pulsingLights.setPosition(Common::Point(194, 158));
-		_pulsingLights.fixPriority(159);
-
-		_keypad.setDetails(Rect(188, 124, 199, 133), 1950, 27, 28, -1, 2, NULL);
-
-		if (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950) {
-			_gem.postInit();
-			_gem.setVisage(1970);
-			_gem.setStrip(1);
-			_gem.setFrame(2);
-			_gem.fixPriority(160);
-		}
-
-		if (R2_GLOBALS.getFlag(37)) {
-			_gem.setPosition(Common::Point(192, 118));
-			_gem.setDetails(1950, 9, 4, -1, 2, (SceneItem *) NULL);
-		} else {
-			_containmentField.postInit();
-			_containmentField.setVisage(1970);
-			_containmentField.setStrip(4);
-			_containmentField._numFrames = 4;
-			_containmentField.animate(ANIM_MODE_8, 0, NULL);
-			_containmentField.setPosition(Common::Point(192, 121));
-			_containmentField.fixPriority(159);
-			_containmentField.setDetails(1950, 6, 7, 8, 2, (SceneItem *) NULL);
-
-			_gem.setPosition(Common::Point(192, 109));
-			_gem.setDetails(1950, 9, 7, 8, 2, (SceneItem *) NULL);
-		}
-
-		_scrolls.postInit();
-		_scrolls.setVisage(1972);
-		_scrolls.setStrip(1);
-		_scrolls.setPosition(Common::Point(76, 94));
-		_scrolls.fixPriority(25);
-		_scrolls.setDetails(1950, 30, -1, -1, 2, (SceneItem *) NULL);
-		if (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2)
-			_scrolls.setFrame(2);
-		else
-			_scrolls.setFrame(1);
+	R2_GLOBALS._player._canWalk = false;
+}
 
-		_removeFlag = true;
-	} else if (_removeFlag) {
-		_cube.remove();
-		_containmentField.remove();
-		_gem.remove();
-		_pulsingLights.remove();
-		_scrolls.remove();
+/*--------------------------------------------------------------------------
+ * Scene 1945 - Spill Mountains Shaft Bottom
+ *
+ *--------------------------------------------------------------------------*/
 
-		R2_GLOBALS._sceneItems.remove(&_background);
-		_background.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 2, NULL);
+Scene1945::Scene1945() {
+	_nextSceneMode1 = 0;
+	_nextSceneMode2 = 0;
+	_lampUsed = CURSOR_NONE;
+}
 
-		_removeFlag = false;
-	}
+void Scene1945::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
 
-	switch (R2_GLOBALS._flubMazeEntryDirection) {
-	case 0:
-		_sceneMode = 1950;
-		if (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0)
-			// The original uses CURSOR_ARROW. CURSOR_WALK is much more coherent
-			R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		else
-			setAction(&_sequenceManager, this, 1950, &R2_GLOBALS._player, NULL);
+	s.syncAsSint16LE(_nextSceneMode1);
+	s.syncAsSint16LE(_nextSceneMode2);
+	s.syncAsSint16LE(_lampUsed);
+}
 
-		break;
-	case 1: {
-		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-		R2_GLOBALS._player.setPosition(Common::Point(160, 213));
-		Common::Point pt(160, 160);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
+bool Scene1945::Ice::startAction(CursorType action, Event &event) {
+	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case R2_GUNPOWDER:
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 0;
+		if ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142))
+			scene->_sceneMode = 1942;
+		else {
+			scene->_sceneMode = 1940;
+			scene->_nextSceneMode1 = 1942;
 		}
+		// At this point the original check if _sceneMode != 0. Skipped.
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_gunpowder, NULL);
+		return true;
 		break;
-	case 2:
-		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-		if (R2_GLOBALS.getFlag(36))
-			setAction(&_sequenceManager, this, 1957, &R2_GLOBALS._player, NULL);
-		else
-			setAction(&_sequenceManager, this, 1974, &R2_GLOBALS._player, NULL);
-		break;
-	case 3:
-		// Entering from the left
-		if (!_vampireActive) {
-			_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-			R2_GLOBALS._player.setPosition(Common::Point(-20, 160));
-			Common::Point pt(30, 160);
-			NpcMover *mover = new NpcMover();
-			R2_GLOBALS._player.addMover(mover, &pt, this);
+	case CURSOR_USE:
+		R2_GLOBALS._player.disableControl(CURSOR_USE);
+		scene->_sceneMode = 0;
+		if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50) && (event.mousePos.x >= 130)) {
+			scene->_sceneMode = 1940;
+			// At this point the original check if _sceneMode != 0. Skipped.
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+			return true;
 		} else {
-			_sceneMode = 18;
-			_eastExit._enabled = false;
-			_vampireDestPos = Common::Point(60, 152);
 			R2_GLOBALS._player.enableControl(CURSOR_USE);
 			R2_GLOBALS._player._canWalk = false;
-
-			_vampire.setStrip(2);
-			NpcMover *mover = new NpcMover();
-			_vampire.addMover(mover, &_vampireDestPos, this);
-
-			R2_GLOBALS._player.setPosition(Common::Point(-20, 160));
-			Common::Point pt2(30, 160);
-			NpcMover *mover2 = new NpcMover();
-			R2_GLOBALS._player.addMover(mover2, &pt2, NULL);
-		}
-		break;
-	case 4:
-		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-		if (!_upExitStyle) {
-			if (R2_GLOBALS.getFlag(36))
-				setAction(&_sequenceManager, this, 1955, &R2_GLOBALS._player, NULL);
-			else
-				setAction(&_sequenceManager, this, 1972, &R2_GLOBALS._player, NULL);
-		} else {
-			if (R2_GLOBALS.getFlag(36))
-				setAction(&_sequenceManager, this, 1954, &R2_GLOBALS._player, NULL);
+			if (event.mousePos.x > 130)
+				scene->_ice.setDetails(1945, 3, -1, -1, 3, (SceneItem *) NULL);
 			else
-				setAction(&_sequenceManager, this, 1971, &R2_GLOBALS._player, NULL);
-		}
-		break;
-	case 5: {
-		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-		R2_GLOBALS._player.setPosition(Common::Point(160, 127));
-		Common::Point pt(160, 160);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
+				scene->_ice.setDetails(1945, 3, -1, 5, 3, (SceneItem *) NULL);
 		}
+	// No break on purpose
+	default:
+		return SceneHotspot::startAction(action, event);
 		break;
-	case 6:
-		// Entering from the right
-		if (!_vampireActive) {
-			_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
-			if (R2_GLOBALS._flubMazeArea == 1) {
-				setAction(&_sequenceManager, this, 1961, &R2_GLOBALS._player, NULL);
-			} else {
-				R2_GLOBALS._player.setPosition(Common::Point(340, 160));
-				Common::Point pt(289, 160);
-				NpcMover *mover = new NpcMover();
-				R2_GLOBALS._player.addMover(mover, &pt, this);
-			}
-		} else {
-			_sceneMode = 17;
-			_westExit._enabled = false;
-			_vampireDestPos = Common::Point(259, 152);
+	}
+}
 
-			R2_GLOBALS._player.enableControl(CURSOR_USE);
-			R2_GLOBALS._player._canWalk = false;
+bool Scene1945::Ladder::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneHotspot::startAction(action, event);
 
-			_vampire.setStrip(1);
-			NpcMover *mover = new NpcMover();
-			_vampire.addMover(mover, &_vampireDestPos, this);
+	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
-			R2_GLOBALS._player.setPosition(Common::Point(340, 160));
-			Common::Point pt2(289, 160);
-			NpcMover *mover2 = new NpcMover();
-			R2_GLOBALS._player.addMover(mover2, &pt2, NULL);
+	R2_GLOBALS._player.disableControl(CURSOR_USE);
+	scene->_sceneMode = 0;
+
+	if ((R2_GLOBALS._player._position.x == 221) && (R2_GLOBALS._player._position.y == 142)) {
+		scene->_sceneMode = 1949;
+		scene->_nextSceneMode1 = 1947;
+	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
+		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
+		scene->_sceneMode = 1947;
+	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)
+			&& (event.mousePos.y >= 30)) {
+		scene->_sceneMode = 1940;
+	} else {
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+	}
+
+	if (scene->_sceneMode != 0)
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+
+	return true;
+}
+
+bool Scene1945::Gunpowder::startAction(CursorType action, Event &event) {
+	if ((action == R2_ALCOHOL_LAMP_3) || (action == R2_ALCOHOL_LAMP_2)) {
+		Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+
+		scene->_lampUsed = action;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 0;
+		if ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) {
+			scene->_sceneMode= 1947;
+			scene->_nextSceneMode1 = 1943;
+		} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)) {
+			scene->_sceneMode = 1940;
+			scene->_nextSceneMode1 = 1943;
+		} else {
+			scene->_sceneMode = 1949;
+			scene->_nextSceneMode1 = 1947;
+			scene->_nextSceneMode2 = 1943;
 		}
-		break;
-	default:
-		break;
-	}
-}
-
-void Scene1950::doButtonPress(int indx) {
-	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
-	R2_GLOBALS._player.disableControl();
-
-	int prevIndex = indx - 1;
-	if ((indx / 4) == (prevIndex / 4)) {
-		if (prevIndex < 0)
-			prevIndex = 3;
+		// At this point the original check if _sceneMode != 0. Skipped.
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+		return true;
 	} else {
-		prevIndex += 4;
+		return SceneActor::startAction(action, event);
 	}
+}
 
-	assert(prevIndex >= 0 && prevIndex < 16);
-	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
-		_KeypadWindow._buttons[prevIndex].setFrame(2);
-		_KeypadWindow._buttons[prevIndex]._toggled = true;
-	} else {
-		_KeypadWindow._buttons[prevIndex].setFrame(1);
-		_KeypadWindow._buttons[prevIndex]._toggled = false;
-	}
+void Scene1945::ExitUp::changeScene() {
+	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
-	prevIndex = indx + 1;
-	if ((indx / 4) == (prevIndex / 4)) {
-		if (prevIndex >  15)
-			prevIndex = 12;
-	} else {
-		prevIndex -= 4;
-	}
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_USE);
+	scene->_sceneMode = 0;
 
-	assert(prevIndex >= 0 && prevIndex < 16);
-	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
-		_KeypadWindow._buttons[prevIndex].setFrame(2);
-		_KeypadWindow._buttons[prevIndex]._toggled = true;
-	} else {
-		_KeypadWindow._buttons[prevIndex].setFrame(1);
-		_KeypadWindow._buttons[prevIndex]._toggled = false;
+	if ((R2_GLOBALS._player._position.x == 221) && (R2_GLOBALS._player._position.y == 142)) {
+		scene->_sceneMode = 1949;
+		scene->_nextSceneMode1 = 1947;
+	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
+		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
+		scene->_sceneMode = 1947;
 	}
 
-	prevIndex = indx - 4;
-	if (prevIndex < 0)
-		prevIndex += 16;
-
-	assert(prevIndex >= 0 && prevIndex < 16);
-	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
-		_KeypadWindow._buttons[prevIndex].setFrame(2);
-		_KeypadWindow._buttons[prevIndex]._toggled = true;
+	if (scene->_sceneMode == 0) {
+		scene->_sceneMode = 1941;
+		signal();
 	} else {
-		_KeypadWindow._buttons[prevIndex].setFrame(1);
-		_KeypadWindow._buttons[prevIndex]._toggled = false;
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
 	}
+}
 
-	prevIndex = indx + 4;
-	if (prevIndex > 15)
-		prevIndex -= 16;
+void Scene1945::CorridorExit::changeScene() {
+	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
-	assert(prevIndex >= 0 && prevIndex < 16);
-	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
-		_KeypadWindow._buttons[prevIndex].setFrame(2);
-		_KeypadWindow._buttons[prevIndex]._toggled = true;
-	} else {
-		_KeypadWindow._buttons[prevIndex].setFrame(1);
-		_KeypadWindow._buttons[prevIndex]._toggled = false;
-	}
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_USE);
+	scene->_sceneMode = 0;
 
-	// Check whether all the buttons are highlighted
-	int cpt = 0;
-	for (prevIndex = 0; prevIndex < 16; prevIndex++) {
-		if (_KeypadWindow._buttons[prevIndex]._toggled)
-			++cpt;
+	if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)) {
+		scene->_sceneMode = 1940;
+		scene->_nextSceneMode1 = 1945;
+	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))
+		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {
+		scene->_sceneMode = 1945;
 	}
 
-	if (cpt != 16) {
-		R2_GLOBALS._player.enableControl();
-		R2_GLOBALS._player._canWalk = false;
-	} else {
-		R2_GLOBALS.setFlag(37);
-		_sceneMode = 24;
-		setAction(&_sequenceManager, scene, 1976, NULL);
-	}
+	if (scene->_sceneMode != 0)
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
 }
 
-void Scene1950::postInit(SceneObjectList *OwnerList) {
-	_upExitStyle = false;
-	_removeFlag = false;
-	_vampireActive = false;
-	_vampireIndex = 0;
-	if (R2_GLOBALS._sceneManager._previousScene == 300)
-		R2_GLOBALS._flubMazeArea = 103;
-
-	initArea();
+void Scene1945::postInit(SceneObjectList *OwnerList) {
+	loadScene(1945);
 	SceneExt::postInit();
-	R2_GLOBALS._sound1.play(105);
-
-	_northExit.setDetails(Rect(130, 46, 189, 135), SHADECURSOR_UP, 1950);
-	_northExit.setDest(Common::Point(160, 145));
+	R2_GLOBALS._sound1.play(220);
 
-	_upExit.setDetails(Rect(208, 0, 255, 73), EXITCURSOR_N, 1950);
-	_upExit.setDest(Common::Point(200, 151));
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._canWalk = false;
+	R2_GLOBALS._player._characterScene[R2_SEEKER] = 1945;
+	R2_GLOBALS._player._characterIndex = R2_SEEKER;
 
-	_eastExit.setDetails(Rect(305, 95, 320, 147), EXITCURSOR_E, 1950);
-	_eastExit.setDest(Common::Point(312, 160));
+	_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945);
+	_corridorExit.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945);
 
-	_downExit.setDetails(Rect(208, 99, 255, 143), EXITCURSOR_S, 1950);
-	_downExit.setDest(Common::Point(200, 151));
+	_ladder.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL);
 
-	_southExit.setDetails(Rect(113, 154, 206, 168), SHADECURSOR_DOWN, 1950);
-	_southExit.setDest(Common::Point(160, 165));
+	if (!R2_GLOBALS.getFlag(43)) {
+		_corridorExit._enabled = false;
+		_gunpowder.postInit();
+		_gunpowder.setup(1945, 4, 1);
+		_gunpowder.setPosition(Common::Point(253, 169));
+		_gunpowder.fixPriority(150);
 
-	_westExit.setDetails(Rect(0, 95, 14, 147), EXITCURSOR_W, 1950);
-	_westExit.setDest(Common::Point(7, 160));
+		if (R2_GLOBALS.getFlag(42))
+			_gunpowder.setDetails(1945, 15, -1, -1, 1, (SceneItem *) NULL);
+		else
+			_gunpowder.hide();
 
-	_shaftExit.setDetails(Rect(72, 54, 120, 128), EXITCURSOR_NW, 1950);
-	_shaftExit.setDest(Common::Point(120, 140));
+		_coveringIce.postInit();
+		_coveringIce.setup(1945, 8, 1);
+		_coveringIce.setPosition(Common::Point(253, 169));
+		_coveringIce.fixPriority(130);
 
-	_doorExit.setDetails(Rect(258, 60, 300, 145), EXITCURSOR_NE, 1950);
-	_doorExit.setDest(Common::Point(268, 149));
+		_alcoholLamp.postInit();
+		_alcoholLamp.setup(1945, 3, 1);
+		_alcoholLamp.hide();
+	} else {
+		_corridorExit._enabled = true;
+	}
 
-	R2_GLOBALS._player.postInit();
-	if ( (R2_INVENTORY.getObjectScene(R2_TANNER_MASK) == 0) && (R2_INVENTORY.getObjectScene(R2_PURE_GRAIN_ALCOHOL) == 0)
-		&& (R2_INVENTORY.getObjectScene(R2_SOAKED_FACEMASK) == 0) && (!R2_GLOBALS.getFlag(36)) )
-		R2_GLOBALS._player.setVisage(22);
-	else
-		R2_GLOBALS._player.setVisage(20);
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 1925:
+		R2_GLOBALS._scene1925CurrLevel = 0;
+		R2_GLOBALS.clearFlag(29);
+		R2_GLOBALS._player.setup(1925, 1, 10);
+		R2_GLOBALS._player.setPosition(Common::Point(154, 50));
+		break;
+	case 1950:
+		_sceneMode = 1944;
+		setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		R2_GLOBALS._player.disableControl(CURSOR_USE);
+		break;
+	default:
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setup(20, 5, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(191, 142));
+		break;
+	}
 
-	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
-	_background.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 1, NULL);
+	R2_GLOBALS._player._canWalk = false;
+	_nextSceneMode1 = 0;
+	_nextSceneMode2 = 0;
 
-	enterArea();
+	_ice.setDetails(11, 1945, 3, -1, 5);
+	_hole.setDetails(Rect(238, 144, 274, 167), 1945, 0, -1, 2, 1, NULL);
+	_ice2.setDetails(Rect(27, 3, 292, 167), 1945, 3, -1, -1, 1, NULL);
 }
 
-void Scene1950::remove() {
-	R2_GLOBALS._sound1.stop();
-	R2_GLOBALS._sound2.fadeOut2(NULL);
+void Scene1945::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
 	SceneExt::remove();
 }
 
-void Scene1950::signal() {
+void Scene1945::signal() {
 	switch (_sceneMode) {
-	case 11:
-		R2_GLOBALS._flubMazeArea += 7;
-		initArea();
-		enterArea();
-		break;
-	case 12:
-		// Moving up a ladder within the Flub maze
-		R2_GLOBALS._flubMazeArea += 35;
-		initArea();
-		enterArea();
-		break;
-	case 1975:
-		SceneItem::display(1950, 21, SET_WIDTH, 280, SET_X, 160, SET_POS_MODE, 1,
-			SET_Y, 20, SET_EXT_BGCOLOR, 7, LIST_END);
-	// No break on purpose
-	case 13:
-		// Moving east within the Flub maze
-		++R2_GLOBALS._flubMazeArea;
-		initArea();
-		enterArea();
-		break;
-	case 14:
-		// Moving down a ladder within the Flub maze
-		R2_GLOBALS._flubMazeArea -= 35;
-		initArea();
-		enterArea();
-		break;
-	case 15:
-		R2_GLOBALS._flubMazeArea -= 7;
-		initArea();
-		enterArea();
-		break;
-	case 16:
-		// Moving west within the Flub maze
-	// No break on purpose
-	case 1961:
-		--R2_GLOBALS._flubMazeArea;
-		initArea();
-		enterArea();
-		break;
-	case 17: {
-		_sceneMode = 13;
-		R2_GLOBALS._flubMazeEntryDirection = 3;
-		_vampireActive = false;
-		R2_GLOBALS._player.disableControl(CURSOR_WALK);
-		R2_GLOBALS._player._canWalk = true;
-		R2_GLOBALS._player.setVisage(22);
-		R2_GLOBALS._player.animate(ANIM_MODE_9);
-		Common::Point pt(340, 160);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
-		Common::Point pt2(289, 160);
-		NpcMover *mover2 = new NpcMover();
-		_vampire.addMover(mover2, &pt2, NULL);
+	case 1940:
+		if (_nextSceneMode1 == 1943) {
+			_sceneMode = _nextSceneMode1;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
+		} else {
+			_sceneMode = 1946;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		}
+		return;
 		break;
-	case 18: {
-		_sceneMode = 16;
-		R2_GLOBALS._flubMazeEntryDirection = 6;
-		_vampireActive = false;
-		R2_GLOBALS._player.disableControl(CURSOR_WALK);
-		R2_GLOBALS._player._canWalk = true;
-		R2_GLOBALS._player.setVisage(22);
-		R2_GLOBALS._player.animate(ANIM_MODE_9);
-		Common::Point pt(-20, 160);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
-		Common::Point pt2(30, 160);
-		NpcMover *mover2 = new NpcMover();
-		_vampire.addMover(mover2, &pt2, NULL);
+	case 1941:
+		if (_nextSceneMode1 == 0) {
+			R2_GLOBALS._scene1925CurrLevel = 0;
+			R2_GLOBALS.setFlag(29);
+			R2_GLOBALS._sceneManager.changeScene(1925);
+		} else {
+			_sceneMode = _nextSceneMode1;
+			_nextSceneMode1 = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		}
+		return;
+	case 1942:
+		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 0);
+		_gunpowder.setDetails(1945, 15, -1, -1, 2, (SceneItem *) NULL);
+		R2_GLOBALS.setFlag(42);
 		break;
-	case 24:
-		_KeypadWindow.remove();
-		_sceneMode = 1966;
-		_cube.setFrame(3);
-		setAction(&_sequenceManager, this, 1966, &_containmentField, &_gem, NULL);
-		break;
-	case 1951:
+	case 1943:
 		R2_GLOBALS._sound1.fadeOut2(NULL);
-		R2_GLOBALS._sceneManager.changeScene(1945);
-		break;
-	case 1958:
-		SceneItem::display(1950, 24, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		_doorExit._enabled = true;
-		break;
-	case 1959:
-		R2_INVENTORY.setObjectScene(R2_SOAKED_FACEMASK, 0);
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		_doorExit._enabled = true;
-		break;
-	case 1962:
-	// No break on purpose
-	case 1963:
-		R2_GLOBALS._player.enableControl();
-		_KeypadWindow.setup2(1971, 1, 1, 160, 135);
+		R2_INVENTORY.setObjectScene(_lampUsed, 0);
+		_sceneMode = 1948;
+		setAction(&_sequenceManager1, this, _sceneMode, &_gunpowder, &_alcoholLamp, &_coveringIce, NULL);
+		R2_GLOBALS._player.setAction(&_sequenceManager2, NULL, 1941, &R2_GLOBALS._player, NULL);
+		return;
+	case 1944:
 		break;
-	case 1964:
-	// No break on purpose
-	case 1965:
-		if (!R2_GLOBALS.getFlag(37))
-			SceneItem::display(1950, 26, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
-
-		R2_GLOBALS._player.enableControl();
+	case 1945:
+		R2_GLOBALS._sceneManager.changeScene(1950);
+		return;
+	case 1946:
+		if (_nextSceneMode1 == 1942) {
+			_sceneMode = _nextSceneMode1;
+			_nextSceneMode1 = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_gunpowder, NULL);
+			return;
+		}
+		_sceneMode = 0;
 		break;
-	case 1966:
-		_containmentField.remove();
-		if (R2_GLOBALS.getFlag(36)) {
-			_sceneMode = 1964;
-			setAction(&_sequenceManager, this, 1964, &R2_GLOBALS._player, NULL);
+	case 1947:
+		if (_nextSceneMode1 == 1943) {
+			_sceneMode = _nextSceneMode1;
+			_nextSceneMode1 = 1948;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
 		} else {
-			_sceneMode = 1965;
-			setAction(&_sequenceManager, this, 1965, &R2_GLOBALS._player, NULL);
+			_sceneMode = 1941;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		}
-		_gem.setDetails(1950, 9, -1, -1, 2, (SceneItem *) NULL);
-		break;
-	case 1967: {
-		_sceneMode = 0;
-		R2_INVENTORY.setObjectScene(R2_SAPPHIRE_BLUE, 2);
-		_gem.remove();
-		if (R2_GLOBALS.getFlag(36))
-			R2_GLOBALS._player.setVisage(20);
-		else
-			R2_GLOBALS._player.setVisage(22);
-
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		// This is a hack to work around a pathfinding issue. original destination is (218, 165)
-		Common::Point pt(128, 165);
-		NpcMover *mover = new NpcMover();
-		R2_GLOBALS._player.addMover(mover, &pt, this);
+		return;
+	case 1948:
+		R2_GLOBALS._sound1.play(220);
+		_corridorExit._enabled = true;
+		R2_GLOBALS._sceneItems.remove(&_gunpowder);
+		R2_GLOBALS.clearFlag(42);
+		R2_GLOBALS.setFlag(43);
+		_nextSceneMode1 = 1940;
+	// No break on purpose
+	case 1949:
+		_sceneMode = _nextSceneMode1;
+		if (_nextSceneMode2 == 1943) {
+			_nextSceneMode1 = _nextSceneMode2;
+			_nextSceneMode2 = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_alcoholLamp, NULL);
+		} else {
+			_nextSceneMode1 = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		}
-		break;
-	case 1968:
-		R2_GLOBALS._player.enableControl();
-		R2_INVENTORY.setObjectScene(R2_ANCIENT_SCROLLS, 2);
-		_scrolls.setFrame(2);
-		if (R2_GLOBALS.getFlag(36))
-			R2_GLOBALS._player.setVisage(20);
-		else
-			R2_GLOBALS._player.setVisage(22);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		break;
+		return;
 	default:
-		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	}
-}
-
-void Scene1950::process(Event &event) {
-	if ( (event.eventType == EVENT_BUTTON_DOWN)
-			&& (R2_GLOBALS._player._uiEnabled)
-			&& (R2_GLOBALS._events.getCursor() == R2_SOAKED_FACEMASK)
-			&& (R2_GLOBALS._player._bounds.contains(event.mousePos))
-			&& (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0)) {
-		event.handled = true;
-		R2_GLOBALS._player.disableControl();
-		_shaftExit._enabled = false;
-		_doorExit._enabled = false;
-		_sceneMode = 1959;
-		setAction(&_sequenceManager, this, 1959, &R2_GLOBALS._player, NULL);
-	}
 
-	Scene::process(event);
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._canWalk = false;
 }
 
 } // End of namespace Ringworld2
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 0b6738060c..e6f5e0ab97 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -135,53 +135,6 @@ public:
 	virtual void saveCharacter(int characterIndex);
 };
 
-class Scene1200 : public SceneExt {
-	enum CrawlDirection { CRAWL_EAST = 1, CRAWL_WEST = 2, CRAWL_SOUTH = 3, CRAWL_NORTH = 4 };
-
-	class LaserPanel: public ModalWindow {
-	public:
-		class Jumper : public SceneActorExt {
-		public:
-			void init(int state);
-			virtual bool startAction(CursorType action, Event &event);
-		};
-
-		Jumper _jumper1;
-		Jumper _jumper2;
-		Jumper _jumper3;
-
-		LaserPanel();
-
-		virtual void postInit(SceneObjectList *OwnerList = NULL);
-		virtual void remove();
-	};
-
-public:
-	NamedHotspot _item1;
-	SceneActor _actor1;
-	LaserPanel _laserPanel;
-	MazeUI _mazeUI;
-	SequenceManager _sequenceManager;
-
-	int _nextCrawlDirection;
-	int _field414;
-	int _field416;
-	int _field418;
-	int _field41A;
-	bool _fixupMaze;
-
-	Scene1200();
-	void synchronize(Serializer &s);
-
-	void startCrawling(CrawlDirection dir);
-
-	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	virtual void signal();
-	virtual void process(Event &event);
-	virtual void dispatch();
-	virtual void saveCharacter(int characterIndex);
-};
-
 class Scene1500 : public SceneExt {
 public:
 	SceneActor _starship;
@@ -880,143 +833,6 @@ public:
 	virtual void signal();
 };
 
-class Scene1950 : public SceneExt {
-	/* Windows */
-	class KeypadWindow: public ModalWindow {
-	public:
-		class KeypadButton : public SceneActor {
-		public:
-			int _buttonIndex;
-			bool _pressed;
-			bool _toggled;
-
-			KeypadButton();
-			void synchronize(Serializer &s);
-
-			void init(int indx);
-			virtual void process(Event &event);
-			virtual bool startAction(CursorType action, Event &event);
-		};
-
-		SceneActor _areaActor;
-		KeypadButton _buttons[16];
-
-		int _buttonIndex;
-
-		KeypadWindow();
-		virtual void synchronize(Serializer &s);
-		virtual void remove();
-		virtual void setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY);
-		virtual void setup3(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
-	};
-
-	class Keypad : public NamedHotspot {
-	public:
-		virtual bool startAction(CursorType action, Event &event);
-	};
-
-	/* Actors */
-	class Door : public SceneActor {
-	public:
-		virtual bool startAction(CursorType action, Event &event);
-	};
-	class Scrolls : public SceneActor {
-	public:
-		virtual bool startAction(CursorType action, Event &event);
-	};
-	class Gem : public SceneActor {
-	public:
-		virtual bool startAction(CursorType action, Event &event);
-	};
-	class Vampire : public SceneActor {
-	public:
-		Common::Point _deadPosition;
-		int _deltaX;
-		int _deltaY;
-		int _vampireMode;
-
-		Vampire();
-		void synchronize(Serializer &s);
-
-		virtual void signal();
-		virtual bool startAction(CursorType action, Event &event);
-	};
-
-	/* Exits */
-	class NorthExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class UpExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class EastExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class DownExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class SouthExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class WestExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class ShaftExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-	class DoorExit : public SceneExit {
-	public:
-		virtual void changeScene();
-	};
-private:
-	void initArea();
-	void enterArea();
-	void doButtonPress(int indx);
-public:
-	NamedHotspot _background;
-	Keypad _keypad;
-	SceneActor _southDoorway;
-	SceneObject _northDoorway;
-	Door _door;
-	Scrolls _scrolls;
-	SceneActor _containmentField;
-	Gem _gem;
-	SceneActor _cube;
-	SceneActor _pulsingLights;
-	Vampire _vampire;
-	KeypadWindow _KeypadWindow;
-	NorthExit _northExit;
-	UpExit _upExit;
-	EastExit _eastExit;
-	DownExit _downExit;
-	SouthExit _southExit;
-	WestExit _westExit;
-	ShaftExit _shaftExit;
-	DoorExit _doorExit;
-	SequenceManager _sequenceManager;
-
-	bool _upExitStyle;
-	bool _removeFlag;
-	bool _vampireActive;
-	Common::Point _vampireDestPos;
-	int _vampireIndex;
-
-	Scene1950();
-	void synchronize(Serializer &s);
-
-	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	virtual void remove();
-	virtual void signal();
-	virtual void process(Event &event);
-};
-
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_vampire.cpp b/engines/tsage/ringworld2/ringworld2_vampire.cpp
new file mode 100644
index 0000000000..9d3b7f91a5
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_vampire.cpp
@@ -0,0 +1,1821 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "tsage/ringworld2/ringworld2_vampire.h"
+
+namespace TsAGE {
+
+namespace Ringworld2 {
+
+/*--------------------------------------------------------------------------
+ * Scene 1950 - Flup Tube Corridor Maze
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene1950::KeypadWindow::KeypadWindow() {
+	_buttonIndex = 0;
+}
+
+void Scene1950::KeypadWindow::synchronize(Serializer &s) {
+	SceneArea::synchronize(s);
+
+	s.syncAsSint16LE(_buttonIndex);
+}
+
+Scene1950::KeypadWindow::KeypadButton::KeypadButton() {
+	_buttonIndex = 0;
+	_pressed = false;
+	_toggled = false;
+}
+
+void Scene1950::KeypadWindow::KeypadButton::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_buttonIndex);
+	s.syncAsSint16LE(_pressed);
+	s.syncAsSint16LE(_toggled);
+}
+
+void Scene1950::KeypadWindow::KeypadButton::init(int indx) {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_buttonIndex = indx;
+	_pressed = false;
+	_toggled = false;
+
+	postInit();
+	setup(1971, 2, 1);
+	fixPriority(249);
+	setPosition(Common::Point(((_buttonIndex % 4) * 22) + 127, ((_buttonIndex / 4) * 19) + 71));
+	scene->_sceneAreas.push_front(this);
+}
+
+void Scene1950::KeypadWindow::KeypadButton::process(Event &event) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE)
+			&& (_bounds.contains(event.mousePos)) && !_pressed) {
+		R2_GLOBALS._sound2.play(227);
+		if (!_toggled) {
+			setFrame(2);
+			_toggled = true;
+		} else {
+			setFrame(1);
+			_toggled = false;
+		}
+		_pressed = true;
+		event.handled = true;
+	}
+
+	if ((event.eventType == EVENT_BUTTON_UP) && _pressed) {
+		_pressed = false;
+		event.handled = true;
+		Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+		scene->doButtonPress(_buttonIndex);
+	}
+}
+
+bool Scene1950::KeypadWindow::KeypadButton::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return false;
+	return SceneActor::startAction(action, event);
+}
+
+void Scene1950::KeypadWindow::remove() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	for (_buttonIndex = 0; _buttonIndex < 16; ++_buttonIndex) {
+		scene->_sceneAreas.remove(&_buttons[_buttonIndex]);
+		_buttons[_buttonIndex].remove();
+	}
+
+	ModalWindow::remove();
+
+	if (!R2_GLOBALS.getFlag(37))
+		R2_GLOBALS._sound2.play(278);
+
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	scene->_eastExit._enabled = true;
+
+	if (!R2_GLOBALS.getFlag(37)) {
+		if (R2_GLOBALS.getFlag(36)) {
+			scene->_sceneMode = 1964;
+			scene->setAction(&scene->_sequenceManager, scene, 1964, &R2_GLOBALS._player, NULL);
+		} else {
+			scene->_sceneMode = 1965;
+			scene->setAction(&scene->_sequenceManager, scene, 1965, &R2_GLOBALS._player, NULL);
+		}
+	}
+}
+
+void Scene1950::KeypadWindow::setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	if (R2_GLOBALS._player._mover)
+		R2_GLOBALS._player.addMover(NULL);
+	R2_GLOBALS._player._canWalk = false;
+
+	ModalWindow::setup2(visage, stripFrameNum, frameNum, posX, posY);
+
+	_object1.fixPriority(248);
+	scene->_eastExit._enabled = false;
+	setup3(1950, 27, 28, 27);
+
+	for (_buttonIndex = 0; _buttonIndex < 16; _buttonIndex++)
+		_buttons[_buttonIndex].init(_buttonIndex);
+}
+
+void Scene1950::KeypadWindow::setup3(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+	// Copy of Scene1200::LaserPanel::proc13()
+	_areaActor.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
+}
+
+/*--------------------------------------------------------------------------*/
+
+bool Scene1950::Keypad::startAction(CursorType action, Event &event) {
+	if ((action != CURSOR_USE) || (R2_GLOBALS.getFlag(37)))
+		return SceneHotspot::startAction(action, event);
+
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	if (R2_GLOBALS.getFlag(36)) {
+		scene->_sceneMode = 1962;
+		scene->setAction(&scene->_sequenceManager, scene, 1962, &R2_GLOBALS._player, NULL);
+	} else {
+		scene->_sceneMode = 1963;
+		scene->setAction(&scene->_sequenceManager, scene, 1963, &R2_GLOBALS._player, NULL);
+	}
+	return true;
+}
+
+bool Scene1950::Door::startAction(CursorType action, Event &event) {
+	if (action != R2_SCRITH_KEY)
+		return SceneActor::startAction(action, event);
+
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	R2_INVENTORY.setObjectScene(R2_SCRITH_KEY, 0);
+	scene->_sceneMode = 1958;
+	scene->setAction(&scene->_sequenceManager, scene, 1958, &R2_GLOBALS._player, &scene->_door, NULL);
+	return true;
+}
+
+bool Scene1950::Scrolls::startAction(CursorType action, Event &event) {
+	if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) != 1950))
+		return SceneActor::startAction(action, event);
+
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 1968;
+	scene->setAction(&scene->_sequenceManager, scene, 1968, &R2_GLOBALS._player, NULL);
+
+	return true;
+}
+
+bool Scene1950::Gem::startAction(CursorType action, Event &event) {
+	if ((action != CURSOR_USE) || (!R2_GLOBALS.getFlag(37)))
+		return SceneActor::startAction(action, event);
+
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 1967;
+	scene->setAction(&scene->_sequenceManager, scene, 1967, &R2_GLOBALS._player, NULL);
+
+	return true;
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene1950::Vampire::Vampire() {
+	_deadPosition = Common::Point(0, 0);
+	_deltaX = 0;
+	_deltaY = 0;
+	_vampireMode = 0;
+}
+
+void Scene1950::Vampire::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_deadPosition.x);
+	s.syncAsSint16LE(_deadPosition.y);
+	s.syncAsSint16LE(_deltaX);
+	s.syncAsSint16LE(_deltaY);
+	s.syncAsSint16LE(_vampireMode);
+}
+
+void Scene1950::Vampire::signal() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_vampireMode) {
+	case 19: {
+		_vampireMode = 0;
+		setVisage(1960);
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			setStrip(2);
+		else
+			setStrip(1);
+
+		NpcMover *mover = new NpcMover();
+		addMover(mover, &scene->_vampireDestPos, scene);
+		}
+		break;
+	case 20: {
+		// Non fatal shot
+		_vampireMode = 19;
+		R2_GLOBALS._player.setVisage(22);
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			R2_GLOBALS._player.setStrip(1);
+		else
+			R2_GLOBALS._player.setStrip(2);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._shotsRequired--;
+
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			_deadPosition.x = _position.x + 10;
+		else
+			_deadPosition.x = _position.x - 10;
+		_deadPosition.y = _position.y - 4;
+
+		setVisage(1961);
+
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			setStrip(2);
+		else
+			setStrip(1);
+
+		animate(ANIM_MODE_2, NULL);
+		Common::Point pt = _deadPosition;
+		PlayerMover *mover = new PlayerMover();
+		addMover(mover, &pt, this);
+
+		R2_GLOBALS._player.enableControl();
+		}
+		break;
+	case 21: {
+		// Fatal shot
+		R2_GLOBALS._player.setVisage(22);
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			R2_GLOBALS._player.setStrip(1);
+		else
+			R2_GLOBALS._player.setStrip(2);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+
+		setVisage(1961);
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			setStrip(4);
+		else
+			setStrip(3);
+		setDetails(1950, 15, -1, 17, 2, (SceneItem *) NULL);
+		addMover(NULL);
+		_numFrames = 8;
+		R2_GLOBALS._sound2.play(226);
+		animate(ANIM_MODE_5, NULL);
+		fixPriority(10);
+
+		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._isAlive = false;
+		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._shotsRequired--;
+		R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._position = _position;
+		_deltaX = (_position.x - R2_GLOBALS._player._position.x) / 2;
+		_deltaY = (_position.y - R2_GLOBALS._player._position.y) / 2;
+
+		byte vampireCount = 0;
+		for (byte i = 0; i < 18; ++i) {
+			if (!R2_GLOBALS._vampireData[i]._isAlive)
+				++vampireCount;
+		}
+
+		if (vampireCount == 18) {
+			R2_GLOBALS.setFlag(36);
+			_vampireMode = 23;
+			Common::Point pt(R2_GLOBALS._player._position.x + _deltaX, R2_GLOBALS._player._position.y + _deltaY);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else if (vampireCount == 1) {
+			_vampireMode = 22;
+			Common::Point pt(R2_GLOBALS._player._position.x + _deltaX, R2_GLOBALS._player._position.y + _deltaY);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else {
+			R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		}
+
+		if (R2_GLOBALS._flubMazeEntryDirection == 3)
+			scene->_eastExit._enabled = true;
+		else
+			scene->_westExit._enabled = true;
+
+		scene->_vampireActive = false;
+		}
+		break;
+	case 22:
+		SceneItem::display(1950, 18, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		break;
+	case 23:
+		SceneItem::display(1950, 25, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		scene->_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+		scene->setAction(&scene->_sequenceManager, scene, 1960, &R2_GLOBALS._player, NULL);
+		break;
+	default:
+		break;
+	}
+}
+
+bool Scene1950::Vampire::startAction(CursorType action, Event &event) {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._isAlive ||
+			(action != R2_PHOTON_STUNNER))
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS._vampireData[scene->_vampireIndex - 1]._shotsRequired <= 1)
+		_vampireMode = 21;
+	else
+		_vampireMode = 20;
+
+	R2_GLOBALS._player.setVisage(25);
+	if (R2_GLOBALS._flubMazeEntryDirection == 3)
+		R2_GLOBALS._player.setStrip(2);
+	else
+		R2_GLOBALS._player.setStrip(1);
+	R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+	R2_GLOBALS._sound3.play(99);
+
+	return true;
+}
+
+/*--------------------------------------------------------------------------*/
+
+void Scene1950::NorthExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 1;
+	scene->_sceneMode = 11;
+
+	Common::Point pt(160, 127);
+	PlayerMover *mover = new PlayerMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1950::UpExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 2;
+	scene->_sceneMode = 12;
+
+	if (!scene->_upExitStyle) {
+		if (R2_GLOBALS.getFlag(36))
+			scene->setAction(&scene->_sequenceManager, scene, 1953, &R2_GLOBALS._player, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager, scene, 1970, &R2_GLOBALS._player, NULL);
+	} else {
+		if (R2_GLOBALS.getFlag(36))
+			scene->setAction(&scene->_sequenceManager, scene, 1952, &R2_GLOBALS._player, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager, scene, 1969, &R2_GLOBALS._player, NULL);
+	}
+}
+
+void Scene1950::EastExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 3;
+	scene->_sceneMode = 13;
+
+	if (scene->_vampireActive)
+		R2_GLOBALS._player.animate(ANIM_MODE_9);
+
+	Common::Point pt(340, 160);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1950::DownExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 4;
+	scene->_sceneMode = 14;
+
+	if (R2_GLOBALS.getFlag(36))
+		scene->setAction(&scene->_sequenceManager, scene, 1956, &R2_GLOBALS._player, NULL);
+	else
+		scene->setAction(&scene->_sequenceManager, scene, 1973, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1950::SouthExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 5;
+	scene->_sceneMode = 15;
+
+	Common::Point pt(160, 213);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1950::WestExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 6;
+
+	if (R2_GLOBALS._flubMazeArea == 2) {
+		// In the very first corridor area after the Scrith Door
+		if ((R2_GLOBALS.getFlag(36)) && (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 2) && (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2)) {
+			scene->_sceneMode = 1961;
+			Common::Point pt(-20, 160);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+		} else {
+			if (!R2_GLOBALS.getFlag(36))
+				SceneItem::display(1950, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+			if ((R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950) || (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 1950))
+				SceneItem::display(1950, 34, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+			scene->_sceneMode = 0;
+			Common::Point pt(30, 160);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+		}
+	} else {
+		if (scene->_vampireActive)
+			R2_GLOBALS._player.animate(ANIM_MODE_9);
+
+		scene->_sceneMode = 16;
+		Common::Point pt(-20, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, scene);
+	}
+}
+
+void Scene1950::ShaftExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 0;
+	scene->_sceneMode = 1951;
+	scene->setAction(&scene->_sequenceManager, scene, 1951, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1950::DoorExit::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
+	R2_GLOBALS._flubMazeEntryDirection = 3;
+	if (R2_GLOBALS._player._visage == 22) {
+		scene->_sceneMode = 1975;
+		scene->setAction(&scene->_sequenceManager, scene, 1975, &R2_GLOBALS._player, NULL);
+	} else {
+		SceneItem::display(1950, 22, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		R2_GLOBALS._flubMazeEntryDirection = 0;
+		scene->_sceneMode = 0;
+		Common::Point pt(250, 150);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, scene);
+		_enabled = true;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene1950::Scene1950() {
+	_upExitStyle = false;
+	_removeFlag = false;
+	_vampireActive = false;
+	_vampireDestPos = Common::Point(0, 0);
+	_vampireIndex = 0;
+}
+
+void Scene1950::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_upExitStyle);
+	s.syncAsSint16LE(_removeFlag);
+	s.syncAsSint16LE(_vampireActive);
+	s.syncAsSint16LE(_vampireDestPos.x);
+	s.syncAsSint16LE(_vampireDestPos.y);
+	s.syncAsSint16LE(_vampireIndex);
+}
+
+void Scene1950::initArea() {
+	_northExit._enabled = false;
+	_upExit._enabled = false;
+	_eastExit._enabled = false;
+	_downExit._enabled = false;
+	_southExit._enabled = false;
+	_westExit._enabled = false;
+	_shaftExit._enabled = false;
+	_doorExit._enabled = false;
+	_northExit._insideArea = false;
+	_upExit._insideArea = false;
+	_eastExit._insideArea = false;
+	_downExit._insideArea = false;
+	_southExit._insideArea = false;
+	_westExit._insideArea = false;
+	_shaftExit._insideArea = false;
+	_doorExit._insideArea = false;
+	_northExit._moving = false;
+	_upExit._moving = false;
+	_eastExit._moving = false;
+	_downExit._moving = false;
+	_southExit._moving = false;
+	_westExit._moving = false;
+	_shaftExit._moving = false;
+	_doorExit._moving = false;
+	_upExitStyle = false;
+
+	switch (R2_GLOBALS._flubMazeArea - 1) {
+	case 0:
+		loadScene(1948);
+		break;
+	case 1:
+	// No break on purpose
+	case 8:
+	// No break on purpose
+	case 10:
+	// No break on purpose
+	case 12:
+	// No break on purpose
+	case 16:
+	// No break on purpose
+	case 19:
+	// No break on purpose
+	case 23:
+	// No break on purpose
+	case 30:
+	// No break on purpose
+	case 44:
+	// No break on purpose
+	case 72:
+	// No break on purpose
+	case 74:
+	// No break on purpose
+	case 86:
+	// No break on purpose
+	case 96:
+	// No break on purpose
+	case 103:
+		loadScene(1950);
+		break;
+	case 2:
+	// No break on purpose
+	case 29:
+		loadScene(1965);
+		break;
+	case 3:
+	// No break on purpose
+	case 9:
+	// No break on purpose
+	case 11:
+	// No break on purpose
+	case 15:
+	// No break on purpose
+	case 24:
+	// No break on purpose
+	case 39:
+	// No break on purpose
+	case 45:
+	// No break on purpose
+	case 71:
+	// No break on purpose
+	case 73:
+	// No break on purpose
+	case 75:
+	// No break on purpose
+	case 79:
+	// No break on purpose
+	case 85:
+	// No break on purpose
+	case 87:
+	// No break on purpose
+	case 95:
+		loadScene(1955);
+		break;
+	case 4:
+	// No break on purpose
+	case 6:
+	// No break on purpose
+	case 13:
+	// No break on purpose
+	case 27:
+	// No break on purpose
+	case 41:
+	// No break on purpose
+	case 48:
+	// No break on purpose
+	case 50:
+	// No break on purpose
+	case 54:
+	// No break on purpose
+	case 76:
+	// No break on purpose
+	case 80:
+	// No break on purpose
+	case 90:
+	// No break on purpose
+	case 104:
+		loadScene(1975);
+		break;
+	case 5:
+	// No break on purpose
+	case 7:
+	// No break on purpose
+	case 14:
+	// No break on purpose
+	case 28:
+	// No break on purpose
+	case 32:
+	// No break on purpose
+	case 47:
+	// No break on purpose
+	case 53:
+		loadScene(1997);
+		break;
+	case 17:
+	// No break on purpose
+	case 20:
+	// No break on purpose
+	case 25:
+	// No break on purpose
+	case 31:
+	// No break on purpose
+	case 33:
+	// No break on purpose
+	case 46:
+		loadScene(1995);
+		break;
+	case 18:
+	// No break on purpose
+	case 22:
+	// No break on purpose
+	case 26:
+	// No break on purpose
+	case 36:
+	// No break on purpose
+	case 38:
+	// No break on purpose
+	case 43:
+	// No break on purpose
+	case 51:
+	// No break on purpose
+	case 70:
+	// No break on purpose
+	case 78:
+	// No break on purpose
+	case 84:
+	// No break on purpose
+	case 89:
+	// No break on purpose
+	case 101:
+		loadScene(1970);
+		break;
+	case 21:
+	// No break on purpose
+	case 34:
+	// No break on purpose
+	case 57:
+	// No break on purpose
+	case 58:
+	// No break on purpose
+	case 59:
+	// No break on purpose
+	case 62:
+	// No break on purpose
+	case 65:
+		loadScene(1980);
+		break;
+	case 35:
+	// No break on purpose
+	case 61:
+	// No break on purpose
+	case 77:
+	// No break on purpose
+	case 83:
+		loadScene(1982);
+		break;
+	case 37:
+	// No break on purpose
+	case 52:
+	// No break on purpose
+	case 82:
+	// No break on purpose
+	case 88:
+	// No break on purpose
+	case 92:
+	// No break on purpose
+	case 97:
+	// No break on purpose
+	case 100:
+		loadScene(1962);
+		break;
+	case 40:
+	// No break on purpose
+	case 102:
+		loadScene(1960);
+		break;
+	case 42:
+	// No break on purpose
+	case 55:
+	// No break on purpose
+	case 60:
+	// No break on purpose
+	case 66:
+	// No break on purpose
+	case 68:
+	// No break on purpose
+	case 69:
+	// No break on purpose
+	case 93:
+	// No break on purpose
+	case 98:
+		loadScene(1990);
+		break;
+	case 49:
+	// No break on purpose
+	case 81:
+	// No break on purpose
+	case 91:
+	// No break on purpose
+	case 94:
+	// No break on purpose
+	case 99:
+		loadScene(1967);
+		break;
+	case 56:
+	// No break on purpose
+	case 63:
+	// No break on purpose
+	case 64:
+	// No break on purpose
+	case 67:
+		loadScene(1985);
+		_upExitStyle = true;
+		break;
+	default:
+		break;
+	}
+
+	if (R2_GLOBALS._flubMazeArea != 1)
+		R2_GLOBALS._walkRegions.load(1950);
+
+	switch (R2_GLOBALS._flubMazeArea - 1) {
+	case 0:
+		_shaftExit._enabled = true;
+		if ((R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0) && (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950))
+			_doorExit._enabled = true;
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+		R2_GLOBALS._walkRegions.disableRegion(5);
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		break;
+	case 1:
+	// No break on purpose
+	case 2:
+	// No break on purpose
+	case 3:
+	// No break on purpose
+	case 8:
+	// No break on purpose
+	case 9:
+	// No break on purpose
+	case 10:
+	// No break on purpose
+	case 11:
+	// No break on purpose
+	case 12:
+	// No break on purpose
+	case 15:
+	// No break on purpose
+	case 16:
+	// No break on purpose
+	case 19:
+	// No break on purpose
+	case 23:
+	// No break on purpose
+	case 24:
+	// No break on purpose
+	case 29:
+	// No break on purpose
+	case 30:
+	// No break on purpose
+	case 39:
+	// No break on purpose
+	case 40:
+	// No break on purpose
+	case 44:
+	// No break on purpose
+	case 45:
+	// No break on purpose
+	case 71:
+	// No break on purpose
+	case 72:
+	// No break on purpose
+	case 73:
+	// No break on purpose
+	case 74:
+	// No break on purpose
+	case 75:
+	// No break on purpose
+	case 79:
+	// No break on purpose
+	case 85:
+	// No break on purpose
+	case 86:
+	// No break on purpose
+	case 87:
+	// No break on purpose
+	case 95:
+	// No break on purpose
+	case 96:
+	// No break on purpose
+	case 102:
+	// No break on purpose
+	case 103:
+		_eastExit._enabled = true;
+		_westExit._enabled = true;
+		break;
+	case 4:
+	// No break on purpose
+	case 6:
+	// No break on purpose
+	case 13:
+	// No break on purpose
+	case 17:
+	// No break on purpose
+	case 20:
+	// No break on purpose
+	case 25:
+	// No break on purpose
+	case 27:
+	// No break on purpose
+	case 31:
+	// No break on purpose
+	case 33:
+	// No break on purpose
+	case 37:
+	// No break on purpose
+	case 41:
+	// No break on purpose
+	case 46:
+	// No break on purpose
+	case 48:
+	// No break on purpose
+	case 50:
+	// No break on purpose
+	case 52:
+	// No break on purpose
+	case 54:
+	// No break on purpose
+	case 76:
+	// No break on purpose
+	case 80:
+	// No break on purpose
+	case 82:
+	// No break on purpose
+	case 88:
+	// No break on purpose
+	case 90:
+	// No break on purpose
+	case 92:
+	// No break on purpose
+	case 97:
+	// No break on purpose
+	case 100:
+	// No break on purpose
+	case 104:
+		_westExit._enabled = true;
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		R2_GLOBALS._walkRegions.disableRegion(9);
+		break;
+	case 5:
+	// No break on purpose
+	case 7:
+	// No break on purpose
+	case 14:
+	// No break on purpose
+	case 18:
+	// No break on purpose
+	case 22:
+	// No break on purpose
+	case 26:
+	// No break on purpose
+	case 28:
+	// No break on purpose
+	case 32:
+	// No break on purpose
+	case 36:
+	// No break on purpose
+	case 38:
+	// No break on purpose
+	case 43:
+	// No break on purpose
+	case 47:
+	// No break on purpose
+	case 49:
+	// No break on purpose
+	case 51:
+	// No break on purpose
+	case 53:
+	// No break on purpose
+	case 70:
+	// No break on purpose
+	case 78:
+	// No break on purpose
+	case 81:
+	// No break on purpose
+	case 84:
+	// No break on purpose
+	case 89:
+	// No break on purpose
+	case 91:
+	// No break on purpose
+	case 94:
+	// No break on purpose
+	case 99:
+	// No break on purpose
+	case 101:
+		_eastExit._enabled = true;
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(7);
+		R2_GLOBALS._walkRegions.disableRegion(13);
+		break;
+	default:
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		R2_GLOBALS._walkRegions.disableRegion(7);
+		R2_GLOBALS._walkRegions.disableRegion(9);
+		R2_GLOBALS._walkRegions.disableRegion(13);
+		break;
+	}
+
+	_northDoorway.remove();
+	_northDoorway.removeObject();
+	_southDoorway.remove();
+
+	switch (R2_GLOBALS._flubMazeArea - 4) {
+	case 0:
+	// No break on purpose
+	case 3:
+	// No break on purpose
+	case 16:
+	// No break on purpose
+	case 22:
+	// No break on purpose
+	case 24:
+	// No break on purpose
+	case 32:
+	// No break on purpose
+	case 33:
+	// No break on purpose
+	case 45:
+	// No break on purpose
+	case 46:
+	// No break on purpose
+	case 48:
+	// No break on purpose
+	case 51:
+	// No break on purpose
+	case 56:
+	// No break on purpose
+	case 59:
+	// No break on purpose
+	case 67:
+	// No break on purpose
+	case 68:
+	// No break on purpose
+	case 70:
+	// No break on purpose
+	case 73:
+	// No break on purpose
+	case 82:
+	// No break on purpose
+	case 90:
+		_northExit._enabled = true;
+		_northDoorway.setup(1950, (R2_GLOBALS._flubMazeArea % 2) + 1, 1, 160, 137, 25);
+		//visage,strip,frame,px,py,priority,effect
+		_southDoorway.postInit();
+		_southDoorway.setVisage(1950);
+		_southDoorway.setStrip((((R2_GLOBALS._flubMazeArea - 1) / 35) % 2) + 1);
+		_southDoorway.setFrame(2);
+		_southDoorway.setPosition(Common::Point(160, 167));
+		_southDoorway.fixPriority(220);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+		break;
+	case 7:
+	// No break on purpose
+	case 10:
+	// No break on purpose
+	case 23:
+	// No break on purpose
+	case 29:
+	// No break on purpose
+	case 31:
+	// No break on purpose
+	case 39:
+	// No break on purpose
+	case 40:
+	// No break on purpose
+	case 52:
+	// No break on purpose
+	case 53:
+	// No break on purpose
+	case 55:
+	// No break on purpose
+	case 63:
+	// No break on purpose
+	case 65:
+	// No break on purpose
+	case 66:
+	// No break on purpose
+	case 75:
+	// No break on purpose
+	case 77:
+	// No break on purpose
+	case 81:
+	// No break on purpose
+	case 87:
+	// No break on purpose
+	case 89:
+	// No break on purpose
+	case 97:
+		_southExit._enabled = true;
+
+		_southDoorway.postInit();
+		_southDoorway.setVisage(1950);
+		_southDoorway.setStrip((((R2_GLOBALS._flubMazeArea - 1) / 35) % 2) + 1);
+		_southDoorway.setFrame(3);
+		_southDoorway.setPosition(Common::Point(160, 167));
+		_southDoorway.fixPriority(220);
+		break;
+	case 58:
+	// No break on purpose
+	case 74:
+	// No break on purpose
+	case 80:
+		_northExit._enabled = true;
+		_southExit._enabled = true;
+
+		_northDoorway.setup(1950, (R2_GLOBALS._flubMazeArea % 2) + 1, 1, 160, 137, 25);
+
+		_southDoorway.postInit();
+		_southDoorway.setVisage(1950);
+		_southDoorway.setStrip((((R2_GLOBALS._flubMazeArea - 1) / 35) % 2) + 1);
+		_southDoorway.setFrame(3);
+		_southDoorway.setPosition(Common::Point(160, 167));
+		_southDoorway.fixPriority(220);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+		break;
+	default:
+		_southDoorway.postInit();
+		_southDoorway.setVisage(1950);
+		_southDoorway.setStrip(((R2_GLOBALS._flubMazeArea - 1) / 35) % 2 + 1);
+		_southDoorway.setFrame(2);
+		_southDoorway.setPosition(Common::Point(160, 167));
+		_southDoorway.fixPriority(220);
+		break;
+	}
+
+	switch (R2_GLOBALS._flubMazeArea - 3) {
+	case 0:
+	// No break on purpose
+	case 3:
+	// No break on purpose
+	case 5:
+	// No break on purpose
+	case 12:
+	// No break on purpose
+	case 15:
+	// No break on purpose
+	case 18:
+	// No break on purpose
+	case 19:
+	// No break on purpose
+	case 23:
+	// No break on purpose
+	case 26:
+	// No break on purpose
+	case 27:
+	// No break on purpose
+	case 29:
+	// No break on purpose
+	case 30:
+	// No break on purpose
+	case 31:
+	// No break on purpose
+	case 32:
+	// No break on purpose
+	case 44:
+	// No break on purpose
+	case 45:
+	// No break on purpose
+	case 51:
+	// No break on purpose
+	case 55:
+	// No break on purpose
+	case 56:
+	// No break on purpose
+	case 57:
+	// No break on purpose
+	case 60:
+	// No break on purpose
+	case 63:
+		_upExit._enabled = true;
+		break;
+	case 54:
+	// No break on purpose
+	case 61:
+	// No break on purpose
+	case 62:
+	// No break on purpose
+	case 65:
+		_upExit._enabled = true;
+	// No break on purpose
+	case 35:
+	// No break on purpose
+	case 38:
+	// No break on purpose
+	case 40:
+	// No break on purpose
+	case 47:
+	// No break on purpose
+	case 50:
+	// No break on purpose
+	case 53:
+	// No break on purpose
+	case 58:
+	// No break on purpose
+	case 64:
+	// No break on purpose
+	case 66:
+	// No break on purpose
+	case 67:
+	// No break on purpose
+	case 79:
+	// No break on purpose
+	case 80:
+	// No break on purpose
+	case 86:
+	// No break on purpose
+	case 89:
+	// No break on purpose
+	case 90:
+	// No break on purpose
+	case 91:
+	// No break on purpose
+	case 92:
+	// No break on purpose
+	case 95:
+	// No break on purpose
+	case 96:
+	// No break on purpose
+	case 97:
+	// No break on purpose
+	case 98:
+	// No break on purpose
+	case 100:
+		_downExit._enabled = true;
+		R2_GLOBALS._walkRegions.disableRegion(4);
+		R2_GLOBALS._walkRegions.disableRegion(5);
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		R2_GLOBALS._walkRegions.disableRegion(10);
+		R2_GLOBALS._walkRegions.disableRegion(11);
+	default:
+		break;
+	}
+	R2_GLOBALS._uiElements.draw();
+}
+
+void Scene1950::enterArea() {
+	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+
+	_vampire.remove();
+	_door.remove();
+	_scrolls.remove();
+
+	_vampireActive = false;
+	_vampireIndex = 0;
+
+	// Certain areas have a vampire in them
+	switch (R2_GLOBALS._flubMazeArea) {
+	case 10:
+		_vampireIndex = 1;
+		break;
+	case 13:
+		_vampireIndex = 2;
+		break;
+	case 16:
+		_vampireIndex = 3;
+		break;
+	case 17:
+		_vampireIndex = 4;
+		break;
+	case 24:
+		_vampireIndex = 5;
+		break;
+	case 25:
+		_vampireIndex = 6;
+		break;
+	case 31:
+		_vampireIndex = 7;
+		break;
+	case 40:
+		_vampireIndex = 8;
+		break;
+	case 45:
+		_vampireIndex = 9;
+		break;
+	case 46:
+		_vampireIndex = 10;
+		break;
+	case 73:
+		_vampireIndex = 11;
+		break;
+	case 75:
+		_vampireIndex = 12;
+		break;
+	case 80:
+		_vampireIndex = 13;
+		break;
+	case 87:
+		_vampireIndex = 14;
+		break;
+	case 88:
+		_vampireIndex = 15;
+		break;
+	case 96:
+		_vampireIndex = 16;
+		break;
+	case 97:
+		_vampireIndex = 17;
+		break;
+	case 104:
+		_vampireIndex = 18;
+		break;
+	default:
+		break;
+	}
+
+	if (_vampireIndex != 0) {
+		_vampire.postInit();
+		_vampire._numFrames = 6;
+		_vampire._moveRate = 6;
+		_vampire._moveDiff = Common::Point(3, 2);
+		_vampire._effect = EFFECT_SHADED;
+
+		if (!R2_GLOBALS._vampireData[_vampireIndex - 1]._isAlive) {
+			// Show vampire ashes
+			_vampire.setPosition(Common::Point(R2_GLOBALS._vampireData[_vampireIndex - 1]._position));
+			_vampire.animate(ANIM_MODE_NONE, NULL);
+			_vampire.addMover(NULL);
+			_vampire.setVisage(1961);
+			_vampire.setStrip(4);
+			_vampire.setFrame(10);
+			_vampire.fixPriority(10);
+			_vampire.setDetails(1950, 15, -1, 17, 2, (SceneItem *) NULL);
+		} else {
+			// Start the vampire
+			_vampire.setVisage(1960);
+			_vampire.setPosition(Common::Point(160, 130));
+			_vampire.animate(ANIM_MODE_2, NULL);
+			_vampire.setDetails(1950, 12, -1, 14, 2, (SceneItem *) NULL);
+			_vampireActive = true;
+		}
+	}
+	if ((R2_GLOBALS._flubMazeArea == 1) && (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) != 0)) {
+		// Show doorway at the right hand side of the very first flub corridor
+		_door.postInit();
+		_door.setVisage(1948);
+		_door.setStrip(3);
+		_door.setPosition(Common::Point(278, 155));
+		_door.fixPriority(100);
+		_door.setDetails(1950, 19, 20, 23, 2, (SceneItem *) NULL);
+	}
+
+	if (R2_GLOBALS._flubMazeArea == 102) {
+		R2_GLOBALS._walkRegions.load(1951);
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(5);
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		R2_GLOBALS._walkRegions.disableRegion(7);
+
+		_cube.postInit();
+		_cube.setVisage(1970);
+		_cube.setStrip(1);
+		if (R2_GLOBALS.getFlag(37))
+			_cube.setFrame(3);
+		else
+			_cube.setFrame(1);
+		_cube.setPosition(Common::Point(193, 158));
+		_cube.setDetails(1950, 3, 4, 5, 2, (SceneItem *) NULL);
+
+		_pulsingLights.postInit();
+		_pulsingLights.setVisage(1970);
+		_pulsingLights.setStrip(3);
+		_pulsingLights.animate(ANIM_MODE_2, NULL);
+		_pulsingLights._numFrames = 6;
+		_pulsingLights.setPosition(Common::Point(194, 158));
+		_pulsingLights.fixPriority(159);
+
+		_keypad.setDetails(Rect(188, 124, 199, 133), 1950, 27, 28, -1, 2, NULL);
+
+		if (R2_INVENTORY.getObjectScene(R2_SAPPHIRE_BLUE) == 1950) {
+			_gem.postInit();
+			_gem.setVisage(1970);
+			_gem.setStrip(1);
+			_gem.setFrame(2);
+			_gem.fixPriority(160);
+		}
+
+		if (R2_GLOBALS.getFlag(37)) {
+			_gem.setPosition(Common::Point(192, 118));
+			_gem.setDetails(1950, 9, 4, -1, 2, (SceneItem *) NULL);
+		} else {
+			_containmentField.postInit();
+			_containmentField.setVisage(1970);
+			_containmentField.setStrip(4);
+			_containmentField._numFrames = 4;
+			_containmentField.animate(ANIM_MODE_8, 0, NULL);
+			_containmentField.setPosition(Common::Point(192, 121));
+			_containmentField.fixPriority(159);
+			_containmentField.setDetails(1950, 6, 7, 8, 2, (SceneItem *) NULL);
+
+			_gem.setPosition(Common::Point(192, 109));
+			_gem.setDetails(1950, 9, 7, 8, 2, (SceneItem *) NULL);
+		}
+
+		_scrolls.postInit();
+		_scrolls.setVisage(1972);
+		_scrolls.setStrip(1);
+		_scrolls.setPosition(Common::Point(76, 94));
+		_scrolls.fixPriority(25);
+		_scrolls.setDetails(1950, 30, -1, -1, 2, (SceneItem *) NULL);
+		if (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2)
+			_scrolls.setFrame(2);
+		else
+			_scrolls.setFrame(1);
+
+		_removeFlag = true;
+	} else if (_removeFlag) {
+		_cube.remove();
+		_containmentField.remove();
+		_gem.remove();
+		_pulsingLights.remove();
+		_scrolls.remove();
+
+		R2_GLOBALS._sceneItems.remove(&_background);
+		_background.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 2, NULL);
+
+		_removeFlag = false;
+	}
+
+	switch (R2_GLOBALS._flubMazeEntryDirection) {
+	case 0:
+		_sceneMode = 1950;
+		if (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0)
+			// The original uses CURSOR_ARROW. CURSOR_WALK is much more coherent
+			R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		else
+			setAction(&_sequenceManager, this, 1950, &R2_GLOBALS._player, NULL);
+
+		break;
+	case 1: {
+		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+		R2_GLOBALS._player.setPosition(Common::Point(160, 213));
+		Common::Point pt(160, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 2:
+		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+		if (R2_GLOBALS.getFlag(36))
+			setAction(&_sequenceManager, this, 1957, &R2_GLOBALS._player, NULL);
+		else
+			setAction(&_sequenceManager, this, 1974, &R2_GLOBALS._player, NULL);
+		break;
+	case 3:
+		// Entering from the left
+		if (!_vampireActive) {
+			_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+			R2_GLOBALS._player.setPosition(Common::Point(-20, 160));
+			Common::Point pt(30, 160);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else {
+			_sceneMode = 18;
+			_eastExit._enabled = false;
+			_vampireDestPos = Common::Point(60, 152);
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+
+			_vampire.setStrip(2);
+			NpcMover *mover = new NpcMover();
+			_vampire.addMover(mover, &_vampireDestPos, this);
+
+			R2_GLOBALS._player.setPosition(Common::Point(-20, 160));
+			Common::Point pt2(30, 160);
+			NpcMover *mover2 = new NpcMover();
+			R2_GLOBALS._player.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 4:
+		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+		if (!_upExitStyle) {
+			if (R2_GLOBALS.getFlag(36))
+				setAction(&_sequenceManager, this, 1955, &R2_GLOBALS._player, NULL);
+			else
+				setAction(&_sequenceManager, this, 1972, &R2_GLOBALS._player, NULL);
+		} else {
+			if (R2_GLOBALS.getFlag(36))
+				setAction(&_sequenceManager, this, 1954, &R2_GLOBALS._player, NULL);
+			else
+				setAction(&_sequenceManager, this, 1971, &R2_GLOBALS._player, NULL);
+		}
+		break;
+	case 5: {
+		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+		R2_GLOBALS._player.setPosition(Common::Point(160, 127));
+		Common::Point pt(160, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 6:
+		// Entering from the right
+		if (!_vampireActive) {
+			_sceneMode = R2_GLOBALS._flubMazeEntryDirection;
+			if (R2_GLOBALS._flubMazeArea == 1) {
+				setAction(&_sequenceManager, this, 1961, &R2_GLOBALS._player, NULL);
+			} else {
+				R2_GLOBALS._player.setPosition(Common::Point(340, 160));
+				Common::Point pt(289, 160);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+		} else {
+			_sceneMode = 17;
+			_westExit._enabled = false;
+			_vampireDestPos = Common::Point(259, 152);
+
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+
+			_vampire.setStrip(1);
+			NpcMover *mover = new NpcMover();
+			_vampire.addMover(mover, &_vampireDestPos, this);
+
+			R2_GLOBALS._player.setPosition(Common::Point(340, 160));
+			Common::Point pt2(289, 160);
+			NpcMover *mover2 = new NpcMover();
+			R2_GLOBALS._player.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1950::doButtonPress(int indx) {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	R2_GLOBALS._player.disableControl();
+
+	int prevIndex = indx - 1;
+	if ((indx / 4) == (prevIndex / 4)) {
+		if (prevIndex < 0)
+			prevIndex = 3;
+	} else {
+		prevIndex += 4;
+	}
+
+	assert(prevIndex >= 0 && prevIndex < 16);
+	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
+		_KeypadWindow._buttons[prevIndex].setFrame(2);
+		_KeypadWindow._buttons[prevIndex]._toggled = true;
+	} else {
+		_KeypadWindow._buttons[prevIndex].setFrame(1);
+		_KeypadWindow._buttons[prevIndex]._toggled = false;
+	}
+
+	prevIndex = indx + 1;
+	if ((indx / 4) == (prevIndex / 4)) {
+		if (prevIndex >  15)
+			prevIndex = 12;
+	} else {
+		prevIndex -= 4;
+	}
+
+	assert(prevIndex >= 0 && prevIndex < 16);
+	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
+		_KeypadWindow._buttons[prevIndex].setFrame(2);
+		_KeypadWindow._buttons[prevIndex]._toggled = true;
+	} else {
+		_KeypadWindow._buttons[prevIndex].setFrame(1);
+		_KeypadWindow._buttons[prevIndex]._toggled = false;
+	}
+
+	prevIndex = indx - 4;
+	if (prevIndex < 0)
+		prevIndex += 16;
+
+	assert(prevIndex >= 0 && prevIndex < 16);
+	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
+		_KeypadWindow._buttons[prevIndex].setFrame(2);
+		_KeypadWindow._buttons[prevIndex]._toggled = true;
+	} else {
+		_KeypadWindow._buttons[prevIndex].setFrame(1);
+		_KeypadWindow._buttons[prevIndex]._toggled = false;
+	}
+
+	prevIndex = indx + 4;
+	if (prevIndex > 15)
+		prevIndex -= 16;
+
+	assert(prevIndex >= 0 && prevIndex < 16);
+	if (!_KeypadWindow._buttons[prevIndex]._toggled) {
+		_KeypadWindow._buttons[prevIndex].setFrame(2);
+		_KeypadWindow._buttons[prevIndex]._toggled = true;
+	} else {
+		_KeypadWindow._buttons[prevIndex].setFrame(1);
+		_KeypadWindow._buttons[prevIndex]._toggled = false;
+	}
+
+	// Check whether all the buttons are highlighted
+	int cpt = 0;
+	for (prevIndex = 0; prevIndex < 16; prevIndex++) {
+		if (_KeypadWindow._buttons[prevIndex]._toggled)
+			++cpt;
+	}
+
+	if (cpt != 16) {
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+	} else {
+		R2_GLOBALS.setFlag(37);
+		_sceneMode = 24;
+		setAction(&_sequenceManager, scene, 1976, NULL);
+	}
+}
+
+void Scene1950::postInit(SceneObjectList *OwnerList) {
+	_upExitStyle = false;
+	_removeFlag = false;
+	_vampireActive = false;
+	_vampireIndex = 0;
+	if (R2_GLOBALS._sceneManager._previousScene == 300)
+		R2_GLOBALS._flubMazeArea = 103;
+
+	initArea();
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(105);
+
+	_northExit.setDetails(Rect(130, 46, 189, 135), SHADECURSOR_UP, 1950);
+	_northExit.setDest(Common::Point(160, 145));
+
+	_upExit.setDetails(Rect(208, 0, 255, 73), EXITCURSOR_N, 1950);
+	_upExit.setDest(Common::Point(200, 151));
+
+	_eastExit.setDetails(Rect(305, 95, 320, 147), EXITCURSOR_E, 1950);
+	_eastExit.setDest(Common::Point(312, 160));
+
+	_downExit.setDetails(Rect(208, 99, 255, 143), EXITCURSOR_S, 1950);
+	_downExit.setDest(Common::Point(200, 151));
+
+	_southExit.setDetails(Rect(113, 154, 206, 168), SHADECURSOR_DOWN, 1950);
+	_southExit.setDest(Common::Point(160, 165));
+
+	_westExit.setDetails(Rect(0, 95, 14, 147), EXITCURSOR_W, 1950);
+	_westExit.setDest(Common::Point(7, 160));
+
+	_shaftExit.setDetails(Rect(72, 54, 120, 128), EXITCURSOR_NW, 1950);
+	_shaftExit.setDest(Common::Point(120, 140));
+
+	_doorExit.setDetails(Rect(258, 60, 300, 145), EXITCURSOR_NE, 1950);
+	_doorExit.setDest(Common::Point(268, 149));
+
+	R2_GLOBALS._player.postInit();
+	if ( (R2_INVENTORY.getObjectScene(R2_TANNER_MASK) == 0) && (R2_INVENTORY.getObjectScene(R2_PURE_GRAIN_ALCOHOL) == 0)
+		&& (R2_INVENTORY.getObjectScene(R2_SOAKED_FACEMASK) == 0) && (!R2_GLOBALS.getFlag(36)) )
+		R2_GLOBALS._player.setVisage(22);
+	else
+		R2_GLOBALS._player.setVisage(20);
+
+	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	_background.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 1, NULL);
+
+	enterArea();
+}
+
+void Scene1950::remove() {
+	R2_GLOBALS._sound1.stop();
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene1950::signal() {
+	switch (_sceneMode) {
+	case 11:
+		R2_GLOBALS._flubMazeArea += 7;
+		initArea();
+		enterArea();
+		break;
+	case 12:
+		// Moving up a ladder within the Flub maze
+		R2_GLOBALS._flubMazeArea += 35;
+		initArea();
+		enterArea();
+		break;
+	case 1975:
+		SceneItem::display(1950, 21, SET_WIDTH, 280, SET_X, 160, SET_POS_MODE, 1,
+			SET_Y, 20, SET_EXT_BGCOLOR, 7, LIST_END);
+	// No break on purpose
+	case 13:
+		// Moving east within the Flub maze
+		++R2_GLOBALS._flubMazeArea;
+		initArea();
+		enterArea();
+		break;
+	case 14:
+		// Moving down a ladder within the Flub maze
+		R2_GLOBALS._flubMazeArea -= 35;
+		initArea();
+		enterArea();
+		break;
+	case 15:
+		R2_GLOBALS._flubMazeArea -= 7;
+		initArea();
+		enterArea();
+		break;
+	case 16:
+		// Moving west within the Flub maze
+	// No break on purpose
+	case 1961:
+		--R2_GLOBALS._flubMazeArea;
+		initArea();
+		enterArea();
+		break;
+	case 17: {
+		_sceneMode = 13;
+		R2_GLOBALS._flubMazeEntryDirection = 3;
+		_vampireActive = false;
+		R2_GLOBALS._player.disableControl(CURSOR_WALK);
+		R2_GLOBALS._player._canWalk = true;
+		R2_GLOBALS._player.setVisage(22);
+		R2_GLOBALS._player.animate(ANIM_MODE_9);
+		Common::Point pt(340, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		Common::Point pt2(289, 160);
+		NpcMover *mover2 = new NpcMover();
+		_vampire.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 18: {
+		_sceneMode = 16;
+		R2_GLOBALS._flubMazeEntryDirection = 6;
+		_vampireActive = false;
+		R2_GLOBALS._player.disableControl(CURSOR_WALK);
+		R2_GLOBALS._player._canWalk = true;
+		R2_GLOBALS._player.setVisage(22);
+		R2_GLOBALS._player.animate(ANIM_MODE_9);
+		Common::Point pt(-20, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		Common::Point pt2(30, 160);
+		NpcMover *mover2 = new NpcMover();
+		_vampire.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 24:
+		_KeypadWindow.remove();
+		_sceneMode = 1966;
+		_cube.setFrame(3);
+		setAction(&_sequenceManager, this, 1966, &_containmentField, &_gem, NULL);
+		break;
+	case 1951:
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+		R2_GLOBALS._sceneManager.changeScene(1945);
+		break;
+	case 1958:
+		SceneItem::display(1950, 24, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		_doorExit._enabled = true;
+		break;
+	case 1959:
+		R2_INVENTORY.setObjectScene(R2_SOAKED_FACEMASK, 0);
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		_doorExit._enabled = true;
+		break;
+	case 1962:
+	// No break on purpose
+	case 1963:
+		R2_GLOBALS._player.enableControl();
+		_KeypadWindow.setup2(1971, 1, 1, 160, 135);
+		break;
+	case 1964:
+	// No break on purpose
+	case 1965:
+		if (!R2_GLOBALS.getFlag(37))
+			SceneItem::display(1950, 26, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, LIST_END);
+
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1966:
+		_containmentField.remove();
+		if (R2_GLOBALS.getFlag(36)) {
+			_sceneMode = 1964;
+			setAction(&_sequenceManager, this, 1964, &R2_GLOBALS._player, NULL);
+		} else {
+			_sceneMode = 1965;
+			setAction(&_sequenceManager, this, 1965, &R2_GLOBALS._player, NULL);
+		}
+		_gem.setDetails(1950, 9, -1, -1, 2, (SceneItem *) NULL);
+		break;
+	case 1967: {
+		_sceneMode = 0;
+		R2_INVENTORY.setObjectScene(R2_SAPPHIRE_BLUE, 2);
+		_gem.remove();
+		if (R2_GLOBALS.getFlag(36))
+			R2_GLOBALS._player.setVisage(20);
+		else
+			R2_GLOBALS._player.setVisage(22);
+
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		// This is a hack to work around a pathfinding issue. original destination is (218, 165)
+		Common::Point pt(128, 165);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 1968:
+		R2_GLOBALS._player.enableControl();
+		R2_INVENTORY.setObjectScene(R2_ANCIENT_SCROLLS, 2);
+		_scrolls.setFrame(2);
+		if (R2_GLOBALS.getFlag(36))
+			R2_GLOBALS._player.setVisage(20);
+		else
+			R2_GLOBALS._player.setVisage(22);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
+		break;
+	}
+}
+
+void Scene1950::process(Event &event) {
+	if ( (event.eventType == EVENT_BUTTON_DOWN)
+			&& (R2_GLOBALS._player._uiEnabled)
+			&& (R2_GLOBALS._events.getCursor() == R2_SOAKED_FACEMASK)
+			&& (R2_GLOBALS._player._bounds.contains(event.mousePos))
+			&& (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0)) {
+		event.handled = true;
+		R2_GLOBALS._player.disableControl();
+		_shaftExit._enabled = false;
+		_doorExit._enabled = false;
+		_sceneMode = 1959;
+		setAction(&_sequenceManager, this, 1959, &R2_GLOBALS._player, NULL);
+	}
+
+	Scene::process(event);
+}
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_vampire.h b/engines/tsage/ringworld2/ringworld2_vampire.h
new file mode 100644
index 0000000000..f2539421f1
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_vampire.h
@@ -0,0 +1,180 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef TSAGE_RINGWORLD2_VAMPIRE_H
+#define TSAGE_RINGWORLD2_VAMPIRE_H
+
+#include "tsage/converse.h"
+#include "tsage/events.h"
+#include "tsage/core.h"
+#include "tsage/scenes.h"
+#include "tsage/globals.h"
+#include "tsage/sound.h"
+#include "tsage/ringworld2/ringworld2_logic.h"
+
+namespace TsAGE {
+
+namespace Ringworld2 {
+
+using namespace TsAGE;
+
+class Scene1950 : public SceneExt {
+	/* Windows */
+	class KeypadWindow: public ModalWindow {
+	public:
+		class KeypadButton : public SceneActor {
+		public:
+			int _buttonIndex;
+			bool _pressed;
+			bool _toggled;
+
+			KeypadButton();
+			void synchronize(Serializer &s);
+
+			void init(int indx);
+			virtual void process(Event &event);
+			virtual bool startAction(CursorType action, Event &event);
+		};
+
+		SceneActor _areaActor;
+		KeypadButton _buttons[16];
+
+		int _buttonIndex;
+
+		KeypadWindow();
+		virtual void synchronize(Serializer &s);
+		virtual void remove();
+		virtual void setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY);
+		virtual void setup3(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
+	};
+
+	class Keypad : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Actors */
+	class Door : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Scrolls : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Gem : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Vampire : public SceneActor {
+	public:
+		Common::Point _deadPosition;
+		int _deltaX;
+		int _deltaY;
+		int _vampireMode;
+
+		Vampire();
+		void synchronize(Serializer &s);
+
+		virtual void signal();
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Exits */
+	class NorthExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class UpExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class EastExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class DownExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class SouthExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class WestExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class ShaftExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class DoorExit : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+private:
+	void initArea();
+	void enterArea();
+	void doButtonPress(int indx);
+public:
+	NamedHotspot _background;
+	Keypad _keypad;
+	SceneActor _southDoorway;
+	SceneObject _northDoorway;
+	Door _door;
+	Scrolls _scrolls;
+	SceneActor _containmentField;
+	Gem _gem;
+	SceneActor _cube;
+	SceneActor _pulsingLights;
+	Vampire _vampire;
+	KeypadWindow _KeypadWindow;
+	NorthExit _northExit;
+	UpExit _upExit;
+	EastExit _eastExit;
+	DownExit _downExit;
+	SouthExit _southExit;
+	WestExit _westExit;
+	ShaftExit _shaftExit;
+	DoorExit _doorExit;
+	SequenceManager _sequenceManager;
+
+	bool _upExitStyle;
+	bool _removeFlag;
+	bool _vampireActive;
+	Common::Point _vampireDestPos;
+	int _vampireIndex;
+
+	Scene1950();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+};
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
+
+#endif
-- 
cgit v1.2.3


From fa5c22393138034efceb908e012f6783b65f36f5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 16 Oct 2014 08:07:38 +0200
Subject: TSAGE: R2R - Remove useless includes

---
 engines/tsage/ringworld2/ringworld2_airduct.cpp | 5 -----
 engines/tsage/ringworld2/ringworld2_airduct.h   | 1 -
 engines/tsage/ringworld2/ringworld2_outpost.cpp | 2 --
 engines/tsage/ringworld2/ringworld2_outpost.h   | 3 ---
 engines/tsage/ringworld2/ringworld2_vampire.h   | 1 -
 5 files changed, 12 deletions(-)

diff --git a/engines/tsage/ringworld2/ringworld2_airduct.cpp b/engines/tsage/ringworld2/ringworld2_airduct.cpp
index dc43dba1ae..136e8d5d1b 100644
--- a/engines/tsage/ringworld2/ringworld2_airduct.cpp
+++ b/engines/tsage/ringworld2/ringworld2_airduct.cpp
@@ -20,11 +20,6 @@
  *
  */
 
-#include "graphics/cursorman.h"
-
-#include "tsage/scenes.h"
-#include "tsage/tsage.h"
-#include "tsage/staticres.h"
 #include "tsage/ringworld2/ringworld2_airduct.h"
 
 namespace TsAGE {
diff --git a/engines/tsage/ringworld2/ringworld2_airduct.h b/engines/tsage/ringworld2/ringworld2_airduct.h
index 4a89f58c96..89dfe778d0 100644
--- a/engines/tsage/ringworld2/ringworld2_airduct.h
+++ b/engines/tsage/ringworld2/ringworld2_airduct.h
@@ -23,7 +23,6 @@
 #ifndef TSAGE_RINGWORLD2_AIRDUCT_H
 #define TSAGE_RINGWORLD2_AIRDUCT_H
 
-#include "tsage/converse.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
diff --git a/engines/tsage/ringworld2/ringworld2_outpost.cpp b/engines/tsage/ringworld2/ringworld2_outpost.cpp
index 5766102c9a..05cfa6259b 100644
--- a/engines/tsage/ringworld2/ringworld2_outpost.cpp
+++ b/engines/tsage/ringworld2/ringworld2_outpost.cpp
@@ -21,8 +21,6 @@
  */
 
 #include "graphics/cursorman.h"
-
-#include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 #include "tsage/ringworld2/ringworld2_outpost.h"
diff --git a/engines/tsage/ringworld2/ringworld2_outpost.h b/engines/tsage/ringworld2/ringworld2_outpost.h
index b3e663356e..6c6952c196 100644
--- a/engines/tsage/ringworld2/ringworld2_outpost.h
+++ b/engines/tsage/ringworld2/ringworld2_outpost.h
@@ -23,15 +23,12 @@
 #ifndef TSAGE_RINGWORLD2_OUTPOST_H
 #define TSAGE_RINGWORLD2_OUTPOST_H
 
-#include "common/scummsys.h"
-#include "tsage/converse.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 #include "tsage/ringworld2/ringworld2_logic.h"
-#include "tsage/ringworld2/ringworld2_speakers.h"
 
 namespace TsAGE {
 
diff --git a/engines/tsage/ringworld2/ringworld2_vampire.h b/engines/tsage/ringworld2/ringworld2_vampire.h
index f2539421f1..ca7aa34544 100644
--- a/engines/tsage/ringworld2/ringworld2_vampire.h
+++ b/engines/tsage/ringworld2/ringworld2_vampire.h
@@ -23,7 +23,6 @@
 #ifndef TSAGE_RINGWORLD2_VAMPIRE_H
 #define TSAGE_RINGWORLD2_VAMPIRE_H
 
-#include "tsage/converse.h"
 #include "tsage/events.h"
 #include "tsage/core.h"
 #include "tsage/scenes.h"
-- 
cgit v1.2.3


From dee4fd193d690baae5afaf906d7604a9df9155ef Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 16 Oct 2014 21:53:21 -0400
Subject: MADS: Fix stopping digital audio, music, and palette cycling when
 animation ends

---
 engines/mads/audio.cpp      | 4 ++++
 engines/mads/audio.h        | 1 +
 engines/mads/menu_views.cpp | 9 ++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/mads/audio.cpp b/engines/mads/audio.cpp
index 9d62c3f615..def2cd6c62 100644
--- a/engines/mads/audio.cpp
+++ b/engines/mads/audio.cpp
@@ -129,4 +129,8 @@ void AudioPlayer::playSound(int soundIndex, bool loop) {
 	*/
 }
 
+void AudioPlayer::stop() {
+	_mixer->stopHandle(_handle);
+}
+
 } // End of namespace M4
diff --git a/engines/mads/audio.h b/engines/mads/audio.h
index 21f4bed59a..13c540bf85 100644
--- a/engines/mads/audio.h
+++ b/engines/mads/audio.h
@@ -46,6 +46,7 @@ public:
 	void setSoundGroup(const Common::String &filename);
 	void setDefaultSoundGroup();
 	void playSound(int soundIndex, bool loop = false);
+	void stop();
 	void setVolume(int volume);
 	bool isPlaying() const;
 
diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 6acf6cdf9f..857db68fa6 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -475,6 +475,13 @@ AnimationView::AnimationView(MADSEngine *vm) : MenuView(vm) {
 }
 
 AnimationView::~AnimationView() {
+	// Turn off palette cycling as well as any playing sound
+	Scene &scene = _vm->_game->_scene;
+	scene._cyclingActive = false;
+	_vm->_sound->stop();
+	_vm->_audio->stop();
+
+	// Delete data
 	delete _currentAnimation;
 	delete _sceneInfo;
 }
@@ -505,7 +512,7 @@ void AnimationView::display() {
 bool AnimationView::onEvent(Common::Event &event) {
 	// Wait for the Escape key or a mouse press
 	if (((event.type == Common::EVENT_KEYDOWN) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) ||
-			(event.type == Common::EVENT_RBUTTONUP)) {
+			(event.type == Common::EVENT_LBUTTONUP)) {
 		scriptDone();
 		return true;
 	}
-- 
cgit v1.2.3


From 497324467f86656b747022661852255d1f3343fb Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 17 Oct 2014 19:17:17 +0200
Subject: TINSEL: Move object creation from constructor to run()

Moved the creation of _midiMusic, _pcmMusic, _sound and _bmv from
the constructor to run(). It was reported on the forum that the
MT-32 emulator didn't work for Discworld, and I'm speculating that
this is because it was being initialized before the "extra path"
had been added to the search path.

It's likely that not all of these objects are needed for every
version of the game. Fixing that is left as an exercise for
someone more familiar with the different game versions than me.
---
 engines/tinsel/tinsel.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 31610a8467..57d8432f0e 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -821,7 +821,8 @@ const char *const TinselEngine::_textFiles[][3] = {
 
 
 TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) :
-		Engine(syst), _gameDescription(gameDesc), _random("tinsel") {
+		Engine(syst), _gameDescription(gameDesc), _random("tinsel"),
+		_sound(0), _midiMusic(0), _pcmMusic(0), _bmv(0) {
 	_vm = this;
 
 	_config = new Config(this);
@@ -846,13 +847,6 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc)
 	if (cd_num >= 0)
 		_system->getAudioCDManager()->openCD(cd_num);
 
-	_midiMusic = new MidiMusicPlayer();
-	_pcmMusic = new PCMMusicPlayer();
-
-	_sound = new SoundManager(this);
-
-	_bmv = new BMVPlayer();
-
 	_mousePos.x = 0;
 	_mousePos.y = 0;
 	_keyHandler = NULL;
@@ -896,6 +890,11 @@ void TinselEngine::initializePath(const Common::FSNode &gamePath) {
 }
 
 Common::Error TinselEngine::run() {
+	_midiMusic = new MidiMusicPlayer();
+	_pcmMusic = new PCMMusicPlayer();
+	_sound = new SoundManager(this);
+	_bmv = new BMVPlayer();
+
 	// Initialize backend
 	if (getGameID() == GID_DW2) {
 #ifndef DW2_EXACT_SIZE
-- 
cgit v1.2.3


From 17a77ff69ced1c04e0520336c14e05fbf993108d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 14:59:16 +0300
Subject: SCI: Fix some typos, and remove some redundant curly braces

---
 engines/sci/detection.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 4f28738508..245b5646cc 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -563,9 +563,8 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 
 
 	// If these files aren't found, it can't be SCI
-	if (!foundResMap && !foundRes000) {
+	if (!foundResMap && !foundRes000)
 		return 0;
-	}
 
 	ResourceManager resMan;
 	resMan.addAppropriateSources(fslist);
@@ -575,19 +574,17 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 #ifndef ENABLE_SCI32
 	// Is SCI32 compiled in? If not, and this is a SCI32 game,
 	// stop here
-	if (getSciVersion() >= SCI_VERSION_2) {
-		return (const ADGameDescription *)&s_fallbackDesc;
-	}
+	if (getSciVersion() >= SCI_VERSION_2)
+		return 0;
 #endif
 
 	ViewType gameViews = resMan.getViewType();
 
 	// Have we identified the game views? If not, stop here
-	// Can't be SCI (or unsupported SCI views). Pinball Creep by sierra also uses resource.map/resource.000 files
-	//  but doesnt share sci format at all, if we dont return 0 here we will detect this game as SCI
-	if (gameViews == kViewUnknown) {
+	// Can't be SCI (or unsupported SCI views). Pinball Creep by Sierra also uses resource.map/resource.000 files
+	// but doesn't share SCI format at all
+	if (gameViews == kViewUnknown)
 		return 0;
-	}
 
 	// Set the platform to Amiga if the game is using Amiga views
 	if (gameViews == kViewAmiga)
@@ -597,9 +594,8 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 	Common::String sierraGameId = resMan.findSierraGameId();
 
 	// If we don't have a game id, the game is not SCI
-	if (sierraGameId.empty()) {
+	if (sierraGameId.empty())
 		return 0;
-	}
 
 	Common::String gameId = convertSierraGameId(sierraGameId, &s_fallbackDesc.flags, resMan);
 	strncpy(s_fallbackGameIdBuf, gameId.c_str(), sizeof(s_fallbackGameIdBuf) - 1);
-- 
cgit v1.2.3


From fe3ed8ded270510a6233a2ca2376befeceeed0e4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 15:02:32 +0300
Subject: SCI: Rename the version of addAppropriateSources() used in detection

---
 engines/sci/detection.cpp | 2 +-
 engines/sci/resource.cpp  | 7 ++-----
 engines/sci/resource.h    | 9 ++++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 245b5646cc..7176a18b46 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -567,7 +567,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 		return 0;
 
 	ResourceManager resMan;
-	resMan.addAppropriateSources(fslist);
+	resMan.addAppropriateSourcesForDetection(fslist);
 	resMan.init(true);
 	// TODO: Add error handling.
 
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 17195c14b8..f690f03cac 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -88,9 +88,6 @@ const char *getSciVersionDesc(SciVersion version) {
 
 //////////////////////////////////////////////////////////////////////
 
-
-#undef SCI_REQUIRE_RESOURCE_FILES
-
 //#define SCI_VERBOSE_RESMAN 1
 
 static const char *const s_errorDescriptions[] = {
@@ -639,7 +636,7 @@ int ResourceManager::addAppropriateSources() {
 	return 1;
 }
 
-int ResourceManager::addAppropriateSources(const Common::FSList &fslist) {
+int ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fslist) {
 	ResourceSource *map = 0;
 	Common::Array<ResourceSource *> sci21Maps;
 
@@ -890,7 +887,7 @@ void ResourceManager::init(bool initFromFallbackDetector) {
 	debugC(1, kDebugLevelResMan, "resMan: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
 
 	if ((_mapVersion == kResVersionUnknown) && (_volVersion == kResVersionUnknown)) {
-		warning("Volume and map version not detected, assuming that this is not a sci game");
+		warning("Volume and map version not detected, assuming that this is not a SCI game");
 		_viewType = kViewUnknown;
 		return;
 	}
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index e90f52a3ce..8260ddb27e 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -314,8 +314,15 @@ public:
 	 */
 	void init(bool initFromFallbackDetector = false);
 
+	/**
+	 * Adds all of the resource files for a game
+	 */
 	int addAppropriateSources();
-	int addAppropriateSources(const Common::FSList &fslist);	// TODO: Switch from FSList to Common::Archive?
+
+	/**
+	 * Similar to the function above, only called from the fallback detector
+	 */
+	int addAppropriateSourcesForDetection(const Common::FSList &fslist);	// TODO: Switch from FSList to Common::Archive?
 
 	/**
 	 * Looks up a resource's data.
-- 
cgit v1.2.3


From 4736c490e1d3182f58db8a51b400f96b9559dad8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 15:33:07 +0300
Subject: SCI: Separate the rest of the detection-only functions

This should fix bug #6717 - "SCI fallback detection assert failure"
---
 engines/sci/detection.cpp |  4 ++--
 engines/sci/resource.cpp  | 45 ++++++++++++++++++++++++++++++++++-----------
 engines/sci/resource.h    |  7 ++++++-
 engines/sci/sci.h         |  6 ++++++
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 7176a18b46..85ff1c0062 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -568,13 +568,13 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles,
 
 	ResourceManager resMan;
 	resMan.addAppropriateSourcesForDetection(fslist);
-	resMan.init(true);
+	resMan.initForDetection();
 	// TODO: Add error handling.
 
 #ifndef ENABLE_SCI32
 	// Is SCI32 compiled in? If not, and this is a SCI32 game,
 	// stop here
-	if (getSciVersion() >= SCI_VERSION_2)
+	if (getSciVersionForDetection() >= SCI_VERSION_2)
 		return 0;
 #endif
 
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index f690f03cac..d155792853 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -55,6 +55,11 @@ SciVersion getSciVersion() {
 	return s_sciVersion;
 }
 
+SciVersion getSciVersionForDetection() {
+	assert(!g_sci);
+	return s_sciVersion;
+}
+
 const char *getSciVersionDesc(SciVersion version) {
 	switch (version) {
 	case SCI_VERSION_NONE:
@@ -855,7 +860,7 @@ void ResourceManager::freeResourceSources() {
 ResourceManager::ResourceManager() {
 }
 
-void ResourceManager::init(bool initFromFallbackDetector) {
+void ResourceManager::init() {
 	_memoryLocked = 0;
 	_memoryLRU = 0;
 	_LRU.clear();
@@ -894,18 +899,17 @@ void ResourceManager::init(bool initFromFallbackDetector) {
 
 	scanNewSources();
 
-	if (!initFromFallbackDetector) {
-		if (!addAudioSources()) {
-			// FIXME: This error message is not always correct.
-			// OTOH, it is nice to be able to detect missing files/sources
-			// So we should definitely fix addAudioSources so this error
-			// only pops up when necessary. Disabling for now.
-			//error("Somehow I can't seem to find the sound files I need (RESOURCE.AUD/RESOURCE.SFX), aborting");
-		}
-		addScriptChunkSources();
-		scanNewSources();
+	if (!addAudioSources()) {
+		// FIXME: This error message is not always correct.
+		// OTOH, it is nice to be able to detect missing files/sources
+		// So we should definitely fix addAudioSources so this error
+		// only pops up when necessary. Disabling for now.
+		//error("Somehow I can't seem to find the sound files I need (RESOURCE.AUD/RESOURCE.SFX), aborting");
 	}
 
+	addScriptChunkSources();
+	scanNewSources();
+
 	detectSciVersion();
 
 	debugC(1, kDebugLevelResMan, "resMan: Detected %s", getSciVersionDesc(getSciVersion()));
@@ -940,6 +944,22 @@ void ResourceManager::init(bool initFromFallbackDetector) {
 	}
 }
 
+void ResourceManager::initForDetection() {
+	assert(!g_sci);
+
+	_memoryLocked = 0;
+	_memoryLRU = 0;
+	_LRU.clear();
+	_resMap.clear();
+	_audioMapSCI1 = NULL;
+
+	_mapVersion = detectMapVersion();
+	_volVersion = detectVolVersion();
+
+	scanNewSources();
+	detectSciVersion();
+}
+
 ResourceManager::~ResourceManager() {
 	// freeing resources
 	ResourceMap::iterator itr = _resMap.begin();
@@ -1642,6 +1662,9 @@ int ResourceManager::readResourceMapSCI1(ResourceSource *map) {
 	do {
 		type = fileStream->readByte() & 0x1F;
 		resMap[type].wOffset = fileStream->readUint16LE();
+		if (fileStream->eos())
+			return SCI_ERROR_RESMAP_NOT_FOUND;
+
 		resMap[prevtype].wSize = (resMap[type].wOffset
 		                          - resMap[prevtype].wOffset) / nEntrySize;
 		prevtype = type;
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 8260ddb27e..62f3c584ac 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -312,7 +312,12 @@ public:
 	/**
 	 * Initializes the resource manager.
 	 */
-	void init(bool initFromFallbackDetector = false);
+	void init();
+
+	/**
+	 * Similar to the function above, only called from the fallback detector
+	 */
+	void initForDetection();
 
 	/**
 	 * Adds all of the resource files for a game
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 48bc4819d2..2377386c72 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -428,6 +428,12 @@ extern SciEngine *g_sci;
  */
 SciVersion getSciVersion();
 
+/**
+ * Same as above, but this version doesn't assert on unknown SCI versions.
+ * Only used by the fallback detector
+ */
+SciVersion getSciVersionForDetection();
+
 /**
  * Convenience function converting an SCI version into a human-readable string.
  */
-- 
cgit v1.2.3


From 22aaf995ed4f5131ae9cf6753d228718a96293f3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 15:34:52 +0300
Subject: SCI: Hopefully fix bug #6718 in LSL6 Polish

View flags are mainly used by LB2. The flag in the LSL6 view seems to
be garbage, so we ignore it
---
 engines/sci/graphics/view.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index f3f352e5b8..a88546e68c 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -283,6 +283,7 @@ void GfxView::initData(GuiResourceId resourceId) {
 			_isScaleable = false;
 			break;
 		case 0x40:
+		case 0x4F:	// LSL6 Polish, seems to be garbage - bug #6718
 		case 0:
 			break; // don't do anything, we already have _isScaleable set
 		default:
-- 
cgit v1.2.3


From dd3e877b144a514fe2c93a253c40a3c47345806d Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 7 Sep 2014 14:21:34 +0200
Subject: GUI: Fix for bug 6719 (last line of help missing)

Since 1.4 the font changed from a 14 to 15 pixel height wich causes
one line of help text no longer to be shown. By changing the padding
of the buttons the last lines fits again.
---
 gui/themes/scummmodern.zip                    | Bin 1489429 -> 1485886 bytes
 gui/themes/scummmodern/scummmodern_layout.stx |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index e40e8b1e26..c7c585654d 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index b760e15919..7e61d6820e 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -1169,9 +1169,9 @@
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'HelpText'
-					height = '220'
+					height = '228'
 			/>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 8, 0'>
 				<widget name = 'Prev'
 						type = 'Button'
 				/>
-- 
cgit v1.2.3


From 72303564f70573dc4bacd9c726dc626920bf21e8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 18 Oct 2014 11:20:50 -0400
Subject: MADS: Hook up Rex game endings to show the correct animation and/or
 credits

---
 engines/mads/menu_views.cpp              | 15 +++++++++++++++
 engines/mads/menu_views.h                | 17 ++++++++++-------
 engines/mads/nebular/dialogs_nebular.cpp |  4 ++--
 engines/mads/nebular/game_nebular.cpp    | 26 ++++++++++++++++++++++++++
 engines/mads/nebular/menu_nebular.cpp    | 15 +++++++++++++++
 engines/mads/nebular/menu_nebular.h      | 12 ++++++++++++
 engines/mads/scene.cpp                   |  3 +++
 7 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 857db68fa6..1314774371 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -80,6 +80,15 @@ bool MenuView::onEvent(Common::Event &event) {
 	return false;
 }
 
+Common::String MenuView::getResourceName() {
+	Common::String s(_filename);
+	s.toLowercase();
+	while (s.contains('.'))
+		s.deleteLastChar();
+
+	return s;
+}
+
 /*------------------------------------------------------------------------*/
 
 char TextView::_resourceName[100];
@@ -112,12 +121,17 @@ TextView::TextView(MADSEngine *vm) : MenuView(vm) {
 }
 
 TextView::~TextView() {
+	// Turn off palette cycling as well as any playing sound
+	Scene &scene = _vm->_game->_scene;
+	scene._cyclingActive = false;
+	_vm->_sound->stop();
 }
 
 void TextView::load() {
 	Common::String scriptName(_resourceName);
 	scriptName += ".txr";
 
+	_filename = scriptName;
 	if (!_script.open(scriptName))
 		error("Could not open resource %s", _resourceName);
 
@@ -491,6 +505,7 @@ void AnimationView::load() {
 	if (!resName.hasSuffix("."))
 		resName += ".res";
 
+	_filename = resName;
 	if (!_script.open(resName))
 		error("Could not open resource %s", resName.c_str());
 
diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index 6faa665bff..c13213c3ed 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -36,6 +36,7 @@ class MenuView: public FullScreenDialog {
 protected:
 	bool _breakFlag;
 	bool _redrawFlag;
+	Common::String _filename;
 
 	virtual void doFrame() = 0;
 
@@ -51,6 +52,8 @@ public:
 	virtual ~MenuView() {}
 
 	virtual void show();
+
+	Common::String getResourceName();
 };
 
 struct TextLine {
@@ -106,11 +109,6 @@ private:
 	 */
 	int getParameter(const char **paramP);
 
-	/**
-	 * Called when the script is finished
-	 */
-	void scriptDone();
-
 	/**
 	 * Reset the game palette
 	 */
@@ -119,6 +117,11 @@ protected:
 	virtual void display();
 
 	virtual void doFrame();
+
+	/**
+	* Called when the script is finished
+	*/
+	virtual void scriptDone();
 public:
 	/**
 	 * Queue the given text resource for display
@@ -201,8 +204,6 @@ private:
 
 	int getParameter();
 
-	void scriptDone();
-
 	void loadNextResource();
 protected:
 	virtual void display();
@@ -210,6 +211,8 @@ protected:
 	virtual void doFrame();
 
 	virtual bool onEvent(Common::Event &event);
+
+	virtual void scriptDone();
 public:
 	/**
 	* Queue the given text resource for display
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 86244bd3bb..1900a12b59 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -314,13 +314,13 @@ void DialogsNebular::showDialog() {
 			break;
 		}
 		case DIALOG_TEXTVIEW: {
-			TextView *dlg = new TextView(_vm);
+			TextView *dlg = new RexTextView(_vm);
 			dlg->show();
 			delete dlg;
 			break;
 		}
 		case DIALOG_ANIMVIEW: {
-			AnimationView *dlg = new AnimationView(_vm);
+			AnimationView *dlg = new RexAnimationView(_vm);
 			dlg->show();
 			delete dlg;
 			break;
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 902f42507a..eae74d6da0 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -27,6 +27,7 @@
 #include "mads/game.h"
 #include "mads/screen.h"
 #include "mads/msurface.h"
+#include "mads/menu_views.h"
 #include "mads/nebular/game_nebular.h"
 #include "mads/nebular/dialogs_nebular.h"
 #include "mads/nebular/globals_nebular.h"
@@ -309,6 +310,31 @@ void GameNebular::setSectionHandler() {
 }
 
 void GameNebular::checkShowDialog() {
+	// Handling to start endgame sequences if the win/lose type has been set
+	switch (_winStatus) {
+	case 1:
+		// No shields failure ending
+		AnimationView::execute(_vm, "rexend1");
+		break;
+	case 2:
+		// Shields, but no targetting failure ending
+		AnimationView::execute(_vm, "rexend2");
+		break;
+	case 3:
+		// Completed game successfully, so activate quotes item on the main menu
+		ConfMan.setBool("ShowQuotes", true);
+		ConfMan.flushToDisk();
+
+		AnimationView::execute(_vm, "rexend3");
+		break;
+	case 4:
+		// Decompression ending
+		TextView::execute(_vm, "ending4");
+		break;
+	}
+	_winStatus = 0;
+
+	// Loop for showing dialogs, if any need to be shown
 	if (_vm->_dialogs->_pendingDialog && _player._stepEnabled && !_globals[kCopyProtectFailed]) {
 		_player.releasePlayerSprites();
 
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 717e3f6cf9..46dc411678 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -375,6 +375,21 @@ bool AdvertView::onEvent(Common::Event &event) {
 	return false;
 }
 
+/*------------------------------------------------------------------------*/
+
+void RexAnimationView::scriptDone() {
+	AnimationView::scriptDone();
+
+	Common::String s = getResourceName();
+	if (s == "rexend1") {
+		TextView::execute(_vm, "ending1");
+	} else if (s == "rexend2") {
+		TextView::execute(_vm, "ending2");
+	} else if (s == "rexend3") {
+		TextView::execute(_vm, "credits");
+	}
+}
+
 } // End of namespace Nebular
 
 } // End of namespace MADS
diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h
index 29777a7a7c..d00439c1e4 100644
--- a/engines/mads/nebular/menu_nebular.h
+++ b/engines/mads/nebular/menu_nebular.h
@@ -128,6 +128,18 @@ public:
 	void show();
 };
 
+class RexAnimationView : public AnimationView {
+protected:
+	virtual void scriptDone();
+public:
+	RexAnimationView(MADSEngine *vm) : AnimationView(vm) {}
+};
+
+class RexTextView : public TextView {
+public:
+	RexTextView(MADSEngine *vm) : TextView(vm) {}
+};
+
 } // End of namespace Nebular
 
 } // End of namespace MADS
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index ad24dd4f60..18ceb3c813 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -360,6 +360,9 @@ void Scene::loop() {
 		if (_vm->_dialogs->_pendingDialog != DIALOG_NONE && !_vm->_game->_trigger
 			&& _vm->_game->_player._stepEnabled)
 			_reloadSceneFlag = true;
+
+		if (_vm->_game->_winStatus)
+			break;
 	}
 }
 
-- 
cgit v1.2.3


From a657c3982447704c9262926f853875ca80e7a7c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 18 Oct 2014 11:42:11 -0400
Subject: MADS: Only show Quotes main menu item after winning the game

---
 engines/mads/nebular/menu_nebular.cpp | 14 ++++++++++++++
 engines/mads/nebular/menu_nebular.h   |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 46dc411678..f2f90e2291 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/scummsys.h"
+#include "common/config-manager.h"
 #include "mads/game.h"
 #include "mads/mads.h"
 #include "mads/menu_views.h"
@@ -62,6 +63,10 @@ MainMenu::~MainMenu() {
 	scene._spriteSlots.reset();
 }
 
+bool MainMenu::shouldShowQuotes() {
+	return ConfMan.hasKey("ShowQuotes") && ConfMan.getBool("ShowQuotes");
+}
+
 void MainMenu::display() {
 	MenuView::display();
 	Scene &scene = _vm->_game->_scene;
@@ -101,6 +106,9 @@ void MainMenu::doFrame() {
 			handleAction((MADSGameAction)_selectedIndex);
 		} else {
 			for (_menuItemIndex = 0; _menuItemIndex < 6; ++_menuItemIndex) {
+				if (_menuItemIndex == 4 && !shouldShowQuotes())
+					continue;
+
 				if (_menuItemIndex != _selectedIndex) {
 					addSpriteSlot();
 				}
@@ -120,6 +128,9 @@ void MainMenu::doFrame() {
 	if (_skipFlag && _menuItemIndex >= 0) {
 		// Quickly loop through all the menu items to display each's final frame		
 		for (; _menuItemIndex < 6; ++_menuItemIndex) {
+			if (_menuItemIndex == 4 && !shouldShowQuotes())
+				continue;
+
 			// Draw the final frame of the menuitem
 			_frameIndex = 0;
 			addSpriteSlot();
@@ -129,9 +140,12 @@ void MainMenu::doFrame() {
 	} else {
 		if ((_menuItemIndex == -1) || (_frameIndex == 0)) {
 			if (++_menuItemIndex == 6) {
+
 				// Reached end of display animation
 				_vm->_events->showCursor();
 				return;
+			} else if (_menuItemIndex == 4 && !shouldShowQuotes()) {
+				++_menuItemIndex;
 			}
 
 			_frameIndex = _menuItems[_menuItemIndex]->getCount() - 1;
diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h
index d00439c1e4..77b8b6fc6e 100644
--- a/engines/mads/nebular/menu_nebular.h
+++ b/engines/mads/nebular/menu_nebular.h
@@ -80,6 +80,8 @@ private:
 	 * Add a sprite slot for the current menuitem frame
 	 */
 	void addSpriteSlot();
+
+	bool shouldShowQuotes();
 protected:
 	/**
 	 * Display the menu
-- 
cgit v1.2.3


From dbfe4972e3a3e1d59aee8993697028cdd2de8da2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 18 Oct 2014 11:55:30 -0400
Subject: MADS: Remove deprecated code from AnimationView and a bunch of
 out-of-date TODOs

---
 engines/mads/animation.cpp          |  3 ---
 engines/mads/game.cpp               |  2 --
 engines/mads/menu_views.cpp         | 36 ------------------------------------
 engines/mads/menu_views.h           |  4 ----
 engines/mads/msurface.cpp           |  4 ----
 engines/mads/nebular/game_nebular.h |  4 +---
 6 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 9f0e0adb6d..2b999fa305 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -340,9 +340,6 @@ void Animation::startAnimation(int endTrigger) {
 		_unkIndex = -1;
 		//SpriteAsset *asset = _scene->_sprites[_spriteListIndexes[_header._spritesIndex]];
 
-		// TODO: Weird stuff with _unkList. Seems like it's treated as pointers
-		// here, but in processText, it's used as POINTs?
-
 		loadFrame(1);
 	}
 
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index b544eff2db..63a7e40d1b 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -433,8 +433,6 @@ void Game::handleKeypress(const Common::Event &event) {
 	default:
 		break;
 	}
-
-	warning("TODO: handleKeypress - %d", (int)event.kbd.keycode);
 }
 
 void Game::synchronize(Common::Serializer &s, bool phase1) {
diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 1314774371..03afc70c3e 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -765,40 +765,4 @@ int AnimationView::getParameter() {
 	return result;
 }
 
-void AnimationView::checkResource(const Common::String &resourceName) {
-	//bool hasSuffix = false;
-	
-}
-
-int AnimationView::scanResourceIndex(const Common::String &resourceName) {
-	int foundIndex = -1;
-
-	if (_v1) {
-		const char *chP = strchr(resourceName.c_str(), '\\');
-		if (!chP) {
-			chP = strchr(resourceName.c_str(), '*');
-		}
-
-		Common::String resName = chP ? Common::String(chP + 1) : resourceName;
-
-		if (_v2 != 3) {
-			assert(_resIndex.size() == 0);
-		}
-
-		// Scan for the resource name
-		for (uint resIndex = 0; resIndex < _resIndex.size(); ++resIndex) {
-			ResIndexEntry &resEntry = _resIndex[resIndex];
-			if (resEntry._resourceName.compareToIgnoreCase(resourceName)) {
-				foundIndex = resIndex;
-				break;
-			}
-		}
-	}
-
-	if (foundIndex >= 0) {
-		// TODO
-	}
-	return -1;
-}
-
 } // End of namespace MADS
diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index c13213c3ed..cc5a13006f 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -192,10 +192,6 @@ private:
 	int _animFrameNumber;
 	bool _nextCyclingActive;
 private:
-	void checkResource(const Common::String &resourceName);
-
-	int scanResourceIndex(const Common::String &resourceName);
-
 	void load();
 
 	void processLines();
diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index 0cb4530a84..39824bac4b 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -87,7 +87,6 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo
 	// rectangle is always 0, 0
 	assert(clipRect.top == 0 && clipRect.left == 0);
 
-	// TODO: Put err* and scaled* into SpriteInfo
 	int errX = info.hotX * info.scaleX % 100;
 	int errY = info.hotY * info.scaleY % 100;
 	int scaledWidth = scaleValue(info.width, info.scaleX, errX);
@@ -160,7 +159,6 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo
 
 			if (status == kStatusDraw && clipY == 0) {
 				// Draw previously scaled line
-				// TODO Implement different drawing types (depth, shadow etc.)
 				byte *tempDst = dst;
 				for (int lineX = 0; lineX < scaledWidth; lineX++) {
 					byte pixel = scaledLineBuf[lineX];
@@ -186,8 +184,6 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo
 				}
 				dst += pitch;
 				heightAmt--;
-				// TODO depth etc.
-				//depthAddress += Destination -> Width;
 
 				errY += 100;
 				if (errY >= 0)
diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h
index da607d47ee..efa21a2e73 100644
--- a/engines/mads/nebular/game_nebular.h
+++ b/engines/mads/nebular/game_nebular.h
@@ -133,18 +133,16 @@ public:
 	virtual void synchronize(Common::Serializer &s, bool phase1);
 };
 
-
+// Section handlers aren't needed in ScummVM implementation
 class Section1Handler : public SectionHandler {
 public:
 	Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
 
-	// TODO: Properly implement handler methods
 	virtual void preLoadSection() {}
 	virtual void sectionPtr2() {}
 	virtual void postLoadSection() {}
 };
 
-// TODO: Properly implement handler classes
 typedef Section1Handler Section2Handler;
 typedef Section1Handler Section3Handler;
 typedef Section1Handler Section4Handler;
-- 
cgit v1.2.3


From f0bcacc7b3ad9bc5bb88b9b7db8d36977e96fa08 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 20:12:42 +0300
Subject: MADS: Reset screen clip bounds before copying over a new screen

This is needed for the in-game menu, where a dialog spawns another one
---
 engines/mads/dialogs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 5ea8fb115c..5e38f34fc6 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -457,6 +457,7 @@ void FullScreenDialog::display() {
 	_vm->_palette->setLowRange();
 	_vm->_screen.hLine(0, 20, MADS_SCREEN_WIDTH, 2);
 	_vm->_screen.hLine(0, 179, MADS_SCREEN_WIDTH, 2);
+	_vm->_screen.resetClipBounds();
 	_vm->_screen.copyRectToScreen(Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
 
 	// Restrict the screen to the area between the two lines
-- 
cgit v1.2.3


From ad1aedec7687019b44066bc7695f4d227cee1a5b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 20:19:14 +0300
Subject: MADS: Implement the Rex Cancel button in the game options dialog

The current options are now saved when the dialog opens, and are
restored to their original values if the user cancels
---
 engines/mads/nebular/dialogs_nebular.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 1900a12b59..6e0e7821ab 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1061,6 +1061,14 @@ void OptionsDialog::display() {
 
 void OptionsDialog::show() {
 	Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
+
+	// Previous options, restored when cancel is selected
+	bool prevEasyMouse = _vm->_easyMouse;
+	bool prevInvObjectsAnimated = _vm->_invObjectsAnimated;
+	bool prevTextWindowStill = _vm->_textWindowStill;
+	ScreenFade prevScreenFade = _vm->_screenFade;
+	StoryMode prevStoryMode = game._storyMode;
+
 	do {
 		_selectedLine = 0;
 		GameDialog::show();
@@ -1105,10 +1113,15 @@ void OptionsDialog::show() {
 
 	switch (_selectedLine) {
 	case 8:	// Done
-		// TODO: Copy from temporary config
+		// New options will be applied
 		break;
 	case 9:	// Cancel
-		// TODO: Ignore all changes to temporary config
+		// Revert all options from the saved ones
+		_vm->_easyMouse = prevEasyMouse;
+		_vm->_invObjectsAnimated = prevInvObjectsAnimated;
+		_vm->_textWindowStill = prevTextWindowStill;
+		_vm->_screenFade = prevScreenFade;
+		game._storyMode = prevStoryMode;
 		break;
 	default:
 		break;
-- 
cgit v1.2.3


From 879890e021028983dda5af3ea83156357ba239a6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 20:46:17 +0300
Subject: MADS: Clear scene sprites and objects when showing a game menu

This shows the game menu, albeit with the wrong palette
---
 engines/mads/nebular/dialogs_nebular.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 6e0e7821ab..f51d046951 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -594,6 +594,9 @@ GameDialog::GameDialog(MADSEngine *vm) : FullScreenDialog(vm) {
 	_vm->_events->waitCursor();
 	scene.clearVocab();
 	scene._dynamicHotspots.clear();
+	// Clear scene sprites and objects
+	scene._spriteSlots.reset();
+	_vm->_game->_screenObjects.clear();
 	_vm->_dialogs->_defaultPosition = Common::Point(-1, -1);
 	_menuSpritesIndex = 0;
 }
-- 
cgit v1.2.3


From 92bf8a54200e762bc95a155e3cdcffd22ec258d3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Oct 2014 22:06:48 +0300
Subject: SCI: Fix bug #6703: "SCI: QFG1 VGA - Can't CTRL+S to access
 statistics"

This actually affected all Control+key combinations. A regression from
0f90b8eaad0335715d5f6aea6ede32ebbb746e25
---
 engines/sci/event.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 511d2014bd..b1c002413d 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -262,7 +262,7 @@ SciEvent EventManager::getScummVMEvent() {
 	// Scancodify if appropriate
 	if (modifiers & Common::KBD_ALT)
 		input.character = altify(input.character);
-	else if ((modifiers & Common::KBD_CTRL) && input.character > 0 && input.character < 27)
+	if (getSciVersion() <= SCI_VERSION_1_MIDDLE && (modifiers & Common::KBD_CTRL) && input.character > 0 && input.character < 27)
 		input.character += 96; // 0x01 -> 'a'
 
 	// If no actual key was pressed (e.g. if only a modifier key was pressed),
-- 
cgit v1.2.3


From 7bdf48170a86fddca28350afac5b90981be0d9a0 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 19 Oct 2014 00:08:32 +0200
Subject: GOB: Remove useless memcpy()

Happened while removing Draw::_vgaSmallPalette in 0f9b1364c.

Fixes Coverity issue #1230309.
---
 engines/gob/inter_v1.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 40134bbf17..676564a9fb 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1124,8 +1124,6 @@ void Inter_v1::o1_palLoad(OpFuncParams &params) {
 			_vm->_draw->_vgaPalette[i].green = _vm->_game->_script->readByte();
 			_vm->_draw->_vgaPalette[i].blue  = _vm->_game->_script->readByte();
 		}
-
-		memcpy(_vm->_draw->_vgaPalette, _vm->_draw->_vgaPalette, 16 * 3);
 		break;
 
 	case 53:
-- 
cgit v1.2.3


From e06327e81aee35b9a523122637f79c9d0530c0bc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 18 Oct 2014 18:27:07 -0400
Subject: MADS: Minor clean up of sprite set removal

---
 engines/mads/sprites.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 6cb55aaeee..fd73930475 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -404,9 +404,9 @@ void SpriteSets::remove(int idx) {
 			delete (*this)[idx];
 			(*this)[idx] = nullptr;
 		} else {
-			while (size() > 0 && (*this)[size() - 1] == nullptr) {
+			do {
 				remove_at(size() - 1);
-			}
+			} while (size() > 0 && (*this)[size() - 1] == nullptr);
 		}
 
 		if (_assetCount > 0)
-- 
cgit v1.2.3


From 1d5536da02c20c5c635e02dd19aa38fb3b1128ec Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 19 Oct 2014 16:52:00 +0300
Subject: SCI: Enable some menus in Jones after restoring (bugs #6537 and
 #6723)

The code path that is supposed to enable these never gets called when
restoring from the main menu, or from the ScummVM launcher. Since the
logic on when and what to enable is quite complex, the easiest thing
to do is enable these entries manually after a game is loaded.
---
 engines/sci/engine/kfile.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 61fb717567..cb8ba7a565 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -37,6 +37,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/savegame.h"
+#include "sci/graphics/menu.h"
 #include "sci/sound/audio.h"
 #include "sci/console.h"
 
@@ -913,6 +914,23 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) {
 				//  code concerning this via script patch.
 				s->variables[VAR_GLOBAL][0xB3].setOffset(SAVEGAMEID_OFFICIALRANGE_START + savegameId);
 				break;
+			case GID_JONES:
+				// HACK: The code that enables certain menu items isn't called when a game is restored from the
+				// launcher, or the "Restore game" option in the game's main menu - bugs #6537 and #6723.
+				// These menu entries are disabled when the game is launched, and are enabled when a new game is
+				// started. The code for enabling these entries is is all in script 1, room1::init, but that code
+				// path is never followed in these two cases (restoring game from the menu, or restoring a game
+				// from the ScummVM launcher). Thus, we perform the calls to enable the menus ourselves here.
+				// These two are needed when restoring from the launcher
+				g_sci->_gfxMenu->kernelSetAttribute(257 >> 8, 257 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Sierra -> About Jones
+				g_sci->_gfxMenu->kernelSetAttribute(258 >> 8, 258 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Sierra -> Help
+				// The rest are normally enabled from room1::init
+				g_sci->_gfxMenu->kernelSetAttribute(769 >> 8, 769 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Options -> Delete current player
+				g_sci->_gfxMenu->kernelSetAttribute(513 >> 8, 513 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Game -> Save Game
+				g_sci->_gfxMenu->kernelSetAttribute(515 >> 8, 515 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Game -> Restore Game
+				g_sci->_gfxMenu->kernelSetAttribute(1025 >> 8, 1025 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);  // Status -> Statistics
+				g_sci->_gfxMenu->kernelSetAttribute(1026 >> 8, 1026 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);  // Status -> Goals
+				break;
 			default:
 				break;
 			}
-- 
cgit v1.2.3


From d3475fe3b699d6d2d8cd87b1b1b480e685717c74 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 19 Oct 2014 17:03:14 +0300
Subject: GRAPHICS: Silence an MSVC warning

---
 graphics/transform_tools.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/transform_tools.h b/graphics/transform_tools.h
index a51c8ee229..ec739f9ad0 100644
--- a/graphics/transform_tools.h
+++ b/graphics/transform_tools.h
@@ -28,7 +28,7 @@
 
 namespace Graphics {
 
-	static const float kEpsilon = 0.00001;  // arbitrarily taken number
+	static const float kEpsilon = 0.00001f;  // arbitrarily taken number
 
 	struct FloatPoint {
 		float x;
-- 
cgit v1.2.3


From 5a6a44f1c6cc59192ec702ee31a1a0feb881c2e7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 19 Oct 2014 14:49:20 -0400
Subject: ACCESS: Wait for keypress in speakText if voice is turned off

---
 engines/access/access.cpp | 7 ++++++-
 engines/access/sound.cpp  | 1 +
 engines/access/sound.h    | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 5636654d03..28847370a2 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -274,7 +274,12 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 	if (soundsLeft == 0)
 		return;
 
-	while(true) {
+	if (!_sound->_isVoice) {
+		_events->waitKeyMouse();
+		return;
+	}
+
+	for (;;) {
 		_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundPriority[0] = 1;
 		_sound->playSound(0);
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 001d2f325b..90818ed5d3 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -32,6 +32,7 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 	_music = nullptr;
 	_musicRepeat = false;
 	_playingSound = false;
+	_isVoice = false;
 }
 
 SoundManager::~SoundManager() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 3d967c6af4..cc02229b3b 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -48,6 +48,7 @@ public:
 	Resource *_music;
 	bool _musicRepeat;
 	bool _playingSound;
+	bool _isVoice;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
-- 
cgit v1.2.3


From 1860c2107adb4d08ce6d5a360b47bf5c19392713 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 19 Oct 2014 23:44:45 +0200
Subject: SCI: Add notes

---
 engines/sci/engine/kfile.cpp    | 2 ++
 engines/sci/engine/savegame.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index cb8ba7a565..c56eb09482 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -922,6 +922,8 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) {
 				// path is never followed in these two cases (restoring game from the menu, or restoring a game
 				// from the ScummVM launcher). Thus, we perform the calls to enable the menus ourselves here.
 				// These two are needed when restoring from the launcher
+				// FIXME: The original interpreter saves and restores the menu state, so these attributes
+				// are automatically reset there. We may want to do the same.
 				g_sci->_gfxMenu->kernelSetAttribute(257 >> 8, 257 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Sierra -> About Jones
 				g_sci->_gfxMenu->kernelSetAttribute(258 >> 8, 258 & 0xFF, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG);    // Sierra -> Help
 				// The rest are normally enabled from room1::init
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index cdcdcc41e5..9decc4cef6 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -844,6 +844,8 @@ bool gamestate_save(EngineState *s, Common::WriteStream *fh, const Common::Strin
 	if (voc)
 		voc->saveLoadWithSerializer(ser);
 
+	// TODO: SSCI (at least JonesCD, presumably more) also stores the Menu state
+
 	return true;
 }
 
-- 
cgit v1.2.3


From 0b3a20f645324696e08745a9e8a3fc75e1700cac Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 22 Oct 2014 11:43:24 +0700
Subject: ZVISION: Some push toggles may contain few hotspot zones

---
 .../scripting/controls/push_toggle_control.cpp      | 21 +++++++++++++++------
 .../scripting/controls/push_toggle_control.h        |  5 ++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 2f4af0d843..bf74a22051 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -42,6 +42,7 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
 	line.toLowercase();
+	_hotspots.clear();
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (line.matchString("*_hotspot*", true)) {
@@ -52,7 +53,7 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 
 			sscanf(line.c_str(), "%*[^(](%u,%u,%u,%u)", &x, &y, &width, &height);
 
-			_hotspot = Common::Rect(x, y, x + width, y + height);
+			_hotspots.push_back(Common::Rect(x, y, x + width + 1, y + height + 1));
 		} else if (line.matchString("cursor*", true)) {
 			char nameBuffer[25];
 
@@ -86,12 +87,13 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 		trimCommentsAndWhiteSpace(&line);
 	}
 
-	if (_hotspot.isEmpty() || _hoverCursor.empty()) {
-		warning("Push_toggle cursor %u was parsed incorrectly", key);
+	if (_hotspots.size() == 0 || _hoverCursor.empty()) {
+		warning("Push_toggle %u was parsed incorrectly", key);
 	}
 }
 
 PushToggleControl::~PushToggleControl() {
+	_hotspots.clear();
 }
 
 bool PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
@@ -101,7 +103,7 @@ bool PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Com
 	if (_event != Common::EVENT_LBUTTONUP)
 		return false;
 
-	if (_hotspot.contains(backgroundImageSpacePos)) {
+	if (contain(backgroundImageSpacePos)) {
 		int32 val = _engine->getScriptManager()->getStateValue(_key);
 		val = (val + 1) % _countTo;
 		_engine->getScriptManager()->setStateValue(_key, val);
@@ -117,7 +119,7 @@ bool PushToggleControl::onMouseDown(const Common::Point &screenSpacePos, const C
 	if (_event != Common::EVENT_LBUTTONDOWN)
 		return false;
 
-	if (_hotspot.contains(backgroundImageSpacePos)) {
+	if (contain(backgroundImageSpacePos)) {
 		int32 val = _engine->getScriptManager()->getStateValue(_key);
 		val = (val + 1) % _countTo;
 		_engine->getScriptManager()->setStateValue(_key, val);
@@ -130,7 +132,7 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_hotspot.contains(backgroundImageSpacePos)) {
+	if (contain(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_engine->getCursorManager()->getCursorId(_hoverCursor));
 		return true;
 	}
@@ -138,4 +140,11 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
 	return false;
 }
 
+bool PushToggleControl::contain(const Common::Point &point) {
+	for (uint i = 0; i < _hotspots.size(); i++)
+		if (_hotspots[i].contains(point))
+			return true;
+	return false;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/push_toggle_control.h b/engines/zvision/scripting/controls/push_toggle_control.h
index 6ba1bd77fa..7b45fb4831 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.h
+++ b/engines/zvision/scripting/controls/push_toggle_control.h
@@ -27,6 +27,7 @@
 
 #include "common/rect.h"
 #include "common/events.h"
+#include "common/array.h"
 
 
 namespace ZVision {
@@ -65,13 +66,15 @@ private:
 	 * The area that will trigger the event
 	 * This is in image space coordinates, NOT screen space
 	 */
-	Common::Rect _hotspot;
+	Common::Array<Common::Rect> _hotspots;
 	/** The cursor to use when hovering over _hotspot */
 	Common::String _hoverCursor;
 	/** Button maximal values count */
 	uint _countTo;
 
 	Common::EventType _event;
+
+	bool contain(const Common::Point &point);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 4bc319441069101a902ed22f48bec40b7e6c9284 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 22 Oct 2014 11:44:49 +0700
Subject: ZVISION: Implement simple midi support

---
 engines/zvision/core/midi.cpp | 89 +++++++++++++++++++++++++++++++++++++++++++
 engines/zvision/core/midi.h   | 59 ++++++++++++++++++++++++++++
 engines/zvision/module.mk     |  1 +
 engines/zvision/zvision.cpp   |  4 ++
 engines/zvision/zvision.h     |  5 +++
 5 files changed, 158 insertions(+)
 create mode 100644 engines/zvision/core/midi.cpp
 create mode 100644 engines/zvision/core/midi.h

diff --git a/engines/zvision/core/midi.cpp b/engines/zvision/core/midi.cpp
new file mode 100644
index 0000000000..5cc8cd0402
--- /dev/null
+++ b/engines/zvision/core/midi.cpp
@@ -0,0 +1,89 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/core/midi.h"
+
+namespace ZVision {
+
+midiManager::midiManager() {
+	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB);
+	_driver = MidiDriver::createMidi(dev);
+	_driver->open();
+}
+
+midiManager::~midiManager() {
+	stop();
+	_driver->close();
+	delete _driver;
+}
+
+void midiManager::stop() {
+	for (int8 i = 0; i < 16; i++)
+		if (_playChannels[i].playing)
+			noteOff(i);
+}
+
+void midiManager::noteOn(int8 channel, int8 note, int8 velocity) {
+	assert(channel <= 15);
+
+	_playChannels[channel].playing = true;
+	_playChannels[channel].note = note;
+	_driver->send(channel | (velocity << 16) | (note << 8) | 0x90);
+}
+
+void midiManager::noteOff(int8 channel) {
+	assert(channel <= 15);
+
+	if (_playChannels[channel].playing) {
+		_playChannels[channel].playing = false;
+		_driver->send(channel | (_playChannels[channel].note << 8) | 0x80);
+	}
+}
+
+int8 midiManager::getFreeChannel() {
+	for (int8 i = 0; i < 16; i++)
+		if (!_playChannels[i].playing)
+			return i;
+	return -1;
+}
+
+void midiManager::setPan(int8 channel, int8 pan) {
+	assert(channel <= 15);
+
+	_driver->send(channel | (pan << 16) | 0xAB0);
+}
+
+void midiManager::setVolume(int8 channel, int8 volume) {
+	assert(channel <= 15);
+
+	_driver->send(channel | (volume << 16) | 0x7B0);
+}
+
+void midiManager::setProgram(int8 channel, int8 prog) {
+	assert(channel <= 15);
+
+	_driver->send(channel | (prog << 8) | 0xC0);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/core/midi.h b/engines/zvision/core/midi.h
new file mode 100644
index 0000000000..79f8ea3d04
--- /dev/null
+++ b/engines/zvision/core/midi.h
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_MIDI_H
+#define ZVISION_MIDI_H
+
+#include "audio/mididrv.h"
+
+namespace ZVision {
+
+class midiManager {
+public:
+	midiManager();
+	~midiManager();
+
+	void stop();
+	void noteOn(int8 channel, int8 noteNumber, int8 velocity);
+	void noteOff(int8 channel);
+	void setPan(int8 channel, int8 pan);
+	void setVolume(int8 channel, int8 volume);
+	void setProgram(int8 channel, int8 prog);
+
+	int8 getFreeChannel();
+
+protected:
+
+	struct chan {
+		bool playing;
+		int8 note;
+
+		chan() : playing(false), note(0) {};
+	};
+
+	MidiDriver *_driver;
+	chan _playChannels[16];
+};
+
+}
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 872b48f775..3f00d67c4c 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -7,6 +7,7 @@ MODULE_OBJS := \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
+	core/midi.o \
 	core/save_manager.o \
 	core/search_manager.o \
 	cursors/cursor_manager.o \
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index a534e49c25..a78d68dc8c 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -36,6 +36,7 @@
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/fonts/truetype_font.h"
+#include "zvision/core/midi.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
@@ -67,6 +68,7 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _saveManager(nullptr),
 	  _stringManager(nullptr),
 	  _cursorManager(nullptr),
+	  _midiManager(nullptr),
 	  _aud_id(0),
 	  _rendDelay(2),
 	  _velocity(0) {
@@ -85,6 +87,7 @@ ZVision::~ZVision() {
 	delete _renderManager;
 	delete _scriptManager;
 	delete _rnd;
+	delete _midiManager;
 
 	// Remove all of our debug levels
 	DebugMan.clearAllDebugChannels();
@@ -156,6 +159,7 @@ void ZVision::initialize() {
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, &_pixelFormat);
 	_textRenderer = new textRenderer(this);
+	_midiManager = new midiManager();
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
 		_menu = new menuZgi(this);
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index e5d32bf678..cbd10da0d5 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -55,6 +55,7 @@ class RlfAnimation;
 class menuHandler;
 class textRenderer;
 class Subtitle;
+class midiManager;
 
 class ZVision : public Engine {
 public:
@@ -104,6 +105,7 @@ private:
 	menuHandler *_menu;
 	sManager *_searchManager;
 	textRenderer *_textRenderer;
+	midiManager *_midiManager;
 
 	// Clock
 	Clock _clock;
@@ -146,6 +148,9 @@ public:
 	textRenderer *getTextRenderer() const {
 		return _textRenderer;
 	}
+	midiManager *getMidiManager() const {
+		return _midiManager;
+	}
 	Common::RandomSource *getRandomSource() const {
 		return _rnd;
 	}
-- 
cgit v1.2.3


From 8e9d201cc3496f79fa30d1e05c7372998895c0e6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 22 Oct 2014 11:49:24 +0700
Subject: ZVISION: Music actions and sidefx now handle midi sounds.

---
 engines/zvision/scripting/actions.cpp           | 35 ++++++++++------
 engines/zvision/scripting/actions.h             |  4 +-
 engines/zvision/scripting/sidefx/music_node.cpp | 56 +++++++++++++++++++++++--
 engines/zvision/scripting/sidefx/music_node.h   | 55 +++++++++++++++++++++++-
 4 files changed, 132 insertions(+), 18 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 839eb1f92c..2464f54861 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -313,21 +313,26 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 
 	// type 4 are midi sound effect files
 	if (type == 4) {
-		_soundType = Audio::Mixer::kSFXSoundType;
-		_fileName = Common::String::format("midi/%s/%u.wav", fileNameBuffer, loop);
-		_loop = false;
+		_midi = true;
+		int note;
+		int prog;
+		sscanf(line.c_str(), "%u %d %d %u", &type, &prog, &note, &volume);
+		_volume = volume;
+		_note = note;
+		_prog = prog;
 	} else {
-		// TODO: See what the other types are so we can specify the correct Mixer::SoundType. In the meantime use kPlainSoundType
-		_soundType = Audio::Mixer::kPlainSoundType;
+		_midi = false;
 		_fileName = Common::String(fileNameBuffer);
 		_loop = loop == 1 ? true : false;
-	}
 
-	// Volume is optional. If it doesn't appear, assume full volume
-	if (volume != 255) {
-		// Volume in the script files is mapped to [0, 100], but the ScummVM mixer uses [0, 255]
-		_volume = volume * 255 / 100;
+		// Volume is optional. If it doesn't appear, assume full volume
+		if (volume != 255) {
+			// Volume in the script files is mapped to [0, 100], but the ScummVM mixer uses [0, 255]
+			_volume = volume * 255 / 100;
+		}
 	}
+
+
 }
 
 ActionMusic::~ActionMusic() {
@@ -339,10 +344,14 @@ bool ActionMusic::execute() {
 	if (_engine->getScriptManager()->getSideFX(_slotkey))
 		return true;
 
-	if (!_engine->getSearchManager()->hasFile(_fileName))
-		return true;
+	if (_midi) {
+		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotkey, _prog, _note, _volume));
+	} else {
+		if (!_engine->getSearchManager()->hasFile(_fileName))
+			return true;
 
-	_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotkey, _fileName, _loop, _volume));
+		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotkey, _fileName, _loop, _volume));
+	}
 
 	return true;
 }
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 5e34f6eaf0..b3c46d16ce 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -243,11 +243,13 @@ public:
 
 private:
 	uint32 _key;
-	Audio::Mixer::SoundType _soundType;
 	Common::String _fileName;
 	bool _loop;
 	byte _volume;
 	bool _universe;
+	bool _midi;
+	int8 _note;
+	int8 _prog;
 };
 
 class ActionPanTrack : public ResultAction {
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index 0351867dd9..4420da3e96 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -25,6 +25,7 @@
 #include "zvision/scripting/sidefx/music_node.h"
 
 #include "zvision/zvision.h"
+#include "zvision/core/midi.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/sound/zork_raw.h"
@@ -37,7 +38,7 @@
 namespace ZVision {
 
 MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
-	: SideFX(engine, key, SIDEFX_AUDIO) {
+	: MusicNode_BASE(engine, key, SIDEFX_AUDIO) {
 	_loop = loop;
 	_volume = volume;
 	_crossfade = false;
@@ -174,7 +175,7 @@ PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
 
 	SideFX *fx = _engine->getScriptManager()->getSideFX(slot);
 	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNode *mus = (MusicNode *)fx;
+		MusicNode_BASE *mus = (MusicNode_BASE *)fx;
 		mus->setPanTrack(pos);
 	}
 }
@@ -182,9 +183,58 @@ PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
 PanTrackNode::~PanTrackNode() {
 	SideFX *fx = _engine->getScriptManager()->getSideFX(_slot);
 	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNode *mus = (MusicNode *)fx;
+		MusicNode_BASE *mus = (MusicNode_BASE *)fx;
 		mus->unsetPanTrack();
 	}
 }
 
+
+MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
+	: MusicNode_BASE(engine, key, SIDEFX_AUDIO) {
+	_volume = volume;
+	_prog = program;
+	_noteNumber = note;
+	_pan = 0;
+
+	_chan = _engine->getMidiManager()->getFreeChannel();
+
+	if (_chan >= 0) {
+		_engine->getMidiManager()->setVolume(_chan, _volume);
+		_engine->getMidiManager()->setPan(_chan, _pan);
+		_engine->getMidiManager()->setProgram(_chan, _prog);
+		_engine->getMidiManager()->noteOn(_chan, _noteNumber, _volume);
+	}
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+MusicMidiNode::~MusicMidiNode() {
+	if (_chan >= 0) {
+		_engine->getMidiManager()->noteOff(_chan);
+	}
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+}
+
+void MusicMidiNode::setPanTrack(int16 pos) {
+}
+
+void MusicMidiNode::unsetPanTrack() {
+}
+
+void MusicMidiNode::setFade(int32 time, uint8 target) {
+}
+
+bool MusicMidiNode::process(uint32 deltaTimeInMillis) {
+	return false;
+}
+
+void MusicMidiNode::setVolume(uint8 new_volume) {
+	if (_chan >= 0) {
+		_engine->getMidiManager()->setVolume(_chan, new_volume);
+	}
+	_volume = new_volume;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index 066b8f80f4..262b13085e 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -32,7 +32,30 @@ class String;
 }
 
 namespace ZVision {
-class MusicNode : public SideFX {
+
+class MusicNode_BASE : public SideFX {
+public:
+	MusicNode_BASE(ZVision *engine, uint32 key, SideFXType type) : SideFX(engine, key, type) {}
+	~MusicNode_BASE() {}
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	virtual bool process(uint32 deltaTimeInMillis) = 0;
+
+	virtual void setVolume(uint8 volume) = 0;
+
+	virtual void setPanTrack(int16 pos) = 0;
+	virtual void unsetPanTrack() = 0;
+
+	virtual void setFade(int32 time, uint8 target) = 0;
+};
+
+class MusicNode : public MusicNode_BASE {
 public:
 	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
 	~MusicNode();
@@ -68,6 +91,36 @@ private:
 	Subtitle *_sub;
 };
 
+class MusicMidiNode : public MusicNode_BASE {
+public:
+	MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume);
+	~MusicMidiNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+	void setVolume(uint8 volume);
+
+	void setPanTrack(int16 pos);
+	void unsetPanTrack();
+
+	void setFade(int32 time, uint8 target);
+
+private:
+	int8 _chan;
+	int8 _noteNumber;
+	int8 _velocity;
+	int8 _pan;
+	int8 _volume;
+	int8 _prog;
+};
+
 class PanTrackNode : public SideFX {
 public:
 	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
-- 
cgit v1.2.3


From c021759ad2f0fdb723f98a62739bdf6d5de9c350 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Oct 2014 20:43:22 -0400
Subject: MADS: Add md5 checks for the asound.00* sound drivers

The implementation of the sound driver code relies on the data for each
sound being at specific locations in the files, so this ensures that
if any language version changes the sound files, we'll know about it
---
 engines/mads/nebular/sound_nebular.cpp | 28 ++++++++++++++++++++++++++++
 engines/mads/nebular/sound_nebular.h   |  5 +++++
 engines/mads/sound.cpp                 |  9 +++++++++
 3 files changed, 42 insertions(+)

diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index c540eb4382..a6dce74bba 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -24,6 +24,7 @@
 #include "audio/decoders/raw.h"
 #include "common/algorithm.h"
 #include "common/debug.h"
+#include "common/md5.h"
 #include "common/memstream.h"
 #include "mads/sound.h"
 #include "mads/nebular/sound_nebular.h"
@@ -218,6 +219,33 @@ ASound::~ASound() {
 	_mixer->stopHandle(_soundHandle);
 }
 
+void ASound::validate() {
+	byte digest[16];
+	Common::File f;
+	static const char *const MD5[] = {
+		"205398468de2c8873b7d4d73d5be8ddc",
+		"f9b2d944a2fb782b1af5c0ad592306d3",
+		"7431f8dad77d6ddfc24e6f3c0c4ac7df",
+		"eb1f3f5a4673d3e73d8ac1818c957cf4",
+		"f936dd853073fa44f3daac512e91c476",
+		"3dc139d3e02437a6d9b732072407c366",
+		"af0edab2934947982e9a405476702e03",
+		"8cbc25570b50ba41c9b5361cad4fbedc",
+		"a31e4783e098f633cbb6689adb41dd4f"
+	};
+
+	for (int i = 1; i <= 9; ++i) {
+		Common::String filename = Common::String::format("ASOUND.00%d", i);
+		if (!f.open(filename))
+			error("Could not process - %s", filename.c_str());
+		Common::String md5str = Common::computeStreamMD5AsString(f, 8192);
+		f.close();
+
+		if (md5str != MD5[i - 1])
+			error("Invalid sound file - %s", filename.c_str());
+	}
+}
+
 void ASound::adlibInit() {
 	write(4, 0x60);
 	write(4, 0x80);
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index abb6516030..ccfd40ad52 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -317,6 +317,11 @@ public:
 	 */
 	virtual ~ASound();
 
+	/**
+	 * Validates the Adlib sound files
+	 */
+	static void validate();
+
 	/**
 	 * Execute a player command. Most commands represent sounds to play, but some
 	 * low number commands also provide control operations.
diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index d0aa770a4d..1652550ba3 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -39,6 +39,15 @@ SoundManager::SoundManager(MADSEngine *vm, Audio::Mixer *mixer) {
 
 	_opl = OPL::Config::create();
 	_opl->init(11025);
+
+	// Validate sound files
+	switch (_vm->getGameID()) {
+	case GType_RexNebular:
+		Nebular::ASound::validate();
+		break;
+	default:
+		break;
+	}
 }
 
 SoundManager::~SoundManager() {
-- 
cgit v1.2.3


From 6fc5092c039e296195709c2274f2a9d4238b6986 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Oct 2014 21:05:47 -0400
Subject: MADS: Remove unused variable

---
 engines/mads/nebular/sound_nebular.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index a6dce74bba..0a054440b2 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -220,7 +220,6 @@ ASound::~ASound() {
 }
 
 void ASound::validate() {
-	byte digest[16];
 	Common::File f;
 	static const char *const MD5[] = {
 		"205398468de2c8873b7d4d73d5be8ddc",
-- 
cgit v1.2.3


From e738de70e51a1b348759d38756660e161567f991 Mon Sep 17 00:00:00 2001
From: Alexander Reim
Date: Thu, 23 Oct 2014 09:19:48 +0200
Subject: WII: missing ASCII codes for some keys

---
 backends/platform/wii/osystem_events.cpp | 136 +++++++++++++++----------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 0563639de3..13f5d1fbe0 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -70,73 +70,73 @@
 #endif
 
 #ifdef USE_WII_KBD
-static int keymap[][2] = {
-	{ KS_Return, Common::KEYCODE_RETURN },
-	{ KS_Up, Common::KEYCODE_UP },
-	{ KS_Down, Common::KEYCODE_DOWN },
-	{ KS_Left, Common::KEYCODE_LEFT },
-	{ KS_Right, Common::KEYCODE_RIGHT },
-	{ KS_Shift_L, Common::KEYCODE_LSHIFT },
-	{ KS_Shift_R, Common::KEYCODE_RSHIFT },
-	{ KS_Control_L, Common::KEYCODE_LCTRL },
-	{ KS_Control_R, Common::KEYCODE_RCTRL },
-	{ KS_Alt_L, Common::KEYCODE_LALT },
-	{ KS_Alt_R, Common::KEYCODE_RALT },
-	{ KS_Meta_L, Common::KEYCODE_LMETA },
-	{ KS_Meta_R, Common::KEYCODE_RMETA },
-	{ KS_KP_0, Common::KEYCODE_KP0 },
-	{ KS_KP_1, Common::KEYCODE_KP1 },
-	{ KS_KP_2, Common::KEYCODE_KP2 },
-	{ KS_KP_3, Common::KEYCODE_KP3 },
-	{ KS_KP_4, Common::KEYCODE_KP4 },
-	{ KS_KP_5, Common::KEYCODE_KP5 },
-	{ KS_KP_6, Common::KEYCODE_KP6 },
-	{ KS_KP_7, Common::KEYCODE_KP7 },
-	{ KS_KP_8, Common::KEYCODE_KP8 },
-	{ KS_KP_9, Common::KEYCODE_KP9 },
-	{ KS_Home, Common::KEYCODE_HOME },
-	{ KS_Insert, Common::KEYCODE_INSERT },
-	{ KS_End, Common::KEYCODE_END },
-	{ KS_Prior, Common::KEYCODE_PAGEUP },
-	{ KS_Next, Common::KEYCODE_PAGEDOWN },
-	{ KS_f1, Common::KEYCODE_F1 },
-	{ KS_f2, Common::KEYCODE_F2 },
-	{ KS_f3, Common::KEYCODE_F3 },
-	{ KS_f4, Common::KEYCODE_F4 },
-	{ KS_f5, Common::KEYCODE_F5 },
-	{ KS_f6, Common::KEYCODE_F6 },
-	{ KS_f7, Common::KEYCODE_F7 },
-	{ KS_f8, Common::KEYCODE_F8 },
-	{ KS_f9, Common::KEYCODE_F9 },
-	{ KS_f10, Common::KEYCODE_F10 },
-	{ KS_f11, Common::KEYCODE_F11 },
-	{ KS_f12, Common::KEYCODE_F12 },
-	{ KS_f13, Common::KEYCODE_F13 },
-	{ KS_f14, Common::KEYCODE_F14 },
-	{ KS_f15, Common::KEYCODE_F15 },
-	{ KS_F1, Common::KEYCODE_F1 },
-	{ KS_F2, Common::KEYCODE_F2 },
-	{ KS_F3, Common::KEYCODE_F3 },
-	{ KS_F4, Common::KEYCODE_F4 },
-	{ KS_F5, Common::KEYCODE_F5 },
-	{ KS_F6, Common::KEYCODE_F6 },
-	{ KS_F7, Common::KEYCODE_F7 },
-	{ KS_F8, Common::KEYCODE_F8 },
-	{ KS_F9, Common::KEYCODE_F9 },
-	{ KS_F10, Common::KEYCODE_F10 },
-	{ KS_F11, Common::KEYCODE_F11 },
-	{ KS_F12, Common::KEYCODE_F12 },
-	{ KS_F13, Common::KEYCODE_F13 },
-	{ KS_F14, Common::KEYCODE_F14 },
-	{ KS_F15, Common::KEYCODE_F15 },
-	{ KS_KP_Separator, Common::KEYCODE_KP_PERIOD },
-	{ KS_KP_Subtract, Common::KEYCODE_KP_DIVIDE },
-	{ KS_KP_Multiply, Common::KEYCODE_KP_MULTIPLY },
-	{ KS_KP_Add, Common::KEYCODE_KP_PLUS },
-	{ KS_KP_Subtract, Common::KEYCODE_KP_MINUS },
-	{ KS_KP_Equal, Common::KEYCODE_KP_EQUALS },
-	{ KS_KP_Enter, Common::KEYCODE_KP_ENTER },
-	{ 0, 0 }
+static int keymap[][3] = {
+	{ KS_Return, Common::KEYCODE_RETURN, Common::ASCII_RETURN },
+	{ KS_Up, Common::KEYCODE_UP, 0 },
+	{ KS_Down, Common::KEYCODE_DOWN, 0 },
+	{ KS_Left, Common::KEYCODE_LEFT, 0 },
+	{ KS_Right, Common::KEYCODE_RIGHT, 0 },
+	{ KS_Shift_L, Common::KEYCODE_LSHIFT, 0 },
+	{ KS_Shift_R, Common::KEYCODE_RSHIFT, 0 },
+	{ KS_Control_L, Common::KEYCODE_LCTRL, 0 },
+	{ KS_Control_R, Common::KEYCODE_RCTRL, 0 },
+	{ KS_Alt_L, Common::KEYCODE_LALT, 0 },
+	{ KS_Alt_R, Common::KEYCODE_RALT, 0 },
+	{ KS_Meta_L, Common::KEYCODE_LMETA, 0 },
+	{ KS_Meta_R, Common::KEYCODE_RMETA, 0 },
+	{ KS_KP_0, Common::KEYCODE_KP0, '0' },
+	{ KS_KP_1, Common::KEYCODE_KP1, '1' },
+	{ KS_KP_2, Common::KEYCODE_KP2, '2' },
+	{ KS_KP_3, Common::KEYCODE_KP3, '3' },
+	{ KS_KP_4, Common::KEYCODE_KP4, '4' },
+	{ KS_KP_5, Common::KEYCODE_KP5, '5' },
+	{ KS_KP_6, Common::KEYCODE_KP6, '6' },
+	{ KS_KP_7, Common::KEYCODE_KP7, '7' },
+	{ KS_KP_8, Common::KEYCODE_KP8, '8' },
+	{ KS_KP_9, Common::KEYCODE_KP9, '9' },
+	{ KS_Home, Common::KEYCODE_HOME, 0 },
+	{ KS_Insert, Common::KEYCODE_INSERT, 0 },
+	{ KS_End, Common::KEYCODE_END, 0 },
+	{ KS_Prior, Common::KEYCODE_PAGEUP, 0 },
+	{ KS_Next, Common::KEYCODE_PAGEDOWN, 0 },
+	{ KS_f1, Common::KEYCODE_F1, Common::ASCII_F1 },
+	{ KS_f2, Common::KEYCODE_F2, Common::ASCII_F2 },
+	{ KS_f3, Common::KEYCODE_F3, Common::ASCII_F3 },
+	{ KS_f4, Common::KEYCODE_F4, Common::ASCII_F4 },
+	{ KS_f5, Common::KEYCODE_F5, Common::ASCII_F5 },
+	{ KS_f6, Common::KEYCODE_F6, Common::ASCII_F6 },
+	{ KS_f7, Common::KEYCODE_F7, Common::ASCII_F7 },
+	{ KS_f8, Common::KEYCODE_F8, Common::ASCII_F8 },
+	{ KS_f9, Common::KEYCODE_F9, Common::ASCII_F9 },
+	{ KS_f10, Common::KEYCODE_F10, Common::ASCII_F10 },
+	{ KS_f11, Common::KEYCODE_F11, Common::ASCII_F11 },
+	{ KS_f12, Common::KEYCODE_F12, Common::ASCII_F12 },
+	{ KS_f13, Common::KEYCODE_F13, 0 },
+	{ KS_f14, Common::KEYCODE_F14, 0 },
+	{ KS_f15, Common::KEYCODE_F15, 0 },
+	{ KS_F1, Common::KEYCODE_F1, Common::ASCII_F1 },
+	{ KS_F2, Common::KEYCODE_F2, Common::ASCII_F2 },
+	{ KS_F3, Common::KEYCODE_F3, Common::ASCII_F3 },
+	{ KS_F4, Common::KEYCODE_F4, Common::ASCII_F4 },
+	{ KS_F5, Common::KEYCODE_F5, Common::ASCII_F5 },
+	{ KS_F6, Common::KEYCODE_F6, Common::ASCII_F6 },
+	{ KS_F7, Common::KEYCODE_F7, Common::ASCII_F7 },
+	{ KS_F8, Common::KEYCODE_F8, Common::ASCII_F8 },
+	{ KS_F9, Common::KEYCODE_F9, Common::ASCII_F9 },
+	{ KS_F10, Common::KEYCODE_F10, Common::ASCII_F10 },
+	{ KS_F11, Common::KEYCODE_F11, Common::ASCII_F11 },
+	{ KS_F12, Common::KEYCODE_F12, Common::ASCII_F12 },
+	{ KS_F13, Common::KEYCODE_F13, 0 },
+	{ KS_F14, Common::KEYCODE_F14, 0 },
+	{ KS_F15, Common::KEYCODE_F15, 0 },
+	{ KS_KP_Separator, Common::KEYCODE_KP_PERIOD, '.' },
+	{ KS_KP_Divide, Common::KEYCODE_KP_DIVIDE, '/' },
+	{ KS_KP_Multiply, Common::KEYCODE_KP_MULTIPLY, '*' },
+	{ KS_KP_Add, Common::KEYCODE_KP_PLUS, '+' },
+	{ KS_KP_Subtract, Common::KEYCODE_KP_MINUS, '-' },
+	{ KS_KP_Equal, Common::KEYCODE_KP_EQUALS, '=' },
+	{ KS_KP_Enter, Common::KEYCODE_KP_ENTER, Common::ASCII_RETURN },
+	{ 0, 0, 0 }
 };
 #endif
 
@@ -262,7 +262,7 @@ bool OSystem_Wii::pollKeyboard(Common::Event &event) {
 	while (keymap[i][0] != 0) {
 		if (keymap[i][0] == kbdEvent.symbol) {
 			event.kbd.keycode = static_cast<Common::KeyCode>(keymap[i][1]);
-			event.kbd.ascii = 0;
+			event.kbd.ascii = keymap[i][2];
 			return true;
 		}
 
-- 
cgit v1.2.3


From 678f47f043fc5498daae5d4331e02d23a2186528 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 23 Oct 2014 17:09:58 +0700
Subject: ZVISION: Implement action:distort and distort sidefx node

---
 engines/zvision/graphics/render_manager.cpp       |   4 +
 engines/zvision/graphics/render_manager.h         |   2 +
 engines/zvision/graphics/render_table.cpp         |  18 ++++
 engines/zvision/graphics/render_table.h           |   2 +
 engines/zvision/scripting/actions.cpp             |  23 +++++
 engines/zvision/scripting/actions.h               |   7 ++
 engines/zvision/scripting/scr_file_handling.cpp   |   2 +-
 engines/zvision/scripting/sidefx/distort_node.cpp | 109 ++++++++++++++++++++++
 engines/zvision/scripting/sidefx/distort_node.h   |  63 +++++++++++++
 9 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 engines/zvision/scripting/sidefx/distort_node.cpp
 create mode 100644 engines/zvision/scripting/sidefx/distort_node.h

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 0aa062214f..ce1962a8ee 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -1046,4 +1046,8 @@ EffectMap *RenderManager::makeEffectMap(const Graphics::Surface &surf, uint16 tr
 	return newMap;
 }
 
+void RenderManager::markDirty() {
+	_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 665a27bf64..e0fc5c248c 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -281,6 +281,8 @@ public:
 	EffectMap *makeEffectMap(const Graphics::Surface &surf, uint16 transp);
 
 	Common::Rect bkgRectToScreen(const Common::Rect &src);
+
+	void markDirty();
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 9bf40d3745..aeba729196 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -264,4 +264,22 @@ float RenderTable::getTiltGap() {
 	return _tiltOptions.gap;
 }
 
+float RenderTable::getAngle() {
+	if (_renderState == TILT)
+		return _tiltOptions.fieldOfView;
+	else if (_renderState == PANORAMA)
+		return _panoramaOptions.fieldOfView;
+	else
+		return 1.0;
+}
+
+float RenderTable::getLinscale() {
+	if (_renderState == TILT)
+		return _tiltOptions.linearScale;
+	else if (_renderState == PANORAMA)
+		return _panoramaOptions.linearScale;
+	else
+		return 1.0;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_table.h b/engines/zvision/graphics/render_table.h
index a268ee615f..7153738c6f 100644
--- a/engines/zvision/graphics/render_table.h
+++ b/engines/zvision/graphics/render_table.h
@@ -81,6 +81,8 @@ public:
 	void setTiltReverse(bool reverse);
 
 	float getTiltGap();
+	float getAngle();
+	float getLinscale();
 
 private:
 	void generatePanoramaLookupTable();
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 2464f54861..9733c5cae8 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -33,6 +33,7 @@
 #include "zvision/scripting/sidefx/music_node.h"
 #include "zvision/scripting/sidefx/syncsound_node.h"
 #include "zvision/scripting/sidefx/animation_node.h"
+#include "zvision/scripting/sidefx/distort_node.h"
 #include "zvision/scripting/sidefx/ttytext_node.h"
 #include "zvision/scripting/sidefx/region_node.h"
 #include "zvision/scripting/controls/titler_control.h"
@@ -192,6 +193,28 @@ bool ActionDisplayMessage::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionDistort
+//////////////////////////////////////////////////////////////////////////////
+
+ActionDistort::ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%hd %hd %f %f %f %f", &_distSlot, &_speed, &_st_angl, &_en_angl, &_st_lin, &_en_lin);
+}
+
+ActionDistort::~ActionDistort() {
+	_engine->getScriptManager()->killSideFx(_distSlot);
+}
+
+bool ActionDistort::execute() {
+	if (_engine->getScriptManager()->getSideFX(_distSlot))
+		return true;
+
+	_engine->getScriptManager()->addSideFX(new DistortNode(_engine, _distSlot, _speed, _st_angl, _en_angl, _st_lin, _en_lin));
+
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionEnableControl
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index b3c46d16ce..f51847ed05 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -202,9 +202,16 @@ public:
 class ActionDistort : public ResultAction {
 public:
 	ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line);
+	~ActionDistort();
 	bool execute();
 
 private:
+	int16 _distSlot;
+	int16 _speed;
+	float _st_angl;
+	float _en_angl;
+	float _st_lin;
+	float _en_lin;
 };
 
 class ActionEnableControl : public ResultAction {
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 8140d09a6a..df60b0b8d4 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -242,7 +242,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("dissolve", true)) {
 					// TODO: Implement ActionDissolve
 				} else if (act.matchString("distort", true)) {
-					// TODO: Implement ActionDistort
+					actionList.push_back(new ActionDistort(_engine, slot, args));
 				} else if (act.matchString("enable_control", true)) {
 					actionList.push_back(new ActionEnableControl(_engine, slot, args));
 				} else if (act.matchString("flush_mouse_events", true)) {
diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp
new file mode 100644
index 0000000000..576a1f8592
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/distort_node.cpp
@@ -0,0 +1,109 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/sidefx/distort_node.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/render_table.h"
+
+#include "common/stream.h"
+
+
+namespace ZVision {
+
+DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float st_angl, float en_angl, float st_lin, float en_lin)
+	: SideFX(engine, key, SIDEFX_DISTORT) {
+
+	_angle = _engine->getRenderManager()->getRenderTable()->getAngle();
+	_linScale = _engine->getRenderManager()->getRenderTable()->getLinscale();
+
+	_speed = speed;
+	_incr = true;
+	_st_angl = st_angl;
+	_en_angl = en_angl;
+	_st_lin = st_lin;
+	_en_lin = en_lin;
+
+	_curFrame = 1.0;
+
+	_diff_angl = en_angl - st_angl;
+	_diff_lin = en_lin - st_lin;
+
+	_frmSpeed = (float)speed / 15.0;
+	_frames = ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed);
+	if (_frames <= 0)
+		_frames = 1;
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+DistortNode::~DistortNode() {
+	setParams(_angle, _linScale);
+}
+
+bool DistortNode::process(uint32 deltaTimeInMillis) {
+
+	float updTime = deltaTimeInMillis / (1000.0 / 60.0);
+
+	if (_incr)
+		_curFrame += updTime;
+	else
+		_curFrame -= updTime;
+
+	if (_curFrame < 1.0) {
+		_curFrame = 1.0;
+		_incr = true;
+	} else if (_curFrame > _frames) {
+		_curFrame = _frames;
+		_incr = false;
+	}
+
+	float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed);
+
+
+	setParams(_st_angl + diff * _diff_angl, _st_lin + diff * _diff_lin);
+
+	return false;
+}
+
+void DistortNode::setParams(float angl, float linScale) {
+	RenderTable *table = _engine->getRenderManager()->getRenderTable();
+	if (table->getRenderState() == RenderTable::PANORAMA) {
+		table->setPanoramaFoV(angl);
+		table->setPanoramaScale(linScale);
+		table->generateRenderTable();
+		_engine->getRenderManager()->markDirty();
+	} else if (table->getRenderState() == RenderTable::TILT) {
+		table->setTiltFoV(angl);
+		table->setTiltScale(linScale);
+		table->generateRenderTable();
+		_engine->getRenderManager()->markDirty();
+	}
+}
+
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/distort_node.h b/engines/zvision/scripting/sidefx/distort_node.h
new file mode 100644
index 0000000000..cba9c5eff2
--- /dev/null
+++ b/engines/zvision/scripting/sidefx/distort_node.h
@@ -0,0 +1,63 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_DISTORT_NODE_H
+#define ZVISION_DISTORT_NODE_H
+
+#include "zvision/scripting/sidefx.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class DistortNode : public SideFX {
+public:
+	DistortNode(ZVision *engine, uint32 key, int16 speed, float st_angl, float en_angl, float st_lin, float en_lin);
+	~DistortNode();
+
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	int16 _speed;
+	float _st_angl;
+	float _en_angl;
+	float _st_lin;
+	float _en_lin;
+
+	float _frmSpeed;
+	float _diff_angl;
+	float _diff_lin;
+	bool _incr;
+	int16 _frames;
+
+	float _curFrame;
+
+	float _angle;
+	float _linScale;
+
+private:
+	void setParams(float angl, float linScale);
+};
+
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From 19b2e9123db86193ad297bf867f7768dfdb389e9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 23 Oct 2014 17:12:25 +0700
Subject: ZVISION: Add distort_node to module.mk for success build

---
 engines/zvision/module.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 3f00d67c4c..1730bbc512 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -36,6 +36,7 @@ MODULE_OBJS := \
 	scripting/script_manager.o \
 	scripting/sidefx.o \
 	scripting/sidefx/animation_node.o \
+	scripting/sidefx/distort_node.o \
 	scripting/sidefx/music_node.o \
 	scripting/sidefx/region_node.o \
 	scripting/sidefx/syncsound_node.o \
-- 
cgit v1.2.3


From 8b18ba64ae544e762ca29449e7be29f6a430201e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 23 Oct 2014 17:13:56 +0700
Subject: ZVISION: Add support for doubleFPS feature

---
 engines/zvision/detection.cpp | 8 ++++++++
 engines/zvision/zvision.cpp   | 3 +++
 engines/zvision/zvision.h     | 1 +
 3 files changed, 12 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 5ad2e7d977..1492ade639 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -106,6 +106,13 @@ static const ExtraGuiOption ZVisionExtraGuiOption = {
 	false
 };
 
+static const ExtraGuiOption ZVisionExtraGuiOption2 = {
+	_s("Double FPS"),
+	_s("Halve the update delay"),
+	"doublefps",
+	false
+};
+
 class ZVisionMetaEngine : public AdvancedMetaEngine {
 public:
 	ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), zVisionGames) {
@@ -162,6 +169,7 @@ bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADG
 const ExtraGuiOptions ZVisionMetaEngine::getExtraGuiOptions(const Common::String &target) const {
 	ExtraGuiOptions options;
 	options.push_back(ZVisionExtraGuiOption);
+	options.push_back(ZVisionExtraGuiOption2);
 	return options;
 }
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index a78d68dc8c..0bc5fef39a 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -173,6 +173,7 @@ void ZVision::initialize() {
 
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
+	_halveDelay = ConfMan.getBool("doublefps");
 }
 
 Common::Error ZVision::run() {
@@ -210,6 +211,8 @@ Common::Error ZVision::run() {
 		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
 		// Ensure non-negative
 		delay = delay < 0 ? 0 : delay;
+		if (_halveDelay)
+			delay >>= 1;
 		_system->delayMillis(delay);
 	}
 
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index cbd10da0d5..8a305f5d37 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -121,6 +121,7 @@ private:
 
 	int _rendDelay;
 	int16 _velocity;
+	bool _halveDelay;
 public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
-- 
cgit v1.2.3


From 9c885719fd27be0c84ede2f403dc5ab82065ecd4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 24 Oct 2014 18:18:11 +0200
Subject: GCW0: Initial code for GCW Zero port

---
 dists/gcw0/default.gcw0.desktop |  16 ++++++
 dists/gcw0/opk_make.sh          | 111 ++++++++++++++++++++++++++++++++++++++++
 dists/gcw0/scummvm.png          | Bin 0 -> 2656 bytes
 dists/gcw0/scummvm.sh           |   9 ++++
 dists/gcw0/scummvmrc            |   6 +++
 ports.mk                        |  16 ++++++
 6 files changed, 158 insertions(+)
 create mode 100644 dists/gcw0/default.gcw0.desktop
 create mode 100755 dists/gcw0/opk_make.sh
 create mode 100644 dists/gcw0/scummvm.png
 create mode 100755 dists/gcw0/scummvm.sh
 create mode 100644 dists/gcw0/scummvmrc

diff --git a/dists/gcw0/default.gcw0.desktop b/dists/gcw0/default.gcw0.desktop
new file mode 100644
index 0000000000..32c2982da7
--- /dev/null
+++ b/dists/gcw0/default.gcw0.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Comment[sv]=Tolk för flera äventyrsspel
+Comment[he]=פרשן למספר משחקי הרפתקאות
+Comment[de]=Interpreter für diverse Abenteuerspiele
+Comment[es]=Intérprete para varias aventuras gráficas
+Comment[ca]=Intèrpret per diverses aventures gràfiques
+Exec=scummvm
+Icon=scummvm
+Terminal=false
+Type=Application
+Categories=Game;AdventureGame;
+StartupNotify=false
+X-OD-Manual=README
diff --git a/dists/gcw0/opk_make.sh b/dists/gcw0/opk_make.sh
new file mode 100755
index 0000000000..b1bfd03efb
--- /dev/null
+++ b/dists/gcw0/opk_make.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# opk_make.sh
+#
+# This script is meant to ease generation of a opk file. Please consult the output
+# when running --help for a list of available parameters and an explaination of
+# those.
+#
+# Required tools when running the script:
+# bash
+# echo, cat, mv, rm, mksquashfs
+
+check_for_tool()
+{
+	which $1 &> /dev/null
+	if [ "$?" -ne "0" ];
+	then
+		cecho "ERROR: Could not find the program '$1'. Please make sure
+that it is available in your PATH since it is required to complete your request." $red
+		exit 1
+	fi
+}
+
+print_help()
+{
+	cat << EOSTREAM
+opk_make.sh - A script to package "something" into a OPK.
+
+Usage:
+  $(basename ${0}) {--directory|-d} <folder> {--opk|-o} <file> [{--help|-h}]
+
+
+Switches:
+  --directory / -d          Sets the folder that is to be used for the resulting opk
+                            to <folder>. This option is mandatory for the script to
+                            function correctly.
+
+  --help / -h               Displays this help text.
+
+  --opkname / -o            Sets the output filename of the resulting opk to <file>.
+                            This option is mandatory for the script to function
+                            correctly.
+
+A version >=4.0 of squashfs is required to be available in your PATH.
+EOSTREAM
+}
+
+
+# Parse command line parameters
+while [ "${1}" != "" ]; do
+	if [ "${1}" = "--directory" ] || [ "${1}" = "-d" ];
+	then
+		FOLDER=$2
+		shift 2
+	elif [ "${1}" = "--help" ] || [ "${1}" = "-h" ];
+	then
+		print_help
+		exit 0
+	elif [ "${1}" = "--opkname" ] || [ "${1}" = "-o" ];
+	then
+		OPKNAME=$2
+		shift 2
+	else
+		echo "ERROR: '$1' is not a known argument. Printing --help and aborting."
+		print_help
+		exit 1
+	fi
+done
+
+
+# Probe if required variables were set
+echo "Checking if all required variables were set."
+if [ ! $OPKNAME ] || [ ! $FOLDER ];
+then
+	echo "ERROR: Not all required options were set! Please see the --help information below."
+	print_help
+	exit 1
+else
+	echo "OPKNAME set to '$OPKNAME'."
+fi
+# Check if the selected folder actually exists
+if [ ! -d $FOLDER ];
+then
+	echo "ERROR: '$FOLDER' doesn't exist or is not a folder."
+	exit 1
+else
+	echo "FOLDER set to '$FOLDER'."
+fi
+
+# Make iso from folder
+echo "Creating an iso file based on '$FOLDER'."
+
+check_for_tool mksquashfs
+if [ $(mksquashfs -version | awk 'BEGIN{r=0} $3>=4{r=1} END{print r}') -eq 0 ];
+then
+	echo "ERROR: Your squashfs version is older then version 4, please upgrade to 4.0 or later"
+	exit 1
+fi
+mksquashfs $FOLDER $OPKNAME.opk -noappend -no-exports -no-xattrs
+
+# Final message
+if [ -f $OPKNAME ];
+then
+	echo "Successfully finished creating the opk '$OPKNAME'."
+else
+	echo "There seems to have been a problem and '$OPKNAME' was not created. Please check
+the output above for any error messages. A possible cause for this is that there was
+not enough space available."
+	exit 1
+fi
+
diff --git a/dists/gcw0/scummvm.png b/dists/gcw0/scummvm.png
new file mode 100644
index 0000000000..128e59efc4
Binary files /dev/null and b/dists/gcw0/scummvm.png differ
diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
new file mode 100755
index 0000000000..c12a3030cc
--- /dev/null
+++ b/dists/gcw0/scummvm.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+cd `dirname $0`
+
+if [ ! -f $HOME/.scummvmrc ] ; then
+	cp ./scummvmrc $HOME/.scummvmrc
+fi
+
+exec ./scummvm
diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
new file mode 100644
index 0000000000..afa295e4b6
--- /dev/null
+++ b/dists/gcw0/scummvmrc
@@ -0,0 +1,6 @@
+[scummvm]
+fullscreen=true
+gfx_mode=1x
+aspect_ratio=true
+themepath=/mnt/scummvm
+browser_lastpath=/media
diff --git a/ports.mk b/ports.mk
index 97b43fe92e..ce6bf38ab2 100644
--- a/ports.mk
+++ b/ports.mk
@@ -293,6 +293,22 @@ win32setup: $(EXECUTABLE)
 	makensis -V2 -Dtop_srcdir="../.." -Dstaging_dir="../../$(STAGINGPATH)" -Darch=$(ARCH) $(srcdir)/dists/win32/scummvm.nsi
 
 
+# Special target for generationg GCW-Zero OPK bundle
+gcw0-opk:
+	mkdir gcw0-opk
+	cp $(DIST_FILES_DOCS) gcw0-opk/
+	cp $(DIST_FILES_THEMES) gcw0-opk/
+ifdef DIST_FILES_ENGINEDATA
+	cp $(DIST_FILES_ENGINEDATA) gcw0-opk/
+endif
+	$(STRIP) scummvm
+	chmod 755 scummvm
+	cp scummvm gcw0-opk/
+	cp $(srcdir)/dists/gcw0/scummvm.png gcw0-opk/
+	cp $(srcdir)/dists/gcw0/default.gcw0.desktop gcw0-opk/
+	cp $(srcdir)/dists/gcw0/scummvmrc gcw0-opk/
+	cp $(srcdir)/dists/gcw0/scummvm.sh gcw0-opk/
+	./dists/gcw0/opk_make.sh -d gcw0-opk -o scummvm.opk
 #
 # Special target to generate project files for various IDEs
 # Mainly Win32-specific
-- 
cgit v1.2.3


From b6302c6e5155af097940c0043e1b7941c2c1fefe Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 25 Oct 2014 20:52:14 +0200
Subject: PRINCE: Fix potential out-of-bounds write (CID 1248504)

There are kMaxTexts text slots, so kMaxTexts itself is not valid.
---
 engines/prince/prince.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 29c434e9c9..17cef6327f 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -730,8 +730,8 @@ bool PrinceEngine::loadSample(uint32 sampleSlot, const Common::String &streamNam
 bool PrinceEngine::loadVoice(uint32 slot, uint32 sampleSlot, const Common::String &streamName) {
 	debugEngine("Loading wav %s slot %d", streamName.c_str(), slot);
 
-	if (slot > kMaxTexts) {
-		error("Text slot bigger than MAXTEXTS %d", kMaxTexts);
+	if (slot >= kMaxTexts) {
+		error("Text slot bigger than MAXTEXTS %d", kMaxTexts - 1);
 		return false;
 	}
 
-- 
cgit v1.2.3


From 0579bf6f18e56410e1b94e97034c8db774e73b06 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 25 Oct 2014 20:57:52 +0200
Subject: PRINCE: Fix potential out-of-bounds reads (CID 1248500, 1248503)

Since heroSetTable[] is an array of int, use >= ARRAYSIZE() instead
of > sizeof().
---
 engines/prince/hero.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp
index 06fba25ba9..146470f6b7 100644
--- a/engines/prince/hero.cpp
+++ b/engines/prince/hero.cpp
@@ -54,7 +54,7 @@ Hero::~Hero() {
 bool Hero::loadAnimSet(uint32 animSetNr) {
 	_animSetNr = animSetNr;
 
-	if (animSetNr > sizeof(heroSetTable)) {
+	if (animSetNr >= ARRAYSIZE(heroSetTable)) {
 		return false;
 	}
 
-- 
cgit v1.2.3


From f25e889c13238671c8ce33a95bcf59f82e70c5c3 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 25 Oct 2014 21:02:03 +0200
Subject: PRINCE: Fix potential out-of-bounds read (CID 1248502)

Since _opcodes[] has kNumOpcodes elements, kNumOpcodes itself is
not a valid index.
---
 engines/prince/script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 0e9dd27877..25249d3236 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -477,7 +477,7 @@ uint32 Interpreter::step(uint32 opcodePC) {
 		// Get the current opcode
 		_lastOpcode = readScript16();
 
-		if (_lastOpcode > kNumOpcodes)
+		if (_lastOpcode >= kNumOpcodes)
 			error(
 				"Trying to execute unknown opcode @0x%04X: %02d", 
 				_currentInstruction, 
-- 
cgit v1.2.3


From 4fdd9bbab33e00e2520c642bf5cca798b8e6e1b5 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 25 Oct 2014 21:11:49 +0200
Subject: ZVISION: Fix memory leak (CID 1109659)

---
 engines/zvision/fonts/truetype_font.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp
index ba4d72bde8..45eaeeb2b4 100644
--- a/engines/zvision/fonts/truetype_font.cpp
+++ b/engines/zvision/fonts/truetype_font.cpp
@@ -95,6 +95,7 @@ Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, u
 		lines.pop_back();
 	}
 	if (lines.size() == 0) {
+		delete surface;
 		return nullptr;
 	}
 
-- 
cgit v1.2.3


From 522cd1c97082a7cae83b39877d4d33abc6770756 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 09:30:21 +0100
Subject: PRINCE: Fix warning

---
 engines/prince/prince.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 17cef6327f..b0f2cd5056 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1901,29 +1901,29 @@ void PrinceEngine::blackPalette() {
 
 void PrinceEngine::setPalette(const byte *palette) {
 	if (palette != nullptr) {
-		byte *blackPalette = (byte *)malloc(256 * 3);
+		byte *blackPalette_ = (byte *)malloc(256 * 3);
 		int fadeStep = 0;
 		for (int i = 0; i <= kFadeStep; i++) {
 			for (int j = 0; j < 256; j++) {
-				blackPalette[3 * j] = palette[3 * j] * fadeStep / 4;
-				blackPalette[3 * j + 1] = palette[3 * j + 1] * fadeStep / 4;
-				blackPalette[3 * j + 2] = palette[3 * j + 2] * fadeStep / 4;
+				blackPalette_[3 * j] = palette[3 * j] * fadeStep / 4;
+				blackPalette_[3 * j + 1] = palette[3 * j + 1] * fadeStep / 4;
+				blackPalette_[3 * j + 2] = palette[3 * j + 2] * fadeStep / 4;
 			}
 			fadeStep++;
-			_graph->setPalette(blackPalette);
+			_graph->setPalette(blackPalette_);
 			_system->updateScreen();
 			Common::Event event;
 			Common::EventManager *eventMan = _system->getEventManager();
 			eventMan->pollEvent(event);
 			if (shouldQuit()) {
 				_graph->setPalette(palette);
-				free(blackPalette);
+				free(blackPalette_);
 				return;
 			}
 			pause();
 		}
 		_graph->setPalette(palette);
-		free(blackPalette);
+		free(blackPalette_);
 	}
 }
 
-- 
cgit v1.2.3


From 3b9ac0318cdd35d645e2ae724dcddb5a3d018345 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 09:32:58 +0100
Subject: PRINCE: Fix variable sign

---
 engines/prince/script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 25249d3236..71d003da8f 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -391,7 +391,7 @@ bool Script::loadAllMasks(Common::Array<Mask> &maskList, int offset) {
 			debug("Can't load %s", msStreamName.c_str());
 			delete msStream;
 		} else {
-			uint32 dataSize = msStream->size();
+			int32 dataSize = msStream->size();
 			if (dataSize != -1) {
 				tempMask._data = (byte *)malloc(dataSize);
 				if (msStream->read(tempMask._data, dataSize) != dataSize) {
-- 
cgit v1.2.3


From 123e52f441619d5c866b9f6e05fcc2775a405830 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 09:34:48 +0100
Subject: PRINCE: Fix another variable sign

---
 engines/prince/script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 71d003da8f..d1a0034940 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -394,7 +394,7 @@ bool Script::loadAllMasks(Common::Array<Mask> &maskList, int offset) {
 			int32 dataSize = msStream->size();
 			if (dataSize != -1) {
 				tempMask._data = (byte *)malloc(dataSize);
-				if (msStream->read(tempMask._data, dataSize) != dataSize) {
+				if (msStream->read(tempMask._data, dataSize) != (uint32)dataSize) {
 					free(tempMask._data);
 					delete msStream;
 					return false;
-- 
cgit v1.2.3


From d4c687ddc8b5e4075c8085b7e761a9da3f2cbe74 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 07:00:36 -0400
Subject: GCW0: Further work on the port

---
 backends/platform/dingux/dingux.mk | 28 ++++++++++++++++++++++++++++
 dists/gcw0/scummvm.sh              |  2 +-
 dists/gcw0/scummvmrc               |  4 +++-
 ports.mk                           | 16 ----------------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 48a9347143..f02801ea98 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -1,6 +1,7 @@
 DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 
 bundle_name = dingux-dist/scummvm
+gcw0_bundle = gcw0-opk
 
 all: $(DINGUX_EXE_STRIPPED)
 
@@ -30,3 +31,30 @@ endif
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
+
+# Special target for generationg GCW-Zero OPK bundle
+gcw0-opk: all
+	$(MKDIR) $(gcw0_bundle)
+	$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
+	$(MKDIR) $(gcw0_bundle)/themes
+	$(CP) $(DIST_FILES_THEMES) $(gcw0_bundle)/themes/
+ifdef DIST_FILES_ENGINEDATA
+	$(MKDIR) $(gcw0_bundle)/engine-data
+	$(CP) $(DIST_FILES_ENGINEDATA) $(gcw0_bundle)/engine-data/
+endif
+ifdef DYNAMIC_MODULES
+	$(MKDIR) $(gcw0_bundle)/plugins
+	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
+	$(STRIP) $(gcw0_bundle)/plugins/*
+endif
+	$(STRIP) $(EXECUTABLE) -o $(gcw0_bundle)/scummvm
+
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(gcw0_bundle)/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(gcw0_bundle)/
+
+	$(CP) $(srcdir)/dists/gcw0/scummvm.png $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/default.gcw0.desktop $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
+	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
+
diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index c12a3030cc..5ad7a8579a 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -3,7 +3,7 @@
 cd `dirname $0`
 
 if [ ! -f $HOME/.scummvmrc ] ; then
-	cp ./scummvmrc $HOME/.scummvmrc
+	cp /mnt/ScummVM/scummvmrc $HOME/.scummvmrc
 fi
 
 exec ./scummvm
diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index afa295e4b6..87b97c191c 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -2,5 +2,7 @@
 fullscreen=true
 gfx_mode=1x
 aspect_ratio=true
-themepath=/mnt/scummvm
+themepath=/mnt/ScummVM/themes
 browser_lastpath=/media
+extrapath=/mnt/ScummVM/engine-data
+pluginspath=/mnt/ScummVM/plugins
diff --git a/ports.mk b/ports.mk
index ce6bf38ab2..97b43fe92e 100644
--- a/ports.mk
+++ b/ports.mk
@@ -293,22 +293,6 @@ win32setup: $(EXECUTABLE)
 	makensis -V2 -Dtop_srcdir="../.." -Dstaging_dir="../../$(STAGINGPATH)" -Darch=$(ARCH) $(srcdir)/dists/win32/scummvm.nsi
 
 
-# Special target for generationg GCW-Zero OPK bundle
-gcw0-opk:
-	mkdir gcw0-opk
-	cp $(DIST_FILES_DOCS) gcw0-opk/
-	cp $(DIST_FILES_THEMES) gcw0-opk/
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) gcw0-opk/
-endif
-	$(STRIP) scummvm
-	chmod 755 scummvm
-	cp scummvm gcw0-opk/
-	cp $(srcdir)/dists/gcw0/scummvm.png gcw0-opk/
-	cp $(srcdir)/dists/gcw0/default.gcw0.desktop gcw0-opk/
-	cp $(srcdir)/dists/gcw0/scummvmrc gcw0-opk/
-	cp $(srcdir)/dists/gcw0/scummvm.sh gcw0-opk/
-	./dists/gcw0/opk_make.sh -d gcw0-opk -o scummvm.opk
 #
 # Special target to generate project files for various IDEs
 # Mainly Win32-specific
-- 
cgit v1.2.3


From 2699259638373381880a01eefdb8608b1d78579b Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 07:19:37 -0400
Subject: GCW0: Correct launch options

---
 dists/gcw0/default.gcw0.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dists/gcw0/default.gcw0.desktop b/dists/gcw0/default.gcw0.desktop
index 32c2982da7..46bd2be092 100644
--- a/dists/gcw0/default.gcw0.desktop
+++ b/dists/gcw0/default.gcw0.desktop
@@ -7,10 +7,10 @@ Comment[he]=פרשן למספר משחקי הרפתקאות
 Comment[de]=Interpreter für diverse Abenteuerspiele
 Comment[es]=Intérprete para varias aventuras gráficas
 Comment[ca]=Intèrpret per diverses aventures gràfiques
-Exec=scummvm
+Exec=scummvm.sh
 Icon=scummvm
 Terminal=false
 Type=Application
-Categories=Game;AdventureGame;
+Categories=games
 StartupNotify=false
 X-OD-Manual=README
-- 
cgit v1.2.3


From 0ee20cebc759a8d7e75e34177ed71b62cdabd987 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 07:20:11 -0400
Subject: GCW0: Enable analog joystick by default

---
 dists/gcw0/scummvmrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index 87b97c191c..1f4043b3ae 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -6,3 +6,4 @@ themepath=/mnt/ScummVM/themes
 browser_lastpath=/media
 extrapath=/mnt/ScummVM/engine-data
 pluginspath=/mnt/ScummVM/plugins
+joystick=0
-- 
cgit v1.2.3


From 5b5a2bc7a4c10e3c18a9cc7a7dca5c01c440d8f3 Mon Sep 17 00:00:00 2001
From: Matthias Mailänder
Date: Sun, 14 Sep 2014 10:48:45 +0200
Subject: BUILD: Install the theme-able SVG icon

Add missing hicolor SVG icon to install. Retain older pixmaps xpm icon
for now.
---
 ports.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports.mk b/ports.mk
index 97b43fe92e..fdab7e23af 100644
--- a/ports.mk
+++ b/ports.mk
@@ -12,6 +12,8 @@ install:
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
 	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm"
+	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/"
+	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg"
 	$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
@@ -28,6 +30,8 @@ install-strip:
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
 	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm"
+	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/"
+	$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg"
 	$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
@@ -41,6 +45,7 @@ uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
 	rm -f "$(DESTDIR)$(mandir)/man6/scummvm.6"
 	rm -f "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm"
+	rm -f "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg"
 	rm -rf "$(DESTDIR)$(docdir)"
 	rm -rf "$(DESTDIR)$(datadir)"
 ifdef DYNAMIC_MODULES
-- 
cgit v1.2.3


From f5e273ded942d2de09be4673cc6b6f136d6ed1e3 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 14:29:43 -0400
Subject: GCW0: Create log file at game launch

---
 dists/gcw0/scummvm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index 5ad7a8579a..4ffb429130 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -6,4 +6,4 @@ if [ ! -f $HOME/.scummvmrc ] ; then
 	cp /mnt/ScummVM/scummvmrc $HOME/.scummvmrc
 fi
 
-exec ./scummvm
+exec ./scummvm 2>&1 >$HOME/scummvm.log
-- 
cgit v1.2.3


From 293a0d0046c9f393f741de66a9ffa0dbc06991e2 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 14:30:29 -0400
Subject: GCW0: Create target with unstripped binaries

---
 backends/platform/dingux/dingux.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index f02801ea98..1333e89ff8 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -33,7 +33,7 @@ endif
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
 
 # Special target for generationg GCW-Zero OPK bundle
-gcw0-opk: all
+$(gcw0_bundle): all
 	$(MKDIR) $(gcw0_bundle)
 	$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
 	$(MKDIR) $(gcw0_bundle)/themes
@@ -45,9 +45,8 @@ endif
 ifdef DYNAMIC_MODULES
 	$(MKDIR) $(gcw0_bundle)/plugins
 	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
-	$(STRIP) $(gcw0_bundle)/plugins/*
 endif
-	$(STRIP) $(EXECUTABLE) -o $(gcw0_bundle)/scummvm
+	$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
 
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(gcw0_bundle)/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(gcw0_bundle)/
@@ -56,5 +55,13 @@ endif
 	$(CP) $(srcdir)/dists/gcw0/default.gcw0.desktop $(gcw0_bundle)/
 	$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
 	$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
+
+gcw0-opk-unstripped: $(gcw0_bundle)
+	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
+	$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
 	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
 
+gcw-opk: $(gcw0_bundle)
+	$(STRIP) $(gcw0_bundle)/plugins/*
+	$(STRIP) $(gcw0_bundle)/scummvm
+	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
-- 
cgit v1.2.3


From 6046863fdd2f5e5d3622c8942ce39ca743857988 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 14:31:02 -0400
Subject: BASE: Display virtual keyboard and keymapper in game options

---
 base/version.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/base/version.cpp b/base/version.cpp
index ef02ff9d21..fcb2740de9 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -146,4 +146,12 @@ const char *gScummVMFeatures = ""
 #ifdef USE_PNG
 	"PNG "
 #endif
+
+#ifdef ENABLE_KEYMAPPER
+	"keymapper "
+#endif
+
+#ifdef ENABLE_VKEYBD
+	"virtual keyboard "
+#endif
 	;
-- 
cgit v1.2.3


From d1169beed169a906925ee078fd7439ac455c8b97 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 14:31:36 -0400
Subject: CONFIGURE: Create port-specific platform for GCW0

---
 configure | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 5264e32410..09b8383120 100755
--- a/configure
+++ b/configure
@@ -822,9 +822,9 @@ Usage: $0 [OPTIONS]...
 
 Configuration:
   -h, --help              display this help and exit
-  --backend=BACKEND       backend to build (android, tizen, dc, dingux, ds, gph,
-                          iphone, linuxmoto, maemo, n64, null, openpandora, ps2,
-                          psp, samsungtv, sdl, webos, wii, wince) [sdl]
+  --backend=BACKEND       backend to build (android, tizen, dc, dingux, ds, gcw0,
+                          gph, iphone, linuxmoto, maemo, n64, null, openpandora,
+                          ps2, psp, samsungtv, sdl, webos, wii, wince) [sdl]
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -859,6 +859,7 @@ Special configuration feature:
                                            dreamcast for Sega Dreamcast
                                            ds for Nintendo DS
                                            gamecube for Nintendo GameCube
+                                           gcw0 for GCW Zero
                                            gp2x for GP2X
                                            gp2xwiz for GP2X Wiz
                                            iphone for Apple iPhone
@@ -1298,7 +1299,7 @@ caanoo)
 	_host_cpu=arm
 	_host_alias=arm-none-linux-gnueabi
 	;;
-dingux)
+dingux | gcw0)
 	_host_os=linux
 	_host_cpu=mipsel
 	_host_alias=mipsel-linux
@@ -2588,6 +2589,27 @@ if test -n "$_host"; then
 			add_line_to_config_h "/* #define DEBUG_WII_GDB */"
 			add_line_to_config_h "#define USE_WII_DI"
 			;;
+               gcw0)
+			DEFINES="$DEFINES -DDINGUX"
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+			ASFLAGS="$ASFLAGS"
+			CXXFLAGS="$CXXFLAGS -msoft-float"
+			CXXFLAGS="$CXXFLAGS -mips32"
+			_backend="dingux"
+			_mt32emu=no
+			_optimization_level=-O3
+			# Disable alsa midi to get the port build on OpenDingux toolchain
+			_alsa=no
+			_vkeybd=yes
+			_build_hq_scalers=no
+			_keymapper=yes
+			# Force disable vorbis on dingux, it has terrible performance compared to tremor
+			_vorbis=no
+			# Force disable seq on dingux, no way to use it and it would get enabled by default with configure
+			_seq_midi=no
+			_port_mk="backends/platform/dingux/dingux.mk"
+			;;
 		gp2x)
 			DEFINES="$DEFINES -DGP2X"
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
-- 
cgit v1.2.3


From 732f9582fa368b810010cbebe89dc47a1defdba2 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 15:41:30 -0400
Subject: GCW0: Remove absolute paths

---
 dists/gcw0/scummvm.sh | 4 ++--
 dists/gcw0/scummvmrc  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index 4ffb429130..c12a3030cc 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -3,7 +3,7 @@
 cd `dirname $0`
 
 if [ ! -f $HOME/.scummvmrc ] ; then
-	cp /mnt/ScummVM/scummvmrc $HOME/.scummvmrc
+	cp ./scummvmrc $HOME/.scummvmrc
 fi
 
-exec ./scummvm 2>&1 >$HOME/scummvm.log
+exec ./scummvm
diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index 1f4043b3ae..fcffd9ada6 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -2,8 +2,8 @@
 fullscreen=true
 gfx_mode=1x
 aspect_ratio=true
-themepath=/mnt/ScummVM/themes
+themepath=./themes
 browser_lastpath=/media
-extrapath=/mnt/ScummVM/engine-data
-pluginspath=/mnt/ScummVM/plugins
+extrapath=./engine-data
+pluginspath=./plugins
 joystick=0
-- 
cgit v1.2.3


From f16064613bb6a39835d56bc6abe99b3e37ad7f93 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 15:57:26 -0400
Subject: GCW0: Fix default joystick number

---
 dists/gcw0/scummvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index fcffd9ada6..c2087c222a 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -6,4 +6,4 @@ themepath=./themes
 browser_lastpath=/media
 extrapath=./engine-data
 pluginspath=./plugins
-joystick=0
+joystick_num=0
-- 
cgit v1.2.3


From 9b8b737fad2da90d3a4ec40029f876300c9d181a Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 22:20:57 +0100
Subject: KEYMAPPER: Fix off-by-one error with keymapper action names

---
 backends/keymapper/action.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h
index ed4bb86ce6..17b1153c77 100644
--- a/backends/keymapper/action.h
+++ b/backends/keymapper/action.h
@@ -37,7 +37,7 @@ namespace Common {
 struct HardwareInput;
 class Keymap;
 
-#define ACTION_ID_SIZE (4)
+#define ACTION_ID_SIZE (5)
 
 struct KeyActionEntry {
 	const KeyState ks;
-- 
cgit v1.2.3


From 238b3e1ac2a21ad9afd934b4bcd4057bce53ab7f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 27 Oct 2014 00:03:32 +0100
Subject: GCW0: Hardcoded (for now) GCW0 controls

---
 backends/events/dinguxsdl/dinguxsdl-events.cpp | 34 ++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp
index 6f9f2a7748..cc15f2666c 100644
--- a/backends/events/dinguxsdl/dinguxsdl-events.cpp
+++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp
@@ -26,18 +26,48 @@
 
 #include "backends/events/dinguxsdl/dinguxsdl-events.h"
 
+#ifndef GCW0
 #define PAD_UP    SDLK_UP
 #define PAD_DOWN  SDLK_DOWN
 #define PAD_LEFT  SDLK_LEFT
 #define PAD_RIGHT SDLK_RIGHT
 #define BUT_A     SDLK_LCTRL
 #define BUT_B     SDLK_LALT
-#define BUT_X     SDLK_SPACE
-#define BUT_Y     SDLK_LSHIFT
+#define BUT_X     SDLK_SPACE       // BUT_Y in GCW0
+#define BUT_Y     SDLK_LSHIFT      // BUT_X in GCW0
 #define BUT_SELECT   SDLK_ESCAPE
 #define BUT_START    SDLK_RETURN
 #define TRIG_L    SDLK_TAB
 #define TRIG_R    SDLK_BACKSPACE
+#else // GCW0
+
+/******
+ * GCW0 keymap
+ *                      Dingoo button
+ * A -> Left Button     BUT_Y
+ * B -> right button    BUT_B
+ * X -> ' '             BUT_A '0'
+ * Y -> '.'             BUT_X
+ * Select -> ESC        TRIG_R
+ * Start -> F5          TRIG_L
+ * L -> Shift           BUT_START
+ * R -> VK              BUT_SELECT
+ */
+
+#define PAD_UP    SDLK_UP
+#define PAD_DOWN  SDLK_DOWN
+#define PAD_LEFT  SDLK_LEFT
+#define PAD_RIGHT SDLK_RIGHT
+#define BUT_A     SDLK_LSHIFT
+#define BUT_B     SDLK_LALT
+#define BUT_X     SDLK_SPACE
+#define BUT_Y     SDLK_LCTRL
+#define BUT_SELECT   SDLK_BACKSPACE
+#define BUT_START    SDLK_TAB
+#define TRIG_L    SDLK_RETURN
+#define TRIG_R    SDLK_ESCAPE
+
+#endif
 
 bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	if (ev.key.keysym.sym == PAD_UP) {
-- 
cgit v1.2.3


From 8e3b6df83000ed02da9aa030d7b91e0f3e91a34d Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Oct 2014 18:13:09 -0400
Subject: GCW0: Switch to HW floats and introduce the platform define

---
 configure | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index 09b8383120..ebca8322dc 100755
--- a/configure
+++ b/configure
@@ -2590,11 +2590,9 @@ if test -n "$_host"; then
 			add_line_to_config_h "#define USE_WII_DI"
 			;;
                gcw0)
-			DEFINES="$DEFINES -DDINGUX"
-			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+			DEFINES="$DEFINES -DDINGUX -DGCW0"
 			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 			ASFLAGS="$ASFLAGS"
-			CXXFLAGS="$CXXFLAGS -msoft-float"
 			CXXFLAGS="$CXXFLAGS -mips32"
 			_backend="dingux"
 			_mt32emu=no
-- 
cgit v1.2.3


From 0db09d334ca1be244aa6b5865ff92919456c669f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 27 Oct 2014 03:18:03 +0200
Subject: QUEEN: Fix bug #6700 - "FOTAQ: Weird Response Glitches"

Pending mouse clicks and keypresses are now cleared before and after
the game options screen or dialog options are shown
---
 engines/queen/logic.cpp | 6 ++++++
 engines/queen/talk.cpp  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index d48bb8a498..664a9a15f9 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -2115,9 +2115,15 @@ void LogicInterview::setupSpecialMoveTable() {
 }
 
 void LogicGame::useJournal() {
+	_vm->input()->clearKeyVerb();
+	_vm->input()->clearMouseButton();
+
 	_vm->command()->clear(false);
 	_journal->use();
 	_vm->walk()->stopJoe();
+
+	_vm->input()->clearKeyVerb();
+	_vm->input()->clearMouseButton();
 }
 
 bool LogicGame::changeToSpecialRoom() {
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 1b9d72babc..d00e64b777 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -1250,6 +1250,7 @@ int16 Talk::selectSentence() {
 		}
 
 		_vm->input()->clearKeyVerb();
+		_vm->input()->clearMouseButton();
 
 		if (sentenceCount > 0) {
 			int oldZone = 0;
@@ -1328,6 +1329,9 @@ int16 Talk::selectSentence() {
 		}
 	}
 
+	_vm->input()->clearKeyVerb();
+	_vm->input()->clearMouseButton();
+
 	debug(6, "Selected sentence %i", selectedSentence);
 
 	arrowBobUp->active    = false;
-- 
cgit v1.2.3


From b5b5417d64eacd21d441631e7a5e0c618bfadebd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 27 Oct 2014 03:36:52 +0200
Subject: QUEEN: Allow the engine to quit while dialog options are shown

---
 engines/queen/talk.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index d00e64b777..e86a53d448 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -189,7 +189,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
 			}
 		}
 
-		if (_vm->input()->talkQuit())
+		if (_vm->input()->talkQuit() || _vm->shouldQuit())
 			break;
 
 		retval   = _dialogueTree[level][selectedSentence].dialogueNodeValue1;
@@ -1255,11 +1255,7 @@ int16 Talk::selectSentence() {
 		if (sentenceCount > 0) {
 			int oldZone = 0;
 
-			while (0 == selectedSentence) {
-
-				if (_vm->input()->talkQuit())
-					break;
-
+			while (0 == selectedSentence && !_vm->input()->talkQuit() && !_vm->shouldQuit()) {
 				_vm->update();
 
 				Common::Point mouse = _vm->input()->getMousePos();
-- 
cgit v1.2.3


From 2a6a79b1673e274420ca8c28f40f9855b1c6134f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 27 Oct 2014 12:28:18 +0200
Subject: SAGA: Remove the buggy actor swapping fixup code for IHNM

This was a hack that was implemented while IHNM was being developed.
That code should no longer be needed. If this issue does occur again,
the actual cause should be investigated, instead of hiding it with
workarounds. The code was buggy anyway, as _currentProtag was not
initialized properly
---
 engines/saga/actor.h      |  1 -
 engines/saga/saveload.cpp | 29 ++---------------------------
 engines/saga/scene.h      |  3 ---
 engines/saga/sfuncs.cpp   |  4 ----
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/engines/saga/actor.h b/engines/saga/actor.h
index b8a5436d76..8dc27c74be 100644
--- a/engines/saga/actor.h
+++ b/engines/saga/actor.h
@@ -468,7 +468,6 @@ public:
 	int actorIdToIndex(uint16 id) { return (id == ID_PROTAG) ? 0 : objectIdToIndex(id); }
 	uint16 actorIndexToId(int index) { return (index == 0) ? ID_PROTAG : objectIndexToId(kGameObjectActor, index); }
 	ActorData *getActor(uint16 actorId);
-	ActorData *getFirstActor() { return &_actors.front(); }
 
 // clarification: Obj - means game object, such Hat, Spoon etc,  Object - means Actor,Obj,HitZone,StepZone
 
diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 90ba62070b..e659e09ce8 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -215,8 +215,7 @@ void SagaEngine::save(const char *fileName, const char *saveName) {
 #ifdef ENABLE_IHNM
 	if (getGameId() == GID_IHNM) {
 		out->writeSint32LE(_scene->currentChapterNumber());
-		// Protagonist
-		out->writeSint32LE(_scene->currentProtag());
+		out->writeSint32LE(0);	// obsolete, was used for the protagonist
 		out->writeSint32LE(_scene->getCurrentMusicTrack());
 		out->writeSint32LE(_scene->getCurrentMusicRepeat());
 	}
@@ -316,7 +315,7 @@ void SagaEngine::load(const char *fileName) {
 	if (getGameId() == GID_IHNM) {
 		int currentChapter = _scene->currentChapterNumber();
 		_scene->setChapterNumber(in->readSint32LE());
-		_scene->setProtag(in->readSint32LE());
+		in->skip(4);	// obsolete, was used for setting the protagonist
 		if (_scene->currentChapterNumber() != currentChapter)
 			_scene->changeScene(-2, 0, kTransitionFade, _scene->currentChapterNumber());
 		_scene->setCurrentMusicTrack(in->readSint32LE());
@@ -366,30 +365,6 @@ void SagaEngine::load(const char *fileName) {
 	int volume = _music->getVolume();
 	_music->setVolume(0);
 
-#ifdef ENABLE_IHNM
-	// Protagonist swapping
-	if (getGameId() == GID_IHNM) {
-		if (_scene->currentProtag() != 0 && _scene->currentChapterNumber() != 6) {
-			ActorData *actor1 = _actor->getFirstActor();
-			ActorData *actor2;
-			// The original gets actor2 from the current protagonist ID, but this is sometimes wrong
-			// If the current protagonist ID is not correct, use the stored protagonist
-			if (!_actor->validActorId(_scene->currentProtag())) {
-				actor2 = _actor->_protagonist;
-			} else {
-				actor2 = _actor->getActor(_scene->currentProtag());
-			}
-
-			SWAP(actor1->_location, actor2->_location);
-
-			actor2->_flags &= ~kProtagonist;
-			actor1->_flags |= kProtagonist;
-			_actor->_protagonist = _actor->_centerActor = actor1;
-			_scene->setProtag(actor1->_id);
-		}
-	}
-#endif
-
 	_scene->clearSceneQueue();
 	_scene->changeScene(sceneNumber, ACTOR_NO_ENTRANCE, kTransitionNoFade);
 
diff --git a/engines/saga/scene.h b/engines/saga/scene.h
index 6a9571d282..410713c5d5 100644
--- a/engines/saga/scene.h
+++ b/engines/saga/scene.h
@@ -286,8 +286,6 @@ class Scene {
 	#endif
 		return _sceneLUT[sceneNumber];
 	}
-	int currentProtag() const { return _currentProtag; }
-	void setProtag(int pr) { _currentProtag = pr; }
 	int currentSceneNumber() const { return _sceneNumber; }
 	int currentChapterNumber() const { return _chapterNumber; }
 	void setChapterNumber(int ch) { _chapterNumber = ch; }
@@ -341,7 +339,6 @@ class Scene {
 	Common::Array<uint16> _sceneLUT;
 	SceneQueueList _sceneQueue;
 	bool _sceneLoaded;
-	int _currentProtag;
 	int _sceneNumber;
 	int _chapterNumber;
 	int _outsetSceneNumber;
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp
index cb963e23ac..2175d8f40a 100644
--- a/engines/saga/sfuncs.cpp
+++ b/engines/saga/sfuncs.cpp
@@ -748,14 +748,10 @@ void Script::sfSwapActors(SCRIPTFUNC_PARAMS) {
 		actor1->_flags &= ~kProtagonist;
 		actor2->_flags |= kProtagonist;
 		_vm->_actor->_protagonist = _vm->_actor->_centerActor = actor2;
-		if (_vm->getGameId() == GID_IHNM)
-			_vm->_scene->setProtag(actorId2);
 	} else if (actor2->_flags & kProtagonist) {
 		actor2->_flags &= ~kProtagonist;
 		actor1->_flags |= kProtagonist;
 		_vm->_actor->_protagonist = _vm->_actor->_centerActor = actor1;
-		if (_vm->getGameId() == GID_IHNM)
-			_vm->_scene->setProtag(actorId1);
 	}
 }
 
-- 
cgit v1.2.3


From 7be3bc7004f0e20475bc32c6c54f0f94d2f8f7a4 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Mon, 22 Sep 2014 12:07:01 +0200
Subject: SCUMM: balloon - There is no spanish version.

---
 devtools/scumm-md5.txt    | 2 +-
 engines/scumm/scumm-md5.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index f0cb577237..856abbf7e0 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -820,7 +820,7 @@ balloon	Putt-Putt and Pep's Balloon-O-Rama
 	bab0fb81dcb12b8930c5d850b8f2a7de	12800	de	Windows	HE 80	-	-	George Kormendi
 	145bd3373574feb668cc2eea2ec6cf86	-1	ru	Windows	HE 80	-	-	sev
 	27b2ef1653089fe5b897d9cc89ce784f	-1	ru	Windows	HE 80	-	-	George Kormendi
-	2232b0b9411575b1f9961713ebc9de61	-1	All	Windows	HE 80	-	ES and NL	exiltd (ES), Ben Castricum (NL)
+	2232b0b9411575b1f9961713ebc9de61	-1	nl	Windows	HE 80	-	-	Ben Castricum
 	a22af0ad0e3126d19d22707b0267a37d	-1	nl	Windows	HE 80	-	-	Ben Castricum
 	a56a05c6b865b9956639f8c51269e5ab	-1	nl	Mac	HE 80	-	-	Ben Castricum
 	d7b247c26bf1f01f8f7daf142be84de3	-1	en	Windows	HE 99	Updated	-	iziku
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 0eeff57ff7..5c8e68e50b 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Wed Jun 25 10:34:07 2014
+  This file was generated by the md5table tool on Mon Sep 22 10:04:01 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -112,7 +112,7 @@ static const MD5Table md5table[] = {
 	{ "2108d83dcf09f8adb4bc524669c8cf51", "PuttTime", "HE 99", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "21a6592322f92550f144f68a8a4e685e", "dig", "", "", -1, Common::FR_FRA, Common::kPlatformMacintosh },
 	{ "21abe302e1b1e2b66d6f5c12e241ebfd", "freddicove", "unenc", "Unencrypted", -1, Common::RU_RUS, Common::kPlatformWindows },
-	{ "2232b0b9411575b1f9961713ebc9de61", "balloon", "HE 80", "", -1, Common::UNK_LANG, Common::kPlatformWindows },
+	{ "2232b0b9411575b1f9961713ebc9de61", "balloon", "HE 80", "", -1, Common::NL_NLD, Common::kPlatformWindows },
 	{ "225e18566e810c634bf7de63e7568e3e", "mustard", "", "", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", "HE 70", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "22de86b2f7ec6e5db745ed1123310b44", "spyfox2", "", "Demo", 15832, Common::FR_FRA, Common::kPlatformWindows },
-- 
cgit v1.2.3


From 1351f6505d6b0d2daf3f5a973b8fd2c6f4ed81e4 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Mon, 22 Sep 2014 12:25:59 +0200
Subject: SCUMM: freddi1 - Add support for 'FREDDI_ROBO' CD sold with Packard
 Bell PCs.

---
 engines/scumm/detection_tables.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 791963e237..fa1f9154dd 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -680,6 +680,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi", "Freddi Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "Freddi Fish", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "FreddiD", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "freddi", "FreddiE", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddi", "Freddi Fisk", kGenHEMac, Common::SE_SWE, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "FRITZI", kGenHEPC, Common::DE_DEU, UNK, 0 },
 	{ "freddi", "Marine Malice", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
-- 
cgit v1.2.3


From 5d6944ab52b2f2d97c613f41ea19f757ea992800 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Mon, 20 Oct 2014 14:12:50 +0200
Subject: SCUMM: freddicove - Detect dutch game variant found on CD EAN
 8716051020172

---
 devtools/scumm-md5.txt    | 1 +
 engines/scumm/scumm-md5.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 856abbf7e0..cb242b4f43 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -577,6 +577,7 @@ freddicove	Freddi Fish 5: The Case of the Creature of Coral Cove
 	590e6546aacd0d374b7f3a4f53013ab1	-1	All	All	-	-	-	cyx
 	21abe302e1b1e2b66d6f5c12e241ebfd	-1	ru	Windows	unenc	Unencrypted	-	sev
 	b8955d7d23b4972229060d1592489fef	-1	nl	All	HE 100	-	-	adutchguy, daniel9
+	8f345db2f3f5a25ed6305001957e6f72	41182	nl	All	HE 100	-	-	Ben Castricum
 	b100abf7ff83146df50db78dbd5e9cfa	-1	fr	All	HE 100	-	-	alamaz, gist974
 	4ce2d5b355964bbcb5e5ce73236ef868	-1	ru	Windows	HE 100	-	-	sev
 
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 5c8e68e50b..496115e8d0 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Mon Sep 22 10:04:01 2014
+  This file was generated by the md5table tool on Mon Oct 20 12:16:47 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -396,6 +396,7 @@ static const MD5Table md5table[] = {
 	{ "8e9830a6f2702be5b22c8fa0a6aaf977", "freddi2", "HE 80", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "8eb84cee9b429314c7f0bdcf560723eb", "monkey", "FM-TOWNS", "", 9925, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "8ee63cafb1fe9d62aa0d5a23117e70e7", "freddi2", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
+	{ "8f345db2f3f5a25ed6305001957e6f72", "freddicove", "HE 100", "", 41182, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "8f3758ff98c9c5d78e5d635222cad026", "atlantis", "Floppy", "Floppy", -1, Common::IT_ITA, Common::kPlatformDOS },
 	{ "8fec68383202d38c0d25e9e3b757c5df", "comi", "Demo", "Demo", 18041, Common::UNK_LANG, Common::kPlatformWindows },
 	{ "8ffd618a776a4c0d8922bb28b09f8ce8", "airport", "", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
-- 
cgit v1.2.3


From 81795ce4445bdd8f3cb7565759b9fc3844e89c9c Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 5 Oct 2014 10:38:14 +0200
Subject: SCUMM: Identify several windows variants as such

---
 devtools/scumm-md5.txt           | 4 ++--
 engines/scumm/detection_tables.h | 8 ++++----
 engines/scumm/scumm-md5.h        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index cb242b4f43..476b27ddb1 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -516,7 +516,7 @@ freddi	Freddi Fish 1: The Case of the Missing Kelp Seeds
 freddi2	Freddi Fish 2: The Case of the Haunted Schoolhouse
 	0a295b80f9a9edf818e8e161a0e83830	-1	fr	All	HE 80	-	-	gist974, ThierryFR
 	fce4b8010704b103acfeea9413788f32	-1	de	All	HE 80	-	-	Joachim Eberhard
-	8e9830a6f2702be5b22c8fa0a6aaf977	-1	nl	Mac	HE 80	-	-	daniel9
+	8e9830a6f2702be5b22c8fa0a6aaf977	65305	nl	All	HE 80	-	-	daniel9
 	5057fb0e99e5aa29df1836329232f101	-1	All	Windows	HE 80	-	-	sev
 	ac62d50e39492ee3738b4e83a5ac780f	-1	nl	Windows	HE 80	-	-	joostp
 	151071053a1d0021198216713939521d	-1	en	Windows	HE 80	-	-	vampir_raziel
@@ -679,7 +679,7 @@ pajama3	Pajama Sam 3: You Are What You Eat From Your Head to Your Feet
 	f7711f9264d4d43c2a1518ec7c10a607	79382	us	All	-	-	-	Kirben
 	2e8a1f76ea33bc5e04347646feee173d	-1	de	All	-	-	-	Joachim Eberhard
 	aefa244ea034b7cd2041f0a44be7d9ba	-1	en	Mac	-	-	-	pix_climber
-	06c3cf4f31daad8b1cd93153491db9e6	-1	nl	Mac	-	-	-	daniel9
+	06c3cf4f31daad8b1cd93153491db9e6	79382	nl	All	-	-	-	daniel9
 	7410a8ba9795020cd42f171c4320659e	-1	fr	Windows	-	-	-	gist974
 	20176076d708bf14407bcc9bdcd7a418	-1	ru	Windows	-	-	-	sev
 
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index fa1f9154dd..3f08f17aff 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -686,7 +686,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi", "Marine Malice", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "MM-DEMO", kGenHEPC, UNK_LANG, UNK, 0 },
 
-	{ "freddi2", "freddi2", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi2", "freddi2", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi2", "FF2-demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi2", "ff2-demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi2", "FFHSDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -748,7 +748,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "lost", "lost", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "lost", "Lost and Found", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "lost", "smaller", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "lost", "verloren", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "lost", "verloren", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "lost", "Verloren", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
 	{ "maze", "maze", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -793,7 +793,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama2", "PJ2 Demo", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "pajama2", "PS2DEMO", kGenHEPC, Common::HE_ISR, UNK, 0 },
 
-	{ "pajama3", "pajama3", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "pajama3", "pajama3", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "pajama3", "FPJ3Demo", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "pajama3", "GPJ3Demo", kGenHEPC, Common::DE_DEU, UNK, 0 },
 	{ "pajama3", "PajamaHTF", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -892,7 +892,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 
 	{ "socks", "socks", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "socks", "SockWorks", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-	{ "socks", "SokkenSoep", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "socks", "SokkenSoep", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "socks", "SokkenSoep", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
 	{ "spyfox", "spyfox", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 496115e8d0..d7ec9bb686 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Mon Oct 20 12:16:47 2014
+  This file was generated by the md5table tool on Mon Oct 20 12:17:31 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -28,7 +28,7 @@ static const MD5Table md5table[] = {
 	{ "055ffe4f47753e47594ac67823220c54", "puttrace", "HE 99", "", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "057c9b456dedcc4d71b991a3072a20b3", "monkey", "SEGA", "", 9465, Common::JA_JPN, Common::kPlatformSegaCD },
 	{ "06b187468113f9ae5a400b148a847fac", "atlantis", "Floppy", "Floppy", 12075, Common::EN_ANY, Common::kPlatformMacintosh },
-	{ "06c3cf4f31daad8b1cd93153491db9e6", "pajama3", "", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
+	{ "06c3cf4f31daad8b1cd93153491db9e6", "pajama3", "", "", 79382, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "07433205acdca3bc553d0e731588b35f", "airport", "", "", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "07a1eefd8ca95d77310311446c0f53d0", "brstorm", "", "", 5433, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "07b810e37be7489263f7bc7627d4765d", "freddi4", "unenc", "Unencrypted", -1, Common::RU_RUS, Common::kPlatformWindows },
@@ -393,7 +393,7 @@ static const MD5Table md5table[] = {
 	{ "8e3241ddd6c8dadf64305e8740d45e13", "balloon", "HE 100", "Updated", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "8e4ee4db46954bfe2912e259a16fad82", "monkey2", "", "", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "8e9417564f33790815445b2136efa667", "atlantis", "", "CD", 11915, Common::JA_JPN, Common::kPlatformMacintosh },
-	{ "8e9830a6f2702be5b22c8fa0a6aaf977", "freddi2", "HE 80", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
+	{ "8e9830a6f2702be5b22c8fa0a6aaf977", "freddi2", "HE 80", "", 65305, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "8eb84cee9b429314c7f0bdcf560723eb", "monkey", "FM-TOWNS", "", 9925, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "8ee63cafb1fe9d62aa0d5a23117e70e7", "freddi2", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "8f345db2f3f5a25ed6305001957e6f72", "freddicove", "HE 100", "", 41182, Common::NL_NLD, Common::kPlatformUnknown },
-- 
cgit v1.2.3


From 180099ac785fd52e0b534ffa37db98c2e834226b Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Mon, 27 Oct 2014 16:31:08 +0100
Subject: SCUMM: Remove obsolete comment from md5 table

This is no longer the case since pull request 177 was merged.
---
 devtools/scumm-md5.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 476b27ddb1..acee5d87b3 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -21,9 +21,6 @@
 #  - Source
 #    -> The source of the information, useful in case it has to be verified
 #
-# TODO: We really should have a separate target for "Misc FM-TOWNS demos", so
-#       that their description in the launcher doesn't start with "Zak McKracken"
-#
 #
 # Table of email addresse of contributors: Sometimes we need to add new
 #   information to this table, or need to verify the correctness of an
-- 
cgit v1.2.3


From df12402a58680a1215532ae6bd8e23d8b8256cc6 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Mon, 13 Oct 2014 09:12:52 +0200
Subject: SCUMM: Fix bug 6739 - Untranslated dialogs

---
 engines/scumm/dialogs.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 52120949cc..c22525b6f2 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -180,9 +180,9 @@ static const ResString string_map_table_v345[] = {
 	// I18N: You may specify 'Yes' symbol at the end of the line, like this:
 	// "Moechten Sie wirklich neu starten?  (J/N)J"
 	// Will react to J as 'Yes'
-	{5, _s("Are you sure you want to restart?  (Y/N)")},
+	{5, _s("Are you sure you want to restart?  (Y/N)Y")},
 	// I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
-	{6, _s("Are you sure you want to quit?  (Y/N)")},
+	{6, _s("Are you sure you want to quit?  (Y/N)Y")},
 
 	// Added in SCUMM4
 	{7, _s("Save")},
@@ -460,7 +460,7 @@ const Common::String InfoDialog::queryResString(int stringno) {
 			tmp += chr;
 		}
 	}
-	return tmp;
+	return _(tmp);
 }
 
 #pragma mark -
-- 
cgit v1.2.3


From 7661b8adfccde8190dc795c71033014f486cf800 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 27 Oct 2014 16:45:31 +0100
Subject: HOPKINS: Fix the censorship flag (bug #6591)

---
 engines/hopkins/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 6620f2878c..3100ed6cdc 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -74,7 +74,7 @@ int FileManager::readStream(Common::ReadStream &stream, void *buf, size_t nbytes
  * It's now using the config manager and a per-engine GUI option.
  */
 void FileManager::initCensorship() {
-	_vm->_globals->_censorshipFl = ConfMan.getBool("enable_gore");
+	_vm->_globals->_censorshipFl = !ConfMan.getBool("enable_gore");
 }
 
 /**
-- 
cgit v1.2.3


From da9ffe9dbc0912463c6161186085525bb775c0c1 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 27 Oct 2014 23:04:25 +0100
Subject: SCI: Add note on SSCI 11 FindColor bug

---
 engines/sci/graphics/palette.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index a3624c7959..c98d1d8e8d 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -524,6 +524,10 @@ uint16 GfxPalette::matchColor(byte r, byte g, byte b) {
 		cdiff = (dr*dr) + (dg*dg) + (db*db);
 //		minimum sum match (Sierra's)
 //		cdiff = ABS(dr) + ABS(dg) + ABS(db);
+//		Note: (most? all?) SCI 1.1 interpreters have a bug in this code,
+//		and in fact have dr, dg, db as signed int8. This makes the comparison
+//		wrap around so that 0 and 255 have an effective distance of 1.
+//		See bug 6455 for a symptom of this in SQ5.
 		if (cdiff < diff) {
 			if (cdiff == 0)
 				return i | 0x8000; // setting this flag to indicate exact match
-- 
cgit v1.2.3


From f317e8c8777bdc8482b5e55f3f28873a61eab7da Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 28 Oct 2014 01:40:40 +0100
Subject: SCI: implement 8-bit color matching SCI1.1 bug effectively fixes bug
 #6455 thanks to wjp and [md5]

---
 engines/sci/console.cpp          |  1 +
 engines/sci/graphics/palette.cpp | 28 +++++++++++++++++++++-------
 engines/sci/graphics/palette.h   |  2 ++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 565e9752c3..510c8cd9ca 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -485,6 +485,7 @@ bool Console::cmdGetVersion(int argc, const char **argv) {
 #endif
 	debugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]);
 	debugPrintf("Uses palette merging: %s\n", g_sci->_gfxPalette->isMerging() ? "yes" : "no");
+	debugPrintf("Uses 16 bit color matching: %s\n", g_sci->_gfxPalette->isUsing16bitColorMatch() ? "yes" : "no");
 	debugPrintf("Resource volume version: %s\n", g_sci->getResMan()->getVolVersionDesc());
 	debugPrintf("Resource map version: %s\n", g_sci->getResMan()->getMapVersionDesc());
 	debugPrintf("Contains selector vocabulary (vocab.997): %s\n", hasVocab997 ? "yes" : "no");
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index c98d1d8e8d..36b9660d4e 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -65,14 +65,19 @@ GfxPalette::GfxPalette(ResourceManager *resMan, GfxScreen *screen)
 	// the real merging done in earlier games. If we use the copying over, we
 	// will get issues because some views have marked all colors as being used
 	// and those will overwrite the current palette in that case
-	if (getSciVersion() < SCI_VERSION_1_1)
+	if (getSciVersion() < SCI_VERSION_1_1) {
 		_useMerging = true;
-	else if (getSciVersion() == SCI_VERSION_1_1)
+		_use16bitColorMatch = true;
+	} else if (getSciVersion() == SCI_VERSION_1_1) {
 		// there are some games that use inbetween SCI1.1 interpreter, so we have
 		// to detect if the current game is merging or copying
 		_useMerging = _resMan->detectPaletteMergingSci11();
-	else	// SCI32
+		_use16bitColorMatch = _useMerging;
+	} else {
+	    // SCI32
 		_useMerging = false;
+		_use16bitColorMatch = false; // not verified that SCI32 uses 8-bit color matching
+	}
 
 	palVaryInit();
 
@@ -120,6 +125,10 @@ bool GfxPalette::isMerging() {
 	return _useMerging;
 }
 
+bool GfxPalette::isUsing16bitColorMatch() {
+	return _use16bitColorMatch;
+}
+
 // meant to get called only once during init of engine
 void GfxPalette::setDefault() {
 	if (_resMan->getViewType() == kViewEga)
@@ -520,14 +529,19 @@ uint16 GfxPalette::matchColor(byte r, byte g, byte b) {
 		dr = _sysPalette.colors[i].r - r;
 		dg = _sysPalette.colors[i].g - g;
 		db = _sysPalette.colors[i].b - b;
+		if (!_use16bitColorMatch) {
+			// remove upper bits for most SCI1.1 games
+			//  this bug was introduced with Quest For Glory 3 interpreter
+			//  we have to implement it, otherwise some colors will be "wrong"
+			//  See Space Quest 5 bug #6455
+			dr &= 0xFF;
+			dg &= 0xFF;
+			db &= 0xFF;
+		}
 //		minimum squares match
 		cdiff = (dr*dr) + (dg*dg) + (db*db);
 //		minimum sum match (Sierra's)
 //		cdiff = ABS(dr) + ABS(dg) + ABS(db);
-//		Note: (most? all?) SCI 1.1 interpreters have a bug in this code,
-//		and in fact have dr, dg, db as signed int8. This makes the comparison
-//		wrap around so that 0 and 255 have an effective distance of 1.
-//		See bug 6455 for a symptom of this in SQ5.
 		if (cdiff < diff) {
 			if (cdiff == 0)
 				return i | 0x8000; // setting this flag to indicate exact match
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h
index 347695deb8..93cc2a8189 100644
--- a/engines/sci/graphics/palette.h
+++ b/engines/sci/graphics/palette.h
@@ -46,6 +46,7 @@ public:
 	~GfxPalette();
 
 	bool isMerging();
+	bool isUsing16bitColorMatch();
 
 	void setDefault();
 	void createFromData(byte *data, int bytesLeft, Palette *paletteOut);
@@ -124,6 +125,7 @@ private:
 
 	bool _sysPaletteChanged;
 	bool _useMerging;
+	bool _use16bitColorMatch;
 
 	Common::Array<PalSchedule> _schedules;
 
-- 
cgit v1.2.3


From 22be7f4346e3f09a8d86a61f6d1b5e6c1b11b703 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 14:26:19 +0200
Subject: COMMON: Add reference links for the enabled C++11 features in MSVC

---
 common/c++11-compat.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/c++11-compat.h b/common/c++11-compat.h
index 9fd252cc67..a56b79514c 100644
--- a/common/c++11-compat.h
+++ b/common/c++11-compat.h
@@ -32,6 +32,7 @@
 // though.
 //
 #if !defined(nullptr)  // XCode 5.0.1 has __cplusplus=199711 but defines this
+// MSVC 2010 and newer fully support nullptr: http://msdn.microsoft.com/en-us/library/hh567368.aspx
 #if !defined(_MSC_VER) || _MSC_VER < 1600
 #define nullptr 0
 #endif
@@ -41,6 +42,7 @@
 // Replacement for the override keyword. This allows compilation of code
 // which uses it, but does not feature any semantic.
 //
+// MSVC 2012 and newer fully support override: http://msdn.microsoft.com/en-us/library/hh567368.aspx
 #if !defined(_MSC_VER) || _MSC_VER < 1700
 #define override
 #endif
-- 
cgit v1.2.3


From 75305f136f666444b5fb3da06b22edaeb00952f0 Mon Sep 17 00:00:00 2001
From: Fedor
Date: Wed, 3 Sep 2014 15:27:41 +0300
Subject: GRAPHICS: Remove some trailing whitespace in surface.h

---
 graphics/surface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/surface.h b/graphics/surface.h
index ad15944361..aaa386b168 100644
--- a/graphics/surface.h
+++ b/graphics/surface.h
@@ -228,7 +228,7 @@ public:
 	 * @param srcSurface    The source of the bitmap data
 	 * @param destX         The x coordinate of the destination rectangle
 	 * @param destY         The y coordinate of the destination rectangle
-	 * @param subRect       The subRect of surface to be blitted             
+	 * @param subRect       The subRect of surface to be blitted
 	 */
 	void copyRectToSurface(const Graphics::Surface &srcSurface, int destX, int destY, const Common::Rect subRect);
 
-- 
cgit v1.2.3


From f50715a3f1a7f8bd42136ea899dede02b6a39579 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:31:11 +0200
Subject: AUTHORS: Remove trailing whitespace

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 37067e5e04..5f19af4612 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -651,7 +651,7 @@ Special thanks to
                        repository, planet and doxygen sites as well as tons
                        of HD space
    DOSBox Team       - For their awesome OPL2 and OPL3 emulator
-   Yusuke Kamiyamane - For contributing some GUI icons 
+   Yusuke Kamiyamane - For contributing some GUI icons
    Till Kresslein    - For design of modern ScummVM GUI
    Jezar             - For his freeverb filter implementation
    Jim Leiterman     - Various info on his FM-TOWNS/Marty SCUMM ports
-- 
cgit v1.2.3


From 4577da88ad507ce3a132c3912209d9968b01df89 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:31:33 +0200
Subject: README: Remove trailing whitespace

---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 0a256b39f3..5b0569089c 100644
--- a/README
+++ b/README
@@ -427,7 +427,7 @@ in the previous paragraph.
 3.3) Maniac Mansion NES notes:
 ---- -------------------------
 Supported versions are English GB (E), French (F), German (G), Italian (I),
-Swedish (SW) and English US (U). ScummVM requires just the PRG section 
+Swedish (SW) and English US (U). ScummVM requires just the PRG section
 to run and not the whole ROM.
 
 In order to get the game working, you will have to strip out the first
@@ -1441,7 +1441,7 @@ The platforms that currently have a different default directory are:
     <windir>\Profiles\username\Application Data\ScummVM\Saved games\
 
 Saved games are stored under a hidden area in Windows NT4/2000/XP/Vista/7,
-which can be accessed by running "%APPDATA%\ScummVM\Saved Games\" or by 
+which can be accessed by running "%APPDATA%\ScummVM\Saved Games\" or by
 enabling hidden files in Windows Explorer.
 
 Note for Windows NT4/2000/XP/Vista/7 users: The default saved games location
-- 
cgit v1.2.3


From 614de0d761bb8be80bf2b8b500e1810cb67a7535 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:33:41 +0200
Subject: GRAPHICS: Remove trailing whitespace

---
 graphics/VectorRenderer.h       |  2 +-
 graphics/VectorRendererSpec.cpp | 52 ++++++++++++++++++++---------------------
 graphics/VectorRendererSpec.h   |  2 +-
 graphics/transform_struct.h     |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/graphics/VectorRenderer.h b/graphics/VectorRenderer.h
index 703da68182..6b657f758d 100644
--- a/graphics/VectorRenderer.h
+++ b/graphics/VectorRenderer.h
@@ -105,7 +105,7 @@ VectorRenderer *createRenderer(int mode);
  */
 class VectorRenderer {
 public:
-	VectorRenderer() : _activeSurface(NULL), _fillMode(kFillDisabled), _shadowOffset(0), _shadowFillMode(kShadowExponential), 
+	VectorRenderer() : _activeSurface(NULL), _fillMode(kFillDisabled), _shadowOffset(0), _shadowFillMode(kShadowExponential),
 		_disableShadows(false), _strokeWidth(1), _gradientFactor(1) {
 
 	}
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index a9594f7dd2..81a0c04441 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -1134,7 +1134,7 @@ void VectorRendererSpec<PixelType>::
 drawTabShadow(int x1, int y1, int w, int h, int r) {
 	int offset = 3;
 	int pitch = _activeSurface->pitch / _activeSurface->format.bytesPerPixel;
-	
+
 	// "Harder" shadows when having lower BPP, since we will have artifacts (greenish tint on the modern theme)
 	uint8 expFactor = 3;
 	uint16 alpha = (_activeSurface->format.bytesPerPixel > 2) ? 4 : 8;
@@ -1162,7 +1162,7 @@ drawTabShadow(int x1, int y1, int w, int h, int r) {
 		// this is ok on filled circles, but when blending on surfaces,
 		// we cannot let it blend twice. awful.
 		uint32 hb = 0;
-		
+
 		while (x++ < y) {
 			BE_ALGORITHM();
 
@@ -1176,7 +1176,7 @@ drawTabShadow(int x1, int y1, int w, int h, int r) {
 				hb |= (1 << y);
 			}
 		}
-	
+
 		ptr_fill += pitch * r;
 		while (short_h--) {
 			blendFill(ptr_fill, ptr_fill + width + 1, color, (uint8)alpha);
@@ -1189,7 +1189,7 @@ drawTabShadow(int x1, int y1, int w, int h, int r) {
 		alpha = (alpha * (expFactor << 8)) >> 9;
 	}
 }
-	
+
 /** BEVELED TABS FOR CLASSIC THEME **/
 template<typename PixelType>
 void VectorRendererSpec<PixelType>::
@@ -1647,7 +1647,7 @@ drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color,
 
 		BE_RESET();
 		r--;
-		
+
 		int alphaStep_tr = ((alpha_t - alpha_r)/(y+1));
 		int alphaStep_br = ((alpha_r - alpha_b)/(y+1));
 		int alphaStep_bl = ((alpha_b - alpha_l)/(y+1));
@@ -1657,16 +1657,16 @@ drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color,
 		while (x++ < (y - 2)) {
 			BE_ALGORITHM();
 
-			BE_DRAWCIRCLE_BCOLOR_TR_CW(ptr_tr, x, y, px, py, (uint8)(alpha_r + (alphaStep_tr * x))); 
+			BE_DRAWCIRCLE_BCOLOR_TR_CW(ptr_tr, x, y, px, py, (uint8)(alpha_r + (alphaStep_tr * x)));
 			BE_DRAWCIRCLE_BCOLOR_BR_CW(ptr_br, x, y, px, py, (uint8)(alpha_b + (alphaStep_br * x)));
 			BE_DRAWCIRCLE_BCOLOR_BL_CW(ptr_bl, x, y, px, py, (uint8)(alpha_l + (alphaStep_bl * x)));
 			BE_DRAWCIRCLE_BCOLOR_TL_CW(ptr_tl, x, y, px, py, (uint8)(alpha_t + (alphaStep_tl * x)));
-			
+
 			BE_DRAWCIRCLE_BCOLOR_TR_CCW(ptr_tr, x, y, px, py, (uint8)(alpha_t - (alphaStep_tr * x)));
 			BE_DRAWCIRCLE_BCOLOR_BR_CCW(ptr_br, x, y, px, py, (uint8)(alpha_r - (alphaStep_br * x)));
 			BE_DRAWCIRCLE_BCOLOR_BL_CCW(ptr_bl, x, y, px, py, (uint8)(alpha_b - (alphaStep_bl * x)));
 			BE_DRAWCIRCLE_BCOLOR_TL_CCW(ptr_tl, x, y, px, py, (uint8)(alpha_l - (alphaStep_tl * x)));
-			
+
 			if (Base::_strokeWidth > 1) {
 				BE_DRAWCIRCLE_BCOLOR(ptr_tr, ptr_tl, ptr_bl, ptr_br, x - 1, y, px, py);
 				BE_DRAWCIRCLE_BCOLOR(ptr_tr, ptr_tl, ptr_bl, ptr_br, x, y, px - pitch, py);
@@ -1754,7 +1754,7 @@ void VectorRendererSpec<PixelType>::
 drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m) {
 	const uint8 borderAlpha_t = 0;
 	const uint8 borderAlpha_r = 127;
-	const uint8 borderAlpha_b = 255; 
+	const uint8 borderAlpha_b = 255;
 	const uint8 borderAlpha_l = 63;
 
 	const uint8 bevelAlpha_t = 255;
@@ -1876,7 +1876,7 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
 	// "Harder" shadows when having lower BPP, since we will have artifacts (greenish tint on the modern theme)
 	uint8 expFactor = 3;
 	uint16 alpha = (_activeSurface->format.bytesPerPixel > 2) ? 4 : 8;
-	
+
 	// These constants ensure a border of 2px on the left and of each rounded square
 	int xstart = (x1 > 2) ? x1 - 2 : x1;
 	int ystart = y1;
@@ -1886,7 +1886,7 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
 	for (int i = offset; i >= 0; i--) {
 		int f, ddF_x, ddF_y;
 		int x, y, px, py;
-		
+
 		PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(xstart + r, ystart + r);
 		PixelType *ptr_tr = (PixelType *)Base::_activeSurface->getBasePtr(xstart + width - r, ystart + r);
 		PixelType *ptr_bl = (PixelType *)Base::_activeSurface->getBasePtr(xstart + r, ystart + height - r);
@@ -1903,14 +1903,14 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
 		// this is ok on filled circles, but when blending on surfaces,
 		// we cannot let it blend twice. awful.
 		uint32 hb = 0;
-		
+
 		while (x++ < y) {
 			BE_ALGORITHM();
 
 
 			if (((1 << x) & hb) == 0) {
 				blendFill(ptr_tl - y - px, ptr_tr + y - px, color, (uint8)alpha);
-				
+
 				// Will create a dark line of pixles if left out
 				if (hb > 0) {
 					blendFill(ptr_bl - y + px, ptr_br + y + px, color, (uint8)alpha);
@@ -1924,7 +1924,7 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
 				hb |= (1 << y);
 			}
 		}
-	
+
 		ptr_fill += pitch * r;
 		while (short_h--) {
 			blendFill(ptr_fill, ptr_fill + width + 1, color, (uint8)alpha);
@@ -1936,7 +1936,7 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
 		ystart += 1;
 		width -= 2;
 		height -= 2;
-		
+
 		if (_shadowFillMode == kShadowExponential)
 			// Multiply with expfactor
 			alpha = (alpha * (expFactor << 8)) >> 9;
@@ -2178,14 +2178,14 @@ drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color,
 			// only when the inside isn't filled
 			if (sw != strokeWidth || fill_m != Base::kFillDisabled)
 				a2 = 255;
-			
-				// inner arc		
-				WU_DRAWCIRCLE_BCOLOR_TR_CW(ptr_tr, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_t - (alphaStep_tr * y)) << 8) * a2) >> 16)); 
+
+				// inner arc
+				WU_DRAWCIRCLE_BCOLOR_TR_CW(ptr_tr, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_t - (alphaStep_tr * y)) << 8) * a2) >> 16));
 				WU_DRAWCIRCLE_BCOLOR_BR_CW(ptr_br, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_r - (alphaStep_br * y)) << 8) * a2) >> 16));
 				WU_DRAWCIRCLE_BCOLOR_BL_CW(ptr_bl, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_b - (alphaStep_bl * y)) << 8) * a2) >> 16));
 				WU_DRAWCIRCLE_BCOLOR_TL_CW(ptr_tl, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_l - (alphaStep_tl * y)) << 8) * a2) >> 16));
-				
-				WU_DRAWCIRCLE_BCOLOR_TR_CCW(ptr_tr, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_r + (alphaStep_tr * y)) << 8) * a2) >> 16)); 
+
+				WU_DRAWCIRCLE_BCOLOR_TR_CCW(ptr_tr, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_r + (alphaStep_tr * y)) << 8) * a2) >> 16));
 				WU_DRAWCIRCLE_BCOLOR_BR_CCW(ptr_br, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_b + (alphaStep_br * y)) << 8) * a2) >> 16));
 				WU_DRAWCIRCLE_BCOLOR_BL_CCW(ptr_bl, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_l + (alphaStep_bl * y)) << 8) * a2) >> 16));
 				WU_DRAWCIRCLE_BCOLOR_TL_CCW(ptr_tl, (x - 1), y, (px - pitch), py, (uint8)((uint32)(((alpha_t + (alphaStep_tl * y)) << 8) * a2) >> 16));
@@ -2196,8 +2196,8 @@ drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color,
 					WU_DRAWCIRCLE_BCOLOR_BR_CW(ptr_br, x, y, px, py, (uint8)((uint32)(((alpha_r - (alphaStep_br * y)) << 8) * a1) >> 16));
 					WU_DRAWCIRCLE_BCOLOR_BL_CW(ptr_bl, x, y, px, py, (uint8)((uint32)(((alpha_b - (alphaStep_bl * y)) << 8) * a1) >> 16));
 					WU_DRAWCIRCLE_BCOLOR_TL_CW(ptr_tl, x, y, px, py, (uint8)((uint32)(((alpha_l - (alphaStep_tl * y)) << 8) * a1) >> 16));
-					
-					WU_DRAWCIRCLE_BCOLOR_TR_CCW(ptr_tr, x, y, px, py, (uint8)((uint32)(((alpha_r + (alphaStep_tr * y)) << 8) * a1) >> 16)); 
+
+					WU_DRAWCIRCLE_BCOLOR_TR_CCW(ptr_tr, x, y, px, py, (uint8)((uint32)(((alpha_r + (alphaStep_tr * y)) << 8) * a1) >> 16));
 					WU_DRAWCIRCLE_BCOLOR_BR_CCW(ptr_br, x, y, px, py, (uint8)((uint32)(((alpha_b + (alphaStep_br * y)) << 8) * a1) >> 16));
 					WU_DRAWCIRCLE_BCOLOR_BL_CCW(ptr_bl, x, y, px, py, (uint8)((uint32)(((alpha_l + (alphaStep_bl * y)) << 8) * a1) >> 16));
 					WU_DRAWCIRCLE_BCOLOR_TL_CCW(ptr_tl, x, y, px, py, (uint8)((uint32)(((alpha_t + (alphaStep_tl * y)) << 8) * a1) >> 16));
@@ -2220,7 +2220,7 @@ drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType colo
 	int x, y;
 	const int pitch = Base::_activeSurface->pitch / Base::_activeSurface->format.bytesPerPixel;
 	int px, py;
-	
+
 	uint32 rsq = r*r;
 	frac_t T = 0, oldT;
 	uint8 a1, a2;
@@ -2318,14 +2318,14 @@ void VectorRendererAA<PixelType>::
 drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m) {
 	const uint8 borderAlpha_t = 0;
 	const uint8 borderAlpha_r = 127;
-	const uint8 borderAlpha_b = 255; 
+	const uint8 borderAlpha_b = 255;
 	const uint8 borderAlpha_l = 63;
 
 	const uint8 bevelAlpha_t = 255;
 	const uint8 bevelAlpha_r = 31;
 	const uint8 bevelAlpha_b = 0;
 	const uint8 bevelAlpha_l = 127;
-	
+
 	if (Base::_strokeWidth) {
 		if (r != 0 && Base::_bevel > 0) {
 			drawBorderRoundedSquareAlg(x1, y1, r, w, h, color, fill_m, borderAlpha_t, borderAlpha_r, borderAlpha_b, borderAlpha_l);
@@ -2334,7 +2334,7 @@ drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, Vecto
 			drawBorderRoundedSquareAlg(x1, y1, r, w, h, color, fill_m, 255, 255, 255, 255);
 		}
 	}
-	
+
 	// If only border is visible
 	if ((!(w <= 0 || h <= 0)) && (fill_m != Base::kFillDisabled)) {
 		if (fill_m == Base::kFillBackground)
diff --git a/graphics/VectorRendererSpec.h b/graphics/VectorRendererSpec.h
index c035ca0e19..f47cc3997a 100644
--- a/graphics/VectorRendererSpec.h
+++ b/graphics/VectorRendererSpec.h
@@ -301,7 +301,7 @@ protected:
 	virtual void drawRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m);
 
 	virtual void drawBorderRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m, uint8 alpha_t, uint8 alpha_l, uint8 alpha_r, uint8 alpha_b);
-	
+
 	virtual void drawInteriorRoundedSquareAlg(int x1, int y1, int r, int w, int h, PixelType color, VectorRenderer::FillMode fill_m);
 
 	virtual void drawRoundedSquareShadow(int x, int y, int r, int w, int h, int offset) {
diff --git a/graphics/transform_struct.h b/graphics/transform_struct.h
index 640daf9f4c..1d37492de4 100644
--- a/graphics/transform_struct.h
+++ b/graphics/transform_struct.h
@@ -48,7 +48,7 @@ const int32 kDefaultHotspotX = 0;
 const int32 kDefaultHotspotY = 0;
 const int32 kDefaultOffsetX = 0;
 const int32 kDefaultOffsetY = 0;
-const int32 kDefaultAngle = 0;	
+const int32 kDefaultAngle = 0;
 
 struct TransformStruct {
 private:
-- 
cgit v1.2.3


From b845d41d16f8452122cc8a3b6194da11b3310b5d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:34:09 +0200
Subject: VIDEO: Remove trailing whitespace

---
 video/avi_decoder.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index d9761e1c38..a5016632d6 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -149,7 +149,7 @@ bool AVIDecoder::parseNextChunk() {
 		skipChunk(size);
 		break;
 	case ID_IDX1:
-		readOldIndex(size);		
+		readOldIndex(size);
 		break;
 	default:
 		error("Unknown tag \'%s\' found", tag2str(tag));
@@ -528,7 +528,7 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 		// Recreate the audio stream
 		audioTrack->resetStream();
 
-		uint framesNeeded = _header.initialFrames;	
+		uint framesNeeded = _header.initialFrames;
 		if (framesNeeded == 0)
 			framesNeeded = 1;
 
@@ -623,7 +623,7 @@ void AVIDecoder::readOldIndex(uint32 size) {
 	OldIndex firstEntry;
 	firstEntry.id = _fileStream->readUint32BE();
 	firstEntry.flags = _fileStream->readUint32LE();
-	firstEntry.offset = _fileStream->readUint32LE(); 
+	firstEntry.offset = _fileStream->readUint32LE();
 	firstEntry.size = _fileStream->readUint32LE();
 
 	// Check if the offset is already absolute
-- 
cgit v1.2.3


From 0d81e522c1a256570a8bc6fd481d2efab83b07df Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:34:48 +0200
Subject: GUI: Remove trailing whitespace

---
 gui/about.cpp            | 2 +-
 gui/widgets/edittext.cpp | 2 +-
 gui/widgets/tab.h        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui/about.cpp b/gui/about.cpp
index fe726df750..b25efc1cd0 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -241,7 +241,7 @@ void AboutDialog::drawDialog() {
 			while (*str && *str == ' ')
 				str++;
 
-		if (*str) 
+		if (*str)
 			g_gui.theme()->drawText(Common::Rect(_x + _xOff, y, _x + _w - _xOff, y + g_gui.theme()->getFontHeight()), str, state, align, ThemeEngine::kTextInversionNone, 0, false, ThemeEngine::kFontStyleBold, ThemeEngine::kFontColorNormal, true, _textDrawableArea);
 		y += _lineHeight;
 	}
diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp
index 3e72350c99..550b1bd153 100644
--- a/gui/widgets/edittext.cpp
+++ b/gui/widgets/edittext.cpp
@@ -94,7 +94,7 @@ void EditTextWidget::drawWidget() {
 
 	// Draw the text
 	adjustOffset();
-	
+
 	const Common::Rect &r = Common::Rect(_x + 2 + _leftPadding, _y + 2, _x + _leftPadding + getEditRect().width() + 8, _y + _h);
 	setTextDrawableArea(r);
 
diff --git a/gui/widgets/tab.h b/gui/widgets/tab.h
index a01ee2d9dc..148f164fbb 100644
--- a/gui/widgets/tab.h
+++ b/gui/widgets/tab.h
@@ -28,7 +28,7 @@
 #include "common/array.h"
 
 namespace GUI {
-	
+
 enum {
 	kTabForwards = 1,
 	kTabBackwards = -1
-- 
cgit v1.2.3


From 67fec75b4e68a3a5ebfbd6a56d61fab480f282b4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:35:24 +0200
Subject: IMAGE: Remove trailing whitespace

---
 image/codecs/mpeg.h   | 2 +-
 image/iff.cpp         | 2 +-
 image/image_decoder.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image/codecs/mpeg.h b/image/codecs/mpeg.h
index 6cb10f21ac..82c3ad19ac 100644
--- a/image/codecs/mpeg.h
+++ b/image/codecs/mpeg.h
@@ -62,7 +62,7 @@ namespace Graphics {
 struct Surface;
 }
 
-namespace Image { 
+namespace Image {
 
 /**
  * MPEG 1/2 video decoder.
diff --git a/image/iff.cpp b/image/iff.cpp
index d93e9ff878..d75fffb31f 100644
--- a/image/iff.cpp
+++ b/image/iff.cpp
@@ -31,7 +31,7 @@ namespace Image {
 IFFDecoder::IFFDecoder() {
 	_surface = 0;
 	_palette = 0;
-	
+
 	// these 2 properties are not reset by destroy(), so the default is set here.
 	_numRelevantPlanes = 8;
 	_pixelPacking = false;
diff --git a/image/image_decoder.h b/image/image_decoder.h
index 4d3512e0f6..2018cebd37 100644
--- a/image/image_decoder.h
+++ b/image/image_decoder.h
@@ -48,7 +48,7 @@ public:
 
 	/**
 	 * Load an image from the specified stream
-	 * 
+	 *
 	 * loadStream() should implicitly call destroy() to free the memory
 	 * of the last loadStream() call.
 	 *
-- 
cgit v1.2.3


From d2c69a79fe1a728ee17ca415ffce1720dae7fe99 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:36:22 +0200
Subject: BACKENDS: Remove trailing whitespace

---
 backends/graphics/opengl/opengl-graphics.cpp       | 6 +++---
 backends/graphics/openglsdl/openglsdl-graphics.cpp | 2 +-
 backends/platform/sdl/sdl.cpp                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index cbd06e9161..c455c4ce2e 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -489,7 +489,7 @@ void OpenGLGraphicsManager::warpMouse(int x, int y) {
 		if (!_overlay) {
 			return;
 		}
-	
+
 		// It might be confusing that we actually have to handle something
 		// here when the overlay is visible. This is because for very small
 		// resolutions we have a minimal overlay size and have to adjust
@@ -1044,8 +1044,8 @@ void OpenGLGraphicsManager::recalculateDisplayArea() {
 	}
 
 	// We center the screen in the middle for now.
-	_displayX = (_outputScreenWidth  - _displayWidth ) / 2; 
-	_displayY = (_outputScreenHeight - _displayHeight) / 2; 
+	_displayX = (_outputScreenWidth  - _displayWidth ) / 2;
+	_displayY = (_outputScreenHeight - _displayHeight) / 2;
 }
 
 void OpenGLGraphicsManager::updateCursorPalette() {
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index c998f3d1f1..b028cd5b1a 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -282,7 +282,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 			if (!_fullscreenVideoModes.empty()) {
 				VideoModeArray::const_iterator i = _fullscreenVideoModes.end();
 				--i;
-	
+
 				_desiredFullscreenWidth  = i->width;
 				_desiredFullscreenHeight = i->height;
 			} else {
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 41610dc0c7..4dc5929dab 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -390,7 +390,7 @@ Common::String OSystem_SDL::getSystemLanguage() const {
 #else // WIN32
 	// Activating current locale settings
 	const Common::String locale = setlocale(LC_ALL, "");
- 
+
 	// Restore default C locale to prevent issues with
 	// portability of sscanf(), atof(), etc.
 	// See bug #3615148
-- 
cgit v1.2.3


From daf110c86709a3e1899b4d1ae4d50efdf9ec9549 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:37:45 +0200
Subject: COMMON: Remove trailing whitespace

---
 common/EventMapper.cpp | 6 +++---
 common/scummsys.h      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index b92116cbe7..cf65946d50 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -45,7 +45,7 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 	if (ev.type == EVENT_MBUTTONUP) {
 		if ((g_system->getMillis() - vkeybdThen) >= vkeybdTime) {
 			mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
-		
+
 			// Avoid blocking event from engine.
 			addDelayedEvent(100, ev);
 		}
@@ -59,7 +59,7 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 #ifdef ENABLE_VKEYBD
 		else if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F7) {
 			mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
-			
+
 			// Avoid blocking CTRL-F7 events from engine.
 			addDelayedEvent(100, ev);
 		}
@@ -67,7 +67,7 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 #ifdef ENABLE_KEYMAPPER
 		else if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F8) {
 			mappedEvent.type = EVENT_KEYMAPPER_REMAP;
-			
+
 			// Avoid blocking CTRL-F8 events from engine.
 			addDelayedEvent(100, ev);
 		}
diff --git a/common/scummsys.h b/common/scummsys.h
index c30bc4a52a..0c4687e03e 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -148,7 +148,7 @@
 	#endif
 #endif
 
-// The following math constants are usually defined by the system math.h header, but 
+// The following math constants are usually defined by the system math.h header, but
 // they are not part of the ANSI C++ standards and so can NOT be relied upon to be
 // present i.e. when -std=c++11 is passed to GCC, enabling strict ANSI compliance.
 // As we rely on these being present, we define them if they are not set.
-- 
cgit v1.2.3


From 50c1d5c3a1622bc8d8cca1996fe0d64661bc2526 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:38:22 +0200
Subject: WINTERMUTE: Remove trailing whitespace

---
 engines/wintermute/math/rect32.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/math/rect32.h b/engines/wintermute/math/rect32.h
index 93b5c68a30..00326d6747 100644
--- a/engines/wintermute/math/rect32.h
+++ b/engines/wintermute/math/rect32.h
@@ -50,7 +50,7 @@ struct Point32 {
 		y -= delta.y;
 		return *this;
 	}
-	
+
 	operator FloatPoint() {
 		return FloatPoint(x,y);
 	}
-- 
cgit v1.2.3


From 338f3dc1035267f94c53e0705473c10b8251fe11 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 15:46:19 +0200
Subject: TONY: Fix image loading on BE systems again

This was originally changed in commit 43520ce4f3, but it has been
removed accidentally in commit 84fb3e816d
---
 engines/tony/gfxcore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index b8350eb8d7..2a32926c53 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -1958,7 +1958,7 @@ void RMGfxSourceBuffer16::prepareImage() {
 
 		pixel = (r << 11) | (g << 6) | b;
 
-		WRITE_LE_UINT16(&buf[i], pixel);
+		buf[i] = pixel;
 	}
 }
 
-- 
cgit v1.2.3


From c18dba13266e9901653cd60869642dad9ccc6337 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:01:35 +0200
Subject: CREDITS: Properly sync trailing whitespace changes in all files

This was initially only done for the AUTHORS file in commit f50715a
---
 devtools/credits.pl | 2 +-
 gui/credits.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devtools/credits.pl b/devtools/credits.pl
index 0960011802..9a3cd5c9ac 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -1205,7 +1205,7 @@ begin_credits("Credits");
 			add_person("Ivan Dubrov", "", "For contributing the initial version of the Gobliiins engine");
 			add_person("Henrik Engqvist", "qvist", "For generously providing hosting for our buildbot, SVN repository, planet and doxygen sites as well as tons of HD space");
 			add_person("DOSBox Team", "", "For their awesome OPL2 and OPL3 emulator");
-			add_person("Yusuke Kamiyamane", "", "For contributing some GUI icons ");
+			add_person("Yusuke Kamiyamane", "", "For contributing some GUI icons");
 			add_person("Till Kresslein", "Krest", "For design of modern ScummVM GUI");
 			add_person("", "Jezar", "For his freeverb filter implementation");
 			add_person("Jim Leiterman", "", "Various info on his FM-TOWNS/Marty SCUMM ports");
diff --git a/gui/credits.h b/gui/credits.h
index e32a0705bf..38287ebdf9 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -810,7 +810,7 @@ static const char *credits[] = {
 "C0""DOSBox Team",
 "C2""For their awesome OPL2 and OPL3 emulator",
 "C0""Yusuke Kamiyamane",
-"C2""For contributing some GUI icons ",
+"C2""For contributing some GUI icons",
 "C0""Till Kresslein",
 "C2""For design of modern ScummVM GUI",
 "C0""Jezar",
-- 
cgit v1.2.3


From 7e03520030c09d60f86578cdbc98b15581c4c471 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:03:17 +0200
Subject: TSAGE: Remove trailing whitespace

---
 engines/tsage/ringworld2/ringworld2_outpost.cpp | 2 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/tsage/ringworld2/ringworld2_outpost.cpp b/engines/tsage/ringworld2/ringworld2_outpost.cpp
index 05cfa6259b..cad21b4623 100644
--- a/engines/tsage/ringworld2/ringworld2_outpost.cpp
+++ b/engines/tsage/ringworld2/ringworld2_outpost.cpp
@@ -4605,7 +4605,7 @@ void Scene1337::subD1940(bool flag) {
 }
 
 void Scene1337::subD1975(int arg1, int arg2) {
-	// No implementation required in ScummVM: Mouse handling with tons of caching 
+	// No implementation required in ScummVM: Mouse handling with tons of caching
 }
 
 void Scene1337::OptionsDialog::show() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 9eaead630b..8610e0c8bc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3878,7 +3878,7 @@ void Scene3500::dispatch() {
 	Scene::dispatch();
 
 	// WORKAROUND: The _mazeUI wasn't originally added to the scene in postInit.
-	// This is only needed to fix old savegames 
+	// This is only needed to fix old savegames
 	if (!R2_GLOBALS._sceneObjects->contains(&_mazeUI))
 		_mazeUI.draw();
 
-- 
cgit v1.2.3


From 62c2e46566b940746d059bfeb23023b45bbca9ef Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:04:11 +0200
Subject: CGE: Remove trailing whitespace

---
 engines/cge/vga13h.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index babcb7e667..4d3a103663 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -640,7 +640,7 @@ Vga::Vga(CGEEngine *vm) : _frmCnt(0), _msg(NULL), _name(NULL), _setPal(false), _
 
 	if (ConfMan.getBool("enable_color_blind"))
 		_mono = 1;
-	
+
 
 	_oldColors = (Dac *)malloc(sizeof(Dac) * kPalCount);
 	_newColors = (Dac *)malloc(sizeof(Dac) * kPalCount);
-- 
cgit v1.2.3


From 2621d22cb7d71e23a96fbdb8d65759a107930d67 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:04:52 +0200
Subject: AGOS: Remove trailing whitespace

---
 engines/agos/input.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 8a4e87017a..687a8ef1cf 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -460,7 +460,7 @@ void AGOSEngine_Simon1::handleMouseWheelUp() {
 				_saveLoadEdit = false;
 				listSaveGames();
 			}
-	} else {	
+	} else {
 		AGOSEngine::handleMouseWheelUp();
 	}
 }
@@ -472,11 +472,11 @@ void AGOSEngine_Simon1::handleMouseWheelDown() {
 				_saveLoadRowCurPos += 1;
 				if (_saveLoadRowCurPos >= _numSaveGameRows)
 					_saveLoadRowCurPos = _numSaveGameRows;
-			
+
 				_saveLoadEdit = false;
 				listSaveGames();
 			}
-	} else {	
+	} else {
 		AGOSEngine::handleMouseWheelDown();
 	}
 }
@@ -492,7 +492,7 @@ void AGOSEngine_Elvira2::handleMouseWheelUp() {
 				_saveLoadRowCurPos -= 3;
 
 			listSaveGames();
-	} else {	
+	} else {
 		AGOSEngine::handleMouseWheelUp();
 	}
 }
@@ -506,7 +506,7 @@ void AGOSEngine_Elvira2::handleMouseWheelDown() {
 				_saveLoadRowCurPos = 1;
 
 			listSaveGames();
-	} else {	
+	} else {
 		AGOSEngine::handleMouseWheelDown();
 	}
 }
-- 
cgit v1.2.3


From c76c72c7998820c5046db7dbf58dc7dfd4af97dc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:06:07 +0200
Subject: CGE2: Remove trailing whitespace

---
 engines/cge2/cge2.cpp      |  2 +-
 engines/cge2/cge2.h        |  2 +-
 engines/cge2/cge2_main.cpp | 24 ++++++++++++------------
 engines/cge2/cge2_main.h   |  2 +-
 engines/cge2/events.cpp    |  4 ++--
 engines/cge2/hero.cpp      | 10 +++++-----
 engines/cge2/map.cpp       |  2 +-
 engines/cge2/saveload.cpp  |  4 ++--
 engines/cge2/snail.cpp     | 10 +++++-----
 engines/cge2/spare.h       |  2 +-
 engines/cge2/talk.cpp      |  2 +-
 engines/cge2/vga13h.cpp    |  8 ++++----
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index 37d87ba09c..ee62e20ac6 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -97,7 +97,7 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription)
 	_midiNotify = nullptr;
 	_spriteNotify = nullptr;
 	_startGameSlot = 0;
-	
+
 	_sayCap = ConfMan.getBool("subtitles");
 	_sayVox = !ConfMan.getBool("speech_mute");
 	_muteAll = ConfMan.getBool("mute");
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 50b418f294..fbe4cb3abc 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -269,7 +269,7 @@ public:
 	void snRoom(Sprite *spr, bool on);
 	void snGhost(Bitmap *bmp);
 	void snSay(Sprite *spr, int val);
-	
+
 	void hide1(Sprite *spr);
 	Sprite *expandSprite(Sprite *spr);
 	void qGame();
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 3e3d615a91..4e3d229618 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -58,7 +58,7 @@ void System::touch(uint16 mask, V2D pos, Common::KeyCode keyCode) {
 		if (_vm->_gamePhase != kPhaseInGame)
 			return;
 		_vm->_infoLine->setText(nullptr);
-		
+
 		if (mask & kMouseLeftUp) {
 			if (pos.y >= 0)	{ // world
 				if (!_vm->_talk && pos.y < _vm->_mouseTop)
@@ -184,7 +184,7 @@ Sprite *CGE2Engine::loadSprite(const char *fname, int ref, int scene, V3D &pos)
 			if (line.empty())
 				continue;
 			Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
-				
+
 			char *p = token(tmpStr);
 			if (*p == '@') {
 				if (label != kNoByte)
@@ -327,7 +327,7 @@ void CGE2Engine::loadScript(const char *fname, bool onlyToolbar) {
 
 		lcnt++;
 		Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
-		
+
 		ok = false; // not OK if break
 
 		V3D P;
@@ -419,7 +419,7 @@ void CGE2Engine::sceneUp(int cav) {
 	_map->load(_now);
 	_spare->takeScene(_now);
 	openPocket();
-	
+
 	for (int i = 0; i < 2; i++) {
 		Hero *h = _heroTab[i]->_ptr;
 		if (h && h->_scene == _now) {
@@ -432,7 +432,7 @@ void CGE2Engine::sceneUp(int cav) {
 			h->setContact();
 		}
 	}
-	
+
 	_sound->stop();
 	_fx->clear();
 
@@ -596,7 +596,7 @@ void CGE2Engine::tick() {
 	for (Sprite *spr = _vga->_showQ->first(); spr; spr = spr->_next) {
 		if (spr->_time && (--spr->_time == 0))
 			spr->tick();
-		
+
 		if (_waitRef && (_waitRef == spr->_ref) && spr->seqTest(_waitSeq))
 			_waitRef = 0;
 	}
@@ -658,10 +658,10 @@ void CGE2Engine::loadUser() {
 
 void CGE2Engine::loadHeroes() { // Original name: loadGame()
 	// load sprites & pocket
-	
+
 	Sprite *s;
 	Hero *h = nullptr;
-	
+
 	// initialize Andzia/Anna
 	s = _spare->take(142);
 	if (s) {
@@ -698,7 +698,7 @@ void CGE2Engine::loadPos() {
 	if (_resman->exist("CGE.HXY")) {
 		for (int cav = 0; cav < kSceneMax; cav++)
 			_heroTab[1]->_posTab[cav] = new V2D(this, 180, 10);
-		
+
 		EncryptedStream file(this, "CGE.HXY");
 
 		for (int cav = 0; cav < kSceneMax; cav++) {
@@ -752,7 +752,7 @@ void CGE2Engine::cge2_main() {
 			runGame();
 			_gamePhase = kPhaseOver;
 		}
-		
+
 		_vga->sunset();
 	} else
 		_vga->sunset();
@@ -767,7 +767,7 @@ char *CGE2Engine::mergeExt(char *buf, const char *name, const char *ext) {
 	return buf;
 }
 
-void CGE2Engine::setEye(const V3D &e) { 
+void CGE2Engine::setEye(const V3D &e) {
 	*_eye = e;
 }
 
@@ -931,7 +931,7 @@ void CGE2Engine::offUse() {
 	// This fixes the issue of empty speech bubbles in the original.
 	// Now we only let this cycle pass if it randoms a valid value for getText().
 	int txt = 0;
-	do { 
+	do {
 		txt = kOffUseText + _sex * offUseCount + newRandom(offUseCount);
 	} while (_text->getText(txt) == nullptr);
 
diff --git a/engines/cge2/cge2_main.h b/engines/cge2/cge2_main.h
index 88cca1cc1e..4d92c33e50 100644
--- a/engines/cge2/cge2_main.h
+++ b/engines/cge2/cge2_main.h
@@ -40,7 +40,7 @@ public:
 	Sprite *_blinkSprite;
 
 	System(CGE2Engine *vm);
-	
+
 	virtual void touch(uint16 mask, V2D pos, Common::KeyCode keyCode);
 	void tick();
 private:
diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp
index ed1ec66bb1..85743c8011 100644
--- a/engines/cge2/events.cpp
+++ b/engines/cge2/events.cpp
@@ -132,7 +132,7 @@ Mouse::Mouse(CGE2Engine *vm) : Sprite(vm), _busy(nullptr), _hold(nullptr), _hx(0
 	_busy = nullptr;
 	_active = false;
 	_flags._kill = false;
-	
+
 	setSeq(_stdSeq8);
 
 	BitmapPtr MC = new Bitmap[2];
@@ -260,7 +260,7 @@ void EventManager::handleEvents() {
 			if (e._spritePtr) {
 				if (e._mask & kEventKeyb)
 					e._spritePtr->touch(e._mask, _vm->_mouse->_point, e._keyCode);
-				else 
+				else
 					e._spritePtr->touch(e._mask, _vm->_mouse->_point - e._spritePtr->_pos2D, e._keyCode);
 			} else if (_vm->_sys)
 				_vm->_sys->touch(e._mask, _vm->_mouse->_point, e._keyCode);
diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp
index 225df54bd1..42ae67cc2b 100644
--- a/engines/cge2/hero.cpp
+++ b/engines/cge2/hero.cpp
@@ -205,7 +205,7 @@ Sprite *Hero::expand() {
 	int i = stepSize() / 2;
 	_maxDist = (int)sqrt(double(i * i * 2));
 	setCurrent();
-	
+
 	return this;
 }
 
@@ -558,9 +558,9 @@ int CGE2Engine::mapCross(const V2D &a, const V2D &b) {
 		if (p) {
 			if (cross(a, b, *n0, *n))
 				++cnt;
-		
+
 			if (*n == *p)
-				p = nullptr;	
+				p = nullptr;
 		} else {
 			p = n;
 		}
@@ -587,7 +587,7 @@ void Hero::operator--() {
 bool Sprite::works(Sprite *spr) {
 	if (!spr || !spr->_ext)
 		return false;
-	
+
 	bool ok = false;
 
 	Action a = _vm->_heroTab[_vm->_sex]->_ptr->action();
@@ -615,7 +615,7 @@ bool Sprite::works(Sprite *spr) {
 			}
 		}
 	}
-	
+
 	return ok;
 }
 
diff --git a/engines/cge2/map.cpp b/engines/cge2/map.cpp
index 8c1f00048f..275e15f55a 100644
--- a/engines/cge2/map.cpp
+++ b/engines/cge2/map.cpp
@@ -48,7 +48,7 @@ void Map::load(int scene) {
 		return;
 
 	EncryptedStream file(_vm, fileName.c_str());
-	
+
 	Common::String line;
 	for (line = file.readLine(); !file.eos(); line = file.readLine()) {
 		if (line.empty())
diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp
index fd60422dff..7735c077a6 100644
--- a/engines/cge2/saveload.cpp
+++ b/engines/cge2/saveload.cpp
@@ -104,7 +104,7 @@ bool CGE2Engine::loadGame(int slotNumber) {
 	saveFile->read(dataBuffer, size);
 	readStream = new Common::MemoryReadStream(dataBuffer, size, DisposeAfterUse::YES);
 	delete saveFile;
-	
+
 	// Check to see if it's a ScummVM savegame or not
 	char buffer[kSavegameStrSize + 1];
 	readStream->read(buffer, kSavegameStrSize + 1);
@@ -132,7 +132,7 @@ bool CGE2Engine::loadGame(int slotNumber) {
 	delete readStream;
 
 	loadHeroes();
-	
+
 	return true;
 }
 
diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp
index 8e1ddf2d9b..7580ef4425 100644
--- a/engines/cge2/snail.cpp
+++ b/engines/cge2/snail.cpp
@@ -92,7 +92,7 @@ void CommandHandler::runCommand() {
 				}
 				_textDelay = false;
 			}
-			
+
 			if (_vm->_talk && tailCmd._commandType != kCmdPause)
 				break;
 		}
@@ -332,7 +332,7 @@ void CGE2Engine::snRSeq(Sprite *spr, int val) {
 void CGE2Engine::snSend(Sprite *spr, int val) {
 	if (!spr)
 		return;
-	
+
 	// Sending", spr->_file
 	// from scene", spr->_scene
 	// to scene", val
@@ -691,7 +691,7 @@ Sprite *CGE2Engine::expandSprite(Sprite *spr) {
 void CGE2Engine::qGame() {
 	// Write out the user's progress
 	saveGame(0, Common::String("Automatic Savegame"));
-	
+
 	busy(false);
 	_vga->sunset();
 	_endGame = true;
@@ -853,13 +853,13 @@ void CGE2Engine::feedSnail(Sprite *spr, Action snq, Hero *hero) {
 				if (s == spr)
 					break;
 			}
-			
+
 			_commandHandler->addCommand(c->_commandType, c->_ref, c->_val, spr);
 
 			++c;
 		}
 	}
-	
+
 }
 
 } // End of namespace CGE2.
diff --git a/engines/cge2/spare.h b/engines/cge2/spare.h
index 7dc6ce60f5..24a97712ff 100644
--- a/engines/cge2/spare.h
+++ b/engines/cge2/spare.h
@@ -38,7 +38,7 @@ class Spare {
 public:
 	Spare(CGE2Engine *vm) : _vm(vm) {}
 	~Spare() { clear(); }
-	void store(Sprite *spr);	
+	void store(Sprite *spr);
 	Sprite *locate(int ref);
 	Sprite *take(int ref);
 	void takeScene(int cav);
diff --git a/engines/cge2/talk.cpp b/engines/cge2/talk.cpp
index 9109da90f1..8e6be6cac2 100644
--- a/engines/cge2/talk.cpp
+++ b/engines/cge2/talk.cpp
@@ -121,7 +121,7 @@ Talk::Talk(CGE2Engine *vm, const char *text, TextBoxStyle mode, ColorBank color,
 Talk::Talk(CGE2Engine *vm, ColorBank color)
 	: Sprite(vm), _mode(kTBPure), _created(false), _wideSpace(false), _vm(vm) {
 	_color = _vm->_font->_colorSet[color];
-	
+
 	if (color == kCBRel)
 		_vm->setAutoColors();
 }
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 227633579e..f4064f3565 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -45,13 +45,13 @@ void V3D::sync(Common::Serializer &s) {
 	_z.sync(s);
 }
 
-FXP FXP::operator*(const FXP& x) const { 
-	FXP y; 
+FXP FXP::operator*(const FXP& x) const {
+	FXP y;
 	int32 t1 = (v >> 8) * x.v;
 	int32 t2 = ((v & 0xFF) * x.v) >> 8;
 
 	y.v = t1 + t2;
-	return y; 
+	return y;
 }
 
 FXP FXP::operator/(const FXP& x) const {
@@ -613,7 +613,7 @@ void Sprite::gotoxyz(V2D pos) {
 		++trim;
 	}
 	_pos2D.x = pos.x;
-	
+
 	if (pos.y < -kPanHeight) {
 		pos.y = -kPanHeight;
 		++trim;
-- 
cgit v1.2.3


From 176f8209c731ef3f93749ff4a4d304f3e494b2c9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:06:48 +0200
Subject: HOPKINS: Remove trailing whitespace

---
 engines/hopkins/computer.cpp | 2 +-
 engines/hopkins/talk.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index 84d5c631c7..18b16cb4c8 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -883,7 +883,7 @@ void ComputerManager::getScoreName() {
 	_vm->_graphicsMan->setColorPercentage(254, 0, 0, 0);
 	byte *ptr = _vm->_fileIO->loadFile("ALPHA.SPR");
 	_vm->_graphicsMan->fadeInBreakout();
-	
+
 	// Figure out the line to put the new high score on
 	int scoreLine = 0;
 	while (scoreLine < 5 && _breakoutScore < atol(_score[scoreLine]._score.c_str()))
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index df7b26c82c..00c4ab0332 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -68,7 +68,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename)
 	getStringFromBuffer(40, spriteFilename, (const char *)_characterBuffer);
 	getStringFromBuffer(0, _questionsFilename, (const char *)_characterBuffer);
 	getStringFromBuffer(20, _answersFilename, (const char *)_characterBuffer);
-	
+
 	switch (_vm->_globals->_language) {
 	case LANG_FR:
 		_answersFilename = _questionsFilename = "RUE.TXT";
-- 
cgit v1.2.3


From ceab7a8742a690f71c1080604bd6aebe1261286c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:07:16 +0200
Subject: KYRA: Remove trailing whitespace

---
 engines/kyra/vqa.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index fb51c05e51..cfd5f6ffc6 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -532,7 +532,7 @@ void VQADecoder::VQAVideoTrack::handleVQFR(Common::SeekableReadStream *stream) {
 		uint32 tag = readTag(stream);
 		uint32 i;
 		size = stream->readUint32BE();
-		
+
 		switch (tag) {
 		case MKTAG('C','B','F','0'):	// Full codebook
 			stream->read(_codeBook, size);
-- 
cgit v1.2.3


From eed9da3ea29324617ae4367569bc7cea1f16d902 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:12:25 +0200
Subject: SWORD1: Remove trailing whitespace

---
 engines/sword1/console.cpp | 2 +-
 engines/sword1/sound.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sword1/console.cpp b/engines/sword1/console.cpp
index 7fabc62192..3a4b51965b 100644
--- a/engines/sword1/console.cpp
+++ b/engines/sword1/console.cpp
@@ -36,7 +36,7 @@ SwordConsole::SwordConsole(SwordEngine *vm) : GUI::Debugger(), _vm(vm) {
 
 SwordConsole::~SwordConsole() {
 }
-	
+
 bool SwordConsole::Cmd_SpeechEndianness(int argc, const char **argv) {
 	if (argc == 1) {
 		debugPrintf("Using %s speech\n", _vm->_sound->_bigEndianSpeech ? "be" : "le");
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 9140bddb65..4deaf06edc 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -144,7 +144,7 @@ void Sound::checkSpeechFileEndianness() {
 		debug(8, "Speech endianness heuristic: average = %f for BE and %f for LE (%d samples)", be_diff, le_diff, maxSamples);
 	}
 }
-											   
+
 double Sound::endiannessHeuristicValue(int16* data, uint32 dataSize, uint32 &maxSamples) {
 	if (!data)
 		return 50000.; // the heuristic value for the wrong endianess is about 21000 (1/3rd of the 16 bits range)
-- 
cgit v1.2.3


From e938ddcef7f40027ea3d2bae3e71730d8f74eb4b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:13:07 +0200
Subject: SWORD25: Remove trailing whitespace

---
 engines/sword25/gfx/renderobjectmanager.cpp | 2 +-
 engines/sword25/util/pluto/pluto.cpp        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/sword25/gfx/renderobjectmanager.cpp b/engines/sword25/gfx/renderobjectmanager.cpp
index 4927b4c58e..8aeecad6b1 100644
--- a/engines/sword25/gfx/renderobjectmanager.cpp
+++ b/engines/sword25/gfx/renderobjectmanager.cpp
@@ -107,7 +107,7 @@ bool RenderObjectManager::render() {
 		if (!_currQueue->exists(*it))
 			_uta->addRect((*it)._bbox);
 	}
-	
+
 	// Add rectangles of objects which are different from the previous frame
 	for (RenderObjectQueue::iterator it = _currQueue->begin(); it != _currQueue->end(); ++it) {
 		if (!_prevQueue->exists(*it))
diff --git a/engines/sword25/util/pluto/pluto.cpp b/engines/sword25/util/pluto/pluto.cpp
index 78b0a815e8..cbe16b0d5b 100644
--- a/engines/sword25/util/pluto/pluto.cpp
+++ b/engines/sword25/util/pluto/pluto.cpp
@@ -325,7 +325,7 @@ static void persisttable(PersistInfo *pi)
 #ifdef TOTEXT
 	printf("persisttable\n");
 #endif
-  
+
 					/* perms reftbl ... tbl */
 	lua_checkstack(pi->L, 3);
 	if(persistspecialobject(pi, 1)) {
@@ -1192,7 +1192,7 @@ int persist_l(lua_State *L)
 
 	wi.buf = NULL;
 	wi.buflen = 0;
-	
+
 	lua_settop(L, 2);
 					/* perms? rootobj? */
 	luaL_checktype(L, 1, LUA_TTABLE);
@@ -1750,7 +1750,7 @@ static void unpersistthread(int ref, UnpersistInfo *upi)
 #else
 		verify(LIF(Z,read)(&upi->zio, &L2->errfunc, sizeof(ptrdiff_t)) == 0);
 #endif
-		
+
 		//read_size(&upi->zio, (size_t *)&L2->errfunc);
 		L2->base = L2->stack + stackbase;
 		L2->top = L2->stack + stacktop;
@@ -2045,7 +2045,7 @@ int unpersist_l(lua_State *L)
 int version_l(lua_State *L)
 {
 	const char *version = VERSION;
-  
+
 	lua_settop(L, 0);
 					/* (empty) */
 	lua_pushlstring(L, version, strlen(version));
-- 
cgit v1.2.3


From 3575235ca628cd7f483f0ca42eb601f82d70efb8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:13:40 +0200
Subject: TONY: Remove trailing whitespace

---
 engines/tony/mpal/lzo.cpp | 2 +-
 engines/tony/window.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/tony/mpal/lzo.cpp b/engines/tony/mpal/lzo.cpp
index 314d6f3ed5..6cc2333315 100644
--- a/engines/tony/mpal/lzo.cpp
+++ b/engines/tony/mpal/lzo.cpp
@@ -116,7 +116,7 @@ int lzo1x_decompress(const byte *in, uint32 in_len, byte *out, uint32 *out_len)
 		*op++ = *ip++;
 		*op++ = *ip++;
 		*op++ = *ip++;
-		do 
+		do
 			*op++ = *ip++;
 		while (--t > 0);
 
diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp
index c62f483a35..3b3687419b 100644
--- a/engines/tony/window.cpp
+++ b/engines/tony/window.cpp
@@ -55,7 +55,7 @@ RMWindow::~RMWindow() {
 void RMWindow::init() {
 	Graphics::PixelFormat pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
 	initGraphics(RM_SX, RM_SY, true, &pixelFormat);
-	
+
 	reset();
 }
 
-- 
cgit v1.2.3


From 66abcb4829d6297f7f637d5eb976f72f9e6591cc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:14:08 +0200
Subject: TOON: Remove trailing whitespace

---
 engines/toon/character.cpp | 2 +-
 engines/toon/state.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 51e8dee19f..686fe99beb 100644
--- a/engines/toon/character.cpp
+++ b/engines/toon/character.cpp
@@ -1059,7 +1059,7 @@ void Character::playAnim(int32 animId, int32 unused, int32 flags) {
 	_specialAnim->loadAnimation(animName);
 
 	_animSpecialId = animId;
-	
+
 	if (_animationInstance) {
 		_animationInstance->setAnimation(_specialAnim);
 		_animationInstance->setAnimationRange(0, _specialAnim->_numFrames - 1);
diff --git a/engines/toon/state.cpp b/engines/toon/state.cpp
index 6ac5808219..000f94d659 100644
--- a/engines/toon/state.cpp
+++ b/engines/toon/state.cpp
@@ -115,7 +115,7 @@ State::State(void) {
 #endif
 
 	memset(_conversationState, 0, sizeof(Conversation) * 60);
-	
+
 	_conversationData = nullptr;
 	_currentConversationId = -1;
 	_exitConversation = true;
-- 
cgit v1.2.3


From e4f3f44c23c05410ddf5a1f1d387ca7d3acaef80 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:15:01 +0200
Subject: ZVISION: Remove trailing whitespace

---
 engines/zvision/archives/zfs_archive.cpp                   |  2 +-
 engines/zvision/core/save_manager.cpp                      |  4 ++--
 engines/zvision/scripting/actions.cpp                      |  6 +++---
 engines/zvision/scripting/controls/animation_control.h     |  2 +-
 engines/zvision/scripting/controls/lever_control.cpp       | 12 ++++++------
 engines/zvision/scripting/controls/push_toggle_control.cpp |  4 ++--
 engines/zvision/scripting/controls/timer_node.cpp          |  2 +-
 engines/zvision/scripting/scr_file_handling.cpp            |  2 +-
 engines/zvision/scripting/script_manager.cpp               |  2 +-
 engines/zvision/utility/utility.cpp                        |  2 +-
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/engines/zvision/archives/zfs_archive.cpp b/engines/zvision/archives/zfs_archive.cpp
index f5fa6fc9bf..d18cc9966b 100644
--- a/engines/zvision/archives/zfs_archive.cpp
+++ b/engines/zvision/archives/zfs_archive.cpp
@@ -79,7 +79,7 @@ void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
 		// Read in each entry header
 		for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
 			ZfsEntryHeader entryHeader;
-			
+
 			entryHeader.name = readEntryName(stream);
 			entryHeader.offset = stream->readUint32LE();
 			entryHeader.id = stream->readUint32LE();
diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 07fb7637e7..e10201e024 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -106,7 +106,7 @@ void SaveManager::autoSave() {
 void SaveManager::writeSaveGameData(Common::OutSaveFile *file) {
 	// Create a thumbnail and save it
 	Graphics::saveThumbnail(*file);
-	
+
 	// Write out the save date/time
 	TimeDate td;
 	g_system->getTimeAndDate(td);
@@ -171,7 +171,7 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 		warning("File is not a ZVision save file. Aborting load");
 		return false;
 	}
-	
+
 	// Read in the version
 	header.version = in->readByte();
 
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 517278e155..219f418b13 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -123,7 +123,7 @@ ActionDisableControl::ActionDisableControl(const Common::String &line) {
 
 bool ActionDisableControl::execute(ZVision *engine) {
 	debug("Disabling control %u", _key);
-	
+
 	ScriptManager *scriptManager = engine->getScriptManager();
 	scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | ScriptManager::DISABLED);
 
@@ -194,7 +194,7 @@ bool ActionMusic::execute(ZVision *engine) {
 	} else {
 		audioStream = makeRawZorkStream(_fileName, engine);
 	}
-	
+
 	if (_loop) {
 		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
 		engine->_mixer->playStream(_soundType, 0, loopingAudioStream, -1, _volume);
@@ -327,7 +327,7 @@ ActionSetPartialScreen::ActionSetPartialScreen(const Common::String &line) {
 
 bool ActionSetPartialScreen::execute(ZVision *engine) {
 	RenderManager *renderManager = engine->getRenderManager();
-	
+
 	if (_backgroundColor > 0) {
 		renderManager->clearWorkingWindowTo555Color(_backgroundColor);
 	}
diff --git a/engines/zvision/scripting/controls/animation_control.h b/engines/zvision/scripting/controls/animation_control.h
index 6c4d6dfcf7..bdb07d39ea 100644
--- a/engines/zvision/scripting/controls/animation_control.h
+++ b/engines/zvision/scripting/controls/animation_control.h
@@ -56,7 +56,7 @@ private:
 
 private:
 	uint32 _animationKey;
-	
+
 	union {
 		RlfAnimation *rlf;
 		Video::VideoDecoder *avi;
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 9724e661b7..c029a2a7a1 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -84,7 +84,7 @@ LeverControl::~LeverControl() {
 	} else if (_fileType == RLF) {
 		delete _animation.rlf;
 	}
-	
+
 	delete[] _frameInfo;
 }
 
@@ -194,7 +194,7 @@ void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 	if (!_enabled) {
 		return;
 	}
-	
+
 	if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_mouseIsCaptured = true;
 		_lastMousePos = backgroundImageSpacePos;
@@ -205,7 +205,7 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 	if (!_enabled) {
 		return;
 	}
-	
+
 	if (_mouseIsCaptured) {
 		_mouseIsCaptured = false;
 		_engine->getScriptManager()->setStateValue(_key, _currentFrame);
@@ -220,7 +220,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 	if (!_enabled) {
 		return false;
 	}
-	
+
 	bool cursorWasChanged = false;
 
 	if (_mouseIsCaptured) {
@@ -276,7 +276,7 @@ bool LeverControl::process(uint32 deltaTimeInMillis) {
 			renderFrame(_returnRoutesCurrentFrame);
 		}
 	}
-	
+
 	return false;
 }
 
@@ -387,7 +387,7 @@ void LeverControl::renderFrame(uint frameNumber) {
 		// getFrameData() will automatically optimize to getNextFrame() / getPreviousFrame() if it can
 		frameData = (const uint16 *)_animation.rlf->getFrameData(frameNumber)->getPixels();
 		width = _animation.rlf->width(); // Use the animation width instead of _animationCoords.width()
-		height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()			
+		height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()
 	} else if (_fileType == AVI) {
 		_animation.avi->seekToFrame(frameNumber);
 		const Graphics::Surface *surface = _animation.avi->decodeNextFrame();
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 82736b7576..a96c95b377 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -76,7 +76,7 @@ void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Com
 	if (!_enabled) {
 		return;
 	}
-	
+
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getScriptManager()->setStateValue(_key, 1);
 	}
@@ -86,7 +86,7 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
 	if (!_enabled) {
 		return false;
 	}
-	
+
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_hoverCursor);
 		return true;
diff --git a/engines/zvision/scripting/controls/timer_node.cpp b/engines/zvision/scripting/controls/timer_node.cpp
index c8c8a85d34..6f88b056a1 100644
--- a/engines/zvision/scripting/controls/timer_node.cpp
+++ b/engines/zvision/scripting/controls/timer_node.cpp
@@ -31,7 +31,7 @@
 
 
 namespace ZVision {
-	
+
 TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
 		: Control(engine, key) {
 	if (_engine->getGameId() == GID_NEMESIS) {
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 753ce4ac6a..416bac00f3 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -236,7 +236,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 		} else if (line.matchString("*:ttytext*", true)) {
 			// TODO: Implement ActionTTYText
 		} else if (line.matchString("*:universe_music*", true)) {
-			// TODO: Implement ActionUniverseMusic		
+			// TODO: Implement ActionUniverseMusic
 		} else if (line.matchString("*:copy_file*", true)) {
 			// Not used. Purposely left empty
 		} else {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 41b835e550..da82308051 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -260,7 +260,7 @@ Control *ScriptManager::getControl(uint32 key) {
 void ScriptManager::focusControl(uint32 key) {
 	for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
 		uint32 controlKey = (*iter)->getKey();
-		
+
 		if (controlKey == key) {
 			(*iter)->focus();
 		} else if (controlKey == _currentlyFocusedControl) {
diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/utility/utility.cpp
index 905bc4513a..2079d23733 100644
--- a/engines/zvision/utility/utility.cpp
+++ b/engines/zvision/utility/utility.cpp
@@ -203,7 +203,7 @@ void convertRawToWav(const Common::String &inputFile, ZVision *engine, const Com
 		return;
 
 	Audio::AudioStream *audioStream = makeRawZorkStream(inputFile, engine);
-	
+
 	Common::DumpFile output;
 	output.open(outputFile);
 
-- 
cgit v1.2.3


From 2cbd2402a516e852c0d04650825b8f3ce96b6a51 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:15:43 +0200
Subject: SCUMM: Remove trailing whitespace

---
 engines/scumm/cdda.cpp      | 2 +-
 engines/scumm/detection.cpp | 2 +-
 engines/scumm/scumm.h       | 2 +-
 engines/scumm/sound.cpp     | 4 ++--
 engines/scumm/vars.cpp      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/scumm/cdda.cpp b/engines/scumm/cdda.cpp
index adb414ecce..d797712a31 100644
--- a/engines/scumm/cdda.cpp
+++ b/engines/scumm/cdda.cpp
@@ -46,7 +46,7 @@ private:
 public:
 	CDDAStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse);
 	virtual ~CDDAStream();
-	
+
 	int readBuffer(int16 *buffer, const int numSamples);
 	bool isStereo() const { return true; }
 	int getRate() const { return 44100; }
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index a7922b232e..10482ba1fc 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -244,7 +244,7 @@ static Common::String generateFilenameForDetection(const char *pattern, Filename
 	case kGenRoomNum:
 		result = Common::String::format(pattern, 0);
 		break;
-	
+
 	case kGenDiskNumSteam:
 	case kGenRoomNumSteam: {
 		const SteamIndexFile *indexFile = lookUpSteamIndexFile(pattern, platform);
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index af118a89a1..46512f8ce6 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -1362,7 +1362,7 @@ public:
 
 	byte VAR_SCRIPT_CYCLE;			// Used in runScript()/runObjectScript()
 	byte VAR_NUM_SCRIPT_CYCLES;		// Used in runAllScripts()
-	
+
 	byte VAR_QUIT_SCRIPT;			// Used in confirmExitDialog()
 
 	// Exists both in V7 and in V72HE:
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index cb428d1c15..84d2b37f96 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1066,9 +1066,9 @@ void Sound::playCDTrackInternal(int track, int numLoops, int startFrame, int dur
 		Common::File *cddaFile = new Common::File();
 		if (cddaFile->open("CDDA.SOU")) {
 			Audio::Timestamp start = Audio::Timestamp(0, startFrame, 75);
-			Audio::Timestamp end = Audio::Timestamp(0, startFrame + duration, 75);				
+			Audio::Timestamp end = Audio::Timestamp(0, startFrame + duration, 75);
 			Audio::SeekableAudioStream *stream = makeCDDAStream(cddaFile, DisposeAfterUse::YES);
-			
+
 			_mixer->playStream(Audio::Mixer::kMusicSoundType, &_loomSteamCDAudioHandle,
 			                    Audio::makeLoopingAudioStream(stream, start, end, (numLoops < 1) ? numLoops + 1 : numLoops));
 		} else {
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index a903ac5804..a6be5c3f3a 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -715,7 +715,7 @@ void ScummEngine_v99he::resetScummVars() {
 		VAR(140) = 0;
 #endif
 	}
-	
+
 	if (_game.id == GID_PUTTZOO && _game.heversion == 100 && _game.platform == Common::kPlatformWindows) {
 		// Specific to Nimbus Games version.
 		VAR(156) = 1;
-- 
cgit v1.2.3


From 6bdb362370df85da27ddae45065464240548e2ab Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:16:12 +0200
Subject: SAGA: Remove trailing whitespace

---
 engines/saga/introproc_ite.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 0c1a2ce233..0b129dbcc0 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -374,7 +374,7 @@ int Scene::ITEIntroCaveCommonProc(int param, int caveScene) {
 		lang = 2;
 
 	int n_dialogues = 0;
-	
+
 	switch (caveScene) {
 	case 1:
 		n_dialogues = ARRAYSIZE(introDialogueCave1[lang]);
-- 
cgit v1.2.3


From 9783f0bbd9f7aca0622ec0138d727abdcbd4145c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:17:06 +0200
Subject: SCI: Remove trailing whitespace

---
 engines/sci/console.cpp             |  4 ++--
 engines/sci/engine/kernel.h         |  4 ++--
 engines/sci/engine/script_patches.h |  2 +-
 engines/sci/graphics/paint32.cpp    |  2 +-
 engines/sci/graphics/picture.cpp    |  4 ++--
 engines/sci/graphics/portrait.cpp   | 42 ++++++++++++++++++-------------------
 engines/sci/graphics/portrait.h     |  2 +-
 engines/sci/graphics/screen.cpp     |  6 +++---
 engines/sci/graphics/view.cpp       |  2 +-
 engines/sci/module.mk               |  4 ++--
 engines/sci/resource_audio.cpp      |  2 +-
 engines/sci/sci.cpp                 |  6 +++---
 engines/sci/sound/music.cpp         |  2 +-
 engines/sci/sound/music.h           |  2 +-
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 510c8cd9ca..e233c4cba4 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -664,7 +664,7 @@ bool Console::cmdDiskDump(int argc, const char **argv) {
 	int resNumFrom = 0;
 	int resNumTo = 0;
 	int resNumCur = 0;
-	
+
 	if (argc != 3) {
 		debugPrintf("Dumps the specified resource to disk as a patch file\n");
 		debugPrintf("Usage: %s <resource type> <resource number>\n", argv[0]);
@@ -672,7 +672,7 @@ bool Console::cmdDiskDump(int argc, const char **argv) {
 		cmdResourceTypes(argc, argv);
 		return true;
 	}
-	
+
 	if (strcmp(argv[2], "*") == 0) {
 		resNumFrom = 0;
 		resNumTo   = 65535;
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index dddf845222..a65bcb7df5 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -145,7 +145,7 @@ public:
 	 */
 	Kernel(ResourceManager *resMan, SegManager *segMan);
 	~Kernel();
-	
+
 	void init();
 
 	uint getSelectorNamesSize() const;
@@ -161,7 +161,7 @@ public:
 	 * @return The appropriate selector ID, or -1 on error
 	 */
 	int findSelector(const char *selectorName) const;
-	
+
 	bool selectorNamesAvailable();
 
 	// Script dissection/dumping functions
diff --git a/engines/sci/engine/script_patches.h b/engines/sci/engine/script_patches.h
index 0b35792949..7023ef327e 100644
--- a/engines/sci/engine/script_patches.h
+++ b/engines/sci/engine/script_patches.h
@@ -98,7 +98,7 @@ private:
 	void enablePatch(const SciScriptPatcherEntry *patchTable, const char *searchDescription);
 	int32 findSignature(const SciScriptPatcherEntry *patchEntry, SciScriptPatcherRuntimeEntry *runtimeEntry, const byte *scriptData, const uint32 scriptSize, bool isMacSci11);
 	void applyPatch(const SciScriptPatcherEntry *patchEntry, byte *scriptData, const uint32 scriptSize, int32 signatureOffset, bool isMacSci11);
-	
+
 	Selector *_selectorIdTable;
 	SciScriptPatcherRuntimeEntry *_runtimeTable;
 };
diff --git a/engines/sci/graphics/paint32.cpp b/engines/sci/graphics/paint32.cpp
index 7d106b5b02..a210a469f1 100644
--- a/engines/sci/graphics/paint32.cpp
+++ b/engines/sci/graphics/paint32.cpp
@@ -46,7 +46,7 @@ void GfxPaint32::fillRect(Common::Rect rect, byte color) {
 	Common::Rect clipRect = rect;
 
 	clipRect.clip(_screen->getWidth(), _screen->getHeight());
-	
+
 	for (y = clipRect.top; y < clipRect.bottom; y++) {
 		for (x = clipRect.left; x < clipRect.right; x++) {
 			_screen->putPixel(x, y, GFX_SCREEN_MASK_VISUAL, color, 0, 0);
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index 434a490109..d751f9738f 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -246,7 +246,7 @@ void GfxPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rlePos
 	int16 y, lastY, x, leftX, rightX;
 	int pixelCount;
 	uint16 width, height;
-	
+
 	// if the picture is not an overlay and we are also not in EGA mode, use priority 0
 	if (!isEGA && !_addToFlag)
 		priority = 0;
@@ -362,7 +362,7 @@ void GfxPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rlePos
 		ptr = celBitmap;
 		ptr += skipCelBitmapPixels;
 		ptr += skipCelBitmapLines * width;
-		
+
 		if ((!isEGA) || (priority < 16)) {
 			// VGA + EGA, EGA only checks priority, when given priority is below 16
 			if (!_mirroredFlag) {
diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 488450485d..668de616fb 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -134,34 +134,34 @@ void Portrait::init() {
 
 	// raw lip-sync ID table follows
 	uint32 lipSyncIDTableSize;
-	
+
 	lipSyncIDTableSize = READ_LE_UINT32(data);
 	data += 4;
 	assert( lipSyncIDTableSize == (_lipSyncIDCount * 4) );
 	_lipSyncIDTable = data;
 	data += lipSyncIDTableSize;
-	
+
 	// raw lip-sync frame table follows
 	uint32 lipSyncDataTableSize;
 	uint32 lipSyncDataTableLastOffset;
 	byte   lipSyncData;
 	uint16 lipSyncDataNr;
 	uint16 lipSyncCurOffset;
-	
+
 	lipSyncDataTableSize = READ_LE_UINT32(data);
 	data += 4;
 	assert( lipSyncDataTableSize == 0x220 ); // always this size, just a safety-check
-	
+
 	_lipSyncData = data;
 	lipSyncDataTableLastOffset = lipSyncDataTableSize - 1;
 	_lipSyncDataOffsetTable = new uint16[ _lipSyncIDCount ];
-	
+
 	lipSyncDataNr = 0;
 	lipSyncCurOffset = 0;
 	while ( (lipSyncCurOffset < lipSyncDataTableSize) && (lipSyncDataNr < _lipSyncIDCount) ) {
 		// We are currently at the start of ID-frame data
 		_lipSyncDataOffsetTable[lipSyncDataNr] = lipSyncCurOffset;
-		
+
 		// Look for end of ID-frame data
 		lipSyncData = *data++; lipSyncCurOffset++;
 		while ( (lipSyncData != 0xFF) && (lipSyncCurOffset < lipSyncDataTableLastOffset) ) {
@@ -195,7 +195,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 	Resource *syncResource = _resMan->findResource(syncResourceId, true);
 	uint syncOffset = 0;
 #endif
-	
+
 #ifdef DEBUG_PORTRAIT
 	// prints out the current lip sync ASCII data
 	char debugPrint[4000];
@@ -246,7 +246,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 		warning("kPortrait: no rave resource %d %X", resourceId, audioNumber);
 		return;
 	}
-	
+
 	// Do animation depending on rave resource till audio is done playing
 	int16 raveTicks;
 	uint16 raveID;
@@ -264,7 +264,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 		raveTicks = raveGetTicks(raveResource, &raveOffset);
 		if (raveTicks < 0)
 			break;
-		
+
 		// get lipSyncID
 		raveID = raveGetID(raveResource, &raveOffset);
 		if (raveID) {
@@ -272,7 +272,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 		} else {
 			raveLipSyncData = NULL;
 		}
-		
+
 		timerPosition += raveTicks;
 
 		// Wait till syncTime passed, then show specific animation bitmap
@@ -287,7 +287,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 				curPosition = _audio->getAudioPosition();
 			} while ((curPosition != -1) && (curPosition < timerPosition) && (!userAbort));
 		}
-		
+
 		if (raveLipSyncData) {
 			// lip sync data is
 			//  Tick:Byte, Bitmap-Nr:BYTE
@@ -308,7 +308,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 				} while ((curPosition != -1) && (curPosition < timerPositionWithin) && (!userAbort));
 
 				raveLipSyncBitmapNr = *raveLipSyncData++;
-				
+
 				// bitmap nr within sync data is base 1, we need base 0
 				raveLipSyncBitmapNr--;
 
@@ -319,7 +319,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 				} else {
 					warning("kPortrait: rave lip sync data tried to draw non-existent bitmap %d", raveLipSyncBitmapNr);
 				}
-				
+
 				raveLipSyncTicks = *raveLipSyncData++;
 			}
 		}
@@ -372,7 +372,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 		}
 	}
 #endif
-	
+
 	// Reset the portrait bitmap to "closed mouth" state (rave.dll seems to do the same)
 	drawBitmap(0);
 	bitsShow();
@@ -393,10 +393,10 @@ int16 Portrait::raveGetTicks(Resource *resource, uint *offset) {
 	byte *curData = resource->data + curOffset;
 	byte curByte;
 	uint16 curValue = 0;
-	
+
 	if (curOffset >= resource->size)
 		return -1;
-	
+
 	while (curOffset < resource->size) {
 		curByte = *curData++; curOffset++;
 		if ( curByte == ' ' )
@@ -418,7 +418,7 @@ uint16 Portrait::raveGetID(Resource *resource, uint *offset) {
 	byte *curData = resource->data + curOffset;
 	byte curByte = 0;
 	uint16 curValue = 0;
-	
+
 	while (curOffset < resource->size) {
 		curByte = *curData++; curOffset++;
 		if ( curByte == ' ' )
@@ -429,7 +429,7 @@ uint16 Portrait::raveGetID(Resource *resource, uint *offset) {
 			curValue |= curByte;
 		}
 	}
-	
+
 	*offset = curOffset;
 	return curValue;
 }
@@ -440,17 +440,17 @@ byte *Portrait::raveGetLipSyncData(uint16 raveID) {
 	byte *lipSyncIDPtr = _lipSyncIDTable;
 	byte lipSyncIDByte1, lipSyncIDByte2;
 	uint16 lipSyncID;
-	
+
 	lipSyncIDPtr++; // skip over first byte
 	while (lipSyncIDNr < _lipSyncIDCount) {
 		lipSyncIDByte1 = *lipSyncIDPtr++;
 		lipSyncIDByte2 = *lipSyncIDPtr++;
 		lipSyncID = ( lipSyncIDByte1 << 8 ) | lipSyncIDByte2;
-		
+
 		if ( lipSyncID == raveID ) {
 			return _lipSyncData + _lipSyncDataOffsetTable[lipSyncIDNr];
 		}
-		
+
 		lipSyncIDNr++;
 		lipSyncIDPtr += 2; // ID is every 4 bytes
 	}
diff --git a/engines/sci/graphics/portrait.h b/engines/sci/graphics/portrait.h
index 877b253bcf..e0888daa86 100644
--- a/engines/sci/graphics/portrait.h
+++ b/engines/sci/graphics/portrait.h
@@ -72,7 +72,7 @@ private:
 	Common::String _resourceName;
 
 	byte *_fileData;
-	
+
 	uint32 _lipSyncIDCount;
 	byte *_lipSyncIDTable;
 
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index c5c94d7991..d66352b411 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -50,7 +50,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 			_upscaledHires = GFX_SCREEN_UPSCALED_640x480;
 #endif
 	}
-	
+
 	if (g_sci->getPlatform() == Common::kPlatformMacintosh) {
 		if (getSciVersion() <= SCI_VERSION_01)
 			_upscaledHires = GFX_SCREEN_UPSCALED_480x300;
@@ -232,7 +232,7 @@ void GfxScreen::copyRectToScreen(const Common::Rect &rect, int16 x, int16 y) {
 	} else {
 		int rectHeight = _upscaledHeightMapping[rect.bottom] - _upscaledHeightMapping[rect.top];
 		int rectWidth  = _upscaledWidthMapping[rect.right] - _upscaledWidthMapping[rect.left];
-	
+
 		g_system->copyRectToScreen(_activeScreen + _upscaledHeightMapping[rect.top] * _displayWidth + _upscaledWidthMapping[rect.left], _displayWidth, _upscaledWidthMapping[x], _upscaledHeightMapping[y], rectWidth, rectHeight);
 	}
 }
@@ -329,7 +329,7 @@ void GfxScreen::drawLine(Common::Point startPoint, Common::Point endPoint, byte
 	int16 top = CLIP<int16>(startPoint.y, 0, maxHeight);
 	int16 right = CLIP<int16>(endPoint.x, 0, maxWidth);
 	int16 bottom = CLIP<int16>(endPoint.y, 0, maxHeight);
-	
+
 	//set_drawing_flag
 	byte drawMask = getDrawingMask(color, priority, control);
 
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index a88546e68c..da61ecf4c3 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -367,7 +367,7 @@ void GfxView::initData(GuiResourceId resourceId) {
 	default:
 		error("ViewType was not detected, can't continue");
 	}
-	
+
 	// Inject our own views
 	//  Currently only used for Dual mode (speech + text) for games, that do not have a "dual" icon already
 	//  Which is Laura Bow 2 + King's Quest 6
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 6b6058c819..33392e3b42 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -76,8 +76,8 @@ MODULE_OBJS := \
 	sound/drivers/midi.o \
 	sound/drivers/pcjr.o \
 	video/seq_decoder.o
-	
-	
+
+
 ifdef ENABLE_SCI32
 MODULE_OBJS += \
 	engine/kgraphics32.o \
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 66778f0914..c775f502c5 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -110,7 +110,7 @@ bool Resource::loadFromAudioVolumeSCI11(Common::SeekableReadStream *file) {
 			unalloc();
 			return false;
 		}
-	
+
 		_headerSize = file->readByte();
 
 		if (type == kResourceTypeAudio) {
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index fc723f18cf..60a1271b89 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -219,7 +219,7 @@ Common::Error SciEngine::run() {
 	// Add the after market GM patches for the specified game, if they exist
 	_resMan->addNewGMPatch(_gameId);
 	_gameObjectAddress = _resMan->findGameObject();
-	
+
 	_scriptPatcher = new ScriptPatcher();
 	SegManager *segMan = new SegManager(_resMan, _scriptPatcher);
 
@@ -896,7 +896,7 @@ void SciEngine::syncSoundSettings() {
 bool SciEngine::speechAndSubtitlesEnabled() {
 	bool subtitlesOn = ConfMan.getBool("subtitles");
 	bool speechOn = !ConfMan.getBool("speech_mute");
-	
+
 	if (isCD() && subtitlesOn && speechOn)
 		return true;
 	return false;
@@ -936,7 +936,7 @@ void SciEngine::updateScummVMAudioOptions() {
 	// depending on the in-game settings
 	if (isCD() && getSciVersion() == SCI_VERSION_1_1) {
 		uint16 ingameSetting = _gamestate->variables[VAR_GLOBAL][90].getOffset();
-		
+
 		switch (ingameSetting) {
 		case 1:
 			// subtitles
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 362cca699d..7a6eaf62b4 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -142,7 +142,7 @@ void SciMusic::init() {
 	_driverLastChannel = _pMidiDrv->getLastChannel();
 	if (getSciVersion() <= SCI_VERSION_0_LATE)
 		_globalReverb = _pMidiDrv->getReverb();	// Init global reverb for SCI0
-		
+
 	_currentlyPlayingSample = NULL;
 }
 
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 6149bb799e..4e44074630 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -264,7 +264,7 @@ private:
 
 	int _driverFirstChannel;
 	int _driverLastChannel;
-	
+
 	MusicEntry *_currentlyPlayingSample;
 };
 
-- 
cgit v1.2.3


From 26588f81b4f4749c0136cdf4f5de09405dee9e3a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:17:44 +0200
Subject: PEGASUS: Remove trailing whitespace

---
 engines/pegasus/input.cpp   | 2 +-
 engines/pegasus/pegasus.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index e1b7e25cd5..73c319bd8b 100644
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -57,7 +57,7 @@ InputDeviceManager::InputDeviceManager() {
 	_keyMap[Common::KEYCODE_p] = false;
 	_keyMap[Common::KEYCODE_TILDE] = false;
 	_keyMap[Common::KEYCODE_BACKQUOTE] = false;
-	_keyMap[Common::KEYCODE_KP7] = false;	
+	_keyMap[Common::KEYCODE_KP7] = false;
 	_keyMap[Common::KEYCODE_BACKSPACE] = false;
 	_keyMap[Common::KEYCODE_KP_MULTIPLY] = false;
 	_keyMap[Common::KEYCODE_KP9] = false;
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 0c8ea2e4ee..4262ad4c12 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -979,7 +979,7 @@ void PegasusEngine::doGameMenuCommand(const GameMenuCommand command) {
 		resetIntroTimer();
 		break;
 	case kMenuCmdPauseSave:
-		result = showSaveDialog();			
+		result = showSaveDialog();
 
 		if (result.getCode() != Common::kUserCanceled) {
 			if (result.getCode() != Common::kNoError)
-- 
cgit v1.2.3


From e0c281b9b22fa8e515eb3b8c02a80ff3431acbc6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:18:11 +0200
Subject: NEVERHOOD: Remove trailing whitespace

---
 engines/neverhood/console.cpp | 2 +-
 engines/neverhood/sound.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/neverhood/console.cpp b/engines/neverhood/console.cpp
index 91ab3e767a..7ee6b30311 100644
--- a/engines/neverhood/console.cpp
+++ b/engines/neverhood/console.cpp
@@ -55,7 +55,7 @@ bool Console::Cmd_Scene(int argc, const char **argv) {
 
 		const char *sceneTypes[] = { "normal", "smacker", "navigation" };
 
-		debugPrintf("Current module: %d, previous module: %d, scene %d (%s scene)\n", currentModule, previousModule, scenenNum, sceneTypes[sceneType]);	
+		debugPrintf("Current module: %d, previous module: %d, scene %d (%s scene)\n", currentModule, previousModule, scenenNum, sceneTypes[sceneType]);
 
 		if (sceneType == kSceneTypeNormal) {
 			Scene *scene = (Scene *)((GameModule *)_vm->_gameModule->_childObject)->_childObject;
diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index d53243d4ba..b15bea4a64 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -560,7 +560,7 @@ int NeverhoodAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 		} else {
 			while (samplesRead--) {
 				*buffer++ = READ_LE_UINT16(src);
-				src += 2;				
+				src += 2;
 			}
 		}
 
-- 
cgit v1.2.3


From 01e8286e1c8df605c98f828e5834584c997713b4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:19:26 +0200
Subject: MADS: Remove trailing whitespace

---
 engines/mads/game.cpp                    |  2 +-
 engines/mads/menu_views.cpp              | 24 ++++++++++++------------
 engines/mads/nebular/dialogs_nebular.cpp |  2 +-
 engines/mads/nebular/dialogs_nebular.h   |  4 ++--
 engines/mads/nebular/game_nebular.cpp    |  2 +-
 engines/mads/nebular/menu_nebular.cpp    | 16 ++++++++--------
 engines/mads/nebular/nebular_scenes6.cpp |  2 +-
 engines/mads/nebular/nebular_scenes7.cpp |  2 +-
 engines/mads/nebular/nebular_scenes8.cpp |  2 +-
 engines/mads/palette.cpp                 |  4 ++--
 engines/mads/scene_data.cpp              |  2 +-
 engines/mads/sequence.cpp                |  2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 63a7e40d1b..94653f9a39 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -556,7 +556,7 @@ void Game::writeSavegameHeader(Common::OutSaveFile *out, MADSSavegameHeader &hea
 	if (!_saveThumb)
 		createThumbnail();
 	Graphics::saveThumbnail(*out, *_saveThumb);
-	
+
 	_saveThumb->free();
 	delete _saveThumb;
 	_saveThumb = nullptr;
diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 03afc70c3e..ee4268a650 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -37,7 +37,7 @@ MenuView::MenuView(MADSEngine *vm) : FullScreenDialog(vm) {
 }
 
 void MenuView::show() {
- 	Scene &scene = _vm->_game->_scene;	
+ 	Scene &scene = _vm->_game->_scene;
 	EventsManager &events = *_vm->_events;
 	_vm->_screenFade = SCREEN_FADE_FAST;
 
@@ -195,7 +195,7 @@ void TextView::processCommand() {
 		paramP = commandStr + 10;
 		resetPalette();
 		int screenId = getParameter(&paramP);
-		
+
 		SceneInfo *sceneInfo = SceneInfo::init(_vm);
 		sceneInfo->load(screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
 		scene._spriteSlots.fullRefresh();
@@ -230,7 +230,7 @@ void TextView::processCommand() {
 		int soundId = getParameter(&paramP);
 		_vm->_sound->command(soundId);
 
-	} else if (!strncmp(commandStr, "COLOR", 5) && ((commandStr[5] == '0') || 
+	} else if (!strncmp(commandStr, "COLOR", 5) && ((commandStr[5] == '0') ||
 			(commandStr[5] == '1'))) {
 		// Set the text colors
 		int index = commandStr[5] - '0';
@@ -254,7 +254,7 @@ void TextView::processCommand() {
 		sceneInfo->_width = MADS_SCREEN_WIDTH;
 		sceneInfo->_height = MADS_SCENE_HEIGHT;
 		_spareScreens[spareIndex].setSize(MADS_SCREEN_WIDTH, MADS_SCENE_HEIGHT);
-		sceneInfo->loadMadsV1Background(screenId, "", SCENEFLAG_TRANSLATE, 
+		sceneInfo->loadMadsV1Background(screenId, "", SCENEFLAG_TRANSLATE,
 			_spareScreens[spareIndex]);
 		delete sceneInfo;
 
@@ -409,7 +409,7 @@ void TextView::doFrame() {
 				Common::copy(srcP, srcP + MADS_SCREEN_WIDTH, destP);
 			}
 
-			Common::copy(linesTemp, linesTemp + _pan.y * MADS_SCREEN_WIDTH, 
+			Common::copy(linesTemp, linesTemp + _pan.y * MADS_SCREEN_WIDTH,
 				(byte *)scene._backgroundSurface.getPixels());
 			delete[] linesTemp;
 		}
@@ -429,7 +429,7 @@ void TextView::doFrame() {
 		if (tl._pos.y < 0) {
 			_textLines.remove_at(i);
 		} else {
-			tl._textDisplayIndex = scene._textDisplay.add(tl._pos.x, tl._pos.y, 
+			tl._textDisplayIndex = scene._textDisplay.add(tl._pos.x, tl._pos.y,
 				0x605, -1, tl._line, _font);
 		}
 	}
@@ -537,7 +537,7 @@ bool AnimationView::onEvent(Common::Event &event) {
 
 void AnimationView::doFrame() {
 	Scene &scene = _vm->_game->_scene;
-	
+
 	if (_resourceIndex == -1 || _currentAnimation->freeFlag()) {
 		if (++_resourceIndex == (int)_resources.size()) {
 			scriptDone();
@@ -565,7 +565,7 @@ void AnimationView::loadNextResource() {
 	if (resEntry._bgFlag)
 		palette.resetGamePalette(1, 8);
 
-	palette._mainPalette[253 * 3] = palette._mainPalette[253 * 3 + 1] 
+	palette._mainPalette[253 * 3] = palette._mainPalette[253 * 3 + 1]
 		= palette._mainPalette[253 * 3 + 2] = 0xb4;
 	palette.setPalette(&palette._mainPalette[253 * 3], 253, 1);
 
@@ -587,7 +587,7 @@ void AnimationView::loadNextResource() {
 	delete _currentAnimation;
 	_currentAnimation = Animation::init(_vm, &scene);
 	int flags = ANIMFLAG_ANIMVIEW | (resEntry._bgFlag ? ANIMFLAG_LOAD_BACKGROUND : 0);
-	_currentAnimation->load(scene._backgroundSurface, scene._depthSurface, 
+	_currentAnimation->load(scene._backgroundSurface, scene._depthSurface,
 		resEntry._resourceName, flags, &paletteCycles, _sceneInfo);
 
 	// Signal for a screen refresh
@@ -656,7 +656,7 @@ void AnimationView::processLines() {
 			if (c != '\r' && c != '\0')
 				_currentLine += c;
 		}
-		
+
 		// Process the line
 		while (!_currentLine.empty()) {
 			if (_currentLine.hasPrefix("-")) {
@@ -672,7 +672,7 @@ void AnimationView::processLines() {
 				}
 
 				// Add resource into list along with any set state information
-				_resources.push_back(ResourceEntry(resName, _sfx, _soundFlag, 
+				_resources.push_back(ResourceEntry(resName, _sfx, _soundFlag,
 					_bgLoadFlag, _showWhiteBars));
 
 				// Fx resets between resource entries
@@ -753,7 +753,7 @@ int AnimationView::getParameter() {
 
 	while (!_currentLine.empty()) {
 		char c = _currentLine[0];
-		
+
 		if (c >= '0' && c <= '9') {
 			_currentLine.deleteChar(0);
 			result = result * 10 + (c - '0');
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index f51d046951..f5355517bd 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -908,7 +908,7 @@ void GameDialog::refreshText() {
 			}
 
 			if (!skipFlag) {
-				_lines[i]._textDisplayIndex = scene._textDisplay.add(_lines[i]._pos.x, _lines[i]._pos.y, 
+				_lines[i]._textDisplayIndex = scene._textDisplay.add(_lines[i]._pos.x, _lines[i]._pos.y,
 					fontColor, _lines[i]._widthAdjust, _lines[i]._msg, _lines[i]._font);
 			}
 		}
diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h
index d00cd87ead..5dbe4da6f0 100644
--- a/engines/mads/nebular/dialogs_nebular.h
+++ b/engines/mads/nebular/dialogs_nebular.h
@@ -116,7 +116,7 @@ class GameDialog: public FullScreenDialog {
 		Common::String _msg;
 		Font *_font;
 		int _widthAdjust;
-		 
+
 		DialogLine();
 		DialogLine(const Common::String &s);
 	};
@@ -130,7 +130,7 @@ protected:
 	int _menuSpritesIndex;
 	int _lineIndex;
 	int _textLineCount;
-	
+
 	/**
 	 * Display the dialog
 	 */
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index eae74d6da0..fd669bc5cf 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -625,7 +625,7 @@ void GameNebular::doObjectAction() {
 			_objects.addToInventory(OBJ_DURAFAIL_CELLS);
 			if (_difficulty == DIFFICULTY_HARD) {
 				dialogs.showItem(OBJ_DURAFAIL_CELLS, 416);
-			} 
+			}
 			_globals[kHandsetCellStatus] = 0;
 			break;
 		case 3:
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index f2f90e2291..28de4e5650 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -48,7 +48,7 @@ MainMenu::MainMenu(MADSEngine *vm): MenuView(vm) {
 	_highlightedIndex = -1;
 	_selectedIndex = -1;
 	_buttonDown = false;
-	
+
 	for (int i = 0; i < 7; ++i)
 		_menuItems[i] = nullptr;
 }
@@ -85,7 +85,7 @@ void MainMenu::display() {
 		Common::Point pt(frame0->_offset.x - (frame0->w / 2),
 			frame0->_offset.y - frame0->h);
 		screenObjects.add(
-			Common::Rect(pt.x, pt.y + DIALOG_TOP, pt.x + frame0->w, 
+			Common::Rect(pt.x, pt.y + DIALOG_TOP, pt.x + frame0->w,
 			pt.y + frame0->h + DIALOG_TOP), LAYER_GUI, CAT_COMMAND, i);
 	}
 
@@ -126,7 +126,7 @@ void MainMenu::doFrame() {
 
 	// If the user has chosen to skip the animation, show the full menu immediately
 	if (_skipFlag && _menuItemIndex >= 0) {
-		// Quickly loop through all the menu items to display each's final frame		
+		// Quickly loop through all the menu items to display each's final frame
 		for (; _menuItemIndex < 6; ++_menuItemIndex) {
 			if (_menuItemIndex == 4 && !shouldShowQuotes())
 				continue;
@@ -161,7 +161,7 @@ void MainMenu::doFrame() {
 void MainMenu::addSpriteSlot() {
 	Scene &scene = _vm->_game->_scene;
 	SpriteSlots &spriteSlots = scene._spriteSlots;
-	
+
 	int seqIndex = (_menuItemIndex < 6) ? _menuItemIndex : _frameIndex;
 	spriteSlots.deleteTimer(seqIndex);
 
@@ -255,7 +255,7 @@ bool MainMenu::onEvent(Common::Event &event) {
 		}
 		return true;
 
-	case Common::EVENT_MOUSEMOVE: 
+	case Common::EVENT_MOUSEMOVE:
 		if (_buttonDown) {
 			int menuIndex = getHighlightedItem(event.mouse);
 			if (menuIndex != _highlightedIndex) {
@@ -287,7 +287,7 @@ bool MainMenu::onEvent(Common::Event &event) {
 	default:
 		break;
 	}
-	
+
 	return false;
 }
 
@@ -317,7 +317,7 @@ void MainMenu::handleAction(MADSGameAction action) {
 		break;
 
 	case RESUME_GAME:
-		// The original resumed the most recently saved game. Instead, 
+		// The original resumed the most recently saved game. Instead,
 		// just show the load game scren
 		_vm->_dialogs->_pendingDialog = DIALOG_RESTORE;
 		return;
@@ -354,7 +354,7 @@ void AdvertView::show() {
 	uint32 expiryTime = g_system->getMillis() + 10 * 1000;
 
 	_vm->_palette->resetGamePalette(4, 8);
-	
+
 	// Load the advert background onto the screen
 	SceneInfo *sceneInfo = SceneInfo::init(_vm);
 	sceneInfo->load(screenId, 0, Common::String(), 0, _vm->_game->_scene._depthSurface,
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 13ee1a3dc1..679039535f 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -3155,7 +3155,7 @@ bool Scene611::check2ChargedBatteries() {
 }
 
 bool Scene611::check4ChargedBatteries() {
-	if (_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && _game._objects.isInInventory(OBJ_PHONE_CELLS) 
+	if (_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && _game._objects.isInInventory(OBJ_PHONE_CELLS)
 			&& _globals[kDurafailRecharged])
 		return true;
 
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 930bb7c250..0f019c4b19 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -2616,7 +2616,7 @@ void Scene752::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(VERB_TAKE, NOUN_BONES) && (_action._savedFields._mainObjectSource == CAT_HOTSPOT) && 
+	} else if (_action.isAction(VERB_TAKE, NOUN_BONES) && (_action._savedFields._mainObjectSource == CAT_HOTSPOT) &&
 			(!_game._objects.isInInventory(OBJ_BONES) || _game._trigger)) {
 		switch (_game._trigger) {
 		case 0:
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 14f36756de..62a1a262b0 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1098,7 +1098,7 @@ void Scene804::actions() {
 		_action.isAction(VERB_OPEN, NOUN_SERVICE_PANEL)) {
 		_scene->_nextSceneId = 805;
 	} else if ((_action.isAction(VERB_ACTIVATE, NOUN_REMOTE)) && _globals[kTopButtonPushed]) {
-		if (!_globals[kInSpace]) {    
+		if (!_globals[kInSpace]) {
 			// Top button pressed on panel in hanger control
 			if (!_globals[kBeamIsUp]) {
 				_globals[kFromCockpit] = true;
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 1787b3c298..836d04f7c0 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -233,7 +233,7 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 		// CHECKME: When pressing on F1 in the first screen, newPalIndex is set to 0xFF at this point
 		// which is a valid value for the index. Maybe a better check would be "< 256" ?
 		//assert(newPalIndex != -1);
-		
+
 		int var52 = (noUsageFlag && palette[palIndex]._u2) ? 2 : 0;
 
 		_vm->_palette->_palFlags[newPalIndex] |= var52 | rgbMask;
@@ -342,7 +342,7 @@ int PaletteUsage::checkRGB(const byte *rgb, int palStart, bool flag, int *palInd
 			if ((!(*flagsP & 1) || flag) && !(*flagsP & 2)) {
 				if (!memcmp(palP, rgb, 3)) {
 					*flagsP |= mask;
-					
+
 					if (palIndex)
 						*palIndex = result;
 					match = true;
diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index b0a5aa35c6..b5e219ed04 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -264,7 +264,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 		assert(asset && _depthStyle != 2);
 
 		MSprite *spr = asset->getFrame(asset->getCount() - 1);
-		bgSurface.copyFrom(spr, si._position, si._depth, &depthSurface, 
+		bgSurface.copyFrom(spr, si._position, si._depth, &depthSurface,
 			si._scale, spr->getTransparencyIndex());
 	}
 
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index 07b1451718..05f00afb5a 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -473,7 +473,7 @@ int SequenceList::startReverseCycle(int srcSpriteIndex, bool flipped, int numTic
 	int depth = _vm->_game->_scene._depthSurface.getDepth(Common::Point(
 		frame->_offset.x + frame->w / 2, frame->_offset.y + frame->h / 2));
 
-	return add(srcSpriteIndex, flipped, sprites->getCount(), triggerCountdown, timeoutTicks, 
+	return add(srcSpriteIndex, flipped, sprites->getCount(), triggerCountdown, timeoutTicks,
 		extraTicks, numTicks, 0, 0, true, 100, depth - 1, -1, ANIMTYPE_REVERSIBLE, 0, 0);
 }
 
-- 
cgit v1.2.3


From 8d11226723964d754dff2efca35d082e25affae3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:20:43 +0200
Subject: MORTEVIELLE: Remove trailing whitespace

---
 engines/mortevielle/detection_tables.h | 2 +-
 engines/mortevielle/mortevielle.h      | 2 +-
 engines/mortevielle/utils.cpp          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index 0aa27b89eb..d244d15365 100644
--- a/engines/mortevielle/detection_tables.h
+++ b/engines/mortevielle/detection_tables.h
@@ -75,7 +75,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
 
 	// DOS English version doesn't exist. Technically, they are French or German versions,
 	// using English strings stored mort.dat
-	
+
 	// English on top of French version
 	{
 		{
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index c3d1e4ae8b..5f7f175c26 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -421,7 +421,7 @@ public:
 	byte *_curPict;
 	byte *_curAnim;
 	byte *_rightFramePict;
-	
+
 	PaletteManager _paletteManager;
 	GfxSurface _backgroundSurface;
 	Common::RandomSource _randomSource;
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index d5dec6a286..40136ad78b 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -3097,7 +3097,7 @@ void MortevielleEngine::putObject() {
  */
 void MortevielleEngine::addObjectToInventory(int objectId) {
 	int i;
-	
+
 	for (i = 1; (i <= 5) && (_coreVar._inventory[i] != 0); i++)
 		;
 
-- 
cgit v1.2.3


From 0f0ca25e4321b978370e1f7d325fd31f144d0ca1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:21:53 +0200
Subject: PRINCE: Remove trailing whitespace

---
 engines/prince/animation.cpp |  6 +++---
 engines/prince/animation.h   |  2 +-
 engines/prince/archive.cpp   |  2 +-
 engines/prince/cursor.h      |  2 +-
 engines/prince/graphics.cpp  |  2 +-
 engines/prince/graphics.h    |  2 +-
 engines/prince/hero.cpp      |  2 +-
 engines/prince/hero.h        |  4 ++--
 engines/prince/mhwanh.cpp    |  4 ++--
 engines/prince/mob.h         |  2 +-
 engines/prince/object.cpp    |  2 +-
 engines/prince/object.h      |  2 +-
 engines/prince/prince.cpp    | 14 +++++++-------
 engines/prince/prince.h      |  4 ++--
 engines/prince/pscr.h        |  2 +-
 engines/prince/resource.h    |  6 +++---
 engines/prince/saveload.cpp  |  4 ++--
 engines/prince/script.cpp    | 14 +++++++-------
 18 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/engines/prince/animation.cpp b/engines/prince/animation.cpp
index b4bde27f69..aabdd7a623 100644
--- a/engines/prince/animation.cpp
+++ b/engines/prince/animation.cpp
@@ -132,7 +132,7 @@ int16 Animation::getPhaseOffsetX(int phaseIndex) const {
 	if (phaseIndex < _phaseCount) {
 		return _phaseList[phaseIndex]._phaseOffsetX;
 	} else {
-		error("getPhaseOffsetX() phaseIndex: %d, phaseCount: %d", phaseIndex, _phaseCount); 
+		error("getPhaseOffsetX() phaseIndex: %d, phaseCount: %d", phaseIndex, _phaseCount);
 	}
 }
 
@@ -140,7 +140,7 @@ int16 Animation::getPhaseOffsetY(int phaseIndex) const {
 	if (phaseIndex < _phaseCount) {
 		return _phaseList[phaseIndex]._phaseOffsetY;
 	} else {
-		error("getPhaseOffsetY() phaseIndex: %d, phaseCount: %d", phaseIndex, _phaseCount); 
+		error("getPhaseOffsetY() phaseIndex: %d, phaseCount: %d", phaseIndex, _phaseCount);
 	}
 }
 
@@ -148,7 +148,7 @@ int16 Animation::getPhaseFrameIndex(int phaseIndex) const {
 	if (phaseIndex < _phaseCount) {
 		return _phaseList[phaseIndex]._phaseToFrameIndex;
 	} else {
-		error("getPhaseFrameIndex() phaseIndex: %d, phaseCount: %d", phaseIndex, _phaseCount); 
+		error("getPhaseFrameIndex() phaseIndex: %d, phaseCount: %d", phaseIndex, _phaseCount);
 	}
 }
 
diff --git a/engines/prince/animation.h b/engines/prince/animation.h
index 733acb399c..3471ffa158 100644
--- a/engines/prince/animation.h
+++ b/engines/prince/animation.h
@@ -35,7 +35,7 @@ public:
 	Animation();
 	~Animation();
 	bool loadStream(Common::SeekableReadStream &stream);
-	
+
 	int16 getLoopCount() const;
 	int32 getPhaseCount() const;
 	int32 getFrameCount() const;
diff --git a/engines/prince/archive.cpp b/engines/prince/archive.cpp
index ae6a2b7546..7a4a35abd8 100644
--- a/engines/prince/archive.cpp
+++ b/engines/prince/archive.cpp
@@ -64,7 +64,7 @@ bool PtcArchive::open(const Common::String &filename) {
 	byte *fileTableEnd = fileTable + fileTableSize;
 	_stream->read(fileTable, fileTableSize);
 	decrypt(fileTable, fileTableSize);
-	
+
 	for (byte *fileItem = fileTable; fileItem < fileTableEnd; fileItem += 32) {
 		FileEntry item;
 		Common::String name = (const char*)fileItem;
diff --git a/engines/prince/cursor.h b/engines/prince/cursor.h
index 9387f344dc..fb07d01729 100644
--- a/engines/prince/cursor.h
+++ b/engines/prince/cursor.h
@@ -30,7 +30,7 @@
 namespace Prince {
 
 class Cursor {
-public: 
+public:
 	Cursor();
 	~Cursor();
 
diff --git a/engines/prince/graphics.cpp b/engines/prince/graphics.cpp
index ad6a2ff85c..f556d81eab 100644
--- a/engines/prince/graphics.cpp
+++ b/engines/prince/graphics.cpp
@@ -194,7 +194,7 @@ void GraphicsMan::drawTransparentDrawNode(Graphics::Surface *screen, DrawNode *d
 /**
  * Similar to drawTransparentDrawNode but with additional anti-aliasing code for sprite drawing.
  * Edge smoothing is based on 256 x 256 table of colors transition.
- * Algorithm is checking if currently drawing pixel is located next to the edge of sprite and if it makes jagged line. 
+ * Algorithm is checking if currently drawing pixel is located next to the edge of sprite and if it makes jagged line.
  * If it does then this pixel is set with color from transition table calculated of original background pixel color
  * and sprite's edge pixel color.
  */
diff --git a/engines/prince/graphics.h b/engines/prince/graphics.h
index b6f002b7da..1a1737f976 100644
--- a/engines/prince/graphics.h
+++ b/engines/prince/graphics.h
@@ -35,7 +35,7 @@ class GraphicsMan {
 public:
 	GraphicsMan(PrinceEngine *vm);
 	~GraphicsMan();
-	
+
 	void update(Graphics::Surface *screen);
 
 	void change();
diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp
index 146470f6b7..b873e83360 100644
--- a/engines/prince/hero.cpp
+++ b/engines/prince/hero.cpp
@@ -129,7 +129,7 @@ int Hero::getScaledValue(int size) {
 Graphics::Surface *Hero::zoomSprite(Graphics::Surface *heroFrame) {
 	Graphics::Surface *zoomedFrame = new Graphics::Surface();
 	zoomedFrame->create(_scaledFrameXSize, _scaledFrameYSize, Graphics::PixelFormat::createFormatCLUT8());
-	
+
 	int sprZoomX;
 	int sprZoomY = _vm->_scaleValue;
 	uint xSource = 0;
diff --git a/engines/prince/hero.h b/engines/prince/hero.h
index d5f7d8cc7a..703ef0650d 100644
--- a/engines/prince/hero.h
+++ b/engines/prince/hero.h
@@ -129,7 +129,7 @@ public:
 	void drawHeroShadow(Graphics::Surface *heroFrame);
 	void freeOldMove();
 	void freeHeroAnim();
-	
+
 	uint16 _number;
 	uint16 _visible;
 	int16 _state;
@@ -170,7 +170,7 @@ public:
 	int _color; // subtitles color
 	uint32 _animSetNr; // number of animation set
 	Common::Array<Animation *> _moveSet; // MoveAnims MoveSet
-	
+
 	uint32 _moveDelay;
 	uint32 _shadMinus;
 
diff --git a/engines/prince/mhwanh.cpp b/engines/prince/mhwanh.cpp
index ef94ef71f9..608ccc23d7 100644
--- a/engines/prince/mhwanh.cpp
+++ b/engines/prince/mhwanh.cpp
@@ -38,7 +38,7 @@ MhwanhDecoder::~MhwanhDecoder() {
 void MhwanhDecoder::destroy() {
 	if (_surface != nullptr) {
 		_surface->free();
-		delete _surface; 
+		delete _surface;
 		_surface = nullptr;
 	}
 	if (_palette != nullptr) {
@@ -57,7 +57,7 @@ bool MhwanhDecoder::loadStream(Common::SeekableReadStream &stream) {
 		_palette[i * 3] = stream.readByte();
 		_palette[i * 3 + 1] = stream.readByte();
 		_palette[i * 3 + 2] = stream.readByte();
-	}  
+	}
 
 	_surface = new Graphics::Surface();
 	_surface->create(640, 480, Graphics::PixelFormat::createFormatCLUT8());
diff --git a/engines/prince/mob.h b/engines/prince/mob.h
index cc60e36f9b..0ea610dd8f 100644
--- a/engines/prince/mob.h
+++ b/engines/prince/mob.h
@@ -50,7 +50,7 @@ public:
 	void setData(AttrId dataId, uint16 value);
 	uint16 getData(AttrId dataId);
 
-	bool _visible; 
+	bool _visible;
 	uint16 _type;
 	uint16 _mask;
 	Common::Rect _rect;
diff --git a/engines/prince/object.cpp b/engines/prince/object.cpp
index a9a96455b1..2dc5da68e7 100644
--- a/engines/prince/object.cpp
+++ b/engines/prince/object.cpp
@@ -79,7 +79,7 @@ bool Object::loadFromStream(Common::SeekableReadStream &stream) {
 
 	_flags = stream.readUint16LE();
 	_z = stream.readUint16LE();
-	
+
 	stream.seek(pos + 16);
 
 	return true;
diff --git a/engines/prince/object.h b/engines/prince/object.h
index 68edd061a0..ff22a05805 100644
--- a/engines/prince/object.h
+++ b/engines/prince/object.h
@@ -62,7 +62,7 @@ public:
 
 private:
 	void loadSurface(Common::SeekableReadStream &stream);
-	Graphics::Surface *_surface; 
+	Graphics::Surface *_surface;
 };
 
 } // End of namespace Prince
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index b0f2cd5056..04a482c570 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -213,11 +213,11 @@ GUI::Debugger *PrinceEngine::getDebugger() {
 void PrinceEngine::init() {
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
-	
+
 	debugEngine("Adding all path: %s", gameDataDir.getPath().c_str());
 
 	PtcArchive *all = new PtcArchive();
-	if (!all->open("all/databank.ptc")) 
+	if (!all->open("all/databank.ptc"))
 		error("Can't open all/databank.ptc");
 
 	PtcArchive *voices = new PtcArchive();
@@ -261,7 +261,7 @@ void PrinceEngine::init() {
 
 	_variaTxt = new VariaTxt();
 	Resource::loadResource(_variaTxt, "variatxt.dat", true);
-	
+
 	_cursor1 = new Cursor();
 	Resource::loadResource(_cursor1, "mouse1.cur", true);
 
@@ -705,7 +705,7 @@ void PrinceEngine::freeAllSamples() {
 }
 
 bool PrinceEngine::loadSample(uint32 sampleSlot, const Common::String &streamName) {
-	// FIXME: This is just a workaround streamName is a path 
+	// FIXME: This is just a workaround streamName is a path
 	// SOUND\\SCIERKA1.WAV for now only last path component is used
 	Common::String normalizedPath = lastPathComponent(streamName, '\\');
 
@@ -756,7 +756,7 @@ bool PrinceEngine::loadVoice(uint32 slot, uint32 sampleSlot, const Common::Strin
 	}
 
 	id = sampleStream->readUint32LE();
-	debugEngine("SetVoice slot %d time %04x", slot, id); 
+	debugEngine("SetVoice slot %d time %04x", slot, id);
 	id <<= 3;
 	id /= 22050;
 	id += 2;
@@ -768,7 +768,7 @@ bool PrinceEngine::loadVoice(uint32 slot, uint32 sampleSlot, const Common::Strin
 		_secondHero->_talkTime = id;
 	}
 
-	debugEngine("SetVoice slot %d time %04x", slot, id); 
+	debugEngine("SetVoice slot %d time %04x", slot, id);
 	sampleStream->seek(SEEK_SET);
 	_audioStream[sampleSlot] = Audio::makeWAVStream(sampleStream, DisposeAfterUse::NO);
 	delete sampleStream;
@@ -4321,7 +4321,7 @@ int PrinceEngine::scanDirectionsFindNext(byte *tempCoordsBuf, int xDiff, int yDi
 		tempCoordsBuf += 4;
 
 		if (tempCoordsBuf == _coords) {
-			direction = tempX; 
+			direction = tempX;
 			break;
 		}
 
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 0e5bf97dde..930c3c7bd3 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -242,7 +242,7 @@ struct DebugChannel {
 
 enum Type {
 	kScript,
-	kEngine 
+	kEngine
 };
 
 };
@@ -658,7 +658,7 @@ private:
 	Common::Array<Mob> _invMobList;
 
 	bool _flicLooped;
-	
+
 	void mainLoop();
 
 };
diff --git a/engines/prince/pscr.h b/engines/prince/pscr.h
index d59fa37d81..fdcdb524a9 100644
--- a/engines/prince/pscr.h
+++ b/engines/prince/pscr.h
@@ -40,7 +40,7 @@ public:
 	Graphics::Surface *getSurface() const { return _surface; }
 private:
 	void loadSurface(Common::SeekableReadStream &stream);
-	Graphics::Surface *_surface; 
+	Graphics::Surface *_surface;
 };
 
 } // End of namespace Prince
diff --git a/engines/prince/resource.h b/engines/prince/resource.h
index b1fbd9c4f0..f42eb87842 100644
--- a/engines/prince/resource.h
+++ b/engines/prince/resource.h
@@ -41,13 +41,13 @@ namespace Resource {
 	bool loadResource(T *resource, const char *resourceName, bool required) {
 		Common::ScopedPtr<Common::SeekableReadStream> stream(SearchMan.createReadStreamForMember(resourceName));
 		if (!stream) {
-			if (required) 
+			if (required)
 				error("Can't load %s", resourceName);
 			return false;
 		}
 
 		return loadFromStream(*resource, *stream);
-	} 
+	}
 
 	template <typename T>
 	bool loadResource(Common::Array<T> &array, Common::SeekableReadStream &stream, bool required = true) {
@@ -82,7 +82,7 @@ namespace Resource {
 		}
 
 		// FIXME: This is stupid. Maybe loadFromStream should be helper method that returns initiailzed object
-		while (true) {	
+		while (true) {
 			T* t = new T();
 			if (!t->loadFromStream(*stream)) {
 				delete t;
diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
index 39a4002b40..706079ffaf 100644
--- a/engines/prince/saveload.cpp
+++ b/engines/prince/saveload.cpp
@@ -480,7 +480,7 @@ bool PrinceEngine::loadGame(int slotNumber) {
 	saveFile->read(dataBuffer, size);
 	readStream = new Common::MemoryReadStream(dataBuffer, size, DisposeAfterUse::YES);
 	delete saveFile;
-	
+
 	// Check to see if it's a ScummVM savegame or not
 	char buffer[kSavegameStrSize + 1];
 	readStream->read(buffer, kSavegameStrSize + 1);
@@ -507,7 +507,7 @@ bool PrinceEngine::loadGame(int slotNumber) {
 
 	// TODO
 	//syncSpeechSettings();
-	
+
 	return true;
 }
 
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index d1a0034940..deb52d7622 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -43,7 +43,7 @@ Room::Room() {}
 bool Room::loadRoom(byte *roomData) {
 	int roomSize = 64;
 	Common::MemoryReadStream roomStream(roomData, roomSize);
-	
+
 	_mobs = roomStream.readSint32LE();
 	_backAnim = roomStream.readSint32LE();
 	_obj = roomStream.readSint32LE();
@@ -131,7 +131,7 @@ bool Script::loadStream(Common::SeekableReadStream &stream) {
 	_scriptInfo.invObjGive = scriptDataStream.readSint32LE();
 	_scriptInfo.stdGiveItem = scriptDataStream.readSint32LE();
 	_scriptInfo.goTester = scriptDataStream.readSint32LE();
-	
+
 	return true;
 }
 
@@ -427,7 +427,7 @@ int32 InterpreterFlags::getFlagValue(Flags::Id flagId) {
 	return _flags[(uint32)flagId - kFlagMask];
 }
 
-Interpreter::Interpreter(PrinceEngine *vm, Script *script, InterpreterFlags *flags) : 
+Interpreter::Interpreter(PrinceEngine *vm, Script *script, InterpreterFlags *flags) :
 	_vm(vm), _script(script), _flags(flags),
 	_stacktop(0), _opcodeNF(false), _opcodeEnd(false),
 	_waitFlag(0), _result(true) {
@@ -479,8 +479,8 @@ uint32 Interpreter::step(uint32 opcodePC) {
 
 		if (_lastOpcode >= kNumOpcodes)
 			error(
-				"Trying to execute unknown opcode @0x%04X: %02d", 
-				_currentInstruction, 
+				"Trying to execute unknown opcode @0x%04X: %02d",
+				_currentInstruction,
 				_lastOpcode);
 
 		// Execute the current opcode
@@ -570,7 +570,7 @@ int32 Interpreter::readScriptFlagValue() {
 	return value;
 }
 
-Flags::Id Interpreter::readScriptFlagId() { 
+Flags::Id Interpreter::readScriptFlagId() {
 	return (Flags::Id)readScript16();
 }
 
@@ -1689,7 +1689,7 @@ void Interpreter::O_POPSTRING() {
 
 void Interpreter::O_SETFGCODE() {
 	int32 offset = readScript32();
-	_fgOpcodePC = _currentInstruction + offset - 4;	
+	_fgOpcodePC = _currentInstruction + offset - 4;
 	debugInterpreter("O_SETFGCODE next %08x, offset %08x", _fgOpcodePC, offset);
 }
 
-- 
cgit v1.2.3


From 361f4d4717b2f719a61ca9de421907503e99f37f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:22:48 +0200
Subject: FULLPIPE: Remove trailing whitespace

---
 engines/fullpipe/fullpipe.cpp       |  4 ++--
 engines/fullpipe/gfx.cpp            |  8 ++++----
 engines/fullpipe/input.cpp          |  2 +-
 engines/fullpipe/motion.cpp         | 14 +++++++-------
 engines/fullpipe/scene.cpp          |  2 +-
 engines/fullpipe/scenes/scene02.cpp |  2 +-
 engines/fullpipe/scenes/scene14.cpp |  2 +-
 engines/fullpipe/scenes/scene15.cpp |  2 +-
 engines/fullpipe/scenes/scene16.cpp |  8 ++++----
 engines/fullpipe/scenes/scene23.cpp |  2 +-
 engines/fullpipe/scenes/scene28.cpp |  2 +-
 engines/fullpipe/scenes/scene29.cpp |  2 +-
 engines/fullpipe/scenes/scene37.cpp |  2 +-
 engines/fullpipe/sound.cpp          |  2 +-
 engines/fullpipe/statics.cpp        |  8 ++++----
 15 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index bb0838395d..ebaff32550 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -163,7 +163,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 
 	for (int i = 0; i < 11; i++)
 		_currSoundList1[i] = 0;
-	
+
 	for (int i = 0; i < 200; i++)
 		_mapTable[i] = 0;
 
@@ -285,7 +285,7 @@ Common::Error FullpipeEngine::run() {
 			freeGameLoader();
 			_currentScene = 0;
 			_updateTicks = 0;
-			
+
 			loadGam("fullpipe.gam");
 			_needRestart = false;
 		}
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 61fbf7192f..42846850ca 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -153,7 +153,7 @@ bool PictureObject::load(MfcArchive &file, bool bigPicture) {
 
 	if (count > 0) {
 		GameObject *o = new GameObject();
-		
+
 		o->load(file);
 		_pictureObject2List->push_back(o);
 	}
@@ -286,9 +286,9 @@ bool GameObject::load(MfcArchive &file) {
 	_okeyCode = 0;
 	_flags = 0;
 	_field_20 = 0;
-	
+
 	_id = file.readUint16LE();
-	
+
 	_objectName = file.readPascalString();
 	_ox = file.readUint32LE();
 	_oy = file.readUint32LE();
@@ -498,7 +498,7 @@ bool Picture::load(MfcArchive &file) {
 	_x = file.readUint32LE();
 	_y = file.readUint32LE();
 	_field_44 = file.readUint16LE();
-	
+
 	assert(g_fp->_gameProjectVersion >= 2);
 
 	_width = file.readUint32LE();
diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp
index 7c97461a24..b681f4fbe7 100644
--- a/engines/fullpipe/input.cpp
+++ b/engines/fullpipe/input.cpp
@@ -70,7 +70,7 @@ void setInputDisabled(bool state) {
 void InputController::addCursor(CursorInfo *cursor) {
 	CursorInfo *newc = new CursorInfo(cursor);
 	Common::Point p;
-	
+
 	cursor->picture->getDimensions(&p);
 
 	newc->width = p.x;
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 49cf88434e..9573e0517b 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1040,11 +1040,11 @@ MessageQueue *MovGraph::doWalkTo(StaticANIObject *subj, int xpos, int ypos, int
 
 					if (!mq || !mq->getExCommandByIndex(0))
 						return 0;
-					
+
 					ExCommand *ex = mq->getExCommandByIndex(0);
 
-					if ((ex->_messageKind != 1 && ex->_messageKind != 20) || 
-						ex->_messageNum != subj->_movement->_id || 
+					if ((ex->_messageKind != 1 && ex->_messageKind != 20) ||
+						ex->_messageNum != subj->_movement->_id ||
 						(ex->_field_14 >= 1 && ex->_field_14 <= subj->_movement->_currDynamicPhaseIndex))
 						subj->playIdle();
 				}
@@ -1416,8 +1416,8 @@ Common::Array<MovArr *> *MovGraph::genMovArr(int x, int y, int *arrSize, int fla
 				movarr = new MovArr;
 
 				movarr->_link = lnk;
-				movarr->_dist = ((double)(lnk->_movGraphNode1->_y - lnk->_movGraphNode2->_y) * (double)(lnk->_movGraphNode1->_y - point.y) + 
-								 (double)(lnk->_movGraphNode2->_x - lnk->_movGraphNode1->_x) * (double)(point.x - lnk->_movGraphNode1->_x)) / 
+				movarr->_dist = ((double)(lnk->_movGraphNode1->_y - lnk->_movGraphNode2->_y) * (double)(lnk->_movGraphNode1->_y - point.y) +
+								 (double)(lnk->_movGraphNode2->_x - lnk->_movGraphNode1->_x) * (double)(point.x - lnk->_movGraphNode1->_x)) /
 					lnk->_distance / lnk->_distance;
 				movarr->_point = point;
 
@@ -1445,8 +1445,8 @@ Common::Array<MovArr *> *MovGraph::genMovArr(int x, int y, int *arrSize, int fla
 					} else {
 						movarr = new MovArr;
 						movarr->_link = lnk;
-						movarr->_dist = ((double)(lnk->_movGraphNode1->_y - lnk->_movGraphNode2->_y) * (double)(lnk->_movGraphNode1->_y - y) + 
-										 (double)(lnk->_movGraphNode2->_x - lnk->_movGraphNode1->_x) * (double)(x - lnk->_movGraphNode1->_x)) / 
+						movarr->_dist = ((double)(lnk->_movGraphNode1->_y - lnk->_movGraphNode2->_y) * (double)(lnk->_movGraphNode1->_y - y) +
+										 (double)(lnk->_movGraphNode2->_x - lnk->_movGraphNode1->_x) * (double)(x - lnk->_movGraphNode1->_x)) /
 							lnk->_distance / lnk->_distance;
 						movarr->_point.x = x;
 						movarr->_point.y = y;
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 8463b3ab40..00dd70c1b2 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -162,7 +162,7 @@ bool Scene::load(MfcArchive &file) {
 	Background::load(file);
 
 	_sceneId = file.readUint16LE();
-	
+
 	_sceneName = file.readPascalString();
 	debug(0, "scene: <%s> %d", transCyrillic((byte *)_sceneName), _sceneId);
 
diff --git a/engines/fullpipe/scenes/scene02.cpp b/engines/fullpipe/scenes/scene02.cpp
index 109a20a07a..fd542d580d 100644
--- a/engines/fullpipe/scenes/scene02.cpp
+++ b/engines/fullpipe/scenes/scene02.cpp
@@ -134,5 +134,5 @@ int sceneHandler02(ExCommand *ex) {
 
 	return res;
 }
-	
+
 } // End of namespace Fullpipe
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 21dbe8101f..446f477133 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -57,7 +57,7 @@ void scene14_initScene(Scene *sc) {
 
 		ball->_flags &= 0xFFFB;
 		g_vars->scene14_balls.push_back(ball);
-		
+
 		for (uint i = 0; i < 3; i++) {
 			ball = new StaticANIObject(ball); // create a copy
 
diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp
index 452f2edeca..efc69a5fa6 100644
--- a/engines/fullpipe/scenes/scene15.cpp
+++ b/engines/fullpipe/scenes/scene15.cpp
@@ -71,7 +71,7 @@ void scene15_initScene(Scene *sc) {
 		grandma->hide();
 		g_fp->setObjectState(sO_LeftPipe_15, g_fp->getObjectEnumState(sO_LeftPipe_15, sO_IsOpened));
 	}
-	
+
 	g_vars->scene15_plusminus = sc->getStaticANIObject1ById(ANI_PLUSMINUS, -1);
 
 	if (g_fp->getObjectState(sO_Guard_2) == g_fp->getObjectEnumState(sO_Guard_2, sO_Off))
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index ed3c51a6c2..e9d3a37efd 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -57,9 +57,9 @@ void scene16_initScene(Scene *sc) {
 
 		boy[1] = new StaticANIObject(boy[0]);
 		sc->addStaticANIObject(boy[1], 1);
-		
+
 		int idx = 0;
-		
+
 		for (int i = 0; i < 3; i++) {
 			g_vars->scene16_figures.push_back(boy[idx]);
 
@@ -68,7 +68,7 @@ void scene16_initScene(Scene *sc) {
 			if (idx >= 2)
 				idx = 0;
 		}
-		
+
 		g_vars->scene16_figures.push_back(sc->getStaticANIObject1ById(ANI_GIRL, -1));
 
 		for (int i = 0; i < 4; i++) {
@@ -259,7 +259,7 @@ void sceneHandler16_drink() {
 							mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYKICK), 0, 1);
 
 							mq->replaceKeyCode(-1, g_vars->scene16_walkingBoy->_okeyCode);
-							
+
 							ex = new ExCommand(ANI_MAN, 34, 384, 0, 0, 0, 1, 0, 0, 0);
 							ex->_excFlags |= 3u;
 							ex->_field_14 = 384;
diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/fullpipe/scenes/scene23.cpp
index ccfbac9223..f66ea12b4b 100644
--- a/engines/fullpipe/scenes/scene23.cpp
+++ b/engines/fullpipe/scenes/scene23.cpp
@@ -146,7 +146,7 @@ void scene23_initScene(Scene *sc) {
 
 		sc->getStaticANIObject1ById(ANI_INV_LEVERHANDLE, -1)->hide();
 	}
-	
+
 	g_fp->_currentScene = oldsc;
 }
 
diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
index c21ce05502..de5a96e70d 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -46,7 +46,7 @@ void scene28_initScene(Scene *sc) {
 	g_vars->scene28_lift6inside = false;
 
 	g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_28"));
-	
+
 	g_fp->initArcadeKeys("SC_28");
 }
 
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 8f82e99ad1..222a541554 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -840,7 +840,7 @@ void sceneHandler29_shootersEscape() {
 
 void sceneHandler29_manRideBack() {
 	g_vars->scene29_manX -= 2;
-  
+
 	g_fp->_aniMan->setOXY(g_vars->scene29_manX, g_vars->scene29_manY);
 }
 
diff --git a/engines/fullpipe/scenes/scene37.cpp b/engines/fullpipe/scenes/scene37.cpp
index 09da01f138..324d3ac92d 100644
--- a/engines/fullpipe/scenes/scene37.cpp
+++ b/engines/fullpipe/scenes/scene37.cpp
@@ -91,7 +91,7 @@ void scene37_initScene(Scene *sc) {
 	g_vars->scene37_rings.push_back(ring);
 
 	g_fp->setObjectState(sO_LeftPipe_37, g_fp->getObjectEnumState(sO_LeftPipe_37, sO_IsClosed));
-	
+
 	Scene *oldsc = g_fp->_currentScene;
 
 	g_fp->_currentScene = sc;
diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index a4ca06f489..230d6c39a9 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -62,7 +62,7 @@ bool SoundList::load(MfcArchive &file, char *fname) {
 	}
 
 	return true;
-	
+
 }
 
 bool SoundList::loadFile(const char *fname, char *libname) {
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 717de84925..880c2eb0df 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -246,7 +246,7 @@ bool StaticANIObject::load(MfcArchive &file) {
 void StaticANIObject::setOXY(int x, int y) {
 	_ox = x;
 	_oy = y;
-	
+
 	if (_movement)
 		_movement->setOXY(x, y);
 }
@@ -713,7 +713,7 @@ void StaticANIObject::setSpeed(int speed) {
 void StaticANIObject::setAlpha(int alpha) {
 	for (uint i = 0; i < _movements.size(); i++)
 		_movements[i]->setAlpha(alpha);
-	
+
 	for (uint i = 0; i < _staticsList.size(); i++)
 		_staticsList[i]->setAlpha(alpha);
 }
@@ -1813,7 +1813,7 @@ void Movement::initStatics(StaticANIObject *ani) {
 
 	_staticsObj2 = ani->addReverseStatics(_currMovement->_staticsObj2);
 	_staticsObj1 = ani->addReverseStatics(_currMovement->_staticsObj1);
-	
+
 	_mx = _currMovement->_mx;
 	_my = _currMovement->_my;
 
@@ -2279,7 +2279,7 @@ bool StaticPhase::load(MfcArchive &file) {
 
 	_initialCountdown = file.readUint16LE();
 	_field_6A = file.readUint16LE();
-	
+
 	if (g_fp->_gameProjectVersion >= 12) {
 		_exCommand = (ExCommand *)file.readClass();
 
-- 
cgit v1.2.3


From 88e5998ee5aa9123f2c9c4f9b54269fbf840172b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Oct 2014 16:24:45 +0200
Subject: BBVS: Remove trailing whitespace

---
 engines/bbvs/bbvs.cpp                  | 98 +++++++++++++++++-----------------
 engines/bbvs/bbvs.h                    | 78 +++++++++++++--------------
 engines/bbvs/detection.cpp             |  2 +-
 engines/bbvs/dialogs.cpp               |  8 +--
 engines/bbvs/dialogs.h                 |  6 +--
 engines/bbvs/gamemodule.cpp            | 40 +++++++-------
 engines/bbvs/gamemodule.h              | 50 ++++++++---------
 engines/bbvs/graphics.cpp              |  4 +-
 engines/bbvs/minigames/bbairguitar.cpp | 62 ++++++++++-----------
 engines/bbvs/minigames/bbairguitar.h   | 34 ++++++------
 engines/bbvs/minigames/bbant.cpp       | 64 +++++++++++-----------
 engines/bbvs/minigames/bbant.h         | 26 ++++-----
 engines/bbvs/minigames/bbloogie.cpp    | 68 +++++++++++------------
 engines/bbvs/minigames/bbloogie.h      | 36 ++++++-------
 engines/bbvs/minigames/bbtennis.cpp    | 44 +++++++--------
 engines/bbvs/minigames/bbtennis.h      | 22 ++++----
 engines/bbvs/minigames/minigame.cpp    |  6 +--
 engines/bbvs/minigames/minigame.h      | 14 ++---
 engines/bbvs/saveload.cpp              | 26 ++++-----
 engines/bbvs/scene.cpp                 | 20 +++----
 engines/bbvs/spritemodule.cpp          | 12 ++---
 engines/bbvs/videoplayer.cpp           |  4 +-
 engines/bbvs/walk.cpp                  | 24 ++++-----
 23 files changed, 374 insertions(+), 374 deletions(-)

diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index d2e13e525c..11e4b6cea7 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -60,7 +60,7 @@ static const BBPoint kInventorySlotPositions[] = {
 	{135,  93}, {134, 145}, { 96, 224}, {128, 224}, {160, 224},
 	{192, 224}, {224, 224}, {240, 224}, {256, 224}, {  0,   0}
 };
-	
+
 static const BBRect kVerbRects[6] = {
 	{-32,  -2, 19, 27}, {-33, -33, 19, 27}, { 12,  -2, 19, 27},
 	{ 13, -33, 19, 27}, {-10,   8, 19, 27}, {-11, -49, 19, 27}
@@ -77,7 +77,7 @@ bool WalkArea::contains(const Common::Point &pt) const {
 
 BbvsEngine::BbvsEngine(OSystem *syst, const ADGameDescription *gd) :
 	Engine(syst), _gameDescription(gd) {
-	
+
 	_random = new Common::RandomSource("bbvs");
 	_currActionCommandIndex = -1;
 	_buttheadObject = nullptr;
@@ -148,14 +148,14 @@ Common::Error BbvsEngine::run() {
 	_gameModule = new GameModule();
 	_spriteModule = new SpriteModule();
 	_sound = new SoundMan();
-	
+
 	allocSnapshot();
 	memset(_easterEggInput, 0, sizeof(_easterEggInput));
-	
+
 	_gameTicks = 0;
 	_playVideoNumber = 0;
 	_bootSaveSlot = -1;
-	
+
 	memset(_inventoryItemStatus, 0, sizeof(_inventoryItemStatus));
 	memset(_gameVars, 0, sizeof(_gameVars));
 	memset(_sceneVisited, 0, sizeof(_sceneVisited));
@@ -189,7 +189,7 @@ Common::Error BbvsEngine::run() {
 			_playVideoNumber = 0;
 		}
 	}
-	
+
 	writeContinueSavegame();
 
 	freeSnapshot();
@@ -282,20 +282,20 @@ void BbvsEngine::updateGame() {
 		inputTicks = 1;
 		_gameTicks = _system->getMillis();
 	}
-	
+
 	if (inputTicks > 20) {
 		inputTicks = 20;
 		_gameTicks = _system->getMillis();
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	if (_mouseX >= 320 || _mouseY >= 240) {
 		_mouseY = -1;
 		_mouseX = -1;
 	}
-	
+
 	bool done;
 
 	do {
@@ -304,14 +304,14 @@ void BbvsEngine::updateGame() {
 		_mouseButtons &= ~kRightButtonClicked;
 		_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _playVideoNumber == 0 && _gameTicks > 0 && !done);
-	
+
 	if (!done && _playVideoNumber == 0 && _gameTicks > 0) {
 		DrawList drawList;
 		buildDrawList(drawList);
 		_screen->drawDrawList(drawList, _spriteModule);
 		drawScreen();
 	}
-	
+
 	_system->delayMillis(10);
 
 }
@@ -329,7 +329,7 @@ void BbvsEngine::updateBackgroundSounds() {
 			_backgroundSoundsActive[i] = 0;
 		}
 	}
-} 
+}
 
 bool BbvsEngine::update(int mouseX, int mouseY, uint mouseButtons, Common::KeyCode keyCode) {
 
@@ -339,7 +339,7 @@ bool BbvsEngine::update(int mouseX, int mouseY, uint mouseButtons, Common::KeyCo
 		_bootSaveSlot = -1;
 		return false;
 	}
-	
+
 	if (_newSceneNum != 0) {
 		_gameTicks = 0;
 		return changeScene();
@@ -413,7 +413,7 @@ bool BbvsEngine::update(int mouseX, int mouseY, uint mouseButtons, Common::KeyCo
 		}
 		updateInventory(mouseButtons & kLeftButtonClicked);
 		break;
-	
+
 	case kGSVerbs:
 		_isSaveAllowed = false;
 		updateVerbs();
@@ -426,7 +426,7 @@ bool BbvsEngine::update(int mouseX, int mouseY, uint mouseButtons, Common::KeyCo
 			}
 		}
 		break;
-	
+
 	case kGSWait:
 	case kGSWaitDialog:
 		_isSaveAllowed = false;
@@ -438,14 +438,14 @@ bool BbvsEngine::update(int mouseX, int mouseY, uint mouseButtons, Common::KeyCo
 		else
 			updateCommon();
 		break;
-	
+
 	case kGSDialog:
 		_isSaveAllowed = true;
 		saveSnapshot();
 		updateDialog(mouseButtons & kLeftButtonClicked);
 		updateCommon();
 		break;
-	
+
 	}
 
 	return true;
@@ -503,7 +503,7 @@ void BbvsEngine::buildDrawList(DrawList &drawList) {
 			// Verbs background
 			drawList.add(_gameModule->getGuiSpriteIndex(13), _verbPos.x - _cameraPos.x,
 				_verbPos.y - _cameraPos.y, 500);
-			// Selected inventory item		
+			// Selected inventory item
 			if (_currInventoryItem >= 0) {
 				drawList.add(_gameModule->getInventoryItemSpriteIndex(2 * _currInventoryItem), _verbPos.x - _cameraPos.x,
 					_verbPos.y - _cameraPos.y + 27, 500);
@@ -538,7 +538,7 @@ void BbvsEngine::updateVerbs() {
 		_mouseCursorSpriteIndex = 0;
 		return;
 	}
-	
+
 	for (int i = 0; i < 6; ++i) {
 		const BBRect &verbRect = kVerbRects[i];
 		const int16 x = _verbPos.x + verbRect.x;
@@ -551,7 +551,7 @@ void BbvsEngine::updateVerbs() {
 			break;
 		}
 	}
-	
+
 	switch (_currVerbNum) {
 	case kVerbLook:
 	case kVerbUse:
@@ -585,7 +585,7 @@ void BbvsEngine::updateDialog(bool clicked) {
 			_gameState = kGSScene;
 		return;
 	}
-	
+
 	int slotX = (_mousePos.x - _cameraPos.x) / 32;
 
 	if (slotX >= _dialogSlotCount) {
@@ -597,7 +597,7 @@ void BbvsEngine::updateDialog(bool clicked) {
 
 	_mouseCursorSpriteIndex = _gameModule->getGuiSpriteIndex(5);
 	_activeItemType = kITDialog;
-	
+
 	// Find the selected dialog item index
 	for (int i = 0; i < 50 && slotX >= 0; ++i) {
 		if (_dialogItemStatus[i]) {
@@ -605,7 +605,7 @@ void BbvsEngine::updateDialog(bool clicked) {
 			_activeItemIndex = i;
 		}
 	}
-	
+
 	// Select the dialog item action if it was clicked
 	if (clicked) {
 		for (int i = 0; i < _gameModule->getActionsCount(); ++i) {
@@ -622,7 +622,7 @@ void BbvsEngine::updateDialog(bool clicked) {
 }
 
 void BbvsEngine::updateInventory(bool clicked) {
-	
+
 	Common::Rect kInvButtonRects[3] = {
 		Common::Rect(97, 13, 97 + 20, 13 + 26),
 		Common::Rect(135, 15, 135 + 46, 15 + 25),
@@ -636,10 +636,10 @@ void BbvsEngine::updateInventory(bool clicked) {
 
 	if (_currVerbNum != kVerbLook && _currVerbNum != kVerbUse && _currVerbNum != kVerbInvItem)
 		_currVerbNum = kVerbUse;
-	
+
 	const int16 mx = _mousePos.x - _cameraPos.x;
 	const int16 my = _mousePos.y - _cameraPos.y;
-	
+
 	// Check inventory exit left/right edge of screen
 	if (mx < 40 || mx > 280) {
 		_mouseCursorSpriteIndex = _gameModule->getGuiSpriteIndex(10);
@@ -652,7 +652,7 @@ void BbvsEngine::updateInventory(bool clicked) {
 		return;
 	}
 
-	// Check hovered/clicked inventory button	
+	// Check hovered/clicked inventory button
 	_inventoryButtonIndex = -1;
 	if (kInvButtonRects[0].contains(mx, my)) {
 		_inventoryButtonIndex = 0;
@@ -677,10 +677,10 @@ void BbvsEngine::updateInventory(bool clicked) {
 	// Find hovered/clicked inventory item
 
 	int currItem = -1;
-	
+
 	if (_currVerbNum == kVerbInvItem)
 		currItem = _currInventoryItem;
-		
+
 	_activeItemType = kITEmpty;
 
 	for (int i = 0; i < 50; ++i) {
@@ -769,7 +769,7 @@ void BbvsEngine::updateScene(bool clicked) {
 			}
 		}
 	}
-	
+
 	for (int i = 0; i < _gameModule->getBgObjectsCount(); ++i) {
 		BgObject *bgObject = _gameModule->getBgObject(i);
 		if (lastPriority <= bgObject->rect.bottom && bgObject->rect.contains(_mousePos)) {
@@ -921,7 +921,7 @@ bool BbvsEngine::performActionCommand(ActionCommand *actionCommand) {
 		return false;
 
 	case kActionCmdWalkObject:
-		{			
+		{
 			SceneObject *sceneObject = &_sceneObjects[actionCommand->sceneObjectIndex];
 			debug(5, "[%s] walks from (%d, %d) to (%d, %d)", sceneObject->sceneObjectDef->name,
 				sceneObject->x >> 16, sceneObject->y >> 16, actionCommand->walkDest.x, actionCommand->walkDest.y);
@@ -998,14 +998,14 @@ bool BbvsEngine::performActionCommand(ActionCommand *actionCommand) {
 
 bool BbvsEngine::processCurrAction() {
 	bool actionsFinished = false;
-	
+
 	if (_sceneObjectActions.size() == 0) {
-	
+
 		for (uint i = 0; i < _currAction->actionCommands.size(); ++i) {
 			ActionCommand *actionCommand = &_currAction->actionCommands[i];
 			if (actionCommand->timeStamp != 0)
 				break;
-				
+
 			if (actionCommand->cmd == kActionCmdMoveObject || actionCommand->cmd == kActionCmdAnimObject) {
 				SceneObjectAction *sceneObjectAction = 0;
 				// See if there's already an entry for the SceneObject
@@ -1027,14 +1027,14 @@ bool BbvsEngine::processCurrAction() {
 					sceneObjectAction->animationIndex = actionCommand->param;
 				}
 			}
-			
+
 			if (actionCommand->cmd == kActionCmdSetCameraPos) {
 				_currCameraNum = actionCommand->param;
 				_newCameraPos = _gameModule->getCameraInit(actionCommand->param)->cameraPos;
 			}
 
 		}
-		
+
 		// Delete entries for SceneObjects without anim
 		for (uint i = 0; i < _sceneObjectActions.size();) {
 			if (!_sceneObjects[_sceneObjectActions[i].sceneObjectIndex].anim)
@@ -1107,7 +1107,7 @@ void BbvsEngine::updateCommon() {
 		if (doActionCommands) {
 
 			ActionCommand *actionCommand = &_currAction->actionCommands[_currActionCommandIndex];
-			
+
 			while (actionCommand->timeStamp == _currActionCommandTimeStamp &&
 				_currActionCommandIndex < (int)_currAction->actionCommands.size()) {
 				if (!performActionCommand(actionCommand)) {
@@ -1161,7 +1161,7 @@ void BbvsEngine::updateCommon() {
 			}
 			updateWalkObject(sceneObject);
 		}
-		
+
 		if (sceneObject->walkCount > 0 && sceneObject->turnCount == 0) {
 			debug(5, "walk step, xIncr: %d, yIncr: %d", sceneObject->xIncr, sceneObject->yIncr);
 			sceneObject->x += sceneObject->xIncr;
@@ -1226,7 +1226,7 @@ void BbvsEngine::updateCommon() {
 			}
 		}
 	}
-	
+
 	if (_cameraPos.x < _newCameraPos.x)
 		++_cameraPos.x;
 	if (_cameraPos.x > _newCameraPos.x)
@@ -1235,7 +1235,7 @@ void BbvsEngine::updateCommon() {
 		++_cameraPos.y;
 	if (_cameraPos.y > _newCameraPos.y)
 		--_cameraPos.y;
-	
+
 	// Check if Butthead is inside a scene exit
 	if (_newSceneNum == 0 && !_currAction && _buttheadObject) {
 		int16 buttheadX = _buttheadObject->x >> 16;
@@ -1314,13 +1314,13 @@ void BbvsEngine::stopSounds() {
 
 bool BbvsEngine::runMinigame(int minigameNum) {
 	debug(0, "BbvsEngine::runMinigame() minigameNum: %d", minigameNum);
-	
+
 	bool fromMainGame = _currSceneNum != kMainMenu;
-	
+
 	_sound->unloadSounds();
-		
+
 	Minigame *minigame = 0;
-	
+
 	switch (minigameNum) {
 	case kMinigameBbLoogie:
 		minigame = new MinigameBbLoogie(this);
@@ -1338,9 +1338,9 @@ bool BbvsEngine::runMinigame(int minigameNum) {
 		error("Incorrect minigame number %d", minigameNum);
 		break;
 	}
-	
+
 	bool minigameResult = minigame->run(fromMainGame);
-	
+
 	delete minigame;
 
 	// Check if the principal was hit with a megaloogie in the loogie minigame
@@ -1370,11 +1370,11 @@ void BbvsEngine::checkEasterEgg(char key) {
 		"SKCUS",
 		"NAMTAH"
 	};
-	
+
 	static const int kEasterEggLengths[] = {
 		7, 5, 5, 6
 	};
-	
+
 	if (_currSceneNum == kCredits) {
 		memcpy(&_easterEggInput[1], &_easterEggInput[0], 6);
 		_easterEggInput[0] = key;
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index 6a9a13905c..bbd8046a8b 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -149,7 +149,7 @@ struct BBPoint {
 
 struct BBRect {
 	int16 x, y, width, height;
-}; 
+};
 
 struct BBPolygon {
 	const BBPoint *points;
@@ -229,66 +229,66 @@ public:
 private:
 	const ADGameDescription *_gameDescription;
 	Graphics::PixelFormat _pixelFormat;
-public:	
+public:
 	Common::RandomSource *_random;
-	
+
 	GameModule *_gameModule;
 	SpriteModule *_spriteModule;
 	SoundMan *_sound;
-	
+
 	Screen *_screen;
-	
+
 	int _bootSaveSlot;
-	
+
 	int _mouseX, _mouseY;
 	uint _mouseButtons;
 	Common::KeyCode _keyCode;
-	
+
 	int _mouseCursorSpriteIndex;
 
 	int _gameState;
 	int _gameTicks;
-	
+
 	Common::Point _mousePos;
 	Common::Point _verbPos;
 	Common::Point _walkMousePos;
-	
+
 	int _activeItemType;
 	int _activeItemIndex;
 	int _currTalkObjectIndex;
-	
+
 	Common::Point _cameraPos, _newCameraPos;
-	
+
 	int _newSceneNum, _prevSceneNum, _currSceneNum;
 	int _playVideoNumber;
-	
+
 	int _dialogSlotCount;
 	byte _dialogItemStatus[kDialogItemStatusCount];
-	
+
 	byte _gameVars[kGameVarsCount];
 	byte _sceneVisited[kSceneVisitedCount];
 
 	int _currVerbNum;
-	
+
 	int _currInventoryItem;
 	byte _inventoryItemStatus[kInventoryItemStatusCount];
 	int _inventoryButtonIndex;
-	
+
 	Action *_currAction;
 	uint32 _currActionCommandTimeStamp;
 	int _currActionCommandIndex;
-	
+
 	Common::Array<Action*> _walkAreaActions;
-	
+
 	SceneObject _sceneObjects[kSceneObjectsCount];
 	Common::Array<SceneObjectAction> _sceneObjectActions;
-	
+
 	SceneObject *_buttheadObject, *_beavisObject;
 	int _currCameraNum;
-	
+
 	byte _backgroundSoundsActive[kSceneSoundsCount];
 	Audio::SoundHandle _speechSoundHandle;
-	
+
 	int _walkAreasCount;
 	WalkArea _walkAreas[80];
 	int _walkInfosCount;
@@ -298,40 +298,40 @@ public:
 	Common::Rect _tempWalkableRects1[256];
 	Common::Rect _tempWalkableRects2[256];
 	WalkInfo *_walkInfoPtrs[256];
-	
+
 	WalkArea *_sourceWalkArea, *_destWalkArea;
 	Common::Point _sourceWalkAreaPt, _destWalkAreaPt, _finalWalkPt;
 	int _currWalkDistance;
 	bool _walkReachedDestArea;
-	
+
 	bool _hasSnapshot;
 	byte *_snapshot;
 	Common::SeekableMemoryWriteStream *_snapshotStream;
-	
+
 	char _easterEggInput[7];
-	
+
 	void updateEvents();
 	int getRandom(int max);
 
 	void drawDebugInfo();
 	void drawScreen();
-	
+
 	void updateGame();
 
 	bool evalCondition(Conditions &conditions);
 	bool evalCameraCondition(Conditions &conditions, int value);
 	int evalDialogCondition(Conditions &conditions);
 	void evalActionResults(ActionResults &results);
-	
+
 	void updateBackgroundSounds();
 
 	void loadScene(int sceneNum);
 	void initScene(bool sounds);
-	bool changeScene();	
+	bool changeScene();
 	bool update(int mouseX, int mouseY, uint mouseButtons, Common::KeyCode keyCode);
-	
+
 	void buildDrawList(DrawList &drawList);
-	
+
 	void updateVerbs();
 	void updateDialog(bool clicked);
 	void updateInventory(bool clicked);
@@ -342,7 +342,7 @@ public:
 	void skipCurrAction();
 
 	void updateCommon();
-	
+
 	void updateWalkableRects();
 	void startWalkObject(SceneObject *sceneObject);
 	void updateWalkObject(SceneObject *sceneObject);
@@ -360,20 +360,20 @@ public:
 	void walkFindPath(WalkArea *sourceWalkArea, int infoCount);
 	int calcDistance(const Common::Point &pt1, const Common::Point &pt2);
 	void walkFoundPath(int count);
-	
+
 	void updateSceneObjectsTurnValue();
 	void updateDialogConditions();
-	
-	void playSpeech(int soundNum);	
+
+	void playSpeech(int soundNum);
 	void stopSpeech();
-	
+
 	void playSound(uint soundNum, bool loop = false);
 	void stopSound(uint soundNum);
 	void stopSounds();
-	
+
 	bool runMinigame(int minigameNum);
 	void playVideo(int videoNum);
-	
+
 	void runMainMenu();
 	void checkEasterEgg(char key);
 
@@ -409,13 +409,13 @@ public:
 	bool existsSavegame(int num);
 	static Common::String getSavegameFilename(const Common::String &target, int num);
 	static kReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *in, bool loadThumbnail, SaveHeader &header);
-	
+
 	void allocSnapshot();
 	void freeSnapshot();
 	void saveSnapshot();
-	
+
 	void writeContinueSavegame();
-	
+
 };
 
 } // End of namespace Bbvs
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index e7383163f5..3e247aad99 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -133,7 +133,7 @@ SaveStateDescriptor BbvsMetaEngine::querySaveMetaInfos(const char *target, int s
 		Bbvs::BbvsEngine::kReadSaveHeaderError error;
 		error = Bbvs::BbvsEngine::readSaveHeader(in, true, header);
 		delete in;
-		if (error == Bbvs::BbvsEngine::kRSHENoError) {		
+		if (error == Bbvs::BbvsEngine::kRSHENoError) {
 			SaveStateDescriptor desc(slot, header.description);
 			// Slot 0 is used for the "Continue" save
 			desc.setDeletableFlag(slot != 0);
diff --git a/engines/bbvs/dialogs.cpp b/engines/bbvs/dialogs.cpp
index 5247a58ec8..af95f06c1e 100644
--- a/engines/bbvs/dialogs.cpp
+++ b/engines/bbvs/dialogs.cpp
@@ -34,7 +34,7 @@ struct MenuButton {
 
 static const MenuButton kMenuButtons[] = {
 	// Main menu
-	{"New Game", kCmdNewGame},	
+	{"New Game", kCmdNewGame},
 	{"Continue", kCmdContinue},
 	{"Options", kCmdOptions},
 	{"Mini Games", kCmdMiniGames},
@@ -61,7 +61,7 @@ MainMenu::~MainMenu() {
 }
 
 void MainMenu::init() {
-	_buttons[0] = new GUI::ButtonWidget(this, 0, 0, 1, 1, "", 0, 0);	
+	_buttons[0] = new GUI::ButtonWidget(this, 0, 0, 1, 1, "", 0, 0);
 	_buttons[1] = new GUI::ButtonWidget(this, 0, 0, 1, 1, "", 0, 0);
 	_buttons[2] = new GUI::ButtonWidget(this, 0, 0, 1, 1, "", 0, 0);
 	_buttons[3] = new GUI::ButtonWidget(this, 0, 0, 1, 1, "", 0, 0);
@@ -76,14 +76,14 @@ void MainMenu::reflowLayout() {
 	const int buttonWidth = screenW * 70 / 320;
 	const int buttonHeight = screenH * 14 / 240;
 	const int buttonPadding = screenW * 3 / 320;
-	
+
 	_w = 2 * buttonWidth  + buttonPadding;
 	_h = 3 * buttonHeight + 3 * buttonPadding;
 	_x = (screenW - _w) / 2;
 	_y = screenH - _h;
 
 	int x = 0, y = 0;
-	
+
 	x = 0;
 	y = 0;
 	_buttons[0]->resize(x, y, buttonWidth, buttonHeight);
diff --git a/engines/bbvs/dialogs.h b/engines/bbvs/dialogs.h
index 2dce2a110b..7db0b182b7 100644
--- a/engines/bbvs/dialogs.h
+++ b/engines/bbvs/dialogs.h
@@ -67,13 +67,13 @@ protected:
 	BbvsEngine *_vm;
 
 	void init();
-	
+
 	GUI::ButtonWidget *_buttons[5];
-	
+
 	void gotoMenuScreen(int index);
 	bool canContinue();
 	void gotoScene(int sceneNum);
-	
+
 };
 
 }
diff --git a/engines/bbvs/gamemodule.cpp b/engines/bbvs/gamemodule.cpp
index d6343084ab..80f0e81450 100644
--- a/engines/bbvs/gamemodule.cpp
+++ b/engines/bbvs/gamemodule.cpp
@@ -39,11 +39,11 @@ GameModule::~GameModule() {
 
 void GameModule::load(const char *filename) {
 	debug(0, "GameModule::load()");
-	
+
 	unload();
 
 	Common::File fd;
-	
+
 	if (!fd.open(filename))
 		error("GameModule::load() Could not open %s", filename);
 
@@ -68,7 +68,7 @@ void GameModule::load(const char *filename) {
 
 	fd.seek(0x1A8);
 	_buttheadObjectIndex = fd.readUint32LE();
-	
+
 	fd.close();
 
 	debug(0, "GameModule::load() OK");
@@ -177,7 +177,7 @@ int GameModule::getBgSpritePriority(int index) {
 int GameModule::getSceneSoundsCount() {
 	return _sceneSoundsCount;
 }
- 
+
 SceneSound *GameModule::getSceneSound(int index) {
 	assert(index < _sceneSoundsCount);
 	return &_sceneSounds[index];
@@ -257,7 +257,7 @@ void GameModule::unload() {
 
 void GameModule::loadBgSprites(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadBgSprites()");
-	
+
 	s.seek(0x14);
 	_bgSpriteCount = s.readUint32LE();
 	uint32 bgSpriteIndicesOffs = s.readUint32LE();
@@ -275,7 +275,7 @@ void GameModule::loadBgSprites(Common::SeekableReadStream &s) {
 
 void GameModule::loadCameraInits(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadCameraInits()");
-	
+
 	s.seek(0x20);
 	for (int i = 0; i < kCameraInitsCount; ++i) {
 		CameraInit &cameraInit = _cameraInits[i];
@@ -283,13 +283,13 @@ void GameModule::loadCameraInits(Common::SeekableReadStream &s) {
 		for (int j = 0; j < 8; ++j)
 			cameraInit.cameraLinks[j] = s.readByte();
 		for (int j = 0; j < 8; ++j)
-			cameraInit.rects[j] = readRect(s); 
+			cameraInit.rects[j] = readRect(s);
 	}
 }
 
 void GameModule::loadWalkRects(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadWalkRects()");
-	
+
 	s.seek(0x150);
 	_walkRectsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
@@ -301,7 +301,7 @@ void GameModule::loadWalkRects(Common::SeekableReadStream &s) {
 
 void GameModule::loadSceneExits(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadSceneExits()");
-	
+
 	s.seek(0x158);
 	_sceneExitsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
@@ -329,13 +329,13 @@ void GameModule::loadBgObjects(Common::SeekableReadStream &s) {
 
 void GameModule::loadAnimations(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadAnimations()");
-	
+
 	s.seek(0x168);
 	_animationsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
 	_animations = new Animation[_animationsCount];
 	for (int i = 0; i < _animationsCount; ++i) {
-		Animation &anim = _animations[i];		
+		Animation &anim = _animations[i];
 		s.seek(offs + i * 20);
 		anim.frameCount = s.readUint32LE();
 		uint32 frameSpriteIndicesOffs = s.readUint32LE();
@@ -363,7 +363,7 @@ void GameModule::loadAnimations(Common::SeekableReadStream &s) {
 
 void GameModule::loadSceneObjectDefs(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadSceneObjectDefs()");
-	
+
 	s.seek(0x170);
 	_sceneObjectDefsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
@@ -379,7 +379,7 @@ void GameModule::loadSceneObjectDefs(Common::SeekableReadStream &s) {
 
 void GameModule::loadSceneObjectInits(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadSceneObjectInits()");
-	
+
 	s.seek(0x178);
 	_sceneObjectInitsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
@@ -396,7 +396,7 @@ void GameModule::loadSceneObjectInits(Common::SeekableReadStream &s) {
 
 void GameModule::loadActions(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadActions()");
-	
+
 	s.seek(0x180);
 	_actionsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
@@ -427,7 +427,7 @@ void GameModule::loadActions(Common::SeekableReadStream &s) {
 
 void GameModule::loadGuiSpriteIndices(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadGuiSpriteIndices()");
-	
+
 	s.seek(0x188);
 	uint32 offs = s.readUint32LE();
 	s.seek(offs);
@@ -437,7 +437,7 @@ void GameModule::loadGuiSpriteIndices(Common::SeekableReadStream &s) {
 
 void GameModule::loadInventoryItemSpriteIndices(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadInventoryItemSpriteIndices()");
-	
+
 	s.seek(0x18C);
 	uint32 offs = s.readUint32LE();
 	s.seek(offs);
@@ -447,7 +447,7 @@ void GameModule::loadInventoryItemSpriteIndices(Common::SeekableReadStream &s) {
 
 void GameModule::loadInventoryItemInfos(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadInventoryItemInfos()");
-	
+
 	s.seek(0x190);
 	uint32 offs = s.readUint32LE();
 	s.seek(offs);
@@ -462,7 +462,7 @@ void GameModule::loadInventoryItemInfos(Common::SeekableReadStream &s) {
 
 void GameModule::loadDialogItemSpriteIndices(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadDialogItemSpriteIndices()");
-	
+
 	s.seek(0x194);
 	uint32 offs = s.readUint32LE();
 	s.seek(offs);
@@ -473,7 +473,7 @@ void GameModule::loadDialogItemSpriteIndices(Common::SeekableReadStream &s) {
 
 void GameModule::loadSceneSounds(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadSceneSounds()");
-	
+
 	s.seek(0x1A0);
 	_sceneSoundsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
@@ -487,7 +487,7 @@ void GameModule::loadSceneSounds(Common::SeekableReadStream &s) {
 
 void GameModule::loadPreloadSounds(Common::SeekableReadStream &s) {
 	debug(0, "GameModule::loadPreloadSounds()");
-	
+
 	s.seek(0x198);
 	_preloadSoundsCount = s.readUint32LE();
 	uint32 offs = s.readUint32LE();
diff --git a/engines/bbvs/gamemodule.h b/engines/bbvs/gamemodule.h
index 4d4f5b90a1..b31b95dcee 100644
--- a/engines/bbvs/gamemodule.h
+++ b/engines/bbvs/gamemodule.h
@@ -134,29 +134,29 @@ class GameModule {
 public:
 	GameModule();
 	~GameModule();
-	
+
 	void load(const char *filename);
-	
+
 	int getFieldC();
 	int getButtheadObjectIndex();
-	
+
 	int getGuiSpriteIndex(int index);
 	int getInventoryItemSpriteIndex(int index);
 	int getDialogItemSpriteIndex(int index);
-	
+
 	int getActionsCount();
 	Action *getAction(int index);
-	
+
 	InventoryItemInfo *getInventoryItemInfo(int index);
 
 	CameraInit *getCameraInit(int cameraNum);
-	
+
 	int getSceneExitsCount();
 	SceneExit *getSceneExit(int index);
-	
+
 	int getWalkRectsCount();
 	Common::Rect *getWalkRects();
-	
+
 	int getSceneObjectDefsCount();
 	SceneObjectDef *getSceneObjectDef(int index);
 
@@ -170,44 +170,44 @@ public:
 	int getBgSpriteIndex(int index);
 	int getBgSpritePriority(int index);
 
-	int getSceneSoundsCount(); 
+	int getSceneSoundsCount();
 	SceneSound *getSceneSound(int index);
-	uint getSceneSoundIndex(uint soundNum); 
-	
+	uint getSceneSoundIndex(uint soundNum);
+
 	uint getPreloadSoundsCount();
 	uint getPreloadSound(uint index);
 
 	Animation *getAnimation(int index);
-	
+
 protected:
-	
+
 	int _bgSpriteCount;
 	int *_bgSpriteIndices;
 	int16 *_bgSpritePriorities;
-	
+
 	CameraInit _cameraInits[kCameraInitsCount];
-	
+
 	int _walkRectsCount;
 	Common::Rect *_walkRects;
-	
+
 	int _sceneExitsCount;
 	SceneExit *_sceneExits;
-	
+
 	int _bgObjectsCount;
 	BgObject *_bgObjects;
-	
+
 	int _animationsCount;
 	Animation *_animations;
-	
+
 	int _sceneObjectDefsCount;
 	SceneObjectDef *_sceneObjectDefs;
-	
+
 	int _sceneObjectInitsCount;
 	SceneObjectInit *_sceneObjectInits;
 
 	int _actionsCount;
 	Action *_actions;
-	
+
 	int _sceneSoundsCount;
 	SceneSound *_sceneSounds;
 
@@ -218,16 +218,16 @@ protected:
 	int _inventoryItemSpriteIndices[kInventoryItemSpriteCount];
 	InventoryItemInfo _inventoryItemInfos[kInventoryItemCount];
 	int _dialogItemSpriteIndices[kDialogItemSpriteCount];
-	
+
 	int _fieldC;
 	int _buttheadObjectIndex;
 
 	Common::Point readPoint(Common::SeekableReadStream &s);
 	Common::Rect readRect(Common::SeekableReadStream &s);
 	Conditions readConditions(Common::SeekableReadStream &s);
-	
+
 	void unload();
-	
+
 	void loadBgSprites(Common::SeekableReadStream &s);
 	void loadCameraInits(Common::SeekableReadStream &s);
 	void loadWalkRects(Common::SeekableReadStream &s);
@@ -243,7 +243,7 @@ protected:
 	void loadDialogItemSpriteIndices(Common::SeekableReadStream &s);
 	void loadSceneSounds(Common::SeekableReadStream &s);
 	void loadPreloadSounds(Common::SeekableReadStream &s);
-	
+
 };
 
 } // End of namespace Bbvs
diff --git a/engines/bbvs/graphics.cpp b/engines/bbvs/graphics.cpp
index 810d910abf..43840607c8 100644
--- a/engines/bbvs/graphics.cpp
+++ b/engines/bbvs/graphics.cpp
@@ -104,9 +104,9 @@ void Screen::drawSprite(Sprite &sprite, int x, int y) {
 	}
 	if (destX + width >= _surface->w)
 		width = _surface->w - destX;
-	
+
 	debug(0, "drawSprite() (%d, %d, %d, %d); skipX: %d; skipY: %d; %d", destX, destY, width, height, skipX, skipY, sprite.type);
-	
+
 	if (sprite.type == 1) {
 		for (int yc = 0; yc < height; ++yc) {
 			byte *source = sprite.getRow(skipY + yc);
diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp
index f2e42313e3..1984dbb0fd 100644
--- a/engines/bbvs/minigames/bbairguitar.cpp
+++ b/engines/bbvs/minigames/bbairguitar.cpp
@@ -198,12 +198,12 @@ void MinigameBbAirGuitar::buildDrawList1(DrawList &drawList) {
 
 	if (_trackBarX > kTrackBarMaxX)
 		_trackBarX = kTrackBarMaxX;
-	
+
 	_trackBarThumbRect.top = 208;
 	_trackBarThumbRect.bottom = 218;
 	_trackBarThumbRect.left = _trackBarX;
 	_trackBarThumbRect.right = _trackBarX + 6;
-	
+
 	drawList.add(_objects[5].anim->frameIndices[0], _trackBarX, 208, 100);
 
 	if (_playerMode != 0) {
@@ -228,7 +228,7 @@ void MinigameBbAirGuitar::buildDrawList1(DrawList &drawList) {
 			drawList.add(_objects[i].anim->frameIndices[frameIndex], kPointsTbl2[i - 47].x, kPointsTbl2[i - 47].y, 254);
 		}
 	}
-	
+
 	if (_backgroundSpriteIndex > 0)
 		drawList.add(_backgroundSpriteIndex, 0, 0, 0);
 
@@ -394,7 +394,7 @@ void MinigameBbAirGuitar::initObjects1() {
 	_track[0].noteNum = -1;
 	stop();
 	changePatch(0);
-  
+
 }
 
 bool MinigameBbAirGuitar::updateStatus(int mouseX, int mouseY, uint mouseButtons) {
@@ -408,7 +408,7 @@ bool MinigameBbAirGuitar::updateStatus(int mouseX, int mouseY, uint mouseButtons
 }
 
 bool MinigameBbAirGuitar::updateStatus0(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	if (mouseButtons & kAnyButtonDown) {
 		stopSound(1);
 		_rockTunePlaying = false;
@@ -436,14 +436,14 @@ bool MinigameBbAirGuitar::updateStatus0(int mouseX, int mouseY, uint mouseButton
 		}
 
 	}
-  
+
   	return true;
 }
 
 bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	int currTicks = _vm->_system->getMillis();
-	
+
 	if (_playerMode == 1 && _track[_trackIndex].ticks <= currTicks - _noteStartTime) {
 		noteOff(_track[_trackIndex].noteNum);
 		if (_trackIndex < _trackCount && _track[++_trackIndex].noteNum != -1)
@@ -481,17 +481,17 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 	} else {
 		++_vuMeterRight2;
 	}
-	
+
 	if (_resetAnims && _vm->_system->getMillis() - _noteStartTime >= 1000)
 		resetObjs();
-	
+
 	_objects[0].x = mouseX;
 	_objects[0].y = mouseY;
-	
+
 	_trackBarMouseX = CLIP(mouseX, kTrackBarMinX, kTrackBarMaxX);
-	
+
 	bool checkClick = false;
-	
+
 	if (mouseButtons & kAnyButtonClicked) {
 		checkClick = true;
 	} else if (!(mouseButtons & kAnyButtonDown)) {
@@ -506,14 +506,14 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 		}
 	} else if (!_movingTrackBar)
 		checkClick = true;
-		
+
 	if (checkClick) {
 
 		afterButtonReleased();
 		_objects[0].frameIndex = 1;
-	
+
 		if (ptInRect(&kRect2, mouseX, mouseY)) {
-		
+
 			if (_playerMode != 1 && ptInRect(&kPianoRect, mouseX, mouseY)) {
 				for (int i = 0; i <= 12; ++i) {
 					if (ptInPoly(&kPianoKeyAreas[i], mouseX, mouseY)) {
@@ -538,7 +538,7 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 						break;
 					}
 				}
-				
+
 				if (playerButtonNum >= 0) {
 					_currButtonNum = playerButtonNum;
 					_currPlayerButtonRect = &kPlayerButtonRects[playerButtonNum];
@@ -673,12 +673,12 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 			}
 		}
 	}
-	
+
 	if (_buttonClickTicks + 1000 < currTicks)
 		_buttonClickTicks = currTicks;
-	
+
 	int newKind = _buttonClickTicks + 500 < currTicks ? 1 : 0;
-	
+
 	switch (_playerMode) {
 
 	case 1:
@@ -770,20 +770,20 @@ bool MinigameBbAirGuitar::run(bool fromMainGame) {
 	_gameResult = false;
 	_gameDone = false;
 	initObjects();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbairg/bbairg.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	delete _spriteModule;
@@ -803,15 +803,15 @@ void MinigameBbAirGuitar::update() {
 		inputTicks = 1;
 		_gameTicks = _vm->_system->getMillis();
 	}
-	
+
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
 		_gameDone = true;
 		return;
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	bool done;
 
 	do {
@@ -820,9 +820,9 @@ void MinigameBbAirGuitar::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
@@ -1001,7 +1001,7 @@ void MinigameBbAirGuitar::calcTotalTicks1() {
 }
 
 void MinigameBbAirGuitar::noteOn(int noteNum) {
-	
+
 	if (_currNoteNum != -2) {
 		if (noteNum == _currNoteNum)
 			return;
@@ -1087,7 +1087,7 @@ void MinigameBbAirGuitar::noteOn(int noteNum) {
 }
 
 void MinigameBbAirGuitar::noteOff(int noteNum) {
-	
+
 	if (_currNoteNum != noteNum)
 		return;
 
diff --git a/engines/bbvs/minigames/bbairguitar.h b/engines/bbvs/minigames/bbairguitar.h
index d4fd6ec30c..40b8a50a03 100644
--- a/engines/bbvs/minigames/bbairguitar.h
+++ b/engines/bbvs/minigames/bbairguitar.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbAirGuitar(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y;
@@ -44,24 +44,24 @@ public:
 		int16 frameIndexAdd;
 		int16 unk2;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256,
 		kMaxTracks = 2049
 	};
-	
+
 	struct PianoKeyInfo {
 		int x, y;
 		int frameIndex;
 	};
-	
+
 	struct TrackEvt {
 		int8 noteNum;
 		int16 ticks;
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _playerMode;
 
 	bool _modified;
@@ -82,24 +82,24 @@ public:
 
 	int *_currFrameIndex;
 	int _btn3KindToggle;
-	
+
 	const BBPolygon *_currPianoKeyArea;
 	const Rect *_currPlayerButtonRect;
-	
+
 	bool _movingTrackBar;
 	int _trackBarMouseX;
 	int _trackBarX;
 	Rect _trackBarThumbRect;
-	
+
 	int _currTrackPos, _totalTrackLength;
 	int _ticksDelta;
-	
+
 	int _actionStartTrackPos, _actionTrackPos;
 	int _actionStartTime;
 
 	int _currNoteNum;
 	int _currPatchNum;
-	
+
 	const ObjAnimation *getAnimation(int animIndex);
 	bool ptInRect(const Rect *r, int x, int y);
 	bool ptInPoly(const BBPolygon *poly, int x, int y);
@@ -109,14 +109,14 @@ public:
 	void buildDrawList1(DrawList &drawList);
 
 	void drawSprites();
-	
+
 	void initObjs();
 	Obj *getFreeObject();
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
@@ -124,7 +124,7 @@ public:
 	void updateObjs();
 
 	void update();
-	
+
 	void play();
 	void record();
 	void setPlayerMode3();
@@ -136,9 +136,9 @@ public:
 	void noteOn(int noteNum);
 	void noteOff(int noteNum);
 	void resetObjs();
-	
+
 	void loadSounds();
-	void playNote(int noteNum);	
+	void playNote(int noteNum);
 	void stopNote(int noteNum);
 
 };
diff --git a/engines/bbvs/minigames/bbant.cpp b/engines/bbvs/minigames/bbant.cpp
index 9786682ada..3678934345 100644
--- a/engines/bbvs/minigames/bbant.cpp
+++ b/engines/bbvs/minigames/bbant.cpp
@@ -94,7 +94,7 @@ void MinigameBbAnt::buildDrawList1(DrawList &drawList) {
 	drawNumber(drawList, _score, 68, 16);
 	drawList.add(getAnimation(166)->frameIndices[0], 230, 2, 2000);
 	drawNumber(drawList, _levelTimeLeft, 280, 16);
-	
+
 	for (int i = 0; i < _stompCount; ++i)
 		drawList.add(getAnimation(130)->frameIndices[0], 20 + i * 30, 230, 2000);
 
@@ -116,7 +116,7 @@ void MinigameBbAnt::buildDrawList3(DrawList &drawList) {
 	drawNumber(drawList, _hiScore, 208, 107);
 }
 
-void MinigameBbAnt::drawMagnifyingGlass(DrawList &drawList) {	
+void MinigameBbAnt::drawMagnifyingGlass(DrawList &drawList) {
 	scale2x(_objects[0].x - 28, _objects[0].y - 27);
 	drawList.clear();
 	drawList.add(_objects[0].anim->frameIndices[0], _objects[0].x, _objects[0].y, _objects[0].priority);
@@ -358,7 +358,7 @@ bool MinigameBbAnt::updateStatus0(int mouseX, int mouseY, uint mouseButtons) {
 		_objects[0].x = 0;
 	if (_objects[0].y < 0)
 		_objects[0].y = 0;
-	
+
 	if ((mouseButtons & kLeftButtonDown) || (mouseButtons & kRightButtonDown)) {
 		_gameState = 1;
 		initObjects();
@@ -447,7 +447,7 @@ bool MinigameBbAnt::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
 		int maxKindCount = 0, objKind = 0;
 
 		_stompCounter2 = _stompCounter1;
-		
+
 		for (int i = 0; i < 4; ++i)
 			testTbl[i] = _vm->getRandom(_bugsChanceByKind[i] - _bugsCountByKind[i]);
 
@@ -471,7 +471,7 @@ bool MinigameBbAnt::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
 		if (_stompCounter1 > 20)
 			--_stompCounter1;
 	}
-	
+
 	return true;
 }
 
@@ -701,7 +701,7 @@ void MinigameBbAnt::updateBugObjAnim(int objIndex) {
 
 void MinigameBbAnt::updateObjAnim2(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->animIndexIncr += _vm->getRandom(3) - 1;
 	if (obj->animIndexIncr < 0)
 		obj->animIndexIncr = 7;
@@ -736,7 +736,7 @@ bool MinigameBbAnt::isBugOutOfScreen(int objIndex) {
 
 void MinigameBbAnt::updateObjAnim3(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->animIndexIncr += _vm->getRandom(3) - 1;
 	if (obj->animIndexIncr < 0)
 		obj->animIndexIncr = 7;
@@ -752,7 +752,7 @@ void MinigameBbAnt::updateBugObj1(int objIndex) {
 	Obj *obj = &_objects[objIndex];
 	bool flag1 = false;
 	bool flag2 = false;
-	
+
 	if (--obj->ticks == 0) {
 		++obj->frameIndex;
 		if (obj->anim->frameCount == obj->frameIndex) {
@@ -911,7 +911,7 @@ void MinigameBbAnt::updateStompObj(int objIndex) {
 
 void MinigameBbAnt::updateSmokeObj(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->x += obj->xIncr;
 	obj->y += obj->yIncr;
 
@@ -1047,7 +1047,7 @@ bool MinigameBbAnt::isMagGlassAtBug(int objIndex) {
 	Obj *obj = &_objects[objIndex];
 	Obj *obj0 = &_objects[0];
 	bool result = false;
-	
+
 	if (obj->kind >= 1 && obj->kind <= 5) {
 		const BBRect &frameRect1 = obj0->anim->frameRects[0];
 		const int obj1X1 = obj0->x + frameRect1.x;
@@ -1102,7 +1102,7 @@ bool MinigameBbAnt::testObj5(int objIndex) {
 }
 
 void MinigameBbAnt::updateObjs(uint mouseButtons) {
-	
+
 	for (int i = 12; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 
@@ -1162,7 +1162,7 @@ void MinigameBbAnt::updateObjs(uint mouseButtons) {
 			}
 
 		}
-		
+
 	}
 
 }
@@ -1170,9 +1170,9 @@ void MinigameBbAnt::updateObjs(uint mouseButtons) {
 bool MinigameBbAnt::run(bool fromMainGame) {
 
 	memset(_objects, 0, sizeof(_objects));
-	
+
 	_numbersAnim = getAnimation(167);
-	
+
 	_backgroundSpriteIndex = 303;
 	_titleScreenSpriteIndex = 304;
 
@@ -1187,23 +1187,23 @@ bool MinigameBbAnt::run(bool fromMainGame) {
 	_gameDone = false;
 	initObjects();
 	initVars();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbant/bbant.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
 
 	_gameTicks = 0;
 	playSound(12, true);
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	if (!_fromMainGame)
@@ -1243,19 +1243,19 @@ void MinigameBbAnt::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
 
 void MinigameBbAnt::scale2x(int x, int y) {
-	Graphics::Surface *surface = _vm->_screen->_surface; 
-	
+	Graphics::Surface *surface = _vm->_screen->_surface;
+
 	int srcX = x + 14, srcY = y + 14;
 	int srcW = kScaleDim, srcH = kScaleDim;
-	
+
 	if (srcX < 0) {
 		srcW += srcX;
 		srcX = 0;
@@ -1265,21 +1265,21 @@ void MinigameBbAnt::scale2x(int x, int y) {
 		srcH += srcY;
 		srcY = 0;
 	}
-	
+
 	if (srcX + srcW >= 320)
 		srcW = 320 - srcX - 1;
-	
+
 	if (srcY + srcH >= 240)
 		srcH = 240 - srcY - 1;
-	
+
 	for (int yc = 0; yc < srcH; ++yc) {
 		byte *src = (byte*)surface->getBasePtr(srcX, srcY + yc);
 		memcpy(&_scaleBuf[yc * kScaleDim], src, srcW);
 	}
-	
+
 	int dstX = x, dstY = y;
 	int dstW = 2 * kScaleDim, dstH = 2 * kScaleDim;
-	
+
 	if (dstX < 0) {
 		dstW += dstX;
 		dstX = 0;
@@ -1289,15 +1289,15 @@ void MinigameBbAnt::scale2x(int x, int y) {
 		dstH += dstY;
 		dstY = 0;
 	}
-	
+
 	if (dstX + dstW >= 320)
 		dstW = 320 - dstX - 1;
-	
+
 	if (dstY + dstH >= 240)
 		dstH = 240 - dstY - 1;
-	
+
 	int w = MIN(srcW * 2, dstW), h = MIN(srcH * 2, dstH);
-	
+
 	for (int yc = 0; yc < h; ++yc) {
 		byte *src = _scaleBuf + kScaleDim * (yc / 2);
 		byte *dst = (byte*)surface->getBasePtr(dstX, dstY + yc);
diff --git a/engines/bbvs/minigames/bbant.h b/engines/bbvs/minigames/bbant.h
index be2afe688d..88b4af9c71 100644
--- a/engines/bbvs/minigames/bbant.h
+++ b/engines/bbvs/minigames/bbant.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbAnt(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y, priority;
@@ -55,21 +55,21 @@ public:
 		int status2;
 		int flag;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256,
 		kScaleDim = 28
 	};
-	
+
 	struct ObjInit {
 		const ObjAnimation *anim1;
 		const ObjAnimation *anim2;
 		const ObjAnimation *anim3;
 		int x, y;
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _score, _hiScore;
 
 	int _totalBugsCount;
@@ -96,37 +96,37 @@ public:
 	int _countdown6;
 	int _countdown5;
 	int _countdown7;
-	
+
 	byte _scaleBuf[kScaleDim * kScaleDim];
 
 	const ObjAnimation *getAnimation(int animIndex);
 	const ObjInit *getObjInit(int index);
 	const ObjAnimation * const *getObjKindAnimTable(int kind);
 	const ObjAnimation *getObjAnim(int index);
-	
+
 	void buildDrawList0(DrawList &drawList);
 	void buildDrawList1(DrawList &drawList);
 	void buildDrawList2(DrawList &drawList);
 	void buildDrawList3(DrawList &drawList);
 	void drawMagnifyingGlass(DrawList &drawList);
-	
+
 	void drawSprites();
 	void drawSprites0();
 	void drawSprites1();
 	void drawSprites2();
 	void drawSprites3();
-	
+
 	Obj *getFreeObject();
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
-	
+
 	void initVars();
 	void initVars1();
 	void initVars2();
 	void initVars3();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
@@ -161,7 +161,7 @@ public:
 	void updateObjs(uint mouseButtons);
 
 	void update();
-	
+
 	void scale2x(int x, int y);
 
 	void loadSounds();
diff --git a/engines/bbvs/minigames/bbloogie.cpp b/engines/bbvs/minigames/bbloogie.cpp
index 4601e9ff93..68a3147f9a 100644
--- a/engines/bbvs/minigames/bbloogie.cpp
+++ b/engines/bbvs/minigames/bbloogie.cpp
@@ -117,7 +117,7 @@ void MinigameBbLoogie::buildDrawList0(DrawList &drawList) {
 }
 
 void MinigameBbLoogie::buildDrawList1(DrawList &drawList) {
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		switch (obj->kind) {
@@ -163,7 +163,7 @@ void MinigameBbLoogie::buildDrawList1(DrawList &drawList) {
 }
 
 void MinigameBbLoogie::buildDrawList2(DrawList &drawList) {
-	
+
 	buildDrawList1(drawList);
 
 	if (_level > 0 && (_bonusDisplayDelay1 > 0 || _bonusDisplayDelay2 > 0)) {
@@ -180,7 +180,7 @@ void MinigameBbLoogie::buildDrawList2(DrawList &drawList) {
 }
 
 void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 2)
@@ -191,7 +191,7 @@ void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
 
 	if (_backgroundSpriteIndex)
 		drawList.add(_backgroundSpriteIndex, 0, 0, 0);
-		
+
 	drawList.add(getAnimation(10)->frameIndices[0], 230, 2, 2000);
 
 	drawNumber(drawList, _levelTimeLeft, 280, 16);
@@ -201,7 +201,7 @@ void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
 	int numberX2 = drawNumber(drawList, _currScore, 68, 16);
 	drawList.add(getAnimation(9)->frameIndices[10], numberX2, 16, 2000);
 	drawNumber(drawList, _dispLevelScore, numberX2 + 10, 16);
-	
+
 	drawList.add(getAnimation(20)->frameIndices[0], 120, 70, 2000);
 	drawList.add(getAnimation(13)->frameIndices[0], 95, 95, 2000);
 
@@ -416,7 +416,7 @@ bool MinigameBbLoogie::updateStatus(int mouseX, int mouseY, uint mouseButtons) {
 }
 
 bool MinigameBbLoogie::updateStatus0(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	_objects[0].x = mouseX;
 	_objects[0].y = mouseY;
 
@@ -445,7 +445,7 @@ bool MinigameBbLoogie::updateStatus0(int mouseX, int mouseY, uint mouseButtons)
 		_objects[4].kind = 0;
 		_objects[2].kind = 1;
 	}
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 11) {
@@ -487,12 +487,12 @@ bool MinigameBbLoogie::updateStatus0(int mouseX, int mouseY, uint mouseButtons)
 		initVars();
 		_gameTicks = 0;
 	}
-	
+
 	return true;
 }
 
 bool MinigameBbLoogie::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	if (--_levelTimeDelay == 0) {
 		_levelTimeDelay = 58;
 		--_levelTimeLeft;
@@ -568,9 +568,9 @@ bool MinigameBbLoogie::updateStatus2(int mouseX, int mouseY, uint mouseButtons)
 }
 
 bool MinigameBbLoogie::updateStatus3(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	_objects[0].x = mouseX;
-		
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 2) {
@@ -582,7 +582,7 @@ bool MinigameBbLoogie::updateStatus3(int mouseX, int mouseY, uint mouseButtons)
 			}
 		}
 	}
-	
+
 	return true;
 }
 
@@ -620,7 +620,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 			break;
 		}
 	}
-	
+
 	if (--_carDelay == 0) {
 		// Car
 		Obj *obj = getFreeObject();
@@ -633,7 +633,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		obj->yIncr = 0;
 		_carDelay = _vm->getRandom(256) + 800;
 	}
-	
+
 	if (--_bikeDelay == 0) {
 		// Bike
 		Obj *obj = getFreeObject();
@@ -646,7 +646,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		obj->yIncr = 0;
 		_bikeDelay = _vm->getRandom(512) + 500;
 	}
-  
+
 	if (--_squirrelDelay == 0) {
 		// Squirrel
 		Obj *obj = getFreeObject();
@@ -662,7 +662,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 			playSound(9);
 		_squirrelDelay = _vm->getRandom(512) + 300;
 	}
-	
+
 	if (--_paperPlaneDelay == 0) {
 		// Paper plane
 		Obj *obj = getFreeObject();
@@ -685,7 +685,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		}
 		_paperPlaneDelay = 400;
 	}
-	
+
 	if (_principalDelay >= 0 && --_principalDelay == 0) {
 		// Principal
 		Obj *obj = getFreeObject();
@@ -703,13 +703,13 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		_principalFirstFrameIndex = 11;
 		_principalLastFrameIndex = 16;
 	}
-	
+
 }
 
 void MinigameBbLoogie::updatePlayer(int objIndex, uint mouseButtons) {
 
 	Obj *obj = &_objects[0];
-	
+
 	switch (obj->status) {
 
 	case 1:
@@ -817,7 +817,7 @@ void MinigameBbLoogie::updateLoogie(int objIndex) {
 		obj->y -= kLoogieOffY[obj->unk2 / 8];
 		--obj->unk2;
 	}
-	
+
 	if (obj->ticks-- == 0) {
 		obj->ticks = getAnimation(5)->frameTicks[0];
 		++obj->frameIndex;
@@ -832,9 +832,9 @@ void MinigameBbLoogie::updateLoogie(int objIndex) {
 
 void MinigameBbLoogie::updateCar(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->x += obj->xIncr;
-	
+
 	if (obj->ticks-- == 0) {
 		if (obj->frameIndex++ == 3 || obj->frameIndex == 6)
 			obj->frameIndex = 0;
@@ -867,7 +867,7 @@ void MinigameBbLoogie::updateCar(int objIndex) {
 
 void MinigameBbLoogie::updateBike(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->x += obj->xIncr;
 
 	if (obj->ticks-- == 0) {
@@ -965,7 +965,7 @@ void MinigameBbLoogie::updatePaperPlane(int objIndex) {
 			loogieObj = findLoogieObj(loogieObjIndex++);
 		}
 	}
-	
+
 }
 
 void MinigameBbLoogie::updateIndicator(int objIndex) {
@@ -995,7 +995,7 @@ void MinigameBbLoogie::updateIndicator(int objIndex) {
 		obj->kind = 0;
 		obj->anim = getAnimation(6);
 	}
-	
+
 }
 
 void MinigameBbLoogie::updatePrincipal(int objIndex) {
@@ -1281,22 +1281,22 @@ bool MinigameBbLoogie::run(bool fromMainGame) {
 	_gameDone = false;
 	initObjects();
 	initVars();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbloogie/bbloogie.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
 
 	playSound(32, true);
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	if (!_fromMainGame)
@@ -1319,15 +1319,15 @@ void MinigameBbLoogie::update() {
 		inputTicks = 1;
 		_gameTicks = _vm->_system->getMillis();
 	}
-	
+
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
 		_gameDone = true;
 		return;
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	bool done;
 
 	do {
@@ -1336,9 +1336,9 @@ void MinigameBbLoogie::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
diff --git a/engines/bbvs/minigames/bbloogie.h b/engines/bbvs/minigames/bbloogie.h
index 1dd4049b41..04ead51a1e 100644
--- a/engines/bbvs/minigames/bbloogie.h
+++ b/engines/bbvs/minigames/bbloogie.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbLoogie(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y;
@@ -44,33 +44,33 @@ public:
 		int16 frameIndexAdd;
 		int16 unk2;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256
 	};
-	
+
 	enum {
 		kGSTitleScreen		= 0,	// Title screen
 		kGSMainGame			= 1,	// Game when called as part of the main game
 		kGSStandaloneGame	= 2,	// Game when called as standalone game
 		kGSScoreCountUp		= 3		// Score countup and next level text
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _playerKind;
 	const ObjAnimation *_playerAnim;
 	const uint *_playerSounds1, *_playerSounds2;
 	uint _playerSounds1Count, _playerSounds2Count;
-	
+
 	int _level, _levelTimeLeft, _levelTimeDelay;
-	int _numberOfHits, _currScore, _hiScore; 
+	int _numberOfHits, _currScore, _hiScore;
 	int _doubleScore, _megaLoogieCount;
-	
+
 	int _dispLevelScore, _nextLevelScore;
 
 	int _timeBonusCtr, _bonusDisplayDelay1, _bonusDisplayDelay2, _bonusDisplayDelay3;
-	
+
 	int _carDelay;
 	int _bikeDelay;
 	int _squirrelDelay;
@@ -78,37 +78,37 @@ public:
 	int _paperPlaneDelay;
 	int _principalDelay;
 
-	int _prevPrincipalStatus;	
+	int _prevPrincipalStatus;
 	int _principalCtr, _principalFirstFrameIndex, _principalLastFrameIndex;
 	bool _principalAngry;
-	
+
 	const ObjAnimation *getAnimation(int animIndex);
-	
+
 	void buildDrawList(DrawList &drawList);
 	void buildDrawList0(DrawList &drawList);
 	void buildDrawList1(DrawList &drawList);
 	void buildDrawList2(DrawList &drawList);
 	void buildDrawList3(DrawList &drawList);
-	
+
 	void drawSprites();
-	
+
 	void initObjs();
 	Obj *getFreeObject();
 	Obj *findLoogieObj(int startObjIndex);
 	bool isHit(Obj *obj1, Obj *obj2);
 	bool isCursorAtObj(int objIndex);
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
 	void initObjects3();
-	
+
 	void initVars();
 	void initVars0();
 	void initVars1();
 	void initVars2();
 	void initVars3();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
@@ -129,7 +129,7 @@ public:
 	void incNumberOfHits();
 	void incScore(int incrAmount);
 	void playRndSound();
-	
+
 	void update();
 
 	void loadSounds();
diff --git a/engines/bbvs/minigames/bbtennis.cpp b/engines/bbvs/minigames/bbtennis.cpp
index ddd5cfc804..7763548330 100644
--- a/engines/bbvs/minigames/bbtennis.cpp
+++ b/engines/bbvs/minigames/bbtennis.cpp
@@ -86,7 +86,7 @@ void MinigameBbTennis::buildDrawList(DrawList &drawList) {
 }
 
 void MinigameBbTennis::buildDrawList0(DrawList &drawList) {
-	
+
 	drawList.add(_objects[0].anim->frameIndices[_objects[0].frameIndex], _objects[0].x, _objects[0].y, 2000);
 
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
@@ -154,7 +154,7 @@ void MinigameBbTennis::buildDrawList1(DrawList &drawList) {
 				break;
 
 			}
-			
+
 			drawList.add(index, x, y, priority);
 
 		}
@@ -174,16 +174,16 @@ void MinigameBbTennis::buildDrawList1(DrawList &drawList) {
 	drawList.add(getAnimation(9)->frameIndices[0], 256, 52, 500);
 	drawList.add(getAnimation(10)->frameIndices[0], 60, 162, 500);
 	drawList.add(getAnimation(21)->frameIndices[0], 36, 18, 2000);
-	
+
 	drawNumber(drawList, _score, 70, 18);
-	
+
 	for (int i = 0; i < _numHearts; ++i)
 		drawList.add(getAnimation(7)->frameIndices[0], 20 + i * 20, 236, 990);
 
 }
 
 void MinigameBbTennis::buildDrawList2(DrawList &drawList) {
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind)
@@ -384,7 +384,7 @@ bool MinigameBbTennis::updateStatus1(int mouseX, int mouseY, uint mouseButtons)
 
 	_objects[0].x = mouseX;
 	_objects[0].y = mouseY;
-	
+
 	if (_allHeartsGone) {
 		_gameState = 2;
 		initObjects();
@@ -427,13 +427,13 @@ bool MinigameBbTennis::updateStatus1(int mouseX, int mouseY, uint mouseButtons)
 
 	if (_newBallTimer > 0)
 		--_newBallTimer;
-	
+
 	if (++_delayDecreaseTimer == 30) {
 		_delayDecreaseTimer = 0;
 		if (_playerDecrease < 199)
 			++_playerDecrease;
 	}
-	
+
 	updateObjs();
 
 	if (!_playedThisIsTheCoolest && _score > 3 && _vm->getRandom(10) == 1 && !isAnySoundPlaying(kAllSounds, 11)) {
@@ -482,7 +482,7 @@ void MinigameBbTennis::updateObjs() {
 			break;
 		}
 	}
-	
+
 	if (_rapidFireBallsCount == 0) {
 		--_squirrelDelay;
 		if (--_squirrelDelay == 0) {
@@ -763,7 +763,7 @@ void MinigameBbTennis::updateTennisPlayer(int objIndex) {
 		}
 		++_tennisPlayerDelay;
 		break;
-	
+
 	case 2:
 		if (--obj->ticks == 0) {
 			++obj->frameIndex;
@@ -1077,7 +1077,7 @@ void MinigameBbTennis::updateNetPlayer(int objIndex) {
 
 void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	if (--obj->ticks == 0) {
 		--obj->frameIndex;
 		obj->ticks = getAnimation(6)->frameTicks[obj->frameIndex];
@@ -1103,7 +1103,7 @@ void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
 	obj->x = (int)obj->fltX;
 	obj->fltY = obj->fltY - obj->fltStepY;
 	obj->y = (int)obj->fltY;
-	
+
 }
 
 void MinigameBbTennis::makeEnemyBall(int x, int y, int frameIndex) {
@@ -1184,7 +1184,7 @@ void MinigameBbTennis::hitSomething() {
 bool MinigameBbTennis::run(bool fromMainGame) {
 
 	memset(_objects, 0, sizeof(_objects));
-	
+
 	_numbersAnim = getAnimation(20);
 
 	_backgroundSpriteIndex = 272;
@@ -1201,23 +1201,23 @@ bool MinigameBbTennis::run(bool fromMainGame) {
 	_gameDone = false;
 	initObjects();
 	initVars();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbtennis/bbtennis.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
 
 	_gameTicks = 0;
 	playSound(29, true);
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	if (!_fromMainGame)
@@ -1240,15 +1240,15 @@ void MinigameBbTennis::update() {
 		inputTicks = 1;
 		_gameTicks = _vm->_system->getMillis();
 	}
-	
+
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
 		_gameDone = true;
 		return;
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	bool done;
 
 	do {
@@ -1257,9 +1257,9 @@ void MinigameBbTennis::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
diff --git a/engines/bbvs/minigames/bbtennis.h b/engines/bbvs/minigames/bbtennis.h
index 690bd724a0..7eac904c4d 100644
--- a/engines/bbvs/minigames/bbtennis.h
+++ b/engines/bbvs/minigames/bbtennis.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbTennis(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y;
@@ -51,20 +51,20 @@ public:
 		int ballStepCtr;
 		int netPlayDirection;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256
 	};
-	
+
 	enum {
 		kGSTitleScreen      = 0,    // Title screen
 		kGSMainGame         = 1,    // Game when called as part of the main game
 		kGSStandaloneGame   = 2,    // Game when called as standalone game
 		kGSScoreCountUp     = 3     // Score countup and next level text
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _numHearts;
 	int _squirrelDelay;
 	int _tennisPlayerDelay;
@@ -85,29 +85,29 @@ public:
 	bool _endSoundPlaying;
 
 	const ObjAnimation *getAnimation(int animIndex);
-	
+
 	void buildDrawList(DrawList &drawList);
 	void buildDrawList0(DrawList &drawList);
 	void buildDrawList1(DrawList &drawList);
 	void buildDrawList2(DrawList &drawList);
-	
+
 	void drawSprites();
-	
+
 	void initObjs();
 	Obj *getFreeObject();
 	Obj *findTennisBall(int startObjIndex);
 	bool isHit(Obj *obj1, Obj *obj2);
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
 	void initObjects2();
-	
+
 	void initVars();
 	void initVars0();
 	void initVars1();
 	void initVars2();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
diff --git a/engines/bbvs/minigames/minigame.cpp b/engines/bbvs/minigames/minigame.cpp
index aae18072d9..58d98a9df8 100644
--- a/engines/bbvs/minigames/minigame.cpp
+++ b/engines/bbvs/minigames/minigame.cpp
@@ -44,13 +44,13 @@ Minigame::~Minigame() {
 
 int Minigame::drawNumber(DrawList &drawList, int number, int x, int y) {
 	int digits = 1, rightX = x;
-	
+
 	for (int mag = 10; number / mag != 0; mag *= 10)
 		++digits;
-		
+
 	rightX = x + digits * 10;
 	x = rightX;
-	
+
 	while (digits--) {
 		const int n = number % 10;
 		x -= 10;
diff --git a/engines/bbvs/minigames/minigame.h b/engines/bbvs/minigames/minigame.h
index 675dec360d..1c24110519 100644
--- a/engines/bbvs/minigames/minigame.h
+++ b/engines/bbvs/minigames/minigame.h
@@ -51,30 +51,30 @@ public:
 	virtual ~Minigame();
 	virtual bool run(bool fromMainGame) = 0;
 protected:
-	BbvsEngine *_vm;	
+	BbvsEngine *_vm;
 	SpriteModule *_spriteModule;
-	
+
 	int _gameState;
 	int _gameTicks;
 	bool _gameResult;
 	bool _gameDone;
 	bool _fromMainGame;
 	int _hiScoreTable[kMinigameCount];
-	
+
 	int _backgroundSpriteIndex, _titleScreenSpriteIndex;
-	
+
 	const ObjAnimation *_numbersAnim;
-	
+
 	int drawNumber(DrawList &drawList, int number, int x, int y);
 
 	void playSound(uint index, bool loop = false);
 	void stopSound(uint index);
 	bool isSoundPlaying(uint index);
 	bool isAnySoundPlaying(const uint *indices, uint count);
-	
+
 	void saveHiscore(int minigameNum, int score);
 	int loadHiscore(int minigameNum);
-	
+
 };
 
 } // End of namespace Bbvs
diff --git a/engines/bbvs/saveload.cpp b/engines/bbvs/saveload.cpp
index ff53cc457b..e7725713fd 100644
--- a/engines/bbvs/saveload.cpp
+++ b/engines/bbvs/saveload.cpp
@@ -73,7 +73,7 @@ void BbvsEngine::savegame(const char *filename, const char *description) {
 	byte descriptionLen = strlen(description);
 	out->writeByte(descriptionLen);
 	out->write(description, descriptionLen);
-	
+
 	Graphics::saveThumbnail(*out);
 
 	// Not used yet, reserved for future usage
@@ -86,7 +86,7 @@ void BbvsEngine::savegame(const char *filename, const char *description) {
 	out->writeUint32LE(saveTime);
 	out->writeUint32LE(playTime);
 	// Header end
-	
+
 	out->write(_snapshot, _snapshotStream->pos());
 
 	out->finalize();
@@ -103,15 +103,15 @@ void BbvsEngine::loadgame(const char *filename) {
 	SaveHeader header;
 
 	kReadSaveHeaderError errorCode = readSaveHeader(in, false, header);
-	
+
 	if (errorCode != kRSHENoError) {
 		warning("Error loading savegame '%s'", filename);
 		delete in;
 		return;
 	}
-	
+
 	g_engine->setTotalPlayTime(header.playTime * 1000);
-	
+
 	memset(_sceneObjects, 0, sizeof(_sceneObjects));
 	for (int i = 0; i < kSceneObjectsCount; ++i) {
 		_sceneObjects[i].walkDestPt.x = -1;
@@ -120,7 +120,7 @@ void BbvsEngine::loadgame(const char *filename) {
 
 	_currSceneNum = 0;
 	_newSceneNum = in->readUint32LE();
-	
+
 	initScene(false);
 
 	_prevSceneNum = in->readUint32LE();
@@ -157,16 +157,16 @@ void BbvsEngine::loadgame(const char *filename) {
 		obj->frameIndex = in->readUint32LE();
 		obj->frameTicks = in->readUint32LE();
 		obj->walkCount = in->readUint32LE();
-		obj->xIncr = in->readUint32LE(); 
+		obj->xIncr = in->readUint32LE();
 		obj->yIncr = in->readUint32LE();
-		obj->turnValue = in->readUint32LE(); 
-		obj->turnCount = in->readUint32LE(); 
+		obj->turnValue = in->readUint32LE();
+		obj->turnCount = in->readUint32LE();
 		obj->turnTicks = in->readUint32LE();
 		obj->walkDestPt.x = in->readUint16LE();
 		obj->walkDestPt.y = in->readUint16LE();
 		obj->anim = obj->animIndex > 0 ? _gameModule->getAnimation(obj->animIndex) : 0;
 	}
-	
+
 	updateWalkableRects();
 
 	// Restart scene background sounds
@@ -259,10 +259,10 @@ void BbvsEngine::saveSnapshot() {
 		_snapshotStream->writeUint32LE(obj->frameIndex);
 		_snapshotStream->writeUint32LE(obj->frameTicks);
 		_snapshotStream->writeUint32LE(obj->walkCount);
-		_snapshotStream->writeUint32LE(obj->xIncr); 
+		_snapshotStream->writeUint32LE(obj->xIncr);
 		_snapshotStream->writeUint32LE(obj->yIncr);
-		_snapshotStream->writeUint32LE(obj->turnValue); 
-		_snapshotStream->writeUint32LE(obj->turnCount); 
+		_snapshotStream->writeUint32LE(obj->turnValue);
+		_snapshotStream->writeUint32LE(obj->turnCount);
 		_snapshotStream->writeUint32LE(obj->turnTicks);
 		_snapshotStream->writeUint16LE(obj->walkDestPt.x);
 		_snapshotStream->writeUint16LE(obj->walkDestPt.y);
diff --git a/engines/bbvs/scene.cpp b/engines/bbvs/scene.cpp
index 0d86eb4dbc..a89c88fd82 100644
--- a/engines/bbvs/scene.cpp
+++ b/engines/bbvs/scene.cpp
@@ -34,7 +34,7 @@ static const int kAfterVideoSceneNum[] = {
 
 void BbvsEngine::loadScene(int sceneNum) {
 	debug(0, "BbvsEngine::loadScene() sceneNum: %d", sceneNum);
-	
+
 	Common::String sprFilename = Common::String::format("vnm/vspr%04d.vnm", sceneNum);
 	Common::String gamFilename = Common::String::format("vnm/game%04d.vnm", sceneNum);
 
@@ -42,7 +42,7 @@ void BbvsEngine::loadScene(int sceneNum) {
 
 	_spriteModule->load(sprFilename.c_str());
 	_gameModule->load(gamFilename.c_str());
-	
+
 	Palette palette = _spriteModule->getPalette();
 	_screen->setPalette(palette);
 
@@ -106,10 +106,10 @@ void BbvsEngine::initScene(bool sounds) {
 	loadScene(_newSceneNum);
 	_currSceneNum = _newSceneNum;
 	_newSceneNum = 0;
-	
+
 	for (int i = 0; i < _gameModule->getSceneObjectDefsCount(); ++i)
 		_sceneObjects[i].sceneObjectDef = _gameModule->getSceneObjectDef(i);
-		
+
 	for (int i = 0; i < _gameModule->getSceneObjectInitsCount(); ++i) {
 		SceneObjectInit *soInit = _gameModule->getSceneObjectInit(i);
 		if (evalCondition(soInit->conditions)) {
@@ -149,10 +149,10 @@ void BbvsEngine::initScene(bool sounds) {
 			}
 		}
 	}
-	
+
 	_cameraPos = _gameModule->getCameraInit(_currCameraNum)->cameraPos;
 	_newCameraPos = _cameraPos;
-	
+
 	_walkAreaActions.clear();
 	for (int i = 0; i < _gameModule->getActionsCount(); ++i) {
 		Action *action = _gameModule->getAction(i);
@@ -165,7 +165,7 @@ void BbvsEngine::initScene(bool sounds) {
 
 	_activeItemIndex = 0;
 	_activeItemType = kITEmpty;
-	
+
 	for (int i = 0; i < _gameModule->getActionsCount(); ++i) {
 		Action *action = _gameModule->getAction(i);
 		if (evalCondition(action->conditions)) {
@@ -183,7 +183,7 @@ void BbvsEngine::initScene(bool sounds) {
 			break;
 		}
 	}
-	
+
 	if (sounds)
 		updateBackgroundSounds();
 
@@ -192,7 +192,7 @@ void BbvsEngine::initScene(bool sounds) {
 bool BbvsEngine::changeScene() {
 
 	writeContinueSavegame();
-	
+
 	if (_newSceneNum >= 27 && _newSceneNum <= 30) {
 		// Run minigames
 		stopSpeech();
@@ -221,7 +221,7 @@ bool BbvsEngine::changeScene() {
 	}
 
 	return true;
-	
+
 }
 
 } // End of namespace Bbvs
diff --git a/engines/bbvs/spritemodule.cpp b/engines/bbvs/spritemodule.cpp
index 8eae7f9a6a..f8b0d9afd5 100644
--- a/engines/bbvs/spritemodule.cpp
+++ b/engines/bbvs/spritemodule.cpp
@@ -41,15 +41,15 @@ SpriteModule::~SpriteModule() {
 
 void SpriteModule::load(const char *filename) {
 	unload();
-	
+
 	Common::File fd;
 	if (!fd.open(filename))
 		error("SpriteModule::load() Could not open %s", filename);
-		
+
 	fd.readUint32LE(); // Skip magic
 	fd.readUint32LE(); // Skip unused
 	fd.readUint32LE(); // Skip filesize
-	
+
 	_paletteOffs = fd.readUint32LE();
 	fd.readUint32LE(); // Skip unused flagsTbl1Ofs
 	fd.readUint32LE(); // Skip unused flagsTbl2Ofs
@@ -57,18 +57,18 @@ void SpriteModule::load(const char *filename) {
 	_paletteStart = fd.readUint32LE();
 	_paletteCount = fd.readUint32LE();
 	_spritesCount = fd.readUint32LE();
-	
+
 	debug(0, "_paletteOffs: %08X", _paletteOffs);
 	debug(0, "_spriteTblOffs: %08X", _spriteTblOffs);
 	debug(0, "_paletteStart: %d", _paletteStart);
 	debug(0, "_paletteCount: %d", _paletteCount);
 	debug(0, "_spritesCount: %d", _spritesCount);
-	
+
 	_spriteDataSize = fd.size();
 	_spriteData = new byte[_spriteDataSize];
 	fd.seek(0);
 	fd.read(_spriteData, _spriteDataSize);
-	
+
 	// Convert palette
 	byte *palette = _spriteData + _paletteOffs;
 	for (int i = 0; i < _paletteCount; ++i) {
diff --git a/engines/bbvs/videoplayer.cpp b/engines/bbvs/videoplayer.cpp
index fda9372ade..9ea73ad10b 100644
--- a/engines/bbvs/videoplayer.cpp
+++ b/engines/bbvs/videoplayer.cpp
@@ -42,7 +42,7 @@ void BbvsEngine::playVideo(int videoNum) {
 		warning("Couldn't switch to a RGB color video mode to play a video.");
 		return;
 	}
-		
+
 	Video::VideoDecoder *videoDecoder = new Video::AVIDecoder();
 	if (!videoDecoder->loadFile(videoFilename)) {
 		delete videoDecoder;
@@ -74,7 +74,7 @@ void BbvsEngine::playVideo(int videoNum) {
 	}
 
 	delete videoDecoder;
-	
+
 	initGraphics(320, 240, false);
 
 }
diff --git a/engines/bbvs/walk.cpp b/engines/bbvs/walk.cpp
index 077110b867..5ef14101a0 100644
--- a/engines/bbvs/walk.cpp
+++ b/engines/bbvs/walk.cpp
@@ -46,7 +46,7 @@ static const int8 kWalkAnimTbl[32] = {
 void BbvsEngine::startWalkObject(SceneObject *sceneObject) {
 	if (_buttheadObject != sceneObject && _beavisObject != sceneObject)
 		return;
-	
+
 	initWalkAreas(sceneObject);
 	_sourceWalkAreaPt.x = sceneObject->x >> 16;
 	_sourceWalkAreaPt.y = sceneObject->y >> 16;
@@ -60,7 +60,7 @@ void BbvsEngine::startWalkObject(SceneObject *sceneObject) {
 	_destWalkArea = getWalkAreaAtPos(_destWalkAreaPt);
 	if (!_destWalkArea)
 		return;
-		
+
 	if (_sourceWalkArea != _destWalkArea) {
 		_currWalkDistance = kMaxDistance;
 		walkFindPath(_sourceWalkArea, 0);
@@ -68,12 +68,12 @@ void BbvsEngine::startWalkObject(SceneObject *sceneObject) {
 	}
 
 	walkObject(sceneObject, _destWalkAreaPt, sceneObject->sceneObjectDef->walkSpeed);
-	
+
 }
 
 void BbvsEngine::updateWalkObject(SceneObject *sceneObject) {
 	int animIndex;
-	
+
 	if (sceneObject->walkCount > 0 && (sceneObject->xIncr != 0 || sceneObject->yIncr != 0)) {
 		if (ABS(sceneObject->xIncr) <= ABS(sceneObject->yIncr))
 			sceneObject->turnValue = sceneObject->yIncr >= 0 ? 0 : 4;
@@ -89,7 +89,7 @@ void BbvsEngine::updateWalkObject(SceneObject *sceneObject) {
 	Animation *anim = 0;
 	if (animIndex > 0)
 		anim = _gameModule->getAnimation(animIndex);
-	
+
 	if (sceneObject->anim != anim) {
 		if (anim) {
 			sceneObject->anim = anim;
@@ -305,12 +305,12 @@ bool BbvsEngine::canButtheadWalkToDest(const Common::Point &destPt) {
 }
 
 void BbvsEngine::canWalkToDest(WalkArea *walkArea, int infoCount) {
-	
+
 	if (_destWalkArea == walkArea) {
 		_walkReachedDestArea = true;
 		return;
 	}
-	
+
 	if (_gameModule->getFieldC() <= 320 || infoCount <= 20) {
 		walkArea->checked = true;
 		for (int linkIndex = 0; linkIndex < walkArea->linksCount; ++linkIndex) {
@@ -364,10 +364,10 @@ int BbvsEngine::calcDistance(const Common::Point &pt1, const Common::Point &pt2)
 
 void BbvsEngine::walkFoundPath(int count) {
 	debug(5, "BbvsEngine::walkFoundPath(%d)", count);
-	
+
 	Common::Point midPt = _sourceWalkAreaPt;
 	int totalMidPtDistance = 0;
-	
+
 	if (count > 0) {
 		Common::Point lastMidPt;
 		int halfCount = (count + 1) >> 1;
@@ -384,13 +384,13 @@ void BbvsEngine::walkFoundPath(int count) {
 
 	if (distance >= _currWalkDistance)
 		return;
-		
+
 	debug(5, "BbvsEngine::walkFoundPath() distance smaller");
 
 	_currWalkDistance = distance;
 
 	Common::Point destPt = _destWalkAreaPt, newDestPt;
-	
+
 	while (1) {
 
 		int index = 0;
@@ -408,7 +408,7 @@ void BbvsEngine::walkFoundPath(int count) {
 		WalkInfo *walkInfo = _walkInfoPtrs[--count];
 		destPt.x = walkInfo->x;
 		destPt.y = walkInfo->y;
-		
+
 		if (walkInfo->direction) {
 			newDestPt.x = walkInfo->x;
 			newDestPt.y = walkInfo->y + walkInfo->delta - 1;
-- 
cgit v1.2.3


From 7126374b428ebb2feb7b431bdf5c906482d248dd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 28 Oct 2014 18:15:41 +0100
Subject: HOPKINS: Rename the parameter of PlayAnimSound to make it meaningful

---
 engines/hopkins/sound.cpp | 32 ++++++++++++++++----------------
 engines/hopkins/sound.h   |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 773c714899..d86fc449ee 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -261,9 +261,9 @@ void SoundManager::loadAnimSound() {
 	}
 }
 
-void SoundManager::playAnimSound(int soundNumber) {
+void SoundManager::playAnimSound(int animFrame) {
 	if (!_vm->_globals->_censorshipFl && _specialSoundNum == 2) {
-		switch (soundNumber) {
+		switch (animFrame) {
 		case 20:
 			playSample(5);
 			break;
@@ -282,35 +282,35 @@ void SoundManager::playAnimSound(int soundNumber) {
 			playSample(4);
 			break;
 		}
-	} else if (_specialSoundNum == 1 && soundNumber == 17)
+	} else if (_specialSoundNum == 1 && animFrame == 17)
 		playSoundFile("SOUND42.WAV");
-	else if (_specialSoundNum == 5 && soundNumber == 19)
+	else if (_specialSoundNum == 5 && animFrame == 19)
 		playWav(1);
-	else if (_specialSoundNum == 14 && soundNumber == 625)
+	else if (_specialSoundNum == 14 && animFrame == 625)
 		playWav(1);
-	else if (_specialSoundNum == 16 && soundNumber == 25)
+	else if (_specialSoundNum == 16 && animFrame == 25)
 		playWav(1);
 	else if (_specialSoundNum == 17) {
-		if (soundNumber == 6)
+		if (animFrame == 6)
 			playSample(1);
-		else if (soundNumber == 14)
+		else if (animFrame == 14)
 			playSample(2);
-		else if (soundNumber == 67)
+		else if (animFrame == 67)
 			playSample(3);
-	} else if (_specialSoundNum == 198 && soundNumber == 15)
+	} else if (_specialSoundNum == 198 && animFrame == 15)
 		playWav(1);
-	else if (_specialSoundNum == 199 && soundNumber == 72)
+	else if (_specialSoundNum == 199 && animFrame == 72)
 		playWav(1);
-	else if (_specialSoundNum == 208 && soundNumber == 40)
+	else if (_specialSoundNum == 208 && animFrame == 40)
 		playWav(1);
-	else if (_specialSoundNum == 210 && soundNumber == 2)
+	else if (_specialSoundNum == 210 && animFrame == 2)
 		playWav(1);
-	else if (_specialSoundNum == 211 && soundNumber == 22)
+	else if (_specialSoundNum == 211 && animFrame == 22)
 		playWav(1);
 	else if (_specialSoundNum == 229) {
-		if (soundNumber == 15)
+		if (animFrame == 15)
 			playWav(1);
-		else if (soundNumber == 91)
+		else if (animFrame == 91)
 			playWav(2);
 	}
 }
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index 97cdcdc1dd..1fb4f9ae71 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -116,7 +116,7 @@ public:
 	~SoundManager();
 
 	void loadAnimSound();
-	void playAnimSound(int soundNumber);
+	void playAnimSound(int animFrame);
 
 	void loadSample(int wavIndex, const Common::String &file);
 	void playSample(int wavIndex, int voiceMode = 9);
-- 
cgit v1.2.3


From 9ad2135ff960da2bbc1882ac50f2188b5a9e228e Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Tue, 28 Oct 2014 19:20:56 +0100
Subject: PRINCE: Allow to load translation file - prince_translation.dat

Update detection file to allow English language with both PL and DE data files. Add setMobTranslationTexts() to update mob names to translated ones in each location
---
 engines/prince/archive.cpp | 22 +++++++++++
 engines/prince/archive.h   |  1 +
 engines/prince/detection.h | 38 +++++++++++++++++--
 engines/prince/prince.cpp  | 92 +++++++++++++++++++++++++++++++++++++++++++---
 engines/prince/prince.h    |  6 +++
 5 files changed, 149 insertions(+), 10 deletions(-)

diff --git a/engines/prince/archive.cpp b/engines/prince/archive.cpp
index 7a4a35abd8..a01f824df8 100644
--- a/engines/prince/archive.cpp
+++ b/engines/prince/archive.cpp
@@ -79,6 +79,28 @@ bool PtcArchive::open(const Common::String &filename) {
 	return true;
 }
 
+bool PtcArchive::openTranslation(const Common::String &filename) {
+	_stream = SearchMan.createReadStreamForMember(filename);
+	if (!_stream)
+		return false;
+
+	Common::Array<Common::String> translationNames;
+	Common::String translationFileName;
+	const int kTranslationFiles = 5;
+	for (int i = 0; i < kTranslationFiles; i++) {
+		translationFileName = _stream->readLine();
+		translationNames.push_back(translationFileName);
+	}
+	FileEntry item;
+	for (int i = 0; i < kTranslationFiles; i++) {
+		item._offset = _stream->readUint32LE();
+		item._size = _stream->readUint32LE();
+		_items[translationNames[i]] = item;
+	}
+
+	return true;
+}
+
 void PtcArchive::close() {
 	delete _stream;
 	_stream = nullptr;
diff --git a/engines/prince/archive.h b/engines/prince/archive.h
index e211036ed6..a640b77911 100644
--- a/engines/prince/archive.h
+++ b/engines/prince/archive.h
@@ -35,6 +35,7 @@ public:
 	~PtcArchive();
 
 	bool open(const Common::String &filename);
+	bool openTranslation(const Common::String &filename);
 	void close();
 	bool isOpen() const { return _stream != 0; }
 
diff --git a/engines/prince/detection.h b/engines/prince/detection.h
index 5cc0d32be4..6720e5e0b7 100644
--- a/engines/prince/detection.h
+++ b/engines/prince/detection.h
@@ -28,9 +28,15 @@
 
 namespace Prince {
 
+enum PrinceGameType {
+	UNK_DATA,
+	DE_DATA,
+	PL_DATA
+};
+
 struct PrinceGameDescription {
 	ADGameDescription desc;
-	int gameType;
+	PrinceGameType gameType;
 };
 
 static const PlainGameDescriptor princeGames[] = {
@@ -49,7 +55,7 @@ static const PrinceGameDescription gameDescriptions[] = {
 			ADGF_TESTING,
 			GUIO1(GUIO_NONE)
 		},
-		0
+		DE_DATA
 	},
 	{
 		{
@@ -61,9 +67,33 @@ static const PrinceGameDescription gameDescriptions[] = {
 			ADGF_TESTING,
 			GUIO1(GUIO_NONE)
 		},
-		1
+		PL_DATA
+	},
+	{
+		{
+			"prince",
+			"The Prince and the Coward",
+			AD_ENTRY1s("databank.ptc", "5fa03833177331214ec1354761b1d2ee", 3565031),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_TESTING,
+			GUIO1(GUIO_NONE)
+		},
+		DE_DATA
+	},
+	{
+		{
+			"prince",
+			"The Prince and the Coward",
+			AD_ENTRY1s("databank.ptc", "48ec9806bda9d152acbea8ce31c93c49", 3435298),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_TESTING,
+			GUIO1(GUIO_NONE)
+		},
+		PL_DATA
 	},
-	{ AD_TABLE_END_MARKER, 0 }
+	{ AD_TABLE_END_MARKER, UNK_DATA }
 };
 
 const static char *directoryGlobs[] = {
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 04a482c570..a6197260e4 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -61,6 +61,7 @@
 #include "prince/animation.h"
 #include "prince/option_text.h"
 #include "prince/curve_values.h"
+#include "prince/detection.h"
 
 namespace Prince {
 
@@ -95,7 +96,8 @@ PrinceEngine::PrinceEngine(OSystem *syst, const PrinceGameDescription *gameDesc)
 	_tracePointFirstPointFlag(false), _coordsBuf2(nullptr), _coords2(nullptr), _coordsBuf3(nullptr), _coords3(nullptr),
 	_shanLen(0), _directionTable(nullptr), _currentMidi(0), _lightX(0), _lightY(0), _curveData(nullptr), _curvPos(0),
 	_creditsData(nullptr), _creditsDataSize(0), _currentTime(0), _zoomBitmap(nullptr), _shadowBitmap(nullptr), _transTable(nullptr),
-	_flcFrameSurface(nullptr), _shadScaleValue(0), _shadLineLen(0), _scaleValue(0), _dialogImage(nullptr) {
+	_flcFrameSurface(nullptr), _shadScaleValue(0), _shadLineLen(0), _scaleValue(0), _dialogImage(nullptr), _mobTranslationData(nullptr),
+	_mobTranslationSize(0) {
 
 	// Debug/console setup
 	DebugMan.addDebugChannel(DebugChannel::kScript, "script", "Prince Script debug channel");
@@ -204,6 +206,8 @@ PrinceEngine::~PrinceEngine() {
 		_dialogImage->free();
 		delete _dialogImage;
 	}
+
+	free(_mobTranslationData);
 }
 
 GUI::Debugger *PrinceEngine::getDebugger() {
@@ -228,11 +232,20 @@ void PrinceEngine::init() {
 	if (!sound->open("sound/databank.ptc"))
 		error("Can't open sound/databank.ptc");
 
+	PtcArchive *translation = new PtcArchive();
+	if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) {
+		if (!translation->openTranslation("all/prince_translation.dat"))
+			error("Can't open prince_translation.dat");
+	}
+
 	SearchMan.addSubDirectoryMatching(gameDataDir, "all");
 
 	SearchMan.add("all", all);
 	SearchMan.add("voices", voices);
 	SearchMan.add("sound", sound);
+	if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) {
+		SearchMan.add("translation", translation);
+	}
 
 	_graph = new GraphicsMan(this);
 
@@ -261,6 +274,11 @@ void PrinceEngine::init() {
 
 	_variaTxt = new VariaTxt();
 	Resource::loadResource(_variaTxt, "variatxt.dat", true);
+	if (getLanguage() == Common::PL_POL || getLanguage() == Common::DE_DEU) {
+		Resource::loadResource(_variaTxt, "variatxt.dat", true);
+	} else {
+		Resource::loadResource(_variaTxt, "variatxt_translate.dat", true);
+	}
 
 	_cursor1 = new Cursor();
 	Resource::loadResource(_cursor1, "mouse1.cur", true);
@@ -268,7 +286,12 @@ void PrinceEngine::init() {
 	_cursor3 = new Cursor();
 	Resource::loadResource(_cursor3, "mouse2.cur", true);
 
-	Common::SeekableReadStream *talkTxtStream = SearchMan.createReadStreamForMember("talktxt.dat");
+	Common::SeekableReadStream *talkTxtStream;
+	if (getLanguage() == Common::PL_POL || getLanguage() == Common::DE_DEU) {
+		talkTxtStream = SearchMan.createReadStreamForMember("talktxt.dat");
+	} else {
+		talkTxtStream = SearchMan.createReadStreamForMember("talktxt_translate.dat");
+	}
 	if (!talkTxtStream) {
 		error("Can't load talkTxtStream");
 		return;
@@ -279,7 +302,12 @@ void PrinceEngine::init() {
 
 	delete talkTxtStream;
 
-	Common::SeekableReadStream *invTxtStream = SearchMan.createReadStreamForMember("invtxt.dat");
+	Common::SeekableReadStream *invTxtStream;
+	if (getLanguage() == Common::PL_POL || getLanguage() == Common::DE_DEU) {
+		invTxtStream = SearchMan.createReadStreamForMember("invtxt.dat");
+	} else {
+		invTxtStream = SearchMan.createReadStreamForMember("invtxt_translate.dat");
+	}
 	if (!invTxtStream) {
 		error("Can't load invTxtStream");
 		return;
@@ -354,7 +382,12 @@ void PrinceEngine::init() {
 
 	_shadowLine = (byte *)malloc(kShadowLineArraySize);
 
-	Common::SeekableReadStream *creditsDataStream = SearchMan.createReadStreamForMember("credits.dat");
+	Common::SeekableReadStream *creditsDataStream;
+	if (getLanguage() == Common::PL_POL || getLanguage() == Common::DE_DEU) {
+		creditsDataStream = SearchMan.createReadStreamForMember("credits.dat");
+	} else {
+		creditsDataStream = SearchMan.createReadStreamForMember("credits_translate.dat");
+	}
 	if (!creditsDataStream) {
 		error("Can't load creditsDataStream");
 		return;
@@ -363,6 +396,10 @@ void PrinceEngine::init() {
 	_creditsData = (byte *)malloc(_creditsDataSize);
 	creditsDataStream->read(_creditsData, _creditsDataSize);
 	delete creditsDataStream;
+
+	if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) {
+		loadMobTranslationTexts();
+	}
 }
 
 void PrinceEngine::showLogo() {
@@ -469,13 +506,17 @@ bool PrinceEngine::loadLocation(uint16 locationNr) {
 	loadMobPriority("mobpri");
 
 	_mobList.clear();
-	if (getLanguage() == Common::DE_DEU) {
+	if (getGameType() == PrinceGameType::DE_DATA) {
 		const Common::String mobLstName = Common::String::format("mob%02d.lst", _locationNr);
 		debug("name: %s", mobLstName.c_str());
 		Resource::loadResource(_mobList, mobLstName.c_str(), false);
-	} else {
+	} else if (getGameType() == PrinceGameType::PL_DATA) {
 		Resource::loadResource(_mobList, "mob.lst", false);
 	}
+	if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) {
+		// update Mob texts for translated version
+		setMobTranslationTexts();
+	}
 
 	_animList.clear();
 	Resource::loadResource(_animList, "anim.lst", false);
@@ -947,6 +988,45 @@ bool PrinceEngine::loadMobPriority(const char *resourceName) {
 	return true;
 }
 
+void PrinceEngine::loadMobTranslationTexts() {
+	Common::SeekableReadStream *mobTranslationStream = SearchMan.createReadStreamForMember("mob_translate.dat");
+	if (!mobTranslationStream) {
+		error("Can't load mob_translate.dat");
+	}
+	_mobTranslationSize = mobTranslationStream->size();
+	_mobTranslationData = (byte *)malloc(_mobTranslationSize);
+	mobTranslationStream->read(_mobTranslationData, _mobTranslationSize);
+	delete mobTranslationStream;
+}
+
+void PrinceEngine::setMobTranslationTexts() {
+	int locationOffset = READ_UINT16(_mobTranslationData + (_locationNr - 1) * 2);
+	if (locationOffset) {
+		byte *locationText = _mobTranslationData + locationOffset;
+		for (uint i = 0; i < _mobList.size(); i++) {
+			byte c;
+			locationText++;
+			_mobList[i]._name.clear();
+			while ((c = *locationText)) {
+				_mobList[i]._name += c;
+				locationText++;
+			}
+			locationText++;
+			_mobList[i]._examText.clear();
+			c = *locationText;
+			locationText++;
+			if (c) {
+				_mobList[i]._examText += c;
+				do {
+					c = *locationText;
+					_mobList[i]._examText += c;
+					locationText++;
+				} while (c != 255);
+			}
+		}
+	}
+}
+
 void PrinceEngine::keyHandler(Common::Event event) {
 	uint16 nChar = event.kbd.keycode;
 	switch (nChar) {
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 930c3c7bd3..48491c63bd 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -285,6 +285,9 @@ public:
 	uint32 _talkTxtSize;
 	byte *_talkTxt;
 
+	uint32 _mobTranslationSize;
+	byte *_mobTranslationData;
+
 	bool loadLocation(uint16 locationNr);
 	bool loadAnim(uint16 animNr, bool loop);
 	bool loadVoice(uint32 textSlot, uint32 sampleSlot, const Common::String &name);
@@ -294,6 +297,9 @@ public:
 	bool loadTrans(byte *transTable, const char *resourceName);
 	bool loadMobPriority(const char *resourceName);
 
+	void loadMobTranslationTexts();
+	void setMobTranslationTexts();
+
 	bool loadMusic(int musNumber);
 	void stopMusic();
 
-- 
cgit v1.2.3


From 5f022f2e9e333318d38a456ce5db63b19e203b84 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Tue, 28 Oct 2014 21:36:25 +0100
Subject: PRINCE: Change PrinceGameType enum names

Fix compilation on gcc
---
 engines/prince/detection.h | 16 ++++++++--------
 engines/prince/prince.cpp  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/prince/detection.h b/engines/prince/detection.h
index 6720e5e0b7..7e5bdd6b7b 100644
--- a/engines/prince/detection.h
+++ b/engines/prince/detection.h
@@ -29,9 +29,9 @@
 namespace Prince {
 
 enum PrinceGameType {
-	UNK_DATA,
-	DE_DATA,
-	PL_DATA
+	kPrinceDataUNK,
+	kPrinceDataDE,
+	kPrinceDataPL
 };
 
 struct PrinceGameDescription {
@@ -55,7 +55,7 @@ static const PrinceGameDescription gameDescriptions[] = {
 			ADGF_TESTING,
 			GUIO1(GUIO_NONE)
 		},
-		DE_DATA
+		kPrinceDataDE
 	},
 	{
 		{
@@ -67,7 +67,7 @@ static const PrinceGameDescription gameDescriptions[] = {
 			ADGF_TESTING,
 			GUIO1(GUIO_NONE)
 		},
-		PL_DATA
+		kPrinceDataPL
 	},
 	{
 		{
@@ -79,7 +79,7 @@ static const PrinceGameDescription gameDescriptions[] = {
 			ADGF_TESTING,
 			GUIO1(GUIO_NONE)
 		},
-		DE_DATA
+		kPrinceDataDE
 	},
 	{
 		{
@@ -91,9 +91,9 @@ static const PrinceGameDescription gameDescriptions[] = {
 			ADGF_TESTING,
 			GUIO1(GUIO_NONE)
 		},
-		PL_DATA
+		kPrinceDataPL
 	},
-	{ AD_TABLE_END_MARKER, UNK_DATA }
+	{ AD_TABLE_END_MARKER, kPrinceDataUNK }
 };
 
 const static char *directoryGlobs[] = {
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index a6197260e4..00e1736c46 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -506,11 +506,11 @@ bool PrinceEngine::loadLocation(uint16 locationNr) {
 	loadMobPriority("mobpri");
 
 	_mobList.clear();
-	if (getGameType() == PrinceGameType::DE_DATA) {
+	if (getGameType() == kPrinceDataDE) {
 		const Common::String mobLstName = Common::String::format("mob%02d.lst", _locationNr);
 		debug("name: %s", mobLstName.c_str());
 		Resource::loadResource(_mobList, mobLstName.c_str(), false);
-	} else if (getGameType() == PrinceGameType::PL_DATA) {
+	} else if (getGameType() == kPrinceDataPL) {
 		Resource::loadResource(_mobList, "mob.lst", false);
 	}
 	if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) {
-- 
cgit v1.2.3


From 28967b617f53dbda91d549007dc8af2581dbae3a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 28 Oct 2014 22:37:57 +0100
Subject: SCI: properly reversed color matching thanks wjp

---
 engines/sci/graphics/palette.cpp | 82 +++++++++++++++++++++++-----------------
 engines/sci/graphics/palette.h   |  4 ++
 engines/sci/resource.cpp         |  3 ++
 3 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 36b9660d4e..4d2c874e04 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -73,6 +73,8 @@ GfxPalette::GfxPalette(ResourceManager *resMan, GfxScreen *screen)
 		// to detect if the current game is merging or copying
 		_useMerging = _resMan->detectPaletteMergingSci11();
 		_use16bitColorMatch = _useMerging;
+		// Note: Laura Bow 2 floppy uses the new palette format and is detected
+		//        as 8 bit color matching because of that.
 	} else {
 	    // SCI32
 		_useMerging = false;
@@ -473,8 +475,8 @@ bool GfxPalette::merge(Palette *newPalette, bool force, bool forceRealMerge) {
 
 		// check if exact color could be matched
 		res = matchColor(newPalette->colors[i].r, newPalette->colors[i].g, newPalette->colors[i].b);
-		if (res & 0x8000) { // exact match was found
-			newPalette->mapping[i] = res & 0xFF;
+		if (res & SCI_PALETTE_MATCH_PERFECT) { // exact match was found
+			newPalette->mapping[i] = res & SCI_PALETTE_MATCH_COLORMASK;
 			continue;
 		}
 
@@ -495,8 +497,8 @@ bool GfxPalette::merge(Palette *newPalette, bool force, bool forceRealMerge) {
 
 		// if still no luck - set an approximate color
 		if (j == 256) {
-			newPalette->mapping[i] = res & 0xFF;
-			_sysPalette.colors[res & 0xFF].used |= 0x10;
+			newPalette->mapping[i] = res & SCI_PALETTE_MATCH_COLORMASK;
+			_sysPalette.colors[res & SCI_PALETTE_MATCH_COLORMASK].used |= 0x10;
 		}
 	}
 
@@ -518,38 +520,50 @@ void GfxPalette::drewPicture(GuiResourceId pictureId) {
 	}
 }
 
-uint16 GfxPalette::matchColor(byte r, byte g, byte b) {
-	byte found = 0xFF;
-	int diff = 0x2FFFF, cdiff;
-	int16 dr,dg,db;
-
-	for (int i = 1; i < 255; i++) {
-		if ((!_sysPalette.colors[i].used))
-			continue;
-		dr = _sysPalette.colors[i].r - r;
-		dg = _sysPalette.colors[i].g - g;
-		db = _sysPalette.colors[i].b - b;
-		if (!_use16bitColorMatch) {
-			// remove upper bits for most SCI1.1 games
-			//  this bug was introduced with Quest For Glory 3 interpreter
-			//  we have to implement it, otherwise some colors will be "wrong"
-			//  See Space Quest 5 bug #6455
-			dr &= 0xFF;
-			dg &= 0xFF;
-			db &= 0xFF;
+uint16 GfxPalette::matchColor(byte matchRed, byte matchGreen, byte matchBlue) {
+	int16 colorNr;
+	int16 differenceRed, differenceGreen, differenceBlue;
+	int16 differenceTotal = 0;
+	int16 bestDifference = 0x7FFF;
+	uint16 bestColor = 255;
+
+	if (_use16bitColorMatch) {
+		// used by SCI0 to SCI1, also by the first few SCI1.1 games
+		for (colorNr = 0; colorNr < 256; colorNr++) {
+			if ((!_sysPalette.colors[colorNr].used))
+				continue;
+			differenceRed = ABS(_sysPalette.colors[colorNr].r - matchRed);
+			differenceGreen = ABS(_sysPalette.colors[colorNr].g - matchGreen);
+			differenceBlue = ABS(_sysPalette.colors[colorNr].b - matchBlue);
+			differenceTotal = differenceRed + differenceGreen + differenceBlue;
+			if (differenceTotal <= bestDifference) {
+				bestDifference = differenceTotal;
+				bestColor = colorNr;
+			}
 		}
-//		minimum squares match
-		cdiff = (dr*dr) + (dg*dg) + (db*db);
-//		minimum sum match (Sierra's)
-//		cdiff = ABS(dr) + ABS(dg) + ABS(db);
-		if (cdiff < diff) {
-			if (cdiff == 0)
-				return i | 0x8000; // setting this flag to indicate exact match
-			found = i;
-			diff = cdiff;
+	} else {
+		// SCI1.1, starting with QfG3 introduced a bug in the matching code
+		// we have to implement it as well, otherwise some colors will be "wrong" in comparison to the original interpreter
+		//  See Space Quest 5 bug #6455
+		for (colorNr = 0; colorNr < 256; colorNr++) {
+			if ((!_sysPalette.colors[colorNr].used))
+				continue;
+			differenceRed = (uint8)ABS<int8>(_sysPalette.colors[colorNr].r - matchRed);
+			differenceGreen = (uint8)ABS<int8>(_sysPalette.colors[colorNr].g - matchGreen);
+			differenceBlue = (uint8)ABS<int8>(_sysPalette.colors[colorNr].b - matchBlue);
+			differenceTotal = differenceRed + differenceGreen + differenceBlue;
+			if (differenceTotal < 0) {
+				differenceTotal = differenceTotal;
+			}
+			if (differenceTotal <= bestDifference) {
+				bestDifference = differenceTotal;
+				bestColor = colorNr;
+			}
 		}
 	}
-	return found;
+	if (differenceTotal == 0) // original interpreter does not do this, instead it does 2 calls for merges in the worst case
+		return colorNr | SCI_PALETTE_MATCH_PERFECT; // we set this flag, so that we can optimize during palette merge
+	return bestColor;
 }
 
 void GfxPalette::getSys(Palette *pal) {
@@ -639,7 +653,7 @@ void GfxPalette::kernelSetIntensity(uint16 fromColor, uint16 toColor, uint16 int
 }
 
 int16 GfxPalette::kernelFindColor(uint16 r, uint16 g, uint16 b) {
-	return matchColor(r, g, b) & 0xFF;
+	return matchColor(r, g, b) & SCI_PALETTE_MATCH_COLORMASK;
 }
 
 // Returns true, if palette got changed
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h
index 93cc2a8189..500a45eccf 100644
--- a/engines/sci/graphics/palette.h
+++ b/engines/sci/graphics/palette.h
@@ -31,6 +31,10 @@ namespace Sci {
 class ResourceManager;
 class GfxScreen;
 
+// Special flag implemented by us for optimization in palette merge
+#define SCI_PALETTE_MATCH_PERFECT 0x8000
+#define SCI_PALETTE_MATCH_COLORMASK 0xFF
+
 enum ColorRemappingType {
 	kRemappingNone = 0,
 	kRemappingByRange = 1,
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index d155792853..10740a8b7b 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2350,6 +2350,9 @@ bool ResourceManager::detectPaletteMergingSci11() {
 		// Old palette format used in palette resource? -> it's merging
 		if ((data[0] == 0 && data[1] == 1) || (data[0] == 0 && data[1] == 0 && READ_LE_UINT16(data + 29) == 0))
 			return true;
+		// Hardcoded: Laura Bow 2 floppy uses new palette resource, but still palette merging + 16 bit color matching
+		if ((g_sci->getGameId() == GID_LAURABOW2) && (!g_sci->isCD()) && (!g_sci->isDemo()))
+			return true;
 		return false;
 	}
 	return false;
-- 
cgit v1.2.3


From bb29cdc899dcf48fb67b369273194dab32843665 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 28 Oct 2014 22:41:14 +0100
Subject: SCI: color matching - remove debug code

---
 engines/sci/graphics/palette.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 4d2c874e04..5058eaa550 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -552,9 +552,6 @@ uint16 GfxPalette::matchColor(byte matchRed, byte matchGreen, byte matchBlue) {
 			differenceGreen = (uint8)ABS<int8>(_sysPalette.colors[colorNr].g - matchGreen);
 			differenceBlue = (uint8)ABS<int8>(_sysPalette.colors[colorNr].b - matchBlue);
 			differenceTotal = differenceRed + differenceGreen + differenceBlue;
-			if (differenceTotal < 0) {
-				differenceTotal = differenceTotal;
-			}
 			if (differenceTotal <= bestDifference) {
 				bestDifference = differenceTotal;
 				bestColor = colorNr;
-- 
cgit v1.2.3


From 5c91173337278d1d23d03efbeb4e6b6debba0d6d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 29 Oct 2014 00:12:12 +0100
Subject: SCI: color matching bug fix

---
 engines/sci/graphics/palette.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 5058eaa550..59abef5550 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -525,7 +525,7 @@ uint16 GfxPalette::matchColor(byte matchRed, byte matchGreen, byte matchBlue) {
 	int16 differenceRed, differenceGreen, differenceBlue;
 	int16 differenceTotal = 0;
 	int16 bestDifference = 0x7FFF;
-	uint16 bestColor = 255;
+	uint16 bestColorNr = 255;
 
 	if (_use16bitColorMatch) {
 		// used by SCI0 to SCI1, also by the first few SCI1.1 games
@@ -538,7 +538,7 @@ uint16 GfxPalette::matchColor(byte matchRed, byte matchGreen, byte matchBlue) {
 			differenceTotal = differenceRed + differenceGreen + differenceBlue;
 			if (differenceTotal <= bestDifference) {
 				bestDifference = differenceTotal;
-				bestColor = colorNr;
+				bestColorNr = colorNr;
 			}
 		}
 	} else {
@@ -554,13 +554,13 @@ uint16 GfxPalette::matchColor(byte matchRed, byte matchGreen, byte matchBlue) {
 			differenceTotal = differenceRed + differenceGreen + differenceBlue;
 			if (differenceTotal <= bestDifference) {
 				bestDifference = differenceTotal;
-				bestColor = colorNr;
+				bestColorNr = colorNr;
 			}
 		}
 	}
 	if (differenceTotal == 0) // original interpreter does not do this, instead it does 2 calls for merges in the worst case
-		return colorNr | SCI_PALETTE_MATCH_PERFECT; // we set this flag, so that we can optimize during palette merge
-	return bestColor;
+		return bestColorNr | SCI_PALETTE_MATCH_PERFECT; // we set this flag, so that we can optimize during palette merge
+	return bestColorNr;
 }
 
 void GfxPalette::getSys(Palette *pal) {
-- 
cgit v1.2.3


From 40b224fc74337315dd485a7e8cdbf19bd37dc941 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 29 Oct 2014 11:19:15 +0200
Subject: SCUMM: Disallow saving while a room 'prequel' is shown in v0-v3 games

These are cases where the screen is completely blank, showing text.
In such cases, no room is set, thus no room resources are available.
An example is the screen shown after the credits in the Zak FM-TOWNS
intro ("The next day..."). Thanks to segrax for finding this case.
This commit is based off pull request 522, but completely disallows
saving in such scenes, instead of adding explicit checks for them
---
 engines/scumm/saveload.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 7eadb042fb..0c0f6be73b 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -109,7 +109,12 @@ Common::Error ScummEngine::saveGameState(int slot, const Common::String &desc) {
 }
 
 bool ScummEngine::canSaveGameStateCurrently() {
-	// FIXME: For now always allow loading in V0-V3 games
+	// Disallow saving in v0-v3 games when a 'prequel' to a cutscene is shown.
+	// This is a blank screen with text, and while this is shown, saving should
+	// be disabled, as no room is set.
+	if (_game.version <= 3 && _currentScript == 0xFF && _roomResource == 0 && _currentRoom == 0)
+		return false;
+
 	// TODO: Should we disallow saving in some more places,
 	// e.g. when a SAN movie is playing? Not sure whether the
 	// original EXE allowed this.
-- 
cgit v1.2.3


From c2951e2594c320c244898237d434e7d83a027662 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 29 Oct 2014 05:14:13 +0100
Subject: HOPKINS: Add specific code to handle the butchered Polish version
 with sync sound

---
 engines/hopkins/sound.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index d86fc449ee..6b3149e247 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -275,11 +275,23 @@ void SoundManager::playAnimSound(int animFrame) {
 		case 75:
 			playSample(2);
 			break;
+		case 95:
+			// This fixes an original bug in the Polish version of the bug, which was literally butchered for some reason
+			if (_vm->getLanguage() == Common::PL_POL)
+				playSample(3);
+			break;
 		case 109:
-			playSample(3);
+			if (_vm->getLanguage() != Common::PL_POL)
+				playSample(3);
+			break;
+		case 108:
+			// This fixes an original bug in the Polish version of the bug, which was literally butchered for some reason
+			if (_vm->getLanguage() == Common::PL_POL)
+				playSample(4);
 			break;
 		case 122:
-			playSample(4);
+			if (_vm->getLanguage() != Common::PL_POL)
+				playSample(4);
 			break;
 		}
 	} else if (_specialSoundNum == 1 && animFrame == 17)
-- 
cgit v1.2.3


From 75198ce17c6e13dd01ca44e17c7ad8a40d38dcf8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 29 Oct 2014 17:13:16 +0100
Subject: HOPKINS: Fix a couple of comments

---
 engines/hopkins/sound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 6b3149e247..b429eb863a 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -276,7 +276,7 @@ void SoundManager::playAnimSound(int animFrame) {
 			playSample(2);
 			break;
 		case 95:
-			// This fixes an original bug in the Polish version of the bug, which was literally butchered for some reason
+			// This fixes an original bug in the Polish version of the game, which was literally butchered for some reason
 			if (_vm->getLanguage() == Common::PL_POL)
 				playSample(3);
 			break;
@@ -285,7 +285,7 @@ void SoundManager::playAnimSound(int animFrame) {
 				playSample(3);
 			break;
 		case 108:
-			// This fixes an original bug in the Polish version of the bug, which was literally butchered for some reason
+			// This fixes an original bug in the Polish version of the game, which was literally butchered for some reason
 			if (_vm->getLanguage() == Common::PL_POL)
 				playSample(4);
 			break;
-- 
cgit v1.2.3


From 86a3d504672e86e0acb62c93d1f120f7e1162ba2 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Fri, 31 Oct 2014 09:22:12 +1100
Subject: SCUMM: Fix bug #6742 - PJGAMES: Crash upon playing Happy Fun Squares
 on Hard.

---
 engines/scumm/scumm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 46512f8ce6..967909e505 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -642,7 +642,7 @@ protected:
 	byte _opcode;
 	byte _currentScript;
 	int _scummStackPos;
-	int _vmStack[150];
+	int _vmStack[256];
 
 	OpcodeEntry _opcodes[256];
 
-- 
cgit v1.2.3


From 0c5fae865218aa140f65e6ac56eeda835bda4f52 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Fri, 31 Oct 2014 09:37:46 +1100
Subject: SCUMM: Add Dutch Windows demo of Let's Explore the Farm with Buzzy.

---
 devtools/scumm-md5.txt    | 1 +
 engines/scumm/scumm-md5.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index acee5d87b3..122df76ec0 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -625,6 +625,7 @@ farm	Let's Explore the Farm with Buzzy
 	5dda73606533d66a4c3f4f9ea6e842af	87061	ru	Windows	-	-	-	sev
 
 	39fd6db10d0222d817025c4d3346e3b4	-1	en	Mac	-	Demo	-	Joachim Eberhard
+	6c375c2236d99f56e6c2cf540e74e474	36864	nl	Windows	-	Demo	-	Kirben
 	bf8b52fdd9a69c67f34e8e9fec72661c	-1	en	Windows	HE 71	Demo	-	khalek, sev
 	0557df19f046a84c2fdc63507c6616cb	-1	nl	Windows	HE 72	Demo	-	adutchguy
 	8d479e36f35e80257dfc102cf4b8a912	34333	en	Windows	HE 72	Demo	-	khalek, sev
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index d7ec9bb686..f29239606a 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Mon Oct 20 12:17:31 2014
+  This file was generated by the md5table tool on Thu Oct 30 22:35:51 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -310,6 +310,7 @@ static const MD5Table md5table[] = {
 	{ "6bca7a1a96d16e52b8f3c42b50dbdca3", "fbear", "HE 62", "", -1, Common::JA_JPN, Common::kPlatform3DO },
 	{ "6bf70eee5de3d24d2403e0dd3d267e8a", "spyfox", "", "", 49221, Common::UNK_LANG, Common::kPlatformWindows },
 	{ "6c2bff0e327f2962e809c2e1a82d7309", "monkey", "VGA", "VGA", -1, Common::EN_ANY, Common::kPlatformAmiga },
+	{ "6c375c2236d99f56e6c2cf540e74e474", "farm", "", "Demo", 36864, Common::NL_NLD, Common::kPlatformWindows },
 	{ "6d1baa1065ac5f7b210be8ebe4235e49", "freddi", "HE 73", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "6dead580b0ff14d5f7b33b4219f04159", "samnmax", "", "Demo", 16556335, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "6df20c50c1ab19799de9be7ae7716881", "fbear", "HE 62", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
-- 
cgit v1.2.3


From 6bc36cbdf412db1ce10adcdc50eb98135908612e Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 31 Oct 2014 08:16:33 +0100
Subject: DEBUGGER: Add FIXME comment about file name vs base name

---
 gui/debugger.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 560e516a94..216bd626fe 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -556,6 +556,10 @@ bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 			filename = filename + " " + argv[i];
 		}
 		Common::MacResManager macResMan;
+		// FIXME: There currently isn't any way to tell the Mac resource
+		// manager to open a specific file. Instead, it takes a "base name"
+		// and constructs a file name out of that. While usually a desirable
+		// thing, it's not ideal here.
 		if (!macResMan.open(filename)) {
 			debugPrintf("Resource file '%s' not found\n", filename.c_str());
 		} else {
-- 
cgit v1.2.3


From 5b42fa81961d86b20659e50f10eb828b900dd1d9 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 31 Oct 2014 20:33:00 +0100
Subject: SCI: script patch for qfg1ega (fixes bug #6407) throwing rocks at
 bird's nest, running ego gets stuck

---
 engines/sci/engine/script_patches.cpp | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 8bbbd713a6..3d76848a76 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1916,6 +1916,43 @@ static const SciScriptPatcherEntry pq1vgaSignatures[] = {
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
+// ===========================================================================
+//  At the healer's house there is a bird's nest up on the tree.
+//   The player can throw rocks at it until it falls to the ground.
+//   The hero will then grab the item, that is in the nest.
+//
+//  When running is active, the hero will not reach the actual destination
+//   and because of that, the game will get stuck.
+//
+//  We just change the coordinate of the destination slightly, so that walking,
+//   sneaking and running work.
+//
+//  This bug was fixed by Sierra at least in the Japanese PC-9801 version.
+// Applies to at least: English floppy (1.000, 1.012)
+// Responsible method: pickItUp::changeState (script 54)
+// Fixes bug: #6407
+static const uint16 qfg1egaSignatureThrowRockAtNest[] = {
+	0x4a, 0x04,                         // send 04 (nest::x)
+	0x36,                               // push
+	SIG_MAGICDWORD,
+	0x35, 0x0f,                         // ldi 0f (15d)
+	0x02,                               // add
+	0x36,                               // push
+	SIG_END
+};
+
+static const uint16 qfg1egaPatchThrowRockAtNest[] = {
+	PATCH_ADDTOOFFSET(+3),
+	0x35, 0x12,                         // ldi 12 (18d)
+	PATCH_END
+};
+
+//          script, description,                                      signature                            patch
+static const SciScriptPatcherEntry qfg1egaSignatures[] = {
+	{  true,    54, "throw rock at nest while running",            1, qfg1egaSignatureThrowRockAtNest,     qfg1egaPatchThrowRockAtNest },
+	SCI_SIGNATUREENTRY_TERMINATOR
+};
+
 // ===========================================================================
 //  script 215 of qfg1vga pointBox::doit actually processes button-presses
 //   during fighting with monsters. It strangely also calls kGetEvent. Because
@@ -3036,6 +3073,9 @@ void ScriptPatcher::processScript(uint16 scriptNr, byte *scriptData, const uint3
 	case GID_PQ1:
 		signatureTable = pq1vgaSignatures;
 		break;
+	case GID_QFG1:
+		signatureTable = qfg1egaSignatures;
+		break;
 	case GID_QFG1VGA:
 		signatureTable = qfg1vgaSignatures;
 		break;
-- 
cgit v1.2.3


From 9561d5f6f8d5fab355ee56f70879443177b58ee1 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 1 Nov 2014 00:57:26 +0100
Subject: SCI: revert r55034, fixes bug #6539 original bug wasn't solved
 properly will reopen the original bug #5334 and figure out that one instead

---
 engines/sci/graphics/text16.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 245d6996cb..808ce45d0d 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -337,8 +337,6 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 			maxTextWidth = MAX(textWidth, maxTextWidth);
 			totalHeight += textHeight;
 			curPos += charCount;
-			while (*curPos == ' ')
-				curPos++; // skip over breaking spaces
 		}
 		rect.bottom = totalHeight;
 		rect.right = maxWidth ? maxWidth : MIN(rect.right, maxTextWidth);
@@ -458,8 +456,6 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
 
 		hline += textHeight;
 		text += charCount;
-		while (*text == ' ')
-			text++; // skip over breaking spaces
 	}
 	SetFont(previousFontId);
 	_ports->penColor(previousPenColor);
-- 
cgit v1.2.3


From 14ab55e9badc97fd6554214408da33663a88c792 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 1 Nov 2014 12:35:59 +0100
Subject: HOPKINS: Add a check for another sound related to frames removed in
 the Polish version. Fix for bug #6591

---
 engines/hopkins/sound.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index b429eb863a..6660233740 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -273,7 +273,10 @@ void SoundManager::playAnimSound(int animFrame) {
 			playSample(1);
 			break;
 		case 75:
-			playSample(2);
+			// This removes the sound of the gun played while the guard is being shot, as this part of the scene has been
+			// removed in the Polish version of the game
+			if (_vm->getLanguage() != Common::PL_POL)
+				playSample(2);
 			break;
 		case 95:
 			// This fixes an original bug in the Polish version of the game, which was literally butchered for some reason
-- 
cgit v1.2.3


From c4e40fc83fa79ed14f9a5dd434b952d5b3e4eb56 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Sat, 1 Nov 2014 23:01:29 +1100
Subject: SCUMM: Correct file size for Dutch Windows demo of Let's Explore the
 Farm with Buzzy.

---
 devtools/scumm-md5.txt    | 2 +-
 engines/scumm/scumm-md5.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 122df76ec0..eef50003d2 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -625,7 +625,7 @@ farm	Let's Explore the Farm with Buzzy
 	5dda73606533d66a4c3f4f9ea6e842af	87061	ru	Windows	-	-	-	sev
 
 	39fd6db10d0222d817025c4d3346e3b4	-1	en	Mac	-	Demo	-	Joachim Eberhard
-	6c375c2236d99f56e6c2cf540e74e474	36864	nl	Windows	-	Demo	-	Kirben
+	6c375c2236d99f56e6c2cf540e74e474	34333	nl	Windows	-	Demo	-	Kirben
 	bf8b52fdd9a69c67f34e8e9fec72661c	-1	en	Windows	HE 71	Demo	-	khalek, sev
 	0557df19f046a84c2fdc63507c6616cb	-1	nl	Windows	HE 72	Demo	-	adutchguy
 	8d479e36f35e80257dfc102cf4b8a912	34333	en	Windows	HE 72	Demo	-	khalek, sev
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index f29239606a..878b2eeef3 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu Oct 30 22:35:51 2014
+  This file was generated by the md5table tool on Sat Nov 01 11:52:16 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -310,7 +310,7 @@ static const MD5Table md5table[] = {
 	{ "6bca7a1a96d16e52b8f3c42b50dbdca3", "fbear", "HE 62", "", -1, Common::JA_JPN, Common::kPlatform3DO },
 	{ "6bf70eee5de3d24d2403e0dd3d267e8a", "spyfox", "", "", 49221, Common::UNK_LANG, Common::kPlatformWindows },
 	{ "6c2bff0e327f2962e809c2e1a82d7309", "monkey", "VGA", "VGA", -1, Common::EN_ANY, Common::kPlatformAmiga },
-	{ "6c375c2236d99f56e6c2cf540e74e474", "farm", "", "Demo", 36864, Common::NL_NLD, Common::kPlatformWindows },
+	{ "6c375c2236d99f56e6c2cf540e74e474", "farm", "", "Demo", 34333, Common::NL_NLD, Common::kPlatformWindows },
 	{ "6d1baa1065ac5f7b210be8ebe4235e49", "freddi", "HE 73", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "6dead580b0ff14d5f7b33b4219f04159", "samnmax", "", "Demo", 16556335, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "6df20c50c1ab19799de9be7ae7716881", "fbear", "HE 62", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
-- 
cgit v1.2.3


From c9e74d6d54bf59b3587eea0785ce31df5d46615b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 1 Nov 2014 23:36:29 +0100
Subject: SCI: text16 GetLongest() changes fixes bug #5334 also fixes bug #5159
 also fixes Japanese line wrapping (hopefully)

---
 engines/sci/graphics/text16.cpp | 177 +++++++++++++++++++++++++---------------
 engines/sci/graphics/text16.h   |   2 +-
 2 files changed, 114 insertions(+), 65 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 808ce45d0d..66cff422ae 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -143,7 +143,8 @@ int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int1
 	return textCodeSize;
 }
 
-static const uint16 text16_punctuationSjis[] = {
+// Has actually punctuation and characters in it, that may not be the first in a line
+static const uint16 text16_shiftJIS_punctuation[] = {
 	0x9F82, 0xA182, 0xA382, 0xA582, 0xA782, 0xC182, 0xA782, 0xC182, 0xE182, 0xE382, 0xE582, 0xEC82,
 	0x4083, 0x4283, 0x4483, 0x4683, 0x4883, 0x6283, 0x8383, 0x8583, 0x8783, 0x8E83, 0x9583, 0x9683,
 	0x5B81, 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881, 0
@@ -151,10 +152,21 @@ static const uint16 text16_punctuationSjis[] = {
 
 // return max # of chars to fit maxwidth with full words, does not include
 // breaking space
-int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgFontId) {
+//  Also adjusts text pointer to the new position for the caller
+// 
+// Special cases in games:
+//  Laura Bow 2 - Credits in the game menu - all the text lines start with spaces (bug #5159)
+//                Act 6 Coroner questionaire - the text of all control buttons has trailing spaces
+//                                              "Detective Ryan Hanrahan O'Riley" contains even more spaces (bug #5334)
+//  Conquests of Camelot - talking with Cobb - one text box of the dialogue contains a longer word,
+//                                              that will be broken into 2 lines (bug #5159)
+int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId orgFontId) {
 	uint16 curChar = 0;
-	int16 maxChars = 0, curCharCount = 0;
-	uint16 width = 0;
+	const char *textStartPtr = textPtr;
+	const char *lastSpacePtr = NULL;
+	int16 lastSpaceCharCount = 0;
+	int16 curCharCount = 0, resultCharCount = 0;
+	uint16 curWidth = 0, tempWidth = 0;
 	GuiResourceId previousFontId = GetFontId();
 	int16 previousPenColor = _ports->_curPort->penClr;
 
@@ -162,35 +174,34 @@ int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgF
 	if (!_font)
 		return 0;
 
-	while (width <= maxWidth) {
-		curChar = (*(const byte *)text++);
+	while (1) {
+		curChar = (*(const byte *)textPtr);
 		if (_font->isDoubleByte(curChar)) {
-			curChar |= (*(const byte *)text++) << 8;
-			curCharCount++;
+			curChar |= (*(const byte *)textPtr + 1) << 8;
 		}
 		switch (curChar) {
 		case 0x7C:
 			if (getSciVersion() >= SCI_VERSION_1_1) {
-				curCharCount++;
-				curCharCount += CodeProcessing(text, orgFontId, previousPenColor, false);
+				curCharCount++; textPtr++;
+				curCharCount += CodeProcessing(textPtr, orgFontId, previousPenColor, false);
 				continue;
 			}
 			break;
 
 		// We need to add 0xD, 0xA and 0xD 0xA to curCharCount and then exit
-		//  which means, we split text like
-		//  'Mature, experienced software analyst available.' 0xD 0xA
-		//  'Bug installation a proven speciality. "No version too clean."' (normal game text, this is from lsl2)
-		//   and 0xA '-------' 0xA (which is the official sierra subtitle separator)
+		//  which means, we split text like for example
+		//  - 'Mature, experienced software analyst available.' 0xD 0xA
+		//    'Bug installation a proven speciality. "No version too clean."' (normal game text, this is from lsl2)
+		//  - 0xA '-------' 0xA (which is the official sierra subtitle separator) (found in multilingual versions)
 		//  Sierra did it the same way.
 		case 0xD:
 			// Check, if 0xA is following, if so include it as well
-			if ((*(const unsigned char *)text) == 0xA)
-				curCharCount++;
+			if ((*(const byte *)textPtr + 1) == 0xA)
+				curCharCount++; textPtr++;
 			// it's meant to pass through here
 		case 0xA:
 		case 0x9781: // this one is used by SQ4/japanese as line break as well
-			curCharCount++;
+			curCharCount++; textPtr++;
 			// and it's also meant to pass through here
 		case 0:
 			SetFont(previousFontId);
@@ -198,55 +209,90 @@ int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgF
 			return curCharCount;
 
 		case ' ':
-			maxChars = curCharCount; // return count up to (but not including) breaking space
+			lastSpaceCharCount = curCharCount; // return count up to (but not including) breaking space
+			lastSpacePtr = textPtr + 1; // remember position right after the current space
 			break;
 		}
-		// Sometimes this can go off the screen, like for example bug #3040161.
-		// However, we only perform this for non-Japanese games, as these require
-		// special handling, done after this loop.
-		if (width + _font->getCharWidth(curChar) > maxWidth && g_sci->getLanguage() != Common::JA_JPN)
+		tempWidth += _font->getCharWidth(curChar);
+		
+		// Width is too large? -> break out
+		if (tempWidth > maxWidth)
 			break;
-		width += _font->getCharWidth(curChar);
-		curCharCount++;
-	}
 
-	// Text without spaces, probably Kanji/Japanese
-	if (maxChars == 0) {
-		maxChars = curCharCount;
+		// still fits, remember width
+		curWidth = tempWidth;
 
-		uint16 nextChar;
+		// go to next character
+		curCharCount++; textPtr++;
+		if (curChar > 0xFF) {
+			// Double-Byte
+			curCharCount++; textPtr++;
+		 }
+	}
 
-		// We remove the last char only, if maxWidth was actually equal width
-		// before adding the last char. Otherwise we won't get the same cutting
-		// as in sierra pc98 sci.
-		if (maxWidth == (width - _font->getCharWidth(curChar))) {
-			maxChars--;
-			if (curChar > 0xFF)
-				maxChars--;
-			nextChar = curChar;
-		} else {
-			nextChar = (*(const byte *)text++);
-			if (_font->isDoubleByte(nextChar))
-				nextChar |= (*(const byte *)text++) << 8;
-		}
-		// sierra checked the following character against a punctuation kanji table
-		if (nextChar > 0xFF) {
-			// if the character is punctuation, we go back one character
-			uint nonBreakingNr = 0;
-			while (text16_punctuationSjis[nonBreakingNr]) {
-				if (text16_punctuationSjis[nonBreakingNr] == nextChar) {
-					maxChars--;
-					if (curChar > 0xFF)
-						maxChars--; // go back 2 chars, when last char was double byte
+	if (lastSpaceCharCount) {
+		// Break and at least one space was found before that
+		resultCharCount = lastSpaceCharCount;
+		
+		// additionally skip over all spaces, that are following that space, but don't count them for displaying purposes
+		textPtr = lastSpacePtr;
+		while (*textPtr == ' ')
+			textPtr++;
+		
+	} else {
+		// Break without spaces found, we split the very first word - may also be Kanji/Japanese
+		if (curChar > 0xFF) {
+			// current charracter is Japanese
+			
+			// PC-9801 SCI actually added the last character, which shouldn't fit anymore, still onto the
+			//  screen in case maxWidth wasn't fully reached with the last character
+			if (maxWidth == curWidth) {
+				curCharCount -= 2; textPtr -= 2;
+				if (textPtr < textStartPtr)
+					error("Seeking back went too far, data corruption?");
+
+				curChar = (*(const byte *)textPtr);
+				if (!_font->isDoubleByte(curChar))
+					error("Non double byte while seeking back");
+				curChar |= (*(const byte *)textPtr + 1) << 8;
+			}
+			
+			// But it also checked, if the current character is not inside a punctuation table and it even
+			//  went backwards in case it found multiple ones inside that table.
+			uint nonBreakingPos = 0;
+			
+			while (1) {
+				// Look up if character shouldn't be the first on a new line
+				nonBreakingPos = 0;
+				while (text16_shiftJIS_punctuation[nonBreakingPos]) {
+					if (text16_shiftJIS_punctuation[nonBreakingPos] == curChar)
+						break;
+					nonBreakingPos++;
+				}
+				if (!text16_shiftJIS_punctuation[nonBreakingPos]) {
+					// character is fine
 					break;
 				}
-				nonBreakingNr++;
+				// Character is not acceptable, seek backward in the text
+				curCharCount -= 2; textPtr -= 2;
+				if (textPtr < textStartPtr)
+					error("Seeking back went too far, data corruption?");
+				
+				curChar = (*(const byte *)textPtr);
+				if (!_font->isDoubleByte(curChar))
+					error("Non double byte while seeking back");
+				curChar |= (*(const byte *)textPtr + 1) << 8;
 			}
+			// include the current character
+			curCharCount += 2; textPtr += 2;
 		}
+
+		// We split the word in that case
+		resultCharCount = curCharCount;
 	}
 	SetFont(previousFontId);
 	_ports->penColor(previousPenColor);
-	return maxChars;
+	return resultCharCount;
 }
 
 void GfxText16::Width(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight, bool restoreFont) {
@@ -328,15 +374,16 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 		// rect.right=found widest line with RTextWidth and GetLongest
 		// rect.bottom=num. lines * GetPointSize
 		rect.right = (maxWidth ? maxWidth : 192);
-		const char *curPos = text;
-		while (*curPos) {
-			charCount = GetLongest(curPos, rect.right, fontId);
+		const char *curTextPos = text; // in work position for GetLongest()
+		const char *curTextLine = text; // starting point of current line
+		while (*curTextPos) {
+			charCount = GetLongest(curTextPos, rect.right, fontId);
 			if (charCount == 0)
 				break;
-			Width(curPos, 0, charCount, fontId, textWidth, textHeight, false);
+			Width(curTextLine, 0, charCount, fontId, textWidth, textHeight, false);
 			maxTextWidth = MAX(textWidth, maxTextWidth);
 			totalHeight += textHeight;
-			curPos += charCount;
+			curTextLine = curTextPos;
 		}
 		rect.bottom = totalHeight;
 		rect.right = maxWidth ? maxWidth : MIN(rect.right, maxTextWidth);
@@ -410,6 +457,8 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
 	GuiResourceId previousFontId = GetFontId();
 	int16 previousPenColor = _ports->_curPort->penClr;
 	bool doubleByteMode = false;
+	const char *curTextPos = text;
+	const char *curTextLine = text;
 
 	if (fontId != -1)
 		SetFont(fontId);
@@ -426,11 +475,11 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
 	_codeRefTempRect.left = _codeRefTempRect.top = -1;
 
 	maxTextWidth = 0;
-	while (*text) {
-		charCount = GetLongest(text, rect.width(), fontId);
+	while (*curTextPos) {
+		charCount = GetLongest(curTextPos, rect.width(), fontId);
 		if (charCount == 0)
 			break;
-		Width(text, 0, charCount, fontId, textWidth, textHeight, true);
+		Width(curTextLine, 0, charCount, fontId, textWidth, textHeight, true);
 		maxTextWidth = MAX<int16>(maxTextWidth, textWidth);
 		switch (alignment) {
 		case SCI_TEXT16_ALIGNMENT_RIGHT:
@@ -449,13 +498,13 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
 		_ports->moveTo(rect.left + offset, rect.top + hline);
 
 		if (show) {
-			Show(text, 0, charCount, fontId, previousPenColor);
+			Show(curTextLine, 0, charCount, fontId, previousPenColor);
 		} else {
-			Draw(text, 0, charCount, fontId, previousPenColor);
+			Draw(curTextLine, 0, charCount, fontId, previousPenColor);
 		}
 
 		hline += textHeight;
-		text += charCount;
+		curTextLine = curTextPos;
 	}
 	SetFont(previousFontId);
 	_ports->penColor(previousPenColor);
diff --git a/engines/sci/graphics/text16.h b/engines/sci/graphics/text16.h
index ab0cb13a64..715891be44 100644
--- a/engines/sci/graphics/text16.h
+++ b/engines/sci/graphics/text16.h
@@ -51,7 +51,7 @@ public:
 
 	void ClearChar(int16 chr);
 
-	int16 GetLongest(const char *text, int16 maxWidth, GuiResourceId orgFontId);
+	int16 GetLongest(const char *&text, int16 maxWidth, GuiResourceId orgFontId);
 	void Width(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight, bool restoreFont);
 	void StringWidth(const char *str, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight);
 	void ShowString(const char *str, GuiResourceId orgFontId, int16 orgPenColor);
-- 
cgit v1.2.3


From c4ca0a7de29ab32d35e72ae88ed399b377a3c2c7 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 02:16:00 +0100
Subject: SCI: fix bug in text16 / GetLongest()

---
 engines/sci/graphics/text16.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 66cff422ae..37d786a849 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -196,8 +196,9 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 		//  Sierra did it the same way.
 		case 0xD:
 			// Check, if 0xA is following, if so include it as well
-			if ((*(const byte *)textPtr + 1) == 0xA)
+			if ((*(const byte *)textPtr + 1) == 0xA) {
 				curCharCount++; textPtr++;
+			}
 			// it's meant to pass through here
 		case 0xA:
 		case 0x9781: // this one is used by SQ4/japanese as line break as well
-- 
cgit v1.2.3


From 9d693b9a793f1d14d9b80a0341ac55dfc2da0b0b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 02:31:32 +0100
Subject: SCI: fix another bug in text16 / GetLongest()

---
 engines/sci/graphics/text16.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 37d786a849..4f9b6c7da8 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -177,7 +177,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 	while (1) {
 		curChar = (*(const byte *)textPtr);
 		if (_font->isDoubleByte(curChar)) {
-			curChar |= (*(const byte *)textPtr + 1) << 8;
+			curChar |= (*(const byte *)(textPtr + 1)) << 8;
 		}
 		switch (curChar) {
 		case 0x7C:
@@ -196,7 +196,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 		//  Sierra did it the same way.
 		case 0xD:
 			// Check, if 0xA is following, if so include it as well
-			if ((*(const byte *)textPtr + 1) == 0xA) {
+			if ((*(const byte *)(textPtr + 1)) == 0xA) {
 				curCharCount++; textPtr++;
 			}
 			// it's meant to pass through here
@@ -255,7 +255,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 				curChar = (*(const byte *)textPtr);
 				if (!_font->isDoubleByte(curChar))
 					error("Non double byte while seeking back");
-				curChar |= (*(const byte *)textPtr + 1) << 8;
+				curChar |= (*(const byte *)(textPtr + 1)) << 8;
 			}
 			
 			// But it also checked, if the current character is not inside a punctuation table and it even
@@ -282,7 +282,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 				curChar = (*(const byte *)textPtr);
 				if (!_font->isDoubleByte(curChar))
 					error("Non double byte while seeking back");
-				curChar |= (*(const byte *)textPtr + 1) << 8;
+				curChar |= (*(const byte *)(textPtr + 1)) << 8;
 			}
 			// include the current character
 			curCharCount += 2; textPtr += 2;
-- 
cgit v1.2.3


From 5aae18feb80ff7aa58ce6f7400d54673af58196b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 13:08:33 +0100
Subject: SCI: text16 Shift-JIS font switch fixed fixes Police Quest 2 Japanese
 intro and others, where the internal SCI font was used and not the Shift-JIS
 hires font

---
 engines/sci/graphics/text16.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 4f9b6c7da8..3769cd3af9 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -362,12 +362,12 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 	else
 		fontId = previousFontId;
 
-	if (g_sci->getLanguage() == Common::JA_JPN)
-		SwitchToFont900OnSjis(text);
-
 	rect.top = rect.left = 0;
 
 	if (maxWidth < 0) { // force output as single line
+		if (g_sci->getLanguage() == Common::JA_JPN)
+			SwitchToFont900OnSjis(text);
+
 		StringWidth(text, fontId, textWidth, textHeight);
 		rect.bottom = textHeight;
 		rect.right = textWidth;
@@ -378,6 +378,10 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 		const char *curTextPos = text; // in work position for GetLongest()
 		const char *curTextLine = text; // starting point of current line
 		while (*curTextPos) {
+			// We need to check for Shift-JIS every line
+			if (g_sci->getLanguage() == Common::JA_JPN)
+				SwitchToFont900OnSjis(curTextPos);
+
 			charCount = GetLongest(curTextPos, rect.right, fontId);
 			if (charCount == 0)
 				break;
@@ -466,17 +470,19 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
 	else
 		fontId = previousFontId;
 
-	if (g_sci->getLanguage() == Common::JA_JPN) {
-		if (SwitchToFont900OnSjis(text))
-			doubleByteMode = true;
-	}
-
 	// Reset reference code rects
 	_codeRefRects.clear();
 	_codeRefTempRect.left = _codeRefTempRect.top = -1;
 
 	maxTextWidth = 0;
 	while (*curTextPos) {
+		// We need to check for Shift-JIS every line
+		//  Police Quest 2 PC-9801 often draws English + Japanese text during the same call
+		if (g_sci->getLanguage() == Common::JA_JPN) {
+			if (SwitchToFont900OnSjis(curTextPos))
+				doubleByteMode = true;
+		}
+
 		charCount = GetLongest(curTextPos, rect.width(), fontId);
 		if (charCount == 0)
 			break;
-- 
cgit v1.2.3


From 8ffd8793ed1f50872c572c6886a5e9100e8312e4 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 15:44:22 +0100
Subject: SCI: add support for \n and \r in Japanese text fixes Police Quest 2
 Japanese intro thx to wjp for helping

---
 engines/sci/engine/state.cpp | 45 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 7701822f6d..1b7fa7699e 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -227,26 +227,53 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 			// Japanese including Kanji, displayed with system font
 			// Convert half-width characters to full-width equivalents
 			Common::String fullWidth;
-			byte c;
+			byte curChar, curChar2;
+			uint16 mappedChar;
+
+			seeker++;
+
+			while (1) {
+				curChar = *(seeker);
+				
+				switch (curChar) {
+				case 0: // Terminator NUL
+					return fullWidth;
+				case '\\':
+					// "\n", "\N", "\r" and "\R" were overwritten with SPACE + 0x0D in PC-9801 SSCI
+					//  inside GetLongest() (text16). We do it here, because it's much cleaner and
+					//  we have to process the text here anyway.
+					//  Occurs for example in Police Quest 2 intro
+					curChar2 = *(seeker + 1);
+					switch (curChar2) {
+					case 'n':
+					case 'N':
+					case 'r':
+					case 'R':
+						fullWidth += ' ';
+						fullWidth += 0x0D; // CR
+						seeker += 2;
+						continue;
+					}
+				}
+				
+				seeker++;
 
-			while ((c = *(++seeker))) {
-				uint16 mappedChar = s_halfWidthSJISMap[c];
+				mappedChar = s_halfWidthSJISMap[curChar];
 				if (mappedChar) {
 					fullWidth += mappedChar >> 8;
 					fullWidth += mappedChar & 0xFF;
 				} else {
 					// Copy double-byte character
-					char c2 = *(++seeker);
-					if (!c2) {
-						error("SJIS character %02X is missing second byte", c);
+					curChar2 = *(seeker++);
+					if (!curChar) {
+						error("SJIS character %02X is missing second byte", curChar);
 						break;
 					}
-					fullWidth += c;
-					fullWidth += c2;
+					fullWidth += curChar;
+					fullWidth += curChar2;
 				}
 			}
 
-			return fullWidth;
 		} else {
 			return Common::String(seeker + 1);
 		}
-- 
cgit v1.2.3


From 11ba4474830ad0557de5a8c2b47dcd3000bc0032 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 19:31:37 +0100
Subject: SCI: bugfix in GetLongest() for Japanese SQ4

---
 engines/sci/graphics/text16.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 3769cd3af9..c5c2054add 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -201,14 +201,17 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 			}
 			// it's meant to pass through here
 		case 0xA:
-		case 0x9781: // this one is used by SQ4/japanese as line break as well
-			curCharCount++; textPtr++;
-			// and it's also meant to pass through here
 		case 0:
 			SetFont(previousFontId);
 			_ports->penColor(previousPenColor);
 			return curCharCount;
 
+		case 0x9781: // this one is used by SQ4/japanese as line break as well
+			curCharCount += 2; textPtr += 2;
+			SetFont(previousFontId);
+			_ports->penColor(previousPenColor);
+			return curCharCount;
+
 		case ' ':
 			lastSpaceCharCount = curCharCount; // return count up to (but not including) breaking space
 			lastSpacePtr = textPtr + 1; // remember position right after the current space
-- 
cgit v1.2.3


From fa7a6d473e07d3bf2068bd58d3474e77634b0b30 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 19:37:23 +0100
Subject: SCI: GetClosest() bugfix the bugfix thx wjp

---
 engines/sci/graphics/text16.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index c5c2054add..7552cb89ef 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -201,13 +201,13 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 			}
 			// it's meant to pass through here
 		case 0xA:
-		case 0:
-			SetFont(previousFontId);
-			_ports->penColor(previousPenColor);
-			return curCharCount;
-
 		case 0x9781: // this one is used by SQ4/japanese as line break as well
-			curCharCount += 2; textPtr += 2;
+			curCharCount++; textPtr++;
+			if (curChar > 0xFF) {
+				curCharCount++; textPtr++;
+			}
+			// and it's also meant to pass through here
+		case 0:
 			SetFont(previousFontId);
 			_ports->penColor(previousPenColor);
 			return curCharCount;
-- 
cgit v1.2.3


From 3f7566c7b183452a6203140b923d7e7a273369dd Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 2 Nov 2014 23:30:06 +0100
Subject: SCI: hoyle 4 workaround properly done (bug #6614) fixes placement of
 edit control caused by uninitialized reads

---
 engines/sci/engine/workarounds.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index ea4dc2fe71..c5730b5345 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -91,7 +91,8 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_HOYLE4,        700,    -1,  1,      "BridgeDefense", "think",          -1,   -1, { WORKAROUND_FAKE,   0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
 	{ GID_HOYLE4,        700,   730,  1,      "BridgeDefense", "beatTheirBest",  -1,    3, { WORKAROUND_FAKE,   0 } }, // rarely while playing bridge
 	{ GID_HOYLE4,        700,    -1,  1,               "Code", "doit",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
-	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,   -1, { WORKAROUND_FAKE,   0 } }, // when saving the game (may also occur in other situations) - bug #6601
+	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,    0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
+	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,    1, { WORKAROUND_FAKE,   1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
 	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2",   0x1d4d,    0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
 	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",       -1,    4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
 	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",            -1,  504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
-- 
cgit v1.2.3


From dfc3bcae20584b79f0b7ea2a6e4ccf0fed29797f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 2 Nov 2014 19:26:18 -0500
Subject: VIDEO: Separate AVI video and audio track reading

Relying on the videos to have 'initial frames' for audio tracks is not the best way to handle AVI videos. Now videos without initial frames (or broken interleaving) will buffer properly.
---
 video/avi_decoder.cpp | 369 ++++++++++++++++++++++++++------------------------
 video/avi_decoder.h   |  16 ++-
 2 files changed, 206 insertions(+), 179 deletions(-)

diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index a5016632d6..7119c72f07 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -319,8 +319,25 @@ bool AVIDecoder::loadStream(Common::SeekableReadStream *stream) {
 		return false;
 	}
 
-	// Seek back to the start of the MOVI list
-	_fileStream->seek(_movieListStart);
+	// Create the status entries
+	uint32 index = 0;
+	for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++, index++) {
+		TrackStatus status;
+		status.track = *it;
+		status.index = index;
+		status.chunkSearchOffset = _movieListStart;
+
+		if ((*it)->getTrackType() == Track::kTrackTypeVideo)
+			_videoTracks.push_back(status);
+		else
+			_audioTracks.push_back(status);
+	}
+
+	if (_videoTracks.size() != 1) {
+		warning("Unhandled AVI video track count: %d", _videoTracks.size());
+		close();
+		return false;
+	}
 
 	// Check if this is a special Duck Truemotion video
 	checkTruemotion1();
@@ -340,79 +357,138 @@ void AVIDecoder::close() {
 
 	_indexEntries.clear();
 	memset(&_header, 0, sizeof(_header));
+
+	_videoTracks.clear();
+	_audioTracks.clear();
 }
 
 void AVIDecoder::readNextPacket() {
-	if ((uint32)_fileStream->pos() >= _movieListEnd) {
-		// Ugh, reached the end premature.
-		forceVideoEnd();
+	// Shouldn't get this unless called on a non-open video
+	if (_videoTracks.empty())
 		return;
-	}
 
-	uint32 nextTag = _fileStream->readUint32BE();
-	uint32 size = _fileStream->readUint32LE();
+	// Get the video frame first
+	handleNextPacket(_videoTracks[0]);
+
+	// Handle audio tracks next
+	for (uint32 i = 0; i < _audioTracks.size(); i++)
+		handleNextPacket(_audioTracks[i]);
+}
+
+void AVIDecoder::handleNextPacket(TrackStatus &status) {
+	// If there's no more to search, bail out
+	if (status.chunkSearchOffset + 8 >= _movieListEnd) {
+		if (status.track->getTrackType() == Track::kTrackTypeVideo) {
+			// Horrible AVI video has a premature end
+			// Force the frame to be the last frame
+			debug(0, "Forcing end of AVI video");
+			((AVIVideoTrack *)status.track)->forceTrackEnd();
+		}
 
-	if (_fileStream->eos()) {
-		// Also premature end.
-		forceVideoEnd();
 		return;
 	}
 
-	if (nextTag == ID_LIST) {
-		// A list of audio/video chunks
-		int32 startPos = _fileStream->pos();
+	// See if audio needs to be buffered and break out if not
+	if (status.track->getTrackType() == Track::kTrackTypeAudio && !shouldQueueAudio(status))
+		return;
 
-		if (_fileStream->readUint32BE() != ID_REC)
-			error("Expected 'rec ' LIST");
+	// Seek to where we shall start searching
+	_fileStream->seek(status.chunkSearchOffset);
+
+	for (;;) {
+		// If there's no more to search, bail out
+		if ((uint32)_fileStream->pos() + 8 >= _movieListEnd) {
+			if (status.track->getTrackType() == Track::kTrackTypeVideo) {
+				// Horrible AVI video has a premature end
+				// Force the frame to be the last frame
+				debug(0, "Forcing end of AVI video");
+				((AVIVideoTrack *)status.track)->forceTrackEnd();
+			}
 
-		size -= 4; // subtract list type
+			break;
+		}
 
-		// Decode chunks in the list
-		while (_fileStream->pos() < startPos + (int32)size)
-			readNextPacket();
+		uint32 nextTag = _fileStream->readUint32BE();
+		uint32 size = _fileStream->readUint32LE();
 
-		return;
-	} else if (nextTag == ID_JUNK || nextTag == ID_IDX1) {
-		skipChunk(size);
-		return;
-	}
+		if (nextTag == ID_LIST) {
+			// A list of audio/video chunks
+			if (_fileStream->readUint32BE() != ID_REC)
+				error("Expected 'rec ' LIST");
 
-	Track *track = getTrack(getStreamIndex(nextTag));
+			continue;
+		} else if (nextTag == ID_JUNK || nextTag == ID_IDX1) {
+			skipChunk(size);
+			continue;
+		}
 
-	if (!track)
-		error("Cannot get track from tag '%s'", tag2str(nextTag));
+		// Only accept chunks for this stream
+		uint32 streamIndex = getStreamIndex(nextTag);
+		if (streamIndex != status.index) {
+			skipChunk(size);
+			continue;
+		}
 
-	Common::SeekableReadStream *chunk = 0;
+		Common::SeekableReadStream *chunk = 0;
 
-	if (size != 0) {
-		chunk = _fileStream->readStream(size);
-		_fileStream->skip(size & 1);
-	}
+		if (size != 0) {
+			chunk = _fileStream->readStream(size);
+			_fileStream->skip(size & 1);
+		}
 
-	if (track->getTrackType() == Track::kTrackTypeAudio) {
-		if (getStreamType(nextTag) != kStreamTypeAudio)
-			error("Invalid audio track tag '%s'", tag2str(nextTag));
+		if (status.track->getTrackType() == Track::kTrackTypeAudio) {
+			if (getStreamType(nextTag) != kStreamTypeAudio)
+				error("Invalid audio track tag '%s'", tag2str(nextTag));
 
-		assert(chunk);
-		((AVIAudioTrack *)track)->queueSound(chunk);
-	} else {
-		AVIVideoTrack *videoTrack = (AVIVideoTrack *)track;
+			assert(chunk);
+			((AVIAudioTrack *)status.track)->queueSound(chunk);
 
-		if (getStreamType(nextTag) == kStreamTypePaletteChange) {
-			// Palette Change
-			videoTrack->loadPaletteFromChunk(chunk);
+			// Break out if we have enough audio
+			if (!shouldQueueAudio(status))
+				break;
 		} else {
-			// Otherwise, assume it's a compressed frame
-			videoTrack->decodeFrame(chunk);
+			AVIVideoTrack *videoTrack = (AVIVideoTrack *)status.track;
+
+			if (getStreamType(nextTag) == kStreamTypePaletteChange) {
+				// Palette Change
+				videoTrack->loadPaletteFromChunk(chunk);
+			} else {
+				// Otherwise, assume it's a compressed frame
+				videoTrack->decodeFrame(chunk);
+				break;
+			}
 		}
 	}
+
+	// Start us off in this position next time
+	status.chunkSearchOffset = _fileStream->pos();
+}
+
+bool AVIDecoder::shouldQueueAudio(TrackStatus& status) {
+	// Sanity check:
+	if (status.track->getTrackType() != Track::kTrackTypeAudio)
+		return false;
+
+	// If video is done, make sure that the rest of the audio is queued
+	// (I guess this is also really a sanity check)
+	AVIVideoTrack *videoTrack = (AVIVideoTrack *)_videoTracks[0].track;
+	if (videoTrack->endOfTrack())
+		return true;
+
+	// Being three frames ahead should be enough for any video.
+	return ((AVIAudioTrack *)status.track)->getCurChunk() < (uint32)(videoTrack->getCurFrame() + 3);
 }
 
 bool AVIDecoder::rewind() {
 	if (!VideoDecoder::rewind())
 		return false;
 
-	_fileStream->seek(_movieListStart);
+	for (uint32 i = 0; i < _videoTracks.size(); i++)
+		_videoTracks[i].chunkSearchOffset = _movieListStart;
+
+	for (uint32 i = 0; i < _audioTracks.size(); i++)
+		_audioTracks[i].chunkSearchOffset = _movieListStart;
+
 	return true;
 }
 
@@ -421,29 +497,9 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 	if (time > getDuration())
 		return false;
 
-	// Track down our video track.
-	// We only support seeking with one video track right now.
-	AVIVideoTrack *videoTrack = 0;
-	int videoIndex = -1;
-	uint trackID = 0;
-
-	for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++, trackID++) {
-		if ((*it)->getTrackType() == Track::kTrackTypeVideo) {
-			if (videoTrack) {
-				// Already have one
-				// -> Not supported
-				return false;
-			}
-
-			videoTrack = (AVIVideoTrack *)*it;
-			videoIndex = trackID;
-		}
-	}
-
-	// Need a video track to go forwards
-	// If there isn't a video track, why would anyone be using AVI then?
-	if (!videoTrack)
-		return false;
+	// Get our video
+	AVIVideoTrack *videoTrack = (AVIVideoTrack *)_videoTracks[0].track;
+	uint32 videoIndex = _videoTracks[0].index;
 
 	// If we seek directly to the end, just mark the tracks as over
 	if (time == getDuration()) {
@@ -464,7 +520,6 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 
 	int lastKeyFrame = -1;
 	int frameIndex = -1;
-	int lastRecord = -1;
 	uint curFrame = 0;
 
 	// Go through and figure out where we should be
@@ -472,40 +527,40 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 	for (uint32 i = 0; i < _indexEntries.size(); i++) {
 		const OldIndex &index = _indexEntries[i];
 
-		if (index.id == ID_REC) {
-			// Keep track of any records we find
-			lastRecord = i;
-		} else {
-			if (getStreamIndex(index.id) != videoIndex)
-				continue;
+		// We don't care about RECs
+		if (index.id == ID_REC)
+			continue;
 
-			uint16 streamType = getStreamType(index.id);
+		// We're only looking at entries for this track
+		if (getStreamIndex(index.id) != videoIndex)
+			continue;
 
-			if (streamType == kStreamTypePaletteChange) {
-				// We need to handle any palette change we see since there's no
-				// flag to tell if this is a "key" palette.
-				// Decode the palette
-				_fileStream->seek(_indexEntries[i].offset + 8);
-				Common::SeekableReadStream *chunk = 0;
+		uint16 streamType = getStreamType(index.id);
 
-				if (_indexEntries[i].size != 0)
-					chunk = _fileStream->readStream(_indexEntries[i].size);
+		if (streamType == kStreamTypePaletteChange) {
+			// We need to handle any palette change we see since there's no
+			// flag to tell if this is a "key" palette.
+			// Decode the palette
+			_fileStream->seek(_indexEntries[i].offset + 8);
+			Common::SeekableReadStream *chunk = 0;
 
-				videoTrack->loadPaletteFromChunk(chunk);
-			} else {
-				// Check to see if this is a keyframe
-				// The first frame has to be a keyframe
-				if ((_indexEntries[i].flags & AVIIF_INDEX) || curFrame == 0)
-					lastKeyFrame = i;
-
-				// Did we find the target frame?
-				if (frame == curFrame) {
-					frameIndex = i;
-					break;
-				}
+			if (_indexEntries[i].size != 0)
+				chunk = _fileStream->readStream(_indexEntries[i].size);
 
-				curFrame++;
+			videoTrack->loadPaletteFromChunk(chunk);
+		} else {
+			// Check to see if this is a keyframe
+			// The first frame has to be a keyframe
+			if ((_indexEntries[i].flags & AVIIF_INDEX) || curFrame == 0)
+				lastKeyFrame = i;
+
+			// Did we find the target frame?
+			if (frame == curFrame) {
+				frameIndex = i;
+				break;
 			}
+
+			curFrame++;
 		}
 	}
 
@@ -513,57 +568,36 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 		return false;
 
 	// Update all the audio tracks
-	uint audioIndex = 0;
-
-	for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++, audioIndex++) {
-		if ((*it)->getTrackType() != Track::kTrackTypeAudio)
-			continue;
-
-		AVIAudioTrack *audioTrack = (AVIAudioTrack *)*it;
-
-		// We need to find where the start of audio should be.
-		// Which is exactly 'initialFrames' audio chunks back from where
-		// our found frame is.
+	for (uint32 i = 0; i < _audioTracks.size(); i++) {
+		AVIAudioTrack *audioTrack = (AVIAudioTrack *)_audioTracks[i].track;
 
 		// Recreate the audio stream
 		audioTrack->resetStream();
 
-		uint framesNeeded = _header.initialFrames;
-		if (framesNeeded == 0)
-			framesNeeded = 1;
+		// Set the chunk index for the track
+		audioTrack->setCurChunk(frame);
 
-		uint startAudioChunk = 0;
-		int startAudioSearch = (lastRecord < 0) ? (frameIndex - 1) : (lastRecord - 1);
+		uint32 chunksFound = 0;
+		for (uint32 j = 0; j < _indexEntries.size(); j++) {
+			const OldIndex &index = _indexEntries[j];
 
-		for (int i = startAudioSearch; i >= 0; i--) {
-			if (getStreamIndex(_indexEntries[i].id) != audioIndex)
+			// Continue ignoring RECs
+			if (index.id == ID_REC)
 				continue;
 
-			assert(getStreamType(_indexEntries[i].id) == kStreamTypeAudio);
-
-			framesNeeded--;
+			if (getStreamIndex(index.id) == _audioTracks[i].index) {
+				if (chunksFound == frame) {
+					_fileStream->seek(index.offset + 8);
+					Common::SeekableReadStream *audioChunk = _fileStream->readStream(index.size);
+					audioTrack->queueSound(audioChunk);
+					_audioTracks[i].chunkSearchOffset = (j == _indexEntries.size() - 1) ? _movieListEnd : _indexEntries[j + 1].offset;
+					break;
+				}
 
-			if (framesNeeded == 0) {
-				startAudioChunk = i;
-				break;
+				chunksFound++;
 			}
 		}
 
-		// Now go forward and queue them all
-		for (int i = startAudioChunk; i <= startAudioSearch; i++) {
-			if (_indexEntries[i].id == ID_REC)
-				continue;
-
-			if (getStreamIndex(_indexEntries[i].id) != audioIndex)
-				continue;
-
-			assert(getStreamType(_indexEntries[i].id) == kStreamTypeAudio);
-
-			_fileStream->seek(_indexEntries[i].offset + 8);
-			Common::SeekableReadStream *chunk = _fileStream->readStream(_indexEntries[i].size);
-			audioTrack->queueSound(chunk);
-		}
-
 		// Skip any audio to bring us to the right time
 		audioTrack->skipAudio(time, videoTrack->getFrameTime(frame));
 	}
@@ -592,15 +626,11 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 		videoTrack->decodeFrame(chunk);
 	}
 
-	// Seek to the right spot
-	// To the beginning of the last record, or frame if that doesn't exist
-	if (lastRecord >= 0)
-		_fileStream->seek(_indexEntries[lastRecord].offset);
-	else
-		_fileStream->seek(_indexEntries[frameIndex].offset);
-
+	// Set the video track's frame
 	videoTrack->setCurFrame((int)frame - 1);
 
+	// Set the video track's search offset to the right spot
+	_videoTracks[0].chunkSearchOffset = _indexEntries[frameIndex].offset;
 	return true;
 }
 
@@ -654,45 +684,22 @@ void AVIDecoder::readOldIndex(uint32 size) {
 	}
 }
 
-void AVIDecoder::forceVideoEnd() {
-	// Horrible AVI video has a premature end
-	// Force the frame to be the last frame
-	debug(0, "Forcing end of AVI video");
-
-	for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++)
-		if ((*it)->getTrackType() == Track::kTrackTypeVideo)
-			((AVIVideoTrack *)*it)->forceTrackEnd();
-}
-
 void AVIDecoder::checkTruemotion1() {
-	AVIVideoTrack *track = 0;
-
-	for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++) {
-		if ((*it)->getTrackType() == Track::kTrackTypeVideo) {
-			if (track) {
-				// Multiple tracks; isn't going to be truemotion 1
-				return;
-			}
+	// If we got here from loadStream(), we know the track is valid
+	assert(!_videoTracks.empty());
 
-			track = (AVIVideoTrack *)*it;
-		}
-	}
-
-	// No track found?
-	if (!track)
-		return;
+	TrackStatus &status = _videoTracks[0];
+	AVIVideoTrack *track = (AVIVideoTrack *)status.track;
 
 	// Ignore non-truemotion tracks
 	if (!track->isTruemotion1())
 		return;
 
-	// Search for a non-empty frame
-	const Graphics::Surface *frame = 0;
-	for (int i = 0; i < 10 && !frame; i++)
-		frame = decodeNextFrame();
+	// Read the next video packet
+	handleNextPacket(status);
 
+	const Graphics::Surface *frame = track->decodeNextFrame();
 	if (!frame) {
-		// Probably shouldn't happen
 		rewind();
 		return;
 	}
@@ -809,7 +816,7 @@ void AVIDecoder::AVIVideoTrack::forceTrackEnd() {
 }
 
 AVIDecoder::AVIAudioTrack::AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType)
-		: _audsHeader(streamHeader), _wvInfo(waveFormat), _soundType(soundType) {
+		: _audsHeader(streamHeader), _wvInfo(waveFormat), _soundType(soundType), _curChunk(0) {
 	_audStream = createAudioStream();
 }
 
@@ -836,12 +843,12 @@ void AVIDecoder::AVIAudioTrack::queueSound(Common::SeekableReadStream *stream) {
 			_audStream->queueAudioStream(Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMMSIma, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign), DisposeAfterUse::YES);
 		} else if (_wvInfo.tag == kWaveFormatDK3) {
 			_audStream->queueAudioStream(Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMDK3, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign), DisposeAfterUse::YES);
-		} else if (_wvInfo.tag == kWaveFormatMP3) {
-			warning("AVI: MP3 audio stream is not supported");
 		}
 	} else {
 		delete stream;
 	}
+
+	_curChunk++;
 }
 
 void AVIDecoder::AVIAudioTrack::skipAudio(const Audio::Timestamp &time, const Audio::Timestamp &frameTime) {
@@ -862,6 +869,7 @@ void AVIDecoder::AVIAudioTrack::skipAudio(const Audio::Timestamp &time, const Au
 void AVIDecoder::AVIAudioTrack::resetStream() {
 	delete _audStream;
 	_audStream = createAudioStream();
+	_curChunk = 0;
 }
 
 bool AVIDecoder::AVIAudioTrack::rewind() {
@@ -874,12 +882,17 @@ Audio::AudioStream *AVIDecoder::AVIAudioTrack::getAudioStream() const {
 }
 
 Audio::QueuingAudioStream *AVIDecoder::AVIAudioTrack::createAudioStream() {
-	if (_wvInfo.tag == kWaveFormatPCM || _wvInfo.tag == kWaveFormatMSADPCM || _wvInfo.tag == kWaveFormatMSIMAADPCM || _wvInfo.tag == kWaveFormatDK3 || _wvInfo.tag == kWaveFormatMP3)
+	if (_wvInfo.tag == kWaveFormatPCM || _wvInfo.tag == kWaveFormatMSADPCM || _wvInfo.tag == kWaveFormatMSIMAADPCM || _wvInfo.tag == kWaveFormatDK3)
 		return Audio::makeQueuingAudioStream(_wvInfo.samplesPerSec, _wvInfo.channels == 2);
+	else if (_wvInfo.tag == kWaveFormatMP3)
+		warning("Unsupported AVI MP3 tracks");
 	else if (_wvInfo.tag != kWaveFormatNone) // No sound
 		warning("Unsupported AVI audio format %d", _wvInfo.tag);
 
 	return 0;
 }
 
+AVIDecoder::TrackStatus::TrackStatus() : track(0), chunkSearchOffset(0) {
+}
+
 } // End of namespace Video
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 4461e537c5..eef127155e 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -216,6 +216,8 @@ protected:
 		Audio::Mixer::SoundType getSoundType() const { return _soundType; }
 		void skipAudio(const Audio::Timestamp &time, const Audio::Timestamp &frameTime);
 		void resetStream();
+		uint32 getCurChunk() const { return _curChunk; }
+		void setCurChunk(uint32 chunk) { _curChunk = chunk; }
 
 		bool isRewindable() const { return true; }
 		bool rewind();
@@ -238,6 +240,15 @@ protected:
 		Audio::Mixer::SoundType _soundType;
 		Audio::QueuingAudioStream *_audStream;
 		Audio::QueuingAudioStream *createAudioStream();
+		uint32 _curChunk;
+	};
+
+	struct TrackStatus {
+		TrackStatus();
+
+		Track *track;
+		uint32 index;
+		uint32 chunkSearchOffset;
 	};
 
 	AVIHeader _header;
@@ -260,9 +271,12 @@ protected:
 	void handleStreamHeader(uint32 size);
 	uint16 getStreamType(uint32 tag) const { return tag & 0xFFFF; }
 	byte getStreamIndex(uint32 tag) const;
-	void forceVideoEnd();
 	void checkTruemotion1();
 
+	void handleNextPacket(TrackStatus& status);
+	bool shouldQueueAudio(TrackStatus& status);
+	Common::Array<TrackStatus> _videoTracks, _audioTracks;
+
 public:
 	virtual AVIAudioTrack *createAudioTrack(AVIStreamHeader sHeader, PCMWaveFormat wvInfo);
 };
-- 
cgit v1.2.3


From 124ac887fd491effed8db2b342f45d7c498c2d28 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 2 Nov 2014 20:45:38 -0500
Subject: VIDEO: Make AVIAudioTrack::resetStream() virtual

In case a subclass (like Zork) needs to override it
---
 video/avi_decoder.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index eef127155e..8941ff4e75 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -215,7 +215,7 @@ protected:
 		virtual void queueSound(Common::SeekableReadStream *stream);
 		Audio::Mixer::SoundType getSoundType() const { return _soundType; }
 		void skipAudio(const Audio::Timestamp &time, const Audio::Timestamp &frameTime);
-		void resetStream();
+		virtual void resetStream();
 		uint32 getCurChunk() const { return _curChunk; }
 		void setCurChunk(uint32 chunk) { _curChunk = chunk; }
 
-- 
cgit v1.2.3


From f733498388267e1fb848eb758a2625c157a84857 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 3 Nov 2014 01:08:15 +0200
Subject: GROOVIE: Finish implementation of o_hotspot_outrect

This is needed by the main menu in the 11th Hour
---
 engines/groovie/script.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 7625151082..4f4e45ddd2 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -1595,8 +1595,7 @@ void Script::o_hotspot_outrect() {
 	bool contained = rect.contains(mousepos);
 
 	if (!contained) {
-		error("hotspot-outrect unimplemented");
-		// TODO: what to do with address?
+		_currentInstruction = address;
 	}
 }
 
-- 
cgit v1.2.3


From 9d6437c01ef4e476fce47d37f4e879b39e830857 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 3 Nov 2014 01:43:19 +0200
Subject: GROOVIE: Add initial full screen functionality for V2 games

---
 engines/groovie/graphics.cpp | 25 ++++++++++++++++++++++---
 engines/groovie/graphics.h   |  2 ++
 engines/groovie/roq.cpp      |  6 ++++++
 engines/groovie/script.cpp   | 20 +++++++++++---------
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp
index b85277fac7..e0c198f377 100644
--- a/engines/groovie/graphics.cpp
+++ b/engines/groovie/graphics.cpp
@@ -63,7 +63,7 @@ void GraphicsMan::update() {
 
 			// Clear the buffer when ending the fade out
 			if (_fading == 2)
-				_foreground.fillRect(Common::Rect(640, 320), 0);
+				_foreground.fillRect(Common::Rect(640, _foreground.h), 0);
 		}
 	}
 
@@ -74,6 +74,22 @@ void GraphicsMan::update() {
 	}
 }
 
+void GraphicsMan::switchToFullScreen(bool fullScreen) {
+	_foreground.free();
+	_background.free();
+
+	if (fullScreen) {
+		_foreground.create(640, 480, _vm->_pixelFormat);
+		_background.create(640, 480, _vm->_pixelFormat);
+	} else {
+		_vm->_system->fillScreen(0);
+		_foreground.create(640, 320, _vm->_pixelFormat);
+		_background.create(640, 320, _vm->_pixelFormat);
+	}
+
+	_changed = true;
+}
+
 void GraphicsMan::change() {
 	_changed = true;
 }
@@ -84,7 +100,7 @@ void GraphicsMan::mergeFgAndBg() {
 
 	countf = (byte *)_foreground.getPixels();
 	countb = (byte *)_background.getPixels();
-	for (i = 640 * 320; i; i--) {
+	for (i = 640 * _foreground.h; i; i--) {
 		if (255 == *(countf)) {
 			*(countf) = *(countb);
 		}
@@ -94,7 +110,10 @@ void GraphicsMan::mergeFgAndBg() {
 }
 
 void GraphicsMan::updateScreen(Graphics::Surface *source) {
-	_vm->_system->copyRectToScreen(source->getPixels(), 640, 0, 80, 640, 320);
+	if (!isFullScreen())
+		_vm->_system->copyRectToScreen(source->getPixels(), source->pitch, 0, 80, 640, 320);
+	else
+		_vm->_system->copyRectToScreen(source->getPixels(), source->pitch, 0, 0, 640, 480);
 	change();
 }
 
diff --git a/engines/groovie/graphics.h b/engines/groovie/graphics.h
index 72ab01deb6..69934f9d68 100644
--- a/engines/groovie/graphics.h
+++ b/engines/groovie/graphics.h
@@ -38,6 +38,8 @@ public:
 	void update();
 	void change();
 	void mergeFgAndBg();
+	void switchToFullScreen(bool fullScreen);
+	bool isFullScreen() { return (_foreground.h == 480); }
 	void updateScreen(Graphics::Surface *source);
 	Graphics::Surface _foreground;	// The main surface that most things are drawn to
 	Graphics::Surface _background;	// Used occasionally, mostly (only?) in puzzles
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 379fcabc07..0c735962b6 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -277,6 +277,12 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) {
 		_prevBuf->create(width, height, _vm->_pixelFormat);
 	}
 
+	// Switch from/to fullscreen, if needed
+	if (_bg->h != 480 && height == 480)
+		_vm->_graphicsMan->switchToFullScreen(true);
+	else if (_bg->h == 480 && height != 480)
+		_vm->_graphicsMan->switchToFullScreen(false);
+
 	// Clear the buffers with black
 	_currBuf->fillRect(Common::Rect(width, height), _vm->_pixelFormat.RGBToColor(0, 0, 0));
 	_prevBuf->fillRect(Common::Rect(width, height), _vm->_pixelFormat.RGBToColor(0, 0, 0));
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 4f4e45ddd2..1d4ad0aec9 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -350,9 +350,10 @@ bool Script::hotspot(Common::Rect rect, uint16 address, uint8 cursor) {
 
 	// Show hotspots when debugging
 	if (DebugMan.isDebugChannelEnabled(kDebugHotspots)) {
-		rect.translate(0, -80);
+		if (!_vm->_graphicsMan->isFullScreen())
+			rect.translate(0, -80);
 		_vm->_graphicsMan->_foreground.frameRect(rect, 250);
-		_vm->_system->copyRectToScreen(_vm->_graphicsMan->_foreground.getPixels(), _vm->_graphicsMan->_foreground.pitch, 0, 80, 640, 320);
+		_vm->_graphicsMan->updateScreen(&_vm->_graphicsMan->_foreground);
 		_vm->_system->updateScreen();
 	}
 
@@ -962,7 +963,7 @@ void Script::o_strcmpnejmp_var() {			// 0x21
 
 void Script::o_copybgtofg() {			// 0x22
 	debugC(1, kDebugScript, "COPY_BG_TO_FG");
-	memcpy(_vm->_graphicsMan->_foreground.getPixels(), _vm->_graphicsMan->_background.getPixels(), 640 * 320);
+	memcpy(_vm->_graphicsMan->_foreground.getPixels(), _vm->_graphicsMan->_background.getPixels(), 640 * _vm->_graphicsMan->_foreground.h);
 }
 
 void Script::o_strcmpeqjmp() {			// 0x23
@@ -1198,6 +1199,7 @@ void Script::o_copyrecttobg() {	// 0x37
 	uint16 top = readScript16bits();
 	uint16 right = readScript16bits();
 	uint16 bottom = readScript16bits();
+	uint16 baseTop = (!_vm->_graphicsMan->isFullScreen()) ? 80 : 0;
 
 	// Sanity checks to prevent bad pointer access crashes
 	if (left > right) {
@@ -1216,9 +1218,9 @@ void Script::o_copyrecttobg() {	// 0x37
 		bottom = top;
 		top = j;
 	}
-	if (top < 80) {
-		warning("COPYRECT top < 80... clamping");
-		top = 80;
+	if (top < baseTop) {
+		warning("COPYRECT top < baseTop... clamping");
+		top = baseTop;
 	}
 	if (top >= 480) {
 		warning("COPYRECT top >= 480... clamping");
@@ -1243,13 +1245,13 @@ void Script::o_copyrecttobg() {	// 0x37
 
 	debugC(1, kDebugScript, "COPYRECT((%d,%d)->(%d,%d))", left, top, right, bottom);
 
-	fg = (byte *)_vm->_graphicsMan->_foreground.getBasePtr(left, top - 80);
-	bg = (byte *)_vm->_graphicsMan->_background.getBasePtr(left, top - 80);
+	fg = (byte *)_vm->_graphicsMan->_foreground.getBasePtr(left, top - baseTop);
+	bg = (byte *)_vm->_graphicsMan->_background.getBasePtr(left, top - baseTop);
 	for (i = 0; i < height; i++) {
 		memcpy(bg + offset, fg + offset, width);
 		offset += 640;
 	}
-	_vm->_system->copyRectToScreen(_vm->_graphicsMan->_background.getBasePtr(left, top - 80), 640, left, top, width, height);
+	_vm->_system->copyRectToScreen(_vm->_graphicsMan->_background.getBasePtr(left, top - baseTop), 640, left, top, width, height);
 	_vm->_graphicsMan->change();
 }
 
-- 
cgit v1.2.3


From a82740516c9f973d8beaf1b11dd2f0a8a6beff5e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 3 Nov 2014 11:33:33 +0200
Subject: GROOVIE: Implement o2_copyscreentobg and o2_copybgtoscreen

---
 engines/groovie/script.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 1d4ad0aec9..479ede5ff4 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -1671,15 +1671,29 @@ void Script::o2_vdxtransition() {
 void Script::o2_copyscreentobg() {
 	uint16 val = readScript16bits();
 
+	// TODO: Parameter
+	if (val)
+		warning("o2_copyscreentobg: Param is %d", val);
+	
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+	_vm->_graphicsMan->_background.copyFrom(screen->getSubArea(Common::Rect(0, 80, 640, 320)));
+	_vm->_system->unlockScreen();
+
 	debugC(1, kDebugScript, "CopyScreenToBG3: 0x%04X", val);
-	error("Unimplemented Opcode 0x4F");
 }
 
 void Script::o2_copybgtoscreen() {
 	uint16 val = readScript16bits();
 
+	// TODO: Parameter
+	if (val)
+		warning("o2_copybgtoscreen: Param is %d", val);
+
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+	_vm->_graphicsMan->_background.copyRectToSurface(*screen, 0, 80, Common::Rect(0, 0, 640, 320 - 80));
+	_vm->_system->unlockScreen();
+
 	debugC(1, kDebugScript, "CopyBG3ToScreen: 0x%04X", val);
-	error("Unimplemented Opcode 0x50");
 }
 
 void Script::o2_setvideoskip() {
-- 
cgit v1.2.3


From 5dc03107fd86abb725eff6d9ea704267534d9dfe Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 3 Nov 2014 11:36:25 +0200
Subject: GROOVIE: Add a stub for opcode 42 in V2 games

This was o_cellmove in T7G (the Microscope puzzle)
---
 engines/groovie/script.cpp | 8 +++++++-
 engines/groovie/script.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 479ede5ff4..c4091f6da7 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -1701,6 +1701,12 @@ void Script::o2_setvideoskip() {
 	debugC(1, kDebugScript, "SetVideoSkip (0x%04X)", _videoSkipAddress);
 }
 
+void Script::o2_stub42() {
+	uint8 arg = readScript8bits();
+	// TODO: Switch with 5 cases (0 - 5). Anything above 5 is a NOP
+	debugC(1, kDebugScript, "STUB42 (0x%02X)", arg);
+}
+
 void Script::o2_stub52() {
 	uint8 arg = readScript8bits();
 	debugC(1, kDebugScript, "STUB52 (0x%02X)", arg);
@@ -1874,7 +1880,7 @@ Script::OpcodeFunc Script::_opcodesV2[NUM_OPCODES] = {
 	&Script::o_loadscript,
 	&Script::o_setvideoorigin, // 0x40
 	&Script::o_sub,
-	&Script::o_cellmove,
+	&Script::o2_stub42,
 	&Script::o_returnscript,
 	&Script::o_sethotspotright, // 0x44
 	&Script::o_sethotspotleft,
diff --git a/engines/groovie/script.h b/engines/groovie/script.h
index 35e52593de..a9f6143509 100644
--- a/engines/groovie/script.h
+++ b/engines/groovie/script.h
@@ -238,6 +238,7 @@ private:
 	void o2_setvideoskip();
 	void o2_copyscreentobg();
 	void o2_copybgtoscreen();
+	void o2_stub42();
 	void o2_stub52();
 	void o2_setscriptend();
 };
-- 
cgit v1.2.3


From 35577ab71e8482ce629decb220b7df0cf0482d0f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 3 Nov 2014 11:38:01 +0200
Subject: GROOVIE: Initial implementation of direct game load for the 11th Hour

---
 engines/groovie/script.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index c4091f6da7..eef97b6ff9 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -179,12 +179,20 @@ void Script::directGameLoad(int slot) {
 
 	// TODO: Return to the main script, likely reusing most of o_returnscript()
 
-	// HACK: We set variable 0x19 to the slot to load, and set the current
-	// instruction to the one that actually loads the saved game specified
-	// in that variable. This will change in other versions of the game and
-	// in other games.
-	setVariable(0x19, slot);
-	_currentInstruction = 0x287;
+	// HACK: We set the slot to load in the appropriate variable, and set the
+	// current instruction to the one that actually loads the saved game
+	// specified in that variable. This differs depending on the game and its
+	// version.
+	if (_version == kGroovieT7G) {
+		// 7th Guest
+		setVariable(0x19, slot);
+		_currentInstruction = 0x287;
+	} else {
+		// 11th Hour
+		setVariable(0xF, slot);
+		// FIXME: This bypasses a lot of the game's initialization procedure
+		_currentInstruction = 0xE78E;
+	}
 
 	// TODO: We'll probably need to start by running the beginning of the
 	// script to let it do the soundcard initialization and then do the
-- 
cgit v1.2.3


From 2d42ab88b714ba720971482b31378f9c985dfab7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 3 Nov 2014 12:41:37 +0200
Subject: GROOVIE: Fix video transparency in V2 games

---
 engines/groovie/roq.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 0c735962b6..065621e8e0 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -28,6 +28,7 @@
 #include "groovie/groovie.h"
 
 #include "common/debug.h"
+#include "common/debug-channels.h"
 #include "common/rect.h"
 #include "common/substream.h"
 #include "common/textconsole.h"
@@ -63,6 +64,18 @@ ROQPlayer::~ROQPlayer() {
 }
 
 uint16 ROQPlayer::loadInternal() {
+	if (DebugMan.isDebugChannelEnabled(kDebugVideo)) {
+		int8 i;
+		debugN(1, "Groovie::ROQ: New ROQ: bitflags are ");
+		for (i = 15; i >= 0; i--) {
+			debugN(1, "%d", _flags & (1 << i)? 1 : 0);
+			if (i % 4 == 0) {
+				debugN(1, " ");
+			}
+		}
+		debug(1, " <- 0 ");
+	}
+
 	// Begin reading the file
 	debugC(1, kDebugVideo, "Groovie::ROQ: Loading video");
 
@@ -106,13 +119,18 @@ uint16 ROQPlayer::loadInternal() {
 }
 
 void ROQPlayer::buildShowBuf() {
+	uint32 transparent = _alpha ? 0 : _vm->_pixelFormat.RGBToColor(255, 255, 255);
+
 	for (int line = 0; line < _bg->h; line++) {
 		uint32 *out = (uint32 *)_bg->getBasePtr(0, line);
 		uint32 *in = (uint32 *)_currBuf->getBasePtr(0, line / _scaleY);
 
 		for (int x = 0; x < _bg->w; x++) {
 			// Copy a pixel
-			*out++ = *in;
+			if (*in != transparent)
+				*out++ = *in;
+			else
+				out++;
 
 			// Skip to the next pixel
 			if (!(x % _scaleX))
-- 
cgit v1.2.3


From 3f21de4694080f07f7927afdc11c4093e523dd6f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 4 Nov 2014 10:08:07 +0600
Subject: ZVISION: Make ZorkAVIAudioTrack resetable

---
 engines/zvision/video/zork_avi_decoder.cpp | 4 ++++
 engines/zvision/video/zork_avi_decoder.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index e7624342e8..a9dc7765d4 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -55,4 +55,8 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 	}
 }
 
+void ZorkAVIDecoder::ZorkAVIAudioTrack::resetStream() {
+	decoder->init();
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/video/zork_avi_decoder.h b/engines/zvision/video/zork_avi_decoder.h
index db1ad312c7..89c0d1e4b9 100644
--- a/engines/zvision/video/zork_avi_decoder.h
+++ b/engines/zvision/video/zork_avi_decoder.h
@@ -52,6 +52,7 @@ private:
 		}
 
 		void queueSound(Common::SeekableReadStream *stream);
+		void resetStream();
 	private:
 		RawChunkStream *decoder;
 	};
-- 
cgit v1.2.3


From d40caba5b748be38f2b6fe4c70af7eeccedd0ab8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 4 Nov 2014 10:09:27 +0600
Subject: ZVISION: If ZorkAVIAudioTrack got another format call
 AVIAudioTrack::queueSound

---
 engines/zvision/video/zork_avi_decoder.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index a9dc7765d4..415a20d3f2 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -48,10 +48,9 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 
 			if (chunk.data)
 				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_STEREO);
+		} else {
+			AVIAudioTrack::queueSound(stream);
 		}
-	} else {
-		warning("Got %d wave format in AVI\n", _wvInfo.tag);
-		delete stream;
 	}
 }
 
-- 
cgit v1.2.3


From be8cf9767470cc8ca9d35539b768817cf74b89c6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Tue, 4 Nov 2014 10:12:13 +0600
Subject: ZVISION: Implement settings functions

---
 engines/zvision/scripting/script_manager.cpp |  4 ++-
 engines/zvision/scripting/script_manager.h   |  1 +
 engines/zvision/zvision.cpp                  | 52 ++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index fea3c2e199..d2165734b4 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -96,7 +96,7 @@ void ScriptManager::execScope(script_scope &scope) {
 	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
 		(*PuzzleIter)->addedBySetState = 0;
 
-	if (scope.proc_count < 2 || getStateValue(76)) {
+	if (scope.proc_count < 2 || getStateValue(StateKey_ExecScopeStyle)) {
 		for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
 			checkPuzzleCriteria(*PuzzleIter, scope.proc_count);
 	} else {
@@ -738,6 +738,8 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	// Place for read prefs
 	_engine->setRenderDelay(10);
 	setStateValue(StateKey_RestoreFlag, 1);
+
+	_engine->loadSettings();
 }
 
 Location ScriptManager::getCurrentLocation() const {
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 219cff9f45..3fcbad5fa4 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -86,6 +86,7 @@ enum StateKey {
 	StateKey_ShowErrorDlg = 73,
 	StateKey_DebugCheats = 74,
 	StateKey_JapanFonts = 75,
+	StateKey_ExecScopeStyle = 76,
 	StateKey_Brightness = 77,
 	StateKey_EF9_R = 91,
 	StateKey_EF9_G = 92,
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 0bc5fef39a..77c47d9b1e 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -54,6 +54,32 @@
 
 namespace ZVision {
 
+#define ZVISION_SETTINGS_KEYS_COUNT 17
+
+struct zvisionIniSettings {
+	const char *name;
+	int16 slot;
+	int16 deflt;
+} settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
+	{"ZVision_KeyboardTurnSpeed", StateKey_KbdRotateSpeed, 5},
+	{"ZVision_PanaRotateSpeed", StateKey_RotateSpeed, 540},
+	{"ZVision_QSoundEnabled", StateKey_Qsound, 1},
+	{"ZVision_VenusEnabled", StateKey_VenusEnable, 1},
+	{"ZVision_HighQuality", StateKey_HighQuality, 1},
+	{"ZVision_Platform", StateKey_Platform, 0},
+	{"ZVision_InstallLevel", StateKey_InstallLevel, 0},
+	{"ZVision_CountryCode", StateKey_CountryCode, 0},
+	{"ZVision_CPU", StateKey_CPU, 1},
+	{"ZVision_MovieCursor", StateKey_MovieCursor, 1},
+	{"ZVision_NoAnimWhileTurning", StateKey_NoTurnAnim, 0},
+	{"ZVision_Win958", StateKey_WIN958, 0},
+	{"ZVision_ShowErrorDialogs", StateKey_ShowErrorDlg, 0},
+	{"ZVision_ShowSubtitles", StateKey_Subtitles, 1},
+	{"ZVision_DebugCheats", StateKey_DebugCheats, 0},
+	{"ZVision_JapaneseFonts", StateKey_JapanFonts, 0},
+	{"ZVision_Brightness", StateKey_Brightness, 0}
+};
+
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	: Engine(syst),
 	  _gameDescription(gameDesc),
@@ -93,6 +119,28 @@ ZVision::~ZVision() {
 	DebugMan.clearAllDebugChannels();
 }
 
+void ZVision::registerDefaultSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++)
+		ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].deflt);
+	ConfMan.registerDefault("doublefps", false);
+}
+
+void ZVision::loadSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++)
+		_scriptManager->setStateValue(settingsKeys[i].slot, ConfMan.getInt(settingsKeys[i].name));
+
+	if (getGameId() == GID_NEMESIS)
+		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 1);
+	else
+		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 0);
+}
+
+void ZVision::saveSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++)
+		ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
+	ConfMan.flushToDisk();
+}
+
 void ZVision::initialize() {
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 
@@ -171,6 +219,10 @@ void ZVision::initialize() {
 	_scriptManager->initialize();
 	_stringManager->initialize(_gameDescription->gameId);
 
+	registerDefaultSettings();
+
+	loadSettings();
+
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
 	_halveDelay = ConfMan.getBool("doublefps");
-- 
cgit v1.2.3


From 70fe89b92d81bcdbc827c4467e508b3ad3d26051 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 4 Nov 2014 11:51:13 +0200
Subject: GROOVIE: More work on transparency in the puzzle scenes for V2 games

This fixes most of the transparency issues in the puzzle screens.
They are still not correct, as the relevant videos play completely,
instead of showing a single frame. This also fixes issues with commit
2d42ab8
---
 engines/groovie/roq.cpp | 23 ++++++++++++++---------
 engines/groovie/roq.h   |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 065621e8e0..34689d8aa2 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -47,6 +47,7 @@ namespace Groovie {
 
 ROQPlayer::ROQPlayer(GroovieEngine *vm) :
 	VideoPlayer(vm), _codingTypeCount(0),
+	_fg(&_vm->_graphicsMan->_foreground),
 	_bg(&_vm->_graphicsMan->_background),
 	_firstFrame(true) {
 
@@ -119,18 +120,19 @@ uint16 ROQPlayer::loadInternal() {
 }
 
 void ROQPlayer::buildShowBuf() {
-	uint32 transparent = _alpha ? 0 : _vm->_pixelFormat.RGBToColor(255, 255, 255);
+	if (_alpha)
+		_fg->copyFrom(*_bg);
 
 	for (int line = 0; line < _bg->h; line++) {
-		uint32 *out = (uint32 *)_bg->getBasePtr(0, line);
+		uint32 *out = _alpha ? (uint32 *)_fg->getBasePtr(0, line) : (uint32 *)_bg->getBasePtr(0, line);
 		uint32 *in = (uint32 *)_currBuf->getBasePtr(0, line / _scaleY);
 
 		for (int x = 0; x < _bg->w; x++) {
-			// Copy a pixel
-			if (*in != transparent)
-				*out++ = *in;
-			else
+			// Copy a pixel, checking the alpha channel first
+			if (_alpha && !(*in & 0xFF))
 				out++;
+			else
+				*out++ = *in;
 
 			// Skip to the next pixel
 			if (!(x % _scaleX))
@@ -167,7 +169,8 @@ bool ROQPlayer::playFrameInternal() {
 
 	if (_dirty) {
 		// Update the screen
-		_syst->copyRectToScreen(_bg->getPixels(), _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h);
+		void *src = (_alpha) ? _fg->getPixels() : _bg->getPixels();
+		_syst->copyRectToScreen(src, _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h);
 		_syst->updateScreen();
 
 		// Clear the dirty flag
@@ -302,8 +305,10 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) {
 		_vm->_graphicsMan->switchToFullScreen(false);
 
 	// Clear the buffers with black
-	_currBuf->fillRect(Common::Rect(width, height), _vm->_pixelFormat.RGBToColor(0, 0, 0));
-	_prevBuf->fillRect(Common::Rect(width, height), _vm->_pixelFormat.RGBToColor(0, 0, 0));
+	if (!_alpha) {
+		_currBuf->fillRect(Common::Rect(width, height), _vm->_pixelFormat.RGBToColor(0, 0, 0));
+		_prevBuf->fillRect(Common::Rect(width, height), _vm->_pixelFormat.RGBToColor(0, 0, 0));
+	}
 
 	return true;
 }
diff --git a/engines/groovie/roq.h b/engines/groovie/roq.h
index 7e7d38580e..3a85517f59 100644
--- a/engines/groovie/roq.h
+++ b/engines/groovie/roq.h
@@ -75,7 +75,7 @@ private:
 	byte _codebook4[256 * 4];
 
 	// Buffers
-	Graphics::Surface *_bg;
+	Graphics::Surface *_fg, *_bg;
 	Graphics::Surface *_currBuf, *_prevBuf;
 	void buildShowBuf();
 	byte _scaleX, _scaleY;
-- 
cgit v1.2.3


From d8e650b4cbfd76ed448e5ebc2caab3db5b1d1d55 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 4 Nov 2014 11:52:09 +0200
Subject: GROOVIE: Handle flag 2 for V2 games (show a whole overlay video)

---
 engines/groovie/roq.cpp | 9 +++++++--
 engines/groovie/roq.h   | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 34689d8aa2..1996181571 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -77,6 +77,10 @@ uint16 ROQPlayer::loadInternal() {
 		debug(1, " <- 0 ");
 	}
 
+	// Flags:
+	// - 2 For overlay videos, show the whole video
+	_flagTwo =	((_flags & (1 << 2)) != 0);
+
 	// Begin reading the file
 	debugC(1, kDebugVideo, "Groovie::ROQ: Loading video");
 
@@ -177,8 +181,9 @@ bool ROQPlayer::playFrameInternal() {
 		_dirty = false;
 	}
 
-	// Return whether the video has ended
-	return _file->eos();
+	// Report the end of the video if we reached the end of the file or if we
+	// just wanted to play one frame.
+	return _file->eos() || (_alpha && !_flagTwo);
 }
 
 bool ROQPlayer::readBlockHeader(ROQBlockHeader &blockHeader) {
diff --git a/engines/groovie/roq.h b/engines/groovie/roq.h
index 3a85517f59..b720e6a235 100644
--- a/engines/groovie/roq.h
+++ b/engines/groovie/roq.h
@@ -74,6 +74,9 @@ private:
 	uint32 _codebook2[256 * 4];
 	byte _codebook4[256 * 4];
 
+	// Flags
+	bool _flagTwo;
+
 	// Buffers
 	Graphics::Surface *_fg, *_bg;
 	Graphics::Surface *_currBuf, *_prevBuf;
-- 
cgit v1.2.3


From c9a60233d587fd67ec00aeb494e8a7c1df4d2a3f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 4 Nov 2014 12:40:08 +0200
Subject: GROOVIE: More bugfixes for V2 puzzle overlay videos

---
 engines/groovie/roq.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 1996181571..49d6158973 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -169,7 +169,9 @@ bool ROQPlayer::playFrameInternal() {
 	}
 
 	// Wait until the current frame can be shown
-	waitFrame();
+	// Don't wait if we're just showing one frame
+	if (!(_alpha && !_flagTwo))
+		waitFrame();
 
 	if (_dirty) {
 		// Update the screen
@@ -177,6 +179,10 @@ bool ROQPlayer::playFrameInternal() {
 		_syst->copyRectToScreen(src, _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h);
 		_syst->updateScreen();
 
+		// For overlay videos, set the background buffer when the video ends
+		if (_alpha && (!_flagTwo || (_flagTwo && _file->eos())))
+			_bg->copyFrom(*_fg);
+
 		// Clear the dirty flag
 		_dirty = false;
 	}
-- 
cgit v1.2.3


From 028238ed5481838828652d43e647d317641745fe Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 4 Nov 2014 12:57:58 +0200
Subject: GROOVIE: Handle transparency in Gamepad videos in the 11th Hour

---
 engines/groovie/roq.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 49d6158973..8f272d4404 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -135,6 +135,10 @@ void ROQPlayer::buildShowBuf() {
 			// Copy a pixel, checking the alpha channel first
 			if (_alpha && !(*in & 0xFF))
 				out++;
+			else if (_fg->h == 480 && *in == _vm->_pixelFormat.RGBToColor(255, 255, 255))
+				// Handle transparency in Gamepad videos
+				// TODO: For now, we detect these videos by checking for full screen
+				out++;
 			else
 				*out++ = *in;
 
-- 
cgit v1.2.3


From dfe465e26ba88b850644979cbd9835d296fca728 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sun, 26 Oct 2014 22:57:28 +0100
Subject: WINTERMUTE: Introduce WMEGameDescription

I aped what has been done with AGS: in engines/agi/detection.cpp, adding
a struct that includes ADGameDescription at the beginning.

This is also recommended in advancedDetector.h
---
 engines/wintermute/base/base_engine.cpp |    3 +-
 engines/wintermute/base/base_engine.h   |    9 +-
 engines/wintermute/detection.cpp        |    6 +-
 engines/wintermute/detection_tables.h   | 2801 +++++++++++++++++--------------
 engines/wintermute/game_description.h   |   53 +
 engines/wintermute/wintermute.cpp       |    4 +-
 engines/wintermute/wintermute.h         |    5 +-
 7 files changed, 1647 insertions(+), 1234 deletions(-)
 create mode 100644 engines/wintermute/game_description.h

diff --git a/engines/wintermute/base/base_engine.cpp b/engines/wintermute/base/base_engine.cpp
index 7c2e9c8468..2166a3e070 100644
--- a/engines/wintermute/base/base_engine.cpp
+++ b/engines/wintermute/base/base_engine.cpp
@@ -61,10 +61,11 @@ BaseEngine::~BaseEngine() {
 	delete _classReg;
 }
 
-void BaseEngine::createInstance(const Common::String &targetName, const Common::String &gameId, Common::Language lang) {
+void BaseEngine::createInstance(const Common::String &targetName, const Common::String &gameId, Common::Language lang, WMETargetExecutable targetExecutable) {
 	instance()._targetName = targetName;
 	instance()._gameId = gameId;
 	instance()._language = lang;
+	instance()._targetExecutable = targetExecutable;
 	instance().init();
 }
 
diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h
index dd82cf9c29..0f4a6b0775 100644
--- a/engines/wintermute/base/base_engine.h
+++ b/engines/wintermute/base/base_engine.h
@@ -34,6 +34,8 @@
 #include "common/random.h"
 #include "common/language.h"
 
+#include "engines/wintermute/game_description.h"
+
 namespace Wintermute {
 
 class BaseFileManager;
@@ -53,10 +55,12 @@ class BaseEngine : public Common::Singleton<Wintermute::BaseEngine> {
 	Common::RandomSource *_rnd;
 	SystemClassRegistry *_classReg;
 	Common::Language _language;
+	WMETargetExecutable _targetExecutable;
 public:
 	BaseEngine();
 	~BaseEngine();
-	static void createInstance(const Common::String &targetName, const Common::String &gameId, Common::Language lang);
+	static void createInstance(const Common::String &targetName, const Common::String &gameId, Common::Language lang, WMETargetExecutable targetExecutable = LATEST_VERSION);
+
 	void setGameRef(BaseGame *gameRef) { _gameRef = gameRef; }
 
 	Common::RandomSource *getRandomSource() { return _rnd; }
@@ -73,6 +77,9 @@ public:
 	const char *getGameTargetName() const { return _targetName.c_str(); }
 	Common::String getGameId() const { return _gameId; }
 	Common::Language getLanguage() const { return _language; }
+	WMETargetExecutable getTargetExecutable() const {
+		return _targetExecutable;
+	}
 };
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index a659c434d0..aca682ae99 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -74,7 +74,7 @@ static const char *directoryGlobs[] = {
 
 class WintermuteMetaEngine : public AdvancedMetaEngine {
 public:
-	WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(ADGameDescription), Wintermute::wintermuteGames, gameGuiOptions) {
+	WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) {
 		_singleid = "wintermute";
 		_guioptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS);
 		_maxScanDepth = 2;
@@ -127,8 +127,8 @@ public:
 	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 		assert(syst);
 		assert(engine);
-
-		*engine = new Wintermute::WintermuteEngine(syst, desc);
+		const WMEGameDescription *gd = (const WMEGameDescription *)desc;
+		*engine = new Wintermute::WintermuteEngine(syst, gd);
 		return true;
 	}
 
diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 8206ca9643..98bf3c1136 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -90,1341 +90,1692 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{0, 0}
 };
 
-static const ADGameDescription gameDescriptions[] = {
-	// Five Lethal Demons
-	{
-		"5ld",
-		"",
-		AD_ENTRY1s("data.dcp", "1037a77cbd001e0644898addc022322c", 15407750),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Five Magical Amulets
-	{
-		"5ma",
-		"",
-		AD_ENTRY1s("data.dcp", "0134e92bcd5fd2837df3971087e96067", 163316498),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Actual Destination
-	{
-		"actualdest",
-		"",
-		AD_ENTRY1s("data.dcp", "6926f44b26f21ceb1d840eaab9aeb510", 9081740),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Boredom of Agustin Cordes
-	{
-		"agustin",
-		"",
-		AD_ENTRY1s("data.dcp", "abb79c16c9b92e9b06525a4c7c3f5861", 2461949),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Beyond the Threshold
-	{
-		"bthreshold",
-		"",
-		AD_ENTRY1s("data.dcp", "d49bf9ccb2e74507447c82d6ad3e2bc4", 12773712),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Bickadoodle
-	{
-		"bickadoodle",
-		"",
-		AD_ENTRY1s("data.dcp", "84db4d1594cac95e25614985775d10a8", 35303844),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Bickadoodle (Ver 1.1)
-	{
-		"bickadoodle",
-		"Version 1.1",
-		AD_ENTRY1s("data.dcp", "8bb52ac9a9ee129c5059e8e808b669d7", 35337760),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
-	{
-		"bickadoodle",
-		"",
-		AD_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Book of Gron Part One
-	{
-		"bookofgron",
-		"",
-		AD_ENTRY1s("data.dcp", "e61b2ebee044a82fa0f8ca0fce2c8946", 83129531),
-		Common::RU_RUS,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Carol Reed 4 - East Side Story (Demo)
-	{
-		"carolreed4",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Carol Reed 4 - East Side Story
-	{
-		"carolreed4",
-		"",
-		AD_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Carol Reed 5 - The Colour of Murder
-	{
-		"carolreed5",
-		"",
-		AD_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Carol Reed 6 - Black Circle
-	{
-		"carolreed6",
-		"",
-		AD_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Carol Reed 7 - Blue Madonna (Demo)
-	{
-		"carolreed7",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Carol Reed 7 - Blue Madonna
-	{
-		"carolreed7",
-		"",
-		AD_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Carol Reed 8 - Amber's Blood
-	{
-		"carolreed8",
-		"",
-		AD_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Carol Reed 9 - Cold Case Summer
-	{
-		"carolreed9",
-		"",
-		AD_ENTRY1s("data.dcp", "2b343b48a7aee508d728a546b414a255", 620005266),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Chivalry is Not Dead
-	{
-		"chivalry",
-		"",
-		AD_ENTRY1s("data.dcp", "ebd0915d9a12df5224be22f53bb23eb6", 7278306),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_TESTING,
-		GUIO0()
-	},
-	// Chivalry is Not Dead (Version from deirdrakai.com)
-	{
-		"chivalry",
-		"",
-		AD_ENTRY1s("data.dcp", "ae6d91b9517f4d2851a8ad94c96951c8", 7278302),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_TESTING,
-		GUIO0()
-	},
-	// Conspiracao Dumont
-	{
-		"conspiracao",
-		"",
-		AD_ENTRY1s("ConspiracaoDumont.exe", "106f3f2c8f18bb5ffffeed634ace256c", 32908032),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Corrosion: Cold Winter Waiting
-	{
-		"corrosion",
-		"",
-		AD_ENTRY1s("data.dcp", "ae885b1a8faa0b27f43c0e8f0df02fc9", 525931618),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_TESTING,
-		GUIO0()
-	},
-	// Dead City (Czech)
-	{
-		"deadcity",
-		"",
-		{
-			// The Czech data are in data.dcp, so in this case we'll have to
-			// just detect the english version twice, to give the user a choice.
-			{"english.dcp", 0, "c591046d6de7e381d76f70e0787b2b1f", 415935},
-			{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-			AD_LISTEND
-		},
-		Common::CZ_CZE,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Dead City (English)
-	{
-		"deadcity",
-		"",
-		{
-			{"english.dcp", 0, "c591046d6de7e381d76f70e0787b2b1f", 415935},
-			{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-			AD_LISTEND
-		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Dead City (Italian)
-	{
-		"deadcity",
-		"",
+static const WMEGameDescription gameDescriptions[] = {
+	{
+		// Five Lethal Demons
+		{
+			"5ld",
+			"",
+			AD_ENTRY1s("data.dcp", "1037a77cbd001e0644898addc022322c", 15407750),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Five Magical Amulets
+		{
+			"5ma",
+			"",
+			AD_ENTRY1s("data.dcp", "0134e92bcd5fd2837df3971087e96067", 163316498),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		WME_1_7_0
+	},
+	{
+		// Actual Destination
+		{
+			"actualdest",
+			"",
+			AD_ENTRY1s("data.dcp", "6926f44b26f21ceb1d840eaab9aeb510", 9081740),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Boredom of Agustin Cordes
+		{
+			"agustin",
+			"",
+			AD_ENTRY1s("data.dcp", "abb79c16c9b92e9b06525a4c7c3f5861", 2461949),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Beyond the Threshold
+		{
+			"bthreshold",
+			"",
+			AD_ENTRY1s("data.dcp", "d49bf9ccb2e74507447c82d6ad3e2bc4", 12773712),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Bickadoodle
+		{
+			"bickadoodle",
+			"",
+			AD_ENTRY1s("data.dcp", "84db4d1594cac95e25614985775d10a8", 35303844),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Bickadoodle (Ver 1.1)
+		{
+			"bickadoodle",
+			"Version 1.1",
+			AD_ENTRY1s("data.dcp", "8bb52ac9a9ee129c5059e8e808b669d7", 35337760),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
+		{
+			"bickadoodle",
+			"",
+			AD_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Book of Gron Part One
+		{
+			"bookofgron",
+			"",
+			AD_ENTRY1s("data.dcp", "e61b2ebee044a82fa0f8ca0fce2c8946", 83129531),
+			Common::RU_RUS,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 4 - East Side Story (Demo)
+		{
+			"carolreed4",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 4 - East Side Story
+		{
+			"carolreed4",
+			"",
+			AD_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 5 - The Colour of Murder
+		{
+			"carolreed5",
+			"",
+			AD_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 6 - Black Circle
+		{
+			"carolreed6",
+			"",
+			AD_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 7 - Blue Madonna (Demo)
+		{
+			"carolreed7",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 7 - Blue Madonna
+		{
+			"carolreed7",
+			"",
+			AD_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 8 - Amber's Blood
+		{
+			"carolreed8",
+			"",
+			AD_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Carol Reed 9 - Cold Case Summer
+		{
+			"carolreed9",
+			"",
+			AD_ENTRY1s("data.dcp", "2b343b48a7aee508d728a546b414a255", 620005266),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Chivalry is Not Dead
+		{
+			"chivalry",
+			"",
+			AD_ENTRY1s("data.dcp", "ebd0915d9a12df5224be22f53bb23eb6", 7278306),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_TESTING,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Chivalry is Not Dead (Version from deirdrakai.com)
+		{
+			"chivalry",
+			"",
+			AD_ENTRY1s("data.dcp", "ae6d91b9517f4d2851a8ad94c96951c8", 7278302),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_TESTING,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Conspiracao Dumont
+		{
+			"conspiracao",
+			"",
+			AD_ENTRY1s("ConspiracaoDumont.exe", "106f3f2c8f18bb5ffffeed634ace256c", 32908032),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Corrosion: Cold Winter Waiting
+		{
+			"corrosion",
+			"",
+			AD_ENTRY1s("data.dcp", "ae885b1a8faa0b27f43c0e8f0df02fc9", 525931618),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_TESTING,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Dead City (Czech)
+		{
+			"deadcity",
+			"",
+			{
+				// The Czech data are in data.dcp, so in this case we'll have to
+				// just detect the english version twice, to give the user a choice.
+				{"english.dcp", 0, "c591046d6de7e381d76f70e0787b2b1f", 415935},
+				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
+				AD_LISTEND
+			},
+			Common::CZ_CZE,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Dead City (English)
 		{
-			{"italian.dcp", 0, "92d8efb94436bec7bd1b7fe0b548192e", 454037},
-			{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-			AD_LISTEND
+			"deadcity",
+			"",
+			{
+				{"english.dcp", 0, "c591046d6de7e381d76f70e0787b2b1f", 415935},
+				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Dead City (Russian)
 	{
-		"deadcity",
-		"",
+		// Dead City (Italian)
 		{
-			{"russian.dcp", 0, "a0ae71e9e1185596fffb07ad2c951eb9", 653317},
-			{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-			AD_LISTEND
+			"deadcity",
+			"",
+			{
+				{"italian.dcp", 0, "92d8efb94436bec7bd1b7fe0b548192e", 454037},
+				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
+				AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::RU_RUS,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Dirty Split (Czech)
-	{
-		"dirtysplit",
-		"",
+	{
+		// Dead City (Russian)
+		{
+			"deadcity",
+			"",
+			{
+				{"russian.dcp", 0, "a0ae71e9e1185596fffb07ad2c951eb9", 653317},
+				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
+				AD_LISTEND
+			},
+			Common::RU_RUS,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Dirty Split (Czech)
 		{
-			{"czech.dcp", 0, "08a71446467cf8f9444cfea446b46ad6", 127697934},
-			{"data.dcp", 0, "8b4b81b718bf65f30a67fc0b1e329eb5", 88577623},
+			"dirtysplit",
+			"",
+			{
+				{"czech.dcp", 0, "08a71446467cf8f9444cfea446b46ad6", 127697934},
+				{"data.dcp", 0, "8b4b81b718bf65f30a67fc0b1e329eb5", 88577623},
+			},
+			Common::CZ_CZE,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::CZ_CZE,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Dirty Split (English)
 	{
-		"dirtysplit",
-		"",
-		AD_ENTRY1s("data.dcp", "8f3dae199361ece0f59fb20cfff6eed3", 88577621),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		// Dirty Split (English)
+		{
+			"dirtysplit",
+			"",
+			AD_ENTRY1s("data.dcp", "8f3dae199361ece0f59fb20cfff6eed3", 88577621),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
 	},
-	// Dirty Split (French)
 	{
-		"dirtysplit",
-		"",
+		// Dirty Split (French)
 		{
-			{"french.dcp", 0, "a0508dedebd0fe478d0158fa4c2a1136", 125534323},
-			{"data.dcp", 0, "e6d70c7f5d181b761cfcf974adf9186a", 88577623},
-			AD_LISTEND
+			"dirtysplit",
+			"",
+			{
+				{"french.dcp", 0, "a0508dedebd0fe478d0158fa4c2a1136", 125534323},
+				{"data.dcp", 0, "e6d70c7f5d181b761cfcf974adf9186a", 88577623},
+				AD_LISTEND
+			},
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::FR_FRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Dirty Split (German)
 	{
-		"dirtysplit",
-		"",
-		AD_ENTRY1s("data.dcp", "139d8a25579e969f8b37d20e6e3de5f9", 92668291),
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		// Dirty Split (German)
+		{
+			"dirtysplit",
+			"",
+			AD_ENTRY1s("data.dcp", "139d8a25579e969f8b37d20e6e3de5f9", 92668291),
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
 	},
-	// Dirty Split (Italian)
 	{
-		"dirtysplit",
-		"",
+		// Dirty Split (Italian)
 		{
-			{"italian.dcp", 0, "8108807fbd8af70be1ec452d0fd1131b", 125513726},
-			{"data.dcp", 0, "35a150e22af274185883fdbb142c6fb1", 88577623},
+			"dirtysplit",
+			"",
+			{
+				{"italian.dcp", 0, "8108807fbd8af70be1ec452d0fd1131b", 125513726},
+				{"data.dcp", 0, "35a150e22af274185883fdbb142c6fb1", 88577623},
+			},
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Dirty Split (Spanish)
 	{
-		"dirtysplit",
-		"",
-		{
-			{"spanish.dcp", 0, "b3982c0a5e85b42e1e38240fef004aa4", 164428596},
-			{"data.dcp", 0, "63766d6c68b9f00b632ea1736fc8a95c", 88577621},
-		},
-		Common::ES_ESP,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Des Reves Elastiques Avec Mille Insectes Nommes Georges
-	{
-		"dreaming",
-		"",
-		AD_ENTRY1s("data.dcp", "4af26d97ea063fc1277ce30ae431de90", 8804073),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Dreamscape
-	{
-		"dreamscape",
-		"",
-		AD_ENTRY1s("data.dcp",  "7a5752ed4446c862be9f02d7932acf54", 17034377),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Escape from the Mansion
-	{
-		"escapemansion",
-		"Beta 1",
-		AD_ENTRY1s("data.dcp",  "d8e348b2312cc36a929cad75f12e0b3a", 21452380),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Escape from the Mansion
-	{
-		"escapemansion",
-		"Beta 2",
-		AD_ENTRY1s("data.dcp",  "ded5fa6c5f2afdaf2cafb53e52cd3dd8", 21455763),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Escape from the Mansion
-	{
-		"escapemansion",
-		"1.3",
-		AD_ENTRY1s("data.dcp",  "1e5d231b56c8a228cd15cb690f50253e", 29261972),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Four
-	{
-		"four",
-		"",
-		AD_ENTRY1s("data.dcp", "ec05cd5e37c9a524053b8859635a4234", 62599855),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Framed
-	{
-		"framed",
-		"",
-		AD_ENTRY1s("data.dcp",  "e7259fb36f2c6f9f28242291e0c3de98", 34690568),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Ghost in the Sheet
-	{
-		"ghostsheet",
-		"",
-		{
-			{"english.dcp", 0, "e6d0aad2c89996bcabe416105a3d6d3a", 12221017},
-			{"data.dcp", 0, "b2f8b05328e4881e15e98e845b63f451", 168003},
-			AD_LISTEND
-		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Ghost in the Sheet (Demo)
-	{
-		"ghostsheet",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "dc1f6595f412ac25a52eaf47dad4ab81", 169083),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Hamlet or the last game without MMORPS features, shaders and product placement
-	{
-		"hamlet",
-		"",
-		AD_ENTRY1s("data.dcp", "f624add957a77c9930529fb28cc2450f", 88183022),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Helga Deep In Trouble (English)
-	{
-		"helga",
-		"",
-		{
-			{"english.dcp", 0, "bfa136b21bdbc7d8691c0770a6d40bc3", 135931},
-			{"data.dcp", 0, "25cb955a60b58326f2eeda1ce288fb37", 183251259},
-			AD_LISTEND
-		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Helga Deep In Trouble (Demo) (English)
-	{
-		"helga",
-		"Demo",
-		{
-			{"english.dcp", 0, "b3a93e678f0ef97200f691cd1724643f", 135864},
-			{"data.dcp", 0, "45134ed93bc391edf148b79cdcbf2a09", 154266028},
-			AD_LISTEND
-		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// James Peris: No License Nor Control (English)
-	{
-		"jamesperis",
-		"",
-		AD_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// James Peris: No License Nor Control (Spanish)
-	{
-		"jamesperis",
-		"",
-		AD_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032),
-		Common::ES_ESP,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// James Peris: No License Nor Control (Demo) (English)
-	{
-		"jamesperis",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// James Peris: No License Nor Control (Demo) (Spanish)
-	{
-		"jamesperis",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507),
-		Common::ES_ESP,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// J.U.L.I.A. (English)
-	{
-		"julia",
-		"",
-		AD_ENTRY1s("data.dcp", "c2264b4f8fcd132d2913ff5b6076a24f", 10109741),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// J.U.L.I.A. (English, Bundle in a box-version)
-	{
-		"julia",
-		"Version 1.2",
-		AD_ENTRY1s("data.dcp", "fe90023ccc22f35185b40b910e0d03a2", 10101373),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// J.U.L.I.A. (English) (Demo)
-	{
-		"julia",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "f0bbc3394555a9811f6050dae428cab6", 7655237),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// J.U.L.I.A. (English) (Greenlight Demo)
-	{
-		"julia",
-		"Greenlight Demo",
-		AD_ENTRY1s("data.dcp", "4befd448d36b0dae9c3ab1aa7cb8b78d", 7271886),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Kulivocko (Czech)
-	{
-		"kulivocko",
-		"",
-		AD_ENTRY1s("data.dcp", "44306dc470e9b27474043932eccee02f", 155106392),
-		Common::CZ_CZE,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Kulivocko (Czech) (Demo)
-	{
-		"kulivocko",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "63b164bdfadecbb0deb5da691afb8154", 48362234),
-		Common::CZ_CZE,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Life In 3 Minutes
-	{
-		"lifein3minutes",
-		"",
-		AD_ENTRY1s("data.dcp", "c6368950e37a95bf098b02b4eaa5b929", 141787214),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Looky Demo (English)
-	{
-		"looky",
-		"Demo",
-		{
-			{"english.dcp", 0, "1388e1dd320f4d553dea3b0316812f9d", 1358442},
-			{"data.dcp", 0, "7074bcd7bc7ad7eb04c271aafb964c32", 13815660},
-			AD_LISTEND
-		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Looky Demo (German)
-	{
-		"looky",
-		"Demo",
-		{
-			{"german.dcp", 0, "606c048426dfbe94442b59fd34a5c76e", 14339496},
-			{"data.dcp", 0, "7074bcd7bc7ad7eb04c271aafb964c32", 13815660},
-			AD_LISTEND
-		},
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Looky (German)
-	{
-		"looky",
-		"",
-		{
-			{"german.dcp", 0, "bf4c2b8c26342342441a6d64934ab832", 107027865},
-			{"data.dcp", 0, "50de0beaa5ad621aa9f020df901d1e74", 1342214},
-			AD_LISTEND
-		},
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Mirage
-	{
-		"mirage",
-		"",
-		AD_ENTRY1s("data.dcp", "d230b0b99c0aa77b9ecd094d8ee5573b", 17844056),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Oknytt
-	{
-		"oknytt",
-		"Version 1.0",
-		AD_ENTRY1s("data.dcp", "6456cf8f429905c83f07509f9da536dd", 109502959),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Night Train Demo
-	{
-		"nighttrain",
-		"",
-		AD_ENTRY1s("data.dcp", "5a027ef84b083a730c9a4c85ec1d3a32", 131760816),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Paintaria
-	{
-		"paintaria",
-		"",
-		AD_ENTRY1s("data.dcp", "354c08440c98150ff0d4008dd2865880", 48326040),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Pigeons in the Park
-	{
-		"pigeons",
-		"",
-		AD_ENTRY1s("data.dcp", "9143a5b6ff8206aefe3c4c643add3ec7", 2611100),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Project: Doom
-	{
-		"projectdoom",
-		"",
-		AD_ENTRY1s("data.dcp", "d5894b65a40706845434b99870bcab92", 99223761),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Project Joe
-	{
-		"projectjoe",
-		"",
-		AD_ENTRY1s("data.dcp", "ada3c08542901295076b5349e655e73f", 160780037),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Project Lonely Robot
-	{
-		"lonelyrobot",
-		"beta",
-		AD_ENTRY1s("data.dcp", "a0cf7ad5bab957416dcda454e9f28ef0", 3420120),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Reversion: The Escape Version 1.0
-	{
-		"reversion1",
-		"Version 1.0",
-		AD_ENTRY1s("data.dcp", "cd616f98ebfd047e0c540b50b4b70761", 254384531),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Reversion: The Escape Version 1.1 (Chinese)
-	{
-		"reversion1",
-		"Version 1.1",
-		{
-			{"chinese.dcp", 0, "cf97150739499a4c15f51dc534ff85a1", 6330561},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
-		},
-		Common::ZH_CNA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		// Dirty Split (Spanish)
+		{
+			"dirtysplit",
+			"",
+			{
+				{"spanish.dcp", 0, "b3982c0a5e85b42e1e38240fef004aa4", 164428596},
+				{"data.dcp", 0, "63766d6c68b9f00b632ea1736fc8a95c", 88577621},
+			},
+			Common::ES_ESP,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Des Reves Elastiques Avec Mille Insectes Nommes Georges
+		{
+			"dreaming",
+			"",
+			AD_ENTRY1s("data.dcp", "4af26d97ea063fc1277ce30ae431de90", 8804073),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Dreamscape
+		{
+			"dreamscape",
+			"",
+			AD_ENTRY1s("data.dcp",  "7a5752ed4446c862be9f02d7932acf54", 17034377),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Escape from the Mansion
+		{
+			"escapemansion",
+			"Beta 1",
+			AD_ENTRY1s("data.dcp",  "d8e348b2312cc36a929cad75f12e0b3a", 21452380),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.1 (English)
 	{
-		"reversion1",
-		"Version 1.1",
+		// Escape from the Mansion
 		{
-			{"english.dcp", 0, "7b2f061d7c91365c5d04605f1de032b3", 5702699},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
+			"escapemansion",
+			"Beta 2",
+			AD_ENTRY1s("data.dcp",  "ded5fa6c5f2afdaf2cafb53e52cd3dd8", 21455763),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.1 (French)
 	{
-		"reversion1",
-		"Version 1.1",
+		// Escape from the Mansion
 		{
-			{"french.dcp", 0, "214204b6022c5ed67fada44557690faf", 6327400},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
+			"escapemansion",
+			"1.3",
+			AD_ENTRY1s("data.dcp",  "1e5d231b56c8a228cd15cb690f50253e", 29261972),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::FR_FRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.1 (German)
 	{
-		"reversion1",
-		"Version 1.1",
+		// Four
 		{
-			{"german.dcp", 0, "96677823b36d580a4a29e3659071071c", 6340699},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
+			"four",
+			"",
+			AD_ENTRY1s("data.dcp", "ec05cd5e37c9a524053b8859635a4234", 62599855),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.1 (Italian)
 	{
-		"reversion1",
-		"Version 1.1",
+		// Framed
 		{
-			{"italian.dcp", 0, "9ce80c1835108f10170a02969f71efe1", 6301836},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
+			"framed",
+			"",
+			AD_ENTRY1s("data.dcp",  "e7259fb36f2c6f9f28242291e0c3de98", 34690568),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.1 (Portuguese)
 	{
-		"reversion1",
-		"Version 1.1",
+		// Ghost in the Sheet
 		{
-			{"portugues.dcp", 0, "8772501afa2c630a7c697eb99e9c7bda", 5053303},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
+			"ghostsheet",
+			"",
+			{
+				{"english.dcp", 0, "e6d0aad2c89996bcabe416105a3d6d3a", 12221017},
+				{"data.dcp", 0, "b2f8b05328e4881e15e98e845b63f451", 168003},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::PT_BRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3 (Chinese)
 	{
-		"reversion1",
-		"Version 1.3",
+		// Ghost in the Sheet (Demo)
 		{
-			{"xlanguage_nz.dcp", 0, "92c4065156e464211685bf799b3279fd", 5130600},
-			{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-			AD_LISTEND
+			"ghostsheet",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "dc1f6595f412ac25a52eaf47dad4ab81", 169083),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::ZH_CNA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3 (English)
 	{
-		"reversion1",
-		"Version 1.3",
+		// Hamlet or the last game without MMORPS features, shaders and product placement
 		{
-			{"xlanguage_en.dcp", 0, "05845e1283920a6e4044f2a54f7a9519", 4818543},
-			{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-			AD_LISTEND
+			"hamlet",
+			"",
+			AD_ENTRY1s("data.dcp", "f624add957a77c9930529fb28cc2450f", 88183022),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3 (French)
 	{
-		"reversion1",
-		"Version 1.3",
+		// Helga Deep In Trouble (English)
 		{
-			{"xlanguage_fr.dcp", 0, "441795490e9307eb2ed07830779881ac", 5425959},
-			{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-			AD_LISTEND
+			"helga",
+			"",
+			{
+				{"english.dcp", 0, "bfa136b21bdbc7d8691c0770a6d40bc3", 135931},
+				{"data.dcp", 0, "25cb955a60b58326f2eeda1ce288fb37", 183251259},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::FR_FRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3 (German)
 	{
-		"reversion1",
-		"Version 1.3",
+		// Helga Deep In Trouble (Demo) (English)
 		{
-			{"xlanguage_de.dcp", 0, "b588041015b93e54b4c246ca77d01e76", 5423798},
-			{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-			AD_LISTEND
+			"helga",
+			"Demo",
+			{
+				{"english.dcp", 0, "b3a93e678f0ef97200f691cd1724643f", 135864},
+				{"data.dcp", 0, "45134ed93bc391edf148b79cdcbf2a09", 154266028},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3 (Italian)
 	{
-		"reversion1",
-		"Version 1.3",
+		// James Peris: No License Nor Control (English)
 		{
-			{"xlanguage_it.dcp", 0, "a1f4199079b75ee10cded41f05b45d5f", 5386424},
-			{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-			AD_LISTEND
+			"jamesperis",
+			"",
+			AD_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3 (Portuguese)
 	{
-		"reversion1",
-		"Version 1.3",
+		// James Peris: No License Nor Control (Spanish)
 		{
-			{"xlanguage_pt.dcp", 0, "3d653debd37e56756a79401e1004c4d2", 4149165},
-			{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-			AD_LISTEND
+			"jamesperis",
+			"",
+			AD_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032),
+			Common::ES_ESP,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::PT_BRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (Chinese)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// James Peris: No License Nor Control (Demo) (English)
 		{
-			{"xlanguage_nz.dcp", 0, "7146dfa43ffdf0886e034fffe2c8a0c0", 13722261},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"jamesperis",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::ZH_CNA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (English)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// James Peris: No License Nor Control (Demo) (Spanish)
 		{
-			{"xlanguage_en.dcp", 0, "64b6fa7eedc09c231f6ce046e77fee05", 11339619},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"jamesperis",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507),
+			Common::ES_ESP,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (French)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// J.U.L.I.A. (English)
 		{
-			{"xlanguage_fr.dcp", 0, "d561d562224afea809153a1fd9fdb0c0", 11963210},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"julia",
+			"",
+			AD_ENTRY1s("data.dcp", "c2264b4f8fcd132d2913ff5b6076a24f", 10109741),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::FR_FRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (German)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// J.U.L.I.A. (English, Bundle in a box-version)
 		{
-			{"xlanguage_de.dcp", 0, "4e3f614c36bd6bae74b8cc83e663a8f0", 14040310},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"julia",
+			"Version 1.2",
+			AD_ENTRY1s("data.dcp", "fe90023ccc22f35185b40b910e0d03a2", 10101373),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (Italian)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// J.U.L.I.A. (English) (Demo)
 		{
-			{"xlanguage_it.dcp", 0, "10d09b7fe61946f09dd91d5e8d090f94", 11913752},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"julia",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "f0bbc3394555a9811f6050dae428cab6", 7655237),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (Latvian)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// J.U.L.I.A. (English) (Greenlight Demo)
 		{
-			{"xlanguage_lv.dcp", 0, "704359ab5040b0dab6545064d7aa6eb9", 11414925},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"julia",
+			"Greenlight Demo",
+			AD_ENTRY1s("data.dcp", "4befd448d36b0dae9c3ab1aa7cb8b78d", 7271886),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::LV_LAT,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (Polish)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// Kulivocko (Czech)
 		{
-			{"xlanguage_pl.dcp", 0, "c4ad33f57e1e998169552d521c1d6638", 11532215},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"kulivocko",
+			"",
+			AD_ENTRY1s("data.dcp", "44306dc470e9b27474043932eccee02f", 155106392),
+			Common::CZ_CZE,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::PL_POL,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Escape Version 1.3.2369 (Portuguese)
 	{
-		"reversion1",
-		"Version 1.3.2369",
+		// Kulivocko (Czech) (Demo)
 		{
-			{"xlanguage_pt.dcp", 0, "886886b6b14aadac844078de856799a6", 10620797},
-			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-			AD_LISTEND
+			"kulivocko",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "63b164bdfadecbb0deb5da691afb8154", 48362234),
+			Common::CZ_CZE,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::PT_BRA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Meeting (Chinese)
 	{
-		"reversion2",
-		"",
+		// Life In 3 Minutes
 		{
-			{"xlanguage_nz.dcp", 0, "8c3709474a87a7876109025dff41ff3f", 8746015},
-			{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-			AD_LISTEND
+			"lifein3minutes",
+			"",
+			AD_ENTRY1s("data.dcp", "c6368950e37a95bf098b02b4eaa5b929", 141787214),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
-		Common::ZH_CNA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Meeting (English)
 	{
-		"reversion2",
-		"",
+		// Looky Demo (English)
 		{
-			{"xlanguage_en.dcp", 0, "ca357d86618d1ab76a21c913f4403cbd", 8414976},
-			{"data.dcp", 0, "f7938cbfdc48f07934550245a3286921", 255672016},
-			AD_LISTEND
+			"looky",
+			"Demo",
+			{
+				{"english.dcp", 0, "1388e1dd320f4d553dea3b0316812f9d", 1358442},
+				{"data.dcp", 0, "7074bcd7bc7ad7eb04c271aafb964c32", 13815660},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
 		},
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
+		LATEST_VERSION
 	},
-	// Reversion: The Meeting (Spanish)
 	{
-		"reversion2",
-		"",
-		AD_ENTRY1s("data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016),
-		Common::ES_ESP,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Reversion: The Meeting Version 2.0.2412 (Chinese)
-	{
-		"reversion2",
-		"Version 2.0.2412",
+		// Looky Demo (German)
 		{
-			{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
-			{"xlanguage_nz.dcp", 0, "17c79af4928e24484bee77a7e807cc2a", 10737127},
-			{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
-			AD_LISTEND
-		},
-		Common::ZH_CNA,
-		Common::kPlatformLinux,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Reversion: The Meeting Version 2.0.2412 (English)
-	{
-		"reversion2",
-		"Version 2.0.2412",
-		{
-			{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
-			{"xlanguage_en.dcp", 0, "0598bf752ce93b42bcaf1094df537c7b", 8533057},
-			{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
-			AD_LISTEND
-		},
-		Common::EN_ANY,
-		Common::kPlatformLinux,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Rhiannon: Curse of the four Branches
-	{
-		"rhiannon",
-		"",
-		AD_ENTRY1s("data.dcp", "870f348900b735f1cc79c0608ce32b0e", 1046169851),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Rhiannon: Curse of the four Branches (English PC DVD)
-	{
-		"rhiannon",
-		"DVD",
-		AD_ENTRY1s("data.dcp", "6736bbc921bb6ce5161b3ad095a97bd4", 1053441028),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
-	{
-		"ritter",
-		"",
-		AD_ENTRY1s("data.dcp", "5ac416cee605d3a30f4d59687b1cdab2", 364260278),
-		Common::DE_DEU,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Satan and Son
-	{
-		"satanandson",
-		"",
-		AD_ENTRY1s("data.dcp",  "16a6ba8174b697bbba9299619d1e20c4", 67539054),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Rosemary
-	{
-		"rosemary",
-		"",
-		AD_ENTRY1s("data.dcp", "4f2631138bd4d27587d9043f8aeff3df", 29483643),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Securanote
-	{
-		"securanote",
-		"",
-		AD_ENTRY1s("data.dcp",  "5213d3e59b9e95b7fbd5c56f7de5341a", 2625554),
-		Common::EN_ANY,
-		Common::kPlatformIOS,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Shaban
-	{
-		"shaban",
-		"",
-		AD_ENTRY1s("data.dcp",  "35f702ca9baabc5c620e0be230195c8a", 755388466),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Shine of a Star
-	{
-		"shinestar",
-		"",
-		AD_ENTRY1s("data.dcp", "f05abe9e2427a5e4f73648fa09c4ba8e", 94113060),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Sofia's Debt
-	{
-		"sofiasdebt",
-		"",
-		AD_ENTRY1s("SD.exe", "e9515f9ba1a2925bb6733476a826a650", 9915047),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Space Invaders (Demo)
-	{
-		"spaceinvaders",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "3f27adefdf72f2c1601cf555c80a509f", 1308361),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// Space Madness
-	{
-		"spacemadness",
-		"1.0.2",
-		AD_ENTRY1s("data.dcp",  "b9b83135dc7a9e1b4b5f50195dbeb630", 39546622),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Ancient Mark - Episode 1
-	{
-		"theancientmark1",
-		"",
-		AD_ENTRY1s("data.dcp", "ca04c26f03b2bd307368b306b297ddd7", 364664692),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Box
-	{
-		"thebox",
-		"",
-		AD_ENTRY1s("data.dcp", "ec5f0c7e8174e307701447b53afe7e2f", 108372483),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Kite (Version 1.1)
-	{
-		"thekite",
-		"Version 1.1",
-		AD_ENTRY1s("data.dcp", "92d29428f464469bda2d81b03d4d5c3e", 47332296),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Kite (Version 1.2.e)
-	{
-		"thekite",
-		"Version 1.2.e",
-		AD_ENTRY1s("data.dcp", "92451578b1bdd2b32a1db592a4f6d5fc", 47360539),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Kite (Version 1.2.i) (Italian)
-	{
-		"thekite",
-		"Version 1.2.i",
-		AD_ENTRY1s("data.dcp", "d3435b106a1b3b4c1df8ad596d271586", 47509274),
-		Common::IT_ITA,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Kite (Version 1.2.r) (Russian)
-	{
-		"thekite",
-		"Version 1.2.r",
-		AD_ENTRY1s("data.dcp", "d531e097dd884737469da014ed882cde", 47554582 ),
-		Common::RU_RUS,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Kite (Version 1.3.e)
-	{
-		"thekite",
-		"Version 1.3.e",
-		AD_ENTRY1s("data.dcp", "9761827b51370263b7623721545d7627", 47382987),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Fairy Tales About Toshechka and Boshechka
-	{
-		"tib",
-		"",
-		AD_ENTRY1s("data.dcp", "87d296ef3f46570ed18f000d3885db77", 340264526),
-		Common::RU_RUS,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// The Trader of Stories
-	{
-		"tradestory",
-		"Demo",
-		AD_ENTRY1s("data.dcp", "0a0b51191636cc8ead89b905281c3218", 40401902),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// the white chamber (multi-language)
-	{
-		"twc",
-		"",
-		AD_ENTRY1s("data.dcp", "0011d01142547c61e51ba24dc42b579e", 186451273),
-		Common::UNK_LANG,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Vsevolod Prologue (Demo)
-	{
-		"vsevolod",
-		"Prologue",
-		AD_ENTRY1s("data.dcp", "f2dcffd2692dbfcc9371fa1a87970fe7", 388669493),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE |
-		ADGF_DEMO,
-		GUIO0()
-	},
-	// War
-	{
-		"war",
-		"",
-		AD_ENTRY1s("data.dcp", "003e317cda6d0137bbd5e5d7f089ee4d", 32591890),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Wilma Tetris
-	{
-		"wtetris",
-		"",
-		AD_ENTRY1s("data.dcp", "946e3a0496e6c12fb344c9ed861ff015", 2780093),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	// Zilm: A Game of Reflex 1.0
-	{
-		"Zilm",
-		"1.0",
-		AD_ENTRY1s("data.dcp",  "098dffaf03d8adbb4cb5633e4733e63c", 351726),
-		Common::EN_ANY,
-		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
-		GUIO0()
-	},
-	AD_TABLE_END_MARKER
+			"looky",
+			"Demo",
+			{
+				{"german.dcp", 0, "606c048426dfbe94442b59fd34a5c76e", 14339496},
+				{"data.dcp", 0, "7074bcd7bc7ad7eb04c271aafb964c32", 13815660},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Looky (German)
+		{
+			"looky",
+			"",
+			{
+				{"german.dcp", 0, "bf4c2b8c26342342441a6d64934ab832", 107027865},
+				{"data.dcp", 0, "50de0beaa5ad621aa9f020df901d1e74", 1342214},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Mirage
+		{
+			"mirage",
+			"",
+			AD_ENTRY1s("data.dcp", "d230b0b99c0aa77b9ecd094d8ee5573b", 17844056),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Oknytt
+		{
+			"oknytt",
+			"Version 1.0",
+			AD_ENTRY1s("data.dcp", "6456cf8f429905c83f07509f9da536dd", 109502959),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Night Train Demo
+		{
+			"nighttrain",
+			"",
+			AD_ENTRY1s("data.dcp", "5a027ef84b083a730c9a4c85ec1d3a32", 131760816),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Paintaria
+		{
+			"paintaria",
+			"",
+			AD_ENTRY1s("data.dcp", "354c08440c98150ff0d4008dd2865880", 48326040),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Pigeons in the Park
+		{
+			"pigeons",
+			"",
+			AD_ENTRY1s("data.dcp", "9143a5b6ff8206aefe3c4c643add3ec7", 2611100),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Project: Doom
+		{
+			"projectdoom",
+			"",
+			AD_ENTRY1s("data.dcp", "d5894b65a40706845434b99870bcab92", 99223761),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Project Joe
+		{
+			"projectjoe",
+			"",
+			AD_ENTRY1s("data.dcp", "ada3c08542901295076b5349e655e73f", 160780037),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Project Lonely Robot
+		{
+			"lonelyrobot",
+			"beta",
+			AD_ENTRY1s("data.dcp", "a0cf7ad5bab957416dcda454e9f28ef0", 3420120),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.0
+		{
+			"reversion1",
+			"Version 1.0",
+			AD_ENTRY1s("data.dcp", "cd616f98ebfd047e0c540b50b4b70761", 254384531),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.1 (Chinese)
+		{
+			"reversion1",
+			"Version 1.1",
+			{
+				{"chinese.dcp", 0, "cf97150739499a4c15f51dc534ff85a1", 6330561},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::ZH_CNA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.1 (English)
+		{
+			"reversion1",
+			"Version 1.1",
+			{
+				{"english.dcp", 0, "7b2f061d7c91365c5d04605f1de032b3", 5702699},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.1 (French)
+		{
+			"reversion1",
+			"Version 1.1",
+			{
+				{"french.dcp", 0, "214204b6022c5ed67fada44557690faf", 6327400},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.1 (German)
+		{
+			"reversion1",
+			"Version 1.1",
+			{
+				{"german.dcp", 0, "96677823b36d580a4a29e3659071071c", 6340699},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.1 (Italian)
+		{
+			"reversion1",
+			"Version 1.1",
+			{
+				{"italian.dcp", 0, "9ce80c1835108f10170a02969f71efe1", 6301836},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.1 (Portuguese)
+		{
+			"reversion1",
+			"Version 1.1",
+			{
+				{"portugues.dcp", 0, "8772501afa2c630a7c697eb99e9c7bda", 5053303},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::PT_BRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3 (Chinese)
+		{
+			"reversion1",
+			"Version 1.3",
+			{
+				{"xlanguage_nz.dcp", 0, "92c4065156e464211685bf799b3279fd", 5130600},
+				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
+				AD_LISTEND
+			},
+			Common::ZH_CNA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3 (English)
+		{
+			"reversion1",
+			"Version 1.3",
+			{
+				{"xlanguage_en.dcp", 0, "05845e1283920a6e4044f2a54f7a9519", 4818543},
+				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3 (French)
+		{
+			"reversion1",
+			"Version 1.3",
+			{
+				{"xlanguage_fr.dcp", 0, "441795490e9307eb2ed07830779881ac", 5425959},
+				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
+				AD_LISTEND
+			},
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3 (German)
+		{
+			"reversion1",
+			"Version 1.3",
+			{
+				{"xlanguage_de.dcp", 0, "b588041015b93e54b4c246ca77d01e76", 5423798},
+				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3 (Italian)
+		{
+			"reversion1",
+			"Version 1.3",
+			{
+				{"xlanguage_it.dcp", 0, "a1f4199079b75ee10cded41f05b45d5f", 5386424},
+				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
+				AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3 (Portuguese)
+		{
+			"reversion1",
+			"Version 1.3",
+			{
+				{"xlanguage_pt.dcp", 0, "3d653debd37e56756a79401e1004c4d2", 4149165},
+				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
+				AD_LISTEND
+			},
+			Common::PT_BRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (Chinese)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_nz.dcp", 0, "7146dfa43ffdf0886e034fffe2c8a0c0", 13722261},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::ZH_CNA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (English)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_en.dcp", 0, "64b6fa7eedc09c231f6ce046e77fee05", 11339619},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (French)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_fr.dcp", 0, "d561d562224afea809153a1fd9fdb0c0", 11963210},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (German)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_de.dcp", 0, "4e3f614c36bd6bae74b8cc83e663a8f0", 14040310},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (Italian)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_it.dcp", 0, "10d09b7fe61946f09dd91d5e8d090f94", 11913752},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (Latvian)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_lv.dcp", 0, "704359ab5040b0dab6545064d7aa6eb9", 11414925},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::LV_LAT,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (Polish)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_pl.dcp", 0, "c4ad33f57e1e998169552d521c1d6638", 11532215},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::PL_POL,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Escape Version 1.3.2369 (Portuguese)
+		{
+			"reversion1",
+			"Version 1.3.2369",
+			{
+				{"xlanguage_pt.dcp", 0, "886886b6b14aadac844078de856799a6", 10620797},
+				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+				AD_LISTEND
+			},
+			Common::PT_BRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Meeting (Chinese)
+		{
+			"reversion2",
+			"",
+			{
+				{"xlanguage_nz.dcp", 0, "8c3709474a87a7876109025dff41ff3f", 8746015},
+				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
+				AD_LISTEND
+			},
+			Common::ZH_CNA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Meeting (English)
+		{
+			"reversion2",
+			"",
+			{
+				{"xlanguage_en.dcp", 0, "ca357d86618d1ab76a21c913f4403cbd", 8414976},
+				{"data.dcp", 0, "f7938cbfdc48f07934550245a3286921", 255672016},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Meeting (Spanish)
+		{
+			"reversion2",
+			"",
+			AD_ENTRY1s("data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016),
+			Common::ES_ESP,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Meeting Version 2.0.2412 (Chinese)
+		{
+			"reversion2",
+			"Version 2.0.2412",
+			{
+				{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
+				{"xlanguage_nz.dcp", 0, "17c79af4928e24484bee77a7e807cc2a", 10737127},
+				{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
+				AD_LISTEND
+			},
+			Common::ZH_CNA,
+			Common::kPlatformLinux,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Reversion: The Meeting Version 2.0.2412 (English)
+		{
+			"reversion2",
+			"Version 2.0.2412",
+			{
+				{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
+				{"xlanguage_en.dcp", 0, "0598bf752ce93b42bcaf1094df537c7b", 8533057},
+				{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformLinux,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Rhiannon: Curse of the four Branches
+		{
+			"rhiannon",
+			"",
+			AD_ENTRY1s("data.dcp", "870f348900b735f1cc79c0608ce32b0e", 1046169851),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Rhiannon: Curse of the four Branches (English PC DVD)
+		{
+			"rhiannon",
+			"DVD",
+			AD_ENTRY1s("data.dcp", "6736bbc921bb6ce5161b3ad095a97bd4", 1053441028),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
+		{
+			"ritter",
+			"",
+			AD_ENTRY1s("data.dcp", "5ac416cee605d3a30f4d59687b1cdab2", 364260278),
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Satan and Son
+		{
+			"satanandson",
+			"",
+			AD_ENTRY1s("data.dcp",  "16a6ba8174b697bbba9299619d1e20c4", 67539054),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Rosemary
+		{
+			"rosemary",
+			"",
+			AD_ENTRY1s("data.dcp", "4f2631138bd4d27587d9043f8aeff3df", 29483643),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Securanote
+		{
+			"securanote",
+			"",
+			AD_ENTRY1s("data.dcp",  "5213d3e59b9e95b7fbd5c56f7de5341a", 2625554),
+			Common::EN_ANY,
+			Common::kPlatformIOS,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Shaban
+		{
+			"shaban",
+			"",
+			AD_ENTRY1s("data.dcp",  "35f702ca9baabc5c620e0be230195c8a", 755388466),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Shine of a Star
+		{
+			"shinestar",
+			"",
+			AD_ENTRY1s("data.dcp", "f05abe9e2427a5e4f73648fa09c4ba8e", 94113060),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Sofia's Debt
+		{
+			"sofiasdebt",
+			"",
+			AD_ENTRY1s("SD.exe", "e9515f9ba1a2925bb6733476a826a650", 9915047),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Space Invaders (Demo)
+		{
+			"spaceinvaders",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "3f27adefdf72f2c1601cf555c80a509f", 1308361),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Space Madness
+		{
+			"spacemadness",
+			"1.0.2",
+			AD_ENTRY1s("data.dcp",  "b9b83135dc7a9e1b4b5f50195dbeb630", 39546622),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Ancient Mark - Episode 1
+		{
+			"theancientmark1",
+			"",
+			AD_ENTRY1s("data.dcp", "ca04c26f03b2bd307368b306b297ddd7", 364664692),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Box
+		{
+			"thebox",
+			"",
+			AD_ENTRY1s("data.dcp", "ec5f0c7e8174e307701447b53afe7e2f", 108372483),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Kite (Version 1.1)
+		{
+			"thekite",
+			"Version 1.1",
+			AD_ENTRY1s("data.dcp", "92d29428f464469bda2d81b03d4d5c3e", 47332296),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Kite (Version 1.2.e)
+		{
+			"thekite",
+			"Version 1.2.e",
+			AD_ENTRY1s("data.dcp", "92451578b1bdd2b32a1db592a4f6d5fc", 47360539),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Kite (Version 1.2.i) (Italian)
+		{
+			"thekite",
+			"Version 1.2.i",
+			AD_ENTRY1s("data.dcp", "d3435b106a1b3b4c1df8ad596d271586", 47509274),
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Kite (Version 1.2.r) (Russian)
+		{
+			"thekite",
+			"Version 1.2.r",
+			AD_ENTRY1s("data.dcp", "d531e097dd884737469da014ed882cde", 47554582 ),
+			Common::RU_RUS,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Kite (Version 1.3.e)
+		{
+			"thekite",
+			"Version 1.3.e",
+			AD_ENTRY1s("data.dcp", "9761827b51370263b7623721545d7627", 47382987),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Fairy Tales About Toshechka and Boshechka
+		{
+			"tib",
+			"",
+			AD_ENTRY1s("data.dcp", "87d296ef3f46570ed18f000d3885db77", 340264526),
+			Common::RU_RUS,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// The Trader of Stories
+		{
+			"tradestory",
+			"Demo",
+			AD_ENTRY1s("data.dcp", "0a0b51191636cc8ead89b905281c3218", 40401902),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// the white chamber (multi-language)
+		{
+			"twc",
+			"",
+			AD_ENTRY1s("data.dcp", "0011d01142547c61e51ba24dc42b579e", 186451273),
+			Common::UNK_LANG,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Vsevolod Prologue (Demo)
+		{
+			"vsevolod",
+			"Prologue",
+			AD_ENTRY1s("data.dcp", "f2dcffd2692dbfcc9371fa1a87970fe7", 388669493),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE |
+			ADGF_DEMO,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// War
+		{
+			"war",
+			"",
+			AD_ENTRY1s("data.dcp", "003e317cda6d0137bbd5e5d7f089ee4d", 32591890),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Wilma Tetris
+		{
+			"wtetris",
+			"",
+			AD_ENTRY1s("data.dcp", "946e3a0496e6c12fb344c9ed861ff015", 2780093),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		// Zilm: A Game of Reflex 1.0
+		{
+			"Zilm",
+			"1.0",
+			AD_ENTRY1s("data.dcp",  "098dffaf03d8adbb4cb5633e4733e63c", 351726),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		LATEST_VERSION
+	},
+	{
+		AD_TABLE_END_MARKER,
+		LATEST_VERSION
+	}
 };
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/game_description.h b/engines/wintermute/game_description.h
new file mode 100644
index 0000000000..313fff8bbf
--- /dev/null
+++ b/engines/wintermute/game_description.h
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef WINTERMUTE_GAME_DESCRIPTION_H
+#define WINTERMUTE_GAME_DESCRIPTION_H
+
+#include "engines/advancedDetector.h"
+
+namespace Wintermute {
+
+enum WMETargetExecutable {
+	OLDEST_VERSION,
+	WME_1_0_0,
+	WME_1_1_0,
+	WME_1_2_0,
+	WME_1_3_0,
+	WME_1_4_0,
+	WME_1_5_0,
+	WME_1_6_0,
+	WME_1_7_0,
+	WME_1_8_0,
+	WME_1_8_6,
+	WME_1_9_0,
+	LATEST_VERSION
+};
+
+struct WMEGameDescription {
+	ADGameDescription adDesc;
+	WMETargetExecutable targetExecutable;
+};
+
+}
+
+#endif  /* WINTERMUTE_GAME_DESCRIPTION_H_ */
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 81b6e53c9f..e35bb60c3d 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -53,7 +53,7 @@ WintermuteEngine::WintermuteEngine() : Engine(g_system) {
 	_gameDescription = nullptr;
 }
 
-WintermuteEngine::WintermuteEngine(OSystem *syst, const ADGameDescription *desc)
+WintermuteEngine::WintermuteEngine(OSystem *syst, const WMEGameDescription *desc)
 	: Engine(syst), _gameDescription(desc) {
 	// Put your engine in a sane state, but do nothing big yet;
 	// in particular, do not load data from files; rather, if you
@@ -133,7 +133,7 @@ Common::Error WintermuteEngine::run() {
 }
 
 int WintermuteEngine::init() {
-	BaseEngine::createInstance(_targetName, _gameDescription->gameid, _gameDescription->language);
+	BaseEngine::createInstance(_targetName, _gameDescription->adDesc.gameid, _gameDescription->adDesc.language, _gameDescription->targetExecutable);
 	_game = new AdGame(_targetName);
 	if (!_game) {
 		return 1;
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index 017809d56a..f8f5fc7deb 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -26,6 +26,7 @@
 #include "engines/engine.h"
 #include "engines/advancedDetector.h"
 #include "gui/debugger.h"
+#include "engines/wintermute/game_description.h"
 
 namespace Wintermute {
 
@@ -44,7 +45,7 @@ enum {
 
 class WintermuteEngine : public Engine {
 public:
-	WintermuteEngine(OSystem *syst, const ADGameDescription *desc);
+	WintermuteEngine(OSystem *syst, const WMEGameDescription *desc);
 	WintermuteEngine();
 	~WintermuteEngine();
 
@@ -67,7 +68,7 @@ private:
 	int messageLoop();
 	GUI::Debugger *_debugger;
 	BaseGame *_game;
-	const ADGameDescription *_gameDescription;
+	const WMEGameDescription *_gameDescription;
 
 	friend class Console;
 };
-- 
cgit v1.2.3


From b460323e58e189650dc03e67d75b3a193f7a6685 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sun, 5 Oct 2014 11:52:26 +0200
Subject: WINTERMUTE: killAllSounds only if WME targetExecutable >= 1.8.6

This fixes #6647
---
 engines/wintermute/base/base_sprite.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 04060bff32..09e138a1fd 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -41,6 +41,7 @@
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/game_description.h"
 
 namespace Wintermute {
 
@@ -347,9 +348,17 @@ void BaseSprite::reset() {
 	} else {
 		_currentFrame = -1;
 	}
-
-	killAllSounds();
-
+	if (BaseEngine::instance().getTargetExecutable() >= WME_1_8_6) {
+		/*
+		* This was added in WME 1.8.6
+		*
+		* 5MA and possibly other games ship with pre-1.8.6 WME, and
+		* depends (e.g.: menu sounds, etc) on this not being triggered.
+		*
+		* See bug #6647
+		*/
+		killAllSounds();
+	}
 	_lastFrameTime = 0;
 	_finished = false;
 	_moveX = _moveY = 0;
-- 
cgit v1.2.3


From f1eb2513f032013ba8a62872abf63b2ad0e6a876 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Tue, 4 Nov 2014 17:20:09 +0100
Subject: WINTERMUTE: Use macros to simplify detection_tables.h

---
 engines/wintermute/detection_tables.h | 2124 +++++++--------------------------
 1 file changed, 443 insertions(+), 1681 deletions(-)

diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 98bf3c1136..f6f9e24730 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -90,1688 +90,444 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{0, 0}
 };
 
+// Duplicates WME_ENTRY1s, for consistency
+#define WME_ENTRY1s(f1, h1, s1) { {f1, 0, h1, s1}, AD_LISTEND }
+#define WME_ENTRY2s(f1, h1, s1, f2, h2, s2) { {f1, 0, h1, s1}, {f2, 0, h2, s2}, AD_LISTEND }
+#define WME_ENTRY3s(f1, h1, s1, f2, h2, s2, f3, h3, s3) { {f1, 0, h1, s1}, {f2, 0, h2, s2}, {f3, 0, h3, s3}, AD_LISTEND }
+
+#define WME_PLATENTRY(shortName, extraName, hashEntry, lang, plat, status, version) \
+	{ \
+		{ \
+			shortName, \
+			extraName, \
+			hashEntry, \
+			lang, \
+			plat, \
+			status, \
+			GUIO0(), \
+		}, \
+		version \
+	}
+
+// Convenience variant, as most of the games are Windows-games
+#define WME_WINENTRY(shortName, extraName, hashEntry, lang, status, version) \
+	{ \
+		{ \
+			shortName, \
+			extraName, \
+			hashEntry, \
+			lang, \
+			Common::kPlatformWindows, \
+			status, \
+			GUIO0(), \
+		}, \
+		version \
+	}
+
+/* To add new entries:
+ * Make sure you have a target name defined at the top of the file
+ *
+ * If the game has only one language, and can be detected using only one file,
+ * then use WME_WINENTRY, with WME_ENTRY1s as exemplified below.
+ *
+ * If the game has more than one language, and the main data file is common across
+ * the versions, then you should use WME_WINENTRY with WME_ENTRY2s/WME_ENTRY3s, with
+ * the language file as the first hit, and the data file as the second. (Make sure to
+ * NOT create a WME_ENTRY1s matching the same data file as the 2/3 file match)
+ */
+
 static const WMEGameDescription gameDescriptions[] = {
-	{
-		// Five Lethal Demons
-		{
-			"5ld",
-			"",
-			AD_ENTRY1s("data.dcp", "1037a77cbd001e0644898addc022322c", 15407750),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Five Magical Amulets
-		{
-			"5ma",
-			"",
-			AD_ENTRY1s("data.dcp", "0134e92bcd5fd2837df3971087e96067", 163316498),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		WME_1_7_0
-	},
-	{
-		// Actual Destination
-		{
-			"actualdest",
-			"",
-			AD_ENTRY1s("data.dcp", "6926f44b26f21ceb1d840eaab9aeb510", 9081740),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Boredom of Agustin Cordes
-		{
-			"agustin",
-			"",
-			AD_ENTRY1s("data.dcp", "abb79c16c9b92e9b06525a4c7c3f5861", 2461949),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Beyond the Threshold
-		{
-			"bthreshold",
-			"",
-			AD_ENTRY1s("data.dcp", "d49bf9ccb2e74507447c82d6ad3e2bc4", 12773712),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Bickadoodle
-		{
-			"bickadoodle",
-			"",
-			AD_ENTRY1s("data.dcp", "84db4d1594cac95e25614985775d10a8", 35303844),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Bickadoodle (Ver 1.1)
-		{
-			"bickadoodle",
-			"Version 1.1",
-			AD_ENTRY1s("data.dcp", "8bb52ac9a9ee129c5059e8e808b669d7", 35337760),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
-		{
-			"bickadoodle",
-			"",
-			AD_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Book of Gron Part One
-		{
-			"bookofgron",
-			"",
-			AD_ENTRY1s("data.dcp", "e61b2ebee044a82fa0f8ca0fce2c8946", 83129531),
-			Common::RU_RUS,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 4 - East Side Story (Demo)
-		{
-			"carolreed4",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 4 - East Side Story
-		{
-			"carolreed4",
-			"",
-			AD_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 5 - The Colour of Murder
-		{
-			"carolreed5",
-			"",
-			AD_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 6 - Black Circle
-		{
-			"carolreed6",
-			"",
-			AD_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 7 - Blue Madonna (Demo)
-		{
-			"carolreed7",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 7 - Blue Madonna
-		{
-			"carolreed7",
-			"",
-			AD_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 8 - Amber's Blood
-		{
-			"carolreed8",
-			"",
-			AD_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Carol Reed 9 - Cold Case Summer
-		{
-			"carolreed9",
-			"",
-			AD_ENTRY1s("data.dcp", "2b343b48a7aee508d728a546b414a255", 620005266),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Chivalry is Not Dead
-		{
-			"chivalry",
-			"",
-			AD_ENTRY1s("data.dcp", "ebd0915d9a12df5224be22f53bb23eb6", 7278306),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_TESTING,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Chivalry is Not Dead (Version from deirdrakai.com)
-		{
-			"chivalry",
-			"",
-			AD_ENTRY1s("data.dcp", "ae6d91b9517f4d2851a8ad94c96951c8", 7278302),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_TESTING,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Conspiracao Dumont
-		{
-			"conspiracao",
-			"",
-			AD_ENTRY1s("ConspiracaoDumont.exe", "106f3f2c8f18bb5ffffeed634ace256c", 32908032),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Corrosion: Cold Winter Waiting
-		{
-			"corrosion",
-			"",
-			AD_ENTRY1s("data.dcp", "ae885b1a8faa0b27f43c0e8f0df02fc9", 525931618),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_TESTING,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dead City (Czech)
-		{
-			"deadcity",
-			"",
-			{
-				// The Czech data are in data.dcp, so in this case we'll have to
-				// just detect the english version twice, to give the user a choice.
-				{"english.dcp", 0, "c591046d6de7e381d76f70e0787b2b1f", 415935},
-				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-				AD_LISTEND
-			},
-			Common::CZ_CZE,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dead City (English)
-		{
-			"deadcity",
-			"",
-			{
-				{"english.dcp", 0, "c591046d6de7e381d76f70e0787b2b1f", 415935},
-				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dead City (Italian)
-		{
-			"deadcity",
-			"",
-			{
-				{"italian.dcp", 0, "92d8efb94436bec7bd1b7fe0b548192e", 454037},
-				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-				AD_LISTEND
-			},
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dead City (Russian)
-		{
-			"deadcity",
-			"",
-			{
-				{"russian.dcp", 0, "a0ae71e9e1185596fffb07ad2c951eb9", 653317},
-				{"data.dcp", 0, "7ebfd50d1a22370ed7b079bcaa631d62", 9070205},
-				AD_LISTEND
-			},
-			Common::RU_RUS,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dirty Split (Czech)
-		{
-			"dirtysplit",
-			"",
-			{
-				{"czech.dcp", 0, "08a71446467cf8f9444cfea446b46ad6", 127697934},
-				{"data.dcp", 0, "8b4b81b718bf65f30a67fc0b1e329eb5", 88577623},
-			},
-			Common::CZ_CZE,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dirty Split (English)
-		{
-			"dirtysplit",
-			"",
-			AD_ENTRY1s("data.dcp", "8f3dae199361ece0f59fb20cfff6eed3", 88577621),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dirty Split (French)
-		{
-			"dirtysplit",
-			"",
-			{
-				{"french.dcp", 0, "a0508dedebd0fe478d0158fa4c2a1136", 125534323},
-				{"data.dcp", 0, "e6d70c7f5d181b761cfcf974adf9186a", 88577623},
-				AD_LISTEND
-			},
-			Common::FR_FRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dirty Split (German)
-		{
-			"dirtysplit",
-			"",
-			AD_ENTRY1s("data.dcp", "139d8a25579e969f8b37d20e6e3de5f9", 92668291),
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dirty Split (Italian)
-		{
-			"dirtysplit",
-			"",
-			{
-				{"italian.dcp", 0, "8108807fbd8af70be1ec452d0fd1131b", 125513726},
-				{"data.dcp", 0, "35a150e22af274185883fdbb142c6fb1", 88577623},
-			},
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dirty Split (Spanish)
-		{
-			"dirtysplit",
-			"",
-			{
-				{"spanish.dcp", 0, "b3982c0a5e85b42e1e38240fef004aa4", 164428596},
-				{"data.dcp", 0, "63766d6c68b9f00b632ea1736fc8a95c", 88577621},
-			},
-			Common::ES_ESP,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Des Reves Elastiques Avec Mille Insectes Nommes Georges
-		{
-			"dreaming",
-			"",
-			AD_ENTRY1s("data.dcp", "4af26d97ea063fc1277ce30ae431de90", 8804073),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Dreamscape
-		{
-			"dreamscape",
-			"",
-			AD_ENTRY1s("data.dcp",  "7a5752ed4446c862be9f02d7932acf54", 17034377),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Escape from the Mansion
-		{
-			"escapemansion",
-			"Beta 1",
-			AD_ENTRY1s("data.dcp",  "d8e348b2312cc36a929cad75f12e0b3a", 21452380),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Escape from the Mansion
-		{
-			"escapemansion",
-			"Beta 2",
-			AD_ENTRY1s("data.dcp",  "ded5fa6c5f2afdaf2cafb53e52cd3dd8", 21455763),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Escape from the Mansion
-		{
-			"escapemansion",
-			"1.3",
-			AD_ENTRY1s("data.dcp",  "1e5d231b56c8a228cd15cb690f50253e", 29261972),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Four
-		{
-			"four",
-			"",
-			AD_ENTRY1s("data.dcp", "ec05cd5e37c9a524053b8859635a4234", 62599855),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Framed
-		{
-			"framed",
-			"",
-			AD_ENTRY1s("data.dcp",  "e7259fb36f2c6f9f28242291e0c3de98", 34690568),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Ghost in the Sheet
-		{
-			"ghostsheet",
-			"",
-			{
-				{"english.dcp", 0, "e6d0aad2c89996bcabe416105a3d6d3a", 12221017},
-				{"data.dcp", 0, "b2f8b05328e4881e15e98e845b63f451", 168003},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Ghost in the Sheet (Demo)
-		{
-			"ghostsheet",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "dc1f6595f412ac25a52eaf47dad4ab81", 169083),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Hamlet or the last game without MMORPS features, shaders and product placement
-		{
-			"hamlet",
-			"",
-			AD_ENTRY1s("data.dcp", "f624add957a77c9930529fb28cc2450f", 88183022),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Helga Deep In Trouble (English)
-		{
-			"helga",
-			"",
-			{
-				{"english.dcp", 0, "bfa136b21bdbc7d8691c0770a6d40bc3", 135931},
-				{"data.dcp", 0, "25cb955a60b58326f2eeda1ce288fb37", 183251259},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Helga Deep In Trouble (Demo) (English)
-		{
-			"helga",
-			"Demo",
-			{
-				{"english.dcp", 0, "b3a93e678f0ef97200f691cd1724643f", 135864},
-				{"data.dcp", 0, "45134ed93bc391edf148b79cdcbf2a09", 154266028},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// James Peris: No License Nor Control (English)
-		{
-			"jamesperis",
-			"",
-			AD_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// James Peris: No License Nor Control (Spanish)
-		{
-			"jamesperis",
-			"",
-			AD_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032),
-			Common::ES_ESP,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// James Peris: No License Nor Control (Demo) (English)
-		{
-			"jamesperis",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// James Peris: No License Nor Control (Demo) (Spanish)
-		{
-			"jamesperis",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507),
-			Common::ES_ESP,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// J.U.L.I.A. (English)
-		{
-			"julia",
-			"",
-			AD_ENTRY1s("data.dcp", "c2264b4f8fcd132d2913ff5b6076a24f", 10109741),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// J.U.L.I.A. (English, Bundle in a box-version)
-		{
-			"julia",
-			"Version 1.2",
-			AD_ENTRY1s("data.dcp", "fe90023ccc22f35185b40b910e0d03a2", 10101373),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// J.U.L.I.A. (English) (Demo)
-		{
-			"julia",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "f0bbc3394555a9811f6050dae428cab6", 7655237),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// J.U.L.I.A. (English) (Greenlight Demo)
-		{
-			"julia",
-			"Greenlight Demo",
-			AD_ENTRY1s("data.dcp", "4befd448d36b0dae9c3ab1aa7cb8b78d", 7271886),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Kulivocko (Czech)
-		{
-			"kulivocko",
-			"",
-			AD_ENTRY1s("data.dcp", "44306dc470e9b27474043932eccee02f", 155106392),
-			Common::CZ_CZE,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Kulivocko (Czech) (Demo)
-		{
-			"kulivocko",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "63b164bdfadecbb0deb5da691afb8154", 48362234),
-			Common::CZ_CZE,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Life In 3 Minutes
-		{
-			"lifein3minutes",
-			"",
-			AD_ENTRY1s("data.dcp", "c6368950e37a95bf098b02b4eaa5b929", 141787214),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Looky Demo (English)
-		{
-			"looky",
-			"Demo",
-			{
-				{"english.dcp", 0, "1388e1dd320f4d553dea3b0316812f9d", 1358442},
-				{"data.dcp", 0, "7074bcd7bc7ad7eb04c271aafb964c32", 13815660},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Looky Demo (German)
-		{
-			"looky",
-			"Demo",
-			{
-				{"german.dcp", 0, "606c048426dfbe94442b59fd34a5c76e", 14339496},
-				{"data.dcp", 0, "7074bcd7bc7ad7eb04c271aafb964c32", 13815660},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Looky (German)
-		{
-			"looky",
-			"",
-			{
-				{"german.dcp", 0, "bf4c2b8c26342342441a6d64934ab832", 107027865},
-				{"data.dcp", 0, "50de0beaa5ad621aa9f020df901d1e74", 1342214},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Mirage
-		{
-			"mirage",
-			"",
-			AD_ENTRY1s("data.dcp", "d230b0b99c0aa77b9ecd094d8ee5573b", 17844056),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Oknytt
-		{
-			"oknytt",
-			"Version 1.0",
-			AD_ENTRY1s("data.dcp", "6456cf8f429905c83f07509f9da536dd", 109502959),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Night Train Demo
-		{
-			"nighttrain",
-			"",
-			AD_ENTRY1s("data.dcp", "5a027ef84b083a730c9a4c85ec1d3a32", 131760816),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Paintaria
-		{
-			"paintaria",
-			"",
-			AD_ENTRY1s("data.dcp", "354c08440c98150ff0d4008dd2865880", 48326040),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Pigeons in the Park
-		{
-			"pigeons",
-			"",
-			AD_ENTRY1s("data.dcp", "9143a5b6ff8206aefe3c4c643add3ec7", 2611100),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Project: Doom
-		{
-			"projectdoom",
-			"",
-			AD_ENTRY1s("data.dcp", "d5894b65a40706845434b99870bcab92", 99223761),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Project Joe
-		{
-			"projectjoe",
-			"",
-			AD_ENTRY1s("data.dcp", "ada3c08542901295076b5349e655e73f", 160780037),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Project Lonely Robot
-		{
-			"lonelyrobot",
-			"beta",
-			AD_ENTRY1s("data.dcp", "a0cf7ad5bab957416dcda454e9f28ef0", 3420120),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.0
-		{
-			"reversion1",
-			"Version 1.0",
-			AD_ENTRY1s("data.dcp", "cd616f98ebfd047e0c540b50b4b70761", 254384531),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.1 (Chinese)
-		{
-			"reversion1",
-			"Version 1.1",
-			{
-				{"chinese.dcp", 0, "cf97150739499a4c15f51dc534ff85a1", 6330561},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::ZH_CNA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.1 (English)
-		{
-			"reversion1",
-			"Version 1.1",
-			{
-				{"english.dcp", 0, "7b2f061d7c91365c5d04605f1de032b3", 5702699},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.1 (French)
-		{
-			"reversion1",
-			"Version 1.1",
-			{
-				{"french.dcp", 0, "214204b6022c5ed67fada44557690faf", 6327400},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::FR_FRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.1 (German)
-		{
-			"reversion1",
-			"Version 1.1",
-			{
-				{"german.dcp", 0, "96677823b36d580a4a29e3659071071c", 6340699},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.1 (Italian)
-		{
-			"reversion1",
-			"Version 1.1",
-			{
-				{"italian.dcp", 0, "9ce80c1835108f10170a02969f71efe1", 6301836},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.1 (Portuguese)
-		{
-			"reversion1",
-			"Version 1.1",
-			{
-				{"portugues.dcp", 0, "8772501afa2c630a7c697eb99e9c7bda", 5053303},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::PT_BRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3 (Chinese)
-		{
-			"reversion1",
-			"Version 1.3",
-			{
-				{"xlanguage_nz.dcp", 0, "92c4065156e464211685bf799b3279fd", 5130600},
-				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-				AD_LISTEND
-			},
-			Common::ZH_CNA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3 (English)
-		{
-			"reversion1",
-			"Version 1.3",
-			{
-				{"xlanguage_en.dcp", 0, "05845e1283920a6e4044f2a54f7a9519", 4818543},
-				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3 (French)
-		{
-			"reversion1",
-			"Version 1.3",
-			{
-				{"xlanguage_fr.dcp", 0, "441795490e9307eb2ed07830779881ac", 5425959},
-				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-				AD_LISTEND
-			},
-			Common::FR_FRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3 (German)
-		{
-			"reversion1",
-			"Version 1.3",
-			{
-				{"xlanguage_de.dcp", 0, "b588041015b93e54b4c246ca77d01e76", 5423798},
-				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3 (Italian)
-		{
-			"reversion1",
-			"Version 1.3",
-			{
-				{"xlanguage_it.dcp", 0, "a1f4199079b75ee10cded41f05b45d5f", 5386424},
-				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-				AD_LISTEND
-			},
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3 (Portuguese)
-		{
-			"reversion1",
-			"Version 1.3",
-			{
-				{"xlanguage_pt.dcp", 0, "3d653debd37e56756a79401e1004c4d2", 4149165},
-				{"data.dcp", 0, "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907},
-				AD_LISTEND
-			},
-			Common::PT_BRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (Chinese)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_nz.dcp", 0, "7146dfa43ffdf0886e034fffe2c8a0c0", 13722261},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::ZH_CNA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (English)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_en.dcp", 0, "64b6fa7eedc09c231f6ce046e77fee05", 11339619},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (French)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_fr.dcp", 0, "d561d562224afea809153a1fd9fdb0c0", 11963210},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::FR_FRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (German)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_de.dcp", 0, "4e3f614c36bd6bae74b8cc83e663a8f0", 14040310},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (Italian)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_it.dcp", 0, "10d09b7fe61946f09dd91d5e8d090f94", 11913752},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (Latvian)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_lv.dcp", 0, "704359ab5040b0dab6545064d7aa6eb9", 11414925},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::LV_LAT,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (Polish)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_pl.dcp", 0, "c4ad33f57e1e998169552d521c1d6638", 11532215},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::PL_POL,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Escape Version 1.3.2369 (Portuguese)
-		{
-			"reversion1",
-			"Version 1.3.2369",
-			{
-				{"xlanguage_pt.dcp", 0, "886886b6b14aadac844078de856799a6", 10620797},
-				{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
-				AD_LISTEND
-			},
-			Common::PT_BRA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Meeting (Chinese)
-		{
-			"reversion2",
-			"",
-			{
-				{"xlanguage_nz.dcp", 0, "8c3709474a87a7876109025dff41ff3f", 8746015},
-				{"data.dcp", 0, "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032},
-				AD_LISTEND
-			},
-			Common::ZH_CNA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Meeting (English)
-		{
-			"reversion2",
-			"",
-			{
-				{"xlanguage_en.dcp", 0, "ca357d86618d1ab76a21c913f4403cbd", 8414976},
-				{"data.dcp", 0, "f7938cbfdc48f07934550245a3286921", 255672016},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Meeting (Spanish)
-		{
-			"reversion2",
-			"",
-			AD_ENTRY1s("data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016),
-			Common::ES_ESP,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Meeting Version 2.0.2412 (Chinese)
-		{
-			"reversion2",
-			"Version 2.0.2412",
-			{
-				{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
-				{"xlanguage_nz.dcp", 0, "17c79af4928e24484bee77a7e807cc2a", 10737127},
-				{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
-				AD_LISTEND
-			},
-			Common::ZH_CNA,
-			Common::kPlatformLinux,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Reversion: The Meeting Version 2.0.2412 (English)
-		{
-			"reversion2",
-			"Version 2.0.2412",
-			{
-				{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
-				{"xlanguage_en.dcp", 0, "0598bf752ce93b42bcaf1094df537c7b", 8533057},
-				{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformLinux,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Rhiannon: Curse of the four Branches
-		{
-			"rhiannon",
-			"",
-			AD_ENTRY1s("data.dcp", "870f348900b735f1cc79c0608ce32b0e", 1046169851),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Rhiannon: Curse of the four Branches (English PC DVD)
-		{
-			"rhiannon",
-			"DVD",
-			AD_ENTRY1s("data.dcp", "6736bbc921bb6ce5161b3ad095a97bd4", 1053441028),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
-		{
-			"ritter",
-			"",
-			AD_ENTRY1s("data.dcp", "5ac416cee605d3a30f4d59687b1cdab2", 364260278),
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Satan and Son
-		{
-			"satanandson",
-			"",
-			AD_ENTRY1s("data.dcp",  "16a6ba8174b697bbba9299619d1e20c4", 67539054),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Rosemary
-		{
-			"rosemary",
-			"",
-			AD_ENTRY1s("data.dcp", "4f2631138bd4d27587d9043f8aeff3df", 29483643),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Securanote
-		{
-			"securanote",
-			"",
-			AD_ENTRY1s("data.dcp",  "5213d3e59b9e95b7fbd5c56f7de5341a", 2625554),
-			Common::EN_ANY,
-			Common::kPlatformIOS,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Shaban
-		{
-			"shaban",
-			"",
-			AD_ENTRY1s("data.dcp",  "35f702ca9baabc5c620e0be230195c8a", 755388466),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Shine of a Star
-		{
-			"shinestar",
-			"",
-			AD_ENTRY1s("data.dcp", "f05abe9e2427a5e4f73648fa09c4ba8e", 94113060),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Sofia's Debt
-		{
-			"sofiasdebt",
-			"",
-			AD_ENTRY1s("SD.exe", "e9515f9ba1a2925bb6733476a826a650", 9915047),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Space Invaders (Demo)
-		{
-			"spaceinvaders",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "3f27adefdf72f2c1601cf555c80a509f", 1308361),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Space Madness
-		{
-			"spacemadness",
-			"1.0.2",
-			AD_ENTRY1s("data.dcp",  "b9b83135dc7a9e1b4b5f50195dbeb630", 39546622),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Ancient Mark - Episode 1
-		{
-			"theancientmark1",
-			"",
-			AD_ENTRY1s("data.dcp", "ca04c26f03b2bd307368b306b297ddd7", 364664692),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Box
-		{
-			"thebox",
-			"",
-			AD_ENTRY1s("data.dcp", "ec5f0c7e8174e307701447b53afe7e2f", 108372483),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Kite (Version 1.1)
-		{
-			"thekite",
-			"Version 1.1",
-			AD_ENTRY1s("data.dcp", "92d29428f464469bda2d81b03d4d5c3e", 47332296),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Kite (Version 1.2.e)
-		{
-			"thekite",
-			"Version 1.2.e",
-			AD_ENTRY1s("data.dcp", "92451578b1bdd2b32a1db592a4f6d5fc", 47360539),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Kite (Version 1.2.i) (Italian)
-		{
-			"thekite",
-			"Version 1.2.i",
-			AD_ENTRY1s("data.dcp", "d3435b106a1b3b4c1df8ad596d271586", 47509274),
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Kite (Version 1.2.r) (Russian)
-		{
-			"thekite",
-			"Version 1.2.r",
-			AD_ENTRY1s("data.dcp", "d531e097dd884737469da014ed882cde", 47554582 ),
-			Common::RU_RUS,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Kite (Version 1.3.e)
-		{
-			"thekite",
-			"Version 1.3.e",
-			AD_ENTRY1s("data.dcp", "9761827b51370263b7623721545d7627", 47382987),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Fairy Tales About Toshechka and Boshechka
-		{
-			"tib",
-			"",
-			AD_ENTRY1s("data.dcp", "87d296ef3f46570ed18f000d3885db77", 340264526),
-			Common::RU_RUS,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// The Trader of Stories
-		{
-			"tradestory",
-			"Demo",
-			AD_ENTRY1s("data.dcp", "0a0b51191636cc8ead89b905281c3218", 40401902),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// the white chamber (multi-language)
-		{
-			"twc",
-			"",
-			AD_ENTRY1s("data.dcp", "0011d01142547c61e51ba24dc42b579e", 186451273),
-			Common::UNK_LANG,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Vsevolod Prologue (Demo)
-		{
-			"vsevolod",
-			"Prologue",
-			AD_ENTRY1s("data.dcp", "f2dcffd2692dbfcc9371fa1a87970fe7", 388669493),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE |
-			ADGF_DEMO,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// War
-		{
-			"war",
-			"",
-			AD_ENTRY1s("data.dcp", "003e317cda6d0137bbd5e5d7f089ee4d", 32591890),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Wilma Tetris
-		{
-			"wtetris",
-			"",
-			AD_ENTRY1s("data.dcp", "946e3a0496e6c12fb344c9ed861ff015", 2780093),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
-	{
-		// Zilm: A Game of Reflex 1.0
-		{
-			"Zilm",
-			"1.0",
-			AD_ENTRY1s("data.dcp",  "098dffaf03d8adbb4cb5633e4733e63c", 351726),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
-			GUIO0()
-		},
-		LATEST_VERSION
-	},
+	// Five Lethal Demons
+	WME_WINENTRY("5ld", "", 
+		WME_ENTRY1s("data.dcp", "1037a77cbd001e0644898addc022322c", 15407750), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Five Magical Amulets
+	WME_WINENTRY("5ma", "", 
+		WME_ENTRY1s("data.dcp", "0134e92bcd5fd2837df3971087e96067", 163316498), Common::EN_ANY, ADGF_UNSTABLE, WME_1_7_0),
+	// Actual Destination
+	WME_WINENTRY("actualdest", "", 
+		WME_ENTRY1s("data.dcp", "6926f44b26f21ceb1d840eaab9aeb510", 9081740), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Boredom of Agustin Cordes
+	WME_WINENTRY("agustin", "", 
+		WME_ENTRY1s("data.dcp", "abb79c16c9b92e9b06525a4c7c3f5861", 2461949), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Beyond the Threshold
+	WME_WINENTRY("bthreshold", "", 
+		WME_ENTRY1s("data.dcp", "d49bf9ccb2e74507447c82d6ad3e2bc4", 12773712), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Bickadoodle
+	WME_WINENTRY("bickadoodle", "", 
+		WME_ENTRY1s("data.dcp", "84db4d1594cac95e25614985775d10a8", 35303844), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Bickadoodle (Ver 1.1)
+	WME_WINENTRY("bickadoodle", "Version 1.1", 
+		WME_ENTRY1s("data.dcp", "8bb52ac9a9ee129c5059e8e808b669d7", 35337760), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
+	WME_WINENTRY("bickadoodle", "", 
+		WME_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Book of Gron Part One
+	WME_WINENTRY("bookofgron", "", 
+		WME_ENTRY1s("data.dcp", "e61b2ebee044a82fa0f8ca0fce2c8946", 83129531), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
+	// Carol Reed 4 - East Side Story (Demo)
+	WME_WINENTRY("carolreed4", "Demo", 
+		WME_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Carol Reed 4 - East Side Story
+	WME_WINENTRY("carolreed4", "", 
+		WME_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Carol Reed 5 - The Colour of Murder
+	WME_WINENTRY("carolreed5", "", 
+		WME_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Carol Reed 6 - Black Circle
+	WME_WINENTRY("carolreed6", "", 
+		WME_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Carol Reed 7 - Blue Madonna (Demo)
+	WME_WINENTRY("carolreed7", "Demo", 
+		WME_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Carol Reed 7 - Blue Madonna
+	WME_WINENTRY("carolreed7", "", 
+		WME_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Carol Reed 8 - Amber's Blood
+	WME_WINENTRY("carolreed8", "", 
+		WME_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Carol Reed 9 - Cold Case Summer
+	WME_WINENTRY("carolreed9", "", 
+		WME_ENTRY1s("data.dcp", "2b343b48a7aee508d728a546b414a255", 620005266), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Chivalry is Not Dead
+	WME_WINENTRY("chivalry", "", 
+		WME_ENTRY1s("data.dcp", "ebd0915d9a12df5224be22f53bb23eb6", 7278306), Common::EN_ANY, ADGF_TESTING, LATEST_VERSION),
+	// Chivalry is Not Dead (Version from deirdrakai.com)
+	WME_WINENTRY("chivalry", "", 
+		WME_ENTRY1s("data.dcp", "ae6d91b9517f4d2851a8ad94c96951c8", 7278302), Common::EN_ANY, ADGF_TESTING, LATEST_VERSION),
+	// Conspiracao Dumont
+	WME_WINENTRY("conspiracao", "", 
+		WME_ENTRY1s("ConspiracaoDumont.exe", "106f3f2c8f18bb5ffffeed634ace256c", 32908032), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Corrosion: Cold Winter Waiting
+	WME_WINENTRY("corrosion", "", 
+		WME_ENTRY1s("data.dcp", "ae885b1a8faa0b27f43c0e8f0df02fc9", 525931618), Common::EN_ANY, ADGF_TESTING, LATEST_VERSION),
+	// Dead City (Czech)
+	// The Czech data are in data.dcp, so in this case we'll have to
+	// just detect the english version twice, to give the user a choice.
+	WME_WINENTRY("deadcity", "",
+		WME_ENTRY2s("english.dcp", "c591046d6de7e381d76f70e0787b2b1f", 415935, 
+					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::CZ_CZE, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dead City (English)
+	WME_WINENTRY("deadcity", "",
+		WME_ENTRY2s("english.dcp", "c591046d6de7e381d76f70e0787b2b1f", 415935, 
+					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dead City (Italian)
+	WME_WINENTRY("deadcity", "",
+		WME_ENTRY2s("italian.dcp", "92d8efb94436bec7bd1b7fe0b548192e", 454037, 
+					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dead City (Russian)
+	WME_WINENTRY("deadcity", "",
+		WME_ENTRY2s("russian.dcp", "a0ae71e9e1185596fffb07ad2c951eb9", 653317, 
+					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dirty Split (Czech)
+	WME_WINENTRY("dirtysplit", "",
+		WME_ENTRY2s("czech.dcp", "08a71446467cf8f9444cfea446b46ad6", 127697934, 
+					"data.dcp", "8b4b81b718bf65f30a67fc0b1e329eb5", 88577623), Common::CZ_CZE, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dirty Split (English)
+	WME_WINENTRY("dirtysplit", "", 
+		WME_ENTRY1s("data.dcp", "8f3dae199361ece0f59fb20cfff6eed3", 88577621), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dirty Split (French)
+	WME_WINENTRY("dirtysplit", "",
+		WME_ENTRY2s("french.dcp", "a0508dedebd0fe478d0158fa4c2a1136", 125534323, 
+					"data.dcp", "e6d70c7f5d181b761cfcf974adf9186a", 88577623), Common::FR_FRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dirty Split (German)
+	WME_WINENTRY("dirtysplit", "", 
+		WME_ENTRY1s("data.dcp", "139d8a25579e969f8b37d20e6e3de5f9", 92668291), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dirty Split (Italian)
+	WME_WINENTRY("dirtysplit", "",
+		WME_ENTRY2s("italian.dcp", "8108807fbd8af70be1ec452d0fd1131b", 125513726,
+					"data.dcp", "35a150e22af274185883fdbb142c6fb1", 88577623), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dirty Split (Spanish)
+	WME_WINENTRY("dirtysplit", "",
+		WME_ENTRY2s("spanish.dcp", "b3982c0a5e85b42e1e38240fef004aa4", 164428596,
+					"data.dcp", "63766d6c68b9f00b632ea1736fc8a95c", 88577621), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
+	// Des Reves Elastiques Avec Mille Insectes Nommes Georges
+	WME_WINENTRY("dreaming", "", 
+		WME_ENTRY1s("data.dcp", "4af26d97ea063fc1277ce30ae431de90", 8804073), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Dreamscape
+	WME_WINENTRY("dreamscape", "", 
+		WME_ENTRY1s("data.dcp",  "7a5752ed4446c862be9f02d7932acf54", 17034377), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Escape from the Mansion
+	WME_WINENTRY("escapemansion", "Beta 1", 
+		WME_ENTRY1s("data.dcp",  "d8e348b2312cc36a929cad75f12e0b3a", 21452380), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Escape from the Mansion
+	WME_WINENTRY("escapemansion", "Beta 2", 
+		WME_ENTRY1s("data.dcp",  "ded5fa6c5f2afdaf2cafb53e52cd3dd8", 21455763), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Escape from the Mansion
+	WME_WINENTRY("escapemansion", "1.3", 
+		WME_ENTRY1s("data.dcp",  "1e5d231b56c8a228cd15cb690f50253e", 29261972), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Four
+	WME_WINENTRY("four", "", 
+		WME_ENTRY1s("data.dcp", "ec05cd5e37c9a524053b8859635a4234", 62599855), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Framed
+	WME_WINENTRY("framed", "", 
+		WME_ENTRY1s("data.dcp",  "e7259fb36f2c6f9f28242291e0c3de98", 34690568), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Ghost in the Sheet
+	WME_WINENTRY("ghostsheet", "",
+		WME_ENTRY2s("english.dcp", "e6d0aad2c89996bcabe416105a3d6d3a", 12221017,
+					"data.dcp", "b2f8b05328e4881e15e98e845b63f451", 168003), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Ghost in the Sheet (Demo)
+	WME_WINENTRY("ghostsheet", "Demo", 
+		WME_ENTRY1s("data.dcp", "dc1f6595f412ac25a52eaf47dad4ab81", 169083), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Hamlet or the last game without MMORPS features, shaders and product placement
+	WME_WINENTRY("hamlet", "", 
+		
+		WME_ENTRY1s("data.dcp", "f624add957a77c9930529fb28cc2450f", 88183022), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Helga Deep In Trouble (English)
+	WME_WINENTRY("helga", "",
+		WME_ENTRY2s("english.dcp", "bfa136b21bdbc7d8691c0770a6d40bc3", 135931,
+					"data.dcp", "25cb955a60b58326f2eeda1ce288fb37", 183251259), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Helga Deep In Trouble (Demo) (English)
+	WME_WINENTRY("helga", "Demo",
+		WME_ENTRY2s("english.dcp", "b3a93e678f0ef97200f691cd1724643f", 135864,
+					"data.dcp", "45134ed93bc391edf148b79cdcbf2a09", 154266028), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// James Peris: No License Nor Control (English)
+	WME_WINENTRY("jamesperis", "", 
+		WME_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// James Peris: No License Nor Control (Spanish)
+	WME_WINENTRY("jamesperis", "", 
+		WME_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
+	// James Peris: No License Nor Control (Demo) (English)
+	WME_WINENTRY("jamesperis", "Demo", 
+		WME_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// James Peris: No License Nor Control (Demo) (Spanish)
+	WME_WINENTRY("jamesperis", "Demo", 
+		WME_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507), Common::ES_ESP, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// J.U.L.I.A. (English)
+	WME_WINENTRY("julia", "", 
+		WME_ENTRY1s("data.dcp", "c2264b4f8fcd132d2913ff5b6076a24f", 10109741), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// J.U.L.I.A. (English, Bundle in a box-version)
+	WME_WINENTRY("julia", "Version 1.2", 
+		WME_ENTRY1s("data.dcp", "fe90023ccc22f35185b40b910e0d03a2", 10101373), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// J.U.L.I.A. (English) (Demo)
+	WME_WINENTRY("julia", "Demo", 
+		WME_ENTRY1s("data.dcp", "f0bbc3394555a9811f6050dae428cab6", 7655237), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// J.U.L.I.A. (English) (Greenlight Demo)
+	WME_WINENTRY("julia", "Greenlight Demo", 
+		WME_ENTRY1s("data.dcp", "4befd448d36b0dae9c3ab1aa7cb8b78d", 7271886), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Kulivocko (Czech)
+	WME_WINENTRY("kulivocko", "", 
+		WME_ENTRY1s("data.dcp", "44306dc470e9b27474043932eccee02f", 155106392), Common::CZ_CZE, ADGF_UNSTABLE, LATEST_VERSION),
+	// Kulivocko (Czech) (Demo)
+	WME_WINENTRY("kulivocko", "Demo", 
+		WME_ENTRY1s("data.dcp", "63b164bdfadecbb0deb5da691afb8154", 48362234), Common::CZ_CZE, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Life In 3 Minutes
+	WME_WINENTRY("lifein3minutes", "", 
+		WME_ENTRY1s("data.dcp", "c6368950e37a95bf098b02b4eaa5b929", 141787214), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Looky Demo (English)
+	WME_WINENTRY("looky", "Demo",
+		WME_ENTRY2s("english.dcp", "1388e1dd320f4d553dea3b0316812f9d", 1358442,
+					"data.dcp", "7074bcd7bc7ad7eb04c271aafb964c32", 13815660), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Looky Demo (German)
+	WME_WINENTRY("looky", "Demo",
+		WME_ENTRY2s("german.dcp", "606c048426dfbe94442b59fd34a5c76e", 14339496,
+					"data.dcp", "7074bcd7bc7ad7eb04c271aafb964c32", 13815660), Common::DE_DEU, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Looky (German)
+	WME_WINENTRY("looky", "",
+		WME_ENTRY2s("german.dcp", "bf4c2b8c26342342441a6d64934ab832", 107027865,
+					"data.dcp", "50de0beaa5ad621aa9f020df901d1e74", 1342214), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
+	// Mirage
+	WME_WINENTRY("mirage", "", 
+		WME_ENTRY1s("data.dcp", "d230b0b99c0aa77b9ecd094d8ee5573b", 17844056), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Oknytt
+	WME_WINENTRY("oknytt", "Version 1.0", 
+		WME_ENTRY1s("data.dcp", "6456cf8f429905c83f07509f9da536dd", 109502959), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Night Train Demo
+	WME_WINENTRY("nighttrain", "", 
+		WME_ENTRY1s("data.dcp", "5a027ef84b083a730c9a4c85ec1d3a32", 131760816), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Paintaria
+	WME_WINENTRY("paintaria", "", 
+		WME_ENTRY1s("data.dcp", "354c08440c98150ff0d4008dd2865880", 48326040), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Pigeons in the Park
+	WME_WINENTRY("pigeons", "", 
+		WME_ENTRY1s("data.dcp", "9143a5b6ff8206aefe3c4c643add3ec7", 2611100), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Project: Doom
+	WME_WINENTRY("projectdoom", "", 
+		WME_ENTRY1s("data.dcp", "d5894b65a40706845434b99870bcab92", 99223761), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Project Joe
+	WME_WINENTRY("projectjoe", "", 
+		WME_ENTRY1s("data.dcp", "ada3c08542901295076b5349e655e73f", 160780037), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Project Lonely Robot
+	WME_WINENTRY("lonelyrobot", "beta", 
+		WME_ENTRY1s("data.dcp", "a0cf7ad5bab957416dcda454e9f28ef0", 3420120), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Reversion: The Escape Version 1.0
+	WME_WINENTRY("reversion1", "Version 1.0", 
+		WME_ENTRY1s("data.dcp", "cd616f98ebfd047e0c540b50b4b70761", 254384531), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.1 (Chinese)
+	WME_WINENTRY("reversion1", "Version 1.1",
+		WME_ENTRY2s("chinese.dcp", "cf97150739499a4c15f51dc534ff85a1", 6330561,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::ZH_CNA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.1 (English)
+	WME_WINENTRY("reversion1", "Version 1.1",
+		WME_ENTRY2s("english.dcp", "7b2f061d7c91365c5d04605f1de032b3", 5702699,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.1 (French)
+	WME_WINENTRY("reversion1", "Version 1.1",
+		WME_ENTRY2s("french.dcp", "214204b6022c5ed67fada44557690faf", 6327400,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::FR_FRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.1 (German)
+	WME_WINENTRY("reversion1", "Version 1.1",
+		WME_ENTRY2s("german.dcp", "96677823b36d580a4a29e3659071071c", 6340699,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.1 (Italian)
+	WME_WINENTRY("reversion1", "Version 1.1",
+		WME_ENTRY2s("italian.dcp", "9ce80c1835108f10170a02969f71efe1", 6301836,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.1 (Portuguese)
+	WME_WINENTRY("reversion1", "Version 1.1",
+		WME_ENTRY2s("portugues.dcp", "8772501afa2c630a7c697eb99e9c7bda", 5053303,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::PT_BRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3 (Chinese)
+	WME_WINENTRY("reversion1", "Version 1.3",
+		WME_ENTRY2s("xlanguage_nz.dcp", "92c4065156e464211685bf799b3279fd", 5130600,
+					"data.dcp", "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907), Common::ZH_CNA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3 (English)
+	WME_WINENTRY("reversion1", "Version 1.3",
+		WME_ENTRY2s("xlanguage_en.dcp", "05845e1283920a6e4044f2a54f7a9519", 4818543,
+					"data.dcp", "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3 (French)
+	WME_WINENTRY("reversion1", "Version 1.3",
+		WME_ENTRY2s("xlanguage_fr.dcp", "441795490e9307eb2ed07830779881ac", 5425959,
+					"data.dcp", "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907), Common::FR_FRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3 (German)
+	WME_WINENTRY("reversion1", "Version 1.3",
+		WME_ENTRY2s("xlanguage_de.dcp", "b588041015b93e54b4c246ca77d01e76", 5423798,
+					"data.dcp", "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3 (Italian)
+	WME_WINENTRY("reversion1", "Version 1.3",
+		WME_ENTRY2s("xlanguage_it.dcp", "a1f4199079b75ee10cded41f05b45d5f", 5386424,
+					"data.dcp", "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3 (Portuguese)
+	WME_WINENTRY("reversion1", "Version 1.3",
+		WME_ENTRY2s("xlanguage_pt.dcp", "3d653debd37e56756a79401e1004c4d2", 4149165,
+					"data.dcp", "9ebb12f6fd7c038d079f81beb3bd96d5", 254185907), Common::PT_BRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (Chinese)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_nz.dcp", "7146dfa43ffdf0886e034fffe2c8a0c0", 13722261,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::ZH_CNA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (English)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_en.dcp", "64b6fa7eedc09c231f6ce046e77fee05", 11339619,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (French)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_fr.dcp", "d561d562224afea809153a1fd9fdb0c0", 11963210,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::FR_FRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (German)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_de.dcp", "4e3f614c36bd6bae74b8cc83e663a8f0", 14040310,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (Italian)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_it.dcp", "10d09b7fe61946f09dd91d5e8d090f94", 11913752,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (Latvian)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_lv.dcp", "704359ab5040b0dab6545064d7aa6eb9", 11414925,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::LV_LAT, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (Polish)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_pl.dcp", "c4ad33f57e1e998169552d521c1d6638", 11532215,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::PL_POL, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Escape Version 1.3.2369 (Portuguese)
+	WME_WINENTRY("reversion1", "Version 1.3.2369",
+		WME_ENTRY2s("xlanguage_pt.dcp", "886886b6b14aadac844078de856799a6", 10620797,
+					"data.dcp", "aecb5deeea7b0baa871fbd0cef35a648", 254219204), Common::PT_BRA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Meeting (Chinese)
+	WME_WINENTRY("reversion2", "",
+		WME_ENTRY2s("xlanguage_nz.dcp", "8c3709474a87a7876109025dff41ff3f", 8746015,
+					"data.dcp", "cb9865dc7e1db2990a8cf4bc13cf4999", 257643032), Common::ZH_CNA, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Meeting (English)
+	WME_WINENTRY("reversion2", "",
+		WME_ENTRY2s("xlanguage_en.dcp", "ca357d86618d1ab76a21c913f4403cbd", 8414976,
+					"data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Meeting (Spanish)
+	WME_WINENTRY("reversion2", "", 
+		WME_ENTRY1s("data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Meeting Version 2.0.2412 (Chinese)
+	WME_PLATENTRY("reversion2", "Version 2.0.2412",
+		WME_ENTRY3s("data.dcp", "f4ffc4df24b7bebad56a24930f33a2bc", 255766600,
+					"xlanguage_nz.dcp", "17c79af4928e24484bee77a7e807cc2a", 10737127,
+					"Linux.dcp", "21858bd77dc86b03f701fd47900e2f51", 984535), Common::ZH_CNA, Common::kPlatformLinux, ADGF_UNSTABLE, LATEST_VERSION),
+	// Reversion: The Meeting Version 2.0.2412 (English)
+	WME_PLATENTRY("reversion2", "Version 2.0.2412",
+		WME_ENTRY3s("data.dcp", "f4ffc4df24b7bebad56a24930f33a2bc", 255766600,
+					"xlanguage_en.dcp", "0598bf752ce93b42bcaf1094df537c7b", 8533057,
+					"Linux.dcp", "21858bd77dc86b03f701fd47900e2f51", 984535), Common::EN_ANY, Common::kPlatformLinux, ADGF_UNSTABLE, LATEST_VERSION),
+	// Rhiannon: Curse of the four Branches
+	WME_WINENTRY("rhiannon", "", 
+		WME_ENTRY1s("data.dcp", "870f348900b735f1cc79c0608ce32b0e", 1046169851), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Rhiannon: Curse of the four Branches (English PC DVD)
+	WME_WINENTRY("rhiannon", "DVD", 
+		WME_ENTRY1s("data.dcp", "6736bbc921bb6ce5161b3ad095a97bd4", 1053441028), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
+	WME_WINENTRY("ritter", "", 
+		WME_ENTRY1s("data.dcp", "5ac416cee605d3a30f4d59687b1cdab2", 364260278), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
+	// Satan and Son
+	WME_WINENTRY("satanandson", "", 
+		WME_ENTRY1s("data.dcp",  "16a6ba8174b697bbba9299619d1e20c4", 67539054), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Rosemary
+	WME_WINENTRY("rosemary", "", 
+		WME_ENTRY1s("data.dcp", "4f2631138bd4d27587d9043f8aeff3df", 29483643), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Securanote
+	WME_PLATENTRY("securanote", "", 
+		WME_ENTRY1s("data.dcp",  "5213d3e59b9e95b7fbd5c56f7de5341a", 2625554), Common::EN_ANY, Common::kPlatformIOS, ADGF_UNSTABLE, LATEST_VERSION),
+	// Shaban
+	WME_WINENTRY("shaban", "", 
+		WME_ENTRY1s("data.dcp",  "35f702ca9baabc5c620e0be230195c8a", 755388466), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Shine of a Star
+	WME_WINENTRY("shinestar", "", 
+		WME_ENTRY1s("data.dcp", "f05abe9e2427a5e4f73648fa09c4ba8e", 94113060), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Sofia's Debt
+	WME_WINENTRY("sofiasdebt", "", 
+		WME_ENTRY1s("SD.exe", "e9515f9ba1a2925bb6733476a826a650", 9915047), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Space Invaders (Demo)
+	WME_WINENTRY("spaceinvaders", "Demo", 
+		WME_ENTRY1s("data.dcp", "3f27adefdf72f2c1601cf555c80a509f", 1308361), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// Space Madness
+	WME_WINENTRY("spacemadness", "1.0.2", 
+		WME_ENTRY1s("data.dcp",  "b9b83135dc7a9e1b4b5f50195dbeb630", 39546622), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Ancient Mark - Episode 1
+	WME_WINENTRY("theancientmark1", "", 
+		WME_ENTRY1s("data.dcp", "ca04c26f03b2bd307368b306b297ddd7", 364664692), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Box
+	WME_WINENTRY("thebox", "", 
+		WME_ENTRY1s("data.dcp", "ec5f0c7e8174e307701447b53afe7e2f", 108372483), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Kite (Version 1.1)
+	WME_WINENTRY("thekite", "Version 1.1", 
+		WME_ENTRY1s("data.dcp", "92d29428f464469bda2d81b03d4d5c3e", 47332296), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Kite (Version 1.2.e)
+	WME_WINENTRY("thekite", "Version 1.2.e", 
+		WME_ENTRY1s("data.dcp", "92451578b1bdd2b32a1db592a4f6d5fc", 47360539), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Kite (Version 1.2.i) (Italian)
+	WME_WINENTRY("thekite", "Version 1.2.i", 
+		WME_ENTRY1s("data.dcp", "d3435b106a1b3b4c1df8ad596d271586", 47509274), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Kite (Version 1.2.r) (Russian)
+	WME_WINENTRY("thekite", "Version 1.2.r", 
+		WME_ENTRY1s("data.dcp", "d531e097dd884737469da014ed882cde", 47554582 ), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Kite (Version 1.3.e)
+	WME_WINENTRY("thekite", "Version 1.3.e", 
+		WME_ENTRY1s("data.dcp", "9761827b51370263b7623721545d7627", 47382987), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Fairy Tales About Toshechka and Boshechka
+	WME_WINENTRY("tib", "", 
+		WME_ENTRY1s("data.dcp", "87d296ef3f46570ed18f000d3885db77", 340264526), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
+	// The Trader of Stories
+	WME_WINENTRY("tradestory", "Demo", 
+		WME_ENTRY1s("data.dcp", "0a0b51191636cc8ead89b905281c3218", 40401902), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// the white chamber (multi-language)
+	WME_WINENTRY("twc", "", 
+		WME_ENTRY1s("data.dcp", "0011d01142547c61e51ba24dc42b579e", 186451273), Common::UNK_LANG, ADGF_UNSTABLE, LATEST_VERSION),
+	// Vsevolod Prologue (Demo)
+	WME_WINENTRY("vsevolod", "Prologue", 
+		WME_ENTRY1s("data.dcp", "f2dcffd2692dbfcc9371fa1a87970fe7", 388669493), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
+	// War
+	WME_WINENTRY("war", "", 
+		WME_ENTRY1s("data.dcp", "003e317cda6d0137bbd5e5d7f089ee4d", 32591890), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Wilma Tetris
+	WME_WINENTRY("wtetris", "", 
+		WME_ENTRY1s("data.dcp", "946e3a0496e6c12fb344c9ed861ff015", 2780093), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Zilm: A Game of Reflex 1.0
+	WME_WINENTRY("Zilm", "1.0", 
+		WME_ENTRY1s("data.dcp",  "098dffaf03d8adbb4cb5633e4733e63c", 351726), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	{
 		AD_TABLE_END_MARKER,
 		LATEST_VERSION
@@ -1780,3 +536,9 @@ static const WMEGameDescription gameDescriptions[] = {
 
 } // End of namespace Wintermute
 
+#undef WEM_ENTRY1s
+#undef WEM_ENTRY2s
+#undef WEM_ENTRY3s
+#undef WME_WINENTRY
+#undef WME_PLATENTRY
+
-- 
cgit v1.2.3


From 2f868ae5b6ed2c5449048db7206357870ce740a1 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Tue, 4 Nov 2014 18:08:20 +0100
Subject: WINTERMUTE: Add detection for Bickadoodle 1.2 (Fixes bug 6735)

---
 engines/wintermute/detection_tables.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index f6f9e24730..4e3320159a 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -158,6 +158,9 @@ static const WMEGameDescription gameDescriptions[] = {
 	// Bickadoodle (Ver 1.1)
 	WME_WINENTRY("bickadoodle", "Version 1.1", 
 		WME_ENTRY1s("data.dcp", "8bb52ac9a9ee129c5059e8e808b669d7", 35337760), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
+	// Bickadoodle (Ver 1.2)
+	WME_WINENTRY("bickadoodle", "Version 1.2",
+		WME_ENTRY1s("data.dcp", "1796a48f3ed72dd785ce93334ab883cc", 35337760), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
 	WME_WINENTRY("bickadoodle", "", 
 		WME_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
-- 
cgit v1.2.3


From ee876b56b291676faa4526b6df1e385d8560087f Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Tue, 4 Nov 2014 18:34:06 +0100
Subject: WINTERMUTE: Add VK-translations for F1-F12 and HOME

---
 engines/wintermute/base/base_keyboard_state.cpp | 48 +++++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index 61087c5836..0babc07586 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -278,10 +278,24 @@ uint32 BaseKeyboardState::keyCodeToVKey(Common::Event *event) {
 enum VKeyCodes {
 	kVkEscape = 27,
 	kVkSpace  = 32,
+	kVkHome   = 36,
 	kVkLeft   = 37,
 	kVkUp     = 38,
 	kVkRight  = 39,
-	kVkDown   = 40
+	kVkDown   = 40,
+
+	kVkF1     = 112,
+	kVkF2     = 113,
+	kVkF3     = 114,
+	kVkF4     = 115,
+	kVkF5     = 116,
+	kVkF6     = 117,
+	kVkF7     = 118,
+	kVkF8     = 119,
+	kVkF9     = 120,
+	kVkF10    = 121,
+	kVkF11    = 122,
+	kVkF12    = 123
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -290,22 +304,42 @@ Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {
 	switch (vkey) {
 	case kVkEscape:
 		return Common::KEYCODE_ESCAPE;
-		break;
 	case kVkSpace:
 		return Common::KEYCODE_SPACE;
-		break;
+	case kVkHome:
+		return Common::KEYCODE_HOME;
 	case kVkLeft:
 		return Common::KEYCODE_LEFT;
-		break;
 	case kVkRight:
 		return Common::KEYCODE_RIGHT;
-		break;
 	case kVkUp:
 		return Common::KEYCODE_UP;
-		break;
 	case kVkDown:
 		return Common::KEYCODE_DOWN;
-		break;
+	case kVkF1:
+		return Common::KEYCODE_F1;
+	case kVkF2:
+		return Common::KEYCODE_F2;
+	case kVkF3:
+		return Common::KEYCODE_F3;
+	case kVkF4:
+		return Common::KEYCODE_F4;
+	case kVkF5:
+		return Common::KEYCODE_F5;
+	case kVkF6:
+		return Common::KEYCODE_F6;
+	case kVkF7:
+		return Common::KEYCODE_F7;
+	case kVkF8:
+		return Common::KEYCODE_F8;
+	case kVkF9:
+		return Common::KEYCODE_F9;
+	case kVkF10:
+		return Common::KEYCODE_F10;
+	case kVkF11:
+		return Common::KEYCODE_F11;
+	case kVkF12:
+		return Common::KEYCODE_F12;
 	default:
 		warning("Unknown VKEY: %d", vkey);
 		return (Common::KeyCode)vkey;
-- 
cgit v1.2.3


From ad8dbd364203a463fbae935b751cf96f76c38cf5 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 4 Nov 2014 19:46:44 +0100
Subject: SCI: kStrCat does language-splitting for QfG1 too

---
 engines/sci/engine/kstring.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 56dad583e4..eef758a0d9 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -42,10 +42,12 @@ reg_t kStrCat(EngineState *s, int argc, reg_t *argv) {
 	Common::String s1 = s->_segMan->getString(argv[0]);
 	Common::String s2 = s->_segMan->getString(argv[1]);
 
-	// The Japanese version of PQ2 splits the two strings here
-	// (check bug #3396887).
-	if (g_sci->getGameId() == GID_PQ2 &&
-		g_sci->getLanguage() == Common::JA_JPN) {
+	// Japanese PC-9801 interpreter splits strings here
+	//  see bug #5834
+	//  Verified for Police Quest 2 + Quest For Glory 1
+	//  However Space Quest 4 PC-9801 doesn't
+	if ((g_sci->getLanguage() == Common::JA_JPN)
+		&& (getSciVersion() <= SCI_VERSION_01)) {
 		s1 = g_sci->strSplit(s1.c_str(), NULL);
 		s2 = g_sci->strSplit(s2.c_str(), NULL);
 	}
-- 
cgit v1.2.3


From eff78c442474185ecb1bde59bfc54c276178c480 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 4 Nov 2014 22:01:21 +0100
Subject: SCI: fix Japanese Space Quest 4 (intro + buttons) At least SQ4 uses
 #j text prefix as signal for the interpreter to not use the PC9801 hires
 font, but to use the internal low res font instead

---
 engines/sci/engine/kgraphics.cpp    | 33 +++++++++++----
 engines/sci/engine/state.cpp        | 84 ++++++++++++++++++++-----------------
 engines/sci/graphics/controls16.cpp | 12 +++---
 engines/sci/graphics/controls16.h   |  6 +--
 engines/sci/graphics/paint16.cpp    |  6 +--
 engines/sci/graphics/paint16.h      |  2 +-
 engines/sci/graphics/text16.cpp     | 24 ++++++-----
 engines/sci/graphics/text16.h       | 13 ++++--
 engines/sci/sci.h                   |  7 +++-
 9 files changed, 112 insertions(+), 75 deletions(-)

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index c2089bcd4d..ee2249bd9d 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -354,13 +354,16 @@ reg_t kTextSize(EngineState *s, int argc, reg_t *argv) {
 	}
 
 	textWidth = dest[3].toUint16(); textHeight = dest[2].toUint16();
+	
+	uint16 languageSplitter = 0;
+	Common::String splitText = g_sci->strSplitLanguage(text.c_str(), &languageSplitter, sep);
 
 #ifdef ENABLE_SCI32
 	if (g_sci->_gfxText32)
-		g_sci->_gfxText32->kernelTextSize(g_sci->strSplit(text.c_str(), sep).c_str(), font_nr, maxwidth, &textWidth, &textHeight);
+		g_sci->_gfxText32->kernelTextSize(splitText.c_str(), font_nr, maxwidth, &textWidth, &textHeight);
 	else
 #endif
-		g_sci->_gfxText16->kernelTextSize(g_sci->strSplit(text.c_str(), sep).c_str(), font_nr, maxwidth, &textWidth, &textHeight);
+		g_sci->_gfxText16->kernelTextSize(splitText.c_str(), languageSplitter, font_nr, maxwidth, &textWidth, &textHeight);
 
 	// One of the game texts in LB2 German contains loads of spaces in
 	// its end. We trim the text here, otherwise the graphics code will
@@ -376,7 +379,7 @@ reg_t kTextSize(EngineState *s, int argc, reg_t *argv) {
 			// Copy over the trimmed string...
 			s->_segMan->strcpy(argv[1], text.c_str());
 			// ...and recalculate bounding box dimensions
-			g_sci->_gfxText16->kernelTextSize(g_sci->strSplit(text.c_str(), sep).c_str(), font_nr, maxwidth, &textWidth, &textHeight);
+			g_sci->_gfxText16->kernelTextSize(splitText.c_str(), languageSplitter, font_nr, maxwidth, &textWidth, &textHeight);
 		}
 	}
 
@@ -818,16 +821,29 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) {
 	if (!textReference.isNull())
 		text = s->_segMan->getString(textReference);
 
+	uint16 languageSplitter = 0;
+	Common::String splitText;
+	
+	switch (type) {
+	case SCI_CONTROLS_TYPE_BUTTON:
+	case SCI_CONTROLS_TYPE_TEXTEDIT:
+		splitText = g_sci->strSplitLanguage(text.c_str(), &languageSplitter, NULL);
+		break;
+	case SCI_CONTROLS_TYPE_TEXT:
+		splitText = g_sci->strSplitLanguage(text.c_str(), &languageSplitter);
+		break;
+	}
+
 	switch (type) {
 	case SCI_CONTROLS_TYPE_BUTTON:
 		debugC(kDebugLevelGraphics, "drawing button %04x:%04x to %d,%d", PRINT_REG(controlObject), x, y);
-		g_sci->_gfxControls16->kernelDrawButton(rect, controlObject, g_sci->strSplit(text.c_str(), NULL).c_str(), fontId, style, hilite);
+		g_sci->_gfxControls16->kernelDrawButton(rect, controlObject, splitText.c_str(), languageSplitter, fontId, style, hilite);
 		return;
 
 	case SCI_CONTROLS_TYPE_TEXT:
 		alignment = readSelectorValue(s->_segMan, controlObject, SELECTOR(mode));
 		debugC(kDebugLevelGraphics, "drawing text %04x:%04x ('%s') to %d,%d, mode=%d", PRINT_REG(controlObject), text.c_str(), x, y, alignment);
-		g_sci->_gfxControls16->kernelDrawText(rect, controlObject, g_sci->strSplit(text.c_str()).c_str(), fontId, alignment, style, hilite);
+		g_sci->_gfxControls16->kernelDrawText(rect, controlObject, splitText.c_str(), languageSplitter, fontId, alignment, style, hilite);
 		s->r_acc = g_sci->_gfxText16->allocAndFillReferenceRectArray();
 		return;
 
@@ -841,7 +857,7 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) {
 			writeSelectorValue(s->_segMan, controlObject, SELECTOR(cursor), cursorPos);
 		}
 		debugC(kDebugLevelGraphics, "drawing edit control %04x:%04x (text %04x:%04x, '%s') to %d,%d", PRINT_REG(controlObject), PRINT_REG(textReference), text.c_str(), x, y);
-		g_sci->_gfxControls16->kernelDrawTextEdit(rect, controlObject, g_sci->strSplit(text.c_str(), NULL).c_str(), fontId, mode, style, cursorPos, maxChars, hilite);
+		g_sci->_gfxControls16->kernelDrawTextEdit(rect, controlObject, splitText.c_str(), languageSplitter, fontId, mode, style, cursorPos, maxChars, hilite);
 		return;
 
 	case SCI_CONTROLS_TYPE_ICON:
@@ -1165,8 +1181,11 @@ reg_t kDisplay(EngineState *s, int argc, reg_t *argv) {
 		argc--; argc--; argv++; argv++;
 		text = g_sci->getKernel()->lookupText(textp, index);
 	}
+	
+	uint16 languageSplitter = 0;
+	Common::String splitText = g_sci->strSplitLanguage(text.c_str(), &languageSplitter);
 
-	return g_sci->_gfxPaint16->kernelDisplay(g_sci->strSplit(text.c_str()).c_str(), argc, argv);
+	return g_sci->_gfxPaint16->kernelDisplay(splitText.c_str(), languageSplitter, argc, argv);
 }
 
 reg_t kSetVideoMode(EngineState *s, int argc, reg_t *argv) {
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 1b7fa7699e..c07dc925e0 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -203,37 +203,45 @@ static kLanguage charToLanguage(const char c) {
 	}
 }
 
-Common::String SciEngine::getSciLanguageString(const Common::String &str, kLanguage lang, kLanguage *lang2) const {
-	kLanguage secondLang = K_LANG_NONE;
-
-	const char *seeker = str.c_str();
-	while (*seeker) {
-		if ((*seeker == '%') || (*seeker == '#')) {
-			secondLang = charToLanguage(*(seeker + 1));
-
-			if (secondLang != K_LANG_NONE)
+Common::String SciEngine::getSciLanguageString(const Common::String &str, kLanguage requestedLanguage, kLanguage *secondaryLanguage, uint16 *languageSplitter) const {
+	kLanguage foundLanguage = K_LANG_NONE;
+	const byte *textPtr = (byte *)str.c_str();
+	byte curChar = 0;
+	byte curChar2 = 0;
+	
+	while (1) {
+		curChar = *textPtr;
+		if (!curChar)
+			break;
+		
+		if ((curChar == '%') || (curChar == '#')) {
+			curChar2 = *(textPtr + 1);
+			foundLanguage = charToLanguage(curChar2);
+
+			if (foundLanguage != K_LANG_NONE) {
+				// Return language splitter
+				if (languageSplitter)
+					*languageSplitter = curChar | ( curChar2 << 8 );
+				// Return the secondary language found in the string
+				if (secondaryLanguage)
+					*secondaryLanguage = foundLanguage;
 				break;
+			}
 		}
-
-		++seeker;
+		textPtr++;
 	}
 
-	// Return the secondary language found in the string
-	if (lang2)
-		*lang2 = secondLang;
-
-	if (secondLang == lang) {
-		if (*(++seeker) == 'J') {
+	if (foundLanguage == requestedLanguage) {
+		if (curChar2 == 'J') {
 			// Japanese including Kanji, displayed with system font
 			// Convert half-width characters to full-width equivalents
 			Common::String fullWidth;
-			byte curChar, curChar2;
 			uint16 mappedChar;
 
-			seeker++;
+			textPtr += 2; // skip over language splitter
 
 			while (1) {
-				curChar = *(seeker);
+				curChar = *textPtr;
 				
 				switch (curChar) {
 				case 0: // Terminator NUL
@@ -243,7 +251,7 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 					//  inside GetLongest() (text16). We do it here, because it's much cleaner and
 					//  we have to process the text here anyway.
 					//  Occurs for example in Police Quest 2 intro
-					curChar2 = *(seeker + 1);
+					curChar2 = *(textPtr + 1);
 					switch (curChar2) {
 					case 'n':
 					case 'N':
@@ -251,12 +259,12 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 					case 'R':
 						fullWidth += ' ';
 						fullWidth += 0x0D; // CR
-						seeker += 2;
+						textPtr += 2;
 						continue;
 					}
 				}
 				
-				seeker++;
+				textPtr++;
 
 				mappedChar = s_halfWidthSJISMap[curChar];
 				if (mappedChar) {
@@ -264,7 +272,7 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 					fullWidth += mappedChar & 0xFF;
 				} else {
 					// Copy double-byte character
-					curChar2 = *(seeker++);
+					curChar2 = *(textPtr++);
 					if (!curChar) {
 						error("SJIS character %02X is missing second byte", curChar);
 						break;
@@ -275,14 +283,14 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 			}
 
 		} else {
-			return Common::String(seeker + 1);
+			return Common::String((const char *)(textPtr + 2));
 		}
 	}
 
-	if (*seeker)
-		return Common::String(str.c_str(), seeker - str.c_str());
-	else
-		return str;
+	if (curChar)
+		return Common::String(str.c_str(), (const char *)textPtr - str.c_str());
+
+	return str;
 }
 
 kLanguage SciEngine::getSciLanguage() {
@@ -341,25 +349,25 @@ void SciEngine::setSciLanguage() {
 	setSciLanguage(getSciLanguage());
 }
 
-Common::String SciEngine::strSplit(const char *str, const char *sep) {
-	kLanguage lang = getSciLanguage();
-	kLanguage subLang = K_LANG_NONE;
+Common::String SciEngine::strSplitLanguage(const char *str, uint16 *languageSplitter, const char *sep) {
+	kLanguage activeLanguage = getSciLanguage();
+	kLanguage subtitleLanguage = K_LANG_NONE;
 
 	if (SELECTOR(subtitleLang) != -1)
-		subLang = (kLanguage)readSelectorValue(_gamestate->_segMan, _gameObjectAddress, SELECTOR(subtitleLang));
+		subtitleLanguage = (kLanguage)readSelectorValue(_gamestate->_segMan, _gameObjectAddress, SELECTOR(subtitleLang));
 
-	kLanguage secondLang;
-	Common::String retval = getSciLanguageString(str, lang, &secondLang);
+	kLanguage foundLanguage;
+	Common::String retval = getSciLanguageString(str, activeLanguage, &foundLanguage, languageSplitter);
 
 	// Don't add subtitle when separator is not set, subtitle language is not set, or
 	// string contains only one language
-	if ((sep == NULL) || (subLang == K_LANG_NONE) || (secondLang == K_LANG_NONE))
+	if ((sep == NULL) || (subtitleLanguage == K_LANG_NONE) || (foundLanguage == K_LANG_NONE))
 		return retval;
 
 	// Add subtitle, unless the subtitle language doesn't match the languages in the string
-	if ((subLang == K_LANG_ENGLISH) || (subLang == secondLang)) {
+	if ((subtitleLanguage == K_LANG_ENGLISH) || (subtitleLanguage == foundLanguage)) {
 		retval += sep;
-		retval += getSciLanguageString(str, subLang);
+		retval += getSciLanguageString(str, subtitleLanguage);
 	}
 
 	return retval;
diff --git a/engines/sci/graphics/controls16.cpp b/engines/sci/graphics/controls16.cpp
index f2b2ccdfe6..e2e250cf9d 100644
--- a/engines/sci/graphics/controls16.cpp
+++ b/engines/sci/graphics/controls16.cpp
@@ -280,7 +280,7 @@ int GfxControls16::getPicNotValid() {
 	return _screen->_picNotValid;
 }
 
-void GfxControls16::kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite) {
+void GfxControls16::kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 style, bool hilite) {
 	int16 sci0EarlyPen = 0, sci0EarlyBack = 0;
 	if (!hilite) {
 		if (getSciVersion() == SCI_VERSION_0_EARLY) {
@@ -295,7 +295,7 @@ void GfxControls16::kernelDrawButton(Common::Rect rect, reg_t obj, const char *t
 		_paint16->frameRect(rect);
 		rect.grow(-2);
 		_ports->textGreyedOutput(!(style & SCI_CONTROLS_STYLE_ENABLED));
-		_text16->Box(text, false, rect, SCI_TEXT16_ALIGNMENT_CENTER, fontId);
+		_text16->Box(text, languageSplitter, false, rect, SCI_TEXT16_ALIGNMENT_CENTER, fontId);
 		_ports->textGreyedOutput(false);
 		rect.grow(1);
 		if (style & SCI_CONTROLS_STYLE_SELECTED)
@@ -318,12 +318,12 @@ void GfxControls16::kernelDrawButton(Common::Rect rect, reg_t obj, const char *t
 	}
 }
 
-void GfxControls16::kernelDrawText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, TextAlignment alignment, int16 style, bool hilite) {
+void GfxControls16::kernelDrawText(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, TextAlignment alignment, int16 style, bool hilite) {
 	if (!hilite) {
 		rect.grow(1);
 		_paint16->eraseRect(rect);
 		rect.grow(-1);
-		_text16->Box(text, false, rect, alignment, fontId);
+		_text16->Box(text, languageSplitter, false, rect, alignment, fontId);
 		if (style & SCI_CONTROLS_STYLE_SELECTED) {
 			_paint16->frameRect(rect);
 		}
@@ -335,7 +335,7 @@ void GfxControls16::kernelDrawText(Common::Rect rect, reg_t obj, const char *tex
 	}
 }
 
-void GfxControls16::kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite) {
+void GfxControls16::kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite) {
 	Common::Rect textRect = rect;
 	uint16 oldFontId = _text16->GetFontId();
 
@@ -343,7 +343,7 @@ void GfxControls16::kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char
 	_texteditCursorVisible = false;
 	texteditCursorErase();
 	_paint16->eraseRect(rect);
-	_text16->Box(text, false, textRect, SCI_TEXT16_ALIGNMENT_LEFT, fontId);
+	_text16->Box(text, languageSplitter, false, textRect, SCI_TEXT16_ALIGNMENT_LEFT, fontId);
 	_paint16->frameRect(rect);
 	if (style & SCI_CONTROLS_STYLE_SELECTED) {
 		_text16->SetFont(fontId);
diff --git a/engines/sci/graphics/controls16.h b/engines/sci/graphics/controls16.h
index 6a70c71aae..39ffa243fb 100644
--- a/engines/sci/graphics/controls16.h
+++ b/engines/sci/graphics/controls16.h
@@ -55,9 +55,9 @@ public:
 	GfxControls16(SegManager *segMan, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen);
 	~GfxControls16();
 
-	void kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite);
-	void kernelDrawText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 alignment, int16 style, bool hilite);
-	void kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite);
+	void kernelDrawButton(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 style, bool hilite);
+	void kernelDrawText(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 alignment, int16 style, bool hilite);
+	void kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char *text, uint16 languageSplitter, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite);
 	void kernelDrawIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite);
 	void kernelDrawList(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const char **entries, GuiResourceId fontId, int16 style, int16 upperPos, int16 cursorPos, bool isAlias, bool hilite);
 	void kernelTexteditChange(reg_t controlObject, reg_t eventObject);
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index b835eb92ca..f80703e14d 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -476,7 +476,7 @@ void GfxPaint16::kernelGraphRedrawBox(Common::Rect rect) {
 #define SCI_DISPLAY_DUMMY3				117
 #define SCI_DISPLAY_DONTSHOWBITS		121
 
-reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
+reg_t GfxPaint16::kernelDisplay(const char *text, uint16 languageSplitter, int argc, reg_t *argv) {
 	reg_t displayArg;
 	TextAlignment alignment = SCI_TEXT16_ALIGNMENT_LEFT;
 	int16 colorPen = -1, colorBack = -1, width = -1, bRedraw = 1;
@@ -572,7 +572,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
 	}
 
 	// now drawing the text
-	_text16->Size(rect, text, -1, width);
+	_text16->Size(rect, text, languageSplitter, -1, width);
 	rect.moveTo(_ports->getPort()->curLeft, _ports->getPort()->curTop);
 	// Note: This code has been found in SCI1 middle and newer games. It was
 	// previously only for SCI1 late and newer, but the LSL1 interpreter contains
@@ -588,7 +588,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
 		result = bitsSave(rect, GFX_SCREEN_MASK_VISUAL);
 	if (colorBack != -1)
 		fillRect(rect, GFX_SCREEN_MASK_VISUAL, colorBack, 0, 0);
-	_text16->Box(text, false, rect, alignment, -1);
+	_text16->Box(text, languageSplitter, false, rect, alignment, -1);
 	if (_screen->_picNotValid == 0 && bRedraw)
 		bitsShow(rect);
 	// restoring port and cursor pos
diff --git a/engines/sci/graphics/paint16.h b/engines/sci/graphics/paint16.h
index 882f311a5b..955cfdec8f 100644
--- a/engines/sci/graphics/paint16.h
+++ b/engines/sci/graphics/paint16.h
@@ -80,7 +80,7 @@ public:
 	void kernelGraphUpdateBox(const Common::Rect &rect, bool hiresMode);
 	void kernelGraphRedrawBox(Common::Rect rect);
 
-	reg_t kernelDisplay(const char *text, int argc, reg_t *argv);
+	reg_t kernelDisplay(const char *text, uint16 languageSplitter, int argc, reg_t *argv);
 
 	reg_t kernelPortraitLoad(const Common::String &resourceName);
 	void kernelPortraitShow(const Common::String &resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 7552cb89ef..edeef31a5f 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -353,7 +353,7 @@ void GfxText16::DrawString(const char *str, GuiResourceId orgFontId, int16 orgPe
 	Draw(str, 0, (int16)strlen(str), orgFontId, orgPenColor);
 }
 
-int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId, int16 maxWidth) {
+int16 GfxText16::Size(Common::Rect &rect, const char *text, uint16 languageSplitter, GuiResourceId fontId, int16 maxWidth) {
 	GuiResourceId previousFontId = GetFontId();
 	int16 previousPenColor = _ports->_curPort->penClr;
 	int16 charCount;
@@ -369,7 +369,7 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 
 	if (maxWidth < 0) { // force output as single line
 		if (g_sci->getLanguage() == Common::JA_JPN)
-			SwitchToFont900OnSjis(text);
+			SwitchToFont900OnSjis(text, languageSplitter);
 
 		StringWidth(text, fontId, textWidth, textHeight);
 		rect.bottom = textHeight;
@@ -383,7 +383,7 @@ int16 GfxText16::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 		while (*curTextPos) {
 			// We need to check for Shift-JIS every line
 			if (g_sci->getLanguage() == Common::JA_JPN)
-				SwitchToFont900OnSjis(curTextPos);
+				SwitchToFont900OnSjis(curTextPos, languageSplitter);
 
 			charCount = GetLongest(curTextPos, rect.right, fontId);
 			if (charCount == 0)
@@ -458,7 +458,7 @@ void GfxText16::Show(const char *text, int16 from, int16 len, GuiResourceId orgF
 }
 
 // Draws a text in rect.
-void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId) {
+void GfxText16::Box(const char *text, uint16 languageSplitter, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId) {
 	int16 textWidth, maxTextWidth, textHeight, charCount;
 	int16 offset = 0;
 	int16 hline = 0;
@@ -482,7 +482,7 @@ void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextA
 		// We need to check for Shift-JIS every line
 		//  Police Quest 2 PC-9801 often draws English + Japanese text during the same call
 		if (g_sci->getLanguage() == Common::JA_JPN) {
-			if (SwitchToFont900OnSjis(curTextPos))
+			if (SwitchToFont900OnSjis(curTextPos, languageSplitter))
 				doubleByteMode = true;
 		}
 
@@ -576,11 +576,13 @@ void GfxText16::DrawStatus(const char *text) {
 
 // Sierra did this in their PC98 interpreter only, they identify a text as being
 // sjis and then switch to font 900
-bool GfxText16::SwitchToFont900OnSjis(const char *text) {
+bool GfxText16::SwitchToFont900OnSjis(const char *text, uint16 languageSplitter) {
 	byte firstChar = (*(const byte *)text++);
-	if (((firstChar >= 0x81) && (firstChar <= 0x9F)) || ((firstChar >= 0xE0) && (firstChar <= 0xEF))) {
-		SetFont(900);
-		return true;
+	if (languageSplitter != 0x6a23) { // #j prefix as language splitter
+		if (((firstChar >= 0x81) && (firstChar <= 0x9F)) || ((firstChar >= 0xE0) && (firstChar <= 0xEF))) {
+			SetFont(900);
+			return true;
+		}
 	}
 	return false;
 }
@@ -609,9 +611,9 @@ reg_t GfxText16::allocAndFillReferenceRectArray() {
 	return NULL_REG;
 }
 
-void GfxText16::kernelTextSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight) {
+void GfxText16::kernelTextSize(const char *text, uint16 languageSplitter, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight) {
 	Common::Rect rect(0, 0, 0, 0);
-	Size(rect, text, font, maxWidth);
+	Size(rect, text, languageSplitter, font, maxWidth);
 	*textWidth = rect.width();
 	*textHeight = rect.height();
 }
diff --git a/engines/sci/graphics/text16.h b/engines/sci/graphics/text16.h
index 715891be44..2724d97347 100644
--- a/engines/sci/graphics/text16.h
+++ b/engines/sci/graphics/text16.h
@@ -56,10 +56,15 @@ public:
 	void StringWidth(const char *str, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight);
 	void ShowString(const char *str, GuiResourceId orgFontId, int16 orgPenColor);
 	void DrawString(const char *str, GuiResourceId orgFontId, int16 orgPenColor);
-	int16 Size(Common::Rect &rect, const char *text, GuiResourceId fontId, int16 maxWidth);
+	int16 Size(Common::Rect &rect, const char *text, uint16 textLanguage, GuiResourceId fontId, int16 maxWidth);
 	void Draw(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);
 	void Show(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);
-	void Box(const char *text, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId);
+	void Box(const char *text, uint16 languageSplitter, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId);
+
+	void Box(const char *text, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId) {
+		Box(text, 0, show, rect, alignment, fontId);
+	}
+	
 	void DrawString(const char *text);
 	void DrawStatus(const char *text);
 
@@ -67,13 +72,13 @@ public:
 
 	reg_t allocAndFillReferenceRectArray();
 
-	void kernelTextSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight);
+	void kernelTextSize(const char *text, uint16 textLanguage, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight);
 	void kernelTextFonts(int argc, reg_t *argv);
 	void kernelTextColors(int argc, reg_t *argv);
 
 private:
 	void init();
-	bool SwitchToFont900OnSjis(const char *text);
+	bool SwitchToFont900OnSjis(const char *text, uint16 languageSplitter);
 
 	GfxCache *_cache;
 	GfxPorts *_ports;
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 2377386c72..4928fd1b4e 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -314,13 +314,16 @@ public:
 	 *					if NULL is passed no subtitle will be added to the returned string
 	 * @return processed string
 	 */
-	Common::String strSplit(const char *str, const char *sep = "\r----------\r");
+	Common::String strSplitLanguage(const char *str, uint16 *splitLanguage, const char *sep = "\r----------\r");
+	Common::String strSplit(const char *str, const char *sep = "\r----------\r") {
+		return strSplitLanguage(str, NULL, sep);
+	}
 
 	kLanguage getSciLanguage();
 	void setSciLanguage(kLanguage lang);
 	void setSciLanguage();
 
-	Common::String getSciLanguageString(const Common::String &str, kLanguage lang, kLanguage *lang2 = NULL) const;
+	Common::String getSciLanguageString(const Common::String &str, kLanguage lang, kLanguage *lang2 = NULL, uint16 *languageSplitter = NULL) const;
 
 	// Check if vocabulary needs to get switched (in multilingual parser games)
 	void checkVocabularySwitch();
-- 
cgit v1.2.3


From 0a2c1a809f1335f2d259fa7e3070405232687b00 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Nov 2014 19:07:03 +0100
Subject: WINTERMUTE: Keep _[show|current]Subtitle private in video_subtitler.h

---
 engines/wintermute/video/video_subtitler.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index c1730c84fd..f97461cd87 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -39,15 +39,14 @@ class VideoSubtitler :
 public:
 	VideoSubtitler(BaseGame *inGame);
 	virtual ~VideoSubtitler(void);
-
-	bool _showSubtitle;
-	uint32 _currentSubtitle;
 	bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
 	void display();
 	void update(uint32 frame);
 private:
 	Common::Array<SubtitleCard> _subtitles;
 	int32 _lastSample;
+	bool _showSubtitle;
+	uint32 _currentSubtitle;
 };
 
 } // End of namespace Wintermute
-- 
cgit v1.2.3


From 215ac157e6f694327d5de0ec46a6fc1eabbf4719 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Nov 2014 19:28:42 +0100
Subject: WINTERMUTE: Declare vars inside appropriate block in loadSubtitles

---
 engines/wintermute/video/video_subtitler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 52bae27d2d..e3127d1c5e 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -85,7 +85,6 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 	file->read(buffer, fileSize);
 
-	int start, end;
 	bool inToken;
 	char *tokenStart = 0;
 	int tokenLength = 0;
@@ -98,6 +97,8 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 	 * {StartFrame}{EndFrame} FirstLine | SecondLine \n
 	 */
 	while (pos < fileSize) {
+		int start, end;
+
 		start = end = -1;
 		inToken = false;
 		tokenPos = -1;
-- 
cgit v1.2.3


From 2f082f6e438598f9093c92482bd6f75af264d785 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Nov 2014 19:31:10 +0100
Subject: WINTERMUTE: Remove redundant explicit call to Common::String
 constructor

---
 engines/wintermute/video/video_subtitler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index e3127d1c5e..86f8f9b128 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -66,7 +66,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 	 * /some/path/movie.sub
 	 */
 	if (subtitleFile.size() != 0) {
-		newFile = Common::String(subtitleFile);
+		newFile = subtitleFile;
 	} else {
 		Common::String path = PathUtil::getDirectoryName(filename);
 		Common::String name = PathUtil::getFileNameWithoutExtension(filename);
-- 
cgit v1.2.3


From 998da18c05c159f6dffe2b25d0afe23021c8ec38 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Nov 2014 19:42:17 +0100
Subject: WINTERMUTE: Move var declarations inside loop in loadSubtitles

---
 engines/wintermute/video/video_subtitler.cpp | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 86f8f9b128..95d938574b 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -85,25 +85,20 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common:
 
 	file->read(buffer, fileSize);
 
-	bool inToken;
-	char *tokenStart = 0;
-	int tokenLength = 0;
-	int tokenPos = 0;
-
-	int pos = 0;
-	int lineLength = 0;
 	/* This is where we parse .sub files.
 	 * Subtitles cards are in the form
 	 * {StartFrame}{EndFrame} FirstLine | SecondLine \n
 	 */
-	while (pos < fileSize) {
-		int start, end;
-
-		start = end = -1;
-		inToken = false;
-		tokenPos = -1;
+	int pos = 0;
 
-		lineLength = 0;
+	while (pos < fileSize) {
+		char *tokenStart = 0;
+		int tokenLength = 0;
+		int tokenPos = -1;
+		int lineLength = 0;
+		int start = -1;
+		int end = -1;
+		bool inToken = false;
 
 		while (pos + lineLength < fileSize &&
 				buffer[pos + lineLength] != '\n' &&
-- 
cgit v1.2.3


From 9787fc5768fdc7338433fa5bcbc606f7d8ffe1d2 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Wed, 5 Nov 2014 19:45:39 +0100
Subject: WINTERMUTE: Fix formatting in video_subtitler.h

---
 engines/wintermute/video/video_subtitler.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index f97461cd87..94f22909a1 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -34,8 +34,7 @@
 
 namespace Wintermute {
 
-class VideoSubtitler :
-	public BaseClass {
+class VideoSubtitler : public BaseClass {
 public:
 	VideoSubtitler(BaseGame *inGame);
 	virtual ~VideoSubtitler(void);
-- 
cgit v1.2.3


From 0fd16ef39f503016c710e264752f41caa8daf724 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 6 Nov 2014 20:45:24 +0100
Subject: SCI: hopefully Japanese text wrapping is fine now

also removed duplicate entries in punctuation table
thanks to wjp
---
 engines/sci/graphics/text16.cpp | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index edeef31a5f..f463dff4b1 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -145,9 +145,9 @@ int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int1
 
 // Has actually punctuation and characters in it, that may not be the first in a line
 static const uint16 text16_shiftJIS_punctuation[] = {
-	0x9F82, 0xA182, 0xA382, 0xA582, 0xA782, 0xC182, 0xA782, 0xC182, 0xE182, 0xE382, 0xE582, 0xEC82,
-	0x4083, 0x4283, 0x4483, 0x4683, 0x4883, 0x6283, 0x8383, 0x8583, 0x8783, 0x8E83, 0x9583, 0x9683,
-	0x5B81, 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881, 0
+	0x9F82, 0xA182, 0xA382, 0xA582, 0xA782, 0xC182, 0xE182, 0xE382, 0xE582, 0xEC82,	0x4083, 0x4283,
+	0x4483, 0x4683, 0x4883, 0x6283, 0x8383, 0x8583, 0x8783, 0x8E83, 0x9583, 0x9683,	0x5B81, 0x4181,
+	0x4281, 0x7681, 0x7881, 0x4981, 0x4881, 0
 };
 
 // return max # of chars to fit maxwidth with full words, does not include
@@ -237,34 +237,32 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 	if (lastSpaceCharCount) {
 		// Break and at least one space was found before that
 		resultCharCount = lastSpaceCharCount;
-		
+
 		// additionally skip over all spaces, that are following that space, but don't count them for displaying purposes
 		textPtr = lastSpacePtr;
 		while (*textPtr == ' ')
 			textPtr++;
-		
+
 	} else {
 		// Break without spaces found, we split the very first word - may also be Kanji/Japanese
 		if (curChar > 0xFF) {
 			// current charracter is Japanese
-			
+
 			// PC-9801 SCI actually added the last character, which shouldn't fit anymore, still onto the
 			//  screen in case maxWidth wasn't fully reached with the last character
-			if (maxWidth == curWidth) {
-				curCharCount -= 2; textPtr -= 2;
-				if (textPtr < textStartPtr)
-					error("Seeking back went too far, data corruption?");
+			if (( maxWidth - 1 ) > curWidth) {
+				curCharCount += 2; textPtr += 2;
 
 				curChar = (*(const byte *)textPtr);
-				if (!_font->isDoubleByte(curChar))
-					error("Non double byte while seeking back");
-				curChar |= (*(const byte *)(textPtr + 1)) << 8;
+				if (_font->isDoubleByte(curChar)) {
+					curChar |= (*(const byte *)(textPtr + 1)) << 8;
+				}
 			}
-			
+
 			// But it also checked, if the current character is not inside a punctuation table and it even
 			//  went backwards in case it found multiple ones inside that table.
 			uint nonBreakingPos = 0;
-			
+
 			while (1) {
 				// Look up if character shouldn't be the first on a new line
 				nonBreakingPos = 0;
@@ -281,14 +279,12 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 				curCharCount -= 2; textPtr -= 2;
 				if (textPtr < textStartPtr)
 					error("Seeking back went too far, data corruption?");
-				
+
 				curChar = (*(const byte *)textPtr);
 				if (!_font->isDoubleByte(curChar))
 					error("Non double byte while seeking back");
 				curChar |= (*(const byte *)(textPtr + 1)) << 8;
 			}
-			// include the current character
-			curCharCount += 2; textPtr += 2;
 		}
 
 		// We split the word in that case
-- 
cgit v1.2.3


From 3131e3aa5a3a4911c12223af06ad0d2885f64606 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 7 Nov 2014 10:21:24 +0600
Subject: ZVISION: Add missing methods definition

---
 engines/zvision/zvision.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 8a305f5d37..0bee639458 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -180,6 +180,9 @@ public:
 	void setRenderDelay(uint);
 	bool canRender();
 
+	void loadSettings();
+	void saveSettings();
+
 private:
 	void initialize();
 	void initFonts();
@@ -191,6 +194,8 @@ private:
 
 	void onMouseMove(const Common::Point &pos);
 	void updateRotation();
+
+	void registerDefaultSettings();
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 7151240345cc723c0084a4ea5dda9aaaa4dff690 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 7 Nov 2014 10:23:29 +0600
Subject: ZVISION: Now setBackgroundPosition must care about statekey value

---
 engines/zvision/graphics/render_manager.cpp | 3 +++
 engines/zvision/zvision.cpp                 | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index ce1962a8ee..4d5bcf754b 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -24,6 +24,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
 #include "zvision/text/text.h"
 
 #include "zvision/utility/lzss_read_stream.h"
@@ -384,6 +385,8 @@ void RenderManager::setBackgroundPosition(int offset) {
 		if (_bkgOff != offset)
 			_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
 	_bkgOff = offset;
+
+	_engine->getScriptManager()->setStateValue(StateKey_ViewPos, offset);
 }
 
 uint32 RenderManager::getCurrentBackgroundOffset() {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 77c47d9b1e..41d3eea6aa 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -383,7 +383,6 @@ void ZVision::updateRotation() {
 			if (new_pos < 0)
 				new_pos += scr_width;
 
-			_scriptManager->setStateValue(StateKey_ViewPos, new_pos);
 			_renderManager->setBackgroundPosition(new_pos);
 		} else if (renderState == RenderTable::TILT) {
 			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
@@ -398,7 +397,6 @@ void ZVision::updateRotation() {
 			if (new_pos <= tilt_gap)
 				new_pos = tilt_gap;
 
-			_scriptManager->setStateValue(StateKey_ViewPos, new_pos);
 			_renderManager->setBackgroundPosition(new_pos);
 		}
 	}
-- 
cgit v1.2.3


From 0efa1bc5606c9fd984df077d55cf93a7903f5f67 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 7 Nov 2014 10:25:11 +0600
Subject: ZVISION: Implement action:rotate_to

---
 engines/zvision/scripting/actions.cpp           | 15 +++++++
 engines/zvision/scripting/actions.h             | 10 +++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 engines/zvision/zvision.cpp                     | 52 +++++++++++++++++++++++++
 engines/zvision/zvision.h                       |  2 +
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 9733c5cae8..2754a39676 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -612,6 +612,21 @@ bool ActionRandom::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionRotateTo
+//////////////////////////////////////////////////////////////////////////////
+
+ActionRotateTo::ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%d, %d", &_toPos, &_time);
+}
+
+bool ActionRotateTo::execute() {
+	_engine->rotateTo(_toPos, _time);
+
+	return true;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionSetPartialScreen
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index f51847ed05..6a200198b7 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -360,6 +360,16 @@ private:
 	ValueSlot *_max;
 };
 
+class ActionRotateTo : public ResultAction {
+public:
+	ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	int32 _toPos;
+	int32 _time;
+};
+
 class ActionSetPartialScreen : public ResultAction {
 public:
 	ActionSetPartialScreen(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index df60b0b8d4..b16a2d9474 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -270,7 +270,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("restore_game", true)) {
 					// TODO: Implement ActionRestoreGame
 				} else if (act.matchString("rotate_to", true)) {
-					// TODO: Implement ActionRotateTo
+					actionList.push_back(new ActionRotateTo(_engine, slot, args));
 				} else if (act.matchString("save_game", true)) {
 					// TODO: Implement ActionSaveGame
 				} else if (act.matchString("set_partial_screen", true)) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 41d3eea6aa..79f7d74a8d 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -402,4 +402,56 @@ void ZVision::updateRotation() {
 	}
 }
 
+void ZVision::rotateTo(int16 _toPos, int16 _time) {
+	if (_renderManager->getRenderTable()->getRenderState() != RenderTable::PANORAMA)
+		return;
+
+	if (_time == 0)
+		_time = 1;
+
+	int32 maxX = _renderManager->getBkgSize().x;
+	int32 curX = _renderManager->getCurrentBackgroundOffset();
+	int32 dx = 0;
+
+	if (curX == _toPos)
+		return;
+
+	if (curX > _toPos) {
+		if (curX - _toPos > maxX / 2)
+			dx = (_toPos + (maxX - curX)) / _time;
+		else
+			dx = -(curX - _toPos) / _time;
+	} else {
+		if (_toPos - curX > maxX / 2)
+			dx = -((maxX - _toPos) + curX) / _time;
+		else
+			dx = (_toPos - curX) / _time;
+	}
+
+	_clock.stop();
+
+	for (int16 i = 0; i <= _time; i++) {
+		if (i == _time)
+			curX = _toPos;
+		else
+			curX += dx;
+
+		if (curX < 0)
+			curX = maxX - curX;
+		else if (curX >= maxX)
+			curX %= maxX;
+
+		_renderManager->setBackgroundPosition(curX);
+
+		_renderManager->prepareBkg();
+		_renderManager->renderBackbufferToScreen();
+
+		_system->updateScreen();
+
+		_system->delayMillis(500 / _time);
+	}
+
+	_clock.start();
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 0bee639458..e2bde7bd9e 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -170,6 +170,8 @@ public:
 	 */
 	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true, Subtitle *sub = NULL);
 
+	void rotateTo(int16 to, int16 time);
+
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
-- 
cgit v1.2.3


From 9f2c3d794e4594fd736b6130412c1685ea21afc9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 7 Nov 2014 12:09:13 +0200
Subject: GROOVIE: Do not play audio in V2 games when only one frame is shown

---
 engines/groovie/roq.cpp | 18 ++++++++++++------
 engines/groovie/roq.h   |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 8f272d4404..f14cacd6b8 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -174,7 +174,7 @@ bool ROQPlayer::playFrameInternal() {
 
 	// Wait until the current frame can be shown
 	// Don't wait if we're just showing one frame
-	if (!(_alpha && !_flagTwo))
+	if (!playFirstFrame())
 		waitFrame();
 
 	if (_dirty) {
@@ -193,7 +193,7 @@ bool ROQPlayer::playFrameInternal() {
 
 	// Report the end of the video if we reached the end of the file or if we
 	// just wanted to play one frame.
-	return _file->eos() || (_alpha && !_flagTwo);
+	return _file->eos() || playFirstFrame();
 }
 
 bool ROQPlayer::readBlockHeader(ROQBlockHeader &blockHeader) {
@@ -492,7 +492,7 @@ bool ROQPlayer::processBlockSoundMono(ROQBlockHeader &blockHeader) {
 	}
 
 	// Initialize the audio stream if needed
-	if (!_audioStream) {
+	if (!_audioStream && !playFirstFrame()) {
 		_audioStream = Audio::makeQueuingAudioStream(22050, false);
 		Audio::SoundHandle sound_handle;
 		g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
@@ -521,7 +521,10 @@ bool ROQPlayer::processBlockSoundMono(ROQBlockHeader &blockHeader) {
 #ifdef SCUMM_LITTLE_ENDIAN
 	flags |= Audio::FLAG_LITTLE_ENDIAN;
 #endif
-	_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2, DisposeAfterUse::YES, flags);
+	if (!playFirstFrame())
+		_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2, DisposeAfterUse::YES, flags);
+	else
+		free(buffer);
 
 	return true;
 }
@@ -535,7 +538,7 @@ bool ROQPlayer::processBlockSoundStereo(ROQBlockHeader &blockHeader) {
 	}
 
 	// Initialize the audio stream if needed
-	if (!_audioStream) {
+	if (!_audioStream && !playFirstFrame()) {
 		_audioStream = Audio::makeQueuingAudioStream(22050, true);
 		Audio::SoundHandle sound_handle;
 		g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
@@ -577,7 +580,10 @@ bool ROQPlayer::processBlockSoundStereo(ROQBlockHeader &blockHeader) {
 #ifdef SCUMM_LITTLE_ENDIAN
 	flags |= Audio::FLAG_LITTLE_ENDIAN;
 #endif
-	_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2, DisposeAfterUse::YES, flags);
+	if (!playFirstFrame())
+		_audioStream->queueBuffer((byte *)buffer, blockHeader.size * 2, DisposeAfterUse::YES, flags);
+	else
+		free(buffer);
 
 	return true;
 }
diff --git a/engines/groovie/roq.h b/engines/groovie/roq.h
index b720e6a235..ce1a3a2d58 100644
--- a/engines/groovie/roq.h
+++ b/engines/groovie/roq.h
@@ -57,6 +57,7 @@ private:
 	bool processBlockSoundMono(ROQBlockHeader &blockHeader);
 	bool processBlockSoundStereo(ROQBlockHeader &blockHeader);
 	bool processBlockAudioContainer(ROQBlockHeader &blockHeader);
+	bool playFirstFrame() { return _alpha && !_flagTwo; }
 
 	void paint2(byte i, int destx, int desty);
 	void paint4(byte i, int destx, int desty);
-- 
cgit v1.2.3


From 53002dd2d067c24baaecfbc32071365bef58cfca Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 12:21:38 +0600
Subject: ZVISION: Implement action:animunload

---
 engines/zvision/scripting/actions.cpp           | 19 +++++++++++++++++++
 engines/zvision/scripting/actions.h             |  2 ++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 2754a39676..8a3d17f2c5 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -440,6 +440,25 @@ bool ActionPreloadAnimation::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionUnloadAnimation
+//////////////////////////////////////////////////////////////////////////////
+
+ActionUnloadAnimation::ActionUnloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+
+	sscanf(line.c_str(), "%u", &_key);
+}
+
+bool ActionUnloadAnimation::execute() {
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_key);
+
+	if (nod && nod->getType() == SideFX::SIDEFX_ANIM)
+		_engine->getScriptManager()->deleteSideFx(_key);
+
+	return true;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionPlayAnimation
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 6a200198b7..731105d591 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -347,6 +347,8 @@ class ActionUnloadAnimation : public ResultAction {
 public:
 	ActionUnloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
+private:
+	uint32 _key;
 };
 
 class ActionRandom : public ResultAction {
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index b16a2d9474..a2b5311666 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -220,7 +220,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("animpreload", true)) {
 					actionList.push_back(new ActionPreloadAnimation(_engine, slot, args));
 				} else if (act.matchString("animunload", true)) {
-					//actionList.push_back(new ActionUnloadAnimation(_engine, slot, args));
+					actionList.push_back(new ActionUnloadAnimation(_engine, slot, args));
 				} else if (act.matchString("attenuate", true)) {
 					actionList.push_back(new ActionAttenuate(_engine, slot, args));
 				} else if (act.matchString("assign", true)) {
-- 
cgit v1.2.3


From d0f6b61d7d86598c71c7ff8679f610bbd1341aaa Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 12:26:04 +0600
Subject: ZVISION: Implement action:delay_render

---
 engines/zvision/scripting/actions.cpp           | 13 +++++++++++++
 engines/zvision/scripting/actions.h             |  3 +--
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 8a3d17f2c5..3763eb6e30 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -160,6 +160,19 @@ bool ActionCrossfade::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionDelayRender
+//////////////////////////////////////////////////////////////////////////////
+
+ActionDelayRender::ActionDelayRender(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%u", &_framesToDelay);
+}
+
+bool ActionDelayRender::execute() {
+	_engine->setRenderDelay(_framesToDelay);
+	return true;
+}
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionDisableControl
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 731105d591..ade57ba14c 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -162,8 +162,7 @@ public:
 	bool execute();
 
 private:
-	// TODO: Check if this should actually be frames or if it should be milliseconds/seconds
-	uint32 framesToDelay;
+	uint32 _framesToDelay;
 };
 
 class ActionDisableControl : public ResultAction {
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index a2b5311666..68840aa413 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -232,7 +232,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("debug", true)) {
 					// TODO: Implement ActionDebug
 				} else if (act.matchString("delay_render", true)) {
-					// TODO: Implement ActionDelayRender
+					actionList.push_back(new ActionDelayRender(_engine, slot, args));
 				} else if (act.matchString("disable_control", true)) {
 					actionList.push_back(new ActionDisableControl(_engine, slot, args));
 				} else if (act.matchString("disable_venus", true)) {
-- 
cgit v1.2.3


From 7ddfcfd17ec1e367896c223d5b8dc59b44d4029e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 12:44:00 +0600
Subject: ZVISION: Implement action:disable_venus and action:set_venus

---
 engines/zvision/scripting/actions.cpp           | 32 +++++++++++++++++++++++++
 engines/zvision/scripting/actions.h             | 10 ++++++++
 engines/zvision/scripting/scr_file_handling.cpp |  4 ++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 3763eb6e30..33add9f8fa 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -188,6 +188,21 @@ bool ActionDisableControl::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionDisableVenus
+//////////////////////////////////////////////////////////////////////////////
+
+ActionDisableVenus::ActionDisableVenus(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%d", &_key);
+}
+
+bool ActionDisableVenus::execute() {
+	_engine->getScriptManager()->setStateValue(_key, 0);
+
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionDisplayMessage
 //////////////////////////////////////////////////////////////////////////////
@@ -715,6 +730,23 @@ bool ActionSetScreen::execute() {
 	return true;
 }
 
+
+//////////////////////////////////////////////////////////////////////////////
+// ActionSetVenus
+//////////////////////////////////////////////////////////////////////////////
+
+ActionSetVenus::ActionSetVenus(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%d", &_key);
+}
+
+bool ActionSetVenus::execute() {
+	if (_engine->getScriptManager()->getStateValue(_key))
+		_engine->getScriptManager()->setStateValue(StateKey_Venus, _key);
+
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionStop
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index ade57ba14c..b80af9a6c5 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -180,6 +180,7 @@ public:
 	bool execute();
 
 private:
+	int32 _key;
 };
 
 class ActionDisplayMessage : public ResultAction {
@@ -392,6 +393,15 @@ private:
 	Common::String _fileName;
 };
 
+class ActionSetVenus : public ResultAction {
+public:
+	ActionSetVenus(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	int32 _key;
+};
+
 class ActionStop : public ResultAction {
 public:
 	ActionStop(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 68840aa413..c7268e6111 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -236,7 +236,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("disable_control", true)) {
 					actionList.push_back(new ActionDisableControl(_engine, slot, args));
 				} else if (act.matchString("disable_venus", true)) {
-					// TODO: Implement ActionDisableVenus
+					actionList.push_back(new ActionDisableVenus(_engine, slot, args));
 				} else if (act.matchString("display_message", true)) {
 					actionList.push_back(new ActionDisplayMessage(_engine, slot, args));
 				} else if (act.matchString("dissolve", true)) {
@@ -278,7 +278,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("set_screen", true)) {
 					actionList.push_back(new ActionSetScreen(_engine, slot, args));
 				} else if (act.matchString("set_venus", true)) {
-					// TODO: Implement ActionSetVenus
+					actionList.push_back(new ActionSetVenus(_engine, slot, args));
 				} else if (act.matchString("stop", true)) {
 					actionList.push_back(new ActionStop(_engine, slot, args));
 				} else if (act.matchString("streamvideo", true)) {
-- 
cgit v1.2.3


From b8ef942f692d7354fed3fd889994c499db714ba7 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 12:58:11 +0600
Subject: ZVISION: Implement action:dissolve

---
 engines/zvision/graphics/render_manager.cpp     |  5 +++++
 engines/zvision/graphics/render_manager.h       |  2 ++
 engines/zvision/scripting/actions.cpp           | 14 ++++++++++++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 4d5bcf754b..8411f190a7 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -1053,4 +1053,9 @@ void RenderManager::markDirty() {
 	_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
 }
 
+void RenderManager::bkgFill(uint8 r, uint8 g, uint8 b) {
+	_curBkg.fillRect(Common::Rect(_curBkg.w, _curBkg.h), _curBkg.format.RGBToColor(r, g, b));
+	markDirty();
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index e0fc5c248c..ae24ce4f58 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -283,6 +283,8 @@ public:
 	Common::Rect bkgRectToScreen(const Common::Rect &src);
 
 	void markDirty();
+
+	void bkgFill(uint8 r, uint8 g, uint8 b);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 33add9f8fa..96411e2c3d 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -221,6 +221,20 @@ bool ActionDisplayMessage::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionDissolve
+//////////////////////////////////////////////////////////////////////////////
+
+ActionDissolve::ActionDissolve(ZVision *engine) :
+	ResultAction(engine, 0) {
+}
+
+bool ActionDissolve::execute() {
+	// Cause black screen flick
+	// _engine->getRenderManager()->bkgFill(0, 0, 0);
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionDistort
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index c7268e6111..daec4f8f18 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -240,7 +240,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("display_message", true)) {
 					actionList.push_back(new ActionDisplayMessage(_engine, slot, args));
 				} else if (act.matchString("dissolve", true)) {
-					// TODO: Implement ActionDissolve
+					actionList.push_back(new ActionDissolve(_engine));
 				} else if (act.matchString("distort", true)) {
 					actionList.push_back(new ActionDistort(_engine, slot, args));
 				} else if (act.matchString("enable_control", true)) {
-- 
cgit v1.2.3


From 66d2cb46989537d80855952cff2c0be1b5d6c320 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 12:59:58 +0600
Subject: ZVISION: Implement action:flush_mouse_events

---
 engines/zvision/scripting/actions.cpp           | 14 ++++++++++++++
 engines/zvision/scripting/actions.h             |  6 ++++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 engines/zvision/scripting/script_manager.cpp    | 11 +++++++++++
 engines/zvision/scripting/script_manager.h      |  1 +
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 96411e2c3d..42b71ea5cc 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -271,6 +271,20 @@ bool ActionEnableControl::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionFlushMouseEvents
+//////////////////////////////////////////////////////////////////////////////
+
+ActionFlushMouseEvents::ActionFlushMouseEvents(ZVision *engine, int32 slotkey) :
+	ResultAction(engine, slotkey) {
+}
+
+bool ActionFlushMouseEvents::execute() {
+	_engine->getScriptManager()->flushEvent(Common::EVENT_LBUTTONUP);
+	_engine->getScriptManager()->flushEvent(Common::EVENT_LBUTTONDOWN);
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionInventory
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index b80af9a6c5..c03238571c 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -223,6 +223,12 @@ private:
 	uint32 _key;
 };
 
+class ActionFlushMouseEvents : public ResultAction {
+public:
+	ActionFlushMouseEvents(ZVision *engine, int32 slotkey);
+	bool execute();
+};
+
 class ActionInventory : public ResultAction {
 public:
 	ActionInventory(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index daec4f8f18..a4d127f6f9 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -246,7 +246,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("enable_control", true)) {
 					actionList.push_back(new ActionEnableControl(_engine, slot, args));
 				} else if (act.matchString("flush_mouse_events", true)) {
-					// TODO: Implement ActionFlushMouseEvents
+					actionList.push_back(new ActionFlushMouseEvents(_engine, slot));
 				} else if (act.matchString("inventory", true)) {
 					actionList.push_back(new ActionInventory(_engine, slot, args));
 				} else if (act.matchString("kill", true)) {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index d2165734b4..28958dd972 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -775,6 +775,17 @@ void ScriptManager::addEvent(Common::Event event) {
 	_controlEvents.push_back(event);
 }
 
+void ScriptManager::flushEvent(Common::EventType type) {
+	EventList::iterator it = _controlEvents.begin();
+	while (it != _controlEvents.end()) {
+
+		if ((*it).type == type)
+			it = _controlEvents.erase(it);
+		else
+			it++;
+	}
+}
+
 ValueSlot::ValueSlot(ScriptManager *sc_man, const char *slot_val):
 	_sc_man(sc_man) {
 	value = 0;
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 3fcbad5fa4..fb17077aa6 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -200,6 +200,7 @@ public:
 	void killSideFxType(SideFX::SideFXType type);
 
 	void addEvent(Common::Event);
+	void flushEvent(Common::EventType type);
 
 	/**
 	 * Called when LeftMouse is pushed.
-- 
cgit v1.2.3


From 44eeb4027250a2989a9e34a303383fa8533a7a84 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 13:02:48 +0600
Subject: ZVISION: Implement action:menu_bar_enable

---
 engines/zvision/core/menu.h                     |  4 ++++
 engines/zvision/scripting/actions.cpp           | 13 +++++++++++++
 engines/zvision/scripting/actions.h             |  8 ++++++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 engines/zvision/zvision.cpp                     |  5 +++++
 engines/zvision/zvision.h                       |  2 ++
 6 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
index cc802ee5f5..7e6acf325c 100644
--- a/engines/zvision/core/menu.h
+++ b/engines/zvision/core/menu.h
@@ -48,6 +48,10 @@ public:
 	virtual void onMouseDown(const Common::Point &Pos) {};
 	virtual void onMouseUp(const Common::Point &Pos) {};
 	virtual void process(uint32 deltaTimeInMillis) {};
+
+	void setEnable(uint16 flags) {
+		menu_bar_flag = flags;
+	}
 protected:
 	uint16 menu_bar_flag;
 	ZVision *_engine;
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 42b71ea5cc..fbf887f779 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -374,6 +374,19 @@ bool ActionKill::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionMenuBarEnable
+//////////////////////////////////////////////////////////////////////////////
+
+ActionMenuBarEnable::ActionMenuBarEnable(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	sscanf(line.c_str(), "%hu", &_menus);
+}
+
+bool ActionMenuBarEnable::execute() {
+	_engine->menuBarEnable(_menus);
+	return true;
+}
 
 //////////////////////////////////////////////////////////////////////////////
 // ActionMusic
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index c03238571c..fed620926d 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -248,6 +248,14 @@ private:
 	uint32 _type;
 };
 
+class ActionMenuBarEnable : public ResultAction {
+public:
+	ActionMenuBarEnable(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+private:
+	uint16 _menus;
+};
+
 class ActionMusic : public ResultAction {
 public:
 	ActionMusic(ZVision *engine, int32 slotkey, const Common::String &line, bool global);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index a4d127f6f9..ca92890b19 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -252,7 +252,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("kill", true)) {
 					actionList.push_back(new ActionKill(_engine, slot, args));
 				} else if (act.matchString("menu_bar_enable", true)) {
-					// TODO: Implement ActionMenuBarEnable
+					actionList.push_back(new ActionMenuBarEnable(_engine, slot, args));
 				} else if (act.matchString("music", true)) {
 					actionList.push_back(new ActionMusic(_engine, slot, args, false));
 				} else if (act.matchString("pan_track", true)) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 79f7d74a8d..4f05edaefd 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -454,4 +454,9 @@ void ZVision::rotateTo(int16 _toPos, int16 _time) {
 	_clock.start();
 }
 
+void ZVision::menuBarEnable(uint16 menus) {
+	if (_menu)
+		_menu->setEnable(menus);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index e2bde7bd9e..def9bbbdfb 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -185,6 +185,8 @@ public:
 	void loadSettings();
 	void saveSettings();
 
+	void menuBarEnable(uint16 menus);
+
 private:
 	void initialize();
 	void initFonts();
-- 
cgit v1.2.3


From 19e2251a7562defc560a25dd4655ededad4d5369 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 13:04:27 +0600
Subject: ZVISION: Implement action:preferences

---
 engines/zvision/scripting/actions.cpp           | 21 +++++++++++++++++++++
 engines/zvision/scripting/actions.h             |  9 +++++++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index fbf887f779..1e1b3b2862 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -473,6 +473,27 @@ bool ActionPanTrack::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionPreferences
+//////////////////////////////////////////////////////////////////////////////
+
+ActionPreferences::ActionPreferences(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	if (line.compareToIgnoreCase("save") == 0)
+		_save = true;
+	else
+		_save = false;
+}
+
+bool ActionPreferences::execute() {
+	if (_save)
+		_engine->saveSettings();
+	else
+		_engine->loadSettings();
+
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionPreloadAnimation
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index fed620926d..dd771c1078 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -334,6 +334,15 @@ private:
 	int32 _framerate;
 };
 
+class ActionPreferences : public ResultAction {
+public:
+	ActionPreferences(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	bool _save;
+};
+
 class ActionQuit : public ResultAction {
 public:
 	ActionQuit(ZVision *engine, int32 slotkey) : ResultAction(engine, slotkey) {}
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index ca92890b19..06354feaae 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -260,7 +260,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("playpreload", true)) {
 					actionList.push_back(new ActionPlayPreloadAnimation(_engine, slot, args));
 				} else if (act.matchString("preferences", true)) {
-					// TODO: Implement ActionPreferences
+					actionList.push_back(new ActionPreferences(_engine, slot, args));
 				} else if (act.matchString("quit", true)) {
 					actionList.push_back(new ActionQuit(_engine, slot));
 				} else if (act.matchString("random", true)) {
-- 
cgit v1.2.3


From ea8cc34a66f7b8a853d396daaade9de25efb431f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 13:06:48 +0600
Subject: ZVISION: Implement action:restore_game

---
 engines/zvision/scripting/actions.cpp           | 17 +++++++++++
 engines/zvision/scripting/actions.h             |  9 ++++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 +-
 engines/zvision/scripting/script_manager.cpp    | 40 +++++++++++++------------
 engines/zvision/scripting/script_manager.h      |  4 +--
 5 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 1e1b3b2862..04f318b84e 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -42,6 +42,7 @@
 #include "zvision/graphics/effects/fog.h"
 #include "zvision/graphics/effects/light.h"
 #include "zvision/graphics/effects/wave.h"
+#include "zvision/core/save_manager.h"
 
 #include "common/file.h"
 
@@ -721,6 +722,22 @@ bool ActionRandom::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionRestoreGame
+//////////////////////////////////////////////////////////////////////////////
+
+ActionRestoreGame::ActionRestoreGame(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	char buf[128];
+	sscanf(line.c_str(), "%s", buf);
+	_fileName = Common::String(buf);
+}
+
+bool ActionRestoreGame::execute() {
+	_engine->getSaveManager()->loadGame(_fileName);
+	return false;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionRotateTo
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index dd771c1078..a6b5aa1290 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -385,6 +385,15 @@ private:
 	ValueSlot *_max;
 };
 
+class ActionRestoreGame : public ResultAction {
+public:
+	ActionRestoreGame(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	Common::String _fileName;
+};
+
 class ActionRotateTo : public ResultAction {
 public:
 	ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 06354feaae..d5f5704f2a 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -268,7 +268,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("region", true)) {
 					actionList.push_back(new ActionRegion(_engine, slot, args));
 				} else if (act.matchString("restore_game", true)) {
-					// TODO: Implement ActionRestoreGame
+					actionList.push_back(new ActionRestoreGame(_engine, slot, args));
 				} else if (act.matchString("rotate_to", true)) {
 					actionList.push_back(new ActionRotateTo(_engine, slot, args));
 				} else if (act.matchString("save_game", true)) {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 28958dd972..457b491042 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -79,14 +79,18 @@ void ScriptManager::update(uint deltaTimeMillis) {
 		do_changeLocation();
 
 	updateNodes(deltaTimeMillis);
-	execScope(nodeview);
-	execScope(room);
-	execScope(world);
-	execScope(universe);
+	if (! execScope(nodeview))
+		return;
+	if (! execScope(room))
+		return;
+	if (! execScope(world))
+		return;
+	if (! execScope(universe))
+		return;
 	updateControls(deltaTimeMillis);
 }
 
-void ScriptManager::execScope(script_scope &scope) {
+bool ScriptManager::execScope(script_scope &scope) {
 	// Swap queues
 	PuzzleList *tmp = scope.exec_queue;
 	scope.exec_queue = scope.scope_queue;
@@ -98,15 +102,18 @@ void ScriptManager::execScope(script_scope &scope) {
 
 	if (scope.proc_count < 2 || getStateValue(StateKey_ExecScopeStyle)) {
 		for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
-			checkPuzzleCriteria(*PuzzleIter, scope.proc_count);
+			if (!checkPuzzleCriteria(*PuzzleIter, scope.proc_count))
+				return false;
 	} else {
 		for (PuzzleList::iterator PuzzleIter = scope.exec_queue->begin(); PuzzleIter != scope.exec_queue->end(); ++PuzzleIter)
-			checkPuzzleCriteria(*PuzzleIter, scope.proc_count);
+			if (!checkPuzzleCriteria(*PuzzleIter, scope.proc_count))
+				return false;
 	}
 
 	if (scope.proc_count < 2) {
 		scope.proc_count++;
 	}
+	return true;
 }
 
 void ScriptManager::referenceTableAddPuzzle(uint32 key, puzzle_ref ref) {
@@ -185,16 +192,16 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 			break;
 }
 
-void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
+bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 	// Check if the puzzle is already finished
 	// Also check that the puzzle isn't disabled
 	if (getStateValue(puzzle->key) == 1 || (getStateFlag(puzzle->key) & Puzzle::DISABLED) == Puzzle::DISABLED) {
-		return;
+		return true;
 	}
 
 	// Check each Criteria
 	if (counter == 0 && (getStateFlag(puzzle->key) & Puzzle::DO_ME_NOW) == 0)
-		return;
+		return true;
 
 	bool criteriaMet = false;
 	for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = puzzle->criteriaList.begin(); criteriaIter != puzzle->criteriaList.end(); ++criteriaIter) {
@@ -243,18 +250,13 @@ void ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 		// Set the puzzle as completed
 		setStateValue(puzzle->key, 1);
 
-		bool shouldContinue = true;
 		for (Common::List<ResultAction *>::iterator resultIter = puzzle->resultActions.begin(); resultIter != puzzle->resultActions.end(); ++resultIter) {
-			shouldContinue = shouldContinue && (*resultIter)->execute();
-			if (!shouldContinue) {
-				break;
-			}
-		}
-
-		if (!shouldContinue) {
-			return;
+			if (!(*resultIter)->execute())
+				return false;
 		}
 	}
+
+	return true;
 }
 
 void ScriptManager::cleanStateTable() {
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index fb17077aa6..ddb8c885aa 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -253,10 +253,10 @@ private:
 	void addPuzzlesToReferenceTable(script_scope &scope);
 	void updateNodes(uint deltaTimeMillis);
 	void updateControls(uint deltaTimeMillis);
-	void checkPuzzleCriteria(Puzzle *puzzle, uint counter);
+	bool checkPuzzleCriteria(Puzzle *puzzle, uint counter);
 	void cleanStateTable();
 	void cleanScriptScope(script_scope &scope);
-	void execScope(script_scope &scope);
+	bool execScope(script_scope &scope);
 
 	/** Perform change location */
 	void do_changeLocation();
-- 
cgit v1.2.3


From be5860b93af1d17d31e9430fc096ef02683324ee Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Sat, 8 Nov 2014 13:08:40 +0600
Subject: ZVISION: Change comments of not implemented actions

---
 engines/zvision/scripting/scr_file_handling.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index d5f5704f2a..de092183c6 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -230,7 +230,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("crossfade", true)) {
 					actionList.push_back(new ActionCrossfade(_engine, slot, args));
 				} else if (act.matchString("debug", true)) {
-					// TODO: Implement ActionDebug
+					// Not used. Purposely left empty
 				} else if (act.matchString("delay_render", true)) {
 					actionList.push_back(new ActionDelayRender(_engine, slot, args));
 				} else if (act.matchString("disable_control", true)) {
@@ -272,7 +272,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("rotate_to", true)) {
 					actionList.push_back(new ActionRotateTo(_engine, slot, args));
 				} else if (act.matchString("save_game", true)) {
-					// TODO: Implement ActionSaveGame
+					// Not used. Purposely left empty
 				} else if (act.matchString("set_partial_screen", true)) {
 					actionList.push_back(new ActionSetPartialScreen(_engine, slot, args));
 				} else if (act.matchString("set_screen", true)) {
-- 
cgit v1.2.3


From ccb051f0e37481161a8546f74e6e96e2013de9e9 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 8 Nov 2014 19:41:26 +0100
Subject: PRINCE: Implement pauseEngineIntern() - pause and resume music in GMM

---
 engines/prince/prince.cpp | 10 ++++++++++
 engines/prince/prince.h   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 00e1736c46..43ff218e1d 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -427,6 +427,16 @@ Common::Error PrinceEngine::run() {
 	return Common::kNoError;
 }
 
+void PrinceEngine::pauseEngineIntern(bool pause) {
+	Engine::pauseEngineIntern(pause);
+	if (pause) {
+		_midiPlayer->pause();
+	}
+	else {
+		_midiPlayer->resume();
+	}
+}
+
 bool AnimListItem::loadFromStream(Common::SeekableReadStream &stream) {
 	int32 pos = stream.pos();
 
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 48491c63bd..15887b2de8 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -256,6 +256,7 @@ public:
 	virtual ~PrinceEngine();
 
 	virtual bool hasFeature(EngineFeature f) const;
+	virtual void pauseEngineIntern(bool pause);
 	virtual bool canSaveGameStateCurrently();
 	virtual bool canLoadGameStateCurrently();
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
-- 
cgit v1.2.3


From 56af32f2ad06ea61f1a7c6662325e36d176f2c35 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 8 Nov 2014 20:14:33 +0100
Subject: PRINCE: Reduce pause() and pause2() to one function and rename it to
 pausePrinceEngine()

---
 engines/prince/prince.cpp | 33 +++++++++++++--------------------
 engines/prince/prince.h   |  3 +--
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 43ff218e1d..ad682c415e 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1983,7 +1983,7 @@ void PrinceEngine::blackPalette() {
 			free(blackPalette1);
 			return;
 		}
-		pause();
+		pausePrinceEngine();
 	}
 	free(paletteBackup);
 	free(blackPalette1);
@@ -2010,22 +2010,15 @@ void PrinceEngine::setPalette(const byte *palette) {
 				free(blackPalette_);
 				return;
 			}
-			pause();
+			pausePrinceEngine();
 		}
 		_graph->setPalette(palette);
 		free(blackPalette_);
 	}
 }
 
-void PrinceEngine::pause() {
-	int delay = 1000 / kFPS - int32(_system->getMillis() - _currentTime);
-	delay = delay < 0 ? 0 : delay;
-	_system->delayMillis(delay);
-	_currentTime = _system->getMillis();
-}
-
-void PrinceEngine::pause2() {
-	int delay = 1000 / (kFPS * 2) - int32(_system->getMillis() - _currentTime);
+void PrinceEngine::pausePrinceEngine(int fps) {
+	int delay = 1000 / fps - int32(_system->getMillis() - _currentTime);
 	delay = delay < 0 ? 0 : delay;
 	_system->delayMillis(delay);
 	_currentTime = _system->getMillis();
@@ -2138,7 +2131,7 @@ void PrinceEngine::addInvObj() {
 			if (shouldQuit()) {
 				return;
 			}
-			pause();
+			pausePrinceEngine();
 		}
 		while (_mst_shadow2 > 256) {
 			rememberScreenInv();
@@ -2152,7 +2145,7 @@ void PrinceEngine::addInvObj() {
 			if (shouldQuit()) {
 				return;
 			}
-			pause();
+			pausePrinceEngine();
 		}
 	} else {
 		//CURSEBLINK:
@@ -2170,7 +2163,7 @@ void PrinceEngine::addInvObj() {
 				if (shouldQuit()) {
 					return;
 				}
-				pause();
+				pausePrinceEngine();
 			}
 			while (_mst_shadow2 > 256) {
 				rememberScreenInv();
@@ -2184,7 +2177,7 @@ void PrinceEngine::addInvObj() {
 				if (shouldQuit()) {
 					return;
 				}
-				pause();
+				pausePrinceEngine();
 			}
 		}
 	}
@@ -2200,7 +2193,7 @@ void PrinceEngine::addInvObj() {
 		if (shouldQuit()) {
 			return;
 		}
-		pause();
+		pausePrinceEngine();
 	}
 }
 
@@ -2828,7 +2821,7 @@ void PrinceEngine::displayInventory() {
 
 		getDebugger()->onFrame();
 		_graph->update(_graph->_screenForInventory);
-		pause();
+		pausePrinceEngine();
 	}
 
 	if (_currentPointerNumber == 2) {
@@ -2953,7 +2946,7 @@ void PrinceEngine::dialogRun() {
 
 		getDebugger()->onFrame();
 		_graph->update(_graph->_frontScreen);
-		pause();
+		pausePrinceEngine();
 	}
 	_dialogImage->free();
 	delete _dialogImage;
@@ -3212,7 +3205,7 @@ void PrinceEngine::scrollCredits() {
 			}
 			_graph->change();
 			_graph->update(_graph->_frontScreen);
-			pause2();
+			pausePrinceEngine(kFPS * 2);
 		}
 		char letter2;
 		byte *scan2 = scrollAdress;
@@ -4816,7 +4809,7 @@ void PrinceEngine::mainLoop() {
 
 		openInventoryCheck();
 
-		pause();
+		pausePrinceEngine();
 	}
 }
 
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 15887b2de8..c9cb83d0b3 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -640,8 +640,7 @@ private:
 	static bool compareDrawNodes(DrawNode d1, DrawNode d2);
 	void runDrawNodes();
 	void makeShadowTable(int brightness);
-	void pause();
-	void pause2();
+	void pausePrinceEngine(int fps = kFPS);
 
 	uint32 getTextWidth(const char *s);
 	void debugEngine(const char *s, ...);
-- 
cgit v1.2.3


From e228a313e2a8b4997c256a9735eecbbe442a48c7 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 8 Nov 2014 20:41:00 +0100
Subject: PRINCE: Fix double loading of variaTxt.dat file in init()

---
 engines/prince/prince.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index ad682c415e..f0d360309c 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -273,7 +273,6 @@ void PrinceEngine::init() {
 	_debugger = new Debugger(this, _flags);
 
 	_variaTxt = new VariaTxt();
-	Resource::loadResource(_variaTxt, "variatxt.dat", true);
 	if (getLanguage() == Common::PL_POL || getLanguage() == Common::DE_DEU) {
 		Resource::loadResource(_variaTxt, "variatxt.dat", true);
 	} else {
-- 
cgit v1.2.3


From bb145b439d1ed243d3968264a191fb9760d0b629 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 8 Nov 2014 20:57:37 +0100
Subject: PRINCE: Silence signed and unsigned comparison warnings in gcc

---
 engines/prince/prince.cpp | 4 ++--
 engines/prince/prince.h   | 6 +++---
 engines/prince/script.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index f0d360309c..1c0198d6f6 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1595,7 +1595,7 @@ void PrinceEngine::setBackAnim(Anim &backAnim) {
 }
 
 void PrinceEngine::showBackAnims() {
-	for (uint i = 0; i < kMaxBackAnims; i++) {
+	for (int i = 0; i < kMaxBackAnims; i++) {
 		BAS &seq = _backAnimList[i]._seq;
 		int activeSubAnim = seq._currRelative;
 		if (!_backAnimList[i].backAnims.empty()) {
@@ -4188,7 +4188,7 @@ int PrinceEngine::checkRightUpDir() {
 }
 
 bool PrinceEngine::tracePath(int x1, int y1, int x2, int y2) {
-	for (int i = 0; i < kPathBitmapLen; i++) {
+	for (uint i = 0; i < kPathBitmapLen; i++) {
 		_roomPathBitmapTemp[i] = 0;
 	}
 	if (x1 != x2 || y1 != y2) {
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index c9cb83d0b3..6dce044a41 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -372,7 +372,7 @@ public:
 	static const int16 kZoomBitmapHeight = kMaxPicHeight / kZoomStep;
 	static const int16 kNormalWidth = 640;
 	static const int16 kNormalHeight = 480;
-	static const int32 kTransTableSize = 256 * 256;
+	static const uint32 kTransTableSize = 256 * 256;
 
 	static const int kMaxNormAnims = 64;
 	static const int kMaxBackAnims = 64;
@@ -408,7 +408,7 @@ public:
 	int _currentPointerNumber;
 
 	static const int16 kMaxInv = 90; // max amount of inventory items in whole game
-	static const int16 kMaxItems = 30; // size of inventory
+	static const uint16 kMaxItems = 30; // size of inventory
 
 	uint32 _invTxtSize;
 	byte *_invTxt;
@@ -537,7 +537,7 @@ public:
 
 	// Pathfinding
 	static const int16 kPathGridStep = 2;
-	static const int32 kPathBitmapLen = (kMaxPicHeight / kPathGridStep * kMaxPicWidth / kPathGridStep) / 8;
+	static const uint32 kPathBitmapLen = (kMaxPicHeight / kPathGridStep * kMaxPicWidth / kPathGridStep) / 8;
 	static const int32 kTracePts = 8000;
 	static const int32 kPBW = kMaxPicWidth / 16; // PathBitmapWidth
 	static const int kMinDistance = 2500;
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index deb52d7622..1e50fe5ec4 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -1629,7 +1629,7 @@ void Interpreter::O_BACKANIMRANGE() {
 }
 
 void Interpreter::O_CLEARPATH() {
-	for (int i = 0; i < _vm->kPathBitmapLen; i++) {
+	for (uint i = 0; i < _vm->kPathBitmapLen; i++) {
 		_vm->_roomPathBitmap[i] = 255;
 	}
 	debugInterpreter("O_CLEARPATH");
-- 
cgit v1.2.3


From 71eedf9a3ebae5ba3c8bba075e4bc02fa5c474b2 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 8 Nov 2014 21:00:47 +0100
Subject: PRINCE: Silence last comparison warning in gcc

---
 engines/prince/script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/prince/script.h b/engines/prince/script.h
index 4799e84944..23c0468d15 100644
--- a/engines/prince/script.h
+++ b/engines/prince/script.h
@@ -241,7 +241,7 @@ private:
 	typedef void (Interpreter::*OpcodeFunc)();
 	static OpcodeFunc _opcodes[];
 
-	static const int kGiveLetterScriptFix = 79002;
+	static const uint kGiveLetterScriptFix = 79002;
 
 	// Keep opcode handlers names as they are in original code
 	// making it easier to switch back and forth
-- 
cgit v1.2.3


From e33383b19f361cb3eabdc4c3322e623917438d32 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 8 Nov 2014 23:51:56 +0100
Subject: PRINCE: showLogo() - allow to skip logo animation or quit game during
 it

---
 engines/prince/prince.cpp | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 1c0198d6f6..144876ca75 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -403,7 +403,6 @@ void PrinceEngine::init() {
 
 void PrinceEngine::showLogo() {
 	MhwanhDecoder logo;
-	_system->delayMillis(1000 / kFPS * 20);
 	if (Resource::loadResource(&logo, "logo.raw", true)) {
 		loadSample(0, "LOGO.WAV");
 		playSample(0, 0);
@@ -411,7 +410,31 @@ void PrinceEngine::showLogo() {
 		_graph->change();
 		_graph->update(_graph->_frontScreen);
 		setPalette(logo.getPalette());
-		_system->delayMillis(1000 / kFPS * 70);
+
+		uint32 logoStart = _system->getMillis();
+		while (_system->getMillis() < logoStart + 5000) {
+			Common::Event event;
+			Common::EventManager *eventMan = _system->getEventManager();
+			while (eventMan->pollEvent(event)) {
+				switch (event.type) {
+				case Common::EVENT_KEYDOWN:
+					if (event.kbd.keycode == Common::KEYCODE_ESCAPE) {
+						stopSample(0);
+						return;
+					}
+					break;
+				case Common::EVENT_LBUTTONDOWN:
+					stopSample(0);
+					return;
+				default:
+					break;
+				}
+			}
+
+			if (shouldQuit()) {
+				return;
+			}
+		}
 	}
 }
 
-- 
cgit v1.2.3


From b5596482f0b21ffea3a4e2e78b9a5814ec9723af Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 00:04:51 +0100
Subject: PRINCE: Allow to skip intro animation with LMB

---
 engines/prince/prince.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 144876ca75..6239d6aa40 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -2410,6 +2410,7 @@ void PrinceEngine::moveRunHero(int heroId, int x, int y, int dir, bool runHeroFl
 }
 
 void PrinceEngine::leftMouseButton() {
+	_flags->setFlagValue(Flags::ESCAPED2, 1); // skip intro animation
 	_flags->setFlagValue(Flags::LMOUSE, 1);
 	if (_flags->getFlagValue(Flags::POWERENABLED)) {
 		_flags->setFlagValue(Flags::MBFLAG, 1);
-- 
cgit v1.2.3


From 8ad075a764ba948b922a01218989fa3d09d828ad Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 00:11:34 +0100
Subject: PRINCE: Allow RTL engine feature

---
 engines/prince/detection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 3f83009de8..dd553adc6e 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -61,7 +61,8 @@ bool PrinceMetaEngine::hasFeature(MetaEngineFeature f) const {
 bool Prince::PrinceEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsLoadingDuringRuntime) ||
-		(f == kSupportsSavingDuringRuntime);
+		(f == kSupportsSavingDuringRuntime) ||
+		(f == kSupportsRTL);
 }
 
 } // End of namespace Prince
-- 
cgit v1.2.3


From ce1e776eeef153ca3aa6beaae5ce3786919368d6 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 01:42:54 +0100
Subject: PRINCE: Add loading during startup and syncSoundSettings features

---
 engines/prince/detection.cpp |  3 ++-
 engines/prince/prince.cpp    | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index dd553adc6e..3fe7993fdb 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -55,7 +55,8 @@ bool PrinceMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesSupportMetaInfo) ||
 		(f == kSavesSupportThumbnail) ||
 		(f == kSavesSupportCreationDate) ||
-		(f == kSupportsListSaves);
+		(f == kSupportsListSaves) ||
+		(f == kSupportsLoadingDuringStartup);
 }
 
 bool Prince::PrinceEngine::hasFeature(EngineFeature f) const {
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 6239d6aa40..5055c6a225 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -439,13 +439,16 @@ void PrinceEngine::showLogo() {
 }
 
 Common::Error PrinceEngine::run() {
-
+	syncSoundSettings();
+	int startGameSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
 	init();
-
-	showLogo();
-
+	if (startGameSlot == -1) {
+		showLogo();
+	} else {
+		loadLocation(59); // load intro location - easiest way to set everything up
+		loadGame(startGameSlot);
+	}
 	mainLoop();
-
 	return Common::kNoError;
 }
 
-- 
cgit v1.2.3


From d5938d25204f6d2bb2f97d9340db281742db8c5b Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 02:15:56 +0100
Subject: PRINCE: canSaveGameStateCurrently() - check conditions when you can't
 save the game state

---
 engines/prince/saveload.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
index 706079ffaf..65983f40de 100644
--- a/engines/prince/saveload.cpp
+++ b/engines/prince/saveload.cpp
@@ -172,13 +172,20 @@ void PrinceMetaEngine::removeSaveState(const char *target, int slot) const {
 	g_system->getSavefileManager()->removeSavefile(fileName);
 }
 
-// TODO
 bool PrinceEngine::canSaveGameStateCurrently() {
-	return true;
+	if (_mouseFlag && _mouseFlag != 3) {
+		if (_mainHero->_visible) {
+			// 29 - Basement
+			if (_locationNr != 29) {
+				return true;
+			}
+		}
+	}
+	return false;
 }
 
-// TODO
 bool PrinceEngine::canLoadGameStateCurrently() {
+	// Always true
 	return true;
 }
 
-- 
cgit v1.2.3


From cb01dd36b62fca7b8bcd8d41d701f6f41b8249d8 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 02:42:48 +0100
Subject: PRINCE: canLoadGameStateCurrently() - to check if loading is allowed

Also block saving during dialogbox and inventory drawing
---
 engines/prince/saveload.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
index 65983f40de..46e598be70 100644
--- a/engines/prince/saveload.cpp
+++ b/engines/prince/saveload.cpp
@@ -177,7 +177,10 @@ bool PrinceEngine::canSaveGameStateCurrently() {
 		if (_mainHero->_visible) {
 			// 29 - Basement
 			if (_locationNr != 29) {
-				return true;
+				// No dialog box and not in inventory
+				if (!_dialogFlag && !_showInventoryFlag) {
+					return true;
+				}
 			}
 		}
 	}
@@ -185,8 +188,18 @@ bool PrinceEngine::canSaveGameStateCurrently() {
 }
 
 bool PrinceEngine::canLoadGameStateCurrently() {
-	// Always true
-	return true;
+	if (_mouseFlag && _mouseFlag != 3) {
+		if (_mainHero->_visible) {
+			// 29 - Basement
+			if (_locationNr != 29) {
+				// No dialog box and not in inventory
+				if (!_dialogFlag && !_showInventoryFlag) {
+					return true;
+				}
+			}
+		}
+	}
+	return false;
 }
 
 Common::Error PrinceEngine::saveGameState(int slot, const Common::String &desc) {
@@ -512,9 +525,6 @@ bool PrinceEngine::loadGame(int slotNumber) {
 	syncGame(readStream, nullptr);
 	delete readStream;
 
-	// TODO
-	//syncSpeechSettings();
-
 	return true;
 }
 
-- 
cgit v1.2.3


From 3472d95f4546fd1c1212e0f9ef85deaefa23e689 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 03:05:34 +0100
Subject: PRINCE: playSample() - split to sound and speech types to correct
 volume settings

---
 engines/prince/prince.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 5055c6a225..55f12a6560 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -754,7 +754,11 @@ void PrinceEngine::playSample(uint16 sampleId, uint16 loopType) {
 			return;
 		}
 		_audioStream[sampleId]->rewind();
-		_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle[sampleId], _audioStream[sampleId], sampleId, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+		if (sampleId < 28) {
+			_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle[sampleId], _audioStream[sampleId], sampleId, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+		} else {
+			_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle[sampleId], _audioStream[sampleId], sampleId, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+		}
 	}
 }
 
-- 
cgit v1.2.3


From 72e6a9eeab1082892e5d77fabc4f0b50f839615a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 9 Nov 2014 12:54:41 +0100
Subject: SCI: some more work on 480x300 mac support

---
 engines/sci/graphics/cursor.cpp      |   8 +-
 engines/sci/graphics/font.cpp        |   8 +-
 engines/sci/graphics/font.h          |   4 +-
 engines/sci/graphics/picture.cpp     |  84 +++++---
 engines/sci/graphics/ports.cpp       |  16 +-
 engines/sci/graphics/screen.cpp      | 385 +++++++++++++++++++++++------------
 engines/sci/graphics/screen.h        |  94 +++++++--
 engines/sci/graphics/transitions.cpp |   6 +-
 8 files changed, 412 insertions(+), 193 deletions(-)

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 048ec1e9b9..1a58de073c 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -47,7 +47,7 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc
 	_isVisible = true;
 
 	// center mouse cursor
-	setPosition(Common::Point(_screen->getWidth() / 2, _screen->getHeight() / 2));
+	setPosition(Common::Point(_screen->getScriptWidth() / 2, _screen->getScriptHeight() / 2));
 	_moveZoneActive = false;
 
 	_zoomZoneActive = false;
@@ -151,14 +151,14 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 	colorMapping[0] = 0; // Black is hardcoded
 	colorMapping[1] = _screen->getColorWhite(); // White is also hardcoded
 	colorMapping[2] = SCI_CURSOR_SCI0_TRANSPARENCYCOLOR;
-	colorMapping[3] = _palette->matchColor(170, 170, 170); // Grey
+	colorMapping[3] = _palette->matchColor(170, 170, 170) & SCI_PALETTE_MATCH_COLORMASK; // Grey
 	// TODO: Figure out if the grey color is hardcoded
 	// HACK for the magnifier cursor in LB1, fixes its color (bug #3487092)
 	if (g_sci->getGameId() == GID_LAURABOW && resourceId == 1)
 		colorMapping[3] = _screen->getColorWhite();
 	// HACK for Longbow cursors, fixes the shade of grey they're using (bug #3489101)
 	if (g_sci->getGameId() == GID_LONGBOW)
-		colorMapping[3] = _palette->matchColor(223, 223, 223); // Light Grey
+		colorMapping[3] = _palette->matchColor(223, 223, 223) & SCI_PALETTE_MATCH_COLORMASK; // Light Grey
 
 	// Seek to actual data
 	resourceData += 4;
@@ -481,7 +481,7 @@ void GfxCursor::kernelSetPos(Common::Point pos) {
 
 void GfxCursor::kernelMoveCursor(Common::Point pos) {
 	_coordAdjuster->moveCursor(pos);
-	if (pos.x > _screen->getWidth() || pos.y > _screen->getHeight()) {
+	if (pos.x > _screen->getScriptWidth() || pos.y > _screen->getScriptHeight()) {
 		warning("attempt to place cursor at invalid coordinates (%d, %d)", pos.y, pos.x);
 		return;
 	}
diff --git a/engines/sci/graphics/font.cpp b/engines/sci/graphics/font.cpp
index e4684ff134..2268ec0459 100644
--- a/engines/sci/graphics/font.cpp
+++ b/engines/sci/graphics/font.cpp
@@ -48,8 +48,8 @@ GfxFontFromResource::GfxFontFromResource(ResourceManager *resMan, GfxScreen *scr
 	// filling info for every char
 	for (int16 i = 0; i < _numChars; i++) {
 		_chars[i].offset = READ_SCI32ENDIAN_UINT16(_resourceData + 6 + i * 2);
-		_chars[i].w = _resourceData[_chars[i].offset];
-		_chars[i].h = _resourceData[_chars[i].offset + 1];
+		_chars[i].width = _resourceData[_chars[i].offset];
+		_chars[i].height = _resourceData[_chars[i].offset + 1];
 	}
 }
 
@@ -66,10 +66,10 @@ byte GfxFontFromResource::getHeight() {
 	return _fontHeight;
 }
 byte GfxFontFromResource::getCharWidth(uint16 chr) {
-	return chr < _numChars ? _chars[chr].w : 0;
+	return chr < _numChars ? _chars[chr].width : 0;
 }
 byte GfxFontFromResource::getCharHeight(uint16 chr) {
-	return chr < _numChars ? _chars[chr].h : 0;
+	return chr < _numChars ? _chars[chr].height : 0;
 }
 byte *GfxFontFromResource::getCharData(uint16 chr) {
 	return chr < _numChars ? _resourceData + _chars[chr].offset + 2 : 0;
diff --git a/engines/sci/graphics/font.h b/engines/sci/graphics/font.h
index 58b2ba4813..451261f315 100644
--- a/engines/sci/graphics/font.h
+++ b/engines/sci/graphics/font.h
@@ -71,9 +71,11 @@ private:
 	byte *_resourceData;
 
 	struct Charinfo {
-		byte w, h;
+		byte width;
+		byte height;
 		int16 offset;
 	};
+	
 	byte _fontHeight;
 	uint16 _numChars;
 	Charinfo *_chars;
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index d751f9738f..d7ef84dc1e 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -88,10 +88,13 @@ void GfxPicture::draw(int16 animationNr, bool mirroredFlag, bool addToFlag, int1
 }
 
 void GfxPicture::reset() {
+	int16 startY = _ports->getPort()->top;
+	int16 startX = 0;
 	int16 x, y;
-	for (y = _ports->getPort()->top; y < _screen->getHeight(); y++) {
-		for (x = 0; x < _screen->getWidth(); x++) {
-			_screen->putPixel(x, y, GFX_SCREEN_MASK_ALL, 255, 0, 0);
+	_screen->vectorAdjustCoordinate(&startX, &startY);
+	for (y = startY; y < _screen->getHeight(); y++) {
+		for (x = startX; x < _screen->getWidth(); x++) {
+			_screen->vectorPutPixel(x, y, GFX_SCREEN_MASK_ALL, 255, 0, 0);
 		}
 	}
 }
@@ -482,6 +485,8 @@ enum {
 	PIC_OPX_VGA_PRIORITY_TABLE_EXPLICIT = 4
 };
 
+//#define DEBUG_PICTURE_DRAW 1
+
 #ifdef DEBUG_PICTURE_DRAW
 const char *picOpcodeNames[] = {
 	"Set color",
@@ -589,6 +594,9 @@ void GfxPicture::drawVectorData(byte *data, int dataSize) {
 	while (curPos < dataSize) {
 #ifdef DEBUG_PICTURE_DRAW
 		debug("Picture op: %X (%s) at %d", data[curPos], picOpcodeNames[data[curPos] - 0xF0], curPos);
+		_screen->copyToScreen();
+		g_system->updateScreen();
+		g_system->delayMillis(400);
 #endif
 		switch (pic_op = data[curPos++]) {
 		case PIC_OP_SET_COLOR:
@@ -934,17 +942,17 @@ void GfxPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, by
 	Common::Point p, p1;
 	byte screenMask = _screen->getDrawingMask(color, priority, control);
 	byte matchedMask, matchMask;
-	int16 w, e, a_set, b_set;
 
 	bool isEGA = (_resMan->getViewType() == kViewEga);
 
 	p.x = x + curPort->left;
 	p.y = y + curPort->top;
-	stack.push(p);
 
-	byte searchColor = _screen->getVisual(p.x, p.y);
-	byte searchPriority = _screen->getPriority(p.x, p.y);
-	byte searchControl = _screen->getControl(p.x, p.y);
+	_screen->vectorAdjustCoordinate(&p.x, &p.y);
+
+	byte searchColor = _screen->vectorGetVisual(p.x, p.y);
+	byte searchPriority = _screen->vectorGetPriority(p.x, p.y);
+	byte searchControl = _screen->vectorGetControl(p.x, p.y);
 
 	if (isEGA) {
 		// In EGA games a pixel in the framebuffer is only 4 bits. We store
@@ -991,22 +999,31 @@ void GfxPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, by
 	}
 
 	// hard borders for filling
-	int l = curPort->rect.left + curPort->left;
-	int t = curPort->rect.top + curPort->top;
-	int r = curPort->rect.right + curPort->left - 1;
-	int b = curPort->rect.bottom + curPort->top - 1;
+	int16 borderLeft = curPort->rect.left + curPort->left;
+	int16 borderTop = curPort->rect.top + curPort->top;
+	int16 borderRight = curPort->rect.right + curPort->left - 1;
+	int16 borderBottom = curPort->rect.bottom + curPort->top - 1;
+	int16 curToLeft, curToRight, a_set, b_set;
+	
+	// Translate coordinates, if required (needed for Macintosh 480x300)
+	_screen->vectorAdjustCoordinate(&borderLeft, &borderTop);
+	_screen->vectorAdjustCoordinate(&borderRight, &borderBottom);
+	//return;
+
+	stack.push(p);
+	
 	while (stack.size()) {
 		p = stack.pop();
-		if ((matchedMask = _screen->isFillMatch(p.x, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)) == 0) // already filled
+		if ((matchedMask = _screen->vectorIsFillMatch(p.x, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)) == 0) // already filled
 			continue;
-		_screen->putPixel(p.x, p.y, screenMask, color, priority, control);
-		w = p.x;
-		e = p.x;
+		_screen->vectorPutPixel(p.x, p.y, screenMask, color, priority, control);
+		curToLeft = p.x;
+		curToRight = p.x;
 		// moving west and east pointers as long as there is a matching color to fill
-		while (w > l && (matchedMask = _screen->isFillMatch(w - 1, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)))
-			_screen->putPixel(--w, p.y, screenMask, color, priority, control);
-		while (e < r && (matchedMask = _screen->isFillMatch(e + 1, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)))
-			_screen->putPixel(++e, p.y, screenMask, color, priority, control);
+		while (curToLeft > borderLeft && (matchedMask = _screen->vectorIsFillMatch(curToLeft - 1, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)))
+			_screen->vectorPutPixel(--curToLeft, p.y, screenMask, color, priority, control);
+		while (curToRight < borderRight && (matchedMask = _screen->vectorIsFillMatch(curToRight + 1, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)))
+			_screen->vectorPutPixel(++curToRight, p.y, screenMask, color, priority, control);
 #if 0
 		// debug code for floodfill
 		_screen->copyToScreen();
@@ -1015,10 +1032,10 @@ void GfxPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, by
 #endif
 		// checking lines above and below for possible flood targets
 		a_set = b_set = 0;
-		while (w <= e) {
-			if (p.y > t && (matchedMask = _screen->isFillMatch(w, p.y - 1, matchMask, searchColor, searchPriority, searchControl, isEGA))) { // one line above
+		while (curToLeft <= curToRight) {
+			if (p.y > borderTop && (matchedMask = _screen->vectorIsFillMatch(curToLeft, p.y - 1, matchMask, searchColor, searchPriority, searchControl, isEGA))) { // one line above
 				if (a_set == 0) {
-					p1.x = w;
+					p1.x = curToLeft;
 					p1.y = p.y - 1;
 					stack.push(p1);
 					a_set = 1;
@@ -1026,16 +1043,16 @@ void GfxPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, by
 			} else
 				a_set = 0;
 
-			if (p.y < b && (matchedMask = _screen->isFillMatch(w, p.y + 1, matchMask, searchColor, searchPriority, searchControl, isEGA))) { // one line below
+			if (p.y < borderBottom && (matchedMask = _screen->vectorIsFillMatch(curToLeft, p.y + 1, matchMask, searchColor, searchPriority, searchControl, isEGA))) { // one line below
 				if (b_set == 0) {
-					p1.x = w;
+					p1.x = curToLeft;
 					p1.y = p.y + 1;
 					stack.push(p1);
 					b_set = 1;
 				}
 			} else
 				b_set = 0;
-			w++;
+			curToLeft++;
 		}
 	}
 }
@@ -1173,7 +1190,7 @@ void GfxPicture::vectorPatternBox(Common::Rect box, byte color, byte prio, byte
 
 	for (y = box.top; y < box.bottom; y++) {
 		for (x = box.left; x < box.right; x++) {
-			_screen->putPixel(x, y, flag, color, prio, control);
+			_screen->vectorPutPixel(x, y, flag, color, prio, control);
 		}
 	}
 }
@@ -1186,7 +1203,7 @@ void GfxPicture::vectorPatternTexturedBox(Common::Rect box, byte color, byte pri
 	for (y = box.top; y < box.bottom; y++) {
 		for (x = box.left; x < box.right; x++) {
 			if (*textureData) {
-				_screen->putPixel(x, y, flag, color, prio, control);
+				_screen->vectorPutPixel(x, y, flag, color, prio, control);
 			}
 			textureData++;
 		}
@@ -1203,7 +1220,7 @@ void GfxPicture::vectorPatternCircle(Common::Rect box, byte size, byte color, by
 	for (y = box.top; y < box.bottom; y++) {
 		for (x = box.left; x < box.right; x++) {
 			if (bitmap & 1) {
-				_screen->putPixel(x, y, flag, color, prio, control);
+				_screen->vectorPutPixel(x, y, flag, color, prio, control);
 			}
 			bitNo++;
 			if (bitNo == 8) {
@@ -1222,12 +1239,12 @@ void GfxPicture::vectorPatternTexturedCircle(Common::Rect box, byte size, byte c
 	byte bitNo = 0;
 	const bool *textureData = &vectorPatternTextures[vectorPatternTextureOffset[texture]];
 	int y, x;
-
+	
 	for (y = box.top; y < box.bottom; y++) {
 		for (x = box.left; x < box.right; x++) {
 			if (bitmap & 1) {
 				if (*textureData) {
-					_screen->putPixel(x, y, flag, color, prio, control);
+					_screen->vectorPutPixel(x, y, flag, color, prio, control);
 				}
 				textureData++;
 			}
@@ -1252,7 +1269,10 @@ void GfxPicture::vectorPattern(int16 x, int16 y, byte color, byte priority, byte
 	rect.top = y; rect.left = x;
 	rect.setHeight((size*2)+1); rect.setWidth((size*2)+2);
 	_ports->offsetRect(rect);
-	rect.clip(_screen->getWidth(), _screen->getHeight());
+	rect.clip(_screen->getScriptWidth(), _screen->getScriptHeight());
+
+	_screen->vectorAdjustCoordinate(&rect.left, &rect.top);
+	_screen->vectorAdjustCoordinate(&rect.right, &rect.bottom);
 
 	if (code & SCI_PATTERN_CODE_RECTANGLE) {
 		// Rectangle
diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp
index 56c63a7b12..bcc991081e 100644
--- a/engines/sci/graphics/ports.cpp
+++ b/engines/sci/graphics/ports.cpp
@@ -63,10 +63,10 @@ void GfxPorts::init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *te
 	openPort(_menuPort);
 	setPort(_menuPort);
 	_text16->SetFont(0);
-	_menuPort->rect = Common::Rect(0, 0, _screen->getWidth(), _screen->getHeight());
-	_menuBarRect = Common::Rect(0, 0, _screen->getWidth(), 9);
-	_menuRect = Common::Rect(0, 0, _screen->getWidth(), 10);
-	_menuLine = Common::Rect(0, 9, _screen->getWidth(), 10);
+	_menuPort->rect = Common::Rect(0, 0, _screen->getScriptWidth(), _screen->getScriptHeight());
+	_menuBarRect = Common::Rect(0, 0, _screen->getScriptWidth(), 9);
+	_menuRect = Common::Rect(0, 0, _screen->getScriptWidth(), 10);
+	_menuLine = Common::Rect(0, 9, _screen->getScriptWidth(), 10);
 
 	_wmgrPort = new Port(1);
 	_windowsById.resize(2);
@@ -122,13 +122,13 @@ void GfxPorts::init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *te
 	} else {
 		_wmgrPort->rect.bottom = _screen->getHeight();
 	}
-	_wmgrPort->rect.right = _screen->getWidth();
+	_wmgrPort->rect.right = _screen->getScriptWidth();
 	_wmgrPort->rect.moveTo(0, 0);
 	_wmgrPort->curTop = 0;
 	_wmgrPort->curLeft = 0;
 	_windowList.push_front(_wmgrPort);
 
-	_picWind = addWindow(Common::Rect(0, offTop, _screen->getWidth(), _screen->getHeight()), 0, 0, SCI_WINDOWMGR_STYLE_TRANSPARENT | SCI_WINDOWMGR_STYLE_NOFRAME, 0, true);
+	_picWind = addWindow(Common::Rect(0, offTop, _screen->getScriptWidth(), _screen->getScriptHeight()), 0, 0, SCI_WINDOWMGR_STYLE_TRANSPARENT | SCI_WINDOWMGR_STYLE_NOFRAME, 0, true);
 	// For SCI0 games till kq4 (.502 - not including) we set _picWind top to offTop instead
 	//  Because of the menu/status bar
 	if (_usesOldGfxFunctions)
@@ -321,13 +321,13 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor
 	// their interpreter even in the newer VGA games.
 	r.left = r.left & 0xFFFE;
 
-	if (r.width() > _screen->getWidth()) {
+	if (r.width() > _screen->getScriptWidth()) {
 		// We get invalid dimensions at least at the end of sq3 (script bug!).
 		// Same happens very often in lsl5, sierra sci didnt fix it but it looked awful.
 		// Also happens frequently in the demo of GK1.
 		warning("Fixing too large window, left: %d, right: %d", dims.left, dims.right);
 		r.left = 0;
-		r.right = _screen->getWidth() - 1;
+		r.right = _screen->getScriptWidth() - 1;
 		if ((style != _styleUser) && !(style & SCI_WINDOWMGR_STYLE_NOFRAME))
 			r.right--;
 	}
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index d66352b411..594c4b3442 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -37,7 +37,13 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 
 	// Scale the screen, if needed
 	_upscaledHires = GFX_SCREEN_UPSCALED_DISABLED;
-
+	
+	// we default to scripts running at 320x200
+	_scriptWidth = 320;
+	_scriptHeight = 200;
+	_width = 0;
+	_height = 0;
+	
 	// King's Quest 6 and Gabriel Knight 1 have hires content, gk1/cd was able
 	// to provide that under DOS as well, but as gk1/floppy does support
 	// upscaled hires scriptswise, but doesn't actually have the hires content
@@ -51,9 +57,32 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 #endif
 	}
 
+	// Japanese versions of games use hi-res font on upscaled version of the game.
+	if ((g_sci->getLanguage() == Common::JA_JPN) && (getSciVersion() <= SCI_VERSION_1_1))
+		_upscaledHires = GFX_SCREEN_UPSCALED_640x400;
+	
+	// Macintosh SCI0 games used 480x300, while the scripts were running at 320x200
 	if (g_sci->getPlatform() == Common::kPlatformMacintosh) {
-		if (getSciVersion() <= SCI_VERSION_01)
+		if (getSciVersion() <= SCI_VERSION_01) {
 			_upscaledHires = GFX_SCREEN_UPSCALED_480x300;
+			_width = 480;
+			_height = 300; // regular visual, priority and control map are 480x300 (this is different than other upscaled SCI games)
+		}
+	
+		// Some Mac SCI1/1.1 games only take up 190 rows and do not
+		// have the menu bar.
+		// TODO: Verify that LSL1 and LSL5 use height 190
+		switch (g_sci->getGameId()) {
+		case GID_FREDDYPHARKAS:
+		case GID_KQ5:
+		case GID_KQ6:
+		case GID_LSL1:
+		case GID_LSL5:
+		case GID_SQ1:
+			_width = 190;
+		default:
+			break;
+		}
 	}
 
 #ifdef ENABLE_SCI32
@@ -64,70 +93,66 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	}
 #endif
 
-	if (_resMan->detectHires()) {
-		_width = 640;
-		_pitch = 640;
-		_height = 480;
-	} else {
-		_width = 320;
-		_pitch = 320;
-		_height = getLowResScreenHeight();
-	}
-
 #ifdef ENABLE_SCI32
 	// Phantasmagoria 1 sets a window area of 630x450
-	if (g_sci->getGameId() == GID_PHANTASMAGORIA) {
-		_width = 630;
-		_height = 450;
-	}
+	//if (g_sci->getGameId() == GID_PHANTASMAGORIA) {
+	//	_width = 630;
+	//	_height = 450;
+	//}
 #endif
 
-	// Japanese versions of games use hi-res font on upscaled version of the game.
-	if ((g_sci->getLanguage() == Common::JA_JPN) && (getSciVersion() <= SCI_VERSION_1_1))
-		_upscaledHires = GFX_SCREEN_UPSCALED_640x400;
+	if (_resMan->detectHires()) {
+		_scriptWidth = 640;
+		_scriptHeight = 480;
+	}
 
-	_pixels = _pitch * _height;
+	// if not yet set, set those to script-width/height
+	if (!_width)
+		_width = _scriptWidth;
+	if (!_height)
+		_height = _scriptHeight;
+
+	_pixels = _width * _height;
 
 	switch (_upscaledHires) {
 	case GFX_SCREEN_UPSCALED_480x300:
 		// Space Quest 3, Hoyle 1+2 on MAC use this one
-		//  TODO: Sierra's upscaling worked differently. We need to figure out the exact algo
 		_displayWidth = 480;
 		_displayHeight = 300;
-		for (int i = 0; i <= _height; i++)
+		for (int i = 0; i <= _scriptHeight; i++)
 			_upscaledHeightMapping[i] = (i * 3) >> 1;
-		for (int i = 0; i <= _width; i++)
+		for (int i = 0; i <= _scriptWidth; i++)
 			_upscaledWidthMapping[i] = (i * 3) >> 1;
 		break;
 	case GFX_SCREEN_UPSCALED_640x400:
 		// Police Quest 2 and Quest For Glory on PC9801 (Japanese)
 		_displayWidth = 640;
 		_displayHeight = 400;
-		for (int i = 0; i <= _height; i++)
+		for (int i = 0; i <= _scriptHeight; i++)
 			_upscaledHeightMapping[i] = i * 2;
-		for (int i = 0; i <= _width; i++)
+		for (int i = 0; i <= _scriptWidth; i++)
 			_upscaledWidthMapping[i] = i * 2;
 		break;
 	case GFX_SCREEN_UPSCALED_640x440:
 		// used by King's Quest 6 on Windows
 		_displayWidth = 640;
 		_displayHeight = 440;
-		for (int i = 0; i <= _height; i++)
+		for (int i = 0; i <= _scriptHeight; i++)
 			_upscaledHeightMapping[i] = (i * 11) / 5;
-		for (int i = 0; i <= _width; i++)
+		for (int i = 0; i <= _scriptWidth; i++)
 			_upscaledWidthMapping[i] = i * 2;
 		break;
 	case GFX_SCREEN_UPSCALED_640x480:
 		// Gabriel Knight 1 (VESA, Mac)
 		_displayWidth = 640;
 		_displayHeight = 480;
-		for (int i = 0; i <= _height; i++)
+		for (int i = 0; i <= _scriptHeight; i++)
 			_upscaledHeightMapping[i] = (i * 12) / 5;
-		for (int i = 0; i <= _width; i++)
+		for (int i = 0; i <= _scriptWidth; i++)
 			_upscaledWidthMapping[i] = i * 2;
 		break;
 	default:
-		_displayWidth = _pitch;
+		_displayWidth = _width;
 		_displayHeight = _height;
 		memset(&_upscaledHeightMapping, 0, sizeof(_upscaledHeightMapping) );
 		memset(&_upscaledWidthMapping, 0, sizeof(_upscaledWidthMapping) );
@@ -135,6 +160,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	}
 
 	_displayPixels = _displayWidth * _displayHeight;
+	
+	// Allocate visual, priority, control and display screen
 	_visualScreen = (byte *)calloc(_pixels, 1);
 	_priorityScreen = (byte *)calloc(_pixels, 1);
 	_controlScreen = (byte *)calloc(_pixels, 1);
@@ -179,6 +206,34 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 			error("Unknown SCI1.1 Mac game");
 	} else
 		initGraphics(_displayWidth, _displayHeight, _displayWidth > 320);
+
+	// Initialize code pointers
+	_vectorAdjustCoordinatePtr = &GfxScreen::vectorAdjustCoordinateNOP;
+	_vectorAdjustLineCoordinatesPtr = &GfxScreen::vectorAdjustLineCoordinatesNOP;
+	_vectorIsFillMatchPtr = &GfxScreen::vectorIsFillMatchNormal;
+	_vectorPutPixelPtr = &GfxScreen::putPixelNormal;
+	_vectorPutLinePixelPtr = &GfxScreen::putPixel;
+	_vectorGetPixelPtr = &GfxScreen::getPixelNormal;
+	_putPixelPtr = &GfxScreen::putPixelNormal;
+	_getPixelPtr = &GfxScreen::getPixelNormal;
+	
+	switch (_upscaledHires) {
+	case GFX_SCREEN_UPSCALED_480x300:
+		_vectorAdjustCoordinatePtr = &GfxScreen::vectorAdjustCoordinate480x300Mac;
+		_vectorAdjustLineCoordinatesPtr = &GfxScreen::vectorAdjustLineCoordinates480x300Mac;
+		// vectorPutPixel -> we already adjust coordinates for vector code, that's why we can set pixels directly
+		// vectorGetPixel -> see vectorPutPixel
+		_vectorPutLinePixelPtr = &GfxScreen::vectorPutLinePixel480x300Mac;
+		_putPixelPtr = &GfxScreen::putPixelAllUpscaled;
+		_getPixelPtr = &GfxScreen::getPixelUpscaled;
+		break;
+	case GFX_SCREEN_UPSCALED_640x400:
+	case GFX_SCREEN_UPSCALED_640x440:
+	case GFX_SCREEN_UPSCALED_640x480:
+		_vectorPutPixelPtr = &GfxScreen::putPixelDisplayUpscaled;
+		_putPixelPtr = &GfxScreen::putPixelDisplayUpscaled;
+		break;
+	}
 }
 
 GfxScreen::~GfxScreen() {
@@ -248,43 +303,162 @@ byte GfxScreen::getDrawingMask(byte color, byte prio, byte control) {
 	return flag;
 }
 
-void GfxScreen::putPixel(int x, int y, byte drawMask, byte color, byte priority, byte control) {
-	int offset = y * _pitch + x;
+void GfxScreen::vectorAdjustCoordinateNOP(int16 *x, int16 *y) {
+}
 
-	if (drawMask & GFX_SCREEN_MASK_VISUAL) {
-		_visualScreen[offset] = color;
-		if (!_upscaledHires) {
-			_displayScreen[offset] = color;
+void GfxScreen::vectorAdjustCoordinate480x300Mac(int16 *x, int16 *y) {
+	*x = _upscaledWidthMapping[*x];
+	*y = _upscaledHeightMapping[*y];
+}
+
+void GfxScreen::vectorAdjustLineCoordinatesNOP(int16 *left, int16 *top, int16 *right, int16 *bottom, byte drawMask, byte color, byte priority, byte control) {
+}
+
+void GfxScreen::vectorAdjustLineCoordinates480x300Mac(int16 *left, int16 *top, int16 *right, int16 *bottom, byte drawMask, byte color, byte priority, byte control) {
+	int16 displayLeft = _upscaledWidthMapping[*left];
+	int16 displayRight = _upscaledWidthMapping[*right];
+	int16 displayTop = _upscaledHeightMapping[*top];
+	int16 displayBottom = _upscaledHeightMapping[*bottom];
+	
+	if (displayLeft < displayRight) {
+		// one more pixel to the left, one more pixel to the right
+		if (displayLeft > 0)
+			vectorPutLinePixel(displayLeft - 1, displayTop, drawMask, color, priority, control);
+		vectorPutLinePixel(displayRight + 1, displayBottom, drawMask, color, priority, control);
+	} else if (displayLeft > displayRight) {
+		if (displayRight > 0)
+			vectorPutLinePixel(displayRight - 1, displayBottom, drawMask, color, priority, control);
+		vectorPutLinePixel(displayLeft + 1, displayTop, drawMask, color, priority, control);
+	}
+	*left = displayLeft;
+	*top = displayTop;
+	*right = displayRight;
+	*bottom = displayBottom;
+}
+
+byte GfxScreen::vectorIsFillMatchNormal(int16 x, int16 y, byte screenMask, byte checkForColor, byte checkForPriority, byte checkForControl, bool isEGA) {
+	int offset = y * _width + x;
+	byte match = 0;
+
+	if (screenMask & GFX_SCREEN_MASK_VISUAL) {
+		if (!isEGA) {
+			if (*(_visualScreen + offset) == checkForColor)
+				match |= GFX_SCREEN_MASK_VISUAL;
 		} else {
-			putScaledPixelOnDisplay(x, y, color);
+			// In EGA games a pixel in the framebuffer is only 4 bits. We store
+			// a full byte per pixel to allow undithering, but when comparing
+			// pixels for flood-fill purposes, we should only compare the
+			// visible color of a pixel.
+
+			byte EGAcolor = *(_visualScreen + offset);
+			if ((x ^ y) & 1)
+				EGAcolor = (EGAcolor ^ (EGAcolor >> 4)) & 0x0F;
+			else
+				EGAcolor = EGAcolor & 0x0F;
+			if (EGAcolor == checkForColor)
+				match |= GFX_SCREEN_MASK_VISUAL;
 		}
 	}
+	if ((screenMask & GFX_SCREEN_MASK_PRIORITY) && *(_priorityScreen + offset) == checkForPriority)
+		match |= GFX_SCREEN_MASK_PRIORITY;
+	if ((screenMask & GFX_SCREEN_MASK_CONTROL) && *(_controlScreen + offset) == checkForControl)
+		match |= GFX_SCREEN_MASK_CONTROL;
+	return match;
+}
+
+// Special 480x300 Mac putPixel for vector line drawing, also draws an additional pixel below the actual one
+void GfxScreen::vectorPutLinePixel480x300Mac(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+	int offset = y * _width + x;
+	
+	if (drawMask & GFX_SCREEN_MASK_VISUAL) {
+		_visualScreen[offset] = color;
+		_visualScreen[offset + _width] = color;
+		_displayScreen[offset] = color;
+		// also set pixel below actual pixel
+		_displayScreen[offset + _displayWidth] = color;
+	}
+	if (drawMask & GFX_SCREEN_MASK_PRIORITY) {
+		_priorityScreen[offset] = priority;
+		_priorityScreen[offset + _width] = priority;
+	}
+	if (drawMask & GFX_SCREEN_MASK_CONTROL) {
+		_controlScreen[offset] = control;
+		_controlScreen[offset + _width] = control;
+	}
+}
+
+// Directly sets a pixel on various screens, display is not upscaled
+void GfxScreen::putPixelNormal(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+	int offset = y * _width + x;
+
+	if (drawMask & GFX_SCREEN_MASK_VISUAL) {
+		_visualScreen[offset] = color;
+		_displayScreen[offset] = color;
+	}
+	if (drawMask & GFX_SCREEN_MASK_PRIORITY)
+		_priorityScreen[offset] = priority;
+	if (drawMask & GFX_SCREEN_MASK_CONTROL)
+		_controlScreen[offset] = control;
+}
+
+// Directly sets a pixel on various screens, display IS upscaled
+void GfxScreen::putPixelDisplayUpscaled(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+	int offset = y * _width + x;
+
+	if (drawMask & GFX_SCREEN_MASK_VISUAL) {
+		_visualScreen[offset] = color;
+		putScaledPixelOnScreen(_displayScreen, x, y, color);
+	}
 	if (drawMask & GFX_SCREEN_MASK_PRIORITY)
 		_priorityScreen[offset] = priority;
 	if (drawMask & GFX_SCREEN_MASK_CONTROL)
 		_controlScreen[offset] = control;
 }
 
+// Directly sets a pixel on various screens, ALL screens ARE upscaled
+void GfxScreen::putPixelAllUpscaled(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+	if (drawMask & GFX_SCREEN_MASK_VISUAL) {
+		putScaledPixelOnScreen(_visualScreen, x, y, color);
+		putScaledPixelOnScreen(_displayScreen, x, y, color);
+	}
+	if (drawMask & GFX_SCREEN_MASK_PRIORITY)
+		putScaledPixelOnScreen(_priorityScreen, x, y, priority);
+	if (drawMask & GFX_SCREEN_MASK_CONTROL)
+		putScaledPixelOnScreen(_controlScreen, x, y, control);
+}
+
 /**
  * This is used to put font pixels onto the screen - we adjust differently, so that we won't
  *  do triple pixel lines in any case on upscaled hires. That way the font will not get distorted
  *  Sierra SCI didn't do this
  */
-void GfxScreen::putFontPixel(int startingY, int x, int y, byte color) {
-	int actualY = startingY + y;
+void GfxScreen::putFontPixel(int16 startingY, int16 x, int16 y, byte color) {
+	int16 actualY = startingY + y;
 	if (_fontIsUpscaled) {
 		// Do not scale ourselves, but put it on the display directly
 		putPixelOnDisplay(x, actualY, color);
 	} else {
-		int offset = actualY * _pitch + x;
+		int offset = actualY * _width + x;
 
 		_visualScreen[offset] = color;
 		switch (_upscaledHires) {
 		case GFX_SCREEN_UPSCALED_DISABLED:
 			_displayScreen[offset] = color;
 			break;
+		case GFX_SCREEN_UPSCALED_640x400:
+		case GFX_SCREEN_UPSCALED_640x440:
+		case GFX_SCREEN_UPSCALED_640x480: {
+			// to 1-> 4 pixels upscaling for all of those, so that fonts won't look weird
+			int displayOffset = (_upscaledHeightMapping[startingY] + y * 2) * _displayWidth + x * 2;
+			_displayScreen[displayOffset] = color;
+			_displayScreen[displayOffset + 1] = color;
+			displayOffset += _displayWidth;
+			_displayScreen[displayOffset] = color;
+			_displayScreen[displayOffset + 1] = color;
+			break;
+		}
 		default:
-			putScaledPixelOnDisplay(x, actualY, color);
+			putScaledPixelOnScreen(_displayScreen, x, actualY, color);
 			break;
 		}
 	}
@@ -295,12 +469,15 @@ void GfxScreen::putFontPixel(int startingY, int x, int y, byte color) {
  * only used on upscaled-Hires games where hires content needs to get drawn ONTO
  * the upscaled display screen (like japanese fonts, hires portraits, etc.).
  */
-void GfxScreen::putPixelOnDisplay(int x, int y, byte color) {
+void GfxScreen::putPixelOnDisplay(int16 x, int16 y, byte color) {
 	int offset = y * _displayWidth + x;
 	_displayScreen[offset] = color;
 }
 
-void GfxScreen::putScaledPixelOnDisplay(int x, int y, byte color) {
+//void GfxScreen::putScaledPixelOnDisplay(int16 x, int16 y, byte color) {
+//}
+
+void GfxScreen::putScaledPixelOnScreen(byte *screen, int16 x, int16 y, byte data) {
 	int displayOffset = _upscaledHeightMapping[y] * _displayWidth + _upscaledWidthMapping[x];
 	int heightOffsetBreak = (_upscaledHeightMapping[y + 1] - _upscaledHeightMapping[y]) * _displayWidth;
 	int heightOffset = 0;
@@ -308,7 +485,7 @@ void GfxScreen::putScaledPixelOnDisplay(int x, int y, byte color) {
 	do {
 		int widthOffset = 0;
 		do {
-			_displayScreen[displayOffset + heightOffset + widthOffset] = color;
+			screen[displayOffset + heightOffset + widthOffset] = data;
 			widthOffset++;
 		} while (widthOffset != widthOffsetBreak);
 		heightOffset += _displayWidth;
@@ -333,12 +510,14 @@ void GfxScreen::drawLine(Common::Point startPoint, Common::Point endPoint, byte
 	//set_drawing_flag
 	byte drawMask = getDrawingMask(color, priority, control);
 
+	vectorAdjustLineCoordinates(&left, &top, &right, &bottom, drawMask, color, priority, control);
+
 	// horizontal line
 	if (top == bottom) {
 		if (right < left)
 			SWAP(right, left);
 		for (int i = left; i <= right; i++)
-			putPixel(i, top, drawMask, color, priority, control);
+			vectorPutLinePixel(i, top, drawMask, color, priority, control);
 		return;
 	}
 	// vertical line
@@ -346,20 +525,20 @@ void GfxScreen::drawLine(Common::Point startPoint, Common::Point endPoint, byte
 		if (top > bottom)
 			SWAP(top, bottom);
 		for (int i = top; i <= bottom; i++)
-			putPixel(left, i, drawMask, color, priority, control);
+			vectorPutLinePixel(left, i, drawMask, color, priority, control);
 		return;
 	}
 	// sloped line - draw with Bresenham algorithm
-	int dy = bottom - top;
-	int dx = right - left;
-	int stepy = dy < 0 ? -1 : 1;
-	int stepx = dx < 0 ? -1 : 1;
+	int16 dy = bottom - top;
+	int16 dx = right - left;
+	int16 stepy = dy < 0 ? -1 : 1;
+	int16 stepx = dx < 0 ? -1 : 1;
 	dy = ABS(dy) << 1;
 	dx = ABS(dx) << 1;
 
 	// setting the 1st and last pixel
-	putPixel(left, top, drawMask, color, priority, control);
-	putPixel(right, bottom, drawMask, color, priority, control);
+	vectorPutLinePixel(left, top, drawMask, color, priority, control);
+	vectorPutLinePixel(right, bottom, drawMask, color, priority, control);
 	// drawing the line
 	if (dx > dy) { // going horizontal
 		int fraction = dy - (dx >> 1);
@@ -370,7 +549,7 @@ void GfxScreen::drawLine(Common::Point startPoint, Common::Point endPoint, byte
 			}
 			left += stepx;
 			fraction += dy;
-			putPixel(left, top, drawMask, color, priority, control);
+			vectorPutLinePixel(left, top, drawMask, color, priority, control);
 		}
 	} else { // going vertical
 		int fraction = dx - (dy >> 1);
@@ -381,7 +560,7 @@ void GfxScreen::drawLine(Common::Point startPoint, Common::Point endPoint, byte
 			}
 			top += stepy;
 			fraction += dx;
-			putPixel(left, top, drawMask, color, priority, control);
+			vectorPutLinePixel(left, top, drawMask, color, priority, control);
 		}
 	}
 }
@@ -394,46 +573,14 @@ void GfxScreen::putKanjiChar(Graphics::FontSJIS *commonFont, int16 x, int16 y, u
 	commonFont->drawChar(displayPtr, chr, _displayWidth, 1, color, 0, -1, -1);
 }
 
-byte GfxScreen::getVisual(int x, int y) {
-	return _visualScreen[y * _pitch + x];
-}
-
-byte GfxScreen::getPriority(int x, int y) {
-	return _priorityScreen[y * _pitch + x];
-}
-
-byte GfxScreen::getControl(int x, int y) {
-	return _controlScreen[y * _pitch + x];
+byte GfxScreen::getPixelNormal(byte *screen, int16 x, int16 y) {
+	return screen[y * _width + x];
 }
 
-byte GfxScreen::isFillMatch(int16 x, int16 y, byte screenMask, byte t_color, byte t_pri, byte t_con, bool isEGA) {
-	int offset = y * _pitch + x;
-	byte match = 0;
-
-	if (screenMask & GFX_SCREEN_MASK_VISUAL) {
-		if (!isEGA) {
-			if (*(_visualScreen + offset) == t_color)
-				match |= GFX_SCREEN_MASK_VISUAL;
-		} else {
-			// In EGA games a pixel in the framebuffer is only 4 bits. We store
-			// a full byte per pixel to allow undithering, but when comparing
-			// pixels for flood-fill purposes, we should only compare the
-			// visible color of a pixel.
-
-			byte c = *(_visualScreen + offset);
-			if ((x ^ y) & 1)
-				c = (c ^ (c >> 4)) & 0x0F;
-			else
-				c = c & 0x0F;
-			if (c == t_color)
-				match |= GFX_SCREEN_MASK_VISUAL;
-		}
-	}
-	if ((screenMask & GFX_SCREEN_MASK_PRIORITY) && *(_priorityScreen + offset) == t_pri)
-		match |= GFX_SCREEN_MASK_PRIORITY;
-	if ((screenMask & GFX_SCREEN_MASK_CONTROL) && *(_controlScreen + offset) == t_con)
-		match |= GFX_SCREEN_MASK_CONTROL;
-	return match;
+byte GfxScreen::getPixelUpscaled(byte *screen, int16 x, int16 y) {
+	int16 mappedX = _upscaledWidthMapping[x];
+	int16 mappedY = _upscaledHeightMapping[y];
+	return screen[mappedY * _width + mappedX];
 }
 
 int GfxScreen::bitsGetDataSize(Common::Rect rect, byte mask) {
@@ -469,14 +616,14 @@ void GfxScreen::bitsSave(Common::Rect rect, byte mask, byte *memoryPtr) {
 	memcpy(memoryPtr, (void *)&mask, sizeof(mask)); memoryPtr += sizeof(mask);
 
 	if (mask & GFX_SCREEN_MASK_VISUAL) {
-		bitsSaveScreen(rect, _visualScreen, _pitch, memoryPtr);
+		bitsSaveScreen(rect, _visualScreen, _width, memoryPtr);
 		bitsSaveDisplayScreen(rect, memoryPtr);
 	}
 	if (mask & GFX_SCREEN_MASK_PRIORITY) {
-		bitsSaveScreen(rect, _priorityScreen, _pitch, memoryPtr);
+		bitsSaveScreen(rect, _priorityScreen, _width, memoryPtr);
 	}
 	if (mask & GFX_SCREEN_MASK_CONTROL) {
-		bitsSaveScreen(rect, _controlScreen, _pitch, memoryPtr);
+		bitsSaveScreen(rect, _controlScreen, _width, memoryPtr);
 	}
 	if (mask & GFX_SCREEN_MASK_DISPLAY) {
 		if (!_upscaledHires)
@@ -530,14 +677,14 @@ void GfxScreen::bitsRestore(byte *memoryPtr) {
 	memcpy((void *)&mask, memoryPtr, sizeof(mask)); memoryPtr += sizeof(mask);
 
 	if (mask & GFX_SCREEN_MASK_VISUAL) {
-		bitsRestoreScreen(rect, memoryPtr, _visualScreen, _pitch);
+		bitsRestoreScreen(rect, memoryPtr, _visualScreen, _width);
 		bitsRestoreDisplayScreen(rect, memoryPtr);
 	}
 	if (mask & GFX_SCREEN_MASK_PRIORITY) {
-		bitsRestoreScreen(rect, memoryPtr, _priorityScreen, _pitch);
+		bitsRestoreScreen(rect, memoryPtr, _priorityScreen, _width);
 	}
 	if (mask & GFX_SCREEN_MASK_CONTROL) {
-		bitsRestoreScreen(rect, memoryPtr, _controlScreen, _pitch);
+		bitsRestoreScreen(rect, memoryPtr, _controlScreen, _width);
 	}
 	if (mask & GFX_SCREEN_MASK_DISPLAY) {
 		if (!_upscaledHires)
@@ -612,21 +759,22 @@ void GfxScreen::dither(bool addToFlag) {
 	byte color, ditheredColor;
 	byte *visualPtr = _visualScreen;
 	byte *displayPtr = _displayScreen;
-
+	
 	if (!_unditheringEnabled) {
 		// Do dithering on visual and display-screen
 		for (y = 0; y < _height; y++) {
-			for (x = 0; x < _pitch; x++) {
+			for (x = 0; x < _width; x++) {
 				color = *visualPtr;
 				if (color & 0xF0) {
 					color ^= color << 4;
 					color = ((x^y) & 1) ? color >> 4 : color & 0x0F;
 					switch (_upscaledHires) {
 					case GFX_SCREEN_UPSCALED_DISABLED:
+					case GFX_SCREEN_UPSCALED_480x300:
 						*displayPtr = color;
 						break;
 					default:
-						putScaledPixelOnDisplay(x, y, color);
+						putScaledPixelOnScreen(_displayScreen, x, y, color);
 						break;
 					}
 					*visualPtr = color;
@@ -639,7 +787,7 @@ void GfxScreen::dither(bool addToFlag) {
 			memset(&_ditheredPicColors, 0, sizeof(_ditheredPicColors));
 		// Do dithering on visual screen and put decoded but undithered byte onto display-screen
 		for (y = 0; y < _height; y++) {
-			for (x = 0; x < _pitch; x++) {
+			for (x = 0; x < _width; x++) {
 				color = *visualPtr;
 				if (color & 0xF0) {
 					color ^= color << 4;
@@ -654,10 +802,11 @@ void GfxScreen::dither(bool addToFlag) {
 					}
 					switch (_upscaledHires) {
 					case GFX_SCREEN_UPSCALED_DISABLED:
+					case GFX_SCREEN_UPSCALED_480x300:
 						*displayPtr = ditheredColor;
 						break;
 					default:
-						putScaledPixelOnDisplay(x, y, ditheredColor);
+						putScaledPixelOnScreen(_displayScreen, x, y, ditheredColor);
 						break;
 					}
 					color = ((x^y) & 1) ? color >> 4 : color & 0x0F;
@@ -685,8 +834,8 @@ int16 *GfxScreen::unditherGetDitheredBgColors() {
 }
 
 void GfxScreen::debugShowMap(int mapNo) {
-	// We cannot really support changing maps when in upscaledHires mode
-	if (_upscaledHires)
+	// We cannot really support changing maps when display screen has a different resolution than visual screen
+	if ((_width != _displayWidth) || (_height != _displayHeight))
 		return;
 
 	switch (mapNo) {
@@ -779,8 +928,8 @@ void GfxScreen::adjustBackUpscaledCoordinates(int16 &y, int16 &x, Sci32ViewNativ
 
 	switch (_upscaledHires) {
 	case GFX_SCREEN_UPSCALED_480x300:
-		x = (x << 1) / 3;
-		y = (y << 1) / 3;
+		x = (x * 4) / 6;
+		y = (y * 4) / 6;
 		break;
 	case GFX_SCREEN_UPSCALED_640x400:
 		x /= 2;
@@ -816,26 +965,4 @@ int16 GfxScreen::kernelPicNotValid(int16 newPicNotValid) {
 	return oldPicNotValid;
 }
 
-uint16 GfxScreen::getLowResScreenHeight() {
-	// Some Mac SCI1/1.1 games only take up 190 rows and do not
-	// have the menu bar.
-	// TODO: Verify that LSL1 and LSL5 use height 190
-	if (g_sci->getPlatform() == Common::kPlatformMacintosh) {
-		switch (g_sci->getGameId()) {
-		case GID_FREDDYPHARKAS:
-		case GID_KQ5:
-		case GID_KQ6:
-		case GID_LSL1:
-		case GID_LSL5:
-		case GID_SQ1:
-			return 190;
-		default:
-			break;
-		}
-	}
-
-	// Everything else is 200
-	return 200;
-}
-
 } // End of namespace Sci
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index e266a4ed16..766e32614a 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -69,6 +69,8 @@ public:
 
 	uint16 getWidth() { return _width; }
 	uint16 getHeight() { return _height; }
+	uint16 getScriptWidth() { return _scriptWidth; }
+	uint16 getScriptHeight() { return _scriptHeight; }
 	uint16 getDisplayWidth() { return _displayWidth; }
 	uint16 getDisplayHeight() { return _displayHeight; }
 	byte getColorWhite() { return _colorWhite; }
@@ -81,11 +83,51 @@ public:
 	void copyDisplayRectToScreen(const Common::Rect &rect);
 	void copyRectToScreen(const Common::Rect &rect, int16 x, int16 y);
 
+	// calls to code pointers
+	void inline vectorAdjustCoordinate (int16 *x, int16 *y) {
+		(this->*_vectorAdjustCoordinatePtr)(x, y);
+	}
+	void inline vectorAdjustLineCoordinates (int16 *left, int16 *top, int16 *right, int16 *bottom, byte drawMask, byte color, byte priority, byte control) {
+		(this->*_vectorAdjustLineCoordinatesPtr)(left, top, right, bottom, drawMask, color, priority, control);
+	}
+	byte inline vectorIsFillMatch (int16 x, int16 y, byte screenMask, byte t_color, byte t_pri, byte t_con, bool isEGA) {
+		return (this->*_vectorIsFillMatchPtr)(x, y, screenMask, t_color, t_pri, t_con, isEGA);
+	}
+	void inline vectorPutPixel(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+		(this->*_vectorPutPixelPtr)(x, y, drawMask, color, priority, control);
+	}
+	void inline vectorPutLinePixel(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+		(this->*_vectorPutLinePixelPtr)(x, y, drawMask, color, priority, control);
+	}
+	byte inline vectorGetVisual(int16 x, int16 y) {
+		return (this->*_vectorGetPixelPtr)(_visualScreen, x, y);
+	}
+	byte inline vectorGetPriority(int16 x, int16 y) {
+		return (this->*_vectorGetPixelPtr)(_priorityScreen, x, y);
+	}
+	byte inline vectorGetControl(int16 x, int16 y) {
+		return (this->*_vectorGetPixelPtr)(_controlScreen, x, y);
+	}
+
+
+	void inline putPixel(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
+		(this->*_putPixelPtr)(x, y, drawMask, color, priority, control);
+	}
+
+	byte inline getVisual(int16 x, int16 y) {
+		return (this->*_getPixelPtr)(_visualScreen, x, y);
+	}
+	byte inline getPriority(int16 x, int16 y) {
+		return (this->*_getPixelPtr)(_priorityScreen, x, y);
+	}
+	byte inline getControl(int16 x, int16 y) {
+		return (this->*_getPixelPtr)(_controlScreen, x, y);
+	}
+
 	byte getDrawingMask(byte color, byte prio, byte control);
-	void putPixel(int x, int y, byte drawMask, byte color, byte prio, byte control);
-	void putFontPixel(int startingY, int x, int y, byte color);
-	void putPixelOnDisplay(int x, int y, byte color);
-	void putScaledPixelOnDisplay(int x, int y, byte color);
+	//void putPixel(int16 x, int16 y, byte drawMask, byte color, byte prio, byte control);
+	void putFontPixel(int16 startingY, int16 x, int16 y, byte color);
+	void putPixelOnDisplay(int16 x, int16 y, byte color);
 	void drawLine(Common::Point startPoint, Common::Point endPoint, byte color, byte prio, byte control);
 	void drawLine(int16 left, int16 top, int16 right, int16 bottom, byte color, byte prio, byte control) {
 		drawLine(Common::Point(left, top), Common::Point(right, bottom), color, prio, control);
@@ -101,10 +143,6 @@ public:
 	void enableUndithering(bool flag);
 
 	void putKanjiChar(Graphics::FontSJIS *commonFont, int16 x, int16 y, uint16 chr, byte color);
-	byte getVisual(int x, int y);
-	byte getPriority(int x, int y);
-	byte getControl(int x, int y);
-	byte isFillMatch(int16 x, int16 y, byte drawMask, byte t_color, byte t_pri, byte t_con, bool isEGA);
 
 	int bitsGetDataSize(Common::Rect rect, byte mask);
 	void bitsSave(Common::Rect rect, byte mask, byte *memoryPtr);
@@ -135,9 +173,10 @@ public:
 
 private:
 	uint16 _width;
-	uint16 _pitch;
 	uint16 _height;
 	uint _pixels;
+	uint16 _scriptWidth;
+	uint16 _scriptHeight;
 	uint16 _displayWidth;
 	uint16 _displayHeight;
 	uint _displayPixels;
@@ -190,8 +229,8 @@ private:
 	 * This here holds a translation for vertical+horizontal coordinates between native
 	 * (visual) and actual (display) screen.
 	 */
-	int _upscaledHeightMapping[SCI_SCREEN_UPSCALEDMAXHEIGHT + 1];
-	int _upscaledWidthMapping[SCI_SCREEN_UPSCALEDMAXWIDTH + 1];
+	int16 _upscaledHeightMapping[SCI_SCREEN_UPSCALEDMAXHEIGHT + 1];
+	int16 _upscaledWidthMapping[SCI_SCREEN_UPSCALEDMAXWIDTH + 1];
 
 	/**
 	 * This defines whether or not the font we're drawing is already scaled
@@ -199,7 +238,38 @@ private:
 	 */
 	bool _fontIsUpscaled;
 
-	uint16 getLowResScreenHeight();
+	// dynamic code
+	void (GfxScreen::*_vectorAdjustCoordinatePtr) (int16 *x, int16 *y);
+	void vectorAdjustCoordinateNOP (int16 *x, int16 *y);
+	void vectorAdjustCoordinate480x300Mac (int16 *x, int16 *y);
+
+	void (GfxScreen::*_vectorAdjustLineCoordinatesPtr) (int16 *left, int16 *top, int16 *right, int16 *bottom, byte drawMask, byte color, byte priority, byte control);
+	void vectorAdjustLineCoordinatesNOP (int16 *left, int16 *top, int16 *right, int16 *bottom, byte drawMask, byte color, byte priority, byte control);
+	void vectorAdjustLineCoordinates480x300Mac (int16 *left, int16 *top, int16 *right, int16 *bottom, byte drawMask, byte color, byte priority, byte control);
+	
+	byte (GfxScreen::*_vectorIsFillMatchPtr) (int16 x, int16 y, byte screenMask, byte t_color, byte t_pri, byte t_con, bool isEGA);
+	byte vectorIsFillMatchNormal (int16 x, int16 y, byte screenMask, byte t_color, byte t_pri, byte t_con, bool isEGA);
+	byte vectorIsFillMatch480x300Mac (int16 x, int16 y, byte screenMask, byte t_color, byte t_pri, byte t_con, bool isEGA);
+
+	void (GfxScreen::*_vectorPutPixelPtr) (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+	void vectorPutPixel480x300Mac (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+
+	void (GfxScreen::*_vectorPutLinePixelPtr) (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+	void vectorPutLinePixel480x300Mac (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+
+	byte (GfxScreen::*_vectorGetPixelPtr) (byte *screen, int16 x, int16 y);
+
+	void (GfxScreen::*_putPixelPtr) (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+	void putPixelNormal (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+	void putPixelDisplayUpscaled (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+	void putPixelAllUpscaled (int16 x, int16 y, byte drawMask, byte color, byte priority, byte control);
+
+	byte (GfxScreen::*_getPixelPtr) (byte *screen, int16 x, int16 y);
+	byte getPixelNormal (byte *screen, int16 x, int16 y);
+	byte getPixelUpscaled (byte *screen, int16 x, int16 y);
+
+	// pixel helper
+	void putScaledPixelOnScreen(byte *screen, int16 x, int16 y, byte color);
 };
 
 } // End of namespace Sci
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index 5e7dbc6c15..ccc7a4389a 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -339,10 +339,10 @@ void GfxTransitions::pixelation(bool blackoutFlag) {
 
 	do {
 		mask = (mask & 1) ? (mask >> 1) ^ 0xB400 : mask >> 1;
-		if (mask >= _screen->getWidth() * _screen->getHeight())
+		if (mask >= _screen->getScriptWidth() * _screen->getScriptHeight())
 			continue;
-		pixelRect.left = mask % _screen->getWidth(); pixelRect.right = pixelRect.left + 1;
-		pixelRect.top = mask / _screen->getWidth();	pixelRect.bottom = pixelRect.top + 1;
+		pixelRect.left = mask % _screen->getScriptWidth(); pixelRect.right = pixelRect.left + 1;
+		pixelRect.top = mask / _screen->getScriptWidth();	pixelRect.bottom = pixelRect.top + 1;
 		pixelRect.clip(_picRect);
 		if (!pixelRect.isEmpty())
 			copyRectToScreen(pixelRect, blackoutFlag);
-- 
cgit v1.2.3


From 5594feff2a7a209d62b5ecfba02262680fd27d97 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 9 Nov 2014 17:33:17 +0100
Subject: SCI: Phantasmagoria actually outputs 630x450 now

clipping of video output was required
---
 engines/sci/graphics/frameout.cpp | 10 +++++++++-
 engines/sci/graphics/screen.cpp   | 25 +++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index fafc734895..ccc362dc37 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -524,6 +524,10 @@ void GfxFrameout::showVideo() {
 	RobotDecoder *videoDecoder = g_sci->_robotDecoder;
 	uint16 x = videoDecoder->getPos().x;
 	uint16 y = videoDecoder->getPos().y;
+	uint16 screenWidth = _screen->getWidth();
+	uint16 screenHeight = _screen->getHeight();
+	uint16 outputWidth;
+	uint16 outputHeight;
 
 	if (videoDecoder->hasDirtyPalette())
 		g_system->getPaletteManager()->setPalette(videoDecoder->getPalette(), 0, 256);
@@ -532,7 +536,11 @@ void GfxFrameout::showVideo() {
 		if (videoDecoder->needsUpdate()) {
 			const Graphics::Surface *frame = videoDecoder->decodeNextFrame();
 			if (frame) {
-				g_system->copyRectToScreen(frame->getPixels(), frame->pitch, x, y, frame->w, frame->h);
+				// We need to clip here
+				//  At least Phantasmagoria shows a 640x390 video on a 630x450 screen during the intro
+				outputWidth = frame->w > screenWidth ? screenWidth : frame->w;
+				outputHeight = frame->h > screenHeight ? screenHeight : frame->h;
+				g_system->copyRectToScreen(frame->getPixels(), frame->pitch, x, y, outputWidth, outputHeight);
 
 				if (videoDecoder->hasDirtyPalette())
 					g_system->getPaletteManager()->setPalette(videoDecoder->getPalette(), 0, 256);
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 594c4b3442..8b0e76332f 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -43,6 +43,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	_scriptHeight = 200;
 	_width = 0;
 	_height = 0;
+	_displayWidth = 0;
+	_displayHeight = 0;
 	
 	// King's Quest 6 and Gabriel Knight 1 have hires content, gk1/cd was able
 	// to provide that under DOS as well, but as gk1/floppy does support
@@ -93,19 +95,20 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	}
 #endif
 
-#ifdef ENABLE_SCI32
-	// Phantasmagoria 1 sets a window area of 630x450
-	//if (g_sci->getGameId() == GID_PHANTASMAGORIA) {
-	//	_width = 630;
-	//	_height = 450;
-	//}
-#endif
-
 	if (_resMan->detectHires()) {
 		_scriptWidth = 640;
 		_scriptHeight = 480;
 	}
 
+#ifdef ENABLE_SCI32
+	// Phantasmagoria 1 effectively outputs 630x450
+	//  Coordinate translation has to use this resolution as well
+	if (g_sci->getGameId() == GID_PHANTASMAGORIA) {
+		_width = 630;
+		_height = 450;
+	}
+#endif
+
 	// if not yet set, set those to script-width/height
 	if (!_width)
 		_width = _scriptWidth;
@@ -152,8 +155,10 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 			_upscaledWidthMapping[i] = i * 2;
 		break;
 	default:
-		_displayWidth = _width;
-		_displayHeight = _height;
+		if (!_displayWidth)
+			_displayWidth = _width;
+		if (!_displayHeight)
+			_displayHeight = _height;
 		memset(&_upscaledHeightMapping, 0, sizeof(_upscaledHeightMapping) );
 		memset(&_upscaledWidthMapping, 0, sizeof(_upscaledWidthMapping) );
 		break;
-- 
cgit v1.2.3


From 54a4b2fa863b5fd9469e360ecd7c4b0717b373fe Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sun, 9 Nov 2014 22:19:20 +0100
Subject: PRINCE: Double animation of bird after 'throw a rock' mini-game fix

---
 engines/prince/script.cpp | 11 +++++++++++
 engines/prince/script.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 1e50fe5ec4..4ed3cee6f3 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -722,6 +722,17 @@ void Interpreter::O_PUTBACKANIM() {
 		_vm->_script->installSingleBackAnim(_vm->_backAnimList, slot, room->_backAnim);
 	}
 	delete room;
+
+	// WALKAROUND: fix for turning on 'walking bird' background animation too soon,
+	// after completing 'throw a rock' mini-game in Silmaniona location.
+	// Second bird shouldn't appear when normal animation is still in use
+	// in script lines 13814 and 13848
+	if (_currentInstruction == kSecondBirdAnimationScriptFix) {
+		if (_vm->_normAnimList[1]._state == 0) {
+			_vm->_backAnimList[0].backAnims[0]._state = 1;
+		}
+	}
+
 	debugInterpreter("O_PUTBACKANIM roomId %d, slot %d, animId %d", roomId, slot, animId);
 }
 
diff --git a/engines/prince/script.h b/engines/prince/script.h
index 23c0468d15..fe79cf5f96 100644
--- a/engines/prince/script.h
+++ b/engines/prince/script.h
@@ -242,6 +242,7 @@ private:
 	static OpcodeFunc _opcodes[];
 
 	static const uint kGiveLetterScriptFix = 79002;
+	static const uint kSecondBirdAnimationScriptFix = 45658;
 
 	// Keep opcode handlers names as they are in original code
 	// making it easier to switch back and forth
-- 
cgit v1.2.3


From d0f2e20b62392dc040a61036237cef37e13e6d19 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:25:39 +0600
Subject: ZVISION: Fix rlf backward seek and rename class field

---
 engines/zvision/animation/rlf_animation.cpp | 45 +++++++++++++++++------------
 engines/zvision/animation/rlf_animation.h   |  4 +--
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
index 2bb0271966..5972bdb3ef 100644
--- a/engines/zvision/animation/rlf_animation.cpp
+++ b/engines/zvision/animation/rlf_animation.cpp
@@ -44,7 +44,7 @@ RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _currentFrame(0),
+	  _nextFrame(0),
 	  _frameBufferByteSize(0) {
 
 	Common::File *_file = new Common::File;
@@ -82,7 +82,7 @@ RlfAnimation::RlfAnimation(Common::SeekableReadStream *rstream, bool stream)
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _currentFrame(0),
+	  _nextFrame(0),
 	  _frameBufferByteSize(0) {
 
 	if (!readHeader()) {
@@ -193,23 +193,32 @@ void RlfAnimation::seekToFrame(int frameNumber) {
 	assert(!_stream);
 	assert(frameNumber < (int)_frameCount || frameNumber >= -1);
 
-	if (_currentFrame == frameNumber)
+	if (_nextFrame == frameNumber)
 		return;
 
 	if (frameNumber < 0) {
-		_currentFrame = 0;
+		_nextFrame = 0;
 		return;
 	}
 
-	int closestFrame = _currentFrame;
-	int distance = (int)frameNumber - _currentFrame;
-	for (uint i = 0; i < _completeFrames.size(); ++i) {
-		int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
-		if (newDistance < 0)
-			break;
-		if (newDistance > 0 && newDistance < distance) {
+	int closestFrame = _nextFrame;
+	int distance = (int)frameNumber - _nextFrame;
+
+	if (distance < 0) {
+		for (uint i = 0; i < _completeFrames.size(); ++i) {
+			if ((int)_completeFrames[i] > frameNumber)
+				break;
 			closestFrame = _completeFrames[i];
-			distance = newDistance;
+		}
+	} else {
+		for (uint i = 0; i < _completeFrames.size(); ++i) {
+			int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
+			if (newDistance < 0)
+				break;
+			if (newDistance < distance) {
+				closestFrame = _completeFrames[i];
+				distance = newDistance;
+			}
 		}
 	}
 
@@ -217,7 +226,7 @@ void RlfAnimation::seekToFrame(int frameNumber) {
 		applyFrameToCurrent(i);
 	}
 
-	_currentFrame = frameNumber;
+	_nextFrame = frameNumber;
 }
 
 const Graphics::Surface *RlfAnimation::getFrameData(uint frameNumber) {
@@ -226,9 +235,9 @@ const Graphics::Surface *RlfAnimation::getFrameData(uint frameNumber) {
 
 	// Since this method is so expensive, first check to see if we can use
 	// decodeNextFrame() it's cheap.
-	if ((int)frameNumber == _currentFrame - 1) {
+	if ((int)frameNumber == _nextFrame - 1) {
 		return &_currentFrameBuffer;
-	} else if (_currentFrame == (int)frameNumber) {
+	} else if (_nextFrame == (int)frameNumber) {
 		return decodeNextFrame();
 	}
 
@@ -237,15 +246,15 @@ const Graphics::Surface *RlfAnimation::getFrameData(uint frameNumber) {
 }
 
 const Graphics::Surface *RlfAnimation::decodeNextFrame() {
-	assert(_currentFrame < (int)_frameCount);
+	assert(_nextFrame < (int)_frameCount);
 
 	if (_stream) {
 		applyFrameToCurrent(readNextFrame());
 	} else {
-		applyFrameToCurrent(_currentFrame);
+		applyFrameToCurrent(_nextFrame);
 	}
 
-	_currentFrame++;
+	_nextFrame++;
 	return &_currentFrameBuffer;
 }
 
diff --git a/engines/zvision/animation/rlf_animation.h b/engines/zvision/animation/rlf_animation.h
index dfb2a60109..00c2e9b3d5 100644
--- a/engines/zvision/animation/rlf_animation.h
+++ b/engines/zvision/animation/rlf_animation.h
@@ -64,7 +64,7 @@ private:
 	Frame *_frames;
 	Common::Array<uint> _completeFrames;
 
-	int _currentFrame;
+	int _nextFrame;
 	Graphics::Surface _currentFrameBuffer;
 	uint32 _frameBufferByteSize;
 
@@ -113,7 +113,7 @@ public:
 	 * @return Is the currentFrame is the last frame in the animation?
 	 */
 	bool endOfAnimation() {
-		return _currentFrame == (int)_frameCount;
+		return _nextFrame == (int)_frameCount;
 	}
 
 private:
-- 
cgit v1.2.3


From 51a9ec80df468757902cd85a5ab2a32856148d29 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:30:13 +0600
Subject: ZVISION: Implement ZeroPoint for panorama renderer

---
 engines/zvision/graphics/render_table.cpp | 9 +++++++++
 engines/zvision/graphics/render_table.h   | 3 +++
 engines/zvision/scripting/control.cpp     | 4 +++-
 engines/zvision/zvision.cpp               | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index aeba729196..bb095f0c9a 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -52,6 +52,7 @@ void RenderTable::setRenderState(RenderState newState) {
 		_panoramaOptions.fieldOfView = 27.0f;
 		_panoramaOptions.linearScale = 0.55f;
 		_panoramaOptions.reverse = false;
+		_panoramaOptions.zeroPoint = 0;
 		break;
 	case TILT:
 		_tiltOptions.fieldOfView = 27.0f;
@@ -244,6 +245,14 @@ void RenderTable::setPanoramaReverse(bool reverse) {
 	_panoramaOptions.reverse = reverse;
 }
 
+void RenderTable::setPanoramaZeroPoint(uint16 point) {
+	_panoramaOptions.zeroPoint = point;
+}
+
+uint16 RenderTable::getPanoramaZeroPoint() {
+	return _panoramaOptions.zeroPoint;
+}
+
 void RenderTable::setTiltFoV(float fov) {
 	assert(fov > 0.0f);
 
diff --git a/engines/zvision/graphics/render_table.h b/engines/zvision/graphics/render_table.h
index 7153738c6f..2e3fd8ec33 100644
--- a/engines/zvision/graphics/render_table.h
+++ b/engines/zvision/graphics/render_table.h
@@ -50,6 +50,7 @@ private:
 		float fieldOfView;
 		float linearScale;
 		bool reverse;
+		uint16 zeroPoint;
 	} _panoramaOptions;
 
 	// TODO: See if tilt and panorama need to have separate options
@@ -75,6 +76,8 @@ public:
 	void setPanoramaFoV(float fov);
 	void setPanoramaScale(float scale);
 	void setPanoramaReverse(bool reverse);
+	void setPanoramaZeroPoint(uint16 point);
+	uint16 getPanoramaZeroPoint();
 
 	void setTiltFoV(float fov);
 	void setTiltScale(float scale);
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index ae717d6f8d..4567495725 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -61,7 +61,9 @@ void Control::parsePanoramaControl(ZVision *engine, Common::SeekableReadStream &
 				renderTable->setPanoramaReverse(true);
 			}
 		} else if (line.matchString("zeropoint*", true)) {
-			// TODO: Implement
+			uint point;
+			sscanf(line.c_str(), "zeropoint(%u)", &point);
+			renderTable->setPanoramaZeroPoint(point);
 		}
 
 		line = stream.readLine();
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 4f05edaefd..606e712cd0 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -370,7 +370,7 @@ void ZVision::updateRotation() {
 
 			int16 new_pos = st_pos + _velocity * (1 - 2 * 0);
 
-			int16 zero_point = 0;
+			int16 zero_point = _renderManager->getRenderTable()->getPanoramaZeroPoint();
 			if (st_pos >= zero_point && new_pos < zero_point)
 				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) - 1);
 			if (st_pos <= zero_point && new_pos > zero_point)
-- 
cgit v1.2.3


From 54917582eb60c28c093cf84d78f5641a8ea02ea8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:31:48 +0600
Subject: ZVISION: Implement missing action - cursor

---
 engines/zvision/scripting/actions.cpp           | 33 +++++++++++++++++++++++++
 engines/zvision/scripting/actions.h             |  9 +++++++
 engines/zvision/scripting/scr_file_handling.cpp |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 04f318b84e..f27427caa9 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -43,6 +43,7 @@
 #include "zvision/graphics/effects/light.h"
 #include "zvision/graphics/effects/wave.h"
 #include "zvision/core/save_manager.h"
+#include "zvision/cursors/cursor_manager.h"
 
 #include "common/file.h"
 
@@ -161,6 +162,38 @@ bool ActionCrossfade::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionCursor
+//////////////////////////////////////////////////////////////////////////////
+
+ActionCursor::ActionCursor(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	Common::String up = line;
+	up.toUppercase();
+	_action = 0;
+
+	if (up[0] == 'B')
+		_action = 2;
+	else if (up[0] == 'I')
+		_action = 3;
+	else if (up[0] == 'U')
+		_action = 0;
+	else if (up[0] == 'H')
+		_action = 1;
+}
+
+bool ActionCursor::execute() {
+	switch (_action) {
+	case 1:
+		_engine->getCursorManager()->showMouse(false);
+		break;
+	default:
+		_engine->getCursorManager()->showMouse(true);
+		break;
+	}
+	return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionDelayRender
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index a6b5aa1290..5401af0876 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -148,6 +148,15 @@ private:
 	int32 _timeInMillis;
 };
 
+class ActionCursor : public ResultAction {
+public:
+	ActionCursor(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	uint8 _action;
+};
+
 class ActionDebug : public ResultAction {
 public:
 	ActionDebug(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index de092183c6..5e0387f0d9 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -229,6 +229,8 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 					actionList.push_back(new ActionChangeLocation(_engine, slot, args));
 				} else if (act.matchString("crossfade", true)) {
 					actionList.push_back(new ActionCrossfade(_engine, slot, args));
+				} else if (act.matchString("cursor", true)) {
+					actionList.push_back(new ActionCursor(_engine, slot, args));
 				} else if (act.matchString("debug", true)) {
 					// Not used. Purposely left empty
 				} else if (act.matchString("delay_render", true)) {
-- 
cgit v1.2.3


From 6f6d5fc24eb66b893f9871e773b9bd2632ab5ca5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:34:01 +0600
Subject: ZVISION: Hide mouse cursor while streamvideo is working

---
 engines/zvision/scripting/actions.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index f27427caa9..eb6b09308b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -899,6 +899,8 @@ bool ActionStreamVideo::execute() {
 			return true;
 		}
 
+		_engine->getCursorManager()->showMouse(false);
+
 		Common::Rect destRect = Common::Rect(_x1, _y1, _x2 + 1, _y2 + 1);
 
 		Common::String subname = _fileName;
@@ -913,6 +915,8 @@ bool ActionStreamVideo::execute() {
 
 		_engine->playVideo(decoder, destRect, _skippable, sub);
 
+		_engine->getCursorManager()->showMouse(true);
+
 		if (sub)
 			delete sub;
 	}
-- 
cgit v1.2.3


From 7d92b44e09809f559db96ec029a6258d23d84fd0 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:36:30 +0600
Subject: ZVISION: Nemesis and GI has difference in set_partial_screen color
 mask

---
 engines/zvision/graphics/render_manager.cpp | 10 ++++++++++
 engines/zvision/graphics/render_manager.h   |  2 ++
 engines/zvision/scripting/actions.cpp       | 18 ++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 8411f190a7..3e146939e3 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -149,6 +149,16 @@ void RenderManager::renderImageToBackground(const Common::String &fileName, int1
 	surface.free();
 }
 
+void RenderManager::renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, int16  keyX, int16 keyY) {
+	Graphics::Surface surface;
+	readImageToSurface(fileName, surface);
+
+	uint16 keycolor = *(uint16 *)surface.getBasePtr(keyX, keyY);
+
+	blitSurfaceToBkg(surface, destX, destY, keycolor);
+	surface.free();
+}
+
 void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination) {
 	Common::File file;
 
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index ae24ce4f58..d34ecf8ce0 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -185,6 +185,8 @@ public:
 	 */
 	void renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, uint32 colorkey);
 
+	void renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, int16 keyX, int16 keyY);
+
 	/**
 	 * Sets the current background image to be used by the RenderManager and immediately
 	 * blits it to the screen. (It won't show up until the end of the frame)
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index eb6b09308b..31f68d7953 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -815,10 +815,20 @@ ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, int32 slotkey, c
 
 bool ActionSetPartialScreen::execute() {
 	RenderManager *renderManager = _engine->getRenderManager();
-	if (_backgroundColor >= 0)
-		renderManager->renderImageToBackground(_fileName, _x, _y, _backgroundColor);
-	else
-		renderManager->renderImageToBackground(_fileName, _x, _y);
+
+	if (_engine->getGameId() == GID_NEMESIS) {
+		if (_backgroundColor)
+			renderManager->renderImageToBackground(_fileName, _x, _y, 0, 0);
+		else
+			renderManager->renderImageToBackground(_fileName, _x, _y);
+	} else {
+		if (_backgroundColor >= 0)
+			renderManager->renderImageToBackground(_fileName, _x, _y, _backgroundColor);
+		else if (_backgroundColor == -2)
+			renderManager->renderImageToBackground(_fileName, _x, _y, 0, 0);
+		else
+			renderManager->renderImageToBackground(_fileName, _x, _y);
+	}
 
 	return true;
 }
-- 
cgit v1.2.3


From 42bc6c5daf132b3656f04759aa1fa615fe7b26f6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:37:57 +0600
Subject: ZVISION: Fix incorrect usage of Common::String::format

---
 engines/zvision/core/save_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 6e8b6b5ff3..2797b940a0 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -219,9 +219,9 @@ Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
 		// Try to load standart save file
 		Common::String filename;
 		if (_engine->getGameId() == GID_GRANDINQUISITOR)
-			filename.format("inqsav%u.sav", slot);
+			filename = Common::String::format("inqsav%u.sav", slot);
 		else if (_engine->getGameId() == GID_NEMESIS)
-			filename.format("nemsav%u.sav", slot);
+			filename = Common::String::format("nemsav%u.sav", slot);
 
 		saveFile = _engine->getSearchManager()->openFile(filename);
 		if (saveFile == NULL) {
-- 
cgit v1.2.3


From f55f4af2937f77c3dc9760b000d2e4806477c1a0 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:38:29 +0600
Subject: ZVISION: Fix code style in save_manager.h

---
 engines/zvision/core/save_manager.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/save_manager.h b/engines/zvision/core/save_manager.h
index c7c1297062..5cd61c7aa9 100644
--- a/engines/zvision/core/save_manager.h
+++ b/engines/zvision/core/save_manager.h
@@ -49,7 +49,9 @@ struct SaveGameHeader {
 class SaveManager {
 public:
 	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL) {}
-	~SaveManager() { flushSaveBuffer(); }
+	~SaveManager() {
+		flushSaveBuffer();
+	}
 
 private:
 	ZVision *_engine;
-- 
cgit v1.2.3


From 9b88ab15dfff651007f9c6bcad1f5e646a4fa662 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:40:29 +0600
Subject: ZVISION: Make strings const in functions declaration

---
 engines/zvision/cursors/cursor_manager.cpp | 2 +-
 engines/zvision/cursors/cursor_manager.h   | 2 +-
 engines/zvision/scripting/control.cpp      | 2 +-
 engines/zvision/scripting/control.h        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/cursors/cursor_manager.cpp b/engines/zvision/cursors/cursor_manager.cpp
index cfb4baf636..564ffd25c5 100644
--- a/engines/zvision/cursors/cursor_manager.cpp
+++ b/engines/zvision/cursors/cursor_manager.cpp
@@ -140,7 +140,7 @@ void CursorManager::changeCursor(int id) {
 	}
 }
 
-int CursorManager::getCursorId(Common::String &name) {
+int CursorManager::getCursorId(const Common::String &name) {
 	for (int i = 0; i < NUM_CURSORS; i++)
 		if (name.equals(_cursorNames[i]))
 			return i;
diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h
index 5392fd5e03..a6f77cec64 100644
--- a/engines/zvision/cursors/cursor_manager.h
+++ b/engines/zvision/cursors/cursor_manager.h
@@ -97,7 +97,7 @@ public:
 	 * @return        Id of cursor or idle cursor id if not found
 	 */
 
-	int getCursorId(Common::String &name);
+	int getCursorId(const Common::String &name);
 
 	/**
 	 * Load cursor for item by id, and try to change cursor to item cursor if it's not 0
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index 4567495725..c746f00831 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -105,7 +105,7 @@ void Control::parseTiltControl(ZVision *engine, Common::SeekableReadStream &stre
 	renderTable->generateRenderTable();
 }
 
-void Control::getParams(Common::String &input_str, Common::String &parameter, Common::String &values) {
+void Control::getParams(const Common::String &input_str, Common::String &parameter, Common::String &values) {
 	const char *chrs = input_str.c_str();
 	uint lbr;
 
diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 8708f033af..28c7348d98 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -127,7 +127,7 @@ protected:
 	uint32 _key;
 	int32 _venus_id;
 
-	void getParams(Common::String &input_str, Common::String &parameter, Common::String &values);
+	void getParams(const Common::String &input_str, Common::String &parameter, Common::String &values);
 // Static member functions
 public:
 	static void parseFlatControl(ZVision *engine);
-- 
cgit v1.2.3


From 9e9b89071f9a07e2784bf52ef976d6560bf56e67 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:43:04 +0600
Subject: ZVISION: Implement function for convertion of scummvm KeyCode to win
 vkKey

---
 engines/zvision/module.mk            |   1 +
 engines/zvision/utility/win_keys.cpp | 129 +++++++++++++++++++++++++++++++++++
 engines/zvision/utility/win_keys.h   |  32 +++++++++
 3 files changed, 162 insertions(+)
 create mode 100644 engines/zvision/utility/win_keys.cpp
 create mode 100644 engines/zvision/utility/win_keys.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 1730bbc512..199f96bf47 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -50,6 +50,7 @@ MODULE_OBJS := \
 	utility/lzss_read_stream.o \
 	utility/single_value_container.o \
 	utility/utility.o \
+	utility/win_keys.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o 
diff --git a/engines/zvision/utility/win_keys.cpp b/engines/zvision/utility/win_keys.cpp
new file mode 100644
index 0000000000..3441fb8bf0
--- /dev/null
+++ b/engines/zvision/utility/win_keys.cpp
@@ -0,0 +1,129 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/keyboard.h"
+
+namespace ZVision {
+
+uint8 VKkey(Common::KeyCode scumm_key) {
+	if (scumm_key >= Common::KEYCODE_a && scumm_key <= Common::KEYCODE_z)
+		return 0x41 + scumm_key - Common::KEYCODE_a;
+	if (scumm_key >= Common::KEYCODE_0 && scumm_key <= Common::KEYCODE_9)
+		return 0x30 + scumm_key - Common::KEYCODE_0;
+	if (scumm_key >= Common::KEYCODE_F1 && scumm_key <= Common::KEYCODE_F15)
+		return 0x70 + scumm_key - Common::KEYCODE_F1;
+	if (scumm_key >= Common::KEYCODE_KP0 && scumm_key <= Common::KEYCODE_KP9)
+		return 0x60 + scumm_key - Common::KEYCODE_KP0;
+
+	switch (scumm_key) {
+	case Common::KEYCODE_BACKSPACE:
+		return 0x8;
+	case Common::KEYCODE_TAB:
+		return 0x9;
+	case Common::KEYCODE_CLEAR:
+		return 0xC;
+	case Common::KEYCODE_RETURN:
+		return 0xD;
+	case Common::KEYCODE_CAPSLOCK:
+		return 0x14;
+	case Common::KEYCODE_ESCAPE:
+		return 0x1B;
+	case Common::KEYCODE_SPACE:
+		return 0x20;
+	case Common::KEYCODE_PAGEUP:
+		return 0x21;
+	case Common::KEYCODE_PAGEDOWN:
+		return 0x22;
+	case Common::KEYCODE_END:
+		return 0x23;
+	case Common::KEYCODE_HOME:
+		return 0x24;
+	case Common::KEYCODE_LEFT:
+		return 0x25;
+	case Common::KEYCODE_UP:
+		return 0x26;
+	case Common::KEYCODE_RIGHT:
+		return 0x27;
+	case Common::KEYCODE_DOWN:
+		return 0x28;
+	case Common::KEYCODE_PRINT:
+		return 0x2A;
+	case Common::KEYCODE_INSERT:
+		return 0x2D;
+	case Common::KEYCODE_DELETE:
+		return 0x2E;
+	case Common::KEYCODE_HELP:
+		return 0x2F;
+	case Common::KEYCODE_KP_MULTIPLY:
+		return 0x6A;
+	case Common::KEYCODE_KP_PLUS:
+		return 0x6B;
+	case Common::KEYCODE_KP_MINUS:
+		return 0x6D;
+	case Common::KEYCODE_KP_PERIOD:
+		return 0x6E;
+	case Common::KEYCODE_KP_DIVIDE:
+		return 0x6F;
+	case Common::KEYCODE_NUMLOCK:
+		return 0x90;
+	case Common::KEYCODE_SCROLLOCK:
+		return 0x91;
+	case Common::KEYCODE_LSHIFT:
+		return 0xA0;
+	case Common::KEYCODE_RSHIFT:
+		return 0xA1;
+	case Common::KEYCODE_LCTRL:
+		return 0xA2;
+	case Common::KEYCODE_RCTRL:
+		return 0xA3;
+	case Common::KEYCODE_MENU:
+		return 0xA5;
+	case Common::KEYCODE_LEFTBRACKET:
+		return 0xDB;
+	case Common::KEYCODE_RIGHTBRACKET:
+		return 0xDD;
+	case Common::KEYCODE_SEMICOLON:
+		return 0xBA;
+	case Common::KEYCODE_BACKSLASH:
+		return 0xDC;
+	case Common::KEYCODE_QUOTE:
+		return 0xDE;
+	case Common::KEYCODE_SLASH:
+		return 0xBF;
+	case Common::KEYCODE_TILDE:
+		return 0xC0;
+	case Common::KEYCODE_COMMA:
+		return 0xBC;
+	case Common::KEYCODE_PERIOD:
+		return 0xBE;
+	case Common::KEYCODE_MINUS:
+		return 0xBD;
+	case Common::KEYCODE_PLUS:
+		return 0xBB;
+	default:
+		return 0;
+	}
+
+	return 0;
+}
+
+}
diff --git a/engines/zvision/utility/win_keys.h b/engines/zvision/utility/win_keys.h
new file mode 100644
index 0000000000..a79a03a07b
--- /dev/null
+++ b/engines/zvision/utility/win_keys.h
@@ -0,0 +1,32 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_WINKEY_H
+#define ZVISION_WINKEY_H
+
+#include "common/keyboard.h"
+
+namespace ZVision {
+uint8 VKkey(Common::KeyCode scumm_key);
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From c79ac80b0c73b86fa665dd439fa30cb3ca709785 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:47:12 +0600
Subject: ZVISION: Implement quit function with reminder

---
 engines/zvision/zvision.cpp | 7 +++++++
 engines/zvision/zvision.h   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 606e712cd0..b697405c63 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -459,4 +459,11 @@ void ZVision::menuBarEnable(uint16 menus) {
 		_menu->setEnable(menus);
 }
 
+bool ZVision::ifQuit() {
+	if (askQuestion(_stringManager->getTextLine(StringManager::ZVISION_STR_EXITPROMT))) {
+		quitGame();
+		return true;
+	}
+	return false;
+}
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index def9bbbdfb..e1a94db618 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -187,6 +187,8 @@ public:
 
 	void menuBarEnable(uint16 menus);
 
+	bool ifQuit();
+
 private:
 	void initialize();
 	void initFonts();
-- 
cgit v1.2.3


From fcbb3d0307d8423399a41cef8f8cbaec062018db Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 14:48:32 +0600
Subject: ZVISION: Use ifQuit for menu bars

---
 engines/zvision/core/menu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
index bf311c4577..57a1983784 100644
--- a/engines/zvision/core/menu.cpp
+++ b/engines/zvision/core/menu.cpp
@@ -174,7 +174,7 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 				                 scrollPos[menu_MAIN],
 				                 320 + 135 + 135,
 				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					// ifquit();
+					_engine->ifQuit();
 				}
 
 			// Settings
@@ -591,7 +591,7 @@ void menuNem::onMouseUp(const Common::Point &Pos) {
 			                 scrollPos,
 			                 buts[3][0] + buts[3][1],
 			                 scrollPos + 32).contains(Pos)) {
-				// ifquit();
+				_engine->ifQuit();
 				frm = 5;
 				redraw = true;
 			}
-- 
cgit v1.2.3


From f658a5c8e6a92341efc7ec15ec0f875b1cc7eb93 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:34:55 +0600
Subject: ZVISION: Implement methods for get state of menu items

---
 engines/zvision/core/menu.h | 3 +++
 engines/zvision/zvision.cpp | 6 ++++++
 engines/zvision/zvision.h   | 1 +
 3 files changed, 10 insertions(+)

diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
index 7e6acf325c..c2ea822dd9 100644
--- a/engines/zvision/core/menu.h
+++ b/engines/zvision/core/menu.h
@@ -52,6 +52,9 @@ public:
 	void setEnable(uint16 flags) {
 		menu_bar_flag = flags;
 	}
+	uint16 getEnable() {
+		return menu_bar_flag;
+	}
 protected:
 	uint16 menu_bar_flag;
 	ZVision *_engine;
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b697405c63..c5d5fdc58b 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -459,6 +459,12 @@ void ZVision::menuBarEnable(uint16 menus) {
 		_menu->setEnable(menus);
 }
 
+uint16 ZVision::getMenuBarEnable() {
+	if (_menu)
+		return _menu->getEnable();
+	return 0;
+}
+
 bool ZVision::ifQuit() {
 	if (askQuestion(_stringManager->getTextLine(StringManager::ZVISION_STR_EXITPROMT))) {
 		quitGame();
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index e1a94db618..8b9b67303e 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -186,6 +186,7 @@ public:
 	void saveSettings();
 
 	void menuBarEnable(uint16 menus);
+	uint16 getMenuBarEnable();
 
 	bool ifQuit();
 
-- 
cgit v1.2.3


From db5e2adc5828a4bf888959ebd520bb43e89996fe Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:40:54 +0600
Subject: ZVISION: Implement method for visual output of some info

---
 engines/zvision/zvision.cpp | 6 ++++++
 engines/zvision/zvision.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index c5d5fdc58b..0b03cc351d 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -472,4 +472,10 @@ bool ZVision::ifQuit() {
 	}
 	return false;
 }
+void ZVision::showDebugMsg(const Common::String &msg, int16 delay) {
+	uint16 msgid = _renderManager->createSubArea();
+	_renderManager->updateSubArea(msgid, msg);
+	_renderManager->deleteSubArea(msgid, delay);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 8b9b67303e..3c9e26b5ec 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -190,6 +190,8 @@ public:
 
 	bool ifQuit();
 
+	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
+
 private:
 	void initialize();
 	void initFonts();
-- 
cgit v1.2.3


From 8e112edb1a7d8d1d579a235bda18b58ffcc18b8c Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:47:27 +0600
Subject: ZVISION: Implement Easter eggs and debug cheats

---
 engines/zvision/core/events.cpp | 92 ++++++++++++++++++++++++++++++++++++++++-
 engines/zvision/zvision.cpp     | 30 ++++++++++++++
 engines/zvision/zvision.h       | 11 ++++-
 3 files changed, 130 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index c977125f55..97565dd4d7 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -30,6 +30,8 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/animation/rlf_animation.h"
 #include "zvision/core/menu.h"
+#include "zvision/utility/win_keys.h"
+#include "zvision/sound/zork_raw.h"
 
 #include "common/events.h"
 #include "common/system.h"
@@ -40,6 +42,86 @@
 
 namespace ZVision {
 
+void ZVision::cheatCodes(uint8 key) {
+	pushKeyToCheatBuf(key);
+
+	if (getGameId() == GID_GRANDINQUISITOR) {
+
+		if (checkCode("IMNOTDEAF")) {
+			// Unknow cheat
+			showDebugMsg(Common::String::format("IMNOTDEAF cheat or debug, not implemented"));
+		}
+
+		if (checkCode("3100OPB")) {
+			showDebugMsg(Common::String::format("Current location: %c%c%c%c",
+			                                    _scriptManager->getStateValue(StateKey_World),
+			                                    _scriptManager->getStateValue(StateKey_Room),
+			                                    _scriptManager->getStateValue(StateKey_Node),
+			                                    _scriptManager->getStateValue(StateKey_View)));
+		}
+
+		if (checkCode("KILLMENOW")) {
+			_scriptManager->changeLocation('g', 'j', 'd', 'e', 0);
+			_scriptManager->setStateValue(2201, 35);
+		}
+
+		if (checkCode("MIKESPANTS")) {
+			_scriptManager->changeLocation('g', 'j', 't', 'm', 0);
+		}
+	} else if (getGameId() == GID_NEMESIS) {
+
+		if (checkCode("CHLOE")) {
+			_scriptManager->changeLocation('t', 'm', '2', 'g', 0);
+			_scriptManager->setStateValue(224, 1);
+		}
+
+		if (checkCode("77MASSAVE")) {
+			showDebugMsg(Common::String::format("Current location: %c%c%c%c",
+			                                    _scriptManager->getStateValue(StateKey_World),
+			                                    _scriptManager->getStateValue(StateKey_Room),
+			                                    _scriptManager->getStateValue(StateKey_Node),
+			                                    _scriptManager->getStateValue(StateKey_View)));
+		}
+
+		if (checkCode("IDKFA")) {
+			_scriptManager->changeLocation('t', 'w', '3', 'f', 0);
+			_scriptManager->setStateValue(249, 1);
+		}
+
+		if (checkCode("309NEWDORMA")) {
+			_scriptManager->changeLocation('g', 'j', 'g', 'j', 0);
+		}
+
+		if (checkCode("HELLOSAILOR")) {
+			Location loc = _scriptManager->getCurrentLocation();
+			Audio::AudioStream *soundStream;
+			if (loc.world == 'v' && loc.room == 'b' && loc.node == '1' && loc.view == '0') {
+				soundStream = makeRawZorkStream("v000hpta.raw", this);
+			} else {
+				soundStream = makeRawZorkStream("v000hnta.raw", this);
+			}
+			Audio::SoundHandle handle;
+			_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, soundStream);
+		}
+	}
+
+	if (checkCode("FRAME"))
+		showDebugMsg(Common::String::format("FPS: ???, not implemented"));
+
+	if (checkCode("XYZZY"))
+		_scriptManager->setStateValue(StateKey_DebugCheats, 1 - _scriptManager->getStateValue(StateKey_DebugCheats));
+
+	if (checkCode("COMPUTERARCH"))
+		showDebugMsg(Common::String::format("COMPUTERARCH: var-viewer not implemented"));
+
+	if (_scriptManager->getStateValue(StateKey_DebugCheats) == 1)
+		if (checkCode("GO????"))
+			_scriptManager->changeLocation(getBufferedKey(3),
+			                               getBufferedKey(2),
+			                               getBufferedKey(1),
+			                               getBufferedKey(0), 0);
+}
+
 void ZVision::processEvents() {
 	while (_eventMan->pollEvent(_event)) {
 		switch (_event.type) {
@@ -72,7 +154,7 @@ void ZVision::processEvents() {
 			onMouseMove(_event.mouse);
 			break;
 
-		case Common::EVENT_KEYDOWN:
+		case Common::EVENT_KEYDOWN: {
 			switch (_event.kbd.keycode) {
 			case Common::KEYCODE_d:
 				if (_event.kbd.hasFlags(Common::KBD_CTRL)) {
@@ -89,8 +171,14 @@ void ZVision::processEvents() {
 				break;
 			}
 
+			uint8 vkKey = VKkey(_event.kbd.keycode);
+
+			_scriptManager->setStateValue(StateKey_KeyPress, vkKey);
+
 			_scriptManager->addEvent(_event);
-			break;
+			cheatCodes(vkKey);
+		}
+		break;
 		case Common::EVENT_KEYUP:
 			_scriptManager->addEvent(_event);
 			break;
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 0b03cc351d..3518e01d68 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -100,6 +100,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _velocity(0) {
 
 	debug(1, "ZVision::ZVision");
+
+	memset(_cheatBuff, 0, sizeof(_cheatBuff));
 }
 
 ZVision::~ZVision() {
@@ -472,6 +474,34 @@ bool ZVision::ifQuit() {
 	}
 	return false;
 }
+
+void ZVision::pushKeyToCheatBuf(uint8 key) {
+	for (int i = 0; i < KEYBUF_SIZE - 1; i++)
+		_cheatBuff[i] = _cheatBuff[i + 1];
+
+	_cheatBuff[KEYBUF_SIZE - 1] = key;
+}
+
+bool ZVision::checkCode(const char *code) {
+	int codeLen = strlen(code);
+
+	if (codeLen > KEYBUF_SIZE)
+		return false;
+
+	for (int i = 0; i < codeLen; i++)
+		if (code[i] != _cheatBuff[KEYBUF_SIZE - codeLen + i] && code[i] != '?')
+			return false;
+
+	return true;
+}
+
+uint8 ZVision::getBufferedKey(uint8 pos) {
+	if (pos >= KEYBUF_SIZE)
+		return 0;
+	else
+		return _cheatBuff[KEYBUF_SIZE - pos - 1];
+}
+
 void ZVision::showDebugMsg(const Common::String &msg, int16 delay) {
 	uint16 msgid = _renderManager->createSubArea();
 	_renderManager->updateSubArea(msgid, msg);
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 3c9e26b5ec..041a8574a6 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -85,7 +85,9 @@ private:
 		WORKING_WINDOW_HEIGHT = 344,
 
 		ROTATION_SCREEN_EDGE_OFFSET = 60,
-		MAX_ROTATION_SPEED = 400 // Pixels per second
+		MAX_ROTATION_SPEED = 400, // Pixels per second
+
+		KEYBUF_SIZE = 20
 	};
 
 	Console *_console;
@@ -122,6 +124,8 @@ private:
 	int _rendDelay;
 	int16 _velocity;
 	bool _halveDelay;
+
+	uint8 _cheatBuff[KEYBUF_SIZE];
 public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
@@ -205,6 +209,11 @@ private:
 	void updateRotation();
 
 	void registerDefaultSettings();
+
+	void cheatCodes(uint8 key);
+	void pushKeyToCheatBuf(uint8 key);
+	bool checkCode(const char *code);
+	uint8 getBufferedKey(uint8 pos);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From c4911135c152b9f7eb082dee1af79d82932e72c0 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:50:18 +0600
Subject: ZVISION: Implement keyboard hotkeys

---
 engines/zvision/core/events.cpp | 27 +++++++++++++++++++++++++++
 engines/zvision/zvision.h       |  1 +
 2 files changed, 28 insertions(+)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 97565dd4d7..72e3fa6d34 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -31,6 +31,7 @@
 #include "zvision/animation/rlf_animation.h"
 #include "zvision/core/menu.h"
 #include "zvision/utility/win_keys.h"
+#include "zvision/core/menu.h"
 #include "zvision/sound/zork_raw.h"
 
 #include "common/events.h"
@@ -42,6 +43,31 @@
 
 namespace ZVision {
 
+void ZVision::shortKeys(Common::Event event) {
+	if (event.kbd.hasFlags(Common::KBD_CTRL)) {
+		switch (event.kbd.keycode) {
+		case Common::KEYCODE_s:
+			if (getMenuBarEnable() & menuBar_Save)
+				_scriptManager->changeLocation('g', 'j', 's', 'e', 0);
+			break;
+		case Common::KEYCODE_r:
+			if (getMenuBarEnable() & menuBar_Restore)
+				_scriptManager->changeLocation('g', 'j', 'r', 'e', 0);
+			break;
+		case Common::KEYCODE_p:
+			if (getMenuBarEnable() & menuBar_Settings)
+				_scriptManager->changeLocation('g', 'j', 'p', 'e', 0);
+			break;
+		case Common::KEYCODE_q:
+			if (getMenuBarEnable() & menuBar_Exit)
+				ifQuit();
+			break;
+		default:
+			break;
+		}
+	}
+}
+
 void ZVision::cheatCodes(uint8 key) {
 	pushKeyToCheatBuf(key);
 
@@ -176,6 +202,7 @@ void ZVision::processEvents() {
 			_scriptManager->setStateValue(StateKey_KeyPress, vkKey);
 
 			_scriptManager->addEvent(_event);
+			shortKeys(_event);
 			cheatCodes(vkKey);
 		}
 		break;
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 041a8574a6..8564e4e26b 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -209,6 +209,7 @@ private:
 	void updateRotation();
 
 	void registerDefaultSettings();
+	void shortKeys(Common::Event);
 
 	void cheatCodes(uint8 key);
 	void pushKeyToCheatBuf(uint8 key);
-- 
cgit v1.2.3


From e57c358cead20cbf75332a15c4961ff6c15abf6a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:52:20 +0600
Subject: ZVISION: Implement method for getting panorama reverse flag

---
 engines/zvision/graphics/render_table.cpp | 4 ++++
 engines/zvision/graphics/render_table.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index bb095f0c9a..629cbde3cf 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -245,6 +245,10 @@ void RenderTable::setPanoramaReverse(bool reverse) {
 	_panoramaOptions.reverse = reverse;
 }
 
+bool RenderTable::getPanoramaReverse() {
+	return _panoramaOptions.reverse;
+}
+
 void RenderTable::setPanoramaZeroPoint(uint16 point) {
 	_panoramaOptions.zeroPoint = point;
 }
diff --git a/engines/zvision/graphics/render_table.h b/engines/zvision/graphics/render_table.h
index 2e3fd8ec33..f061b3b0d6 100644
--- a/engines/zvision/graphics/render_table.h
+++ b/engines/zvision/graphics/render_table.h
@@ -78,6 +78,7 @@ public:
 	void setPanoramaReverse(bool reverse);
 	void setPanoramaZeroPoint(uint16 point);
 	uint16 getPanoramaZeroPoint();
+	bool getPanoramaReverse();
 
 	void setTiltFoV(float fov);
 	void setTiltScale(float scale);
-- 
cgit v1.2.3


From 1f0bf5ecf2f3eb1c65019d196f7327a0874f93bb Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:55:10 +0600
Subject: ZVISION: Implement code for pan from keyboard and mouse

---
 engines/zvision/core/events.cpp | 46 ++++++++++++++++++++++++++++++++++-------
 engines/zvision/zvision.cpp     | 12 ++++++++---
 engines/zvision/zvision.h       |  3 ++-
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 72e3fa6d34..38ceb5ceb4 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -189,10 +189,26 @@ void ZVision::processEvents() {
 					_console->onFrame();
 				}
 				break;
+
+			case Common::KEYCODE_LEFT:
+			case Common::KEYCODE_RIGHT:
+				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::PANORAMA)
+					_kbdVelocity = (_event.kbd.keycode == Common::KEYCODE_LEFT ?
+					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
+					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
 			case Common::KEYCODE_q:
 				if (_event.kbd.hasFlags(Common::KBD_CTRL))
 					quitGame();
 				break;
+
+			case Common::KEYCODE_UP:
+			case Common::KEYCODE_DOWN:
+				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::TILT)
+					_kbdVelocity = (_event.kbd.keycode == Common::KEYCODE_UP ?
+					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
+					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
+				break;
+
 			default:
 				break;
 			}
@@ -208,6 +224,20 @@ void ZVision::processEvents() {
 		break;
 		case Common::EVENT_KEYUP:
 			_scriptManager->addEvent(_event);
+			switch (_event.kbd.keycode) {
+			case Common::KEYCODE_LEFT:
+			case Common::KEYCODE_RIGHT:
+				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::PANORAMA)
+					_kbdVelocity = 0;
+				break;
+			case Common::KEYCODE_UP:
+			case Common::KEYCODE_DOWN:
+				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::TILT)
+					_kbdVelocity = 0;
+				break;
+			default:
+				break;
+			}
 			break;
 		default:
 			break;
@@ -261,7 +291,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_velocity  = (((pos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((pos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
@@ -270,12 +300,12 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_velocity  = (((pos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((pos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
 			} else {
-				_velocity = 0;
+				_mouseVelocity = 0;
 			}
 		} else if (renderState == RenderTable::TILT) {
 			if (pos.y >= _workingWindow.top && pos.y < _workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET) {
@@ -283,7 +313,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_velocity  = (((pos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((pos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
@@ -292,18 +322,18 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_velocity  = (((pos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((pos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
 			} else {
-				_velocity = 0;
+				_mouseVelocity = 0;
 			}
 		} else {
-			_velocity = 0;
+			_mouseVelocity = 0;
 		}
 	} else {
-		_velocity = 0;
+		_mouseVelocity = 0;
 	}
 
 	if (!cursorWasChanged) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 3518e01d68..f2f713dac0 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -97,7 +97,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _midiManager(nullptr),
 	  _aud_id(0),
 	  _rendDelay(2),
-	  _velocity(0) {
+	  _kbdVelocity(0),
+	  _mouseVelocity(0) {
 
 	debug(1, "ZVision::ZVision");
 
@@ -365,12 +366,17 @@ bool ZVision::canRender() {
 }
 
 void ZVision::updateRotation() {
+	int16 _velocity = _mouseVelocity + _kbdVelocity;
+
+	if (_halveDelay)
+		_velocity /= 2;
+
 	if (_velocity) {
 		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
 		if (renderState == RenderTable::PANORAMA) {
 			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
 
-			int16 new_pos = st_pos + _velocity * (1 - 2 * 0);
+			int16 new_pos = st_pos + (_renderManager->getRenderTable()->getPanoramaReverse() ? -_velocity : _velocity);
 
 			int16 zero_point = _renderManager->getRenderTable()->getPanoramaZeroPoint();
 			if (st_pos >= zero_point && new_pos < zero_point)
@@ -389,7 +395,7 @@ void ZVision::updateRotation() {
 		} else if (renderState == RenderTable::TILT) {
 			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
 
-			int16 new_pos = st_pos + _velocity * (1 - 2 * 0);
+			int16 new_pos = st_pos + _velocity;
 
 			int16 scr_height = _renderManager->getBkgSize().y;
 			int16 tilt_gap = _renderManager->getRenderTable()->getTiltGap();
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 8564e4e26b..549ea9bcdf 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -122,7 +122,8 @@ private:
 	const Common::Rect _workingWindow_ZNM;
 
 	int _rendDelay;
-	int16 _velocity;
+	int16 _mouseVelocity;
+	int16 _kbdVelocity;
 	bool _halveDelay;
 
 	uint8 _cheatBuff[KEYBUF_SIZE];
-- 
cgit v1.2.3


From 418b5f6dd28931ef8c7a0a05ae90dde3b36015b7 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 15:58:35 +0600
Subject: ZVISION: Passive borders check for tilt and panorama for
 changelocation

---
 engines/zvision/scripting/script_manager.cpp |  2 ++
 engines/zvision/zvision.cpp                  | 35 ++++++++++++++++++++++++++++
 engines/zvision/zvision.h                    |  1 +
 3 files changed, 38 insertions(+)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 457b491042..a5cb81b957 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -628,6 +628,8 @@ void ScriptManager::do_changeLocation() {
 		_currentLocation = _nextLocation;
 		execScope(nodeview);
 	}
+
+	_engine->checkBorders();
 }
 
 void ScriptManager::serialize(Common::WriteStream *stream) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f2f713dac0..d8b0f209e3 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -410,6 +410,41 @@ void ZVision::updateRotation() {
 	}
 }
 
+void ZVision::checkBorders() {
+	RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
+	if (renderState == RenderTable::PANORAMA) {
+		int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+
+		int16 new_pos = st_pos;
+
+		int16 scr_width = _renderManager->getBkgSize().x;
+
+		if (scr_width)
+			new_pos %= scr_width;
+
+		if (new_pos < 0)
+			new_pos += scr_width;
+
+		if (st_pos != new_pos)
+			_renderManager->setBackgroundPosition(new_pos);
+	} else if (renderState == RenderTable::TILT) {
+		int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+
+		int16 new_pos = st_pos;
+
+		int16 scr_height = _renderManager->getBkgSize().y;
+		int16 tilt_gap = _renderManager->getRenderTable()->getTiltGap();
+
+		if (new_pos >= (scr_height - tilt_gap))
+			new_pos = scr_height - tilt_gap;
+		if (new_pos <= tilt_gap)
+			new_pos = tilt_gap;
+
+		if (st_pos != new_pos)
+			_renderManager->setBackgroundPosition(new_pos);
+	}
+}
+
 void ZVision::rotateTo(int16 _toPos, int16 _time) {
 	if (_renderManager->getRenderTable()->getRenderState() != RenderTable::PANORAMA)
 		return;
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 549ea9bcdf..8cf9dbf107 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -195,6 +195,7 @@ public:
 
 	bool ifQuit();
 
+	void checkBorders();
 	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
 
 private:
-- 
cgit v1.2.3


From 2d7af4bab7e8c298373307d77d4a3e98cab1b575 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 16:00:02 +0600
Subject: ZVISION: Add call of inventory cycling for Nemesis

---
 engines/zvision/core/events.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 38ceb5ceb4..5f8f8e243f 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -168,7 +168,9 @@ void ZVision::processEvents() {
 		case Common::EVENT_RBUTTONDOWN:
 			_cursorManager->cursorDown(true);
 			_scriptManager->setStateValue(StateKey_RMouse, 1);
-			// TODO: Inventory logic
+
+			if (getGameId() == GID_NEMESIS)
+				_scriptManager->invertory_cycle();
 			break;
 
 		case Common::EVENT_RBUTTONUP:
-- 
cgit v1.2.3


From bb06ecf798682959bc9e31e92a6624e391e8429d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 16:01:23 +0600
Subject: ZVISION: Make menu bar fully enabled after changelocation called

---
 engines/zvision/scripting/script_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a5cb81b957..7df48183bd 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -562,6 +562,8 @@ void ScriptManager::do_changeLocation() {
 	_referenceTable.clear();
 	addPuzzlesToReferenceTable(universe);
 
+	_engine->menuBarEnable(0xFFFF);
+
 	if (_nextLocation.world != _currentLocation.world) {
 		cleanScriptScope(nodeview);
 		cleanScriptScope(room);
-- 
cgit v1.2.3


From 960bbe53b2160de3747678bd877c532d49c7d147 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 16:02:35 +0600
Subject: ZVISION: Fix delays with halveDelay option

---
 engines/zvision/zvision.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index d8b0f209e3..4d9830a0e3 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -300,7 +300,10 @@ bool ZVision::askQuestion(const Common::String &str) {
 			}
 		}
 		_system->updateScreen();
-		_system->delayMillis(66);
+		if (_halveDelay)
+			_system->delayMillis(33);
+		else
+			_system->delayMillis(66);
 	}
 	_renderManager->deleteSubArea(msgid);
 	_clock.start();
@@ -325,7 +328,10 @@ void ZVision::delayedMessage(const Common::String &str, uint16 milsecs) {
 				break;
 		}
 		_system->updateScreen();
-		_system->delayMillis(66);
+		if (_halveDelay)
+			_system->delayMillis(33);
+		else
+			_system->delayMillis(66);
 	}
 	_renderManager->deleteSubArea(msgid);
 	_clock.start();
-- 
cgit v1.2.3


From e970d121ff1acbe426e652a4ac17deebaf351821 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 16:05:48 +0600
Subject: ZVISION: Lead code of all controls to the same style

---
 .../zvision/scripting/controls/fist_control.cpp    | 80 ++++++++++++++-------
 engines/zvision/scripting/controls/fist_control.h  |  1 +
 .../zvision/scripting/controls/input_control.cpp   | 34 +++++----
 .../zvision/scripting/controls/lever_control.cpp   | 82 ++++++++++++++--------
 engines/zvision/scripting/controls/lever_control.h |  3 +-
 .../scripting/controls/push_toggle_control.cpp     | 48 ++++++-------
 .../scripting/controls/push_toggle_control.h       |  2 +-
 .../zvision/scripting/controls/save_control.cpp    | 15 ++--
 8 files changed, 161 insertions(+), 104 deletions(-)

diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 89aeb53be6..4779c5db74 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -187,54 +187,58 @@ void FistControl::readDescFile(const Common::String &fileName) {
 	}
 
 	Common::String line;
+	Common::String param;
+	Common::String values;
 
 	while (!file.eos()) {
 		line = file.readLine();
+		getFistParams(line, param, values);
 
-		for (int i = line.size() - 1; i >= 0; i--)
-			if (line[i] == '~')
-				line.deleteChar(i);
-
-		if (line.matchString("*animation_id*", true)) {
+		if (param.matchString("animation_id", true)) {
 			// Not used
-		} else if (line.matchString("*animation*", true)) {
-			char filename[64];
-			sscanf(line.c_str(), "animation:%s", filename);
-			_animation = new MetaAnimation(Common::String(filename), _engine);
-		} else if (line.matchString("*anim_rect*", true)) {
+		} else if (param.matchString("animation", true)) {
+			_animation = new MetaAnimation(values, _engine);
+		} else if (param.matchString("anim_rect", true)) {
 			int left, top, right, bottom;
-			sscanf(line.c_str(), "anim_rect:%d %d %d %d", &left, &top, &right, &bottom);
+			sscanf(values.c_str(), "%d %d %d %d", &left, &top, &right, &bottom);
 			_anmRect = Common::Rect(left, top, right, bottom);
-		} else if (line.matchString("*num_fingers*", true)) {
-			sscanf(line.c_str(), "num_fingers:%d", &_fistnum);
+		} else if (param.matchString("num_fingers", true)) {
+			sscanf(values.c_str(), "%d", &_fistnum);
 			_fistsUp.resize(_fistnum);
 			_fistsDwn.resize(_fistnum);
-		} else if (line.matchString("*entries*", true)) {
-			sscanf(line.c_str(), "entries:%d", &_numEntries);
+		} else if (param.matchString("entries", true)) {
+			sscanf(values.c_str(), "%d", &_numEntries);
 			_entries.resize(_numEntries);
-		} else if (line.matchString("*eval_order_ascending*", true)) {
-			sscanf(line.c_str(), "eval_order_ascending:%d", &_order);
-		} else if (line.matchString("*up_hs_num_*", true)) {
+		} else if (param.matchString("eval_order_ascending", true)) {
+			sscanf(values.c_str(), "%d", &_order);
+		} else if (param.matchString("up_hs_num_*", true)) {
 			int fist, num;
-			sscanf(line.c_str(), "up_hs_num_%d:%d", &fist, &num);
+			num = atoi(values.c_str());
+
+			sscanf(param.c_str(), "up_hs_num_%d", &fist);
 			_fistsUp[fist].resize(num);
-		} else if (line.matchString("*up_hs_*", true)) {
+		} else if (param.matchString("up_hs_*", true)) {
 			int16 fist, box, x1, y1, x2, y2;
-			sscanf(line.c_str(), "up_hs_%hd_%hd:%hd %hd %hd %hd", &fist, &box, &x1, &y1, &x2, &y2);
+			sscanf(param.c_str(), "up_hs_%hd_%hd", &fist, &box);
+			sscanf(values.c_str(), "%hd %hd %hd %hd", &x1, &y1, &x2, &y2);
 			(_fistsUp[fist])[box] = Common::Rect(x1, y1, x2, y2);
-		} else if (line.matchString("*down_hs_num_*", true)) {
+		} else if (param.matchString("down_hs_num_*", true)) {
 			int fist, num;
-			sscanf(line.c_str(), "down_hs_num_%d:%d", &fist, &num);
+			num = atoi(values.c_str());
+
+			sscanf(param.c_str(), "down_hs_num_%d", &fist);
 			_fistsDwn[fist].resize(num);
-		} else if (line.matchString("*down_hs_*", true)) {
+		} else if (param.matchString("down_hs_*", true)) {
 			int16 fist, box, x1, y1, x2, y2;
-			sscanf(line.c_str(), "down_hs_%hd_%hd:%hd %hd %hd %hd", &fist, &box, &x1, &y1, &x2, &y2);
+			sscanf(param.c_str(), "down_hs_%hd_%hd", &fist, &box);
+			sscanf(values.c_str(), "%hd %hd %hd %hd", &x1, &y1, &x2, &y2);
 			(_fistsDwn[fist])[box] = Common::Rect(x1, y1, x2, y2);
 		} else {
 			int  entry, start, end, sound;
 			char bits_start[33];
 			char bits_end[33];
-			if (sscanf(line.c_str(), "%d:%s %s %d %d (%d)", &entry, bits_start, bits_end, &start, &end, &sound) == 6) {
+			entry = atoi(param.c_str());
+			if (sscanf(values.c_str(), "%s %s %d %d (%d)", bits_start, bits_end, &start, &end, &sound) == 5) {
 				_entries[entry]._bitsStrt = readBits(bits_start);
 				_entries[entry]._bitsEnd = readBits(bits_end);
 				_entries[entry]._anmStrt = start;
@@ -291,4 +295,28 @@ int FistControl::mouseIn(const Common::Point &screenSpacePos, const Common::Poin
 	return -1;
 }
 
+void FistControl::getFistParams(const Common::String &input_str, Common::String &parameter, Common::String &values) {
+	const char *chrs = input_str.c_str();
+	uint lbr;
+
+	for (lbr = 0; lbr < input_str.size(); lbr++)
+		if (chrs[lbr] == ':')
+			break;
+
+	if (lbr >= input_str.size())
+		return;
+
+	uint rbr;
+
+	for (rbr = lbr + 1; rbr < input_str.size(); rbr++)
+		if (chrs[rbr] == '~')
+			break;
+
+	if (rbr >= input_str.size())
+		return;
+
+	parameter = Common::String(chrs, chrs + lbr);
+	values = Common::String(chrs + lbr + 1, chrs + rbr);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index 940bc96d69..8b229f964a 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -79,6 +79,7 @@ private:
 	void clearFistArray(Common::Array< Common::Array<Common::Rect> > &arr);
 	uint32 readBits(const char *str);
 	int mouseIn(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
+	void getFistParams(const Common::String &input_str, Common::String &parameter, Common::String &values);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index e35b300cb9..f8acdbda73 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -51,59 +51,63 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
 
 	while (!stream.eos() && !line.contains('}')) {
-		if (line.matchString("*rectangle*", true)) {
+		if (param.matchString("rectangle", true)) {
 			int x1;
 			int y1;
 			int x2;
 			int y2;
 
-			sscanf(line.c_str(), "%*[^(](%d %d %d %d)", &x1, &y1, &x2, &y2);
+			sscanf(values.c_str(), "%d %d %d %d", &x1, &y1, &x2, &y2);
 
 			_textRectangle = Common::Rect(x1, y1, x2, y2);
-		} else if (line.matchString("*aux_hotspot*", true)) {
+		} else if (param.matchString("aux_hotspot", true)) {
 			int x1;
 			int y1;
 			int x2;
 			int y2;
 
-			sscanf(line.c_str(), "%*[^(](%d %d %d %d)", &x1, &y1, &x2, &y2);
+			sscanf(values.c_str(), "%d %d %d %d", &x1, &y1, &x2, &y2);
 
 			_headerRectangle = Common::Rect(x1, y1, x2, y2);
-		} else if (line.matchString("*string_init*", true)) {
+		} else if (param.matchString("string_init", true)) {
 			uint fontFormatNumber;
 
-			sscanf(line.c_str(), "%*[^(](%u)", &fontFormatNumber);
+			sscanf(values.c_str(), "%u", &fontFormatNumber);
 
 			_string_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
-		} else if (line.matchString("*chooser_init_string*", true)) {
+		} else if (param.matchString("chooser_init_string", true)) {
 			uint fontFormatNumber;
 
-			sscanf(line.c_str(), "%*[^(](%u)", &fontFormatNumber);
+			sscanf(values.c_str(), "%u", &fontFormatNumber);
 
 			_string_chooser_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
-		} else if (line.matchString("*next_tabstop*", true)) {
-			sscanf(line.c_str(), "%*[^(](%u)", &_nextTabstop);
-		} else if (line.matchString("*cursor_dimensions*", true)) {
+		} else if (param.matchString("next_tabstop", true)) {
+			sscanf(values.c_str(), "%u", &_nextTabstop);
+		} else if (param.matchString("cursor_dimensions", true)) {
 			// Ignore, use the dimensions in the animation file
-		} else if (line.matchString("*cursor_animation_frames*", true)) {
+		} else if (param.matchString("cursor_animation_frames", true)) {
 			// Ignore, use the frame count in the animation file
-		} else if (line.matchString("*cursor_animation*", true)) {
+		} else if (param.matchString("cursor_animation", true)) {
 			char fileName[25];
 
-			sscanf(line.c_str(), "%*[^(](%25s %*u)", fileName);
+			sscanf(values.c_str(), "%25s %*u", fileName);
 
 			_animation = new MetaAnimation(fileName, _engine);
 			_frame = -1;
 			_frameDelay = 0;
-		} else if (line.matchString("*focus*", true)) {
+		} else if (param.matchString("focus", true)) {
 			_focused = true;
 			_engine->getScriptManager()->setFocusControlKey(_key);
 		}
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
 	}
 }
 
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 84cd6fa598..9b665ff033 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -57,21 +57,26 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
 
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
+
 	while (!stream.eos() && !line.contains('}')) {
-		if (line.matchString("*descfile*", true)) {
+		if (param.matchString("descfile", true)) {
 			char levFileName[25];
-			sscanf(line.c_str(), "%*[^(](%25[^)])", levFileName);
+			sscanf(values.c_str(), "%25s", levFileName);
 
 			parseLevFile(levFileName);
-		} else if (line.matchString("*cursor*", true)) {
+		} else if (param.matchString("cursor", true)) {
 			char cursorName[25];
-			sscanf(line.c_str(), "%*[^(](%25[^)])", cursorName);
+			sscanf(values.c_str(), "%25s", cursorName);
 
-			_cursorName = Common::String(cursorName);
+			_cursor = _engine->getCursorManager()->getCursorId(Common::String(cursorName));
 		}
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
 	}
 
 	renderFrame(_currentFrame);
@@ -92,50 +97,47 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 	}
 
 	Common::String line;
+	Common::String param;
+	Common::String values;
 
 	while (!file.eos()) {
 		line = file.readLine();
+		getLevParams(line, param, values);
 
-		if (line.matchString("*animation_id*", true)) {
+		if (param.matchString("animation_id", true)) {
 			// Not used
-		} else if (line.matchString("*filename*", true)) {
-			char fileNameBuffer[25];
-			sscanf(line.c_str(), "%*[^:]:%25[^~]~", fileNameBuffer);
-
-			Common::String animationFileName(fileNameBuffer);
-
-			_animation = new MetaAnimation(animationFileName, _engine);
-
-		} else if (line.matchString("*skipcolor*", true)) {
+		} else if (param.matchString("filename", true)) {
+			_animation = new MetaAnimation(values, _engine);
+		} else if (param.matchString("skipcolor", true)) {
 			// Not used
-		} else if (line.matchString("*anim_coords*", true)) {
+		} else if (param.matchString("anim_coords", true)) {
 			int left, top, right, bottom;
-			sscanf(line.c_str(), "%*[^:]:%d %d %d %d~", &left, &top, &right, &bottom);
+			sscanf(values.c_str(), "%d %d %d %d", &left, &top, &right, &bottom);
 
 			_animationCoords.left = left;
 			_animationCoords.top = top;
 			_animationCoords.right = right;
 			_animationCoords.bottom = bottom;
-		} else if (line.matchString("*mirrored*", true)) {
+		} else if (param.matchString("mirrored", true)) {
 			uint mirrored;
-			sscanf(line.c_str(), "%*[^:]:%u~", &mirrored);
+			sscanf(values.c_str(), "%u", &mirrored);
 
 			_mirrored = mirrored == 0 ? false : true;
-		} else if (line.matchString("*frames*", true)) {
-			sscanf(line.c_str(), "%*[^:]:%u~", &_frameCount);
+		} else if (param.matchString("frames", true)) {
+			sscanf(values.c_str(), "%u", &_frameCount);
 
 			_frameInfo = new FrameInfo[_frameCount];
-		} else if (line.matchString("*elsewhere*", true)) {
+		} else if (param.matchString("elsewhere", true)) {
 			// Not used
-		} else if (line.matchString("*out_of_control*", true)) {
+		} else if (param.matchString("out_of_control", true)) {
 			// Not used
-		} else if (line.matchString("*start_pos*", true)) {
-			sscanf(line.c_str(), "%*[^:]:%u~", &_startFrame);
+		} else if (param.matchString("start_pos", true)) {
+			sscanf(values.c_str(), "%u", &_startFrame);
 			_currentFrame = _startFrame;
-		} else if (line.matchString("*hotspot_deltas*", true)) {
+		} else if (param.matchString("hotspot_deltas", true)) {
 			uint x;
 			uint y;
-			sscanf(line.c_str(), "%*[^:]:%u %u~", &x, &y);
+			sscanf(values.c_str(), "%u %u", &x, &y);
 
 			_hotspotDelta.x = x;
 			_hotspotDelta.y = y;
@@ -233,7 +235,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 			}
 		}
 	} else if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
-		_engine->getCursorManager()->changeCursor(_engine->getCursorManager()->getCursorId(_cursorName));
+		_engine->getCursorManager()->changeCursor(_cursor);
 		cursorWasChanged = true;
 	}
 
@@ -376,4 +378,28 @@ void LeverControl::renderFrame(uint frameNumber) {
 		_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _animationCoords);
 }
 
+void LeverControl::getLevParams(const Common::String &input_str, Common::String &parameter, Common::String &values) {
+	const char *chrs = input_str.c_str();
+	uint lbr;
+
+	for (lbr = 0; lbr < input_str.size(); lbr++)
+		if (chrs[lbr] == ':')
+			break;
+
+	if (lbr >= input_str.size())
+		return;
+
+	uint rbr;
+
+	for (rbr = lbr + 1; rbr < input_str.size(); rbr++)
+		if (chrs[rbr] == '~')
+			break;
+
+	if (rbr >= input_str.size())
+		return;
+
+	parameter = Common::String(chrs, chrs + lbr);
+	values = Common::String(chrs + lbr + 1, chrs + rbr);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h
index 712d688523..22789f777b 100644
--- a/engines/zvision/scripting/controls/lever_control.h
+++ b/engines/zvision/scripting/controls/lever_control.h
@@ -62,7 +62,7 @@ private:
 private:
 	MetaAnimation *_animation;
 
-	Common::String _cursorName;
+	int _cursor;
 	Common::Rect _animationCoords;
 	bool _mirrored;
 	uint _frameCount;
@@ -112,6 +112,7 @@ private:
 	 */
 	static int calculateVectorAngle(const Common::Point &pointOne, const Common::Point &pointTwo);
 	void renderFrame(uint frameNumber);
+	void getLevParams(const Common::String &input_str, Common::String &parameter, Common::String &values);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index bf74a22051..03df4b722e 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -38,56 +38,52 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 	: Control(engine, key, CONTROL_PUSHTGL),
 	  _countTo(2),
 	  _event(Common::EVENT_LBUTTONUP) {
+
+	_hotspots.clear();
+
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
-	line.toLowercase();
-	_hotspots.clear();
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
 
 	while (!stream.eos() && !line.contains('}')) {
-		if (line.matchString("*_hotspot*", true)) {
+		if (param.matchString("*_hotspot", true)) {
 			uint x;
 			uint y;
 			uint width;
 			uint height;
 
-			sscanf(line.c_str(), "%*[^(](%u,%u,%u,%u)", &x, &y, &width, &height);
+			sscanf(values.c_str(), "%u,%u,%u,%u", &x, &y, &width, &height);
 
 			_hotspots.push_back(Common::Rect(x, y, x + width + 1, y + height + 1));
-		} else if (line.matchString("cursor*", true)) {
-			char nameBuffer[25];
-
-			sscanf(line.c_str(), "%*[^(](%25[^)])", nameBuffer);
-
-			_hoverCursor = Common::String(nameBuffer);
-		} else if (line.matchString("animation*", true)) {
+		} else if (param.matchString("cursor", true)) {
+			_cursor = _engine->getCursorManager()->getCursorId(values);
+		} else if (param.matchString("animation", true)) {
 			// Not used
-		} else if (line.matchString("sound*", true)) {
+		} else if (param.matchString("sound", true)) {
 			// Not used
-		} else if (line.matchString("count_to*", true)) {
-			sscanf(line.c_str(), "%*[^(](%u)", &_countTo);
-		} else if (line.matchString("mouse_event*", true)) {
-			char nameBuffer[25];
-
-			sscanf(line.c_str(), "%*[^(](%25[^)])", nameBuffer);
-
-			Common::String evntStr(nameBuffer);
-			if (evntStr.equalsIgnoreCase("up")) {
+		} else if (param.matchString("count_to", true)) {
+			sscanf(values.c_str(), "%u", &_countTo);
+		} else if (param.matchString("mouse_event", true)) {
+			if (values.equalsIgnoreCase("up")) {
 				_event = Common::EVENT_LBUTTONUP;
-			} else if (evntStr.equalsIgnoreCase("down")) {
+			} else if (values.equalsIgnoreCase("down")) {
 				_event = Common::EVENT_LBUTTONDOWN;
-			} else if (evntStr.equalsIgnoreCase("double")) {
+			} else if (values.equalsIgnoreCase("double")) {
 				// Not used
 			}
-		} else if (line.matchString("venus_id*", true)) {
+		} else if (param.matchString("venus_id*", true)) {
 			// Not used
 		}
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
 	}
 
-	if (_hotspots.size() == 0 || _hoverCursor.empty()) {
+	if (_hotspots.size() == 0) {
 		warning("Push_toggle %u was parsed incorrectly", key);
 	}
 }
@@ -133,7 +129,7 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
 		return false;
 
 	if (contain(backgroundImageSpacePos)) {
-		_engine->getCursorManager()->changeCursor(_engine->getCursorManager()->getCursorId(_hoverCursor));
+		_engine->getCursorManager()->changeCursor(_cursor);
 		return true;
 	}
 
diff --git a/engines/zvision/scripting/controls/push_toggle_control.h b/engines/zvision/scripting/controls/push_toggle_control.h
index 7b45fb4831..6d68b8f162 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.h
+++ b/engines/zvision/scripting/controls/push_toggle_control.h
@@ -68,7 +68,7 @@ private:
 	 */
 	Common::Array<Common::Rect> _hotspots;
 	/** The cursor to use when hovering over _hotspot */
-	Common::String _hoverCursor;
+	int _cursor;
 	/** Button maximal values count */
 	uint _countTo;
 
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index fda8a70114..a0b19db513 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -44,23 +44,23 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
+	Common::String param;
+	Common::String values;
+	getParams(line, param, values);
 
 	while (!stream.eos() && !line.contains('}')) {
-		if (line.matchString("*savebox*", true)) {
+		if (param.matchString("savebox", true)) {
 			int save_id;
 			int input_id;
 
-			sscanf(line.c_str(), "%*[^(](%d %d)", &save_id, &input_id);
+			sscanf(values.c_str(), "%d %d", &save_id, &input_id);
 			save_elmnt elmnt;
 			elmnt.input_key = input_id;
 			elmnt.save_id = save_id;
 			elmnt.exist = false;
 			_inputs.push_back(elmnt);
-		} else if (line.matchString("*control_type*", true)) {
-			char buf[32];
-
-			sscanf(line.c_str(), "%*[^(](%s)", buf);
-			if (Common::String(buf).contains("save"))
+		} else if (param.matchString("control_type", true)) {
+			if (values.contains("save"))
 				_saveControl = true;
 			else
 				_saveControl = false;
@@ -68,6 +68,7 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
+		getParams(line, param, values);
 	}
 
 	for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) {
-- 
cgit v1.2.3


From f43326a533faec014fb1987f9ba3729127c46487 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 12 Nov 2014 16:06:31 +0600
Subject: ZVISION: Clean of useless code

---
 engines/zvision/core/events.cpp |  3 ---
 engines/zvision/zvision.cpp     | 27 ---------------------------
 2 files changed, 30 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 5f8f8e243f..0d38e08b88 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -198,9 +198,6 @@ void ZVision::processEvents() {
 					_kbdVelocity = (_event.kbd.keycode == Common::KEYCODE_LEFT ?
 					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
 					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
-			case Common::KEYCODE_q:
-				if (_event.kbd.hasFlags(Common::KBD_CTRL))
-					quitGame();
 				break;
 
 			case Common::KEYCODE_UP:
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 4d9830a0e3..84856429e9 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -170,33 +170,6 @@ void ZVision::initialize() {
 		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
 	} else if (_gameDescription->gameId == GID_NEMESIS)
 		_searchManager->loadZix("NEMESIS.ZIX");
-	// TODO: There are 10 file clashes when we flatten the directories.
-	// From a quick look, the files are exactly the same, so it shouldn't matter.
-	// But I'm noting it here just in-case it does become a problem.
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data3", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zassets1", 0, 2, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zassets2", 0, 2, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "znemmx", 0, 1, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zgi", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zgi_mx", 0, 1, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "fonts", 0, 1, true);
-
-	// Find zfs archive files
-	Common::ArchiveMemberList list;
-	SearchMan.listMatchingMembers(list, "*.zfs");
-
-	// Register the file entries within the zfs archives with the SearchMan
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::String name = (*iter)->getName();
-		Common::SeekableReadStream *stream = (*iter)->createReadStream();
-		ZfsArchive *archive = new ZfsArchive(name, stream);
-
-		delete stream;
-
-		SearchMan.add(name, archive);
-	}
 
 	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_pixelFormat);
 
-- 
cgit v1.2.3


From b577da29b569a9ea4d74f4b8ea0d7e4fa3cae587 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 15 Nov 2014 09:15:54 -0500
Subject: ANDROID: Delay deleting a local ref until it's no longer used

Should fix bug #6741
---
 backends/platform/android/asset-archive.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
index 52c2c084bd..6680081c16 100644
--- a/backends/platform/android/asset-archive.cpp
+++ b/backends/platform/android/asset-archive.cpp
@@ -295,7 +295,6 @@ AssetFdReadStream::AssetFdReadStream(JNIEnv *env, jobject assetfd) :
 	jclass cls = env->GetObjectClass(_assetfd);
 	MID_close = env->GetMethodID(cls, "close", "()V");
 	assert(MID_close);
-	env->DeleteLocalRef(cls);
 
 	jmethodID MID_getStartOffset =
 		env->GetMethodID(cls, "getStartOffset", "()J");
@@ -321,6 +320,8 @@ AssetFdReadStream::AssetFdReadStream(JNIEnv *env, jobject assetfd) :
 
 	_fd = env->GetIntField(javafd, FID_descriptor);
 	env->DeleteLocalRef(javafd);
+
+	env->DeleteLocalRef(cls);
 }
 
 AssetFdReadStream::~AssetFdReadStream() {
-- 
cgit v1.2.3


From 244da223bd44759febbc8d5ff3044c1bbc61ae07 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 16 Nov 2014 11:30:08 +0100
Subject: CREDITS: Add Tobia Tesan

---
 AUTHORS             | 1 +
 devtools/credits.pl | 1 +
 gui/credits.h       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 5f19af4612..983f2524e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -257,6 +257,7 @@ ScummVM Team
 
     Wintermute:
        Einar Johan T. Somaaen
+       Tobia Tesan
 
     ZVision:
        Adrian Astley
diff --git a/devtools/credits.pl b/devtools/credits.pl
index 9a3cd5c9ac..c8d9e538d8 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -786,6 +786,7 @@ begin_credits("Credits");
 
 			begin_section("Wintermute");
 				add_person("Einar Johan T. S&oslash;m&aring;en", "somaen", "");
+				add_person("Tobia Tesan", "t0by", "");
 			end_section();
             
 			begin_section("ZVision");
diff --git a/gui/credits.h b/gui/credits.h
index 38287ebdf9..d908a730b7 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -320,6 +320,7 @@ static const char *credits[] = {
 "C1""Wintermute",
 "A0""Einar Johan T. Somaaen",
 "C0""Einar Johan T. S\370m\345en",
+"C0""Tobia Tesan",
 "",
 "C1""ZVision",
 "C0""Adrian Astley",
-- 
cgit v1.2.3


From f7b2cd0a7d067e39ed7973de75d5ce68c5464bc4 Mon Sep 17 00:00:00 2001
From: Kevin Becker
Date: Wed, 19 Nov 2014 07:44:03 -0500
Subject: ZVISION: Added detection for Zork Grand Inquisitor English Demo.

---
 engines/zvision/detection.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 1492ade639..bd45b39756 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -86,6 +86,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_GRANDINQUISITOR
 	},
 
+	{
+		// Zork Grand Inquisitor English demo version
+		{
+			"zgi",
+			"Demo",
+			AD_ENTRY1s("SCRIPTS.ZFS", "71a2494fd2fb999347deb13401e9b998", 304239),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
+			GUIO1(GUIO_NONE)
+		},
+		GID_GRANDINQUISITOR
+	},
+
 	{
 		AD_TABLE_END_MARKER,
 		GID_NONE
-- 
cgit v1.2.3


From b12b1e1d256219364860db51977dd6bca7424ed1 Mon Sep 17 00:00:00 2001
From: Kevin Becker
Date: Wed, 19 Nov 2014 07:44:23 -0500
Subject: ZVISION: Added detection for Zork Nemesis English Demo.

---
 engines/zvision/detection.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index bd45b39756..4f1d7fed3f 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -72,6 +72,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_NEMESIS
 	},
 
+	{
+		// Zork Nemesis English demo version
+		{
+			"znemesis",
+			"Demo",
+			AD_ENTRY1s("SCRIPTS.ZFS", "64f1e881394e9462305104f99513c833", 380539),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
+			GUIO1(GUIO_NONE)
+		},
+		GID_NEMESIS
+	},
+
 	{
 		// Zork Grand Inquisitor English version
 		{
-- 
cgit v1.2.3


From deeeb0646f5c374d0f7635cb5897e2df2962ad37 Mon Sep 17 00:00:00 2001
From: Kevin Becker
Date: Wed, 19 Nov 2014 07:44:44 -0500
Subject: ZVISION: Added detection for Zork Grand Inquisitor English DVD
 version.

---
 engines/zvision/detection.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 4f1d7fed3f..cd696557d9 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -87,10 +87,10 @@ static const ZVisionGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Zork Grand Inquisitor English version
+		// Zork Grand Inquisitor English CD version
 		{
 			"zgi",
-			0,
+			"CD",
 			AD_ENTRY1s("SCRIPTS.ZFS", "81efd40ecc3d22531e211368b779f17f", 8336944),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
@@ -114,6 +114,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_GRANDINQUISITOR
 	},
 
+	{
+		// Zork Grand Inquisitor English DVD version
+		{
+			"zgi",
+			"DVD",
+			AD_ENTRY1s("SCRIPTS.ZFS", "03157a3399513bfaaf8dc6d5ab798b36", 8433326),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+		GID_GRANDINQUISITOR
+	},
+
 	{
 		AD_TABLE_END_MARKER,
 		GID_NONE
-- 
cgit v1.2.3


From 74509eb8ac390d04d76e464a6b50173ee720e40d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 19 Nov 2014 20:39:27 +0100
Subject: AGOS: Added detection for Simon the Sorcerer 1 CD32 demo

I have verified that the demo is completable, though it doesn't
actually seems to end. You're just told that there is nothing more
for you to do.
---
 engines/agos/detection_tables.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 77fc88c6bb..2f4709c49e 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -1259,6 +1259,32 @@ static const AGOSGameDescription gameDescriptions[] = {
 		GF_TALKIE | GF_OLD_BUNDLE | GF_PLANAR
 	},
 
+		// Simon the Sorcerer 1 - English Amiga CD32 demo, from the cover disc of
+		// issue 5 (October 1994) of Amiga CD32 Gamer
+	{
+		{
+			"simon1",
+			"CD32 Demo",
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"e243f9229f9728b3476e54d2cf5f18a1", 27998},
+	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed", 18979},
+	{ "stripped.txt",	GAME_STRFILE,	"94413c71c86c32ed9baaa1c74a151cb3", 243},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b", 696},
+	{ NULL, 0, NULL, 0}
+			},
+			Common::EN_ANY,
+			Common::kPlatformAmiga,
+			ADGF_CD | ADGF_DEMO,
+			GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI)
+		},
+
+		GType_SIMON1,
+		GID_SIMON1CD32,
+		GF_TALKIE | GF_OLD_BUNDLE | GF_PLANAR
+	},
+
+
 	// Simon the Sorcerer 1 - English DOS Floppy Demo
 	{
 		{
-- 
cgit v1.2.3


From f94f48ae2bdd3ad596c6bdf6a9875461079d4a7b Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 19 Nov 2014 22:59:34 +0100
Subject: AGOS: Fix invisibility in Amiga CD32 Simon the Sorcerer 1 demo

This probably affects the full version as well, but I haven't
verified that. Either way, the old code was obviously wrong while
the new makes it look right to me.
---
 engines/agos/gfx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 33145b7d0d..5a1f9f1917 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -547,7 +547,7 @@ void AGOSEngine_Simon1::drawMaskedImage(VC10_state *state) {
 						if ((dst[count * 2] & 0xF0) == 0x20)
 							dst[count * 2] = src[count * 2];
 					if (mask[count + state->x_skip] & 0x0F)
-						if ((dst[count * 2 + 1] & 0x0F) == 0x20)
+						if ((dst[count * 2 + 1] & 0xF0) == 0x20)
 							dst[count * 2 + 1] = src[count * 2 + 1];
 				} else {
 					/* no transparency */
-- 
cgit v1.2.3


From d5f7a1dc03f2a38774ad1c8dd6741bb9c6fb9848 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 20 Nov 2014 14:02:08 +0600
Subject: ZVISION: Implement forgotten setVenus for controls

---
 engines/zvision/scripting/control.cpp                      | 7 +++++++
 engines/zvision/scripting/control.h                        | 4 ++--
 engines/zvision/scripting/controls/fist_control.cpp        | 4 +---
 engines/zvision/scripting/controls/hotmov_control.cpp      | 1 +
 engines/zvision/scripting/controls/input_control.cpp       | 7 ++++++-
 engines/zvision/scripting/controls/lever_control.cpp       | 3 +++
 engines/zvision/scripting/controls/paint_control.cpp       | 1 +
 engines/zvision/scripting/controls/push_toggle_control.cpp | 6 ++++--
 engines/zvision/scripting/controls/safe_control.cpp        | 1 +
 engines/zvision/scripting/controls/slot_control.cpp        | 2 +-
 10 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index c746f00831..9c8156961c 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 
 #include "zvision/scripting/control.h"
+#include "zvision/scripting/script_manager.h"
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
@@ -129,4 +130,10 @@ void Control::getParams(const Common::String &input_str, Common::String &paramet
 	values = Common::String(chrs + lbr + 1, chrs + rbr);
 }
 
+void Control::setVenus() {
+	if (_venus_id >= 0)
+		if (_engine->getScriptManager()->getStateValue(_venus_id) > 0)
+			_engine->getScriptManager()->setStateValue(StateKey_Venus, _venus_id);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 28c7348d98..b784a66913 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -54,8 +54,7 @@ public:
 		CONTROL_PAINT
 	};
 
-	Control() : _engine(0), _key(0) {}
-	Control(ZVision *engine, uint32 key, ControlType type) : _engine(engine), _key(key), _type(type) {}
+	Control(ZVision *engine, uint32 key, ControlType type) : _engine(engine), _key(key), _type(type), _venus_id(-1) {}
 	virtual ~Control() {}
 
 	uint32 getKey() {
@@ -121,6 +120,7 @@ public:
 	virtual bool process(uint32 deltaTimeInMillis) {
 		return false;
 	}
+	void setVenus();
 
 protected:
 	ZVision *_engine;
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 4779c5db74..185bea09d2 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -155,7 +155,7 @@ bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 	int n_fist = mouseIn(screenSpacePos, backgroundImageSpacePos);
 
 	if (n_fist >= 0) {
-		//ctrl_setvenus(ct);
+		setVenus();
 
 		uint32 oldStatus = _fiststatus;
 		_fiststatus ^= (1 << n_fist);
@@ -172,8 +172,6 @@ bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 			}
 
 		_engine->getScriptManager()->setStateValue(_key, _fiststatus);
-
-		//_engine->getScriptManager()->FlushMouseBtn(SDL_BUTTON_LEFT);
 	}
 
 	return false;
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index b39292f1c5..6969ee1bfe 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -158,6 +158,7 @@ bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common:
 
 	if (_cycle < _num_cycles) {
 		if (_frames[_cur_frame].contains(backgroundImageSpacePos)) {
+			setVenus();
 			_engine->getScriptManager()->setStateValue(_key, 1);
 			return true;
 		}
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index f8acdbda73..442c6cbc6a 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -103,6 +103,8 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		} else if (param.matchString("focus", true)) {
 			_focused = true;
 			_engine->getScriptManager()->setFocusControlKey(_key);
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
@@ -119,10 +121,13 @@ bool InputControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 		if (!_readOnly) {
 			// Save
 			_engine->getScriptManager()->focusControl(_key);
+			setVenus();
 		} else {
 			// Restore
-			if (_currentInputText.size())
+			if (_currentInputText.size()) {
+				setVenus();
 				_enterPressed = true;
+			}
 		}
 	}
 	return false;
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 9b665ff033..a9836b388e 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -141,6 +141,8 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 
 			_hotspotDelta.x = x;
 			_hotspotDelta.y = y;
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
 		} else {
 			uint frameNumber;
 			uint x, y;
@@ -191,6 +193,7 @@ bool LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 		return false;
 
 	if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
+		setVenus();
 		_mouseIsCaptured = true;
 		_lastMousePos = backgroundImageSpacePos;
 	}
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index 2891f1b1f9..54c02a2568 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -142,6 +142,7 @@ bool PaintControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
 
 		if (eligeblity(mouse_item)) {
+			setVenus();
 			_mouseDown = true;
 		}
 	}
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 03df4b722e..561dd1dd20 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -74,8 +74,8 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 			} else if (values.equalsIgnoreCase("double")) {
 				// Not used
 			}
-		} else if (param.matchString("venus_id*", true)) {
-			// Not used
+		} else if (param.matchString("venus_id", true)) {
+			_venus_id = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
@@ -100,6 +100,7 @@ bool PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Com
 		return false;
 
 	if (contain(backgroundImageSpacePos)) {
+		setVenus();
 		int32 val = _engine->getScriptManager()->getStateValue(_key);
 		val = (val + 1) % _countTo;
 		_engine->getScriptManager()->setStateValue(_key, val);
@@ -116,6 +117,7 @@ bool PushToggleControl::onMouseDown(const Common::Point &screenSpacePos, const C
 		return false;
 
 	if (contain(backgroundImageSpacePos)) {
+		setVenus();
 		int32 val = _engine->getScriptManager()->getStateValue(_key);
 		val = (val + 1) % _countTo;
 		_engine->getScriptManager()->setStateValue(_key, val);
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index ba809148a3..9df61ce341 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -179,6 +179,7 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 	if (_rectangle.contains(backgroundImageSpacePos)) {
 		int32 mR = backgroundImageSpacePos.sqrDist(_center);
 		if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) {
+			setVenus();
 
 			Common::Point tmp = backgroundImageSpacePos - _center;
 
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index f78061ac13..46ee320eb5 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -121,7 +121,7 @@ bool SlotControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 		return false;
 
 	if (_hotspot.contains(backgroundImageSpacePos)) {
-		//ctrl_setvenus(ct);
+		setVenus();
 
 		int item = _engine->getScriptManager()->getStateValue(_key);
 		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
-- 
cgit v1.2.3


From 5b352da304931bafcfcddbe08461488335c7ad57 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 20 Nov 2014 14:48:24 +0600
Subject: ZVISION: More CamelCase and a bit of comments cleanup

---
 engines/zvision/animation/meta_animation.cpp       |  16 +-
 engines/zvision/animation/meta_animation.h         |   4 +-
 engines/zvision/core/events.cpp                    |   2 +-
 engines/zvision/core/menu.cpp                      | 282 ++++++++++-----------
 engines/zvision/core/menu.h                        |  34 +--
 engines/zvision/core/midi.cpp                      |  18 +-
 engines/zvision/core/midi.h                        |   6 +-
 engines/zvision/core/save_manager.cpp              |   3 +-
 engines/zvision/core/search_manager.cpp            | 103 ++++----
 engines/zvision/core/search_manager.h              |  38 ++-
 engines/zvision/fonts/truetype_font.cpp            |  28 +-
 engines/zvision/fonts/truetype_font.h              |   6 +-
 engines/zvision/graphics/effects/fog.h             |   6 +-
 engines/zvision/graphics/effects/wave.cpp          | 148 +++++------
 engines/zvision/graphics/effects/wave.h            |   6 +-
 engines/zvision/graphics/render_manager.cpp        |  89 ++++---
 engines/zvision/graphics/render_manager.h          | 120 ++++++---
 engines/zvision/module.mk                          |  12 +-
 engines/zvision/scripting/actions.cpp              | 104 ++++----
 engines/zvision/scripting/actions.h                |  48 +---
 engines/zvision/scripting/control.cpp              |  18 +-
 engines/zvision/scripting/control.h                |  16 +-
 .../zvision/scripting/controls/fist_control.cpp    |  30 +--
 engines/zvision/scripting/controls/fist_control.h  |   2 +-
 .../zvision/scripting/controls/hotmov_control.cpp  |  46 ++--
 .../zvision/scripting/controls/hotmov_control.h    |   8 +-
 .../zvision/scripting/controls/input_control.cpp   |  16 +-
 engines/zvision/scripting/controls/input_control.h |   4 +-
 .../zvision/scripting/controls/lever_control.cpp   |  14 +-
 engines/zvision/scripting/controls/lever_control.h |   2 +-
 .../zvision/scripting/controls/paint_control.cpp   |  52 ++--
 engines/zvision/scripting/controls/paint_control.h |   4 +-
 .../scripting/controls/push_toggle_control.cpp     |   2 +-
 .../zvision/scripting/controls/safe_control.cpp    |  85 +++----
 engines/zvision/scripting/controls/safe_control.h  |  22 +-
 .../zvision/scripting/controls/save_control.cpp    |  22 +-
 engines/zvision/scripting/controls/save_control.h  |   8 +-
 .../zvision/scripting/controls/slot_control.cpp    |  54 ++--
 engines/zvision/scripting/controls/slot_control.h  |   8 +-
 engines/zvision/scripting/inventory.cpp            |  68 ++---
 engines/zvision/scripting/scr_file_handling.cpp    |  12 +-
 engines/zvision/scripting/script_manager.cpp       | 108 ++++----
 engines/zvision/scripting/script_manager.h         |  60 ++---
 .../zvision/scripting/sidefx/animation_node.cpp    |  22 +-
 engines/zvision/scripting/sidefx/animation_node.h  |   4 +-
 engines/zvision/scripting/sidefx/distort_node.cpp  |  16 +-
 engines/zvision/scripting/sidefx/distort_node.h    |  14 +-
 engines/zvision/scripting/sidefx/music_node.cpp    |  60 ++---
 engines/zvision/scripting/sidefx/music_node.h      |  16 +-
 engines/zvision/scripting/sidefx/ttytext_node.h    |   9 +-
 engines/zvision/subtitles/subtitles.cpp            |  10 +-
 engines/zvision/text/text.cpp                      | 104 ++++----
 engines/zvision/text/text.h                        |  14 +-
 engines/zvision/utility/win_keys.cpp               |  20 +-
 engines/zvision/utility/win_keys.h                 |   6 +-
 engines/zvision/zvision.cpp                        |  94 +++----
 engines/zvision/zvision.h                          |  22 +-
 57 files changed, 1081 insertions(+), 1064 deletions(-)

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
index 1ea6df6481..2e549ec838 100644
--- a/engines/zvision/animation/meta_animation.cpp
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -39,7 +39,7 @@ namespace ZVision {
 
 MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
 	: _fileType(RLF),
-	  _cur_frame(NULL) {
+	  _curFrame(NULL) {
 	Common::String tmpFileName = fileName;
 	tmpFileName.toLowercase();
 	if (tmpFileName.hasSuffix(".rlf")) {
@@ -102,11 +102,11 @@ void MetaAnimation::seekToFrame(int frameNumber) {
 
 const Graphics::Surface *MetaAnimation::decodeNextFrame() {
 	if (_fileType == RLF)
-		_cur_frame = _animation.rlf->decodeNextFrame();
+		_curFrame = _animation.rlf->decodeNextFrame();
 	else
-		_cur_frame = _animation.avi->decodeNextFrame();
+		_curFrame = _animation.avi->decodeNextFrame();
 
-	return _cur_frame;
+	return _curFrame;
 }
 
 const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) {
@@ -114,12 +114,12 @@ const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) {
 		frameNumber = frameCount() - 1;
 
 	if (_fileType == RLF) {
-		_cur_frame = _animation.rlf->getFrameData(frameNumber);
-		return _cur_frame;
+		_curFrame = _animation.rlf->getFrameData(frameNumber);
+		return _curFrame;
 	} else {
 		_animation.avi->seekToFrame(frameNumber);
-		_cur_frame = _animation.avi->decodeNextFrame();
-		return _cur_frame;
+		_curFrame = _animation.avi->decodeNextFrame();
+		return _curFrame;
 	}
 }
 
diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h
index 2ea00310f9..4795a388e4 100644
--- a/engines/zvision/animation/meta_animation.h
+++ b/engines/zvision/animation/meta_animation.h
@@ -57,7 +57,7 @@ public:
 		int32 start;
 		int32 stop;
 		int32 loop;
-		int32 _cur_frm;
+		int32 _curFrame;
 		int32 _delay;
 		Graphics::Surface *_scaled;
 	};
@@ -77,7 +77,7 @@ private:
 	FileType _fileType;
 	int32 _frmDelay;
 
-	const Graphics::Surface *_cur_frame;
+	const Graphics::Surface *_curFrame;
 
 public:
 
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 0d38e08b88..873cdb0df7 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -170,7 +170,7 @@ void ZVision::processEvents() {
 			_scriptManager->setStateValue(StateKey_RMouse, 1);
 
 			if (getGameId() == GID_NEMESIS)
-				_scriptManager->invertory_cycle();
+				_scriptManager->inventoryCycle();
 			break;
 
 		case Common::EVENT_RBUTTONUP:
diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
index 57a1983784..5816b3f364 100644
--- a/engines/zvision/core/menu.cpp
+++ b/engines/zvision/core/menu.cpp
@@ -43,14 +43,14 @@ enum {
 	menu_MAIN_EXIT = 3
 };
 
-menuHandler::menuHandler(ZVision *engine) {
+MenuHandler::MenuHandler(ZVision *engine) {
 	_engine = engine;
-	menu_bar_flag = 0xFFFF;
+	menuBarFlag = 0xFFFF;
 }
 
-menuZgi::menuZgi(ZVision *engine) :
-	menuHandler(engine) {
-	menu_mousefocus = -1;
+MenuZGI::MenuZGI(ZVision *engine) :
+	MenuHandler(engine) {
+	menuMouseFocus = -1;
 	inmenu = false;
 	scrolled[0] = false;
 	scrolled[1] = false;
@@ -58,7 +58,7 @@ menuZgi::menuZgi(ZVision *engine) :
 	scrollPos[0] = 0.0;
 	scrollPos[1] = 0.0;
 	scrollPos[2] = 0.0;
-	mouse_on_item = -1;
+	mouseOnItem = -1;
 
 	char buf[24];
 	for (int i = 1; i < 4; i++) {
@@ -77,17 +77,17 @@ menuZgi::menuZgi(ZVision *engine) :
 	for (int i = 0; i < 50; i++) {
 		items[i][0] = NULL;
 		items[i][1] = NULL;
-		item_id[i] = 0;
+		itemId[i] = 0;
 	}
 
 	for (int i = 0; i < 12; i++) {
 		magic[i][0] = NULL;
 		magic[i][1] = NULL;
-		magic_id[i] = 0;
+		magicId[i] = 0;
 	}
 }
 
-menuZgi::~menuZgi() {
+MenuZGI::~MenuZGI() {
 	for (int i = 0; i < 3; i++) {
 		menuback[i][0].free();
 		menuback[i][1].free();
@@ -118,25 +118,25 @@ menuZgi::~menuZgi() {
 	}
 }
 
-void menuZgi::onMouseUp(const Common::Point &Pos) {
+void MenuZGI::onMouseUp(const Common::Point &Pos) {
 	if (Pos.y < 40) {
-		switch (menu_mousefocus) {
+		switch (menuMouseFocus) {
 		case menu_ITEM:
-			if (menu_bar_flag & menuBar_Items) {
-				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-				if (item_count == 0)
-					item_count = 20;
+			if (menuBarFlag & menuBar_Items) {
+				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (itemCount == 0)
+					itemCount = 20;
 
-				for (int i = 0; i < item_count; i++) {
-					int itemspace = (600 - 28) / item_count;
+				for (int i = 0; i < itemCount; i++) {
+					int itemspace = (600 - 28) / itemCount;
 
 					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
 					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
-						int32 mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
-						if (mouse_item >= 0  && mouse_item < 0xE0) {
-							_engine->getScriptManager()->invertory_drop(mouse_item);
-							_engine->getScriptManager()->invertory_add(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
-							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouse_item);
+						int32 mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+						if (mouseItem >= 0  && mouseItem < 0xE0) {
+							_engine->getScriptManager()->inventoryDrop(mouseItem);
+							_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
+							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouseItem);
 
 							redraw = true;
 						}
@@ -146,7 +146,7 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 			break;
 
 		case menu_MAGIC:
-			if (menu_bar_flag & menuBar_Magic) {
+			if (menuBarFlag & menuBar_Magic) {
 				for (int i = 0; i < 12; i++) {
 
 					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
@@ -169,7 +169,7 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 		case menu_MAIN:
 
 			// Exit
-			if (menu_bar_flag & menuBar_Exit)
+			if (menuBarFlag & menuBar_Exit)
 				if (Common::Rect(320 + 135,
 				                 scrollPos[menu_MAIN],
 				                 320 + 135 + 135,
@@ -178,7 +178,7 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 				}
 
 			// Settings
-			if (menu_bar_flag & menuBar_Settings)
+			if (menuBarFlag & menuBar_Settings)
 				if (Common::Rect(320 ,
 				                 scrollPos[menu_MAIN],
 				                 320 + 135,
@@ -187,7 +187,7 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 				}
 
 			// Load
-			if (menu_bar_flag & menuBar_Restore)
+			if (menuBarFlag & menuBar_Restore)
 				if (Common::Rect(320 - 135,
 				                 scrollPos[menu_MAIN],
 				                 320,
@@ -196,7 +196,7 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 				}
 
 			// Save
-			if (menu_bar_flag & menuBar_Save)
+			if (menuBarFlag & menuBar_Save)
 				if (Common::Rect(320 - 135 * 2,
 				                 scrollPos[menu_MAIN],
 				                 320 - 135,
@@ -208,133 +208,133 @@ void menuZgi::onMouseUp(const Common::Point &Pos) {
 	}
 }
 
-void menuZgi::onMouseMove(const Common::Point &Pos) {
+void MenuZGI::onMouseMove(const Common::Point &Pos) {
 	if (Pos.y < 40) {
 
 		if (!inmenu)
 			redraw = true;
 		inmenu = true;
-		switch (menu_mousefocus) {
+		switch (menuMouseFocus) {
 		case menu_ITEM:
-			if (menu_bar_flag & menuBar_Items) {
-				int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-				if (item_count == 0)
-					item_count = 20;
-				else if (item_count > 50)
-					item_count = 50;
+			if (menuBarFlag & menuBar_Items) {
+				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (itemCount == 0)
+					itemCount = 20;
+				else if (itemCount > 50)
+					itemCount = 50;
 
-				int last_item = mouse_on_item;
+				int lastItem = mouseOnItem;
 
-				mouse_on_item = -1;
+				mouseOnItem = -1;
 
-				for (int i = 0; i < item_count; i++) {
-					int itemspace = (600 - 28) / item_count;
+				for (int i = 0; i < itemCount; i++) {
+					int itemspace = (600 - 28) / itemCount;
 
 					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
 					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
-						mouse_on_item = i;
+						mouseOnItem = i;
 						break;
 					}
 				}
 
-				if (last_item != mouse_on_item)
-					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouse_on_item) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + last_item))
+				if (lastItem != mouseOnItem)
+					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouseOnItem) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + lastItem))
 						redraw = true;
 			}
 			break;
 
 		case menu_MAGIC:
-			if (menu_bar_flag & menuBar_Magic) {
-				int last_item = mouse_on_item;
-				mouse_on_item = -1;
+			if (menuBarFlag & menuBar_Magic) {
+				int lastItem = mouseOnItem;
+				mouseOnItem = -1;
 				for (int i = 0; i < 12; i++) {
 					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
 					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
-						mouse_on_item = i;
+						mouseOnItem = i;
 						break;
 					}
 				}
 
-				if (last_item != mouse_on_item)
-					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouse_on_item) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + last_item))
+				if (lastItem != mouseOnItem)
+					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouseOnItem) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + lastItem))
 						redraw = true;
 
 			}
 			break;
 
 		case menu_MAIN: {
-			int last_item = mouse_on_item;
-			mouse_on_item = -1;
+			int lastItem = mouseOnItem;
+			mouseOnItem = -1;
 
 			// Exit
-			if (menu_bar_flag & menuBar_Exit)
+			if (menuBarFlag & menuBar_Exit)
 				if (Common::Rect(320 + 135,
 				                 scrollPos[menu_MAIN],
 				                 320 + 135 + 135,
 				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_EXIT;
+					mouseOnItem = menu_MAIN_EXIT;
 				}
 
 			// Settings
-			if (menu_bar_flag & menuBar_Settings)
+			if (menuBarFlag & menuBar_Settings)
 				if (Common::Rect(320 ,
 				                 scrollPos[menu_MAIN],
 				                 320 + 135,
 				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_PREF;
+					mouseOnItem = menu_MAIN_PREF;
 				}
 
 			// Load
-			if (menu_bar_flag & menuBar_Restore)
+			if (menuBarFlag & menuBar_Restore)
 				if (Common::Rect(320 - 135,
 				                 scrollPos[menu_MAIN],
 				                 320,
 				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_REST;
+					mouseOnItem = menu_MAIN_REST;
 				}
 
 			// Save
-			if (menu_bar_flag & menuBar_Save)
+			if (menuBarFlag & menuBar_Save)
 				if (Common::Rect(320 - 135 * 2,
 				                 scrollPos[menu_MAIN],
 				                 320 - 135,
 				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouse_on_item = menu_MAIN_SAVE;
+					mouseOnItem = menu_MAIN_SAVE;
 				}
 
-			if (last_item != mouse_on_item)
+			if (lastItem != mouseOnItem)
 				redraw = true;
 		}
 		break;
 
 		default:
-			int cur_menu = menu_mousefocus;
+			int cur_menu = menuMouseFocus;
 			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
-				menu_mousefocus = menu_MAIN;
+				menuMouseFocus = menu_MAIN;
 				scrolled[menu_MAIN]  = false;
 				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
 				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
 			}
 
-			if (menu_bar_flag & menuBar_Magic)
+			if (menuBarFlag & menuBar_Magic)
 				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
-					menu_mousefocus = menu_MAGIC;
+					menuMouseFocus = menu_MAGIC;
 					scrolled[menu_MAGIC]  = false;
 					scrollPos[menu_MAGIC] = 28;
 					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
 				}
 
-			if (menu_bar_flag & menuBar_Items)
+			if (menuBarFlag & menuBar_Items)
 				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
-					menu_mousefocus = menu_ITEM;
+					menuMouseFocus = menu_ITEM;
 					scrolled[menu_ITEM]  = false;
 					scrollPos[menu_ITEM] = 28 - 600;
 					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
 				}
 
-			if (cur_menu != menu_mousefocus)
+			if (cur_menu != menuMouseFocus)
 				clean = true;
 
 			break;
@@ -345,18 +345,18 @@ void menuZgi::onMouseMove(const Common::Point &Pos) {
 		inmenu = false;
 		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
 			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
-		menu_mousefocus = -1;
+		menuMouseFocus = -1;
 	}
 }
 
-void menuZgi::process(uint32 deltatime) {
+void MenuZGI::process(uint32 deltatime) {
 	if (clean) {
 		_engine->getRenderManager()->clearMenuSurface();
 		clean = false;
 	}
-	switch (menu_mousefocus) {
+	switch (menuMouseFocus) {
 	case menu_ITEM:
-		if (menu_bar_flag & menuBar_Items)
+		if (menuBarFlag & menuBar_Items)
 			if (!scrolled[menu_ITEM]) {
 				redraw = true;
 				float scrl = 600.0 * (deltatime / 1000.0);
@@ -374,31 +374,31 @@ void menuZgi::process(uint32 deltatime) {
 		if (redraw) {
 			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
 
-			int item_count = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-			if (item_count == 0)
-				item_count = 20;
-			else if (item_count > 50)
-				item_count = 50;
+			int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+			if (itemCount == 0)
+				itemCount = 20;
+			else if (itemCount > 50)
+				itemCount = 50;
 
 
-			for (int i = 0; i < item_count; i++) {
-				int itemspace = (600 - 28) / item_count;
+			for (int i = 0; i < itemCount; i++) {
+				int itemspace = (600 - 28) / itemCount;
 
 				bool inrect = false;
 
-				if (mouse_on_item == i)
+				if (mouseOnItem == i)
 					inrect = true;
 
-				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
+				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
 
-				if (cur_item_id != 0) {
-					if (item_id[i] != cur_item_id) {
+				if (curItemId != 0) {
+					if (itemId[i] != curItemId) {
 						char buf[16];
-						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
+						sprintf(buf, "gmzwu%2.2x1.tga", curItemId);
 						items[i][0] = _engine->getRenderManager()->loadImage(buf, false);
-						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
+						sprintf(buf, "gmzxu%2.2x1.tga", curItemId);
 						items[i][1] = _engine->getRenderManager()->loadImage(buf, false);
-						item_id[i] = cur_item_id;
+						itemId[i] = curItemId;
 					}
 
 					if (inrect)
@@ -417,7 +417,7 @@ void menuZgi::process(uint32 deltatime) {
 						delete items[i][1];
 						items[i][1] = NULL;
 					}
-					item_id[i] = 0;
+					itemId[i] = 0;
 				}
 			}
 
@@ -426,7 +426,7 @@ void menuZgi::process(uint32 deltatime) {
 		break;
 
 	case menu_MAGIC:
-		if (menu_bar_flag & menuBar_Magic)
+		if (menuBarFlag & menuBar_Magic)
 			if (!scrolled[menu_MAGIC]) {
 				redraw = true;
 				float scrl = 600.0 * (deltatime / 1000.0);
@@ -447,25 +447,25 @@ void menuZgi::process(uint32 deltatime) {
 			for (int i = 0; i < 12; i++) {
 				bool inrect = false;
 
-				if (mouse_on_item == i)
+				if (mouseOnItem == i)
 					inrect = true;
 
-				uint cur_item_id = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
-				if (cur_item_id) {
+				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+				if (curItemId) {
 					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
-						cur_item_id = 0xEE + i;
+						curItemId = 0xEE + i;
 					else
-						cur_item_id = 0xE0 + i;
+						curItemId = 0xE0 + i;
 				}
 
-				if (cur_item_id != 0) {
-					if (item_id[i] != cur_item_id) {
+				if (curItemId != 0) {
+					if (itemId[i] != curItemId) {
 						char buf[16];
-						sprintf(buf, "gmzwu%2.2x1.tga", cur_item_id);
+						sprintf(buf, "gmzwu%2.2x1.tga", curItemId);
 						magic[i][0] = _engine->getRenderManager()->loadImage(buf, false);
-						sprintf(buf, "gmzxu%2.2x1.tga", cur_item_id);
+						sprintf(buf, "gmzxu%2.2x1.tga", curItemId);
 						magic[i][1] = _engine->getRenderManager()->loadImage(buf, false);
-						magic_id[i] = cur_item_id;
+						magicId[i] = curItemId;
 					}
 
 					if (inrect)
@@ -484,7 +484,7 @@ void menuZgi::process(uint32 deltatime) {
 						delete magic[i][1];
 						magic[i][1] = NULL;
 					}
-					magic_id[i] = 0;
+					magicId[i] = 0;
 				}
 			}
 			redraw = false;
@@ -509,26 +509,26 @@ void menuZgi::process(uint32 deltatime) {
 		if (redraw) {
 			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
 
-			if (menu_bar_flag & menuBar_Exit) {
-				if (mouse_on_item == menu_MAIN_EXIT)
+			if (menuBarFlag & menuBar_Exit) {
+				if (mouseOnItem == menu_MAIN_EXIT)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
 			}
-			if (menu_bar_flag & menuBar_Settings) {
-				if (mouse_on_item == menu_MAIN_PREF)
+			if (menuBarFlag & menuBar_Settings) {
+				if (mouseOnItem == menu_MAIN_PREF)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
 			}
-			if (menu_bar_flag & menuBar_Restore) {
-				if (mouse_on_item == menu_MAIN_REST)
+			if (menuBarFlag & menuBar_Restore) {
+				if (mouseOnItem == menu_MAIN_REST)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
 			}
-			if (menu_bar_flag & menuBar_Save) {
-				if (mouse_on_item == menu_MAIN_SAVE)
+			if (menuBarFlag & menuBar_Save) {
+				if (mouseOnItem == menu_MAIN_SAVE)
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
 				else
 					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
@@ -541,10 +541,10 @@ void menuZgi::process(uint32 deltatime) {
 			if (inmenu) {
 				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
 
-				if (menu_bar_flag & menuBar_Items)
+				if (menuBarFlag & menuBar_Items)
 					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
 
-				if (menu_bar_flag & menuBar_Magic)
+				if (menuBarFlag & menuBar_Magic)
 					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
 			}
 			redraw = false;
@@ -554,12 +554,12 @@ void menuZgi::process(uint32 deltatime) {
 }
 
 
-menuNem::menuNem(ZVision *engine) :
-	menuHandler(engine) {
+MenuNemesis::MenuNemesis(ZVision *engine) :
+	MenuHandler(engine) {
 	inmenu = false;
 	scrolled = false;
 	scrollPos = 0.0;
-	mouse_on_item = -1;
+	mouseOnItem = -1;
 
 	char buf[24];
 	for (int i = 0; i < 4; i++)
@@ -573,7 +573,7 @@ menuNem::menuNem(ZVision *engine) :
 	frm = 0;
 }
 
-menuNem::~menuNem() {
+MenuNemesis::~MenuNemesis() {
 	for (int i = 0; i < 4; i++)
 		for (int j = 0; j < 6; j++)
 			but[i][j].free();
@@ -583,10 +583,10 @@ menuNem::~menuNem() {
 
 static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456} };
 
-void menuNem::onMouseUp(const Common::Point &Pos) {
+void MenuNemesis::onMouseUp(const Common::Point &Pos) {
 	if (Pos.y < 40) {
 		// Exit
-		if (menu_bar_flag & menuBar_Exit)
+		if (menuBarFlag & menuBar_Exit)
 			if (Common::Rect(buts[3][1],
 			                 scrollPos,
 			                 buts[3][0] + buts[3][1],
@@ -597,7 +597,7 @@ void menuNem::onMouseUp(const Common::Point &Pos) {
 			}
 
 		// Settings
-		if (menu_bar_flag & menuBar_Settings)
+		if (menuBarFlag & menuBar_Settings)
 			if (Common::Rect(buts[2][1],
 			                 scrollPos,
 			                 buts[2][0] + buts[2][1],
@@ -608,7 +608,7 @@ void menuNem::onMouseUp(const Common::Point &Pos) {
 			}
 
 		// Load
-		if (menu_bar_flag & menuBar_Restore)
+		if (menuBarFlag & menuBar_Restore)
 			if (Common::Rect(buts[1][1],
 			                 scrollPos,
 			                 buts[1][0] + buts[1][1],
@@ -619,7 +619,7 @@ void menuNem::onMouseUp(const Common::Point &Pos) {
 			}
 
 		// Save
-		if (menu_bar_flag & menuBar_Save)
+		if (menuBarFlag & menuBar_Save)
 			if (Common::Rect(buts[0][1],
 			                 scrollPos,
 			                 buts[0][0] + buts[0][1],
@@ -631,7 +631,7 @@ void menuNem::onMouseUp(const Common::Point &Pos) {
 	}
 }
 
-void menuNem::onMouseMove(const Common::Point &Pos) {
+void MenuNemesis::onMouseMove(const Common::Point &Pos) {
 	if (Pos.y < 40) {
 
 		inmenu = true;
@@ -639,46 +639,46 @@ void menuNem::onMouseMove(const Common::Point &Pos) {
 		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 2)
 			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
 
-		int last_item = mouse_on_item;
-		mouse_on_item = -1;
+		int lastItem = mouseOnItem;
+		mouseOnItem = -1;
 
 		// Exit
-		if (menu_bar_flag & menuBar_Exit)
+		if (menuBarFlag & menuBar_Exit)
 			if (Common::Rect(buts[3][1],
 			                 scrollPos,
 			                 buts[3][0] + buts[3][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_EXIT;
+				mouseOnItem = menu_MAIN_EXIT;
 			}
 
 		// Settings
-		if (menu_bar_flag & menuBar_Settings)
+		if (menuBarFlag & menuBar_Settings)
 			if (Common::Rect(buts[2][1],
 			                 scrollPos,
 			                 buts[2][0] + buts[2][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_PREF;
+				mouseOnItem = menu_MAIN_PREF;
 			}
 
 		// Load
-		if (menu_bar_flag & menuBar_Restore)
+		if (menuBarFlag & menuBar_Restore)
 			if (Common::Rect(buts[1][1],
 			                 scrollPos,
 			                 buts[1][0] + buts[1][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_REST;
+				mouseOnItem = menu_MAIN_REST;
 			}
 
 		// Save
-		if (menu_bar_flag & menuBar_Save)
+		if (menuBarFlag & menuBar_Save)
 			if (Common::Rect(buts[0][1],
 			                 scrollPos,
 			                 buts[0][0] + buts[0][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouse_on_item = menu_MAIN_SAVE;
+				mouseOnItem = menu_MAIN_SAVE;
 			}
 
-		if (last_item != mouse_on_item) {
+		if (lastItem != mouseOnItem) {
 			redraw = true;
 			frm = 0;
 			delay = 200;
@@ -687,11 +687,11 @@ void menuNem::onMouseMove(const Common::Point &Pos) {
 		inmenu = false;
 		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
 			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
-		mouse_on_item = -1;
+		mouseOnItem = -1;
 	}
 }
 
-void menuNem::process(uint32 deltatime) {
+void MenuNemesis::process(uint32 deltatime) {
 	if (inmenu) {
 		if (!scrolled) {
 			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
@@ -708,7 +708,7 @@ void menuNem::process(uint32 deltatime) {
 			scrollPos = 0;
 		}
 
-		if (mouse_on_item != -1) {
+		if (mouseOnItem != -1) {
 			delay -= deltatime;
 			if (delay <= 0 && frm < 4) {
 				delay = 200;
@@ -720,20 +720,20 @@ void menuNem::process(uint32 deltatime) {
 		if (redraw) {
 			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
 
-			if (menu_bar_flag & menuBar_Exit)
-				if (mouse_on_item == menu_MAIN_EXIT)
+			if (menuBarFlag & menuBar_Exit)
+				if (mouseOnItem == menu_MAIN_EXIT)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
 
-			if (menu_bar_flag & menuBar_Settings)
-				if (mouse_on_item == menu_MAIN_PREF)
+			if (menuBarFlag & menuBar_Settings)
+				if (mouseOnItem == menu_MAIN_PREF)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
 
-			if (menu_bar_flag & menuBar_Restore)
-				if (mouse_on_item == menu_MAIN_REST)
+			if (menuBarFlag & menuBar_Restore)
+				if (mouseOnItem == menu_MAIN_REST)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
 
-			if (menu_bar_flag & menuBar_Save)
-				if (mouse_on_item == menu_MAIN_SAVE)
+			if (menuBarFlag & menuBar_Save)
+				if (mouseOnItem == menu_MAIN_SAVE)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
 
 			redraw = false;
diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
index c2ea822dd9..62683de912 100644
--- a/engines/zvision/core/menu.h
+++ b/engines/zvision/core/menu.h
@@ -40,30 +40,30 @@ enum menuBar {
 	menuBar_Magic = 0x200
 };
 
-class menuHandler {
+class MenuHandler {
 public:
-	menuHandler(ZVision *engine);
-	virtual ~menuHandler() {};
+	MenuHandler(ZVision *engine);
+	virtual ~MenuHandler() {};
 	virtual void onMouseMove(const Common::Point &Pos) {};
 	virtual void onMouseDown(const Common::Point &Pos) {};
 	virtual void onMouseUp(const Common::Point &Pos) {};
 	virtual void process(uint32 deltaTimeInMillis) {};
 
 	void setEnable(uint16 flags) {
-		menu_bar_flag = flags;
+		menuBarFlag = flags;
 	}
 	uint16 getEnable() {
-		return menu_bar_flag;
+		return menuBarFlag;
 	}
 protected:
-	uint16 menu_bar_flag;
+	uint16 menuBarFlag;
 	ZVision *_engine;
 };
 
-class menuZgi: public menuHandler {
+class MenuZGI: public MenuHandler {
 public:
-	menuZgi(ZVision *engine);
-	~menuZgi();
+	MenuZGI(ZVision *engine);
+	~MenuZGI();
 	void onMouseMove(const Common::Point &Pos);
 	void onMouseUp(const Common::Point &Pos);
 	void process(uint32 deltaTimeInMillis);
@@ -73,15 +73,15 @@ private:
 
 
 	Graphics::Surface *items[50][2];
-	uint item_id[50];
+	uint itemId[50];
 
 	Graphics::Surface *magic[12][2];
-	uint magic_id[12];
+	uint magicId[12];
 
-	int menu_mousefocus;
+	int menuMouseFocus;
 	bool inmenu;
 
-	int mouse_on_item;
+	int mouseOnItem;
 
 	bool   scrolled[3];
 	float scrollPos[3];
@@ -97,10 +97,10 @@ private:
 
 };
 
-class menuNem: public menuHandler {
+class MenuNemesis: public MenuHandler {
 public:
-	menuNem(ZVision *engine);
-	~menuNem();
+	MenuNemesis(ZVision *engine);
+	~MenuNemesis();
 	void onMouseMove(const Common::Point &Pos);
 	void onMouseUp(const Common::Point &Pos);
 	void process(uint32 deltaTimeInMillis);
@@ -110,7 +110,7 @@ private:
 
 	bool inmenu;
 
-	int mouse_on_item;
+	int mouseOnItem;
 
 	bool   scrolled;
 	float scrollPos;
diff --git a/engines/zvision/core/midi.cpp b/engines/zvision/core/midi.cpp
index 5cc8cd0402..736be1311d 100644
--- a/engines/zvision/core/midi.cpp
+++ b/engines/zvision/core/midi.cpp
@@ -26,25 +26,25 @@
 
 namespace ZVision {
 
-midiManager::midiManager() {
+MidiManager::MidiManager() {
 	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB);
 	_driver = MidiDriver::createMidi(dev);
 	_driver->open();
 }
 
-midiManager::~midiManager() {
+MidiManager::~MidiManager() {
 	stop();
 	_driver->close();
 	delete _driver;
 }
 
-void midiManager::stop() {
+void MidiManager::stop() {
 	for (int8 i = 0; i < 16; i++)
 		if (_playChannels[i].playing)
 			noteOff(i);
 }
 
-void midiManager::noteOn(int8 channel, int8 note, int8 velocity) {
+void MidiManager::noteOn(int8 channel, int8 note, int8 velocity) {
 	assert(channel <= 15);
 
 	_playChannels[channel].playing = true;
@@ -52,7 +52,7 @@ void midiManager::noteOn(int8 channel, int8 note, int8 velocity) {
 	_driver->send(channel | (velocity << 16) | (note << 8) | 0x90);
 }
 
-void midiManager::noteOff(int8 channel) {
+void MidiManager::noteOff(int8 channel) {
 	assert(channel <= 15);
 
 	if (_playChannels[channel].playing) {
@@ -61,26 +61,26 @@ void midiManager::noteOff(int8 channel) {
 	}
 }
 
-int8 midiManager::getFreeChannel() {
+int8 MidiManager::getFreeChannel() {
 	for (int8 i = 0; i < 16; i++)
 		if (!_playChannels[i].playing)
 			return i;
 	return -1;
 }
 
-void midiManager::setPan(int8 channel, int8 pan) {
+void MidiManager::setPan(int8 channel, int8 pan) {
 	assert(channel <= 15);
 
 	_driver->send(channel | (pan << 16) | 0xAB0);
 }
 
-void midiManager::setVolume(int8 channel, int8 volume) {
+void MidiManager::setVolume(int8 channel, int8 volume) {
 	assert(channel <= 15);
 
 	_driver->send(channel | (volume << 16) | 0x7B0);
 }
 
-void midiManager::setProgram(int8 channel, int8 prog) {
+void MidiManager::setProgram(int8 channel, int8 prog) {
 	assert(channel <= 15);
 
 	_driver->send(channel | (prog << 8) | 0xC0);
diff --git a/engines/zvision/core/midi.h b/engines/zvision/core/midi.h
index 79f8ea3d04..a3bac19636 100644
--- a/engines/zvision/core/midi.h
+++ b/engines/zvision/core/midi.h
@@ -27,10 +27,10 @@
 
 namespace ZVision {
 
-class midiManager {
+class MidiManager {
 public:
-	midiManager();
-	~midiManager();
+	MidiManager();
+	~MidiManager();
 
 	void stop();
 	void noteOn(int8 channel, int8 noteNumber, int8 velocity);
diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 2797b940a0..9b36824c3b 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -165,6 +165,7 @@ Common::Error SaveManager::loadGame(const Common::String &saveName) {
 
 bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header) {
 	uint32 tag = in->readUint32BE();
+	// Check if it's original savegame than fill header structure
 	if (tag == MKTAG('Z', 'N', 'S', 'G')) {
 		header.saveYear = 0;
 		header.saveMonth = 0;
@@ -216,7 +217,7 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
 	Common::SeekableReadStream *saveFile = g_system->getSavefileManager()->openForLoading(_engine->generateSaveFileName(slot));
 	if (saveFile == NULL) {
-		// Try to load standart save file
+		// Try to load standard save file
 		Common::String filename;
 		if (_engine->getGameId() == GID_GRANDINQUISITOR)
 			filename = Common::String::format("inqsav%u.sav", slot);
diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
index fe99772b9b..8350189566 100644
--- a/engines/zvision/core/search_manager.cpp
+++ b/engines/zvision/core/search_manager.cpp
@@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 */
+
 #include "common/debug.h"
 
 #include "zvision/core/search_manager.h"
@@ -29,18 +30,18 @@
 
 namespace ZVision {
 
-sManager::sManager(const Common::String &root_path, int depth) {
-	_root = root_path;
+SearchManager::SearchManager(const Common::String &rootPath, int depth) {
+	_root = rootPath;
 	if (_root[_root.size() - 1] == '\\' || _root[_root.size() - 1] == '/')
 		_root.deleteLastChar();
 
-	Common::FSNode fs_node(_root);
+	Common::FSNode fsNode(_root);
 
-	list_dir_recursive(dir_list, fs_node, depth);
+	listDirRecursive(dirList, fsNode, depth);
 
-	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end();)
+	for (Common::List<Common::String>::iterator it = dirList.begin(); it != dirList.end();)
 		if (it->size() == _root.size())
-			it = dir_list.erase(it);
+			it = dirList.erase(it);
 		else if (it->size() > _root.size()) {
 			*it = Common::String(it->c_str() + _root.size() + 1);
 			it++;
@@ -48,7 +49,7 @@ sManager::sManager(const Common::String &root_path, int depth) {
 			it++;
 }
 
-sManager::~sManager() {
+SearchManager::~SearchManager() {
 	Common::List<Common::Archive *>::iterator it = archList.begin();
 	while (it != archList.end()) {
 		delete *it;
@@ -58,20 +59,20 @@ sManager::~sManager() {
 	archList.clear();
 }
 
-void sManager::addPatch(const Common::String &src, const Common::String &dst) {
-	Common::String lw_name = dst;
-	lw_name.toLowercase();
+void SearchManager::addPatch(const Common::String &src, const Common::String &dst) {
+	Common::String lowerCaseName = dst;
+	lowerCaseName.toLowercase();
 
-	sManager::MatchList::iterator it = files.find(lw_name);
+	SearchManager::MatchList::iterator it = files.find(lowerCaseName);
 
 	if (it != files.end()) {
-		lw_name = src;
-		lw_name.toLowercase();
-		files[lw_name] = it->_value;
+		lowerCaseName = src;
+		lowerCaseName.toLowercase();
+		files[lowerCaseName] = it->_value;
 	}
 }
 
-void sManager::addFile(const Common::String &name, Common::Archive *arch) {
+void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
 	bool addArch = true;
 	Common::List<Common::Archive *>::iterator it = archList.begin();
 	while (it != archList.end()) {
@@ -84,17 +85,17 @@ void sManager::addFile(const Common::String &name, Common::Archive *arch) {
 	if (addArch)
 		archList.push_back(arch);
 
-	Common::String lw_name = name;
-	lw_name.toLowercase();
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
 
-	sManager::Node nod;
-	nod.name = lw_name;
+	SearchManager::Node nod;
+	nod.name = lowerCaseName;
 	nod.arch = arch;
 
-	sManager::MatchList::iterator fit = files.find(lw_name);
+	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
 
 	if (fit == files.end()) {
-		files[lw_name] = nod;
+		files[lowerCaseName] = nod;
 	} else {
 		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
 		if (stream) {
@@ -102,16 +103,16 @@ void sManager::addFile(const Common::String &name, Common::Archive *arch) {
 				fit->_value.arch = arch;
 			delete stream;
 		} else {
-			files[lw_name] = nod;
+			files[lowerCaseName] = nod;
 		}
 	}
 }
 
-Common::File *sManager::openFile(const Common::String &name) {
-	Common::String lw_name = name;
-	lw_name.toLowercase();
+Common::File *SearchManager::openFile(const Common::String &name) {
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
 
-	sManager::MatchList::iterator fit = files.find(lw_name);
+	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
 
 	if (fit != files.end()) {
 		Common::File *tmp = new Common::File();
@@ -121,29 +122,29 @@ Common::File *sManager::openFile(const Common::String &name) {
 	return NULL;
 }
 
-bool sManager::openFile(Common::File &file, const Common::String &name) {
-	Common::String lw_name = name;
-	lw_name.toLowercase();
+bool SearchManager::openFile(Common::File &file, const Common::String &name) {
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
 
-	sManager::MatchList::iterator fit = files.find(lw_name);
+	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
 
 	if (fit != files.end())
 		return file.open(fit->_value.name, *fit->_value.arch);
 	return false;
 }
 
-bool sManager::hasFile(const Common::String &name) {
-	Common::String lw_name = name;
-	lw_name.toLowercase();
+bool SearchManager::hasFile(const Common::String &name) {
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
 
-	sManager::MatchList::iterator fit = files.find(lw_name);
+	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
 
 	if (fit != files.end())
 		return true;
 	return false;
 }
 
-void sManager::loadZix(const Common::String &name) {
+void SearchManager::loadZix(const Common::String &name) {
 	Common::File file;
 	file.open(name);
 
@@ -168,13 +169,13 @@ void sManager::loadZix(const Common::String &name) {
 		else if (line.matchString("DIR:*", true)) {
 			Common::String path(line.c_str() + 5);
 			Common::Archive *arc;
-			char n_path[128];
-			strcpy(n_path, path.c_str());
+			char tempPath[128];
+			strcpy(tempPath, path.c_str());
 			for (uint i = 0; i < path.size(); i++)
-				if (n_path[i] == '\\')
-					n_path[i] = '/';
+				if (tempPath[i] == '\\')
+					tempPath[i] = '/';
 
-			path = Common::String(n_path);
+			path = Common::String(tempPath);
 			if (path.size() && path[0] == '.')
 				path.deleteChar(0);
 			if (path.size() && path[0] == '/')
@@ -187,7 +188,7 @@ void sManager::loadZix(const Common::String &name) {
 					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
 						path.deleteLastChar();
 					if (path.size())
-						for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
+						for (Common::List<Common::String>::iterator it = dirList.begin(); it != dirList.end(); ++it)
 							if (path.equalsIgnoreCase(*it)) {
 								path = *it;
 								break;
@@ -218,9 +219,9 @@ void sManager::loadZix(const Common::String &name) {
 	}
 }
 
-void sManager::addDir(const Common::String &name) {
+void SearchManager::addDir(const Common::String &name) {
 	Common::String path;
-	for (Common::List<Common::String>::iterator it = dir_list.begin(); it != dir_list.end(); ++it)
+	for (Common::List<Common::String>::iterator it = dirList.begin(); it != dirList.end(); ++it)
 		if (name.equalsIgnoreCase(*it)) {
 			path = *it;
 			break;
@@ -246,8 +247,8 @@ void sManager::addDir(const Common::String &name) {
 		zfs->listMembers(zfslist);
 
 		for (Common::ArchiveMemberList::iterator ziter = zfslist.begin(); ziter != zfslist.end(); ++ziter) {
-			Common::String z_name = (*ziter)->getName();
-			addFile(z_name, zfs);
+			Common::String zfsFileName = (*ziter)->getName();
+			addFile(zfsFileName, zfs);
 		}
 	}
 
@@ -260,15 +261,15 @@ void sManager::addDir(const Common::String &name) {
 	}
 }
 
-void sManager::list_dir_recursive(Common::List<Common::String> &_list, const Common::FSNode &fs_node, int depth) {
-	Common::FSList fs_list;
-	fs_node.getChildren(fs_list);
+void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const Common::FSNode &fsNode, int depth) {
+	Common::FSList fsList;
+	fsNode.getChildren(fsList);
 
-	_list.push_back(fs_node.getPath());
+	_list.push_back(fsNode.getPath());
 
 	if (depth > 1)
-		for (Common::FSList::const_iterator it = fs_list.begin(); it != fs_list.end(); ++it)
-			list_dir_recursive(_list, *it, depth - 1);
+		for (Common::FSList::const_iterator it = fsList.begin(); it != fsList.end(); ++it)
+			listDirRecursive(_list, *it, depth - 1);
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/core/search_manager.h b/engines/zvision/core/search_manager.h
index c768cb8b00..180102eac6 100644
--- a/engines/zvision/core/search_manager.h
+++ b/engines/zvision/core/search_manager.h
@@ -1,5 +1,27 @@
-#ifndef SEARCH_MANAGER_H_INCLUDED
-#define SEARCH_MANAGER_H_INCLUDED
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SEARCH_MANAGER_H
+#define ZVISION_SEARCH_MANAGER_H
 
 #include "common/str.h"
 #include "common/hash-str.h"
@@ -10,10 +32,10 @@
 
 namespace ZVision {
 
-class sManager {
+class SearchManager {
 public:
-	sManager(const Common::String &root_path, int depth);
-	~sManager();
+	SearchManager(const Common::String &rootPath, int depth);
+	~SearchManager();
 
 	void addFile(const Common::String &name, Common::Archive *arch);
 	void addDir(const Common::String &name);
@@ -27,14 +49,14 @@ public:
 
 private:
 
-	void list_dir_recursive(Common::List<Common::String> &dir_list, const Common::FSNode &fs_node, int depth);
+	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
 
 	struct Node {
 		Common::String name;
 		Common::Archive *arch;
 	};
 
-	Common::List<Common::String> dir_list;
+	Common::List<Common::String> dirList;
 
 	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
 
@@ -48,4 +70,4 @@ private:
 
 }
 
-#endif // SEARCH_MANAGER_H_INCLUDED
+#endif // ZVISION_SEARCH_MANAGER_H
diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp
index 22aa16f52f..638a8ed233 100644
--- a/engines/zvision/fonts/truetype_font.cpp
+++ b/engines/zvision/fonts/truetype_font.cpp
@@ -116,24 +116,24 @@ Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, u
 	return surface;
 }
 
-sTTFont::sTTFont(ZVision *engine) {
+StyledTTFont::StyledTTFont(ZVision *engine) {
 	_engine = engine;
 	_style = 0;
 	_font = NULL;
 	_lineHeight = 0;
 }
 
-sTTFont::~sTTFont() {
+StyledTTFont::~StyledTTFont() {
 	if (_font)
 		delete _font;
 }
 
-bool sTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
 	_style = style;
 	return loadFont(fontName, point);
 }
 
-bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 	Common::String newFontName;
 	if (fontName.matchString("*times new roman*", true) || fontName.matchString("*times*", true)) {
 		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
@@ -205,7 +205,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 				}
 			}
 		}
-		if (!themeFile) { // Fallback 2.5: Search for ScummModern.zip in SearchMan.
+		if (!themeFile) { // Fallback : Search for ScummModern.zip in SearchMan.
 			themeFile = SearchMan.createReadStreamForMember("scummmodern.zip");
 		}
 		if (themeFile) {
@@ -243,7 +243,7 @@ bool sTTFont::loadFont(const Common::String &fontName, int32 point) {
 	return false;
 }
 
-void sTTFont::setStyle(uint newStyle) {
+void StyledTTFont::setStyle(uint newStyle) {
 	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
 		_style = newStyle;
 		loadFont(_fntName, _lineHeight);
@@ -252,31 +252,31 @@ void sTTFont::setStyle(uint newStyle) {
 	}
 }
 
-int sTTFont::getFontHeight() {
+int StyledTTFont::getFontHeight() {
 	if (_font)
 		return _font->getFontHeight();
 	return 0;
 }
 
-int sTTFont::getMaxCharWidth() {
+int StyledTTFont::getMaxCharWidth() {
 	if (_font)
 		return _font->getMaxCharWidth();
 	return 0;
 }
 
-int sTTFont::getCharWidth(byte chr) {
+int StyledTTFont::getCharWidth(byte chr) {
 	if (_font)
 		return _font->getCharWidth(chr);
 	return 0;
 }
 
-int sTTFont::getKerningOffset(byte left, byte right) {
+int StyledTTFont::getKerningOffset(byte left, byte right) {
 	if (_font)
 		return _font->getKerningOffset(left, right);
 	return 0;
 }
 
-void sTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
+void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
 	if (_font) {
 		_font->drawChar(dst, chr, x, y, color);
 		if (_style & STTF_UNDERLINE) {
@@ -292,7 +292,7 @@ void sTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 co
 	}
 }
 
-void sTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
+void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
 	if (_font) {
 		_font->drawString(dst, str, x, y, w, color, align);
 		if (_style & STTF_UNDERLINE) {
@@ -324,13 +324,13 @@ void sTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int
 	}
 }
 
-int sTTFont::getStringWidth(const Common::String &str) {
+int StyledTTFont::getStringWidth(const Common::String &str) {
 	if (_font)
 		return _font->getStringWidth(str);
 	return 0;
 }
 
-Graphics::Surface *sTTFont::renderSolidText(const Common::String &str, uint32 color) {
+Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
 	Graphics::Surface *tmp = new Graphics::Surface;
 	if (_font) {
 		int16 w = _font->getStringWidth(str);
diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h
index 0fed3ccbc4..771c02a6dc 100644
--- a/engines/zvision/fonts/truetype_font.h
+++ b/engines/zvision/fonts/truetype_font.h
@@ -77,10 +77,10 @@ public:
 };
 
 // Styled TTF
-class sTTFont {
+class StyledTTFont {
 public:
-	sTTFont(ZVision *engine);
-	~sTTFont();
+	StyledTTFont(ZVision *engine);
+	~StyledTTFont();
 
 	enum {
 		STTF_BOLD = 1,
diff --git a/engines/zvision/graphics/effects/fog.h b/engines/zvision/graphics/effects/fog.h
index 62dd1f9473..45d6f9596d 100644
--- a/engines/zvision/graphics/effects/fog.h
+++ b/engines/zvision/graphics/effects/fog.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef FOGFX_H_INCLUDED
-#define FOGFX_H_INCLUDED
+#ifndef ZVISION_FOG_H
+#define ZVISION_FOG_H
 
 #include "zvision/graphics/effect.h"
 
@@ -49,4 +49,4 @@ private:
 };
 } // End of namespace ZVision
 
-#endif // FOGFX_H_INCLUDED
+#endif // ZVISION_FOG_H
diff --git a/engines/zvision/graphics/effects/wave.cpp b/engines/zvision/graphics/effects/wave.cpp
index 88239f3cad..9f2fbb285c 100644
--- a/engines/zvision/graphics/effects/wave.cpp
+++ b/engines/zvision/graphics/effects/wave.cpp
@@ -30,32 +30,32 @@
 
 namespace ZVision {
 
-WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 s_x, int16 s_y, float ampl, float waveln, float spd):
+WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd):
 	Effect(engine, key, region, ported) {
 
 	_frame = 0;
-	_frame_cnt = frames;
+	_frameCount = frames;
 
-	_ampls.resize(_frame_cnt);
-	_hw = _region.width() / 2;
-	_hh = _region.height() / 2;
+	_ampls.resize(_frameCount);
+	_halfWidth = _region.width() / 2;
+	_halfHeight = _region.height() / 2;
 
-	int32 frmsize = _hw * _hh;
+	int32 frmsize = _halfWidth * _halfHeight;
 
 	float phase = 0;
 
-	int16 w_4 = _hw / 2;
-	int16 h_4 = _hh / 2;
+	int16 quarterWidth = _halfWidth / 2;
+	int16 quarterHeight = _halfHeight / 2;
 
-	for (int16 i = 0; i < _frame_cnt; i++) {
+	for (int16 i = 0; i < _frameCount; i++) {
 		_ampls[i].resize(frmsize);
 
-		for (int16 y = 0; y < _hh; y++)
-			for (int16 x = 0; x < _hw; x++) {
-				int16 dx = (x - w_4);
-				int16 dy = (y - h_4);
+		for (int16 y = 0; y < _halfHeight; y++)
+			for (int16 x = 0; x < _halfWidth; x++) {
+				int16 dx = (x - quarterWidth);
+				int16 dy = (y - quarterHeight);
 
-				_ampls[i][x + y * _hw] = ampl * sin(sqrt(dx * dx / (float)s_x + dy * dy / (float)s_y) / (-waveln * 3.1415926) + phase);
+				_ampls[i][x + y * _halfWidth] = ampl * sin(sqrt(dx * dx / (float)centerX + dy * dy / (float)centerY) / (-waveln * 3.1415926) + phase);
 			}
 		phase += spd;
 	}
@@ -68,66 +68,66 @@ WaveFx::~WaveFx() {
 }
 
 const Graphics::Surface *WaveFx::draw(const Graphics::Surface &srcSubRect) {
-	for (int16 y = 0; y < _hh; y++) {
+	for (int16 y = 0; y < _halfHeight; y++) {
 		uint16 *abc  = (uint16 *)_surface.getBasePtr(0, y);
-		uint16 *abc2  = (uint16 *)_surface.getBasePtr(0, _hh + y);
-		uint16 *abc3  = (uint16 *)_surface.getBasePtr(_hw, y);
-		uint16 *abc4  = (uint16 *)_surface.getBasePtr(_hw, _hh + y);
-
-		for (int16 x = 0; x < _hw; x++) {
-			int8 amnt = _ampls[_frame][x + _hw * y];
-
-			int16 n_x = x + amnt;
-			int16 n_y = y + amnt;
-
-			if (n_x < 0)
-				n_x = 0;
-			if (n_x >= _region.width())
-				n_x = _region.width() - 1;
-			if (n_y < 0)
-				n_y = 0;
-			if (n_y >= _region.height())
-				n_y = _region.height() - 1;
-			*abc = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
-
-			n_x = x + amnt + _hw;
-			n_y = y + amnt;
-
-			if (n_x < 0)
-				n_x = 0;
-			if (n_x >= _region.width())
-				n_x = _region.width() - 1;
-			if (n_y < 0)
-				n_y = 0;
-			if (n_y >= _region.height())
-				n_y = _region.height() - 1;
-			*abc3 = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
-
-			n_x = x + amnt;
-			n_y = y + amnt + _hh;
-
-			if (n_x < 0)
-				n_x = 0;
-			if (n_x >= _region.width())
-				n_x = _region.width() - 1;
-			if (n_y < 0)
-				n_y = 0;
-			if (n_y >= _region.height())
-				n_y = _region.height() - 1;
-			*abc2 = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
-
-			n_x = x + amnt + _hw;
-			n_y = y + amnt + _hh;
-
-			if (n_x < 0)
-				n_x = 0;
-			if (n_x >= _region.width())
-				n_x = _region.width() - 1;
-			if (n_y < 0)
-				n_y = 0;
-			if (n_y >= _region.height())
-				n_y = _region.height() - 1;
-			*abc4 = *(const uint16 *)srcSubRect.getBasePtr(n_x, n_y);
+		uint16 *abc2  = (uint16 *)_surface.getBasePtr(0, _halfHeight + y);
+		uint16 *abc3  = (uint16 *)_surface.getBasePtr(_halfWidth, y);
+		uint16 *abc4  = (uint16 *)_surface.getBasePtr(_halfWidth, _halfHeight + y);
+
+		for (int16 x = 0; x < _halfWidth; x++) {
+			int8 amnt = _ampls[_frame][x + _halfWidth * y];
+
+			int16 nX = x + amnt;
+			int16 nY = y + amnt;
+
+			if (nX < 0)
+				nX = 0;
+			if (nX >= _region.width())
+				nX = _region.width() - 1;
+			if (nY < 0)
+				nY = 0;
+			if (nY >= _region.height())
+				nY = _region.height() - 1;
+			*abc = *(const uint16 *)srcSubRect.getBasePtr(nX, nY);
+
+			nX = x + amnt + _halfWidth;
+			nY = y + amnt;
+
+			if (nX < 0)
+				nX = 0;
+			if (nX >= _region.width())
+				nX = _region.width() - 1;
+			if (nY < 0)
+				nY = 0;
+			if (nY >= _region.height())
+				nY = _region.height() - 1;
+			*abc3 = *(const uint16 *)srcSubRect.getBasePtr(nX, nY);
+
+			nX = x + amnt;
+			nY = y + amnt + _halfHeight;
+
+			if (nX < 0)
+				nX = 0;
+			if (nX >= _region.width())
+				nX = _region.width() - 1;
+			if (nY < 0)
+				nY = 0;
+			if (nY >= _region.height())
+				nY = _region.height() - 1;
+			*abc2 = *(const uint16 *)srcSubRect.getBasePtr(nX, nY);
+
+			nX = x + amnt + _halfWidth;
+			nY = y + amnt + _halfHeight;
+
+			if (nX < 0)
+				nX = 0;
+			if (nX >= _region.width())
+				nX = _region.width() - 1;
+			if (nY < 0)
+				nY = 0;
+			if (nY >= _region.height())
+				nY = _region.height() - 1;
+			*abc4 = *(const uint16 *)srcSubRect.getBasePtr(nX, nY);
 
 			abc++;
 			abc2++;
@@ -140,7 +140,7 @@ const Graphics::Surface *WaveFx::draw(const Graphics::Surface &srcSubRect) {
 }
 
 void WaveFx::update() {
-	_frame = (_frame + 1) % _frame_cnt;
+	_frame = (_frame + 1) % _frameCount;
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/effects/wave.h b/engines/zvision/graphics/effects/wave.h
index 0046dfceec..2e813ed5b6 100644
--- a/engines/zvision/graphics/effects/wave.h
+++ b/engines/zvision/graphics/effects/wave.h
@@ -33,7 +33,7 @@ class ZVision;
 class WaveFx : public Effect {
 public:
 
-	WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 s_x, int16 s_y, float ampl, float waveln, float spd);
+	WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd);
 	~WaveFx();
 
 	const Graphics::Surface *draw(const Graphics::Surface &srcSubRect);
@@ -42,8 +42,8 @@ public:
 
 private:
 	int16 _frame;
-	int16 _frame_cnt;
-	int16 _hw, _hh;
+	int16 _frameCount;
+	int16 _halfWidth, _halfHeight;
 	Common::Array< Common::Array< int8 > > _ampls;
 };
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 3e146939e3..05f8dec937 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -78,6 +78,7 @@ RenderManager::~RenderManager() {
 void RenderManager::renderBackbufferToScreen() {
 	Graphics::Surface *out = &_outWnd;
 	Graphics::Surface *in = &_wrkWnd;
+	Common::Rect outWndDirtyRect;
 
 	if (!_effects.empty()) {
 		bool copied = false;
@@ -114,22 +115,20 @@ void RenderManager::renderBackbufferToScreen() {
 		if (!_wrkWndDirtyRect.isEmpty()) {
 			_renderTable.mutateImage(&_outWnd, in);
 			out = &_outWnd;
-			_outWndDirtyRect = Common::Rect(_wrkWidth, _wrkHeight);
+			outWndDirtyRect = Common::Rect(_wrkWidth, _wrkHeight);
 		}
 	} else {
 		out = in;
-		_outWndDirtyRect = _wrkWndDirtyRect;
+		outWndDirtyRect = _wrkWndDirtyRect;
 	}
 
 
-	if (!_outWndDirtyRect.isEmpty()) {
-		_system->copyRectToScreen(out->getBasePtr(_outWndDirtyRect.left, _outWndDirtyRect.top), out->pitch,
-		                          _outWndDirtyRect.left + _workingWindow.left,
-		                          _outWndDirtyRect.top + _workingWindow.top,
-		                          _outWndDirtyRect.width(),
-		                          _outWndDirtyRect.height());
-
-		_outWndDirtyRect = Common::Rect();
+	if (!outWndDirtyRect.isEmpty()) {
+		_system->copyRectToScreen(out->getBasePtr(outWndDirtyRect.left, outWndDirtyRect.top), out->pitch,
+		                          outWndDirtyRect.left + _workingWindow.left,
+		                          outWndDirtyRect.top + _workingWindow.top,
+		                          outWndDirtyRect.width(),
+		                          outWndDirtyRect.height());
 	}
 }
 
@@ -472,7 +471,7 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 		return;
 
 	// Copy srcRect from src surface to dst surface
-	const byte *src_buf = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
+	const byte *srcBuffer = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
 
 	int xx = _x;
 	int yy = _y;
@@ -485,15 +484,15 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (_x >= dst.w || _y >= dst.h)
 		return;
 
-	byte *dst_buf = (byte *)dst.getBasePtr(xx, yy);
+	byte *dstBuffer = (byte *)dst.getBasePtr(xx, yy);
 
 	int32 w = srcRect.width();
 	int32 h = srcRect.height();
 
 	for (int32 y = 0; y < h; y++) {
-		memcpy(dst_buf, src_buf, w * src.format.bytesPerPixel);
-		src_buf += src.pitch;
-		dst_buf += dst.pitch;
+		memcpy(dstBuffer, srcBuffer, w * src.format.bytesPerPixel);
+		srcBuffer += src.pitch;
+		dstBuffer += dst.pitch;
 	}
 }
 
@@ -517,7 +516,7 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	uint32 _keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
 
 	// Copy srcRect from src surface to dst surface
-	const byte *src_buf = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
+	const byte *srcBuffer = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
 
 	int xx = _x;
 	int yy = _y;
@@ -530,7 +529,7 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (_x >= dst.w || _y >= dst.h)
 		return;
 
-	byte *dst_buf = (byte *)dst.getBasePtr(xx, yy);
+	byte *dstBuffer = (byte *)dst.getBasePtr(xx, yy);
 
 	int32 w = srcRect.width();
 	int32 h = srcRect.height();
@@ -538,37 +537,37 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	for (int32 y = 0; y < h; y++) {
 		switch (src.format.bytesPerPixel) {
 		case 1: {
-			const uint *src_tmp = (const uint *)src_buf;
-			uint *dst_tmp = (uint *)dst_buf;
+			const uint *srcTemp = (const uint *)srcBuffer;
+			uint *dstTemp = (uint *)dstBuffer;
 			for (int32 x = 0; x < w; x++) {
-				if (*src_tmp != _keycolor)
-					*dst_tmp = *src_tmp;
-				src_tmp++;
-				dst_tmp++;
+				if (*srcTemp != _keycolor)
+					*dstTemp = *srcTemp;
+				srcTemp++;
+				dstTemp++;
 			}
 		}
 		break;
 
 		case 2: {
-			const uint16 *src_tmp = (const uint16 *)src_buf;
-			uint16 *dst_tmp = (uint16 *)dst_buf;
+			const uint16 *srcTemp = (const uint16 *)srcBuffer;
+			uint16 *dstTemp = (uint16 *)dstBuffer;
 			for (int32 x = 0; x < w; x++) {
-				if (*src_tmp != _keycolor)
-					*dst_tmp = *src_tmp;
-				src_tmp++;
-				dst_tmp++;
+				if (*srcTemp != _keycolor)
+					*dstTemp = *srcTemp;
+				srcTemp++;
+				dstTemp++;
 			}
 		}
 		break;
 
 		case 4: {
-			const uint32 *src_tmp = (const uint32 *)src_buf;
-			uint32 *dst_tmp = (uint32 *)dst_buf;
+			const uint32 *srcTemp = (const uint32 *)srcBuffer;
+			uint32 *dstTemp = (uint32 *)dstBuffer;
 			for (int32 x = 0; x < w; x++) {
-				if (*src_tmp != _keycolor)
-					*dst_tmp = *src_tmp;
-				src_tmp++;
-				dst_tmp++;
+				if (*srcTemp != _keycolor)
+					*dstTemp = *srcTemp;
+				srcTemp++;
+				dstTemp++;
 			}
 		}
 		break;
@@ -576,8 +575,8 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 		default:
 			break;
 		}
-		src_buf += src.pitch;
-		dst_buf += dst.pitch;
+		srcBuffer += src.pitch;
+		dstBuffer += dst.pitch;
 	}
 }
 
@@ -796,7 +795,7 @@ uint16 RenderManager::createSubArea(const Common::Rect &area) {
 	sub.redraw = false;
 	sub.timer = -1;
 	sub.todelete = false;
-	sub._r = area;
+	sub.r = area;
 
 	_subsList[_subid] = sub;
 
@@ -810,8 +809,8 @@ uint16 RenderManager::createSubArea() {
 	sub.redraw = false;
 	sub.timer = -1;
 	sub.todelete = false;
-	sub._r = Common::Rect(_subWndRect.left, _subWndRect.top, _subWndRect.right, _subWndRect.bottom);
-	sub._r.translate(-_workingWindow.left, -_workingWindow.top);
+	sub.r = Common::Rect(_subWndRect.left, _subWndRect.top, _subWndRect.right, _subWndRect.bottom);
+	sub.r.translate(-_workingWindow.left, -_workingWindow.top);
 
 	_subsList[_subid] = sub;
 
@@ -831,7 +830,7 @@ void RenderManager::deleteSubArea(uint16 id, int16 delay) {
 void RenderManager::updateSubArea(uint16 id, const Common::String &txt) {
 	if (_subsList.contains(id)) {
 		oneSub *sub = &_subsList[id];
-		sub->_txt = txt;
+		sub->txt = txt;
 		sub->redraw = true;
 	}
 }
@@ -857,11 +856,11 @@ void RenderManager::processSubs(uint16 deltatime) {
 
 		for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
 			oneSub *sub = &it->_value;
-			if (sub->_txt.size()) {
+			if (sub->txt.size()) {
 				Graphics::Surface *rndr = new Graphics::Surface();
-				rndr->create(sub->_r.width(), sub->_r.height(), _pixelFormat);
-				_engine->getTextRenderer()->drawTxtInOneLine(sub->_txt, *rndr);
-				blitSurfaceToSurface(*rndr, _subWnd, sub->_r.left - _subWndRect.left + _workingWindow.left, sub->_r.top - _subWndRect.top + _workingWindow.top);
+				rndr->create(sub->r.width(), sub->r.height(), _pixelFormat);
+				_engine->getTextRenderer()->drawTxtInOneLine(sub->txt, *rndr);
+				blitSurfaceToSurface(*rndr, _subWnd, sub->r.left - _subWndRect.left + _workingWindow.left, sub->r.top - _subWndRect.top + _workingWindow.top);
 				rndr->free();
 				delete rndr;
 			}
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index d34ecf8ce0..7723c3d0f3 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -54,21 +54,13 @@ public:
 
 private:
 	struct oneSub {
-		Common::Rect _r;
-		Common::String _txt;
+		Common::Rect r;
+		Common::String txt;
 		int16  timer;
 		bool todelete;
 		bool redraw;
 	};
-//	struct AlphaDataEntry {
-//		Graphics::Surface *data;
-//		uint16 alphaColor;
-//		uint16 destX;
-//		uint16 destY;
-//		uint16 width;
-//		uint16 height;
-//	};
-//
+
 	typedef Common::HashMap<uint16, oneSub> subMap;
 	typedef Common::List<Effect *> effectsList;
 
@@ -82,37 +74,25 @@ private:
 
 	Common::Rect _wrkWndDirtyRect;
 
+	// A buffer for mutate image by tilt or panorama renderers
 	Graphics::Surface _outWnd;
 
-	Common::Rect _outWndDirtyRect;
-
 	Common::Rect _bkgDirtyRect;
 
+	// A buffer for subtitles
 	Graphics::Surface _subWnd;
 
 	Common::Rect _subWndDirtyRect;
 
+	// A buffer for menu drawing
 	Graphics::Surface _menuWnd;
 
 	Common::Rect _menuWndDirtyRect;
 
+	// A buffer used for apply graphics effects
 	Graphics::Surface _effectWnd;
 
 
-	// A buffer the exact same size as the workingWindow
-	// This buffer stores everything un-warped, then does a warp at the end of the frame
-	//Graphics::Surface _workingWindowBuffer;
-	// A buffer representing the entire screen. Any graphical updates are first done with this buffer
-	// before actually being blitted to the screen
-	//Graphics::Surface _backBuffer;
-	// A list of Alpha Entries that need to be blitted to the backbuffer
-	//AlphaEntryMap _alphaDataEntries;
-
-	// A rectangle representing the portion of the working window where the pixels have been changed since last frame
-	//Common::Rect _workingWindowDirtyRect;
-	// A rectangle representing the portion of the backbuffer where the pixels have been changed since last frame
-	//Common::Rect _backBufferDirtyRect;
-
 	/** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */
 	const int _wrkWidth;
 	/** Height of the working window. Saved to prevent extraneous calls to _workingWindow.height() */
@@ -129,13 +109,16 @@ private:
 	 */
 	const Common::Rect _workingWindow;
 
+	// Recatangle for subtitles area
 	Common::Rect _subWndRect;
 
+	// Recatangle for menu area
 	Common::Rect _menuWndRect;
 
 	/** Used to warp the background image */
 	RenderTable _renderTable;
 
+	// A buffer for background image
 	Graphics::Surface _curBkg;
 	/** The (x1,y1) coordinates of the subRectangle of the background that is currently displayed on the screen */
 	int16 _bkgOff;
@@ -144,18 +127,13 @@ private:
 	/** The height of the current background image */
 	uint16 _bkgHeight;
 
+	// Internal subtitles counter
 	uint16 _subid;
 
+	// Subtitle list
 	subMap _subsList;
 
-	/**
-	 * The "velocity" at which the background image is panning. We actually store the inverse of velocity (ms/pixel instead of pixels/ms)
-	 * because it allows you to accumulate whole pixels 'steps' instead of rounding pixels every frame
-	 */
-	//int _backgroundInverseVelocity;
-	/** Holds any 'leftover' milliseconds between frames */
-	//uint _accumulatedVelocityMilliseconds;
-
+	// Visual effects list
 	effectsList _effects;
 
 public:
@@ -178,13 +156,22 @@ public:
 	/**
 	 * Blits the image or a portion of the image to the background.
 	 *
-	 * @param fileName        Name of the image file
-	 * @param destinationX    X position where the image should be put. Coords are in working window space, not screen space!
-	 * @param destinationY    Y position where the image should be put. Coords are in working window space, not screen space!
+	 * @param fileName   Name of the image file
+	 * @param destX      X position where the image should be put. Coords are in working window space, not screen space!
+	 * @param destY      Y position where the image should be put. Coords are in working window space, not screen space!
 	 * @param colorkey   Transparent color
 	 */
 	void renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, uint32 colorkey);
 
+	/**
+	 * Blits the image or a portion of the image to the background.
+	 *
+	 * @param fileName   Name of the image file
+	 * @param destX      X position where the image should be put. Coords are in working window space, not screen space!
+	 * @param destY      Y position where the image should be put. Coords are in working window space, not screen space!
+	 * @param keyX       X position of transparent color
+	 * @param keyY       Y position of transparent color
+	 */
 	void renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY, int16 keyX, int16 keyY);
 
 	/**
@@ -215,7 +202,10 @@ public:
 	 */
 	const Common::Point screenSpaceToImageSpace(const Common::Point &point);
 
+	// Return pointer of RenderTable object
 	RenderTable *getRenderTable();
+
+	// Return current background offset
 	uint32 getCurrentBackgroundOffset();
 
 	/**
@@ -229,39 +219,64 @@ public:
 	 */
 	static Graphics::Surface *tranposeSurface(const Graphics::Surface *surface);
 
+	// Scale buffer (nearest)
 	void scaleBuffer(const void *src, void *dst, uint32 srcWidth, uint32 srcHeight, byte bytesPerPixel, uint32 dstWidth, uint32 dstHeight);
 
-
+	// Blitting surface-to-surface methods
 	void blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int x, int y);
 	void blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y, uint32 colorkey);
 	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y);
 	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey);
+
+	// Blitting surface-to-background methods
 	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y);
 	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey);
+
+	// Blitting surface-to-background methods with scale
 	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect);
 	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, uint32 colorkey);
+
+	// Blitting surface-to-menu methods
 	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y);
 	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey);
 
+	// Subtitles methods
+
+	// Create subtitle area and return ID
 	uint16 createSubArea(const Common::Rect &area);
 	uint16 createSubArea();
+
+	// Delete subtitle by ID
 	void deleteSubArea(uint16 id);
 	void deleteSubArea(uint16 id, int16 delay);
+
+	// Update subtitle area
 	void updateSubArea(uint16 id, const Common::String &txt);
+
+	// Processing subtitles
 	void processSubs(uint16 deltatime);
 
+
+	// Return background size
 	Common::Point getBkgSize();
 
+	// Return portion of background as new surface
 	Graphics::Surface *getBkgRect(Common::Rect &rect);
+
+	// Load image into new surface
 	Graphics::Surface *loadImage(const char *file);
 	Graphics::Surface *loadImage(Common::String &file);
 	Graphics::Surface *loadImage(const char *file, bool transposed);
 	Graphics::Surface *loadImage(Common::String &file, bool transposed);
 
+	// Clear whole/area of menu surface
 	void clearMenuSurface();
 	void clearMenuSurface(const Common::Rect &r);
+
+	// Copy menu buffer to screen
 	void renderMenuToScreen();
 
+	// Copy needed portion of background surface to workingWindow surface
 	void prepareBkg();
 
 	/**
@@ -275,17 +290,44 @@ public:
 	 * @param destination    A reference to the Surface to store the pixel data in
 	 */
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination);
+
+	/**
+	 * Reads an image file pixel data into a Surface buffer. In the process
+	 * it converts the pixel data from RGB 555 to RGB 565. Also, if the image
+	 * is transposed, it will un-transpose the pixel data. The function will
+	 * call destination::create() if the dimensions of destination do not match
+	 * up with the dimensions of the image.
+	 *
+	 * @param fileName       The name of a .tga file
+	 * @param destination    A reference to the Surface to store the pixel data in
+	 * @param transposed     Transpose flag
+	 */
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed);
 
+	// Add visual effect to effects list
 	void addEffect(Effect *_effect);
+
+	// Delete effect(s) by ID (ID equal to slot of action:region that create this effect)
 	void deleteEffect(uint32 ID);
+
+	// Create "mask" for effects - (color +/- depth) will be selected as not transparent. Like color selection
+	// xy - base color
+	// depth - +/- of base color
+	// rect - rectangle where select pixels
+	// minD - if not NULL will recieve real bottom border of depth
+	// maxD - if not NULL will recieve real top border of depth
 	EffectMap *makeEffectMap(const Common::Point &xy, int16 depth, const Common::Rect &rect, int8 *minD, int8 *maxD);
+
+	// Create "mask" for effects by simple transparent color
 	EffectMap *makeEffectMap(const Graphics::Surface &surf, uint16 transp);
 
+	// Return background rectangle in screen coordinates
 	Common::Rect bkgRectToScreen(const Common::Rect &src);
 
+	// Mark whole background surface as dirty
 	void markDirty();
 
+	// Fille background surface by color
 	void bkgFill(uint8 r, uint8 g, uint8 b);
 };
 
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 199f96bf47..f7927650d9 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -1,5 +1,5 @@
 MODULE := engines/zvision
- 
+
 MODULE_OBJS := \
 	animation/meta_animation.o \
 	animation/rlf_animation.o \
@@ -53,15 +53,15 @@ MODULE_OBJS := \
 	utility/win_keys.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
-	zvision.o 
- 
+	zvision.o
+
 MODULE_DIRS += \
 	engines/zvision
- 
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_ZVISION), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
- 
-# Include common rules 
+
+# Include common rules
 include $(srcdir)/rules.mk
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 31f68d7953..8ff6bd0496 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -275,7 +275,7 @@ bool ActionDissolve::execute() {
 
 ActionDistort::ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
-	sscanf(line.c_str(), "%hd %hd %f %f %f %f", &_distSlot, &_speed, &_st_angl, &_en_angl, &_st_lin, &_en_lin);
+	sscanf(line.c_str(), "%hd %hd %f %f %f %f", &_distSlot, &_speed, &_startAngle, &_endAngle, &_startLineScale, &_endLineScale);
 }
 
 ActionDistort::~ActionDistort() {
@@ -286,7 +286,7 @@ bool ActionDistort::execute() {
 	if (_engine->getScriptManager()->getSideFX(_distSlot))
 		return true;
 
-	_engine->getScriptManager()->addSideFX(new DistortNode(_engine, _distSlot, _speed, _st_angl, _en_angl, _st_lin, _en_lin));
+	_engine->getScriptManager()->addSideFX(new DistortNode(_engine, _distSlot, _speed, _startAngle, _endAngle, _startLineScale, _endLineScale));
 
 	return true;
 }
@@ -345,22 +345,22 @@ ActionInventory::ActionInventory(ZVision *engine, int32 slotkey, const Common::S
 bool ActionInventory::execute() {
 	switch (_type) {
 	case 0: // add
-		_engine->getScriptManager()->invertory_add(_key);
+		_engine->getScriptManager()->inventoryAdd(_key);
 		break;
 	case 1: // addi
-		_engine->getScriptManager()->invertory_add(_engine->getScriptManager()->getStateValue(_key));
+		_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(_key));
 		break;
 	case 2: // drop
 		if (_key >= 0)
-			_engine->getScriptManager()->invertory_drop(_key);
+			_engine->getScriptManager()->inventoryDrop(_key);
 		else
-			_engine->getScriptManager()->invertory_drop(_engine->getScriptManager()->getStateValue(StateKey_InventoryItem));
+			_engine->getScriptManager()->inventoryDrop(_engine->getScriptManager()->getStateValue(StateKey_InventoryItem));
 		break;
 	case 3: // dropi
-		_engine->getScriptManager()->invertory_drop(_engine->getScriptManager()->getStateValue(_key));
+		_engine->getScriptManager()->inventoryDrop(_engine->getScriptManager()->getStateValue(_key));
 		break;
 	case 4: // cycle
-		_engine->getScriptManager()->invertory_cycle();
+		_engine->getScriptManager()->inventoryCycle();
 		break;
 	default:
 		break;
@@ -463,20 +463,20 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 
 ActionMusic::~ActionMusic() {
 	if (!_universe)
-		_engine->getScriptManager()->killSideFx(_slotkey);
+		_engine->getScriptManager()->killSideFx(_slotKey);
 }
 
 bool ActionMusic::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotkey))
+	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
 
 	if (_midi) {
-		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotkey, _prog, _note, _volume));
+		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, _volume));
 	} else {
 		if (!_engine->getSearchManager()->hasFile(_fileName))
 			return true;
 
-		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotkey, _fileName, _loop, _volume));
+		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotKey, _fileName, _loop, _volume));
 	}
 
 	return true;
@@ -489,20 +489,20 @@ bool ActionMusic::execute() {
 ActionPanTrack::ActionPanTrack(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey),
 	_pos(0),
-	_mus_slot(0) {
+	_musicSlot(0) {
 
-	sscanf(line.c_str(), "%u %d", &_mus_slot, &_pos);
+	sscanf(line.c_str(), "%u %d", &_musicSlot, &_pos);
 }
 
 ActionPanTrack::~ActionPanTrack() {
-	_engine->getScriptManager()->killSideFx(_slotkey);
+	_engine->getScriptManager()->killSideFx(_slotKey);
 }
 
 bool ActionPanTrack::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotkey))
+	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
 
-	_engine->getScriptManager()->addSideFX(new PanTrackNode(_engine, _slotkey, _mus_slot, _pos));
+	_engine->getScriptManager()->addSideFX(new PanTrackNode(_engine, _slotKey, _musicSlot, _pos));
 
 	return true;
 }
@@ -549,18 +549,18 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, c
 }
 
 ActionPreloadAnimation::~ActionPreloadAnimation() {
-	_engine->getScriptManager()->deleteSideFx(_slotkey);
+	_engine->getScriptManager()->deleteSideFx(_slotKey);
 }
 
 bool ActionPreloadAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotkey);
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotKey);
 
 	if (!nod) {
-		nod = new AnimationNode(_engine, _slotkey, _fileName, _mask, _framerate, false);
+		nod = new AnimationNode(_engine, _slotKey, _fileName, _mask, _framerate, false);
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
-	_engine->getScriptManager()->setStateValue(_slotkey, 2);
+	_engine->getScriptManager()->setStateValue(_slotKey, 2);
 	return true;
 }
 
@@ -607,20 +607,20 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 }
 
 ActionPlayAnimation::~ActionPlayAnimation() {
-	_engine->getScriptManager()->deleteSideFx(_slotkey);
+	_engine->getScriptManager()->deleteSideFx(_slotKey);
 }
 
 bool ActionPlayAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotkey);
+	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotKey);
 
 	if (!nod) {
-		nod = new AnimationNode(_engine, _slotkey, _fileName, _mask, _framerate);
+		nod = new AnimationNode(_engine, _slotKey, _fileName, _mask, _framerate);
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
 
 	if (nod)
-		nod->addPlayNode(_slotkey, _x, _y, _x2, _y2, _start, _end, _loopCount);
+		nod->addPlayNode(_slotKey, _x, _y, _x2, _y2, _start, _end, _loopCount);
 
 	return true;
 }
@@ -641,7 +641,7 @@ bool ActionPlayPreloadAnimation::execute() {
 	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_controlKey);
 
 	if (nod)
-		nod->addPlayNode(_slotkey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
+		nod->addPlayNode(_slotKey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
 
 	return true;
 }
@@ -676,20 +676,20 @@ ActionRegion::ActionRegion(ZVision *engine, int32 slotkey, const Common::String
 }
 
 ActionRegion::~ActionRegion() {
-	_engine->getScriptManager()->killSideFx(_slotkey);
+	_engine->getScriptManager()->killSideFx(_slotKey);
 }
 
 bool ActionRegion::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotkey))
+	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
 
 	Effect *effct = NULL;
 	switch (_type) {
 	case 0: {
-		uint16 s_x, s_y, frames;
+		uint16 centerX, centerY, frames;
 		double amplitude, waveln, speed;
-		sscanf(_custom.c_str(), "%hu,%hu,%hu,%lf,%lf,%lf,", &s_x, &s_y, &frames, &amplitude, &waveln, &speed);
-		effct = new WaveFx(_engine, _slotkey, _rect, _unk1, frames, s_x, s_y, amplitude, waveln, speed);
+		sscanf(_custom.c_str(), "%hu,%hu,%hu,%lf,%lf,%lf,", &centerX, &centerY, &frames, &amplitude, &waveln, &speed);
+		effct = new WaveFx(_engine, _slotKey, _rect, _unk1, frames, centerX, centerY, amplitude, waveln, speed);
 	}
 	break;
 	case 1: {
@@ -701,7 +701,7 @@ bool ActionRegion::execute() {
 		int8 minD;
 		int8 maxD;
 		EffectMap *_map = _engine->getRenderManager()->makeEffectMap(Common::Point(aX, aY), aD, _rect, &minD, &maxD);
-		effct = new LightFx(_engine, _slotkey, _rect, _unk1, _map, atoi(_custom.c_str()), minD, maxD);
+		effct = new LightFx(_engine, _slotKey, _rect, _unk1, _map, atoi(_custom.c_str()), minD, maxD);
 	}
 	break;
 	case 9: {
@@ -717,7 +717,7 @@ bool ActionRegion::execute() {
 			_rect.setHeight(tempMask.h);
 
 		EffectMap *_map = _engine->getRenderManager()->makeEffectMap(tempMask, 0);
-		effct = new FogFx(_engine, _slotkey, _rect, _unk1, _map, Common::String(buf));
+		effct = new FogFx(_engine, _slotKey, _rect, _unk1, _map, Common::String(buf));
 	}
 	break;
 	default:
@@ -725,7 +725,7 @@ bool ActionRegion::execute() {
 	}
 
 	if (effct) {
-		_engine->getScriptManager()->addSideFX(new RegionNode(_engine, _slotkey, effct, _delay));
+		_engine->getScriptManager()->addSideFX(new RegionNode(_engine, _slotKey, effct, _delay));
 		_engine->getRenderManager()->addEffect(effct);
 	}
 
@@ -738,10 +738,10 @@ bool ActionRegion::execute() {
 
 ActionRandom::ActionRandom(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
-	char max_buf[64];
-	memset(max_buf, 0, 64);
-	sscanf(line.c_str(), "%s", max_buf);
-	_max = new ValueSlot(_engine->getScriptManager(), max_buf);
+	char maxBuffer[64];
+	memset(maxBuffer, 0, 64);
+	sscanf(line.c_str(), "%s", maxBuffer);
+	_max = new ValueSlot(_engine->getScriptManager(), maxBuffer);
 }
 
 ActionRandom::~ActionRandom() {
@@ -751,7 +751,7 @@ ActionRandom::~ActionRandom() {
 
 bool ActionRandom::execute() {
 	uint randNumber = _engine->getRandomSource()->getRandomNumber(_max->getValue());
-	_engine->getScriptManager()->setStateValue(_slotkey, randNumber);
+	_engine->getScriptManager()->setStateValue(_slotKey, randNumber);
 	return true;
 }
 
@@ -941,9 +941,9 @@ bool ActionStreamVideo::execute() {
 ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
 	char fileName[25];
-	int not_used;
+	int notUsed;
 
-	sscanf(line.c_str(), "%d %d %25s", &_syncto, &not_used, fileName);
+	sscanf(line.c_str(), "%d %d %25s", &_syncto, &notUsed, fileName);
 
 	_fileName = Common::String(fileName);
 }
@@ -960,7 +960,7 @@ bool ActionSyncSound::execute() {
 	if (animnode->getFrameDelay() > 200) // Hack for fix incorrect framedelay in some animpreload
 		animnode->setNewFrameDelay(66); // ~15fps
 
-	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotkey, _fileName, _syncto));
+	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotKey, _fileName, _syncto));
 	return true;
 }
 
@@ -970,22 +970,22 @@ bool ActionSyncSound::execute() {
 
 ActionTimer::ActionTimer(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
-	char time_buf[64];
-	memset(time_buf, 0, 64);
-	sscanf(line.c_str(), "%s", time_buf);
-	_time = new ValueSlot(_engine->getScriptManager(), time_buf);
+	char timeBuffer[64];
+	memset(timeBuffer, 0, 64);
+	sscanf(line.c_str(), "%s", timeBuffer);
+	_time = new ValueSlot(_engine->getScriptManager(), timeBuffer);
 }
 
 ActionTimer::~ActionTimer() {
 	if (_time)
 		delete _time;
-	_engine->getScriptManager()->killSideFx(_slotkey);
+	_engine->getScriptManager()->killSideFx(_slotKey);
 }
 
 bool ActionTimer::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotkey))
+	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
-	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _slotkey, _time->getValue()));
+	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _slotKey, _time->getValue()));
 	return true;
 }
 
@@ -1003,13 +1003,13 @@ ActionTtyText::ActionTtyText(ZVision *engine, int32 slotkey, const Common::Strin
 }
 
 ActionTtyText::~ActionTtyText() {
-	_engine->getScriptManager()->killSideFx(_slotkey);
+	_engine->getScriptManager()->killSideFx(_slotKey);
 }
 
 bool ActionTtyText::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotkey))
+	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
-	_engine->getScriptManager()->addSideFX(new ttyTextNode(_engine, _slotkey, _filename, _r, _delay));
+	_engine->getScriptManager()->addSideFX(new ttyTextNode(_engine, _slotKey, _filename, _r, _delay));
 	return true;
 }
 
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 5401af0876..03a249e580 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -41,7 +41,7 @@ class ValueSlot;
   */
 class ResultAction {
 public:
-	ResultAction(ZVision *engine, int32 slotkey) : _engine(engine), _slotkey(slotkey) {}
+	ResultAction(ZVision *engine, int32 slotkey) : _engine(engine), _slotKey(slotkey) {}
 	virtual ~ResultAction() {}
 	/**
 	 * This is called by the script system whenever a Puzzle's criteria are found to be true.
@@ -54,40 +54,8 @@ public:
 	virtual bool execute() = 0;
 protected:
 	ZVision *_engine;
-	int32 _slotkey;
-};
-
-
-// The different types of actions
-// DEBUG,
-// DISABLE_CONTROL,
-// DISABLE_VENUS,
-// DISPLAY_MESSAGE,
-// DISSOLVE,
-// DISTORT,
-// ENABLE_CONTROL,
-// FLUSH_MOUSE_EVENTS,
-// INVENTORY,
-// KILL,
-// MENU_BAR_ENABLE,
-// MUSIC,
-// PAN_TRACK,
-// PLAY_PRELOAD,
-// PREFERENCES,
-// QUIT,
-// RANDOM,
-// REGION,
-// RESTORE_GAME,
-// ROTATE_TO,
-// SAVE_GAME,
-// SET_PARTIAL_SCREEN,
-// SET_SCREEN,
-// SET_VENUS,
-// STOP,
-// STREAM_VIDEO,
-// SYNC_SOUND,
-// TTY_TEXT,
-// UNIVERSE_MUSIC,
+	int32 _slotKey;
+};
 
 class ActionAdd : public ResultAction {
 public:
@@ -217,10 +185,10 @@ public:
 private:
 	int16 _distSlot;
 	int16 _speed;
-	float _st_angl;
-	float _en_angl;
-	float _st_lin;
-	float _en_lin;
+	float _startAngle;
+	float _endAngle;
+	float _startLineScale;
+	float _endLineScale;
 };
 
 class ActionEnableControl : public ResultAction {
@@ -290,7 +258,7 @@ public:
 
 private:
 	int32 _pos;
-	uint32 _mus_slot;
+	uint32 _musicSlot;
 };
 
 class ActionPlayAnimation : public ResultAction {
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index 9c8156961c..e69d57f75c 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -106,24 +106,24 @@ void Control::parseTiltControl(ZVision *engine, Common::SeekableReadStream &stre
 	renderTable->generateRenderTable();
 }
 
-void Control::getParams(const Common::String &input_str, Common::String &parameter, Common::String &values) {
-	const char *chrs = input_str.c_str();
+void Control::getParams(const Common::String &inputStr, Common::String &parameter, Common::String &values) {
+	const char *chrs = inputStr.c_str();
 	uint lbr;
 
-	for (lbr = 0; lbr < input_str.size(); lbr++)
+	for (lbr = 0; lbr < inputStr.size(); lbr++)
 		if (chrs[lbr] == '(')
 			break;
 
-	if (lbr >= input_str.size())
+	if (lbr >= inputStr.size())
 		return;
 
 	uint rbr;
 
-	for (rbr = lbr + 1; rbr < input_str.size(); rbr++)
+	for (rbr = lbr + 1; rbr < inputStr.size(); rbr++)
 		if (chrs[rbr] == ')')
 			break;
 
-	if (rbr >= input_str.size())
+	if (rbr >= inputStr.size())
 		return;
 
 	parameter = Common::String(chrs, chrs + lbr);
@@ -131,9 +131,9 @@ void Control::getParams(const Common::String &input_str, Common::String &paramet
 }
 
 void Control::setVenus() {
-	if (_venus_id >= 0)
-		if (_engine->getScriptManager()->getStateValue(_venus_id) > 0)
-			_engine->getScriptManager()->setStateValue(StateKey_Venus, _venus_id);
+	if (_venusId >= 0)
+		if (_engine->getScriptManager()->getStateValue(_venusId) > 0)
+			_engine->getScriptManager()->setStateValue(StateKey_Venus, _venusId);
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index b784a66913..5814c9e419 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -54,7 +54,7 @@ public:
 		CONTROL_PAINT
 	};
 
-	Control(ZVision *engine, uint32 key, ControlType type) : _engine(engine), _key(key), _type(type), _venus_id(-1) {}
+	Control(ZVision *engine, uint32 key, ControlType type) : _engine(engine), _key(key), _type(type), _venusId(-1) {}
 	virtual ~Control() {}
 
 	uint32 getKey() {
@@ -120,14 +120,15 @@ public:
 	virtual bool process(uint32 deltaTimeInMillis) {
 		return false;
 	}
+
 	void setVenus();
 
 protected:
 	ZVision *_engine;
 	uint32 _key;
-	int32 _venus_id;
+	int32 _venusId;
 
-	void getParams(const Common::String &input_str, Common::String &parameter, Common::String &values);
+	void getParams(const Common::String &inputStr, Common::String &parameter, Common::String &values);
 // Static member functions
 public:
 	static void parseFlatControl(ZVision *engine);
@@ -137,15 +138,6 @@ private:
 	ControlType _type;
 };
 
-// TODO: Implement InputControl
-// TODO: Implement SaveControl
-// TODO: Implement SlotControl
-// TODO: Implement SafeControl
-// TODO: Implement FistControl
-// TODO: Implement HotMovieControl
-// TODO: Implement PaintControl
-// TODO: Implement TilterControl
-
 } // End of namespace ZVision
 
 #endif
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 185bea09d2..9bb03cba51 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -80,7 +80,7 @@ FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		} else if (param.matchString("animation_id", true)) {
 			_animationId = atoi(values.c_str());
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
@@ -152,13 +152,13 @@ bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	int n_fist = mouseIn(screenSpacePos, backgroundImageSpacePos);
+	int fistNumber = mouseIn(screenSpacePos, backgroundImageSpacePos);
 
-	if (n_fist >= 0) {
+	if (fistNumber >= 0) {
 		setVenus();
 
 		uint32 oldStatus = _fiststatus;
-		_fiststatus ^= (1 << n_fist);
+		_fiststatus ^= (1 << fistNumber);
 
 		for (int i = 0; i < _numEntries; i++)
 			if (_entries[i]._bitsStrt == oldStatus && _entries[i]._bitsEnd == _fiststatus) {
@@ -233,12 +233,12 @@ void FistControl::readDescFile(const Common::String &fileName) {
 			(_fistsDwn[fist])[box] = Common::Rect(x1, y1, x2, y2);
 		} else {
 			int  entry, start, end, sound;
-			char bits_start[33];
-			char bits_end[33];
+			char bitsStart[33];
+			char bitsEnd[33];
 			entry = atoi(param.c_str());
-			if (sscanf(values.c_str(), "%s %s %d %d (%d)", bits_start, bits_end, &start, &end, &sound) == 5) {
-				_entries[entry]._bitsStrt = readBits(bits_start);
-				_entries[entry]._bitsEnd = readBits(bits_end);
+			if (sscanf(values.c_str(), "%s %s %d %d (%d)", bitsStart, bitsEnd, &start, &end, &sound) == 5) {
+				_entries[entry]._bitsStrt = readBits(bitsStart);
+				_entries[entry]._bitsEnd = readBits(bitsEnd);
 				_entries[entry]._anmStrt = start;
 				_entries[entry]._anmEnd = end;
 				_entries[entry]._sound = sound;
@@ -293,24 +293,24 @@ int FistControl::mouseIn(const Common::Point &screenSpacePos, const Common::Poin
 	return -1;
 }
 
-void FistControl::getFistParams(const Common::String &input_str, Common::String &parameter, Common::String &values) {
-	const char *chrs = input_str.c_str();
+void FistControl::getFistParams(const Common::String &inputStr, Common::String &parameter, Common::String &values) {
+	const char *chrs = inputStr.c_str();
 	uint lbr;
 
-	for (lbr = 0; lbr < input_str.size(); lbr++)
+	for (lbr = 0; lbr < inputStr.size(); lbr++)
 		if (chrs[lbr] == ':')
 			break;
 
-	if (lbr >= input_str.size())
+	if (lbr >= inputStr.size())
 		return;
 
 	uint rbr;
 
-	for (rbr = lbr + 1; rbr < input_str.size(); rbr++)
+	for (rbr = lbr + 1; rbr < inputStr.size(); rbr++)
 		if (chrs[rbr] == '~')
 			break;
 
-	if (rbr >= input_str.size())
+	if (rbr >= inputStr.size())
 		return;
 
 	parameter = Common::String(chrs, chrs + lbr);
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index 8b229f964a..33c3c7b579 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -79,7 +79,7 @@ private:
 	void clearFistArray(Common::Array< Common::Array<Common::Rect> > &arr);
 	uint32 readBits(const char *str);
 	int mouseIn(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
-	void getFistParams(const Common::String &input_str, Common::String &parameter, Common::String &values);
+	void getFistParams(const Common::String &inputStr, Common::String &parameter, Common::String &values);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 6969ee1bfe..fd7afb92d1 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -44,12 +44,12 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 	: Control(engine, key, CONTROL_HOTMOV) {
 	_animation = NULL;
 	_cycle = 0;
-	_cur_frame = -1;
+	_curFrame = -1;
 	_lastRenderedFrame = -1;
 	_frames.clear();
-	_frame_time = 0;
-	_num_cycles = 0;
-	_num_frames = 0;
+	_frameTime = 0;
+	_cyclesCount = 0;
+	_framesCount = 0;
 
 	_engine->getScriptManager()->setStateValue(_key, 0);
 
@@ -73,16 +73,16 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 
 			_rectangle = Common::Rect(x, y, width, height);
 		} else if (param.matchString("num_frames", true)) {
-			_num_frames = atoi(values.c_str());
+			_framesCount = atoi(values.c_str());
 		} else if (param.matchString("num_cycles", true)) {
-			_num_cycles = atoi(values.c_str());
+			_cyclesCount = atoi(values.c_str());
 		} else if (param.matchString("animation", true)) {
 			char filename[64];
 			sscanf(values.c_str(), "%s", filename);
 			values = Common::String(filename);
 			_animation = new MetaAnimation(values, _engine);
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
@@ -117,21 +117,21 @@ bool HotMovControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_cycle < _num_cycles) {
-		_frame_time -= deltaTimeInMillis;
+	if (_cycle < _cyclesCount) {
+		_frameTime -= deltaTimeInMillis;
 
-		if (_frame_time <= 0) {
-			_cur_frame++;
-			if (_cur_frame >= _num_frames) {
-				_cur_frame = 0;
+		if (_frameTime <= 0) {
+			_curFrame++;
+			if (_curFrame >= _framesCount) {
+				_curFrame = 0;
 				_cycle++;
 			}
-			if (_cycle != _num_cycles)
-				renderFrame(_cur_frame);
+			if (_cycle != _cyclesCount)
+				renderFrame(_curFrame);
 			else
 				_engine->getScriptManager()->setStateValue(_key, 2);
 
-			_frame_time = _animation->frameTime();
+			_frameTime = _animation->frameTime();
 		}
 	}
 
@@ -142,8 +142,8 @@ bool HotMovControl::onMouseMove(const Common::Point &screenSpacePos, const Commo
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_cycle < _num_cycles) {
-		if (_frames[_cur_frame].contains(backgroundImageSpacePos)) {
+	if (_cycle < _cyclesCount) {
+		if (_frames[_curFrame].contains(backgroundImageSpacePos)) {
 			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
 			return true;
 		}
@@ -156,8 +156,8 @@ bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common:
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_cycle < _num_cycles) {
-		if (_frames[_cur_frame].contains(backgroundImageSpacePos)) {
+	if (_cycle < _cyclesCount) {
+		if (_frames[_curFrame].contains(backgroundImageSpacePos)) {
 			setVenus();
 			_engine->getScriptManager()->setStateValue(_key, 1);
 			return true;
@@ -168,7 +168,7 @@ bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common:
 }
 
 void HotMovControl::readHsFile(const Common::String &fileName) {
-	if (_num_frames == 0)
+	if (_framesCount == 0)
 		return;
 
 	Common::File file;
@@ -179,7 +179,7 @@ void HotMovControl::readHsFile(const Common::String &fileName) {
 
 	Common::String line;
 
-	_frames.resize(_num_frames);
+	_frames.resize(_framesCount);
 
 	while (!file.eos()) {
 		line = file.readLine();
@@ -192,7 +192,7 @@ void HotMovControl::readHsFile(const Common::String &fileName) {
 
 		sscanf(line.c_str(), "%d:%d %d %d %d~", &frame, &x, &y, &width, &height);
 
-		if (frame >= 0 && frame < _num_frames)
+		if (frame >= 0 && frame < _framesCount)
 			_frames[frame] = Common::Rect(x, y, width, height);
 	}
 	file.close();
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index ea12bab82b..9e01b40bab 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -39,12 +39,12 @@ public:
 	~HotMovControl();
 
 private:
-	int32  _num_frames;
-	int32  _frame_time;
-	int32  _cur_frame;
+	int32  _framesCount;
+	int32  _frameTime;
+	int32  _curFrame;
 	int32  _lastRenderedFrame;
 	int32  _cycle;
-	int32  _num_cycles;
+	int32  _cyclesCount;
 	MetaAnimation *_animation;
 	Common::Rect _rectangle;
 	Common::Array<Common::Rect> _frames;
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 442c6cbc6a..8af436bb40 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -79,13 +79,13 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 			sscanf(values.c_str(), "%u", &fontFormatNumber);
 
-			_string_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
+			_stringInit.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
 		} else if (param.matchString("chooser_init_string", true)) {
 			uint fontFormatNumber;
 
 			sscanf(values.c_str(), "%u", &fontFormatNumber);
 
-			_string_chooser_init.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
+			_stringChooserInit.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
 		} else if (param.matchString("next_tabstop", true)) {
 			sscanf(values.c_str(), "%u", &_nextTabstop);
 		} else if (param.matchString("cursor_dimensions", true)) {
@@ -104,7 +104,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 			_focused = true;
 			_engine->getScriptManager()->setFocusControlKey(_key);
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
@@ -201,9 +201,9 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 		txt.create(_textRectangle.width(), _textRectangle.height(), _engine->_pixelFormat);
 
 		if (!_readOnly || !_focused)
-			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _string_init, txt);
+			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringInit, txt);
 		else
-			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _string_chooser_init, txt);
+			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringChooserInit, txt);
 
 		_engine->getRenderManager()->blitSurfaceToBkg(txt, _textRectangle.left, _textRectangle.top);
 
@@ -211,15 +211,15 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 	}
 
 	if (_animation && !_readOnly && _focused) {
-		bool need_draw = true;// = _textChanged;
+		bool needDraw = true;// = _textChanged;
 		_frameDelay -= deltaTimeInMillis;
 		if (_frameDelay <= 0) {
 			_frame = (_frame + 1) % _animation->frameCount();
 			_frameDelay = _animation->frameTime();
-			need_draw = true;
+			needDraw = true;
 		}
 
-		if (need_draw) {
+		if (needDraw) {
 			const Graphics::Surface *srf = _animation->getFrameData(_frame);
 			uint32 xx = _textRectangle.left + _txtWidth;
 			if (xx >= _textRectangle.left + (_textRectangle.width() - _animation->width()))
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 5e2190f369..9a829d30f6 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -40,8 +40,8 @@ public:
 private:
 	Common::Rect _textRectangle;
 	Common::Rect _headerRectangle;
-	cTxtStyle _string_init;
-	cTxtStyle _string_chooser_init;
+	cTxtStyle _stringInit;
+	cTxtStyle _stringChooserInit;
 	uint32 _nextTabstop;
 	bool _focused;
 
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index a9836b388e..1f176ef9d0 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -142,7 +142,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 			_hotspotDelta.x = x;
 			_hotspotDelta.y = y;
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		} else {
 			uint frameNumber;
 			uint x, y;
@@ -381,24 +381,24 @@ void LeverControl::renderFrame(uint frameNumber) {
 		_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _animationCoords);
 }
 
-void LeverControl::getLevParams(const Common::String &input_str, Common::String &parameter, Common::String &values) {
-	const char *chrs = input_str.c_str();
+void LeverControl::getLevParams(const Common::String &inputStr, Common::String &parameter, Common::String &values) {
+	const char *chrs = inputStr.c_str();
 	uint lbr;
 
-	for (lbr = 0; lbr < input_str.size(); lbr++)
+	for (lbr = 0; lbr < inputStr.size(); lbr++)
 		if (chrs[lbr] == ':')
 			break;
 
-	if (lbr >= input_str.size())
+	if (lbr >= inputStr.size())
 		return;
 
 	uint rbr;
 
-	for (rbr = lbr + 1; rbr < input_str.size(); rbr++)
+	for (rbr = lbr + 1; rbr < inputStr.size(); rbr++)
 		if (chrs[rbr] == '~')
 			break;
 
-	if (rbr >= input_str.size())
+	if (rbr >= inputStr.size())
 		return;
 
 	parameter = Common::String(chrs, chrs + lbr);
diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h
index 22789f777b..8de6d1e5c9 100644
--- a/engines/zvision/scripting/controls/lever_control.h
+++ b/engines/zvision/scripting/controls/lever_control.h
@@ -112,7 +112,7 @@ private:
 	 */
 	static int calculateVectorAngle(const Common::Point &pointOne, const Common::Point &pointTwo);
 	void renderFrame(uint frameNumber);
-	void getLevParams(const Common::String &input_str, Common::String &parameter, Common::String &values);
+	void getLevParams(const Common::String &inputStr, Common::String &parameter, Common::String &values);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index 54c02a2568..cb3c17e0fd 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -64,7 +64,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		} else if (param.matchString("brush_file", true)) {
 			_brush = _engine->getRenderManager()->loadImage(values, false);
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		} else if (param.matchString("paint_file", true)) {
 			_paint = _engine->getRenderManager()->loadImage(values, false);
 		} else if (param.matchString("eligible_objects", true)) {
@@ -88,7 +88,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 				int obj = atoi(st);
 
-				_eligible_objects.push_back(obj);
+				_eligibleObjects.push_back(obj);
 			}
 		}
 
@@ -139,9 +139,9 @@ bool PaintControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 		return false;
 
 	if (_rectangle.contains(backgroundImageSpacePos)) {
-		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+		int mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
 
-		if (eligeblity(mouse_item)) {
+		if (eligeblity(mouseItem)) {
 			setVenus();
 			_mouseDown = true;
 		}
@@ -155,9 +155,9 @@ bool PaintControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 		return false;
 
 	if (_rectangle.contains(backgroundImageSpacePos)) {
-		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+		int mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
 
-		if (eligeblity(mouse_item)) {
+		if (eligeblity(mouseItem)) {
 			_engine->getCursorManager()->changeCursor(_cursor);
 
 			if (_mouseDown) {
@@ -178,30 +178,30 @@ bool PaintControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 	return false;
 }
 
-bool PaintControl::eligeblity(int item_id) {
-	for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++)
-		if (*it == item_id)
+bool PaintControl::eligeblity(int itemId) {
+	for (Common::List<int>::iterator it = _eligibleObjects.begin(); it != _eligibleObjects.end(); it++)
+		if (*it == itemId)
 			return true;
 	return false;
 }
 
 Common::Rect PaintControl::paint(const Common::Point &point) {
-	Common::Rect paint_rect = Common::Rect(_brush->w, _brush->h);
-	paint_rect.moveTo(point);
-	paint_rect.clip(_rectangle);
-
-	if (!paint_rect.isEmpty()) {
-		Common::Rect brush_rect = paint_rect;
-		brush_rect.translate(-point.x, -point.y);
-
-		Common::Rect bkg_rect = paint_rect;
-		bkg_rect.translate(-_rectangle.left, -_rectangle.top);
-
-		for (int yy = 0; yy < brush_rect.height(); yy++) {
-			uint16 *mask = (uint16 *)_brush->getBasePtr(brush_rect.left, brush_rect.top + yy);
-			uint16 *from = (uint16 *)_paint->getBasePtr(bkg_rect.left, bkg_rect.top + yy);
-			uint16 *to   = (uint16 *)_bkg->getBasePtr(bkg_rect.left, bkg_rect.top + yy);
-			for (int xx = 0; xx < brush_rect.width(); xx++) {
+	Common::Rect paintRect = Common::Rect(_brush->w, _brush->h);
+	paintRect.moveTo(point);
+	paintRect.clip(_rectangle);
+
+	if (!paintRect.isEmpty()) {
+		Common::Rect brushRect = paintRect;
+		brushRect.translate(-point.x, -point.y);
+
+		Common::Rect bkgRect = paintRect;
+		bkgRect.translate(-_rectangle.left, -_rectangle.top);
+
+		for (int yy = 0; yy < brushRect.height(); yy++) {
+			uint16 *mask = (uint16 *)_brush->getBasePtr(brushRect.left, brushRect.top + yy);
+			uint16 *from = (uint16 *)_paint->getBasePtr(bkgRect.left, bkgRect.top + yy);
+			uint16 *to   = (uint16 *)_bkg->getBasePtr(bkgRect.left, bkgRect.top + yy);
+			for (int xx = 0; xx < brushRect.width(); xx++) {
 				if (*mask != 0)
 					*(to + xx) = *(from + xx);
 
@@ -210,7 +210,7 @@ Common::Rect PaintControl::paint(const Common::Point &point) {
 		}
 
 	}
-	return paint_rect;
+	return paintRect;
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h
index 54b96e8e4e..aac4755fcd 100644
--- a/engines/zvision/scripting/controls/paint_control.h
+++ b/engines/zvision/scripting/controls/paint_control.h
@@ -75,14 +75,14 @@ private:
 	Graphics::Surface *_bkg;
 	Graphics::Surface *_brush;
 
-	Common::List<int> _eligible_objects;
+	Common::List<int> _eligibleObjects;
 
 	int _cursor;
 	Common::Rect _rectangle;
 
 	bool _mouseDown;
 
-	bool eligeblity(int item_id);
+	bool eligeblity(int itemId);
 	Common::Rect paint(const Common::Point &point);
 
 };
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 561dd1dd20..ea4e947abe 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -75,7 +75,7 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 				// Not used
 			}
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 9df61ce341..de1ece5b19 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -43,18 +43,18 @@ namespace ZVision {
 
 SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
 	: Control(engine, key, CONTROL_SAFE) {
-	_num_states = 0;
-	_cur_state = 0;
+	_statesCount = 0;
+	_curState = 0;
 	_animation = NULL;
-	_radius_inner = 0;
-	_radius_inner_sq = 0;
-	_radius_outer = 0;
-	_radius_outer_sq = 0;
-	_zero_pointer = 0;
-	_start_pointer = 0;
-	_cur_frame = -1;
-	_to_frame = 0;
-	_frame_time = 0;
+	_innerRaduis = 0;
+	_innerRadiusSqr = 0;
+	_outerRadius = 0;
+	_outerRadiusSqr = 0;
+	_zeroPointer = 0;
+	_startPointer = 0;
+	_curFrame = -1;
+	_targetFrame = 0;
+	_frameTime = 0;
 	_lastRenderedFrame = -1;
 
 	// Loop until we find the closing brace
@@ -77,7 +77,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 			_rectangle = Common::Rect(x, y, width, height);
 		} else if (param.matchString("num_states", true)) {
-			_num_states = atoi(values.c_str());
+			_statesCount = atoi(values.c_str());
 		} else if (param.matchString("center", true)) {
 			int x;
 			int y;
@@ -85,29 +85,29 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 			sscanf(values.c_str(), "%d %d", &x, &y);
 			_center = Common::Point(x, y);
 		} else if (param.matchString("dial_inner_radius", true)) {
-			_radius_inner = atoi(values.c_str());
-			_radius_inner_sq = _radius_inner * _radius_inner;
+			_innerRaduis = atoi(values.c_str());
+			_innerRadiusSqr = _innerRaduis * _innerRaduis;
 		} else if (param.matchString("radius", true)) {
-			_radius_outer = atoi(values.c_str());
-			_radius_outer_sq = _radius_outer * _radius_outer;
+			_outerRadius = atoi(values.c_str());
+			_outerRadiusSqr = _outerRadius * _outerRadius;
 		} else if (param.matchString("zero_radians_offset", true)) {
-			_zero_pointer = atoi(values.c_str());
+			_zeroPointer = atoi(values.c_str());
 		} else if (param.matchString("pointer_offset", true)) {
-			_start_pointer = atoi(values.c_str());
-			_cur_state = _start_pointer;
+			_startPointer = atoi(values.c_str());
+			_curState = _startPointer;
 		} else if (param.matchString("cursor", true)) {
 			// Not used
 		} else if (param.matchString("mirrored", true)) {
 			// Not used
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		}
 
 		line = stream.readLine();
 		trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
-	renderFrame(_cur_state);
+	renderFrame(_curState);
 }
 
 SafeControl::~SafeControl() {
@@ -121,7 +121,7 @@ void SafeControl::renderFrame(uint frameNumber) {
 		_lastRenderedFrame = frameNumber;
 	} else if ((int16)frameNumber < _lastRenderedFrame) {
 		_lastRenderedFrame = frameNumber;
-		frameNumber = (_num_states * 2) - frameNumber;
+		frameNumber = (_statesCount * 2) - frameNumber;
 	} else {
 		_lastRenderedFrame = frameNumber;
 	}
@@ -139,21 +139,20 @@ bool SafeControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_cur_frame != _to_frame) {
-		_frame_time -= deltaTimeInMillis;
+	if (_curFrame != _targetFrame) {
+		_frameTime -= deltaTimeInMillis;
 
-		if (_frame_time <= 0) {
-			if (_cur_frame < _to_frame) {
-				_cur_frame++;
-				renderFrame(_cur_frame);
-			} else if (_cur_frame > _to_frame) {
-				_cur_frame--;
-				renderFrame(_cur_frame);
+		if (_frameTime <= 0) {
+			if (_curFrame < _targetFrame) {
+				_curFrame++;
+				renderFrame(_curFrame);
+			} else if (_curFrame > _targetFrame) {
+				_curFrame--;
+				renderFrame(_curFrame);
 			}
-			_frame_time = _animation->frameTime();
+			_frameTime = _animation->frameTime();
 		}
 	}
-
 	return false;
 }
 
@@ -163,12 +162,11 @@ bool SafeControl::onMouseMove(const Common::Point &screenSpacePos, const Common:
 
 	if (_rectangle.contains(backgroundImageSpacePos)) {
 		int32 mR = backgroundImageSpacePos.sqrDist(_center);
-		if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) {
+		if (mR <= _outerRadiusSqr && mR >= _innerRadiusSqr) {
 			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
 			return true;
 		}
 	}
-
 	return false;
 }
 
@@ -178,30 +176,29 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 
 	if (_rectangle.contains(backgroundImageSpacePos)) {
 		int32 mR = backgroundImageSpacePos.sqrDist(_center);
-		if (mR <= _radius_outer_sq && mR >= _radius_inner_sq) {
+		if (mR <= _outerRadiusSqr && mR >= _innerRadiusSqr) {
 			setVenus();
 
 			Common::Point tmp = backgroundImageSpacePos - _center;
 
 			float dd = atan2(tmp.x, tmp.y) * 57.29578;
 
-			int16 dp_state = 360 / _num_states;
+			int16 dp_state = 360 / _statesCount;
 
-			int16 m_state = (_num_states - ((((int16)dd + 540) % 360) / dp_state)) % _num_states;
+			int16 m_state = (_statesCount - ((((int16)dd + 540) % 360) / dp_state)) % _statesCount;
 
-			int16 tmp2 = (m_state + _cur_state - _zero_pointer + _num_states - 1) % _num_states;
+			int16 tmp2 = (m_state + _curState - _zeroPointer + _statesCount - 1) % _statesCount;
 
-			_cur_frame = (_cur_state + _num_states - _start_pointer) % _num_states;
+			_curFrame = (_curState + _statesCount - _startPointer) % _statesCount;
 
-			_cur_state = (_num_states * 2 + tmp2) % _num_states;
+			_curState = (_statesCount * 2 + tmp2) % _statesCount;
 
-			_to_frame = (_cur_state + _num_states - _start_pointer) % _num_states;
+			_targetFrame = (_curState + _statesCount - _startPointer) % _statesCount;
 
-			_engine->getScriptManager()->setStateValue(_key, _cur_state);
+			_engine->getScriptManager()->setStateValue(_key, _curState);
 			return true;
 		}
 	}
-
 	return false;
 }
 
diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h
index 2477d8c26d..e682e35050 100644
--- a/engines/zvision/scripting/controls/safe_control.h
+++ b/engines/zvision/scripting/controls/safe_control.h
@@ -40,20 +40,20 @@ public:
 	~SafeControl();
 
 private:
-	int16  _num_states;
-	int16  _cur_state;
+	int16  _statesCount;
+	int16  _curState;
 	MetaAnimation *_animation;
 	Common::Point _center;
 	Common::Rect _rectangle;
-	int16  _radius_inner;
-	int32  _radius_inner_sq;
-	int16  _radius_outer;
-	int32  _radius_outer_sq;
-	int16  _zero_pointer;
-	int16  _start_pointer;
-	int16  _cur_frame;
-	int16  _to_frame;
-	int32  _frame_time;
+	int16  _innerRaduis;
+	int32  _innerRadiusSqr;
+	int16  _outerRadius;
+	int32  _outerRadiusSqr;
+	int16  _zeroPointer;
+	int16  _startPointer;
+	int16  _curFrame;
+	int16  _targetFrame;
+	int32  _frameTime;
 
 	int16 _lastRenderedFrame;
 
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index a0b19db513..7e1a65a9cc 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -50,13 +50,13 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (param.matchString("savebox", true)) {
-			int save_id;
-			int input_id;
+			int saveId;
+			int inputId;
 
-			sscanf(values.c_str(), "%d %d", &save_id, &input_id);
-			save_elmnt elmnt;
-			elmnt.input_key = input_id;
-			elmnt.save_id = save_id;
+			sscanf(values.c_str(), "%d %d", &saveId, &inputId);
+			saveElement elmnt;
+			elmnt.inputKey = inputId;
+			elmnt.saveId = saveId;
 			elmnt.exist = false;
 			_inputs.push_back(elmnt);
 		} else if (param.matchString("control_type", true)) {
@@ -72,11 +72,11 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 	}
 
 	for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) {
-		Control *ctrl = _engine->getScriptManager()->getControl(iter->input_key);
+		Control *ctrl = _engine->getScriptManager()->getControl(iter->inputKey);
 		if (ctrl && ctrl->getType() == Control::CONTROL_INPUT) {
 			InputControl *inp = (InputControl *)ctrl;
 			inp->setReadOnly(!_saveControl);
-			Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->save_id);
+			Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->saveId);
 			if (save) {
 				SaveGameHeader header;
 				_engine->getSaveManager()->readSaveGameHeader(save, header);
@@ -90,7 +90,7 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 bool SaveControl::process(uint32 deltaTimeInMillis) {
 	for (saveElmntList::iterator iter = _inputs.begin(); iter != _inputs.end(); ++iter) {
-		Control *ctrl = _engine->getScriptManager()->getControl(iter->input_key);
+		Control *ctrl = _engine->getScriptManager()->getControl(iter->inputKey);
 		if (ctrl && ctrl->getType() == Control::CONTROL_INPUT) {
 			InputControl *inp = (InputControl *)ctrl;
 			if (inp->enterPress()) {
@@ -102,7 +102,7 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 								toSave = false;
 
 						if (toSave) {
-							_engine->getSaveManager()->saveGameBuffered(iter->save_id, inp->getText());
+							_engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText());
 							_engine->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
 							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
 						}
@@ -110,7 +110,7 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 						_engine->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000);
 					}
 				} else {
-					_engine->getSaveManager()->loadGame(iter->save_id);
+					_engine->getSaveManager()->loadGame(iter->saveId);
 					return true;
 				}
 				break;
diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h
index 942b9c9269..fefb0e0ce2 100644
--- a/engines/zvision/scripting/controls/save_control.h
+++ b/engines/zvision/scripting/controls/save_control.h
@@ -35,12 +35,12 @@ public:
 	SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
 
 private:
-	struct save_elmnt {
-		int save_id;
-		int input_key;
+	struct saveElement {
+		int saveId;
+		int inputKey;
 		bool exist;
 	};
-	typedef Common::List<save_elmnt> saveElmntList;
+	typedef Common::List<saveElement> saveElmntList;
 	saveElmntList _inputs;
 
 	bool _saveControl;
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 46ee320eb5..074d1905b4 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -38,7 +38,7 @@ namespace ZVision {
 SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
 	: Control(engine, key, CONTROL_SLOT) {
 
-	_rendered_item = 0;
+	_renderedItem = 0;
 	_bkg = NULL;
 
 	// Loop until we find the closing brace
@@ -70,9 +70,9 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		} else if (param.matchString("cursor", true)) {
 			_cursor = _engine->getCursorManager()->getCursorId(values);
 		} else if (param.matchString("distance_id", true)) {
-			sscanf(values.c_str(), "%c", &_distance_id);
+			sscanf(values.c_str(), "%c", &_distanceId);
 		} else if (param.matchString("venus_id", true)) {
-			_venus_id = atoi(values.c_str());
+			_venusId = atoi(values.c_str());
 		} else if (param.matchString("eligible_objects", true)) {
 			char buf[256];
 			memset(buf, 0, 256);
@@ -94,7 +94,7 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 				int obj = atoi(st);
 
-				_eligible_objects.push_back(obj);
+				_eligibleObjects.push_back(obj);
 			}
 		}
 
@@ -124,26 +124,26 @@ bool SlotControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 		setVenus();
 
 		int item = _engine->getScriptManager()->getStateValue(_key);
-		int mouse_item = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+		int mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
 		if (item != 0) {
-			if (mouse_item != 0) {
-				if (eligeblity(mouse_item)) {
-					_engine->getScriptManager()->invertory_drop(mouse_item);
-					_engine->getScriptManager()->invertory_add(item);
-					_engine->getScriptManager()->setStateValue(_key, mouse_item);
+			if (mouseItem != 0) {
+				if (eligeblity(mouseItem)) {
+					_engine->getScriptManager()->inventoryDrop(mouseItem);
+					_engine->getScriptManager()->inventoryAdd(item);
+					_engine->getScriptManager()->setStateValue(_key, mouseItem);
 				}
 			} else {
-				_engine->getScriptManager()->invertory_add(item);
+				_engine->getScriptManager()->inventoryAdd(item);
 				_engine->getScriptManager()->setStateValue(_key, 0);
 			}
-		} else if (mouse_item == 0) {
+		} else if (mouseItem == 0) {
 			if (eligeblity(0)) {
-				_engine->getScriptManager()->invertory_drop(0);
+				_engine->getScriptManager()->inventoryDrop(0);
 				_engine->getScriptManager()->setStateValue(_key, 0);
 			}
-		} else if (eligeblity(mouse_item)) {
-			_engine->getScriptManager()->setStateValue(_key, mouse_item);
-			_engine->getScriptManager()->invertory_drop(mouse_item);
+		} else if (eligeblity(mouseItem)) {
+			_engine->getScriptManager()->setStateValue(_key, mouseItem);
+			_engine->getScriptManager()->inventoryDrop(mouseItem);
 		}
 	}
 	return false;
@@ -166,13 +166,13 @@ bool SlotControl::process(uint32 deltaTimeInMillis) {
 		return false;
 
 	if (_engine->canRender()) {
-		int cur_item = _engine->getScriptManager()->getStateValue(_key);
-		if (cur_item != _rendered_item) {
-			if (_rendered_item != 0 && cur_item == 0) {
+		int curItem = _engine->getScriptManager()->getStateValue(_key);
+		if (curItem != _renderedItem) {
+			if (_renderedItem != 0 && curItem == 0) {
 				_engine->getRenderManager()->blitSurfaceToBkg(*_bkg, _rectangle.left, _rectangle.top);
-				_rendered_item = cur_item;
+				_renderedItem = curItem;
 			} else {
-				if (_rendered_item == 0) {
+				if (_renderedItem == 0) {
 					if (_bkg)
 						delete _bkg;
 
@@ -183,9 +183,9 @@ bool SlotControl::process(uint32 deltaTimeInMillis) {
 
 				char buf[16];
 				if (_engine->getGameId() == GID_NEMESIS)
-					sprintf(buf, "%d%cobj.tga", cur_item, _distance_id);
+					sprintf(buf, "%d%cobj.tga", curItem, _distanceId);
 				else
-					sprintf(buf, "g0z%cu%2.2x1.tga", _distance_id, cur_item);
+					sprintf(buf, "g0z%cu%2.2x1.tga", _distanceId, curItem);
 
 				Graphics::Surface *srf = _engine->getRenderManager()->loadImage(buf);
 
@@ -202,16 +202,16 @@ bool SlotControl::process(uint32 deltaTimeInMillis) {
 
 				delete srf;
 
-				_rendered_item = cur_item;
+				_renderedItem = curItem;
 			}
 		}
 	}
 	return false;
 }
 
-bool SlotControl::eligeblity(int item_id) {
-	for (Common::List<int>::iterator it = _eligible_objects.begin(); it != _eligible_objects.end(); it++)
-		if (*it == item_id)
+bool SlotControl::eligeblity(int itemId) {
+	for (Common::List<int>::iterator it = _eligibleObjects.begin(); it != _eligibleObjects.end(); it++)
+		if (*it == itemId)
 			return true;
 	return false;
 }
diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h
index 7799785aa5..86fd261f25 100644
--- a/engines/zvision/scripting/controls/slot_control.h
+++ b/engines/zvision/scripting/controls/slot_control.h
@@ -66,13 +66,13 @@ private:
 	Common::Rect _hotspot;
 
 	int _cursor;
-	char _distance_id;
+	char _distanceId;
 
-	int _rendered_item;
+	int _renderedItem;
 
-	Common::List<int> _eligible_objects;
+	Common::List<int> _eligibleObjects;
 
-	bool eligeblity(int item_id);
+	bool eligeblity(int itemId);
 
 	Graphics::Surface *_bkg;
 
diff --git a/engines/zvision/scripting/inventory.cpp b/engines/zvision/scripting/inventory.cpp
index f8b22970c4..98d063395b 100644
--- a/engines/zvision/scripting/inventory.cpp
+++ b/engines/zvision/scripting/inventory.cpp
@@ -27,95 +27,95 @@
 
 namespace ZVision {
 
-int8 ScriptManager::invertory_getCount() {
+int8 ScriptManager::inventoryGetCount() {
 	return getStateValue(StateKey_Inv_Cnt_Slot);
 }
 
-void ScriptManager::invertory_setCount(int8 cnt) {
+void ScriptManager::inventorySetCount(int8 cnt) {
 	setStateValue(StateKey_Inv_Cnt_Slot, cnt);
 }
 
-int16 ScriptManager::invertory_getItem(int8 id) {
+int16 ScriptManager::inventoryGetItem(int8 id) {
 	if (id < 49 && id >= 0)
 		return getStateValue(StateKey_Inv_1_Slot + id);
 	return -1;
 }
 
-void ScriptManager::invertory_setItem(int8 id, int16 item) {
+void ScriptManager::inventorySetItem(int8 id, int16 item) {
 	if (id < 49 && id >= 0)
 		setStateValue(StateKey_Inv_1_Slot + id, item);
 }
 
-void ScriptManager::invertory_add(int16 item) {
-	int8 cnt = invertory_getCount();
+void ScriptManager::inventoryAdd(int16 item) {
+	int8 cnt = inventoryGetCount();
 
 	if (cnt < 49) {
-		bool not_exist = true;
+		bool notExist = true;
 
 		if (cnt == 0) {
-			invertory_setItem(0, 0);
-			invertory_setCount(1); // we needed empty item for cycle code
+			inventorySetItem(0, 0);
+			inventorySetCount(1); // we needed empty item for cycle code
 			cnt = 1;
 		}
 
 		for (int8 cur = 0; cur < cnt; cur++)
-			if (invertory_getItem(cur) == item) {
-				not_exist = false;
+			if (inventoryGetItem(cur) == item) {
+				notExist = false;
 				break;
 			}
 
-		if (not_exist) {
+		if (notExist) {
 			for (int8 i = cnt; i > 0; i--)
-				invertory_setItem(i, invertory_getItem(i - 1));
+				inventorySetItem(i, inventoryGetItem(i - 1));
 
-			invertory_setItem(0, item);
+			inventorySetItem(0, item);
 
 			setStateValue(StateKey_InventoryItem, item);
 
-			invertory_setCount(cnt + 1);
+			inventorySetCount(cnt + 1);
 		}
 	}
 }
 
-void ScriptManager::invertory_drop(int16 item) {
-	int8 items_cnt = invertory_getCount();
+void ScriptManager::inventoryDrop(int16 item) {
+	int8 itemCount = inventoryGetCount();
 
 	// if items in inventory > 0
-	if (items_cnt != 0) {
+	if (itemCount != 0) {
 		int8 index = 0;
 
 		// finding needed item
-		while (index < items_cnt) {
-			if (invertory_getItem(index) == item)
+		while (index < itemCount) {
+			if (inventoryGetItem(index) == item)
 				break;
 
 			index++;
 		}
 
 		// if item in the inventory
-		if (items_cnt != index) {
+		if (itemCount != index) {
 			// shift all items left with rewrite founded item
-			for (int8 v = index; v < items_cnt - 1 ; v++)
-				invertory_setItem(v, invertory_getItem(v + 1));
+			for (int8 v = index; v < itemCount - 1 ; v++)
+				inventorySetItem(v, inventoryGetItem(v + 1));
 
 			// del last item
-			invertory_setItem(items_cnt - 1, 0);
-			invertory_setCount(invertory_getCount() - 1);
+			inventorySetItem(itemCount - 1, 0);
+			inventorySetCount(inventoryGetCount() - 1);
 
-			setStateValue(StateKey_InventoryItem, invertory_getItem(0));
+			setStateValue(StateKey_InventoryItem, inventoryGetItem(0));
 		}
 	}
 }
-void ScriptManager::invertory_cycle() {
-	int8 item_cnt = invertory_getCount();
-	int8 cur_item = invertory_getItem(0);
-	if (item_cnt > 1) {
-		for (int8 i = 0; i < item_cnt - 1; i++)
-			invertory_setItem(i, invertory_getItem(i + 1));
+void ScriptManager::inventoryCycle() {
+	int8 itemCount = inventoryGetCount();
+	int8 curItem = inventoryGetItem(0);
+	if (itemCount > 1) {
+		for (int8 i = 0; i < itemCount - 1; i++)
+			inventorySetItem(i, inventoryGetItem(i + 1));
 
-		invertory_setItem(item_cnt - 1, cur_item);
+		inventorySetItem(itemCount - 1, curItem);
 
-		setStateValue(StateKey_InventoryItem, invertory_getItem(0));
+		setStateValue(StateKey_InventoryItem, inventoryGetItem(0));
 
 	}
 }
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 5e0387f0d9..697de58ed8 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -46,7 +46,7 @@
 
 namespace ZVision {
 
-void ScriptManager::parseScrFile(const Common::String &fileName, script_scope &scope) {
+void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) {
 	Common::File file;
 	if (!_engine->getSearchManager()->openFile(file, fileName)) {
 		warning("Script file not found: %s", fileName.c_str());
@@ -70,15 +70,15 @@ void ScriptManager::parseScrFile(const Common::String &fileName, script_scope &s
 			if (getStateFlag(puzzle->key) & Puzzle::ONCE_PER_INST)
 				setStateValue(puzzle->key, 0);
 			parsePuzzle(puzzle, file);
-			scope._puzzles.push_back(puzzle);
+			scope.puzzles.push_back(puzzle);
 
 		} else if (line.matchString("control:*", true)) {
 			Control *ctrl = parseControl(line, file);
 			if (ctrl)
-				scope._controls.push_back(ctrl);
+				scope.controls.push_back(ctrl);
 		}
 	}
-	scope.proc_count = 0;
+	scope.procCount = 0;
 }
 
 void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stream) {
@@ -196,8 +196,8 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 					for (pos = startpos; pos < line.size(); pos++)
 						if (chrs[pos] == '(')
 							break;
-					Common::String s_slot(chrs + startpos, chrs + pos);
-					slot = atoi(s_slot.c_str());
+					Common::String strSlot(chrs + startpos, chrs + pos);
+					slot = atoi(strSlot.c_str());
 
 					startpos = pos + 1;
 				}
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 7df48183bd..2a54cc4314 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -76,7 +76,7 @@ void ScriptManager::update(uint deltaTimeMillis) {
 	        _currentLocation.room != _nextLocation.room ||
 	        _currentLocation.view != _nextLocation.view ||
 	        _currentLocation.world != _nextLocation.world)
-		do_changeLocation();
+		ChangeLocationReal();
 
 	updateNodes(deltaTimeMillis);
 	if (! execScope(nodeview))
@@ -90,35 +90,35 @@ void ScriptManager::update(uint deltaTimeMillis) {
 	updateControls(deltaTimeMillis);
 }
 
-bool ScriptManager::execScope(script_scope &scope) {
+bool ScriptManager::execScope(ScriptScope &scope) {
 	// Swap queues
-	PuzzleList *tmp = scope.exec_queue;
-	scope.exec_queue = scope.scope_queue;
-	scope.scope_queue = tmp;
-	scope.scope_queue->clear();
+	PuzzleList *tmp = scope.execQueue;
+	scope.execQueue = scope.scopeQueue;
+	scope.scopeQueue = tmp;
+	scope.scopeQueue->clear();
 
-	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
+	for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter)
 		(*PuzzleIter)->addedBySetState = 0;
 
-	if (scope.proc_count < 2 || getStateValue(StateKey_ExecScopeStyle)) {
-		for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter)
-			if (!checkPuzzleCriteria(*PuzzleIter, scope.proc_count))
+	if (scope.procCount < 2 || getStateValue(StateKey_ExecScopeStyle)) {
+		for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter)
+			if (!checkPuzzleCriteria(*PuzzleIter, scope.procCount))
 				return false;
 	} else {
-		for (PuzzleList::iterator PuzzleIter = scope.exec_queue->begin(); PuzzleIter != scope.exec_queue->end(); ++PuzzleIter)
-			if (!checkPuzzleCriteria(*PuzzleIter, scope.proc_count))
+		for (PuzzleList::iterator PuzzleIter = scope.execQueue->begin(); PuzzleIter != scope.execQueue->end(); ++PuzzleIter)
+			if (!checkPuzzleCriteria(*PuzzleIter, scope.procCount))
 				return false;
 	}
 
-	if (scope.proc_count < 2) {
-		scope.proc_count++;
+	if (scope.procCount < 2) {
+		scope.procCount++;
 	}
 	return true;
 }
 
-void ScriptManager::referenceTableAddPuzzle(uint32 key, puzzle_ref ref) {
+void ScriptManager::referenceTableAddPuzzle(uint32 key, PuzzleRef ref) {
 	if (_referenceTable.contains(key)) {
-		Common::Array<puzzle_ref> *arr = &_referenceTable[key];
+		Common::Array<PuzzleRef> *arr = &_referenceTable[key];
 		for (uint32 i = 0; i < arr->size(); i++)
 			if ((*arr)[i].puz == ref.puz)
 				return;
@@ -127,12 +127,12 @@ void ScriptManager::referenceTableAddPuzzle(uint32 key, puzzle_ref ref) {
 	_referenceTable[key].push_back(ref);
 }
 
-void ScriptManager::addPuzzlesToReferenceTable(script_scope &scope) {
+void ScriptManager::addPuzzlesToReferenceTable(ScriptScope &scope) {
 	// Iterate through each local Puzzle
-	for (PuzzleList::iterator PuzzleIter = scope._puzzles.begin(); PuzzleIter != scope._puzzles.end(); ++PuzzleIter) {
+	for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter) {
 		Puzzle *puzzlePtr = (*PuzzleIter);
 
-		puzzle_ref ref;
+		PuzzleRef ref;
 		ref.scope = &scope;
 		ref.puz = puzzlePtr;
 
@@ -270,22 +270,22 @@ void ScriptManager::cleanStateTable() {
 	}
 }
 
-void ScriptManager::cleanScriptScope(script_scope &scope) {
-	scope._priv_queue_one.clear();
-	scope._priv_queue_two.clear();
-	scope.scope_queue = &scope._priv_queue_one;
-	scope.exec_queue = &scope._priv_queue_two;
-	for (PuzzleList::iterator iter = scope._puzzles.begin(); iter != scope._puzzles.end(); ++iter)
+void ScriptManager::cleanScriptScope(ScriptScope &scope) {
+	scope.privQueueOne.clear();
+	scope.privQueueTwo.clear();
+	scope.scopeQueue = &scope.privQueueOne;
+	scope.execQueue = &scope.privQueueTwo;
+	for (PuzzleList::iterator iter = scope.puzzles.begin(); iter != scope.puzzles.end(); ++iter)
 		delete(*iter);
 
-	scope._puzzles.clear();
+	scope.puzzles.clear();
 
-	for (ControlList::iterator iter = scope._controls.begin(); iter != scope._controls.end(); ++iter)
+	for (ControlList::iterator iter = scope.controls.begin(); iter != scope.controls.end(); ++iter)
 		delete(*iter);
 
-	scope._controls.clear();
+	scope.controls.clear();
 
-	scope.proc_count = 0;
+	scope.procCount = 0;
 }
 
 int ScriptManager::getStateValue(uint32 key) {
@@ -297,10 +297,10 @@ int ScriptManager::getStateValue(uint32 key) {
 
 void ScriptManager::queuePuzzles(uint32 key) {
 	if (_referenceTable.contains(key)) {
-		Common::Array<puzzle_ref> *arr = &_referenceTable[key];
+		Common::Array<PuzzleRef> *arr = &_referenceTable[key];
 		for (int32 i = arr->size() - 1; i >= 0; i--)
 			if (!(*arr)[i].puz->addedBySetState) {
-				(*arr)[i].scope->scope_queue->push_back((*arr)[i].puz);
+				(*arr)[i].scope->scopeQueue->push_back((*arr)[i].puz);
 				(*arr)[i].puz->addedBySetState = true;
 			}
 	}
@@ -518,7 +518,7 @@ void ScriptManager::changeLocation(char _world, char _room, char _node, char _vi
 	}
 }
 
-void ScriptManager::do_changeLocation() {
+void ScriptManager::ChangeLocationReal() {
 	assert(_nextLocation.world != 0);
 	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
@@ -605,7 +605,7 @@ void ScriptManager::do_changeLocation() {
 		addPuzzlesToReferenceTable(nodeview);
 	}
 
-	_activeControls = &nodeview._controls;
+	_activeControls = &nodeview.controls;
 
 	// Revert to the idle cursor
 	_engine->getCursorManager()->changeCursor(CursorIndex_Idle);
@@ -701,19 +701,17 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 		return;
 	}
 
-	Location next_loc;
+	Location nextLocation;
 
-	next_loc.world = stream->readByte();
-	next_loc.room = stream->readByte();
-	next_loc.node = stream->readByte();
-	next_loc.view = stream->readByte();
-	next_loc.offset = stream->readUint32LE() & 0x0000FFFF;
+	nextLocation.world = stream->readByte();
+	nextLocation.room = stream->readByte();
+	nextLocation.node = stream->readByte();
+	nextLocation.view = stream->readByte();
+	nextLocation.offset = stream->readUint32LE() & 0x0000FFFF;
 
-	// What the fck, eos is not 'return pos >= size'
-	// while (!stream->eos()) {*/
 	while (stream->pos() < stream->size()) {
 		uint32 tag = stream->readUint32BE();
-		uint32 tag_size = stream->readUint32LE();
+		uint32 tagSize = stream->readUint32LE();
 		switch (tag) {
 		case MKTAG('T', 'I', 'M', 'R'): {
 			uint32 key = stream->readUint32LE();
@@ -726,22 +724,22 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 		}
 		break;
 		case MKTAG('F', 'L', 'A', 'G'):
-			for (uint32 i = 0; i < tag_size / 2; i++)
+			for (uint32 i = 0; i < tagSize / 2; i++)
 				setStateFlagSilent(i, stream->readUint16LE());
 			break;
 		case MKTAG('P', 'U', 'Z', 'Z'):
-			for (uint32 i = 0; i < tag_size / 2; i++)
+			for (uint32 i = 0; i < tagSize / 2; i++)
 				setStateValueSilent(i, stream->readUint16LE());
 			break;
 		default:
-			stream->seek(tag_size, SEEK_CUR);
+			stream->seek(tagSize, SEEK_CUR);
 		}
 	}
 
-	_nextLocation = next_loc;
+	_nextLocation = nextLocation;
+
+	ChangeLocationReal();
 
-	do_changeLocation();
-	// Place for read prefs
 	_engine->setRenderDelay(10);
 	setStateValue(StateKey_RestoreFlag, 1);
 
@@ -792,23 +790,23 @@ void ScriptManager::flushEvent(Common::EventType type) {
 	}
 }
 
-ValueSlot::ValueSlot(ScriptManager *sc_man, const char *slot_val):
-	_sc_man(sc_man) {
+ValueSlot::ValueSlot(ScriptManager *scriptManager, const char *slotValue):
+	_scriptManager(scriptManager) {
 	value = 0;
 	slot = false;
-	const char *is_slot = strstr(slot_val, "[");
-	if (is_slot) {
+	const char *isSlot = strstr(slotValue, "[");
+	if (isSlot) {
 		slot = true;
-		value = atoi(is_slot + 1);
+		value = atoi(isSlot + 1);
 	} else {
 		slot = false;
-		value = atoi(slot_val);
+		value = atoi(slotValue);
 	}
 }
 int16 ValueSlot::getValue() {
 	if (slot) {
 		if (value >= 0)
-			return _sc_man->getStateValue(value);
+			return _scriptManager->getStateValue(value);
 		else
 			return 0;
 	} else
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index ddb8c885aa..5701cde6d0 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -123,24 +123,24 @@ public:
 private:
 	ZVision *_engine;
 
-	struct script_scope {
-		uint32 proc_count;
+	struct ScriptScope {
+		uint32 procCount;
 
-		PuzzleList *scope_queue; // For adding puzzles to queue
-		PuzzleList *exec_queue;  // Switch to it when execute
-		PuzzleList _priv_queue_one;
-		PuzzleList _priv_queue_two;
+		PuzzleList *scopeQueue; // For adding puzzles to queue
+		PuzzleList *execQueue;  // Switch to it when execute
+		PuzzleList privQueueOne;
+		PuzzleList privQueueTwo;
 
-		PuzzleList  _puzzles;
-		ControlList _controls;
+		PuzzleList  puzzles;
+		ControlList controls;
 	};
 
-	struct puzzle_ref {
+	struct PuzzleRef {
 		Puzzle *puz;
-		script_scope *scope;
+		ScriptScope *scope;
 	};
 
-	typedef Common::HashMap<uint32, Common::Array<puzzle_ref> > PuzzleMap;
+	typedef Common::HashMap<uint32, Common::Array<PuzzleRef> > PuzzleMap;
 
 	/**
 	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and
@@ -157,10 +157,10 @@ private:
 
 	EventList _controlEvents;
 
-	script_scope universe;
-	script_scope world;
-	script_scope room;
-	script_scope nodeview;
+	ScriptScope universe;
+	ScriptScope world;
+	ScriptScope room;
+	ScriptScope nodeview;
 
 	/** Holds the currently active timers, musics, other */
 	SideFXList _activeSideFx;
@@ -249,30 +249,30 @@ public:
 	Location getLastMenuLocation();
 
 private:
-	void referenceTableAddPuzzle(uint32 key, puzzle_ref ref);
-	void addPuzzlesToReferenceTable(script_scope &scope);
+	void referenceTableAddPuzzle(uint32 key, PuzzleRef ref);
+	void addPuzzlesToReferenceTable(ScriptScope &scope);
 	void updateNodes(uint deltaTimeMillis);
 	void updateControls(uint deltaTimeMillis);
 	bool checkPuzzleCriteria(Puzzle *puzzle, uint counter);
 	void cleanStateTable();
-	void cleanScriptScope(script_scope &scope);
-	bool execScope(script_scope &scope);
+	void cleanScriptScope(ScriptScope &scope);
+	bool execScope(ScriptScope &scope);
 
 	/** Perform change location */
-	void do_changeLocation();
+	void ChangeLocationReal();
 
-	int8 invertory_getCount();
-	void invertory_setCount(int8 cnt);
-	int16 invertory_getItem(int8 id);
-	void invertory_setItem(int8 id, int16 item);
+	int8 inventoryGetCount();
+	void inventorySetCount(int8 cnt);
+	int16 inventoryGetItem(int8 id);
+	void inventorySetItem(int8 id, int16 item);
 
 	void setStateFlagSilent(uint32 key, uint value);
 	void setStateValueSilent(uint32 key, int value);
 
 public:
-	void invertory_add(int16 item);
-	void invertory_drop(int16 item);
-	void invertory_cycle();
+	void inventoryAdd(int16 item);
+	void inventoryDrop(int16 item);
+	void inventoryCycle();
 
 	// TODO: Make this private. It was only made public so Console::cmdParseAllScrFiles() could use it
 	/**
@@ -281,7 +281,7 @@ public:
 	 * @param fileName    Name of the .scr file
 	 * @param isGlobal    Are the puzzles included in the file global (true). AKA, the won't be purged during location changes
 	 */
-	void parseScrFile(const Common::String &fileName, script_scope &scope);
+	void parseScrFile(const Common::String &fileName, ScriptScope &scope);
 
 private:
 	/**
@@ -332,12 +332,12 @@ private:
 
 class ValueSlot {
 public:
-	ValueSlot(ScriptManager *sc_man, const char *slot_val);
+	ValueSlot(ScriptManager *scriptManager, const char *slotValue);
 	int16 getValue();
 private:
 	int16 value;
 	bool slot;
-	ScriptManager *_sc_man;
+	ScriptManager *_scriptManager;
 };
 
 
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index bd9c543d52..98ac4e3b37 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -75,19 +75,19 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 			const Graphics::Surface *frame = NULL;
 
-			if (nod->_cur_frm == -1) { // Start of new playlist node
-				nod->_cur_frm = nod->start;
+			if (nod->_curFrame == -1) { // Start of new playlist node
+				nod->_curFrame = nod->start;
 
-				_animation->seekToFrame(nod->_cur_frm);
+				_animation->seekToFrame(nod->_curFrame);
 				frame = _animation->decodeNextFrame();
 
 				nod->_delay = _frmDelay;
 				if (nod->slot)
 					_engine->getScriptManager()->setStateValue(nod->slot, 1);
 			} else {
-				nod->_cur_frm++;
+				nod->_curFrame++;
 
-				if (nod->_cur_frm > nod->stop) {
+				if (nod->_curFrame > nod->stop) {
 					nod->loop--;
 
 					if (nod->loop == 0) {
@@ -99,8 +99,8 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 						return _DisposeAfterUse;
 					}
 
-					nod->_cur_frm = nod->start;
-					_animation->seekToFrame(nod->_cur_frm);
+					nod->_curFrame = nod->start;
+					_animation->seekToFrame(nod->_curFrame);
 				}
 
 				frame = _animation->decodeNextFrame();
@@ -156,18 +156,18 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 
 
-void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops) {
+void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) {
 	playnode nod;
 	nod.loop = loops;
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
-	nod.start = start_frame;
-	nod.stop = end_frame;
+	nod.start = startFrame;
+	nod.stop = endFrame;
 
 	if (nod.stop >= (int)_animation->frameCount())
 		nod.stop = _animation->frameCount() - 1;
 
 	nod.slot = slot;
-	nod._cur_frm = -1;
+	nod._curFrame = -1;
 	nod._delay = 0;
 	nod._scaled = NULL;
 	_playList.push_back(nod);
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index 4d1c74bccf..dab3d88d80 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -52,7 +52,7 @@ public:
 		int32 start;
 		int32 stop;
 		int32 loop;
-		int32 _cur_frm;
+		int32 _curFrame;
 		int32 _delay;
 		Graphics::Surface *_scaled;
 	};
@@ -71,7 +71,7 @@ private:
 public:
 	bool process(uint32 deltaTimeInMillis);
 
-	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int start_frame, int end_frame, int loops = 1);
+	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops = 1);
 
 	bool stop();
 
diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp
index 576a1f8592..9be6b29413 100644
--- a/engines/zvision/scripting/sidefx/distort_node.cpp
+++ b/engines/zvision/scripting/sidefx/distort_node.cpp
@@ -34,7 +34,7 @@
 
 namespace ZVision {
 
-DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float st_angl, float en_angl, float st_lin, float en_lin)
+DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale)
 	: SideFX(engine, key, SIDEFX_DISTORT) {
 
 	_angle = _engine->getRenderManager()->getRenderTable()->getAngle();
@@ -42,15 +42,15 @@ DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float st_angl
 
 	_speed = speed;
 	_incr = true;
-	_st_angl = st_angl;
-	_en_angl = en_angl;
-	_st_lin = st_lin;
-	_en_lin = en_lin;
+	_startAngle = startAngle;
+	_endAngle = endAngle;
+	_startLineScale = startLineScale;
+	_endLineScale = endLineScale;
 
 	_curFrame = 1.0;
 
-	_diff_angl = en_angl - st_angl;
-	_diff_lin = en_lin - st_lin;
+	_diffAngle = endAngle - startAngle;
+	_diffLinScale = endLineScale - startLineScale;
 
 	_frmSpeed = (float)speed / 15.0;
 	_frames = ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed);
@@ -85,7 +85,7 @@ bool DistortNode::process(uint32 deltaTimeInMillis) {
 	float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed);
 
 
-	setParams(_st_angl + diff * _diff_angl, _st_lin + diff * _diff_lin);
+	setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale);
 
 	return false;
 }
diff --git a/engines/zvision/scripting/sidefx/distort_node.h b/engines/zvision/scripting/sidefx/distort_node.h
index cba9c5eff2..787a69bdde 100644
--- a/engines/zvision/scripting/sidefx/distort_node.h
+++ b/engines/zvision/scripting/sidefx/distort_node.h
@@ -31,21 +31,21 @@ class ZVision;
 
 class DistortNode : public SideFX {
 public:
-	DistortNode(ZVision *engine, uint32 key, int16 speed, float st_angl, float en_angl, float st_lin, float en_lin);
+	DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale);
 	~DistortNode();
 
 	bool process(uint32 deltaTimeInMillis);
 
 private:
 	int16 _speed;
-	float _st_angl;
-	float _en_angl;
-	float _st_lin;
-	float _en_lin;
+	float _startAngle;
+	float _endAngle;
+	float _startLineScale;
+	float _endLineScale;
 
 	float _frmSpeed;
-	float _diff_angl;
-	float _diff_lin;
+	float _diffAngle;
+	float _diffLinScale;
 	bool _incr;
 	int16 _frames;
 
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index 4420da3e96..e9baadb011 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -38,15 +38,15 @@
 namespace ZVision {
 
 MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
-	: MusicNode_BASE(engine, key, SIDEFX_AUDIO) {
+	: MusicNodeBASE(engine, key, SIDEFX_AUDIO) {
 	_loop = loop;
 	_volume = volume;
 	_crossfade = false;
-	_crossfade_target = 0;
-	_crossfade_time = 0;
+	_crossfadeTarget = 0;
+	_crossfadeTime = 0;
 	_attenuate = 0;
 	_pantrack = false;
-	_pantrack_X = 0;
+	_pantrackPosition = 0;
 	_sub = NULL;
 
 	Audio::RewindableAudioStream *audioStream;
@@ -93,7 +93,7 @@ MusicNode::~MusicNode() {
 void MusicNode::setPanTrack(int16 pos) {
 	if (!_stereo) {
 		_pantrack = true;
-		_pantrack_X = pos;
+		_pantrackPosition = pos;
 		setVolume(_volume);
 	}
 }
@@ -104,8 +104,8 @@ void MusicNode::unsetPanTrack() {
 }
 
 void MusicNode::setFade(int32 time, uint8 target) {
-	_crossfade_target = target;
-	_crossfade_time = time;
+	_crossfadeTarget = target;
+	_crossfadeTime = time;
 	_crossfade = true;
 }
 
@@ -116,14 +116,14 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 		uint8 _newvol = _volume;
 
 		if (_crossfade) {
-			if (_crossfade_time > 0) {
-				if ((int32)deltaTimeInMillis > _crossfade_time)
-					deltaTimeInMillis = _crossfade_time;
-				_newvol += floor(((float)(_crossfade_target - _newvol) / (float)_crossfade_time)) * (float)deltaTimeInMillis;
-				_crossfade_time -= deltaTimeInMillis;
+			if (_crossfadeTime > 0) {
+				if ((int32)deltaTimeInMillis > _crossfadeTime)
+					deltaTimeInMillis = _crossfadeTime;
+				_newvol += floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis;
+				_crossfadeTime -= deltaTimeInMillis;
 			} else {
 				_crossfade = false;
-				_newvol = _crossfade_target;
+				_newvol = _crossfadeTarget;
 			}
 		}
 
@@ -136,17 +136,17 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 	return false;
 }
 
-void MusicNode::setVolume(uint8 new_volume) {
+void MusicNode::setVolume(uint8 newVolume) {
 	if (_pantrack) {
-		int cur_x = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
-		cur_x -= _pantrack_X;
+		int curX = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
+		curX -= _pantrackPosition;
 		int32 _width = _engine->getRenderManager()->getBkgSize().x;
-		if (cur_x < (-_width) / 2)
-			cur_x += _width;
-		else if (cur_x >= _width / 2)
-			cur_x -= _width;
+		if (curX < (-_width) / 2)
+			curX += _width;
+		else if (curX >= _width / 2)
+			curX -= _width;
 
-		float norm = (float)cur_x / ((float)_width / 2.0);
+		float norm = (float)curX / ((float)_width / 2.0);
 		float lvl = fabs(norm);
 		if (lvl > 0.5)
 			lvl = (lvl - 0.5) * 1.7;
@@ -157,16 +157,16 @@ void MusicNode::setVolume(uint8 new_volume) {
 
 		if (_engine->_mixer->isSoundHandleActive(_handle)) {
 			_engine->_mixer->setChannelBalance(_handle, bal);
-			_engine->_mixer->setChannelVolume(_handle, new_volume * lvl);
+			_engine->_mixer->setChannelVolume(_handle, newVolume * lvl);
 		}
 	} else {
 		if (_engine->_mixer->isSoundHandleActive(_handle)) {
 			_engine->_mixer->setChannelBalance(_handle, 0);
-			_engine->_mixer->setChannelVolume(_handle, new_volume);
+			_engine->_mixer->setChannelVolume(_handle, newVolume);
 		}
 	}
 
-	_volume = new_volume;
+	_volume = newVolume;
 }
 
 PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
@@ -175,7 +175,7 @@ PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
 
 	SideFX *fx = _engine->getScriptManager()->getSideFX(slot);
 	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNode_BASE *mus = (MusicNode_BASE *)fx;
+		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 		mus->setPanTrack(pos);
 	}
 }
@@ -183,14 +183,14 @@ PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
 PanTrackNode::~PanTrackNode() {
 	SideFX *fx = _engine->getScriptManager()->getSideFX(_slot);
 	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNode_BASE *mus = (MusicNode_BASE *)fx;
+		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 		mus->unsetPanTrack();
 	}
 }
 
 
 MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
-	: MusicNode_BASE(engine, key, SIDEFX_AUDIO) {
+	: MusicNodeBASE(engine, key, SIDEFX_AUDIO) {
 	_volume = volume;
 	_prog = program;
 	_noteNumber = note;
@@ -230,11 +230,11 @@ bool MusicMidiNode::process(uint32 deltaTimeInMillis) {
 	return false;
 }
 
-void MusicMidiNode::setVolume(uint8 new_volume) {
+void MusicMidiNode::setVolume(uint8 newVolume) {
 	if (_chan >= 0) {
-		_engine->getMidiManager()->setVolume(_chan, new_volume);
+		_engine->getMidiManager()->setVolume(_chan, newVolume);
 	}
-	_volume = new_volume;
+	_volume = newVolume;
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index 262b13085e..954e2f474e 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -33,10 +33,10 @@ class String;
 
 namespace ZVision {
 
-class MusicNode_BASE : public SideFX {
+class MusicNodeBASE : public SideFX {
 public:
-	MusicNode_BASE(ZVision *engine, uint32 key, SideFXType type) : SideFX(engine, key, type) {}
-	~MusicNode_BASE() {}
+	MusicNodeBASE(ZVision *engine, uint32 key, SideFXType type) : SideFX(engine, key, type) {}
+	~MusicNodeBASE() {}
 
 	/**
 	 * Decrement the timer by the delta time. If the timer is finished, set the status
@@ -55,7 +55,7 @@ public:
 	virtual void setFade(int32 time, uint8 target) = 0;
 };
 
-class MusicNode : public MusicNode_BASE {
+class MusicNode : public MusicNodeBASE {
 public:
 	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
 	~MusicNode();
@@ -79,19 +79,19 @@ public:
 private:
 	int32 _timeLeft;
 	bool _pantrack;
-	int32 _pantrack_X;
+	int32 _pantrackPosition;
 	int32 _attenuate;
 	uint8 _volume;
 	bool _loop;
 	bool _crossfade;
-	uint8 _crossfade_target;
-	int32 _crossfade_time;
+	uint8 _crossfadeTarget;
+	int32 _crossfadeTime;
 	bool _stereo;
 	Audio::SoundHandle _handle;
 	Subtitle *_sub;
 };
 
-class MusicMidiNode : public MusicNode_BASE {
+class MusicMidiNode : public MusicNodeBASE {
 public:
 	MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume);
 	~MusicMidiNode();
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
index a6326c733b..a229129b9d 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.h
+++ b/engines/zvision/scripting/sidefx/ttytext_node.h
@@ -50,15 +50,12 @@ public:
 	bool process(uint32 deltaTimeInMillis);
 private:
 	Common::Rect _r;
-	//int16 x;
-	//int16 y;
-	//uint16 w;
-	//uint16 h;
+
 	cTxtStyle _style;
-	sTTFont _fnt;
+	StyledTTFont _fnt;
 	Common::String _txtbuf;
 	uint32 _txtpos;
-	//int32 txtsize;
+
 	int32 _delay;
 	int32 _nexttime;
 	Graphics::Surface _img;
diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp
index 4ca48f7b42..1f68b2435f 100644
--- a/engines/zvision/subtitles/subtitles.cpp
+++ b/engines/zvision/subtitles/subtitles.cpp
@@ -52,12 +52,12 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
 				if (_engine->getSearchManager()->openFile(txt, filename)) {
 					while (!txt.eos()) {
 						Common::String txtline = readWideLine(txt);
-						sub cur_sub;
-						cur_sub.start = -1;
-						cur_sub.stop = -1;
-						cur_sub.sub = txtline;
+						sub curSubtitle;
+						curSubtitle.start = -1;
+						curSubtitle.stop = -1;
+						curSubtitle.sub = txtline;
 
-						_subs.push_back(cur_sub);
+						_subs.push_back(curSubtitle);
 					}
 					txt.close();
 				}
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index efb0fb42f9..872d6875b7 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -233,71 +233,71 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 }
 
 void cTxtStyle::readAllStyle(const Common::String &txt) {
-	int16 strt = -1;
-	int16 endt = -1;
+	int16 startTextPosition = -1;
+	int16 endTextPosition = -1;
 
 	for (uint16 i = 0; i < txt.size(); i++) {
 		if (txt[i] == '<')
-			strt = i;
+			startTextPosition = i;
 		else if (txt[i] == '>') {
-			endt = i;
-			if (strt != -1)
-				if ((endt - strt - 1) > 0)
-					parseStyle(Common::String(txt.c_str() + strt + 1), endt - strt - 1);
+			endTextPosition = i;
+			if (startTextPosition != -1)
+				if ((endTextPosition - startTextPosition - 1) > 0)
+					parseStyle(Common::String(txt.c_str() + startTextPosition + 1), endTextPosition - startTextPosition - 1);
 		}
 
 	}
 }
 
-void cTxtStyle::setFontStyle(sTTFont &font) {
-	uint temp_stl = 0;
+void cTxtStyle::setFontStyle(StyledTTFont &font) {
+	uint tempStyle = 0;
 
 	if (bold)
-		temp_stl |= sTTFont::STTF_BOLD;
+		tempStyle |= StyledTTFont::STTF_BOLD;
 
 	if (italic)
-		temp_stl |= sTTFont::STTF_ITALIC;
+		tempStyle |= StyledTTFont::STTF_ITALIC;
 
 	if (underline)
-		temp_stl |= sTTFont::STTF_UNDERLINE;
+		tempStyle |= StyledTTFont::STTF_UNDERLINE;
 
 	if (strikeout)
-		temp_stl |= sTTFont::STTF_STRIKEOUT;
+		tempStyle |= StyledTTFont::STTF_STRIKEOUT;
 
 	if (sharp)
-		temp_stl |= sTTFont::STTF_SHARP;
+		tempStyle |= StyledTTFont::STTF_SHARP;
 
-	font.setStyle(temp_stl);
+	font.setStyle(tempStyle);
 }
 
-void cTxtStyle::setFont(sTTFont &font) {
-	uint temp_stl = 0;
+void cTxtStyle::setFont(StyledTTFont &font) {
+	uint tempStyle = 0;
 
 	if (bold)
-		temp_stl |= sTTFont::STTF_BOLD;
+		tempStyle |= StyledTTFont::STTF_BOLD;
 
 	if (italic)
-		temp_stl |= sTTFont::STTF_ITALIC;
+		tempStyle |= StyledTTFont::STTF_ITALIC;
 
 	if (underline)
-		temp_stl |= sTTFont::STTF_UNDERLINE;
+		tempStyle |= StyledTTFont::STTF_UNDERLINE;
 
 	if (strikeout)
-		temp_stl |= sTTFont::STTF_STRIKEOUT;
+		tempStyle |= StyledTTFont::STTF_STRIKEOUT;
 
 	if (sharp)
-		temp_stl |= sTTFont::STTF_SHARP;
+		tempStyle |= StyledTTFont::STTF_SHARP;
 
-	font.loadFont(fontname, size, temp_stl);
+	font.loadFont(fontname, size, tempStyle);
 }
 
-Graphics::Surface *textRenderer::render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
+Graphics::Surface *TextRenderer::render(StyledTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
 	style.setFontStyle(fnt);
 	uint32 clr = _engine->_pixelFormat.RGBToColor(style.red, style.green, style.blue);
 	return fnt.renderSolidText(txt, clr);
 }
 
-void textRenderer::drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify) {
+void TextRenderer::drawTxtWithJustify(const Common::String &txt, StyledTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify) {
 	if (justify == TXT_JUSTIFY_LEFT)
 		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignLeft);
 	else if (justify == TXT_JUSTIFY_CENTER)
@@ -306,33 +306,33 @@ void textRenderer::drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, u
 		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignRight);
 }
 
-int32 textRenderer::drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst) {
-	sTTFont font(_engine);
-	fnt_stl.setFont(font);
+int32 TextRenderer::drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Graphics::Surface &dst) {
+	StyledTTFont font(_engine);
+	fontStyle.setFont(font);
 
 	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
 
-	uint32 clr = _engine->_pixelFormat.RGBToColor(fnt_stl.red, fnt_stl.green, fnt_stl.blue);
+	uint32 clr = _engine->_pixelFormat.RGBToColor(fontStyle.red, fontStyle.green, fontStyle.blue);
 
 	int16 w;
 
 	w = font.getStringWidth(txt);
 
-	drawTxtWithJustify(txt, font, clr, dst, 0, fnt_stl.justify);
+	drawTxtWithJustify(txt, font, clr, dst, 0, fontStyle.justify);
 
 	return w;
 }
 
-void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surface &dst) {
+void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surface &dst) {
 	const int16 TXT_CFG_TEXTURES_LINES = 256; // For now I don't want remake it
 	const int TXT_CFG_TEXTURES_PER_LINE = 6;
 	cTxtStyle style, style2;
-	int16 strt = -1;
-	int16 endt = -1;
+	int16 startTextPosition = -1;
+	int16 endTextPosition = -1;
 	int16 i = 0;
 	int16 dx = 0, dy = 0;
-	int16 txt_w;
-	int16 txtpos = 0;
+	int16 textPixelWidth;
+	int16 textPosition = 0;
 	Common::String buf;
 	Common::String buf2;
 
@@ -350,7 +350,7 @@ void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 
 	int16 stringlen = text.size();
 
-	sTTFont font(_engine);
+	StyledTTFont font(_engine);
 
 	style.setFont(font);
 
@@ -361,19 +361,19 @@ void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 		if (text[i] == '<') {
 			int16 ret = 0;
 
-			strt = i;
+			startTextPosition = i;
 			while (i < stringlen && text[i] != '>')
 				i++;
-			endt = i;
-			if (strt != -1)
-				if ((endt - strt - 1) > 0) {
+			endTextPosition = i;
+			if (startTextPosition != -1)
+				if ((endTextPosition - startTextPosition - 1) > 0) {
 					style2 = style;
-					ret = style.parseStyle(Common::String(text.c_str() + strt + 1), endt - strt - 1);
+					ret = style.parseStyle(Common::String(text.c_str() + startTextPosition + 1), endTextPosition - startTextPosition - 1);
 				}
 
 			if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
 				if (buf.size() > 0) {
-					txt_w = font.getStringWidth(buf);
+					textPixelWidth = font.getStringWidth(buf);
 
 					TxtSurfaces[currentline][currentlineitm] = render(font, buf, style2);
 					TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
@@ -382,8 +382,8 @@ void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 
 					buf.clear();
 					prevbufspace = 0;
-					txtpos = 0;
-					dx += txt_w;
+					textPosition = 0;
+					dx += textPixelWidth;
 
 				}
 				if (ret & TXT_RET_FNTCHG) {
@@ -403,25 +403,25 @@ void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 				Common::String buf3;
 				buf3.format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
 				buf += buf3;
-				txtpos += buf3.size();
+				textPosition += buf3.size();
 			}
 
 		} else {
 
 			buf += text[i];
-			txtpos++;
+			textPosition++;
 
 			if (text[i] == ' ') {
-				prevbufspace = txtpos - 1;
+				prevbufspace = textPosition - 1;
 				prevtxtspace = i;
 			}
 
 			if (font.isLoaded()) {
-				txt_w = font.getStringWidth(buf);
-				if (txt_w + dx > dst.w) {
+				textPixelWidth = font.getStringWidth(buf);
+				if (textPixelWidth + dx > dst.w) {
 					if (prevbufspace == 0) {
 						prevtxtspace = i;
-						prevbufspace = txtpos - 1;
+						prevbufspace = textPosition - 1;
 					}
 					buf2 = Common::String(buf.c_str(), prevbufspace + 1);
 
@@ -433,7 +433,7 @@ void textRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 					buf.clear();
 					i = prevtxtspace;
 					prevbufspace = 0;
-					txtpos = 0;
+					textPosition = 0;
 					currentline++;
 					currentlineitm = 0;
 					dx = 0;
@@ -494,7 +494,7 @@ Common::String readWideLine(Common::SeekableReadStream &stream) {
 			break;
 		}
 
-		// Crush each octet pair to a single octet with a simple cast
+		// Crush each octet pair to a UTF-8 sequence
 		if (value < 0x80) {
 			asciiString += (char)(value & 0x7F);
 		} else if (value >= 0x80 && value < 0x800) {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index 4b318fdef0..c2468383d3 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -56,8 +56,8 @@ public:
 	cTxtStyle();
 	txtReturn parseStyle(const Common::String &strin, int16 len);
 	void readAllStyle(const Common::String &txt);
-	void setFontStyle(sTTFont &font);
-	void setFont(sTTFont &font);
+	void setFontStyle(StyledTTFont &font);
+	void setFont(StyledTTFont &font);
 
 public:
 	Common::String fontname;
@@ -78,13 +78,13 @@ public:
 	// char image ??
 };
 
-class textRenderer {
+class TextRenderer {
 public:
-	textRenderer(ZVision *engine): _engine(engine) {};
+	TextRenderer(ZVision *engine): _engine(engine) {};
 
-	void drawTxtWithJustify(const Common::String &txt, sTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify);
-	int32 drawTxt(const Common::String &txt, cTxtStyle &fnt_stl, Graphics::Surface &dst);
-	Graphics::Surface *render(sTTFont &fnt, const Common::String &txt, cTxtStyle &style);
+	void drawTxtWithJustify(const Common::String &txt, StyledTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify);
+	int32 drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Graphics::Surface &dst);
+	Graphics::Surface *render(StyledTTFont &fnt, const Common::String &txt, cTxtStyle &style);
 	void drawTxtInOneLine(const Common::String &txt, Graphics::Surface &dst);
 
 private:
diff --git a/engines/zvision/utility/win_keys.cpp b/engines/zvision/utility/win_keys.cpp
index 3441fb8bf0..86ed7c596f 100644
--- a/engines/zvision/utility/win_keys.cpp
+++ b/engines/zvision/utility/win_keys.cpp
@@ -24,17 +24,17 @@
 
 namespace ZVision {
 
-uint8 VKkey(Common::KeyCode scumm_key) {
-	if (scumm_key >= Common::KEYCODE_a && scumm_key <= Common::KEYCODE_z)
-		return 0x41 + scumm_key - Common::KEYCODE_a;
-	if (scumm_key >= Common::KEYCODE_0 && scumm_key <= Common::KEYCODE_9)
-		return 0x30 + scumm_key - Common::KEYCODE_0;
-	if (scumm_key >= Common::KEYCODE_F1 && scumm_key <= Common::KEYCODE_F15)
-		return 0x70 + scumm_key - Common::KEYCODE_F1;
-	if (scumm_key >= Common::KEYCODE_KP0 && scumm_key <= Common::KEYCODE_KP9)
-		return 0x60 + scumm_key - Common::KEYCODE_KP0;
+uint8 VKkey(Common::KeyCode scummKeyCode) {
+	if (scummKeyCode >= Common::KEYCODE_a && scummKeyCode <= Common::KEYCODE_z)
+		return 0x41 + scummKeyCode - Common::KEYCODE_a;
+	if (scummKeyCode >= Common::KEYCODE_0 && scummKeyCode <= Common::KEYCODE_9)
+		return 0x30 + scummKeyCode - Common::KEYCODE_0;
+	if (scummKeyCode >= Common::KEYCODE_F1 && scummKeyCode <= Common::KEYCODE_F15)
+		return 0x70 + scummKeyCode - Common::KEYCODE_F1;
+	if (scummKeyCode >= Common::KEYCODE_KP0 && scummKeyCode <= Common::KEYCODE_KP9)
+		return 0x60 + scummKeyCode - Common::KEYCODE_KP0;
 
-	switch (scumm_key) {
+	switch (scummKeyCode) {
 	case Common::KEYCODE_BACKSPACE:
 		return 0x8;
 	case Common::KEYCODE_TAB:
diff --git a/engines/zvision/utility/win_keys.h b/engines/zvision/utility/win_keys.h
index a79a03a07b..53d76c4d5f 100644
--- a/engines/zvision/utility/win_keys.h
+++ b/engines/zvision/utility/win_keys.h
@@ -20,13 +20,13 @@
  *
  */
 
-#ifndef ZVISION_WINKEY_H
-#define ZVISION_WINKEY_H
+#ifndef ZVISION_WIN_KEYS_H
+#define ZVISION_WIN_KEYS_H
 
 #include "common/keyboard.h"
 
 namespace ZVision {
-uint8 VKkey(Common::KeyCode scumm_key);
+uint8 VKkey(Common::KeyCode scummKeyCode);
 } // End of namespace ZVision
 
 #endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 84856429e9..62342f02b9 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -95,7 +95,7 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _stringManager(nullptr),
 	  _cursorManager(nullptr),
 	  _midiManager(nullptr),
-	  _aud_id(0),
+	  _audioId(0),
 	  _rendDelay(2),
 	  _kbdVelocity(0),
 	  _mouseVelocity(0) {
@@ -147,7 +147,7 @@ void ZVision::saveSettings() {
 void ZVision::initialize() {
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 
-	_searchManager = new sManager(ConfMan.get("path"), 6);
+	_searchManager = new SearchManager(ConfMan.get("path"), 6);
 
 	_searchManager->addDir("FONTS");
 	_searchManager->addDir("addon");
@@ -182,13 +182,13 @@ void ZVision::initialize() {
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, &_pixelFormat);
-	_textRenderer = new textRenderer(this);
-	_midiManager = new midiManager();
+	_textRenderer = new TextRenderer(this);
+	_midiManager = new MidiManager();
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
-		_menu = new menuZgi(this);
+		_menu = new MenuZGI(this);
 	else
-		_menu = new menuNem(this);
+		_menu = new MenuNemesis(this);
 
 	// Initialize the managers
 	_cursorManager->initialize();
@@ -290,8 +290,8 @@ void ZVision::delayedMessage(const Common::String &str, uint16 milsecs) {
 	_renderManager->renderBackbufferToScreen();
 	_clock.stop();
 
-	uint32 stop_time = _system->getMillis() + milsecs;
-	while (_system->getMillis() < stop_time) {
+	uint32 stopTime = _system->getMillis() + milsecs;
+	while (_system->getMillis() < stopTime) {
 		Common::Event evnt;
 		while (_eventMan->pollEvent(evnt)) {
 			if (evnt.type == Common::EVENT_KEYDOWN &&
@@ -353,38 +353,38 @@ void ZVision::updateRotation() {
 	if (_velocity) {
 		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
 		if (renderState == RenderTable::PANORAMA) {
-			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+			int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
 
-			int16 new_pos = st_pos + (_renderManager->getRenderTable()->getPanoramaReverse() ? -_velocity : _velocity);
+			int16 newPosition = startPosition + (_renderManager->getRenderTable()->getPanoramaReverse() ? -_velocity : _velocity);
 
-			int16 zero_point = _renderManager->getRenderTable()->getPanoramaZeroPoint();
-			if (st_pos >= zero_point && new_pos < zero_point)
+			int16 zeroPoint = _renderManager->getRenderTable()->getPanoramaZeroPoint();
+			if (startPosition >= zeroPoint && newPosition < zeroPoint)
 				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) - 1);
-			if (st_pos <= zero_point && new_pos > zero_point)
+			if (startPosition <= zeroPoint && newPosition > zeroPoint)
 				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) + 1);
 
-			int16 scr_width = _renderManager->getBkgSize().x;
-			if (scr_width)
-				new_pos %= scr_width;
+			int16 screenWidth = _renderManager->getBkgSize().x;
+			if (screenWidth)
+				newPosition %= screenWidth;
 
-			if (new_pos < 0)
-				new_pos += scr_width;
+			if (newPosition < 0)
+				newPosition += screenWidth;
 
-			_renderManager->setBackgroundPosition(new_pos);
+			_renderManager->setBackgroundPosition(newPosition);
 		} else if (renderState == RenderTable::TILT) {
-			int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+			int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
 
-			int16 new_pos = st_pos + _velocity;
+			int16 newPosition = startPosition + _velocity;
 
-			int16 scr_height = _renderManager->getBkgSize().y;
-			int16 tilt_gap = _renderManager->getRenderTable()->getTiltGap();
+			int16 screenHeight = _renderManager->getBkgSize().y;
+			int16 tiltGap = _renderManager->getRenderTable()->getTiltGap();
 
-			if (new_pos >= (scr_height - tilt_gap))
-				new_pos = scr_height - tilt_gap;
-			if (new_pos <= tilt_gap)
-				new_pos = tilt_gap;
+			if (newPosition >= (screenHeight - tiltGap))
+				newPosition = screenHeight - tiltGap;
+			if (newPosition <= tiltGap)
+				newPosition = tiltGap;
 
-			_renderManager->setBackgroundPosition(new_pos);
+			_renderManager->setBackgroundPosition(newPosition);
 		}
 	}
 }
@@ -392,35 +392,35 @@ void ZVision::updateRotation() {
 void ZVision::checkBorders() {
 	RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
 	if (renderState == RenderTable::PANORAMA) {
-		int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+		int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
 
-		int16 new_pos = st_pos;
+		int16 newPosition = startPosition;
 
-		int16 scr_width = _renderManager->getBkgSize().x;
+		int16 screenWidth = _renderManager->getBkgSize().x;
 
-		if (scr_width)
-			new_pos %= scr_width;
+		if (screenWidth)
+			newPosition %= screenWidth;
 
-		if (new_pos < 0)
-			new_pos += scr_width;
+		if (newPosition < 0)
+			newPosition += screenWidth;
 
-		if (st_pos != new_pos)
-			_renderManager->setBackgroundPosition(new_pos);
+		if (startPosition != newPosition)
+			_renderManager->setBackgroundPosition(newPosition);
 	} else if (renderState == RenderTable::TILT) {
-		int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
+		int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
 
-		int16 new_pos = st_pos;
+		int16 newPosition = startPosition;
 
-		int16 scr_height = _renderManager->getBkgSize().y;
-		int16 tilt_gap = _renderManager->getRenderTable()->getTiltGap();
+		int16 screenHeight = _renderManager->getBkgSize().y;
+		int16 tiltGap = _renderManager->getRenderTable()->getTiltGap();
 
-		if (new_pos >= (scr_height - tilt_gap))
-			new_pos = scr_height - tilt_gap;
-		if (new_pos <= tilt_gap)
-			new_pos = tilt_gap;
+		if (newPosition >= (screenHeight - tiltGap))
+			newPosition = screenHeight - tiltGap;
+		if (newPosition <= tiltGap)
+			newPosition = tiltGap;
 
-		if (st_pos != new_pos)
-			_renderManager->setBackgroundPosition(new_pos);
+		if (startPosition != newPosition)
+			_renderManager->setBackgroundPosition(newPosition);
 	}
 }
 
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 8cf9dbf107..8b14cfa178 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -52,10 +52,10 @@ class CursorManager;
 class StringManager;
 class SaveManager;
 class RlfAnimation;
-class menuHandler;
-class textRenderer;
+class MenuHandler;
+class TextRenderer;
 class Subtitle;
-class midiManager;
+class MidiManager;
 
 class ZVision : public Engine {
 public:
@@ -104,16 +104,16 @@ private:
 	CursorManager *_cursorManager;
 	SaveManager *_saveManager;
 	StringManager *_stringManager;
-	menuHandler *_menu;
-	sManager *_searchManager;
-	textRenderer *_textRenderer;
-	midiManager *_midiManager;
+	MenuHandler *_menu;
+	SearchManager *_searchManager;
+	TextRenderer *_textRenderer;
+	MidiManager *_midiManager;
 
 	// Clock
 	Clock _clock;
 
 	// Audio ID
-	int _aud_id;
+	int _audioId;
 
 	// To prevent allocation every time we process events
 	Common::Event _event;
@@ -148,13 +148,13 @@ public:
 	StringManager *getStringManager() const {
 		return _stringManager;
 	}
-	sManager *getSearchManager() const {
+	SearchManager *getSearchManager() const {
 		return _searchManager;
 	}
-	textRenderer *getTextRenderer() const {
+	TextRenderer *getTextRenderer() const {
 		return _textRenderer;
 	}
-	midiManager *getMidiManager() const {
+	MidiManager *getMidiManager() const {
 		return _midiManager;
 	}
 	Common::RandomSource *getRandomSource() const {
-- 
cgit v1.2.3


From 596a904a0c6aedba5bbe45cdfa931425450626c8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Thu, 20 Nov 2014 14:55:35 +0600
Subject: ZVISION: Remove wrong TODO from  scripting/sidefx.h

---
 engines/zvision/scripting/sidefx.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/engines/zvision/scripting/sidefx.h b/engines/zvision/scripting/sidefx.h
index 2c53467559..5bb14f0cdd 100644
--- a/engines/zvision/scripting/sidefx.h
+++ b/engines/zvision/scripting/sidefx.h
@@ -109,16 +109,6 @@ protected:
 public:
 
 };
-
-// TODO: Implement InputControl
-// TODO: Implement SaveControl
-// TODO: Implement SlotControl
-// TODO: Implement SafeControl
-// TODO: Implement FistControl
-// TODO: Implement HotMovieControl
-// TODO: Implement PaintControl
-// TODO: Implement TilterControl
-
 } // End of namespace ZVision
 
 #endif // SIDEFX_H_INCLUDED
-- 
cgit v1.2.3


From 3fb4ab1377d15bb0fca78c5964531d3f2d49f986 Mon Sep 17 00:00:00 2001
From: Stefan Kristiansson
Date: Sat, 22 Nov 2014 10:01:27 +0200
Subject: COMMON: make XMLParser::loadStream() fail when stream is null

Some users of this method relies on it to fail when
an invalid stream is passed to it
(E.g. VirtualKeyboard::openPack).
---
 common/xmlparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 common/xmlparser.cpp

diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
old mode 100644
new mode 100755
index c80d5e15be..67a3d36cec
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -69,7 +69,7 @@ bool XMLParser::loadBuffer(const byte *buffer, uint32 size, DisposeAfterUse::Fla
 bool XMLParser::loadStream(SeekableReadStream *stream) {
 	_stream = stream;
 	_fileName = "File Stream";
-	return true;
+	return _stream != nullptr;
 }
 
 void XMLParser::close() {
-- 
cgit v1.2.3


From daefdc315bdcb8a62f6e69d45a1f0b535fff46d5 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 22 Nov 2014 10:21:32 +1100
Subject: SCUMM: Fix bug #2034 - MANIAC V2: Early Collision with Green Tentacle

---
 engines/scumm/script_v0.cpp | 6 +++---
 engines/scumm/script_v2.cpp | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index a7999a2695..af39fdaad8 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -589,9 +589,9 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 		return;
 	}
 
-	// The original interpreter seems to set the actors new room X/Y to the last rooms X/Y
-	// This fixes a problem with MM: script 158 in room 12, the 'Oompf!' script
-	// This scripts runs before the actor position is set to the correct location
+	// The original interpreter sets the actors new room X/Y to the last rooms X/Y
+	// This fixes a problem with MM: script 158 in room 12, the 'Oomph!' script
+	// This scripts runs before the actor position is set to the correct room entry location
 	a->putActor(a->getPos().x, a->getPos().y, room);
 	_egoPositioned = false;
 
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 74d0aa2483..a7ec2e644f 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1390,7 +1390,14 @@ void ScummEngine_v2::o2_loadRoomWithEgo() {
 
 	a = derefActor(VAR(VAR_EGO), "o2_loadRoomWithEgo");
 
-	a->putActor(0, 0, room);
+	// The original interpreter sets the actors new room X/Y to the last rooms X/Y
+	// This fixes a problem with MM: script 161 in room 12, the 'Oomph!' script
+	// This scripts runs before the actor position is set to the correct room entry location
+	if ((_game.id == GID_MANIAC) && (_game.platform != Common::kPlatformNES)) {
+		a->putActor(a->getPos().x, a->getPos().y, room);
+	} else {
+		a->putActor(0, 0, room);
+	}
 	_egoPositioned = false;
 
 	x = (int8)fetchScriptByte();
-- 
cgit v1.2.3


From c76f21747fddd0688732c7115f2a5307777a6fad Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sun, 23 Nov 2014 10:58:48 +1100
Subject: SCUMM: MANIAC V1 Demo: GF_DEMO was not being set

---
 engines/scumm/detection.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 10482ba1fc..c0db0d6d37 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -502,6 +502,7 @@ static void computeGameSettingsFromMD5(const Common::FSList &fslist, const GameF
 				// (since they have identical MD5):
 				if (dr.game.id == GID_MANIAC && !strcmp(gfp->pattern, "%02d.MAN")) {
 					dr.extra = "V1 Demo";
+					dr.game.features = GF_DEMO;
 				}
 
 				// HACK: Try to detect languages for translated games
-- 
cgit v1.2.3


From 26fc4be311f5e0cf9a92a64ca412b8b12858e324 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 23 Nov 2014 12:07:58 +0100
Subject: DOCS: Add CONTRIBUTING.md

This will be displayed on github as "guidelines for contributing".
---
 CONTRIBUTING.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..3a6672b0cb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+Thank you for considering contributing to ScummVM.
+
+Please make sure to read our guidelines for contributions on our
+[wiki](http://wiki.scummvm.org/index.php/Developer_Central). In particular:
+
+* [Coding style](http://wiki.scummvm.org/index.php/Code_Formatting_Conventions)
+* [Portability](http://wiki.scummvm.org/index.php/Coding_Conventions)
+* [Commit message style](http://wiki.scummvm.org/index.php/Commit_Guidelines)
+* License: GPLv2+
+
+If you have any questions about code, style, procedure, or anything else, feel
+free to contact us on our mailing list at scummvm-devel@lists.sourceforge.net.
-- 
cgit v1.2.3


From 7ff41ae9027ffe3186a0c0f471069d656dbda91b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 23 Nov 2014 17:51:13 +0100
Subject: COMMON: Remove executable bit

---
 common/xmlparser.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 common/xmlparser.cpp

diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 2dbd99d57264bab012cebd064eadfc34050832b1 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Fri, 28 Nov 2014 22:24:45 +1100
Subject: SCUMM: Maniac V0: Implement the original Walk Code (to fix some anim
 glitches), fix opcode to use _moving correctly (as V0 is different)

---
 engines/scumm/actor.cpp     | 440 +++++++++++++++++++++++++++++++++++++++++++-
 engines/scumm/actor.h       |  40 +++-
 engines/scumm/script.cpp    |   2 +-
 engines/scumm/script_v0.cpp |  12 +-
 engines/scumm/verbs.cpp     |   1 -
 5 files changed, 473 insertions(+), 22 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 116a953b0b..1ea1f6eb54 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -250,8 +250,11 @@ void Actor::stopActorMoving() {
 		_vm->stopScript(_walkScript);
 
 	_moving = 0;
-	if (_vm->_game.version == 0)
+
+	if (_vm->_game.version == 0) {
+		_moving = 2;
 		setDirection(_facing);
+	}
 }
 
 void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY) {
@@ -447,7 +450,11 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	_walkdata.dest.y = abr.y;
 	_walkdata.destbox = abr.box;
 	_walkdata.destdir = dir;
-	_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
+	if(_vm->_game.version != 0 ) {
+		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
+	} else {
+		((Actor_v0*)this)->unk_FDE1 = 1;
+	}
 	_walkdata.point3.x = 32000;
 
 	_walkdata.curbox = _walkbox;
@@ -651,6 +658,403 @@ bool Actor_v0::checkWalkboxesHaveDirectPath(Common::Point &foundPath) {
 	return false;
 }
 
+bool Actor_v0::sub_2F6F() {
+	_walkDirX = 0;
+	_walkDirY = 0;
+	_walkYCountGreaterThanXCount = 0;
+	uint16 A = 0;
+
+	if (_CurrentWalkTo.x >= _tmp_Dest.x ) {
+		A = _CurrentWalkTo.x - _tmp_Dest.x;
+		_walkDirX = 1;
+	} else {
+		A = _tmp_Dest.x - _CurrentWalkTo.x;
+	}
+
+	_walkXCountInc = A;
+
+	if (_CurrentWalkTo.y >= _tmp_Dest.y ) {
+		A = _CurrentWalkTo.y - _tmp_Dest.y;
+		_walkDirY = 1;
+	} else {
+		A = _tmp_Dest.y - _CurrentWalkTo.y;
+	}
+
+	_walkYCountInc = A;
+	if ( !_walkXCountInc && !_walkYCountInc )
+		return true;
+
+	if( _walkXCountInc <= _walkYCountInc ) 
+		_walkYCountGreaterThanXCount = 1;
+
+	// 2FCC
+	A = _walkXCountInc;
+	if( A <= _walkYCountInc )
+		A = _walkYCountInc;
+
+	_walkMaxXYCountInc = A;
+	_walkXCount = _walkXCountInc;
+	_walkYCount = _walkYCountInc;
+	_walkCountModulo = _walkMaxXYCountInc;
+
+	return false;
+}
+
+byte Actor_v0::updateWalkbox() {
+	if( _vm->checkXYInBoxBounds( _walkbox, _pos.x, _pos.y ) )
+		return 0;
+
+	int numBoxes = _vm->getNumBoxes() - 1;
+	for (int i = 0; i <= numBoxes; i++) {
+		if (_vm->checkXYInBoxBounds( i, _pos.x, _pos.y ) == true ) {
+			if (_walkdata.curbox == i ) {
+				setBox(i);
+
+				unk_FDE1 = 1;
+				return i;
+			}
+		}
+	}
+
+	return 0xFF;
+}
+
+void Actor_v0::setTmpFromActor() {
+	_tmp_Pos = _pos;
+	_pos = _tmp_Dest;
+	_tmp_WalkBox = _walkbox;
+	_tmp_CB5F = unk_FDE1;
+}
+
+void Actor_v0::setActorFromTmp() {
+	_pos = _tmp_Pos;
+	_tmp_Dest = _tmp_Pos;
+	_walkbox = _tmp_WalkBox;
+	unk_FDE1 = _tmp_CB5F;
+}
+
+byte Actor_v0::actorWalkX() {
+	byte A = _walkXCount;
+	A += _walkXCountInc;
+	if (A >= _walkCountModulo) {
+		if (!_walkDirX ) {
+			_tmp_Dest.x--;
+		} else {
+			_tmp_Dest.x++;
+		}
+
+		A -= _walkCountModulo;
+	}
+	// 2EAC
+	_walkXCount = A;
+	setTmpFromActor();
+	if( updateWalkbox() == 0xFF ) {
+		// 2EB9
+		setActorFromTmp();
+
+		return 3;
+	} 
+	// 2EBF
+	if( _tmp_Dest.x == _CurrentWalkTo.x )
+		return 1;
+
+	return 0;
+}
+
+byte Actor_v0::actorWalkY() {
+
+	byte A = _walkYCount;
+	A += _walkYCountInc;
+	if (A >= _walkCountModulo) {
+		if (!_walkDirY ) {
+			_tmp_Dest.y--;
+		} else {
+			_tmp_Dest.y++;
+		}
+
+		A -= _walkCountModulo;
+	}
+	// 2EEB
+	_walkYCount = A;
+	setTmpFromActor();
+	if (updateWalkbox() == 0xFF) {
+		// 2EF8
+		setActorFromTmp();
+		return 4;
+	} 
+
+	// 2EFE
+	if (_walkYCountInc != 0) {
+		if (_walkYCountInc == 0xFF ) {
+			setActorFromTmp();
+			return 4;
+		}
+	}
+
+	// 2F0D
+	if (_CurrentWalkTo.y == _tmp_Dest.y)
+		return 1;
+
+	return 0;
+}
+
+byte Actor_v0::walkboxFindTarget() {
+	return 0xff;
+}
+
+void Actor_v0::actorSetWalkTo() {
+	
+	if (unk_FDE1 == 0 )
+		return;
+
+	unk_FDE1 = 0;
+	byte nextBox = _vm->getNextBox(_walkbox, _walkdata.destbox);
+
+	if (nextBox != 0xFF && nextBox != _walkbox ) {
+		Common::Point tmp;
+		_walkdata.curbox = nextBox;
+
+		getClosestPtOnBox(_vm->getBoxCoordinates(nextBox), _pos.x, _pos.y, _NewWalkTo.x, _NewWalkTo.y);
+		//getClosestPtOnBox(_vm->getBoxCoordinates(_walkbox), tmp.x, tmp.y, _NewWalkTo.x, _NewWalkTo.y);
+		
+
+	} else {
+		if( _walkdata.dest.x == -1 )
+			_NewWalkTo = _CurrentWalkTo;
+		else
+			_NewWalkTo = _walkdata.dest;
+	}
+}
+
+void Actor_v0::walkActor() {
+	actorSetWalkTo();
+
+	_needRedraw = true;
+	if (_NewWalkTo != _CurrentWalkTo) {
+		
+		// 2A27
+		_CurrentWalkTo = _NewWalkTo;
+
+loc_2A33:;
+		_moving &= 0xF0;
+		_tmp_Dest = _pos;
+
+		byte tmp = sub_2F6F();
+		_moving &= 0xF0;
+		_moving |= tmp;
+
+		if (!_walkYCountGreaterThanXCount) {
+			if (_walkDirX) {
+				_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*1, V12_Y_MULTIPLIER*0, false);
+			} else {
+				_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*-1, V12_Y_MULTIPLIER*0, false);
+			}
+		} else {
+			if (_walkDirY) {
+				_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*0, V12_Y_MULTIPLIER*1, false);
+			} else {
+				_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*0, V12_Y_MULTIPLIER*-1, false);
+			}
+		}
+
+		directionUpdate();
+		
+		if (_moving & 0x80 ) 
+			return;
+
+		animateActor(newDirToOldDir(_facing));
+
+	} else {
+		// 2A0A
+		if ((_moving & 0x7F) != 1) {
+			
+			if (_NewWalkTo == _pos) {
+				return;
+			}
+		}
+	}
+
+
+	// 2A9A
+	if (_moving == 2 )
+		return;
+
+	if ((_moving & 0x0F) == 1 )
+		return stopActorMoving();
+
+	// 2AAD
+	if (_moving & 0x80) {
+		directionUpdate();
+
+		if ((_moving & 0x80) )
+			return;
+
+		// 2AC2
+		animateActor(newDirToOldDir(_facing));
+	}
+
+	// 2ACE
+	if ((_moving & 0x0F) == 3 ) {
+loc_2C36:;
+		// 2C36
+		setTmpFromActor();
+
+		if (!_walkDirX ) {
+			_pos.x--;
+		} else {
+			_pos.x++;
+		}
+
+		// 2C51
+		if (updateWalkbox() != 0xFF) {
+			//2C66
+			setActorFromTmp();
+			goto loc_2A33;
+		}
+
+		// 2C6C
+		setActorFromTmp();
+
+		if (_CurrentWalkTo.y == _tmp_Dest.y) {
+			stopActorMoving();
+			return;
+		}
+
+		if (!_walkDirY) {
+			_tmp_Dest.y--;
+		} else {
+			_tmp_Dest.y++;
+		}
+		setTmpFromActor();
+		//2C8B
+		byte A = updateWalkbox();
+		if (A == 0xFF) {
+			setActorFromTmp();
+			stopActorMoving();
+			return;
+		}
+		// 2C98: Yes, an exact copy of what just occured.. the original does this, so im doing it...
+		//       Just to keep me sane when going over it :)
+		if (A == 0xFF) {
+			setActorFromTmp();
+			stopActorMoving();
+			return;
+		}
+		return;
+	}
+
+	// 2ADA
+	if ((_moving & 0x0F) == 4 ) {
+		// 2CA3
+loc_2CA3:;
+		setTmpFromActor();
+
+		if (!_walkDirY) {
+			_pos.y--;
+		} else {
+			_pos.y++;
+		}
+		if (updateWalkbox() == 0xFF ) {
+			// 2CC7
+			setActorFromTmp();
+			if( _CurrentWalkTo.x == _tmp_Dest.x ) {
+				stopActorMoving();
+				return;
+			}
+			// 2CD5
+			if (!_walkDirX ) {
+				_tmp_Dest.x--;
+			} else {
+				_tmp_Dest.x++;
+			}
+			setTmpFromActor();
+
+			if (updateWalkbox() == 0xFF ) {
+				setActorFromTmp();
+				stopActorMoving();
+			}
+
+			return;
+		} else {
+			setActorFromTmp();
+			goto loc_2A33;
+		}
+	}
+
+	if ((_moving & 0x0F) == 0 ) {
+	 // 2AE8
+		byte A = actorWalkX();
+
+		if( A == 1 ) {
+			A = actorWalkY();
+			if( A  == 1 ) {
+				// 2AF6
+				_moving &= 0xF0;
+				_moving |= A;
+			} else {
+				// 2B04
+				if( A == 4 ) 
+					stopActorMoving();
+			}
+
+			return;
+
+		} else {
+			// 2B0C
+			if (A == 3) {
+				_moving &= 0xF0;
+				_moving |= A;
+
+				if (_walkDirY) {
+					_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*0, V12_Y_MULTIPLIER*1, false);
+				} else {
+					_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*0, V12_Y_MULTIPLIER*-1, false);
+				}
+
+				directionUpdate();
+				animateActor(newDirToOldDir(_facing));
+				goto loc_2C36;
+
+			} else {
+				// 2B39
+				A = actorWalkY();
+				if (A != 4 )
+					return;
+
+				// 2B46
+				_moving &= 0xF0;
+				_moving |= A;
+
+				if (_walkDirX) {
+					_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*1, V12_Y_MULTIPLIER*0, false);
+				} else {
+					_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*-1, V12_Y_MULTIPLIER*0, false);
+				}
+				
+				directionUpdate();
+				animateActor(newDirToOldDir(_facing));
+				goto loc_2CA3;
+			}
+		}
+	}
+}
+
+void Actor_v0::directionUpdate() {
+
+	int nextFacing = updateActorDirection(true);
+	if (_facing != nextFacing) {
+		// 2A89
+		setDirection(nextFacing);
+
+		if (_facing != _targetFacing ) {
+			_moving |= 0x80;
+		} else {
+			_moving &= ~0x80;
+		}
+	} else
+		_moving &= ~0x80;
+}	
+
 void Actor_v2::walkActor() {
 	Common::Point foundPath, tmp;
 	int new_dir, next_box;
@@ -985,18 +1389,16 @@ void Actor_v0::setDirection(int direction) {
 			break;
 
 		case 2:
-			res = 6;	// Face Away
+			res = 6;	// Face Camera
 			break;
 
 		default:
-			res = 7;	// Face Camera
+			res = 7;	// Face Away
 			break;
 	}
 
 	_animFrameRepeat = -1;
 	animateActor(res);
-	if (_moving)
-		animateCostume();
 }
 
 void Actor::faceToObject(int obj) {
@@ -1017,8 +1419,14 @@ void Actor::turnToDirection(int newdir) {
 		return;
 
 	if (_vm->_game.version <= 6) {
-		_moving = MF_TURN;
 		_targetFacing = newdir;
+		
+		if (_vm->_game.version == 0 ) {
+			setDirection( newdir );
+			return;
+		}
+		_moving = MF_TURN;
+		
 	} else {
 		_moving &= ~MF_TURN;
 		if (newdir != _facing) {
@@ -1085,8 +1493,14 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 	}
 
 	// V0 always sets the actor to face the camera upon entering a room
-	if (_vm->_game.version == 0)
+	if (_vm->_game.version == 0) {
+		_walkdata.dest = _pos;
+
+		((Actor_v0*)this)->unk_FDE1 = 1;
+		((Actor_v0*)this)->_CurrentWalkTo = _pos;
+
 		setDirection(oldDirToNewDir(2));
+	}
 }
 
 static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
@@ -1410,6 +1824,7 @@ void Actor::showActor() {
 		Actor_v0 *a = ((Actor_v0 *)this);
 
 		a->_costCommand = a->_costCommandNew = 0xFF;
+		
 
 		for (int i = 0; i < 8; ++i) {
 			a->_limbFrameRepeat[i] = 0;
@@ -1659,8 +2074,15 @@ void ScummEngine::processActors() {
 		// would hence cause regressions. See also the other big
 		// comment further up in this method for some details.
 		if (a->_costume) {
+
+			if (_game.version == 0)
+				a->animateCostume();
+
 			a->drawActorCostume();
-			a->animateCostume();
+
+			if (_game.version != 0)
+				a->animateCostume();
+				
 		}
 	}
 }
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 46dc7d0295..b2245da3d2 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -354,6 +354,27 @@ public:
 	byte _miscflags;
 	byte _speaking;
 
+	Common::Point _CurrentWalkTo, _NewWalkTo;
+
+	byte _walkDirX;
+	byte _walkDirY;
+
+	byte _walkYCountGreaterThanXCount;
+	byte _walkXCount;
+	byte _walkXCountInc;
+	byte _walkYCount;
+	byte _walkYCountInc;
+	byte _walkCountModulo;
+
+	byte _walkMaxXYCountInc;
+
+	byte unk_FDE1;
+
+	Common::Point _tmp_Pos;
+	Common::Point _tmp_Dest;
+	byte _tmp_WalkBox;
+	byte _tmp_CB5F;
+
 	int8 _animFrameRepeat;
 	int8 _limbFrameRepeatNew[8];
 	int8 _limbFrameRepeat[8];
@@ -363,16 +384,27 @@ public:
 public:
 	Actor_v0(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {}
 
-	virtual void initActor(int mode);
-	virtual void animateActor(int anim);
-	virtual void animateCostume();
+	void initActor(int mode);
+	void animateActor(int anim);
+	void animateCostume();
 
 	void limbFrameCheck(int limb);
 
+	void directionUpdate();
 	void speakCheck();
-	virtual void setDirection(int direction);
+	void setDirection(int direction);
 	void startAnimActor(int f);
 
+	bool sub_2F6F();
+	void walkActor();
+	void actorSetWalkTo();
+	byte actorWalkX();
+	byte actorWalkY();
+	byte updateWalkbox();
+	byte walkboxFindTarget();
+	void setTmpFromActor();
+	void setActorFromTmp();
+
 	// Used by the save/load system:
 	virtual void saveLoadWithSerializer(Serializer *ser);
 
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 2fe5333bfc..efd5e7bd2c 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1179,7 +1179,7 @@ bool ScummEngine_v0::checkPendingWalkAction() {
 	Actor_v0 *a = (Actor_v0 *)derefActor(actor, "checkPendingWalkAction");
 
 	// wait until walking or turning action is finished
-	if (a->_moving)
+	if (a->_moving!=2)
 		return true;
 
 	// after walking and turning finally execute the script
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index af39fdaad8..6cbfbf45b3 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -589,9 +589,9 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 		return;
 	}
 
-	// The original interpreter sets the actors new room X/Y to the last rooms X/Y
-	// This fixes a problem with MM: script 158 in room 12, the 'Oomph!' script
-	// This scripts runs before the actor position is set to the correct room entry location
+	// The original interpreter seems to set the actors new room X/Y to the last rooms X/Y
+	// This fixes a problem with MM: script 158 in room 12, the 'Oompf!' script
+	// This scripts runs before the actor position is set to the correct location
 	a->putActor(a->getPos().x, a->getPos().y, room);
 	_egoPositioned = false;
 
@@ -714,10 +714,8 @@ void ScummEngine_v0::o_getActorMoving() {
 	getResultPos();
 	int act = getVarOrDirectByte(PARAM_1);
 	Actor *a = derefActor(act, "o_getActorMoving");
-	if (a->_moving)
-		setResult(1);
-	else
-		setResult(2);
+
+	setResult(a->_moving);
 }
 
 void ScummEngine_v0::o_putActorAtObject() {
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index fdb98a8019..c1bafe1e0f 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -717,7 +717,6 @@ void ScummEngine_v0::verbExec() {
 	if (a->_miscflags & kActorMiscFlagFreeze)
 		return;
 
-	a->stopActorMoving();
 	a->startWalkActor(VAR(6), VAR(7), -1);
 }
 
-- 
cgit v1.2.3


From 29d46e8a10b7fae45d833bee0e7d3e4e62d75c5c Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 29 Nov 2014 07:12:57 +1100
Subject: SCUMM: Maniac V0: If boxes are neighbors, walk directly to the new
 box. Remove extra call to 'animateCostume'. Remove now unnecessary V0 walk
 calc functions

---
 engines/scumm/actor.cpp     | 211 ++++++++++++--------------------------------
 engines/scumm/actor.h       |  20 ++---
 engines/scumm/boxes.cpp     |  24 +++++
 engines/scumm/script_v0.cpp |   7 +-
 engines/scumm/scumm_v0.h    |   4 +-
 engines/scumm/verbs.cpp     |   1 -
 6 files changed, 92 insertions(+), 175 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 1ea1f6eb54..636f718582 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -33,6 +33,7 @@
 #include "scumm/resource.h"
 #include "scumm/saveload.h"
 #include "scumm/scumm_v7.h"
+#include "scumm/scumm_v0.h"
 #include "scumm/he/sound_he.h"
 #include "scumm/he/sprite_he.h"
 #include "scumm/usage_bits.h"
@@ -453,7 +454,7 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	if(_vm->_game.version != 0 ) {
 		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
 	} else {
-		((Actor_v0*)this)->unk_FDE1 = 1;
+		((Actor_v0*)this)->_newWalkBoxEntered = 1;
 	}
 	_walkdata.point3.x = 32000;
 
@@ -574,91 +575,7 @@ void Actor::walkActor() {
 	calcMovementFactor(_walkdata.dest);
 }
 
-bool Actor_v2::checkWalkboxesHaveDirectPath(Common::Point &foundPath) {
-	// only MM v0 supports walking in direct line between walkboxes.
-	// MM v1 already does not support it anymore.
-	return false;
-}
-
-bool Actor_v0::intersectLineSegments(const Common::Point &line1Start, const Common::Point &line1End,
-	const Common::Point &line2Start, const Common::Point &line2End, Common::Point &result)
-{
-	const Common::Point v1 = line1End - line1Start; // line1(n1) = line1Start + n1 * v1
-	const Common::Point v2 = line2End - line2Start; // line2(n2) = line2Start + n2 * v2
-
-	double det = v2.x * v1.y - v1.x * v2.y;
-	if (det == 0)
-		return false;
-
-	double n1 = ((double)v2.x * (line2Start.y - line1Start.y) -
-		         (double)v2.y * (line2Start.x - line1Start.x)) / det;
-	double n2 = ((double)v1.x * (line2Start.y - line1Start.y) -
-		         (double)v1.y * (line2Start.x - line1Start.x)) / det;
-
-	// both coefficients have to be in [0, 1], otherwise the intersection is
-	// not inside of at least one of the two line segments
-	if (n1 < 0.0 || n1 > 1.0 || n2 < 0.0 || n2 > 1.0)
-		return false;
-
-	result.x = line1Start.x + (int)(n1 * v1.x);
-	result.y = line1Start.y + (int)(n1 * v1.y);
-	return true;
-}
-
-/*
- * MM v0 allows the actor to walk in a direct line between boxes to the target
- * if actor and target share a horizontal or vertical corridor.
- * If such a corridor is found the actor is not forced to go horizontally or
- * vertically from one box to the next but can also walk diagonally.
- *
- * Note: the original v0 interpreter sets the target destination for diagonal
- * walking only once and then rechecks whenever the actor reaches a new box if the
- * walk destination is still suitable for the current box.
- * ScummVM does not perform such a check, so it is possible to leave the walkboxes
- * in some cases, for example L-shaped rooms like the swimming pool (actor walks over water)
- * or the medical room (actor walks over examination table).
- * To solve this we intersect the new walk destination with the actor's walkbox borders,
- * so a recheck is done when the actor leaves his box. This is done by the
- * intersectLineSegments() routine calls.
- */
-bool Actor_v0::checkWalkboxesHaveDirectPath(Common::Point &foundPath) {
-	BoxCoords boxCoords = _vm->getBoxCoordinates(_walkbox);
-	BoxCoords curBoxCoords = _vm->getBoxCoordinates(_walkdata.curbox);
-
-	// check if next walkbox is left or right to actor's box
-	if (boxCoords.ll.x > curBoxCoords.lr.x || boxCoords.lr.x < curBoxCoords.ll.x) {
-		// determine horizontal corridor gates
-		int gateUpper = MAX(boxCoords.ul.y, curBoxCoords.ul.y);
-		int gateLower = MIN(boxCoords.ll.y, curBoxCoords.ll.y);
-
-		// check if actor and target are in the same horizontal corridor between the boxes
-		if ((_pos.y >= gateUpper && _pos.y <= gateLower) &&
-			(_walkdata.dest.y >= gateUpper && _walkdata.dest.y <= gateLower)) {
-			if (boxCoords.ll.x > curBoxCoords.lr.x) // next box is left
-				return intersectLineSegments(_pos, _walkdata.dest, boxCoords.ll, boxCoords.ul, foundPath);
-			else // next box is right
-				return intersectLineSegments(_pos, _walkdata.dest, boxCoords.lr, boxCoords.ur, foundPath);
-		}
-	// check if next walkbox is above or below actor's box
-	} else if (boxCoords.ul.y > curBoxCoords.ll.y || boxCoords.ll.y < curBoxCoords.ul.y) {
-		// determine vertical corridor gates
-		int gateLeft = MAX(boxCoords.ll.x, curBoxCoords.ll.x);
-		int gateRight = MIN(boxCoords.lr.x, curBoxCoords.lr.x);
-
-		// check if actor and target are in the same vertical corridor between the boxes
-		if ((_pos.x >= gateLeft && _pos.x <= gateRight) &&
-			(_walkdata.dest.x >= gateLeft && _walkdata.dest.x <= gateRight)) {
-			if (boxCoords.ul.y > curBoxCoords.ll.y) // next box is above
-				return intersectLineSegments(_pos, _walkdata.dest, boxCoords.ul, boxCoords.ur, foundPath);
-			else // next box is below
-				return intersectLineSegments(_pos, _walkdata.dest, boxCoords.ll, boxCoords.lr, foundPath);
-		}
-	}
-
-	return false;
-}
-
-bool Actor_v0::sub_2F6F() {
+bool Actor_v0::calcWalkDistances() {
 	_walkDirX = 0;
 	_walkDirY = 0;
 	_walkYCountGreaterThanXCount = 0;
@@ -710,7 +627,7 @@ byte Actor_v0::updateWalkbox() {
 			if (_walkdata.curbox == i ) {
 				setBox(i);
 
-				unk_FDE1 = 1;
+				_newWalkBoxEntered = 1;
 				return i;
 			}
 		}
@@ -723,14 +640,14 @@ void Actor_v0::setTmpFromActor() {
 	_tmp_Pos = _pos;
 	_pos = _tmp_Dest;
 	_tmp_WalkBox = _walkbox;
-	_tmp_CB5F = unk_FDE1;
+	_tmp_NewWalkBoxEntered = _newWalkBoxEntered;
 }
 
 void Actor_v0::setActorFromTmp() {
 	_pos = _tmp_Pos;
 	_tmp_Dest = _tmp_Pos;
 	_walkbox = _tmp_WalkBox;
-	unk_FDE1 = _tmp_CB5F;
+	_newWalkBoxEntered = _tmp_NewWalkBoxEntered;
 }
 
 byte Actor_v0::actorWalkX() {
@@ -748,21 +665,20 @@ byte Actor_v0::actorWalkX() {
 	// 2EAC
 	_walkXCount = A;
 	setTmpFromActor();
-	if( updateWalkbox() == 0xFF ) {
+	if (updateWalkbox() == 0xFF) {
 		// 2EB9
 		setActorFromTmp();
 
 		return 3;
 	} 
 	// 2EBF
-	if( _tmp_Dest.x == _CurrentWalkTo.x )
+	if (_tmp_Dest.x == _CurrentWalkTo.x)
 		return 1;
 
 	return 0;
 }
 
 byte Actor_v0::actorWalkY() {
-
 	byte A = _walkYCount;
 	A += _walkYCountInc;
 	if (A >= _walkCountModulo) {
@@ -782,15 +698,13 @@ byte Actor_v0::actorWalkY() {
 		setActorFromTmp();
 		return 4;
 	} 
-
 	// 2EFE
 	if (_walkYCountInc != 0) {
-		if (_walkYCountInc == 0xFF ) {
+		if (_walkYCountInc == 0xFF) {
 			setActorFromTmp();
 			return 4;
 		}
 	}
-
 	// 2F0D
 	if (_CurrentWalkTo.y == _tmp_Dest.y)
 		return 1;
@@ -798,31 +712,33 @@ byte Actor_v0::actorWalkY() {
 	return 0;
 }
 
-byte Actor_v0::walkboxFindTarget() {
-	return 0xff;
-}
+void Actor_v0::directionUpdate() {
+
+	int nextFacing = updateActorDirection(true);
+	if (_facing != nextFacing) {
+		// 2A89
+		setDirection(nextFacing);
+
+		// Still need to turn?
+		if (_facing != _targetFacing ) {
+			_moving |= 0x80;
+			return;
+		}
+	}
+
+	_moving &= ~0x80;
+}	
 
 void Actor_v0::actorSetWalkTo() {
 	
-	if (unk_FDE1 == 0 )
+	if (_newWalkBoxEntered == 0)
 		return;
 
-	unk_FDE1 = 0;
-	byte nextBox = _vm->getNextBox(_walkbox, _walkdata.destbox);
+	_newWalkBoxEntered = 0;
 
-	if (nextBox != 0xFF && nextBox != _walkbox ) {
-		Common::Point tmp;
+	int nextBox = ((ScummEngine_v0*)_vm)->walkboxFindTarget( this, _walkdata.destbox, _walkdata.dest );
+	if (nextBox != 0xFF) {
 		_walkdata.curbox = nextBox;
-
-		getClosestPtOnBox(_vm->getBoxCoordinates(nextBox), _pos.x, _pos.y, _NewWalkTo.x, _NewWalkTo.y);
-		//getClosestPtOnBox(_vm->getBoxCoordinates(_walkbox), tmp.x, tmp.y, _NewWalkTo.x, _NewWalkTo.y);
-		
-
-	} else {
-		if( _walkdata.dest.x == -1 )
-			_NewWalkTo = _CurrentWalkTo;
-		else
-			_NewWalkTo = _walkdata.dest;
 	}
 }
 
@@ -839,7 +755,7 @@ loc_2A33:;
 		_moving &= 0xF0;
 		_tmp_Dest = _pos;
 
-		byte tmp = sub_2F6F();
+		byte tmp = calcWalkDistances();
 		_moving &= 0xF0;
 		_moving |= tmp;
 
@@ -859,7 +775,7 @@ loc_2A33:;
 
 		directionUpdate();
 		
-		if (_moving & 0x80 ) 
+		if (_moving & 0x80) 
 			return;
 
 		animateActor(newDirToOldDir(_facing));
@@ -876,17 +792,17 @@ loc_2A33:;
 
 
 	// 2A9A
-	if (_moving == 2 )
+	if (_moving == 2)
 		return;
 
-	if ((_moving & 0x0F) == 1 )
+	if ((_moving & 0x0F) == 1)
 		return stopActorMoving();
 
 	// 2AAD
 	if (_moving & 0x80) {
 		directionUpdate();
 
-		if ((_moving & 0x80) )
+		if (_moving & 0x80)
 			return;
 
 		// 2AC2
@@ -899,7 +815,7 @@ loc_2C36:;
 		// 2C36
 		setTmpFromActor();
 
-		if (!_walkDirX ) {
+		if (!_walkDirX) {
 			_pos.x--;
 		} else {
 			_pos.x++;
@@ -944,7 +860,7 @@ loc_2C36:;
 	}
 
 	// 2ADA
-	if ((_moving & 0x0F) == 4 ) {
+	if ((_moving & 0x0F) == 4) {
 		// 2CA3
 loc_2CA3:;
 		setTmpFromActor();
@@ -954,22 +870,22 @@ loc_2CA3:;
 		} else {
 			_pos.y++;
 		}
-		if (updateWalkbox() == 0xFF ) {
+		if (updateWalkbox() == 0xFF) {
 			// 2CC7
 			setActorFromTmp();
-			if( _CurrentWalkTo.x == _tmp_Dest.x ) {
+			if( _CurrentWalkTo.x == _tmp_Dest.x) {
 				stopActorMoving();
 				return;
 			}
 			// 2CD5
-			if (!_walkDirX ) {
+			if (!_walkDirX) {
 				_tmp_Dest.x--;
 			} else {
 				_tmp_Dest.x++;
 			}
 			setTmpFromActor();
 
-			if (updateWalkbox() == 0xFF ) {
+			if (updateWalkbox() == 0xFF) {
 				setActorFromTmp();
 				stopActorMoving();
 			}
@@ -981,19 +897,19 @@ loc_2CA3:;
 		}
 	}
 
-	if ((_moving & 0x0F) == 0 ) {
+	if ((_moving & 0x0F) == 0) {
 	 // 2AE8
 		byte A = actorWalkX();
 
-		if( A == 1 ) {
+		if (A == 1) {
 			A = actorWalkY();
-			if( A  == 1 ) {
+			if (A  == 1) {
 				// 2AF6
 				_moving &= 0xF0;
 				_moving |= A;
 			} else {
 				// 2B04
-				if( A == 4 ) 
+				if (A == 4) 
 					stopActorMoving();
 			}
 
@@ -1018,7 +934,7 @@ loc_2CA3:;
 			} else {
 				// 2B39
 				A = actorWalkY();
-				if (A != 4 )
+				if (A != 4)
 					return;
 
 				// 2B46
@@ -1039,22 +955,6 @@ loc_2CA3:;
 	}
 }
 
-void Actor_v0::directionUpdate() {
-
-	int nextFacing = updateActorDirection(true);
-	if (_facing != nextFacing) {
-		// 2A89
-		setDirection(nextFacing);
-
-		if (_facing != _targetFacing ) {
-			_moving |= 0x80;
-		} else {
-			_moving &= ~0x80;
-		}
-	} else
-		_moving &= ~0x80;
-}	
-
 void Actor_v2::walkActor() {
 	Common::Point foundPath, tmp;
 	int new_dir, next_box;
@@ -1101,10 +1001,8 @@ void Actor_v2::walkActor() {
 
 				_walkdata.curbox = next_box;
 
-				if (!checkWalkboxesHaveDirectPath(foundPath)) {
-					getClosestPtOnBox(_vm->getBoxCoordinates(_walkdata.curbox), _pos.x, _pos.y, tmp.x, tmp.y);
-					getClosestPtOnBox(_vm->getBoxCoordinates(_walkbox), tmp.x, tmp.y, foundPath.x, foundPath.y);
-				}
+				getClosestPtOnBox(_vm->getBoxCoordinates(_walkdata.curbox), _pos.x, _pos.y, tmp.x, tmp.y);
+				getClosestPtOnBox(_vm->getBoxCoordinates(_walkbox), tmp.x, tmp.y, foundPath.x, foundPath.y);
 			}
 			calcMovementFactor(foundPath);
 		}
@@ -1496,7 +1394,7 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 	if (_vm->_game.version == 0) {
 		_walkdata.dest = _pos;
 
-		((Actor_v0*)this)->unk_FDE1 = 1;
+		((Actor_v0*)this)->_newWalkBoxEntered = 1;
 		((Actor_v0*)this)->_CurrentWalkTo = _pos;
 
 		setDirection(oldDirToNewDir(2));
@@ -2075,14 +1973,15 @@ void ScummEngine::processActors() {
 		// comment further up in this method for some details.
 		if (a->_costume) {
 
-			if (_game.version == 0)
+			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor', before drawing the actor... doing it the
+			// other way with V0, causes graphic glitches
+			if (_game.version == 0) {
 				a->animateCostume();
-
-			a->drawActorCostume();
-
-			if (_game.version != 0)
+				a->drawActorCostume();
+			} else {
+				a->drawActorCostume();
 				a->animateCostume();
-				
+			}
 		}
 	}
 }
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index b2245da3d2..c554cad040 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -333,7 +333,6 @@ public:
 protected:
 	virtual bool isPlayer();
 	virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
-	virtual bool checkWalkboxesHaveDirectPath(Common::Point &foundPath);
 };
 
 enum ActorV0MiscFlags {
@@ -349,12 +348,15 @@ enum ActorV0MiscFlags {
 
 class Actor_v0 : public Actor_v2 {
 public:
+	Common::Point _CurrentWalkTo, _NewWalkTo;
+
 	byte _costCommandNew;
 	byte _costCommand;
 	byte _miscflags;
 	byte _speaking;
 
-	Common::Point _CurrentWalkTo, _NewWalkTo;
+	byte _walkCountModulo;
+	byte _newWalkBoxEntered;
 
 	byte _walkDirX;
 	byte _walkDirY;
@@ -364,16 +366,13 @@ public:
 	byte _walkXCountInc;
 	byte _walkYCount;
 	byte _walkYCountInc;
-	byte _walkCountModulo;
 
 	byte _walkMaxXYCountInc;
 
-	byte unk_FDE1;
-
 	Common::Point _tmp_Pos;
 	Common::Point _tmp_Dest;
 	byte _tmp_WalkBox;
-	byte _tmp_CB5F;
+	byte _tmp_NewWalkBoxEntered;
 
 	int8 _animFrameRepeat;
 	int8 _limbFrameRepeatNew[8];
@@ -395,23 +394,18 @@ public:
 	void setDirection(int direction);
 	void startAnimActor(int f);
 
-	bool sub_2F6F();
+	bool calcWalkDistances();
 	void walkActor();
 	void actorSetWalkTo();
 	byte actorWalkX();
 	byte actorWalkY();
 	byte updateWalkbox();
-	byte walkboxFindTarget();
+
 	void setTmpFromActor();
 	void setActorFromTmp();
 
 	// Used by the save/load system:
 	virtual void saveLoadWithSerializer(Serializer *ser);
-
-protected:
-	bool intersectLineSegments(const Common::Point &line1Start, const Common::Point &line1End,
-		const Common::Point &line2Start, const Common::Point &line2End, Common::Point &result);
-	virtual bool checkWalkboxesHaveDirectPath(Common::Point &foundPath);
 };
 
 
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 70c8f2e032..087d8425ac 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -1158,6 +1158,30 @@ bool ScummEngine::areBoxesNeighbors(int box1nr, int box2nr) {
 	return false;
 }
 
+byte ScummEngine_v0::walkboxFindTarget(Actor *a, int destbox, Common::Point walkdest) {
+	Actor_v0 *Actor = (Actor_v0*)a;
+
+	byte nextBox = getNextBox(a->_walkbox, destbox);
+
+	if (nextBox != 0xFF && nextBox == destbox && areBoxesNeighbors(a->_walkbox, nextBox)) {
+
+		Actor->_NewWalkTo = walkdest;
+		return nextBox;
+	}
+
+	if (nextBox != 0xFF && nextBox != a->_walkbox) {
+
+		getClosestPtOnBox(getBoxCoordinates(nextBox), a->getPos().x, a->getPos().y, Actor->_NewWalkTo.x, Actor->_NewWalkTo.y);
+
+	} else {
+		if (walkdest.x == -1)
+			Actor->_NewWalkTo = Actor->_CurrentWalkTo;
+		else
+			Actor->_NewWalkTo = walkdest;
+	}
+	return nextBox;
+}
+
 bool ScummEngine_v0::areBoxesNeighbors(int box1nr, int box2nr) {
 	int i;
 	const int numOfBoxes = getNumBoxes();
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 6cbfbf45b3..90291535fd 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -589,9 +589,9 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 		return;
 	}
 
-	// The original interpreter seems to set the actors new room X/Y to the last rooms X/Y
-	// This fixes a problem with MM: script 158 in room 12, the 'Oompf!' script
-	// This scripts runs before the actor position is set to the correct location
+	// The original interpreter sets the actors new room X/Y to the last rooms X/Y
+	// This fixes a problem with MM: script 158 in room 12, the 'Oomph!' script
+	// This scripts runs before the actor position is set to the correct room entry location
 	a->putActor(a->getPos().x, a->getPos().y, room);
 	_egoPositioned = false;
 
@@ -707,7 +707,6 @@ void ScummEngine_v0::o_animateActor() {
 	}
 
 	a->animateActor(anim);
-	a->animateCostume();
 }
 
 void ScummEngine_v0::o_getActorMoving() {
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 80d047ab9f..83e0e32e15 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -67,6 +67,8 @@ public:
 
 	virtual void resetScumm();
 
+	byte walkboxFindTarget(Actor *a, int destbox, Common::Point walkdest);
+
 protected:
 	virtual void resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr = NULL);
 
@@ -116,7 +118,7 @@ protected:
 
 	void resetSentence();
 
-	virtual bool areBoxesNeighbors(int box1nr, int box2nr);
+	bool areBoxesNeighbors(int box1nr, int box2nr);
 
 	bool ifEqualActiveObject2Common(bool checkType);
 
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index c1bafe1e0f..bf0a693467 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -708,7 +708,6 @@ void ScummEngine_v0::verbExec() {
 	Actor_v0 *a = (Actor_v0 *)derefActor(VAR(VAR_EGO), "verbExec");
 	int x = _virtualMouse.x / V12_X_MULTIPLIER;
 	int y = _virtualMouse.y / V12_Y_MULTIPLIER;
-	//actorSetPosInBox();
 
 	// 0xB31
 	VAR(6) = x;
-- 
cgit v1.2.3


From aa70e73e2526073129ab3dc942037bc57631ef7c Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Wed, 26 Nov 2014 17:52:51 +0100
Subject: I18N: Update/improve Dutch translation

---
 po/nl_NL.po | 100 +++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 58 insertions(+), 42 deletions(-)

diff --git a/po/nl_NL.po b/po/nl_NL.po
index 43ac274ac5..3a9e6d8172 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,21 +1,21 @@
 # LANGUAGE translation for ScummVM.
 # Copyright (C) YEAR ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR scummvm@bencastricum.nl, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.8.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2014-10-04 00:58+0100\n"
-"PO-Revision-Date: 2014-09-03 07:42+0100\n"
+"POT-Creation-Date: 2014-11-25 20:41+0100\n"
+"PO-Revision-Date: 2014-11-25 20:46+0100\n"
 "Last-Translator: Ben Castricum <scummvm@bencastricum.nl>\n"
 "Language-Team: Ben Castricum <scummvm@bencastricum.nl>\n"
 "Language: Nederlands\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.3\n"
+"X-Generator: Poedit 1.6.10\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -34,11 +34,11 @@ msgstr "Beschikbare engines:"
 
 #: gui/browser.cpp:68
 msgid "Show hidden files"
-msgstr "Verborgen bestanden weergeven"
+msgstr "Toon verborgen bestanden"
 
 #: gui/browser.cpp:68
 msgid "Show files marked with the hidden attribute"
-msgstr "Toon de bestanden die met het verborgen kenmerk hebben."
+msgstr "Toon bestanden die het verborgen kenmerk hebben."
 
 #: gui/browser.cpp:72
 msgid "Go up"
@@ -108,7 +108,7 @@ msgstr "Koppel"
 #: backends/platform/wii/options.cpp:47
 #: backends/platform/wince/CELauncherDialog.cpp:54
 #: engines/agos/animation.cpp:558 engines/drascula/saveload.cpp:49
-#: engines/groovie/script.cpp:399 engines/parallaction/saveload.cpp:274
+#: engines/groovie/script.cpp:408 engines/parallaction/saveload.cpp:274
 #: engines/scumm/dialogs.cpp:193 engines/scumm/scumm.cpp:1825
 #: engines/scumm/players/player_v3m.cpp:130
 #: engines/scumm/players/player_v5m.cpp:108 engines/sky/compact.cpp:131
@@ -214,7 +214,7 @@ msgstr "Engine"
 
 #: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090
 msgid "Graphics"
-msgstr "Grafisch"
+msgstr "Beeld"
 
 #: gui/launcher.cpp:245 gui/options.cpp:1073 gui/options.cpp:1090
 msgid "GFX"
@@ -231,7 +231,7 @@ msgstr "Negeer algemene grafische instellingen"
 
 #: gui/launcher.cpp:257 gui/options.cpp:1096
 msgid "Audio"
-msgstr "Audio"
+msgstr "Geluid"
 
 #: gui/launcher.cpp:260
 msgid "Override global audio settings"
@@ -319,7 +319,7 @@ msgstr "Extra Pad:"
 
 #: gui/launcher.cpp:339 gui/options.cpp:1134
 msgid "Save Path:"
-msgstr "Save Pad:"
+msgstr "Bewaar Pad:"
 
 #: gui/launcher.cpp:339 gui/launcher.cpp:341 gui/launcher.cpp:342
 #: gui/options.cpp:1134 gui/options.cpp:1136 gui/options.cpp:1137
@@ -329,7 +329,7 @@ msgstr "Bepaalt waar opgeslagen spellen worden bewaard."
 #: gui/launcher.cpp:341 gui/options.cpp:1136
 msgctxt "lowres"
 msgid "Save Path:"
-msgstr "Save Pad:"
+msgstr "Bewaar Pad:"
 
 #: gui/launcher.cpp:360 gui/launcher.cpp:459 gui/launcher.cpp:517
 #: gui/launcher.cpp:571 gui/options.cpp:1145 gui/options.cpp:1153
@@ -604,8 +604,7 @@ msgstr "Geen"
 
 #: gui/options.cpp:389
 msgid "Failed to apply some of the graphic options changes:"
-msgstr ""
-"Het is niet gelukt om enkele veranderingen in grafische opties toe te passen:"
+msgstr "Sommige grafische opties konden niet worden toegepast:"
 
 #: gui/options.cpp:401
 msgid "the video mode could not be changed."
@@ -781,7 +780,7 @@ msgstr "Geen Roland MT-32 muziek gebruiken"
 
 #: gui/options.cpp:927
 msgid "Text and Speech:"
-msgstr "Spraak en/of ondertitels:"
+msgstr "Spraak en/of tekst:"
 
 #: gui/options.cpp:931 gui/options.cpp:941
 msgid "Speech"
@@ -789,7 +788,7 @@ msgstr "Spraak"
 
 #: gui/options.cpp:932 gui/options.cpp:942
 msgid "Subtitles"
-msgstr "Ondertitels"
+msgstr "Tekst"
 
 #: gui/options.cpp:933
 msgid "Both"
@@ -797,7 +796,7 @@ msgstr "Beide"
 
 #: gui/options.cpp:935
 msgid "Subtitle speed:"
-msgstr "Snelheid ondertitels:"
+msgstr "Snelheid tekst:"
 
 #: gui/options.cpp:937
 msgctxt "lowres"
@@ -819,7 +818,7 @@ msgstr "Beide"
 
 #: gui/options.cpp:943
 msgid "Show subtitles and play speech"
-msgstr "Toon ondertitels en speel spraak af"
+msgstr "Toon tekst en speel spraak af"
 
 #: gui/options.cpp:945
 msgctxt "lowres"
@@ -1277,17 +1276,17 @@ msgstr "O~v~er"
 
 #: engines/dialogs.cpp:105 engines/dialogs.cpp:181
 msgid "~R~eturn to Launcher"
-msgstr "~T~erug naar het startmenu"
+msgstr "Terug naar s~t~artmenu"
 
 #: engines/dialogs.cpp:107 engines/dialogs.cpp:183
 msgctxt "lowres"
 msgid "~R~eturn to Launcher"
-msgstr "~T~erug naar startmenu"
+msgstr "S~t~artmenu"
 
 #: engines/dialogs.cpp:116 engines/agi/saveload.cpp:803
 #: engines/cruise/menu.cpp:212 engines/drascula/saveload.cpp:336
 #: engines/dreamweb/saveload.cpp:261 engines/neverhood/menumodule.cpp:873
-#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:758
+#: engines/pegasus/pegasus.cpp:377 engines/sci/engine/kfile.cpp:759
 #: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598
 msgid "Save game:"
 msgstr "Spel opslaan:"
@@ -1300,7 +1299,7 @@ msgstr "Spel opslaan:"
 #: engines/agi/saveload.cpp:803 engines/cruise/menu.cpp:212
 #: engines/drascula/saveload.cpp:336 engines/dreamweb/saveload.cpp:261
 #: engines/neverhood/menumodule.cpp:873 engines/pegasus/pegasus.cpp:377
-#: engines/sci/engine/kfile.cpp:758 engines/scumm/dialogs.cpp:188
+#: engines/sci/engine/kfile.cpp:759 engines/scumm/dialogs.cpp:188
 #: engines/toltecs/menu.cpp:281 engines/tsage/scenes.cpp:598
 msgid "Save"
 msgstr "Opslaan"
@@ -1540,7 +1539,7 @@ msgstr "~I~ndy vecht besturing"
 
 #: backends/platform/ds/arm9/source/dsoptions.cpp:65
 msgid "Show mouse cursor"
-msgstr "Toon muis wijzer"
+msgstr "Toon muiswijzer"
 
 #: backends/platform/ds/arm9/source/dsoptions.cpp:66
 msgid "Snap to edges"
@@ -1769,7 +1768,7 @@ msgstr "Video"
 
 #: backends/platform/wii/options.cpp:54
 msgid "Current video mode:"
-msgstr "Huidige video modus:"
+msgstr "Huidige videomodus:"
 
 #: backends/platform/wii/options.cpp:56
 msgid "Double-strike"
@@ -2113,13 +2112,13 @@ msgstr ""
 
 #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349
 #: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886
-#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256
+#: engines/sci/engine/kfile.cpp:858 engines/toltecs/menu.cpp:256
 msgid "Restore game:"
 msgstr "Laad opgeslagen spel:"
 
 #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349
 #: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886
-#: engines/sci/engine/kfile.cpp:857 engines/toltecs/menu.cpp:256
+#: engines/sci/engine/kfile.cpp:858 engines/toltecs/menu.cpp:256
 msgid "Restore"
 msgstr "Laad"
 
@@ -2161,14 +2160,13 @@ msgstr ""
 msgid "Cutscene file '%s' not found!"
 msgstr "Cutscene bestand '%s' niet gevonden!"
 
-#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:81
-#, fuzzy
+#: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:91
 msgid "Color Blind Mode"
-msgstr "Klik Modus"
+msgstr "Kleurenblind Modus"
 
-#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:82
+#: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:92
 msgid "Enable Color Blind Mode by default"
-msgstr ""
+msgstr "Schakel Kleurenblind modus standaard in"
 
 #: engines/drascula/saveload.cpp:47
 msgid ""
@@ -2218,17 +2216,17 @@ msgstr "Film snel afspelen"
 msgid "Play movies at an increased speed"
 msgstr "Speel films sneller af"
 
-#: engines/groovie/script.cpp:399
+#: engines/groovie/script.cpp:408
 msgid "Failed to save game"
 msgstr "Opslaan van spel mislukt."
 
 #: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86
 msgid "Gore Mode"
-msgstr ""
+msgstr "Gore Modus"
 
 #: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87
 msgid "Enable Gore Mode when available"
-msgstr ""
+msgstr "Gore modus inschakelen waar mogelijk"
 
 #. I18N: Studio audience adds an applause and cheering sounds whenever
 #. Malcolm makes a joke.
@@ -2359,6 +2357,12 @@ msgid ""
 "Do you wish to use this save game file with ScummVM?\n"
 "\n"
 msgstr ""
+"Het volgende originele opgeslagen spel was gevonden in uw spel pad:\n"
+"\n"
+"%s %s\n"
+"\n"
+"Wilt u dit opgeslagen spel gebruiken in ScummVM?\n"
+"\n"
 
 #: engines/kyra/saveload_eob.cpp:590
 #, c-format
@@ -2366,6 +2370,8 @@ msgid ""
 "A save game file was found in the specified slot %d. Overwrite?\n"
 "\n"
 msgstr ""
+"Er is al een opgeslagen spel in slot %d. Deze overschrijven?\n"
+"\n"
 
 #: engines/kyra/saveload_eob.cpp:623
 #, c-format
@@ -2377,6 +2383,12 @@ msgid ""
 "'import_savefile'.\n"
 "\n"
 msgstr ""
+"%d origneel opgeslagen spellen zijn succesvol geimporteerd in ScummVM.\n"
+"Als u later handmatig origineel opgeslagen spellen wilt importeren dan zult "
+"u de\n"
+"ScummVM debug console moeten openen en het commando 'import_savefile' "
+"gebruiken.\n"
+"\n"
 
 #. I18N: Option for fast scene switching
 #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167
@@ -2433,7 +2445,7 @@ msgstr ""
 
 #: engines/parallaction/saveload.cpp:204
 msgid "Loading game..."
-msgstr "Laden spel..."
+msgstr "Spel laden..."
 
 #: engines/parallaction/saveload.cpp:219
 msgid "Saving game..."
@@ -2510,12 +2522,12 @@ msgstr "Toon/Verberg Pauze-Menu"
 
 #: engines/queen/detection.cpp:56
 msgid "Alternative intro"
-msgstr ""
+msgstr "Alternatieve intro"
 
 #: engines/queen/detection.cpp:57
-#, fuzzy
 msgid "Use an alternative game intro (CD version only)"
-msgstr "Gebruik de floppy versie van de intro (alleen voor de CD versie)"
+msgstr ""
+"Gebruik een alternatieve versie van de intro (alleen voor de CD versie)"
 
 #: engines/sci/detection.cpp:374
 msgid "EGA undithering"
@@ -2598,12 +2610,12 @@ msgstr "Spel is gepauzeerd. Druk op de spatiebalk om verder te gaan."
 #. "Moechten Sie wirklich neu starten?  (J/N)J"
 #. Will react to J as 'Yes'
 #: engines/scumm/dialogs.cpp:183
-msgid "Are you sure you want to restart?  (Y/N)"
+msgid "Are you sure you want to restart?  (Y/N)Y"
 msgstr "Weet u zeker dat u opnieuw wilt beginnen? (J/N)J"
 
 #. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
 #: engines/scumm/dialogs.cpp:185
-msgid "Are you sure you want to quit?  (Y/N)"
+msgid "Are you sure you want to quit?  (Y/N)Y"
 msgstr "Weet u zeker dat u wilt stoppen? (J/N)J"
 
 #: engines/scumm/dialogs.cpp:190
@@ -3224,12 +3236,16 @@ msgid ""
 "Could not find the 'Loom' Macintosh executable to read the\n"
 "instruments from. Music will be disabled."
 msgstr ""
+"De 'Loom' Macintosh executable is niet gevonden om de instrumenten van te "
+"laden. Muziek wordt uitgeschakeld."
 
 #: engines/scumm/players/player_v5m.cpp:107
 msgid ""
 "Could not find the 'Monkey Island' Macintosh executable to read the\n"
 "instruments from. Music will be disabled."
 msgstr ""
+"De 'Monkey Island' Macintosh executable is niet gevonden om de instrumenten "
+"van te laden. Muziek wordt uitgeschakeld."
 
 #: engines/sky/compact.cpp:130
 msgid ""
@@ -3312,7 +3328,7 @@ msgstr "Houd de nieuwe"
 
 #: engines/sword1/logic.cpp:1633
 msgid "This is the end of the Broken Sword 1 Demo"
-msgstr "Dit is het einde van de Broken Sword 1 Demo"
+msgstr "Dit is het einde van de Broken Sword 1 demo."
 
 #: engines/sword2/animation.cpp:425
 msgid ""
@@ -3346,8 +3362,8 @@ msgstr ""
 
 #: engines/wintermute/detection.cpp:58
 msgid "Show FPS-counter"
-msgstr ""
+msgstr "Toon FPS-teller"
 
 #: engines/wintermute/detection.cpp:59
 msgid "Show the current number of frames per second in the upper left corner"
-msgstr ""
+msgstr "Toon de huidige Frames Per Second teller in de linkerbovenhoek"
-- 
cgit v1.2.3


From 235f299db5af6f82bf2b644dea768734c381d09f Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Tue, 25 Nov 2014 21:15:17 +0100
Subject: I18N: Fix missing translation entries

The last translation entry of a .po file was not properly handled.
---
 devtools/create_translations/po_parser.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/devtools/create_translations/po_parser.cpp b/devtools/create_translations/po_parser.cpp
index 7882502ca4..ecc3ba540c 100644
--- a/devtools/create_translations/po_parser.cpp
+++ b/devtools/create_translations/po_parser.cpp
@@ -332,6 +332,13 @@ PoMessageEntryList *parsePoFile(const char *file, PoMessageList& messages) {
 				strcat(currentBuf, stripLine(line));
 		}
 	}
+	if (currentBuf == msgstrBuf) {
+		// add last entry
+		if (*msgstrBuf != '\0' && !fuzzy) {
+			messages.insert(msgidBuf);
+			list->addMessageEntry(msgstrBuf, msgidBuf, msgctxtBuf);
+		}
+	}
 
 	fclose(inFile);
 	return list;
-- 
cgit v1.2.3


From ea420adbadf553545e41f6d45c18948f3576abf7 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sat, 29 Nov 2014 13:44:01 +0000
Subject: I18N: Update translations data file

---
 gui/themes/translations.dat | Bin 468258 -> 470115 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index abd745bb2b..bfa33d4feb 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 30b6a479e5b1510cb5157c72decdb24aa4c24ed1 Mon Sep 17 00:00:00 2001
From: Rodrigo Rebello
Date: Sun, 2 Nov 2014 15:07:09 -0200
Subject: SCUMM: Fix bug #6679 - INDY3 DOS-EGA: book of maps graphic glitch

Force correct width value for room 64 (book of maps) in Indy3. This
works around the wrong value stored in the data files of a specific
version of the game (DOS/EGA v1.0, according to scumm-md5.txt).
---
 engines/scumm/room.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 3828629997..4b59e22408 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -614,6 +614,15 @@ void ScummEngine_v3old::setupRoomSubBlocks() {
 		}
 	} else {
 		_roomWidth = READ_LE_UINT16(&(rmhd->old.width));
+
+		// WORKAROUND: Fix bad width value for room 64 (book of maps) in
+		// Indy3. A specific version of this game (DOS/EGA v1.0, according to
+		// scumm-md5.txt) has a wrong width of 1793 stored in the data files,
+		// which causes a strange situation in which the book view may scroll
+		// towards the right depending on Indy's position from the previous room.
+		// Fixes bug #6679.
+		if (_game.id == GID_INDY3 && _roomResource == 64 && _roomWidth == 1793)
+			_roomWidth = 320;
 		_roomHeight = READ_LE_UINT16(&(rmhd->old.height));
 	}
 	_numObjectsInRoom = roomptr[20];
-- 
cgit v1.2.3


From 0aba59b4602b7a76d91e9e4daef31222df38c3f1 Mon Sep 17 00:00:00 2001
From: uruk
Date: Mon, 1 Dec 2014 14:45:18 +0100
Subject: CGE2: Add support for Sfinx.

---
 AUTHORS                       | 4 ++--
 NEWS                          | 4 +++-
 engines/cge2/configure.engine | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 983f2524e4..9470217230 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -701,8 +701,8 @@ Special thanks to
    of Dreamweb and for their tremendous support.
 
    Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe
-   Avalon for providing full source code for Soltys and letting us
-   redistribute the game.
+   Avalon for providing full source code for Soltys and Sfinx and letting us
+   redistribute the games.
 
    Jan Nedoma for providing the sources to the Wintermute-engine, and for his
    support while porting the engine to ScummVM.
diff --git a/NEWS b/NEWS
index bb23bb37ff..762af70962 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,10 @@ For a more comprehensive changelog of the latest experimental code, see:
         https://github.com/scummvm/scummvm/commits/
 
 1.8.0 (????-??-??)
+ New Games:
+   - Added support for Sfinx.
 
-Broken Sword 1:
+ Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
      version (bug #6720).
    - Fix crash when reloading a game from the Main Menu while in the bull's
diff --git a/engines/cge2/configure.engine b/engines/cge2/configure.engine
index 6ccbfee088..79d091fec5 100644
--- a/engines/cge2/configure.engine
+++ b/engines/cge2/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine cge2 "CGE2" no
+add_engine cge2 "CGE2" yes
-- 
cgit v1.2.3


From b1f7603263c368658a3b9b7e30a929bd77d895af Mon Sep 17 00:00:00 2001
From: uruk
Date: Mon, 1 Dec 2014 15:11:54 +0100
Subject: CGE2: Update credits the right way.

---
 devtools/credits.pl | 2 +-
 gui/credits.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devtools/credits.pl b/devtools/credits.pl
index c8d9e538d8..1c2ece80ed 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -1267,7 +1267,7 @@ begin_credits("Credits");
 
 	add_paragraph(
     "Janusz Wi&#347;niewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon ".
-    "for providing full source code for So&#322;tys and letting us redistribute the game.");
+    "for providing full source code for So&#322;tys and Sfinx and letting us redistribute the games.");
 
 	add_paragraph(
     "Jan Nedoma for providing the sources to the Wintermute-engine, and for his ".
diff --git a/gui/credits.h b/gui/credits.h
index d908a730b7..5b33797a63 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -851,7 +851,7 @@ static const char *credits[] = {
 "C0""",
 "C0""Neil Dodwell and David Dew from Creative Reality for providing the source of Dreamweb and for their tremendous support.",
 "C0""",
-"C0""Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon for providing full source code for Soltys and letting us redistribute the game.",
+"C0""Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon for providing full source code for Soltys and Sfinx and letting us redistribute the games.",
 "C0""",
 "C0""Jan Nedoma for providing the sources to the Wintermute-engine, and for his support while porting the engine to ScummVM.",
 "C0""",
-- 
cgit v1.2.3


From 814d9b1153df417c184be2b1a9072d0c7b37b201 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sun, 30 Nov 2014 22:01:23 +1100
Subject: SCUMM: Maniac V0: Correctly handle 'slanted' walk-boxes, Add new
 variables to save-games, Bump the SaveGame Version number, remove obsolete V0
 code in V2 functions

---
 engines/scumm/actor.cpp  | 504 +++++++++++++++++++++++++++--------------------
 engines/scumm/actor.h    |   7 +-
 engines/scumm/saveload.h |   2 +-
 engines/scumm/script.cpp |   6 +-
 4 files changed, 296 insertions(+), 223 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 636f718582..90ee5bf368 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -51,6 +51,12 @@ static const byte v0ActorTalkArray[0x19] = {
 	0xC0, 0xC0, 0x00, 0x06, 0x06
 };
 
+static const byte v0WalkboxSlantedModifier[0x16] = { 
+	0x00,0x01,0x02,0x03,0x03,0x04,0x05,0x06,
+	0x06,0x07,0x08,0x09,0x09,0x0A,0x0B,
+	0x0C,0x0C,0x0D,0x0E,0x0F,0x10,0x10
+};
+
 Actor::Actor(ScummEngine *scumm, int id) :
 	_vm(scumm), _number(id) {
 	assert(_vm != 0);
@@ -183,6 +189,20 @@ void Actor_v0::initActor(int mode) {
 	_costCommand = 0xFF;
 	_miscflags = 0;
 	_speaking = 0;
+	
+	_walkCountModulo = 0;
+	_newWalkBoxEntered = false;
+	_walkDirX = 0;
+	_walkDirY = 0;
+	_walkYCountGreaterThanXCount = 0;
+	_walkXCount = 0;
+	_walkXCountInc = 0;
+	_walkYCount = 0;
+	_walkYCountInc = 0;
+	_walkMaxXYCountInc = 0;
+
+	_tmp_WalkBox = 0;
+	_tmp_NewWalkBoxEntered = 0;
 
 	_animFrameRepeat = 0;
 	for (int i = 0; i < 8; ++i) {
@@ -250,11 +270,11 @@ void Actor::stopActorMoving() {
 	if (_walkScript)
 		_vm->stopScript(_walkScript);
 
-	_moving = 0;
-
 	if (_vm->_game.version == 0) {
 		_moving = 2;
 		setDirection(_facing);
+	} else {
+		_moving = 0;
 	}
 }
 
@@ -343,9 +363,6 @@ int Actor::actorWalkStep() {
 	int distX, distY;
 	int nextFacing;
 
-	if (_vm->_game.version == 0)
-		((Actor_v0 *)this)->_animFrameRepeat = -1;
-
 	_needRedraw = true;
 
 	nextFacing = updateActorDirection(true);
@@ -354,10 +371,6 @@ int Actor::actorWalkStep() {
 			startWalkAnim(1, nextFacing);
 		}
 		_moving |= MF_IN_LEG;
-
-		// V0: Don't move during the turn
-		if (_vm->_game.version == 0)
-			return 0;
 	}
 
 	if (_walkbox != _walkdata.curbox && _vm->checkXYInBoxBounds(_walkdata.curbox, _pos.x, _pos.y)) {
@@ -393,12 +406,113 @@ int Actor::actorWalkStep() {
 		return 0;
 	}
 
-	if (_vm->_game.version == 0)
-		((Actor_v0 *)this)->animateActor(newDirToOldDir(_facing));
-
 	return 1;
 }
 
+bool Actor_v0::calcWalkDistances() {
+	_walkDirX = 0;
+	_walkDirY = 0;
+	_walkYCountGreaterThanXCount = 0;
+	uint16 A = 0;
+
+	if (_CurrentWalkTo.x >= _tmp_Dest.x ) {
+		A = _CurrentWalkTo.x - _tmp_Dest.x;
+		_walkDirX = 1;
+	} else {
+		A = _tmp_Dest.x - _CurrentWalkTo.x;
+	}
+
+	_walkXCountInc = A;
+
+	if (_CurrentWalkTo.y >= _tmp_Dest.y ) {
+		A = _CurrentWalkTo.y - _tmp_Dest.y;
+		_walkDirY = 1;
+	} else {
+		A = _tmp_Dest.y - _CurrentWalkTo.y;
+	}
+
+	_walkYCountInc = A;
+	if ( !_walkXCountInc && !_walkYCountInc )
+		return true;
+
+	if( _walkXCountInc <= _walkYCountInc ) 
+		_walkYCountGreaterThanXCount = 1;
+
+	// 2FCC
+	A = _walkXCountInc;
+	if( A <= _walkYCountInc )
+		A = _walkYCountInc;
+
+	_walkMaxXYCountInc = A;
+	_walkXCount = _walkXCountInc;
+	_walkYCount = _walkYCountInc;
+	_walkCountModulo = _walkMaxXYCountInc;
+
+	return false;
+}
+
+byte Actor_v0::actorWalkX() {
+	byte A = _walkXCount;
+	A += _walkXCountInc;
+	if (A >= _walkCountModulo) {
+		if (!_walkDirX ) {
+			_tmp_Dest.x--;
+		} else {
+			_tmp_Dest.x++;
+		}
+
+		A -= _walkCountModulo;
+	}
+	// 2EAC
+	_walkXCount = A;
+	setTmpFromActor();
+	if (updateWalkbox() == kInvalidBox) {
+		// 2EB9
+		setActorFromTmp();
+
+		return 3;
+	} 
+	// 2EBF
+	if (_tmp_Dest.x == _CurrentWalkTo.x)
+		return 1;
+
+	return 0;
+}
+
+byte Actor_v0::actorWalkY() {
+	byte A = _walkYCount;
+	A += _walkYCountInc;
+	if (A >= _walkCountModulo) {
+		if (!_walkDirY ) {
+			_tmp_Dest.y--;
+		} else {
+			_tmp_Dest.y++;
+		}
+
+		A -= _walkCountModulo;
+	}
+	// 2EEB
+	_walkYCount = A;
+	setTmpFromActor();
+	if (updateWalkbox() == kInvalidBox) {
+		// 2EF8
+		setActorFromTmp();
+		return 4;
+	} 
+	// 2EFE
+	if (_walkYCountInc != 0) {
+		if (_walkYCountInc == 0xFF) {
+			setActorFromTmp();
+			return 4;
+		}
+	}
+	// 2F0D
+	if (_CurrentWalkTo.y == _tmp_Dest.y)
+		return 1;
+	
+	return 0;
+}
+
 void Actor::startWalkActor(int destX, int destY, int dir) {
 	AdjustBoxResult abr;
 
@@ -451,14 +565,14 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	_walkdata.dest.y = abr.y;
 	_walkdata.destbox = abr.box;
 	_walkdata.destdir = dir;
-	if(_vm->_game.version != 0 ) {
-		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
-	} else {
-		((Actor_v0*)this)->_newWalkBoxEntered = 1;
-	}
 	_walkdata.point3.x = 32000;
-
 	_walkdata.curbox = _walkbox;
+
+	if(_vm->_game.version == 0 ) {
+		((Actor_v0*)this)->_newWalkBoxEntered = true;
+	} else {
+		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
+	}
 }
 
 void Actor::startWalkAnim(int cmd, int angle) {
@@ -575,183 +689,14 @@ void Actor::walkActor() {
 	calcMovementFactor(_walkdata.dest);
 }
 
-bool Actor_v0::calcWalkDistances() {
-	_walkDirX = 0;
-	_walkDirY = 0;
-	_walkYCountGreaterThanXCount = 0;
-	uint16 A = 0;
-
-	if (_CurrentWalkTo.x >= _tmp_Dest.x ) {
-		A = _CurrentWalkTo.x - _tmp_Dest.x;
-		_walkDirX = 1;
-	} else {
-		A = _tmp_Dest.x - _CurrentWalkTo.x;
-	}
-
-	_walkXCountInc = A;
-
-	if (_CurrentWalkTo.y >= _tmp_Dest.y ) {
-		A = _CurrentWalkTo.y - _tmp_Dest.y;
-		_walkDirY = 1;
-	} else {
-		A = _tmp_Dest.y - _CurrentWalkTo.y;
-	}
-
-	_walkYCountInc = A;
-	if ( !_walkXCountInc && !_walkYCountInc )
-		return true;
-
-	if( _walkXCountInc <= _walkYCountInc ) 
-		_walkYCountGreaterThanXCount = 1;
-
-	// 2FCC
-	A = _walkXCountInc;
-	if( A <= _walkYCountInc )
-		A = _walkYCountInc;
-
-	_walkMaxXYCountInc = A;
-	_walkXCount = _walkXCountInc;
-	_walkYCount = _walkYCountInc;
-	_walkCountModulo = _walkMaxXYCountInc;
-
-	return false;
-}
-
-byte Actor_v0::updateWalkbox() {
-	if( _vm->checkXYInBoxBounds( _walkbox, _pos.x, _pos.y ) )
-		return 0;
-
-	int numBoxes = _vm->getNumBoxes() - 1;
-	for (int i = 0; i <= numBoxes; i++) {
-		if (_vm->checkXYInBoxBounds( i, _pos.x, _pos.y ) == true ) {
-			if (_walkdata.curbox == i ) {
-				setBox(i);
-
-				_newWalkBoxEntered = 1;
-				return i;
-			}
-		}
-	}
-
-	return 0xFF;
-}
-
-void Actor_v0::setTmpFromActor() {
-	_tmp_Pos = _pos;
-	_pos = _tmp_Dest;
-	_tmp_WalkBox = _walkbox;
-	_tmp_NewWalkBoxEntered = _newWalkBoxEntered;
-}
-
-void Actor_v0::setActorFromTmp() {
-	_pos = _tmp_Pos;
-	_tmp_Dest = _tmp_Pos;
-	_walkbox = _tmp_WalkBox;
-	_newWalkBoxEntered = _tmp_NewWalkBoxEntered;
-}
-
-byte Actor_v0::actorWalkX() {
-	byte A = _walkXCount;
-	A += _walkXCountInc;
-	if (A >= _walkCountModulo) {
-		if (!_walkDirX ) {
-			_tmp_Dest.x--;
-		} else {
-			_tmp_Dest.x++;
-		}
-
-		A -= _walkCountModulo;
-	}
-	// 2EAC
-	_walkXCount = A;
-	setTmpFromActor();
-	if (updateWalkbox() == 0xFF) {
-		// 2EB9
-		setActorFromTmp();
-
-		return 3;
-	} 
-	// 2EBF
-	if (_tmp_Dest.x == _CurrentWalkTo.x)
-		return 1;
-
-	return 0;
-}
-
-byte Actor_v0::actorWalkY() {
-	byte A = _walkYCount;
-	A += _walkYCountInc;
-	if (A >= _walkCountModulo) {
-		if (!_walkDirY ) {
-			_tmp_Dest.y--;
-		} else {
-			_tmp_Dest.y++;
-		}
-
-		A -= _walkCountModulo;
-	}
-	// 2EEB
-	_walkYCount = A;
-	setTmpFromActor();
-	if (updateWalkbox() == 0xFF) {
-		// 2EF8
-		setActorFromTmp();
-		return 4;
-	} 
-	// 2EFE
-	if (_walkYCountInc != 0) {
-		if (_walkYCountInc == 0xFF) {
-			setActorFromTmp();
-			return 4;
-		}
-	}
-	// 2F0D
-	if (_CurrentWalkTo.y == _tmp_Dest.y)
-		return 1;
-
-	return 0;
-}
-
-void Actor_v0::directionUpdate() {
-
-	int nextFacing = updateActorDirection(true);
-	if (_facing != nextFacing) {
-		// 2A89
-		setDirection(nextFacing);
-
-		// Still need to turn?
-		if (_facing != _targetFacing ) {
-			_moving |= 0x80;
-			return;
-		}
-	}
-
-	_moving &= ~0x80;
-}	
-
-void Actor_v0::actorSetWalkTo() {
-	
-	if (_newWalkBoxEntered == 0)
-		return;
-
-	_newWalkBoxEntered = 0;
-
-	int nextBox = ((ScummEngine_v0*)_vm)->walkboxFindTarget( this, _walkdata.destbox, _walkdata.dest );
-	if (nextBox != 0xFF) {
-		_walkdata.curbox = nextBox;
-	}
-}
-
 void Actor_v0::walkActor() {
 	actorSetWalkTo();
 
 	_needRedraw = true;
 	if (_NewWalkTo != _CurrentWalkTo) {
-		
-		// 2A27
 		_CurrentWalkTo = _NewWalkTo;
 
-loc_2A33:;
+L2A33:;
 		_moving &= 0xF0;
 		_tmp_Dest = _pos;
 
@@ -784,13 +729,11 @@ loc_2A33:;
 		// 2A0A
 		if ((_moving & 0x7F) != 1) {
 			
-			if (_NewWalkTo == _pos) {
+			if (_NewWalkTo == _pos)
 				return;
-			}
 		}
 	}
 
-
 	// 2A9A
 	if (_moving == 2)
 		return;
@@ -805,14 +748,11 @@ loc_2A33:;
 		if (_moving & 0x80)
 			return;
 
-		// 2AC2
 		animateActor(newDirToOldDir(_facing));
 	}
 
-	// 2ACE
 	if ((_moving & 0x0F) == 3 ) {
-loc_2C36:;
-		// 2C36
+L2C36:;
 		setTmpFromActor();
 
 		if (!_walkDirX) {
@@ -822,13 +762,12 @@ loc_2C36:;
 		}
 
 		// 2C51
-		if (updateWalkbox() != 0xFF) {
-			//2C66
+		if (updateWalkbox() != kInvalidBox) {
+
 			setActorFromTmp();
-			goto loc_2A33;
+			goto L2A33;
 		}
 
-		// 2C6C
 		setActorFromTmp();
 
 		if (_CurrentWalkTo.y == _tmp_Dest.y) {
@@ -841,8 +780,9 @@ loc_2C36:;
 		} else {
 			_tmp_Dest.y++;
 		}
+
 		setTmpFromActor();
-		//2C8B
+
 		byte A = updateWalkbox();
 		if (A == 0xFF) {
 			setActorFromTmp();
@@ -861,8 +801,7 @@ loc_2C36:;
 
 	// 2ADA
 	if ((_moving & 0x0F) == 4) {
-		// 2CA3
-loc_2CA3:;
+L2CA3:;
 		setTmpFromActor();
 
 		if (!_walkDirY) {
@@ -870,14 +809,14 @@ loc_2CA3:;
 		} else {
 			_pos.y++;
 		}
-		if (updateWalkbox() == 0xFF) {
+		if (updateWalkbox() == kInvalidBox) {
 			// 2CC7
 			setActorFromTmp();
 			if( _CurrentWalkTo.x == _tmp_Dest.x) {
 				stopActorMoving();
 				return;
 			}
-			// 2CD5
+
 			if (!_walkDirX) {
 				_tmp_Dest.x--;
 			} else {
@@ -885,7 +824,7 @@ loc_2CA3:;
 			}
 			setTmpFromActor();
 
-			if (updateWalkbox() == 0xFF) {
+			if (updateWalkbox() == kInvalidBox) {
 				setActorFromTmp();
 				stopActorMoving();
 			}
@@ -893,22 +832,20 @@ loc_2CA3:;
 			return;
 		} else {
 			setActorFromTmp();
-			goto loc_2A33;
+			goto L2A33;
 		}
 	}
 
 	if ((_moving & 0x0F) == 0) {
-	 // 2AE8
+		// 2AE8
 		byte A = actorWalkX();
 
 		if (A == 1) {
 			A = actorWalkY();
-			if (A  == 1) {
-				// 2AF6
+			if (A == 1) {
 				_moving &= 0xF0;
 				_moving |= A;
 			} else {
-				// 2B04
 				if (A == 4) 
 					stopActorMoving();
 			}
@@ -929,7 +866,7 @@ loc_2CA3:;
 
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
-				goto loc_2C36;
+				goto L2C36;
 
 			} else {
 				// 2B39
@@ -937,7 +874,6 @@ loc_2CA3:;
 				if (A != 4)
 					return;
 
-				// 2B46
 				_moving &= 0xF0;
 				_moving |= A;
 
@@ -949,7 +885,7 @@ loc_2CA3:;
 				
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
-				goto loc_2CA3;
+				goto L2CA3;
 			}
 		}
 	}
@@ -1394,7 +1330,7 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 	if (_vm->_game.version == 0) {
 		_walkdata.dest = _pos;
 
-		((Actor_v0*)this)->_newWalkBoxEntered = 1;
+		((Actor_v0*)this)->_newWalkBoxEntered = true;
 		((Actor_v0*)this)->_CurrentWalkTo = _pos;
 
 		setDirection(oldDirToNewDir(2));
@@ -1512,6 +1448,59 @@ static int checkXYInBoxBounds(int boxnum, int x, int y, int &destX, int &destY)
 	return dist;
 }
 
+AdjustBoxResult Actor_v0::adjustPosInBorderWalkbox(AdjustBoxResult box) {
+	AdjustBoxResult Result = box;
+	BoxCoords BoxCoord = _vm->getBoxCoordinates(box.box);
+
+	byte boxMask = _vm->getMaskFromBox(box.box);
+	if (!(boxMask & 0x80))
+		return Result;
+
+	char A;
+	boxMask &= 0x7C;
+	if (boxMask == 0x0C) 
+		A = 2;
+	else {
+		if (boxMask != 0x08)
+			return Result;
+
+		A = 1;
+	}
+
+	// 1BC6
+	byte Modifier = box.y - BoxCoord.ul.y;
+	assert(Modifier < 0x16);
+
+	if (A == 1) {
+		// 1BCF
+		A = BoxCoord.ur.x - v0WalkboxSlantedModifier[ Modifier ];
+		if (A < box.x)
+			return box;
+
+		if (A < 0xA0 || A == 0xA0)
+			A = 0;
+
+		Result.x = A;
+	} else {
+		// 1BED
+		A = BoxCoord.ul.x + v0WalkboxSlantedModifier[ Modifier ];
+
+		if (A < box.x || A == box.x)
+			Result.x = A;
+	}
+
+	return Result;
+}
+
+AdjustBoxResult Actor_v0::adjustXYToBeInBox(int dstX, int dstY) {
+	AdjustBoxResult Result = Actor_v2::adjustXYToBeInBox(dstX, dstY);
+
+	if( Result.box == kInvalidBox )
+		return Result;
+
+	return adjustPosInBorderWalkbox(Result);
+}
+
 AdjustBoxResult Actor_v2::adjustXYToBeInBox(const int dstX, const int dstY) {
 	AdjustBoxResult abr;
 
@@ -1722,7 +1711,7 @@ void Actor::showActor() {
 		Actor_v0 *a = ((Actor_v0 *)this);
 
 		a->_costCommand = a->_costCommandNew = 0xFF;
-		
+		_walkdata.dest = a->_CurrentWalkTo;
 
 		for (int i = 0; i < 8; ++i) {
 			a->_limbFrameRepeat[i] = 0;
@@ -1955,7 +1944,7 @@ void ScummEngine::processActors() {
 				continue;
 
 			// Sound
-			if (a0->_moving  && _currentRoom != 1 && _currentRoom != 44) {
+			if (a0->_moving != 2 && _currentRoom != 1 && _currentRoom != 44) {
 				if (a0->_cost.soundPos == 0)
 					a0->_cost.soundCounter++;
 
@@ -1973,8 +1962,9 @@ void ScummEngine::processActors() {
 		// comment further up in this method for some details.
 		if (a->_costume) {
 
-			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor', before drawing the actor... doing it the
-			// other way with V0, causes graphic glitches
+			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor' (which is before drawing the actor)... 
+			// doing it the other way with V0, causes animation glitches (when beginnning to walk, as the costume hasnt been updated).
+			// Updating the costume directly after 'walkActor' and again, after drawing... causes frame skipping
 			if (_game.version == 0) {
 				a->animateCostume();
 				a->drawActorCostume();
@@ -3218,6 +3208,70 @@ void Actor_v0::animateActor(int anim) {
 	}
 }
 
+byte Actor_v0::updateWalkbox() {
+	if( _vm->checkXYInBoxBounds( _walkbox, _pos.x, _pos.y ) )
+		return 0;
+
+	int numBoxes = _vm->getNumBoxes() - 1;
+	for (int i = 0; i <= numBoxes; i++) {
+		if (_vm->checkXYInBoxBounds( i, _pos.x, _pos.y ) == true ) {
+			if (_walkdata.curbox == i) {
+				setBox(i);
+				directionUpdate();
+
+				_newWalkBoxEntered = true;
+				return i;
+			}
+		}
+	}
+
+	return kInvalidBox;
+}
+
+void Actor_v0::directionUpdate() {
+
+	int nextFacing = updateActorDirection(true);
+	if (_facing != nextFacing) {
+		// 2A89
+		setDirection(nextFacing);
+
+		// Still need to turn?
+		if (_facing != _targetFacing) {
+			_moving |= 0x80;
+			return;
+		}
+	}
+
+	_moving &= ~0x80;
+}
+
+void Actor_v0::setTmpFromActor() {
+	_tmp_Pos = _pos;
+	_pos = _tmp_Dest;
+	_tmp_WalkBox = _walkbox;
+	_tmp_NewWalkBoxEntered = _newWalkBoxEntered;
+}
+
+void Actor_v0::setActorFromTmp() {
+	_pos = _tmp_Pos;
+	_tmp_Dest = _tmp_Pos;
+	_walkbox = _tmp_WalkBox;
+	_newWalkBoxEntered = _tmp_NewWalkBoxEntered;
+}
+
+void Actor_v0::actorSetWalkTo() {
+	
+	if (_newWalkBoxEntered == false)
+		return;
+
+	_newWalkBoxEntered = false;
+
+	int nextBox = ((ScummEngine_v0*)_vm)->walkboxFindTarget(this, _walkdata.destbox, _walkdata.dest);
+	if (nextBox != kInvalidBox) {
+		_walkdata.curbox = nextBox;
+	}
+}
+
 void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 	Actor::saveLoadWithSerializer(ser);
 
@@ -3231,6 +3285,20 @@ void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 		MKLINE(Actor_v0, _animFrameRepeat, sleByte, VER(89)),
 		MKARRAY(Actor_v0, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
 		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
+		MKLINE(Actor_v0, _CurrentWalkTo.x, sleInt16, VER(97)),
+		MKLINE(Actor_v0, _CurrentWalkTo.y, sleInt16, VER(97)),
+		MKLINE(Actor_v0, _NewWalkTo.x, sleInt16, VER(97)),
+		MKLINE(Actor_v0, _NewWalkTo.y, sleInt16, VER(97)),
+		MKLINE(Actor_v0, _walkCountModulo, sleInt8, VER(97)),
+		MKLINE(Actor_v0, _newWalkBoxEntered, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkDirX, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkDirY, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkYCountGreaterThanXCount, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkXCount, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkXCountInc, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkYCount, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkYCountInc, sleByte, VER(97)),
+		MKLINE(Actor_v0, _walkMaxXYCountInc, sleByte, VER(97)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index c554cad040..c1a3f23318 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -356,7 +356,7 @@ public:
 	byte _speaking;
 
 	byte _walkCountModulo;
-	byte _newWalkBoxEntered;
+	bool _newWalkBoxEntered;
 
 	byte _walkDirX;
 	byte _walkDirY;
@@ -372,7 +372,7 @@ public:
 	Common::Point _tmp_Pos;
 	Common::Point _tmp_Dest;
 	byte _tmp_WalkBox;
-	byte _tmp_NewWalkBoxEntered;
+	bool _tmp_NewWalkBoxEntered;
 
 	int8 _animFrameRepeat;
 	int8 _limbFrameRepeatNew[8];
@@ -401,6 +401,9 @@ public:
 	byte actorWalkY();
 	byte updateWalkbox();
 
+	AdjustBoxResult adjustXYToBeInBox(int dstX, int dstY);
+	AdjustBoxResult adjustPosInBorderWalkbox(AdjustBoxResult box);
+
 	void setTmpFromActor();
 	void setActorFromTmp();
 
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 01ed21ece5..753287e217 100644
--- a/engines/scumm/saveload.h
+++ b/engines/scumm/saveload.h
@@ -47,7 +47,7 @@ namespace Scumm {
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 96
+#define CURRENT_VER 97
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index efd5e7bd2c..c9b37d43b1 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1164,8 +1164,10 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	VAR(7) = y;
 
 	// actor must not move if frozen
-	if (a->_miscflags & kActorMiscFlagFreeze)
+	if (a->_miscflags & kActorMiscFlagFreeze) {
 		a->stopActorMoving();
+		a->_newWalkBoxEntered = false;
+	}
 }
 
 bool ScummEngine_v0::checkPendingWalkAction() {
@@ -1179,7 +1181,7 @@ bool ScummEngine_v0::checkPendingWalkAction() {
 	Actor_v0 *a = (Actor_v0 *)derefActor(actor, "checkPendingWalkAction");
 
 	// wait until walking or turning action is finished
-	if (a->_moving!=2)
+	if (a->_moving != 2)
 		return true;
 
 	// after walking and turning finally execute the script
-- 
cgit v1.2.3


From 4b1b9ec66f5889fd20d88f8f7f565e8448ac8389 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Tue, 2 Dec 2014 16:40:46 +1100
Subject: SCUMM: Maniac V0: Remove workaround for bug #2971126 (this issue no
 longer occurs as walking is handled the same as the original)

---
 engines/scumm/script_v5.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 91afa859a9..4a53ca3fed 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2497,10 +2497,6 @@ void ScummEngine_v5::walkActorToActor(int actor, int toActor, int dist) {
 		y = abr.y;
 	}
 	a->startWalkActor(x, y, -1);
-
-	// WORKAROUND: See bug #2971126 for details on why this is here.
-	if (_game.version == 0)
-		o5_breakHere();
 }
 
 void ScummEngine_v5::o5_walkActorToActor() {
-- 
cgit v1.2.3


From 11d41ace02ce84ab40de2ae315a106950579e2bd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 00:52:11 +0200
Subject: ZVISION: Use the ScummVM defined type int32, instead of int32_t

---
 engines/zvision/text/text.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 872d6875b7..3cfc5b2f89 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -457,7 +457,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 			j++;
 		}
 		dx = 0;
-		for (int32_t jj = 0; jj < j; jj++) {
+		for (int32 jj = 0; jj < j; jj++) {
 			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
 				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
 
@@ -474,7 +474,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 	}
 
 	for (i = 0; i < TXT_CFG_TEXTURES_LINES; i++)
-		for (int32_t j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
+		for (int32 j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
 			if (TxtSurfaces[i][j] != NULL) {
 				TxtSurfaces[i][j]->free();
 				delete TxtSurfaces[i][j];
-- 
cgit v1.2.3


From 61f654e4eee90d761c06583a67dc9631db9d0d29 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 00:53:36 +0200
Subject: ZVISION: Explicitly define which version of atan2() to use

This is needed by MSVC
---
 engines/zvision/graphics/render_table.cpp           | 2 +-
 engines/zvision/scripting/controls/safe_control.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 629cbde3cf..5500b50ba8 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -200,7 +200,7 @@ void RenderTable::generateTiltLookupTable() {
 
 	float fovInRadians = (_tiltOptions.fieldOfView * M_PI / 180.0f);
 	float cylinderRadius = halfWidth / tan(fovInRadians);
-	_tiltOptions.gap = cylinderRadius * atan2(halfHeight / cylinderRadius, 1.0) * _tiltOptions.linearScale;
+	_tiltOptions.gap = cylinderRadius * atan2((float)(halfHeight / cylinderRadius), 1.0f) * _tiltOptions.linearScale;
 
 	for (uint y = 0; y < _numRows; ++y) {
 
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index de1ece5b19..66ab53085f 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -181,7 +181,7 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 
 			Common::Point tmp = backgroundImageSpacePos - _center;
 
-			float dd = atan2(tmp.x, tmp.y) * 57.29578;
+			float dd = atan2((float)tmp.x, (float)tmp.y) * 57.29578;
 
 			int16 dp_state = 360 / _statesCount;
 
-- 
cgit v1.2.3


From daeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 00:54:19 +0200
Subject: ZVISION: Silence some false positive warnings by MSVC

---
 engines/zvision/scripting/sidefx/music_node.cpp     | 2 +-
 engines/zvision/scripting/sidefx/syncsound_node.cpp | 2 +-
 engines/zvision/sound/zork_raw.cpp                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index e9baadb011..b1e16e71ef 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -49,7 +49,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	_pantrackPosition = 0;
 	_sub = NULL;
 
-	Audio::RewindableAudioStream *audioStream;
+	Audio::RewindableAudioStream *audioStream = NULL;
 
 	if (filename.contains(".wav")) {
 		Common::File *file = new Common::File();
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
index 2bfdc349d1..39542675eb 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.cpp
+++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp
@@ -41,7 +41,7 @@ SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filena
 	_syncto = syncto;
 	_sub = NULL;
 
-	Audio::RewindableAudioStream *audioStream;
+	Audio::RewindableAudioStream *audioStream = NULL;
 
 	if (filename.contains(".wav")) {
 		Common::File *file = new Common::File();
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index a0f660f65f..1581210c86 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -259,7 +259,7 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 	Common::String fileName = getFileName(filePath);
 	fileName.toLowercase();
 
-	SoundParams soundParams;
+	SoundParams soundParams = {};
 
 	if (engine->getGameId() == GID_NEMESIS) {
 		for (int i = 0; i < 32; ++i) {
-- 
cgit v1.2.3


From 7976a34bbfbece2686712d80b1efa3612cb2b441 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 00:55:14 +0200
Subject: ZVISION: Rename struct member to fix compilation with MSVC

A struct member can't have the same name as the struct itself
---
 engines/zvision/subtitles/subtitles.cpp | 6 +++---
 engines/zvision/subtitles/subtitles.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp
index 1f68b2435f..d36eb24923 100644
--- a/engines/zvision/subtitles/subtitles.cpp
+++ b/engines/zvision/subtitles/subtitles.cpp
@@ -55,7 +55,7 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
 						sub curSubtitle;
 						curSubtitle.start = -1;
 						curSubtitle.stop = -1;
-						curSubtitle.sub = txtline;
+						curSubtitle.subStr = txtline;
 
 						_subs.push_back(curSubtitle);
 					}
@@ -98,9 +98,9 @@ void Subtitle::process(int32 time) {
 	}
 
 	if (j != -1 && j != _subId) {
-		if (_subs[j].sub.size())
+		if (_subs[j].subStr.size())
 			if (_areaId != -1)
-				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].sub);
+				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
 		_subId = j;
 	}
 }
diff --git a/engines/zvision/subtitles/subtitles.h b/engines/zvision/subtitles/subtitles.h
index 09e079bba4..c3da6583a4 100644
--- a/engines/zvision/subtitles/subtitles.h
+++ b/engines/zvision/subtitles/subtitles.h
@@ -43,7 +43,7 @@ private:
 	struct sub {
 		int start;
 		int stop;
-		Common::String sub;
+		Common::String subStr;
 	};
 
 	Common::Array<sub> _subs;
-- 
cgit v1.2.3


From 2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 01:12:35 +0200
Subject: ZVISION: Remove superfluous spacing and reorder some includes

---
 engines/zvision/animation/meta_animation.cpp              |  1 -
 engines/zvision/animation/meta_animation.h                |  1 -
 engines/zvision/animation/rlf_animation.cpp               |  1 -
 engines/zvision/animation/rlf_animation.h                 |  1 -
 engines/zvision/archives/zfs_archive.cpp                  |  2 --
 engines/zvision/archives/zfs_archive.h                    |  1 -
 engines/zvision/core/console.cpp                          |  1 -
 engines/zvision/core/events.cpp                           |  1 -
 engines/zvision/core/menu.cpp                             |  4 ----
 engines/zvision/core/menu.h                               |  2 --
 engines/zvision/core/save_manager.cpp                     |  1 -
 engines/zvision/core/search_manager.cpp                   |  2 --
 engines/zvision/cursors/cursor.cpp                        |  1 -
 engines/zvision/cursors/cursor.h                          |  1 -
 engines/zvision/cursors/cursor_manager.cpp                |  2 --
 engines/zvision/cursors/cursor_manager.h                  |  1 -
 engines/zvision/detection.cpp                             |  3 ---
 engines/zvision/detection.h                               |  1 -
 engines/zvision/fonts/truetype_font.cpp                   |  1 -
 engines/zvision/fonts/truetype_font.h                     |  1 -
 engines/zvision/graphics/effects/fog.cpp                  |  1 -
 engines/zvision/graphics/effects/light.cpp                |  1 -
 engines/zvision/graphics/effects/wave.cpp                 |  1 -
 engines/zvision/graphics/render_manager.cpp               |  4 ----
 engines/zvision/graphics/render_manager.h                 |  3 ---
 engines/zvision/graphics/render_table.cpp                 |  4 ----
 engines/zvision/graphics/render_table.h                   |  1 -
 engines/zvision/scripting/actions.cpp                     | 15 ---------------
 engines/zvision/scripting/actions.h                       |  1 -
 engines/zvision/scripting/control.cpp                     |  1 -
 engines/zvision/scripting/control.h                       |  1 -
 engines/zvision/scripting/controls/fist_control.cpp       |  1 -
 engines/zvision/scripting/controls/fist_control.h         |  1 -
 engines/zvision/scripting/controls/hotmov_control.cpp     |  1 -
 engines/zvision/scripting/controls/hotmov_control.h       |  1 -
 engines/zvision/scripting/controls/input_control.cpp      |  1 -
 engines/zvision/scripting/controls/input_control.h        |  1 -
 engines/zvision/scripting/controls/lever_control.cpp      |  1 -
 engines/zvision/scripting/controls/lever_control.h        |  1 -
 engines/zvision/scripting/controls/paint_control.cpp      |  2 --
 engines/zvision/scripting/controls/paint_control.h        |  1 -
 .../zvision/scripting/controls/push_toggle_control.cpp    |  1 -
 engines/zvision/scripting/controls/push_toggle_control.h  |  1 -
 engines/zvision/scripting/controls/safe_control.cpp       |  1 -
 engines/zvision/scripting/controls/safe_control.h         |  1 -
 engines/zvision/scripting/controls/save_control.cpp       |  1 -
 engines/zvision/scripting/controls/save_control.h         |  1 -
 engines/zvision/scripting/controls/slot_control.cpp       |  1 -
 engines/zvision/scripting/controls/slot_control.h         |  1 -
 engines/zvision/scripting/controls/titler_control.cpp     |  1 -
 engines/zvision/scripting/controls/titler_control.h       |  1 -
 engines/zvision/scripting/inventory.cpp                   |  1 -
 engines/zvision/scripting/puzzle.h                        |  1 -
 engines/zvision/scripting/scr_file_handling.cpp           |  3 ---
 engines/zvision/scripting/script_manager.cpp              |  1 -
 engines/zvision/scripting/script_manager.h                |  2 --
 engines/zvision/scripting/sidefx.cpp                      |  1 -
 engines/zvision/scripting/sidefx/animation_node.cpp       |  3 ---
 engines/zvision/scripting/sidefx/animation_node.h         |  1 -
 engines/zvision/scripting/sidefx/distort_node.cpp         |  4 ----
 engines/zvision/scripting/sidefx/music_node.cpp           |  2 --
 engines/zvision/scripting/sidefx/syncsound_node.cpp       |  1 -
 engines/zvision/scripting/sidefx/timer_node.cpp           |  1 -
 engines/zvision/scripting/sidefx/ttytext_node.cpp         |  1 -
 engines/zvision/sound/zork_raw.cpp                        |  1 -
 engines/zvision/sound/zork_raw.h                          |  2 --
 engines/zvision/text/string_manager.cpp                   |  1 -
 engines/zvision/text/string_manager.h                     |  1 -
 engines/zvision/text/text.cpp                             |  1 -
 engines/zvision/text/text.h                               |  1 -
 engines/zvision/utility/clock.cpp                         |  1 -
 engines/zvision/utility/lzss_read_stream.cpp              |  1 -
 engines/zvision/utility/lzss_read_stream.h                |  1 -
 engines/zvision/utility/single_value_container.cpp        |  6 +-----
 engines/zvision/utility/utility.cpp                       |  1 -
 engines/zvision/utility/utility.h                         |  1 -
 engines/zvision/video/video.cpp                           | 15 ++++-----------
 engines/zvision/video/zork_avi_decoder.cpp                |  1 -
 engines/zvision/zvision.cpp                               |  1 -
 engines/zvision/zvision.h                                 |  1 -
 80 files changed, 5 insertions(+), 136 deletions(-)

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
index 2e549ec838..857a0dd688 100644
--- a/engines/zvision/animation/meta_animation.cpp
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -34,7 +34,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h
index 4795a388e4..93b69587c4 100644
--- a/engines/zvision/animation/meta_animation.h
+++ b/engines/zvision/animation/meta_animation.h
@@ -28,7 +28,6 @@
 #include "common/rect.h"
 #include "common/list.h"
 
-
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
index 5972bdb3ef..d9b8fa3894 100644
--- a/engines/zvision/animation/rlf_animation.cpp
+++ b/engines/zvision/animation/rlf_animation.cpp
@@ -32,7 +32,6 @@
 
 #include "graphics/colormasks.h"
 
-
 namespace ZVision {
 
 RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
diff --git a/engines/zvision/animation/rlf_animation.h b/engines/zvision/animation/rlf_animation.h
index 00c2e9b3d5..c8b2930676 100644
--- a/engines/zvision/animation/rlf_animation.h
+++ b/engines/zvision/animation/rlf_animation.h
@@ -27,7 +27,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/archives/zfs_archive.cpp b/engines/zvision/archives/zfs_archive.cpp
index ed4dcec1fe..416719b8f2 100644
--- a/engines/zvision/archives/zfs_archive.cpp
+++ b/engines/zvision/archives/zfs_archive.cpp
@@ -153,5 +153,3 @@ void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
 }
 
 } // End of namespace ZVision
-
-
diff --git a/engines/zvision/archives/zfs_archive.h b/engines/zvision/archives/zfs_archive.h
index 44e2c4b240..571591a6d1 100644
--- a/engines/zvision/archives/zfs_archive.h
+++ b/engines/zvision/archives/zfs_archive.h
@@ -27,7 +27,6 @@
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 
-
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index aac4e7b2bc..201d1c9360 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -41,7 +41,6 @@
 
 #include "audio/mixer.h"
 
-
 namespace ZVision {
 
 Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 873cdb0df7..e3bcf6f09a 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -40,7 +40,6 @@
 
 #include "engines/util.h"
 
-
 namespace ZVision {
 
 void ZVision::shortKeys(Common::Event event) {
diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
index 5816b3f364..c7898a4fbd 100644
--- a/engines/zvision/core/menu.cpp
+++ b/engines/zvision/core/menu.cpp
@@ -26,7 +26,6 @@
 
 #include "zvision/graphics/render_manager.h"
 
-
 namespace ZVision {
 
 enum {
@@ -380,7 +379,6 @@ void MenuZGI::process(uint32 deltatime) {
 			else if (itemCount > 50)
 				itemCount = 50;
 
-
 			for (int i = 0; i < itemCount; i++) {
 				int itemspace = (600 - 28) / itemCount;
 
@@ -553,7 +551,6 @@ void MenuZGI::process(uint32 deltatime) {
 	}
 }
 
-
 MenuNemesis::MenuNemesis(ZVision *engine) :
 	MenuHandler(engine) {
 	inmenu = false;
@@ -761,5 +758,4 @@ void MenuNemesis::process(uint32 deltatime) {
 	}
 }
 
-
 } // End of namespace ZVision
diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
index 62683de912..7301323173 100644
--- a/engines/zvision/core/menu.h
+++ b/engines/zvision/core/menu.h
@@ -70,8 +70,6 @@ public:
 private:
 	Graphics::Surface menuback[3][2];
 	Graphics::Surface menubar[4][2];
-
-
 	Graphics::Surface *items[50][2];
 	uint itemId[50];
 
diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 9b36824c3b..11d3dd391a 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -35,7 +35,6 @@
 
 #include "gui/message.h"
 
-
 namespace ZVision {
 
 const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');
diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
index 8350189566..1e9643ddbb 100644
--- a/engines/zvision/core/search_manager.cpp
+++ b/engines/zvision/core/search_manager.cpp
@@ -27,7 +27,6 @@
 #include "common/fs.h"
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 SearchManager::SearchManager(const Common::String &rootPath, int depth) {
@@ -237,7 +236,6 @@ void SearchManager::addDir(const Common::String &name) {
 	Common::ArchiveMemberList list;
 	dir->listMatchingMembers(list, "*.zfs");
 
-
 	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
 		Common::String flname = (*iter)->getName();
 
diff --git a/engines/zvision/cursors/cursor.cpp b/engines/zvision/cursors/cursor.cpp
index 8c6027a1bb..b07220df92 100644
--- a/engines/zvision/cursors/cursor.cpp
+++ b/engines/zvision/cursors/cursor.cpp
@@ -27,7 +27,6 @@
 #include "common/str.h"
 #include "common/file.h"
 
-
 namespace ZVision {
 
 ZorkCursor::ZorkCursor()
diff --git a/engines/zvision/cursors/cursor.h b/engines/zvision/cursors/cursor.h
index 57db561655..0c1e99411f 100644
--- a/engines/zvision/cursors/cursor.h
+++ b/engines/zvision/cursors/cursor.h
@@ -26,7 +26,6 @@
 #include "graphics/surface.h"
 #include "zvision/zvision.h"
 
-
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/cursors/cursor_manager.cpp b/engines/zvision/cursors/cursor_manager.cpp
index 564ffd25c5..33fb55515b 100644
--- a/engines/zvision/cursors/cursor_manager.cpp
+++ b/engines/zvision/cursors/cursor_manager.cpp
@@ -31,7 +31,6 @@
 #include "graphics/pixelformat.h"
 #include "graphics/cursorman.h"
 
-
 namespace ZVision {
 
 const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "backward", "downarrow", "forward", "handpt", "handpu", "hdown", "hleft",
@@ -46,7 +45,6 @@ const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow
                                                                  "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
                                                                };
 
-
 CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
 	: _engine(engine),
 	  _pixelFormat(pixelFormat),
diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h
index a6f77cec64..460f6fade6 100644
--- a/engines/zvision/cursors/cursor_manager.h
+++ b/engines/zvision/cursors/cursor_manager.h
@@ -27,7 +27,6 @@
 
 #include "common/str.h"
 
-
 namespace Graphics {
 struct PixelFormat;
 }
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index cd696557d9..4d210abe86 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -32,7 +32,6 @@
 #include "common/str-array.h"
 #include "common/system.h"
 
-
 namespace ZVision {
 
 uint32 ZVision::getFeatures() const {
@@ -45,7 +44,6 @@ Common::Language ZVision::getLanguage() const {
 
 } // End of namespace ZVision
 
-
 static const PlainGameDescriptor zVisionGames[] = {
 	{"zvision",  "ZVision Game"},
 	{"znemesis", "Zork Nemesis: The Forbidden Lands"},
@@ -53,7 +51,6 @@ static const PlainGameDescriptor zVisionGames[] = {
 	{0, 0}
 };
 
-
 namespace ZVision {
 
 static const ZVisionGameDescription gameDescriptions[] = {
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index a788e710b7..f80cac79ec 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -25,7 +25,6 @@
 
 #include "engines/advancedDetector.h"
 
-
 namespace ZVision {
 
 enum ZVisionGameId {
diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp
index 638a8ed233..a9363d8923 100644
--- a/engines/zvision/fonts/truetype_font.cpp
+++ b/engines/zvision/fonts/truetype_font.cpp
@@ -37,7 +37,6 @@
 #include "graphics/fonts/ttf.h"
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h
index 771c02a6dc..30ef1c73a3 100644
--- a/engines/zvision/fonts/truetype_font.h
+++ b/engines/zvision/fonts/truetype_font.h
@@ -28,7 +28,6 @@
 #include "graphics/font.h"
 #include "graphics/pixelformat.h"
 
-
 namespace Graphics {
 struct Surface;
 }
diff --git a/engines/zvision/graphics/effects/fog.cpp b/engines/zvision/graphics/effects/fog.cpp
index b6c5e7b011..f59e82a4a0 100644
--- a/engines/zvision/graphics/effects/fog.cpp
+++ b/engines/zvision/graphics/effects/fog.cpp
@@ -28,7 +28,6 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
 
-
 namespace ZVision {
 
 FogFx::FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds):
diff --git a/engines/zvision/graphics/effects/light.cpp b/engines/zvision/graphics/effects/light.cpp
index 9bff077051..00b3811d65 100644
--- a/engines/zvision/graphics/effects/light.cpp
+++ b/engines/zvision/graphics/effects/light.cpp
@@ -27,7 +27,6 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 
-
 namespace ZVision {
 
 LightFx::LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD, int8 maxD):
diff --git a/engines/zvision/graphics/effects/wave.cpp b/engines/zvision/graphics/effects/wave.cpp
index 9f2fbb285c..1b3aa040e8 100644
--- a/engines/zvision/graphics/effects/wave.cpp
+++ b/engines/zvision/graphics/effects/wave.cpp
@@ -27,7 +27,6 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 
-
 namespace ZVision {
 
 WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd):
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 05f8dec937..97d47e3920 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -37,7 +37,6 @@
 
 #include "image/tga.h"
 
-
 namespace ZVision {
 
 RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
@@ -122,7 +121,6 @@ void RenderManager::renderBackbufferToScreen() {
 		outWndDirtyRect = _wrkWndDirtyRect;
 	}
 
-
 	if (!outWndDirtyRect.isEmpty()) {
 		_system->copyRectToScreen(out->getBasePtr(outWndDirtyRect.left, outWndDirtyRect.top), out->pitch,
 		                          outWndDirtyRect.left + _workingWindow.left,
@@ -511,8 +509,6 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (srcRect.isEmpty() || !srcRect.isValidRect())
 		return;
 
-
-
 	uint32 _keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
 
 	// Copy srcRect from src surface to dst surface
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 7723c3d0f3..39809c65a4 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -33,7 +33,6 @@
 
 #include "effect.h"
 
-
 class OSystem;
 
 namespace Common {
@@ -92,7 +91,6 @@ private:
 	// A buffer used for apply graphics effects
 	Graphics::Surface _effectWnd;
 
-
 	/** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */
 	const int _wrkWidth;
 	/** Height of the working window. Saved to prevent extraneous calls to _workingWindow.height() */
@@ -256,7 +254,6 @@ public:
 	// Processing subtitles
 	void processSubs(uint16 deltatime);
 
-
 	// Return background size
 	Common::Point getBkgSize();
 
diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 5500b50ba8..54faecfa8b 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -21,14 +21,10 @@
  */
 
 #include "common/scummsys.h"
-
 #include "zvision/graphics/render_table.h"
-
 #include "common/rect.h"
-
 #include "graphics/colormasks.h"
 
-
 namespace ZVision {
 
 RenderTable::RenderTable(uint numColumns, uint numRows)
diff --git a/engines/zvision/graphics/render_table.h b/engines/zvision/graphics/render_table.h
index f061b3b0d6..7455d9ba39 100644
--- a/engines/zvision/graphics/render_table.h
+++ b/engines/zvision/graphics/render_table.h
@@ -26,7 +26,6 @@
 #include "common/rect.h"
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 class RenderTable {
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 8ff6bd0496..c8c82063f7 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -49,7 +49,6 @@
 
 #include "audio/decoders/wave.h"
 
-
 namespace ZVision {
 
 //////////////////////////////////////////////////////////////////////////////
@@ -66,7 +65,6 @@ bool ActionAdd::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionAssign
 //////////////////////////////////////////////////////////////////////////////
@@ -89,7 +87,6 @@ bool ActionAssign::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionAttenuate
 //////////////////////////////////////////////////////////////////////////////
@@ -108,7 +105,6 @@ bool ActionAttenuate::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionChangeLocation
 //////////////////////////////////////////////////////////////////////////////
@@ -125,7 +121,6 @@ bool ActionChangeLocation::execute() {
 	return false;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionCrossfade
 //////////////////////////////////////////////////////////////////////////////
@@ -368,7 +363,6 @@ bool ActionInventory::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionKill
 //////////////////////////////////////////////////////////////////////////////
@@ -457,8 +451,6 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 			_volume = volume * 255 / 100;
 		}
 	}
-
-
 }
 
 ActionMusic::~ActionMusic() {
@@ -583,7 +575,6 @@ bool ActionUnloadAnimation::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionPlayAnimation
 //////////////////////////////////////////////////////////////////////////////
@@ -625,7 +616,6 @@ bool ActionPlayAnimation::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionPlayPreloadAnimation
 //////////////////////////////////////////////////////////////////////////////
@@ -646,7 +636,6 @@ bool ActionPlayPreloadAnimation::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionQuit
 //////////////////////////////////////////////////////////////////////////////
@@ -786,7 +775,6 @@ bool ActionRotateTo::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionSetPartialScreen
 //////////////////////////////////////////////////////////////////////////////
@@ -833,7 +821,6 @@ bool ActionSetPartialScreen::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionSetScreen
 //////////////////////////////////////////////////////////////////////////////
@@ -852,7 +839,6 @@ bool ActionSetScreen::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionSetVenus
 //////////////////////////////////////////////////////////////////////////////
@@ -884,7 +870,6 @@ bool ActionStop::execute() {
 	return true;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionStreamVideo
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 03a249e580..f9e4ee8167 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -28,7 +28,6 @@
 
 #include "audio/mixer.h"
 
-
 namespace ZVision {
 
 // Forward declaration of ZVision. This file is included before ZVision is declared
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index e69d57f75c..5469106928 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -31,7 +31,6 @@
 
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 void Control::parseFlatControl(ZVision *engine) {
diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 5814c9e419..803d0cf1ce 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -26,7 +26,6 @@
 #include "common/keyboard.h"
 #include "common/str.h"
 
-
 namespace Common {
 class SeekableReadStream;
 struct Point;
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 9bb03cba51..dd6a7f11a9 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -37,7 +37,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index 33c3c7b579..cb765c429a 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -28,7 +28,6 @@
 #include "common/array.h"
 #include "common/rect.h"
 
-
 namespace ZVision {
 
 class MetaAnimation;
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index fd7afb92d1..68861dc221 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -37,7 +37,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index 9e01b40bab..86600d65dc 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -28,7 +28,6 @@
 #include "common/array.h"
 #include "common/rect.h"
 
-
 namespace ZVision {
 
 class MetaAnimation;
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 8af436bb40..c541693ec3 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -35,7 +35,6 @@
 #include "common/stream.h"
 #include "common/rect.h"
 
-
 namespace ZVision {
 
 InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 9a829d30f6..410caf6d49 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -30,7 +30,6 @@
 
 #include "common/rect.h"
 
-
 namespace ZVision {
 
 class InputControl : public Control {
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 1f176ef9d0..12b07d7584 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -38,7 +38,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h
index 8de6d1e5c9..37d4d3bd8d 100644
--- a/engines/zvision/scripting/controls/lever_control.h
+++ b/engines/zvision/scripting/controls/lever_control.h
@@ -28,7 +28,6 @@
 #include "common/list.h"
 #include "common/rect.h"
 
-
 namespace ZVision {
 
 class ZorkAVIDecoder;
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index cb3c17e0fd..9bad6f2c58 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -110,8 +110,6 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		delete _paint;
 		_paint = tmp;
 	}
-
-
 }
 
 PaintControl::~PaintControl() {
diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h
index aac4755fcd..8097290ac2 100644
--- a/engines/zvision/scripting/controls/paint_control.h
+++ b/engines/zvision/scripting/controls/paint_control.h
@@ -30,7 +30,6 @@
 #include "common/rect.h"
 #include "common/list.h"
 
-
 namespace ZVision {
 
 class PaintControl : public Control {
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index ea4e947abe..c5ec070899 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -31,7 +31,6 @@
 
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/push_toggle_control.h b/engines/zvision/scripting/controls/push_toggle_control.h
index 6d68b8f162..9444c77cb6 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.h
+++ b/engines/zvision/scripting/controls/push_toggle_control.h
@@ -29,7 +29,6 @@
 #include "common/events.h"
 #include "common/array.h"
 
-
 namespace ZVision {
 
 class PushToggleControl : public Control {
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 66ab53085f..3ad5d3a8ae 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -38,7 +38,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h
index e682e35050..e32ca97b70 100644
--- a/engines/zvision/scripting/controls/safe_control.h
+++ b/engines/zvision/scripting/controls/safe_control.h
@@ -28,7 +28,6 @@
 #include "common/list.h"
 #include "common/rect.h"
 
-
 namespace ZVision {
 
 class ZorkAVIDecoder;
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index 7e1a65a9cc..ad01257e6b 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -35,7 +35,6 @@
 #include "common/str.h"
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h
index fefb0e0ce2..cdc50eb54d 100644
--- a/engines/zvision/scripting/controls/save_control.h
+++ b/engines/zvision/scripting/controls/save_control.h
@@ -27,7 +27,6 @@
 
 #include "common/list.h"
 
-
 namespace ZVision {
 
 class SaveControl : public Control {
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 074d1905b4..1d83b44392 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -32,7 +32,6 @@
 
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h
index 86fd261f25..e776d99311 100644
--- a/engines/zvision/scripting/controls/slot_control.h
+++ b/engines/zvision/scripting/controls/slot_control.h
@@ -30,7 +30,6 @@
 #include "common/rect.h"
 #include "common/list.h"
 
-
 namespace ZVision {
 
 class SlotControl : public Control {
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index b803501033..f0126bebc2 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -32,7 +32,6 @@
 
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h
index ee230afa97..075e47c9e9 100644
--- a/engines/zvision/scripting/controls/titler_control.h
+++ b/engines/zvision/scripting/controls/titler_control.h
@@ -30,7 +30,6 @@
 #include "common/rect.h"
 #include "common/array.h"
 
-
 namespace ZVision {
 
 class TitlerControl : public Control {
diff --git a/engines/zvision/scripting/inventory.cpp b/engines/zvision/scripting/inventory.cpp
index 98d063395b..76d43b200b 100644
--- a/engines/zvision/scripting/inventory.cpp
+++ b/engines/zvision/scripting/inventory.cpp
@@ -24,7 +24,6 @@
 
 #include "zvision/scripting/script_manager.h"
 
-
 namespace ZVision {
 
 int8 ScriptManager::inventoryGetCount() {
diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h
index ab38c5fc5d..4123880835 100644
--- a/engines/zvision/scripting/puzzle.h
+++ b/engines/zvision/scripting/puzzle.h
@@ -28,7 +28,6 @@
 #include "common/list.h"
 #include "common/ptr.h"
 
-
 namespace ZVision {
 
 struct Puzzle {
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 697de58ed8..f97eed6b75 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -43,7 +43,6 @@
 #include "common/file.h"
 #include "common/tokenizer.h"
 
-
 namespace ZVision {
 
 void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) {
@@ -210,8 +209,6 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 					args = Common::String(chrs + startpos, chrs + pos);
 				}
 
-
-
 				// Parse for the action type
 				if (act.matchString("add", true)) {
 					actionList.push_back(new ActionAdd(_engine, slot, args));
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 2a54cc4314..7904817156 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -37,7 +37,6 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 ScriptManager::ScriptManager(ZVision *engine)
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 5701cde6d0..89b961634b 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -31,7 +31,6 @@
 #include "common/queue.h"
 #include "common/events.h"
 
-
 namespace Common {
 class String;
 class SeekableReadStream;
@@ -340,7 +339,6 @@ private:
 	ScriptManager *_scriptManager;
 };
 
-
 } // End of namespace ZVision
 
 #endif
diff --git a/engines/zvision/scripting/sidefx.cpp b/engines/zvision/scripting/sidefx.cpp
index c0b8a4d12f..9a658817c9 100644
--- a/engines/zvision/scripting/sidefx.cpp
+++ b/engines/zvision/scripting/sidefx.cpp
@@ -32,5 +32,4 @@
 
 namespace ZVision {
 
-
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 98ac4e3b37..549aacba7f 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -31,7 +31,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
@@ -154,8 +153,6 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 	return false;
 }
 
-
-
 void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) {
 	playnode nod;
 	nod.loop = loops;
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index dab3d88d80..94428d2542 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -27,7 +27,6 @@
 #include "common/rect.h"
 #include "common/list.h"
 
-
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp
index 9be6b29413..0d5c8b1ed5 100644
--- a/engines/zvision/scripting/sidefx/distort_node.cpp
+++ b/engines/zvision/scripting/sidefx/distort_node.cpp
@@ -31,7 +31,6 @@
 
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale)
@@ -83,8 +82,6 @@ bool DistortNode::process(uint32 deltaTimeInMillis) {
 	}
 
 	float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed);
-
-
 	setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale);
 
 	return false;
@@ -105,5 +102,4 @@ void DistortNode::setParams(float angl, float linScale) {
 	}
 }
 
-
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index b1e16e71ef..a76d3b4e8d 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -34,7 +34,6 @@
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 
-
 namespace ZVision {
 
 MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
@@ -188,7 +187,6 @@ PanTrackNode::~PanTrackNode() {
 	}
 }
 
-
 MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
 	: MusicNodeBASE(engine, key, SIDEFX_AUDIO) {
 	_volume = volume;
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
index 39542675eb..c1f139694b 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.cpp
+++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp
@@ -33,7 +33,6 @@
 #include "common/file.h"
 #include "audio/decoders/wave.h"
 
-
 namespace ZVision {
 
 SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)
diff --git a/engines/zvision/scripting/sidefx/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp
index 6e71101acd..abf2c90b04 100644
--- a/engines/zvision/scripting/sidefx/timer_node.cpp
+++ b/engines/zvision/scripting/sidefx/timer_node.cpp
@@ -29,7 +29,6 @@
 
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
index 68636eb422..1fb7c10792 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.cpp
+++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp
@@ -32,7 +32,6 @@
 #include "common/stream.h"
 #include "common/file.h"
 
-
 namespace ZVision {
 
 ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 1581210c86..485e0b8a49 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -38,7 +38,6 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 
-
 namespace ZVision {
 
 const int16 RawChunkStream::_stepAdjustmentTable[8] = { -1, -1, -1, 1, 4, 7, 10, 12};
diff --git a/engines/zvision/sound/zork_raw.h b/engines/zvision/sound/zork_raw.h
index a5e346dfbb..0b408d818c 100644
--- a/engines/zvision/sound/zork_raw.h
+++ b/engines/zvision/sound/zork_raw.h
@@ -25,7 +25,6 @@
 
 #include "audio/audiostream.h"
 
-
 namespace Common {
 class SeekableReadStream;
 }
@@ -42,7 +41,6 @@ struct SoundParams {
 	bool bits16;
 };
 
-
 /**
  * This is a ADPCM stream-reader, this class holds context for multi-chunk reading and no buffers.
  */
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index 114f298505..f88f9eaddd 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -35,7 +35,6 @@
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 
-
 namespace ZVision {
 
 StringManager::StringManager(ZVision *engine)
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index 5420e1f3ee..61c0d95f51 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -26,7 +26,6 @@
 #include "zvision/detection.h"
 #include "zvision/fonts/truetype_font.h"
 
-
 namespace Graphics {
 class FontManager;
 }
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 3cfc5b2f89..6f41416015 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -40,7 +40,6 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
 
-
 namespace ZVision {
 
 cTxtStyle::cTxtStyle() {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index c2468383d3..6b916860f0 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -28,7 +28,6 @@
 #include "zvision/fonts/truetype_font.h"
 #include "zvision/zvision.h"
 
-
 namespace Graphics {
 class FontManager;
 }
diff --git a/engines/zvision/utility/clock.cpp b/engines/zvision/utility/clock.cpp
index 45ab23ab65..0e800a2031 100644
--- a/engines/zvision/utility/clock.cpp
+++ b/engines/zvision/utility/clock.cpp
@@ -26,7 +26,6 @@
 
 #include "common/system.h"
 
-
 namespace ZVision {
 
 Clock::Clock(OSystem *system)
diff --git a/engines/zvision/utility/lzss_read_stream.cpp b/engines/zvision/utility/lzss_read_stream.cpp
index 14613a6fb2..bbe6e35f76 100644
--- a/engines/zvision/utility/lzss_read_stream.cpp
+++ b/engines/zvision/utility/lzss_read_stream.cpp
@@ -24,7 +24,6 @@
 
 #include "zvision/utility/lzss_read_stream.h"
 
-
 namespace ZVision {
 
 LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)
diff --git a/engines/zvision/utility/lzss_read_stream.h b/engines/zvision/utility/lzss_read_stream.h
index b7ae5ac2cb..1420621f13 100644
--- a/engines/zvision/utility/lzss_read_stream.h
+++ b/engines/zvision/utility/lzss_read_stream.h
@@ -26,7 +26,6 @@
 #include "common/stream.h"
 #include "common/array.h"
 
-
 namespace Common {
 class SeekableReadStream;
 }
diff --git a/engines/zvision/utility/single_value_container.cpp b/engines/zvision/utility/single_value_container.cpp
index e609474285..774f4b72ee 100644
--- a/engines/zvision/utility/single_value_container.cpp
+++ b/engines/zvision/utility/single_value_container.cpp
@@ -21,12 +21,10 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/utility/single_value_container.h"
-
 #include "common/textconsole.h"
 #include "common/str.h"
 
+#include "zvision/utility/single_value_container.h"
 
 namespace ZVision {
 
@@ -114,7 +112,6 @@ void SingleValueContainer::deleteCharPointer() {
 		delete[] _value.stringVal;
 }
 
-
 SingleValueContainer &SingleValueContainer::operator=(const bool &rhs) {
 	if (_objectType == BOOL) {
 		_value.boolVal = rhs;
@@ -270,7 +267,6 @@ SingleValueContainer &SingleValueContainer::operator=(const SingleValueContainer
 	return *this;
 }
 
-
 bool SingleValueContainer::getBoolValue(bool *returnValue) const {
 	if (_objectType !=  BOOL) {
 		warning("'Object' is not storing a bool.");
diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/utility/utility.cpp
index 537f525bd4..517c89afbd 100644
--- a/engines/zvision/utility/utility.cpp
+++ b/engines/zvision/utility/utility.cpp
@@ -30,7 +30,6 @@
 #include "common/tokenizer.h"
 #include "common/file.h"
 
-
 namespace ZVision {
 
 void writeFileContentsToFile(const Common::String &sourceFile, const Common::String &destFile) {
diff --git a/engines/zvision/utility/utility.h b/engines/zvision/utility/utility.h
index 380034404a..0741cc044c 100644
--- a/engines/zvision/utility/utility.h
+++ b/engines/zvision/utility/utility.h
@@ -25,7 +25,6 @@
 
 #include "common/array.h"
 
-
 namespace Common {
 class String;
 }
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 7a120df76b..25125ec2fb 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -21,21 +21,15 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/zvision.h"
-
-#include "zvision/utility/clock.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/subtitles/subtitles.h"
-
 #include "common/system.h"
-
 #include "video/video_decoder.h"
-
 #include "engines/util.h"
-
 #include "graphics/surface.h"
 
+#include "zvision/zvision.h"
+#include "zvision/utility/clock.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/subtitles/subtitles.h"
 
 namespace ZVision {
 
@@ -52,7 +46,6 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 		scaled->create(dst.width(), dst.height(), vid.getPixelFormat());
 	}
 
-
 	uint16 x = _workingWindow.left + dst.left;
 	uint16 y = _workingWindow.top + dst.top;
 	uint16 finalWidth = dst.width() < _workingWindow.width() ? dst.width() : _workingWindow.width();
diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index 415a20d3f2..67fab0a114 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -31,7 +31,6 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 
-
 namespace ZVision {
 
 Video::AVIDecoder::AVIAudioTrack *ZorkAVIDecoder::createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 62342f02b9..7a5e50f491 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -51,7 +51,6 @@
 
 #include "audio/mixer.h"
 
-
 namespace ZVision {
 
 #define ZVISION_SETTINGS_KEYS_COUNT 17
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 8b14cfa178..ae49f0640f 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -37,7 +37,6 @@
 
 #include "gui/debugger.h"
 
-
 namespace Video {
 class VideoDecoder;
 }
-- 
cgit v1.2.3


From 0f55a7faf72b6cb0327236e9fb8f2ec8bd6d91a3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 01:15:33 +0200
Subject: ZVISION: Remove empty file

---
 engines/zvision/module.mk            |  1 -
 engines/zvision/scripting/sidefx.cpp | 35 -----------------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 engines/zvision/scripting/sidefx.cpp

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index f7927650d9..f2455a5d9c 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -34,7 +34,6 @@ MODULE_OBJS := \
 	scripting/inventory.o \
 	scripting/scr_file_handling.o \
 	scripting/script_manager.o \
-	scripting/sidefx.o \
 	scripting/sidefx/animation_node.o \
 	scripting/sidefx/distort_node.o \
 	scripting/sidefx/music_node.o \
diff --git a/engines/zvision/scripting/sidefx.cpp b/engines/zvision/scripting/sidefx.cpp
deleted file mode 100644
index 9a658817c9..0000000000
--- a/engines/zvision/scripting/sidefx.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
-
-#include "common/stream.h"
-
-namespace ZVision {
-
-} // End of namespace ZVision
-- 
cgit v1.2.3


From fd2750a71152d09557709a49f055b50937919326 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 01:41:06 +0200
Subject: ZVISION: Remove dead code

---
 engines/zvision/module.mk                          |   1 -
 engines/zvision/utility/single_value_container.cpp | 344 ---------------------
 engines/zvision/utility/single_value_container.h   | 183 -----------
 3 files changed, 528 deletions(-)
 delete mode 100644 engines/zvision/utility/single_value_container.cpp
 delete mode 100644 engines/zvision/utility/single_value_container.h

diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index f2455a5d9c..140074c326 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -47,7 +47,6 @@ MODULE_OBJS := \
 	text/text.o \
 	utility/clock.o \
 	utility/lzss_read_stream.o \
-	utility/single_value_container.o \
 	utility/utility.o \
 	utility/win_keys.o \
 	video/video.o \
diff --git a/engines/zvision/utility/single_value_container.cpp b/engines/zvision/utility/single_value_container.cpp
deleted file mode 100644
index 774f4b72ee..0000000000
--- a/engines/zvision/utility/single_value_container.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-#include "common/textconsole.h"
-#include "common/str.h"
-
-#include "zvision/utility/single_value_container.h"
-
-namespace ZVision {
-
-SingleValueContainer::SingleValueContainer(ValueType type) : _objectType(type) { }
-
-SingleValueContainer::SingleValueContainer(bool value) : _objectType(BOOL) {
-	_value.boolVal = value;
-}
-
-SingleValueContainer::SingleValueContainer(byte value) : _objectType(BYTE) {
-	_value.byteVal = value;
-}
-
-SingleValueContainer::SingleValueContainer(int16 value) : _objectType(INT16) {
-	_value.int16Val = value;
-}
-
-SingleValueContainer::SingleValueContainer(uint16 value) : _objectType(UINT16) {
-	_value.uint16Val = value;
-}
-
-SingleValueContainer::SingleValueContainer(int32 value) : _objectType(INT32) {
-	_value.int32Val = value;
-}
-
-SingleValueContainer::SingleValueContainer(uint32 value) : _objectType(UINT32) {
-	_value.uint32Val = value;
-}
-
-SingleValueContainer::SingleValueContainer(float value) : _objectType(FLOAT) {
-	_value.floatVal = value;
-}
-
-SingleValueContainer::SingleValueContainer(double value) : _objectType(DOUBLE) {
-	_value.doubleVal = value;
-}
-
-SingleValueContainer::SingleValueContainer(Common::String value) : _objectType(BYTE) {
-	_value.stringVal = new char[value.size() + 1];
-	memcpy(_value.stringVal, value.c_str(), value.size() + 1);
-}
-
-SingleValueContainer::SingleValueContainer(const SingleValueContainer &other) {
-	_objectType = other._objectType;
-
-	switch (_objectType) {
-	case BOOL:
-		_value.boolVal = other._value.boolVal;
-		break;
-	case BYTE:
-		_value.byteVal = other._value.byteVal;
-		break;
-	case INT16:
-		_value.int16Val = other._value.int16Val;
-		break;
-	case UINT16:
-		_value.uint16Val = other._value.uint16Val;
-		break;
-	case INT32:
-		_value.int32Val = other._value.int32Val;
-		break;
-	case UINT32:
-		_value.uint32Val = other._value.uint32Val;
-		break;
-	case FLOAT:
-		_value.floatVal = other._value.floatVal;
-		break;
-	case DOUBLE:
-		_value.doubleVal = other._value.doubleVal;
-		break;
-	case STRING:
-		uint32 length = strlen(other._value.stringVal);
-		_value.stringVal = new char[length + 1];
-		memcpy(_value.stringVal, other._value.stringVal, length + 1);
-		break;
-	}
-}
-
-SingleValueContainer::~SingleValueContainer() {
-	deleteCharPointer();
-}
-
-void SingleValueContainer::deleteCharPointer() {
-	if (_objectType == STRING)
-		delete[] _value.stringVal;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const bool &rhs) {
-	if (_objectType == BOOL) {
-		_value.boolVal = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = BOOL;
-	_value.boolVal = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const byte &rhs) {
-	if (_objectType == BYTE) {
-		_value.byteVal = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = BYTE;
-	_value.byteVal = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const int16 &rhs) {
-	if (_objectType == INT16) {
-		_value.int16Val = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = INT16;
-	_value.int16Val = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const uint16 &rhs) {
-	if (_objectType == UINT16) {
-		_value.uint16Val = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = UINT16;
-	_value.uint16Val = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const int32 &rhs) {
-	if (_objectType == INT32) {
-		_value.int32Val = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = INT32;
-	_value.int32Val = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const uint32 &rhs) {
-	if (_objectType == UINT32) {
-		_value.uint32Val = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = UINT32;
-	_value.uint32Val = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const float &rhs) {
-	if (_objectType == FLOAT) {
-		_value.floatVal = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = FLOAT;
-	_value.floatVal = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const double &rhs) {
-	if (_objectType == DOUBLE) {
-		_value.doubleVal = rhs;
-		return *this;
-	}
-
-	deleteCharPointer();
-	_objectType = DOUBLE;
-	_value.doubleVal = rhs;
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const Common::String &rhs) {
-	if (_objectType != STRING) {
-		_objectType = STRING;
-		_value.stringVal = new char[rhs.size() + 1];
-		memcpy(_value.stringVal, rhs.c_str(), rhs.size() + 1);
-
-		return *this;
-	}
-
-	uint32 length = strlen(_value.stringVal);
-	if (length <= rhs.size() + 1) {
-		memcpy(_value.stringVal, rhs.c_str(), rhs.size() + 1);
-	} else {
-		delete[] _value.stringVal;
-		_value.stringVal = new char[rhs.size() + 1];
-		memcpy(_value.stringVal, rhs.c_str(), rhs.size() + 1);
-	}
-
-	return *this;
-}
-
-SingleValueContainer &SingleValueContainer::operator=(const SingleValueContainer &rhs) {
-	switch (_objectType) {
-	case BOOL:
-		return operator=(rhs._value.boolVal);
-	case BYTE:
-		return operator=(rhs._value.byteVal);
-	case INT16:
-		return operator=(rhs._value.int16Val);
-	case UINT16:
-		return operator=(rhs._value.uint16Val);
-	case INT32:
-		return operator=(rhs._value.int32Val);
-	case UINT32:
-		return operator=(rhs._value.uint32Val);
-	case FLOAT:
-		return operator=(rhs._value.floatVal);
-	case DOUBLE:
-		return operator=(rhs._value.doubleVal);
-	case STRING:
-		uint32 length = strlen(rhs._value.stringVal);
-
-		_value.stringVal = new char[length + 1];
-		memcpy(_value.stringVal, rhs._value.stringVal, length + 1);
-
-		return *this;
-	}
-
-	return *this;
-}
-
-bool SingleValueContainer::getBoolValue(bool *returnValue) const {
-	if (_objectType !=  BOOL) {
-		warning("'Object' is not storing a bool.");
-		return false;
-	}
-
-	*returnValue = _value.boolVal;
-	return true;
-}
-
-bool SingleValueContainer::getByteValue(byte *returnValue) const {
-	if (_objectType !=  BYTE)
-		warning("'Object' is not storing a byte.");
-
-	*returnValue = _value.byteVal;
-	return true;
-}
-
-bool SingleValueContainer::getInt16Value(int16 *returnValue) const {
-	if (_objectType !=  INT16)
-		warning("'Object' is not storing an int16.");
-
-	*returnValue = _value.int16Val;
-	return true;
-}
-
-bool SingleValueContainer::getUInt16Value(uint16 *returnValue) const {
-	if (_objectType !=  UINT16)
-		warning("'Object' is not storing a uint16.");
-
-	*returnValue = _value.uint16Val;
-	return true;
-}
-
-bool SingleValueContainer::getInt32Value(int32 *returnValue) const {
-	if (_objectType !=  INT32)
-		warning("'Object' is not storing an int32.");
-
-	*returnValue = _value.int32Val;
-	return true;
-}
-
-bool SingleValueContainer::getUInt32Value(uint32 *returnValue) const {
-	if (_objectType !=  UINT32)
-		warning("'Object' is not storing a uint32.");
-
-	*returnValue = _value.uint32Val;
-	return true;
-}
-
-bool SingleValueContainer::getFloatValue(float *returnValue) const {
-	if (_objectType !=  FLOAT)
-		warning("'Object' is not storing a float.");
-
-	*returnValue = _value.floatVal;
-	return true;
-}
-
-bool SingleValueContainer::getDoubleValue(double *returnValue) const {
-	if (_objectType !=  DOUBLE)
-		warning("'Object' is not storing a double.");
-
-	*returnValue = _value.doubleVal;
-	return true;
-}
-
-bool SingleValueContainer::getStringValue(Common::String *returnValue) const {
-	if (_objectType !=  STRING)
-		warning("'Object' is not storing a Common::String.");
-
-	*returnValue = _value.stringVal;
-	return true;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/utility/single_value_container.h b/engines/zvision/utility/single_value_container.h
deleted file mode 100644
index ac6e99039a..0000000000
--- a/engines/zvision/utility/single_value_container.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SINGLE_VALUE_CONTAINER_H
-#define ZVISION_SINGLE_VALUE_CONTAINER_H
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-/**
- * A generic single value storage class. It is useful for storing different
- * value types in a single List, Hashmap, etc.
- */
-class SingleValueContainer {
-public:
-	enum ValueType {
-		BOOL,
-		BYTE,
-		INT16,
-		UINT16,
-		INT32,
-		UINT32,
-		FLOAT,
-		DOUBLE,
-		STRING
-	};
-
-	// Constructors
-	explicit SingleValueContainer(ValueType type);
-	explicit SingleValueContainer(bool value);
-	explicit SingleValueContainer(byte value);
-	explicit SingleValueContainer(int16 value);
-	explicit SingleValueContainer(uint16 value);
-	explicit SingleValueContainer(int32 value);
-	explicit SingleValueContainer(uint32 value);
-	explicit SingleValueContainer(float value);
-	explicit SingleValueContainer(double value);
-	explicit SingleValueContainer(Common::String value);
-
-	// Copy constructor
-	explicit SingleValueContainer(const SingleValueContainer &other);
-
-	// Destructor
-	~SingleValueContainer();
-
-private:
-	ValueType _objectType;
-
-	union {
-		bool boolVal;
-		byte byteVal;
-		int16 int16Val;
-		uint16 uint16Val;
-		int32 int32Val;
-		uint32 uint32Val;
-		float floatVal;
-		double doubleVal;
-		char *stringVal;
-	} _value;
-
-public:
-	SingleValueContainer &operator=(const bool &rhs);
-	SingleValueContainer &operator=(const byte &rhs);
-	SingleValueContainer &operator=(const int16 &rhs);
-	SingleValueContainer &operator=(const uint16 &rhs);
-	SingleValueContainer &operator=(const int32 &rhs);
-	SingleValueContainer &operator=(const uint32 &rhs);
-	SingleValueContainer &operator=(const float &rhs);
-	SingleValueContainer &operator=(const double &rhs);
-	SingleValueContainer &operator=(const Common::String &rhs);
-
-	SingleValueContainer &operator=(const SingleValueContainer &rhs);
-
-	/**
-	 * Retrieve a bool from the container. If the container is not storing a
-	 * bool, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getBoolValue(bool *returnValue) const;
-	/**
-	 * Retrieve a byte from the container. If the container is not storing a
-	 * byte, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getByteValue(byte *returnValue) const;
-	/**
-	 * Retrieve an int16 from the container. If the container is not storing an
-	 * int16, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getInt16Value(int16 *returnValue) const;
-	/**
-	 * Retrieve a uint16 from the container. If the container is not storing a
-	 * uint16, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getUInt16Value(uint16 *returnValue) const;
-	/**
-	 * Retrieve an int32 from the container. If the container is not storing an
-	 * int32, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getInt32Value(int32 *returnValue) const;
-	/**
-	 * Retrieve a uint32 from the container. If the container is not storing a
-	 * uint32, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getUInt32Value(uint32 *returnValue) const;
-	/**
-	 * Retrieve a float from the container. If the container is not storing a
-	 * float, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getFloatValue(float *returnValue) const;
-	/**
-	 * Retrieve a double from the container. If the container is not storing a
-	 * double, this will return false and display a warning().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getDoubleValue(double *returnValue) const;
-	/**
-	 * Retrieve a String from the container. If the container is not storing a
-	 * string, this will return false and display a warning().
-	 *
-	 * Caution: Strings are internally stored as char[]. getStringValue uses
-	 * Common::String::operator=(char *) to do the assigment, which uses both
-	 * strlen() AND memmove().
-	 *
-	 * @param returnValue    Pointer to where you want the value stored
-	 * @return               Value indicating whether the value assignment was successful
-	 */
-	bool getStringValue(Common::String *returnValue) const;
-
-private:
-	/**
-	 * Helper method for destruction and assignment. It checks to see
-	 * if the char pointer is being used, and if so calls delete on it
-	 */
-	void deleteCharPointer();
-};
-
-} // End of namespace ZVision
-
-#endif
-- 
cgit v1.2.3


From 10444ef5683f420f08cfc276349a5771dd0d04e5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 01:42:04 +0200
Subject: ZVISION: Use integers for rectangles in the menu code

---
 engines/zvision/core/menu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
index 7301323173..ebe0bb50ac 100644
--- a/engines/zvision/core/menu.h
+++ b/engines/zvision/core/menu.h
@@ -82,7 +82,7 @@ private:
 	int mouseOnItem;
 
 	bool   scrolled[3];
-	float scrollPos[3];
+	int16 scrollPos[3];
 
 	enum {
 		menu_ITEM = 0,
@@ -111,7 +111,7 @@ private:
 	int mouseOnItem;
 
 	bool   scrolled;
-	float scrollPos;
+	int16 scrollPos;
 
 	bool redraw;
 
-- 
cgit v1.2.3


From bb31c435bf6502f4e1f94b3de9f046c054031a98 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 01:43:51 +0200
Subject: ZVISION: Remove more dead code, and move some debugger functions

---
 engines/zvision/core/console.cpp    |  79 ++++++++++------
 engines/zvision/core/console.h      |   2 -
 engines/zvision/sound/zork_raw.cpp  |  22 +++--
 engines/zvision/utility/utility.cpp | 176 ------------------------------------
 engines/zvision/utility/utility.h   |  66 --------------
 5 files changed, 65 insertions(+), 280 deletions(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 201d1c9360..f8e28333f1 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -44,7 +44,6 @@
 namespace ZVision {
 
 Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
-	registerCmd("loadimage", WRAP_METHOD(Console, cmdLoadImage));
 	registerCmd("loadvideo", WRAP_METHOD(Console, cmdLoadVideo));
 	registerCmd("loadsound", WRAP_METHOD(Console, cmdLoadSound));
 	registerCmd("raw2wav", WRAP_METHOD(Console, cmdRawToWav));
@@ -55,18 +54,6 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 	registerCmd("changelocation", WRAP_METHOD(Console, cmdChangeLocation));
 	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
 	registerCmd("parseallscrfiles", WRAP_METHOD(Console, cmdParseAllScrFiles));
-	registerCmd("rendertext", WRAP_METHOD(Console, cmdRenderText));
-}
-
-bool Console::cmdLoadImage(int argc, const char **argv) {
-//	if (argc == 4)
-//		_engine->getRenderManager()->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]));
-//	else {
-//		DebugPrintf("Use loadimage <fileName> <destinationX> <destinationY> to load an image to the screen\n");
-//		return true;
-//	}
-
-	return true;
 }
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
@@ -117,7 +104,42 @@ bool Console::cmdRawToWav(int argc, const char **argv) {
 		return true;
 	}
 
-	convertRawToWav(argv[1], _engine, argv[2]);
+	Common::File file;
+	if (!file.open(argv[1]))
+		return true;
+
+	Audio::AudioStream *audioStream = makeRawZorkStream(argv[1], _engine);
+
+	Common::DumpFile output;
+	output.open(argv[2]);
+
+	output.writeUint32BE(MKTAG('R', 'I', 'F', 'F'));
+	output.writeUint32LE(file.size() * 2 + 36);
+	output.writeUint32BE(MKTAG('W', 'A', 'V', 'E'));
+	output.writeUint32BE(MKTAG('f', 'm', 't', ' '));
+	output.writeUint32LE(16);
+	output.writeUint16LE(1);
+	uint16 numChannels;
+	if (audioStream->isStereo()) {
+		numChannels = 2;
+		output.writeUint16LE(2);
+	} else {
+		numChannels = 1;
+		output.writeUint16LE(1);
+	}
+	output.writeUint32LE(audioStream->getRate());
+	output.writeUint32LE(audioStream->getRate() * numChannels * 2);
+	output.writeUint16LE(numChannels * 2);
+	output.writeUint16LE(16);
+	output.writeUint32BE(MKTAG('d', 'a', 't', 'a'));
+	output.writeUint32LE(file.size() * 2);
+	int16 *buffer = new int16[file.size()];
+	audioStream->readBuffer(buffer, file.size());
+	output.write(buffer, file.size() * 2);
+
+	delete[] buffer;
+
+
 	return true;
 }
 
@@ -186,7 +208,22 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
 		return true;
 	}
 
-	writeFileContentsToFile(argv[1], argv[1]);
+	Common::File f;
+	if (!f.open(argv[1])) {
+		return true;
+	}
+
+	byte *buffer = new byte[f.size()];
+	f.read(buffer, f.size());
+
+	Common::DumpFile dumpFile;
+	dumpFile.open(argv[1]);
+
+	dumpFile.write(buffer, f.size());
+	dumpFile.flush();
+	dumpFile.close();
+
+	delete[] buffer;
 
 	return true;
 }
@@ -201,16 +238,4 @@ bool Console::cmdParseAllScrFiles(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdRenderText(int argc, const char **argv) {
-	if (argc != 7) {
-		debugPrintf("Use rendertext <text> <fontNumber> <destX> <destY> <maxWidth> <1 or 0: wrap> to render text\n");
-		return true;
-	}
-
-	//StringManager::TextStyle style = _engine->getStringManager()->getTextStyle(atoi(argv[2]));
-	//_engine->getRenderManager()->renderTextToWorkingWindow(333, Common::String(argv[1]), style.font, atoi(argv[3]), atoi(argv[4]), style.color, atoi(argv[5]), -1, Graphics::kTextAlignLeft, atoi(argv[6]) == 0 ? false : true);
-
-	return true;
-}
-
 } // End of namespace ZVision
diff --git a/engines/zvision/core/console.h b/engines/zvision/core/console.h
index 29523c57ee..994e05ba35 100644
--- a/engines/zvision/core/console.h
+++ b/engines/zvision/core/console.h
@@ -37,7 +37,6 @@ public:
 private:
 	ZVision *_engine;
 
-	bool cmdLoadImage(int argc, const char **argv);
 	bool cmdLoadVideo(int argc, const char **argv);
 	bool cmdLoadSound(int argc, const char **argv);
 	bool cmdRawToWav(int argc, const char **argv);
@@ -48,7 +47,6 @@ private:
 	bool cmdChangeLocation(int argc, const char **argv);
 	bool cmdDumpFile(int argc, const char **argv);
 	bool cmdParseAllScrFiles(int argc, const char **argv);
-	bool cmdRenderText(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 485e0b8a49..c26c33a392 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -21,23 +21,21 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/sound/zork_raw.h"
-
-#include "zvision/zvision.h"
-#include "zvision/detection.h"
-#include "zvision/utility/utility.h"
-
 #include "common/file.h"
 #include "common/str.h"
 #include "common/stream.h"
 #include "common/memstream.h"
 #include "common/bufferedstream.h"
 #include "common/util.h"
-
+#include "common/tokenizer.h"
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 
+#include "zvision/sound/zork_raw.h"
+#include "zvision/zvision.h"
+#include "zvision/detection.h"
+#include "zvision/utility/utility.h"
+
 namespace ZVision {
 
 const int16 RawChunkStream::_stepAdjustmentTable[8] = { -1, -1, -1, 1, 4, 7, 10, 12};
@@ -255,7 +253,13 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 	Common::File *file = new Common::File();
 	assert(engine->getSearchManager()->openFile(*file, filePath));
 
-	Common::String fileName = getFileName(filePath);
+	// Get the file name
+	Common::StringTokenizer tokenizer(filePath, "/\\");
+	Common::String fileName;
+	while (!tokenizer.empty()) {
+		fileName = tokenizer.nextToken();
+	}
+
 	fileName.toLowercase();
 
 	SoundParams soundParams = {};
diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/utility/utility.cpp
index 517c89afbd..2388fe826e 100644
--- a/engines/zvision/utility/utility.cpp
+++ b/engines/zvision/utility/utility.cpp
@@ -32,25 +32,6 @@
 
 namespace ZVision {
 
-void writeFileContentsToFile(const Common::String &sourceFile, const Common::String &destFile) {
-	Common::File f;
-	if (!f.open(sourceFile)) {
-		return;
-	}
-
-	byte *buffer = new byte[f.size()];
-	f.read(buffer, f.size());
-
-	Common::DumpFile dumpFile;
-	dumpFile.open(destFile);
-
-	dumpFile.write(buffer, f.size());
-	dumpFile.flush();
-	dumpFile.close();
-
-	delete[] buffer;
-}
-
 void trimCommentsAndWhiteSpace(Common::String *string) {
 	for (int i = string->size() - 1; i >= 0; i--) {
 		if ((*string)[i] == '#') {
@@ -76,161 +57,4 @@ void tryToDumpLine(const Common::String &key,
 	}
 }
 
-void dumpEveryResultAction(const Common::String &destFile) {
-	Common::HashMap<Common::String, byte> count;
-	Common::HashMap<Common::String, bool> fileAlreadyUsed;
-
-	Common::DumpFile output;
-	output.open(destFile);
-
-	// Find scr files
-	Common::ArchiveMemberList list;
-	SearchMan.listMatchingMembers(list, "*.scr");
-
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::SeekableReadStream *stream = (*iter)->createReadStream();
-
-		Common::String line = stream->readLine();
-		trimCommentsAndWhiteSpace(&line);
-
-		while (!stream->eos()) {
-			if (line.matchString("*:add*", true)) {
-				tryToDumpLine("add", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:animplay*", true)) {
-				tryToDumpLine("animplay", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:animpreload*", true)) {
-				tryToDumpLine("animpreload", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:animunload*", true)) {
-				tryToDumpLine("animunload", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:attenuate*", true)) {
-				tryToDumpLine("attenuate", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:assign*", true)) {
-				tryToDumpLine("assign", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:change_location*", true)) {
-				tryToDumpLine("change_location", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:crossfade*", true) && !fileAlreadyUsed["add"]) {
-				tryToDumpLine("crossfade", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:debug*", true)) {
-				tryToDumpLine("debug", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:delay_render*", true)) {
-				tryToDumpLine("delay_render", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:disable_control*", true)) {
-				tryToDumpLine("disable_control", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:disable_venus*", true)) {
-				tryToDumpLine("disable_venus", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:display_message*", true)) {
-				tryToDumpLine("display_message", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:dissolve*", true)) {
-				tryToDumpLine("dissolve", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:distort*", true)) {
-				tryToDumpLine("distort", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:enable_control*", true)) {
-				tryToDumpLine("enable_control", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:flush_mouse_events*", true)) {
-				tryToDumpLine("flush_mouse_events", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:inventory*", true)) {
-				tryToDumpLine("inventory", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:kill*", true)) {
-				tryToDumpLine("kill", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:menu_bar_enable*", true)) {
-				tryToDumpLine("menu_bar_enable", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:music*", true)) {
-				tryToDumpLine("music", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:pan_track*", true)) {
-				tryToDumpLine("pan_track", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:playpreload*", true)) {
-				tryToDumpLine("playpreload", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:preferences*", true)) {
-				tryToDumpLine("preferences", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:quit*", true)) {
-				tryToDumpLine("quit", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:random*", true)) {
-				tryToDumpLine("random", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:region*", true)) {
-				tryToDumpLine("region", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:restore_game*", true)) {
-				tryToDumpLine("restore_game", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:rotate_to*", true)) {
-				tryToDumpLine("rotate_to", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:save_game*", true)) {
-				tryToDumpLine("save_game", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:set_partial_screen*", true)) {
-				tryToDumpLine("set_partial_screen", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:set_screen*", true)) {
-				tryToDumpLine("set_screen", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:set_venus*", true)) {
-				tryToDumpLine("set_venus", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:stop*", true)) {
-				tryToDumpLine("stop", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:streamvideo*", true)) {
-				tryToDumpLine("streamvideo", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:syncsound*", true)) {
-				tryToDumpLine("syncsound", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:timer*", true)) {
-				tryToDumpLine("timer", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:ttytext*", true)) {
-				tryToDumpLine("ttytext", line, &count, &fileAlreadyUsed, output);
-			} else if (line.matchString("*:universe_music*", true)) {
-				tryToDumpLine("universe_music", line, &count, &fileAlreadyUsed, output);
-			}
-
-			line = stream->readLine();
-			trimCommentsAndWhiteSpace(&line);
-		}
-
-		for (Common::HashMap<Common::String, bool>::iterator fileUsedIter = fileAlreadyUsed.begin(); fileUsedIter != fileAlreadyUsed.end(); ++fileUsedIter) {
-			fileUsedIter->_value = false;
-		}
-	}
-
-	output.close();
-}
-
-Common::String getFileName(const Common::String &fullPath) {
-	Common::StringTokenizer tokenizer(fullPath, "/\\");
-	Common::String token;
-	while (!tokenizer.empty()) {
-		token = tokenizer.nextToken();
-	}
-
-	return token;
-}
-
-void convertRawToWav(const Common::String &inputFile, ZVision *engine, const Common::String &outputFile) {
-	Common::File file;
-	if (!file.open(inputFile))
-		return;
-
-	Audio::AudioStream *audioStream = makeRawZorkStream(inputFile, engine);
-
-	Common::DumpFile output;
-	output.open(outputFile);
-
-	output.writeUint32BE(MKTAG('R', 'I', 'F', 'F'));
-	output.writeUint32LE(file.size() * 2 + 36);
-	output.writeUint32BE(MKTAG('W', 'A', 'V', 'E'));
-	output.writeUint32BE(MKTAG('f', 'm', 't', ' '));
-	output.writeUint32LE(16);
-	output.writeUint16LE(1);
-	uint16 numChannels;
-	if (audioStream->isStereo()) {
-		numChannels = 2;
-		output.writeUint16LE(2);
-	} else {
-		numChannels = 1;
-		output.writeUint16LE(1);
-	}
-	output.writeUint32LE(audioStream->getRate());
-	output.writeUint32LE(audioStream->getRate() * numChannels * 2);
-	output.writeUint16LE(numChannels * 2);
-	output.writeUint16LE(16);
-	output.writeUint32BE(MKTAG('d', 'a', 't', 'a'));
-	output.writeUint32LE(file.size() * 2);
-	int16 *buffer = new int16[file.size()];
-	audioStream->readBuffer(buffer, file.size());
-	output.write(buffer, file.size() * 2);
-
-	delete[] buffer;
-}
-
 } // End of namespace ZVision
diff --git a/engines/zvision/utility/utility.h b/engines/zvision/utility/utility.h
index 0741cc044c..0ca26b968d 100644
--- a/engines/zvision/utility/utility.h
+++ b/engines/zvision/utility/utility.h
@@ -33,15 +33,6 @@ namespace ZVision {
 
 class ZVision;
 
-/**
- * Opens the sourceFile utilizing Common::File (aka SearchMan) and writes the
- * contents to destFile. destFile is created in the working directory
- *
- * @param sourceFile    The 'file' you want the contents of
- * @param destFile      The name of the file where the content will be written to
- */
-void writeFileContentsToFile(const Common::String &sourceFile, const Common::String &destFile);
-
 /**
  * Removes any line comments using '#' as a sequence start.
  * Then removes any trailing and leading 'whitespace' using String::trim()
@@ -51,63 +42,6 @@ void writeFileContentsToFile(const Common::String &sourceFile, const Common::Str
  */
 void trimCommentsAndWhiteSpace(Common::String *string);
 
-/**
- * Searches through all the .scr files and dumps 'numberOfExamplesPerType' examples of each type of ResultAction
- * ZVision::initialize() must have been called before this function can be used.
- *
- * @param destFile    Where to write the examples
- */
-void dumpEveryResultAction(const Common::String &destFile);
-
-/**
- * Removes all duplicate entries from container. Relative order will be preserved.
- *
- * @param container    The Array to remove duplicate entries from
- */
-template<class T>
-void removeDuplicateEntries(Common::Array<T> &container) {
-	// Length of modified array
-	uint newLength = 1;
-	uint j;
-
-	for (uint i = 1; i < container.size(); i++) {
-		for (j = 0; j < newLength; j++) {
-			if (container[i] == container[j]) {
-				break;
-			}
-		}
-
-		// If none of the values in index[0..j] of container are the same as array[i],
-		// then copy the current value to corresponding new position in array
-		if (j == newLength) {
-			container[newLength++] = container[i];
-		}
-	}
-
-	// Actually remove the unneeded space
-	while (container.size() < newLength) {
-		container.pop_back();
-	}
-}
-
-/**
- * Gets the name of the file (including extension). Forward or back slashes
- * are interpreted as directory changes
- *
- * @param fullPath    A full or partial path to the file. Ex: folderOne/folderTwo/file.txt
- * @return            The name of the file without any preceding directories. Ex: file.txt
- */
-Common::String getFileName(const Common::String &fullPath);
-
-/**
- * Converts a ZVision .RAW file to a .WAV
- * The .WAV will be created in the working directory and will overwrite any existing file
- *
- * @param inputFile     The path to the input .RAW file
- * @param outputFile    The name of the output .WAV file
- */
-void convertRawToWav(const Common::String &inputFile, ZVision *engine, const Common::String &outputFile);
-
 } // End of namespace ZVision
 
 #endif
-- 
cgit v1.2.3


From bbec6c913ac6ad4279e3549fc903b9c6e4521f50 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 01:58:07 +0200
Subject: ZVISION: Document some more cheats for ZGI

Thanks to marisa-chan for providing the location of those in pull
request #532
---
 engines/zvision/core/events.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index e3bcf6f09a..2c0e63bf5c 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -71,9 +71,8 @@ void ZVision::cheatCodes(uint8 key) {
 	pushKeyToCheatBuf(key);
 
 	if (getGameId() == GID_GRANDINQUISITOR) {
-
 		if (checkCode("IMNOTDEAF")) {
-			// Unknow cheat
+			// Unknown cheat
 			showDebugMsg(Common::String::format("IMNOTDEAF cheat or debug, not implemented"));
 		}
 
@@ -93,8 +92,12 @@ void ZVision::cheatCodes(uint8 key) {
 		if (checkCode("MIKESPANTS")) {
 			_scriptManager->changeLocation('g', 'j', 't', 'm', 0);
 		}
-	} else if (getGameId() == GID_NEMESIS) {
 
+		// There are 3 more cheats in script files:
+		// - "EAT ME": gjcr.scr
+		// - "WHOAMI": hp1e.scr
+		// - "HUISOK": uh1f.scr
+	} else if (getGameId() == GID_NEMESIS) {
 		if (checkCode("CHLOE")) {
 			_scriptManager->changeLocation('t', 'm', '2', 'g', 0);
 			_scriptManager->setStateValue(224, 1);
-- 
cgit v1.2.3


From f578a1b3342578594d9940894a525bf3983641ff Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 02:11:50 +0200
Subject: ZVISION: Move the key mapper function

---
 engines/zvision/core/events.cpp      | 106 +++++++++++++++++++++++++++-
 engines/zvision/module.mk            |   1 -
 engines/zvision/utility/win_keys.cpp | 129 -----------------------------------
 engines/zvision/utility/win_keys.h   |  32 ---------
 engines/zvision/zvision.h            |   3 +-
 5 files changed, 105 insertions(+), 166 deletions(-)
 delete mode 100644 engines/zvision/utility/win_keys.cpp
 delete mode 100644 engines/zvision/utility/win_keys.h

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 2c0e63bf5c..52d71c92f6 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -30,8 +30,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/animation/rlf_animation.h"
 #include "zvision/core/menu.h"
-#include "zvision/utility/win_keys.h"
-#include "zvision/core/menu.h"
 #include "zvision/sound/zork_raw.h"
 
 #include "common/events.h"
@@ -214,7 +212,7 @@ void ZVision::processEvents() {
 				break;
 			}
 
-			uint8 vkKey = VKkey(_event.kbd.keycode);
+			uint8 vkKey = getZvisionKey(_event.kbd.keycode);
 
 			_scriptManager->setStateValue(StateKey_KeyPress, vkKey);
 
@@ -342,4 +340,106 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 	}
 }
 
+uint8 ZVision::getZvisionKey(Common::KeyCode scummKeyCode) {
+	if (scummKeyCode >= Common::KEYCODE_a && scummKeyCode <= Common::KEYCODE_z)
+		return 0x41 + scummKeyCode - Common::KEYCODE_a;
+	if (scummKeyCode >= Common::KEYCODE_0 && scummKeyCode <= Common::KEYCODE_9)
+		return 0x30 + scummKeyCode - Common::KEYCODE_0;
+	if (scummKeyCode >= Common::KEYCODE_F1 && scummKeyCode <= Common::KEYCODE_F15)
+		return 0x70 + scummKeyCode - Common::KEYCODE_F1;
+	if (scummKeyCode >= Common::KEYCODE_KP0 && scummKeyCode <= Common::KEYCODE_KP9)
+		return 0x60 + scummKeyCode - Common::KEYCODE_KP0;
+
+	switch (scummKeyCode) {
+	case Common::KEYCODE_BACKSPACE:
+		return 0x8;
+	case Common::KEYCODE_TAB:
+		return 0x9;
+	case Common::KEYCODE_CLEAR:
+		return 0xC;
+	case Common::KEYCODE_RETURN:
+		return 0xD;
+	case Common::KEYCODE_CAPSLOCK:
+		return 0x14;
+	case Common::KEYCODE_ESCAPE:
+		return 0x1B;
+	case Common::KEYCODE_SPACE:
+		return 0x20;
+	case Common::KEYCODE_PAGEUP:
+		return 0x21;
+	case Common::KEYCODE_PAGEDOWN:
+		return 0x22;
+	case Common::KEYCODE_END:
+		return 0x23;
+	case Common::KEYCODE_HOME:
+		return 0x24;
+	case Common::KEYCODE_LEFT:
+		return 0x25;
+	case Common::KEYCODE_UP:
+		return 0x26;
+	case Common::KEYCODE_RIGHT:
+		return 0x27;
+	case Common::KEYCODE_DOWN:
+		return 0x28;
+	case Common::KEYCODE_PRINT:
+		return 0x2A;
+	case Common::KEYCODE_INSERT:
+		return 0x2D;
+	case Common::KEYCODE_DELETE:
+		return 0x2E;
+	case Common::KEYCODE_HELP:
+		return 0x2F;
+	case Common::KEYCODE_KP_MULTIPLY:
+		return 0x6A;
+	case Common::KEYCODE_KP_PLUS:
+		return 0x6B;
+	case Common::KEYCODE_KP_MINUS:
+		return 0x6D;
+	case Common::KEYCODE_KP_PERIOD:
+		return 0x6E;
+	case Common::KEYCODE_KP_DIVIDE:
+		return 0x6F;
+	case Common::KEYCODE_NUMLOCK:
+		return 0x90;
+	case Common::KEYCODE_SCROLLOCK:
+		return 0x91;
+	case Common::KEYCODE_LSHIFT:
+		return 0xA0;
+	case Common::KEYCODE_RSHIFT:
+		return 0xA1;
+	case Common::KEYCODE_LCTRL:
+		return 0xA2;
+	case Common::KEYCODE_RCTRL:
+		return 0xA3;
+	case Common::KEYCODE_MENU:
+		return 0xA5;
+	case Common::KEYCODE_LEFTBRACKET:
+		return 0xDB;
+	case Common::KEYCODE_RIGHTBRACKET:
+		return 0xDD;
+	case Common::KEYCODE_SEMICOLON:
+		return 0xBA;
+	case Common::KEYCODE_BACKSLASH:
+		return 0xDC;
+	case Common::KEYCODE_QUOTE:
+		return 0xDE;
+	case Common::KEYCODE_SLASH:
+		return 0xBF;
+	case Common::KEYCODE_TILDE:
+		return 0xC0;
+	case Common::KEYCODE_COMMA:
+		return 0xBC;
+	case Common::KEYCODE_PERIOD:
+		return 0xBE;
+	case Common::KEYCODE_MINUS:
+		return 0xBD;
+	case Common::KEYCODE_PLUS:
+		return 0xBB;
+	default:
+		return 0;
+	}
+
+	return 0;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 140074c326..5efd6d4a29 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -48,7 +48,6 @@ MODULE_OBJS := \
 	utility/clock.o \
 	utility/lzss_read_stream.o \
 	utility/utility.o \
-	utility/win_keys.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o
diff --git a/engines/zvision/utility/win_keys.cpp b/engines/zvision/utility/win_keys.cpp
deleted file mode 100644
index 86ed7c596f..0000000000
--- a/engines/zvision/utility/win_keys.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/keyboard.h"
-
-namespace ZVision {
-
-uint8 VKkey(Common::KeyCode scummKeyCode) {
-	if (scummKeyCode >= Common::KEYCODE_a && scummKeyCode <= Common::KEYCODE_z)
-		return 0x41 + scummKeyCode - Common::KEYCODE_a;
-	if (scummKeyCode >= Common::KEYCODE_0 && scummKeyCode <= Common::KEYCODE_9)
-		return 0x30 + scummKeyCode - Common::KEYCODE_0;
-	if (scummKeyCode >= Common::KEYCODE_F1 && scummKeyCode <= Common::KEYCODE_F15)
-		return 0x70 + scummKeyCode - Common::KEYCODE_F1;
-	if (scummKeyCode >= Common::KEYCODE_KP0 && scummKeyCode <= Common::KEYCODE_KP9)
-		return 0x60 + scummKeyCode - Common::KEYCODE_KP0;
-
-	switch (scummKeyCode) {
-	case Common::KEYCODE_BACKSPACE:
-		return 0x8;
-	case Common::KEYCODE_TAB:
-		return 0x9;
-	case Common::KEYCODE_CLEAR:
-		return 0xC;
-	case Common::KEYCODE_RETURN:
-		return 0xD;
-	case Common::KEYCODE_CAPSLOCK:
-		return 0x14;
-	case Common::KEYCODE_ESCAPE:
-		return 0x1B;
-	case Common::KEYCODE_SPACE:
-		return 0x20;
-	case Common::KEYCODE_PAGEUP:
-		return 0x21;
-	case Common::KEYCODE_PAGEDOWN:
-		return 0x22;
-	case Common::KEYCODE_END:
-		return 0x23;
-	case Common::KEYCODE_HOME:
-		return 0x24;
-	case Common::KEYCODE_LEFT:
-		return 0x25;
-	case Common::KEYCODE_UP:
-		return 0x26;
-	case Common::KEYCODE_RIGHT:
-		return 0x27;
-	case Common::KEYCODE_DOWN:
-		return 0x28;
-	case Common::KEYCODE_PRINT:
-		return 0x2A;
-	case Common::KEYCODE_INSERT:
-		return 0x2D;
-	case Common::KEYCODE_DELETE:
-		return 0x2E;
-	case Common::KEYCODE_HELP:
-		return 0x2F;
-	case Common::KEYCODE_KP_MULTIPLY:
-		return 0x6A;
-	case Common::KEYCODE_KP_PLUS:
-		return 0x6B;
-	case Common::KEYCODE_KP_MINUS:
-		return 0x6D;
-	case Common::KEYCODE_KP_PERIOD:
-		return 0x6E;
-	case Common::KEYCODE_KP_DIVIDE:
-		return 0x6F;
-	case Common::KEYCODE_NUMLOCK:
-		return 0x90;
-	case Common::KEYCODE_SCROLLOCK:
-		return 0x91;
-	case Common::KEYCODE_LSHIFT:
-		return 0xA0;
-	case Common::KEYCODE_RSHIFT:
-		return 0xA1;
-	case Common::KEYCODE_LCTRL:
-		return 0xA2;
-	case Common::KEYCODE_RCTRL:
-		return 0xA3;
-	case Common::KEYCODE_MENU:
-		return 0xA5;
-	case Common::KEYCODE_LEFTBRACKET:
-		return 0xDB;
-	case Common::KEYCODE_RIGHTBRACKET:
-		return 0xDD;
-	case Common::KEYCODE_SEMICOLON:
-		return 0xBA;
-	case Common::KEYCODE_BACKSLASH:
-		return 0xDC;
-	case Common::KEYCODE_QUOTE:
-		return 0xDE;
-	case Common::KEYCODE_SLASH:
-		return 0xBF;
-	case Common::KEYCODE_TILDE:
-		return 0xC0;
-	case Common::KEYCODE_COMMA:
-		return 0xBC;
-	case Common::KEYCODE_PERIOD:
-		return 0xBE;
-	case Common::KEYCODE_MINUS:
-		return 0xBD;
-	case Common::KEYCODE_PLUS:
-		return 0xBB;
-	default:
-		return 0;
-	}
-
-	return 0;
-}
-
-}
diff --git a/engines/zvision/utility/win_keys.h b/engines/zvision/utility/win_keys.h
deleted file mode 100644
index 53d76c4d5f..0000000000
--- a/engines/zvision/utility/win_keys.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_WIN_KEYS_H
-#define ZVISION_WIN_KEYS_H
-
-#include "common/keyboard.h"
-
-namespace ZVision {
-uint8 VKkey(Common::KeyCode scummKeyCode);
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index ae49f0640f..ca6c8e10e4 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -163,6 +163,8 @@ public:
 		return _gameDescription->gameId;
 	}
 
+	uint8 getZvisionKey(Common::KeyCode scummKeyCode);
+
 	/**
 	 * Play a video until it is finished. This is a blocking call. It will call
 	 * _clock.stop() when the video starts and _clock.start() when the video finishes.
@@ -196,7 +198,6 @@ public:
 
 	void checkBorders();
 	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
-
 private:
 	void initialize();
 	void initFonts();
-- 
cgit v1.2.3


From f2eee1759f922640b08ac3420f50f0a9c05e0588 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 02:16:14 +0200
Subject: ZVISION: Move the ZfsArchive class

---
 engines/zvision/archives/zfs_archive.cpp | 155 -------------------------------
 engines/zvision/archives/zfs_archive.h   | 125 -------------------------
 engines/zvision/core/search_manager.cpp  |   6 +-
 engines/zvision/module.mk                |   2 +-
 engines/zvision/utility/zfs_archive.cpp  | 154 ++++++++++++++++++++++++++++++
 engines/zvision/utility/zfs_archive.h    | 125 +++++++++++++++++++++++++
 engines/zvision/zvision.cpp              |   3 +-
 7 files changed, 284 insertions(+), 286 deletions(-)
 delete mode 100644 engines/zvision/archives/zfs_archive.cpp
 delete mode 100644 engines/zvision/archives/zfs_archive.h
 create mode 100644 engines/zvision/utility/zfs_archive.cpp
 create mode 100644 engines/zvision/utility/zfs_archive.h

diff --git a/engines/zvision/archives/zfs_archive.cpp b/engines/zvision/archives/zfs_archive.cpp
deleted file mode 100644
index 416719b8f2..0000000000
--- a/engines/zvision/archives/zfs_archive.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/archives/zfs_archive.h"
-
-#include "common/memstream.h"
-#include "common/debug.h"
-#include "common/file.h"
-
-namespace ZVision {
-
-ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {
-	Common::File zfsFile;
-
-	if (!zfsFile.open(_fileName)) {
-		warning("ZFSArchive::ZFSArchive(): Could not find the archive file");
-		return;
-	}
-
-	readHeaders(&zfsFile);
-
-	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
-}
-
-ZfsArchive::ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream) : _fileName(fileName) {
-	readHeaders(stream);
-
-	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
-}
-
-ZfsArchive::~ZfsArchive() {
-	debug(1, "ZfsArchive Destructor Called");
-	ZfsEntryHeaderMap::iterator it = _entryHeaders.begin();
-	for (; it != _entryHeaders.end(); ++it) {
-		delete it->_value;
-	}
-}
-
-void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
-	// Don't do a straight struct cast since we can't guarantee endianness
-	_header.magic = stream->readUint32LE();
-	_header.unknown1 = stream->readUint32LE();
-	_header.maxNameLength = stream->readUint32LE();
-	_header.filesPerBlock = stream->readUint32LE();
-	_header.fileCount = stream->readUint32LE();
-	_header.xorKey[0] = stream->readByte();
-	_header.xorKey[1] = stream->readByte();
-	_header.xorKey[2] = stream->readByte();
-	_header.xorKey[3] = stream->readByte();
-	_header.fileSectionOffset = stream->readUint32LE();
-
-	uint32 nextOffset;
-
-	do {
-		// Read the offset to the next block
-		nextOffset = stream->readUint32LE();
-
-		// Read in each entry header
-		for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
-			ZfsEntryHeader entryHeader;
-
-			entryHeader.name = readEntryName(stream);
-			entryHeader.offset = stream->readUint32LE();
-			entryHeader.id = stream->readUint32LE();
-			entryHeader.size = stream->readUint32LE();
-			entryHeader.time = stream->readUint32LE();
-			entryHeader.unknown = stream->readUint32LE();
-
-			if (entryHeader.size != 0)
-				_entryHeaders[entryHeader.name] = new ZfsEntryHeader(entryHeader);
-		}
-
-		// Seek to the next block of headers
-		stream->seek(nextOffset);
-	} while (nextOffset != 0);
-}
-
-Common::String ZfsArchive::readEntryName(Common::SeekableReadStream *stream) const {
-	// Entry Names are at most 16 bytes and are null padded
-	char buffer[16];
-	stream->read(buffer, 16);
-
-	return Common::String(buffer);
-}
-
-bool ZfsArchive::hasFile(const Common::String &name) const {
-	return _entryHeaders.contains(name);
-}
-
-int ZfsArchive::listMembers(Common::ArchiveMemberList &list) const {
-	int matches = 0;
-
-	for (ZfsEntryHeaderMap::const_iterator it = _entryHeaders.begin(); it != _entryHeaders.end(); ++it) {
-		list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(it->_value->name, this)));
-		matches++;
-	}
-
-	return matches;
-}
-
-const Common::ArchiveMemberPtr ZfsArchive::getMember(const Common::String &name) const {
-	if (!_entryHeaders.contains(name))
-		return Common::ArchiveMemberPtr();
-
-	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
-}
-
-Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::String &name) const {
-	if (!_entryHeaders.contains(name)) {
-		return 0;
-	}
-
-	ZfsEntryHeader *entryHeader = _entryHeaders[name];
-
-	Common::File zfsArchive;
-	zfsArchive.open(_fileName);
-	zfsArchive.seek(entryHeader->offset);
-
-	// This *HAS* to be malloc (not new[]) because MemoryReadStream uses free() to free the memory
-	byte *buffer = (byte *)malloc(entryHeader->size);
-	zfsArchive.read(buffer, entryHeader->size);
-	// Decrypt the data in place
-	if (_header.xorKey != 0)
-		unXor(buffer, entryHeader->size, _header.xorKey);
-
-	return new Common::MemoryReadStream(buffer, entryHeader->size, DisposeAfterUse::YES);
-}
-
-void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
-	for (uint32 i = 0; i < length; ++i)
-		buffer[i] ^= xorKey[i % 4];
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/archives/zfs_archive.h b/engines/zvision/archives/zfs_archive.h
deleted file mode 100644
index 571591a6d1..0000000000
--- a/engines/zvision/archives/zfs_archive.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_ZFS_ARCHIVE_H
-#define ZVISION_ZFS_ARCHIVE_H
-
-#include "common/archive.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-struct ZfsHeader {
-	uint32 magic;
-	uint32 unknown1;
-	uint32 maxNameLength;
-	uint32 filesPerBlock;
-	uint32 fileCount;
-	byte xorKey[4];
-	uint32 fileSectionOffset;
-};
-
-struct ZfsEntryHeader {
-	Common::String name;
-	uint32 offset;
-	uint32 id;
-	uint32 size;
-	uint32 time;
-	uint32 unknown;
-};
-
-typedef Common::HashMap<Common::String, ZfsEntryHeader *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
-
-class ZfsArchive : public Common::Archive {
-public:
-	ZfsArchive(const Common::String &fileName);
-	ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream);
-	~ZfsArchive();
-
-	/**
-	 * Check if a member with the given name is present in the Archive.
-	 * Patterns are not allowed, as this is meant to be a quick File::exists()
-	 * replacement.
-	 */
-	bool hasFile(const Common::String &fileName) const;
-
-	/**
-	 * Add all members of the Archive to list.
-	 * Must only append to list, and not remove elements from it.
-	 *
-	 * @return    The number of names added to list
-	 */
-	int listMembers(Common::ArchiveMemberList &list) const;
-
-	/**
-	 * Returns a ArchiveMember representation of the given file.
-	 */
-	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
-
-	/**
-	 * Create a stream bound to a member with the specified name in the
-	 * archive. If no member with this name exists, 0 is returned.
-	 *
-	 * @return    The newly created input stream
-	 */
-	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
-
-private:
-	const Common::String _fileName;
-	ZfsHeader _header;
-	ZfsEntryHeaderMap _entryHeaders;
-
-	/**
-	 * Parses the zfs file into file entry headers that can be used later
-	 * to get the entry data.
-	 *
-	 * @param stream    The contents of the zfs file
-	 */
-	void readHeaders(Common::SeekableReadStream *stream);
-
-	/**
-	 * Entry names are contained within a 16 byte block. This reads the block
-	 * and converts it the name to a Common::String
-	 *
-	 * @param stream    The zfs file stream
-	 * @return          The entry file name
-	 */
-	Common::String readEntryName(Common::SeekableReadStream *stream) const;
-
-	/**
-	 * ZFS file entries can be encrypted using XOR encoding. This method
-	 * decodes the buffer in place using the supplied xorKey.
-	 *
-	 * @param buffer    The data to decode
-	 * @param length    Length of buffer
-	 */
-	void unXor(byte *buffer, uint32 length, const byte *xorKey) const;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
index 1e9643ddbb..9c5d8fb323 100644
--- a/engines/zvision/core/search_manager.cpp
+++ b/engines/zvision/core/search_manager.cpp
@@ -21,12 +21,12 @@
 */
 
 #include "common/debug.h"
-
-#include "zvision/core/search_manager.h"
-#include "zvision/archives/zfs_archive.h"
 #include "common/fs.h"
 #include "common/stream.h"
 
+#include "zvision/core/search_manager.h"
+#include "zvision/utility/zfs_archive.h"
+
 namespace ZVision {
 
 SearchManager::SearchManager(const Common::String &rootPath, int depth) {
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 5efd6d4a29..607a9be4ed 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -3,7 +3,6 @@ MODULE := engines/zvision
 MODULE_OBJS := \
 	animation/meta_animation.o \
 	animation/rlf_animation.o \
-	archives/zfs_archive.o \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
@@ -48,6 +47,7 @@ MODULE_OBJS := \
 	utility/clock.o \
 	utility/lzss_read_stream.o \
 	utility/utility.o \
+	utility/zfs_archive.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o
diff --git a/engines/zvision/utility/zfs_archive.cpp b/engines/zvision/utility/zfs_archive.cpp
new file mode 100644
index 0000000000..13b0168e1c
--- /dev/null
+++ b/engines/zvision/utility/zfs_archive.cpp
@@ -0,0 +1,154 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/memstream.h"
+#include "common/debug.h"
+#include "common/file.h"
+
+#include "zvision/utility/zfs_archive.h"
+
+namespace ZVision {
+
+ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {
+	Common::File zfsFile;
+
+	if (!zfsFile.open(_fileName)) {
+		warning("ZFSArchive::ZFSArchive(): Could not find the archive file");
+		return;
+	}
+
+	readHeaders(&zfsFile);
+
+	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
+}
+
+ZfsArchive::ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream) : _fileName(fileName) {
+	readHeaders(stream);
+
+	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
+}
+
+ZfsArchive::~ZfsArchive() {
+	debug(1, "ZfsArchive Destructor Called");
+	ZfsEntryHeaderMap::iterator it = _entryHeaders.begin();
+	for (; it != _entryHeaders.end(); ++it) {
+		delete it->_value;
+	}
+}
+
+void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
+	// Don't do a straight struct cast since we can't guarantee endianness
+	_header.magic = stream->readUint32LE();
+	_header.unknown1 = stream->readUint32LE();
+	_header.maxNameLength = stream->readUint32LE();
+	_header.filesPerBlock = stream->readUint32LE();
+	_header.fileCount = stream->readUint32LE();
+	_header.xorKey[0] = stream->readByte();
+	_header.xorKey[1] = stream->readByte();
+	_header.xorKey[2] = stream->readByte();
+	_header.xorKey[3] = stream->readByte();
+	_header.fileSectionOffset = stream->readUint32LE();
+
+	uint32 nextOffset;
+
+	do {
+		// Read the offset to the next block
+		nextOffset = stream->readUint32LE();
+
+		// Read in each entry header
+		for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
+			ZfsEntryHeader entryHeader;
+
+			entryHeader.name = readEntryName(stream);
+			entryHeader.offset = stream->readUint32LE();
+			entryHeader.id = stream->readUint32LE();
+			entryHeader.size = stream->readUint32LE();
+			entryHeader.time = stream->readUint32LE();
+			entryHeader.unknown = stream->readUint32LE();
+
+			if (entryHeader.size != 0)
+				_entryHeaders[entryHeader.name] = new ZfsEntryHeader(entryHeader);
+		}
+
+		// Seek to the next block of headers
+		stream->seek(nextOffset);
+	} while (nextOffset != 0);
+}
+
+Common::String ZfsArchive::readEntryName(Common::SeekableReadStream *stream) const {
+	// Entry Names are at most 16 bytes and are null padded
+	char buffer[16];
+	stream->read(buffer, 16);
+
+	return Common::String(buffer);
+}
+
+bool ZfsArchive::hasFile(const Common::String &name) const {
+	return _entryHeaders.contains(name);
+}
+
+int ZfsArchive::listMembers(Common::ArchiveMemberList &list) const {
+	int matches = 0;
+
+	for (ZfsEntryHeaderMap::const_iterator it = _entryHeaders.begin(); it != _entryHeaders.end(); ++it) {
+		list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(it->_value->name, this)));
+		matches++;
+	}
+
+	return matches;
+}
+
+const Common::ArchiveMemberPtr ZfsArchive::getMember(const Common::String &name) const {
+	if (!_entryHeaders.contains(name))
+		return Common::ArchiveMemberPtr();
+
+	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
+}
+
+Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::String &name) const {
+	if (!_entryHeaders.contains(name)) {
+		return 0;
+	}
+
+	ZfsEntryHeader *entryHeader = _entryHeaders[name];
+
+	Common::File zfsArchive;
+	zfsArchive.open(_fileName);
+	zfsArchive.seek(entryHeader->offset);
+
+	// This *HAS* to be malloc (not new[]) because MemoryReadStream uses free() to free the memory
+	byte *buffer = (byte *)malloc(entryHeader->size);
+	zfsArchive.read(buffer, entryHeader->size);
+	// Decrypt the data in place
+	if (_header.xorKey != 0)
+		unXor(buffer, entryHeader->size, _header.xorKey);
+
+	return new Common::MemoryReadStream(buffer, entryHeader->size, DisposeAfterUse::YES);
+}
+
+void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
+	for (uint32 i = 0; i < length; ++i)
+		buffer[i] ^= xorKey[i % 4];
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/utility/zfs_archive.h b/engines/zvision/utility/zfs_archive.h
new file mode 100644
index 0000000000..571591a6d1
--- /dev/null
+++ b/engines/zvision/utility/zfs_archive.h
@@ -0,0 +1,125 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_ZFS_ARCHIVE_H
+#define ZVISION_ZFS_ARCHIVE_H
+
+#include "common/archive.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+
+struct ZfsHeader {
+	uint32 magic;
+	uint32 unknown1;
+	uint32 maxNameLength;
+	uint32 filesPerBlock;
+	uint32 fileCount;
+	byte xorKey[4];
+	uint32 fileSectionOffset;
+};
+
+struct ZfsEntryHeader {
+	Common::String name;
+	uint32 offset;
+	uint32 id;
+	uint32 size;
+	uint32 time;
+	uint32 unknown;
+};
+
+typedef Common::HashMap<Common::String, ZfsEntryHeader *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
+
+class ZfsArchive : public Common::Archive {
+public:
+	ZfsArchive(const Common::String &fileName);
+	ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream);
+	~ZfsArchive();
+
+	/**
+	 * Check if a member with the given name is present in the Archive.
+	 * Patterns are not allowed, as this is meant to be a quick File::exists()
+	 * replacement.
+	 */
+	bool hasFile(const Common::String &fileName) const;
+
+	/**
+	 * Add all members of the Archive to list.
+	 * Must only append to list, and not remove elements from it.
+	 *
+	 * @return    The number of names added to list
+	 */
+	int listMembers(Common::ArchiveMemberList &list) const;
+
+	/**
+	 * Returns a ArchiveMember representation of the given file.
+	 */
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
+
+	/**
+	 * Create a stream bound to a member with the specified name in the
+	 * archive. If no member with this name exists, 0 is returned.
+	 *
+	 * @return    The newly created input stream
+	 */
+	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
+
+private:
+	const Common::String _fileName;
+	ZfsHeader _header;
+	ZfsEntryHeaderMap _entryHeaders;
+
+	/**
+	 * Parses the zfs file into file entry headers that can be used later
+	 * to get the entry data.
+	 *
+	 * @param stream    The contents of the zfs file
+	 */
+	void readHeaders(Common::SeekableReadStream *stream);
+
+	/**
+	 * Entry names are contained within a 16 byte block. This reads the block
+	 * and converts it the name to a Common::String
+	 *
+	 * @param stream    The zfs file stream
+	 * @return          The entry file name
+	 */
+	Common::String readEntryName(Common::SeekableReadStream *stream) const;
+
+	/**
+	 * ZFS file entries can be encrypted using XOR encoding. This method
+	 * decodes the buffer in place using the supplied xorKey.
+	 *
+	 * @param buffer    The data to decode
+	 * @param length    Length of buffer
+	 */
+	void unXor(byte *buffer, uint32 length, const byte *xorKey) const;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 7a5e50f491..d981d14838 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -23,20 +23,19 @@
 #include "common/scummsys.h"
 
 #include "zvision/zvision.h"
-
 #include "zvision/core/console.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/text/string_manager.h"
-#include "zvision/archives/zfs_archive.h"
 #include "zvision/detection.h"
 #include "zvision/core/menu.h"
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/fonts/truetype_font.h"
 #include "zvision/core/midi.h"
+#include "zvision/utility/zfs_archive.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
-- 
cgit v1.2.3


From f0ce0b498fe62fa97428ebcd36caa2ae883eb775 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 02:29:08 +0200
Subject: ZVISION: Move the TruetypeFont class

---
 engines/zvision/fonts/truetype_font.cpp         | 344 ------------------------
 engines/zvision/fonts/truetype_font.h           | 123 ---------
 engines/zvision/graphics/render_manager.h       |   2 +-
 engines/zvision/graphics/truetype_font.cpp      | 341 +++++++++++++++++++++++
 engines/zvision/graphics/truetype_font.h        | 123 +++++++++
 engines/zvision/module.mk                       |   2 +-
 engines/zvision/scripting/sidefx/ttytext_node.h |   2 +-
 engines/zvision/text/string_manager.cpp         |  13 +-
 engines/zvision/text/string_manager.h           |   2 +-
 engines/zvision/text/text.cpp                   |   8 +-
 engines/zvision/text/text.h                     |   2 +-
 engines/zvision/zvision.cpp                     |   2 +-
 12 files changed, 477 insertions(+), 487 deletions(-)
 delete mode 100644 engines/zvision/fonts/truetype_font.cpp
 delete mode 100644 engines/zvision/fonts/truetype_font.h
 create mode 100644 engines/zvision/graphics/truetype_font.cpp
 create mode 100644 engines/zvision/graphics/truetype_font.h

diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp
deleted file mode 100644
index a9363d8923..0000000000
--- a/engines/zvision/fonts/truetype_font.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/fonts/truetype_font.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-
-#include "common/config-manager.h"
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/system.h"
-#include "common/unzip.h"
-
-#include "graphics/font.h"
-#include "graphics/fonts/ttf.h"
-#include "graphics/surface.h"
-
-namespace ZVision {
-
-TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
-	: _engine(engine),
-	  _fontHeight(fontHeight),
-	  _font(0),
-	  _lineHeight(0),
-	  _maxCharWidth(0),
-	  _maxCharHeight(0) {
-}
-
-TruetypeFont::~TruetypeFont(void) {
-	delete _font;
-}
-
-bool TruetypeFont::loadFile(const Common::String &filename) {
-	Common::File file;
-
-	bool fileOpened = false;
-	if (!Common::File::exists(filename)) {
-		debug("TTF font file %s was not found. Reverting to arial.ttf", filename.c_str());
-		fileOpened = file.open("arial.ttf");
-	} else {
-		fileOpened = file.open(filename);
-	}
-
-	if (!fileOpened) {
-		debug("TTF file could not be opened");
-		return false;
-	}
-
-	_font = Graphics::loadTTFFont(file, _fontHeight);
-	_lineHeight = _font->getFontHeight();
-
-	return true;
-}
-
-Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap) {
-	if (text.equals("")) {
-		return nullptr;
-	}
-
-	Graphics::Surface *surface = new Graphics::Surface();
-
-	if (!wrap) {
-		int width = MIN(_font->getStringWidth(text), maxWidth);
-		surface->create(width, _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-		// TODO: Add better alpha support by getting the pixels from the backbuffer.
-		// However doing that requires some kind of caching system so future text doesn't try to use this text as it's alpha background.
-		surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
-
-		_font->drawString(surface, text, 0, 0, maxWidth, textColor, align);
-		return surface;
-	}
-
-	Common::Array<Common::String> lines;
-	_font->wordWrapText(text, maxWidth, lines);
-
-	while (maxHeight > 0 && (int)lines.size() * _lineHeight > maxHeight) {
-		lines.pop_back();
-	}
-	if (lines.size() == 0) {
-		delete surface;
-		return nullptr;
-	}
-
-	surface->create(maxWidth, lines.size() * _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-	surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
-
-	int heightOffset = 0;
-	for (Common::Array<Common::String>::iterator it = lines.begin(); it != lines.end(); it++) {
-		_font->drawString(surface, *it, 0, 0 + heightOffset, maxWidth, textColor, align);
-		heightOffset += _lineHeight;
-	}
-
-	return surface;
-}
-
-StyledTTFont::StyledTTFont(ZVision *engine) {
-	_engine = engine;
-	_style = 0;
-	_font = NULL;
-	_lineHeight = 0;
-}
-
-StyledTTFont::~StyledTTFont() {
-	if (_font)
-		delete _font;
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
-	_style = style;
-	return loadFont(fontName, point);
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
-	Common::String newFontName;
-	if (fontName.matchString("*times new roman*", true) || fontName.matchString("*times*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "timesbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "timesbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "timesi.ttf";
-		else
-			newFontName = "times.ttf";
-
-	} else if (fontName.matchString("*courier new*", true) || fontName.matchString("*courier*", true) || fontName.matchString("*ZorkDeath*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "courbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "courbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "couri.ttf";
-		else
-			newFontName = "cour.ttf";
-
-	} else if (fontName.matchString("*century schoolbook*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "censcbkbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "censcbkbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "censcbki.ttf";
-		else
-			newFontName = "censcbk.ttf";
-
-	} else if (fontName.matchString("*garamond*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "garabi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "garabd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "garai.ttf";
-		else
-			newFontName = "gara.ttf";
-
-	} else if (fontName.matchString("*arial*", true) || fontName.matchString("*ZorkNormal*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "arialbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "arialbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "ariali.ttf";
-		else
-			newFontName = "arial.ttf";
-
-	} else {
-		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
-		newFontName = "arial.ttf";
-	}
-
-	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
-
-	Common::File *file = _engine->getSearchManager()->openFile(newFontName);
-
-	if (!file) {
-		Common::SeekableReadStream *themeFile = nullptr;
-		if (ConfMan.hasKey("themepath")) {
-			Common::FSNode themePath(ConfMan.get("themepath"));
-			if (themePath.exists()) {
-				Common::FSNode scummModern = themePath.getChild("scummmodern.zip");
-				if (scummModern.exists()) {
-					themeFile = scummModern.createReadStream();
-				}
-			}
-		}
-		if (!themeFile) { // Fallback : Search for ScummModern.zip in SearchMan.
-			themeFile = SearchMan.createReadStreamForMember("scummmodern.zip");
-		}
-		if (themeFile) {
-			Common::Archive *themeArchive = Common::makeZipArchive(themeFile);
-			if (themeArchive->hasFile("FreeSans.ttf")) {
-				Common::SeekableReadStream *stream = nullptr;
-				stream = themeArchive->createReadStreamForMember("FreeSans.ttf");
-				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-				if (_newFont) {
-					if (!_font)
-						delete _font;
-					_font = _newFont;
-				}
-				if (stream)
-					delete stream;
-			}
-			delete themeArchive;
-			themeArchive = nullptr;
-		}
-	} else {
-		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-		if (_newFont) {
-			if (!_font)
-				delete _font;
-			_font = _newFont;
-		}
-		delete file;
-	}
-
-	_fntName = fontName;
-	_lineHeight = point;
-
-	if (_font)
-		return true;
-	return false;
-}
-
-void StyledTTFont::setStyle(uint newStyle) {
-	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
-		_style = newStyle;
-		loadFont(_fntName, _lineHeight);
-	} else {
-		_style = newStyle;
-	}
-}
-
-int StyledTTFont::getFontHeight() {
-	if (_font)
-		return _font->getFontHeight();
-	return 0;
-}
-
-int StyledTTFont::getMaxCharWidth() {
-	if (_font)
-		return _font->getMaxCharWidth();
-	return 0;
-}
-
-int StyledTTFont::getCharWidth(byte chr) {
-	if (_font)
-		return _font->getCharWidth(chr);
-	return 0;
-}
-
-int StyledTTFont::getKerningOffset(byte left, byte right) {
-	if (_font)
-		return _font->getKerningOffset(left, right);
-	return 0;
-}
-
-void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
-	if (_font) {
-		_font->drawChar(dst, chr, x, y, color);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-	}
-}
-
-void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
-	if (_font) {
-		_font->drawString(dst, str, x, y, w, color, align);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-	}
-}
-
-int StyledTTFont::getStringWidth(const Common::String &str) {
-	if (_font)
-		return _font->getStringWidth(str);
-	return 0;
-}
-
-Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
-	Graphics::Surface *tmp = new Graphics::Surface;
-	if (_font) {
-		int16 w = _font->getStringWidth(str);
-		if (w && w < 1024) {
-			tmp->create(w, _font->getFontHeight(), _engine->_pixelFormat);
-			drawString(tmp, str, 0, 0, w, color);
-		}
-	}
-	return tmp;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h
deleted file mode 100644
index 30ef1c73a3..0000000000
--- a/engines/zvision/fonts/truetype_font.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-// This file is based on engines/wintermute/base/fonts/base_font_truetype.h/.cpp
-
-#ifndef ZVISION_TRUETYPE_FONT_H
-#define ZVISION_TRUETYPE_FONT_H
-
-#include "graphics/font.h"
-#include "graphics/pixelformat.h"
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-class TruetypeFont {
-public:
-	TruetypeFont(ZVision *engine, int32 fontHeight);
-	~TruetypeFont();
-
-private:
-	ZVision *_engine;
-	Graphics::Font *_font;
-	int _lineHeight;
-
-	size_t _maxCharWidth;
-	size_t _maxCharHeight;
-
-public:
-	int32 _fontHeight;
-
-public:
-	/**
-	 * Loads a .ttf file into memory. This must be called
-	 * before any calls to drawTextToSurface
-	 *
-	 * @param filename    The file name of the .ttf file to load
-	 */
-	bool loadFile(const Common::String &filename);
-	/**
-	 * Renders the supplied text to a Surface using 0x0 as the
-	 * background color.
-	 *
-	 * @param text         The to render
-	 * @param textColor    The color to render the text with
-	 * @param maxWidth     The max width the text should take up.
-	 * @param maxHeight    The max height the text should take up.
-	 * @param align        The alignment of the text within the bounds of maxWidth
-	 * @param wrap         If true, any words extending past maxWidth will wrap to a new line. If false, ellipses will be rendered to show that the text didn't fit
-	 * @return             A Surface containing the rendered text
-	 */
-	Graphics::Surface *drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap);
-};
-
-// Styled TTF
-class StyledTTFont {
-public:
-	StyledTTFont(ZVision *engine);
-	~StyledTTFont();
-
-	enum {
-		STTF_BOLD = 1,
-		STTF_ITALIC = 2,
-		STTF_UNDERLINE = 4,
-		STTF_STRIKEOUT = 8,
-		STTF_SHARP = 16
-	};
-
-private:
-	ZVision *_engine;
-	Graphics::Font *_font;
-	int _lineHeight;
-	uint _style;
-	Common::String _fntName;
-
-public:
-	bool loadFont(const Common::String &fontName, int32 point);
-	bool loadFont(const Common::String &fontName, int32 point, uint style);
-	void setStyle(uint newStyle);
-
-	int getFontHeight();
-	int getMaxCharWidth();
-	int getCharWidth(byte chr);
-	int getKerningOffset(byte left, byte right);
-
-	void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color);
-
-	void drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align = Graphics::kTextAlignLeft);
-	int getStringWidth(const Common::String &str);
-
-	Graphics::Surface *renderSolidText(const Common::String &str, uint32 color);
-
-	bool isLoaded() {
-		return _font != NULL;
-	};
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 39809c65a4..879a8643ce 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_RENDER_MANAGER_H
 
 #include "zvision/graphics/render_table.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 #include "common/rect.h"
 #include "common/hashmap.h"
diff --git a/engines/zvision/graphics/truetype_font.cpp b/engines/zvision/graphics/truetype_font.cpp
new file mode 100644
index 0000000000..1a0e92087c
--- /dev/null
+++ b/engines/zvision/graphics/truetype_font.cpp
@@ -0,0 +1,341 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/file.h"
+#include "common/system.h"
+#include "common/unzip.h"
+#include "graphics/font.h"
+#include "graphics/fonts/ttf.h"
+#include "graphics/surface.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/truetype_font.h"
+
+namespace ZVision {
+
+TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
+	: _engine(engine),
+	  _fontHeight(fontHeight),
+	  _font(0),
+	  _lineHeight(0),
+	  _maxCharWidth(0),
+	  _maxCharHeight(0) {
+}
+
+TruetypeFont::~TruetypeFont(void) {
+	delete _font;
+}
+
+bool TruetypeFont::loadFile(const Common::String &filename) {
+	Common::File file;
+
+	bool fileOpened = false;
+	if (!Common::File::exists(filename)) {
+		debug("TTF font file %s was not found. Reverting to arial.ttf", filename.c_str());
+		fileOpened = file.open("arial.ttf");
+	} else {
+		fileOpened = file.open(filename);
+	}
+
+	if (!fileOpened) {
+		debug("TTF file could not be opened");
+		return false;
+	}
+
+	_font = Graphics::loadTTFFont(file, _fontHeight);
+	_lineHeight = _font->getFontHeight();
+
+	return true;
+}
+
+Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap) {
+	if (text.equals("")) {
+		return nullptr;
+	}
+
+	Graphics::Surface *surface = new Graphics::Surface();
+
+	if (!wrap) {
+		int width = MIN(_font->getStringWidth(text), maxWidth);
+		surface->create(width, _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
+		// TODO: Add better alpha support by getting the pixels from the backbuffer.
+		// However doing that requires some kind of caching system so future text doesn't try to use this text as it's alpha background.
+		surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
+
+		_font->drawString(surface, text, 0, 0, maxWidth, textColor, align);
+		return surface;
+	}
+
+	Common::Array<Common::String> lines;
+	_font->wordWrapText(text, maxWidth, lines);
+
+	while (maxHeight > 0 && (int)lines.size() * _lineHeight > maxHeight) {
+		lines.pop_back();
+	}
+	if (lines.size() == 0) {
+		delete surface;
+		return nullptr;
+	}
+
+	surface->create(maxWidth, lines.size() * _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
+	surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
+
+	int heightOffset = 0;
+	for (Common::Array<Common::String>::iterator it = lines.begin(); it != lines.end(); it++) {
+		_font->drawString(surface, *it, 0, 0 + heightOffset, maxWidth, textColor, align);
+		heightOffset += _lineHeight;
+	}
+
+	return surface;
+}
+
+StyledTTFont::StyledTTFont(ZVision *engine) {
+	_engine = engine;
+	_style = 0;
+	_font = NULL;
+	_lineHeight = 0;
+}
+
+StyledTTFont::~StyledTTFont() {
+	if (_font)
+		delete _font;
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
+	_style = style;
+	return loadFont(fontName, point);
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
+	Common::String newFontName;
+	if (fontName.matchString("*times new roman*", true) || fontName.matchString("*times*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "timesbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "timesbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "timesi.ttf";
+		else
+			newFontName = "times.ttf";
+
+	} else if (fontName.matchString("*courier new*", true) || fontName.matchString("*courier*", true) || fontName.matchString("*ZorkDeath*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "courbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "courbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "couri.ttf";
+		else
+			newFontName = "cour.ttf";
+
+	} else if (fontName.matchString("*century schoolbook*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "censcbkbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "censcbkbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "censcbki.ttf";
+		else
+			newFontName = "censcbk.ttf";
+
+	} else if (fontName.matchString("*garamond*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "garabi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "garabd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "garai.ttf";
+		else
+			newFontName = "gara.ttf";
+
+	} else if (fontName.matchString("*arial*", true) || fontName.matchString("*ZorkNormal*", true)) {
+		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
+			newFontName = "arialbi.ttf";
+		else if (_style & STTF_BOLD)
+			newFontName = "arialbd.ttf";
+		else if (_style & STTF_ITALIC)
+			newFontName = "ariali.ttf";
+		else
+			newFontName = "arial.ttf";
+
+	} else {
+		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
+		newFontName = "arial.ttf";
+	}
+
+	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
+
+	Common::File *file = _engine->getSearchManager()->openFile(newFontName);
+
+	if (!file) {
+		Common::SeekableReadStream *themeFile = nullptr;
+		if (ConfMan.hasKey("themepath")) {
+			Common::FSNode themePath(ConfMan.get("themepath"));
+			if (themePath.exists()) {
+				Common::FSNode scummModern = themePath.getChild("scummmodern.zip");
+				if (scummModern.exists()) {
+					themeFile = scummModern.createReadStream();
+				}
+			}
+		}
+		if (!themeFile) { // Fallback : Search for ScummModern.zip in SearchMan.
+			themeFile = SearchMan.createReadStreamForMember("scummmodern.zip");
+		}
+		if (themeFile) {
+			Common::Archive *themeArchive = Common::makeZipArchive(themeFile);
+			if (themeArchive->hasFile("FreeSans.ttf")) {
+				Common::SeekableReadStream *stream = nullptr;
+				stream = themeArchive->createReadStreamForMember("FreeSans.ttf");
+				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+				if (_newFont) {
+					if (!_font)
+						delete _font;
+					_font = _newFont;
+				}
+				if (stream)
+					delete stream;
+			}
+			delete themeArchive;
+			themeArchive = nullptr;
+		}
+	} else {
+		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+		if (_newFont) {
+			if (!_font)
+				delete _font;
+			_font = _newFont;
+		}
+		delete file;
+	}
+
+	_fntName = fontName;
+	_lineHeight = point;
+
+	if (_font)
+		return true;
+	return false;
+}
+
+void StyledTTFont::setStyle(uint newStyle) {
+	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
+		_style = newStyle;
+		loadFont(_fntName, _lineHeight);
+	} else {
+		_style = newStyle;
+	}
+}
+
+int StyledTTFont::getFontHeight() {
+	if (_font)
+		return _font->getFontHeight();
+	return 0;
+}
+
+int StyledTTFont::getMaxCharWidth() {
+	if (_font)
+		return _font->getMaxCharWidth();
+	return 0;
+}
+
+int StyledTTFont::getCharWidth(byte chr) {
+	if (_font)
+		return _font->getCharWidth(chr);
+	return 0;
+}
+
+int StyledTTFont::getKerningOffset(byte left, byte right) {
+	if (_font)
+		return _font->getKerningOffset(left, right);
+	return 0;
+}
+
+void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
+	if (_font) {
+		_font->drawChar(dst, chr, x, y, color);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+	}
+}
+
+void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
+	if (_font) {
+		_font->drawString(dst, str, x, y, w, color, align);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+	}
+}
+
+int StyledTTFont::getStringWidth(const Common::String &str) {
+	if (_font)
+		return _font->getStringWidth(str);
+	return 0;
+}
+
+Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	if (_font) {
+		int16 w = _font->getStringWidth(str);
+		if (w && w < 1024) {
+			tmp->create(w, _font->getFontHeight(), _engine->_pixelFormat);
+			drawString(tmp, str, 0, 0, w, color);
+		}
+	}
+	return tmp;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/truetype_font.h b/engines/zvision/graphics/truetype_font.h
new file mode 100644
index 0000000000..30ef1c73a3
--- /dev/null
+++ b/engines/zvision/graphics/truetype_font.h
@@ -0,0 +1,123 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+// This file is based on engines/wintermute/base/fonts/base_font_truetype.h/.cpp
+
+#ifndef ZVISION_TRUETYPE_FONT_H
+#define ZVISION_TRUETYPE_FONT_H
+
+#include "graphics/font.h"
+#include "graphics/pixelformat.h"
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+class TruetypeFont {
+public:
+	TruetypeFont(ZVision *engine, int32 fontHeight);
+	~TruetypeFont();
+
+private:
+	ZVision *_engine;
+	Graphics::Font *_font;
+	int _lineHeight;
+
+	size_t _maxCharWidth;
+	size_t _maxCharHeight;
+
+public:
+	int32 _fontHeight;
+
+public:
+	/**
+	 * Loads a .ttf file into memory. This must be called
+	 * before any calls to drawTextToSurface
+	 *
+	 * @param filename    The file name of the .ttf file to load
+	 */
+	bool loadFile(const Common::String &filename);
+	/**
+	 * Renders the supplied text to a Surface using 0x0 as the
+	 * background color.
+	 *
+	 * @param text         The to render
+	 * @param textColor    The color to render the text with
+	 * @param maxWidth     The max width the text should take up.
+	 * @param maxHeight    The max height the text should take up.
+	 * @param align        The alignment of the text within the bounds of maxWidth
+	 * @param wrap         If true, any words extending past maxWidth will wrap to a new line. If false, ellipses will be rendered to show that the text didn't fit
+	 * @return             A Surface containing the rendered text
+	 */
+	Graphics::Surface *drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap);
+};
+
+// Styled TTF
+class StyledTTFont {
+public:
+	StyledTTFont(ZVision *engine);
+	~StyledTTFont();
+
+	enum {
+		STTF_BOLD = 1,
+		STTF_ITALIC = 2,
+		STTF_UNDERLINE = 4,
+		STTF_STRIKEOUT = 8,
+		STTF_SHARP = 16
+	};
+
+private:
+	ZVision *_engine;
+	Graphics::Font *_font;
+	int _lineHeight;
+	uint _style;
+	Common::String _fntName;
+
+public:
+	bool loadFont(const Common::String &fontName, int32 point);
+	bool loadFont(const Common::String &fontName, int32 point, uint style);
+	void setStyle(uint newStyle);
+
+	int getFontHeight();
+	int getMaxCharWidth();
+	int getCharWidth(byte chr);
+	int getKerningOffset(byte left, byte right);
+
+	void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color);
+
+	void drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align = Graphics::kTextAlignLeft);
+	int getStringWidth(const Common::String &str);
+
+	Graphics::Surface *renderSolidText(const Common::String &str, uint32 color);
+
+	bool isLoaded() {
+		return _font != NULL;
+	};
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 607a9be4ed..e2beeb593d 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -12,12 +12,12 @@ MODULE_OBJS := \
 	cursors/cursor_manager.o \
 	cursors/cursor.o \
 	detection.o \
-	fonts/truetype_font.o \
 	graphics/effects/fog.o \
 	graphics/effects/light.o \
 	graphics/effects/wave.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
+	graphics/truetype_font.o \
 	scripting/actions.o \
 	scripting/control.o \
 	scripting/controls/fist_control.o \
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
index a229129b9d..b6cbed3e34 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.h
+++ b/engines/zvision/scripting/sidefx/ttytext_node.h
@@ -28,7 +28,7 @@
 
 #include "zvision/scripting/sidefx.h"
 #include "zvision/text/text.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index f88f9eaddd..1a04c67988 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -21,20 +21,17 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/zvision.h"
-#include "zvision/core/search_manager.h"
-#include "zvision/text/string_manager.h"
-
-#include "zvision/fonts/truetype_font.h"
-
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
-
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 
+#include "zvision/zvision.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/string_manager.h"
+#include "zvision/graphics/truetype_font.h"
+
 namespace ZVision {
 
 StringManager::StringManager(ZVision *engine)
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index 61c0d95f51..8d6fbe67a6 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_STRING_MANAGER_H
 
 #include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 
 namespace Graphics {
 class FontManager;
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 6f41416015..0ccca214d7 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -21,23 +21,19 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/text/text.h"
-
-#include "zvision/fonts/truetype_font.h"
-
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/debug.h"
 #include "common/rect.h"
-
 #include "graphics/fontman.h"
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 
+#include "zvision/text/text.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/scripting/script_manager.h"
 
 namespace ZVision {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index 6b916860f0..01c3fd760c 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -25,7 +25,7 @@
 #define ZVISION_TEXT_H
 
 #include "zvision/detection.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/zvision.h"
 
 namespace Graphics {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index d981d14838..af9d26a350 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -33,7 +33,7 @@
 #include "zvision/core/menu.h"
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
-#include "zvision/fonts/truetype_font.h"
+#include "zvision/graphics/truetype_font.h"
 #include "zvision/core/midi.h"
 #include "zvision/utility/zfs_archive.h"
 
-- 
cgit v1.2.3


From dab4ce1f7bc5c72f9f90bc0de8553e4b4e945624 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 3 Dec 2014 02:38:06 +0200
Subject: ZVISION: Move the subtitle class

---
 engines/zvision/graphics/subtitles.cpp            | 108 ++++++++++++++++++++++
 engines/zvision/graphics/subtitles.h              |  54 +++++++++++
 engines/zvision/module.mk                         |   2 +-
 engines/zvision/scripting/sidefx/music_node.h     |   2 +-
 engines/zvision/scripting/sidefx/syncsound_node.h |   2 +-
 engines/zvision/subtitles/subtitles.cpp           | 108 ----------------------
 engines/zvision/subtitles/subtitles.h             |  54 -----------
 engines/zvision/video/video.cpp                   |   2 +-
 8 files changed, 166 insertions(+), 166 deletions(-)
 create mode 100644 engines/zvision/graphics/subtitles.cpp
 create mode 100644 engines/zvision/graphics/subtitles.h
 delete mode 100644 engines/zvision/subtitles/subtitles.cpp
 delete mode 100644 engines/zvision/subtitles/subtitles.h

diff --git a/engines/zvision/graphics/subtitles.cpp b/engines/zvision/graphics/subtitles.cpp
new file mode 100644
index 0000000000..784721562a
--- /dev/null
+++ b/engines/zvision/graphics/subtitles.cpp
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/subtitles.h"
+#include "zvision/core/search_manager.h"
+#include "zvision/text/text.h"
+
+namespace ZVision {
+
+Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
+	_engine(engine),
+	_areaId(-1),
+	_subId(-1) {
+	Common::File file;
+	if (_engine->getSearchManager()->openFile(file, subname)) {
+		while (!file.eos()) {
+			Common::String str = file.readLine();
+			if (str.lastChar() == '~')
+				str.deleteLastChar();
+
+			if (str.matchString("*Initialization*", true)) {
+				// Not used
+			} else if (str.matchString("*Rectangle*", true)) {
+				int32 x1, y1, x2, y2;
+				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
+				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
+				_areaId = _engine->getRenderManager()->createSubArea(rct);
+			} else if (str.matchString("*TextFile*", true)) {
+				char filename[64];
+				sscanf(str.c_str(), "%*[^:]:%s", filename);
+				Common::File txt;
+				if (_engine->getSearchManager()->openFile(txt, filename)) {
+					while (!txt.eos()) {
+						Common::String txtline = readWideLine(txt);
+						sub curSubtitle;
+						curSubtitle.start = -1;
+						curSubtitle.stop = -1;
+						curSubtitle.subStr = txtline;
+
+						_subs.push_back(curSubtitle);
+					}
+					txt.close();
+				}
+			} else {
+				int32 st;
+				int32 en;
+				int32 sb;
+				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
+					if (sb <= (int32)_subs.size()) {
+						_subs[sb].start = st;
+						_subs[sb].stop = en;
+					}
+				}
+			}
+		}
+	}
+}
+
+Subtitle::~Subtitle() {
+	if (_areaId != -1)
+		_engine->getRenderManager()->deleteSubArea(_areaId);
+
+	_subs.clear();
+}
+
+void Subtitle::process(int32 time) {
+	int16 j = -1;
+	for (uint16 i = 0; i < _subs.size(); i++)
+		if (time >= _subs[i].start && time <= _subs[i].stop) {
+			j = i;
+			break;
+		}
+
+	if (j == -1 && _subId != -1) {
+		if (_areaId != -1)
+			_engine->getRenderManager()->updateSubArea(_areaId, "");
+		_subId = -1;
+	}
+
+	if (j != -1 && j != _subId) {
+		if (_subs[j].subStr.size())
+			if (_areaId != -1)
+				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
+		_subId = j;
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/subtitles.h b/engines/zvision/graphics/subtitles.h
new file mode 100644
index 0000000000..c3da6583a4
--- /dev/null
+++ b/engines/zvision/graphics/subtitles.h
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SUBTITLES_H
+#define ZVISION_SUBTITLES_H
+
+#include "zvision/zvision.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class Subtitle {
+public:
+	Subtitle(ZVision *engine, const Common::String &subname);
+	~Subtitle();
+
+	void process(int32 time);
+private:
+	ZVision *_engine;
+	int32 _areaId;
+	int16 _subId;
+
+	struct sub {
+		int start;
+		int stop;
+		Common::String subStr;
+	};
+
+	Common::Array<sub> _subs;
+};
+
+}
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index e2beeb593d..045eb5264a 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -17,6 +17,7 @@ MODULE_OBJS := \
 	graphics/effects/wave.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
+	graphics/subtitles.o \
 	graphics/truetype_font.o \
 	scripting/actions.o \
 	scripting/control.o \
@@ -41,7 +42,6 @@ MODULE_OBJS := \
 	scripting/sidefx/timer_node.o \
 	scripting/sidefx/ttytext_node.o \
 	sound/zork_raw.o \
-	subtitles/subtitles.o \
 	text/string_manager.o \
 	text/text.o \
 	utility/clock.o \
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index 954e2f474e..c89345f0d0 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/scripting/sidefx.h"
-#include "zvision/subtitles/subtitles.h"
+#include "zvision/graphics/subtitles.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.h b/engines/zvision/scripting/sidefx/syncsound_node.h
index c16ffebe7f..7cd02a8aef 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.h
+++ b/engines/zvision/scripting/sidefx/syncsound_node.h
@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/scripting/sidefx.h"
-#include "zvision/subtitles/subtitles.h"
+#include "zvision/graphics/subtitles.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp
deleted file mode 100644
index d36eb24923..0000000000
--- a/engines/zvision/subtitles/subtitles.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "zvision/subtitles/subtitles.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/core/search_manager.h"
-#include "zvision/text/text.h"
-
-namespace ZVision {
-
-Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
-	_engine(engine),
-	_areaId(-1),
-	_subId(-1) {
-	Common::File file;
-	if (_engine->getSearchManager()->openFile(file, subname)) {
-		while (!file.eos()) {
-			Common::String str = file.readLine();
-			if (str.lastChar() == '~')
-				str.deleteLastChar();
-
-			if (str.matchString("*Initialization*", true)) {
-				// Not used
-			} else if (str.matchString("*Rectangle*", true)) {
-				int32 x1, y1, x2, y2;
-				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
-				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
-				_areaId = _engine->getRenderManager()->createSubArea(rct);
-			} else if (str.matchString("*TextFile*", true)) {
-				char filename[64];
-				sscanf(str.c_str(), "%*[^:]:%s", filename);
-				Common::File txt;
-				if (_engine->getSearchManager()->openFile(txt, filename)) {
-					while (!txt.eos()) {
-						Common::String txtline = readWideLine(txt);
-						sub curSubtitle;
-						curSubtitle.start = -1;
-						curSubtitle.stop = -1;
-						curSubtitle.subStr = txtline;
-
-						_subs.push_back(curSubtitle);
-					}
-					txt.close();
-				}
-			} else {
-				int32 st;
-				int32 en;
-				int32 sb;
-				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
-					if (sb <= (int32)_subs.size()) {
-						_subs[sb].start = st;
-						_subs[sb].stop = en;
-					}
-				}
-			}
-		}
-	}
-}
-
-Subtitle::~Subtitle() {
-	if (_areaId != -1)
-		_engine->getRenderManager()->deleteSubArea(_areaId);
-
-	_subs.clear();
-}
-
-void Subtitle::process(int32 time) {
-	int16 j = -1;
-	for (uint16 i = 0; i < _subs.size(); i++)
-		if (time >= _subs[i].start && time <= _subs[i].stop) {
-			j = i;
-			break;
-		}
-
-	if (j == -1 && _subId != -1) {
-		if (_areaId != -1)
-			_engine->getRenderManager()->updateSubArea(_areaId, "");
-		_subId = -1;
-	}
-
-	if (j != -1 && j != _subId) {
-		if (_subs[j].subStr.size())
-			if (_areaId != -1)
-				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
-		_subId = j;
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/subtitles/subtitles.h b/engines/zvision/subtitles/subtitles.h
deleted file mode 100644
index c3da6583a4..0000000000
--- a/engines/zvision/subtitles/subtitles.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SUBTITLES_H
-#define ZVISION_SUBTITLES_H
-
-#include "zvision/zvision.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class Subtitle {
-public:
-	Subtitle(ZVision *engine, const Common::String &subname);
-	~Subtitle();
-
-	void process(int32 time);
-private:
-	ZVision *_engine;
-	int32 _areaId;
-	int16 _subId;
-
-	struct sub {
-		int start;
-		int stop;
-		Common::String subStr;
-	};
-
-	Common::Array<sub> _subs;
-};
-
-}
-
-#endif
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 25125ec2fb..36b5f9b921 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -29,7 +29,7 @@
 #include "zvision/zvision.h"
 #include "zvision/utility/clock.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/subtitles/subtitles.h"
+#include "zvision/graphics/subtitles.h"
 
 namespace ZVision {
 
-- 
cgit v1.2.3


From e0d008a9ca83cc9f1bfae0d089f90f2c3b39fa0f Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Wed, 5 Nov 2014 20:36:33 +0100
Subject: SCUMM: puttrace - Add suport for a dutch demo variant.

Found on Spy Fox 2 CD, Mac partition (EAN 5400646050646)
---
 devtools/scumm-md5.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index eef50003d2..361595670b 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -722,6 +722,7 @@ puttrace	Putt-Putt Enters the Race
 	62050da376483d8edcbd98cd26b6cb57	-1	ru	Windows	HE 99	-	-	sev
 
 	0ac41e2e3d2174e5a042a6b565328dba	13110	us	All	HE 98	Demo	-	sev
+	ee8cfeb76e55d43a01c25e0865a9db76	13135	nl	Mac	HE 98	Demo	-	Ben Castricum
 	6af2419fe3db5c2fdb091ae4e5833770	-1	nl	All	HE 98.5	Demo	-	Kirben
 	663743c03ae0c007f3d665cf631c0e6b	13135	de	All	HE 99	Demo	-	Joachim Eberhard
 	aaa587701cde7e74692c68c1024b85eb	-1	nl	All	HE 99	Demo	-	joostp
-- 
cgit v1.2.3


From 2e497bb9f83d0435e88bcd283b636c4e2c9043e3 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sat, 15 Nov 2014 13:26:16 +0100
Subject: SCUMM: farm - Add support for a dutch Macintosh variant.

Found on CD with EAN8714902148334.
---
 devtools/scumm-md5.txt           | 1 +
 engines/scumm/detection_tables.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 361595670b..1f1f75affd 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -622,6 +622,7 @@ farm	Let's Explore the Farm with Buzzy
 	a5c5388da9bf0e6662fdca8813a79d13	86962	en	Windows	-	-	-	George Kormendi
 	a85856675429fe88051744f755b72f93	-1	en	Windows	-	-	-	Kirben
 	a2386da005672cbd5136f4f27a626c5f	87061	nl	Windows	-	-	-	George Kormendi
+	eeb606c2d2ec877a712a9f20c10bcdda	87034	nl	Mac	-	-	-	Ben Castricum
 	5dda73606533d66a4c3f4f9ea6e842af	87061	ru	Windows	-	-	-	sev
 
 	39fd6db10d0222d817025c4d3346e3b4	-1	en	Mac	-	Demo	-	Joachim Eberhard
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 3f08f17aff..42b5f4ce97 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -664,6 +664,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "dog", "Springparadijs", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
 	{ "farm", "farm", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "farm", "farm", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "farm", "farmdemo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "farm", "Farm Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
-- 
cgit v1.2.3


From 50b904ee94eb5640f90c01981daf660d2187a35b Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Wed, 5 Nov 2014 20:48:11 +0100
Subject: SCUMM: Add support for the "Mini Games" from Kellogg's complimentary
 CD

---
 devtools/scumm-md5.txt | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 1f1f75affd..3edb53c598 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -561,7 +561,11 @@ freddi4	Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch
 	fa84cb1018103a4ee4e5fa8041c1d0d1	13609	de	Windows	-	Demo	-	George Kormendi
 	ebd324dcf06a4c49e1ba5c231eee1060	-1	us	All	HE 99	Demo	-	sev
 	688328c5bdc4c8ec4145688dfa077bf2	-1	de	All	HE 99	Demo	-	Joachim Eberhard
-	03d3b18ee3fd68114e2a687c871e38d5	-1	us	Windows	HE 99	Mini Game	-	eriktorbjorn
+	03d3b18ee3fd68114e2a687c871e38d5	13609	us	Windows	HE 99	Mini Game	-	eriktorbjorn
+	9340b552b0f2dffe6d4f3d13ebebe832	13609	nl	Windows	HE 99	Mini Game	-	Ben Castricum
+	c486e4cfa7bd6f8efcd0740f96f7dde3	13609	fr	Windows	HE 99	Mini Game	-	Ben Castricum
+	7a2b6d8e8a645c9d534c8c4edc38a9c9	13609	it	Windows	HE 99	Mini Game	-	Ben Castricum
+	09b0be55c16cd9e88b5080bf89ff281d	13609	de	Windows	HE 99	Mini Game	-	Ben Castricum
 	16effd200aa6b8abe9c569c3e578814d	-1	nl	All	HE 99	Demo	-	joostp
 	499c958affc394f2a3868f1eb568c3ee	-1	nl	All	HE 99	Demo	-	adutchguy
 	5fdb2ac2483908b065c6e77988338a54	-1	nl	Windows	HE 99	Demo	-	Ben
@@ -686,7 +690,11 @@ pajama3	Pajama Sam 3: You Are What You Eat From Your Head to Your Feet
 	a654fb60c3b67d6317a7894ffd9f25c5	-1	us	All	-	Demo	-	sev
 	a9f2f04b1ecaab9495b59befffe9bf88	-1	us	All	-	Demo	-	sev
 	0c45eb4baff0c12c3d9dfa889c8070ab	13884	de	All	-	Demo	-	Joachim Eberhard
-	4fe6a2e8df3c4536b278fdd2fbcb181e	-1	en	Windows	-	Mini Game	-	Trekky
+	4fe6a2e8df3c4536b278fdd2fbcb181e	13911	en	Windows	-	Mini Game	-	Trekky
+	24942a4200d99bdb4bdb78f9c7e07027	13911	nl	Windows	-	Mini Game	-	Ben Castricum
+	faa89ab5e67ba4eebb4399f584f7490c	13911	fr	Windows	-	Mini Game	-	Ben Castricum
+	d1a73e87564477c7c2dcc2b8f616ad0b	13911	it	Windows	-	Mini Game	-	Ben Castricum
+	a8fcc3084ad5e3e569722755f205b1ef	13911	de	Windows	-	Mini Game	-	Ben Castricum
 	679855cf61932f9bf995c8f3677380ed	-1	fr	Windows	-	Demo	-	Mevi
 	c8c5baadcbfc8d0372ed4335abace8a7	-1	fr	Windows	-	Demo	-	Mevi
 	784b499c98d07260a30952685758636b	13911	de	Windows	-	Demo	-	George Kormendi
@@ -813,7 +821,10 @@ PuttTime	Putt-Putt Travels Through Time
 	59d5cfcc5e672a6e07baae01328b918b	-1	fr	All	HE 90	Demo	-	Kirben
 	fbb697d89d2beca87360a145f467bdae	-1	de	All	HE 90	Demo	-	Joachim Eberhard
 	6b19d0e25cbf720d05822379b8b90ed9	-1	nl	All	HE 90	Demo	-	adutchguy
-	0a6d7b81b850ed4a77811c60c9b5c555	-1	us	Windows	HE 99	Mini Game	-	eriktorbjorn	
+	0a6d7b81b850ed4a77811c60c9b5c555	18458	us	Windows	HE 99	Mini Game	-	eriktorbjorn	
+	a71014c53a6d18c66ef2ea0ee42328e9	18458	nl	Windows	HE 99	Mini Game	-	Ben Castricum
+	8dd4d590685c19bf651b5016e749ead2	18458	fr	Windows	HE 99	Mini Game	-	Ben Castricum
+	aef415cc5dc063e3668359c2657169f3	18458	de	Windows	HE 99	Mini Game	-	Ben Castricum
 	0ab19be9e2a3f6938226638b2a3744fe	-1	us	All	HE 100	Demo	-	khalek
 
 balloon	Putt-Putt and Pep's Balloon-O-Rama
@@ -882,7 +893,11 @@ spyfox2	SPY Fox 2: Some Assembly Required
 	1c792d28376d45e145cb916bca0400a2	-1	nl	All	-	Demo	-	joostp
 	7222f260253f325c21fcfa68b5bfab67	-1	us	All	-	Demo	-	Kirben
 	732845548b1d6c2da572cb6a1bf81b07	-1	de	All	-	Demo	-	Joachim Eberhard
-	e62056ba675ad65d8854ab3c5ad4b3c0	-1	en	Windows	-	Mini Game	-	Trekky
+	e62056ba675ad65d8854ab3c5ad4b3c0	14689	en	Windows	-	Mini Game	-	Trekky
+	22c7432dc97a821fcfccd480e93e3911	14689	nl	Windows	-	Mini Game	-	Ben Castricum
+	6b10c9977cad9de503642059359792b1	14689	fr	Windows	-	Mini Game	-	Ben Castricum
+	9684c161258d68e0d464d6cab7024b9c	14689	it	Windows	-	Mini Game	-	Ben Castricum
+	7f2578d8d33a9ff525488a2d9ba617e4	14689	de	Windows	-	Mini Game	-	Ben Castricum
 	22de86b2f7ec6e5db745ed1123310b44	15832	fr	Windows	-	Demo	-	George Kormendi
 	204453e33456c4faa26e276229fe5b76	14689	de	Windows	-	Demo	-	George Kormendi
 	19bf6938a94698296bcb0c99c31c91a7	-1	gb	Windows	-	Demo	-	eriktorbjorn
-- 
cgit v1.2.3


From 75408c1cb860d143076460ea4c42dc0acd1ced03 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 9 Nov 2014 16:39:25 +0100
Subject: SCUMM: More detection fixes.

---
 devtools/scumm-md5.txt           | 6 +++---
 engines/scumm/detection_tables.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 3edb53c598..37d7e7a5e1 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -480,9 +480,9 @@ fbpack	Fatty Bear's Fun Pack
 
 freddi	Freddi Fish 1: The Case of the Missing Kelp Seeds
 	d4cccb5af88f3e77f370896e9ba8c5f9	-1	All	Windows	HE 71	-	-	sev
-	c0039ad982999c92d0de81910d640fa0	-1	nl	Windows	HE 71	-	-	adutchguy
+	c0039ad982999c92d0de81910d640fa0	26159	nl	Windows	HE 71	-	-	adutchguy
 	68530d2e15f339fbbf3150b78b4d2ffb	-1	en	Mac	HE 73	-	-	satz
-	6d1baa1065ac5f7b210be8ebe4235e49	-1	nl	Mac	HE 73	-	-	daniel9
+	6d1baa1065ac5f7b210be8ebe4235e49	26384	nl	Mac	HE 73	-	-	daniel9
 	c782fbbe74a987c3df8ac73cd3e289ed	-1	se	Mac	HE 73	-	-	Torbj�rn Andersson
 	5ebb57234b2fe5c5dff641e00184ad81	-1	fr	Windows	HE 73	-	-	gist974
 	cf8ef3a1fb483c5c4b1c584d1167b2c4	-1	de	Windows	HE 73	-	-	Oncer
@@ -888,7 +888,7 @@ spyfox2	SPY Fox 2: Some Assembly Required
 	bc4700bc0e12879f6d25d14d6be6cfdd	-1	de	All	-	-	-	Joachim Eberhard
 	cea91e3dd47f2518ea418e41611aa77f	-1	ru	All	-	-	-	sev
 	9fd66fb3b04703bd50da4356e4202558	51295	en	Mac	-	-	-	pix_climber
-	71fe97c3108678cf604f14abe342341b	-1	nl	Windows	-	-	-	adutchguy
+	71fe97c3108678cf604f14abe342341b	51286	nl	All	-	-	-	adutchguy
 
 	1c792d28376d45e145cb916bca0400a2	-1	nl	All	-	Demo	-	joostp
 	7222f260253f325c21fcfa68b5bfab67	-1	us	All	-	Demo	-	Kirben
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 42b5f4ce97..f72e552fa6 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -856,7 +856,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "putttime", "PuttTijd", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "putttime", "Putt Time", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "putttime", "PuttTTT", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-	{ "putttime", "PuttTTT", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "putttime", "PuttTTT", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "putttime", "TIJDDEMO", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "putttime", "TijdDemo", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "putttime", "timedemo", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -918,7 +918,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "spyfox", "JR-Demo", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
 	{ "spyfox", "game", kGenHEIOS, Common::EN_ANY, Common::kPlatformIOS, 0 },
 
-	{ "spyfox2", "spyfox2", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "spyfox2", "spyfox2", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "spyfox2", "sf2-demo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "spyfox2", "sf2demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "spyfox2", "Sf2demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-- 
cgit v1.2.3


From 30038ef789791512529ce13af4d72940efbbb563 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sat, 15 Nov 2014 13:56:11 +0100
Subject: SCUMM: Update scumm-md5.h

---
 engines/scumm/scumm-md5.h | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 878b2eeef3..4a34894506 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Sat Nov 01 11:52:16 2014
+  This file was generated by the md5table tool on Sat Nov 29 19:54:41 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -20,7 +20,7 @@ static const MD5Table md5table[] = {
 	{ "0354ee0d14cde1264ec762261c04c14a", "loom", "Steam", "Steam", 585728, Common::EN_ANY, Common::kPlatformWindows },
 	{ "035deab53b47bc43abc763560d0f8d4b", "atlantis", "Floppy", "Demo", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "037385a953789190298494d92b89b3d0", "catalog", "HE 72", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
-	{ "03d3b18ee3fd68114e2a687c871e38d5", "freddi4", "HE 99", "Mini Game", -1, Common::EN_USA, Common::kPlatformWindows },
+	{ "03d3b18ee3fd68114e2a687c871e38d5", "freddi4", "HE 99", "Mini Game", 13609, Common::EN_USA, Common::kPlatformWindows },
 	{ "0425954a9db5c340861672892c3e678d", "samnmax", "", "Demo", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "04401d747f1a2c1c4b388daff71ed378", "ft", "", "", 535405461, Common::DE_DEU, Common::kPlatformMacintosh },
 	{ "04687cdf7f975a89d2474929f7b80946", "indy3", "FM-TOWNS", "", 7552, Common::EN_ANY, Common::kPlatformFMTowns },
@@ -37,10 +37,11 @@ static const MD5Table md5table[] = {
 	{ "08656dd9698ddf1023ba9bf8a195e37b", "monkey", "VGA", "VGA", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "08cc5c3eedaf72ebe12734eee94f7fa2", "balloon", "HE 80", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "09820417db26687bb7fe0c83cc4c553b", "ft", "", "Version A", 19697, Common::EN_ANY, Common::kPlatformUnknown },
+	{ "09b0be55c16cd9e88b5080bf89ff281d", "freddi4", "HE 99", "Mini Game", 13609, Common::DE_DEU, Common::kPlatformWindows },
 	{ "0a212fa35fa8421f31c1f3961272caf0", "monkey", "VGA", "VGA", -1, Common::DE_DEU, Common::kPlatformAmiga },
 	{ "0a295b80f9a9edf818e8e161a0e83830", "freddi2", "HE 80", "", -1, Common::FR_FRA, Common::kPlatformUnknown },
 	{ "0a41311d462b6639fc45297b9044bf16", "monkey", "No AdLib", "EGA", -1, Common::ES_ESP, Common::kPlatformAtariST },
-	{ "0a6d7b81b850ed4a77811c60c9b5c555", "PuttTime", "HE 99", "Mini Game", -1, Common::EN_USA, Common::kPlatformWindows },
+	{ "0a6d7b81b850ed4a77811c60c9b5c555", "PuttTime", "HE 99", "Mini Game", 18458, Common::EN_USA, Common::kPlatformWindows },
 	{ "0aa050f4ad79402fbe9c4f78fb8ac494", "loom", "PC-Engine", "", 6532, Common::EN_ANY, Common::kPlatformPCEngine },
 	{ "0ab19be9e2a3f6938226638b2a3744fe", "PuttTime", "HE 100", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "0ac41e2e3d2174e5a042a6b565328dba", "puttrace", "HE 98", "Demo", 13110, Common::EN_USA, Common::kPlatformUnknown },
@@ -114,10 +115,12 @@ static const MD5Table md5table[] = {
 	{ "21abe302e1b1e2b66d6f5c12e241ebfd", "freddicove", "unenc", "Unencrypted", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "2232b0b9411575b1f9961713ebc9de61", "balloon", "HE 80", "", -1, Common::NL_NLD, Common::kPlatformWindows },
 	{ "225e18566e810c634bf7de63e7568e3e", "mustard", "", "", -1, Common::EN_USA, Common::kPlatformUnknown },
+	{ "22c7432dc97a821fcfccd480e93e3911", "spyfox2", "", "Mini Game", 14689, Common::NL_NLD, Common::kPlatformWindows },
 	{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", "HE 70", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "22de86b2f7ec6e5db745ed1123310b44", "spyfox2", "", "Demo", 15832, Common::FR_FRA, Common::kPlatformWindows },
 	{ "22f4ea88a09da12df9308ba30bcb7d0f", "loom", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "23394c8d29cc63c61313959431a12476", "spyfox", "HE 100", "Updated", -1, Common::EN_ANY, Common::kPlatformWindows },
+	{ "24942a4200d99bdb4bdb78f9c7e07027", "pajama3", "", "Mini Game", 13911, Common::NL_NLD, Common::kPlatformWindows },
 	{ "254fede2f15dbb32a23760d601b01816", "zak", "V1", "", -1, Common::EN_ANY, Common::kPlatformC64 },
 	{ "2723fea3dae0cb47768c424b145ae0e7", "tentacle", "Floppy", "Floppy", 7932, Common::EN_ANY, Common::kPlatformDOS },
 	{ "27b2ef1653089fe5b897d9cc89ce784f", "balloon", "HE 80", "", -1, Common::RU_RUS, Common::kPlatformWindows },
@@ -230,7 +233,7 @@ static const MD5Table md5table[] = {
 	{ "4f580a021eee026f3b4589e17d130d78", "freddi4", "", "", -1, Common::UNK_LANG, Common::kPlatformUnknown },
 	{ "4fa6870d9bc8c313b65d54b1da5a1891", "pajama", "", "", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "4fbbe9f64b8bc547503a379a301183ce", "tentacle", "", "CD", -1, Common::IT_ITA, Common::kPlatformUnknown },
-	{ "4fe6a2e8df3c4536b278fdd2fbcb181e", "pajama3", "", "Mini Game", -1, Common::EN_ANY, Common::kPlatformWindows },
+	{ "4fe6a2e8df3c4536b278fdd2fbcb181e", "pajama3", "", "Mini Game", 13911, Common::EN_ANY, Common::kPlatformWindows },
 	{ "5057fb0e99e5aa29df1836329232f101", "freddi2", "HE 80", "", -1, Common::UNK_LANG, Common::kPlatformWindows },
 	{ "507bb360688dc4180fdf0d7597352a69", "freddi", "HE 73", "", 26402, Common::SE_SWE, Common::kPlatformWindows },
 	{ "50b831f11b8c4b83784cf81f4dcc69ea", "spyfox", "HE 101", "", -1, Common::EN_ANY, Common::kPlatformWii },
@@ -302,6 +305,7 @@ static const MD5Table md5table[] = {
 	{ "6a60d395b78b205c93a956100b1bf5ae", "pajama2", "HE 98.5", "", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "6a8133b63d46f6663fbcbb49d5a2edb1", "atlantis", "Steam", "Steam", 520548, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "6af2419fe3db5c2fdb091ae4e5833770", "puttrace", "HE 98.5", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
+	{ "6b10c9977cad9de503642059359792b1", "spyfox2", "", "Mini Game", 14689, Common::FR_FRA, Common::kPlatformWindows },
 	{ "6b19d0e25cbf720d05822379b8b90ed9", "PuttTime", "HE 90", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "6b257bb2827dd894b8109a50a1a18b5a", "freddicove", "HE 100", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "6b27dbcd8d5697d5c918eeca0f68ef6a", "puttrace", "HE CUP", "Preview", 3901484, Common::UNK_LANG, Common::kPlatformUnknown },
@@ -311,7 +315,7 @@ static const MD5Table md5table[] = {
 	{ "6bf70eee5de3d24d2403e0dd3d267e8a", "spyfox", "", "", 49221, Common::UNK_LANG, Common::kPlatformWindows },
 	{ "6c2bff0e327f2962e809c2e1a82d7309", "monkey", "VGA", "VGA", -1, Common::EN_ANY, Common::kPlatformAmiga },
 	{ "6c375c2236d99f56e6c2cf540e74e474", "farm", "", "Demo", 34333, Common::NL_NLD, Common::kPlatformWindows },
-	{ "6d1baa1065ac5f7b210be8ebe4235e49", "freddi", "HE 73", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
+	{ "6d1baa1065ac5f7b210be8ebe4235e49", "freddi", "HE 73", "", 26384, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "6dead580b0ff14d5f7b33b4219f04159", "samnmax", "", "Demo", 16556335, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "6df20c50c1ab19799de9be7ae7716881", "fbear", "HE 62", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "6e959d65358eedf9b68b81e304b97fa4", "tentacle", "", "CD", 7932, Common::DE_DEU, Common::kPlatformUnknown },
@@ -325,7 +329,7 @@ static const MD5Table md5table[] = {
 	{ "70b0719ac3a5b47ae233c561823d5b96", "puttzoo", "", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "71523b539491527d9860f4407faf0411", "monkey", "Demo", "EGA Demo", 7607, Common::EN_ANY, Common::kPlatformDOS },
 	{ "71d384e7676c53d513ddd333eae1d82c", "Blues123time", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
-	{ "71fe97c3108678cf604f14abe342341b", "spyfox2", "", "", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "71fe97c3108678cf604f14abe342341b", "spyfox2", "", "", 51286, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "7222f260253f325c21fcfa68b5bfab67", "spyfox2", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "72ac6bc980d5101c2142189d746bd62f", "spyfox", "HE 99", "", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "732845548b1d6c2da572cb6a1bf81b07", "spyfox2", "", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown },
@@ -349,6 +353,7 @@ static const MD5Table md5table[] = {
 	{ "78c07ca088526d8d4446a4c2cb501203", "freddi3", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformUnknown },
 	{ "7974365d3dc0f43a2748c975f91ff042", "monkey2", "", "", -1, Common::ES_ESP, Common::kPlatformDOS },
 	{ "79b05f628586837e7166e82b2279bb50", "loom", "PC-Engine", "", -1, Common::JA_JPN, Common::kPlatformPCEngine },
+	{ "7a2b6d8e8a645c9d534c8c4edc38a9c9", "freddi4", "HE 99", "Mini Game", 13609, Common::IT_ITA, Common::kPlatformWindows },
 	{ "7b4ee071eecadc2d8cd0c3509110825c", "puttzoo", "HE 100", "Remastered", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "7bad72e332a59f9fcc1d437f4edad32a", "puttcircus", "", "", -1, Common::RU_RUS, Common::kPlatformUnknown },
 	{ "7c2e76087027eeee9c8f8985f93a1cc5", "freddi4", "", "Demo", 13584, Common::EN_ANY, Common::kPlatformUnknown },
@@ -358,6 +363,7 @@ static const MD5Table md5table[] = {
 	{ "7e151c17adf624f1966c8fc5827c95e9", "puttputt", "HE 61", "", -1, Common::EN_ANY, Common::kPlatform3DO },
 	{ "7ea2da67ebabea4ac20cee9f4f9d2934", "airport", "", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "7edd665bbede7ea8b7233f8e650be6f8", "samnmax", "", "CD", -1, Common::FR_FRA, Common::kPlatformUnknown },
+	{ "7f2578d8d33a9ff525488a2d9ba617e4", "spyfox2", "", "Mini Game", 14689, Common::DE_DEU, Common::kPlatformWindows },
 	{ "7f45ddd6dbfbf8f80c0c0efea4c295bc", "maniac", "V1", "V1", 1972, Common::EN_ANY, Common::kPlatformDOS },
 	{ "7f945525abcd48015adf1632637a44a1", "pajama", "", "Demo", -1, Common::FR_FRA, Common::kPlatformUnknown },
 	{ "7fbcff27c323499beaedd605e1ebd47d", "indy3", "Steam", "Steam", 561152, Common::EN_ANY, Common::kPlatformWindows },
@@ -390,6 +396,7 @@ static const MD5Table md5table[] = {
 	{ "8afb3cf9f95abf208358e984f0c9e738", "funpack", "", "", -1, Common::EN_ANY, Common::kPlatform3DO },
 	{ "8bdb0bf87b5e303dd35693afb9351215", "ft", "", "", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "8d479e36f35e80257dfc102cf4b8a912", "farm", "HE 72", "Demo", 34333, Common::EN_ANY, Common::kPlatformWindows },
+	{ "8dd4d590685c19bf651b5016e749ead2", "PuttTime", "HE 99", "Mini Game", 18458, Common::FR_FRA, Common::kPlatformWindows },
 	{ "8de13897f0121c79d29a2377159f9ad0", "socks", "HE 99", "Updated", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "8e3241ddd6c8dadf64305e8740d45e13", "balloon", "HE 100", "Updated", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "8e4ee4db46954bfe2912e259a16fad82", "monkey2", "", "", -1, Common::FR_FRA, Common::kPlatformDOS },
@@ -411,11 +418,13 @@ static const MD5Table md5table[] = {
 	{ "92b078d9d6d9d751da9c26b8b3075779", "tentacle", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "92e7727e67f5cd979d8a1070e4eb8cb3", "puttzoo", "HE 98.5", "Updated", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "92fc0073a4cf259ff36070ecb8628ba8", "thinkerk", "", "", -1, Common::EN_USA, Common::kPlatformUnknown },
+	{ "9340b552b0f2dffe6d4f3d13ebebe832", "freddi4", "HE 99", "Mini Game", 13609, Common::NL_NLD, Common::kPlatformWindows },
 	{ "94aaedbb8f26d71ed3ad6dd34490e29e", "tentacle", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "94db6519da85b8d08c976d8e9a858ea7", "baseball", "HE CUP", "Preview", 10044774, Common::UNK_LANG, Common::kPlatformUnknown },
 	{ "95818b178d473c989ac753574e8892aa", "readtime", "", "Demo", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "95b3806e043be08668c54c3ffe98650f", "BluesABCTime", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "95be99181bd0f10fef4872c2d4a771cb", "zak", "V1", "", -1, Common::DE_DEU, Common::kPlatformC64 },
+	{ "9684c161258d68e0d464d6cab7024b9c", "spyfox2", "", "Mini Game", 14689, Common::IT_ITA, Common::kPlatformWindows },
 	{ "96a3069a3c63caa7329588ce1fef41ee", "spyozon", "", "", -1, Common::RU_RUS, Common::kPlatformUnknown },
 	{ "9708cf716ed8bcc9ff3fcfc69413b746", "puttputt", "HE 62", "", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "9778341eefc6feb447ca07e7be21791c", "puttrace", "HE 99", "Demo", -1, Common::IT_ITA, Common::kPlatformWindows },
@@ -461,9 +470,11 @@ static const MD5Table md5table[] = {
 	{ "a59a438cb182124c30c4447d8ed469e9", "freddi", "HE 100", "", 34837, Common::NB_NOR, Common::kPlatformWii },
 	{ "a5c5388da9bf0e6662fdca8813a79d13", "farm", "", "", 86962, Common::EN_ANY, Common::kPlatformWindows },
 	{ "a654fb60c3b67d6317a7894ffd9f25c5", "pajama3", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
+	{ "a71014c53a6d18c66ef2ea0ee42328e9", "PuttTime", "HE 99", "Mini Game", 18458, Common::NL_NLD, Common::kPlatformWindows },
 	{ "a7cacad9c40c4dc9e1812abf6c8af9d5", "puttcircus", "", "Demo", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "a85856675429fe88051744f755b72f93", "farm", "", "", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "a86f9c49355579c30d4a55b477c0d869", "baseball2001", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
+	{ "a8fcc3084ad5e3e569722755f205b1ef", "pajama3", "", "Mini Game", 13911, Common::DE_DEU, Common::kPlatformWindows },
 	{ "a9543ef0d79bcb47cd76ec197ad0a967", "puttmoon", "", "", -1, Common::EN_ANY, Common::kPlatform3DO },
 	{ "a99c39ba65b6086be28aef576da69595", "spyozon", "", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "a9f2f04b1ecaab9495b59befffe9bf88", "pajama3", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
@@ -480,6 +491,7 @@ static const MD5Table md5table[] = {
 	{ "acad97ab1c6fc2a5b2d98abf6db4a190", "tentacle", "Floppy", "Floppy", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "ae94f110a14ce71fc515d5b648827a8f", "tentacle", "Floppy", "Floppy", -1, Common::ES_ESP, Common::kPlatformDOS },
 	{ "aeec382acef62e122bf0d5b14581cfa4", "zak", "V1", "", -1, Common::IT_ITA, Common::kPlatformC64 },
+	{ "aef415cc5dc063e3668359c2657169f3", "PuttTime", "HE 99", "Mini Game", 18458, Common::DE_DEU, Common::kPlatformWindows },
 	{ "aefa244ea034b7cd2041f0a44be7d9ba", "pajama3", "", "", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "af2bd1a43b50b55915d87994e093203d", "freddi", "HE 99", "Updated", 34829, Common::DE_DEU, Common::kPlatformWindows },
 	{ "b100abf7ff83146df50db78dbd5e9cfa", "freddicove", "HE 100", "", -1, Common::FR_FRA, Common::kPlatformUnknown },
@@ -507,7 +519,7 @@ static const MD5Table md5table[] = {
 	{ "be83e882b44f2767bc08d4f766ebc347", "maniac", "V2", "V2", -1, Common::DE_DEU, Common::kPlatformAtariST },
 	{ "bf8b52fdd9a69c67f34e8e9fec72661c", "farm", "HE 71", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "bfdf584b01503f0762baded581f6a0a2", "SoccerMLS", "", "", -1, Common::EN_ANY, Common::kPlatformWindows },
-	{ "c0039ad982999c92d0de81910d640fa0", "freddi", "HE 71", "", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "c0039ad982999c92d0de81910d640fa0", "freddi", "HE 71", "", 26159, Common::NL_NLD, Common::kPlatformWindows },
 	{ "c13225cb1bbd3bc9fe578301696d8021", "monkey", "SEGA", "", -1, Common::EN_ANY, Common::kPlatformSegaCD },
 	{ "c20848f53c2d48bfacdc840993843765", "freddi2", "HE 80", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "c225bec1b6c0798a2b8c89ac226dc793", "pajama", "HE 101", "", -1, Common::EN_ANY, Common::kPlatformWii },
@@ -518,6 +530,7 @@ static const MD5Table md5table[] = {
 	{ "c3b22fa4654bb580b20325ebf4174841", "puttzoo", "", "", -1, Common::NL_NLD, Common::kPlatformWindows },
 	{ "c3df37df9d3b481b45f75283a9907c47", "loom", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformDOS },
 	{ "c4787c3e8b5e2dfda90850ee800af00f", "zak", "V2", "V2", -1, Common::FR_FRA, Common::kPlatformDOS },
+	{ "c486e4cfa7bd6f8efcd0740f96f7dde3", "freddi4", "HE 99", "Mini Game", 13609, Common::FR_FRA, Common::kPlatformWindows },
 	{ "c4ffae9fac495475d6bc3343ccc8faf9", "Soccer2004", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "c5cc7cba02a2fbd539c4439e775b0536", "puttzoo", "HE 99", "Updated", 43470, Common::DE_DEU, Common::kPlatformWindows },
 	{ "c5d10e190d4b4d59114b824f2fdbd00e", "loom", "FM-TOWNS", "", 7540, Common::EN_ANY, Common::kPlatformFMTowns },
@@ -557,6 +570,7 @@ static const MD5Table md5table[] = {
 	{ "d06fbe28818fef7bfc45c2cdf0c0849d", "zak", "V2", "V2", -1, Common::DE_DEU, Common::kPlatformDOS },
 	{ "d0ad929def3e9cfe39dea55bd12098d4", "puttcircus", "", "", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "d0b531227a27c6662018d2bd05aac52a", "monkey", "VGA", "VGA", 8357, Common::DE_DEU, Common::kPlatformDOS },
+	{ "d1a73e87564477c7c2dcc2b8f616ad0b", "pajama3", "", "Mini Game", 13911, Common::IT_ITA, Common::kPlatformWindows },
 	{ "d220d154aafbfa12bd6f3ab1b2dae420", "puttzoo", "", "Demo", -1, Common::DE_DEU, Common::kPlatformMacintosh },
 	{ "d2cc8e31bce61e6cf2951249e10638fe", "basketball", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "d37c55388294b66e53e7ced3af88fa68", "freddi2", "HE 100", "Updated Demo", -1, Common::EN_ANY, Common::kPlatformUnknown },
@@ -604,7 +618,7 @@ static const MD5Table md5table[] = {
 	{ "e534d29afb3c6e0ee9dc3d53c5956714", "atlantis", "Floppy", "Floppy", -1, Common::DE_DEU, Common::kPlatformAmiga },
 	{ "e5563c8358443c4352fcddf7402a5e0a", "pajama2", "HE 98.5", "", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "e5c112140ad6574997de033a8e2a2964", "readtime", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
-	{ "e62056ba675ad65d8854ab3c5ad4b3c0", "spyfox2", "", "Mini Game", -1, Common::EN_ANY, Common::kPlatformWindows },
+	{ "e62056ba675ad65d8854ab3c5ad4b3c0", "spyfox2", "", "Mini Game", 14689, Common::EN_ANY, Common::kPlatformWindows },
 	{ "e63a0b9249b5ca4cc4d3ac34305ae360", "freddi", "HE 99", "", -1, Common::NB_NOR, Common::kPlatformWindows },
 	{ "e689bdf67f98b1d760ce4487ec0e8d06", "indy3", "EGA", "EGA", -1, Common::FR_FRA, Common::kPlatformAmiga },
 	{ "e6cd81b25ab1453a8a6d3482118c391e", "pass", "", "", 7857, Common::EN_ANY, Common::kPlatformDOS },
@@ -626,7 +640,9 @@ static const MD5Table md5table[] = {
 	{ "edfdb24a499d92c59f824c52987c0eec", "atlantis", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "ee41f6afbc5b26fa475754b56fe92048", "puttputt", "HE 61", "", 8032, Common::JA_JPN, Common::kPlatform3DO },
 	{ "ee785fe2569bc9965526e774f7ab86f1", "spyfox", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformMacintosh },
+	{ "ee8cfeb76e55d43a01c25e0865a9db76", "puttrace", "HE 98", "Demo", 13135, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "eea4d9ac2fb6f145945a308e8866915b", "maniac", "C64", "", -1, Common::EN_ANY, Common::kPlatformC64 },
+	{ "eeb606c2d2ec877a712a9f20c10bcdda", "farm", "", "", 87034, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "ef347474f3c7be3b29584eaa133cca05", "samnmax", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "ef71a322b6530ac45b1a070f7c0795f7", "moonbase", "Demo", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "ef74d9071d4e564b037cb44bd6774de7", "fbear", "HE 62", "", -1, Common::HE_ISR, Common::kPlatformDOS },
@@ -651,6 +667,7 @@ static const MD5Table md5table[] = {
 	{ "fa30c4a7a806629626269b6dcab59a15", "BluesBirthday", "HE CUP", "Preview", 7819264, Common::UNK_LANG, Common::kPlatformUnknown },
 	{ "fa3cb1541f9d7cf99ccbae6249bc150c", "maniac", "NES", "", -1, Common::IT_ITA, Common::kPlatformNES },
 	{ "fa84cb1018103a4ee4e5fa8041c1d0d1", "freddi4", "", "Demo", 13609, Common::DE_DEU, Common::kPlatformWindows },
+	{ "faa89ab5e67ba4eebb4399f584f7490c", "pajama3", "", "Mini Game", 13911, Common::FR_FRA, Common::kPlatformWindows },
 	{ "fb66aa42de21675116346213f176a366", "monkey", "VGA", "VGA", -1, Common::IT_ITA, Common::kPlatformAmiga },
 	{ "fbb697d89d2beca87360a145f467bdae", "PuttTime", "HE 90", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "fbbbb38a81fc9d6a61d509278390a290", "farm", "", "", -1, Common::EN_ANY, Common::kPlatformMacintosh },
-- 
cgit v1.2.3


From be489328dd40a188094ce7371d1b5f41e4bf1f6f Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski
Date: Fri, 5 Dec 2014 19:37:45 +0100
Subject: GUI: remove not used const

---
 gui/EventRecorder.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp
index ab284aaa6e..d0371f5e78 100644
--- a/gui/EventRecorder.cpp
+++ b/gui/EventRecorder.cpp
@@ -49,7 +49,6 @@ namespace GUI {
 
 const int kMaxRecordsNames = 0x64;
 const int kDefaultScreenshotPeriod = 60000;
-const int kDefaultBPP = 2;
 
 uint32 readTime(Common::ReadStream *inFile) {
 	uint32 d = inFile->readByte();
-- 
cgit v1.2.3


From 9649e919e31343d8f91acafede84caa547cee678 Mon Sep 17 00:00:00 2001
From: Pawel Kolodziejski
Date: Fri, 5 Dec 2014 19:45:10 +0100
Subject: GUI: use newer define for OS X 10.10+

---
 gui/browser_osx.mm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gui/browser_osx.mm b/gui/browser_osx.mm
index 0e80410032..18cbd134f3 100644
--- a/gui/browser_osx.mm
+++ b/gui/browser_osx.mm
@@ -154,7 +154,11 @@ int BrowserDialog::runModal() {
 		[showHiddenFilesButton setAction:@selector(showHiddenFiles:)];
 	}
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1090
 	if ([panel runModal] == NSOKButton) {
+#else
+	if ([panel runModal] == NSModalResponseOK) {
+#endif
 		NSURL *url = [panel URL];
 		if ([url isFileURL]) {
 			const char *filename = [[url path] UTF8String];
-- 
cgit v1.2.3


From d8af639dfcbdae3c99f72c4c4ec4f07410d5915c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 6 Dec 2014 11:11:32 +0100
Subject: BUILD: sync config.guess and config.sub from GNU

---
 config.guess | 364 ++++++++++++++++++++++-------------------------------------
 config.sub   | 158 ++++++++++++++++----------
 2 files changed, 232 insertions(+), 290 deletions(-)

diff --git a/config.guess b/config.guess
index 43f0cdbcfd..6c32c8645c 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2011-10-01'
+timestamp='2014-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2011-10-01'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches@gnu.org>.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -562,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -803,9 +821,15 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -851,15 +875,22 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -871,59 +902,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo hexagon-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -942,54 +968,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1193,6 +1228,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1219,19 +1257,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1248,7 +1298,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1317,158 +1367,10 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
+esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
diff --git a/config.sub b/config.sub
index 5b8736823d..7ffe373784 100755
--- a/config.sub
+++ b/config.sub
@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2011-10-08'
+timestamp='2014-12-03'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +116,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -223,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,13 +248,16 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -261,10 +265,11 @@ case $basic_machine in
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -278,24 +283,27 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -305,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -319,8 +328,10 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -333,7 +344,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -356,15 +370,16 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -373,11 +388,13 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -391,23 +408,27 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -420,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -719,7 +741,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -758,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -777,11 +801,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -809,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -816,6 +848,10 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -1004,7 +1040,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1331,29 +1371,29 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1477,9 +1517,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1528,6 +1565,12 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1555,9 +1598,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
-- 
cgit v1.2.3


From c9e6db6571bd1c69d1a08bcc7d371cc68c3b53a0 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Sun, 7 Dec 2014 15:24:21 +1100
Subject: SCUMM: Correct spacing and warning in last Maniac V0 merge.

---
 engines/scumm/actor.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 90ee5bf368..59a1009789 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -415,7 +415,7 @@ bool Actor_v0::calcWalkDistances() {
 	_walkYCountGreaterThanXCount = 0;
 	uint16 A = 0;
 
-	if (_CurrentWalkTo.x >= _tmp_Dest.x ) {
+	if (_CurrentWalkTo.x >= _tmp_Dest.x) {
 		A = _CurrentWalkTo.x - _tmp_Dest.x;
 		_walkDirX = 1;
 	} else {
@@ -424,7 +424,7 @@ bool Actor_v0::calcWalkDistances() {
 
 	_walkXCountInc = A;
 
-	if (_CurrentWalkTo.y >= _tmp_Dest.y ) {
+	if (_CurrentWalkTo.y >= _tmp_Dest.y) {
 		A = _CurrentWalkTo.y - _tmp_Dest.y;
 		_walkDirY = 1;
 	} else {
@@ -432,15 +432,15 @@ bool Actor_v0::calcWalkDistances() {
 	}
 
 	_walkYCountInc = A;
-	if ( !_walkXCountInc && !_walkYCountInc )
+	if (!_walkXCountInc && !_walkYCountInc)
 		return true;
 
-	if( _walkXCountInc <= _walkYCountInc ) 
+	if (_walkXCountInc <= _walkYCountInc) 
 		_walkYCountGreaterThanXCount = 1;
 
 	// 2FCC
 	A = _walkXCountInc;
-	if( A <= _walkYCountInc )
+	if (A <= _walkYCountInc)
 		A = _walkYCountInc;
 
 	_walkMaxXYCountInc = A;
@@ -455,7 +455,7 @@ byte Actor_v0::actorWalkX() {
 	byte A = _walkXCount;
 	A += _walkXCountInc;
 	if (A >= _walkCountModulo) {
-		if (!_walkDirX ) {
+		if (!_walkDirX) {
 			_tmp_Dest.x--;
 		} else {
 			_tmp_Dest.x++;
@@ -483,7 +483,7 @@ byte Actor_v0::actorWalkY() {
 	byte A = _walkYCount;
 	A += _walkYCountInc;
 	if (A >= _walkCountModulo) {
-		if (!_walkDirY ) {
+		if (!_walkDirY) {
 			_tmp_Dest.y--;
 		} else {
 			_tmp_Dest.y++;
@@ -568,7 +568,7 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	_walkdata.point3.x = 32000;
 	_walkdata.curbox = _walkbox;
 
-	if(_vm->_game.version == 0 ) {
+	if (_vm->_game.version == 0) {
 		((Actor_v0*)this)->_newWalkBoxEntered = true;
 	} else {
 		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
@@ -751,7 +751,7 @@ L2A33:;
 		animateActor(newDirToOldDir(_facing));
 	}
 
-	if ((_moving & 0x0F) == 3 ) {
+	if ((_moving & 0x0F) == 3) {
 L2C36:;
 		setTmpFromActor();
 
@@ -812,7 +812,7 @@ L2CA3:;
 		if (updateWalkbox() == kInvalidBox) {
 			// 2CC7
 			setActorFromTmp();
-			if( _CurrentWalkTo.x == _tmp_Dest.x) {
+			if (_CurrentWalkTo.x == _tmp_Dest.x) {
 				stopActorMoving();
 				return;
 			}
@@ -1210,7 +1210,7 @@ void Actor::setDirection(int direction) {
 }
 
 void Actor_v0::setDirection(int direction) {
-	int dir = newDirToOldDir( direction );
+	int dir = newDirToOldDir(direction);
 	int res = 0;
 
 	switch (dir) {
@@ -1255,8 +1255,8 @@ void Actor::turnToDirection(int newdir) {
 	if (_vm->_game.version <= 6) {
 		_targetFacing = newdir;
 		
-		if (_vm->_game.version == 0 ) {
-			setDirection( newdir );
+		if (_vm->_game.version == 0) {
+			setDirection(newdir);
 			return;
 		}
 		_moving = MF_TURN;
@@ -1456,7 +1456,7 @@ AdjustBoxResult Actor_v0::adjustPosInBorderWalkbox(AdjustBoxResult box) {
 	if (!(boxMask & 0x80))
 		return Result;
 
-	char A;
+	byte A;
 	boxMask &= 0x7C;
 	if (boxMask == 0x0C) 
 		A = 2;
@@ -1495,7 +1495,7 @@ AdjustBoxResult Actor_v0::adjustPosInBorderWalkbox(AdjustBoxResult box) {
 AdjustBoxResult Actor_v0::adjustXYToBeInBox(int dstX, int dstY) {
 	AdjustBoxResult Result = Actor_v2::adjustXYToBeInBox(dstX, dstY);
 
-	if( Result.box == kInvalidBox )
+	if (Result.box == kInvalidBox)
 		return Result;
 
 	return adjustPosInBorderWalkbox(Result);
@@ -3209,12 +3209,12 @@ void Actor_v0::animateActor(int anim) {
 }
 
 byte Actor_v0::updateWalkbox() {
-	if( _vm->checkXYInBoxBounds( _walkbox, _pos.x, _pos.y ) )
+	if (_vm->checkXYInBoxBounds(_walkbox, _pos.x, _pos.y))
 		return 0;
 
 	int numBoxes = _vm->getNumBoxes() - 1;
 	for (int i = 0; i <= numBoxes; i++) {
-		if (_vm->checkXYInBoxBounds( i, _pos.x, _pos.y ) == true ) {
+		if (_vm->checkXYInBoxBounds(i, _pos.x, _pos.y) == true) {
 			if (_walkdata.curbox == i) {
 				setBox(i);
 				directionUpdate();
-- 
cgit v1.2.3


From 6ec077e1b9f766da0a74bfb85b4ee2cc891cb348 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 14:37:51 +0200
Subject: AGI: Set the correct palette to use for each Amiga game

The Amiga palettes were added in 16529e58e6, but were never used.
A new game-specific option has been added for the old Amiga palette
---
 engines/agi/agi.cpp       |  1 +
 engines/agi/detection.cpp |  9 +++++++++
 engines/agi/graphics.cpp  | 21 ++++++++++++++++++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 6bdbabd33e..73233d4f4c 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -500,6 +500,7 @@ static const GameSettings agiSettings[] = {
 AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
 	// Assign default values to the config manager, in case settings are missing
 	ConfMan.registerDefault("originalsaveload", "false");
+	ConfMan.registerDefault("altamigapalette", "false");
 
 	_noSaveLoadAllowed = false;
 
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 1d58900056..e7285d8112 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -145,6 +145,13 @@ static const ExtraGuiOption agiExtraGuiOption = {
 	false
 };
 
+static const ExtraGuiOption agiExtraGuiOptionAmiga = {
+	_s("Use an alternative palette"),
+	_s("Use an alternative palette, common for all Amiga games. This was the old behavior"),
+	"altamigapalette",
+	false
+};
+
 #include "agi/detection_tables.h"
 
 using namespace Agi;
@@ -230,6 +237,8 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD
 const ExtraGuiOptions AgiMetaEngine::getExtraGuiOptions(const Common::String &target) const {
 	ExtraGuiOptions options;
 	options.push_back(agiExtraGuiOption);
+	if (target.contains("-amiga"))
+		options.push_back(agiExtraGuiOptionAmiga);
 	return options;
 }
 
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 34651c70b2..317e747cdd 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/config-manager.h"
 #include "common/file.h"
 #include "common/textconsole.h"
 
@@ -220,7 +221,7 @@ static const uint8 amigaAgiPaletteV3[16 * 3] = {
 /**
  * 16 color amiga-ish palette.
  */
-static const uint8 newPalette[16 * 3] = {
+static const uint8 altAmigaPalette[16 * 3] = {
 	0x00, 0x00, 0x00,
 	0x00, 0x00, 0x3f,
 	0x00, 0x2A, 0x00,
@@ -1030,8 +1031,22 @@ int GfxMgr::initVideo() {
 		initPalette(vgaPalette, 256, 8);
 	else if (_vm->_renderMode == Common::kRenderEGA)
 		initPalette(egaPalette);
-	else
-		initPalette(newPalette);
+	else if (_vm->_renderMode == Common::kRenderAmiga) {
+		if (!ConfMan.getBool("altamigapalette")) {
+			// Set the correct Amiga palette
+			if (_vm->getVersion() < 0x2936)
+				// TODO: This palette isn't used for Apple IIGS games yet, as
+				// we don't set a separate render mode for them yet
+				initPalette(amigaAgiPaletteV1, 16, 4);
+			else if (_vm->getVersion() == 0x2936)
+				initPalette(amigaAgiPaletteV2, 16, 4);
+			else if (_vm->getVersion() > 0x2936)
+				initPalette(amigaAgiPaletteV3, 16, 4);
+		} else
+			// Set the old common alternative Amiga palette
+			initPalette(altAmigaPalette);
+	} else
+		error("initVideo: Unhandled render mode");
 
 	if ((_agiScreen = (uint8 *)calloc(GFX_WIDTH, GFX_HEIGHT)) == NULL)
 		return errNotEnoughMemory;
-- 
cgit v1.2.3


From b3e45ccc6854c93e73fcda0f9daa67ffad76a3a1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 14:40:21 +0200
Subject: AGI: Disable/remove unused code

This is code that isn't used currently. Thanks to fingolfin for
pointing out these parts of the code
---
 engines/agi/agi.cpp           | 5 -----
 engines/agi/graphics.cpp      | 2 ++
 engines/agi/preagi_mickey.cpp | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 73233d4f4c..1e663ec29a 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -492,11 +492,6 @@ struct GameSettings {
 	const char *detectname;
 };
 
-static const GameSettings agiSettings[] = {
-	{"agi", "AGI game", GID_AGI, MDT_ADLIB, "OBJECT"},
-	{NULL, NULL, 0, 0, NULL}
-};
-
 AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
 	// Assign default values to the config manager, in case settings are missing
 	ConfMan.registerDefault("originalsaveload", "false");
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 317e747cdd..2b1bd8c829 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -905,6 +905,7 @@ static const byte sciMouseCursor[] = {
 	0,0,0,0,0,0,1,2,2,1,0
 };
 
+#if 0
 /**
  * A black and white Apple IIGS style arrow cursor (9x11).
  * 0 = Transparent.
@@ -924,6 +925,7 @@ static const byte appleIIgsMouseCursor[] = {
 	2,2,2,0,2,1,1,2,0,
 	0,0,0,0,0,2,2,2,0
 };
+#endif
 
 /**
  * RGB-palette for the black and white SCI and Apple IIGS arrow cursors.
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index 4ca8d00824..a1572d7f1f 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -892,6 +892,7 @@ void MickeyEngine::drawRoom() {
 	drawRoomAnimation();
 }
 
+#if 0
 const uint8 colorBCG[16][2] = {
 	{ 0x00,	0x00 },	// 0 (black, black)
 	{ 0, 0 },
@@ -910,6 +911,7 @@ const uint8 colorBCG[16][2] = {
 	{ 0, 0 },
 	{ 0xFF,	0xFF }	// F (white, white)
 };
+#endif
 
 void MickeyEngine::drawLogo() {
 	// TODO: clean this up and make it work properly, the logo is drawn way off to the right
-- 
cgit v1.2.3


From 815851e959bb46b2b9fd0de7ff9d04c9097d6908 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 15:39:11 +0200
Subject: MADS: Remove unused reference to MADSEngine

Thanks to fingolfin for finding out the unused reference
---
 engines/mads/msurface.h | 4 +---
 engines/mads/scene.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index ebfb1f437a..650d7fdaee 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -223,8 +223,6 @@ public:
 };
 
 class DepthSurface : public MSurface {
-private:
-	MADSEngine *_vm;
 public:
 	/**
 	 * Depth style
@@ -234,7 +232,7 @@ public:
 	/**
 	 * Constructor
 	 */
-	DepthSurface(MADSEngine *vm) : _vm(vm), _depthStyle(0) {}
+	DepthSurface() : _depthStyle(0) {}
 
 	/**
 	 * Returns the depth at a given position
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 18ceb3c813..d2b4b29622 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -31,7 +31,7 @@
 namespace MADS {
 
 Scene::Scene(MADSEngine *vm)
-	: _vm(vm), _action(_vm), _depthSurface(vm),
+	: _vm(vm), _action(_vm), _depthSurface(),
 	  _dirtyAreas(_vm),  _dynamicHotspots(vm), _hotspots(vm),
 	  _kernelMessages(vm), _sequences(vm), _sprites(vm), _spriteSlots(vm),
 	  _textDisplay(vm), _userInterface(vm) {
@@ -182,7 +182,7 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
 		flags |= ANIMFLAG_LOAD_BACKGROUND_ONLY;
 
 	_animationData = Animation::init(_vm, this);
-	DepthSurface depthSurface(_vm);
+	DepthSurface depthSurface;
 	_animationData->load(_userInterface, depthSurface, prefix, flags, nullptr, nullptr);
 
 	_vm->_palette->_paletteUsage.load(&_scenePaletteUsage);
@@ -611,7 +611,7 @@ void Scene::loadAnimation(const Common::String &resName, int trigger) {
 	if (_activeAnimation)
 		freeAnimation();
 
-	DepthSurface depthSurface(_vm);
+	DepthSurface depthSurface;
 	UserInterface interfaceSurface(_vm);
 
 	_activeAnimation = Animation::init(_vm, this);
-- 
cgit v1.2.3


From 2325183751e14a50b59f4a9cf5950396f52fed2a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 15:45:43 +0200
Subject: NEVERHOOD: Remove duplicate defines

These have been left behind after the split of the scenes and the scene
sprites. Thanks to fingolfin for pointing out the duplicate defines
---
 engines/neverhood/modules/module2700_sprites.cpp | 56 ------------------------
 engines/neverhood/modules/module2800.cpp         | 15 -------
 engines/neverhood/modules/module2800_sprites.cpp | 10 -----
 engines/neverhood/modules/module3000.cpp         | 12 -----
 engines/neverhood/modules/module3000_sprites.cpp | 36 ---------------
 5 files changed, 129 deletions(-)

diff --git a/engines/neverhood/modules/module2700_sprites.cpp b/engines/neverhood/modules/module2700_sprites.cpp
index e17cddc834..079e0b7afe 100644
--- a/engines/neverhood/modules/module2700_sprites.cpp
+++ b/engines/neverhood/modules/module2700_sprites.cpp
@@ -24,62 +24,6 @@
 
 namespace Neverhood {
 
-static const NRect kScene2710ClipRect = { 0, 0, 626, 480 };
-
-static const uint32 kScene2710StaticSprites[] = {
-	0x0D2016C0,
-	0
-};
-
-static const NRect kScene2711ClipRect = { 0, 0, 521, 480 };
-
-static const uint32 kScene2711FileHashes1[] = {
-	0,
-	0x100801A1,
-	0x201081A0,
-	0x006800A4,
-	0x40390120,
-	0x000001B1,
-	0x001000A1,
-	0
-};
-
-static const uint32 kScene2711FileHashes2[] = {
-	0,
-	0x40403308,
-	0x71403168,
-	0x80423928,
-	0x224131A8,
-	0x50401328,
-	0x70423328,
-	0
-};
-
-static const uint32 kScene2711FileHashes3[] = {
-	0,
-	0x1088A021,
-	0x108120E5,
-	0x18A02321,
-	0x148221A9,
-	0x10082061,
-	0x188820E1,
-	0
-};
-
-static const NRect kScene2724ClipRect = { 0, 141, 640, 480 };
-
-static const uint32 kScene2724StaticSprites[] = {
-	0xC20D00A5,
-	0
-};
-
-static const NRect kScene2725ClipRect = { 0, 0, 640, 413 };
-
-static const uint32 kScene2725StaticSprites[] = {
-	0xC20E00A5,
-	0
-};
-
 static const NPoint kCarShadowOffsets[] = {
 	{-63,  3}, {-48, 40}, {-33, 58},
 	{  0, 65}, { 40, 53}, { 56, 27},
diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index a59c3f8156..ab22390c7d 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -1477,21 +1477,6 @@ static const uint32 kScene2808FileHashes2[] = {
 	0xB0196098
 };
 
-static const uint32 kClass428FileHashes[] = {
-	0x140022CA,
-	0x4C30A602,
-	0xB1633402,
-	0x12982135,
-	0x0540B728,
-	0x002A81E3,
-	0x08982841,
-	0x10982841,
-	0x20982841,
-	0x40982841,
-	0x80982841,
-	0x40800711
-};
-
 Scene2808::Scene2808(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule), _countdown(0), _testTubeSetNum(which), _leaveResult(0), _isFlowing(false) {
 
diff --git a/engines/neverhood/modules/module2800_sprites.cpp b/engines/neverhood/modules/module2800_sprites.cpp
index f9a58de92d..ad814d2b5b 100644
--- a/engines/neverhood/modules/module2800_sprites.cpp
+++ b/engines/neverhood/modules/module2800_sprites.cpp
@@ -574,16 +574,6 @@ uint32 AsScene2806Spew::handleMessage(int messageNum, const MessageParam &param,
 	return messageResult;
 }
 
-static const uint32 kScene2808FileHashes1[] = {
-	0x90B0392,
-	0x90B0192
-};
-
-static const uint32 kScene2808FileHashes2[] = {
-	0xB0396098,
-	0xB0196098
-};
-
 static const uint32 kClass428FileHashes[] = {
 	0x140022CA,
 	0x4C30A602,
diff --git a/engines/neverhood/modules/module3000.cpp b/engines/neverhood/modules/module3000.cpp
index d4809611ad..0f84dbd18d 100644
--- a/engines/neverhood/modules/module3000.cpp
+++ b/engines/neverhood/modules/module3000.cpp
@@ -666,18 +666,6 @@ static const uint32 kScene3010ButtonNameHashes[] = {
 	0x01180951
 };
 
-static const uint32 kScene3010DeadBoltButtonFileHashes1[] = {
-	0x301024C2,
-	0x20280580,
-	0x30200452
-};
-
-static const uint32 kScene3010DeadBoltButtonFileHashes2[] = {
-	0x50C025A8,
-	0x1020A0A0,
-	0x5000A7E8
-};
-
 Scene3010::Scene3010(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule), _countdown(0), _doorUnlocked(false), _checkUnlocked(false) {
 
diff --git a/engines/neverhood/modules/module3000_sprites.cpp b/engines/neverhood/modules/module3000_sprites.cpp
index 3f883eaa72..23a388efe4 100644
--- a/engines/neverhood/modules/module3000_sprites.cpp
+++ b/engines/neverhood/modules/module3000_sprites.cpp
@@ -46,42 +46,6 @@ enum {
 	kCTSCount				= 14
 };
 
-static const uint32 kScene3009CannonScopeVideos[] = {
-	0x1010000D,
-	0x340A0049,
-	0x340A0049,
-	0x0282081D,
-	0x0082080D,
-	0x0882080D,
-	0x0882080D,
-	0x0282081D,
-	0x004B000B,
-	0x014B000B,
-	0x044B000B,
-	0x0282081D,
-	0x0282081D,
-	0x0282081D,
-	0x340A0049
-};
-
-static const uint32 kScene3009CannonActionVideos[] = {
-	0x00000000,
-	0x8004001B,	// 1 Fire cannon at wall, it breaks (lowered)
-	0x0004001A,	// 2 Fire cannon at wall, nothing happens (lowered)
-	0x1048404B,	// 3 Fire cannon at emptyness (raised)
-	0x50200109,	// 4 Fire cannon, robot missed (raised)
-	0x12032109,	// 5 Fire cannon, robot hit (raised)
-	0x10201109,	// 6 Fire cannon, no robot (raised)
-	0x000A2030,	// 7 Raise the cannon
-	0x000A0028,	// 8
-	0x000A0028,	// 9
-	0x000A0028,	// 10
-	0x040A1069,	// 11
-	0x040A1069,	// 12
-	0x040A1069,	// 13
-	0x240A1101	// 14 Lower the cannon
-};
-
 static const uint32 kSsScene3009SymbolEdgesFileHashes[] = {
 	0x618827A0,
 	0xB1A92322
-- 
cgit v1.2.3


From 0e763f6aa209613cbbbb4d4e3e2c1b8938c4f865 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 15:46:08 +0200
Subject: NEVERHOOD: Remove duplicate file hash definition

---
 engines/neverhood/modules/module2400.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/engines/neverhood/modules/module2400.cpp b/engines/neverhood/modules/module2400.cpp
index 3acb952db9..4bfc10abbf 100644
--- a/engines/neverhood/modules/module2400.cpp
+++ b/engines/neverhood/modules/module2400.cpp
@@ -168,11 +168,6 @@ static const uint32 kScene2401FileHashes2[] = {
 	0xD0910068, 0xD09100A8, 0
 };
 
-static const uint32 kScene2401FileHashes3[] = {
-	0xD0910020, 0xD0910038, 0xD0910008,
-	0xD0910068, 0xD09100A8, 0
-};
-
 static const NRect kScene2401Rects[] = {
 	{ 369, 331, 394, 389 },
 	{ 395, 331, 419, 389 },
@@ -264,11 +259,11 @@ void Scene2401::update() {
 		} else if (_pipeStatus >= 5) {
 			_ssWaterPipes[_pipeStatus]->setVisible(true);
 			_countdown1 = 8;
-			playPipeSound(kScene2401FileHashes3[getSubVar(VA_CURR_WATER_PIPES_LEVEL, _pipeStatus - 5)]);
+			playPipeSound(kScene2401FileHashes2[getSubVar(VA_CURR_WATER_PIPES_LEVEL, _pipeStatus - 5)]);
 		} else {
 			_ssWaterPipes[_pipeStatus]->setVisible(true);
 			_countdown1 = _pipeStatus == 4 ? 16 : 8;
-			playPipeSound(kScene2401FileHashes3[getSubVar(VA_GOOD_WATER_PIPES_LEVEL, _pipeStatus)]);
+			playPipeSound(kScene2401FileHashes2[getSubVar(VA_GOOD_WATER_PIPES_LEVEL, _pipeStatus)]);
 		}
 		_pipeStatus++;
 	}
-- 
cgit v1.2.3


From ce40801f5b80aaf8786b7ac790588bd83250372b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 15:48:11 +0200
Subject: MOHAWK: Comment out unused constant

Thanks to fingolfin for finding this unused code
---
 engines/mohawk/riven_external.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 3d0bccc47f..cda0683028 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -2513,7 +2513,7 @@ void RivenExternal::xthideinventory(uint16 argc, uint16 *argv) {
 static const uint32 kMarbleCount = 6;
 static const int kSmallMarbleWidth = 4;
 static const int kSmallMarbleHeight = 2;
-static const int kLargeMarbleSize = 8;
+//static const int kLargeMarbleSize = 8;
 static const int kMarbleHotspotSize = 13;
 static const char *s_marbleNames[] = { "tred", "torange", "tyellow", "tgreen", "tblue", "tviolet" };
 
-- 
cgit v1.2.3


From fa9e2f7b29a487d0bcfc697b3f4a71c9387fe7ba Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 17:38:16 +0200
Subject: SWORD25: Disable unused code

Thanks to fingolfin for pointing out this unused code
---
 engines/sword25/sword25.cpp         | 1 -
 engines/sword25/util/lua/lapi.cpp   | 3 ++-
 engines/sword25/util/lua/liolib.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp
index bb0aab3ad4..76142c2534 100644
--- a/engines/sword25/sword25.cpp
+++ b/engines/sword25/sword25.cpp
@@ -57,7 +57,6 @@ DECLARE_SINGLETON(Sword25::RenderObjectRegistry);
 
 namespace Sword25 {
 
-const char *const PACKAGE_MANAGER = "archiveFS";
 const char *const DEFAULT_SCRIPT_FILE = "/system/boot.lua";
 
 Sword25Engine::Sword25Engine(OSystem *syst, const ADGameDescription *gameDesc):
diff --git a/engines/sword25/util/lua/lapi.cpp b/engines/sword25/util/lua/lapi.cpp
index b97e90012c..d7ebdcbe12 100644
--- a/engines/sword25/util/lua/lapi.cpp
+++ b/engines/sword25/util/lua/lapi.cpp
@@ -30,11 +30,12 @@
 #include "common/textconsole.h"
 
 
+#if 0
 const char lua_ident[] =
   "Lua: " LUA_RELEASE " " LUA_COPYRIGHT " \n"
   "Authors: " LUA_AUTHORS " \n"
   "URL: www.lua.org\n";
-
+#endif
 
 
 #define api_checknelems(L, n)	api_check(L, (n) <= (L->top - L->base))
diff --git a/engines/sword25/util/lua/liolib.cpp b/engines/sword25/util/lua/liolib.cpp
index 0d27f9677f..403dea2ec2 100644
--- a/engines/sword25/util/lua/liolib.cpp
+++ b/engines/sword25/util/lua/liolib.cpp
@@ -24,7 +24,7 @@
 #define IO_OUTPUT	2
 
 
-static const char *const fnames[] = {"input", "output"};
+//static const char *const fnames[] = {"input", "output"};
 
 
 static int pushresult (lua_State *L, int i, const char *filename) {
-- 
cgit v1.2.3


From bb120d0fd4f6b32f9b9d76d9d3b334eef58cbfb8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 17:42:49 +0200
Subject: COMMON: Disable unused string

---
 common/unzip.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/unzip.cpp b/common/unzip.cpp
index 716c8c2d5e..1f4e601989 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -334,8 +334,10 @@ int unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len);
 #define SIZEZIPLOCALHEADER (0x1e)
 
 
+#if 0
 const char unz_copyright[] =
    " unzip 0.15 Copyright 1998 Gilles Vollant ";
+#endif
 
 /* unz_file_info_interntal contain internal info about a file in zipfile*/
 typedef struct {
-- 
cgit v1.2.3


From f2511e5a9ecfebdf5c03319acb9466e070fa3d06 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Dec 2014 17:43:49 +0200
Subject: IMAGE: Disable unused MJPEG array

Thanks to fingolfin for pointing that out
---
 image/codecs/mjpeg.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/image/codecs/mjpeg.cpp b/image/codecs/mjpeg.cpp
index 4ad72f259d..6e7faf1045 100644
--- a/image/codecs/mjpeg.cpp
+++ b/image/codecs/mjpeg.cpp
@@ -87,9 +87,11 @@ static const byte s_mjpegValDC[12] = {
 	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
 };
 
+#if 0
 static const byte s_mjpegBitsDCChrominance[17] = {
 	/* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0
 };
+#endif
 
 static const byte s_mjpegBitsACLuminance[17] = {
 	/* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d
-- 
cgit v1.2.3


From ec1fdeb25ad6b2d9aae69a544f45eb7fc5e189b8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 8 Dec 2014 01:08:27 +0200
Subject: ZVISION: Implement several advanced engine features and ScummVM
 dialogs

The functionality to return to launcher, list saves, delete saves, load
games from the launcher and load and save games during runtime has been
implemented. Also, ScummVM save/load dialogs have been implemented.
Saved games now have three numbers in their file extension, bumping the
possible save game slots up to 999
---
 engines/zvision/core/save_manager.cpp        | 40 +++++++++++++++++-
 engines/zvision/core/save_manager.h          |  1 +
 engines/zvision/detection.cpp                | 61 +++++++++++++++++++---------
 engines/zvision/scripting/script_manager.cpp | 23 +++++++++++
 engines/zvision/video/video.cpp              |  2 +
 engines/zvision/zvision.cpp                  |  9 +++-
 engines/zvision/zvision.h                    |  8 ++++
 7 files changed, 121 insertions(+), 23 deletions(-)

diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 11d3dd391a..20bd39fde5 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -23,22 +23,60 @@
 #include "common/scummsys.h"
 
 #include "zvision/core/save_manager.h"
-
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 
 #include "common/system.h"
+#include "common/translation.h"
 
 #include "graphics/surface.h"
 #include "graphics/thumbnail.h"
 
 #include "gui/message.h"
+#include "gui/saveload.h"
 
 namespace ZVision {
 
 const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');
 
+bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
+	GUI::SaveLoadChooser *dialog;
+	Common::String desc;
+	int slot;
+
+	if (isSave) {
+		dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+
+		slot = dialog->runModalWithCurrentTarget();
+		desc = dialog->getResultString();
+
+		if (desc.empty()) {
+			// create our own description for the saved game, the user didnt enter it
+			desc = dialog->createDefaultSaveDescription(slot);
+		}
+
+		if (desc.size() > 28)
+			desc = Common::String(desc.c_str(), 28);
+	} else {
+		dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+		slot = dialog->runModalWithCurrentTarget();
+	}
+
+	delete dialog;
+
+	if (slot < 0)
+		return false;
+
+	if (isSave) {
+		saveGame(slot, desc);
+		return true;
+	} else {
+		Common::ErrorCode result = loadGame(slot).getCode();
+		return (result == Common::kNoError);
+	}
+}
+
 void SaveManager::saveGame(uint slot, const Common::String &saveName) {
 	// The games only support 20 slots
 	//assert(slot <= 1 && slot <= 20);
diff --git a/engines/zvision/core/save_manager.h b/engines/zvision/core/save_manager.h
index 5cd61c7aa9..75841331e7 100644
--- a/engines/zvision/core/save_manager.h
+++ b/engines/zvision/core/save_manager.h
@@ -96,6 +96,7 @@ public:
 
 	void prepareSaveBuffer();
 	void flushSaveBuffer();
+	bool scummVMSaveLoadDialog(bool isSave);
 private:
 	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName);
 };
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 4d210abe86..a60ef6040d 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -26,6 +26,8 @@
 
 #include "zvision/zvision.h"
 #include "zvision/detection.h"
+#include "zvision/core/save_manager.h"
+#include "zvision/scripting/script_manager.h"
 
 #include "common/translation.h"
 #include "common/savefile.h"
@@ -178,24 +180,40 @@ public:
 };
 
 bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {
-	return false;
-	/*
+	return
 	(f == kSupportsListSaves) ||
 	(f == kSupportsLoadingDuringStartup) ||
-	(f == kSupportsDeleteSave) ||
-	(f == kSavesSupportMetaInfo) ||
-	(f == kSavesSupportThumbnail) ||
-	(f == kSavesSupportCreationDate) ||
-	(f == kSavesSupportPlayTime);
-	*/
+	(f == kSupportsDeleteSave);
+	//(f == kSavesSupportMetaInfo) ||
+	//(f == kSavesSupportThumbnail) ||
+	//(f == kSavesSupportCreationDate) ||
+	//(f == kSavesSupportPlayTime);
 }
 
-/*bool ZVision::ZVision::hasFeature(EngineFeature f) const {
+bool ZVision::ZVision::hasFeature(EngineFeature f) const {
     return
         (f == kSupportsRTL) ||
         (f == kSupportsLoadingDuringRuntime) ||
         (f == kSupportsSavingDuringRuntime);
-}*/
+}
+
+Common::Error ZVision::ZVision::loadGameState(int slot) {
+	return _saveManager->loadGame(slot);
+}
+
+Common::Error ZVision::ZVision::saveGameState(int slot, const Common::String &desc) {
+	_saveManager->saveGame(slot, desc);
+	return Common::kNoError;
+}
+
+bool ZVision::ZVision::canLoadGameStateCurrently() {
+	return !_videoIsPlaying;
+}
+
+bool ZVision::ZVision::canSaveGameStateCurrently() {
+	Location currentLocation = _scriptManager->getCurrentLocation();
+	return !_videoIsPlaying && currentLocation.world != 'g' && !(currentLocation.room == 'j' || currentLocation.room == 'a');
+}
 
 bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const ZVision::ZVisionGameDescription *gd = (const ZVision::ZVisionGameDescription *)desc;
@@ -213,8 +231,8 @@ const ExtraGuiOptions ZVisionMetaEngine::getExtraGuiOptions(const Common::String
 }
 
 SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
-	//Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-	/*ZVision::ZVision::SaveHeader header;
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	ZVision::SaveGameHeader header;
 	Common::String pattern = target;
 	pattern += ".???";
 
@@ -223,20 +241,25 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
 	Common::sort(filenames.begin(), filenames.end());   // Sort (hopefully ensuring we are sorted numerically..)*/
 
 	SaveStateList saveList;
-	/*  for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
+	// We only use readSaveGameHeader() here, which doesn't need an engine callback
+	ZVision::SaveManager *zvisionSaveMan = new ZVision::SaveManager(NULL);
+
+	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
 	        // Obtain the last 3 digits of the filename, since they correspond to the save slot
 	        int slotNum = atoi(file->c_str() + file->size() - 3);
 
 	        if (slotNum >= 0 && slotNum <= 999) {
 	            Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
 	            if (in) {
-	                if (ZVision::ZVision::readSaveHeader(in, false, header) == ZVision::ZVision::kRSHENoError) {
-	                    saveList.push_back(SaveStateDescriptor(slotNum, header.description));
+	                if (zvisionSaveMan->readSaveGameHeader(in, header)) {
+	                    saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
 	                }
 	                delete in;
 	            }
 	        }
-	    }*/
+	}
+
+	delete zvisionSaveMan;
 
 	return saveList;
 }
@@ -246,9 +269,8 @@ int ZVisionMetaEngine::getMaximumSaveSlot() const {
 }
 
 void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {
-	/*
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-	Common::String filename = ZVision::ZVision::getSavegameFilename(target, slot);
+	Common::String filename = Common::String::format("%s.%03u", target, slot);
 
 	saveFileMan->removeSavefile(filename.c_str());
 
@@ -265,10 +287,9 @@ void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {
 	    // Rename every slot greater than the deleted slot,
 	    if (slotNum > slot) {
 	        saveFileMan->renameSavefile(file->c_str(), filename.c_str());
-	        filename = ZVision::ZVision::getSavegameFilename(target, ++slot);
+	        filename = Common::String::format("%s.%03u", target, ++slot);
 	    }
 	}
-	*/
 }
 
 SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 7904817156..c532a2b15d 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -36,6 +36,7 @@
 #include "common/hashmap.h"
 #include "common/debug.h"
 #include "common/stream.h"
+#include "common/config-manager.h"
 
 namespace ZVision {
 
@@ -521,6 +522,28 @@ void ScriptManager::ChangeLocationReal() {
 	assert(_nextLocation.world != 0);
 	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
+	if (_nextLocation.world == 'g' && _nextLocation.room == 'j' && !ConfMan.getBool("originalsaveload")) {
+		if ((_nextLocation.node == 's' || _nextLocation.node == 'r') && _nextLocation.view == 'e') {
+			// Hook up the ScummVM save/restore dialog
+			bool isSave = (_nextLocation.node == 's');
+			bool gameSavedOrLoaded = _engine->getSaveManager()->scummVMSaveLoadDialog(isSave);
+			if (!gameSavedOrLoaded || isSave) {
+				// Reload the current room
+				_nextLocation.world = _currentLocation.world;
+				_nextLocation.room = _currentLocation.room;
+				_nextLocation.node = _currentLocation.node;
+				_nextLocation.view = _currentLocation.view;
+				_nextLocation.offset = _currentLocation.offset;
+				_currentLocation.world = '0';
+				_currentLocation.room = '0';
+				_currentLocation.node = '0';
+				_currentLocation.view = '0';
+				_currentLocation.offset = 0;
+			} else
+				return;
+		}
+	}
+
 	_engine->setRenderDelay(2);
 
 	if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 36b5f9b921..db6161bf0c 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -53,6 +53,7 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 
 	_clock.stop();
 	vid.start();
+	_videoIsPlaying = true;
 
 	// Only continue while the video is still playing
 	while (!shouldQuit() && !vid.endOfVideo() && vid.isPlaying()) {
@@ -99,6 +100,7 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 		_system->delayMillis(vid.getTimeToNextFrame() / 2);
 	}
 
+	_videoIsPlaying = false;
 	_clock.start();
 
 	if (scaled) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index af9d26a350..8a44ccebea 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -96,7 +96,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _audioId(0),
 	  _rendDelay(2),
 	  _kbdVelocity(0),
-	  _mouseVelocity(0) {
+	  _mouseVelocity(0),
+	  _videoIsPlaying(false) {
 
 	debug(1, "ZVision::ZVision");
 
@@ -205,6 +206,10 @@ void ZVision::initialize() {
 Common::Error ZVision::run() {
 	initialize();
 
+	// Check if a saved game is to be loaded from the launcher
+	if (ConfMan.hasKey("save_slot"))
+		_saveManager->loadGame(ConfMan.getInt("save_slot"));
+
 	// Main loop
 	while (!shouldQuit()) {
 		_clock.update();
@@ -327,7 +332,7 @@ void ZVision::pauseEngineIntern(bool pause) {
 }
 
 Common::String ZVision::generateSaveFileName(uint slot) {
-	return Common::String::format("%s.%02u", _targetName.c_str(), slot);
+	return Common::String::format("%s.%03u", _targetName.c_str(), slot);
 }
 
 Common::String ZVision::generateAutoSaveFileName() {
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index ca6c8e10e4..5850bf66cd 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -124,6 +124,7 @@ private:
 	int16 _mouseVelocity;
 	int16 _kbdVelocity;
 	bool _halveDelay;
+	bool _videoIsPlaying;
 
 	uint8 _cheatBuff[KEYBUF_SIZE];
 public:
@@ -198,6 +199,13 @@ public:
 
 	void checkBorders();
 	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
+
+	// Engine features
+	bool hasFeature(EngineFeature f) const;
+	bool canLoadGameStateCurrently();
+	bool canSaveGameStateCurrently();
+	Common::Error loadGameState(int slot);
+	Common::Error saveGameState(int slot, const Common::String &desc);
 private:
 	void initialize();
 	void initFonts();
-- 
cgit v1.2.3


From 9ebfa3e4f93bd3af0b8170bbb718e4e9a120e776 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 8 Dec 2014 01:09:04 +0200
Subject: ZVISION: Add some spacing

---
 engines/zvision/utility/clock.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/utility/clock.h b/engines/zvision/utility/clock.h
index 9a50116a8c..cbf52be560 100644
--- a/engines/zvision/utility/clock.h
+++ b/engines/zvision/utility/clock.h
@@ -47,6 +47,7 @@ public:
 	 * when the last update() was called.
 	 */
 	void update();
+
 	/**
 	 * Get the delta time since the last frame. (The time between update() calls)
 	 *
@@ -55,6 +56,7 @@ public:
 	uint32 getDeltaTime() const {
 		return _deltaTime;
 	}
+
 	/**
 	 * Get the time from the program starting to the last update() call
 	 *
@@ -69,6 +71,7 @@ public:
 	 * Has no effect if the clock is already paused.
 	 */
 	void start();
+
 	/**
 	 * Un-pause the clock.
 	 * Has no effect if the clock is already un-paused.
-- 
cgit v1.2.3


From a2eaf78255d6a92f8d93e2a3e8907f60c2e6e699 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 8 Dec 2014 01:09:27 +0200
Subject: ZVISION: Remove unused code

---
 engines/zvision/utility/utility.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/utility/utility.cpp
index 2388fe826e..e09545a90d 100644
--- a/engines/zvision/utility/utility.cpp
+++ b/engines/zvision/utility/utility.cpp
@@ -42,19 +42,4 @@ void trimCommentsAndWhiteSpace(Common::String *string) {
 	string->trim();
 }
 
-void tryToDumpLine(const Common::String &key,
-                   Common::String &line,
-                   Common::HashMap<Common::String, byte> *count,
-                   Common::HashMap<Common::String, bool> *fileAlreadyUsed,
-                   Common::DumpFile &output) {
-	const byte numberOfExamplesPerType = 8;
-
-	if ((*count)[key] < numberOfExamplesPerType && !(*fileAlreadyUsed)[key]) {
-		output.writeString(line);
-		output.writeByte('\n');
-		(*count)[key]++;
-		(*fileAlreadyUsed)[key] = true;
-	}
-}
-
 } // End of namespace ZVision
-- 
cgit v1.2.3


From d83438225e40f513a43b2c9b5d9b71a3afbc375e Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sun, 7 Dec 2014 19:53:27 +1100
Subject: SCUMM: Maniac V0: Add support for D64 Demo Disk, Cleanup duplicate
 'Talk' array

---
 devtools/scumm-md5.txt           |   1 +
 engines/scumm/actor.cpp          | 102 ++++++++++++++++++++++++---------------
 engines/scumm/detection.cpp      |   2 +
 engines/scumm/detection_tables.h |   2 +
 engines/scumm/file.cpp           |  26 ++++++++--
 engines/scumm/resource_v2.cpp    |  10 +++-
 engines/scumm/script_v0.cpp      |  15 ++++++
 engines/scumm/scumm-md5.h        |   3 +-
 engines/scumm/scumm.cpp          |  16 ++++--
 engines/scumm/scumm_v0.h         |   3 ++
 engines/scumm/verbs.cpp          |  55 +++++++++++++++++++++
 11 files changed, 187 insertions(+), 48 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 37d7e7a5e1..62925e98fa 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -52,6 +52,7 @@
 maniac	Maniac Mansion
 	2d624d1b214f7faf0094daea65c6d1a6	-1	en	2gs	Apple II	-	-	
 
+	2cb46375dd5cdfd023e2f07e0a21b530	-1	en	C64	C64	Demo	-	Robert Crossfield
 	eea4d9ac2fb6f145945a308e8866915b	-1	en	C64	C64	-	-	
 	439a7f4adf510489981ac52308e7d7a2	-1	de	C64	C64	-	-	
 
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 59a1009789..d07f175c78 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -43,12 +43,60 @@ namespace Scumm {
 
 byte Actor::kInvalidBox = 0;
 
-static const byte v0ActorTalkArray[0x19] = {
-	0x00, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x00, 0x46, 0x06,
-	0x06, 0x06, 0x06, 0xFF, 0xFF,
-	0x06, 0xC0, 0x06, 0x06, 0x00,
-	0xC0, 0xC0, 0x00, 0x06, 0x06
+static const byte v0ActorDemoTalk[25] = {
+	0x00,
+	0x06, // Syd
+	0x06, // Razor
+	0x06, // Dave
+	0x06, // Michael
+	0x06, // Bernard
+	0x06, // Wendy
+	0x00, // Jeff
+	0x46, // Radiation Suit
+	0x06, // Dr Fred
+	0x06, // Nurse Edna
+	0x06, // Weird Ed
+	0x06, // Dead Cousin Ted
+	0xE2, // Purple Tentacle
+	0xE2, // Green Tentacle
+	0x06, // Meteor police
+	0xC0, // Meteor
+	0x06, // Mark Eteer
+	0x06, // Talkshow Host
+	0x00, // Plant
+	0xC0, // Meteor Radiation
+	0xC0, // Edsel (small, outro)
+	0x00, // Meteor (small, intro)
+	0x06, // Sandy (Lab)
+	0x06, // Sandy (Cut-Scene)
+};
+
+static const byte v0ActorTalk[25] = {
+	0x00,
+	0x06, // Syd
+	0x06, // Razor
+	0x06, // Dave
+	0x06, // Michael
+	0x06, // Bernard
+	0x06, // Wendy
+	0x00, // Jeff
+	0x46, // Radiation Suit
+	0x06, // Dr Fred
+	0x06, // Nurse Edna
+	0x06, // Weird Ed
+	0x06, // Dead Cousin Ted
+	0xFF, // Purple Tentacle
+	0xFF, // Green Tentacle
+	0x06, // Meteor police
+	0xC0, // Meteor
+	0x06, // Mark Eteer
+	0x06, // Talkshow Host
+	0x00, // Plant
+	0xC0, // Meteor Radiation
+	0xC0, // Edsel (small, outro)
+	0x00, // Meteor (small, intro)
+	0x06, // Sandy (Lab)
+	0x06, // Sandy (Cut-Scene)
 };
 
 static const byte v0WalkboxSlantedModifier[0x16] = { 
@@ -210,6 +258,12 @@ void Actor_v0::initActor(int mode) {
 		_limbFrameRepeat[i] = 0;
 		_limb_flipped[i] = false;
 	}
+
+	if (_vm->_game.features & GF_DEMO) {
+		_sound[0] = v0ActorDemoTalk[_number];
+	} else {
+		_sound[0] = v0ActorTalk[_number];
+	}
 }
 
 void Actor::setBox(int box) {
@@ -1753,34 +1807,6 @@ void ScummEngine::showActors() {
 	}
 }
 
-// bits 0..5: sound, bit 6: ???
-static const byte v0ActorSounds[24] = {
-	0x06, // Syd
-	0x06, // Razor
-	0x06, // Dave
-	0x06, // Michael
-	0x06, // Bernard
-	0x06, // Wendy
-	0x00, // Jeff
-	0x46, // Radiation Suit
-	0x06, // Dr Fred
-	0x06, // Nurse Edna
-	0x06, // Weird Ed
-	0x06, // Dead Cousin Ted
-	0xFF, // Purple Tentacle
-	0xFF, // Green Tentacle
-	0x06, // Meteor police
-	0xC0, // Meteor
-	0x06, // Mark Eteer
-	0x06, // Talkshow Host
-	0x00, // Plant
-	0xC0, // Meteor Radiation
-	0xC0, // Edsel (small, outro)
-	0x00, // Meteor (small, intro)
-	0x06, // Sandy (Lab)
-	0x06, // Sandy (Cut-Scene)
-};
-
 /* Used in Scumm v5 only. Play sounds associated with actors */
 void ScummEngine::playActorSounds() {
 	int i, j;
@@ -1790,7 +1816,7 @@ void ScummEngine::playActorSounds() {
 		if (_actors[i]->_cost.soundCounter && _actors[i]->isInCurrentRoom()) {
 			_currentScript = 0xFF;
 			if (_game.version == 0) {
-				sound = v0ActorSounds[i - 1] & 0x3F;
+				sound = _actors[i]->_sound[0] & 0x3F;
 			} else {
 				sound = _actors[i]->_sound[0];
 			}
@@ -1950,7 +1976,7 @@ void ScummEngine::processActors() {
 
 				// Is this the correct location?
 				// 0x073C
-				if (v0ActorTalkArray[a0->_number] & 0x3F)
+				if (a0->_sound[0] & 0x3F)
 					a0->_cost.soundPos = (a0->_cost.soundPos + 1) % 3;
 			}
 		}
@@ -2259,7 +2285,7 @@ void Actor::startAnimActor(int f) {
 
 void Actor_v0::startAnimActor(int f) {
 	if (f == _talkStartFrame) {
-		if (v0ActorTalkArray[_number] & 0x40)
+		if (_sound[0] & 0x40)
 			return;
 
 		_speaking = 1;
@@ -2365,7 +2391,7 @@ void Actor_v0::animateCostume() {
 }
 
 void Actor_v0::speakCheck() {
-	if (v0ActorTalkArray[_number] & 0x80)
+	if (_sound[0] & 0x80)
 		return;
 
 	int cmd = newDirToOldDir(_facing);
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index c0db0d6d37..45647c9bed 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -323,6 +323,8 @@ static BaseScummFile *openDiskImage(const Common::FSNode &node, const GameFilena
 		gs.gameid = gfp->gameid;
 		gs.id = (Common::String(gfp->gameid) == "maniac" ? GID_MANIAC : GID_ZAK);
 		gs.platform = gfp->platform;
+		if (strcmp(gfp->pattern, "maniacdemo.d64") == 0)
+			gs.features |= GF_DEMO;
 
 		// determine second disk file name
 		Common::String disk2(disk1);
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index f72e552fa6..82a8b4452b 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -207,6 +207,7 @@ static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = {
 static const GameSettings gameVariantsTable[] = {
 	{"maniac", "Apple II",   0, GID_MANIAC, 0, 0, MDT_APPLEIIGS, 0, Common::kPlatformApple2GS, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
 	{"maniac", "C64",        0, GID_MANIAC, 0, 0, MDT_C64, 0, Common::kPlatformC64, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) },
+	{"maniac", "C64 Demo",   0, GID_MANIAC, 0, 0, MDT_C64, GF_DEMO, Common::kPlatformC64, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) },
 	{"maniac", "V1",      "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, 0, Common::kPlatformDOS, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
 	{"maniac", "V1 Demo", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
 	{"maniac", "NES",        0, GID_MANIAC, 1, 0, MDT_NONE,  0, Common::kPlatformNES, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_NOASPECT)},
@@ -448,6 +449,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "maniac", "%02d.MAN", kGenRoomNum, UNK_LANG, UNK, "V1 Demo" },
 	{ "maniac", "maniac1.d64", kGenUnchanged, UNK_LANG, Common::kPlatformC64, "C64" },   // ... and maniac2.d64
 	{ "maniac", "maniac1.dsk", kGenUnchanged, UNK_LANG, Common::kPlatformApple2GS, "Apple II" },   // ... and maniac2.dsk
+	{ "maniac", "maniacdemo.d64", kGenUnchanged, UNK_LANG, Common::kPlatformC64, "C64 Demo" },
 	{ "maniac", "Maniac Mansion (E).prg", kGenUnchanged, Common::EN_GRB, Common::kPlatformNES, "NES" },
 	{ "maniac", "Maniac Mansion (F).prg", kGenUnchanged, Common::FR_FRA, Common::kPlatformNES, "NES" },
 	{ "maniac", "Maniac Mansion (SW).prg", kGenUnchanged, Common::SE_SWE, Common::kPlatformNES, "NES" },
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 475ffa3238..7ead4c25b5 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -221,6 +221,15 @@ static const int maniacResourcesPerFile[55] = {
 	 3, 10,  1,  0,  0
 };
 
+static const int maniacDemoResourcesPerFile[55] = {
+	 0, 12,  0,  2,  1, 12,  1, 13,  6,  0,
+	 31, 0,  1,  0,  0,  0,  0,  1,  1,  1,
+	 0,  1,  0,  0,  2,  0,  0,  1,  0,  0,
+	 2,  7,  1, 11,  0,  0,  5,  1,  0,  0,
+	 1,  0,  1,  3,  4,  3,  1,  0,  0,  1,
+	 1,  2,  0,  0,  0
+};
+
 static const int zakResourcesPerFile[59] = {
 	 0, 29, 12, 14, 13,  4,  4, 10,  7,  4,
 	14, 19,  5,  4,  7,  6, 11,  9,  4,  4,
@@ -253,9 +262,17 @@ ScummDiskImage::ScummDiskImage(const char *disk1, const char *disk2, GameSetting
 		_numGlobalObjects = 256;
 		_numRooms = 55;
 		_numCostumes = 25;
-		_numScripts = 160;
-		_numSounds = 70;
-		_resourcesPerFile = maniacResourcesPerFile;
+		
+		if (_game.features & GF_DEMO) {
+			_numScripts = 55;
+			_numSounds = 40;
+			_resourcesPerFile = maniacDemoResourcesPerFile;
+		} else {
+			_numScripts = 160;
+			_numSounds = 70;
+			_resourcesPerFile = maniacResourcesPerFile;
+		}
+
 	} else {
 		_numGlobalObjects = 775;
 		_numRooms = 59;
@@ -327,6 +344,9 @@ bool ScummDiskImage::open(const Common::String &filename) {
 
 	extractIndex(0); // Fill in resource arrays
 
+	if (_game.features & GF_DEMO)
+		return true;
+
 	openDisk(2);
 
 	if (_game.platform == Common::kPlatformApple2GS) {
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index 7ccdfa4780..87dc132ff0 100644
--- a/engines/scumm/resource_v2.cpp
+++ b/engines/scumm/resource_v2.cpp
@@ -34,8 +34,14 @@ void ScummEngine_v2::readClassicIndexFile() {
 			_numGlobalObjects = 256;
 			_numRooms = 55;
 			_numCostumes = 25;
-			_numScripts = 160;
-			_numSounds = 70;
+			if (_game.features & GF_DEMO) {
+				_numScripts = 55;
+				_numSounds = 40;
+			} else {
+				_numScripts = 160;
+				_numSounds = 70; 
+			}
+
 		} else if (_game.platform == Common::kPlatformNES) {
 			_numGlobalObjects = 775;
 			_numRooms = 55;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 90291535fd..8d9d196b62 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -633,12 +633,21 @@ void ScummEngine_v0::setMode(byte mode) {
 
 	switch (_currentMode) {
 	case kModeCutscene:
+		if (_game.features & GF_DEMO) {
+			if (VAR(11) != 0)
+				_drawDemo = true;
+		}
 		_redrawSentenceLine = false;
 		// Note: do not change freeze state here
 		state = USERSTATE_SET_IFACE |
 			USERSTATE_SET_CURSOR;
+		
 		break;
 	case kModeKeypad:
+		if (_game.features & GF_DEMO) {
+			if (VAR(11) != 0)
+				_drawDemo = true;
+		}
 		_redrawSentenceLine = false;
 		state = USERSTATE_SET_IFACE |
 			USERSTATE_SET_CURSOR | USERSTATE_CURSOR_ON |
@@ -646,6 +655,12 @@ void ScummEngine_v0::setMode(byte mode) {
 		break;
 	case kModeNormal:
 	case kModeNoNewKid:
+		if (_game.features & GF_DEMO) {
+			resetVerbs();
+			_activeVerb = kVerbWalkTo;
+			_redrawSentenceLine = true;
+			_drawDemo = false;
+		}
 		state = USERSTATE_SET_IFACE | USERSTATE_IFACE_ALL |
 			USERSTATE_SET_CURSOR | USERSTATE_CURSOR_ON |
 			USERSTATE_SET_FREEZE;
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 4a34894506..5be18fb990 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Sat Nov 29 19:54:41 2014
+  This file was generated by the md5table tool on Sun Dec  7 23:09:10 2014
   DO NOT EDIT MANUALLY!
  */
 
@@ -135,6 +135,7 @@ static const MD5Table md5table[] = {
 	{ "2a446817ffcabfef8716e0c456ecaf81", "puttzoo", "", "Demo", -1, Common::DE_DEU, Common::kPlatformWindows },
 	{ "2a8658dbd13d84d1bce64a71a35995eb", "pajama2", "HE 99", "Demo", -1, Common::HE_ISR, Common::kPlatformWindows },
 	{ "2c04aacffb8428f30ccf4f734fbe3adc", "activity", "", "", -1, Common::EN_ANY, Common::kPlatformDOS },
+	{ "2cb46375dd5cdfd023e2f07e0a21b530", "maniac", "C64", "Demo", -1, Common::EN_ANY, Common::kPlatformC64 },
 	{ "2ccd8891ce4d3f1a334d21bff6a88ca2", "monkey", "CD", "", 9455, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "2d1e891fe52df707c30185e52c50cd92", "monkey", "CD", "CD", 8955, Common::EN_ANY, Common::kPlatformDOS },
 	{ "2d388339d6050d8ccaa757b64633954e", "indyloom", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 475b146a7b..6040344c2c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -716,7 +716,7 @@ ScummEngine_v2::ScummEngine_v2(OSystem *syst, const DetectorResult &dr)
 
 ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	: ScummEngine_v2(syst, dr) {
-
+	_drawDemo = false;
 	_currentMode = 0;
 	_currentLights = 0;
 
@@ -731,6 +731,9 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	VAR_ACTIVE_OBJECT2 = 0xFF;
 	VAR_IS_SOUND_RUNNING = 0xFF;
 	VAR_ACTIVE_VERB = 0xFF;
+
+	if (strcmp(dr.fp.pattern, "maniacdemo.d64") == 0 )
+		_game.features |= GF_DEMO; 
 }
 
 ScummEngine_v6::ScummEngine_v6(OSystem *syst, const DetectorResult &dr)
@@ -1091,8 +1094,13 @@ Common::Error ScummEngine::init() {
 			const char *tmpBuf1, *tmpBuf2;
 			assert(_game.id == GID_MANIAC || _game.id == GID_ZAK);
 			if (_game.id == GID_MANIAC) {
-				tmpBuf1 = "maniac1.d64";
-				tmpBuf2 = "maniac2.d64";
+				if (_game.features & GF_DEMO) {
+					tmpBuf1 = "maniacdemo.d64";
+					tmpBuf2 = "maniacdemo.d64";
+				} else {
+					tmpBuf1 = "maniac1.d64";
+					tmpBuf2 = "maniac2.d64";
+				}
 			} else {
 				tmpBuf1 = "zak1.d64";
 				tmpBuf2 = "zak2.d64";
@@ -2572,7 +2580,7 @@ void ScummEngine::runBootscript() {
 	int args[NUM_SCRIPT_LOCAL];
 	memset(args, 0, sizeof(args));
 	args[0] = _bootParam;
-	if (_game.id == GID_MANIAC && (_game.features & GF_DEMO))
+	if (_game.id == GID_MANIAC && (_game.features & GF_DEMO) && (_game.platform != Common::kPlatformC64))
 		runScript(9, 0, 0, args);
 	else
 		runScript(1, 0, 0, args);
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 83e0e32e15..e2f4a2ffbf 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -46,6 +46,7 @@ protected:
 	};
 
 protected:
+	bool _drawDemo;
 	byte _currentMode;
 	byte _currentLights;
 
@@ -101,6 +102,8 @@ protected:
 	virtual void handleMouseOver(bool updateInventory);
 	int verbPrepIdType(int verbid);
 	void resetVerbs();
+	void verbDemoMode();
+	void verbDrawDemoString(int VerbDemoNumber);
 
 	void clearSentenceLine();
 	void flushSentenceLine();
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index bf0a693467..fe936b550c 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -80,6 +80,19 @@ static const VerbSettings v0VerbTable_German[] = {
 	{kVerbWhatIs,  13, 2, "Was ist"}
 };
 
+struct VerbDemo {
+	int color;
+	const char *str;
+};
+static VerbDemo v0DemoStr[] = {
+	{7,  "        MANIAC MANSION DEMO DISK        "},
+	{5,  "          from Lucasfilm Games          "},
+	{5,  "    Copyright = 1987 by Lucasfilm Ltd.  "},
+	{5,  "           All Rights Reserved.         "},
+	{0,  "                                        "},
+	{16, "       Press F7 to return to menu.      "}
+};
+
 int ScummEngine_v0::verbPrepIdType(int verbid) {
 	switch (verbid) {
 	case kVerbUse: // depends on object1
@@ -93,6 +106,44 @@ int ScummEngine_v0::verbPrepIdType(int verbid) {
 	}
 }
 
+void ScummEngine_v0::verbDemoMode() {
+	int i;
+
+	for (i = 1; i < 16; i++)
+		killVerb(i);
+
+	for (i = 0; i < 6; i++) {
+		verbDrawDemoString(i);
+	}
+}
+
+void ScummEngine_v0::verbDrawDemoString(int VerbDemoNumber) {
+	byte string[80];
+	const char *ptr = v0DemoStr[VerbDemoNumber].str;
+	int i = 0, len = 0;
+
+	// Maximum length of printable characters
+	int maxChars = 40;
+	while (*ptr) {
+		if (*ptr != '@')
+			len++;
+		if (len > maxChars) {
+			break;
+		}
+
+		string[i++] = *ptr++;
+
+	}
+	string[i] = 0;
+
+	_string[2].charset = 1;
+	_string[2].ypos = _virtscr[kVerbVirtScreen].topline + (8 * VerbDemoNumber);
+	_string[2].xpos = 0;
+	_string[2].right = _virtscr[kVerbVirtScreen].w - 1;
+	_string[2].color = v0DemoStr[VerbDemoNumber].color;
+	drawString(2, (byte *)string);
+}
+
 void ScummEngine_v0::resetVerbs() {
 	VirtScreen *virt = &_virtscr[kVerbVirtScreen];
 	VerbSlot *vs;
@@ -854,6 +905,10 @@ void ScummEngine_v0::checkExecVerbs() {
 			}
 		}
 	}
+		
+	if (_drawDemo && _game.features & GF_DEMO) {
+		verbDemoMode();
+	}
 
 	if (_redrawSentenceLine)
 		drawSentenceLine();
-- 
cgit v1.2.3


From ecb1979245fb6695a68286a59f5eaf2c3677b579 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 8 Dec 2014 01:25:27 +0200
Subject: ZVISION: Implement more advanced engine features

Save game thumbnails and save game creation date have now been
implemented
---
 engines/zvision/detection.cpp                      | 36 +++++++++++-----------
 .../zvision/scripting/controls/save_control.cpp    |  2 ++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index a60ef6040d..ebf5bdcfdd 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -183,10 +183,10 @@ bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
 	(f == kSupportsListSaves) ||
 	(f == kSupportsLoadingDuringStartup) ||
-	(f == kSupportsDeleteSave);
-	//(f == kSavesSupportMetaInfo) ||
-	//(f == kSavesSupportThumbnail) ||
-	//(f == kSavesSupportCreationDate) ||
+	(f == kSupportsDeleteSave) ||
+	(f == kSavesSupportMetaInfo) ||
+	(f == kSavesSupportThumbnail) ||
+	(f == kSavesSupportCreationDate);
 	//(f == kSavesSupportPlayTime);
 }
 
@@ -293,41 +293,41 @@ void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const {
 }
 
 SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
-	/*
-	Common::String filename = ZVision::ZVision::getSavegameFilename(target, slot);
+	Common::String filename = Common::String::format("%s.%03u", target, slot);
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
 
 	if (in) {
-	    ZVision::ZVision::SaveHeader header;
-	    ZVision::ZVision::kReadSaveHeaderError error;
+	    ZVision::SaveGameHeader header;
 
-	    error = ZVision::ZVision::readSaveHeader(in, true, header);
+		// We only use readSaveGameHeader() here, which doesn't need an engine callback
+		ZVision::SaveManager *zvisionSaveMan = new ZVision::SaveManager(NULL);
+		bool successfulRead = zvisionSaveMan->readSaveGameHeader(in, header);
+		delete zvisionSaveMan;
 	    delete in;
 
-	    if (error == ZVision::ZVision::kRSHENoError) {
-	        SaveStateDescriptor desc(slot, header.description);
+	    if (successfulRead) {
+	        SaveStateDescriptor desc(slot, header.saveName);
 
 	        desc.setThumbnail(header.thumbnail);
 
 	        if (header.version > 0) {
-	            int day = (header.saveDate >> 24) & 0xFF;
-	            int month = (header.saveDate >> 16) & 0xFF;
-	            int year = header.saveDate & 0xFFFF;
+	            int day = header.saveDay;
+	            int month = header.saveMonth;
+	            int year = header.saveYear;
 
 	            desc.setSaveDate(year, month, day);
 
-	            int hour = (header.saveTime >> 16) & 0xFF;
-	            int minutes = (header.saveTime >> 8) & 0xFF;
+	            int hour = header.saveHour;
+	            int minutes = header.saveMinutes;
 
 	            desc.setSaveTime(hour, minutes);
 
-	            desc.setPlayTime(header.playTime * 1000);
+	            //desc.setPlayTime(header.playTime * 1000);
 	        }
 
 	        return desc;
 	    }
 	}
-	*/
 
 	return SaveStateDescriptor();
 }
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index ad01257e6b..d773b5fc6f 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -101,6 +101,8 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 								toSave = false;
 
 						if (toSave) {
+							// FIXME: At this point, the screen shows the save control, so the save game thumbnails will always
+							// show the save control
 							_engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText());
 							_engine->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
 							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
-- 
cgit v1.2.3


From d92e47f4e6ff7187ac0dca9ad1c54b2c96fda1b9 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Mon, 8 Dec 2014 10:29:23 +1100
Subject: SCUMM V1-V2: Fix actor walk behavior (transitions between walk boxes,
 and changing destination issue)

---
 engines/scumm/actor.cpp | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 59a1009789..07c8f84be7 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -385,13 +385,28 @@ int Actor::actorWalkStep() {
 		return 0;
 	}
 
-	tmpX = (_pos.x << 16) + _walkdata.xfrac + (_walkdata.deltaXFactor >> 8) * _scalex;
-	_walkdata.xfrac = (uint16)tmpX;
-	_pos.x = (tmpX >> 16);
+	if (_vm->_game.version <= 2) {
+		if (_walkdata.deltaXFactor != 0) {
+			if (_walkdata.deltaXFactor > 0)
+				_pos.x += 1;
+			else
+				_pos.x -= 1;
+		}
+		if (_walkdata.deltaYFactor != 0) {
+			if (_walkdata.deltaYFactor > 0)
+				_pos.y += 1;
+			else
+				_pos.y -= 1;
+		}
+	} else {
+		tmpX = (_pos.x << 16) + _walkdata.xfrac + (_walkdata.deltaXFactor >> 8) * _scalex;
+		_walkdata.xfrac = (uint16)tmpX;
+		_pos.x = (tmpX >> 16);
 
-	tmpY = (_pos.y << 16) + _walkdata.yfrac + (_walkdata.deltaYFactor >> 8) * _scaley;
-	_walkdata.yfrac = (uint16)tmpY;
-	_pos.y = (tmpY >> 16);
+		tmpY = (_pos.y << 16) + _walkdata.yfrac + (_walkdata.deltaYFactor >> 8) * _scaley;
+		_walkdata.yfrac = (uint16)tmpY;
+		_pos.y = (tmpY >> 16);
+	}
 
 	if (ABS(_pos.x - _walkdata.cur.x) > distX) {
 		_pos.x = _walkdata.next.x;
@@ -401,7 +416,7 @@ int Actor::actorWalkStep() {
 		_pos.y = _walkdata.next.y;
 	}
 
-	if (_vm->_game.version >= 4 && _vm->_game.version <= 6 && _pos == _walkdata.next) {
+	if ((_vm->_game.version <= 2 || (_vm->_game.version >= 4 && _vm->_game.version <= 6)) && _pos == _walkdata.next) {
 		_moving &= ~MF_IN_LEG;
 		return 0;
 	}
@@ -565,14 +580,17 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	_walkdata.dest.y = abr.y;
 	_walkdata.destbox = abr.box;
 	_walkdata.destdir = dir;
-	_walkdata.point3.x = 32000;
-	_walkdata.curbox = _walkbox;
-
+	
 	if (_vm->_game.version == 0) {
 		((Actor_v0*)this)->_newWalkBoxEntered = true;
-	} else {
-		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
-	}
+	} else if (_vm->_game.version <= 2) {
+		_moving = (_moving & ~(MF_LAST_LEG | MF_IN_LEG)) | MF_NEW_LEG;
+ 	} else {
+ 		_moving = (_moving & MF_IN_LEG) | MF_NEW_LEG;
+ 	}
+
+	_walkdata.point3.x = 32000;
+	_walkdata.curbox = _walkbox;
 }
 
 void Actor::startWalkAnim(int cmd, int angle) {
-- 
cgit v1.2.3


From 962c8b4524f46bbc2394d7a80972db0a474221a3 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Mon, 8 Dec 2014 19:04:17 +1100
Subject: SCUMM: Maniac V0 Demo: Allow F7 to restart, Add handler for opcode
 0x6e (o_screenPrepare)

---
 engines/scumm/file.cpp      |  2 +-
 engines/scumm/input.cpp     | 12 ++++++++++--
 engines/scumm/script_v0.cpp |  6 +++++-
 engines/scumm/scumm_v0.h    |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 7ead4c25b5..96b46aa21a 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -227,7 +227,7 @@ static const int maniacDemoResourcesPerFile[55] = {
 	 0,  1,  0,  0,  2,  0,  0,  1,  0,  0,
 	 2,  7,  1, 11,  0,  0,  5,  1,  0,  0,
 	 1,  0,  1,  3,  4,  3,  1,  0,  0,  1,
-	 1,  2,  0,  0,  0
+	 2,  2,  0,  0,  0
 };
 
 static const int zakResourcesPerFile[59] = {
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 824dfec144..86048af57c 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -452,8 +452,16 @@ void ScummEngine_v2::processKeyboard(Common::KeyState lastKeyHit) {
 		lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
 	// F7 is used to skip cutscenes in the Commodote 64 version of Maniac Mansion
 	} else if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformC64) {
-		if (lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0))
-			lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
+		// Demo always F7 to be pressed to restart
+		if (_game.features & GF_DEMO) {
+			if (_roomResource != 0x2D && lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0)) {
+				restart();
+				return;
+			}
+		} else {
+			if (lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0))
+				lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
+		}
 	// 'B' is used to skip cutscenes in the NES version of Maniac Mansion
 	} else if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformNES) {
 		if (lastKeyHit.keycode == Common::KEYCODE_b && lastKeyHit.hasFlags(Common::KBD_SHIFT))
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 8d9d196b62..609cbd1e89 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -172,7 +172,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* 6C */
 	OPCODE(0x6c, o_stopCurrentScript);
 	OPCODE(0x6d, o2_putActorInRoom);
-	OPCODE(0x6e, o2_dummy);
+	OPCODE(0x6e, o_screenPrepare);
 	OPCODE(0x6f, o2_ifState08);
 	/* 70 */
 	OPCODE(0x70, o_lights);
@@ -982,6 +982,10 @@ void ScummEngine_v0::o_setOwnerOf() {
 	setOwnerOf(obj, owner);
 }
 
+void ScummEngine_v0::o_screenPrepare() {
+
+}
+
 void ScummEngine_v0::resetSentence() {
 	_activeVerb = kVerbWalkTo;
 	_activeObject = 0;
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index e2f4a2ffbf..4098d639c4 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -166,6 +166,7 @@ protected:
 	void o_cutscene();
 	void o_endCutscene();
 	void o_setOwnerOf();
+	void o_screenPrepare();
 
 	byte VAR_ACTIVE_OBJECT2;
 	byte VAR_IS_SOUND_RUNNING;
-- 
cgit v1.2.3


From 0a6904c4abc242125532fb797290820834cbb2cf Mon Sep 17 00:00:00 2001
From: Kirben
Date: Mon, 8 Dec 2014 23:31:59 +1100
Subject: SCUMM: Correct variable type in Actor_v0::adjustPosInBorderWalkbox,
 since variable can have negative value.

---
 engines/scumm/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 6cbb2a4e45..0d7ea39ec2 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1528,7 +1528,7 @@ AdjustBoxResult Actor_v0::adjustPosInBorderWalkbox(AdjustBoxResult box) {
 	if (!(boxMask & 0x80))
 		return Result;
 
-	byte A;
+	int16 A;
 	boxMask &= 0x7C;
 	if (boxMask == 0x0C) 
 		A = 2;
-- 
cgit v1.2.3


From 68693f996dc9b66ecbdfda9c38e07765ba0a70df Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 9 Dec 2014 10:51:00 +0000
Subject: CONFIGURE: Add likely fix for AmigaOS4 linker relocation build
 failure.

---
 configure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index ebca8322dc..eba1ebcb32 100755
--- a/configure
+++ b/configure
@@ -2763,6 +2763,9 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/openpandora/op-bundle.mk"
 			;;
 		ppc-amigaos)
+			# PPC Linker requires this to fix relocation errors
+			CXXFLAGS="$CXXFLAGS -mlongcall"
+
 			# Only static builds link successfully on buildbot
 			LDFLAGS=`echo $LDFLAGS | sed 's/-use-dynld//'`
 			LDFLAGS="$LDFLAGS -static"
-- 
cgit v1.2.3


From ea8db1969a7f975103d26f6a6a7eaa54835db7c1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 9 Dec 2014 19:36:38 +0200
Subject: ZVISION: Fix the 'dumpfile' console command

---
 engines/zvision/core/console.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index f8e28333f1..e641783338 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -209,7 +209,8 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
 	}
 
 	Common::File f;
-	if (!f.open(argv[1])) {
+	if (!_engine->getSearchManager()->openFile(f, argv[1])) {
+		warning("File not found: %s", argv[1]);
 		return true;
 	}
 
-- 
cgit v1.2.3


From 1f80e1389fca2fc86d7176730115c48f4e503474 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 9 Dec 2014 19:37:33 +0200
Subject: ZVISION: Fix the responsiveness of level controls to mouse movement

This fixes the responsiveness of the levers in the planet screen of
Zork: Nemesis
---
 engines/zvision/scripting/controls/lever_control.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 12b07d7584..1e4087963e 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -221,10 +221,9 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 	bool cursorWasChanged = false;
 
 	if (_mouseIsCaptured) {
-		// Make sure the square distance between the last point and the current point is greater than 64
+		// Make sure the square distance between the last point and the current point is greater than 16
 		// This is a heuristic. This determines how responsive the lever is to mouse movement.
-		// TODO: Fiddle with the heuristic to get a good lever responsiveness 'feel'
-		if (_lastMousePos.sqrDist(backgroundImageSpacePos) >= 64) {
+		if (_lastMousePos.sqrDist(backgroundImageSpacePos) >= 16) {
 			int angle = calculateVectorAngle(_lastMousePos, backgroundImageSpacePos);
 			_lastMousePos = backgroundImageSpacePos;
 
-- 
cgit v1.2.3


From e670196c6266100000e16fc3c368bfdce8a6d558 Mon Sep 17 00:00:00 2001
From: Alexander Reim
Date: Wed, 10 Dec 2014 14:27:10 +0100
Subject: SCI: Add detection entries for the German versions of Phantasmagoria
 1+2

---
 engines/sci/detection_tables.h | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 0fddaa51b4..d6bdef946b 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2603,6 +2603,29 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_UNSTABLE, GUIO5(GUIO_NOSPEECH, GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// Phantasmagoria - German DOS/Windows
+	// Windows executable scanning reports "unknown" - "Sep 19 1995 09:39:48"
+	// DOS executable scanning reports "unknown" - "Sep 19 1995 16:18:34"
+	// VERSION file reports "1.100.000"
+	// Supplied by AReim1982
+	{"phantasmagoria", "", {
+		{"resmap.001", 0, "d5048f972d2e1abd5f6b6a3ea8a466b0", 11524},
+		{"ressci.001", 0, "3aae6559aa1df273bc542d5ac6330d75", 71063082},
+		{"resmap.002", 0, "ae0105261e04826324daf7dd2d534465", 12064},
+		{"ressci.002", 0, "3aae6559aa1df273bc542d5ac6330d75", 80283368},
+		{"resmap.003", 0, "50786a4f54c6432ec31b52be90b3a8ba", 12340},
+		{"ressci.003", 0, "3aae6559aa1df273bc542d5ac6330d75", 82360370},
+		{"resmap.004", 0, "4cd3bbff8b81bad85db52c0c8407bd81", 12562},
+		{"ressci.004", 0, "3aae6559aa1df273bc542d5ac6330d75", 84453560},
+		{"resmap.005", 0, "779bd12802da6cfe54ce482140824a46", 12616},
+		{"ressci.005", 0, "3aae6559aa1df273bc542d5ac6330d75", 85113663},
+		{"resmap.006", 0, "2299f97876493cc29b6a48e1cfe9619d", 12538},
+		{"ressci.006", 0, "3aae6559aa1df273bc542d5ac6330d75", 87602346},
+		{"resmap.007", 0, "06309b8043aecb85bd507b15d16cb544", 7984},
+		//{"ressci.007", 0, "3aae6559aa1df273bc542d5ac6330d75", 26898681},
+		AD_LISTEND},
+		Common::DE_DEU, Common::kPlatformDOS, ADGF_UNSTABLE, GUIO5(GUIO_NOSPEECH, GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) },
+
 	// Phantasmagoria - French DOS
 	// Supplied by Kervala in bug #6574
 	{"phantasmagoria", "", {
@@ -2674,6 +2697,25 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO5(GUIO_NOSPEECH, GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// Phantasmagoria 2 - German DOS/Windows
+	// Windows executable scanning reports "unknown" - "Dec 07 1996 15:42:02"
+	// DOS executable scanning reports "unknown" - "Dec 07 1996 08:35:12"
+	// VERSION file reports "000.1.0vu" (HEX: 30 30 30 2E 31 00 2E 30 76 FA 0D 0A)
+	// Supplied by AReim1982
+	{"phantasmagoria2", "", {
+		{"resmap.001", 0, "d62f48ff8bddb39503b97e33439482c9", 1114},
+		{"ressci.001", 0, "4ebc2b8455c74ad205ae592eec27313a", 24590716},
+		{"resmap.002", 0, "642a1f85ad8a4ce1d3850b10ad082200", 1138},
+		{"ressci.002", 0, "4ebc2b8455c74ad205ae592eec27313a", 34681672},
+		{"resmap.003", 0, "e08316864ef77735bb7f8f208110c43b", 1174},
+		{"ressci.003", 0, "4ebc2b8455c74ad205ae592eec27313a", 38930933},
+		{"resmap.004", 0, "875cf07df77fbaa1518a06ffed616c5f", 1300},
+		{"ressci.004", 0, "4ebc2b8455c74ad205ae592eec27313a", 42750325},
+		{"resmap.005", 0, "2fc48a4a5a73b726994f189da51a8b2a", 1954},
+		{"ressci.005", 0, "e94005890d22dd3b7f605a2a7c025803", 68232146},
+		AD_LISTEND},
+		Common::DE_DEU, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO5(GUIO_NOSPEECH, GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) },
+
 	// Phantasmagoria 2 - English DOS (GOG version) - ressci.* merged in ressci.000
 	// Executable scanning reports "3.000.000" - "Dec 07 1996 09:29:03"
 	// VERSION file reports "001.0.06"
-- 
cgit v1.2.3


From c98e9fa6f7702b81fa15667e58854de95cb4a5f6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 11 Dec 2014 13:24:27 +0200
Subject: ZVISION: Add a comment in the music code

---
 engines/zvision/scripting/sidefx/music_node.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index a76d3b4e8d..8316c1a76b 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -71,6 +71,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 1);
 
+	// Change filename.raw into filename.sub
 	Common::String subname = filename;
 	subname.setChar('s', subname.size() - 3);
 	subname.setChar('u', subname.size() - 2);
-- 
cgit v1.2.3


From 2644d084480d537388cc7f585338ff2bf0490b38 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 11 Dec 2014 13:25:37 +0200
Subject: ZVISION: Add functionality to show the current location. Some cleanup

---
 engines/zvision/core/console.cpp | 38 ++++++++++++++++----------------------
 engines/zvision/core/console.h   |  3 +--
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index e641783338..0f6cbfc96f 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -51,14 +51,13 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 	registerCmd("generaterendertable", WRAP_METHOD(Console, cmdGenerateRenderTable));
 	registerCmd("setpanoramafov", WRAP_METHOD(Console, cmdSetPanoramaFoV));
 	registerCmd("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale));
-	registerCmd("changelocation", WRAP_METHOD(Console, cmdChangeLocation));
+	registerCmd("location", WRAP_METHOD(Console, cmdLocation));
 	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
-	registerCmd("parseallscrfiles", WRAP_METHOD(Console, cmdParseAllScrFiles));
 }
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
 	if (argc != 2) {
-		debugPrintf("Use loadvideo <fileName> to load a video to the screen\n");
+		debugPrintf("Use %s <fileName> to load a video to the screen\n", argv[0]);
 		return true;
 	}
 
@@ -91,7 +90,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) {
 		Audio::SoundHandle handle;
 		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, soundStream, -1, 100, 0, DisposeAfterUse::YES, false, false);
 	} else {
-		debugPrintf("Use loadsound <fileName> [<rate> <isStereo: 1 or 0>] to load a sound\n");
+		debugPrintf("Use %s <fileName> [<rate> <isStereo: 1 or 0>] to load a sound\n", argv[0]);
 		return true;
 	}
 
@@ -100,7 +99,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) {
 
 bool Console::cmdRawToWav(int argc, const char **argv) {
 	if (argc != 3) {
-		debugPrintf("Use raw2wav <rawFilePath> <wavFileName> to dump a .RAW file to .WAV\n");
+		debugPrintf("Use %s <rawFilePath> <wavFileName> to dump a .RAW file to .WAV\n", argv[0]);
 		return true;
 	}
 
@@ -145,7 +144,7 @@ bool Console::cmdRawToWav(int argc, const char **argv) {
 
 bool Console::cmdSetRenderState(int argc, const char **argv) {
 	if (argc != 2) {
-		debugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n");
+		debugPrintf("Use %s <RenderState: panorama, tilt, flat> to change the current render state\n", argv[0]);
 		return true;
 	}
 
@@ -158,7 +157,7 @@ bool Console::cmdSetRenderState(int argc, const char **argv) {
 	else if (renderState.matchString("flat", true))
 		_engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::FLAT);
 	else
-		debugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n");
+		debugPrintf("Use %s <RenderState: panorama, tilt, flat> to change the current render state\n", argv[0]);
 
 	return true;
 }
@@ -171,7 +170,7 @@ bool Console::cmdGenerateRenderTable(int argc, const char **argv) {
 
 bool Console::cmdSetPanoramaFoV(int argc, const char **argv) {
 	if (argc != 2) {
-		debugPrintf("Use setpanoramafov <fieldOfView> to change the current panorama field of view\n");
+		debugPrintf("Use %s <fieldOfView> to change the current panorama field of view\n", argv[0]);
 		return true;
 	}
 
@@ -182,7 +181,7 @@ bool Console::cmdSetPanoramaFoV(int argc, const char **argv) {
 
 bool Console::cmdSetPanoramaScale(int argc, const char **argv) {
 	if (argc != 2) {
-		debugPrintf("Use setpanoramascale <scale> to change the current panorama scale\n");
+		debugPrintf("Use %s <scale> to change the current panorama scale\n", argv[0]);
 		return true;
 	}
 
@@ -191,9 +190,14 @@ bool Console::cmdSetPanoramaScale(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdChangeLocation(int argc, const char **argv) {
+bool Console::cmdLocation(int argc, const char **argv) {
+	Location curLocation = _engine->getScriptManager()->getCurrentLocation();
+	Common::String scrFile = Common::String::format("%c%c%c%c.scr", curLocation.world, curLocation.room, curLocation.node, curLocation.view);
+	debugPrintf("Current location: world '%c', room '%c', node '%c', view '%c', offset %d, script %s\n",
+				curLocation.world, curLocation.room, curLocation.node, curLocation.view, curLocation.offset, scrFile.c_str());
+	
 	if (argc != 6) {
-		debugPrintf("Use changelocation <char: world> <char: room> <char:node> <char:view> <int: x position> to change your location\n");
+		debugPrintf("Use %s <char: world> <char: room> <char:node> <char:view> <int: x offset> to change your location\n", argv[0]);
 		return true;
 	}
 
@@ -204,7 +208,7 @@ bool Console::cmdChangeLocation(int argc, const char **argv) {
 
 bool Console::cmdDumpFile(int argc, const char **argv) {
 	if (argc != 2) {
-		debugPrintf("Use dumpfile <fileName> to dump a file\n");
+		debugPrintf("Use %s <fileName> to dump a file\n", argv[0]);
 		return true;
 	}
 
@@ -229,14 +233,4 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdParseAllScrFiles(int argc, const char **argv) {
-	Common::ArchiveMemberList list;
-	SearchMan.listMatchingMembers(list, "*.scr");
-
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-	}
-
-	return true;
-}
-
 } // End of namespace ZVision
diff --git a/engines/zvision/core/console.h b/engines/zvision/core/console.h
index 994e05ba35..299bd6127f 100644
--- a/engines/zvision/core/console.h
+++ b/engines/zvision/core/console.h
@@ -44,9 +44,8 @@ private:
 	bool cmdGenerateRenderTable(int argc, const char **argv);
 	bool cmdSetPanoramaFoV(int argc, const char **argv);
 	bool cmdSetPanoramaScale(int argc, const char **argv);
-	bool cmdChangeLocation(int argc, const char **argv);
+	bool cmdLocation(int argc, const char **argv);
 	bool cmdDumpFile(int argc, const char **argv);
-	bool cmdParseAllScrFiles(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From fd6731c9b6f3977b2d03d1e6db2522e0769d8f33 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 12 Dec 2014 22:53:52 +0200
Subject: ZVISION: Only scale down animations to fit their frame, not up

This fixes the animations in two locations in Zork: Nemesis (the armor
visor in location cz1e, and the planet in location aa10).
---
 engines/zvision/scripting/sidefx/animation_node.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 549aacba7f..74e4cadbe9 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -117,7 +117,11 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 					dsth = nod->pos.height();
 				}
 
-				if (frame->w != dstw || frame->h != dsth) {
+				// We only scale down the animation to fit its frame, not up, otherwise we
+				// end up with distorted animations - e.g. the armor visor in location cz1e
+				// in Nemesis (one of the armors inside Irondune), or the planet in location
+				// aa10 in Nemesis (Juperon, outside the asylum).
+				if (frame->w > dstw || frame->h > dsth) {
 					if (nod->_scaled)
 						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
 							delete nod->_scaled;
-- 
cgit v1.2.3


From 374669d7c3d8b9d3b7207925c90417a4e82f7ed2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 19 Oct 2014 22:03:20 -0400
Subject: ACCESS: Fix scene establishment paging when there are multiple pages

---
 engines/access/access.cpp | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 28847370a2..a97bd6d322 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -239,29 +239,34 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
 		if ((s->_printOrg.y > _printEnd) && (!lastLine)) {
-			while (true) {
-				_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
-				_sound->_soundPriority[0] = 1;
-				_sound->playSound(0);
-				_scripts->cmdFreeSound();
-
-				_events->pollEvents();
-
-				if (_events->_leftButton) {
-					_events->debounceLeft();
-					_sndSubFile += soundsLeft;
-					break;
-				} else if (_events->_keypresses.size() != 0) {
-					_sndSubFile += soundsLeft;
-					break;
-				} else {
-					++_sndSubFile;
-					--soundsLeft;
-					if (soundsLeft == 0)
+			if (!_sound->_isVoice) {
+				_events->waitKeyMouse();
+			} else {
+				for (;;) {
+					_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
+					_sound->_soundPriority[0] = 1;
+					_sound->playSound(0);
+					_scripts->cmdFreeSound();
+
+					_events->pollEvents();
+
+					if (_events->_leftButton) {
+						_events->debounceLeft();
+						_sndSubFile += soundsLeft;
+						break;
+					} else if (_events->_keypresses.size() != 0) {
+						_sndSubFile += soundsLeft;
 						break;
+					} else {
+						++_sndSubFile;
+						--soundsLeft;
+						if (soundsLeft == 0)
+							break;
+					}
 				}
 			}
-			_buffer2.copyBuffer(s);
+
+			s->copyBuffer(&_buffer2);
 			s->_printOrg.y = s->_printStart.y;
 			++curPage;
 			soundsLeft = _countTbl[curPage];
-- 
cgit v1.2.3


From e9c003f30648936e58253dca2e72173757d2ff80 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 31 Oct 2014 19:44:45 -0400
Subject: ACCESS: Fix display of paged text in doEstablish calls

---
 engines/access/access.cpp             | 17 +++++++++++------
 engines/access/access.h               |  4 ++--
 engines/access/amazon/amazon_game.cpp | 11 +++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a97bd6d322..051884c704 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -218,17 +218,20 @@ void AccessEngine::freeInactiveData() {
 	_inactive._spritesPtr = nullptr;
 }
 
-void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr) {
+void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
+	Common::String lines = msg;
+	Common::String line;
 	int curPage = 0;
 	int soundsLeft = 0;
 
-	while(true) {
+	for (;;) {
 		soundsLeft = _countTbl[curPage];
 		_events->zeroKeys();
 
 		Common::String line;
 		int width = 0;
-		bool lastLine = _fonts._font2.getLine(msgArr[curPage], s->_maxChars * 6, line, width);
+		bool lastLine = _fonts._font2.getLine(lines, s->_maxChars * 6, line, width);
+
 		// Set font colors
 		_fonts._font2._fontColors[0] = 0;
 		_fonts._font2._fontColors[1] = 28;
@@ -308,11 +311,13 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 	}
 }
 
-void AccessEngine::printText(ASurface *s, Common::String &msg) {
+void AccessEngine::printText(ASurface *s, const Common::String &msg) {
+	Common::String lines = msg;
 	Common::String line;
 	int width = 0;
-	while (true) {
-		bool lastLine = _fonts._font2.getLine(msg, s->_maxChars * 6, line, width);
+
+	for (;;) {
+		bool lastLine = _fonts._font2.getLine(lines, s->_maxChars * 6, line, width);
 
 		// Set font colors
 		_fonts._font2._fontColors[0] = 0;
diff --git a/engines/access/access.h b/engines/access/access.h
index 157a33c723..bec1dacb4c 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -271,8 +271,8 @@ public:
 	/**
 	 * Draw a string on a given surface and update text positioning
 	 */
-	void printText(ASurface *s, Common::String &msg);
-	void speakText(ASurface *s, Common::Array<Common::String>msgArr);
+	void printText(ASurface *s, const Common::String &msg);
+	void speakText(ASurface *s, const Common::String &msg);
 
 	/**
 	 * Load a savegame
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 66b77d66d2..187b38c497 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -282,17 +282,12 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (estabIndex * 2) + 2);
 
 	_printEnd = 155;
+	Common::String msg((const char *)_eseg->data() + msgOffset);
+
 	if (_txtPages == 0) {
-		Common::String msg((const char *)_eseg->data() + msgOffset);
 		printText(_screen, msg);
 	} else {
-		Common::Array<Common::String> msgArr;
-		for (int i = 0; i < _txtPages; ++i) {
-			Common::String msg((const char *)_eseg->data() + msgOffset);
-			msgOffset += msg.size() + 1;
-			msgArr.push_back(msg);
-		}
-		speakText(_screen, msgArr);
+		speakText(_screen, msg);
 	}
 
 	_screen->forceFadeOut();
-- 
cgit v1.2.3


From 59c4c93c005896389915c1022634e5dd041e268a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 31 Oct 2014 20:34:32 -0400
Subject: ACCESS: Add needed event polling to cmdCheckTimer

---
 engines/access/scripts.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 0b2150a5a6..85c714f4a8 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -414,6 +414,7 @@ void Scripts::cmdSetTimer() {
 void Scripts::cmdCheckTimer() {
 	int idx = _data->readUint16LE();
 
+	_vm->_events->pollEvents();
 	if ((idx == 9) && (_vm->_events->_keypresses.size() > 0)) {
 		_vm->_events->zeroKeys();
 		_vm->_timers[9]._timer = 0;
-- 
cgit v1.2.3


From 3627ff51aaad803f611b2e5f3072914d0170ed9c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 31 Oct 2014 23:01:47 -0400
Subject: ACCESS: Implemented code for cmdChapter

---
 engines/access/access.cpp                  |  11 ++
 engines/access/access.h                    |   5 +
 engines/access/amazon/amazon_game.cpp      | 158 ++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_game.h        |   6 ++
 engines/access/amazon/amazon_resources.cpp |  38 +++++++
 engines/access/amazon/amazon_resources.h   |   6 ++
 engines/access/amazon/amazon_scripts.cpp   |   7 +-
 engines/access/amazon/amazon_scripts.h     |   2 +-
 engines/access/files.cpp                   |   2 +-
 engines/access/files.h                     |   3 +-
 engines/access/scripts.h                   |   3 +-
 engines/access/video.cpp                   |   2 +-
 engines/access/video.h                     |   2 +-
 13 files changed, 235 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 051884c704..1e3e3a7754 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -432,6 +432,17 @@ void AccessEngine::copyBF2Vid() {
 	}
 }
 
+void AccessEngine::playVideo(int fileNum, const Common::Point &pt) {
+	_video->setVideo(_screen, pt, FileIdent(fileNum, 96), 10);
+
+	while (!shouldQuit() && !_video->_videoEnd) {
+		_video->playVideo();
+
+		g_system->delayMillis(10);
+		_events->pollEvents();
+	}
+}
+
 void AccessEngine::doLoadSave() {
 	error("TODO: doLoadSave");
 }
diff --git a/engines/access/access.h b/engines/access/access.h
index bec1dacb4c..a12a63212d 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -119,6 +119,11 @@ protected:
 	*/
 	Common::String AccessEngine::generateSaveName(int slot);
 
+	/**
+	 * Play back an entire video
+	 */
+	void playVideo(int fileNum, const Common::Point &pt);
+
 	// Engine APIs
 	virtual Common::Error run();
 	virtual bool hasFeature(EngineFeature f) const;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 187b38c497..3af07edaf3 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -55,11 +55,13 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
 	_tilePos = Common::Point(0, 0);
+	_hintLevel = 0;
 
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 	memset(_tileData, 0, sizeof(_tileData));
+	
+	_chapterCells.push_back(CellIdent(0, 96, 17));
 
-	_hintLevel = 0;
 }
 
 AmazonEngine::~AmazonEngine() {
@@ -380,6 +382,160 @@ void AmazonEngine::drawHelp() {
 	error("TODO: drawHelp");
 }
 
+void AmazonEngine::startChapter(int chapter) {
+	_chapter = chapter;
+	assert(_chapter <= 14);
+
+	if (chapter != 1) {
+		_room->clearRoom();
+		freeChar();
+		
+		_sound->newMusic(32, 0);
+		playVideo(0, Common::Point());
+		if (shouldQuit())
+			return;
+
+		_events->debounceLeft();
+		_events->zeroKeys();
+		playVideo(_chapter, Common::Point(4, 113));
+		if (shouldQuit())
+			return;
+
+		_timers[20]._timer = 500;
+		_timers[20]._initTm = 500;
+		_timers[20]._flag++;
+
+		_sound->_soundTable[0] = _sound->loadSound(115, 0);
+		_sound->_soundPriority[0] = 1;
+		_sound->playSound(0);
+		_sound->freeSounds();
+
+		_sound->_soundTable[0] = _sound->loadSound(115, 1);
+		_sound->_soundPriority[0] = 1;
+		_sound->playSound(0);
+		_sound->freeSounds();
+
+		// Wait loop
+		while (!shouldQuit() && !_events->_leftButton && !_events->_rightButton
+				&& _events->_keypresses.size() == 0 && _timers[20]._flag) {
+			_events->pollEvents();
+			g_system->delayMillis(10);
+		}
+	}
+
+	_screen->forceFadeOut();
+	_events->debounceLeft();
+	_events->zeroKeys();
+	_screen->clearScreen();
+
+	_screen->setPanel(3);
+	
+	// Set up cells for the chapter display
+	Common::Array<CellIdent> chapterCells;
+	chapterCells.push_back(CellIdent(0, 96, 17));
+	const int *chapCell = &CHAPTER_CELLS[_chapter - 1][0];
+	chapterCells.push_back(CellIdent(chapCell[0], chapCell[1], chapCell[2]));
+	loadCells(chapterCells);
+
+	// Show chapter screen
+	_files->loadScreen(96, 15);
+	_buffer2.copyFrom(*_screen);
+
+	const int *chapImg = &CHAPTER_TABLE[_chapter - 1][0];
+	_screen->plotImage(_objectsTable[0], _chapter - 1, 
+		Common::Point(chapImg[1], chapImg[2]));
+	_screen->plotImage(_objectsTable[_chapter - 1], 0,
+		Common::Point(chapImg[3], chapImg[4]));
+	if (chapter == 14)
+		_screen->plotImage(_objectsTable[_chapter - 1], 1, Common::Point(169, 76));
+
+	_sound->newMusic(chapImg[4], 1);
+	_sound->newMusic(33, 0);
+	_screen->forceFadeIn();
+
+	_timers[20]._timer = 950;
+	_timers[20]._initTm = 950;
+	_timers[20]._flag++;
+
+	// Wait loop
+	while (!shouldQuit() && !_events->_leftButton && !_events->_rightButton
+		&& _events->_keypresses.size() == 0 && _timers[20]._flag) {
+		_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+	if (shouldQuit())
+		return;
+
+	_screen->forceFadeOut();
+	_events->debounceLeft();
+	_events->zeroKeys();
+	
+	_screen->clearBuffer();
+	_files->loadScreen(96, 16);
+	_buffer2.copyFrom(*_screen);
+	_screen->plotImage(_objectsTable[0], chapImg[0], Common::Point(90, 7));
+
+	_sound->newMusic(7, 1);
+	_sound->newMusic(34, 0);
+
+	_screen->forceFadeIn();
+	_buffer2.copyFrom(*_screen);
+
+	_fonts._charSet._lo = 1;
+	_fonts._charSet._hi = 10;
+	_fonts._charFor._lo = 55;
+	_fonts._charFor._hi = 0xFF;
+	_screen->_printOrg = Common::Point(31, 77);
+	_screen->_printStart = Common::Point(31, 77);
+
+	_establishGroup = 1;
+	loadEstablish(0x40 + _chapter);
+	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (_chapter * 2) + 2);
+	_printEnd = 170;
+
+	_printEnd = 155;
+	Common::String msg((const char *)_eseg->data() + msgOffset);
+
+	if (_txtPages == 0) {
+		printText(_screen, msg);
+	} else {
+		speakText(_screen, msg);
+	}
+	if (shouldQuit())
+		return;
+
+	_screen->forceFadeOut();
+	_screen->clearBuffer();
+	freeCells();
+	
+	_sound->newMusic(_chapter * 2, 1);
+
+	if (chapter != 1 && chapter != 14) {
+		_room->init4Quads();
+	}
+
+	if (chapter == 14) {
+		_conversation = 31;
+		_char->loadChar(_conversation);
+		_events->setCursor(CURSOR_ARROW);
+
+		_images.clear();
+		_oldRects.clear();
+		_scripts->_sequence = 0;
+		_scripts->searchForSequence();
+
+		if (_screen->_vesaMode) {
+			_converseMode = 1;
+		}
+	} else if (chapter != 1) {
+		_player->_roomNumber = CHAPTER_JUMP[_chapter - 1];
+		_room->_function = 1;
+		_converseMode = 0;
+
+		_scripts->cmdRetPos();
+	}
+}
+
 void AmazonEngine::synchronize(Common::Serializer &s) {
 	AccessEngine::synchronize(s);
 
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 0275ceec17..2dc0c058fb 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -70,6 +70,7 @@ private:
 	// Other fields
 	Common::Point _tilePos;
 	byte _tileData[1455];
+	Common::Array<CellIdent> _chapterCells;
 
 	/**
 	 * Do the game introduction
@@ -161,6 +162,11 @@ public:
 
 	void tileScreen();
 	void updateSummary(int chap);
+
+	/**
+	 * Show the start of a chapter
+	 */
+	void startChapter(int chapter);
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index a51457522e..05af0c116b 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1314,6 +1314,44 @@ const int DEATH_CELLS[12][3] = {
 	{ 0, 94, 14 }
 };
 
+const int CHAPTER_CELLS[17][3] = {
+	{ 1, 96, 18 },
+	{ 2, 96, 19 },
+	{ 3, 96, 20 },
+	{ 4, 96, 21 },
+	{ 5, 96, 22 },
+	{ 6, 96, 23 },
+	{ 7, 96, 24 },
+	{ 8, 96, 25 },
+	{ 9, 96, 26 },
+	{ 10, 96, 27 },
+	{ 11, 96, 28 },
+	{ 12, 96, 29 },
+	{ 13, 96, 30 },
+	{ 14, 96, 31 }
+};
+
+const int CHAPTER_TABLE[14][5] = {
+	{ 18, 136, 27, 76, 49 },
+	{ 16, 134, 27, 53, 74 },
+	{ 16, 136, 27, 52, 56 },
+	{ 16, 135, 26, 46, 75 },
+	{ 16, 135, 27, 54, 66 },
+	{ 16, 137, 27, 67, 79 },
+	{ 14, 136, 27, 82, 52 },
+	{ 15, 136, 26, 65, 73 },
+	{ 15, 137, 26, 48, 75 },
+	{ 17, 135, 27, 52, 66 },
+	{ 15, 135, 27, 62, 65 },
+	{ 16, 135, 28, 45, 66 },
+	{ 16, 135, 28, 36, 67 },
+	{ 15, 135, 27, 34, 63 }
+};
+
+const int CHAPTER_JUMP[14] = {
+	0, 12, 10, 15, 19, 25, 31, 36, 45, 46, 29, 55, 61, 0
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 17cca2a0b4..d8d37b5a5f 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -58,6 +58,12 @@ extern const char *const DEATH_TEXT[58];
 
 extern const int DEATH_CELLS[12][3];
 
+extern const int CHAPTER_CELLS[17][3];
+
+extern const int CHAPTER_TABLE[14][5];
+
+extern const int CHAPTER_JUMP[14];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index a932dad216..7ad68bd5bc 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -414,7 +414,7 @@ typedef void(AmazonScripts::*AmazonScriptMethodPtr)();
 void AmazonScripts::executeCommand(int commandIndex) {
 	static const AmazonScriptMethodPtr COMMAND_LIST[] = {
 		&AmazonScripts::cmdHelp, &AmazonScripts::CMDCYCLEBACK,
-		&AmazonScripts::CMDCHAPTER, &AmazonScripts::cmdSetHelp,
+		&AmazonScripts::cmdChapter, &AmazonScripts::cmdSetHelp,
 		&AmazonScripts::cmdCenterPanel, &AmazonScripts::cmdMainPanel,
 		&AmazonScripts::CMDRETFLASH
 	};
@@ -452,8 +452,9 @@ void AmazonScripts::cmdHelp() {
 void AmazonScripts::CMDCYCLEBACK() { 
 	error("TODO CMDCYCLEBACK"); 
 }
-void AmazonScripts::CMDCHAPTER() { 
-	error("TODO CMDCHAPTER"); 
+void AmazonScripts::cmdChapter() {
+	int chapter = _data->readByte();
+	_game->startChapter(chapter);
 }
 
 void AmazonScripts::cmdSetHelp() {
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 50bd2ac9b1..edb8843da3 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -53,7 +53,7 @@ protected:
 
 	void cmdHelp();
 	void CMDCYCLEBACK();
-	void CMDCHAPTER();
+	void cmdChapter();
 	void cmdSetHelp();
 	void cmdCenterPanel();
 	void cmdMainPanel();
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index d8823c0510..a4ec16ad61 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -101,7 +101,7 @@ Resource *FileManager::loadFile(int fileNum, int subfile) {
 	return res;
 }
 
-Resource *FileManager::loadFile(FileIdent &fileIdent) {
+Resource *FileManager::loadFile(const FileIdent &fileIdent) {
 	return loadFile(fileIdent._fileNum, fileIdent._subfile);
 }
 
diff --git a/engines/access/files.h b/engines/access/files.h
index a32ebbf88c..720d4fb2ba 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -38,6 +38,7 @@ struct FileIdent {
 	int _subfile;
 
 	FileIdent();
+	FileIdent(int fileNum, int subfile) { _fileNum = fileNum; _subfile = subfile; }
 
 	void load(Common::SeekableReadStream &s);
 };
@@ -112,7 +113,7 @@ public:
 	/**
 	 * Loads a resource specified by a file identifier
 	 */
-	Resource *loadFile(FileIdent &fileIdent);
+	Resource *loadFile(const FileIdent &fileIdent);
 
 	/**
 	 * Load a given file by name
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 003f441234..e6faa46dde 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -66,7 +66,6 @@ protected:
 	void cmdJumpTalk();
 	void cmdNull();
 	void cmdPrint();
-	void cmdRetPos();
 	void cmdAnim();
 	void cmdSetFlag();
 	void cmdCheckFlag();
@@ -145,7 +144,9 @@ public:
 
 	void findNull();
 
+	// Script commands that need to be public
 	void cmdFreeSound();
+	void cmdRetPos();
 };
 
 } // End of namespace Access
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 4b9a875931..b46bdf240f 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -38,7 +38,7 @@ VideoPlayer::~VideoPlayer() {
 }
 
 
-void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, FileIdent &videoFile, int rate) {
+void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate) {
 	_vidSurface = vidSurface;
 	vidSurface->_orgX1 = pt.x;
 	vidSurface->_orgY1 = pt.y;
diff --git a/engines/access/video.h b/engines/access/video.h
index bb9656b296..b49c876a07 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -62,7 +62,7 @@ public:
 	/**
 	 * Start up a video
 	 */
-	void setVideo(ASurface *vidSurface, const Common::Point &pt, FileIdent &videoFile, int rate);
+	void setVideo(ASurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate);
 
 	/**
 	 * Decodes a frame of the video
-- 
cgit v1.2.3


From fb6d9230dc24d68b888ed4cefbf99bbf2fb60e3d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 13:43:11 -0400
Subject: ACCESS: Add missing table to savegames

---
 engines/access/access.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 1e3e3a7754..9b49b9f55c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -539,6 +539,9 @@ void AccessEngine::synchronize(Common::Serializer &s) {
 	s.syncAsUint16LE(_mapOffset);
 	s.syncAsUint16LE(_screenVirtX);
 
+	for (int i = 0; i < 100; ++i)
+		s.syncAsByte(_establishTable[i]);
+
 	// Synchronize sub-objects
 	_timers.synchronize(s);
 	_inventory->synchronize(s);
-- 
cgit v1.2.3


From 386aae3ffa60c9ef44181cb730ab947544b2e761 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 13:55:52 -0400
Subject: ACCESS: Workaround for background column rendering bug in original

---
 engines/access/room.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 2c597609e1..181dcd6c5b 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -309,7 +309,10 @@ void Room::buildColumn(int playX, int screenX) {
 	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
 		_playFieldWidth + playX;
 
-	for (int y = 0; y <= _vm->_screen->_vWindowHeight; ++y) {
+	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
+	int h = MIN(_vm->_screen->_vWindowHeight + 1, _playFieldHeight);
+
+	for (int y = 0; y < h; ++y) {
 		byte *pTile = _tile + (*pSrc << 8);
 		byte *pDest = (byte *)_vm->_buffer1.getBasePtr(screenX, y * TILE_HEIGHT);
 
-- 
cgit v1.2.3


From 21c1d0f920a530b310a68376e9aa8836ed43471b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 14:13:29 -0400
Subject: ACCESS: Workaround for background rendering bug in original

---
 engines/access/room.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 181dcd6c5b..9b830770af 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -289,14 +289,16 @@ void Room::setWallCodes() {
 
 void Room::buildScreen() {
 	int scrollCol = _vm->_screen->_scrollCol;
-	int cnt = _vm->_screen->_vWindowWidth + 1;
 	int offset = 0;
 
 	// Clear current background buffer
 	_vm->_buffer1.clearBuffer();
 
+	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
+	int w = MIN(_vm->_screen->_vWindowWidth + 1, _playFieldWidth);
+
 	// Loop through drawing each column of tiles forming the background
-	for (int idx = 0; idx < cnt; offset += TILE_WIDTH, ++idx) {
+	for (int idx = 0; idx < w; offset += TILE_WIDTH, ++idx) {
 		buildColumn(_vm->_screen->_scrollCol, offset);
 		++_vm->_screen->_scrollCol;
 	}
-- 
cgit v1.2.3


From ae24bf54b43ab682f4e057c117810c1506b58d4d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 16:07:52 -0400
Subject: ACCESS: Fixes for startChapter

---
 engines/access/access.cpp                  | 4 ++--
 engines/access/access.h                    | 2 +-
 engines/access/amazon/amazon_game.cpp      | 7 ++++---
 engines/access/amazon/amazon_resources.cpp | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 9b49b9f55c..fab66c3b6c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -432,8 +432,8 @@ void AccessEngine::copyBF2Vid() {
 	}
 }
 
-void AccessEngine::playVideo(int fileNum, const Common::Point &pt) {
-	_video->setVideo(_screen, pt, FileIdent(fileNum, 96), 10);
+void AccessEngine::playVideo(int videoNum, const Common::Point &pt) {
+	_video->setVideo(_screen, pt, FileIdent(96, videoNum), 10);
 
 	while (!shouldQuit() && !_video->_videoEnd) {
 		_video->playVideo();
diff --git a/engines/access/access.h b/engines/access/access.h
index a12a63212d..fcac69d56e 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -122,7 +122,7 @@ protected:
 	/**
 	 * Play back an entire video
 	 */
-	void playVideo(int fileNum, const Common::Point &pt);
+	void playVideo(int videoNum, const Common::Point &pt);
 
 	// Engine APIs
 	virtual Common::Error run();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 3af07edaf3..8270eaee6b 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -444,10 +444,10 @@ void AmazonEngine::startChapter(int chapter) {
 	const int *chapImg = &CHAPTER_TABLE[_chapter - 1][0];
 	_screen->plotImage(_objectsTable[0], _chapter - 1, 
 		Common::Point(chapImg[1], chapImg[2]));
-	_screen->plotImage(_objectsTable[_chapter - 1], 0,
+	_screen->plotImage(_objectsTable[_chapter], 0,
 		Common::Point(chapImg[3], chapImg[4]));
 	if (chapter == 14)
-		_screen->plotImage(_objectsTable[_chapter - 1], 1, Common::Point(169, 76));
+		_screen->plotImage(_objectsTable[_chapter], 1, Common::Point(169, 76));
 
 	_sound->newMusic(chapImg[4], 1);
 	_sound->newMusic(33, 0);
@@ -485,12 +485,13 @@ void AmazonEngine::startChapter(int chapter) {
 	_fonts._charSet._hi = 10;
 	_fonts._charFor._lo = 55;
 	_fonts._charFor._hi = 0xFF;
+	_screen->_maxChars = 43;
 	_screen->_printOrg = Common::Point(31, 77);
 	_screen->_printStart = Common::Point(31, 77);
 
 	_establishGroup = 1;
 	loadEstablish(0x40 + _chapter);
-	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (_chapter * 2) + 2);
+	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + ((0x40 + _chapter) * 2) + 2);
 	_printEnd = 170;
 
 	_printEnd = 155;
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 05af0c116b..0807a979cc 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -48,7 +48,7 @@ const char *const FILENAMES[] = {
 	"NARATE01.AP", "NARATE02.AP", "NARATE03.AP", "NARATE04.AP",
 	"NARATE05.AP", "NARATE06.AP", "NARATE07.AP", "NARATE08.AP",
 	"NARATE09.AP", "NARATE10.AP", "NARATE11.AP", "NARATE12.AP",
-	"NARATE13.AP", "NARATE14.AP"
+	"NARATE13.AP", "NARATE14.AP", "S00.AP", "TAG.AP"
 };
 
 const byte MOUSE0[] = {
-- 
cgit v1.2.3


From 48edbf1e34993ee8eda7902197e1e6cdb33dce7b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 20:57:39 -0400
Subject: ACCESS: Fixed clearing talk bubbles during conversations

---
 engines/access/bubble_box.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index c4272b607a..d865d5c9b3 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -47,6 +47,15 @@ void BubbleBox::load(Common::SeekableReadStream *stream) {
 }
 
 void BubbleBox::clearBubbles() {
+	// Loop through the bubble list to restore the screen areas
+	for (uint i = 0; i < _bubbles.size(); ++i) {
+		_vm->_screen->_screenYOff = 0;
+		Common::Rect r = _bubbles[i];
+		r.left -= 2;
+		_vm->_screen->copyBlock(&_vm->_buffer2, r);
+	}
+
+	// Clear the list
 	_bubbles.clear();
 }
 
@@ -56,7 +65,7 @@ void BubbleBox::placeBubble(const Common::String &msg) {
 }
 
 void BubbleBox::placeBubble1(const Common::String &msg) {
-	BubbleBox::clearBubbles();
+	clearBubbles();
 	_vm->_fonts._charSet._lo = 1;
 	_vm->_fonts._charSet._hi = 8;
 	_vm->_fonts._charFor._lo = 29;
-- 
cgit v1.2.3


From 7e4d76b1fb41662cd48e21d775322d2a0ad3325e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 20:58:13 -0400
Subject: ACCESS: Implemented cmdWait

---
 engines/access/scripts.cpp | 23 +++++++++++++++++++++--
 engines/access/scripts.h   |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 85c714f4a8..bed1a775f6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -127,7 +127,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
-		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::CMDWAIT, 
+		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
@@ -655,7 +655,26 @@ void Scripts::cmdTexChoice() {
 	_vm->_bubbleBox->clearBubbles();
 }
 
-void Scripts::CMDWAIT() { error("TODO CMDWAIT"); }
+void Scripts::cmdWait() { 
+	int time = _data->readSint16LE();
+	_vm->_timers[3]._timer = time;
+	_vm->_timers[3]._initTm = time;
+	_vm->_timers[3]._flag++;
+	_vm->_events->_keypresses.clear();
+
+	while (!_vm->shouldQuit() && _vm->_events->_keypresses.empty() &&
+			!_vm->_events->_leftButton && !_vm->_events->_rightButton &&
+			_vm->_timers[3]._flag) {
+		_vm->_sound->midiRepeat();
+		charLoop();
+
+		_vm->_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+
+	_vm->_events->debounceLeft();
+	_vm->_events->zeroKeys();
+}
 
 void Scripts::cmdSetConPos() {
 	int x = _data->readSint16LE();
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index e6faa46dde..49c3b562b9 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -106,7 +106,7 @@ protected:
 	void cmdCharSpeak();
 	void cmdTexSpeak();
 	void cmdTexChoice();
-	void CMDWAIT();
+	void cmdWait();
 	void cmdSetConPos();
 	void CMDCHECKVFRAME();
 	void cmdJumpChoice();
-- 
cgit v1.2.3


From f3063a13f08a2b085d92d0a79231e568671501b3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 22:20:23 -0400
Subject: ACCESS: Implement palette cycling script commands

---
 engines/access/amazon/amazon_scripts.cpp |  6 ++---
 engines/access/amazon/amazon_scripts.h   |  2 +-
 engines/access/screen.cpp                | 38 ++++++++++++++++++++++++++++++++
 engines/access/screen.h                  |  9 ++++++++
 engines/access/scripts.cpp               | 14 +++++++++---
 engines/access/scripts.h                 |  4 ++--
 6 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7ad68bd5bc..0ea9ee5ebe 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -413,7 +413,7 @@ typedef void(AmazonScripts::*AmazonScriptMethodPtr)();
 
 void AmazonScripts::executeCommand(int commandIndex) {
 	static const AmazonScriptMethodPtr COMMAND_LIST[] = {
-		&AmazonScripts::cmdHelp, &AmazonScripts::CMDCYCLEBACK,
+		&AmazonScripts::cmdHelp, &AmazonScripts::cmdCycleBack,
 		&AmazonScripts::cmdChapter, &AmazonScripts::cmdSetHelp,
 		&AmazonScripts::cmdCenterPanel, &AmazonScripts::cmdMainPanel,
 		&AmazonScripts::CMDRETFLASH
@@ -449,8 +449,8 @@ void AmazonScripts::cmdHelp() {
 	error("TODO: more cmdHelp");
 }
 
-void AmazonScripts::CMDCYCLEBACK() { 
-	error("TODO CMDCYCLEBACK"); 
+void AmazonScripts::cmdCycleBack() { 
+	_vm->_screen->cyclePaletteBackwards();
 }
 void AmazonScripts::cmdChapter() {
 	int chapter = _data->readByte();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index edb8843da3..694260ddcb 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -52,7 +52,7 @@ protected:
 	void boatWalls(int param1, int param2);
 
 	void cmdHelp();
-	void CMDCYCLEBACK();
+	void cmdCycleBack();
 	void cmdChapter();
 	void cmdSetHelp();
 	void cmdCenterPanel();
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 227d9d7d0c..17f36fc072 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -59,6 +59,9 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_vWindowLinesTall = this->h;
 	_clipWidth = _vWindowBytesWide - 1;
 	_clipHeight = _vWindowLinesTall - 1;
+	_startCycle = 0;
+	_cycleStart = 0;
+	_endCycle = 0;
 }
 
 void Screen::clearScreen() {
@@ -244,4 +247,39 @@ void Screen::copyBlock(ASurface *src, const Common::Rect &bounds) {
 	copyRectToSurface(*src, destBounds.left, destBounds.top, bounds);
 }
 
+void Screen::setPaletteCycle(int startCycle, int endCycle, int timer) {
+	_startCycle = _cycleStart = startCycle;
+	_endCycle = endCycle;
+
+	TimerEntry &te = _vm->_timers[6];
+	te._timer = te._initTm = timer;
+	te._flag++;
+}
+
+void Screen::cyclePaletteForward() {
+	cyclePaletteBackwards();
+}
+
+void Screen::cyclePaletteBackwards() {
+	if (!_vm->_timers[6]._flag) {
+		_vm->_timers[6]._flag++;
+		byte *pStart = &_rawPalette[_cycleStart * 3];
+		byte *pEnd = &_rawPalette[_endCycle * 3];
+		
+		for (int idx = _startCycle; idx < _endCycle; ++idx) {
+			g_system->getPaletteManager()->setPalette(pStart, idx, 1);
+			
+			pStart += 3;
+			if (pStart == pEnd)
+				pStart = &_rawPalette[_cycleStart * 3];
+		}
+
+		if (--_cycleStart <= _startCycle)
+			_cycleStart = _endCycle - 1;
+
+		g_system->updateScreen();
+		g_system->delayMillis(10);
+	}
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index b278062d13..2db05a5f9d 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -60,6 +60,9 @@ private:
 	Common::Point _virtualOffsetsTable[4];
 	bool _hideFlag;
 	ScreenSave _screenSave;
+	int _startCycle;
+	int _cycleStart;
+	int _endCycle;
 
 	void updatePalette();
 public:
@@ -150,6 +153,12 @@ public:
 	 * Restores previously saved screen display state variables
 	 */
 	void restoreScreen();
+
+	void setPaletteCycle(int startCycle, int endCycle, int timer);
+
+	void cyclePaletteForward();
+
+	void cyclePaletteBackwards();
 };
 
 } // End of namespace Access
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index bed1a775f6..2aa10b6b4a 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -126,7 +126,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, 
 		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
-		&Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, 
+		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
 		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
@@ -514,8 +514,16 @@ void Scripts::cmdSpecial() {
 	}
 }
 
-void Scripts::CMDSETCYCLE() { error("TODO CMDSETCYCLE"); }
-void Scripts::CMDCYCLE() { error("TODO CMDCYCLE"); }
+void Scripts::cmdSetCycle() { 
+	int startCycle = _data->readUint16LE();
+	int endCycle = _data->readUint16LE();
+	int timer = _data->readUint16LE();
+	_vm->_screen->setPaletteCycle(startCycle, endCycle, timer);
+}
+
+void Scripts::cmdCycle() {
+	_vm->_screen->cyclePaletteForward();
+}
 
 void Scripts::cmdCharSpeak() {
 	_vm->_screen->_printOrg = _charsOrg;
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 49c3b562b9..f4128f4e31 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -101,8 +101,8 @@ protected:
 	void CMDPLAYBUFVID();
 	void cmdRemoveLast();
 	void cmdSpecial();
-	void CMDSETCYCLE();
-	void CMDCYCLE();
+	void cmdSetCycle();
+	void cmdCycle();
 	void cmdCharSpeak();
 	void cmdTexSpeak();
 	void cmdTexChoice();
-- 
cgit v1.2.3


From c03845258843a7b0d1db792ea42a986bf79c917a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Nov 2014 22:25:41 -0400
Subject: ACCESS: Add missing _startup checks to palette cycling opcodes

---
 engines/access/amazon/amazon_scripts.cpp | 5 +++--
 engines/access/scripts.cpp               | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0ea9ee5ebe..3e7fd4e84e 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -449,8 +449,9 @@ void AmazonScripts::cmdHelp() {
 	error("TODO: more cmdHelp");
 }
 
-void AmazonScripts::cmdCycleBack() { 
-	_vm->_screen->cyclePaletteBackwards();
+void AmazonScripts::cmdCycleBack() {
+	if (_vm->_startup == -1)
+		_vm->_screen->cyclePaletteBackwards();
 }
 void AmazonScripts::cmdChapter() {
 	int chapter = _data->readByte();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2aa10b6b4a..c46d7b972f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -522,7 +522,8 @@ void Scripts::cmdSetCycle() {
 }
 
 void Scripts::cmdCycle() {
-	_vm->_screen->cyclePaletteForward();
+	if (_vm->_startup == -1)
+		_vm->_screen->cyclePaletteForward();
 }
 
 void Scripts::cmdCharSpeak() {
-- 
cgit v1.2.3


From 335acfac892ab071d791db46161d5ca4c8868109 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 2 Nov 2014 12:00:50 +0100
Subject: ACCESS: Implement newMusic()

---
 engines/access/sound.cpp | 18 +++++++++++++++++-
 engines/access/sound.h   |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 90818ed5d3..072261dbf2 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -30,6 +30,7 @@ namespace Access {
 SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : 
 		_vm(vm), _mixer(mixer) {
 	_music = nullptr;
+	_tempMusic = nullptr;
 	_musicRepeat = false;
 	_playingSound = false;
 	_isVoice = false;
@@ -37,6 +38,8 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 
 SoundManager::~SoundManager() {
 	clearSounds();
+	delete _music;
+	delete _tempMusic;
 }
 
 void SoundManager::clearSounds() {
@@ -95,7 +98,20 @@ void SoundManager::freeSounds() {
 }
 
 void SoundManager::newMusic(int musicId, int mode) {
-	warning("TODO: newMusic");
+	if (mode == 1) {
+		stopSong();
+		freeMusic();
+		_music = _tempMusic;
+		_tempMusic = nullptr;
+		_musicRepeat = true;
+		if (_music)
+			midiPlay();
+	} else {
+		_musicRepeat = (mode == 2);
+		_tempMusic = _music;
+		stopSong();
+		_music = loadSound(97, musicId);
+	}
 }
 
 void SoundManager::freeMusic() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index cc02229b3b..5c130661a7 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -46,6 +46,7 @@ public:
 	Common::Array<Resource *> _soundTable;
 	Common::Array<int> _soundPriority;
 	Resource *_music;
+	Resource *_tempMusic;
 	bool _musicRepeat;
 	bool _playingSound;
 	bool _isVoice;
-- 
cgit v1.2.3


From 2805dcaa7bcb315e124e0f2bab7218d834a05d99 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 2 Nov 2014 14:42:16 +0100
Subject: ACCESS: Implement freeSounds

---
 engines/access/sound.cpp | 7 ++++++-
 engines/access/sound.h   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 072261dbf2..dd8cf16189 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -93,8 +93,13 @@ void SoundManager::stopSong() {
 	// TODO
 }
 
+void SoundManager::stopSound() {
+	// TODO: REALSTOPSND or BLASTSTOPSND or STOP_SOUNDG
+}
+
 void SoundManager::freeSounds() {
-	// TODO
+	stopSound();
+	clearSounds();
 }
 
 void SoundManager::newMusic(int musicId, int mode) {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 5c130661a7..c1b3981997 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -42,6 +42,8 @@ private:
 	void clearSounds();
 
 	void playSound(Resource *res, int priority);
+	void stopSound();
+
 public:
 	Common::Array<Resource *> _soundTable;
 	Common::Array<int> _soundPriority;
-- 
cgit v1.2.3


From 7a178098a7139ee593872d551057a9892158158c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 2 Nov 2014 14:43:02 +0100
Subject: ACCESS: Remove a useless check, comment out some code related to
 original debugging

---
 engines/access/player.cpp | 49 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index b8eb08acd8..869467a590 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -259,9 +259,10 @@ void Player::walkUp() {
 		_rawPlayerLow.y = _rawYTempL;
 		
 		calcManScale();
-		if (_vm->_currentMan != 3 && (_frame == 17 || _frame == 21)) {
-			warning("TODO: walkUp - si = 0?");
-		}
+
+		// This code looks totally useless as 'si' is unconditionally set in plotCom
+		//if (_vm->_currentMan != 3 && (_frame == 17 || _frame == 21))
+		//	warning("TODO: walkUp - si = 0?");
 
 		if (++_frame > _upWalkMax)
 			_frame = _upWalkMin;
@@ -288,9 +289,10 @@ void Player::walkDown() {
 		_rawPlayerLow.y = _rawYTempL;
 
 		calcManScale();
-		if (_vm->_currentMan != 3 && (_frame == 10 || _frame == 14)) {
-			warning("TODO: walkDown - si = 0?");
-		}
+
+		// This code looks totally useless as 'si' is unconditionally set in plotCom
+		//if (_vm->_currentMan != 3 && (_frame == 10 || _frame == 14))
+		//	warning("TODO: walkDown - si = 0?");
 
 		if (++_frame > _downWalkMax)
 			_frame = _downWalkMin;
@@ -329,9 +331,9 @@ void Player::walkLeft() {
 		_rawPlayerLow.x = _rawTempL;
 		++_frame;
 
-		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			warning("TODO: walkLeft - si = 0?");
-		}
+		// This code looks totally useless as 'si' is unconditionally set in plotCom1
+		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
+		//	warning("TODO: walkLeft - si = 0?");
 
 		if (_frame > _sideWalkMax)
 			_frame = _sideWalkMin;
@@ -370,10 +372,7 @@ void Player::walkRight() {
 		_rawPlayerLow.x = _rawTempL;
 		++_frame;
 
-		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			warning("TODO: walkRight - si = 0?");
-		}
-
+		// Useless check removed
 		if (_frame > _sideWalkMax)
 			_frame = _sideWalkMin;
 
@@ -421,9 +420,9 @@ void Player::walkUpLeft() {
 		++_frame;
 		calcManScale();
 
-		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			warning("TODO: walkUpLeft - si = 0?");
-		}
+		// This code looks totally useless as 'si' is unconditionally set in plotCom1
+		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
+		//	warning("TODO: walkUpLeft - si = 0?");
 
 		if (_frame > _diagUpWalkMax)
 			_frame = _diagUpWalkMin;
@@ -472,9 +471,9 @@ void Player::walkDownLeft() {
 		++_frame;
 		calcManScale();
 		
-		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			warning("TODO: walkDownLeft - si = 0?");
-		}
+		// This code looks totally useless as 'si' is unconditionally set in plotCom1
+		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
+		//	warning("TODO: walkDownLeft - si = 0?");
 
 		if (_frame > _diagDownWalkMax)
 			_frame = _diagDownWalkMin;
@@ -523,9 +522,9 @@ void Player::walkUpRight() {
 		++_frame;
 		calcManScale();
 
-		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			warning("TODO: walkUpRight - si = 0?");
-		}
+		// This code looks totally useless as 'si' is unconditionally set in plotCom
+		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
+		//	warning("TODO: walkUpRight - si = 0?");
 
 		if (_frame > _diagUpWalkMax)
 			_frame = _diagUpWalkMin;
@@ -575,9 +574,9 @@ void Player::walkDownRight() {
 		++_frame;
 		calcManScale();
 
-		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) {
-			warning("TODO: walkDownRight - si = 0?");
-		}
+		// This code looks totally useless as 'si' is unconditionally set in plotCom1
+		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
+		//	warning("TODO: walkDownRight - si = 0?");
 
 		if (_frame > _diagDownWalkMax)
 			_frame = _diagDownWalkMin;
-- 
cgit v1.2.3


From 32bbfe3f606b1d02ec9283c92ceb8c74264c3008 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 2 Nov 2014 14:45:35 +0100
Subject: ACCESS: Fix a little bug in walkUpRight()

---
 engines/access/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 869467a590..ba5ba8924f 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -486,7 +486,7 @@ void Player::walkUpRight() {
 	if (_frame > _diagUpWalkMax || _frame < _diagUpWalkMin)
 		_frame = _diagUpWalkMin;
 
-	_playerDirection = UPLEFT;
+	_playerDirection = UPRIGHT;
 
 	int walkOffset, tempL;
 	bool flag = _scrollEnd == 1;
-- 
cgit v1.2.3


From 958dd0b77bb7becc489d717806bbb96734901217 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 2 Nov 2014 18:02:54 +0100
Subject: ACCESS: Hood newMusic in cmdSpecial

---
 engines/access/amazon/amazon_scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 3e7fd4e84e..9ecaadd6aa 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -390,7 +390,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		guard();
 		break;
 	case 10:
-		warning("TODO NEWMUSIC");
+		_vm->_sound->newMusic(param1, param2);
 		break;
 	case 11:
 		plotInactive();
-- 
cgit v1.2.3


From e46c0ac66a1fc94439264e4a07bbc92b09c03c07 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 2 Nov 2014 16:28:06 -0500
Subject: ACCESS: Fix resetting cursor after conversations

---
 engines/access/access.cpp               | 1 -
 engines/access/access.h                 | 1 -
 engines/access/amazon/amazon_room.cpp   | 2 +-
 engines/access/martian/martian_room.cpp | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index fab66c3b6c..a3cadc1025 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -51,7 +51,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_destIn = nullptr;
 	_current = nullptr;
 	_pCount = 0;
-	_normalMouse = true;
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
diff --git a/engines/access/access.h b/engines/access/access.h
index fcac69d56e..36951c7504 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -172,7 +172,6 @@ public:
 	Common::Array<ExtraCell> _extraCells;
 	ImageEntryList _images;
 	int _pCount;
-	bool _normalMouse;
 	int _mouseMode;
 
 	int _currentManOld;
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 39cea9ae62..098220ee0c 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -84,7 +84,7 @@ void AmazonRoom::reloadRoom1() {
 	}
 
 	_selectCommand = -1;
-	_vm->_normalMouse = 1;
+	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 	_vm->_mouseMode = 0;
 	_vm->_boxSelect = true;
 	_vm->_player->_playerOff = false;
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index e624b0abd5..6d4d62f7e9 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -82,7 +82,7 @@ void MartianRoom::reloadRoom1() {
 	}
 
 	_selectCommand = -1;
-	_vm->_normalMouse = 1;
+	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 	_vm->_mouseMode = 0;
 	_vm->_boxSelect = true;
 	_vm->_player->_playerOff = false;
-- 
cgit v1.2.3


From 38f010f96f3ba2ff1ff217912d196873ecc29877 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 3 Nov 2014 00:18:59 +0100
Subject: ACCESS: Implement mWhileFly

---
 engines/access/amazon/amazon_scripts.cpp | 87 +++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  3 ++
 engines/access/events.h                  |  5 +-
 3 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 9ecaadd6aa..a39b8ae6e2 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -205,13 +205,98 @@ void AmazonScripts::mWhile2() {
 	} while (_vm->_flags[52] == 4);
 }
 
+void AmazonScripts::doFlyCell() {
+	_game->_destIn = &_game->_buffer2;
+	if (_game->_plane._pCount <= 40) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 3, Common::Point(70, 74));
+	} else if (_game->_plane._pCount <= 80) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 6, Common::Point(70, 74));
+	} else if (_game->_plane._pCount <= 120) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 2, Common::Point(50, 76));
+	} else if (_game->_plane._pCount <= 160) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 14, Common::Point(63, 78));
+	} else if (_game->_plane._pCount <= 200) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 5, Common::Point(86, 74));
+	} else if (_game->_plane._pCount <= 240) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 0, Common::Point(103, 76));
+	} else if (_game->_plane._pCount <= 280) {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 4, Common::Point(119, 77));
+	} else {
+		_vm->_screen->plotImage(_vm->_objectsTable[15], 1, Common::Point(111, 77));
+	}
+}
+
+void AmazonScripts::scrollFly() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	doFlyCell();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void AmazonScripts::mWhileFly() {
+	_vm->_events->hideCursor();
+	_vm->_screen->clearScreen();
+	_vm->_screen->setBufferScan();
+	_vm->_screen->fadeOut();
+	_vm->_screen->_scrollX = 0;
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->fadeIn();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+
+	// KEYFLG = 0;
+
+	_vm->_screen->_scrollRow = _vm->_screen->_scrollCol = 0;
+	_vm->_screen->_scrollX = _vm->_screen->_scrollY = 0;
+	_vm->_player->_rawPlayer = Common::Point(0, 0);
+	_vm->_player->_scrollAmount = 1;
+
+	_game->_plane._pCount = 0;
+	_game->_plane._planeCount = 0;
+	_game->_plane._propCount = 0;
+	_game->_plane._xCount = 0;
+	_game->_plane._position = Common::Point(20, 29);
+
+	warning("FIXME: _vbCount should be handled in NEWTIMER");
+	while (true) {
+		int _vbCount = 4;
+		if (_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth == _vm->_room->_playFieldWidth) {
+			_vm->_events->showCursor();
+			return;
+		}
+
+		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		while (_vm->_screen->_scrollX > TILE_WIDTH) {
+			_vm->_screen->_scrollX -= TILE_WIDTH;
+			++_vm->_screen->_scrollCol;
+
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+		}
+
+		scrollFly();
+		++_game->_plane._pCount;
+		g_system->delayMillis(10);
+
+		while(_vbCount > 0) {
+			// To be rewritten when NEWTIMER is done
+			_vm->_events->checkForNextFrameCounter();
+			_vbCount--;
+			_vm->_sound->playSound(0);
+		}
+	}
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
 		mWhile1();
 		break;
 	case 2:
-		warning("TODO FLY");
+		mWhileFly();
 		break;
 	case 3:
 		warning("TODO FALL");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 694260ddcb..fb2c66f685 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -39,9 +39,12 @@ protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
 	virtual void executeCommand(int commandIndex);
 
+	void doFlyCell();
+	void scrollFly();
 	void cLoop();
 	void mWhile1();
 	void mWhile2();
+	void mWhileFly();
 	void mWhile(int param1);
 	void guardSee();
 	void setGuardFrame();
diff --git a/engines/access/events.h b/engines/access/events.h
index 6b46086d9a..313a039831 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -47,9 +47,6 @@ private:
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
 	Graphics::Surface _invCursor;
-
-	bool checkForNextFrameCounter();
-
 	void nextFrame();
 public:
 	CursorType _cursorId;
@@ -119,6 +116,8 @@ public:
 
 	void waitKeyMouse();
 
+	bool checkForNextFrameCounter();
+
 	Common::Point &getMousePos() { return _mousePos; }
 
 	Common::Point calcRawMouse();
-- 
cgit v1.2.3


From 43e8e905906ad77f1a98efd255ee7589edff7518 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 2 Nov 2014 21:12:24 -0500
Subject: ACCESS: Don't show inventory items that have been used

---
 engines/access/inventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 25c906056f..bb735d45a9 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -255,7 +255,7 @@ void InventoryManager::getList() {
 	_tempLOff.clear();
 
 	for (uint i = 0; i < _inv.size(); ++i) {
-		if (_inv[i]) {
+		if (_inv[i] == 1) {
 			_items.push_back(i);
 			_tempLOff.push_back(_names[i]);
 		}
-- 
cgit v1.2.3


From d5ddd2268106d57c8f5cb84d1afd67f26a7a3ccc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 3 Nov 2014 20:29:09 +0100
Subject: ACCESS: Implement mWhileFall

---
 engines/access/amazon/amazon_scripts.cpp | 81 +++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  3 ++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index a39b8ae6e2..af619cb7e6 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -226,6 +226,27 @@ void AmazonScripts::doFlyCell() {
 	}
 }
 
+void AmazonScripts::doFallCell() {
+	if (_vm->_scaleI <= 0)
+		return;
+
+	_game->_destIn = &_game->_buffer2;
+
+	// 115, 11, i
+	_vm->_screen->plotImage(_vm->_objectsTable[20], _game->_plane._planeCount / 6, Common::Point(115, 11));
+	_vm->_scaleI -= 3;
+	_vm->_scale = _vm->_scaleI;
+	_vm->_screen->setScaleTable(_vm->_scale);
+	++_game->_plane._xCount;
+	if (_game->_plane._xCount == 5)
+		return;
+	_game->_plane._xCount = 0;
+	if (_game->_plane._planeCount == 18)
+		_game->_plane._planeCount = 0;
+	else
+		_game->_plane._planeCount += 6;
+}
+
 void AmazonScripts::scrollFly() {
 	_vm->copyBF1BF2();
 	_vm->_newRects.clear();
@@ -234,6 +255,14 @@ void AmazonScripts::scrollFly() {
 	_vm->copyBF2Vid();
 }
 
+void AmazonScripts::scrollFall() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	doFallCell();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
 void AmazonScripts::mWhileFly() {
 	_vm->_events->hideCursor();
 	_vm->_screen->clearScreen();
@@ -290,6 +319,56 @@ void AmazonScripts::mWhileFly() {
 	}
 }
 
+void AmazonScripts::mWhileFall() {
+	_vm->_events->hideCursor();
+	_vm->_screen->clearScreen();
+	_vm->_screen->setBufferScan();
+	_vm->_screen->fadeOut();
+	_vm->_screen->_scrollX = 0;
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->fadeIn();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+
+	// KEYFLG = 0;
+
+	_vm->_screen->_scrollRow = _vm->_screen->_scrollCol = 0;
+	_vm->_screen->_scrollX = _vm->_screen->_scrollY = 0;
+	_vm->_player->_scrollAmount = 3;
+	_vm->_scaleI = 255;
+
+	_game->_plane._xCount = 0;
+	_game->_plane._planeCount = 0;
+
+	while (true) {
+		int _vbCount = 4;
+		if (_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth == _vm->_room->_playFieldWidth) {
+			_vm->_events->showCursor();
+			return;
+		}
+
+		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
+			_vm->_screen->_scrollX -= TILE_WIDTH;
+			++_vm->_screen->_scrollCol;
+
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+		}
+
+		scrollFall();
+		g_system->delayMillis(10);
+
+		while(_vbCount > 0) {
+			// To be rewritten when NEWTIMER is done
+			_vm->_events->checkForNextFrameCounter();
+			_vbCount--;
+		}
+	}
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
@@ -299,7 +378,7 @@ void AmazonScripts::mWhile(int param1) {
 		mWhileFly();
 		break;
 	case 3:
-		warning("TODO FALL");
+		mWhileFall();
 		break;
 	case 4:
 		warning("TODO JWALK");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index fb2c66f685..ca96de60d7 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -40,11 +40,14 @@ protected:
 	virtual void executeCommand(int commandIndex);
 
 	void doFlyCell();
+	void doFallCell();
 	void scrollFly();
+	void scrollFall();
 	void cLoop();
 	void mWhile1();
 	void mWhile2();
 	void mWhileFly();
+	void mWhileFall();
 	void mWhile(int param1);
 	void guardSee();
 	void setGuardFrame();
-- 
cgit v1.2.3


From a7d88af24d0a2c1e37b91f716ad85c8e7eb000c6 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 3 Nov 2014 20:30:43 +0100
Subject: ACCESS: Fix tiny bug in mWhileFly

---
 engines/access/amazon/amazon_scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index af619cb7e6..688dbe0a30 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -298,7 +298,7 @@ void AmazonScripts::mWhileFly() {
 		}
 
 		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-		while (_vm->_screen->_scrollX > TILE_WIDTH) {
+		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
 			_vm->_screen->_scrollX -= TILE_WIDTH;
 			++_vm->_screen->_scrollCol;
 
-- 
cgit v1.2.3


From fb686191a813c633d215f06ca2aadbf3ad9c64ac Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 3 Nov 2014 21:51:11 -0500
Subject: ACCESS: Fix initialisation of Y positioning in rooms with vertical
 scrolling

---
 engines/access/room.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 9b830770af..76ad29e21a 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -267,14 +267,15 @@ void Room::setupRoom() {
 		screen._scrollRow = 0;
 	} else {
 		screen._scrollY = _vm->_player->_rawPlayer.y -
-			(_vm->_player->_rawPlayer.y >> 4);
-		int yp = MAX((_vm->_player->_rawPlayer.y >> 4) -
+			(_vm->_player->_rawPlayer.y / 16) * 16;
+		int yc = MAX((_vm->_player->_rawPlayer.y >> 4) -
 			(screen._vWindowHeight / 2), 0);
-		screen._scrollRow = yp;
+		screen._scrollRow = yc;
 
-		yp = yp + screen._vWindowHeight - _playFieldHeight;
-		if (yp >= 0) {
-			screen._scrollRow = yp + 1;
+		yc = yc + screen._vWindowHeight - _playFieldHeight;
+		if (yc >= 0) {
+			screen._scrollRow = _playFieldHeight - screen._vWindowHeight;
+			screen._scrollY = 0;
 		}
 	}
 }
-- 
cgit v1.2.3


From 2c700cc6cd633b2a07ae5b10c803fb7b7321413c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 4 Nov 2014 23:57:51 +0100
Subject: ACCESS: Start implementing mWhileJWalk()

---
 engines/access/amazon/amazon_scripts.cpp | 112 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  22 ++++++
 engines/access/player.h                  |   7 +-
 3 files changed, 137 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 688dbe0a30..d2370a2fd1 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -32,6 +32,27 @@ namespace Amazon {
 
 AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 	_game = (AmazonEngine *)_vm;
+
+	_xTrack = 0;
+	_yTrack = 0;
+	_zTrack = 0;
+	_xCam = 0;
+	_yCam = 0;
+	_zCam = 0;
+
+	_pNumObj = 0;
+	for (int i = 0; i < 32; i++) {
+		_pImgNum[i] = 0;
+		_pObject[i] = nullptr;
+		_pObjX[i] = 0;
+		_pObjY[i] = 0;
+		_pObjZ[i] = 0;
+	}
+
+	for (int i = 0; i < 16; i++) {
+		_pObjXl[i] = 0;
+		_pObjYl[i] = 0;
+	}
 }
 
 void AmazonScripts::cLoop() {
@@ -247,6 +268,10 @@ void AmazonScripts::doFallCell() {
 		_game->_plane._planeCount += 6;
 }
 
+void AmazonScripts::PAN() {
+	warning("TODO: PAN");
+}
+
 void AmazonScripts::scrollFly() {
 	_vm->copyBF1BF2();
 	_vm->_newRects.clear();
@@ -263,6 +288,14 @@ void AmazonScripts::scrollFall() {
 	_vm->copyBF2Vid();
 }
 
+void AmazonScripts::scrollJWalk() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	_game->plotList();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
 void AmazonScripts::mWhileFly() {
 	_vm->_events->hideCursor();
 	_vm->_screen->clearScreen();
@@ -369,6 +402,83 @@ void AmazonScripts::mWhileFall() {
 	}
 }
 
+void AmazonScripts::mWhileJWalk() {
+	const int jungleObj[7][4] = {
+		{2, 77, 0, 40},
+		{0, 290, 0, 50},
+		{1, 210, 0, 70},
+		{0, 50, 0, 30},
+		{1, 70, 0, 20},
+		{0, -280, 0, 60},
+		{1, -150, 0, 30},
+	};
+
+	_vm->_screen->fadeOut();
+	_vm->_events->hideCursor();
+	_vm->_screen->clearScreen();
+	_vm->_buffer2.clearBuffer();
+	_vm->_screen->setBufferScan();
+	_vm->_screen->_scrollX = 0;
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->fadeIn();
+
+	// KEYFLG = 0;
+	_vm->_player->_xFlag = 1;
+	_vm->_player->_yFlag = 0;
+	_vm->_player->_moveTo.x = 160;
+	_vm->_player->_move = UP;
+
+	_game->_plane._xCount = 2;
+	_xTrack = 10;
+	_yTrack = _zTrack = 0;
+	_xCam = 480;
+	_yCam = 0;
+	_zCam = 80;
+
+	TimerEntry *te = &_vm->_timers[24];
+	te->_initTm = te->_timer = 1;
+	te->_flag++;
+	
+	_pNumObj = 7;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pObject[i] = _vm->_objectsTable[24];
+		_pImgNum[i] = jungleObj[i][0];
+		_pObjX[i] = jungleObj[i][1];
+		_pObjY[i] = jungleObj[i][2];
+		_pObjZ[i] = jungleObj[i][3];
+		_pObjXl[i] = _pObjYl[i] = 0;
+	}
+	
+	while (true) {
+		_vm->_images.clear();
+		int _vbCount = 6;
+		if (_vm->_player->_xFlag == 2) {
+			_vm->_events->showCursor();
+			return;
+		}
+		
+		_pImgNum[0] = _game->_plane._xCount;
+		if (_game->_plane._xCount == 2)
+			++_game->_plane._xCount;
+		else
+			--_game->_plane._xCount;
+
+		_vm->_player->checkMove();
+		_vm->_player->checkScroll();
+		PAN();
+		scrollJWalk();
+
+		g_system->delayMillis(10);
+		while(_vbCount > 0) {
+			// To be rewritten when NEWTIMER is done
+			_vm->_events->checkForNextFrameCounter();
+			_vbCount--;
+		}
+	}
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
@@ -381,7 +491,7 @@ void AmazonScripts::mWhile(int param1) {
 		mWhileFall();
 		break;
 	case 4:
-		warning("TODO JWALK");
+		mWhileJWalk();
 		break;
 	case 5:
 		warning("TODO DOOPEN");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index ca96de60d7..50fab5caaf 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -35,6 +35,26 @@ class AmazonEngine;
 class AmazonScripts: public Scripts {
 private:
 	AmazonEngine *_game;
+
+	int _xTrack;
+	int _yTrack;
+	int _zTrack;
+	int _xCam;
+	int _yCam;
+	int _zCam;
+
+	int _pNumObj;
+	int _pImgNum[32];
+	SpriteResource *_pObject[32];
+
+	int _pObjX[32];
+	int _pObjY[32];
+	int _pObjZ[32];
+	int _pObjXl[16];
+	int _pObjYl[16];
+
+	void PAN();
+
 protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
 	virtual void executeCommand(int commandIndex);
@@ -43,11 +63,13 @@ protected:
 	void doFallCell();
 	void scrollFly();
 	void scrollFall();
+	void scrollJWalk();
 	void cLoop();
 	void mWhile1();
 	void mWhile2();
 	void mWhileFly();
 	void mWhileFall();
+	void mWhileJWalk();
 	void mWhile(int param1);
 	void guardSee();
 	void setGuardFrame();
diff --git a/engines/access/player.h b/engines/access/player.h
index c5c9afa087..ed48af0932 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -49,14 +49,11 @@ private:
 	int _diagUpWalkMin, _diagUpWalkMax;
 	int _diagDownWalkMin, _diagDownWalkMax;
 	Common::Point _guard;
-	Direction _move;
-	int _xFlag, _yFlag;
 	SpriteResource *_playerSprites1;
 	byte *_manPal1;
 	int _scrollEnd;
 	int _inactiveYOff;
 
-	void checkMove();
 	void plotCom(int v1);
 	void plotCom1();
 	void plotCom2();
@@ -97,6 +94,8 @@ public:
 	int _playerYLow;
 	int _playerY;
 	int _frame;
+	int _xFlag, _yFlag;
+	Direction _move;
 
 	// Additional public globals we've added to new Player class
 	bool _playerOff;
@@ -129,6 +128,8 @@ public:
 
 	void checkScroll();
 
+	void checkMove();
+
 	/**
 	* Synchronize savegame data
 	*/
-- 
cgit v1.2.3


From b8c95e653dab6a82926effe772b03eb6770e6083 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 5 Nov 2014 08:34:59 +0100
Subject: ACCESS: Implement pan()

---
 engines/access/amazon/amazon_scripts.cpp | 30 +++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d2370a2fd1..2b489d678e 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -268,8 +268,32 @@ void AmazonScripts::doFallCell() {
 		_game->_plane._planeCount += 6;
 }
 
-void AmazonScripts::PAN() {
-	warning("TODO: PAN");
+void AmazonScripts::pan() {
+	_zCam += _zTrack;
+	_xCam += _xTrack;
+	int tx = (_xCam << 8) / _zCam;
+	_yCam += _yTrack;
+	int ty = (_yCam << 8) / _zCam;
+
+	if (_vm->_timers[24]._flag != 1) {
+		++_vm->_timers[24]._flag;
+		for (int i = 0; i < _pNumObj; i++) {
+			_pObjZ[i] = _zTrack;
+			_pObjXl[i] += tx * _zTrack;
+			_pObjX[i] += _pObjXl[i];
+			_pObjYl[i] += ty * _zTrack;
+			_pObjY[i] += _pObjYl[i];
+		}
+	}
+
+	for (int i = 0; i < _pNumObj; i++) {
+		ImageEntry ie;
+		ie._flags= 8;
+		ie._position = Common::Point(_pObjX[i], _pObjY[i]);
+		ie._offsetY = 0xFF;
+		ie._spritesPtr = _pObject[i];
+		ie._frameNumber = _pImgNum[i];
+	}
 }
 
 void AmazonScripts::scrollFly() {
@@ -467,7 +491,7 @@ void AmazonScripts::mWhileJWalk() {
 
 		_vm->_player->checkMove();
 		_vm->_player->checkScroll();
-		PAN();
+		pan();
 		scrollJWalk();
 
 		g_system->delayMillis(10);
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 50fab5caaf..1ee8b98e05 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -53,7 +53,7 @@ private:
 	int _pObjXl[16];
 	int _pObjYl[16];
 
-	void PAN();
+	void pan();
 
 protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
-- 
cgit v1.2.3


From 6ceda069c7042bc081845d3a52f99e21a58c43d8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 5 Nov 2014 22:32:12 -0500
Subject: ACCESS: Beginnings of inventory dragging for combining items

---
 engines/access/amazon/amazon_resources.cpp |  88 +++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |   2 +
 engines/access/events.cpp                  |  13 ++++
 engines/access/events.h                    |   2 +
 engines/access/inventory.cpp               | 100 +++++++++++++++++++++++++++--
 engines/access/inventory.h                 |  18 +++++-
 engines/access/scripts.cpp                 |  20 ++----
 engines/access/scripts.h                   |   2 -
 8 files changed, 218 insertions(+), 27 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 0807a979cc..c2eab7b5c2 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1352,6 +1352,94 @@ const int CHAPTER_JUMP[14] = {
 	0, 12, 10, 15, 19, 25, 31, 36, 45, 46, 29, 55, 61, 0
 };
 
+const int COMBO_TABLE[85][4] = {
+	{ -1, -1, -1, -1 },
+	{ 12, 3, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 24, 25, -1, -1 },
+	{ 10, 24, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 8, 24, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 1, 3, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 7, 25, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 80, 81, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 41, 42, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 39, 40, -1, -1 },
+	{ 38, 40, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 32, 42, 77, 78 },
+	{ -1, -1, -1, -1 },
+	{ 60, 61, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 73, 72, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 64, 67, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 59, 60, -1, -1 },
+	{ 58, 60, -1, -1 },
+	{ 43, 61, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 56, 67, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 50, 72, -1, -1 },
+	{ 75, 77, -1, -1 },
+	{ 74, 77, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 41, 78, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ 29, 81, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 }
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index d8d37b5a5f..2be9b4dd4b 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -64,6 +64,8 @@ extern const int CHAPTER_TABLE[14][5];
 
 extern const int CHAPTER_JUMP[14];
 
+extern const int COMBO_TABLE[85][4];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 0a754305b2..0b7a34841e 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -250,5 +250,18 @@ Common::Point EventsManager::calcRawMouse() {
 	return pt;
 }
 
+int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
+	int i = 0;
+	for (i = 0;; i++) {
+		if (rects[i].left == -1)
+			return -1;
+
+		if ((_mousePos.x > rects[i].left) && (_mousePos.x < rects[i].right)
+			&& (_mousePos.y > rects[i].top) && (_mousePos.y < rects[i].bottom))
+			return i;
+	}
+}
+
+
 
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index 313a039831..b29b54159e 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -121,6 +121,8 @@ public:
 	Common::Point &getMousePos() { return _mousePos; }
 
 	Common::Point calcRawMouse();
+
+	int checkMouseBox1(Common::Array<Common::Rect> &rects);
 };
 
 } // End of namespace Access
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index bb735d45a9..f31379a2fa 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -28,6 +28,26 @@
 
 namespace Access {
 
+void InventoryEntry::load(const Common::String &name, const int *data) {
+	_value = 0;
+	_name = name;
+	_otherItem1 = *data++;
+	_newItem1 = *data++;
+	_otherItem2 = *data++;
+	_newItem2 = *data;
+}
+
+int InventoryEntry::checkItem(int itemId) {
+	if (_otherItem1 == itemId)
+		return _newItem1;
+	else if (_otherItem2 == itemId)
+		return _newItem2;
+	else
+		return -1;
+}
+
+/*------------------------------------------------------------------------*/
+
 InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_startInvItem = 0;
 	_startInvBox = 0;
@@ -39,9 +59,12 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_iconDisplayFlag = true;
 
 	const char *const *names;
+	const int *combineP;
+
 	switch (vm->getGameID()) {
 	case GType_Amazon:
 		names = Amazon::INVENTORY_NAMES;
+		combineP = &Amazon::COMBO_TABLE[0][0];
 		_inv.resize(85);
 		break;
 	case GType_MartianMemorandum:
@@ -52,8 +75,9 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 		error("Unknown game");
 	}
 
-	for (uint i = 0; i < _inv.size(); ++i)
-		_names.push_back(names[i]);
+	for (uint i = 0; i < _inv.size(); ++i, combineP += 4) {
+		_inv[i].load(names[i], combineP);
+	}
 
 	for (uint i = 0; i < 26; ++i) {
 		const int *r = INVCOORDS[i];
@@ -62,7 +86,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 }
 
 int &InventoryManager::operator[](int idx) {
-	return _inv[idx];
+	return _inv[idx]._value;
 }
 
 int InventoryManager::useItem() { 
@@ -255,9 +279,9 @@ void InventoryManager::getList() {
 	_tempLOff.clear();
 
 	for (uint i = 0; i < _inv.size(); ++i) {
-		if (_inv[i] == 1) {
+		if (_inv[i]._value == 1) {
 			_items.push_back(i);
-			_tempLOff.push_back(_names[i]);
+			_tempLOff.push_back(_inv[i]._name);
 		}
 	}
 }
@@ -351,7 +375,69 @@ void InventoryManager::outlineIcon(int itemIndex) {
 }
 
 void InventoryManager::combineItems() {
-	warning("TODO: combineItems");
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+	screen._leftSkip = screen._rightSkip = 0;
+	screen._topSkip = screen._bottomSkip = 0;
+	screen._screenYOff = 0;
+
+	Common::Point tempMouse = events._mousePos;
+	Common::Point lastMouse = events._mousePos;
+
+	Common::Rect &inv = _invCoords[_boxNum];
+	Common::Rect r(inv.left, inv.top, inv.left + 46, inv.top + 35);
+	Common::Point tempBox(inv.left, inv.top);
+	Common::Point lastBox(inv.left, inv.top);
+
+	_vm->_buffer2.copyBlock(&_vm->_buffer1, r);
+	SpriteResource *sprites = _vm->_objectsTable[99];
+	int invItem = _items[_boxNum];
+	events.pollEvents();
+
+	// Item drag handling loop
+	while (!_vm->shouldQuit() && events._leftButton) {
+		// Poll for events
+		events.pollEvents();
+		g_system->delayMillis(10);
+
+		// Check positioning
+		if (lastMouse == events._mousePos)
+			continue;
+
+		lastMouse = events._mousePos;
+		Common::Rect lastRect(lastBox.x, lastBox.y, lastBox.x + 46, lastBox.y + 35);
+		screen.copyBlock(&_vm->_buffer2, lastRect);
+
+		int xp = MAX(events._mousePos.x - tempMouse.x + tempBox.x, 0);
+		int yp = MAX(events._mousePos.y - tempMouse.y + tempBox.y, 0);
+		screen.plotImage(sprites, invItem, Common::Point(xp, yp));
+	}
+
+	int destBox = events.checkMouseBox1(_invCoords);
+	if (destBox >= 0 && destBox != _boxNum && destBox < _items.size()
+			&& _items[destBox] != -1) {
+		int itemA = invItem;
+		int itemB = _items[destBox];
+		
+		// Check whether the items can be combined
+		int combinedItem = _inv[itemA].checkItem(itemB);
+		if (combinedItem != -1) {
+			_inv[combinedItem]._value = 1;
+			_inv[itemA]._value = 2;
+			_inv[itemB]._value = 2;
+			_items[_boxNum] = -1;
+			_items[destBox] = combinedItem;
+			_tempLOff[destBox] = _inv[combinedItem]._name;
+
+			// TODO: zoomIcon calls?
+
+			_boxNum = destBox;
+			return;
+		}
+	}
+
+	_iconDisplayFlag = true;
+	putInvIcon(_boxNum, invItem);
 }
 
 void InventoryManager::synchronize(Common::Serializer &s) {
@@ -362,7 +448,7 @@ void InventoryManager::synchronize(Common::Serializer &s) {
 		_inv.resize(count);
 
 	for (int i = 0; i < count; ++i)
-		s.syncAsUint16LE((*this)[i]);
+		s.syncAsUint16LE(_inv[i]._value);
 }
 
 } // End of namespace Access
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 0ff9020250..eff142c9c9 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -32,6 +32,21 @@
 
 namespace Access {
 
+class InventoryEntry {
+public:
+	Common::String _name;
+	int _value;
+
+	int _otherItem1;
+	int _newItem1;
+	int _otherItem2;
+	int _newItem2;
+
+	void load(const Common::String &name, const int *data);
+
+	int checkItem(int itemId);
+};
+
 class InventoryManager : public Manager {
 	struct SavedFields {
 		int _vWindowHeight;
@@ -58,7 +73,6 @@ private:
 	ASurface _savedScreen;
 	SavedFields _fields;
 	bool _iconDisplayFlag;
-	Common::StringArray _names;
 	Common::Array<int> _tempLPtr;
 	Common::StringArray _tempLOff;
 	int _boxNum;
@@ -89,7 +103,7 @@ private:
 
 	void combineItems();
 public:
-	Common::Array<int> _inv;
+	Common::Array<InventoryEntry> _inv;
 	int _startInvItem;
 	int _startInvBox;
 	bool _invChangeFlag;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index c46d7b972f..6c4c37491f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -554,18 +554,6 @@ void Scripts::cmdTexSpeak() {
 	findNull();
 }
 
-int Scripts::checkMouseBox1(Common::Rect *rectArr) {
-	int i = 0;
-	for (i = 0; ; i++){
-		if (rectArr[i].left == -1)
-			return -1;
-
-		if ((_vm->_events->_mousePos.x > rectArr[i].left) && (_vm->_events->_mousePos.x < rectArr[i].right) 
-			&& (_vm->_events->_mousePos.y > rectArr[i].top) && (_vm->_events->_mousePos.y < rectArr[i].bottom))
-			return i;
-	}
-}
-
 void Scripts::cmdTexChoice() {
 	static Common::Point cMouse[7] = {
 		Common::Point(0, 76), Common::Point(77, 154), Common::Point(155, 232),
@@ -595,9 +583,9 @@ void Scripts::cmdTexChoice() {
 	_vm->_bubbleBox->calcBubble(tmpStr);
 	_vm->_bubbleBox->printBubble(tmpStr);
 
-	Common::Rect responseCoords[2];
-	responseCoords[0] = _vm->_bubbleBox->_bounds;
-	responseCoords[1] = Common::Rect(0, 0, 0, 0);
+	Common::Array<Common::Rect> responseCoords;
+	responseCoords.push_back(_vm->_bubbleBox->_bounds);
+	responseCoords.push_back(Common::Rect(0, 0, 0, 0));
 	_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 
 	findNull();
@@ -655,7 +643,7 @@ void Scripts::cmdTexChoice() {
 				}
 			} else {
 				_vm->_events->debounceLeft();
-				choice = checkMouseBox1(responseCoords);
+				choice = _vm->_events->checkMouseBox1(responseCoords);
 			}
 		}
 	} while ((choice == -1) || ((choice == 2) && choice3Fl));
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index f4128f4e31..ab80c1cd9f 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -44,8 +44,6 @@ protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
 
-	int checkMouseBox1(Common::Rect *rectArr);
-
 	/**
 	 * Print a given message to the screen in a bubble box
 	 */
-- 
cgit v1.2.3


From b0653e1c924650c86edd220a37786c82faaeb11e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 5 Nov 2014 22:40:52 -0500
Subject: ACCESS: Fix redrawing during inventory item dragging

---
 engines/access/inventory.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index f31379a2fa..86e73c1cec 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -394,7 +394,7 @@ void InventoryManager::combineItems() {
 	int invItem = _items[_boxNum];
 	events.pollEvents();
 
-	// Item drag handling loop
+	// Item drag handling loop if left button is held down
 	while (!_vm->shouldQuit() && events._leftButton) {
 		// Poll for events
 		events.pollEvents();
@@ -408,9 +408,12 @@ void InventoryManager::combineItems() {
 		Common::Rect lastRect(lastBox.x, lastBox.y, lastBox.x + 46, lastBox.y + 35);
 		screen.copyBlock(&_vm->_buffer2, lastRect);
 
-		int xp = MAX(events._mousePos.x - tempMouse.x + tempBox.x, 0);
-		int yp = MAX(events._mousePos.y - tempMouse.y + tempBox.y, 0);
-		screen.plotImage(sprites, invItem, Common::Point(xp, yp));
+		Common::Point newPt;
+		newPt.x = MAX(events._mousePos.x - tempMouse.x + tempBox.x, 0);
+		newPt.y = MAX(events._mousePos.y - tempMouse.y + tempBox.y, 0);
+		
+		screen.plotImage(sprites, invItem, newPt);
+		lastBox = newPt;
 	}
 
 	int destBox = events.checkMouseBox1(_invCoords);
-- 
cgit v1.2.3


From b5ad2b9db52e4184829c02830a9d2b22b6f85dde Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 6 Nov 2014 21:52:05 -0500
Subject: ACCESS: Inventory item merge zoom partially working

---
 engines/access/inventory.cpp | 61 +++++++++++++++++++++++++++++++++++++++++---
 engines/access/inventory.h   |  2 ++
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 86e73c1cec..2dc73a2864 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -308,10 +308,11 @@ void InventoryManager::chooseItem() {
 	int selIndex;
 
 	while (!_vm->shouldQuit()) {
+		// Check for events
+		events.pollEvents();
 		g_system->delayMillis(10);
 
 		// Poll events and wait for a click on a known area
-		events.pollEvents();
 		if (!events._leftButton || ((selIndex = coordIndexOf()) == -1))
 			continue;
 
@@ -319,7 +320,7 @@ void InventoryManager::chooseItem() {
 			if (selIndex == 25)
 				_vm->_useItem = -1;
 			break;
-		} else if (selIndex < (int)_items.size()) {
+		} else if (selIndex < (int)_items.size() && _items[selIndex] != -1) {
 			_boxNum = selIndex;
 			_vm->copyBF2Vid();
 			combineItems();
@@ -417,7 +418,7 @@ void InventoryManager::combineItems() {
 	}
 
 	int destBox = events.checkMouseBox1(_invCoords);
-	if (destBox >= 0 && destBox != _boxNum && destBox < _items.size()
+	if (destBox >= 0 && destBox != _boxNum && destBox < (int)_items.size()
 			&& _items[destBox] != -1) {
 		int itemA = invItem;
 		int itemB = _items[destBox];
@@ -432,9 +433,19 @@ void InventoryManager::combineItems() {
 			_items[destBox] = combinedItem;
 			_tempLOff[destBox] = _inv[combinedItem]._name;
 
-			// TODO: zoomIcon calls?
+			// Zoom out the old two items and zoom in the new combined item
+			events.hideCursor();
+			zoomIcon(itemA, itemB, destBox, true);
+			Common::Rect destRect(_invCoords[destBox].left, _invCoords[destBox].top,
+				_invCoords[destBox].left + 46, _invCoords[destBox].top + 35);
+			_vm->_buffer2.copyBlock(&_vm->_buffer1, destRect);
+			screen._screenYOff = 0;
+			
+			zoomIcon(itemB, -1, destBox, true);
+			zoomIcon(combinedItem, -1, destBox, false);
 
 			_boxNum = destBox;
+			events.showCursor();
 			return;
 		}
 	}
@@ -443,6 +454,48 @@ void InventoryManager::combineItems() {
 	putInvIcon(_boxNum, invItem);
 }
 
+void InventoryManager::zoomIcon(int zoomItem, int backItem, int zoomBox, bool shrink) {
+	Screen &screen = *_vm->_screen;
+	screen._screenYOff = 0;
+	SpriteResource *sprites = _vm->_objectsTable[99];
+
+	int8 zoomScale = shrink ? -1 : 1;
+	int8 zoomInc = shrink ? -1 : 1;
+	Common::Rect boxRect(_invCoords[zoomBox].left, _invCoords[zoomBox].top,
+		_invCoords[zoomBox].left + 46, _invCoords[zoomBox].top + 35);
+
+	while (!_vm->shouldQuit() && zoomScale != 0) {
+		_vm->_events->pollEvents();
+		g_system->delayMillis(5);
+
+		_vm->_buffer2.copyBlock(&_vm->_buffer1, boxRect);
+		if (backItem != -1) {
+			_iconDisplayFlag = false;
+			putInvIcon(zoomBox, backItem);
+		}
+
+		_vm->_scale = zoomScale;
+		screen.setScaleTable(zoomScale);
+
+		int xv = screen._scaleTable1[boxRect.width() + 1];
+		if (xv) {
+			int yv = screen._scaleTable1[boxRect.height() + 1];
+			if (yv) {
+				// The zoomed size is positive in both directions, so show zoomed item
+				Common::Rect scaledBox(xv, yv);
+				scaledBox.moveTo(boxRect.left + (boxRect.width() - xv + 1) / 2,
+					boxRect.top + (boxRect.height() - yv + 1) / 2);
+
+				_vm->_buffer2.sPlotF(sprites->getFrame(zoomItem), scaledBox);
+			}
+		}
+
+		screen.copyBlock(&_vm->_buffer2, boxRect);
+
+		zoomScale += zoomInc;
+	}
+}
+
 void InventoryManager::synchronize(Common::Serializer &s) {
 	int count = _inv.size();
 	s.syncAsUint16LE(count);
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index eff142c9c9..f2b1f5e182 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -102,6 +102,8 @@ private:
 	void outlineIcon(int itemIndex);
 
 	void combineItems();
+
+	void zoomIcon(int zoomItem, int backItem, int zoomBox, bool shrink);
 public:
 	Common::Array<InventoryEntry> _inv;
 	int _startInvItem;
-- 
cgit v1.2.3


From 0a8b8d9e94bea66834c102edeeb8b6c5374423ed Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 6 Nov 2014 22:33:56 -0500
Subject: ACCESS: Fix inventory item combining zoom logic

---
 engines/access/inventory.cpp | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 2dc73a2864..1b81b6badf 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -432,16 +432,19 @@ void InventoryManager::combineItems() {
 			_items[_boxNum] = -1;
 			_items[destBox] = combinedItem;
 			_tempLOff[destBox] = _inv[combinedItem]._name;
-
-			// Zoom out the old two items and zoom in the new combined item
 			events.hideCursor();
+
+			// Shrink down the first item on top of the second item
 			zoomIcon(itemA, itemB, destBox, true);
+
+			// Shrink down the second item
 			Common::Rect destRect(_invCoords[destBox].left, _invCoords[destBox].top,
 				_invCoords[destBox].left + 46, _invCoords[destBox].top + 35);
 			_vm->_buffer2.copyBlock(&_vm->_buffer1, destRect);
-			screen._screenYOff = 0;
-			
+			screen._screenYOff = 0;			
 			zoomIcon(itemB, -1, destBox, true);
+
+			// Exand up the new combined item from nothing to full size
 			zoomIcon(combinedItem, -1, destBox, false);
 
 			_boxNum = destBox;
@@ -459,12 +462,13 @@ void InventoryManager::zoomIcon(int zoomItem, int backItem, int zoomBox, bool sh
 	screen._screenYOff = 0;
 	SpriteResource *sprites = _vm->_objectsTable[99];
 
-	int8 zoomScale = shrink ? -1 : 1;
-	int8 zoomInc = shrink ? -1 : 1;
+	int oldScale = _vm->_scale;
+	int zoomScale = shrink ? 255 : 1;
+	int zoomInc = shrink ? -1 : 1;
 	Common::Rect boxRect(_invCoords[zoomBox].left, _invCoords[zoomBox].top,
 		_invCoords[zoomBox].left + 46, _invCoords[zoomBox].top + 35);
 
-	while (!_vm->shouldQuit() && zoomScale != 0) {
+	while (!_vm->shouldQuit() && zoomScale != 0 && zoomScale != 256) {
 		_vm->_events->pollEvents();
 		g_system->delayMillis(5);
 
@@ -494,6 +498,17 @@ void InventoryManager::zoomIcon(int zoomItem, int backItem, int zoomBox, bool sh
 
 		zoomScale += zoomInc;
 	}
+
+	if (!shrink) {
+		// Handle the final full-size version
+		_vm->_buffer2.copyBlock(&_vm->_buffer1, boxRect);
+		_vm->_buffer2.plotImage(sprites, zoomItem,
+			Common::Point(boxRect.left, boxRect.top));
+		screen.copyBlock(&_vm->_buffer2, boxRect);
+	}
+
+	_vm->_scale = oldScale;
+	screen.setScaleTable(oldScale);
 }
 
 void InventoryManager::synchronize(Common::Serializer &s) {
-- 
cgit v1.2.3


From 8a31fca61efa4a97097a499e1f42e57f631fe678 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 7 Nov 2014 23:38:05 +0100
Subject: ACCESS: Implement mWhileDoOpen

---
 engines/access/amazon/amazon_game.h      |   5 +-
 engines/access/amazon/amazon_scripts.cpp | 115 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |   1 +
 3 files changed, 117 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 2dc0c058fb..653deefb96 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -54,8 +54,6 @@ public:
 
 class AmazonEngine : public AccessEngine {
 private:
-	bool _skipStart;
-
 	// Fields that are included in savegames
 	int _canoeLane;
 	int _canoeYPos;
@@ -99,7 +97,6 @@ private:
 
 	void loadEstablish(int estabIndex);
 	void doEstablish(int screenId, int estabIndex);
-	void establishCenter(int screenId, int esatabIndex);
 
 protected:
 	/**
@@ -113,6 +110,7 @@ protected:
 	virtual void synchronize(Common::Serializer &s);
 public:
 	bool _charSegSwitch;
+	bool _skipStart;
 
 	int _rawInactiveX;
 	int _rawInactiveY;
@@ -162,6 +160,7 @@ public:
 
 	void tileScreen();
 	void updateSummary(int chap);
+	void establishCenter(int screenId, int esatabIndex);
 
 	/**
 	 * Show the start of a chapter
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 2b489d678e..5d9f2d9436 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -503,6 +503,119 @@ void AmazonScripts::mWhileJWalk() {
 	}
 }
 
+void AmazonScripts::mWhileDoOpen() {
+	const int openObj[10][4] = {
+		{8, -80, 120, 30},
+		{13, 229, 0, 50},
+		{12, 78, 0, 50},
+		{11, 10, 0, 50},
+		{10, 178, 97, 50},
+		{9, 92, 192, 50},
+		{14, 38, 0, 100},
+		{15, 132, 76, 100},
+		{16, 142, 0, 100},
+		{4, -280, 40, 120},
+	};
+
+	_vm->_screen->setBufferScan();
+	_vm->_events->hideCursor();
+	_vm->_screen->forceFadeOut();
+	_game->_skipStart = false;
+	if (_vm->_conversation != 2) {
+		_vm->_screen->setPanel(3);
+		_game->startChapter(1);
+		_game->establishCenter(0, 1);
+	}
+
+	Resource *data = _vm->_files->loadFile(0, 1);
+	SpriteResource *spr = new SpriteResource(_vm, data);
+	delete data;
+
+	_vm->_objectsTable[1] = spr;
+	_vm->_files->_loadPalFlag = false;
+	_vm->_files->loadScreen(1, 2);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+
+	warning("TODO _roomInfo = _vm->_files->loadFile(1, 1);");
+
+	_xTrack = 8;
+	_yTrack = -3;
+	_zTrack = 0;
+	_xCam = _yCam = 0;
+	_zCam = 270;
+	_vm->_timers[24]._timer = _vm->_timers[24]._initTm = 1;
+	++_vm->_timers[24]._flag;
+	_pNumObj = 10;
+
+	for (int i = 0; i < _pNumObj; i++) {
+		_pObject[i] = _vm->_objectsTable[1];
+		_pImgNum[i] = openObj[i][0];
+		_pObjX[i] = openObj[i][1];
+		_pObjY[i] = openObj[i][2];
+		_pObjZ[i] = openObj[i][3];
+		_pObjXl[i] = _pObjYl[i] = 0;
+	}
+
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	Animation *anim = _vm->_animation->setAnimation(0);
+	_vm->_animation->setAnimTimer(anim);
+	anim = _vm->_animation->setAnimation(1);
+	_vm->_animation->setAnimTimer(anim);
+	_vm->_sound->newMusic(10, 0);
+	
+	bool startFl = false;
+	while (true) {
+		_vm->_images.clear();
+		_vm->_animation->animate(0);
+		_vm->_animation->animate(1);
+		pan();
+		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		_vm->_newRects.clear();
+		_game->plotList();
+		_vm->copyBlocks();
+		if (!startFl) {
+			startFl = true;
+			_vm->_screen->forceFadeIn();
+		}
+		_vm->_events->pollEvents();
+		warning("TODO: check on KEYBUFCNT");
+		if (_vm->_events->_leftButton || _vm->_events->_rightButton) {
+			_game->_skipStart = true;
+			_vm->_sound->newMusic(10, 1);
+			break;
+		}
+
+		if (_xCam > 680) {
+			warning("FIXME: _vbCount should be handled in NEWTIMER");
+			int _vbCount = 125;
+			while(_vbCount > 0) {
+				// To be rewritten when NEWTIMER is done
+				_vm->_events->checkForNextFrameCounter();
+				_vbCount--;
+			}
+			break;
+		}
+	}
+	
+	_vm->_events->showCursor();
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	warning("TODO: delete _roomInfo;");
+	_vm->freeCells();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	_vm->_numAnimTimers = 0;
+	_vm->_images.clear();
+	if (_vm->_conversation == 2) {
+		Resource *spriteData = _vm->_files->loadFile(28, 37);
+		_vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
+		delete spriteData;
+		warning("TODO: _roomInfo = _vm->_files->loadFile(28, 38);");
+	}
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
@@ -518,7 +631,7 @@ void AmazonScripts::mWhile(int param1) {
 		mWhileJWalk();
 		break;
 	case 5:
-		warning("TODO DOOPEN");
+		mWhileDoOpen();
 		break;
 	case 6:
 		warning("TODO DOWNRIVER");
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 1ee8b98e05..06ed6e5d01 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -70,6 +70,7 @@ protected:
 	void mWhileFly();
 	void mWhileFall();
 	void mWhileJWalk();
+	void mWhileDoOpen();
 	void mWhile(int param1);
 	void guardSee();
 	void setGuardFrame();
-- 
cgit v1.2.3


From 47304849c7c24fd9809f6e854f18354f95773980 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Nov 2014 21:17:00 -0500
Subject: ACCESS: Fix malformed inventory item description

---
 engines/access/amazon/amazon_resources.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index c2eab7b5c2..e60da5b0ff 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -990,7 +990,7 @@ const char *const INVENTORY_NAMES[] = {
 	"RAT", "ALCOHOL", "SAFE COMBINATION", "BEAKER", "MICROFILM",
 	"VAULT KEY", "BOLT CUTTERS", "BLOWGUN", "LOVE POTION", "MONEY",
 	"DARTS", "TAPE", "JUNGLE POTION", "MOVIE", "CABINET KEY",
-	"DISPLAY CASE KEY", "FLITCH', 27h, 'S CAR KEYS", "COAT HANGER",
+	"DISPLAY CASE KEY", "FLITCH'S CAR KEYS", "COAT HANGER",
 	"CROWBAR", "COMPASS", "MAP", "LETTER OPENER", "LETTER",
 	"DECODER", "DIPPED DART", "LOADED BLOWGUN", "CARD", "JERRYCAN",
 	"CIGARETTES", "BIKE PUMP", "PARACHUTE", "PESO", "PEPPERS",
-- 
cgit v1.2.3


From 712261f02a84700ed014b2e2e16a0f13e2c6f93c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Nov 2014 21:26:40 -0500
Subject: ACCESS: Fix entire inventory disappearing after combining items

---
 engines/access/inventory.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 1b81b6badf..f465432096 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -287,6 +287,8 @@ void InventoryManager::getList() {
 }
 
 void InventoryManager::showAllItems() {
+	_iconDisplayFlag = true;
+
 	for (uint i = 0; i < _items.size(); ++i)
 		putInvIcon(i, _items[i]);
 }
-- 
cgit v1.2.3


From 63bacba2d906f650e702ba544c5a49528452b5b2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Nov 2014 21:29:21 -0500
Subject: ACCESS: Add enum for inventory item states

---
 engines/access/inventory.cpp | 4 ++--
 engines/access/inventory.h   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index f465432096..45738462df 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -29,7 +29,7 @@
 namespace Access {
 
 void InventoryEntry::load(const Common::String &name, const int *data) {
-	_value = 0;
+	_value = ITEM_NOT_FOUND;
 	_name = name;
 	_otherItem1 = *data++;
 	_newItem1 = *data++;
@@ -279,7 +279,7 @@ void InventoryManager::getList() {
 	_tempLOff.clear();
 
 	for (uint i = 0; i < _inv.size(); ++i) {
-		if (_inv[i]._value == 1) {
+		if (_inv[i]._value == ITEM_IN_INVENTORY) {
 			_items.push_back(i);
 			_tempLOff.push_back(_inv[i]._name);
 		}
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index f2b1f5e182..820b15b40f 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -32,6 +32,10 @@
 
 namespace Access {
 
+enum ItemState {
+	ITEM_NOT_FOUND = 0, ITEM_IN_INVENTORY = 1, ITEM_USED = 2
+};
+
 class InventoryEntry {
 public:
 	Common::String _name;
-- 
cgit v1.2.3


From dc218d53ef9d9b6de11e26e1b793204d416fc9db Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Nov 2014 22:09:09 -0500
Subject: ACCESS: Merge the sound resource and priority lists

---
 engines/access/access.cpp                | 10 ++++++----
 engines/access/amazon/amazon_game.cpp    | 10 +++-------
 engines/access/amazon/amazon_scripts.cpp |  1 -
 engines/access/martian/martian_game.cpp  |  1 -
 engines/access/scripts.cpp               | 14 ++++++--------
 engines/access/sound.cpp                 | 19 +++++++++++--------
 engines/access/sound.h                   | 11 +++++++++--
 7 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a3cadc1025..f04a5dec88 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -245,8 +245,9 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 				_events->waitKeyMouse();
 			} else {
 				for (;;) {
-					_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
-					_sound->_soundPriority[0] = 1;
+					_sound->freeSounds();
+					Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile);
+					_sound->_soundTable.push_back(SoundEntry(sound, 1));
 					_sound->playSound(0);
 					_scripts->cmdFreeSound();
 
@@ -287,8 +288,9 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 	}
 
 	for (;;) {
-		_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
-		_sound->_soundPriority[0] = 1;
+		_sound->freeSounds();
+		Resource *res = _sound->loadSound(_narateFile + 99, _sndSubFile);
+		_sound->_soundTable.push_back(SoundEntry(res, 1));
 		_sound->playSound(0);
 		_scripts->cmdFreeSound();
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 8270eaee6b..9801df7f3c 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -132,10 +132,7 @@ void AmazonEngine::doTitle() {
 	_events->hideCursor();
 
 	_sound->queueSound(0, 98, 30);
-	_sound->_soundPriority[0] = 1;
-
 	_sound->queueSound(1, 98, 8);
-	_sound->_soundPriority[1] = 1;
 
 	_files->_loadPalFlag = false;
 	_files->loadScreen(0, 3);
@@ -404,14 +401,13 @@ void AmazonEngine::startChapter(int chapter) {
 		_timers[20]._timer = 500;
 		_timers[20]._initTm = 500;
 		_timers[20]._flag++;
+		_sound->freeSounds();
 
-		_sound->_soundTable[0] = _sound->loadSound(115, 0);
-		_sound->_soundPriority[0] = 1;
+		_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 0), 1));
 		_sound->playSound(0);
 		_sound->freeSounds();
 
-		_sound->_soundTable[0] = _sound->loadSound(115, 1);
-		_sound->_soundPriority[0] = 1;
+		_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 1), 1));
 		_sound->playSound(0);
 		_sound->freeSounds();
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 5d9f2d9436..12902081b7 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -116,7 +116,6 @@ void AmazonScripts::mWhile1() {
 	_sequence = 2200;
 
 	_vm->_sound->queueSound(0, 14, 15);
-	_vm->_sound->_soundPriority[0] = 1;
 
 	do {
 		cLoop();
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 2f11d8b858..1c135930f3 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -96,7 +96,6 @@ void MartianEngine::doTitle() {
 	_events->hideCursor();
 
 	_sound->queueSound(0, 98, 30);
-	_sound->_soundPriority[0] = 1;
 
 	_files->_loadPalFlag = false;
 	_files->loadScreen(0, 3);
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 6c4c37491f..bf58a20eef 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -707,15 +707,14 @@ void Scripts::cmdLoadSound() {
 	int idx = _data->readSint16LE();
 
 	_vm->_sound->_soundTable.clear();
-	_vm->_sound->_soundPriority.clear();
-	_vm->_sound->_soundTable.push_back(_vm->_files->loadFile(_vm->_extraCells[idx]._vidSound));
-	_vm->_sound->_soundPriority.push_back(1);
+	Resource *sound = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSound);
+	_vm->_sound->_soundTable.push_back(SoundEntry(sound, 1));
 }
 
 void Scripts::cmdFreeSound() { 
 	SoundManager &sound = *_vm->_sound;
 
-	if (sound._soundTable.size() > 0 && sound._soundTable[0]) {
+	if (sound._soundTable.size() > 0 && sound._soundTable[0]._res) {
 		// Keep doing char display loop if playing sound for it
 		do {
 			if (_vm->_flags[236] == 1)
@@ -725,8 +724,8 @@ void Scripts::cmdFreeSound() {
 		} while (!_vm->shouldQuit() && sound._playingSound);
 
 		// Free the sound
-		delete sound._soundTable[0];
-		sound._soundTable[0] = nullptr;
+		delete sound._soundTable[0]._res;
+		sound._soundTable.remove_at(0);
 	}
 }
 
@@ -766,8 +765,7 @@ void Scripts::cmdDead() {
 	_vm->_screen->forceFadeOut();
 	cmdFreeSound();
 
-	_vm->_sound->_soundTable[0] = _vm->_files->loadFile(98, 44);
-	_vm->_sound->_soundPriority[1] = 1;
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_files->loadFile(98, 44), 1));
 	
 	_vm->_screen->clearScreen();
 	_vm->_screen->setPanel(3);
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index dd8cf16189..075bfc005e 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -44,14 +44,17 @@ SoundManager::~SoundManager() {
 
 void SoundManager::clearSounds() {
 	for (uint i = 0; i < _soundTable.size(); ++i)
-		delete _soundTable[i];
+		delete _soundTable[i]._res;
 	_soundTable.clear();
-	_soundPriority.clear();
 }
 
 void SoundManager::queueSound(int idx, int fileNum, int subfile) {
-	delete _soundTable[idx];
-	_soundTable[idx] = _vm->_files->loadFile(fileNum, subfile);
+	if (idx >= (int)_soundTable.size())
+		_soundTable.resize(idx + 1);
+
+	delete _soundTable[idx]._res;
+	_soundTable[idx]._res = _vm->_files->loadFile(fileNum, subfile);
+	_soundTable[idx]._priority = 1;
 }
 
 Resource *SoundManager::loadSound(int fileNum, int subfile) {
@@ -59,8 +62,8 @@ Resource *SoundManager::loadSound(int fileNum, int subfile) {
 }
 
 void SoundManager::playSound(int soundIndex) {
-	int priority = _soundPriority[soundIndex];
-	playSound(_soundTable[soundIndex], priority);
+	int priority = _soundTable[soundIndex]._priority;
+	playSound(_soundTable[soundIndex]._res, priority);
 }
 
 void SoundManager::playSound(Resource *res, int priority) {
@@ -76,8 +79,8 @@ void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
 	clearSounds();
 
 	for (uint i = 0; i < sounds.size(); ++i) {
-		_soundTable.push_back(loadSound(sounds[i]._fileNum, sounds[i]._subfile));
-		_soundPriority.push_back(sounds[i]._priority);
+		Resource *sound = loadSound(sounds[i]._fileNum, sounds[i]._subfile);
+		_soundTable.push_back(SoundEntry(sound, sounds[i]._priority));
 	}
 }
 
diff --git a/engines/access/sound.h b/engines/access/sound.h
index c1b3981997..2456ba7753 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -33,6 +33,14 @@ namespace Access {
 
 class AccessEngine;
 
+struct SoundEntry {
+	Resource *_res;
+	int _priority;
+
+	SoundEntry() { _res = nullptr; _priority = 0; }
+	SoundEntry(Resource *res, int priority) { _res = res; _priority = priority; }
+};
+
 class SoundManager {
 private:
 	AccessEngine *_vm;
@@ -45,8 +53,7 @@ private:
 	void stopSound();
 
 public:
-	Common::Array<Resource *> _soundTable;
-	Common::Array<int> _soundPriority;
+	Common::Array<SoundEntry> _soundTable;
 	Resource *_music;
 	Resource *_tempMusic;
 	bool _musicRepeat;
-- 
cgit v1.2.3


From 6434ace3b695cc88593547f8079f6abd309b7f72 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Nov 2014 22:11:28 -0500
Subject: ACCESS: Fix not being able to save in room 9

---
 engines/access/scripts.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index bf58a20eef..e99af4b2f6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -414,7 +414,10 @@ void Scripts::cmdSetTimer() {
 void Scripts::cmdCheckTimer() {
 	int idx = _data->readUint16LE();
 
+	_vm->_canSaveLoad = true;
 	_vm->_events->pollEvents();
+	_vm->_canSaveLoad = false;
+
 	if ((idx == 9) && (_vm->_events->_keypresses.size() > 0)) {
 		_vm->_events->zeroKeys();
 		_vm->_timers[9]._timer = 0;
-- 
cgit v1.2.3


From fddff687da7b7f9eb2156a84407794c44978caa8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Nov 2014 16:34:06 -0500
Subject: ACCESS: Workaround for original game vertical room scrolling

---
 engines/access/amazon/amazon_room.cpp | 11 +++++++++++
 engines/access/amazon/amazon_room.h   |  2 ++
 engines/access/room.h                 |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 098220ee0c..96d34e70bb 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -125,6 +125,17 @@ void AmazonRoom::reloadRoom1() {
 	_vm->_newRects.clear();
 }
 
+void AmazonRoom::setupRoom() {
+	Room::setupRoom();
+
+	// WORKAROUND: The original engine doesn't handle vertical scrolling rooms
+	Screen &screen = *_vm->_screen;
+	if (screen._vWindowHeight == (_playFieldHeight - 1)) {
+		screen._scrollRow = 1;
+		screen._scrollY = 0;
+	}
+}
+
 void AmazonRoom::roomSet() {
 	_vm->_numAnimTimers = 0;
 	_vm->_scripts->_sequence = 1000;
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 122eed991e..ccace1ea45 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -48,6 +48,8 @@ protected:
 
 	virtual void reloadRoom1();
 
+	virtual void setupRoom();
+
 	virtual void roomMenu();
 
 	virtual void mainAreaClick();
diff --git a/engines/access/room.h b/engines/access/room.h
index fdeccc87c8..810082edb4 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -80,7 +80,6 @@ private:
 	bool checkCode(int v1, int v2);
 protected:
 	void loadRoomData(const byte *roomData);
-	void setupRoom();
 
 	/**
 	* Free the playfield data
@@ -115,6 +114,8 @@ protected:
 
 	virtual void reloadRoom1() = 0;
 
+	virtual void setupRoom();
+
 	virtual void doCommands();
 
 	virtual void roomMenu() = 0;
-- 
cgit v1.2.3


From e7818639afd72d861c3ed985bb8aeb4f685e5042 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Nov 2014 18:12:52 -0500
Subject: ACCESS: Workaround not being able to leave scene 9 in Amazon to the
 south

---
 engines/access/amazon/amazon_room.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 96d34e70bb..ec90fc6295 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -177,6 +177,11 @@ void AmazonRoom::mainAreaClick() {
 			}
 		} 
 
+		// WORKAROUND: In Amazon room 9, you can't leave the screen to the south due
+		// to not being able to click a Y position that's high enough
+		if (pt.y > 178)
+			pt.y = 200;
+
 		_vm->_player->_moveTo = pt;
 		_vm->_player->_playerMove = true;
 	} else if (mousePos.x >= _vm->_screen->_windowXAdd &&
-- 
cgit v1.2.3


From aea906f7d3c8959337c24ee4507bb245d9f5f744 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Nov 2014 19:16:14 -0500
Subject: ACCESS: Implemented chapter debug command

---
 engines/access/access.cpp   |  2 +-
 engines/access/debugger.cpp | 50 ++++++++++++++++++++++++++++++++++++++++-----
 engines/access/debugger.h   | 17 +++++++++++++--
 engines/access/files.cpp    |  6 ++++++
 engines/access/files.h      |  1 +
 engines/access/room.cpp     |  2 +-
 engines/access/scripts.cpp  |  2 --
 engines/access/scripts.h    |  3 +++
 8 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index f04a5dec88..a1f6430965 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -164,7 +164,7 @@ void AccessEngine::initialize() {
 	_animation = new AnimationManager(this);
 	_bubbleBox = new BubbleBox(this);
 	_char = new CharManager(this);
-	_debugger = new Debugger(this);
+	_debugger = Debugger::init(this);
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
 	_inventory = new InventoryManager(this);
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index d20b5d3e6b..d8f7cfe411 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -23,14 +23,10 @@
 #include "common/file.h"
 #include "access/access.h"
 #include "access/debugger.h"
+#include "access/amazon/amazon_game.h"
 
 namespace Access {
 
-Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
-	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
-	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
-}
-
 static int strToInt(const char *s) {
 	if (!*s)
 		// No string at all
@@ -47,6 +43,22 @@ static int strToInt(const char *s) {
 	return (int)tmp;
 }
 
+Debugger *Debugger::init(AccessEngine *vm) {
+	switch (vm->getGameID()) {
+	case GType_Amazon:
+		return new Amazon::AmazonDebugger(vm);
+	default:
+		return new Debugger(vm);
+	}
+}
+
+/*------------------------------------------------------------------------*/
+
+Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
+	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
+	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
+}
+
 bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Current scene is: %d\n", _vm->_player->_roomNumber);
@@ -66,4 +78,32 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 	}
 }
 
+/*------------------------------------------------------------------------*/
+
+namespace Amazon {
+
+AmazonDebugger::AmazonDebugger(AccessEngine *vm): Debugger(vm) {
+	registerCmd("chapter", WRAP_METHOD(AmazonDebugger, Cmd_StartChapter));
+}
+
+bool AmazonDebugger::Cmd_StartChapter(int argc, const char **argv) {
+	if (argc != 2) {
+		debugPrintf("Usage: %s <chapter number>\n", argv[0]);
+		return true;
+	}
+
+	// Build up a simple one line script to start the given chapter
+	byte *chapterScript = (byte *)malloc(5);
+	chapterScript[0] = SCRIPT_START_BYTE;
+	chapterScript[1] = ROOM_SCRIPT % 256;
+	chapterScript[2] = ROOM_SCRIPT / 256;
+	chapterScript[3] = 0x80 + 75;			// cmdChapter
+	chapterScript[4] = strToInt(argv[1]);	// chapter number
+	_vm->_scripts->setScript(new Resource(chapterScript, 5));
+
+	return false;
+}
+
+} // End of namespace Amazon
+
 } // End of namespace Access
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
index 6c8424dac4..67425430e2 100644
--- a/engines/access/debugger.h
+++ b/engines/access/debugger.h
@@ -31,16 +31,29 @@ namespace Access {
 class AccessEngine;
 
 class Debugger : public GUI::Debugger {
-private:
-	AccessEngine *_vm;
 protected:
+	AccessEngine *_vm;
+
 	bool Cmd_LoadScene(int argc, const char **argv);
 public:
+	static Debugger *init(AccessEngine *vm);
 public:
 	Debugger(AccessEngine *vm);
 	virtual ~Debugger() {}
 };
 
+namespace Amazon {
+
+class AmazonDebugger : public Debugger {
+protected:
+	bool Cmd_StartChapter(int argc, const char **argv);
+public:
+	AmazonDebugger(AccessEngine *vm);
+	virtual ~AmazonDebugger() {}
+};
+
+} // End of namespace Amazon
+
 } // End of namespace Access
 
 #endif	/* ACCESS_DEBUGGER_H */
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index a4ec16ad61..bb8dc57c2c 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -59,6 +59,12 @@ Resource::~Resource() {
 	delete _stream;
 }
 
+Resource::Resource(byte *data, int size) {
+	_data = data;
+	_size = size;
+	_stream = new Common::MemoryReadStream(data, size);
+}
+
 byte *Resource::data() {
 	if (_data == nullptr) {
 		_data = new byte[_size];
diff --git a/engines/access/files.h b/engines/access/files.h
index 720d4fb2ba..24e2d88456 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -62,6 +62,7 @@ public:
 	int _size;
 
 	Resource();
+	Resource::Resource(byte *data, int size);
 	~Resource();
 	byte *data();
 };
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 76ad29e21a..c9f4a886a1 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -235,7 +235,7 @@ void Room::loadRoomData(const byte *roomData) {
 }
 
 void Room::roomLoop() {
-	_vm->_scripts->_sequence = 2000;
+	_vm->_scripts->_sequence = ROOM_SCRIPT;
 	_vm->_scripts->searchForSequence();
 	_vm->_scripts->executeScript();
 }
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index e99af4b2f6..72fc35dc3f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -25,8 +25,6 @@
 #include "access/resources.h"
 #include "access/scripts.h"
 
-#define SCRIPT_START_BYTE 0xE0
-
 namespace Access {
 
 Scripts::Scripts(AccessEngine *vm) : Manager(vm) {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index ab80c1cd9f..9860c7cde9 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -32,6 +32,9 @@ namespace Access {
 class AccessEngine;
 class Scripts;
 
+#define SCRIPT_START_BYTE 0xE0
+#define ROOM_SCRIPT 2000
+
 class Scripts: public Manager {
 private:
 	Resource *_resource;
-- 
cgit v1.2.3


From d23d95b9129c0f0b90718630d9d136042821d026 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Nov 2014 22:35:58 -0500
Subject: ACCESS: Fix display of cutscene at the end of chapter 3

---
 engines/access/amazon/amazon_game.cpp    | 4 ++--
 engines/access/amazon/amazon_scripts.cpp | 7 +++----
 engines/access/files.cpp                 | 8 ++------
 engines/access/files.h                   | 2 +-
 engines/access/martian/martian_game.cpp  | 4 ++--
 engines/access/screen.cpp                | 5 +++--
 engines/access/scripts.cpp               | 9 ++++++---
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 9801df7f3c..87aa9358cd 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -134,7 +134,7 @@ void AmazonEngine::doTitle() {
 	_sound->queueSound(0, 98, 30);
 	_sound->queueSound(1, 98, 8);
 
-	_files->_loadPalFlag = false;
+	_files->_setPaletteFlag = false;
 	_files->loadScreen(0, 3);
 	
 	_buffer2.copyFrom(*_screen);
@@ -148,7 +148,7 @@ void AmazonEngine::doTitle() {
 
 	_sound->playSound(1);
 
-	_files->_loadPalFlag = false;
+	_files->_setPaletteFlag = false;
 	_files->loadScreen(0, 4);
 	_sound->playSound(1);
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 12902081b7..bb17f86f49 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -531,7 +531,7 @@ void AmazonScripts::mWhileDoOpen() {
 	delete data;
 
 	_vm->_objectsTable[1] = spr;
-	_vm->_files->_loadPalFlag = false;
+	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(1, 2);
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_buffer1.copyFrom(*_vm->_screen);
@@ -714,14 +714,13 @@ void AmazonScripts::guard() {
 }
 
 void AmazonScripts::loadBackground(int param1, int param2) {
-	_vm->_files->_loadPalFlag = false;
+	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(param1, param2);
 
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_buffer1.copyFrom(*_vm->_screen);
 
-	_vm->_screen->forceFadeOut();
-	
+	_vm->_screen->forceFadeIn();
 }
 
 void AmazonScripts::setInactive() {
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index bb8dc57c2c..0705b5d227 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -92,7 +92,7 @@ FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	}
 
 	_fileNumber = -1;
-	_loadPalFlag = true;
+	_setPaletteFlag = true;
 }
 
 FileManager::~FileManager() {
@@ -144,11 +144,7 @@ void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile)
 }
 
 void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
-	if (_loadPalFlag) {
-		_vm->_screen->loadPalette(res->_stream);
-	} else {
-		res->_stream->skip(PALETTE_SIZE);
-	}
+	_vm->_screen->loadPalette(res->_stream);
 
 	// The remainder of the file after the palette may be separately compressed,
 	// so call handleFile to handle it if it is
diff --git a/engines/access/files.h b/engines/access/files.h
index 24e2d88456..f65f2ba8da 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -96,7 +96,7 @@ private:
 public:
 	int _fileNumber;
 	Common::Array<uint32> _fileIndex;
-	bool _loadPalFlag;
+	bool _setPaletteFlag;
 public:
 	FileManager(AccessEngine *vm);
 	~FileManager();
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 1c135930f3..81a8ffdf4d 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -97,7 +97,7 @@ void MartianEngine::doTitle() {
 
 	_sound->queueSound(0, 98, 30);
 
-	_files->_loadPalFlag = false;
+	_files->_setPaletteFlag = false;
 	_files->loadScreen(0, 3);
 	
 	_buffer2.copyFrom(*_screen);
@@ -111,7 +111,7 @@ void MartianEngine::doTitle() {
 
 	_sound->playSound(1);
 
-	_files->_loadPalFlag = false;
+	_files->_setPaletteFlag = false;
 	_files->loadScreen(0, 4);
 	_sound->playSound(1);
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 17f36fc072..3e0863cc31 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -101,8 +101,9 @@ void Screen::setInitialPalettte() {
 
 void Screen::loadPalette(Common::SeekableReadStream *stream) {
 	loadRawPalette(stream);
-	setPalette();
-	_vm->_files->_loadPalFlag = true;
+	if (_vm->_files->_setPaletteFlag)
+		setPalette();
+	_vm->_files->_setPaletteFlag = true;
 }
 
 void Screen::loadPalette(int fileNum, int subfile) {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 72fc35dc3f..081fc65f0c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -748,6 +748,9 @@ void Scripts::cmdPlayVideoSound() {
 		_vm->_sound->playSound(0);
 		_vm->_video->_soundFlag = true;
 	}
+
+	_vm->_events->pollEvents();
+	g_system->delayMillis(10);
 }
 
 void Scripts::CMDPUSHLOCATION() { error("TODO CMDPUSHLOCATION"); }
@@ -773,9 +776,9 @@ void Scripts::cmdDead() {
 
 	if (deathId != 10) {
 		_vm->_sound->newMusic(62, 0);
-		_vm->_files->_loadPalFlag = false;
+		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(94, 0);
-		_vm->_files->_loadPalFlag = true;
+		_vm->_files->_setPaletteFlag = true;
 		_vm->_buffer2.copyFrom(*_vm->_screen);
 
 		for (int i = 0; i < 3; ++i) {
@@ -793,7 +796,7 @@ void Scripts::cmdDead() {
 		_vm->loadCells(cells);
 
 		_vm->_screen->setDisplayScan();
-		_vm->_files->_loadPalFlag = false;
+		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(&_vm->_buffer2, 94, 1);
 		_vm->_screen->setIconPalette();
 
-- 
cgit v1.2.3


From d6963d8d09b9bd5f1fd5cd4c58e90bb4332a5cfe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Nov 2014 22:44:30 -0500
Subject: ACCESS: Simplification of logic for selectively applying loaded
 palettes

---
 engines/access/files.cpp  | 5 ++++-
 engines/access/screen.cpp | 7 -------
 engines/access/screen.h   | 2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 0705b5d227..dacceb7a09 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -144,7 +144,10 @@ void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile)
 }
 
 void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
-	_vm->_screen->loadPalette(res->_stream);
+	_vm->_screen->loadRawPalette(res->_stream);
+	if (_setPaletteFlag)
+		_vm->_screen->setPalette();
+	_setPaletteFlag = true;
 
 	// The remainder of the file after the palette may be separately compressed,
 	// so call handleFile to handle it if it is
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 3e0863cc31..f98552470c 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -99,13 +99,6 @@ void Screen::setInitialPalettte() {
 	g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18);
 }
 
-void Screen::loadPalette(Common::SeekableReadStream *stream) {
-	loadRawPalette(stream);
-	if (_vm->_files->_setPaletteFlag)
-		setPalette();
-	_vm->_files->_setPaletteFlag = true;
-}
-
 void Screen::loadPalette(int fileNum, int subfile) {
 	Resource *res = _vm->_files->loadFile(fileNum, subfile);
 	byte *palette = res->data();
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 2db05a5f9d..8875ce12b7 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -121,8 +121,6 @@ public:
 	 */
 	void setIconPalette() {}
 
-	void loadPalette(Common::SeekableReadStream *stream);
-
 	void loadPalette(int fileNum, int subfile);
 
 	void setPalette();
-- 
cgit v1.2.3


From 876ce794a1545f04aafc1752d2e25d4379fc72ea Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Nov 2014 22:53:21 -0500
Subject: ACCESS: Fix crash when exiting game in the middle of a chapter start

---
 engines/access/room.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index c9f4a886a1..02bb3b53c7 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -88,7 +88,10 @@ void Room::doRoom() {
 			_vm->_player->walk();
 			_vm->_sound->midiRepeat();
 			_vm->_player->checkScroll();
+
 			doCommands();
+			if (_vm->shouldQuit())
+				return;
 
 			// DOROOMFLASHBACK jump point
 			if (_function == FN_CLEAR1) {
-- 
cgit v1.2.3


From 6f39c07324521becc4d12354a27e213b4bc73272 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 09:40:44 -0500
Subject: ACCESS: Fix crash when starting scene 16

---
 engines/access/amazon/amazon_room.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index ec90fc6295..fb849d27fa 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -93,7 +93,7 @@ void AmazonRoom::reloadRoom1() {
 	_vm->_screen->clearScreen();
 	roomSet();
 
-	if (!_roomFlag && (_vm->_player->_roomNumber != 61 || !_antOutFlag)) {
+	if (_roomFlag != 1 && (_vm->_player->_roomNumber != 61 || !_antOutFlag)) {
 		_vm->_player->load();
 		_vm->_player->calcManScale();
 	}
-- 
cgit v1.2.3


From 8ef3d551511f2b22c36e2cdbcb50f104eb64871a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 11:19:10 -0500
Subject: ACCESS: Fix scene fade ins

---
 engines/access/room.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 02bb3b53c7..e3ac84c231 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -69,12 +69,12 @@ void Room::doRoom() {
 		}
 
 		reloadFlag = false;
-		_vm->_startup = 0;
+		_vm->_startup = 8;
 		_function = 0;
 
 		while (!_vm->shouldQuit()) {
 			_vm->_images.clear();
-			if (_vm->_startup != -1 && --_vm->_startup != 0) {
+			if (_vm->_startup != -1 && --_vm->_startup == 0) {
 				_vm->_events->showCursor();
 				_vm->_screen->fadeIn();
 			}
-- 
cgit v1.2.3


From 985ad555591ebb48ebe3f2bfd711d245bab40f71 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 12:22:38 -0500
Subject: ACCESS: Airplane flight cutscene is now partially working

---
 engines/access/amazon/amazon_scripts.cpp | 124 +++++++++++++++++++------------
 engines/access/events.cpp                |   2 +
 engines/access/events.h                  |   1 +
 3 files changed, 79 insertions(+), 48 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index bb17f86f49..857e4447e6 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -226,24 +226,48 @@ void AmazonScripts::mWhile2() {
 }
 
 void AmazonScripts::doFlyCell() {
-	_game->_destIn = &_game->_buffer2;
-	if (_game->_plane._pCount <= 40) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 3, Common::Point(70, 74));
-	} else if (_game->_plane._pCount <= 80) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 6, Common::Point(70, 74));
-	} else if (_game->_plane._pCount <= 120) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 2, Common::Point(50, 76));
-	} else if (_game->_plane._pCount <= 160) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 14, Common::Point(63, 78));
-	} else if (_game->_plane._pCount <= 200) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 5, Common::Point(86, 74));
-	} else if (_game->_plane._pCount <= 240) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 0, Common::Point(103, 76));
-	} else if (_game->_plane._pCount <= 280) {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 4, Common::Point(119, 77));
+	Plane &plane = _game->_plane;
+	SpriteResource *sprites = _vm->_objectsTable[15];
+
+	if (plane._pCount <= 40) {
+		_vm->_buffer2.plotImage(sprites, 3, Common::Point(70, 74));
+	} else if (plane._pCount <= 80) {
+		_vm->_buffer2.plotImage(sprites, 6, Common::Point(70, 74));
+	} else if (plane._pCount <= 120) {
+		_vm->_buffer2.plotImage(sprites, 2, Common::Point(50, 76));
+	} else if (plane._pCount <= 160) {
+		_vm->_buffer2.plotImage(sprites, 14, Common::Point(63, 78));
+	} else if (plane._pCount <= 200) {
+		_vm->_buffer2.plotImage(sprites, 5, Common::Point(86, 74));
+	} else if (plane._pCount <= 240) {
+		_vm->_buffer2.plotImage(sprites, 0, Common::Point(103, 76));
+	} else if (plane._pCount <= 280) {
+		_vm->_buffer2.plotImage(sprites, 4, Common::Point(119, 77));
 	} else {
-		_vm->_screen->plotImage(_vm->_objectsTable[15], 1, Common::Point(111, 77));
+		_vm->_buffer2.plotImage(sprites, 1, Common::Point(111, 77));
 	}
+
+	if (plane._pCount == 11 || plane._pCount == 12)
+		++plane._position.y;
+	else if (plane._pCount >= 28)
+		--plane._position.y;
+
+	_vm->_buffer2.plotImage(sprites, 7, plane._position);
+	_vm->_buffer2.plotImage(sprites, plane._propCount, Common::Point(
+		plane._position.x + 99, plane._position.y + 10));
+	_vm->_buffer2.plotImage(sprites, plane._propCount, Common::Point(
+		plane._position.x + 104, plane._position.y + 18));
+
+	if (++plane._planeCount >= 30)
+		plane._planeCount = 0;
+	if (++plane._propCount >= 3)
+		plane._propCount = 0;
+
+	++plane._xCount;
+	if (plane._xCount == 1)
+		++plane._position.x;
+	else
+		plane._xCount = 0;
 }
 
 void AmazonScripts::doFallCell() {
@@ -320,59 +344,63 @@ void AmazonScripts::scrollJWalk() {
 }
 
 void AmazonScripts::mWhileFly() {
-	_vm->_events->hideCursor();
-	_vm->_screen->clearScreen();
-	_vm->_screen->setBufferScan();
-	_vm->_screen->fadeOut();
-	_vm->_screen->_scrollX = 0;
+	Screen &screen = *_vm->_screen;
+	Player &player = *_vm->_player;
+	EventsManager &events = *_vm->_events;
+	Plane &plane = _game->_plane;
+
+	events.hideCursor();
+	screen.clearScreen();
+	screen.setBufferScan();
+	screen.fadeOut();
+	screen._scrollX = 0;
 
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-	_vm->_screen->fadeIn();
+	screen.fadeIn();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
 
 	// KEYFLG = 0;
 
-	_vm->_screen->_scrollRow = _vm->_screen->_scrollCol = 0;
-	_vm->_screen->_scrollX = _vm->_screen->_scrollY = 0;
-	_vm->_player->_rawPlayer = Common::Point(0, 0);
-	_vm->_player->_scrollAmount = 1;
+	screen._scrollRow = screen._scrollCol = 0;
+	screen._scrollX = screen._scrollY = 0;
+	player._rawPlayer = Common::Point(0, 0);
+	player._scrollAmount = 1;
 
-	_game->_plane._pCount = 0;
-	_game->_plane._planeCount = 0;
-	_game->_plane._propCount = 0;
-	_game->_plane._xCount = 0;
-	_game->_plane._position = Common::Point(20, 29);
+	plane._pCount = 0;
+	plane._planeCount = 0;
+	plane._propCount = 0;
+	plane._xCount = 0;
+	plane._position = Common::Point(20, 29);
 
-	warning("FIXME: _vbCount should be handled in NEWTIMER");
-	while (true) {
-		int _vbCount = 4;
-		if (_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth == _vm->_room->_playFieldWidth) {
-			_vm->_events->showCursor();
-			return;
-		}
+	while (!_vm->shouldQuit() && ((screen._scrollCol + screen._vWindowWidth) 
+			!= _vm->_room->_playFieldWidth)) {
+		events._vbCount = 4;
+		screen._scrollX += player._scrollAmount;
 
-		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
-			_vm->_screen->_scrollX -= TILE_WIDTH;
-			++_vm->_screen->_scrollCol;
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
 
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		scrollFly();
-		++_game->_plane._pCount;
-		g_system->delayMillis(10);
+		++plane._pCount;
 
-		while(_vbCount > 0) {
+		while (!_vm->shouldQuit() && events._vbCount > 0) {
 			// To be rewritten when NEWTIMER is done
-			_vm->_events->checkForNextFrameCounter();
-			_vbCount--;
+			events.checkForNextFrameCounter();
 			_vm->_sound->playSound(0);
+
+			g_system->delayMillis(10);
+			events.pollEvents();
 		}
 	}
+
+	events.showCursor();
 }
 
 void AmazonScripts::mWhileFall() {
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 0b7a34841e..7741a87677 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -44,6 +44,7 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_wheelUp = _wheelDown = false;
 	_mouseCol = _mouseRow = 0;
 	_cursorExitFlag = false;
+	_vbCount = 0;
 }
 
 EventsManager::~EventsManager() {
@@ -184,6 +185,7 @@ bool EventsManager::checkForNextFrameCounter() {
 	// Check for next game frame
 	uint32 milli = g_system->getMillis();
 	if ((milli - _priorFrameTime) >= GAME_FRAME_TIME) {
+		--_vbCount;
 		++_frameCounter;
 		_priorFrameTime = milli;
 
diff --git a/engines/access/events.h b/engines/access/events.h
index b29b54159e..def04effb8 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -57,6 +57,7 @@ public:
 	Common::Point _mousePos;
 	int _mouseCol, _mouseRow;
 	bool _cursorExitFlag;
+	int _vbCount;
 	Common::FixedStack<Common::KeyState> _keypresses;
 public:
 	/**
-- 
cgit v1.2.3


From bbaea32386927c856d22b97c877ddbba41fb142f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 13:54:48 -0500
Subject: ACCESS: Fixes for flying plane cutscene

---
 engines/access/amazon/amazon_scripts.cpp | 12 ++++++------
 engines/access/events.cpp                |  7 +++++++
 engines/access/events.h                  |  2 ++
 engines/access/room.cpp                  |  3 +++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 857e4447e6..b79b1c5c64 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -247,15 +247,15 @@ void AmazonScripts::doFlyCell() {
 		_vm->_buffer2.plotImage(sprites, 1, Common::Point(111, 77));
 	}
 
-	if (plane._pCount == 11 || plane._pCount == 12)
+	if (plane._planeCount == 11 || plane._planeCount == 12)
 		++plane._position.y;
-	else if (plane._pCount >= 28)
+	else if (plane._planeCount >= 28)
 		--plane._position.y;
 
 	_vm->_buffer2.plotImage(sprites, 7, plane._position);
-	_vm->_buffer2.plotImage(sprites, plane._propCount, Common::Point(
+	_vm->_buffer2.plotImage(sprites, 8 + plane._propCount, Common::Point(
 		plane._position.x + 99, plane._position.y + 10));
-	_vm->_buffer2.plotImage(sprites, plane._propCount, Common::Point(
+	_vm->_buffer2.plotImage(sprites, 11 + plane._propCount, Common::Point(
 		plane._position.x + 104, plane._position.y + 18));
 
 	if (++plane._planeCount >= 30)
@@ -374,8 +374,8 @@ void AmazonScripts::mWhileFly() {
 	plane._xCount = 0;
 	plane._position = Common::Point(20, 29);
 
-	while (!_vm->shouldQuit() && ((screen._scrollCol + screen._vWindowWidth) 
-			!= _vm->_room->_playFieldWidth)) {
+	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
+			((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth)) {
 		events._vbCount = 4;
 		screen._scrollX += player._scrollAmount;
 
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 7741a87677..0287e8cb03 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -264,6 +264,13 @@ int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
 	}
 }
 
+bool EventsManager::isKeyMousePressed() {
+	bool result = _leftButton || _rightButton || _keypresses.size() > 0;
+	debounceLeft();
+	zeroKeys();
+
+	return result;
+}
 
 
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index def04effb8..4888a27593 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -124,6 +124,8 @@ public:
 	Common::Point calcRawMouse();
 
 	int checkMouseBox1(Common::Array<Common::Rect> &rects);
+
+	bool isKeyMousePressed();
 };
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e3ac84c231..f1e499d1c9 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -126,7 +126,10 @@ void Room::doRoom() {
 				_vm->copyBF1BF2();
 				_vm->_newRects.clear();
 				_function = 0;
+
 				roomLoop();
+				if (_vm->shouldQuit())
+					return;
 
 				if (_function == FN_CLEAR1) {
 					clearRoom();
-- 
cgit v1.2.3


From d7cf5701324eb0e9b69017e596f8577bf9fe14a1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 15:34:05 -0500
Subject: ACCESS: Fix restoring talk bubbles where right edge is a bit over
 screen edge

---
 engines/access/bubble_box.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index d865d5c9b3..37b757f8d9 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -52,6 +52,8 @@ void BubbleBox::clearBubbles() {
 		_vm->_screen->_screenYOff = 0;
 		Common::Rect r = _bubbles[i];
 		r.left -= 2;
+		r.right = MIN(r.right, (int16)_vm->_screen->w);
+
 		_vm->_screen->copyBlock(&_vm->_buffer2, r);
 	}
 
-- 
cgit v1.2.3


From 4448929812a5b8ca21eebb594e587a582392c9a3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 15:34:33 -0500
Subject: ACCESS: Fixes for selecting bottom buttons in conversation screen

---
 engines/access/scripts.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 081fc65f0c..297118010e 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -555,11 +555,11 @@ void Scripts::cmdTexSpeak() {
 	findNull();
 }
 
+#define BTN_COUNT 6
 void Scripts::cmdTexChoice() {
-	static Common::Point cMouse[7] = {
-		Common::Point(0, 76), Common::Point(77, 154), Common::Point(155, 232),
-		Common::Point(233, 276), Common::Point(0, 0), Common::Point(277, 319),
-		Common::Point(297, 319)
+	static const int BTN_RANGES[BTN_COUNT][2] = {
+		{ 0, 76 }, { 77, 154 }, { 155, 232 }, { 233, 276 }, { 0, 0 }, 
+		{ 277, 319 }
 	};
 
 	_vm->_oldRects.clear();
@@ -636,8 +636,8 @@ void Scripts::cmdTexChoice() {
 			if (_vm->_events->_mouseRow >= 22) {
 				_vm->_events->debounceLeft();
 				int x = _vm->_events->_mousePos.x;
-				for (int i = 0; i < 7; i++) {
-					if ((x >= cMouse->x) && (x < cMouse->y)) {
+				for (int i = 0; i < BTN_COUNT; i++) {
+					if ((x >= BTN_RANGES[i][0]) && (x < BTN_RANGES[i][1])) {
 						choice = i;
 						break;
 					}
@@ -687,7 +687,7 @@ void Scripts::cmdSetConPos() {
 void Scripts::CMDCHECKVFRAME() { error("TODO CMDCHECKVFRAME"); }
 
 void Scripts::cmdJumpChoice() {
-	int val = (_data->readUint16LE() && 0xFF);
+	int val = (_data->readUint16LE() & 0xFF);
 	
 	if (val == _choice) {
 		_sequence = _data->readUint16LE();
-- 
cgit v1.2.3


From 4ce87a51a061c31b0f2db605712ce7e0cab5b5d7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 18:29:15 -0500
Subject: ACCESS: Fix restoring screen after offering a character an inventory
 item

---
 engines/access/inventory.cpp | 5 ++++-
 engines/access/room.cpp      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 45738462df..f2c87b2604 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -113,7 +113,7 @@ int InventoryManager::newDisplayInv() {
 	_invModeFlag = true;
 	_vm->_timers.saveTimers();
 	
-	if (room._tile && !_invRefreshFlag) {
+	if (!room._tile && !_invRefreshFlag) {
 		saveScreens();
 	}
 
@@ -360,6 +360,9 @@ void InventoryManager::restoreScreens() {
 	_vm->_buffer1.w = _vm->_buffer1.pitch;
 	_savedBuffer1.copyTo(&_vm->_buffer1);
 	_savedScreen.copyTo(_vm->_screen);
+
+	_savedBuffer1.free();
+	_savedScreen.free();
 }
 
 void InventoryManager::outlineIcon(int itemIndex) {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f1e499d1c9..e3a46159cf 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -163,6 +163,7 @@ void Room::clearRoom() {
 	_vm->_scripts->freeScriptData();
 	_vm->freeCells();
 	freePlayField();
+	freeTileData();
 	_vm->freeInactiveData();
 	_vm->_player->freeSprites();
 }
-- 
cgit v1.2.3


From 6390f54d4b6e191d5b1f85d0a3f86e94bb110228 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 18:39:54 -0500
Subject: ACCESS: Fix crash at end of cmdDead

---
 engines/access/scripts.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 297118010e..9f321947f2 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -824,9 +824,10 @@ void Scripts::cmdDead() {
 
 		warning("TODO: restart game");
 		_vm->quitGame();
-	}
-	else {
+		_vm->_events->pollEvents();
+	} else {
 		_vm->quitGame();
+		_vm->_events->pollEvents();
 	}
 }
 
-- 
cgit v1.2.3


From 304db8ee6f963a4f647488623fd30ccb70472962 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 10 Nov 2014 01:02:58 +0100
Subject: ACCESS: Add some code to display scene number & description

---
 engines/access/amazon/amazon_resources.cpp   | 18 +++++++++++++
 engines/access/amazon/amazon_resources.h     |  2 ++
 engines/access/debugger.cpp                  | 38 ++++++++++++++++++++++++----
 engines/access/debugger.h                    |  4 +++
 engines/access/martian/martian_resources.cpp | 15 +++++++++++
 engines/access/martian/martian_resources.h   |  2 ++
 6 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index e60da5b0ff..42dc35aa8e 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -574,6 +574,24 @@ const byte *ROOM_TABLE[] = {
 	CAVE, nullptr, nullptr, nullptr, PIT, nullptr, nullptr
 };
 
+const char *ROOM_DESCR[] = {
+	"TBD CREDITS", nullptr, nullptr, nullptr, "TBD ALLISTER",
+	"TBD HALL", "TBD JASONLAB", nullptr, "TBD ALLENLAB", "TBD OUTVAULT",
+	"TBD VAULT", "TBD LIBRARY", "TBD JASAPT", "TBD RANSACKED", "TBD MEAN1",
+	"TBD FLYSOUTH", "TBD CUZCO", "TBD INAIR", "TBD GREENMONKEY", "TBD INPLANE",
+	"TBD PILFALL", "TBD COCKPIT", "TBD CRASH", "TBD SINKING", "TBD JNGLWLK",
+	"TBD TOWN", "TBD HOTEL", "TBD CANTINA", nullptr, "TBD MASSACRE",
+	"TBD TRADE", "TBD BRIDGE", "TBD DOCK", "TBD DRIVER", nullptr,
+	nullptr, "TBD SHORE", "TBD BOAT", "TBD CABIN", "TBD CAPTIVE",
+	nullptr, nullptr, "TBD VILLAGE", nullptr, "TBD TREE",
+	"TBD CANOE", "TBD INTREE", "TBD FALLS", nullptr, nullptr,
+	nullptr, nullptr, nullptr, nullptr, "TBD WATERFALL",
+	"TBD INWATER", nullptr, "TBD CAVE", nullptr, nullptr,
+	nullptr, "TBD PIT", nullptr, nullptr
+};
+
+const int ROOM_NUMB = 63;
+
 const byte ELAINE[] = {
 	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 	0xFF, 0x0, 0x0, 0x0, 0x0, 0x41, 0x41, 0x0, 0x1, 0x0, 0xFF, 0x41, 0x0, 0x2,
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 2be9b4dd4b..7aee90003e 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -36,6 +36,8 @@ extern const byte *CURSORS[10];
 extern const int TRAVEL_POS[][2];
 
 extern const byte *ROOM_TABLE[];
+extern const char *ROOM_DESCR[];
+extern const int ROOM_NUMB;
 
 extern const byte *CHARTBL[];
 
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index d8f7cfe411..17ab6e101d 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -57,15 +57,38 @@ Debugger *Debugger::init(AccessEngine *vm) {
 Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
+
+	switch (vm->getGameID()) {
+	case GType_Amazon:
+		_sceneNumb = Amazon::ROOM_NUMB;
+		_sceneDescr = new Common::String[_sceneNumb];
+		for (int i = 0; i < _sceneNumb; i++)
+			_sceneDescr[i] = Common::String(Amazon::ROOM_DESCR[i]);
+		break;
+	case GType_MartianMemorandum:
+		_sceneNumb = Martian::ROOM_NUMB;
+		_sceneDescr = new Common::String[_sceneNumb];
+		for (int i = 0; i < _sceneNumb; i++)
+			_sceneDescr[i] = Common::String(Martian::ROOM_DESCR[i]);
+		break;
+	default:
+		_sceneDescr = nullptr;
+		_sceneNumb = 0;
+		break;
+	}
 }
 
 bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
-	if (argc != 2) {
-		debugPrintf("Current scene is: %d\n", _vm->_player->_roomNumber);
-		debugPrintf("Usage: %s <scene number>\n", argv[0]);
+	switch (argc) {
+	case 1:
+		debugPrintf("Current scene is: %d\n\n", _vm->_player->_roomNumber);
+
+		for (int i = 0; i < _sceneNumb; i++)
+			if (_sceneDescr[i].size())
+				debugPrintf("%d - %s\n", i, _sceneDescr[i].c_str());
 		return true;
-	}
-	else {
+
+	case 2:
 		_vm->_player->_roomNumber = strToInt(argv[1]);
 
 		_vm->_room->_function = FN_CLEAR1;
@@ -75,6 +98,11 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 		_vm->_scripts->_returnCode = 0;
 
 		return false;
+
+	default:
+		debugPrintf("Current scene is: %d\n", _vm->_player->_roomNumber);
+		debugPrintf("Usage: %s <scene number>\n", argv[0]);
+		return true;
 	}
 }
 
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
index 67425430e2..60bd22358a 100644
--- a/engines/access/debugger.h
+++ b/engines/access/debugger.h
@@ -25,6 +25,8 @@
 
 #include "common/scummsys.h"
 #include "gui/debugger.h"
+#include "access/amazon/amazon_resources.h"
+#include "access/martian/martian_resources.h"
 
 namespace Access {
 
@@ -35,6 +37,8 @@ protected:
 	AccessEngine *_vm;
 
 	bool Cmd_LoadScene(int argc, const char **argv);
+	Common::String *_sceneDescr;
+	int _sceneNumb;
 public:
 	static Debugger *init(AccessEngine *vm);
 public:
diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index b596797ab5..5dfb766885 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -421,6 +421,21 @@ const byte *ROOM_TABLE[] = {
 	nullptr, nullptr, nullptr, nullptr, nullptr, ROOM_TABLE47
 };
 
+const char *ROOM_DESCR[] = {
+	nullptr, "TBD ROOM_TABLE1", "TBD ROOM_TABLE2", "TBD ROOM_TABLE3", "TBD ROOM_TABLE4",
+	"TBD ROOM_TABLE5", "TBD ROOM_TABLE6", "TBD ROOM_TABLE7", "TBD ROOM_TABLE8", "TBD ROOM_TABLE9",
+	nullptr, "TBD ROOM_TABLE11", nullptr, "TBD ROOM_TABLE13", "TBD ROOM_TABLE14",
+	"TBD ROOM_TABLE15", "TBD ROOM_TABLE16", "TBD ROOM_TABLE17", "TBD ROOM_TABLE18", nullptr,
+	nullptr, "TBD ROOM_TABLE21", "TBD ROOM_TABLE22", "TBD ROOM_TABLE23", "TBD ROOM_TABLE24",
+	"TBD ROOM_TABLE25", "TBD ROOM_TABLE26", "TBD ROOM_TABLE27", "TBD ROOM_TABLE28", "TBD ROOM_TABLE29",
+	"TBD ROOM_TABLE30", "TBD ROOM_TABLE31", "TBD ROOM_TABLE32", "TBD ROOM_TABLE33", nullptr,
+	"TBD ROOM_TABLE35", nullptr, "TBD ROOM_TABLE37", "TBD ROOM_TABLE38", "TBD ROOM_TABLE39",
+	nullptr, nullptr, nullptr, nullptr, nullptr,
+	nullptr, nullptr, "TBD ROOM_TABLE47"
+};
+
+const int ROOM_NUMB = 48;
+
 const byte CHAR_TABLE0[] = {
 	0x02, 0x31, 0x00, 0x08, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
 	0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h
index a6ababeec3..ab8dfb4d1a 100644
--- a/engines/access/martian/martian_resources.h
+++ b/engines/access/martian/martian_resources.h
@@ -38,6 +38,8 @@ extern const int TRAVEL_POS[][2];
 extern const char *const INVENTORY_NAMES[];
 
 extern const byte *ROOM_TABLE[];
+extern const char *ROOM_DESCR[];
+extern const int ROOM_NUMB;
 
 extern const byte *CHAR_TABLE[];
 
-- 
cgit v1.2.3


From dd2bfdd47fb111259f94fbd985513d56c263305d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 10 Nov 2014 01:12:39 +0100
Subject: ACCESS: Fix compilation warning by adding a dummy inventory combo
 array for Martian

---
 engines/access/inventory.cpp                 |  1 +
 engines/access/martian/martian_resources.cpp | 58 ++++++++++++++++++++++++++++
 engines/access/martian/martian_resources.h   |  2 +
 3 files changed, 61 insertions(+)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index f2c87b2604..34470ace1e 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -69,6 +69,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 		break;
 	case GType_MartianMemorandum:
 		names = Martian::INVENTORY_NAMES;
+		combineP = &Martian::COMBO_TABLE[0][0];
 		_inv.resize(54);
 		break;
 	default:
diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index 5dfb766885..ae63f66c7c 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -659,6 +659,64 @@ const byte *CHAR_TABLE[] = {
 	CHAR_TABLE26, CHAR_TABLE27
 };
 
+// TODO: Fix that array
+const int COMBO_TABLE[54][4] = {
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 },
+	{ -1, -1, -1, -1 }
+};
+
 } // End of namespace Martian
 
 } // End of namespace Access
diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h
index ab8dfb4d1a..b9584ba2dd 100644
--- a/engines/access/martian/martian_resources.h
+++ b/engines/access/martian/martian_resources.h
@@ -43,6 +43,8 @@ extern const int ROOM_NUMB;
 
 extern const byte *CHAR_TABLE[];
 
+extern const int COMBO_TABLE[54][4];
+
 } // End of namespace Martian
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 0df4c903c77b3614723bfc183102c89aa071a65f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 10 Nov 2014 01:28:42 +0100
Subject: ACCESS: Add some safeguards in LoadScene debugger command

---
 engines/access/amazon/amazon_resources.cpp | 14 +++++++-------
 engines/access/debugger.cpp                | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 42dc35aa8e..a1db01d7b3 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -575,19 +575,19 @@ const byte *ROOM_TABLE[] = {
 };
 
 const char *ROOM_DESCR[] = {
-	"TBD CREDITS", nullptr, nullptr, nullptr, "TBD ALLISTER",
-	"TBD HALL", "TBD JASONLAB", nullptr, "TBD ALLENLAB", "TBD OUTVAULT",
-	"TBD VAULT", "TBD LIBRARY", "TBD JASAPT", "TBD RANSACKED", "TBD MEAN1",
-	"TBD FLYSOUTH", "TBD CUZCO", "TBD INAIR", "TBD GREENMONKEY", "TBD INPLANE",
-	"TBD PILFALL", "TBD COCKPIT", "TBD CRASH", "TBD SINKING", "TBD JNGLWLK",
+	"Credits", nullptr, nullptr, nullptr, "Outside of Allister Center",
+	"Hall", "Jason's Lab", nullptr, "Allen's Lab", "Outside of the Vault",
+	"Inside the Vault", "Reader", "Jason's Apartment", "Jason's ransacked apartment", "Cutscene 1",
+	"TBD FLYSOUTH", "Cuzco Airport", "TBD INAIR", "Green Monkey Club", "In Plane",
+	"TBD PILFALL", "TBD COCKPIT", "TBD CRASH", "TBD SINKING", "Cutscene Jungle Walk",
 	"TBD TOWN", "TBD HOTEL", "TBD CANTINA", nullptr, "TBD MASSACRE",
 	"TBD TRADE", "TBD BRIDGE", "TBD DOCK", "TBD DRIVER", nullptr,
 	nullptr, "TBD SHORE", "TBD BOAT", "TBD CABIN", "TBD CAPTIVE",
 	nullptr, nullptr, "TBD VILLAGE", nullptr, "TBD TREE",
 	"TBD CANOE", "TBD INTREE", "TBD FALLS", nullptr, nullptr,
 	nullptr, nullptr, nullptr, nullptr, "TBD WATERFALL",
-	"TBD INWATER", nullptr, "TBD CAVE", nullptr, nullptr,
-	nullptr, "TBD PIT", nullptr, nullptr
+	"TBD INWATER", nullptr, "Cave Bridge", nullptr, nullptr,
+	nullptr, "Pit with Ants", nullptr, nullptr
 };
 
 const int ROOM_NUMB = 63;
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 17ab6e101d..9a82168561 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -88,8 +88,18 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 				debugPrintf("%d - %s\n", i, _sceneDescr[i].c_str());
 		return true;
 
-	case 2:
-		_vm->_player->_roomNumber = strToInt(argv[1]);
+	case 2: {
+		int newRoom = strToInt(argv[1]);
+		if (newRoom < 0 || newRoom >= _sceneNumb) {
+			debugPrintf("Invalid Room Number");
+			return true;
+		}
+		if (!_sceneDescr[newRoom].size()) {
+			debugPrintf("Unused Room Number");
+			return true;
+		}
+			
+		_vm->_player->_roomNumber = newRoom;
 
 		_vm->_room->_function = FN_CLEAR1;
 		_vm->freeChar();
@@ -98,7 +108,7 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 		_vm->_scripts->_returnCode = 0;
 
 		return false;
-
+		}
 	default:
 		debugPrintf("Current scene is: %d\n", _vm->_player->_roomNumber);
 		debugPrintf("Usage: %s <scene number>\n", argv[0]);
-- 
cgit v1.2.3


From ea206330813aff730c7af5f1aec931f8720105d9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 22:30:57 -0500
Subject: ACCESS: Fix cutscene of pilot falling out of plane

---
 engines/access/amazon/amazon_scripts.cpp | 57 ++++++++++++++++----------------
 engines/access/room.cpp                  |  3 ++
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index b79b1c5c64..8e33ae614d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -271,13 +271,14 @@ void AmazonScripts::doFlyCell() {
 }
 
 void AmazonScripts::doFallCell() {
-	if (_vm->_scaleI <= 0)
+	if (_vm->_scaleI <= 20)
 		return;
 
-	_game->_destIn = &_game->_buffer2;
+	SpriteFrame *frame = _vm->_objectsTable[20]->getFrame(_game->_plane._planeCount / 6);
+	Common::Rect r(115, 11, 115 + _vm->_screen->_scaleTable1[frame->w], 
+		11 + _vm->_screen->_scaleTable1[frame->h]);
+	_vm->_buffer2.sPlotF(frame, r);
 
-	// 115, 11, i
-	_vm->_screen->plotImage(_vm->_objectsTable[20], _game->_plane._planeCount / 6, Common::Point(115, 11));
 	_vm->_scaleI -= 3;
 	_vm->_scale = _vm->_scaleI;
 	_vm->_screen->setScaleTable(_vm->_scale);
@@ -404,53 +405,53 @@ void AmazonScripts::mWhileFly() {
 }
 
 void AmazonScripts::mWhileFall() {
-	_vm->_events->hideCursor();
-	_vm->_screen->clearScreen();
-	_vm->_screen->setBufferScan();
-	_vm->_screen->fadeOut();
-	_vm->_screen->_scrollX = 0;
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+
+	events.hideCursor();
+	screen.clearScreen();
+	screen.setBufferScan();
+	screen.fadeOut();
+	screen._scrollX = 0;
 
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-	_vm->_screen->fadeIn();
+	screen.fadeIn();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
 
 	// KEYFLG = 0;
 
-	_vm->_screen->_scrollRow = _vm->_screen->_scrollCol = 0;
-	_vm->_screen->_scrollX = _vm->_screen->_scrollY = 0;
+	screen._scrollRow = screen._scrollCol = 0;
+	screen._scrollX = screen._scrollY = 0;
 	_vm->_player->_scrollAmount = 3;
 	_vm->_scaleI = 255;
 
 	_game->_plane._xCount = 0;
 	_game->_plane._planeCount = 0;
 
-	while (true) {
-		int _vbCount = 4;
-		if (_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth == _vm->_room->_playFieldWidth) {
-			_vm->_events->showCursor();
-			return;
-		}
+	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
+			(screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
+		events._vbCount = 4;
+		screen._scrollX += _vm->_player->_scrollAmount;
 
-		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
-			_vm->_screen->_scrollX -= TILE_WIDTH;
-			++_vm->_screen->_scrollCol;
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
 
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		scrollFall();
-		g_system->delayMillis(10);
 
-		while(_vbCount > 0) {
-			// To be rewritten when NEWTIMER is done
-			_vm->_events->checkForNextFrameCounter();
-			_vbCount--;
+		while (!_vm->shouldQuit() && events._vbCount > 0) {
+			events.pollEvents();
+			g_system->delayMillis(10);
 		}
 	}
+
+	events.showCursor();
 }
 
 void AmazonScripts::mWhileJWalk() {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e3a46159cf..513c1596ac 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -316,6 +316,9 @@ void Room::buildScreen() {
 }
 
 void Room::buildColumn(int playX, int screenX) {
+	if (playX < 0 || playX >= _playFieldWidth)
+		return;
+
 	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
 		_playFieldWidth + playX;
 
-- 
cgit v1.2.3


From 7ce1da3ba47bcc7092aa7ff12b9fe1102b707e06 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 22:40:22 -0500
Subject: ACCESS: Some cleanup of remaining game cutscenes code

---
 engines/access/amazon/amazon_scripts.cpp | 81 +++++++++++++++++---------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8e33ae614d..53ac4be869 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -455,6 +455,10 @@ void AmazonScripts::mWhileFall() {
 }
 
 void AmazonScripts::mWhileJWalk() {
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+	Player &player = *_vm->_player;
+
 	const int jungleObj[7][4] = {
 		{2, 77, 0, 40},
 		{0, 290, 0, 50},
@@ -465,22 +469,22 @@ void AmazonScripts::mWhileJWalk() {
 		{1, -150, 0, 30},
 	};
 
-	_vm->_screen->fadeOut();
-	_vm->_events->hideCursor();
-	_vm->_screen->clearScreen();
+	screen.fadeOut();
+	events.hideCursor();
+	screen.clearScreen();
 	_vm->_buffer2.clearBuffer();
-	_vm->_screen->setBufferScan();
-	_vm->_screen->_scrollX = 0;
+	screen.setBufferScan();
+	screen._scrollX = 0;
 
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-	_vm->_screen->fadeIn();
+	screen.fadeIn();
 
 	// KEYFLG = 0;
-	_vm->_player->_xFlag = 1;
-	_vm->_player->_yFlag = 0;
-	_vm->_player->_moveTo.x = 160;
-	_vm->_player->_move = UP;
+	player._xFlag = 1;
+	player._yFlag = 0;
+	player._moveTo.x = 160;
+	player._move = UP;
 
 	_game->_plane._xCount = 2;
 	_xTrack = 10;
@@ -503,35 +507,36 @@ void AmazonScripts::mWhileJWalk() {
 		_pObjXl[i] = _pObjYl[i] = 0;
 	}
 	
-	while (true) {
+	while (!_vm->shouldQuit() && !events.isKeyMousePressed() && (player._xFlag != 2)) {
 		_vm->_images.clear();
-		int _vbCount = 6;
-		if (_vm->_player->_xFlag == 2) {
-			_vm->_events->showCursor();
-			return;
-		}
-		
+		events._vbCount = 6;
+
 		_pImgNum[0] = _game->_plane._xCount;
 		if (_game->_plane._xCount == 2)
 			++_game->_plane._xCount;
 		else
 			--_game->_plane._xCount;
 
-		_vm->_player->checkMove();
-		_vm->_player->checkScroll();
+		player.checkMove();
+		player.checkScroll();
 		pan();
 		scrollJWalk();
 
 		g_system->delayMillis(10);
-		while(_vbCount > 0) {
-			// To be rewritten when NEWTIMER is done
-			_vm->_events->checkForNextFrameCounter();
-			_vbCount--;
+		while (!_vm->shouldQuit() && events._vbCount > 0) {
+			events.pollEvents();
+			g_system->delayMillis(10);
 		}
 	}
+
+	_vm->_images.clear();
+	events.showCursor();
 }
 
 void AmazonScripts::mWhileDoOpen() {
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+
 	const int openObj[10][4] = {
 		{8, -80, 120, 30},
 		{13, 229, 0, 50},
@@ -545,12 +550,12 @@ void AmazonScripts::mWhileDoOpen() {
 		{4, -280, 40, 120},
 	};
 
-	_vm->_screen->setBufferScan();
-	_vm->_events->hideCursor();
-	_vm->_screen->forceFadeOut();
+	screen.setBufferScan();
+	events.hideCursor();
+	screen.forceFadeOut();
 	_game->_skipStart = false;
 	if (_vm->_conversation != 2) {
-		_vm->_screen->setPanel(3);
+		screen.setPanel(3);
 		_game->startChapter(1);
 		_game->establishCenter(0, 1);
 	}
@@ -594,7 +599,7 @@ void AmazonScripts::mWhileDoOpen() {
 	_vm->_sound->newMusic(10, 0);
 	
 	bool startFl = false;
-	while (true) {
+	while (!_vm->shouldQuit()) {
 		_vm->_images.clear();
 		_vm->_animation->animate(0);
 		_vm->_animation->animate(1);
@@ -605,29 +610,28 @@ void AmazonScripts::mWhileDoOpen() {
 		_vm->copyBlocks();
 		if (!startFl) {
 			startFl = true;
-			_vm->_screen->forceFadeIn();
+			screen.forceFadeIn();
 		}
-		_vm->_events->pollEvents();
+		events.pollEvents();
 		warning("TODO: check on KEYBUFCNT");
-		if (_vm->_events->_leftButton || _vm->_events->_rightButton) {
+		if (events._leftButton || events._rightButton) {
 			_game->_skipStart = true;
 			_vm->_sound->newMusic(10, 1);
 			break;
 		}
 
 		if (_xCam > 680) {
-			warning("FIXME: _vbCount should be handled in NEWTIMER");
-			int _vbCount = 125;
-			while(_vbCount > 0) {
-				// To be rewritten when NEWTIMER is done
-				_vm->_events->checkForNextFrameCounter();
-				_vbCount--;
+			events._vbCount = 125;
+			
+			while(!_vm->shouldQuit() && !events.isKeyMousePressed() && events._vbCount > 0) {
+				events.pollEvents();
+				g_system->delayMillis(10);
 			}
 			break;
 		}
 	}
 	
-	_vm->_events->showCursor();
+	events.showCursor();
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_buffer1.copyFrom(*_vm->_screen);
 	warning("TODO: delete _roomInfo;");
@@ -636,6 +640,7 @@ void AmazonScripts::mWhileDoOpen() {
 	_vm->_newRects.clear();
 	_vm->_numAnimTimers = 0;
 	_vm->_images.clear();
+
 	if (_vm->_conversation == 2) {
 		Resource *spriteData = _vm->_files->loadFile(28, 37);
 		_vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
-- 
cgit v1.2.3


From 0ed120b9ff380bc59a96214c0e3ea2b60bb71c8f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 9 Nov 2014 23:08:18 -0500
Subject: ACCESS: Fix buffer source when clearing speech bubbles

---
 engines/access/bubble_box.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 37b757f8d9..9f47c905bc 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -54,7 +54,7 @@ void BubbleBox::clearBubbles() {
 		r.left -= 2;
 		r.right = MIN(r.right, (int16)_vm->_screen->w);
 
-		_vm->_screen->copyBlock(&_vm->_buffer2, r);
+		_vm->_screen->copyBlock(&_vm->_buffer1, r);
 	}
 
 	// Clear the list
-- 
cgit v1.2.3


From 38edbfb4bcbdfe819a133ede25bd85b19d12df60 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 10 Nov 2014 10:28:29 +0100
Subject: ACCESS: Little cleanup in roomMenu

---
 engines/access/amazon/amazon_room.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index fb849d27fa..db46b4836c 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -148,13 +148,14 @@ void AmazonRoom::roomMenu() {
 	SpriteResource *spr = new SpriteResource(_vm, iconData);
 	delete iconData;
 
-	_vm->_screen->saveScreen();
-	_vm->_screen->setDisplayScan();
-	_vm->_destIn = _vm->_screen;	// TODO: Redundant
-	_vm->_screen->plotImage(spr, 0, Common::Point(0, 177));
-	_vm->_screen->plotImage(spr, 1, Common::Point(143, 177));
+	Screen &screen = *_vm->_screen;
+	screen.saveScreen();
+	screen.setDisplayScan();
+	_vm->_destIn = &screen;	// TODO: Redundant
+	screen.plotImage(spr, 0, Common::Point(0, 177));
+	screen.plotImage(spr, 1, Common::Point(143, 177));
 
-	_vm->_screen->restoreScreen();
+	screen.restoreScreen();
 	delete spr;
 }
 
-- 
cgit v1.2.3


From 26b632a9eb36f8e5e8874b50666b3d739dd1416f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 10 Nov 2014 10:29:39 +0100
Subject: ACCESS: Fix display in cmdDeath()

---
 engines/access/access.cpp | 13 ++++++-------
 engines/access/font.cpp   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a1f6430965..b309e92b29 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -325,16 +325,15 @@ void AccessEngine::printText(ASurface *s, const Common::String &msg) {
 		_fonts._font2._fontColors[1] = 28;
 		_fonts._font2._fontColors[2] = 29;
 		_fonts._font2._fontColors[3] = 30;
-
 		_fonts._font2.drawString(s, line, s->_printOrg);
-		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
-		if (lastLine)
-			break;
+		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
-		_events->waitKeyMouse();
-		_buffer2.copyBuffer(s);
-		s->_printOrg.y = s->_printStart.y;
+		if (s->_printOrg.y >_printEnd && !lastLine) {
+			_events->waitKeyMouse();
+			s->copyBuffer(&_buffer2);
+			s->_printOrg.y = s->_printStart.y;
+		}
 
 		if (lastLine)
 			break;
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index ffc1715c39..5eaf0b0ca8 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -111,7 +111,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 		// Reached maximum allowed size
 		// If this was the last character of the string, let it go
 		if (*src == '\0')
-			break;
+			return true;
 		
 		// Work backwards to find space at the start of the current word 
 		// as a point to split the line on
-- 
cgit v1.2.3


From 0e01c3623a499fd69acef789bb4c2a6c39091b99 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 10 Nov 2014 12:18:16 -0500
Subject: ACCESS: Fixes to pan method

---
 engines/access/amazon/amazon_scripts.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 53ac4be869..189f634aa6 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -295,18 +295,18 @@ void AmazonScripts::doFallCell() {
 void AmazonScripts::pan() {
 	_zCam += _zTrack;
 	_xCam += _xTrack;
-	int tx = (_xCam << 8) / _zCam;
+	int tx = (_xTrack << 8) / _zCam;
 	_yCam += _yTrack;
-	int ty = (_yCam << 8) / _zCam;
+	int ty = (_yTrack << 8) / _zCam;
 
 	if (_vm->_timers[24]._flag != 1) {
 		++_vm->_timers[24]._flag;
 		for (int i = 0; i < _pNumObj; i++) {
-			_pObjZ[i] = _zTrack;
-			_pObjXl[i] += tx * _zTrack;
-			_pObjX[i] += _pObjXl[i];
-			_pObjYl[i] += ty * _zTrack;
-			_pObjY[i] += _pObjYl[i];
+			_pObjZ[i] += _zTrack;
+			_pObjXl[i] += (_pObjZ[i] * tx) & 0xff;
+			_pObjX[i] += (_pObjZ[i] * tx) >> 8;
+			_pObjYl[i] += (_pObjZ[i] * ty) & 0xff;
+			_pObjY[i] += (_pObjZ[i] * ty) >> 8;
 		}
 	}
 
@@ -317,6 +317,8 @@ void AmazonScripts::pan() {
 		ie._offsetY = 0xFF;
 		ie._spritesPtr = _pObject[i];
 		ie._frameNumber = _pImgNum[i];
+
+		_vm->_images.addToList(&ie);
 	}
 }
 
-- 
cgit v1.2.3


From 878038fe07ed750a4616d4a86dfb2a9f9873d245 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 10 Nov 2014 12:25:13 -0500
Subject: ACCESS: Fix redundant pointer references in adding items to _images
 list

---
 engines/access/amazon/amazon_scripts.cpp | 4 ++--
 engines/access/animation.cpp             | 2 +-
 engines/access/asurface.cpp              | 4 ++--
 engines/access/asurface.h                | 2 +-
 engines/access/player.cpp                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 189f634aa6..3ccca2bd2d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -318,7 +318,7 @@ void AmazonScripts::pan() {
 		ie._spritesPtr = _pObject[i];
 		ie._frameNumber = _pImgNum[i];
 
-		_vm->_images.addToList(&ie);
+		_vm->_images.addToList(ie);
 	}
 }
 
@@ -810,7 +810,7 @@ void AmazonScripts::plotInactive() {
 	_vm->_inactive._offsetY = _game->_inactiveYOff;
 	_vm->_inactive._frameNumber = 0;
 
-	_vm->_images.addToList(&_vm->_inactive);
+	_vm->_images.addToList(_vm->_inactive);
 
 }
 
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 03f349e34a..de44740c7f 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -232,7 +232,7 @@ void Animation::setFrame1(AnimationFrame *frame) {
 		ie._position = part->_position + _vm->_animation->_base;
 		ie._offsetY = part->_offsetY - ie._position.y;
 
-		_vm->_images.addToList(&ie);
+		_vm->_images.addToList(ie);
 	}
 }
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index cf8bf0766f..d36f6e4ba1 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -90,9 +90,9 @@ static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
 	return (ie1._position.y + ie1._offsetY) < (ie2._position.y + ie2._offsetY);
 }
 
-void ImageEntryList::addToList(ImageEntry *ie) {
+void ImageEntryList::addToList(ImageEntry &ie) {
 	assert(size() < 35);
-	push_back(*ie);
+	push_back(ie);
 	Common::sort(begin(), end(), sortImagesY);
 }
 
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 5c164f0e59..d066589f84 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -144,7 +144,7 @@ public:
 
 class ImageEntryList : public Common::Array<ImageEntry> {
 public:
-	void addToList(ImageEntry *ie);
+	void addToList(ImageEntry &ie);
 };
 
 } // End of namespace Access
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index ba5ba8924f..2abe9ad097 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -667,7 +667,7 @@ void Player::plotCom1() {
 
 void Player::plotCom2() {
 	if (!_playerOff)
-		_vm->_images.addToList(this);
+		_vm->_images.addToList(*this);
 }
 
 void Player::plotCom3() {
-- 
cgit v1.2.3


From 340a3fa91bc6168f5e073a33afd48a083fb14d10 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 10 Nov 2014 13:29:24 -0500
Subject: ACCESS: Fix player walking in jungle cutscene

---
 engines/access/amazon/amazon_scripts.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 3ccca2bd2d..a22f04b0de 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -461,7 +461,7 @@ void AmazonScripts::mWhileJWalk() {
 	EventsManager &events = *_vm->_events;
 	Player &player = *_vm->_player;
 
-	const int jungleObj[7][4] = {
+	static const int JUNGLE_OBJ[7][4] = {
 		{2, 77, 0, 40},
 		{0, 290, 0, 50},
 		{1, 210, 0, 70},
@@ -478,15 +478,16 @@ void AmazonScripts::mWhileJWalk() {
 	screen.setBufferScan();
 	screen._scrollX = 0;
 
+	// Build the initial jungle scene and fade it in
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 	screen.fadeIn();
 
-	// KEYFLG = 0;
+	// Set up the player to walk horizontally
 	player._xFlag = 1;
 	player._yFlag = 0;
 	player._moveTo.x = 160;
-	player._move = UP;
+	player._playerMove = true;
 
 	_game->_plane._xCount = 2;
 	_xTrack = 10;
@@ -502,10 +503,10 @@ void AmazonScripts::mWhileJWalk() {
 	_pNumObj = 7;
 	for (int i = 0; i < _pNumObj; i++) {
 		_pObject[i] = _vm->_objectsTable[24];
-		_pImgNum[i] = jungleObj[i][0];
-		_pObjX[i] = jungleObj[i][1];
-		_pObjY[i] = jungleObj[i][2];
-		_pObjZ[i] = jungleObj[i][3];
+		_pImgNum[i] = JUNGLE_OBJ[i][0];
+		_pObjX[i] = JUNGLE_OBJ[i][1];
+		_pObjY[i] = JUNGLE_OBJ[i][2];
+		_pObjZ[i] = JUNGLE_OBJ[i][3];
 		_pObjXl[i] = _pObjYl[i] = 0;
 	}
 	
-- 
cgit v1.2.3


From 4d82191f34c2c08f250914f52b183914e26e4df9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 10 Nov 2014 13:35:15 -0500
Subject: ACCESS: Fix crashes for scene debugger command when launched from
 cmdCheckTimer

---
 engines/access/scripts.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 9f321947f2..34d5372b56 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -46,6 +46,7 @@ Scripts::~Scripts() {
 void Scripts::setScript(Resource *res) {
 	_resource = res;
 	_data = res->_stream;
+	_endFlag = true;
 }
 
 void Scripts::freeScriptData() {
@@ -416,6 +417,12 @@ void Scripts::cmdCheckTimer() {
 	_vm->_events->pollEvents();
 	_vm->_canSaveLoad = false;
 
+	// Since the ScummVM debugger can be launched from the above point, we need
+	// to check whether the script needs to be ended here, since some commands,
+	// like the scene command, can change the current script
+	if (_endFlag)
+		return;
+
 	if ((idx == 9) && (_vm->_events->_keypresses.size() > 0)) {
 		_vm->_events->zeroKeys();
 		_vm->_timers[9]._timer = 0;
-- 
cgit v1.2.3


From a97bbb86c4c40a10e67b358372743c919a5ee59d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 10 Nov 2014 16:32:16 -0500
Subject: ACCESS: Fix incorrect screen draw during setup of bubble boxes

---
 engines/access/bubble_box.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 9f47c905bc..ff6c4de53d 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -67,7 +67,7 @@ void BubbleBox::placeBubble(const Common::String &msg) {
 }
 
 void BubbleBox::placeBubble1(const Common::String &msg) {
-	clearBubbles();
+	_bubbles.clear();
 	_vm->_fonts._charSet._lo = 1;
 	_vm->_fonts._charSet._hi = 8;
 	_vm->_fonts._charFor._lo = 29;
-- 
cgit v1.2.3


From fa46257a77c462c92c6c6c5f7af2ef55dbb0d802 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 10 Nov 2014 18:48:16 -0500
Subject: ACCESS: Fix item Z ordering issue causing flickering in airplane rear
 scene

---
 engines/access/asurface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index d36f6e4ba1..dbbf119171 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -87,7 +87,8 @@ ImageEntry::ImageEntry() {
 /*------------------------------------------------------------------------*/
 
 static bool sortImagesY(const ImageEntry &ie1, const ImageEntry &ie2) {
-	return (ie1._position.y + ie1._offsetY) < (ie2._position.y + ie2._offsetY);
+	int v = (ie1._position.y + ie1._offsetY) - (ie2._position.y + ie2._offsetY);
+	return (v < 0) || (v == 0 && ie1._position.y <= ie2._position.y);
 }
 
 void ImageEntryList::addToList(ImageEntry &ie) {
-- 
cgit v1.2.3


From 2fe5957393d37cbae864327ddefe262cbb789211 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 02:03:07 +0100
Subject: ACCESS: Start working on ANT()

---
 engines/access/amazon/amazon_game.cpp      |  11 ++
 engines/access/amazon/amazon_game.h        |  12 ++
 engines/access/amazon/amazon_resources.cpp |  67 +++++++-
 engines/access/amazon/amazon_resources.h   |  13 ++
 engines/access/amazon/amazon_scripts.cpp   | 253 ++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h     |   2 +
 6 files changed, 356 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 87aa9358cd..b1a8bbe294 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -57,6 +57,17 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_tilePos = Common::Point(0, 0);
 	_hintLevel = 0;
 
+	_antDirection = NONE;
+	_pitDirection = NONE;
+	_antCel = 0;
+	_torchCel = 0;
+	_pitCel = 0;
+	_stabCel = 0;
+	_antPos = Common::Point(0, 0);
+	_antDieFl = _antEatFl = false;
+	_stabFl = false;
+	_pitPos = Common::Point(0, 0);
+
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 	memset(_tileData, 0, sizeof(_tileData));
 	
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 653deefb96..0c6fb1cb41 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -149,6 +149,18 @@ public:
 	int _canoeVXPos;
 	int _canoeMoveCount;
 	int _canoeFrame;
+
+	Direction _antDirection;
+	Direction _pitDirection;
+	int _antCel;
+	int _torchCel;
+	int _pitCel;
+	int _stabCel;
+	Common::Point _antPos;
+	bool _antDieFl;
+	bool _antEatFl;
+	bool _stabFl;
+	Common::Point _pitPos;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index a1db01d7b3..5768be3c33 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1458,6 +1458,71 @@ const int COMBO_TABLE[85][4] = {
 	{ -1, -1, -1, -1 }
 };
 
-} // End of namespace Amazon
+const int ANTWALK[24] = {
+	 0,  3,  0,
+	 1,  5,  0,
+	 2,  4,  0,
+	 3,  2,  0,
+	 4,  4,  0,
+	 5,  3,  0,
+	 6,  4,  0,
+	-1, -1, -1
+};
+
+const int ANTEAT[33] = {
+	 7,  0,  -1,
+	 8,  0,  -5,
+	 9,  0, -11,
+	10,  0,   7,
+	11,  0,  -3,
+	12,  0,   3,
+	13,  0,  -1,
+	 9,  0,  -6,
+	 8,  0,  11,
+	 7,  0,   6,
+	-1, -1,  -1 
+};
+
+const int ANTDIE[21] = {
+	14,  4,  8,
+	15,  7,  6,
+	16,  6,  7,
+	17,  8,  2,
+	18,  0,  0,
+	19,  0,  0,
+	-1, -1, -1
+};
+
+const int PITWALK[27] = {
+	18,  0, -1,
+	19, -2,  1,
+	20, -2,  1,
+	21, -2,  1,
+	22, -2,  0,
+	23, -3,  0,
+	24, -3, -1,
+	25, -2, -1,
+	-1, -1, -1
+};
+
+const int PITSTAB[21] = {
+	14, -2,   0,
+	15, -4,   0,
+	16,  3, -13,
+	16,  0,   0,
+	15, -3,  13,
+	14,  4,   0,
+	-1, -1,  -1
+};
+
+const int TORCH[12] = {
+	26, -11, -7,
+	27, -12, -2,
+	28, -15, -4,
+	-1,  -1, -1
+};
+
+const int SPEAR[3] = {30, -13, 1};
 
+} // End of namespace Amazon
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 7aee90003e..0d65a569c7 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -68,6 +68,19 @@ extern const int CHAPTER_JUMP[14];
 
 extern const int COMBO_TABLE[85][4];
 
+extern const int ANTWALK[24];
+
+extern const int ANTEAT[33];
+
+extern const int ANTDIE[21];
+
+extern const int PITWALK[27];
+
+extern const int PITSTAB[21];
+
+extern const int TORCH[12];
+
+extern const int SPEAR[3];
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index a22f04b0de..0074a5d2f5 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -768,6 +768,257 @@ void AmazonScripts::setInactive() {
 	mWhile(_game->_rawInactiveY);
 }
 
+void AmazonScripts::PLOTPIT() {
+	warning("TODO: PLOTPIT");
+}
+
+void AmazonScripts::ANT() {
+	_game->_antDirection = NONE;
+	if (_game->_aniFlag != 1) {
+		_game->_aniFlag = 1;
+		_game->_antCel = 0;
+		_game->_torchCel = 0;
+		_game->_pitCel = 0;
+
+		_game->_timers[15]._timer = 16;
+		_game->_timers[15]._initTm = 16;
+		_game->_timers[15]._flag = 1;
+
+		_game->_timers[13]._timer = 5;
+		_game->_timers[13]._initTm = 5;
+		_game->_timers[13]._flag = 1;
+
+		_game->_timers[14]._timer = 10;
+		_game->_timers[14]._initTm = 10;
+		_game->_timers[14]._flag = 1;
+
+		_game->_antPos = Common::Point(-40, 123);
+		_game->_antDieFl = _game->_antEatFl = false;
+		_game->_stabFl = false;
+		_game->_pitPos = Common::Point(_vm->_player->_rawPlayer.x, 127);
+	}
+
+	const int *buf = nullptr;
+	if (_game->_antDieFl) {
+		buf = Amazon::ANTDIE;
+	} else if (_game->_antEatFl) {
+		buf = Amazon::ANTEAT;
+	} else if (_game->_antPos.x > 120 && _vm->_flags[198] == 1) {
+		_game->_antEatFl = true;
+		_vm->_flags[235] = 1;
+		_game->_antCel = 0;
+		buf = Amazon::ANTEAT;
+	} else {
+		buf = Amazon::ANTWALK;
+		if (_vm->_inventory->_inv[76]._value == 1)
+			_game->_antDirection = UP;
+	}
+
+	int idx = _game->_antCel;
+	if (_game->_timers[15]._flag == 0) {
+		_game->_timers[15]._flag = 1;
+		if (_game->_antDirection == UP) {
+			if (_game->_antPos.x > 10) {
+				if (idx == 0)
+					idx = 36;
+				else
+					idx -= 6;
+
+				_game->_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_game->_antCel = idx;
+			}
+		} else {
+			idx += 6;
+			if (buf[(idx / 2)] != -1) {
+				_game->_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_game->_antCel = idx;
+			} else if (!_game->_antDieFl) {
+				idx = 0;
+				_game->_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_game->_antCel = idx;
+			} else {
+				idx -= 6;
+				if (_game->_flags[200] == 0)
+					_game->_flags[200] = 1;
+			}
+		}
+	}
+
+	ImageEntry ie;
+	ie._flags = 8;
+	ie._spritesPtr = _pObject[61];
+	ie._frameNumber = buf[(idx / 2)];
+	ie._position = Common::Point(_game->_antPos.x, _game->_antPos.y);
+	ie._offsetY = _game->_antPos.y - 70;
+	_vm->_images.addToList(ie);
+	_game->_antCel = idx;
+
+	if (_game->_flags[196] != 1) {
+		idx = _game->_pitCel;
+		if (_game->_stabFl == 1) {
+			if (_vm->_inventory->_inv[78]._value == 1) {
+				PLOTPIT();
+			} else {
+				buf = Amazon::PITSTAB;
+				idx = _game->_stabCel;
+				if (_game->_timers[13]._flag == 0) {
+					PLOTPIT();
+				} else {
+					_game->_timers[13]._flag = 1;
+					idx += 6;
+					if (Amazon::PITSTAB[idx] == -1) {
+						_game->_stabFl = false;
+						_game->_pitCel = 0;
+						_game->_pitPos.y = 127;
+						idx = 0;
+						buf = Amazon::PITWALK;
+						PLOTPIT();
+					} else {
+						_game->_pitPos.x += buf[(idx / 2) + 1];
+						_game->_pitPos.y += buf[(idx / 2) + 2];
+						_game->_pitCel = idx;
+						PLOTPIT();
+					}
+				}
+			}
+		} else {
+			buf = Amazon::PITWALK;
+			if (_game->_timers[13]._flag != 0) {
+				PLOTPIT();
+			} else {
+				_game->_timers[13]._flag = 1;
+				_vm->_events->pollEvents();
+				if (_vm->_events->_leftButton) {
+					Common::Point pt = _vm->_events->calcRawMouse();
+					if (pt.x < _game->_pitPos.x) {
+						if (_game->_pitDirection == UP) {
+							_game->_pitDirection = NONE;
+							_game->_pitPos.y = 127;
+						}
+						idx = _game->_pitCel;
+						buf = Amazon::PITWALK;
+						idx += 6;
+						if (buf[idx / 2] == -1) {
+							idx = 0;
+							_game->_pitPos.y = 127;
+						}
+						_game->_pitPos.x += buf[(idx / 2) + 1];
+						_game->_pitPos.y += buf[(idx / 2) + 2];
+						_game->_pitCel = idx;
+						PLOTPIT();
+					} else if (pt.x > _game->_pitPos.x) {
+						if (_game->_pitDirection == NONE) {
+							_game->_pitDirection = UP;
+							_game->_pitPos.y = 127;
+							idx = _game->_pitCel;
+							buf = Amazon::PITWALK;
+							if (_game->_pitPos.x >= 230)
+								PLOTPIT();
+							else {
+								if (idx == 0) {
+									idx = 48;
+									_game->_pitPos.y = 127;
+								}
+								idx -= 6;
+								_game->_pitPos.x -= buf[(idx / 2) + 1];
+								_game->_pitPos.y -= buf[(idx / 2) + 2];
+								_game->_pitCel = idx;
+								PLOTPIT();
+							}
+						}
+					} else {
+						PLOTPIT();
+					}
+				} else {
+					buf = Amazon::PITWALK;
+					if (_vm->_player->_playerDirection == UP) {
+						if (_vm->_inventory->_inv[78]._value == 1) {
+							PLOTPIT();
+						} else {
+							if (_game->_stabFl) {
+								buf = Amazon::PITSTAB;
+								idx = _game->_stabCel;
+								if (_game->_timers[13]._flag == 0) {
+									PLOTPIT();
+								} else {
+									_game->_timers[13]._flag = 1;
+									idx += 6;
+									if (Amazon::PITSTAB[idx] == -1) {
+										_game->_stabFl = false;
+										_game->_pitCel = 0;
+										_game->_pitPos.y = 127;
+										idx = 0;
+										buf = Amazon::PITWALK;
+										PLOTPIT();
+									} else {
+										_game->_pitPos.x += buf[(idx / 2) + 1];
+										_game->_pitPos.y += buf[(idx / 2) + 2];
+										_game->_pitCel = idx;
+										PLOTPIT();
+									}
+								}
+							} else {
+								_game->_stabFl = true;
+								_game->_pitCel = 0;
+								idx = 0;
+								_game->_stabCel = 0;
+								int dist = _game->_pitPos.x - _game->_antPos.x;
+								if (!_game->_antEatFl || _game->_antDieFl || (dist > 80))
+									PLOTPIT();
+								else {
+									_game->_antDieFl = true;
+									_game->_antCel = 0;
+									_game->_antPos.y = 123;
+									_vm->_sound->playSound(1);
+									PLOTPIT();
+								}
+							}
+						}
+					} else if (_vm->_player->_playerDirection == LEFT) {
+						if (_game->_pitDirection == UP) {
+							_game->_pitDirection = NONE;
+							_game->_pitPos.y = 127;
+						}
+						idx = _game->_pitCel;
+						buf = Amazon::PITWALK;
+						idx += 6;
+						if (buf[idx / 2] == -1) {
+							idx = 0;
+							_game->_pitPos.y = 127;
+						}
+						_game->_pitPos.x += buf[(idx / 2) + 1];
+						_game->_pitPos.y += buf[(idx / 2) + 2];
+						_game->_pitCel = idx;
+						PLOTPIT();
+					} else if (_vm->_player->_playerDirection == RIGHT) {
+						if (_game->_pitDirection == NONE) {
+							_game->_pitDirection = UP;
+							_game->_pitPos.y = 127;
+							idx = _game->_pitCel;
+							buf = Amazon::PITWALK;
+							if (_game->_pitPos.x >= 230)
+								PLOTPIT();
+							else {
+								if (idx == 0) {
+									idx = 48;
+									_game->_pitPos.y = 127;
+								}
+								idx -= 6;
+								_game->_pitPos.x -= buf[(idx / 2) + 1];
+								_game->_pitPos.y -= buf[(idx / 2) + 2];
+								_game->_pitCel = idx;
+								PLOTPIT();
+							}
+						}
+					} else {
+						PLOTPIT();
+					}
+				}
+			}
+		}
+	}
+}
+
 void AmazonScripts::boatWalls(int param1, int param2) {
 	if (param1 == 1)
 		_vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 87, 42);
@@ -845,7 +1096,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		warning("TODO RIVER");
 		break;
 	case 14:
-		warning("TODO ANT");
+		ANT();
 		break;
 	case 15:
 		boatWalls(param1, param2);
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 06ed6e5d01..9733c1c391 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -75,6 +75,8 @@ protected:
 	void guardSee();
 	void setGuardFrame();
 	void guard();
+	void PLOTPIT();
+	void ANT();
 	void loadBackground(int param1, int param2);
 	void plotInactive();
 	void setInactive();
-- 
cgit v1.2.3


From b874ddd31573ee491fd0780e81810913c7a9ff2c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 08:15:50 +0100
Subject: ACCESS: Refactor ANT

---
 engines/access/amazon/amazon_scripts.cpp | 251 +++++++++++++------------------
 engines/access/amazon/amazon_scripts.h   |   5 +-
 2 files changed, 105 insertions(+), 151 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0074a5d2f5..8553babccf 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -768,10 +768,89 @@ void AmazonScripts::setInactive() {
 	mWhile(_game->_rawInactiveY);
 }
 
-void AmazonScripts::PLOTPIT() {
+void AmazonScripts::PLOTPIT(int idx, const int *buf) {
 	warning("TODO: PLOTPIT");
 }
 
+int AmazonScripts::antHandleRight(int indx, const int *buf) {
+	int retval = indx;
+	if (_game->_pitDirection == NONE) {
+		_game->_pitDirection = UP;
+		_game->_pitPos.y = 127;
+	}
+	retval = _game->_pitCel;
+	buf = Amazon::PITWALK;
+	if (_game->_pitPos.x < 230) {
+		if (retval == 0) {
+			retval = 48;
+			_game->_pitPos.y = 127;
+		}
+		retval -= 6;
+		_game->_pitPos.x -= buf[(retval / 2) + 1];
+		_game->_pitPos.y -= buf[(retval / 2) + 2];
+		_game->_pitCel = retval;
+	}
+	return retval;
+}
+
+int AmazonScripts::antHandleLeft(int indx, const int *buf) {
+	int retval = indx;
+	if (_game->_pitDirection == UP) {
+		_game->_pitDirection = NONE;
+		_game->_pitPos.y = 127;
+	}
+	retval = _game->_pitCel;
+	buf = Amazon::PITWALK;
+	retval += 6;
+	if (buf[retval / 2] == -1) {
+		retval = 0;
+		_game->_pitPos.y = 127;
+	}
+	_game->_pitPos.x += buf[(retval / 2) + 1];
+	_game->_pitPos.y += buf[(retval / 2) + 2];
+	_game->_pitCel = retval;
+
+	return retval;
+}
+
+int AmazonScripts::antHandleStab(int indx, const int *buf) {
+	int retval = indx;
+	if (_vm->_inventory->_inv[78]._value != 1) {
+		if (_game->_stabFl) {
+			buf = Amazon::PITSTAB;
+			retval = _game->_stabCel;
+			if (_game->_timers[13]._flag == 0) {
+				_game->_timers[13]._flag = 1;
+				retval += 6;
+				if (Amazon::PITSTAB[retval] == -1) {
+					_game->_stabFl = false;
+					_game->_pitCel = 0;
+					_game->_pitPos.y = 127;
+					retval = 0;
+					buf = Amazon::PITWALK;
+				} else {
+					_game->_pitPos.x += buf[(retval / 2) + 1];
+					_game->_pitPos.y += buf[(retval / 2) + 2];
+					_game->_pitCel = retval;
+				}
+			}
+		} else {
+			_game->_stabFl = true;
+			_game->_pitCel = 0;
+			retval = 0;
+			_game->_stabCel = 0;
+			int dist = _game->_pitPos.x - _game->_antPos.x;
+			if (_game->_antEatFl && !_game->_antDieFl && (dist <= 80)) {
+				_game->_antDieFl = true;
+				_game->_antCel = 0;
+				_game->_antPos.y = 123;
+				_vm->_sound->playSound(1);
+			}
+		}
+	}
+	return retval;
+}
+
 void AmazonScripts::ANT() {
 	_game->_antDirection = NONE;
 	if (_game->_aniFlag != 1) {
@@ -856,166 +935,38 @@ void AmazonScripts::ANT() {
 	if (_game->_flags[196] != 1) {
 		idx = _game->_pitCel;
 		if (_game->_stabFl == 1) {
-			if (_vm->_inventory->_inv[78]._value == 1) {
-				PLOTPIT();
-			} else {
-				buf = Amazon::PITSTAB;
-				idx = _game->_stabCel;
-				if (_game->_timers[13]._flag == 0) {
-					PLOTPIT();
-				} else {
-					_game->_timers[13]._flag = 1;
-					idx += 6;
-					if (Amazon::PITSTAB[idx] == -1) {
-						_game->_stabFl = false;
-						_game->_pitCel = 0;
-						_game->_pitPos.y = 127;
-						idx = 0;
-						buf = Amazon::PITWALK;
-						PLOTPIT();
-					} else {
-						_game->_pitPos.x += buf[(idx / 2) + 1];
-						_game->_pitPos.y += buf[(idx / 2) + 2];
-						_game->_pitCel = idx;
-						PLOTPIT();
-					}
-				}
-			}
+			idx = antHandleStab(idx, buf);
 		} else {
 			buf = Amazon::PITWALK;
-			if (_game->_timers[13]._flag != 0) {
-				PLOTPIT();
-			} else {
+			if (_game->_timers[13]._flag == 0) {
 				_game->_timers[13]._flag = 1;
 				_vm->_events->pollEvents();
 				if (_vm->_events->_leftButton) {
 					Common::Point pt = _vm->_events->calcRawMouse();
-					if (pt.x < _game->_pitPos.x) {
-						if (_game->_pitDirection == UP) {
-							_game->_pitDirection = NONE;
-							_game->_pitPos.y = 127;
-						}
-						idx = _game->_pitCel;
-						buf = Amazon::PITWALK;
-						idx += 6;
-						if (buf[idx / 2] == -1) {
-							idx = 0;
-							_game->_pitPos.y = 127;
-						}
-						_game->_pitPos.x += buf[(idx / 2) + 1];
-						_game->_pitPos.y += buf[(idx / 2) + 2];
-						_game->_pitCel = idx;
-						PLOTPIT();
-					} else if (pt.x > _game->_pitPos.x) {
-						if (_game->_pitDirection == NONE) {
-							_game->_pitDirection = UP;
-							_game->_pitPos.y = 127;
-							idx = _game->_pitCel;
-							buf = Amazon::PITWALK;
-							if (_game->_pitPos.x >= 230)
-								PLOTPIT();
-							else {
-								if (idx == 0) {
-									idx = 48;
-									_game->_pitPos.y = 127;
-								}
-								idx -= 6;
-								_game->_pitPos.x -= buf[(idx / 2) + 1];
-								_game->_pitPos.y -= buf[(idx / 2) + 2];
-								_game->_pitCel = idx;
-								PLOTPIT();
-							}
-						}
-					} else {
-						PLOTPIT();
-					}
+					if (pt.x < _game->_pitPos.x)
+						idx = antHandleLeft(idx, buf);
+					else if (pt.x > _game->_pitPos.x)
+						idx = antHandleRight(idx, buf);
 				} else {
 					buf = Amazon::PITWALK;
-					if (_vm->_player->_playerDirection == UP) {
-						if (_vm->_inventory->_inv[78]._value == 1) {
-							PLOTPIT();
-						} else {
-							if (_game->_stabFl) {
-								buf = Amazon::PITSTAB;
-								idx = _game->_stabCel;
-								if (_game->_timers[13]._flag == 0) {
-									PLOTPIT();
-								} else {
-									_game->_timers[13]._flag = 1;
-									idx += 6;
-									if (Amazon::PITSTAB[idx] == -1) {
-										_game->_stabFl = false;
-										_game->_pitCel = 0;
-										_game->_pitPos.y = 127;
-										idx = 0;
-										buf = Amazon::PITWALK;
-										PLOTPIT();
-									} else {
-										_game->_pitPos.x += buf[(idx / 2) + 1];
-										_game->_pitPos.y += buf[(idx / 2) + 2];
-										_game->_pitCel = idx;
-										PLOTPIT();
-									}
-								}
-							} else {
-								_game->_stabFl = true;
-								_game->_pitCel = 0;
-								idx = 0;
-								_game->_stabCel = 0;
-								int dist = _game->_pitPos.x - _game->_antPos.x;
-								if (!_game->_antEatFl || _game->_antDieFl || (dist > 80))
-									PLOTPIT();
-								else {
-									_game->_antDieFl = true;
-									_game->_antCel = 0;
-									_game->_antPos.y = 123;
-									_vm->_sound->playSound(1);
-									PLOTPIT();
-								}
-							}
-						}
-					} else if (_vm->_player->_playerDirection == LEFT) {
-						if (_game->_pitDirection == UP) {
-							_game->_pitDirection = NONE;
-							_game->_pitPos.y = 127;
-						}
-						idx = _game->_pitCel;
-						buf = Amazon::PITWALK;
-						idx += 6;
-						if (buf[idx / 2] == -1) {
-							idx = 0;
-							_game->_pitPos.y = 127;
-						}
-						_game->_pitPos.x += buf[(idx / 2) + 1];
-						_game->_pitPos.y += buf[(idx / 2) + 2];
-						_game->_pitCel = idx;
-						PLOTPIT();
-					} else if (_vm->_player->_playerDirection == RIGHT) {
-						if (_game->_pitDirection == NONE) {
-							_game->_pitDirection = UP;
-							_game->_pitPos.y = 127;
-							idx = _game->_pitCel;
-							buf = Amazon::PITWALK;
-							if (_game->_pitPos.x >= 230)
-								PLOTPIT();
-							else {
-								if (idx == 0) {
-									idx = 48;
-									_game->_pitPos.y = 127;
-								}
-								idx -= 6;
-								_game->_pitPos.x -= buf[(idx / 2) + 1];
-								_game->_pitPos.y -= buf[(idx / 2) + 2];
-								_game->_pitCel = idx;
-								PLOTPIT();
-							}
-						}
-					} else {
-						PLOTPIT();
-					}
+					if (_vm->_player->_playerDirection == UP)
+						idx = antHandleStab(idx, buf);
+					else if (_vm->_player->_playerDirection == LEFT)
+						idx = antHandleLeft(idx, buf);
+					else if (_vm->_player->_playerDirection == RIGHT)
+						idx = antHandleRight(idx, buf);
 				}
 			}
 		}
+		PLOTPIT(idx, buf);
+	}
+
+	if (!_game->_antDieFl) {
+		int dist = _game->_pitPos.x - _game->_antPos.x;
+		if ((_game->_antEatFl && (dist <= 45)) || (!_game->_antEatFl && (dist <= 80))) {
+			_game->_flags[199] = 1;
+			_game->_aniFlag = 0;
+		}
 	}
 }
 
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 9733c1c391..fc6fb0a7e3 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -75,7 +75,10 @@ protected:
 	void guardSee();
 	void setGuardFrame();
 	void guard();
-	void PLOTPIT();
+	void PLOTPIT(int idx, const int *buf);
+	int antHandleRight(int indx, const int *buf);
+	int antHandleLeft(int indx, const int *buf);
+	int antHandleStab(int indx, const int *buf);
 	void ANT();
 	void loadBackground(int param1, int param2);
 	void plotInactive();
-- 
cgit v1.2.3


From c3660acf63e684bdb90efd4cb7fb1fedd3ed1ea0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 08:37:37 +0100
Subject: ACCESS: Implement plotPit()

---
 engines/access/amazon/amazon_scripts.cpp | 41 +++++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  3 ++-
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8553babccf..d0b4d7ae2a 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -768,8 +768,43 @@ void AmazonScripts::setInactive() {
 	mWhile(_game->_rawInactiveY);
 }
 
-void AmazonScripts::PLOTPIT(int idx, const int *buf) {
-	warning("TODO: PLOTPIT");
+void AmazonScripts::plotTorchSpear(int indx, const int *buf) {
+	int idx = indx;
+
+	ImageEntry ie;
+	ie._flags = 8;
+	ie._spritesPtr = _pObject[62];
+	ie._frameNumber = buf[(idx / 2)];
+	ie._position = Common::Point(_game->_pitPos.x + buf[(idx / 2) + 1], _game->_pitPos.y + buf[(idx / 2) + 2]);
+	ie._offsetY = 255;
+	_vm->_images.addToList(ie);
+}
+
+void AmazonScripts::plotPit(int indx, const int *buf) {
+	int idx = indx;
+	ImageEntry ie;
+	ie._flags = 8;
+	ie._spritesPtr = _pObject[62];
+	ie._frameNumber = buf[(idx / 2)];
+	ie._position = Common::Point(_game->_pitPos.x, _game->_pitPos.y);
+	ie._offsetY = _game->_pitPos.y;
+	_vm->_images.addToList(ie);
+
+	_vm->_player->_rawPlayer = _game->_pitPos;
+	if (_vm->_inventory->_inv[76]._value == 1) {
+		idx = _game->_torchCel;
+		buf = Amazon::TORCH;
+		_vm->_timers[14]._flag = 1;
+		idx += 6;
+		if (buf[idx / 2] == -1)
+			idx = 0;
+		_game->_torchCel = idx;
+		plotTorchSpear(idx, buf);
+	} else if (!_game->_stabFl && (_vm->_inventory->_inv[78]._value == 1)) {
+		idx = 0;
+		buf = Amazon::SPEAR;
+		plotTorchSpear(idx, buf);
+	}
 }
 
 int AmazonScripts::antHandleRight(int indx, const int *buf) {
@@ -958,7 +993,7 @@ void AmazonScripts::ANT() {
 				}
 			}
 		}
-		PLOTPIT(idx, buf);
+		plotPit(idx, buf);
 	}
 
 	if (!_game->_antDieFl) {
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index fc6fb0a7e3..7e42c0ca36 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -75,7 +75,8 @@ protected:
 	void guardSee();
 	void setGuardFrame();
 	void guard();
-	void PLOTPIT(int idx, const int *buf);
+	void plotTorchSpear(int indx, const int *buf);
+	void plotPit(int indx, const int *buf);
 	int antHandleRight(int indx, const int *buf);
 	int antHandleLeft(int indx, const int *buf);
 	int antHandleStab(int indx, const int *buf);
-- 
cgit v1.2.3


From 15da1cc639faf09984b1a228a25ad829b98cd331 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 19:28:05 +0100
Subject: ACCESS: Fix some parameters in ANT

---
 engines/access/amazon/amazon_scripts.cpp | 10 +++++-----
 engines/access/amazon/amazon_scripts.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d0b4d7ae2a..0642119b9e 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -768,7 +768,7 @@ void AmazonScripts::setInactive() {
 	mWhile(_game->_rawInactiveY);
 }
 
-void AmazonScripts::plotTorchSpear(int indx, const int *buf) {
+void AmazonScripts::plotTorchSpear(int indx, const int *&buf) {
 	int idx = indx;
 
 	ImageEntry ie;
@@ -780,7 +780,7 @@ void AmazonScripts::plotTorchSpear(int indx, const int *buf) {
 	_vm->_images.addToList(ie);
 }
 
-void AmazonScripts::plotPit(int indx, const int *buf) {
+void AmazonScripts::plotPit(int indx, const int *&buf) {
 	int idx = indx;
 	ImageEntry ie;
 	ie._flags = 8;
@@ -807,7 +807,7 @@ void AmazonScripts::plotPit(int indx, const int *buf) {
 	}
 }
 
-int AmazonScripts::antHandleRight(int indx, const int *buf) {
+int AmazonScripts::antHandleRight(int indx, const int *&buf) {
 	int retval = indx;
 	if (_game->_pitDirection == NONE) {
 		_game->_pitDirection = UP;
@@ -828,7 +828,7 @@ int AmazonScripts::antHandleRight(int indx, const int *buf) {
 	return retval;
 }
 
-int AmazonScripts::antHandleLeft(int indx, const int *buf) {
+int AmazonScripts::antHandleLeft(int indx, const int *&buf) {
 	int retval = indx;
 	if (_game->_pitDirection == UP) {
 		_game->_pitDirection = NONE;
@@ -848,7 +848,7 @@ int AmazonScripts::antHandleLeft(int indx, const int *buf) {
 	return retval;
 }
 
-int AmazonScripts::antHandleStab(int indx, const int *buf) {
+int AmazonScripts::antHandleStab(int indx, const int *&buf) {
 	int retval = indx;
 	if (_vm->_inventory->_inv[78]._value != 1) {
 		if (_game->_stabFl) {
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 7e42c0ca36..9d741158a8 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -75,11 +75,11 @@ protected:
 	void guardSee();
 	void setGuardFrame();
 	void guard();
-	void plotTorchSpear(int indx, const int *buf);
-	void plotPit(int indx, const int *buf);
-	int antHandleRight(int indx, const int *buf);
-	int antHandleLeft(int indx, const int *buf);
-	int antHandleStab(int indx, const int *buf);
+	void plotTorchSpear(int indx, const int *&buf);
+	void plotPit(int indx, const int *&buf);
+	int antHandleRight(int indx, const int *&buf);
+	int antHandleLeft(int indx, const int *&buf);
+	int antHandleStab(int indx, const int *&buf);
 	void ANT();
 	void loadBackground(int param1, int param2);
 	void plotInactive();
-- 
cgit v1.2.3


From ba8f4941b5ed387999ec1f30c90e237b048e9d76 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 22:20:46 +0100
Subject: ACCESS: Add missing code in guard()

---
 engines/access/amazon/amazon_scripts.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0642119b9e..e2fea04960 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -731,7 +731,8 @@ void AmazonScripts::guard() {
 		if (_game->_guard._position.y <= 89) {
 			_game->_guard._position.y = 89;
 			_game->_guardLocation = 4;
-			warning("CHECME: unused flag121");
+			if (_game->_flags[121] == 1)
+				_game->_guardLocation = 5;
 		}
 		break;
 	default:
-- 
cgit v1.2.3


From 37431dcedfddbac02b450affa9346d6c2581e673 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 23:12:44 +0100
Subject: ACCESS: Implement guardSee and setGuardFrame

---
 engines/access/amazon/amazon_scripts.cpp | 48 ++++++++++++++++++++++++++++++--
 engines/access/amazon/amazon_scripts.h   |  2 ++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index e2fea04960..faf2ede386 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -683,12 +683,56 @@ void AmazonScripts::mWhile(int param1) {
 	}
 }
 
+void AmazonScripts::CHKVLINE() {
+	warning("TODO: CHKVLINE()");
+}
+
+void AmazonScripts::CHKHLINE() {
+	warning("TODO: CHKHLINE()");
+}
+
 void AmazonScripts::guardSee() {
-	warning("TODO: guardSee()");
+	int tmpY = (_vm->_screen->_scrollRow << 4) + _vm->_screen->_scrollY;
+	_game->_flags[140] = 0;
+	if (tmpY > _game->_guard._position.y)
+		return;
+
+	tmpY += _vm->_screen->_vWindowLinesTall;
+	tmpY -= 11;
+
+	if (tmpY < _game->_guard._position.y)
+		return;
+
+	_game->_guardFind = 1;
+	_game->_flags[140] = 1;
+
+	for (uint16 idx = 0; idx < _vm->_room->_plotter._walls.size(); idx++) {
+		_vm->_screen->_orgX1 = _vm->_room->_plotter._walls[idx].left;
+		_vm->_screen->_orgY1 = _vm->_room->_plotter._walls[idx].top;
+		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
+		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
+		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
+			CHKVLINE();
+			if (_game->_guardFind == 0)
+				return;
+		} else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
+			CHKHLINE();
+			if (_game->_guardFind == 0)
+				return;
+		}
+	}
 }
 
 void AmazonScripts::setGuardFrame() {
-	warning("TODO: setGuardFrame()");
+	ImageEntry ie;
+	ie._flags = 8;
+	if (_game->_guardLocation == 4)
+		ie._flags |= 2;
+	ie._spritesPtr = _vm->_objectsTable[37];
+	ie._frameNumber = _game->_guard._guardCel;
+	ie._position = _game->_guard._position;
+	ie._offsetY = 10;
+	_vm->_images.addToList(ie);
 }
 
 void AmazonScripts::guard() {
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 9d741158a8..9d5e4d8db1 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -72,6 +72,8 @@ protected:
 	void mWhileJWalk();
 	void mWhileDoOpen();
 	void mWhile(int param1);
+	void CHKVLINE();
+	void CHKHLINE();
 	void guardSee();
 	void setGuardFrame();
 	void guard();
-- 
cgit v1.2.3


From c74821161b05f27fa4f37afd1f549260fc4d6c90 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 12 Nov 2014 23:26:25 +0100
Subject: ACCESS: Fix some issues in plotTorchSpear(), in plotPit() and in
 ANT()

---
 engines/access/amazon/amazon_scripts.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index faf2ede386..f75d12fa18 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -818,7 +818,7 @@ void AmazonScripts::plotTorchSpear(int indx, const int *&buf) {
 
 	ImageEntry ie;
 	ie._flags = 8;
-	ie._spritesPtr = _pObject[62];
+	ie._spritesPtr = _vm->_objectsTable[62];
 	ie._frameNumber = buf[(idx / 2)];
 	ie._position = Common::Point(_game->_pitPos.x + buf[(idx / 2) + 1], _game->_pitPos.y + buf[(idx / 2) + 2]);
 	ie._offsetY = 255;
@@ -829,7 +829,7 @@ void AmazonScripts::plotPit(int indx, const int *&buf) {
 	int idx = indx;
 	ImageEntry ie;
 	ie._flags = 8;
-	ie._spritesPtr = _pObject[62];
+	ie._spritesPtr = _vm->_objectsTable[62];
 	ie._frameNumber = buf[(idx / 2)];
 	ie._position = Common::Point(_game->_pitPos.x, _game->_pitPos.y);
 	ie._offsetY = _game->_pitPos.y;
@@ -1005,7 +1005,7 @@ void AmazonScripts::ANT() {
 
 	ImageEntry ie;
 	ie._flags = 8;
-	ie._spritesPtr = _pObject[61];
+	ie._spritesPtr = _vm->_objectsTable[61];
 	ie._frameNumber = buf[(idx / 2)];
 	ie._position = Common::Point(_game->_antPos.x, _game->_antPos.y);
 	ie._offsetY = _game->_antPos.y - 70;
-- 
cgit v1.2.3


From 4ca5cc5ab4409601ed7458d08bf08c79c96dc8f7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 13 Nov 2014 08:18:18 +0100
Subject: ACCESS: Implement chkVLine and chkHLine

---
 engines/access/amazon/amazon_scripts.cpp | 94 ++++++++++++++++++++++++++++++--
 engines/access/amazon/amazon_scripts.h   |  6 +-
 2 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index f75d12fa18..4d08047d9c 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -683,12 +683,94 @@ void AmazonScripts::mWhile(int param1) {
 	}
 }
 
-void AmazonScripts::CHKVLINE() {
-	warning("TODO: CHKVLINE()");
+void AmazonScripts::VCODE(Common::Rect bounds) {
+	warning("TODO: VCODE()");
 }
 
-void AmazonScripts::CHKHLINE() {
-	warning("TODO: CHKHLINE()");
+void AmazonScripts::HCODE(Common::Rect bounds) {
+	warning("TODO: HCODE()");
+}
+
+void AmazonScripts::chkVLine() {
+	if (_game->_guard._position.x > _vm->_player->_rawPlayer.x)
+		_game->_guard._bounds = Common::Rect(_vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y, _game->_guard._position.x, _game->_guard._position.y);
+	else
+		_game->_guard._bounds = Common::Rect(_game->_guard._position.x, _game->_guard._position.y, _vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y);
+
+	if (_vm->_screen->_orgY1 > _vm->_screen->_orgY2)
+		SWAP(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
+
+	while (true) {
+		VCODE(_game->_guard._bounds);
+		int code = _game->_guard._gCode1 | _game->_guard._gCode2;
+		if (code == 10) {
+			_game->_guardFind = 0;
+			return;
+		}
+
+		int code2 = _game->_guard._gCode1 & _game->_guard._gCode2;
+		code2 &= 5;
+		if (((code & 10) == 8) || ((code & 10) == 2) || (code2 != 0))
+			return;
+
+		int midX = (_game->_guard._bounds.left + _game->_guard._bounds.right) / 2;
+		int midY = (_game->_guard._bounds.top + _game->_guard._bounds.bottom) / 2;
+
+		if (midX < _vm->_screen->_orgX1) {
+			if ((midX == _game->_guard._bounds.left) && (midY == _game->_guard._bounds.top))
+				return;
+
+			_game->_guard._bounds.left = midX;
+			_game->_guard._bounds.top = midY;
+		} else {
+			if ((midX == _game->_guard._bounds.right) && (midY == _game->_guard._bounds.bottom))
+				return;
+
+			_game->_guard._bounds.right = midX;
+			_game->_guard._bounds.bottom = midY;
+		}
+	}
+}
+
+void AmazonScripts::chkHLine() {
+	if (_game->_guard._position.y > _vm->_player->_rawPlayer.y)
+		_game->_guard._bounds = Common::Rect(_vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y, _game->_guard._position.x, _game->_guard._position.y);
+	else
+		_game->_guard._bounds = Common::Rect(_game->_guard._position.x, _game->_guard._position.y, _vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y);
+
+	if (_vm->_screen->_orgX1 > _vm->_screen->_orgX2)
+		SWAP(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
+
+	while (true) {
+		HCODE(_game->_guard._bounds);
+		int code = _game->_guard._gCode1 | _game->_guard._gCode2;
+		if (code == 5) {
+			_game->_guardFind = 0;
+			return;
+		}
+
+		int code2 = _game->_guard._gCode1 & _game->_guard._gCode2;
+		code2 &= 10;
+		if (((code & 5) == 4) || ((code & 5) == 1) || (code2 != 0))
+			return;
+
+		int midX = (_game->_guard._bounds.left + _game->_guard._bounds.right) / 2;
+		int midY = (_game->_guard._bounds.top + _game->_guard._bounds.bottom) / 2;
+
+		if (midY < _vm->_screen->_orgY1) {
+			if ((midX == _game->_guard._bounds.left) && (midY == _game->_guard._bounds.top))
+				return;
+
+			_game->_guard._bounds.left = midX;
+			_game->_guard._bounds.top = midY;
+		} else {
+			if ((midX == _game->_guard._bounds.right) && (midY == _game->_guard._bounds.bottom))
+				return;
+
+			_game->_guard._bounds.right = midX;
+			_game->_guard._bounds.bottom = midY;
+		}
+	}
 }
 
 void AmazonScripts::guardSee() {
@@ -712,11 +794,11 @@ void AmazonScripts::guardSee() {
 		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
 		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
 		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
-			CHKVLINE();
+			chkVLine();
 			if (_game->_guardFind == 0)
 				return;
 		} else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
-			CHKHLINE();
+			chkHLine();
 			if (_game->_guardFind == 0)
 				return;
 		}
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 9d5e4d8db1..c4e4869fde 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -72,8 +72,10 @@ protected:
 	void mWhileJWalk();
 	void mWhileDoOpen();
 	void mWhile(int param1);
-	void CHKVLINE();
-	void CHKHLINE();
+	void VCODE(Common::Rect bounds);
+	void HCODE(Common::Rect bounds);
+	void chkVLine();
+	void chkHLine();
 	void guardSee();
 	void setGuardFrame();
 	void guard();
-- 
cgit v1.2.3


From c4a5c36290e59d47272cb47244f294696cc6c5c1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 13 Nov 2014 20:30:41 -0500
Subject: ACCESS: Fix crash when talking to pilot on the plane

---
 engines/access/debugger.cpp | 2 +-
 engines/access/scripts.cpp  | 4 ++--
 engines/access/scripts.h    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 9a82168561..359b2e73a5 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -137,7 +137,7 @@ bool AmazonDebugger::Cmd_StartChapter(int argc, const char **argv) {
 	chapterScript[2] = ROOM_SCRIPT / 256;
 	chapterScript[3] = 0x80 + 75;			// cmdChapter
 	chapterScript[4] = strToInt(argv[1]);	// chapter number
-	_vm->_scripts->setScript(new Resource(chapterScript, 5));
+	_vm->_scripts->setScript(new Resource(chapterScript, 5), true);
 
 	return false;
 }
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 34d5372b56..9f919484ef 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -43,10 +43,10 @@ Scripts::~Scripts() {
 	freeScriptData();
 }
 
-void Scripts::setScript(Resource *res) {
+void Scripts::setScript(Resource *res, bool restartFlag) {
 	_resource = res;
 	_data = res->_stream;
-	_endFlag = true;
+	_endFlag = restartFlag;
 }
 
 void Scripts::freeScriptData() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 9860c7cde9..eaac996d4d 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -135,7 +135,7 @@ public:
 
 	virtual ~Scripts();
 
-	void setScript(Resource *data);
+	void setScript(Resource *data, bool restartFlag = false);
 
 	void freeScriptData();
 
-- 
cgit v1.2.3


From 2daa96e2840fd608f8968226ae44715ccf26c977 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 13 Nov 2014 20:31:44 -0500
Subject: ACCESS: Fix crash in conversation screen when clicking outside
 response boxes

---
 engines/access/events.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 0287e8cb03..b05aea3025 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -254,7 +254,7 @@ Common::Point EventsManager::calcRawMouse() {
 
 int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
 	int i = 0;
-	for (i = 0;; i++) {
+	for (i = 0; i < rects.size(); ++i) {
 		if (rects[i].left == -1)
 			return -1;
 
@@ -262,6 +262,8 @@ int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
 			&& (_mousePos.y > rects[i].top) && (_mousePos.y < rects[i].bottom))
 			return i;
 	}
+
+	return -1;
 }
 
 bool EventsManager::isKeyMousePressed() {
-- 
cgit v1.2.3


From 96cc1e3ac9270ca2ce60aedcbae3cca8c7410c1a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 14 Nov 2014 07:49:33 +0100
Subject: ACCESS: Implement setVerticalCode and setHorizontalCode used by the
 guard scene

---
 engines/access/amazon/amazon_scripts.cpp | 65 +++++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  4 +-
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 4d08047d9c..ae7e047fb8 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -683,12 +683,65 @@ void AmazonScripts::mWhile(int param1) {
 	}
 }
 
-void AmazonScripts::VCODE(Common::Rect bounds) {
-	warning("TODO: VCODE()");
+void AmazonScripts::setVerticalCode(Common::Rect bounds) {
+	_game->_guard._gCode1 = 0;
+	_game->_guard._gCode2 = 0;
+	if (bounds.left < _vm->_screen->_orgX1)
+		_game->_guard._gCode1 |= 8;
+	else if (bounds.left == _vm->_screen->_orgX1) {
+		_game->_guard._gCode1 |= 8;
+		_game->_guard._gCode1 |= 2;
+	} else
+		_game->_guard._gCode1 |= 2;
+
+	if (bounds.right < _vm->_screen->_orgX1)
+		_game->_guard._gCode2 |= 8;
+	else if (bounds.right == _vm->_screen->_orgX1) {
+		_game->_guard._gCode2 |= 8;
+		_game->_guard._gCode2 |= 2;
+	} else
+		_game->_guard._gCode2 |= 2;
+
+	if (bounds.top < _vm->_screen->_orgY1)
+		_game->_guard._gCode1 |= 4;
+	else if (bounds.top > _vm->_screen->_orgY2)
+		_game->_guard._gCode1 |= 1;
+
+	if (bounds.bottom < _vm->_screen->_orgY1)
+		_game->_guard._gCode2 |= 4;
+	else if (bounds.bottom > _vm->_screen->_orgY2)
+		_game->_guard._gCode2 |= 1;
 }
 
-void AmazonScripts::HCODE(Common::Rect bounds) {
-	warning("TODO: HCODE()");
+void AmazonScripts::setHorizontalCode(Common::Rect bounds) {
+	_game->_guard._gCode1 = 0;
+	_game->_guard._gCode2 = 0;
+
+	if (bounds.top < _vm->_screen->_orgY1)
+		_game->_guard._gCode1 |= 4;
+	else if (bounds.left == _vm->_screen->_orgX1) {
+		_game->_guard._gCode1 |= 4;
+		_game->_guard._gCode1 |= 1;
+	} else
+		_game->_guard._gCode1 |= 1;
+
+	if (bounds.bottom < _vm->_screen->_orgY1)
+		_game->_guard._gCode2 |= 4;
+	else if (bounds.right == _vm->_screen->_orgX1) {
+		_game->_guard._gCode2 |= 4;
+		_game->_guard._gCode2 |= 1;
+	} else
+		_game->_guard._gCode2 |= 1;
+
+	if (bounds.left < _vm->_screen->_orgX1)
+		_game->_guard._gCode1 |= 8;
+	else if (bounds.left > _vm->_screen->_orgX2)
+		_game->_guard._gCode1 |= 2;
+
+	if (bounds.right < _vm->_screen->_orgX1)
+		_game->_guard._gCode2 |= 8;
+	else if (bounds.bottom > _vm->_screen->_orgX2)
+		_game->_guard._gCode2 |= 2;
 }
 
 void AmazonScripts::chkVLine() {
@@ -701,7 +754,7 @@ void AmazonScripts::chkVLine() {
 		SWAP(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
 
 	while (true) {
-		VCODE(_game->_guard._bounds);
+		setVerticalCode(_game->_guard._bounds);
 		int code = _game->_guard._gCode1 | _game->_guard._gCode2;
 		if (code == 10) {
 			_game->_guardFind = 0;
@@ -742,7 +795,7 @@ void AmazonScripts::chkHLine() {
 		SWAP(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
 
 	while (true) {
-		HCODE(_game->_guard._bounds);
+		setHorizontalCode(_game->_guard._bounds);
 		int code = _game->_guard._gCode1 | _game->_guard._gCode2;
 		if (code == 5) {
 			_game->_guardFind = 0;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index c4e4869fde..c7b72a651e 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -72,8 +72,8 @@ protected:
 	void mWhileJWalk();
 	void mWhileDoOpen();
 	void mWhile(int param1);
-	void VCODE(Common::Rect bounds);
-	void HCODE(Common::Rect bounds);
+	void setVerticalCode(Common::Rect bounds);
+	void setHorizontalCode(Common::Rect bounds);
 	void chkVLine();
 	void chkHLine();
 	void guardSee();
-- 
cgit v1.2.3


From bacb9badf859ebb4fa6c5b15f1cb46460f57ab5b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 14 Nov 2014 07:53:58 +0100
Subject: ACCESS: Fix compilation warning

---
 engines/access/events.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index b05aea3025..ac07a7579f 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -253,8 +253,7 @@ Common::Point EventsManager::calcRawMouse() {
 }
 
 int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
-	int i = 0;
-	for (i = 0; i < rects.size(); ++i) {
+	for (uint16 i = 0; i < rects.size(); ++i) {
 		if (rects[i].left == -1)
 			return -1;
 
-- 
cgit v1.2.3


From 339847872b3d35cf6bec5b4d0360a2e0e815dbbd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 14 Nov 2014 08:33:33 +0100
Subject: ACCESS: Fix the call of doIntroduction

---
 engines/access/amazon/amazon_game.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index b1a8bbe294..fc5a44f354 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -79,11 +79,11 @@ AmazonEngine::~AmazonEngine() {
 }
 
 void AmazonEngine::playGame() {
-	// Initialise Amazon game-specific objects
+	// Initialize Amazon game-specific objects
 	_room = new AmazonRoom(this);
 	_scripts = new AmazonScripts(this);
 
-	if (_loadSaveSlot != -1) {
+	if (_loadSaveSlot == -1) {
 		// Do introduction
 		doIntroduction();
 		if (shouldQuit())
@@ -111,10 +111,11 @@ void AmazonEngine::doIntroduction() {
 	_events->setCursor(CURSOR_ARROW);
 	_events->showCursor();
 	_screen->setPanel(0);
+	_screen->setPalette();
 
-	//TODO: Implement the rest of the intro
-	return;
-
+	_events->setCursor(CURSOR_ARROW);
+	_events->showCursor();
+	_screen->setPanel(3);
 	doTitle();
 	if (shouldQuit())
 		return;
@@ -132,6 +133,7 @@ void AmazonEngine::doIntroduction() {
 		}
 	}
 
+	warning("TODO - More introduction code");
 	doTitle();
 }
 
-- 
cgit v1.2.3


From 4e1394c8e34fd1163f2ef54b5cb66e6945110d96 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 15 Nov 2014 23:03:45 +0100
Subject: ACCESS: Fix intro countdown, add splashscreen and loading of scene 0

---
 engines/access/amazon/amazon_game.cpp | 74 +++++++++++++++++++++++++++++------
 engines/access/room.h                 |  4 +-
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index fc5a44f354..4c2662e146 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -132,9 +132,6 @@ void AmazonEngine::doIntroduction() {
 				return;
 		}
 	}
-
-	warning("TODO - More introduction code");
-	doTitle();
 }
 
 void AmazonEngine::doTitle() {
@@ -170,19 +167,70 @@ void AmazonEngine::doTitle() {
 	_sound->playSound(1);
 
 	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (_pCount = 0; _pCount <= 3; ++_pCount) {
-		if (_pCount != 3) {
-			_buffer2.copyFrom(_buffer1);
-			int id = READ_LE_UINT16(COUNTDOWN + _pCount * 2);
-			int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 2 + 1);
-			_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
-			//TODO : more intro
-		} else {
-			//TODO : more intro
+	for (_pCount = 0; _pCount < 3; ++_pCount) {
+		_buffer2.copyFrom(_buffer1);
+		int id = COUNTDOWN[_pCount * 2];
+		int xp = COUNTDOWN[_pCount * 2 + 1];
+		_buffer2.plotImage(_objectsTable[0], id, Common::Point(xp, 71));
+		_screen->copyFrom(_buffer2);
+
+		_events->_vbCount = 70;
+		while (!shouldQuit() && _events->_vbCount > 0) {
+			_events->pollEvents();
+			g_system->delayMillis(10);
 		}
 	}
-	//TODO : more intro
+
+	_sound->playSound(0);
+	_screen->forceFadeOut();
+	_events->_vbCount = 100;
+	while (!shouldQuit() && _events->_vbCount > 0) {
+		_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+
+	_sound->freeSounds();
 	delete _objectsTable[0];
+	_objectsTable[0] = nullptr;
+
+	_files->_setPaletteFlag = false;
+	_files->loadScreen(0, 5);
+	_buffer2.copyFrom(*_screen);
+	_buffer1.copyFrom(*_screen);
+	_screen->forceFadeIn();
+	_sound->newMusic(1, 0);
+	_events->_vbCount = 700;
+	warning("TODO: check on KEYBUFCNT");
+	while (!shouldQuit() && (_events->_vbCount > 0) && (!_events->_leftButton) && (!_events->_rightButton)) {
+		_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+	if (_events->_rightButton) {
+		_skipStart = true;
+		_room->clearRoom();
+		_events->showCursor();
+		return;
+	}
+
+	_sound->newMusic(1, 1);
+	_sound->_musicRepeat = false;
+	_events->zeroKeys();
+	_room->loadRoom(0);
+	_screen->clearScreen();
+	_screen->setBufferScan();
+	_screen->_scrollRow = _screen->_scrollCol = 0;
+	_screen->_scrollX = _screen->_scrollY = 0;
+	_player->_rawPlayer = Common::Point(0, 0);
+	_screen->forceFadeOut();
+	_screen->_scrollX = 0;
+	_room->buildScreen();
+	copyBF2Vid();
+	_screen->forceFadeIn();
+	_oldRects.clear();
+	_newRects.clear();
+	// KEYFLG = 0;
+	_player->_scrollAmount = 1;
+	_pCount = 1;
 }
 
 void AmazonEngine::doOpening() {
diff --git a/engines/access/room.h b/engines/access/room.h
index 810082edb4..6c8b040593 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -108,8 +108,6 @@ protected:
 	 */
 	void executeCommand(int commandId);
 
-	virtual void loadRoom(int roomNumber) = 0;
-
 	virtual void reloadRoom() = 0;
 
 	virtual void reloadRoom1() = 0;
@@ -141,6 +139,8 @@ public:
 
 	void doRoom();
 
+	virtual void loadRoom(int roomNumber) = 0;
+
 	/**
 	 * Clear all the data used by the room
 	 */
-- 
cgit v1.2.3


From 731d7d20394d6cb8852fcc32e9beadc46d724cc7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 16 Nov 2014 00:16:41 +0100
Subject: ACCESS: Add more intro code, including credit scrolling

---
 engines/access/amazon/amazon_game.cpp | 114 +++++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_game.h   |   2 +
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 4c2662e146..f10c933d44 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -134,6 +134,42 @@ void AmazonEngine::doIntroduction() {
 	}
 }
 
+void AmazonEngine::doCredit() {
+	if (_pCount < 15)
+		return;
+
+	if (_pCount <= 75)
+		_buffer2.plotImage(_objectsTable[0], 0, Common::Point(90, 35));
+	else if (_pCount <= 210)
+		_buffer2.plotImage(_objectsTable[0], 1, Common::Point(65, 35));
+	else if (_pCount <= 272)
+		_buffer2.plotImage(_objectsTable[0], 2, Common::Point(96, 45));
+	else if (_pCount <= 334)
+		_buffer2.plotImage(_objectsTable[0], 3, Common::Point(68, 54));
+	else if (_pCount <= 396)
+		_buffer2.plotImage(_objectsTable[0], 4, Common::Point(103, 54));
+	else if (_pCount <= 458) {
+		_buffer2.plotImage(_objectsTable[0], 5, Common::Point(8, 5));
+		_buffer2.plotImage(_objectsTable[0], 12, Common::Point(88, 55));
+		_buffer2.plotImage(_objectsTable[0], 6, Common::Point(194, 98));
+	} else if (_pCount <= 520) {
+		_buffer2.plotImage(_objectsTable[0], 7, Common::Point(90, 35));
+		_buffer2.plotImage(_objectsTable[0], 8, Common::Point(90, 35));
+	} else if (_pCount <= 580) {
+		_buffer2.plotImage(_objectsTable[0], 9, Common::Point(18, 15));
+		_buffer2.plotImage(_objectsTable[0], 10, Common::Point(164, 81));
+	} else
+		_buffer2.plotImage(_objectsTable[0], 11, Common::Point(106, 55));
+}
+
+void AmazonEngine::scrollTitle() {
+	copyBF1BF2();
+	_newRects.clear();
+	doCredit();
+	copyRects();
+	copyBF2Vid();
+}
+
 void AmazonEngine::doTitle() {
 	_screen->setDisplayScan();
 	_destIn = &_buffer2;
@@ -230,7 +266,83 @@ void AmazonEngine::doTitle() {
 	_newRects.clear();
 	// KEYFLG = 0;
 	_player->_scrollAmount = 1;
-	_pCount = 1;
+	_pCount = 0;
+
+	while(true) {
+		_events->pollEvents();
+		if (_events->_rightButton) {
+			_skipStart = true;
+			_room->clearRoom();
+			_events->showCursor();
+			return;
+		}
+
+		warning("TODO: check on KEYBUFCNT");
+		if (_events->_leftButton) {
+			_room->clearRoom();
+			_events->showCursor();
+			return;
+		}
+
+		_events->_vbCount = 4;
+		if (_screen->_scrollCol + _screen->_vWindowWidth != _room->_playFieldWidth) {
+			_screen->_scrollX += _player->_scrollAmount;
+
+			while (_screen->_scrollX >= TILE_WIDTH && !shouldQuit()) {
+				_screen->_scrollX -= TILE_WIDTH;
+				++_screen->_scrollCol;
+
+				_buffer1.moveBufferLeft();
+				_room->buildColumn(_screen->_scrollCol + _screen->_vWindowWidth, _screen->_vWindowBytesWide);
+			}
+			scrollTitle();
+			++_pCount;
+
+			while (!shouldQuit() && (_events->_vbCount > 0)) {
+				_events->pollEvents();
+				g_system->delayMillis(10);
+			}
+			continue;
+		}
+
+		_events->_vbCount = 120;
+		while (!shouldQuit() && (_events->_vbCount > 0)) {
+			_events->pollEvents();
+			g_system->delayMillis(10);
+		}
+
+		while(true) {
+			_pCount = 0;
+			_events->_vbCount = 3;
+			if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
+				_room->clearRoom();
+				_events->showCursor();
+				return;
+			}
+
+			_screen->_scrollY = _screen->_scrollY + _player->_scrollAmount;
+
+			while (_screen->_scrollY >= TILE_HEIGHT && !shouldQuit()) {
+				_screen->_scrollY -= TILE_HEIGHT;
+				++_screen->_scrollRow;
+				_buffer1.moveBufferUp();
+
+				_room->buildRow(_screen->_scrollRow + _screen->_vWindowHeight, _screen->_vWindowLinesTall * _screen->_bufferBytesWide);
+
+				if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
+					_room->clearRoom();
+					_events->showCursor();
+					return;
+				}
+				
+				scrollTitle();
+				while (!shouldQuit() && (_events->_vbCount > 0)) {
+					_events->pollEvents();
+					g_system->delayMillis(10);
+				}
+			}
+		}
+	}
 }
 
 void AmazonEngine::doOpening() {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 0c6fb1cb41..34a1eef775 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -95,6 +95,8 @@ private:
 	 */
 	void setupGame();
 
+	void doCredit();
+	void scrollTitle();
 	void loadEstablish(int estabIndex);
 	void doEstablish(int screenId, int estabIndex);
 
-- 
cgit v1.2.3


From 1ad11d091f03aeb437413c328c36bed1c08b73d8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 16 Nov 2014 00:40:13 +0100
Subject: ACCESS: Simplify doIntroduction()

---
 engines/access/amazon/amazon_game.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f10c933d44..d110a6cf44 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -117,21 +117,17 @@ void AmazonEngine::doIntroduction() {
 	_events->showCursor();
 	_screen->setPanel(3);
 	doTitle();
-	if (shouldQuit())
+
+	if (shouldQuit() || _skipStart)
 		return;
 
-	if (!_skipStart) {
-		_screen->setPanel(3);
-		doOpening();
-		if (shouldQuit())
-			return;
+	_screen->setPanel(3);
+	doOpening();
 
-		if (!_skipStart) {
-			doTent();
-			if (shouldQuit())
-				return;
-		}
-	}
+	if (shouldQuit() || _skipStart)
+		return;
+
+	doTent();
 }
 
 void AmazonEngine::doCredit() {
-- 
cgit v1.2.3


From f70012a115dc963f21ac531d57e593af0e5a1ccf Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 16 Nov 2014 18:10:37 +0100
Subject: ACCESS: Replace doOpening by mWhileDoOpen, move openObj to Amazon
 Resources

---
 engines/access/amazon/amazon_game.cpp      |  6 +-----
 engines/access/amazon/amazon_game.h        |  5 -----
 engines/access/amazon/amazon_resources.cpp | 13 +++++++++++++
 engines/access/amazon/amazon_resources.h   |  2 ++
 engines/access/amazon/amazon_scripts.cpp   | 13 -------------
 engines/access/amazon/amazon_scripts.h     |  7 ++++---
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d110a6cf44..e9c42d0647 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -122,7 +122,7 @@ void AmazonEngine::doIntroduction() {
 		return;
 
 	_screen->setPanel(3);
-	doOpening();
+	((AmazonScripts *)_scripts)->mWhileDoOpen();
 
 	if (shouldQuit() || _skipStart)
 		return;
@@ -341,10 +341,6 @@ void AmazonEngine::doTitle() {
 	}
 }
 
-void AmazonEngine::doOpening() {
-	warning("TODO doOpening");
-}
-
 void AmazonEngine::doTent() {
 	warning("TODO doTent");
 }
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 34a1eef775..ba81a77658 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -80,11 +80,6 @@ private:
 	 */
 	void doTitle();
 
-	/**
-	 * Do opening sequence
-	 */
-	void doOpening();
-
 	/**
 	 * Do tent scene of introduction
 	 */
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 5768be3c33..925ea195a5 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1524,5 +1524,18 @@ const int TORCH[12] = {
 
 const int SPEAR[3] = {30, -13, 1};
 
+const int openObj[10][4] = {
+	{8, -80, 120, 30},
+	{13, 229, 0, 50},
+	{12, 78, 0, 50},
+	{11, 10, 0, 50},
+	{10, 178, 97, 50},
+	{9, 92, 192, 50},
+	{14, 38, 0, 100},
+	{15, 132, 76, 100},
+	{16, 142, 0, 100},
+	{4, -280, 40, 120},
+};
+
 } // End of namespace Amazon
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 0d65a569c7..434a0f37db 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -81,6 +81,8 @@ extern const int PITSTAB[21];
 extern const int TORCH[12];
 
 extern const int SPEAR[3];
+
+extern const int openObj[10][4];
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index ae7e047fb8..f97d789f5f 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -540,19 +540,6 @@ void AmazonScripts::mWhileDoOpen() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 
-	const int openObj[10][4] = {
-		{8, -80, 120, 30},
-		{13, 229, 0, 50},
-		{12, 78, 0, 50},
-		{11, 10, 0, 50},
-		{10, 178, 97, 50},
-		{9, 92, 192, 50},
-		{14, 38, 0, 100},
-		{15, 132, 76, 100},
-		{16, 142, 0, 100},
-		{4, -280, 40, 120},
-	};
-
 	screen.setBufferScan();
 	events.hideCursor();
 	screen.forceFadeOut();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index c7b72a651e..67e7e77009 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -35,16 +35,16 @@ class AmazonEngine;
 class AmazonScripts: public Scripts {
 private:
 	AmazonEngine *_game;
-
 	int _xTrack;
 	int _yTrack;
 	int _zTrack;
 	int _xCam;
 	int _yCam;
 	int _zCam;
-
 	int _pNumObj;
+
 	int _pImgNum[32];
+
 	SpriteResource *_pObject[32];
 
 	int _pObjX[32];
@@ -70,7 +70,6 @@ protected:
 	void mWhileFly();
 	void mWhileFall();
 	void mWhileJWalk();
-	void mWhileDoOpen();
 	void mWhile(int param1);
 	void setVerticalCode(Common::Rect bounds);
 	void setHorizontalCode(Common::Rect bounds);
@@ -99,6 +98,8 @@ protected:
 	void CMDRETFLASH();
 public:
 	AmazonScripts(AccessEngine *vm);
+
+	void mWhileDoOpen();
 };
 
 } // End of namespace Amazon
-- 
cgit v1.2.3


From a0294b633896dda85d3dee610c4ba2f938f3d731 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 18 Nov 2014 00:36:39 +0100
Subject: ACCESS: Move setupGame before doIntroduction to fix a crash

---
 engines/access/amazon/amazon_game.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index e9c42d0647..44071753d2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -83,6 +83,9 @@ void AmazonEngine::playGame() {
 	_room = new AmazonRoom(this);
 	_scripts = new AmazonScripts(this);
 
+	// Setup the game
+	setupGame();
+
 	if (_loadSaveSlot == -1) {
 		// Do introduction
 		doIntroduction();
@@ -90,9 +93,6 @@ void AmazonEngine::playGame() {
 			return;
 	}
 
-	// Setup the game
-	setupGame();
-
 	_screen->clearScreen();
 	_screen->setPanel(0);
 	_screen->forceFadeOut();
-- 
cgit v1.2.3


From 44e7051b955b7ccf12da6a8bfdbca2155f296a98 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 18 Nov 2014 11:10:34 +0100
Subject: ACCESS: Fix display height of text in chapter introduction

---
 engines/access/amazon/amazon_game.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 44071753d2..bc26ee3e3f 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -655,7 +655,6 @@ void AmazonEngine::startChapter(int chapter) {
 	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + ((0x40 + _chapter) * 2) + 2);
 	_printEnd = 170;
 
-	_printEnd = 155;
 	Common::String msg((const char *)_eseg->data() + msgOffset);
 
 	if (_txtPages == 0) {
-- 
cgit v1.2.3


From 8e483e037f1851fb96fd2125bf526828cdfa6e98 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 18 Nov 2014 12:10:07 +0100
Subject: ACCESS: Fix the handling of the very last line of a text in getLine

---
 engines/access/font.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 5eaf0b0ca8..5686cdf3b0 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -110,8 +110,11 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 
 		// Reached maximum allowed size
 		// If this was the last character of the string, let it go
-		if (*src == '\0')
+		if (*src == '\0') {
+			line = Common::String(s.c_str(), src);
+			s = "";
 			return true;
+		}
 		
 		// Work backwards to find space at the start of the current word 
 		// as a point to split the line on
-- 
cgit v1.2.3


From 31fc8fdaa1520d57b02c9aeb83fb4a57b4fef16e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 18 Nov 2014 14:10:01 +0100
Subject: ACCESS: Add a hack in order to make the first screen visible

---
 engines/access/amazon/amazon_game.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index bc26ee3e3f..d7ad12e721 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -184,6 +184,15 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->playSound(1);
 
+	// HACK: This delay has been added so that the very first screen is visible.
+	// The original was using disk loading time to display it, and it's too fast
+	// nowadays to be visible.
+	_events->_vbCount = 70;
+	while (!shouldQuit() && _events->_vbCount > 0) {
+		_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+
 	Resource *spriteData = _files->loadFile(0, 2);
 	_objectsTable[0] = new SpriteResource(this, spriteData);
 	delete spriteData;
-- 
cgit v1.2.3


From 8939d657f701d3e40112b5b19fe49022eca8f18a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 18 Nov 2014 20:21:35 -0500
Subject: ACCESS: Fix loading animation data in mWhileDoOpen

---
 engines/access/amazon/amazon_scripts.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index f97d789f5f..9bb910c2ba 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -560,7 +560,11 @@ void AmazonScripts::mWhileDoOpen() {
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_buffer1.copyFrom(*_vm->_screen);
 
-	warning("TODO _roomInfo = _vm->_files->loadFile(1, 1);");
+	// Load animation data
+	_vm->_animation->freeAnimationData();
+	Resource *animResource = _vm->_files->loadFile(1, 1);
+	_vm->_animation->loadAnimations(animResource);
+	delete animResource;
 
 	_xTrack = 8;
 	_yTrack = -3;
-- 
cgit v1.2.3


From a01ddaeb1b20d4e512d8418fa2ae9b72dcaca308 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 18 Nov 2014 20:48:53 -0500
Subject: ACCESS: Fix loading correct sprite resource in mWhileDoOpen

---
 engines/access/amazon/amazon_scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 9bb910c2ba..b4a1568e5a 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -550,7 +550,7 @@ void AmazonScripts::mWhileDoOpen() {
 		_game->establishCenter(0, 1);
 	}
 
-	Resource *data = _vm->_files->loadFile(0, 1);
+	Resource *data = _vm->_files->loadFile(1, 0);
 	SpriteResource *spr = new SpriteResource(_vm, data);
 	delete data;
 
-- 
cgit v1.2.3


From b2e67a69c6dd53f2ffa720eced127dff97eb856c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 18 Nov 2014 21:42:49 -0500
Subject: ACCESS: Fix incorrect loading of exra cells during room load

---
 engines/access/room.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 513c1596ac..31d1583c3e 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -796,7 +796,6 @@ RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD) {
 		ExtraCell ec;
 		ec._vid._fileNum = v;
 		ec._vid._subfile = stream.readSint16LE();
-		ec._vidSound.load(stream);
 
 		_extraCells.push_back(ec);
 	}
-- 
cgit v1.2.3


From 8e45582492cab277c5b53884f7ec9c0a22a6e4ca Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 18 Nov 2014 21:47:42 -0500
Subject: ACCESS: Add extra shouldQuit checks during title sequence

---
 engines/access/amazon/amazon_game.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d7ad12e721..dba1b6fb9c 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -273,8 +273,7 @@ void AmazonEngine::doTitle() {
 	_player->_scrollAmount = 1;
 	_pCount = 0;
 
-	while(true) {
-		_events->pollEvents();
+	while (!shouldQuit()) {
 		if (_events->_rightButton) {
 			_skipStart = true;
 			_room->clearRoom();
@@ -293,7 +292,7 @@ void AmazonEngine::doTitle() {
 		if (_screen->_scrollCol + _screen->_vWindowWidth != _room->_playFieldWidth) {
 			_screen->_scrollX += _player->_scrollAmount;
 
-			while (_screen->_scrollX >= TILE_WIDTH && !shouldQuit()) {
+			while (_screen->_scrollX >= TILE_WIDTH) {
 				_screen->_scrollX -= TILE_WIDTH;
 				++_screen->_scrollCol;
 
@@ -316,7 +315,7 @@ void AmazonEngine::doTitle() {
 			g_system->delayMillis(10);
 		}
 
-		while(true) {
+		while (!shouldQuit()) {
 			_pCount = 0;
 			_events->_vbCount = 3;
 			if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
-- 
cgit v1.2.3


From e9e19446d833c784430e2947098df251583f24ce Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 19 Nov 2014 16:19:01 +0100
Subject: ACCESS: Implement doTent

---
 engines/access/amazon/amazon_game.cpp | 69 ++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index dba1b6fb9c..f663f03b38 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -350,7 +350,74 @@ void AmazonEngine::doTitle() {
 }
 
 void AmazonEngine::doTent() {
-	warning("TODO doTent");
+	int step = 0;
+	_screen->setDisplayScan();
+	_screen->forceFadeOut();
+	_events->hideCursor();
+	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 39), 1));
+	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 14), 1));
+	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 15), 1));
+	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 16), 1));
+	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 31), 2));
+	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 52), 2));
+	_sound->playSound(0);
+
+	_files->_setPaletteFlag = false;
+	_files->loadScreen(2, 0);
+	_buffer2.copyFrom(*_screen);
+	_buffer1.copyFrom(*_screen);
+	_screen->forceFadeIn();
+
+	_video->setVideo(_screen, Common::Point(126, 73), FileIdent(2, 1), 10);
+	while (!shouldQuit() && !_video->_videoEnd) {
+		_video->playVideo();
+		if ((_video->_videoFrame == 32) || (_video->_videoFrame == 34))
+			_sound->playSound(4);
+		else if (_video->_videoFrame == 36) {
+			if (step != 2) {
+				_sound->playSound(2);
+				step = 2;
+			}
+		} else if (_video->_videoFrame == 18) {
+			if (step != 1) {
+				_sound->newMusic(73, 1);
+				_sound->newMusic(11, 0);
+				step = 1;
+				_sound->playSound(1);
+			}
+		}
+
+		g_system->delayMillis(10);
+		_events->pollEvents();
+	}	
+
+	_sound->playSound(5);
+	_video->setVideo(_screen, Common::Point(43, 11), FileIdent(2, 2), 10);
+	while (!shouldQuit() && !_video->_videoEnd) {
+		_video->playVideo();
+		if (_video->_videoFrame == 26) {
+			_sound->playSound(5);
+		} else if (_video->_videoFrame == 15) {
+			if (step !=3) {
+				_sound->playSound(3);
+				step = 3;
+			}
+		}
+
+		g_system->delayMillis(10);
+		_events->pollEvents();
+	}
+
+	_events->_vbCount = 200;
+	while (!shouldQuit() && _events->_vbCount > 0) {
+		_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+	_events->showCursor();
+	_sound->newMusic(11, 1);
+	_sound->_soundTable.clear();
+
+	establishCenter(0, 4);
 }
 
 void AmazonEngine::setupGame() {
-- 
cgit v1.2.3


From bc050a549ca43b8571270782bc3b12cc0b31c634 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 19 Nov 2014 20:28:27 -0500
Subject: ACCESS: Implemented cmdCheckVFrame opcode

---
 engines/access/scripts.cpp | 9 +++++++--
 engines/access/scripts.h   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 9f919484ef..89c8a4d0e6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -127,7 +127,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
-		&Scripts::cmdSetConPos, &Scripts::CMDCHECKVFRAME, &Scripts::cmdJumpChoice, 
+		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
@@ -691,7 +691,12 @@ void Scripts::cmdSetConPos() {
 	_texsOrg = Common::Point(x, y);
 }
 
-void Scripts::CMDCHECKVFRAME() { error("TODO CMDCHECKVFRAME"); }
+void Scripts::cmdCheckVFrame() { 
+	if (_vm->_video->_videoFrame == _data->readSint16LE())
+		cmdGoto();
+	else
+		_data->skip(2);
+}
 
 void Scripts::cmdJumpChoice() {
 	int val = (_data->readUint16LE() & 0xFF);
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index eaac996d4d..2b527a855a 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -109,7 +109,7 @@ protected:
 	void cmdTexChoice();
 	void cmdWait();
 	void cmdSetConPos();
-	void CMDCHECKVFRAME();
+	void cmdCheckVFrame();
 	void cmdJumpChoice();
 	void cmdReturnChoice();
 	void cmdClearBlock();
-- 
cgit v1.2.3


From 43f7fe9182a151f070c93dae4550dc022aeb12be Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 20 Nov 2014 13:28:31 +0100
Subject: ACCESS: Implement doCast

---
 engines/access/amazon/amazon_scripts.cpp | 139 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |   1 +
 engines/access/sound.cpp                 |   5 ++
 engines/access/sound.h                   |   2 +
 4 files changed, 146 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index b4a1568e5a..451c689350 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -931,6 +931,143 @@ void AmazonScripts::loadBackground(int param1, int param2) {
 	_vm->_screen->forceFadeIn();
 }
 
+void AmazonScripts::doCast(int param1) {
+	static const int END_OBJ[26][4] = {
+		{ 0, 118, 210, 10},
+		{ 1,  38, 250, 10},
+		{ 2,  38, 280, 10},
+		{ 3,  38, 310, 10},
+		{ 4,  38, 340, 10},
+		{ 5,  38, 370, 10},
+		{ 6,  38, 400, 10},
+		{ 7,  38, 430, 10},
+		{ 8,  38, 460, 10},
+		{ 9,  38, 490, 10},
+		{10,  38, 520, 10},
+		{11,  38, 550, 10},
+		{12,  38, 580, 10},
+		{13,  38, 610, 10},
+		{14,  38, 640, 10},
+		{15,  38, 670, 10},
+		{16,  38, 700, 10},
+		{17,  38, 730, 10},
+		{18,  38, 760, 10},
+		{19,  38, 790, 10},
+		{20,  95, 820, 10},
+		{21,  94, 850, 10},
+		{22,  96, 880, 10},
+		{23, 114, 910, 10},
+		{24, 114, 940, 10},
+		{25, 110, 970, 10}
+	};
+
+	static const int END_OBJ1[4][4] = {
+		{0,  40, 1100, 10},
+		{2,  11, 1180, 10},
+		{1, 154, 1180, 10},
+		{3, 103, 1300, 10}
+	};
+
+	_vm->_screen->setDisplayScan();
+	_vm->_events->hideCursor();
+	_vm->_screen->forceFadeOut();
+	_vm->_screen->_clipHeight = 173;
+	_vm->_screen->clearScreen();
+	_game->_chapter = 16;
+	_game->tileScreen();
+	_game->updateSummary(param1);
+	_vm->_screen->setPanel(3);
+	_game->_chapter = 14;
+
+	Resource *spriteData = _vm->_files->loadFile(91, 0);
+	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+	spriteData = _vm->_files->loadFile(91, 1);
+	_vm->_objectsTable[1] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(58, 1);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+
+	_xTrack = 0;
+	_yTrack = -6;
+	_zTrack = 0;
+	_xCam = _yCam = 0;
+	_zCam = 60;
+
+	_game->_timers[24]._timer = 1;
+	_game->_timers[24]._initTm = 1;
+	++_game->_timers[24]._flag;
+
+	_pNumObj = 26;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pObject[i] = _vm->_objectsTable[0];
+		_pImgNum[i] = END_OBJ[i][0];
+		_pObjX[i] = END_OBJ[i][1];
+		_pObjY[i] = END_OBJ[i][2];
+		_pObjZ[i] = END_OBJ[i][3];
+		_pObjXl[i] = _pObjYl[i] = 0;
+	}
+
+	_pNumObj = 4;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pObject[26 + i] = _vm->_objectsTable[1];
+		_pImgNum[26 + i] = END_OBJ1[i][0];
+		_pObjX[26 + i] = END_OBJ1[i][1];
+		_pObjY[26 + i] = END_OBJ1[i][2];
+		_pObjZ[26 + i] = END_OBJ1[i][3];
+		_pObjXl[26 + i] = _pObjYl[26 + i] = 0;
+	}
+
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	_vm->_numAnimTimers = 0;
+
+	_vm->_sound->newMusic(58, 0);
+	_vm->_screen->forceFadeIn();
+
+	while (!_vm->shouldQuit()) {
+		_vm->_images.clear();
+		pan();
+		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		_vm->_newRects.clear();
+		_game->plotList();
+		_vm->copyBlocks();
+
+		_vm->_events->pollEvents();
+		warning("TODO: check on KEYBUFCNT");
+
+		if (_yCam < -7550) {
+			_vm->_events->_vbCount = 50;
+
+			while(!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() && _vm->_events->_vbCount > 0) {
+				_vm->_events->pollEvents();
+				g_system->delayMillis(10);
+			}
+
+			while (!_vm->shouldQuit() && !_vm->_sound->checkMidiDone())
+				_vm->_events->pollEvents();
+
+			break;
+		}
+	}
+
+	_vm->_sound->newMusic(58, 1);
+	_vm->_events->showCursor();
+	warning("TODO: delete _roomInfo;");
+	_vm->freeCells();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	_vm->_numAnimTimers = 0;
+	_vm->_images.clear();
+	_vm->_screen->forceFadeOut();
+
+	warning("TODO: EXIT");
+
+}
+
 void AmazonScripts::setInactive() {
 	_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
 	_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
@@ -1232,7 +1369,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		loadBackground(param1, param2);
 		break;
 	case 3:
-		warning("TODO DOCAST");
+		doCast(param1);
 		break;
 	case 4:
 		setInactive();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 67e7e77009..ccf19fab31 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -84,6 +84,7 @@ protected:
 	int antHandleLeft(int indx, const int *&buf);
 	int antHandleStab(int indx, const int *&buf);
 	void ANT();
+	void doCast(int param1);
 	void loadBackground(int param1, int param2);
 	void plotInactive();
 	void setInactive();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 075bfc005e..6d42cd552e 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -88,6 +88,11 @@ void SoundManager::midiPlay() {
 	// TODO
 }
 
+bool SoundManager::checkMidiDone() {
+	// TODO
+	return true;
+}
+
 void SoundManager::midiRepeat() {
 	// TODO
 }
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 2456ba7753..46e3b23bb1 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -72,6 +72,8 @@ public:
 
 	void midiPlay();
 
+	bool checkMidiDone();
+
 	void midiRepeat();
 
 	void stopSong();
-- 
cgit v1.2.3


From 690bea4c8831895ec74c022aeda599a9a7d119f6 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 20 Nov 2014 13:31:56 +0100
Subject: ACCESS: Trigger quit game at the end of doCast

---
 engines/access/amazon/amazon_scripts.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 451c689350..4c4f2f376b 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1064,8 +1064,8 @@ void AmazonScripts::doCast(int param1) {
 	_vm->_images.clear();
 	_vm->_screen->forceFadeOut();
 
-	warning("TODO: EXIT");
-
+	_vm->quitGame();
+	_vm->_events->pollEvents();
 }
 
 void AmazonScripts::setInactive() {
-- 
cgit v1.2.3


From 7427f29e85dc5988126349b2579d37a0cf3997f1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 21 Nov 2014 00:09:28 +0100
Subject: ACCESS: Implement mWhileJWalk2 (WIP)

---
 engines/access/amazon/amazon_scripts.cpp | 96 +++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  6 ++
 2 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 4c4f2f376b..f7d1df5503 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -225,6 +225,100 @@ void AmazonScripts::mWhile2() {
 	} while (_vm->_flags[52] == 4);
 }
 
+void AmazonScripts::initJWalk2() {
+	const int JUNGLE1OBJ[7][4] = {
+		{2, 470, 0, 20},
+		{0, 290, 0, 50},
+		{1, 210, 0, 40},
+		{0, 500, 0, 30},
+		{1, 550, 0, 20},
+		{0, 580, 0, 60},
+		{1, 650, 0, 30}
+	};
+	_vm->_screen->fadeOut();
+	_vm->_events->hideCursor();
+	_vm->_screen->clearScreen();
+	_vm->_buffer2.clearBuffer();
+	_vm->_screen->setBufferScan();
+
+	_vm->_screen->_scrollX = _vm->_screen->_scrollY;
+	_vm->_screen->_scrollCol = _vm->_screen->_scrollRow;
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->fadeIn();
+	// KEYFL = 0;
+
+	_game->_plane._xCount = 2;
+	_vm->_player->_scrollAmount = 5;
+	_xTrack = -10;
+	_yTrack = _zTrack = 0;
+	_xCam = 480;
+	_yCam = 0;
+	_zCam = 80;
+
+	_game->_timers[24]._timer = 1;
+	_game->_timers[24]._initTm = 1;
+	++_game->_timers[24]._flag;
+
+	_pNumObj = 7;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pObject[i] = _vm->_objectsTable[24];
+		_pImgNum[i] = JUNGLE1OBJ[i][0];
+		_pObjX[i] = JUNGLE1OBJ[i][1];
+		_pObjY[i] = JUNGLE1OBJ[i][2];
+		_pObjZ[i] = JUNGLE1OBJ[i][3];
+		_pObjXl[i] = _pObjYl[i] = 0;
+	}
+
+	_jCnt[0] = 0;
+	_jCnt[1] = 3;
+	_jCnt[2] = 5;
+
+	_jungleX[0] = 50;
+	_jungleX[1] = 16;
+	_jungleX[2] = 93;
+}
+
+void AmazonScripts::jungleMove() {
+	warning("TODO jungleMove");
+}
+
+void AmazonScripts::mWhileJWalk2() {
+	Screen &screen = *_vm->_screen;
+
+	initJWalk2();
+
+	while(true) {
+		_vm->_images.clear();
+		_vm->_events->_vbCount = 6;
+		_pImgNum[0] = _game->_plane._xCount;
+		while ((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
+			int scrollX = screen._scrollCol + screen._vWindowWidth;
+			jungleMove();
+			while (scrollX >= TILE_WIDTH) {
+				screen._scrollX -= TILE_WIDTH;
+				++screen._scrollCol;
+				_vm->_buffer1.moveBufferLeft();
+				_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+			}
+			if (_game->_plane._xCount == 2)
+				++_game->_plane._xCount;
+			else
+				--_game->_plane._xCount;
+
+			pan();
+			scrollJWalk();
+
+			g_system->delayMillis(10);
+			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+				_vm->_events->pollEvents();
+				g_system->delayMillis(10);
+			}
+		}
+	}
+	_vm->_events->showCursor();
+}
+
 void AmazonScripts::doFlyCell() {
 	Plane &plane = _game->_plane;
 	SpriteResource *sprites = _vm->_objectsTable[15];
@@ -667,7 +761,7 @@ void AmazonScripts::mWhile(int param1) {
 		mWhile2();
 		break;
 	case 8:
-		warning("TODO JWALK2");
+		mWhileJWalk2();
 		break;
 	default:
 		break;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index ccf19fab31..d07445b7ef 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -53,6 +53,9 @@ private:
 	int _pObjXl[16];
 	int _pObjYl[16];
 
+	int _jCnt[3];
+	int _jungleX[3];
+
 	void pan();
 
 protected:
@@ -70,6 +73,9 @@ protected:
 	void mWhileFly();
 	void mWhileFall();
 	void mWhileJWalk();
+	void initJWalk2();
+	void jungleMove();
+	void mWhileJWalk2();
 	void mWhile(int param1);
 	void setVerticalCode(Common::Rect bounds);
 	void setHorizontalCode(Common::Rect bounds);
-- 
cgit v1.2.3


From 60ee5456c9b7436e0830ba30a30acb53051d2820 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 21 Nov 2014 00:54:13 +0100
Subject: ACCESS: Implement jungleMove

---
 engines/access/amazon/amazon_scripts.cpp | 33 +++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index f7d1df5503..7272564fdb 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -280,7 +280,35 @@ void AmazonScripts::initJWalk2() {
 }
 
 void AmazonScripts::jungleMove() {
-	warning("TODO jungleMove");
+	const static int jungleY[3] = {27, 30, 29};
+	int cx = 1;
+	int dx = 0;
+	if (_vm->_timers[0]._flag == 0) {
+		_vm->_timers[0]._flag = 1;
+		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		for (int i = 0; i <= 3; i++) {
+			int newJCnt = (_jCnt[i] + 1) % 8;
+			_jCnt[i] = newJCnt;
+			_jungleX[i] += 5;
+		}
+		dx = 4;
+		if (_game->_allenFlag != 1)
+			cx = 2;
+		else
+			cx = 3;
+	}
+
+	for (int i = 0; i <= cx; i++) {
+		ImageEntry ie;
+		ie._flags = 8;
+		ie._spritesPtr = _vm->_objectsTable[24];
+		ie._frameNumber = _jCnt[i] + dx;
+		ie._position = Common::Point(_jungleX[i], jungleY[i]);
+		ie._offsetY = jungleY[i];
+
+		_vm->_images.addToList(ie);
+		dx += 8;
+	}
 }
 
 void AmazonScripts::mWhileJWalk2() {
@@ -293,9 +321,8 @@ void AmazonScripts::mWhileJWalk2() {
 		_vm->_events->_vbCount = 6;
 		_pImgNum[0] = _game->_plane._xCount;
 		while ((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
-			int scrollX = screen._scrollCol + screen._vWindowWidth;
 			jungleMove();
-			while (scrollX >= TILE_WIDTH) {
+			while (screen._scrollX >= TILE_WIDTH) {
 				screen._scrollX -= TILE_WIDTH;
 				++screen._scrollCol;
 				_vm->_buffer1.moveBufferLeft();
-- 
cgit v1.2.3


From 968bfec0677c75943fde080c63ab2e265aefa2b2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 20 Nov 2014 22:25:01 -0500
Subject: ACCESS: Workaround for original setting animations when none is
 loaded

---
 engines/access/animation.cpp | 4 +++-
 engines/access/scripts.cpp   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index de44740c7f..184b015371 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -304,6 +304,8 @@ void AnimationManager::loadAnimations(Resource *res) {
 
 Animation *AnimationManager::setAnimation(int animId) {
 	Animation *anim = findAnimation(animId);
+	if (!anim)
+		return nullptr;
 
 	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
@@ -320,7 +322,7 @@ void AnimationManager::setAnimTimer(Animation *anim) {
 }
 
 Animation *AnimationManager::findAnimation(int animId) {
-	_animStart = _animation->getAnimation(animId);
+	_animStart = (_animation == nullptr) ? nullptr : _animation->getAnimation(animId);
 	return _animStart;
 }
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 89c8a4d0e6..b7ee4d2278 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -391,7 +391,9 @@ void Scripts::cmdCheckLoc() {
 void Scripts::cmdSetAnim() { 
 	int animId = _data->readByte();
 	Animation *anim = _vm->_animation->setAnimation(animId);
-	_vm->_animation->setAnimTimer(anim);
+
+	if (anim)
+		_vm->_animation->setAnimTimer(anim);
 }
 
 void Scripts::cmdDispInv() {
-- 
cgit v1.2.3


From 5de214dfc446a7905d48900f49e1da37871f209c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 21 Nov 2014 12:02:27 +0100
Subject: ACCESS: Implement mWhileDownRiver

---
 engines/access/amazon/amazon_scripts.cpp | 106 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |   2 +
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7272564fdb..df6b24b3c2 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -764,6 +764,110 @@ void AmazonScripts::mWhileDoOpen() {
 	}
 }
 
+void AmazonScripts::scrollRiver() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	_vm->_buffer2.plotImage(_vm->_objectsTable[33], 0, Common::Point(66, 30));
+	_vm->plotList();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void AmazonScripts::mWhileDownRiver() {
+	static const int RIVEROBJ[14][4] = {
+		{3,  77, 0, 40},
+		{2,  30, 0, 30},
+		{2, 290, 0, 50},
+		{1, 210, 0, 70},
+		{2, 350, 0, 30},
+		{1, 370, 0, 20},
+		{2, 480, 0, 60},
+		{3, 395, 0, 10},
+		{1, 550, 0, 30},
+		{2, 620, 0, 50},
+		{1, 690, 0, 10},
+		{2, 715, 0, 40},
+		{1, 770, 0, 30},
+		{3, 700, 0, 20}
+	};
+
+	_vm->_events->hideCursor();
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->clearScreen();
+	_vm->_screen->savePalette();
+
+	_vm->_files->loadScreen(95, 4);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_screen->restorePalette();
+	_vm->_screen->setPalette();
+	_vm->_screen->setBufferScan();
+	_vm->_screen->_scrollX = 0;
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+
+	// KEYFLG = 0;
+
+	_vm->_player->_scrollAmount = 2;
+	_vm->_destIn = &_vm->_buffer2;
+	_xTrack = -7;
+	_yTrack = _zTrack = 0;
+	_xCam = _yCam = 0;
+	_zCam = 80;
+
+	_game->_timers[24]._timer = 1;
+	_game->_timers[24]._initTm = 1;
+	++_game->_timers[24]._flag;
+	
+	_pNumObj = 14;
+	for (int i = 0; i <_pNumObj; i++) {
+		_pObject[i] = _vm->_objectsTable[33];
+		_pImgNum[i] = RIVEROBJ[i][0];
+		_pObjX[i] = RIVEROBJ[i][1];
+		_pObjY[i] = RIVEROBJ[i][2];
+		_pObjZ[i] = RIVEROBJ[i][3];
+		_pObjXl[i] = _pObjYl[i] = 0;
+	}
+
+	_game->_timers[3]._timer = 200;
+	_game->_timers[3]._initTm = 200;
+	++_game->_timers[3]._flag;
+	_game->_timers[4]._timer = 350;
+	_game->_timers[4]._initTm = 350;
+	++_game->_timers[4]._flag;
+
+	while(true) {
+		_vm->_images.clear();
+		_vm->_events->_vbCount = 6;
+		while ((_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth) && _vm->_events->_vbCount) {
+			jungleMove();
+			while (_vm->_screen->_scrollX >= TILE_WIDTH) {
+				_vm->_screen->_scrollX -= TILE_WIDTH;
+				++_vm->_screen->_scrollCol;
+				_vm->_buffer1.moveBufferLeft();
+				_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+			}
+
+			pan();
+			scrollRiver();
+
+			if (_game->_timers[3]._flag == 0) {
+				_game->_timers[3]._flag = 1;
+				_vm->_sound->playSound(1);
+			} else if (_game->_timers[4]._flag == 0) {
+				_game->_timers[4]._flag = 1;
+				_vm->_sound->playSound(0);
+			}
+
+			g_system->delayMillis(10);
+			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+				_vm->_events->pollEvents();
+				g_system->delayMillis(10);
+			}
+		}
+	}
+	_vm->_events->showCursor();
+}
+
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
@@ -782,7 +886,7 @@ void AmazonScripts::mWhile(int param1) {
 		mWhileDoOpen();
 		break;
 	case 6:
-		warning("TODO DOWNRIVER");
+		mWhileDownRiver();
 		break;
 	case 7:
 		mWhile2();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index d07445b7ef..06fe56a2bb 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -76,6 +76,8 @@ protected:
 	void initJWalk2();
 	void jungleMove();
 	void mWhileJWalk2();
+	void scrollRiver();
+	void mWhileDownRiver();
 	void mWhile(int param1);
 	void setVerticalCode(Common::Rect bounds);
 	void setHorizontalCode(Common::Rect bounds);
-- 
cgit v1.2.3


From e1e97ec9ff30435bee991133d8adc009d74979e5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 22 Nov 2014 00:42:04 +0100
Subject: ACCESS: Start the implementation of RIVER (WIP)

---
 engines/access/amazon/amazon_game.h      |   2 +-
 engines/access/amazon/amazon_scripts.cpp | 103 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h   |  12 +++-
 3 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index ba81a77658..f062a28dcd 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -59,7 +59,6 @@ private:
 	int _canoeYPos;
 	int _hitCount;
 	int _saveRiver;
-	int _hitSafe;
 	int _topList;
 	int _botList;
 	int _riverIndex;
@@ -109,6 +108,7 @@ public:
 	bool _charSegSwitch;
 	bool _skipStart;
 
+	int _hitSafe;
 	int _rawInactiveX;
 	int _rawInactiveY;
 	int _inactiveYOff;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index df6b24b3c2..a45e6f72bd 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1585,6 +1585,107 @@ void AmazonScripts::plotInactive() {
 
 }
 
+void AmazonScripts::initRiver() {
+	warning("TODO: initRiver()");
+}
+
+bool AmazonScripts::JUMPTEST() {
+	warning("TODO: JUMPTEST();");
+	return true;
+}
+
+void AmazonScripts::RIVERSOUND() {
+	warning("TODO: RIVERSOUND();");
+}
+
+void AmazonScripts::MOVECANOE() {
+	warning("TODO: MOVECANOE();");
+}
+
+void AmazonScripts::UPDATEOBSTACLES() {
+	warning("TODO: UPDATEOBSTACLES()");
+}
+
+void AmazonScripts::SETPHYSX() {
+	warning("TODO: SETPHYSX()");
+}
+
+void AmazonScripts::RIVERCOLLIDE() {
+	warning("TODO: RIVERCOLLIDE()");
+}
+
+void AmazonScripts::SCROLLRIVER1() {
+	warning("TODO: SCROLLRIVER1()");
+}
+
+void AmazonScripts::RIVER() {
+	static const int RIVERDEATH[5] = {22, 23, 24, 25, 26};
+
+	initRiver();
+	while (true) {
+		_vm->_events->_vbCount = 4;
+
+		int bx = _vm->_player->_scrollAmount - _screenVertX;
+		if (_vm->_screen->_scrollX == 0) {
+			_vm->_sound->midiRepeat();
+			if (JUMPTEST()) {
+				CHICKENOUTFLG = false;
+				return;
+			}
+		} else {
+			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
+		}
+
+		if (CHICKENOUTFLG) {
+			CHICKENOUTFLG = false;
+			return;
+		}
+
+		_vm->_images.clear();
+		_vm->_animation->animate(0);
+
+		RIVERSOUND();
+		pan();
+		MOVECANOE();
+
+		if (_vm->_room->_function == 1) {
+			CHICKENOUTFLG = false;
+			return;
+		}
+		
+		UPDATEOBSTACLES();
+		SETPHYSX();
+		RIVERCOLLIDE();
+		if (_game->_hitSafe != 0)
+			_game->_hitSafe -= 2;
+
+		if (_game->_hitSafe < 0) {
+			warning("TODO: cmdDead(RIVERDEATH[0]);");
+			return;
+		}
+
+		if (_game->_deathFlag) {
+			_game->_deathCount--;
+			if (_game->_deathCount == 0) {
+				warning("TODO: cmdDead(RIVERDEATH[_game->_deathType]);");
+				return;
+			}
+		}
+		
+		if (_vm->_events->_mousePos.y >= 24 && _vm->_events->_mousePos.y <= 136) {
+			_vm->_events->hideCursor();
+			SCROLLRIVER1();
+			_vm->_events->pollEvents();
+		} else
+			SCROLLRIVER1();
+
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+			_vm->_events->pollEvents();
+			g_system->delayMillis(10);
+		}
+	}
+}
+
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
@@ -1612,7 +1713,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		plotInactive();
 		break;
 	case 13:
-		warning("TODO RIVER");
+		RIVER();
 		break;
 	case 14:
 		ANT();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 06fe56a2bb..5c3fc0fb8c 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -42,7 +42,8 @@ private:
 	int _yCam;
 	int _zCam;
 	int _pNumObj;
-
+	int _screenVertX;
+	bool CHICKENOUTFLG;
 	int _pImgNum[32];
 
 	SpriteResource *_pObject[32];
@@ -94,6 +95,15 @@ protected:
 	void ANT();
 	void doCast(int param1);
 	void loadBackground(int param1, int param2);
+	void initRiver();
+	bool JUMPTEST();
+	void RIVERSOUND();
+	void MOVECANOE();
+	void UPDATEOBSTACLES();
+	void SETPHYSX();
+	void RIVERCOLLIDE();
+	void SCROLLRIVER1();
+	void RIVER();
 	void plotInactive();
 	void setInactive();
 	void boatWalls(int param1, int param2);
-- 
cgit v1.2.3


From 5cfdc983c38c6b470701be46209dacba06e537a0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 21 Nov 2014 21:34:55 -0500
Subject: ACCESS: Fix loading of animation at end of mWhileDoOpen

---
 engines/access/amazon/amazon_scripts.cpp | 9 +++++++--
 engines/access/scripts.cpp               | 6 ++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index a45e6f72bd..bb8f8a9223 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -749,7 +749,7 @@ void AmazonScripts::mWhileDoOpen() {
 	events.showCursor();
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_buffer1.copyFrom(*_vm->_screen);
-	warning("TODO: delete _roomInfo;");
+	
 	_vm->freeCells();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
@@ -757,10 +757,15 @@ void AmazonScripts::mWhileDoOpen() {
 	_vm->_images.clear();
 
 	if (_vm->_conversation == 2) {
+		// Cutscene at end of Chapter 6
 		Resource *spriteData = _vm->_files->loadFile(28, 37);
 		_vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
 		delete spriteData;
-		warning("TODO: _roomInfo = _vm->_files->loadFile(28, 38);");
+		
+		_vm->_animation->freeAnimationData();
+		animResource = _vm->_files->loadFile(28, 38);
+		_vm->_animation->loadAnimations(animResource);
+		delete animResource;
 	}
 }
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index b7ee4d2278..9268b829e7 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -595,7 +595,6 @@ void Scripts::cmdTexChoice() {
 
 	Common::Array<Common::Rect> responseCoords;
 	responseCoords.push_back(_vm->_bubbleBox->_bounds);
-	responseCoords.push_back(Common::Rect(0, 0, 0, 0));
 	_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 
 	findNull();
@@ -605,13 +604,12 @@ void Scripts::cmdTexChoice() {
 	while ((v = _data->readByte()) != 0)
 		tmpStr += (char)v;
 
-	Common::Rect termResponse2 = Common::Rect(-1, 0, 0, 0);
 	if (tmpStr.size() != 0) {
 		choice2Fl = true;
 		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 2").c_str();
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
-		responseCoords[1] = _vm->_bubbleBox->_bounds;
+		responseCoords.push_back(_vm->_bubbleBox->_bounds);
 		_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 	}
 
@@ -626,7 +624,7 @@ void Scripts::cmdTexChoice() {
 		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 3").c_str();
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
-		termResponse2 = _vm->_bubbleBox->_bounds;
+		responseCoords.push_back(_vm->_bubbleBox->_bounds);
 		_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;
 	}
 
-- 
cgit v1.2.3


From 237404fa70e0aa75c0a9803830915d01bb763d43 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 22 Nov 2014 16:59:51 +0100
Subject: ACCESS: Some more work on RIVER (still WIP)

---
 engines/access/amazon/amazon_game.cpp      |   6 +-
 engines/access/amazon/amazon_game.h        |  15 ++-
 engines/access/amazon/amazon_resources.cpp | 208 +++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |  15 +++
 engines/access/amazon/amazon_room.h        |   4 +-
 engines/access/amazon/amazon_scripts.cpp   |  84 ++++++++++++
 engines/access/amazon/amazon_scripts.h     |   1 +
 engines/access/events.cpp                  |   7 +
 engines/access/events.h                    |   3 +
 engines/access/martian/martian_room.h      |   3 +-
 engines/access/room.h                      |   4 +-
 11 files changed, 336 insertions(+), 14 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f663f03b38..396ba42148 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -775,13 +775,15 @@ void AmazonEngine::startChapter(int chapter) {
 void AmazonEngine::synchronize(Common::Serializer &s) {
 	AccessEngine::synchronize(s);
 
+	int dummy = 0;
+
 	s.syncAsSint16LE(_canoeLane);
 	s.syncAsSint16LE(_canoeYPos);
 	s.syncAsSint16LE(_hitCount);
 	s.syncAsSint16LE(_saveRiver);
 	s.syncAsSint16LE(_hitSafe);
 	s.syncAsSint16LE(_chapter);
-	s.syncAsSint16LE(_topList);
+	s.syncAsSint16LE(dummy);
 	s.syncAsSint16LE(_botList);
 	s.syncAsSint16LE(_riverIndex);
 	s.syncAsSint16LE(_rawInactiveX);
@@ -789,6 +791,8 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_inactiveYOff);
 	for (int i = 0; i < 100; ++i)
 		s.syncAsSint16LE(_esTabTable[i]);
+
+	warning("TODO: 	s.syncAsSint16LE(_topList);");
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index f062a28dcd..911ec55412 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -55,13 +55,7 @@ public:
 class AmazonEngine : public AccessEngine {
 private:
 	// Fields that are included in savegames
-	int _canoeLane;
-	int _canoeYPos;
-	int _hitCount;
-	int _saveRiver;
-	int _topList;
 	int _botList;
-	int _riverIndex;
 	int _esTabTable[100];
 
 	// Other fields
@@ -108,6 +102,13 @@ public:
 	bool _charSegSwitch;
 	bool _skipStart;
 
+	int _canoeLane;
+	int _canoeYPos;
+	int _hitCount;
+	const byte *_topList;
+	int _riverIndex;
+	int _saveRiver;
+	int _canoeDir;
 	int _hitSafe;
 	int _rawInactiveX;
 	int _rawInactiveY;
@@ -142,7 +143,7 @@ public:
 	bool _deathFlag;
 	int _deathCount;
 	int _deathType;
-	int _mapPtr;
+	byte *_mapPtr;
 	int _canoeVXPos;
 	int _canoeMoveCount;
 	int _canoeFrame;
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 925ea195a5..4df2c0c42e 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1537,5 +1537,213 @@ const int openObj[10][4] = {
 	{4, -280, 40, 120},
 };
 
+const byte MAP0[26] = {
+	0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 4, 0,
+	0, 0, 1, 0, 2, 0, 0, 1, 1, 3, 0, 0,
+	0, 0xFF
+};
+
+const byte MAP1[27] = {
+	0, 0, 1, 0, 3, 0, 0, 1, 1, 2, 0, 0,
+	0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 4, 0,
+	0, 0, 0xFF
+};
+
+const byte MAP2[32] = {
+	0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 1, 0,
+	3, 0, 0, 1, 0, 4, 0, 0, 1, 1, 2, 0,
+	0, 1, 0, 1, 0, 0, 0, 0xFF
+};
+
+const byte *MAPTBL[3] = {MAP0, MAP1, MAP2};
+
+const byte RIVER0OBJECTS[450] = {
+	16, 31, 0, 0, 25, 0, 0, 4, 12,
+	0, 16, 31, 0, 56, 24, 0, 0, 2,
+	12, 0, 17, 30, 0, 212, 23, 0, 0,
+	3, 15, 0, 16, 31, 0, 82, 23, 0,
+	0, 7, 12, 0, 17, 30, 0, 22, 23,
+	0, 0, 5, 15, 0, 17, 30, 0, 98,
+	22, 0, 0, 3, 15, 0, 16, 31, 0,
+	68, 22, 0, 0, 7, 12, 0, 255, 58,
+	1, 16, 21, 0, 0, 4, 0, 0, 17,
+	30, 0, 35, 20, 0, 0, 1, 15, 0,
+	16, 31, 0, 30, 20, 0, 0, 5, 12,
+	0, 16, 31, 0, 192, 19, 0, 0, 7,
+	12, 0, 17, 30, 0, 36, 19, 0, 0,
+	2, 15, 0, 17, 30, 0, 177, 18, 0,
+	0, 7, 15, 0, 16, 31, 0, 82, 18,
+	0, 0, 4, 12, 0, 16, 31, 0, 52,
+	18, 0, 0, 1, 12, 0, 17, 30, 0,
+	208, 17, 0, 0, 5, 15, 0, 16, 31,
+	0, 113, 17, 0, 0, 2, 12, 0, 255,
+	58, 1, 16, 16, 0, 0, 4, 0, 0,
+	17, 30, 0, 165, 15, 0, 0, 3, 15,
+	0, 16, 31, 0, 25, 15, 0, 0, 6,
+	12, 0, 17, 30, 0, 21, 14, 0, 0,
+	4, 15, 0, 16, 31, 0, 32, 13, 0,
+	0, 1, 12, 0, 17, 30, 0, 33, 12,
+	0, 0, 0, 15, 0, 16, 31, 0, 8,
+	12, 0, 0, 7, 12, 0, 17, 30, 0,
+	198, 11, 0, 0, 4, 15, 0, 16, 31,
+	0, 176, 11, 0, 0, 3, 12, 0, 16,
+	31, 0, 160, 11, 0, 0, 2, 12, 0,
+	17, 30, 0, 64, 11, 0, 0, 7, 15,
+	0, 17, 30, 0, 44, 11, 0, 0, 0,
+	15, 0, 255, 58, 1, 208, 9, 0, 0,
+	4, 0, 0, 17, 30, 0, 222, 8, 0,
+	0, 4, 15, 0, 16, 31, 0, 147, 8,
+	0, 0, 6, 12, 0, 17, 30, 0, 32,
+	7, 0, 0, 1, 15, 0, 16, 31, 0,
+	240, 6, 0, 0, 4, 12, 0, 17, 30,
+	0, 114, 6, 0, 0, 3, 15, 0, 16,
+	31, 0, 80, 6, 0, 0, 7, 12, 0,
+	17, 30, 0, 49, 6, 0, 0, 2, 15,
+	0, 255, 58, 1, 208, 4, 0, 0, 4,
+	0, 0, 17, 30, 0, 166, 4, 0, 0,
+	2, 15, 0, 16, 31, 0, 96, 4, 0,
+	0, 4, 12, 0, 17, 30, 0, 202, 3,
+	0, 0, 7, 15, 0, 16, 31, 0, 142,
+	3, 0, 0, 5, 12, 0, 17, 30, 0,
+	193, 2, 0, 0, 0, 15, 0, 16, 31,
+	0, 38, 2, 0, 0, 4, 12, 0, 17,
+	30, 0, 49, 1, 0, 0, 2, 15, 0
+};
+
+const byte ENDRIVER0[10] = {16, 31, 0, 4, 1, 0, 0, 7, 12, 0};
+
+const byte RIVER1OBJECTS[490] = {
+	16, 31, 0, 8, 27, 0, 0, 1, 12,
+	0, 16, 31, 0, 84, 26, 0, 0, 4,
+	12, 0, 17, 30, 0, 43, 26, 0, 0,
+	1, 15, 0, 16, 31, 0, 210, 25, 0,
+	0, 2, 12, 0, 17, 30, 0, 95, 25,
+	0, 0, 6, 15, 0, 17, 30, 0, 241,
+	24, 0, 0, 4, 15, 0, 16, 31, 0,
+	206, 24, 0, 0, 1, 12, 0, 17, 30,
+	0, 36, 24, 0, 0, 0, 15, 0, 255,
+	58, 1, 144, 23, 0, 0, 4, 0, 0,
+	16, 31, 0, 168, 22, 0, 0, 3, 12,
+	0, 17, 30, 0, 158, 22, 0, 0, 6,
+	15, 0, 16, 31, 0, 154, 21, 0, 0,
+	4, 12, 0, 16, 31, 0, 124, 21, 0,
+	0, 7, 12, 0, 17, 30, 0, 119, 21,
+	0, 0, 1, 15, 0, 17, 30, 0, 0,
+	21, 0, 0, 0, 15, 0, 16, 31, 0,
+	208, 20, 0, 0, 7, 12, 0, 17, 30,
+	0, 128, 20, 0, 0, 2, 15, 0, 16,
+	31, 0, 128, 20, 0, 0, 6, 12, 0,
+	255, 58, 1, 144, 18, 0, 0, 4, 0,
+	0, 17, 30, 0, 80, 17, 0, 0, 2,
+	15, 0, 16, 31, 0, 80, 17, 0, 0,
+	7, 12, 0, 16, 31, 0, 32, 17, 0,
+	0, 2, 12, 0, 17, 30, 0, 16, 17,
+	0, 0, 5, 15, 0, 16, 31, 0, 240,
+	16, 0, 0, 4, 12, 0, 17, 30, 0,
+	89, 16, 0, 0, 1, 15, 0, 16, 31,
+	0, 29, 16, 0, 0, 3, 12, 0, 17,
+	30, 0, 233, 14, 0, 0, 7, 15, 0,
+	16, 31, 0, 28, 14, 0, 0, 4, 12,
+	0, 16, 31, 0, 32, 13, 0, 0, 5,
+	12, 0, 16, 31, 0, 193, 12, 0, 0,
+	7, 12, 0, 17, 30, 0, 128, 12, 0,
+	0, 1, 15, 0, 17, 30, 0, 240, 11,
+	0, 0, 6, 15, 0, 255, 58, 1, 16,
+	11, 0, 0, 4, 0, 0, 16, 31, 0,
+	180, 10, 0, 0, 3, 12, 0, 17, 30,
+	0, 134, 10, 0, 0, 6, 15, 0, 16,
+	31, 0, 151, 9, 0, 0, 0, 12, 0,
+	17, 30, 0, 237, 8, 0, 0, 5, 15,
+	0, 16, 31, 0, 212, 8, 0, 0, 2,
+	12, 0, 16, 31, 0, 112, 7, 0, 0,
+	5, 12, 0, 17, 30, 0, 16, 7, 0,
+	0, 1, 15, 0, 16, 31, 0, 208, 6,
+	0, 0, 7, 12, 0, 17, 30, 0, 160,
+	6, 0, 0, 4, 15, 0, 16, 31, 0,
+	32, 6, 0, 0, 2, 12, 0, 255, 58,
+	1, 208, 4, 0, 0, 4, 0, 0, 17,
+	30, 0, 202, 3, 0, 0, 4, 15, 0,
+	16, 31, 0, 142, 3, 0, 0, 7, 12,
+	0, 17, 30, 0, 193, 2, 0, 0, 0,
+	15, 0, 16, 31, 0, 38, 2, 0, 0,
+	6, 12, 0, 17, 30, 0, 49, 1, 0,
+	0, 3, 15, 0
+};
+
+const byte ENDRIVER1[10] = {
+	16, 31, 0, 4, 1, 0, 0, 1, 12, 0
+};
+
+const byte RIVER2OBJECTS[530] = {
+	16, 31, 0, 38, 32, 0, 0, 6, 12,
+	0, 16, 31, 0, 179, 31, 0, 0, 7,
+	12, 0, 17, 30, 0, 19, 31, 0, 0,
+	4, 15, 0, 16, 31, 0, 210, 30, 0,
+	0, 0, 12, 0, 16, 31, 0, 192, 29,
+	0, 0, 2, 12, 0, 17, 30, 0, 48,
+	29, 0, 0, 5, 15, 0, 16, 31, 0,
+	1, 29, 0, 0, 4, 12, 0, 17, 30,
+	0, 192, 28, 0, 0, 1, 15, 0, 16,
+	31, 0, 160, 28, 0, 0, 6, 12, 0,
+	255, 58, 1, 80, 27, 0, 0, 4, 0,
+	0, 16, 31, 0, 64, 26, 0, 0, 3,
+	12, 0, 17, 30, 0, 44, 26, 0, 0,
+	6, 15, 0, 16, 31, 0, 118, 25, 0,
+	0, 2, 12, 0, 17, 30, 0, 81, 24,
+	0, 0, 5, 15, 0, 16, 31, 0, 56,
+	24, 0, 0, 2, 12, 0, 17, 30, 0,
+	102, 23, 0, 0, 1, 15, 0, 16, 31,
+	0, 72, 23, 0, 0, 7, 12, 0, 16,
+	31, 0, 68, 22, 0, 0, 2, 12, 0,
+	17, 30, 0, 18, 22, 0, 0, 4, 15,
+	0, 16, 31, 0, 192, 21, 0, 0, 5,
+	12, 0, 17, 30, 0, 112, 21, 0, 0,
+	6, 15, 0, 255, 58, 1, 208, 19, 0,
+	0, 4, 0, 0, 17, 30, 0, 217, 18,
+	0, 0, 4, 15, 0, 16, 31, 0, 174,
+	18, 0, 0, 2, 12, 0, 17, 30, 0,
+	52, 18, 0, 0, 5, 15, 0, 16, 31,
+	0, 158, 17, 0, 0, 7, 12, 0, 16,
+	31, 0, 143, 17, 0, 0, 1, 12, 0,
+	17, 30, 0, 154, 16, 0, 0, 2, 15,
+	0, 16, 31, 0, 99, 16, 0, 0, 4,
+	12, 0, 255, 58, 1, 208, 14, 0, 0,
+	4, 0, 0, 17, 30, 0, 16, 14, 0,
+	0, 3, 15, 0, 16, 31, 0, 142, 13,
+	0, 0, 5, 12, 0, 16, 31, 0, 94,
+	13, 0, 0, 2, 12, 0, 17, 30, 0,
+	98, 12, 0, 0, 6, 15, 0, 16, 31,
+	0, 144, 11, 0, 0, 4, 12, 0, 17,
+	30, 0, 139, 11, 0, 0, 7, 15, 0,
+	255, 58, 1, 208, 9, 0, 0, 4, 0,
+	0, 17, 30, 0, 111, 9, 0, 0, 1,
+	15, 0, 16, 31, 0, 14, 9, 0, 0,
+	0, 12, 0, 17, 30, 0, 227, 8, 0,
+	0, 2, 15, 0, 16, 31, 0, 222, 8,
+	0, 0, 6, 12, 0, 17, 30, 0, 234,
+	7, 0, 0, 3, 15, 0, 16, 31, 0,
+	208, 7, 0, 0, 0, 12, 0, 16, 31,
+	0, 48, 7, 0, 0, 3, 12, 0, 17,
+	30, 0, 3, 7, 0, 0, 7, 15, 0,
+	16, 31, 0, 98, 6, 0, 0, 5, 12,
+	0, 17, 30, 0, 94, 6, 0, 0, 1,
+	15, 0, 255, 58, 1, 208, 4, 0, 0,
+	4, 0, 0, 17, 30, 0, 202, 3, 0,
+	0, 2, 15, 0, 16, 31, 0, 142, 3,
+	0, 0, 5, 12, 0, 17, 30, 0, 193,
+	2, 0, 0, 0, 15, 0, 16, 31, 0,
+	38, 2, 0, 0, 4, 12, 0, 17, 30,
+	0, 49, 1, 0, 0, 3, 15, 0
+};
+
+const byte ENDRIVER2[10] = {
+	16, 31, 0, 4, 1, 0, 0, 6, 12, 0
+};
+
+const byte *RIVEROBJECTTBL[6] = {
+	RIVER0OBJECTS, ENDRIVER0, RIVER1OBJECTS, 
+	ENDRIVER1, RIVER2OBJECTS, ENDRIVER2
+};
+
 } // End of namespace Amazon
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 434a0f37db..f7e1b0371b 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -83,6 +83,21 @@ extern const int TORCH[12];
 extern const int SPEAR[3];
 
 extern const int openObj[10][4];
+
+extern const byte MAP0[26];
+extern const byte MAP1[27];
+extern const byte MAP2[32];
+
+extern const byte *MAPTBL[3];
+
+extern const byte RIVER0OBJECTS[450];
+extern const byte ENDRIVER0[10];
+extern const byte RIVER1OBJECTS[490];
+extern const byte ENDRIVER1[10];
+extern const byte RIVER2OBJECTS[530];
+extern const byte ENDRIVER2[10];
+
+extern const byte *RIVEROBJECTTBL[6];
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index ccace1ea45..6b89a8f348 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -50,8 +50,6 @@ protected:
 
 	virtual void setupRoom();
 
-	virtual void roomMenu();
-
 	virtual void mainAreaClick();
 
 public:
@@ -60,6 +58,8 @@ public:
 	virtual ~AmazonRoom();
 
 	virtual void init4Quads();
+	
+	virtual void roomMenu();
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index bb8f8a9223..2d462616db 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1590,8 +1590,92 @@ void AmazonScripts::plotInactive() {
 
 }
 
+void AmazonScripts::SETRIVERPAN() {
+	warning("TODO: SETRIVERPAN");
+}
+
 void AmazonScripts::initRiver() {
 	warning("TODO: initRiver()");
+
+	static const int RIVERVXTBL[3] = {6719, 7039, 8319};
+
+	_vm->_events->centerMousePos();
+	_vm->_events->restrictMouse();
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->clearScreen();
+	_vm->_screen->savePalette();
+	_vm->_screen->forceFadeOut();
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(95, 4);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+
+	_vm->_screen->restorePalette();
+	_vm->_screen->setBufferScan();
+	_vm->_destIn = &_vm->_buffer2;
+	_vm->_room->roomMenu();
+
+	if (_game->_saveRiver == 1) {
+		_vm->_screen->_scrollRow = _vm->_rScrollRow;
+		_vm->_screen->_scrollCol = _vm->_rScrollCol;
+		_vm->_screen->_scrollX = _vm->_rScrollX;
+		_vm->_screen->_scrollY = _vm->_rScrollY;
+	} else {
+		_vm->_screen->_scrollRow = 0;
+		_vm->_screen->_scrollCol = 140;
+		_vm->_screen->_scrollX = 0;
+		_vm->_screen->_scrollY = 0;
+	}
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->forceFadeIn();
+	if (_game->_saveRiver == 1) {
+		_vm->_oldRects.resize(_vm->_rOldRectCount);
+		_vm->_newRects.resize(_vm->_rNewRectCount);
+		// KEYFLG = _vm->_rKeyFlag
+	} else {
+		_vm->_oldRects.clear();
+		_vm->_newRects.clear();
+		// KEYFLG = 0
+	}
+
+	_vm->_player->_scrollAmount = 2;
+	SETRIVERPAN();
+	_game->_timers[3]._timer = 1;
+	_game->_timers[3]._initTm = 1;
+	++_game->_timers[3]._flag;
+
+	_game->_canoeFrame = 0;
+	_game->_mapPtr = (byte *)MAPTBL[_game->_riverFlag] + 1;
+	if (_game->_saveRiver == 1) {
+		_game->_mapPtr--;
+		_game->_mapPtr += _game->_mapOffset;
+	} else {
+		_screenVertX = RIVERVXTBL[_game->_riverFlag] - 320;
+		_game->_canoeLane = 3;
+		_game->_hitCount = 0;
+		_game->_hitSafe = 0;
+		_game->_canoeYPos = 71;
+	}
+
+	_game->_riverIndex = _game->_riverFlag;
+	_game->_topList = RIVEROBJECTTBL[_game->_riverIndex];
+	UPDATEOBSTACLES();
+	SETPHYSX();
+	_game->_canoeDir = 0;
+	_game->_deathFlag = 0;
+	_game->_deathCount = 0;
+
+	_game->_timers[11]._timer = 1200;
+	_game->_timers[11]._initTm = 1200;
+	++_game->_timers[11]._flag;
+	_game->_timers[12]._timer = 1500;
+	_game->_timers[12]._initTm = 1500;
+	++_game->_timers[12]._flag;
+	
+	_game->_maxHits = 2 - _game->_riverFlag;
+	_game->_saveRiver = 0;
 }
 
 bool AmazonScripts::JUMPTEST() {
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 5c3fc0fb8c..703e0b8497 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -103,6 +103,7 @@ protected:
 	void SETPHYSX();
 	void RIVERCOLLIDE();
 	void SCROLLRIVER1();
+	void SETRIVERPAN();
 	void RIVER();
 	void plotInactive();
 	void setInactive();
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index ac07a7579f..fd432573e4 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -273,5 +273,12 @@ bool EventsManager::isKeyMousePressed() {
 	return result;
 }
 
+void EventsManager::centerMousePos() {
+	_mousePos = Common::Point(160, 100);
+}
+
+void EventsManager::restrictMouse() {
+	warning("TODO: restrictMouse");
+}
 
 } // End of namespace Access
diff --git a/engines/access/events.h b/engines/access/events.h
index 4888a27593..d73f76af49 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -126,6 +126,9 @@ public:
 	int checkMouseBox1(Common::Array<Common::Rect> &rects);
 
 	bool isKeyMousePressed();
+
+	void centerMousePos();
+	void restrictMouse();
 };
 
 } // End of namespace Access
diff --git a/engines/access/martian/martian_room.h b/engines/access/martian/martian_room.h
index 14744f5311..85529ce8f0 100644
--- a/engines/access/martian/martian_room.h
+++ b/engines/access/martian/martian_room.h
@@ -46,8 +46,6 @@ protected:
 
 	virtual void reloadRoom1();
 
-	virtual void roomMenu();
-
 	virtual void mainAreaClick();
 public:
 	MartianRoom(AccessEngine *vm);
@@ -58,6 +56,7 @@ public:
 
 	virtual void init4Quads() { }
 
+	virtual void roomMenu();
 };
 
 } // End of namespace Martian
diff --git a/engines/access/room.h b/engines/access/room.h
index 6c8b040593..9b3136630e 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -116,8 +116,6 @@ protected:
 
 	virtual void doCommands();
 
-	virtual void roomMenu() = 0;
-
 	virtual void mainAreaClick() = 0;
 public:
 	Plotter _plotter;
@@ -141,6 +139,8 @@ public:
 
 	virtual void loadRoom(int roomNumber) = 0;
 
+	virtual void roomMenu() = 0;
+
 	/**
 	 * Clear all the data used by the room
 	 */
-- 
cgit v1.2.3


From 1d70d61d2b9935c3d64711757e9da67091ba0bc2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 22 Nov 2014 18:11:56 +0100
Subject: ACCESS: Implement setRiverPan

---
 engines/access/amazon/amazon_scripts.cpp | 54 +++++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  2 +-
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 2d462616db..d3377f97a5 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1590,13 +1590,57 @@ void AmazonScripts::plotInactive() {
 
 }
 
-void AmazonScripts::SETRIVERPAN() {
-	warning("TODO: SETRIVERPAN");
+void AmazonScripts::setRiverPan() {
+	static const int RIVER1OBJ[23][4] = {
+		{18,   -77,  0, 30},
+		{18,  -325,  0, 20},
+		{18,  -450,  0, 15},
+		{18, -1250,  0, 25},
+		{19,  -130,  0, 20},
+		{19,  -410,  0, 15},
+		{19,  -710,  0, 25},
+		{19, -1510,  0, 20},
+		{20,  -350,  0, 30},
+		{20,  -695,  0, 25},
+		{20,  -990,  0, 20},
+		{20, -1300,  0, 25},
+		{20, -1600,  0, 30},
+		{21,  -370,  0, 20},
+		{21,  -650,  0, 30},
+		{21, -1215,  0, 40},
+		{21, -1815,  0, 35},
+		{22,  -380,  0, 25},
+		{22,  -720,  0, 35},
+		{22, -1020,  0, 30},
+		{22, -1170,  0, 25},
+		{22, -1770,  0, 35},
+		{23,  -500, 63, 20}
+	};
+
+	int delta = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+
+	_xTrack = 9;
+	_yTrack = _zTrack = 0;
+	_xCam = 160;
+	_yCam = 0;
+	_zCam = 80;
+
+	_game->_timers[24]._timer = 1;
+	_game->_timers[24]._initTm = 1;
+	++_game->_timers[24]._flag;
+
+	_pNumObj = 23;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pObject[i] = _vm->_objectsTable[45];
+		_pImgNum[i] = RIVER1OBJ[i][0];
+		_pObjX[i] = RIVER1OBJ[i][1] + delta;
+		_pObjY[i] = RIVER1OBJ[i][2];
+		_pObjZ[i] = RIVER1OBJ[i][3];
+		_pObjXl[i] = _pObjYl[i] = 0;
+	}
 }
 
 void AmazonScripts::initRiver() {
-	warning("TODO: initRiver()");
-
 	static const int RIVERVXTBL[3] = {6719, 7039, 8319};
 
 	_vm->_events->centerMousePos();
@@ -1641,7 +1685,7 @@ void AmazonScripts::initRiver() {
 	}
 
 	_vm->_player->_scrollAmount = 2;
-	SETRIVERPAN();
+	setRiverPan();
 	_game->_timers[3]._timer = 1;
 	_game->_timers[3]._initTm = 1;
 	++_game->_timers[3]._flag;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 703e0b8497..08ad23d0f6 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -103,7 +103,7 @@ protected:
 	void SETPHYSX();
 	void RIVERCOLLIDE();
 	void SCROLLRIVER1();
-	void SETRIVERPAN();
+	void setRiverPan();
 	void RIVER();
 	void plotInactive();
 	void setInactive();
-- 
cgit v1.2.3


From 1d60368724198d9c5fd201ab628ef46d285bb73b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 22 Nov 2014 19:24:33 -0500
Subject: ACCESS: Tweaks to mWhileDoOpen and fixes to pan method

---
 engines/access/amazon/amazon_resources.cpp |  3 ++-
 engines/access/amazon/amazon_resources.h   |  3 ++-
 engines/access/amazon/amazon_scripts.cpp   | 30 ++++++++++++++++++------------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 4df2c0c42e..ead6410bec 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1524,7 +1524,7 @@ const int TORCH[12] = {
 
 const int SPEAR[3] = {30, -13, 1};
 
-const int openObj[10][4] = {
+const int OPENING_OBJS[10][4] = {
 	{8, -80, 120, 30},
 	{13, 229, 0, 50},
 	{12, 78, 0, 50},
@@ -1746,4 +1746,5 @@ const byte *RIVEROBJECTTBL[6] = {
 };
 
 } // End of namespace Amazon
+
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index f7e1b0371b..b29bdab2c3 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -82,7 +82,7 @@ extern const int TORCH[12];
 
 extern const int SPEAR[3];
 
-extern const int openObj[10][4];
+extern const int OPENING_OBJS[10][4];
 
 extern const byte MAP0[26];
 extern const byte MAP1[27];
@@ -98,6 +98,7 @@ extern const byte RIVER2OBJECTS[530];
 extern const byte ENDRIVER2[10];
 
 extern const byte *RIVEROBJECTTBL[6];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d3377f97a5..d4018c2def 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -425,9 +425,12 @@ void AmazonScripts::pan() {
 		for (int i = 0; i < _pNumObj; i++) {
 			_pObjZ[i] += _zTrack;
 			_pObjXl[i] += (_pObjZ[i] * tx) & 0xff;
-			_pObjX[i] += (_pObjZ[i] * tx) >> 8;
+			_pObjX[i] += (_pObjZ[i] * tx) >> 8 + (_pObjXl[i] >> 8);
+			_pObjXl[i] &= 0xff;
+
 			_pObjYl[i] += (_pObjZ[i] * ty) & 0xff;
-			_pObjY[i] += (_pObjZ[i] * ty) >> 8;
+			_pObjY[i] += (_pObjZ[i] * ty) >> 8 + (_pObjYl[i] >> 8);
+			_pObjYl[i] &= 0xff;
 		}
 	}
 
@@ -435,7 +438,7 @@ void AmazonScripts::pan() {
 		ImageEntry ie;
 		ie._flags= 8;
 		ie._position = Common::Point(_pObjX[i], _pObjY[i]);
-		ie._offsetY = 0xFF;
+		ie._offsetY = 255;
 		ie._spritesPtr = _pObject[i];
 		ie._frameNumber = _pImgNum[i];
 
@@ -666,16 +669,16 @@ void AmazonScripts::mWhileDoOpen() {
 	screen.forceFadeOut();
 	_game->_skipStart = false;
 	if (_vm->_conversation != 2) {
+		// Cutscene at start of chapter 1
 		screen.setPanel(3);
 		_game->startChapter(1);
 		_game->establishCenter(0, 1);
 	}
 
 	Resource *data = _vm->_files->loadFile(1, 0);
-	SpriteResource *spr = new SpriteResource(_vm, data);
+	_vm->_objectsTable[1] = new SpriteResource(_vm, data);
 	delete data;
 
-	_vm->_objectsTable[1] = spr;
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(1, 2);
 	_vm->_buffer2.copyFrom(*_vm->_screen);
@@ -698,10 +701,10 @@ void AmazonScripts::mWhileDoOpen() {
 
 	for (int i = 0; i < _pNumObj; i++) {
 		_pObject[i] = _vm->_objectsTable[1];
-		_pImgNum[i] = openObj[i][0];
-		_pObjX[i] = openObj[i][1];
-		_pObjY[i] = openObj[i][2];
-		_pObjZ[i] = openObj[i][3];
+		_pImgNum[i] = OPENING_OBJS[i][0];
+		_pObjX[i] = OPENING_OBJS[i][1];
+		_pObjY[i] = OPENING_OBJS[i][2];
+		_pObjZ[i] = OPENING_OBJS[i][3];
 		_pObjXl[i] = _pObjYl[i] = 0;
 	}
 
@@ -727,11 +730,14 @@ void AmazonScripts::mWhileDoOpen() {
 			startFl = true;
 			screen.forceFadeIn();
 		}
-		events.pollEvents();
-		warning("TODO: check on KEYBUFCNT");
-		if (events._leftButton || events._rightButton) {
+
+		events.pollEvents();		
+		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
 			_game->_skipStart = true;
 			_vm->_sound->newMusic(10, 1);
+
+			events.debounceLeft();
+			events.zeroKeys();
 			break;
 		}
 
-- 
cgit v1.2.3


From 30f602b6cb265000d4ac95e645598d324e3d5d49 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 22 Nov 2014 22:17:39 -0500
Subject: ACCESS: Further fixes for panning

---
 engines/access/access.cpp                | 10 +++++-----
 engines/access/access.h                  |  2 +-
 engines/access/amazon/amazon_scripts.cpp | 11 +++++++----
 engines/access/asurface.h                |  2 ++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index b309e92b29..e87b647b59 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -72,7 +72,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleT1 = 0;
 	_scaleMaxY = 0;
 	_scaleI = 0;
-	_scaleFlag = false;
+	_imgUnscaled = false;
 	_canSaveLoad = false;
 	_eseg = nullptr;
 
@@ -351,13 +351,13 @@ void AccessEngine::plotList1() {
 	for (uint idx = 0; idx < _images.size(); ++idx) {
 		ImageEntry &ie = _images[idx];
 
-		_scaleFlag = (ie._flags & 8) != 0;
+		_imgUnscaled = (ie._flags & IMGFLAG_UNSCALED) != 0;
 		Common::Point pt = ie._position - _screen->_bufferStart;
 		SpriteResource *sprites = ie._spritesPtr;
 		SpriteFrame *frame = sprites->getFrame(ie._frameNumber);
 
 		Common::Rect bounds(pt.x, pt.y, pt.x + frame->w, pt.y + frame->h);
-		if (!_scaleFlag) {
+		if (!_imgUnscaled) {
 			bounds.setWidth(_screen->_scaleTable1[frame->w]);
 			bounds.setHeight(_screen->_scaleTable1[frame->h]);
 		}
@@ -376,7 +376,7 @@ void AccessEngine::plotList1() {
 
 			_newRects.push_back(bounds);
 
-			if (!_scaleFlag) {
+			if (!_imgUnscaled) {
 				_buffer2._rightSkip /= _scale;
 				bounds.setWidth(bounds.width() / _scale);
 
@@ -386,7 +386,7 @@ void AccessEngine::plotList1() {
 					_buffer2.sPlotF(frame, destBounds);
 				}
 			} else {
-				if (ie._flags & 2) {
+				if (ie._flags & IMGFLAG_BACKWARDS) {
 					_buffer2.plotB(frame, Common::Point(destBounds.left, destBounds.top));
 				} else {
 					_buffer2.plotF(frame, Common::Point(destBounds.left, destBounds.top));
diff --git a/engines/access/access.h b/engines/access/access.h
index 36951c7504..805abcce02 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -189,7 +189,7 @@ public:
 	int _scaleT1;
 	int _scaleMaxY;
 	int _scaleI;
-	bool _scaleFlag;
+	bool _imgUnscaled;
 	bool _canSaveLoad;
 
 	Resource *_eseg;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d4018c2def..4d354017c6 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -425,11 +425,11 @@ void AmazonScripts::pan() {
 		for (int i = 0; i < _pNumObj; i++) {
 			_pObjZ[i] += _zTrack;
 			_pObjXl[i] += (_pObjZ[i] * tx) & 0xff;
-			_pObjX[i] += (_pObjZ[i] * tx) >> 8 + (_pObjXl[i] >> 8);
+			_pObjX[i] += ((_pObjZ[i] * tx) >> 8) + (_pObjXl[i] >> 8);
 			_pObjXl[i] &= 0xff;
 
 			_pObjYl[i] += (_pObjZ[i] * ty) & 0xff;
-			_pObjY[i] += (_pObjZ[i] * ty) >> 8 + (_pObjYl[i] >> 8);
+			_pObjY[i] += ((_pObjZ[i] * ty) >> 8) + (_pObjYl[i] >> 8);
 			_pObjYl[i] &= 0xff;
 		}
 	}
@@ -697,8 +697,9 @@ void AmazonScripts::mWhileDoOpen() {
 	_zCam = 270;
 	_vm->_timers[24]._timer = _vm->_timers[24]._initTm = 1;
 	++_vm->_timers[24]._flag;
-	_pNumObj = 10;
+	_vm->_timers.updateTimers();
 
+	_pNumObj = 10;
 	for (int i = 0; i < _pNumObj; i++) {
 		_pObject[i] = _vm->_objectsTable[1];
 		_pImgNum[i] = OPENING_OBJS[i][0];
@@ -731,7 +732,9 @@ void AmazonScripts::mWhileDoOpen() {
 			screen.forceFadeIn();
 		}
 
-		events.pollEvents();		
+		events.pollEvents();
+		g_system->delayMillis(10);
+
 		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
 			_game->_skipStart = true;
 			_vm->_sound->newMusic(10, 1);
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index d066589f84..1c30db8915 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -131,6 +131,8 @@ public:
 	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
 };
 
+enum ImageFlag { IMGFLAG_BACKWARDS = 2, IMGFLAG_UNSCALED = 8 };
+
 class ImageEntry {
 public:
 	int _frameNumber;
-- 
cgit v1.2.3


From c1b3db90c49de5c2925cf65dfa49889dd2941164 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 14:56:18 +0100
Subject: ACCESS: Implement riverSound

---
 engines/access/amazon/amazon_scripts.cpp | 18 +++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 4d354017c6..61387687b6 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1733,11 +1733,23 @@ void AmazonScripts::initRiver() {
 
 bool AmazonScripts::JUMPTEST() {
 	warning("TODO: JUMPTEST();");
+
 	return true;
 }
 
-void AmazonScripts::RIVERSOUND() {
-	warning("TODO: RIVERSOUND();");
+void AmazonScripts::riverSound() {
+	if (_game->_timers[11]._flag == 0) {
+		++_game->_timers[11]._flag;
+		_vm->_sound->playSound(2);
+	}
+
+	if (_game->_timers[12]._flag == 0) {
+		++_game->_timers[12]._flag;
+		_vm->_sound->playSound(3);
+	}
+
+	if ((_xCam >= 1300) && (_xCam <= 1320))
+		_vm->_sound->playSound(1);
 }
 
 void AmazonScripts::MOVECANOE() {
@@ -1786,7 +1798,7 @@ void AmazonScripts::RIVER() {
 		_vm->_images.clear();
 		_vm->_animation->animate(0);
 
-		RIVERSOUND();
+		riverSound();
 		pan();
 		MOVECANOE();
 
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 08ad23d0f6..7162bab057 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -97,7 +97,7 @@ protected:
 	void loadBackground(int param1, int param2);
 	void initRiver();
 	bool JUMPTEST();
-	void RIVERSOUND();
+	void riverSound();
 	void MOVECANOE();
 	void UPDATEOBSTACLES();
 	void SETPHYSX();
-- 
cgit v1.2.3


From 7fbd145f5db82c002a213f57de8839c4decdc427 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 14:57:37 +0100
Subject: ACCESS: Use a new structure instead of a byte array for River Objects

---
 engines/access/amazon/amazon_game.cpp      |   7 +-
 engines/access/amazon/amazon_game.h        |   4 +-
 engines/access/amazon/amazon_resources.cpp | 347 ++++++++++++++---------------
 engines/access/amazon/amazon_resources.h   |  23 +-
 4 files changed, 185 insertions(+), 196 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 396ba42148..def64f2f88 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -48,8 +48,8 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_hitSafe = 0;
 	_oldTitleChapter = _chapter = 0;
 	_updateChapter = -1;
-	_topList = 0;
-	_botList = 0;
+	_topList = nullptr;
+	_botList = nullptr;
 	_riverIndex = 0;
 	_rawInactiveX = 0;
 	_rawInactiveY = 0;
@@ -784,7 +784,7 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_hitSafe);
 	s.syncAsSint16LE(_chapter);
 	s.syncAsSint16LE(dummy);
-	s.syncAsSint16LE(_botList);
+	s.syncAsSint16LE(dummy);
 	s.syncAsSint16LE(_riverIndex);
 	s.syncAsSint16LE(_rawInactiveX);
 	s.syncAsSint16LE(_rawInactiveY);
@@ -793,6 +793,7 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 		s.syncAsSint16LE(_esTabTable[i]);
 
 	warning("TODO: 	s.syncAsSint16LE(_topList);");
+	warning("TODO: 	s.syncAsSint16LE(_botList);");
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 911ec55412..3b8b98101e 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -55,7 +55,6 @@ public:
 class AmazonEngine : public AccessEngine {
 private:
 	// Fields that are included in savegames
-	int _botList;
 	int _esTabTable[100];
 
 	// Other fields
@@ -105,7 +104,8 @@ public:
 	int _canoeLane;
 	int _canoeYPos;
 	int _hitCount;
-	const byte *_topList;
+	const RiverStruct *_topList;
+	const RiverStruct *_botList;
 	int _riverIndex;
 	int _saveRiver;
 	int _canoeDir;
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index ead6410bec..192af2c9b6 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1557,190 +1557,169 @@ const byte MAP2[32] = {
 
 const byte *MAPTBL[3] = {MAP0, MAP1, MAP2};
 
-const byte RIVER0OBJECTS[450] = {
-	16, 31, 0, 0, 25, 0, 0, 4, 12,
-	0, 16, 31, 0, 56, 24, 0, 0, 2,
-	12, 0, 17, 30, 0, 212, 23, 0, 0,
-	3, 15, 0, 16, 31, 0, 82, 23, 0,
-	0, 7, 12, 0, 17, 30, 0, 22, 23,
-	0, 0, 5, 15, 0, 17, 30, 0, 98,
-	22, 0, 0, 3, 15, 0, 16, 31, 0,
-	68, 22, 0, 0, 7, 12, 0, 255, 58,
-	1, 16, 21, 0, 0, 4, 0, 0, 17,
-	30, 0, 35, 20, 0, 0, 1, 15, 0,
-	16, 31, 0, 30, 20, 0, 0, 5, 12,
-	0, 16, 31, 0, 192, 19, 0, 0, 7,
-	12, 0, 17, 30, 0, 36, 19, 0, 0,
-	2, 15, 0, 17, 30, 0, 177, 18, 0,
-	0, 7, 15, 0, 16, 31, 0, 82, 18,
-	0, 0, 4, 12, 0, 16, 31, 0, 52,
-	18, 0, 0, 1, 12, 0, 17, 30, 0,
-	208, 17, 0, 0, 5, 15, 0, 16, 31,
-	0, 113, 17, 0, 0, 2, 12, 0, 255,
-	58, 1, 16, 16, 0, 0, 4, 0, 0,
-	17, 30, 0, 165, 15, 0, 0, 3, 15,
-	0, 16, 31, 0, 25, 15, 0, 0, 6,
-	12, 0, 17, 30, 0, 21, 14, 0, 0,
-	4, 15, 0, 16, 31, 0, 32, 13, 0,
-	0, 1, 12, 0, 17, 30, 0, 33, 12,
-	0, 0, 0, 15, 0, 16, 31, 0, 8,
-	12, 0, 0, 7, 12, 0, 17, 30, 0,
-	198, 11, 0, 0, 4, 15, 0, 16, 31,
-	0, 176, 11, 0, 0, 3, 12, 0, 16,
-	31, 0, 160, 11, 0, 0, 2, 12, 0,
-	17, 30, 0, 64, 11, 0, 0, 7, 15,
-	0, 17, 30, 0, 44, 11, 0, 0, 0,
-	15, 0, 255, 58, 1, 208, 9, 0, 0,
-	4, 0, 0, 17, 30, 0, 222, 8, 0,
-	0, 4, 15, 0, 16, 31, 0, 147, 8,
-	0, 0, 6, 12, 0, 17, 30, 0, 32,
-	7, 0, 0, 1, 15, 0, 16, 31, 0,
-	240, 6, 0, 0, 4, 12, 0, 17, 30,
-	0, 114, 6, 0, 0, 3, 15, 0, 16,
-	31, 0, 80, 6, 0, 0, 7, 12, 0,
-	17, 30, 0, 49, 6, 0, 0, 2, 15,
-	0, 255, 58, 1, 208, 4, 0, 0, 4,
-	0, 0, 17, 30, 0, 166, 4, 0, 0,
-	2, 15, 0, 16, 31, 0, 96, 4, 0,
-	0, 4, 12, 0, 17, 30, 0, 202, 3,
-	0, 0, 7, 15, 0, 16, 31, 0, 142,
-	3, 0, 0, 5, 12, 0, 17, 30, 0,
-	193, 2, 0, 0, 0, 15, 0, 16, 31,
-	0, 38, 2, 0, 0, 4, 12, 0, 17,
-	30, 0, 49, 1, 0, 0, 2, 15, 0
-};
-
-const byte ENDRIVER0[10] = {16, 31, 0, 4, 1, 0, 0, 7, 12, 0};
-
-const byte RIVER1OBJECTS[490] = {
-	16, 31, 0, 8, 27, 0, 0, 1, 12,
-	0, 16, 31, 0, 84, 26, 0, 0, 4,
-	12, 0, 17, 30, 0, 43, 26, 0, 0,
-	1, 15, 0, 16, 31, 0, 210, 25, 0,
-	0, 2, 12, 0, 17, 30, 0, 95, 25,
-	0, 0, 6, 15, 0, 17, 30, 0, 241,
-	24, 0, 0, 4, 15, 0, 16, 31, 0,
-	206, 24, 0, 0, 1, 12, 0, 17, 30,
-	0, 36, 24, 0, 0, 0, 15, 0, 255,
-	58, 1, 144, 23, 0, 0, 4, 0, 0,
-	16, 31, 0, 168, 22, 0, 0, 3, 12,
-	0, 17, 30, 0, 158, 22, 0, 0, 6,
-	15, 0, 16, 31, 0, 154, 21, 0, 0,
-	4, 12, 0, 16, 31, 0, 124, 21, 0,
-	0, 7, 12, 0, 17, 30, 0, 119, 21,
-	0, 0, 1, 15, 0, 17, 30, 0, 0,
-	21, 0, 0, 0, 15, 0, 16, 31, 0,
-	208, 20, 0, 0, 7, 12, 0, 17, 30,
-	0, 128, 20, 0, 0, 2, 15, 0, 16,
-	31, 0, 128, 20, 0, 0, 6, 12, 0,
-	255, 58, 1, 144, 18, 0, 0, 4, 0,
-	0, 17, 30, 0, 80, 17, 0, 0, 2,
-	15, 0, 16, 31, 0, 80, 17, 0, 0,
-	7, 12, 0, 16, 31, 0, 32, 17, 0,
-	0, 2, 12, 0, 17, 30, 0, 16, 17,
-	0, 0, 5, 15, 0, 16, 31, 0, 240,
-	16, 0, 0, 4, 12, 0, 17, 30, 0,
-	89, 16, 0, 0, 1, 15, 0, 16, 31,
-	0, 29, 16, 0, 0, 3, 12, 0, 17,
-	30, 0, 233, 14, 0, 0, 7, 15, 0,
-	16, 31, 0, 28, 14, 0, 0, 4, 12,
-	0, 16, 31, 0, 32, 13, 0, 0, 5,
-	12, 0, 16, 31, 0, 193, 12, 0, 0,
-	7, 12, 0, 17, 30, 0, 128, 12, 0,
-	0, 1, 15, 0, 17, 30, 0, 240, 11,
-	0, 0, 6, 15, 0, 255, 58, 1, 16,
-	11, 0, 0, 4, 0, 0, 16, 31, 0,
-	180, 10, 0, 0, 3, 12, 0, 17, 30,
-	0, 134, 10, 0, 0, 6, 15, 0, 16,
-	31, 0, 151, 9, 0, 0, 0, 12, 0,
-	17, 30, 0, 237, 8, 0, 0, 5, 15,
-	0, 16, 31, 0, 212, 8, 0, 0, 2,
-	12, 0, 16, 31, 0, 112, 7, 0, 0,
-	5, 12, 0, 17, 30, 0, 16, 7, 0,
-	0, 1, 15, 0, 16, 31, 0, 208, 6,
-	0, 0, 7, 12, 0, 17, 30, 0, 160,
-	6, 0, 0, 4, 15, 0, 16, 31, 0,
-	32, 6, 0, 0, 2, 12, 0, 255, 58,
-	1, 208, 4, 0, 0, 4, 0, 0, 17,
-	30, 0, 202, 3, 0, 0, 4, 15, 0,
-	16, 31, 0, 142, 3, 0, 0, 7, 12,
-	0, 17, 30, 0, 193, 2, 0, 0, 0,
-	15, 0, 16, 31, 0, 38, 2, 0, 0,
-	6, 12, 0, 17, 30, 0, 49, 1, 0,
-	0, 3, 15, 0
-};
-
-const byte ENDRIVER1[10] = {
-	16, 31, 0, 4, 1, 0, 0, 1, 12, 0
-};
-
-const byte RIVER2OBJECTS[530] = {
-	16, 31, 0, 38, 32, 0, 0, 6, 12,
-	0, 16, 31, 0, 179, 31, 0, 0, 7,
-	12, 0, 17, 30, 0, 19, 31, 0, 0,
-	4, 15, 0, 16, 31, 0, 210, 30, 0,
-	0, 0, 12, 0, 16, 31, 0, 192, 29,
-	0, 0, 2, 12, 0, 17, 30, 0, 48,
-	29, 0, 0, 5, 15, 0, 16, 31, 0,
-	1, 29, 0, 0, 4, 12, 0, 17, 30,
-	0, 192, 28, 0, 0, 1, 15, 0, 16,
-	31, 0, 160, 28, 0, 0, 6, 12, 0,
-	255, 58, 1, 80, 27, 0, 0, 4, 0,
-	0, 16, 31, 0, 64, 26, 0, 0, 3,
-	12, 0, 17, 30, 0, 44, 26, 0, 0,
-	6, 15, 0, 16, 31, 0, 118, 25, 0,
-	0, 2, 12, 0, 17, 30, 0, 81, 24,
-	0, 0, 5, 15, 0, 16, 31, 0, 56,
-	24, 0, 0, 2, 12, 0, 17, 30, 0,
-	102, 23, 0, 0, 1, 15, 0, 16, 31,
-	0, 72, 23, 0, 0, 7, 12, 0, 16,
-	31, 0, 68, 22, 0, 0, 2, 12, 0,
-	17, 30, 0, 18, 22, 0, 0, 4, 15,
-	0, 16, 31, 0, 192, 21, 0, 0, 5,
-	12, 0, 17, 30, 0, 112, 21, 0, 0,
-	6, 15, 0, 255, 58, 1, 208, 19, 0,
-	0, 4, 0, 0, 17, 30, 0, 217, 18,
-	0, 0, 4, 15, 0, 16, 31, 0, 174,
-	18, 0, 0, 2, 12, 0, 17, 30, 0,
-	52, 18, 0, 0, 5, 15, 0, 16, 31,
-	0, 158, 17, 0, 0, 7, 12, 0, 16,
-	31, 0, 143, 17, 0, 0, 1, 12, 0,
-	17, 30, 0, 154, 16, 0, 0, 2, 15,
-	0, 16, 31, 0, 99, 16, 0, 0, 4,
-	12, 0, 255, 58, 1, 208, 14, 0, 0,
-	4, 0, 0, 17, 30, 0, 16, 14, 0,
-	0, 3, 15, 0, 16, 31, 0, 142, 13,
-	0, 0, 5, 12, 0, 16, 31, 0, 94,
-	13, 0, 0, 2, 12, 0, 17, 30, 0,
-	98, 12, 0, 0, 6, 15, 0, 16, 31,
-	0, 144, 11, 0, 0, 4, 12, 0, 17,
-	30, 0, 139, 11, 0, 0, 7, 15, 0,
-	255, 58, 1, 208, 9, 0, 0, 4, 0,
-	0, 17, 30, 0, 111, 9, 0, 0, 1,
-	15, 0, 16, 31, 0, 14, 9, 0, 0,
-	0, 12, 0, 17, 30, 0, 227, 8, 0,
-	0, 2, 15, 0, 16, 31, 0, 222, 8,
-	0, 0, 6, 12, 0, 17, 30, 0, 234,
-	7, 0, 0, 3, 15, 0, 16, 31, 0,
-	208, 7, 0, 0, 0, 12, 0, 16, 31,
-	0, 48, 7, 0, 0, 3, 12, 0, 17,
-	30, 0, 3, 7, 0, 0, 7, 15, 0,
-	16, 31, 0, 98, 6, 0, 0, 5, 12,
-	0, 17, 30, 0, 94, 6, 0, 0, 1,
-	15, 0, 255, 58, 1, 208, 4, 0, 0,
-	4, 0, 0, 17, 30, 0, 202, 3, 0,
-	0, 2, 15, 0, 16, 31, 0, 142, 3,
-	0, 0, 5, 12, 0, 17, 30, 0, 193,
-	2, 0, 0, 0, 15, 0, 16, 31, 0,
-	38, 2, 0, 0, 4, 12, 0, 17, 30,
-	0, 49, 1, 0, 0, 3, 15, 0
-};
-
-const byte ENDRIVER2[10] = {
-	16, 31, 0, 4, 1, 0, 0, 6, 12, 0
-};
-
-const byte *RIVEROBJECTTBL[6] = {
+const RiverStruct RIVER0OBJECTS[45] = {
+	{16,  31, 6400, 0, 4, 12},
+	{16,  31, 6200, 0, 2, 12},
+	{17,  30, 6100, 0, 3, 15},
+	{16,  31, 5970, 0, 7, 12},
+	{17,  30, 5910, 0, 5, 15},
+	{17,  30, 5730, 0, 3, 15},
+	{16,  31, 5700, 0, 7, 12},
+	{-1, 314, 5392, 0, 4,  0},
+	{17,  30, 5155, 0, 1, 15},
+	{16,  31, 5150, 0, 5, 12},
+	{16,  31, 5056, 0, 7, 12},
+	{17,  30, 4900, 0, 2, 15},
+	{17,  30, 4785, 0, 7, 15},
+	{16,  31, 4690, 0, 4, 12},
+	{16,  31, 4660, 0, 1, 12},
+	{17,  30, 4560, 0, 5, 15},
+	{16,  31, 4465, 0, 2, 12},
+	{-1, 314, 4112, 0, 4,  0},
+	{17,  30, 4005, 0, 3, 15},
+	{16,  31, 3865, 0, 6, 12},
+	{17,  30, 3605, 0, 4, 15},
+	{16,  31, 3360, 0, 1, 12},
+	{17,  30, 3105, 0, 0, 15},
+	{16,  31, 3080, 0, 7, 12},
+	{17,  30, 3014, 0, 4, 15},
+	{16,  31, 2992, 0, 3, 12},
+	{16,  31, 2976, 0, 2, 12},
+	{17,  30, 2880, 0, 7, 15},
+	{17,  30, 2860, 0, 0, 15},
+	{-1, 314, 2512, 0, 4,  0},
+	{17,  30, 2270, 0, 4, 15},
+	{16,  31, 2195, 0, 6, 12},
+	{17,  30, 1824, 0, 1, 15},
+	{16,  31, 1776, 0, 4, 12},
+	{17,  30, 1650, 0, 3, 15},
+	{16,  31, 1616, 0, 7, 12},
+	{17,  30, 1585, 0, 2, 15},
+	{-1, 314, 1232, 0, 4,  0},
+	{17,  30, 1190, 0, 2, 15},
+	{16,  31, 1120, 0, 4, 12},
+	{17,  30,  970, 0, 7, 15},
+	{16,  31,  910, 0, 5, 12},
+	{17,  30,  705, 0, 0, 15},
+	{16,  31,  550, 0, 4, 12},
+	{17,  30,  305, 0, 2, 15}
+};
+
+const RiverStruct ENDRIVER0[1] = {16, 31, 260, 0, 7, 12};
+
+const RiverStruct RIVER1OBJECTS[49] = {
+	{16,  31, 6920, 0, 1, 12},
+	{16,  31, 6740, 0, 4, 12},
+	{17,  30, 6699, 0, 1, 15},
+	{16,  31, 6610, 0, 2, 12},
+	{17,  30, 6495, 0, 6, 15},
+	{17,  30, 6385, 0, 4, 15},
+	{16,  31, 6350, 0, 1, 12},
+	{17,  30, 6180, 0, 0, 15},
+	{-1, 314, 6032, 0, 4,  0},
+	{16,  31, 5800, 0, 3, 12},
+	{17,  30, 5790, 0, 6, 15},
+	{16,  31, 5530, 0, 4, 12},
+	{16,  31, 5500, 0, 7, 12},
+	{17,  30, 5495, 0, 1, 15},
+	{17,  30, 5376, 0, 0, 15},
+	{16,  31, 5328, 0, 7, 12},
+	{17,  30, 5248, 0, 2, 15},
+	{16,  31, 5248, 0, 6, 12},
+	{-1, 314, 4752, 0, 4,  0},
+	{17,  30, 4432, 0, 2, 15},
+	{16,  31, 4432, 0, 7, 12},
+	{16,  31, 4384, 0, 2, 12},
+	{17,  30, 4368, 0, 5, 15},
+	{16,  31, 4336, 0, 4, 12},
+	{17,  30, 4185, 0, 1, 15},
+	{16,  31, 4125, 0, 3, 12},
+	{17,  30, 3817, 0, 7, 15},
+	{16,  31, 3612, 0, 4, 12},
+	{16,  31, 3360, 0, 5, 12},
+	{16,  31, 3265, 0, 7, 12},
+	{17,  30, 3200, 0, 1, 15},
+	{17,  30, 3056, 0, 6, 15},
+	{-1, 314, 2832, 0, 4,  0},
+	{16,  31, 2740, 0, 3, 12},
+	{17,  30, 2694, 0, 6, 15},
+	{16,  31, 2455, 0, 0, 12},
+	{17,  30, 2285, 0, 5, 15},
+	{16,  31, 2260, 0, 2, 12},
+	{16,  31, 1904, 0, 5, 12},
+	{17,  30, 1808, 0, 1, 15},
+	{16,  31, 1744, 0, 7, 12},
+	{17,  30, 1696, 0, 4, 15},
+	{16,  31, 1568, 0, 2, 12},
+	{-1, 314, 1232, 0, 4,  0},
+	{17,  30,  970, 0, 4, 15},
+	{16,  31,  910, 0, 7, 12},
+	{17,  30,  705, 0, 0, 15},
+	{16,  31,  550, 0, 6, 12},
+	{17,  30,  305, 0, 3, 15}
+};
+
+const RiverStruct ENDRIVER1[1] = {16, 31, 260, 0, 1, 12};
+
+const RiverStruct RIVER2OBJECTS[53] = {
+	{16,  31, 8230, 0, 6, 12},
+	{16,  31, 8115, 0, 7, 12},
+	{17,  30, 7955, 0, 4, 15},
+	{16,  31, 7890, 0, 0, 12},
+	{16,  31, 7616, 0, 2, 12},
+	{17,  30, 7472, 0, 5, 15},
+	{16,  31, 7425, 0, 4, 12},
+	{17,  30, 7360, 0, 1, 15},
+	{16,  31, 7328, 0, 6, 12},
+	{-1, 314, 6992, 0, 4,  0},
+	{16,  31, 6720, 0, 3, 12},
+	{17,  30, 6700, 0, 6, 15},
+	{16,  31, 6518, 0, 2, 12},
+	{17,  30, 6225, 0, 5, 15},
+	{16,  31, 6200, 0, 2, 12},
+	{17,  30, 5990, 0, 1, 15},
+	{16,  31, 5960, 0, 7, 12},
+	{16,  31, 5700, 0, 2, 12},
+	{17,  30, 5650, 0, 4, 15},
+	{16,  31, 5568, 0, 5, 12},
+	{17,  30, 5488, 0, 6, 15},
+	{-1, 314, 5072, 0, 4,  0},
+	{17,  30, 4825, 0, 4, 15},
+	{16,  31, 4782, 0, 2, 12},
+	{17,  30, 4660, 0, 5, 15},
+	{16,  31, 4510, 0, 7, 12},
+	{16,  31, 4495, 0, 1, 12},
+	{17,  30, 4250, 0, 2, 15},
+	{16,  31, 4195, 0, 4, 12},
+	{-1, 314, 3792, 0, 4,  0},
+	{17,  30, 3600, 0, 3, 15},
+	{16,  31, 3470, 0, 5, 12},
+	{16,  31, 3422, 0, 2, 12},
+	{17,  30, 3170, 0, 6, 15},
+	{16,  31, 2960, 0, 4, 12},
+	{17,  30, 2955, 0, 7, 15},
+	{-1, 314, 2512, 0, 4,  0},
+	{17,  30, 2415, 0, 1, 15},
+	{16,  31, 2318, 0, 0, 12},
+	{17,  30, 2275, 0, 2, 15},
+	{16,  31, 2270, 0, 6, 12},
+	{17,  30, 2026, 0, 3, 15},
+	{16,  31, 2000, 0, 0, 12},
+	{16,  31, 1840, 0, 3, 12},
+	{17,  30, 1795, 0, 7, 15},
+	{16,  31, 1634, 0, 5, 12},
+	{17,  30, 1630, 0, 1, 15},
+	{-1, 314, 1232, 0, 4,  0},
+	{17,  30,  970, 0, 2, 15},
+	{16,  31,  910, 0, 5, 12},
+	{17,  30,  705, 0, 0, 15},
+	{16,  31,  550, 0, 4, 12},
+	{17,  30,  305, 0, 3, 15}
+};
+
+const RiverStruct ENDRIVER2[1] = {16, 31, 260, 0, 6, 12};
+
+const RiverStruct *RIVEROBJECTTBL[6] = {
 	RIVER0OBJECTS, ENDRIVER0, RIVER1OBJECTS, 
 	ENDRIVER1, RIVER2OBJECTS, ENDRIVER2
 };
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index b29bdab2c3..ec412766bc 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -29,6 +29,15 @@ namespace Access {
 
 namespace Amazon {
 
+struct RiverStruct {
+	int _id;
+	int _field1;
+	int _field3;
+	int _field5;
+	int _lane;
+	int _field8;
+};
+
 extern const char *const FILENAMES[];
 
 extern const byte *CURSORS[10];
@@ -90,14 +99,14 @@ extern const byte MAP2[32];
 
 extern const byte *MAPTBL[3];
 
-extern const byte RIVER0OBJECTS[450];
-extern const byte ENDRIVER0[10];
-extern const byte RIVER1OBJECTS[490];
-extern const byte ENDRIVER1[10];
-extern const byte RIVER2OBJECTS[530];
-extern const byte ENDRIVER2[10];
+extern const RiverStruct RIVER0OBJECTS[45];
+extern const RiverStruct ENDRIVER0[1];
+extern const RiverStruct RIVER1OBJECTS[49];
+extern const RiverStruct ENDRIVER1[1];
+extern const RiverStruct RIVER2OBJECTS[53];
+extern const RiverStruct ENDRIVER2[1];
 
-extern const byte *RIVEROBJECTTBL[6];
+extern const RiverStruct *RIVEROBJECTTBL[6];
 
 } // End of namespace Amazon
 
-- 
cgit v1.2.3


From ff003f3b657a7651cc1f49be84d5190299ec17d5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 11:57:39 -0500
Subject: ACCESS: Fix the jungle walk 2 cutscene

---
 engines/access/amazon/amazon_scripts.cpp | 96 ++++++++++++++------------------
 engines/access/events.cpp                |  5 ++
 engines/access/events.h                  |  2 +
 3 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 61387687b6..d0b13d9c58 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -281,33 +281,33 @@ void AmazonScripts::initJWalk2() {
 
 void AmazonScripts::jungleMove() {
 	const static int jungleY[3] = {27, 30, 29};
-	int cx = 1;
-	int dx = 0;
-	if (_vm->_timers[0]._flag == 0) {
-		_vm->_timers[0]._flag = 1;
+	int count = 1;
+	int frameOffset = 0;
+
+	if (!_vm->_timers[0]._flag) {
+		++_vm->_timers[0]._flag;
 		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-		for (int i = 0; i <= 3; i++) {
+
+		for (int i = 0; i < 3; ++i) {
 			int newJCnt = (_jCnt[i] + 1) % 8;
 			_jCnt[i] = newJCnt;
 			_jungleX[i] += 5;
 		}
-		dx = 4;
-		if (_game->_allenFlag != 1)
-			cx = 2;
-		else
-			cx = 3;
+
+		frameOffset = 4;
+		count = (_game->_allenFlag != 1) ? 2 : 3;
 	}
 
-	for (int i = 0; i <= cx; i++) {
+	for (int i = 0; i < count; ++i) {
 		ImageEntry ie;
 		ie._flags = 8;
 		ie._spritesPtr = _vm->_objectsTable[24];
-		ie._frameNumber = _jCnt[i] + dx;
+		ie._frameNumber = _jCnt[i] + frameOffset;
 		ie._position = Common::Point(_jungleX[i], jungleY[i]);
 		ie._offsetY = jungleY[i];
 
 		_vm->_images.addToList(ie);
-		dx += 8;
+		frameOffset += 8;
 	}
 }
 
@@ -316,33 +316,33 @@ void AmazonScripts::mWhileJWalk2() {
 
 	initJWalk2();
 
-	while(true) {
+	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
+			(screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
 		_vm->_images.clear();
 		_vm->_events->_vbCount = 6;
 		_pImgNum[0] = _game->_plane._xCount;
-		while ((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
-			jungleMove();
-			while (screen._scrollX >= TILE_WIDTH) {
-				screen._scrollX -= TILE_WIDTH;
-				++screen._scrollCol;
-				_vm->_buffer1.moveBufferLeft();
-				_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
-			}
-			if (_game->_plane._xCount == 2)
-				++_game->_plane._xCount;
-			else
-				--_game->_plane._xCount;
 
-			pan();
-			scrollJWalk();
+		jungleMove();
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+		}
 
-			g_system->delayMillis(10);
-			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-				_vm->_events->pollEvents();
-				g_system->delayMillis(10);
-			}
+		if (_game->_plane._xCount == 2)
+			++_game->_plane._xCount;
+		else
+			--_game->_plane._xCount;
+
+		pan();
+		scrollJWalk();
+
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+			_vm->_events->pollEventsAndWait();
 		}
 	}
+
 	_vm->_events->showCursor();
 }
 
@@ -522,8 +522,7 @@ void AmazonScripts::mWhileFly() {
 			events.checkForNextFrameCounter();
 			_vm->_sound->playSound(0);
 
-			g_system->delayMillis(10);
-			events.pollEvents();
+			events.pollEventsAndWait();
 		}
 	}
 
@@ -572,8 +571,7 @@ void AmazonScripts::mWhileFall() {
 		scrollFall();
 
 		while (!_vm->shouldQuit() && events._vbCount > 0) {
-			events.pollEvents();
-			g_system->delayMillis(10);
+			events.pollEventsAndWait();
 		}
 	}
 
@@ -649,10 +647,8 @@ void AmazonScripts::mWhileJWalk() {
 		pan();
 		scrollJWalk();
 
-		g_system->delayMillis(10);
 		while (!_vm->shouldQuit() && events._vbCount > 0) {
-			events.pollEvents();
-			g_system->delayMillis(10);
+			events.pollEventsAndWait();
 		}
 	}
 
@@ -732,8 +728,7 @@ void AmazonScripts::mWhileDoOpen() {
 			screen.forceFadeIn();
 		}
 
-		events.pollEvents();
-		g_system->delayMillis(10);
+		events.pollEventsAndWait();
 
 		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
 			_game->_skipStart = true;
@@ -748,8 +743,7 @@ void AmazonScripts::mWhileDoOpen() {
 			events._vbCount = 125;
 			
 			while(!_vm->shouldQuit() && !events.isKeyMousePressed() && events._vbCount > 0) {
-				events.pollEvents();
-				g_system->delayMillis(10);
+				events.pollEventsAndWait();
 			}
 			break;
 		}
@@ -872,10 +866,8 @@ void AmazonScripts::mWhileDownRiver() {
 				_vm->_sound->playSound(0);
 			}
 
-			g_system->delayMillis(10);
 			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-				_vm->_events->pollEvents();
-				g_system->delayMillis(10);
+				_vm->_events->pollEventsAndWait();
 			}
 		}
 	}
@@ -1282,12 +1274,11 @@ void AmazonScripts::doCast(int param1) {
 			_vm->_events->_vbCount = 50;
 
 			while(!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() && _vm->_events->_vbCount > 0) {
-				_vm->_events->pollEvents();
-				g_system->delayMillis(10);
+				_vm->_events->pollEventsAndWait();
 			}
 
 			while (!_vm->shouldQuit() && !_vm->_sound->checkMidiDone())
-				_vm->_events->pollEvents();
+				_vm->_events->pollEventsAndWait();
 
 			break;
 		}
@@ -1295,7 +1286,7 @@ void AmazonScripts::doCast(int param1) {
 
 	_vm->_sound->newMusic(58, 1);
 	_vm->_events->showCursor();
-	warning("TODO: delete _roomInfo;");
+
 	_vm->freeCells();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
@@ -1834,8 +1825,7 @@ void AmazonScripts::RIVER() {
 			SCROLLRIVER1();
 
 		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-			_vm->_events->pollEvents();
-			g_system->delayMillis(10);
+			_vm->_events->pollEventsAndWait();
 		}
 	}
 }
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index fd432573e4..d911e666ea 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -181,6 +181,11 @@ void EventsManager::pollEvents() {
 	}
 }
 
+void EventsManager::pollEventsAndWait() {
+	pollEvents();
+	g_system->delayMillis(10);
+}
+
 bool EventsManager::checkForNextFrameCounter() {
 	// Check for next game frame
 	uint32 milli = g_system->getMillis();
diff --git a/engines/access/events.h b/engines/access/events.h
index d73f76af49..0a2a541de9 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -107,6 +107,8 @@ public:
 
 	void pollEvents();
 
+	void pollEventsAndWait();
+
 	void zeroKeys();
 
 	bool getKey(Common::KeyState &key);
-- 
cgit v1.2.3


From ada5ca20f97a4d0b3b21ed18feac7c8d814d8959 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 14:52:22 -0500
Subject: ACCESS: Reorganise Amazon game-specific variables that are saved

---
 engines/access/amazon/amazon_game.h | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 3b8b98101e..26a9454d09 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -54,10 +54,6 @@ public:
 
 class AmazonEngine : public AccessEngine {
 private:
-	// Fields that are included in savegames
-	int _esTabTable[100];
-
-	// Other fields
 	Common::Point _tilePos;
 	byte _tileData[1455];
 	Common::Array<CellIdent> _chapterCells;
@@ -101,18 +97,9 @@ public:
 	bool _charSegSwitch;
 	bool _skipStart;
 
-	int _canoeLane;
-	int _canoeYPos;
-	int _hitCount;
 	const RiverStruct *_topList;
 	const RiverStruct *_botList;
-	int _riverIndex;
-	int _saveRiver;
 	int _canoeDir;
-	int _hitSafe;
-	int _rawInactiveX;
-	int _rawInactiveY;
-	int _inactiveYOff;
 
 	// Fields that are mapped to flags
 	int &_guardLocation;
@@ -130,7 +117,17 @@ public:
 	int &_noSound;
 
 	// Saved fields
+	int _canoeLane;
+	int _canoeYPos;
+	int _hitCount;
+	int _saveRiver;
+	int _hitSafe;
 	int _chapter;
+	int _riverIndex;
+	int _rawInactiveX;
+	int _rawInactiveY;
+	int _inactiveYOff;
+	int _esTabTable[100];
 
 	// Other game specific fields
 	Guard _guard;
-- 
cgit v1.2.3


From 1cbaab55cd6870c9f75162f1ddb90f0c25959db3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 21:13:25 +0100
Subject: ACCESS: Split cmdDead in order to use it in RIVER

---
 engines/access/amazon/amazon_scripts.cpp |  4 ++--
 engines/access/scripts.cpp               | 10 +++++++---
 engines/access/scripts.h                 |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d0b13d9c58..75fbd052b0 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1805,14 +1805,14 @@ void AmazonScripts::RIVER() {
 			_game->_hitSafe -= 2;
 
 		if (_game->_hitSafe < 0) {
-			warning("TODO: cmdDead(RIVERDEATH[0]);");
+			cmdDead(RIVERDEATH[0]);
 			return;
 		}
 
 		if (_game->_deathFlag) {
 			_game->_deathCount--;
 			if (_game->_deathCount == 0) {
-				warning("TODO: cmdDead(RIVERDEATH[_game->_deathType]);");
+				cmdDead(RIVERDEATH[_game->_deathType]);
 				return;
 			}
 		}
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 9268b829e7..3f94ea2e55 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -775,14 +775,13 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::cmdDead() { 
-	int deathId = _data->readByte();
+void Scripts::cmdDead(int deathId) {
 	_vm->_events->hideCursor();
 	_vm->_screen->forceFadeOut();
 	cmdFreeSound();
 
 	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_files->loadFile(98, 44), 1));
-	
+
 	_vm->_screen->clearScreen();
 	_vm->_screen->setPanel(3);
 
@@ -843,6 +842,11 @@ void Scripts::cmdDead() {
 	}
 }
 
+void Scripts::cmdDead() { 
+	int deathId = _data->readByte();
+	cmdDead(deathId);
+}
+
 void Scripts::cmdFadeOut() {
 	_vm->_screen->forceFadeOut();
 }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 2b527a855a..de27ae7205 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -120,6 +120,7 @@ protected:
 	void cmdPlayerOff();
 	void cmdPlayerOn();
 	void cmdDead();
+	void cmdDead(int deathId);
 	void cmdFadeOut();
 	void CMDENDVID();
 public:
-- 
cgit v1.2.3


From a0beb08984b989d6dcb1c9dcbc8bb083e2534891 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 16:15:07 -0500
Subject: ACCESS: Refactor _inactive from AccessEngine to AmazonEngine

---
 engines/access/access.cpp                |  9 ------
 engines/access/access.h                  |  6 ----
 engines/access/amazon/amazon_game.cpp    | 11 ++++++-
 engines/access/amazon/amazon_game.h      | 11 +++++++
 engines/access/amazon/amazon_room.cpp    |  9 +++++-
 engines/access/amazon/amazon_room.h      |  1 +
 engines/access/amazon/amazon_scripts.cpp | 50 +++++++++++++++++++-------------
 engines/access/martian/martian_room.cpp  |  6 ++--
 engines/access/room.cpp                  |  1 -
 engines/access/room.h                    |  2 +-
 10 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index e87b647b59..cb47598066 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -54,9 +54,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
-	_inactive._spritesPtr = nullptr;
-	_inactive._flags = _inactive._frameNumber = _inactive._offsetY = 0;
-	_inactive._position = Common::Point(0, 0);
 	_music = nullptr;
 	_title = nullptr;
 	_converseMode = 0;
@@ -128,7 +125,6 @@ AccessEngine::~AccessEngine() {
 	delete _video;
 
 	freeCells();
-	delete _inactive._spritesPtr;
 	delete _music;
 	delete _title;
 	delete _eseg;
@@ -212,11 +208,6 @@ void AccessEngine::freeCells() {
 	}
 }
 
-void AccessEngine::freeInactiveData() {
-	delete _inactive._spritesPtr;
-	_inactive._spritesPtr = nullptr;
-}
-
 void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 	Common::String lines = msg;
 	Common::String line;
diff --git a/engines/access/access.h b/engines/access/access.h
index 805abcce02..12e0e1bd5e 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -175,7 +175,6 @@ public:
 	int _mouseMode;
 
 	int _currentManOld;
-	ImageEntry _inactive;
 	Resource *_music;
 	Resource *_title;
 	int _converseMode;
@@ -250,11 +249,6 @@ public:
 	*/
 	void freeCells();
 
-	/**
-	 * Free the inactive data
-	 */
-	void freeInactiveData();
-
 	virtual void establish(int esatabIndex, int sub) = 0;
 
 	void plotList();
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index def64f2f88..5c7a3edca2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -72,10 +72,19 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	memset(_tileData, 0, sizeof(_tileData));
 	
 	_chapterCells.push_back(CellIdent(0, 96, 17));
-
+	_inactive._spritesPtr = nullptr;
+	_inactive._altSpritesPtr = nullptr;
+	_inactive._flags = _inactive._frameNumber = _inactive._offsetY = 0;
+	_inactive._position = Common::Point(0, 0);
 }
 
 AmazonEngine::~AmazonEngine() {
+	delete _inactive._spritesPtr;
+}
+
+void AmazonEngine::freeInactivePlayer() {
+	delete _inactive._spritesPtr;
+	_inactive._spritesPtr = nullptr;
 }
 
 void AmazonEngine::playGame() {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 26a9454d09..05caa21018 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -52,6 +52,11 @@ public:
 	Guard();
 };
 
+class InactivePlayer : public ImageEntry {
+public:
+	SpriteResource *_altSpritesPtr;
+};
+
 class AmazonEngine : public AccessEngine {
 private:
 	Common::Point _tilePos;
@@ -94,6 +99,7 @@ protected:
 	*/
 	virtual void synchronize(Common::Serializer &s);
 public:
+	InactivePlayer _inactive;
 	bool _charSegSwitch;
 	bool _skipStart;
 
@@ -161,6 +167,11 @@ public:
 
 	virtual ~AmazonEngine();
 
+	/**
+	* Free the inactive player data
+	*/
+	void freeInactivePlayer();
+
 	void drawHelp();
 
 	virtual void establish(int esatabIndex, int sub);
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index db46b4836c..262a6caa87 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -78,7 +78,7 @@ void AmazonRoom::reloadRoom1() {
 	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
-		_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
+		_game->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
 		delete spriteData;
 		_vm->_currentCharFlag = false;
 	}
@@ -168,9 +168,11 @@ void AmazonRoom::mainAreaClick() {
 				_vm->_player->_roomNumber == 31 || _vm->_player->_roomNumber == 29) {
 			switch (checkBoxes1(pt)) {
 			case 0:
+				// Make Jason the active player
 				_game->_jasMayaFlag = 0;
 				return;
 			case 1:
+				// Make Maya the active player
 				_game->_jasMayaFlag = 1;
 				return;
 			default:
@@ -208,6 +210,11 @@ void AmazonRoom::init4Quads() {
 	_vm->_screen->clearScreen();
 }
 
+void AmazonRoom::clearRoom() {
+	Room::clearRoom();
+	_game->freeInactivePlayer();
+}
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 6b89a8f348..bcb0d84e15 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -52,6 +52,7 @@ protected:
 
 	virtual void mainAreaClick();
 
+	virtual void clearRoom();
 public:
 	AmazonRoom(AccessEngine *vm);
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 75fbd052b0..8a92dd6994 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1553,41 +1553,51 @@ void AmazonScripts::boatWalls(int param1, int param2) {
 }
 
 void AmazonScripts::plotInactive() {
+	Player &player = *_vm->_player;
+	InactivePlayer &inactive = _game->_inactive;
+
 	if (_game->_charSegSwitch) {
 		_game->_currentCharFlag = true;
-		SpriteResource *tmp = _vm->_inactive._spritesPtr;
-		_vm->_inactive._spritesPtr = _vm->_player->_playerSprites;
-		_vm->_player->_playerSprites = tmp;
+		SpriteResource *tmp = inactive._spritesPtr;
+		inactive._spritesPtr = player._playerSprites;
+		player._playerSprites = tmp;
 		_game->_charSegSwitch = false;
 	} else if (_game->_jasMayaFlag != (_game->_currentCharFlag ? 1 : 0)) {
-		if (_vm->_player->_playerOff) {
+		if (player._playerOff) {
 			_game->_jasMayaFlag = (_game->_currentCharFlag ? 1 : 0);
 		} else {
 			_game->_currentCharFlag = (_game->_jasMayaFlag == 1);
 			int tmpX = _game->_rawInactiveX;
 			int tmpY = _game->_rawInactiveY;
-			_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
-			_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
-			_vm->_player->_rawPlayer.x = tmpX;
-			_vm->_player->_rawPlayer.y = tmpY;
-			_game->_inactiveYOff = _vm->_player->_playerOffset.y;
-			_vm->_player->calcManScale();
+			_game->_rawInactiveX = player._rawPlayer.x;
+			_game->_rawInactiveY = player._rawPlayer.y;
+			player._rawPlayer.x = tmpX;
+			player._rawPlayer.y = tmpY;
+			_game->_inactiveYOff = player._playerOffset.y;
+			player.calcManScale();
 		}
 	}
 
-	if (_vm->_player->_roomNumber == 44) {
-		warning("CHECKME: Only sets useless(?) flags 155 and 160");
+	_game->_flags[155] = 0;
+	if (_game->_rawInactiveX >= 152 && _game->_rawInactiveX <= 167 &&
+			_game->_rawInactiveY >= 158 && _game->_rawInactiveY <= 173) {
+		_game->_flags[155] = 1;
+	} else {
+		_game->_flags[160] = 1;
+		if (!_game->_jasMayaFlag && _game->_rawInactiveX <= 266 && _game->_rawInactiveX < 290
+			&& _game->_rawInactiveY >= 70 && _game->_rawInactiveY <= 87) {
+			_game->_flags[160] = 1;
+		}
 	}
 
-	_vm->_inactive._flags &= 0xFD;
-	_vm->_inactive._flags &= 0xF7;
-	_vm->_inactive._position.x = _game->_rawInactiveX;
-	_vm->_inactive._position.y = _game->_rawInactiveY - _game->_inactiveYOff;
-	_vm->_inactive._offsetY = _game->_inactiveYOff;
-	_vm->_inactive._frameNumber = 0;
-
-	_vm->_images.addToList(_vm->_inactive);
+	inactive._flags &= ~IMGFLAG_UNSCALED;
+	inactive._flags &= ~IMGFLAG_BACKWARDS;
+	inactive._position.x = _game->_rawInactiveX;
+	inactive._position.y = _game->_rawInactiveY - _game->_inactiveYOff;
+	inactive._offsetY = _game->_inactiveYOff;
+	inactive._frameNumber = 0;
 
+	_vm->_images.addToList(_game->_inactive);
 }
 
 void AmazonScripts::setRiverPan() {
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 6d4d62f7e9..62c44bc529 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -75,9 +75,9 @@ void MartianRoom::reloadRoom() {
 void MartianRoom::reloadRoom1() {
 	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
-		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
-		_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
-		delete spriteData;
+		//Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
+		//_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
+		//delete spriteData;
 		_vm->_currentCharFlag = false;
 	}
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 31d1583c3e..37746d1b7c 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -164,7 +164,6 @@ void Room::clearRoom() {
 	_vm->freeCells();
 	freePlayField();
 	freeTileData();
-	_vm->freeInactiveData();
 	_vm->_player->freeSprites();
 }
 
diff --git a/engines/access/room.h b/engines/access/room.h
index 9b3136630e..a26f2ed04c 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -144,7 +144,7 @@ public:
 	/**
 	 * Clear all the data used by the room
 	 */
-	void clearRoom();
+	virtual void clearRoom();
 
 	/**
 	 * Builds up a game screen
-- 
cgit v1.2.3


From 9e84be664cab90788aa67049732bc6be1e5b6209 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 22:21:48 +0100
Subject: ACCESS: Implement a couple of script functions

---
 engines/access/access.cpp  |  2 ++
 engines/access/access.h    |  2 ++
 engines/access/scripts.cpp | 17 ++++++++++++++---
 engines/access/scripts.h   |  2 +-
 engines/access/video.cpp   |  4 +++-
 engines/access/video.h     |  1 +
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index cb47598066..cdabb323e4 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -107,6 +107,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_txtPages = 0;
 	_sndSubFile = 0;
 	_loadSaveSlot = -1;
+	_vidX = _vidY = 0;
 }
 
 AccessEngine::~AccessEngine() {
@@ -171,6 +172,7 @@ void AccessEngine::initialize() {
 
 	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight());
 	_buffer2.create(g_system->getWidth(), g_system->getHeight());
+	_vidBuf.create(160, 101);
 
 	// If requested, load a savegame instead of showing the intro
 	if (ConfMan.hasKey("save_slot")) {
diff --git a/engines/access/access.h b/engines/access/access.h
index 12e0e1bd5e..2cd35fbf1d 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -156,6 +156,8 @@ public:
 	ASurface *_current;
 	ASurface _buffer1;
 	ASurface _buffer2;
+	ASurface _vidBuf;
+	int _vidX, _vidY;
 	Common::Array<CharEntry *> _charTable;
 	SpriteResource *_objectsTable[100];
 	bool _establishTable[100];
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 3f94ea2e55..442d91d255 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -123,7 +123,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, 
-		&Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
+		&Scripts::cmdSetBufVid, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
@@ -497,8 +497,19 @@ void Scripts::cmdVideoEnded() {
 	}
 }
 
-void Scripts::CMDSETBUFVID() { error("TODO CMDSETBUFVID"); }
-void Scripts::CMDPLAYBUFVID() { error("TODO CMDPLAYBUFVID"); }
+void Scripts::cmdSetBufVid() {
+	_vm->_vidX = _data->readUint16LE();
+	_vm->_vidY = _data->readUint16LE();
+	int idx = _data->readUint16LE();
+	int rate = _data->readUint16LE();
+
+	_vm->_video->setVideo(&_vm->_vidBuf, Common::Point(0, 0), FileIdent(_vm->_extraCells[idx]._vid._fileNum, _vm->_extraCells[idx]._vid._subfile), rate);
+}
+
+void Scripts::CMDPLAYBUFVID() {
+	_vm->_video->playVideo();
+	_vm->_video->copyVideo();
+}
 
 void Scripts::cmdRemoveLast() {
 	--_vm->_numAnimTimers;
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index de27ae7205..aa9b266c0c 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -98,7 +98,7 @@ protected:
 	void cmdSetBuffer();
 	void cmdSetScroll();
 	void cmdVideoEnded();
-	void CMDSETBUFVID();
+	void cmdSetBufVid();
 	void CMDPLAYBUFVID();
 	void cmdRemoveLast();
 	void cmdSpecial();
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index b46bdf240f..539ad34b8c 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -140,5 +140,7 @@ void VideoPlayer::playVideo() {
 	}
 }
 
-
+void VideoPlayer::copyVideo() {
+	warning("TODO: copyVideo");
+}
 } // End of namespace Access
diff --git a/engines/access/video.h b/engines/access/video.h
index b49c876a07..f4be76de31 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -69,6 +69,7 @@ public:
 	 */
 	void playVideo();
 
+	void copyVideo();
 	/**
 	 * Frees the data for a previously loaded video
 	 */
-- 
cgit v1.2.3


From 80ec09d0aee51a5430887cc94c70928375d55640 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 22:29:46 +0100
Subject: ACCESS: Rename a function

---
 engines/access/scripts.cpp | 4 ++--
 engines/access/scripts.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 442d91d255..2336e78041 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -123,7 +123,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
 		&Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, 
-		&Scripts::cmdSetBufVid, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, 
+		&Scripts::cmdSetBufVid, &Scripts::cmdPlayBufVid, &Scripts::cmdRemoveLast, 
 		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
 		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
@@ -506,7 +506,7 @@ void Scripts::cmdSetBufVid() {
 	_vm->_video->setVideo(&_vm->_vidBuf, Common::Point(0, 0), FileIdent(_vm->_extraCells[idx]._vid._fileNum, _vm->_extraCells[idx]._vid._subfile), rate);
 }
 
-void Scripts::CMDPLAYBUFVID() {
+void Scripts::cmdPlayBufVid() {
 	_vm->_video->playVideo();
 	_vm->_video->copyVideo();
 }
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index aa9b266c0c..ebee79d458 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -99,7 +99,7 @@ protected:
 	void cmdSetScroll();
 	void cmdVideoEnded();
 	void cmdSetBufVid();
-	void CMDPLAYBUFVID();
+	void cmdPlayBufVid();
 	void cmdRemoveLast();
 	void cmdSpecial();
 	void cmdSetCycle();
-- 
cgit v1.2.3


From 74a61d1118df5c54b2ad75f6068328d8a6d54bec Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 17:31:43 -0500
Subject: ACCESS: Fix the ability to switch between players

---
 engines/access/amazon/amazon_game.cpp    | 6 +++---
 engines/access/amazon/amazon_room.cpp    | 2 +-
 engines/access/amazon/amazon_scripts.cpp | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 5c7a3edca2..657458fa44 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -79,12 +79,12 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 }
 
 AmazonEngine::~AmazonEngine() {
-	delete _inactive._spritesPtr;
+	delete _inactive._altSpritesPtr;
 }
 
 void AmazonEngine::freeInactivePlayer() {
-	delete _inactive._spritesPtr;
-	_inactive._spritesPtr = nullptr;
+	delete _inactive._altSpritesPtr;
+	_inactive._altSpritesPtr = nullptr;
 }
 
 void AmazonEngine::playGame() {
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 262a6caa87..3381688356 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -78,7 +78,7 @@ void AmazonRoom::reloadRoom1() {
 	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
-		_game->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
+		_game->_inactive._altSpritesPtr = new SpriteResource(_vm, spriteData);
 		delete spriteData;
 		_vm->_currentCharFlag = false;
 	}
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 8a92dd6994..e4c58c9eb5 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1558,9 +1558,7 @@ void AmazonScripts::plotInactive() {
 
 	if (_game->_charSegSwitch) {
 		_game->_currentCharFlag = true;
-		SpriteResource *tmp = inactive._spritesPtr;
-		inactive._spritesPtr = player._playerSprites;
-		player._playerSprites = tmp;
+		SWAP(inactive._altSpritesPtr, player._playerSprites);
 		_game->_charSegSwitch = false;
 	} else if (_game->_jasMayaFlag != (_game->_currentCharFlag ? 1 : 0)) {
 		if (player._playerOff) {
@@ -1575,6 +1573,9 @@ void AmazonScripts::plotInactive() {
 			player._rawPlayer.y = tmpY;
 			_game->_inactiveYOff = player._playerOffset.y;
 			player.calcManScale();
+
+			SWAP(inactive._altSpritesPtr, player._playerSprites);
+			_vm->_room->setWallCodes();
 		}
 	}
 
@@ -1595,7 +1596,7 @@ void AmazonScripts::plotInactive() {
 	inactive._position.x = _game->_rawInactiveX;
 	inactive._position.y = _game->_rawInactiveY - _game->_inactiveYOff;
 	inactive._offsetY = _game->_inactiveYOff;
-	inactive._frameNumber = 0;
+	inactive._spritesPtr = inactive._altSpritesPtr;
 
 	_vm->_images.addToList(_game->_inactive);
 }
-- 
cgit v1.2.3


From ddfe7395546e9b932280d7aae9e6455dbb4d9989 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 23:44:12 +0100
Subject: ACCESS: Implement copyVideo

---
 engines/access/video.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 539ad34b8c..776c58a83b 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -141,6 +141,28 @@ void VideoPlayer::playVideo() {
 }
 
 void VideoPlayer::copyVideo() {
-	warning("TODO: copyVideo");
+	_vm->_player->calcPlayer();
+	Common::Rect r = Common::Rect(_vm->_vidX - _vm->_screen->_bufferStart.x,
+		_vm->_vidY - _vm->_screen->_bufferStart.y, 
+		_vm->_vidX - _vm->_screen->_bufferStart.x + _header._width,
+		_vm->_vidY - _vm->_screen->_bufferStart.y + _header._height);
+	if (!_vm->_screen->clip(r))
+		return;
+	
+	_vm->_newRects.push_back(r);
+	int vh = _header._height;
+	int vw = _header._width;
+	int destIdx = _vm->_vidX - _vm->_screen->_bufferStart.x;
+	int srcIdx = _vm->_screen->_leftSkip;
+	for (int i = 0; i < _vm->_screen->_topSkip; i++)
+		destIdx += 160;
+
+	const byte *srcP = (const byte *)_vm->_vidBuf.getPixels() + srcIdx;
+	byte *destP = (byte *)_vm->_buffer2.getPixels() + destIdx;
+	for (int i = 0; i < vh; i++) {
+		Common::copy(srcP, srcP + vw, destP);
+		srcP += _vm->_vidBuf.pitch;
+		destP += _vm->_buffer2.pitch;
+	}
 }
 } // End of namespace Access
-- 
cgit v1.2.3


From 08c65399002ffa7c1d5f055c242996ff0f416fad Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 23 Nov 2014 23:51:25 +0100
Subject: ACCESS: Implement cmdEndVideo

---
 engines/access/scripts.cpp | 7 +++++--
 engines/access/scripts.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2336e78041..d4bd5ad644 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -133,7 +133,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
 		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::cmdDead, &Scripts::cmdFadeOut,
-		&Scripts::CMDENDVID
+		&Scripts::cmdEndVideo
 	};
 
 	(this->*COMMAND_LIST[commandIndex])();
@@ -862,6 +862,9 @@ void Scripts::cmdFadeOut() {
 	_vm->_screen->forceFadeOut();
 }
 
-void Scripts::CMDENDVID() { error("TODO CMDENDVID"); }
+void Scripts::cmdEndVideo() {
+	_vm->_video->closeVideo();
+	_vm->_video->_videoEnd = true;
+}
 
 } // End of namespace Access
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index ebee79d458..b6a3dc4dd9 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -122,7 +122,7 @@ protected:
 	void cmdDead();
 	void cmdDead(int deathId);
 	void cmdFadeOut();
-	void CMDENDVID();
+	void cmdEndVideo();
 public:
 	int _sequence;
 	bool _endFlag;
-- 
cgit v1.2.3


From d2d75dd4a7b3b7d2a90186adf82d45c1c18e3c2a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 17:55:55 -0500
Subject: ACCESS: Workaround for original game bug doing inventory check

In scene 31, moving the corrugated metal does a check on an invalid item
index
---
 engines/access/inventory.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 34470ace1e..11baa8fc08 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -87,7 +87,10 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 }
 
 int &InventoryManager::operator[](int idx) {
-	return _inv[idx]._value;
+	// WORKAROUND: At least in Amazon, some game scripts accidentally do reads
+	// beyond the length of the inventory array
+	static int invalid = 0;
+	return (idx >= _inv.size()) ? invalid : _inv[idx]._value;
 }
 
 int InventoryManager::useItem() { 
-- 
cgit v1.2.3


From a9131a93c377311addf8f74d0b71fe6c8fac3aa7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 18:37:22 -0500
Subject: ACCESS: Fix freeing alternate player sprites resource

---
 engines/access/amazon/amazon_room.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 3381688356..762daf06d6 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -211,8 +211,8 @@ void AmazonRoom::init4Quads() {
 }
 
 void AmazonRoom::clearRoom() {
-	Room::clearRoom();
 	_game->freeInactivePlayer();
+	Room::clearRoom();
 }
 
 } // End of namespace Amazon
-- 
cgit v1.2.3


From cdb2159ba282bd8218db86651199ee8072603525 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 18:37:34 -0500
Subject: ACCESS: Workaround for original Amazon bug trying to draw player in
 cutscene

In scene 33, the game briefly adds the player to the _images list, even
though no player sprites have been loaded, since it's a cutscene scene
---
 engines/access/player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 2abe9ad097..7adfc5ec0f 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -666,7 +666,8 @@ void Player::plotCom1() {
 }
 
 void Player::plotCom2() {
-	if (!_playerOff)
+	// WORKAROUND: Amazon has at least one cutscene with the player not properly turned off
+	if (!_playerOff && _spritesPtr != nullptr)
 		_vm->_images.addToList(*this);
 }
 
-- 
cgit v1.2.3


From 36a3c5d2341204cbbba8bd067f90e65820edb72b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Nov 2014 00:54:45 +0100
Subject: ACCESS: Implement riverJumpTest

---
 engines/access/amazon/amazon_scripts.cpp | 58 +++++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  4 ++-
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index e4c58c9eb5..c61229b5d1 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1733,10 +1733,60 @@ void AmazonScripts::initRiver() {
 	_game->_saveRiver = 0;
 }
 
-bool AmazonScripts::JUMPTEST() {
-	warning("TODO: JUMPTEST();");
+void AmazonScripts::RESETPOSITIONS() {
+	warning("TODO: RESETPOSITIONS");
+}
+
+void AmazonScripts::CHECKRIVERPAN() {
+	warning("TODO: CHECKRIVERPAN");
+}
+
+bool AmazonScripts::riverJumpTest() {
+	if (_vm->_screen->_scrollCol == 120 || _vm->_screen->_scrollCol == 60 || _vm->_screen->_scrollCol == 0) {
+		int val = _game->_mapPtr[0];
+		++_game->_mapPtr;
+		if (val == 0xFF)
+			return true;
+		_game->_oldScrollCol = _vm->_screen->_scrollCol;
+
+		if (val == 0) {
+			_vm->_screen->_scrollCol = 139;
+			_vm->_screen->_scrollX = 14;
+			_vm->_room->buildScreen();
+			RESETPOSITIONS();
+			return false;
+		}
+	} else if (_vm->_screen->_scrollCol == 105) {
+		int val1 = _game->_mapPtr[1];
+		int val2 = _game->_mapPtr[2];
+		_game->_mapPtr += 3;
+		if (_game->_canoeLane < 3) {
+			if (val1 != 0) {
+				_game->_deathFlag = true;
+				_game->_deathCount = 300;
+				_game->_deathType = val2;
+			}
+		} else {
+			if (val1 != 1) {
+				_game->_deathFlag = true;
+				_game->_deathCount = 300;
+				_game->_deathType = val2;
+			}
+			_game->_oldScrollCol = _vm->_screen->_scrollCol;
+			_vm->_screen->_scrollCol = 44;
+			_vm->_screen->_scrollX = 14;
+			_vm->_room->buildScreen();
+			RESETPOSITIONS();
+			return false;
+		}
+	}
 
-	return true;
+	_vm->_screen->_scrollX = 14;
+	--_vm->_screen->_scrollCol;
+	_vm->_buffer1.moveBufferRight();
+	_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
+	CHECKRIVERPAN();
+	return false;
 }
 
 void AmazonScripts::riverSound() {
@@ -1784,7 +1834,7 @@ void AmazonScripts::RIVER() {
 		int bx = _vm->_player->_scrollAmount - _screenVertX;
 		if (_vm->_screen->_scrollX == 0) {
 			_vm->_sound->midiRepeat();
-			if (JUMPTEST()) {
+			if (riverJumpTest()) {
 				CHICKENOUTFLG = false;
 				return;
 			}
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 7162bab057..155afb8ac7 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -96,7 +96,9 @@ protected:
 	void doCast(int param1);
 	void loadBackground(int param1, int param2);
 	void initRiver();
-	bool JUMPTEST();
+	void RESETPOSITIONS();
+	void CHECKRIVERPAN();
+	bool riverJumpTest();
 	void riverSound();
 	void MOVECANOE();
 	void UPDATEOBSTACLES();
-- 
cgit v1.2.3


From 74a15d659989f90140b8ff30ad4af4783802b758 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 18:59:39 -0500
Subject: ACCESS: Fix the mWhileDownRiver cutscene

---
 engines/access/amazon/amazon_resources.cpp | 17 ++++++++
 engines/access/amazon/amazon_resources.h   |  2 +
 engines/access/amazon/amazon_scripts.cpp   | 70 +++++++++++-------------------
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 192af2c9b6..af631eae7e 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1557,6 +1557,23 @@ const byte MAP2[32] = {
 
 const byte *MAPTBL[3] = {MAP0, MAP1, MAP2};
 
+const int DOWNRIVEROBJ[14][4] = {
+	{ 3, 77, 0, 40 },
+	{ 2, 30, 0, 30 },
+	{ 2, 290, 0, 50 },
+	{ 1, 210, 0, 70 },
+	{ 2, 350, 0, 30 },
+	{ 1, 370, 0, 20 },
+	{ 2, 480, 0, 60 },
+	{ 3, 395, 0, 10 },
+	{ 1, 550, 0, 30 },
+	{ 2, 620, 0, 50 },
+	{ 1, 690, 0, 10 },
+	{ 2, 715, 0, 40 },
+	{ 1, 770, 0, 30 },
+	{ 3, 700, 0, 20 }
+};
+
 const RiverStruct RIVER0OBJECTS[45] = {
 	{16,  31, 6400, 0, 4, 12},
 	{16,  31, 6200, 0, 2, 12},
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index ec412766bc..02560ccac4 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -99,6 +99,8 @@ extern const byte MAP2[32];
 
 extern const byte *MAPTBL[3];
 
+extern const int DOWNRIVEROBJ[14][4];
+
 extern const RiverStruct RIVER0OBJECTS[45];
 extern const RiverStruct ENDRIVER0[1];
 extern const RiverStruct RIVER1OBJECTS[49];
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index c61229b5d1..4fc0a4ba91 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -782,23 +782,6 @@ void AmazonScripts::scrollRiver() {
 }
 
 void AmazonScripts::mWhileDownRiver() {
-	static const int RIVEROBJ[14][4] = {
-		{3,  77, 0, 40},
-		{2,  30, 0, 30},
-		{2, 290, 0, 50},
-		{1, 210, 0, 70},
-		{2, 350, 0, 30},
-		{1, 370, 0, 20},
-		{2, 480, 0, 60},
-		{3, 395, 0, 10},
-		{1, 550, 0, 30},
-		{2, 620, 0, 50},
-		{1, 690, 0, 10},
-		{2, 715, 0, 40},
-		{1, 770, 0, 30},
-		{3, 700, 0, 20}
-	};
-
 	_vm->_events->hideCursor();
 	_vm->_screen->setDisplayScan();
 	_vm->_screen->clearScreen();
@@ -813,8 +796,6 @@ void AmazonScripts::mWhileDownRiver() {
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 
-	// KEYFLG = 0;
-
 	_vm->_player->_scrollAmount = 2;
 	_vm->_destIn = &_vm->_buffer2;
 	_xTrack = -7;
@@ -829,10 +810,10 @@ void AmazonScripts::mWhileDownRiver() {
 	_pNumObj = 14;
 	for (int i = 0; i <_pNumObj; i++) {
 		_pObject[i] = _vm->_objectsTable[33];
-		_pImgNum[i] = RIVEROBJ[i][0];
-		_pObjX[i] = RIVEROBJ[i][1];
-		_pObjY[i] = RIVEROBJ[i][2];
-		_pObjZ[i] = RIVEROBJ[i][3];
+		_pImgNum[i] = DOWNRIVEROBJ[i][0];
+		_pObjX[i] = DOWNRIVEROBJ[i][1];
+		_pObjY[i] = DOWNRIVEROBJ[i][2];
+		_pObjZ[i] = DOWNRIVEROBJ[i][3];
 		_pObjXl[i] = _pObjYl[i] = 0;
 	}
 
@@ -843,34 +824,35 @@ void AmazonScripts::mWhileDownRiver() {
 	_game->_timers[4]._initTm = 350;
 	++_game->_timers[4]._flag;
 
-	while(true) {
+	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
+			(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth)) {
 		_vm->_images.clear();
 		_vm->_events->_vbCount = 6;
-		while ((_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth) && _vm->_events->_vbCount) {
-			jungleMove();
-			while (_vm->_screen->_scrollX >= TILE_WIDTH) {
-				_vm->_screen->_scrollX -= TILE_WIDTH;
-				++_vm->_screen->_scrollCol;
-				_vm->_buffer1.moveBufferLeft();
-				_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
-			}
 
-			pan();
-			scrollRiver();
+		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
+			_vm->_screen->_scrollX -= TILE_WIDTH;
+			++_vm->_screen->_scrollCol;
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+		}
 
-			if (_game->_timers[3]._flag == 0) {
-				_game->_timers[3]._flag = 1;
-				_vm->_sound->playSound(1);
-			} else if (_game->_timers[4]._flag == 0) {
-				_game->_timers[4]._flag = 1;
-				_vm->_sound->playSound(0);
-			}
+		pan();
+		scrollRiver();
 
-			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-				_vm->_events->pollEventsAndWait();
-			}
+		if (!_game->_timers[3]._flag) {
+			++_game->_timers[3]._flag;
+			_vm->_sound->playSound(1);
+		} else if (!_game->_timers[4]._flag) {
+			++_game->_timers[4]._flag;
+			_vm->_sound->playSound(0);
+		}
+
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+			_vm->_events->pollEventsAndWait();
 		}
 	}
+
 	_vm->_events->showCursor();
 }
 
-- 
cgit v1.2.3


From cc07c2e5a229381a5efe5d2aa092270b6dd0b75a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Nov 2014 01:35:24 +0100
Subject: ACCESS: Implement two more RIVER related functions

---
 engines/access/amazon/amazon_game.h        |  4 ++--
 engines/access/amazon/amazon_resources.cpp | 14 +++++++-------
 engines/access/amazon/amazon_resources.h   | 16 ++++++++--------
 engines/access/amazon/amazon_scripts.cpp   | 30 ++++++++++++++++++++++--------
 engines/access/amazon/amazon_scripts.h     |  4 ++--
 5 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 05caa21018..c646f513b1 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -103,8 +103,8 @@ public:
 	bool _charSegSwitch;
 	bool _skipStart;
 
-	const RiverStruct *_topList;
-	const RiverStruct *_botList;
+	RiverStruct *_topList;
+	RiverStruct *_botList;
 	int _canoeDir;
 
 	// Fields that are mapped to flags
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index af631eae7e..23929ef4ba 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1574,7 +1574,7 @@ const int DOWNRIVEROBJ[14][4] = {
 	{ 3, 700, 0, 20 }
 };
 
-const RiverStruct RIVER0OBJECTS[45] = {
+RiverStruct RIVER0OBJECTS[45] = {
 	{16,  31, 6400, 0, 4, 12},
 	{16,  31, 6200, 0, 2, 12},
 	{17,  30, 6100, 0, 3, 15},
@@ -1622,9 +1622,9 @@ const RiverStruct RIVER0OBJECTS[45] = {
 	{17,  30,  305, 0, 2, 15}
 };
 
-const RiverStruct ENDRIVER0[1] = {16, 31, 260, 0, 7, 12};
+RiverStruct ENDRIVER0[1] = {16, 31, 260, 0, 7, 12};
 
-const RiverStruct RIVER1OBJECTS[49] = {
+RiverStruct RIVER1OBJECTS[49] = {
 	{16,  31, 6920, 0, 1, 12},
 	{16,  31, 6740, 0, 4, 12},
 	{17,  30, 6699, 0, 1, 15},
@@ -1676,9 +1676,9 @@ const RiverStruct RIVER1OBJECTS[49] = {
 	{17,  30,  305, 0, 3, 15}
 };
 
-const RiverStruct ENDRIVER1[1] = {16, 31, 260, 0, 1, 12};
+RiverStruct ENDRIVER1[1] = {16, 31, 260, 0, 1, 12};
 
-const RiverStruct RIVER2OBJECTS[53] = {
+RiverStruct RIVER2OBJECTS[53] = {
 	{16,  31, 8230, 0, 6, 12},
 	{16,  31, 8115, 0, 7, 12},
 	{17,  30, 7955, 0, 4, 15},
@@ -1734,9 +1734,9 @@ const RiverStruct RIVER2OBJECTS[53] = {
 	{17,  30,  305, 0, 3, 15}
 };
 
-const RiverStruct ENDRIVER2[1] = {16, 31, 260, 0, 6, 12};
+RiverStruct ENDRIVER2[1] = {16, 31, 260, 0, 6, 12};
 
-const RiverStruct *RIVEROBJECTTBL[6] = {
+RiverStruct *RIVEROBJECTTBL[6] = {
 	RIVER0OBJECTS, ENDRIVER0, RIVER1OBJECTS, 
 	ENDRIVER1, RIVER2OBJECTS, ENDRIVER2
 };
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 02560ccac4..99ce40e965 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -101,14 +101,14 @@ extern const byte *MAPTBL[3];
 
 extern const int DOWNRIVEROBJ[14][4];
 
-extern const RiverStruct RIVER0OBJECTS[45];
-extern const RiverStruct ENDRIVER0[1];
-extern const RiverStruct RIVER1OBJECTS[49];
-extern const RiverStruct ENDRIVER1[1];
-extern const RiverStruct RIVER2OBJECTS[53];
-extern const RiverStruct ENDRIVER2[1];
-
-extern const RiverStruct *RIVEROBJECTTBL[6];
+extern RiverStruct RIVER0OBJECTS[45];
+extern RiverStruct ENDRIVER0[1];
+extern RiverStruct RIVER1OBJECTS[49];
+extern RiverStruct ENDRIVER1[1];
+extern RiverStruct RIVER2OBJECTS[53];
+extern RiverStruct ENDRIVER2[1];
+
+extern RiverStruct *RIVEROBJECTTBL[6];
 
 } // End of namespace Amazon
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 4fc0a4ba91..3bd1148b64 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1699,7 +1699,7 @@ void AmazonScripts::initRiver() {
 	_game->_riverIndex = _game->_riverFlag;
 	_game->_topList = RIVEROBJECTTBL[_game->_riverIndex];
 	UPDATEOBSTACLES();
-	SETPHYSX();
+	riverSetPhysX();
 	_game->_canoeDir = 0;
 	_game->_deathFlag = 0;
 	_game->_deathCount = 0;
@@ -1715,8 +1715,16 @@ void AmazonScripts::initRiver() {
 	_game->_saveRiver = 0;
 }
 
-void AmazonScripts::RESETPOSITIONS() {
-	warning("TODO: RESETPOSITIONS");
+void AmazonScripts::resetPositions() {
+	riverSetPhysX();
+	int val = (_vm->_screen->_scrollCol + 1 - _game->_oldScrollCol) * 16;
+	if (val > 256) {
+		val &= 0x7F;
+		val |= 0x80;
+	}
+
+	for (int i = 0; i < _pNumObj; i++)
+		_pObjX[i] += val;
 }
 
 void AmazonScripts::CHECKRIVERPAN() {
@@ -1735,7 +1743,7 @@ bool AmazonScripts::riverJumpTest() {
 			_vm->_screen->_scrollCol = 139;
 			_vm->_screen->_scrollX = 14;
 			_vm->_room->buildScreen();
-			RESETPOSITIONS();
+			resetPositions();
 			return false;
 		}
 	} else if (_vm->_screen->_scrollCol == 105) {
@@ -1758,7 +1766,7 @@ bool AmazonScripts::riverJumpTest() {
 			_vm->_screen->_scrollCol = 44;
 			_vm->_screen->_scrollX = 14;
 			_vm->_room->buildScreen();
-			RESETPOSITIONS();
+			resetPositions();
 			return false;
 		}
 	}
@@ -1794,8 +1802,14 @@ void AmazonScripts::UPDATEOBSTACLES() {
 	warning("TODO: UPDATEOBSTACLES()");
 }
 
-void AmazonScripts::SETPHYSX() {
-	warning("TODO: SETPHYSX()");
+void AmazonScripts::riverSetPhysX() {
+	int val = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+	RiverStruct *si = _game->_topList;
+	RiverStruct *di = _game->_botList;
+	while (si <= di) {
+		si[0]._field5 = val - (_screenVertX - si[0]._field3);
+		si = &si[1];
+	}
 }
 
 void AmazonScripts::RIVERCOLLIDE() {
@@ -1842,7 +1856,7 @@ void AmazonScripts::RIVER() {
 		}
 		
 		UPDATEOBSTACLES();
-		SETPHYSX();
+		riverSetPhysX();
 		RIVERCOLLIDE();
 		if (_game->_hitSafe != 0)
 			_game->_hitSafe -= 2;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 155afb8ac7..2b634ca89a 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -96,13 +96,13 @@ protected:
 	void doCast(int param1);
 	void loadBackground(int param1, int param2);
 	void initRiver();
-	void RESETPOSITIONS();
+	void resetPositions();
 	void CHECKRIVERPAN();
 	bool riverJumpTest();
 	void riverSound();
 	void MOVECANOE();
 	void UPDATEOBSTACLES();
-	void SETPHYSX();
+	void riverSetPhysX();
 	void RIVERCOLLIDE();
 	void SCROLLRIVER1();
 	void setRiverPan();
-- 
cgit v1.2.3


From 68dc425cd4ba6907be6b1fa46c2251e5715b8803 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Nov 2014 21:13:55 -0500
Subject: ACCESS: Implemented buildRow for vertical screen scrolling

---
 engines/access/asurface.cpp |  4 ++--
 engines/access/room.cpp     | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index dbbf119171..96cb1991be 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -337,12 +337,12 @@ void ASurface::moveBufferRight() {
 
 void ASurface::moveBufferUp() {
 	byte *p = (byte *)getPixels();
-	Common::copy(p + w, p + (w * h), p);
+	Common::copy(p + (w * TILE_HEIGHT), p + (w * h), p);
 }
 
 void ASurface::moveBufferDown() {
 	byte *p = (byte *)getPixels();
-	Common::copy_backward(p, p + (w * (h - 1)), p + (w * h));
+	Common::copy_backward(p, p + (w * (h - TILE_HEIGHT)), p + (w * h));
 }
 
 } // End of namespace Access
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 37746d1b7c..f32bc95ae0 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -339,7 +339,27 @@ void Room::buildColumn(int playX, int screenX) {
 }
 
 void Room::buildRow(int playY, int screenY) {
-	error("TODO: buildRow");
+	if (playY < 0 || playY >= _playFieldHeight)
+		return;
+	assert(screenY <= (_vm->_screen->h - TILE_HEIGHT));
+
+	const byte *pSrc = _playField + screenY *_playFieldWidth + _vm->_screen->_scrollCol;
+
+	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
+	int w = MIN(_vm->_screen->_vWindowWidth + 1, _playFieldWidth);
+
+	for (int x = 0; x < w; ++x) {
+		byte *pTile = _tile + (*pSrc << 8);
+		byte *pDest = (byte *)_vm->_buffer1.getBasePtr(w * TILE_WIDTH, screenY);
+
+		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
+			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
+			pTile += TILE_WIDTH;
+			pDest += _vm->_buffer1.pitch;
+		}
+
+		++pSrc;
+	}
 }
 
 void Room::loadPlayField(int fileNum, int subfile) {
-- 
cgit v1.2.3


From 0c4fdc6a4896a4690af45aa0aabe77d90fffcaaf Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Nov 2014 13:13:53 +0100
Subject: ACCESS: Implement some more RIVER functions

---
 engines/access/amazon/amazon_scripts.cpp | 30 +++++++++++++++++++++++-------
 engines/access/amazon/amazon_scripts.h   |  5 +++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 3bd1148b64..3f0e53e6df 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1727,8 +1727,15 @@ void AmazonScripts::resetPositions() {
 		_pObjX[i] += val;
 }
 
-void AmazonScripts::CHECKRIVERPAN() {
-	warning("TODO: CHECKRIVERPAN");
+void AmazonScripts::checkRiverPan() {
+	int val = (_vm->_screen->_scrollCol + 20) * 16;
+
+	for (int i = 0; i < _pNumObj; i++) {
+		if (_pObjX[i] < val)
+			return;
+	}
+
+	setRiverPan();
 }
 
 bool AmazonScripts::riverJumpTest() {
@@ -1775,7 +1782,7 @@ bool AmazonScripts::riverJumpTest() {
 	--_vm->_screen->_scrollCol;
 	_vm->_buffer1.moveBufferRight();
 	_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
-	CHECKRIVERPAN();
+	checkRiverPan();
 	return false;
 }
 
@@ -1816,8 +1823,17 @@ void AmazonScripts::RIVERCOLLIDE() {
 	warning("TODO: RIVERCOLLIDE()");
 }
 
-void AmazonScripts::SCROLLRIVER1() {
-	warning("TODO: SCROLLRIVER1()");
+void AmazonScripts::PLOTRIVER() {
+	warning("TODO: PLOTRIVER");
+}
+
+void AmazonScripts::scrollRiver1() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	PLOTRIVER();
+	_vm->plotList();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
 }
 
 void AmazonScripts::RIVER() {
@@ -1876,10 +1892,10 @@ void AmazonScripts::RIVER() {
 		
 		if (_vm->_events->_mousePos.y >= 24 && _vm->_events->_mousePos.y <= 136) {
 			_vm->_events->hideCursor();
-			SCROLLRIVER1();
+			scrollRiver1();
 			_vm->_events->pollEvents();
 		} else
-			SCROLLRIVER1();
+			scrollRiver1();
 
 		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
 			_vm->_events->pollEventsAndWait();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 2b634ca89a..1e3290e8e7 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -97,14 +97,15 @@ protected:
 	void loadBackground(int param1, int param2);
 	void initRiver();
 	void resetPositions();
-	void CHECKRIVERPAN();
+	void checkRiverPan();
 	bool riverJumpTest();
 	void riverSound();
 	void MOVECANOE();
 	void UPDATEOBSTACLES();
 	void riverSetPhysX();
 	void RIVERCOLLIDE();
-	void SCROLLRIVER1();
+	void PLOTRIVER();
+	void scrollRiver1();
 	void setRiverPan();
 	void RIVER();
 	void plotInactive();
-- 
cgit v1.2.3


From 51ccd0c1fbbb2065441e6c7fbbe7f6ec6c3c3e3e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Nov 2014 21:10:29 +0100
Subject: ACCESS: Implement moveCanoe

---
 engines/access/amazon/amazon_resources.cpp |  7 ++-
 engines/access/amazon/amazon_resources.h   |  3 +
 engines/access/amazon/amazon_scripts.cpp   | 98 +++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_scripts.h     |  2 +-
 4 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 23929ef4ba..08b57957ec 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1209,9 +1209,10 @@ const char *const NO_HELP_MESSAGE =
 	"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \
 HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \
 YOU CAN UNDERSTAND.";
-const char *const NO_HINTS_MESSAGE =
-	"THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME.";
-
+const char *const NO_HINTS_MESSAGE = "THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME.";
+const char *const HIT1 = "YOU HIT THE ROCKS AND THE CANOE BEGINS TO LEAK.";
+const char *const HIT2 = "YOU HIT THE ROCKS AND THE CANOE DEVELOPS SERIOUS LEAKS.";
+const char *const BAR_MESSAGE = "YOU ARE TOO BUSY TRYING TO KEEP FROM SINKING TO DO THAT";
 
 const byte DEATH_SCREENS[58] = {
 	0,  1,  0,  0,  0,  0,  0,  0,  2,  0,
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 99ce40e965..65a38dc660 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -62,6 +62,9 @@ extern const byte FONT6x6_DATA[];
 
 extern const char *const NO_HELP_MESSAGE;
 extern const char *const NO_HINTS_MESSAGE;
+extern const char *const HIT1;
+extern const char *const HIT2;
+extern const char *const BAR_MESSAGE;
 
 extern const byte DEATH_SCREENS[58];
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 3f0e53e6df..5e53e0b946 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -22,6 +22,7 @@
 
 #include "common/scummsys.h"
 #include "access/access.h"
+#include "access/resources.h"
 #include "access/amazon/amazon_game.h"
 #include "access/amazon/amazon_resources.h"
 #include "access/amazon/amazon_scripts.h"
@@ -1801,8 +1802,99 @@ void AmazonScripts::riverSound() {
 		_vm->_sound->playSound(1);
 }
 
-void AmazonScripts::MOVECANOE() {
-	warning("TODO: MOVECANOE();");
+void AmazonScripts::moveCanoe() {
+	if (_game->_canoeDir != 0) {
+		_game->_canoeYPos += _game->_canoeDir;
+		++_game->_canoeMoveCount;
+		if (_game->_canoeMoveCount == 5) {
+			_game->_canoeLane += _game->_canoeDir;
+			_game->_canoeDir = 0;
+		}
+		return;
+	}
+
+	_vm->_events->pollEvents();
+	if (_vm->_events->_leftButton) {
+		Common::Point pt = _vm->_events->calcRawMouse();
+		if (pt.y < 180) {
+			if (_vm->_events->_mousePos.x < RMOUSE[8][0]) {
+				printString(BAR_MESSAGE);
+				return;
+			}
+			_game->_saveRiver = 1;
+			_vm->_rScrollRow = _vm->_screen->_scrollRow;
+			_vm->_rScrollCol = _vm->_screen->_scrollCol;
+			_vm->_rScrollX = _vm->_screen->_scrollX;
+			_vm->_rScrollY = _vm->_screen->_scrollY;
+			_vm->_rOldRectCount = _vm->_oldRects.size();
+			_vm->_rNewRectCount = _vm->_newRects.size();
+			// _vm->_rKeyFlag = KEYFLG;
+			_vm->_mapOffset = _game->_mapPtr - MAPTBL[_game->_riverFlag];
+			_vm->doLoadSave();
+			if (_vm->_room->_function == 1) {
+				_endFlag = true;
+				_returnCode = 0;
+			} else {
+				_game->_saveRiver = 0;
+				_vm->_room->buildScreen();
+				_vm->copyBF2Vid();
+			}
+			return;
+		} 
+		
+		if (pt.y <= _game->_canoeYPos) {
+			if (_game->_canoeLane == 0)
+				return;
+
+			_game->_canoeDir = -1;
+			_game->_canoeMoveCount = 0;
+			_game->_canoeYPos += _game->_canoeDir;
+			++_game->_canoeMoveCount;
+			if (_game->_canoeMoveCount == 5) {
+				_game->_canoeLane += _game->_canoeDir;
+				_game->_canoeDir = 0;
+			}
+		} else {
+			if (_game->_canoeLane == 7)
+				return;
+
+			_game->_canoeDir = 1;
+			_game->_canoeMoveCount = 0;
+			_game->_canoeYPos += _game->_canoeDir;
+			++_game->_canoeMoveCount;
+			if (_game->_canoeMoveCount == 5) {
+				_game->_canoeLane += _game->_canoeDir;
+				_game->_canoeDir = 0;
+			}
+		}
+		return;
+	}	
+
+	if (_vm->_player->_move == UP) {
+		if (_game->_canoeLane == 0)
+			return;
+
+		_game->_canoeDir = -1;
+		_game->_canoeMoveCount = 0;
+		_game->_canoeYPos += _game->_canoeDir;
+		++_game->_canoeMoveCount;
+		if (_game->_canoeMoveCount == 5) {
+			_game->_canoeLane += _game->_canoeDir;
+			_game->_canoeDir = 0;
+		}
+	} else if (_vm->_player->_move == DOWN) {
+		if (_game->_canoeLane == 7)
+			return;
+
+		_game->_canoeDir = 1;
+		_game->_canoeMoveCount = 0;
+		_game->_canoeYPos += _game->_canoeDir;
+		++_game->_canoeMoveCount;
+		if (_game->_canoeMoveCount == 5) {
+			_game->_canoeLane += _game->_canoeDir;
+			_game->_canoeDir = 0;
+		}
+	}
 }
 
 void AmazonScripts::UPDATEOBSTACLES() {
@@ -1864,7 +1956,7 @@ void AmazonScripts::RIVER() {
 
 		riverSound();
 		pan();
-		MOVECANOE();
+		moveCanoe();
 
 		if (_vm->_room->_function == 1) {
 			CHICKENOUTFLG = false;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 1e3290e8e7..20fca8ea70 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -100,7 +100,7 @@ protected:
 	void checkRiverPan();
 	bool riverJumpTest();
 	void riverSound();
-	void MOVECANOE();
+	void moveCanoe();
 	void UPDATEOBSTACLES();
 	void riverSetPhysX();
 	void RIVERCOLLIDE();
-- 
cgit v1.2.3


From f1b99b0ede325c1f447ce79e2c00159871ee1462 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Nov 2014 23:29:57 +0100
Subject: ACCESS: Implement plotRiver

---
 engines/access/amazon/amazon_scripts.cpp | 45 ++++++++++++++++++++++++++------
 engines/access/amazon/amazon_scripts.h   |  2 +-
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 5e53e0b946..2c16938ea8 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1903,11 +1903,10 @@ void AmazonScripts::UPDATEOBSTACLES() {
 
 void AmazonScripts::riverSetPhysX() {
 	int val = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
-	RiverStruct *si = _game->_topList;
-	RiverStruct *di = _game->_botList;
-	while (si <= di) {
-		si[0]._field5 = val - (_screenVertX - si[0]._field3);
-		si = &si[1];
+	RiverStruct *cur = _game->_topList;
+	while (cur <= _game->_botList) {
+		cur[0]._field5 = val - (_screenVertX - cur[0]._field3);
+		++cur;
 	}
 }
 
@@ -1915,14 +1914,44 @@ void AmazonScripts::RIVERCOLLIDE() {
 	warning("TODO: RIVERCOLLIDE()");
 }
 
-void AmazonScripts::PLOTRIVER() {
-	warning("TODO: PLOTRIVER");
+void AmazonScripts::plotRiver() {
+	if (_vm->_timers[3]._flag == 0) {
+		++_vm->_timers[3]._flag;
+		if (_game->_canoeFrame == 12)
+			_game->_canoeFrame = 0;
+		else
+			++_game->_canoeFrame;
+	}
+
+	ImageEntry ie;
+	ie._flags = 8;
+	ie._spritesPtr = _vm->_objectsTable[45];
+	ie._frameNumber = _game->_canoeFrame;
+	ie._position.x = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX + 160;
+	ie._position.y = _game->_canoeYPos - 41;
+	ie._offsetY = 41;
+	_vm->_images.addToList(ie);
+
+	RiverStruct *cur = _game->_topList;
+	while (cur <= _game->_botList) {
+		if (cur[0]._id != -1) {
+			ie._flags = 8;
+			ie._spritesPtr = _vm->_objectsTable[45];
+			ie._frameNumber = 0;
+			ie._position.x = cur[0]._field5;
+			int val = (cur[0]._lane * 5) + 56;
+			ie._position.y = val - cur[0]._field8;
+			ie._offsetY = cur[0]._field8;
+			_vm->_images.addToList(ie);
+		}
+		++cur;
+	}
 }
 
 void AmazonScripts::scrollRiver1() {
 	_vm->copyBF1BF2();
 	_vm->_newRects.clear();
-	PLOTRIVER();
+	plotRiver();
 	_vm->plotList();
 	_vm->copyRects();
 	_vm->copyBF2Vid();
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 20fca8ea70..ef7ead60c9 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -104,7 +104,7 @@ protected:
 	void UPDATEOBSTACLES();
 	void riverSetPhysX();
 	void RIVERCOLLIDE();
-	void PLOTRIVER();
+	void plotRiver();
 	void scrollRiver1();
 	void setRiverPan();
 	void RIVER();
-- 
cgit v1.2.3


From 8eeb5bd8e6a4f1e3ca7ff8f10c7487ebc75b6426 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 24 Nov 2014 19:18:30 -0500
Subject: ACCESS: Refine scene 9 workaround to stop movement problems on ship

---
 engines/access/amazon/amazon_room.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 762daf06d6..a942ed3ba8 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -182,7 +182,7 @@ void AmazonRoom::mainAreaClick() {
 
 		// WORKAROUND: In Amazon room 9, you can't leave the screen to the south due
 		// to not being able to click a Y position that's high enough
-		if (pt.y > 178)
+		if (_vm->_screen->_scrollRow == 0 && pt.y > 178)
 			pt.y = 200;
 
 		_vm->_player->_moveTo = pt;
-- 
cgit v1.2.3


From b01f5d61d7ad648c5d41a86682ce28bb8f9ddc88 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 24 Nov 2014 19:23:02 -0500
Subject: ACCESS: Fix vertically scrolling up the screen

---
 engines/access/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 7adfc5ec0f..2492345ec4 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -741,7 +741,7 @@ bool Player::scrollUp() {
 		_vm->_buffer1.moveBufferUp();
 
 		_vm->_room->buildRow(_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight,
-			_vm->_screen->_vWindowLinesTall * _vm->_screen->_bufferBytesWide);
+			_vm->_screen->_vWindowLinesTall);
 
 		if ((_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight) >=
 			_vm->_room->_playFieldHeight)
-- 
cgit v1.2.3


From 9fa0fc845e2cc20f400790be57b607b4e656078e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 24 Nov 2014 21:24:20 -0500
Subject: ACCESS: Fix 'bounce' when reaching left end of a horizontal scrolling
 scene

---
 engines/access/player.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 2492345ec4..70f688120c 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -814,8 +814,12 @@ bool Player::scrollRight() {
 	if (_vm->_screen->_scrollX < 0) {
 		do {
 			_vm->_screen->_scrollX += TILE_WIDTH;
-			if (--_vm->_screen->_scrollCol < 0)
+			if (--_vm->_screen->_scrollCol < 0) {
+				_scrollEnd = true;
+				_vm->_screen->_scrollX = 0;
+				_vm->_screen->_scrollCol = 0;
 				return true;
+			}
 
 			_vm->_buffer1.moveBufferRight();
 			_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
-- 
cgit v1.2.3


From 5674bed27bb43f0313e4d0a67ad94d4e41e8719c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 25 Nov 2014 07:28:35 +0100
Subject: ACCESS: Implement updateObstacles

---
 engines/access/amazon/amazon_scripts.cpp | 43 +++++++++++++++++++++++++++++---
 engines/access/amazon/amazon_scripts.h   |  2 +-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 2c16938ea8..b6d4987caa 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1699,7 +1699,7 @@ void AmazonScripts::initRiver() {
 
 	_game->_riverIndex = _game->_riverFlag;
 	_game->_topList = RIVEROBJECTTBL[_game->_riverIndex];
-	UPDATEOBSTACLES();
+	updateObstacles();
 	riverSetPhysX();
 	_game->_canoeDir = 0;
 	_game->_deathFlag = 0;
@@ -1897,8 +1897,43 @@ void AmazonScripts::moveCanoe() {
 	}
 }
 
-void AmazonScripts::UPDATEOBSTACLES() {
-	warning("TODO: UPDATEOBSTACLES()");
+void AmazonScripts::updateObstacles() {
+	RiverStruct *cur = _game->_topList;
+	while (true) {
+		int val = cur[0]._field1 + cur[0]._field3 - 1;
+		if (val < _screenVertX) {
+			cur = _game->_topList;
+			cur--;
+			_game->_botList = cur;
+			return;
+		}
+
+		if (cur[0]._field3 < _screenVertX + 319) {
+			_game->_topList = _game->_botList = cur;
+			break;
+		}
+
+		if (cur > RIVEROBJECTTBL[_game->_riverIndex + 1]) {
+			cur = _game->_topList;
+			cur--;
+			_game->_botList = cur;
+			return;
+		}
+	}
+
+	while (true) {
+		if (cur > RIVEROBJECTTBL[_game->_riverIndex + 1])
+			return;
+		++cur;
+		int val = cur[0]._field1 + cur[0]._field3 - 1;
+		if (val < _screenVertX)
+			return;
+
+		if (cur[0]._field3 >= _screenVertX + 319)
+			return;
+
+		_game->_botList = cur;
+	}
 }
 
 void AmazonScripts::riverSetPhysX() {
@@ -1992,7 +2027,7 @@ void AmazonScripts::RIVER() {
 			return;
 		}
 		
-		UPDATEOBSTACLES();
+		updateObstacles();
 		riverSetPhysX();
 		RIVERCOLLIDE();
 		if (_game->_hitSafe != 0)
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index ef7ead60c9..0f71e89e48 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -101,7 +101,7 @@ protected:
 	bool riverJumpTest();
 	void riverSound();
 	void moveCanoe();
-	void UPDATEOBSTACLES();
+	void updateObstacles();
 	void riverSetPhysX();
 	void RIVERCOLLIDE();
 	void plotRiver();
-- 
cgit v1.2.3


From 6e2d63e4cd8240cc1b0dae2096cbef7bde993afe Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 25 Nov 2014 07:48:13 +0100
Subject: ACCESS: Implement checkRiverCollide()

---
 engines/access/amazon/amazon_scripts.cpp | 26 ++++++++++++++++++++++----
 engines/access/amazon/amazon_scripts.h   |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index b6d4987caa..e83bc9f190 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1945,8 +1945,26 @@ void AmazonScripts::riverSetPhysX() {
 	}
 }
 
-void AmazonScripts::RIVERCOLLIDE() {
-	warning("TODO: RIVERCOLLIDE()");
+bool AmazonScripts::checkRiverCollide() {
+	if (_game->_hitSafe)
+		return false;
+
+	_game->_canoeVXPos = _screenVertX + 170;
+
+	for (RiverStruct *si = _game->_topList; si <= _game->_botList; ++si) {
+		if (si[0]._lane < _game->_canoeLane)
+			continue;
+
+		if ((si[0]._lane == _game->_canoeLane) || (si[0]._lane == _game->_canoeLane + 1)) {
+			if (si[0]._field1 + si[0]._field3 - 1 >= _game->_canoeVXPos) {
+				if (_game->_canoeVXPos + 124 >= si[0]._field3) {
+					_vm->_sound->playSound(4);
+					return true;
+				}
+			}
+		}
+	}
+	return false;
 }
 
 void AmazonScripts::plotRiver() {
@@ -2029,11 +2047,11 @@ void AmazonScripts::RIVER() {
 		
 		updateObstacles();
 		riverSetPhysX();
-		RIVERCOLLIDE();
+		bool checkCollide = checkRiverCollide();
 		if (_game->_hitSafe != 0)
 			_game->_hitSafe -= 2;
 
-		if (_game->_hitSafe < 0) {
+		if (checkCollide) {
 			cmdDead(RIVERDEATH[0]);
 			return;
 		}
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 0f71e89e48..1da10d8bdd 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -103,7 +103,7 @@ protected:
 	void moveCanoe();
 	void updateObstacles();
 	void riverSetPhysX();
-	void RIVERCOLLIDE();
+	bool checkRiverCollide();
 	void plotRiver();
 	void scrollRiver1();
 	void setRiverPan();
-- 
cgit v1.2.3


From a8c99d1986a902aaf65c760b365c49cce2174e30 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 25 Nov 2014 11:33:04 +0100
Subject: ACCESS: Some work on drawHelp (WIP)

---
 engines/access/amazon/amazon_game.cpp | 64 ++++++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_game.h   |  2 ++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 657458fa44..e864a921f7 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -624,8 +624,70 @@ void AmazonEngine::updateSummary(int chap) {
 	}
 }
 
+void AmazonEngine::HELPTITLE() {
+	warning("TODO: HELPTITLE");
+}
+
+void AmazonEngine::drawHelpText(const Common::String &msg) {
+	_screen->_maxChars = 39;
+	_screen->_printOrg = Common::Point(26, 58);
+	_screen->_printStart = Common::Point(26, 58);
+
+	Common::String lines = msg;
+	Common::String line;
+	int width = 0;
+	bool lastLine = false;
+	do {
+		lastLine = _fonts._font2.getLine(lines, _screen->_maxChars * 6, line, width);
+
+		// Set font colors
+		_fonts._font2._fontColors[0] = 0;
+		_fonts._font2._fontColors[1] = 27;
+		_fonts._font2._fontColors[2] = 28;
+		_fonts._font2._fontColors[3] = 29;
+
+		_fonts._font2.drawString(_screen, line, _screen->_printOrg);
+		_screen->_printOrg = Common::Point(_screen->_printStart.x, _screen->_printOrg.y + 8);
+	} while (!lastLine);
+
+	_events->showCursor();
+}
+
 void AmazonEngine::drawHelp() {
-	error("TODO: drawHelp");
+	_events->hideCursor();
+	if (_useItem == 0) {
+		_buffer2.copyBuffer(_screen);
+		if (_screen->_vesaMode) {
+			_screen->setPanel(2);
+			_screen->saveScreen();
+		}
+		_screen->setPalette();
+		_screen->fadeOut();
+		_screen->clearBuffer();
+		if (_moreHelp == 1) {
+			// Set cells
+			Common::Array<CellIdent> cells;
+			cells.push_back(CellIdent(95, 95, 3));
+			loadCells(cells);
+		}
+	}
+
+	_files->loadScreen(95, 2);
+	if (_moreHelp == 1) {
+		ASurface *oldDest = _destIn;
+		_destIn = _screen;
+		int oldClip = _screen->_clipHeight;
+		_screen->_clipHeight = 200;
+		_screen->plotImage(_objectsTable[95], 0, Common::Point(76, 168));
+		_destIn = oldDest;
+		_screen->_clipHeight = oldClip;		
+	}
+
+	if ((_useItem == 0) && (_screen->_vesaMode == 0))
+		_screen->fadeIn();
+
+	HELPTITLE();
+	drawHelpText("TODO: WHICH BUFFER?");
 }
 
 void AmazonEngine::startChapter(int chapter) {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index c646f513b1..0aea43575f 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -83,6 +83,8 @@ private:
 	 */
 	void setupGame();
 
+	void HELPTITLE();
+	void drawHelpText(const Common::String &msg);
 	void doCredit();
 	void scrollTitle();
 	void loadEstablish(int estabIndex);
-- 
cgit v1.2.3


From cc8a8bfdddaf66f6c3b8a7ac049a05b6877eb973 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 25 Nov 2014 07:47:19 -0500
Subject: ACCESS: Refactored Amazon specific player loading into new
 AmazonPlayer class

---
 engines/access/access.cpp                  |   2 +-
 engines/access/amazon/amazon_player.cpp    |  86 +++++++++++++++++++++
 engines/access/amazon/amazon_player.h      |  48 ++++++++++++
 engines/access/amazon/amazon_resources.cpp |  13 ++++
 engines/access/amazon/amazon_resources.h   |  13 ++++
 engines/access/animation.cpp               |   4 +-
 engines/access/module.mk                   |   1 +
 engines/access/player.cpp                  | 115 +++++++++++------------------
 engines/access/player.h                    |   8 +-
 engines/access/resources.cpp               |  12 ---
 engines/access/resources.h                 |  12 ---
 11 files changed, 210 insertions(+), 104 deletions(-)
 create mode 100644 engines/access/amazon/amazon_player.cpp
 create mode 100644 engines/access/amazon/amazon_player.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index cdabb323e4..88c62a74a7 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -165,7 +165,7 @@ void AccessEngine::initialize() {
 	_events = new EventsManager(this);
 	_files = new FileManager(this);
 	_inventory = new InventoryManager(this);
-	_player = new Player(this);
+	_player = Player::init(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
 	_video = new VideoPlayer(this);
diff --git a/engines/access/amazon/amazon_player.cpp b/engines/access/amazon/amazon_player.cpp
new file mode 100644
index 0000000000..ede7ab58e2
--- /dev/null
+++ b/engines/access/amazon/amazon_player.cpp
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/room.h"
+#include "access/amazon/amazon_game.h"
+#include "access/amazon/amazon_player.h"
+#include "access/amazon/amazon_resources.h"
+
+namespace Access {
+
+namespace Amazon {
+
+AmazonPlayer::AmazonPlayer(AccessEngine *vm) : Player(vm) {
+	_game = (AmazonEngine *)vm;
+}
+
+void AmazonPlayer::load() {
+	Player::load();
+
+	// Special scene setup for the top-down view when on the Slaver ship
+	if (_vm->_room->_roomFlag == 3) {
+		_playerOffset.x = _vm->_screen->_scaleTable1[8];
+		_playerOffset.y = _vm->_screen->_scaleTable1[11];
+		_leftDelta = 0;
+		_rightDelta = 8;
+		_upDelta = 2;
+		_downDelta = -2;
+		_scrollConst = 2;
+
+		for (int i = 0; i < PLAYER_DATA_COUNT; ++i) {
+			_walkOffRight[i] = OVEROFFR[i];
+			_walkOffLeft[i] = OVEROFFL[i];
+			_walkOffUp[i] = OVEROFFU[i];
+			_walkOffDown[i] = OVEROFFD[i];
+			_walkOffUR[i].x = OVEROFFURX[i];
+			_walkOffUR[i].y = OVEROFFURY[i];
+			_walkOffDR[i].x = OVEROFFDRX[i];
+			_walkOffDR[i].y = OVEROFFDRY[i];
+			_walkOffUL[i].x = OVEROFFULX[i];
+			_walkOffUL[i].y = OVEROFFULY[i];
+			_walkOffDL[i].x = OVEROFFDLX[i];
+			_walkOffDL[i].y = OVEROFFDLY[i];
+		}
+
+		_vm->_timers[8]._initTm = 7;
+		_vm->_timers[8]._timer = 7;
+		++_vm->_timers[8]._flag;
+
+		_sideWalkMin = 0;
+		_sideWalkMax = 5;
+		_upWalkMin = 12;
+		_upWalkMax = 17;
+		_downWalkMin = 6;
+		_downWalkMax = 11;
+		_diagUpWalkMin = 0;
+		_diagUpWalkMax = 5;
+		_diagDownWalkMin = 0;
+		_diagDownWalkMax = 5;
+		_game->_guard._position = Common::Point(56, 190);
+	}
+}
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_player.h b/engines/access/amazon/amazon_player.h
new file mode 100644
index 0000000000..200b530aa1
--- /dev/null
+++ b/engines/access/amazon/amazon_player.h
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_PLAYER_H
+#define ACCESS_AMAZON_PLAYER_H
+
+#include "common/scummsys.h"
+#include "access/player.h"
+
+namespace Access {
+
+namespace Amazon {
+
+class AmazonEngine;
+
+class AmazonPlayer: public Player {
+private:
+	AmazonEngine *_game;
+public:
+	AmazonPlayer(AccessEngine *vm);
+
+	virtual void load();
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_PLAYER_H */
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 08b57957ec..e03750fd52 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -245,6 +245,19 @@ const int TRAVEL_POS[][2] = {
 	{ 0, 0 }
 };
 
+const int OVEROFFR[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 };
+const int OVEROFFL[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 };
+const int OVEROFFU[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 };
+const int OVEROFFD[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 };
+const int OVEROFFURX[] = { 3, 1, 1, 2, 2, 1, 0, 0, 0 };
+const int OVEROFFURY[] = { 1, 0, 0, 1, 1, 0, 0, 0, 0 };
+const int OVEROFFDRX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
+const int OVEROFFDRY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
+const int OVEROFFULX[] = { 2, 1, 1, 1, 2, 1, 0, 0, 0 };
+const int OVEROFFULY[] = { 1, 0, 0, 2, 1, 0, 0, 0, 0 };
+const int OVEROFFDLX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
+const int OVEROFFDLY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
+
 const byte CREDITS[] = {
 	0x2, 0xFF, 0xFF, 0x61, 0x0, 0x3, 0x0, 0x30, 0x22, 0x30, 0x0, 0x0, 0x0,
 	0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF,
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 65a38dc660..4229522f44 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -44,6 +44,19 @@ extern const byte *CURSORS[10];
 
 extern const int TRAVEL_POS[][2];
 
+extern const int OVEROFFR[];
+extern const int OVEROFFL[];
+extern const int OVEROFFU[];
+extern const int OVEROFFD[];
+extern const int OVEROFFURX[];
+extern const int OVEROFFURY[];
+extern const int OVEROFFDRX[];
+extern const int OVEROFFDRY[];
+extern const int OVEROFFULX[];
+extern const int OVEROFFULY[];
+extern const int OVEROFFDLX[];
+extern const int OVEROFFDLY[];
+
 extern const byte *ROOM_TABLE[];
 extern const char *ROOM_DESCR[];
 extern const int ROOM_NUMB;
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 184b015371..e59874fe7a 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -222,9 +222,9 @@ void Animation::setFrame1(AnimationFrame *frame) {
 		ImageEntry ie;
 
 		// Set the flags
-		ie._flags = part->_flags & 0xF7;
+		ie._flags = part->_flags & ~IMGFLAG_UNSCALED;
 		if (_vm->_animation->_frameScale == -1)
-			ie._flags |= 8;
+			ie._flags |= IMGFLAG_UNSCALED;
 
 		// Set the other fields
 		ie._spritesPtr = _vm->_objectsTable[part->_spritesIndex];
diff --git a/engines/access/module.mk b/engines/access/module.mk
index b6e73b66bd..98464014ba 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -22,6 +22,7 @@ MODULE_OBJS := \
 	sound.o \
 	video.o \
 	amazon/amazon_game.o \
+	amazon/amazon_player.o \
 	amazon/amazon_resources.o \
 	amazon/amazon_room.o \
 	amazon/amazon_scripts.o \
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 70f688120c..b5046632c5 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -25,9 +25,19 @@
 #include "access/player.h"
 #include "access/access.h"
 #include "access/resources.h"
+#include "access/amazon/amazon_player.h"
 
 namespace Access {
 
+Player *Player::init(AccessEngine *vm) {
+	switch (vm->getGameID()) {
+	case GType_Amazon:
+		return new Amazon::AmazonPlayer(vm);
+	default:
+		return new Player(vm);
+	}
+}
+
 Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
 	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
@@ -71,81 +81,40 @@ Player::~Player() {
 }
 
 void Player::load() {
-	if (_vm->_room->_roomFlag == 3) {
-		_playerOffset.x = _vm->_screen->_scaleTable1[8];
-		_playerOffset.y = _vm->_screen->_scaleTable1[11];
-		_leftDelta = 0;
-		_rightDelta = 8;
-		_upDelta = 2;
-		_downDelta = -2;
-		_scrollConst = 2;
-
-		for (int i = 0; i < PLAYER_DATA_COUNT; ++i) {
-			_walkOffRight[i] = OVEROFFR[i];
-			_walkOffLeft[i] = OVEROFFL[i];
-			_walkOffUp[i] = OVEROFFU[i];
-			_walkOffDown[i] = OVEROFFD[i];
-			_walkOffUR[i].x = OVEROFFURX[i];
-			_walkOffUR[i].y = OVEROFFURY[i];
-			_walkOffDR[i].x = OVEROFFDRX[i];
-			_walkOffDR[i].y = OVEROFFDRY[i];
-			_walkOffUL[i].x = OVEROFFULX[i];
-			_walkOffUL[i].y = OVEROFFULY[i];
-			_walkOffDL[i].x = OVEROFFDLX[i];
-			_walkOffDL[i].y = OVEROFFDLY[i];
-		}
-
-		_vm->_timers[8]._initTm = 7;
-		_vm->_timers[8]._timer = 7;
-		++_vm->_timers[8]._flag;
-
-		_sideWalkMin = 0;
-		_sideWalkMax = 5;
-		_upWalkMin = 12;
-		_upWalkMax = 17;
-		_downWalkMin = 6;
-		_downWalkMax = 11;
-		_diagUpWalkMin = 0;
-		_diagUpWalkMax = 5;
-		_diagDownWalkMin = 0;
-		_diagDownWalkMax = 5;
-		_guard = Common::Point(56, 190);
-	} else {
-		_playerOffset.x = _vm->_screen->_scaleTable1[25];
-		_playerOffset.y = _vm->_screen->_scaleTable1[67];
-		_leftDelta = -3;
-		_rightDelta = 33;
-		_upDelta = 5;
-		_downDelta = -10;
-		_scrollConst = 5;
-
-		for (int i = 0; i < PLAYER_DATA_COUNT; ++i) {
-			_walkOffRight[i] = SIDEOFFR[i];
-			_walkOffLeft[i] = SIDEOFFL[i];
-			_walkOffUp[i] = SIDEOFFU[i];
-			_walkOffDown[i] = SIDEOFFD[i];
-			_walkOffUR[i].x = DIAGOFFURX[i];
-			_walkOffUR[i].y = DIAGOFFURY[i];
-			_walkOffDR[i].x = DIAGOFFDRX[i];
-			_walkOffDR[i].y = DIAGOFFDRY[i];
-			_walkOffUL[i].x = DIAGOFFULX[i];
-			_walkOffUL[i].y = DIAGOFFULY[i];
-			_walkOffDL[i].x = DIAGOFFDLX[i];
-			_walkOffDL[i].y = DIAGOFFDLY[i];
-		}
-
-		_sideWalkMin = 0;
-		_sideWalkMax = 7;
-		_upWalkMin = 16;
-		_upWalkMax = 23;
-		_downWalkMin = 8;
-		_downWalkMax = 15;
-		_diagUpWalkMin = 0;
-		_diagUpWalkMax = 7;
-		_diagDownWalkMin = 0;
-		_diagDownWalkMax = 7;
+	_playerOffset.x = _vm->_screen->_scaleTable1[25];
+	_playerOffset.y = _vm->_screen->_scaleTable1[67];
+	_leftDelta = -3;
+	_rightDelta = 33;
+	_upDelta = 5;
+	_downDelta = -10;
+	_scrollConst = 5;
+
+	for (int i = 0; i < PLAYER_DATA_COUNT; ++i) {
+		_walkOffRight[i] = SIDEOFFR[i];
+		_walkOffLeft[i] = SIDEOFFL[i];
+		_walkOffUp[i] = SIDEOFFU[i];
+		_walkOffDown[i] = SIDEOFFD[i];
+		_walkOffUR[i].x = DIAGOFFURX[i];
+		_walkOffUR[i].y = DIAGOFFURY[i];
+		_walkOffDR[i].x = DIAGOFFDRX[i];
+		_walkOffDR[i].y = DIAGOFFDRY[i];
+		_walkOffUL[i].x = DIAGOFFULX[i];
+		_walkOffUL[i].y = DIAGOFFULY[i];
+		_walkOffDL[i].x = DIAGOFFDLX[i];
+		_walkOffDL[i].y = DIAGOFFDLY[i];
 	}
 
+	_sideWalkMin = 0;
+	_sideWalkMax = 7;
+	_upWalkMin = 16;
+	_upWalkMax = 23;
+	_downWalkMin = 8;
+	_downWalkMax = 15;
+	_diagUpWalkMin = 0;
+	_diagUpWalkMax = 7;
+	_diagDownWalkMin = 0;
+	_diagDownWalkMax = 7;
+
 	_playerSprites = _playerSprites1;
 	if (_manPal1) {
 		Common::copy(_manPal1 + 0x270, _manPal1 + 0x270 + 0x60, _vm->_screen->_manPal);
diff --git a/engines/access/player.h b/engines/access/player.h
index ed48af0932..400770c21a 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -38,8 +38,8 @@ enum Direction { NONE = 0, UP = 1, DOWN = 2, LEFT = 3, RIGHT = 4,
 
 class AccessEngine;
 
-class Player: public ImageEntry, Manager {
-private:
+class Player: public ImageEntry, public Manager {
+protected:
 	int _leftDelta, _rightDelta;
 	int _upDelta, _downDelta;
 	int _scrollConst;
@@ -48,7 +48,6 @@ private:
 	int _downWalkMin, _downWalkMax;
 	int _diagUpWalkMin, _diagUpWalkMax;
 	int _diagDownWalkMin, _diagDownWalkMax;
-	Common::Point _guard;
 	SpriteResource *_playerSprites1;
 	byte *_manPal1;
 	int _scrollEnd;
@@ -113,8 +112,9 @@ public:
 public:
 	Player(AccessEngine *vm);
 	~Player();
+	static Player *init(AccessEngine *vm);
 
-	void load();
+	virtual void load();
 
 	void loadSprites(const Common::String &name);
 
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index e5a27a8ba1..9bef5cf879 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -58,18 +58,6 @@ const int DIAGOFFULX[] = { 4, 5, 4, 3, 3, 2, 2, 2, 0 };
 const int DIAGOFFULY[] = { 3, 3, 1, 2, 2, 1, 1, 1, 0 };
 const int DIAGOFFDLX[] = { 4, 5, 3, 3, 5, 4, 6, 1, 0 };
 const int DIAGOFFDLY[] = { 2, 2, 1, 2, 3, 1, 2, 1, 0 };
-const int OVEROFFR[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 };
-const int OVEROFFL[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 };
-const int OVEROFFU[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 };
-const int OVEROFFD[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 };
-const int OVEROFFURX[] = { 3, 1, 1, 2, 2, 1, 0, 0, 0 };
-const int OVEROFFURY[] = { 1, 0, 0, 1, 1, 0, 0, 0, 0 };
-const int OVEROFFDRX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
-const int OVEROFFDRY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
-const int OVEROFFULX[] = { 2, 1, 1, 1, 2, 1, 0, 0, 0 };
-const int OVEROFFULY[] = { 1, 0, 0, 2, 1, 0, 0, 0, 0 };
-const int OVEROFFDLX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 };
-const int OVEROFFDLY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 };
 
 const int RMOUSE[10][2] = {
 	{ 0, 35 }, { 0, 0 }, { 36, 70 }, { 71, 106 }, { 107, 141 },
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 6fb781e0d1..10f2adb97e 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -41,18 +41,6 @@ extern const int DIAGOFFULX[];
 extern const int DIAGOFFULY[];
 extern const int DIAGOFFDLX[];
 extern const int DIAGOFFDLY[];
-extern const int OVEROFFR[];
-extern const int OVEROFFL[];
-extern const int OVEROFFU[];
-extern const int OVEROFFD[];
-extern const int OVEROFFURX[];
-extern const int OVEROFFURY[];
-extern const int OVEROFFDRX[];
-extern const int OVEROFFDRY[];
-extern const int OVEROFFULX[];
-extern const int OVEROFFULY[];
-extern const int OVEROFFDLX[];
-extern const int OVEROFFDLY[];
 
 extern const int RMOUSE[10][2];
 
-- 
cgit v1.2.3


From 7a691f38cf866c43222ce7d555f6bc953de49017 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 25 Nov 2014 08:24:02 -0500
Subject: ACCESS: Fix guard movement logic on slaver boat

---
 engines/access/amazon/amazon_scripts.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index e83bc9f190..df6bb8f00f 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1085,10 +1085,11 @@ void AmazonScripts::guard() {
 
 	switch (_game->_guardLocation) {
 	case 1:
+		// Guard walking down
 		if (curCel <= 8 || curCel > 13)
 			_game->_guard._guardCel = curCel = 8;
 
-		_game->_guard._position.y = _vm->_player->_walkOffDown[curCel - 8];
+		_game->_guard._position.y += _vm->_player->_walkOffDown[curCel - 8];
 		guardSee();
 		if (_game->_guard._position.y >= 272) {
 			_game->_guard._position.y = 272;
@@ -1096,10 +1097,11 @@ void AmazonScripts::guard() {
 		}
 		break;
 	case 2:
+		// Guard walking left
 		if (curCel <= 43 || curCel > 48)
 			_game->_guard._guardCel = curCel = 43;
 
-		_game->_guard._position.x = _vm->_player->_walkOffLeft[curCel - 43];
+		_game->_guard._position.x -= _vm->_player->_walkOffLeft[curCel - 43];
 		guardSee();
 		if (_game->_guard._position.x <= 56) {
 			_game->_guard._position.x = 56;
@@ -1107,10 +1109,11 @@ void AmazonScripts::guard() {
 		}
 		break;
 	case 3:
+		// Guard walking up
 		if (curCel <= 0 || curCel > 5)
 			_game->_guard._guardCel = curCel = 0;
 
-		_game->_guard._position.y = _vm->_player->_walkOffUp[curCel];
+		_game->_guard._position.y -= _vm->_player->_walkOffUp[curCel];
 		guardSee();
 		if (_game->_guard._position.y <= 89) {
 			_game->_guard._position.y = 89;
@@ -1120,10 +1123,11 @@ void AmazonScripts::guard() {
 		}
 		break;
 	default:
+		// Guard walking right
 		if (curCel <= 43 || curCel > 48)
 			_game->_guard._guardCel = curCel = 43;
 
-		_game->_guard._position.x = _vm->_player->_walkOffRight[curCel - 43];
+		_game->_guard._position.x += _vm->_player->_walkOffRight[curCel - 43];
 		guardSee();
 		if (_game->_guard._position.x >= 127) {
 			_game->_guard._position.x = 127;
-- 
cgit v1.2.3


From 2ea4601589196ba91d2e87582cb5f9325e0b1f95 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 25 Nov 2014 14:56:29 +0100
Subject: ACCESS: Implement helpTitle

---
 engines/access/amazon/amazon_game.cpp      | 48 ++++++++++++++++++++++++++++--
 engines/access/amazon/amazon_game.h        |  4 ++-
 engines/access/amazon/amazon_resources.cpp | 17 +++++++++++
 engines/access/amazon/amazon_resources.h   |  3 +-
 4 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index e864a921f7..c12af5e339 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -624,8 +624,50 @@ void AmazonEngine::updateSummary(int chap) {
 	}
 }
 
-void AmazonEngine::HELPTITLE() {
-	warning("TODO: HELPTITLE");
+void AmazonEngine::CALCIQ() {
+	warning("TODO: CALCIQ");
+}
+
+void AmazonEngine::helpTitle() {
+	int width = _fonts._font2.stringWidth(_bubbleBox->_bubbleTitle);
+	int posX = 160 - (width / 2);
+	_fonts._font2._fontColors[0] = 0;
+	_fonts._font2._fontColors[1] = 33;
+	_fonts._font2._fontColors[2] = 34;
+	_fonts._font2._fontColors[3] = 35;
+	_fonts._font2.drawString(_screen, _bubbleBox->_bubbleTitle, Common::Point(posX, 24));
+
+	width = _fonts._font2.stringWidth(HELPLVLTXT[_helpLevel]);
+	posX = 160 - (width / 2);
+	_fonts._font2._fontColors[0] = 0;
+	_fonts._font2._fontColors[1] = 10;
+	_fonts._font2._fontColors[2] = 11;
+	_fonts._font2._fontColors[3] = 12;
+	_fonts._font2.drawString(_screen, HELPLVLTXT[_helpLevel], Common::Point(posX, 36));
+
+	Common::String iqText = "IQ: ";
+	CALCIQ();
+	Common::String IQSCORE = Common::String::format("d", _iqValue);
+	while (IQSCORE.size() != 4)
+		IQSCORE = " " + IQSCORE;
+
+	iqText += IQSCORE;
+	int index = _iqValue;
+	if (index == 170)
+		index = 169;
+
+	index /= 20;
+	
+	iqText += " ";
+	iqText += IQLABELS[index];
+
+	width = _fonts._font2.stringWidth(iqText);
+	posX = 160 - (width / 2);
+	_fonts._font2._fontColors[0] = 0;
+	_fonts._font2._fontColors[1] = 10;
+	_fonts._font2._fontColors[2] = 11;
+	_fonts._font2._fontColors[3] = 12;
+	_fonts._font2.drawString(_screen, iqText, Common::Point(posX, 44));
 }
 
 void AmazonEngine::drawHelpText(const Common::String &msg) {
@@ -686,7 +728,7 @@ void AmazonEngine::drawHelp() {
 	if ((_useItem == 0) && (_screen->_vesaMode == 0))
 		_screen->fadeIn();
 
-	HELPTITLE();
+	helpTitle();
 	drawHelpText("TODO: WHICH BUFFER?");
 }
 
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 0aea43575f..89d15d36e2 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -83,7 +83,8 @@ private:
 	 */
 	void setupGame();
 
-	void HELPTITLE();
+	void CALCIQ();
+	void helpTitle();
 	void drawHelpText(const Common::String &msg);
 	void doCredit();
 	void scrollTitle();
@@ -164,6 +165,7 @@ public:
 	bool _antEatFl;
 	bool _stabFl;
 	Common::Point _pitPos;
+	int _iqValue;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index e03750fd52..08ecfff467 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1226,6 +1226,23 @@ const char *const NO_HINTS_MESSAGE = "THE HELP SYSTEM HAS BEEN TURNED OFF FOR TH
 const char *const HIT1 = "YOU HIT THE ROCKS AND THE CANOE BEGINS TO LEAK.";
 const char *const HIT2 = "YOU HIT THE ROCKS AND THE CANOE DEVELOPS SERIOUS LEAKS.";
 const char *const BAR_MESSAGE = "YOU ARE TOO BUSY TRYING TO KEEP FROM SINKING TO DO THAT";
+const char *const HELPLVLTXT[3] = {
+	" LEVEL 1 ",
+	" LEVEL 2 ",
+	" LEVEL 3 "
+};
+
+const char *const IQLABELS[9] = {
+	"VEGETABLE",
+	"NEANDERTHAL",
+	"LOBOTOMIZED",
+	"DENSE",
+	"AVERAGE",
+	"INTELLIGENT",
+	"MURPHYITE",
+	"BRILLIANT",
+	"GENIUS"
+};
 
 const byte DEATH_SCREENS[58] = {
 	0,  1,  0,  0,  0,  0,  0,  0,  2,  0,
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 4229522f44..37b12d26cf 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -78,7 +78,8 @@ extern const char *const NO_HINTS_MESSAGE;
 extern const char *const HIT1;
 extern const char *const HIT2;
 extern const char *const BAR_MESSAGE;
-
+extern const char *const HELPLVLTXT[3];
+extern const char *const IQLABELS[9];
 extern const byte DEATH_SCREENS[58];
 
 extern const char *const DEATH_TEXT[58];
-- 
cgit v1.2.3


From 79fa346ca04a6a2a0ac7cb725d21ba496944feb1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 25 Nov 2014 17:06:54 +0100
Subject: ACCESS: Implement calcIQ

---
 engines/access/amazon/amazon_game.cpp | 31 ++++++++++++++++++++++++++++---
 engines/access/amazon/amazon_game.h   |  2 +-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index c12af5e339..33e5888cf4 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -624,8 +624,33 @@ void AmazonEngine::updateSummary(int chap) {
 	}
 }
 
-void AmazonEngine::CALCIQ() {
-	warning("TODO: CALCIQ");
+void AmazonEngine::calcIQ() {
+	int tmpIQ = 170;
+	for (int i = 0; i < 256; i++) {
+		if (_help1[i] == 1)
+			tmpIQ -= 3;
+	}
+
+	for (int i = 0; i < 256; i++) {
+		if (_help2[i] == 1)
+			tmpIQ -= 5;
+	}
+
+	for (int i = 0; i < 256; i++) {
+		if (_help3[i] == 1)
+			tmpIQ -= 10;
+	}
+
+	if (tmpIQ < 0)
+		tmpIQ = 0;
+
+	_iqValue = tmpIQ;
+
+	if (_iqValue <= 100)
+		_badEnd = 1;
+
+	if (_iqValue <= 0)
+		_noHints = 1;
 }
 
 void AmazonEngine::helpTitle() {
@@ -646,7 +671,7 @@ void AmazonEngine::helpTitle() {
 	_fonts._font2.drawString(_screen, HELPLVLTXT[_helpLevel], Common::Point(posX, 36));
 
 	Common::String iqText = "IQ: ";
-	CALCIQ();
+	calcIQ();
 	Common::String IQSCORE = Common::String::format("d", _iqValue);
 	while (IQSCORE.size() != 4)
 		IQSCORE = " " + IQSCORE;
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 89d15d36e2..6208796b8a 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -83,7 +83,7 @@ private:
 	 */
 	void setupGame();
 
-	void CALCIQ();
+	void calcIQ();
 	void helpTitle();
 	void drawHelpText(const Common::String &msg);
 	void doCredit();
-- 
cgit v1.2.3


From 451a29ada517fad99a5de823efca8758416ccd46 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 26 Nov 2014 00:03:40 +0100
Subject: ACCESS: Fix character in first screen when the intro is played

---
 engines/access/amazon/amazon_game.cpp | 9 +++++++--
 engines/access/amazon/amazon_game.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 33e5888cf4..6288ddb64b 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -107,6 +107,8 @@ void AmazonEngine::playGame() {
 	_screen->forceFadeOut();
 	_events->showCursor();
 
+	initVariables();
+
 	// If there's a pending savegame to load, load it
 	if (_loadSaveSlot != -1)
 		loadGameState(_loadSaveSlot);
@@ -430,8 +432,6 @@ void AmazonEngine::doTent() {
 }
 
 void AmazonEngine::setupGame() {
-	_chapter = 1;
-
 	// Setup timers
 	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
 	for (int i = 0; i < 32; ++i) {
@@ -456,6 +456,11 @@ void AmazonEngine::setupGame() {
 	_fonts._font1.load(FONT6x6_INDEX, FONT6x6_DATA);
 	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
 
+	initVariables();
+}
+
+void AmazonEngine::initVariables() {
+	_chapter = 1;
 	// Set player room and position
 	_player->_roomNumber = 4;
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 6208796b8a..e6c817d242 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -83,6 +83,7 @@ private:
 	 */
 	void setupGame();
 
+	void initVariables();
 	void calcIQ();
 	void helpTitle();
 	void drawHelpText(const Common::String &msg);
-- 
cgit v1.2.3


From 0a28a77e1a6339c292826b264047bd439290fe16 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 26 Nov 2014 00:04:16 +0100
Subject: ACCESS: Silent warning

---
 engines/access/inventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 11baa8fc08..629b89f155 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -90,7 +90,7 @@ int &InventoryManager::operator[](int idx) {
 	// WORKAROUND: At least in Amazon, some game scripts accidentally do reads
 	// beyond the length of the inventory array
 	static int invalid = 0;
-	return (idx >= _inv.size()) ? invalid : _inv[idx]._value;
+	return (idx >= (int)_inv.size()) ? invalid : _inv[idx]._value;
 }
 
 int InventoryManager::useItem() { 
-- 
cgit v1.2.3


From 486b7d7e04f3832bfd2a6ed63ba92295cd509965 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 26 Nov 2014 00:05:03 +0100
Subject: ACCESS: Add detection for Amazon English Demo

---
 engines/access/detection_tables.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index 95ac8fa47d..ec1507633c 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -41,6 +41,24 @@ static const AccessGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// Amazon Guardians of Eden - Demo English
+	{
+		{
+		"amazon",
+		"Demo",
+			{
+				{ "c25.ap", 0, "5baba0c052d22157499bfa05cb1ed5b7", 65458 },
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_DEMO,
+			GUIO1(GUIO_NONE)
+		},
+		GType_Amazon,
+		0
+	},
+
 	{
 		// Amazon: Guardians of Eden - CD English
 		{
-- 
cgit v1.2.3


From 9cd2bbf6bd9c7b053aa5748872087a0fafe0fb3d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 25 Nov 2014 20:17:17 -0500
Subject: ACCESS: Move slaver guard functions into the Guard class

---
 engines/access/amazon/amazon_game.cpp    | 279 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_game.h      |  17 +-
 engines/access/amazon/amazon_scripts.cpp | 253 +---------------------------
 engines/access/amazon/amazon_scripts.h   |   7 -
 4 files changed, 290 insertions(+), 266 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 6288ddb64b..550d8b2b46 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -31,7 +31,7 @@ namespace Access {
 namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
-		AccessEngine(syst, gameDesc),
+AccessEngine(syst, gameDesc),
 		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]), 
 		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
 		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), 
@@ -91,6 +91,7 @@ void AmazonEngine::playGame() {
 	// Initialize Amazon game-specific objects
 	_room = new AmazonRoom(this);
 	_scripts = new AmazonScripts(this);
+	_guard.setVm(this);
 
 	// Setup the game
 	setupGame();
@@ -941,17 +942,283 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 
 /*------------------------------------------------------------------------*/
 
+Plane::Plane() {
+	_pCount = 0;
+	_planeCount = 0;
+	_propCount = 0;
+	_xCount = 0;
+}
+
+/*------------------------------------------------------------------------*/
+
 Guard::Guard() {
+	_vm = nullptr;
 	_guardCel = 0;
 	_gCode1 = _gCode2 = 0;
 	_xMid = _yMid = 0;
 }
 
-Plane::Plane() {
-	_pCount = 0;
-	_planeCount = 0;
-	_propCount = 0;
-	_xCount = 0;
+void Guard::setVerticalCode() {
+	_gCode1 = 0;
+	_gCode2 = 0;
+	if (_topLeft.x < _vm->_screen->_orgX1)
+		_gCode1 |= 8;
+	else if (_topLeft.x == _vm->_screen->_orgX1) {
+		_gCode1 |= 8;
+		_gCode1 |= 2;
+	}
+	else
+		_gCode1 |= 2;
+
+	if (_bottomRight.x < _vm->_screen->_orgX1)
+		_gCode2 |= 8;
+	else if (_bottomRight.x == _vm->_screen->_orgX1) {
+		_gCode2 |= 8;
+		_gCode2 |= 2;
+	}
+	else
+		_gCode2 |= 2;
+
+	if (_topLeft.y < _vm->_screen->_orgY1)
+		_gCode1 |= 4;
+	else if (_topLeft.y > _vm->_screen->_orgY2)
+		_gCode1 |= 1;
+
+	if (_bottomRight.y < _vm->_screen->_orgY1)
+		_gCode2 |= 4;
+	else if (_bottomRight.y > _vm->_screen->_orgY2)
+		_gCode2 |= 1;
+}
+
+void Guard::setHorizontalCode() {
+	_gCode1 = 0;
+	_gCode2 = 0;
+
+	if (_topLeft.y < _vm->_screen->_orgY1)
+		_gCode1 |= 4;
+	else if (_topLeft.x == _vm->_screen->_orgX1) {
+		_gCode1 |= 4;
+		_gCode1 |= 1;
+	}
+	else
+		_gCode1 |= 1;
+
+	if (_bottomRight.y < _vm->_screen->_orgY1)
+		_gCode2 |= 4;
+	else if (_bottomRight.x == _vm->_screen->_orgX1) {
+		_gCode2 |= 4;
+		_gCode2 |= 1;
+	}
+	else
+		_gCode2 |= 1;
+
+	if (_topLeft.x < _vm->_screen->_orgX1)
+		_gCode1 |= 8;
+	else if (_topLeft.x > _vm->_screen->_orgX2)
+		_gCode1 |= 2;
+
+	if (_bottomRight.x < _vm->_screen->_orgX1)
+		_gCode2 |= 8;
+	else if (_bottomRight.y > _vm->_screen->_orgX2)
+		_gCode2 |= 2;
+}
+
+void Guard::chkVLine() {
+	if (_position.x > _vm->_player->_rawPlayer.x) {
+		_topLeft = _vm->_player->_rawPlayer;
+		_bottomRight = _position;
+	} else {
+		_topLeft = _position;
+		_bottomRight = _vm->_player->_rawPlayer;
+	}
+
+	if (_vm->_screen->_orgY1 > _vm->_screen->_orgY2)
+		SWAP(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
+
+	for (;;) {
+		setVerticalCode();
+		int code = _gCode1 | _gCode2;
+		if (code == 10) {
+			_vm->_guardFind = 0;
+			return;
+		}
+
+		int code2 = _gCode1 & _gCode2;
+		code2 &= 5;
+		if (((code & 10) == 8) || ((code & 10) == 2) || (code2 != 0))
+			return;
+
+		int midX = (_topLeft.x + _bottomRight.x) / 2;
+		int midY = (_topLeft.y + _bottomRight.y) / 2;
+
+		if (midX < _vm->_screen->_orgX1) {
+			if ((midX == _topLeft.x) && (midY == _topLeft.y))
+				return;
+
+			_topLeft.x = midX;
+			_topLeft.y = midY;
+		} else {
+			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
+				return;
+
+			_bottomRight.x = midX;
+			_bottomRight.y = midY;
+		}
+	}
+}
+
+void Guard::chkHLine() {
+	if (_position.y > _vm->_player->_rawPlayer.y) {
+		_topLeft = _vm->_player->_rawPlayer;
+		_bottomRight = _position;
+	} else {
+		_topLeft = _position;
+		_bottomRight = _vm->_player->_rawPlayer;
+	}
+
+	if (_vm->_screen->_orgX1 > _vm->_screen->_orgX2)
+		SWAP(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
+
+	while (true) {
+		setHorizontalCode();
+		int code = _gCode1 | _gCode2;
+		if (code == 5) {
+			_vm->_guardFind = 0;
+			return;
+		}
+
+		int code2 = _gCode1 & _gCode2;
+		code2 &= 10;
+		if (((code & 5) == 4) || ((code & 5) == 1) || (code2 != 0))
+			return;
+
+		int midX = (_topLeft.x + _bottomRight.x) / 2;
+		int midY = (_topLeft.y + _bottomRight.y) / 2;
+
+		if (midY < _vm->_screen->_orgY1) {
+			if ((midX == _topLeft.x) && (midY == _topLeft.y))
+				return;
+
+			_topLeft.x = midX;
+			_topLeft.y = midY;
+		} else {
+			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
+				return;
+
+			_bottomRight.x = midX;
+			_bottomRight.y = midY;
+		}
+	}
+}
+
+void Guard::guardSee() {
+	int tmpY = (_vm->_screen->_scrollRow << 4) + _vm->_screen->_scrollY;
+	_vm->_flags[140] = 0;
+	if (tmpY > _position.y)
+		return;
+
+	tmpY += _vm->_screen->_vWindowLinesTall;
+	tmpY -= 11;
+
+	if (tmpY < _position.y)
+		return;
+
+	_vm->_guardFind = 1;
+	_vm->_flags[140] = 1;
+
+	for (uint16 idx = 0; idx < _vm->_room->_plotter._walls.size(); idx++) {
+		_vm->_screen->_orgX1 = _vm->_room->_plotter._walls[idx].left;
+		_vm->_screen->_orgY1 = _vm->_room->_plotter._walls[idx].top;
+		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
+		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
+		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
+			chkVLine();
+			if (_vm->_guardFind == 0)
+				return;
+		}
+		else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
+			chkHLine();
+			if (_vm->_guardFind == 0)
+				return;
+		}
+	}
+}
+
+void Guard::setGuardFrame() {
+	ImageEntry ie;
+	ie._flags = 8;
+
+	if (_vm->_guardLocation == 4)
+		ie._flags |= 2;
+	ie._spritesPtr = _vm->_objectsTable[37];
+	ie._frameNumber = _guardCel;
+	ie._position = _position;
+	ie._offsetY = 10;
+	_vm->_images.addToList(ie);
+}
+
+void Guard::guard() {
+	if (_vm->_timers[8]._flag != 0)
+		return;
+
+	++_vm->_timers[8]._flag;
+	++_guardCel;
+	int curCel = _guardCel;
+
+	switch (_vm->_guardLocation) {
+	case 1:
+		// Guard walking down
+		if (curCel <= 8 || curCel > 13)
+			_guardCel = curCel = 8;
+
+		_position.y += _vm->_player->_walkOffDown[curCel - 8];
+		guardSee();
+		if (_position.y >= 272) {
+			_position.y = 272;
+			_vm->_guardLocation = 2;
+		}
+		break;
+	case 2:
+		// Guard walking left
+		if (curCel <= 43 || curCel > 48)
+			_guardCel = curCel = 43;
+
+		_position.x -= _vm->_player->_walkOffLeft[curCel - 43];
+		guardSee();
+		if (_position.x <= 56) {
+			_position.x = 56;
+			_vm->_guardLocation = 3;
+		}
+		break;
+	case 3:
+		// Guard walking up
+		if (curCel <= 0 || curCel > 5)
+			_guardCel = curCel = 0;
+
+		_position.y -= _vm->_player->_walkOffUp[curCel];
+		guardSee();
+		if (_position.y <= 89) {
+			_position.y = 89;
+			_vm->_guardLocation = 4;
+			if (_vm->_flags[121] == 1)
+				_vm->_guardLocation = 5;
+		}
+		break;
+	default:
+		// Guard walking right
+		if (curCel <= 43 || curCel > 48)
+			_guardCel = curCel = 43;
+
+		_position.x += _vm->_player->_walkOffRight[curCel - 43];
+		guardSee();
+		if (_position.x >= 127) {
+			_position.x = 127;
+			_vm->_guardLocation = 1;
+		}
+		break;
+	}
+
+	setGuardFrame();
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index e6c817d242..7917586ba2 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -29,6 +29,8 @@ namespace Access {
 
 namespace Amazon {
 
+	class AmazonEngine;
+
 class Plane {
 public:
 	int _pCount;
@@ -41,15 +43,28 @@ public:
 };
 
 class Guard {
+private:
+	AmazonEngine *_vm;
+
+	void chkVLine();
+	void chkHLine();
+	void setVerticalCode();
+	void setHorizontalCode();
+	void guardSee();
+	void setGuardFrame();
 public:
 	int _guardCel;
 	Common::Point _position;
 	int _gCode1;
 	int _gCode2;
-	Common::Rect _bounds;
+	Common::Point _topLeft;
+	Common::Point _bottomRight;
 	int _xMid, _yMid;
 public:
 	Guard();
+	void setVm(AmazonEngine *vm) { _vm = vm; }
+
+	void guard();
 };
 
 class InactivePlayer : public ImageEntry {
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index df6bb8f00f..f3f120bf72 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -888,257 +888,6 @@ void AmazonScripts::mWhile(int param1) {
 	}
 }
 
-void AmazonScripts::setVerticalCode(Common::Rect bounds) {
-	_game->_guard._gCode1 = 0;
-	_game->_guard._gCode2 = 0;
-	if (bounds.left < _vm->_screen->_orgX1)
-		_game->_guard._gCode1 |= 8;
-	else if (bounds.left == _vm->_screen->_orgX1) {
-		_game->_guard._gCode1 |= 8;
-		_game->_guard._gCode1 |= 2;
-	} else
-		_game->_guard._gCode1 |= 2;
-
-	if (bounds.right < _vm->_screen->_orgX1)
-		_game->_guard._gCode2 |= 8;
-	else if (bounds.right == _vm->_screen->_orgX1) {
-		_game->_guard._gCode2 |= 8;
-		_game->_guard._gCode2 |= 2;
-	} else
-		_game->_guard._gCode2 |= 2;
-
-	if (bounds.top < _vm->_screen->_orgY1)
-		_game->_guard._gCode1 |= 4;
-	else if (bounds.top > _vm->_screen->_orgY2)
-		_game->_guard._gCode1 |= 1;
-
-	if (bounds.bottom < _vm->_screen->_orgY1)
-		_game->_guard._gCode2 |= 4;
-	else if (bounds.bottom > _vm->_screen->_orgY2)
-		_game->_guard._gCode2 |= 1;
-}
-
-void AmazonScripts::setHorizontalCode(Common::Rect bounds) {
-	_game->_guard._gCode1 = 0;
-	_game->_guard._gCode2 = 0;
-
-	if (bounds.top < _vm->_screen->_orgY1)
-		_game->_guard._gCode1 |= 4;
-	else if (bounds.left == _vm->_screen->_orgX1) {
-		_game->_guard._gCode1 |= 4;
-		_game->_guard._gCode1 |= 1;
-	} else
-		_game->_guard._gCode1 |= 1;
-
-	if (bounds.bottom < _vm->_screen->_orgY1)
-		_game->_guard._gCode2 |= 4;
-	else if (bounds.right == _vm->_screen->_orgX1) {
-		_game->_guard._gCode2 |= 4;
-		_game->_guard._gCode2 |= 1;
-	} else
-		_game->_guard._gCode2 |= 1;
-
-	if (bounds.left < _vm->_screen->_orgX1)
-		_game->_guard._gCode1 |= 8;
-	else if (bounds.left > _vm->_screen->_orgX2)
-		_game->_guard._gCode1 |= 2;
-
-	if (bounds.right < _vm->_screen->_orgX1)
-		_game->_guard._gCode2 |= 8;
-	else if (bounds.bottom > _vm->_screen->_orgX2)
-		_game->_guard._gCode2 |= 2;
-}
-
-void AmazonScripts::chkVLine() {
-	if (_game->_guard._position.x > _vm->_player->_rawPlayer.x)
-		_game->_guard._bounds = Common::Rect(_vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y, _game->_guard._position.x, _game->_guard._position.y);
-	else
-		_game->_guard._bounds = Common::Rect(_game->_guard._position.x, _game->_guard._position.y, _vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y);
-
-	if (_vm->_screen->_orgY1 > _vm->_screen->_orgY2)
-		SWAP(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
-
-	while (true) {
-		setVerticalCode(_game->_guard._bounds);
-		int code = _game->_guard._gCode1 | _game->_guard._gCode2;
-		if (code == 10) {
-			_game->_guardFind = 0;
-			return;
-		}
-
-		int code2 = _game->_guard._gCode1 & _game->_guard._gCode2;
-		code2 &= 5;
-		if (((code & 10) == 8) || ((code & 10) == 2) || (code2 != 0))
-			return;
-
-		int midX = (_game->_guard._bounds.left + _game->_guard._bounds.right) / 2;
-		int midY = (_game->_guard._bounds.top + _game->_guard._bounds.bottom) / 2;
-
-		if (midX < _vm->_screen->_orgX1) {
-			if ((midX == _game->_guard._bounds.left) && (midY == _game->_guard._bounds.top))
-				return;
-
-			_game->_guard._bounds.left = midX;
-			_game->_guard._bounds.top = midY;
-		} else {
-			if ((midX == _game->_guard._bounds.right) && (midY == _game->_guard._bounds.bottom))
-				return;
-
-			_game->_guard._bounds.right = midX;
-			_game->_guard._bounds.bottom = midY;
-		}
-	}
-}
-
-void AmazonScripts::chkHLine() {
-	if (_game->_guard._position.y > _vm->_player->_rawPlayer.y)
-		_game->_guard._bounds = Common::Rect(_vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y, _game->_guard._position.x, _game->_guard._position.y);
-	else
-		_game->_guard._bounds = Common::Rect(_game->_guard._position.x, _game->_guard._position.y, _vm->_player->_rawPlayer.x, _vm->_player->_rawPlayer.y);
-
-	if (_vm->_screen->_orgX1 > _vm->_screen->_orgX2)
-		SWAP(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
-
-	while (true) {
-		setHorizontalCode(_game->_guard._bounds);
-		int code = _game->_guard._gCode1 | _game->_guard._gCode2;
-		if (code == 5) {
-			_game->_guardFind = 0;
-			return;
-		}
-
-		int code2 = _game->_guard._gCode1 & _game->_guard._gCode2;
-		code2 &= 10;
-		if (((code & 5) == 4) || ((code & 5) == 1) || (code2 != 0))
-			return;
-
-		int midX = (_game->_guard._bounds.left + _game->_guard._bounds.right) / 2;
-		int midY = (_game->_guard._bounds.top + _game->_guard._bounds.bottom) / 2;
-
-		if (midY < _vm->_screen->_orgY1) {
-			if ((midX == _game->_guard._bounds.left) && (midY == _game->_guard._bounds.top))
-				return;
-
-			_game->_guard._bounds.left = midX;
-			_game->_guard._bounds.top = midY;
-		} else {
-			if ((midX == _game->_guard._bounds.right) && (midY == _game->_guard._bounds.bottom))
-				return;
-
-			_game->_guard._bounds.right = midX;
-			_game->_guard._bounds.bottom = midY;
-		}
-	}
-}
-
-void AmazonScripts::guardSee() {
-	int tmpY = (_vm->_screen->_scrollRow << 4) + _vm->_screen->_scrollY;
-	_game->_flags[140] = 0;
-	if (tmpY > _game->_guard._position.y)
-		return;
-
-	tmpY += _vm->_screen->_vWindowLinesTall;
-	tmpY -= 11;
-
-	if (tmpY < _game->_guard._position.y)
-		return;
-
-	_game->_guardFind = 1;
-	_game->_flags[140] = 1;
-
-	for (uint16 idx = 0; idx < _vm->_room->_plotter._walls.size(); idx++) {
-		_vm->_screen->_orgX1 = _vm->_room->_plotter._walls[idx].left;
-		_vm->_screen->_orgY1 = _vm->_room->_plotter._walls[idx].top;
-		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
-		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
-		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
-			chkVLine();
-			if (_game->_guardFind == 0)
-				return;
-		} else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
-			chkHLine();
-			if (_game->_guardFind == 0)
-				return;
-		}
-	}
-}
-
-void AmazonScripts::setGuardFrame() {
-	ImageEntry ie;
-	ie._flags = 8;
-	if (_game->_guardLocation == 4)
-		ie._flags |= 2;
-	ie._spritesPtr = _vm->_objectsTable[37];
-	ie._frameNumber = _game->_guard._guardCel;
-	ie._position = _game->_guard._position;
-	ie._offsetY = 10;
-	_vm->_images.addToList(ie);
-}
-
-void AmazonScripts::guard() {
-	if (_vm->_timers[8]._flag != 0)
-		return;
-
-	++_vm->_timers[8]._flag;
-	++_game->_guard._guardCel;
-	int curCel = _game->_guard._guardCel;
-
-	switch (_game->_guardLocation) {
-	case 1:
-		// Guard walking down
-		if (curCel <= 8 || curCel > 13)
-			_game->_guard._guardCel = curCel = 8;
-
-		_game->_guard._position.y += _vm->_player->_walkOffDown[curCel - 8];
-		guardSee();
-		if (_game->_guard._position.y >= 272) {
-			_game->_guard._position.y = 272;
-			_game->_guardLocation = 2;
-		}
-		break;
-	case 2:
-		// Guard walking left
-		if (curCel <= 43 || curCel > 48)
-			_game->_guard._guardCel = curCel = 43;
-
-		_game->_guard._position.x -= _vm->_player->_walkOffLeft[curCel - 43];
-		guardSee();
-		if (_game->_guard._position.x <= 56) {
-			_game->_guard._position.x = 56;
-			_game->_guardLocation = 3;
-		}
-		break;
-	case 3:
-		// Guard walking up
-		if (curCel <= 0 || curCel > 5)
-			_game->_guard._guardCel = curCel = 0;
-
-		_game->_guard._position.y -= _vm->_player->_walkOffUp[curCel];
-		guardSee();
-		if (_game->_guard._position.y <= 89) {
-			_game->_guard._position.y = 89;
-			_game->_guardLocation = 4;
-			if (_game->_flags[121] == 1)
-				_game->_guardLocation = 5;
-		}
-		break;
-	default:
-		// Guard walking right
-		if (curCel <= 43 || curCel > 48)
-			_game->_guard._guardCel = curCel = 43;
-
-		_game->_guard._position.x += _vm->_player->_walkOffRight[curCel - 43];
-		guardSee();
-		if (_game->_guard._position.x >= 127) {
-			_game->_guard._position.x = 127;
-			_game->_guardLocation = 1;
-		}
-		break;
-	}
-
-	setGuardFrame();
-}
-
 void AmazonScripts::loadBackground(int param1, int param2) {
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(param1, param2);
@@ -2099,7 +1848,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		mWhile(param1);
 		break;
 	case 9:
-		guard();
+		_game->_guard.guard();
 		break;
 	case 10:
 		_vm->_sound->newMusic(param1, param2);
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 1da10d8bdd..20dfb6345d 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -80,13 +80,6 @@ protected:
 	void scrollRiver();
 	void mWhileDownRiver();
 	void mWhile(int param1);
-	void setVerticalCode(Common::Rect bounds);
-	void setHorizontalCode(Common::Rect bounds);
-	void chkVLine();
-	void chkHLine();
-	void guardSee();
-	void setGuardFrame();
-	void guard();
 	void plotTorchSpear(int indx, const int *&buf);
 	void plotPit(int indx, const int *&buf);
 	int antHandleRight(int indx, const int *&buf);
-- 
cgit v1.2.3


From 84d500a35a2fc674adbbbc59311702f195cb4984 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 25 Nov 2014 20:33:40 -0500
Subject: ACCESS: Fix flickering slaver guard

---
 engines/access/amazon/amazon_game.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 550d8b2b46..1a89ddb80d 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -1158,8 +1158,10 @@ void Guard::setGuardFrame() {
 }
 
 void Guard::guard() {
-	if (_vm->_timers[8]._flag != 0)
+	if (_vm->_timers[8]._flag) {
+		setGuardFrame();
 		return;
+	}
 
 	++_vm->_timers[8]._flag;
 	++_guardCel;
-- 
cgit v1.2.3


From 0cafe2719d56e1acd1b3972737a9f8e031d51136 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 25 Nov 2014 21:02:51 -0500
Subject: ACCESS: Fix for proper vertical scrolling on the ship

---
 engines/access/room.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f32bc95ae0..57a5c4a88e 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -343,14 +343,14 @@ void Room::buildRow(int playY, int screenY) {
 		return;
 	assert(screenY <= (_vm->_screen->h - TILE_HEIGHT));
 
-	const byte *pSrc = _playField + screenY *_playFieldWidth + _vm->_screen->_scrollCol;
+	const byte *pSrc = _playField + playY *_playFieldWidth + _vm->_screen->_scrollCol;
 
 	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
 	int w = MIN(_vm->_screen->_vWindowWidth + 1, _playFieldWidth);
 
 	for (int x = 0; x < w; ++x) {
 		byte *pTile = _tile + (*pSrc << 8);
-		byte *pDest = (byte *)_vm->_buffer1.getBasePtr(w * TILE_WIDTH, screenY);
+		byte *pDest = (byte *)_vm->_buffer1.getBasePtr(x * TILE_WIDTH, screenY);
 
 		for (int tileY = 0; tileY < TILE_HEIGHT; ++tileY) {
 			Common::copy(pTile, pTile + TILE_WIDTH, pDest);
-- 
cgit v1.2.3


From 953321cc26f431f82314866b15fe312094e32ecb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 27 Nov 2014 00:11:57 +0100
Subject: ACCESS: Fix a glitch in the intro, add a workaround for a crash, fix
 a logic flaw

---
 engines/access/amazon/amazon_game.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 1a89ddb80d..05ac80e350 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -161,8 +161,8 @@ void AmazonEngine::doCredit() {
 		_buffer2.plotImage(_objectsTable[0], 12, Common::Point(88, 55));
 		_buffer2.plotImage(_objectsTable[0], 6, Common::Point(194, 98));
 	} else if (_pCount <= 520) {
-		_buffer2.plotImage(_objectsTable[0], 7, Common::Point(90, 35));
-		_buffer2.plotImage(_objectsTable[0], 8, Common::Point(90, 35));
+		_buffer2.plotImage(_objectsTable[0], 7, Common::Point(32, 13));
+		_buffer2.plotImage(_objectsTable[0], 8, Common::Point(162, 80));
 	} else if (_pCount <= 580) {
 		_buffer2.plotImage(_objectsTable[0], 9, Common::Point(18, 15));
 		_buffer2.plotImage(_objectsTable[0], 10, Common::Point(164, 81));
@@ -258,6 +258,7 @@ void AmazonEngine::doTitle() {
 		_events->pollEvents();
 		g_system->delayMillis(10);
 	}
+
 	if (_events->_rightButton) {
 		_skipStart = true;
 		_room->clearRoom();
@@ -343,19 +344,19 @@ void AmazonEngine::doTitle() {
 				++_screen->_scrollRow;
 				_buffer1.moveBufferUp();
 
-				_room->buildRow(_screen->_scrollRow + _screen->_vWindowHeight, _screen->_vWindowLinesTall * _screen->_bufferBytesWide);
+				// WORKAROUND: the original was using _screen->_vWindowBytesWide * _screen->_vWindowLinesTall
+				_room->buildRow(_screen->_scrollRow + _screen->_vWindowHeight, _screen->_vWindowLinesTall);
 
 				if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
 					_room->clearRoom();
 					_events->showCursor();
 					return;
 				}
-				
-				scrollTitle();
-				while (!shouldQuit() && (_events->_vbCount > 0)) {
-					_events->pollEvents();
-					g_system->delayMillis(10);
-				}
+			}
+			scrollTitle();
+			while (!shouldQuit() && (_events->_vbCount > 0)) {
+				_events->pollEvents();
+				g_system->delayMillis(10);
 			}
 		}
 	}
-- 
cgit v1.2.3


From fde1ea9d0e5edc6b3761b893891c5c7431488a91 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 26 Nov 2014 18:33:03 -0500
Subject: ACCESS: Improve usage of ImageEntry _flags IMGFLAG enum

---
 engines/access/access.cpp                | 10 ++++++----
 engines/access/amazon/amazon_game.cpp    |  4 ++--
 engines/access/amazon/amazon_scripts.cpp | 14 +++++++-------
 engines/access/asurface.h                |  3 ++-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 88c62a74a7..2c973160b0 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -360,12 +360,12 @@ void AccessEngine::plotList1() {
 		Common::Rect destBounds = bounds;
 
 		if (_buffer2.clip(bounds)) {
-			ie._flags |= 1;
+			ie._flags |= IMGFLAG_CROPPED;
 		} else {
-			ie._flags &= ~1;
+			ie._flags &= ~IMGFLAG_CROPPED;
 			if (_buffer2._leftSkip != 0 ||  _buffer2._rightSkip != 0
 				|| _buffer2._topSkip != 0 || _buffer2._bottomSkip != 0)
-				ie._flags |= 1;
+				ie._flags |= IMGFLAG_CROPPED;
 
 			_newRects.push_back(bounds);
 
@@ -373,7 +373,7 @@ void AccessEngine::plotList1() {
 				_buffer2._rightSkip /= _scale;
 				bounds.setWidth(bounds.width() / _scale);
 
-				if (ie._flags & 2) {
+				if (ie._flags & IMGFLAG_BACKWARDS) {
 					_buffer2.sPlotB(frame, destBounds);
 				} else {
 					_buffer2.sPlotF(frame, destBounds);
@@ -386,6 +386,8 @@ void AccessEngine::plotList1() {
 				}
 			}
 		}
+
+		ie._flags |= IMGFLAG_DRAWN;
 	}
 }
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 05ac80e350..c575d8498c 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -1147,10 +1147,10 @@ void Guard::guardSee() {
 
 void Guard::setGuardFrame() {
 	ImageEntry ie;
-	ie._flags = 8;
+	ie._flags = IMGFLAG_UNSCALED;
 
 	if (_vm->_guardLocation == 4)
-		ie._flags |= 2;
+		ie._flags |= IMGFLAG_BACKWARDS;
 	ie._spritesPtr = _vm->_objectsTable[37];
 	ie._frameNumber = _guardCel;
 	ie._position = _position;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index f3f120bf72..7ec0f95e08 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -301,7 +301,7 @@ void AmazonScripts::jungleMove() {
 
 	for (int i = 0; i < count; ++i) {
 		ImageEntry ie;
-		ie._flags = 8;
+		ie._flags = IMGFLAG_UNSCALED;
 		ie._spritesPtr = _vm->_objectsTable[24];
 		ie._frameNumber = _jCnt[i] + frameOffset;
 		ie._position = Common::Point(_jungleX[i], jungleY[i]);
@@ -437,7 +437,7 @@ void AmazonScripts::pan() {
 
 	for (int i = 0; i < _pNumObj; i++) {
 		ImageEntry ie;
-		ie._flags= 8;
+		ie._flags = IMGFLAG_UNSCALED;
 		ie._position = Common::Point(_pObjX[i], _pObjY[i]);
 		ie._offsetY = 255;
 		ie._spritesPtr = _pObject[i];
@@ -1046,7 +1046,7 @@ void AmazonScripts::plotTorchSpear(int indx, const int *&buf) {
 	int idx = indx;
 
 	ImageEntry ie;
-	ie._flags = 8;
+	ie._flags = IMGFLAG_UNSCALED;
 	ie._spritesPtr = _vm->_objectsTable[62];
 	ie._frameNumber = buf[(idx / 2)];
 	ie._position = Common::Point(_game->_pitPos.x + buf[(idx / 2) + 1], _game->_pitPos.y + buf[(idx / 2) + 2]);
@@ -1057,7 +1057,7 @@ void AmazonScripts::plotTorchSpear(int indx, const int *&buf) {
 void AmazonScripts::plotPit(int indx, const int *&buf) {
 	int idx = indx;
 	ImageEntry ie;
-	ie._flags = 8;
+	ie._flags = IMGFLAG_UNSCALED;
 	ie._spritesPtr = _vm->_objectsTable[62];
 	ie._frameNumber = buf[(idx / 2)];
 	ie._position = Common::Point(_game->_pitPos.x, _game->_pitPos.y);
@@ -1233,7 +1233,7 @@ void AmazonScripts::ANT() {
 	}
 
 	ImageEntry ie;
-	ie._flags = 8;
+	ie._flags = IMGFLAG_UNSCALED;
 	ie._spritesPtr = _vm->_objectsTable[61];
 	ie._frameNumber = buf[(idx / 2)];
 	ie._position = Common::Point(_game->_antPos.x, _game->_antPos.y);
@@ -1730,7 +1730,7 @@ void AmazonScripts::plotRiver() {
 	}
 
 	ImageEntry ie;
-	ie._flags = 8;
+	ie._flags = IMGFLAG_UNSCALED;
 	ie._spritesPtr = _vm->_objectsTable[45];
 	ie._frameNumber = _game->_canoeFrame;
 	ie._position.x = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX + 160;
@@ -1741,7 +1741,7 @@ void AmazonScripts::plotRiver() {
 	RiverStruct *cur = _game->_topList;
 	while (cur <= _game->_botList) {
 		if (cur[0]._id != -1) {
-			ie._flags = 8;
+			ie._flags = IMGFLAG_UNSCALED;
 			ie._spritesPtr = _vm->_objectsTable[45];
 			ie._frameNumber = 0;
 			ie._position.x = cur[0]._field5;
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 1c30db8915..273578c830 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -131,7 +131,8 @@ public:
 	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
 };
 
-enum ImageFlag { IMGFLAG_BACKWARDS = 2, IMGFLAG_UNSCALED = 8 };
+enum ImageFlag { IMGFLAG_CROPPED = 1, IMGFLAG_BACKWARDS = 2, IMGFLAG_DRAWN = 4,
+	IMGFLAG_UNSCALED = 8 };
 
 class ImageEntry {
 public:
-- 
cgit v1.2.3


From d8c97d259bc19f22ecf8b1cc9da03c374a3adbec Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 27 Nov 2014 00:52:14 +0100
Subject: ACCESS: add code to replace the checks on KEYBUFCNT

---
 engines/access/amazon/amazon_game.cpp    | 15 ++++-----------
 engines/access/amazon/amazon_scripts.cpp |  3 ++-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index c575d8498c..6da895a1ce 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -253,8 +253,7 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->newMusic(1, 0);
 	_events->_vbCount = 700;
-	warning("TODO: check on KEYBUFCNT");
-	while (!shouldQuit() && (_events->_vbCount > 0) && (!_events->_leftButton) && (!_events->_rightButton)) {
+	while (!shouldQuit() && (_events->_vbCount > 0) && !_events->isKeyMousePressed()) {
 		_events->pollEvents();
 		g_system->delayMillis(10);
 	}
@@ -287,15 +286,9 @@ void AmazonEngine::doTitle() {
 	_pCount = 0;
 
 	while (!shouldQuit()) {
-		if (_events->_rightButton) {
-			_skipStart = true;
-			_room->clearRoom();
-			_events->showCursor();
-			return;
-		}
-
-		warning("TODO: check on KEYBUFCNT");
-		if (_events->_leftButton) {
+		if (!_events->isKeyMousePressed()) {
+			if (_events->_rightButton)
+				_skipStart = true;
 			_room->clearRoom();
 			_events->showCursor();
 			return;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7ec0f95e08..30cd6c866c 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1004,7 +1004,8 @@ void AmazonScripts::doCast(int param1) {
 		_vm->copyBlocks();
 
 		_vm->_events->pollEvents();
-		warning("TODO: check on KEYBUFCNT");
+		if (_vm->_events->isKeyMousePressed())
+			break;
 
 		if (_yCam < -7550) {
 			_vm->_events->_vbCount = 50;
-- 
cgit v1.2.3


From 89b20c618f16f1d3ad8e33819dd9202d234aa258 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 26 Nov 2014 20:39:36 -0500
Subject: ACCESS: Fix to correctly draw partly off-screen sprites

---
 engines/access/asurface.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 96cb1991be..e954e9efa6 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -224,7 +224,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	int scaleY = SCALE_LIMIT * bounds.height() / this->h;
 	int scaleXCtr = 0, scaleYCtr = 0;
 
-	for (int yCtr = 0, y = bounds.top; yCtr < this->h; ++yCtr) {
+	for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr, ++destY) {
 		// Handle skipping lines if Y scaling 
 		scaleYCtr += scaleY;
 		if (scaleYCtr < SCALE_LIMIT)
@@ -232,14 +232,14 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 		scaleYCtr -= SCALE_LIMIT;
 
 		// Handle off-screen lines
-		if (y < 0)
+		if (destY < 0)
 			continue;
-		else if (y >= dest->h)
+		else if (destY >= dest->h)
 			break;
 
 		// Handle drawing the line
 		byte *pSrc = (byte *)getBasePtr(0, yCtr);
-		byte *pDest = (byte *)dest->getBasePtr(bounds.left, y);
+		byte *pDest = (byte *)dest->getBasePtr(bounds.left, destY);
 		scaleXCtr = 0;
 		int x = bounds.left;
 
@@ -259,8 +259,6 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 			++pDest;
 			++x;
 		}
-
-		++y;
 	}
 }
 
-- 
cgit v1.2.3


From 7434c764c6899e114d07e756356a55595adb8694 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 26 Nov 2014 22:16:14 -0500
Subject: ACCESS: gcc compilation fixes

---
 engines/access/access.cpp                  | 1 -
 engines/access/access.h                    | 2 +-
 engines/access/amazon/amazon_game.cpp      | 2 +-
 engines/access/amazon/amazon_game.h        | 2 +-
 engines/access/amazon/amazon_resources.cpp | 6 +++---
 engines/access/amazon/amazon_scripts.cpp   | 6 +++---
 engines/access/files.cpp                   | 6 +++---
 engines/access/files.h                     | 2 +-
 engines/access/player.h                    | 2 +-
 engines/access/scripts.cpp                 | 2 --
 10 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 2c973160b0..4d326acff6 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -220,7 +220,6 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 		soundsLeft = _countTbl[curPage];
 		_events->zeroKeys();
 
-		Common::String line;
 		int width = 0;
 		bool lastLine = _fonts._font2.getLine(lines, s->_maxChars * 6, line, width);
 
diff --git a/engines/access/access.h b/engines/access/access.h
index 2cd35fbf1d..c0bc467f08 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -117,7 +117,7 @@ protected:
 	* Support method that generates a savegame name
 	* @param slot		Slot number
 	*/
-	Common::String AccessEngine::generateSaveName(int slot);
+	Common::String generateSaveName(int slot);
 
 	/**
 	 * Play back an entire video
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 6da895a1ce..9b9df8bc25 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -672,7 +672,7 @@ void AmazonEngine::helpTitle() {
 
 	Common::String iqText = "IQ: ";
 	calcIQ();
-	Common::String IQSCORE = Common::String::format("d", _iqValue);
+	Common::String IQSCORE = Common::String::format("%d", _iqValue);
 	while (IQSCORE.size() != 4)
 		IQSCORE = " " + IQSCORE;
 
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 7917586ba2..2d371ca9fb 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -165,7 +165,7 @@ public:
 	bool _deathFlag;
 	int _deathCount;
 	int _deathType;
-	byte *_mapPtr;
+	const byte *_mapPtr;
 	int _canoeVXPos;
 	int _canoeMoveCount;
 	int _canoeFrame;
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 08ecfff467..68e078ef08 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1653,7 +1653,7 @@ RiverStruct RIVER0OBJECTS[45] = {
 	{17,  30,  305, 0, 2, 15}
 };
 
-RiverStruct ENDRIVER0[1] = {16, 31, 260, 0, 7, 12};
+RiverStruct ENDRIVER0[1] = { { 16, 31, 260, 0, 7, 12 } };
 
 RiverStruct RIVER1OBJECTS[49] = {
 	{16,  31, 6920, 0, 1, 12},
@@ -1707,7 +1707,7 @@ RiverStruct RIVER1OBJECTS[49] = {
 	{17,  30,  305, 0, 3, 15}
 };
 
-RiverStruct ENDRIVER1[1] = {16, 31, 260, 0, 1, 12};
+RiverStruct ENDRIVER1[1] = { { 16, 31, 260, 0, 1, 12 } };
 
 RiverStruct RIVER2OBJECTS[53] = {
 	{16,  31, 8230, 0, 6, 12},
@@ -1765,7 +1765,7 @@ RiverStruct RIVER2OBJECTS[53] = {
 	{17,  30,  305, 0, 3, 15}
 };
 
-RiverStruct ENDRIVER2[1] = {16, 31, 260, 0, 6, 12};
+RiverStruct ENDRIVER2[1] = { { 16, 31, 260, 0, 6, 12 } };
 
 RiverStruct *RIVEROBJECTTBL[6] = {
 	RIVER0OBJECTS, ENDRIVER0, RIVER1OBJECTS, 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 30cd6c866c..7b4729b3e0 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1282,7 +1282,7 @@ void AmazonScripts::ANT() {
 
 void AmazonScripts::boatWalls(int param1, int param2) {
 	if (param1 == 1)
-		_vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 87, 42);
+		_vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 96 + 87, 27 + 42);
 	else {
 		_vm->_room->_plotter._walls[39].bottom = _vm->_room->_plotter._walls[41].bottom = 106;
 		_vm->_room->_plotter._walls[40].left = 94;
@@ -1439,7 +1439,7 @@ void AmazonScripts::initRiver() {
 	++_game->_timers[3]._flag;
 
 	_game->_canoeFrame = 0;
-	_game->_mapPtr = (byte *)MAPTBL[_game->_riverFlag] + 1;
+	_game->_mapPtr = (const byte *)MAPTBL[_game->_riverFlag] + 1;
 	if (_game->_saveRiver == 1) {
 		_game->_mapPtr--;
 		_game->_mapPtr += _game->_mapOffset;
@@ -1771,7 +1771,7 @@ void AmazonScripts::RIVER() {
 	while (true) {
 		_vm->_events->_vbCount = 4;
 
-		int bx = _vm->_player->_scrollAmount - _screenVertX;
+//		int bx = _vm->_player->_scrollAmount - _screenVertX;
 		if (_vm->_screen->_scrollX == 0) {
 			_vm->_sound->midiRepeat();
 			if (riverJumpTest()) {
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index dacceb7a09..df114229da 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -59,10 +59,10 @@ Resource::~Resource() {
 	delete _stream;
 }
 
-Resource::Resource(byte *data, int size) {
-	_data = data;
+Resource::Resource(byte *p, int size) {
+	_data = p;
 	_size = size;
-	_stream = new Common::MemoryReadStream(data, size);
+	_stream = new Common::MemoryReadStream(p, size);
 }
 
 byte *Resource::data() {
diff --git a/engines/access/files.h b/engines/access/files.h
index f65f2ba8da..f90071df85 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -62,7 +62,7 @@ public:
 	int _size;
 
 	Resource();
-	Resource::Resource(byte *data, int size);
+	Resource(byte *data, int size);
 	~Resource();
 	byte *data();
 };
diff --git a/engines/access/player.h b/engines/access/player.h
index 400770c21a..67908a315d 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -111,7 +111,7 @@ public:
 	Common::Point _rawPlayer;
 public:
 	Player(AccessEngine *vm);
-	~Player();
+	virtual ~Player();
 	static Player *init(AccessEngine *vm);
 
 	virtual void load();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index d4bd5ad644..9aba05a2fb 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -610,13 +610,11 @@ void Scripts::cmdTexChoice() {
 
 	findNull();
 
-	bool choice2Fl = false;
 	tmpStr = "";
 	while ((v = _data->readByte()) != 0)
 		tmpStr += (char)v;
 
 	if (tmpStr.size() != 0) {
-		choice2Fl = true;
 		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 2").c_str();
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
-- 
cgit v1.2.3


From f75fa68c057dc5e626428415b38f7159d2d23c06 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 27 Nov 2014 14:58:41 +0100
Subject: ACCESS: Add a replacement of configSelect, currently just
 initializing _hintLevel

---
 engines/access/amazon/amazon_game.cpp | 6 ++++++
 engines/access/amazon/amazon_game.h   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 9b9df8bc25..912c4ddfd2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -87,6 +87,11 @@ void AmazonEngine::freeInactivePlayer() {
 	_inactive._altSpritesPtr = nullptr;
 }
 
+void AmazonEngine::configSelect() {
+	// Initialize fields contained in the config file.
+	_hintLevel = 3;
+}
+
 void AmazonEngine::playGame() {
 	// Initialize Amazon game-specific objects
 	_room = new AmazonRoom(this);
@@ -95,6 +100,7 @@ void AmazonEngine::playGame() {
 
 	// Setup the game
 	setupGame();
+	configSelect();
 
 	if (_loadSaveSlot == -1) {
 		// Do introduction
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 2d371ca9fb..d67f0c2150 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -98,6 +98,11 @@ private:
 	 */
 	void setupGame();
 
+	/**
+	 * Initialize variables found in the config file
+	 */
+	void configSelect();
+
 	void initVariables();
 	void calcIQ();
 	void helpTitle();
-- 
cgit v1.2.3


From 4c71b12e021d69550a7574579327002afda9d0e7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 10:13:38 -0500
Subject: ACCESS: Fix memory leaks

---
 engines/access/debugger.cpp | 4 ++++
 engines/access/debugger.h   | 2 +-
 engines/access/files.cpp    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 359b2e73a5..6b49fb0e67 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -78,6 +78,10 @@ Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
 	}
 }
 
+Debugger::~Debugger() {
+	delete[] _sceneDescr;
+}
+
 bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 	switch (argc) {
 	case 1:
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
index 60bd22358a..839d13106e 100644
--- a/engines/access/debugger.h
+++ b/engines/access/debugger.h
@@ -43,7 +43,7 @@ public:
 	static Debugger *init(AccessEngine *vm);
 public:
 	Debugger(AccessEngine *vm);
-	virtual ~Debugger() {}
+	virtual ~Debugger();
 };
 
 namespace Amazon {
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index df114229da..cbcfa3f614 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -55,7 +55,7 @@ Resource::Resource() {
 }
 
 Resource::~Resource() {
-	delete _data;
+	delete[] _data;
 	delete _stream;
 }
 
-- 
cgit v1.2.3


From abb4b9d1e6cd1373a3d71c2fe97f3ca4d6df2454 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 27 Nov 2014 18:16:21 +0100
Subject: ACCESS: Fix regression in bd004bd6f3b960e36756248d8e44bfdf955fdb52

---
 engines/access/asurface.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index e954e9efa6..c9c335e894 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -224,7 +224,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	int scaleY = SCALE_LIMIT * bounds.height() / this->h;
 	int scaleXCtr = 0, scaleYCtr = 0;
 
-	for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr, ++destY) {
+	for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr) {
 		// Handle skipping lines if Y scaling 
 		scaleYCtr += scaleY;
 		if (scaleYCtr < SCALE_LIMIT)
@@ -250,7 +250,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 				continue;
 			scaleXCtr -= SCALE_LIMIT;
 
-			// Only handle on-scren pixels
+			// Only handle on-screen pixels
 			if (x >= dest->w)
 				break;	
 			if (x >= 0 && *pSrc != 0)
@@ -259,6 +259,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 			++pDest;
 			++x;
 		}
+		++destY;
 	}
 }
 
-- 
cgit v1.2.3


From f0f19dbea07be8593cdc50bcef671bf69a8bd731 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 16:32:25 -0500
Subject: ACCESS: Fix for vertical scrolling after using inventory screen

---
 engines/access/asurface.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index c9c335e894..624721920a 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -331,17 +331,17 @@ void ASurface::moveBufferLeft() {
 
 void ASurface::moveBufferRight() {
 	byte *p = (byte *)getPixels();
-	Common::copy_backward(p, p + (w * h) - TILE_WIDTH, p + (w * h));
+	Common::copy_backward(p, p + (pitch * h) - TILE_WIDTH, p + (pitch * h));
 }
 
 void ASurface::moveBufferUp() {
 	byte *p = (byte *)getPixels();
-	Common::copy(p + (w * TILE_HEIGHT), p + (w * h), p);
+	Common::copy(p + (pitch * TILE_HEIGHT), p + (pitch * h), p);
 }
 
 void ASurface::moveBufferDown() {
 	byte *p = (byte *)getPixels();
-	Common::copy_backward(p, p + (w * (h - TILE_HEIGHT)), p + (w * h));
+	Common::copy_backward(p, p + (pitch * (h - TILE_HEIGHT)), p + (pitch * h));
 }
 
 } // End of namespace Access
-- 
cgit v1.2.3


From bb93268ee21a216162ef077c64462e0ac360df0a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 16:56:03 -0500
Subject: ACCESS: Fix left button flag beig stuck after saving & loading games

---
 engines/access/access.cpp | 1 +
 engines/access/events.cpp | 5 +++++
 engines/access/events.h   | 2 ++
 engines/access/room.cpp   | 1 +
 4 files changed, 9 insertions(+)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 4d326acff6..82c405c48e 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -491,6 +491,7 @@ Common::Error AccessEngine::loadGameState(int slot) {
 	// Set extra post-load state
 	_room->_function = 1;
 	_timers._timersSavedFlag = false;
+	_events->clearEvents();
 
 	return Common::kNoError;
 }
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index d911e666ea..327fb06dd1 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -236,6 +236,11 @@ void EventsManager::debounceLeft() {
 	}
 }
 
+void EventsManager::clearEvents() {
+	_leftButton = _rightButton = false;
+	_keypresses.clear();
+}
+
 void EventsManager::waitKeyMouse() {
 	while (!_vm->shouldQuit() && !_leftButton && _keypresses.size() == 0) {
 		pollEvents();
diff --git a/engines/access/events.h b/engines/access/events.h
index 0a2a541de9..c72f245412 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -117,6 +117,8 @@ public:
 
 	void debounceLeft();
 
+	void clearEvents();
+
 	void waitKeyMouse();
 
 	bool checkForNextFrameCounter();
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 57a5c4a88e..9251db4af4 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -494,6 +494,7 @@ void Room::handleCommand(int commandId) {
 		--commandId;
 
 	if (commandId == 9) {
+		_vm->_events->debounceLeft();
 		_vm->_canSaveLoad = true;
 		_vm->openMainMenuDialog();
 		_vm->_canSaveLoad = false;
-- 
cgit v1.2.3


From f6a1faa5e4ea7b35b3dd9d1bd942858dd31cdbde Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 17:17:35 -0500
Subject: ACCESS: Fix check for scene area that can be clicked in

---
 engines/access/amazon/amazon_room.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index a942ed3ba8..4df1131643 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -162,10 +162,12 @@ void AmazonRoom::roomMenu() {
 void AmazonRoom::mainAreaClick() {
 	Common::Point &mousePos = _vm->_events->_mousePos;
 	Common::Point pt = _vm->_events->calcRawMouse();
+	Screen &screen = *_vm->_screen;
+	Player &player = *_vm->_player;
 
 	if (_selectCommand == -1) {
-		if (_vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44 ||
-				_vm->_player->_roomNumber == 31 || _vm->_player->_roomNumber == 29) {
+		if (player._roomNumber == 42 || player._roomNumber == 44 ||
+				player._roomNumber == 31 || player._roomNumber == 29) {
 			switch (checkBoxes1(pt)) {
 			case 0:
 				// Make Jason the active player
@@ -182,15 +184,15 @@ void AmazonRoom::mainAreaClick() {
 
 		// WORKAROUND: In Amazon room 9, you can't leave the screen to the south due
 		// to not being able to click a Y position that's high enough
-		if (_vm->_screen->_scrollRow == 0 && pt.y > 178)
+		if (screen._scrollRow == 0 && pt.y > 178)
 			pt.y = 200;
 
-		_vm->_player->_moveTo = pt;
-		_vm->_player->_playerMove = true;
-	} else if (mousePos.x >= _vm->_screen->_windowXAdd &&
-			mousePos.x <= _vm->_screen->_vWindowBytesWide &&
-			mousePos.y >= _vm->_screen->_windowYAdd &&
-			mousePos.y <= _vm->_screen->_vWindowLinesTall) {
+		player._moveTo = pt;
+		player._playerMove = true;
+	} else if (mousePos.x >= screen._windowXAdd &&
+			mousePos.x <= (screen._windowXAdd + screen._vWindowBytesWide) &&
+			mousePos.y >= screen._windowYAdd &&
+			mousePos.y <= (screen._windowYAdd + screen._vWindowLinesTall)) {
 		if (checkBoxes1(pt) >= 0) {
 			checkBoxes3();
 		}
-- 
cgit v1.2.3


From 64b45e68aa10954edafe34139386b4cd7042ad74 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 17:33:42 -0500
Subject: ACCESS: Fix loading or exiting game when Maya is active player

---
 engines/access/player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index b5046632c5..b945b76600 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -76,7 +76,7 @@ Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
 }
 
 Player::~Player() {
-	delete _playerSprites1;
+	delete _playerSprites;
 	delete[] _manPal1;
 }
 
@@ -132,7 +132,7 @@ void Player::loadSprites(const Common::String &name) {
 }
 
 void Player::freeSprites() {
-	delete _playerSprites1;
+	delete _playerSprites;
 	_playerSprites1 = nullptr;
 	_playerSprites = nullptr;
 }
-- 
cgit v1.2.3


From 3be3cb1ac21dcaf8f79907e9ce463c4828cba65c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 21:35:20 -0500
Subject: ACCESS: Cleanup of room _function and river canoe movement

---
 engines/access/access.cpp                  |   2 +-
 engines/access/amazon/amazon_game.cpp      |  10 ++-
 engines/access/amazon/amazon_resources.cpp |   4 +-
 engines/access/amazon/amazon_resources.h   |   4 +-
 engines/access/amazon/amazon_scripts.cpp   | 140 ++++++++++++-----------------
 engines/access/amazon/amazon_scripts.h     |   3 +-
 engines/access/room.cpp                    |   8 +-
 engines/access/room.h                      |  12 +--
 engines/access/scripts.cpp                 |   2 +-
 9 files changed, 80 insertions(+), 105 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 82c405c48e..885b2f998c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -489,7 +489,7 @@ Common::Error AccessEngine::loadGameState(int slot) {
 	delete saveFile;
 
 	// Set extra post-load state
-	_room->_function = 1;
+	_room->_function = FN_CLEAR1;
 	_timers._timersSavedFlag = false;
 	_events->clearEvents();
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 912c4ddfd2..cdc7727244 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -909,7 +909,7 @@ void AmazonEngine::startChapter(int chapter) {
 		}
 	} else if (chapter != 1) {
 		_player->_roomNumber = CHAPTER_JUMP[_chapter - 1];
-		_room->_function = 1;
+		_room->_function = FN_CLEAR1;
 		_converseMode = 0;
 
 		_scripts->cmdRetPos();
@@ -936,8 +936,12 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	for (int i = 0; i < 100; ++i)
 		s.syncAsSint16LE(_esTabTable[i]);
 
-	warning("TODO: 	s.syncAsSint16LE(_topList);");
-	warning("TODO: 	s.syncAsSint16LE(_botList);");
+	if (_player->_roomNumber == 45) {
+
+
+		warning("TODO: 	s.syncAsSint16LE(_topList);");
+		warning("TODO: 	s.syncAsSint16LE(_botList);");
+	}
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 68e078ef08..6148eeb8f1 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1223,8 +1223,8 @@ const char *const NO_HELP_MESSAGE =
 HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \
 YOU CAN UNDERSTAND.";
 const char *const NO_HINTS_MESSAGE = "THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME.";
-const char *const HIT1 = "YOU HIT THE ROCKS AND THE CANOE BEGINS TO LEAK.";
-const char *const HIT2 = "YOU HIT THE ROCKS AND THE CANOE DEVELOPS SERIOUS LEAKS.";
+const char *const RIVER_HIT1 = "YOU HIT THE ROCKS AND THE CANOE BEGINS TO LEAK.";
+const char *const RIVER_HIT2 = "YOU HIT THE ROCKS AND THE CANOE DEVELOPS SERIOUS LEAKS.";
 const char *const BAR_MESSAGE = "YOU ARE TOO BUSY TRYING TO KEEP FROM SINKING TO DO THAT";
 const char *const HELPLVLTXT[3] = {
 	" LEVEL 1 ",
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 37b12d26cf..cd1fc95f82 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -75,8 +75,8 @@ extern const byte FONT6x6_DATA[];
 
 extern const char *const NO_HELP_MESSAGE;
 extern const char *const NO_HINTS_MESSAGE;
-extern const char *const HIT1;
-extern const char *const HIT2;
+extern const char *const RIVER_HIT1;
+extern const char *const RIVER_HIT2;
 extern const char *const BAR_MESSAGE;
 extern const char *const HELPLVLTXT[3];
 extern const char *const IQLABELS[9];
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7b4729b3e0..537dd3094d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -40,6 +40,7 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 	_xCam = 0;
 	_yCam = 0;
 	_zCam = 0;
+	_CHICKENOUTFLG = false;
 
 	_pNumObj = 0;
 	for (int i = 0; i < 32; i++) {
@@ -1557,97 +1558,66 @@ void AmazonScripts::riverSound() {
 }
 
 void AmazonScripts::moveCanoe() {
-	if (_game->_canoeDir != 0) {
-		_game->_canoeYPos += _game->_canoeDir;
-		++_game->_canoeMoveCount;
-		if (_game->_canoeMoveCount == 5) {
-			_game->_canoeLane += _game->_canoeDir;
-			_game->_canoeDir = 0;
-		}
-		return;
-	}
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+	Common::Point pt = events.calcRawMouse();
 
 	_vm->_events->pollEvents();
-	if (_vm->_events->_leftButton) {
-		Common::Point pt = _vm->_events->calcRawMouse();
-		if (pt.y < 180) {
-			if (_vm->_events->_mousePos.x < RMOUSE[8][0]) {
+
+	if (_game->_canoeDir) {
+		// Canoe movement in progress
+		moveCanoe2();
+	} else {
+		if (events._leftButton && pt.y < 180) {
+			if (RMOUSE[8][0] < pt.x) {
 				printString(BAR_MESSAGE);
-				return;
-			}
-			_game->_saveRiver = 1;
-			_vm->_rScrollRow = _vm->_screen->_scrollRow;
-			_vm->_rScrollCol = _vm->_screen->_scrollCol;
-			_vm->_rScrollX = _vm->_screen->_scrollX;
-			_vm->_rScrollY = _vm->_screen->_scrollY;
-			_vm->_rOldRectCount = _vm->_oldRects.size();
-			_vm->_rNewRectCount = _vm->_newRects.size();
-			// _vm->_rKeyFlag = KEYFLG;
-			_vm->_mapOffset = _game->_mapPtr - MAPTBL[_game->_riverFlag];
-			_vm->doLoadSave();
-			if (_vm->_room->_function == 1) {
-				_endFlag = true;
-				_returnCode = 0;
 			} else {
-				_game->_saveRiver = 0;
-				_vm->_room->buildScreen();
-				_vm->copyBF2Vid();
+				_game->_saveRiver = 1;
+				_game->_rScrollRow = screen._scrollRow;
+				_game->_rScrollCol = screen._scrollCol;
+				_game->_rScrollX = screen._scrollX;
+				_game->_rScrollY = screen._scrollY;
+				_game->_mapOffset = _game->_mapPtr - MAPTBL[_game->_riverFlag];
+
+				// Show the ScummVM menu
+				_vm->_room->handleCommand(9);
+
+				if (_vm->_room->_function == FN_CLEAR1) {
+					_endFlag = true;
+					_returnCode = 0;
+				} else {
+					_game->_saveRiver = 0;
+					_vm->_room->buildScreen();
+					_vm->copyBF2Vid();
+				}
 			}
-			return;
-		} 
-		
-		if (pt.y <= _game->_canoeYPos) {
-			if (_game->_canoeLane == 0)
-				return;
-
-			_game->_canoeDir = -1;
-			_game->_canoeMoveCount = 0;
-			_game->_canoeYPos += _game->_canoeDir;
-			++_game->_canoeMoveCount;
-			if (_game->_canoeMoveCount == 5) {
-				_game->_canoeLane += _game->_canoeDir;
-				_game->_canoeDir = 0;
+		} else if ((events._leftButton && pt.y <= _game->_canoeYPos) ||
+			(!events._leftButton && _vm->_player->_move == UP)) {
+			// Move canoe up
+			if (_game->_canoeLane > 0) {
+				_game->_canoeDir = -1;
+				_game->_canoeMoveCount = 0;
+
+				moveCanoe2();
 			}
-		} else {
-			if (_game->_canoeLane == 7)
-				return;
+		} else if (events._leftButton || _vm->_player->_move == DOWN) {
+			// Move canoe down
+			if (_game->_canoeLane < 7) {
+				_game->_canoeDir = 1;
+				_game->_canoeMoveCount = 0;
 
-			_game->_canoeDir = 1;
-			_game->_canoeMoveCount = 0;
-			_game->_canoeYPos += _game->_canoeDir;
-			++_game->_canoeMoveCount;
-			if (_game->_canoeMoveCount == 5) {
-				_game->_canoeLane += _game->_canoeDir;
-				_game->_canoeDir = 0;
+				moveCanoe2();
 			}
 		}
-		return;
-	}	
-
-	if (_vm->_player->_move == UP) {
-		if (_game->_canoeLane == 0)
-			return;
+	}
+}
 
-		_game->_canoeDir = -1;
-		_game->_canoeMoveCount = 0;
-		_game->_canoeYPos += _game->_canoeDir;
-		++_game->_canoeMoveCount;
-		if (_game->_canoeMoveCount == 5) {
-			_game->_canoeLane += _game->_canoeDir;
-			_game->_canoeDir = 0;
-		}
-	} else if (_vm->_player->_move == DOWN) {
-		if (_game->_canoeLane == 7)
-			return;
+void AmazonScripts::moveCanoe2() {
+	_game->_canoeYPos += _game->_canoeDir;
 
-		_game->_canoeDir = 1;
-		_game->_canoeMoveCount = 0;
+	if (++_game->_canoeMoveCount == 5) {
 		_game->_canoeYPos += _game->_canoeDir;
-		++_game->_canoeMoveCount;
-		if (_game->_canoeMoveCount == 5) {
-			_game->_canoeLane += _game->_canoeDir;
-			_game->_canoeDir = 0;
-		}
+		_game->_canoeDir = 0;
 	}
 }
 
@@ -1768,22 +1738,22 @@ void AmazonScripts::RIVER() {
 	static const int RIVERDEATH[5] = {22, 23, 24, 25, 26};
 
 	initRiver();
-	while (true) {
+	while (!_vm->shouldQuit()) {
 		_vm->_events->_vbCount = 4;
 
 //		int bx = _vm->_player->_scrollAmount - _screenVertX;
 		if (_vm->_screen->_scrollX == 0) {
 			_vm->_sound->midiRepeat();
 			if (riverJumpTest()) {
-				CHICKENOUTFLG = false;
+				_CHICKENOUTFLG = false;
 				return;
 			}
 		} else {
 			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
 		}
 
-		if (CHICKENOUTFLG) {
-			CHICKENOUTFLG = false;
+		if (_CHICKENOUTFLG) {
+			_CHICKENOUTFLG = false;
 			return;
 		}
 
@@ -1794,8 +1764,8 @@ void AmazonScripts::RIVER() {
 		pan();
 		moveCanoe();
 
-		if (_vm->_room->_function == 1) {
-			CHICKENOUTFLG = false;
+		if (_vm->_room->_function == FN_CLEAR1) {
+			_CHICKENOUTFLG = false;
 			return;
 		}
 		
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 20dfb6345d..5fd1bb848a 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -43,7 +43,7 @@ private:
 	int _zCam;
 	int _pNumObj;
 	int _screenVertX;
-	bool CHICKENOUTFLG;
+	bool _CHICKENOUTFLG;
 	int _pImgNum[32];
 
 	SpriteResource *_pObject[32];
@@ -94,6 +94,7 @@ protected:
 	bool riverJumpTest();
 	void riverSound();
 	void moveCanoe();
+	void moveCanoe2();
 	void updateObstacles();
 	void riverSetPhysX();
 	bool checkRiverCollide();
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 9251db4af4..bc76d48d8d 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -29,7 +29,7 @@
 namespace Access {
 
 Room::Room(AccessEngine *vm) : Manager(vm) {
-	_function = 0;
+	_function = FN_NONE;
 	_roomFlag = 0;
 	_playField = nullptr;
 	_playFieldWidth = _playFieldHeight = 0;
@@ -70,7 +70,7 @@ void Room::doRoom() {
 
 		reloadFlag = false;
 		_vm->_startup = 8;
-		_function = 0;
+		_function = FN_NONE;
 
 		while (!_vm->shouldQuit()) {
 			_vm->_images.clear();
@@ -111,7 +111,7 @@ void Room::doRoom() {
 			if (_vm->_player->_scrollFlag) {
 				_vm->copyBF1BF2();
 				_vm->_newRects.clear();
-				_function = 0;
+				_function = FN_NONE;
 				roomLoop();
 
 				if (_function == FN_CLEAR1) {
@@ -125,7 +125,7 @@ void Room::doRoom() {
 			} else {
 				_vm->copyBF1BF2();
 				_vm->_newRects.clear();
-				_function = 0;
+				_function = FN_NONE;
 
 				roomLoop();
 				if (_vm->shouldQuit())
diff --git a/engines/access/room.h b/engines/access/room.h
index a26f2ed04c..a3ee019d39 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -91,11 +91,6 @@ protected:
 	*/
 	void freeTileData();
 
-	/**
-	* Switch to a given command mode
-	*/
-	void handleCommand(int commandId);
-
 	int checkBoxes();
 	int checkBoxes1(const Common::Point &pt);
 	int checkBoxes2(const Common::Point &pt, int start, int count);
@@ -120,7 +115,7 @@ protected:
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
-	int _function;
+	Function _function;
 	int _roomFlag;
 	byte *_playField;
 	int _matrixSize;
@@ -166,6 +161,11 @@ public:
 	void setWallCodes();
 
 	bool codeWalls();
+
+	/**
+	* Switch to a given command mode
+	*/
+	void handleCommand(int commandId);
 };
 
 class RoomInfo {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 9aba05a2fb..72650f472c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -531,7 +531,7 @@ void Scripts::cmdSpecial() {
 
 	if (_specialFunction == 1) {
 		_vm->_screen->restorePalette();
-		_vm->_room->_function = 3;
+		_vm->_room->_function = FN_RELOAD;
 	}
 }
 
-- 
cgit v1.2.3


From c6042e2e2593f92ff0dc936fe34e6b933c284589 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 22:27:09 -0500
Subject: ACCESS: Minor cleanups of canoe code

---
 engines/access/amazon/amazon_scripts.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 537dd3094d..aa904716c2 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1562,16 +1562,18 @@ void AmazonScripts::moveCanoe() {
 	EventsManager &events = *_vm->_events;
 	Common::Point pt = events.calcRawMouse();
 
-	_vm->_events->pollEvents();
+	events.pollEvents();
 
 	if (_game->_canoeDir) {
 		// Canoe movement in progress
 		moveCanoe2();
 	} else {
-		if (events._leftButton && pt.y < 180) {
-			if (RMOUSE[8][0] < pt.x) {
+		if (events._leftButton && pt.y >= 140) {
+			if (pt.x < RMOUSE[8][0]) {
+				// Disk icon wasn't clicked
 				printString(BAR_MESSAGE);
 			} else {
+				// Clicked on the Disc icon
 				_game->_saveRiver = 1;
 				_game->_rScrollRow = screen._scrollRow;
 				_game->_rScrollCol = screen._scrollCol;
@@ -1738,6 +1740,8 @@ void AmazonScripts::RIVER() {
 	static const int RIVERDEATH[5] = {22, 23, 24, 25, 26};
 
 	initRiver();
+	_vm->_events->showCursor();
+
 	while (!_vm->shouldQuit()) {
 		_vm->_events->_vbCount = 4;
 
@@ -1787,14 +1791,11 @@ void AmazonScripts::RIVER() {
 				return;
 			}
 		}
-		
-		if (_vm->_events->_mousePos.y >= 24 && _vm->_events->_mousePos.y <= 136) {
-			_vm->_events->hideCursor();
-			scrollRiver1();
-			_vm->_events->pollEvents();
-		} else
-			scrollRiver1();
 
+		// Scroll the river
+		scrollRiver1();
+
+		// Allow time for new scrolled river position to be shown
 		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
 			_vm->_events->pollEventsAndWait();
 		}
-- 
cgit v1.2.3


From b1ea7879f3f6726e4b63aac5f985876fcd1ea9b2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 22:52:13 -0500
Subject: ACCESS: Fix saving/loading using ScummVM GMM in the river scene

---
 engines/access/amazon/amazon_scripts.cpp | 67 ++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index aa904716c2..ea7df7bcbd 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1562,7 +1562,12 @@ void AmazonScripts::moveCanoe() {
 	EventsManager &events = *_vm->_events;
 	Common::Point pt = events.calcRawMouse();
 
+	// Do an event polling
+	_vm->_canSaveLoad = true;
 	events.pollEvents();
+	_vm->_canSaveLoad = false;
+	if (_vm->_room->_function == FN_CLEAR1)
+		return;
 
 	if (_game->_canoeDir) {
 		// Canoe movement in progress
@@ -1584,10 +1589,7 @@ void AmazonScripts::moveCanoe() {
 				// Show the ScummVM menu
 				_vm->_room->handleCommand(9);
 
-				if (_vm->_room->_function == FN_CLEAR1) {
-					_endFlag = true;
-					_returnCode = 0;
-				} else {
+				if (_vm->_room->_function != FN_CLEAR1) {
 					_game->_saveRiver = 0;
 					_vm->_room->buildScreen();
 					_vm->copyBF2Vid();
@@ -1768,36 +1770,43 @@ void AmazonScripts::RIVER() {
 		pan();
 		moveCanoe();
 
-		if (_vm->_room->_function == FN_CLEAR1) {
-			_CHICKENOUTFLG = false;
-			return;
-		}
-		
-		updateObstacles();
-		riverSetPhysX();
-		bool checkCollide = checkRiverCollide();
-		if (_game->_hitSafe != 0)
-			_game->_hitSafe -= 2;
-
-		if (checkCollide) {
-			cmdDead(RIVERDEATH[0]);
-			return;
-		}
+		if (_vm->_room->_function != FN_CLEAR1) {
+			updateObstacles();
+			riverSetPhysX();
+			bool checkCollide = checkRiverCollide();
+			if (_game->_hitSafe != 0)
+				_game->_hitSafe -= 2;
 
-		if (_game->_deathFlag) {
-			_game->_deathCount--;
-			if (_game->_deathCount == 0) {
-				cmdDead(RIVERDEATH[_game->_deathType]);
+			if (checkCollide) {
+				cmdDead(RIVERDEATH[0]);
 				return;
 			}
-		}
 
-		// Scroll the river
-		scrollRiver1();
+			if (_game->_deathFlag) {
+				_game->_deathCount--;
+				if (_game->_deathCount == 0) {
+					cmdDead(RIVERDEATH[_game->_deathType]);
+					return;
+				}
+			}
+
+			// Scroll the river
+			scrollRiver1();
 
-		// Allow time for new scrolled river position to be shown
-		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-			_vm->_events->pollEventsAndWait();
+			// Allow time for new scrolled river position to be shown
+			_vm->_canSaveLoad = true;
+			while (!_vm->shouldQuit() && _vm->_room->_function == FN_NONE &&
+					_vm->_events->_vbCount > 0) {
+				_vm->_events->pollEventsAndWait();
+			}
+			_vm->_canSaveLoad = false;
+		}
+
+		if (_vm->_room->_function == FN_CLEAR1) {
+			_endFlag = true;
+			_returnCode = 0;
+			_CHICKENOUTFLG = false;
+			break;
 		}
 	}
 }
-- 
cgit v1.2.3


From 3f445384415d18bc4e437c33df67be88dfdb4a0a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 27 Nov 2014 23:21:19 -0500
Subject: ACCESS: Fix array sizes for panning objects fields

---
 engines/access/amazon/amazon_scripts.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 5fd1bb848a..bd47e9ce5b 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -44,15 +44,14 @@ private:
 	int _pNumObj;
 	int _screenVertX;
 	bool _CHICKENOUTFLG;
-	int _pImgNum[32];
 
 	SpriteResource *_pObject[32];
-
+	int _pImgNum[32];
 	int _pObjX[32];
 	int _pObjY[32];
 	int _pObjZ[32];
-	int _pObjXl[16];
-	int _pObjYl[16];
+	int _pObjXl[32];
+	int _pObjYl[32];
 
 	int _jCnt[3];
 	int _jungleX[3];
-- 
cgit v1.2.3


From 27351011799b4c85e0fc7f80acbbbf10dbb78aa9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 28 Nov 2014 13:59:27 +0100
Subject: ACCESS: Finish the implementation of cmdHelp (still a redraw issue)

---
 engines/access/amazon/amazon_game.cpp      |  4 +--
 engines/access/amazon/amazon_game.h        |  2 +-
 engines/access/amazon/amazon_resources.cpp |  4 +++
 engines/access/amazon/amazon_resources.h   |  1 +
 engines/access/amazon/amazon_scripts.cpp   | 47 ++++++++++++++++++++++++++++--
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index cdc7727244..f4cf83e150 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -726,7 +726,7 @@ void AmazonEngine::drawHelpText(const Common::String &msg) {
 	_events->showCursor();
 }
 
-void AmazonEngine::drawHelp() {
+void AmazonEngine::drawHelp(const Common::String str) {
 	_events->hideCursor();
 	if (_useItem == 0) {
 		_buffer2.copyBuffer(_screen);
@@ -760,7 +760,7 @@ void AmazonEngine::drawHelp() {
 		_screen->fadeIn();
 
 	helpTitle();
-	drawHelpText("TODO: WHICH BUFFER?");
+	drawHelpText(str);
 }
 
 void AmazonEngine::startChapter(int chapter) {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index d67f0c2150..435e1722b2 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -197,7 +197,7 @@ public:
 	*/
 	void freeInactivePlayer();
 
-	void drawHelp();
+	void drawHelp(const Common::String str);
 
 	virtual void establish(int esatabIndex, int sub);
 
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 6148eeb8f1..05e234aefc 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1772,6 +1772,10 @@ RiverStruct *RIVEROBJECTTBL[6] = {
 	ENDRIVER1, RIVER2OBJECTS, ENDRIVER2
 };
 
+const int HELP1COORDS[2][4] = {
+	{  76, 129, 168, 183 }, { 187, 240, 168, 183 }
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index cd1fc95f82..6d94e6a359 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -126,6 +126,7 @@ extern RiverStruct RIVER2OBJECTS[53];
 extern RiverStruct ENDRIVER2[1];
 
 extern RiverStruct *RIVEROBJECTTBL[6];
+extern const int HELP1COORDS[2][4];
 
 } // End of namespace Amazon
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index ea7df7bcbd..cde1ff8324 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1887,8 +1887,51 @@ void AmazonScripts::cmdHelp() {
 	if (level < _game->_helpLevel)
 		_game->_moreHelp = 0;
 
-	_game->drawHelp();
-	error("TODO: more cmdHelp");
+	_game->drawHelp(helpMessage);
+
+	while(true) {
+		while(!_vm->shouldQuit() && !_vm->_events->_leftButton)
+			_vm->_events->pollEventsAndWait();
+
+		_vm->_events->debounceLeft();
+
+		static const Common::Rect butn1 = Common::Rect(HELP1COORDS[0][0], HELP1COORDS[0][2], HELP1COORDS[0][1], HELP1COORDS[0][3]);
+		static const Common::Rect butn2 = Common::Rect(HELP1COORDS[1][0], HELP1COORDS[1][2], HELP1COORDS[1][1], HELP1COORDS[1][3]);
+		const Common::Point pt = _vm->_events->_mousePos;
+
+		int choice = -1;
+		if (butn1.contains(pt))
+			choice = 0;
+		else if (butn2.contains(pt))
+			choice = 1;
+
+		if (choice < 0)
+			continue;
+
+		if (choice == 1) {
+			_game->_helpLevel = 0;
+			_game->_moreHelp = 1;
+			_game->_useItem = 0;
+			_vm->_events->hideCursor();
+			_vm->_screen->restoreScreen();
+			_vm->_screen->setPanel(0);
+			_vm->_buffer2.copyFrom(*_vm->_screen);
+			_vm->_screen->restorePalette();
+			_vm->_screen->setPalette();
+			_vm->_events->showCursor();
+			free(_vm->_objectsTable[45]);
+			_vm->_objectsTable[45] = nullptr;
+			_vm->_timers.restoreTimers();
+			break;
+		} else {
+			if ((_game->_moreHelp == 0) || (choice != 0))
+				continue;
+			++_game->_helpLevel;
+			_game->_useItem = 1;
+			break;
+		}
+	}
+	findNull();
 }
 
 void AmazonScripts::cmdCycleBack() {
-- 
cgit v1.2.3


From 62a7619017c676c229ba72b295a4ceae19d3f0c7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 10:19:26 -0500
Subject: ACCESS: Better fix for drawing partially off-screen sprites

---
 engines/access/asurface.cpp | 49 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 624721920a..4202ed098f 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -232,33 +232,34 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 		scaleYCtr -= SCALE_LIMIT;
 
 		// Handle off-screen lines
-		if (destY < 0)
-			continue;
-		else if (destY >= dest->h)
+		if (destY >= dest->h)
 			break;
 
-		// Handle drawing the line
-		byte *pSrc = (byte *)getBasePtr(0, yCtr);
-		byte *pDest = (byte *)dest->getBasePtr(bounds.left, destY);
-		scaleXCtr = 0;
-		int x = bounds.left;
-
-		for (int xCtr = 0; xCtr < this->w; ++xCtr, ++pSrc) {
-			// Handle horizontal scaling
-			scaleXCtr += scaleX;
-			if (scaleXCtr < SCALE_LIMIT)
-				continue;
-			scaleXCtr -= SCALE_LIMIT;
-
-			// Only handle on-screen pixels
-			if (x >= dest->w)
-				break;	
-			if (x >= 0 && *pSrc != 0)
-				*pDest = *pSrc;
-			
-			++pDest;
-			++x;
+		if (destY >= 0) {
+			// Handle drawing the line
+			byte *pSrc = (byte *)getBasePtr(0, yCtr);
+			byte *pDest = (byte *)dest->getBasePtr(bounds.left, destY);
+			scaleXCtr = 0;
+			int x = bounds.left;
+
+			for (int xCtr = 0; xCtr < this->w; ++xCtr, ++pSrc) {
+				// Handle horizontal scaling
+				scaleXCtr += scaleX;
+				if (scaleXCtr < SCALE_LIMIT)
+					continue;
+				scaleXCtr -= SCALE_LIMIT;
+
+				// Only handle on-screen pixels
+				if (x >= dest->w)
+					break;
+				if (x >= 0 && *pSrc != 0)
+					*pDest = *pSrc;
+
+				++pDest;
+				++x;
+			}
 		}
+
 		++destY;
 	}
 }
-- 
cgit v1.2.3


From bfbce8c6a6ac00423b47f3c3ce0f3b9a32e497ae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 11:40:33 -0500
Subject: ACCESS: Cleanup of updateObstacles

---
 engines/access/amazon/amazon_game.cpp    |  2 +-
 engines/access/amazon/amazon_game.h      |  2 +-
 engines/access/amazon/amazon_scripts.cpp | 65 +++++++++++++++-----------------
 engines/access/events.cpp                |  2 +-
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f4cf83e150..4237982b4d 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -44,7 +44,7 @@ AccessEngine(syst, gameDesc),
 	_canoeLane = 0;
 	_canoeYPos = 0;
 	_hitCount = 0;
-	_saveRiver = 0;
+	_saveRiver = false;
 	_hitSafe = 0;
 	_oldTitleChapter = _chapter = 0;
 	_updateChapter = -1;
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 435e1722b2..4c4b304514 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -150,7 +150,7 @@ public:
 	int _canoeLane;
 	int _canoeYPos;
 	int _hitCount;
-	int _saveRiver;
+	bool _saveRiver;
 	int _hitSafe;
 	int _chapter;
 	int _riverIndex;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index cde1ff8324..7cae5fd0ef 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1408,12 +1408,14 @@ void AmazonScripts::initRiver() {
 	_vm->_destIn = &_vm->_buffer2;
 	_vm->_room->roomMenu();
 
-	if (_game->_saveRiver == 1) {
+	if (_game->_saveRiver) {
+		// Restoring a savegame, so set properties from saved fields
 		_vm->_screen->_scrollRow = _vm->_rScrollRow;
 		_vm->_screen->_scrollCol = _vm->_rScrollCol;
 		_vm->_screen->_scrollX = _vm->_rScrollX;
 		_vm->_screen->_scrollY = _vm->_rScrollY;
 	} else {
+		// Set initial scene state
 		_vm->_screen->_scrollRow = 0;
 		_vm->_screen->_scrollCol = 140;
 		_vm->_screen->_scrollX = 0;
@@ -1423,11 +1425,14 @@ void AmazonScripts::initRiver() {
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 	_vm->_screen->forceFadeIn();
-	if (_game->_saveRiver == 1) {
+
+	if (_game->_saveRiver) {
+		// Restore draw rects from savegame
 		_vm->_oldRects.resize(_vm->_rOldRectCount);
 		_vm->_newRects.resize(_vm->_rNewRectCount);
 		// KEYFLG = _vm->_rKeyFlag
 	} else {
+		// Reset draw rects
 		_vm->_oldRects.clear();
 		_vm->_newRects.clear();
 		// KEYFLG = 0
@@ -1441,7 +1446,7 @@ void AmazonScripts::initRiver() {
 
 	_game->_canoeFrame = 0;
 	_game->_mapPtr = (const byte *)MAPTBL[_game->_riverFlag] + 1;
-	if (_game->_saveRiver == 1) {
+	if (_game->_saveRiver) {
 		_game->_mapPtr--;
 		_game->_mapPtr += _game->_mapOffset;
 	} else {
@@ -1468,7 +1473,7 @@ void AmazonScripts::initRiver() {
 	++_game->_timers[12]._flag;
 	
 	_game->_maxHits = 2 - _game->_riverFlag;
-	_game->_saveRiver = 0;
+	_game->_saveRiver = false;
 }
 
 void AmazonScripts::resetPositions() {
@@ -1579,7 +1584,7 @@ void AmazonScripts::moveCanoe() {
 				printString(BAR_MESSAGE);
 			} else {
 				// Clicked on the Disc icon
-				_game->_saveRiver = 1;
+				_game->_saveRiver = true;
 				_game->_rScrollRow = screen._scrollRow;
 				_game->_rScrollCol = screen._scrollCol;
 				_game->_rScrollX = screen._scrollX;
@@ -1590,7 +1595,7 @@ void AmazonScripts::moveCanoe() {
 				_vm->_room->handleCommand(9);
 
 				if (_vm->_room->_function != FN_CLEAR1) {
-					_game->_saveRiver = 0;
+					_game->_saveRiver = false;
 					_vm->_room->buildScreen();
 					_vm->copyBF2Vid();
 				}
@@ -1626,42 +1631,32 @@ void AmazonScripts::moveCanoe2() {
 }
 
 void AmazonScripts::updateObstacles() {
-	RiverStruct *cur = _game->_topList;
-	while (true) {
-		int val = cur[0]._field1 + cur[0]._field3 - 1;
-		if (val < _screenVertX) {
-			cur = _game->_topList;
-			cur--;
-			_game->_botList = cur;
-			return;
-		}
-
-		if (cur[0]._field3 < _screenVertX + 319) {
-			_game->_topList = _game->_botList = cur;
+	RiverStruct *cur;
+	for (cur = _game->_topList; cur < RIVEROBJECTTBL[_game->_riverIndex + 1]; ++cur) {
+		int val = cur->_field1 + cur->_field3 - 1;
+		if (val < _screenVertX)
 			break;
-		}
 
-		if (cur > RIVEROBJECTTBL[_game->_riverIndex + 1]) {
-			cur = _game->_topList;
-			cur--;
+		if (cur->_field3 < (_game->_screenVirtX + 319)) {
+			_game->_topList = cur;
 			_game->_botList = cur;
-			return;
-		}
-	}
 
-	while (true) {
-		if (cur > RIVEROBJECTTBL[_game->_riverIndex + 1])
-			return;
-		++cur;
-		int val = cur[0]._field1 + cur[0]._field3 - 1;
-		if (val < _screenVertX)
-			return;
+			while (cur < RIVEROBJECTTBL[_game->_riverIndex + 1]) {
+				++cur;
+				val = cur->_field1 + cur->_field3 - 1;
+				if (val < _screenVertX || (cur->_field3 >= (_game->_screenVirtX + 319)))
+					break;
 
-		if (cur[0]._field3 >= _screenVertX + 319)
-			return;
+				_game->_botList = cur;
+			}
 
-		_game->_botList = cur;
+			return;
+		}
 	}
+
+	cur = _game->_topList;
+	cur--;
+	_game->_botList = cur;
 }
 
 void AmazonScripts::riverSetPhysX() {
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 327fb06dd1..06552b781b 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -288,7 +288,7 @@ void EventsManager::centerMousePos() {
 }
 
 void EventsManager::restrictMouse() {
-	warning("TODO: restrictMouse");
+	// No implementation in ScummVM
 }
 
 } // End of namespace Access
-- 
cgit v1.2.3


From abecac94d4b944f1c594f6963cb308614086360a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 11:42:25 -0500
Subject: ACCESS: Fix to restrict river canoe to 7 allowable 'lanes'

---
 engines/access/amazon/amazon_scripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7cae5fd0ef..58491250ad 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1625,7 +1625,7 @@ void AmazonScripts::moveCanoe2() {
 	_game->_canoeYPos += _game->_canoeDir;
 
 	if (++_game->_canoeMoveCount == 5) {
-		_game->_canoeYPos += _game->_canoeDir;
+		_game->_canoeLane += _game->_canoeDir;
 		_game->_canoeDir = 0;
 	}
 }
-- 
cgit v1.2.3


From eeb9d63a19ba3a712a8f02ecede554dc992246fe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 14:16:10 -0500
Subject: ACCESS: Don't decrease timers whilst text dialogs are showing

---
 engines/access/events.cpp  | 16 +++++++++-------
 engines/access/events.h    |  4 ++--
 engines/access/scripts.cpp |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 06552b781b..8b109ea470 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -120,9 +120,9 @@ bool EventsManager::isCursorVisible() {
 	return CursorMan.isVisible();
 }
 
-void EventsManager::pollEvents() {
+void EventsManager::pollEvents(bool skipTimers) {
 	if (checkForNextFrameCounter()) {
-		nextFrame();
+		nextFrame(skipTimers);
 	}
 
 	_wheelUp = _wheelDown = false;
@@ -200,10 +200,12 @@ bool EventsManager::checkForNextFrameCounter() {
 	return false;
 }
 
-void EventsManager::nextFrame() {
-	// Update timers
-	_vm->_animation->updateTimers();
-	_vm->_timers.updateTimers();
+void EventsManager::nextFrame(bool skipTimers) {
+	if (skipTimers) {
+		// Update timers
+		_vm->_animation->updateTimers();
+		_vm->_timers.updateTimers();
+	}
 
 	// Give time to the debugger
 	_vm->_debugger->onFrame();
@@ -243,7 +245,7 @@ void EventsManager::clearEvents() {
 
 void EventsManager::waitKeyMouse() {
 	while (!_vm->shouldQuit() && !_leftButton && _keypresses.size() == 0) {
-		pollEvents();
+		pollEvents(true);
 		g_system->delayMillis(10);
 	}
 
diff --git a/engines/access/events.h b/engines/access/events.h
index c72f245412..95ba926384 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -47,7 +47,7 @@ private:
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
 	Graphics::Surface _invCursor;
-	void nextFrame();
+	void nextFrame(bool skipTimers);
 public:
 	CursorType _cursorId;
 	CursorType _normalMouse;
@@ -105,7 +105,7 @@ public:
 	 */
 	bool isCursorVisible();
 
-	void pollEvents();
+	void pollEvents(bool skipTimers = false);
 
 	void pollEventsAndWait();
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 72650f472c..d611b6fe26 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -213,7 +213,7 @@ void Scripts::printString(const Common::String &msg) {
 
 	// Wait until the bubble display is expired
 	while (!_vm->shouldQuit() && _vm->_timers[PRINT_TIMER]._flag) {
-		_vm->_events->pollEvents();
+		_vm->_events->pollEvents(true);
 	}
 
 	// Restore the original screen over the text bubble
-- 
cgit v1.2.3


From 740df9b42aac87472353512d2eda796bdd6d3aa3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 14:22:11 -0500
Subject: ACCESS: Further tweaks to timer skipping

---
 engines/access/events.cpp  | 2 +-
 engines/access/scripts.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 8b109ea470..87e5d10cc3 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -201,7 +201,7 @@ bool EventsManager::checkForNextFrameCounter() {
 }
 
 void EventsManager::nextFrame(bool skipTimers) {
-	if (skipTimers) {
+	if (!skipTimers) {
 		// Update timers
 		_vm->_animation->updateTimers();
 		_vm->_timers.updateTimers();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index d611b6fe26..72650f472c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -213,7 +213,7 @@ void Scripts::printString(const Common::String &msg) {
 
 	// Wait until the bubble display is expired
 	while (!_vm->shouldQuit() && _vm->_timers[PRINT_TIMER]._flag) {
-		_vm->_events->pollEvents(true);
+		_vm->_events->pollEvents();
 	}
 
 	// Restore the original screen over the text bubble
-- 
cgit v1.2.3


From e3322185686f268c0375bcaef93c5ef35209ebdc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 15:06:49 -0500
Subject: ACCESS: Workaround for Exit/walk icon in massacre site scene

---
 engines/access/amazon/amazon_room.cpp | 16 ++++++++++++++++
 engines/access/amazon/amazon_room.h   |  2 ++
 engines/access/room.cpp               | 33 ++++++++++++++++++++-------------
 engines/access/room.h                 |  2 ++
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 4df1131643..ca0d7bf341 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -199,6 +199,22 @@ void AmazonRoom::mainAreaClick() {
 	}
 }
 
+void AmazonRoom::walkCursor() {
+	// WORKAROUND: For scene 29, which is a normal walkable scene, but yet can be
+	// 'exitted'. This workaround ensures the scene will only be left if you click
+	// the Exit icon wgeb the cursor is already a walk cursor
+	EventsManager &events = *_vm->_events;
+
+	if (_vm->_player->_roomNumber == 29 && events._normalMouse != CURSOR_CROSSHAIRS) {
+		events._normalMouse = CURSOR_CROSSHAIRS;
+		events.setCursor(CURSOR_CROSSHAIRS);
+		_selectCommand = -1;
+		_vm->_boxSelect = true;
+	} else {
+		Room::walkCursor();
+	}
+}
+
 void AmazonRoom::init4Quads() {
 	if (!_vm->_screen->_vesaMode)
 		return;
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index bcb0d84e15..ab9212724f 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -53,6 +53,8 @@ protected:
 	virtual void mainAreaClick();
 
 	virtual void clearRoom();
+
+	virtual void walkCursor();
 public:
 	AmazonRoom(AccessEngine *vm);
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index bc76d48d8d..b9ce06959a 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -540,19 +540,7 @@ void Room::executeCommand(int commandId) {
 		events.setCursor(CURSOR_TALK);
 		break;
 	case 7:
-		events._normalMouse = CURSOR_CROSSHAIRS;
-		events.setCursor(CURSOR_CROSSHAIRS);
-		_vm->_scripts->_sequence = 5000;
-		_vm->_scripts->searchForSequence();
-		roomMenu();
-		_selectCommand = -1;
-
-		_conFlag = true;
-		while (_conFlag && !_vm->shouldQuit()) {
-			_conFlag = false;
-			_vm->_scripts->executeScript();
-		}
-		_vm->_boxSelect = true;
+		walkCursor();
 		return;
 	case 8:
 		events._normalMouse = CURSOR_HELP;
@@ -580,6 +568,25 @@ void Room::executeCommand(int commandId) {
 	_vm->_boxSelect = true;
 }
 
+void Room::walkCursor() {
+	EventsManager &events = *_vm->_events;
+	
+	events._normalMouse = CURSOR_CROSSHAIRS;
+	events.setCursor(CURSOR_CROSSHAIRS);
+	_vm->_scripts->_sequence = 5000;
+	_vm->_scripts->searchForSequence();
+	roomMenu();
+	_selectCommand = -1;
+
+	_conFlag = true;
+	while (_conFlag && !_vm->shouldQuit()) {
+		_conFlag = false;
+		_vm->_scripts->executeScript();
+	}
+
+	_vm->_boxSelect = true;
+}
+
 void Room::commandOff() {
 	_selectCommand = -1;
 	_vm->_events->setCursor(CURSOR_CROSSHAIRS);
diff --git a/engines/access/room.h b/engines/access/room.h
index a3ee019d39..4ec80d114c 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -112,6 +112,8 @@ protected:
 	virtual void doCommands();
 
 	virtual void mainAreaClick() = 0;
+
+	virtual void walkCursor();
 public:
 	Plotter _plotter;
 	Common::Array<JetFrame> _jetFrame;
-- 
cgit v1.2.3


From 1716cd9b30e9fdf97fcbcc854c30c0818ae90011 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 21:02:12 -0500
Subject: ACCESS: Major refactoring of Amazon logic into their own classes

---
 engines/access/access.cpp                  |   18 -
 engines/access/access.h                    |   11 +-
 engines/access/amazon/amazon_game.cpp      |  389 ++----
 engines/access/amazon/amazon_game.h        |   78 +-
 engines/access/amazon/amazon_logic.cpp     | 1832 ++++++++++++++++++++++++++++
 engines/access/amazon/amazon_logic.h       |  228 ++++
 engines/access/amazon/amazon_player.cpp    |    2 +-
 engines/access/amazon/amazon_resources.cpp |   62 +
 engines/access/amazon/amazon_resources.h   |    6 +
 engines/access/amazon/amazon_room.cpp      |    3 +-
 engines/access/amazon/amazon_scripts.cpp   | 1514 +----------------------
 engines/access/amazon/amazon_scripts.h     |   59 -
 engines/access/martian/martian_game.h      |    2 +
 engines/access/module.mk                   |    1 +
 engines/access/player.cpp                  |    2 +-
 engines/access/scripts.cpp                 |   69 +-
 engines/access/scripts.h                   |   11 +-
 17 files changed, 2236 insertions(+), 2051 deletions(-)
 create mode 100644 engines/access/amazon/amazon_logic.cpp
 create mode 100644 engines/access/amazon/amazon_logic.h

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 885b2f998c..1ab40a2de7 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -92,15 +92,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_helpTbl[2] = _help3;
 	_travel = 0;
 	_ask = 0;
-	_rScrollRow = 0;
-	_rScrollCol = 0;
-	_rScrollX = 0;
-	_rScrollY = 0;
-	_rOldRectCount = 0;
-	_rNewRectCount = 0;
-	_rKeyFlag = 0;
-	_mapOffset = 0;
-	_screenVirtX = 0;
 	_lastTime = g_system->getMillis();
 	_curTime = 0;
 	_narateFile = 0;
@@ -524,15 +515,6 @@ void AccessEngine::synchronize(Common::Serializer &s) {
 
 	s.syncAsUint16LE(_travel);
 	s.syncAsUint16LE(_ask);
-	s.syncAsUint16LE(_rScrollRow);
-	s.syncAsUint16LE(_rScrollCol);
-	s.syncAsSint16LE(_rScrollX);
-	s.syncAsSint16LE(_rScrollY);
-	s.syncAsUint16LE(_rOldRectCount);
-	s.syncAsUint16LE(_rNewRectCount);
-	s.syncAsUint16LE(_rKeyFlag);
-	s.syncAsUint16LE(_mapOffset);
-	s.syncAsUint16LE(_screenVirtX);
 
 	for (int i = 0; i < 100; ++i)
 		s.syncAsByte(_establishTable[i]);
diff --git a/engines/access/access.h b/engines/access/access.h
index c0bc467f08..0942c9eb8e 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -213,15 +213,6 @@ public:
 	byte *_helpTbl[3];
 	int _travel;
 	int _ask;
-	int _rScrollRow;
-	int _rScrollCol;
-	int _rScrollX;
-	int _rScrollY;
-	int _rOldRectCount;
-	int _rNewRectCount;
-	int _rKeyFlag;
-	int _mapOffset;
-	int _screenVirtX;
 
 	bool _clearSummaryFlag;
 
@@ -234,6 +225,8 @@ public:
 	AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 	virtual ~AccessEngine();
 
+	virtual void dead(int deathId) = 0;
+
 	uint32 getFeatures() const;
 	bool isCD() const;
 	Common::Language getLanguage() const;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 4237982b4d..55876b5692 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -36,38 +36,22 @@ AccessEngine(syst, gameDesc),
 		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
 		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), 
 		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]), 
-		_noSound(_flags[239]) {
+		_noSound(_flags[239]),
+		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this), 
+		_plane(this), _river(this) {
 
 	_skipStart = false;
 	_charSegSwitch = false;
 
-	_canoeLane = 0;
-	_canoeYPos = 0;
-	_hitCount = 0;
 	_saveRiver = false;
-	_hitSafe = 0;
 	_oldTitleChapter = _chapter = 0;
 	_updateChapter = -1;
-	_topList = nullptr;
-	_botList = nullptr;
-	_riverIndex = 0;
 	_rawInactiveX = 0;
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
 	_tilePos = Common::Point(0, 0);
 	_hintLevel = 0;
 
-	_antDirection = NONE;
-	_pitDirection = NONE;
-	_antCel = 0;
-	_torchCel = 0;
-	_pitCel = 0;
-	_stabCel = 0;
-	_antPos = Common::Point(0, 0);
-	_antDieFl = _antEatFl = false;
-	_stabFl = false;
-	_pitPos = Common::Point(0, 0);
-
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 	memset(_tileData, 0, sizeof(_tileData));
 	
@@ -96,7 +80,6 @@ void AmazonEngine::playGame() {
 	// Initialize Amazon game-specific objects
 	_room = new AmazonRoom(this);
 	_scripts = new AmazonScripts(this);
-	_guard.setVm(this);
 
 	// Setup the game
 	setupGame();
@@ -140,7 +123,7 @@ void AmazonEngine::doIntroduction() {
 		return;
 
 	_screen->setPanel(3);
-	((AmazonScripts *)_scripts)->mWhileDoOpen();
+	_opening.mWhileDoOpen();
 
 	if (shouldQuit() || _skipStart)
 		return;
@@ -916,315 +899,89 @@ void AmazonEngine::startChapter(int chapter) {
 	}
 }
 
-void AmazonEngine::synchronize(Common::Serializer &s) {
-	AccessEngine::synchronize(s);
-
-	int dummy = 0;
-
-	s.syncAsSint16LE(_canoeLane);
-	s.syncAsSint16LE(_canoeYPos);
-	s.syncAsSint16LE(_hitCount);
-	s.syncAsSint16LE(_saveRiver);
-	s.syncAsSint16LE(_hitSafe);
-	s.syncAsSint16LE(_chapter);
-	s.syncAsSint16LE(dummy);
-	s.syncAsSint16LE(dummy);
-	s.syncAsSint16LE(_riverIndex);
-	s.syncAsSint16LE(_rawInactiveX);
-	s.syncAsSint16LE(_rawInactiveY);
-	s.syncAsSint16LE(_inactiveYOff);
-	for (int i = 0; i < 100; ++i)
-		s.syncAsSint16LE(_esTabTable[i]);
-
-	if (_player->_roomNumber == 45) {
-
-
-		warning("TODO: 	s.syncAsSint16LE(_topList);");
-		warning("TODO: 	s.syncAsSint16LE(_botList);");
-	}
-}
-
-/*------------------------------------------------------------------------*/
-
-Plane::Plane() {
-	_pCount = 0;
-	_planeCount = 0;
-	_propCount = 0;
-	_xCount = 0;
-}
-
-/*------------------------------------------------------------------------*/
-
-Guard::Guard() {
-	_vm = nullptr;
-	_guardCel = 0;
-	_gCode1 = _gCode2 = 0;
-	_xMid = _yMid = 0;
-}
 
-void Guard::setVerticalCode() {
-	_gCode1 = 0;
-	_gCode2 = 0;
-	if (_topLeft.x < _vm->_screen->_orgX1)
-		_gCode1 |= 8;
-	else if (_topLeft.x == _vm->_screen->_orgX1) {
-		_gCode1 |= 8;
-		_gCode1 |= 2;
-	}
-	else
-		_gCode1 |= 2;
-
-	if (_bottomRight.x < _vm->_screen->_orgX1)
-		_gCode2 |= 8;
-	else if (_bottomRight.x == _vm->_screen->_orgX1) {
-		_gCode2 |= 8;
-		_gCode2 |= 2;
-	}
-	else
-		_gCode2 |= 2;
-
-	if (_topLeft.y < _vm->_screen->_orgY1)
-		_gCode1 |= 4;
-	else if (_topLeft.y > _vm->_screen->_orgY2)
-		_gCode1 |= 1;
-
-	if (_bottomRight.y < _vm->_screen->_orgY1)
-		_gCode2 |= 4;
-	else if (_bottomRight.y > _vm->_screen->_orgY2)
-		_gCode2 |= 1;
-}
-
-void Guard::setHorizontalCode() {
-	_gCode1 = 0;
-	_gCode2 = 0;
-
-	if (_topLeft.y < _vm->_screen->_orgY1)
-		_gCode1 |= 4;
-	else if (_topLeft.x == _vm->_screen->_orgX1) {
-		_gCode1 |= 4;
-		_gCode1 |= 1;
-	}
-	else
-		_gCode1 |= 1;
-
-	if (_bottomRight.y < _vm->_screen->_orgY1)
-		_gCode2 |= 4;
-	else if (_bottomRight.x == _vm->_screen->_orgX1) {
-		_gCode2 |= 4;
-		_gCode2 |= 1;
-	}
-	else
-		_gCode2 |= 1;
-
-	if (_topLeft.x < _vm->_screen->_orgX1)
-		_gCode1 |= 8;
-	else if (_topLeft.x > _vm->_screen->_orgX2)
-		_gCode1 |= 2;
-
-	if (_bottomRight.x < _vm->_screen->_orgX1)
-		_gCode2 |= 8;
-	else if (_bottomRight.y > _vm->_screen->_orgX2)
-		_gCode2 |= 2;
-}
+void AmazonEngine::dead(int deathId) {
+	_events->hideCursor();
+	_screen->forceFadeOut();
+	_scripts->cmdFreeSound();
 
-void Guard::chkVLine() {
-	if (_position.x > _vm->_player->_rawPlayer.x) {
-		_topLeft = _vm->_player->_rawPlayer;
-		_bottomRight = _position;
-	} else {
-		_topLeft = _position;
-		_bottomRight = _vm->_player->_rawPlayer;
-	}
+	_sound->_soundTable.push_back(SoundEntry(_files->loadFile(98, 44), 1));
 
-	if (_vm->_screen->_orgY1 > _vm->_screen->_orgY2)
-		SWAP(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
+	_screen->clearScreen();
+	_screen->setPanel(3);
 
-	for (;;) {
-		setVerticalCode();
-		int code = _gCode1 | _gCode2;
-		if (code == 10) {
-			_vm->_guardFind = 0;
-			return;
+	if (deathId != 10) {
+		_sound->newMusic(62, 0);
+		_files->_setPaletteFlag = false;
+		_files->loadScreen(94, 0);
+		_files->_setPaletteFlag = true;
+		_buffer2.copyFrom(*_screen);
+
+		for (int i = 0; i < 3; ++i) {
+			_sound->playSound(0);
+			_screen->forceFadeIn();
+			_sound->playSound(0);
+			_screen->forceFadeOut();
 		}
+		freeCells();
+
+		// Load the cell list for the death screen
+		DeathEntry &de = _deaths[deathId];
+		Common::Array<CellIdent> cells;
+		cells.push_back(_deaths._cells[de._screenId]);
+		loadCells(cells);
+
+		_screen->setDisplayScan();
+		_files->_setPaletteFlag = false;
+		_files->loadScreen(&_buffer2, 94, 1);
+		_screen->setIconPalette();
+
+		_buffer2.plotImage(_objectsTable[0], 0, Common::Point(105, 25));
+		_buffer2.copyTo(_screen);
+		_screen->forceFadeIn();
+
+		_fonts._charSet._hi = 10;
+		_fonts._charSet._lo = 1;
+		_fonts._charFor._lo = 55;
+		_fonts._charFor._hi = 255;
+		_screen->_maxChars = 46;
+		_screen->_printOrg = Common::Point(20, 155);
+		_screen->_printStart = Common::Point(20, 155);
+
+		Common::String &msg = de._msg;
+		_printEnd = 180;
+		printText(_screen, msg);
+		_screen->forceFadeOut();
 
-		int code2 = _gCode1 & _gCode2;
-		code2 &= 5;
-		if (((code & 10) == 8) || ((code & 10) == 2) || (code2 != 0))
-			return;
-
-		int midX = (_topLeft.x + _bottomRight.x) / 2;
-		int midY = (_topLeft.y + _bottomRight.y) / 2;
-
-		if (midX < _vm->_screen->_orgX1) {
-			if ((midX == _topLeft.x) && (midY == _topLeft.y))
-				return;
-
-			_topLeft.x = midX;
-			_topLeft.y = midY;
-		} else {
-			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
-				return;
-
-			_bottomRight.x = midX;
-			_bottomRight.y = midY;
-		}
-	}
-}
+		_sound->newMusic(0, 1);
+		_events->showCursor();
+		_room->clearRoom();
+		freeChar();
 
-void Guard::chkHLine() {
-	if (_position.y > _vm->_player->_rawPlayer.y) {
-		_topLeft = _vm->_player->_rawPlayer;
-		_bottomRight = _position;
+		warning("TODO: restart game");
+		quitGame();
+		_events->pollEvents();
 	} else {
-		_topLeft = _position;
-		_bottomRight = _vm->_player->_rawPlayer;
-	}
-
-	if (_vm->_screen->_orgX1 > _vm->_screen->_orgX2)
-		SWAP(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
-
-	while (true) {
-		setHorizontalCode();
-		int code = _gCode1 | _gCode2;
-		if (code == 5) {
-			_vm->_guardFind = 0;
-			return;
-		}
-
-		int code2 = _gCode1 & _gCode2;
-		code2 &= 10;
-		if (((code & 5) == 4) || ((code & 5) == 1) || (code2 != 0))
-			return;
-
-		int midX = (_topLeft.x + _bottomRight.x) / 2;
-		int midY = (_topLeft.y + _bottomRight.y) / 2;
-
-		if (midY < _vm->_screen->_orgY1) {
-			if ((midX == _topLeft.x) && (midY == _topLeft.y))
-				return;
-
-			_topLeft.x = midX;
-			_topLeft.y = midY;
-		} else {
-			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
-				return;
-
-			_bottomRight.x = midX;
-			_bottomRight.y = midY;
-		}
-	}
-}
-
-void Guard::guardSee() {
-	int tmpY = (_vm->_screen->_scrollRow << 4) + _vm->_screen->_scrollY;
-	_vm->_flags[140] = 0;
-	if (tmpY > _position.y)
-		return;
-
-	tmpY += _vm->_screen->_vWindowLinesTall;
-	tmpY -= 11;
-
-	if (tmpY < _position.y)
-		return;
-
-	_vm->_guardFind = 1;
-	_vm->_flags[140] = 1;
-
-	for (uint16 idx = 0; idx < _vm->_room->_plotter._walls.size(); idx++) {
-		_vm->_screen->_orgX1 = _vm->_room->_plotter._walls[idx].left;
-		_vm->_screen->_orgY1 = _vm->_room->_plotter._walls[idx].top;
-		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
-		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
-		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
-			chkVLine();
-			if (_vm->_guardFind == 0)
-				return;
-		}
-		else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
-			chkHLine();
-			if (_vm->_guardFind == 0)
-				return;
-		}
+		quitGame();
+		_events->pollEvents();
 	}
 }
 
-void Guard::setGuardFrame() {
-	ImageEntry ie;
-	ie._flags = IMGFLAG_UNSCALED;
-
-	if (_vm->_guardLocation == 4)
-		ie._flags |= IMGFLAG_BACKWARDS;
-	ie._spritesPtr = _vm->_objectsTable[37];
-	ie._frameNumber = _guardCel;
-	ie._position = _position;
-	ie._offsetY = 10;
-	_vm->_images.addToList(ie);
-}
+void AmazonEngine::synchronize(Common::Serializer &s) {
+	AccessEngine::synchronize(s);
 
-void Guard::guard() {
-	if (_vm->_timers[8]._flag) {
-		setGuardFrame();
-		return;
-	}
+	int dummy = 0;
 
-	++_vm->_timers[8]._flag;
-	++_guardCel;
-	int curCel = _guardCel;
-
-	switch (_vm->_guardLocation) {
-	case 1:
-		// Guard walking down
-		if (curCel <= 8 || curCel > 13)
-			_guardCel = curCel = 8;
-
-		_position.y += _vm->_player->_walkOffDown[curCel - 8];
-		guardSee();
-		if (_position.y >= 272) {
-			_position.y = 272;
-			_vm->_guardLocation = 2;
-		}
-		break;
-	case 2:
-		// Guard walking left
-		if (curCel <= 43 || curCel > 48)
-			_guardCel = curCel = 43;
-
-		_position.x -= _vm->_player->_walkOffLeft[curCel - 43];
-		guardSee();
-		if (_position.x <= 56) {
-			_position.x = 56;
-			_vm->_guardLocation = 3;
-		}
-		break;
-	case 3:
-		// Guard walking up
-		if (curCel <= 0 || curCel > 5)
-			_guardCel = curCel = 0;
-
-		_position.y -= _vm->_player->_walkOffUp[curCel];
-		guardSee();
-		if (_position.y <= 89) {
-			_position.y = 89;
-			_vm->_guardLocation = 4;
-			if (_vm->_flags[121] == 1)
-				_vm->_guardLocation = 5;
-		}
-		break;
-	default:
-		// Guard walking right
-		if (curCel <= 43 || curCel > 48)
-			_guardCel = curCel = 43;
-
-		_position.x += _vm->_player->_walkOffRight[curCel - 43];
-		guardSee();
-		if (_position.x >= 127) {
-			_position.x = 127;
-			_vm->_guardLocation = 1;
-		}
-		break;
-	}
+	s.syncAsSint16LE(_chapter);
+	s.syncAsSint16LE(dummy);
+	s.syncAsSint16LE(dummy);
+	s.syncAsSint16LE(_rawInactiveX);
+	s.syncAsSint16LE(_rawInactiveY);
+	s.syncAsSint16LE(_inactiveYOff);
+	for (int i = 0; i < 100; ++i)
+		s.syncAsSint16LE(_esTabTable[i]);
 
-	setGuardFrame();
+	_river.synchronize(s);
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 4c4b304514..b09c96d263 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -24,53 +24,13 @@
 #define ACCESS_AMAZON_GAME_H
 
 #include "access/access.h"
+#include "access/amazon/amazon_logic.h"
 
 namespace Access {
 
 namespace Amazon {
 
-	class AmazonEngine;
-
-class Plane {
-public:
-	int _pCount;
-	Common::Point _position;
-	int _planeCount;
-	int _propCount;
-	int _xCount;
-public:
-	Plane();
-};
-
-class Guard {
-private:
-	AmazonEngine *_vm;
-
-	void chkVLine();
-	void chkHLine();
-	void setVerticalCode();
-	void setHorizontalCode();
-	void guardSee();
-	void setGuardFrame();
-public:
-	int _guardCel;
-	Common::Point _position;
-	int _gCode1;
-	int _gCode2;
-	Common::Point _topLeft;
-	Common::Point _bottomRight;
-	int _xMid, _yMid;
-public:
-	Guard();
-	void setVm(AmazonEngine *vm) { _vm = vm; }
-
-	void guard();
-};
-
-class InactivePlayer : public ImageEntry {
-public:
-	SpriteResource *_altSpritesPtr;
-};
+class AmazonEngine;
 
 class AmazonEngine : public AccessEngine {
 private:
@@ -126,10 +86,7 @@ public:
 	InactivePlayer _inactive;
 	bool _charSegSwitch;
 	bool _skipStart;
-
-	RiverStruct *_topList;
-	RiverStruct *_botList;
-	int _canoeDir;
+	bool _saveRiver;
 
 	// Fields that are mapped to flags
 	int &_guardLocation;
@@ -147,21 +104,20 @@ public:
 	int &_noSound;
 
 	// Saved fields
-	int _canoeLane;
-	int _canoeYPos;
-	int _hitCount;
-	bool _saveRiver;
-	int _hitSafe;
 	int _chapter;
-	int _riverIndex;
 	int _rawInactiveX;
 	int _rawInactiveY;
 	int _inactiveYOff;
 	int _esTabTable[100];
 
 	// Other game specific fields
+	Ant _ant;
+	Cast _cast;
 	Guard _guard;
+	Jungle _jungle;
+	Opening _opening;
 	Plane _plane;
+	River _river;
 	int _hintLevel;
 	int _updateChapter;
 	int _oldTitleChapter;
@@ -170,28 +126,14 @@ public:
 	bool _deathFlag;
 	int _deathCount;
 	int _deathType;
-	const byte *_mapPtr;
-	int _canoeVXPos;
-	int _canoeMoveCount;
-	int _canoeFrame;
-
-	Direction _antDirection;
-	Direction _pitDirection;
-	int _antCel;
-	int _torchCel;
-	int _pitCel;
-	int _stabCel;
-	Common::Point _antPos;
-	bool _antDieFl;
-	bool _antEatFl;
-	bool _stabFl;
-	Common::Point _pitPos;
 	int _iqValue;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
 	virtual ~AmazonEngine();
 
+	virtual void dead(int deathId);
+
 	/**
 	* Free the inactive player data
 	*/
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
new file mode 100644
index 0000000000..cae3373ea8
--- /dev/null
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -0,0 +1,1832 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "access/access.h"
+#include "access/resources.h"
+#include "access/screen.h"
+#include "access/amazon/amazon_game.h"
+#include "access/amazon/amazon_logic.h"
+
+namespace Access {
+
+namespace Amazon {
+
+PannedScene::PannedScene(AmazonEngine *vm): AmazonManager(vm) {
+	for (int i = 0; i < PAN_SIZE; ++i) {
+		_pan[i]._pObject = nullptr;
+		_pan[i]._pImgNum = 0;
+		_pan[i]._pObjX = _pan[i]._pObjY = _pan[i]._pObjZ = 0;
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+
+	_xCount = 0;
+	_xTrack = _yTrack = _zTrack = 0;
+	_xCam = _yCam = _zCam = 0;
+	_pNumObj = 0;
+	_screenVertX = 0;
+}
+
+void PannedScene::pan() {
+	_zCam += _zTrack;
+	_xCam += _xTrack;
+	int tx = (_xTrack << 8) / _zCam;
+	_yCam += _yTrack;
+	int ty = (_yTrack << 8) / _zCam;
+
+	if (_vm->_timers[24]._flag != 1) {
+		++_vm->_timers[24]._flag;
+		for (int i = 0; i < _pNumObj; i++) {
+			_pan[i]._pObjZ += _zTrack;
+			_pan[i]._pObjXl += (_pan[i]._pObjZ * tx) & 0xff;
+			_pan[i]._pObjX += ((_pan[i]._pObjZ * tx) >> 8) + (_pan[i]._pObjXl >> 8);
+			_pan[i]._pObjXl &= 0xff;
+
+			_pan[i]._pObjYl += (_pan[i]._pObjZ * ty) & 0xff;
+			_pan[i]._pObjY += ((_pan[i]._pObjZ * ty) >> 8) + (_pan[i]._pObjYl >> 8);
+			_pan[i]._pObjYl &= 0xff;
+		}
+	}
+
+	for (int i = 0; i < _pNumObj; i++) {
+		ImageEntry ie;
+		ie._flags = IMGFLAG_UNSCALED;
+		ie._position = Common::Point(_pan[i]._pObjX, _pan[i]._pObjY);
+		ie._offsetY = 255;
+		ie._spritesPtr = _pan[i]._pObject;
+		ie._frameNumber = _pan[i]._pImgNum;
+
+		_vm->_images.addToList(ie);
+	}
+}
+
+/*------------------------------------------------------------------------*/
+
+Opening::Opening(AmazonEngine *vm) : PannedScene(vm) {
+}
+
+void Opening::mWhileDoOpen() {
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+
+	screen.setBufferScan();
+	events.hideCursor();
+	screen.forceFadeOut();
+	_vm->_skipStart = false;
+	if (_vm->_conversation != 2) {
+		// Cutscene at start of chapter 1
+		screen.setPanel(3);
+		_vm->startChapter(1);
+		_vm->establishCenter(0, 1);
+	}
+
+	Resource *data = _vm->_files->loadFile(1, 0);
+	_vm->_objectsTable[1] = new SpriteResource(_vm, data);
+	delete data;
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(1, 2);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+
+	// Load animation data
+	_vm->_animation->freeAnimationData();
+	Resource *animResource = _vm->_files->loadFile(1, 1);
+	_vm->_animation->loadAnimations(animResource);
+	delete animResource;
+
+	_xTrack = 8;
+	_yTrack = -3;
+	_zTrack = 0;
+	_xCam = _yCam = 0;
+	_zCam = 270;
+	_vm->_timers[24]._timer = _vm->_timers[24]._initTm = 1;
+	++_vm->_timers[24]._flag;
+	_vm->_timers.updateTimers();
+
+	_pNumObj = 10;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pan[i]._pObject = _vm->_objectsTable[1];
+		_pan[i]._pImgNum = OPENING_OBJS[i][0];
+		_pan[i]._pObjX = OPENING_OBJS[i][1];
+		_pan[i]._pObjY = OPENING_OBJS[i][2];
+		_pan[i]._pObjZ = OPENING_OBJS[i][3];
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	Animation *anim = _vm->_animation->setAnimation(0);
+	_vm->_animation->setAnimTimer(anim);
+	anim = _vm->_animation->setAnimation(1);
+	_vm->_animation->setAnimTimer(anim);
+	_vm->_sound->newMusic(10, 0);
+
+	bool startFl = false;
+	while (!_vm->shouldQuit()) {
+		_vm->_images.clear();
+		_vm->_animation->animate(0);
+		_vm->_animation->animate(1);
+		pan();
+		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		_vm->_newRects.clear();
+		_vm->plotList();
+		_vm->copyBlocks();
+		if (!startFl) {
+			startFl = true;
+			screen.forceFadeIn();
+		}
+
+		events.pollEventsAndWait();
+
+		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
+			_vm->_skipStart = true;
+			_vm->_sound->newMusic(10, 1);
+
+			events.debounceLeft();
+			events.zeroKeys();
+			break;
+		}
+
+		if (_xCam > 680) {
+			events._vbCount = 125;
+
+			while (!_vm->shouldQuit() && !events.isKeyMousePressed() && events._vbCount > 0) {
+				events.pollEventsAndWait();
+			}
+			break;
+		}
+	}
+
+	events.showCursor();
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+
+	_vm->freeCells();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	_vm->_numAnimTimers = 0;
+	_vm->_images.clear();
+
+	if (_vm->_conversation == 2) {
+		// Cutscene at end of Chapter 6
+		Resource *spriteData = _vm->_files->loadFile(28, 37);
+		_vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
+		delete spriteData;
+
+		_vm->_animation->freeAnimationData();
+		animResource = _vm->_files->loadFile(28, 38);
+		_vm->_animation->loadAnimations(animResource);
+		delete animResource;
+	}
+}
+
+/*------------------------------------------------------------------------*/
+
+Plane::Plane(AmazonEngine *vm): PannedScene(vm) {
+	_pCount = 0;
+	_planeCount = 0;
+	_propCount = 0;
+}
+
+
+void Plane::doFlyCell() {
+	SpriteResource *sprites = _vm->_objectsTable[15];
+
+	if (_pCount <= 40) {
+		_vm->_buffer2.plotImage(sprites, 3, Common::Point(70, 74));
+	} else if (_pCount <= 80) {
+		_vm->_buffer2.plotImage(sprites, 6, Common::Point(70, 74));
+	} else if (_pCount <= 120) {
+		_vm->_buffer2.plotImage(sprites, 2, Common::Point(50, 76));
+	} else if (_pCount <= 160) {
+		_vm->_buffer2.plotImage(sprites, 14, Common::Point(63, 78));
+	} else if (_pCount <= 200) {
+		_vm->_buffer2.plotImage(sprites, 5, Common::Point(86, 74));
+	} else if (_pCount <= 240) {
+		_vm->_buffer2.plotImage(sprites, 0, Common::Point(103, 76));
+	} else if (_pCount <= 280) {
+		_vm->_buffer2.plotImage(sprites, 4, Common::Point(119, 77));
+	} else {
+		_vm->_buffer2.plotImage(sprites, 1, Common::Point(111, 77));
+	}
+
+	if (_planeCount == 11 || _planeCount == 12)
+		++_position.y;
+	else if (_planeCount >= 28)
+		--_position.y;
+
+	_vm->_buffer2.plotImage(sprites, 7, _position);
+	_vm->_buffer2.plotImage(sprites, 8 + _propCount, Common::Point(
+		_position.x + 99, _position.y + 10));
+	_vm->_buffer2.plotImage(sprites, 11 + _propCount, Common::Point(
+		_position.x + 104, _position.y + 18));
+
+	if (++_planeCount >= 30)
+		_planeCount = 0;
+	if (++_propCount >= 3)
+		_propCount = 0;
+
+	++_xCount;
+	if (_xCount == 1)
+		++_position.x;
+	else
+		_xCount = 0;
+}
+
+void Plane::doFallCell() {
+	if (_vm->_scaleI <= 20)
+		return;
+
+	SpriteFrame *frame = _vm->_objectsTable[20]->getFrame(_planeCount / 6);
+	Common::Rect r(115, 11, 115 + _vm->_screen->_scaleTable1[frame->w],
+		11 + _vm->_screen->_scaleTable1[frame->h]);
+	_vm->_buffer2.sPlotF(frame, r);
+
+	_vm->_scaleI -= 3;
+	_vm->_scale = _vm->_scaleI;
+	_vm->_screen->setScaleTable(_vm->_scale);
+	++_xCount;
+	if (_xCount == 5)
+		return;
+	_xCount = 0;
+	if (_planeCount == 18)
+		_planeCount = 0;
+	else
+		_planeCount += 6;
+}
+
+void Plane::scrollFly() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	doFlyCell();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void Plane::scrollFall() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	doFallCell();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void Plane::mWhileFly() {
+	Screen &screen = *_vm->_screen;
+	Player &player = *_vm->_player;
+	EventsManager &events = *_vm->_events;
+
+	events.hideCursor();
+	screen.clearScreen();
+	screen.setBufferScan();
+	screen.fadeOut();
+	screen._scrollX = 0;
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	screen.fadeIn();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+
+	// KEYFLG = 0;
+
+	screen._scrollRow = screen._scrollCol = 0;
+	screen._scrollX = screen._scrollY = 0;
+	player._rawPlayer = Common::Point(0, 0);
+	player._scrollAmount = 1;
+
+	_pCount = 0;
+	_planeCount = 0;
+	_propCount = 0;
+	_xCount = 0;
+	_position = Common::Point(20, 29);
+
+	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
+		((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth)) {
+		events._vbCount = 4;
+		screen._scrollX += player._scrollAmount;
+
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
+
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+		}
+
+		scrollFly();
+		++_pCount;
+
+		while (!_vm->shouldQuit() && events._vbCount > 0) {
+			// To be rewritten when NEWTIMER is done
+			events.checkForNextFrameCounter();
+			_vm->_sound->playSound(0);
+
+			events.pollEventsAndWait();
+		}
+	}
+
+	events.showCursor();
+}
+
+void Plane::mWhileFall() {
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+
+	events.hideCursor();
+	screen.clearScreen();
+	screen.setBufferScan();
+	screen.fadeOut();
+	screen._scrollX = 0;
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	screen.fadeIn();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+
+	// KEYFLG = 0;
+
+	screen._scrollRow = screen._scrollCol = 0;
+	screen._scrollX = screen._scrollY = 0;
+	_vm->_player->_scrollAmount = 3;
+	_vm->_scaleI = 255;
+
+	_xCount = 0;
+	_planeCount = 0;
+
+	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
+		(screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
+		events._vbCount = 4;
+		screen._scrollX += _vm->_player->_scrollAmount;
+
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
+
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+		}
+
+		scrollFall();
+
+		while (!_vm->shouldQuit() && events._vbCount > 0) {
+			events.pollEventsAndWait();
+		}
+	}
+
+	events.showCursor();
+}
+
+/*------------------------------------------------------------------------*/
+
+Jungle::Jungle(AmazonEngine *vm) : PannedScene(vm) {
+	for (int i = 0; i < JUNGLE_SIZE; ++i) {
+		_jCnt[i] = _jungleX[i] = -1;
+	}
+}
+
+void Jungle::jungleMove() {
+	const static int jungleY[3] = { 27, 30, 29 };
+	int count = 1;
+	int frameOffset = 0;
+
+	if (!_vm->_timers[0]._flag) {
+		++_vm->_timers[0]._flag;
+		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+
+		for (int i = 0; i < 3; ++i) {
+			int newJCnt = (_jCnt[i] + 1) % 8;
+			_jCnt[i] = newJCnt;
+			_jungleX[i] += 5;
+		}
+
+		frameOffset = 4;
+		count = (_vm->_allenFlag != 1) ? 2 : 3;
+	}
+
+	for (int i = 0; i < count; ++i) {
+		ImageEntry ie;
+		ie._flags = IMGFLAG_UNSCALED;
+		ie._spritesPtr = _vm->_objectsTable[24];
+		ie._frameNumber = _jCnt[i] + frameOffset;
+		ie._position = Common::Point(_jungleX[i], jungleY[i]);
+		ie._offsetY = jungleY[i];
+
+		_vm->_images.addToList(ie);
+		frameOffset += 8;
+	}
+}
+
+void Jungle::initJWalk2() {
+	const int JUNGLE1OBJ[7][4] = {
+		{ 2, 470, 0, 20 },
+		{ 0, 290, 0, 50 },
+		{ 1, 210, 0, 40 },
+		{ 0, 500, 0, 30 },
+		{ 1, 550, 0, 20 },
+		{ 0, 580, 0, 60 },
+		{ 1, 650, 0, 30 }
+	};
+	_vm->_screen->fadeOut();
+	_vm->_events->hideCursor();
+	_vm->_screen->clearScreen();
+	_vm->_buffer2.clearBuffer();
+	_vm->_screen->setBufferScan();
+
+	_vm->_screen->_scrollX = _vm->_screen->_scrollY;
+	_vm->_screen->_scrollCol = _vm->_screen->_scrollRow;
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->fadeIn();
+	// KEYFL = 0;
+
+	_xCount = 2;
+	_vm->_player->_scrollAmount = 5;
+	_xTrack = -10;
+	_yTrack = _zTrack = 0;
+	_xCam = 480;
+	_yCam = 0;
+	_zCam = 80;
+
+	_vm->_timers[24]._timer = 1;
+	_vm->_timers[24]._initTm = 1;
+	++_vm->_timers[24]._flag;
+
+	_pNumObj = 7;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pan[i]._pObject = _vm->_objectsTable[24];
+		_pan[i]._pImgNum = JUNGLE1OBJ[i][0];
+		_pan[i]._pObjX = JUNGLE1OBJ[i][1];
+		_pan[i]._pObjY = JUNGLE1OBJ[i][2];
+		_pan[i]._pObjZ = JUNGLE1OBJ[i][3];
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+
+	_jCnt[0] = 0;
+	_jCnt[1] = 3;
+	_jCnt[2] = 5;
+
+	_jungleX[0] = 50;
+	_jungleX[1] = 16;
+	_jungleX[2] = 93;
+}
+
+void Jungle::mWhileJWalk() {
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+	Player &player = *_vm->_player;
+
+	static const int JUNGLE_OBJ[7][4] = {
+		{ 2, 77, 0, 40 },
+		{ 0, 290, 0, 50 },
+		{ 1, 210, 0, 70 },
+		{ 0, 50, 0, 30 },
+		{ 1, 70, 0, 20 },
+		{ 0, -280, 0, 60 },
+		{ 1, -150, 0, 30 },
+	};
+
+	screen.fadeOut();
+	events.hideCursor();
+	screen.clearScreen();
+	_vm->_buffer2.clearBuffer();
+	screen.setBufferScan();
+	screen._scrollX = 0;
+
+	// Build the initial jungle scene and fade it in
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	screen.fadeIn();
+
+	// Set up the player to walk horizontally
+	player._xFlag = 1;
+	player._yFlag = 0;
+	player._moveTo.x = 160;
+	player._playerMove = true;
+
+	_xCount = 2;
+	_xTrack = 10;
+	_yTrack = _zTrack = 0;
+	_xCam = 480;
+	_yCam = 0;
+	_zCam = 80;
+
+	TimerEntry *te = &_vm->_timers[24];
+	te->_initTm = te->_timer = 1;
+	te->_flag++;
+
+	_pNumObj = 7;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pan[i]._pObject = _vm->_objectsTable[24];
+		_pan[i]._pImgNum = JUNGLE_OBJ[i][0];
+		_pan[i]._pObjX = JUNGLE_OBJ[i][1];
+		_pan[i]._pObjY = JUNGLE_OBJ[i][2];
+		_pan[i]._pObjZ = JUNGLE_OBJ[i][3];
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+
+	while (!_vm->shouldQuit() && !events.isKeyMousePressed() && (player._xFlag != 2)) {
+		_vm->_images.clear();
+		events._vbCount = 6;
+
+		_pan[0]._pImgNum = _xCount;
+		if (_xCount == 2)
+			++_xCount;
+		else
+			--_xCount;
+
+		player.checkMove();
+		player.checkScroll();
+		pan();
+		scrollJWalk();
+
+		while (!_vm->shouldQuit() && events._vbCount > 0) {
+			events.pollEventsAndWait();
+		}
+	}
+
+	_vm->_images.clear();
+	events.showCursor();
+}
+
+void Jungle::mWhileJWalk2() {
+	Screen &screen = *_vm->_screen;
+
+	initJWalk2();
+
+	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
+		(screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
+		_vm->_images.clear();
+		_vm->_events->_vbCount = 6;
+		_pan[0]._pImgNum = _xCount;
+
+		jungleMove();
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+		}
+
+		if (_xCount == 2)
+			++_xCount;
+		else
+			--_xCount;
+
+		pan();
+		scrollJWalk();
+
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+			_vm->_events->pollEventsAndWait();
+		}
+	}
+
+	_vm->_events->showCursor();
+}
+
+void Jungle::scrollJWalk() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	_vm->plotList();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+/*------------------------------------------------------------------------*/
+
+Guard::Guard(AmazonEngine *vm): PannedScene(vm) {
+	_vm = nullptr;
+	_guardCel = 0;
+	_gCode1 = _gCode2 = 0;
+	_xMid = _yMid = 0;
+}
+
+void Guard::setVerticalCode() {
+	_gCode1 = 0;
+	_gCode2 = 0;
+	if (_topLeft.x < _vm->_screen->_orgX1)
+		_gCode1 |= 8;
+	else if (_topLeft.x == _vm->_screen->_orgX1) {
+		_gCode1 |= 8;
+		_gCode1 |= 2;
+	}
+	else
+		_gCode1 |= 2;
+
+	if (_bottomRight.x < _vm->_screen->_orgX1)
+		_gCode2 |= 8;
+	else if (_bottomRight.x == _vm->_screen->_orgX1) {
+		_gCode2 |= 8;
+		_gCode2 |= 2;
+	}
+	else
+		_gCode2 |= 2;
+
+	if (_topLeft.y < _vm->_screen->_orgY1)
+		_gCode1 |= 4;
+	else if (_topLeft.y > _vm->_screen->_orgY2)
+		_gCode1 |= 1;
+
+	if (_bottomRight.y < _vm->_screen->_orgY1)
+		_gCode2 |= 4;
+	else if (_bottomRight.y > _vm->_screen->_orgY2)
+		_gCode2 |= 1;
+}
+
+void Guard::setHorizontalCode() {
+	_gCode1 = 0;
+	_gCode2 = 0;
+
+	if (_topLeft.y < _vm->_screen->_orgY1)
+		_gCode1 |= 4;
+	else if (_topLeft.x == _vm->_screen->_orgX1) {
+		_gCode1 |= 4;
+		_gCode1 |= 1;
+	}
+	else
+		_gCode1 |= 1;
+
+	if (_bottomRight.y < _vm->_screen->_orgY1)
+		_gCode2 |= 4;
+	else if (_bottomRight.x == _vm->_screen->_orgX1) {
+		_gCode2 |= 4;
+		_gCode2 |= 1;
+	}
+	else
+		_gCode2 |= 1;
+
+	if (_topLeft.x < _vm->_screen->_orgX1)
+		_gCode1 |= 8;
+	else if (_topLeft.x > _vm->_screen->_orgX2)
+		_gCode1 |= 2;
+
+	if (_bottomRight.x < _vm->_screen->_orgX1)
+		_gCode2 |= 8;
+	else if (_bottomRight.y > _vm->_screen->_orgX2)
+		_gCode2 |= 2;
+}
+
+void Guard::chkVLine() {
+	if (_position.x > _vm->_player->_rawPlayer.x) {
+		_topLeft = _vm->_player->_rawPlayer;
+		_bottomRight = _position;
+	}
+	else {
+		_topLeft = _position;
+		_bottomRight = _vm->_player->_rawPlayer;
+	}
+
+	if (_vm->_screen->_orgY1 > _vm->_screen->_orgY2)
+		SWAP(_vm->_screen->_orgY1, _vm->_screen->_orgY2);
+
+	for (;;) {
+		setVerticalCode();
+		int code = _gCode1 | _gCode2;
+		if (code == 10) {
+			_vm->_guardFind = 0;
+			return;
+		}
+
+		int code2 = _gCode1 & _gCode2;
+		code2 &= 5;
+		if (((code & 10) == 8) || ((code & 10) == 2) || (code2 != 0))
+			return;
+
+		int midX = (_topLeft.x + _bottomRight.x) / 2;
+		int midY = (_topLeft.y + _bottomRight.y) / 2;
+
+		if (midX < _vm->_screen->_orgX1) {
+			if ((midX == _topLeft.x) && (midY == _topLeft.y))
+				return;
+
+			_topLeft.x = midX;
+			_topLeft.y = midY;
+		}
+		else {
+			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
+				return;
+
+			_bottomRight.x = midX;
+			_bottomRight.y = midY;
+		}
+	}
+}
+
+void Guard::chkHLine() {
+	if (_position.y > _vm->_player->_rawPlayer.y) {
+		_topLeft = _vm->_player->_rawPlayer;
+		_bottomRight = _position;
+	}
+	else {
+		_topLeft = _position;
+		_bottomRight = _vm->_player->_rawPlayer;
+	}
+
+	if (_vm->_screen->_orgX1 > _vm->_screen->_orgX2)
+		SWAP(_vm->_screen->_orgX1, _vm->_screen->_orgX2);
+
+	while (true) {
+		setHorizontalCode();
+		int code = _gCode1 | _gCode2;
+		if (code == 5) {
+			_vm->_guardFind = 0;
+			return;
+		}
+
+		int code2 = _gCode1 & _gCode2;
+		code2 &= 10;
+		if (((code & 5) == 4) || ((code & 5) == 1) || (code2 != 0))
+			return;
+
+		int midX = (_topLeft.x + _bottomRight.x) / 2;
+		int midY = (_topLeft.y + _bottomRight.y) / 2;
+
+		if (midY < _vm->_screen->_orgY1) {
+			if ((midX == _topLeft.x) && (midY == _topLeft.y))
+				return;
+
+			_topLeft.x = midX;
+			_topLeft.y = midY;
+		}
+		else {
+			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
+				return;
+
+			_bottomRight.x = midX;
+			_bottomRight.y = midY;
+		}
+	}
+}
+
+void Guard::guardSee() {
+	int tmpY = (_vm->_screen->_scrollRow << 4) + _vm->_screen->_scrollY;
+	_vm->_flags[140] = 0;
+	if (tmpY > _position.y)
+		return;
+
+	tmpY += _vm->_screen->_vWindowLinesTall;
+	tmpY -= 11;
+
+	if (tmpY < _position.y)
+		return;
+
+	_vm->_guardFind = 1;
+	_vm->_flags[140] = 1;
+
+	for (uint16 idx = 0; idx < _vm->_room->_plotter._walls.size(); idx++) {
+		_vm->_screen->_orgX1 = _vm->_room->_plotter._walls[idx].left;
+		_vm->_screen->_orgY1 = _vm->_room->_plotter._walls[idx].top;
+		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
+		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
+		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
+			chkVLine();
+			if (_vm->_guardFind == 0)
+				return;
+		}
+		else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
+			chkHLine();
+			if (_vm->_guardFind == 0)
+				return;
+		}
+	}
+}
+
+void Guard::setGuardFrame() {
+	ImageEntry ie;
+	ie._flags = IMGFLAG_UNSCALED;
+
+	if (_vm->_guardLocation == 4)
+		ie._flags |= IMGFLAG_BACKWARDS;
+	ie._spritesPtr = _vm->_objectsTable[37];
+	ie._frameNumber = _guardCel;
+	ie._position = _position;
+	ie._offsetY = 10;
+	_vm->_images.addToList(ie);
+}
+
+void Guard::doGuard() {
+	if (_vm->_timers[8]._flag) {
+		setGuardFrame();
+		return;
+	}
+
+	++_vm->_timers[8]._flag;
+	++_guardCel;
+	int curCel = _guardCel;
+
+	switch (_vm->_guardLocation) {
+	case 1:
+		// Guard walking down
+		if (curCel <= 8 || curCel > 13)
+			_guardCel = curCel = 8;
+
+		_position.y += _vm->_player->_walkOffDown[curCel - 8];
+		guardSee();
+		if (_position.y >= 272) {
+			_position.y = 272;
+			_vm->_guardLocation = 2;
+		}
+		break;
+	case 2:
+		// Guard walking left
+		if (curCel <= 43 || curCel > 48)
+			_guardCel = curCel = 43;
+
+		_position.x -= _vm->_player->_walkOffLeft[curCel - 43];
+		guardSee();
+		if (_position.x <= 56) {
+			_position.x = 56;
+			_vm->_guardLocation = 3;
+		}
+		break;
+	case 3:
+		// Guard walking up
+		if (curCel <= 0 || curCel > 5)
+			_guardCel = curCel = 0;
+
+		_position.y -= _vm->_player->_walkOffUp[curCel];
+		guardSee();
+		if (_position.y <= 89) {
+			_position.y = 89;
+			_vm->_guardLocation = 4;
+			if (_vm->_flags[121] == 1)
+				_vm->_guardLocation = 5;
+		}
+		break;
+	default:
+		// Guard walking right
+		if (curCel <= 43 || curCel > 48)
+			_guardCel = curCel = 43;
+
+		_position.x += _vm->_player->_walkOffRight[curCel - 43];
+		guardSee();
+		if (_position.x >= 127) {
+			_position.x = 127;
+			_vm->_guardLocation = 1;
+		}
+		break;
+	}
+
+	setGuardFrame();
+}
+
+void Guard::setPosition(const Common::Point &pt) {
+	_position = pt;
+}
+
+/*------------------------------------------------------------------------*/
+
+Cast::Cast(AmazonEngine *vm) : PannedScene(vm) {
+}
+
+void Cast::doCast(int param1) {
+	_vm->_screen->setDisplayScan();
+	_vm->_events->hideCursor();
+	_vm->_screen->forceFadeOut();
+	_vm->_screen->_clipHeight = 173;
+	_vm->_screen->clearScreen();
+	_vm->_chapter = 16;
+	_vm->tileScreen();
+	_vm->updateSummary(param1);
+	_vm->_screen->setPanel(3);
+	_vm->_chapter = 14;
+
+	Resource *spriteData = _vm->_files->loadFile(91, 0);
+	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+	spriteData = _vm->_files->loadFile(91, 1);
+	_vm->_objectsTable[1] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(58, 1);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+
+	_xTrack = 0;
+	_yTrack = -6;
+	_zTrack = 0;
+	_xCam = _yCam = 0;
+	_zCam = 60;
+
+	_vm->_timers[24]._timer = 1;
+	_vm->_timers[24]._initTm = 1;
+	++_vm->_timers[24]._flag;
+
+	_pNumObj = 26;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pan[i]._pObject = _vm->_objectsTable[0];
+		_pan[i]._pImgNum = CAST_END_OBJ[i][0];
+		_pan[i]._pObjX = CAST_END_OBJ[i][1];
+		_pan[i]._pObjY = CAST_END_OBJ[i][2];
+		_pan[i]._pObjZ = CAST_END_OBJ[i][3];
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+
+	_pNumObj = 4;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pan[26 + i]._pObject = _vm->_objectsTable[1];
+		_pan[26 + i]._pImgNum = CAST_END_OBJ1[i][0];
+		_pan[26 + i]._pObjX = CAST_END_OBJ1[i][1];
+		_pan[26 + i]._pObjY = CAST_END_OBJ1[i][2];
+		_pan[26 + i]._pObjZ = CAST_END_OBJ1[i][3];
+		_pan[26 + i]._pObjXl = _pan[26 + i]._pObjYl = 0;
+	}
+
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	_vm->_numAnimTimers = 0;
+
+	_vm->_sound->newMusic(58, 0);
+	_vm->_screen->forceFadeIn();
+
+	while (!_vm->shouldQuit()) {
+		_vm->_images.clear();
+		pan();
+		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		_vm->_newRects.clear();
+		_vm->plotList();
+		_vm->copyBlocks();
+
+		_vm->_events->pollEvents();
+		if (_vm->_events->isKeyMousePressed())
+			break;
+
+		if (_yCam < -7550) {
+			_vm->_events->_vbCount = 50;
+
+			while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() && _vm->_events->_vbCount > 0) {
+				_vm->_events->pollEventsAndWait();
+			}
+
+			while (!_vm->shouldQuit() && !_vm->_sound->checkMidiDone())
+				_vm->_events->pollEventsAndWait();
+
+			break;
+		}
+	}
+
+	_vm->_sound->newMusic(58, 1);
+	_vm->_events->showCursor();
+
+	_vm->freeCells();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	_vm->_numAnimTimers = 0;
+	_vm->_images.clear();
+	_vm->_screen->forceFadeOut();
+
+	_vm->quitGame();
+	_vm->_events->pollEvents();
+}
+
+/*------------------------------------------------------------------------*/
+
+River::River(AmazonEngine *vm): PannedScene(vm) {
+	_vm = nullptr;
+	_CHICKENOUTFLG = false;
+	_rScrollRow = 0;
+	_rScrollCol = 0;
+	_rScrollX = 0;
+	_rScrollY = 0;
+	_rOldRectCount = 0;
+	_rNewRectCount = 0;
+	_rKeyFlag = 0;
+	_mapOffset = 0;
+	_screenVirtX = 0;
+}
+
+void River::setRiverPan() {
+	int delta = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+
+	_xTrack = 9;
+	_yTrack = _zTrack = 0;
+	_xCam = 160;
+	_yCam = 0;
+	_zCam = 80;
+
+	_vm->_timers[24]._timer = 1;
+	_vm->_timers[24]._initTm = 1;
+	++_vm->_timers[24]._flag;
+
+	_pNumObj = 23;
+	for (int i = 0; i < _pNumObj; i++) {
+		_pan[i]._pObject = _vm->_objectsTable[45];
+		_pan[i]._pImgNum = RIVER1OBJ[i][0];
+		_pan[i]._pObjX = RIVER1OBJ[i][1] + delta;
+		_pan[i]._pObjY = RIVER1OBJ[i][2];
+		_pan[i]._pObjZ = RIVER1OBJ[i][3];
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+}
+
+void River::initRiver() {
+	static const int RIVERVXTBL[3] = { 6719, 7039, 8319 };
+
+	_vm->_events->centerMousePos();
+	_vm->_events->restrictMouse();
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->clearScreen();
+	_vm->_screen->savePalette();
+	_vm->_screen->forceFadeOut();
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(95, 4);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+
+	_vm->_screen->restorePalette();
+	_vm->_screen->setBufferScan();
+	_vm->_destIn = &_vm->_buffer2;
+	_vm->_room->roomMenu();
+
+	if (_vm->_saveRiver) {
+		// Restoring a savegame, so set properties from saved fields
+		_vm->_screen->_scrollRow = _rScrollRow;
+		_vm->_screen->_scrollCol = _rScrollCol;
+		_vm->_screen->_scrollX = _rScrollX;
+		_vm->_screen->_scrollY = _rScrollY;
+	} else {
+		// Set initial scene state
+		_vm->_screen->_scrollRow = 0;
+		_vm->_screen->_scrollCol = 140;
+		_vm->_screen->_scrollX = 0;
+		_vm->_screen->_scrollY = 0;
+	}
+
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->forceFadeIn();
+
+	if (_vm->_saveRiver) {
+		// Restore draw rects from savegame
+		_vm->_oldRects.resize(_rOldRectCount);
+		_vm->_newRects.resize(_rNewRectCount);
+		// KEYFLG = _vm->_rKeyFlag
+	} else {
+		// Reset draw rects
+		_vm->_oldRects.clear();
+		_vm->_newRects.clear();
+		// KEYFLG = 0
+	}
+
+	_vm->_player->_scrollAmount = 2;
+	setRiverPan();
+	_vm->_timers[3]._timer = 1;
+	_vm->_timers[3]._initTm = 1;
+	++_vm->_timers[3]._flag;
+
+	_canoeFrame = 0;
+	_mapPtr = (const byte *)MAPTBL[_vm->_riverFlag] + 1;
+	if (_vm->_saveRiver) {
+		_mapPtr--;
+		_mapPtr += _mapOffset;
+	} else {
+		_screenVertX = RIVERVXTBL[_vm->_riverFlag] - 320;
+		_canoeLane = 3;
+		_hitCount = 0;
+		_hitSafe = 0;
+		_canoeYPos = 71;
+	}
+
+	_riverIndex = _vm->_riverFlag;
+	_topList = RIVEROBJECTTBL[_riverIndex];
+	updateObstacles();
+	riverSetPhysX();
+	_canoeDir = 0;
+	_vm->_deathFlag = 0;
+	_vm->_deathCount = 0;
+
+	_vm->_timers[11]._timer = 1200;
+	_vm->_timers[11]._initTm = 1200;
+	++_vm->_timers[11]._flag;
+	_vm->_timers[12]._timer = 1500;
+	_vm->_timers[12]._initTm = 1500;
+	++_vm->_timers[12]._flag;
+
+	_vm->_maxHits = 2 - _vm->_riverFlag;
+	_vm->_saveRiver = false;
+}
+
+void River::resetPositions() {
+	riverSetPhysX();
+	int val = (_vm->_screen->_scrollCol + 1 - _vm->_oldScrollCol) * 16;
+	if (val > 256) {
+		val &= 0x7F;
+		val |= 0x80;
+	}
+
+	for (int i = 0; i < _pNumObj; i++)
+		_pan[i]._pObjX += val;
+}
+
+void River::checkRiverPan() {
+	int val = (_vm->_screen->_scrollCol + 20) * 16;
+
+	for (int i = 0; i < _pNumObj; i++) {
+		if (_pan[i]._pObjX < val)
+			return;
+	}
+
+	setRiverPan();
+}
+
+bool River::riverJumpTest() {
+	if (_vm->_screen->_scrollCol == 120 || _vm->_screen->_scrollCol == 60 || _vm->_screen->_scrollCol == 0) {
+		int val = _mapPtr[0];
+		++_mapPtr;
+		if (val == 0xFF)
+			return true;
+		_vm->_oldScrollCol = _vm->_screen->_scrollCol;
+
+		if (val == 0) {
+			_vm->_screen->_scrollCol = 139;
+			_vm->_screen->_scrollX = 14;
+			_vm->_room->buildScreen();
+			resetPositions();
+			return false;
+		}
+	} else if (_vm->_screen->_scrollCol == 105) {
+		int val1 = _mapPtr[1];
+		int val2 = _mapPtr[2];
+		_mapPtr += 3;
+		if (_canoeLane < 3) {
+			if (val1 != 0) {
+				_vm->_deathFlag = true;
+				_vm->_deathCount = 300;
+				_vm->_deathType = val2;
+			}
+		} else {
+			if (val1 != 1) {
+				_vm->_deathFlag = true;
+				_vm->_deathCount = 300;
+				_vm->_deathType = val2;
+			}
+			_vm->_oldScrollCol = _vm->_screen->_scrollCol;
+			_vm->_screen->_scrollCol = 44;
+			_vm->_screen->_scrollX = 14;
+			_vm->_room->buildScreen();
+			resetPositions();
+			return false;
+		}
+	}
+
+	_vm->_screen->_scrollX = 14;
+	--_vm->_screen->_scrollCol;
+	_vm->_buffer1.moveBufferRight();
+	_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
+	checkRiverPan();
+	return false;
+}
+
+void River::riverSound() {
+	if (_vm->_timers[11]._flag == 0) {
+		++_vm->_timers[11]._flag;
+		_vm->_sound->playSound(2);
+	}
+
+	if (_vm->_timers[12]._flag == 0) {
+		++_vm->_timers[12]._flag;
+		_vm->_sound->playSound(3);
+	}
+
+	if ((_xCam >= 1300) && (_xCam <= 1320))
+		_vm->_sound->playSound(1);
+}
+
+void River::moveCanoe() {
+	Screen &screen = *_vm->_screen;
+	EventsManager &events = *_vm->_events;
+	Common::Point pt = events.calcRawMouse();
+
+	// Do an event polling
+	_vm->_canSaveLoad = true;
+	events.pollEvents();
+	_vm->_canSaveLoad = false;
+	if (_vm->_room->_function == FN_CLEAR1)
+		return;
+
+	if (_canoeDir) {
+		// Canoe movement in progress
+		moveCanoe2();
+	} else {
+		if (events._leftButton && pt.y >= 140) {
+			if (pt.x < RMOUSE[8][0]) {
+				// Disk icon wasn't clicked
+				_vm->_scripts->printString(BAR_MESSAGE);
+			} else {
+				// Clicked on the Disc icon
+				_vm->_saveRiver = true;
+				_rScrollRow = screen._scrollRow;
+				_rScrollCol = screen._scrollCol;
+				_rScrollX = screen._scrollX;
+				_rScrollY = screen._scrollY;
+				_mapOffset = _mapPtr - MAPTBL[_vm->_riverFlag];
+
+				// Show the ScummVM menu
+				_vm->_room->handleCommand(9);
+
+				if (_vm->_room->_function != FN_CLEAR1) {
+					_vm->_saveRiver = false;
+					_vm->_room->buildScreen();
+					_vm->copyBF2Vid();
+				}
+			}
+		}
+		else if ((events._leftButton && pt.y <= _canoeYPos) ||
+			(!events._leftButton && _vm->_player->_move == UP)) {
+			// Move canoe up
+			if (_canoeLane > 0) {
+				_canoeDir = -1;
+				_canoeMoveCount = 0;
+
+				moveCanoe2();
+			}
+		}
+		else if (events._leftButton || _vm->_player->_move == DOWN) {
+			// Move canoe down
+			if (_canoeLane < 7) {
+				_canoeDir = 1;
+				_canoeMoveCount = 0;
+
+				moveCanoe2();
+			}
+		}
+	}
+}
+
+void River::moveCanoe2() {
+	_canoeYPos += _canoeDir;
+
+	if (++_canoeMoveCount == 5) {
+		_canoeLane += _canoeDir;
+		_canoeDir = 0;
+	}
+}
+
+void River::updateObstacles() {
+	RiverStruct *cur;
+	for (cur = _topList; cur < RIVEROBJECTTBL[_riverIndex + 1]; ++cur) {
+		int val = cur->_field1 + cur->_field3 - 1;
+		if (val < _screenVertX)
+			break;
+
+		if (cur->_field3 < (_screenVirtX + 319)) {
+			_topList = cur;
+			_botList = cur;
+
+			while (cur < RIVEROBJECTTBL[_riverIndex + 1]) {
+				++cur;
+				val = cur->_field1 + cur->_field3 - 1;
+				if (val < _screenVertX || (cur->_field3 >= (_screenVirtX + 319)))
+					break;
+
+				_botList = cur;
+			}
+
+			return;
+		}
+	}
+
+	cur = _topList;
+	cur--;
+	_botList = cur;
+}
+
+void River::riverSetPhysX() {
+	int val = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+	RiverStruct *cur = _topList;
+	while (cur <= _botList) {
+		cur[0]._field5 = val - (_screenVertX - cur[0]._field3);
+		++cur;
+	}
+}
+
+bool River::checkRiverCollide() {
+	if (_hitSafe)
+		return false;
+
+	_canoeVXPos = _screenVertX + 170;
+
+	for (RiverStruct *si = _topList; si <= _botList; ++si) {
+		if (si[0]._lane < _canoeLane)
+			continue;
+
+		if ((si[0]._lane == _canoeLane) || (si[0]._lane == _canoeLane + 1)) {
+			if (si[0]._field1 + si[0]._field3 - 1 >= _canoeVXPos) {
+				if (_canoeVXPos + 124 >= si[0]._field3) {
+					_vm->_sound->playSound(4);
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+void River::plotRiver() {
+	if (_vm->_timers[3]._flag == 0) {
+		++_vm->_timers[3]._flag;
+		if (_canoeFrame == 12)
+			_canoeFrame = 0;
+		else
+			++_canoeFrame;
+	}
+
+	ImageEntry ie;
+	ie._flags = IMGFLAG_UNSCALED;
+	ie._spritesPtr = _vm->_objectsTable[45];
+	ie._frameNumber = _canoeFrame;
+	ie._position.x = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX + 160;
+	ie._position.y = _canoeYPos - 41;
+	ie._offsetY = 41;
+	_vm->_images.addToList(ie);
+
+	RiverStruct *cur = _topList;
+	while (cur <= _botList) {
+		if (cur[0]._id != -1) {
+			ie._flags = IMGFLAG_UNSCALED;
+			ie._spritesPtr = _vm->_objectsTable[45];
+			ie._frameNumber = 0;
+			ie._position.x = cur[0]._field5;
+			int val = (cur[0]._lane * 5) + 56;
+			ie._position.y = val - cur[0]._field8;
+			ie._offsetY = cur[0]._field8;
+			_vm->_images.addToList(ie);
+		}
+		++cur;
+	}
+}
+
+void River::mWhileDownRiver() {
+	_vm->_events->hideCursor();
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->clearScreen();
+	_vm->_screen->savePalette();
+
+	_vm->_files->loadScreen(95, 4);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_screen->restorePalette();
+	_vm->_screen->setPalette();
+	_vm->_screen->setBufferScan();
+	_vm->_screen->_scrollX = 0;
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+
+	_vm->_player->_scrollAmount = 2;
+	_vm->_destIn = &_vm->_buffer2;
+	_xTrack = -7;
+	_yTrack = _zTrack = 0;
+	_xCam = _yCam = 0;
+	_zCam = 80;
+
+	_vm->_timers[24]._timer = 1;
+	_vm->_timers[24]._initTm = 1;
+	++_vm->_timers[24]._flag;
+
+	_pNumObj = 14;
+	for (int i = 0; i <_pNumObj; i++) {
+		_pan[i]._pObject = _vm->_objectsTable[33];
+		_pan[i]._pImgNum = DOWNRIVEROBJ[i][0];
+		_pan[i]._pObjX = DOWNRIVEROBJ[i][1];
+		_pan[i]._pObjY = DOWNRIVEROBJ[i][2];
+		_pan[i]._pObjZ = DOWNRIVEROBJ[i][3];
+		_pan[i]._pObjXl = _pan[i]._pObjYl = 0;
+	}
+
+	_vm->_timers[3]._timer = 200;
+	_vm->_timers[3]._initTm = 200;
+	++_vm->_timers[3]._flag;
+	_vm->_timers[4]._timer = 350;
+	_vm->_timers[4]._initTm = 350;
+	++_vm->_timers[4]._flag;
+
+	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
+		(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth)) {
+		_vm->_images.clear();
+		_vm->_events->_vbCount = 6;
+
+		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
+			_vm->_screen->_scrollX -= TILE_WIDTH;
+			++_vm->_screen->_scrollCol;
+			_vm->_buffer1.moveBufferLeft();
+			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+		}
+
+		pan();
+		scrollRiver();
+
+		if (!_vm->_timers[3]._flag) {
+			++_vm->_timers[3]._flag;
+			_vm->_sound->playSound(1);
+		}
+		else if (!_vm->_timers[4]._flag) {
+			++_vm->_timers[4]._flag;
+			_vm->_sound->playSound(0);
+		}
+
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+			_vm->_events->pollEventsAndWait();
+		}
+	}
+
+	_vm->_events->showCursor();
+}
+
+void River::scrollRiver() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	_vm->_buffer2.plotImage(_vm->_objectsTable[33], 0, Common::Point(66, 30));
+	_vm->plotList();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void River::scrollRiver1() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	plotRiver();
+	_vm->plotList();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void River::river() {
+	static const int RIVERDEATH[5] = { 22, 23, 24, 25, 26 };
+
+	initRiver();
+	_vm->_events->showCursor();
+
+	while (!_vm->shouldQuit()) {
+		_vm->_events->_vbCount = 4;
+
+		//		int bx = _vm->_player->_scrollAmount - _screenVertX;
+		if (_vm->_screen->_scrollX == 0) {
+			_vm->_sound->midiRepeat();
+			if (riverJumpTest()) {
+				_CHICKENOUTFLG = false;
+				return;
+			}
+		}
+		else {
+			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
+		}
+
+		if (_CHICKENOUTFLG) {
+			_CHICKENOUTFLG = false;
+			return;
+		}
+
+		_vm->_images.clear();
+		_vm->_animation->animate(0);
+
+		riverSound();
+		pan();
+		moveCanoe();
+
+		if (_vm->_room->_function != FN_CLEAR1) {
+			updateObstacles();
+			riverSetPhysX();
+			bool checkCollide = checkRiverCollide();
+			if (_hitSafe != 0)
+				_hitSafe -= 2;
+
+			if (checkCollide) {
+				_vm->dead(RIVERDEATH[0]);
+				return;
+			}
+
+			if (_vm->_deathFlag) {
+				_vm->_deathCount--;
+				if (_vm->_deathCount == 0) {
+					_vm->dead(RIVERDEATH[_vm->_deathType]);
+					return;
+				}
+			}
+
+			// Scroll the river
+			scrollRiver1();
+
+			// Allow time for new scrolled river position to be shown
+			_vm->_canSaveLoad = true;
+			while (!_vm->shouldQuit() && _vm->_room->_function == FN_NONE &&
+				_vm->_events->_vbCount > 0) {
+				_vm->_events->pollEventsAndWait();
+			}
+			_vm->_canSaveLoad = false;
+		}
+
+		if (_vm->_room->_function == FN_CLEAR1) {
+			_vm->_scripts->_endFlag = true;
+			_vm->_scripts->_returnCode = 0;
+			_CHICKENOUTFLG = false;
+			break;
+		}
+	}
+}
+void River::synchronize(Common::Serializer &s) {
+	s.syncAsSint16LE(_canoeLane);
+	s.syncAsSint16LE(_canoeYPos);
+	s.syncAsSint16LE(_hitCount);
+	s.syncAsSint16LE(_riverIndex);
+	s.syncAsSint16LE(_hitSafe);
+	s.syncAsUint16LE(_rScrollRow);
+	s.syncAsUint16LE(_rScrollCol);
+	s.syncAsSint16LE(_rScrollX);
+	s.syncAsSint16LE(_rScrollY);
+	s.syncAsUint16LE(_rOldRectCount);
+	s.syncAsUint16LE(_rNewRectCount);
+	s.syncAsUint16LE(_rKeyFlag);
+	s.syncAsUint16LE(_mapOffset);
+	s.syncAsUint16LE(_screenVirtX);
+	warning("TODO: 	s.syncAsSint16LE(_topList);");
+	warning("TODO: 	s.syncAsSint16LE(_botList);");
+}
+
+/*------------------------------------------------------------------------*/
+
+Ant::Ant(AmazonEngine *vm) : AmazonManager(vm) {
+	_antDirection = NONE;
+	_pitDirection = NONE;
+	_antCel = 0;
+	_torchCel = 0;
+	_pitCel = 0;
+	_stabCel = 0;
+	_antPos = Common::Point(0, 0);
+	_antDieFl = _antEatFl = false;
+	_stabFl = false;
+	_pitPos = Common::Point(0, 0);
+}
+
+void Ant::plotTorchSpear(int indx, const int *&buf) {
+	int idx = indx;
+
+	ImageEntry ie;
+	ie._flags = IMGFLAG_UNSCALED;
+	ie._spritesPtr = _vm->_objectsTable[62];
+	ie._frameNumber = buf[(idx / 2)];
+	ie._position = Common::Point(_pitPos.x + buf[(idx / 2) + 1], _pitPos.y + buf[(idx / 2) + 2]);
+	ie._offsetY = 255;
+	_vm->_images.addToList(ie);
+}
+
+void Ant::plotPit(int indx, const int *&buf) {
+	int idx = indx;
+	ImageEntry ie;
+	ie._flags = IMGFLAG_UNSCALED;
+	ie._spritesPtr = _vm->_objectsTable[62];
+	ie._frameNumber = buf[(idx / 2)];
+	ie._position = Common::Point(_pitPos.x, _pitPos.y);
+	ie._offsetY = _pitPos.y;
+	_vm->_images.addToList(ie);
+
+	_vm->_player->_rawPlayer = _pitPos;
+	if (_vm->_inventory->_inv[76]._value == 1) {
+		idx = _torchCel;
+		buf = Amazon::TORCH;
+		_vm->_timers[14]._flag = 1;
+		idx += 6;
+		if (buf[idx / 2] == -1)
+			idx = 0;
+		_torchCel = idx;
+		plotTorchSpear(idx, buf);
+	}
+	else if (!_stabFl && (_vm->_inventory->_inv[78]._value == 1)) {
+		idx = 0;
+		buf = Amazon::SPEAR;
+		plotTorchSpear(idx, buf);
+	}
+}
+
+int Ant::antHandleRight(int indx, const int *&buf) {
+	int retval = indx;
+	if (_pitDirection == NONE) {
+		_pitDirection = UP;
+		_pitPos.y = 127;
+	}
+	retval = _pitCel;
+	buf = Amazon::PITWALK;
+	if (_pitPos.x < 230) {
+		if (retval == 0) {
+			retval = 48;
+			_pitPos.y = 127;
+		}
+		retval -= 6;
+		_pitPos.x -= buf[(retval / 2) + 1];
+		_pitPos.y -= buf[(retval / 2) + 2];
+		_pitCel = retval;
+	}
+	return retval;
+}
+
+int Ant::antHandleLeft(int indx, const int *&buf) {
+	int retval = indx;
+	if (_pitDirection == UP) {
+		_pitDirection = NONE;
+		_pitPos.y = 127;
+	}
+	retval = _pitCel;
+	buf = Amazon::PITWALK;
+	retval += 6;
+	if (buf[retval / 2] == -1) {
+		retval = 0;
+		_pitPos.y = 127;
+	}
+	_pitPos.x += buf[(retval / 2) + 1];
+	_pitPos.y += buf[(retval / 2) + 2];
+	_pitCel = retval;
+
+	return retval;
+}
+
+int Ant::antHandleStab(int indx, const int *&buf) {
+	int retval = indx;
+	if (_vm->_inventory->_inv[78]._value != 1) {
+		if (_stabFl) {
+			buf = Amazon::PITSTAB;
+			retval = _stabCel;
+			if (_vm->_timers[13]._flag == 0) {
+				_vm->_timers[13]._flag = 1;
+				retval += 6;
+				if (Amazon::PITSTAB[retval] == -1) {
+					_stabFl = false;
+					_pitCel = 0;
+					_pitPos.y = 127;
+					retval = 0;
+					buf = Amazon::PITWALK;
+				}
+				else {
+					_pitPos.x += buf[(retval / 2) + 1];
+					_pitPos.y += buf[(retval / 2) + 2];
+					_pitCel = retval;
+				}
+			}
+		}
+		else {
+			_stabFl = true;
+			_pitCel = 0;
+			retval = 0;
+			_stabCel = 0;
+			int dist = _pitPos.x - _antPos.x;
+			if (_antEatFl && !_antDieFl && (dist <= 80)) {
+				_antDieFl = true;
+				_antCel = 0;
+				_antPos.y = 123;
+				_vm->_sound->playSound(1);
+			}
+		}
+	}
+	return retval;
+}
+
+void Ant::doAnt() {
+	_antDirection = NONE;
+	if (_vm->_aniFlag != 1) {
+		_vm->_aniFlag = 1;
+		_antCel = 0;
+		_torchCel = 0;
+		_pitCel = 0;
+
+		_vm->_timers[15]._timer = 16;
+		_vm->_timers[15]._initTm = 16;
+		_vm->_timers[15]._flag = 1;
+
+		_vm->_timers[13]._timer = 5;
+		_vm->_timers[13]._initTm = 5;
+		_vm->_timers[13]._flag = 1;
+
+		_vm->_timers[14]._timer = 10;
+		_vm->_timers[14]._initTm = 10;
+		_vm->_timers[14]._flag = 1;
+
+		_antPos = Common::Point(-40, 123);
+		_antDieFl = _antEatFl = false;
+		_stabFl = false;
+		_pitPos = Common::Point(_vm->_player->_rawPlayer.x, 127);
+	}
+
+	const int *buf = nullptr;
+	if (_antDieFl) {
+		buf = Amazon::ANTDIE;
+	}
+	else if (_antEatFl) {
+		buf = Amazon::ANTEAT;
+	}
+	else if (_antPos.x > 120 && _vm->_flags[198] == 1) {
+		_antEatFl = true;
+		_vm->_flags[235] = 1;
+		_antCel = 0;
+		buf = Amazon::ANTEAT;
+	}
+	else {
+		buf = Amazon::ANTWALK;
+		if (_vm->_inventory->_inv[76]._value == 1)
+			_antDirection = UP;
+	}
+
+	int idx = _antCel;
+	if (_vm->_timers[15]._flag == 0) {
+		_vm->_timers[15]._flag = 1;
+		if (_antDirection == UP) {
+			if (_antPos.x > 10) {
+				if (idx == 0)
+					idx = 36;
+				else
+					idx -= 6;
+
+				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_antCel = idx;
+			}
+		}
+		else {
+			idx += 6;
+			if (buf[(idx / 2)] != -1) {
+				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_antCel = idx;
+			}
+			else if (!_antDieFl) {
+				idx = 0;
+				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_antCel = idx;
+			}
+			else {
+				idx -= 6;
+				if (_vm->_flags[200] == 0)
+					_vm->_flags[200] = 1;
+			}
+		}
+	}
+
+	ImageEntry ie;
+	ie._flags = IMGFLAG_UNSCALED;
+	ie._spritesPtr = _vm->_objectsTable[61];
+	ie._frameNumber = buf[(idx / 2)];
+	ie._position = Common::Point(_antPos.x, _antPos.y);
+	ie._offsetY = _antPos.y - 70;
+	_vm->_images.addToList(ie);
+	_antCel = idx;
+
+	if (_vm->_flags[196] != 1) {
+		idx = _pitCel;
+		if (_stabFl == 1) {
+			idx = antHandleStab(idx, buf);
+		}
+		else {
+			buf = Amazon::PITWALK;
+			if (_vm->_timers[13]._flag == 0) {
+				_vm->_timers[13]._flag = 1;
+				_vm->_events->pollEvents();
+				if (_vm->_events->_leftButton) {
+					Common::Point pt = _vm->_events->calcRawMouse();
+					if (pt.x < _pitPos.x)
+						idx = antHandleLeft(idx, buf);
+					else if (pt.x > _pitPos.x)
+						idx = antHandleRight(idx, buf);
+				}
+				else {
+					buf = Amazon::PITWALK;
+					if (_vm->_player->_playerDirection == UP)
+						idx = antHandleStab(idx, buf);
+					else if (_vm->_player->_playerDirection == LEFT)
+						idx = antHandleLeft(idx, buf);
+					else if (_vm->_player->_playerDirection == RIGHT)
+						idx = antHandleRight(idx, buf);
+				}
+			}
+		}
+		plotPit(idx, buf);
+	}
+
+	if (!_antDieFl) {
+		int dist = _pitPos.x - _antPos.x;
+		if ((_antEatFl && (dist <= 45)) || (!_antEatFl && (dist <= 80))) {
+			_vm->_flags[199] = 1;
+			_vm->_aniFlag = 0;
+		}
+	}
+}
+
+} // End of namespace Amazon
+
+} // End of namespace Access
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
new file mode 100644
index 0000000000..4d5e274388
--- /dev/null
+++ b/engines/access/amazon/amazon_logic.h
@@ -0,0 +1,228 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ACCESS_AMAZON_LOGIC_H
+#define ACCESS_AMAZON_LOGIC_H
+
+#include "common/scummsys.h"
+#include "access/scripts.h"
+#include "access/asurface.h"
+
+namespace Access {
+
+namespace Amazon {
+
+class AmazonEngine;
+
+#define PAN_SIZE 32
+
+class AmazonManager {
+protected:
+	AmazonEngine *_vm;
+public:
+	AmazonManager(AmazonEngine *vm) : _vm(vm) {}
+};
+
+class PannedScene: public AmazonManager {
+	struct PanEntry {
+		SpriteResource *_pObject;
+		int _pImgNum;
+		int _pObjX;
+		int _pObjY;
+		int _pObjZ;
+		int _pObjXl;
+		int _pObjYl;
+	};
+protected:
+	int _xCount;
+	int _xTrack;
+	int _yTrack;
+	int _zTrack;
+	int _xCam;
+	int _yCam;
+	int _zCam;
+	int _pNumObj;
+	int _screenVertX;
+
+	PanEntry _pan[PAN_SIZE];
+public:
+	PannedScene(AmazonEngine *vm);
+
+	void pan();
+};
+
+class Opening: public PannedScene {
+public:
+	Opening(AmazonEngine *vm);
+
+	void mWhileDoOpen();
+};
+
+class Plane: public PannedScene {
+public:
+	int _pCount;
+	Common::Point _position;
+	int _planeCount;
+	int _propCount;
+
+	void doFlyCell();
+	void doFallCell();
+	void scrollFly();
+	void scrollFall();
+	void mWhileFly();
+	void mWhileFall();
+public:
+	Plane(AmazonEngine *vm);
+};
+
+#define JUNGLE_SIZE 3
+class Jungle: public PannedScene {
+private:
+	void initJWalk2();
+	void jungleMove();
+	void scrollJWalk();
+
+	int _jCnt[JUNGLE_SIZE];
+	int _jungleX[JUNGLE_SIZE];
+public:
+	Jungle(AmazonEngine *vm);
+
+	void mWhileJWalk();
+	void mWhileJWalk2();
+};
+
+class Guard : public PannedScene {
+private:
+	int _guardCel;
+	Common::Point _position;
+	int _gCode1;
+	int _gCode2;
+	Common::Point _topLeft;
+	Common::Point _bottomRight;
+	int _xMid, _yMid;
+
+	void chkVLine();
+	void chkHLine();
+	void setVerticalCode();
+	void setHorizontalCode();
+	void guardSee();
+	void setGuardFrame();
+public:
+	Guard(AmazonEngine *vm);
+
+	void doGuard();
+
+	void setPosition(const Common::Point &pt);
+};
+
+class Cast : public PannedScene {
+public:
+	Cast(AmazonEngine *vm);
+
+	void doCast(int param1);
+};
+
+class River: public PannedScene {
+private:
+	bool _CHICKENOUTFLG;
+	const byte *_mapPtr;
+	int _canoeVXPos;
+	int _canoeMoveCount;
+	int _canoeFrame;
+	RiverStruct *_topList;
+	RiverStruct *_botList;
+	int _canoeDir;
+
+	// Saved fields
+	int _canoeLane;
+	int _canoeYPos;
+	int _hitCount;
+	int _riverIndex;
+	int _hitSafe;
+	int _rScrollRow;
+	int _rScrollCol;
+	int _rScrollX;
+	int _rScrollY;
+	int _rOldRectCount;
+	int _rNewRectCount;
+	int _rKeyFlag;
+	int _mapOffset;
+	int _screenVirtX;
+
+	void initRiver();
+	void resetPositions();
+	void checkRiverPan();
+	bool riverJumpTest();
+	void riverSound();
+	void moveCanoe();
+	void moveCanoe2();
+	void updateObstacles();
+	void riverSetPhysX();
+	bool checkRiverCollide();
+	void plotRiver();
+	void scrollRiver();
+	void scrollRiver1();
+	void setRiverPan();
+public:
+	River(AmazonEngine *vm);
+
+	void river();
+	void mWhileDownRiver();
+
+	void synchronize(Common::Serializer &s);
+};
+
+class Ant: public AmazonManager {
+private:
+	Direction _antDirection;
+	Direction _pitDirection;
+	int _antCel;
+	int _torchCel;
+	int _pitCel;
+	int _stabCel;
+	Common::Point _antPos;
+	bool _antDieFl;
+	bool _antEatFl;
+	bool _stabFl;
+	Common::Point _pitPos;
+
+	void plotTorchSpear(int indx, const int *&buf);
+	void plotPit(int indx, const int *&buf);
+	int antHandleRight(int indx, const int *&buf);
+	int antHandleLeft(int indx, const int *&buf);
+	int antHandleStab(int indx, const int *&buf);
+public:
+	Ant(AmazonEngine *vm);
+
+	void doAnt();
+};
+
+class InactivePlayer : public ImageEntry {
+public:
+	SpriteResource *_altSpritesPtr;
+};
+
+} // End of namespace Amazon
+
+} // End of namespace Access
+
+#endif /* ACCESS_AMAZON_LOGIC_H */
diff --git a/engines/access/amazon/amazon_player.cpp b/engines/access/amazon/amazon_player.cpp
index ede7ab58e2..c9b63a9108 100644
--- a/engines/access/amazon/amazon_player.cpp
+++ b/engines/access/amazon/amazon_player.cpp
@@ -77,7 +77,7 @@ void AmazonPlayer::load() {
 		_diagUpWalkMax = 5;
 		_diagDownWalkMin = 0;
 		_diagDownWalkMax = 5;
-		_game->_guard._position = Common::Point(56, 190);
+		_game->_guard.setPosition(Common::Point(56, 190));
 	}
 }
 
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 05e234aefc..0ae7ef0718 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1776,6 +1776,68 @@ const int HELP1COORDS[2][4] = {
 	{  76, 129, 168, 183 }, { 187, 240, 168, 183 }
 };
 
+const int RIVER1OBJ[23][4] = {
+	{ 18, -77, 0, 30 },
+	{ 18, -325, 0, 20 },
+	{ 18, -450, 0, 15 },
+	{ 18, -1250, 0, 25 },
+	{ 19, -130, 0, 20 },
+	{ 19, -410, 0, 15 },
+	{ 19, -710, 0, 25 },
+	{ 19, -1510, 0, 20 },
+	{ 20, -350, 0, 30 },
+	{ 20, -695, 0, 25 },
+	{ 20, -990, 0, 20 },
+	{ 20, -1300, 0, 25 },
+	{ 20, -1600, 0, 30 },
+	{ 21, -370, 0, 20 },
+	{ 21, -650, 0, 30 },
+	{ 21, -1215, 0, 40 },
+	{ 21, -1815, 0, 35 },
+	{ 22, -380, 0, 25 },
+	{ 22, -720, 0, 35 },
+	{ 22, -1020, 0, 30 },
+	{ 22, -1170, 0, 25 },
+	{ 22, -1770, 0, 35 },
+	{ 23, -500, 63, 20 }
+};
+
+const int CAST_END_OBJ[26][4] = {
+	{ 0, 118, 210, 10 },
+	{ 1, 38, 250, 10 },
+	{ 2, 38, 280, 10 },
+	{ 3, 38, 310, 10 },
+	{ 4, 38, 340, 10 },
+	{ 5, 38, 370, 10 },
+	{ 6, 38, 400, 10 },
+	{ 7, 38, 430, 10 },
+	{ 8, 38, 460, 10 },
+	{ 9, 38, 490, 10 },
+	{ 10, 38, 520, 10 },
+	{ 11, 38, 550, 10 },
+	{ 12, 38, 580, 10 },
+	{ 13, 38, 610, 10 },
+	{ 14, 38, 640, 10 },
+	{ 15, 38, 670, 10 },
+	{ 16, 38, 700, 10 },
+	{ 17, 38, 730, 10 },
+	{ 18, 38, 760, 10 },
+	{ 19, 38, 790, 10 },
+	{ 20, 95, 820, 10 },
+	{ 21, 94, 850, 10 },
+	{ 22, 96, 880, 10 },
+	{ 23, 114, 910, 10 },
+	{ 24, 114, 940, 10 },
+	{ 25, 110, 970, 10 }
+};
+
+const int CAST_END_OBJ1[4][4] = {
+	{ 0, 40, 1100, 10 },
+	{ 2, 11, 1180, 10 },
+	{ 1, 154, 1180, 10 },
+	{ 3, 103, 1300, 10 }
+};
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 6d94e6a359..61659d30d4 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -128,6 +128,12 @@ extern RiverStruct ENDRIVER2[1];
 extern RiverStruct *RIVEROBJECTTBL[6];
 extern const int HELP1COORDS[2][4];
 
+extern const int RIVER1OBJ[23][4];
+
+extern const int CAST_END_OBJ[26][4];
+
+extern const int CAST_END_OBJ1[4][4];
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index ca0d7bf341..14514c2c7c 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -205,7 +205,8 @@ void AmazonRoom::walkCursor() {
 	// the Exit icon wgeb the cursor is already a walk cursor
 	EventsManager &events = *_vm->_events;
 
-	if (_vm->_player->_roomNumber == 29 && events._normalMouse != CURSOR_CROSSHAIRS) {
+	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 && 
+			events._normalMouse != CURSOR_CROSSHAIRS)) {
 		events._normalMouse = CURSOR_CROSSHAIRS;
 		events.setCursor(CURSOR_CROSSHAIRS);
 		_selectCommand = -1;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 58491250ad..d6a57d7919 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -33,28 +33,6 @@ namespace Amazon {
 
 AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 	_game = (AmazonEngine *)_vm;
-
-	_xTrack = 0;
-	_yTrack = 0;
-	_zTrack = 0;
-	_xCam = 0;
-	_yCam = 0;
-	_zCam = 0;
-	_CHICKENOUTFLG = false;
-
-	_pNumObj = 0;
-	for (int i = 0; i < 32; i++) {
-		_pImgNum[i] = 0;
-		_pObject[i] = nullptr;
-		_pObjX[i] = 0;
-		_pObjY[i] = 0;
-		_pObjZ[i] = 0;
-	}
-
-	for (int i = 0; i < 16; i++) {
-		_pObjXl[i] = 0;
-		_pObjYl[i] = 0;
-	}
 }
 
 void AmazonScripts::cLoop() {
@@ -227,662 +205,31 @@ void AmazonScripts::mWhile2() {
 	} while (_vm->_flags[52] == 4);
 }
 
-void AmazonScripts::initJWalk2() {
-	const int JUNGLE1OBJ[7][4] = {
-		{2, 470, 0, 20},
-		{0, 290, 0, 50},
-		{1, 210, 0, 40},
-		{0, 500, 0, 30},
-		{1, 550, 0, 20},
-		{0, 580, 0, 60},
-		{1, 650, 0, 30}
-	};
-	_vm->_screen->fadeOut();
-	_vm->_events->hideCursor();
-	_vm->_screen->clearScreen();
-	_vm->_buffer2.clearBuffer();
-	_vm->_screen->setBufferScan();
-
-	_vm->_screen->_scrollX = _vm->_screen->_scrollY;
-	_vm->_screen->_scrollCol = _vm->_screen->_scrollRow;
-	_vm->_room->buildScreen();
-	_vm->copyBF2Vid();
-	_vm->_screen->fadeIn();
-	// KEYFL = 0;
-
-	_game->_plane._xCount = 2;
-	_vm->_player->_scrollAmount = 5;
-	_xTrack = -10;
-	_yTrack = _zTrack = 0;
-	_xCam = 480;
-	_yCam = 0;
-	_zCam = 80;
-
-	_game->_timers[24]._timer = 1;
-	_game->_timers[24]._initTm = 1;
-	++_game->_timers[24]._flag;
-
-	_pNumObj = 7;
-	for (int i = 0; i < _pNumObj; i++) {
-		_pObject[i] = _vm->_objectsTable[24];
-		_pImgNum[i] = JUNGLE1OBJ[i][0];
-		_pObjX[i] = JUNGLE1OBJ[i][1];
-		_pObjY[i] = JUNGLE1OBJ[i][2];
-		_pObjZ[i] = JUNGLE1OBJ[i][3];
-		_pObjXl[i] = _pObjYl[i] = 0;
-	}
-
-	_jCnt[0] = 0;
-	_jCnt[1] = 3;
-	_jCnt[2] = 5;
-
-	_jungleX[0] = 50;
-	_jungleX[1] = 16;
-	_jungleX[2] = 93;
-}
-
-void AmazonScripts::jungleMove() {
-	const static int jungleY[3] = {27, 30, 29};
-	int count = 1;
-	int frameOffset = 0;
-
-	if (!_vm->_timers[0]._flag) {
-		++_vm->_timers[0]._flag;
-		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-
-		for (int i = 0; i < 3; ++i) {
-			int newJCnt = (_jCnt[i] + 1) % 8;
-			_jCnt[i] = newJCnt;
-			_jungleX[i] += 5;
-		}
-
-		frameOffset = 4;
-		count = (_game->_allenFlag != 1) ? 2 : 3;
-	}
-
-	for (int i = 0; i < count; ++i) {
-		ImageEntry ie;
-		ie._flags = IMGFLAG_UNSCALED;
-		ie._spritesPtr = _vm->_objectsTable[24];
-		ie._frameNumber = _jCnt[i] + frameOffset;
-		ie._position = Common::Point(_jungleX[i], jungleY[i]);
-		ie._offsetY = jungleY[i];
-
-		_vm->_images.addToList(ie);
-		frameOffset += 8;
-	}
-}
-
-void AmazonScripts::mWhileJWalk2() {
-	Screen &screen = *_vm->_screen;
-
-	initJWalk2();
-
-	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
-			(screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
-		_vm->_images.clear();
-		_vm->_events->_vbCount = 6;
-		_pImgNum[0] = _game->_plane._xCount;
-
-		jungleMove();
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
-			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
-		}
-
-		if (_game->_plane._xCount == 2)
-			++_game->_plane._xCount;
-		else
-			--_game->_plane._xCount;
-
-		pan();
-		scrollJWalk();
-
-		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-			_vm->_events->pollEventsAndWait();
-		}
-	}
-
-	_vm->_events->showCursor();
-}
-
-void AmazonScripts::doFlyCell() {
-	Plane &plane = _game->_plane;
-	SpriteResource *sprites = _vm->_objectsTable[15];
-
-	if (plane._pCount <= 40) {
-		_vm->_buffer2.plotImage(sprites, 3, Common::Point(70, 74));
-	} else if (plane._pCount <= 80) {
-		_vm->_buffer2.plotImage(sprites, 6, Common::Point(70, 74));
-	} else if (plane._pCount <= 120) {
-		_vm->_buffer2.plotImage(sprites, 2, Common::Point(50, 76));
-	} else if (plane._pCount <= 160) {
-		_vm->_buffer2.plotImage(sprites, 14, Common::Point(63, 78));
-	} else if (plane._pCount <= 200) {
-		_vm->_buffer2.plotImage(sprites, 5, Common::Point(86, 74));
-	} else if (plane._pCount <= 240) {
-		_vm->_buffer2.plotImage(sprites, 0, Common::Point(103, 76));
-	} else if (plane._pCount <= 280) {
-		_vm->_buffer2.plotImage(sprites, 4, Common::Point(119, 77));
-	} else {
-		_vm->_buffer2.plotImage(sprites, 1, Common::Point(111, 77));
-	}
-
-	if (plane._planeCount == 11 || plane._planeCount == 12)
-		++plane._position.y;
-	else if (plane._planeCount >= 28)
-		--plane._position.y;
-
-	_vm->_buffer2.plotImage(sprites, 7, plane._position);
-	_vm->_buffer2.plotImage(sprites, 8 + plane._propCount, Common::Point(
-		plane._position.x + 99, plane._position.y + 10));
-	_vm->_buffer2.plotImage(sprites, 11 + plane._propCount, Common::Point(
-		plane._position.x + 104, plane._position.y + 18));
-
-	if (++plane._planeCount >= 30)
-		plane._planeCount = 0;
-	if (++plane._propCount >= 3)
-		plane._propCount = 0;
-
-	++plane._xCount;
-	if (plane._xCount == 1)
-		++plane._position.x;
-	else
-		plane._xCount = 0;
-}
-
-void AmazonScripts::doFallCell() {
-	if (_vm->_scaleI <= 20)
-		return;
-
-	SpriteFrame *frame = _vm->_objectsTable[20]->getFrame(_game->_plane._planeCount / 6);
-	Common::Rect r(115, 11, 115 + _vm->_screen->_scaleTable1[frame->w], 
-		11 + _vm->_screen->_scaleTable1[frame->h]);
-	_vm->_buffer2.sPlotF(frame, r);
-
-	_vm->_scaleI -= 3;
-	_vm->_scale = _vm->_scaleI;
-	_vm->_screen->setScaleTable(_vm->_scale);
-	++_game->_plane._xCount;
-	if (_game->_plane._xCount == 5)
-		return;
-	_game->_plane._xCount = 0;
-	if (_game->_plane._planeCount == 18)
-		_game->_plane._planeCount = 0;
-	else
-		_game->_plane._planeCount += 6;
-}
-
-void AmazonScripts::pan() {
-	_zCam += _zTrack;
-	_xCam += _xTrack;
-	int tx = (_xTrack << 8) / _zCam;
-	_yCam += _yTrack;
-	int ty = (_yTrack << 8) / _zCam;
-
-	if (_vm->_timers[24]._flag != 1) {
-		++_vm->_timers[24]._flag;
-		for (int i = 0; i < _pNumObj; i++) {
-			_pObjZ[i] += _zTrack;
-			_pObjXl[i] += (_pObjZ[i] * tx) & 0xff;
-			_pObjX[i] += ((_pObjZ[i] * tx) >> 8) + (_pObjXl[i] >> 8);
-			_pObjXl[i] &= 0xff;
-
-			_pObjYl[i] += (_pObjZ[i] * ty) & 0xff;
-			_pObjY[i] += ((_pObjZ[i] * ty) >> 8) + (_pObjYl[i] >> 8);
-			_pObjYl[i] &= 0xff;
-		}
-	}
-
-	for (int i = 0; i < _pNumObj; i++) {
-		ImageEntry ie;
-		ie._flags = IMGFLAG_UNSCALED;
-		ie._position = Common::Point(_pObjX[i], _pObjY[i]);
-		ie._offsetY = 255;
-		ie._spritesPtr = _pObject[i];
-		ie._frameNumber = _pImgNum[i];
-
-		_vm->_images.addToList(ie);
-	}
-}
-
-void AmazonScripts::scrollFly() {
-	_vm->copyBF1BF2();
-	_vm->_newRects.clear();
-	doFlyCell();
-	_vm->copyRects();
-	_vm->copyBF2Vid();
-}
-
-void AmazonScripts::scrollFall() {
-	_vm->copyBF1BF2();
-	_vm->_newRects.clear();
-	doFallCell();
-	_vm->copyRects();
-	_vm->copyBF2Vid();
-}
-
-void AmazonScripts::scrollJWalk() {
-	_vm->copyBF1BF2();
-	_vm->_newRects.clear();
-	_game->plotList();
-	_vm->copyRects();
-	_vm->copyBF2Vid();
-}
-
-void AmazonScripts::mWhileFly() {
-	Screen &screen = *_vm->_screen;
-	Player &player = *_vm->_player;
-	EventsManager &events = *_vm->_events;
-	Plane &plane = _game->_plane;
-
-	events.hideCursor();
-	screen.clearScreen();
-	screen.setBufferScan();
-	screen.fadeOut();
-	screen._scrollX = 0;
-
-	_vm->_room->buildScreen();
-	_vm->copyBF2Vid();
-	screen.fadeIn();
-	_vm->_oldRects.clear();
-	_vm->_newRects.clear();
-
-	// KEYFLG = 0;
-
-	screen._scrollRow = screen._scrollCol = 0;
-	screen._scrollX = screen._scrollY = 0;
-	player._rawPlayer = Common::Point(0, 0);
-	player._scrollAmount = 1;
-
-	plane._pCount = 0;
-	plane._planeCount = 0;
-	plane._propCount = 0;
-	plane._xCount = 0;
-	plane._position = Common::Point(20, 29);
-
-	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
-			((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth)) {
-		events._vbCount = 4;
-		screen._scrollX += player._scrollAmount;
-
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
-
-			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
-		}
-
-		scrollFly();
-		++plane._pCount;
-
-		while (!_vm->shouldQuit() && events._vbCount > 0) {
-			// To be rewritten when NEWTIMER is done
-			events.checkForNextFrameCounter();
-			_vm->_sound->playSound(0);
-
-			events.pollEventsAndWait();
-		}
-	}
-
-	events.showCursor();
-}
-
-void AmazonScripts::mWhileFall() {
-	Screen &screen = *_vm->_screen;
-	EventsManager &events = *_vm->_events;
-
-	events.hideCursor();
-	screen.clearScreen();
-	screen.setBufferScan();
-	screen.fadeOut();
-	screen._scrollX = 0;
-
-	_vm->_room->buildScreen();
-	_vm->copyBF2Vid();
-	screen.fadeIn();
-	_vm->_oldRects.clear();
-	_vm->_newRects.clear();
-
-	// KEYFLG = 0;
-
-	screen._scrollRow = screen._scrollCol = 0;
-	screen._scrollX = screen._scrollY = 0;
-	_vm->_player->_scrollAmount = 3;
-	_vm->_scaleI = 255;
-
-	_game->_plane._xCount = 0;
-	_game->_plane._planeCount = 0;
-
-	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
-			(screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
-		events._vbCount = 4;
-		screen._scrollX += _vm->_player->_scrollAmount;
-
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
-
-			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
-		}
-
-		scrollFall();
-
-		while (!_vm->shouldQuit() && events._vbCount > 0) {
-			events.pollEventsAndWait();
-		}
-	}
-
-	events.showCursor();
-}
-
-void AmazonScripts::mWhileJWalk() {
-	Screen &screen = *_vm->_screen;
-	EventsManager &events = *_vm->_events;
-	Player &player = *_vm->_player;
-
-	static const int JUNGLE_OBJ[7][4] = {
-		{2, 77, 0, 40},
-		{0, 290, 0, 50},
-		{1, 210, 0, 70},
-		{0, 50, 0, 30},
-		{1, 70, 0, 20},
-		{0, -280, 0, 60},
-		{1, -150, 0, 30},
-	};
-
-	screen.fadeOut();
-	events.hideCursor();
-	screen.clearScreen();
-	_vm->_buffer2.clearBuffer();
-	screen.setBufferScan();
-	screen._scrollX = 0;
-
-	// Build the initial jungle scene and fade it in
-	_vm->_room->buildScreen();
-	_vm->copyBF2Vid();
-	screen.fadeIn();
-
-	// Set up the player to walk horizontally
-	player._xFlag = 1;
-	player._yFlag = 0;
-	player._moveTo.x = 160;
-	player._playerMove = true;
-
-	_game->_plane._xCount = 2;
-	_xTrack = 10;
-	_yTrack = _zTrack = 0;
-	_xCam = 480;
-	_yCam = 0;
-	_zCam = 80;
-
-	TimerEntry *te = &_vm->_timers[24];
-	te->_initTm = te->_timer = 1;
-	te->_flag++;
-	
-	_pNumObj = 7;
-	for (int i = 0; i < _pNumObj; i++) {
-		_pObject[i] = _vm->_objectsTable[24];
-		_pImgNum[i] = JUNGLE_OBJ[i][0];
-		_pObjX[i] = JUNGLE_OBJ[i][1];
-		_pObjY[i] = JUNGLE_OBJ[i][2];
-		_pObjZ[i] = JUNGLE_OBJ[i][3];
-		_pObjXl[i] = _pObjYl[i] = 0;
-	}
-	
-	while (!_vm->shouldQuit() && !events.isKeyMousePressed() && (player._xFlag != 2)) {
-		_vm->_images.clear();
-		events._vbCount = 6;
-
-		_pImgNum[0] = _game->_plane._xCount;
-		if (_game->_plane._xCount == 2)
-			++_game->_plane._xCount;
-		else
-			--_game->_plane._xCount;
-
-		player.checkMove();
-		player.checkScroll();
-		pan();
-		scrollJWalk();
-
-		while (!_vm->shouldQuit() && events._vbCount > 0) {
-			events.pollEventsAndWait();
-		}
-	}
-
-	_vm->_images.clear();
-	events.showCursor();
-}
-
-void AmazonScripts::mWhileDoOpen() {
-	Screen &screen = *_vm->_screen;
-	EventsManager &events = *_vm->_events;
-
-	screen.setBufferScan();
-	events.hideCursor();
-	screen.forceFadeOut();
-	_game->_skipStart = false;
-	if (_vm->_conversation != 2) {
-		// Cutscene at start of chapter 1
-		screen.setPanel(3);
-		_game->startChapter(1);
-		_game->establishCenter(0, 1);
-	}
-
-	Resource *data = _vm->_files->loadFile(1, 0);
-	_vm->_objectsTable[1] = new SpriteResource(_vm, data);
-	delete data;
-
-	_vm->_files->_setPaletteFlag = false;
-	_vm->_files->loadScreen(1, 2);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-
-	// Load animation data
-	_vm->_animation->freeAnimationData();
-	Resource *animResource = _vm->_files->loadFile(1, 1);
-	_vm->_animation->loadAnimations(animResource);
-	delete animResource;
-
-	_xTrack = 8;
-	_yTrack = -3;
-	_zTrack = 0;
-	_xCam = _yCam = 0;
-	_zCam = 270;
-	_vm->_timers[24]._timer = _vm->_timers[24]._initTm = 1;
-	++_vm->_timers[24]._flag;
-	_vm->_timers.updateTimers();
-
-	_pNumObj = 10;
-	for (int i = 0; i < _pNumObj; i++) {
-		_pObject[i] = _vm->_objectsTable[1];
-		_pImgNum[i] = OPENING_OBJS[i][0];
-		_pObjX[i] = OPENING_OBJS[i][1];
-		_pObjY[i] = OPENING_OBJS[i][2];
-		_pObjZ[i] = OPENING_OBJS[i][3];
-		_pObjXl[i] = _pObjYl[i] = 0;
-	}
-
-	_vm->_oldRects.clear();
-	_vm->_newRects.clear();
-	Animation *anim = _vm->_animation->setAnimation(0);
-	_vm->_animation->setAnimTimer(anim);
-	anim = _vm->_animation->setAnimation(1);
-	_vm->_animation->setAnimTimer(anim);
-	_vm->_sound->newMusic(10, 0);
-	
-	bool startFl = false;
-	while (!_vm->shouldQuit()) {
-		_vm->_images.clear();
-		_vm->_animation->animate(0);
-		_vm->_animation->animate(1);
-		pan();
-		_vm->_buffer2.copyFrom(_vm->_buffer1);
-		_vm->_newRects.clear();
-		_game->plotList();
-		_vm->copyBlocks();
-		if (!startFl) {
-			startFl = true;
-			screen.forceFadeIn();
-		}
-
-		events.pollEventsAndWait();
-
-		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
-			_game->_skipStart = true;
-			_vm->_sound->newMusic(10, 1);
-
-			events.debounceLeft();
-			events.zeroKeys();
-			break;
-		}
-
-		if (_xCam > 680) {
-			events._vbCount = 125;
-			
-			while(!_vm->shouldQuit() && !events.isKeyMousePressed() && events._vbCount > 0) {
-				events.pollEventsAndWait();
-			}
-			break;
-		}
-	}
-	
-	events.showCursor();
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-	
-	_vm->freeCells();
-	_vm->_oldRects.clear();
-	_vm->_newRects.clear();
-	_vm->_numAnimTimers = 0;
-	_vm->_images.clear();
-
-	if (_vm->_conversation == 2) {
-		// Cutscene at end of Chapter 6
-		Resource *spriteData = _vm->_files->loadFile(28, 37);
-		_vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
-		delete spriteData;
-		
-		_vm->_animation->freeAnimationData();
-		animResource = _vm->_files->loadFile(28, 38);
-		_vm->_animation->loadAnimations(animResource);
-		delete animResource;
-	}
-}
-
-void AmazonScripts::scrollRiver() {
-	_vm->copyBF1BF2();
-	_vm->_newRects.clear();
-	_vm->_buffer2.plotImage(_vm->_objectsTable[33], 0, Common::Point(66, 30));
-	_vm->plotList();
-	_vm->copyRects();
-	_vm->copyBF2Vid();
-}
-
-void AmazonScripts::mWhileDownRiver() {
-	_vm->_events->hideCursor();
-	_vm->_screen->setDisplayScan();
-	_vm->_screen->clearScreen();
-	_vm->_screen->savePalette();
-
-	_vm->_files->loadScreen(95, 4);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_screen->restorePalette();
-	_vm->_screen->setPalette();
-	_vm->_screen->setBufferScan();
-	_vm->_screen->_scrollX = 0;
-	_vm->_room->buildScreen();
-	_vm->copyBF2Vid();
-
-	_vm->_player->_scrollAmount = 2;
-	_vm->_destIn = &_vm->_buffer2;
-	_xTrack = -7;
-	_yTrack = _zTrack = 0;
-	_xCam = _yCam = 0;
-	_zCam = 80;
-
-	_game->_timers[24]._timer = 1;
-	_game->_timers[24]._initTm = 1;
-	++_game->_timers[24]._flag;
-	
-	_pNumObj = 14;
-	for (int i = 0; i <_pNumObj; i++) {
-		_pObject[i] = _vm->_objectsTable[33];
-		_pImgNum[i] = DOWNRIVEROBJ[i][0];
-		_pObjX[i] = DOWNRIVEROBJ[i][1];
-		_pObjY[i] = DOWNRIVEROBJ[i][2];
-		_pObjZ[i] = DOWNRIVEROBJ[i][3];
-		_pObjXl[i] = _pObjYl[i] = 0;
-	}
-
-	_game->_timers[3]._timer = 200;
-	_game->_timers[3]._initTm = 200;
-	++_game->_timers[3]._flag;
-	_game->_timers[4]._timer = 350;
-	_game->_timers[4]._initTm = 350;
-	++_game->_timers[4]._flag;
-
-	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
-			(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth)) {
-		_vm->_images.clear();
-		_vm->_events->_vbCount = 6;
-
-		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
-			_vm->_screen->_scrollX -= TILE_WIDTH;
-			++_vm->_screen->_scrollCol;
-			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
-		}
-
-		pan();
-		scrollRiver();
-
-		if (!_game->_timers[3]._flag) {
-			++_game->_timers[3]._flag;
-			_vm->_sound->playSound(1);
-		} else if (!_game->_timers[4]._flag) {
-			++_game->_timers[4]._flag;
-			_vm->_sound->playSound(0);
-		}
-
-		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-			_vm->_events->pollEventsAndWait();
-		}
-	}
-
-	_vm->_events->showCursor();
-}
-
 void AmazonScripts::mWhile(int param1) {
 	switch(param1) {
 	case 1:
 		mWhile1();
 		break;
 	case 2:
-		mWhileFly();
+		_game->_plane.mWhileFly();
 		break;
 	case 3:
-		mWhileFall();
+		_game->_plane.mWhileFall();
 		break;
 	case 4:
-		mWhileJWalk();
+		_game->_jungle.mWhileJWalk();
 		break;
 	case 5:
-		mWhileDoOpen();
+		_game->_opening.mWhileDoOpen();
 		break;
 	case 6:
-		mWhileDownRiver();
+		_game->_river.mWhileDownRiver();
 		break;
 	case 7:
 		mWhile2();
 		break;
 	case 8:
-		mWhileJWalk2();
+		_game->_jungle.mWhileJWalk2();
 		break;
 	default:
 		break;
@@ -899,143 +246,6 @@ void AmazonScripts::loadBackground(int param1, int param2) {
 	_vm->_screen->forceFadeIn();
 }
 
-void AmazonScripts::doCast(int param1) {
-	static const int END_OBJ[26][4] = {
-		{ 0, 118, 210, 10},
-		{ 1,  38, 250, 10},
-		{ 2,  38, 280, 10},
-		{ 3,  38, 310, 10},
-		{ 4,  38, 340, 10},
-		{ 5,  38, 370, 10},
-		{ 6,  38, 400, 10},
-		{ 7,  38, 430, 10},
-		{ 8,  38, 460, 10},
-		{ 9,  38, 490, 10},
-		{10,  38, 520, 10},
-		{11,  38, 550, 10},
-		{12,  38, 580, 10},
-		{13,  38, 610, 10},
-		{14,  38, 640, 10},
-		{15,  38, 670, 10},
-		{16,  38, 700, 10},
-		{17,  38, 730, 10},
-		{18,  38, 760, 10},
-		{19,  38, 790, 10},
-		{20,  95, 820, 10},
-		{21,  94, 850, 10},
-		{22,  96, 880, 10},
-		{23, 114, 910, 10},
-		{24, 114, 940, 10},
-		{25, 110, 970, 10}
-	};
-
-	static const int END_OBJ1[4][4] = {
-		{0,  40, 1100, 10},
-		{2,  11, 1180, 10},
-		{1, 154, 1180, 10},
-		{3, 103, 1300, 10}
-	};
-
-	_vm->_screen->setDisplayScan();
-	_vm->_events->hideCursor();
-	_vm->_screen->forceFadeOut();
-	_vm->_screen->_clipHeight = 173;
-	_vm->_screen->clearScreen();
-	_game->_chapter = 16;
-	_game->tileScreen();
-	_game->updateSummary(param1);
-	_vm->_screen->setPanel(3);
-	_game->_chapter = 14;
-
-	Resource *spriteData = _vm->_files->loadFile(91, 0);
-	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
-	delete spriteData;
-	spriteData = _vm->_files->loadFile(91, 1);
-	_vm->_objectsTable[1] = new SpriteResource(_vm, spriteData);
-	delete spriteData;
-
-	_vm->_files->_setPaletteFlag = false;
-	_vm->_files->loadScreen(58, 1);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-
-	_xTrack = 0;
-	_yTrack = -6;
-	_zTrack = 0;
-	_xCam = _yCam = 0;
-	_zCam = 60;
-
-	_game->_timers[24]._timer = 1;
-	_game->_timers[24]._initTm = 1;
-	++_game->_timers[24]._flag;
-
-	_pNumObj = 26;
-	for (int i = 0; i < _pNumObj; i++) {
-		_pObject[i] = _vm->_objectsTable[0];
-		_pImgNum[i] = END_OBJ[i][0];
-		_pObjX[i] = END_OBJ[i][1];
-		_pObjY[i] = END_OBJ[i][2];
-		_pObjZ[i] = END_OBJ[i][3];
-		_pObjXl[i] = _pObjYl[i] = 0;
-	}
-
-	_pNumObj = 4;
-	for (int i = 0; i < _pNumObj; i++) {
-		_pObject[26 + i] = _vm->_objectsTable[1];
-		_pImgNum[26 + i] = END_OBJ1[i][0];
-		_pObjX[26 + i] = END_OBJ1[i][1];
-		_pObjY[26 + i] = END_OBJ1[i][2];
-		_pObjZ[26 + i] = END_OBJ1[i][3];
-		_pObjXl[26 + i] = _pObjYl[26 + i] = 0;
-	}
-
-	_vm->_oldRects.clear();
-	_vm->_newRects.clear();
-	_vm->_numAnimTimers = 0;
-
-	_vm->_sound->newMusic(58, 0);
-	_vm->_screen->forceFadeIn();
-
-	while (!_vm->shouldQuit()) {
-		_vm->_images.clear();
-		pan();
-		_vm->_buffer2.copyFrom(_vm->_buffer1);
-		_vm->_newRects.clear();
-		_game->plotList();
-		_vm->copyBlocks();
-
-		_vm->_events->pollEvents();
-		if (_vm->_events->isKeyMousePressed())
-			break;
-
-		if (_yCam < -7550) {
-			_vm->_events->_vbCount = 50;
-
-			while(!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() && _vm->_events->_vbCount > 0) {
-				_vm->_events->pollEventsAndWait();
-			}
-
-			while (!_vm->shouldQuit() && !_vm->_sound->checkMidiDone())
-				_vm->_events->pollEventsAndWait();
-
-			break;
-		}
-	}
-
-	_vm->_sound->newMusic(58, 1);
-	_vm->_events->showCursor();
-
-	_vm->freeCells();
-	_vm->_oldRects.clear();
-	_vm->_newRects.clear();
-	_vm->_numAnimTimers = 0;
-	_vm->_images.clear();
-	_vm->_screen->forceFadeOut();
-
-	_vm->quitGame();
-	_vm->_events->pollEvents();
-}
-
 void AmazonScripts::setInactive() {
 	_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
 	_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
@@ -1044,243 +254,6 @@ void AmazonScripts::setInactive() {
 	mWhile(_game->_rawInactiveY);
 }
 
-void AmazonScripts::plotTorchSpear(int indx, const int *&buf) {
-	int idx = indx;
-
-	ImageEntry ie;
-	ie._flags = IMGFLAG_UNSCALED;
-	ie._spritesPtr = _vm->_objectsTable[62];
-	ie._frameNumber = buf[(idx / 2)];
-	ie._position = Common::Point(_game->_pitPos.x + buf[(idx / 2) + 1], _game->_pitPos.y + buf[(idx / 2) + 2]);
-	ie._offsetY = 255;
-	_vm->_images.addToList(ie);
-}
-
-void AmazonScripts::plotPit(int indx, const int *&buf) {
-	int idx = indx;
-	ImageEntry ie;
-	ie._flags = IMGFLAG_UNSCALED;
-	ie._spritesPtr = _vm->_objectsTable[62];
-	ie._frameNumber = buf[(idx / 2)];
-	ie._position = Common::Point(_game->_pitPos.x, _game->_pitPos.y);
-	ie._offsetY = _game->_pitPos.y;
-	_vm->_images.addToList(ie);
-
-	_vm->_player->_rawPlayer = _game->_pitPos;
-	if (_vm->_inventory->_inv[76]._value == 1) {
-		idx = _game->_torchCel;
-		buf = Amazon::TORCH;
-		_vm->_timers[14]._flag = 1;
-		idx += 6;
-		if (buf[idx / 2] == -1)
-			idx = 0;
-		_game->_torchCel = idx;
-		plotTorchSpear(idx, buf);
-	} else if (!_game->_stabFl && (_vm->_inventory->_inv[78]._value == 1)) {
-		idx = 0;
-		buf = Amazon::SPEAR;
-		plotTorchSpear(idx, buf);
-	}
-}
-
-int AmazonScripts::antHandleRight(int indx, const int *&buf) {
-	int retval = indx;
-	if (_game->_pitDirection == NONE) {
-		_game->_pitDirection = UP;
-		_game->_pitPos.y = 127;
-	}
-	retval = _game->_pitCel;
-	buf = Amazon::PITWALK;
-	if (_game->_pitPos.x < 230) {
-		if (retval == 0) {
-			retval = 48;
-			_game->_pitPos.y = 127;
-		}
-		retval -= 6;
-		_game->_pitPos.x -= buf[(retval / 2) + 1];
-		_game->_pitPos.y -= buf[(retval / 2) + 2];
-		_game->_pitCel = retval;
-	}
-	return retval;
-}
-
-int AmazonScripts::antHandleLeft(int indx, const int *&buf) {
-	int retval = indx;
-	if (_game->_pitDirection == UP) {
-		_game->_pitDirection = NONE;
-		_game->_pitPos.y = 127;
-	}
-	retval = _game->_pitCel;
-	buf = Amazon::PITWALK;
-	retval += 6;
-	if (buf[retval / 2] == -1) {
-		retval = 0;
-		_game->_pitPos.y = 127;
-	}
-	_game->_pitPos.x += buf[(retval / 2) + 1];
-	_game->_pitPos.y += buf[(retval / 2) + 2];
-	_game->_pitCel = retval;
-
-	return retval;
-}
-
-int AmazonScripts::antHandleStab(int indx, const int *&buf) {
-	int retval = indx;
-	if (_vm->_inventory->_inv[78]._value != 1) {
-		if (_game->_stabFl) {
-			buf = Amazon::PITSTAB;
-			retval = _game->_stabCel;
-			if (_game->_timers[13]._flag == 0) {
-				_game->_timers[13]._flag = 1;
-				retval += 6;
-				if (Amazon::PITSTAB[retval] == -1) {
-					_game->_stabFl = false;
-					_game->_pitCel = 0;
-					_game->_pitPos.y = 127;
-					retval = 0;
-					buf = Amazon::PITWALK;
-				} else {
-					_game->_pitPos.x += buf[(retval / 2) + 1];
-					_game->_pitPos.y += buf[(retval / 2) + 2];
-					_game->_pitCel = retval;
-				}
-			}
-		} else {
-			_game->_stabFl = true;
-			_game->_pitCel = 0;
-			retval = 0;
-			_game->_stabCel = 0;
-			int dist = _game->_pitPos.x - _game->_antPos.x;
-			if (_game->_antEatFl && !_game->_antDieFl && (dist <= 80)) {
-				_game->_antDieFl = true;
-				_game->_antCel = 0;
-				_game->_antPos.y = 123;
-				_vm->_sound->playSound(1);
-			}
-		}
-	}
-	return retval;
-}
-
-void AmazonScripts::ANT() {
-	_game->_antDirection = NONE;
-	if (_game->_aniFlag != 1) {
-		_game->_aniFlag = 1;
-		_game->_antCel = 0;
-		_game->_torchCel = 0;
-		_game->_pitCel = 0;
-
-		_game->_timers[15]._timer = 16;
-		_game->_timers[15]._initTm = 16;
-		_game->_timers[15]._flag = 1;
-
-		_game->_timers[13]._timer = 5;
-		_game->_timers[13]._initTm = 5;
-		_game->_timers[13]._flag = 1;
-
-		_game->_timers[14]._timer = 10;
-		_game->_timers[14]._initTm = 10;
-		_game->_timers[14]._flag = 1;
-
-		_game->_antPos = Common::Point(-40, 123);
-		_game->_antDieFl = _game->_antEatFl = false;
-		_game->_stabFl = false;
-		_game->_pitPos = Common::Point(_vm->_player->_rawPlayer.x, 127);
-	}
-
-	const int *buf = nullptr;
-	if (_game->_antDieFl) {
-		buf = Amazon::ANTDIE;
-	} else if (_game->_antEatFl) {
-		buf = Amazon::ANTEAT;
-	} else if (_game->_antPos.x > 120 && _vm->_flags[198] == 1) {
-		_game->_antEatFl = true;
-		_vm->_flags[235] = 1;
-		_game->_antCel = 0;
-		buf = Amazon::ANTEAT;
-	} else {
-		buf = Amazon::ANTWALK;
-		if (_vm->_inventory->_inv[76]._value == 1)
-			_game->_antDirection = UP;
-	}
-
-	int idx = _game->_antCel;
-	if (_game->_timers[15]._flag == 0) {
-		_game->_timers[15]._flag = 1;
-		if (_game->_antDirection == UP) {
-			if (_game->_antPos.x > 10) {
-				if (idx == 0)
-					idx = 36;
-				else
-					idx -= 6;
-
-				_game->_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
-				_game->_antCel = idx;
-			}
-		} else {
-			idx += 6;
-			if (buf[(idx / 2)] != -1) {
-				_game->_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
-				_game->_antCel = idx;
-			} else if (!_game->_antDieFl) {
-				idx = 0;
-				_game->_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
-				_game->_antCel = idx;
-			} else {
-				idx -= 6;
-				if (_game->_flags[200] == 0)
-					_game->_flags[200] = 1;
-			}
-		}
-	}
-
-	ImageEntry ie;
-	ie._flags = IMGFLAG_UNSCALED;
-	ie._spritesPtr = _vm->_objectsTable[61];
-	ie._frameNumber = buf[(idx / 2)];
-	ie._position = Common::Point(_game->_antPos.x, _game->_antPos.y);
-	ie._offsetY = _game->_antPos.y - 70;
-	_vm->_images.addToList(ie);
-	_game->_antCel = idx;
-
-	if (_game->_flags[196] != 1) {
-		idx = _game->_pitCel;
-		if (_game->_stabFl == 1) {
-			idx = antHandleStab(idx, buf);
-		} else {
-			buf = Amazon::PITWALK;
-			if (_game->_timers[13]._flag == 0) {
-				_game->_timers[13]._flag = 1;
-				_vm->_events->pollEvents();
-				if (_vm->_events->_leftButton) {
-					Common::Point pt = _vm->_events->calcRawMouse();
-					if (pt.x < _game->_pitPos.x)
-						idx = antHandleLeft(idx, buf);
-					else if (pt.x > _game->_pitPos.x)
-						idx = antHandleRight(idx, buf);
-				} else {
-					buf = Amazon::PITWALK;
-					if (_vm->_player->_playerDirection == UP)
-						idx = antHandleStab(idx, buf);
-					else if (_vm->_player->_playerDirection == LEFT)
-						idx = antHandleLeft(idx, buf);
-					else if (_vm->_player->_playerDirection == RIGHT)
-						idx = antHandleRight(idx, buf);
-				}
-			}
-		}
-		plotPit(idx, buf);
-	}
-
-	if (!_game->_antDieFl) {
-		int dist = _game->_pitPos.x - _game->_antPos.x;
-		if ((_game->_antEatFl && (dist <= 45)) || (!_game->_antEatFl && (dist <= 80))) {
-			_game->_flags[199] = 1;
-			_game->_aniFlag = 0;
-		}
-	}
-}
-
 void AmazonScripts::boatWalls(int param1, int param2) {
 	if (param1 == 1)
 		_vm->_room->_plotter._walls[42] = Common::Rect(96, 27, 96 + 87, 27 + 42);
@@ -1339,473 +312,6 @@ void AmazonScripts::plotInactive() {
 	_vm->_images.addToList(_game->_inactive);
 }
 
-void AmazonScripts::setRiverPan() {
-	static const int RIVER1OBJ[23][4] = {
-		{18,   -77,  0, 30},
-		{18,  -325,  0, 20},
-		{18,  -450,  0, 15},
-		{18, -1250,  0, 25},
-		{19,  -130,  0, 20},
-		{19,  -410,  0, 15},
-		{19,  -710,  0, 25},
-		{19, -1510,  0, 20},
-		{20,  -350,  0, 30},
-		{20,  -695,  0, 25},
-		{20,  -990,  0, 20},
-		{20, -1300,  0, 25},
-		{20, -1600,  0, 30},
-		{21,  -370,  0, 20},
-		{21,  -650,  0, 30},
-		{21, -1215,  0, 40},
-		{21, -1815,  0, 35},
-		{22,  -380,  0, 25},
-		{22,  -720,  0, 35},
-		{22, -1020,  0, 30},
-		{22, -1170,  0, 25},
-		{22, -1770,  0, 35},
-		{23,  -500, 63, 20}
-	};
-
-	int delta = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
-
-	_xTrack = 9;
-	_yTrack = _zTrack = 0;
-	_xCam = 160;
-	_yCam = 0;
-	_zCam = 80;
-
-	_game->_timers[24]._timer = 1;
-	_game->_timers[24]._initTm = 1;
-	++_game->_timers[24]._flag;
-
-	_pNumObj = 23;
-	for (int i = 0; i < _pNumObj; i++) {
-		_pObject[i] = _vm->_objectsTable[45];
-		_pImgNum[i] = RIVER1OBJ[i][0];
-		_pObjX[i] = RIVER1OBJ[i][1] + delta;
-		_pObjY[i] = RIVER1OBJ[i][2];
-		_pObjZ[i] = RIVER1OBJ[i][3];
-		_pObjXl[i] = _pObjYl[i] = 0;
-	}
-}
-
-void AmazonScripts::initRiver() {
-	static const int RIVERVXTBL[3] = {6719, 7039, 8319};
-
-	_vm->_events->centerMousePos();
-	_vm->_events->restrictMouse();
-	_vm->_screen->setDisplayScan();
-	_vm->_screen->clearScreen();
-	_vm->_screen->savePalette();
-	_vm->_screen->forceFadeOut();
-
-	_vm->_files->_setPaletteFlag = false;
-	_vm->_files->loadScreen(95, 4);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-
-	_vm->_screen->restorePalette();
-	_vm->_screen->setBufferScan();
-	_vm->_destIn = &_vm->_buffer2;
-	_vm->_room->roomMenu();
-
-	if (_game->_saveRiver) {
-		// Restoring a savegame, so set properties from saved fields
-		_vm->_screen->_scrollRow = _vm->_rScrollRow;
-		_vm->_screen->_scrollCol = _vm->_rScrollCol;
-		_vm->_screen->_scrollX = _vm->_rScrollX;
-		_vm->_screen->_scrollY = _vm->_rScrollY;
-	} else {
-		// Set initial scene state
-		_vm->_screen->_scrollRow = 0;
-		_vm->_screen->_scrollCol = 140;
-		_vm->_screen->_scrollX = 0;
-		_vm->_screen->_scrollY = 0;
-	}
-
-	_vm->_room->buildScreen();
-	_vm->copyBF2Vid();
-	_vm->_screen->forceFadeIn();
-
-	if (_game->_saveRiver) {
-		// Restore draw rects from savegame
-		_vm->_oldRects.resize(_vm->_rOldRectCount);
-		_vm->_newRects.resize(_vm->_rNewRectCount);
-		// KEYFLG = _vm->_rKeyFlag
-	} else {
-		// Reset draw rects
-		_vm->_oldRects.clear();
-		_vm->_newRects.clear();
-		// KEYFLG = 0
-	}
-
-	_vm->_player->_scrollAmount = 2;
-	setRiverPan();
-	_game->_timers[3]._timer = 1;
-	_game->_timers[3]._initTm = 1;
-	++_game->_timers[3]._flag;
-
-	_game->_canoeFrame = 0;
-	_game->_mapPtr = (const byte *)MAPTBL[_game->_riverFlag] + 1;
-	if (_game->_saveRiver) {
-		_game->_mapPtr--;
-		_game->_mapPtr += _game->_mapOffset;
-	} else {
-		_screenVertX = RIVERVXTBL[_game->_riverFlag] - 320;
-		_game->_canoeLane = 3;
-		_game->_hitCount = 0;
-		_game->_hitSafe = 0;
-		_game->_canoeYPos = 71;
-	}
-
-	_game->_riverIndex = _game->_riverFlag;
-	_game->_topList = RIVEROBJECTTBL[_game->_riverIndex];
-	updateObstacles();
-	riverSetPhysX();
-	_game->_canoeDir = 0;
-	_game->_deathFlag = 0;
-	_game->_deathCount = 0;
-
-	_game->_timers[11]._timer = 1200;
-	_game->_timers[11]._initTm = 1200;
-	++_game->_timers[11]._flag;
-	_game->_timers[12]._timer = 1500;
-	_game->_timers[12]._initTm = 1500;
-	++_game->_timers[12]._flag;
-	
-	_game->_maxHits = 2 - _game->_riverFlag;
-	_game->_saveRiver = false;
-}
-
-void AmazonScripts::resetPositions() {
-	riverSetPhysX();
-	int val = (_vm->_screen->_scrollCol + 1 - _game->_oldScrollCol) * 16;
-	if (val > 256) {
-		val &= 0x7F;
-		val |= 0x80;
-	}
-
-	for (int i = 0; i < _pNumObj; i++)
-		_pObjX[i] += val;
-}
-
-void AmazonScripts::checkRiverPan() {
-	int val = (_vm->_screen->_scrollCol + 20) * 16;
-
-	for (int i = 0; i < _pNumObj; i++) {
-		if (_pObjX[i] < val)
-			return;
-	}
-
-	setRiverPan();
-}
-
-bool AmazonScripts::riverJumpTest() {
-	if (_vm->_screen->_scrollCol == 120 || _vm->_screen->_scrollCol == 60 || _vm->_screen->_scrollCol == 0) {
-		int val = _game->_mapPtr[0];
-		++_game->_mapPtr;
-		if (val == 0xFF)
-			return true;
-		_game->_oldScrollCol = _vm->_screen->_scrollCol;
-
-		if (val == 0) {
-			_vm->_screen->_scrollCol = 139;
-			_vm->_screen->_scrollX = 14;
-			_vm->_room->buildScreen();
-			resetPositions();
-			return false;
-		}
-	} else if (_vm->_screen->_scrollCol == 105) {
-		int val1 = _game->_mapPtr[1];
-		int val2 = _game->_mapPtr[2];
-		_game->_mapPtr += 3;
-		if (_game->_canoeLane < 3) {
-			if (val1 != 0) {
-				_game->_deathFlag = true;
-				_game->_deathCount = 300;
-				_game->_deathType = val2;
-			}
-		} else {
-			if (val1 != 1) {
-				_game->_deathFlag = true;
-				_game->_deathCount = 300;
-				_game->_deathType = val2;
-			}
-			_game->_oldScrollCol = _vm->_screen->_scrollCol;
-			_vm->_screen->_scrollCol = 44;
-			_vm->_screen->_scrollX = 14;
-			_vm->_room->buildScreen();
-			resetPositions();
-			return false;
-		}
-	}
-
-	_vm->_screen->_scrollX = 14;
-	--_vm->_screen->_scrollCol;
-	_vm->_buffer1.moveBufferRight();
-	_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
-	checkRiverPan();
-	return false;
-}
-
-void AmazonScripts::riverSound() {
-	if (_game->_timers[11]._flag == 0) {
-		++_game->_timers[11]._flag;
-		_vm->_sound->playSound(2);
-	}
-
-	if (_game->_timers[12]._flag == 0) {
-		++_game->_timers[12]._flag;
-		_vm->_sound->playSound(3);
-	}
-
-	if ((_xCam >= 1300) && (_xCam <= 1320))
-		_vm->_sound->playSound(1);
-}
-
-void AmazonScripts::moveCanoe() {
-	Screen &screen = *_vm->_screen;
-	EventsManager &events = *_vm->_events;
-	Common::Point pt = events.calcRawMouse();
-
-	// Do an event polling
-	_vm->_canSaveLoad = true;
-	events.pollEvents();
-	_vm->_canSaveLoad = false;
-	if (_vm->_room->_function == FN_CLEAR1)
-		return;
-
-	if (_game->_canoeDir) {
-		// Canoe movement in progress
-		moveCanoe2();
-	} else {
-		if (events._leftButton && pt.y >= 140) {
-			if (pt.x < RMOUSE[8][0]) {
-				// Disk icon wasn't clicked
-				printString(BAR_MESSAGE);
-			} else {
-				// Clicked on the Disc icon
-				_game->_saveRiver = true;
-				_game->_rScrollRow = screen._scrollRow;
-				_game->_rScrollCol = screen._scrollCol;
-				_game->_rScrollX = screen._scrollX;
-				_game->_rScrollY = screen._scrollY;
-				_game->_mapOffset = _game->_mapPtr - MAPTBL[_game->_riverFlag];
-
-				// Show the ScummVM menu
-				_vm->_room->handleCommand(9);
-
-				if (_vm->_room->_function != FN_CLEAR1) {
-					_game->_saveRiver = false;
-					_vm->_room->buildScreen();
-					_vm->copyBF2Vid();
-				}
-			}
-		} else if ((events._leftButton && pt.y <= _game->_canoeYPos) ||
-			(!events._leftButton && _vm->_player->_move == UP)) {
-			// Move canoe up
-			if (_game->_canoeLane > 0) {
-				_game->_canoeDir = -1;
-				_game->_canoeMoveCount = 0;
-
-				moveCanoe2();
-			}
-		} else if (events._leftButton || _vm->_player->_move == DOWN) {
-			// Move canoe down
-			if (_game->_canoeLane < 7) {
-				_game->_canoeDir = 1;
-				_game->_canoeMoveCount = 0;
-
-				moveCanoe2();
-			}
-		}
-	}
-}
-
-void AmazonScripts::moveCanoe2() {
-	_game->_canoeYPos += _game->_canoeDir;
-
-	if (++_game->_canoeMoveCount == 5) {
-		_game->_canoeLane += _game->_canoeDir;
-		_game->_canoeDir = 0;
-	}
-}
-
-void AmazonScripts::updateObstacles() {
-	RiverStruct *cur;
-	for (cur = _game->_topList; cur < RIVEROBJECTTBL[_game->_riverIndex + 1]; ++cur) {
-		int val = cur->_field1 + cur->_field3 - 1;
-		if (val < _screenVertX)
-			break;
-
-		if (cur->_field3 < (_game->_screenVirtX + 319)) {
-			_game->_topList = cur;
-			_game->_botList = cur;
-
-			while (cur < RIVEROBJECTTBL[_game->_riverIndex + 1]) {
-				++cur;
-				val = cur->_field1 + cur->_field3 - 1;
-				if (val < _screenVertX || (cur->_field3 >= (_game->_screenVirtX + 319)))
-					break;
-
-				_game->_botList = cur;
-			}
-
-			return;
-		}
-	}
-
-	cur = _game->_topList;
-	cur--;
-	_game->_botList = cur;
-}
-
-void AmazonScripts::riverSetPhysX() {
-	int val = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
-	RiverStruct *cur = _game->_topList;
-	while (cur <= _game->_botList) {
-		cur[0]._field5 = val - (_screenVertX - cur[0]._field3);
-		++cur;
-	}
-}
-
-bool AmazonScripts::checkRiverCollide() {
-	if (_game->_hitSafe)
-		return false;
-
-	_game->_canoeVXPos = _screenVertX + 170;
-
-	for (RiverStruct *si = _game->_topList; si <= _game->_botList; ++si) {
-		if (si[0]._lane < _game->_canoeLane)
-			continue;
-
-		if ((si[0]._lane == _game->_canoeLane) || (si[0]._lane == _game->_canoeLane + 1)) {
-			if (si[0]._field1 + si[0]._field3 - 1 >= _game->_canoeVXPos) {
-				if (_game->_canoeVXPos + 124 >= si[0]._field3) {
-					_vm->_sound->playSound(4);
-					return true;
-				}
-			}
-		}
-	}
-	return false;
-}
-
-void AmazonScripts::plotRiver() {
-	if (_vm->_timers[3]._flag == 0) {
-		++_vm->_timers[3]._flag;
-		if (_game->_canoeFrame == 12)
-			_game->_canoeFrame = 0;
-		else
-			++_game->_canoeFrame;
-	}
-
-	ImageEntry ie;
-	ie._flags = IMGFLAG_UNSCALED;
-	ie._spritesPtr = _vm->_objectsTable[45];
-	ie._frameNumber = _game->_canoeFrame;
-	ie._position.x = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX + 160;
-	ie._position.y = _game->_canoeYPos - 41;
-	ie._offsetY = 41;
-	_vm->_images.addToList(ie);
-
-	RiverStruct *cur = _game->_topList;
-	while (cur <= _game->_botList) {
-		if (cur[0]._id != -1) {
-			ie._flags = IMGFLAG_UNSCALED;
-			ie._spritesPtr = _vm->_objectsTable[45];
-			ie._frameNumber = 0;
-			ie._position.x = cur[0]._field5;
-			int val = (cur[0]._lane * 5) + 56;
-			ie._position.y = val - cur[0]._field8;
-			ie._offsetY = cur[0]._field8;
-			_vm->_images.addToList(ie);
-		}
-		++cur;
-	}
-}
-
-void AmazonScripts::scrollRiver1() {
-	_vm->copyBF1BF2();
-	_vm->_newRects.clear();
-	plotRiver();
-	_vm->plotList();
-	_vm->copyRects();
-	_vm->copyBF2Vid();
-}
-
-void AmazonScripts::RIVER() {
-	static const int RIVERDEATH[5] = {22, 23, 24, 25, 26};
-
-	initRiver();
-	_vm->_events->showCursor();
-
-	while (!_vm->shouldQuit()) {
-		_vm->_events->_vbCount = 4;
-
-//		int bx = _vm->_player->_scrollAmount - _screenVertX;
-		if (_vm->_screen->_scrollX == 0) {
-			_vm->_sound->midiRepeat();
-			if (riverJumpTest()) {
-				_CHICKENOUTFLG = false;
-				return;
-			}
-		} else {
-			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
-		}
-
-		if (_CHICKENOUTFLG) {
-			_CHICKENOUTFLG = false;
-			return;
-		}
-
-		_vm->_images.clear();
-		_vm->_animation->animate(0);
-
-		riverSound();
-		pan();
-		moveCanoe();
-
-		if (_vm->_room->_function != FN_CLEAR1) {
-			updateObstacles();
-			riverSetPhysX();
-			bool checkCollide = checkRiverCollide();
-			if (_game->_hitSafe != 0)
-				_game->_hitSafe -= 2;
-
-			if (checkCollide) {
-				cmdDead(RIVERDEATH[0]);
-				return;
-			}
-
-			if (_game->_deathFlag) {
-				_game->_deathCount--;
-				if (_game->_deathCount == 0) {
-					cmdDead(RIVERDEATH[_game->_deathType]);
-					return;
-				}
-			}
-
-			// Scroll the river
-			scrollRiver1();
-
-			// Allow time for new scrolled river position to be shown
-			_vm->_canSaveLoad = true;
-			while (!_vm->shouldQuit() && _vm->_room->_function == FN_NONE &&
-					_vm->_events->_vbCount > 0) {
-				_vm->_events->pollEventsAndWait();
-			}
-			_vm->_canSaveLoad = false;
-		}
-
-		if (_vm->_room->_function == FN_CLEAR1) {
-			_endFlag = true;
-			_returnCode = 0;
-			_CHICKENOUTFLG = false;
-			break;
-		}
-	}
-}
-
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
 	case 1:
@@ -1815,7 +321,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		loadBackground(param1, param2);
 		break;
 	case 3:
-		doCast(param1);
+		_game->_cast.doCast(param1);
 		break;
 	case 4:
 		setInactive();
@@ -1824,7 +330,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		mWhile(param1);
 		break;
 	case 9:
-		_game->_guard.guard();
+		_game->_guard.doGuard();
 		break;
 	case 10:
 		_vm->_sound->newMusic(param1, param2);
@@ -1833,10 +339,10 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		plotInactive();
 		break;
 	case 13:
-		RIVER();
+		_game->_river.river();
 		break;
 	case 14:
-		ANT();
+		_game->_ant.doAnt();
 		break;
 	case 15:
 		boatWalls(param1, param2);
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index bd47e9ce5b..968d51e2c4 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -35,72 +35,15 @@ class AmazonEngine;
 class AmazonScripts: public Scripts {
 private:
 	AmazonEngine *_game;
-	int _xTrack;
-	int _yTrack;
-	int _zTrack;
-	int _xCam;
-	int _yCam;
-	int _zCam;
-	int _pNumObj;
-	int _screenVertX;
-	bool _CHICKENOUTFLG;
-
-	SpriteResource *_pObject[32];
-	int _pImgNum[32];
-	int _pObjX[32];
-	int _pObjY[32];
-	int _pObjZ[32];
-	int _pObjXl[32];
-	int _pObjYl[32];
-
-	int _jCnt[3];
-	int _jungleX[3];
-
-	void pan();
-
 protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2);
 	virtual void executeCommand(int commandIndex);
 
-	void doFlyCell();
-	void doFallCell();
-	void scrollFly();
-	void scrollFall();
-	void scrollJWalk();
 	void cLoop();
 	void mWhile1();
 	void mWhile2();
-	void mWhileFly();
-	void mWhileFall();
-	void mWhileJWalk();
-	void initJWalk2();
-	void jungleMove();
-	void mWhileJWalk2();
-	void scrollRiver();
-	void mWhileDownRiver();
 	void mWhile(int param1);
-	void plotTorchSpear(int indx, const int *&buf);
-	void plotPit(int indx, const int *&buf);
-	int antHandleRight(int indx, const int *&buf);
-	int antHandleLeft(int indx, const int *&buf);
-	int antHandleStab(int indx, const int *&buf);
-	void ANT();
-	void doCast(int param1);
 	void loadBackground(int param1, int param2);
-	void initRiver();
-	void resetPositions();
-	void checkRiverPan();
-	bool riverJumpTest();
-	void riverSound();
-	void moveCanoe();
-	void moveCanoe2();
-	void updateObstacles();
-	void riverSetPhysX();
-	bool checkRiverCollide();
-	void plotRiver();
-	void scrollRiver1();
-	void setRiverPan();
-	void RIVER();
 	void plotInactive();
 	void setInactive();
 	void boatWalls(int param1, int param2);
@@ -114,8 +57,6 @@ protected:
 	void CMDRETFLASH();
 public:
 	AmazonScripts(AccessEngine *vm);
-
-	void mWhileDoOpen();
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/martian/martian_game.h b/engines/access/martian/martian_game.h
index a99ece67cf..e46b2bb0fd 100644
--- a/engines/access/martian/martian_game.h
+++ b/engines/access/martian/martian_game.h
@@ -63,6 +63,8 @@ protected:
 	 * Play the game
 	 */
 	virtual void playGame();
+
+	virtual void dead(int deathId) {}
 public:
 	MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc);
 
diff --git a/engines/access/module.mk b/engines/access/module.mk
index 98464014ba..b6961aeca9 100644
--- a/engines/access/module.mk
+++ b/engines/access/module.mk
@@ -22,6 +22,7 @@ MODULE_OBJS := \
 	sound.o \
 	video.o \
 	amazon/amazon_game.o \
+	amazon/amazon_logic.o \
 	amazon/amazon_player.o \
 	amazon/amazon_resources.o \
 	amazon/amazon_room.o \
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index b945b76600..2313ed266e 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -751,7 +751,7 @@ bool Player::scrollDown() {
 bool Player::scrollLeft() {
 	Screen &screen = *_vm->_screen;
 	_scrollAmount = -(screen._clipWidth - _playerX - _scrollThreshold);
-	if ((_vm->_rScrollCol + screen._vWindowWidth) == _vm->_room->_playFieldWidth) {
+	if ((screen._scrollCol + screen._vWindowWidth) == _vm->_room->_playFieldWidth) {
 		_scrollEnd = 2;
 		screen._scrollX = 0;
 		_scrollFlag = true;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 72650f472c..add461eb81 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -784,76 +784,9 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::cmdDead(int deathId) {
-	_vm->_events->hideCursor();
-	_vm->_screen->forceFadeOut();
-	cmdFreeSound();
-
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_files->loadFile(98, 44), 1));
-
-	_vm->_screen->clearScreen();
-	_vm->_screen->setPanel(3);
-
-	if (deathId != 10) {
-		_vm->_sound->newMusic(62, 0);
-		_vm->_files->_setPaletteFlag = false;
-		_vm->_files->loadScreen(94, 0);
-		_vm->_files->_setPaletteFlag = true;
-		_vm->_buffer2.copyFrom(*_vm->_screen);
-
-		for (int i = 0; i < 3; ++i) {
-			_vm->_sound->playSound(0);
-			_vm->_screen->forceFadeIn();
-			_vm->_sound->playSound(0);
-			_vm->_screen->forceFadeOut();
-		}
-		_vm->freeCells();
-
-		// Load the cell list for the death screen
-		DeathEntry &de = _vm->_deaths[deathId];
-		Common::Array<CellIdent> cells;
-		cells.push_back(_vm->_deaths._cells[de._screenId]);
-		_vm->loadCells(cells);
-
-		_vm->_screen->setDisplayScan();
-		_vm->_files->_setPaletteFlag = false;
-		_vm->_files->loadScreen(&_vm->_buffer2, 94, 1);
-		_vm->_screen->setIconPalette();
-
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(105, 25));
-		_vm->_buffer2.copyTo(_vm->_screen);
-		_vm->_screen->forceFadeIn();
-
-		_vm->_fonts._charSet._hi = 10;
-		_vm->_fonts._charSet._lo = 1;
-		_vm->_fonts._charFor._lo = 55;
-		_vm->_fonts._charFor._hi = 255;
-		_vm->_screen->_maxChars = 46;
-		_vm->_screen->_printOrg = Common::Point(20, 155);
-		_vm->_screen->_printStart = Common::Point(20, 155);
-
-		Common::String &msg = de._msg;
-		_vm->_printEnd = 180;
-		_vm->printText(_vm->_screen, msg);
-		_vm->_screen->forceFadeOut();
-
-		_vm->_sound->newMusic(0, 1);
-		_vm->_events->showCursor();
-		_vm->_room->clearRoom();
-		_vm->freeChar();
-
-		warning("TODO: restart game");
-		_vm->quitGame();
-		_vm->_events->pollEvents();
-	} else {
-		_vm->quitGame();
-		_vm->_events->pollEvents();
-	}
-}
-
 void Scripts::cmdDead() { 
 	int deathId = _data->readByte();
-	cmdDead(deathId);
+	_vm->dead(deathId);
 }
 
 void Scripts::cmdFadeOut() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index b6a3dc4dd9..098fd4f322 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -47,11 +47,6 @@ protected:
 	virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
 	virtual void executeCommand(int commandIndex);
 
-	/**
-	 * Print a given message to the screen in a bubble box
-	 */
-	void printString(const Common::String &msg);
-
 	/**
 	 * Read a null terminated string from the script
 	 */
@@ -120,7 +115,6 @@ protected:
 	void cmdPlayerOff();
 	void cmdPlayerOn();
 	void cmdDead();
-	void cmdDead(int deathId);
 	void cmdFadeOut();
 	void cmdEndVideo();
 public:
@@ -146,6 +140,11 @@ public:
 
 	void findNull();
 
+	/**
+	 * Print a given message to the screen in a bubble box
+	 */
+	void printString(const Common::String &msg);
+
 	// Script commands that need to be public
 	void cmdFreeSound();
 	void cmdRetPos();
-- 
cgit v1.2.3


From 01e9214c7d98f1b64597d943b35ac8efb3069c47 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 21:12:59 -0500
Subject: ACCESS: Only save river scene fields when actually in the river scene

I'm still not happy everything needed is being synchronised, so this
way we can work on it further without upsetting other Amazon saves
---
 engines/access/amazon/amazon_logic.cpp | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index cae3373ea8..547026560c 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1546,22 +1546,24 @@ void River::river() {
 	}
 }
 void River::synchronize(Common::Serializer &s) {
-	s.syncAsSint16LE(_canoeLane);
-	s.syncAsSint16LE(_canoeYPos);
-	s.syncAsSint16LE(_hitCount);
-	s.syncAsSint16LE(_riverIndex);
-	s.syncAsSint16LE(_hitSafe);
-	s.syncAsUint16LE(_rScrollRow);
-	s.syncAsUint16LE(_rScrollCol);
-	s.syncAsSint16LE(_rScrollX);
-	s.syncAsSint16LE(_rScrollY);
-	s.syncAsUint16LE(_rOldRectCount);
-	s.syncAsUint16LE(_rNewRectCount);
-	s.syncAsUint16LE(_rKeyFlag);
-	s.syncAsUint16LE(_mapOffset);
-	s.syncAsUint16LE(_screenVirtX);
-	warning("TODO: 	s.syncAsSint16LE(_topList);");
-	warning("TODO: 	s.syncAsSint16LE(_botList);");
+	if (_vm->_player->_roomNumber == 45) {
+		s.syncAsSint16LE(_canoeLane);
+		s.syncAsSint16LE(_canoeYPos);
+		s.syncAsSint16LE(_hitCount);
+		s.syncAsSint16LE(_riverIndex);
+		s.syncAsSint16LE(_hitSafe);
+		s.syncAsUint16LE(_rScrollRow);
+		s.syncAsUint16LE(_rScrollCol);
+		s.syncAsSint16LE(_rScrollX);
+		s.syncAsSint16LE(_rScrollY);
+		s.syncAsUint16LE(_rOldRectCount);
+		s.syncAsUint16LE(_rNewRectCount);
+		s.syncAsUint16LE(_rKeyFlag);
+		s.syncAsUint16LE(_mapOffset);
+		s.syncAsUint16LE(_screenVirtX);
+		warning("TODO: 	s.syncAsSint16LE(_topList);");
+		warning("TODO: 	s.syncAsSint16LE(_botList);");
+	}
 }
 
 /*------------------------------------------------------------------------*/
-- 
cgit v1.2.3


From 21519194348425f988f9a78c3748bc596bb1ac61 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 21:19:43 -0500
Subject: ACCESS: Remove accidental resetting of _vm pointers

---
 engines/access/amazon/amazon_logic.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 547026560c..8df28ae85e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -616,7 +616,6 @@ void Jungle::scrollJWalk() {
 /*------------------------------------------------------------------------*/
 
 Guard::Guard(AmazonEngine *vm): PannedScene(vm) {
-	_vm = nullptr;
 	_guardCel = 0;
 	_gCode1 = _gCode2 = 0;
 	_xMid = _yMid = 0;
@@ -1004,7 +1003,6 @@ void Cast::doCast(int param1) {
 /*------------------------------------------------------------------------*/
 
 River::River(AmazonEngine *vm): PannedScene(vm) {
-	_vm = nullptr;
 	_CHICKENOUTFLG = false;
 	_rScrollRow = 0;
 	_rScrollCol = 0;
-- 
cgit v1.2.3


From b478b05df2ac62425fc01ea7ad13899c50404166 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 22:12:45 -0500
Subject: ACCESS: Move _saveRiver from engine to River class

---
 engines/access/amazon/amazon_game.cpp  |  1 -
 engines/access/amazon/amazon_game.h    |  1 -
 engines/access/amazon/amazon_logic.cpp | 15 +++++++++------
 engines/access/amazon/amazon_logic.h   |  1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 55876b5692..b6c538542e 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -43,7 +43,6 @@ AccessEngine(syst, gameDesc),
 	_skipStart = false;
 	_charSegSwitch = false;
 
-	_saveRiver = false;
 	_oldTitleChapter = _chapter = 0;
 	_updateChapter = -1;
 	_rawInactiveX = 0;
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index b09c96d263..d697b16c93 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -86,7 +86,6 @@ public:
 	InactivePlayer _inactive;
 	bool _charSegSwitch;
 	bool _skipStart;
-	bool _saveRiver;
 
 	// Fields that are mapped to flags
 	int &_guardLocation;
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 8df28ae85e..3ecb20d974 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1013,6 +1013,7 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_rKeyFlag = 0;
 	_mapOffset = 0;
 	_screenVirtX = 0;
+	_saveRiver = false;
 }
 
 void River::setRiverPan() {
@@ -1058,7 +1059,7 @@ void River::initRiver() {
 	_vm->_destIn = &_vm->_buffer2;
 	_vm->_room->roomMenu();
 
-	if (_vm->_saveRiver) {
+	if (_saveRiver) {
 		// Restoring a savegame, so set properties from saved fields
 		_vm->_screen->_scrollRow = _rScrollRow;
 		_vm->_screen->_scrollCol = _rScrollCol;
@@ -1076,7 +1077,7 @@ void River::initRiver() {
 	_vm->copyBF2Vid();
 	_vm->_screen->forceFadeIn();
 
-	if (_vm->_saveRiver) {
+	if (_saveRiver) {
 		// Restore draw rects from savegame
 		_vm->_oldRects.resize(_rOldRectCount);
 		_vm->_newRects.resize(_rNewRectCount);
@@ -1096,7 +1097,7 @@ void River::initRiver() {
 
 	_canoeFrame = 0;
 	_mapPtr = (const byte *)MAPTBL[_vm->_riverFlag] + 1;
-	if (_vm->_saveRiver) {
+	if (_saveRiver) {
 		_mapPtr--;
 		_mapPtr += _mapOffset;
 	} else {
@@ -1123,7 +1124,7 @@ void River::initRiver() {
 	++_vm->_timers[12]._flag;
 
 	_vm->_maxHits = 2 - _vm->_riverFlag;
-	_vm->_saveRiver = false;
+	_saveRiver = false;
 }
 
 void River::resetPositions() {
@@ -1234,7 +1235,7 @@ void River::moveCanoe() {
 				_vm->_scripts->printString(BAR_MESSAGE);
 			} else {
 				// Clicked on the Disc icon
-				_vm->_saveRiver = true;
+				_saveRiver = true;
 				_rScrollRow = screen._scrollRow;
 				_rScrollCol = screen._scrollCol;
 				_rScrollX = screen._scrollX;
@@ -1245,7 +1246,7 @@ void River::moveCanoe() {
 				_vm->_room->handleCommand(9);
 
 				if (_vm->_room->_function != FN_CLEAR1) {
-					_vm->_saveRiver = false;
+					_saveRiver = false;
 					_vm->_room->buildScreen();
 					_vm->copyBF2Vid();
 				}
@@ -1561,6 +1562,8 @@ void River::synchronize(Common::Serializer &s) {
 		s.syncAsUint16LE(_screenVirtX);
 		warning("TODO: 	s.syncAsSint16LE(_topList);");
 		warning("TODO: 	s.syncAsSint16LE(_botList);");
+
+		_saveRiver = s.isLoading();
 	}
 }
 
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 4d5e274388..46b3c7047c 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -151,6 +151,7 @@ private:
 	RiverStruct *_topList;
 	RiverStruct *_botList;
 	int _canoeDir;
+	bool _saveRiver;
 
 	// Saved fields
 	int _canoeLane;
-- 
cgit v1.2.3


From ec44c0504f7dc37f7d38894b5a7f764aa17721cc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 22:23:27 -0500
Subject: ACCESS: Remove unneeded dummy field syncs from serializer

---
 engines/access/amazon/amazon_game.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index b6c538542e..fb884897df 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -969,11 +969,7 @@ void AmazonEngine::dead(int deathId) {
 void AmazonEngine::synchronize(Common::Serializer &s) {
 	AccessEngine::synchronize(s);
 
-	int dummy = 0;
-
 	s.syncAsSint16LE(_chapter);
-	s.syncAsSint16LE(dummy);
-	s.syncAsSint16LE(dummy);
 	s.syncAsSint16LE(_rawInactiveX);
 	s.syncAsSint16LE(_rawInactiveY);
 	s.syncAsSint16LE(_inactiveYOff);
-- 
cgit v1.2.3


From 01124c3378f03f9fa0c7c7618879caff5926f735 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 22:26:07 -0500
Subject: ACCESS: Moved help table data from AccessEngine to AmazonEngine

---
 engines/access/access.cpp                | 11 -----------
 engines/access/access.h                  |  4 ----
 engines/access/amazon/amazon_game.cpp    | 14 +++++++++++++-
 engines/access/amazon/amazon_game.h      |  4 ++++
 engines/access/amazon/amazon_scripts.cpp |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 1ab40a2de7..2d25ae9d00 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -84,12 +84,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_establishMode = 0;
 	_establishGroup = 0;
 	_establishCtrlTblOfs = 0;
-	Common::fill(&_help1[0], &_help1[366], 0);
-	Common::fill(&_help2[0], &_help2[366], 0);
-	Common::fill(&_help1[0], &_help3[366], 0);
-	_helpTbl[0] = _help1;
-	_helpTbl[1] = _help2;
-	_helpTbl[2] = _help3;
 	_travel = 0;
 	_ask = 0;
 	_lastTime = g_system->getMillis();
@@ -507,11 +501,6 @@ void AccessEngine::synchronize(Common::Serializer &s) {
 
 	for (int i = 0; i < 256; ++i)
 		s.syncAsUint16LE(_flags[i]);
-	for (int i = 0; i < 366; ++i) {
-		s.syncAsByte(_help1[i]);
-		s.syncAsByte(_help2[i]);
-		s.syncAsByte(_help3[i]);
-	}
 
 	s.syncAsUint16LE(_travel);
 	s.syncAsUint16LE(_ask);
diff --git a/engines/access/access.h b/engines/access/access.h
index 0942c9eb8e..165ae83b28 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -207,10 +207,6 @@ public:
 	uint32 _newTime;
 	uint32 _newDate;
 	int _flags[256];
-	byte _help1[366];
-	byte _help2[366];
-	byte _help3[366];
-	byte *_helpTbl[3];
 	int _travel;
 	int _ask;
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index fb884897df..8958239a15 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -53,7 +53,13 @@ AccessEngine(syst, gameDesc),
 
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 	memset(_tileData, 0, sizeof(_tileData));
-	
+	Common::fill(&_help1[0], &_help1[366], 0);
+	Common::fill(&_help2[0], &_help2[366], 0);
+	Common::fill(&_help1[0], &_help3[366], 0);
+	_helpTbl[0] = _help1;
+	_helpTbl[1] = _help2;
+	_helpTbl[2] = _help3;
+
 	_chapterCells.push_back(CellIdent(0, 96, 17));
 	_inactive._spritesPtr = nullptr;
 	_inactive._altSpritesPtr = nullptr;
@@ -973,8 +979,14 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_rawInactiveX);
 	s.syncAsSint16LE(_rawInactiveY);
 	s.syncAsSint16LE(_inactiveYOff);
+
 	for (int i = 0; i < 100; ++i)
 		s.syncAsSint16LE(_esTabTable[i]);
+	for (int i = 0; i < 366; ++i) {
+		s.syncAsByte(_help1[i]);
+		s.syncAsByte(_help2[i]);
+		s.syncAsByte(_help3[i]);
+	}
 
 	_river.synchronize(s);
 }
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index d697b16c93..016ddf40f0 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -86,6 +86,10 @@ public:
 	InactivePlayer _inactive;
 	bool _charSegSwitch;
 	bool _skipStart;
+	byte _help1[366];
+	byte _help2[366];
+	byte _help3[366];
+	byte *_helpTbl[3];
 
 	// Fields that are mapped to flags
 	int &_guardLocation;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index d6a57d7919..4c3b83869c 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -448,7 +448,7 @@ void AmazonScripts::cmdSetHelp() {
 	int arrayId = (_data->readUint16LE() && 0xFF) - 1;
 	int helpId = _data->readUint16LE() && 0xFF;
 
-	byte *help = _vm->_helpTbl[arrayId];
+	byte *help = _game->_helpTbl[arrayId];
 	help[helpId] = 1;
 
 	if (_vm->_useItem == 0) {
-- 
cgit v1.2.3


From eadaf534865c674bbe11588818539c34da278e0e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 22:28:06 -0500
Subject: ACCESS: Remove unused _travel and _ask fields

---
 engines/access/access.cpp | 6 ------
 engines/access/access.h   | 2 --
 2 files changed, 8 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 2d25ae9d00..6161336de7 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -84,8 +84,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_establishMode = 0;
 	_establishGroup = 0;
 	_establishCtrlTblOfs = 0;
-	_travel = 0;
-	_ask = 0;
 	_lastTime = g_system->getMillis();
 	_curTime = 0;
 	_narateFile = 0;
@@ -501,10 +499,6 @@ void AccessEngine::synchronize(Common::Serializer &s) {
 
 	for (int i = 0; i < 256; ++i)
 		s.syncAsUint16LE(_flags[i]);
-
-	s.syncAsUint16LE(_travel);
-	s.syncAsUint16LE(_ask);
-
 	for (int i = 0; i < 100; ++i)
 		s.syncAsByte(_establishTable[i]);
 
diff --git a/engines/access/access.h b/engines/access/access.h
index 165ae83b28..47f5b5ec06 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -207,8 +207,6 @@ public:
 	uint32 _newTime;
 	uint32 _newDate;
 	int _flags[256];
-	int _travel;
-	int _ask;
 
 	bool _clearSummaryFlag;
 
-- 
cgit v1.2.3


From 16a8d705baab154498cf33905655c4ed4b93b545 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Nov 2014 22:42:27 -0500
Subject: ACCESS: Fix restoring game scene after using help

---
 engines/access/amazon/amazon_game.cpp    |  2 +-
 engines/access/amazon/amazon_scripts.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 8958239a15..b05bb7bb82 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -722,7 +722,7 @@ void AmazonEngine::drawHelp(const Common::String str) {
 			_screen->setPanel(2);
 			_screen->saveScreen();
 		}
-		_screen->setPalette();
+		_screen->savePalette();
 		_screen->fadeOut();
 		_screen->clearBuffer();
 		if (_moreHelp == 1) {
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 4c3b83869c..e2d18141f4 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -390,8 +390,8 @@ void AmazonScripts::cmdHelp() {
 
 	_game->drawHelp(helpMessage);
 
-	while(true) {
-		while(!_vm->shouldQuit() && !_vm->_events->_leftButton)
+	while (!_vm->shouldQuit()) {
+		while (!_vm->shouldQuit() && !_vm->_events->_leftButton)
 			_vm->_events->pollEventsAndWait();
 
 		_vm->_events->debounceLeft();
@@ -410,21 +410,24 @@ void AmazonScripts::cmdHelp() {
 			continue;
 
 		if (choice == 1) {
+			// Done button selected
 			_game->_helpLevel = 0;
 			_game->_moreHelp = 1;
 			_game->_useItem = 0;
 			_vm->_events->hideCursor();
 			_vm->_screen->restoreScreen();
 			_vm->_screen->setPanel(0);
-			_vm->_buffer2.copyFrom(*_vm->_screen);
+			_vm->_screen->copyFrom(_vm->_buffer2);
 			_vm->_screen->restorePalette();
 			_vm->_screen->setPalette();
 			_vm->_events->showCursor();
-			free(_vm->_objectsTable[45]);
+			
+			delete _vm->_objectsTable[45];
 			_vm->_objectsTable[45] = nullptr;
 			_vm->_timers.restoreTimers();
 			break;
 		} else {
+			// More button selected
 			if ((_game->_moreHelp == 0) || (choice != 0))
 				continue;
 			++_game->_helpLevel;
-- 
cgit v1.2.3


From c42666f3d28519c52ac30695e175b8abb42436c7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 29 Nov 2014 14:46:15 +0100
Subject: ACCESS: Add some code for VGA mode in cmdHelp

---
 engines/access/amazon/amazon_scripts.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index e2d18141f4..eadcbddd2b 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -415,8 +415,14 @@ void AmazonScripts::cmdHelp() {
 			_game->_moreHelp = 1;
 			_game->_useItem = 0;
 			_vm->_events->hideCursor();
-			_vm->_screen->restoreScreen();
-			_vm->_screen->setPanel(0);
+			if (_vm->_screen->_vesaMode) {
+				_vm->_screen->restoreScreen();
+				_vm->_screen->setPanel(0);
+			} else {
+				_vm->_screen->fadeOut();
+				_vm->_screen->clearBuffer();
+			}
+
 			_vm->_screen->copyFrom(_vm->_buffer2);
 			_vm->_screen->restorePalette();
 			_vm->_screen->setPalette();
-- 
cgit v1.2.3


From a8e111fae4b492c8478dd4eab239a7fa622b8833 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Nov 2014 11:53:50 -0500
Subject: ACCESS: Refactor opening scenes logic into Opening class

---
 engines/access/access.cpp                |   1 -
 engines/access/access.h                  |   1 -
 engines/access/amazon/amazon_game.cpp    | 311 +----------------------------
 engines/access/amazon/amazon_game.h      |  18 --
 engines/access/amazon/amazon_logic.cpp   | 324 ++++++++++++++++++++++++++++++-
 engines/access/amazon/amazon_logic.h     |  22 ++-
 engines/access/amazon/amazon_scripts.cpp |   2 +-
 engines/access/martian/martian_game.cpp  |   8 +-
 engines/access/martian/martian_game.h    |   5 -
 9 files changed, 343 insertions(+), 349 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6161336de7..bac1308b09 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -50,7 +50,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 
 	_destIn = nullptr;
 	_current = nullptr;
-	_pCount = 0;
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
diff --git a/engines/access/access.h b/engines/access/access.h
index 47f5b5ec06..af0d42302b 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -173,7 +173,6 @@ public:
 	Common::Array<Common::Rect> _oldRects;
 	Common::Array<ExtraCell> _extraCells;
 	ImageEntryList _images;
-	int _pCount;
 	int _mouseMode;
 
 	int _currentManOld;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index b05bb7bb82..dfaba977af 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -40,7 +40,6 @@ AccessEngine(syst, gameDesc),
 		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this), 
 		_plane(this), _river(this) {
 
-	_skipStart = false;
 	_charSegSwitch = false;
 
 	_oldTitleChapter = _chapter = 0;
@@ -92,7 +91,7 @@ void AmazonEngine::playGame() {
 
 	if (_loadSaveSlot == -1) {
 		// Do introduction
-		doIntroduction();
+		_opening.doIntroduction();
 		if (shouldQuit())
 			return;
 	}
@@ -112,314 +111,6 @@ void AmazonEngine::playGame() {
 	_room->doRoom();
 }
 
-void AmazonEngine::doIntroduction() {
-	_screen->setInitialPalettte();
-	_events->setCursor(CURSOR_ARROW);
-	_events->showCursor();
-	_screen->setPanel(0);
-	_screen->setPalette();
-
-	_events->setCursor(CURSOR_ARROW);
-	_events->showCursor();
-	_screen->setPanel(3);
-	doTitle();
-
-	if (shouldQuit() || _skipStart)
-		return;
-
-	_screen->setPanel(3);
-	_opening.mWhileDoOpen();
-
-	if (shouldQuit() || _skipStart)
-		return;
-
-	doTent();
-}
-
-void AmazonEngine::doCredit() {
-	if (_pCount < 15)
-		return;
-
-	if (_pCount <= 75)
-		_buffer2.plotImage(_objectsTable[0], 0, Common::Point(90, 35));
-	else if (_pCount <= 210)
-		_buffer2.plotImage(_objectsTable[0], 1, Common::Point(65, 35));
-	else if (_pCount <= 272)
-		_buffer2.plotImage(_objectsTable[0], 2, Common::Point(96, 45));
-	else if (_pCount <= 334)
-		_buffer2.plotImage(_objectsTable[0], 3, Common::Point(68, 54));
-	else if (_pCount <= 396)
-		_buffer2.plotImage(_objectsTable[0], 4, Common::Point(103, 54));
-	else if (_pCount <= 458) {
-		_buffer2.plotImage(_objectsTable[0], 5, Common::Point(8, 5));
-		_buffer2.plotImage(_objectsTable[0], 12, Common::Point(88, 55));
-		_buffer2.plotImage(_objectsTable[0], 6, Common::Point(194, 98));
-	} else if (_pCount <= 520) {
-		_buffer2.plotImage(_objectsTable[0], 7, Common::Point(32, 13));
-		_buffer2.plotImage(_objectsTable[0], 8, Common::Point(162, 80));
-	} else if (_pCount <= 580) {
-		_buffer2.plotImage(_objectsTable[0], 9, Common::Point(18, 15));
-		_buffer2.plotImage(_objectsTable[0], 10, Common::Point(164, 81));
-	} else
-		_buffer2.plotImage(_objectsTable[0], 11, Common::Point(106, 55));
-}
-
-void AmazonEngine::scrollTitle() {
-	copyBF1BF2();
-	_newRects.clear();
-	doCredit();
-	copyRects();
-	copyBF2Vid();
-}
-
-void AmazonEngine::doTitle() {
-	_screen->setDisplayScan();
-	_destIn = &_buffer2;
-
-	_screen->forceFadeOut();
-	_events->hideCursor();
-
-	_sound->queueSound(0, 98, 30);
-	_sound->queueSound(1, 98, 8);
-
-	_files->_setPaletteFlag = false;
-	_files->loadScreen(0, 3);
-	
-	_buffer2.copyFrom(*_screen);
-	_buffer1.copyFrom(*_screen);
-	_screen->forceFadeIn();
-	_sound->playSound(1);
-
-	// HACK: This delay has been added so that the very first screen is visible.
-	// The original was using disk loading time to display it, and it's too fast
-	// nowadays to be visible.
-	_events->_vbCount = 70;
-	while (!shouldQuit() && _events->_vbCount > 0) {
-		_events->pollEvents();
-		g_system->delayMillis(10);
-	}
-
-	Resource *spriteData = _files->loadFile(0, 2);
-	_objectsTable[0] = new SpriteResource(this, spriteData);
-	delete spriteData;
-
-	_sound->playSound(1);
-
-	_files->_setPaletteFlag = false;
-	_files->loadScreen(0, 4);
-	_sound->playSound(1);
-
-	_buffer2.copyFrom(*_screen);
-	_buffer1.copyFrom(*_screen);
-	_sound->playSound(1);
-
-	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (_pCount = 0; _pCount < 3; ++_pCount) {
-		_buffer2.copyFrom(_buffer1);
-		int id = COUNTDOWN[_pCount * 2];
-		int xp = COUNTDOWN[_pCount * 2 + 1];
-		_buffer2.plotImage(_objectsTable[0], id, Common::Point(xp, 71));
-		_screen->copyFrom(_buffer2);
-
-		_events->_vbCount = 70;
-		while (!shouldQuit() && _events->_vbCount > 0) {
-			_events->pollEvents();
-			g_system->delayMillis(10);
-		}
-	}
-
-	_sound->playSound(0);
-	_screen->forceFadeOut();
-	_events->_vbCount = 100;
-	while (!shouldQuit() && _events->_vbCount > 0) {
-		_events->pollEvents();
-		g_system->delayMillis(10);
-	}
-
-	_sound->freeSounds();
-	delete _objectsTable[0];
-	_objectsTable[0] = nullptr;
-
-	_files->_setPaletteFlag = false;
-	_files->loadScreen(0, 5);
-	_buffer2.copyFrom(*_screen);
-	_buffer1.copyFrom(*_screen);
-	_screen->forceFadeIn();
-	_sound->newMusic(1, 0);
-	_events->_vbCount = 700;
-	while (!shouldQuit() && (_events->_vbCount > 0) && !_events->isKeyMousePressed()) {
-		_events->pollEvents();
-		g_system->delayMillis(10);
-	}
-
-	if (_events->_rightButton) {
-		_skipStart = true;
-		_room->clearRoom();
-		_events->showCursor();
-		return;
-	}
-
-	_sound->newMusic(1, 1);
-	_sound->_musicRepeat = false;
-	_events->zeroKeys();
-	_room->loadRoom(0);
-	_screen->clearScreen();
-	_screen->setBufferScan();
-	_screen->_scrollRow = _screen->_scrollCol = 0;
-	_screen->_scrollX = _screen->_scrollY = 0;
-	_player->_rawPlayer = Common::Point(0, 0);
-	_screen->forceFadeOut();
-	_screen->_scrollX = 0;
-	_room->buildScreen();
-	copyBF2Vid();
-	_screen->forceFadeIn();
-	_oldRects.clear();
-	_newRects.clear();
-	// KEYFLG = 0;
-	_player->_scrollAmount = 1;
-	_pCount = 0;
-
-	while (!shouldQuit()) {
-		if (!_events->isKeyMousePressed()) {
-			if (_events->_rightButton)
-				_skipStart = true;
-			_room->clearRoom();
-			_events->showCursor();
-			return;
-		}
-
-		_events->_vbCount = 4;
-		if (_screen->_scrollCol + _screen->_vWindowWidth != _room->_playFieldWidth) {
-			_screen->_scrollX += _player->_scrollAmount;
-
-			while (_screen->_scrollX >= TILE_WIDTH) {
-				_screen->_scrollX -= TILE_WIDTH;
-				++_screen->_scrollCol;
-
-				_buffer1.moveBufferLeft();
-				_room->buildColumn(_screen->_scrollCol + _screen->_vWindowWidth, _screen->_vWindowBytesWide);
-			}
-			scrollTitle();
-			++_pCount;
-
-			while (!shouldQuit() && (_events->_vbCount > 0)) {
-				_events->pollEvents();
-				g_system->delayMillis(10);
-			}
-			continue;
-		}
-
-		_events->_vbCount = 120;
-		while (!shouldQuit() && (_events->_vbCount > 0)) {
-			_events->pollEvents();
-			g_system->delayMillis(10);
-		}
-
-		while (!shouldQuit()) {
-			_pCount = 0;
-			_events->_vbCount = 3;
-			if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
-				_room->clearRoom();
-				_events->showCursor();
-				return;
-			}
-
-			_screen->_scrollY = _screen->_scrollY + _player->_scrollAmount;
-
-			while (_screen->_scrollY >= TILE_HEIGHT && !shouldQuit()) {
-				_screen->_scrollY -= TILE_HEIGHT;
-				++_screen->_scrollRow;
-				_buffer1.moveBufferUp();
-
-				// WORKAROUND: the original was using _screen->_vWindowBytesWide * _screen->_vWindowLinesTall
-				_room->buildRow(_screen->_scrollRow + _screen->_vWindowHeight, _screen->_vWindowLinesTall);
-
-				if (_screen->_scrollRow + _screen->_vWindowHeight >= _room->_playFieldHeight) {
-					_room->clearRoom();
-					_events->showCursor();
-					return;
-				}
-			}
-			scrollTitle();
-			while (!shouldQuit() && (_events->_vbCount > 0)) {
-				_events->pollEvents();
-				g_system->delayMillis(10);
-			}
-		}
-	}
-}
-
-void AmazonEngine::doTent() {
-	int step = 0;
-	_screen->setDisplayScan();
-	_screen->forceFadeOut();
-	_events->hideCursor();
-	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 39), 1));
-	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 14), 1));
-	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 15), 1));
-	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 16), 1));
-	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 31), 2));
-	_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(98, 52), 2));
-	_sound->playSound(0);
-
-	_files->_setPaletteFlag = false;
-	_files->loadScreen(2, 0);
-	_buffer2.copyFrom(*_screen);
-	_buffer1.copyFrom(*_screen);
-	_screen->forceFadeIn();
-
-	_video->setVideo(_screen, Common::Point(126, 73), FileIdent(2, 1), 10);
-	while (!shouldQuit() && !_video->_videoEnd) {
-		_video->playVideo();
-		if ((_video->_videoFrame == 32) || (_video->_videoFrame == 34))
-			_sound->playSound(4);
-		else if (_video->_videoFrame == 36) {
-			if (step != 2) {
-				_sound->playSound(2);
-				step = 2;
-			}
-		} else if (_video->_videoFrame == 18) {
-			if (step != 1) {
-				_sound->newMusic(73, 1);
-				_sound->newMusic(11, 0);
-				step = 1;
-				_sound->playSound(1);
-			}
-		}
-
-		g_system->delayMillis(10);
-		_events->pollEvents();
-	}	
-
-	_sound->playSound(5);
-	_video->setVideo(_screen, Common::Point(43, 11), FileIdent(2, 2), 10);
-	while (!shouldQuit() && !_video->_videoEnd) {
-		_video->playVideo();
-		if (_video->_videoFrame == 26) {
-			_sound->playSound(5);
-		} else if (_video->_videoFrame == 15) {
-			if (step !=3) {
-				_sound->playSound(3);
-				step = 3;
-			}
-		}
-
-		g_system->delayMillis(10);
-		_events->pollEvents();
-	}
-
-	_events->_vbCount = 200;
-	while (!shouldQuit() && _events->_vbCount > 0) {
-		_events->pollEvents();
-		g_system->delayMillis(10);
-	}
-	_events->showCursor();
-	_sound->newMusic(11, 1);
-	_sound->_soundTable.clear();
-
-	establishCenter(0, 4);
-}
-
 void AmazonEngine::setupGame() {
 	// Setup timers
 	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 016ddf40f0..ca8287b87e 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -38,21 +38,6 @@ private:
 	byte _tileData[1455];
 	Common::Array<CellIdent> _chapterCells;
 
-	/**
-	 * Do the game introduction
-	 */
-	void doIntroduction();
-
-	/**
-	 * Do title sequence
-	 */
-	void doTitle();
-
-	/**
-	 * Do tent scene of introduction
-	 */
-	void doTent();
-
 	/**
 	 * Setup variables for the game
 	 */
@@ -67,8 +52,6 @@ private:
 	void calcIQ();
 	void helpTitle();
 	void drawHelpText(const Common::String &msg);
-	void doCredit();
-	void scrollTitle();
 	void loadEstablish(int estabIndex);
 	void doEstablish(int screenId, int estabIndex);
 
@@ -85,7 +68,6 @@ protected:
 public:
 	InactivePlayer _inactive;
 	bool _charSegSwitch;
-	bool _skipStart;
 	byte _help1[366];
 	byte _help2[366];
 	byte _help3[366];
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 3ecb20d974..8db7e9f785 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -81,17 +81,18 @@ void PannedScene::pan() {
 
 /*------------------------------------------------------------------------*/
 
-Opening::Opening(AmazonEngine *vm) : PannedScene(vm) {
+CampScene::CampScene(AmazonEngine *vm) : PannedScene(vm) {
+	_skipStart = false;
 }
 
-void Opening::mWhileDoOpen() {
+void CampScene::mWhileDoOpen() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 
 	screen.setBufferScan();
 	events.hideCursor();
 	screen.forceFadeOut();
-	_vm->_skipStart = false;
+	_skipStart = false;
 	if (_vm->_conversation != 2) {
 		// Cutscene at start of chapter 1
 		screen.setPanel(3);
@@ -159,7 +160,7 @@ void Opening::mWhileDoOpen() {
 		events.pollEventsAndWait();
 
 		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
-			_vm->_skipStart = true;
+			_skipStart = true;
 			_vm->_sound->newMusic(10, 1);
 
 			events.debounceLeft();
@@ -202,6 +203,319 @@ void Opening::mWhileDoOpen() {
 
 /*------------------------------------------------------------------------*/
 
+Opening::Opening(AmazonEngine *vm) : CampScene(vm) {
+	_pCount = 0;
+}
+
+void Opening::doIntroduction() {
+	_vm->_screen->setInitialPalettte();
+	_vm->_events->setCursor(CURSOR_ARROW);
+	_vm->_events->showCursor();
+	_vm->_screen->setPanel(0);
+	_vm->_screen->setPalette();
+
+	_vm->_events->setCursor(CURSOR_ARROW);
+	_vm->_events->showCursor();
+	_vm->_screen->setPanel(3);
+	doTitle();
+
+	if (_vm->shouldQuit() || _skipStart)
+		return;
+
+	_vm->_screen->setPanel(3);
+	mWhileDoOpen();
+
+	if (_vm->shouldQuit() || _skipStart)
+		return;
+
+	doTent();
+}
+
+void Opening::doCredit() {
+	if (_pCount < 15)
+		return;
+
+	if (_pCount <= 75)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(90, 35));
+	else if (_pCount <= 210)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 1, Common::Point(65, 35));
+	else if (_pCount <= 272)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
+	else if (_pCount <= 334)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
+	else if (_pCount <= 396)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
+	else if (_pCount <= 458) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(8, 5));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(88, 55));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(194, 98));
+	} else if (_pCount <= 520) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(32, 13));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 8, Common::Point(162, 80));
+	} else if (_pCount <= 580) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(18, 15));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(164, 81));
+	} else
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(106, 55));
+}
+
+void Opening::scrollTitle() {
+	_vm->copyBF1BF2();
+	_vm->_newRects.clear();
+	doCredit();
+	_vm->copyRects();
+	_vm->copyBF2Vid();
+}
+
+void Opening::doTitle() {
+	_vm->_screen->setDisplayScan();
+
+	_vm->_screen->forceFadeOut();
+	_vm->_events->hideCursor();
+
+	_vm->_sound->queueSound(0, 98, 30);
+	_vm->_sound->queueSound(1, 98, 8);
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(0, 3);
+	
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_screen->forceFadeIn();
+	_vm->_sound->playSound(1);
+
+	// HACK: This delay has been added so that the very first screen is visible.
+	// The original was using disk loading time to display it, and it's too fast
+	// nowadays to be visible.
+	_vm->_events->_vbCount = 70;
+	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+		_vm->_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+
+	Resource *spriteData = _vm->_files->loadFile(0, 2);
+	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
+	delete spriteData;
+
+	_vm->_sound->playSound(1);
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(0, 4);
+	_vm->_sound->playSound(1);
+
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_sound->playSound(1);
+
+	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
+	for (_pCount = 0; _pCount < 3; ++_pCount) {
+		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		int id = COUNTDOWN[_pCount * 2];
+		int xp = COUNTDOWN[_pCount * 2 + 1];
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
+		_vm->_screen->copyFrom(_vm->_buffer2);
+
+		_vm->_events->_vbCount = 70;
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+			_vm->_events->pollEvents();
+			g_system->delayMillis(10);
+		}
+	}
+
+	_vm->_sound->playSound(0);
+	_vm->_screen->forceFadeOut();
+	_vm->_events->_vbCount = 100;
+	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+		_vm->_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+
+	_vm->_sound->freeSounds();
+	delete _vm->_objectsTable[0];
+	_vm->_objectsTable[0] = nullptr;
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(0, 5);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_screen->forceFadeIn();
+	_vm->_sound->newMusic(1, 0);
+	_vm->_events->_vbCount = 700;
+	while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0) && !_vm->_events->isKeyMousePressed()) {
+		_vm->_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+
+	if (_vm->_events->_rightButton) {
+		_skipStart = true;
+		_vm->_room->clearRoom();
+		_vm->_events->showCursor();
+		return;
+	}
+
+	_vm->_sound->newMusic(1, 1);
+	_vm->_sound->_musicRepeat = false;
+	_vm->_events->zeroKeys();
+	_vm->_room->loadRoom(0);
+	_vm->_screen->clearScreen();
+	_vm->_screen->setBufferScan();
+	_vm->_screen->_scrollRow = _vm->_screen->_scrollCol = 0;
+	_vm->_screen->_scrollX = _vm->_screen->_scrollY = 0;
+	_vm->_player->_rawPlayer = Common::Point(0, 0);
+	_vm->_screen->forceFadeOut();
+	_vm->_screen->_scrollX = 0;
+	_vm->_room->buildScreen();
+	_vm->copyBF2Vid();
+	_vm->_screen->forceFadeIn();
+	_vm->_oldRects.clear();
+	_vm->_newRects.clear();
+	// KEYFLG = 0;
+	_vm->_player->_scrollAmount = 1;
+	_pCount = 0;
+
+	while (!_vm->shouldQuit()) {
+		if (!_vm->_events->isKeyMousePressed()) {
+			if (_vm->_events->_rightButton)
+				_skipStart = true;
+			_vm->_room->clearRoom();
+			_vm->_events->showCursor();
+			return;
+		}
+
+		_vm->_events->_vbCount = 4;
+		if (_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth) {
+			_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+
+			while (_vm->_screen->_scrollX >= TILE_WIDTH) {
+				_vm->_screen->_scrollX -= TILE_WIDTH;
+				++_vm->_screen->_scrollCol;
+
+				_vm->_buffer1.moveBufferLeft();
+				_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+			}
+			scrollTitle();
+			++_pCount;
+
+			while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0)) {
+				_vm->_events->pollEvents();
+				g_system->delayMillis(10);
+			}
+			continue;
+		}
+
+		_vm->_events->_vbCount = 120;
+		while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0)) {
+			_vm->_events->pollEvents();
+			g_system->delayMillis(10);
+		}
+
+		while (!_vm->shouldQuit()) {
+			_pCount = 0;
+			_vm->_events->_vbCount = 3;
+			if (_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight >= _vm->_room->_playFieldHeight) {
+				_vm->_room->clearRoom();
+				_vm->_events->showCursor();
+				return;
+			}
+
+			_vm->_screen->_scrollY = _vm->_screen->_scrollY + _vm->_player->_scrollAmount;
+
+			while (_vm->_screen->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
+				_vm->_screen->_scrollY -= TILE_HEIGHT;
+				++_vm->_screen->_scrollRow;
+				_vm->_buffer1.moveBufferUp();
+
+				// WORKAROUND: the original was using _vm->_screen->_vWindowBytesWide * _vm->_screen->_vWindowLinesTall
+				_vm->_room->buildRow(_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight, _vm->_screen->_vWindowLinesTall);
+
+				if (_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight >= _vm->_room->_playFieldHeight) {
+					_vm->_room->clearRoom();
+					_vm->_events->showCursor();
+					return;
+				}
+			}
+			scrollTitle();
+			while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0)) {
+				_vm->_events->pollEvents();
+				g_system->delayMillis(10);
+			}
+		}
+	}
+}
+
+void Opening::doTent() {
+	int step = 0;
+	_vm->_screen->setDisplayScan();
+	_vm->_screen->forceFadeOut();
+	_vm->_events->hideCursor();
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 39), 1));
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 14), 1));
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 15), 1));
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 16), 1));
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 31), 2));
+	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 52), 2));
+	_vm->_sound->playSound(0);
+
+	_vm->_files->_setPaletteFlag = false;
+	_vm->_files->loadScreen(2, 0);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_screen->forceFadeIn();
+
+	_vm->_video->setVideo(_vm->_screen, Common::Point(126, 73), FileIdent(2, 1), 10);
+	while (!_vm->shouldQuit() && !_vm->_video->_videoEnd) {
+		_vm->_video->playVideo();
+		if ((_vm->_video->_videoFrame == 32) || (_vm->_video->_videoFrame == 34))
+			_vm->_sound->playSound(4);
+		else if (_vm->_video->_videoFrame == 36) {
+			if (step != 2) {
+				_vm->_sound->playSound(2);
+				step = 2;
+			}
+		} else if (_vm->_video->_videoFrame == 18) {
+			if (step != 1) {
+				_vm->_sound->newMusic(73, 1);
+				_vm->_sound->newMusic(11, 0);
+				step = 1;
+				_vm->_sound->playSound(1);
+			}
+		}
+
+		g_system->delayMillis(10);
+		_vm->_events->pollEvents();
+	}	
+
+	_vm->_sound->playSound(5);
+	_vm->_video->setVideo(_vm->_screen, Common::Point(43, 11), FileIdent(2, 2), 10);
+	while (!_vm->shouldQuit() && !_vm->_video->_videoEnd) {
+		_vm->_video->playVideo();
+		if (_vm->_video->_videoFrame == 26) {
+			_vm->_sound->playSound(5);
+		} else if (_vm->_video->_videoFrame == 15) {
+			if (step !=3) {
+				_vm->_sound->playSound(3);
+				step = 3;
+			}
+		}
+
+		g_system->delayMillis(10);
+		_vm->_events->pollEvents();
+	}
+
+	_vm->_events->_vbCount = 200;
+	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
+		_vm->_events->pollEvents();
+		g_system->delayMillis(10);
+	}
+	_vm->_events->showCursor();
+	_vm->_sound->newMusic(11, 1);
+	_vm->_sound->_soundTable.clear();
+
+	_vm->establishCenter(0, 4);
+}
+
+/*------------------------------------------------------------------------*/
+
 Plane::Plane(AmazonEngine *vm): PannedScene(vm) {
 	_pCount = 0;
 	_planeCount = 0;
@@ -400,7 +714,7 @@ void Plane::mWhileFall() {
 
 /*------------------------------------------------------------------------*/
 
-Jungle::Jungle(AmazonEngine *vm) : PannedScene(vm) {
+Jungle::Jungle(AmazonEngine *vm) : CampScene(vm) {
 	for (int i = 0; i < JUNGLE_SIZE; ++i) {
 		_jCnt[i] = _jungleX[i] = -1;
 	}
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 46b3c7047c..c2752af77b 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -70,13 +70,29 @@ public:
 	void pan();
 };
 
-class Opening: public PannedScene {
+class CampScene : public PannedScene {
+protected:
+	bool _skipStart;
 public:
-	Opening(AmazonEngine *vm);
+	CampScene(AmazonEngine *vm);
 
 	void mWhileDoOpen();
 };
 
+class Opening: public CampScene {
+private:
+	int _pCount;
+
+	void doTitle();
+	void doCredit();
+	void scrollTitle();
+	void doTent();
+public:
+	Opening(AmazonEngine *vm);
+
+	void doIntroduction();
+};
+
 class Plane: public PannedScene {
 public:
 	int _pCount;
@@ -95,7 +111,7 @@ public:
 };
 
 #define JUNGLE_SIZE 3
-class Jungle: public PannedScene {
+class Jungle: public CampScene {
 private:
 	void initJWalk2();
 	void jungleMove();
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index eadcbddd2b..f38c80c915 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -220,7 +220,7 @@ void AmazonScripts::mWhile(int param1) {
 		_game->_jungle.mWhileJWalk();
 		break;
 	case 5:
-		_game->_opening.mWhileDoOpen();
+		_game->_jungle.mWhileDoOpen();
 		break;
 	case 6:
 		_game->_river.mWhileDownRiver();
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 81a8ffdf4d..e534b6cc03 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -79,7 +79,7 @@ void MartianEngine::doIntroduction() {
 			return;
 
 		if (!_skipStart) {
-			doTent();
+			//doTent();
 			if (shouldQuit())
 				return;
 		}
@@ -89,6 +89,7 @@ void MartianEngine::doIntroduction() {
 }
 
 void MartianEngine::doTitle() {
+	/*
 	_screen->setDisplayScan();
 	_destIn = &_buffer2;
 
@@ -129,16 +130,13 @@ void MartianEngine::doTitle() {
 	// TODO: More to do
 
 	delete _objectsTable[0];
+	*/
 }
 
 void MartianEngine::doOpening() {
 	warning("TODO doOpening");
 }
 
-void MartianEngine::doTent() {
-	warning("TODO doTent");
-}
-
 void MartianEngine::setupGame() {
 
 	// Setup timers
diff --git a/engines/access/martian/martian_game.h b/engines/access/martian/martian_game.h
index e46b2bb0fd..a83b67a288 100644
--- a/engines/access/martian/martian_game.h
+++ b/engines/access/martian/martian_game.h
@@ -48,11 +48,6 @@ private:
 	 */
 	void doOpening();
 
-	/**
-	 * Do tent scene of introduction
-	 */
-	void doTent();
-
 	/**
 	 * Setup variables for the game
 	 */
-- 
cgit v1.2.3


From d37593d5c1008995b292a62f473a2a8dfa322cc1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Nov 2014 12:19:41 -0500
Subject: ACCESS: Replaced delayMilli calls to use pollEventsAndWait

---
 engines/access/amazon/amazon_logic.cpp | 61 +++++++++++++++-------------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 8db7e9f785..c62ca5786e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -284,14 +284,14 @@ void Opening::doTitle() {
 	_vm->_screen->forceFadeIn();
 	_vm->_sound->playSound(1);
 
-	// HACK: This delay has been added so that the very first screen is visible.
-	// The original was using disk loading time to display it, and it's too fast
+	// WORKAROUND: This delay has been added to replace original game delay that
+	// came from loading resources, since nowadays it would be too fast to be visible
 	// nowadays to be visible.
 	_vm->_events->_vbCount = 70;
-	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-		_vm->_events->pollEvents();
-		g_system->delayMillis(10);
-	}
+	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+		_vm->_events->pollEventsAndWait();
+	if (_vm->shouldQuit())
+		return;
 
 	Resource *spriteData = _vm->_files->loadFile(0, 2);
 	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
@@ -308,7 +308,7 @@ void Opening::doTitle() {
 	_vm->_sound->playSound(1);
 
 	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (_pCount = 0; _pCount < 3; ++_pCount) {
+	for (_pCount = 0; _pCount < 3 && !_vm->shouldQuit(); ++_pCount) {
 		_vm->_buffer2.copyFrom(_vm->_buffer1);
 		int id = COUNTDOWN[_pCount * 2];
 		int xp = COUNTDOWN[_pCount * 2 + 1];
@@ -316,19 +316,19 @@ void Opening::doTitle() {
 		_vm->_screen->copyFrom(_vm->_buffer2);
 
 		_vm->_events->_vbCount = 70;
-		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-			_vm->_events->pollEvents();
-			g_system->delayMillis(10);
-		}
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+			_vm->_events->pollEventsAndWait();
 	}
+	if (_vm->shouldQuit())
+		return;
 
 	_vm->_sound->playSound(0);
 	_vm->_screen->forceFadeOut();
 	_vm->_events->_vbCount = 100;
-	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-		_vm->_events->pollEvents();
-		g_system->delayMillis(10);
-	}
+	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+		_vm->_events->pollEventsAndWait();
+	if (_vm->shouldQuit())
+		return;
 
 	_vm->_sound->freeSounds();
 	delete _vm->_objectsTable[0];
@@ -342,8 +342,7 @@ void Opening::doTitle() {
 	_vm->_sound->newMusic(1, 0);
 	_vm->_events->_vbCount = 700;
 	while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0) && !_vm->_events->isKeyMousePressed()) {
-		_vm->_events->pollEvents();
-		g_system->delayMillis(10);
+		_vm->_events->pollEventsAndWait();
 	}
 
 	if (_vm->_events->_rightButton) {
@@ -397,17 +396,14 @@ void Opening::doTitle() {
 			++_pCount;
 
 			while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0)) {
-				_vm->_events->pollEvents();
-				g_system->delayMillis(10);
+				_vm->_events->pollEventsAndWait();
 			}
 			continue;
 		}
 
 		_vm->_events->_vbCount = 120;
-		while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0)) {
-			_vm->_events->pollEvents();
-			g_system->delayMillis(10);
-		}
+		while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0))
+			_vm->_events->pollEventsAndWait();
 
 		while (!_vm->shouldQuit()) {
 			_pCount = 0;
@@ -435,10 +431,8 @@ void Opening::doTitle() {
 				}
 			}
 			scrollTitle();
-			while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0)) {
-				_vm->_events->pollEvents();
-				g_system->delayMillis(10);
-			}
+			while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0))
+				_vm->_events->pollEventsAndWait();
 		}
 	}
 }
@@ -481,8 +475,7 @@ void Opening::doTent() {
 			}
 		}
 
-		g_system->delayMillis(10);
-		_vm->_events->pollEvents();
+		_vm->_events->pollEventsAndWait();
 	}	
 
 	_vm->_sound->playSound(5);
@@ -498,15 +491,13 @@ void Opening::doTent() {
 			}
 		}
 
-		g_system->delayMillis(10);
-		_vm->_events->pollEvents();
+		_vm->_events->pollEventsAndWait();
 	}
 
 	_vm->_events->_vbCount = 200;
-	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) {
-		_vm->_events->pollEvents();
-		g_system->delayMillis(10);
-	}
+	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+		_vm->_events->pollEventsAndWait();
+
 	_vm->_events->showCursor();
 	_vm->_sound->newMusic(11, 1);
 	_vm->_sound->_soundTable.clear();
-- 
cgit v1.2.3


From 63bcd2ebcbe8063e5009fb27ed2d1aaa08bf28a1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 29 Nov 2014 23:43:43 +0100
Subject: ACCESS: Remove second character sprite in Dead command

---
 engines/access/amazon/amazon_game.cpp | 3 +++
 engines/access/player.cpp             | 7 +++++++
 engines/access/player.h               | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index dfaba977af..b665c49806 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -654,6 +654,9 @@ void AmazonEngine::dead(int deathId) {
 		_room->clearRoom();
 		freeChar();
 
+		_currentManOld = 1;
+		_player->removeSprite1();
+
 		warning("TODO: restart game");
 		quitGame();
 		_events->pollEvents();
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 2313ed266e..cb7459e8cc 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -137,6 +137,13 @@ void Player::freeSprites() {
 	_playerSprites = nullptr;
 }
 
+void Player::removeSprite1() {
+	if (_playerSprites1) {
+		delete _playerSprites1;
+		_playerSprites1 = nullptr;
+	}
+}
+
 void Player::calcManScale() {
 	if (!_vm->_manScaleOff) {
 		_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
diff --git a/engines/access/player.h b/engines/access/player.h
index 67908a315d..631452f12d 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -120,6 +120,8 @@ public:
 
 	void freeSprites();
 
+	void removeSprite1();
+
 	void calcManScale();
 
 	void walk();
-- 
cgit v1.2.3


From a3801df5187cb2500e72b74d37c6bccdbff1f8c5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 30 Nov 2014 13:23:16 +0100
Subject: ACCESS: First implementation of Sound playback for both CD and Floppy
 version. Courtesy of m_kiewitz

---
 engines/access/sound.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 6d42cd552e..fdc606b43e 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -21,7 +21,10 @@
  */
 
 #include "common/algorithm.h"
+#include "audio/mixer.h"
 #include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
 #include "access/access.h"
 #include "access/sound.h"
 
@@ -49,11 +52,14 @@ void SoundManager::clearSounds() {
 }
 
 void SoundManager::queueSound(int idx, int fileNum, int subfile) {
+	Resource *soundResource;
+
 	if (idx >= (int)_soundTable.size())
 		_soundTable.resize(idx + 1);
 
 	delete _soundTable[idx]._res;
-	_soundTable[idx]._res = _vm->_files->loadFile(fileNum, subfile);
+	soundResource = _vm->_files->loadFile(fileNum, subfile);
+	_soundTable[idx]._res = soundResource;
 	_soundTable[idx]._priority = 1;
 }
 
@@ -67,6 +73,54 @@ void SoundManager::playSound(int soundIndex) {
 }
 
 void SoundManager::playSound(Resource *res, int priority) {
+	byte *resourceData = res->data();
+	Audio::SoundHandle audioHandle;
+	Audio::RewindableAudioStream *audioStream = 0;
+	
+	assert(res->_size >= 32);
+
+	if (READ_BE_UINT32(resourceData) == MKTAG('R','I','F','F')) {
+		// CD version uses WAVE-files
+		Common::SeekableReadStream *waveStream = new Common::MemoryReadStream(resourceData, res->_size, DisposeAfterUse::NO);
+		audioStream = Audio::makeWAVStream(waveStream, DisposeAfterUse::YES);
+
+	} else if (READ_BE_UINT32(resourceData) == MKTAG('S', 'T', 'E', 'V')) {
+		// sound files have a fixed header of 32 bytes in total
+		//  header content:
+		//   "STEVE" - fixed header
+		//   byte    - sample rate
+		//              01h mapped internally to 3Ch ??
+		//              02h mapped internally to 78h seems to be 11025Hz
+		//              03h mapped internally to B5h
+		//              04h mapped internally to F1h
+		//   byte    - unknown
+		//   word    - actual sample size (should be resource-size - 32)
+		byte internalSampleRate = resourceData[5];
+		int sampleSize = READ_LE_UINT16(resourceData + 7);
+	
+		assert( (sampleSize + 32) == res->_size);
+
+		int sampleRate = 0;
+		switch (internalSampleRate) {
+		case 1: sampleRate = 16666; break; // 3Ch -> C4h time constant
+		case 2: sampleRate = 8334; break;  // 78h -> 88h time constant
+		case 3: sampleRate = 5525; break;  // B5h -> 4Bh time constant
+		case 4: sampleRate = 4150; break;  // F1h -> 0Fh time constant
+		default:
+			error("Unexpected internal Sample Rate %d", internalSampleRate);
+			return;
+		}
+	
+		audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0);
+
+	} else
+		error("Unknown format");
+	
+	audioHandle = Audio::SoundHandle();
+	_mixer->playStream(Audio::Mixer::kSFXSoundType, &audioHandle,
+						audioStream, -1, _mixer->kMaxChannelVolume, 0,
+						DisposeAfterUse::NO);
+
 	/*
 	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
 	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
-- 
cgit v1.2.3


From 11e920f427312c496b080c280dca7a9eb8b75676 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 07:49:26 +0100
Subject: ACCESS: Split SoundManager and MusicManager

---
 engines/access/access.cpp                |  2 ++
 engines/access/access.h                  |  1 +
 engines/access/amazon/amazon_game.cpp    | 16 +++++-----
 engines/access/amazon/amazon_logic.cpp   | 24 +++++++--------
 engines/access/amazon/amazon_scripts.cpp |  2 +-
 engines/access/room.cpp                  | 18 +++++------
 engines/access/scripts.cpp               |  2 +-
 engines/access/sound.cpp                 | 51 ++++++++++++++++++++------------
 engines/access/sound.h                   | 25 ++++++++++++----
 9 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index bac1308b09..b0b28f64f6 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -100,6 +100,7 @@ AccessEngine::~AccessEngine() {
 	delete _events;
 	delete _files;
 	delete _inventory;
+	delete _midi;
 	delete _player;
 	delete _room;
 	delete _screen;
@@ -150,6 +151,7 @@ void AccessEngine::initialize() {
 	_player = Player::init(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
+	_midi = new MusicManager(this, _mixer);
 	_video = new VideoPlayer(this);
 
 	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight());
diff --git a/engines/access/access.h b/engines/access/access.h
index af0d42302b..da10d6326c 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -150,6 +150,7 @@ public:
 	Screen *_screen;
 	Scripts *_scripts;
 	SoundManager *_sound;
+	MusicManager *_midi;
 	VideoPlayer *_video;
 
 	ASurface *_destIn;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index b665c49806..ba8b156e65 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -450,7 +450,7 @@ void AmazonEngine::startChapter(int chapter) {
 		_room->clearRoom();
 		freeChar();
 		
-		_sound->newMusic(32, 0);
+		_midi->newMusic(32, 0);
 		playVideo(0, Common::Point());
 		if (shouldQuit())
 			return;
@@ -508,8 +508,8 @@ void AmazonEngine::startChapter(int chapter) {
 	if (chapter == 14)
 		_screen->plotImage(_objectsTable[_chapter], 1, Common::Point(169, 76));
 
-	_sound->newMusic(chapImg[4], 1);
-	_sound->newMusic(33, 0);
+	_midi->newMusic(chapImg[4], 1);
+	_midi->newMusic(33, 0);
 	_screen->forceFadeIn();
 
 	_timers[20]._timer = 950;
@@ -534,8 +534,8 @@ void AmazonEngine::startChapter(int chapter) {
 	_buffer2.copyFrom(*_screen);
 	_screen->plotImage(_objectsTable[0], chapImg[0], Common::Point(90, 7));
 
-	_sound->newMusic(7, 1);
-	_sound->newMusic(34, 0);
+	_midi->newMusic(7, 1);
+	_midi->newMusic(34, 0);
 
 	_screen->forceFadeIn();
 	_buffer2.copyFrom(*_screen);
@@ -567,7 +567,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->clearBuffer();
 	freeCells();
 	
-	_sound->newMusic(_chapter * 2, 1);
+	_midi->newMusic(_chapter * 2, 1);
 
 	if (chapter != 1 && chapter != 14) {
 		_room->init4Quads();
@@ -607,7 +607,7 @@ void AmazonEngine::dead(int deathId) {
 	_screen->setPanel(3);
 
 	if (deathId != 10) {
-		_sound->newMusic(62, 0);
+		_midi->newMusic(62, 0);
 		_files->_setPaletteFlag = false;
 		_files->loadScreen(94, 0);
 		_files->_setPaletteFlag = true;
@@ -649,7 +649,7 @@ void AmazonEngine::dead(int deathId) {
 		printText(_screen, msg);
 		_screen->forceFadeOut();
 
-		_sound->newMusic(0, 1);
+		_midi->newMusic(0, 1);
 		_events->showCursor();
 		_room->clearRoom();
 		freeChar();
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c62ca5786e..c330429ee6 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -140,7 +140,7 @@ void CampScene::mWhileDoOpen() {
 	_vm->_animation->setAnimTimer(anim);
 	anim = _vm->_animation->setAnimation(1);
 	_vm->_animation->setAnimTimer(anim);
-	_vm->_sound->newMusic(10, 0);
+	_vm->_midi->newMusic(10, 0);
 
 	bool startFl = false;
 	while (!_vm->shouldQuit()) {
@@ -161,7 +161,7 @@ void CampScene::mWhileDoOpen() {
 
 		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
 			_skipStart = true;
-			_vm->_sound->newMusic(10, 1);
+			_vm->_midi->newMusic(10, 1);
 
 			events.debounceLeft();
 			events.zeroKeys();
@@ -339,7 +339,7 @@ void Opening::doTitle() {
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_buffer1.copyFrom(*_vm->_screen);
 	_vm->_screen->forceFadeIn();
-	_vm->_sound->newMusic(1, 0);
+	_vm->_midi->newMusic(1, 0);
 	_vm->_events->_vbCount = 700;
 	while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0) && !_vm->_events->isKeyMousePressed()) {
 		_vm->_events->pollEventsAndWait();
@@ -352,8 +352,8 @@ void Opening::doTitle() {
 		return;
 	}
 
-	_vm->_sound->newMusic(1, 1);
-	_vm->_sound->_musicRepeat = false;
+	_vm->_midi->newMusic(1, 1);
+	_vm->_midi->_musicRepeat = false;
 	_vm->_events->zeroKeys();
 	_vm->_room->loadRoom(0);
 	_vm->_screen->clearScreen();
@@ -468,8 +468,8 @@ void Opening::doTent() {
 			}
 		} else if (_vm->_video->_videoFrame == 18) {
 			if (step != 1) {
-				_vm->_sound->newMusic(73, 1);
-				_vm->_sound->newMusic(11, 0);
+				_vm->_midi->newMusic(73, 1);
+				_vm->_midi->newMusic(11, 0);
 				step = 1;
 				_vm->_sound->playSound(1);
 			}
@@ -499,7 +499,7 @@ void Opening::doTent() {
 		_vm->_events->pollEventsAndWait();
 
 	_vm->_events->showCursor();
-	_vm->_sound->newMusic(11, 1);
+	_vm->_midi->newMusic(11, 1);
 	_vm->_sound->_soundTable.clear();
 
 	_vm->establishCenter(0, 4);
@@ -1262,7 +1262,7 @@ void Cast::doCast(int param1) {
 	_vm->_newRects.clear();
 	_vm->_numAnimTimers = 0;
 
-	_vm->_sound->newMusic(58, 0);
+	_vm->_midi->newMusic(58, 0);
 	_vm->_screen->forceFadeIn();
 
 	while (!_vm->shouldQuit()) {
@@ -1284,14 +1284,14 @@ void Cast::doCast(int param1) {
 				_vm->_events->pollEventsAndWait();
 			}
 
-			while (!_vm->shouldQuit() && !_vm->_sound->checkMidiDone())
+			while (!_vm->shouldQuit() && !_vm->_midi->checkMidiDone())
 				_vm->_events->pollEventsAndWait();
 
 			break;
 		}
 	}
 
-	_vm->_sound->newMusic(58, 1);
+	_vm->_midi->newMusic(58, 1);
 	_vm->_events->showCursor();
 
 	_vm->freeCells();
@@ -1787,7 +1787,7 @@ void River::river() {
 
 		//		int bx = _vm->_player->_scrollAmount - _screenVertX;
 		if (_vm->_screen->_scrollX == 0) {
-			_vm->_sound->midiRepeat();
+			_vm->_midi->midiRepeat();
 			if (riverJumpTest()) {
 				_CHICKENOUTFLG = false;
 				return;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index f38c80c915..da43f1bc82 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -333,7 +333,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		_game->_guard.doGuard();
 		break;
 	case 10:
-		_vm->_sound->newMusic(param1, param2);
+		_vm->_midi->newMusic(param1, param2);
 		break;
 	case 11:
 		plotInactive();
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b9ce06959a..7ef3d6937d 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -86,7 +86,7 @@ void Room::doRoom() {
 			g_system->delayMillis(5);
 
 			_vm->_player->walk();
-			_vm->_sound->midiRepeat();
+			_vm->_midi->midiRepeat();
 			_vm->_player->checkScroll();
 
 			doCommands();
@@ -150,10 +150,10 @@ void Room::doRoom() {
 }
 
 void Room::clearRoom() {
-	if (_vm->_sound->_music) {
-		_vm->_sound->stopSong();
-		delete _vm->_sound->_music;
-		_vm->_sound->_music = nullptr;
+	if (_vm->_midi->_music) {
+		_vm->_midi->stopSong();
+		delete _vm->_midi->_music;
+		_vm->_midi->_music = nullptr;
 	}
 
 	_vm->_sound->freeSounds();
@@ -181,11 +181,11 @@ void Room::loadRoomData(const byte *roomData) {
 		}
 	}
 
-	_vm->_sound->freeMusic();
+	_vm->_midi->freeMusic();
 	if (roomInfo._musicFile._fileNum != -1) {
-		_vm->_sound->_music = _vm->_files->loadFile(roomInfo._musicFile);
-		_vm->_sound->midiPlay();
-		_vm->_sound->_musicRepeat = true;
+		_vm->_midi->_music = _vm->_files->loadFile(roomInfo._musicFile);
+		_vm->_midi->midiPlay();
+		_vm->_midi->_musicRepeat = true;
 	}
 
 	_vm->_scaleH1 = roomInfo._scaleH1;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index add461eb81..2c32f59ced 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -679,7 +679,7 @@ void Scripts::cmdWait() {
 	while (!_vm->shouldQuit() && _vm->_events->_keypresses.empty() &&
 			!_vm->_events->_leftButton && !_vm->_events->_rightButton &&
 			_vm->_timers[3]._flag) {
-		_vm->_sound->midiRepeat();
+		_vm->_midi->midiRepeat();
 		charLoop();
 
 		_vm->_events->pollEvents();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index fdc606b43e..7d1885955a 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -32,17 +32,12 @@ namespace Access {
 
 SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : 
 		_vm(vm), _mixer(mixer) {
-	_music = nullptr;
-	_tempMusic = nullptr;
-	_musicRepeat = false;
 	_playingSound = false;
 	_isVoice = false;
 }
 
 SoundManager::~SoundManager() {
 	clearSounds();
-	delete _music;
-	delete _tempMusic;
 }
 
 void SoundManager::clearSounds() {
@@ -138,33 +133,51 @@ void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
 	}
 }
 
-void SoundManager::midiPlay() {
-	// TODO
+void SoundManager::stopSound() {
+	// TODO: REALSTOPSND or BLASTSTOPSND or STOP_SOUNDG
+	warning("TODO: stopSound");
+}
+
+void SoundManager::freeSounds() {
+	stopSound();
+	clearSounds();
+}
+
+/******************************************************************************************/
+
+MusicManager::MusicManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
+	_music = nullptr;
+	_tempMusic = nullptr;
+	_musicRepeat = false;
+}
+
+MusicManager::~MusicManager() {
+	delete _music;
+	delete _tempMusic;
 }
 
-bool SoundManager::checkMidiDone() {
+void MusicManager::midiPlay() {
 	// TODO
-	return true;
 }
 
-void SoundManager::midiRepeat() {
+bool MusicManager::checkMidiDone() {
 	// TODO
+	return true;
 }
 
-void SoundManager::stopSong() {
+void MusicManager::midiRepeat() {
 	// TODO
 }
 
-void SoundManager::stopSound() {
-	// TODO: REALSTOPSND or BLASTSTOPSND or STOP_SOUNDG
+void MusicManager::stopSong() {
+	// TODO
 }
 
-void SoundManager::freeSounds() {
-	stopSound();
-	clearSounds();
+Resource *MusicManager::loadMusic(int fileNum, int subfile) {
+	return _vm->_files->loadFile(fileNum, subfile);
 }
 
-void SoundManager::newMusic(int musicId, int mode) {
+void MusicManager::newMusic(int musicId, int mode) {
 	if (mode == 1) {
 		stopSong();
 		freeMusic();
@@ -177,11 +190,11 @@ void SoundManager::newMusic(int musicId, int mode) {
 		_musicRepeat = (mode == 2);
 		_tempMusic = _music;
 		stopSong();
-		_music = loadSound(97, musicId);
+		_music = loadMusic(97, musicId);
 	}
 }
 
-void SoundManager::freeMusic() {
+void MusicManager::freeMusic() {
 	delete _music;
 	_music = nullptr;
 }
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 46e3b23bb1..b14ce7c685 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -54,9 +54,6 @@ private:
 
 public:
 	Common::Array<SoundEntry> _soundTable;
-	Resource *_music;
-	Resource *_tempMusic;
-	bool _musicRepeat;
 	bool _playingSound;
 	bool _isVoice;
 public:
@@ -70,6 +67,25 @@ public:
 	Resource *loadSound(int fileNum, int subfile);
 	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
 
+	void freeSounds();
+};
+
+class MusicManager {
+private:
+	AccessEngine *_vm;
+	Audio::Mixer *_mixer;
+
+	Resource *loadMusic(int fileNum, int subfile);
+
+public:
+	Resource *_music;
+	Resource *_tempMusic;
+	bool _musicRepeat;
+	bool _playingSound;
+public:
+	MusicManager(AccessEngine *vm, Audio::Mixer *mixer);
+	~MusicManager();
+
 	void midiPlay();
 
 	bool checkMidiDone();
@@ -78,13 +94,10 @@ public:
 
 	void stopSong();
 
-	void freeSounds();
-
 	void newMusic(int musicId, int mode);
 
 	void freeMusic();
 };
-
 } // End of namespace Access
 
 #endif /* ACCESS_SOUND_H*/
-- 
cgit v1.2.3


From 0277d1654d23fa92d09bfb6486d0b7a9514e6403 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 07:52:08 +0100
Subject: ACCESS: Remove two unused variables

---
 engines/access/access.cpp | 4 ----
 engines/access/access.h   | 2 --
 2 files changed, 6 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index b0b28f64f6..6111ec7906 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -53,8 +53,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_mouseMode = 0;
 	_currentMan = 0;
 	_currentManOld = -1;
-	_music = nullptr;
-	_title = nullptr;
 	_converseMode = 0;
 	_startAboutBox = 0;
 	_startTravelBox = 0;
@@ -109,8 +107,6 @@ AccessEngine::~AccessEngine() {
 	delete _video;
 
 	freeCells();
-	delete _music;
-	delete _title;
 	delete _eseg;
 }
 
diff --git a/engines/access/access.h b/engines/access/access.h
index da10d6326c..2fdf619a35 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -177,8 +177,6 @@ public:
 	int _mouseMode;
 
 	int _currentManOld;
-	Resource *_music;
-	Resource *_title;
 	int _converseMode;
 	int _startAboutBox;
 	int _startTravelBox;
-- 
cgit v1.2.3


From 9604da9da3fad69daca3604de618f5c91c293850 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 07:59:42 +0100
Subject: ACCESS: Rename _Eseg

---
 engines/access/access.cpp             |  4 ++--
 engines/access/access.h               |  2 +-
 engines/access/amazon/amazon_game.cpp | 28 ++++++++++++++--------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6111ec7906..41706fc4fd 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -68,7 +68,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleI = 0;
 	_imgUnscaled = false;
 	_canSaveLoad = false;
-	_eseg = nullptr;
+	_establish = nullptr;
 
 	_conversation = 0;
 	_currentMan = 0;
@@ -107,7 +107,7 @@ AccessEngine::~AccessEngine() {
 	delete _video;
 
 	freeCells();
-	delete _eseg;
+	delete _establish;
 }
 
 void AccessEngine::setVGA() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 2fdf619a35..eacdae9709 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -191,7 +191,7 @@ public:
 	bool _imgUnscaled;
 	bool _canSaveLoad;
 
-	Resource *_eseg;
+	Resource *_establish;
 	int _et;
 	int _printEnd;
 	int _txtPages;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index ba8b156e65..5b27eb24a2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -165,26 +165,26 @@ void AmazonEngine::loadEstablish(int estabIndex) {
 		int oldGroup = _establishGroup;
 		_establishGroup = 0;
 
-		_eseg = _files->loadFile(_estTable[oldGroup]);
-		_establishCtrlTblOfs = READ_LE_UINT16(_eseg->data());
+		_establish = _files->loadFile(_estTable[oldGroup]);
+		_establishCtrlTblOfs = READ_LE_UINT16(_establish->data());
 
 		int ofs = _establishCtrlTblOfs + (estabIndex * 2);
-		int idx = READ_LE_UINT16(_eseg->data() + ofs);
-		_narateFile = READ_LE_UINT16(_eseg->data() + idx);
-		_txtPages = READ_LE_UINT16(_eseg->data() + idx + 2);
+		int idx = READ_LE_UINT16(_establish->data() + ofs);
+		_narateFile = READ_LE_UINT16(_establish->data() + idx);
+		_txtPages = READ_LE_UINT16(_establish->data() + idx + 2);
 
 		if (!_txtPages)
 			return;
 
-		_sndSubFile = READ_LE_UINT16(_eseg->data() + idx + 4);
+		_sndSubFile = READ_LE_UINT16(_establish->data() + idx + 4);
 		for (int i = 0; i < _txtPages; ++i)
-			_countTbl[i] = READ_LE_UINT16(_eseg->data() + idx + 6 + (2 * i));
+			_countTbl[i] = READ_LE_UINT16(_establish->data() + idx + 6 + (2 * i));
 	} else {
 		_establishGroup = 0;
 		_narateFile = 0;
 		_txtPages = 0;
 		_sndSubFile = 0;
-		_eseg = _files->loadFile("ETEXT.DAT");
+		_establish = _files->loadFile("ETEXT.DAT");
 	}
 }
 
@@ -212,10 +212,10 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(estabIndex);
 	_et = estabIndex;
-	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (estabIndex * 2) + 2);
+	uint16 msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2) + 2);
 
 	_printEnd = 155;
-	Common::String msg((const char *)_eseg->data() + msgOffset);
+	Common::String msg((const char *)_establish->data() + msgOffset);
 
 	if (_txtPages == 0) {
 		printText(_screen, msg);
@@ -226,8 +226,8 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 
-	delete _eseg;
-	_eseg = nullptr;
+	delete _establish;
+	_establish = nullptr;
 
 	if (_establishMode == 0)
 		_room->init4Quads();
@@ -550,10 +550,10 @@ void AmazonEngine::startChapter(int chapter) {
 
 	_establishGroup = 1;
 	loadEstablish(0x40 + _chapter);
-	uint16 msgOffset = READ_LE_UINT16(_eseg->data() + ((0x40 + _chapter) * 2) + 2);
+	uint16 msgOffset = READ_LE_UINT16(_establish->data() + ((0x40 + _chapter) * 2) + 2);
 	_printEnd = 170;
 
-	Common::String msg((const char *)_eseg->data() + msgOffset);
+	Common::String msg((const char *)_establish->data() + msgOffset);
 
 	if (_txtPages == 0) {
 		printText(_screen, msg);
-- 
cgit v1.2.3


From 6e8f29c15b433e517b06c17fc63d082e7c5069d9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 08:22:40 +0100
Subject: ACCESS: Implement stopSound

---
 engines/access/sound.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 7d1885955a..a24dd1a24b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -134,8 +134,7 @@ void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
 }
 
 void SoundManager::stopSound() {
-	// TODO: REALSTOPSND or BLASTSTOPSND or STOP_SOUNDG
-	warning("TODO: stopSound");
+	_mixer->stopHandle(Audio::SoundHandle());
 }
 
 void SoundManager::freeSounds() {
-- 
cgit v1.2.3


From f364782d05cf0772bf2eaa71ea418650e0d9bf27 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 08:46:32 +0100
Subject: ACCESS: Some rework in MusicManager

---
 engines/access/room.cpp  |  5 ++---
 engines/access/sound.cpp | 10 +++++++---
 engines/access/sound.h   | 10 +++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 7ef3d6937d..8ef61a9d68 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -152,8 +152,7 @@ void Room::doRoom() {
 void Room::clearRoom() {
 	if (_vm->_midi->_music) {
 		_vm->_midi->stopSong();
-		delete _vm->_midi->_music;
-		_vm->_midi->_music = nullptr;
+		_vm->_midi->freeMusic();
 	}
 
 	_vm->_sound->freeSounds();
@@ -183,7 +182,7 @@ void Room::loadRoomData(const byte *roomData) {
 
 	_vm->_midi->freeMusic();
 	if (roomInfo._musicFile._fileNum != -1) {
-		_vm->_midi->_music = _vm->_files->loadFile(roomInfo._musicFile);
+		_vm->_midi->loadMusic(roomInfo._musicFile);
 		_vm->_midi->midiPlay();
 		_vm->_midi->_musicRepeat = true;
 	}
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index a24dd1a24b..316ac54d42 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -172,8 +172,12 @@ void MusicManager::stopSong() {
 	// TODO
 }
 
-Resource *MusicManager::loadMusic(int fileNum, int subfile) {
-	return _vm->_files->loadFile(fileNum, subfile);
+void MusicManager::loadMusic(int fileNum, int subfile) {
+	_music = _vm->_files->loadFile(fileNum, subfile);
+}
+
+void MusicManager::loadMusic(FileIdent file) {
+	_music = _vm->_files->loadFile(file);
 }
 
 void MusicManager::newMusic(int musicId, int mode) {
@@ -189,7 +193,7 @@ void MusicManager::newMusic(int musicId, int mode) {
 		_musicRepeat = (mode == 2);
 		_tempMusic = _music;
 		stopSong();
-		_music = loadMusic(97, musicId);
+		loadMusic(97, musicId);
 	}
 }
 
diff --git a/engines/access/sound.h b/engines/access/sound.h
index b14ce7c685..827a00f8b5 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -75,13 +75,14 @@ private:
 	AccessEngine *_vm;
 	Audio::Mixer *_mixer;
 
-	Resource *loadMusic(int fileNum, int subfile);
+	Resource *_tempMusic;
 
 public:
-	Resource *_music;
-	Resource *_tempMusic;
 	bool _musicRepeat;
 	bool _playingSound;
+
+	Resource *_music;
+
 public:
 	MusicManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~MusicManager();
@@ -97,6 +98,9 @@ public:
 	void newMusic(int musicId, int mode);
 
 	void freeMusic();
+
+	void loadMusic(int fileNum, int subfile);
+	void loadMusic(FileIdent file);
 };
 } // End of namespace Access
 
-- 
cgit v1.2.3


From 11870c414460d8c9ea70651a979b1842e58569e5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 14:07:09 +0100
Subject: ACCESS: Implement music player (WIP)

---
 engines/access/amazon/amazon_logic.cpp |  2 +-
 engines/access/room.cpp                |  2 +-
 engines/access/sound.cpp               | 84 ++++++++++++++++++++++++++++++----
 engines/access/sound.h                 | 12 +++--
 4 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c330429ee6..de497c2a35 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -353,7 +353,7 @@ void Opening::doTitle() {
 	}
 
 	_vm->_midi->newMusic(1, 1);
-	_vm->_midi->_musicRepeat = false;
+	_vm->_midi->setLoop(false);
 	_vm->_events->zeroKeys();
 	_vm->_room->loadRoom(0);
 	_vm->_screen->clearScreen();
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 8ef61a9d68..a5873b2c38 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -184,7 +184,7 @@ void Room::loadRoomData(const byte *roomData) {
 	if (roomInfo._musicFile._fileNum != -1) {
 		_vm->_midi->loadMusic(roomInfo._musicFile);
 		_vm->_midi->midiPlay();
-		_vm->_midi->_musicRepeat = true;
+		_vm->_midi->setLoop(true);
 	}
 
 	_vm->_scaleH1 = roomInfo._scaleH1;
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 316ac54d42..2d38a2c6bc 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -147,7 +147,20 @@ void SoundManager::freeSounds() {
 MusicManager::MusicManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_music = nullptr;
 	_tempMusic = nullptr;
-	_musicRepeat = false;
+	_isLooping = false;
+
+	MidiPlayer::createDriver();
+	MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
+
+	int retValue = _driver->open();
+	if (retValue == 0) {
+		if (_nativeMT32)
+			_driver->sendMT32Reset();
+		else
+			_driver->sendGMReset();
+
+		_driver->setTimerCallback(this, &timerCallback);
+	}
 }
 
 MusicManager::~MusicManager() {
@@ -155,46 +168,92 @@ MusicManager::~MusicManager() {
 	delete _tempMusic;
 }
 
+void MusicManager::send(uint32 b) {
+	if ((b & 0xF0) == 0xC0 && !_nativeMT32) {
+		b = (b & 0xFFFF00FF) | MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8;
+	}
+
+	Audio::MidiPlayer::send(b);
+}
+
 void MusicManager::midiPlay() {
-	// TODO
+	warning("MusicManager::midiPlay");
+	if (_music->_size < 4) {
+		error("midiPlay() wrong music resource size");
+	}
+
+	if (READ_BE_UINT32(_music->data()) != MKTAG('F', 'O', 'R', 'M'))
+		error("midiPlay() Unexpected signature");
+
+	stop();
+
+	_parser = MidiParser::createParser_XMIDI();
+
+	if (!_parser->loadMusic(_music->data(), _music->_size))
+		error("midiPlay() wrong music resource");
+
+	_parser->setTrack(0);
+	_parser->setMidiDriver(this);
+	_parser->setTimerRate(_driver->getBaseTempo());
+	_parser->property(MidiParser::mpCenterPitchWheelOnUnload, 1);
+	_parser->property(MidiParser::mpSendSustainOffOnNotesOff, 1);
+
+	// Handle music looping
+	_parser->property(MidiParser::mpAutoLoop, _isLooping);
+	//	_isLooping = loop;
+
+	setVolume(127);
+	_isPlaying = true;
 }
 
 bool MusicManager::checkMidiDone() {
-	// TODO
-	return true;
+	warning("MusicManager::checkMidiDone");
+	return (!_isPlaying);
 }
 
 void MusicManager::midiRepeat() {
-	// TODO
+	warning("MusicManager::midiRepeat");
+	if (!_parser)
+		return;
+
+	_isLooping = true;
+	_parser->property(MidiParser::mpAutoLoop, _isLooping);
+	if (!_isPlaying)
+		_parser->setTrack(0);
 }
 
 void MusicManager::stopSong() {
-	// TODO
+	warning("MusicManager::stopSong");
+	stop();
 }
 
 void MusicManager::loadMusic(int fileNum, int subfile) {
+	warning("MusicManager::loadMusic %d %d", fileNum, subfile);
 	_music = _vm->_files->loadFile(fileNum, subfile);
 }
 
 void MusicManager::loadMusic(FileIdent file) {
+	warning("MusicManager::loadMusic %d %d", file._fileNum, file._subfile);
 	_music = _vm->_files->loadFile(file);
 }
 
 void MusicManager::newMusic(int musicId, int mode) {
+	warning("MusicManager::newMusic %d %d", musicId, mode);
 	if (mode == 1) {
 		stopSong();
 		freeMusic();
 		_music = _tempMusic;
 		_tempMusic = nullptr;
-		_musicRepeat = true;
-		if (_music)
-			midiPlay();
+		_isLooping = true;
 	} else {
-		_musicRepeat = (mode == 2);
+		_isLooping = (mode == 2);
 		_tempMusic = _music;
 		stopSong();
 		loadMusic(97, musicId);
 	}
+
+	if (_music)
+		midiPlay();
 }
 
 void MusicManager::freeMusic() {
@@ -202,4 +261,9 @@ void MusicManager::freeMusic() {
 	_music = nullptr;
 }
 
+void MusicManager::setLoop(bool loop) {
+	_isLooping = loop;
+	if (_parser)
+		_parser->property(MidiParser::mpAutoLoop, _isLooping);
+}
 } // End of namespace Access
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 827a00f8b5..5089bd093b 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -26,6 +26,8 @@
 #include "common/scummsys.h"
 #include "audio/mixer.h"
 #include "access/files.h"
+#include "audio/midiplayer.h"
+#include "audio/midiparser.h"
 
 #define MAX_SOUNDS 20
 
@@ -70,17 +72,17 @@ public:
 	void freeSounds();
 };
 
-class MusicManager {
+class MusicManager : public Audio::MidiPlayer {
 private:
 	AccessEngine *_vm;
 	Audio::Mixer *_mixer;
 
 	Resource *_tempMusic;
 
-public:
-	bool _musicRepeat;
-	bool _playingSound;
+	// MidiDriver_BASE interface implementation
+	virtual void send(uint32 b);
 
+public:
 	Resource *_music;
 
 public:
@@ -101,6 +103,8 @@ public:
 
 	void loadMusic(int fileNum, int subfile);
 	void loadMusic(FileIdent file);
+
+	void setLoop(bool loop);
 };
 } // End of namespace Access
 
-- 
cgit v1.2.3


From 0028556d6c1706f647f0df3fddd04adb87bd6630 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 15:01:47 +0100
Subject: ACCESS: improve the sound during the title countdown

---
 engines/access/amazon/amazon_logic.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index de497c2a35..5db3efbecb 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -316,8 +316,12 @@ void Opening::doTitle() {
 		_vm->_screen->copyFrom(_vm->_buffer2);
 
 		_vm->_events->_vbCount = 70;
-		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0 && !_skipStart) {
+			_vm->_sound->playSound(1);
 			_vm->_events->pollEventsAndWait();
+			if (_vm->_events->_rightButton)
+				_skipStart = true;
+		}
 	}
 	if (_vm->shouldQuit())
 		return;
-- 
cgit v1.2.3


From 0eeb5b5bf3e6dfe5537647068f697eedda87c468 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 1 Dec 2014 15:18:21 +0100
Subject: ACCESS: Fix the horizontal scrolling in intro, add some calls to
 clearEvents

---
 engines/access/amazon/amazon_logic.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 5db3efbecb..1649cddc51 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -372,12 +372,12 @@ void Opening::doTitle() {
 	_vm->_screen->forceFadeIn();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
-	// KEYFLG = 0;
+	_vm->_events->clearEvents();
 	_vm->_player->_scrollAmount = 1;
 	_pCount = 0;
 
 	while (!_vm->shouldQuit()) {
-		if (!_vm->_events->isKeyMousePressed()) {
+		if (_vm->_events->isKeyMousePressed()) {
 			if (_vm->_events->_rightButton)
 				_skipStart = true;
 			_vm->_room->clearRoom();
@@ -616,8 +616,7 @@ void Plane::mWhileFly() {
 	screen.fadeIn();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
-
-	// KEYFLG = 0;
+	_vm->_events->clearEvents();
 
 	screen._scrollRow = screen._scrollCol = 0;
 	screen._scrollX = screen._scrollY = 0;
@@ -673,8 +672,7 @@ void Plane::mWhileFall() {
 	screen.fadeIn();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
-
-	// KEYFLG = 0;
+	_vm->_events->clearEvents();
 
 	screen._scrollRow = screen._scrollCol = 0;
 	screen._scrollX = screen._scrollY = 0;
@@ -768,7 +766,7 @@ void Jungle::initJWalk2() {
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 	_vm->_screen->fadeIn();
-	// KEYFL = 0;
+	_vm->_events->clearEvents();
 
 	_xCount = 2;
 	_vm->_player->_scrollAmount = 5;
@@ -1395,7 +1393,8 @@ void River::initRiver() {
 		// Reset draw rects
 		_vm->_oldRects.clear();
 		_vm->_newRects.clear();
-		// KEYFLG = 0
+		_vm->_events->clearEvents();
+
 	}
 
 	_vm->_player->_scrollAmount = 2;
-- 
cgit v1.2.3


From 954a0d0f9f8ebf3fc49df583d9eda59de8f62ed8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 2 Dec 2014 16:28:30 +0100
Subject: ACCESS: Remove useless (and commented) code

---
 engines/access/sound.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 2d38a2c6bc..bf11d6a624 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -200,7 +200,6 @@ void MusicManager::midiPlay() {
 
 	// Handle music looping
 	_parser->property(MidiParser::mpAutoLoop, _isLooping);
-	//	_isLooping = loop;
 
 	setVolume(127);
 	_isPlaying = true;
-- 
cgit v1.2.3


From 66f9d71f1dc27ab0e4d3499703e39ebf35e87a27 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 2 Dec 2014 16:29:42 +0100
Subject: ACCESS: Add some code for the intro (WIP)

---
 engines/access/access.h                    |   1 +
 engines/access/amazon/amazon_logic.cpp     | 148 ++++++------
 engines/access/amazon/amazon_resources.cpp | 375 +++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |   2 +
 engines/access/amazon/amazon_room.cpp      |   5 +-
 engines/access/detection.cpp               |   4 +
 engines/access/files.cpp                   |   5 +-
 7 files changed, 465 insertions(+), 75 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index eacdae9709..2fe4b726a2 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -221,6 +221,7 @@ public:
 
 	uint32 getFeatures() const;
 	bool isCD() const;
+	bool isDemo() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 	uint16 getVersion() const;
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 1649cddc51..68a52e77f8 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -273,92 +273,94 @@ void Opening::doTitle() {
 	_vm->_screen->forceFadeOut();
 	_vm->_events->hideCursor();
 
-	_vm->_sound->queueSound(0, 98, 30);
-	_vm->_sound->queueSound(1, 98, 8);
-
-	_vm->_files->_setPaletteFlag = false;
-	_vm->_files->loadScreen(0, 3);
-	
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-	_vm->_screen->forceFadeIn();
-	_vm->_sound->playSound(1);
+	if (!_vm->isDemo()) {
+		_vm->_sound->queueSound(0, 98, 30);
+		_vm->_sound->queueSound(1, 98, 8);
+
+		_vm->_files->_setPaletteFlag = false;
+		_vm->_files->loadScreen(0, 3);
+		
+		_vm->_buffer2.copyFrom(*_vm->_screen);
+		_vm->_buffer1.copyFrom(*_vm->_screen);
+		_vm->_screen->forceFadeIn();
+		_vm->_sound->playSound(1);
 
-	// WORKAROUND: This delay has been added to replace original game delay that
-	// came from loading resources, since nowadays it would be too fast to be visible
-	// nowadays to be visible.
-	_vm->_events->_vbCount = 70;
-	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
-		_vm->_events->pollEventsAndWait();
-	if (_vm->shouldQuit())
-		return;
+		// WORKAROUND: This delay has been added to replace original game delay that
+		// came from loading resources, since nowadays it would be too fast to be visible
+		// nowadays to be visible.
+		_vm->_events->_vbCount = 70;
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+			_vm->_events->pollEventsAndWait();
+		if (_vm->shouldQuit())
+			return;
 
-	Resource *spriteData = _vm->_files->loadFile(0, 2);
-	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
-	delete spriteData;
+		Resource *spriteData = _vm->_files->loadFile(0, 2);
+		_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
+		delete spriteData;
 
-	_vm->_sound->playSound(1);
+		_vm->_sound->playSound(1);
 
-	_vm->_files->_setPaletteFlag = false;
-	_vm->_files->loadScreen(0, 4);
-	_vm->_sound->playSound(1);
+		_vm->_files->_setPaletteFlag = false;
+		_vm->_files->loadScreen(0, 4);
+		_vm->_sound->playSound(1);
 
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-	_vm->_sound->playSound(1);
+		_vm->_buffer2.copyFrom(*_vm->_screen);
+		_vm->_buffer1.copyFrom(*_vm->_screen);
+		_vm->_sound->playSound(1);
 
-	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (_pCount = 0; _pCount < 3 && !_vm->shouldQuit(); ++_pCount) {
-		_vm->_buffer2.copyFrom(_vm->_buffer1);
-		int id = COUNTDOWN[_pCount * 2];
-		int xp = COUNTDOWN[_pCount * 2 + 1];
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
-		_vm->_screen->copyFrom(_vm->_buffer2);
+		const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
+		for (_pCount = 0; _pCount < 3 && !_vm->shouldQuit(); ++_pCount) {
+			_vm->_buffer2.copyFrom(_vm->_buffer1);
+			int id = COUNTDOWN[_pCount * 2];
+			int xp = COUNTDOWN[_pCount * 2 + 1];
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
+			_vm->_screen->copyFrom(_vm->_buffer2);
 
-		_vm->_events->_vbCount = 70;
-		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0 && !_skipStart) {
-			_vm->_sound->playSound(1);
-			_vm->_events->pollEventsAndWait();
-			if (_vm->_events->_rightButton)
-				_skipStart = true;
+			_vm->_events->_vbCount = 70;
+			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0 && !_skipStart) {
+				_vm->_sound->playSound(1);
+				_vm->_events->pollEventsAndWait();
+				if (_vm->_events->_rightButton)
+					_skipStart = true;
+			}
 		}
-	}
-	if (_vm->shouldQuit())
-		return;
+		if (_vm->shouldQuit())
+			return;
 
-	_vm->_sound->playSound(0);
-	_vm->_screen->forceFadeOut();
-	_vm->_events->_vbCount = 100;
-	while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
-		_vm->_events->pollEventsAndWait();
-	if (_vm->shouldQuit())
-		return;
+		_vm->_sound->playSound(0);
+		_vm->_screen->forceFadeOut();
+		_vm->_events->_vbCount = 100;
+		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
+			_vm->_events->pollEventsAndWait();
+		if (_vm->shouldQuit())
+			return;
 
-	_vm->_sound->freeSounds();
-	delete _vm->_objectsTable[0];
-	_vm->_objectsTable[0] = nullptr;
+		_vm->_sound->freeSounds();
+		delete _vm->_objectsTable[0];
+		_vm->_objectsTable[0] = nullptr;
+
+		_vm->_files->_setPaletteFlag = false;
+		_vm->_files->loadScreen(0, 5);
+		_vm->_buffer2.copyFrom(*_vm->_screen);
+		_vm->_buffer1.copyFrom(*_vm->_screen);
+		_vm->_screen->forceFadeIn();
+		_vm->_midi->newMusic(1, 0);
+		_vm->_events->_vbCount = 700;
+		while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0) && !_vm->_events->isKeyMousePressed()) {
+			_vm->_events->pollEventsAndWait();
+		}
 
-	_vm->_files->_setPaletteFlag = false;
-	_vm->_files->loadScreen(0, 5);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-	_vm->_screen->forceFadeIn();
-	_vm->_midi->newMusic(1, 0);
-	_vm->_events->_vbCount = 700;
-	while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0) && !_vm->_events->isKeyMousePressed()) {
-		_vm->_events->pollEventsAndWait();
-	}
+		if (_vm->_events->_rightButton) {
+			_skipStart = true;
+			_vm->_room->clearRoom();
+			_vm->_events->showCursor();
+			return;
+		}
 
-	if (_vm->_events->_rightButton) {
-		_skipStart = true;
-		_vm->_room->clearRoom();
-		_vm->_events->showCursor();
-		return;
+		_vm->_midi->newMusic(1, 1);
+		_vm->_midi->setLoop(false);
+		_vm->_events->zeroKeys();
 	}
-
-	_vm->_midi->newMusic(1, 1);
-	_vm->_midi->setLoop(false);
-	_vm->_events->zeroKeys();
 	_vm->_room->loadRoom(0);
 	_vm->_screen->clearScreen();
 	_vm->_screen->setBufferScan();
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 0ae7ef0718..8e5fccbf25 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -51,6 +51,25 @@ const char *const FILENAMES[] = {
 	"NARATE13.AP", "NARATE14.AP", "S00.AP", "TAG.AP"
 };
 
+const char *const FILENAMES_DEMO[] = {
+	"S00.AP", "S01.AP", "S02.AP", "R03.AP", "S04.AP", "S05.AP",
+	"S06.AP", "S07.AP", "S08.AP", "S09.AP", "S10.AP", "S11.AP",
+	"S12.AP", "S13.AP", "S14.AP", "S15.AP", "S16.AP", "S17.AP",
+	"S18.AP", "S19.AP", "S20.AP", "S21.AP", "S22.AP", "S23.AP",
+	"S24.AP", "S25.AP", "S26.AP", "S27.AP", "S28.AP", "S29.AP",
+	"S30.AP", "S31.AP", "S32.AP", "S33.AP", "S34.AP", "R35.AP",
+	"S36.AP", "S37.AP", "S38.AP", "S39.AP", "S40.AP", "TITLE.AP",
+	"S42.AP", "S01.AP", "S44.AP", "S45.AP", "S46.AP", "S47.AP",
+	nullptr, nullptr, "S50.AP", nullptr, nullptr, "S53.AP",
+	"S54.AP", nullptr, nullptr, "S57.AP", nullptr, nullptr,
+	nullptr, "S61.AP", nullptr, "C23.AP", "C12.AP", "C00.AP",
+	"C01.AP", "C06.AP", "C07.AP", "C08.AP", "C05.AP", "C09.AP",
+	"C12.AP", "C03.AP", "C13.AP", "C15.AP", "C14.AP", "C16.AP",
+	"C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP",
+	"C24.AP", "C25.AP", "R49.AP", "R49.AP", "R49.AP", "R49.AP",
+	"R49.AP", "R49.AP", "R49.AP", "R49.AP", "DEAD.AP", "EST.AP",
+	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP" 
+};
 const byte MOUSE0[] = {
 	0, 0, 0, 0, 
 	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
@@ -603,6 +622,362 @@ const char *ROOM_DESCR[] = {
 	nullptr, "Pit with Ants", nullptr, nullptr
 };
 
+const byte ROOM_TABLE1_DEMO[] = {
+	0x02, 0x61, 0x00, 0x03, 0x00, 0x30, 0x22, 0x30, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE5_DEMO[] = {
+	0x00, 0x61, 0x00, 0x0E, 0x00, 0x36, 0x0F, 0x5E, 0x04, 0x00,
+	0x00, 0x00, 0x04, 0x04, 0x00, 0x03, 0x00, 0xFF, 0x04, 0x00,
+	0x02, 0x00, 0x04, 0x00, 0x01, 0x00, 0x8C, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x0B, 0x00, 0x01, 0x00, 0x62, 0x00, 0x0C, 0x00,
+	0x01, 0x00, 0x62, 0x00, 0x0D, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE6_DEMO[] = {
+	0x00, 0x61, 0x00, 0x0E, 0x00, 0x40, 0x3E, 0x1A, 0x05, 0x00,
+	0x00, 0x00, 0x05, 0x05, 0x00, 0x03, 0x00, 0xFF, 0x05, 0x00,
+	0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0xFF, 0x30, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00,
+	0x62, 0x00, 0x12, 0x00, 0x03, 0x00, 0x62, 0x00, 0x13, 0x00,
+	0x01, 0x00, 0x62, 0x00, 0x14, 0x00, 0x02, 0x00, 0x62, 0x00,
+	0x04, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE7_DEMO[] = {
+	0x01, 0x61, 0x00, 0x0D, 0x00, 0x40, 0x20, 0xC4, 0x06, 0x00,
+	0x00, 0x00, 0x06, 0x06, 0x00, 0x03, 0x00, 0xFF, 0x06, 0x00,
+	0x02, 0x00, 0x06, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x01, 0x00, 0x01, 0x00, 0x62, 0x00, 0x02, 0x00,
+	0x01, 0x00, 0x62, 0x00, 0x03, 0x00, 0x02, 0x00, 0x62, 0x00,
+	0x26, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE9_DEMO[] = {
+	0x01, 0x61, 0x00, 0x0D, 0x00, 0x40, 0x20, 0xC4, 0x08, 0x00,
+	0x00, 0x00, 0x08, 0x08, 0x00, 0x03, 0x00, 0xFF, 0x08, 0x00,
+	0x02, 0x00, 0x08, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x07, 0x00, 0x01, 0x00, 0x62, 0x00, 0x08, 0x00,
+	0x02, 0x00, 0x62, 0x00, 0x09, 0x00, 0x01, 0x00, 0x62, 0x00,
+	0x0A, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE10_DEMO[] = {
+	0x00, 0x61, 0x00, 0x0E, 0x00, 0x30, 0x18, 0x9B, 0x09, 0x00,
+	0x00, 0x00, 0x09, 0x09, 0x00, 0x03, 0x00, 0xFF, 0x09, 0x00,
+	0x02, 0x00, 0x09, 0x00, 0x01, 0x00, 0xB4, 0x10, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x03, 0x00,
+	0x62, 0x00, 0x04, 0x00, 0x01, 0x00, 0x62, 0x00, 0x05, 0x00,
+	0x02, 0x00, 0x62, 0x00, 0x06, 0x00, 0x02, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE11_DEMO[] = {
+	0x01, 0x61, 0x00, 0x0E, 0x00, 0x40, 0x30, 0x14, 0x0A, 0x00,
+	0x00, 0x00, 0x0A, 0x0A, 0x00, 0x03, 0x00, 0xFF, 0x0A, 0x00,
+	0x02, 0x00, 0x0A, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x15, 0x00, 0x01, 0x00, 0x62, 0x00, 0x16, 0x00,
+	0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE12_DEMO[] = {
+	0x01, 0x61, 0x00, 0x0E, 0x00, 0x40, 0x3A, 0x22, 0x0B, 0x00,
+	0x00, 0x00, 0x0B, 0x0B, 0x00, 0x03, 0x00, 0xFF, 0x0B, 0x00,
+	0x02, 0x00, 0x0B, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE13_DEMO[] = {
+	0x01, 0x61, 0x00, 0x08, 0x00, 0x40, 0x30, 0x14, 0x0C, 0x00,
+	0x00, 0x00, 0x0C, 0x0C, 0x00, 0x03, 0x00, 0xFF, 0x0C, 0x00,
+	0x02, 0x00, 0x0C, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x18, 0x00, 0x02, 0x00,
+	0x62, 0x00, 0x17, 0x00, 0x01, 0x00, 0x62, 0x00, 0x11, 0x00,
+	0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE14_DEMO[] = {
+	0x01, 0x61, 0x00, 0x0D, 0x00, 0x40, 0x36, 0x2C, 0x0D, 0x00,
+	0x00, 0x00, 0x0D, 0x0D, 0x00, 0x03, 0x00, 0xFF, 0x0D, 0x00,
+	0x02, 0x00, 0x0D, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE15_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x3E, 0x33, 0xFF, 0xFF,
+	0x00, 0x00, 0xFF, 0x0E, 0x00, 0x05, 0x00, 0x0E, 0x00, 0x04,
+	0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF
+};
+
+const byte ROOM_TABLE16_DEMO[] = {
+	0x01, 0x61, 0x00, 0x10, 0x00, 0x28, 0x0C, 0x5E, 0x0F, 0x00,
+	0x00, 0x00, 0x0F, 0x0F, 0x00, 0x02, 0x00, 0xFF, 0x0F, 0x00,
+	0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE17_DEMO[] = {
+	0x02, 0x61, 0x00, 0x10, 0x00, 0x40, 0x20, 0x30, 0x10, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x00, 0x03, 0x00, 0xFF, 0x10, 0x00,
+	0x02, 0x00, 0x10, 0x00, 0x01, 0x00, 0x6E, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE18_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x19, 0x2B, 0x11, 0x00,
+	0x00, 0x00, 0x11, 0x11, 0x00, 0x03, 0x00, 0xFF, 0x11, 0x00,
+	0x02, 0x00, 0x11, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE19_DEMO[] = {
+	0x01, 0x61, 0x00, 0x11, 0x00, 0x2D, 0x14, 0x3C, 0x12, 0x00,
+	0x00, 0x00, 0x12, 0x12, 0x00, 0x03, 0x00, 0xFF, 0x12, 0x00,
+	0x02, 0x00, 0x12, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE20_DEMO[] = {
+	0x02, 0x61, 0x00, 0x12, 0x00, 0x2D, 0x28, 0x28, 0x13, 0x00,
+	0x00, 0x00, 0x13, 0x13, 0x00, 0x03, 0x00, 0xFF, 0x13, 0x00,
+	0x02, 0x00, 0x13, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00,
+	0x62, 0x00, 0x29, 0x00, 0x01, 0x00, 0x62, 0x00, 0x24, 0x00,
+	0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE21_DEMO[] = {
+	0x01, 0x61, 0x00, 0x16, 0x00, 0x28, 0x0C, 0x5E, 0x14, 0x00,
+	0x00, 0x00, 0x14, 0x14, 0x00, 0x02, 0x00, 0xFF, 0x14, 0x00,
+	0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE22_DEMO[] = {
+	0x01, 0x61, 0x00, 0x12, 0x00, 0x3C, 0x2A, 0x29, 0x15, 0x00,
+	0x00, 0x00, 0x15, 0x15, 0x00, 0x03, 0x00, 0xFF, 0x15, 0x00,
+	0x02, 0x00, 0x15, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x23, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE23_DEMO[] = {
+	0x01, 0x61, 0x00, 0x13, 0x00, 0x40, 0x2D, 0x64, 0x16, 0x00,
+	0x00, 0x00, 0xFF, 0x16, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00,
+	0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x16, 0x00, 0x02,
+	0x00, 0xFF, 0xFF, 0x62, 0x00, 0x2A, 0x00, 0x01, 0x00, 0xFF,
+	0xFF
+};
+
+const byte ROOM_TABLE24_DEMO[] = {
+	0x02, 0x61, 0x00, 0x14, 0x00, 0x40, 0x3C, 0x19, 0x17, 0x00,
+	0x00, 0x00, 0x17, 0x17, 0x00, 0x03, 0x00, 0xFF, 0x17, 0x00,
+	0x02, 0x00, 0x17, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE25_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x3F, 0x5A, 0x18, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x00, 0x02, 0x00, 0xFF, 0x18, 0x00,
+	0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xDC, 0xA0, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE26_DEMO[] = {
+	0x02, 0x61, 0x00, 0x17, 0x00, 0x3E, 0x32, 0x80, 0x19, 0x00,
+	0x00, 0x00, 0x19, 0x19, 0x00, 0x03, 0x00, 0xFF, 0x19, 0x00,
+	0x02, 0x00, 0x19, 0x00, 0x01, 0x00, 0x64, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE27_DEMO[] = {
+	0x01, 0x61, 0x00, 0x19, 0x00, 0x34, 0x28, 0x28, 0x1A, 0x00,
+	0x00, 0x00, 0x1A, 0x1A, 0x00, 0x03, 0x00, 0xFF, 0x1A, 0x00,
+	0x02, 0x00, 0x1A, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x28, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x2B, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE28_DEMO[] = {
+	0x02, 0x61, 0x00, 0x18, 0x00, 0x40, 0x3A, 0x6C, 0x1B, 0x00,
+	0x00, 0x00, 0x1B, 0x1B, 0x00, 0x03, 0x00, 0xFF, 0x1B, 0x00,
+	0x02, 0x00, 0x1B, 0x00, 0x01, 0x00, 0xC8, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE30_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x20, 0x18, 0x73, 0x1D, 0x00,
+	0x00, 0x00, 0x1D, 0x1D, 0x00, 0x03, 0x00, 0xFF, 0x1D, 0x00,
+	0x02, 0x00, 0x1D, 0x00, 0x01, 0x00, 0x80, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE31_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x1C, 0x27, 0x1E, 0x00,
+	0x00, 0x00, 0x1E, 0x1E, 0x00, 0x03, 0x00, 0xFF, 0x1E, 0x00,
+	0x02, 0x00, 0x1E, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE32_DEMO[] = {
+	0x02, 0x61, 0x00, 0x1B, 0x00, 0x40, 0x10, 0x78, 0x1F, 0x00,
+	0x00, 0x00, 0x1F, 0x1F, 0x00, 0x03, 0x00, 0xFF, 0x1F, 0x00,
+	0x02, 0x00, 0x1F, 0x00, 0x01, 0x00, 0xFE, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00,
+	0x62, 0x00, 0x1F, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE33_DEMO[] = {
+	0x01, 0x61, 0x00, 0x1E, 0x00, 0x40, 0x3B, 0x4B, 0x20, 0x00,
+	0x00, 0x00, 0x20, 0x20, 0x00, 0x03, 0x00, 0xFF, 0x20, 0x00,
+	0x02, 0x00, 0x20, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE34_DEMO[] = {
+	0x01, 0x61, 0x00, 0x04, 0x00, 0x30, 0x10, 0x51, 0x21, 0x00,
+	0x00, 0x00, 0x21, 0x21, 0x00, 0x02, 0x00, 0xFF, 0x21, 0x00,
+	0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x2E, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x2F, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE37_DEMO[] = {
+	0x02, 0x61, 0x00, 0x04, 0x00, 0x3E, 0x3A, 0x32, 0x24, 0x00,
+	0x00, 0x00, 0x24, 0x24, 0x00, 0x03, 0x00, 0xFF, 0x24, 0x00,
+	0x02, 0x00, 0x24, 0x00, 0x01, 0x00, 0xB4, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x2D, 0x00, 0x02, 0x00,
+	0x62, 0x00, 0x1F, 0x00, 0x01, 0x00, 0x62, 0x00, 0x2E, 0x00,
+	0x01, 0x00, 0x62, 0x00, 0x2F, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE38_DEMO[] = {
+	0x03, 0x61, 0x00, 0x08, 0x00, 0x3F, 0x3F, 0xFF, 0x25, 0x00,
+	0x00, 0x00, 0x25, 0x25, 0x00, 0x03, 0x00, 0xFF, 0x25, 0x00,
+	0x02, 0x00, 0x25, 0x00, 0x01, 0x00, 0xFF, 0x40, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00,
+	0x62, 0x00, 0x21, 0x00, 0x01, 0x00, 0x62, 0x00, 0x25, 0x00,
+	0x01, 0x00, 0x62, 0x00, 0x1F, 0x00, 0x01, 0x00, 0x62, 0x00,
+	0x30, 0x00, 0x01, 0x00, 0x62, 0x00, 0x32, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE39_DEMO[] = {
+	0x01, 0x61, 0x00, 0x08, 0x00, 0x40, 0x32, 0x50, 0x26, 0x00,
+	0x00, 0x00, 0x26, 0x26, 0x00, 0x03, 0x00, 0xFF, 0x26, 0x00,
+	0x02, 0x00, 0x26, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x62, 0x00, 0x22, 0x00, 0x02, 0x00, 0x62, 0x00, 0x31, 0x00,
+	0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE40_DEMO[] = {
+	0x02, 0x61, 0x00, 0x09, 0x00, 0x40, 0x3F, 0x37, 0x27, 0x00,
+	0x00, 0x00, 0x27, 0x27, 0x00, 0x03, 0x00, 0xFF, 0x27, 0x00,
+	0x02, 0x00, 0x27, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x04, 0x00,
+	0x62, 0x00, 0x1B, 0x00, 0x03, 0x00, 0x62, 0x00, 0x1C, 0x00,
+	0x01, 0x00, 0x62, 0x00, 0x1F, 0x00, 0x02, 0x00, 0x62, 0x00,
+	0x23, 0x00, 0x01, 0x00, 0x62, 0x00, 0x32, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE43_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x1B, 0x6E, 0x2A, 0x00,
+	0x00, 0x00, 0x2A, 0x2A, 0x00, 0x03, 0x00, 0xFF, 0x2A, 0x00,
+	0x02, 0x00, 0x2A, 0x00, 0x01, 0x00, 0xA5, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE45_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x1D, 0xBE, 0x2C, 0x00,
+	0x00, 0x00, 0x2C, 0x2C, 0x00, 0x03, 0x00, 0xFF, 0x2C, 0x00,
+	0x02, 0x00, 0x2C, 0x00, 0x01, 0x00, 0x50, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE46_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x1D, 0x78, 0x2D, 0x00,
+	0x00, 0x00, 0x2D, 0x2D, 0x00, 0x03, 0x00, 0xFF, 0x2D, 0x00,
+	0x02, 0x00, 0x2D, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE47_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x32, 0x2E, 0x00,
+	0x00, 0x00, 0x2E, 0x2E, 0x00, 0x03, 0x00, 0xFF, 0x2E, 0x00,
+	0x02, 0x00, 0x2E, 0x00, 0x01, 0x00, 0xF0, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE48_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x32, 0x2F, 0x00,
+	0x00, 0x00, 0x2F, 0x2F, 0x00, 0x03, 0x00, 0xFF, 0x2F, 0x00,
+	0x02, 0x00, 0x2F, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE51_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x32, 0xFF, 0xFF,
+	0x00, 0x00, 0xFF, 0x32, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x04,
+	0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x32,
+	0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE55_DEMO[] = {
+	0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x6E, 0x36, 0x00,
+	0x00, 0x00, 0x36, 0x36, 0x00, 0x03, 0x00, 0xFF, 0x36, 0x00,
+	0x02, 0x00, 0x36, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x36, 0x00, 0x04, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+const byte ROOM_TABLE58_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x32, 0x14, 0x73, 0x39, 0x00,
+	0x00, 0x00, 0x39, 0x39, 0x00, 0x03, 0x00, 0xFF, 0x39, 0x00,
+	0x02, 0x00, 0x39, 0x00, 0x01, 0x00, 0xB4, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0xFF, 0xFF
+};
+
+const byte ROOM_TABLE62_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x41, 0x3F, 0x19, 0x3D, 0x00,
+	0x00, 0x00, 0x3D, 0x3D, 0x00, 0x03, 0x00, 0x3E, 0x3D, 0x00,
+	0x04, 0x00, 0xFF, 0x3D, 0x00, 0x02, 0x00, 0x3D, 0x00, 0x01,
+	0x00, 0xBE, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62,
+	0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00
+};
+
+const byte *ROOM_TABLE_DEMO[] = {
+	ROOM_TABLE1_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE5_DEMO,
+	ROOM_TABLE6_DEMO, ROOM_TABLE7_DEMO, nullptr, ROOM_TABLE9_DEMO, ROOM_TABLE10_DEMO,
+	ROOM_TABLE11_DEMO, ROOM_TABLE12_DEMO, ROOM_TABLE13_DEMO, ROOM_TABLE14_DEMO, ROOM_TABLE15_DEMO,
+	ROOM_TABLE16_DEMO, ROOM_TABLE17_DEMO, ROOM_TABLE18_DEMO, ROOM_TABLE19_DEMO, ROOM_TABLE20_DEMO,
+	ROOM_TABLE21_DEMO, ROOM_TABLE22_DEMO, ROOM_TABLE23_DEMO, ROOM_TABLE24_DEMO, ROOM_TABLE25_DEMO,
+	ROOM_TABLE26_DEMO, ROOM_TABLE27_DEMO, ROOM_TABLE28_DEMO, nullptr, ROOM_TABLE30_DEMO,
+	ROOM_TABLE31_DEMO, ROOM_TABLE32_DEMO, ROOM_TABLE33_DEMO, ROOM_TABLE34_DEMO, nullptr,
+	nullptr, ROOM_TABLE37_DEMO, ROOM_TABLE38_DEMO, ROOM_TABLE39_DEMO, ROOM_TABLE40_DEMO,
+	nullptr, nullptr, ROOM_TABLE43_DEMO, nullptr, ROOM_TABLE45_DEMO, 
+	ROOM_TABLE46_DEMO, ROOM_TABLE47_DEMO, ROOM_TABLE48_DEMO, nullptr, nullptr,
+	ROOM_TABLE51_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE55_DEMO,
+	nullptr, nullptr, ROOM_TABLE58_DEMO, nullptr, nullptr,
+	nullptr, ROOM_TABLE62_DEMO, nullptr, nullptr
+};
+
 const int ROOM_NUMB = 63;
 
 const byte ELAINE[] = {
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 61659d30d4..e75b78a9e3 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -39,6 +39,7 @@ struct RiverStruct {
 };
 
 extern const char *const FILENAMES[];
+extern const char *const FILENAMES_DEMO[];
 
 extern const byte *CURSORS[10];
 
@@ -59,6 +60,7 @@ extern const int OVEROFFDLY[];
 
 extern const byte *ROOM_TABLE[];
 extern const char *ROOM_DESCR[];
+extern const byte *ROOM_TABLE_DEMO[];
 extern const int ROOM_NUMB;
 
 extern const byte *CHARTBL[];
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 14514c2c7c..24aedf5722 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -41,7 +41,10 @@ AmazonRoom::~AmazonRoom() {
 }
 
 void AmazonRoom::loadRoom(int roomNumber) {
-	loadRoomData(ROOM_TABLE[roomNumber]);
+	if (_vm->isDemo())
+		loadRoomData(ROOM_TABLE_DEMO[roomNumber]);
+	else
+		loadRoomData(ROOM_TABLE[roomNumber]);
 }
 
 void AmazonRoom::reloadRoom() {
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 59c4bc4738..914f98e232 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -61,6 +61,10 @@ bool AccessEngine::isCD() const {
 	return (bool)(_gameDescription->desc.flags & ADGF_CD);
 }
 
+bool AccessEngine::isDemo() const {
+	return (bool)(_gameDescription->desc.flags & ADGF_DEMO);
+}
+
 Common::Language AccessEngine::getLanguage() const {
 	return _gameDescription->desc.language;
 }
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index cbcfa3f614..6671a484de 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -82,7 +82,10 @@ byte *Resource::data() {
 FileManager::FileManager(AccessEngine *vm): _vm(vm) {
 	switch (vm->getGameID()) {
 	case GType_Amazon:
-		_filenames = &Amazon::FILENAMES[0];
+		if (_vm->isDemo())
+			_filenames = &Amazon::FILENAMES_DEMO[0];
+		else
+			_filenames = &Amazon::FILENAMES[0];
 		break;
 	case GType_MartianMemorandum:
 		_filenames = &Martian::FILENAMES[0];
-- 
cgit v1.2.3


From f9685533292b0301ed9770439e55f39fbc934a7f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 2 Dec 2014 23:50:40 +0100
Subject: ACCESS: Fix RoomInfo for the demo version, fix a typo in a comment

---
 engines/access/files.cpp | 2 +-
 engines/access/room.cpp  | 7 ++++---
 engines/access/room.h    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 6671a484de..9fff6c4102 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -211,7 +211,7 @@ void FileManager::setAppended(Resource *res, int fileNum) {
 	if (!res->_file.open(_filenames[fileNum]))
 		error("Could not open file %s", _filenames[fileNum]);
 
-	// If a different file has been opened then previously, load it's index
+	// If a different file has been opened then previously, load its index
 	if (_fileNumber != fileNum) {
 		_fileNumber = fileNum;
 			
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a5873b2c38..97341b04b9 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -167,7 +167,7 @@ void Room::clearRoom() {
 }
 
 void Room::loadRoomData(const byte *roomData) {
-	RoomInfo roomInfo(roomData, _vm->getGameID(), _vm->isCD());
+	RoomInfo roomInfo(roomData, _vm->getGameID(), _vm->isCD(), _vm->isDemo());
 
 	_roomFlag = roomInfo._roomFlag;
 
@@ -777,7 +777,7 @@ bool Room::checkCode(int v1, int v2) {
 
 /*------------------------------------------------------------------------*/
 
-RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD) {
+RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD, bool isDemo) {
 	Common::MemoryReadStream stream(data, 999);
 
 	_roomFlag = stream.readByte();
@@ -787,7 +787,8 @@ RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD) {
 			_estIndex = stream.readSint16LE();
 		else {
 			_estIndex = -1;
-			stream.readSint16LE();
+			if (!isDemo)
+				stream.readSint16LE();
 		}
 	} else
 		_estIndex = -1;
diff --git a/engines/access/room.h b/engines/access/room.h
index 4ec80d114c..db794dbc96 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -194,7 +194,7 @@ public:
 	Common::Array<ExtraCell> _extraCells;
 	Common::Array<SoundIdent> _sounds;
 public:
-	RoomInfo(const byte *data, int gameType, bool isCD);
+	RoomInfo(const byte *data, int gameType, bool isCD, bool isDemo);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 8267b5d2abe9bd5f620502bd436acb74453daa06 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 2 Dec 2014 23:59:36 +0100
Subject: ACCESS: Skip the unknown midi file format used by the demo

---
 engines/access/sound.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index bf11d6a624..7dab0a75f7 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -182,27 +182,29 @@ void MusicManager::midiPlay() {
 		error("midiPlay() wrong music resource size");
 	}
 
-	if (READ_BE_UINT32(_music->data()) != MKTAG('F', 'O', 'R', 'M'))
-		error("midiPlay() Unexpected signature");
-
 	stop();
 
-	_parser = MidiParser::createParser_XMIDI();
+	if (READ_BE_UINT32(_music->data()) != MKTAG('F', 'O', 'R', 'M')) {
+		warning("midiPlay() Unexpected signature");
+		_isPlaying = false;
+	} else {
+		_parser = MidiParser::createParser_XMIDI();
 
-	if (!_parser->loadMusic(_music->data(), _music->_size))
-		error("midiPlay() wrong music resource");
+		if (!_parser->loadMusic(_music->data(), _music->_size))
+			error("midiPlay() wrong music resource");
 
-	_parser->setTrack(0);
-	_parser->setMidiDriver(this);
-	_parser->setTimerRate(_driver->getBaseTempo());
-	_parser->property(MidiParser::mpCenterPitchWheelOnUnload, 1);
-	_parser->property(MidiParser::mpSendSustainOffOnNotesOff, 1);
+		_parser->setTrack(0);
+		_parser->setMidiDriver(this);
+		_parser->setTimerRate(_driver->getBaseTempo());
+		_parser->property(MidiParser::mpCenterPitchWheelOnUnload, 1);
+		_parser->property(MidiParser::mpSendSustainOffOnNotesOff, 1);
 
-	// Handle music looping
-	_parser->property(MidiParser::mpAutoLoop, _isLooping);
+		// Handle music looping
+		_parser->property(MidiParser::mpAutoLoop, _isLooping);
 
-	setVolume(127);
-	_isPlaying = true;
+		setVolume(127);
+		_isPlaying = true;
+	}
 }
 
 bool MusicManager::checkMidiDone() {
-- 
cgit v1.2.3


From 860f7c717cc9ed2f89b87bd75783f3d74c19c572 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 3 Dec 2014 00:33:08 +0100
Subject: ACCESS: Implement the demo logic in doTitle

---
 engines/access/amazon/amazon_logic.cpp | 80 ++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 68a52e77f8..b92197129a 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -236,27 +236,69 @@ void Opening::doCredit() {
 		return;
 
 	if (_pCount <= 75)
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(90, 35));
-	else if (_pCount <= 210)
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 1, Common::Point(65, 35));
-	else if (_pCount <= 272)
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
-	else if (_pCount <= 334)
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
-	else if (_pCount <= 396)
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
-	else if (_pCount <= 458) {
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(8, 5));
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(88, 55));
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(194, 98));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], _vm->isDemo()? 24 : 0, Common::Point(90, 35));
+	else if (_pCount <= 210) {
+		if (_vm->isDemo())
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 25, Common::Point(82, 35));
+		else
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 1, Common::Point(65, 35));
+	} else if (_pCount <= 272) {
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 23, Common::Point(77, 20));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(50, 35));
+		} else 
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
+	} else if (_pCount <= 334) {
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 16, Common::Point(200, 70));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(170, 85));
+		} else 
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
+	} else if (_pCount <= 396) {
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 15, Common::Point(65, 15));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(30, 30));
+		} else 
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
+	} else if (_pCount <= 458) {
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 19, Common::Point(123, 40));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(115, 55));
+		} else {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(8, 5));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(88, 55));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(194, 98));
+		}
 	} else if (_pCount <= 520) {
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(32, 13));
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 8, Common::Point(162, 80));
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 18, Common::Point(50, 15));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(40, 30));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(40, 55));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 20, Common::Point(198, 95));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(160, 110));
+		} else {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(32, 13));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 8, Common::Point(162, 80));
+		}
 	} else if (_pCount <= 580) {
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(18, 15));
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(164, 81));
-	} else
-		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(106, 55));
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 21, Common::Point(40, 10));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(20, 25));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 22, Common::Point(145, 50));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(125, 65));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(207, 90));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(200, 105));
+		} else {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(18, 15));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(164, 81));
+		}
+	} else {
+		if (_vm->isDemo()) {
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(125, 30));
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(115, 45));
+		} else
+			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(106, 55));
+	}
 }
 
 void Opening::scrollTitle() {
-- 
cgit v1.2.3


From 2413fd0798b3eb0bd89b51a03dea432b40311bfd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 3 Dec 2014 00:57:52 +0100
Subject: ACCESS: Skip the end of the full intro in the demo

---
 engines/access/amazon/amazon_logic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index b92197129a..4fcca20594 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -219,7 +219,7 @@ void Opening::doIntroduction() {
 	_vm->_screen->setPanel(3);
 	doTitle();
 
-	if (_vm->shouldQuit() || _skipStart)
+	if (_vm->shouldQuit() || _skipStart || _vm->isDemo())
 		return;
 
 	_vm->_screen->setPanel(3);
-- 
cgit v1.2.3


From c6322702e692948933056b889820c84b8af842c5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 3 Dec 2014 20:30:21 +0100
Subject: ACCESS: Fix doEstablish for the floppy and for the demo versions

---
 engines/access/amazon/amazon_game.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 5b27eb24a2..29197fe93c 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -142,7 +142,10 @@ void AmazonEngine::setupGame() {
 void AmazonEngine::initVariables() {
 	_chapter = 1;
 	// Set player room and position
-	_player->_roomNumber = 4;
+	if (isDemo())
+		_player->_roomNumber = 33;
+	else
+		_player->_roomNumber = 4;
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
 }
@@ -212,7 +215,11 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(estabIndex);
 	_et = estabIndex;
-	uint16 msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2) + 2);
+	uint16 msgOffset;
+	if (!isCD())
+		msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2));
+	else
+		msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2) + 2);
 
 	_printEnd = 155;
 	Common::String msg((const char *)_establish->data() + msgOffset);
-- 
cgit v1.2.3


From cbd772ea5fa0c6911ba56d3aad78c078f1d9a2ac Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 3 Dec 2014 23:52:06 +0100
Subject: ACCESS: Avoid the call to loadScreen in mWhileDownRiver

---
 engines/access/amazon/amazon_logic.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 4fcca20594..65519f3b17 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1731,15 +1731,17 @@ void River::plotRiver() {
 
 void River::mWhileDownRiver() {
 	_vm->_events->hideCursor();
+
 	_vm->_screen->setDisplayScan();
 	_vm->_screen->clearScreen();
 	_vm->_screen->savePalette();
-
-	_vm->_files->loadScreen(95, 4);
+	if (!_vm->isDemo())
+		_vm->_files->loadScreen(95, 4);
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 	_vm->_screen->restorePalette();
 	_vm->_screen->setPalette();
 	_vm->_screen->setBufferScan();
+
 	_vm->_screen->_scrollX = 0;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-- 
cgit v1.2.3


From 771bcc8efd12d40c9ad13c270fe93567e093f329 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Dec 2014 01:01:20 +0100
Subject: ACCESS: Add warnings about opcodes changed in the demo version

---
 engines/access/amazon/amazon_scripts.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index da43f1bc82..80aded7983 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -321,14 +321,29 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		loadBackground(param1, param2);
 		break;
 	case 3:
-		_game->_cast.doCast(param1);
+		if (_vm->isDemo())
+			warning("TODO: DEMO - LOADCELLSET");
+		else
+			_game->_cast.doCast(param1);
 		break;
 	case 4:
-		setInactive();
+		if (_vm->isDemo())
+			warning("TODO: DEMO - LOADNSOUND");
+		else
+			setInactive();
+		break;
+	case 5: 
+		warning("TODO: DEMO - UNLOADCELLSET");
 		break;
 	case 6:
 		mWhile(param1);
 		break;
+	case 7:
+		warning("TODO: DEMO - ADDMONEY");
+		break;
+	case 8:
+		warning("TODO: DEMO - CHKMONEY");
+		break;
 	case 9:
 		_game->_guard.doGuard();
 		break;
-- 
cgit v1.2.3


From 580fec468f61d8883ad0a78b27cc6555532b5803 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Dec 2014 01:21:23 +0100
Subject: ACCESS: Implement loadNSound, add a warning about another special
 opcode used by the demo

---
 engines/access/amazon/amazon_scripts.cpp | 10 +++++++++-
 engines/access/amazon/amazon_scripts.h   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 80aded7983..43532aa93c 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -246,6 +246,11 @@ void AmazonScripts::loadBackground(int param1, int param2) {
 	_vm->_screen->forceFadeIn();
 }
 
+void AmazonScripts::loadNSound(int param1, int param2) {
+	Resource *sound = _vm->_files->loadFile(param1, param2);
+	_vm->_sound->_soundTable.push_back(SoundEntry(sound, 1));
+}
+
 void AmazonScripts::setInactive() {
 	_game->_rawInactiveX = _vm->_player->_rawPlayer.x;
 	_game->_rawInactiveY = _vm->_player->_rawPlayer.y;
@@ -314,6 +319,9 @@ void AmazonScripts::plotInactive() {
 
 void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 	switch (commandIndex) {
+	case 0:
+		warning("TODO: DEMO - RESETAN");
+		break;
 	case 1:
 		_vm->establish(param1, param2);
 		break;
@@ -328,7 +336,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		break;
 	case 4:
 		if (_vm->isDemo())
-			warning("TODO: DEMO - LOADNSOUND");
+			loadNSound(param1, param2);
 		else
 			setInactive();
 		break;
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 968d51e2c4..573ffb89bf 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -45,6 +45,7 @@ protected:
 	void mWhile(int param1);
 	void loadBackground(int param1, int param2);
 	void plotInactive();
+	void loadNSound(int param1, int param2);
 	void setInactive();
 	void boatWalls(int param1, int param2);
 
-- 
cgit v1.2.3


From e35e6df93a72f1a29b731281bef123d675bcfd01 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Dec 2014 01:25:16 +0100
Subject: ACCESS: Rename cmdObject

---
 engines/access/scripts.cpp | 4 ++--
 engines/access/scripts.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2c32f59ced..57af1a869c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -109,7 +109,7 @@ typedef void(Scripts::*ScriptMethodPtr)();
 
 void Scripts::executeCommand(int commandIndex) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
-		&Scripts::CMDOBJECT, &Scripts::cmdEndObject, &Scripts::cmdJumpLook, 
+		&Scripts::cmdObject, &Scripts::cmdEndObject, &Scripts::cmdJumpLook, 
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
@@ -139,7 +139,7 @@ void Scripts::executeCommand(int commandIndex) {
 	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::CMDOBJECT() { 
+void Scripts::cmdObject() { 
 	_vm->_bubbleBox->load(_data);
 }
 
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 098fd4f322..cc9eca3d04 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -52,7 +52,7 @@ protected:
 	 */
 	Common::String readString();
 
-	void CMDOBJECT();
+	void cmdObject();
 	void cmdEndObject();
 	void cmdJumpLook();
 	void cmdJumpHelp();
-- 
cgit v1.2.3


From 7571fdd4b19f5f1bf3008d764c85c254ed86f635 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Dec 2014 02:01:51 +0100
Subject: ACCESS: Add some more Demo opcodes

---
 engines/access/amazon/amazon_scripts.cpp |   8 ++-
 engines/access/scripts.cpp               | 100 ++++++++++++++++++++++++++++---
 engines/access/scripts.h                 |  13 ++++
 3 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 43532aa93c..5cf22106b7 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -472,8 +472,12 @@ void AmazonScripts::cmdCycleBack() {
 		_vm->_screen->cyclePaletteBackwards();
 }
 void AmazonScripts::cmdChapter() {
-	int chapter = _data->readByte();
-	_game->startChapter(chapter);
+	if (_vm->isDemo()) {
+		cmdSetHelp();
+	} else {
+		int chapter = _data->readByte();
+		_game->startChapter(chapter);
+	}
 }
 
 void AmazonScripts::cmdSetHelp() {
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 57af1a869c..053e824956 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -114,24 +114,24 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
 		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
-		&Scripts::cmdSetInventory, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
+		&Scripts::cmdAddScore, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
 		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::cmdConverse, 
 		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
 		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
-		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetTimer, 
+		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetAbout, 
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
-		&Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
+		&Scripts::cmdJumpGoto, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
 		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
-		&Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, 
+		&Scripts::cmdSetScroll, &Scripts::cmdSaveRect, &Scripts::cmdVideoEnded, 
 		&Scripts::cmdSetBufVid, &Scripts::cmdPlayBufVid, &Scripts::cmdRemoveLast, 
-		&Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial,
+		&Scripts::cmdDoTravel, &Scripts::cmdCheckAbout, &Scripts::cmdSpecial,
 		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
 		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
 		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice, 
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
-		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, 
-		&Scripts::CMDPUSHLOCATION, &Scripts::CMDPUSHLOCATION, &Scripts::cmdPlayerOff, 
+		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::CMDPUSHLOCATION, 
+		&Scripts::cmdCheckTravel, &Scripts::cmdBlock, &Scripts::cmdPlayerOff, 
 		&Scripts::cmdPlayerOn, &Scripts::cmdDead, &Scripts::cmdFadeOut,
 		&Scripts::cmdEndVideo
 	};
@@ -263,6 +263,15 @@ void Scripts::cmdGoto() {
 	searchForSequence();
 }
 
+void Scripts::cmdAddScore() {
+	if (_vm->isCD()) {
+		cmdSetInventory();
+		return;
+	}
+
+	_data->skip(1);
+}
+
 void Scripts::cmdSetInventory() { 
 	int itemId = _data->readByte();
 	int itemVal = _data->readByte();
@@ -400,6 +409,15 @@ void Scripts::cmdDispInv() {
 	_vm->_inventory->newDisplayInv();
 }
 
+void Scripts::cmdSetAbout() {
+	if (_vm->isCD()) {
+		cmdSetTimer();
+		return;
+	}
+
+	error("TODO: DEMO - cmdSetAbout");
+}
+
 void Scripts::cmdSetTimer() {
 	int idx = _data->readUint16LE();
 	int val = _data->readUint16LE();
@@ -439,6 +457,14 @@ void Scripts::cmdCheckTimer() {
 }
 
 void Scripts::cmdSetTravel() {
+	if (_vm->isCD()) {
+		cmdJumpGoto();
+		return;
+	}
+	error("TODO: DEMO - cmdSetTravel");
+}
+
+void Scripts::cmdJumpGoto() {
 	if (_vm->_room->_selectCommand == 5)
 		cmdGoto();
 	else
@@ -486,6 +512,14 @@ void Scripts::cmdSetScroll() {
 	_vm->_screen->_scrollY = 0;
 }
 
+void Scripts::cmdSaveRect() {
+	if (_vm->isCD()) {
+		cmdVideoEnded();
+		return;
+	}
+	error("TODO: DEMO - cmdSaveRect");
+}
+
 void Scripts::cmdVideoEnded() { 
 	_vm->_events->pollEvents();
 
@@ -515,6 +549,22 @@ void Scripts::cmdRemoveLast() {
 	--_vm->_numAnimTimers;
 }
 
+void Scripts::cmdDoTravel() {
+	if (_vm->isCD()) {
+		cmdSpecial();
+		return;
+	}
+	error("TODO: DEMO - cmdDoTravel");
+}
+
+void Scripts::cmdCheckAbout() {
+	if (_vm->isCD()) {
+		cmdSpecial();
+		return;
+	}
+	error("TODO: DEMO - cmdCheckAbout");
+}
+
 void Scripts::cmdSpecial() { 
 	_specialFunction = _data->readUint16LE();
 	int p1 = _data->readUint16LE();
@@ -774,7 +824,41 @@ void Scripts::cmdPlayVideoSound() {
 	g_system->delayMillis(10);
 }
 
-void Scripts::CMDPUSHLOCATION() { error("TODO CMDPUSHLOCATION"); }
+void Scripts::cmdPrintWatch() {
+	if (_vm->isCD()) {
+		CMDPUSHLOCATION();
+		return;
+	}
+	error("TODO: DEMO - cmdPrintWatch"); 
+}
+
+void Scripts::cmdDispAbout() {
+	if (_vm->isCD()) {
+		CMDPUSHLOCATION();
+		return;
+	}
+	error("TODO: DEMO - cmdDispAbout"); 
+}
+
+void Scripts::CMDPUSHLOCATION() {
+	error("TODO CMDPUSHLOCATION"); 
+}
+
+void Scripts::cmdCheckTravel() {
+	if (_vm->isCD()) {
+		CMDPUSHLOCATION();
+		return;
+	}
+	error("TODO: DEMO - cmdCheckTravel"); 
+}
+
+void Scripts::cmdBlock() {
+	if (_vm->isCD()) {
+		CMDPUSHLOCATION();
+		return;
+	}
+	error("TODO: DEMO - cmdBlock"); 
+}
 
 void Scripts::cmdPlayerOff() {
 	_vm->_player->_playerOff = true;
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index cc9eca3d04..320da73bbb 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -71,6 +71,7 @@ protected:
 	 */
 	void cmdGoto();
 	
+	void cmdAddScore();
 	void cmdSetInventory();
 	void cmdCheckInventory();
 	void cmdSetTex();
@@ -83,8 +84,10 @@ protected:
 	void cmdCheckLoc();
 	void cmdSetAnim();
 	void cmdDispInv();
+	void cmdSetAbout();
 	void cmdSetTimer();
 	void cmdCheckTimer();
+	void cmdJumpGoto();
 	void cmdSetTravel();
 	void cmdSetVideo();
 	void cmdPlayVideo();
@@ -92,10 +95,13 @@ protected:
 	void cmdSetDisplay();
 	void cmdSetBuffer();
 	void cmdSetScroll();
+	void cmdSaveRect();
 	void cmdVideoEnded();
 	void cmdSetBufVid();
 	void cmdPlayBufVid();
 	void cmdRemoveLast();
+	void cmdDoTravel();
+	void cmdCheckAbout();
 	void cmdSpecial();
 	void cmdSetCycle();
 	void cmdCycle();
@@ -111,12 +117,19 @@ protected:
 	void cmdLoadSound();
 	void cmdSetVideoSound();
 	void cmdPlayVideoSound();
+	void cmdPrintWatch();
+	void cmdDispAbout();
 	void CMDPUSHLOCATION();
+	void cmdCheckTravel();
+	void cmdBlock();
 	void cmdPlayerOff();
 	void cmdPlayerOn();
 	void cmdDead();
 	void cmdFadeOut();
 	void cmdEndVideo();
+	void cmdHelp();
+	void cmdCycleBack();
+	void cmdSetHelp();
 public:
 	int _sequence;
 	bool _endFlag;
-- 
cgit v1.2.3


From 889a564e73e824f736706345c19497007a321df7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 22:25:37 -0500
Subject: ACCESS: Fix definition of river data structures

---
 engines/access/amazon/amazon_logic.cpp     |  6 +++---
 engines/access/amazon/amazon_resources.cpp | 28 +++++++++++++---------------
 engines/access/amazon/amazon_resources.h   | 14 ++++++--------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 65519f3b17..039cc01342 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1461,7 +1461,7 @@ void River::initRiver() {
 	}
 
 	_riverIndex = _vm->_riverFlag;
-	_topList = RIVEROBJECTTBL[_riverIndex];
+	_topList = RIVER_OBJECTS[_riverIndex][RIVER_START];
 	updateObstacles();
 	riverSetPhysX();
 	_canoeDir = 0;
@@ -1637,7 +1637,7 @@ void River::moveCanoe2() {
 
 void River::updateObstacles() {
 	RiverStruct *cur;
-	for (cur = _topList; cur < RIVEROBJECTTBL[_riverIndex + 1]; ++cur) {
+	for (cur = _topList; cur < RIVER_OBJECTS[_riverIndex][RIVER_END]; ++cur) {
 		int val = cur->_field1 + cur->_field3 - 1;
 		if (val < _screenVertX)
 			break;
@@ -1646,7 +1646,7 @@ void River::updateObstacles() {
 			_topList = cur;
 			_botList = cur;
 
-			while (cur < RIVEROBJECTTBL[_riverIndex + 1]) {
+			while (cur < RIVER_OBJECTS[_riverIndex][RIVER_END]) {
 				++cur;
 				val = cur->_field1 + cur->_field3 - 1;
 				if (val < _screenVertX || (cur->_field3 >= (_screenVirtX + 319)))
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 8e5fccbf25..1b83e6bf70 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1980,7 +1980,7 @@ const int DOWNRIVEROBJ[14][4] = {
 	{ 3, 700, 0, 20 }
 };
 
-RiverStruct RIVER0OBJECTS[45] = {
+RiverStruct RIVER0OBJECTS[46] = {
 	{16,  31, 6400, 0, 4, 12},
 	{16,  31, 6200, 0, 2, 12},
 	{17,  30, 6100, 0, 3, 15},
@@ -2025,12 +2025,11 @@ RiverStruct RIVER0OBJECTS[45] = {
 	{16,  31,  910, 0, 5, 12},
 	{17,  30,  705, 0, 0, 15},
 	{16,  31,  550, 0, 4, 12},
-	{17,  30,  305, 0, 2, 15}
+	{17,  30,  305, 0, 2, 15},
+	{16,  31,  260, 0, 7, 12}
 };
 
-RiverStruct ENDRIVER0[1] = { { 16, 31, 260, 0, 7, 12 } };
-
-RiverStruct RIVER1OBJECTS[49] = {
+RiverStruct RIVER1OBJECTS[50] = {
 	{16,  31, 6920, 0, 1, 12},
 	{16,  31, 6740, 0, 4, 12},
 	{17,  30, 6699, 0, 1, 15},
@@ -2079,12 +2078,11 @@ RiverStruct RIVER1OBJECTS[49] = {
 	{16,  31,  910, 0, 7, 12},
 	{17,  30,  705, 0, 0, 15},
 	{16,  31,  550, 0, 6, 12},
-	{17,  30,  305, 0, 3, 15}
+	{17,  30,  305, 0, 3, 15},
+	{ 16, 31, 260, 0, 1, 12 }
 };
 
-RiverStruct ENDRIVER1[1] = { { 16, 31, 260, 0, 1, 12 } };
-
-RiverStruct RIVER2OBJECTS[53] = {
+RiverStruct RIVER2OBJECTS[54] = {
 	{16,  31, 8230, 0, 6, 12},
 	{16,  31, 8115, 0, 7, 12},
 	{17,  30, 7955, 0, 4, 15},
@@ -2137,14 +2135,14 @@ RiverStruct RIVER2OBJECTS[53] = {
 	{16,  31,  910, 0, 5, 12},
 	{17,  30,  705, 0, 0, 15},
 	{16,  31,  550, 0, 4, 12},
-	{17,  30,  305, 0, 3, 15}
+	{17,  30,  305, 0, 3, 15},
+	{16,  31,  260, 0, 6, 12}
 };
 
-RiverStruct ENDRIVER2[1] = { { 16, 31, 260, 0, 6, 12 } };
-
-RiverStruct *RIVEROBJECTTBL[6] = {
-	RIVER0OBJECTS, ENDRIVER0, RIVER1OBJECTS, 
-	ENDRIVER1, RIVER2OBJECTS, ENDRIVER2
+RiverStruct *RIVER_OBJECTS[3][2] = {
+	{ RIVER0OBJECTS, RIVER0OBJECTS + 46 - 1},
+	{ RIVER1OBJECTS, RIVER0OBJECTS + 50 - 1 },
+	{ RIVER2OBJECTS, RIVER0OBJECTS + 54 - 1 }
 };
 
 const int HELP1COORDS[2][4] = {
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index e75b78a9e3..be1dc7d05b 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -120,14 +120,12 @@ extern const byte *MAPTBL[3];
 
 extern const int DOWNRIVEROBJ[14][4];
 
-extern RiverStruct RIVER0OBJECTS[45];
-extern RiverStruct ENDRIVER0[1];
-extern RiverStruct RIVER1OBJECTS[49];
-extern RiverStruct ENDRIVER1[1];
-extern RiverStruct RIVER2OBJECTS[53];
-extern RiverStruct ENDRIVER2[1];
-
-extern RiverStruct *RIVEROBJECTTBL[6];
+extern RiverStruct RIVER0OBJECTS[46];
+extern RiverStruct RIVER1OBJECTS[50];
+extern RiverStruct RIVER2OBJECTS[54];
+extern RiverStruct *RIVER_OBJECTS[3][2];
+enum { RIVER_START = 0, RIVER_END = 1 };
+
 extern const int HELP1COORDS[2][4];
 
 extern const int RIVER1OBJ[23][4];
-- 
cgit v1.2.3


From 4c2ab8b2979dcbc7ccaee4d42e79aed554d1eb46 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 22:53:45 -0500
Subject: ACCESS: Remove misnamed duplicate _screenVirtX field

---
 engines/access/amazon/amazon_logic.cpp | 16 ++++++++--------
 engines/access/amazon/amazon_logic.h   |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 039cc01342..1a9765e835 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -43,7 +43,6 @@ PannedScene::PannedScene(AmazonEngine *vm): AmazonManager(vm) {
 	_xTrack = _yTrack = _zTrack = 0;
 	_xCam = _yCam = _zCam = 0;
 	_pNumObj = 0;
-	_screenVertX = 0;
 }
 
 void PannedScene::pan() {
@@ -1363,7 +1362,7 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_rNewRectCount = 0;
 	_rKeyFlag = 0;
 	_mapOffset = 0;
-	_screenVirtX = 0;
+	_screenVertX = 0;
 	_saveRiver = false;
 }
 
@@ -1642,14 +1641,14 @@ void River::updateObstacles() {
 		if (val < _screenVertX)
 			break;
 
-		if (cur->_field3 < (_screenVirtX + 319)) {
+		if (cur->_field3 < (_screenVertX + 319)) {
 			_topList = cur;
 			_botList = cur;
 
 			while (cur < RIVER_OBJECTS[_riverIndex][RIVER_END]) {
 				++cur;
 				val = cur->_field1 + cur->_field3 - 1;
-				if (val < _screenVertX || (cur->_field3 >= (_screenVirtX + 319)))
+				if (val < _screenVertX || (cur->_field3 >= (_screenVertX + 319)))
 					break;
 
 				_botList = cur;
@@ -1834,15 +1833,16 @@ void River::river() {
 	while (!_vm->shouldQuit()) {
 		_vm->_events->_vbCount = 4;
 
-		//		int bx = _vm->_player->_scrollAmount - _screenVertX;
+		// Move the river position
+		_screenVertX -= _vm->_player->_scrollAmount;
+
 		if (_vm->_screen->_scrollX == 0) {
 			_vm->_midi->midiRepeat();
 			if (riverJumpTest()) {
 				_CHICKENOUTFLG = false;
 				return;
 			}
-		}
-		else {
+		} else {
 			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
 		}
 
@@ -1913,7 +1913,7 @@ void River::synchronize(Common::Serializer &s) {
 		s.syncAsUint16LE(_rNewRectCount);
 		s.syncAsUint16LE(_rKeyFlag);
 		s.syncAsUint16LE(_mapOffset);
-		s.syncAsUint16LE(_screenVirtX);
+		s.syncAsUint16LE(_screenVertX);
 		warning("TODO: 	s.syncAsSint16LE(_topList);");
 		warning("TODO: 	s.syncAsSint16LE(_botList);");
 
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index c2752af77b..f6f07b46e2 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -61,7 +61,6 @@ protected:
 	int _yCam;
 	int _zCam;
 	int _pNumObj;
-	int _screenVertX;
 
 	PanEntry _pan[PAN_SIZE];
 public:
@@ -183,7 +182,7 @@ private:
 	int _rNewRectCount;
 	int _rKeyFlag;
 	int _mapOffset;
-	int _screenVirtX;
+	int _screenVertX;
 
 	void initRiver();
 	void resetPositions();
-- 
cgit v1.2.3


From c1e80440b5969e025109301fad9fa8426558108a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 22:56:58 -0500
Subject: ACCESS: Fix the formatting of a bunch of else statements

---
 engines/access/amazon/amazon_logic.cpp | 36 ++++++++++++----------------------
 engines/access/player.cpp              |  3 +--
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 1a9765e835..94a61ade61 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1040,8 +1040,7 @@ void Guard::chkVLine() {
 	if (_position.x > _vm->_player->_rawPlayer.x) {
 		_topLeft = _vm->_player->_rawPlayer;
 		_bottomRight = _position;
-	}
-	else {
+	} else {
 		_topLeft = _position;
 		_bottomRight = _vm->_player->_rawPlayer;
 	}
@@ -1071,8 +1070,7 @@ void Guard::chkVLine() {
 
 			_topLeft.x = midX;
 			_topLeft.y = midY;
-		}
-		else {
+		} else {
 			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
 				return;
 
@@ -1086,8 +1084,7 @@ void Guard::chkHLine() {
 	if (_position.y > _vm->_player->_rawPlayer.y) {
 		_topLeft = _vm->_player->_rawPlayer;
 		_bottomRight = _position;
-	}
-	else {
+	} else {
 		_topLeft = _position;
 		_bottomRight = _vm->_player->_rawPlayer;
 	}
@@ -1117,8 +1114,7 @@ void Guard::chkHLine() {
 
 			_topLeft.x = midX;
 			_topLeft.y = midY;
-		}
-		else {
+		} else {
 			if ((midX == _bottomRight.x) && (midY == _bottomRight.y))
 				return;
 
@@ -2032,15 +2028,13 @@ int Ant::antHandleStab(int indx, const int *&buf) {
 					_pitPos.y = 127;
 					retval = 0;
 					buf = Amazon::PITWALK;
-				}
-				else {
+				} else {
 					_pitPos.x += buf[(retval / 2) + 1];
 					_pitPos.y += buf[(retval / 2) + 2];
 					_pitCel = retval;
 				}
 			}
-		}
-		else {
+		} else {
 			_stabFl = true;
 			_pitCel = 0;
 			retval = 0;
@@ -2095,8 +2089,7 @@ void Ant::doAnt() {
 		_vm->_flags[235] = 1;
 		_antCel = 0;
 		buf = Amazon::ANTEAT;
-	}
-	else {
+	} else {
 		buf = Amazon::ANTWALK;
 		if (_vm->_inventory->_inv[76]._value == 1)
 			_antDirection = UP;
@@ -2115,19 +2108,16 @@ void Ant::doAnt() {
 				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
 				_antCel = idx;
 			}
-		}
-		else {
+		} else {
 			idx += 6;
 			if (buf[(idx / 2)] != -1) {
 				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
 				_antCel = idx;
-			}
-			else if (!_antDieFl) {
+			} else if (!_antDieFl) {
 				idx = 0;
 				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
 				_antCel = idx;
-			}
-			else {
+			} else {
 				idx -= 6;
 				if (_vm->_flags[200] == 0)
 					_vm->_flags[200] = 1;
@@ -2148,8 +2138,7 @@ void Ant::doAnt() {
 		idx = _pitCel;
 		if (_stabFl == 1) {
 			idx = antHandleStab(idx, buf);
-		}
-		else {
+		} else {
 			buf = Amazon::PITWALK;
 			if (_vm->_timers[13]._flag == 0) {
 				_vm->_timers[13]._flag = 1;
@@ -2160,8 +2149,7 @@ void Ant::doAnt() {
 						idx = antHandleLeft(idx, buf);
 					else if (pt.x > _pitPos.x)
 						idx = antHandleRight(idx, buf);
-				}
-				else {
+				} else {
 					buf = Amazon::PITWALK;
 					if (_vm->_player->_playerDirection == UP)
 						idx = antHandleStab(idx, buf);
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index cb7459e8cc..97d7d4845d 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -528,8 +528,7 @@ void Player::walkDownRight() {
 		_rawTempL = (byte)tempL;
 		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] +
 			(tempL >= 0x100 ? 1 : 0);
-	}
-	else {
+	} else {
 		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[_scrollConst];
 	}
 
-- 
cgit v1.2.3


From 93b1516f9f7398de188808884f2696751056237a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 23:04:28 -0500
Subject: ACCESS: Fix display of rocks in the river arcade scene

---
 engines/access/amazon/amazon_logic.cpp   | 28 ++++++++++++++--------------
 engines/access/amazon/amazon_resources.h |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 94a61ade61..7029a7c917 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1633,18 +1633,18 @@ void River::moveCanoe2() {
 void River::updateObstacles() {
 	RiverStruct *cur;
 	for (cur = _topList; cur < RIVER_OBJECTS[_riverIndex][RIVER_END]; ++cur) {
-		int val = cur->_field1 + cur->_field3 - 1;
+		int val = cur->_field1 + cur->_riverX - 1;
 		if (val < _screenVertX)
 			break;
 
-		if (cur->_field3 < (_screenVertX + 319)) {
+		if (cur->_riverX < (_screenVertX + 319)) {
 			_topList = cur;
 			_botList = cur;
 
 			while (cur < RIVER_OBJECTS[_riverIndex][RIVER_END]) {
 				++cur;
-				val = cur->_field1 + cur->_field3 - 1;
-				if (val < _screenVertX || (cur->_field3 >= (_screenVertX + 319)))
+				val = cur->_field1 + cur->_riverX - 1;
+				if (val < _screenVertX || (cur->_riverX >= (_screenVertX + 319)))
 					break;
 
 				_botList = cur;
@@ -1663,7 +1663,7 @@ void River::riverSetPhysX() {
 	int val = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
 	RiverStruct *cur = _topList;
 	while (cur <= _botList) {
-		cur[0]._field5 = val - (_screenVertX - cur[0]._field3);
+		cur[0]._xp = val - (_screenVertX - cur[0]._riverX);
 		++cur;
 	}
 }
@@ -1675,12 +1675,12 @@ bool River::checkRiverCollide() {
 	_canoeVXPos = _screenVertX + 170;
 
 	for (RiverStruct *si = _topList; si <= _botList; ++si) {
-		if (si[0]._lane < _canoeLane)
+		if (si->_lane < _canoeLane)
 			continue;
 
-		if ((si[0]._lane == _canoeLane) || (si[0]._lane == _canoeLane + 1)) {
-			if (si[0]._field1 + si[0]._field3 - 1 >= _canoeVXPos) {
-				if (_canoeVXPos + 124 >= si[0]._field3) {
+		if ((si->_lane == _canoeLane) || (si->_lane == _canoeLane + 1)) {
+			if (si->_field1 + si->_riverX - 1 >= _canoeVXPos) {
+				if (_canoeVXPos + 124 >= si->_riverX) {
 					_vm->_sound->playSound(4);
 					return true;
 				}
@@ -1710,14 +1710,14 @@ void River::plotRiver() {
 
 	RiverStruct *cur = _topList;
 	while (cur <= _botList) {
-		if (cur[0]._id != -1) {
+		if (cur->_id != -1) {
 			ie._flags = IMGFLAG_UNSCALED;
 			ie._spritesPtr = _vm->_objectsTable[45];
-			ie._frameNumber = 0;
-			ie._position.x = cur[0]._field5;
+			ie._frameNumber = cur->_id;
+			ie._position.x = cur->_xp;
 			int val = (cur[0]._lane * 5) + 56;
-			ie._position.y = val - cur[0]._field8;
-			ie._offsetY = cur[0]._field8;
+			ie._position.y = val - cur->_offsetY;
+			ie._offsetY = cur->_offsetY;
 			_vm->_images.addToList(ie);
 		}
 		++cur;
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index be1dc7d05b..b6b0dbbdce 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -32,10 +32,10 @@ namespace Amazon {
 struct RiverStruct {
 	int _id;
 	int _field1;
-	int _field3;
-	int _field5;
+	int _riverX;
+	int _xp;
 	int _lane;
-	int _field8;
+	int _offsetY;
 };
 
 extern const char *const FILENAMES[];
-- 
cgit v1.2.3


From f2cd2ee5b3b9cef53441375cb35bd2fd67a80f48 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 23:13:15 -0500
Subject: ACCESS: Move river death flags from engine to River class

---
 engines/access/amazon/amazon_game.h    |  3 ---
 engines/access/amazon/amazon_logic.cpp | 25 +++++++++++++------------
 engines/access/amazon/amazon_logic.h   |  3 +++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index ca8287b87e..43fce80191 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -108,9 +108,6 @@ public:
 	int _oldTitleChapter;
 	int _maxHits;
 	int _oldScrollCol;
-	bool _deathFlag;
-	int _deathCount;
-	int _deathType;
 	int _iqValue;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 7029a7c917..9ccf5eb62c 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1360,6 +1360,8 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_mapOffset = 0;
 	_screenVertX = 0;
 	_saveRiver = false;
+	_deathFlag = false;
+	_deathCount = 0;
 }
 
 void River::setRiverPan() {
@@ -1460,8 +1462,8 @@ void River::initRiver() {
 	updateObstacles();
 	riverSetPhysX();
 	_canoeDir = 0;
-	_vm->_deathFlag = 0;
-	_vm->_deathCount = 0;
+	_deathFlag = false;
+	_deathCount = 0;
 
 	_vm->_timers[11]._timer = 1200;
 	_vm->_timers[11]._initTm = 1200;
@@ -1518,15 +1520,15 @@ bool River::riverJumpTest() {
 		_mapPtr += 3;
 		if (_canoeLane < 3) {
 			if (val1 != 0) {
-				_vm->_deathFlag = true;
-				_vm->_deathCount = 300;
-				_vm->_deathType = val2;
+				_deathFlag = true;
+				_deathCount = 300;
+				_deathType = val2;
 			}
 		} else {
 			if (val1 != 1) {
-				_vm->_deathFlag = true;
-				_vm->_deathCount = 300;
-				_vm->_deathType = val2;
+				_deathFlag = true;
+				_deathCount = 300;
+				_deathType = val2;
 			}
 			_vm->_oldScrollCol = _vm->_screen->_scrollCol;
 			_vm->_screen->_scrollCol = 44;
@@ -1866,10 +1868,9 @@ void River::river() {
 				return;
 			}
 
-			if (_vm->_deathFlag) {
-				_vm->_deathCount--;
-				if (_vm->_deathCount == 0) {
-					_vm->dead(RIVERDEATH[_vm->_deathType]);
+			if (_deathFlag) {
+				if (--_deathCount == 0) {
+					_vm->dead(RIVERDEATH[_deathType]);
 					return;
 				}
 			}
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index f6f07b46e2..14f51990cc 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -167,6 +167,9 @@ private:
 	RiverStruct *_botList;
 	int _canoeDir;
 	bool _saveRiver;
+	bool _deathFlag;
+	int _deathCount;
+	int _deathType;
 
 	// Saved fields
 	int _canoeLane;
-- 
cgit v1.2.3


From 06f99158f063e72a492a661fc94529ec3b0d242a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 23:22:03 -0500
Subject: ACCESS: Debounce any mouse press when showing death screen

---
 engines/access/amazon/amazon_game.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 29197fe93c..248f5e2f49 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -607,6 +607,8 @@ void AmazonEngine::dead(int deathId) {
 	_events->hideCursor();
 	_screen->forceFadeOut();
 	_scripts->cmdFreeSound();
+	_events->debounceLeft();
+	_events->zeroKeys();
 
 	_sound->_soundTable.push_back(SoundEntry(_files->loadFile(98, 44), 1));
 
-- 
cgit v1.2.3


From 3c97961fd2c300a4b4541517a4884498f5d52366 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Dec 2014 13:43:12 +0100
Subject: ACCESS: Fix the display in the floppy and demo version by removing
 the inventory pre-rendering

---
 engines/access/inventory.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 629b89f155..1bf3bdc8a0 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -102,10 +102,14 @@ void InventoryManager::setUseItem(int itemId) {
 }
 
 void InventoryManager::refreshInventory() {
-	if (_vm->_screen->_vesaMode) {
-		_invRefreshFlag = true;
-		newDisplayInv();
-	}
+	
+	// The original version was using pre-rendering for the inventory to spare some time.
+	// This is not needed on modern hardware, and it breaks a couple of things.
+	// Therefore it was removed in order to keep the same logic than for the CD version
+	// if (_vm->_screen->_vesaMode) {
+	//		_invRefreshFlag = true;
+	//		newDisplayInv();
+	// }
 }
 
 int InventoryManager::newDisplayInv() {
-- 
cgit v1.2.3


From 84ba0df9b2ce15d6c1d32a6c61794a1accb3fc99 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 4 Dec 2014 14:17:30 +0100
Subject: ACCESS: Janitorial

---
 engines/access/access.cpp                    |   2 +-
 engines/access/amazon/amazon_game.cpp        |  26 +++----
 engines/access/amazon/amazon_logic.cpp       |  10 +--
 engines/access/amazon/amazon_resources.cpp   |  40 +++++------
 engines/access/amazon/amazon_room.cpp        |   8 +--
 engines/access/amazon/amazon_scripts.cpp     |  10 +--
 engines/access/animation.cpp                 |   6 +-
 engines/access/asurface.cpp                  |   6 +-
 engines/access/bubble_box.cpp                |  10 +--
 engines/access/bubble_box.h                  |   2 +-
 engines/access/data.h                        |   2 +-
 engines/access/events.h                      |   4 +-
 engines/access/files.cpp                     |   4 +-
 engines/access/font.cpp                      |   6 +-
 engines/access/inventory.cpp                 |  17 +++--
 engines/access/martian/martian_resources.cpp |  12 ++--
 engines/access/martian/martian_room.cpp      |   4 +-
 engines/access/player.cpp                    |  18 ++---
 engines/access/resources.cpp                 |   4 +-
 engines/access/room.cpp                      |  14 ++--
 engines/access/scripts.cpp                   | 104 +++++++++++++--------------
 engines/access/sound.cpp                     |  12 ++--
 engines/access/video.cpp                     |  10 +--
 23 files changed, 165 insertions(+), 166 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 41706fc4fd..2153f594b1 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -396,7 +396,7 @@ void AccessEngine::copyBF1BF2() {
 
 void AccessEngine::copyBF2Vid() {
 	const byte *srcP = (const byte *)_buffer2.getPixels();
-	byte *destP = (byte *)_screen->getBasePtr(_screen->_windowXAdd, 
+	byte *destP = (byte *)_screen->getBasePtr(_screen->_windowXAdd,
 		_screen->_windowYAdd + _screen->_screenYOff);
 
 	for (int yp = 0; yp < _screen->_vWindowLinesTall; ++yp) {
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 248f5e2f49..deb45ff4b1 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -32,12 +32,12 @@ namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 AccessEngine(syst, gameDesc),
-		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]), 
+		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]),
 		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
-		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), 
-		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]), 
+		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]),
+		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]),
 		_noSound(_flags[239]),
-		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this), 
+		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this),
 		_plane(this), _river(this) {
 
 	_charSegSwitch = false;
@@ -263,7 +263,7 @@ void AmazonEngine::tileScreen() {
 	int x = res->_stream->readSint16LE();
 	int y = res->_stream->readSint16LE();
 	int size = ((x + 2) * y) + 10;
-	
+
 	for (int i = 0; i < size; ++i)
 		_tileData[i] = res->_stream->readByte();
 
@@ -292,7 +292,7 @@ void AmazonEngine::updateSummary(int chap) {
 	_updateChapter = chapter;
 	Common::Array<CellIdent> summaryCells;
 	loadCells(summaryCells);
-	
+
 	for (int i = celSubFile; i < 16; ++i) {
 		if (i > 7)
 			warning("TODO: DRAWOBJECT");
@@ -374,7 +374,7 @@ void AmazonEngine::helpTitle() {
 		index = 169;
 
 	index /= 20;
-	
+
 	iqText += " ";
 	iqText += IQLABELS[index];
 
@@ -439,7 +439,7 @@ void AmazonEngine::drawHelp(const Common::String str) {
 		_screen->_clipHeight = 200;
 		_screen->plotImage(_objectsTable[95], 0, Common::Point(76, 168));
 		_destIn = oldDest;
-		_screen->_clipHeight = oldClip;		
+		_screen->_clipHeight = oldClip;
 	}
 
 	if ((_useItem == 0) && (_screen->_vesaMode == 0))
@@ -456,7 +456,7 @@ void AmazonEngine::startChapter(int chapter) {
 	if (chapter != 1) {
 		_room->clearRoom();
 		freeChar();
-		
+
 		_midi->newMusic(32, 0);
 		playVideo(0, Common::Point());
 		if (shouldQuit())
@@ -495,7 +495,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->clearScreen();
 
 	_screen->setPanel(3);
-	
+
 	// Set up cells for the chapter display
 	Common::Array<CellIdent> chapterCells;
 	chapterCells.push_back(CellIdent(0, 96, 17));
@@ -508,7 +508,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_buffer2.copyFrom(*_screen);
 
 	const int *chapImg = &CHAPTER_TABLE[_chapter - 1][0];
-	_screen->plotImage(_objectsTable[0], _chapter - 1, 
+	_screen->plotImage(_objectsTable[0], _chapter - 1,
 		Common::Point(chapImg[1], chapImg[2]));
 	_screen->plotImage(_objectsTable[_chapter], 0,
 		Common::Point(chapImg[3], chapImg[4]));
@@ -535,7 +535,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->forceFadeOut();
 	_events->debounceLeft();
 	_events->zeroKeys();
-	
+
 	_screen->clearBuffer();
 	_files->loadScreen(96, 16);
 	_buffer2.copyFrom(*_screen);
@@ -573,7 +573,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->forceFadeOut();
 	_screen->clearBuffer();
 	freeCells();
-	
+
 	_midi->newMusic(_chapter * 2, 1);
 
 	if (chapter != 1 && chapter != 14) {
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 9ccf5eb62c..428b85f969 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -245,19 +245,19 @@ void Opening::doCredit() {
 		if (_vm->isDemo()) {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 23, Common::Point(77, 20));
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(50, 35));
-		} else 
+		} else
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
 	} else if (_pCount <= 334) {
 		if (_vm->isDemo()) {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 16, Common::Point(200, 70));
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(170, 85));
-		} else 
+		} else
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
 	} else if (_pCount <= 396) {
 		if (_vm->isDemo()) {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 15, Common::Point(65, 15));
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(30, 30));
-		} else 
+		} else
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
 	} else if (_pCount <= 458) {
 		if (_vm->isDemo()) {
@@ -320,7 +320,7 @@ void Opening::doTitle() {
 
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 3);
-		
+
 		_vm->_buffer2.copyFrom(*_vm->_screen);
 		_vm->_buffer1.copyFrom(*_vm->_screen);
 		_vm->_screen->forceFadeIn();
@@ -523,7 +523,7 @@ void Opening::doTent() {
 		}
 
 		_vm->_events->pollEventsAndWait();
-	}	
+	}
 
 	_vm->_sound->playSound(5);
 	_vm->_video->setVideo(_vm->_screen, Common::Point(43, 11), FileIdent(2, 2), 10);
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 1b83e6bf70..bd4e4f838d 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -68,10 +68,10 @@ const char *const FILENAMES_DEMO[] = {
 	"C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP",
 	"C24.AP", "C25.AP", "R49.AP", "R49.AP", "R49.AP", "R49.AP",
 	"R49.AP", "R49.AP", "R49.AP", "R49.AP", "DEAD.AP", "EST.AP",
-	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP" 
+	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP"
 };
 const byte MOUSE0[] = {
-	0, 0, 0, 0, 
+	0, 0, 0, 0,
 	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
 	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
 	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
@@ -971,7 +971,7 @@ const byte *ROOM_TABLE_DEMO[] = {
 	ROOM_TABLE26_DEMO, ROOM_TABLE27_DEMO, ROOM_TABLE28_DEMO, nullptr, ROOM_TABLE30_DEMO,
 	ROOM_TABLE31_DEMO, ROOM_TABLE32_DEMO, ROOM_TABLE33_DEMO, ROOM_TABLE34_DEMO, nullptr,
 	nullptr, ROOM_TABLE37_DEMO, ROOM_TABLE38_DEMO, ROOM_TABLE39_DEMO, ROOM_TABLE40_DEMO,
-	nullptr, nullptr, ROOM_TABLE43_DEMO, nullptr, ROOM_TABLE45_DEMO, 
+	nullptr, nullptr, ROOM_TABLE43_DEMO, nullptr, ROOM_TABLE45_DEMO,
 	ROOM_TABLE46_DEMO, ROOM_TABLE47_DEMO, ROOM_TABLE48_DEMO, nullptr, nullptr,
 	ROOM_TABLE51_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE55_DEMO,
 	nullptr, nullptr, ROOM_TABLE58_DEMO, nullptr, nullptr,
@@ -1124,14 +1124,14 @@ const byte BEXPLODE[] = {
 
 const byte THORNICK[] = {
 	0x2, 0x7, 0x0, 0x7, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x0,
-	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x0, 0x0, 0x0, 0x7, 0x0, 0x2, 0x0, 
-	0x7, 0x0, 0x5, 0x0, 0x7, 0x0, 0x3, 0x0, 0x7, 0x0, 0x6, 0x0, 0x7, 0x0, 0x3, 
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x0, 0x0, 0x0, 0x7, 0x0, 0x2, 0x0,
+	0x7, 0x0, 0x5, 0x0, 0x7, 0x0, 0x3, 0x0, 0x7, 0x0, 0x6, 0x0, 0x7, 0x0, 0x3,
 	0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x4, 0x0, 0x7, 0x0, 0x8, 0x0, 0xFF, 0xFF
 };
 
 const byte MAYA[] = {
-	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 
-	0x0, 0x0, 0x0, 0x48, 0x48, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x48, 0x48, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0,
 	0x48, 0x0, 0x0, 0x0, 0x48, 0x0, 0x2, 0x0, 0x48, 0x0, 0x13, 0x0, 0x48,
 	0x0, 0x3, 0x0, 0x48, 0x0, 0x14, 0x0, 0x48, 0x0, 0x4, 0x0, 0x48, 0x0, 0x15,
 	0x0, 0x48, 0x0, 0x5, 0x0, 0x48, 0x0, 0x16, 0x0, 0x48, 0x0, 0x6, 0x0, 0x48,
@@ -1258,14 +1258,14 @@ const byte JWATER[] = {
 const byte SHOOT[] = {
 	0x2, 0xFF, 0xFF, 0x52, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x0, 0x0, 0x0, 0x0, 0x38, 0x52, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
-	0x0, 0x52, 0x0, 0x0, 0x0, 0x52, 0x0, 0x3, 0x0, 0x52, 0x0, 0x5, 0x0, 0x52, 
+	0x0, 0x52, 0x0, 0x0, 0x0, 0x52, 0x0, 0x3, 0x0, 0x52, 0x0, 0x5, 0x0, 0x52,
 	0x0, 0x4, 0x0, 0x62, 0x0, 0x1F, 0x0, 0xFF, 0xFF
 };
 
 const byte ADIE[] = {
 	0x2, 0xFF, 0xFF, 0x53, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 0x53, 0x0, 0x0, 0x0, 0x53,
-	0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x53, 0x0, 0x3, 0x0, 0x62, 0x0, 0x4, 
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x53, 0x0, 0x3, 0x0, 0x62, 0x0, 0x4,
 	0x0, 0x53, 0x0, 0x4, 0x0, 0x62, 0x0, 0x4, 0x0, 0xFF, 0xFF
 };
 
@@ -1278,20 +1278,20 @@ const byte DYNAMITE[] = {
 const byte MAYASHOT[] = {
 	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 	0xFF, 0x0, 0x0, 0x0, 0x0, 0x36, 0x55, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
-	0x3, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 
+	0x3, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F,
 	0x0, 0xFF, 0xFF
 };
 
 const byte OFFKEV[] = {
-	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 
-	0x0, 0x0, 0x0, 0x4D, 0x29, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x4D, 0x29, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x29, 0x0, 0x0, 0x0, 0x29, 0x0, 0x2, 0x0, 0x29, 0x0, 0x3, 0x0, 0xFF, 0xFF
 };
 
 const byte VALLEY[] = {
 	0x2, 0x3A, 0x0, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
 	0x0, 0x0, 0x0, 0x3A, 0x3A, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0x3, 0x0,
-	0x3A, 0x0, 0x0, 0x0, 0x3A, 0x0, 0x3, 0x0, 0x3A, 0x0, 0x5, 0x0, 0x3A, 0x0, 
+	0x3A, 0x0, 0x0, 0x0, 0x3A, 0x0, 0x3, 0x0, 0x3A, 0x0, 0x5, 0x0, 0x3A, 0x0,
 	0x4, 0x0, 0x62, 0x0, 0x27, 0x0, 0xFF, 0xFF
 };
 
@@ -1352,14 +1352,14 @@ const byte ROBOT[] = {
 };
 
 const byte ANTKILL[] = {
-	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 
-	0x0, 0x0, 0x3C, 0x59, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x59, 
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0,
+	0x0, 0x0, 0x3C, 0x59, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x59,
 	0x0, 0x0, 0x0, 0x59, 0x0, 0x2, 0x0, 0x62, 0x0, 0x0E, 0x0, 0xFF, 0xFF
 };
 
 const byte LOCOHOT[] = {
-	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 
-	0x0, 0x0, 0x19, 0x5A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x5A, 
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0,
+	0x0, 0x0, 0x19, 0x5A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x5A,
 	0x0, 0x0, 0x0, 0x5A, 0x0, 0x2, 0x0, 0x62, 0x0, 0x3C, 0x0, 0xFF, 0xFF
 };
 
@@ -1593,7 +1593,7 @@ const byte FONT6x6_DATA[] = {
 	0x54, 0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x56, 0x49,
 };
 
-const char *const NO_HELP_MESSAGE = 
+const char *const NO_HELP_MESSAGE =
 	"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \
 HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \
 YOU CAN UNDERSTAND.";
@@ -1707,7 +1707,7 @@ const char *const DEATH_TEXT[58] = {
 	"MAYA FALLS OFF THE END OF THE BROKEN BRIDGE.",
 	"YOUR WEIGHT IS JUST ENOUGH TO CAUSE THE REMAINING SUPPORT CABLE TO SNAP AND YOU "
 		"FALL TO THE BOTTOM OF THE GORGE.",
-	
+
 	"EVEN WITH REPAIRS THE BRIDGE IS NOT STRONG ENOUGH TO HOLD TWO PEOPLE.",
 	"SANCHEZ AND HIS MEN FIND YOU AND HOLD FIRING SQUAD PRACTICE.",
 	"THE TWO GUARDS ARE DISTURBED IN THEIR LOVE NEST AND COME LOOKING FOR ANYONE ACTING SUSPICIOUS.  "
@@ -1886,7 +1886,7 @@ const int ANTEAT[33] = {
 	 9,  0,  -6,
 	 8,  0,  11,
 	 7,  0,   6,
-	-1, -1,  -1 
+	-1, -1,  -1
 };
 
 const int ANTDIE[21] = {
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 24aedf5722..d6ab2bd758 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -54,7 +54,7 @@ void AmazonRoom::reloadRoom() {
 		_vm->_currentMan = _roomFlag;
 		_vm->_currentManOld = _roomFlag;
 		_vm->_manScaleOff = 0;
-		
+
 		switch (_vm->_currentMan) {
 		case 0:
 			_vm->_player->loadSprites("MAN.LZ");
@@ -78,7 +78,7 @@ void AmazonRoom::reloadRoom() {
 }
 
 void AmazonRoom::reloadRoom1() {
-	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
+	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
 		_game->_inactive._altSpritesPtr = new SpriteResource(_vm, spriteData);
@@ -183,7 +183,7 @@ void AmazonRoom::mainAreaClick() {
 			default:
 				break;
 			}
-		} 
+		}
 
 		// WORKAROUND: In Amazon room 9, you can't leave the screen to the south due
 		// to not being able to click a Y position that's high enough
@@ -208,7 +208,7 @@ void AmazonRoom::walkCursor() {
 	// the Exit icon wgeb the cursor is already a walk cursor
 	EventsManager &events = *_vm->_events;
 
-	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 && 
+	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 &&
 			events._normalMouse != CURSOR_CROSSHAIRS)) {
 		events._normalMouse = CURSOR_CROSSHAIRS;
 		events.setCursor(CURSOR_CROSSHAIRS);
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 5cf22106b7..fb1ccbe05e 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -57,7 +57,7 @@ void AmazonScripts::mWhile1() {
 
 	_vm->_screen->setIconPalette();
 	_vm->_screen->forceFadeIn();
-	
+
 	Resource *spriteData = _vm->_files->loadFile(14, 6);
 	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
 	delete spriteData;
@@ -340,7 +340,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		else
 			setInactive();
 		break;
-	case 5: 
+	case 5:
 		warning("TODO: DEMO - UNLOADCELLSET");
 		break;
 	case 6:
@@ -450,7 +450,7 @@ void AmazonScripts::cmdHelp() {
 			_vm->_screen->restorePalette();
 			_vm->_screen->setPalette();
 			_vm->_events->showCursor();
-			
+
 			delete _vm->_objectsTable[45];
 			_vm->_objectsTable[45] = nullptr;
 			_vm->_timers.restoreTimers();
@@ -507,8 +507,8 @@ void AmazonScripts::cmdMainPanel() {
 	}
 }
 
-void AmazonScripts::CMDRETFLASH() { 
-	error("TODO CMDRETFLASH"); 
+void AmazonScripts::CMDRETFLASH() {
+	error("TODO CMDRETFLASH");
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index e59874fe7a..b13fcfdc1e 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -87,7 +87,7 @@ typedef void(Animation::*AnimationMethodPtr)();
 
 void Animation::animate() {
 	static const AnimationMethodPtr METHODS[8] =
-	{ &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3, 
+	{ &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3,
 	&Animation::anim4, &Animation::animNone, &Animation::animNone, &Animation::anim7 };
 
 	(this->*METHODS[_type])();
@@ -310,10 +310,10 @@ Animation *AnimationManager::setAnimation(int animId) {
 	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
 
-	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 : 
+	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 :
 		anim->_loopCount;
 	anim->_field10 = 0;
-		
+
 	return anim;
 }
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 4202ed098f..cd872e04b2 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -55,11 +55,11 @@ SpriteFrame::SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, i
 	int xSize = stream->readUint16LE();
 	int ySize = stream->readUint16LE();
 	create(xSize, ySize);
-	
+
 	// Empty surface
 	byte *data = (byte *)getPixels();
 	Common::fill(data, data + w * h, 0);
-	
+
 	// Decode the data
 	for (int y = 0; y < h; ++y) {
 		int offset = stream->readByte();
@@ -225,7 +225,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	int scaleXCtr = 0, scaleYCtr = 0;
 
 	for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr) {
-		// Handle skipping lines if Y scaling 
+		// Handle skipping lines if Y scaling
 		scaleYCtr += scaleY;
 		if (scaleYCtr < SCALE_LIMIT)
 			continue;
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index ff6c4de53d..e9e2a182c0 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -159,10 +159,10 @@ void BubbleBox::printBubble(const Common::String &msg) {
 		int xp = _vm->_screen->_printOrg.x;
 		if (_type == TYPE_4)
 			xp = (_bounds.width() - width) / 2 + _bounds.left - 4;
-		
+
 		// Draw the text
 		font2.drawString(_vm->_screen, line, Common::Point(xp, _vm->_screen->_printOrg.y));
-		
+
 		// Move print position
 		_vm->_screen->_printOrg.y += 6;
 		_vm->_screen->_printOrg.x = _vm->_screen->_printStart.x;
@@ -237,10 +237,10 @@ void BubbleBox::doBox(int item, int box) {
 	yp += (_type == TYPE_4) ? 4 : 8;
 
 	for (int x = 0; x < xSize; ++x, xp += 20) {
-		screen.plotImage(icons, (_type == TYPE_4 ? 62 : 34) + x, 
+		screen.plotImage(icons, (_type == TYPE_4 ? 62 : 34) + x,
 			Common::Point(xp, yp));
 	}
-	
+
 	yp = screen._orgY2 - (_type == TYPE_4 ? 18 : 12);
 	screen.plotImage(icons, (_type == TYPE_4) ? 73 : 23, Common::Point(xp, yp));
 
@@ -274,7 +274,7 @@ void BubbleBox::doBox(int item, int box) {
 	_charCol = charCol;
 	_rowOff = rowOff;
 	_vm->_screen->restoreScreen();
-	
+
 	// Free icons data
 	delete icons;
 }
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 7b25a58183..128bd618ff 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -71,7 +71,7 @@ public:
 	void calcBubble(const Common::String &msg);
 
 	/**
-	 * Prints a text bubble and it's contents 
+	 * Prints a text bubble and it's contents
 	 */
 	void printBubble(const Common::String &msg);
 
diff --git a/engines/access/data.h b/engines/access/data.h
index 08fbb40d68..6b44eddd75 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -77,7 +77,7 @@ public:
 	void updateTimers();
 
 	/**
-	 * Synchronize savegame data 
+	 * Synchronize savegame data
 	 */
 	void synchronize(Common::Serializer &s);
 };
diff --git a/engines/access/events.h b/engines/access/events.h
index 95ba926384..965e8e7fd6 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -29,9 +29,9 @@
 
 namespace Access {
 
-enum CursorType { 
+enum CursorType {
 	CURSOR_NONE = -1,
-	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_LOOK, 
+	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_LOOK,
 	CURSOR_USE, CURSOR_TAKE, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP,
 	CURSOR_INVENTORY = 99
 };
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 9fff6c4102..b846cbd32c 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -187,7 +187,7 @@ void FileManager::handleFile(Resource *res) {
 
 	bool isCompressed = !strncmp(header, "DBE", 3);
 
-	// If the data is compressed, uncompress it and replace the stream 
+	// If the data is compressed, uncompress it and replace the stream
 	// in the resource with the decompressed one
 	if (isCompressed) {
 		// Read in the entire compressed data
@@ -214,7 +214,7 @@ void FileManager::setAppended(Resource *res, int fileNum) {
 	// If a different file has been opened then previously, load its index
 	if (_fileNumber != fileNum) {
 		_fileNumber = fileNum;
-			
+
 		// Read in the file index
 		int count = res->_file.readUint16LE();
 		assert(count <= 100);
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 5686cdf3b0..51fb9dc1c8 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -50,7 +50,7 @@ void Font::load(const int *fontIndex, const byte *fontData) {
 			int bitsLeft = 0;
 			byte srcByte = 0;
 			byte pixel;
-			
+
 			byte *pDest = (byte *)_chars[i].getBasePtr(0, y);
 			for (int x = 0; x < _chars[i].w; ++x, ++pDest) {
 				// Get the pixel
@@ -115,8 +115,8 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 			s = "";
 			return true;
 		}
-		
-		// Work backwards to find space at the start of the current word 
+
+		// Work backwards to find space at the start of the current word
 		// as a point to split the line on
 		while (src >= s.c_str() && *src != ' ') {
 			width -= charWidth(*src);
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 1bf3bdc8a0..d9e1b496a4 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -93,16 +93,15 @@ int &InventoryManager::operator[](int idx) {
 	return (idx >= (int)_inv.size()) ? invalid : _inv[idx]._value;
 }
 
-int InventoryManager::useItem() { 
+int InventoryManager::useItem() {
 	return _vm->_useItem;
 }
 
-void InventoryManager::setUseItem(int itemId) { 
-	_vm->_useItem = itemId; 
+void InventoryManager::setUseItem(int itemId) {
+	_vm->_useItem = itemId;
 }
 
 void InventoryManager::refreshInventory() {
-	
 	// The original version was using pre-rendering for the inventory to spare some time.
 	// This is not needed on modern hardware, and it breaks a couple of things.
 	// Therefore it was removed in order to keep the same logic than for the CD version
@@ -120,7 +119,7 @@ int InventoryManager::newDisplayInv() {
 
 	_invModeFlag = true;
 	_vm->_timers.saveTimers();
-	
+
 	if (!room._tile && !_invRefreshFlag) {
 		saveScreens();
 	}
@@ -361,7 +360,7 @@ void InventoryManager::saveScreens() {
 	_vm->_buffer1.copyTo(&_savedBuffer1);
 	_vm->_screen->copyTo(&_savedScreen);
 	_vm->_newRects.push_back(Common::Rect(0, 0, _savedScreen.w, _savedScreen.h));
-	
+
 }
 
 void InventoryManager::restoreScreens() {
@@ -425,7 +424,7 @@ void InventoryManager::combineItems() {
 		Common::Point newPt;
 		newPt.x = MAX(events._mousePos.x - tempMouse.x + tempBox.x, 0);
 		newPt.y = MAX(events._mousePos.y - tempMouse.y + tempBox.y, 0);
-		
+
 		screen.plotImage(sprites, invItem, newPt);
 		lastBox = newPt;
 	}
@@ -435,7 +434,7 @@ void InventoryManager::combineItems() {
 			&& _items[destBox] != -1) {
 		int itemA = invItem;
 		int itemB = _items[destBox];
-		
+
 		// Check whether the items can be combined
 		int combinedItem = _inv[itemA].checkItem(itemB);
 		if (combinedItem != -1) {
@@ -454,7 +453,7 @@ void InventoryManager::combineItems() {
 			Common::Rect destRect(_invCoords[destBox].left, _invCoords[destBox].top,
 				_invCoords[destBox].left + 46, _invCoords[destBox].top + 35);
 			_vm->_buffer2.copyBlock(&_vm->_buffer1, destRect);
-			screen._screenYOff = 0;			
+			screen._screenYOff = 0;
 			zoomIcon(itemB, -1, destBox, true);
 
 			// Exand up the new combined item from nothing to full size
diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index ae63f66c7c..046e06c6e3 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -32,11 +32,11 @@ const char *const FILENAMES[] = {
 	"R08.AP", "R09.AP", "R10.AP", "R11.AP", "R12.AP", "R13.AP", "R14.AP", "R15.AP",
 	"R16.AP", "R17.AP", "R18.AP", "R19.AP", "R20.AP", "R21.AP", "R22.AP", "R23.AP",
 	"R24.AP", "R25.AP", "R26.AP", "R27.AP", "R28.AP", "R29.AP", "R30.AP", "R31.AP",
-	"R32.AP", "R33.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP", 
+	"R32.AP", "R33.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP",
 	"R40.AP","TITLE.AP","R42.AP","S01.AP",  "R44.AP", "R45.AP","SOUND.AP","MUSIC.AP",
 	"DEAD.AP","EST.AP", "W02.AP", "C02.AP", "C05.AP", "C04.AP", "C10.AP", "C03.AP",
-	"C07.AP", "LOVE.AP","CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP", 
-	"C12.AP", "C16.AP","CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP", 
+	"C07.AP", "LOVE.AP","CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP",
+	"C12.AP", "C16.AP","CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP",
 	"C16A.AP","C09.AP", "R45.AP", "R46.AP", "R47.AP", "R48.AP", "R49.AP"
 };
 
@@ -653,9 +653,9 @@ const byte CHAR_TABLE27[] = {
 const byte *CHAR_TABLE[] = {
 	CHAR_TABLE0, nullptr, CHAR_TABLE2, CHAR_TABLE3, CHAR_TABLE4, CHAR_TABLE5,
 	CHAR_TABLE6, CHAR_TABLE7, CHAR_TABLE8, CHAR_TABLE9, CHAR_TABLE10,
-	CHAR_TABLE11, CHAR_TABLE12, CHAR_TABLE13, nullptr, CHAR_TABLE15, 
-	CHAR_TABLE16, nullptr, CHAR_TABLE18, CHAR_TABLE19, CHAR_TABLE20, 
-	CHAR_TABLE21, nullptr, CHAR_TABLE23, CHAR_TABLE24, CHAR_TABLE25, 
+	CHAR_TABLE11, CHAR_TABLE12, CHAR_TABLE13, nullptr, CHAR_TABLE15,
+	CHAR_TABLE16, nullptr, CHAR_TABLE18, CHAR_TABLE19, CHAR_TABLE20,
+	CHAR_TABLE21, nullptr, CHAR_TABLE23, CHAR_TABLE24, CHAR_TABLE25,
 	CHAR_TABLE26, CHAR_TABLE27
 };
 
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 62c44bc529..2bd98186f0 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -49,7 +49,7 @@ void MartianRoom::reloadRoom() {
 		_vm->_currentMan = _roomFlag;
 		_vm->_currentManOld = _roomFlag;
 		_vm->_manScaleOff = 0;
-		
+
 		switch (_vm->_currentMan) {
 		case 0:
 			_vm->_player->loadSprites("MAN.LZ");
@@ -73,7 +73,7 @@ void MartianRoom::reloadRoom() {
 }
 
 void MartianRoom::reloadRoom1() {
-	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
+	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		//Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
 		//_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 97d7d4845d..5668e9c6b9 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -146,7 +146,7 @@ void Player::removeSprite1() {
 
 void Player::calcManScale() {
 	if (!_vm->_manScaleOff) {
-		_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
+		_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) *
 			_vm->_scaleT1 + (_vm->_scaleH2 << 8)) & 0xff00) / _vm->_scaleH1 * _vm->_scaleI) >> 8;
 		_vm->_screen->setScaleTable(_vm->_scale);
 
@@ -159,7 +159,7 @@ void Player::calcManScale() {
 void Player::walk() {
 	_collideFlag = false;
 	_playerDirection = NONE;
-	
+
 	if (_playerOff)
 		return;
 	else if (_vm->_timers[0]._flag) {
@@ -223,7 +223,7 @@ void Player::walkUp() {
 	int walkOff = _walkOffUp[_frame - _upWalkMin];
 	int tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOff];
 	_rawYTempL = (byte)tempL;
-	int yTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff] - 
+	int yTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff] -
 		(tempL < 0 ? 1 : 0);
 	_rawYTemp = yTemp;
 	_rawXTemp = _rawPlayer.x;
@@ -233,7 +233,7 @@ void Player::walkUp() {
 	} else {
 		_rawPlayer.y = _rawYTemp;
 		_rawPlayerLow.y = _rawYTempL;
-		
+
 		calcManScale();
 
 		// This code looks totally useless as 'si' is unconditionally set in plotCom
@@ -297,7 +297,7 @@ void Player::walkLeft() {
 			(tempL < 0 ? 1 : 0);
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
-	}	
+	}
 	_rawYTemp = _rawPlayer.y;
 
 	if (_vm->_room->codeWalls()) {
@@ -378,7 +378,7 @@ void Player::walkUpLeft() {
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
 	}
-	
+
 	walkOffset = _walkOffUL[_frame - _diagUpWalkMin].y;
 	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTempL = (byte)tempL;
@@ -446,7 +446,7 @@ void Player::walkDownLeft() {
 
 		++_frame;
 		calcManScale();
-		
+
 		// This code looks totally useless as 'si' is unconditionally set in plotCom1
 		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
 		//	warning("TODO: walkDownLeft - si = 0?");
@@ -668,7 +668,7 @@ void Player::checkScroll() {
 		if (!scrollRight()) {
 			if (_playerDirection == DOWNLEFT)
 				goto scrollUp;
-			
+
 			return;
 		}
 	} else if ((_playerDirection == UPRIGHT || _playerDirection == DOWNRIGHT ||
@@ -678,7 +678,7 @@ void Player::checkScroll() {
 		if (!scrollLeft()) {
 			if (_playerDirection == DOWNRIGHT)
 				goto scrollUp;
-	
+
 			return;
 		}
 	}
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 9bef5cf879..41f611d136 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -26,7 +26,7 @@
 namespace Access {
 
 const byte INITIAL_PALETTE[18 * 3] = {
-	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00,
 	0xff, 0xff, 0xff,
 	0xf0, 0xf0, 0xf0,
 	0xe0, 0xe0, 0xe0,
@@ -73,7 +73,7 @@ const char *GO_MESSAGE = "YOU CAN'T CLIMB THAT.";
 const char *HELP_MESSAGE = "THIS OBJECT REQUIRES NO HINTS";
 const char *TALK_MESSAGE      = "THERE SEEMS TO BE NO RESPONSE.";
 const char *const GENERAL_MESSAGES[] = {
-	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE, 
+	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE,
 	GO_MESSAGE, TALK_MESSAGE, HELP_MESSAGE, HELP_MESSAGE, USE_MESSAGE
 };
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 97341b04b9..b3c3317307 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -266,7 +266,7 @@ void Room::setupRoom() {
 			screen._scrollCol -= sx + 1;
 		}
 	}
-	
+
 	if (screen._vWindowHeight == _playFieldHeight) {
 		screen._scrollY = 0;
 		screen._scrollRow = 0;
@@ -317,7 +317,7 @@ void Room::buildColumn(int playX, int screenX) {
 	if (playX < 0 || playX >= _playFieldWidth)
 		return;
 
-	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
+	const byte *pSrc = _playField + _vm->_screen->_scrollRow *
 		_playFieldWidth + playX;
 
 	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
@@ -406,7 +406,7 @@ Plotter::Plotter() {
 void Plotter::load(Common::SeekableReadStream *stream, int wallCount, int blockCount) {
 	// Load the wall count
 	_walls.resize(wallCount);
-	
+
 	for (int i = 0; i < wallCount; ++i)
 		_walls[i].left = stream->readSint16LE();
 	for (int i = 0; i < wallCount; ++i)
@@ -474,7 +474,7 @@ void Room::doCommands() {
 	}
 }
 
-void Room::cycleCommand(int incr) {	
+void Room::cycleCommand(int incr) {
 	int command = _selectCommand + incr;
 	if (command < -1)
 		command = 6;
@@ -560,7 +560,7 @@ void Room::executeCommand(int commandId) {
 	delete iconData;
 
 	// Draw the button as selected
-	_vm->_screen->plotImage(spr, _selectCommand + 2, 
+	_vm->_screen->plotImage(spr, _selectCommand + 2,
 		Common::Point(RMOUSE[_selectCommand][0], 176));
 
 	_vm->_screen->restoreScreen();
@@ -569,7 +569,7 @@ void Room::executeCommand(int commandId) {
 
 void Room::walkCursor() {
 	EventsManager &events = *_vm->_events;
-	
+
 	events._normalMouse = CURSOR_CROSSHAIRS;
 	events.setCursor(CURSOR_CROSSHAIRS);
 	_vm->_scripts->_sequence = 5000;
@@ -698,7 +698,7 @@ bool Room::codeWalls() {
 			if ((player._rawYTemp >= screen._orgY1) &&
 					(player._rawYTemp <= screen._orgY2)) {
 				jf._wallCode |= (calcLR(player._rawYTemp) - player._rawXTemp) < 0 ? 2 : 1;
-				jf._wallCode1 |= (calcLR(player._rawYTemp) - 
+				jf._wallCode1 |= (calcLR(player._rawYTemp) -
 					(player._rawXTemp + player._playerOffset.x)) < 0 ? 2 : 1;
 			}
 		}
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 053e824956..ec41f37d8c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -109,29 +109,29 @@ typedef void(Scripts::*ScriptMethodPtr)();
 
 void Scripts::executeCommand(int commandIndex) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
-		&Scripts::cmdObject, &Scripts::cmdEndObject, &Scripts::cmdJumpLook, 
+		&Scripts::cmdObject, &Scripts::cmdEndObject, &Scripts::cmdJumpLook,
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
-		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
+		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull,
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
-		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
-		&Scripts::cmdAddScore, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
-		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::cmdConverse, 
-		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
-		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
-		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetAbout, 
+		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto,
+		&Scripts::cmdAddScore, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory,
+		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::cmdConverse,
+		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd,
+		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc,
+		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetAbout,
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
-		&Scripts::cmdJumpGoto, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
-		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
-		&Scripts::cmdSetScroll, &Scripts::cmdSaveRect, &Scripts::cmdVideoEnded, 
-		&Scripts::cmdSetBufVid, &Scripts::cmdPlayBufVid, &Scripts::cmdRemoveLast, 
+		&Scripts::cmdJumpGoto, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo,
+		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer,
+		&Scripts::cmdSetScroll, &Scripts::cmdSaveRect, &Scripts::cmdVideoEnded,
+		&Scripts::cmdSetBufVid, &Scripts::cmdPlayBufVid, &Scripts::cmdRemoveLast,
 		&Scripts::cmdDoTravel, &Scripts::cmdCheckAbout, &Scripts::cmdSpecial,
-		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
-		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
-		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice, 
-		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
+		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak,
+		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait,
+		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice,
+		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound,
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
-		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::CMDPUSHLOCATION, 
-		&Scripts::cmdCheckTravel, &Scripts::cmdBlock, &Scripts::cmdPlayerOff, 
+		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::CMDPUSHLOCATION,
+		&Scripts::cmdCheckTravel, &Scripts::cmdBlock, &Scripts::cmdPlayerOff,
 		&Scripts::cmdPlayerOn, &Scripts::cmdDead, &Scripts::cmdFadeOut,
 		&Scripts::cmdEndVideo
 	};
@@ -139,11 +139,11 @@ void Scripts::executeCommand(int commandIndex) {
 	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::cmdObject() { 
+void Scripts::cmdObject() {
 	_vm->_bubbleBox->load(_data);
 }
 
-void Scripts::cmdEndObject() { 
+void Scripts::cmdEndObject() {
 	printString(GENERAL_MESSAGES[_vm->_room->_selectCommand]);
 }
 
@@ -154,35 +154,35 @@ void Scripts::cmdJumpLook() {
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpHelp() { 
+void Scripts::cmdJumpHelp() {
 	if (_vm->_room->_selectCommand == 8)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpGet() { 
+void Scripts::cmdJumpGet() {
 	if (_vm->_room->_selectCommand == 3)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpMove() { 
+void Scripts::cmdJumpMove() {
 	if (_vm->_room->_selectCommand == 2)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpUse() { 
+void Scripts::cmdJumpUse() {
 	if (_vm->_room->_selectCommand == 4)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpTalk() { 
+void Scripts::cmdJumpTalk() {
 	if (_vm->_room->_selectCommand == 6)
 		cmdGoto();
 	else
@@ -234,12 +234,12 @@ void Scripts::cmdRetPos() {
 	_returnCode = 0;
 }
 
-void Scripts::cmdAnim() { 
+void Scripts::cmdAnim() {
 	int animId = _data->readByte();
 	_vm->_animation->animate(animId);
 }
 
-void Scripts::cmdSetFlag() { 
+void Scripts::cmdSetFlag() {
 	int flagNum = _data->readByte();
 	byte flagVal = _data->readByte();
 	assert(flagNum < 256);
@@ -247,7 +247,7 @@ void Scripts::cmdSetFlag() {
 	_vm->_flags[flagNum] = flagVal;
 }
 
-void Scripts::cmdCheckFlag() { 
+void Scripts::cmdCheckFlag() {
 	int flagNum = _data->readUint16LE();
 	int flagVal = _data->readUint16LE();
 	assert(flagNum < 256);
@@ -258,7 +258,7 @@ void Scripts::cmdCheckFlag() {
 		_data->skip(2);
 }
 
-void Scripts::cmdGoto() { 
+void Scripts::cmdGoto() {
 	_sequence = _data->readUint16LE();
 	searchForSequence();
 }
@@ -272,7 +272,7 @@ void Scripts::cmdAddScore() {
 	_data->skip(1);
 }
 
-void Scripts::cmdSetInventory() { 
+void Scripts::cmdSetInventory() {
 	int itemId = _data->readByte();
 	int itemVal = _data->readByte();
 
@@ -282,7 +282,7 @@ void Scripts::cmdSetInventory() {
 	_vm->_inventory->_invChangeFlag = true;
 }
 
-void Scripts::cmdCheckInventory() { 
+void Scripts::cmdCheckInventory() {
 	int itemId = _data->readUint16LE();
 	int itemVal = _data->readUint16LE();
 
@@ -323,7 +323,7 @@ void Scripts::cmdSetTex() {
 
 #define CURRENT_ROOM 0xFF
 
-void Scripts::cmdNewRoom() { 
+void Scripts::cmdNewRoom() {
 	int roomNumber = _data->readByte();
 	if (roomNumber != CURRENT_ROOM)
 		_vm->_player->_roomNumber = roomNumber;
@@ -334,7 +334,7 @@ void Scripts::cmdNewRoom() {
 	cmdRetPos();
 }
 
-void Scripts::cmdConverse() { 
+void Scripts::cmdConverse() {
 	_vm->_conversation = _data->readUint16LE();
 	_vm->_room->clearRoom();
 	_vm->freeChar();
@@ -397,7 +397,7 @@ void Scripts::cmdCheckLoc() {
 		_data->skip(2);
 }
 
-void Scripts::cmdSetAnim() { 
+void Scripts::cmdSetAnim() {
 	int animId = _data->readByte();
 	Animation *anim = _vm->_animation->setAnimation(animId);
 
@@ -471,7 +471,7 @@ void Scripts::cmdJumpGoto() {
 		_data->skip(2);
 }
 
-void Scripts::cmdSetVideo() { 
+void Scripts::cmdSetVideo() {
 	Common::Point pt;
 	pt.x = _data->readSint16LE();
 	pt.y = _data->readSint16LE();
@@ -481,7 +481,7 @@ void Scripts::cmdSetVideo() {
 	_vm->_video->setVideo(_vm->_screen, pt, _vm->_extraCells[cellIndex]._vid, rate);
 }
 
-void Scripts::cmdPlayVideo() { 
+void Scripts::cmdPlayVideo() {
 	_vm->_video->playVideo();
 }
 
@@ -520,7 +520,7 @@ void Scripts::cmdSaveRect() {
 	error("TODO: DEMO - cmdSaveRect");
 }
 
-void Scripts::cmdVideoEnded() { 
+void Scripts::cmdVideoEnded() {
 	_vm->_events->pollEvents();
 
 	if (_vm->_video->_videoEnd) {
@@ -565,7 +565,7 @@ void Scripts::cmdCheckAbout() {
 	error("TODO: DEMO - cmdCheckAbout");
 }
 
-void Scripts::cmdSpecial() { 
+void Scripts::cmdSpecial() {
 	_specialFunction = _data->readUint16LE();
 	int p1 = _data->readUint16LE();
 	int p2 = _data->readUint16LE();
@@ -585,7 +585,7 @@ void Scripts::cmdSpecial() {
 	}
 }
 
-void Scripts::cmdSetCycle() { 
+void Scripts::cmdSetCycle() {
 	int startCycle = _data->readUint16LE();
 	int endCycle = _data->readUint16LE();
 	int timer = _data->readUint16LE();
@@ -628,7 +628,7 @@ void Scripts::cmdTexSpeak() {
 #define BTN_COUNT 6
 void Scripts::cmdTexChoice() {
 	static const int BTN_RANGES[BTN_COUNT][2] = {
-		{ 0, 76 }, { 77, 154 }, { 155, 232 }, { 233, 276 }, { 0, 0 }, 
+		{ 0, 76 }, { 77, 154 }, { 155, 232 }, { 233, 276 }, { 0, 0 },
 		{ 277, 319 }
 	};
 
@@ -714,12 +714,12 @@ void Scripts::cmdTexChoice() {
 			}
 		}
 	} while ((choice == -1) || ((choice == 2) && choice3Fl));
-	
+
 	_choice = choice + 1;
 	_vm->_bubbleBox->clearBubbles();
 }
 
-void Scripts::cmdWait() { 
+void Scripts::cmdWait() {
 	int time = _data->readSint16LE();
 	_vm->_timers[3]._timer = time;
 	_vm->_timers[3]._initTm = time;
@@ -750,7 +750,7 @@ void Scripts::cmdSetConPos() {
 	_texsOrg = Common::Point(x, y);
 }
 
-void Scripts::cmdCheckVFrame() { 
+void Scripts::cmdCheckVFrame() {
 	if (_vm->_video->_videoFrame == _data->readSint16LE())
 		cmdGoto();
 	else
@@ -759,7 +759,7 @@ void Scripts::cmdCheckVFrame() {
 
 void Scripts::cmdJumpChoice() {
 	int val = (_data->readUint16LE() & 0xFF);
-	
+
 	if (val == _choice) {
 		_sequence = _data->readUint16LE();
 		searchForSequence();
@@ -783,7 +783,7 @@ void Scripts::cmdLoadSound() {
 	_vm->_sound->_soundTable.push_back(SoundEntry(sound, 1));
 }
 
-void Scripts::cmdFreeSound() { 
+void Scripts::cmdFreeSound() {
 	SoundManager &sound = *_vm->_sound;
 
 	if (sound._soundTable.size() > 0 && sound._soundTable[0]._res) {
@@ -812,7 +812,7 @@ void Scripts::cmdSetVideoSound() {
 	_vm->_video->_soundFlag = false;
 }
 
-void Scripts::cmdPlayVideoSound() { 
+void Scripts::cmdPlayVideoSound() {
 	_vm->_video->playVideo();
 	if (_vm->_video->_soundFrame == _vm->_video->_videoFrame &&
 			!_vm->_video->_soundFlag) {
@@ -829,7 +829,7 @@ void Scripts::cmdPrintWatch() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdPrintWatch"); 
+	error("TODO: DEMO - cmdPrintWatch");
 }
 
 void Scripts::cmdDispAbout() {
@@ -837,11 +837,11 @@ void Scripts::cmdDispAbout() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdDispAbout"); 
+	error("TODO: DEMO - cmdDispAbout");
 }
 
 void Scripts::CMDPUSHLOCATION() {
-	error("TODO CMDPUSHLOCATION"); 
+	error("TODO CMDPUSHLOCATION");
 }
 
 void Scripts::cmdCheckTravel() {
@@ -849,7 +849,7 @@ void Scripts::cmdCheckTravel() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdCheckTravel"); 
+	error("TODO: DEMO - cmdCheckTravel");
 }
 
 void Scripts::cmdBlock() {
@@ -857,7 +857,7 @@ void Scripts::cmdBlock() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdBlock"); 
+	error("TODO: DEMO - cmdBlock");
 }
 
 void Scripts::cmdPlayerOff() {
@@ -868,7 +868,7 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::cmdDead() { 
+void Scripts::cmdDead() {
 	int deathId = _data->readByte();
 	_vm->dead(deathId);
 }
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 7dab0a75f7..95576d212b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -30,7 +30,7 @@
 
 namespace Access {
 
-SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : 
+SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 		_vm(vm), _mixer(mixer) {
 	_playingSound = false;
 	_isVoice = false;
@@ -71,7 +71,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 	byte *resourceData = res->data();
 	Audio::SoundHandle audioHandle;
 	Audio::RewindableAudioStream *audioStream = 0;
-	
+
 	assert(res->_size >= 32);
 
 	if (READ_BE_UINT32(resourceData) == MKTAG('R','I','F','F')) {
@@ -92,7 +92,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 		//   word    - actual sample size (should be resource-size - 32)
 		byte internalSampleRate = resourceData[5];
 		int sampleSize = READ_LE_UINT16(resourceData + 7);
-	
+
 		assert( (sampleSize + 32) == res->_size);
 
 		int sampleRate = 0;
@@ -105,12 +105,12 @@ void SoundManager::playSound(Resource *res, int priority) {
 			error("Unexpected internal Sample Rate %d", internalSampleRate);
 			return;
 		}
-	
+
 		audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0);
 
 	} else
 		error("Unknown format");
-	
+
 	audioHandle = Audio::SoundHandle();
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &audioHandle,
 						audioStream, -1, _mixer->kMaxChannelVolume, 0,
@@ -119,7 +119,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 	/*
 	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
 	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
-	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream, -1, 
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream, -1,
 		Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::YES, false);
 		*/
 }
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 776c58a83b..abe833ce42 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -54,7 +54,7 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const
 	_header._height = _videoData->_stream->readUint16LE();
 	_videoData->_stream->skip(1);
 	_header._flags = (VideoFlags)_videoData->_stream->readByte();
-	
+
 	_startCoord = (byte *)vidSurface->getBasePtr(pt.x, pt.y);
 	_frameCount = _header._frameCount - 2;
 	_xCount = _header._width;
@@ -72,7 +72,7 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const
 
 		if (vidSurface == _vm->_screen)
 			_vm->_newRects.push_back(Common::Rect(pt.x, pt.y, pt.x + _xCount, pt.y + _scanCount));
-		
+
 		getFrame();
 	}
 
@@ -115,7 +115,7 @@ void VideoPlayer::playVideo() {
 			pDest += count;
 		} else {
 			// Read count number of pixels
-			
+
 			// Load across lines if necessary
 			while (count >= (pLine + _xCount - pDest)) {
 				int lineCount = (pLine + _xCount - pDest);
@@ -143,12 +143,12 @@ void VideoPlayer::playVideo() {
 void VideoPlayer::copyVideo() {
 	_vm->_player->calcPlayer();
 	Common::Rect r = Common::Rect(_vm->_vidX - _vm->_screen->_bufferStart.x,
-		_vm->_vidY - _vm->_screen->_bufferStart.y, 
+		_vm->_vidY - _vm->_screen->_bufferStart.y,
 		_vm->_vidX - _vm->_screen->_bufferStart.x + _header._width,
 		_vm->_vidY - _vm->_screen->_bufferStart.y + _header._height);
 	if (!_vm->_screen->clip(r))
 		return;
-	
+
 	_vm->_newRects.push_back(r);
 	int vh = _header._height;
 	int vw = _header._width;
-- 
cgit v1.2.3


From 1f42800e0cd2b4ab08bba78edbe69f657dc89367 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 4 Dec 2014 22:40:09 -0500
Subject: ACCESS: Further cleanup of river obstacles checks

---
 engines/access/amazon/amazon_game.cpp    |  3 +++
 engines/access/amazon/amazon_logic.cpp   | 21 +++++++++++----------
 engines/access/amazon/amazon_resources.h |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index deb45ff4b1..79fca87b3f 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -627,6 +627,9 @@ void AmazonEngine::dead(int deathId) {
 			_screen->forceFadeIn();
 			_sound->playSound(0);
 			_screen->forceFadeOut();
+
+			if (shouldQuit())
+				return;
 		}
 		freeCells();
 
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 428b85f969..a7ee432183 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1635,8 +1635,9 @@ void River::moveCanoe2() {
 void River::updateObstacles() {
 	RiverStruct *cur;
 	for (cur = _topList; cur < RIVER_OBJECTS[_riverIndex][RIVER_END]; ++cur) {
-		int val = cur->_field1 + cur->_riverX - 1;
+		int val = cur->_riverX + cur->_width - 1;
 		if (val < _screenVertX)
+			// Obstacle is not yet on-scren
 			break;
 
 		if (cur->_riverX < (_screenVertX + 319)) {
@@ -1645,7 +1646,7 @@ void River::updateObstacles() {
 
 			while (cur < RIVER_OBJECTS[_riverIndex][RIVER_END]) {
 				++cur;
-				val = cur->_field1 + cur->_riverX - 1;
+				val = cur->_riverX + cur->_width - 1;
 				if (val < _screenVertX || (cur->_riverX >= (_screenVertX + 319)))
 					break;
 
@@ -1676,19 +1677,19 @@ bool River::checkRiverCollide() {
 
 	_canoeVXPos = _screenVertX + 170;
 
-	for (RiverStruct *si = _topList; si <= _botList; ++si) {
-		if (si->_lane < _canoeLane)
+	for (RiverStruct *cur = _topList; cur <= _botList; ++cur) {
+		if (cur->_lane < _canoeLane)
 			continue;
 
-		if ((si->_lane == _canoeLane) || (si->_lane == _canoeLane + 1)) {
-			if (si->_field1 + si->_riverX - 1 >= _canoeVXPos) {
-				if (_canoeVXPos + 124 >= si->_riverX) {
-					_vm->_sound->playSound(4);
-					return true;
-				}
+		if ((cur->_lane == _canoeLane) || (cur->_lane == _canoeLane + 1)) {
+			if ((cur->_riverX + cur->_width - 1) >= _canoeVXPos &&
+					cur->_riverX < (_canoeVXPos + 124)) {
+				_vm->_sound->playSound(4);
+				return true;
 			}
 		}
 	}
+
 	return false;
 }
 
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index b6b0dbbdce..777c579073 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -31,7 +31,7 @@ namespace Amazon {
 
 struct RiverStruct {
 	int _id;
-	int _field1;
+	int _width;
 	int _riverX;
 	int _xp;
 	int _lane;
-- 
cgit v1.2.3


From c41d7bab2b3bdfd04a1872d2261866660c8b0bf3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 5 Dec 2014 08:28:35 +0100
Subject: ACCESS: Add some data for the character info used by the demo

---
 engines/access/amazon/amazon_resources.cpp | 32 ++++++++++++++++++++++++++++++
 engines/access/amazon/amazon_resources.h   |  1 +
 engines/access/char.cpp                    |  9 +++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index bd4e4f838d..509c8bcac4 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1383,6 +1383,31 @@ const byte LETTER[] = {
 	0x0, 0x0, 0x0, 0x30, 0x0, 0x5, 0x0, 0xFF, 0xFF
 };
 
+const byte OVERBOARD_DEMO[] = {
+	0x02, 0xFF, 0xFF, 0x22, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x02, 0x00,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x22, 0x00, 0x00, 0x00, 0x22,
+	0x00, 0x03, 0x00, 0x22, 0x00, 0x06, 0x00, 0x22, 0x00, 0x04,
+	0x00, 0x22, 0x00, 0x07, 0x00, 0x22, 0x00, 0x05, 0x00, 0x62,
+	0x00, 0x1D, 0x00, 0x60, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06,
+	0x00, 0x60, 0x00, 0x01, 0x00, 0x22, 0x00, 0x07, 0x00, 0xFF,
+	0xFF
+};
+
+const byte SHORE1[] = {
+	0x02, 0xFF, 0xFF, 0x55, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x03, 0x00,
+	0x55, 0x00, 0x00, 0x00, 0x55, 0x00, 0x02, 0x00, 0x62, 0x00,
+	0x2E, 0x00, 0x55, 0x00, 0x02, 0x00, 0x62, 0x00, 0x2F, 0x00,
+	0xFF, 0xFF
+};
+
+const byte CHAP8[] = {
+	0x02, 0xFF, 0xFF, 0x60, 0x00, 0x03, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x60, 0x00, 0x02, 0x00, 0xFF, 0xFF 
+};
+
 const byte *CHARTBL[] = {
 	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT,
 	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
@@ -1392,6 +1417,13 @@ const byte *CHARTBL[] = {
 	CRACK, LETTER
 };
 
+const byte *CHARTBL_DEMO[] = {
+	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD_DEMO, PILOT2, TIKAGENT,
+	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
+	ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS,
+	JWATER, SHOOT, ADIE, DYNAMITE, SHORE1, CHAP8
+};
+
 const char *const INVENTORY_NAMES[] = {
 	"RAT", "ALCOHOL", "SAFE COMBINATION", "BEAKER", "MICROFILM",
 	"VAULT KEY", "BOLT CUTTERS", "BLOWGUN", "LOVE POTION", "MONEY",
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 777c579073..6e35ca0361 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -64,6 +64,7 @@ extern const byte *ROOM_TABLE_DEMO[];
 extern const int ROOM_NUMB;
 
 extern const byte *CHARTBL[];
+extern const byte *CHARTBL_DEMO[];
 
 extern const char *const INVENTORY_NAMES[];
 
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index 8ce43a5730..d5eec3eb7f 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -71,8 +71,13 @@ CharManager::CharManager(AccessEngine *vm) : Manager(vm) {
 	switch (vm->getGameID()) {
 	case GType_Amazon:
 		// Setup character list
-		for (int i = 0; i < 37; ++i)
-			_charTable.push_back(CharEntry(Amazon::CHARTBL[i]));
+		if (_vm->isDemo()) {
+			for (int i = 0; i < 27; ++i)
+				_charTable.push_back(CharEntry(Amazon::CHARTBL_DEMO[i]));
+		} else {
+			for (int i = 0; i < 37; ++i)
+				_charTable.push_back(CharEntry(Amazon::CHARTBL[i]));
+		}
 		break;
 	default:
 		error("Unknown game");
-- 
cgit v1.2.3


From 59099a72057ff2e242679955a80e29d425219c8a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 5 Dec 2014 10:27:44 +0100
Subject: ACCESS: Fix cmdDead for the demo

---
 engines/access/amazon/amazon_game.cpp      | 111 +++++++++++++++++++----------
 engines/access/amazon/amazon_resources.cpp |  44 ++++++++++++
 engines/access/amazon/amazon_resources.h   |   2 +
 3 files changed, 120 insertions(+), 37 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 79fca87b3f..3252754239 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -124,9 +124,16 @@ void AmazonEngine::setupGame() {
 
 	// Load death list
 	_deaths.resize(58);
-	for (int i = 0; i < 58; ++i) {
-		_deaths[i]._screenId = DEATH_SCREENS[i];
-		_deaths[i]._msg = DEATH_TEXT[i];
+	if (isDemo()) {
+		for (int i = 0; i < 34; ++i) {
+			_deaths[i]._screenId = DEATH_SCREENS_DEMO[i];
+			_deaths[i]._msg = DEATH_TEXT_DEMO[i];
+		}
+	} else {
+		for (int i = 0; i < 58; ++i) {
+			_deaths[i]._screenId = DEATH_SCREENS[i];
+			_deaths[i]._msg = DEATH_TEXT[i];
+		}
 	}
 	_deaths._cells.resize(12);
 	for (int i = 0; i < 12; ++i)
@@ -616,7 +623,8 @@ void AmazonEngine::dead(int deathId) {
 	_screen->setPanel(3);
 
 	if (deathId != 10) {
-		_midi->newMusic(62, 0);
+		if (!isDemo())
+			_midi->newMusic(62, 0);
 		_files->_setPaletteFlag = false;
 		_files->loadScreen(94, 0);
 		_files->_setPaletteFlag = true;
@@ -631,43 +639,72 @@ void AmazonEngine::dead(int deathId) {
 			if (shouldQuit())
 				return;
 		}
-		freeCells();
 
-		// Load the cell list for the death screen
-		DeathEntry &de = _deaths[deathId];
-		Common::Array<CellIdent> cells;
-		cells.push_back(_deaths._cells[de._screenId]);
-		loadCells(cells);
+		if (!isDemo()) {
+			freeCells();
 
-		_screen->setDisplayScan();
-		_files->_setPaletteFlag = false;
-		_files->loadScreen(&_buffer2, 94, 1);
-		_screen->setIconPalette();
-
-		_buffer2.plotImage(_objectsTable[0], 0, Common::Point(105, 25));
-		_buffer2.copyTo(_screen);
-		_screen->forceFadeIn();
-
-		_fonts._charSet._hi = 10;
-		_fonts._charSet._lo = 1;
-		_fonts._charFor._lo = 55;
-		_fonts._charFor._hi = 255;
-		_screen->_maxChars = 46;
-		_screen->_printOrg = Common::Point(20, 155);
-		_screen->_printStart = Common::Point(20, 155);
-
-		Common::String &msg = de._msg;
-		_printEnd = 180;
-		printText(_screen, msg);
-		_screen->forceFadeOut();
+			// Load the cell list for the death screen
+			DeathEntry &de = _deaths[deathId];
+			Common::Array<CellIdent> cells;
+			cells.push_back(_deaths._cells[de._screenId]);
+			loadCells(cells);
 
-		_midi->newMusic(0, 1);
-		_events->showCursor();
-		_room->clearRoom();
-		freeChar();
+			_screen->setDisplayScan();
+			_files->_setPaletteFlag = false;
+			_files->loadScreen(&_buffer2, 94, 1);
+			_screen->setIconPalette();
+
+			_buffer2.plotImage(_objectsTable[0], 0, Common::Point(105, 25));
+			_buffer2.copyTo(_screen);
+			_screen->forceFadeIn();
+
+			_fonts._charSet._hi = 10;
+			_fonts._charSet._lo = 1;
+			_fonts._charFor._lo = 55;
+			_fonts._charFor._hi = 255;
+			_screen->_maxChars = 46;
+			_screen->_printOrg = Common::Point(20, 155);
+			_screen->_printStart = Common::Point(20, 155);
 
-		_currentManOld = 1;
-		_player->removeSprite1();
+			Common::String &msg = de._msg;
+			_printEnd = 180;
+
+			printText(_screen, msg);
+			_screen->forceFadeOut();
+
+			_midi->newMusic(0, 1);
+			_events->showCursor();
+			_room->clearRoom();
+			freeChar();
+
+			_currentManOld = 1;
+			_player->removeSprite1();
+
+		} else {
+			_files->loadScreen(_screen, 94, _deaths[deathId]._screenId);
+			_screen->forceFadeIn();
+
+			_fonts._charSet._hi = 10;
+			_fonts._charSet._lo = 1;
+			_fonts._charFor._lo = 55;
+			_fonts._charFor._hi = 255;
+			_screen->_maxChars = 49;
+			_screen->_printOrg = Common::Point(15, 165);
+			_screen->_printStart = Common::Point(15, 165);
+
+			Common::String msg = Common::String(_deaths[deathId]._msg);
+			_printEnd = 200;
+
+			printText(_screen, msg);
+			_screen->fadeOut();
+
+			_events->showCursor();
+			_room->clearRoom();
+			freeChar();
+
+			_currentManOld = 1;
+			_player->removeSprite1();
+		}
 
 		warning("TODO: restart game");
 		quitGame();
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 509c8bcac4..ed4a012bd1 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1660,6 +1660,13 @@ const byte DEATH_SCREENS[58] = {
 	8,  0,  5,  8,  0, 12, 12,  11
 };
 
+const byte DEATH_SCREENS_DEMO[34] = {
+	1, 2, 1, 1, 1, 1, 1, 1, 4, 1,
+	3, 4, 2, 4, 2, 1, 1, 1, 1, 1,
+	1, 4, 2, 4, 2, 4, 2, 4, 4, 4,
+	1, 1, 1, 1
+};
+
 const char *const DEATH_TEXT[58] = {
 	"SAM SALVADOR SPOTS YOU AND LETS YOU HAVE IT.",
 	"WHILE TAKING A MOONLIGHT SWIM YOU DISCOVER THAT PIRANHA REALLY CAN STRIP FLESH TO THE BONE.",
@@ -1755,6 +1762,43 @@ const char *const DEATH_TEXT[58] = {
 		"TWENTY YEARS LATER YOU ARE RELEASED FROM A SOUTH AMERICAN PRISON."
 };
 
+const char *const DEATH_TEXT_DEMO[34] = {
+	"SAM SALVADOR SPOTS YOU AND LETS YOU HAVE IT.",
+	"WHILE TAKING A MOONLIGHT SWIM YOU DISCOVER THAT PIRANHA REALLY CAN STRIP FLESH TO THE BONE.",
+	"THE GUARD FILLS YOU FULL OF HOLES BEFORE TOSSING YOU TO THE PIRANHA.",
+	"YOU'RE ONLY ABLE TO SWIM HALFWAY ACROSS THE RIVER BEFORE RUNNING OUT OF AIR.  YOU MAKE SO MUCH NOISE GASPING FOR BREATH THAT SAM EASILY FINDS YOU AND LEAVES YOU IN THE RIVER PERMANENTLY.",
+	"SAM SALVADOR NOTICES SOMEONE HAS BEEN PLAYING WITH THE CARGO. HE TRACKS YOU DOWN AND LETS YOU HAVE IT.",
+	"THE GUARD COMES AROUND THE CORNER.  HE DECIDES THAT THREE LEAD SLUGS WILL TEACH YOU TO BE MORE POLITE.",
+	"THE CAPTAIN IS WAITING OUTSIDE THE DOOR.",
+	"THE CAPTAIN',27h,'S RANDOM SHOOTING FINALLY FINDS ITS TARGET.",
+	"THE CRATE OUTSIDE THE WINDOW EXPLODES, DESTROYING THE SHIP.  UNFORTUNATELY, YOU'RE STILL ABOARD.",
+	"THE DOOR WAS NOT BARRED AND THE CAPTAIN WALKS RIGHT IN AND PARTS YOUR HAIR.",
+	"",
+	"YOU RUN OUT ON DECK, THEN REALIZE THAT MAYA IS STILL TIED UP.  AS YOU TURN TO GO BACK THE BOAT BLOWS UP.",
+	"AFTER YOU FAIL TO PROVE YOUR DIVINITY THE NATIVES EAT YOU FOR LUNCH.",
+	"THIS IS THE GENERIC DEATH SCENE",
+	"YOU ONLY MAKE IT HALFWAY ACROSS THE RIVER BEFORE THE PIRANHA STRIKE.",
+	"WITH NOTHING TO PROTECT HIM FROM THE HAIL OF BULLETS ALLEN IS QUICKLY GUNNED DOWN.  JASON AND MAYA SOON FOLLOW...",
+	"THE COMBINATION OF THE WIND AND GUNFIRE KNOCK THE CORRUGATED IRON OVER, LEAVING YOU WITHOUT PROTECTION.",
+	"WITHOUT SUFFICIENT AMMUNITION, ALLEN IS UNABLE TO HOLD OFF THE ATTACKERS FOR LONG.  THIS RESULTS IN A SERIOUS CASE OF LEAD POISONING.",
+	"ALLEN IS A MARVELOUS SHOT, BUT HIS AMMUNITION IS NOT UNLIMITED.  SOON IT IS ALL OVER.",
+	"THE PILOT FEELS YOU ARE TOO CLOSE AND PULLS THE TRIGGER.",
+	"THE PILOT SHOOTS YOU IN THE HEAD, THEN TOSSES YOUR LIFELESS",
+	"THE PLANE CRASHES INTO THE JUNGLE CANOPY AT 200 MPH.",
+	"THE CANOE HITS THE ROCKS AND CAPSIZES, AND THE PIRANHA MAKE YOU THEIR LUNCH GUESTS.",
+	"YOU ACCIDENTALLY DISCOVER THE FOURTH TALLEST WATERFALL IN SOUTH AMERICA.",
+	"YOU DISCOVER A VERY HUNGRY TRIBE OF CANNIBALS.",
+	"YOU BECOME LOST IN THE WINDING WATERWAYS AND WANDER UNTIL YOU STARVE TO DEATH.",
+	"YOU BECOME TRAPPED IN THE RAPIDS AND ARE CRUSHED BETWEEN THE ROCKS.",
+	"YOU WAIT AROUND FOR SOME TIME, BUT HANS STROHEIM NEVER SPEAKS TO YOU AGAIN.  FINALLY YOU RETURN HOME KNOWING YOU HAVE FAILED.",
+	"DECIDING THAT YOU THREATEN HIM AND HIS WORK, HANS STROHEIM HAS THE NATIVES IN THE VILLAGE KILL YOU.",
+	"YOU DO NOT GET FAR ENOUGH AWAY BEFORE THE DYNAMITE EXPLODES AND YOU ARE BLOWN INTO A THOUSAND PIECES.",
+	"STANDING OUT IN THE OPEN YOU ARE EXPOSED TO THE HAIL OF BULLETS FROM SANCHEZ' MEN.",
+	"THE AMAZON SENTINELS SPOT YOU AND FILL YOU FULL OF ARROWS.",
+	"SAM MAY BE UGLY, BUT HE',27h,'S NOT DEAF.  HE HEARS ALL THE NOISE YOU ARE MAKING AND CANCELS YOUR BOARDING PASS.",
+	"WITH THE BAR OFF THE DOOR THE CAPTAIN WALTZES IN AND BLOWS YOU AWAY"
+};
+
 const int DEATH_CELLS[12][3] = {
 	{ 0, 94, 3 },
 	{ 0, 94, 4 },
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 6e35ca0361..92e0cecf68 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -84,8 +84,10 @@ extern const char *const BAR_MESSAGE;
 extern const char *const HELPLVLTXT[3];
 extern const char *const IQLABELS[9];
 extern const byte DEATH_SCREENS[58];
+extern const byte DEATH_SCREENS_DEMO[34];
 
 extern const char *const DEATH_TEXT[58];
+extern const char *const DEATH_TEXT_DEMO[34];
 
 extern const int DEATH_CELLS[12][3];
 
-- 
cgit v1.2.3


From 84d77b7daf8473cd25196ae9445015ed3656797a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 5 Dec 2014 17:58:41 +0100
Subject: ACCESS: Fix the inventory behavior in the floppy and demo version

---
 engines/access/inventory.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index d9e1b496a4..78a85c3257 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -168,7 +168,9 @@ int InventoryManager::newDisplayInv() {
 
 	restoreFields();
 	screen.restorePalette();
-	if (!screen._vesaMode && !_invRefreshFlag) {
+	// The original was testing the vesa mode too.
+	// We removed this check as we don't use pre-rendering
+	if (!_invRefreshFlag) {
 		screen.clearBuffer();
 		screen.setPalette();
 	}
@@ -179,10 +181,10 @@ int InventoryManager::newDisplayInv() {
 		screen.setBufferScan();
 		room.buildScreen();
 
-		if (!screen._vesaMode) {
-			screen.fadeOut();
-			_vm->copyBF2Vid();
-		}
+		// The original was doing a check on the vesa mode at this point.
+		// We don't need it as we don't do inventory pre-rendering
+		screen.fadeOut();
+		_vm->copyBF2Vid();
 	}
 
 	events._cursorExitFlag = false;
@@ -275,7 +277,9 @@ void InventoryManager::initFields() {
 
 	_vm->_buffer1.clearBuffer();
 	_vm->_buffer2.clearBuffer();
-	if (!_invRefreshFlag && !screen._vesaMode)
+	// The original was doing at this point a check on vesa mode
+	// We don't need it as we don't do inventory pre-rendering
+	if (!_invRefreshFlag)
 		screen.clearBuffer();
 
 	screen.savePalette();
-- 
cgit v1.2.3


From 67b3304f710a6888943e8b029237b246377d4026 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Dec 2014 15:01:52 -0500
Subject: ACCESS: Clean up keyboard control

---
 engines/access/access.cpp              |  4 ++--
 engines/access/amazon/amazon_game.cpp  |  6 ++----
 engines/access/amazon/amazon_logic.cpp |  5 +----
 engines/access/events.cpp              | 28 ++++++++++++++++++----------
 engines/access/events.h                |  6 +++++-
 engines/access/scripts.cpp             |  7 +++----
 6 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 2153f594b1..55fe2514ed 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -229,7 +229,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 						_events->debounceLeft();
 						_sndSubFile += soundsLeft;
 						break;
-					} else if (_events->_keypresses.size() != 0) {
+					} else if (_events->isKeyPending()) {
 						_sndSubFile += soundsLeft;
 						break;
 					} else {
@@ -272,7 +272,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 			_events->debounceLeft();
 			_sndSubFile += soundsLeft;
 			break;
-		} else if (_events->_keypresses.size() != 0) {
+		} else if (_events->isKeyPending()) {
 			_sndSubFile += soundsLeft;
 			break;
 		} else {
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 3252754239..902cfcd38a 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -489,8 +489,7 @@ void AmazonEngine::startChapter(int chapter) {
 		_sound->freeSounds();
 
 		// Wait loop
-		while (!shouldQuit() && !_events->_leftButton && !_events->_rightButton
-				&& _events->_keypresses.size() == 0 && _timers[20]._flag) {
+		while (!shouldQuit() && !_events->isKeyMousePressed() && _timers[20]._flag) {
 			_events->pollEvents();
 			g_system->delayMillis(10);
 		}
@@ -531,8 +530,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_timers[20]._flag++;
 
 	// Wait loop
-	while (!shouldQuit() && !_events->_leftButton && !_events->_rightButton
-		&& _events->_keypresses.size() == 0 && _timers[20]._flag) {
+	while (!shouldQuit() && !_events->isKeyMousePressed() && _timers[20]._flag) {
 		_events->pollEvents();
 		g_system->delayMillis(10);
 	}
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index a7ee432183..5def4815e2 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -158,12 +158,9 @@ void CampScene::mWhileDoOpen() {
 
 		events.pollEventsAndWait();
 
-		if (events._leftButton || events._rightButton || events._keypresses.size() > 0) {
+		if (_vm->_events->isKeyMousePressed()) {
 			_skipStart = true;
 			_vm->_midi->newMusic(10, 1);
-
-			events.debounceLeft();
-			events.zeroKeys();
 			break;
 		}
 
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 87e5d10cc3..60073e6030 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -45,6 +45,7 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_mouseCol = _mouseRow = 0;
 	_cursorExitFlag = false;
 	_vbCount = 0;
+	_keyCode = Common::KEYCODE_INVALID;
 }
 
 EventsManager::~EventsManager() {
@@ -141,7 +142,7 @@ void EventsManager::pollEvents(bool skipTimers) {
 				_vm->_debugger->attach();
 				_vm->_debugger->onFrame();
 			} else {
-				_keypresses.push(event.kbd);
+				keyControl(event.kbd.keycode);
 			}
 			return;
 		case Common::EVENT_KEYUP:
@@ -181,6 +182,11 @@ void EventsManager::pollEvents(bool skipTimers) {
 	}
 }
 
+void EventsManager::keyControl(Common::KeyCode keycode) {
+	_keyCode = keycode;
+	// TODO: Keypress handling
+}
+
 void EventsManager::pollEventsAndWait() {
 	pollEvents();
 	g_system->delayMillis(10);
@@ -219,18 +225,23 @@ void EventsManager::delay(int time) {
 }
 
 void EventsManager::zeroKeys() {
-	_keypresses.clear();
+	_keyCode = Common::KEYCODE_INVALID;
 }
 
 bool EventsManager::getKey(Common::KeyState &key) {
-	if (_keypresses.empty()) {
+	if (_keyCode == Common::KEYCODE_INVALID) {
 		return false;
 	} else {
-		key = _keypresses.pop();
+		key = _keyCode;
+		_keyCode = Common::KEYCODE_INVALID;
 		return true;
 	}
 }
 
+bool EventsManager::isKeyPending() const {
+	return _keyCode != Common::KEYCODE_INVALID;
+}
+
 void EventsManager::debounceLeft() {
 	while (_leftButton && !_vm->shouldQuit()) {
 		pollEvents();
@@ -240,17 +251,14 @@ void EventsManager::debounceLeft() {
 
 void EventsManager::clearEvents() {
 	_leftButton = _rightButton = false;
-	_keypresses.clear();
+	zeroKeys();
 }
 
 void EventsManager::waitKeyMouse() {
-	while (!_vm->shouldQuit() && !_leftButton && _keypresses.size() == 0) {
+	while (!_vm->shouldQuit() && isKeyMousePressed()) {
 		pollEvents(true);
 		g_system->delayMillis(10);
 	}
-
-	zeroKeys();
-	debounceLeft();
 }
 
 Common::Point EventsManager::calcRawMouse() {
@@ -278,7 +286,7 @@ int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
 }
 
 bool EventsManager::isKeyMousePressed() {
-	bool result = _leftButton || _rightButton || _keypresses.size() > 0;
+	bool result = _leftButton || _rightButton || isKeyPending();
 	debounceLeft();
 	zeroKeys();
 
diff --git a/engines/access/events.h b/engines/access/events.h
index 965e8e7fd6..ffb0dbab3f 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -46,8 +46,11 @@ private:
 	AccessEngine *_vm;
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
+	Common::KeyCode _keyCode;
+
 	Graphics::Surface _invCursor;
 	void nextFrame(bool skipTimers);
+	void keyControl(Common::KeyCode keycode);
 public:
 	CursorType _cursorId;
 	CursorType _normalMouse;
@@ -58,7 +61,6 @@ public:
 	int _mouseCol, _mouseRow;
 	bool _cursorExitFlag;
 	int _vbCount;
-	Common::FixedStack<Common::KeyState> _keypresses;
 public:
 	/**
 	 * Constructor
@@ -113,6 +115,8 @@ public:
 
 	bool getKey(Common::KeyState &key);
 
+	bool isKeyPending() const;
+
 	void delay(int time);
 
 	void debounceLeft();
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index ec41f37d8c..728421c6d9 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -443,7 +443,7 @@ void Scripts::cmdCheckTimer() {
 	if (_endFlag)
 		return;
 
-	if ((idx == 9) && (_vm->_events->_keypresses.size() > 0)) {
+	if ((idx == 9) && _vm->_events->isKeyPending()) {
 		_vm->_events->zeroKeys();
 		_vm->_timers[9]._timer = 0;
 		_vm->_timers[9]._flag = 0;
@@ -724,10 +724,9 @@ void Scripts::cmdWait() {
 	_vm->_timers[3]._timer = time;
 	_vm->_timers[3]._initTm = time;
 	_vm->_timers[3]._flag++;
-	_vm->_events->_keypresses.clear();
+	_vm->_events->zeroKeys();
 
-	while (!_vm->shouldQuit() && _vm->_events->_keypresses.empty() &&
-			!_vm->_events->_leftButton && !_vm->_events->_rightButton &&
+	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
 			_vm->_timers[3]._flag) {
 		_vm->_midi->midiRepeat();
 		charLoop();
-- 
cgit v1.2.3


From 7cd7bb9b54266f952c4049875532e587b0278415 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Dec 2014 15:21:35 -0500
Subject: ACCESS: Implement player keyboard movement

---
 engines/access/events.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++---
 engines/access/events.h   |  2 +-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 60073e6030..a1be7ffa5b 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -27,6 +27,7 @@
 #include "engines/util.h"
 #include "access/access.h"
 #include "access/events.h"
+#include "access/player.h"
 #include "access/amazon/amazon_resources.h"
 
 #define CURSOR_WIDTH 16
@@ -142,10 +143,11 @@ void EventsManager::pollEvents(bool skipTimers) {
 				_vm->_debugger->attach();
 				_vm->_debugger->onFrame();
 			} else {
-				keyControl(event.kbd.keycode);
+				keyControl(event.kbd.keycode, true);
 			}
 			return;
 		case Common::EVENT_KEYUP:
+			keyControl(event.kbd.keycode, false);
 			return;
 		case Common::EVENT_MOUSEMOVE:
 			_mousePos = event.mouse;
@@ -182,9 +184,51 @@ void EventsManager::pollEvents(bool skipTimers) {
 	}
 }
 
-void EventsManager::keyControl(Common::KeyCode keycode) {
+void EventsManager::keyControl(Common::KeyCode keycode, bool isKeyDown) {
+	Player &player = *_vm->_player;
+
+	if (!isKeyDown) {
+		if (player._move != NONE) {
+			_keyCode = Common::KEYCODE_INVALID;
+			player._move = NONE;
+		}
+		return;
+	}
+	
 	_keyCode = keycode;
-	// TODO: Keypress handling
+	
+	switch (keycode) {
+	case Common::KEYCODE_UP:
+	case Common::KEYCODE_KP8:
+		player._move = UP;
+		break;
+	case Common::KEYCODE_DOWN:
+	case Common::KEYCODE_KP2:
+		player._move = DOWN;
+		break;
+	case Common::KEYCODE_LEFT:
+	case Common::KEYCODE_KP4:
+		player._move = LEFT;
+		break;
+	case Common::KEYCODE_RIGHT:
+	case Common::KEYCODE_KP6:
+		player._move = RIGHT;
+		break;
+	case Common::KEYCODE_KP7:
+		player._move = UPLEFT;
+		break;
+	case Common::KEYCODE_KP9:
+		player._move = UPRIGHT;
+		break;
+	case Common::KEYCODE_KP1:
+		player._move = DOWNLEFT;
+		break;
+	case Common::KEYCODE_KP3:
+		player._move = DOWNRIGHT;
+		break;
+	default:
+		break;
+	}
 }
 
 void EventsManager::pollEventsAndWait() {
diff --git a/engines/access/events.h b/engines/access/events.h
index ffb0dbab3f..04edd2bdf3 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -50,7 +50,7 @@ private:
 
 	Graphics::Surface _invCursor;
 	void nextFrame(bool skipTimers);
-	void keyControl(Common::KeyCode keycode);
+	void keyControl(Common::KeyCode keycode, bool isKeyDown);
 public:
 	CursorType _cursorId;
 	CursorType _normalMouse;
-- 
cgit v1.2.3


From 40b84172969781899347aff208f87da9d243d0ba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Dec 2014 16:07:14 -0500
Subject: ACCESS: Correct down-right player movement

---
 engines/access/player.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 5668e9c6b9..35c5dadf02 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -516,14 +516,14 @@ void Player::walkDownRight() {
 	_playerDirection = DOWNRIGHT;
 
 	int walkOffset, tempL;
-	bool flag = _scrollEnd == 1;
+	bool flag = _scrollEnd == 2;
 	if (!flag) {
 		calcPlayer();
-		flag = (_playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+		flag = (_vm->_screen->_clipWidth -  _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
 			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
-		walkOffset = _walkOffUR[_frame - _sideWalkMin].x;
+		walkOffset = _walkOffUR[_frame - _diagDownWalkMin].x;
 		tempL = _rawPlayerLow.x + _vm->_screen->_scaleTable2[walkOffset];
 		_rawTempL = (byte)tempL;
 		_rawXTemp = _rawPlayer.x + _vm->_screen->_scaleTable1[walkOffset] +
@@ -533,7 +533,7 @@ void Player::walkDownRight() {
 	}
 
 	walkOffset = _walkOffDR[_frame - _diagDownWalkMin].y;
-	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
+	tempL = _rawPlayerLow.y + _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTempL = (byte)tempL;
 	_rawYTemp = _rawPlayer.y + _vm->_screen->_scaleTable1[walkOffset] +
 		(tempL >= 0x100 ? 1 : 0);
@@ -546,17 +546,17 @@ void Player::walkDownRight() {
 		_rawPlayerLow.x = _rawTempL;
 		_rawPlayerLow.y = _rawYTempL;
 
-		++_frame;
 		calcManScale();
 
 		// This code looks totally useless as 'si' is unconditionally set in plotCom1
 		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
 		//	warning("TODO: walkDownRight - si = 0?");
 
+		++_frame;
 		if (_frame > _diagDownWalkMax)
 			_frame = _diagDownWalkMin;
 
-		plotCom1();
+		plotCom(0);
 	}
 }
 
-- 
cgit v1.2.3


From a1e5e8be9481add1402ea337039b755937ef6441 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Dec 2014 16:43:30 -0500
Subject: ACCESS: Cleaned up event handling for scene establish text display

---
 engines/access/access.cpp             | 10 +++-------
 engines/access/amazon/amazon_game.cpp |  1 +
 engines/access/events.cpp             |  2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 55fe2514ed..a09e47c733 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -196,7 +196,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 	int curPage = 0;
 	int soundsLeft = 0;
 
-	for (;;) {
+	while (!shouldQuit()) {
 		soundsLeft = _countTbl[curPage];
 		_events->zeroKeys();
 
@@ -216,7 +216,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 			if (!_sound->_isVoice) {
 				_events->waitKeyMouse();
 			} else {
-				for (;;) {
+				while (!shouldQuit()) {
 					_sound->freeSounds();
 					Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile);
 					_sound->_soundTable.push_back(SoundEntry(sound, 1));
@@ -225,11 +225,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 
 					_events->pollEvents();
 
-					if (_events->_leftButton) {
-						_events->debounceLeft();
-						_sndSubFile += soundsLeft;
-						break;
-					} else if (_events->isKeyPending()) {
+					if (_events->isKeyMousePressed()) {
 						_sndSubFile += soundsLeft;
 						break;
 					} else {
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 902cfcd38a..979fffe2d3 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -201,6 +201,7 @@ void AmazonEngine::loadEstablish(int estabIndex) {
 void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_establishMode = 1;
 
+	_events->clearEvents();
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index a1be7ffa5b..5ed5ee2052 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -299,7 +299,7 @@ void EventsManager::clearEvents() {
 }
 
 void EventsManager::waitKeyMouse() {
-	while (!_vm->shouldQuit() && isKeyMousePressed()) {
+	while (!_vm->shouldQuit() && !isKeyMousePressed()) {
 		pollEvents(true);
 		g_system->delayMillis(10);
 	}
-- 
cgit v1.2.3


From bf361715e0c83ebb18914e8769a867a2c5c370c2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Dec 2014 16:54:25 -0500
Subject: ACCESS: Simply river savegame fields

---
 engines/access/amazon/amazon_logic.cpp | 15 +--------------
 engines/access/amazon/amazon_logic.h   |  3 ---
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 5def4815e2..c9e8886d08 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1351,9 +1351,6 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_rScrollCol = 0;
 	_rScrollX = 0;
 	_rScrollY = 0;
-	_rOldRectCount = 0;
-	_rNewRectCount = 0;
-	_rKeyFlag = 0;
 	_mapOffset = 0;
 	_screenVertX = 0;
 	_saveRiver = false;
@@ -1422,12 +1419,7 @@ void River::initRiver() {
 	_vm->copyBF2Vid();
 	_vm->_screen->forceFadeIn();
 
-	if (_saveRiver) {
-		// Restore draw rects from savegame
-		_vm->_oldRects.resize(_rOldRectCount);
-		_vm->_newRects.resize(_rNewRectCount);
-		// KEYFLG = _vm->_rKeyFlag
-	} else {
+	if (!_saveRiver) {
 		// Reset draw rects
 		_vm->_oldRects.clear();
 		_vm->_newRects.clear();
@@ -1904,13 +1896,8 @@ void River::synchronize(Common::Serializer &s) {
 		s.syncAsUint16LE(_rScrollCol);
 		s.syncAsSint16LE(_rScrollX);
 		s.syncAsSint16LE(_rScrollY);
-		s.syncAsUint16LE(_rOldRectCount);
-		s.syncAsUint16LE(_rNewRectCount);
-		s.syncAsUint16LE(_rKeyFlag);
 		s.syncAsUint16LE(_mapOffset);
 		s.syncAsUint16LE(_screenVertX);
-		warning("TODO: 	s.syncAsSint16LE(_topList);");
-		warning("TODO: 	s.syncAsSint16LE(_botList);");
 
 		_saveRiver = s.isLoading();
 	}
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 14f51990cc..1cc65cbf6d 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -181,9 +181,6 @@ private:
 	int _rScrollCol;
 	int _rScrollX;
 	int _rScrollY;
-	int _rOldRectCount;
-	int _rNewRectCount;
-	int _rKeyFlag;
 	int _mapOffset;
 	int _screenVertX;
 
-- 
cgit v1.2.3


From b864b846356b6b20d6e6def414456b5d44fe88c7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 7 Dec 2014 19:03:06 +0100
Subject: ACCESS: Fix the end of the demo

---
 engines/access/amazon/amazon_game.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 979fffe2d3..b425fe9e22 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -621,7 +621,11 @@ void AmazonEngine::dead(int deathId) {
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (deathId != 10) {
+	if ((deathId == 10) && !isDemo()) {
+		quitGame();
+		_events->pollEvents();
+		return;
+	} else {
 		if (!isDemo())
 			_midi->newMusic(62, 0);
 		_files->_setPaletteFlag = false;
@@ -629,14 +633,16 @@ void AmazonEngine::dead(int deathId) {
 		_files->_setPaletteFlag = true;
 		_buffer2.copyFrom(*_screen);
 
-		for (int i = 0; i < 3; ++i) {
-			_sound->playSound(0);
-			_screen->forceFadeIn();
-			_sound->playSound(0);
-			_screen->forceFadeOut();
+		if (!isDemo() || deathId != 10) {
+			for (int i = 0; i < 3; ++i) {
+				_sound->playSound(0);
+				_screen->forceFadeIn();
+				_sound->playSound(0);
+				_screen->forceFadeOut();
 
-			if (shouldQuit())
-				return;
+				if (shouldQuit())
+					return;
+			}
 		}
 
 		if (!isDemo()) {
@@ -708,9 +714,6 @@ void AmazonEngine::dead(int deathId) {
 		warning("TODO: restart game");
 		quitGame();
 		_events->pollEvents();
-	} else {
-		quitGame();
-		_events->pollEvents();
 	}
 }
 
-- 
cgit v1.2.3


From 3cf08939797c1963264cf1ef49ed227fba3daf00 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 7 Dec 2014 19:53:19 +0100
Subject: ACCESS: Add a cheat mode which currently skips the guard in chapter 8

---
 engines/access/access.cpp              |  1 +
 engines/access/access.h                |  2 +-
 engines/access/amazon/amazon_logic.cpp |  5 +++++
 engines/access/debugger.cpp            | 13 +++++++++++++
 engines/access/debugger.h              |  1 +
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index a09e47c733..428c4c603a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -88,6 +88,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_sndSubFile = 0;
 	_loadSaveSlot = -1;
 	_vidX = _vidY = 0;
+	_cheatFl = false;
 }
 
 AccessEngine::~AccessEngine() {
diff --git a/engines/access/access.h b/engines/access/access.h
index 2fe4b726a2..2fdf26318e 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -207,7 +207,7 @@ public:
 	int _flags[256];
 
 	bool _clearSummaryFlag;
-
+	bool _cheatFl;
 	// Fields mapped into the flags array
 	int &_useItem;
 	int &_startup;
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c9e8886d08..c1df5353a2 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1168,6 +1168,11 @@ void Guard::setGuardFrame() {
 }
 
 void Guard::doGuard() {
+	// Skip the code dealing with the guard on the boat (chapter 8)
+	// if the cheat mode is activated
+	if (_vm->_cheatFl)
+		return;
+
 	if (_vm->_timers[8]._flag) {
 		setGuardFrame();
 		return;
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 6b49fb0e67..1f8100452b 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -57,6 +57,7 @@ Debugger *Debugger::init(AccessEngine *vm) {
 Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
 	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
+	registerCmd("cheat", WRAP_METHOD(Debugger, Cmd_Cheat));
 
 	switch (vm->getGameID()) {
 	case GType_Amazon:
@@ -120,6 +121,18 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 	}
 }
 
+bool Debugger::Cmd_Cheat(int argc, const char **argv) {
+	if (argc != 1) {
+		debugPrintf("Usage: %s\n", argv[0]);
+		debugPrintf("Switches on/off the cheat mode\n");
+		return true;
+	}
+
+	_vm->_cheatFl = !_vm->_cheatFl;
+	debugPrintf("Cheat is now %s\n", _vm->_cheatFl ? "ON" : "OFF");
+	return true;
+}
+
 /*------------------------------------------------------------------------*/
 
 namespace Amazon {
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
index 839d13106e..6bd23740cd 100644
--- a/engines/access/debugger.h
+++ b/engines/access/debugger.h
@@ -37,6 +37,7 @@ protected:
 	AccessEngine *_vm;
 
 	bool Cmd_LoadScene(int argc, const char **argv);
+	bool Cmd_Cheat(int argc, const char **argv);
 	Common::String *_sceneDescr;
 	int _sceneNumb;
 public:
-- 
cgit v1.2.3


From 07456932d4be48fcf27a991d9d764a111abc5524 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 7 Dec 2014 22:28:03 +0100
Subject: ACCESS: Add a debug channel for the sound & music handling

---
 engines/access/access.cpp |  1 +
 engines/access/access.h   |  3 ++-
 engines/access/sound.cpp  | 42 +++++++++++++++++++++++++++++++++---------
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 428c4c603a..b63bb29e0a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -120,6 +120,7 @@ void AccessEngine::initialize() {
 	DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
 	DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
 	DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
+	DebugMan.addDebugChannel(kDebugSound, "sound", "Sound and Music handling");
 
 	if (isCD()) {
 		const Common::FSNode gameDataDir(ConfMan.get("path"));
diff --git a/engines/access/access.h b/engines/access/access.h
index 2fdf26318e..284ac2690c 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -71,7 +71,8 @@ enum {
 enum AccessDebugChannels {
 	kDebugPath      = 1 << 0,
 	kDebugScripts	= 1 << 1,
-	kDebugGraphics	= 1 << 2
+	kDebugGraphics	= 1 << 2,
+	kDebugSound     = 1 << 3
 };
 
 struct AccessGameDescription;
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 95576d212b..b5800ba82f 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -30,8 +30,7 @@
 
 namespace Access {
 
-SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
-		_vm(vm), _mixer(mixer) {
+SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_playingSound = false;
 	_isVoice = false;
 }
@@ -41,12 +40,16 @@ SoundManager::~SoundManager() {
 }
 
 void SoundManager::clearSounds() {
+	debugC(1, kDebugSound, "clearSounds()");
+
 	for (uint i = 0; i < _soundTable.size(); ++i)
 		delete _soundTable[i]._res;
 	_soundTable.clear();
 }
 
 void SoundManager::queueSound(int idx, int fileNum, int subfile) {
+	debugC(1, kDebugSound, "queueSound(%d, %d, %d)", idx, fileNum, subfile);
+
 	Resource *soundResource;
 
 	if (idx >= (int)_soundTable.size())
@@ -59,15 +62,20 @@ void SoundManager::queueSound(int idx, int fileNum, int subfile) {
 }
 
 Resource *SoundManager::loadSound(int fileNum, int subfile) {
+	debugC(1, kDebugSound, "loadSound(%d, %d)", fileNum, subfile);
 	return _vm->_files->loadFile(fileNum, subfile);
 }
 
 void SoundManager::playSound(int soundIndex) {
+	debugC(1, kDebugSound, "playSound(%d)", soundIndex);
+
 	int priority = _soundTable[soundIndex]._priority;
 	playSound(_soundTable[soundIndex]._res, priority);
 }
 
 void SoundManager::playSound(Resource *res, int priority) {
+	debugC(1, kDebugSound, "playSound");
+
 	byte *resourceData = res->data();
 	Audio::SoundHandle audioHandle;
 	Audio::RewindableAudioStream *audioStream = 0;
@@ -125,6 +133,8 @@ void SoundManager::playSound(Resource *res, int priority) {
 }
 
 void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
+	debugC(1, kDebugSound, "loadSounds");
+
 	clearSounds();
 
 	for (uint i = 0; i < sounds.size(); ++i) {
@@ -134,10 +144,14 @@ void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
 }
 
 void SoundManager::stopSound() {
+	debugC(3, kDebugSound, "stopSound");
+
 	_mixer->stopHandle(Audio::SoundHandle());
 }
 
 void SoundManager::freeSounds() {
+	debugC(3, kDebugSound, "freeSounds");
+
 	stopSound();
 	clearSounds();
 }
@@ -177,7 +191,8 @@ void MusicManager::send(uint32 b) {
 }
 
 void MusicManager::midiPlay() {
-	warning("MusicManager::midiPlay");
+	debugC(1, kDebugSound, "midiPlay");
+
 	if (_music->_size < 4) {
 		error("midiPlay() wrong music resource size");
 	}
@@ -208,12 +223,13 @@ void MusicManager::midiPlay() {
 }
 
 bool MusicManager::checkMidiDone() {
-	warning("MusicManager::checkMidiDone");
+	debugC(1, kDebugSound, "checkMidiDone");
 	return (!_isPlaying);
 }
 
 void MusicManager::midiRepeat() {
-	warning("MusicManager::midiRepeat");
+	debugC(1, kDebugSound, "midiRepeat");
+
 	if (!_parser)
 		return;
 
@@ -224,22 +240,26 @@ void MusicManager::midiRepeat() {
 }
 
 void MusicManager::stopSong() {
-	warning("MusicManager::stopSong");
+	debugC(1, kDebugSound, "stopSong");
+
 	stop();
 }
 
 void MusicManager::loadMusic(int fileNum, int subfile) {
-	warning("MusicManager::loadMusic %d %d", fileNum, subfile);
+	debugC(1, kDebugSound, "loadMusic(%d, %d)", fileNum, subfile);
+
 	_music = _vm->_files->loadFile(fileNum, subfile);
 }
 
 void MusicManager::loadMusic(FileIdent file) {
-	warning("MusicManager::loadMusic %d %d", file._fileNum, file._subfile);
+	debugC(1, kDebugSound, "loadMusic(%d, %d)", file._fileNum, file._subfile);
+
 	_music = _vm->_files->loadFile(file);
 }
 
 void MusicManager::newMusic(int musicId, int mode) {
-	warning("MusicManager::newMusic %d %d", musicId, mode);
+	debugC(1, kDebugSound, "newMusic(%d, %d)", musicId, mode);
+
 	if (mode == 1) {
 		stopSong();
 		freeMusic();
@@ -258,11 +278,15 @@ void MusicManager::newMusic(int musicId, int mode) {
 }
 
 void MusicManager::freeMusic() {
+	debugC(3, kDebugSound, "freeMusic");
+
 	delete _music;
 	_music = nullptr;
 }
 
 void MusicManager::setLoop(bool loop) {
+	debugC(3, kDebugSound, "setLoop");
+
 	_isLooping = loop;
 	if (_parser)
 		_parser->property(MidiParser::mpAutoLoop, _isLooping);
-- 
cgit v1.2.3


From 8e90ef2ec7fd1b3bf7d020988fff1629605b0481 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 7 Dec 2014 17:45:51 -0500
Subject: ACCESS: Minor river code clean up and saving fix

---
 engines/access/amazon/amazon_game.h    |  1 -
 engines/access/amazon/amazon_logic.cpp | 51 +++++++++++++++++++---------------
 engines/access/amazon/amazon_logic.h   |  1 +
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 43fce80191..63ee978359 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -107,7 +107,6 @@ public:
 	int _updateChapter;
 	int _oldTitleChapter;
 	int _maxHits;
-	int _oldScrollCol;
 	int _iqValue;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c1df5353a2..cb655bbf14 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1361,6 +1361,7 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_saveRiver = false;
 	_deathFlag = false;
 	_deathCount = 0;
+	_oldScrollCol = 0;
 }
 
 void River::setRiverPan() {
@@ -1472,7 +1473,7 @@ void River::initRiver() {
 
 void River::resetPositions() {
 	riverSetPhysX();
-	int val = (_vm->_screen->_scrollCol + 1 - _vm->_oldScrollCol) * 16;
+	int val = (_vm->_screen->_scrollCol + 1 - _oldScrollCol) * 16;
 	if (val > 256) {
 		val &= 0x7F;
 		val |= 0x80;
@@ -1483,7 +1484,7 @@ void River::resetPositions() {
 }
 
 void River::checkRiverPan() {
-	int val = (_vm->_screen->_scrollCol + 20) * 16;
+	int val = _vm->_screen->_scrollCol * 16 + 320;
 
 	for (int i = 0; i < _pNumObj; i++) {
 		if (_pan[i]._pObjX < val)
@@ -1499,7 +1500,7 @@ bool River::riverJumpTest() {
 		++_mapPtr;
 		if (val == 0xFF)
 			return true;
-		_vm->_oldScrollCol = _vm->_screen->_scrollCol;
+		_oldScrollCol = _vm->_screen->_scrollCol;
 
 		if (val == 0) {
 			_vm->_screen->_scrollCol = 139;
@@ -1524,7 +1525,7 @@ bool River::riverJumpTest() {
 				_deathCount = 300;
 				_deathType = val2;
 			}
-			_vm->_oldScrollCol = _vm->_screen->_scrollCol;
+			_oldScrollCol = _vm->_screen->_scrollCol;
 			_vm->_screen->_scrollCol = 44;
 			_vm->_screen->_scrollX = 14;
 			_vm->_room->buildScreen();
@@ -1579,11 +1580,6 @@ void River::moveCanoe() {
 			} else {
 				// Clicked on the Disc icon
 				_saveRiver = true;
-				_rScrollRow = screen._scrollRow;
-				_rScrollCol = screen._scrollCol;
-				_rScrollX = screen._scrollX;
-				_rScrollY = screen._scrollY;
-				_mapOffset = _mapPtr - MAPTBL[_vm->_riverFlag];
 
 				// Show the ScummVM menu
 				_vm->_room->handleCommand(9);
@@ -1635,6 +1631,8 @@ void River::updateObstacles() {
 			break;
 
 		if (cur->_riverX < (_screenVertX + 319)) {
+			// Object is now on-screen. So set _topList/_botList to the range
+			// of river obstacles that are currently visible
 			_topList = cur;
 			_botList = cur;
 
@@ -1657,11 +1655,10 @@ void River::updateObstacles() {
 }
 
 void River::riverSetPhysX() {
-	int val = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
-	RiverStruct *cur = _topList;
-	while (cur <= _botList) {
-		cur[0]._xp = val - (_screenVertX - cur[0]._riverX);
-		++cur;
+	int xAmt = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+	
+	for (RiverStruct *cur = _topList; cur <= _botList; ++cur) {
+		cur->_xp = xAmt - (_screenVertX - cur->_riverX);
 	}
 }
 
@@ -1688,14 +1685,15 @@ bool River::checkRiverCollide() {
 }
 
 void River::plotRiver() {
+	// Handle cycling through the canoe rowing frames
 	if (_vm->_timers[3]._flag == 0) {
 		++_vm->_timers[3]._flag;
-		if (_canoeFrame == 12)
+
+		if (_canoeFrame++ == 12)
 			_canoeFrame = 0;
-		else
-			++_canoeFrame;
 	}
 
+	// Draw the canoe
 	ImageEntry ie;
 	ie._flags = IMGFLAG_UNSCALED;
 	ie._spritesPtr = _vm->_objectsTable[45];
@@ -1705,19 +1703,17 @@ void River::plotRiver() {
 	ie._offsetY = 41;
 	_vm->_images.addToList(ie);
 
-	RiverStruct *cur = _topList;
-	while (cur <= _botList) {
+	// Draw any on-screen obstacles
+	for (RiverStruct *cur = _topList; cur <= _botList; ++cur) {
 		if (cur->_id != -1) {
 			ie._flags = IMGFLAG_UNSCALED;
 			ie._spritesPtr = _vm->_objectsTable[45];
 			ie._frameNumber = cur->_id;
 			ie._position.x = cur->_xp;
-			int val = (cur[0]._lane * 5) + 56;
-			ie._position.y = val - cur->_offsetY;
+			ie._position.y = (cur->_lane * 5) + 56 - cur->_offsetY;
 			ie._offsetY = cur->_offsetY;
 			_vm->_images.addToList(ie);
 		}
-		++cur;
 	}
 }
 
@@ -1890,8 +1886,19 @@ void River::river() {
 		}
 	}
 }
+
 void River::synchronize(Common::Serializer &s) {
 	if (_vm->_player->_roomNumber == 45) {
+		if (s.isSaving()) {
+			// Set river properties to be saved out
+			Screen &screen = *_vm->_screen;
+			_rScrollRow = screen._scrollRow;
+			_rScrollCol = screen._scrollCol;
+			_rScrollX = screen._scrollX;
+			_rScrollY = screen._scrollY;
+			_mapOffset = _mapPtr - MAPTBL[_vm->_riverFlag];
+		}
+
 		s.syncAsSint16LE(_canoeLane);
 		s.syncAsSint16LE(_canoeYPos);
 		s.syncAsSint16LE(_hitCount);
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 1cc65cbf6d..d2fb3334fa 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -183,6 +183,7 @@ private:
 	int _rScrollY;
 	int _mapOffset;
 	int _screenVertX;
+	int _oldScrollCol;
 
 	void initRiver();
 	void resetPositions();
-- 
cgit v1.2.3


From 86bee5b48ecbadf9c8f1b4ae2f48c8bcbdf3fce9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 7 Dec 2014 17:53:05 -0500
Subject: ACCESS: Fix function key mapping for game icons

---
 engines/access/room.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b3c3317307..a781dab24a 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -468,8 +468,8 @@ void Room::doCommands() {
 			mainAreaClick();
 		}
 	} else if (_vm->_events->getKey(keyState)) {
-		if (keyState.ascii >= ';' && keyState.ascii <= 'D') {
-			handleCommand((int)keyState.ascii - ';');
+		if (keyState.keycode >= Common::KEYCODE_F1 && keyState.keycode <= Common::KEYCODE_F9) {
+			handleCommand(keyState.keycode - Common::KEYCODE_F1 + 1);
 		}
 	}
 }
-- 
cgit v1.2.3


From 7508e7b5f8c491556b65ff48d54f289cec9532b1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 8 Dec 2014 07:45:11 +0100
Subject: ACCESS: Minor River cleanup

---
 engines/access/amazon/amazon_game.h    | 1 -
 engines/access/amazon/amazon_logic.cpp | 4 ++--
 engines/access/amazon/amazon_logic.h   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 63ee978359..30b9b80778 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -106,7 +106,6 @@ public:
 	int _hintLevel;
 	int _updateChapter;
 	int _oldTitleChapter;
-	int _maxHits;
 	int _iqValue;
 public:
 	AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index cb655bbf14..89ea81507b 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1362,6 +1362,7 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_deathFlag = false;
 	_deathCount = 0;
 	_oldScrollCol = 0;
+	_maxHits = 0;
 }
 
 void River::setRiverPan() {
@@ -1467,7 +1468,7 @@ void River::initRiver() {
 	_vm->_timers[12]._initTm = 1500;
 	++_vm->_timers[12]._flag;
 
-	_vm->_maxHits = 2 - _vm->_riverFlag;
+	_maxHits = 2 - _vm->_riverFlag;
 	_saveRiver = false;
 }
 
@@ -1558,7 +1559,6 @@ void River::riverSound() {
 }
 
 void River::moveCanoe() {
-	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 	Common::Point pt = events.calcRawMouse();
 
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index d2fb3334fa..2799e4f8dd 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -170,6 +170,7 @@ private:
 	bool _deathFlag;
 	int _deathCount;
 	int _deathType;
+	int _maxHits;
 
 	// Saved fields
 	int _canoeLane;
-- 
cgit v1.2.3


From 960a787c033fa7a90d347b9d37c4c0e890444ce2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 8 Dec 2014 07:55:47 +0100
Subject: ACCESS: Reduce the scope of a variable in Inventory

---
 engines/access/inventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 78a85c3257..4038929a67 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -318,13 +318,13 @@ void InventoryManager::putInvIcon(int itemIndex, int itemId) {
 void InventoryManager::chooseItem() {
 	EventsManager &events = *_vm->_events;
 	_vm->_useItem = -1;
-	int selIndex;
 
 	while (!_vm->shouldQuit()) {
 		// Check for events
 		events.pollEvents();
 		g_system->delayMillis(10);
 
+		int selIndex;
 		// Poll events and wait for a click on a known area
 		if (!events._leftButton || ((selIndex = coordIndexOf()) == -1))
 			continue;
-- 
cgit v1.2.3


From 9ef60f3f3357491e39dfe3c16470fa3711e8a211 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 8 Dec 2014 07:56:13 +0100
Subject: ACCESS: Fix a bug in plotInactive

---
 engines/access/amazon/amazon_scripts.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index fb1ccbe05e..c5b77950ad 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -300,8 +300,8 @@ void AmazonScripts::plotInactive() {
 			_game->_rawInactiveY >= 158 && _game->_rawInactiveY <= 173) {
 		_game->_flags[155] = 1;
 	} else {
-		_game->_flags[160] = 1;
-		if (!_game->_jasMayaFlag && _game->_rawInactiveX <= 266 && _game->_rawInactiveX < 290
+		_game->_flags[160] = 0;
+		if (!_game->_jasMayaFlag && _game->_rawInactiveX >= 266 && _game->_rawInactiveX <= 290
 			&& _game->_rawInactiveY >= 70 && _game->_rawInactiveY <= 87) {
 			_game->_flags[160] = 1;
 		}
-- 
cgit v1.2.3


From 35922c28c8579c9f2fe476a351da74a92b7660d5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 9 Dec 2014 00:35:02 +0100
Subject: ACCESS: Add a hack to fake queueing

---
 engines/access/amazon/amazon_logic.cpp | 2 +-
 engines/access/sound.cpp               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 89ea81507b..f1bf7dcf3b 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -354,9 +354,9 @@ void Opening::doTitle() {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
 			_vm->_screen->copyFrom(_vm->_buffer2);
 
+			_vm->_sound->playSound(1);
 			_vm->_events->_vbCount = 70;
 			while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0 && !_skipStart) {
-				_vm->_sound->playSound(1);
 				_vm->_events->pollEventsAndWait();
 				if (_vm->_events->_rightButton)
 					_skipStart = true;
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index b5800ba82f..4e701618d9 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -82,6 +82,10 @@ void SoundManager::playSound(Resource *res, int priority) {
 
 	assert(res->_size >= 32);
 
+	// HACK: Simulates queueing for the rare sounds played one after the other
+	while (_mixer->hasActiveChannelOfType(Audio::Mixer::kSFXSoundType))
+		;
+
 	if (READ_BE_UINT32(resourceData) == MKTAG('R','I','F','F')) {
 		// CD version uses WAVE-files
 		Common::SeekableReadStream *waveStream = new Common::MemoryReadStream(resourceData, res->_size, DisposeAfterUse::NO);
-- 
cgit v1.2.3


From b20c755f46b34906305c773d1e4e320d0d8affbe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 8 Dec 2014 21:59:00 -0500
Subject: ACCESS: Fix progressing within the river

---
 engines/access/amazon/amazon_logic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index f1bf7dcf3b..952809f11f 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1497,10 +1497,10 @@ void River::checkRiverPan() {
 
 bool River::riverJumpTest() {
 	if (_vm->_screen->_scrollCol == 120 || _vm->_screen->_scrollCol == 60 || _vm->_screen->_scrollCol == 0) {
-		int val = _mapPtr[0];
-		++_mapPtr;
+		int val = *++_mapPtr;
 		if (val == 0xFF)
 			return true;
+
 		_oldScrollCol = _vm->_screen->_scrollCol;
 
 		if (val == 0) {
-- 
cgit v1.2.3


From c69480f6bf6f7afd6f0cffb0a6a76e22ad8e08cf Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 8 Dec 2014 23:13:42 -0500
Subject: ACCESS: Fix event pollig in death flashing loop

---
 engines/access/amazon/amazon_game.cpp  | 1 +
 engines/access/amazon/amazon_logic.cpp | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index b425fe9e22..9880b65b69 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -640,6 +640,7 @@ void AmazonEngine::dead(int deathId) {
 				_sound->playSound(0);
 				_screen->forceFadeOut();
 
+				_events->pollEvents();
 				if (shouldQuit())
 					return;
 			}
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 952809f11f..01450077bd 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1475,8 +1475,7 @@ void River::initRiver() {
 void River::resetPositions() {
 	riverSetPhysX();
 	int val = (_vm->_screen->_scrollCol + 1 - _oldScrollCol) * 16;
-	if (val > 256) {
-		val &= 0x7F;
+	if (val < 0) {
 		val |= 0x80;
 	}
 
-- 
cgit v1.2.3


From 8ee8444779b11528391fb969f186fd8a74f437a6 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 9 Dec 2014 07:49:39 +0100
Subject: ACCESS: Skip chapter speech for the non-CD versions

---
 engines/access/amazon/amazon_game.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 9880b65b69..98eba1f086 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -481,13 +481,14 @@ void AmazonEngine::startChapter(int chapter) {
 		_timers[20]._flag++;
 		_sound->freeSounds();
 
-		_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 0), 1));
-		_sound->playSound(0);
-		_sound->freeSounds();
+		if (isCD()) {
+			_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 0), 1));
+			_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 1), 1));
+			_sound->playSound(0);
+			_sound->playSound(1);
 
-		_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 1), 1));
-		_sound->playSound(0);
-		_sound->freeSounds();
+			_sound->freeSounds();
+		}
 
 		// Wait loop
 		while (!shouldQuit() && !_events->isKeyMousePressed() && _timers[20]._flag) {
-- 
cgit v1.2.3


From 8d97dc9891a3a4a217c72915b8a319f66f84d250 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 9 Dec 2014 07:50:40 +0100
Subject: ACCESS: stops the SFX sounds in the intro at the end of the countdown

---
 engines/access/amazon/amazon_logic.cpp | 1 +
 engines/access/sound.h                 | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 01450077bd..80c98a8ad1 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -365,6 +365,7 @@ void Opening::doTitle() {
 		if (_vm->shouldQuit())
 			return;
 
+		_vm->_sound->stopSound();
 		_vm->_sound->playSound(0);
 		_vm->_screen->forceFadeOut();
 		_vm->_events->_vbCount = 100;
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 5089bd093b..dc8bd90b85 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -52,8 +52,6 @@ private:
 	void clearSounds();
 
 	void playSound(Resource *res, int priority);
-	void stopSound();
-
 public:
 	Common::Array<SoundEntry> _soundTable;
 	bool _playingSound;
@@ -69,6 +67,7 @@ public:
 	Resource *loadSound(int fileNum, int subfile);
 	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
 
+	void stopSound();
 	void freeSounds();
 };
 
-- 
cgit v1.2.3


From 98685b935822f3f934d3b69aa079e3e70b71f2e2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 9 Dec 2014 07:59:18 +0100
Subject: ACCESS: Add some more checks for the floppy version

---
 engines/access/amazon/amazon_game.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 98eba1f086..77ee8fe620 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -232,7 +232,7 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_printEnd = 155;
 	Common::String msg((const char *)_establish->data() + msgOffset);
 
-	if (_txtPages == 0) {
+	if ((_txtPages == 0) || !isCD()) {
 		printText(_screen, msg);
 	} else {
 		speakText(_screen, msg);
@@ -569,7 +569,7 @@ void AmazonEngine::startChapter(int chapter) {
 
 	Common::String msg((const char *)_establish->data() + msgOffset);
 
-	if (_txtPages == 0) {
+	if ((_txtPages == 0) || !isCD()) {
 		printText(_screen, msg);
 	} else {
 		speakText(_screen, msg);
-- 
cgit v1.2.3


From 1870e31e25bd2b502fca538fd6c84e97c839b5a5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 9 Dec 2014 08:02:10 +0100
Subject: ACCESS: Add a comment related to the CD specific files

---
 engines/access/amazon/amazon_resources.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index ed4a012bd1..cb84841002 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -45,6 +45,7 @@ const char *const FILENAMES[] = {
 	"C24.AP", "C25.AP", "C29.AP", "C30.AP", "C32.AP", "C33.AP",
 	"C34.AP", "CREDITS.AP", "MIDIDRV.AP", "SUMMARY.AP", "DEAD.AP",
 	"EST.AP", "CHAPTER.AP", "MIDI.AP", "SOUND.AP", "INV.AP",
+	// The following files are only present in the CD version
 	"NARATE01.AP", "NARATE02.AP", "NARATE03.AP", "NARATE04.AP",
 	"NARATE05.AP", "NARATE06.AP", "NARATE07.AP", "NARATE08.AP",
 	"NARATE09.AP", "NARATE10.AP", "NARATE11.AP", "NARATE12.AP",
-- 
cgit v1.2.3


From beba0b40d5730844d6c8ffc813f19cf5d743f2af Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 9 Dec 2014 19:43:38 -0500
Subject: ACCESS: Minor cleanup of _saveRiver flag

---
 engines/access/amazon/amazon_logic.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 80c98a8ad1..23a8a43932 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1578,14 +1578,10 @@ void River::moveCanoe() {
 				// Disk icon wasn't clicked
 				_vm->_scripts->printString(BAR_MESSAGE);
 			} else {
-				// Clicked on the Disc icon
-				_saveRiver = true;
-
-				// Show the ScummVM menu
+				// Clicked on the Disc icon. Show the ScummVM menu
 				_vm->_room->handleCommand(9);
 
 				if (_vm->_room->_function != FN_CLEAR1) {
-					_saveRiver = false;
 					_vm->_room->buildScreen();
 					_vm->copyBF2Vid();
 				}
-- 
cgit v1.2.3


From cdc27778c0c07d728876ebe169d658dda666ef1f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 9 Dec 2014 20:11:44 -0500
Subject: ACCESS: Add a button to allow skipping the river scene

---
 engines/access/amazon/amazon_logic.cpp   | 22 +++++++++++++++++-----
 engines/access/amazon/amazon_logic.h     |  2 +-
 engines/access/amazon/amazon_scripts.cpp |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 23a8a43932..eb889d2000 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1471,6 +1471,12 @@ void River::initRiver() {
 
 	_maxHits = 2 - _vm->_riverFlag;
 	_saveRiver = false;
+
+	Font &font2 = _vm->_fonts._font2;
+	font2._fontColors[0] = 0;
+	font2._fontColors[1] = 33;
+	font2._fontColors[2] = 34;
+	font2._fontColors[3] = 35;
 }
 
 void River::resetPositions() {
@@ -1561,6 +1567,7 @@ void River::riverSound() {
 void River::moveCanoe() {
 	EventsManager &events = *_vm->_events;
 	Common::Point pt = events.calcRawMouse();
+	Common::Point mousePos = events.getMousePos();
 
 	// Do an event polling
 	_vm->_canSaveLoad = true;
@@ -1586,8 +1593,10 @@ void River::moveCanoe() {
 					_vm->copyBF2Vid();
 				}
 			}
-		}
-		else if ((events._leftButton && pt.y <= _canoeYPos) ||
+		} else if (events._leftButton && mousePos.x < 35 && mousePos.y < 12) {
+			// Clicked on the Skip button. So chicken out
+			_CHICKENOUTFLG = true;
+		}  else if ((events._leftButton && pt.y <= _canoeYPos) ||
 			(!events._leftButton && _vm->_player->_move == UP)) {
 			// Move canoe up
 			if (_canoeLane > 0) {
@@ -1596,8 +1605,7 @@ void River::moveCanoe() {
 
 				moveCanoe2();
 			}
-		}
-		else if (events._leftButton || _vm->_player->_move == DOWN) {
+		} else if (events._leftButton || _vm->_player->_move == DOWN) {
 			// Move canoe down
 			if (_canoeLane < 7) {
 				_canoeDir = 1;
@@ -1711,6 +1719,10 @@ void River::plotRiver() {
 			_vm->_images.addToList(ie);
 		}
 	}
+
+	// Draw the text for skipping the river
+	Font &font2 = _vm->_fonts._font2;
+	font2.drawString(_vm->_screen, "SKIP", Common::Point(5, 5));
 }
 
 void River::mWhileDownRiver() {
@@ -1809,7 +1821,7 @@ void River::scrollRiver1() {
 	_vm->copyBF2Vid();
 }
 
-void River::river() {
+void River::doRiver() {
 	static const int RIVERDEATH[5] = { 22, 23, 24, 25, 26 };
 
 	initRiver();
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 2799e4f8dd..2962d77722 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -203,7 +203,7 @@ private:
 public:
 	River(AmazonEngine *vm);
 
-	void river();
+	void doRiver();
 	void mWhileDownRiver();
 
 	void synchronize(Common::Serializer &s);
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index c5b77950ad..76513db7fb 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -362,7 +362,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		plotInactive();
 		break;
 	case 13:
-		_game->_river.river();
+		_game->_river.doRiver();
 		break;
 	case 14:
 		_game->_ant.doAnt();
-- 
cgit v1.2.3


From 80dfc3537d8495bb1f096c1bd21ab4052ac0cb40 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 10 Dec 2014 08:12:37 +0100
Subject: ACCESS: Fix _help3 initialization

---
 engines/access/amazon/amazon_game.cpp | 8 ++++----
 engines/access/amazon/amazon_game.h   | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 77ee8fe620..20d71021c2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -47,14 +47,13 @@ AccessEngine(syst, gameDesc),
 	_rawInactiveX = 0;
 	_rawInactiveY = 0;
 	_inactiveYOff = 0;
-	_tilePos = Common::Point(0, 0);
 	_hintLevel = 0;
 
 	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 	memset(_tileData, 0, sizeof(_tileData));
 	Common::fill(&_help1[0], &_help1[366], 0);
 	Common::fill(&_help2[0], &_help2[366], 0);
-	Common::fill(&_help1[0], &_help3[366], 0);
+	Common::fill(&_help3[0], &_help3[366], 0);
 	_helpTbl[0] = _help1;
 	_helpTbl[1] = _help2;
 	_helpTbl[2] = _help3;
@@ -276,8 +275,9 @@ void AmazonEngine::tileScreen() {
 		_tileData[i] = res->_stream->readByte();
 
 	// CHECKME: Depending on the Vesa mode during initialization, 400 or 480
-	for (_tilePos.y = 0; _tilePos.y < 480; _tilePos.y += y) {
-		for (_tilePos.x = 0; _tilePos.x < 640; _tilePos.x += x)
+	Common::Point tilePos;
+	for (tilePos.y = 0; tilePos.y < 480; tilePos.y += y) {
+		for (tilePos.x = 0; tilePos.x < 640; tilePos.x += x)
 			warning("TODO: DRAWOBJECT");
 	}
 
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 30b9b80778..e475542772 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -34,7 +34,6 @@ class AmazonEngine;
 
 class AmazonEngine : public AccessEngine {
 private:
-	Common::Point _tilePos;
 	byte _tileData[1455];
 	Common::Array<CellIdent> _chapterCells;
 
-- 
cgit v1.2.3


From 538782e14e085fa4cc8e435439f0432b3b1f0b21 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 10 Dec 2014 08:25:35 +0100
Subject: ACCESS: Get rid of the use of 'this' in constructor

---
 engines/access/amazon/amazon_game.cpp    | 40 ++++++++++++++++++++++++++------
 engines/access/amazon/amazon_game.h      | 15 ++++++------
 engines/access/amazon/amazon_player.cpp  |  2 +-
 engines/access/amazon/amazon_scripts.cpp | 20 ++++++++--------
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 20d71021c2..cfcafbba6f 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -36,9 +36,15 @@ AccessEngine(syst, gameDesc),
 		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
 		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]),
 		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]),
-		_noSound(_flags[239]),
-		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this),
-		_plane(this), _river(this) {
+		_noSound(_flags[239]) {
+
+	_ant = nullptr;
+	_cast = nullptr;
+	_guard = nullptr;
+	_jungle = nullptr;
+	_opening = nullptr;
+	_plane = nullptr;
+	_river = nullptr;
 
 	_charSegSwitch = false;
 
@@ -67,6 +73,14 @@ AccessEngine(syst, gameDesc),
 
 AmazonEngine::~AmazonEngine() {
 	delete _inactive._altSpritesPtr;
+
+	delete _ant;
+	delete _cast;
+	delete _guard;
+	delete _jungle;
+	delete _opening;
+	delete _plane;
+	delete _river;
 }
 
 void AmazonEngine::freeInactivePlayer() {
@@ -79,18 +93,30 @@ void AmazonEngine::configSelect() {
 	_hintLevel = 3;
 }
 
-void AmazonEngine::playGame() {
-	// Initialize Amazon game-specific objects
+void AmazonEngine::initObjects() {
 	_room = new AmazonRoom(this);
 	_scripts = new AmazonScripts(this);
 
+	_ant = new Ant(this);
+	_cast = new Cast(this);
+	_guard = new Guard(this);
+	_jungle = new Jungle(this);
+	_opening = new Opening(this);
+	_plane = new Plane(this);
+	_river = new River(this);
+}
+
+void AmazonEngine::playGame() {
+	// Initialize Amazon game-specific objects
+	initObjects();
+
 	// Setup the game
 	setupGame();
 	configSelect();
 
 	if (_loadSaveSlot == -1) {
 		// Do introduction
-		_opening.doIntroduction();
+		_opening->doIntroduction();
 		if (shouldQuit())
 			return;
 	}
@@ -735,7 +761,7 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 		s.syncAsByte(_help3[i]);
 	}
 
-	_river.synchronize(s);
+	_river->synchronize(s);
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index e475542772..4ebea0f7eb 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -48,6 +48,7 @@ private:
 	void configSelect();
 
 	void initVariables();
+	void initObjects();
 	void calcIQ();
 	void helpTitle();
 	void drawHelpText(const Common::String &msg);
@@ -95,13 +96,13 @@ public:
 	int _esTabTable[100];
 
 	// Other game specific fields
-	Ant _ant;
-	Cast _cast;
-	Guard _guard;
-	Jungle _jungle;
-	Opening _opening;
-	Plane _plane;
-	River _river;
+	Ant *_ant;
+	Cast *_cast;
+	Guard *_guard;
+	Jungle *_jungle;
+	Opening *_opening;
+	Plane *_plane;
+	River *_river;
 	int _hintLevel;
 	int _updateChapter;
 	int _oldTitleChapter;
diff --git a/engines/access/amazon/amazon_player.cpp b/engines/access/amazon/amazon_player.cpp
index c9b63a9108..2780922935 100644
--- a/engines/access/amazon/amazon_player.cpp
+++ b/engines/access/amazon/amazon_player.cpp
@@ -77,7 +77,7 @@ void AmazonPlayer::load() {
 		_diagUpWalkMax = 5;
 		_diagDownWalkMin = 0;
 		_diagDownWalkMax = 5;
-		_game->_guard.setPosition(Common::Point(56, 190));
+		_game->_guard->setPosition(Common::Point(56, 190));
 	}
 }
 
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 76513db7fb..52c142a415 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -211,25 +211,25 @@ void AmazonScripts::mWhile(int param1) {
 		mWhile1();
 		break;
 	case 2:
-		_game->_plane.mWhileFly();
+		_game->_plane->mWhileFly();
 		break;
 	case 3:
-		_game->_plane.mWhileFall();
+		_game->_plane->mWhileFall();
 		break;
 	case 4:
-		_game->_jungle.mWhileJWalk();
+		_game->_jungle->mWhileJWalk();
 		break;
 	case 5:
-		_game->_jungle.mWhileDoOpen();
+		_game->_jungle->mWhileDoOpen();
 		break;
 	case 6:
-		_game->_river.mWhileDownRiver();
+		_game->_river->mWhileDownRiver();
 		break;
 	case 7:
 		mWhile2();
 		break;
 	case 8:
-		_game->_jungle.mWhileJWalk2();
+		_game->_jungle->mWhileJWalk2();
 		break;
 	default:
 		break;
@@ -332,7 +332,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		if (_vm->isDemo())
 			warning("TODO: DEMO - LOADCELLSET");
 		else
-			_game->_cast.doCast(param1);
+			_game->_cast->doCast(param1);
 		break;
 	case 4:
 		if (_vm->isDemo())
@@ -353,7 +353,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		warning("TODO: DEMO - CHKMONEY");
 		break;
 	case 9:
-		_game->_guard.doGuard();
+		_game->_guard->doGuard();
 		break;
 	case 10:
 		_vm->_midi->newMusic(param1, param2);
@@ -362,10 +362,10 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		plotInactive();
 		break;
 	case 13:
-		_game->_river.doRiver();
+		_game->_river->doRiver();
 		break;
 	case 14:
-		_game->_ant.doAnt();
+		_game->_ant->doAnt();
 		break;
 	case 15:
 		boatWalls(param1, param2);
-- 
cgit v1.2.3


From 8517209bcbef56a1fa68a6e17b04d56c13fa77b2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 10 Dec 2014 23:25:18 +0100
Subject: ACCESS: Implement restart after death

---
 engines/access/access.cpp             |  4 +++
 engines/access/access.h               |  2 ++
 engines/access/amazon/amazon_game.cpp | 67 ++++++++++++++++++++++-------------
 engines/access/room.cpp               |  8 ++---
 engines/access/scripts.cpp            |  2 +-
 5 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index b63bb29e0a..4201564e84 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -89,6 +89,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_loadSaveSlot = -1;
 	_vidX = _vidY = 0;
 	_cheatFl = false;
+	_restartFl = false;
 }
 
 AccessEngine::~AccessEngine() {
@@ -570,4 +571,7 @@ void AccessEngine::writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameH
 	out->writeUint32LE(_events->getFrameCounter());
 }
 
+bool AccessEngine::shouldQuitOrRestart() {
+	return shouldQuit() || _restartFl;
+}
 } // End of namespace Access
diff --git a/engines/access/access.h b/engines/access/access.h
index 284ac2690c..5470d2a208 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -209,6 +209,7 @@ public:
 
 	bool _clearSummaryFlag;
 	bool _cheatFl;
+	bool _restartFl;
 	// Fields mapped into the flags array
 	int &_useItem;
 	int &_startup;
@@ -228,6 +229,7 @@ public:
 	uint16 getVersion() const;
 	uint32 getGameID() const;
 	uint32 getGameFeatures() const;
+	bool shouldQuitOrRestart();
 
 	int getRandomNumber(int maxNumber);
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index cfcafbba6f..29466f1dee 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -121,40 +121,36 @@ void AmazonEngine::playGame() {
 			return;
 	}
 
-	_screen->clearScreen();
-	_screen->setPanel(0);
-	_screen->forceFadeOut();
-	_events->showCursor();
-
-	initVariables();
-
-	// If there's a pending savegame to load, load it
-	if (_loadSaveSlot != -1)
-		loadGameState(_loadSaveSlot);
+	do {
+		_restartFl = false;
+		_screen->clearScreen();
+		_screen->setPanel(0);
+		_screen->forceFadeOut();
+		_events->showCursor();
+
+		initVariables();
+
+		// If there's a pending savegame to load, load it
+		if (_loadSaveSlot != -1) {
+			loadGameState(_loadSaveSlot);
+			_loadSaveSlot = -1;
+		}
 
-	// Execute the room
-	_room->doRoom();
+		// Execute the room
+		_room->doRoom();
+	} while (_restartFl);
 }
 
 void AmazonEngine::setupGame() {
-	// Setup timers
-	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
-	for (int i = 0; i < 32; ++i) {
-		TimerEntry te;
-		te._initTm = te._timer = (i < 8) ? TIMER_DEFAULTS[i] : 1;
-		te._flag = 1;
-
-		_timers.push_back(te);
-	}
-
 	// Load death list
-	_deaths.resize(58);
 	if (isDemo()) {
+		_deaths.resize(34);
 		for (int i = 0; i < 34; ++i) {
 			_deaths[i]._screenId = DEATH_SCREENS_DEMO[i];
 			_deaths[i]._msg = DEATH_TEXT_DEMO[i];
 		}
 	} else {
+		_deaths.resize(58);
 		for (int i = 0; i < 58; ++i) {
 			_deaths[i]._screenId = DEATH_SCREENS[i];
 			_deaths[i]._msg = DEATH_TEXT[i];
@@ -178,8 +174,29 @@ void AmazonEngine::initVariables() {
 		_player->_roomNumber = 33;
 	else
 		_player->_roomNumber = 4;
+
+	_converseMode = 0;
+	_inventory->_startInvItem = 0;
+	_inventory->_startInvBox = 0;
+	Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
+	_player->_playerOff = false;
+
+	// Setup timers
+	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
+	for (int i = 0; i < 32; ++i) {
+		TimerEntry te;
+		te._initTm = te._timer = (i < 8) ? TIMER_DEFAULTS[i] : 1;
+		te._flag = 1;
+
+		_timers.push_back(te);
+	}
+
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
+	_room->_selectCommand = -1;
+	_events->_normalMouse = CURSOR_CROSSHAIRS;
+	_mouseMode = 0;
+	_numAnimTimers = 0;
 }
 
 void AmazonEngine::establish(int screenId, int esatabIndex) {
@@ -739,8 +756,8 @@ void AmazonEngine::dead(int deathId) {
 			_player->removeSprite1();
 		}
 
-		warning("TODO: restart game");
-		quitGame();
+		// The original was jumping to the restart label in main
+		_restartFl = true;
 		_events->pollEvents();
 	}
 }
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a781dab24a..57332f742d 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -90,7 +90,7 @@ void Room::doRoom() {
 			_vm->_player->checkScroll();
 
 			doCommands();
-			if (_vm->shouldQuit())
+			if (_vm->shouldQuitOrRestart())
 				return;
 
 			// DOROOMFLASHBACK jump point
@@ -128,7 +128,7 @@ void Room::doRoom() {
 				_function = FN_NONE;
 
 				roomLoop();
-				if (_vm->shouldQuit())
+				if (_vm->shouldQuitOrRestart())
 					return;
 
 				if (_function == FN_CLEAR1) {
@@ -578,7 +578,7 @@ void Room::walkCursor() {
 	_selectCommand = -1;
 
 	_conFlag = true;
-	while (_conFlag && !_vm->shouldQuit()) {
+	while (_conFlag && !_vm->shouldQuitOrRestart()) {
 		_conFlag = false;
 		_vm->_scripts->executeScript();
 	}
@@ -622,7 +622,7 @@ void Room::checkBoxes3() {
 				_vm->_boxSelect = start;
 
 				_conFlag = true;
-				while (_conFlag && !_vm->shouldQuit()) {
+				while (_conFlag && !_vm->shouldQuitOrRestart()) {
 					_conFlag = false;
 					_vm->_scripts->executeScript();
 				}
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 728421c6d9..6c9f278736 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -100,7 +100,7 @@ int Scripts::executeScript() {
 
 		assert(_scriptCommand >= 0x80);
 		executeCommand(_scriptCommand - 0x80);
-	} while (!_endFlag && !_vm->shouldQuit());
+	} while (!_endFlag && !_vm->shouldQuitOrRestart());
 
 	return _returnCode;
 }
-- 
cgit v1.2.3


From b1d5359fc6033c25c3360d30de0fe98ce4fce29e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Dec 2014 21:12:04 -0500
Subject: ACCESS: Minor formatting for debugger error messages

---
 engines/access/debugger.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 1f8100452b..5eb615f4dc 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -96,11 +96,11 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 	case 2: {
 		int newRoom = strToInt(argv[1]);
 		if (newRoom < 0 || newRoom >= _sceneNumb) {
-			debugPrintf("Invalid Room Number");
+			debugPrintf("Invalid Room Number\n");
 			return true;
 		}
 		if (!_sceneDescr[newRoom].size()) {
-			debugPrintf("Unused Room Number");
+			debugPrintf("Unused Room Number\n");
 			return true;
 		}
 			
-- 
cgit v1.2.3


From 781c6ff8c44efd4e9411114d2628d547fab8ce33 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Dec 2014 21:12:39 -0500
Subject: ACCESS: Initial enum cleanup for Ant fields

---
 engines/access/amazon/amazon_logic.cpp | 30 +++++++++++++++---------------
 engines/access/amazon/amazon_logic.h   |  6 ++++--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index eb889d2000..49bc47fc64 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1926,8 +1926,8 @@ void River::synchronize(Common::Serializer &s) {
 /*------------------------------------------------------------------------*/
 
 Ant::Ant(AmazonEngine *vm) : AmazonManager(vm) {
-	_antDirection = NONE;
-	_pitDirection = NONE;
+	_antDirection = RIGHT;
+	_pitDirection = RIGHT;
 	_antCel = 0;
 	_torchCel = 0;
 	_pitCel = 0;
@@ -1962,6 +1962,7 @@ void Ant::plotPit(int indx, const int *&buf) {
 
 	_vm->_player->_rawPlayer = _pitPos;
 	if (_vm->_inventory->_inv[76]._value == 1) {
+		// Player has torch
 		idx = _torchCel;
 		buf = Amazon::TORCH;
 		_vm->_timers[14]._flag = 1;
@@ -1970,8 +1971,8 @@ void Ant::plotPit(int indx, const int *&buf) {
 			idx = 0;
 		_torchCel = idx;
 		plotTorchSpear(idx, buf);
-	}
-	else if (!_stabFl && (_vm->_inventory->_inv[78]._value == 1)) {
+	} else if (!_stabFl && (_vm->_inventory->_inv[78]._value == 1)) {
+		// Player has spear
 		idx = 0;
 		buf = Amazon::SPEAR;
 		plotTorchSpear(idx, buf);
@@ -1980,8 +1981,8 @@ void Ant::plotPit(int indx, const int *&buf) {
 
 int Ant::antHandleRight(int indx, const int *&buf) {
 	int retval = indx;
-	if (_pitDirection == NONE) {
-		_pitDirection = UP;
+	if (_pitDirection == RIGHT) {
+		_pitDirection = LEFT;
 		_pitPos.y = 127;
 	}
 	retval = _pitCel;
@@ -2001,8 +2002,8 @@ int Ant::antHandleRight(int indx, const int *&buf) {
 
 int Ant::antHandleLeft(int indx, const int *&buf) {
 	int retval = indx;
-	if (_pitDirection == UP) {
-		_pitDirection = NONE;
+	if (_pitDirection == LEFT) {
+		_pitDirection = RIGHT;
 		_pitPos.y = 127;
 	}
 	retval = _pitCel;
@@ -2058,7 +2059,7 @@ int Ant::antHandleStab(int indx, const int *&buf) {
 }
 
 void Ant::doAnt() {
-	_antDirection = NONE;
+	_antDirection = RIGHT;
 	if (_vm->_aniFlag != 1) {
 		_vm->_aniFlag = 1;
 		_antCel = 0;
@@ -2086,11 +2087,9 @@ void Ant::doAnt() {
 	const int *buf = nullptr;
 	if (_antDieFl) {
 		buf = Amazon::ANTDIE;
-	}
-	else if (_antEatFl) {
+	} else if (_antEatFl) {
 		buf = Amazon::ANTEAT;
-	}
-	else if (_antPos.x > 120 && _vm->_flags[198] == 1) {
+	} else if (_antPos.x > 120 && _vm->_flags[198] == 1) {
 		_antEatFl = true;
 		_vm->_flags[235] = 1;
 		_antCel = 0;
@@ -2098,13 +2097,14 @@ void Ant::doAnt() {
 	} else {
 		buf = Amazon::ANTWALK;
 		if (_vm->_inventory->_inv[76]._value == 1)
-			_antDirection = UP;
+			// Player has burning torch, which scares the Ant
+			_antDirection = LEFT;
 	}
 
 	int idx = _antCel;
 	if (_vm->_timers[15]._flag == 0) {
 		_vm->_timers[15]._flag = 1;
-		if (_antDirection == UP) {
+		if (_antDirection == LEFT) {
 			if (_antPos.x > 10) {
 				if (idx == 0)
 					idx = 36;
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 2962d77722..d66a8d818e 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -209,10 +209,12 @@ public:
 	void synchronize(Common::Serializer &s);
 };
 
+enum AntDirection { RIGHT = 0, LEFT = 1 };
+
 class Ant: public AmazonManager {
 private:
-	Direction _antDirection;
-	Direction _pitDirection;
+	AntDirection _antDirection;
+	AntDirection _pitDirection;
 	int _antCel;
 	int _torchCel;
 	int _pitCel;
-- 
cgit v1.2.3


From 547f3debb2b44dfb8fb3d659ac09f3bd24a017c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Dec 2014 21:27:06 -0500
Subject: ACCESS: Separate timer updates from frame updates, and overall delay
 cleanup

---
 engines/access/access.cpp              |  4 +---
 engines/access/amazon/amazon_game.cpp  |  6 ++----
 engines/access/amazon/amazon_logic.cpp |  3 ---
 engines/access/events.cpp              | 34 ++++++++++++++++++++++++----------
 engines/access/events.h                | 11 +++++++----
 engines/access/inventory.cpp           |  9 +++------
 engines/access/room.cpp                |  3 +--
 engines/access/screen.cpp              |  4 ++--
 engines/access/scripts.cpp             |  9 +++------
 9 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 4201564e84..bb5414da31 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -410,9 +410,7 @@ void AccessEngine::playVideo(int videoNum, const Common::Point &pt) {
 
 	while (!shouldQuit() && !_video->_videoEnd) {
 		_video->playVideo();
-
-		g_system->delayMillis(10);
-		_events->pollEvents();
+		_events->pollEventsAndWait();
 	}
 }
 
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 29466f1dee..63291bde52 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -535,8 +535,7 @@ void AmazonEngine::startChapter(int chapter) {
 
 		// Wait loop
 		while (!shouldQuit() && !_events->isKeyMousePressed() && _timers[20]._flag) {
-			_events->pollEvents();
-			g_system->delayMillis(10);
+			_events->pollEventsAndWait();
 		}
 	}
 
@@ -576,8 +575,7 @@ void AmazonEngine::startChapter(int chapter) {
 
 	// Wait loop
 	while (!shouldQuit() && !_events->isKeyMousePressed() && _timers[20]._flag) {
-		_events->pollEvents();
-		g_system->delayMillis(10);
+		_events->pollEventsAndWait();
 	}
 	if (shouldQuit())
 		return;
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 49bc47fc64..320d87476a 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -687,10 +687,7 @@ void Plane::mWhileFly() {
 		++_pCount;
 
 		while (!_vm->shouldQuit() && events._vbCount > 0) {
-			// To be rewritten when NEWTIMER is done
-			events.checkForNextFrameCounter();
 			_vm->_sound->playSound(0);
-
 			events.pollEventsAndWait();
 		}
 	}
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 5ed5ee2052..249ba15010 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -47,6 +47,7 @@ EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
 	_cursorExitFlag = false;
 	_vbCount = 0;
 	_keyCode = Common::KEYCODE_INVALID;
+	_priorTimerTime = 0;
 }
 
 EventsManager::~EventsManager() {
@@ -124,9 +125,12 @@ bool EventsManager::isCursorVisible() {
 
 void EventsManager::pollEvents(bool skipTimers) {
 	if (checkForNextFrameCounter()) {
-		nextFrame(skipTimers);
+		nextFrame();
 	}
 
+	if (checkForNextTimerUpdate() && !skipTimers)
+		nextTimer();
+
 	_wheelUp = _wheelDown = false;
 
 	Common::Event event;
@@ -233,7 +237,7 @@ void EventsManager::keyControl(Common::KeyCode keycode, bool isKeyDown) {
 
 void EventsManager::pollEventsAndWait() {
 	pollEvents();
-	g_system->delayMillis(10);
+	delay();
 }
 
 bool EventsManager::checkForNextFrameCounter() {
@@ -250,13 +254,19 @@ bool EventsManager::checkForNextFrameCounter() {
 	return false;
 }
 
-void EventsManager::nextFrame(bool skipTimers) {
-	if (!skipTimers) {
-		// Update timers
-		_vm->_animation->updateTimers();
-		_vm->_timers.updateTimers();
+bool EventsManager::checkForNextTimerUpdate() {
+	// Check for next timer update
+	uint32 milli = g_system->getMillis();
+	if ((milli - _priorTimerTime) >= GAME_TIMER_TIME) {
+		_priorTimerTime = milli;
+
+		return true;
 	}
 
+	return false;
+}
+
+void EventsManager::nextFrame() {
 	// Give time to the debugger
 	_vm->_debugger->onFrame();
 
@@ -264,6 +274,11 @@ void EventsManager::nextFrame(bool skipTimers) {
 	_vm->_screen->updateScreen();
 }
 
+void EventsManager::nextTimer() {
+	_vm->_animation->updateTimers();
+	_vm->_timers.updateTimers();
+}
+
 void EventsManager::delay(int time) {
 	g_system->delayMillis(time);
 }
@@ -288,8 +303,7 @@ bool EventsManager::isKeyPending() const {
 
 void EventsManager::debounceLeft() {
 	while (_leftButton && !_vm->shouldQuit()) {
-		pollEvents();
-		g_system->delayMillis(10);
+		pollEventsAndWait();
 	}
 }
 
@@ -301,7 +315,7 @@ void EventsManager::clearEvents() {
 void EventsManager::waitKeyMouse() {
 	while (!_vm->shouldQuit() && !isKeyMousePressed()) {
 		pollEvents(true);
-		g_system->delayMillis(10);
+		delay();
 	}
 }
 
diff --git a/engines/access/events.h b/engines/access/events.h
index 04edd2bdf3..c43bf472f0 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -38,6 +38,7 @@ enum CursorType {
 
 #define GAME_FRAME_RATE 100
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
+#define GAME_TIMER_TIME 15
 
 class AccessEngine;
 
@@ -46,10 +47,14 @@ private:
 	AccessEngine *_vm;
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
+	uint32 _priorTimerTime;
 	Common::KeyCode _keyCode;
 
 	Graphics::Surface _invCursor;
-	void nextFrame(bool skipTimers);
+	bool checkForNextFrameCounter();
+	bool checkForNextTimerUpdate();
+	void nextFrame();
+	void nextTimer();
 	void keyControl(Common::KeyCode keycode, bool isKeyDown);
 public:
 	CursorType _cursorId;
@@ -117,7 +122,7 @@ public:
 
 	bool isKeyPending() const;
 
-	void delay(int time);
+	void delay(int time = 5);
 
 	void debounceLeft();
 
@@ -125,8 +130,6 @@ public:
 
 	void waitKeyMouse();
 
-	bool checkForNextFrameCounter();
-
 	Common::Point &getMousePos() { return _mousePos; }
 
 	Common::Point calcRawMouse();
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 4038929a67..acba60433f 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -321,8 +321,7 @@ void InventoryManager::chooseItem() {
 
 	while (!_vm->shouldQuit()) {
 		// Check for events
-		events.pollEvents();
-		g_system->delayMillis(10);
+		events.pollEventsAndWait();
 
 		int selIndex;
 		// Poll events and wait for a click on a known area
@@ -414,8 +413,7 @@ void InventoryManager::combineItems() {
 	// Item drag handling loop if left button is held down
 	while (!_vm->shouldQuit() && events._leftButton) {
 		// Poll for events
-		events.pollEvents();
-		g_system->delayMillis(10);
+		events.pollEventsAndWait();
 
 		// Check positioning
 		if (lastMouse == events._mousePos)
@@ -485,8 +483,7 @@ void InventoryManager::zoomIcon(int zoomItem, int backItem, int zoomBox, bool sh
 		_invCoords[zoomBox].left + 46, _invCoords[zoomBox].top + 35);
 
 	while (!_vm->shouldQuit() && zoomScale != 0 && zoomScale != 256) {
-		_vm->_events->pollEvents();
-		g_system->delayMillis(5);
+		_vm->_events->pollEventsAndWait();
 
 		_vm->_buffer2.copyBlock(&_vm->_buffer1, boxRect);
 		if (backItem != -1) {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 57332f742d..e18bd4a329 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -81,9 +81,8 @@ void Room::doRoom() {
 
 			// Poll for events
 			_vm->_canSaveLoad = true;
-			_vm->_events->pollEvents();
+			_vm->_events->pollEventsAndWait();
 			_vm->_canSaveLoad = false;
-			g_system->delayMillis(5);
 
 			_vm->_player->walk();
 			_vm->_midi->midiRepeat();
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index f98552470c..318eb66516 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -158,7 +158,7 @@ void Screen::forceFadeOut() {
 		}
 
 		updatePalette();
-		g_system->delayMillis(10);
+		_vm->_events->pollEventsAndWait();
 	} while (repeatFlag && !_vm->shouldQuit());
 }
 
@@ -180,7 +180,7 @@ void Screen::forceFadeIn() {
 		}
 
 		updatePalette();
-		g_system->delayMillis(10);
+		_vm->_events->pollEventsAndWait();
 	} while (repeatFlag);
 }
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 6c9f278736..d8f9a51e8f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -521,12 +521,11 @@ void Scripts::cmdSaveRect() {
 }
 
 void Scripts::cmdVideoEnded() {
-	_vm->_events->pollEvents();
+	_vm->_events->pollEventsAndWait();
 
 	if (_vm->_video->_videoEnd) {
 		cmdGoto();
 	} else {
-		g_system->delayMillis(10);
 		_data->skip(2);
 	}
 }
@@ -731,8 +730,7 @@ void Scripts::cmdWait() {
 		_vm->_midi->midiRepeat();
 		charLoop();
 
-		_vm->_events->pollEvents();
-		g_system->delayMillis(10);
+		_vm->_events->pollEventsAndWait();
 	}
 
 	_vm->_events->debounceLeft();
@@ -819,8 +817,7 @@ void Scripts::cmdPlayVideoSound() {
 		_vm->_video->_soundFlag = true;
 	}
 
-	_vm->_events->pollEvents();
-	g_system->delayMillis(10);
+	_vm->_events->pollEventsAndWait();
 }
 
 void Scripts::cmdPrintWatch() {
-- 
cgit v1.2.3


From c2e5dd8487834b875333652d6b482bd61a50354d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Dec 2014 21:40:36 -0500
Subject: ACCESS: Fix positioning of Ant in pit scene

---
 engines/access/amazon/amazon_logic.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 320d87476a..517351f7c3 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -2108,17 +2108,17 @@ void Ant::doAnt() {
 				else
 					idx -= 6;
 
-				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_antPos -= Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
 				_antCel = idx;
 			}
 		} else {
 			idx += 6;
 			if (buf[(idx / 2)] != -1) {
-				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_antPos += Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
 				_antCel = idx;
 			} else if (!_antDieFl) {
 				idx = 0;
-				_antPos = Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
+				_antPos += Common::Point(buf[(idx / 2) + 1], buf[(idx / 2) + 2]);
 				_antCel = idx;
 			} else {
 				idx -= 6;
-- 
cgit v1.2.3


From 41d0908606469ebbac5d8b3a6442e70a5e778b7f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 10 Dec 2014 21:48:53 -0500
Subject: ACCESS: Fix death cell list data

---
 engines/access/amazon/amazon_game.cpp      | 4 ++--
 engines/access/amazon/amazon_resources.cpp | 3 ++-
 engines/access/amazon/amazon_resources.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 63291bde52..802cb3887d 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -156,8 +156,8 @@ void AmazonEngine::setupGame() {
 			_deaths[i]._msg = DEATH_TEXT[i];
 		}
 	}
-	_deaths._cells.resize(12);
-	for (int i = 0; i < 12; ++i)
+	_deaths._cells.resize(13);
+	for (int i = 0; i < 13; ++i)
 		_deaths._cells[i] = CellIdent(DEATH_CELLS[i][0], DEATH_CELLS[i][1], DEATH_CELLS[i][2]);
 
 	// Miscellaneous
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index cb84841002..694454cc3e 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1800,7 +1800,8 @@ const char *const DEATH_TEXT_DEMO[34] = {
 	"WITH THE BAR OFF THE DOOR THE CAPTAIN WALTZES IN AND BLOWS YOU AWAY"
 };
 
-const int DEATH_CELLS[12][3] = {
+const int DEATH_CELLS[13][3] = {
+	{ 0, 94, 2 },
 	{ 0, 94, 3 },
 	{ 0, 94, 4 },
 	{ 0, 94, 5 },
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 92e0cecf68..36ae2af092 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -89,7 +89,7 @@ extern const byte DEATH_SCREENS_DEMO[34];
 extern const char *const DEATH_TEXT[58];
 extern const char *const DEATH_TEXT_DEMO[34];
 
-extern const int DEATH_CELLS[12][3];
+extern const int DEATH_CELLS[13][3];
 
 extern const int CHAPTER_CELLS[17][3];
 
-- 
cgit v1.2.3


From a6cc9250d329ab0d56c49dd24018ac1c84a723dc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 11 Dec 2014 07:58:05 +0100
Subject: ACCESS: Remove a useless variable, some renaming

---
 engines/access/amazon/amazon_game.cpp  | 13 +++++++------
 engines/access/amazon/amazon_game.h    |  1 -
 engines/access/amazon/amazon_logic.cpp | 12 ++++++------
 engines/access/amazon/amazon_logic.h   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 802cb3887d..ff16bbfa94 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -55,7 +55,6 @@ AccessEngine(syst, gameDesc),
 	_inactiveYOff = 0;
 	_hintLevel = 0;
 
-	Common::fill(&_esTabTable[0], &_esTabTable[100], 0);
 	memset(_tileData, 0, sizeof(_tileData));
 	Common::fill(&_help1[0], &_help1[366], 0);
 	Common::fill(&_help2[0], &_help2[366], 0);
@@ -415,11 +414,11 @@ void AmazonEngine::helpTitle() {
 
 	Common::String iqText = "IQ: ";
 	calcIQ();
-	Common::String IQSCORE = Common::String::format("%d", _iqValue);
-	while (IQSCORE.size() != 4)
-		IQSCORE = " " + IQSCORE;
+	Common::String scoreIQ = Common::String::format("%d", _iqValue);
+	while (scoreIQ.size() < 4)
+		scoreIQ = " " + scoreIQ;
 
-	iqText += IQSCORE;
+	iqText += scoreIQ;
 	int index = _iqValue;
 	if (index == 170)
 		index = 169;
@@ -768,8 +767,10 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_rawInactiveY);
 	s.syncAsSint16LE(_inactiveYOff);
 
+	int dummy = 0;
 	for (int i = 0; i < 100; ++i)
-		s.syncAsSint16LE(_esTabTable[i]);
+		s.syncAsSint16LE(dummy);
+
 	for (int i = 0; i < 366; ++i) {
 		s.syncAsByte(_help1[i]);
 		s.syncAsByte(_help2[i]);
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 4ebea0f7eb..5d87cc434e 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -93,7 +93,6 @@ public:
 	int _rawInactiveX;
 	int _rawInactiveY;
 	int _inactiveYOff;
-	int _esTabTable[100];
 
 	// Other game specific fields
 	Ant *_ant;
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 517351f7c3..2aed0bcafb 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1349,7 +1349,7 @@ void Cast::doCast(int param1) {
 /*------------------------------------------------------------------------*/
 
 River::River(AmazonEngine *vm): PannedScene(vm) {
-	_CHICKENOUTFLG = false;
+	_chickenOutFl = false;
 	_rScrollRow = 0;
 	_rScrollCol = 0;
 	_rScrollX = 0;
@@ -1592,7 +1592,7 @@ void River::moveCanoe() {
 			}
 		} else if (events._leftButton && mousePos.x < 35 && mousePos.y < 12) {
 			// Clicked on the Skip button. So chicken out
-			_CHICKENOUTFLG = true;
+			_chickenOutFl = true;
 		}  else if ((events._leftButton && pt.y <= _canoeYPos) ||
 			(!events._leftButton && _vm->_player->_move == UP)) {
 			// Move canoe up
@@ -1833,15 +1833,15 @@ void River::doRiver() {
 		if (_vm->_screen->_scrollX == 0) {
 			_vm->_midi->midiRepeat();
 			if (riverJumpTest()) {
-				_CHICKENOUTFLG = false;
+				_chickenOutFl = false;
 				return;
 			}
 		} else {
 			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
 		}
 
-		if (_CHICKENOUTFLG) {
-			_CHICKENOUTFLG = false;
+		if (_chickenOutFl) {
+			_chickenOutFl = false;
 			return;
 		}
 
@@ -1886,7 +1886,7 @@ void River::doRiver() {
 		if (_vm->_room->_function == FN_CLEAR1) {
 			_vm->_scripts->_endFlag = true;
 			_vm->_scripts->_returnCode = 0;
-			_CHICKENOUTFLG = false;
+			_chickenOutFl = false;
 			break;
 		}
 	}
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index d66a8d818e..8fb6df9354 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -158,7 +158,7 @@ public:
 
 class River: public PannedScene {
 private:
-	bool _CHICKENOUTFLG;
+	bool _chickenOutFl;
 	const byte *_mapPtr;
 	int _canoeVXPos;
 	int _canoeMoveCount;
-- 
cgit v1.2.3


From c82fb8c9571073b95da0f45a6b8beb3000fbfbc0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 11 Dec 2014 08:11:28 +0100
Subject: ACCESS: Reduce screen pointer usage in amazon logic

---
 engines/access/amazon/amazon_logic.cpp | 235 ++++++++++++++++++---------------
 1 file changed, 126 insertions(+), 109 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 2aed0bcafb..c8bf054d3b 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -204,21 +204,23 @@ Opening::Opening(AmazonEngine *vm) : CampScene(vm) {
 }
 
 void Opening::doIntroduction() {
-	_vm->_screen->setInitialPalettte();
+	Screen &screen = *_vm->_screen;
+
+	screen.setInitialPalettte();
 	_vm->_events->setCursor(CURSOR_ARROW);
 	_vm->_events->showCursor();
-	_vm->_screen->setPanel(0);
-	_vm->_screen->setPalette();
+	screen.setPanel(0);
+	screen.setPalette();
 
 	_vm->_events->setCursor(CURSOR_ARROW);
 	_vm->_events->showCursor();
-	_vm->_screen->setPanel(3);
+	screen.setPanel(3);
 	doTitle();
 
 	if (_vm->shouldQuit() || _skipStart || _vm->isDemo())
 		return;
 
-	_vm->_screen->setPanel(3);
+	screen.setPanel(3);
 	mWhileDoOpen();
 
 	if (_vm->shouldQuit() || _skipStart)
@@ -306,9 +308,11 @@ void Opening::scrollTitle() {
 }
 
 void Opening::doTitle() {
-	_vm->_screen->setDisplayScan();
+	Screen &screen = *_vm->_screen;
 
-	_vm->_screen->forceFadeOut();
+	screen.setDisplayScan();
+
+	screen.forceFadeOut();
 	_vm->_events->hideCursor();
 
 	if (!_vm->isDemo()) {
@@ -320,7 +324,7 @@ void Opening::doTitle() {
 
 		_vm->_buffer2.copyFrom(*_vm->_screen);
 		_vm->_buffer1.copyFrom(*_vm->_screen);
-		_vm->_screen->forceFadeIn();
+		screen.forceFadeIn();
 		_vm->_sound->playSound(1);
 
 		// WORKAROUND: This delay has been added to replace original game delay that
@@ -352,7 +356,7 @@ void Opening::doTitle() {
 			int id = COUNTDOWN[_pCount * 2];
 			int xp = COUNTDOWN[_pCount * 2 + 1];
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
-			_vm->_screen->copyFrom(_vm->_buffer2);
+			screen.copyFrom(_vm->_buffer2);
 
 			_vm->_sound->playSound(1);
 			_vm->_events->_vbCount = 70;
@@ -367,7 +371,7 @@ void Opening::doTitle() {
 
 		_vm->_sound->stopSound();
 		_vm->_sound->playSound(0);
-		_vm->_screen->forceFadeOut();
+		screen.forceFadeOut();
 		_vm->_events->_vbCount = 100;
 		while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0)
 			_vm->_events->pollEventsAndWait();
@@ -382,7 +386,7 @@ void Opening::doTitle() {
 		_vm->_files->loadScreen(0, 5);
 		_vm->_buffer2.copyFrom(*_vm->_screen);
 		_vm->_buffer1.copyFrom(*_vm->_screen);
-		_vm->_screen->forceFadeIn();
+		screen.forceFadeIn();
 		_vm->_midi->newMusic(1, 0);
 		_vm->_events->_vbCount = 700;
 		while (!_vm->shouldQuit() && (_vm->_events->_vbCount > 0) && !_vm->_events->isKeyMousePressed()) {
@@ -401,16 +405,16 @@ void Opening::doTitle() {
 		_vm->_events->zeroKeys();
 	}
 	_vm->_room->loadRoom(0);
-	_vm->_screen->clearScreen();
-	_vm->_screen->setBufferScan();
-	_vm->_screen->_scrollRow = _vm->_screen->_scrollCol = 0;
-	_vm->_screen->_scrollX = _vm->_screen->_scrollY = 0;
+	screen.clearScreen();
+	screen.setBufferScan();
+	screen._scrollRow = screen._scrollCol = 0;
+	screen._scrollX = screen._scrollY = 0;
 	_vm->_player->_rawPlayer = Common::Point(0, 0);
-	_vm->_screen->forceFadeOut();
-	_vm->_screen->_scrollX = 0;
+	screen.forceFadeOut();
+	screen._scrollX = 0;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-	_vm->_screen->forceFadeIn();
+	screen.forceFadeIn();
 	_vm->_oldRects.clear();
 	_vm->_newRects.clear();
 	_vm->_events->clearEvents();
@@ -427,15 +431,15 @@ void Opening::doTitle() {
 		}
 
 		_vm->_events->_vbCount = 4;
-		if (_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth) {
-			_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		if (screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth) {
+			screen._scrollX += _vm->_player->_scrollAmount;
 
-			while (_vm->_screen->_scrollX >= TILE_WIDTH) {
-				_vm->_screen->_scrollX -= TILE_WIDTH;
-				++_vm->_screen->_scrollCol;
+			while (screen._scrollX >= TILE_WIDTH) {
+				screen._scrollX -= TILE_WIDTH;
+				++screen._scrollCol;
 
 				_vm->_buffer1.moveBufferLeft();
-				_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+				_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 			}
 			scrollTitle();
 			++_pCount;
@@ -453,23 +457,23 @@ void Opening::doTitle() {
 		while (!_vm->shouldQuit()) {
 			_pCount = 0;
 			_vm->_events->_vbCount = 3;
-			if (_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight >= _vm->_room->_playFieldHeight) {
+			if (screen._scrollRow + screen._vWindowHeight >= _vm->_room->_playFieldHeight) {
 				_vm->_room->clearRoom();
 				_vm->_events->showCursor();
 				return;
 			}
 
-			_vm->_screen->_scrollY = _vm->_screen->_scrollY + _vm->_player->_scrollAmount;
+			screen._scrollY = screen._scrollY + _vm->_player->_scrollAmount;
 
-			while (_vm->_screen->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
-				_vm->_screen->_scrollY -= TILE_HEIGHT;
-				++_vm->_screen->_scrollRow;
+			while (screen._scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
+				screen._scrollY -= TILE_HEIGHT;
+				++screen._scrollRow;
 				_vm->_buffer1.moveBufferUp();
 
-				// WORKAROUND: the original was using _vm->_screen->_vWindowBytesWide * _vm->_screen->_vWindowLinesTall
-				_vm->_room->buildRow(_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight, _vm->_screen->_vWindowLinesTall);
+				// WORKAROUND: the original was using screen._vWindowBytesWide * screen._vWindowLinesTall
+				_vm->_room->buildRow(screen._scrollRow + screen._vWindowHeight, screen._vWindowLinesTall);
 
-				if (_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight >= _vm->_room->_playFieldHeight) {
+				if (screen._scrollRow + screen._vWindowHeight >= _vm->_room->_playFieldHeight) {
 					_vm->_room->clearRoom();
 					_vm->_events->showCursor();
 					return;
@@ -793,17 +797,19 @@ void Jungle::initJWalk2() {
 		{ 0, 580, 0, 60 },
 		{ 1, 650, 0, 30 }
 	};
-	_vm->_screen->fadeOut();
+
+	Screen &screen = *_vm->_screen;
+	screen.fadeOut();
 	_vm->_events->hideCursor();
-	_vm->_screen->clearScreen();
+	screen.clearScreen();
 	_vm->_buffer2.clearBuffer();
-	_vm->_screen->setBufferScan();
+	screen.setBufferScan();
 
-	_vm->_screen->_scrollX = _vm->_screen->_scrollY;
-	_vm->_screen->_scrollCol = _vm->_screen->_scrollRow;
+	screen._scrollX = screen._scrollY;
+	screen._scrollCol = screen._scrollRow;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-	_vm->_screen->fadeIn();
+	screen.fadeIn();
 	_vm->_events->clearEvents();
 
 	_xCount = 2;
@@ -967,67 +973,71 @@ Guard::Guard(AmazonEngine *vm): PannedScene(vm) {
 }
 
 void Guard::setVerticalCode() {
+	Screen &screen = *_vm->_screen;
+
 	_gCode1 = 0;
 	_gCode2 = 0;
-	if (_topLeft.x < _vm->_screen->_orgX1)
+	if (_topLeft.x < screen._orgX1)
 		_gCode1 |= 8;
-	else if (_topLeft.x == _vm->_screen->_orgX1) {
+	else if (_topLeft.x == screen._orgX1) {
 		_gCode1 |= 8;
 		_gCode1 |= 2;
 	}
 	else
 		_gCode1 |= 2;
 
-	if (_bottomRight.x < _vm->_screen->_orgX1)
+	if (_bottomRight.x < screen._orgX1)
 		_gCode2 |= 8;
-	else if (_bottomRight.x == _vm->_screen->_orgX1) {
+	else if (_bottomRight.x == screen._orgX1) {
 		_gCode2 |= 8;
 		_gCode2 |= 2;
 	}
 	else
 		_gCode2 |= 2;
 
-	if (_topLeft.y < _vm->_screen->_orgY1)
+	if (_topLeft.y < screen._orgY1)
 		_gCode1 |= 4;
-	else if (_topLeft.y > _vm->_screen->_orgY2)
+	else if (_topLeft.y > screen._orgY2)
 		_gCode1 |= 1;
 
-	if (_bottomRight.y < _vm->_screen->_orgY1)
+	if (_bottomRight.y < screen._orgY1)
 		_gCode2 |= 4;
-	else if (_bottomRight.y > _vm->_screen->_orgY2)
+	else if (_bottomRight.y > screen._orgY2)
 		_gCode2 |= 1;
 }
 
 void Guard::setHorizontalCode() {
+	Screen &screen = *_vm->_screen;
+
 	_gCode1 = 0;
 	_gCode2 = 0;
 
-	if (_topLeft.y < _vm->_screen->_orgY1)
+	if (_topLeft.y < screen._orgY1)
 		_gCode1 |= 4;
-	else if (_topLeft.x == _vm->_screen->_orgX1) {
+	else if (_topLeft.x == screen._orgX1) {
 		_gCode1 |= 4;
 		_gCode1 |= 1;
 	}
 	else
 		_gCode1 |= 1;
 
-	if (_bottomRight.y < _vm->_screen->_orgY1)
+	if (_bottomRight.y < screen._orgY1)
 		_gCode2 |= 4;
-	else if (_bottomRight.x == _vm->_screen->_orgX1) {
+	else if (_bottomRight.x == screen._orgX1) {
 		_gCode2 |= 4;
 		_gCode2 |= 1;
 	}
 	else
 		_gCode2 |= 1;
 
-	if (_topLeft.x < _vm->_screen->_orgX1)
+	if (_topLeft.x < screen._orgX1)
 		_gCode1 |= 8;
-	else if (_topLeft.x > _vm->_screen->_orgX2)
+	else if (_topLeft.x > screen._orgX2)
 		_gCode1 |= 2;
 
-	if (_bottomRight.x < _vm->_screen->_orgX1)
+	if (_bottomRight.x < screen._orgX1)
 		_gCode2 |= 8;
-	else if (_bottomRight.y > _vm->_screen->_orgX2)
+	else if (_bottomRight.y > screen._orgX2)
 		_gCode2 |= 2;
 }
 
@@ -1120,12 +1130,13 @@ void Guard::chkHLine() {
 }
 
 void Guard::guardSee() {
-	int tmpY = (_vm->_screen->_scrollRow << 4) + _vm->_screen->_scrollY;
+	Screen &screen = *_vm->_screen;
+	int tmpY = (screen._scrollRow << 4) + screen._scrollY;
 	_vm->_flags[140] = 0;
 	if (tmpY > _position.y)
 		return;
 
-	tmpY += _vm->_screen->_vWindowLinesTall;
+	tmpY += screen._vWindowLinesTall;
 	tmpY -= 11;
 
 	if (tmpY < _position.y)
@@ -1135,16 +1146,16 @@ void Guard::guardSee() {
 	_vm->_flags[140] = 1;
 
 	for (uint16 idx = 0; idx < _vm->_room->_plotter._walls.size(); idx++) {
-		_vm->_screen->_orgX1 = _vm->_room->_plotter._walls[idx].left;
-		_vm->_screen->_orgY1 = _vm->_room->_plotter._walls[idx].top;
-		_vm->_screen->_orgX2 = _vm->_room->_plotter._walls[idx].right;
-		_vm->_screen->_orgY2 = _vm->_room->_plotter._walls[idx].bottom;
-		if (_vm->_screen->_orgX1 == _vm->_screen->_orgX2) {
+		screen._orgX1 = _vm->_room->_plotter._walls[idx].left;
+		screen._orgY1 = _vm->_room->_plotter._walls[idx].top;
+		screen._orgX2 = _vm->_room->_plotter._walls[idx].right;
+		screen._orgY2 = _vm->_room->_plotter._walls[idx].bottom;
+		if (screen._orgX1 == screen._orgX2) {
 			chkVLine();
 			if (_vm->_guardFind == 0)
 				return;
 		}
-		else if (_vm->_screen->_orgY1 == _vm->_screen->_orgY2) {
+		else if (screen._orgY1 == screen._orgY2) {
 			chkHLine();
 			if (_vm->_guardFind == 0)
 				return;
@@ -1246,15 +1257,17 @@ Cast::Cast(AmazonEngine *vm) : PannedScene(vm) {
 }
 
 void Cast::doCast(int param1) {
-	_vm->_screen->setDisplayScan();
+	Screen &screen = *_vm->_screen;
+
+	screen.setDisplayScan();
 	_vm->_events->hideCursor();
-	_vm->_screen->forceFadeOut();
-	_vm->_screen->_clipHeight = 173;
-	_vm->_screen->clearScreen();
+	screen.forceFadeOut();
+	screen._clipHeight = 173;
+	screen.clearScreen();
 	_vm->_chapter = 16;
 	_vm->tileScreen();
 	_vm->updateSummary(param1);
-	_vm->_screen->setPanel(3);
+	screen.setPanel(3);
 	_vm->_chapter = 14;
 
 	Resource *spriteData = _vm->_files->loadFile(91, 0);
@@ -1304,7 +1317,7 @@ void Cast::doCast(int param1) {
 	_vm->_numAnimTimers = 0;
 
 	_vm->_midi->newMusic(58, 0);
-	_vm->_screen->forceFadeIn();
+	screen.forceFadeIn();
 
 	while (!_vm->shouldQuit()) {
 		_vm->_images.clear();
@@ -1340,7 +1353,7 @@ void Cast::doCast(int param1) {
 	_vm->_newRects.clear();
 	_vm->_numAnimTimers = 0;
 	_vm->_images.clear();
-	_vm->_screen->forceFadeOut();
+	screen.forceFadeOut();
 
 	_vm->quitGame();
 	_vm->_events->pollEvents();
@@ -1389,40 +1402,41 @@ void River::setRiverPan() {
 
 void River::initRiver() {
 	static const int RIVERVXTBL[3] = { 6719, 7039, 8319 };
+	Screen &screen = *_vm->_screen;
 
 	_vm->_events->centerMousePos();
 	_vm->_events->restrictMouse();
-	_vm->_screen->setDisplayScan();
-	_vm->_screen->clearScreen();
-	_vm->_screen->savePalette();
-	_vm->_screen->forceFadeOut();
+	screen.setDisplayScan();
+	screen.clearScreen();
+	screen.savePalette();
+	screen.forceFadeOut();
 
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(95, 4);
 	_vm->_buffer2.copyFrom(*_vm->_screen);
 
-	_vm->_screen->restorePalette();
-	_vm->_screen->setBufferScan();
+	screen.restorePalette();
+	screen.setBufferScan();
 	_vm->_destIn = &_vm->_buffer2;
 	_vm->_room->roomMenu();
 
 	if (_saveRiver) {
 		// Restoring a savegame, so set properties from saved fields
-		_vm->_screen->_scrollRow = _rScrollRow;
-		_vm->_screen->_scrollCol = _rScrollCol;
-		_vm->_screen->_scrollX = _rScrollX;
-		_vm->_screen->_scrollY = _rScrollY;
+		screen._scrollRow = _rScrollRow;
+		screen._scrollCol = _rScrollCol;
+		screen._scrollX = _rScrollX;
+		screen._scrollY = _rScrollY;
 	} else {
 		// Set initial scene state
-		_vm->_screen->_scrollRow = 0;
-		_vm->_screen->_scrollCol = 140;
-		_vm->_screen->_scrollX = 0;
-		_vm->_screen->_scrollY = 0;
+		screen._scrollRow = 0;
+		screen._scrollCol = 140;
+		screen._scrollX = 0;
+		screen._scrollY = 0;
 	}
 
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
-	_vm->_screen->forceFadeIn();
+	screen.forceFadeIn();
 
 	if (!_saveRiver) {
 		// Reset draw rects
@@ -1499,21 +1513,23 @@ void River::checkRiverPan() {
 }
 
 bool River::riverJumpTest() {
-	if (_vm->_screen->_scrollCol == 120 || _vm->_screen->_scrollCol == 60 || _vm->_screen->_scrollCol == 0) {
+	Screen &screen = *_vm->_screen;
+
+	if (screen._scrollCol == 120 || screen._scrollCol == 60 || screen._scrollCol == 0) {
 		int val = *++_mapPtr;
 		if (val == 0xFF)
 			return true;
 
-		_oldScrollCol = _vm->_screen->_scrollCol;
+		_oldScrollCol = screen._scrollCol;
 
 		if (val == 0) {
-			_vm->_screen->_scrollCol = 139;
-			_vm->_screen->_scrollX = 14;
+			screen._scrollCol = 139;
+			screen._scrollX = 14;
 			_vm->_room->buildScreen();
 			resetPositions();
 			return false;
 		}
-	} else if (_vm->_screen->_scrollCol == 105) {
+	} else if (screen._scrollCol == 105) {
 		int val1 = _mapPtr[1];
 		int val2 = _mapPtr[2];
 		_mapPtr += 3;
@@ -1529,19 +1545,19 @@ bool River::riverJumpTest() {
 				_deathCount = 300;
 				_deathType = val2;
 			}
-			_oldScrollCol = _vm->_screen->_scrollCol;
-			_vm->_screen->_scrollCol = 44;
-			_vm->_screen->_scrollX = 14;
+			_oldScrollCol = screen._scrollCol;
+			screen._scrollCol = 44;
+			screen._scrollX = 14;
 			_vm->_room->buildScreen();
 			resetPositions();
 			return false;
 		}
 	}
 
-	_vm->_screen->_scrollX = 14;
-	--_vm->_screen->_scrollCol;
+	screen._scrollX = 14;
+	--screen._scrollCol;
 	_vm->_buffer1.moveBufferRight();
-	_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
+	_vm->_room->buildColumn(screen._scrollCol, 0);
 	checkRiverPan();
 	return false;
 }
@@ -1628,7 +1644,7 @@ void River::updateObstacles() {
 	for (cur = _topList; cur < RIVER_OBJECTS[_riverIndex][RIVER_END]; ++cur) {
 		int val = cur->_riverX + cur->_width - 1;
 		if (val < _screenVertX)
-			// Obstacle is not yet on-scren
+			// Obstacle is not yet on-screen
 			break;
 
 		if (cur->_riverX < (_screenVertX + 319)) {
@@ -1723,19 +1739,20 @@ void River::plotRiver() {
 }
 
 void River::mWhileDownRiver() {
+	Screen &screen = *_vm->_screen;
 	_vm->_events->hideCursor();
 
-	_vm->_screen->setDisplayScan();
-	_vm->_screen->clearScreen();
-	_vm->_screen->savePalette();
+	screen.setDisplayScan();
+	screen.clearScreen();
+	screen.savePalette();
 	if (!_vm->isDemo())
 		_vm->_files->loadScreen(95, 4);
 	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_screen->restorePalette();
-	_vm->_screen->setPalette();
-	_vm->_screen->setBufferScan();
+	screen.restorePalette();
+	screen.setPalette();
+	screen.setBufferScan();
 
-	_vm->_screen->_scrollX = 0;
+	screen._scrollX = 0;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 
@@ -1768,16 +1785,16 @@ void River::mWhileDownRiver() {
 	++_vm->_timers[4]._flag;
 
 	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
-		(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth != _vm->_room->_playFieldWidth)) {
+		(screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
 		_vm->_images.clear();
 		_vm->_events->_vbCount = 6;
 
-		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
-		while (_vm->_screen->_scrollX >= TILE_WIDTH) {
-			_vm->_screen->_scrollX -= TILE_WIDTH;
-			++_vm->_screen->_scrollCol;
+		screen._scrollX += _vm->_player->_scrollAmount;
+		while (screen._scrollX >= TILE_WIDTH) {
+			screen._scrollX -= TILE_WIDTH;
+			++screen._scrollCol;
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol + _vm->_screen->_vWindowWidth, _vm->_screen->_vWindowBytesWide);
+			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		pan();
-- 
cgit v1.2.3


From 5520a763849a4dd7df6cd2eb727ac89294b5790f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Dec 2014 01:07:47 +0100
Subject: ACCESS: Fix speakText behavior

---
 engines/access/access.cpp | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index bb5414da31..97b08d73c4 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -216,27 +216,25 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 		s->_printOrg = Common::Point(s->_printStart.x, s->_printOrg.y + 9);
 
 		if ((s->_printOrg.y > _printEnd) && (!lastLine)) {
-			if (!_sound->_isVoice) {
-				_events->waitKeyMouse();
-			} else {
-				while (!shouldQuit()) {
-					_sound->freeSounds();
-					Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile);
-					_sound->_soundTable.push_back(SoundEntry(sound, 1));
-					_sound->playSound(0);
-					_scripts->cmdFreeSound();
-
-					_events->pollEvents();
-
-					if (_events->isKeyMousePressed()) {
-						_sndSubFile += soundsLeft;
+			_events->clearEvents();
+			while (!shouldQuit()) {
+				_sound->freeSounds();
+				Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile);
+				_sound->_soundTable.push_back(SoundEntry(sound, 1));
+				_sound->playSound(0);
+				_scripts->cmdFreeSound();
+
+				_events->pollEvents();
+
+				if (_events->isKeyMousePressed()) {
+					_sndSubFile += soundsLeft;
+					break;
+				} else {
+					++_sndSubFile;
+					--soundsLeft;
+					if (soundsLeft == 0)
 						break;
-					} else {
-						++_sndSubFile;
-						--soundsLeft;
-						if (soundsLeft == 0)
-							break;
-					}
+					_events->clearEvents();
 				}
 			}
 
@@ -253,11 +251,6 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 	if (soundsLeft == 0)
 		return;
 
-	if (!_sound->_isVoice) {
-		_events->waitKeyMouse();
-		return;
-	}
-
 	for (;;) {
 		_sound->freeSounds();
 		Resource *res = _sound->loadSound(_narateFile + 99, _sndSubFile);
-- 
cgit v1.2.3


From b1f63a9985055a7a71ebfdfb14bfe1d59502ad16 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 11 Dec 2014 20:39:06 -0500
Subject: ACCESS: Fix for player movement and stab action in pit scene

---
 engines/access/amazon/amazon_game.cpp  |  1 +
 engines/access/amazon/amazon_logic.cpp | 61 ++++++++++++++++++++++++----------
 engines/access/amazon/amazon_logic.h   |  4 ++-
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index ff16bbfa94..af9de52cc2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -778,6 +778,7 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	}
 
 	_river->synchronize(s);
+	_ant->synchronize(s);
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c8bf054d3b..e8e27fc24e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1940,8 +1940,8 @@ void River::synchronize(Common::Serializer &s) {
 /*------------------------------------------------------------------------*/
 
 Ant::Ant(AmazonEngine *vm) : AmazonManager(vm) {
-	_antDirection = RIGHT;
-	_pitDirection = RIGHT;
+	_antDirection = ANT_RIGHT;
+	_pitDirection = ANT_RIGHT;
 	_antCel = 0;
 	_torchCel = 0;
 	_pitCel = 0;
@@ -1975,7 +1975,7 @@ void Ant::plotPit(int indx, const int *&buf) {
 	_vm->_images.addToList(ie);
 
 	_vm->_player->_rawPlayer = _pitPos;
-	if (_vm->_inventory->_inv[76]._value == 1) {
+	if (_vm->_inventory->_inv[76]._value == ITEM_IN_INVENTORY) {
 		// Player has torch
 		idx = _torchCel;
 		buf = Amazon::TORCH;
@@ -1985,7 +1985,8 @@ void Ant::plotPit(int indx, const int *&buf) {
 			idx = 0;
 		_torchCel = idx;
 		plotTorchSpear(idx, buf);
-	} else if (!_stabFl && (_vm->_inventory->_inv[78]._value == 1)) {
+	}
+	else if (!_stabFl && (_vm->_inventory->_inv[78]._value == ITEM_IN_INVENTORY)) {
 		// Player has spear
 		idx = 0;
 		buf = Amazon::SPEAR;
@@ -1995,8 +1996,8 @@ void Ant::plotPit(int indx, const int *&buf) {
 
 int Ant::antHandleRight(int indx, const int *&buf) {
 	int retval = indx;
-	if (_pitDirection == RIGHT) {
-		_pitDirection = LEFT;
+	if (_pitDirection == ANT_RIGHT) {
+		_pitDirection = ANT_LEFT;
 		_pitPos.y = 127;
 	}
 	retval = _pitCel;
@@ -2016,8 +2017,8 @@ int Ant::antHandleRight(int indx, const int *&buf) {
 
 int Ant::antHandleLeft(int indx, const int *&buf) {
 	int retval = indx;
-	if (_pitDirection == LEFT) {
-		_pitDirection = RIGHT;
+	if (_pitDirection == ANT_LEFT) {
+		_pitDirection = ANT_RIGHT;
 		_pitPos.y = 127;
 	}
 	retval = _pitCel;
@@ -2036,14 +2037,16 @@ int Ant::antHandleLeft(int indx, const int *&buf) {
 
 int Ant::antHandleStab(int indx, const int *&buf) {
 	int retval = indx;
-	if (_vm->_inventory->_inv[78]._value != 1) {
+	if (_vm->_inventory->_inv[78]._value == ITEM_IN_INVENTORY) {
 		if (_stabFl) {
 			buf = Amazon::PITSTAB;
 			retval = _stabCel;
 			if (_vm->_timers[13]._flag == 0) {
 				_vm->_timers[13]._flag = 1;
 				retval += 6;
-				if (Amazon::PITSTAB[retval] == -1) {
+				_stabCel = retval;
+
+				if (buf[retval] == -1) {
 					_stabFl = false;
 					_pitCel = 0;
 					_pitPos.y = 127;
@@ -2069,11 +2072,12 @@ int Ant::antHandleStab(int indx, const int *&buf) {
 			}
 		}
 	}
+
 	return retval;
 }
 
 void Ant::doAnt() {
-	_antDirection = RIGHT;
+	_antDirection = ANT_RIGHT;
 	if (_vm->_aniFlag != 1) {
 		_vm->_aniFlag = 1;
 		_antCel = 0;
@@ -2110,15 +2114,15 @@ void Ant::doAnt() {
 		buf = Amazon::ANTEAT;
 	} else {
 		buf = Amazon::ANTWALK;
-		if (_vm->_inventory->_inv[76]._value == 1)
+		if (_vm->_inventory->_inv[76]._value == ITEM_IN_INVENTORY)
 			// Player has burning torch, which scares the Ant
-			_antDirection = LEFT;
+			_antDirection = ANT_LEFT;
 	}
 
 	int idx = _antCel;
 	if (_vm->_timers[15]._flag == 0) {
 		_vm->_timers[15]._flag = 1;
-		if (_antDirection == LEFT) {
+		if (_antDirection == ANT_LEFT) {
 			if (_antPos.x > 10) {
 				if (idx == 0)
 					idx = 36;
@@ -2156,7 +2160,7 @@ void Ant::doAnt() {
 
 	if (_vm->_flags[196] != 1) {
 		idx = _pitCel;
-		if (_stabFl == 1) {
+		if (_stabFl) {
 			idx = antHandleStab(idx, buf);
 		} else {
 			buf = Amazon::PITWALK;
@@ -2164,18 +2168,20 @@ void Ant::doAnt() {
 				_vm->_timers[13]._flag = 1;
 				_vm->_events->pollEvents();
 				if (_vm->_events->_leftButton) {
+					// Handle moving the player whilst the mouse button is held down
 					Common::Point pt = _vm->_events->calcRawMouse();
 					if (pt.x < _pitPos.x)
 						idx = antHandleLeft(idx, buf);
 					else if (pt.x > _pitPos.x)
 						idx = antHandleRight(idx, buf);
 				} else {
+					// Handle movement based on keyboard keys
 					buf = Amazon::PITWALK;
-					if (_vm->_player->_playerDirection == UP)
+					if (_vm->_player->_move == UP)
 						idx = antHandleStab(idx, buf);
-					else if (_vm->_player->_playerDirection == LEFT)
+					else if (_vm->_player->_move == LEFT)
 						idx = antHandleLeft(idx, buf);
-					else if (_vm->_player->_playerDirection == RIGHT)
+					else if (_vm->_player->_move == RIGHT)
 						idx = antHandleRight(idx, buf);
 				}
 			}
@@ -2192,6 +2198,25 @@ void Ant::doAnt() {
 	}
 }
 
+void Ant::synchronize(Common::Serializer &s) {
+	if (_vm->_player->_roomNumber == 61) {
+		s.syncAsByte(_antDirection);
+		s.syncAsByte(_pitDirection);
+		s.syncAsSint16LE(_antCel);
+		s.syncAsSint16LE(_torchCel);
+		s.syncAsSint16LE(_pitCel);
+		s.syncAsSint16LE(_stabCel);
+		s.syncAsSint16LE(_antPos.x);
+		s.syncAsSint16LE(_antPos.y);
+		s.syncAsSint16LE(_pitPos.x);
+		s.syncAsSint16LE(_pitPos.y);
+		s.syncAsByte(_antDieFl);
+		s.syncAsByte(_antEatFl);
+		s.syncAsByte(_stabFl);
+	}
+}
+
+
 } // End of namespace Amazon
 
 } // End of namespace Access
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 8fb6df9354..9b429d8108 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -209,7 +209,7 @@ public:
 	void synchronize(Common::Serializer &s);
 };
 
-enum AntDirection { RIGHT = 0, LEFT = 1 };
+enum AntDirection { ANT_RIGHT = 0, ANT_LEFT = 1 };
 
 class Ant: public AmazonManager {
 private:
@@ -234,6 +234,8 @@ public:
 	Ant(AmazonEngine *vm);
 
 	void doAnt();
+
+	void synchronize(Common::Serializer &s);
 };
 
 class InactivePlayer : public ImageEntry {
-- 
cgit v1.2.3


From 712a18d0500dd51dc113ebaf5ac420ceaa8e456c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Dec 2014 22:33:46 +0100
Subject: ACCESS: Fix compilation errors reported by Criezy

---
 engines/access/access.cpp                | 2 +-
 engines/access/amazon/amazon_scripts.cpp | 4 ++--
 engines/access/sound.cpp                 | 2 +-
 engines/access/sound.h                   | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 97b08d73c4..d0bd3e6eed 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -150,7 +150,7 @@ void AccessEngine::initialize() {
 	_player = Player::init(this);
 	_screen = new Screen(this);
 	_sound = new SoundManager(this, _mixer);
-	_midi = new MusicManager(this, _mixer);
+	_midi = new MusicManager(this);
 	_video = new VideoPlayer(this);
 
 	_buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight());
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 52c142a415..ce9a3d5c5c 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -481,8 +481,8 @@ void AmazonScripts::cmdChapter() {
 }
 
 void AmazonScripts::cmdSetHelp() {
-	int arrayId = (_data->readUint16LE() && 0xFF) - 1;
-	int helpId = _data->readUint16LE() && 0xFF;
+	int arrayId = (_data->readUint16LE() & 0xFF) - 1;
+	int helpId = _data->readUint16LE() & 0xFF;
 
 	byte *help = _game->_helpTbl[arrayId];
 	help[helpId] = 1;
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 4e701618d9..e151458f21 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -162,7 +162,7 @@ void SoundManager::freeSounds() {
 
 /******************************************************************************************/
 
-MusicManager::MusicManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
+MusicManager::MusicManager(AccessEngine *vm) : _vm(vm) {
 	_music = nullptr;
 	_tempMusic = nullptr;
 	_isLooping = false;
diff --git a/engines/access/sound.h b/engines/access/sound.h
index dc8bd90b85..ed8fe0b060 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -74,7 +74,6 @@ public:
 class MusicManager : public Audio::MidiPlayer {
 private:
 	AccessEngine *_vm;
-	Audio::Mixer *_mixer;
 
 	Resource *_tempMusic;
 
@@ -85,7 +84,7 @@ public:
 	Resource *_music;
 
 public:
-	MusicManager(AccessEngine *vm, Audio::Mixer *mixer);
+	MusicManager(AccessEngine *vm);
 	~MusicManager();
 
 	void midiPlay();
-- 
cgit v1.2.3


From de63e2afbc967016e5cdd1d5aff126a1fca7d4ed Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Dec 2014 23:22:41 +0100
Subject: ACCESS: Properly indent some code in playSound

---
 engines/access/sound.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index e151458f21..57f95c9516 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -96,8 +96,8 @@ void SoundManager::playSound(Resource *res, int priority) {
 		//  header content:
 		//   "STEVE" - fixed header
 		//   byte    - sample rate
-		//              01h mapped internally to 3Ch ??
-		//              02h mapped internally to 78h seems to be 11025Hz
+		//              01h mapped internally to 3Ch
+		//              02h mapped internally to 78h
 		//              03h mapped internally to B5h
 		//              04h mapped internally to F1h
 		//   byte    - unknown
@@ -109,10 +109,22 @@ void SoundManager::playSound(Resource *res, int priority) {
 
 		int sampleRate = 0;
 		switch (internalSampleRate) {
-		case 1: sampleRate = 16666; break; // 3Ch -> C4h time constant
-		case 2: sampleRate = 8334; break;  // 78h -> 88h time constant
-		case 3: sampleRate = 5525; break;  // B5h -> 4Bh time constant
-		case 4: sampleRate = 4150; break;  // F1h -> 0Fh time constant
+		case 1: // NEG(3Ch) -> C4h time constant
+			sampleRate = 16666;
+			break;
+
+		case 2: // NEG(78h) -> 88h time constant
+			sampleRate = 8334;
+			break;
+
+		case 3: // NEG(B5h) -> 4Bh time constant
+			sampleRate = 5525;
+			break;
+
+		case 4: // NEG(F1h) -> 0Fh time constant
+			sampleRate = 4150;
+			break;
+
 		default:
 			error("Unexpected internal Sample Rate %d", internalSampleRate);
 			return;
-- 
cgit v1.2.3


From 330cb5fb07c18ecd61e1cac20ce3e030dfe5687b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 12 Dec 2014 23:24:49 -0500
Subject: ACCESS: Remove old dummy unused fields from savegame

---
 engines/access/amazon/amazon_game.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index af9de52cc2..793a601d34 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -767,10 +767,6 @@ void AmazonEngine::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_rawInactiveY);
 	s.syncAsSint16LE(_inactiveYOff);
 
-	int dummy = 0;
-	for (int i = 0; i < 100; ++i)
-		s.syncAsSint16LE(dummy);
-
 	for (int i = 0; i < 366; ++i) {
 		s.syncAsByte(_help1[i]);
 		s.syncAsByte(_help2[i]);
-- 
cgit v1.2.3


From 4e20a93931685c5a5e37a869c6ef57ed9f78aa83 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 13 Dec 2014 14:08:34 +0100
Subject: SCI: Fix comment for workaround.

The previous explanation just wasn't true.
---
 engines/sci/engine/savegame.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 9decc4cef6..0b55425406 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -640,9 +640,11 @@ void SoundCommandParser::reconstructPlayList() {
 		initSoundResource(*i);
 
 		if ((*i)->status == kSoundPlaying) {
-			// Sync the sound object's selectors related to playing with the stored
-			// ones in the playlist, as they may have been invalidated when loading.
-			// Refer to bug #3104624.
+			// WORKAROUND: PQ3 (German?) scripts can set volume negative in the
+			// sound object directly without going through DoSound.
+			// Since we re-read this selector when re-playing the sound after loading,
+			// this will lead to unexpected behaviour. As a workaround we
+			// sync the sound object's selectors here. (See bug #5501)
 			writeSelectorValue(_segMan, (*i)->soundObj, SELECTOR(loop), (*i)->loop);
 			writeSelectorValue(_segMan, (*i)->soundObj, SELECTOR(priority), (*i)->priority);
 			if (_soundVersion >= SCI_VERSION_1_EARLY)
-- 
cgit v1.2.3


From 98889efae52bba628c83f0d9109962e65c6f5c0a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 13 Dec 2014 21:25:46 -0500
Subject: ACCESS: Beginnings of dirty rect handling for screen

---
 engines/access/access.cpp |  5 +++++
 engines/access/asurface.h |  7 ++++---
 engines/access/screen.cpp | 22 ++++++++++++++++++++--
 engines/access/screen.h   |  5 +++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index d0bd3e6eed..b67aebfcc0 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -396,6 +396,11 @@ void AccessEngine::copyBF2Vid() {
 		srcP += _buffer2.pitch;
 		destP += _screen->pitch;
 	}
+
+	// Add dirty rect for affected area
+	Common::Rect r(_screen->_vWindowBytesWide, _screen->_vWindowLinesTall);
+	r.moveTo(_screen->_windowXAdd, _screen->_windowYAdd + _screen->_screenYOff);
+	_screen->addDirtyRect(r);
 }
 
 void AccessEngine::playVideo(int videoNum, const Common::Point &pt) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 273578c830..0ce08bbb5c 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -38,9 +38,10 @@ class SpriteFrame;
 class ASurface : public Graphics::Surface {
 private:
 	Graphics::Surface _savedBlock;
-	Common::Rect _savedBounds;
 
 	void flipHorizontal(ASurface &dest);
+protected:
+	Common::Rect _savedBounds;
 public:
 	static int _leftSkip, _rightSkip;
 	static int _topSkip, _bottomSkip;
@@ -92,6 +93,8 @@ public:
 
 	virtual void copyBlock(ASurface *src, const Common::Rect &bounds);
 
+	virtual void restoreBlock();
+
 	void copyTo(ASurface *dest, const Common::Point &destPos);
 
 	void copyTo(ASurface *dest, const Common::Rect &bounds);
@@ -100,8 +103,6 @@ public:
 
 	void saveBlock(const Common::Rect &bounds);
 
-	void restoreBlock();
-
 	void drawRect();
 
 	void moveBufferLeft();
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 318eb66516..9ccad28931 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -68,6 +68,8 @@ void Screen::clearScreen() {
 	clearBuffer();
 	if (_vesaMode)
 		_vm->_clearSummaryFlag = true;
+
+	addDirtyRect(Common::Rect(0, 0, this->w, this->h));
 }
 
 void Screen::setDisplayScan() {
@@ -87,9 +89,15 @@ void Screen::setPanel(int num) {
 }
 
 void Screen::updateScreen() {
-	g_system->copyRectToScreen((byte *)getPixels(), this->pitch, 0, 0,
-		this->w, this->h);
+	for (uint i = 0; i < _dirtyRects.size(); ++i) {
+		const Common::Rect &r = _dirtyRects[i];
+		const byte *srcP = (const byte *)getBasePtr(r.left, r.top);
+		g_system->copyRectToScreen(srcP, this->pitch, r.left, r.top,
+			r.width(), r.height());
+	}
+
 	g_system->updateScreen();
+	_dirtyRects.clear();
 }
 
 void Screen::setInitialPalettte() {
@@ -239,6 +247,12 @@ void Screen::copyBlock(ASurface *src, const Common::Rect &bounds) {
 	destBounds.translate(_windowXAdd, _windowYAdd + _screenYOff);
 
 	copyRectToSurface(*src, destBounds.left, destBounds.top, bounds);
+	addDirtyRect(destBounds);
+}
+
+void Screen::restoreBlock() {
+	ASurface::restoreBlock();
+	addDirtyRect(_savedBounds);
 }
 
 void Screen::setPaletteCycle(int startCycle, int endCycle, int timer) {
@@ -276,4 +290,8 @@ void Screen::cyclePaletteBackwards() {
 	}
 }
 
+void Screen::addDirtyRect(const Common::Rect &r) {
+	_dirtyRects.push_back(r);
+}
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 8875ce12b7..93da5aa8b3 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -63,6 +63,7 @@ private:
 	int _startCycle;
 	int _cycleStart;
 	int _endCycle;
+	Common::Array<Common::Rect> _dirtyRects;
 
 	void updatePalette();
 public:
@@ -83,6 +84,8 @@ public:
 	bool _screenChangeFlag;
 public:
 	virtual void copyBlock(ASurface *src, const Common::Rect &bounds);
+
+	virtual void restoreBlock();
 public:
 	Screen(AccessEngine *vm);
 
@@ -157,6 +160,8 @@ public:
 	void cyclePaletteForward();
 
 	void cyclePaletteBackwards();
+
+	void addDirtyRect(const Common::Rect &r);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 9314daa11cb2eb8d4c4ecbe1c00fc044ba271f3d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 13 Dec 2014 22:06:58 -0500
Subject: ACCESS: Dirty rect handling for bubble boxes

---
 engines/access/asurface.h    | 4 ++--
 engines/access/inventory.cpp | 2 +-
 engines/access/screen.cpp    | 8 +++++++-
 engines/access/screen.h      | 2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 0ce08bbb5c..ffa22d58e5 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -95,6 +95,8 @@ public:
 
 	virtual void restoreBlock();
 
+	virtual void drawRect();
+
 	void copyTo(ASurface *dest, const Common::Point &destPos);
 
 	void copyTo(ASurface *dest, const Common::Rect &bounds);
@@ -103,8 +105,6 @@ public:
 
 	void saveBlock(const Common::Rect &bounds);
 
-	void drawRect();
-
 	void moveBufferLeft();
 
 	void moveBufferRight();
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index acba60433f..20c9976a3b 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -171,7 +171,7 @@ int InventoryManager::newDisplayInv() {
 	// The original was testing the vesa mode too.
 	// We removed this check as we don't use pre-rendering
 	if (!_invRefreshFlag) {
-		screen.clearBuffer();
+		screen.clearScreen();
 		screen.setPalette();
 	}
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 9ccad28931..98dbdb4e9c 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -251,8 +251,13 @@ void Screen::copyBlock(ASurface *src, const Common::Rect &bounds) {
 }
 
 void Screen::restoreBlock() {
-	ASurface::restoreBlock();
 	addDirtyRect(_savedBounds);
+	ASurface::restoreBlock();
+}
+
+void Screen::drawRect() {
+	addDirtyRect(Common::Rect(_orgX1, _orgY1, _orgX2, _orgY2));
+	ASurface::drawRect();
 }
 
 void Screen::setPaletteCycle(int startCycle, int endCycle, int timer) {
@@ -292,6 +297,7 @@ void Screen::cyclePaletteBackwards() {
 
 void Screen::addDirtyRect(const Common::Rect &r) {
 	_dirtyRects.push_back(r);
+	assert(r.isValidRect() && r.width() > 0 && r.height() > 0);
 }
 
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 93da5aa8b3..c43a03c9dc 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -86,6 +86,8 @@ public:
 	virtual void copyBlock(ASurface *src, const Common::Rect &bounds);
 
 	virtual void restoreBlock();
+
+	virtual void drawRect();
 public:
 	Screen(AccessEngine *vm);
 
-- 
cgit v1.2.3


From 310853a285d5d648f1695cc3a40a165223b2928a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 13 Dec 2014 22:33:23 -0500
Subject: ACCESS: Add dirty rects when plotting images to the screen

---
 engines/access/amazon/amazon_logic.cpp   |  2 +-
 engines/access/amazon/amazon_scripts.cpp |  6 ++---
 engines/access/asurface.cpp              | 43 ++++++++++++++++++--------------
 engines/access/asurface.h                | 12 +++++----
 engines/access/screen.cpp                | 15 +++++++++++
 engines/access/screen.h                  |  6 +++++
 6 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index e8e27fc24e..42f9a243ce 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -356,7 +356,7 @@ void Opening::doTitle() {
 			int id = COUNTDOWN[_pCount * 2];
 			int xp = COUNTDOWN[_pCount * 2 + 1];
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
-			screen.copyFrom(_vm->_buffer2);
+			_vm->_buffer2.copyTo(_vm->_screen);
 
 			_vm->_sound->playSound(1);
 			_vm->_events->_vbCount = 70;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index ce9a3d5c5c..6f9d9c9697 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -71,8 +71,8 @@ void AmazonScripts::mWhile1() {
 		_sequence = 2100;
 	} while (_vm->_flags[52] == 1);
 
-	_vm->_screen->copyFrom(_vm->_buffer1);
-	_vm->_buffer1.copyFrom(_vm->_buffer2);
+	_vm->_buffer1.copyTo(_vm->_screen);
+	_vm->_buffer2.copyTo(&_vm->_buffer1);
 
 	_game->establish(-1, 14);
 
@@ -446,7 +446,7 @@ void AmazonScripts::cmdHelp() {
 				_vm->_screen->clearBuffer();
 			}
 
-			_vm->_screen->copyFrom(_vm->_buffer2);
+			_vm->_buffer2.copyTo(_vm->_screen);
 			_vm->_screen->restorePalette();
 			_vm->_screen->setPalette();
 			_vm->_events->showCursor();
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index cd872e04b2..9725a5f646 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -203,13 +203,13 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 	}
 }
 
-void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
-	if (dest->getPixels() == nullptr)
-		dest->create(w, h);
+void ASurface::copyFrom(ASurface *src, const Common::Point &destPos) {
+	if (getPixels() == nullptr)
+		create(w, h);
 
-	for (int yp = 0; yp < h; ++yp) {
-		byte *srcP = (byte *)getBasePtr(0, yp);
-		byte *destP = (byte *)dest->getBasePtr(destPos.x, destPos.y + yp);
+	for (int yp = 0; yp < src->h; ++yp) {
+		const byte *srcP = (const byte *)src->getBasePtr(0, yp);
+		byte *destP = (byte *)getBasePtr(destPos.x, destPos.y + yp);
 
 		for (int xp = 0; xp < this->w; ++xp, ++srcP, ++destP) {
 			if (*srcP != 0)
@@ -218,13 +218,13 @@ void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
 	}
 }
 
-void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
+void ASurface::copyFrom(ASurface *src, const Common::Rect &bounds) {
 	const int SCALE_LIMIT = 0x100;
-	int scaleX = SCALE_LIMIT * bounds.width() / this->w;
-	int scaleY = SCALE_LIMIT * bounds.height() / this->h;
+	int scaleX = SCALE_LIMIT * bounds.width() / src->w;
+	int scaleY = SCALE_LIMIT * bounds.height() / src->h;
 	int scaleXCtr = 0, scaleYCtr = 0;
 
-	for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr) {
+	for (int yCtr = 0, destY = bounds.top; yCtr < src->h; ++yCtr) {
 		// Handle skipping lines if Y scaling
 		scaleYCtr += scaleY;
 		if (scaleYCtr < SCALE_LIMIT)
@@ -232,17 +232,17 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 		scaleYCtr -= SCALE_LIMIT;
 
 		// Handle off-screen lines
-		if (destY >= dest->h)
+		if (destY >= this->h)
 			break;
 
 		if (destY >= 0) {
 			// Handle drawing the line
-			byte *pSrc = (byte *)getBasePtr(0, yCtr);
-			byte *pDest = (byte *)dest->getBasePtr(bounds.left, destY);
+			const byte *pSrc = (const byte *)src->getBasePtr(0, yCtr);
+			byte *pDest = (byte *)getBasePtr(bounds.left, destY);
 			scaleXCtr = 0;
 			int x = bounds.left;
 
-			for (int xCtr = 0; xCtr < this->w; ++xCtr, ++pSrc) {
+			for (int xCtr = 0; xCtr < src->w; ++xCtr, ++pSrc) {
 				// Handle horizontal scaling
 				scaleXCtr += scaleX;
 				if (scaleXCtr < SCALE_LIMIT)
@@ -250,7 +250,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 				scaleXCtr -= SCALE_LIMIT;
 
 				// Only handle on-screen pixels
-				if (x >= dest->w)
+				if (x >= this->w)
 					break;
 				if (x >= 0 && *pSrc != 0)
 					*pDest = *pSrc;
@@ -264,8 +264,12 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	}
 }
 
-void ASurface::copyTo(ASurface *dest) {
-	copyTo(dest, Common::Point());
+void ASurface::copyFrom(ASurface &src) {
+	copyFrom(&src, Common::Point());
+}
+
+void ASurface::copyBuffer(Graphics::Surface *src) {
+	Graphics::Surface::copyFrom(*src);
 }
 
 void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
@@ -277,13 +281,14 @@ void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
-	frame->copyTo(this, bounds);
+	copyFrom(frame, bounds);
 }
 
 void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
 	ASurface flippedFrame;
 	frame->flipHorizontal(flippedFrame);
-	flippedFrame.copyTo(this, bounds);
+
+	copyFrom(&flippedFrame, bounds);
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index ffa22d58e5..36fd2518c3 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -65,8 +65,6 @@ public:
 
 	void clearBuffer();
 
-	void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
-
 	bool clip(Common::Rect &r);
 
 	void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
@@ -97,11 +95,15 @@ public:
 
 	virtual void drawRect();
 
-	void copyTo(ASurface *dest, const Common::Point &destPos);
+	virtual void copyFrom(ASurface *src, const Common::Point &destPos);
+
+	virtual void copyFrom(ASurface *src, const Common::Rect &bounds);
+
+	virtual void copyFrom(ASurface &src);
 
-	void copyTo(ASurface *dest, const Common::Rect &bounds);
+	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
 
-	void copyTo(ASurface *dest);
+	virtual void copyBuffer(Graphics::Surface *src);
 
 	void saveBlock(const Common::Rect &bounds);
 
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 98dbdb4e9c..14ead2e266 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -260,6 +260,21 @@ void Screen::drawRect() {
 	ASurface::drawRect();
 }
 
+void Screen::copyFrom(ASurface *src, const Common::Point &destPos) {
+	addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h));
+	ASurface::copyFrom(src, destPos);
+}
+
+void Screen::copyFrom(ASurface *src, const Common::Rect &bounds) {
+	addDirtyRect(bounds);
+	ASurface::copyFrom(src, bounds);
+}
+
+void Screen::copyBuffer(Graphics::Surface *src) {
+	addDirtyRect(Common::Rect(0, 0, src->w, src->h));
+	ASurface::copyBuffer(src);
+}
+
 void Screen::setPaletteCycle(int startCycle, int endCycle, int timer) {
 	_startCycle = _cycleStart = startCycle;
 	_endCycle = endCycle;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index c43a03c9dc..1d93efbfee 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -88,6 +88,12 @@ public:
 	virtual void restoreBlock();
 
 	virtual void drawRect();
+
+	virtual void copyFrom(ASurface *src, const Common::Point &destPos);
+
+	virtual void copyFrom(ASurface *src, const Common::Rect &bounds);
+
+	virtual void copyBuffer(Graphics::Surface *src);
 public:
 	Screen(AccessEngine *vm);
 
-- 
cgit v1.2.3


From 2cdd05306c4c4c405a7405f1d0e5d491ec886c1d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 10:17:47 -0500
Subject: ACCESS: Dirty rect handling for conversation videos

---
 engines/access/screen.cpp |  3 ++-
 engines/access/video.cpp  | 10 +++++++++-
 engines/access/video.h    |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 14ead2e266..2276fcc963 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -251,7 +251,8 @@ void Screen::copyBlock(ASurface *src, const Common::Rect &bounds) {
 }
 
 void Screen::restoreBlock() {
-	addDirtyRect(_savedBounds);
+	if (!_savedBounds.isEmpty())
+		addDirtyRect(_savedBounds);
 	ASurface::restoreBlock();
 }
 
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index abe833ce42..eb50083de5 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -60,6 +60,7 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const
 	_xCount = _header._width;
 	_scanCount = _header._height;
 	_videoFrame = 0;
+	_videoBounds = Common::Rect(pt.x, pt.y, pt.x + _header._width, pt.y + _header._height);
 
 	getFrame();
 
@@ -133,6 +134,10 @@ void VideoPlayer::playVideo() {
 		}
 	}
 
+	// If the video is playing on the screen surface, add a dirty rect
+	if (_vidSurface == _vm->_screen)
+		_vm->_screen->addDirtyRect(_videoBounds);
+
 	getFrame();
 	if (++_videoFrame == _frameCount) {
 		closeVideo();
@@ -142,14 +147,16 @@ void VideoPlayer::playVideo() {
 
 void VideoPlayer::copyVideo() {
 	_vm->_player->calcPlayer();
+
+	// Figure out the dirty rect area for the video frame
 	Common::Rect r = Common::Rect(_vm->_vidX - _vm->_screen->_bufferStart.x,
 		_vm->_vidY - _vm->_screen->_bufferStart.y,
 		_vm->_vidX - _vm->_screen->_bufferStart.x + _header._width,
 		_vm->_vidY - _vm->_screen->_bufferStart.y + _header._height);
 	if (!_vm->_screen->clip(r))
 		return;
-
 	_vm->_newRects.push_back(r);
+
 	int vh = _header._height;
 	int vw = _header._width;
 	int destIdx = _vm->_vidX - _vm->_screen->_bufferStart.x;
@@ -165,4 +172,5 @@ void VideoPlayer::copyVideo() {
 		destP += _vm->_buffer2.pitch;
 	}
 }
+
 } // End of namespace Access
diff --git a/engines/access/video.h b/engines/access/video.h
index f4be76de31..65d6ad61a7 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -48,6 +48,7 @@ private:
 	int _xCount;
 	int _scanCount;
 	int _frameSize;
+	Common::Rect _videoBounds;
 
 	void getFrame();
 public:
-- 
cgit v1.2.3


From 93979484f6932759ea5075d68ac75fa479848080 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 11:56:42 -0500
Subject: ACCESS: Fix for background redraws during conversations

---
 engines/access/asurface.cpp | 14 +++++++-------
 engines/access/asurface.h   | 10 +++++-----
 engines/access/screen.cpp   |  8 ++++----
 engines/access/screen.h     |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 9725a5f646..ef8e079c42 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -203,7 +203,7 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 	}
 }
 
-void ASurface::copyFrom(ASurface *src, const Common::Point &destPos) {
+void ASurface::transCopyFrom(ASurface *src, const Common::Point &destPos) {
 	if (getPixels() == nullptr)
 		create(w, h);
 
@@ -218,7 +218,7 @@ void ASurface::copyFrom(ASurface *src, const Common::Point &destPos) {
 	}
 }
 
-void ASurface::copyFrom(ASurface *src, const Common::Rect &bounds) {
+void ASurface::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
 	const int SCALE_LIMIT = 0x100;
 	int scaleX = SCALE_LIMIT * bounds.width() / src->w;
 	int scaleY = SCALE_LIMIT * bounds.height() / src->h;
@@ -264,12 +264,12 @@ void ASurface::copyFrom(ASurface *src, const Common::Rect &bounds) {
 	}
 }
 
-void ASurface::copyFrom(ASurface &src) {
-	copyFrom(&src, Common::Point());
+void ASurface::transCopyFrom(ASurface &src) {
+	copyFrom(src);
 }
 
 void ASurface::copyBuffer(Graphics::Surface *src) {
-	Graphics::Surface::copyFrom(*src);
+	copyFrom(*src);
 }
 
 void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
@@ -281,14 +281,14 @@ void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
-	copyFrom(frame, bounds);
+	transCopyFrom(frame, bounds);
 }
 
 void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
 	ASurface flippedFrame;
 	frame->flipHorizontal(flippedFrame);
 
-	copyFrom(&flippedFrame, bounds);
+	transCopyFrom(&flippedFrame, bounds);
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 36fd2518c3..c04b33c36e 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -95,16 +95,16 @@ public:
 
 	virtual void drawRect();
 
-	virtual void copyFrom(ASurface *src, const Common::Point &destPos);
+	virtual void transCopyFrom(ASurface *src, const Common::Point &destPos);
 
-	virtual void copyFrom(ASurface *src, const Common::Rect &bounds);
+	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
 
-	virtual void copyFrom(ASurface &src);
-
-	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
+	virtual void transCopyFrom(ASurface &src);
 
 	virtual void copyBuffer(Graphics::Surface *src);
 
+	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
+
 	void saveBlock(const Common::Rect &bounds);
 
 	void moveBufferLeft();
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 2276fcc963..5897fbec2e 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -261,14 +261,14 @@ void Screen::drawRect() {
 	ASurface::drawRect();
 }
 
-void Screen::copyFrom(ASurface *src, const Common::Point &destPos) {
+void Screen::transCopyFrom(ASurface *src, const Common::Point &destPos) {
 	addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h));
-	ASurface::copyFrom(src, destPos);
+	ASurface::transCopyFrom(src, destPos);
 }
 
-void Screen::copyFrom(ASurface *src, const Common::Rect &bounds) {
+void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
 	addDirtyRect(bounds);
-	ASurface::copyFrom(src, bounds);
+	ASurface::transCopyFrom(src, bounds);
 }
 
 void Screen::copyBuffer(Graphics::Surface *src) {
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 1d93efbfee..f790dd7986 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -89,9 +89,9 @@ public:
 
 	virtual void drawRect();
 
-	virtual void copyFrom(ASurface *src, const Common::Point &destPos);
+	virtual void transCopyFrom(ASurface *src, const Common::Point &destPos);
 
-	virtual void copyFrom(ASurface *src, const Common::Rect &bounds);
+	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
 
 	virtual void copyBuffer(Graphics::Surface *src);
 public:
-- 
cgit v1.2.3


From 924f2abdf40a97966fff991d7cb0db842212a567 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 14:45:06 -0500
Subject: ACCESS: Dirty rect handling for intro screens

---
 engines/access/asurface.cpp | 4 ++++
 engines/access/asurface.h   | 2 ++
 engines/access/files.cpp    | 3 +++
 engines/access/screen.cpp   | 5 +++++
 engines/access/screen.h     | 2 ++
 5 files changed, 16 insertions(+)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index ef8e079c42..e135ae7184 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -268,6 +268,10 @@ void ASurface::transCopyFrom(ASurface &src) {
 	copyFrom(src);
 }
 
+void ASurface::copyFrom(Graphics::Surface &src) {
+	Graphics::Surface::copyFrom(src);
+}
+
 void ASurface::copyBuffer(Graphics::Surface *src) {
 	copyFrom(*src);
 }
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index c04b33c36e..db17eb2089 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -101,6 +101,8 @@ public:
 
 	virtual void transCopyFrom(ASurface &src);
 
+	virtual void copyFrom(Graphics::Surface &src);
+
 	virtual void copyBuffer(Graphics::Surface *src);
 
 	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index b846cbd32c..004886a379 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -168,6 +168,9 @@ void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) {
 			res->_stream->read(pDest, dest->w);
 		}
 	}
+
+	if (dest == _vm->_screen)
+		_vm->_screen->addDirtyRect(Common::Rect(0, 0, dest->w, dest->h));
 }
 
 void FileManager::loadScreen(int fileNum, int subfile) {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 5897fbec2e..34755ade47 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -271,6 +271,11 @@ void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
 	ASurface::transCopyFrom(src, bounds);
 }
 
+void Screen::copyFrom(Graphics::Surface &src) {
+	addDirtyRect(Common::Rect(0, 0, src.w, src.h));
+	ASurface::copyFrom(src);
+}
+
 void Screen::copyBuffer(Graphics::Surface *src) {
 	addDirtyRect(Common::Rect(0, 0, src->w, src->h));
 	ASurface::copyBuffer(src);
diff --git a/engines/access/screen.h b/engines/access/screen.h
index f790dd7986..56ee9bed20 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -93,6 +93,8 @@ public:
 
 	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
 
+	virtual void copyFrom(Graphics::Surface &src);
+
 	virtual void copyBuffer(Graphics::Surface *src);
 public:
 	Screen(AccessEngine *vm);
-- 
cgit v1.2.3


From fda4ef620f3eefc76d7362945d514e6c46187073 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 15:22:09 -0500
Subject: ACCESS: Add dirty rect handling for font display

---
 engines/access/asurface.h | 2 ++
 engines/access/font.cpp   | 2 ++
 engines/access/screen.h   | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index db17eb2089..139565190b 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -105,6 +105,8 @@ public:
 
 	virtual void copyBuffer(Graphics::Surface *src);
 
+	virtual void addDirtyRect(const Common::Rect &r) {}
+
 	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
 
 	void saveBlock(const Common::Rect &bounds);
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 51fb9dc1c8..1aadfb6be2 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -150,6 +150,8 @@ void Font::drawString(ASurface *s, const Common::String &msg, const Common::Poin
 int Font::drawChar(ASurface *s, char c, Common::Point &pt) {
 	Graphics::Surface &ch = _chars[c - ' '];
 
+	s->addDirtyRect(Common::Rect(pt.x, pt.y, pt.x + ch.w, pt.y + ch.h));
+
 	// Loop through the lines of the character
 	for (int y = 0; y < ch.h; ++y) {
 		byte *pSrc = (byte *)ch.getBasePtr(0, y);
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 56ee9bed20..7134afffeb 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -96,6 +96,8 @@ public:
 	virtual void copyFrom(Graphics::Surface &src);
 
 	virtual void copyBuffer(Graphics::Surface *src);
+
+	virtual void addDirtyRect(const Common::Rect &r);
 public:
 	Screen(AccessEngine *vm);
 
@@ -170,8 +172,6 @@ public:
 	void cyclePaletteForward();
 
 	void cyclePaletteBackwards();
-
-	void addDirtyRect(const Common::Rect &r);
 };
 
 } // End of namespace Access
-- 
cgit v1.2.3


From 831a3f7f3591182ab0e7b8812e98c12282923909 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 15:39:37 -0500
Subject: ACCESS: Implement dirty rect merging

---
 engines/access/screen.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++--
 engines/access/screen.h   |  6 +++++-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 34755ade47..3e6bd7e38f 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -89,13 +89,19 @@ void Screen::setPanel(int num) {
 }
 
 void Screen::updateScreen() {
-	for (uint i = 0; i < _dirtyRects.size(); ++i) {
-		const Common::Rect &r = _dirtyRects[i];
+	// Merge the dirty rects
+	mergeDirtyRects();
+
+	// Loop through copying dirty areas to the physical screen
+	Common::List<Common::Rect>::iterator i;
+	for (i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
+		const Common::Rect &r = *i;
 		const byte *srcP = (const byte *)getBasePtr(r.left, r.top);
 		g_system->copyRectToScreen(srcP, this->pitch, r.left, r.top,
 			r.width(), r.height());
 	}
 
+	// Signal the physical screen to update
 	g_system->updateScreen();
 	_dirtyRects.clear();
 }
@@ -321,4 +327,43 @@ void Screen::addDirtyRect(const Common::Rect &r) {
 	assert(r.isValidRect() && r.width() > 0 && r.height() > 0);
 }
 
+void Screen::mergeDirtyRects() {
+	Common::List<Common::Rect>::iterator rOuter, rInner;
+
+	// Ensure dirty rect list has at least two entries
+	rOuter = _dirtyRects.begin();
+	for (int i = 0; i < 2; ++i, ++rOuter) {
+		if (rOuter == _dirtyRects.end())
+			return;
+	}
+	
+	// Process the dirty rect list to find any rects to merge
+	for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
+		rInner = rOuter;
+		while (++rInner != _dirtyRects.end()) {
+
+			if ((*rOuter).intersects(*rInner)) {
+				// these two rectangles overlap or
+				// are next to each other - merge them
+
+				unionRectangle(*rOuter, *rOuter, *rInner);
+
+				// remove the inner rect from the list
+				_dirtyRects.erase(rInner);
+
+				// move back to beginning of list
+				rInner = rOuter;
+			}
+		}
+	}
+}
+
+bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2) {
+	destRect = src1;
+	destRect.extend(src2);
+
+	return !destRect.isEmpty();
+}
+
+
 } // End of namespace Access
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 7134afffeb..775cb6b0c3 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -63,9 +63,13 @@ private:
 	int _startCycle;
 	int _cycleStart;
 	int _endCycle;
-	Common::Array<Common::Rect> _dirtyRects;
+	Common::List<Common::Rect> _dirtyRects;
 
 	void updatePalette();
+
+	void mergeDirtyRects();
+
+	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
 public:
 	int _vesaMode;
 	int _startColor, _numColors;
-- 
cgit v1.2.3


From 27ed5246b8780dc74235478058177abcc1d8e84d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 14 Dec 2014 22:43:01 +0100
Subject: ACCESS: Use the same (weird) key mapping than in the original game

---
 engines/access/room.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index e18bd4a329..b9d13c94cd 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -467,9 +467,10 @@ void Room::doCommands() {
 			mainAreaClick();
 		}
 	} else if (_vm->_events->getKey(keyState)) {
-		if (keyState.keycode >= Common::KEYCODE_F1 && keyState.keycode <= Common::KEYCODE_F9) {
+		if (keyState.keycode == Common::KEYCODE_F1)
 			handleCommand(keyState.keycode - Common::KEYCODE_F1 + 1);
-		}
+		else if (keyState.keycode >= Common::KEYCODE_F2 && keyState.keycode <= Common::KEYCODE_F10)
+			handleCommand(keyState.keycode - Common::KEYCODE_F1);
 	}
 }
 
-- 
cgit v1.2.3


From dcc6ceb117549a68a275b5740edea5e5e02030bd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 14 Dec 2014 23:22:54 +0100
Subject: ACCESS: Fix icon when unselecting a menu button

---
 engines/access/room.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index b9d13c94cd..a33f773bac 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -588,6 +588,7 @@ void Room::walkCursor() {
 
 void Room::commandOff() {
 	_selectCommand = -1;
+	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
 	_vm->_events->setCursor(CURSOR_CROSSHAIRS);
 	roomMenu();
 }
-- 
cgit v1.2.3


From 66bf0ec7412949eee758c138be1f81571b1fc56d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 14 Dec 2014 23:51:01 +0100
Subject: ACCESS: Some refactoring concerning the mouse cursor

---
 engines/access/amazon/amazon_game.cpp   |  2 +-
 engines/access/amazon/amazon_room.cpp   |  5 ++---
 engines/access/events.cpp               |  9 +++++++++
 engines/access/events.h                 | 10 ++++++++++
 engines/access/inventory.cpp            |  9 +++------
 engines/access/martian/martian_room.cpp |  2 +-
 engines/access/room.cpp                 | 30 +++++++++++-------------------
 7 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 793a601d34..9a86642579 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -193,7 +193,7 @@ void AmazonEngine::initVariables() {
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
 	_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
 	_room->_selectCommand = -1;
-	_events->_normalMouse = CURSOR_CROSSHAIRS;
+	_events->setNormalCursor(CURSOR_CROSSHAIRS);
 	_mouseMode = 0;
 	_numAnimTimers = 0;
 }
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index d6ab2bd758..10b622c738 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -87,7 +87,7 @@ void AmazonRoom::reloadRoom1() {
 	}
 
 	_selectCommand = -1;
-	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
+	_vm->_events->setNormalCursor(CURSOR_CROSSHAIRS);
 	_vm->_mouseMode = 0;
 	_vm->_boxSelect = true;
 	_vm->_player->_playerOff = false;
@@ -210,8 +210,7 @@ void AmazonRoom::walkCursor() {
 
 	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 &&
 			events._normalMouse != CURSOR_CROSSHAIRS)) {
-		events._normalMouse = CURSOR_CROSSHAIRS;
-		events.setCursor(CURSOR_CROSSHAIRS);
+		events.forceSetCursor(CURSOR_CROSSHAIRS);
 		_selectCommand = -1;
 		_vm->_boxSelect = true;
 	} else {
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 249ba15010..cd1880b338 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -54,6 +54,15 @@ EventsManager::~EventsManager() {
 	_invCursor.free();
 }
 
+void EventsManager::forceSetCursor(CursorType cursorId) {
+	setNormalCursor(cursorId);
+	setCursor(cursorId);
+}
+
+void EventsManager::setNormalCursor(CursorType cursorId) {
+	_normalMouse = cursorId;
+}
+
 void EventsManager::setCursor(CursorType cursorId) {
 	if (cursorId == _cursorId)
 		return;	
diff --git a/engines/access/events.h b/engines/access/events.h
index c43bf472f0..fd3adf8797 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -82,6 +82,16 @@ public:
 	 */
 	uint32 getFrameCounter() { return _frameCounter; }
 
+	/**
+	 * Sets the cursor and reset the normal cursor
+	 */
+	void EventsManager::forceSetCursor(CursorType cursorId);
+
+	/**
+	 * Sets the normal cursor
+	 */
+	void EventsManager::setNormalCursor(CursorType cursorId);
+
 	/**
 	 * Sets the cursor
 	 */
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 20c9976a3b..49fa6e7efc 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -198,12 +198,9 @@ int InventoryManager::newDisplayInv() {
 	if (!_invRefreshFlag) {
 		if (_vm->_useItem == -1) {
 			result = 2;
-			events._normalMouse = CURSOR_CROSSHAIRS;
-			events.setCursor(CURSOR_CROSSHAIRS);
-		} else {
-			events.setCursor(CURSOR_INVENTORY);
-			events._normalMouse = CURSOR_INVENTORY;
-		}
+			events.forceSetCursor(CURSOR_CROSSHAIRS);
+		} else
+			events.forceSetCursor(CURSOR_INVENTORY);
 	}
 
 	_invRefreshFlag = false;
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 2bd98186f0..22f456fd4c 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -82,7 +82,7 @@ void MartianRoom::reloadRoom1() {
 	}
 
 	_selectCommand = -1;
-	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
+	_vm->_events->setNormalCursor(CURSOR_CROSSHAIRS);
 	_vm->_mouseMode = 0;
 	_vm->_boxSelect = true;
 	_vm->_player->_playerOff = false;
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a33f773bac..f4826090b1 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -136,11 +136,11 @@ void Room::doRoom() {
 				} else {
 					_vm->plotList();
 
-					if (_vm->_events->_mousePos.y < 177) {
+					if (_vm->_events->_mousePos.y < 177)
 						_vm->_events->setCursor(_vm->_events->_normalMouse);
-					} else {
+					else
 						_vm->_events->setCursor(CURSOR_ARROW);
-					}
+
 					_vm->copyBlocks();
 				}
 			}
@@ -512,16 +512,13 @@ void Room::executeCommand(int commandId) {
 
 	switch (commandId) {
 	case 0:
-		events._normalMouse = CURSOR_LOOK;
-		events.setCursor(CURSOR_LOOK);
+		events.forceSetCursor(CURSOR_LOOK);
 		break;
 	case 2:
-		events._normalMouse = CURSOR_USE;
-		events.setCursor(CURSOR_USE);
+		events.forceSetCursor(CURSOR_USE);
 		break;
 	case 3:
-		events._normalMouse = CURSOR_TAKE;
-		events.setCursor(CURSOR_TAKE);
+		events.forceSetCursor(CURSOR_TAKE);
 		break;
 	case 4:
 		events.setCursor(CURSOR_ARROW);
@@ -531,19 +528,16 @@ void Room::executeCommand(int commandId) {
 		}
 		break;
 	case 5:
-		events._normalMouse = CURSOR_CLIMB;
-		events.setCursor(CURSOR_CLIMB);
+		events.forceSetCursor(CURSOR_CLIMB);
 		break;
 	case 6:
-		events._normalMouse = CURSOR_TALK;
-		events.setCursor(CURSOR_TALK);
+		events.forceSetCursor(CURSOR_TALK);
 		break;
 	case 7:
 		walkCursor();
 		return;
 	case 8:
-		events._normalMouse = CURSOR_HELP;
-		events.setCursor(CURSOR_HELP);
+		events.forceSetCursor(CURSOR_HELP);
 		break;
 	default:
 		break;
@@ -570,8 +564,7 @@ void Room::executeCommand(int commandId) {
 void Room::walkCursor() {
 	EventsManager &events = *_vm->_events;
 
-	events._normalMouse = CURSOR_CROSSHAIRS;
-	events.setCursor(CURSOR_CROSSHAIRS);
+	events.forceSetCursor(CURSOR_CROSSHAIRS);
 	_vm->_scripts->_sequence = 5000;
 	_vm->_scripts->searchForSequence();
 	roomMenu();
@@ -588,8 +581,7 @@ void Room::walkCursor() {
 
 void Room::commandOff() {
 	_selectCommand = -1;
-	_vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
-	_vm->_events->setCursor(CURSOR_CROSSHAIRS);
+	_vm->_events->forceSetCursor(CURSOR_CROSSHAIRS);
 	roomMenu();
 }
 
-- 
cgit v1.2.3


From 450deabd4536eb71671286e52e4b01a03a4e581a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 14 Dec 2014 23:55:22 +0100
Subject: ACCESS: Fix a couple of typos in comments

---
 engines/access/amazon/amazon_room.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 10b622c738..d026f7b6a5 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -204,8 +204,8 @@ void AmazonRoom::mainAreaClick() {
 
 void AmazonRoom::walkCursor() {
 	// WORKAROUND: For scene 29, which is a normal walkable scene, but yet can be
-	// 'exitted'. This workaround ensures the scene will only be left if you click
-	// the Exit icon wgeb the cursor is already a walk cursor
+	// 'exited'. This workaround ensures the scene will only be left if you click
+	// the Exit icon when the cursor is already a walk cursor
 	EventsManager &events = *_vm->_events;
 
 	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 &&
-- 
cgit v1.2.3


From 37aefd08f245c0a5de0c11929e06705271952f65 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 18:27:29 -0500
Subject: ACCESS: Add enum for inventory items referred in hardcoded logic

---
 engines/access/amazon/amazon_logic.cpp   | 9 +++++----
 engines/access/amazon/amazon_resources.h | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 42f9a243ce..ecc43f5b1e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -26,6 +26,7 @@
 #include "access/screen.h"
 #include "access/amazon/amazon_game.h"
 #include "access/amazon/amazon_logic.h"
+#include "access/amazon/amazon_resources.h"
 
 namespace Access {
 
@@ -1975,7 +1976,7 @@ void Ant::plotPit(int indx, const int *&buf) {
 	_vm->_images.addToList(ie);
 
 	_vm->_player->_rawPlayer = _pitPos;
-	if (_vm->_inventory->_inv[76]._value == ITEM_IN_INVENTORY) {
+	if (_vm->_inventory->_inv[INV_TORCH]._value == ITEM_IN_INVENTORY) {
 		// Player has torch
 		idx = _torchCel;
 		buf = Amazon::TORCH;
@@ -1986,7 +1987,7 @@ void Ant::plotPit(int indx, const int *&buf) {
 		_torchCel = idx;
 		plotTorchSpear(idx, buf);
 	}
-	else if (!_stabFl && (_vm->_inventory->_inv[78]._value == ITEM_IN_INVENTORY)) {
+	else if (!_stabFl && (_vm->_inventory->_inv[INV_KNIFE_SPEAR]._value == ITEM_IN_INVENTORY)) {
 		// Player has spear
 		idx = 0;
 		buf = Amazon::SPEAR;
@@ -2037,7 +2038,7 @@ int Ant::antHandleLeft(int indx, const int *&buf) {
 
 int Ant::antHandleStab(int indx, const int *&buf) {
 	int retval = indx;
-	if (_vm->_inventory->_inv[78]._value == ITEM_IN_INVENTORY) {
+	if (_vm->_inventory->_inv[INV_KNIFE_SPEAR]._value == ITEM_IN_INVENTORY) {
 		if (_stabFl) {
 			buf = Amazon::PITSTAB;
 			retval = _stabCel;
@@ -2114,7 +2115,7 @@ void Ant::doAnt() {
 		buf = Amazon::ANTEAT;
 	} else {
 		buf = Amazon::ANTWALK;
-		if (_vm->_inventory->_inv[76]._value == ITEM_IN_INVENTORY)
+		if (_vm->_inventory->_inv[INV_TORCH]._value == ITEM_IN_INVENTORY)
 			// Player has burning torch, which scares the Ant
 			_antDirection = ANT_LEFT;
 	}
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index 36ae2af092..c4d2cc994d 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -29,6 +29,10 @@ namespace Access {
 
 namespace Amazon {
 
+enum InventoryEnum {
+	INV_BAITED_POLE = 67, INV_TORCH = 76, INV_KNIFE_SPEAR = 78
+};
+
 struct RiverStruct {
 	int _id;
 	int _width;
-- 
cgit v1.2.3


From e806c6333283ca33a52a2c3ed0f36779c7bc48d6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 18:37:31 -0500
Subject: ACCESS: Formatting fixes

---
 engines/access/amazon/amazon_logic.cpp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index ecc43f5b1e..98ab57b32e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -983,8 +983,7 @@ void Guard::setVerticalCode() {
 	else if (_topLeft.x == screen._orgX1) {
 		_gCode1 |= 8;
 		_gCode1 |= 2;
-	}
-	else
+	} else
 		_gCode1 |= 2;
 
 	if (_bottomRight.x < screen._orgX1)
@@ -992,8 +991,7 @@ void Guard::setVerticalCode() {
 	else if (_bottomRight.x == screen._orgX1) {
 		_gCode2 |= 8;
 		_gCode2 |= 2;
-	}
-	else
+	} else
 		_gCode2 |= 2;
 
 	if (_topLeft.y < screen._orgY1)
@@ -1018,8 +1016,7 @@ void Guard::setHorizontalCode() {
 	else if (_topLeft.x == screen._orgX1) {
 		_gCode1 |= 4;
 		_gCode1 |= 1;
-	}
-	else
+	} else
 		_gCode1 |= 1;
 
 	if (_bottomRight.y < screen._orgY1)
@@ -1027,8 +1024,7 @@ void Guard::setHorizontalCode() {
 	else if (_bottomRight.x == screen._orgX1) {
 		_gCode2 |= 4;
 		_gCode2 |= 1;
-	}
-	else
+	} else
 		_gCode2 |= 1;
 
 	if (_topLeft.x < screen._orgX1)
@@ -1155,8 +1151,7 @@ void Guard::guardSee() {
 			chkVLine();
 			if (_vm->_guardFind == 0)
 				return;
-		}
-		else if (screen._orgY1 == screen._orgY2) {
+		} else if (screen._orgY1 == screen._orgY2) {
 			chkHLine();
 			if (_vm->_guardFind == 0)
 				return;
@@ -1804,8 +1799,7 @@ void River::mWhileDownRiver() {
 		if (!_vm->_timers[3]._flag) {
 			++_vm->_timers[3]._flag;
 			_vm->_sound->playSound(1);
-		}
-		else if (!_vm->_timers[4]._flag) {
+		} else if (!_vm->_timers[4]._flag) {
 			++_vm->_timers[4]._flag;
 			_vm->_sound->playSound(0);
 		}
@@ -1986,8 +1980,7 @@ void Ant::plotPit(int indx, const int *&buf) {
 			idx = 0;
 		_torchCel = idx;
 		plotTorchSpear(idx, buf);
-	}
-	else if (!_stabFl && (_vm->_inventory->_inv[INV_KNIFE_SPEAR]._value == ITEM_IN_INVENTORY)) {
+	} else if (!_stabFl && (_vm->_inventory->_inv[INV_KNIFE_SPEAR]._value == ITEM_IN_INVENTORY)) {
 		// Player has spear
 		idx = 0;
 		buf = Amazon::SPEAR;
-- 
cgit v1.2.3


From 0e4a4a28ad57e7b9698baff4b42b398d345e8a24 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Dec 2014 21:33:14 -0500
Subject: ACCESS: Fix distortion occurring at left edge of jungle scrolling in
 introduction

---
 engines/access/amazon/amazon_logic.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 98ab57b32e..eb7d8b567d 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -405,6 +405,8 @@ void Opening::doTitle() {
 		_vm->_midi->setLoop(false);
 		_vm->_events->zeroKeys();
 	}
+
+	_vm->_buffer1.create(_vm->_screen->w + TILE_WIDTH, _vm->_screen->h);
 	_vm->_room->loadRoom(0);
 	screen.clearScreen();
 	screen.setBufferScan();
-- 
cgit v1.2.3


From 8120cbfde316ce344d11bcdfac18222414965d8a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 15 Dec 2014 19:48:02 +0100
Subject: ACCESS: Remove extra qualification stupidly accepted by MSVC

---
 engines/access/events.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/events.h b/engines/access/events.h
index fd3adf8797..3fdcf12136 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -85,12 +85,12 @@ public:
 	/**
 	 * Sets the cursor and reset the normal cursor
 	 */
-	void EventsManager::forceSetCursor(CursorType cursorId);
+	void forceSetCursor(CursorType cursorId);
 
 	/**
 	 * Sets the normal cursor
 	 */
-	void EventsManager::setNormalCursor(CursorType cursorId);
+	void setNormalCursor(CursorType cursorId);
 
 	/**
 	 * Sets the cursor
-- 
cgit v1.2.3


From 409ce79a35131d8538e3100e499366e43ae15d02 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 13 Dec 2014 03:42:07 +0200
Subject: ZVISION: Rename RlfAnimation -> RLFDecoder

---
 engines/zvision/animation/meta_animation.cpp |  2 +-
 engines/zvision/animation/meta_animation.h   |  4 ++--
 engines/zvision/animation/rlf_animation.cpp  | 26 +++++++++++++-------------
 engines/zvision/animation/rlf_animation.h    | 10 +++++-----
 engines/zvision/zvision.h                    |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
index 857a0dd688..5a8dba6b9d 100644
--- a/engines/zvision/animation/meta_animation.cpp
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -44,7 +44,7 @@ MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
 	if (tmpFileName.hasSuffix(".rlf")) {
 		_fileType = RLF;
 		Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
-		_animation.rlf = new RlfAnimation(_file, false);
+		_animation.rlf = new RLFDecoder(_file, false);
 		_frmDelay = _animation.rlf->frameTime();
 	} else if (tmpFileName.hasSuffix(".avi")) {
 		_fileType = AVI;
diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h
index 93b69587c4..6d2025b2cf 100644
--- a/engines/zvision/animation/meta_animation.h
+++ b/engines/zvision/animation/meta_animation.h
@@ -43,7 +43,7 @@ struct Surface;
 namespace ZVision {
 
 class ZVision;
-class RlfAnimation;
+class RLFDecoder;
 
 class MetaAnimation {
 public:
@@ -69,7 +69,7 @@ private:
 
 private:
 	union {
-		RlfAnimation *rlf;
+		RLFDecoder *rlf;
 		Video::VideoDecoder *avi;
 	} _animation;
 
diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
index d9b8fa3894..eaf08a79f9 100644
--- a/engines/zvision/animation/rlf_animation.cpp
+++ b/engines/zvision/animation/rlf_animation.cpp
@@ -34,7 +34,7 @@
 
 namespace ZVision {
 
-RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
+RLFDecoder::RLFDecoder(const Common::String &fileName, bool stream)
 	: _stream(stream),
 	  _readStream(NULL),
 	  _lastFrameRead(0),
@@ -72,7 +72,7 @@ RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 	}
 }
 
-RlfAnimation::RlfAnimation(Common::SeekableReadStream *rstream, bool stream)
+RLFDecoder::RLFDecoder(Common::SeekableReadStream *rstream, bool stream)
 	: _stream(stream),
 	  _readStream(rstream),
 	  _lastFrameRead(0),
@@ -102,7 +102,7 @@ RlfAnimation::RlfAnimation(Common::SeekableReadStream *rstream, bool stream)
 	}
 }
 
-RlfAnimation::~RlfAnimation() {
+RLFDecoder::~RLFDecoder() {
 	for (uint i = 0; i < _frameCount; ++i) {
 		delete[] _frames[i].encodedData;
 	}
@@ -111,7 +111,7 @@ RlfAnimation::~RlfAnimation() {
 	_currentFrameBuffer.free();
 }
 
-bool RlfAnimation::readHeader() {
+bool RLFDecoder::readHeader() {
 	if (_readStream->readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
 		return false;
 	}
@@ -160,8 +160,8 @@ bool RlfAnimation::readHeader() {
 	return true;
 }
 
-RlfAnimation::Frame RlfAnimation::readNextFrame() {
-	RlfAnimation::Frame frame;
+RLFDecoder::Frame RLFDecoder::readNextFrame() {
+	RLFDecoder::Frame frame;
 
 	_readStream->readUint32BE();                        // Magic number MARF
 	uint32 size = _readStream->readUint32LE();          // Size
@@ -188,7 +188,7 @@ RlfAnimation::Frame RlfAnimation::readNextFrame() {
 	return frame;
 }
 
-void RlfAnimation::seekToFrame(int frameNumber) {
+void RLFDecoder::seekToFrame(int frameNumber) {
 	assert(!_stream);
 	assert(frameNumber < (int)_frameCount || frameNumber >= -1);
 
@@ -228,7 +228,7 @@ void RlfAnimation::seekToFrame(int frameNumber) {
 	_nextFrame = frameNumber;
 }
 
-const Graphics::Surface *RlfAnimation::getFrameData(uint frameNumber) {
+const Graphics::Surface *RLFDecoder::getFrameData(uint frameNumber) {
 	assert(!_stream);
 	assert(frameNumber < _frameCount);
 
@@ -244,7 +244,7 @@ const Graphics::Surface *RlfAnimation::getFrameData(uint frameNumber) {
 	return decodeNextFrame();
 }
 
-const Graphics::Surface *RlfAnimation::decodeNextFrame() {
+const Graphics::Surface *RLFDecoder::decodeNextFrame() {
 	assert(_nextFrame < (int)_frameCount);
 
 	if (_stream) {
@@ -257,7 +257,7 @@ const Graphics::Surface *RlfAnimation::decodeNextFrame() {
 	return &_currentFrameBuffer;
 }
 
-void RlfAnimation::applyFrameToCurrent(uint frameNumber) {
+void RLFDecoder::applyFrameToCurrent(uint frameNumber) {
 	if (_frames[frameNumber].type == Masked) {
 		decodeMaskedRunLengthEncoding(_frames[frameNumber].encodedData, (int8 *)_currentFrameBuffer.getPixels(), _frames[frameNumber].encodedSize, _frameBufferByteSize);
 	} else if (_frames[frameNumber].type == Simple) {
@@ -265,7 +265,7 @@ void RlfAnimation::applyFrameToCurrent(uint frameNumber) {
 	}
 }
 
-void RlfAnimation::applyFrameToCurrent(const RlfAnimation::Frame &frame) {
+void RLFDecoder::applyFrameToCurrent(const RLFDecoder::Frame &frame) {
 	if (frame.type == Masked) {
 		decodeMaskedRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
 	} else if (frame.type == Simple) {
@@ -273,7 +273,7 @@ void RlfAnimation::applyFrameToCurrent(const RlfAnimation::Frame &frame) {
 	}
 }
 
-void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
+void RLFDecoder::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
 	uint32 sourceOffset = 0;
 	uint32 destOffset = 0;
 	int16 numberOfCopy = 0;
@@ -320,7 +320,7 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3
 	}
 }
 
-void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
+void RLFDecoder::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
 	uint32 sourceOffset = 0;
 	uint32 destOffset = 0;
 	int16 numberOfCopy = 0;
diff --git a/engines/zvision/animation/rlf_animation.h b/engines/zvision/animation/rlf_animation.h
index c8b2930676..62fa6099bf 100644
--- a/engines/zvision/animation/rlf_animation.h
+++ b/engines/zvision/animation/rlf_animation.h
@@ -33,11 +33,11 @@ class String;
 
 namespace ZVision {
 
-class RlfAnimation {
+class RLFDecoder {
 public:
-	RlfAnimation(const Common::String &fileName, bool stream = true);
-	RlfAnimation(Common::SeekableReadStream *rstream, bool stream);
-	~RlfAnimation();
+	RLFDecoder(const Common::String &fileName, bool stream = true);
+	RLFDecoder(Common::SeekableReadStream *rstream, bool stream);
+	~RLFDecoder();
 
 private:
 	enum EncodingType {
@@ -143,7 +143,7 @@ private:
 	 *
 	 * @param frame    A Frame object to apply to _currentFrameBuffer
 	 */
-	void applyFrameToCurrent(const RlfAnimation::Frame &frame);
+	void applyFrameToCurrent(const RLFDecoder::Frame &frame);
 
 	/**
 	 * Decode frame data that uses masked run length encoding. This is the encoding
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 5850bf66cd..891f9a9a0f 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -50,7 +50,7 @@ class RenderManager;
 class CursorManager;
 class StringManager;
 class SaveManager;
-class RlfAnimation;
+class RLFDecoder;
 class MenuHandler;
 class TextRenderer;
 class Subtitle;
-- 
cgit v1.2.3


From 3315522ba1607d68c3402f3d1c8b51b7dc38a7dd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 13 Dec 2014 15:28:22 +0200
Subject: ZVISION: Move the RLF decoder

---
 engines/zvision/animation/meta_animation.cpp |   2 +-
 engines/zvision/animation/rlf_animation.cpp  | 382 ---------------------------
 engines/zvision/animation/rlf_animation.h    | 172 ------------
 engines/zvision/core/events.cpp              |   1 -
 engines/zvision/module.mk                    |   2 +-
 engines/zvision/video/rlf_decoder.cpp        | 382 +++++++++++++++++++++++++++
 engines/zvision/video/rlf_decoder.h          | 172 ++++++++++++
 7 files changed, 556 insertions(+), 557 deletions(-)
 delete mode 100644 engines/zvision/animation/rlf_animation.cpp
 delete mode 100644 engines/zvision/animation/rlf_animation.h
 create mode 100644 engines/zvision/video/rlf_decoder.cpp
 create mode 100644 engines/zvision/video/rlf_decoder.h

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
index 5a8dba6b9d..85b2e0f6b7 100644
--- a/engines/zvision/animation/meta_animation.cpp
+++ b/engines/zvision/animation/meta_animation.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/animation/rlf_animation.h"
+#include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
 
 #include "video/video_decoder.h"
diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
deleted file mode 100644
index eaf08a79f9..0000000000
--- a/engines/zvision/animation/rlf_animation.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-#include "common/scummsys.h"
-
-#include "zvision/animation/rlf_animation.h"
-
-#include "common/str.h"
-#include "common/file.h"
-#include "common/textconsole.h"
-#include "common/debug.h"
-#include "common/endian.h"
-
-#include "graphics/colormasks.h"
-
-namespace ZVision {
-
-RLFDecoder::RLFDecoder(const Common::String &fileName, bool stream)
-	: _stream(stream),
-	  _readStream(NULL),
-	  _lastFrameRead(0),
-	  _frameCount(0),
-	  _width(0),
-	  _height(0),
-	  _frameTime(0),
-	  _frames(0),
-	  _nextFrame(0),
-	  _frameBufferByteSize(0) {
-
-	Common::File *_file = new Common::File;
-	if (!_file->open(fileName)) {
-		warning("RLF animation file %s could not be opened", fileName.c_str());
-		return;
-	}
-
-	_readStream = _file;
-
-	if (!readHeader()) {
-		warning("%s is not a RLF animation file. Wrong magic number", fileName.c_str());
-		return;
-	}
-
-	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
-	_frameBufferByteSize = _width * _height * sizeof(uint16);
-
-	if (!stream) {
-		_frames = new Frame[_frameCount];
-
-		// Read in each frame
-		for (uint i = 0; i < _frameCount; ++i) {
-			_frames[i] = readNextFrame();
-		}
-	}
-}
-
-RLFDecoder::RLFDecoder(Common::SeekableReadStream *rstream, bool stream)
-	: _stream(stream),
-	  _readStream(rstream),
-	  _lastFrameRead(0),
-	  _frameCount(0),
-	  _width(0),
-	  _height(0),
-	  _frameTime(0),
-	  _frames(0),
-	  _nextFrame(0),
-	  _frameBufferByteSize(0) {
-
-	if (!readHeader()) {
-		warning("Stream is not a RLF animation. Wrong magic number");
-		return;
-	}
-
-	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
-	_frameBufferByteSize = _width * _height * sizeof(uint16);
-
-	if (!stream) {
-		_frames = new Frame[_frameCount];
-
-		// Read in each frame
-		for (uint i = 0; i < _frameCount; ++i) {
-			_frames[i] = readNextFrame();
-		}
-	}
-}
-
-RLFDecoder::~RLFDecoder() {
-	for (uint i = 0; i < _frameCount; ++i) {
-		delete[] _frames[i].encodedData;
-	}
-	delete[] _frames;
-	delete _readStream;
-	_currentFrameBuffer.free();
-}
-
-bool RLFDecoder::readHeader() {
-	if (_readStream->readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
-		return false;
-	}
-
-	// Read the header
-	_readStream->readUint32LE();                // Size1
-	_readStream->readUint32LE();                // Unknown1
-	_readStream->readUint32LE();                // Unknown2
-	_frameCount = _readStream->readUint32LE();  // Frame count
-
-	// Since we don't need any of the data, we can just seek right to the
-	// entries we need rather than read in all the individual entries.
-	_readStream->seek(136, SEEK_CUR);
-
-	//// Read CIN header
-	//_readStream->readUint32BE();          // Magic number FNIC
-	//_readStream->readUint32LE();          // Size2
-	//_readStream->readUint32LE();          // Unknown3
-	//_readStream->readUint32LE();          // Unknown4
-	//_readStream->readUint32LE();          // Unknown5
-	//_readStream->seek(0x18, SEEK_CUR);    // VRLE
-	//_readStream->readUint32LE();          // LRVD
-	//_readStream->readUint32LE();          // Unknown6
-	//_readStream->seek(0x18, SEEK_CUR);    // HRLE
-	//_readStream->readUint32LE();          // ELHD
-	//_readStream->readUint32LE();          // Unknown7
-	//_readStream->seek(0x18, SEEK_CUR);    // HKEY
-	//_readStream->readUint32LE();          // ELRH
-
-	//// Read MIN info header
-	//_readStream->readUint32BE();          // Magic number FNIM
-	//_readStream->readUint32LE();          // Size3
-	//_readStream->readUint32LE();          // OEDV
-	//_readStream->readUint32LE();          // Unknown8
-	//_readStream->readUint32LE();          // Unknown9
-	//_readStream->readUint32LE();          // Unknown10
-	_width = _readStream->readUint32LE();   // Width
-	_height = _readStream->readUint32LE();  // Height
-
-	// Read time header
-	_readStream->readUint32BE();                    // Magic number EMIT
-	_readStream->readUint32LE();                    // Size4
-	_readStream->readUint32LE();                    // Unknown11
-	_frameTime = _readStream->readUint32LE() / 10;  // Frame time in microseconds
-
-	return true;
-}
-
-RLFDecoder::Frame RLFDecoder::readNextFrame() {
-	RLFDecoder::Frame frame;
-
-	_readStream->readUint32BE();                        // Magic number MARF
-	uint32 size = _readStream->readUint32LE();          // Size
-	_readStream->readUint32LE();                        // Unknown1
-	_readStream->readUint32LE();                        // Unknown2
-	uint32 type = _readStream->readUint32BE();          // Either ELHD or ELRH
-	uint32 headerSize = _readStream->readUint32LE();    // Offset from the beginning of this frame to the frame data. Should always be 28
-	_readStream->readUint32LE();                        // Unknown3
-
-	frame.encodedSize = size - headerSize;
-	frame.encodedData = new int8[frame.encodedSize];
-	_readStream->read(frame.encodedData, frame.encodedSize);
-
-	if (type == MKTAG('E', 'L', 'H', 'D')) {
-		frame.type = Masked;
-	} else if (type == MKTAG('E', 'L', 'R', 'H')) {
-		frame.type = Simple;
-		_completeFrames.push_back(_lastFrameRead);
-	} else {
-		warning("Frame %u doesn't have type that can be decoded", _lastFrameRead);
-	}
-
-	_lastFrameRead++;
-	return frame;
-}
-
-void RLFDecoder::seekToFrame(int frameNumber) {
-	assert(!_stream);
-	assert(frameNumber < (int)_frameCount || frameNumber >= -1);
-
-	if (_nextFrame == frameNumber)
-		return;
-
-	if (frameNumber < 0) {
-		_nextFrame = 0;
-		return;
-	}
-
-	int closestFrame = _nextFrame;
-	int distance = (int)frameNumber - _nextFrame;
-
-	if (distance < 0) {
-		for (uint i = 0; i < _completeFrames.size(); ++i) {
-			if ((int)_completeFrames[i] > frameNumber)
-				break;
-			closestFrame = _completeFrames[i];
-		}
-	} else {
-		for (uint i = 0; i < _completeFrames.size(); ++i) {
-			int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
-			if (newDistance < 0)
-				break;
-			if (newDistance < distance) {
-				closestFrame = _completeFrames[i];
-				distance = newDistance;
-			}
-		}
-	}
-
-	for (int i = closestFrame; i < frameNumber; ++i) {
-		applyFrameToCurrent(i);
-	}
-
-	_nextFrame = frameNumber;
-}
-
-const Graphics::Surface *RLFDecoder::getFrameData(uint frameNumber) {
-	assert(!_stream);
-	assert(frameNumber < _frameCount);
-
-	// Since this method is so expensive, first check to see if we can use
-	// decodeNextFrame() it's cheap.
-	if ((int)frameNumber == _nextFrame - 1) {
-		return &_currentFrameBuffer;
-	} else if (_nextFrame == (int)frameNumber) {
-		return decodeNextFrame();
-	}
-
-	seekToFrame(frameNumber);
-	return decodeNextFrame();
-}
-
-const Graphics::Surface *RLFDecoder::decodeNextFrame() {
-	assert(_nextFrame < (int)_frameCount);
-
-	if (_stream) {
-		applyFrameToCurrent(readNextFrame());
-	} else {
-		applyFrameToCurrent(_nextFrame);
-	}
-
-	_nextFrame++;
-	return &_currentFrameBuffer;
-}
-
-void RLFDecoder::applyFrameToCurrent(uint frameNumber) {
-	if (_frames[frameNumber].type == Masked) {
-		decodeMaskedRunLengthEncoding(_frames[frameNumber].encodedData, (int8 *)_currentFrameBuffer.getPixels(), _frames[frameNumber].encodedSize, _frameBufferByteSize);
-	} else if (_frames[frameNumber].type == Simple) {
-		decodeSimpleRunLengthEncoding(_frames[frameNumber].encodedData, (int8 *)_currentFrameBuffer.getPixels(), _frames[frameNumber].encodedSize, _frameBufferByteSize);
-	}
-}
-
-void RLFDecoder::applyFrameToCurrent(const RLFDecoder::Frame &frame) {
-	if (frame.type == Masked) {
-		decodeMaskedRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
-	} else if (frame.type == Simple) {
-		decodeSimpleRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
-	}
-}
-
-void RLFDecoder::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
-	uint32 sourceOffset = 0;
-	uint32 destOffset = 0;
-	int16 numberOfCopy = 0;
-
-	while (sourceOffset < sourceSize) {
-		int8 numberOfSamples = source[sourceOffset];
-		sourceOffset++;
-
-		// If numberOfSamples is negative, the next abs(numberOfSamples) samples should
-		// be copied directly from source to dest
-		if (numberOfSamples < 0) {
-			numberOfCopy = -numberOfSamples;
-
-			while (numberOfCopy > 0) {
-				if (sourceOffset + 1 >= sourceSize) {
-					return;
-				} else if (destOffset + 1 >= destSize) {
-					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
-					return;
-				}
-
-				byte r, g, b;
-				Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
-				uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
-				WRITE_UINT16(dest + destOffset, destColor);
-
-				sourceOffset += 2;
-				destOffset += 2;
-				numberOfCopy--;
-			}
-
-			// If numberOfSamples is >= 0, move destOffset forward ((numberOfSamples * 2) + 2)
-			// This function assumes the dest buffer has been memset with 0's.
-		} else {
-			if (sourceOffset + 1 >= sourceSize) {
-				return;
-			} else if (destOffset + 1 >= destSize) {
-				debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
-				return;
-			}
-
-			destOffset += (numberOfSamples * 2) + 2;
-		}
-	}
-}
-
-void RLFDecoder::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
-	uint32 sourceOffset = 0;
-	uint32 destOffset = 0;
-	int16 numberOfCopy = 0;
-
-	while (sourceOffset < sourceSize) {
-		int8 numberOfSamples = source[sourceOffset];
-		sourceOffset++;
-
-		// If numberOfSamples is negative, the next abs(numberOfSamples) samples should
-		// be copied directly from source to dest
-		if (numberOfSamples < 0) {
-			numberOfCopy = -numberOfSamples;
-
-			while (numberOfCopy > 0) {
-				if (sourceOffset + 1 >= sourceSize) {
-					return;
-				} else if (destOffset + 1 >= destSize) {
-					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
-					return;
-				}
-
-				byte r, g, b;
-				Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
-				uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
-				WRITE_UINT16(dest + destOffset, destColor);
-
-				sourceOffset += 2;
-				destOffset += 2;
-				numberOfCopy--;
-			}
-
-			// If numberOfSamples is >= 0, copy one sample from source to the
-			// next (numberOfSamples + 2) dest spots
-		} else {
-			if (sourceOffset + 1 >= sourceSize) {
-				return;
-			}
-
-			byte r, g, b;
-			Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
-			uint16 sampleColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
-			sourceOffset += 2;
-
-			numberOfCopy = numberOfSamples + 2;
-			while (numberOfCopy > 0) {
-				if (destOffset + 1 >= destSize) {
-					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
-					return;
-				}
-
-				WRITE_UINT16(dest + destOffset, sampleColor);
-				destOffset += 2;
-				numberOfCopy--;
-			}
-		}
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/animation/rlf_animation.h b/engines/zvision/animation/rlf_animation.h
deleted file mode 100644
index 62fa6099bf..0000000000
--- a/engines/zvision/animation/rlf_animation.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_RLF_ANIMATION_H
-#define ZVISION_RLF_ANIMATION_H
-
-#include "common/file.h"
-
-#include "graphics/surface.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-class RLFDecoder {
-public:
-	RLFDecoder(const Common::String &fileName, bool stream = true);
-	RLFDecoder(Common::SeekableReadStream *rstream, bool stream);
-	~RLFDecoder();
-
-private:
-	enum EncodingType {
-		Masked,
-		Simple
-	};
-
-	struct Frame {
-		EncodingType type;
-		int8 *encodedData;
-		uint32 encodedSize;
-	};
-
-private:
-	Common::SeekableReadStream *_readStream;
-	bool _stream;
-	uint _lastFrameRead;
-
-	uint _frameCount;
-	uint _width;
-	uint _height;
-	uint32 _frameTime; // In milliseconds
-	Frame *_frames;
-	Common::Array<uint> _completeFrames;
-
-	int _nextFrame;
-	Graphics::Surface _currentFrameBuffer;
-	uint32 _frameBufferByteSize;
-
-public:
-	uint frameCount() {
-		return _frameCount;
-	}
-	uint width() {
-		return _width;
-	}
-	uint height() {
-		return _height;
-	}
-	uint32 frameTime() {
-		return _frameTime;
-	}
-
-	/**
-	 * Seeks to the frameNumber and updates the internal Surface with
-	 * the new frame data. If frameNumber == -1, it only sets _currentFrame,
-	 * the internal Surface is unchanged. This function requires _stream = false
-	 *
-	 * @param frameNumber    The frame number to seek to
-	 */
-	void seekToFrame(int frameNumber);
-
-	/**
-	 * Returns the pixel data of the frame specified. It will try to use
-	 * decodeNextFrame() if possible. If not, it uses seekToFrame() to
-	 * update the internal Surface and then returns a pointer to it.
-	 * This function requires _stream = false
-	 *
-	 * @param frameNumber    The frame number to get data for
-	 * @return               A pointer to the pixel data. Do NOT delete this.
-	 */
-	const Graphics::Surface *getFrameData(uint frameNumber);
-	/**
-	 * Returns the pixel data of current frame and go to next. It is up to the user to
-	 * check if the current frame is valid before calling this.
-	 * IE. Use endOfAnimation()
-	 *
-	 * @return    A pointer to the pixel data. Do NOT delete this.
-	 */
-	const Graphics::Surface *decodeNextFrame();
-	/**
-	 * @return Is the currentFrame is the last frame in the animation?
-	 */
-	bool endOfAnimation() {
-		return _nextFrame == (int)_frameCount;
-	}
-
-private:
-	/**
-	 * Reads in the header of the RLF file
-	 *
-	 * @return    Will return false if the header magic number is wrong
-	 */
-	bool readHeader();
-	/**
-	 * Reads the next frame from the RLF file, stores the data in
-	 * a Frame object, then returns the object
-	 *
-	 * @return    A Frame object representing the frame data
-	 */
-	Frame readNextFrame();
-
-	/**
-	 * Applies the frame corresponding to frameNumber on top of _currentFrameBuffer.
-	 * This function requires _stream = false so it can look up the Frame object
-	 * referenced by frameNumber.
-	 *
-	 * @param frameNumber    The frame number to apply to _currentFrameBuffer
-	 */
-	void applyFrameToCurrent(uint frameNumber);
-	/**
-	 * Applies the data from a Frame object on top of a _currentFrameBuffer.
-	 *
-	 * @param frame    A Frame object to apply to _currentFrameBuffer
-	 */
-	void applyFrameToCurrent(const RLFDecoder::Frame &frame);
-
-	/**
-	 * Decode frame data that uses masked run length encoding. This is the encoding
-	 * used by P-frames.
-	 *
-	 * @param source        The source pixel data
-	 * @param dest          The destination buffer
-	 * @param sourceSize    The size of the source pixel data
-	 * @param destSize      The size of the destination buffer
-	 */
-	void decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
-	/**
-	 * Decode frame data that uses simple run length encoding. This is the encoding
-	 * used by I-frames.
-	 *
-	 * @param source        The source pixel data
-	 * @param dest          The destination buffer
-	 * @param sourceSize    The size of the source pixel data
-	 * @param destSize      The size of the destination buffer
-	 */
-	void decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 52d71c92f6..839f919ad6 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -28,7 +28,6 @@
 #include "zvision/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/animation/rlf_animation.h"
 #include "zvision/core/menu.h"
 #include "zvision/sound/zork_raw.h"
 
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 045eb5264a..5c2fd2045b 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -2,7 +2,6 @@ MODULE := engines/zvision
 
 MODULE_OBJS := \
 	animation/meta_animation.o \
-	animation/rlf_animation.o \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
@@ -48,6 +47,7 @@ MODULE_OBJS := \
 	utility/lzss_read_stream.o \
 	utility/utility.o \
 	utility/zfs_archive.o \
+	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o
diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
new file mode 100644
index 0000000000..a4f16af9b0
--- /dev/null
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -0,0 +1,382 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "common/scummsys.h"
+
+#include "zvision/video/rlf_decoder.h"
+
+#include "common/str.h"
+#include "common/file.h"
+#include "common/textconsole.h"
+#include "common/debug.h"
+#include "common/endian.h"
+
+#include "graphics/colormasks.h"
+
+namespace ZVision {
+
+RLFDecoder::RLFDecoder(const Common::String &fileName, bool stream)
+	: _stream(stream),
+	  _readStream(NULL),
+	  _lastFrameRead(0),
+	  _frameCount(0),
+	  _width(0),
+	  _height(0),
+	  _frameTime(0),
+	  _frames(0),
+	  _nextFrame(0),
+	  _frameBufferByteSize(0) {
+
+	Common::File *_file = new Common::File;
+	if (!_file->open(fileName)) {
+		warning("RLF animation file %s could not be opened", fileName.c_str());
+		return;
+	}
+
+	_readStream = _file;
+
+	if (!readHeader()) {
+		warning("%s is not a RLF animation file. Wrong magic number", fileName.c_str());
+		return;
+	}
+
+	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
+	_frameBufferByteSize = _width * _height * sizeof(uint16);
+
+	if (!stream) {
+		_frames = new Frame[_frameCount];
+
+		// Read in each frame
+		for (uint i = 0; i < _frameCount; ++i) {
+			_frames[i] = readNextFrame();
+		}
+	}
+}
+
+RLFDecoder::RLFDecoder(Common::SeekableReadStream *rstream, bool stream)
+	: _stream(stream),
+	  _readStream(rstream),
+	  _lastFrameRead(0),
+	  _frameCount(0),
+	  _width(0),
+	  _height(0),
+	  _frameTime(0),
+	  _frames(0),
+	  _nextFrame(0),
+	  _frameBufferByteSize(0) {
+
+	if (!readHeader()) {
+		warning("Stream is not a RLF animation. Wrong magic number");
+		return;
+	}
+
+	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
+	_frameBufferByteSize = _width * _height * sizeof(uint16);
+
+	if (!stream) {
+		_frames = new Frame[_frameCount];
+
+		// Read in each frame
+		for (uint i = 0; i < _frameCount; ++i) {
+			_frames[i] = readNextFrame();
+		}
+	}
+}
+
+RLFDecoder::~RLFDecoder() {
+	for (uint i = 0; i < _frameCount; ++i) {
+		delete[] _frames[i].encodedData;
+	}
+	delete[] _frames;
+	delete _readStream;
+	_currentFrameBuffer.free();
+}
+
+bool RLFDecoder::readHeader() {
+	if (_readStream->readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
+		return false;
+	}
+
+	// Read the header
+	_readStream->readUint32LE();                // Size1
+	_readStream->readUint32LE();                // Unknown1
+	_readStream->readUint32LE();                // Unknown2
+	_frameCount = _readStream->readUint32LE();  // Frame count
+
+	// Since we don't need any of the data, we can just seek right to the
+	// entries we need rather than read in all the individual entries.
+	_readStream->seek(136, SEEK_CUR);
+
+	//// Read CIN header
+	//_readStream->readUint32BE();          // Magic number FNIC
+	//_readStream->readUint32LE();          // Size2
+	//_readStream->readUint32LE();          // Unknown3
+	//_readStream->readUint32LE();          // Unknown4
+	//_readStream->readUint32LE();          // Unknown5
+	//_readStream->seek(0x18, SEEK_CUR);    // VRLE
+	//_readStream->readUint32LE();          // LRVD
+	//_readStream->readUint32LE();          // Unknown6
+	//_readStream->seek(0x18, SEEK_CUR);    // HRLE
+	//_readStream->readUint32LE();          // ELHD
+	//_readStream->readUint32LE();          // Unknown7
+	//_readStream->seek(0x18, SEEK_CUR);    // HKEY
+	//_readStream->readUint32LE();          // ELRH
+
+	//// Read MIN info header
+	//_readStream->readUint32BE();          // Magic number FNIM
+	//_readStream->readUint32LE();          // Size3
+	//_readStream->readUint32LE();          // OEDV
+	//_readStream->readUint32LE();          // Unknown8
+	//_readStream->readUint32LE();          // Unknown9
+	//_readStream->readUint32LE();          // Unknown10
+	_width = _readStream->readUint32LE();   // Width
+	_height = _readStream->readUint32LE();  // Height
+
+	// Read time header
+	_readStream->readUint32BE();                    // Magic number EMIT
+	_readStream->readUint32LE();                    // Size4
+	_readStream->readUint32LE();                    // Unknown11
+	_frameTime = _readStream->readUint32LE() / 10;  // Frame time in microseconds
+
+	return true;
+}
+
+RLFDecoder::Frame RLFDecoder::readNextFrame() {
+	RLFDecoder::Frame frame;
+
+	_readStream->readUint32BE();                        // Magic number MARF
+	uint32 size = _readStream->readUint32LE();          // Size
+	_readStream->readUint32LE();                        // Unknown1
+	_readStream->readUint32LE();                        // Unknown2
+	uint32 type = _readStream->readUint32BE();          // Either ELHD or ELRH
+	uint32 headerSize = _readStream->readUint32LE();    // Offset from the beginning of this frame to the frame data. Should always be 28
+	_readStream->readUint32LE();                        // Unknown3
+
+	frame.encodedSize = size - headerSize;
+	frame.encodedData = new int8[frame.encodedSize];
+	_readStream->read(frame.encodedData, frame.encodedSize);
+
+	if (type == MKTAG('E', 'L', 'H', 'D')) {
+		frame.type = Masked;
+	} else if (type == MKTAG('E', 'L', 'R', 'H')) {
+		frame.type = Simple;
+		_completeFrames.push_back(_lastFrameRead);
+	} else {
+		warning("Frame %u doesn't have type that can be decoded", _lastFrameRead);
+	}
+
+	_lastFrameRead++;
+	return frame;
+}
+
+void RLFDecoder::seekToFrame(int frameNumber) {
+	assert(!_stream);
+	assert(frameNumber < (int)_frameCount || frameNumber >= -1);
+
+	if (_nextFrame == frameNumber)
+		return;
+
+	if (frameNumber < 0) {
+		_nextFrame = 0;
+		return;
+	}
+
+	int closestFrame = _nextFrame;
+	int distance = (int)frameNumber - _nextFrame;
+
+	if (distance < 0) {
+		for (uint i = 0; i < _completeFrames.size(); ++i) {
+			if ((int)_completeFrames[i] > frameNumber)
+				break;
+			closestFrame = _completeFrames[i];
+		}
+	} else {
+		for (uint i = 0; i < _completeFrames.size(); ++i) {
+			int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
+			if (newDistance < 0)
+				break;
+			if (newDistance < distance) {
+				closestFrame = _completeFrames[i];
+				distance = newDistance;
+			}
+		}
+	}
+
+	for (int i = closestFrame; i < frameNumber; ++i) {
+		applyFrameToCurrent(i);
+	}
+
+	_nextFrame = frameNumber;
+}
+
+const Graphics::Surface *RLFDecoder::getFrameData(uint frameNumber) {
+	assert(!_stream);
+	assert(frameNumber < _frameCount);
+
+	// Since this method is so expensive, first check to see if we can use
+	// decodeNextFrame() it's cheap.
+	if ((int)frameNumber == _nextFrame - 1) {
+		return &_currentFrameBuffer;
+	} else if (_nextFrame == (int)frameNumber) {
+		return decodeNextFrame();
+	}
+
+	seekToFrame(frameNumber);
+	return decodeNextFrame();
+}
+
+const Graphics::Surface *RLFDecoder::decodeNextFrame() {
+	assert(_nextFrame < (int)_frameCount);
+
+	if (_stream) {
+		applyFrameToCurrent(readNextFrame());
+	} else {
+		applyFrameToCurrent(_nextFrame);
+	}
+
+	_nextFrame++;
+	return &_currentFrameBuffer;
+}
+
+void RLFDecoder::applyFrameToCurrent(uint frameNumber) {
+	if (_frames[frameNumber].type == Masked) {
+		decodeMaskedRunLengthEncoding(_frames[frameNumber].encodedData, (int8 *)_currentFrameBuffer.getPixels(), _frames[frameNumber].encodedSize, _frameBufferByteSize);
+	} else if (_frames[frameNumber].type == Simple) {
+		decodeSimpleRunLengthEncoding(_frames[frameNumber].encodedData, (int8 *)_currentFrameBuffer.getPixels(), _frames[frameNumber].encodedSize, _frameBufferByteSize);
+	}
+}
+
+void RLFDecoder::applyFrameToCurrent(const RLFDecoder::Frame &frame) {
+	if (frame.type == Masked) {
+		decodeMaskedRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
+	} else if (frame.type == Simple) {
+		decodeSimpleRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
+	}
+}
+
+void RLFDecoder::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
+	uint32 sourceOffset = 0;
+	uint32 destOffset = 0;
+	int16 numberOfCopy = 0;
+
+	while (sourceOffset < sourceSize) {
+		int8 numberOfSamples = source[sourceOffset];
+		sourceOffset++;
+
+		// If numberOfSamples is negative, the next abs(numberOfSamples) samples should
+		// be copied directly from source to dest
+		if (numberOfSamples < 0) {
+			numberOfCopy = -numberOfSamples;
+
+			while (numberOfCopy > 0) {
+				if (sourceOffset + 1 >= sourceSize) {
+					return;
+				} else if (destOffset + 1 >= destSize) {
+					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
+					return;
+				}
+
+				byte r, g, b;
+				Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
+				uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+				WRITE_UINT16(dest + destOffset, destColor);
+
+				sourceOffset += 2;
+				destOffset += 2;
+				numberOfCopy--;
+			}
+
+			// If numberOfSamples is >= 0, move destOffset forward ((numberOfSamples * 2) + 2)
+			// This function assumes the dest buffer has been memset with 0's.
+		} else {
+			if (sourceOffset + 1 >= sourceSize) {
+				return;
+			} else if (destOffset + 1 >= destSize) {
+				debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
+				return;
+			}
+
+			destOffset += (numberOfSamples * 2) + 2;
+		}
+	}
+}
+
+void RLFDecoder::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
+	uint32 sourceOffset = 0;
+	uint32 destOffset = 0;
+	int16 numberOfCopy = 0;
+
+	while (sourceOffset < sourceSize) {
+		int8 numberOfSamples = source[sourceOffset];
+		sourceOffset++;
+
+		// If numberOfSamples is negative, the next abs(numberOfSamples) samples should
+		// be copied directly from source to dest
+		if (numberOfSamples < 0) {
+			numberOfCopy = -numberOfSamples;
+
+			while (numberOfCopy > 0) {
+				if (sourceOffset + 1 >= sourceSize) {
+					return;
+				} else if (destOffset + 1 >= destSize) {
+					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
+					return;
+				}
+
+				byte r, g, b;
+				Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
+				uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+				WRITE_UINT16(dest + destOffset, destColor);
+
+				sourceOffset += 2;
+				destOffset += 2;
+				numberOfCopy--;
+			}
+
+			// If numberOfSamples is >= 0, copy one sample from source to the
+			// next (numberOfSamples + 2) dest spots
+		} else {
+			if (sourceOffset + 1 >= sourceSize) {
+				return;
+			}
+
+			byte r, g, b;
+			Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
+			uint16 sampleColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+			sourceOffset += 2;
+
+			numberOfCopy = numberOfSamples + 2;
+			while (numberOfCopy > 0) {
+				if (destOffset + 1 >= destSize) {
+					debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize);
+					return;
+				}
+
+				WRITE_UINT16(dest + destOffset, sampleColor);
+				destOffset += 2;
+				numberOfCopy--;
+			}
+		}
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/video/rlf_decoder.h b/engines/zvision/video/rlf_decoder.h
new file mode 100644
index 0000000000..dcfd8606c2
--- /dev/null
+++ b/engines/zvision/video/rlf_decoder.h
@@ -0,0 +1,172 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_RLF_DECODER_H
+#define ZVISION_RLF_DECODER_H
+
+#include "common/file.h"
+
+#include "graphics/surface.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+
+class RLFDecoder {
+public:
+	RLFDecoder(const Common::String &fileName, bool stream = true);
+	RLFDecoder(Common::SeekableReadStream *rstream, bool stream);
+	~RLFDecoder();
+
+private:
+	enum EncodingType {
+		Masked,
+		Simple
+	};
+
+	struct Frame {
+		EncodingType type;
+		int8 *encodedData;
+		uint32 encodedSize;
+	};
+
+private:
+	Common::SeekableReadStream *_readStream;
+	bool _stream;
+	uint _lastFrameRead;
+
+	uint _frameCount;
+	uint _width;
+	uint _height;
+	uint32 _frameTime; // In milliseconds
+	Frame *_frames;
+	Common::Array<uint> _completeFrames;
+
+	int _nextFrame;
+	Graphics::Surface _currentFrameBuffer;
+	uint32 _frameBufferByteSize;
+
+public:
+	uint frameCount() {
+		return _frameCount;
+	}
+	uint width() {
+		return _width;
+	}
+	uint height() {
+		return _height;
+	}
+	uint32 frameTime() {
+		return _frameTime;
+	}
+
+	/**
+	 * Seeks to the frameNumber and updates the internal Surface with
+	 * the new frame data. If frameNumber == -1, it only sets _currentFrame,
+	 * the internal Surface is unchanged. This function requires _stream = false
+	 *
+	 * @param frameNumber    The frame number to seek to
+	 */
+	void seekToFrame(int frameNumber);
+
+	/**
+	 * Returns the pixel data of the frame specified. It will try to use
+	 * decodeNextFrame() if possible. If not, it uses seekToFrame() to
+	 * update the internal Surface and then returns a pointer to it.
+	 * This function requires _stream = false
+	 *
+	 * @param frameNumber    The frame number to get data for
+	 * @return               A pointer to the pixel data. Do NOT delete this.
+	 */
+	const Graphics::Surface *getFrameData(uint frameNumber);
+	/**
+	 * Returns the pixel data of current frame and go to next. It is up to the user to
+	 * check if the current frame is valid before calling this.
+	 * IE. Use endOfAnimation()
+	 *
+	 * @return    A pointer to the pixel data. Do NOT delete this.
+	 */
+	const Graphics::Surface *decodeNextFrame();
+	/**
+	 * @return Is the currentFrame is the last frame in the animation?
+	 */
+	bool endOfAnimation() {
+		return _nextFrame == (int)_frameCount;
+	}
+
+private:
+	/**
+	 * Reads in the header of the RLF file
+	 *
+	 * @return    Will return false if the header magic number is wrong
+	 */
+	bool readHeader();
+	/**
+	 * Reads the next frame from the RLF file, stores the data in
+	 * a Frame object, then returns the object
+	 *
+	 * @return    A Frame object representing the frame data
+	 */
+	Frame readNextFrame();
+
+	/**
+	 * Applies the frame corresponding to frameNumber on top of _currentFrameBuffer.
+	 * This function requires _stream = false so it can look up the Frame object
+	 * referenced by frameNumber.
+	 *
+	 * @param frameNumber    The frame number to apply to _currentFrameBuffer
+	 */
+	void applyFrameToCurrent(uint frameNumber);
+	/**
+	 * Applies the data from a Frame object on top of a _currentFrameBuffer.
+	 *
+	 * @param frame    A Frame object to apply to _currentFrameBuffer
+	 */
+	void applyFrameToCurrent(const RLFDecoder::Frame &frame);
+
+	/**
+	 * Decode frame data that uses masked run length encoding. This is the encoding
+	 * used by P-frames.
+	 *
+	 * @param source        The source pixel data
+	 * @param dest          The destination buffer
+	 * @param sourceSize    The size of the source pixel data
+	 * @param destSize      The size of the destination buffer
+	 */
+	void decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
+	/**
+	 * Decode frame data that uses simple run length encoding. This is the encoding
+	 * used by I-frames.
+	 *
+	 * @param source        The source pixel data
+	 * @param dest          The destination buffer
+	 * @param sourceSize    The size of the source pixel data
+	 * @param destSize      The size of the destination buffer
+	 */
+	void decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
+};
+
+} // End of namespace ZVision
+
+#endif
-- 
cgit v1.2.3


From 3d1a9e34422f3bb9d86149c18695cc5a9e4ebac8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 15 Dec 2014 03:15:30 +0200
Subject: ZVISION: Simplify the working window code

---
 engines/zvision/zvision.cpp | 12 +++++++++---
 engines/zvision/zvision.h   | 13 +++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 8a44ccebea..ec1fb9413b 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -81,9 +81,6 @@ struct zvisionIniSettings {
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	: Engine(syst),
 	  _gameDescription(gameDesc),
-	  _workingWindow_ZGI((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - WORKING_WINDOW_WIDTH) / 2) + WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - WORKING_WINDOW_HEIGHT) / 2) + WORKING_WINDOW_HEIGHT),
-	  _workingWindow_ZNM((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2, (WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2, ((WINDOW_WIDTH - ZNM_WORKING_WINDOW_WIDTH) / 2) + ZNM_WORKING_WINDOW_WIDTH, ((WINDOW_HEIGHT - ZNM_WORKING_WINDOW_HEIGHT) / 2) + ZNM_WORKING_WINDOW_HEIGHT),
-	  _workingWindow(gameDesc->gameId == GID_NEMESIS ? _workingWindow_ZNM : _workingWindow_ZGI),
 	  _pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /*RGB 565*/
 	  _desiredFrameTime(33), /* ~30 fps */
 	  _clock(_system),
@@ -101,6 +98,15 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 
 	debug(1, "ZVision::ZVision");
 
+	uint16 workingWindowWidth  = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
+	uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
+	_workingWindow = Common::Rect(
+						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
+						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
+						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
+						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
+					 );
+
 	memset(_cheatBuff, 0, sizeof(_cheatBuff));
 }
 
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 891f9a9a0f..f8763f94ee 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -67,7 +67,7 @@ public:
 	 * are given in this coordinate space. Also, all images are clipped to the
 	 * edges of this Rectangle
 	 */
-	const Common::Rect &_workingWindow;
+	Common::Rect _workingWindow;
 	const Graphics::PixelFormat _pixelFormat;
 
 private:
@@ -75,13 +75,13 @@ private:
 		WINDOW_WIDTH = 640,
 		WINDOW_HEIGHT = 480,
 
-		//Zork nemesis working window sizes
+		// Zork nemesis working window sizes
 		ZNM_WORKING_WINDOW_WIDTH  = 512,
 		ZNM_WORKING_WINDOW_HEIGHT = 320,
 
-		//ZGI(and default) working window sizes
-		WORKING_WINDOW_WIDTH  = 640,
-		WORKING_WINDOW_HEIGHT = 344,
+		// ZGI working window sizes
+		ZGI_WORKING_WINDOW_WIDTH  = 640,
+		ZGI_WORKING_WINDOW_HEIGHT = 344,
 
 		ROTATION_SCREEN_EDGE_OFFSET = 60,
 		MAX_ROTATION_SPEED = 400, // Pixels per second
@@ -117,9 +117,6 @@ private:
 	// To prevent allocation every time we process events
 	Common::Event _event;
 
-	const Common::Rect _workingWindow_ZGI;
-	const Common::Rect _workingWindow_ZNM;
-
 	int _rendDelay;
 	int16 _mouseVelocity;
 	int16 _kbdVelocity;
-- 
cgit v1.2.3


From 67bd78a95f6efab6d0da4b3bef1b0cebc79c537c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 15 Dec 2014 03:40:52 +0200
Subject: ZVISION: Prefix class member variables with an underscore

This makes the code adhere to our code formatting conventions
---
 engines/zvision/core/search_manager.cpp | 48 ++++++++++++++++-----------------
 engines/zvision/core/search_manager.h   |  6 ++---
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
index 9c5d8fb323..1523319c94 100644
--- a/engines/zvision/core/search_manager.cpp
+++ b/engines/zvision/core/search_manager.cpp
@@ -36,11 +36,11 @@ SearchManager::SearchManager(const Common::String &rootPath, int depth) {
 
 	Common::FSNode fsNode(_root);
 
-	listDirRecursive(dirList, fsNode, depth);
+	listDirRecursive(_dirList, fsNode, depth);
 
-	for (Common::List<Common::String>::iterator it = dirList.begin(); it != dirList.end();)
+	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();)
 		if (it->size() == _root.size())
-			it = dirList.erase(it);
+			it = _dirList.erase(it);
 		else if (it->size() > _root.size()) {
 			*it = Common::String(it->c_str() + _root.size() + 1);
 			it++;
@@ -49,32 +49,32 @@ SearchManager::SearchManager(const Common::String &rootPath, int depth) {
 }
 
 SearchManager::~SearchManager() {
-	Common::List<Common::Archive *>::iterator it = archList.begin();
-	while (it != archList.end()) {
+	Common::List<Common::Archive *>::iterator it = _archList.begin();
+	while (it != _archList.end()) {
 		delete *it;
 		it++;
 	}
 
-	archList.clear();
+	_archList.clear();
 }
 
 void SearchManager::addPatch(const Common::String &src, const Common::String &dst) {
 	Common::String lowerCaseName = dst;
 	lowerCaseName.toLowercase();
 
-	SearchManager::MatchList::iterator it = files.find(lowerCaseName);
+	SearchManager::MatchList::iterator it = _files.find(lowerCaseName);
 
-	if (it != files.end()) {
+	if (it != _files.end()) {
 		lowerCaseName = src;
 		lowerCaseName.toLowercase();
-		files[lowerCaseName] = it->_value;
+		_files[lowerCaseName] = it->_value;
 	}
 }
 
 void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
 	bool addArch = true;
-	Common::List<Common::Archive *>::iterator it = archList.begin();
-	while (it != archList.end()) {
+	Common::List<Common::Archive *>::iterator it = _archList.begin();
+	while (it != _archList.end()) {
 		if (*it == arch) {
 			addArch = false;
 			break;
@@ -82,7 +82,7 @@ void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
 		it++;
 	}
 	if (addArch)
-		archList.push_back(arch);
+		_archList.push_back(arch);
 
 	Common::String lowerCaseName = name;
 	lowerCaseName.toLowercase();
@@ -91,10 +91,10 @@ void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
 	nod.name = lowerCaseName;
 	nod.arch = arch;
 
-	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
 
-	if (fit == files.end()) {
-		files[lowerCaseName] = nod;
+	if (fit == _files.end()) {
+		_files[lowerCaseName] = nod;
 	} else {
 		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
 		if (stream) {
@@ -102,7 +102,7 @@ void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
 				fit->_value.arch = arch;
 			delete stream;
 		} else {
-			files[lowerCaseName] = nod;
+			_files[lowerCaseName] = nod;
 		}
 	}
 }
@@ -111,9 +111,9 @@ Common::File *SearchManager::openFile(const Common::String &name) {
 	Common::String lowerCaseName = name;
 	lowerCaseName.toLowercase();
 
-	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
 
-	if (fit != files.end()) {
+	if (fit != _files.end()) {
 		Common::File *tmp = new Common::File();
 		tmp->open(fit->_value.name, *fit->_value.arch);
 		return tmp;
@@ -125,9 +125,9 @@ bool SearchManager::openFile(Common::File &file, const Common::String &name) {
 	Common::String lowerCaseName = name;
 	lowerCaseName.toLowercase();
 
-	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
 
-	if (fit != files.end())
+	if (fit != _files.end())
 		return file.open(fit->_value.name, *fit->_value.arch);
 	return false;
 }
@@ -136,9 +136,9 @@ bool SearchManager::hasFile(const Common::String &name) {
 	Common::String lowerCaseName = name;
 	lowerCaseName.toLowercase();
 
-	SearchManager::MatchList::iterator fit = files.find(lowerCaseName);
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
 
-	if (fit != files.end())
+	if (fit != _files.end())
 		return true;
 	return false;
 }
@@ -187,7 +187,7 @@ void SearchManager::loadZix(const Common::String &name) {
 					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
 						path.deleteLastChar();
 					if (path.size())
-						for (Common::List<Common::String>::iterator it = dirList.begin(); it != dirList.end(); ++it)
+						for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
 							if (path.equalsIgnoreCase(*it)) {
 								path = *it;
 								break;
@@ -220,7 +220,7 @@ void SearchManager::loadZix(const Common::String &name) {
 
 void SearchManager::addDir(const Common::String &name) {
 	Common::String path;
-	for (Common::List<Common::String>::iterator it = dirList.begin(); it != dirList.end(); ++it)
+	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
 		if (name.equalsIgnoreCase(*it)) {
 			path = *it;
 			break;
diff --git a/engines/zvision/core/search_manager.h b/engines/zvision/core/search_manager.h
index 180102eac6..fdd70fd381 100644
--- a/engines/zvision/core/search_manager.h
+++ b/engines/zvision/core/search_manager.h
@@ -56,12 +56,12 @@ private:
 		Common::Archive *arch;
 	};
 
-	Common::List<Common::String> dirList;
+	Common::List<Common::String> _dirList;
 
 	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
 
-	Common::List<Common::Archive *> archList;
-	MatchList files;
+	Common::List<Common::Archive *> _archList;
+	MatchList _files;
 
 	Common::String _root;
 
-- 
cgit v1.2.3


From 7f61a094781256f7c2734aa08637494c1dfac6bf Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 00:48:16 +0200
Subject: ZVISION: Make the RLF decoder a subclass of the common video decoder

This way, the redundant MetaAnimation class can now be removed
---
 engines/zvision/animation/meta_animation.cpp       | 132 ------------
 engines/zvision/animation/meta_animation.h         |  98 ---------
 engines/zvision/module.mk                          |   1 -
 .../zvision/scripting/controls/fist_control.cpp    |  14 +-
 engines/zvision/scripting/controls/fist_control.h  |   8 +-
 .../zvision/scripting/controls/hotmov_control.cpp  |  10 +-
 .../zvision/scripting/controls/hotmov_control.h    |   8 +-
 .../zvision/scripting/controls/input_control.cpp   |  14 +-
 engines/zvision/scripting/controls/input_control.h |   7 +-
 .../zvision/scripting/controls/lever_control.cpp   |   8 +-
 engines/zvision/scripting/controls/lever_control.h |   9 +-
 .../zvision/scripting/controls/safe_control.cpp    |  10 +-
 engines/zvision/scripting/controls/safe_control.h  |   9 +-
 .../zvision/scripting/sidefx/animation_node.cpp    |  10 +-
 engines/zvision/scripting/sidefx/animation_node.h  |  11 +-
 engines/zvision/video/rlf_decoder.cpp              | 141 ++++---------
 engines/zvision/video/rlf_decoder.h                | 224 +++++++++------------
 engines/zvision/video/video.cpp                    |  20 ++
 engines/zvision/zvision.h                          |   1 +
 19 files changed, 222 insertions(+), 513 deletions(-)
 delete mode 100644 engines/zvision/animation/meta_animation.cpp
 delete mode 100644 engines/zvision/animation/meta_animation.h

diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
deleted file mode 100644
index 85b2e0f6b7..0000000000
--- a/engines/zvision/animation/meta_animation.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/animation/meta_animation.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/video/rlf_decoder.h"
-#include "zvision/video/zork_avi_decoder.h"
-
-#include "video/video_decoder.h"
-
-#include "graphics/surface.h"
-
-namespace ZVision {
-
-MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)
-	: _fileType(RLF),
-	  _curFrame(NULL) {
-	Common::String tmpFileName = fileName;
-	tmpFileName.toLowercase();
-	if (tmpFileName.hasSuffix(".rlf")) {
-		_fileType = RLF;
-		Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
-		_animation.rlf = new RLFDecoder(_file, false);
-		_frmDelay = _animation.rlf->frameTime();
-	} else if (tmpFileName.hasSuffix(".avi")) {
-		_fileType = AVI;
-		Common::File *_file = engine->getSearchManager()->openFile(tmpFileName);
-		_animation.avi = new ZorkAVIDecoder();
-		_animation.avi->loadStream(_file);
-		_frmDelay = 1000.0 / _animation.avi->getDuration().framerate();
-	} else {
-		warning("Unrecognized animation file type: %s", fileName.c_str());
-	}
-}
-
-MetaAnimation::~MetaAnimation() {
-	if (_fileType == RLF) {
-		delete _animation.rlf;
-	} else if (_fileType == AVI) {
-		delete _animation.avi;
-	}
-}
-
-uint MetaAnimation::frameCount() {
-	if (_fileType == RLF) {
-		return _animation.rlf->frameCount();
-	} else
-		return _animation.avi->getFrameCount();
-
-}
-
-uint MetaAnimation::width() {
-	if (_fileType == RLF) {
-		return _animation.rlf->width();
-	} else
-		return _animation.avi->getWidth();
-}
-uint MetaAnimation::height() {
-	if (_fileType == RLF) {
-		return _animation.rlf->height();
-	} else
-		return _animation.avi->getHeight();
-}
-uint32 MetaAnimation::frameTime() {
-	return _frmDelay;
-}
-
-void MetaAnimation::seekToFrame(int frameNumber) {
-	if (frameNumber >= (int)frameCount())
-		frameNumber = frameCount() - 1;
-
-	if (_fileType == RLF) {
-		_animation.rlf->seekToFrame(frameNumber);
-	} else
-		_animation.avi->seekToFrame(frameNumber);
-}
-
-const Graphics::Surface *MetaAnimation::decodeNextFrame() {
-	if (_fileType == RLF)
-		_curFrame = _animation.rlf->decodeNextFrame();
-	else
-		_curFrame = _animation.avi->decodeNextFrame();
-
-	return _curFrame;
-}
-
-const Graphics::Surface *MetaAnimation::getFrameData(uint frameNumber) {
-	if (frameNumber >= frameCount())
-		frameNumber = frameCount() - 1;
-
-	if (_fileType == RLF) {
-		_curFrame = _animation.rlf->getFrameData(frameNumber);
-		return _curFrame;
-	} else {
-		_animation.avi->seekToFrame(frameNumber);
-		_curFrame = _animation.avi->decodeNextFrame();
-		return _curFrame;
-	}
-}
-
-bool MetaAnimation::endOfAnimation() {
-	if (_fileType == RLF) {
-		return _animation.rlf->endOfAnimation();
-	} else
-		return _animation.avi->endOfVideo();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h
deleted file mode 100644
index 6d2025b2cf..0000000000
--- a/engines/zvision/animation/meta_animation.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_METAANIM_NODE_H
-#define ZVISION_METAANIM_NODE_H
-
-#include "zvision/scripting/sidefx.h"
-#include "zvision/zvision.h"
-#include "common/rect.h"
-#include "common/list.h"
-
-namespace Common {
-class String;
-}
-
-namespace Video {
-class VideoDecoder;
-}
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-class RLFDecoder;
-
-class MetaAnimation {
-public:
-	MetaAnimation(const Common::String &fileName, ZVision *engine);
-	~MetaAnimation();
-
-	struct playnode {
-		Common::Rect pos;
-		int32 slot;
-		int32 start;
-		int32 stop;
-		int32 loop;
-		int32 _curFrame;
-		int32 _delay;
-		Graphics::Surface *_scaled;
-	};
-
-private:
-	enum FileType {
-		RLF = 1,
-		AVI = 2
-	};
-
-private:
-	union {
-		RLFDecoder *rlf;
-		Video::VideoDecoder *avi;
-	} _animation;
-
-	FileType _fileType;
-	int32 _frmDelay;
-
-	const Graphics::Surface *_curFrame;
-
-public:
-
-	uint frameCount();
-	uint width();
-	uint height();
-	uint32 frameTime();
-
-	void seekToFrame(int frameNumber);
-
-	const Graphics::Surface *decodeNextFrame();
-	const Graphics::Surface *getFrameData(uint frameNumber);
-
-	bool endOfAnimation();
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 5c2fd2045b..6ed3eee718 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -1,7 +1,6 @@
 MODULE := engines/zvision
 
 MODULE_OBJS := \
-	animation/meta_animation.o \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index dd6a7f11a9..c3a69084f2 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -22,20 +22,19 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/scripting/controls/fist_control.h"
-
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
+#include "zvision/scripting/controls/fist_control.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
-#include "zvision/animation/meta_animation.h"
 #include "zvision/utility/utility.h"
+#include "zvision/video/rlf_decoder.h"
 
 #include "common/stream.h"
 #include "common/file.h"
 #include "common/system.h"
-
 #include "graphics/surface.h"
+#include "video/video_decoder.h"
 
 namespace ZVision {
 
@@ -106,7 +105,8 @@ void FistControl::renderFrame(uint frameNumber) {
 	const Graphics::Surface *frameData;
 
 	if (_animation) {
-		frameData = _animation->getFrameData(frameNumber);
+		_animation->seekToFrame(frameNumber);
+		frameData = _animation->decodeNextFrame();
 		if (frameData)
 			_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _anmRect);
 	}
@@ -121,7 +121,7 @@ bool FistControl::process(uint32 deltaTimeInMillis) {
 			_frameTime -= deltaTimeInMillis;
 
 			if (_frameTime <= 0) {
-				_frameTime = _animation->frameTime();
+				_frameTime = 1000.0 / _animation->getDuration().framerate();
 
 				renderFrame(_frameCur);
 
@@ -194,7 +194,7 @@ void FistControl::readDescFile(const Common::String &fileName) {
 		if (param.matchString("animation_id", true)) {
 			// Not used
 		} else if (param.matchString("animation", true)) {
-			_animation = new MetaAnimation(values, _engine);
+			_animation = _engine->loadAnimation(values);
 		} else if (param.matchString("anim_rect", true)) {
 			int left, top, right, bottom;
 			sscanf(values.c_str(), "%d %d %d %d", &left, &top, &right, &bottom);
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index cb765c429a..0a6b977ead 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -28,9 +28,11 @@
 #include "common/array.h"
 #include "common/rect.h"
 
-namespace ZVision {
+namespace Video {
+	class VideoDecoder;
+}
 
-class MetaAnimation;
+namespace ZVision {
 
 class FistControl : public Control {
 public:
@@ -58,7 +60,7 @@ private:
 
 	Common::Array<entries> _entries;
 
-	MetaAnimation *_animation;
+	Video::VideoDecoder *_animation;
 	Common::Rect _anmRect;
 	int32   _soundKey;
 	int32   _frameCur;
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 68861dc221..dfa0200f47 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -28,14 +28,13 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
-#include "zvision/animation/meta_animation.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
 #include "common/system.h"
-
 #include "graphics/surface.h"
+#include "video/video_decoder.h"
 
 namespace ZVision {
 
@@ -79,7 +78,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 			char filename[64];
 			sscanf(values.c_str(), "%s", filename);
 			values = Common::String(filename);
-			_animation = new MetaAnimation(values, _engine);
+			_animation = _engine->loadAnimation(values);
 		} else if (param.matchString("venus_id", true)) {
 			_venusId = atoi(values.c_str());
 		}
@@ -106,7 +105,8 @@ void HotMovControl::renderFrame(uint frameNumber) {
 	const Graphics::Surface *frameData;
 
 	if (_animation) {
-		frameData = _animation->getFrameData(frameNumber);
+		_animation->seekToFrame(frameNumber);
+		frameData = _animation->decodeNextFrame();
 		if (frameData)
 			_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _rectangle);
 	}
@@ -130,7 +130,7 @@ bool HotMovControl::process(uint32 deltaTimeInMillis) {
 			else
 				_engine->getScriptManager()->setStateValue(_key, 2);
 
-			_frameTime = _animation->frameTime();
+			_frameTime = 1000.0 / _animation->getDuration().framerate();
 		}
 	}
 
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index 86600d65dc..b18d44c7a6 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -28,9 +28,11 @@
 #include "common/array.h"
 #include "common/rect.h"
 
-namespace ZVision {
+namespace Video {
+	class VideoDecoder;
+}
 
-class MetaAnimation;
+namespace ZVision {
 
 class HotMovControl : public Control {
 public:
@@ -44,7 +46,7 @@ private:
 	int32  _lastRenderedFrame;
 	int32  _cycle;
 	int32  _cyclesCount;
-	MetaAnimation *_animation;
+	Video::VideoDecoder *_animation;
 	Common::Rect _rectangle;
 	Common::Array<Common::Rect> _frames;
 public:
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index c541693ec3..60dcd37453 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -34,6 +34,7 @@
 #include "common/str.h"
 #include "common/stream.h"
 #include "common/rect.h"
+#include "video/video_decoder.h"
 
 namespace ZVision {
 
@@ -96,7 +97,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 			sscanf(values.c_str(), "%25s %*u", fileName);
 
-			_animation = new MetaAnimation(fileName, _engine);
+			_animation = _engine->loadAnimation(fileName);
 			_frame = -1;
 			_frameDelay = 0;
 		} else if (param.matchString("focus", true)) {
@@ -213,16 +214,17 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 		bool needDraw = true;// = _textChanged;
 		_frameDelay -= deltaTimeInMillis;
 		if (_frameDelay <= 0) {
-			_frame = (_frame + 1) % _animation->frameCount();
-			_frameDelay = _animation->frameTime();
+			_frame = (_frame + 1) % _animation->getFrameCount();
+			_frameDelay = 1000.0 / _animation->getDuration().framerate();
 			needDraw = true;
 		}
 
 		if (needDraw) {
-			const Graphics::Surface *srf = _animation->getFrameData(_frame);
+			_animation->seekToFrame(_frame);
+			const Graphics::Surface *srf = _animation->decodeNextFrame();
 			uint32 xx = _textRectangle.left + _txtWidth;
-			if (xx >= _textRectangle.left + (_textRectangle.width() - _animation->width()))
-				xx = _textRectangle.left + _textRectangle.width() - _animation->width();
+			if (xx >= _textRectangle.left + (_textRectangle.width() - (int16)_animation->getWidth()))
+				xx = _textRectangle.left + _textRectangle.width() - (int16)_animation->getWidth();
 			_engine->getRenderManager()->blitSurfaceToBkg(*srf, xx, _textRectangle.top);
 		}
 	}
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 410caf6d49..99f7f5287d 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -24,12 +24,15 @@
 #define ZVISION_INPUT_CONTROL_H
 
 #include "zvision/scripting/control.h"
-#include "zvision/animation/meta_animation.h"
 #include "zvision/text/text.h"
 #include "zvision/text/string_manager.h"
 
 #include "common/rect.h"
 
+namespace Video {
+	class VideoDecoder;
+}
+
 namespace ZVision {
 
 class InputControl : public Control {
@@ -51,7 +54,7 @@ private:
 	bool _readOnly;
 
 	int16 _txtWidth;
-	MetaAnimation *_animation;
+	Video::VideoDecoder *_animation;
 	int32 _frameDelay;
 	int16 _frame;
 
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 1e4087963e..9566e4e038 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -28,15 +28,14 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
-#include "zvision/animation/meta_animation.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/system.h"
-
 #include "graphics/surface.h"
+#include "video/video_decoder.h"
 
 namespace ZVision {
 
@@ -106,7 +105,7 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 		if (param.matchString("animation_id", true)) {
 			// Not used
 		} else if (param.matchString("filename", true)) {
-			_animation = new MetaAnimation(values, _engine);
+			_animation = _engine->loadAnimation(values);
 		} else if (param.matchString("skipcolor", true)) {
 			// Not used
 		} else if (param.matchString("anim_coords", true)) {
@@ -374,7 +373,8 @@ void LeverControl::renderFrame(uint frameNumber) {
 
 	const Graphics::Surface *frameData;
 
-	frameData = _animation->getFrameData(frameNumber);
+	_animation->seekToFrame(frameNumber);
+	frameData = _animation->decodeNextFrame();
 	if (frameData)
 		_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _animationCoords);
 }
diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h
index 37d4d3bd8d..fdf4a649dc 100644
--- a/engines/zvision/scripting/controls/lever_control.h
+++ b/engines/zvision/scripting/controls/lever_control.h
@@ -28,10 +28,11 @@
 #include "common/list.h"
 #include "common/rect.h"
 
-namespace ZVision {
+namespace Video {
+	class VideoDecoder;
+}
 
-class ZorkAVIDecoder;
-class MetaAnimation;
+namespace ZVision {
 
 class LeverControl : public Control {
 public:
@@ -59,7 +60,7 @@ private:
 	};
 
 private:
-	MetaAnimation *_animation;
+	Video::VideoDecoder *_animation;
 
 	int _cursor;
 	Common::Rect _animationCoords;
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 3ad5d3a8ae..9f4e29acae 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -28,15 +28,14 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
-#include "zvision/animation/meta_animation.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
 #include "common/tokenizer.h"
 #include "common/system.h"
-
 #include "graphics/surface.h"
+#include "video/video_decoder.h"
 
 namespace ZVision {
 
@@ -65,7 +64,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (param.matchString("animation", true)) {
-			_animation = new MetaAnimation(values, _engine);
+			_animation = _engine->loadAnimation(values);
 		} else if (param.matchString("rectangle", true)) {
 			int x;
 			int y;
@@ -129,7 +128,8 @@ void SafeControl::renderFrame(uint frameNumber) {
 	int x = _rectangle.left;
 	int y = _rectangle.top;
 
-	frameData = _animation->getFrameData(frameNumber);
+	_animation->seekToFrame(frameNumber);
+	frameData = _animation->decodeNextFrame();
 	if (frameData)
 		_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
 }
@@ -149,7 +149,7 @@ bool SafeControl::process(uint32 deltaTimeInMillis) {
 				_curFrame--;
 				renderFrame(_curFrame);
 			}
-			_frameTime = _animation->frameTime();
+			_frameTime = 1000.0 / _animation->getDuration().framerate();
 		}
 	}
 	return false;
diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h
index e32ca97b70..6e1095e304 100644
--- a/engines/zvision/scripting/controls/safe_control.h
+++ b/engines/zvision/scripting/controls/safe_control.h
@@ -28,10 +28,11 @@
 #include "common/list.h"
 #include "common/rect.h"
 
-namespace ZVision {
+namespace Video {
+	class VideoDecoder;
+}
 
-class ZorkAVIDecoder;
-class MetaAnimation;
+namespace ZVision {
 
 class SafeControl : public Control {
 public:
@@ -41,7 +42,7 @@ public:
 private:
 	int16  _statesCount;
 	int16  _curState;
-	MetaAnimation *_animation;
+	Video::VideoDecoder *_animation;
 	Common::Point _center;
 	Common::Rect _rectangle;
 	int16  _innerRaduis;
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 74e4cadbe9..e15f8ec00f 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -27,9 +27,9 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/animation/meta_animation.h"
 
 #include "graphics/surface.h"
+#include "video/video_decoder.h"
 
 namespace ZVision {
 
@@ -39,8 +39,8 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	  _mask(mask),
 	  _animation(NULL) {
 
-	_animation = new MetaAnimation(fileName, engine);
-	_frmDelay = _animation->frameTime();
+	_animation = engine->loadAnimation(fileName);
+	_frmDelay = 1000.0 / _animation->getDuration().framerate();
 
 	if (frate > 0)
 		_frmDelay = 1000.0 / frate;
@@ -164,8 +164,8 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.start = startFrame;
 	nod.stop = endFrame;
 
-	if (nod.stop >= (int)_animation->frameCount())
-		nod.stop = _animation->frameCount() - 1;
+	if (nod.stop >= (int)_animation->getFrameCount())
+		nod.stop = _animation->getFrameCount() - 1;
 
 	nod.slot = slot;
 	nod._curFrame = -1;
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index 94428d2542..3adfd91f32 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -27,18 +27,17 @@
 #include "common/rect.h"
 #include "common/list.h"
 
-namespace Common {
-class String;
-}
-
 namespace Graphics {
 struct Surface;
 }
 
+namespace Video {
+	class VideoDecoder;
+}
+
 namespace ZVision {
 
 class ZVision;
-class MetaAnimation;
 
 class AnimationNode : public SideFX {
 public:
@@ -64,7 +63,7 @@ private:
 	int32 _mask;
 	bool _DisposeAfterUse;
 
-	MetaAnimation *_animation;
+	Video::VideoDecoder *_animation;
 	int32 _frmDelay;
 
 public:
diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index a4f16af9b0..bdb5dc18bc 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -34,75 +34,46 @@
 
 namespace ZVision {
 
-RLFDecoder::RLFDecoder(const Common::String &fileName, bool stream)
-	: _stream(stream),
-	  _readStream(NULL),
-	  _lastFrameRead(0),
-	  _frameCount(0),
-	  _width(0),
-	  _height(0),
-	  _frameTime(0),
-	  _frames(0),
-	  _nextFrame(0),
-	  _frameBufferByteSize(0) {
-
-	Common::File *_file = new Common::File;
-	if (!_file->open(fileName)) {
-		warning("RLF animation file %s could not be opened", fileName.c_str());
-		return;
-	}
-
-	_readStream = _file;
-
-	if (!readHeader()) {
-		warning("%s is not a RLF animation file. Wrong magic number", fileName.c_str());
-		return;
-	}
+RLFDecoder::~RLFDecoder() {
+	close();
+}
 
-	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
-	_frameBufferByteSize = _width * _height * sizeof(uint16);
+bool RLFDecoder::loadStream(Common::SeekableReadStream *stream) {
+	close();
 
-	if (!stream) {
-		_frames = new Frame[_frameCount];
+	addTrack(new RLFVideoTrack(stream));
 
-		// Read in each frame
-		for (uint i = 0; i < _frameCount; ++i) {
-			_frames[i] = readNextFrame();
-		}
-	}
+	return true;
 }
 
-RLFDecoder::RLFDecoder(Common::SeekableReadStream *rstream, bool stream)
-	: _stream(stream),
-	  _readStream(rstream),
+RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
+	: _readStream(stream),
 	  _lastFrameRead(0),
 	  _frameCount(0),
 	  _width(0),
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _nextFrame(0),
+	  _curFrame(0),
 	  _frameBufferByteSize(0) {
 
 	if (!readHeader()) {
-		warning("Stream is not a RLF animation. Wrong magic number");
+		warning("Not a RLF animation file. Wrong magic number");
 		return;
 	}
 
 	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
 	_frameBufferByteSize = _width * _height * sizeof(uint16);
 
-	if (!stream) {
-		_frames = new Frame[_frameCount];
+	_frames = new Frame[_frameCount];
 
-		// Read in each frame
-		for (uint i = 0; i < _frameCount; ++i) {
-			_frames[i] = readNextFrame();
-		}
+	// Read in each frame
+	for (uint i = 0; i < _frameCount; ++i) {
+		_frames[i] = readNextFrame();
 	}
 }
 
-RLFDecoder::~RLFDecoder() {
+RLFDecoder::RLFVideoTrack::~RLFVideoTrack() {
 	for (uint i = 0; i < _frameCount; ++i) {
 		delete[] _frames[i].encodedData;
 	}
@@ -111,7 +82,7 @@ RLFDecoder::~RLFDecoder() {
 	_currentFrameBuffer.free();
 }
 
-bool RLFDecoder::readHeader() {
+bool RLFDecoder::RLFVideoTrack::readHeader() {
 	if (_readStream->readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
 		return false;
 	}
@@ -160,8 +131,8 @@ bool RLFDecoder::readHeader() {
 	return true;
 }
 
-RLFDecoder::Frame RLFDecoder::readNextFrame() {
-	RLFDecoder::Frame frame;
+RLFDecoder::RLFVideoTrack::Frame RLFDecoder::RLFVideoTrack::readNextFrame() {
+	RLFDecoder::RLFVideoTrack::Frame frame;
 
 	_readStream->readUint32BE();                        // Magic number MARF
 	uint32 size = _readStream->readUint32LE();          // Size
@@ -188,30 +159,30 @@ RLFDecoder::Frame RLFDecoder::readNextFrame() {
 	return frame;
 }
 
-void RLFDecoder::seekToFrame(int frameNumber) {
-	assert(!_stream);
-	assert(frameNumber < (int)_frameCount || frameNumber >= -1);
+bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
+	uint frame = getFrameAtTime(time);
+	assert(frame < (int)_frameCount);
 
-	if (_nextFrame == frameNumber)
-		return;
+	if ((uint)_curFrame == frame)
+		return true;
 
-	if (frameNumber < 0) {
-		_nextFrame = 0;
-		return;
+	if (frame < 0) {
+		_curFrame = 0;
+		return false;
 	}
 
-	int closestFrame = _nextFrame;
-	int distance = (int)frameNumber - _nextFrame;
+	int closestFrame = _curFrame;
+	int distance = (int)frame - _curFrame;
 
 	if (distance < 0) {
 		for (uint i = 0; i < _completeFrames.size(); ++i) {
-			if ((int)_completeFrames[i] > frameNumber)
+			if ((int)_completeFrames[i] > frame)
 				break;
 			closestFrame = _completeFrames[i];
 		}
 	} else {
 		for (uint i = 0; i < _completeFrames.size(); ++i) {
-			int newDistance = (int)frameNumber - (int)(_completeFrames[i]);
+			int newDistance = (int)frame - (int)(_completeFrames[i]);
 			if (newDistance < 0)
 				break;
 			if (newDistance < distance) {
@@ -221,43 +192,27 @@ void RLFDecoder::seekToFrame(int frameNumber) {
 		}
 	}
 
-	for (int i = closestFrame; i < frameNumber; ++i) {
+	for (uint i = closestFrame; i < frame; ++i) {
 		applyFrameToCurrent(i);
 	}
 
-	_nextFrame = frameNumber;
-}
-
-const Graphics::Surface *RLFDecoder::getFrameData(uint frameNumber) {
-	assert(!_stream);
-	assert(frameNumber < _frameCount);
+	_curFrame = frame;
 
-	// Since this method is so expensive, first check to see if we can use
-	// decodeNextFrame() it's cheap.
-	if ((int)frameNumber == _nextFrame - 1) {
-		return &_currentFrameBuffer;
-	} else if (_nextFrame == (int)frameNumber) {
-		return decodeNextFrame();
-	}
-
-	seekToFrame(frameNumber);
-	return decodeNextFrame();
+	return true;
 }
 
-const Graphics::Surface *RLFDecoder::decodeNextFrame() {
-	assert(_nextFrame < (int)_frameCount);
+const Graphics::Surface *RLFDecoder::RLFVideoTrack::decodeNextFrame() {
+	// When an animation ends, rewind
+	if (_curFrame == (int)_frameCount)
+		seek(Audio::Timestamp(0, getFrameRate().toInt()));
+	
+	applyFrameToCurrent(_curFrame);
 
-	if (_stream) {
-		applyFrameToCurrent(readNextFrame());
-	} else {
-		applyFrameToCurrent(_nextFrame);
-	}
-
-	_nextFrame++;
+	_curFrame++;
 	return &_currentFrameBuffer;
 }
 
-void RLFDecoder::applyFrameToCurrent(uint frameNumber) {
+void RLFDecoder::RLFVideoTrack::applyFrameToCurrent(uint frameNumber) {
 	if (_frames[frameNumber].type == Masked) {
 		decodeMaskedRunLengthEncoding(_frames[frameNumber].encodedData, (int8 *)_currentFrameBuffer.getPixels(), _frames[frameNumber].encodedSize, _frameBufferByteSize);
 	} else if (_frames[frameNumber].type == Simple) {
@@ -265,15 +220,7 @@ void RLFDecoder::applyFrameToCurrent(uint frameNumber) {
 	}
 }
 
-void RLFDecoder::applyFrameToCurrent(const RLFDecoder::Frame &frame) {
-	if (frame.type == Masked) {
-		decodeMaskedRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
-	} else if (frame.type == Simple) {
-		decodeSimpleRunLengthEncoding(frame.encodedData, (int8 *)_currentFrameBuffer.getPixels(), frame.encodedSize, _frameBufferByteSize);
-	}
-}
-
-void RLFDecoder::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
+void RLFDecoder::RLFVideoTrack::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
 	uint32 sourceOffset = 0;
 	uint32 destOffset = 0;
 	int16 numberOfCopy = 0;
@@ -320,7 +267,7 @@ void RLFDecoder::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32
 	}
 }
 
-void RLFDecoder::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
+void RLFDecoder::RLFVideoTrack::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const {
 	uint32 sourceOffset = 0;
 	uint32 destOffset = 0;
 	int16 numberOfCopy = 0;
diff --git a/engines/zvision/video/rlf_decoder.h b/engines/zvision/video/rlf_decoder.h
index dcfd8606c2..f0f31c2128 100644
--- a/engines/zvision/video/rlf_decoder.h
+++ b/engines/zvision/video/rlf_decoder.h
@@ -24,147 +24,109 @@
 #define ZVISION_RLF_DECODER_H
 
 #include "common/file.h"
+#include "video/video_decoder.h"
 
 #include "graphics/surface.h"
 
-namespace Common {
-class String;
-}
-
 namespace ZVision {
 
-class RLFDecoder {
+class RLFDecoder : public Video::VideoDecoder {
 public:
-	RLFDecoder(const Common::String &fileName, bool stream = true);
-	RLFDecoder(Common::SeekableReadStream *rstream, bool stream);
+	RLFDecoder() {}
 	~RLFDecoder();
 
-private:
-	enum EncodingType {
-		Masked,
-		Simple
-	};
-
-	struct Frame {
-		EncodingType type;
-		int8 *encodedData;
-		uint32 encodedSize;
-	};
-
-private:
-	Common::SeekableReadStream *_readStream;
-	bool _stream;
-	uint _lastFrameRead;
-
-	uint _frameCount;
-	uint _width;
-	uint _height;
-	uint32 _frameTime; // In milliseconds
-	Frame *_frames;
-	Common::Array<uint> _completeFrames;
-
-	int _nextFrame;
-	Graphics::Surface _currentFrameBuffer;
-	uint32 _frameBufferByteSize;
-
-public:
-	uint frameCount() {
-		return _frameCount;
-	}
-	uint width() {
-		return _width;
-	}
-	uint height() {
-		return _height;
-	}
-	uint32 frameTime() {
-		return _frameTime;
-	}
-
-	/**
-	 * Seeks to the frameNumber and updates the internal Surface with
-	 * the new frame data. If frameNumber == -1, it only sets _currentFrame,
-	 * the internal Surface is unchanged. This function requires _stream = false
-	 *
-	 * @param frameNumber    The frame number to seek to
-	 */
-	void seekToFrame(int frameNumber);
-
-	/**
-	 * Returns the pixel data of the frame specified. It will try to use
-	 * decodeNextFrame() if possible. If not, it uses seekToFrame() to
-	 * update the internal Surface and then returns a pointer to it.
-	 * This function requires _stream = false
-	 *
-	 * @param frameNumber    The frame number to get data for
-	 * @return               A pointer to the pixel data. Do NOT delete this.
-	 */
-	const Graphics::Surface *getFrameData(uint frameNumber);
-	/**
-	 * Returns the pixel data of current frame and go to next. It is up to the user to
-	 * check if the current frame is valid before calling this.
-	 * IE. Use endOfAnimation()
-	 *
-	 * @return    A pointer to the pixel data. Do NOT delete this.
-	 */
-	const Graphics::Surface *decodeNextFrame();
-	/**
-	 * @return Is the currentFrame is the last frame in the animation?
-	 */
-	bool endOfAnimation() {
-		return _nextFrame == (int)_frameCount;
-	}
+	bool loadStream(Common::SeekableReadStream *stream);
 
 private:
-	/**
-	 * Reads in the header of the RLF file
-	 *
-	 * @return    Will return false if the header magic number is wrong
-	 */
-	bool readHeader();
-	/**
-	 * Reads the next frame from the RLF file, stores the data in
-	 * a Frame object, then returns the object
-	 *
-	 * @return    A Frame object representing the frame data
-	 */
-	Frame readNextFrame();
-
-	/**
-	 * Applies the frame corresponding to frameNumber on top of _currentFrameBuffer.
-	 * This function requires _stream = false so it can look up the Frame object
-	 * referenced by frameNumber.
-	 *
-	 * @param frameNumber    The frame number to apply to _currentFrameBuffer
-	 */
-	void applyFrameToCurrent(uint frameNumber);
-	/**
-	 * Applies the data from a Frame object on top of a _currentFrameBuffer.
-	 *
-	 * @param frame    A Frame object to apply to _currentFrameBuffer
-	 */
-	void applyFrameToCurrent(const RLFDecoder::Frame &frame);
-
-	/**
-	 * Decode frame data that uses masked run length encoding. This is the encoding
-	 * used by P-frames.
-	 *
-	 * @param source        The source pixel data
-	 * @param dest          The destination buffer
-	 * @param sourceSize    The size of the source pixel data
-	 * @param destSize      The size of the destination buffer
-	 */
-	void decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
-	/**
-	 * Decode frame data that uses simple run length encoding. This is the encoding
-	 * used by I-frames.
-	 *
-	 * @param source        The source pixel data
-	 * @param dest          The destination buffer
-	 * @param sourceSize    The size of the source pixel data
-	 * @param destSize      The size of the destination buffer
-	 */
-	void decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
+	class RLFVideoTrack : public FixedRateVideoTrack {
+	public:
+		RLFVideoTrack(Common::SeekableReadStream *stream);
+		~RLFVideoTrack();
+
+		uint16 getWidth() const { return _width; }
+		uint16 getHeight() const { return _height; }
+		Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); /*RGB 565*/ }
+		int getCurFrame() const { return _curFrame; }
+		int getFrameCount() const { return _frameCount; }
+		const Graphics::Surface *decodeNextFrame();
+		bool isSeekable() const { return true; }
+		bool seek(const Audio::Timestamp &time);
+
+	protected:
+		Common::Rational getFrameRate() const { return Common::Rational(60, _frameTime); }
+
+	private:
+		enum EncodingType {
+			Masked,
+			Simple
+		};
+
+		struct Frame {
+			EncodingType type;
+			int8 *encodedData;
+			uint32 encodedSize;
+		};
+
+		/**
+		 * Reads in the header of the RLF file
+		 *
+		 * @return    Will return false if the header magic number is wrong
+		 */
+		bool readHeader();
+
+		/**
+		 * Reads the next frame from the RLF file, stores the data in
+		 * a Frame object, then returns the object
+		 *
+		 * @return    A Frame object representing the frame data
+		 */
+		Frame readNextFrame();
+
+		/**
+		 * Applies the frame corresponding to frameNumber on top of _currentFrameBuffer.
+		 * This function requires _stream = false so it can look up the Frame object
+		 * referenced by frameNumber.
+		 *
+		 * @param frameNumber    The frame number to apply to _currentFrameBuffer
+		 */
+		void applyFrameToCurrent(uint frameNumber);
+
+		/**
+		 * Decode frame data that uses masked run length encoding. This is the encoding
+		 * used by P-frames.
+		 *
+		 * @param source        The source pixel data
+		 * @param dest          The destination buffer
+		 * @param sourceSize    The size of the source pixel data
+		 * @param destSize      The size of the destination buffer
+		 */
+		void decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
+		/**
+		 * Decode frame data that uses simple run length encoding. This is the encoding
+		 * used by I-frames.
+		 *
+		 * @param source        The source pixel data
+		 * @param dest          The destination buffer
+		 * @param sourceSize    The size of the source pixel data
+		 * @param destSize      The size of the destination buffer
+		 */
+		void decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint32 sourceSize, uint32 destSize) const;
+
+		uint _lastFrameRead;
+
+		uint _frameCount;
+		uint _width;
+		uint _height;
+		uint32 _frameTime; // In milliseconds
+		Frame *_frames;
+		Common::Array<uint> _completeFrames;
+
+		int _curFrame;
+		Graphics::Surface _currentFrameBuffer;
+		uint32 _frameBufferByteSize;
+
+		Common::SeekableReadStream *_readStream;
+	};	// RLFVideoTrack
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index db6161bf0c..c8f968d975 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -30,9 +30,29 @@
 #include "zvision/utility/clock.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/subtitles.h"
+#include "zvision/video/rlf_decoder.h"
+#include "zvision/video/zork_avi_decoder.h"
 
 namespace ZVision {
 
+Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
+	Common::String tmpFileName = fileName;
+	tmpFileName.toLowercase();
+	Video::VideoDecoder *animation = NULL;
+
+	if (tmpFileName.hasSuffix(".rlf"))
+		animation = new RLFDecoder();
+	else if (tmpFileName.hasSuffix(".avi"))
+		animation = new ZorkAVIDecoder();
+	else
+		error("Unknown suffix for animation %s", fileName.c_str());
+
+	Common::File *_file = getSearchManager()->openFile(tmpFileName);
+	animation->loadStream(_file);
+	
+	return animation;
+}
+
 void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect, bool skippable, Subtitle *sub) {
 	Common::Rect dst = destRect;
 	// If destRect is empty, no specific scaling was requested. However, we may choose to do scaling anyway
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index f8763f94ee..82030e6944 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -173,6 +173,7 @@ public:
 	 * @param skippable       If true, the video can be skipped at any time using [Spacebar]
 	 */
 	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true, Subtitle *sub = NULL);
+	Video::VideoDecoder *loadAnimation(const Common::String &fileName);
 
 	void rotateTo(int16 to, int16 time);
 
-- 
cgit v1.2.3


From 4b2b5e686b6ac2105f11983b2072037358d9ad7f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 01:00:50 +0200
Subject: ZVISION: Move the mouse cursor handling code into the graphics code

---
 engines/zvision/core/console.cpp                   |   2 +-
 engines/zvision/core/events.cpp                    |   2 +-
 engines/zvision/cursors/cursor.cpp                 | 122 -----------------
 engines/zvision/cursors/cursor.h                   |  79 -----------
 engines/zvision/cursors/cursor_manager.cpp         | 152 ---------------------
 engines/zvision/cursors/cursor_manager.h           | 134 ------------------
 engines/zvision/graphics/cursors/cursor.cpp        | 122 +++++++++++++++++
 engines/zvision/graphics/cursors/cursor.h          |  79 +++++++++++
 .../zvision/graphics/cursors/cursor_manager.cpp    | 152 +++++++++++++++++++++
 engines/zvision/graphics/cursors/cursor_manager.h  | 134 ++++++++++++++++++
 engines/zvision/module.mk                          |   4 +-
 engines/zvision/scripting/actions.cpp              |   2 +-
 .../zvision/scripting/controls/fist_control.cpp    |   2 +-
 .../zvision/scripting/controls/hotmov_control.cpp  |   2 +-
 .../zvision/scripting/controls/input_control.cpp   |   2 +-
 .../zvision/scripting/controls/lever_control.cpp   |   2 +-
 .../zvision/scripting/controls/paint_control.cpp   |   2 +-
 .../scripting/controls/push_toggle_control.cpp     |   2 +-
 .../zvision/scripting/controls/safe_control.cpp    |   2 +-
 .../zvision/scripting/controls/slot_control.cpp    |   2 +-
 engines/zvision/scripting/script_manager.cpp       |   2 +-
 engines/zvision/zvision.cpp                        |   2 +-
 22 files changed, 502 insertions(+), 502 deletions(-)
 delete mode 100644 engines/zvision/cursors/cursor.cpp
 delete mode 100644 engines/zvision/cursors/cursor.h
 delete mode 100644 engines/zvision/cursors/cursor_manager.cpp
 delete mode 100644 engines/zvision/cursors/cursor_manager.h
 create mode 100644 engines/zvision/graphics/cursors/cursor.cpp
 create mode 100644 engines/zvision/graphics/cursors/cursor.h
 create mode 100644 engines/zvision/graphics/cursors/cursor_manager.cpp
 create mode 100644 engines/zvision/graphics/cursors/cursor_manager.h

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 0f6cbfc96f..76481a3549 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -31,7 +31,7 @@
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/utility/utility.h"
-#include "zvision/cursors/cursor.h"
+#include "zvision/graphics/cursors/cursor.h"
 
 #include "common/system.h"
 #include "common/file.h"
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 839f919ad6..c66e61a61a 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -25,7 +25,7 @@
 #include "zvision/zvision.h"
 
 #include "zvision/core/console.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/core/menu.h"
diff --git a/engines/zvision/cursors/cursor.cpp b/engines/zvision/cursors/cursor.cpp
deleted file mode 100644
index b07220df92..0000000000
--- a/engines/zvision/cursors/cursor.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-#include "common/scummsys.h"
-
-#include "zvision/cursors/cursor.h"
-
-#include "common/str.h"
-#include "common/file.h"
-
-namespace ZVision {
-
-ZorkCursor::ZorkCursor()
-	: _width(0),
-	  _height(0),
-	  _hotspotX(0),
-	  _hotspotY(0) {
-}
-
-ZorkCursor::ZorkCursor(const Common::String &fileName)
-	: _width(0),
-	  _height(0),
-	  _hotspotX(0),
-	  _hotspotY(0) {
-	Common::File file;
-	if (!file.open(fileName))
-		return;
-
-	uint32 magic = file.readUint32BE();
-	if (magic != MKTAG('Z', 'C', 'R', '1')) {
-		warning("%s is not a Zork Cursor file", fileName.c_str());
-		return;
-	}
-
-	_hotspotX = file.readUint16LE();
-	_hotspotY = file.readUint16LE();
-	_width = file.readUint16LE();
-	_height = file.readUint16LE();
-
-	uint dataSize = _width * _height * sizeof(uint16);
-	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
-	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
-	assert(bytesRead == dataSize);
-
-	// Convert to RGB 565
-	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-}
-
-ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
-	: _width(0),
-	  _height(0),
-	  _hotspotX(0),
-	  _hotspotY(0) {
-	Common::File file;
-	if (!engine->getSearchManager()->openFile(file, fileName))
-		return;
-
-	uint32 magic = file.readUint32BE();
-	if (magic != MKTAG('Z', 'C', 'R', '1')) {
-		warning("%s is not a Zork Cursor file", fileName.c_str());
-		return;
-	}
-
-	_hotspotX = file.readUint16LE();
-	_hotspotY = file.readUint16LE();
-	_width = file.readUint16LE();
-	_height = file.readUint16LE();
-
-	uint dataSize = _width * _height * sizeof(uint16);
-	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
-	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
-	assert(bytesRead == dataSize);
-
-	// Convert to RGB 565
-	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-}
-
-ZorkCursor::ZorkCursor(const ZorkCursor &other) {
-	_width = other._width;
-	_height = other._height;
-	_hotspotX = other._hotspotX;
-	_hotspotY = other._hotspotY;
-
-	_surface.copyFrom(other._surface);
-}
-
-ZorkCursor &ZorkCursor::operator=(const ZorkCursor &other) {
-	_width = other._width;
-	_height = other._height;
-	_hotspotX = other._hotspotX;
-	_hotspotY = other._hotspotY;
-
-	_surface.free();
-	_surface.copyFrom(other._surface);
-
-	return *this;
-}
-
-ZorkCursor::~ZorkCursor() {
-	_surface.free();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/cursors/cursor.h b/engines/zvision/cursors/cursor.h
deleted file mode 100644
index 0c1e99411f..0000000000
--- a/engines/zvision/cursors/cursor.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_CURSOR_H
-#define ZVISION_CURSOR_H
-
-#include "graphics/surface.h"
-#include "zvision/zvision.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-/**
- * Utility class to parse and hold cursor data
- * Modeled off Graphics::Cursor
- */
-class ZorkCursor {
-public:
-	ZorkCursor();
-	ZorkCursor(const Common::String &fileName);
-	ZorkCursor(ZVision *engine, const Common::String &fileName);
-	ZorkCursor(const ZorkCursor &other);
-	~ZorkCursor();
-
-private:
-	uint16 _width;
-	uint16 _height;
-	uint16 _hotspotX;
-	uint16 _hotspotY;
-	Graphics::Surface _surface;
-
-public:
-	ZorkCursor &operator=(const ZorkCursor &other);
-
-	uint16 getWidth() const {
-		return _width;
-	}
-	uint16 getHeight() const {
-		return _height;
-	}
-	uint16 getHotspotX() const {
-		return _hotspotX;
-	}
-	uint16 getHotspotY() const {
-		return _hotspotY;
-	}
-	byte getKeyColor() const {
-		return 0;
-	}
-	const byte *getSurface() const {
-		return (const byte *)_surface.getPixels();
-	}
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/cursors/cursor_manager.cpp b/engines/zvision/cursors/cursor_manager.cpp
deleted file mode 100644
index 33fb55515b..0000000000
--- a/engines/zvision/cursors/cursor_manager.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-#include "common/scummsys.h"
-
-#include "zvision/cursors/cursor_manager.h"
-
-#include "zvision/zvision.h"
-
-#include "common/system.h"
-
-#include "graphics/pixelformat.h"
-#include "graphics/cursorman.h"
-
-namespace ZVision {
-
-const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "backward", "downarrow", "forward", "handpt", "handpu", "hdown", "hleft",
-                                                         "hright", "hup", "idle", "leftarrow", "rightarrow", "suggest_surround", "suggest_tilt", "turnaround", "zuparrow"
-                                                       };
-
-const char *CursorManager::_zgiCursorFileNames[NUM_CURSORS] = { "g0gbc011.zcr", "g0gac001.zcr", "g0gac021.zcr", "g0gac031.zcr", "g0gac041.zcr", "g0gac051.zcr", "g0gac061.zcr", "g0gac071.zcr", "g0gac081.zcr",
-                                                                "g0gac091.zcr", "g0gac101.zcr", "g0gac011.zcr", "g0gac111.zcr", "g0gac121.zcr", "g0gac131.zcr", "g0gac141.zcr", "g0gac151.zcr", "g0gac161.zcr"
-                                                              };
-
-const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow", "back", "down", "forw", "handpt", "handpu", "hdown", "hleft",
-                                                                 "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
-                                                               };
-
-CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
-	: _engine(engine),
-	  _pixelFormat(pixelFormat),
-	  _cursorIsPushed(false),
-	  _item(0),
-	  _lastitem(0) {
-	for (int i = 0; i < NUM_CURSORS; i++) {
-		if (_engine->getGameId() == GID_NEMESIS) {
-			Common::String name;
-			name = Common::String::format("%sa.zcr", _zNemCursorFileNames[i]);
-			_cursors[i][0] = ZorkCursor(_engine, name); // Up cursor
-			name = Common::String::format("%sb.zcr", _zNemCursorFileNames[i]);
-			_cursors[i][1] = ZorkCursor(_engine, name); // Down cursor
-		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-			_cursors[i][0] = ZorkCursor(_engine, _zgiCursorFileNames[i]); // Up cursor
-			char buffer[25];
-			strcpy(buffer, _zgiCursorFileNames[i]);
-			buffer[3] += 2;
-			_cursors[i][1] = ZorkCursor(_engine, buffer); // Down cursor
-		}
-	}
-}
-
-void CursorManager::setItemID(int id) {
-	if (id != _item) {
-		if (id) {
-			Common::String file;
-			if (_engine->getGameId() == GID_NEMESIS) {
-				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'a');
-				_cursors[NUM_CURSORS][0] = ZorkCursor(_engine, file);
-				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'b');
-				_cursors[NUM_CURSORS][1] = ZorkCursor(_engine, file);
-				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'a');
-				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
-				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'b');
-				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
-			} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-				file = Common::String::format("g0b%cc%2.2x1.zcr", 'a' , id);
-				_cursors[NUM_CURSORS][0] = ZorkCursor(_engine, file);
-				file = Common::String::format("g0b%cc%2.2x1.zcr", 'c' , id);
-				_cursors[NUM_CURSORS][1] = ZorkCursor(_engine, file);
-				file = Common::String::format("g0b%cc%2.2x1.zcr", 'b' , id);
-				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
-				file = Common::String::format("g0b%cc%2.2x1.zcr", 'd' , id);
-				_cursors[NUM_CURSORS + 1][1] = ZorkCursor(_engine, file);
-			} else
-				return;
-		}
-		_item = id;
-		changeCursor(CursorIndex_Idle);
-	}
-}
-
-void CursorManager::initialize() {
-	changeCursor(_cursors[CursorIndex_Idle][_cursorIsPushed]);
-	showMouse(true);
-}
-
-void CursorManager::changeCursor(const ZorkCursor &cursor) {
-	CursorMan.replaceCursor(cursor.getSurface(), cursor.getWidth(), cursor.getHeight(), cursor.getHotspotX(), cursor.getHotspotY(), cursor.getKeyColor(), false, _pixelFormat);
-}
-
-void CursorManager::cursorDown(bool pushed) {
-	if (_cursorIsPushed == pushed)
-		return;
-
-	_cursorIsPushed = pushed;
-
-	changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
-}
-
-void CursorManager::changeCursor(int id) {
-	int _id = id;
-
-	if (_item &&
-	        (_id == CursorIndex_Active ||
-	         _id == CursorIndex_Idle ||
-	         _id == CursorIndex_HandPu)) {
-
-		if (_id == CursorIndex_Idle)
-			_id = CursorIndex_ItemIdle;
-		else
-			_id = CursorIndex_ItemAct;
-	}
-
-	if (_currentCursor != _id ||
-	        ((_id == CursorIndex_ItemAct || _id == CursorIndex_ItemIdle) && _lastitem != _item)) {
-		_currentCursor = _id;
-		_lastitem = _item;
-		changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
-	}
-}
-
-int CursorManager::getCursorId(const Common::String &name) {
-	for (int i = 0; i < NUM_CURSORS; i++)
-		if (name.equals(_cursorNames[i]))
-			return i;
-	return CursorIndex_Idle;
-}
-
-void CursorManager::showMouse(bool vis) {
-	CursorMan.showMouse(vis);
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h
deleted file mode 100644
index 460f6fade6..0000000000
--- a/engines/zvision/cursors/cursor_manager.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_CURSOR_MANAGER_H
-#define ZVISION_CURSOR_MANAGER_H
-
-#include "zvision/cursors/cursor.h"
-
-#include "common/str.h"
-
-namespace Graphics {
-struct PixelFormat;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-/**
- * Mostly usable cursors
- */
-enum CursorIndex {
-	CursorIndex_Active = 0,
-	CursorIndex_DownArr = 3,
-	CursorIndex_HandPu = 6,
-	CursorIndex_Idle = 11,
-	CursorIndex_Left = 12,
-	CursorIndex_Right = 13,
-	CursorIndex_UpArr = 17,
-	CursorIndex_ItemIdle = 18,
-	CursorIndex_ItemAct = 19
-};
-
-/**
- * Class to manage cursor changes. The actual changes have to be done
- * through CursorMan. Otherwise the cursor will disappear after GMM
- * or debug console.
- * TODO: Figure out a way to get rid of the extraneous data copying due to having to use CursorMan
- */
-class CursorManager {
-public:
-	CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat);
-
-private:
-	static const int NUM_CURSORS = 18;
-
-	// 18 default cursors in up/down states, +2 for items idle/act cursors
-	ZorkCursor _cursors[NUM_CURSORS + 2][2];
-
-	ZVision *_engine;
-	const Graphics::PixelFormat *_pixelFormat;
-	bool _cursorIsPushed;
-	int _item;
-	int _lastitem;
-	int _currentCursor;
-
-	static const char *_cursorNames[];
-	static const char *_zgiCursorFileNames[];
-	static const char *_zNemCursorFileNames[];
-
-public:
-	/** Creates the idle cursor and shows it */
-	void initialize();
-
-	/**
-	 * Change cursor to specified cursor ID. If item setted to not 0 and cursor id idle/acrive/handpu change cursor to item.
-	 *
-	 * @param id    Wanted cursor id.
-	 */
-
-	void changeCursor(int id);
-
-	/**
-	 * Return founded id for string contains cursor name
-	 *
-	 * @param name    Cursor name
-	 * @return        Id of cursor or idle cursor id if not found
-	 */
-
-	int getCursorId(const Common::String &name);
-
-	/**
-	 * Load cursor for item by id, and try to change cursor to item cursor if it's not 0
-	 *
-	 * @param id    Item id or 0 for no item cursor
-	 */
-
-	void setItemID(int id);
-
-	/**
-	 * Change the cursor to a certain push state. If the cursor is already in the specified push state, nothing will happen.
-	 *
-	 * @param pushed    Should the cursor be pushed (true) or not pushed (false) (Another way to say it: down or up)
-	 */
-	void cursorDown(bool pushed);
-
-	/**
-	 * Show or hide mouse cursor.
-	 *
-	 * @param vis    Should the cursor be showed (true) or hide (false)
-	 */
-	void showMouse(bool vis);
-
-private:
-	/**
-	 * Calls CursorMan.replaceCursor() using the data in cursor
-	 *
-	 * @param cursor    The cursor to show
-	 */
-	void changeCursor(const ZorkCursor &cursor);
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
new file mode 100644
index 0000000000..07323b45c4
--- /dev/null
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -0,0 +1,122 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "common/scummsys.h"
+
+#include "zvision/graphics/cursors/cursor.h"
+
+#include "common/str.h"
+#include "common/file.h"
+
+namespace ZVision {
+
+ZorkCursor::ZorkCursor()
+	: _width(0),
+	  _height(0),
+	  _hotspotX(0),
+	  _hotspotY(0) {
+}
+
+ZorkCursor::ZorkCursor(const Common::String &fileName)
+	: _width(0),
+	  _height(0),
+	  _hotspotX(0),
+	  _hotspotY(0) {
+	Common::File file;
+	if (!file.open(fileName))
+		return;
+
+	uint32 magic = file.readUint32BE();
+	if (magic != MKTAG('Z', 'C', 'R', '1')) {
+		warning("%s is not a Zork Cursor file", fileName.c_str());
+		return;
+	}
+
+	_hotspotX = file.readUint16LE();
+	_hotspotY = file.readUint16LE();
+	_width = file.readUint16LE();
+	_height = file.readUint16LE();
+
+	uint dataSize = _width * _height * sizeof(uint16);
+	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
+	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
+	assert(bytesRead == dataSize);
+
+	// Convert to RGB 565
+	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
+}
+
+ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
+	: _width(0),
+	  _height(0),
+	  _hotspotX(0),
+	  _hotspotY(0) {
+	Common::File file;
+	if (!engine->getSearchManager()->openFile(file, fileName))
+		return;
+
+	uint32 magic = file.readUint32BE();
+	if (magic != MKTAG('Z', 'C', 'R', '1')) {
+		warning("%s is not a Zork Cursor file", fileName.c_str());
+		return;
+	}
+
+	_hotspotX = file.readUint16LE();
+	_hotspotY = file.readUint16LE();
+	_width = file.readUint16LE();
+	_height = file.readUint16LE();
+
+	uint dataSize = _width * _height * sizeof(uint16);
+	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
+	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
+	assert(bytesRead == dataSize);
+
+	// Convert to RGB 565
+	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
+}
+
+ZorkCursor::ZorkCursor(const ZorkCursor &other) {
+	_width = other._width;
+	_height = other._height;
+	_hotspotX = other._hotspotX;
+	_hotspotY = other._hotspotY;
+
+	_surface.copyFrom(other._surface);
+}
+
+ZorkCursor &ZorkCursor::operator=(const ZorkCursor &other) {
+	_width = other._width;
+	_height = other._height;
+	_hotspotX = other._hotspotX;
+	_hotspotY = other._hotspotY;
+
+	_surface.free();
+	_surface.copyFrom(other._surface);
+
+	return *this;
+}
+
+ZorkCursor::~ZorkCursor() {
+	_surface.free();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/cursors/cursor.h b/engines/zvision/graphics/cursors/cursor.h
new file mode 100644
index 0000000000..0c1e99411f
--- /dev/null
+++ b/engines/zvision/graphics/cursors/cursor.h
@@ -0,0 +1,79 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_CURSOR_H
+#define ZVISION_CURSOR_H
+
+#include "graphics/surface.h"
+#include "zvision/zvision.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+
+/**
+ * Utility class to parse and hold cursor data
+ * Modeled off Graphics::Cursor
+ */
+class ZorkCursor {
+public:
+	ZorkCursor();
+	ZorkCursor(const Common::String &fileName);
+	ZorkCursor(ZVision *engine, const Common::String &fileName);
+	ZorkCursor(const ZorkCursor &other);
+	~ZorkCursor();
+
+private:
+	uint16 _width;
+	uint16 _height;
+	uint16 _hotspotX;
+	uint16 _hotspotY;
+	Graphics::Surface _surface;
+
+public:
+	ZorkCursor &operator=(const ZorkCursor &other);
+
+	uint16 getWidth() const {
+		return _width;
+	}
+	uint16 getHeight() const {
+		return _height;
+	}
+	uint16 getHotspotX() const {
+		return _hotspotX;
+	}
+	uint16 getHotspotY() const {
+		return _hotspotY;
+	}
+	byte getKeyColor() const {
+		return 0;
+	}
+	const byte *getSurface() const {
+		return (const byte *)_surface.getPixels();
+	}
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
new file mode 100644
index 0000000000..a20deb26b5
--- /dev/null
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -0,0 +1,152 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "common/scummsys.h"
+
+#include "zvision/graphics/cursors/cursor_manager.h"
+
+#include "zvision/zvision.h"
+
+#include "common/system.h"
+
+#include "graphics/pixelformat.h"
+#include "graphics/cursorman.h"
+
+namespace ZVision {
+
+const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "backward", "downarrow", "forward", "handpt", "handpu", "hdown", "hleft",
+                                                         "hright", "hup", "idle", "leftarrow", "rightarrow", "suggest_surround", "suggest_tilt", "turnaround", "zuparrow"
+                                                       };
+
+const char *CursorManager::_zgiCursorFileNames[NUM_CURSORS] = { "g0gbc011.zcr", "g0gac001.zcr", "g0gac021.zcr", "g0gac031.zcr", "g0gac041.zcr", "g0gac051.zcr", "g0gac061.zcr", "g0gac071.zcr", "g0gac081.zcr",
+                                                                "g0gac091.zcr", "g0gac101.zcr", "g0gac011.zcr", "g0gac111.zcr", "g0gac121.zcr", "g0gac131.zcr", "g0gac141.zcr", "g0gac151.zcr", "g0gac161.zcr"
+                                                              };
+
+const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow", "back", "down", "forw", "handpt", "handpu", "hdown", "hleft",
+                                                                 "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
+                                                               };
+
+CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
+	: _engine(engine),
+	  _pixelFormat(pixelFormat),
+	  _cursorIsPushed(false),
+	  _item(0),
+	  _lastitem(0) {
+	for (int i = 0; i < NUM_CURSORS; i++) {
+		if (_engine->getGameId() == GID_NEMESIS) {
+			Common::String name;
+			name = Common::String::format("%sa.zcr", _zNemCursorFileNames[i]);
+			_cursors[i][0] = ZorkCursor(_engine, name); // Up cursor
+			name = Common::String::format("%sb.zcr", _zNemCursorFileNames[i]);
+			_cursors[i][1] = ZorkCursor(_engine, name); // Down cursor
+		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
+			_cursors[i][0] = ZorkCursor(_engine, _zgiCursorFileNames[i]); // Up cursor
+			char buffer[25];
+			strcpy(buffer, _zgiCursorFileNames[i]);
+			buffer[3] += 2;
+			_cursors[i][1] = ZorkCursor(_engine, buffer); // Down cursor
+		}
+	}
+}
+
+void CursorManager::setItemID(int id) {
+	if (id != _item) {
+		if (id) {
+			Common::String file;
+			if (_engine->getGameId() == GID_NEMESIS) {
+				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'a');
+				_cursors[NUM_CURSORS][0] = ZorkCursor(_engine, file);
+				file = Common::String::format("%2.2d%s%c.zcr", id, "idle", 'b');
+				_cursors[NUM_CURSORS][1] = ZorkCursor(_engine, file);
+				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'a');
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
+				file = Common::String::format("%2.2d%s%c.zcr", id, "act", 'b');
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
+			} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'a' , id);
+				_cursors[NUM_CURSORS][0] = ZorkCursor(_engine, file);
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'c' , id);
+				_cursors[NUM_CURSORS][1] = ZorkCursor(_engine, file);
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'b' , id);
+				_cursors[NUM_CURSORS + 1][0] = ZorkCursor(_engine, file);
+				file = Common::String::format("g0b%cc%2.2x1.zcr", 'd' , id);
+				_cursors[NUM_CURSORS + 1][1] = ZorkCursor(_engine, file);
+			} else
+				return;
+		}
+		_item = id;
+		changeCursor(CursorIndex_Idle);
+	}
+}
+
+void CursorManager::initialize() {
+	changeCursor(_cursors[CursorIndex_Idle][_cursorIsPushed]);
+	showMouse(true);
+}
+
+void CursorManager::changeCursor(const ZorkCursor &cursor) {
+	CursorMan.replaceCursor(cursor.getSurface(), cursor.getWidth(), cursor.getHeight(), cursor.getHotspotX(), cursor.getHotspotY(), cursor.getKeyColor(), false, _pixelFormat);
+}
+
+void CursorManager::cursorDown(bool pushed) {
+	if (_cursorIsPushed == pushed)
+		return;
+
+	_cursorIsPushed = pushed;
+
+	changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
+}
+
+void CursorManager::changeCursor(int id) {
+	int _id = id;
+
+	if (_item &&
+	        (_id == CursorIndex_Active ||
+	         _id == CursorIndex_Idle ||
+	         _id == CursorIndex_HandPu)) {
+
+		if (_id == CursorIndex_Idle)
+			_id = CursorIndex_ItemIdle;
+		else
+			_id = CursorIndex_ItemAct;
+	}
+
+	if (_currentCursor != _id ||
+	        ((_id == CursorIndex_ItemAct || _id == CursorIndex_ItemIdle) && _lastitem != _item)) {
+		_currentCursor = _id;
+		_lastitem = _item;
+		changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
+	}
+}
+
+int CursorManager::getCursorId(const Common::String &name) {
+	for (int i = 0; i < NUM_CURSORS; i++)
+		if (name.equals(_cursorNames[i]))
+			return i;
+	return CursorIndex_Idle;
+}
+
+void CursorManager::showMouse(bool vis) {
+	CursorMan.showMouse(vis);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/graphics/cursors/cursor_manager.h b/engines/zvision/graphics/cursors/cursor_manager.h
new file mode 100644
index 0000000000..bbfa085c23
--- /dev/null
+++ b/engines/zvision/graphics/cursors/cursor_manager.h
@@ -0,0 +1,134 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_CURSOR_MANAGER_H
+#define ZVISION_CURSOR_MANAGER_H
+
+#include "zvision/graphics/cursors/cursor.h"
+
+#include "common/str.h"
+
+namespace Graphics {
+struct PixelFormat;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+/**
+ * Mostly usable cursors
+ */
+enum CursorIndex {
+	CursorIndex_Active = 0,
+	CursorIndex_DownArr = 3,
+	CursorIndex_HandPu = 6,
+	CursorIndex_Idle = 11,
+	CursorIndex_Left = 12,
+	CursorIndex_Right = 13,
+	CursorIndex_UpArr = 17,
+	CursorIndex_ItemIdle = 18,
+	CursorIndex_ItemAct = 19
+};
+
+/**
+ * Class to manage cursor changes. The actual changes have to be done
+ * through CursorMan. Otherwise the cursor will disappear after GMM
+ * or debug console.
+ * TODO: Figure out a way to get rid of the extraneous data copying due to having to use CursorMan
+ */
+class CursorManager {
+public:
+	CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat);
+
+private:
+	static const int NUM_CURSORS = 18;
+
+	// 18 default cursors in up/down states, +2 for items idle/act cursors
+	ZorkCursor _cursors[NUM_CURSORS + 2][2];
+
+	ZVision *_engine;
+	const Graphics::PixelFormat *_pixelFormat;
+	bool _cursorIsPushed;
+	int _item;
+	int _lastitem;
+	int _currentCursor;
+
+	static const char *_cursorNames[];
+	static const char *_zgiCursorFileNames[];
+	static const char *_zNemCursorFileNames[];
+
+public:
+	/** Creates the idle cursor and shows it */
+	void initialize();
+
+	/**
+	 * Change cursor to specified cursor ID. If item setted to not 0 and cursor id idle/acrive/handpu change cursor to item.
+	 *
+	 * @param id    Wanted cursor id.
+	 */
+
+	void changeCursor(int id);
+
+	/**
+	 * Return founded id for string contains cursor name
+	 *
+	 * @param name    Cursor name
+	 * @return        Id of cursor or idle cursor id if not found
+	 */
+
+	int getCursorId(const Common::String &name);
+
+	/**
+	 * Load cursor for item by id, and try to change cursor to item cursor if it's not 0
+	 *
+	 * @param id    Item id or 0 for no item cursor
+	 */
+
+	void setItemID(int id);
+
+	/**
+	 * Change the cursor to a certain push state. If the cursor is already in the specified push state, nothing will happen.
+	 *
+	 * @param pushed    Should the cursor be pushed (true) or not pushed (false) (Another way to say it: down or up)
+	 */
+	void cursorDown(bool pushed);
+
+	/**
+	 * Show or hide mouse cursor.
+	 *
+	 * @param vis    Should the cursor be showed (true) or hide (false)
+	 */
+	void showMouse(bool vis);
+
+private:
+	/**
+	 * Calls CursorMan.replaceCursor() using the data in cursor
+	 *
+	 * @param cursor    The cursor to show
+	 */
+	void changeCursor(const ZorkCursor &cursor);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 6ed3eee718..604b697ec7 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -7,9 +7,9 @@ MODULE_OBJS := \
 	core/midi.o \
 	core/save_manager.o \
 	core/search_manager.o \
-	cursors/cursor_manager.o \
-	cursors/cursor.o \
 	detection.o \
+	graphics/cursors/cursor_manager.o \
+	graphics/cursors/cursor.o \
 	graphics/effects/fog.o \
 	graphics/effects/light.o \
 	graphics/effects/wave.o \
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index c8c82063f7..d6883ed38f 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -43,7 +43,7 @@
 #include "zvision/graphics/effects/light.h"
 #include "zvision/graphics/effects/wave.h"
 #include "zvision/core/save_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 
 #include "common/file.h"
 
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index c3a69084f2..887ad7950d 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -26,7 +26,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/scripting/controls/fist_control.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/utility/utility.h"
 #include "zvision/video/rlf_decoder.h"
 
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index dfa0200f47..b2c9cdd577 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 60dcd37453..1b15eacd78 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -23,7 +23,7 @@
 #include "common/scummsys.h"
 
 #include "zvision/scripting/controls/input_control.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 9566e4e038..07eec1fb63 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index 9bad6f2c58..0ef7618b5b 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/utility/utility.h"
 
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index c5ec070899..fcd8cd0356 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 9f4e29acae..8135eb34cc 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/utility/utility.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 1d83b44392..7f04c2d311 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/utility/utility.h"
 
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index c532a2b15d..c735fe6eb0 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/utility/utility.h"
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index ec1fb9413b..34fe0794bd 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -26,7 +26,7 @@
 #include "zvision/core/console.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/cursors/cursor_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/detection.h"
-- 
cgit v1.2.3


From 2463b4580436b41a46500e53b4868789c9c7b21e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 01:05:01 +0200
Subject: ZVISION: Move the MIDI code together with the rest of the sound code

---
 engines/zvision/core/midi.cpp                   | 89 -------------------------
 engines/zvision/core/midi.h                     | 59 ----------------
 engines/zvision/module.mk                       |  2 +-
 engines/zvision/scripting/sidefx/music_node.cpp |  2 +-
 engines/zvision/sound/midi.cpp                  | 89 +++++++++++++++++++++++++
 engines/zvision/sound/midi.h                    | 59 ++++++++++++++++
 engines/zvision/zvision.cpp                     |  2 +-
 7 files changed, 151 insertions(+), 151 deletions(-)
 delete mode 100644 engines/zvision/core/midi.cpp
 delete mode 100644 engines/zvision/core/midi.h
 create mode 100644 engines/zvision/sound/midi.cpp
 create mode 100644 engines/zvision/sound/midi.h

diff --git a/engines/zvision/core/midi.cpp b/engines/zvision/core/midi.cpp
deleted file mode 100644
index 736be1311d..0000000000
--- a/engines/zvision/core/midi.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/core/midi.h"
-
-namespace ZVision {
-
-MidiManager::MidiManager() {
-	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB);
-	_driver = MidiDriver::createMidi(dev);
-	_driver->open();
-}
-
-MidiManager::~MidiManager() {
-	stop();
-	_driver->close();
-	delete _driver;
-}
-
-void MidiManager::stop() {
-	for (int8 i = 0; i < 16; i++)
-		if (_playChannels[i].playing)
-			noteOff(i);
-}
-
-void MidiManager::noteOn(int8 channel, int8 note, int8 velocity) {
-	assert(channel <= 15);
-
-	_playChannels[channel].playing = true;
-	_playChannels[channel].note = note;
-	_driver->send(channel | (velocity << 16) | (note << 8) | 0x90);
-}
-
-void MidiManager::noteOff(int8 channel) {
-	assert(channel <= 15);
-
-	if (_playChannels[channel].playing) {
-		_playChannels[channel].playing = false;
-		_driver->send(channel | (_playChannels[channel].note << 8) | 0x80);
-	}
-}
-
-int8 MidiManager::getFreeChannel() {
-	for (int8 i = 0; i < 16; i++)
-		if (!_playChannels[i].playing)
-			return i;
-	return -1;
-}
-
-void MidiManager::setPan(int8 channel, int8 pan) {
-	assert(channel <= 15);
-
-	_driver->send(channel | (pan << 16) | 0xAB0);
-}
-
-void MidiManager::setVolume(int8 channel, int8 volume) {
-	assert(channel <= 15);
-
-	_driver->send(channel | (volume << 16) | 0x7B0);
-}
-
-void MidiManager::setProgram(int8 channel, int8 prog) {
-	assert(channel <= 15);
-
-	_driver->send(channel | (prog << 8) | 0xC0);
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/core/midi.h b/engines/zvision/core/midi.h
deleted file mode 100644
index a3bac19636..0000000000
--- a/engines/zvision/core/midi.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_MIDI_H
-#define ZVISION_MIDI_H
-
-#include "audio/mididrv.h"
-
-namespace ZVision {
-
-class MidiManager {
-public:
-	MidiManager();
-	~MidiManager();
-
-	void stop();
-	void noteOn(int8 channel, int8 noteNumber, int8 velocity);
-	void noteOff(int8 channel);
-	void setPan(int8 channel, int8 pan);
-	void setVolume(int8 channel, int8 volume);
-	void setProgram(int8 channel, int8 prog);
-
-	int8 getFreeChannel();
-
-protected:
-
-	struct chan {
-		bool playing;
-		int8 note;
-
-		chan() : playing(false), note(0) {};
-	};
-
-	MidiDriver *_driver;
-	chan _playChannels[16];
-};
-
-}
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 604b697ec7..c9a1cb7187 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS := \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
-	core/midi.o \
 	core/save_manager.o \
 	core/search_manager.o \
 	detection.o \
@@ -39,6 +38,7 @@ MODULE_OBJS := \
 	scripting/sidefx/syncsound_node.o \
 	scripting/sidefx/timer_node.o \
 	scripting/sidefx/ttytext_node.o \
+	sound/midi.o \
 	sound/zork_raw.o \
 	text/string_manager.o \
 	text/text.o \
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index 8316c1a76b..c79dd0296d 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -25,9 +25,9 @@
 #include "zvision/scripting/sidefx/music_node.h"
 
 #include "zvision/zvision.h"
-#include "zvision/core/midi.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/sound/midi.h"
 #include "zvision/sound/zork_raw.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/sound/midi.cpp b/engines/zvision/sound/midi.cpp
new file mode 100644
index 0000000000..920002c7c3
--- /dev/null
+++ b/engines/zvision/sound/midi.cpp
@@ -0,0 +1,89 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/sound/midi.h"
+
+namespace ZVision {
+
+MidiManager::MidiManager() {
+	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB);
+	_driver = MidiDriver::createMidi(dev);
+	_driver->open();
+}
+
+MidiManager::~MidiManager() {
+	stop();
+	_driver->close();
+	delete _driver;
+}
+
+void MidiManager::stop() {
+	for (int8 i = 0; i < 16; i++)
+		if (_playChannels[i].playing)
+			noteOff(i);
+}
+
+void MidiManager::noteOn(int8 channel, int8 note, int8 velocity) {
+	assert(channel <= 15);
+
+	_playChannels[channel].playing = true;
+	_playChannels[channel].note = note;
+	_driver->send(channel | (velocity << 16) | (note << 8) | 0x90);
+}
+
+void MidiManager::noteOff(int8 channel) {
+	assert(channel <= 15);
+
+	if (_playChannels[channel].playing) {
+		_playChannels[channel].playing = false;
+		_driver->send(channel | (_playChannels[channel].note << 8) | 0x80);
+	}
+}
+
+int8 MidiManager::getFreeChannel() {
+	for (int8 i = 0; i < 16; i++)
+		if (!_playChannels[i].playing)
+			return i;
+	return -1;
+}
+
+void MidiManager::setPan(int8 channel, int8 pan) {
+	assert(channel <= 15);
+
+	_driver->send(channel | (pan << 16) | 0xAB0);
+}
+
+void MidiManager::setVolume(int8 channel, int8 volume) {
+	assert(channel <= 15);
+
+	_driver->send(channel | (volume << 16) | 0x7B0);
+}
+
+void MidiManager::setProgram(int8 channel, int8 prog) {
+	assert(channel <= 15);
+
+	_driver->send(channel | (prog << 8) | 0xC0);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/sound/midi.h b/engines/zvision/sound/midi.h
new file mode 100644
index 0000000000..a3bac19636
--- /dev/null
+++ b/engines/zvision/sound/midi.h
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_MIDI_H
+#define ZVISION_MIDI_H
+
+#include "audio/mididrv.h"
+
+namespace ZVision {
+
+class MidiManager {
+public:
+	MidiManager();
+	~MidiManager();
+
+	void stop();
+	void noteOn(int8 channel, int8 noteNumber, int8 velocity);
+	void noteOff(int8 channel);
+	void setPan(int8 channel, int8 pan);
+	void setVolume(int8 channel, int8 volume);
+	void setProgram(int8 channel, int8 prog);
+
+	int8 getFreeChannel();
+
+protected:
+
+	struct chan {
+		bool playing;
+		int8 note;
+
+		chan() : playing(false), note(0) {};
+	};
+
+	MidiDriver *_driver;
+	chan _playChannels[16];
+};
+
+}
+
+#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 34fe0794bd..45dc124b58 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -34,7 +34,7 @@
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/graphics/truetype_font.h"
-#include "zvision/core/midi.h"
+#include "zvision/sound/midi.h"
 #include "zvision/utility/zfs_archive.h"
 
 #include "common/config-manager.h"
-- 
cgit v1.2.3


From d8a961244d99a87c1a01613a971173cc135c246a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 01:14:37 +0200
Subject: ZVISION: Move all the file-related classes together

---
 engines/zvision/core/search_manager.cpp      | 273 ---------------------------
 engines/zvision/core/search_manager.h        |  73 -------
 engines/zvision/file/lzss_read_stream.cpp    | 102 ++++++++++
 engines/zvision/file/lzss_read_stream.h      |  71 +++++++
 engines/zvision/file/search_manager.cpp      | 273 +++++++++++++++++++++++++++
 engines/zvision/file/search_manager.h        |  73 +++++++
 engines/zvision/file/zfs_archive.cpp         | 154 +++++++++++++++
 engines/zvision/file/zfs_archive.h           | 125 ++++++++++++
 engines/zvision/graphics/render_manager.cpp  |   2 +-
 engines/zvision/graphics/subtitles.cpp       |   2 +-
 engines/zvision/module.mk                    |   6 +-
 engines/zvision/text/string_manager.cpp      |   2 +-
 engines/zvision/utility/lzss_read_stream.cpp | 102 ----------
 engines/zvision/utility/lzss_read_stream.h   |  71 -------
 engines/zvision/utility/zfs_archive.cpp      | 154 ---------------
 engines/zvision/utility/zfs_archive.h        | 125 ------------
 engines/zvision/zvision.cpp                  |   4 +-
 engines/zvision/zvision.h                    |   2 +-
 18 files changed, 807 insertions(+), 807 deletions(-)
 delete mode 100644 engines/zvision/core/search_manager.cpp
 delete mode 100644 engines/zvision/core/search_manager.h
 create mode 100644 engines/zvision/file/lzss_read_stream.cpp
 create mode 100644 engines/zvision/file/lzss_read_stream.h
 create mode 100644 engines/zvision/file/search_manager.cpp
 create mode 100644 engines/zvision/file/search_manager.h
 create mode 100644 engines/zvision/file/zfs_archive.cpp
 create mode 100644 engines/zvision/file/zfs_archive.h
 delete mode 100644 engines/zvision/utility/lzss_read_stream.cpp
 delete mode 100644 engines/zvision/utility/lzss_read_stream.h
 delete mode 100644 engines/zvision/utility/zfs_archive.cpp
 delete mode 100644 engines/zvision/utility/zfs_archive.h

diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
deleted file mode 100644
index 1523319c94..0000000000
--- a/engines/zvision/core/search_manager.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-#include "common/debug.h"
-#include "common/fs.h"
-#include "common/stream.h"
-
-#include "zvision/core/search_manager.h"
-#include "zvision/utility/zfs_archive.h"
-
-namespace ZVision {
-
-SearchManager::SearchManager(const Common::String &rootPath, int depth) {
-	_root = rootPath;
-	if (_root[_root.size() - 1] == '\\' || _root[_root.size() - 1] == '/')
-		_root.deleteLastChar();
-
-	Common::FSNode fsNode(_root);
-
-	listDirRecursive(_dirList, fsNode, depth);
-
-	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();)
-		if (it->size() == _root.size())
-			it = _dirList.erase(it);
-		else if (it->size() > _root.size()) {
-			*it = Common::String(it->c_str() + _root.size() + 1);
-			it++;
-		} else
-			it++;
-}
-
-SearchManager::~SearchManager() {
-	Common::List<Common::Archive *>::iterator it = _archList.begin();
-	while (it != _archList.end()) {
-		delete *it;
-		it++;
-	}
-
-	_archList.clear();
-}
-
-void SearchManager::addPatch(const Common::String &src, const Common::String &dst) {
-	Common::String lowerCaseName = dst;
-	lowerCaseName.toLowercase();
-
-	SearchManager::MatchList::iterator it = _files.find(lowerCaseName);
-
-	if (it != _files.end()) {
-		lowerCaseName = src;
-		lowerCaseName.toLowercase();
-		_files[lowerCaseName] = it->_value;
-	}
-}
-
-void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
-	bool addArch = true;
-	Common::List<Common::Archive *>::iterator it = _archList.begin();
-	while (it != _archList.end()) {
-		if (*it == arch) {
-			addArch = false;
-			break;
-		}
-		it++;
-	}
-	if (addArch)
-		_archList.push_back(arch);
-
-	Common::String lowerCaseName = name;
-	lowerCaseName.toLowercase();
-
-	SearchManager::Node nod;
-	nod.name = lowerCaseName;
-	nod.arch = arch;
-
-	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
-
-	if (fit == _files.end()) {
-		_files[lowerCaseName] = nod;
-	} else {
-		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
-		if (stream) {
-			if (stream->size() < 10)
-				fit->_value.arch = arch;
-			delete stream;
-		} else {
-			_files[lowerCaseName] = nod;
-		}
-	}
-}
-
-Common::File *SearchManager::openFile(const Common::String &name) {
-	Common::String lowerCaseName = name;
-	lowerCaseName.toLowercase();
-
-	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
-
-	if (fit != _files.end()) {
-		Common::File *tmp = new Common::File();
-		tmp->open(fit->_value.name, *fit->_value.arch);
-		return tmp;
-	}
-	return NULL;
-}
-
-bool SearchManager::openFile(Common::File &file, const Common::String &name) {
-	Common::String lowerCaseName = name;
-	lowerCaseName.toLowercase();
-
-	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
-
-	if (fit != _files.end())
-		return file.open(fit->_value.name, *fit->_value.arch);
-	return false;
-}
-
-bool SearchManager::hasFile(const Common::String &name) {
-	Common::String lowerCaseName = name;
-	lowerCaseName.toLowercase();
-
-	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
-
-	if (fit != _files.end())
-		return true;
-	return false;
-}
-
-void SearchManager::loadZix(const Common::String &name) {
-	Common::File file;
-	file.open(name);
-
-	Common::String line;
-
-	while (!file.eos()) {
-		line = file.readLine();
-		if (line.matchString("----------*", true))
-			break;
-	}
-
-	if (file.eos())
-		return;
-
-	Common::Array<Common::Archive *> archives;
-
-	while (!file.eos()) {
-		line = file.readLine();
-		line.trim();
-		if (line.matchString("----------*", true))
-			break;
-		else if (line.matchString("DIR:*", true)) {
-			Common::String path(line.c_str() + 5);
-			Common::Archive *arc;
-			char tempPath[128];
-			strcpy(tempPath, path.c_str());
-			for (uint i = 0; i < path.size(); i++)
-				if (tempPath[i] == '\\')
-					tempPath[i] = '/';
-
-			path = Common::String(tempPath);
-			if (path.size() && path[0] == '.')
-				path.deleteChar(0);
-			if (path.size() && path[0] == '/')
-				path.deleteChar(0);
-
-			if (path.matchString("*.zfs", true))
-				arc = new ZfsArchive(path);
-			else {
-				if (path.size()) {
-					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
-						path.deleteLastChar();
-					if (path.size())
-						for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
-							if (path.equalsIgnoreCase(*it)) {
-								path = *it;
-								break;
-							}
-				}
-
-				path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
-
-				arc = new Common::FSDirectory(path);
-			}
-			archives.push_back(arc);
-		}
-	}
-
-	if (file.eos())
-		return;
-
-	while (!file.eos()) {
-		line = file.readLine();
-		line.trim();
-		uint dr = 0;
-		char buf[32];
-		if (sscanf(line.c_str(), "%u %s", &dr, buf) == 2) {
-			if (dr <= archives.size() && dr > 0) {
-				addFile(Common::String(buf), archives[dr - 1]);
-			}
-		}
-	}
-}
-
-void SearchManager::addDir(const Common::String &name) {
-	Common::String path;
-	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
-		if (name.equalsIgnoreCase(*it)) {
-			path = *it;
-			break;
-		}
-
-	if (path.size() == 0)
-		return;
-
-	path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
-
-	Common::FSDirectory *dir = new Common::FSDirectory(path);
-
-	Common::ArchiveMemberList list;
-	dir->listMatchingMembers(list, "*.zfs");
-
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::String flname = (*iter)->getName();
-
-		ZfsArchive *zfs = new ZfsArchive(Common::String::format("%s/%s", name.c_str(), flname.c_str()));
-
-		Common::ArchiveMemberList zfslist;
-		zfs->listMembers(zfslist);
-
-		for (Common::ArchiveMemberList::iterator ziter = zfslist.begin(); ziter != zfslist.end(); ++ziter) {
-			Common::String zfsFileName = (*ziter)->getName();
-			addFile(zfsFileName, zfs);
-		}
-	}
-
-	list.clear();
-	dir->listMembers(list);
-
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::String flname = (*iter)->getName();
-		addFile(flname, dir);
-	}
-}
-
-void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const Common::FSNode &fsNode, int depth) {
-	Common::FSList fsList;
-	fsNode.getChildren(fsList);
-
-	_list.push_back(fsNode.getPath());
-
-	if (depth > 1)
-		for (Common::FSList::const_iterator it = fsList.begin(); it != fsList.end(); ++it)
-			listDirRecursive(_list, *it, depth - 1);
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/core/search_manager.h b/engines/zvision/core/search_manager.h
deleted file mode 100644
index fdd70fd381..0000000000
--- a/engines/zvision/core/search_manager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SEARCH_MANAGER_H
-#define ZVISION_SEARCH_MANAGER_H
-
-#include "common/str.h"
-#include "common/hash-str.h"
-#include "common/hashmap.h"
-#include "common/archive.h"
-#include "common/file.h"
-#include "common/list.h"
-
-namespace ZVision {
-
-class SearchManager {
-public:
-	SearchManager(const Common::String &rootPath, int depth);
-	~SearchManager();
-
-	void addFile(const Common::String &name, Common::Archive *arch);
-	void addDir(const Common::String &name);
-	void addPatch(const Common::String &src, const Common::String &dst);
-
-	Common::File *openFile(const Common::String &name);
-	bool openFile(Common::File &file, const Common::String &name);
-	bool hasFile(const Common::String &name);
-
-	void loadZix(const Common::String &name);
-
-private:
-
-	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
-
-	struct Node {
-		Common::String name;
-		Common::Archive *arch;
-	};
-
-	Common::List<Common::String> _dirList;
-
-	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
-
-	Common::List<Common::Archive *> _archList;
-	MatchList _files;
-
-	Common::String _root;
-
-private:
-};
-
-}
-
-#endif // ZVISION_SEARCH_MANAGER_H
diff --git a/engines/zvision/file/lzss_read_stream.cpp b/engines/zvision/file/lzss_read_stream.cpp
new file mode 100644
index 0000000000..6f27eaa765
--- /dev/null
+++ b/engines/zvision/file/lzss_read_stream.cpp
@@ -0,0 +1,102 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/file/lzss_read_stream.h"
+
+namespace ZVision {
+
+LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)
+	: _source(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);
+}
+
+uint32 LzssReadStream::decompressBytes(byte *destination, uint32 numberOfBytes) {
+	uint32 destinationCursor = 0;
+
+	while (destinationCursor < numberOfBytes) {
+		byte flagbyte = _source->readByte();
+		if (_source->eos())
+			break;
+		uint mask = 1;
+
+		for (int i = 0; i < 8; ++i) {
+			if ((flagbyte & mask) == mask) {
+				byte data = _source->readByte();
+				if (_source->eos()) {
+					return destinationCursor;
+				}
+
+				_window[_windowCursor] = data;
+				destination[destinationCursor++] = data;
+
+				// Increment and wrap the window cursor
+				_windowCursor = (_windowCursor + 1) & 0xFFF;
+			} else {
+				byte low = _source->readByte();
+				if (_source->eos()) {
+					return destinationCursor;
+				}
+
+				byte high = _source->readByte();
+				if (_source->eos()) {
+					return destinationCursor;
+				}
+
+				uint16 length = (high & 0xF) + 2;
+				uint16 offset = low | ((high & 0xF0) << 4);
+
+				for (int j = 0; j <= length; ++j) {
+					byte temp = _window[(offset + j) & 0xFFF];
+					_window[_windowCursor] = temp;
+					destination[destinationCursor++] = temp;
+					_windowCursor = (_windowCursor + 1) & 0xFFF;
+				}
+			}
+
+			mask = mask << 1;
+		}
+	}
+
+	return destinationCursor;
+}
+
+bool LzssReadStream::eos() const {
+	return _eosFlag;
+}
+
+uint32 LzssReadStream::read(void *dataPtr, uint32 dataSize) {
+	uint32 bytesRead = decompressBytes(static_cast<byte *>(dataPtr), dataSize);
+	if (bytesRead < dataSize) {
+		// Flag that we're at EOS
+		_eosFlag = true;
+	}
+
+	return dataSize;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/file/lzss_read_stream.h b/engines/zvision/file/lzss_read_stream.h
new file mode 100644
index 0000000000..1420621f13
--- /dev/null
+++ b/engines/zvision/file/lzss_read_stream.h
@@ -0,0 +1,71 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_LZSS_STREAM_H
+#define ZVISION_LZSS_STREAM_H
+
+#include "common/stream.h"
+#include "common/array.h"
+
+namespace Common {
+class SeekableReadStream;
+}
+
+namespace ZVision {
+
+class LzssReadStream : public Common::ReadStream {
+public:
+	/**
+	 * A class that decompresses LZSS data and implements ReadStream for easy access
+	 * to the decompiled data.
+	 *
+	 * @param source              The source data
+	 */
+	LzssReadStream(Common::SeekableReadStream *source);
+
+private:
+	enum {
+		BLOCK_SIZE = 0x1000
+	};
+
+private:
+	Common::SeekableReadStream *_source;
+	byte _window[BLOCK_SIZE];
+	uint _windowCursor;
+	bool _eosFlag;
+
+public:
+	bool eos() const;
+	uint32 read(void *dataPtr, uint32 dataSize);
+
+private:
+	/**
+	 * Decompress the next <numberOfBytes> from the source stream. Or until EOS
+	 *
+	 * @param numberOfBytes    How many bytes to decompress. This is a count of source bytes, not destination bytes
+	 */
+	uint32 decompressBytes(byte *destination, uint32 numberOfBytes);
+};
+
+}
+
+#endif
diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
new file mode 100644
index 0000000000..752b52b01f
--- /dev/null
+++ b/engines/zvision/file/search_manager.cpp
@@ -0,0 +1,273 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "common/debug.h"
+#include "common/fs.h"
+#include "common/stream.h"
+
+#include "zvision/file/search_manager.h"
+#include "zvision/file/zfs_archive.h"
+
+namespace ZVision {
+
+SearchManager::SearchManager(const Common::String &rootPath, int depth) {
+	_root = rootPath;
+	if (_root[_root.size() - 1] == '\\' || _root[_root.size() - 1] == '/')
+		_root.deleteLastChar();
+
+	Common::FSNode fsNode(_root);
+
+	listDirRecursive(_dirList, fsNode, depth);
+
+	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();)
+		if (it->size() == _root.size())
+			it = _dirList.erase(it);
+		else if (it->size() > _root.size()) {
+			*it = Common::String(it->c_str() + _root.size() + 1);
+			it++;
+		} else
+			it++;
+}
+
+SearchManager::~SearchManager() {
+	Common::List<Common::Archive *>::iterator it = _archList.begin();
+	while (it != _archList.end()) {
+		delete *it;
+		it++;
+	}
+
+	_archList.clear();
+}
+
+void SearchManager::addPatch(const Common::String &src, const Common::String &dst) {
+	Common::String lowerCaseName = dst;
+	lowerCaseName.toLowercase();
+
+	SearchManager::MatchList::iterator it = _files.find(lowerCaseName);
+
+	if (it != _files.end()) {
+		lowerCaseName = src;
+		lowerCaseName.toLowercase();
+		_files[lowerCaseName] = it->_value;
+	}
+}
+
+void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
+	bool addArch = true;
+	Common::List<Common::Archive *>::iterator it = _archList.begin();
+	while (it != _archList.end()) {
+		if (*it == arch) {
+			addArch = false;
+			break;
+		}
+		it++;
+	}
+	if (addArch)
+		_archList.push_back(arch);
+
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
+
+	SearchManager::Node nod;
+	nod.name = lowerCaseName;
+	nod.arch = arch;
+
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
+
+	if (fit == _files.end()) {
+		_files[lowerCaseName] = nod;
+	} else {
+		Common::SeekableReadStream *stream = fit->_value.arch->createReadStreamForMember(fit->_value.name);
+		if (stream) {
+			if (stream->size() < 10)
+				fit->_value.arch = arch;
+			delete stream;
+		} else {
+			_files[lowerCaseName] = nod;
+		}
+	}
+}
+
+Common::File *SearchManager::openFile(const Common::String &name) {
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
+
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
+
+	if (fit != _files.end()) {
+		Common::File *tmp = new Common::File();
+		tmp->open(fit->_value.name, *fit->_value.arch);
+		return tmp;
+	}
+	return NULL;
+}
+
+bool SearchManager::openFile(Common::File &file, const Common::String &name) {
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
+
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
+
+	if (fit != _files.end())
+		return file.open(fit->_value.name, *fit->_value.arch);
+	return false;
+}
+
+bool SearchManager::hasFile(const Common::String &name) {
+	Common::String lowerCaseName = name;
+	lowerCaseName.toLowercase();
+
+	SearchManager::MatchList::iterator fit = _files.find(lowerCaseName);
+
+	if (fit != _files.end())
+		return true;
+	return false;
+}
+
+void SearchManager::loadZix(const Common::String &name) {
+	Common::File file;
+	file.open(name);
+
+	Common::String line;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		if (line.matchString("----------*", true))
+			break;
+	}
+
+	if (file.eos())
+		return;
+
+	Common::Array<Common::Archive *> archives;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		line.trim();
+		if (line.matchString("----------*", true))
+			break;
+		else if (line.matchString("DIR:*", true)) {
+			Common::String path(line.c_str() + 5);
+			Common::Archive *arc;
+			char tempPath[128];
+			strcpy(tempPath, path.c_str());
+			for (uint i = 0; i < path.size(); i++)
+				if (tempPath[i] == '\\')
+					tempPath[i] = '/';
+
+			path = Common::String(tempPath);
+			if (path.size() && path[0] == '.')
+				path.deleteChar(0);
+			if (path.size() && path[0] == '/')
+				path.deleteChar(0);
+
+			if (path.matchString("*.zfs", true))
+				arc = new ZfsArchive(path);
+			else {
+				if (path.size()) {
+					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
+						path.deleteLastChar();
+					if (path.size())
+						for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
+							if (path.equalsIgnoreCase(*it)) {
+								path = *it;
+								break;
+							}
+				}
+
+				path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
+
+				arc = new Common::FSDirectory(path);
+			}
+			archives.push_back(arc);
+		}
+	}
+
+	if (file.eos())
+		return;
+
+	while (!file.eos()) {
+		line = file.readLine();
+		line.trim();
+		uint dr = 0;
+		char buf[32];
+		if (sscanf(line.c_str(), "%u %s", &dr, buf) == 2) {
+			if (dr <= archives.size() && dr > 0) {
+				addFile(Common::String(buf), archives[dr - 1]);
+			}
+		}
+	}
+}
+
+void SearchManager::addDir(const Common::String &name) {
+	Common::String path;
+	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
+		if (name.equalsIgnoreCase(*it)) {
+			path = *it;
+			break;
+		}
+
+	if (path.size() == 0)
+		return;
+
+	path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
+
+	Common::FSDirectory *dir = new Common::FSDirectory(path);
+
+	Common::ArchiveMemberList list;
+	dir->listMatchingMembers(list, "*.zfs");
+
+	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+		Common::String flname = (*iter)->getName();
+
+		ZfsArchive *zfs = new ZfsArchive(Common::String::format("%s/%s", name.c_str(), flname.c_str()));
+
+		Common::ArchiveMemberList zfslist;
+		zfs->listMembers(zfslist);
+
+		for (Common::ArchiveMemberList::iterator ziter = zfslist.begin(); ziter != zfslist.end(); ++ziter) {
+			Common::String zfsFileName = (*ziter)->getName();
+			addFile(zfsFileName, zfs);
+		}
+	}
+
+	list.clear();
+	dir->listMembers(list);
+
+	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
+		Common::String flname = (*iter)->getName();
+		addFile(flname, dir);
+	}
+}
+
+void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const Common::FSNode &fsNode, int depth) {
+	Common::FSList fsList;
+	fsNode.getChildren(fsList);
+
+	_list.push_back(fsNode.getPath());
+
+	if (depth > 1)
+		for (Common::FSList::const_iterator it = fsList.begin(); it != fsList.end(); ++it)
+			listDirRecursive(_list, *it, depth - 1);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/file/search_manager.h b/engines/zvision/file/search_manager.h
new file mode 100644
index 0000000000..fdd70fd381
--- /dev/null
+++ b/engines/zvision/file/search_manager.h
@@ -0,0 +1,73 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SEARCH_MANAGER_H
+#define ZVISION_SEARCH_MANAGER_H
+
+#include "common/str.h"
+#include "common/hash-str.h"
+#include "common/hashmap.h"
+#include "common/archive.h"
+#include "common/file.h"
+#include "common/list.h"
+
+namespace ZVision {
+
+class SearchManager {
+public:
+	SearchManager(const Common::String &rootPath, int depth);
+	~SearchManager();
+
+	void addFile(const Common::String &name, Common::Archive *arch);
+	void addDir(const Common::String &name);
+	void addPatch(const Common::String &src, const Common::String &dst);
+
+	Common::File *openFile(const Common::String &name);
+	bool openFile(Common::File &file, const Common::String &name);
+	bool hasFile(const Common::String &name);
+
+	void loadZix(const Common::String &name);
+
+private:
+
+	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
+
+	struct Node {
+		Common::String name;
+		Common::Archive *arch;
+	};
+
+	Common::List<Common::String> _dirList;
+
+	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
+
+	Common::List<Common::Archive *> _archList;
+	MatchList _files;
+
+	Common::String _root;
+
+private:
+};
+
+}
+
+#endif // ZVISION_SEARCH_MANAGER_H
diff --git a/engines/zvision/file/zfs_archive.cpp b/engines/zvision/file/zfs_archive.cpp
new file mode 100644
index 0000000000..9b55a366ed
--- /dev/null
+++ b/engines/zvision/file/zfs_archive.cpp
@@ -0,0 +1,154 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/memstream.h"
+#include "common/debug.h"
+#include "common/file.h"
+
+#include "zvision/file/zfs_archive.h"
+
+namespace ZVision {
+
+ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {
+	Common::File zfsFile;
+
+	if (!zfsFile.open(_fileName)) {
+		warning("ZFSArchive::ZFSArchive(): Could not find the archive file");
+		return;
+	}
+
+	readHeaders(&zfsFile);
+
+	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
+}
+
+ZfsArchive::ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream) : _fileName(fileName) {
+	readHeaders(stream);
+
+	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
+}
+
+ZfsArchive::~ZfsArchive() {
+	debug(1, "ZfsArchive Destructor Called");
+	ZfsEntryHeaderMap::iterator it = _entryHeaders.begin();
+	for (; it != _entryHeaders.end(); ++it) {
+		delete it->_value;
+	}
+}
+
+void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
+	// Don't do a straight struct cast since we can't guarantee endianness
+	_header.magic = stream->readUint32LE();
+	_header.unknown1 = stream->readUint32LE();
+	_header.maxNameLength = stream->readUint32LE();
+	_header.filesPerBlock = stream->readUint32LE();
+	_header.fileCount = stream->readUint32LE();
+	_header.xorKey[0] = stream->readByte();
+	_header.xorKey[1] = stream->readByte();
+	_header.xorKey[2] = stream->readByte();
+	_header.xorKey[3] = stream->readByte();
+	_header.fileSectionOffset = stream->readUint32LE();
+
+	uint32 nextOffset;
+
+	do {
+		// Read the offset to the next block
+		nextOffset = stream->readUint32LE();
+
+		// Read in each entry header
+		for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
+			ZfsEntryHeader entryHeader;
+
+			entryHeader.name = readEntryName(stream);
+			entryHeader.offset = stream->readUint32LE();
+			entryHeader.id = stream->readUint32LE();
+			entryHeader.size = stream->readUint32LE();
+			entryHeader.time = stream->readUint32LE();
+			entryHeader.unknown = stream->readUint32LE();
+
+			if (entryHeader.size != 0)
+				_entryHeaders[entryHeader.name] = new ZfsEntryHeader(entryHeader);
+		}
+
+		// Seek to the next block of headers
+		stream->seek(nextOffset);
+	} while (nextOffset != 0);
+}
+
+Common::String ZfsArchive::readEntryName(Common::SeekableReadStream *stream) const {
+	// Entry Names are at most 16 bytes and are null padded
+	char buffer[16];
+	stream->read(buffer, 16);
+
+	return Common::String(buffer);
+}
+
+bool ZfsArchive::hasFile(const Common::String &name) const {
+	return _entryHeaders.contains(name);
+}
+
+int ZfsArchive::listMembers(Common::ArchiveMemberList &list) const {
+	int matches = 0;
+
+	for (ZfsEntryHeaderMap::const_iterator it = _entryHeaders.begin(); it != _entryHeaders.end(); ++it) {
+		list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(it->_value->name, this)));
+		matches++;
+	}
+
+	return matches;
+}
+
+const Common::ArchiveMemberPtr ZfsArchive::getMember(const Common::String &name) const {
+	if (!_entryHeaders.contains(name))
+		return Common::ArchiveMemberPtr();
+
+	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
+}
+
+Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::String &name) const {
+	if (!_entryHeaders.contains(name)) {
+		return 0;
+	}
+
+	ZfsEntryHeader *entryHeader = _entryHeaders[name];
+
+	Common::File zfsArchive;
+	zfsArchive.open(_fileName);
+	zfsArchive.seek(entryHeader->offset);
+
+	// This *HAS* to be malloc (not new[]) because MemoryReadStream uses free() to free the memory
+	byte *buffer = (byte *)malloc(entryHeader->size);
+	zfsArchive.read(buffer, entryHeader->size);
+	// Decrypt the data in place
+	if (_header.xorKey != 0)
+		unXor(buffer, entryHeader->size, _header.xorKey);
+
+	return new Common::MemoryReadStream(buffer, entryHeader->size, DisposeAfterUse::YES);
+}
+
+void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
+	for (uint32 i = 0; i < length; ++i)
+		buffer[i] ^= xorKey[i % 4];
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/file/zfs_archive.h b/engines/zvision/file/zfs_archive.h
new file mode 100644
index 0000000000..571591a6d1
--- /dev/null
+++ b/engines/zvision/file/zfs_archive.h
@@ -0,0 +1,125 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_ZFS_ARCHIVE_H
+#define ZVISION_ZFS_ARCHIVE_H
+
+#include "common/archive.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+
+struct ZfsHeader {
+	uint32 magic;
+	uint32 unknown1;
+	uint32 maxNameLength;
+	uint32 filesPerBlock;
+	uint32 fileCount;
+	byte xorKey[4];
+	uint32 fileSectionOffset;
+};
+
+struct ZfsEntryHeader {
+	Common::String name;
+	uint32 offset;
+	uint32 id;
+	uint32 size;
+	uint32 time;
+	uint32 unknown;
+};
+
+typedef Common::HashMap<Common::String, ZfsEntryHeader *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
+
+class ZfsArchive : public Common::Archive {
+public:
+	ZfsArchive(const Common::String &fileName);
+	ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream);
+	~ZfsArchive();
+
+	/**
+	 * Check if a member with the given name is present in the Archive.
+	 * Patterns are not allowed, as this is meant to be a quick File::exists()
+	 * replacement.
+	 */
+	bool hasFile(const Common::String &fileName) const;
+
+	/**
+	 * Add all members of the Archive to list.
+	 * Must only append to list, and not remove elements from it.
+	 *
+	 * @return    The number of names added to list
+	 */
+	int listMembers(Common::ArchiveMemberList &list) const;
+
+	/**
+	 * Returns a ArchiveMember representation of the given file.
+	 */
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
+
+	/**
+	 * Create a stream bound to a member with the specified name in the
+	 * archive. If no member with this name exists, 0 is returned.
+	 *
+	 * @return    The newly created input stream
+	 */
+	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
+
+private:
+	const Common::String _fileName;
+	ZfsHeader _header;
+	ZfsEntryHeaderMap _entryHeaders;
+
+	/**
+	 * Parses the zfs file into file entry headers that can be used later
+	 * to get the entry data.
+	 *
+	 * @param stream    The contents of the zfs file
+	 */
+	void readHeaders(Common::SeekableReadStream *stream);
+
+	/**
+	 * Entry names are contained within a 16 byte block. This reads the block
+	 * and converts it the name to a Common::String
+	 *
+	 * @param stream    The zfs file stream
+	 * @return          The entry file name
+	 */
+	Common::String readEntryName(Common::SeekableReadStream *stream) const;
+
+	/**
+	 * ZFS file entries can be encrypted using XOR encoding. This method
+	 * decodes the buffer in place using the supplied xorKey.
+	 *
+	 * @param buffer    The data to decode
+	 * @param length    Length of buffer
+	 */
+	void unXor(byte *buffer, uint32 length, const byte *xorKey) const;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 97d47e3920..e2ad13a330 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -27,7 +27,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/text.h"
 
-#include "zvision/utility/lzss_read_stream.h"
+#include "zvision/file/lzss_read_stream.h"
 
 #include "common/file.h"
 #include "common/system.h"
diff --git a/engines/zvision/graphics/subtitles.cpp b/engines/zvision/graphics/subtitles.cpp
index 784721562a..d2c56f0991 100644
--- a/engines/zvision/graphics/subtitles.cpp
+++ b/engines/zvision/graphics/subtitles.cpp
@@ -22,7 +22,7 @@
 
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/subtitles.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
 
 namespace ZVision {
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index c9a1cb7187..1d89e22584 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -5,8 +5,10 @@ MODULE_OBJS := \
 	core/events.o \
 	core/menu.o \
 	core/save_manager.o \
-	core/search_manager.o \
 	detection.o \
+	file/lzss_read_stream.o \
+	file/search_manager.o \
+	file/zfs_archive.o \
 	graphics/cursors/cursor_manager.o \
 	graphics/cursors/cursor.o \
 	graphics/effects/fog.o \
@@ -43,9 +45,7 @@ MODULE_OBJS := \
 	text/string_manager.o \
 	text/text.o \
 	utility/clock.o \
-	utility/lzss_read_stream.o \
 	utility/utility.o \
-	utility/zfs_archive.o \
 	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index 1a04c67988..d275bc8769 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -28,7 +28,7 @@
 #include "graphics/colormasks.h"
 
 #include "zvision/zvision.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/graphics/truetype_font.h"
 
diff --git a/engines/zvision/utility/lzss_read_stream.cpp b/engines/zvision/utility/lzss_read_stream.cpp
deleted file mode 100644
index bbe6e35f76..0000000000
--- a/engines/zvision/utility/lzss_read_stream.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/utility/lzss_read_stream.h"
-
-namespace ZVision {
-
-LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)
-	: _source(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);
-}
-
-uint32 LzssReadStream::decompressBytes(byte *destination, uint32 numberOfBytes) {
-	uint32 destinationCursor = 0;
-
-	while (destinationCursor < numberOfBytes) {
-		byte flagbyte = _source->readByte();
-		if (_source->eos())
-			break;
-		uint mask = 1;
-
-		for (int i = 0; i < 8; ++i) {
-			if ((flagbyte & mask) == mask) {
-				byte data = _source->readByte();
-				if (_source->eos()) {
-					return destinationCursor;
-				}
-
-				_window[_windowCursor] = data;
-				destination[destinationCursor++] = data;
-
-				// Increment and wrap the window cursor
-				_windowCursor = (_windowCursor + 1) & 0xFFF;
-			} else {
-				byte low = _source->readByte();
-				if (_source->eos()) {
-					return destinationCursor;
-				}
-
-				byte high = _source->readByte();
-				if (_source->eos()) {
-					return destinationCursor;
-				}
-
-				uint16 length = (high & 0xF) + 2;
-				uint16 offset = low | ((high & 0xF0) << 4);
-
-				for (int j = 0; j <= length; ++j) {
-					byte temp = _window[(offset + j) & 0xFFF];
-					_window[_windowCursor] = temp;
-					destination[destinationCursor++] = temp;
-					_windowCursor = (_windowCursor + 1) & 0xFFF;
-				}
-			}
-
-			mask = mask << 1;
-		}
-	}
-
-	return destinationCursor;
-}
-
-bool LzssReadStream::eos() const {
-	return _eosFlag;
-}
-
-uint32 LzssReadStream::read(void *dataPtr, uint32 dataSize) {
-	uint32 bytesRead = decompressBytes(static_cast<byte *>(dataPtr), dataSize);
-	if (bytesRead < dataSize) {
-		// Flag that we're at EOS
-		_eosFlag = true;
-	}
-
-	return dataSize;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/utility/lzss_read_stream.h b/engines/zvision/utility/lzss_read_stream.h
deleted file mode 100644
index 1420621f13..0000000000
--- a/engines/zvision/utility/lzss_read_stream.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_LZSS_STREAM_H
-#define ZVISION_LZSS_STREAM_H
-
-#include "common/stream.h"
-#include "common/array.h"
-
-namespace Common {
-class SeekableReadStream;
-}
-
-namespace ZVision {
-
-class LzssReadStream : public Common::ReadStream {
-public:
-	/**
-	 * A class that decompresses LZSS data and implements ReadStream for easy access
-	 * to the decompiled data.
-	 *
-	 * @param source              The source data
-	 */
-	LzssReadStream(Common::SeekableReadStream *source);
-
-private:
-	enum {
-		BLOCK_SIZE = 0x1000
-	};
-
-private:
-	Common::SeekableReadStream *_source;
-	byte _window[BLOCK_SIZE];
-	uint _windowCursor;
-	bool _eosFlag;
-
-public:
-	bool eos() const;
-	uint32 read(void *dataPtr, uint32 dataSize);
-
-private:
-	/**
-	 * Decompress the next <numberOfBytes> from the source stream. Or until EOS
-	 *
-	 * @param numberOfBytes    How many bytes to decompress. This is a count of source bytes, not destination bytes
-	 */
-	uint32 decompressBytes(byte *destination, uint32 numberOfBytes);
-};
-
-}
-
-#endif
diff --git a/engines/zvision/utility/zfs_archive.cpp b/engines/zvision/utility/zfs_archive.cpp
deleted file mode 100644
index 13b0168e1c..0000000000
--- a/engines/zvision/utility/zfs_archive.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-#include "common/memstream.h"
-#include "common/debug.h"
-#include "common/file.h"
-
-#include "zvision/utility/zfs_archive.h"
-
-namespace ZVision {
-
-ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {
-	Common::File zfsFile;
-
-	if (!zfsFile.open(_fileName)) {
-		warning("ZFSArchive::ZFSArchive(): Could not find the archive file");
-		return;
-	}
-
-	readHeaders(&zfsFile);
-
-	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
-}
-
-ZfsArchive::ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream) : _fileName(fileName) {
-	readHeaders(stream);
-
-	debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size());
-}
-
-ZfsArchive::~ZfsArchive() {
-	debug(1, "ZfsArchive Destructor Called");
-	ZfsEntryHeaderMap::iterator it = _entryHeaders.begin();
-	for (; it != _entryHeaders.end(); ++it) {
-		delete it->_value;
-	}
-}
-
-void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
-	// Don't do a straight struct cast since we can't guarantee endianness
-	_header.magic = stream->readUint32LE();
-	_header.unknown1 = stream->readUint32LE();
-	_header.maxNameLength = stream->readUint32LE();
-	_header.filesPerBlock = stream->readUint32LE();
-	_header.fileCount = stream->readUint32LE();
-	_header.xorKey[0] = stream->readByte();
-	_header.xorKey[1] = stream->readByte();
-	_header.xorKey[2] = stream->readByte();
-	_header.xorKey[3] = stream->readByte();
-	_header.fileSectionOffset = stream->readUint32LE();
-
-	uint32 nextOffset;
-
-	do {
-		// Read the offset to the next block
-		nextOffset = stream->readUint32LE();
-
-		// Read in each entry header
-		for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
-			ZfsEntryHeader entryHeader;
-
-			entryHeader.name = readEntryName(stream);
-			entryHeader.offset = stream->readUint32LE();
-			entryHeader.id = stream->readUint32LE();
-			entryHeader.size = stream->readUint32LE();
-			entryHeader.time = stream->readUint32LE();
-			entryHeader.unknown = stream->readUint32LE();
-
-			if (entryHeader.size != 0)
-				_entryHeaders[entryHeader.name] = new ZfsEntryHeader(entryHeader);
-		}
-
-		// Seek to the next block of headers
-		stream->seek(nextOffset);
-	} while (nextOffset != 0);
-}
-
-Common::String ZfsArchive::readEntryName(Common::SeekableReadStream *stream) const {
-	// Entry Names are at most 16 bytes and are null padded
-	char buffer[16];
-	stream->read(buffer, 16);
-
-	return Common::String(buffer);
-}
-
-bool ZfsArchive::hasFile(const Common::String &name) const {
-	return _entryHeaders.contains(name);
-}
-
-int ZfsArchive::listMembers(Common::ArchiveMemberList &list) const {
-	int matches = 0;
-
-	for (ZfsEntryHeaderMap::const_iterator it = _entryHeaders.begin(); it != _entryHeaders.end(); ++it) {
-		list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(it->_value->name, this)));
-		matches++;
-	}
-
-	return matches;
-}
-
-const Common::ArchiveMemberPtr ZfsArchive::getMember(const Common::String &name) const {
-	if (!_entryHeaders.contains(name))
-		return Common::ArchiveMemberPtr();
-
-	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
-}
-
-Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::String &name) const {
-	if (!_entryHeaders.contains(name)) {
-		return 0;
-	}
-
-	ZfsEntryHeader *entryHeader = _entryHeaders[name];
-
-	Common::File zfsArchive;
-	zfsArchive.open(_fileName);
-	zfsArchive.seek(entryHeader->offset);
-
-	// This *HAS* to be malloc (not new[]) because MemoryReadStream uses free() to free the memory
-	byte *buffer = (byte *)malloc(entryHeader->size);
-	zfsArchive.read(buffer, entryHeader->size);
-	// Decrypt the data in place
-	if (_header.xorKey != 0)
-		unXor(buffer, entryHeader->size, _header.xorKey);
-
-	return new Common::MemoryReadStream(buffer, entryHeader->size, DisposeAfterUse::YES);
-}
-
-void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
-	for (uint32 i = 0; i < length; ++i)
-		buffer[i] ^= xorKey[i % 4];
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/utility/zfs_archive.h b/engines/zvision/utility/zfs_archive.h
deleted file mode 100644
index 571591a6d1..0000000000
--- a/engines/zvision/utility/zfs_archive.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_ZFS_ARCHIVE_H
-#define ZVISION_ZFS_ARCHIVE_H
-
-#include "common/archive.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-struct ZfsHeader {
-	uint32 magic;
-	uint32 unknown1;
-	uint32 maxNameLength;
-	uint32 filesPerBlock;
-	uint32 fileCount;
-	byte xorKey[4];
-	uint32 fileSectionOffset;
-};
-
-struct ZfsEntryHeader {
-	Common::String name;
-	uint32 offset;
-	uint32 id;
-	uint32 size;
-	uint32 time;
-	uint32 unknown;
-};
-
-typedef Common::HashMap<Common::String, ZfsEntryHeader *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> ZfsEntryHeaderMap;
-
-class ZfsArchive : public Common::Archive {
-public:
-	ZfsArchive(const Common::String &fileName);
-	ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream);
-	~ZfsArchive();
-
-	/**
-	 * Check if a member with the given name is present in the Archive.
-	 * Patterns are not allowed, as this is meant to be a quick File::exists()
-	 * replacement.
-	 */
-	bool hasFile(const Common::String &fileName) const;
-
-	/**
-	 * Add all members of the Archive to list.
-	 * Must only append to list, and not remove elements from it.
-	 *
-	 * @return    The number of names added to list
-	 */
-	int listMembers(Common::ArchiveMemberList &list) const;
-
-	/**
-	 * Returns a ArchiveMember representation of the given file.
-	 */
-	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
-
-	/**
-	 * Create a stream bound to a member with the specified name in the
-	 * archive. If no member with this name exists, 0 is returned.
-	 *
-	 * @return    The newly created input stream
-	 */
-	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
-
-private:
-	const Common::String _fileName;
-	ZfsHeader _header;
-	ZfsEntryHeaderMap _entryHeaders;
-
-	/**
-	 * Parses the zfs file into file entry headers that can be used later
-	 * to get the entry data.
-	 *
-	 * @param stream    The contents of the zfs file
-	 */
-	void readHeaders(Common::SeekableReadStream *stream);
-
-	/**
-	 * Entry names are contained within a 16 byte block. This reads the block
-	 * and converts it the name to a Common::String
-	 *
-	 * @param stream    The zfs file stream
-	 * @return          The entry file name
-	 */
-	Common::String readEntryName(Common::SeekableReadStream *stream) const;
-
-	/**
-	 * ZFS file entries can be encrypted using XOR encoding. This method
-	 * decodes the buffer in place using the supplied xorKey.
-	 *
-	 * @param buffer    The data to decode
-	 * @param length    Length of buffer
-	 */
-	void unXor(byte *buffer, uint32 length, const byte *xorKey) const;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 45dc124b58..f9d6bb3e85 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -31,11 +31,11 @@
 #include "zvision/text/string_manager.h"
 #include "zvision/detection.h"
 #include "zvision/core/menu.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/graphics/truetype_font.h"
 #include "zvision/sound/midi.h"
-#include "zvision/utility/zfs_archive.h"
+#include "zvision/file/zfs_archive.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 82030e6944..55dddd4f21 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -26,7 +26,7 @@
 
 #include "zvision/detection.h"
 #include "zvision/utility/clock.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 
 #include "common/random.h"
 #include "common/events.h"
-- 
cgit v1.2.3


From 7630e3204e3b932d9b43bda7dc4b658405fabf33 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 01:21:57 +0200
Subject: ZVISION: Move all the remaining utility classes into the core

---
 engines/zvision/core/clock.cpp                     | 68 ++++++++++++++++++
 engines/zvision/core/clock.h                       | 84 ++++++++++++++++++++++
 engines/zvision/core/console.cpp                   |  2 +-
 engines/zvision/core/utility.cpp                   | 45 ++++++++++++
 engines/zvision/core/utility.h                     | 47 ++++++++++++
 engines/zvision/module.mk                          |  4 +-
 engines/zvision/scripting/control.cpp              |  2 +-
 .../zvision/scripting/controls/fist_control.cpp    |  2 +-
 .../zvision/scripting/controls/hotmov_control.cpp  |  2 +-
 .../zvision/scripting/controls/input_control.cpp   |  2 +-
 .../zvision/scripting/controls/lever_control.cpp   |  2 +-
 .../zvision/scripting/controls/paint_control.cpp   |  2 +-
 .../scripting/controls/push_toggle_control.cpp     |  2 +-
 .../zvision/scripting/controls/safe_control.cpp    |  2 +-
 .../zvision/scripting/controls/save_control.cpp    |  2 +-
 .../zvision/scripting/controls/slot_control.cpp    |  2 +-
 .../zvision/scripting/controls/titler_control.cpp  |  2 +-
 engines/zvision/scripting/scr_file_handling.cpp    |  2 +-
 engines/zvision/scripting/script_manager.cpp       |  2 +-
 engines/zvision/sound/zork_raw.cpp                 |  2 +-
 engines/zvision/utility/clock.cpp                  | 68 ------------------
 engines/zvision/utility/clock.h                    | 84 ----------------------
 engines/zvision/utility/utility.cpp                | 45 ------------
 engines/zvision/utility/utility.h                  | 47 ------------
 engines/zvision/video/video.cpp                    |  2 +-
 engines/zvision/zvision.h                          |  2 +-
 26 files changed, 263 insertions(+), 263 deletions(-)
 create mode 100644 engines/zvision/core/clock.cpp
 create mode 100644 engines/zvision/core/clock.h
 create mode 100644 engines/zvision/core/utility.cpp
 create mode 100644 engines/zvision/core/utility.h
 delete mode 100644 engines/zvision/utility/clock.cpp
 delete mode 100644 engines/zvision/utility/clock.h
 delete mode 100644 engines/zvision/utility/utility.cpp
 delete mode 100644 engines/zvision/utility/utility.h

diff --git a/engines/zvision/core/clock.cpp b/engines/zvision/core/clock.cpp
new file mode 100644
index 0000000000..1425d550b7
--- /dev/null
+++ b/engines/zvision/core/clock.cpp
@@ -0,0 +1,68 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/core/clock.h"
+
+#include "common/system.h"
+
+namespace ZVision {
+
+Clock::Clock(OSystem *system)
+	: _system(system),
+	  _lastTime(0),
+	  _deltaTime(0),
+	  _pausedTime(0),
+	  _paused(false) {
+}
+
+void Clock::update() {
+	uint32 currentTime = _system->getMillis();
+
+	_deltaTime = (currentTime - _lastTime);
+	if (_paused) {
+		_deltaTime -= (currentTime - _pausedTime);
+	}
+
+	if (_deltaTime < 0) {
+		_deltaTime = 0;
+	}
+
+	_lastTime = currentTime;
+}
+
+void Clock::start() {
+	if (_paused) {
+		_lastTime = _system->getMillis();
+		_paused = false;
+	}
+}
+
+void Clock::stop() {
+	if (!_paused) {
+		_pausedTime = _system->getMillis();
+		_paused = true;
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/core/clock.h b/engines/zvision/core/clock.h
new file mode 100644
index 0000000000..cbf52be560
--- /dev/null
+++ b/engines/zvision/core/clock.h
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_CLOCK_H
+#define ZVISION_CLOCK_H
+
+#include "common/types.h"
+
+class OSystem;
+
+namespace ZVision {
+
+/* Class for handling frame to frame deltaTime while keeping track of time pauses/un-pauses */
+class Clock {
+public:
+	Clock(OSystem *system);
+
+private:
+	OSystem *_system;
+	uint32 _lastTime;
+	int32 _deltaTime;
+	uint32 _pausedTime;
+	bool _paused;
+
+public:
+	/**
+	 * Updates _deltaTime with the difference between the current time and
+	 * when the last update() was called.
+	 */
+	void update();
+
+	/**
+	 * Get the delta time since the last frame. (The time between update() calls)
+	 *
+	 * @return    Delta time since the last frame (in milliseconds)
+	 */
+	uint32 getDeltaTime() const {
+		return _deltaTime;
+	}
+
+	/**
+	 * Get the time from the program starting to the last update() call
+	 *
+	 * @return Time from program start to last update() call (in milliseconds)
+	 */
+	uint32 getLastMeasuredTime() {
+		return _lastTime;
+	}
+
+	/**
+	 * Pause the clock. Any future delta times will take this pause into account.
+	 * Has no effect if the clock is already paused.
+	 */
+	void start();
+
+	/**
+	 * Un-pause the clock.
+	 * Has no effect if the clock is already un-paused.
+	 */
+	void stop();
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 76481a3549..eb4d281813 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -30,7 +30,7 @@
 #include "zvision/text/string_manager.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/sound/zork_raw.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/graphics/cursors/cursor.h"
 
 #include "common/system.h"
diff --git a/engines/zvision/core/utility.cpp b/engines/zvision/core/utility.cpp
new file mode 100644
index 0000000000..dcbb41171e
--- /dev/null
+++ b/engines/zvision/core/utility.cpp
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/core/utility.h"
+
+#include "zvision/zvision.h"
+#include "zvision/sound/zork_raw.h"
+
+#include "common/tokenizer.h"
+#include "common/file.h"
+
+namespace ZVision {
+
+void trimCommentsAndWhiteSpace(Common::String *string) {
+	for (int i = string->size() - 1; i >= 0; i--) {
+		if ((*string)[i] == '#') {
+			string->erase(i);
+		}
+	}
+
+	string->trim();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/core/utility.h b/engines/zvision/core/utility.h
new file mode 100644
index 0000000000..0ca26b968d
--- /dev/null
+++ b/engines/zvision/core/utility.h
@@ -0,0 +1,47 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_UTILITY_H
+#define ZVISION_UTILITY_H
+
+#include "common/array.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+/**
+ * Removes any line comments using '#' as a sequence start.
+ * Then removes any trailing and leading 'whitespace' using String::trim()
+ * Note: String::trim uses isspace() to determine what is whitespace and what is not.
+ *
+ * @param string    The string to modify. It is modified in place
+ */
+void trimCommentsAndWhiteSpace(Common::String *string);
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 1d89e22584..18923eeb8f 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -2,9 +2,11 @@ MODULE := engines/zvision
 
 MODULE_OBJS := \
 	core/console.o \
+	core/clock.o \
 	core/events.o \
 	core/menu.o \
 	core/save_manager.o \
+	core/utility.o \
 	detection.o \
 	file/lzss_read_stream.o \
 	file/search_manager.o \
@@ -44,8 +46,6 @@ MODULE_OBJS := \
 	sound/zork_raw.o \
 	text/string_manager.o \
 	text/text.o \
-	utility/clock.o \
-	utility/utility.o \
 	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index 5469106928..86f6a30c8f 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -27,7 +27,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 887ad7950d..40d016f360 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/scripting/controls/fist_control.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/video/rlf_decoder.h"
 
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index b2c9cdd577..4a6d2705b4 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 1b15eacd78..e17a5f6dd8 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -29,7 +29,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/str.h"
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 07eec1fb63..632554e7f2 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index 0ef7618b5b..24306bf4db 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index fcd8cd0356..28c791168a 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 8135eb34cc..cb754ecbe2 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index d773b5fc6f..7de138d8e3 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -24,7 +24,7 @@
 
 #include "zvision/scripting/controls/input_control.h"
 #include "zvision/scripting/controls/save_control.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 7f04c2d311..63578d54ea 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index f0126bebc2..af26aed952 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -28,7 +28,7 @@
 #include "zvision/text/text.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index f97eed6b75..631cb6128e 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -25,7 +25,7 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/scripting/puzzle.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/controls/push_toggle_control.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index c735fe6eb0..605d27216e 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -29,7 +29,7 @@
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/scripting/actions.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 
 #include "common/algorithm.h"
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index c26c33a392..d8fabc419b 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -34,7 +34,7 @@
 #include "zvision/sound/zork_raw.h"
 #include "zvision/zvision.h"
 #include "zvision/detection.h"
-#include "zvision/utility/utility.h"
+#include "zvision/core/utility.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/utility/clock.cpp b/engines/zvision/utility/clock.cpp
deleted file mode 100644
index 0e800a2031..0000000000
--- a/engines/zvision/utility/clock.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/utility/clock.h"
-
-#include "common/system.h"
-
-namespace ZVision {
-
-Clock::Clock(OSystem *system)
-	: _system(system),
-	  _lastTime(0),
-	  _deltaTime(0),
-	  _pausedTime(0),
-	  _paused(false) {
-}
-
-void Clock::update() {
-	uint32 currentTime = _system->getMillis();
-
-	_deltaTime = (currentTime - _lastTime);
-	if (_paused) {
-		_deltaTime -= (currentTime - _pausedTime);
-	}
-
-	if (_deltaTime < 0) {
-		_deltaTime = 0;
-	}
-
-	_lastTime = currentTime;
-}
-
-void Clock::start() {
-	if (_paused) {
-		_lastTime = _system->getMillis();
-		_paused = false;
-	}
-}
-
-void Clock::stop() {
-	if (!_paused) {
-		_pausedTime = _system->getMillis();
-		_paused = true;
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/utility/clock.h b/engines/zvision/utility/clock.h
deleted file mode 100644
index cbf52be560..0000000000
--- a/engines/zvision/utility/clock.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_CLOCK_H
-#define ZVISION_CLOCK_H
-
-#include "common/types.h"
-
-class OSystem;
-
-namespace ZVision {
-
-/* Class for handling frame to frame deltaTime while keeping track of time pauses/un-pauses */
-class Clock {
-public:
-	Clock(OSystem *system);
-
-private:
-	OSystem *_system;
-	uint32 _lastTime;
-	int32 _deltaTime;
-	uint32 _pausedTime;
-	bool _paused;
-
-public:
-	/**
-	 * Updates _deltaTime with the difference between the current time and
-	 * when the last update() was called.
-	 */
-	void update();
-
-	/**
-	 * Get the delta time since the last frame. (The time between update() calls)
-	 *
-	 * @return    Delta time since the last frame (in milliseconds)
-	 */
-	uint32 getDeltaTime() const {
-		return _deltaTime;
-	}
-
-	/**
-	 * Get the time from the program starting to the last update() call
-	 *
-	 * @return Time from program start to last update() call (in milliseconds)
-	 */
-	uint32 getLastMeasuredTime() {
-		return _lastTime;
-	}
-
-	/**
-	 * Pause the clock. Any future delta times will take this pause into account.
-	 * Has no effect if the clock is already paused.
-	 */
-	void start();
-
-	/**
-	 * Un-pause the clock.
-	 * Has no effect if the clock is already un-paused.
-	 */
-	void stop();
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/utility/utility.cpp
deleted file mode 100644
index e09545a90d..0000000000
--- a/engines/zvision/utility/utility.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/utility/utility.h"
-
-#include "zvision/zvision.h"
-#include "zvision/sound/zork_raw.h"
-
-#include "common/tokenizer.h"
-#include "common/file.h"
-
-namespace ZVision {
-
-void trimCommentsAndWhiteSpace(Common::String *string) {
-	for (int i = string->size() - 1; i >= 0; i--) {
-		if ((*string)[i] == '#') {
-			string->erase(i);
-		}
-	}
-
-	string->trim();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/utility/utility.h b/engines/zvision/utility/utility.h
deleted file mode 100644
index 0ca26b968d..0000000000
--- a/engines/zvision/utility/utility.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_UTILITY_H
-#define ZVISION_UTILITY_H
-
-#include "common/array.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-/**
- * Removes any line comments using '#' as a sequence start.
- * Then removes any trailing and leading 'whitespace' using String::trim()
- * Note: String::trim uses isspace() to determine what is whitespace and what is not.
- *
- * @param string    The string to modify. It is modified in place
- */
-void trimCommentsAndWhiteSpace(Common::String *string);
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index c8f968d975..189fb22194 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -27,7 +27,7 @@
 #include "graphics/surface.h"
 
 #include "zvision/zvision.h"
-#include "zvision/utility/clock.h"
+#include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 55dddd4f21..78c1c824a1 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -25,7 +25,7 @@
 #define ZVISION_ZVISION_H
 
 #include "zvision/detection.h"
-#include "zvision/utility/clock.h"
+#include "zvision/core/clock.h"
 #include "zvision/file/search_manager.h"
 
 #include "common/random.h"
-- 
cgit v1.2.3


From 77705752efa00ab7f6c65ff8d99e4d9c3fdc4929 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 01:58:05 +0200
Subject: ZVISION: Move trimCommentsAndWhiteSpace() into the script manager

This allows us to remove the last remnants of utility.*
---
 engines/zvision/core/console.cpp                   |  1 -
 engines/zvision/core/utility.cpp                   | 45 ---------------------
 engines/zvision/core/utility.h                     | 47 ----------------------
 engines/zvision/module.mk                          |  1 -
 engines/zvision/scripting/control.cpp              |  9 ++---
 .../zvision/scripting/controls/fist_control.cpp    |  5 +--
 .../zvision/scripting/controls/hotmov_control.cpp  |  5 +--
 .../zvision/scripting/controls/input_control.cpp   |  5 +--
 .../zvision/scripting/controls/lever_control.cpp   |  5 +--
 .../zvision/scripting/controls/paint_control.cpp   |  5 +--
 .../scripting/controls/push_toggle_control.cpp     |  5 +--
 .../zvision/scripting/controls/safe_control.cpp    |  5 +--
 .../zvision/scripting/controls/save_control.cpp    |  5 +--
 .../zvision/scripting/controls/slot_control.cpp    |  5 +--
 .../zvision/scripting/controls/titler_control.cpp  |  5 +--
 engines/zvision/scripting/scr_file_handling.cpp    |  1 -
 engines/zvision/scripting/script_manager.cpp       | 11 ++++-
 engines/zvision/scripting/script_manager.h         |  9 +++++
 engines/zvision/sound/zork_raw.cpp                 |  1 -
 19 files changed, 43 insertions(+), 132 deletions(-)
 delete mode 100644 engines/zvision/core/utility.cpp
 delete mode 100644 engines/zvision/core/utility.h

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index eb4d281813..4dd10d6f40 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -30,7 +30,6 @@
 #include "zvision/text/string_manager.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/sound/zork_raw.h"
-#include "zvision/core/utility.h"
 #include "zvision/graphics/cursors/cursor.h"
 
 #include "common/system.h"
diff --git a/engines/zvision/core/utility.cpp b/engines/zvision/core/utility.cpp
deleted file mode 100644
index dcbb41171e..0000000000
--- a/engines/zvision/core/utility.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/core/utility.h"
-
-#include "zvision/zvision.h"
-#include "zvision/sound/zork_raw.h"
-
-#include "common/tokenizer.h"
-#include "common/file.h"
-
-namespace ZVision {
-
-void trimCommentsAndWhiteSpace(Common::String *string) {
-	for (int i = string->size() - 1; i >= 0; i--) {
-		if ((*string)[i] == '#') {
-			string->erase(i);
-		}
-	}
-
-	string->trim();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/core/utility.h b/engines/zvision/core/utility.h
deleted file mode 100644
index 0ca26b968d..0000000000
--- a/engines/zvision/core/utility.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_UTILITY_H
-#define ZVISION_UTILITY_H
-
-#include "common/array.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-/**
- * Removes any line comments using '#' as a sequence start.
- * Then removes any trailing and leading 'whitespace' using String::trim()
- * Note: String::trim uses isspace() to determine what is whitespace and what is not.
- *
- * @param string    The string to modify. It is modified in place
- */
-void trimCommentsAndWhiteSpace(Common::String *string);
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 18923eeb8f..00652f0824 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -6,7 +6,6 @@ MODULE_OBJS := \
 	core/events.o \
 	core/menu.o \
 	core/save_manager.o \
-	core/utility.o \
 	detection.o \
 	file/lzss_read_stream.o \
 	file/search_manager.o \
diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index 86f6a30c8f..127f35ef12 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -27,7 +27,6 @@
 
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
@@ -43,7 +42,7 @@ void Control::parsePanoramaControl(ZVision *engine, Common::SeekableReadStream &
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (line.matchString("angle*", true)) {
@@ -67,7 +66,7 @@ void Control::parsePanoramaControl(ZVision *engine, Common::SeekableReadStream &
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	}
 
 	renderTable->generateRenderTable();
@@ -79,7 +78,7 @@ void Control::parseTiltControl(ZVision *engine, Common::SeekableReadStream &stre
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (line.matchString("angle*", true)) {
@@ -99,7 +98,7 @@ void Control::parseTiltControl(ZVision *engine, Common::SeekableReadStream &stre
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	}
 
 	renderTable->generateRenderTable();
diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 40d016f360..34a64b4298 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -27,7 +27,6 @@
 #include "zvision/scripting/controls/fist_control.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/utility.h"
 #include "zvision/video/rlf_decoder.h"
 
 #include "common/stream.h"
@@ -63,7 +62,7 @@ FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -82,7 +81,7 @@ FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 }
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 4a6d2705b4..e77272ec73 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -28,7 +28,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
@@ -53,7 +52,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -84,7 +83,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 }
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index e17a5f6dd8..6959f9eca9 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -29,7 +29,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/str.h"
 #include "common/stream.h"
@@ -50,7 +49,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _animation(NULL) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -108,7 +107,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 }
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 632554e7f2..71dd52f40f 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -28,7 +28,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
@@ -53,7 +52,7 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 
 	Common::String param;
 	Common::String values;
@@ -73,7 +72,7 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index 24306bf4db..f06dee25ad 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -28,7 +28,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/core/utility.h"
 
 namespace ZVision {
 
@@ -44,7 +43,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -93,7 +92,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 28c791168a..3811498cd5 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -27,7 +27,6 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
@@ -42,7 +41,7 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -78,7 +77,7 @@ PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::Seekab
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index cb754ecbe2..71be692431 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -28,7 +28,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 #include "common/file.h"
@@ -57,7 +56,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -102,7 +101,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 	renderFrame(_curState);
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index 7de138d8e3..e27faa50b6 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -24,7 +24,6 @@
 
 #include "zvision/scripting/controls/input_control.h"
 #include "zvision/scripting/controls/save_control.h"
-#include "zvision/core/utility.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
@@ -42,7 +41,7 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 	  _saveControl(false) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -66,7 +65,7 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 63578d54ea..292a2b4bc9 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -28,7 +28,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
@@ -42,7 +41,7 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -98,7 +97,7 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index af26aed952..10ba0af655 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -28,7 +28,6 @@
 #include "zvision/text/text.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/core/utility.h"
 
 #include "common/stream.h"
 
@@ -42,7 +41,7 @@ TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-	trimCommentsAndWhiteSpace(&line);
+	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 	Common::String param;
 	Common::String values;
 	getParams(line, param, values);
@@ -62,7 +61,7 @@ TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 		}
 
 		line = stream.readLine();
-		trimCommentsAndWhiteSpace(&line);
+		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
 
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 631cb6128e..56d0c3bd7f 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -25,7 +25,6 @@
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 
-#include "zvision/core/utility.h"
 #include "zvision/scripting/puzzle.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/controls/push_toggle_control.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 605d27216e..65077dfd12 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -29,7 +29,6 @@
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/scripting/actions.h"
-#include "zvision/core/utility.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 
 #include "common/algorithm.h"
@@ -812,6 +811,16 @@ void ScriptManager::flushEvent(Common::EventType type) {
 	}
 }
 
+void ScriptManager::trimCommentsAndWhiteSpace(Common::String *string) const {
+	for (int i = string->size() - 1; i >= 0; i--) {
+		if ((*string)[i] == '#') {
+			string->erase(i);
+		}
+	}
+
+	string->trim();
+}
+
 ValueSlot::ValueSlot(ScriptManager *scriptManager, const char *slotValue):
 	_scriptManager(scriptManager) {
 	value = 0;
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 89b961634b..1e308faf0d 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -247,6 +247,15 @@ public:
 	Location getLastLocation();
 	Location getLastMenuLocation();
 
+	/**
+	 * Removes any line comments using '#' as a sequence start.
+	 * Then removes any trailing and leading 'whitespace' using String::trim()
+	 * Note: String::trim uses isspace() to determine what is whitespace and what is not.
+	 *
+	 * @param string    The string to modify. It is modified in place
+	 */
+	void trimCommentsAndWhiteSpace(Common::String *string) const;
+
 private:
 	void referenceTableAddPuzzle(uint32 key, PuzzleRef ref);
 	void addPuzzlesToReferenceTable(ScriptScope &scope);
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index d8fabc419b..78c851e132 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -34,7 +34,6 @@
 #include "zvision/sound/zork_raw.h"
 #include "zvision/zvision.h"
 #include "zvision/detection.h"
-#include "zvision/core/utility.h"
 
 namespace ZVision {
 
-- 
cgit v1.2.3


From 8efcc3cf26b80ca0451da4c30113b3610f685467 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 03:46:31 +0200
Subject: ZVISION: Bugfix for addDir() - fixes the Nemesis subtitle patch

---
 engines/zvision/file/search_manager.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 752b52b01f..1a6a96ec6d 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -38,7 +38,10 @@ SearchManager::SearchManager(const Common::String &rootPath, int depth) {
 
 	listDirRecursive(_dirList, fsNode, depth);
 
-	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();)
+	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();) {
+		if ((*it).hasSuffix("\\") || (*it).hasSuffix("/"))
+			(*it).deleteLastChar();
+
 		if (it->size() == _root.size())
 			it = _dirList.erase(it);
 		else if (it->size() > _root.size()) {
@@ -46,6 +49,7 @@ SearchManager::SearchManager(const Common::String &rootPath, int depth) {
 			it++;
 		} else
 			it++;
+	}
 }
 
 SearchManager::~SearchManager() {
-- 
cgit v1.2.3


From 1241efcbcae7ea053067b2a80dcd93e88b4d0cea Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 03:47:28 +0200
Subject: ZVISION: Allow 2x scaling up in videos again

This fixes the alchemists and cup sequence in Nemesis
---
 engines/zvision/scripting/sidefx/animation_node.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index e15f8ec00f..3a21227d1a 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -120,8 +120,10 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 				// We only scale down the animation to fit its frame, not up, otherwise we
 				// end up with distorted animations - e.g. the armor visor in location cz1e
 				// in Nemesis (one of the armors inside Irondune), or the planet in location
-				// aa10 in Nemesis (Juperon, outside the asylum).
-				if (frame->w > dstw || frame->h > dsth) {
+				// aa10 in Nemesis (Juperon, outside the asylum). We do allow scaling up only
+				// when a simple 2x filter is requested (e.g. the alchemists and cup sequence
+				// in Nemesis)
+				if (frame->w > dstw || frame->h > dsth || (frame->w == dstw / 2 && frame->h == dsth / 2)) {
 					if (nod->_scaled)
 						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
 							delete nod->_scaled;
-- 
cgit v1.2.3


From 003269dc36288a99d15c65f44d2181ad08dc6181 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 16 Dec 2014 11:08:40 +0200
Subject: ZVISION: Fix the display of state variables, such as the high score

Common::String::format() was used incorrectly. Also, state variables
were handled incorrectly in the TTY text parser
---
 engines/zvision/scripting/sidefx/ttytext_node.cpp | 2 +-
 engines/zvision/text/text.cpp                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
index 1fb7c10792..9a7fa01649 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.cpp
+++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp
@@ -96,7 +96,7 @@ bool ttyTextNode::process(uint32 deltaTimeInMillis) {
 
 				if (ret & TXT_RET_HASSTBOX) {
 					Common::String buf;
-					buf.format("%d", _style.statebox);
+					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style.statebox));
 
 					for (uint8 j = 0; j < buf.size(); j++)
 						outchar(buf[j]);
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 0ccca214d7..406c36e5b0 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -396,7 +396,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 
 			if (ret & TXT_RET_HASSTBOX) {
 				Common::String buf3;
-				buf3.format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
+				buf3 = Common::String::format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
 				buf += buf3;
 				textPosition += buf3.size();
 			}
-- 
cgit v1.2.3


From 64435ef25fb52a9113b6c73619c80bc072372950 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 16 Dec 2014 19:40:27 +0100
Subject: ACCESS: Fix cmdFreeSound, which fixes the sound played during the
 death animation

---
 engines/access/scripts.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index d8f9a51e8f..b1cc2897ce 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -792,9 +792,11 @@ void Scripts::cmdFreeSound() {
 			_vm->_events->pollEvents();
 		} while (!_vm->shouldQuit() && sound._playingSound);
 
-		// Free the sound
-		delete sound._soundTable[0]._res;
-		sound._soundTable.remove_at(0);
+		// Free the sounds
+		while (sound._soundTable.size() > 0) {
+			delete sound._soundTable[0]._res;
+			sound._soundTable.remove_at(0);
+		}
 	}
 }
 
-- 
cgit v1.2.3


From c3312749ff20c76a527edcc0a30291cf6033c694 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 16 Dec 2014 22:41:27 +0100
Subject: ACCESS: Fix crash when getting randomly shot in the cabin

---
 engines/access/amazon/amazon_resources.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 694454cc3e..989dcf15f0 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1771,7 +1771,7 @@ const char *const DEATH_TEXT_DEMO[34] = {
 	"SAM SALVADOR NOTICES SOMEONE HAS BEEN PLAYING WITH THE CARGO. HE TRACKS YOU DOWN AND LETS YOU HAVE IT.",
 	"THE GUARD COMES AROUND THE CORNER.  HE DECIDES THAT THREE LEAD SLUGS WILL TEACH YOU TO BE MORE POLITE.",
 	"THE CAPTAIN IS WAITING OUTSIDE THE DOOR.",
-	"THE CAPTAIN',27h,'S RANDOM SHOOTING FINALLY FINDS ITS TARGET.",
+	"THE CAPTAIN'S RANDOM SHOOTING FINALLY FINDS ITS TARGET.",
 	"THE CRATE OUTSIDE THE WINDOW EXPLODES, DESTROYING THE SHIP.  UNFORTUNATELY, YOU'RE STILL ABOARD.",
 	"THE DOOR WAS NOT BARRED AND THE CAPTAIN WALKS RIGHT IN AND PARTS YOUR HAIR.",
 	"",
@@ -1796,7 +1796,7 @@ const char *const DEATH_TEXT_DEMO[34] = {
 	"YOU DO NOT GET FAR ENOUGH AWAY BEFORE THE DYNAMITE EXPLODES AND YOU ARE BLOWN INTO A THOUSAND PIECES.",
 	"STANDING OUT IN THE OPEN YOU ARE EXPOSED TO THE HAIL OF BULLETS FROM SANCHEZ' MEN.",
 	"THE AMAZON SENTINELS SPOT YOU AND FILL YOU FULL OF ARROWS.",
-	"SAM MAY BE UGLY, BUT HE',27h,'S NOT DEAF.  HE HEARS ALL THE NOISE YOU ARE MAKING AND CANCELS YOUR BOARDING PASS.",
+	"SAM MAY BE UGLY, BUT HE'S NOT DEAF.  HE HEARS ALL THE NOISE YOU ARE MAKING AND CANCELS YOUR BOARDING PASS.",
 	"WITH THE BAR OFF THE DOOR THE CAPTAIN WALTZES IN AND BLOWS YOU AWAY"
 };
 
-- 
cgit v1.2.3


From e0cb8f52f73ba927d5bf24c9b44f6d28743509df Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 17 Dec 2014 00:13:54 +0100
Subject: SCI: fix kq6 azure&ariel scenes in dual mode #6750

script patch
fixes bug #6750 in dual mode (audio+text)
---
 engines/sci/engine/script_patches.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 3d76848a76..03cd1d06e9 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1214,6 +1214,26 @@ static const uint16 kq6CDPatchAudioTextSupportGirlInTheTower[] = {
 	PATCH_END
 };
 
+//  Fixes dual mode for scenes with Azure and Ariel (room 370)
+//   Effectively same patch as the one for fixing "Girl In The Tower"
+// Applies to at least: PC-CD
+// Patched methods: rm370::init, caughtAtGateCD::changeState, caughtAtGateTXT::changeState, toLabyrinth::changeState
+// Fixes bug: #6750
+static const uint16 kq6CDSignatureAudioTextSupportAzureAriel[] = {
+	SIG_MAGICDWORD,
+	0x89, 0x5a,                         // lsg global[5a]
+	0x35, 0x02,                         // ldi 02
+	0x1a,                               // eq?
+	0x31,                               // bnt [jump-for-text-code]
+	SIG_END
+};
+
+static const uint16 kq6CDPatchAudioTextSupportAzureAriel[] = {
+	PATCH_ADDTOOFFSET(+4),
+	0x12,                               // and
+	PATCH_END
+};
+
 // Additional patch specifically for King's Quest 6
 //  Adds another button state for the text/audio button. We currently use the "speech" view for "dual" mode.
 // View 947, loop 9, cel 0+1 -> "text"
@@ -1306,6 +1326,7 @@ static const SciScriptPatcherEntry kq6Signatures[] = {
 	{ false,  1009, "CD: audio + text support KQ6 Guards",            2, kq6CDSignatureAudioTextSupportGuards,         kq6CDPatchAudioTextSupportGuards },
 	{ false,  1027, "CD: audio + text support KQ6 Stepmother",        1, kq6CDSignatureAudioTextSupportStepmother,     kq6CDPatchAudioTextSupportJumpAlways },
 	{ false,   740, "CD: audio + text support KQ6 Girl In The Tower", 1, kq6CDSignatureAudioTextSupportGirlInTheTower, kq6CDPatchAudioTextSupportGirlInTheTower },
+	{ false,   370, "CD: audio + text support KQ6 Azure & Ariel",     6, kq6CDSignatureAudioTextSupportAzureAriel,     kq6CDPatchAudioTextSupportAzureAriel },
 	{ false,   903, "CD: audio + text support KQ6 menu",              1, kq6CDSignatureAudioTextMenuSupport,           kq6CDPatchAudioTextMenuSupport },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
-- 
cgit v1.2.3


From 7ae4fca38e792e8d27664d58562eafe6bd049a4d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 16 Dec 2014 22:21:49 -0500
Subject: ACCESS: Fix foreground parallex in opening scene

---
 engines/access/amazon/amazon_logic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index eb7d8b567d..5ac7341018 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -89,7 +89,7 @@ void CampScene::mWhileDoOpen() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 
-	screen.setBufferScan();
+	screen.setDisplayScan();
 	events.hideCursor();
 	screen.forceFadeOut();
 	_skipStart = false;
-- 
cgit v1.2.3


From 3a1203ff734f7923042ed0b5ab96a460e72369ec Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 07:47:55 +0100
Subject: ACCESS: Use a while statement as suggested by _sev in the merge
 request

Also fix a formatting issue pointed out by _sev
---
 engines/access/access.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index b67aebfcc0..c0f8905681 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -248,10 +248,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 			break;
 	}
 
-	if (soundsLeft == 0)
-		return;
-
-	for (;;) {
+	while (soundsLeft) {
 		_sound->freeSounds();
 		Resource *res = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundTable.push_back(SoundEntry(res, 1));
@@ -270,8 +267,6 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 		} else {
 			++_sndSubFile;
 			--soundsLeft;
-			if (soundsLeft == 0)
-				break;
 		}
 	}
 }
@@ -519,7 +514,8 @@ bool AccessEngine::readSavegameHeader(Common::InSaveFile *in, AccessSavegameHead
 	// Read in the string
 	header._saveName.clear();
 	char ch;
-	while ((ch = (char)in->readByte()) != '\0') header._saveName += ch;
+	while ((ch = (char)in->readByte()) != '\0')
+		header._saveName += ch;
 
 	// Get the thumbnail
 	header._thumbnail = Graphics::loadThumbnail(*in);
-- 
cgit v1.2.3


From 56d28bc4c8bececc6bba2788e727718c5741d0ec Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 07:58:24 +0100
Subject: ACCESS: Split doCredit in two, putting demo code in a separate
 function

---
 engines/access/amazon/amazon_logic.cpp | 112 ++++++++++++++++-----------------
 engines/access/amazon/amazon_logic.h   |   1 +
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 5ac7341018..0200f7a61b 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -236,74 +236,74 @@ void Opening::doCredit() {
 
 	if (_pCount <= 75)
 		_vm->_buffer2.plotImage(_vm->_objectsTable[0], _vm->isDemo()? 24 : 0, Common::Point(90, 35));
-	else if (_pCount <= 210) {
-		if (_vm->isDemo())
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 25, Common::Point(82, 35));
-		else
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 1, Common::Point(65, 35));
-	} else if (_pCount <= 272) {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 23, Common::Point(77, 20));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(50, 35));
-		} else
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
+	else if (_pCount <= 210)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 1, Common::Point(65, 35));
+	else if (_pCount <= 272)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
+	else if (_pCount <= 334)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
+	else if (_pCount <= 396)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
+	else if (_pCount <= 458) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(8, 5));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(88, 55));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(194, 98));
+	} else if (_pCount <= 520) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(32, 13));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 8, Common::Point(162, 80));
+	} else if (_pCount <= 580) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(18, 15));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(164, 81));
+	} else
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(106, 55));
+}
+
+void Opening::doCreditDemo() {
+	if (_pCount < 15)
+		return;
+
+	if (_pCount <= 75)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], _vm->isDemo()? 24 : 0, Common::Point(90, 35));
+	else if (_pCount <= 210)
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 25, Common::Point(82, 35));
+	else if (_pCount <= 272) {
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 23, Common::Point(77, 20));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(50, 35));
 	} else if (_pCount <= 334) {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 16, Common::Point(200, 70));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(170, 85));
-		} else
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 16, Common::Point(200, 70));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(170, 85));
 	} else if (_pCount <= 396) {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 15, Common::Point(65, 15));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(30, 30));
-		} else
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 15, Common::Point(65, 15));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(30, 30));
 	} else if (_pCount <= 458) {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 19, Common::Point(123, 40));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(115, 55));
-		} else {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(8, 5));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(88, 55));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(194, 98));
-		}
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 19, Common::Point(123, 40));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(115, 55));
 	} else if (_pCount <= 520) {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 18, Common::Point(50, 15));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(40, 30));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(40, 55));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 20, Common::Point(198, 95));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(160, 110));
-		} else {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(32, 13));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 8, Common::Point(162, 80));
-		}
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 18, Common::Point(50, 15));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(40, 30));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 0, Common::Point(40, 55));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 20, Common::Point(198, 95));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(160, 110));
 	} else if (_pCount <= 580) {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 21, Common::Point(40, 10));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(20, 25));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 22, Common::Point(145, 50));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(125, 65));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(207, 90));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(200, 105));
-		} else {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 9, Common::Point(18, 15));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 10, Common::Point(164, 81));
-		}
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 21, Common::Point(40, 10));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 6, Common::Point(20, 25));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 22, Common::Point(145, 50));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 7, Common::Point(125, 65));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 12, Common::Point(207, 90));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 5, Common::Point(200, 105));
 	} else {
-		if (_vm->isDemo()) {
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(125, 30));
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(115, 45));
-		} else
-			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(106, 55));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 11, Common::Point(125, 30));
+		_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(115, 45));
 	}
 }
 
 void Opening::scrollTitle() {
 	_vm->copyBF1BF2();
 	_vm->_newRects.clear();
-	doCredit();
+	if (_vm->isDemo())
+		doCreditDemo();
+	else
+		doCredit();
 	_vm->copyRects();
 	_vm->copyBF2Vid();
 }
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 9b429d8108..c8e77455b0 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -84,6 +84,7 @@ private:
 
 	void doTitle();
 	void doCredit();
+	void doCreditDemo();
 	void scrollTitle();
 	void doTent();
 public:
-- 
cgit v1.2.3


From 1496ad9717f499a73ce96cf318c6bf8070f02915 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 08:29:24 +0100
Subject: ACCESS: Split mouse data per line

---
 engines/access/amazon/amazon_resources.cpp | 317 ++++++++++++++++++++---------
 1 file changed, 217 insertions(+), 100 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 989dcf15f0..55302c0708 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -71,126 +71,243 @@ const char *const FILENAMES_DEMO[] = {
 	"R49.AP", "R49.AP", "R49.AP", "R49.AP", "DEAD.AP", "EST.AP",
 	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP"
 };
+
 const byte MOUSE0[] = {
+	// hotspot x and y, uint16 LE
 	0, 0, 0, 0,
-	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
-	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
-	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
-	6, 6, 6, 6, 6, 1, 0, 7, 6, 6, 6, 6, 6, 6, 1, 0, 6, 6,
-	6, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6, 1, 2, 3, 6, 6, 1, 3,
-	3, 6, 6, 1, 3, 3, 6, 6, 1, 4, 2, 6, 1
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0, 2, 6, 1,
+	0, 3, 6, 6, 1, 
+	0, 3, 6, 6, 1, 
+	0, 4, 6, 6, 6, 1, 
+	0, 4, 6, 6, 6, 1, 
+	0, 5, 6, 6, 6, 6, 1, 
+	0, 5, 6, 6, 6, 6, 1, 
+	0, 6, 6, 6, 6, 6, 6, 1,
+	0, 6, 6, 6, 6, 6, 6, 1,
+	0, 7, 6, 6, 6, 6, 6, 6, 1,
+	0, 6, 6, 6, 6, 6, 6, 1,
+	0, 5, 6, 6, 6, 6, 1,
+	2, 3, 6, 6, 1,
+	3, 3, 6, 6, 1,
+	3, 3, 6, 6, 1,
+	4, 2, 6, 1
 };
+
 const byte MOUSE1[] = {
-	0x07, 0x00, 0x07, 0x00, 0x06, 0x01, 0x05, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x03, 0x07,
-	0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
-	0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01,
-	0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x0D, 0x05, 0x00,
-	0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05, 0x01, 0x0B, 0xFF, 0x00, 0x00,
-	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
-	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
-	0x06, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x07, 0x00, 0x07, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x06, 0x01, 0x05,
+	0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x00, 0x0D, 0x05, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
+	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+	0x06, 0x01, 0x05,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
+
 const byte MOUSE2[] = {
-	0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05,
-	0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x02, 0x0C, 0x04, 0x04,
-	0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02,
-	0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x08, 0x00, 0x08, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x00, 0x00,
+	0x00, 0x00,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x02, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
+
 const byte MOUSE3[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05, 0x00,
-	0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 0x00, 0x0C, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05,
-	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00,
-	0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x01, 0x0B, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x00, 0x00, 0x00, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x01, 0x0B, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
 const byte CURSEYE[] = {
-	0x01, 0x00, 0x08, 0x00, 0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x03, 0x09, 0x0E, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D, 0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33,
-	0x34, 0x01, 0x01, 0x0D, 0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04,
-	0x04, 0x01, 0x0D, 0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07,
-	0x07, 0x06, 0x01, 0x0E, 0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07,
-	0x06, 0x0F, 0x0E, 0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x01, 0x01,
-	0x07, 0x00, 0x03, 0x07, 0x01, 0x07, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x01, 0x00, 0x08, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x03, 0x09, 0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D,
+	0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x01, 0x01, 0x0D,
+	0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04, 0x04, 0x01, 0x0D,
+	0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07, 0x07, 0x06, 0x01, 0x0E,
+	0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07, 0x06, 0x0F, 0x0E,
+	0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E,
+	0x01, 0x01, 0x07,
+	0x00, 0x03, 0x07, 0x01, 0x07,
+	0x01, 0x01, 0x07,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
+
 const byte CURSHAND[] = {
-	0x02, 0x00, 0x03, 0x00, 0x07, 0x02, 0x17, 0x0E, 0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17,
-	0x0E, 0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17, 0x01,
-	0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E, 0x02,
-	0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E, 0x04, 0x0B,
-	0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x04, 0x0B, 0x17, 0x0E, 0x12,
-	0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F,
-	0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F, 0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F,
-	0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E,
-	0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, 0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E,
-	0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12, 0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F,
-	0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F,
-	0x0F, 0x0E, 0x0D, 0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x08,
-	0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E,
-	0x0D
+	// hotspot x and y, uint16 LE
+	0x02, 0x00, 0x03, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x07, 0x02, 0x17, 0x0E,
+	0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17, 0x0E,
+	0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17,
+	0x01, 0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E,
+	0x02, 0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E,
+	0x04, 0x0B, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E,
+	0x04, 0x0B, 0x17, 0x0E, 0x12, 0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E,
+	0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F,
+	0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D,
+	0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E, 0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D,
+	0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E, 0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12,
+	0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12,
+	0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D,
+	0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12,
+	0x06, 0x08, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12,
+	0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E, 0x0D
 };
+
 const byte CURSGET[] = {
-	0x07, 0x00, 0x0E, 0x00, 0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x08, 0x08, 0x1C, 0x07, 0x0F,
-	0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
-	0x0C, 0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x03, 0x0C, 0x07,
-	0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x02, 0x0D, 0x1C, 0x0F, 0x0E,
-	0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0E,
-	0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C, 0x00, 0x0D, 0x1C, 0x0D,
-	0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C, 0x01, 0x0B, 0x0E, 0x0F, 0x0E,
-	0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C, 0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07,
-	0x0E, 0x0F, 0x0C, 0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07, 0x07, 0x01, 0x07
+	// hotspot x and y, uint16 LE
+	0x07, 0x00, 0x0E, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F,
+	0x08, 0x08, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x03, 0x0C, 0x07, 0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x02, 0x0D, 0x1C, 0x0F, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0F, 0x1C, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0E, 0x1C, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0E, 0x1C, 0x0E, 0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0D, 0x1C, 0x0D, 0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C,
+	0x01, 0x0B, 0x0E, 0x0F, 0x0E, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C,
+	0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07, 0x0E, 0x0F, 0x0C,
+	0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07,
+	0x07, 0x01, 0x07
 };
+
 const byte CURSCLIMB[] = {
-	0x03, 0x00, 0x0E, 0x00, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
-	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01, 0x07, 0x02, 0x0F, 0x0D, 0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00,
-	0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11, 0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14,
-	0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E, 0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13,
-	0x12, 0x11, 0x11, 0x0E, 0x0D, 0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00,
-	0x00, 0x0E, 0x0D, 0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
-	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E, 0x03,
-	0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20, 0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
-	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20, 0x03, 0x09, 0x07, 0x01, 0x01,
-	0x00, 0x00, 0x00, 0x22, 0x04, 0x20, 0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x01, 0x20, 0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
+	// hotspot x and y, uint16 LE
+	0x03, 0x00, 0x0E, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x06, 0x04, 0x01, 0x01, 0x01, 0x01,
+	0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
+	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01,
+	0x07, 0x02, 0x0F, 0x0D,
+	0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11,
+	0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14, 0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E,
+	0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13, 0x12, 0x11, 0x11, 0x0E, 0x0D,
+	0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00, 0x00, 0x0E, 0x0D,
+	0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
+	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E,
+	0x03, 0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20,
+	0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
+	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20,
+	0x03, 0x09, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x22, 0x04, 0x20,
+	0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x20,
+	0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
 };
+
 const byte CURSTALK[] = {
-	0x02, 0x00, 0x0B, 0x00, 0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x0C,
-	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x00, 0x0E, 0x06, 0x06,
-	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x00, 0x0F, 0x06, 0x08,
-	0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x00, 0x0F, 0x06,
-	0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06, 0x00, 0x0F,
-	0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x01,
-	0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x02,
-	0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 0x09, 0x06,
-	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x02, 0x08,
-	0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
-	0x02, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x02, 0x00, 0x0B, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x01, 0x0C, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06,
+	0x00, 0x0E, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06,
+	0x00, 0x0F, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06,
+	0x00, 0x0F, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06,
+	0x00, 0x0F, 0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06,
+	0x01, 0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06,
+	0x02, 0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06,
+	0x04, 0x09, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06,
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x06,
+	0x02, 0x08, 0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
+	0x02, 0x01, 0x07,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
 const byte CURSHELP[] = {
-	0x02, 0x00, 0x0B, 0x00, 0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x02, 0x0A, 0x24, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20,
-	0x20, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00,
-	0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
-	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
-	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x20, 0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x05, 0x07, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20, 0x02, 0x07, 0x07,
-	0x00, 0x24, 0x20, 0x20, 0x20, 0x20, 0x01, 0x03, 0x07, 0x01, 0x07, 0x02, 0x07, 0x07, 0x00, 0x00,
-	0x24, 0x24, 0x24, 0x24, 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x04, 0x06, 0x24, 0x22,
-	0x22, 0x22, 0x22, 0x20, 0x05, 0x04, 0x20, 0x20, 0x20, 0x20
+	// hotspot x and y, uint16 LE
+	0x02, 0x00, 0x0B, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
+	0x02, 0x0A, 0x24, 0x24, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20,
+	0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20, 0x20, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x20,
+	0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x20,
+	0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x05, 0x07, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20,
+	0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20,
+	0x02, 0x07, 0x07, 0x00, 0x24, 0x20, 0x20, 0x20, 0x20,
+	0x01, 0x03, 0x07, 0x01, 0x07,
+	0x02, 0x07, 0x07, 0x00, 0x00, 0x24, 0x24, 0x24, 0x24,
+	0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x05, 0x04, 0x20, 0x20, 0x20, 0x20
 };
 const byte *CURSORS[10] = {
 	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
-- 
cgit v1.2.3


From 82dfe2a5bcac49e2abbec98f09693810839e422e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 18:25:24 +0100
Subject: ACCESS: Use writeString in writeSavegameHeader

---
 engines/access/access.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index c0f8905681..cc443131b7 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -540,7 +540,7 @@ void AccessEngine::writeSavegameHeader(Common::OutSaveFile *out, AccessSavegameH
 	out->writeByte(ACCESS_SAVEGAME_VERSION);
 
 	// Write savegame name
-	out->write(header._saveName.c_str(), header._saveName.size());
+	out->writeString(header._saveName);
 	out->writeByte('\0');
 
 	// Write a thumbnail of the screen
-- 
cgit v1.2.3


From c8d6370edfef51fc0b5d3382cb5141613046d400 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 18:27:01 +0100
Subject: ACCESS: Fix broken file header

---
 engines/access/amazon/amazon_resources.cpp | 12 ++++++------
 engines/access/files.cpp                   | 12 ++++++------
 engines/access/resources.cpp               | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 55302c0708..e61c704b1d 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -1,22 +1,22 @@
 /* ScummVM - Graphic Adventure Engine
  *
- * ScummVM is the legal property of its developers, 0xwhose names
+ * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, 0xor (at your option) any later version.
-
+ * of the License, or (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, 0xwrite to the Free Software
- * Foundation, 0xInc., 0x51 Franklin Street, 0xFifth Floor, 0xBoston, 0xMA 02110-1301, 0xUSA.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 004886a379..1e81b7c428 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -1,22 +1,22 @@
 /* ScummVM - Graphic Adventure Engine
  *
- * ScummVM is the legal property of its developers, 0xwhose names
+ * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, 0xor (at your option) any later version.
-
+ * of the License, or (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, 0xwrite to the Free Software
- * Foundation, 0xInc., 0x51 Franklin Street, 0xFifth Floor, 0xBoston, 0xMA 02110-1301, 0xUSA.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 41f611d136..6282d93889 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -1,22 +1,22 @@
 /* ScummVM - Graphic Adventure Engine
  *
- * ScummVM is the legal property of its developers, 0xwhose names
+ * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
  * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, 0xor (at your option) any later version.
-
+ * of the License, or (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, 0xwrite to the Free Software
- * Foundation, 0xInc., 0x51 Franklin Street, 0xFifth Floor, 0xBoston, 0xMA 02110-1301, 0xUSA.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
-- 
cgit v1.2.3


From 492d974550924522774181cbcfa559c4b7e7b3a1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 18:27:47 +0100
Subject: ACCESS: Some more polishing in the file headers

---
 engines/access/access.h                  | 4 ++--
 engines/access/amazon/amazon_game.cpp    | 4 ++--
 engines/access/amazon/amazon_game.h      | 4 ++--
 engines/access/amazon/amazon_logic.cpp   | 4 ++--
 engines/access/amazon/amazon_logic.h     | 4 ++--
 engines/access/amazon/amazon_player.cpp  | 4 ++--
 engines/access/amazon/amazon_player.h    | 4 ++--
 engines/access/amazon/amazon_resources.h | 4 ++--
 engines/access/amazon/amazon_room.cpp    | 4 ++--
 engines/access/amazon/amazon_room.h      | 4 ++--
 engines/access/amazon/amazon_scripts.cpp | 4 ++--
 engines/access/amazon/amazon_scripts.h   | 4 ++--
 engines/access/animation.cpp             | 4 ++--
 engines/access/animation.h               | 4 ++--
 engines/access/asurface.cpp              | 4 ++--
 engines/access/asurface.h                | 4 ++--
 engines/access/bubble_box.cpp            | 4 ++--
 engines/access/bubble_box.h              | 4 ++--
 engines/access/char.cpp                  | 4 ++--
 engines/access/char.h                    | 4 ++--
 engines/access/data.cpp                  | 4 ++--
 engines/access/data.h                    | 4 ++--
 engines/access/debugger.cpp              | 6 +++---
 engines/access/debugger.h                | 6 +++---
 engines/access/decompress.cpp            | 4 ++--
 engines/access/decompress.h              | 4 ++--
 engines/access/detection.cpp             | 5 ++---
 engines/access/detection_tables.h        | 4 ++--
 engines/access/events.cpp                | 4 ++--
 engines/access/events.h                  | 4 ++--
 engines/access/files.h                   | 4 ++--
 engines/access/font.cpp                  | 4 ++--
 engines/access/font.h                    | 4 ++--
 engines/access/inventory.cpp             | 4 ++--
 engines/access/inventory.h               | 4 ++--
 engines/access/player.cpp                | 4 ++--
 engines/access/player.h                  | 4 ++--
 engines/access/resources.h               | 4 ++--
 engines/access/room.cpp                  | 4 ++--
 engines/access/room.h                    | 4 ++--
 engines/access/screen.cpp                | 4 ++--
 engines/access/screen.h                  | 4 ++--
 engines/access/scripts.cpp               | 4 ++--
 engines/access/scripts.h                 | 4 ++--
 engines/access/sound.cpp                 | 4 ++--
 engines/access/sound.h                   | 4 ++--
 engines/access/video.cpp                 | 4 ++--
 engines/access/video.h                   | 4 ++--
 48 files changed, 98 insertions(+), 99 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 5470d2a208..2672f3b57d 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 9a86642579..6ee4242797 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 5d87cc434e..8f6dffe28c 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 0200f7a61b..2e936177d1 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index c8e77455b0..5c781727c0 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_player.cpp b/engines/access/amazon/amazon_player.cpp
index 2780922935..b1ed501fce 100644
--- a/engines/access/amazon/amazon_player.cpp
+++ b/engines/access/amazon/amazon_player.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_player.h b/engines/access/amazon/amazon_player.h
index 200b530aa1..2d3797234d 100644
--- a/engines/access/amazon/amazon_player.h
+++ b/engines/access/amazon/amazon_player.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index c4d2cc994d..e7afa2a977 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index d026f7b6a5..82e6db61dc 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index ab9212724f..6396f80199 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 6f9d9c9697..633188e4dd 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index 573ffb89bf..bdbabfc84d 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index b13fcfdc1e..f030e32eea 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 8a39333764..97d45c7b8f 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index e135ae7184..45ce44dfc8 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 139565190b..833927e4ba 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index e9e2a182c0..572567c3a3 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 128bd618ff..8a4d67ecc2 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index d5eec3eb7f..5bc6707509 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/char.h b/engines/access/char.h
index 4bd38d7c6d..882e7077a3 100644
--- a/engines/access/char.h
+++ b/engines/access/char.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index cbc52c0a26..cf40e81ccb 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/data.h b/engines/access/data.h
index 6b44eddd75..19413ecd7e 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 5eb615f4dc..fb5c4d5b22 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/debugger.h b/engines/access/debugger.h
index 6bd23740cd..f4d8df7634 100644
--- a/engines/access/debugger.h
+++ b/engines/access/debugger.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/decompress.cpp b/engines/access/decompress.cpp
index 45ae07d712..62bff87860 100644
--- a/engines/access/decompress.cpp
+++ b/engines/access/decompress.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/decompress.h b/engines/access/decompress.h
index 400aee476c..eea450086b 100644
--- a/engines/access/decompress.h
+++ b/engines/access/decompress.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 914f98e232..abd560404b 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -8,17 +8,16 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *
  */
 
 #include "access/access.h"
diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index ec1507633c..ed3989ac48 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index cd1880b338..f504c869ed 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/events.h b/engines/access/events.h
index 3fdcf12136..b8c5f0ee5e 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/files.h b/engines/access/files.h
index f90071df85..8b1aef0363 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 1aadfb6be2..3ff1b7e679 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/font.h b/engines/access/font.h
index d8517e3720..6a812051ca 100644
--- a/engines/access/font.h
+++ b/engines/access/font.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 49fa6e7efc..d09b784adf 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 820b15b40f..6a9390eda9 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 35c5dadf02..f56bd69533 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/player.h b/engines/access/player.h
index 631452f12d..ab4222eece 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 10f2adb97e..8d59b1b1f1 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f4826090b1..fc9cb6a4a0 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/room.h b/engines/access/room.h
index db794dbc96..1ba4af10e2 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 3e6bd7e38f..d0974bde26 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 775cb6b0c3..1cec75d5e7 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index b1cc2897ce..8b664520d4 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 320da73bbb..fbc3e743a5 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 57f95c9516..a7d96dac9a 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/sound.h b/engines/access/sound.h
index ed8fe0b060..d0f4584fac 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index eb50083de5..b7d5652e5b 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/access/video.h b/engines/access/video.h
index 65d6ad61a7..6331ea4405 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From 7d73acbccc9fd2178c711c973b62e216ffdcfd4b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 18:36:49 +0100
Subject: ACCESS: Remove useless defines

---
 engines/access/access.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/engines/access/access.h b/engines/access/access.h
index 2672f3b57d..c98462003e 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -58,10 +58,6 @@
  */
 namespace Access {
 
-#define DEBUG_BASIC 1
-#define DEBUG_INTERMEDIATE 2
-#define DEBUG_DETAILED 3
-
 enum {
 	GType_Amazon = 1,
 	GType_MartianMemorandum = 2,
-- 
cgit v1.2.3


From 9daf9a30c07ede6d5c931af06976d6582fa38ba1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 19:13:23 +0100
Subject: ACCESS: Modify the indentation of constructor when it's multiline

---
 engines/access/access.cpp             |  6 +++---
 engines/access/amazon/amazon_game.cpp | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index cc443131b7..dd6d0ea129 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -31,9 +31,9 @@
 
 namespace Access {
 
-AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
-		_gameDescription(gameDesc), Engine(syst), _randomSource("Access"),
-		_useItem(_flags[99]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
+AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
+	: _gameDescription(gameDesc), Engine(syst), _randomSource("Access"),
+	  _useItem(_flags[99]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
 	_animation = nullptr;
 	_bubbleBox = nullptr;
 	_char = nullptr;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 6ee4242797..4c57b585b9 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -30,14 +30,12 @@ namespace Access {
 
 namespace Amazon {
 
-AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
-AccessEngine(syst, gameDesc),
-		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]),
-		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
-		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]),
-		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]),
-		_noSound(_flags[239]) {
-
+AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
+	: AccessEngine(syst, gameDesc), _guardLocation(_flags[122]), _guardFind(_flags[128]),
+	  _helpLevel(_flags[167]), _jasMayaFlag(_flags[168]), _moreHelp(_flags[169]),
+	  _flashbackFlag(_flags[171]), _riverFlag(_flags[185]), _aniOutFlag(_flags[195]),
+	  _badEnd(_flags[218]), _noHints(_flags[219]), _aniFlag(_flags[229]),
+	  _allenFlag(_flags[237]), _noSound(_flags[239]) {
 	_ant = nullptr;
 	_cast = nullptr;
 	_guard = nullptr;
-- 
cgit v1.2.3


From 67a40fd9b0be371fcc80f01d5cda73e7272027d0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 19:14:14 +0100
Subject: ACCESS: Add missing space before semicolumn in constructors

---
 engines/access/amazon/amazon_logic.cpp  | 8 ++++----
 engines/access/amazon/amazon_room.cpp   | 2 +-
 engines/access/animation.cpp            | 3 +--
 engines/access/debugger.cpp             | 2 +-
 engines/access/events.cpp               | 2 +-
 engines/access/files.cpp                | 2 +-
 engines/access/martian/martian_game.cpp | 3 +--
 engines/access/martian/martian_room.cpp | 2 +-
 engines/access/player.cpp               | 2 +-
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 2e936177d1..90bc29c329 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -32,7 +32,7 @@ namespace Access {
 
 namespace Amazon {
 
-PannedScene::PannedScene(AmazonEngine *vm): AmazonManager(vm) {
+PannedScene::PannedScene(AmazonEngine *vm) : AmazonManager(vm) {
 	for (int i = 0; i < PAN_SIZE; ++i) {
 		_pan[i]._pObject = nullptr;
 		_pan[i]._pImgNum = 0;
@@ -559,7 +559,7 @@ void Opening::doTent() {
 
 /*------------------------------------------------------------------------*/
 
-Plane::Plane(AmazonEngine *vm): PannedScene(vm) {
+Plane::Plane(AmazonEngine *vm) : PannedScene(vm) {
 	_pCount = 0;
 	_planeCount = 0;
 	_propCount = 0;
@@ -969,7 +969,7 @@ void Jungle::scrollJWalk() {
 
 /*------------------------------------------------------------------------*/
 
-Guard::Guard(AmazonEngine *vm): PannedScene(vm) {
+Guard::Guard(AmazonEngine *vm) : PannedScene(vm) {
 	_guardCel = 0;
 	_gCode1 = _gCode2 = 0;
 	_xMid = _yMid = 0;
@@ -1359,7 +1359,7 @@ void Cast::doCast(int param1) {
 
 /*------------------------------------------------------------------------*/
 
-River::River(AmazonEngine *vm): PannedScene(vm) {
+River::River(AmazonEngine *vm) : PannedScene(vm) {
 	_chickenOutFl = false;
 	_rScrollRow = 0;
 	_rScrollCol = 0;
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 82e6db61dc..8174969a3d 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -31,7 +31,7 @@ namespace Access {
 
 namespace Amazon {
 
-AmazonRoom::AmazonRoom(AccessEngine *vm): Room(vm) {
+AmazonRoom::AmazonRoom(AccessEngine *vm) : Room(vm) {
 	_game = (AmazonEngine *)vm;
 	_antOutFlag = false;
 	_icon = nullptr;
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index f030e32eea..126f904a7f 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -49,8 +49,7 @@ AnimationResource::~AnimationResource() {
 
 /*------------------------------------------------------------------------*/
 
-Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) :
-		Manager(vm) {
+Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Manager(vm) {
 	uint32 startOfs = stream->pos();
 
 	_type = stream->readByte();
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index fb5c4d5b22..6cb2bb606c 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -137,7 +137,7 @@ bool Debugger::Cmd_Cheat(int argc, const char **argv) {
 
 namespace Amazon {
 
-AmazonDebugger::AmazonDebugger(AccessEngine *vm): Debugger(vm) {
+AmazonDebugger::AmazonDebugger(AccessEngine *vm) : Debugger(vm) {
 	registerCmd("chapter", WRAP_METHOD(AmazonDebugger, Cmd_StartChapter));
 }
 
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index f504c869ed..c314fe9444 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -35,7 +35,7 @@
 
 namespace Access {
 
-EventsManager::EventsManager(AccessEngine *vm): _vm(vm) {
+EventsManager::EventsManager(AccessEngine *vm) : _vm(vm) {
 	_cursorId = CURSOR_NONE;
 	_normalMouse = CURSOR_CROSSHAIRS;
 	_frameCounter = 10;
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 1e81b7c428..42a7914638 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -79,7 +79,7 @@ byte *Resource::data() {
 
 /*------------------------------------------------------------------------*/
 
-FileManager::FileManager(AccessEngine *vm): _vm(vm) {
+FileManager::FileManager(AccessEngine *vm) : _vm(vm) {
 	switch (vm->getGameID()) {
 	case GType_Amazon:
 		if (_vm->isDemo())
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index e534b6cc03..6392206209 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -31,8 +31,7 @@ namespace Access {
 
 namespace Martian {
 
-MartianEngine::MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
-		AccessEngine(syst, gameDesc) {
+MartianEngine::MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc) : AccessEngine(syst, gameDesc) {
 }
 
 MartianEngine::~MartianEngine() {
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 22f456fd4c..e9d1b9d8cf 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -31,7 +31,7 @@ namespace Access {
 
 namespace Martian {
 
-MartianRoom::MartianRoom(AccessEngine *vm): Room(vm) {
+MartianRoom::MartianRoom(AccessEngine *vm) : Room(vm) {
 	_game = (MartianEngine *)vm;
 }
 
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index f56bd69533..828be0135d 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -38,7 +38,7 @@ Player *Player::init(AccessEngine *vm) {
 	}
 }
 
-Player::Player(AccessEngine *vm): Manager(vm), ImageEntry() {
+Player::Player(AccessEngine *vm) : Manager(vm), ImageEntry() {
 	Common::fill(&_walkOffRight[0], &_walkOffRight[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffLeft[0], &_walkOffLeft[PLAYER_DATA_COUNT], 0);
 	Common::fill(&_walkOffUp[0], &_walkOffUp[PLAYER_DATA_COUNT], 0);
-- 
cgit v1.2.3


From df7fa78a860a06d110bad38e559e85257a08c87e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 21:10:50 +0100
Subject: ACCESS: Fix three out of bounds

---
 engines/access/amazon/amazon_game.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 4c57b585b9..66ccf3dcef 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -54,9 +54,9 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_hintLevel = 0;
 
 	memset(_tileData, 0, sizeof(_tileData));
-	Common::fill(&_help1[0], &_help1[366], 0);
-	Common::fill(&_help2[0], &_help2[366], 0);
-	Common::fill(&_help3[0], &_help3[366], 0);
+	Common::fill(&_help1[0], &_help1[365], 0);
+	Common::fill(&_help2[0], &_help2[365], 0);
+	Common::fill(&_help3[0], &_help3[365], 0);
 	_helpTbl[0] = _help1;
 	_helpTbl[1] = _help2;
 	_helpTbl[2] = _help3;
-- 
cgit v1.2.3


From ce1f04b1d5c27ca63c1e01b67ae5bfbe5faa0ee9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 21:19:33 +0100
Subject: ACCESS: Get rid of hardcoded size when using Common::Fill

---
 engines/access/amazon/amazon_game.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 66ccf3dcef..933a98aded 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -53,10 +53,10 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_inactiveYOff = 0;
 	_hintLevel = 0;
 
-	memset(_tileData, 0, sizeof(_tileData));
-	Common::fill(&_help1[0], &_help1[365], 0);
-	Common::fill(&_help2[0], &_help2[365], 0);
-	Common::fill(&_help3[0], &_help3[365], 0);
+	Common::fill(&_tileData[0], &_tileData[0] + sizeof(_tileData), 0);
+	Common::fill(&_help1[0], &_help1[0] + sizeof(_help1), 0);
+	Common::fill(&_help2[0], &_help2[0] + sizeof(_help2), 0);
+	Common::fill(&_help3[0], &_help3[0] + sizeof(_help3), 0);
 	_helpTbl[0] = _help1;
 	_helpTbl[1] = _help2;
 	_helpTbl[2] = _help3;
-- 
cgit v1.2.3


From fe627c5ce19482bdb111df7d5018dfcc94030115 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 21:31:26 +0100
Subject: ACCESS: Fix spacing around semicolumn in class definitions

---
 engines/access/amazon/amazon_logic.h     | 12 ++++++------
 engines/access/amazon/amazon_player.h    |  2 +-
 engines/access/amazon/amazon_scripts.h   |  2 +-
 engines/access/animation.h               |  2 +-
 engines/access/bubble_box.h              |  2 +-
 engines/access/char.h                    |  2 +-
 engines/access/martian/martian_scripts.h |  2 +-
 engines/access/player.h                  |  2 +-
 engines/access/room.h                    |  2 +-
 engines/access/screen.h                  |  2 +-
 engines/access/scripts.h                 |  2 +-
 engines/access/video.h                   |  2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index 5c781727c0..a1fb4eef77 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -42,7 +42,7 @@ public:
 	AmazonManager(AmazonEngine *vm) : _vm(vm) {}
 };
 
-class PannedScene: public AmazonManager {
+class PannedScene : public AmazonManager {
 	struct PanEntry {
 		SpriteResource *_pObject;
 		int _pImgNum;
@@ -78,7 +78,7 @@ public:
 	void mWhileDoOpen();
 };
 
-class Opening: public CampScene {
+class Opening : public CampScene {
 private:
 	int _pCount;
 
@@ -93,7 +93,7 @@ public:
 	void doIntroduction();
 };
 
-class Plane: public PannedScene {
+class Plane : public PannedScene {
 public:
 	int _pCount;
 	Common::Point _position;
@@ -111,7 +111,7 @@ public:
 };
 
 #define JUNGLE_SIZE 3
-class Jungle: public CampScene {
+class Jungle : public CampScene {
 private:
 	void initJWalk2();
 	void jungleMove();
@@ -157,7 +157,7 @@ public:
 	void doCast(int param1);
 };
 
-class River: public PannedScene {
+class River : public PannedScene {
 private:
 	bool _chickenOutFl;
 	const byte *_mapPtr;
@@ -212,7 +212,7 @@ public:
 
 enum AntDirection { ANT_RIGHT = 0, ANT_LEFT = 1 };
 
-class Ant: public AmazonManager {
+class Ant : public AmazonManager {
 private:
 	AntDirection _antDirection;
 	AntDirection _pitDirection;
diff --git a/engines/access/amazon/amazon_player.h b/engines/access/amazon/amazon_player.h
index 2d3797234d..236b8bd1bd 100644
--- a/engines/access/amazon/amazon_player.h
+++ b/engines/access/amazon/amazon_player.h
@@ -32,7 +32,7 @@ namespace Amazon {
 
 class AmazonEngine;
 
-class AmazonPlayer: public Player {
+class AmazonPlayer : public Player {
 private:
 	AmazonEngine *_game;
 public:
diff --git a/engines/access/amazon/amazon_scripts.h b/engines/access/amazon/amazon_scripts.h
index bdbabfc84d..e10eefb4f5 100644
--- a/engines/access/amazon/amazon_scripts.h
+++ b/engines/access/amazon/amazon_scripts.h
@@ -32,7 +32,7 @@ namespace Amazon {
 
 class AmazonEngine;
 
-class AmazonScripts: public Scripts {
+class AmazonScripts : public Scripts {
 private:
 	AmazonEngine *_game;
 protected:
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 97d45c7b8f..722f5430ab 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -82,7 +82,7 @@ public:
 	Animation *getAnimation(int idx) { return _animations[idx]; }
 };
 
-class Animation: public Manager {
+class Animation : public Manager {
 private:
 	Common::Array<AnimationFrame *> _frames;
 
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 8a4d67ecc2..2c05d096c3 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -38,7 +38,7 @@ class AccessEngine;
 
 enum BoxType { TYPE_2 = 2, TYPE_4 = 4 };
 
-class BubbleBox: public Manager {
+class BubbleBox : public Manager {
 private:
 	int _startItem, _startBox;
 	int _charCol, _rowOff;
diff --git a/engines/access/char.h b/engines/access/char.h
index 882e7077a3..e89cdae49f 100644
--- a/engines/access/char.h
+++ b/engines/access/char.h
@@ -46,7 +46,7 @@ public:
 	CharEntry();
 };
 
-class CharManager: public Manager {
+class CharManager : public Manager {
 private:
 	void charMenu();
 public:
diff --git a/engines/access/martian/martian_scripts.h b/engines/access/martian/martian_scripts.h
index 9f90643e22..fc7495fc47 100644
--- a/engines/access/martian/martian_scripts.h
+++ b/engines/access/martian/martian_scripts.h
@@ -32,7 +32,7 @@ namespace Martian {
 
 class MartianEngine;
 
-class MartianScripts: public Scripts {
+class MartianScripts : public Scripts {
 private:
 	MartianEngine *_game;
 protected:
diff --git a/engines/access/player.h b/engines/access/player.h
index ab4222eece..7c8e9a2e86 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -38,7 +38,7 @@ enum Direction { NONE = 0, UP = 1, DOWN = 2, LEFT = 3, RIGHT = 4,
 
 class AccessEngine;
 
-class Player: public ImageEntry, public Manager {
+class Player : public ImageEntry, public Manager {
 protected:
 	int _leftDelta, _rightDelta;
 	int _upDelta, _downDelta;
diff --git a/engines/access/room.h b/engines/access/room.h
index 1ba4af10e2..44279fa6b1 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -60,7 +60,7 @@ public:
 
 enum Function { FN_NONE = 0, FN_CLEAR1 = 1, FN_CLEAR2 = 2, FN_RELOAD = 3, FN_BREAK = 4 };
 
-class Room: public Manager {
+class Room : public Manager {
 private:
 	void roomLoop();
 
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 1cec75d5e7..bf4cceaf11 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -47,7 +47,7 @@ struct ScreenSave {
 	int _screenYOff;
 };
 
-class Screen: public ASurface {
+class Screen : public ASurface {
 private:
 	AccessEngine *_vm;
 	byte _tempPalette[PALETTE_SIZE];
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index fbc3e743a5..e12f2826de 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -35,7 +35,7 @@ class Scripts;
 #define SCRIPT_START_BYTE 0xE0
 #define ROOM_SCRIPT 2000
 
-class Scripts: public Manager {
+class Scripts : public Manager {
 private:
 	Resource *_resource;
 	int _specialFunction;
diff --git a/engines/access/video.h b/engines/access/video.h
index 6331ea4405..17825db367 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -33,7 +33,7 @@ namespace Access {
 
 enum VideoFlags { VIDEOFLAG_NONE = 0, VIDEOFLAG_BG = 1 };
 
-class VideoPlayer: public Manager {
+class VideoPlayer : public Manager {
 	struct VideoHeader {
 		int _frameCount;
 		int _width, _height;
-- 
cgit v1.2.3


From e141da25e80fcf9c124661883a1818e13168bd93 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 21:39:26 +0100
Subject: ACCESS: Use a uint instead of a int in a loop based on size()

---
 engines/access/animation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 126f904a7f..a1b7952dd4 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -78,7 +78,7 @@ Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Man
 }
 
 Animation::~Animation() {
-	for (int i = 0; i < (int)_frames.size(); ++i)
+	for (uint i = 0; i < _frames.size(); ++i)
 		delete _frames[i];
 }
 
-- 
cgit v1.2.3


From bb01fa31f80e45f0537b3ea02083eed113c41f9c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 22:31:29 +0100
Subject: ACCESS: Constify some resources

---
 engines/access/amazon/amazon_resources.cpp | 14 +++++++-------
 engines/access/amazon/amazon_resources.h   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index e61c704b1d..2010c7d842 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -309,7 +309,7 @@ const byte CURSHELP[] = {
 	0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
 	0x05, 0x04, 0x20, 0x20, 0x20, 0x20
 };
-const byte *CURSORS[10] = {
+const byte *const CURSORS[10] = {
 	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP
 };
 
@@ -713,7 +713,7 @@ const byte PIT[] = {
 	0x62, 0x0, 0x4D, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0x0
 };
 
-const byte *ROOM_TABLE[] = {
+const byte *const ROOM_TABLE[] = {
 	CREDITS, nullptr, nullptr, nullptr, ALLISTER, HALL, JASONLAB, nullptr,
 	ALLENLAB, OUTVAULT, VAULT, LIBRARY, JASAPT, RANSACKED, MEAN1, FLYSOUTH,
 	CUZCO, INAIR, GREENMONKEY, INPLANE, PILFALL, COCKPIT, CRASH, SINKING,
@@ -724,7 +724,7 @@ const byte *ROOM_TABLE[] = {
 	CAVE, nullptr, nullptr, nullptr, PIT, nullptr, nullptr
 };
 
-const char *ROOM_DESCR[] = {
+const char *const ROOM_DESCR[] = {
 	"Credits", nullptr, nullptr, nullptr, "Outside of Allister Center",
 	"Hall", "Jason's Lab", nullptr, "Allen's Lab", "Outside of the Vault",
 	"Inside the Vault", "Reader", "Jason's Apartment", "Jason's ransacked apartment", "Cutscene 1",
@@ -1080,7 +1080,7 @@ const byte ROOM_TABLE62_DEMO[] = {
 	0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00
 };
 
-const byte *ROOM_TABLE_DEMO[] = {
+const byte *const ROOM_TABLE_DEMO[] = {
 	ROOM_TABLE1_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE5_DEMO,
 	ROOM_TABLE6_DEMO, ROOM_TABLE7_DEMO, nullptr, ROOM_TABLE9_DEMO, ROOM_TABLE10_DEMO,
 	ROOM_TABLE11_DEMO, ROOM_TABLE12_DEMO, ROOM_TABLE13_DEMO, ROOM_TABLE14_DEMO, ROOM_TABLE15_DEMO,
@@ -1526,7 +1526,7 @@ const byte CHAP8[] = {
 	0x60, 0x00, 0x02, 0x00, 0xFF, 0xFF 
 };
 
-const byte *CHARTBL[] = {
+const byte *const CHARTBL[] = {
 	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT,
 	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
 	ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS,
@@ -1535,7 +1535,7 @@ const byte *CHARTBL[] = {
 	CRACK, LETTER
 };
 
-const byte *CHARTBL_DEMO[] = {
+const byte *const CHARTBL_DEMO[] = {
 	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD_DEMO, PILOT2, TIKAGENT,
 	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
 	ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS,
@@ -2156,7 +2156,7 @@ const byte MAP2[32] = {
 	0, 1, 0, 1, 0, 0, 0, 0xFF
 };
 
-const byte *MAPTBL[3] = {MAP0, MAP1, MAP2};
+const byte *const MAPTBL[3] = {MAP0, MAP1, MAP2};
 
 const int DOWNRIVEROBJ[14][4] = {
 	{ 3, 77, 0, 40 },
diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index e7afa2a977..a952860bc2 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -45,7 +45,7 @@ struct RiverStruct {
 extern const char *const FILENAMES[];
 extern const char *const FILENAMES_DEMO[];
 
-extern const byte *CURSORS[10];
+extern const byte *const CURSORS[10];
 
 extern const int TRAVEL_POS[][2];
 
@@ -62,13 +62,13 @@ extern const int OVEROFFULY[];
 extern const int OVEROFFDLX[];
 extern const int OVEROFFDLY[];
 
-extern const byte *ROOM_TABLE[];
-extern const char *ROOM_DESCR[];
-extern const byte *ROOM_TABLE_DEMO[];
+extern const byte *const ROOM_TABLE[];
+extern const char *const ROOM_DESCR[];
+extern const byte *const ROOM_TABLE_DEMO[];
 extern const int ROOM_NUMB;
 
-extern const byte *CHARTBL[];
-extern const byte *CHARTBL_DEMO[];
+extern const byte *const CHARTBL[];
+extern const byte *const CHARTBL_DEMO[];
 
 extern const char *const INVENTORY_NAMES[];
 
@@ -123,7 +123,7 @@ extern const byte MAP0[26];
 extern const byte MAP1[27];
 extern const byte MAP2[32];
 
-extern const byte *MAPTBL[3];
+extern const byte *const MAPTBL[3];
 
 extern const int DOWNRIVEROBJ[14][4];
 
-- 
cgit v1.2.3


From c57f1919603c6a7223cb02c637f3682dfb96975f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 22:38:01 +0100
Subject: ACCESS: Constify some resources in MM too

---
 engines/access/martian/martian_resources.cpp | 8 ++++----
 engines/access/martian/martian_resources.h   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index 046e06c6e3..d2b5dfd5d0 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -83,7 +83,7 @@ const byte MOUSE3[] = {
 	6, 6, 5, 1, 11, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0,
 	0, 0, 0, 0, 0
 };
-const byte *CURSORS[4] = { MOUSE0, MOUSE1, MOUSE2, MOUSE3 };
+const byte *const CURSORS[4] = { MOUSE0, MOUSE1, MOUSE2, MOUSE3 };
 
 const int TRAVEL_POS[][2] = {
 	{ -1, 0 },
@@ -411,7 +411,7 @@ const byte ROOM_TABLE47[] = {
 	0xff, 0xff, 0x2b, 0x00, 0x04, 0x00, 0xff, 0xff, 0x2e, 0x00,
 	0x04, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00,
 };
-const byte *ROOM_TABLE[] = {
+const byte *const ROOM_TABLE[] = {
 	nullptr, ROOM_TABLE1, ROOM_TABLE2, ROOM_TABLE3, ROOM_TABLE4, ROOM_TABLE5, ROOM_TABLE6,
 	ROOM_TABLE7, ROOM_TABLE8, ROOM_TABLE9, nullptr, ROOM_TABLE11, nullptr, ROOM_TABLE13,
 	ROOM_TABLE14, ROOM_TABLE15, ROOM_TABLE16, ROOM_TABLE17, ROOM_TABLE18, nullptr, nullptr,
@@ -421,7 +421,7 @@ const byte *ROOM_TABLE[] = {
 	nullptr, nullptr, nullptr, nullptr, nullptr, ROOM_TABLE47
 };
 
-const char *ROOM_DESCR[] = {
+const char *const ROOM_DESCR[] = {
 	nullptr, "TBD ROOM_TABLE1", "TBD ROOM_TABLE2", "TBD ROOM_TABLE3", "TBD ROOM_TABLE4",
 	"TBD ROOM_TABLE5", "TBD ROOM_TABLE6", "TBD ROOM_TABLE7", "TBD ROOM_TABLE8", "TBD ROOM_TABLE9",
 	nullptr, "TBD ROOM_TABLE11", nullptr, "TBD ROOM_TABLE13", "TBD ROOM_TABLE14",
@@ -650,7 +650,7 @@ const byte CHAR_TABLE27[] = {
 	0x00, 0x49, 0x00, 0x10, 0x00, 0x49, 0x00, 0x09, 0x00, 0x49,
 	0x00, 0x11, 0x00, 0xff, 0xff,
 };
-const byte *CHAR_TABLE[] = {
+const byte *const CHAR_TABLE[] = {
 	CHAR_TABLE0, nullptr, CHAR_TABLE2, CHAR_TABLE3, CHAR_TABLE4, CHAR_TABLE5,
 	CHAR_TABLE6, CHAR_TABLE7, CHAR_TABLE8, CHAR_TABLE9, CHAR_TABLE10,
 	CHAR_TABLE11, CHAR_TABLE12, CHAR_TABLE13, nullptr, CHAR_TABLE15,
diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h
index b9584ba2dd..a52967d42a 100644
--- a/engines/access/martian/martian_resources.h
+++ b/engines/access/martian/martian_resources.h
@@ -31,17 +31,17 @@ namespace Martian {
 
 extern const char *const FILENAMES[];
 
-extern const byte *CURSORS[4];
+extern const byte *const CURSORS[4];
 
 extern const int TRAVEL_POS[][2];
 
 extern const char *const INVENTORY_NAMES[];
 
-extern const byte *ROOM_TABLE[];
-extern const char *ROOM_DESCR[];
+extern const byte *const ROOM_TABLE[];
+extern const char *const ROOM_DESCR[];
 extern const int ROOM_NUMB;
 
-extern const byte *CHAR_TABLE[];
+extern const byte *const CHAR_TABLE[];
 
 extern const int COMBO_TABLE[54][4];
 
-- 
cgit v1.2.3


From 223038924b226b67e93081a5b1c7ed18310c9834 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 22:49:01 +0100
Subject: ACCESS: Get rid of a goto

---
 engines/access/player.cpp | 29 ++++++++++++++++-------------
 engines/access/player.h   |  1 +
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 828be0135d..83f075e3d8 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -657,6 +657,19 @@ void Player::plotCom3() {
 	plotCom2();
 }
 
+void Player::checkScrollUp() {
+	if ((_playerDirection == DOWNRIGHT || _playerDirection == DOWNLEFT ||
+		_playerDirection == DOWN) && (_vm->_screen->_clipHeight -
+		_playerY - _scrollThreshold) <= 0) {
+			// Scroll up
+			if (scrollUp()) {
+				_scrollEnd = 4;
+				_vm->_screen->_scrollY &= TILE_HEIGHT;
+				_scrollFlag = true;
+			}
+	}
+}
+
 void Player::checkScroll() {
 	_scrollFlag = false;
 	if (_playerDirection == NONE)
@@ -667,7 +680,7 @@ void Player::checkScroll() {
 		// Scroll right
 		if (!scrollRight()) {
 			if (_playerDirection == DOWNLEFT)
-				goto scrollUp;
+				checkScrollUp();
 
 			return;
 		}
@@ -677,7 +690,7 @@ void Player::checkScroll() {
 		// Scroll left
 		if (!scrollLeft()) {
 			if (_playerDirection == DOWNRIGHT)
-				goto scrollUp;
+				checkScrollUp();
 
 			return;
 		}
@@ -687,17 +700,7 @@ void Player::checkScroll() {
 			_playerDirection == UP) && _playerY <= _scrollThreshold) {
 		scrollDown();
 	} else {
-scrollUp:
-		if ((_playerDirection == DOWNRIGHT || _playerDirection == DOWNLEFT ||
-			_playerDirection == DOWN) && (_vm->_screen->_clipHeight -
-			_playerY - _scrollThreshold) <= 0) {
-			// Scroll up
-			if (scrollUp()) {
-				_scrollEnd = 4;
-				_vm->_screen->_scrollY &= TILE_HEIGHT;
-				_scrollFlag = true;
-			}
-		}
+		checkScrollUp();
 	}
 }
 
diff --git a/engines/access/player.h b/engines/access/player.h
index 7c8e9a2e86..e3cf5c5433 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -66,6 +66,7 @@ protected:
 	void walkDownLeft();
 	void walkUpRight();
 	void walkDownRight();
+	void checkScrollUp();
 	bool scrollUp();
 	bool scrollDown();
 	bool scrollLeft();
-- 
cgit v1.2.3


From 240b9dcaeba7f28800df1cd6929ceed4bb3cff33 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 22:54:29 +0100
Subject: ACCESS: Format Direction enum as suggested by LordHoto

---
 engines/access/player.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/engines/access/player.h b/engines/access/player.h
index e3cf5c5433..26caec681f 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -33,8 +33,17 @@ namespace Access {
 
 #define PLAYER_DATA_COUNT 8
 
-enum Direction { NONE = 0, UP = 1, DOWN = 2, LEFT = 3, RIGHT = 4,
-	UPRIGHT = 5, DOWNRIGHT = 6, UPLEFT = 7, DOWNLEFT = 8 };
+enum Direction {
+	NONE = 0,
+	UP = 1,
+	DOWN = 2,
+	LEFT = 3,
+	RIGHT = 4,
+	UPRIGHT = 5,
+	DOWNRIGHT = 6,
+	UPLEFT = 7,
+	DOWNLEFT = 8
+};
 
 class AccessEngine;
 
-- 
cgit v1.2.3


From 207c4012ad33f7f11b5375c1478ed2f5e13679b9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:05:22 +0100
Subject: ACCESS: replace an assert by an error as suggested by LordHoto

---
 engines/access/scripts.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 8b664520d4..79d74694a1 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -98,7 +98,9 @@ int Scripts::executeScript() {
 		while ((_scriptCommand = _data->readByte()) == SCRIPT_START_BYTE)
 			_data->skip(2);
 
-		assert(_scriptCommand >= 0x80);
+		if (_scriptCommand < 0x80)
+			error("Unexpected opcode value %d", _scriptCommand);
+
 		executeCommand(_scriptCommand - 0x80);
 	} while (!_endFlag && !_vm->shouldQuitOrRestart());
 
-- 
cgit v1.2.3


From 79b51f20e48f9f93a519f548ba42afdcb8a03899 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:08:54 +0100
Subject: ACCESS: Use clear to empty Common::String variables

---
 engines/access/font.cpp    | 2 +-
 engines/access/scripts.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 3ff1b7e679..da8f0b6ec5 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -112,7 +112,7 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 		// If this was the last character of the string, let it go
 		if (*src == '\0') {
 			line = Common::String(s.c_str(), src);
-			s = "";
+			s.clear();
 			return true;
 		}
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 79d74694a1..59d89af2f2 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -661,7 +661,7 @@ void Scripts::cmdTexChoice() {
 
 	findNull();
 
-	tmpStr = "";
+	tmpStr.clear();
 	while ((v = _data->readByte()) != 0)
 		tmpStr += (char)v;
 
@@ -676,7 +676,7 @@ void Scripts::cmdTexChoice() {
 	findNull();
 
 	bool choice3Fl = false;
-	tmpStr = "";
+	tmpStr.clear();
 	while ((v = _data->readByte()) != 0)
 		tmpStr += (char)v;
 
-- 
cgit v1.2.3


From cd4183a4638e964cc7b4c6b5c7e31c1bec9ffb99 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:15:13 +0100
Subject: ACCESS: Fix indentation of METHODS in animate()

---
 engines/access/animation.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index a1b7952dd4..045382aa0a 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -85,9 +85,10 @@ Animation::~Animation() {
 typedef void(Animation::*AnimationMethodPtr)();
 
 void Animation::animate() {
-	static const AnimationMethodPtr METHODS[8] =
-	{ &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3,
-	&Animation::anim4, &Animation::animNone, &Animation::animNone, &Animation::anim7 };
+	static const AnimationMethodPtr METHODS[8] = {
+	   &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3,
+	   &Animation::anim4, &Animation::animNone, &Animation::animNone, &Animation::anim7
+	};
 
 	(this->*METHODS[_type])();
 }
-- 
cgit v1.2.3


From a9903237034859883618de2b86a08fe5ec572881 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:21:13 +0100
Subject: ACCESS: Format the definition of ImagerFlag

and fix a comment
---
 engines/access/animation.cpp | 2 +-
 engines/access/asurface.h    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 045382aa0a..548e7db02d 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -191,7 +191,7 @@ void Animation::anim4() {
 }
 
 void Animation::animNone() {
-	// No implementation
+	// Empty implementation
 }
 
 void Animation::anim7() {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 833927e4ba..6ffbf0e25e 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -138,8 +138,12 @@ public:
 	SpriteFrame *getFrame(int idx) { return _frames[idx]; }
 };
 
-enum ImageFlag { IMGFLAG_CROPPED = 1, IMGFLAG_BACKWARDS = 2, IMGFLAG_DRAWN = 4,
-	IMGFLAG_UNSCALED = 8 };
+enum ImageFlag {
+	IMGFLAG_CROPPED = 1,
+	IMGFLAG_BACKWARDS = 2,
+	IMGFLAG_DRAWN = 4,
+	IMGFLAG_UNSCALED = 8
+};
 
 class ImageEntry {
 public:
-- 
cgit v1.2.3


From beba3cd3f21f60ba560a7af3485389c0f3dcc065 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:22:50 +0100
Subject: ACCESS: Fix indentation issue pointed out by _sev

---
 engines/access/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index abd560404b..1903bf213f 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -77,7 +77,7 @@ Common::Platform AccessEngine::getPlatform() const {
 static const PlainGameDescriptor AccessGames[] = {
 	{"Access", "Access"},
 	{"amazon", "Amazon: Guardians of Eden"},
-	{ "martian", "Martian Memorandum"},
+	{"martian", "Martian Memorandum"},
 	{0, 0}
 };
 
-- 
cgit v1.2.3


From c11b6e3eb36f736de2a726fabfbfe7ee21466d34 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:27:55 +0100
Subject: ACCESS: Add original engine dates

---
 engines/access/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 1903bf213f..441740c1b2 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -94,7 +94,7 @@ public:
 	}
 
 	virtual const char *getOriginalCopyright() const {
-		return "Access (c)";
+		return "Access Engine (c) 1989-1994 Access Software";
 	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
-- 
cgit v1.2.3


From 8fe8cf8e437df59874b0337946708cff6bb56c6d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:35:12 +0100
Subject: ACCESS: Use AD_ENTRY1s in detection tables

---
 engines/access/detection_tables.h | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/engines/access/detection_tables.h b/engines/access/detection_tables.h
index ed3989ac48..88a64470c5 100644
--- a/engines/access/detection_tables.h
+++ b/engines/access/detection_tables.h
@@ -24,14 +24,13 @@ namespace Access {
 
 static const AccessGameDescription gameDescriptions[] = {
 	{
-		// Amazon Guadians of Eden - Floppy English
+		// Amazon Guardians of Eden - Floppy English
+		// 3.5" and 5.25" floppies provided by Strangerke had the same md5
+		// Except the sound file. The executable is also identical
 		{
 			"amazon",
 			0,
-			{
-				{ "c00.ap", 0, "dcabf69d5a0d911168cb73511ebaead0", 331481 },
-				AD_LISTEND
-			},
+			AD_ENTRY1s("c00.ap", "dcabf69d5a0d911168cb73511ebaead0", 331481),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
@@ -44,12 +43,9 @@ static const AccessGameDescription gameDescriptions[] = {
 	// Amazon Guardians of Eden - Demo English
 	{
 		{
-		"amazon",
-		"Demo",
-			{
-				{ "c25.ap", 0, "5baba0c052d22157499bfa05cb1ed5b7", 65458 },
-				AD_LISTEND
-			},
+			"amazon",
+			"Demo",
+			AD_ENTRY1s("c25.ap", "5baba0c052d22157499bfa05cb1ed5b7", 65458),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_DEMO,
@@ -64,10 +60,7 @@ static const AccessGameDescription gameDescriptions[] = {
 		{
 			"amazon",
 			"CD",
-			{
-				{ "checksum.crc", 0, "bef85478132fec74cb5d9067f3a37d24", 8 },
-				AD_LISTEND
-			},
+			AD_ENTRY1s("checksum.crc", "bef85478132fec74cb5d9067f3a37d24", 8),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_CD,
@@ -82,10 +75,7 @@ static const AccessGameDescription gameDescriptions[] = {
 		{
 			"martian",
 			nullptr,
-			{
-				{ "r00.ap", 0, "af98db5ee7f9ef86c6b1f43187a3691b", 31 },
-				AD_LISTEND
-			},
+			AD_ENTRY1s("r00.ap", "af98db5ee7f9ef86c6b1f43187a3691b", 31),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-- 
cgit v1.2.3


From 20bcc7f7aac3f19e002f25dec14e4def7b9c1ca5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 17 Dec 2014 23:45:41 +0100
Subject: ACCESS: Rename CMDPUSHLOCATION

---
 engines/access/scripts.cpp | 14 +++++++-------
 engines/access/scripts.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 59d89af2f2..ac10fe38d9 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -132,7 +132,7 @@ void Scripts::executeCommand(int commandIndex) {
 		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice,
 		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound,
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
-		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::CMDPUSHLOCATION,
+		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::cmdPushLocation,
 		&Scripts::cmdCheckTravel, &Scripts::cmdBlock, &Scripts::cmdPlayerOff,
 		&Scripts::cmdPlayerOn, &Scripts::cmdDead, &Scripts::cmdFadeOut,
 		&Scripts::cmdEndVideo
@@ -826,7 +826,7 @@ void Scripts::cmdPlayVideoSound() {
 
 void Scripts::cmdPrintWatch() {
 	if (_vm->isCD()) {
-		CMDPUSHLOCATION();
+		cmdPushLocation();
 		return;
 	}
 	error("TODO: DEMO - cmdPrintWatch");
@@ -834,19 +834,19 @@ void Scripts::cmdPrintWatch() {
 
 void Scripts::cmdDispAbout() {
 	if (_vm->isCD()) {
-		CMDPUSHLOCATION();
+		cmdPushLocation();
 		return;
 	}
 	error("TODO: DEMO - cmdDispAbout");
 }
 
-void Scripts::CMDPUSHLOCATION() {
-	error("TODO CMDPUSHLOCATION");
+void Scripts::cmdPushLocation() {
+	error("TODO cmdPushLocation");
 }
 
 void Scripts::cmdCheckTravel() {
 	if (_vm->isCD()) {
-		CMDPUSHLOCATION();
+		cmdPushLocation();
 		return;
 	}
 	error("TODO: DEMO - cmdCheckTravel");
@@ -854,7 +854,7 @@ void Scripts::cmdCheckTravel() {
 
 void Scripts::cmdBlock() {
 	if (_vm->isCD()) {
-		CMDPUSHLOCATION();
+		cmdPushLocation();
 		return;
 	}
 	error("TODO: DEMO - cmdBlock");
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index e12f2826de..cfadf6d901 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -119,7 +119,7 @@ protected:
 	void cmdPlayVideoSound();
 	void cmdPrintWatch();
 	void cmdDispAbout();
-	void CMDPUSHLOCATION();
+	void cmdPushLocation();
 	void cmdCheckTravel();
 	void cmdBlock();
 	void cmdPlayerOff();
-- 
cgit v1.2.3


From 7895c5408c37c54dcb5c30ddf7ae09f91052d768 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 18 Dec 2014 07:14:21 +0100
Subject: ACCESS: Constify general messages

---
 engines/access/resources.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 6282d93889..4157cdfc0d 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -64,14 +64,14 @@ const int RMOUSE[10][2] = {
 	{ 142, 177 }, { 178, 212 }, { 213, 248 }, { 249, 283 }, { 284, 318 }
 };
 
-const char *LOOK_MESSAGE = "LOOKING THERE REVEALS NOTHING OF INTEREST.";
-const char *GET_MESSAGE = "YOU CAN'T TAKE THAT.";
-const char *OPEN_MESSAGE = "THAT DOESN'T OPEN.";
-const char *MOVE_MESSAGE = "THAT WON'T MOVE.";
-const char *USE_MESSAGE = "THAT DOESN'T SEEM TO WORK.";
-const char *GO_MESSAGE = "YOU CAN'T CLIMB THAT.";
-const char *HELP_MESSAGE = "THIS OBJECT REQUIRES NO HINTS";
-const char *TALK_MESSAGE      = "THERE SEEMS TO BE NO RESPONSE.";
+const char *const LOOK_MESSAGE = "LOOKING THERE REVEALS NOTHING OF INTEREST.";
+const char *const GET_MESSAGE  = "YOU CAN'T TAKE THAT.";
+const char *const OPEN_MESSAGE = "THAT DOESN'T OPEN.";
+const char *const MOVE_MESSAGE = "THAT WON'T MOVE.";
+const char *const USE_MESSAGE  = "THAT DOESN'T SEEM TO WORK.";
+const char *const GO_MESSAGE   = "YOU CAN'T CLIMB THAT.";
+const char *const HELP_MESSAGE = "THIS OBJECT REQUIRES NO HINTS";
+const char *const TALK_MESSAGE = "THERE SEEMS TO BE NO RESPONSE.";
 const char *const GENERAL_MESSAGES[] = {
 	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE,
 	GO_MESSAGE, TALK_MESSAGE, HELP_MESSAGE, HELP_MESSAGE, USE_MESSAGE
-- 
cgit v1.2.3


From 3fca9d42f3ff6d19eba40d09754cc794f8e17585 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 18 Dec 2014 07:23:18 +0100
Subject: ACCESS: Use  Common::String to display bubble box text

---
 engines/access/bubble_box.cpp | 10 +++++-----
 engines/access/bubble_box.h   |  2 +-
 engines/access/scripts.cpp    | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 572567c3a3..e37a8142e8 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -29,7 +29,7 @@ namespace Access {
 BubbleBox::BubbleBox(AccessEngine *vm) : Manager(vm) {
 	_type = TYPE_2;
 	_bounds = Common::Rect(64, 32, 64 + 130, 32 + 122);
-	_bubblePtr = nullptr;
+	_bubbleDisplStr = "";
 	_fieldD = 0;
 	_fieldE = 0;
 	_fieldF = 0;
@@ -43,7 +43,7 @@ void BubbleBox::load(Common::SeekableReadStream *stream) {
 	while ((v = stream->readByte()) != 0)
 		_bubbleTitle += (char)v;
 
-	_bubblePtr = _bubbleTitle.c_str();
+	_bubbleDisplStr = _bubbleTitle;
 }
 
 void BubbleBox::clearBubbles() {
@@ -90,7 +90,7 @@ void BubbleBox::calcBubble(const Common::String &msg) {
 	if (_type == TYPE_4) {
 		_vm->_fonts._printMaxX = 110;
 	} else {
-		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubblePtr);
+		_vm->_fonts._printMaxX = _vm->_fonts._font2.stringWidth(_bubbleDisplStr);
 	}
 
 	// Start of with a rect with the given starting x and y
@@ -257,13 +257,13 @@ void BubbleBox::doBox(int item, int box) {
 	}
 
 	// Handle drawing title
-	int titleWidth = _vm->_fonts._font2.stringWidth(_bubblePtr);
+	int titleWidth = _vm->_fonts._font2.stringWidth(_bubbleDisplStr);
 	Font &font2 = _vm->_fonts._font2;
 	font2._fontColors[0] = 0;
 	font2._fontColors[1] = 3;
 	font2._fontColors[2] = 2;
 	font2._fontColors[3] = 1;
-	font2.drawString(_vm->_screen, _bubblePtr, Common::Point(
+	font2.drawString(_vm->_screen, _bubbleDisplStr, Common::Point(
 		_bounds.left + (_bounds.width() / 2) - (titleWidth / 2), _bounds.top + 1));
 
 	// Restore positional state
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 2c05d096c3..0130344c7e 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -48,7 +48,7 @@ public:
 	Common::Rect _bounds;
 	Common::StringArray _nameIndex;
 	Common::String _bubbleTitle;
-	const char *_bubblePtr;
+	Common::String _bubbleDisplStr;
 	int _fieldD;
 	int _fieldE;
 	int _fieldF;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index ac10fe38d9..99f52c0ff8 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -621,7 +621,7 @@ void Scripts::cmdTexSpeak() {
 	while ((v = _data->readByte()) != 0)
 		tmpStr += (char)v;
 
-	_vm->_bubbleBox->_bubblePtr = Common::String("JASON").c_str();
+	_vm->_bubbleBox->_bubbleDisplStr = Common::String("JASON");
 	_vm->_bubbleBox->placeBubble1(tmpStr);
 	findNull();
 }
@@ -645,7 +645,7 @@ void Scripts::cmdTexChoice() {
 	_vm->_screen->_printStart = _texsOrg;
 
 	_vm->_bubbleBox->clearBubbles();
-	_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 1").c_str();
+	_vm->_bubbleBox->_bubbleDisplStr = Common::String("RESPONSE 1");
 
 	byte v;
 	Common::String tmpStr = "";
@@ -666,7 +666,7 @@ void Scripts::cmdTexChoice() {
 		tmpStr += (char)v;
 
 	if (tmpStr.size() != 0) {
-		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 2").c_str();
+		_vm->_bubbleBox->_bubbleDisplStr = Common::String("RESPONSE 2");
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
 		responseCoords.push_back(_vm->_bubbleBox->_bounds);
@@ -681,7 +681,7 @@ void Scripts::cmdTexChoice() {
 		tmpStr += (char)v;
 
 	if (tmpStr.size() != 0) {
-		_vm->_bubbleBox->_bubblePtr = Common::String("RESPONSE 3").c_str();
+		_vm->_bubbleBox->_bubbleDisplStr = Common::String("RESPONSE 3");
 		_vm->_bubbleBox->calcBubble(tmpStr);
 		_vm->_bubbleBox->printBubble(tmpStr);
 		responseCoords.push_back(_vm->_bubbleBox->_bounds);
@@ -698,7 +698,7 @@ void Scripts::cmdTexChoice() {
 
 		charLoop();
 
-		_vm->_bubbleBox->_bubblePtr = _vm->_bubbleBox->_bubbleTitle.c_str();
+		_vm->_bubbleBox->_bubbleDisplStr = _vm->_bubbleBox->_bubbleTitle;
 		if (_vm->_events->_leftButton) {
 			if (_vm->_events->_mouseRow >= 22) {
 				_vm->_events->debounceLeft();
-- 
cgit v1.2.3


From 864cab5e477dc5792339e05c1687b78b92318d89 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 19 Dec 2014 01:35:33 +0100
Subject: ACCESS: Fix issue related to demo-only (and unused afawk) opcodes

---
 engines/access/scripts.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 99f52c0ff8..d1dd5e7a7a 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -266,7 +266,7 @@ void Scripts::cmdGoto() {
 }
 
 void Scripts::cmdAddScore() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdSetInventory();
 		return;
 	}
@@ -412,7 +412,7 @@ void Scripts::cmdDispInv() {
 }
 
 void Scripts::cmdSetAbout() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdSetTimer();
 		return;
 	}
@@ -459,7 +459,7 @@ void Scripts::cmdCheckTimer() {
 }
 
 void Scripts::cmdSetTravel() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdJumpGoto();
 		return;
 	}
@@ -515,7 +515,7 @@ void Scripts::cmdSetScroll() {
 }
 
 void Scripts::cmdSaveRect() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdVideoEnded();
 		return;
 	}
@@ -551,7 +551,7 @@ void Scripts::cmdRemoveLast() {
 }
 
 void Scripts::cmdDoTravel() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdSpecial();
 		return;
 	}
@@ -559,7 +559,7 @@ void Scripts::cmdDoTravel() {
 }
 
 void Scripts::cmdCheckAbout() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdSpecial();
 		return;
 	}
@@ -825,7 +825,7 @@ void Scripts::cmdPlayVideoSound() {
 }
 
 void Scripts::cmdPrintWatch() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdPushLocation();
 		return;
 	}
@@ -833,7 +833,7 @@ void Scripts::cmdPrintWatch() {
 }
 
 void Scripts::cmdDispAbout() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdPushLocation();
 		return;
 	}
@@ -845,7 +845,7 @@ void Scripts::cmdPushLocation() {
 }
 
 void Scripts::cmdCheckTravel() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdPushLocation();
 		return;
 	}
@@ -853,7 +853,7 @@ void Scripts::cmdCheckTravel() {
 }
 
 void Scripts::cmdBlock() {
-	if (_vm->isCD()) {
+	if (!_vm->isDemo()) {
 		cmdPushLocation();
 		return;
 	}
-- 
cgit v1.2.3


From 95aa9a13a6ca634af664a3ac4753faf8b8271fd9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 18 Dec 2014 21:45:55 -0500
Subject: ACCESS: Refactor most of ASurface statics to instance variables

---
 engines/access/access.cpp              |   9 +-
 engines/access/access.h                |   2 +
 engines/access/amazon/amazon_logic.cpp | 161 ++++++++++++++++-----------------
 engines/access/amazon/amazon_room.cpp  |   6 +-
 engines/access/asurface.cpp            |  21 +----
 engines/access/asurface.h              |  22 ++---
 engines/access/events.cpp              |   6 +-
 engines/access/inventory.cpp           |  18 ++--
 engines/access/player.cpp              |  74 +++++++--------
 engines/access/room.cpp                |  36 ++++----
 engines/access/screen.cpp              |  21 ++---
 engines/access/screen.h                |   1 -
 engines/access/scripts.cpp             |   8 +-
 13 files changed, 184 insertions(+), 201 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index dd6d0ea129..6ad1b22408 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -66,6 +66,8 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_scaleT1 = 0;
 	_scaleMaxY = 0;
 	_scaleI = 0;
+	_scrollCol = _scrollRow = 0;
+	_scrollX = _scrollY = 0;
 	_imgUnscaled = false;
 	_canSaveLoad = false;
 	_establish = nullptr;
@@ -139,7 +141,6 @@ void AccessEngine::initialize() {
 	}
 
 	// Create sub-objects of the engine
-	ASurface::init();
 	_animation = new AnimationManager(this);
 	_bubbleBox = new BubbleBox(this);
 	_char = new CharManager(this);
@@ -376,9 +377,9 @@ void AccessEngine::copyRects() {
 
 void AccessEngine::copyBF1BF2() {
 	_buffer2.copyRectToSurface(_buffer1, 0, 0,
-		Common::Rect(_buffer1._scrollX, _buffer1._scrollY,
-		_buffer1._scrollX + _screen->_vWindowBytesWide,
-		_buffer1._scrollY + _screen->_vWindowLinesTall));
+		Common::Rect(_scrollX, _scrollY,
+		_scrollX + _screen->_vWindowBytesWide,
+		_scrollY + _screen->_vWindowLinesTall));
 }
 
 void AccessEngine::copyBF2Vid() {
diff --git a/engines/access/access.h b/engines/access/access.h
index c98462003e..a082b969c4 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -185,6 +185,8 @@ public:
 	int _scaleT1;
 	int _scaleMaxY;
 	int _scaleI;
+	int _scrollX, _scrollY;
+	int _scrollCol, _scrollRow;
 	bool _imgUnscaled;
 	bool _canSaveLoad;
 
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 90bc29c329..436a875688 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -410,11 +410,10 @@ void Opening::doTitle() {
 	_vm->_room->loadRoom(0);
 	screen.clearScreen();
 	screen.setBufferScan();
-	screen._scrollRow = screen._scrollCol = 0;
-	screen._scrollX = screen._scrollY = 0;
+	_vm->_scrollRow = _vm->_scrollCol = 0;
+	_vm->_scrollX = _vm->_scrollY = 0;
 	_vm->_player->_rawPlayer = Common::Point(0, 0);
 	screen.forceFadeOut();
-	screen._scrollX = 0;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 	screen.forceFadeIn();
@@ -434,15 +433,15 @@ void Opening::doTitle() {
 		}
 
 		_vm->_events->_vbCount = 4;
-		if (screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth) {
-			screen._scrollX += _vm->_player->_scrollAmount;
+		if (_vm->_scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth) {
+			_vm->_scrollX += _vm->_player->_scrollAmount;
 
-			while (screen._scrollX >= TILE_WIDTH) {
-				screen._scrollX -= TILE_WIDTH;
-				++screen._scrollCol;
+			while (_vm->_scrollX >= TILE_WIDTH) {
+				_vm->_scrollX -= TILE_WIDTH;
+				++_vm->_scrollCol;
 
 				_vm->_buffer1.moveBufferLeft();
-				_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+				_vm->_room->buildColumn(_vm->_scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 			}
 			scrollTitle();
 			++_pCount;
@@ -460,23 +459,23 @@ void Opening::doTitle() {
 		while (!_vm->shouldQuit()) {
 			_pCount = 0;
 			_vm->_events->_vbCount = 3;
-			if (screen._scrollRow + screen._vWindowHeight >= _vm->_room->_playFieldHeight) {
+			if (_vm->_scrollRow + screen._vWindowHeight >= _vm->_room->_playFieldHeight) {
 				_vm->_room->clearRoom();
 				_vm->_events->showCursor();
 				return;
 			}
 
-			screen._scrollY = screen._scrollY + _vm->_player->_scrollAmount;
+			_vm->_scrollY = _vm->_scrollY + _vm->_player->_scrollAmount;
 
-			while (screen._scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
-				screen._scrollY -= TILE_HEIGHT;
-				++screen._scrollRow;
+			while (_vm->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
+				_vm->_scrollY -= TILE_HEIGHT;
+				++_vm->_scrollRow;
 				_vm->_buffer1.moveBufferUp();
 
 				// WORKAROUND: the original was using screen._vWindowBytesWide * screen._vWindowLinesTall
-				_vm->_room->buildRow(screen._scrollRow + screen._vWindowHeight, screen._vWindowLinesTall);
+				_vm->_room->buildRow(_vm->_scrollRow + screen._vWindowHeight, screen._vWindowLinesTall);
 
-				if (screen._scrollRow + screen._vWindowHeight >= _vm->_room->_playFieldHeight) {
+				if (_vm->_scrollRow + screen._vWindowHeight >= _vm->_room->_playFieldHeight) {
 					_vm->_room->clearRoom();
 					_vm->_events->showCursor();
 					return;
@@ -657,7 +656,7 @@ void Plane::mWhileFly() {
 	screen.clearScreen();
 	screen.setBufferScan();
 	screen.fadeOut();
-	screen._scrollX = 0;
+	_vm->_scrollX = 0;
 
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
@@ -666,8 +665,8 @@ void Plane::mWhileFly() {
 	_vm->_newRects.clear();
 	_vm->_events->clearEvents();
 
-	screen._scrollRow = screen._scrollCol = 0;
-	screen._scrollX = screen._scrollY = 0;
+	_vm->_scrollRow = _vm->_scrollCol = 0;
+	_vm->_scrollX = _vm->_scrollY = 0;
 	player._rawPlayer = Common::Point(0, 0);
 	player._scrollAmount = 1;
 
@@ -678,16 +677,16 @@ void Plane::mWhileFly() {
 	_position = Common::Point(20, 29);
 
 	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
-		((screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth)) {
+		((_vm->_scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth)) {
 		events._vbCount = 4;
-		screen._scrollX += player._scrollAmount;
+		_vm->_scrollX += player._scrollAmount;
 
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
+		while (_vm->_scrollX >= TILE_WIDTH) {
+			_vm->_scrollX -= TILE_WIDTH;
+			++_vm->_scrollCol;
 
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+			_vm->_room->buildColumn(_vm->_scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		scrollFly();
@@ -710,7 +709,7 @@ void Plane::mWhileFall() {
 	screen.clearScreen();
 	screen.setBufferScan();
 	screen.fadeOut();
-	screen._scrollX = 0;
+	_vm->_scrollX = 0;
 
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
@@ -719,8 +718,8 @@ void Plane::mWhileFall() {
 	_vm->_newRects.clear();
 	_vm->_events->clearEvents();
 
-	screen._scrollRow = screen._scrollCol = 0;
-	screen._scrollX = screen._scrollY = 0;
+	_vm->_scrollRow = _vm->_scrollCol = 0;
+	_vm->_scrollX = _vm->_scrollY = 0;
 	_vm->_player->_scrollAmount = 3;
 	_vm->_scaleI = 255;
 
@@ -728,16 +727,16 @@ void Plane::mWhileFall() {
 	_planeCount = 0;
 
 	while (!_vm->shouldQuit() && !events.isKeyMousePressed() &&
-		(screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
+		(_vm->_scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
 		events._vbCount = 4;
-		screen._scrollX += _vm->_player->_scrollAmount;
+		_vm->_scrollX += _vm->_player->_scrollAmount;
 
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
+		while (_vm->_scrollX >= TILE_WIDTH) {
+			_vm->_scrollX -= TILE_WIDTH;
+			++_vm->_scrollCol;
 
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+			_vm->_room->buildColumn(_vm->_scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		scrollFall();
@@ -765,7 +764,7 @@ void Jungle::jungleMove() {
 
 	if (!_vm->_timers[0]._flag) {
 		++_vm->_timers[0]._flag;
-		_vm->_screen->_scrollX += _vm->_player->_scrollAmount;
+		_vm->_scrollX += _vm->_player->_scrollAmount;
 
 		for (int i = 0; i < 3; ++i) {
 			int newJCnt = (_jCnt[i] + 1) % 8;
@@ -808,8 +807,8 @@ void Jungle::initJWalk2() {
 	_vm->_buffer2.clearBuffer();
 	screen.setBufferScan();
 
-	screen._scrollX = screen._scrollY;
-	screen._scrollCol = screen._scrollRow;
+	_vm->_scrollX = _vm->_scrollY;
+	_vm->_scrollCol = _vm->_scrollRow;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 	screen.fadeIn();
@@ -866,7 +865,7 @@ void Jungle::mWhileJWalk() {
 	screen.clearScreen();
 	_vm->_buffer2.clearBuffer();
 	screen.setBufferScan();
-	screen._scrollX = 0;
+	_vm->_scrollX = 0;
 
 	// Build the initial jungle scene and fade it in
 	_vm->_room->buildScreen();
@@ -930,17 +929,17 @@ void Jungle::mWhileJWalk2() {
 	initJWalk2();
 
 	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
-		(screen._scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
+		(_vm->_scrollCol + screen._vWindowWidth) != _vm->_room->_playFieldWidth) {
 		_vm->_images.clear();
 		_vm->_events->_vbCount = 6;
 		_pan[0]._pImgNum = _xCount;
 
 		jungleMove();
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
+		while (_vm->_scrollX >= TILE_WIDTH) {
+			_vm->_scrollX -= TILE_WIDTH;
+			++_vm->_scrollCol;
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+			_vm->_room->buildColumn(_vm->_scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		if (_xCount == 2)
@@ -1130,7 +1129,7 @@ void Guard::chkHLine() {
 
 void Guard::guardSee() {
 	Screen &screen = *_vm->_screen;
-	int tmpY = (screen._scrollRow << 4) + screen._scrollY;
+	int tmpY = (_vm->_scrollRow << 4) + _vm->_scrollY;
 	_vm->_flags[140] = 0;
 	if (tmpY > _position.y)
 		return;
@@ -1375,7 +1374,7 @@ River::River(AmazonEngine *vm) : PannedScene(vm) {
 }
 
 void River::setRiverPan() {
-	int delta = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+	int delta = (_vm->_scrollCol * 16) + _vm->_scrollX;
 
 	_xTrack = 9;
 	_yTrack = _zTrack = 0;
@@ -1420,16 +1419,16 @@ void River::initRiver() {
 
 	if (_saveRiver) {
 		// Restoring a savegame, so set properties from saved fields
-		screen._scrollRow = _rScrollRow;
-		screen._scrollCol = _rScrollCol;
-		screen._scrollX = _rScrollX;
-		screen._scrollY = _rScrollY;
+		_vm->_scrollRow = _rScrollRow;
+		_vm->_scrollCol = _rScrollCol;
+		_vm->_scrollX = _rScrollX;
+		_vm->_scrollY = _rScrollY;
 	} else {
 		// Set initial scene state
-		screen._scrollRow = 0;
-		screen._scrollCol = 140;
-		screen._scrollX = 0;
-		screen._scrollY = 0;
+		_vm->_scrollRow = 0;
+		_vm->_scrollCol = 140;
+		_vm->_scrollX = 0;
+		_vm->_scrollY = 0;
 	}
 
 	_vm->_room->buildScreen();
@@ -1490,7 +1489,7 @@ void River::initRiver() {
 
 void River::resetPositions() {
 	riverSetPhysX();
-	int val = (_vm->_screen->_scrollCol + 1 - _oldScrollCol) * 16;
+	int val = (_vm->_scrollCol + 1 - _oldScrollCol) * 16;
 	if (val < 0) {
 		val |= 0x80;
 	}
@@ -1500,7 +1499,7 @@ void River::resetPositions() {
 }
 
 void River::checkRiverPan() {
-	int val = _vm->_screen->_scrollCol * 16 + 320;
+	int val = _vm->_scrollCol * 16 + 320;
 
 	for (int i = 0; i < _pNumObj; i++) {
 		if (_pan[i]._pObjX < val)
@@ -1513,21 +1512,21 @@ void River::checkRiverPan() {
 bool River::riverJumpTest() {
 	Screen &screen = *_vm->_screen;
 
-	if (screen._scrollCol == 120 || screen._scrollCol == 60 || screen._scrollCol == 0) {
+	if (_vm->_scrollCol == 120 || _vm->_scrollCol == 60 || _vm->_scrollCol == 0) {
 		int val = *++_mapPtr;
 		if (val == 0xFF)
 			return true;
 
-		_oldScrollCol = screen._scrollCol;
+		_oldScrollCol = _vm->_scrollCol;
 
 		if (val == 0) {
-			screen._scrollCol = 139;
-			screen._scrollX = 14;
+			_vm->_scrollCol = 139;
+			_vm->_scrollX = 14;
 			_vm->_room->buildScreen();
 			resetPositions();
 			return false;
 		}
-	} else if (screen._scrollCol == 105) {
+	} else if (_vm->_scrollCol == 105) {
 		int val1 = _mapPtr[1];
 		int val2 = _mapPtr[2];
 		_mapPtr += 3;
@@ -1543,19 +1542,19 @@ bool River::riverJumpTest() {
 				_deathCount = 300;
 				_deathType = val2;
 			}
-			_oldScrollCol = screen._scrollCol;
-			screen._scrollCol = 44;
-			screen._scrollX = 14;
+			_oldScrollCol = _vm->_scrollCol;
+			_vm->_scrollCol = 44;
+			_vm->_scrollX = 14;
 			_vm->_room->buildScreen();
 			resetPositions();
 			return false;
 		}
 	}
 
-	screen._scrollX = 14;
-	--screen._scrollCol;
+	_vm->_scrollX = 14;
+	--_vm->_scrollCol;
 	_vm->_buffer1.moveBufferRight();
-	_vm->_room->buildColumn(screen._scrollCol, 0);
+	_vm->_room->buildColumn(_vm->_scrollCol, 0);
 	checkRiverPan();
 	return false;
 }
@@ -1670,7 +1669,7 @@ void River::updateObstacles() {
 }
 
 void River::riverSetPhysX() {
-	int xAmt = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX;
+	int xAmt = (_vm->_scrollCol * 16) + _vm->_scrollX;
 	
 	for (RiverStruct *cur = _topList; cur <= _botList; ++cur) {
 		cur->_xp = xAmt - (_screenVertX - cur->_riverX);
@@ -1713,7 +1712,7 @@ void River::plotRiver() {
 	ie._flags = IMGFLAG_UNSCALED;
 	ie._spritesPtr = _vm->_objectsTable[45];
 	ie._frameNumber = _canoeFrame;
-	ie._position.x = (_vm->_screen->_scrollCol * 16) + _vm->_screen->_scrollX + 160;
+	ie._position.x = (_vm->_scrollCol * 16) + _vm->_scrollX + 160;
 	ie._position.y = _canoeYPos - 41;
 	ie._offsetY = 41;
 	_vm->_images.addToList(ie);
@@ -1750,7 +1749,7 @@ void River::mWhileDownRiver() {
 	screen.setPalette();
 	screen.setBufferScan();
 
-	screen._scrollX = 0;
+	_vm->_scrollX = 0;
 	_vm->_room->buildScreen();
 	_vm->copyBF2Vid();
 
@@ -1783,16 +1782,16 @@ void River::mWhileDownRiver() {
 	++_vm->_timers[4]._flag;
 
 	while (!_vm->shouldQuit() && !_vm->_events->isKeyMousePressed() &&
-		(screen._scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
+		(_vm->_scrollCol + screen._vWindowWidth != _vm->_room->_playFieldWidth)) {
 		_vm->_images.clear();
 		_vm->_events->_vbCount = 6;
 
-		screen._scrollX += _vm->_player->_scrollAmount;
-		while (screen._scrollX >= TILE_WIDTH) {
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
+		_vm->_scrollX += _vm->_player->_scrollAmount;
+		while (_vm->_scrollX >= TILE_WIDTH) {
+			_vm->_scrollX -= TILE_WIDTH;
+			++_vm->_scrollCol;
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
+			_vm->_room->buildColumn(_vm->_scrollCol + screen._vWindowWidth, screen._vWindowBytesWide);
 		}
 
 		pan();
@@ -1844,14 +1843,14 @@ void River::doRiver() {
 		// Move the river position
 		_screenVertX -= _vm->_player->_scrollAmount;
 
-		if (_vm->_screen->_scrollX == 0) {
+		if (_vm->_scrollX == 0) {
 			_vm->_midi->midiRepeat();
 			if (riverJumpTest()) {
 				_chickenOutFl = false;
 				return;
 			}
 		} else {
-			_vm->_screen->_scrollX -= _vm->_player->_scrollAmount;
+			_vm->_scrollX -= _vm->_player->_scrollAmount;
 		}
 
 		if (_chickenOutFl) {
@@ -1911,10 +1910,10 @@ void River::synchronize(Common::Serializer &s) {
 		if (s.isSaving()) {
 			// Set river properties to be saved out
 			Screen &screen = *_vm->_screen;
-			_rScrollRow = screen._scrollRow;
-			_rScrollCol = screen._scrollCol;
-			_rScrollX = screen._scrollX;
-			_rScrollY = screen._scrollY;
+			_rScrollRow = _vm->_scrollRow;
+			_rScrollCol = _vm->_scrollCol;
+			_rScrollX = _vm->_scrollX;
+			_rScrollY = _vm->_scrollY;
 			_mapOffset = _mapPtr - MAPTBL[_vm->_riverFlag];
 		}
 
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 8174969a3d..29742f66bd 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -134,8 +134,8 @@ void AmazonRoom::setupRoom() {
 	// WORKAROUND: The original engine doesn't handle vertical scrolling rooms
 	Screen &screen = *_vm->_screen;
 	if (screen._vWindowHeight == (_playFieldHeight - 1)) {
-		screen._scrollRow = 1;
-		screen._scrollY = 0;
+		_vm->_scrollRow = 1;
+		_vm->_scrollY = 0;
 	}
 }
 
@@ -187,7 +187,7 @@ void AmazonRoom::mainAreaClick() {
 
 		// WORKAROUND: In Amazon room 9, you can't leave the screen to the south due
 		// to not being able to click a Y position that's high enough
-		if (screen._scrollRow == 0 && pt.y > 178)
+		if (_vm->_scrollRow == 0 && pt.y > 178)
 			pt.y = 200;
 
 		player._moveTo = pt;
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 45ce44dfc8..27e73a0640 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -99,31 +99,14 @@ void ImageEntryList::addToList(ImageEntry &ie) {
 
 /*------------------------------------------------------------------------*/
 
-int ASurface::_leftSkip;
-int ASurface::_rightSkip;
-int ASurface::_topSkip;
-int ASurface::_bottomSkip;
 int ASurface::_clipWidth;
 int ASurface::_clipHeight;
-int ASurface::_lastBoundsX;
-int ASurface::_lastBoundsY;
-int ASurface::_lastBoundsW;
-int ASurface::_lastBoundsH;
-int ASurface::_scrollX;
-int ASurface::_scrollY;
-int ASurface::_orgX1;
-int ASurface::_orgY1;
-int ASurface::_orgX2;
-int ASurface::_orgY2;
-int ASurface::_lColor;
-
-void ASurface::init() {
+
+ASurface::ASurface() {
 	_leftSkip = _rightSkip = 0;
 	_topSkip = _bottomSkip = 0;
-	_clipWidth = _clipHeight = 0;
 	_lastBoundsX = _lastBoundsY = 0;
 	_lastBoundsW = _lastBoundsH = 0;
-	_scrollX = _scrollY = 0;
 	_orgX1 = _orgY1 = 0;
 	_orgX2 = _orgY2 = 0;
 	_lColor = 0;
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 6ffbf0e25e..763e3e629e 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -43,22 +43,22 @@ private:
 protected:
 	Common::Rect _savedBounds;
 public:
-	static int _leftSkip, _rightSkip;
-	static int _topSkip, _bottomSkip;
-	static int _clipWidth, _clipHeight;
-	static int _lastBoundsX, _lastBoundsY;
-	static int _lastBoundsW, _lastBoundsH;
-	static int _scrollX, _scrollY;
-	static int _orgX1, _orgY1;
-	static int _orgX2, _orgY2;
-	static int _lColor;
+	int _leftSkip, _rightSkip;
+	int _topSkip, _bottomSkip;
+	int _lastBoundsX, _lastBoundsY;
+	int _lastBoundsW, _lastBoundsH;
+	int _orgX1, _orgY1;
+	int _orgX2, _orgY2;
+	int _lColor;
 
 	Common::Point _printOrg;
 	Common::Point _printStart;
 	int _maxChars;
-
-	static void init();
 public:
+	static int _clipWidth, _clipHeight;
+public:
+	ASurface();
+
 	virtual ~ASurface();
 
 	void create(uint16 width, uint16 height);
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index c314fe9444..0867b09765 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -329,12 +329,12 @@ void EventsManager::waitKeyMouse() {
 }
 
 Common::Point EventsManager::calcRawMouse() {
-	Screen &screen = *_vm->_screen;
 	Common::Point pt;
+	Screen &screen = *_vm->_screen;
 	pt.x = _mousePos.x - screen._windowXAdd +
-		(screen._scrollCol * TILE_WIDTH) + screen._scrollX;
+		(_vm->_scrollCol * TILE_WIDTH) + _vm->_scrollX;
 	pt.y = _mousePos.y - screen._screenYOff - screen._windowYAdd +
-		(screen._scrollRow * TILE_HEIGHT) + screen._scrollY;
+		(_vm->_scrollRow * TILE_HEIGHT) + _vm->_scrollY;
 
 	return pt;
 }
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index d09b784adf..8db62a45fc 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -221,13 +221,13 @@ void InventoryManager::savedFields() {
 	_fields._windowXAdd = screen._windowXAdd;
 	_fields._windowYAdd = screen._windowYAdd;
 	_fields._screenYOff = screen._screenYOff;
-	_fields._scrollX = screen._scrollX;
-	_fields._scrollY = screen._scrollY;
+	_fields._scrollX = _vm->_scrollX;
+	_fields._scrollY = _vm->_scrollY;
 	_fields._clipWidth = screen._clipWidth;
 	_fields._clipHeight = screen._clipHeight;
 	_fields._bufferStart = screen._bufferStart;
-	_fields._scrollCol = screen._scrollCol;
-	_fields._scrollRow = screen._scrollRow;
+	_fields._scrollCol = _vm->_scrollCol;
+	_fields._scrollRow = _vm->_scrollRow;
 }
 
 void InventoryManager::restoreFields() {
@@ -243,13 +243,13 @@ void InventoryManager::restoreFields() {
 	screen._windowXAdd = _fields._windowXAdd;
 	screen._windowYAdd = _fields._windowYAdd;
 	screen._screenYOff = _fields._screenYOff;
-	screen._scrollX = _fields._scrollX;
-	screen._scrollY = _fields._scrollY;
+	_vm->_scrollX = _fields._scrollX;
+	_vm->_scrollY = _fields._scrollY;
 	screen._clipWidth = _fields._clipWidth;
 	screen._clipHeight = _fields._clipHeight;
 	screen._bufferStart = _fields._bufferStart;
-	screen._scrollCol = _fields._scrollCol;
-	screen._scrollRow = _fields._scrollRow;
+	_vm->_scrollCol = _fields._scrollCol;
+	_vm->_scrollRow = _fields._scrollRow;
 }
 
 void InventoryManager::initFields() {
@@ -268,9 +268,9 @@ void InventoryManager::initFields() {
 	screen._windowXAdd = 0;
 	screen._windowYAdd = 0;
 	screen._screenYOff = 0;
-	screen._scrollX = screen._scrollY = 0;
 	screen._bufferStart.x = 0;
 	screen._bufferStart.y = 0;
+	_vm->_scrollX = _vm->_scrollY = 0;
 
 	_vm->_buffer1.clearBuffer();
 	_vm->_buffer2.clearBuffer();
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 83f075e3d8..d547aedc1d 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -209,8 +209,8 @@ void Player::walk() {
 
 void Player::calcPlayer() {
 	Screen &scr = *_vm->_screen;
-	scr._bufferStart.x = (scr._scrollCol << 4) + scr._scrollX;
-	scr._bufferStart.y = (scr._scrollRow << 4) + scr._scrollY;
+	scr._bufferStart.x = (_vm->_scrollCol << 4) + _vm->_scrollX;
+	scr._bufferStart.y = (_vm->_scrollRow << 4) + _vm->_scrollY;
 	_playerX = _rawPlayer.x - scr._bufferStart.x;
 	_playerY = _rawPlayer.y - scr._bufferStart.y;
 }
@@ -519,7 +519,7 @@ void Player::walkDownRight() {
 	bool flag = _scrollEnd == 2;
 	if (!flag) {
 		calcPlayer();
-		flag = (_vm->_screen->_clipWidth -  _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
+		flag = (_vm->_screen->_clipWidth - _playerX - _vm->_screen->_scaleTable1[_scrollConst] -
 			_vm->_player->_scrollThreshold) > 0;
 	}
 	if (flag) {
@@ -664,7 +664,7 @@ void Player::checkScrollUp() {
 			// Scroll up
 			if (scrollUp()) {
 				_scrollEnd = 4;
-				_vm->_screen->_scrollY &= TILE_HEIGHT;
+				_vm->_scrollY &= TILE_HEIGHT;
 				_scrollFlag = true;
 			}
 	}
@@ -706,26 +706,26 @@ void Player::checkScroll() {
 
 bool Player::scrollUp() {
 	_scrollAmount = -(_vm->_screen->_clipHeight - _playerY - _scrollThreshold);
-	if ((_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight) >=
+	if ((_vm->_scrollRow + _vm->_screen->_vWindowHeight) >=
 			_vm->_room->_playFieldHeight)
 		return true;
 
 	_scrollFlag = true;
-	_vm->_screen->_scrollY = _vm->_screen->_scrollY + _scrollAmount;
+	_vm->_scrollY = _vm->_scrollY + _scrollAmount;
 
-	while (_vm->_screen->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
-			_vm->_screen->_scrollY -= TILE_HEIGHT;
-		++_vm->_screen->_scrollRow;
+	while (_vm->_scrollY >= TILE_HEIGHT && !_vm->shouldQuit()) {
+			_vm->_scrollY -= TILE_HEIGHT;
+		++_vm->_scrollRow;
 		_vm->_buffer1.moveBufferUp();
 
-		_vm->_room->buildRow(_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight,
+		_vm->_room->buildRow(_vm->_scrollRow + _vm->_screen->_vWindowHeight,
 			_vm->_screen->_vWindowLinesTall);
 
-		if ((_vm->_screen->_scrollRow + _vm->_screen->_vWindowHeight) >=
+		if ((_vm->_scrollRow + _vm->_screen->_vWindowHeight) >=
 			_vm->_room->_playFieldHeight)
 			return true;
 
-		if (_vm->_screen->_scrollY <= TILE_HEIGHT)
+		if (_vm->_scrollY <= TILE_HEIGHT)
 			return false;
 	}
 
@@ -735,50 +735,50 @@ bool Player::scrollUp() {
 bool Player::scrollDown() {
 	_scrollAmount = -(_playerY - _scrollThreshold);
 	_scrollFlag = true;
-	_vm->_screen->_scrollY -= _scrollAmount;
-	if (_vm->_screen->_scrollY >= 0)
+	_vm->_scrollY -= _scrollAmount;
+	if (_vm->_scrollY >= 0)
 		return true;
 
 	do {
-		_vm->_screen->_scrollY += TILE_HEIGHT;
-		if (--_vm->_screen->_scrollRow < 0)
+		_vm->_scrollY += TILE_HEIGHT;
+		if (--_vm->_scrollRow < 0)
 			break;
 
 		_vm->_buffer1.moveBufferDown();
-		_vm->_room->buildRow(_vm->_screen->_scrollRow, 0);
+		_vm->_room->buildRow(_vm->_scrollRow, 0);
 
-		if (_vm->_screen->_scrollY >= 0)
+		if (_vm->_scrollY >= 0)
 			return false;
 	} while (!_vm->shouldQuit());
 
 	_scrollEnd = 3;
-	_vm->_screen->_scrollY = 0;
-	_vm->_screen->_scrollRow = 0;
+	_vm->_scrollY = 0;
+	_vm->_scrollRow = 0;
 	return true;
 }
 
 bool Player::scrollLeft() {
 	Screen &screen = *_vm->_screen;
-	_scrollAmount = -(screen._clipWidth - _playerX - _scrollThreshold);
-	if ((screen._scrollCol + screen._vWindowWidth) == _vm->_room->_playFieldWidth) {
+	_scrollAmount = -(_vm->_screen->_clipWidth - _playerX - _scrollThreshold);
+	if ((_vm->_scrollCol + screen._vWindowWidth) == _vm->_room->_playFieldWidth) {
 		_scrollEnd = 2;
-		screen._scrollX = 0;
+		_vm->_scrollX = 0;
 		_scrollFlag = true;
 		return true;
 	} else {
 		_scrollFlag = true;
-		screen._scrollX = screen._scrollX + _scrollAmount;
+		_vm->_scrollX = _vm->_scrollX + _scrollAmount;
 
 		do {
-			if (screen._scrollX < TILE_WIDTH)
+			if (_vm->_scrollX < TILE_WIDTH)
 				return true;
 
-			screen._scrollX -= TILE_WIDTH;
-			++screen._scrollCol;
+			_vm->_scrollX -= TILE_WIDTH;
+			++_vm->_scrollCol;
 			_vm->_buffer1.moveBufferLeft();
-			_vm->_room->buildColumn(screen._scrollCol + screen._vWindowWidth,
+			_vm->_room->buildColumn(_vm->_scrollCol + screen._vWindowWidth,
 				screen._vWindowBytesWide);
-		} while (!_vm->shouldQuit() && (screen._scrollX >= TILE_WIDTH));
+		} while (!_vm->shouldQuit() && (_vm->_scrollX >= TILE_WIDTH));
 
 		return (_playerDirection == UPRIGHT);
 	}
@@ -787,21 +787,21 @@ bool Player::scrollLeft() {
 bool Player::scrollRight() {
 	_scrollAmount = -(_playerX - _scrollThreshold);
 	_scrollFlag = true;
-	_vm->_screen->_scrollX -= _scrollAmount;
+	_vm->_scrollX -= _scrollAmount;
 
-	if (_vm->_screen->_scrollX < 0) {
+	if (_vm->_scrollX < 0) {
 		do {
-			_vm->_screen->_scrollX += TILE_WIDTH;
-			if (--_vm->_screen->_scrollCol < 0) {
+			_vm->_scrollX += TILE_WIDTH;
+			if (--_vm->_scrollCol < 0) {
 				_scrollEnd = true;
-				_vm->_screen->_scrollX = 0;
-				_vm->_screen->_scrollCol = 0;
+				_vm->_scrollX = 0;
+				_vm->_scrollCol = 0;
 				return true;
 			}
 
 			_vm->_buffer1.moveBufferRight();
-			_vm->_room->buildColumn(_vm->_screen->_scrollCol, 0);
-		} while (!_vm->shouldQuit() && (_vm->_screen->_scrollX < 0));
+			_vm->_room->buildColumn(_vm->_scrollCol, 0);
+		} while (!_vm->shouldQuit() && (_vm->_scrollX < 0));
 
 		return false;
 	}
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index fc9cb6a4a0..f7c2eabd0f 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -253,33 +253,33 @@ void Room::setupRoom() {
 		screen.setIconPalette();
 
 	if (screen._vWindowWidth == _playFieldWidth) {
-		screen._scrollX = 0;
-		screen._scrollCol = 0;
+		_vm->_scrollX = 0;
+		_vm->_scrollCol = 0;
 	} else {
 		int xv = _vm->_player->_rawPlayer.x / TILE_WIDTH;
-		screen._scrollX = _vm->_player->_rawPlayer.x % TILE_WIDTH;
-		screen._scrollCol = MAX(xv - (screen._vWindowWidth / 2), 0);
+		_vm->_scrollX = _vm->_player->_rawPlayer.x % TILE_WIDTH;
+		_vm->_scrollCol = MAX(xv - (screen._vWindowWidth / 2), 0);
 
-		int sx = screen._scrollCol + screen._vWindowWidth - _playFieldWidth;
+		int sx = _vm->_scrollCol + screen._vWindowWidth - _playFieldWidth;
 		if (sx >= 0) {
-			screen._scrollCol -= sx + 1;
+			_vm->_scrollCol -= sx + 1;
 		}
 	}
 
 	if (screen._vWindowHeight == _playFieldHeight) {
-		screen._scrollY = 0;
-		screen._scrollRow = 0;
+		_vm->_scrollY = 0;
+		_vm->_scrollRow = 0;
 	} else {
-		screen._scrollY = _vm->_player->_rawPlayer.y -
+		_vm->_scrollY = _vm->_player->_rawPlayer.y -
 			(_vm->_player->_rawPlayer.y / 16) * 16;
 		int yc = MAX((_vm->_player->_rawPlayer.y >> 4) -
 			(screen._vWindowHeight / 2), 0);
-		screen._scrollRow = yc;
+		_vm->_scrollRow = yc;
 
 		yc = yc + screen._vWindowHeight - _playFieldHeight;
 		if (yc >= 0) {
-			screen._scrollRow = _playFieldHeight - screen._vWindowHeight;
-			screen._scrollY = 0;
+			_vm->_scrollRow = _playFieldHeight - screen._vWindowHeight;
+			_vm->_scrollY = 0;
 		}
 	}
 }
@@ -293,7 +293,7 @@ void Room::setWallCodes() {
 }
 
 void Room::buildScreen() {
-	int scrollCol = _vm->_screen->_scrollCol;
+	int scrollCol = _vm->_scrollCol;
 	int offset = 0;
 
 	// Clear current background buffer
@@ -304,11 +304,11 @@ void Room::buildScreen() {
 
 	// Loop through drawing each column of tiles forming the background
 	for (int idx = 0; idx < w; offset += TILE_WIDTH, ++idx) {
-		buildColumn(_vm->_screen->_scrollCol, offset);
-		++_vm->_screen->_scrollCol;
+		buildColumn(_vm->_scrollCol, offset);
+		++_vm->_scrollCol;
 	}
 
-	_vm->_screen->_scrollCol = scrollCol;
+	_vm->_scrollCol = scrollCol;
 	_vm->copyBF1BF2();
 }
 
@@ -316,7 +316,7 @@ void Room::buildColumn(int playX, int screenX) {
 	if (playX < 0 || playX >= _playFieldWidth)
 		return;
 
-	const byte *pSrc = _playField + _vm->_screen->_scrollRow *
+	const byte *pSrc = _playField + _vm->_scrollRow *
 		_playFieldWidth + playX;
 
 	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
@@ -341,7 +341,7 @@ void Room::buildRow(int playY, int screenY) {
 		return;
 	assert(screenY <= (_vm->_screen->h - TILE_HEIGHT));
 
-	const byte *pSrc = _playField + playY *_playFieldWidth + _vm->_screen->_scrollCol;
+	const byte *pSrc = _playField + playY *_playFieldWidth + _vm->_scrollCol;
 
 	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
 	int w = MIN(_vm->_screen->_vWindowWidth + 1, _playFieldWidth);
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index d0974bde26..35069ba683 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -50,7 +50,6 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_currentPanel = 0;
 	_hideFlag = true;
 	_startColor = _numColors = 0;
-	_scrollCol = _scrollRow = 0;
 	_windowXAdd = _windowYAdd = 0;
 	_screenYOff = 0;
 	_screenChangeFlag = false;
@@ -76,8 +75,8 @@ void Screen::setDisplayScan() {
 	_clipWidth = this->w - 1;
 	_clipHeight = this->h - 1;
 	_windowXAdd = _windowYAdd = 0;
-	_scrollX = _scrollY = 0;
-	_scrollCol = _scrollRow = 0;
+	_vm->_scrollX = _vm->_scrollY = 0;
+	_vm->_scrollCol = _vm->_scrollRow = 0;
 	_bufferStart.x = _bufferStart.y = 0;
 	_screenYOff = 0;
 }
@@ -225,10 +224,10 @@ void Screen::saveScreen() {
 	_screenSave._clipHeight = _clipHeight;
 	_screenSave._windowXAdd = _windowXAdd;
 	_screenSave._windowYAdd = _windowYAdd;
-	_screenSave._scroll.x = _scrollX;
-	_screenSave._scroll.y = _scrollY;
-	_screenSave._scrollCol = _scrollCol;
-	_screenSave._scrollRow = _scrollRow;
+	_screenSave._scroll.x = _vm->_scrollX;
+	_screenSave._scroll.y = _vm->_scrollY;
+	_screenSave._scrollCol = _vm->_scrollCol;
+	_screenSave._scrollRow = _vm->_scrollRow;
 	_screenSave._bufferStart.x = _bufferStart.x;
 	_screenSave._bufferStart.y = _bufferStart.y;
 	_screenSave._screenYOff = _screenYOff;
@@ -239,10 +238,10 @@ void Screen::restoreScreen() {
 	_clipHeight = _screenSave._clipHeight;
 	_windowXAdd = _screenSave._windowXAdd;
 	_windowYAdd = _screenSave._windowYAdd;
-	_scrollX = _screenSave._scroll.x;
-	_scrollY = _screenSave._scroll.y;
-	_scrollCol = _screenSave._scrollCol;
-	_scrollRow = _screenSave._scrollRow;
+	_vm->_scrollX = _screenSave._scroll.x;
+	_vm->_scrollY = _screenSave._scroll.y;
+	_vm->_scrollCol = _screenSave._scrollCol;
+	_vm->_scrollRow = _screenSave._scrollRow;
 	_bufferStart.x = _screenSave._bufferStart.x;
 	_bufferStart.y = _screenSave._bufferStart.y;
 	_screenYOff = _screenSave._screenYOff;
diff --git a/engines/access/screen.h b/engines/access/screen.h
index bf4cceaf11..0fa111c21c 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -74,7 +74,6 @@ public:
 	int _vesaMode;
 	int _startColor, _numColors;
 	Common::Point _bufferStart;
-	int _scrollCol, _scrollRow;
 	int _windowXAdd, _windowYAdd;
 	int _screenYOff;
 	byte _manPal[0x60];
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index d1dd5e7a7a..2e22d9a2ce 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -508,10 +508,10 @@ void Scripts::cmdSetBuffer() {
 }
 
 void Scripts::cmdSetScroll() {
-	_vm->_screen->_scrollCol = _data->readUint16LE();
-	_vm->_screen->_scrollRow = _data->readUint16LE();
-	_vm->_screen->_scrollX = 0;
-	_vm->_screen->_scrollY = 0;
+	_vm->_scrollCol = _data->readUint16LE();
+	_vm->_scrollRow = _data->readUint16LE();
+	_vm->_scrollX = 0;
+	_vm->_scrollY = 0;
 }
 
 void Scripts::cmdSaveRect() {
-- 
cgit v1.2.3


From 93bbe3a45e4d9a6542b93ec9747bc0c6031054ae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 18 Dec 2014 21:52:59 -0500
Subject: ACCESS: Manually implement ASurface::copyFrom for performance

The original called Surface::copyFrom, which keeps recreating the
dest surface with each copy. This version simply copies the image
---
 engines/access/asurface.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 27e73a0640..38af7add00 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -252,7 +252,11 @@ void ASurface::transCopyFrom(ASurface &src) {
 }
 
 void ASurface::copyFrom(Graphics::Surface &src) {
-	Graphics::Surface::copyFrom(src);
+	for (int y = 0; y < src.h; ++y) {
+		const byte *srcP = (const byte *)src.getBasePtr(0, y);
+		byte *destP = (byte *)getBasePtr(0, y);
+		Common::copy(srcP, srcP + src.w, destP);
+	}
 }
 
 void ASurface::copyBuffer(Graphics::Surface *src) {
-- 
cgit v1.2.3


From f4fe0b008fa564a59dddfc59af9385fd3cd958d0 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 10:46:43 +0600
Subject: ZVISION: Delete unused code

---
 engines/zvision/graphics/truetype_font.cpp |  76 -----------
 engines/zvision/graphics/truetype_font.h   |  39 ------
 engines/zvision/text/string_manager.cpp    | 202 +----------------------------
 engines/zvision/text/string_manager.h      |  25 ----
 engines/zvision/text/text.h                |   4 -
 5 files changed, 2 insertions(+), 344 deletions(-)

diff --git a/engines/zvision/graphics/truetype_font.cpp b/engines/zvision/graphics/truetype_font.cpp
index 1a0e92087c..2dbd7ca358 100644
--- a/engines/zvision/graphics/truetype_font.cpp
+++ b/engines/zvision/graphics/truetype_font.cpp
@@ -36,82 +36,6 @@
 
 namespace ZVision {
 
-TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
-	: _engine(engine),
-	  _fontHeight(fontHeight),
-	  _font(0),
-	  _lineHeight(0),
-	  _maxCharWidth(0),
-	  _maxCharHeight(0) {
-}
-
-TruetypeFont::~TruetypeFont(void) {
-	delete _font;
-}
-
-bool TruetypeFont::loadFile(const Common::String &filename) {
-	Common::File file;
-
-	bool fileOpened = false;
-	if (!Common::File::exists(filename)) {
-		debug("TTF font file %s was not found. Reverting to arial.ttf", filename.c_str());
-		fileOpened = file.open("arial.ttf");
-	} else {
-		fileOpened = file.open(filename);
-	}
-
-	if (!fileOpened) {
-		debug("TTF file could not be opened");
-		return false;
-	}
-
-	_font = Graphics::loadTTFFont(file, _fontHeight);
-	_lineHeight = _font->getFontHeight();
-
-	return true;
-}
-
-Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap) {
-	if (text.equals("")) {
-		return nullptr;
-	}
-
-	Graphics::Surface *surface = new Graphics::Surface();
-
-	if (!wrap) {
-		int width = MIN(_font->getStringWidth(text), maxWidth);
-		surface->create(width, _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-		// TODO: Add better alpha support by getting the pixels from the backbuffer.
-		// However doing that requires some kind of caching system so future text doesn't try to use this text as it's alpha background.
-		surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
-
-		_font->drawString(surface, text, 0, 0, maxWidth, textColor, align);
-		return surface;
-	}
-
-	Common::Array<Common::String> lines;
-	_font->wordWrapText(text, maxWidth, lines);
-
-	while (maxHeight > 0 && (int)lines.size() * _lineHeight > maxHeight) {
-		lines.pop_back();
-	}
-	if (lines.size() == 0) {
-		delete surface;
-		return nullptr;
-	}
-
-	surface->create(maxWidth, lines.size() * _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-	surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
-
-	int heightOffset = 0;
-	for (Common::Array<Common::String>::iterator it = lines.begin(); it != lines.end(); it++) {
-		_font->drawString(surface, *it, 0, 0 + heightOffset, maxWidth, textColor, align);
-		heightOffset += _lineHeight;
-	}
-
-	return surface;
-}
-
 StyledTTFont::StyledTTFont(ZVision *engine) {
 	_engine = engine;
 	_style = 0;
diff --git a/engines/zvision/graphics/truetype_font.h b/engines/zvision/graphics/truetype_font.h
index 30ef1c73a3..b5fac4af8a 100644
--- a/engines/zvision/graphics/truetype_font.h
+++ b/engines/zvision/graphics/truetype_font.h
@@ -36,45 +36,6 @@ namespace ZVision {
 
 class ZVision;
 
-class TruetypeFont {
-public:
-	TruetypeFont(ZVision *engine, int32 fontHeight);
-	~TruetypeFont();
-
-private:
-	ZVision *_engine;
-	Graphics::Font *_font;
-	int _lineHeight;
-
-	size_t _maxCharWidth;
-	size_t _maxCharHeight;
-
-public:
-	int32 _fontHeight;
-
-public:
-	/**
-	 * Loads a .ttf file into memory. This must be called
-	 * before any calls to drawTextToSurface
-	 *
-	 * @param filename    The file name of the .ttf file to load
-	 */
-	bool loadFile(const Common::String &filename);
-	/**
-	 * Renders the supplied text to a Surface using 0x0 as the
-	 * background color.
-	 *
-	 * @param text         The to render
-	 * @param textColor    The color to render the text with
-	 * @param maxWidth     The max width the text should take up.
-	 * @param maxHeight    The max height the text should take up.
-	 * @param align        The alignment of the text within the bounds of maxWidth
-	 * @param wrap         If true, any words extending past maxWidth will wrap to a new line. If false, ellipses will be rendered to show that the text didn't fit
-	 * @return             A Surface containing the rendered text
-	 */
-	Graphics::Surface *drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap);
-};
-
 // Styled TTF
 class StyledTTFont {
 public:
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index d275bc8769..ec10b6220c 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -30,7 +30,7 @@
 #include "zvision/zvision.h"
 #include "zvision/file/search_manager.h"
 #include "zvision/text/string_manager.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/text.h"
 
 namespace ZVision {
 
@@ -39,9 +39,7 @@ StringManager::StringManager(ZVision *engine)
 }
 
 StringManager::~StringManager() {
-	for (Common::HashMap<Common::String, TruetypeFont *>::iterator iter = _fonts.begin(); iter != _fonts.end(); ++iter) {
-		delete iter->_value;
-	}
+
 }
 
 void StringManager::initialize(ZVisionGameId gameId) {
@@ -69,202 +67,6 @@ void StringManager::loadStrFile(const Common::String &fileName) {
 	}
 }
 
-void StringManager::parseStrFile(const Common::String &fileName) {
-	Common::File file;
-	if (!file.open(fileName)) {
-		warning("%s does not exist. String parsing failed", fileName.c_str());
-		return;
-	}
-
-	uint lineNumber = 0;
-	while (!file.eos()) {
-		_lastStyle.align = Graphics::kTextAlignLeft;
-		_lastStyle.color = 0;
-		_lastStyle.font = nullptr;
-
-		Common::String asciiLine = readWideLine(file);
-		if (asciiLine.empty()) {
-			continue;
-		}
-
-		char tagString[150];
-		uint tagStringCursor = 0;
-		char textString[150];
-		uint textStringCursor = 0;
-		bool inTag = false;
-
-		for (uint i = 0; i < asciiLine.size(); ++i) {
-			switch (asciiLine[i]) {
-			case '<':
-				inTag = true;
-				if (!_inGameText[lineNumber].fragments.empty()) {
-					_inGameText[lineNumber].fragments.back().text = Common::String(textString, textStringCursor);
-					textStringCursor = 0;
-				}
-				break;
-			case '>':
-				inTag = false;
-				parseTag(Common::String(tagString, tagStringCursor), lineNumber);
-				tagStringCursor = 0;
-				break;
-			default:
-				if (inTag) {
-					tagString[tagStringCursor] = asciiLine[i];
-					tagStringCursor++;
-				} else {
-					textString[textStringCursor] = asciiLine[i];
-					textStringCursor++;
-				}
-				break;
-			}
-		}
-
-		if (textStringCursor > 0) {
-			_inGameText[lineNumber].fragments.back().text = Common::String(textString, textStringCursor);
-		}
-
-		lineNumber++;
-		assert(lineNumber <= NUM_TEXT_LINES);
-	}
-}
-
-void StringManager::parseTag(const Common::String &tagString, uint lineNumber) {
-	Common::StringTokenizer tokenizer(tagString);
-
-	Common::String token = tokenizer.nextToken();
-
-	Common::String fontName;
-	bool bold = false;
-	Graphics::TextAlign align = _lastStyle.align;
-	int point = _lastStyle.font != nullptr ? _lastStyle.font->_fontHeight : 12;
-	int red = 0;
-	int green = 0;
-	int blue = 0;
-
-	while (!token.empty()) {
-		if (token.matchString("font", true)) {
-			fontName = tokenizer.nextToken();
-		} else if (token.matchString("bold", true)) {
-			token = tokenizer.nextToken();
-			if (token.matchString("on", false)) {
-				bold = true;
-			}
-		} else if (token.matchString("justify", true)) {
-			token = tokenizer.nextToken();
-			if (token.matchString("center", false)) {
-				align = Graphics::kTextAlignCenter;
-			} else if (token.matchString("right", false)) {
-				align = Graphics::kTextAlignRight;
-			}
-		} else if (token.matchString("point", true)) {
-			point = atoi(tokenizer.nextToken().c_str());
-		} else if (token.matchString("red", true)) {
-			red = atoi(tokenizer.nextToken().c_str());
-		} else if (token.matchString("green", true)) {
-			green = atoi(tokenizer.nextToken().c_str());
-		} else if (token.matchString("blue", true)) {
-			blue = atoi(tokenizer.nextToken().c_str());
-		}
-
-		token = tokenizer.nextToken();
-	}
-
-	TextFragment fragment;
-
-	if (fontName.empty()) {
-		fragment.style.font = _lastStyle.font;
-	} else {
-		Common::String newFontName;
-		if (fontName.matchString("*times new roman*", true)) {
-			if (bold) {
-				newFontName = "timesbd.ttf";
-			} else {
-				newFontName = "times.ttf";
-			}
-		} else if (fontName.matchString("*courier new*", true)) {
-			if (bold) {
-				newFontName = "courbd.ttf";
-			} else {
-				newFontName = "cour.ttf";
-			}
-		} else if (fontName.matchString("*century schoolbook*", true)) {
-			if (bold) {
-				newFontName = "censcbkbd.ttf";
-			} else {
-				newFontName = "censcbk.ttf";
-			}
-		} else if (fontName.matchString("*garamond*", true)) {
-			if (bold) {
-				newFontName = "garabd.ttf";
-			} else {
-				newFontName = "gara.ttf";
-			}
-		} else {
-			debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
-			if (bold) {
-				newFontName = "zorknorm.ttf";
-			} else {
-				newFontName = "arial.ttf";
-			}
-		}
-
-		Common::String fontKey = Common::String::format("%s-%d", newFontName.c_str(), point);
-		if (_fonts.contains(fontKey)) {
-			fragment.style.font = _fonts[fontKey];
-		} else {
-			fragment.style.font = new TruetypeFont(_engine, point);
-			fragment.style.font->loadFile(newFontName);
-			_fonts[fontKey] = fragment.style.font;
-		}
-	}
-
-	fragment.style.align = align;
-	fragment.style.color = Graphics::ARGBToColor<Graphics::ColorMasks<565> >(0, red, green, blue);
-	_inGameText[lineNumber].fragments.push_back(fragment);
-
-	_lastStyle = fragment.style;
-}
-
-Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
-	Common::String asciiString;
-
-	// Don't spam the user with warnings about UTF-16 support.
-	// Just do one warning per String
-	bool charOverflowWarning = false;
-
-	uint16 value = stream.readUint16LE();
-	while (!stream.eos()) {
-		// Check for CRLF
-		if (value == 0x0A0D) {
-			// Read in the extra NULL char
-			stream.readByte(); // \0
-			// End of the line. Break
-			break;
-		}
-
-		// Crush each octet pair to a single octet with a simple cast
-		if (value > 255) {
-			charOverflowWarning = true;
-			value = '?';
-		}
-		char charValue = (char)value;
-
-		asciiString += charValue;
-
-		value = stream.readUint16LE();
-	}
-
-	if (charOverflowWarning) {
-		warning("UTF-16 is not supported. Characters greater than 255 are replaced with '?'");
-	}
-
-	return asciiString;
-}
-
-StringManager::TextStyle StringManager::getTextStyle(uint stringNumber) {
-	return _inGameText[stringNumber].fragments.front().style;
-}
-
 const Common::String StringManager::getTextLine(uint stringNumber) {
 	return _lines[stringNumber];
 }
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index 8d6fbe67a6..b77ad65040 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -40,17 +40,6 @@ public:
 	~StringManager();
 
 public:
-	struct TextStyle {
-		TruetypeFont *font;
-		uint16 color; // In RBG 565
-		Graphics::TextAlign align;
-	};
-
-	struct TextFragment {
-		TextStyle style;
-		Common::String text;
-	};
-
 	enum {
 		ZVISION_STR_SAVEEXIST = 23,
 		ZVISION_STR_SAVED = 4,
@@ -59,10 +48,6 @@ public:
 	};
 
 private:
-	struct InGameText {
-		Common::List<TextFragment> fragments;
-	};
-
 	enum {
 		NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
 	};
@@ -71,22 +56,12 @@ private:
 	ZVision *_engine;
 	Common::String _lines[NUM_TEXT_LINES];
 
-	InGameText _inGameText[NUM_TEXT_LINES];
-	Common::HashMap<Common::String, TruetypeFont *> _fonts;
-
-	TextStyle _lastStyle;
-
 public:
 	void initialize(ZVisionGameId gameId);
-	StringManager::TextStyle getTextStyle(uint stringNumber);
 	const Common::String getTextLine(uint stringNumber);
 
 private:
 	void loadStrFile(const Common::String &fileName);
-	void parseStrFile(const Common::String &fileName);
-	void parseTag(const Common::String &tagString, uint lineNumber);
-
-	static Common::String readWideLine(Common::SeekableReadStream &stream);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index 01c3fd760c..ecec3ccde6 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -28,10 +28,6 @@
 #include "zvision/graphics/truetype_font.h"
 #include "zvision/zvision.h"
 
-namespace Graphics {
-class FontManager;
-}
-
 namespace ZVision {
 
 class ZVision;
-- 
cgit v1.2.3


From 30212e4579e9f811f46cfadc5899c4d21cd513ed Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:30:03 +0600
Subject: ZVISION: Fix array compared against 0 (CID 1109648)

---
 engines/zvision/file/zfs_archive.cpp | 2 +-
 engines/zvision/file/zfs_archive.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/file/zfs_archive.cpp b/engines/zvision/file/zfs_archive.cpp
index 9b55a366ed..0c076a798b 100644
--- a/engines/zvision/file/zfs_archive.cpp
+++ b/engines/zvision/file/zfs_archive.cpp
@@ -140,7 +140,7 @@ Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::
 	byte *buffer = (byte *)malloc(entryHeader->size);
 	zfsArchive.read(buffer, entryHeader->size);
 	// Decrypt the data in place
-	if (_header.xorKey != 0)
+	if (_header.xorKey[0] + _header.xorKey[1] + _header.xorKey[2] + _header.xorKey[3] != 0)
 		unXor(buffer, entryHeader->size, _header.xorKey);
 
 	return new Common::MemoryReadStream(buffer, entryHeader->size, DisposeAfterUse::YES);
diff --git a/engines/zvision/file/zfs_archive.h b/engines/zvision/file/zfs_archive.h
index 571591a6d1..fe0221416d 100644
--- a/engines/zvision/file/zfs_archive.h
+++ b/engines/zvision/file/zfs_archive.h
@@ -39,7 +39,7 @@ struct ZfsHeader {
 	uint32 maxNameLength;
 	uint32 filesPerBlock;
 	uint32 fileCount;
-	byte xorKey[4];
+	uint8 xorKey[4];
 	uint32 fileSectionOffset;
 };
 
-- 
cgit v1.2.3


From d96834020c9f3dac02d6a4feb8bac673ca223f94 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:31:43 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1109669)

---
 engines/zvision/scripting/controls/input_control.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 6959f9eca9..e75cc15743 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -46,7 +46,9 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _enterPressed(false),
 	  _readOnly(false),
 	  _txtWidth(0),
-	  _animation(NULL) {
+	  _animation(NULL),
+	  _frameDelay(0),
+	  _frame(-1) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
-- 
cgit v1.2.3


From 76335d4a81679d7334918e4009a083883befebb8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:32:43 +0600
Subject: ZVISION: Fix uninitialized pointer field (CID 1109672)

---
 engines/zvision/zvision.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f9d6bb3e85..4e5307c182 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -90,6 +90,12 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _stringManager(nullptr),
 	  _cursorManager(nullptr),
 	  _midiManager(nullptr),
+	  _rnd(nullptr),
+	  _console(nullptr),
+	  _menu(nullptr),
+	  _searchManager(nullptr),
+	  _textRenderer(nullptr),
+	  _halveDelay(false),
 	  _audioId(0),
 	  _rendDelay(2),
 	  _kbdVelocity(0),
-- 
cgit v1.2.3


From b10f66438f4a11feece7a6f2eb0cd753169701c4 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:33:51 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1109675)

---
 engines/zvision/graphics/render_table.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 54faecfa8b..c30e0bd472 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -34,6 +34,9 @@ RenderTable::RenderTable(uint numColumns, uint numRows)
 	assert(numRows != 0 && numColumns != 0);
 
 	_internalBuffer = new Common::Point[numRows * numColumns];
+
+	memset(&_panoramaOptions, 0, sizeof(_panoramaOptions));
+	memset(&_tiltOptions, 0, sizeof(_tiltOptions));
 }
 
 RenderTable::~RenderTable() {
-- 
cgit v1.2.3


From c50024fd86e6bb0b21f70eb4e018f823913f36fd Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:37:33 +0600
Subject: ZVISION: Fix uninitialized pointer field (CID 1109699)

---
 engines/zvision/scripting/controls/lever_control.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 71dd52f40f..8faa18357c 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -48,7 +48,10 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _mouseIsCaptured(false),
 	  _isReturning(false),
 	  _accumulatedTime(0),
-	  _returnRoutesCurrentFrame(0) {
+	  _returnRoutesCurrentFrame(0),
+	  _animation(NULL),
+	  _cursor(CursorIndex_Active),
+	  _mirrored(false) {
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
-- 
cgit v1.2.3


From 74ea583a4ef446a92cbba4506f7c04513d1ca997 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:38:28 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1109700)

---
 engines/zvision/file/zfs_archive.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/file/zfs_archive.cpp b/engines/zvision/file/zfs_archive.cpp
index 0c076a798b..3a385cd8fd 100644
--- a/engines/zvision/file/zfs_archive.cpp
+++ b/engines/zvision/file/zfs_archive.cpp
@@ -31,6 +31,7 @@ namespace ZVision {
 
 ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {
 	Common::File zfsFile;
+	memset(&_header, 0, sizeof(_header));
 
 	if (!zfsFile.open(_fileName)) {
 		warning("ZFSArchive::ZFSArchive(): Could not find the archive file");
-- 
cgit v1.2.3


From 5a087927805529293fb340b0b7c0d2e789278ae9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:39:51 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1125218)

---
 engines/zvision/scripting/sidefx/timer_node.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/sidefx/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp
index abf2c90b04..170f6e7472 100644
--- a/engines/zvision/scripting/sidefx/timer_node.cpp
+++ b/engines/zvision/scripting/sidefx/timer_node.cpp
@@ -33,6 +33,8 @@ namespace ZVision {
 
 TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
 	: SideFX(engine, key, SIDEFX_TIMER) {
+	_timeLeft = 0;
+
 	if (_engine->getGameId() == GID_NEMESIS)
 		_timeLeft = timeInSeconds * 1000;
 	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
-- 
cgit v1.2.3


From cd2fc20768a8ed8dc34a316ec91e0643b8c2bddf Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:40:45 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257061)

---
 engines/zvision/core/menu.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
index c7898a4fbd..e584e8712f 100644
--- a/engines/zvision/core/menu.cpp
+++ b/engines/zvision/core/menu.cpp
@@ -58,6 +58,8 @@ MenuZGI::MenuZGI(ZVision *engine) :
 	scrollPos[1] = 0.0;
 	scrollPos[2] = 0.0;
 	mouseOnItem = -1;
+	redraw = false;
+	clean = false;
 
 	char buf[24];
 	for (int i = 1; i < 4; i++) {
-- 
cgit v1.2.3


From deea4ef62c1eda0a3cba45b2f9e23be6338f52ca Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:41:39 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257055)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index d6883ed38f..10122f556d 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -781,6 +781,9 @@ bool ActionRotateTo::execute() {
 
 ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_x = 0;
+	_y = 0;
+
 	char fileName[25];
 	int color;
 
-- 
cgit v1.2.3


From 8c896f5da4eaa4cd95f9ff4c60efa43542cfe557 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:42:19 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257056)

---
 engines/zvision/scripting/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 10122f556d..1d9b4d7be1 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -71,6 +71,8 @@ bool ActionAdd::execute() {
 
 ActionAssign::ActionAssign(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+
 	char buf[64];
 	memset(buf, 0, 64);
 	sscanf(line.c_str(), "%u, %s", &_key, buf);
-- 
cgit v1.2.3


From f9946b726fe7ea5251fe44a77f8dab296052b744 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:43:46 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257057)

---
 engines/zvision/scripting/actions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 1d9b4d7be1..31bd681b3b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -654,11 +654,15 @@ bool ActionQuit::execute() {
 
 ActionRegion::ActionRegion(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_delay = 0;
+	_type = 0;
+	_unk1 = 0;
+	_unk2 = 0;
 
 	char art[64];
 	char custom[64];
 
-	int32 x1, x2, y1, y2;
+	int32 x1 = 0, x2 = 0, y1 = 0, y2 = 0;
 
 	sscanf(line.c_str(), "%s %d %d %d %d %hu %hu %hu %hu %s", art, &x1, &y1, &x2, &y2, &_delay, &_type, &_unk1, &_unk2, custom);
 	_art = Common::String(art);
-- 
cgit v1.2.3


From cd2612a54ed2b5ab9e35140b5f115e39cfe0a1d7 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:44:41 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257058)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 31bd681b3b..62412e68f8 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -240,6 +240,9 @@ bool ActionDisableVenus::execute() {
 
 ActionDisplayMessage::ActionDisplayMessage(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_control = 0;
+	_msgid = 0;
+
 	sscanf(line.c_str(), "%hd %hd", &_control, &_msgid);
 }
 
-- 
cgit v1.2.3


From e28f8a5d8f3de8e6c21be6a494ab91aaf1602216 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:45:54 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257059)

---
 engines/zvision/scripting/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 62412e68f8..2f7103bf18 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -857,6 +857,8 @@ bool ActionSetScreen::execute() {
 
 ActionSetVenus::ActionSetVenus(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+
 	sscanf(line.c_str(), "%d", &_key);
 }
 
-- 
cgit v1.2.3


From fe56e7d02b935e7f7ae3d3f95fcc5bda88a2c50d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 15:47:09 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257060)

---
 engines/zvision/scripting/sidefx/music_node.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index c89345f0d0..b4609583f4 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -115,7 +115,6 @@ public:
 private:
 	int8 _chan;
 	int8 _noteNumber;
-	int8 _velocity;
 	int8 _pan;
 	int8 _volume;
 	int8 _prog;
-- 
cgit v1.2.3


From 56f7be8ab62315a3439d3f4aad9b85a294eac2c9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:01:30 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257054)

---
 engines/zvision/core/menu.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
index e584e8712f..31e0d71370 100644
--- a/engines/zvision/core/menu.cpp
+++ b/engines/zvision/core/menu.cpp
@@ -559,6 +559,8 @@ MenuNemesis::MenuNemesis(ZVision *engine) :
 	scrolled = false;
 	scrollPos = 0.0;
 	mouseOnItem = -1;
+	redraw = false;
+	delay = 0;
 
 	char buf[24];
 	for (int i = 0; i < 4; i++)
-- 
cgit v1.2.3


From f8c1b1eb28e3976fda19547230c7a8b70f31244d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:22:57 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257062)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 2f7103bf18..a9b19eaf2b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -95,6 +95,9 @@ bool ActionAssign::execute() {
 
 ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+	_attenuation = 0;
+
 	sscanf(line.c_str(), "%u, %d", &_key, &_attenuation);
 }
 
-- 
cgit v1.2.3


From 36af1ff5b1a813f773952fabf1906fe1fb07b846 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:27:27 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257063)

---
 engines/zvision/scripting/actions.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index f9e4ee8167..ef82ef0c88 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -454,7 +454,6 @@ public:
 	~ActionTimer();
 	bool execute();
 private:
-	uint32 _key;
 	ValueSlot *_time;
 };
 
-- 
cgit v1.2.3


From 044f2521542617d55c9cd1802f2cab7f9bccb618 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:29:51 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257064)

---
 engines/zvision/scripting/actions.cpp | 6 ++++--
 engines/zvision/scripting/actions.h   | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a9b19eaf2b..8ae1cd733b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -431,10 +431,12 @@ bool ActionMenuBarEnable::execute() {
 ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &line, bool global) :
 	ResultAction(engine, slotkey),
 	_volume(255),
+	_note(0),
+	_prog(0),
 	_universe(global) {
-	uint type;
+	uint type = 0;
 	char fileNameBuffer[25];
-	uint loop;
+	uint loop = 0;
 	uint volume = 255;
 
 	sscanf(line.c_str(), "%u %25s %u %u", &type, fileNameBuffer, &loop, &volume);
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index ef82ef0c88..d859b1d7f1 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -239,7 +239,6 @@ public:
 	bool execute();
 
 private:
-	uint32 _key;
 	Common::String _fileName;
 	bool _loop;
 	byte _volume;
-- 
cgit v1.2.3


From efb93552233f13128a43854a9d2ed97653a04075 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:31:33 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257065)

---
 engines/zvision/scripting/actions.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 8ae1cd733b..f2cfbc0684 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -132,6 +132,14 @@ bool ActionChangeLocation::execute() {
 
 ActionCrossfade::ActionCrossfade(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_keyOne = 0;
+	_keyTwo = 0;
+	_oneStartVolume = 0;
+	_twoStartVolume = 0;
+	_oneEndVolume = 0;
+	_twoEndVolume = 0;
+	_timeInMillis = 0;
+
 	sscanf(line.c_str(),
 	       "%u %u %d %d %d %d %d",
 	       &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
-- 
cgit v1.2.3


From b96c58188110d7f45e4733a0a010c82f6ec62a25 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:32:27 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257066)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index f2cfbc0684..5b27f52aa5 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -57,6 +57,9 @@ namespace ZVision {
 
 ActionAdd::ActionAdd(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+	_value = 0;
+
 	sscanf(line.c_str(), "%u,%d", &_key, &_value);
 }
 
-- 
cgit v1.2.3


From 3b83e82e6f755dd45da8f063f3af831872d6ffdc Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:33:26 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257067)

---
 engines/zvision/scripting/actions.cpp | 10 ++++++++++
 engines/zvision/scripting/actions.h   |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 5b27f52aa5..a030f6ce07 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -602,6 +602,16 @@ bool ActionUnloadAnimation::execute() {
 
 ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_x = 0;
+	_y = 0;
+	_x2 = 0;
+	_y2 = 0;
+	_start = 0;
+	_end = 0;
+	_loopCount = 0;
+	_mask = 0;
+	_framerate = 0;
+
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index d859b1d7f1..ee761c4b30 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -266,7 +266,6 @@ public:
 	bool execute();
 
 private:
-	uint32 _key;
 	Common::String _fileName;
 	uint32 _x;
 	uint32 _y;
-- 
cgit v1.2.3


From dae76a76c788950a05b827cb58cf3bd3f4bb8c32 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:34:11 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257068)

---
 engines/zvision/scripting/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a030f6ce07..31ba2cc5c1 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -239,6 +239,8 @@ bool ActionDisableControl::execute() {
 
 ActionDisableVenus::ActionDisableVenus(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+
 	sscanf(line.c_str(), "%d", &_key);
 }
 
-- 
cgit v1.2.3


From 9c2782a6800ada4330d2ae4f4087c7b13fbf851b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:35:15 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257069)

---
 engines/zvision/scripting/actions.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 31ba2cc5c1..5689f3e2aa 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -119,6 +119,12 @@ bool ActionAttenuate::execute() {
 
 ActionChangeLocation::ActionChangeLocation(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_world = 'g';
+	_room = 'a';
+	_node = 'r';
+	_view = 'y';
+	_offset = 0;
+
 	sscanf(line.c_str(), "%c, %c, %c%c, %u", &_world, &_room, &_node, &_view, &_offset);
 }
 
-- 
cgit v1.2.3


From ea2ad625ff780750213821d25aedfe4e46027755 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:36:54 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257070)

---
 engines/zvision/scripting/actions.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 5689f3e2aa..b569b1315a 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -973,8 +973,10 @@ bool ActionStreamVideo::execute() {
 
 ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_syncto = 0;
+
 	char fileName[25];
-	int notUsed;
+	int notUsed = 0;
 
 	sscanf(line.c_str(), "%d %d %25s", &_syncto, &notUsed, fileName);
 
-- 
cgit v1.2.3


From 8278ed6022f4b172c6173866224071f381a12bd5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:38:34 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257071)

---
 engines/zvision/scripting/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index b569b1315a..a14fa37e4b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -319,6 +319,8 @@ bool ActionDistort::execute() {
 
 ActionEnableControl::ActionEnableControl(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+
 	sscanf(line.c_str(), "%u", &_key);
 }
 
-- 
cgit v1.2.3


From 704a4b3400e07ce5d86e7db7e63c3cc89da383e9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:39:21 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257072)

---
 engines/zvision/scripting/actions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a14fa37e4b..a5cc37a2f7 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -217,6 +217,7 @@ bool ActionCursor::execute() {
 
 ActionDelayRender::ActionDelayRender(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_framesToDelay = 0;
 	sscanf(line.c_str(), "%u", &_framesToDelay);
 }
 
-- 
cgit v1.2.3


From edf35284977d0b666eb796d028ea54278c9736c9 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:41:00 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257073)

---
 engines/zvision/graphics/cursors/cursor_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index a20deb26b5..ae13c9f4fc 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -50,7 +50,8 @@ CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixel
 	  _pixelFormat(pixelFormat),
 	  _cursorIsPushed(false),
 	  _item(0),
-	  _lastitem(0) {
+	  _lastitem(0),
+	  _currentCursor(CursorIndex_Idle) {
 	for (int i = 0; i < NUM_CURSORS; i++) {
 		if (_engine->getGameId() == GID_NEMESIS) {
 			Common::String name;
-- 
cgit v1.2.3


From 897ecc190fc7233fa45082e24b97ff37bab1bc0c Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:41:51 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257074)

---
 engines/zvision/scripting/actions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a5cc37a2f7..7e3a0667aa 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -594,6 +594,7 @@ bool ActionPreloadAnimation::execute() {
 
 ActionUnloadAnimation::ActionUnloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
 
 	sscanf(line.c_str(), "%u", &_key);
 }
-- 
cgit v1.2.3


From 7055ee77552f9126be095aac83ecfcef425f4dd3 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:44:18 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257075)

---
 engines/zvision/scripting/actions.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 7e3a0667aa..68e9b04dd5 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -298,6 +298,13 @@ bool ActionDissolve::execute() {
 
 ActionDistort::ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_distSlot = 0;
+	_speed = 0;
+	_startAngle = 60.0;
+	_endAngle = 60.0;
+	_startLineScale = 1.0;
+	_endLineScale = 1.0;
+
 	sscanf(line.c_str(), "%hd %hd %f %f %f %f", &_distSlot, &_speed, &_startAngle, &_endAngle, &_startLineScale, &_endLineScale);
 }
 
-- 
cgit v1.2.3


From fb0872e40be6cc9c04efdb61dea91e914b02b529 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:48:36 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257076)

---
 engines/zvision/scripting/controls/slot_control.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 292a2b4bc9..5228ba517b 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -34,7 +34,9 @@
 namespace ZVision {
 
 SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key, CONTROL_SLOT) {
+	: Control(engine, key, CONTROL_SLOT),
+	  _cursor(CursorIndex_Active),
+	  _distanceId('0') {
 
 	_renderedItem = 0;
 	_bkg = NULL;
-- 
cgit v1.2.3


From ea3ddd148f88d3aca21a0626ba4700873324897d Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:49:36 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257077)

---
 engines/zvision/scripting/sidefx/music_node.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index b4609583f4..c8077c7a6a 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -77,7 +77,6 @@ public:
 	void setFade(int32 time, uint8 target);
 
 private:
-	int32 _timeLeft;
 	bool _pantrack;
 	int32 _pantrackPosition;
 	int32 _attenuate;
-- 
cgit v1.2.3


From 1078d0c19311b82db00d4524f5f29e7f2ca52795 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:51:01 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257079)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 engines/zvision/scripting/actions.h   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 68e9b04dd5..6e6674d755 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -565,6 +565,9 @@ bool ActionPreferences::execute() {
 
 ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_mask = 0;
+	_framerate = 0;
+
 	char fileName[25];
 
 	// The two %*u are always 0 and dont seem to have a use
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index ee761c4b30..18757e0dea 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -302,7 +302,6 @@ public:
 	bool execute();
 
 private:
-	uint32 _key;
 	Common::String _fileName;
 	int32 _mask;
 	int32 _framerate;
-- 
cgit v1.2.3


From abf37ebbf3e678181731a8eb77d69bdf6c51685a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:51:43 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257080)

---
 engines/zvision/scripting/controls/push_toggle_control.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 3811498cd5..f51a28d644 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -35,6 +35,7 @@ namespace ZVision {
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
 	: Control(engine, key, CONTROL_PUSHTGL),
 	  _countTo(2),
+	  _cursor(CursorIndex_Active),
 	  _event(Common::EVENT_LBUTTONUP) {
 
 	_hotspots.clear();
-- 
cgit v1.2.3


From ed66fbefdf0bb6428ea82c64e9dece0559132f4a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 16:52:26 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257081)

---
 engines/zvision/scripting/actions.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 18757e0dea..523890e9ac 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -354,7 +354,6 @@ public:
 	bool execute();
 
 private:
-	uint32 _key;
 	ValueSlot *_max;
 };
 
-- 
cgit v1.2.3


From 5db4e02f9a5bc756807102e76374c493b80cc028 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:02:22 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257082)

---
 engines/zvision/scripting/actions.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 6e6674d755..b08a7f3c85 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -938,8 +938,14 @@ bool ActionStop::execute() {
 
 ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_x1 = 0;
+	_x2 = 0;
+	_y1 = 0;
+	_y2 = 0;
+	_flags = 0;
+
 	char fileName[25];
-	uint skipline;    //skipline - render video with skip every second line, not skippable.
+	uint skipline = 0;    //skipline - render video with skip every second line, not skippable.
 
 	sscanf(line.c_str(), "%25s %u %u %u %u %u %u", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline);
 
-- 
cgit v1.2.3


From d6e3cea087bd10619f9bad305a03f1517d714687 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:03:07 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257083)

---
 engines/zvision/scripting/actions.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index b08a7f3c85..dbbb605e43 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -1050,9 +1050,11 @@ bool ActionTimer::execute() {
 
 ActionTtyText::ActionTtyText(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_delay = 0;
+
 	char filename[64];
-	int32 x1, y1, x2, y2;
-	sscanf(line.c_str(), "%d %d %d %d %s %u", &x1, &y1, &x2, &y2, filename, &_delay);
+	int32 x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+	sscanf(line.c_str(), "%d %d %d %d %64s %u", &x1, &y1, &x2, &y2, filename, &_delay);
 	_r = Common::Rect(x1, y1, x2, y2);
 	_filename = Common::String(filename);
 }
-- 
cgit v1.2.3


From 7e3c270e49c36cb7290955ded4dc4588f763797a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:03:39 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257084)

---
 engines/zvision/scripting/actions.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index dbbb605e43..63033886c6 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -675,6 +675,15 @@ bool ActionPlayAnimation::execute() {
 
 ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_controlKey = 0;
+	_x1 = 0;
+	_y1 = 0;
+	_x2 = 0;
+	_y2 = 0;
+	_startFrame = 0;
+	_endFrame = 0;
+	_loopCount = 0;
+
 	sscanf(line.c_str(),
 	       "%u %u %u %u %u %u %u %u",
 	       &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount);
-- 
cgit v1.2.3


From 7a0b5982b133c8ef5ed87cd1418ea28cf7da96fb Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:04:04 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257085)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 63033886c6..60d05fb063 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -832,6 +832,9 @@ bool ActionRestoreGame::execute() {
 
 ActionRotateTo::ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_time = 0;
+	_toPos = 0;
+
 	sscanf(line.c_str(), "%d, %d", &_toPos, &_time);
 }
 
-- 
cgit v1.2.3


From 7609b6d866576de9a70aadfb17895cfd30393eb8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:04:26 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257086)

---
 engines/zvision/scripting/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 60d05fb063..5274637ca0 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -232,6 +232,8 @@ bool ActionDelayRender::execute() {
 
 ActionDisableControl::ActionDisableControl(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_key = 0;
+
 	sscanf(line.c_str(), "%u", &_key);
 }
 
-- 
cgit v1.2.3


From 2cb541c6511d39e7814f38c1b6e1cc64b7589671 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:05:03 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257087)

---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 5274637ca0..fd843276c0 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -359,6 +359,9 @@ bool ActionFlushMouseEvents::execute() {
 
 ActionInventory::ActionInventory(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_type = -1;
+	_key = 0;
+
 	char buf[25];
 	sscanf(line.c_str(), "%25s %d", buf, &_key);
 
-- 
cgit v1.2.3


From c8f8da030845c01453652364a48ae0449d62b890 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:05:31 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257088)

---
 engines/zvision/scripting/actions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index fd843276c0..0422a2c028 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -450,6 +450,8 @@ bool ActionKill::execute() {
 
 ActionMenuBarEnable::ActionMenuBarEnable(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
+	_menus = 0xFFFF;
+
 	sscanf(line.c_str(), "%hu", &_menus);
 }
 
-- 
cgit v1.2.3


From e934ffdd5e7719f80703d6874bbdb8618f1606ea Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:06:47 +0600
Subject: ZVISION: Fix uninitialized scalar field (CID 1257089)

---
 engines/zvision/scripting/puzzle.h              | 2 +-
 engines/zvision/scripting/scr_file_handling.cpp | 2 +-
 engines/zvision/scripting/script_manager.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h
index 4123880835..7d64357b0a 100644
--- a/engines/zvision/scripting/puzzle.h
+++ b/engines/zvision/scripting/puzzle.h
@@ -31,7 +31,7 @@
 namespace ZVision {
 
 struct Puzzle {
-	Puzzle() : key(0) {}
+	Puzzle() : key(0), addedBySetState(false) {}
 
 	~Puzzle() {
 		for (Common::List<ResultAction *>::iterator iter = resultActions.begin(); iter != resultActions.end(); ++iter) {
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 56d0c3bd7f..c117da5ec2 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -96,7 +96,7 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
 		trimCommentsAndWhiteSpace(&line);
 	}
 
-	puzzle->addedBySetState = 0;
+	puzzle->addedBySetState = false;
 }
 
 bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList) const {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 65077dfd12..4c1e69072d 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -97,7 +97,7 @@ bool ScriptManager::execScope(ScriptScope &scope) {
 	scope.scopeQueue->clear();
 
 	for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter)
-		(*PuzzleIter)->addedBySetState = 0;
+		(*PuzzleIter)->addedBySetState = false;
 
 	if (scope.procCount < 2 || getStateValue(StateKey_ExecScopeStyle)) {
 		for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter)
-- 
cgit v1.2.3


From 617623e9bff85f2fc0dd75509dfb93e95e366c8e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:07:28 +0600
Subject: ZVISION: Fix unchecked return value (CID 1257090)

---
 engines/zvision/sound/midi.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/sound/midi.cpp b/engines/zvision/sound/midi.cpp
index 920002c7c3..3dd66ff2d4 100644
--- a/engines/zvision/sound/midi.cpp
+++ b/engines/zvision/sound/midi.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/scummsys.h"
+#include "common/textconsole.h"
 
 #include "zvision/sound/midi.h"
 
@@ -29,7 +30,8 @@ namespace ZVision {
 MidiManager::MidiManager() {
 	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB);
 	_driver = MidiDriver::createMidi(dev);
-	_driver->open();
+	if (_driver->open())
+		warning("Can't open MIDI, no MIDI output!");
 }
 
 MidiManager::~MidiManager() {
-- 
cgit v1.2.3


From 169bed1e5e8364875f68a66e7576c6947a11903b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:11:26 +0600
Subject: ZVISION: Fix dereference after null check (CID 1257091)

---
 engines/zvision/sound/zork_raw.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 78c851e132..393f2eb6a9 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -73,6 +73,9 @@ RawChunkStream::RawChunk RawChunkStream::readNextChunk(Common::SeekableReadStrea
 	tmp.size = 0;
 	tmp.data = NULL;
 
+	if (!stream)
+		return tmp;
+
 	if (stream && (stream->size() == 0 || stream->eos()))
 		return tmp;
 
-- 
cgit v1.2.3


From ee7ba1bbaf4a17104f8a61be0218f9793b0b9cf6 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:14:13 +0600
Subject: ZVISION: Fix zork raw soundParams handling

---
 engines/zvision/sound/zork_raw.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 393f2eb6a9..8688039325 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -264,30 +264,33 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 
 	fileName.toLowercase();
 
-	SoundParams soundParams = {};
+	const SoundParams *soundParams = NULL;
 
 	if (engine->getGameId() == GID_NEMESIS) {
 		for (int i = 0; i < 32; ++i) {
 			if (RawZorkStream::_zNemSoundParamLookupTable[i].identifier == (fileName[6]))
-				soundParams = RawZorkStream::_zNemSoundParamLookupTable[i];
+				soundParams = &RawZorkStream::_zNemSoundParamLookupTable[i];
 		}
 	} else if (engine->getGameId() == GID_GRANDINQUISITOR) {
 		for (int i = 0; i < 24; ++i) {
 			if (RawZorkStream::_zgiSoundParamLookupTable[i].identifier == (fileName[7]))
-				soundParams = RawZorkStream::_zgiSoundParamLookupTable[i];
+				soundParams = &RawZorkStream::_zgiSoundParamLookupTable[i];
 		}
 	}
 
-	if (soundParams.packed) {
-		return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams.rate, soundParams.stereo, DisposeAfterUse::YES);
+	if (soundParams == NULL)
+		return NULL;
+
+	if (soundParams->packed) {
+		return makeRawZorkStream(wrapBufferedSeekableReadStream(file, 2048, DisposeAfterUse::YES), soundParams->rate, soundParams->stereo, DisposeAfterUse::YES);
 	} else {
 		byte flags = 0;
-		if (soundParams.bits16)
+		if (soundParams->bits16)
 			flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
-		if (soundParams.stereo)
+		if (soundParams->stereo)
 			flags |= Audio::FLAG_STEREO;
 
-		return Audio::makeRawStream(file, soundParams.rate, flags, DisposeAfterUse::YES);
+		return Audio::makeRawStream(file, soundParams->rate, flags, DisposeAfterUse::YES);
 	}
 }
 
-- 
cgit v1.2.3


From 6c5c1828e1e7ed28865093de12156f6b99fdd40f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:15:21 +0600
Subject: ZVISION: Fix unchecked return value (CID 1257092)

---
 engines/zvision/file/search_manager.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 1a6a96ec6d..30c269c290 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -265,13 +265,14 @@ void SearchManager::addDir(const Common::String &name) {
 
 void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const Common::FSNode &fsNode, int depth) {
 	Common::FSList fsList;
-	fsNode.getChildren(fsList);
+	if ( fsNode.getChildren(fsList) ) {
 
-	_list.push_back(fsNode.getPath());
+		_list.push_back(fsNode.getPath());
 
-	if (depth > 1)
-		for (Common::FSList::const_iterator it = fsList.begin(); it != fsList.end(); ++it)
-			listDirRecursive(_list, *it, depth - 1);
+		if (depth > 1)
+			for (Common::FSList::const_iterator it = fsList.begin(); it != fsList.end(); ++it)
+				listDirRecursive(_list, *it, depth - 1);
+	}
 }
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 6d1fcdbdbdf72d69eda6f458ff859bed7257410b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:15:48 +0600
Subject: ZVISION: Fix copy into fixed size buffer (CID 1257093)

---
 engines/zvision/graphics/cursors/cursor_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index ae13c9f4fc..92fd461c72 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -62,7 +62,8 @@ CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixel
 		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
 			_cursors[i][0] = ZorkCursor(_engine, _zgiCursorFileNames[i]); // Up cursor
 			char buffer[25];
-			strcpy(buffer, _zgiCursorFileNames[i]);
+			memset(buffer, 0, 25);
+			strncpy(buffer, _zgiCursorFileNames[i], 24);
 			buffer[3] += 2;
 			_cursors[i][1] = ZorkCursor(_engine, buffer); // Down cursor
 		}
-- 
cgit v1.2.3


From 3806aa44186e4ce383697f6cb2fed8a23042020b Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:17:33 +0600
Subject: ZVISION: Fix explicit null dereferenced (CID 1257094)

---
 engines/zvision/scripting/sidefx/music_node.cpp | 45 +++++++++++++++----------
 engines/zvision/scripting/sidefx/music_node.h   |  1 +
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index c79dd0296d..56598189f6 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -47,6 +47,8 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	_pantrack = false;
 	_pantrackPosition = 0;
 	_sub = NULL;
+	_stereo = false;
+	_loaded = false;
 
 	Audio::RewindableAudioStream *audioStream = NULL;
 
@@ -59,30 +61,35 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 		audioStream = makeRawZorkStream(filename, _engine);
 	}
 
-	_stereo = audioStream->isStereo();
+	if (audioStream) {
+		_stereo = audioStream->isStereo();
 
-	if (_loop) {
-		Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
-	} else {
-		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
-	}
+		if (_loop) {
+			Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
+			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
+		} else {
+			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
+		}
 
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 1);
+		if (_key != StateKey_NotSet)
+			_engine->getScriptManager()->setStateValue(_key, 1);
+
+		// Change filename.raw into filename.sub
+		Common::String subname = filename;
+		subname.setChar('s', subname.size() - 3);
+		subname.setChar('u', subname.size() - 2);
+		subname.setChar('b', subname.size() - 1);
 
-	// Change filename.raw into filename.sub
-	Common::String subname = filename;
-	subname.setChar('s', subname.size() - 3);
-	subname.setChar('u', subname.size() - 2);
-	subname.setChar('b', subname.size() - 1);
+		if (_engine->getSearchManager()->hasFile(subname))
+			_sub = new Subtitle(_engine, subname);
 
-	if (_engine->getSearchManager()->hasFile(subname))
-		_sub = new Subtitle(_engine, subname);
+		_loaded = true;
+	}
 }
 
 MusicNode::~MusicNode() {
-	_engine->_mixer->stopHandle(_handle);
+	if (!_loaded)
+		_engine->_mixer->stopHandle(_handle);
 	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 2);
 	if (_sub)
@@ -110,7 +117,7 @@ void MusicNode::setFade(int32 time, uint8 target) {
 }
 
 bool MusicNode::process(uint32 deltaTimeInMillis) {
-	if (! _engine->_mixer->isSoundHandleActive(_handle))
+	if (!_loaded || ! _engine->_mixer->isSoundHandleActive(_handle))
 		return stop();
 	else {
 		uint8 _newvol = _volume;
@@ -137,6 +144,8 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 }
 
 void MusicNode::setVolume(uint8 newVolume) {
+	if (!_loaded)
+		return;
 	if (_pantrack) {
 		int curX = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
 		curX -= _pantrackPosition;
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index c8077c7a6a..09bdc3707e 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -88,6 +88,7 @@ private:
 	bool _stereo;
 	Audio::SoundHandle _handle;
 	Subtitle *_sub;
+	bool _loaded;
 };
 
 class MusicMidiNode : public MusicNodeBASE {
-- 
cgit v1.2.3


From fafbd425dc9f85e524a8222facdb0067632add84 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:18:11 +0600
Subject: ZVISION: Fix copy into fixed size buffer (CID 1257095)

---
 engines/zvision/scripting/controls/slot_control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 5228ba517b..42b54a9ab5 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -76,7 +76,7 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		} else if (param.matchString("eligible_objects", true)) {
 			char buf[256];
 			memset(buf, 0, 256);
-			strcpy(buf, values.c_str());
+			strncpy(buf, values.c_str(), 255);
 
 			char *curpos = buf;
 			char *strend = buf + strlen(buf);
-- 
cgit v1.2.3


From 79f75059de9ef2530f8d1c043d97dafe8b8ffec8 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:18:46 +0600
Subject: ZVISION: Fix copy into fixed size buffer (CID 1257096)

---
 engines/zvision/scripting/controls/paint_control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index f06dee25ad..df06bb814e 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -69,7 +69,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		} else if (param.matchString("eligible_objects", true)) {
 			char buf[256];
 			memset(buf, 0, 256);
-			strcpy(buf, values.c_str());
+			strncpy(buf, values.c_str(), 255);
 
 			char *curpos = buf;
 			char *strend = buf + strlen(buf);
-- 
cgit v1.2.3


From 5fb33ee5e7c99f76ba9560b56177041d19fb602e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 19 Dec 2014 17:19:12 +0600
Subject: ZVISION: Fix unchecked return value (CID 1257098)

---
 engines/zvision/scripting/controls/save_control.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index e27faa50b6..b35611feca 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -77,10 +77,11 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 			Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->saveId);
 			if (save) {
 				SaveGameHeader header;
-				_engine->getSaveManager()->readSaveGameHeader(save, header);
+				if (_engine->getSaveManager()->readSaveGameHeader(save, header)) {
+					inp->setText(header.saveName);
+					iter->exist = true;
+				}
 				delete save;
-				inp->setText(header.saveName);
-				iter->exist = true;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 2170c9bc39fa0b0e9598515211bcef602ddaca48 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 19 Dec 2014 13:38:22 +0200
Subject: ZVISION: the type in ActionInventory is used as a signed byte now

---
 engines/zvision/scripting/actions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 523890e9ac..292e25e19c 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -210,7 +210,7 @@ public:
 	ActionInventory(ZVision *engine, int32 slotkey, const Common::String &line);
 	bool execute();
 private:
-	uint8 _type;
+	int8 _type;
 	int32 _key;
 };
 
-- 
cgit v1.2.3


From acb172251aa7401f43308ebcac9f30bef3aa40f5 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Fri, 19 Dec 2014 11:14:10 -0600
Subject: ZVISION: Large scale variable, function, and class renaming to
 improve code clarity

---
 engines/zvision/core/events.cpp             |   8 +-
 engines/zvision/graphics/render_manager.cpp | 348 +++++++++++++++-------------
 engines/zvision/graphics/render_manager.h   | 102 ++++----
 engines/zvision/zvision.cpp                 |  48 ++--
 engines/zvision/zvision.h                   |   6 +-
 5 files changed, 266 insertions(+), 246 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index c66e61a61a..fe357c263b 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -194,7 +194,7 @@ void ZVision::processEvents() {
 			case Common::KEYCODE_LEFT:
 			case Common::KEYCODE_RIGHT:
 				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::PANORAMA)
-					_kbdVelocity = (_event.kbd.keycode == Common::KEYCODE_LEFT ?
+					_keyboardVelocity = (_event.kbd.keycode == Common::KEYCODE_LEFT ?
 					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
 					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
 				break;
@@ -202,7 +202,7 @@ void ZVision::processEvents() {
 			case Common::KEYCODE_UP:
 			case Common::KEYCODE_DOWN:
 				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::TILT)
-					_kbdVelocity = (_event.kbd.keycode == Common::KEYCODE_UP ?
+					_keyboardVelocity = (_event.kbd.keycode == Common::KEYCODE_UP ?
 					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
 					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
 				break;
@@ -226,12 +226,12 @@ void ZVision::processEvents() {
 			case Common::KEYCODE_LEFT:
 			case Common::KEYCODE_RIGHT:
 				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::PANORAMA)
-					_kbdVelocity = 0;
+					_keyboardVelocity = 0;
 				break;
 			case Common::KEYCODE_UP:
 			case Common::KEYCODE_DOWN:
 				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::TILT)
-					_kbdVelocity = 0;
+					_keyboardVelocity = 0;
 				break;
 			default:
 				break;
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index e2ad13a330..b9305f5dcc 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -42,68 +42,73 @@ namespace ZVision {
 RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
 	: _engine(engine),
 	  _system(engine->_system),
-	  _wrkWidth(workingWindow.width()),
-	  _wrkHeight(workingWindow.height()),
-	  _screenCenterX(_wrkWidth / 2),
-	  _screenCenterY(_wrkHeight / 2),
+	  _workingWidth(workingWindow.width()),
+	  _workingHeight(workingWindow.height()),
+	  _screenCenterX(_workingWidth / 2),
+	  _screenCenterY(_workingHeight / 2),
 	  _workingWindow(workingWindow),
 	  _pixelFormat(pixelFormat),
-	  _bkgWidth(0),
-	  _bkgHeight(0),
-	  _bkgOff(0),
-	  _renderTable(_wrkWidth, _wrkHeight) {
+	  _backgroundWidth(0),
+	  _backgroundHeight(0),
+	  _backgroundOffset(0),
+	  _renderTable(_workingWidth, _workingHeight) {
 
-	_wrkWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
-	_effectWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
-	_outWnd.create(_wrkWidth, _wrkHeight, _pixelFormat);
-	_menuWnd.create(windowWidth, workingWindow.top, _pixelFormat);
-	_subWnd.create(windowWidth, windowHeight - workingWindow.bottom, _pixelFormat);
+	_backgroundSurface.create(_workingWidth, _workingHeight, _pixelFormat);
+	_effectSurface.create(_workingWidth, _workingHeight, _pixelFormat);
+	_warpedSceneSurface.create(_workingWidth, _workingHeight, _pixelFormat);
+	_menuSurface.create(windowWidth, workingWindow.top, _pixelFormat);
+	_subtitleSurface.create(windowWidth, windowHeight - workingWindow.bottom, _pixelFormat);
 
-	_menuWndRect = Common::Rect(0, 0, windowWidth, workingWindow.top);
-	_subWndRect = Common::Rect(0, workingWindow.bottom, windowWidth, windowHeight);
+	_menuArea = Common::Rect(0, 0, windowWidth, workingWindow.top);
+	_subtitleArea = Common::Rect(0, workingWindow.bottom, windowWidth, windowHeight);
 
 	_subid = 0;
 }
 
 RenderManager::~RenderManager() {
-	_curBkg.free();
-	_wrkWnd.free();
-	_effectWnd.free();
-	_outWnd.free();
-	_menuWnd.free();
-	_subWnd.free();
+	_currentBackgroundImage.free();
+	_backgroundSurface.free();
+	_effectSurface.free();
+	_warpedSceneSurface.free();
+	_menuSurface.free();
+	_subtitleSurface.free();
 }
 
-void RenderManager::renderBackbufferToScreen() {
-	Graphics::Surface *out = &_outWnd;
-	Graphics::Surface *in = &_wrkWnd;
+void RenderManager::renderSceneToScreen() {
+	Graphics::Surface *out = &_warpedSceneSurface;
+	Graphics::Surface *in = &_backgroundSurface;
 	Common::Rect outWndDirtyRect;
 
+	// If we have graphical effects, we apply them using a temporary buffer
 	if (!_effects.empty()) {
 		bool copied = false;
-		Common::Rect windRect(_wrkWidth, _wrkHeight);
-		for (effectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
+		Common::Rect windowRect(_workingWidth, _workingHeight);
+
+		for (EffectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
 			Common::Rect rect = (*it)->getRegion();
-			Common::Rect scrPlace = rect;
-			if ((*it)->isPort())
-				scrPlace = bkgRectToScreen(scrPlace);
-			if (windRect.intersects(scrPlace)) {
+			Common::Rect screenSpaceLocation = rect;
+
+			if ((*it)->isPort()) {
+				screenSpaceLocation = transformBackgroundSpaceRectToScreenSpace(screenSpaceLocation);
+			}
+
+			if (windowRect.intersects(screenSpaceLocation)) {
 				if (!copied) {
 					copied = true;
-					_effectWnd.copyFrom(_wrkWnd);
-					in = &_effectWnd;
+					_effectSurface.copyFrom(_backgroundSurface);
+					in = &_effectSurface;
 				}
 				const Graphics::Surface *post;
 				if ((*it)->isPort())
-					post = (*it)->draw(_curBkg.getSubArea(rect));
+					post = (*it)->draw(_currentBackgroundImage.getSubArea(rect));
 				else
-					post = (*it)->draw(_effectWnd.getSubArea(rect));
-				blitSurfaceToSurface(*post, _effectWnd, scrPlace.left, scrPlace.top);
-				scrPlace.clip(windRect);
-				if (_wrkWndDirtyRect .isEmpty()) {
-					_wrkWndDirtyRect = scrPlace;
+					post = (*it)->draw(_effectSurface.getSubArea(rect));
+				blitSurfaceToSurface(*post, _effectSurface, screenSpaceLocation.left, screenSpaceLocation.top);
+				screenSpaceLocation.clip(windowRect);
+				if (_backgroundSurfaceDirtyRect .isEmpty()) {
+					_backgroundSurfaceDirtyRect = screenSpaceLocation;
 				} else {
-					_wrkWndDirtyRect.extend(scrPlace);
+					_backgroundSurfaceDirtyRect.extend(screenSpaceLocation);
 				}
 			}
 		}
@@ -111,14 +116,14 @@ void RenderManager::renderBackbufferToScreen() {
 
 	RenderTable::RenderState state = _renderTable.getRenderState();
 	if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
-		if (!_wrkWndDirtyRect.isEmpty()) {
-			_renderTable.mutateImage(&_outWnd, in);
-			out = &_outWnd;
-			outWndDirtyRect = Common::Rect(_wrkWidth, _wrkHeight);
+		if (!_backgroundSurfaceDirtyRect.isEmpty()) {
+			_renderTable.mutateImage(&_warpedSceneSurface, in);
+			out = &_warpedSceneSurface;
+			outWndDirtyRect = Common::Rect(_workingWidth, _workingHeight);
 		}
 	} else {
 		out = in;
-		outWndDirtyRect = _wrkWndDirtyRect;
+		outWndDirtyRect = _backgroundSurfaceDirtyRect;
 	}
 
 	if (!outWndDirtyRect.isEmpty()) {
@@ -354,20 +359,20 @@ const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &
 		}
 
 		if (state == RenderTable::PANORAMA) {
-			newPoint += (Common::Point(_bkgOff - _screenCenterX, 0));
+			newPoint += (Common::Point(_backgroundOffset - _screenCenterX, 0));
 		} else if (state == RenderTable::TILT) {
-			newPoint += (Common::Point(0, _bkgOff - _screenCenterY));
+			newPoint += (Common::Point(0, _backgroundOffset - _screenCenterY));
 		}
 
-		if (_bkgWidth)
-			newPoint.x %= _bkgWidth;
-		if (_bkgHeight)
-			newPoint.y %= _bkgHeight;
+		if (_backgroundWidth)
+			newPoint.x %= _backgroundWidth;
+		if (_backgroundHeight)
+			newPoint.y %= _backgroundHeight;
 
 		if (newPoint.x < 0)
-			newPoint.x += _bkgWidth;
+			newPoint.x += _backgroundWidth;
 		if (newPoint.y < 0)
-			newPoint.y += _bkgHeight;
+			newPoint.y += _backgroundHeight;
 
 		return newPoint;
 	} else {
@@ -380,18 +385,18 @@ RenderTable *RenderManager::getRenderTable() {
 }
 
 void RenderManager::setBackgroundImage(const Common::String &fileName) {
-	readImageToSurface(fileName, _curBkg);
-	_bkgWidth = _curBkg.w;
-	_bkgHeight = _curBkg.h;
-	_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
+	readImageToSurface(fileName, _currentBackgroundImage);
+	_backgroundWidth = _currentBackgroundImage.w;
+	_backgroundHeight = _currentBackgroundImage.h;
+	_backgroundDirtyRect = Common::Rect(_backgroundWidth, _backgroundHeight);
 }
 
 void RenderManager::setBackgroundPosition(int offset) {
 	RenderTable::RenderState state = _renderTable.getRenderState();
 	if (state == RenderTable::TILT || state == RenderTable::PANORAMA)
-		if (_bkgOff != offset)
-			_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
-	_bkgOff = offset;
+		if (_backgroundOffset != offset)
+			_backgroundDirtyRect = Common::Rect(_backgroundWidth, _backgroundHeight);
+	_backgroundOffset = offset;
 
 	_engine->getScriptManager()->setStateValue(StateKey_ViewPos, offset);
 }
@@ -400,9 +405,9 @@ uint32 RenderManager::getCurrentBackgroundOffset() {
 	RenderTable::RenderState state = _renderTable.getRenderState();
 
 	if (state == RenderTable::PANORAMA) {
-		return _bkgOff;
+		return _backgroundOffset;
 	} else if (state == RenderTable::TILT) {
-		return _bkgOff;
+		return _backgroundOffset;
 	} else {
 		return 0;
 	}
@@ -588,24 +593,24 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, Graphics:
 
 void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y) {
 	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _curBkg, x, y);
+	blitSurfaceToSurface(src, empt, _currentBackgroundImage, x, y);
 	Common::Rect dirty(src.w, src.h);
 	dirty.translate(x, y);
-	if (_bkgDirtyRect.isEmpty())
-		_bkgDirtyRect = dirty;
+	if (_backgroundDirtyRect.isEmpty())
+		_backgroundDirtyRect = dirty;
 	else
-		_bkgDirtyRect.extend(dirty);
+		_backgroundDirtyRect.extend(dirty);
 }
 
 void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey) {
 	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _curBkg, x, y, colorkey);
+	blitSurfaceToSurface(src, empt, _currentBackgroundImage, x, y, colorkey);
 	Common::Rect dirty(src.w, src.h);
 	dirty.translate(x, y);
-	if (_bkgDirtyRect.isEmpty())
-		_bkgDirtyRect = dirty;
+	if (_backgroundDirtyRect.isEmpty())
+		_backgroundDirtyRect = dirty;
 	else
-		_bkgDirtyRect.extend(dirty);
+		_backgroundDirtyRect.extend(dirty);
 }
 
 void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect) {
@@ -636,37 +641,37 @@ void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const C
 
 void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y) {
 	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _menuWnd, x, y);
+	blitSurfaceToSurface(src, empt, _menuSurface, x, y);
 	Common::Rect dirty(src.w, src.h);
 	dirty.translate(x, y);
-	if (_menuWndDirtyRect.isEmpty())
-		_menuWndDirtyRect = dirty;
+	if (_menuSurfaceDirtyRect.isEmpty())
+		_menuSurfaceDirtyRect = dirty;
 	else
-		_menuWndDirtyRect.extend(dirty);
+		_menuSurfaceDirtyRect.extend(dirty);
 }
 
 void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey) {
 	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _menuWnd, x, y, colorkey);
+	blitSurfaceToSurface(src, empt, _menuSurface, x, y, colorkey);
 	Common::Rect dirty(src.w, src.h);
 	dirty.translate(x, y);
-	if (_menuWndDirtyRect.isEmpty())
-		_menuWndDirtyRect = dirty;
+	if (_menuSurfaceDirtyRect.isEmpty())
+		_menuSurfaceDirtyRect = dirty;
 	else
-		_menuWndDirtyRect.extend(dirty);
+		_menuSurfaceDirtyRect.extend(dirty);
 }
 
 Graphics::Surface *RenderManager::getBkgRect(Common::Rect &rect) {
 	Common::Rect dst = rect;
-	dst.clip(_bkgWidth, _bkgHeight);
+	dst.clip(_backgroundWidth, _backgroundHeight);
 
 	if (dst.isEmpty() || !dst.isValidRect())
 		return NULL;
 
 	Graphics::Surface *srf = new Graphics::Surface;
-	srf->create(dst.width(), dst.height(), _curBkg.format);
+	srf->create(dst.width(), dst.height(), _currentBackgroundImage.format);
 
-	srf->copyRectToSurface(_curBkg, 0, 0, Common::Rect(dst));
+	srf->copyRectToSurface(_currentBackgroundImage, 0, 0, Common::Rect(dst));
 
 	return srf;
 }
@@ -693,101 +698,110 @@ Graphics::Surface *RenderManager::loadImage(const char *file, bool transposed) {
 	return loadImage(str, transposed);
 }
 
-void RenderManager::prepareBkg() {
-	_bkgDirtyRect.clip(_bkgWidth, _bkgHeight);
+void RenderManager::prepareBackground() {
+	_backgroundDirtyRect.clip(_backgroundWidth, _backgroundHeight);
 	RenderTable::RenderState state = _renderTable.getRenderState();
 
 	if (state == RenderTable::PANORAMA) {
-		Common::Rect viewPort(_wrkWidth, _wrkHeight);
-		viewPort.translate(-(_screenCenterX - _bkgOff), 0);
-		Common::Rect drawRect = _bkgDirtyRect;
+		// Calculate the visible portion of the background
+		Common::Rect viewPort(_workingWidth, _workingHeight);
+		viewPort.translate(-(_screenCenterX - _backgroundOffset), 0);
+		Common::Rect drawRect = _backgroundDirtyRect;
 		drawRect.clip(viewPort);
 
-		if (!drawRect.isEmpty())
-			blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, _screenCenterX - _bkgOff + drawRect.left, drawRect.top);
+		// Render the visible portion
+		if (!drawRect.isEmpty()) {
+			blitSurfaceToSurface(_currentBackgroundImage, drawRect, _backgroundSurface, _screenCenterX - _backgroundOffset + drawRect.left, drawRect.top);
+		}
 
-		_wrkWndDirtyRect = _bkgDirtyRect;
-		_wrkWndDirtyRect.translate(_screenCenterX - _bkgOff, 0);
+		// Mark the dirty portion of the surface
+		_backgroundSurfaceDirtyRect = _backgroundDirtyRect;
+		_backgroundSurfaceDirtyRect.translate(_screenCenterX - _backgroundOffset, 0);
 
-		if (_bkgOff < _screenCenterX) {
-			viewPort.moveTo(-(_screenCenterX - (_bkgOff + _bkgWidth)), 0);
-			drawRect = _bkgDirtyRect;
+		// Panorama mode allows the user to spin in circles. Therefore, we need to render 
+		// the portion of the image that wrapped to the other side of the screen
+		if (_backgroundOffset < _screenCenterX) {
+			viewPort.moveTo(-(_screenCenterX - (_backgroundOffset + _backgroundWidth)), 0);
+			drawRect = _backgroundDirtyRect;
 			drawRect.clip(viewPort);
 
 			if (!drawRect.isEmpty())
-				blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, _screenCenterX - (_bkgOff + _bkgWidth) + drawRect.left, drawRect.top);
+				blitSurfaceToSurface(_currentBackgroundImage, drawRect, _backgroundSurface, _screenCenterX - (_backgroundOffset + _backgroundWidth) + drawRect.left, drawRect.top);
 
-			Common::Rect tmp = _bkgDirtyRect;
-			tmp.translate(_screenCenterX - (_bkgOff + _bkgWidth), 0);
+			Common::Rect tmp = _backgroundDirtyRect;
+			tmp.translate(_screenCenterX - (_backgroundOffset + _backgroundWidth), 0);
 			if (!tmp.isEmpty())
-				_wrkWndDirtyRect.extend(tmp);
+				_backgroundSurfaceDirtyRect.extend(tmp);
 
-		} else if (_bkgWidth - _bkgOff < _screenCenterX) {
-			viewPort.moveTo(-(_screenCenterX + _bkgWidth - _bkgOff), 0);
-			drawRect = _bkgDirtyRect;
+		} else if (_backgroundWidth - _backgroundOffset < _screenCenterX) {
+			viewPort.moveTo(-(_screenCenterX + _backgroundWidth - _backgroundOffset), 0);
+			drawRect = _backgroundDirtyRect;
 			drawRect.clip(viewPort);
 
 			if (!drawRect.isEmpty())
-				blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, _screenCenterX + _bkgWidth - _bkgOff + drawRect.left, drawRect.top);
+				blitSurfaceToSurface(_currentBackgroundImage, drawRect, _backgroundSurface, _screenCenterX + _backgroundWidth - _backgroundOffset + drawRect.left, drawRect.top);
 
-			Common::Rect tmp = _bkgDirtyRect;
-			tmp.translate(_screenCenterX + _bkgWidth - _bkgOff, 0);
+			Common::Rect tmp = _backgroundDirtyRect;
+			tmp.translate(_screenCenterX + _backgroundWidth - _backgroundOffset, 0);
 			if (!tmp.isEmpty())
-				_wrkWndDirtyRect.extend(tmp);
+				_backgroundSurfaceDirtyRect.extend(tmp);
 
 		}
 	} else if (state == RenderTable::TILT) {
-		Common::Rect viewPort(_wrkWidth, _wrkHeight);
-		viewPort.translate(0, -(_screenCenterY - _bkgOff));
-		Common::Rect drawRect = _bkgDirtyRect;
+		// Tilt doesn't allow wrapping, so we just do a simple clip
+		Common::Rect viewPort(_workingWidth, _workingHeight);
+		viewPort.translate(0, -(_screenCenterY - _backgroundOffset));
+		Common::Rect drawRect = _backgroundDirtyRect;
 		drawRect.clip(viewPort);
 		if (!drawRect.isEmpty())
-			blitSurfaceToSurface(_curBkg, drawRect, _wrkWnd, drawRect.left, _screenCenterY - _bkgOff + drawRect.top);
+			blitSurfaceToSurface(_currentBackgroundImage, drawRect, _backgroundSurface, drawRect.left, _screenCenterY - _backgroundOffset + drawRect.top);
 
-		_wrkWndDirtyRect = _bkgDirtyRect;
-		_wrkWndDirtyRect.translate(0, _screenCenterY - _bkgOff);
+		// Mark the dirty portion of the surface
+		_backgroundSurfaceDirtyRect = _backgroundDirtyRect;
+		_backgroundSurfaceDirtyRect.translate(0, _screenCenterY - _backgroundOffset);
 
 	} else {
-		if (!_bkgDirtyRect.isEmpty())
-			blitSurfaceToSurface(_curBkg, _bkgDirtyRect, _wrkWnd, _bkgDirtyRect.left, _bkgDirtyRect.top);
-		_wrkWndDirtyRect = _bkgDirtyRect;
+		if (!_backgroundDirtyRect.isEmpty())
+			blitSurfaceToSurface(_currentBackgroundImage, _backgroundDirtyRect, _backgroundSurface, _backgroundDirtyRect.left, _backgroundDirtyRect.top);
+		_backgroundSurfaceDirtyRect = _backgroundDirtyRect;
 	}
 
-	_bkgDirtyRect = Common::Rect();
+	// Clear the dirty rect since everything is clean now
+	_backgroundDirtyRect = Common::Rect();
 
-	_wrkWndDirtyRect.clip(_wrkWidth, _wrkHeight);
+	_backgroundSurfaceDirtyRect.clip(_workingWidth, _workingHeight);
 }
 
 void RenderManager::clearMenuSurface() {
-	_menuWndDirtyRect = Common::Rect(0, 0, _menuWnd.w, _menuWnd.h);
-	_menuWnd.fillRect(_menuWndDirtyRect, 0);
+	_menuSurfaceDirtyRect = Common::Rect(0, 0, _menuSurface.w, _menuSurface.h);
+	_menuSurface.fillRect(_menuSurfaceDirtyRect, 0);
 }
 
 void RenderManager::clearMenuSurface(const Common::Rect &r) {
-	if (_menuWndDirtyRect.isEmpty())
-		_menuWndDirtyRect = r;
+	if (_menuSurfaceDirtyRect.isEmpty())
+		_menuSurfaceDirtyRect = r;
 	else
-		_menuWndDirtyRect.extend(r);
-	_menuWnd.fillRect(r, 0);
+		_menuSurfaceDirtyRect.extend(r);
+	_menuSurface.fillRect(r, 0);
 }
 
 void RenderManager::renderMenuToScreen() {
-	if (!_menuWndDirtyRect.isEmpty()) {
-		_menuWndDirtyRect.clip(Common::Rect(_menuWnd.w, _menuWnd.h));
-		if (!_menuWndDirtyRect.isEmpty())
-			_system->copyRectToScreen(_menuWnd.getBasePtr(_menuWndDirtyRect.left, _menuWndDirtyRect.top), _menuWnd.pitch,
-			                          _menuWndDirtyRect.left + _menuWndRect.left,
-			                          _menuWndDirtyRect.top + _menuWndRect.top,
-			                          _menuWndDirtyRect.width(),
-			                          _menuWndDirtyRect.height());
-		_menuWndDirtyRect = Common::Rect();
+	if (!_menuSurfaceDirtyRect.isEmpty()) {
+		_menuSurfaceDirtyRect.clip(Common::Rect(_menuSurface.w, _menuSurface.h));
+		if (!_menuSurfaceDirtyRect.isEmpty())
+			_system->copyRectToScreen(_menuSurface.getBasePtr(_menuSurfaceDirtyRect.left, _menuSurfaceDirtyRect.top), _menuSurface.pitch,
+			                          _menuSurfaceDirtyRect.left + _menuArea.left,
+			                          _menuSurfaceDirtyRect.top + _menuArea.top,
+			                          _menuSurfaceDirtyRect.width(),
+			                          _menuSurfaceDirtyRect.height());
+		_menuSurfaceDirtyRect = Common::Rect();
 	}
 }
 
 uint16 RenderManager::createSubArea(const Common::Rect &area) {
 	_subid++;
 
-	oneSub sub;
+	OneSubtitle sub;
 	sub.redraw = false;
 	sub.timer = -1;
 	sub.todelete = false;
@@ -801,11 +815,11 @@ uint16 RenderManager::createSubArea(const Common::Rect &area) {
 uint16 RenderManager::createSubArea() {
 	_subid++;
 
-	oneSub sub;
+	OneSubtitle sub;
 	sub.redraw = false;
 	sub.timer = -1;
 	sub.todelete = false;
-	sub.r = Common::Rect(_subWndRect.left, _subWndRect.top, _subWndRect.right, _subWndRect.bottom);
+	sub.r = Common::Rect(_subtitleArea.left, _subtitleArea.top, _subtitleArea.right, _subtitleArea.bottom);
 	sub.r.translate(-_workingWindow.left, -_workingWindow.top);
 
 	_subsList[_subid] = sub;
@@ -825,7 +839,7 @@ void RenderManager::deleteSubArea(uint16 id, int16 delay) {
 
 void RenderManager::updateSubArea(uint16 id, const Common::String &txt) {
 	if (_subsList.contains(id)) {
-		oneSub *sub = &_subsList[id];
+		OneSubtitle *sub = &_subsList[id];
 		sub->txt = txt;
 		sub->redraw = true;
 	}
@@ -833,7 +847,7 @@ void RenderManager::updateSubArea(uint16 id, const Common::String &txt) {
 
 void RenderManager::processSubs(uint16 deltatime) {
 	bool redraw = false;
-	for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
+	for (SubtitleMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
 		if (it->_value.timer != -1) {
 			it->_value.timer -= deltatime;
 			if (it->_value.timer <= 0)
@@ -848,31 +862,31 @@ void RenderManager::processSubs(uint16 deltatime) {
 	}
 
 	if (redraw) {
-		_subWnd.fillRect(Common::Rect(_subWnd.w, _subWnd.h), 0);
+		_subtitleSurface.fillRect(Common::Rect(_subtitleSurface.w, _subtitleSurface.h), 0);
 
-		for (subMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
-			oneSub *sub = &it->_value;
+		for (SubtitleMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
+			OneSubtitle *sub = &it->_value;
 			if (sub->txt.size()) {
 				Graphics::Surface *rndr = new Graphics::Surface();
 				rndr->create(sub->r.width(), sub->r.height(), _pixelFormat);
 				_engine->getTextRenderer()->drawTxtInOneLine(sub->txt, *rndr);
-				blitSurfaceToSurface(*rndr, _subWnd, sub->r.left - _subWndRect.left + _workingWindow.left, sub->r.top - _subWndRect.top + _workingWindow.top);
+				blitSurfaceToSurface(*rndr, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
 				rndr->free();
 				delete rndr;
 			}
 			sub->redraw = false;
 		}
 
-		_system->copyRectToScreen(_subWnd.getPixels(), _subWnd.pitch,
-		                          _subWndRect.left,
-		                          _subWndRect.top,
-		                          _subWnd.w,
-		                          _subWnd.h);
+		_system->copyRectToScreen(_subtitleSurface.getPixels(), _subtitleSurface.pitch,
+		                          _subtitleArea.left,
+		                          _subtitleArea.top,
+		                          _subtitleSurface.w,
+		                          _subtitleSurface.h);
 	}
 }
 
 Common::Point RenderManager::getBkgSize() {
-	return Common::Point(_bkgWidth, _bkgHeight);
+	return Common::Point(_backgroundWidth, _backgroundHeight);
 }
 
 void RenderManager::addEffect(Effect *_effect) {
@@ -880,7 +894,7 @@ void RenderManager::addEffect(Effect *_effect) {
 }
 
 void RenderManager::deleteEffect(uint32 ID) {
-	for (effectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
+	for (EffectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
 		if ((*it)->getKey() == ID) {
 			delete *it;
 			it = _effects.erase(it);
@@ -888,54 +902,54 @@ void RenderManager::deleteEffect(uint32 ID) {
 	}
 }
 
-Common::Rect RenderManager::bkgRectToScreen(const Common::Rect &src) {
+Common::Rect RenderManager::transformBackgroundSpaceRectToScreenSpace(const Common::Rect &src) {
 	Common::Rect tmp = src;
 	RenderTable::RenderState state = _renderTable.getRenderState();
 
 	if (state == RenderTable::PANORAMA) {
-		if (_bkgOff < _screenCenterX) {
-			Common::Rect rScreen(_screenCenterX + _bkgOff, _wrkHeight);
-			Common::Rect lScreen(_wrkWidth - rScreen.width(), _wrkHeight);
-			lScreen.translate(_bkgWidth - lScreen.width(), 0);
+		if (_backgroundOffset < _screenCenterX) {
+			Common::Rect rScreen(_screenCenterX + _backgroundOffset, _workingHeight);
+			Common::Rect lScreen(_workingWidth - rScreen.width(), _workingHeight);
+			lScreen.translate(_backgroundWidth - lScreen.width(), 0);
 			lScreen.clip(src);
 			rScreen.clip(src);
 			if (rScreen.width() < lScreen.width()) {
-				tmp.translate(_screenCenterX - _bkgOff - _bkgWidth, 0);
+				tmp.translate(_screenCenterX - _backgroundOffset - _backgroundWidth, 0);
 			} else {
-				tmp.translate(_screenCenterX - _bkgOff, 0);
+				tmp.translate(_screenCenterX - _backgroundOffset, 0);
 			}
-		} else if (_bkgWidth - _bkgOff < _screenCenterX) {
-			Common::Rect rScreen(_screenCenterX - (_bkgWidth - _bkgOff), _wrkHeight);
-			Common::Rect lScreen(_wrkWidth - rScreen.width(), _wrkHeight);
-			lScreen.translate(_bkgWidth - lScreen.width(), 0);
+		} else if (_backgroundWidth - _backgroundOffset < _screenCenterX) {
+			Common::Rect rScreen(_screenCenterX - (_backgroundWidth - _backgroundOffset), _workingHeight);
+			Common::Rect lScreen(_workingWidth - rScreen.width(), _workingHeight);
+			lScreen.translate(_backgroundWidth - lScreen.width(), 0);
 			lScreen.clip(src);
 			rScreen.clip(src);
 			if (lScreen.width() < rScreen.width()) {
-				tmp.translate(_screenCenterX + (_bkgWidth - _bkgOff), 0);
+				tmp.translate(_screenCenterX + (_backgroundWidth - _backgroundOffset), 0);
 			} else {
-				tmp.translate(_screenCenterX - _bkgOff, 0);
+				tmp.translate(_screenCenterX - _backgroundOffset, 0);
 			}
 		} else {
-			tmp.translate(_screenCenterX - _bkgOff, 0);
+			tmp.translate(_screenCenterX - _backgroundOffset, 0);
 		}
 	} else if (state == RenderTable::TILT) {
-		tmp.translate(0, (_screenCenterY - _bkgOff));
+		tmp.translate(0, (_screenCenterY - _backgroundOffset));
 	}
 
 	return tmp;
 }
 
 EffectMap *RenderManager::makeEffectMap(const Common::Point &xy, int16 depth, const Common::Rect &rect, int8 *_minComp, int8 *_maxComp) {
-	Common::Rect bkgRect(_bkgWidth, _bkgHeight);
+	Common::Rect bkgRect(_backgroundWidth, _backgroundHeight);
 	if (!bkgRect.contains(xy))
 		return NULL;
 
 	if (!bkgRect.intersects(rect))
 		return NULL;
 
-	uint16 color = *(uint16 *)_curBkg.getBasePtr(xy.x, xy.y);
+	uint16 color = *(uint16 *)_currentBackgroundImage.getBasePtr(xy.x, xy.y);
 	uint8 stC1, stC2, stC3;
-	_curBkg.format.colorToRGB(color, stC1, stC2, stC3);
+	_currentBackgroundImage.format.colorToRGB(color, stC1, stC2, stC3);
 	EffectMap *newMap = new EffectMap;
 
 	EffectMapUnit unit;
@@ -953,11 +967,11 @@ EffectMap *RenderManager::makeEffectMap(const Common::Point &xy, int16 depth, co
 	uint8 depth8 = depth << 3;
 
 	for (int16 j = 0; j < h; j++) {
-		uint16 *pix = (uint16 *)_curBkg.getBasePtr(rect.left, rect.top + j);
+		uint16 *pix = (uint16 *)_currentBackgroundImage.getBasePtr(rect.left, rect.top + j);
 		for (int16 i = 0; i < w; i++) {
 			uint16 curClr = pix[i];
 			uint8 cC1, cC2, cC3;
-			_curBkg.format.colorToRGB(curClr, cC1, cC2, cC3);
+			_currentBackgroundImage.format.colorToRGB(curClr, cC1, cC2, cC3);
 
 			bool use = false;
 
@@ -1055,11 +1069,11 @@ EffectMap *RenderManager::makeEffectMap(const Graphics::Surface &surf, uint16 tr
 }
 
 void RenderManager::markDirty() {
-	_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
+	_backgroundDirtyRect = Common::Rect(_backgroundWidth, _backgroundHeight);
 }
 
 void RenderManager::bkgFill(uint8 r, uint8 g, uint8 b) {
-	_curBkg.fillRect(Common::Rect(_curBkg.w, _curBkg.h), _curBkg.format.RGBToColor(r, g, b));
+	_currentBackgroundImage.fillRect(Common::Rect(_currentBackgroundImage.w, _currentBackgroundImage.h), _currentBackgroundImage.format.RGBToColor(r, g, b));
 	markDirty();
 }
 
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 879a8643ce..29bbd8f411 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -52,7 +52,7 @@ public:
 	~RenderManager();
 
 private:
-	struct oneSub {
+	struct OneSubtitle {
 		Common::Rect r;
 		Common::String txt;
 		int16  timer;
@@ -60,87 +60,91 @@ private:
 		bool redraw;
 	};
 
-	typedef Common::HashMap<uint16, oneSub> subMap;
-	typedef Common::List<Effect *> effectsList;
+	typedef Common::HashMap<uint16, OneSubtitle> SubtitleMap;
+	typedef Common::List<Effect *> EffectsList;
 
 private:
 	ZVision *_engine;
 	OSystem *_system;
 	const Graphics::PixelFormat _pixelFormat;
 
-	// A buffer for blitting background image to working window
-	Graphics::Surface _wrkWnd;
+	/**
+	 * A Rectangle centered inside the actual window. All in-game coordinates
+	 * are given in this coordinate space. Also, all images are clipped to the
+	 * edges of this Rectangle
+	 */
+	const Common::Rect _workingWindow;
 
-	Common::Rect _wrkWndDirtyRect;
+	// Width of the working window. Saved to prevent extraneous calls to _workingWindow.width()
+	const int _workingWidth;
+	// Height of the working window. Saved to prevent extraneous calls to _workingWindow.height()
+	const int _workingHeight;
+	// Center of the screen in the x direction
+	const int _screenCenterX;
+	// Center of the screen in the y direction
+	const int _screenCenterY;
+
+	/** A buffer for background image that's being used to create the background */
+	Graphics::Surface _currentBackgroundImage;
+	Common::Rect _backgroundDirtyRect;
 
-	// A buffer for mutate image by tilt or panorama renderers
-	Graphics::Surface _outWnd;
+	/** 
+	 * The x1 or y1 offset of the subRectangle of the background that is currently displayed on the screen
+	 * It will be x1 if PANORAMA, or y1 if TILT
+	 */
+	int16 _backgroundOffset;
+	/** The width of the current background image */
+	uint16 _backgroundWidth;
+	/** The height of the current background image */
+	uint16 _backgroundHeight;
 
-	Common::Rect _bkgDirtyRect;
+	// A buffer that holds the portion of the background that is used to render the final image
+	// If it's a normal scene, the pixels will be blitted directly to the screen
+	// If it's a panorma / tilt scene, the pixels will be first warped to _warpedSceneSurface
+	Graphics::Surface _backgroundSurface;
+	Common::Rect _backgroundSurfaceDirtyRect;
 
 	// A buffer for subtitles
-	Graphics::Surface _subWnd;
+	Graphics::Surface _subtitleSurface;
+	Common::Rect _subtitleSurfaceDirtyRect;
 
-	Common::Rect _subWndDirtyRect;
+	// Rectangle for subtitles area
+	Common::Rect _subtitleArea;
 
 	// A buffer for menu drawing
-	Graphics::Surface _menuWnd;
+	Graphics::Surface _menuSurface;
+	Common::Rect _menuSurfaceDirtyRect;
 
-	Common::Rect _menuWndDirtyRect;
+	// Rectangle for menu area
+	Common::Rect _menuArea;
 
 	// A buffer used for apply graphics effects
-	Graphics::Surface _effectWnd;
+	Graphics::Surface _effectSurface;
 
-	/** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */
-	const int _wrkWidth;
-	/** Height of the working window. Saved to prevent extraneous calls to _workingWindow.height() */
-	const int _wrkHeight;
-	/** Center of the screen in the x direction */
-	const int _screenCenterX;
-	/** Center of the screen in the y direction */
-	const int _screenCenterY;
-
-	/**
-	 * A Rectangle centered inside the actual window. All in-game coordinates
-	 * are given in this coordinate space. Also, all images are clipped to the
-	 * edges of this Rectangle
-	 */
-	const Common::Rect _workingWindow;
-
-	// Recatangle for subtitles area
-	Common::Rect _subWndRect;
+	// A buffer to store the result of the panorama / tilt warps
+	Graphics::Surface _warpedSceneSurface;
 
-	// Recatangle for menu area
-	Common::Rect _menuWndRect;
 
 	/** Used to warp the background image */
 	RenderTable _renderTable;
 
-	// A buffer for background image
-	Graphics::Surface _curBkg;
-	/** The (x1,y1) coordinates of the subRectangle of the background that is currently displayed on the screen */
-	int16 _bkgOff;
-	/** The width of the current background image */
-	uint16 _bkgWidth;
-	/** The height of the current background image */
-	uint16 _bkgHeight;
-
 	// Internal subtitles counter
 	uint16 _subid;
 
 	// Subtitle list
-	subMap _subsList;
+	SubtitleMap _subsList;
 
 	// Visual effects list
-	effectsList _effects;
+	EffectsList _effects;
 
+	
 public:
 	void initialize();
 
 	/**
-	 * Renders the current state of the backbuffer to the screen
+	 * Renders the scene to the screen
 	 */
-	void renderBackbufferToScreen();
+	void renderSceneToScreen();
 
 	/**
 	 * Blits the image or a portion of the image to the background.
@@ -274,7 +278,7 @@ public:
 	void renderMenuToScreen();
 
 	// Copy needed portion of background surface to workingWindow surface
-	void prepareBkg();
+	void prepareBackground();
 
 	/**
 	 * Reads an image file pixel data into a Surface buffer. In the process
@@ -319,7 +323,7 @@ public:
 	EffectMap *makeEffectMap(const Graphics::Surface &surf, uint16 transp);
 
 	// Return background rectangle in screen coordinates
-	Common::Rect bkgRectToScreen(const Common::Rect &src);
+	Common::Rect transformBackgroundSpaceRectToScreenSpace(const Common::Rect &src);
 
 	// Mark whole background surface as dirty
 	void markDirty();
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 4e5307c182..c32cceb26e 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -97,8 +97,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _textRenderer(nullptr),
 	  _halveDelay(false),
 	  _audioId(0),
-	  _rendDelay(2),
-	  _kbdVelocity(0),
+	  _frameRenderDelay(2),
+	  _keyboardVelocity(0),
 	  _mouseVelocity(0),
 	  _videoIsPlaying(false) {
 
@@ -113,7 +113,7 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
 					 );
 
-	memset(_cheatBuff, 0, sizeof(_cheatBuff));
+	memset(_cheatBuffer, 0, sizeof(_cheatBuffer));
 }
 
 ZVision::~ZVision() {
@@ -233,29 +233,31 @@ Common::Error ZVision::run() {
 		processEvents();
 		updateRotation();
 
-		// Call _renderManager->update() first so the background renders
-		// before anything that puzzles/controls will render
 		_scriptManager->update(deltaTime);
 		_menu->process(deltaTime);
 
 		// Render the backBuffer to the screen
-		_renderManager->prepareBkg();
+		_renderManager->prepareBackground();
 		_renderManager->renderMenuToScreen();
 		_renderManager->processSubs(deltaTime);
-		_renderManager->renderBackbufferToScreen();
+		_renderManager->renderSceneToScreen();
 
 		// Update the screen
-		if (_rendDelay <= 0)
+		if (_frameRenderDelay <= 0) {
 			_system->updateScreen();
-		else
-			_rendDelay--;
+		} else {
+			_frameRenderDelay--;
+		}
 
 		// Calculate the frame delay based off a desired frame time
 		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
 		// Ensure non-negative
 		delay = delay < 0 ? 0 : delay;
-		if (_halveDelay)
+
+		if (_halveDelay) {
 			delay >>= 1;
+		}
+
 		_system->delayMillis(delay);
 	}
 
@@ -266,7 +268,7 @@ bool ZVision::askQuestion(const Common::String &str) {
 	uint16 msgid = _renderManager->createSubArea();
 	_renderManager->updateSubArea(msgid, str);
 	_renderManager->processSubs(0);
-	_renderManager->renderBackbufferToScreen();
+	_renderManager->renderSceneToScreen();
 	_clock.stop();
 
 	int result = 0;
@@ -302,7 +304,7 @@ void ZVision::delayedMessage(const Common::String &str, uint16 milsecs) {
 	uint16 msgid = _renderManager->createSubArea();
 	_renderManager->updateSubArea(msgid, str);
 	_renderManager->processSubs(0);
-	_renderManager->renderBackbufferToScreen();
+	_renderManager->renderSceneToScreen();
 	_clock.stop();
 
 	uint32 stopTime = _system->getMillis() + milsecs;
@@ -329,7 +331,7 @@ void ZVision::timedMessage(const Common::String &str, uint16 milsecs) {
 	uint16 msgid = _renderManager->createSubArea();
 	_renderManager->updateSubArea(msgid, str);
 	_renderManager->processSubs(0);
-	_renderManager->renderBackbufferToScreen();
+	_renderManager->renderSceneToScreen();
 	_renderManager->deleteSubArea(msgid, milsecs);
 }
 
@@ -352,15 +354,15 @@ Common::String ZVision::generateAutoSaveFileName() {
 }
 
 void ZVision::setRenderDelay(uint delay) {
-	_rendDelay = delay;
+	_frameRenderDelay = delay;
 }
 
 bool ZVision::canRender() {
-	return _rendDelay <= 0;
+	return _frameRenderDelay <= 0;
 }
 
 void ZVision::updateRotation() {
-	int16 _velocity = _mouseVelocity + _kbdVelocity;
+	int16 _velocity = _mouseVelocity + _keyboardVelocity;
 
 	if (_halveDelay)
 		_velocity /= 2;
@@ -480,8 +482,8 @@ void ZVision::rotateTo(int16 _toPos, int16 _time) {
 
 		_renderManager->setBackgroundPosition(curX);
 
-		_renderManager->prepareBkg();
-		_renderManager->renderBackbufferToScreen();
+		_renderManager->prepareBackground();
+		_renderManager->renderSceneToScreen();
 
 		_system->updateScreen();
 
@@ -512,9 +514,9 @@ bool ZVision::ifQuit() {
 
 void ZVision::pushKeyToCheatBuf(uint8 key) {
 	for (int i = 0; i < KEYBUF_SIZE - 1; i++)
-		_cheatBuff[i] = _cheatBuff[i + 1];
+		_cheatBuffer[i] = _cheatBuffer[i + 1];
 
-	_cheatBuff[KEYBUF_SIZE - 1] = key;
+	_cheatBuffer[KEYBUF_SIZE - 1] = key;
 }
 
 bool ZVision::checkCode(const char *code) {
@@ -524,7 +526,7 @@ bool ZVision::checkCode(const char *code) {
 		return false;
 
 	for (int i = 0; i < codeLen; i++)
-		if (code[i] != _cheatBuff[KEYBUF_SIZE - codeLen + i] && code[i] != '?')
+		if (code[i] != _cheatBuffer[KEYBUF_SIZE - codeLen + i] && code[i] != '?')
 			return false;
 
 	return true;
@@ -534,7 +536,7 @@ uint8 ZVision::getBufferedKey(uint8 pos) {
 	if (pos >= KEYBUF_SIZE)
 		return 0;
 	else
-		return _cheatBuff[KEYBUF_SIZE - pos - 1];
+		return _cheatBuffer[KEYBUF_SIZE - pos - 1];
 }
 
 void ZVision::showDebugMsg(const Common::String &msg, int16 delay) {
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 78c1c824a1..7ea10ed64d 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -117,13 +117,13 @@ private:
 	// To prevent allocation every time we process events
 	Common::Event _event;
 
-	int _rendDelay;
+	int _frameRenderDelay;
 	int16 _mouseVelocity;
-	int16 _kbdVelocity;
+	int16 _keyboardVelocity;
 	bool _halveDelay;
 	bool _videoIsPlaying;
 
-	uint8 _cheatBuff[KEYBUF_SIZE];
+	uint8 _cheatBuffer[KEYBUF_SIZE];
 public:
 	uint32 getFeatures() const;
 	Common::Language getLanguage() const;
-- 
cgit v1.2.3


From 808a2045b4a3b210f1f2512617fe1be41c5dc460 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Fri, 19 Dec 2014 11:20:01 -0600
Subject: ZVISION: Fix code mis-alignment created from variable rename

---
 engines/zvision/core/events.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index fe357c263b..6cf0ae5d0d 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -195,16 +195,16 @@ void ZVision::processEvents() {
 			case Common::KEYCODE_RIGHT:
 				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::PANORAMA)
 					_keyboardVelocity = (_event.kbd.keycode == Common::KEYCODE_LEFT ?
-					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
-					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
+					                     -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
+					                     _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
 				break;
 
 			case Common::KEYCODE_UP:
 			case Common::KEYCODE_DOWN:
 				if (_renderManager->getRenderTable()->getRenderState() == RenderTable::TILT)
 					_keyboardVelocity = (_event.kbd.keycode == Common::KEYCODE_UP ?
-					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
-					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
+					                     -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
+					                     _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
 				break;
 
 			default:
-- 
cgit v1.2.3


From ff35d7118c0a61a472b74d87337ee62eac993ce1 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Wed, 17 Sep 2014 15:49:44 -0500
Subject: SWORD25: Create a set of functions for manually serializing a double

Since we can't assume IEEE.
---
 engines/sword25/util/double_serializer.cpp | 138 +++++++++++++++++++++++++++++
 engines/sword25/util/double_serializer.h   |  95 ++++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 engines/sword25/util/double_serializer.cpp
 create mode 100644 engines/sword25/util/double_serializer.h

diff --git a/engines/sword25/util/double_serializer.cpp b/engines/sword25/util/double_serializer.cpp
new file mode 100644
index 0000000000..d7ba4f3052
--- /dev/null
+++ b/engines/sword25/util/double_serializer.cpp
@@ -0,0 +1,138 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/double_serializer.h"
+
+#include "common/scummsys.h"
+
+
+namespace Util {
+
+SerializedDouble encodeDouble(double value) {
+	// Split the value into its significand and exponent
+	int exponent;
+	double significand = frexp(value, &exponent);
+
+	// Shift the the first part of the significand into the integer range
+	double shiftedsignificandPart = ldexp(abs(significand), 32);
+	uint32 significandOne = uint32(floor(shiftedsignificandPart));
+
+	// Shift the remainder of the significand into the integer range
+	shiftedsignificandPart -= significandOne;
+	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 31));
+
+	SerializedDouble returnValue;
+	returnValue.significandOne = significandOne;                                // SignificandOne
+	returnValue.signAndSignificandTwo = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
+	                                    significandTwo;                         // SignificandTwo
+	returnValue.exponent = (int16)exponent;
+	return returnValue;
+}
+
+double decodeDouble(SerializedDouble value) {
+	// Expand the exponent and the parts of the significand
+	int exponent = (int)value.exponent;
+	double expandedsignificandOne = (double)value.significandOne;
+	double expandedsignificandTwo = (double)(value.signAndSignificandTwo & 0x7FFFFFFF);
+
+	// Deflate the significand
+	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
+	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
+
+	// Re-calculate the actual double
+	double returnValue = ldexp(significand, exponent);
+
+	// Check the sign bit and return
+	return ((value.signAndSignificandTwo & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
+}
+
+uint64 encodeDouble_64(double value) {
+	// Split the value into its significand and exponent
+	int exponent;
+	double significand = frexp(value, &exponent);
+
+	// Shift the significand into the integer range
+	double shiftedsignificand = ldexp(abs(significand), 53);
+
+	// Combine everything using the IEEE standard
+	uint64 uintsignificand = (uint64)shiftedsignificand;
+	return ((uint64)(value < 0 ? 1 : 0) << 63) |        // Sign
+	       ((uint64)(exponent + 1023) << 52) |          // Exponent stored as an offset to 1023
+	       (uintsignificand & 0x000FFFFFFFFFFFFF);      // significand with MSB inferred
+}
+
+double decodeDouble_64(uint64 value) {
+	// Expand the exponent and significand
+	int exponent = (int)((value >> 52) & 0x7FF) - 1023;
+	double expandedsignificand = (double)(0x10000000000000 /* Inferred MSB */ | (value & 0x000FFFFFFFFFFFFF));
+
+	// Deflate the significand
+	int temp;
+	double significand = frexp(expandedsignificand, &temp);
+
+	// Re-calculate the actual double
+	double returnValue = ldexp(significand, exponent);
+
+	// Check the sign bit and return
+	return ((value & 0x8000000000000000) == 0x8000000000000000) ? -returnValue : returnValue;
+}
+
+CompactSerializedDouble encodeDouble_Compact(double value) {
+	// Split the value into its significand and exponent
+	int exponent;
+	double significand = frexp(value, &exponent);
+
+	// Shift the the first part of the significand into the integer range
+	double shiftedsignificandPart = ldexp(abs(significand), 32);
+	uint32 significandOne = uint32(floor(shiftedsignificandPart));
+
+	// Shift the remainder of the significand into the integer range
+	shiftedsignificandPart -= significandOne;
+	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 21));
+
+	CompactSerializedDouble returnValue;
+	returnValue.signAndSignificandOne = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
+	                                    (significandOne & 0x7FFFFFFF);          // significandOne with MSB inferred
+	// Exponent stored as an offset to 1023
+	returnValue.exponentAndSignificandTwo = ((uint32)(exponent + 1023) << 21) | significandTwo;
+
+	return returnValue;
+}
+
+double decodeDouble_Compact(CompactSerializedDouble value) {
+	// Expand the exponent and the parts of the significand
+	int exponent = (int)(value.exponentAndSignificandTwo >> 21) - 1023;
+	double expandedsignificandOne = (double)(0x80000000 /* Inferred MSB */ | (value.signAndSignificandOne & 0x7FFFFFFF));
+	double expandedsignificandTwo = (double)(value.exponentAndSignificandTwo & 0x1FFFFF);
+
+	// Deflate the significand
+	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
+	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
+
+	// Re-calculate the actual double
+	double returnValue = ldexp(significand, exponent);
+
+	// Check the sign bit and return
+	return ((value.signAndSignificandOne & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
+}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/util/double_serializer.h b/engines/sword25/util/double_serializer.h
new file mode 100644
index 0000000000..e90338c369
--- /dev/null
+++ b/engines/sword25/util/double_serializer.h
@@ -0,0 +1,95 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef DOUBLE_SERIALIZATION_H
+#define DOUBLE_SERIALIZATION_H
+
+#include "common/types.h"
+
+
+namespace Util {
+
+struct SerializedDouble {
+	uint32 significandOne;
+	uint32 signAndSignificandTwo;
+	int16 exponent;
+};
+
+struct CompactSerializedDouble {
+	uint32 signAndSignificandOne;
+	uint32 exponentAndSignificandTwo;
+};
+
+/**
+ * Encodes a double as two uint32 and a one int16
+ *
+ * Supports denormalized numbers. Does NOT support NaN, or Inf
+ *
+ * @param value    The value to encode
+ * @return         The encoded value
+ */
+SerializedDouble encodeDouble(double value);
+/**
+ * Decodes a previously encoded double
+ *
+ * @param value    The value to decode
+ * @return         The decoded value
+ */
+double decodeDouble(SerializedDouble value);
+
+/**
+ * Encodes a double as a uint64
+ *
+ * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
+ *
+ * @param value    The value to encode
+ * @return         The encoded value
+ */
+uint64 encodeDouble_64(double value);
+/**
+ * Decodes a previously encoded double
+ *
+ * @param value    The value to decode
+ * @return         The decoded value
+ */
+double decodeDouble_64(uint64 value);
+
+/**
+ * Encodes a double as two uint32
+ *
+ * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
+ *
+ * @param value    The value to encode
+ * @return         The encoded value
+ */
+CompactSerializedDouble encodeDouble_Compact(double value);
+/**
+ * Decodes a previously encoded double
+ *
+ * @param value    The value to decode
+ * @return         The decoded value
+ */
+double decodeDouble_Compact(CompactSerializedDouble value);
+
+} // End of namespace Sword25
+
+#endif
-- 
cgit v1.2.3


From efcd6196eeaa2bff468bbed8d07040e60ca3c136 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Wed, 17 Sep 2014 15:52:26 -0500
Subject: SWORD25: Create a function for serializing lua objects

This function is very similar to the Pluto function. However, this code
is much cleaner and is endian-safe
---
 engines/sword25/util/lua_serialization.h |  42 ++
 engines/sword25/util/lua_serializer.cpp  | 852 +++++++++++++++++++++++++++++++
 2 files changed, 894 insertions(+)
 create mode 100644 engines/sword25/util/lua_serialization.h
 create mode 100644 engines/sword25/util/lua_serializer.cpp

diff --git a/engines/sword25/util/lua_serialization.h b/engines/sword25/util/lua_serialization.h
new file mode 100644
index 0000000000..0f0c3bd0b2
--- /dev/null
+++ b/engines/sword25/util/lua_serialization.h
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef LUA_SERIALIZATION_H
+#define LUA_SERIALIZATION_H
+
+#include "sword25/util/lua/lua.h"
+
+
+namespace Common {
+class WriteStream;
+}
+
+
+namespace Lua {
+
+#define PERMANENT_TYPE 101
+
+void serializeLua(lua_State *luaState, Common::WriteStream *writeStream);
+
+} // End of namespace Lua
+
+#endif
diff --git a/engines/sword25/util/lua_serializer.cpp b/engines/sword25/util/lua_serializer.cpp
new file mode 100644
index 0000000000..b2bbca6be9
--- /dev/null
+++ b/engines/sword25/util/lua_serializer.cpp
@@ -0,0 +1,852 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/lua_serialization.h"
+
+#include "sword25/util/double_serializer.h"
+
+#include "common/stream.h"
+
+#include "lua/lobject.h"
+#include "lua/lstate.h"
+
+
+namespace Lua {
+
+#define NUMTYPES 9
+
+static const char* typenames[] = {
+	"nil",
+	"boolean",
+	"lightuserdata",
+	"number",
+	"string",
+	"table",
+	"function",
+	"userdata",
+	"thread"
+};
+
+#define PERMANENT_TYPE 101
+
+/* A simple reimplementation of the unfortunately static function luaA_index.
+ * Does not support the global table, registry, or upvalues. */
+static StkId getobject(lua_State *luaState, int stackpos) {
+	if(stackpos > 0) {
+		lua_assert(luaState->base+stackpos-1 < luaState->top);
+		return luaState->base+stackpos-1;
+	} else {
+		lua_assert(L->top-stackpos >= L->base);
+		return luaState->top+stackpos;
+	}
+}
+
+
+struct SerializationInfo {
+	lua_State *luaState;
+	Common::WriteStream *writeStream;
+	uint counter;
+};
+
+static void serializeObject(SerializationInfo *info);
+
+static void serializeBoolean(SerializationInfo *info);
+static void serializeLightUserData(SerializationInfo *info);
+static void serializeNumber(SerializationInfo *info);
+static void serializeString(SerializationInfo *info);
+static void serializeTable(SerializationInfo *info);
+static void serializeFunction(SerializationInfo *info);
+static void serializeThread(SerializationInfo *info);
+static void serializeProto(SerializationInfo *info);
+static void serializeUpValue(SerializationInfo *info);
+static void serializeUserData(SerializationInfo *info);
+
+
+void serializeLua(lua_State *luaState, Common::WriteStream *writeStream) {
+	SerializationInfo info;
+	info.luaState = luaState;
+	info.writeStream = writeStream;
+	info.counter = 0u;
+
+	// The process starts with the lua stack as follows:
+	// >>>>> permTbl rootObj
+	// That's the table of permanents and the root object to be serialized
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(luaState, 4);
+	assert(lua_gettop(luaState) == 2);
+	// And that the root isn't nil
+	assert(!lua_isnil(luaState, 2));
+
+	// Create a table to hold indexes of everything that's serialized
+	// This allows us to only serialize an object once
+	// Every other time, just reference the index
+	lua_newtable(luaState);
+	// >>>>> permTbl rootObj indexTbl
+
+	// Now we're going to make the table weakly keyed. This prevents the
+	// GC from visiting it and trying to mark things it doesn't want to
+	// mark in tables, e.g. upvalues. All objects in the table are
+	// a priori reachable, so it doesn't matter that we do this.
+	
+	// Create the metatable
+	lua_newtable(luaState);
+	// >>>>> permTbl rootObj indexTbl metaTbl
+
+	lua_pushstring(luaState, "__mode");
+	// >>>>> permTbl rootObj indexTbl metaTbl "__mode"
+
+	lua_pushstring(luaState, "k");
+	// >>>>> permTbl rootObj indexTbl metaTbl "__mode" "k"
+
+	lua_settable(luaState, 4);
+	// >>>>> permTbl rootObj indexTbl metaTbl
+
+	lua_setmetatable(luaState, 3);
+	// >>>>> permTbl rootObj indexTbl
+
+	// Swap the indexTable and the rootObj
+	lua_insert(luaState, 2);
+	// >>>>> permTbl indexTbl rootObj
+
+	// Serialize the root recursively
+	serializeObject(&info);
+
+	// Return the stack back to the original state
+	lua_remove(luaState, 2);
+	// >>>>> permTbl rootObj
+}
+
+static void serializeObject(SerializationInfo *info) {
+	// The stack can potentially have many things on it
+	// The object we want to serialize is the item on the top of the stack
+	// >>>>> permTbl indexTbl rootObj ...... obj
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	// If the object has already been written, don't write it again
+	// Instead write the index of the object from the indexTbl
+
+	// Check the indexTbl
+	lua_pushvalue(info->luaState, -1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj
+
+	lua_rawget(info->luaState, 2);
+	// >>>>> permTbl indexTbl rootObj ...... obj ?index?
+
+	// If the index isn't nil, the object has already been written
+	if (!lua_isnil(info->luaState, -1)) {
+		// Write out a flag that indicates that it's an index
+		info->writeStream->writeByte(0);
+
+		// Retrieve the index from the stack
+		uint *index = (uint *)lua_touserdata(info->luaState, -1);
+
+		// Write out the index
+		info->writeStream->writeUint32LE(*index);
+
+		// Pop the index off the stack
+		lua_pop(info->luaState, 1);
+
+		return;
+	}
+
+	// Pop the nil off the stack
+	lua_pop(info->luaState, 1);
+
+	// Write out a flag that indicates that this is a real object
+	info->writeStream->writeByte(1);
+
+	// If the object itself is nil, then write out a zero as a placeholder
+	if (lua_isnil(info->luaState, -1)) {
+		info->writeStream->writeByte(0);
+
+		return;
+	}
+
+	// Add the object to the indexTbl
+
+	lua_pushvalue(info->luaState, -1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj
+
+	uint *ref = (uint *)lua_newuserdata(info->luaState, sizeof(uint));
+	*ref = ++(info->counter);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj index
+
+	lua_rawset(info->luaState, 2);
+	// >>>>> permTbl indexTbl rootObj ...... obj
+
+
+	// Write out the index
+	info->writeStream->writeUint32LE(info->counter);
+
+
+	// Objects that are in the permanents table are serialized in a special way
+
+	lua_pushvalue(info->luaState, -1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj
+
+	lua_gettable(info->luaState, 1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj ?permKey?
+
+	if (!lua_isnil(info->luaState, -1)) {
+		// Write out the type
+		info->writeStream->writeSint32LE(PERMANENT_TYPE);
+
+		// Serialize the key
+		serializeObject(info);
+
+		// Pop the key off the stack
+		lua_pop(info->luaState, 1);
+
+		return;
+	}
+
+	// Pop the nil off the stack
+	lua_pop(info->luaState, 1);
+
+	// Query the type of the object
+	int objType = lua_type(info->luaState, -1);
+
+	// Write it out
+	info->writeStream->writeSint32LE(objType);
+
+	// Serialize the object by its type
+
+	switch (objType) {
+	case LUA_TBOOLEAN:
+		serializeBoolean(info);
+		break;
+	case LUA_TLIGHTUSERDATA:
+		// You can't serialize a pointer
+		// It would be meaningless on the next run
+		assert(0);
+		break;
+	case LUA_TNUMBER:
+		serializeNumber(info);
+		break;
+	case LUA_TSTRING:
+		serializeString(info);
+		break;
+	case LUA_TTABLE:
+		serializeTable(info);
+		break;
+	case LUA_TFUNCTION:
+		serializeFunction(info);
+		break;
+	case LUA_TTHREAD:
+		serializeThread(info);
+		break;
+	case LUA_TPROTO:
+		serializeProto(info);
+		break;
+	case LUA_TUPVAL:
+		serializeUpValue(info);
+		break;
+	case LUA_TUSERDATA:
+		serializeUserData(info);
+		break;
+	default:
+		assert(0);
+	}
+}
+
+static void serializeBoolean(SerializationInfo *info) {
+	int value = lua_toboolean(info->luaState, -1);
+
+	info->writeStream->writeSint32LE(value);
+}
+
+static void serializeNumber(SerializationInfo *info) {
+	lua_Number value = lua_tonumber(info->luaState, -1);
+	
+#if 1
+	Util::SerializedDouble serializedValue(Util::encodeDouble(value));
+
+	info->writeStream->writeUint32LE(serializedValue.significandOne);
+	info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
+	info->writeStream->writeSint16LE(serializedValue.exponent);
+#else
+	// NOTE: We need to store a double. Unfortunately, we have to accommodate endianness. 
+	// Also, I don't know if we can assume all compilers use IEEE double
+	// Therefore, I have chosen to store the double as a string. 
+	Common::String buffer = Common::String::format("%f", value);
+
+	info->writeStream->write(buffer.c_str(), buffer.size());
+#endif
+	
+}
+
+static void serializeString(SerializationInfo *info) {
+	// Hard cast to a uint32 to force size_t to an explicit size
+	// *Theoretically* this could truncate, but if we have a 4gb string, we have bigger problems
+	uint32 length = static_cast<uint32>(lua_strlen(info->luaState, -1));
+	info->writeStream->writeUint32LE(length);
+
+	const char* str = lua_tostring(info->luaState, -1);
+	info->writeStream->write(str, length);
+}
+
+/* Choose whether to do a regular or special persistence based on an object's
+ * metatable. "default" is whether the object, if it doesn't have a __persist
+ * entry, is literally persistable or not.
+ * Pushes the unpersist closure and returns true if special persistence is
+ * used. */
+static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 4);
+
+	// Check whether we should persist literally, or via the __persist metafunction
+	if (!lua_getmetatable(info->luaState, -1)) {
+		if (defaction) {
+			// Write out a flag declaring that the metatable doesn't exist
+			info->writeStream->writeSint32LE(0);
+
+			return false;
+		} else {
+			lua_pushstring(info->luaState, "Type not literally persistable by default");
+			lua_error(info->luaState);
+		}
+	}
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl
+	lua_pushstring(info->luaState, "__persist");
+	// >>>>> permTbl indexTbl rootObj ...... obj metaTbl "__persist"
+
+	lua_rawget(info->luaState, -2);
+	// >>>>> permTbl indexTbl ...... obj metaTbl ?__persist?
+
+	if (lua_isnil(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... obj metaTbl nil
+		lua_pop(info->luaState, 2);
+		// >>>>> permTbl indexTbl ...... obj
+
+		if (defaction) {
+			// Write out a flag declaring there is no persistence metafunction
+			info->writeStream->writeSint32LE(0);
+
+			return 0;
+		} else {
+			lua_pushstring(info->luaState, "Type not literally persistable by default");
+			lua_error(info->luaState);
+
+			return 0; /* not reached */
+		}
+
+	} else if (lua_isboolean(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... obj metaTbl bool
+		if (lua_toboolean(info->luaState, -1)) {
+			// Write out a flag declaring such
+			info->writeStream->writeSint32LE(0);
+
+			// >>>>> permTbl indexTbl ...... obj metaTbl true */
+			lua_pop(info->luaState, 2);
+			// >>>>> permTbl indexTbl ...... obj
+
+			return false;
+		} else {
+			lua_pushstring(info->luaState, "Metatable forbade persistence");
+			lua_error(info->luaState);
+
+			return false; /* not reached */
+		}
+	} else if (!lua_isfunction(info->luaState, -1)) {
+		lua_pushstring(info->luaState, "__persist not nil, boolean, or function");
+		lua_error(info->luaState);
+	}
+					
+	// >>>>> permTbl indexTbl ...... obj metaTbl __persist
+	lua_pushvalue(info->luaState, -3);
+	// >>>>> permTbl indexTbl ...... obj metaTbl __persist obj
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl ?func?
+
+	if (!lua_isfunction(info->luaState, -1)) {
+		lua_pushstring(info->luaState, "__persist function did not return a function");
+		lua_error(info->luaState);
+	}
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl func
+
+	// Write out a flag that the function exists
+	info->writeStream->writeSint32LE(1);
+
+	// Serialize the function
+	serializeObject(info);
+					
+	lua_pop(info->luaState, 2);
+	// >>>>> permTbl indexTbl ...... obj
+
+	return true;
+}
+
+static void serializeTable(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 3);
+
+	// Test if the object needs special serialization
+	if (serializeSpecialObject(info, 1)) {
+		return;
+	}
+
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// First, serialize the metatable (if any)
+	if (!lua_getmetatable(info->luaState, -1)) {
+		lua_pushnil(info->luaState);
+	}
+
+	// >>>>> permTbl indexTbl ...... tbl metaTbl/nil */
+	serializeObject(info);
+	
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... tbl
+
+	
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... tbl nil
+
+	// Now, persist all k/v pairs
+	while (lua_next(info->luaState, -2)) {
+		// >>>>> permTbl indexTbl ...... tbl k v */
+
+		lua_pushvalue(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... tbl k v k */
+
+		// Serialize the key
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... tbl k v */
+
+		// Serialize the value
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... tbl k */
+	}
+
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// Terminate the list with a nil
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... tbl
+
+	serializeObject(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... tbl
+}
+
+static void pushObject(lua_State *luaState, TValue *obj) {
+	setobj2s(luaState, luaState->top, obj);
+
+	api_check(luaState, luaState->top < luaState->ci->top);
+	luaState->top++;
+}
+
+static void pushProto(lua_State *luaState, Proto *proto) {
+	TValue obj;
+	setptvalue(luaState, &obj, proto);
+
+	pushObject(luaState, &obj);
+}
+
+static void pushUpVal(lua_State *luaState, UpVal *upval) {
+	TValue obj;
+
+	obj.value.gc = cast(GCObject *, upval); 
+	obj.tt = LUA_TUPVAL;
+	checkliveness(G(L), obj);
+	
+	pushObject(luaState, &obj);
+}
+
+static void pushString(lua_State *luaState, TString *str) {
+	TValue o;
+	setsvalue(luaState, &o, str);
+
+	pushObject(luaState, &o);
+}
+
+static void serializeFunction(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... func
+	Closure *cl = clvalue(getobject(info->luaState, -1));
+	lua_checkstack(info->luaState, 2);
+
+	if (cl->c.isC) {
+		/* It's a C function. For now, we aren't going to allow
+		 * persistence of C closures, even if the "C proto" is
+		 * already in the permanents table. */
+		lua_pushstring(info->luaState, "Attempt to persist a C function");
+		lua_error(info->luaState);
+	} else {
+		// It's a Lua closure
+
+		// We don't really _NEED_ the number of upvals, but it'll simplify things a bit
+		info->writeStream->writeByte(cl->l.p->nups);
+
+		// Serialize the prototype
+		pushProto(info->luaState, cl->l.p);
+		// >>>>> permTbl indexTbl ...... func proto */
+		
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+		
+		// Serialize upvalue values (not the upvalue objects themselves)
+		for (byte i=0; i<cl->l.p->nups; i++) {
+			// >>>>> permTbl indexTbl ...... func
+			pushUpVal(info->luaState, cl->l.upvals[i]);
+			// >>>>> permTbl indexTbl ...... func upval
+
+			serializeObject(info);
+
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... func
+		}
+
+		// >>>>> permTbl indexTbl ...... func
+
+		// Serialize function environment
+		lua_getfenv(info->luaState, -1);
+		// >>>>> permTbl indexTbl ...... func fenv
+
+		if (lua_equal(info->luaState, -1, LUA_GLOBALSINDEX)) {
+			// Function has the default fenv
+
+			// >>>>> permTbl indexTbl ...... func _G
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... func
+
+			lua_pushnil(info->luaState);
+			// >>>>> permTbl indexTbl ...... func nil
+		}
+
+		// >>>>> permTbl indexTbl ...... func fenv/nil
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+	}
+}
+
+/* Appends one stack to another stack, but the stack is reversed in the process */
+static size_t appendStackToStack_rev(lua_State *from, lua_State *to) {
+	for (StkId id = from->top - 1; id >= from->stack; --id) {
+		setobj2s(to, to->top, id);
+		to->top++;
+	}
+
+	return from->top - from->stack;
+}
+
+static void serializeThread(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... thread
+	lua_State *threadState = lua_tothread(info->luaState, -1);
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, threadState->top - threadState->stack + 1);
+
+	if (info->luaState == threadState) {
+		lua_pushstring(info->luaState, "Can't persist currently running thread");
+		lua_error(info->luaState);
+		return; /* not reached */
+	}
+
+	// Persist the stack
+
+	// We *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
+	uint stackSize = static_cast<uint32>(appendStackToStack_rev(threadState, info->luaState));
+	info->writeStream->writeUint32LE(stackSize);
+
+	// >>>>> permTbl indexTbl ...... thread (reversed contents of thread stack) */
+	for (; stackSize > 0; --stackSize) {
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+	}
+
+	// >>>>> permTbl indexTbl ...... thread
+	
+	// Now, serialize the CallInfo stack
+
+	// Again, we *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
+	uint32 numFrames = static_cast<uint32>((threadState->ci - threadState->base_ci) + 1);
+	info->writeStream->writeUint32LE(numFrames);
+
+	for (uint32 i = 0; i < numFrames; i++) {
+		CallInfo *ci = threadState->base_ci + i;
+
+		// Same argument as above about truncation
+		uint32 stackBase = static_cast<uint32>(ci->base - threadState->stack);
+		uint32 stackFunc = static_cast<uint32>(ci->func - threadState->stack);
+		uint32 stackTop = static_cast<uint32>(ci->top - threadState->stack);
+		
+		info->writeStream->writeUint32LE(stackBase);
+		info->writeStream->writeUint32LE(stackFunc);
+		info->writeStream->writeUint32LE(stackTop);
+
+		info->writeStream->writeSint32LE(ci->nresults);
+
+		uint32 savedpc = (ci != threadState->base_ci) ? static_cast<uint32>(ci->savedpc - ci_func(ci)->l.p->code) : 0u;
+		info->writeStream->writeUint32LE(savedpc);
+	}
+	
+
+	// Serialize the state's other parameters, with the exception of upval stuff
+
+	assert(threadState->nCcalls <= 1);
+	info->writeStream->writeByte(threadState->status);
+
+	// Same argument as above about truncation
+	uint32 stackBase = static_cast<uint32>(threadState->base - threadState->stack);
+	uint32 stackFunc = static_cast<uint32>(threadState->top - threadState->stack);
+	info->writeStream->writeUint32LE(stackBase);
+	info->writeStream->writeUint32LE(stackFunc);
+
+	// Same argument as above about truncation
+	uint32 stackOffset = static_cast<uint32>(threadState->errfunc);
+	info->writeStream->writeUint32LE(stackOffset);
+
+	// Finally, record upvalues which need to be reopened
+	// See the comment above serializeUpVal() for why we do this
+
+	UpVal *upVal;
+
+	// >>>>> permTbl indexTbl ...... thread
+	for (GCObject *gcObject = threadState->openupval; gcObject != NULL; gcObject = upVal->next) {
+		upVal = gco2uv(gcObject);
+
+		/* Make sure upvalue is really open */
+		assert(upVal->v != &upVal->u.value);
+
+		pushUpVal(info->luaState, upVal);
+		// >>>>> permTbl indexTbl ...... thread upVal
+
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... thread
+
+		// Same argument as above about truncation
+		uint32 stackpos = static_cast<uint32>(upVal->v - threadState->stack);
+		info->writeStream->writeUint32LE(stackpos);
+	}
+
+	// >>>>> permTbl indexTbl ...... thread
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... thread nil
+
+	// Use nil as a terminator
+	serializeObject(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... thread
+}
+
+static void serializeProto(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... proto
+	Proto *proto = gco2p(getobject(info->luaState, -1)->value.gc);
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	// Serialize constant refs */
+	info->writeStream->writeSint32LE(proto->sizek);
+
+	for (int i = 0; i < proto->sizek; ++i) {
+		pushObject(info->luaState, &proto->k[i]);
+		// >>>>> permTbl indexTbl ...... proto const
+
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Serialize inner Proto refs
+	info->writeStream->writeSint32LE(proto->sizep);
+
+	for (int i = 0; i < proto->sizep; ++i)
+	{
+		pushProto(info->luaState, proto->p[i]);
+		// >>>>> permTbl indexTbl ...... proto subProto */
+
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Serialize the code
+	info->writeStream->writeSint32LE(proto->sizecode);
+
+	uint32 len = static_cast<uint32>(sizeof(Instruction) * proto->sizecode);
+	info->writeStream->write(proto->code, len);
+
+
+	// Serialize upvalue names
+	info->writeStream->writeSint32LE(proto->sizeupvalues);
+
+	for (int i = 0; i < proto->sizeupvalues; ++i)
+	{
+		pushString(info->luaState, proto->upvalues[i]);
+		// >>>>> permTbl indexTbl ...... proto str
+
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+	
+
+	// Serialize local variable infos 
+	info->writeStream->writeSint32LE(proto->sizelocvars);
+
+	for (int i = 0; i < proto->sizelocvars; ++i) {
+		pushString(info->luaState, proto->locvars[i].varname);
+		// >>>>> permTbl indexTbl ...... proto str
+
+		serializeObject(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+
+		info->writeStream->writeSint32LE(proto->locvars[i].startpc);
+		info->writeStream->writeSint32LE(proto->locvars[i].endpc);
+	}
+
+
+	// Serialize source string
+	pushString(info->luaState, proto->source);
+	// >>>>> permTbl indexTbl ...... proto sourceStr
+
+	serializeObject(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Serialize line numbers
+	info->writeStream->writeSint32LE(proto->sizelineinfo);
+
+	if (proto->sizelineinfo) {
+		uint32 len = static_cast<uint32>(sizeof(int) * proto->sizelineinfo);
+		info->writeStream->write(proto->lineinfo, len);
+	}
+
+	// Serialize linedefined and lastlinedefined
+	info->writeStream->writeSint32LE(proto->linedefined);
+	info->writeStream->writeSint32LE(proto->lastlinedefined);
+
+
+	// Serialize misc values
+	info->writeStream->writeByte(proto->nups);
+	info->writeStream->writeByte(proto->numparams);
+	info->writeStream->writeByte(proto->is_vararg);
+	info->writeStream->writeByte(proto->maxstacksize);
+}
+
+/* Upvalues are tricky. Here's why.
+ *
+ * A particular upvalue may be either "open", in which case its member v
+ * points into a thread's stack, or "closed" in which case it points to the
+ * upvalue itself. An upvalue is closed under any of the following conditions:
+ * -- The function that initially declared the variable "local" returns
+ * -- The thread in which the closure was created is garbage collected
+ *
+ * To make things wackier, just because a thread is reachable by Lua doesn't
+ * mean it's in our root set. We need to be able to treat an open upvalue
+ * from an unreachable thread as a closed upvalue.
+ *
+ * The solution:
+ * (a) For the purposes of serializing, don't indicate whether an upvalue is
+ *     closed or not.
+ * (b) When unserializing, pretend that all upvalues are closed.
+ * (c) When serializing, persist all open upvalues referenced by a thread
+ *     that is persisted, and tag each one with the corresponding stack position
+ * (d) When unserializing, "reopen" each of these upvalues as the thread is
+ *     unserialized
+ */
+static void serializeUpValue(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... upval
+	assert(ttype(getobject(info->luaState, -1)) == LUA_TUPVAL);
+	UpVal *upValue = gco2uv(getobject(info->luaState, -1)->value.gc);
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	// We can't permit the upValue to linger around on the stack, as Lua 
+	// will bail if its GC finds it.
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ......
+
+	pushObject(info->luaState, upValue->v);
+	// >>>>> permTbl indexTbl ...... obj
+
+	serializeObject(info);
+	// >>>>> permTbl indexTbl ...... obj
+}
+
+static void serializeUserData(SerializationInfo *info) {
+	// >>>>> permTbl rootObj ...... udata
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	// Test if the object needs special serialization
+	if (serializeSpecialObject(info, 0)) {
+		return;
+	}
+
+	// Use literal persistence
+
+	// Hard cast to a uint32 length
+	// This could lead to truncation, but if we have a 4gb block of data, we have bigger problems
+	uint32 length = static_cast<uint32>(uvalue(getobject(info->luaState, -1))->len);
+	info->writeStream->writeUint32LE(length);
+
+	info->writeStream->write(lua_touserdata(info->luaState, -1), length);
+
+	// Serialize the metatable (if any)
+	if (!lua_getmetatable(info->luaState, -1)) {
+		lua_pushnil(info->luaState);
+	}
+
+	// >>>>> permTbl rootObj ...... udata metaTbl/nil
+	serializeObject(info);
+
+	lua_pop(info->luaState, 1);
+	/* perms reftbl ... udata */
+}
+
+
+} // End of namespace Lua
-- 
cgit v1.2.3


From a4685796ce2e876ec4025a1a084f8c3f4500af4e Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Fri, 19 Dec 2014 11:49:42 -0600
Subject: TEST: Add unit tests for uint64 reading

---
 test/common/endian.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/common/endian.h b/test/common/endian.h
index cba7618c43..f083d1248c 100644
--- a/test/common/endian.h
+++ b/test/common/endian.h
@@ -10,6 +10,18 @@ class EndianTestSuite : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS(MKTAG('A','B','C','D'), tag);
 	}
 
+	void test_READ_BE_UINT64() {
+		const char data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
+		uint64 value = READ_BE_UINT64(data);
+		TS_ASSERT_EQUALS(value, 0x123456789ABCDEFFULL);
+	}
+
+	void test_READ_LE_UINT64() {
+		const char data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
+		uint64 value = READ_LE_UINT64(data);
+		TS_ASSERT_EQUALS(value, 0xFFEDCBA978563412ULL);
+	}
+
 	void test_READ_BE_UINT32() {
 		const char data[4] = { 0x12, 0x34, 0x56, 0x78 };
 		uint32 value = READ_BE_UINT32(data);
-- 
cgit v1.2.3


From dedfd7aa84360b5950b653109b3679c7f469aebc Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Fri, 19 Dec 2014 13:38:26 -0600
Subject: SWORD25: Move common functions to their own set of files so they can
 be shared

---
 engines/sword25/util/lua_serialization_util.cpp | 77 +++++++++++++++++++++
 engines/sword25/util/lua_serialization_util.h   | 43 ++++++++++++
 engines/sword25/util/lua_serializer.cpp         | 91 +++++--------------------
 3 files changed, 138 insertions(+), 73 deletions(-)
 create mode 100644 engines/sword25/util/lua_serialization_util.cpp
 create mode 100644 engines/sword25/util/lua_serialization_util.h

diff --git a/engines/sword25/util/lua_serialization_util.cpp b/engines/sword25/util/lua_serialization_util.cpp
new file mode 100644
index 0000000000..80009aff60
--- /dev/null
+++ b/engines/sword25/util/lua_serialization_util.cpp
@@ -0,0 +1,77 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distri8buted in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/lua_serialization_util.h"
+
+#include "common/scummsys.h"
+
+#include "lua/lobject.h"
+#include "lua/lstate.h"
+#include "lua/lgc.h"
+
+
+namespace Lua {
+
+void pushObject(lua_State *luaState, TValue *obj) {
+	setobj2s(luaState, luaState->top, obj);
+
+	api_check(luaState, luaState->top < luaState->ci->top);
+	luaState->top++;
+}
+
+void pushProto(lua_State *luaState, Proto *proto) {
+	TValue obj;
+	setptvalue(luaState, &obj, proto);
+
+	pushObject(luaState, &obj);
+}
+
+void pushUpValue(lua_State *luaState, UpVal *upval) {
+	TValue obj;
+
+	obj.value.gc = cast(GCObject *, upval);
+	obj.tt = LUA_TUPVAL;
+	checkliveness(G(L), obj);
+
+	pushObject(luaState, &obj);
+}
+
+void pushString(lua_State *luaState, TString *str) {
+	TValue o;
+	setsvalue(luaState, &o, str);
+
+	pushObject(luaState, &o);
+}
+
+/* A simple reimplementation of the unfortunately static function luaA_index.
+ * Does not support the global table, registry, or upvalues. */
+StkId getObject(lua_State *luaState, int stackpos) {
+	if(stackpos > 0) {
+		lua_assert(luaState->base+stackpos-1 < luaState->top);
+		return luaState->base+stackpos-1;
+	} else {
+		lua_assert(L->top-stackpos >= L->base);
+		return luaState->top+stackpos;
+	}
+}
+
+} // End of namespace Lua
diff --git a/engines/sword25/util/lua_serialization_util.h b/engines/sword25/util/lua_serialization_util.h
new file mode 100644
index 0000000000..6c55d0dd53
--- /dev/null
+++ b/engines/sword25/util/lua_serialization_util.h
@@ -0,0 +1,43 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distri8buted in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef LUA_SERIALIZATION_UTIL_H
+#define LUA_SERIALIZATION_UTIL_H
+
+
+struct lua_State;
+
+#include "lua/lobject.h"
+
+typedef TValue *StkId;
+
+namespace Lua {
+
+void pushObject(lua_State *luaState, TValue *obj);
+void pushProto(lua_State *luaState, Proto *proto);
+void pushUpValue(lua_State *luaState, UpVal *upval);
+void pushString(lua_State *luaState, TString *str);
+StkId getObject(lua_State *luaState, int stackpos);
+
+} // End of namespace Lua
+
+#endif
diff --git a/engines/sword25/util/lua_serializer.cpp b/engines/sword25/util/lua_serializer.cpp
index b2bbca6be9..8c61383fba 100644
--- a/engines/sword25/util/lua_serializer.cpp
+++ b/engines/sword25/util/lua_serializer.cpp
@@ -23,44 +23,19 @@
 #include "sword25/util/lua_serialization.h"
 
 #include "sword25/util/double_serializer.h"
+#include "sword25/util/lua_serialization_util.h"
 
 #include "common/stream.h"
 
 #include "lua/lobject.h"
 #include "lua/lstate.h"
+#include "lua/lgc.h"
 
 
 namespace Lua {
 
-#define NUMTYPES 9
-
-static const char* typenames[] = {
-	"nil",
-	"boolean",
-	"lightuserdata",
-	"number",
-	"string",
-	"table",
-	"function",
-	"userdata",
-	"thread"
-};
-
 #define PERMANENT_TYPE 101
 
-/* A simple reimplementation of the unfortunately static function luaA_index.
- * Does not support the global table, registry, or upvalues. */
-static StkId getobject(lua_State *luaState, int stackpos) {
-	if(stackpos > 0) {
-		lua_assert(luaState->base+stackpos-1 < luaState->top);
-		return luaState->base+stackpos-1;
-	} else {
-		lua_assert(L->top-stackpos >= L->base);
-		return luaState->top+stackpos;
-	}
-}
-
-
 struct SerializationInfo {
 	lua_State *luaState;
 	Common::WriteStream *writeStream;
@@ -70,7 +45,6 @@ struct SerializationInfo {
 static void serializeObject(SerializationInfo *info);
 
 static void serializeBoolean(SerializationInfo *info);
-static void serializeLightUserData(SerializationInfo *info);
 static void serializeNumber(SerializationInfo *info);
 static void serializeString(SerializationInfo *info);
 static void serializeTable(SerializationInfo *info);
@@ -319,13 +293,15 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 	// Check whether we should persist literally, or via the __persist metafunction
 	if (!lua_getmetatable(info->luaState, -1)) {
 		if (defaction) {
-			// Write out a flag declaring that the metatable doesn't exist
+			// Write out a flag declaring that the object isn't special and should be persisted normally
 			info->writeStream->writeSint32LE(0);
 
 			return false;
 		} else {
 			lua_pushstring(info->luaState, "Type not literally persistable by default");
 			lua_error(info->luaState);
+
+			return false; // Not reached
 		}
 	}
 
@@ -342,21 +318,21 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 		// >>>>> permTbl indexTbl ...... obj
 
 		if (defaction) {
-			// Write out a flag declaring there is no persistence metafunction
+			// Write out a flag declaring that the object isn't special and should be persisted normally
 			info->writeStream->writeSint32LE(0);
 
-			return 0;
+			return false;
 		} else {
 			lua_pushstring(info->luaState, "Type not literally persistable by default");
 			lua_error(info->luaState);
 
-			return 0; /* not reached */
+			return false; // Return false
 		}
 
 	} else if (lua_isboolean(info->luaState, -1)) {
 		// >>>>> permTbl indexTbl ...... obj metaTbl bool
 		if (lua_toboolean(info->luaState, -1)) {
-			// Write out a flag declaring such
+			// Write out a flag declaring that the object isn't special and should be persisted normally
 			info->writeStream->writeSint32LE(0);
 
 			// >>>>> permTbl indexTbl ...... obj metaTbl true */
@@ -368,7 +344,7 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 			lua_pushstring(info->luaState, "Metatable forbade persistence");
 			lua_error(info->luaState);
 
-			return false; /* not reached */
+			return false; // Not reached
 		}
 	} else if (!lua_isfunction(info->luaState, -1)) {
 		lua_pushstring(info->luaState, "__persist not nil, boolean, or function");
@@ -460,40 +436,9 @@ static void serializeTable(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... tbl
 }
 
-static void pushObject(lua_State *luaState, TValue *obj) {
-	setobj2s(luaState, luaState->top, obj);
-
-	api_check(luaState, luaState->top < luaState->ci->top);
-	luaState->top++;
-}
-
-static void pushProto(lua_State *luaState, Proto *proto) {
-	TValue obj;
-	setptvalue(luaState, &obj, proto);
-
-	pushObject(luaState, &obj);
-}
-
-static void pushUpVal(lua_State *luaState, UpVal *upval) {
-	TValue obj;
-
-	obj.value.gc = cast(GCObject *, upval); 
-	obj.tt = LUA_TUPVAL;
-	checkliveness(G(L), obj);
-	
-	pushObject(luaState, &obj);
-}
-
-static void pushString(lua_State *luaState, TString *str) {
-	TValue o;
-	setsvalue(luaState, &o, str);
-
-	pushObject(luaState, &o);
-}
-
 static void serializeFunction(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... func
-	Closure *cl = clvalue(getobject(info->luaState, -1));
+	Closure *cl = clvalue(getObject(info->luaState, -1));
 	lua_checkstack(info->luaState, 2);
 
 	if (cl->c.isC) {
@@ -520,7 +465,7 @@ static void serializeFunction(SerializationInfo *info) {
 		// Serialize upvalue values (not the upvalue objects themselves)
 		for (byte i=0; i<cl->l.p->nups; i++) {
 			// >>>>> permTbl indexTbl ...... func
-			pushUpVal(info->luaState, cl->l.upvals[i]);
+			pushUpValue(info->luaState, cl->l.upvals[i]);
 			// >>>>> permTbl indexTbl ...... func upval
 
 			serializeObject(info);
@@ -580,7 +525,7 @@ static void serializeThread(SerializationInfo *info) {
 	// Persist the stack
 
 	// We *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
-	uint stackSize = static_cast<uint32>(appendStackToStack_rev(threadState, info->luaState));
+	uint32 stackSize = static_cast<uint32>(appendStackToStack_rev(threadState, info->luaState));
 	info->writeStream->writeUint32LE(stackSize);
 
 	// >>>>> permTbl indexTbl ...... thread (reversed contents of thread stack) */
@@ -644,7 +589,7 @@ static void serializeThread(SerializationInfo *info) {
 		/* Make sure upvalue is really open */
 		assert(upVal->v != &upVal->u.value);
 
-		pushUpVal(info->luaState, upVal);
+		pushUpValue(info->luaState, upVal);
 		// >>>>> permTbl indexTbl ...... thread upVal
 
 		serializeObject(info);
@@ -670,7 +615,7 @@ static void serializeThread(SerializationInfo *info) {
 
 static void serializeProto(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... proto
-	Proto *proto = gco2p(getobject(info->luaState, -1)->value.gc);
+	Proto *proto = gco2p(getObject(info->luaState, -1)->value.gc);
 
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 2);
@@ -797,8 +742,8 @@ static void serializeProto(SerializationInfo *info) {
  */
 static void serializeUpValue(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... upval
-	assert(ttype(getobject(info->luaState, -1)) == LUA_TUPVAL);
-	UpVal *upValue = gco2uv(getobject(info->luaState, -1)->value.gc);
+	assert(ttype(getObject(info->luaState, -1)) == LUA_TUPVAL);
+	UpVal *upValue = gco2uv(getObject(info->luaState, -1)->value.gc);
 
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 1);
@@ -831,7 +776,7 @@ static void serializeUserData(SerializationInfo *info) {
 
 	// Hard cast to a uint32 length
 	// This could lead to truncation, but if we have a 4gb block of data, we have bigger problems
-	uint32 length = static_cast<uint32>(uvalue(getobject(info->luaState, -1))->len);
+	uint32 length = static_cast<uint32>(uvalue(getObject(info->luaState, -1))->len);
 	info->writeStream->writeUint32LE(length);
 
 	info->writeStream->write(lua_touserdata(info->luaState, -1), length);
-- 
cgit v1.2.3


From de20880d9d3dbe9ebbc26848d7a672c104495aeb Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Fri, 19 Dec 2014 13:41:58 -0600
Subject: SWORD25: Re-write the pluto unserializing function(s)

---
 engines/sword25/util/lua_serialization.h  |    2 +
 engines/sword25/util/lua_unserializer.cpp | 1007 +++++++++++++++++++++++++++++
 2 files changed, 1009 insertions(+)
 create mode 100644 engines/sword25/util/lua_unserializer.cpp

diff --git a/engines/sword25/util/lua_serialization.h b/engines/sword25/util/lua_serialization.h
index 0f0c3bd0b2..549ea7968d 100644
--- a/engines/sword25/util/lua_serialization.h
+++ b/engines/sword25/util/lua_serialization.h
@@ -28,6 +28,7 @@
 
 namespace Common {
 class WriteStream;
+class ReadStream;
 }
 
 
@@ -36,6 +37,7 @@ namespace Lua {
 #define PERMANENT_TYPE 101
 
 void serializeLua(lua_State *luaState, Common::WriteStream *writeStream);
+void unserializeLua(lua_State *luaState, Common::ReadStream *readStream);
 
 } // End of namespace Lua
 
diff --git a/engines/sword25/util/lua_unserializer.cpp b/engines/sword25/util/lua_unserializer.cpp
new file mode 100644
index 0000000000..c561a3d99f
--- /dev/null
+++ b/engines/sword25/util/lua_unserializer.cpp
@@ -0,0 +1,1007 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/lua_serialization.h"
+
+#include "sword25/util/double_serializer.h"
+#include "sword25/util/lua_serialization_util.h"
+
+#include "common/stream.h"
+
+#include "lua/lobject.h"
+#include "lua/lstate.h"
+#include "lua/lgc.h"
+#include "lua/lopcodes.h"
+
+
+namespace Lua {
+
+struct UnSerializationInfo {
+	lua_State *luaState;
+	Common::ReadStream *readStream;
+};
+
+static void unserializeObject(UnSerializationInfo *info);
+
+static void unserializeBoolean(UnSerializationInfo *info);
+static void unserializeNumber(UnSerializationInfo *info);
+static void unserializeString(UnSerializationInfo *info);
+static void unserializeTable(UnSerializationInfo *info, int index);
+static void unserializeFunction(UnSerializationInfo *info, int index);
+static void unserializeThread(UnSerializationInfo *info, int index);
+static void unserializeProto(UnSerializationInfo *info, int index);
+static void unserializeUpValue(UnSerializationInfo *info, int index);
+static void unserializeUserData(UnSerializationInfo *info, int index);
+static void unserializePermanent(UnSerializationInfo *info, int index);
+
+
+void unserializeLua(lua_State *luaState, Common::ReadStream *readStream) {
+	UnSerializationInfo info;
+	info.luaState = luaState;
+	info.readStream = readStream;
+
+	// The process starts with the lua stack as follows:
+	// >>>>> permTbl
+	// That's the table of permanents
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(luaState, 3);
+
+	// Create a table to hold indexes of everything thats already been read
+	lua_newtable(luaState);
+	// >>>>> permTbl indexTbl
+
+	// Prevent garbage collection while we unserialize
+	lua_gc(luaState, LUA_GCSTOP, 0);
+
+	// Unserialize the root object
+	unserializeObject(&info);
+	// >>>>> permTbl indexTbl rootObj
+
+	// Re-start garbage collection
+	lua_gc(luaState, LUA_GCRESTART, 0);
+	
+	// Remove the indexTbl
+	lua_replace(luaState, 2);
+	// >>>>> permTbl rootObj
+}
+
+/* The object is left on the stack. This is primarily used by unpersist, but
+ * may be used by GCed objects that may incur cycles in order to preregister
+ * the object. */
+static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ...... obj
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	lua_pushlightuserdata(info->luaState, (void *)index);
+	// >>>>> permTbl indexTbl ...... obj index
+
+	lua_pushvalue(info->luaState, -2);
+	// >>>>> permTbl indexTbl ...... obj index obj
+
+	// Push the k/v pair into the indexTbl
+	lua_settable(info->luaState, 2);
+	// >>>>> permTbl indexTbl ...... obj
+}
+
+static void unserializeObject(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... 
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	byte isARealValue = info->readStream->readByte();
+	if(isARealValue) {
+		int index = info->readStream->readSint32LE();
+		int type = info->readStream->readSint32LE();
+
+		switch(type) {
+		case LUA_TBOOLEAN:
+			unserializeBoolean(info);
+			break;
+		case LUA_TLIGHTUSERDATA:
+			// You can't serialize a pointer
+			// It would be meaningless on the next run
+			assert(0);
+			break;
+		case LUA_TNUMBER:
+			unserializeNumber(info);
+			break;
+		case LUA_TSTRING:
+			unserializeString(info);
+			break;
+		case LUA_TTABLE:
+			unserializeTable(info, index);
+			break;
+		case LUA_TFUNCTION:
+			unserializeFunction(info, index);
+			break;
+		case LUA_TTHREAD:
+			unserializeThread(info, index);
+			break;
+		case LUA_TPROTO:
+			unserializeProto(info, index);
+			break;
+		case LUA_TUPVAL:
+			unserializeUpValue(info, index);
+			break;
+		case LUA_TUSERDATA:
+			unserializeUserData(info, index);
+			break;
+		case PERMANENT_TYPE:
+			unserializePermanent(info, index);
+			break;
+		default:
+			assert(0);
+		}
+
+		
+		// >>>>> permTbl indexTbl ...... obj
+		assert(lua_type(info->luaState, -1) == type || 
+		       type == PERMANENT_TYPE ||
+		       // Remember, upvalues get a special dispensation, as described in boxUpValue
+		       (lua_type(info->luaState, -1) == LUA_TFUNCTION && type == LUA_TUPVAL));
+
+		registerObjectInIndexTable(info, index);
+		// >>>>> permTbl indexTbl ...... obj
+	} else {
+		int index = info->readStream->readSint32LE();
+
+		if(index == 0) {
+			lua_pushnil(info->luaState);
+			// >>>>> permTbl indexTbl ...... nil
+		} else {
+			// Fetch the object from the indexTbl
+
+			lua_pushlightuserdata(info->luaState, (void *)index);
+			// >>>>> permTbl indexTbl ...... index
+
+			lua_gettable(info->luaState, 2);
+			// >>>>> permTbl indexTbl ...... ?obj?
+
+			assert(!lua_isnil(info->luaState, -1));
+		}
+		// >>>>> permTbl indexTbl ...... obj/nil
+	}
+	
+	// >>>>> permTbl indexTbl ...... obj/nil
+}
+
+static void unserializeBoolean(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	int value = info->readStream->readSint32LE();
+
+	lua_pushboolean(info->luaState, value);
+	// >>>>> permTbl indexTbl ...... bool
+}
+
+static void unserializeNumber(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... 
+	
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	// Read the serialized double
+	Util::SerializedDouble serializedValue;
+	serializedValue.significandOne = info->readStream->readUint32LE();
+	serializedValue.signAndSignificandTwo = info->readStream->readUint32LE();
+	serializedValue.exponent = info->readStream->readSint16LE();
+
+	lua_Number value = Util::decodeDouble(serializedValue);
+
+	lua_pushnumber(info->luaState, value);
+	// >>>>> permTbl indexTbl ...... num
+}
+
+static void unserializeString(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ......
+	
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	uint32 length = info->readStream->readUint32LE();
+	char *string = new char[length];
+
+	info->readStream->read(string, length);
+	lua_pushlstring(info->luaState, string, length);
+
+	// >>>>> permTbl indexTbl ...... string
+	
+	delete[] string;
+}
+
+static void unserializeSpecialTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	unserializeObject(info);
+
+	// >>>>> permTbl indexTbl ...... spfunc
+	lua_call(info->luaState, 0, 1);
+	// >>>>> permTbl indexTbl ...... tbl
+}
+
+static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 3);
+
+	// Preregister table for handling of cycles
+	lua_newtable(info->luaState);
+
+	// >>>>> permTbl indexTbl ...... tbl
+	registerObjectInIndexTable(info, index);
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// Unserialize metatable
+	unserializeObject(info);
+	// >>>>> permTbl indexTbl ...... tbl ?metaTbl/nil?
+	
+	if (lua_istable(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... tbl metaTbl
+		lua_setmetatable(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... tbl
+	} else {
+		// >>>>> permTbl indexTbl ...... tbl nil
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... tbl
+	}
+	// >>>>> permTbl indexTbl ...... tbl
+
+
+	while (1) {
+		// >>>>> permTbl indexTbl ...... tbl
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... tbl key/nil
+
+		// The table serialization is nil terminated
+		if (lua_isnil(info->luaState, -1)) {
+			// >>>>> permTbl indexTbl ...... tbl nil
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... tbl
+
+			break;
+		}
+
+		// >>>>> permTbl indexTbl ...... tbl key
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... tbl value
+
+		lua_rawset(info->luaState, -3);
+		// >>>>> permTbl indexTbl ...... tbl
+	}
+}
+
+void unserializeTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	int isSpecial = info->readStream->readSint32LE();
+
+	if (isSpecial) {
+		unserializeSpecialTable(info, index);
+		// >>>>> permTbl indexTbl ...... tbl
+	} else {
+		unserializeLiteralTable(info, index);
+		// >>>>> permTbl indexTbl ...... tbl
+	}
+}
+
+
+
+void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize) {
+	global_State *globalState = G(luaState);
+
+	block = (*globalState->frealloc)(globalState->ud, block, osize, nsize);
+	globalState->totalbytes = (globalState->totalbytes - osize) + nsize;
+
+	return block;
+}
+
+#define lua_malloc(luaState, nsize) lua_realloc(luaState, nullptr, 0, nsize)
+#define lua_reallocv(luaState, block, on, n, e) lua_realloc(luaState, block, (on) * (e), (n) * (e))
+#define lua_reallocvector(luaState, vec, oldn, n, T) ((vec) = (T *)(lua_reallocv(luaState, vec, oldn, n, sizeof(T))))
+#define lua_newVector(luaState, num, T) ((T *)lua_reallocv(luaState, nullptr, 0, num, sizeof(T)))
+#define lua_new(luaState,T) (T *)lua_malloc(luaState, sizeof(T))
+
+void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type) {
+	global_State *globalState = G(luaState);
+
+	obj->gch.next = globalState->rootgc;
+	globalState->rootgc = obj;
+	obj->gch.marked = luaC_white(globalState);
+	obj->gch.tt = type;
+}
+
+#define sizeLclosure(n)	((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
+
+Closure *newLClosure(lua_State *luaState, byte numUpValues, Table *env) {
+	Closure *newClosure = (Closure *)lua_malloc(luaState, sizeLclosure(numUpValues));
+
+	lua_linkObjToGC(luaState, obj2gco(newClosure), LUA_TFUNCTION);
+
+	newClosure->l.isC = 0;
+	newClosure->l.env = env;
+	newClosure->l.nupvalues = numUpValues;
+
+	while (numUpValues--) {
+		newClosure->l.upvals[numUpValues] = NULL; 
+	}
+
+	return newClosure;
+}
+
+static void pushClosure(lua_State *luaState, Closure *closure) {
+	TValue obj;
+	setclvalue(luaState, &obj, closure);
+	pushObject(luaState, &obj);
+}
+
+Proto *createProto(lua_State *luaState) {
+	Proto *newProto = (Proto *)lua_malloc(luaState, sizeof(Proto));
+	lua_linkObjToGC(luaState, obj2gco(newProto), LUA_TPROTO);
+
+	newProto->k = NULL;
+	newProto->sizek = 0;
+	newProto->p = NULL;
+	newProto->sizep = 0;
+	newProto->code = NULL;
+	newProto->sizecode = 0;
+	newProto->sizelineinfo = 0;
+	newProto->sizeupvalues = 0;
+	newProto->nups = 0;
+	newProto->upvalues = NULL;
+	newProto->numparams = 0;
+	newProto->is_vararg = 0;
+	newProto->maxstacksize = 0;
+	newProto->lineinfo = NULL;
+	newProto->sizelocvars = 0;
+	newProto->locvars = NULL;
+	newProto->linedefined = 0;
+	newProto->lastlinedefined = 0;
+	newProto->source = NULL;
+
+	return newProto;
+}
+
+TString *createString(lua_State *luaState, const char *str, size_t len) {
+	TString *res;
+	lua_pushlstring(luaState, str, len);
+
+	res = rawtsvalue(luaState->top - 1);
+	lua_pop(luaState, 1);
+
+	return res;
+}
+
+static Proto *makeFakeProto(lua_State *L, lu_byte nups) {
+	Proto *p = createProto(L);
+
+	p->sizelineinfo = 1;
+	p->lineinfo = lua_newVector(L, 1, int);
+	p->lineinfo[0] = 1;
+	p->sizecode = 1;
+	p->code = lua_newVector(L, 1, Instruction);
+	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
+	p->source = createString(L, "", 0);
+	p->maxstacksize = 2;
+	p->nups = nups;
+	p->sizek = 0;
+	p->sizep = 0;
+
+	return p;
+}
+
+static UpVal *createUpValue(lua_State *luaState, int stackpos) {
+	UpVal *upValue = (UpVal *)lua_malloc(luaState, sizeof(UpVal));
+	lua_linkObjToGC(luaState, (GCObject *)upValue, LUA_TUPVAL);
+	upValue->tt = LUA_TUPVAL;
+	upValue->v = &upValue->u.value;
+	upValue->u.l.prev = NULL;
+	upValue->u.l.next = NULL;
+
+	const TValue *o2 = (TValue *)getObject(luaState, stackpos);
+	upValue->v->value = o2->value; upValue->v->tt = o2->tt;
+	checkliveness(G(L), upValue->v);
+
+	return upValue;
+}
+
+static void unboxUpValue(lua_State *luaState) {
+	// >>>>> ...... func
+	LClosure *lcl;
+	UpVal *uv;
+
+	lcl = (LClosure *)clvalue(getObject(luaState, -1));
+	uv = lcl->upvals[0];
+
+	lua_pop(luaState, 1);
+	// >>>>> ......
+
+	pushUpValue(luaState, uv);
+	// >>>>> ...... upValue
+}
+
+void unserializeFunction(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	byte numUpValues = info->readStream->readByte();
+
+	LClosure *lclosure = (LClosure *)newLClosure(info->luaState, numUpValues, hvalue(&info->luaState->l_gt));
+	pushClosure(info->luaState, (Closure *)lclosure);
+	// >>>>> permTbl indexTbl ...... func
+
+	// Put *some* proto in the closure, before the GC can find it
+	lclosure->p = makeFakeProto(info->luaState, numUpValues);
+
+	//Also, we need to temporarily fill the upvalues
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... func nil
+
+	for(byte i = 0; i < numUpValues; ++i) {
+		lclosure->upvals[i] = createUpValue(info->luaState, -1);
+	}
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... func
+
+	// I can't see offhand how a function would ever get to be self-
+	// referential, but just in case let's register it early
+	registerObjectInIndexTable(info, index);
+
+	// Now that it's safe, we can get the real proto
+	unserializeObject(info);
+	// >>>>> permTbl indexTbl ...... func proto
+
+	lclosure->p = gco2p(getObject(info->luaState, -1)->value.gc);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... func
+
+	for(byte i = 0; i < numUpValues; ++i) {
+		// >>>>> permTbl indexTbl ...... func
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... func func2
+
+		unboxUpValue(info->luaState);
+		// >>>>> permTbl indexTbl ...... func upValue
+		lclosure->upvals[i] = gco2uv(getObject(info->luaState, -1)->value.gc);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+	}
+
+	// Finally, the fenv
+	unserializeObject(info);
+
+	// >>>>> permTbl indexTbl ...... func ?fenv/nil?
+	if(!lua_isnil(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... func fenv
+		lua_setfenv(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... func
+	} else {
+		// >>>>> permTbl indexTbl ...... func nil
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+	}
+	
+	// >>>>> permTbl indexTbl ...... func
+}
+
+static void correctStack(lua_State *L, TValue *oldstack) {
+	CallInfo *ci;
+	GCObject *up;
+	L->top = (L->top - oldstack) + L->stack;
+	for (up = L->openupval; up != NULL; up = up->gch.next)
+		gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
+	for (ci = L->base_ci; ci <= L->ci; ci++) {
+		ci->top = (ci->top - oldstack) + L->stack;
+		ci->base = (ci->base - oldstack) + L->stack;
+		ci->func = (ci->func - oldstack) + L->stack;
+	}
+	L->base = (L->base - oldstack) + L->stack;
+}
+
+void lua_reallocstack(lua_State *L, int newsize) {
+	TValue *oldstack = L->stack;
+	int realsize = newsize + 1 + EXTRA_STACK;
+
+	lua_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
+	L->stacksize = realsize;
+	L->stack_last = L->stack + newsize;
+	correctStack(L, oldstack);
+}
+
+void lua_growstack(lua_State *L, int n) {
+	// Double size is enough?
+	if (n <= L->stacksize) { 
+		lua_reallocstack(L, 2 * L->stacksize);
+	} else {
+		lua_reallocstack(L, L->stacksize + n);
+	}
+}
+
+void lua_reallocCallInfo(lua_State *lauState, int newsize) {
+	CallInfo *oldci = lauState->base_ci;
+	lua_reallocvector(lauState, lauState->base_ci, lauState->size_ci, newsize, CallInfo);
+
+	lauState->size_ci = newsize;
+	lauState->ci = (lauState->ci - oldci) + lauState->base_ci;
+	lauState->end_ci = lauState->base_ci + lauState->size_ci - 1;
+}
+
+void unboxUpVal(lua_State *luaState) {
+	// >>>>> ... func
+	LClosure *lcl;
+	UpVal *uv;
+
+	lcl = (LClosure *)(&getObject(luaState, -1)->value.gc->cl);
+	uv = lcl->upvals[0];
+	lua_pop(luaState, 1);
+	// >>>>> ...
+	pushUpValue(luaState, uv);
+	// >>>>> ... upVal
+}
+
+/* Does basically the opposite of luaC_link().
+ * Right now this function is rather inefficient; it requires traversing the
+ * entire root GC set in order to find one object. If the GC list were doubly
+ * linked this would be much easier, but there's no reason for Lua to have
+ * that. */
+static void GCUnlink(lua_State *luaState, GCObject *gco) {
+	GCObject *prevslot;
+	if(G(luaState)->rootgc == gco) {
+		G(luaState)->rootgc = G(luaState)->rootgc->gch.next;
+		return;
+	}
+
+	prevslot = G(luaState)->rootgc;
+	while(prevslot->gch.next != gco) {
+		prevslot = prevslot->gch.next;
+	}
+
+	prevslot->gch.next = prevslot->gch.next->gch.next;
+}
+
+void unserializeThread(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	lua_State *L2;
+	uint32 stacklimit = 0;
+
+	L2 = lua_newthread(info->luaState);
+	lua_checkstack(info->luaState, 3);
+	
+	// L1: permTbl indexTbl ...... thread
+	// L2: (empty)
+	registerObjectInIndexTable(info, index);
+
+	// First, deserialize the object stack
+	uint32 stackSize = info->readStream->readUint32LE();
+	lua_growstack(info->luaState, (int)stackSize);
+	
+	// Make sure that the first stack element (a nil, representing
+	// the imaginary top-level C function) is written to the very,
+	// very bottom of the stack
+	L2->top--;
+	for(uint32 i = 0; i < stackSize; ++i) {
+		unserializeObject(info);
+		// L1: permTbl indexTbl ...... thread obj* 
+	}
+
+	lua_xmove(info->luaState, L2, stackSize);
+	// L1: permTbl indexTbl ...... thread
+	// L2: obj*
+
+	// Hereafter, stacks refer to L1
+
+	
+	// Now, deserialize the CallInfo stack
+
+	uint32 numFrames = info->readStream->readUint32LE();
+
+	lua_reallocCallInfo(L2, numFrames*2);
+	for(uint32 i = 0; i < numFrames; ++i) {
+		CallInfo *ci = L2->base_ci + i;
+		uint32 stackbase = info->readStream->readUint32LE();
+		uint32 stackfunc = info->readStream->readUint32LE();
+		uint32 stacktop = info->readStream->readUint32LE();
+		
+		ci->nresults = info->readStream->readSint32LE();
+
+		uint32 savedpc = info->readStream->readUint32LE();
+
+		if (stacklimit < stacktop) {
+			stacklimit = stacktop;
+		}
+
+		ci->base = L2->stack + stackbase;
+		ci->func = L2->stack + stackfunc;
+		ci->top = L2->stack + stacktop;
+		ci->savedpc = (ci != L2->base_ci) ? ci_func(ci)->l.p->code + savedpc : 0;
+		ci->tailcalls = 0;
+		
+		// Update the pointer each time, to keep the GC happy
+		L2->ci = ci;
+	}
+
+	// >>>>> permTbl indexTbl ...... thread
+	// Deserialize the state's other parameters, with the exception of upval stuff
+
+	L2->savedpc = L2->ci->savedpc;
+	L2->status = info->readStream->readByte();
+	uint32 stackbase = info->readStream->readUint32LE();
+	uint32 stacktop = info->readStream->readUint32LE();
+
+
+	L2->errfunc = info->readStream->readUint32LE();
+	
+	L2->base = L2->stack + stackbase;
+	L2->top = L2->stack + stacktop;
+
+	// Finally, "reopen" upvalues. See serializeUpVal() for why we do this		
+	UpVal* uv;
+	GCObject **nextslot = &L2->openupval;
+	global_State *g = G(L2);
+
+	while (true) {
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... thread upVal/nil
+
+		// The list is terminated by a nil
+		if (lua_isnil(info->luaState, -1)) {
+			// >>>>> permTbl indexTbl ...... thread nil
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... thread
+			break;
+		}
+		
+		// >>>>> permTbl indexTbl ...... thread boxedUpVal
+		unboxUpVal(info->luaState);
+		// >>>>> permTbl indexTbl ...... thread boxedUpVal
+
+		uv = &(getObject(info->luaState, -1)->value.gc->uv);
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... thread
+
+		uint32 stackpos = info->readStream->readUint32LE();
+		uv->v = L2->stack + stackpos;
+
+		GCUnlink(info->luaState, (GCObject *)uv);
+
+		uv->marked = luaC_white(g);
+		*nextslot = (GCObject *)uv;
+		nextslot = &uv->next;
+		uv->u.l.prev = &G(L2)->uvhead;
+		uv->u.l.next = G(L2)->uvhead.u.l.next;
+		uv->u.l.next->u.l.prev = uv;
+		G(L2)->uvhead.u.l.next = uv;
+		lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+	}
+	*nextslot = NULL;
+
+	// The stack must be valid at least to the highest value among the CallInfos
+	// 'top' and the values up to there must be filled with 'nil'
+	lua_checkstack(L2, (int)stacklimit);
+	for (StkId o = L2->top; o <= L2->top + stacklimit; ++o) {
+		setnilvalue(o);
+	}
+}
+
+TString *lua_newlstr(lua_State *luaState, const char *str, size_t len) {
+	lua_pushlstring(luaState, str, len);
+	TString *luaStr = &(luaState->top - 1)->value.gc->ts;
+
+	lua_pop(luaState, 1);
+
+	return luaStr;
+}
+
+void lua_link(lua_State *luaState, GCObject *o, lu_byte tt) {
+	global_State *g = G(luaState);
+	o->gch.next = g->rootgc;
+	g->rootgc = o;
+	o->gch.marked = luaC_white(g);
+	o->gch.tt = tt;
+}
+
+Proto *lua_newproto(lua_State *luaState) {
+	Proto *f = (Proto *)lua_malloc(luaState, sizeof(Proto));
+	lua_link(luaState, obj2gco(f), LUA_TPROTO);
+	f->k = NULL;
+	f->sizek = 0;
+	f->p = NULL;
+	f->sizep = 0;
+	f->code = NULL;
+	f->sizecode = 0;
+	f->sizelineinfo = 0;
+	f->sizeupvalues = 0;
+	f->nups = 0;
+	f->upvalues = NULL;
+	f->numparams = 0;
+	f->is_vararg = 0;
+	f->maxstacksize = 0;
+	f->lineinfo = NULL;
+	f->sizelocvars = 0;
+	f->locvars = NULL;
+	f->linedefined = 0;
+	f->lastlinedefined = 0;
+	f->source = NULL;
+	return f;
+}
+
+void unserializeProto(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+	
+	// We have to be careful. The GC expects a lot out of protos. In particular, we need 
+	// to give the function a valid string for its source, and valid code, even before we 
+	// actually read in the real code. 
+	TString *source = lua_newlstr(info->luaState, "", 0);
+	Proto *p = lua_newproto(info->luaState);
+	p->source = source;
+	p->sizecode=1;
+	p->code =  (Instruction *)lua_reallocv(info->luaState, NULL, 0, 1, sizeof(Instruction));
+	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
+	p->maxstacksize = 2;
+	p->sizek = 0;
+	p->sizep = 0;
+
+	lua_checkstack(info->luaState, 2);
+
+	pushProto(info->luaState, p);
+	// >>>>> permTbl indexTbl ...... proto 
+
+	// We don't need to register early, since protos can never ever be
+	// involved in cyclic references 
+
+	// Read in constant references
+	int sizek = info->readStream->readSint32LE();
+	lua_reallocvector(info->luaState, p->k, 0, sizek, TValue);
+	for(int i = 0; i < sizek; ++i) {
+		// >>>>> permTbl indexTbl ...... proto 
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... proto  k 
+
+		setobj2s(info->luaState, &p->k[i], getObject(info->luaState, -1));
+		p->sizek++;
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in sub-proto references
+
+	int sizep = info->readStream->readSint32LE();
+	lua_reallocvector(info->luaState, p->p, 0, sizep, Proto *);
+	for(int i = 0; i < sizep; ++i) {
+		// >>>>> permTbl indexTbl ...... proto 
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... proto  subproto
+
+		p->p[i] = (Proto *)getObject(info->luaState, -1)->value.gc;
+		p->sizep++;
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto 
+	}
+	// >>>>> permTbl indexTbl ...... proto 
+
+
+	// Read in code
+	p->sizecode = info->readStream->readSint32LE();
+	lua_reallocvector(info->luaState, p->code, 1, p->sizecode, Instruction);
+	info->readStream->read(p->code, sizeof(Instruction) * p->sizecode);
+	
+
+	/* Read in upvalue names */
+	p->sizeupvalues = info->readStream->readSint32LE();
+	if (p->sizeupvalues) {
+		lua_reallocvector(info->luaState, p->upvalues, 0, p->sizeupvalues, TString *);
+		for(int i = 0; i < p->sizeupvalues; ++i) {
+			// >>>>> permTbl indexTbl ...... proto
+			unserializeObject(info);
+			// >>>>> permTbl indexTbl ...... proto str
+
+			p->upvalues[i] = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... proto
+		}
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in local variable infos
+	p->sizelocvars = info->readStream->readSint32LE();
+	if (p->sizelocvars) {
+		lua_reallocvector(info->luaState, p->locvars, 0, p->sizelocvars, LocVar);
+		for(int i = 0; i < p->sizelocvars; ++i) {
+			// >>>>> permTbl indexTbl ...... proto
+			unserializeObject(info);
+			// >>>>> permTbl indexTbl ...... proto str
+
+			p->locvars[i].varname = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... proto
+
+			p->locvars[i].startpc = info->readStream->readSint32LE();
+			p->locvars[i].endpc = info->readStream->readSint32LE();
+		}
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in source string
+	unserializeObject(info);
+	// >>>>> permTbl indexTbl ...... proto sourceStr
+
+	p->source = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in line numbers
+	p->sizelineinfo = info->readStream->readSint32LE();
+	if (p->sizelineinfo) {
+		lua_reallocvector(info->luaState, p->lineinfo, 0, p->sizelineinfo, int);
+		info->readStream->read(p->lineinfo, sizeof(int) * p->sizelineinfo);
+	}
+	
+
+	/* Read in linedefined and lastlinedefined */
+	p->linedefined = info->readStream->readSint32LE();
+	p->lastlinedefined = info->readStream->readSint32LE();
+
+	// Read in misc values
+	p->nups = info->readStream->readByte();
+	p->numparams = info->readStream->readByte();
+	p->is_vararg = info->readStream->readByte();
+	p->maxstacksize = info->readStream->readByte();
+}
+
+Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable) {
+	Closure *c = (Closure *)lua_malloc(luaState, sizeLclosure(numElements));
+	lua_link(luaState, obj2gco(c), LUA_TFUNCTION);
+	c->l.isC = 0;
+	c->l.env = elementTable;
+	c->l.nupvalues = cast_byte(numElements);
+	
+	while (numElements--) {
+		c->l.upvals[numElements] = NULL;
+	}
+
+	return c;
+}
+
+static UpVal *makeUpVal(lua_State *luaState, int stackPos) {
+	UpVal *uv = lua_new(luaState, UpVal);
+	lua_link(luaState, (GCObject *)uv, LUA_TUPVAL);
+	uv->tt = LUA_TUPVAL;
+	uv->v = &uv->u.value;
+	uv->u.l.prev = NULL;
+	uv->u.l.next = NULL;
+
+	setobj(luaState, uv->v, getObject(luaState, stackPos));
+
+	return uv;
+}
+
+/** 
+ * The GC is not fond of finding upvalues in tables. We get around this
+ * during persistence using a weakly keyed table, so that the GC doesn't
+ * bother to mark them. This won't work in unpersisting, however, since
+ * if we make the values weak they'll be collected (since nothing else
+ * references them). Our solution, during unpersisting, is to represent
+ * upvalues as dummy functions, each with one upvalue. 
+ */
+static void boxupval_start(lua_State *luaState) {
+	LClosure *closure;
+	closure = (LClosure *)lua_newLclosure(luaState, 1, hvalue(&luaState->l_gt));
+	pushClosure(luaState, (Closure *)closure);
+	// >>>>> ...... func
+	closure->p = makeFakeProto(luaState, 1);
+
+	// Temporarily initialize the upvalue to nil 
+	lua_pushnil(luaState);
+	closure->upvals[0] = makeUpVal(luaState, -1);
+	lua_pop(luaState, 1);
+}
+
+static void boxupval_finish(lua_State *luaState) {
+	// >>>>> ...... func obj
+	LClosure *lcl = (LClosure *)clvalue(getObject(luaState, -2));
+
+	lcl->upvals[0]->u.value = *getObject(luaState, -1);
+	lua_pop(luaState, 1);
+	// >>>>> ...... func
+}
+
+void unserializeUpValue(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ...... 
+	lua_checkstack(upi->L, 2);
+
+	boxupval_start(upi->L);
+	// >>>>> permTbl indexTbl ...... func
+	registerObjectInIndexTable(info, index);
+
+	unserializeObject(info);
+	// >>>>> permTbl indexTbl ...... func obj
+
+	boxupval_finish(upi->L);
+	// >>>>> permTbl indexTbl ...... func
+}
+
+void unserializeUserData(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+	
+	int isspecial = info->readStream->readSint32LE();
+	if(isspecial) {
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... specialFunc
+
+		lua_call(info->luaState, 0, 1);
+		// >>>>> permTbl indexTbl ...... udata
+	} else {
+		uint32 length = info->readStream->readUint32LE();
+		lua_newuserdata(info->luaState, length);
+		// >>>>> permTbl indexTbl ...... udata
+		registerObjectInIndexTable(info, index);
+
+		info->readStream->read(lua_touserdata(upi->L, -1), length);
+
+		unserializeObject(info);
+		// >>>>> permTbl indexTbl ...... udata metaTable/nil
+
+		lua_setmetatable(upi->L, -2);
+		// >>>>> permTbl indexTbl ...... udata
+	}
+	// >>>>> permTbl indexTbl ...... udata
+}
+
+void unserializePermanent(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+	
+	unserializeObject(info);
+	// >>>>> permTbl indexTbl ...... permKey
+
+	lua_gettable(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... perm
+}
+
+} // End of namespace Lua
-- 
cgit v1.2.3


From 2c7a87a4e3181f228c43b92ffb15ae47401f64a7 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Fri, 19 Dec 2014 14:51:00 -0600
Subject: SWORD25: Fix code formatting

... with AStyle
---
 engines/sword25/util/lua_serialization_util.cpp |  10 +-
 engines/sword25/util/lua_serializer.cpp         |  62 ++++++------
 engines/sword25/util/lua_unserializer.cpp       | 127 ++++++++++++------------
 3 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/engines/sword25/util/lua_serialization_util.cpp b/engines/sword25/util/lua_serialization_util.cpp
index 80009aff60..80c5f86b20 100644
--- a/engines/sword25/util/lua_serialization_util.cpp
+++ b/engines/sword25/util/lua_serialization_util.cpp
@@ -65,12 +65,12 @@ void pushString(lua_State *luaState, TString *str) {
 /* A simple reimplementation of the unfortunately static function luaA_index.
  * Does not support the global table, registry, or upvalues. */
 StkId getObject(lua_State *luaState, int stackpos) {
-	if(stackpos > 0) {
-		lua_assert(luaState->base+stackpos-1 < luaState->top);
-		return luaState->base+stackpos-1;
+	if (stackpos > 0) {
+		lua_assert(luaState->base + stackpos - 1 < luaState->top);
+		return luaState->base + stackpos - 1;
 	} else {
-		lua_assert(L->top-stackpos >= L->base);
-		return luaState->top+stackpos;
+		lua_assert(L->top - stackpos >= L->base);
+		return luaState->top + stackpos;
 	}
 }
 
diff --git a/engines/sword25/util/lua_serializer.cpp b/engines/sword25/util/lua_serializer.cpp
index 8c61383fba..c6c5f99342 100644
--- a/engines/sword25/util/lua_serializer.cpp
+++ b/engines/sword25/util/lua_serializer.cpp
@@ -81,7 +81,7 @@ void serializeLua(lua_State *luaState, Common::WriteStream *writeStream) {
 	// GC from visiting it and trying to mark things it doesn't want to
 	// mark in tables, e.g. upvalues. All objects in the table are
 	// a priori reachable, so it doesn't matter that we do this.
-	
+
 	// Create the metatable
 	lua_newtable(luaState);
 	// >>>>> permTbl rootObj indexTbl metaTbl
@@ -253,22 +253,22 @@ static void serializeBoolean(SerializationInfo *info) {
 
 static void serializeNumber(SerializationInfo *info) {
 	lua_Number value = lua_tonumber(info->luaState, -1);
-	
-#if 1
-	Util::SerializedDouble serializedValue(Util::encodeDouble(value));
-
-	info->writeStream->writeUint32LE(serializedValue.significandOne);
-	info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
-	info->writeStream->writeSint16LE(serializedValue.exponent);
-#else
-	// NOTE: We need to store a double. Unfortunately, we have to accommodate endianness. 
-	// Also, I don't know if we can assume all compilers use IEEE double
-	// Therefore, I have chosen to store the double as a string. 
-	Common::String buffer = Common::String::format("%f", value);
-
-	info->writeStream->write(buffer.c_str(), buffer.size());
-#endif
-	
+
+	#if 1
+		Util::SerializedDouble serializedValue(Util::encodeDouble(value));
+
+		info->writeStream->writeUint32LE(serializedValue.significandOne);
+		info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
+		info->writeStream->writeSint16LE(serializedValue.exponent);
+	#else
+		// NOTE: We need to store a double. Unfortunately, we have to accommodate endianness.
+		// Also, I don't know if we can assume all compilers use IEEE double
+		// Therefore, I have chosen to store the double as a string.
+		Common::String buffer = Common::String::format("%f", value);
+
+		info->writeStream->write(buffer.c_str(), buffer.size());
+	#endif
+
 }
 
 static void serializeString(SerializationInfo *info) {
@@ -277,7 +277,7 @@ static void serializeString(SerializationInfo *info) {
 	uint32 length = static_cast<uint32>(lua_strlen(info->luaState, -1));
 	info->writeStream->writeUint32LE(length);
 
-	const char* str = lua_tostring(info->luaState, -1);
+	const char *str = lua_tostring(info->luaState, -1);
 	info->writeStream->write(str, length);
 }
 
@@ -350,7 +350,7 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 		lua_pushstring(info->luaState, "__persist not nil, boolean, or function");
 		lua_error(info->luaState);
 	}
-					
+
 	// >>>>> permTbl indexTbl ...... obj metaTbl __persist
 	lua_pushvalue(info->luaState, -3);
 	// >>>>> permTbl indexTbl ...... obj metaTbl __persist obj
@@ -369,7 +369,7 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 
 	// Serialize the function
 	serializeObject(info);
-					
+
 	lua_pop(info->luaState, 2);
 	// >>>>> permTbl indexTbl ...... obj
 
@@ -396,11 +396,11 @@ static void serializeTable(SerializationInfo *info) {
 
 	// >>>>> permTbl indexTbl ...... tbl metaTbl/nil */
 	serializeObject(info);
-	
+
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... tbl
 
-	
+
 	lua_pushnil(info->luaState);
 	// >>>>> permTbl indexTbl ...... tbl nil
 
@@ -456,14 +456,14 @@ static void serializeFunction(SerializationInfo *info) {
 		// Serialize the prototype
 		pushProto(info->luaState, cl->l.p);
 		// >>>>> permTbl indexTbl ...... func proto */
-		
+
 		serializeObject(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... func
-		
+
 		// Serialize upvalue values (not the upvalue objects themselves)
-		for (byte i=0; i<cl->l.p->nups; i++) {
+		for (byte i = 0; i < cl->l.p->nups; i++) {
 			// >>>>> permTbl indexTbl ...... func
 			pushUpValue(info->luaState, cl->l.upvals[i]);
 			// >>>>> permTbl indexTbl ...... func upval
@@ -536,7 +536,7 @@ static void serializeThread(SerializationInfo *info) {
 	}
 
 	// >>>>> permTbl indexTbl ...... thread
-	
+
 	// Now, serialize the CallInfo stack
 
 	// Again, we *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
@@ -550,7 +550,7 @@ static void serializeThread(SerializationInfo *info) {
 		uint32 stackBase = static_cast<uint32>(ci->base - threadState->stack);
 		uint32 stackFunc = static_cast<uint32>(ci->func - threadState->stack);
 		uint32 stackTop = static_cast<uint32>(ci->top - threadState->stack);
-		
+
 		info->writeStream->writeUint32LE(stackBase);
 		info->writeStream->writeUint32LE(stackFunc);
 		info->writeStream->writeUint32LE(stackTop);
@@ -560,7 +560,7 @@ static void serializeThread(SerializationInfo *info) {
 		uint32 savedpc = (ci != threadState->base_ci) ? static_cast<uint32>(ci->savedpc - ci_func(ci)->l.p->code) : 0u;
 		info->writeStream->writeUint32LE(savedpc);
 	}
-	
+
 
 	// Serialize the state's other parameters, with the exception of upval stuff
 
@@ -671,9 +671,9 @@ static void serializeProto(SerializationInfo *info) {
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
 	}
-	
 
-	// Serialize local variable infos 
+
+	// Serialize local variable infos
 	info->writeStream->writeSint32LE(proto->sizelocvars);
 
 	for (int i = 0; i < proto->sizelocvars; ++i) {
@@ -748,7 +748,7 @@ static void serializeUpValue(SerializationInfo *info) {
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 1);
 
-	// We can't permit the upValue to linger around on the stack, as Lua 
+	// We can't permit the upValue to linger around on the stack, as Lua
 	// will bail if its GC finds it.
 
 	lua_pop(info->luaState, 1);
diff --git a/engines/sword25/util/lua_unserializer.cpp b/engines/sword25/util/lua_unserializer.cpp
index c561a3d99f..69cb764dd2 100644
--- a/engines/sword25/util/lua_unserializer.cpp
+++ b/engines/sword25/util/lua_unserializer.cpp
@@ -79,7 +79,7 @@ void unserializeLua(lua_State *luaState, Common::ReadStream *readStream) {
 
 	// Re-start garbage collection
 	lua_gc(luaState, LUA_GCRESTART, 0);
-	
+
 	// Remove the indexTbl
 	lua_replace(luaState, 2);
 	// >>>>> permTbl rootObj
@@ -106,17 +106,17 @@ static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
 }
 
 static void unserializeObject(UnSerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... 
+	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 2);
 
 	byte isARealValue = info->readStream->readByte();
-	if(isARealValue) {
+	if (isARealValue) {
 		int index = info->readStream->readSint32LE();
 		int type = info->readStream->readSint32LE();
 
-		switch(type) {
+		switch (type) {
 		case LUA_TBOOLEAN:
 			unserializeBoolean(info);
 			break;
@@ -156,9 +156,9 @@ static void unserializeObject(UnSerializationInfo *info) {
 			assert(0);
 		}
 
-		
+
 		// >>>>> permTbl indexTbl ...... obj
-		assert(lua_type(info->luaState, -1) == type || 
+		assert(lua_type(info->luaState, -1) == type ||
 		       type == PERMANENT_TYPE ||
 		       // Remember, upvalues get a special dispensation, as described in boxUpValue
 		       (lua_type(info->luaState, -1) == LUA_TFUNCTION && type == LUA_TUPVAL));
@@ -168,7 +168,7 @@ static void unserializeObject(UnSerializationInfo *info) {
 	} else {
 		int index = info->readStream->readSint32LE();
 
-		if(index == 0) {
+		if (index == 0) {
 			lua_pushnil(info->luaState);
 			// >>>>> permTbl indexTbl ...... nil
 		} else {
@@ -184,7 +184,7 @@ static void unserializeObject(UnSerializationInfo *info) {
 		}
 		// >>>>> permTbl indexTbl ...... obj/nil
 	}
-	
+
 	// >>>>> permTbl indexTbl ...... obj/nil
 }
 
@@ -201,8 +201,8 @@ static void unserializeBoolean(UnSerializationInfo *info) {
 }
 
 static void unserializeNumber(UnSerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... 
-	
+	// >>>>> permTbl indexTbl ......
+
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 1);
 
@@ -220,7 +220,7 @@ static void unserializeNumber(UnSerializationInfo *info) {
 
 static void unserializeString(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ......
-	
+
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 1);
 
@@ -231,7 +231,7 @@ static void unserializeString(UnSerializationInfo *info) {
 	lua_pushlstring(info->luaState, string, length);
 
 	// >>>>> permTbl indexTbl ...... string
-	
+
 	delete[] string;
 }
 
@@ -264,7 +264,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 	// Unserialize metatable
 	unserializeObject(info);
 	// >>>>> permTbl indexTbl ...... tbl ?metaTbl/nil?
-	
+
 	if (lua_istable(info->luaState, -1)) {
 		// >>>>> permTbl indexTbl ...... tbl metaTbl
 		lua_setmetatable(info->luaState, -2);
@@ -343,7 +343,7 @@ void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type) {
 	obj->gch.tt = type;
 }
 
-#define sizeLclosure(n)	((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
+#define sizeLclosure(n) ((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
 
 Closure *newLClosure(lua_State *luaState, byte numUpValues, Table *env) {
 	Closure *newClosure = (Closure *)lua_malloc(luaState, sizeLclosure(numUpValues));
@@ -355,7 +355,7 @@ Closure *newLClosure(lua_State *luaState, byte numUpValues, Table *env) {
 	newClosure->l.nupvalues = numUpValues;
 
 	while (numUpValues--) {
-		newClosure->l.upvals[numUpValues] = NULL; 
+		newClosure->l.upvals[numUpValues] = NULL;
 	}
 
 	return newClosure;
@@ -431,7 +431,8 @@ static UpVal *createUpValue(lua_State *luaState, int stackpos) {
 	upValue->u.l.next = NULL;
 
 	const TValue *o2 = (TValue *)getObject(luaState, stackpos);
-	upValue->v->value = o2->value; upValue->v->tt = o2->tt;
+	upValue->v->value = o2->value;
+	upValue->v->tt = o2->tt;
 	checkliveness(G(L), upValue->v);
 
 	return upValue;
@@ -471,7 +472,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	lua_pushnil(info->luaState);
 	// >>>>> permTbl indexTbl ...... func nil
 
-	for(byte i = 0; i < numUpValues; ++i) {
+	for (byte i = 0; i < numUpValues; ++i) {
 		lclosure->upvals[i] = createUpValue(info->luaState, -1);
 	}
 
@@ -491,7 +492,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... func
 
-	for(byte i = 0; i < numUpValues; ++i) {
+	for (byte i = 0; i < numUpValues; ++i) {
 		// >>>>> permTbl indexTbl ...... func
 		unserializeObject(info);
 		// >>>>> permTbl indexTbl ...... func func2
@@ -508,7 +509,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	unserializeObject(info);
 
 	// >>>>> permTbl indexTbl ...... func ?fenv/nil?
-	if(!lua_isnil(info->luaState, -1)) {
+	if (!lua_isnil(info->luaState, -1)) {
 		// >>>>> permTbl indexTbl ...... func fenv
 		lua_setfenv(info->luaState, -2);
 		// >>>>> permTbl indexTbl ...... func
@@ -517,7 +518,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... func
 	}
-	
+
 	// >>>>> permTbl indexTbl ...... func
 }
 
@@ -547,7 +548,7 @@ void lua_reallocstack(lua_State *L, int newsize) {
 
 void lua_growstack(lua_State *L, int n) {
 	// Double size is enough?
-	if (n <= L->stacksize) { 
+	if (n <= L->stacksize) {
 		lua_reallocstack(L, 2 * L->stacksize);
 	} else {
 		lua_reallocstack(L, L->stacksize + n);
@@ -583,13 +584,13 @@ void unboxUpVal(lua_State *luaState) {
  * that. */
 static void GCUnlink(lua_State *luaState, GCObject *gco) {
 	GCObject *prevslot;
-	if(G(luaState)->rootgc == gco) {
+	if (G(luaState)->rootgc == gco) {
 		G(luaState)->rootgc = G(luaState)->rootgc->gch.next;
 		return;
 	}
 
 	prevslot = G(luaState)->rootgc;
-	while(prevslot->gch.next != gco) {
+	while (prevslot->gch.next != gco) {
 		prevslot = prevslot->gch.next;
 	}
 
@@ -604,7 +605,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 
 	L2 = lua_newthread(info->luaState);
 	lua_checkstack(info->luaState, 3);
-	
+
 	// L1: permTbl indexTbl ...... thread
 	// L2: (empty)
 	registerObjectInIndexTable(info, index);
@@ -612,14 +613,14 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	// First, deserialize the object stack
 	uint32 stackSize = info->readStream->readUint32LE();
 	lua_growstack(info->luaState, (int)stackSize);
-	
+
 	// Make sure that the first stack element (a nil, representing
 	// the imaginary top-level C function) is written to the very,
 	// very bottom of the stack
 	L2->top--;
-	for(uint32 i = 0; i < stackSize; ++i) {
+	for (uint32 i = 0; i < stackSize; ++i) {
 		unserializeObject(info);
-		// L1: permTbl indexTbl ...... thread obj* 
+		// L1: permTbl indexTbl ...... thread obj*
 	}
 
 	lua_xmove(info->luaState, L2, stackSize);
@@ -628,18 +629,18 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 
 	// Hereafter, stacks refer to L1
 
-	
+
 	// Now, deserialize the CallInfo stack
 
 	uint32 numFrames = info->readStream->readUint32LE();
 
-	lua_reallocCallInfo(L2, numFrames*2);
-	for(uint32 i = 0; i < numFrames; ++i) {
+	lua_reallocCallInfo(L2, numFrames * 2);
+	for (uint32 i = 0; i < numFrames; ++i) {
 		CallInfo *ci = L2->base_ci + i;
 		uint32 stackbase = info->readStream->readUint32LE();
 		uint32 stackfunc = info->readStream->readUint32LE();
 		uint32 stacktop = info->readStream->readUint32LE();
-		
+
 		ci->nresults = info->readStream->readSint32LE();
 
 		uint32 savedpc = info->readStream->readUint32LE();
@@ -653,7 +654,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 		ci->top = L2->stack + stacktop;
 		ci->savedpc = (ci != L2->base_ci) ? ci_func(ci)->l.p->code + savedpc : 0;
 		ci->tailcalls = 0;
-		
+
 		// Update the pointer each time, to keep the GC happy
 		L2->ci = ci;
 	}
@@ -668,12 +669,12 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 
 
 	L2->errfunc = info->readStream->readUint32LE();
-	
+
 	L2->base = L2->stack + stackbase;
 	L2->top = L2->stack + stacktop;
 
-	// Finally, "reopen" upvalues. See serializeUpVal() for why we do this		
-	UpVal* uv;
+	// Finally, "reopen" upvalues. See serializeUpVal() for why we do this
+	UpVal *uv;
 	GCObject **nextslot = &L2->openupval;
 	global_State *g = G(L2);
 
@@ -688,7 +689,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 			// >>>>> permTbl indexTbl ...... thread
 			break;
 		}
-		
+
 		// >>>>> permTbl indexTbl ...... thread boxedUpVal
 		unboxUpVal(info->luaState);
 		// >>>>> permTbl indexTbl ...... thread boxedUpVal
@@ -765,15 +766,15 @@ Proto *lua_newproto(lua_State *luaState) {
 
 void unserializeProto(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
-	
-	// We have to be careful. The GC expects a lot out of protos. In particular, we need 
-	// to give the function a valid string for its source, and valid code, even before we 
-	// actually read in the real code. 
+
+	// We have to be careful. The GC expects a lot out of protos. In particular, we need
+	// to give the function a valid string for its source, and valid code, even before we
+	// actually read in the real code.
 	TString *source = lua_newlstr(info->luaState, "", 0);
 	Proto *p = lua_newproto(info->luaState);
 	p->source = source;
-	p->sizecode=1;
-	p->code =  (Instruction *)lua_reallocv(info->luaState, NULL, 0, 1, sizeof(Instruction));
+	p->sizecode = 1;
+	p->code = (Instruction *)lua_reallocv(info->luaState, NULL, 0, 1, sizeof(Instruction));
 	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
 	p->maxstacksize = 2;
 	p->sizek = 0;
@@ -782,18 +783,18 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	lua_checkstack(info->luaState, 2);
 
 	pushProto(info->luaState, p);
-	// >>>>> permTbl indexTbl ...... proto 
+	// >>>>> permTbl indexTbl ...... proto
 
 	// We don't need to register early, since protos can never ever be
-	// involved in cyclic references 
+	// involved in cyclic references
 
 	// Read in constant references
 	int sizek = info->readStream->readSint32LE();
 	lua_reallocvector(info->luaState, p->k, 0, sizek, TValue);
-	for(int i = 0; i < sizek; ++i) {
-		// >>>>> permTbl indexTbl ...... proto 
+	for (int i = 0; i < sizek; ++i) {
+		// >>>>> permTbl indexTbl ...... proto
 		unserializeObject(info);
-		// >>>>> permTbl indexTbl ...... proto  k 
+		// >>>>> permTbl indexTbl ...... proto  k
 
 		setobj2s(info->luaState, &p->k[i], getObject(info->luaState, -1));
 		p->sizek++;
@@ -807,8 +808,8 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 
 	int sizep = info->readStream->readSint32LE();
 	lua_reallocvector(info->luaState, p->p, 0, sizep, Proto *);
-	for(int i = 0; i < sizep; ++i) {
-		// >>>>> permTbl indexTbl ...... proto 
+	for (int i = 0; i < sizep; ++i) {
+		// >>>>> permTbl indexTbl ...... proto
 		unserializeObject(info);
 		// >>>>> permTbl indexTbl ...... proto  subproto
 
@@ -816,22 +817,22 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 		p->sizep++;
 
 		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto 
+		// >>>>> permTbl indexTbl ...... proto
 	}
-	// >>>>> permTbl indexTbl ...... proto 
+	// >>>>> permTbl indexTbl ...... proto
 
 
 	// Read in code
 	p->sizecode = info->readStream->readSint32LE();
 	lua_reallocvector(info->luaState, p->code, 1, p->sizecode, Instruction);
 	info->readStream->read(p->code, sizeof(Instruction) * p->sizecode);
-	
+
 
 	/* Read in upvalue names */
 	p->sizeupvalues = info->readStream->readSint32LE();
 	if (p->sizeupvalues) {
 		lua_reallocvector(info->luaState, p->upvalues, 0, p->sizeupvalues, TString *);
-		for(int i = 0; i < p->sizeupvalues; ++i) {
+		for (int i = 0; i < p->sizeupvalues; ++i) {
 			// >>>>> permTbl indexTbl ...... proto
 			unserializeObject(info);
 			// >>>>> permTbl indexTbl ...... proto str
@@ -847,7 +848,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	p->sizelocvars = info->readStream->readSint32LE();
 	if (p->sizelocvars) {
 		lua_reallocvector(info->luaState, p->locvars, 0, p->sizelocvars, LocVar);
-		for(int i = 0; i < p->sizelocvars; ++i) {
+		for (int i = 0; i < p->sizelocvars; ++i) {
 			// >>>>> permTbl indexTbl ...... proto
 			unserializeObject(info);
 			// >>>>> permTbl indexTbl ...... proto str
@@ -876,7 +877,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 		lua_reallocvector(info->luaState, p->lineinfo, 0, p->sizelineinfo, int);
 		info->readStream->read(p->lineinfo, sizeof(int) * p->sizelineinfo);
 	}
-	
+
 
 	/* Read in linedefined and lastlinedefined */
 	p->linedefined = info->readStream->readSint32LE();
@@ -895,7 +896,7 @@ Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTab
 	c->l.isC = 0;
 	c->l.env = elementTable;
 	c->l.nupvalues = cast_byte(numElements);
-	
+
 	while (numElements--) {
 		c->l.upvals[numElements] = NULL;
 	}
@@ -916,13 +917,13 @@ static UpVal *makeUpVal(lua_State *luaState, int stackPos) {
 	return uv;
 }
 
-/** 
+/**
  * The GC is not fond of finding upvalues in tables. We get around this
  * during persistence using a weakly keyed table, so that the GC doesn't
  * bother to mark them. This won't work in unpersisting, however, since
  * if we make the values weak they'll be collected (since nothing else
  * references them). Our solution, during unpersisting, is to represent
- * upvalues as dummy functions, each with one upvalue. 
+ * upvalues as dummy functions, each with one upvalue.
  */
 static void boxupval_start(lua_State *luaState) {
 	LClosure *closure;
@@ -931,7 +932,7 @@ static void boxupval_start(lua_State *luaState) {
 	// >>>>> ...... func
 	closure->p = makeFakeProto(luaState, 1);
 
-	// Temporarily initialize the upvalue to nil 
+	// Temporarily initialize the upvalue to nil
 	lua_pushnil(luaState);
 	closure->upvals[0] = makeUpVal(luaState, -1);
 	lua_pop(luaState, 1);
@@ -947,7 +948,7 @@ static void boxupval_finish(lua_State *luaState) {
 }
 
 void unserializeUpValue(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ...... 
+	// >>>>> permTbl indexTbl ......
 	lua_checkstack(upi->L, 2);
 
 	boxupval_start(upi->L);
@@ -966,9 +967,9 @@ void unserializeUserData(UnSerializationInfo *info, int index) {
 
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 2);
-	
+
 	int isspecial = info->readStream->readSint32LE();
-	if(isspecial) {
+	if (isspecial) {
 		unserializeObject(info);
 		// >>>>> permTbl indexTbl ...... specialFunc
 
@@ -996,7 +997,7 @@ void unserializePermanent(UnSerializationInfo *info, int index) {
 
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 2);
-	
+
 	unserializeObject(info);
 	// >>>>> permTbl indexTbl ...... permKey
 
-- 
cgit v1.2.3


From 37b5ee24f520e46eae28c703d189939e0b18c65b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 19 Dec 2014 22:45:00 -0500
Subject: ACCESS: Rename ASurface copyFrom methods to avoid clash with
 Graphics::Surface

---
 engines/access/amazon/amazon_game.cpp    |  8 +++----
 engines/access/amazon/amazon_logic.cpp   | 38 ++++++++++++++++----------------
 engines/access/amazon/amazon_scripts.cpp | 30 ++++++++++++-------------
 engines/access/asurface.cpp              | 16 +++++++-------
 engines/access/asurface.h                | 10 ++++-----
 engines/access/char.cpp                  |  4 ++--
 engines/access/martian/martian_game.cpp  | 10 ++++-----
 engines/access/screen.cpp                | 12 +++++-----
 engines/access/screen.h                  |  6 ++---
 engines/access/scripts.cpp               |  2 +-
 10 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 933a98aded..6c9a437e77 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -552,7 +552,7 @@ void AmazonEngine::startChapter(int chapter) {
 
 	// Show chapter screen
 	_files->loadScreen(96, 15);
-	_buffer2.copyFrom(*_screen);
+	_buffer2.blitFrom(*_screen);
 
 	const int *chapImg = &CHAPTER_TABLE[_chapter - 1][0];
 	_screen->plotImage(_objectsTable[0], _chapter - 1,
@@ -583,14 +583,14 @@ void AmazonEngine::startChapter(int chapter) {
 
 	_screen->clearBuffer();
 	_files->loadScreen(96, 16);
-	_buffer2.copyFrom(*_screen);
+	_buffer2.blitFrom(*_screen);
 	_screen->plotImage(_objectsTable[0], chapImg[0], Common::Point(90, 7));
 
 	_midi->newMusic(7, 1);
 	_midi->newMusic(34, 0);
 
 	_screen->forceFadeIn();
-	_buffer2.copyFrom(*_screen);
+	_buffer2.blitFrom(*_screen);
 
 	_fonts._charSet._lo = 1;
 	_fonts._charSet._hi = 10;
@@ -670,7 +670,7 @@ void AmazonEngine::dead(int deathId) {
 		_files->_setPaletteFlag = false;
 		_files->loadScreen(94, 0);
 		_files->_setPaletteFlag = true;
-		_buffer2.copyFrom(*_screen);
+		_buffer2.blitFrom(*_screen);
 
 		if (!isDemo() || deathId != 10) {
 			for (int i = 0; i < 3; ++i) {
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 436a875688..7f802f3cde 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -106,8 +106,8 @@ void CampScene::mWhileDoOpen() {
 
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(1, 2);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 
 	// Load animation data
 	_vm->_animation->freeAnimationData();
@@ -148,7 +148,7 @@ void CampScene::mWhileDoOpen() {
 		_vm->_animation->animate(0);
 		_vm->_animation->animate(1);
 		pan();
-		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		_vm->_buffer2.blitFrom(_vm->_buffer1);
 		_vm->_newRects.clear();
 		_vm->plotList();
 		_vm->copyBlocks();
@@ -176,8 +176,8 @@ void CampScene::mWhileDoOpen() {
 	}
 
 	events.showCursor();
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 
 	_vm->freeCells();
 	_vm->_oldRects.clear();
@@ -323,8 +323,8 @@ void Opening::doTitle() {
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 3);
 
-		_vm->_buffer2.copyFrom(*_vm->_screen);
-		_vm->_buffer1.copyFrom(*_vm->_screen);
+		_vm->_buffer2.blitFrom(*_vm->_screen);
+		_vm->_buffer1.blitFrom(*_vm->_screen);
 		screen.forceFadeIn();
 		_vm->_sound->playSound(1);
 
@@ -347,13 +347,13 @@ void Opening::doTitle() {
 		_vm->_files->loadScreen(0, 4);
 		_vm->_sound->playSound(1);
 
-		_vm->_buffer2.copyFrom(*_vm->_screen);
-		_vm->_buffer1.copyFrom(*_vm->_screen);
+		_vm->_buffer2.blitFrom(*_vm->_screen);
+		_vm->_buffer1.blitFrom(*_vm->_screen);
 		_vm->_sound->playSound(1);
 
 		const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
 		for (_pCount = 0; _pCount < 3 && !_vm->shouldQuit(); ++_pCount) {
-			_vm->_buffer2.copyFrom(_vm->_buffer1);
+			_vm->_buffer2.blitFrom(_vm->_buffer1);
 			int id = COUNTDOWN[_pCount * 2];
 			int xp = COUNTDOWN[_pCount * 2 + 1];
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
@@ -385,8 +385,8 @@ void Opening::doTitle() {
 
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 5);
-		_vm->_buffer2.copyFrom(*_vm->_screen);
-		_vm->_buffer1.copyFrom(*_vm->_screen);
+		_vm->_buffer2.blitFrom(*_vm->_screen);
+		_vm->_buffer1.blitFrom(*_vm->_screen);
 		screen.forceFadeIn();
 		_vm->_midi->newMusic(1, 0);
 		_vm->_events->_vbCount = 700;
@@ -503,8 +503,8 @@ void Opening::doTent() {
 
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(2, 0);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_screen->forceFadeIn();
 
 	_vm->_video->setVideo(_vm->_screen, Common::Point(126, 73), FileIdent(2, 1), 10);
@@ -1276,8 +1276,8 @@ void Cast::doCast(int param1) {
 
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(58, 1);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 
 	_xTrack = 0;
 	_yTrack = -6;
@@ -1319,7 +1319,7 @@ void Cast::doCast(int param1) {
 	while (!_vm->shouldQuit()) {
 		_vm->_images.clear();
 		pan();
-		_vm->_buffer2.copyFrom(_vm->_buffer1);
+		_vm->_buffer2.blitFrom(_vm->_buffer1);
 		_vm->_newRects.clear();
 		_vm->plotList();
 		_vm->copyBlocks();
@@ -1410,7 +1410,7 @@ void River::initRiver() {
 
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(95, 4);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
 
 	screen.restorePalette();
 	screen.setBufferScan();
@@ -1744,7 +1744,7 @@ void River::mWhileDownRiver() {
 	screen.savePalette();
 	if (!_vm->isDemo())
 		_vm->_files->loadScreen(95, 4);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
 	screen.restorePalette();
 	screen.setPalette();
 	screen.setBufferScan();
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 633188e4dd..0b2ddbc854 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -38,7 +38,7 @@ AmazonScripts::AmazonScripts(AccessEngine *vm) : Scripts(vm) {
 void AmazonScripts::cLoop() {
 	searchForSequence();
 	_vm->_images.clear();
-	_vm->_buffer2.copyFrom(_vm->_buffer1);
+	_vm->_buffer2.blitFrom(_vm->_buffer1);
 	_vm->_oldRects.clear();
 	_vm->_scripts->executeScript();
 	_vm->plotList1();
@@ -51,8 +51,8 @@ void AmazonScripts::mWhile1() {
 	_vm->_events->hideCursor();
 
 	_vm->_files->loadScreen(14, 0);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_events->showCursor();
 
 	_vm->_screen->setIconPalette();
@@ -86,8 +86,8 @@ void AmazonScripts::mWhile1() {
 
 	_vm->_files->loadScreen(14, 1);
 	_vm->_screen->setPalette();
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_events->showCursor();
 
 	_vm->_screen->setIconPalette();
@@ -107,8 +107,8 @@ void AmazonScripts::mWhile1() {
 
 	_vm->_files->loadScreen(14, 2);
 	_vm->_screen->setPalette();
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_events->showCursor();
 
 	_vm->_screen->setIconPalette();
@@ -138,8 +138,8 @@ void AmazonScripts::mWhile1() {
 
 	_vm->_files->loadScreen(14, 3);
 	_vm->_screen->setPalette();
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_events->showCursor();
 
 	_vm->_screen->setIconPalette();
@@ -159,8 +159,8 @@ void AmazonScripts::mWhile2() {
 	_vm->_events->hideCursor();
 
 	_vm->_files->loadScreen(14, 0);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_events->showCursor();
 
 	_vm->_screen->setIconPalette();
@@ -190,8 +190,8 @@ void AmazonScripts::mWhile2() {
 
 	_vm->_files->loadScreen(14, 3);
 	_vm->_screen->setPalette();
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 	_vm->_events->showCursor();
 
 	_vm->_screen->setIconPalette();
@@ -240,8 +240,8 @@ void AmazonScripts::loadBackground(int param1, int param2) {
 	_vm->_files->_setPaletteFlag = false;
 	_vm->_files->loadScreen(param1, param2);
 
-	_vm->_buffer2.copyFrom(*_vm->_screen);
-	_vm->_buffer1.copyFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
 
 	_vm->_screen->forceFadeIn();
 }
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 38af7add00..f45f121db4 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -186,7 +186,7 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
 	}
 }
 
-void ASurface::transCopyFrom(ASurface *src, const Common::Point &destPos) {
+void ASurface::transBlitFrom(ASurface *src, const Common::Point &destPos) {
 	if (getPixels() == nullptr)
 		create(w, h);
 
@@ -201,7 +201,7 @@ void ASurface::transCopyFrom(ASurface *src, const Common::Point &destPos) {
 	}
 }
 
-void ASurface::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
+void ASurface::transBlitFrom(ASurface *src, const Common::Rect &bounds) {
 	const int SCALE_LIMIT = 0x100;
 	int scaleX = SCALE_LIMIT * bounds.width() / src->w;
 	int scaleY = SCALE_LIMIT * bounds.height() / src->h;
@@ -247,11 +247,11 @@ void ASurface::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
 	}
 }
 
-void ASurface::transCopyFrom(ASurface &src) {
-	copyFrom(src);
+void ASurface::transBlitFrom(ASurface &src) {
+	blitFrom(src);
 }
 
-void ASurface::copyFrom(Graphics::Surface &src) {
+void ASurface::blitFrom(Graphics::Surface &src) {
 	for (int y = 0; y < src.h; ++y) {
 		const byte *srcP = (const byte *)src.getBasePtr(0, y);
 		byte *destP = (byte *)getBasePtr(0, y);
@@ -260,7 +260,7 @@ void ASurface::copyFrom(Graphics::Surface &src) {
 }
 
 void ASurface::copyBuffer(Graphics::Surface *src) {
-	copyFrom(*src);
+	blitFrom(*src);
 }
 
 void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
@@ -272,14 +272,14 @@ void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
 }
 
 void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
-	transCopyFrom(frame, bounds);
+	transBlitFrom(frame, bounds);
 }
 
 void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
 	ASurface flippedFrame;
 	frame->flipHorizontal(flippedFrame);
 
-	transCopyFrom(&flippedFrame, bounds);
+	transBlitFrom(&flippedFrame, bounds);
 }
 
 void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {
diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 763e3e629e..4fb47b9c09 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -95,19 +95,19 @@ public:
 
 	virtual void drawRect();
 
-	virtual void transCopyFrom(ASurface *src, const Common::Point &destPos);
+	virtual void transBlitFrom(ASurface *src, const Common::Point &destPos);
 
-	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
+	virtual void transBlitFrom(ASurface *src, const Common::Rect &bounds);
 
-	virtual void transCopyFrom(ASurface &src);
+	virtual void transBlitFrom(ASurface &src);
 
-	virtual void copyFrom(Graphics::Surface &src);
+	virtual void blitFrom(Graphics::Surface &src);
 
 	virtual void copyBuffer(Graphics::Surface *src);
 
 	virtual void addDirtyRect(const Common::Rect &r) {}
 
-	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
+	void copyTo(ASurface *dest) { dest->blitFrom(*this); }
 
 	void saveBlock(const Common::Rect &bounds);
 
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index 5bc6707509..b359bcf13a 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -108,8 +108,8 @@ void CharManager::loadChar(int charId) {
 		_vm->_screen->fadeIn();
 	}
 
-	_vm->_buffer1.copyFrom(*_vm->_screen);
-	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.blitFrom(*_vm->_screen);
+	_vm->_buffer2.blitFrom(*_vm->_screen);
 	_vm->_screen->setDisplayScan();
 
 	if (_charFlag != 2 && _charFlag != 3) {
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 6392206209..4e4a5135a6 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -100,8 +100,8 @@ void MartianEngine::doTitle() {
 	_files->_setPaletteFlag = false;
 	_files->loadScreen(0, 3);
 	
-	_buffer2.copyFrom(*_screen);
-	_buffer1.copyFrom(*_screen);
+	_buffer2.blitFrom(*_screen);
+	_buffer1.blitFrom(*_screen);
 	_screen->forceFadeIn();
 	_sound->playSound(1);
 
@@ -115,13 +115,13 @@ void MartianEngine::doTitle() {
 	_files->loadScreen(0, 4);
 	_sound->playSound(1);
 
-	_buffer2.copyFrom(*_screen);
-	_buffer1.copyFrom(*_screen);
+	_buffer2.blitFrom(*_screen);
+	_buffer1.blitFrom(*_screen);
 	_sound->playSound(1);
 
 	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
 	for (_pCount = 0; _pCount < 3; ++_pCount) {
-		_buffer2.copyFrom(_buffer1);
+		_buffer2.blitFrom(_buffer1);
 		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);
 		_screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71));
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 35069ba683..d6fddb73b2 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -266,19 +266,19 @@ void Screen::drawRect() {
 	ASurface::drawRect();
 }
 
-void Screen::transCopyFrom(ASurface *src, const Common::Point &destPos) {
+void Screen::transBlitFrom(ASurface *src, const Common::Point &destPos) {
 	addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h));
-	ASurface::transCopyFrom(src, destPos);
+	ASurface::transBlitFrom(src, destPos);
 }
 
-void Screen::transCopyFrom(ASurface *src, const Common::Rect &bounds) {
+void Screen::transBlitFrom(ASurface *src, const Common::Rect &bounds) {
 	addDirtyRect(bounds);
-	ASurface::transCopyFrom(src, bounds);
+	ASurface::transBlitFrom(src, bounds);
 }
 
-void Screen::copyFrom(Graphics::Surface &src) {
+void Screen::blitFrom(Graphics::Surface &src) {
 	addDirtyRect(Common::Rect(0, 0, src.w, src.h));
-	ASurface::copyFrom(src);
+	ASurface::blitFrom(src);
 }
 
 void Screen::copyBuffer(Graphics::Surface *src) {
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 0fa111c21c..d45a533f9a 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -92,11 +92,11 @@ public:
 
 	virtual void drawRect();
 
-	virtual void transCopyFrom(ASurface *src, const Common::Point &destPos);
+	virtual void transBlitFrom(ASurface *src, const Common::Point &destPos);
 
-	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
+	virtual void transBlitFrom(ASurface *src, const Common::Rect &bounds);
 
-	virtual void copyFrom(Graphics::Surface &src);
+	virtual void blitFrom(Graphics::Surface &src);
 
 	virtual void copyBuffer(Graphics::Surface *src);
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 2e22d9a2ce..dfb9bd963f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -73,7 +73,7 @@ void Scripts::charLoop() {
 	_sequence = 2000;
 	searchForSequence();
 	_vm->_images.clear();
-	_vm->_buffer2.copyFrom(_vm->_buffer1);
+	_vm->_buffer2.blitFrom(_vm->_buffer1);
 	_vm->_newRects.clear();
 
 	executeScript();
-- 
cgit v1.2.3


From 18df28f74da91105b8c1898bfe2351b22cbd435f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 19 Dec 2014 23:36:53 -0500
Subject: ACCESS: Extra initialization for various classes

---
 engines/access/access.cpp              |  3 +++
 engines/access/amazon/amazon_game.cpp  |  9 ++++++++-
 engines/access/amazon/amazon_logic.cpp | 12 ++++++++++++
 engines/access/amazon/amazon_logic.h   |  2 ++
 engines/access/animation.cpp           |  1 +
 engines/access/asurface.cpp            |  3 ++-
 engines/access/bubble_box.cpp          |  7 +++----
 engines/access/bubble_box.h            |  4 ----
 engines/access/font.cpp                |  2 ++
 engines/access/inventory.cpp           |  1 +
 engines/access/player.cpp              |  6 ++++++
 engines/access/screen.cpp              |  1 +
 engines/access/scripts.cpp             |  2 ++
 engines/access/video.cpp               |  8 +++++++-
 14 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6ad1b22408..39e6c2b530 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -41,6 +41,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_events = nullptr;
 	_files = nullptr;
 	_inventory = nullptr;
+	_midi = nullptr;
 	_player = nullptr;
 	_room = nullptr;
 	_screen = nullptr;
@@ -92,6 +93,8 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_vidX = _vidY = 0;
 	_cheatFl = false;
 	_restartFl = false;
+	_et = 0;
+	_printEnd = 0;
 }
 
 AccessEngine::~AccessEngine() {
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 6c9a437e77..eb4fabdad9 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -61,9 +61,16 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_helpTbl[1] = _help2;
 	_helpTbl[2] = _help3;
 
+	_chapter = 0;
+	_rawInactiveX = _rawInactiveY = 0;
+	_inactiveYOff = 0;
+	_hintLevel = 0;
+	_updateChapter = 0;
+	_oldTitleChapter = 0;
+	_iqValue = 0;
+
 	_chapterCells.push_back(CellIdent(0, 96, 17));
 	_inactive._spritesPtr = nullptr;
-	_inactive._altSpritesPtr = nullptr;
 	_inactive._flags = _inactive._frameNumber = _inactive._offsetY = 0;
 	_inactive._position = Common::Point(0, 0);
 }
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 7f802f3cde..d2ee17a230 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1371,6 +1371,18 @@ River::River(AmazonEngine *vm) : PannedScene(vm) {
 	_deathCount = 0;
 	_oldScrollCol = 0;
 	_maxHits = 0;
+	_mapPtr = nullptr;
+	_canoeMoveCount = 0;
+	_canoeVXPos = 0;
+	_canoeFrame = 0;
+	_canoeDir = 0;
+	_canoeLane = 0;
+	_canoeYPos = 0;
+	_hitCount = 0;
+	_riverIndex = 0;
+	_topList = _botList = nullptr;
+	_deathType = 0;
+	_hitSafe = 0;
 }
 
 void River::setRiverPan() {
diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
index a1fb4eef77..0d962483e6 100644
--- a/engines/access/amazon/amazon_logic.h
+++ b/engines/access/amazon/amazon_logic.h
@@ -242,6 +242,8 @@ public:
 class InactivePlayer : public ImageEntry {
 public:
 	SpriteResource *_altSpritesPtr;
+
+	InactivePlayer() { _altSpritesPtr = nullptr; }
 };
 
 } // End of namespace Amazon
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index 548e7db02d..cc699a27e3 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -63,6 +63,7 @@ Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Man
 	_countdownTicks = stream->readUint16LE();
 	_currentLoopCount = stream->readSint16LE();
 	stream->readUint16LE(); // unk
+	_field10 = 0;
 
 	Common::Array<uint16> frameOffsets;
 	uint16 ofs;
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index f45f121db4..e9a2e8a427 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -102,7 +102,7 @@ void ImageEntryList::addToList(ImageEntry &ie) {
 int ASurface::_clipWidth;
 int ASurface::_clipHeight;
 
-ASurface::ASurface() {
+ASurface::ASurface(): Graphics::Surface() {
 	_leftSkip = _rightSkip = 0;
 	_topSkip = _bottomSkip = 0;
 	_lastBoundsX = _lastBoundsY = 0;
@@ -110,6 +110,7 @@ ASurface::ASurface() {
 	_orgX1 = _orgY1 = 0;
 	_orgX2 = _orgY2 = 0;
 	_lColor = 0;
+	_maxChars = 0;
 }
 
 ASurface::~ASurface() {
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index e37a8142e8..28c211991c 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -27,13 +27,12 @@
 namespace Access {
 
 BubbleBox::BubbleBox(AccessEngine *vm) : Manager(vm) {
+	_startItem = 0;
+	_startBox = 0;
+	_charCol = _rowOff = 0;
 	_type = TYPE_2;
 	_bounds = Common::Rect(64, 32, 64 + 130, 32 + 122);
 	_bubbleDisplStr = "";
-	_fieldD = 0;
-	_fieldE = 0;
-	_fieldF = 0;
-	_field10 = 0;
 }
 
 void BubbleBox::load(Common::SeekableReadStream *stream) {
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 0130344c7e..0b3f139520 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -49,10 +49,6 @@ public:
 	Common::StringArray _nameIndex;
 	Common::String _bubbleTitle;
 	Common::String _bubbleDisplStr;
-	int _fieldD;
-	int _fieldE;
-	int _fieldF;
-	int _field10;
 
 	Common::Array<Common::Rect> _bubbles;
 public:
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index da8f0b6ec5..8af183f193 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -27,6 +27,8 @@ namespace Access {
 byte Font::_fontColors[4];
 
 Font::Font() {
+	_bitWidth = 0;
+	_height = 0;
 }
 
 Font::~Font() {
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 8db62a45fc..df499ba705 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -57,6 +57,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
 	_startAboutItem = 0;
 	_startTravelItem = 0;
 	_iconDisplayFlag = true;
+	_boxNum = 0;
 
 	const char *const *names;
 	const int *combineP;
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index d547aedc1d..bcd553c6dc 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -73,6 +73,12 @@ Player::Player(AccessEngine *vm) : Manager(vm), ImageEntry() {
 	_playerDirection = NONE;
 	_xFlag = _yFlag = 0;
 	_inactiveYOff = 0;
+
+	_sideWalkMin = _sideWalkMax = 0;
+	_upWalkMin = _upWalkMax = 0;
+	_downWalkMin = _downWalkMax = 0;
+	_diagUpWalkMin = _diagUpWalkMax = 0;
+	_diagDownWalkMin = _diagDownWalkMax = 0;
 }
 
 Player::~Player() {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index d6fddb73b2..970a8f3079 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -56,6 +56,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 
 	_bufferBytesWide = _vWindowBytesWide = this->w;
 	_vWindowLinesTall = this->h;
+	_vWindowWidth = _vWindowHeight = 0;
 	_clipWidth = _vWindowBytesWide - 1;
 	_clipHeight = _vWindowLinesTall - 1;
 	_startCycle = 0;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index dfb9bd963f..074c781352 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -29,10 +29,12 @@ namespace Access {
 
 Scripts::Scripts(AccessEngine *vm) : Manager(vm) {
 	_resource = nullptr;
+	_specialFunction = -1;
 	_data = nullptr;
 	_sequence = 0;
 	_endFlag = false;
 	_returnCode = 0;
+	_scriptCommand = 0;
 	_choice = 0;
 	_choiceStart = 0;
 	_charsOrg = Common::Point(0, 0);
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index b7d5652e5b..920c066898 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -27,10 +27,16 @@ namespace Access {
 
 VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
 	_vidSurface = nullptr;
+	_videoData = nullptr;
+	_startCoord = nullptr;
+	_frameCount = 0;
+	_xCount = 0;
+	_scanCount = 0;
+	_frameSize = 0;
 	_videoFrame = 0;
 	_soundFlag = false;
 	_soundFrame = 0;
-	_videoData = nullptr;
+	_videoEnd = false;
 }
 
 VideoPlayer::~VideoPlayer() {
-- 
cgit v1.2.3


From a7bfa55aa802b7f6adfe85cb981af9f2f42c2586 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 20 Dec 2014 10:01:52 -0500
Subject: ACCESS: Fix compiler warnings

---
 engines/access/amazon/amazon_logic.cpp | 13 +++++--------
 engines/access/decompress.cpp          |  5 +++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index d2ee17a230..97bd9de650 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1492,11 +1492,11 @@ void River::initRiver() {
 	_maxHits = 2 - _vm->_riverFlag;
 	_saveRiver = false;
 
-	Font &font2 = _vm->_fonts._font2;
-	font2._fontColors[0] = 0;
-	font2._fontColors[1] = 33;
-	font2._fontColors[2] = 34;
-	font2._fontColors[3] = 35;
+	// Set font colors for drawing using font2
+	Font::_fontColors[0] = 0;
+	Font::_fontColors[1] = 33;
+	Font::_fontColors[2] = 34;
+	Font::_fontColors[3] = 35;
 }
 
 void River::resetPositions() {
@@ -1522,8 +1522,6 @@ void River::checkRiverPan() {
 }
 
 bool River::riverJumpTest() {
-	Screen &screen = *_vm->_screen;
-
 	if (_vm->_scrollCol == 120 || _vm->_scrollCol == 60 || _vm->_scrollCol == 0) {
 		int val = *++_mapPtr;
 		if (val == 0xFF)
@@ -1921,7 +1919,6 @@ void River::synchronize(Common::Serializer &s) {
 	if (_vm->_player->_roomNumber == 45) {
 		if (s.isSaving()) {
 			// Set river properties to be saved out
-			Screen &screen = *_vm->_screen;
 			_rScrollRow = _vm->_scrollRow;
 			_rScrollCol = _vm->_scrollCol;
 			_rScrollX = _vm->_scrollX;
diff --git a/engines/access/decompress.cpp b/engines/access/decompress.cpp
index 62bff87860..c5656afa51 100644
--- a/engines/access/decompress.cpp
+++ b/engines/access/decompress.cpp
@@ -32,8 +32,9 @@ void LzwDecompressor::decompress(byte *source, byte *dest) {
 
 	_source = source;
 	
-	byte litByte;
-	uint16 copyLength, maxCodeValue, code, nextCode, lastCode, oldCode;
+	byte litByte = 0;
+	uint16 oldCode = 0;
+	uint16 copyLength, maxCodeValue, code, nextCode, lastCode;
 
 	byte *copyBuf = new byte[8192];
 
-- 
cgit v1.2.3


From 7cb18f8e7ac47e8c8c0b738401534ec0b99c2507 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 20 Dec 2014 10:59:16 -0500
Subject: ACCESS: Fix crash in the introduction sequence

---
 engines/access/amazon/amazon_logic.cpp | 14 +++++++-------
 engines/access/asurface.cpp            |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 97bd9de650..e6a96b67d6 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -148,7 +148,7 @@ void CampScene::mWhileDoOpen() {
 		_vm->_animation->animate(0);
 		_vm->_animation->animate(1);
 		pan();
-		_vm->_buffer2.blitFrom(_vm->_buffer1);
+		_vm->_buffer2.copyFrom(_vm->_buffer1);
 		_vm->_newRects.clear();
 		_vm->plotList();
 		_vm->copyBlocks();
@@ -176,8 +176,8 @@ void CampScene::mWhileDoOpen() {
 	}
 
 	events.showCursor();
-	_vm->_buffer2.blitFrom(*_vm->_screen);
-	_vm->_buffer1.blitFrom(*_vm->_screen);
+	_vm->_buffer2.copyFrom(*_vm->_screen);
+	_vm->_buffer1.copyFrom(*_vm->_screen);
 
 	_vm->freeCells();
 	_vm->_oldRects.clear();
@@ -323,8 +323,8 @@ void Opening::doTitle() {
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 3);
 
-		_vm->_buffer2.blitFrom(*_vm->_screen);
-		_vm->_buffer1.blitFrom(*_vm->_screen);
+		_vm->_buffer2.copyFrom(*_vm->_screen);
+		_vm->_buffer1.copyFrom(*_vm->_screen);
 		screen.forceFadeIn();
 		_vm->_sound->playSound(1);
 
@@ -347,8 +347,8 @@ void Opening::doTitle() {
 		_vm->_files->loadScreen(0, 4);
 		_vm->_sound->playSound(1);
 
-		_vm->_buffer2.blitFrom(*_vm->_screen);
-		_vm->_buffer1.blitFrom(*_vm->_screen);
+		_vm->_buffer2.copyFrom(*_vm->_screen);
+		_vm->_buffer1.copyFrom(*_vm->_screen);
 		_vm->_sound->playSound(1);
 
 		const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index e9a2e8a427..5f4372d5af 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -253,6 +253,7 @@ void ASurface::transBlitFrom(ASurface &src) {
 }
 
 void ASurface::blitFrom(Graphics::Surface &src) {
+	assert(w >= src.w && h >= src.h);
 	for (int y = 0; y < src.h; ++y) {
 		const byte *srcP = (const byte *)src.getBasePtr(0, y);
 		byte *destP = (byte *)getBasePtr(0, y);
-- 
cgit v1.2.3


From b41b3e1a89d7646561697b1bc3636345230a9f12 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 20 Dec 2014 13:26:32 +0200
Subject: ZVISION: Fix code formatting

---
 engines/zvision/file/search_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 30c269c290..d0d4e43d12 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -265,7 +265,7 @@ void SearchManager::addDir(const Common::String &name) {
 
 void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const Common::FSNode &fsNode, int depth) {
 	Common::FSList fsList;
-	if ( fsNode.getChildren(fsList) ) {
+	if (fsNode.getChildren(fsList)) {
 
 		_list.push_back(fsNode.getPath());
 
-- 
cgit v1.2.3


From 0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 20 Dec 2014 13:27:16 +0200
Subject: ZVISION: Simplify check

Thanks to DrMcCoy for spotting this
---
 engines/zvision/sound/zork_raw.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 8688039325..b2c88b34df 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -73,10 +73,7 @@ RawChunkStream::RawChunk RawChunkStream::readNextChunk(Common::SeekableReadStrea
 	tmp.size = 0;
 	tmp.data = NULL;
 
-	if (!stream)
-		return tmp;
-
-	if (stream && (stream->size() == 0 || stream->eos()))
+	if (!stream || stream->size() == 0 || stream->eos())
 		return tmp;
 
 	tmp.size = (stream->size() - stream->pos()) * 2;
-- 
cgit v1.2.3


From 200b05246c3e90e61fe6d2e21507b0b936d0ff2b Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 14 Sep 2014 15:07:50 +0200
Subject: AUDIO: Wrap around in the Timestamp constructor

The "making of" video in the Xbox version of Myst III is
unusually long. VideoDecoder::FixedRateVideoTrack::getFrameTime
would trigger an overflow.
---
 audio/timestamp.cpp    |  6 ++----
 test/audio/timestamp.h | 13 +++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/audio/timestamp.cpp b/audio/timestamp.cpp
index 1ce971631c..63752812e1 100644
--- a/audio/timestamp.cpp
+++ b/audio/timestamp.cpp
@@ -39,12 +39,10 @@ Timestamp::Timestamp(uint ms, uint fr) {
 Timestamp::Timestamp(uint s, uint frames, uint fr) {
 	assert(fr > 0);
 
-	_secs = s;
+	_secs = s + (frames / fr);
 	_framerateFactor = 1000 / Common::gcd<uint>(1000, fr);
 	_framerate = fr * _framerateFactor;
-	_numFrames = frames * _framerateFactor;
-
-	normalize();
+	_numFrames = (frames % fr) * _framerateFactor;
 }
 
 Timestamp Timestamp::convertToFramerate(uint newFramerate) const {
diff --git a/test/audio/timestamp.h b/test/audio/timestamp.h
index ca56e34a4d..ec42a55ec4 100644
--- a/test/audio/timestamp.h
+++ b/test/audio/timestamp.h
@@ -2,6 +2,8 @@
 
 #include "audio/timestamp.h"
 
+#include <limits.h>
+
 class TimestampTestSuite : public CxxTest::TestSuite
 {
 	public:
@@ -238,4 +240,15 @@ class TimestampTestSuite : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS(c.numberOfFrames(), 11025);
 		TS_ASSERT_EQUALS(c.totalNumberOfFrames(), 33075);
 	}
+
+	void test_no_overflow() {
+		// The constructor should not overflow and give incoherent values
+		const Audio::Timestamp a = Audio::Timestamp(0, UINT_MAX, 1000);
+
+		int secs = UINT_MAX / 1000;
+		int frames = UINT_MAX % 1000;
+
+		TS_ASSERT_EQUALS(a.secs(), secs);
+		TS_ASSERT_EQUALS(a.numberOfFrames(), frames);
+	}
 };
-- 
cgit v1.2.3


From d497b45b1c8e13a67946522927dcbbcbc795af9a Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Sun, 21 Dec 2014 03:58:19 -0600
Subject: COMMON: Fix typo that caused uint64 reads to return a uint32

---
 common/stream.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/stream.h b/common/stream.h
index 5655f0fcb4..251995001c 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -266,7 +266,7 @@ public:
 	 * if a read error occurred (for which client code can check by
 	 * calling err() and eos() ).
 	 */
-	uint32 readUint64LE() {
+	uint64 readUint64LE() {
 		uint64 val;
 		read(&val, 8);
 		return FROM_LE_64(val);
@@ -305,7 +305,7 @@ public:
 	 * if a read error occurred (for which client code can check by
 	 * calling err() and eos() ).
 	 */
-	uint32 readUint64BE() {
+	uint64 readUint64BE() {
 		uint64 val;
 		read(&val, 8);
 		return FROM_BE_64(val);
-- 
cgit v1.2.3


From 93167fabb55741a9606efa0088cf348c8ff2019e Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Sun, 21 Dec 2014 04:12:43 -0600
Subject: TEST: Create test cases for reading uint64 from a stream

---
 test/common/memoryreadstream.h       | 16 ++++++++++------
 test/common/memoryreadstreamendian.h | 32 ++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/test/common/memoryreadstream.h b/test/common/memoryreadstream.h
index adef861a5e..79c4079e9b 100644
--- a/test/common/memoryreadstream.h
+++ b/test/common/memoryreadstream.h
@@ -60,28 +60,32 @@ class MemoryReadStreamTestSuite : public CxxTest::TestSuite {
 	}
 
 	void test_seek_read_le() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStream ms(contents, sizeof(contents));
 
 		TS_ASSERT_EQUALS(ms.readUint16LE(), 0x0201UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32LE(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_be() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStream ms(contents, sizeof(contents));
 
 		TS_ASSERT_EQUALS(ms.readUint16BE(), 0x0102UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32BE(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
diff --git a/test/common/memoryreadstreamendian.h b/test/common/memoryreadstreamendian.h
index 35e804c70b..515128ea2a 100644
--- a/test/common/memoryreadstreamendian.h
+++ b/test/common/memoryreadstreamendian.h
@@ -60,54 +60,62 @@ class MemoryReadStreamEndianTestSuite : public CxxTest::TestSuite {
 	}
 
 	void test_seek_read_le() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), false);
 
 		TS_ASSERT_EQUALS(ms.readUint16LE(), 0x0201UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32LE(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_be() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), false);
 
 		TS_ASSERT_EQUALS(ms.readUint16BE(), 0x0102UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32BE(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_le2() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), false);
 
 		TS_ASSERT_EQUALS(ms.readUint16(), 0x0201UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_be2() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), true);
 
 		TS_ASSERT_EQUALS(ms.readUint16(), 0x0102UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 };
-- 
cgit v1.2.3


From 0433eda4dec8b6ac660aacec2ae3866461214ce3 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 21 Dec 2014 18:25:57 +0000
Subject: CGE2: Add detection for new English freeware version

---
 engines/cge2/detection.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index 6e1b93d0b8..4acdea3fde 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -80,6 +80,16 @@ static const ADGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
 		},
+	
+		{
+			"sfinx", "Freeware v1.1",
+			{
+				{"vol.cat", 0, "f158e469dccbebc5a632eb848df89779", 129024},
+				{"vol.dat", 0, "d40a6b4ae173d6930be54ba56bee15d5", 34182773},
+				AD_LISTEND
+			},
+			Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
+		},
 
 		AD_TABLE_END_MARKER
 };
-- 
cgit v1.2.3


From bb1df52da8be0322d5f04ddd371dc3c68eb3812a Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 21 Dec 2014 18:26:40 +0000
Subject: CREDITS: Add credits for Sfinx translation to English

---
 AUTHORS             |  6 ++++++
 devtools/credits.pl |  6 ++++++
 gui/credits.h       | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 9470217230..8e90a625c9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -524,6 +524,12 @@ Other contributions
        Victor Gonzalez              - Soltys Spanish translation
        Alejandro Gomez de la Munoza - Soltys Spanish translation
 
+    CGE2:
+       Arnaud Boutonne              - Sfinx English translation
+       Thierry Crozat               - Sfinx English translation
+       Peter Bozso                  - Sfinx English translation editor
+       Ryan Clark                   - Sfinx English translation editor
+
     Drascula:
        Thierry Crozat               - Improve French translation
 
diff --git a/devtools/credits.pl b/devtools/credits.pl
index 1c2ece80ed..e919c0b8ba 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -1092,6 +1092,12 @@ begin_credits("Credits");
 					add_person("V&iacute;ctor Gonz&aacute;lez", "IlDucci", "Soltys Spanish translation");
 					add_person("Alejandro G&oacute;mez de la Mu&ntilde;oza", "TheFireRed", "Soltys Spanish translation");
 				end_section();
+				begin_section("CGE2");
+					add_person("Arnaud Boutonn&eacute;", "Strangerke", "Sfinx English translation");
+					add_person("Thierry Crozat", "criezy", "Sfinx English translation");
+					add_person("Peter Bozs&oacute;", "uruk", "Sfinx English translation editor");
+					add_person("Ryan Clark", "", "Sfinx English translation editor");
+				end_section();
 				begin_section("Drascula");
 					add_person("Thierry Crozat", "criezy", "Improve French translation");
 				end_section();
diff --git a/gui/credits.h b/gui/credits.h
index 5b33797a63..0610609983 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -630,6 +630,18 @@ static const char *credits[] = {
 "C0""Alejandro G\363mez de la Mu\361oza",
 "C2""Soltys Spanish translation",
 "",
+"C1""CGE2",
+"A0""Arnaud Boutonne",
+"C0""Arnaud Boutonn\351",
+"C2""Sfinx English translation",
+"C0""Thierry Crozat",
+"C2""Sfinx English translation",
+"A0""Peter Bozso",
+"C0""Peter Bozs\363",
+"C2""Sfinx English translation editor",
+"C0""Ryan Clark",
+"C2""Sfinx English translation editor",
+"",
 "C1""Drascula",
 "C0""Thierry Crozat",
 "C2""Improve French translation",
-- 
cgit v1.2.3


From e34b5be8e3d4842e273f08821b6a7bd7ba65e843 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 21 Dec 2014 22:13:28 +0200
Subject: MT32: Update to munt 1.5.0

This syncs with munt commit 4041a16a5d
---
 NEWS                                            |   3 +
 audio/softsynth/mt32/Analog.cpp                 | 348 ++++++++++++++++++++++++
 audio/softsynth/mt32/Analog.h                   |  57 ++++
 audio/softsynth/mt32/BReverbModel.cpp           |  10 +-
 audio/softsynth/mt32/BReverbModel.h             |   2 +-
 audio/softsynth/mt32/LA32FloatWaveGenerator.cpp |   2 +-
 audio/softsynth/mt32/LA32Ramp.cpp               |   2 +-
 audio/softsynth/mt32/LA32WaveGenerator.cpp      |  10 +-
 audio/softsynth/mt32/MemoryRegion.h             | 124 +++++++++
 audio/softsynth/mt32/MidiEventQueue.h           |  67 +++++
 audio/softsynth/mt32/Part.cpp                   |   1 +
 audio/softsynth/mt32/Partial.cpp                |   5 +-
 audio/softsynth/mt32/PartialManager.cpp         |   1 +
 audio/softsynth/mt32/Poly.cpp                   |   1 +
 audio/softsynth/mt32/Poly.h                     |   1 +
 audio/softsynth/mt32/ROMInfo.cpp                |  15 +-
 audio/softsynth/mt32/ROMInfo.h                  |   4 +-
 audio/softsynth/mt32/Structures.h               |  47 ++--
 audio/softsynth/mt32/Synth.cpp                  | 248 +++++++++++------
 audio/softsynth/mt32/Synth.h                    | 347 +++++++++--------------
 audio/softsynth/mt32/TVA.cpp                    |   1 +
 audio/softsynth/mt32/TVF.cpp                    |   1 +
 audio/softsynth/mt32/TVP.cpp                    |   1 +
 audio/softsynth/mt32/Tables.cpp                 |   5 +-
 audio/softsynth/mt32/Tables.h                   |  15 +-
 audio/softsynth/mt32/Types.h                    |  40 +++
 audio/softsynth/mt32/internals.h                |  83 ++++++
 audio/softsynth/mt32/module.mk                  |   1 +
 audio/softsynth/mt32/mt32emu.h                  |  67 +----
 29 files changed, 1086 insertions(+), 423 deletions(-)
 create mode 100644 audio/softsynth/mt32/Analog.cpp
 create mode 100644 audio/softsynth/mt32/Analog.h
 create mode 100644 audio/softsynth/mt32/MemoryRegion.h
 create mode 100644 audio/softsynth/mt32/MidiEventQueue.h
 create mode 100644 audio/softsynth/mt32/Types.h
 create mode 100644 audio/softsynth/mt32/internals.h

diff --git a/NEWS b/NEWS
index 762af70962..470ddc01bd 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  New Games:
    - Added support for Sfinx.
 
+ General:
+   - Updated Munt MT-32 emulation code to version 1.5.0.
+
  Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
      version (bug #6720).
diff --git a/audio/softsynth/mt32/Analog.cpp b/audio/softsynth/mt32/Analog.cpp
new file mode 100644
index 0000000000..8ac28e401a
--- /dev/null
+++ b/audio/softsynth/mt32/Analog.cpp
@@ -0,0 +1,348 @@
+/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+//#include <cstring>
+#include "Analog.h"
+
+namespace MT32Emu {
+
+#if MT32EMU_USE_FLOAT_SAMPLES
+
+/* FIR approximation of the overall impulse response of the cascade composed of the sample & hold circuit and the low pass filter
+ * of the MT-32 first generation.
+ * The coefficients below are found by windowing the inverse DFT of the 1024 pin frequency response converted to the minimum phase.
+ * The frequency response of the LPF is computed directly, the effect of the S&H is approximated by multiplying the LPF frequency
+ * response by the corresponding sinc. Although, the LPF has DC gain of 3.2, we ignore this in the emulation and use normalised model.
+ * The peak gain of the normalised cascade appears about 1.7 near 11.8 kHz. Relative error doesn't exceed 1% for the frequencies
+ * below 12.5 kHz. In the higher frequency range, the relative error is below 8%. Peak error value is at 16 kHz.
+ */
+static const float COARSE_LPF_TAPS_MT32[] = {
+	1.272473681f, -0.220267785f, -0.158039905f, 0.179603785f, -0.111484097f, 0.054137498f, -0.023518029f, 0.010997169f, -0.006935698f
+};
+
+// Similar approximation for new MT-32 and CM-32L/LAPC-I LPF. As the voltage controlled amplifier was introduced, LPF has unity DC gain.
+// The peak gain value shifted towards higher frequencies and a bit higher about 1.83 near 13 kHz.
+static const float COARSE_LPF_TAPS_CM32L[] = {
+	1.340615635f, -0.403331694f, 0.036005517f, 0.066156844f, -0.069672532f, 0.049563806f, -0.031113416f, 0.019169774f, -0.012421368f
+};
+
+#else
+
+static const unsigned int COARSE_LPF_FRACTION_BITS = 14;
+
+// Integer versions of the FIRs above multiplied by (1 << 14) and rounded.
+static const SampleEx COARSE_LPF_TAPS_MT32[] = {
+	20848, -3609, -2589, 2943, -1827, 887, -385, 180, -114
+};
+
+static const SampleEx COARSE_LPF_TAPS_CM32L[] = {
+	21965, -6608, 590, 1084, -1142, 812, -510, 314, -204
+};
+
+#endif
+
+/* Combined FIR that both approximates the impulse response of the analogue circuits of sample & hold and the low pass filter
+ * in the audible frequency range (below 20 kHz) and attenuates unwanted mirror spectra above 28 kHz as well. It is a polyphase
+ * filter intended for resampling the signal to 48 kHz yet for applying high frequency boost.
+ * As with the filter above, the analogue LPF frequency response is obtained for 1536 pin grid for range up to 96 kHz and multiplied
+ * by the corresponding sinc. The result is further squared, windowed and passed to generalised Parks-McClellan routine as a desired response.
+ * Finally, the minimum phase factor is found that's essentially the coefficients below.
+ * Relative error in the audible frequency range doesn't exceed 0.0006%, attenuation in the stopband is better than 100 dB.
+ * This level of performance makes it nearly bit-accurate for standard 16-bit sample resolution.
+ */
+
+// FIR version for MT-32 first generation.
+static const float ACCURATE_LPF_TAPS_MT32[] = {
+	0.003429281f, 0.025929869f, 0.096587777f, 0.228884848f, 0.372413431f, 0.412386503f, 0.263980018f,
+	-0.014504962f, -0.237394528f, -0.257043496f, -0.103436603f, 0.063996095f, 0.124562333f, 0.083703206f,
+	0.013921662f, -0.033475018f, -0.046239712f, -0.029310921f, 0.00126585f, 0.021060961f, 0.017925605f,
+	0.003559874f, -0.005105248f, -0.005647917f, -0.004157918f, -0.002065664f, 0.00158747f, 0.003762585f,
+	0.001867137f, -0.001090028f, -0.001433979f, -0.00022367f, 4.34308E-05f, -0.000247827f, 0.000157087f,
+	0.000605823f, 0.000197317f, -0.000370511f, -0.000261202f, 9.96069E-05f, 9.85073E-05f, -5.28754E-05f,
+	-1.00912E-05f, 7.69943E-05f, 2.03162E-05f, -5.67967E-05f, -3.30637E-05f, 1.61958E-05f, 1.73041E-05f
+};
+
+// FIR version for new MT-32 and CM-32L/LAPC-I.
+static const float ACCURATE_LPF_TAPS_CM32L[] = {
+	0.003917452f, 0.030693861f, 0.116424199f, 0.275101674f, 0.43217361f, 0.431247894f, 0.183255659f,
+	-0.174955671f, -0.354240244f, -0.212401714f, 0.072259178f, 0.204655344f, 0.108336211f, -0.039099027f,
+	-0.075138174f, -0.026261906f, 0.00582663f, 0.003052193f, 0.00613657f, 0.017017951f, 0.008732535f,
+	-0.011027427f, -0.012933664f, 0.001158097f, 0.006765958f, 0.00046778f, -0.002191106f, 0.001561017f,
+	0.001842871f, -0.001996876f, -0.002315836f, 0.000980965f, 0.001817454f, -0.000243272f, -0.000972848f,
+	0.000149941f, 0.000498886f, -0.000204436f, -0.000347415f, 0.000142386f, 0.000249137f, -4.32946E-05f,
+	-0.000131231f, 3.88575E-07f, 4.48813E-05f, -1.31906E-06f, -1.03499E-05f, 7.71971E-06f, 2.86721E-06f
+};
+
+// According to the CM-64 PCB schematic, there is a difference in the values of the LPF entrance resistors for the reverb and non-reverb channels.
+// This effectively results in non-unity LPF DC gain for the reverb channel of 0.68 while the LPF has unity DC gain for the LA32 output channels.
+// In emulation, the reverb output gain is multiplied by this factor to compensate for the LPF gain difference.
+static const float CM32L_REVERB_TO_LA32_ANALOG_OUTPUT_GAIN_FACTOR = 0.68f;
+
+static const unsigned int OUTPUT_GAIN_FRACTION_BITS = 8;
+static const float OUTPUT_GAIN_MULTIPLIER = float(1 << OUTPUT_GAIN_FRACTION_BITS);
+
+static const unsigned int COARSE_LPF_DELAY_LINE_LENGTH = 8; // Must be a power of 2
+static const unsigned int ACCURATE_LPF_DELAY_LINE_LENGTH = 16; // Must be a power of 2
+static const unsigned int ACCURATE_LPF_NUMBER_OF_PHASES = 3; // Upsampling factor
+static const unsigned int ACCURATE_LPF_PHASE_INCREMENT_REGULAR = 2; // Downsampling factor
+static const unsigned int ACCURATE_LPF_PHASE_INCREMENT_OVERSAMPLED = 1; // No downsampling
+static const Bit32u ACCURATE_LPF_DELTAS_REGULAR[][ACCURATE_LPF_NUMBER_OF_PHASES] = { { 0, 0, 0 }, { 1, 1, 0 }, { 1, 2, 1 } };
+static const Bit32u ACCURATE_LPF_DELTAS_OVERSAMPLED[][ACCURATE_LPF_NUMBER_OF_PHASES] = { { 0, 0, 0 }, { 1, 0, 0 }, { 1, 0, 1 } };
+
+class AbstractLowPassFilter {
+public:
+	static AbstractLowPassFilter &createLowPassFilter(AnalogOutputMode mode, bool oldMT32AnalogLPF);
+	static void muteRingBuffer(SampleEx *ringBuffer, unsigned int length);
+
+	virtual ~AbstractLowPassFilter() {}
+	virtual SampleEx process(SampleEx sample) = 0;
+	virtual bool hasNextSample() const;
+	virtual unsigned int getOutputSampleRate() const;
+	virtual unsigned int estimateInSampleCount(unsigned int outSamples) const;
+	virtual void addPositionIncrement(unsigned int) {}
+};
+
+class NullLowPassFilter : public AbstractLowPassFilter {
+public:
+	SampleEx process(SampleEx sample);
+};
+
+class CoarseLowPassFilter : public AbstractLowPassFilter {
+private:
+	const SampleEx * const LPF_TAPS;
+	SampleEx ringBuffer[COARSE_LPF_DELAY_LINE_LENGTH];
+	unsigned int ringBufferPosition;
+
+public:
+	CoarseLowPassFilter(bool oldMT32AnalogLPF);
+	SampleEx process(SampleEx sample);
+};
+
+class AccurateLowPassFilter : public AbstractLowPassFilter {
+private:
+	const float * const LPF_TAPS;
+	const Bit32u (* const deltas)[ACCURATE_LPF_NUMBER_OF_PHASES];
+	const unsigned int phaseIncrement;
+	const unsigned int outputSampleRate;
+
+	SampleEx ringBuffer[ACCURATE_LPF_DELAY_LINE_LENGTH];
+	unsigned int ringBufferPosition;
+	unsigned int phase;
+
+public:
+	AccurateLowPassFilter(bool oldMT32AnalogLPF, bool oversample);
+	SampleEx process(SampleEx sample);
+	bool hasNextSample() const;
+	unsigned int getOutputSampleRate() const;
+	unsigned int estimateInSampleCount(unsigned int outSamples) const;
+	void addPositionIncrement(unsigned int positionIncrement);
+};
+
+Analog::Analog(const AnalogOutputMode mode, const ControlROMFeatureSet *controlROMFeatures) :
+	leftChannelLPF(AbstractLowPassFilter::createLowPassFilter(mode, controlROMFeatures->isOldMT32AnalogLPF())),
+	rightChannelLPF(AbstractLowPassFilter::createLowPassFilter(mode, controlROMFeatures->isOldMT32AnalogLPF())),
+	synthGain(0),
+	reverbGain(0)
+{}
+
+Analog::~Analog() {
+	delete &leftChannelLPF;
+	delete &rightChannelLPF;
+}
+
+void Analog::process(Sample **outStream, const Sample *nonReverbLeft, const Sample *nonReverbRight, const Sample *reverbDryLeft, const Sample *reverbDryRight, const Sample *reverbWetLeft, const Sample *reverbWetRight, Bit32u outLength) {
+	if (outStream == NULL) {
+		leftChannelLPF.addPositionIncrement(outLength);
+		rightChannelLPF.addPositionIncrement(outLength);
+		return;
+	}
+
+	while (0 < (outLength--)) {
+		SampleEx outSampleL;
+		SampleEx outSampleR;
+
+		if (leftChannelLPF.hasNextSample()) {
+			outSampleL = leftChannelLPF.process(0);
+			outSampleR = rightChannelLPF.process(0);
+		} else {
+			SampleEx inSampleL = ((SampleEx)*(nonReverbLeft++) + (SampleEx)*(reverbDryLeft++)) * synthGain + (SampleEx)*(reverbWetLeft++) * reverbGain;
+			SampleEx inSampleR = ((SampleEx)*(nonReverbRight++) + (SampleEx)*(reverbDryRight++)) * synthGain + (SampleEx)*(reverbWetRight++) * reverbGain;
+
+#if !MT32EMU_USE_FLOAT_SAMPLES
+			inSampleL >>= OUTPUT_GAIN_FRACTION_BITS;
+			inSampleR >>= OUTPUT_GAIN_FRACTION_BITS;
+#endif
+
+			outSampleL = leftChannelLPF.process(inSampleL);
+			outSampleR = rightChannelLPF.process(inSampleR);
+		}
+
+		*((*outStream)++) = Synth::clipSampleEx(outSampleL);
+		*((*outStream)++) = Synth::clipSampleEx(outSampleR);
+	}
+}
+
+unsigned int Analog::getOutputSampleRate() const {
+	return leftChannelLPF.getOutputSampleRate();
+}
+
+Bit32u Analog::getDACStreamsLength(Bit32u outputLength) const {
+	return leftChannelLPF.estimateInSampleCount(outputLength);
+}
+
+void Analog::setSynthOutputGain(float useSynthGain) {
+#if MT32EMU_USE_FLOAT_SAMPLES
+	synthGain = useSynthGain;
+#else
+	if (OUTPUT_GAIN_MULTIPLIER < useSynthGain) useSynthGain = OUTPUT_GAIN_MULTIPLIER;
+	synthGain = SampleEx(useSynthGain * OUTPUT_GAIN_MULTIPLIER);
+#endif
+}
+
+void Analog::setReverbOutputGain(float useReverbGain, bool mt32ReverbCompatibilityMode) {
+	if (!mt32ReverbCompatibilityMode) useReverbGain *= CM32L_REVERB_TO_LA32_ANALOG_OUTPUT_GAIN_FACTOR;
+#if MT32EMU_USE_FLOAT_SAMPLES
+	reverbGain = useReverbGain;
+#else
+	if (OUTPUT_GAIN_MULTIPLIER < useReverbGain) useReverbGain = OUTPUT_GAIN_MULTIPLIER;
+	reverbGain = SampleEx(useReverbGain * OUTPUT_GAIN_MULTIPLIER);
+#endif
+}
+
+AbstractLowPassFilter &AbstractLowPassFilter::createLowPassFilter(AnalogOutputMode mode, bool oldMT32AnalogLPF) {
+	switch (mode) {
+		case AnalogOutputMode_COARSE:
+			return *new CoarseLowPassFilter(oldMT32AnalogLPF);
+		case AnalogOutputMode_ACCURATE:
+			return *new AccurateLowPassFilter(oldMT32AnalogLPF, false);
+		case AnalogOutputMode_OVERSAMPLED:
+			return *new AccurateLowPassFilter(oldMT32AnalogLPF, true);
+		default:
+			return *new NullLowPassFilter;
+	}
+}
+
+void AbstractLowPassFilter::muteRingBuffer(SampleEx *ringBuffer, unsigned int length) {
+
+#if MT32EMU_USE_FLOAT_SAMPLES
+
+	SampleEx *p = ringBuffer;
+	while (length--) {
+		*(p++) = 0.0f;
+	}
+
+#else
+
+	memset(ringBuffer, 0, length * sizeof(SampleEx));
+
+#endif
+
+}
+
+bool AbstractLowPassFilter::hasNextSample() const {
+	return false;
+}
+
+unsigned int AbstractLowPassFilter::getOutputSampleRate() const {
+	return SAMPLE_RATE;
+}
+
+unsigned int AbstractLowPassFilter::estimateInSampleCount(unsigned int outSamples) const {
+	return outSamples;
+}
+
+SampleEx NullLowPassFilter::process(const SampleEx inSample) {
+	return inSample;
+}
+
+CoarseLowPassFilter::CoarseLowPassFilter(bool oldMT32AnalogLPF) :
+	LPF_TAPS(oldMT32AnalogLPF ? COARSE_LPF_TAPS_MT32 : COARSE_LPF_TAPS_CM32L),
+	ringBufferPosition(0)
+{
+	muteRingBuffer(ringBuffer, COARSE_LPF_DELAY_LINE_LENGTH);
+}
+
+SampleEx CoarseLowPassFilter::process(const SampleEx inSample) {
+	static const unsigned int DELAY_LINE_MASK = COARSE_LPF_DELAY_LINE_LENGTH - 1;
+
+	SampleEx sample = LPF_TAPS[COARSE_LPF_DELAY_LINE_LENGTH] * ringBuffer[ringBufferPosition];
+	ringBuffer[ringBufferPosition] = Synth::clipSampleEx(inSample);
+
+	for (unsigned int i = 0; i < COARSE_LPF_DELAY_LINE_LENGTH; i++) {
+		sample += LPF_TAPS[i] * ringBuffer[(i + ringBufferPosition) & DELAY_LINE_MASK];
+	}
+
+	ringBufferPosition = (ringBufferPosition - 1) & DELAY_LINE_MASK;
+
+#if !MT32EMU_USE_FLOAT_SAMPLES
+	sample >>= COARSE_LPF_FRACTION_BITS;
+#endif
+
+	return sample;
+}
+
+AccurateLowPassFilter::AccurateLowPassFilter(const bool oldMT32AnalogLPF, const bool oversample) :
+	LPF_TAPS(oldMT32AnalogLPF ? ACCURATE_LPF_TAPS_MT32 : ACCURATE_LPF_TAPS_CM32L),
+	deltas(oversample ? ACCURATE_LPF_DELTAS_OVERSAMPLED : ACCURATE_LPF_DELTAS_REGULAR),
+	phaseIncrement(oversample ? ACCURATE_LPF_PHASE_INCREMENT_OVERSAMPLED : ACCURATE_LPF_PHASE_INCREMENT_REGULAR),
+	outputSampleRate(SAMPLE_RATE * ACCURATE_LPF_NUMBER_OF_PHASES / phaseIncrement),
+	ringBufferPosition(0),
+	phase(0)
+{
+	muteRingBuffer(ringBuffer, ACCURATE_LPF_DELAY_LINE_LENGTH);
+}
+
+SampleEx AccurateLowPassFilter::process(const SampleEx inSample) {
+	static const unsigned int DELAY_LINE_MASK = ACCURATE_LPF_DELAY_LINE_LENGTH - 1;
+
+	float sample = (phase == 0) ? LPF_TAPS[ACCURATE_LPF_DELAY_LINE_LENGTH * ACCURATE_LPF_NUMBER_OF_PHASES] * ringBuffer[ringBufferPosition] : 0.0f;
+	if (!hasNextSample()) {
+		ringBuffer[ringBufferPosition] = inSample;
+	}
+
+	for (unsigned int tapIx = phase, delaySampleIx = 0; delaySampleIx < ACCURATE_LPF_DELAY_LINE_LENGTH; delaySampleIx++, tapIx += ACCURATE_LPF_NUMBER_OF_PHASES) {
+		sample += LPF_TAPS[tapIx] * ringBuffer[(delaySampleIx + ringBufferPosition) & DELAY_LINE_MASK];
+	}
+
+	phase += phaseIncrement;
+	if (ACCURATE_LPF_NUMBER_OF_PHASES <= phase) {
+		phase -= ACCURATE_LPF_NUMBER_OF_PHASES;
+		ringBufferPosition = (ringBufferPosition - 1) & DELAY_LINE_MASK;
+	}
+
+	return SampleEx(ACCURATE_LPF_NUMBER_OF_PHASES * sample);
+}
+
+bool AccurateLowPassFilter::hasNextSample() const {
+	return phaseIncrement <= phase;
+}
+
+unsigned int AccurateLowPassFilter::getOutputSampleRate() const {
+	return outputSampleRate;
+}
+
+unsigned int AccurateLowPassFilter::estimateInSampleCount(unsigned int outSamples) const {
+	Bit32u cycleCount = outSamples / ACCURATE_LPF_NUMBER_OF_PHASES;
+	Bit32u remainder = outSamples - cycleCount * ACCURATE_LPF_NUMBER_OF_PHASES;
+	return cycleCount * phaseIncrement + deltas[remainder][phase];
+}
+
+void AccurateLowPassFilter::addPositionIncrement(const unsigned int positionIncrement) {
+	phase = (phase + positionIncrement * phaseIncrement) % ACCURATE_LPF_NUMBER_OF_PHASES;
+}
+
+}
diff --git a/audio/softsynth/mt32/Analog.h b/audio/softsynth/mt32/Analog.h
new file mode 100644
index 0000000000..a48db72485
--- /dev/null
+++ b/audio/softsynth/mt32/Analog.h
@@ -0,0 +1,57 @@
+/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MT32EMU_ANALOG_H
+#define MT32EMU_ANALOG_H
+
+#include "mt32emu.h"
+
+namespace MT32Emu {
+
+class AbstractLowPassFilter;
+
+/* Analog class is dedicated to perform fair emulation of analogue circuitry of hardware units that is responsible
+ * for processing output signal after the DAC. It appears that the analogue circuit labeled "LPF" on the schematic
+ * also applies audible changes to the signal spectra. There is a significant boost of higher frequencies observed
+ * aside from quite poor attenuation of the mirror spectra above 16 kHz which is due to a relatively low filter order.
+ *
+ * As the final mixing of multiplexed output signal is performed after the DAC, this function is migrated here from Synth.
+ * Saying precisely, mixing is performed within the LPF as the entrance resistors are actually components of a LPF
+ * designed using the multiple feedback topology. Nevertheless, the schematic separates them.
+ */
+class Analog {
+public:
+	Analog(AnalogOutputMode mode, const ControlROMFeatureSet *controlROMFeatures);
+	~Analog();
+	void process(Sample **outStream, const Sample *nonReverbLeft, const Sample *nonReverbRight, const Sample *reverbDryLeft, const Sample *reverbDryRight, const Sample *reverbWetLeft, const Sample *reverbWetRight, const Bit32u outLength);
+	unsigned int getOutputSampleRate() const;
+	Bit32u getDACStreamsLength(Bit32u outputLength) const;
+	void setSynthOutputGain(float synthGain);
+	void setReverbOutputGain(float reverbGain, bool mt32ReverbCompatibilityMode);
+
+private:
+	AbstractLowPassFilter &leftChannelLPF;
+	AbstractLowPassFilter &rightChannelLPF;
+	SampleEx synthGain;
+	SampleEx reverbGain;
+
+	Analog(Analog &);
+};
+
+}
+
+#endif
diff --git a/audio/softsynth/mt32/BReverbModel.cpp b/audio/softsynth/mt32/BReverbModel.cpp
index 37b3e9670d..5e02db8f99 100644
--- a/audio/softsynth/mt32/BReverbModel.cpp
+++ b/audio/softsynth/mt32/BReverbModel.cpp
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#include <memory.h>
+//#include <cstring>
 #include "mt32emu.h"
 #include "BReverbModel.h"
 
@@ -501,9 +501,9 @@ void BReverbModel::process(const Sample *inLeft, const Sample *inRight, Sample *
 				 *   Analysing of the algorithm suggests that the overflow is most probable when the combs output is added below.
 				 *   So, despite this isn't actually accurate, we only add the check here for performance reasons.
 				 */
-				Sample outSample = Synth::clipBit16s(Synth::clipBit16s(Synth::clipBit16s(Synth::clipBit16s((Bit32s)outL1 + Bit32s(outL1 >> 1)) + (Bit32s)outL2) + Bit32s(outL2 >> 1)) + (Bit32s)outL3);
+				Sample outSample = Synth::clipSampleEx(Synth::clipSampleEx(Synth::clipSampleEx(Synth::clipSampleEx((SampleEx)outL1 + SampleEx(outL1 >> 1)) + (SampleEx)outL2) + SampleEx(outL2 >> 1)) + (SampleEx)outL3);
 #else
-				Sample outSample = Synth::clipBit16s((Bit32s)outL1 + Bit32s(outL1 >> 1) + (Bit32s)outL2 + Bit32s(outL2 >> 1) + (Bit32s)outL3);
+				Sample outSample = Synth::clipSampleEx((SampleEx)outL1 + SampleEx(outL1 >> 1) + (SampleEx)outL2 + SampleEx(outL2 >> 1) + (SampleEx)outL3);
 #endif
 				*(outLeft++) = weirdMul(outSample, wetLevel, 0xFF);
 			}
@@ -515,9 +515,9 @@ void BReverbModel::process(const Sample *inLeft, const Sample *inRight, Sample *
 				Sample outSample = 1.5f * (outR1 + outR2) + outR3;
 #elif MT32EMU_BOSS_REVERB_PRECISE_MODE
 				// See the note above for the left channel output.
-				Sample outSample = Synth::clipBit16s(Synth::clipBit16s(Synth::clipBit16s(Synth::clipBit16s((Bit32s)outR1 + Bit32s(outR1 >> 1)) + (Bit32s)outR2) + Bit32s(outR2 >> 1)) + (Bit32s)outR3);
+				Sample outSample = Synth::clipSampleEx(Synth::clipSampleEx(Synth::clipSampleEx(Synth::clipSampleEx((SampleEx)outR1 + SampleEx(outR1 >> 1)) + (SampleEx)outR2) + SampleEx(outR2 >> 1)) + (SampleEx)outR3);
 #else
-				Sample outSample = Synth::clipBit16s((Bit32s)outR1 + Bit32s(outR1 >> 1) + (Bit32s)outR2 + Bit32s(outR2 >> 1) + (Bit32s)outR3);
+				Sample outSample = Synth::clipSampleEx((SampleEx)outR1 + SampleEx(outR1 >> 1) + (SampleEx)outR2 + SampleEx(outR2 >> 1) + (SampleEx)outR3);
 #endif
 				*(outRight++) = weirdMul(outSample, wetLevel, 0xFF);
 			}
diff --git a/audio/softsynth/mt32/BReverbModel.h b/audio/softsynth/mt32/BReverbModel.h
index 9b840900c3..764daf1a9e 100644
--- a/audio/softsynth/mt32/BReverbModel.h
+++ b/audio/softsynth/mt32/BReverbModel.h
@@ -95,7 +95,6 @@ class BReverbModel {
 	const bool tapDelayMode;
 	Bit32u dryAmp;
 	Bit32u wetLevel;
-	void mute();
 
 	static const BReverbSettings &getCM32L_LAPCSettings(const ReverbMode mode);
 	static const BReverbSettings &getMT32Settings(const ReverbMode mode);
@@ -107,6 +106,7 @@ public:
 	void open();
 	// May be called multiple times without an open() in between.
 	void close();
+	void mute();
 	void setParameters(Bit8u time, Bit8u level);
 	void process(const Sample *inLeft, const Sample *inRight, Sample *outLeft, Sample *outRight, unsigned long numSamples);
 	bool isActive() const;
diff --git a/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp b/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp
index 9265d80c88..42d820ebad 100644
--- a/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp
+++ b/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp
@@ -18,7 +18,7 @@
 //#include <cmath>
 #include "mt32emu.h"
 #include "mmath.h"
-#include "LA32FloatWaveGenerator.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
diff --git a/audio/softsynth/mt32/LA32Ramp.cpp b/audio/softsynth/mt32/LA32Ramp.cpp
index 454612c842..2b31a330d2 100644
--- a/audio/softsynth/mt32/LA32Ramp.cpp
+++ b/audio/softsynth/mt32/LA32Ramp.cpp
@@ -50,8 +50,8 @@ We haven't fully explored:
 //#include <cmath>
 
 #include "mt32emu.h"
-#include "LA32Ramp.h"
 #include "mmath.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
diff --git a/audio/softsynth/mt32/LA32WaveGenerator.cpp b/audio/softsynth/mt32/LA32WaveGenerator.cpp
index 7ac7cc6aaa..765f75fa61 100644
--- a/audio/softsynth/mt32/LA32WaveGenerator.cpp
+++ b/audio/softsynth/mt32/LA32WaveGenerator.cpp
@@ -15,15 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#include <cmath>
-#include "mt32emu.h"
-#include "mmath.h"
-#include "LA32WaveGenerator.h"
-
 #if MT32EMU_USE_FLOAT_SAMPLES
 #include "LA32FloatWaveGenerator.cpp"
 #else
 
+//#include <cmath>
+#include "mt32emu.h"
+#include "mmath.h"
+#include "internals.h"
+
 namespace MT32Emu {
 
 static const Bit32u SINE_SEGMENT_RELATIVE_LENGTH = 1 << 18;
diff --git a/audio/softsynth/mt32/MemoryRegion.h b/audio/softsynth/mt32/MemoryRegion.h
new file mode 100644
index 0000000000..c0cb041e11
--- /dev/null
+++ b/audio/softsynth/mt32/MemoryRegion.h
@@ -0,0 +1,124 @@
+/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MT32EMU_MEMORY_REGION_H
+#define MT32EMU_MEMORY_REGION_H
+
+namespace MT32Emu {
+
+enum MemoryRegionType {
+	MR_PatchTemp, MR_RhythmTemp, MR_TimbreTemp, MR_Patches, MR_Timbres, MR_System, MR_Display, MR_Reset
+};
+
+class MemoryRegion {
+private:
+	Synth *synth;
+	Bit8u *realMemory;
+	Bit8u *maxTable;
+public:
+	MemoryRegionType type;
+	Bit32u startAddr, entrySize, entries;
+
+	MemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable, MemoryRegionType useType, Bit32u useStartAddr, Bit32u useEntrySize, Bit32u useEntries) {
+		synth = useSynth;
+		realMemory = useRealMemory;
+		maxTable = useMaxTable;
+		type = useType;
+		startAddr = useStartAddr;
+		entrySize = useEntrySize;
+		entries = useEntries;
+	}
+	int lastTouched(Bit32u addr, Bit32u len) const {
+		return (offset(addr) + len - 1) / entrySize;
+	}
+	int firstTouchedOffset(Bit32u addr) const {
+		return offset(addr) % entrySize;
+	}
+	int firstTouched(Bit32u addr) const {
+		return offset(addr) / entrySize;
+	}
+	Bit32u regionEnd() const {
+		return startAddr + entrySize * entries;
+	}
+	bool contains(Bit32u addr) const {
+		return addr >= startAddr && addr < regionEnd();
+	}
+	int offset(Bit32u addr) const {
+		return addr - startAddr;
+	}
+	Bit32u getClampedLen(Bit32u addr, Bit32u len) const {
+		if (addr + len > regionEnd())
+			return regionEnd() - addr;
+		return len;
+	}
+	Bit32u next(Bit32u addr, Bit32u len) const {
+		if (addr + len > regionEnd()) {
+			return regionEnd() - addr;
+		}
+		return 0;
+	}
+	Bit8u getMaxValue(int off) const {
+		if (maxTable == NULL)
+			return 0xFF;
+		return maxTable[off % entrySize];
+	}
+	Bit8u *getRealMemory() const {
+		return realMemory;
+	}
+	bool isReadable() const {
+		return getRealMemory() != NULL;
+	}
+	void read(unsigned int entry, unsigned int off, Bit8u *dst, unsigned int len) const;
+	void write(unsigned int entry, unsigned int off, const Bit8u *src, unsigned int len, bool init = false) const;
+};
+
+class PatchTempMemoryRegion : public MemoryRegion {
+public:
+	PatchTempMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_PatchTemp, MT32EMU_MEMADDR(0x030000), sizeof(MemParams::PatchTemp), 9) {}
+};
+class RhythmTempMemoryRegion : public MemoryRegion {
+public:
+	RhythmTempMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_RhythmTemp, MT32EMU_MEMADDR(0x030110), sizeof(MemParams::RhythmTemp), 85) {}
+};
+class TimbreTempMemoryRegion : public MemoryRegion {
+public:
+	TimbreTempMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_TimbreTemp, MT32EMU_MEMADDR(0x040000), sizeof(TimbreParam), 8) {}
+};
+class PatchesMemoryRegion : public MemoryRegion {
+public:
+	PatchesMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_Patches, MT32EMU_MEMADDR(0x050000), sizeof(PatchParam), 128) {}
+};
+class TimbresMemoryRegion : public MemoryRegion {
+public:
+	TimbresMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_Timbres, MT32EMU_MEMADDR(0x080000), sizeof(MemParams::PaddedTimbre), 64 + 64 + 64 + 64) {}
+};
+class SystemMemoryRegion : public MemoryRegion {
+public:
+	SystemMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_System, MT32EMU_MEMADDR(0x100000), sizeof(MemParams::System), 1) {}
+};
+class DisplayMemoryRegion : public MemoryRegion {
+public:
+	DisplayMemoryRegion(Synth *useSynth) : MemoryRegion(useSynth, NULL, NULL, MR_Display, MT32EMU_MEMADDR(0x200000), MAX_SYSEX_SIZE - 1, 1) {}
+};
+class ResetMemoryRegion : public MemoryRegion {
+public:
+	ResetMemoryRegion(Synth *useSynth) : MemoryRegion(useSynth, NULL, NULL, MR_Reset, MT32EMU_MEMADDR(0x7F0000), 0x3FFF, 1) {}
+};
+
+}
+
+#endif
diff --git a/audio/softsynth/mt32/MidiEventQueue.h b/audio/softsynth/mt32/MidiEventQueue.h
new file mode 100644
index 0000000000..b1948c5f8e
--- /dev/null
+++ b/audio/softsynth/mt32/MidiEventQueue.h
@@ -0,0 +1,67 @@
+/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MT32EMU_MIDI_EVENT_QUEUE_H
+#define MT32EMU_MIDI_EVENT_QUEUE_H
+
+namespace MT32Emu {
+
+/**
+ * Used to safely store timestamped MIDI events in a local queue.
+ */
+struct MidiEvent {
+	Bit32u shortMessageData;
+	const Bit8u *sysexData;
+	Bit32u sysexLength;
+	Bit32u timestamp;
+
+	~MidiEvent();
+	void setShortMessage(Bit32u shortMessageData, Bit32u timestamp);
+	void setSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp);
+};
+
+/**
+ * Simple queue implementation using a ring buffer to store incoming MIDI event before the synth actually processes it.
+ * It is intended to:
+ * - get rid of prerenderer while retaining graceful partial abortion
+ * - add fair emulation of the MIDI interface delays
+ * - extend the synth interface with the default implementation of a typical rendering loop.
+ * THREAD SAFETY:
+ * It is safe to use either in a single thread environment or when there are only two threads - one performs only reading
+ * and one performs only writing. More complicated usage requires external synchronisation.
+ */
+class MidiEventQueue {
+private:
+	MidiEvent * const ringBuffer;
+	const Bit32u ringBufferMask;
+	volatile Bit32u startPosition;
+	volatile Bit32u endPosition;
+
+public:
+	MidiEventQueue(Bit32u ringBufferSize = DEFAULT_MIDI_EVENT_QUEUE_SIZE); // Must be a power of 2
+	~MidiEventQueue();
+	void reset();
+	bool pushShortMessage(Bit32u shortMessageData, Bit32u timestamp);
+	bool pushSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp);
+	const MidiEvent *peekMidiEvent();
+	void dropMidiEvent();
+	bool isFull() const;
+};
+
+}
+
+#endif
diff --git a/audio/softsynth/mt32/Part.cpp b/audio/softsynth/mt32/Part.cpp
index d92473b5db..cffc3ed744 100644
--- a/audio/softsynth/mt32/Part.cpp
+++ b/audio/softsynth/mt32/Part.cpp
@@ -19,6 +19,7 @@
 //#include <cstring>
 
 #include "mt32emu.h"
+#include "internals.h"
 #include "PartialManager.h"
 
 namespace MT32Emu {
diff --git a/audio/softsynth/mt32/Partial.cpp b/audio/softsynth/mt32/Partial.cpp
index 7dcc6e945a..7348087509 100644
--- a/audio/softsynth/mt32/Partial.cpp
+++ b/audio/softsynth/mt32/Partial.cpp
@@ -21,6 +21,7 @@
 
 #include "mt32emu.h"
 #include "mmath.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
@@ -312,8 +313,8 @@ bool Partial::produceOutput(Sample *leftBuf, Sample *rightBuf, unsigned long len
 		// Though, it is unknown whether this overflow is exploited somewhere.
 		Sample leftOut = Sample((sample * leftPanValue) >> 8);
 		Sample rightOut = Sample((sample * rightPanValue) >> 8);
-		*leftBuf = Synth::clipBit16s((Bit32s)*leftBuf + (Bit32s)leftOut);
-		*rightBuf = Synth::clipBit16s((Bit32s)*rightBuf + (Bit32s)rightOut);
+		*leftBuf = Synth::clipSampleEx((SampleEx)*leftBuf + (SampleEx)leftOut);
+		*rightBuf = Synth::clipSampleEx((SampleEx)*rightBuf + (SampleEx)rightOut);
 		leftBuf++;
 		rightBuf++;
 #endif
diff --git a/audio/softsynth/mt32/PartialManager.cpp b/audio/softsynth/mt32/PartialManager.cpp
index fe73087581..8ca6e4e3d7 100644
--- a/audio/softsynth/mt32/PartialManager.cpp
+++ b/audio/softsynth/mt32/PartialManager.cpp
@@ -18,6 +18,7 @@
 //#include <cstring>
 
 #include "mt32emu.h"
+#include "internals.h"
 #include "PartialManager.h"
 
 namespace MT32Emu {
diff --git a/audio/softsynth/mt32/Poly.cpp b/audio/softsynth/mt32/Poly.cpp
index e07ceb4231..badcd8fb96 100644
--- a/audio/softsynth/mt32/Poly.cpp
+++ b/audio/softsynth/mt32/Poly.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "mt32emu.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
diff --git a/audio/softsynth/mt32/Poly.h b/audio/softsynth/mt32/Poly.h
index 9c6431ce36..e2614369bb 100644
--- a/audio/softsynth/mt32/Poly.h
+++ b/audio/softsynth/mt32/Poly.h
@@ -21,6 +21,7 @@
 namespace MT32Emu {
 
 class Part;
+class Partial;
 
 enum PolyState {
 	POLY_Playing,
diff --git a/audio/softsynth/mt32/ROMInfo.cpp b/audio/softsynth/mt32/ROMInfo.cpp
index eb9622620f..7c0127078b 100644
--- a/audio/softsynth/mt32/ROMInfo.cpp
+++ b/audio/softsynth/mt32/ROMInfo.cpp
@@ -21,8 +21,8 @@
 namespace MT32Emu {
 
 static const ROMInfo *getKnownROMInfoFromList(unsigned int index) {
-	static const ControlROMFeatureSet MT32_COMPATIBLE(true);
-	static const ControlROMFeatureSet CM32L_COMPATIBLE(false);
+	static const ControlROMFeatureSet MT32_COMPATIBLE(true, true);
+	static const ControlROMFeatureSet CM32L_COMPATIBLE(false, false);
 
 	// Known ROMs
 	static const ROMInfo CTRL_MT32_V1_04 = {65536, "5a5cb5a77d7d55ee69657c2f870416daed52dea7", ROMInfo::Control, "ctrl_mt32_1_04", "MT-32 Control v1.04", ROMInfo::Full, NULL, &MT32_COMPATIBLE};
@@ -106,7 +106,6 @@ void ROMImage::freeROMImage(const ROMImage *romImage) {
 	delete romImage;
 }
 
-
 Common::File* ROMImage::getFile() const {
 	return file;
 }
@@ -115,11 +114,17 @@ const ROMInfo* ROMImage::getROMInfo() const {
 	return romInfo;
 }
 
-ControlROMFeatureSet::ControlROMFeatureSet(bool useDefaultReverbMT32Compatible) : defaultReverbMT32Compatible(useDefaultReverbMT32Compatible) {
-}
+ControlROMFeatureSet::ControlROMFeatureSet(bool useDefaultReverbMT32Compatible, bool useOldMT32AnalogLPF) :
+	defaultReverbMT32Compatible(useDefaultReverbMT32Compatible),
+	oldMT32AnalogLPF(useOldMT32AnalogLPF)
+{}
 
 bool ControlROMFeatureSet::isDefaultReverbMT32Compatible() const {
 	return defaultReverbMT32Compatible;
 }
 
+bool ControlROMFeatureSet::isOldMT32AnalogLPF() const {
+	return oldMT32AnalogLPF;
+}
+
 }
diff --git a/audio/softsynth/mt32/ROMInfo.h b/audio/softsynth/mt32/ROMInfo.h
index cecbb6054f..4682620a15 100644
--- a/audio/softsynth/mt32/ROMInfo.h
+++ b/audio/softsynth/mt32/ROMInfo.h
@@ -77,10 +77,12 @@ public:
 struct ControlROMFeatureSet {
 private:
 	unsigned int defaultReverbMT32Compatible : 1;
+	unsigned int oldMT32AnalogLPF : 1;
 
 public:
-	ControlROMFeatureSet(bool defaultReverbMT32Compatible);
+	ControlROMFeatureSet(bool defaultReverbMT32Compatible, bool oldMT32AnalogLPF);
 	bool isDefaultReverbMT32Compatible() const;
+	bool isOldMT32AnalogLPF() const;
 };
 
 }
diff --git a/audio/softsynth/mt32/Structures.h b/audio/softsynth/mt32/Structures.h
index 35dcee90d6..4dada3a847 100644
--- a/audio/softsynth/mt32/Structures.h
+++ b/audio/softsynth/mt32/Structures.h
@@ -31,19 +31,6 @@ namespace MT32Emu {
 #define MT32EMU_ALIGN_PACKED __attribute__((packed))
 #endif
 
-typedef unsigned int       Bit32u;
-typedef   signed int       Bit32s;
-typedef unsigned short int Bit16u;
-typedef   signed short int Bit16s;
-typedef unsigned char      Bit8u;
-typedef   signed char      Bit8s;
-
-#if MT32EMU_USE_FLOAT_SAMPLES
-typedef float Sample;
-#else
-typedef Bit16s Sample;
-#endif
-
 // The following structures represent the MT-32's memory
 // Since sysex allows this memory to be written to in blocks of bytes,
 // we keep this packed so that we can copy data into the various
@@ -184,7 +171,37 @@ struct MemParams {
 #pragma pack()
 #endif
 
-struct ControlROMPCMStruct;
+struct ControlROMMap {
+	Bit16u idPos;
+	Bit16u idLen;
+	const char *idBytes;
+	Bit16u pcmTable; // 4 * pcmCount bytes
+	Bit16u pcmCount;
+	Bit16u timbreAMap; // 128 bytes
+	Bit16u timbreAOffset;
+	bool timbreACompressed;
+	Bit16u timbreBMap; // 128 bytes
+	Bit16u timbreBOffset;
+	bool timbreBCompressed;
+	Bit16u timbreRMap; // 2 * timbreRCount bytes
+	Bit16u timbreRCount;
+	Bit16u rhythmSettings; // 4 * rhythmSettingsCount bytes
+	Bit16u rhythmSettingsCount;
+	Bit16u reserveSettings; // 9 bytes
+	Bit16u panSettings; // 8 bytes
+	Bit16u programSettings; // 8 bytes
+	Bit16u rhythmMaxTable; // 4 bytes
+	Bit16u patchMaxTable; // 16 bytes
+	Bit16u systemMaxTable; // 23 bytes
+	Bit16u timbreMaxTable; // 72 bytes
+};
+
+struct ControlROMPCMStruct {
+	Bit8u pos;
+	Bit8u len;
+	Bit8u pitchLSB;
+	Bit8u pitchMSB;
+};
 
 struct PCMWaveEntry {
 	Bit32u addr;
@@ -216,8 +233,6 @@ struct PatchCache {
 	const TimbreParam::PartialParam *partialParam;
 };
 
-class Partial; // Forward reference for class defined in partial.h
-
 }
 
 #endif
diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index 3bff429875..6df7eb9e31 100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
@@ -22,12 +22,19 @@
 
 #include "mt32emu.h"
 #include "mmath.h"
-#include "PartialManager.h"
+#include "internals.h"
+
+#include "Analog.h"
 #include "BReverbModel.h"
-#include "common/debug.h"
+#include "MemoryRegion.h"
+#include "MidiEventQueue.h"
+#include "PartialManager.h"
 
 namespace MT32Emu {
 
+// MIDI interface data transfer rate in samples. Used to simulate the transfer delay.
+static const double MIDI_DATA_TRANSFER_RATE = (double)SAMPLE_RATE / 31250.0 * 8.0;
+
 static const ControlROMMap ControlROMMaps[7] = {
 	// ID    IDc IDbytes                     PCMmap  PCMc  tmbrA   tmbrAO, tmbrAC tmbrB   tmbrBO, tmbrBC tmbrR   trC  rhythm  rhyC  rsrv    panpot  prog    rhyMax  patMax  sysMax  timMax
 	{0x4014, 22, "\000 ver1.04 14 July 87 ", 0x3000,  128, 0x8000, 0x0000, false, 0xC000, 0x4000, false, 0x3200,  30, 0x73A6,  85,  0x57C7, 0x57E2, 0x57D0, 0x5252, 0x525E, 0x526E, 0x520A},
@@ -46,18 +53,15 @@ static inline void advanceStreamPosition(Sample *&stream, Bit32u posDelta) {
 	}
 }
 
-Bit8u Synth::calcSysexChecksum(const Bit8u *data, Bit32u len, Bit8u checksum) {
+Bit8u Synth::calcSysexChecksum(const Bit8u *data, const Bit32u len, const Bit8u initChecksum) {
+	unsigned int checksum = -initChecksum;
 	for (unsigned int i = 0; i < len; i++) {
-		checksum = checksum + data[i];
+		checksum -= data[i];
 	}
-	checksum = checksum & 0x7f;
-	if (checksum) {
-		checksum = 0x80 - checksum;
-	}
-	return checksum;
+	return Bit8u(checksum & 0x7f);
 }
 
-Synth::Synth(ReportHandler *useReportHandler) {
+Synth::Synth(ReportHandler *useReportHandler) : mt32ram(*new MemParams()), mt32default(*new MemParams()) {
 	isOpen = false;
 	reverbOverridden = false;
 	partialCount = DEFAULT_MAX_PARTIALS;
@@ -75,6 +79,7 @@ Synth::Synth(ReportHandler *useReportHandler) {
 		reverbModels[i] = NULL;
 	}
 	reverbModel = NULL;
+	analog = NULL;
 	setDACInputMode(DACInputMode_NICE);
 	setMIDIDelayMode(MIDIDelayMode_DELAY_SHORT_MESSAGES_ONLY);
 	setOutputGain(1.0f);
@@ -92,6 +97,8 @@ Synth::~Synth() {
 	if (isDefaultReportHandler) {
 		delete reportHandler;
 	}
+	delete &mt32ram;
+	delete &mt32default;
 }
 
 void ReportHandler::showLCDMessage(const char *data) {
@@ -126,7 +133,7 @@ void Synth::printDebug(const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
 #if MT32EMU_DEBUG_SAMPLESTAMPS > 0
-	reportHandler->printDebug("[%u] ", renderedSampleCount);
+	reportHandler->printDebug("[%u] ", (char *)&renderedSampleCount);
 #endif
 	reportHandler->printDebug(fmt, ap);
 	va_end(ap);
@@ -211,10 +218,7 @@ MIDIDelayMode Synth::getMIDIDelayMode() const {
 void Synth::setOutputGain(float newOutputGain) {
 	if (newOutputGain < 0.0f) newOutputGain = -newOutputGain;
 	outputGain = newOutputGain;
-#if !MT32EMU_USE_FLOAT_SAMPLES
-	if (256.0f < newOutputGain) newOutputGain = 256.0f;
-	effectiveOutputGain = int(newOutputGain * 256.0f);
-#endif
+	if (analog != NULL) analog->setSynthOutputGain(newOutputGain);
 }
 
 float Synth::getOutputGain() const {
@@ -224,13 +228,7 @@ float Synth::getOutputGain() const {
 void Synth::setReverbOutputGain(float newReverbOutputGain) {
 	if (newReverbOutputGain < 0.0f) newReverbOutputGain = -newReverbOutputGain;
 	reverbOutputGain = newReverbOutputGain;
-	if (!isMT32ReverbCompatibilityMode()) newReverbOutputGain *= CM32L_REVERB_TO_LA32_ANALOG_OUTPUT_GAIN_FACTOR;
-#if MT32EMU_USE_FLOAT_SAMPLES
-	effectiveReverbOutputGain = newReverbOutputGain;
-#else
-	if (256.0f < newReverbOutputGain) newReverbOutputGain = 256.0f;
-	effectiveReverbOutputGain = int(newReverbOutputGain * 256.0f);
-#endif
+	if (analog != NULL) analog->setReverbOutputGain(newReverbOutputGain, isMT32ReverbCompatibilityMode());
 }
 
 float Synth::getReverbOutputGain() const {
@@ -393,7 +391,11 @@ bool Synth::initTimbres(Bit16u mapAddress, Bit16u offset, int count, int startTi
 	return true;
 }
 
-bool Synth::open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, unsigned int usePartialCount) {
+bool Synth::open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, AnalogOutputMode analogOutputMode) {
+	return open(controlROMImage, pcmROMImage, DEFAULT_MAX_PARTIALS, analogOutputMode);
+}
+
+bool Synth::open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, unsigned int usePartialCount, AnalogOutputMode analogOutputMode) {
 	if (isOpen) {
 		return false;
 	}
@@ -548,6 +550,10 @@ bool Synth::open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, u
 
 	midiQueue = new MidiEventQueue();
 
+	analog = new Analog(analogOutputMode, controlROMFeatures);
+	setOutputGain(outputGain);
+	setReverbOutputGain(reverbOutputGain);
+
 	isOpen = true;
 	isEnabled = false;
 
@@ -565,6 +571,9 @@ void Synth::close(bool forced) {
 	delete midiQueue;
 	midiQueue = NULL;
 
+	delete analog;
+	analog = NULL;
+
 	delete partialManager;
 	partialManager = NULL;
 
@@ -603,16 +612,37 @@ void Synth::flushMIDIQueue() {
 	}
 }
 
-void Synth::setMIDIEventQueueSize(Bit32u useSize) {
-	if (midiQueue != NULL) {
-		flushMIDIQueue();
-		delete midiQueue;
-		midiQueue = new MidiEventQueue(useSize);
+Bit32u Synth::setMIDIEventQueueSize(Bit32u useSize) {
+	static const Bit32u MAX_QUEUE_SIZE = (1 << 24); // This results in about 256 Mb - much greater than any reasonable value
+
+	if (midiQueue == NULL) return 0;
+	flushMIDIQueue();
+
+	// Find a power of 2 that is >= useSize
+	Bit32u binarySize = 1;
+	if (useSize < MAX_QUEUE_SIZE) {
+		// Using simple linear search as this isn't time critical
+		while (binarySize < useSize) binarySize <<= 1;
+	} else {
+		binarySize = MAX_QUEUE_SIZE;
 	}
+	delete midiQueue;
+	midiQueue = new MidiEventQueue(binarySize);
+	return binarySize;
 }
 
 Bit32u Synth::getShortMessageLength(Bit32u msg) {
-	if ((msg & 0xF0) == 0xF0) return 1;
+	if ((msg & 0xF0) == 0xF0) {
+		switch (msg & 0xFF) {
+			case 0xF1:
+			case 0xF3:
+				return 2;
+			case 0xF2:
+				return 3;
+			default:
+				return 1;
+		}
+	}
 	// NOTE: This calculation isn't quite correct
 	// as it doesn't consider the running status byte
 	return ((msg & 0xE0) == 0xC0) ? 2 : 3;
@@ -638,6 +668,7 @@ bool Synth::playMsg(Bit32u msg, Bit32u timestamp) {
 	if (midiDelayMode != MIDIDelayMode_IMMEDIATE) {
 		timestamp = addMIDIInterfaceDelay(getShortMessageLength(msg), timestamp);
 	}
+	if (!isEnabled) isEnabled = true;
 	return midiQueue->pushShortMessage(msg, timestamp);
 }
 
@@ -650,16 +681,19 @@ bool Synth::playSysex(const Bit8u *sysex, Bit32u len, Bit32u timestamp) {
 	if (midiDelayMode == MIDIDelayMode_DELAY_ALL) {
 		timestamp = addMIDIInterfaceDelay(len, timestamp);
 	}
+	if (!isEnabled) isEnabled = true;
 	return midiQueue->pushSysex(sysex, len, timestamp);
 }
 
 void Synth::playMsgNow(Bit32u msg) {
-	// FIXME: Implement active sensing
+	// NOTE: Active sense IS implemented in real hardware. However, realtime processing is clearly out of the library scope.
+	//       It is assumed that realtime consumers of the library respond to these MIDI events as appropriate.
+
 	unsigned char code     = (unsigned char)((msg & 0x0000F0) >> 4);
 	unsigned char chan     = (unsigned char)(msg & 0x00000F);
 	unsigned char note     = (unsigned char)((msg & 0x007F00) >> 8);
 	unsigned char velocity = (unsigned char)((msg & 0x7F0000) >> 16);
-	isEnabled = true;
+	if (!isEnabled) isEnabled = true;
 
 	//printDebug("Playing chan %d, code 0x%01x note: 0x%02x", chan, code, note);
 
@@ -831,7 +865,7 @@ void Synth::playSysexWithoutHeader(unsigned char device, unsigned char command,
 		printDebug("playSysexWithoutHeader: Message is too short (%d bytes)!", len);
 		return;
 	}
-	unsigned char checksum = calcSysexChecksum(sysex, len - 1, 0);
+	Bit8u checksum = calcSysexChecksum(sysex, len - 1);
 	if (checksum != sysex[len - 1]) {
 		printDebug("playSysexWithoutHeader: Message checksum is incorrect (provided: %02x, expected: %02x)!", sysex[len - 1], checksum);
 		return;
@@ -1410,9 +1444,8 @@ void MidiEvent::setSysex(const Bit8u *useSysexData, Bit32u useSysexLength, Bit32
 	memcpy(dstSysexData, useSysexData, sysexLength);
 }
 
-MidiEventQueue::MidiEventQueue(Bit32u useRingBufferSize) : ringBufferSize(useRingBufferSize) {
-	ringBuffer = new MidiEvent[ringBufferSize];
-	memset(ringBuffer, 0, ringBufferSize * sizeof(MidiEvent));
+MidiEventQueue::MidiEventQueue(Bit32u useRingBufferSize) : ringBuffer(new MidiEvent[useRingBufferSize]), ringBufferMask(useRingBufferSize - 1) {
+	memset(ringBuffer, 0, useRingBufferSize * sizeof(MidiEvent));
 	reset();
 }
 
@@ -1426,7 +1459,7 @@ void MidiEventQueue::reset() {
 }
 
 bool MidiEventQueue::pushShortMessage(Bit32u shortMessageData, Bit32u timestamp) {
-	unsigned int newEndPosition = (endPosition + 1) % ringBufferSize;
+	Bit32u newEndPosition = (endPosition + 1) & ringBufferMask;
 	// Is ring buffer full?
 	if (startPosition == newEndPosition) return false;
 	ringBuffer[endPosition].setShortMessage(shortMessageData, timestamp);
@@ -1435,7 +1468,7 @@ bool MidiEventQueue::pushShortMessage(Bit32u shortMessageData, Bit32u timestamp)
 }
 
 bool MidiEventQueue::pushSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp) {
-	unsigned int newEndPosition = (endPosition + 1) % ringBufferSize;
+	Bit32u newEndPosition = (endPosition + 1) & ringBufferMask;
 	// Is ring buffer full?
 	if (startPosition == newEndPosition) return false;
 	ringBuffer[endPosition].setSysex(sysexData, sysexLength, timestamp);
@@ -1450,31 +1483,36 @@ const MidiEvent *MidiEventQueue::peekMidiEvent() {
 void MidiEventQueue::dropMidiEvent() {
 	// Is ring buffer empty?
 	if (startPosition != endPosition) {
-		startPosition = (startPosition + 1) % ringBufferSize;
+		startPosition = (startPosition + 1) & ringBufferMask;
 	}
 }
 
+bool MidiEventQueue::isFull() const {
+	return startPosition == ((endPosition + 1) & ringBufferMask);
+}
+
+unsigned int Synth::getStereoOutputSampleRate() const {
+	return (analog == NULL) ? SAMPLE_RATE : analog->getOutputSampleRate();
+}
+
 void Synth::render(Sample *stream, Bit32u len) {
-	Sample tmpNonReverbLeft[MAX_SAMPLES_PER_RUN];
-	Sample tmpNonReverbRight[MAX_SAMPLES_PER_RUN];
-	Sample tmpReverbDryLeft[MAX_SAMPLES_PER_RUN];
-	Sample tmpReverbDryRight[MAX_SAMPLES_PER_RUN];
-	Sample tmpReverbWetLeft[MAX_SAMPLES_PER_RUN];
-	Sample tmpReverbWetRight[MAX_SAMPLES_PER_RUN];
+	if (!isEnabled) {
+		renderedSampleCount += analog->getDACStreamsLength(len);
+		analog->process(NULL, NULL, NULL, NULL, NULL, NULL, NULL, len);
+		muteSampleBuffer(stream, len << 1);
+		return;
+	}
+
+	// As in AnalogOutputMode_ACCURATE mode output is upsampled, buffer size MAX_SAMPLES_PER_RUN is more than enough.
+	Sample tmpNonReverbLeft[MAX_SAMPLES_PER_RUN], tmpNonReverbRight[MAX_SAMPLES_PER_RUN];
+	Sample tmpReverbDryLeft[MAX_SAMPLES_PER_RUN], tmpReverbDryRight[MAX_SAMPLES_PER_RUN];
+	Sample tmpReverbWetLeft[MAX_SAMPLES_PER_RUN], tmpReverbWetRight[MAX_SAMPLES_PER_RUN];
 
 	while (len > 0) {
-		Bit32u thisLen = len > MAX_SAMPLES_PER_RUN ? MAX_SAMPLES_PER_RUN : len;
-		renderStreams(tmpNonReverbLeft, tmpNonReverbRight, tmpReverbDryLeft, tmpReverbDryRight, tmpReverbWetLeft, tmpReverbWetRight, thisLen);
-		for (Bit32u i = 0; i < thisLen; i++) {
-#if MT32EMU_USE_FLOAT_SAMPLES
-			*(stream++) = tmpNonReverbLeft[i] + tmpReverbDryLeft[i] + tmpReverbWetLeft[i];
-			*(stream++) = tmpNonReverbRight[i] + tmpReverbDryRight[i] + tmpReverbWetRight[i];
-#else
-			*(stream++) = clipBit16s((Bit32s)tmpNonReverbLeft[i] + (Bit32s)tmpReverbDryLeft[i] + (Bit32s)tmpReverbWetLeft[i]);
-			*(stream++) = clipBit16s((Bit32s)tmpNonReverbRight[i] + (Bit32s)tmpReverbDryRight[i] + (Bit32s)tmpReverbWetRight[i]);
-#endif
-		}
-		len -= thisLen;
+		Bit32u thisPassLen = len > MAX_SAMPLES_PER_RUN ? MAX_SAMPLES_PER_RUN : len;
+		renderStreams(tmpNonReverbLeft, tmpNonReverbRight, tmpReverbDryLeft, tmpReverbDryRight, tmpReverbWetLeft, tmpReverbWetRight, analog->getDACStreamsLength(thisPassLen));
+		analog->process(&stream, tmpNonReverbLeft, tmpNonReverbRight, tmpReverbDryLeft, tmpReverbDryRight, tmpReverbWetLeft, tmpReverbWetRight, thisPassLen);
+		len -= thisPassLen;
 	}
 }
 
@@ -1518,7 +1556,10 @@ void Synth::renderStreams(Sample *nonReverbLeft, Sample *nonReverbRight, Sample
 // In GENERATION2 units, the output from LA32 goes to the Boss chip already bit-shifted.
 // In NICE mode, it's also better to increase volume before the reverb processing to preserve accuracy.
 void Synth::produceLA32Output(Sample *buffer, Bit32u len) {
-#if !MT32EMU_USE_FLOAT_SAMPLES
+#if MT32EMU_USE_FLOAT_SAMPLES
+	(void)buffer;
+	(void)len;
+#else
 	switch (dacInputMode) {
 		case DACInputMode_GENERATION2:
 			while (len--) {
@@ -1528,7 +1569,7 @@ void Synth::produceLA32Output(Sample *buffer, Bit32u len) {
 			break;
 		case DACInputMode_NICE:
 			while (len--) {
-				*buffer = clipBit16s(Bit32s(*buffer) << 1);
+				*buffer = clipSampleEx(SampleEx(*buffer) << 1);
 				++buffer;
 			}
 			break;
@@ -1538,26 +1579,16 @@ void Synth::produceLA32Output(Sample *buffer, Bit32u len) {
 #endif
 }
 
-void Synth::convertSamplesToOutput(Sample *buffer, Bit32u len, bool reverb) {
-	if (dacInputMode == DACInputMode_PURE) return;
-
+void Synth::convertSamplesToOutput(Sample *buffer, Bit32u len) {
 #if MT32EMU_USE_FLOAT_SAMPLES
-	float gain = reverb ? effectiveReverbOutputGain : outputGain;
-	while (len--) {
-		*(buffer++) *= gain;
-	}
+	(void)buffer;
+	(void)len;
 #else
-	int gain = reverb ? effectiveReverbOutputGain : effectiveOutputGain;
 	if (dacInputMode == DACInputMode_GENERATION1) {
 		while (len--) {
-			Bit32s target = Bit16s((*buffer & 0x8000) | ((*buffer << 1) & 0x7FFE));
-			*(buffer++) = clipBit16s((target * gain) >> 8);
+			*buffer = Sample((*buffer & 0x8000) | ((*buffer << 1) & 0x7FFE));
+			++buffer;
 		}
-		return;
-	}
-	while (len--) {
-		*buffer = clipBit16s((Bit32s(*buffer) * gain) >> 8);
-		++buffer;
 	}
 #endif
 }
@@ -1566,18 +1597,18 @@ void Synth::doRenderStreams(Sample *nonReverbLeft, Sample *nonReverbRight, Sampl
 	// Even if LA32 output isn't desired, we proceed anyway with temp buffers
 	Sample tmpBufNonReverbLeft[MAX_SAMPLES_PER_RUN], tmpBufNonReverbRight[MAX_SAMPLES_PER_RUN];
 	if (nonReverbLeft == NULL) nonReverbLeft = tmpBufNonReverbLeft;
-	if (nonReverbLeft == NULL) nonReverbRight = tmpBufNonReverbRight;
+	if (nonReverbRight == NULL) nonReverbRight = tmpBufNonReverbRight;
 
 	Sample tmpBufReverbDryLeft[MAX_SAMPLES_PER_RUN], tmpBufReverbDryRight[MAX_SAMPLES_PER_RUN];
 	if (reverbDryLeft == NULL) reverbDryLeft = tmpBufReverbDryLeft;
 	if (reverbDryRight == NULL) reverbDryRight = tmpBufReverbDryRight;
 
-	muteSampleBuffer(nonReverbLeft, len);
-	muteSampleBuffer(nonReverbRight, len);
-	muteSampleBuffer(reverbDryLeft, len);
-	muteSampleBuffer(reverbDryRight, len);
-
 	if (isEnabled) {
+		muteSampleBuffer(nonReverbLeft, len);
+		muteSampleBuffer(nonReverbRight, len);
+		muteSampleBuffer(reverbDryLeft, len);
+		muteSampleBuffer(reverbDryRight, len);
+
 		for (unsigned int i = 0; i < getPartialCount(); i++) {
 			if (partialManager->shouldReverb(i)) {
 				partialManager->produceOutput(i, reverbDryLeft, reverbDryRight, len);
@@ -1591,8 +1622,8 @@ void Synth::doRenderStreams(Sample *nonReverbLeft, Sample *nonReverbRight, Sampl
 
 		if (isReverbEnabled()) {
 			reverbModel->process(reverbDryLeft, reverbDryRight, reverbWetLeft, reverbWetRight, len);
-			if (reverbWetLeft != NULL) convertSamplesToOutput(reverbWetLeft, len, true);
-			if (reverbWetRight != NULL) convertSamplesToOutput(reverbWetRight, len, true);
+			if (reverbWetLeft != NULL) convertSamplesToOutput(reverbWetLeft, len);
+			if (reverbWetRight != NULL) convertSamplesToOutput(reverbWetRight, len);
 		} else {
 			muteSampleBuffer(reverbWetLeft, len);
 			muteSampleBuffer(reverbWetRight, len);
@@ -1601,15 +1632,20 @@ void Synth::doRenderStreams(Sample *nonReverbLeft, Sample *nonReverbRight, Sampl
 		// Don't bother with conversion if the output is going to be unused
 		if (nonReverbLeft != tmpBufNonReverbLeft) {
 			produceLA32Output(nonReverbLeft, len);
-			convertSamplesToOutput(nonReverbLeft, len, false);
+			convertSamplesToOutput(nonReverbLeft, len);
 		}
 		if (nonReverbRight != tmpBufNonReverbRight) {
 			produceLA32Output(nonReverbRight, len);
-			convertSamplesToOutput(nonReverbRight, len, false);
+			convertSamplesToOutput(nonReverbRight, len);
 		}
-		if (reverbDryLeft != tmpBufReverbDryLeft) convertSamplesToOutput(reverbDryLeft, len, false);
-		if (reverbDryRight != tmpBufReverbDryRight) convertSamplesToOutput(reverbDryRight, len, false);
+		if (reverbDryLeft != tmpBufReverbDryLeft) convertSamplesToOutput(reverbDryLeft, len);
+		if (reverbDryRight != tmpBufReverbDryRight) convertSamplesToOutput(reverbDryRight, len);
 	} else {
+		// Avoid muting buffers that wasn't requested
+		if (nonReverbLeft != tmpBufNonReverbLeft) muteSampleBuffer(nonReverbLeft, len);
+		if (nonReverbRight != tmpBufNonReverbRight) muteSampleBuffer(nonReverbRight, len);
+		if (reverbDryLeft != tmpBufReverbDryLeft) muteSampleBuffer(reverbDryLeft, len);
+		if (reverbDryRight != tmpBufReverbDryRight) muteSampleBuffer(reverbDryRight, len);
 		muteSampleBuffer(reverbWetLeft, len);
 		muteSampleBuffer(reverbWetRight, len);
 	}
@@ -1651,14 +1687,48 @@ bool Synth::isActive() const {
 	return false;
 }
 
-const Partial *Synth::getPartial(unsigned int partialNum) const {
-	return partialManager->getPartial(partialNum);
-}
-
 unsigned int Synth::getPartialCount() const {
 	return partialCount;
 }
 
+void Synth::getPartStates(bool *partStates) const {
+	for (int partNumber = 0; partNumber < 9; partNumber++) {
+		const Part *part = parts[partNumber];
+		partStates[partNumber] = part->getActiveNonReleasingPartialCount() > 0;
+	}
+}
+
+void Synth::getPartialStates(PartialState *partialStates) const {
+	static const PartialState partialPhaseToState[8] = {
+		PartialState_ATTACK, PartialState_ATTACK, PartialState_ATTACK, PartialState_ATTACK,
+		PartialState_SUSTAIN, PartialState_SUSTAIN, PartialState_RELEASE, PartialState_INACTIVE
+	};
+
+	for (unsigned int partialNum = 0; partialNum < getPartialCount(); partialNum++) {
+		const Partial *partial = partialManager->getPartial(partialNum);
+		partialStates[partialNum] = partial->isActive() ? partialPhaseToState[partial->getTVA()->getPhase()] : PartialState_INACTIVE;
+	}
+}
+
+unsigned int Synth::getPlayingNotes(unsigned int partNumber, Bit8u *keys, Bit8u *velocities) const {
+	unsigned int playingNotes = 0;
+	if (isOpen && (partNumber < 9)) {
+		const Part *part = parts[partNumber];
+		const Poly *poly = part->getFirstActivePoly();
+		while (poly != NULL) {
+			keys[playingNotes] = (Bit8u)poly->getKey();
+			velocities[playingNotes] = (Bit8u)poly->getVelocity();
+			playingNotes++;
+			poly = poly->getNext();
+		}
+	}
+	return playingNotes;
+}
+
+const char *Synth::getPatchName(unsigned int partNumber) const {
+	return (!isOpen || partNumber > 8) ? NULL : parts[partNumber]->getCurrentInstr();
+}
+
 const Part *Synth::getPart(unsigned int partNum) const {
 	if (partNum > 8) {
 		return NULL;
diff --git a/audio/softsynth/mt32/Synth.h b/audio/softsynth/mt32/Synth.h
index 37fb7b280a..97d4644ee2 100644
--- a/audio/softsynth/mt32/Synth.h
+++ b/audio/softsynth/mt32/Synth.h
@@ -19,15 +19,31 @@
 #define MT32EMU_SYNTH_H
 
 //#include <cstdarg>
+//#include <cstring>
 
 namespace MT32Emu {
 
-class TableInitialiser;
+class Analog;
+class BReverbModel;
+class MemoryRegion;
+class MidiEventQueue;
+class Part;
+class Poly;
 class Partial;
 class PartialManager;
-class Part;
-class ROMImage;
-class BReverbModel;
+
+class PatchTempMemoryRegion;
+class RhythmTempMemoryRegion;
+class TimbreTempMemoryRegion;
+class PatchesMemoryRegion;
+class TimbresMemoryRegion;
+class SystemMemoryRegion;
+class DisplayMemoryRegion;
+class ResetMemoryRegion;
+
+struct ControlROMMap;
+struct PCMWaveEntry;
+struct MemParams;
 
 /**
  * Methods for emulating the connection between the LA32 and the DAC, which involves
@@ -43,8 +59,7 @@ enum DACInputMode {
 	// Produces samples that exactly match the bits output from the emulated LA32.
 	// * Nicer overdrive characteristics than the DAC hacks (it simply clips samples within range)
 	// * Much less likely to overdrive than any other mode.
-	// * Half the volume of any of the other modes, meaning its volume relative to the reverb
-	//   output when mixed together directly will sound wrong.
+	// * Half the volume of any of the other modes.
 	// * Output gain is ignored for both LA32 and reverb output.
 	// * Perfect for developers while debugging :)
 	DACInputMode_PURE,
@@ -60,6 +75,7 @@ enum DACInputMode {
 	DACInputMode_GENERATION2
 };
 
+// Methods for emulating the effective delay of incoming MIDI messages introduced by a MIDI interface.
 enum MIDIDelayMode {
 	// Process incoming MIDI events immediately.
 	MIDIDelayMode_IMMEDIATE,
@@ -72,6 +88,35 @@ enum MIDIDelayMode {
 	MIDIDelayMode_DELAY_ALL
 };
 
+// Methods for emulating the effects of analogue circuits of real hardware units on the output signal.
+enum AnalogOutputMode {
+	// Only digital path is emulated. The output samples correspond to the digital signal at the DAC entrance.
+	AnalogOutputMode_DIGITAL_ONLY,
+	// Coarse emulation of LPF circuit. High frequencies are boosted, sample rate remains unchanged.
+	AnalogOutputMode_COARSE,
+	// Finer emulation of LPF circuit. Output signal is upsampled to 48 kHz to allow emulation of audible mirror spectra above 16 kHz,
+	// which is passed through the LPF circuit without significant attenuation.
+	AnalogOutputMode_ACCURATE,
+	// Same as AnalogOutputMode_ACCURATE mode but the output signal is 2x oversampled, i.e. the output sample rate is 96 kHz.
+	// This makes subsequent resampling easier. Besides, due to nonlinear passband of the LPF emulated, it takes fewer number of MACs
+	// compared to a regular LPF FIR implementations.
+	AnalogOutputMode_OVERSAMPLED
+};
+
+enum ReverbMode {
+	REVERB_MODE_ROOM,
+	REVERB_MODE_HALL,
+	REVERB_MODE_PLATE,
+	REVERB_MODE_TAP_DELAY
+};
+
+enum PartialState {
+	PartialState_INACTIVE,
+	PartialState_ATTACK,
+	PartialState_SUSTAIN,
+	PartialState_RELEASE
+};
+
 const Bit8u SYSEX_MANUFACTURER_ROLAND = 0x41;
 
 const Bit8u SYSEX_MDL_MT32 = 0x16;
@@ -87,148 +132,10 @@ const Bit8u SYSEX_CMD_EOD = 0x45; // End of data
 const Bit8u SYSEX_CMD_ERR = 0x4E; // Communications error
 const Bit8u SYSEX_CMD_RJC = 0x4F; // Rejection
 
-const int MAX_SYSEX_SIZE = 512;
+const int MAX_SYSEX_SIZE = 512; // FIXME: Does this correspond to a real MIDI buffer used in h/w devices?
 
 const unsigned int CONTROL_ROM_SIZE = 64 * 1024;
 
-struct ControlROMPCMStruct {
-	Bit8u pos;
-	Bit8u len;
-	Bit8u pitchLSB;
-	Bit8u pitchMSB;
-};
-
-struct ControlROMMap {
-	Bit16u idPos;
-	Bit16u idLen;
-	const char *idBytes;
-	Bit16u pcmTable; // 4 * pcmCount bytes
-	Bit16u pcmCount;
-	Bit16u timbreAMap; // 128 bytes
-	Bit16u timbreAOffset;
-	bool timbreACompressed;
-	Bit16u timbreBMap; // 128 bytes
-	Bit16u timbreBOffset;
-	bool timbreBCompressed;
-	Bit16u timbreRMap; // 2 * timbreRCount bytes
-	Bit16u timbreRCount;
-	Bit16u rhythmSettings; // 4 * rhythmSettingsCount bytes
-	Bit16u rhythmSettingsCount;
-	Bit16u reserveSettings; // 9 bytes
-	Bit16u panSettings; // 8 bytes
-	Bit16u programSettings; // 8 bytes
-	Bit16u rhythmMaxTable; // 4 bytes
-	Bit16u patchMaxTable; // 16 bytes
-	Bit16u systemMaxTable; // 23 bytes
-	Bit16u timbreMaxTable; // 72 bytes
-};
-
-enum MemoryRegionType {
-	MR_PatchTemp, MR_RhythmTemp, MR_TimbreTemp, MR_Patches, MR_Timbres, MR_System, MR_Display, MR_Reset
-};
-
-enum ReverbMode {
-	REVERB_MODE_ROOM,
-	REVERB_MODE_HALL,
-	REVERB_MODE_PLATE,
-	REVERB_MODE_TAP_DELAY
-};
-
-class MemoryRegion {
-private:
-	Synth *synth;
-	Bit8u *realMemory;
-	Bit8u *maxTable;
-public:
-	MemoryRegionType type;
-	Bit32u startAddr, entrySize, entries;
-
-	MemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable, MemoryRegionType useType, Bit32u useStartAddr, Bit32u useEntrySize, Bit32u useEntries) {
-		synth = useSynth;
-		realMemory = useRealMemory;
-		maxTable = useMaxTable;
-		type = useType;
-		startAddr = useStartAddr;
-		entrySize = useEntrySize;
-		entries = useEntries;
-	}
-	int lastTouched(Bit32u addr, Bit32u len) const {
-		return (offset(addr) + len - 1) / entrySize;
-	}
-	int firstTouchedOffset(Bit32u addr) const {
-		return offset(addr) % entrySize;
-	}
-	int firstTouched(Bit32u addr) const {
-		return offset(addr) / entrySize;
-	}
-	Bit32u regionEnd() const {
-		return startAddr + entrySize * entries;
-	}
-	bool contains(Bit32u addr) const {
-		return addr >= startAddr && addr < regionEnd();
-	}
-	int offset(Bit32u addr) const {
-		return addr - startAddr;
-	}
-	Bit32u getClampedLen(Bit32u addr, Bit32u len) const {
-		if (addr + len > regionEnd())
-			return regionEnd() - addr;
-		return len;
-	}
-	Bit32u next(Bit32u addr, Bit32u len) const {
-		if (addr + len > regionEnd()) {
-			return regionEnd() - addr;
-		}
-		return 0;
-	}
-	Bit8u getMaxValue(int off) const {
-		if (maxTable == NULL)
-			return 0xFF;
-		return maxTable[off % entrySize];
-	}
-	Bit8u *getRealMemory() const {
-		return realMemory;
-	}
-	bool isReadable() const {
-		return getRealMemory() != NULL;
-	}
-	void read(unsigned int entry, unsigned int off, Bit8u *dst, unsigned int len) const;
-	void write(unsigned int entry, unsigned int off, const Bit8u *src, unsigned int len, bool init = false) const;
-};
-
-class PatchTempMemoryRegion : public MemoryRegion {
-public:
-	PatchTempMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_PatchTemp, MT32EMU_MEMADDR(0x030000), sizeof(MemParams::PatchTemp), 9) {}
-};
-class RhythmTempMemoryRegion : public MemoryRegion {
-public:
-	RhythmTempMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_RhythmTemp, MT32EMU_MEMADDR(0x030110), sizeof(MemParams::RhythmTemp), 85) {}
-};
-class TimbreTempMemoryRegion : public MemoryRegion {
-public:
-	TimbreTempMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_TimbreTemp, MT32EMU_MEMADDR(0x040000), sizeof(TimbreParam), 8) {}
-};
-class PatchesMemoryRegion : public MemoryRegion {
-public:
-	PatchesMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_Patches, MT32EMU_MEMADDR(0x050000), sizeof(PatchParam), 128) {}
-};
-class TimbresMemoryRegion : public MemoryRegion {
-public:
-	TimbresMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_Timbres, MT32EMU_MEMADDR(0x080000), sizeof(MemParams::PaddedTimbre), 64 + 64 + 64 + 64) {}
-};
-class SystemMemoryRegion : public MemoryRegion {
-public:
-	SystemMemoryRegion(Synth *useSynth, Bit8u *useRealMemory, Bit8u *useMaxTable) : MemoryRegion(useSynth, useRealMemory, useMaxTable, MR_System, MT32EMU_MEMADDR(0x100000), sizeof(MemParams::System), 1) {}
-};
-class DisplayMemoryRegion : public MemoryRegion {
-public:
-	DisplayMemoryRegion(Synth *useSynth) : MemoryRegion(useSynth, NULL, NULL, MR_Display, MT32EMU_MEMADDR(0x200000), MAX_SYSEX_SIZE - 1, 1) {}
-};
-class ResetMemoryRegion : public MemoryRegion {
-public:
-	ResetMemoryRegion(Synth *useSynth) : MemoryRegion(useSynth, NULL, NULL, MR_Reset, MT32EMU_MEMADDR(0x7F0000), 0x3FFF, 1) {}
-};
-
 class ReportHandler {
 friend class Synth;
 
@@ -254,47 +161,6 @@ protected:
 	virtual void onProgramChanged(int /* partNum */, int /* bankNum */, const char * /* patchName */) {}
 };
 
-/**
- * Used to safely store timestamped MIDI events in a local queue.
- */
-struct MidiEvent {
-	Bit32u shortMessageData;
-	const Bit8u *sysexData;
-	Bit32u sysexLength;
-	Bit32u timestamp;
-
-	~MidiEvent();
-	void setShortMessage(Bit32u shortMessageData, Bit32u timestamp);
-	void setSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp);
-};
-
-/**
- * Simple queue implementation using a ring buffer to store incoming MIDI event before the synth actually processes it.
- * It is intended to:
- * - get rid of prerenderer while retaining graceful partial abortion
- * - add fair emulation of the MIDI interface delays
- * - extend the synth interface with the default implementation of a typical rendering loop.
- * THREAD SAFETY:
- * It is safe to use either in a single thread environment or when there are only two threads - one performs only reading
- * and one performs only writing. More complicated usage requires external synchronisation.
- */
-class MidiEventQueue {
-private:
-	MidiEvent *ringBuffer;
-	Bit32u ringBufferSize;
-	volatile Bit32u startPosition;
-	volatile Bit32u endPosition;
-
-public:
-	MidiEventQueue(Bit32u ringBufferSize = DEFAULT_MIDI_EVENT_QUEUE_SIZE);
-	~MidiEventQueue();
-	void reset();
-	bool pushShortMessage(Bit32u shortMessageData, Bit32u timestamp);
-	bool pushSysex(const Bit8u *sysexData, Bit32u sysexLength, Bit32u timestamp);
-	const MidiEvent *peekMidiEvent();
-	void dropMidiEvent();
-};
-
 class Synth {
 friend class Part;
 friend class RhythmPart;
@@ -335,7 +201,7 @@ private:
 	volatile Bit32u lastReceivedMIDIEventTimestamp;
 	volatile Bit32u renderedSampleCount;
 
-	MemParams mt32ram, mt32default;
+	MemParams &mt32ram, &mt32default;
 
 	BReverbModel *reverbModels[4];
 	BReverbModel *reverbModel;
@@ -346,12 +212,6 @@ private:
 
 	float outputGain;
 	float reverbOutputGain;
-#if MT32EMU_USE_FLOAT_SAMPLES
-	float effectiveReverbOutputGain;
-#else
-	int effectiveOutputGain;
-	int effectiveReverbOutputGain;
-#endif
 
 	bool reversedStereoEnabled;
 
@@ -368,11 +228,12 @@ private:
 	// We emulate this by delaying new MIDI events processing until abortion finishes.
 	Poly *abortingPoly;
 
-	Bit32u getShortMessageLength(Bit32u msg);
+	Analog *analog;
+
 	Bit32u addMIDIInterfaceDelay(Bit32u len, Bit32u timestamp);
 
 	void produceLA32Output(Sample *buffer, Bit32u len);
-	void convertSamplesToOutput(Sample *buffer, Bit32u len, bool reverb);
+	void convertSamplesToOutput(Sample *buffer, Bit32u len);
 	bool isAbortingPoly() const;
 	void doRenderStreams(Sample *nonReverbLeft, Sample *nonReverbRight, Sample *reverbDryLeft, Sample *reverbDryRight, Sample *reverbWetLeft, Sample *reverbWetRight, Bit32u len);
 
@@ -404,13 +265,20 @@ private:
 	void newTimbreSet(int partNum, Bit8u timbreGroup, const char patchName[]);
 	void printDebug(const char *fmt, ...);
 
+	// partNum should be 0..7 for Part 1..8, or 8 for Rhythm
+	const Part *getPart(unsigned int partNum) const;
+
 public:
-	static inline Bit16s clipBit16s(Bit32s sample) {
+	static inline Sample clipSampleEx(SampleEx sampleEx) {
+#if MT32EMU_USE_FLOAT_SAMPLES
+		return sampleEx;
+#else
 		// Clamp values above 32767 to 32767, and values below -32768 to -32768
 		// FIXME: Do we really need this stuff? I think these branches are very well predicted. Instead, this introduces a chain.
 		// The version below is actually a bit faster on my system...
-		//return ((sample + 0x8000) & ~0xFFFF) ? (sample >> 31) ^ 0x7FFF : (Bit16s)sample;
-		return ((-0x8000 <= sample) && (sample <= 0x7FFF)) ? (Bit16s)sample : (sample >> 31) ^ 0x7FFF;
+		//return ((sampleEx + 0x8000) & ~0xFFFF) ? (sampleEx >> 31) ^ 0x7FFF : (Sample)sampleEx;
+		return ((-0x8000 <= sampleEx) && (sampleEx <= 0x7FFF)) ? (Sample)sampleEx : (sampleEx >> 31) ^ 0x7FFF;
+#endif
 	}
 
 	static inline void muteSampleBuffer(Sample *buffer, Bit32u len) {
@@ -426,7 +294,8 @@ public:
 #endif
 	}
 
-	static Bit8u calcSysexChecksum(const Bit8u *data, Bit32u len, Bit8u checksum);
+	static Bit32u getShortMessageLength(Bit32u msg);
+	static Bit8u calcSysexChecksum(const Bit8u *data, const Bit32u len, const Bit8u initChecksum = 0);
 
 	// Optionally sets callbacks for reporting various errors, information and debug messages
 	Synth(ReportHandler *useReportHandler = NULL);
@@ -435,8 +304,12 @@ public:
 	// Used to initialise the MT-32. Must be called before any other function.
 	// Returns true if initialization was sucessful, otherwise returns false.
 	// controlROMImage and pcmROMImage represent Control and PCM ROM images for use by synth.
-	// usePartialCount sets the maximum number of partials playing simultaneously for this session.
-	bool open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, unsigned int usePartialCount = DEFAULT_MAX_PARTIALS);
+	// usePartialCount sets the maximum number of partials playing simultaneously for this session (optional).
+	// analogOutputMode sets the mode for emulation of analogue circuitry of the hardware units (optional).
+	bool open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, unsigned int usePartialCount = DEFAULT_MAX_PARTIALS, AnalogOutputMode analogOutputMode = AnalogOutputMode_COARSE);
+
+	// Overloaded method which opens the synth with default partial count.
+	bool open(const ROMImage &controlROMImage, const ROMImage &pcmROMImage, AnalogOutputMode analogOutputMode);
 
 	// Closes the MT-32 and deallocates any memory used by the synthesizer
 	void close(bool forced = false);
@@ -444,29 +317,34 @@ public:
 	// All the enqueued events are processed by the synth immediately.
 	void flushMIDIQueue();
 
-	// Sets size of the internal MIDI event queue.
+	// Sets size of the internal MIDI event queue. The queue size is set to the minimum power of 2 that is greater or equal to the size specified.
 	// The queue is flushed before reallocation.
-	void setMIDIEventQueueSize(Bit32u);
+	// Returns the actual queue size being used.
+	Bit32u setMIDIEventQueueSize(Bit32u);
 
 	// Enqueues a MIDI event for subsequent playback.
-	// The minimum delay involves the delay introduced while the event is transferred via MIDI interface
+	// The MIDI event will be processed not before the specified timestamp.
+	// The timestamp is measured as the global rendered sample count since the synth was created (at the native sample rate 32000 Hz).
+	// The minimum delay involves emulation of the delay introduced while the event is transferred via MIDI interface
 	// and emulation of the MCU busy-loop while it frees partials for use by a new Poly.
-	// Calls from multiple threads must be synchronised, although,
-	// no synchronisation is required with the rendering thread.
+	// Calls from multiple threads must be synchronised, although, no synchronisation is required with the rendering thread.
+	// The methods return false if the MIDI event queue is full and the message cannot be enqueued.
 
-	// The MIDI event will be processed not before the specified timestamp.
-	// The timestamp is measured as the global rendered sample count since the synth was created.
+	// Enqueues a single short MIDI message. The message must contain a status byte.
 	bool playMsg(Bit32u msg, Bit32u timestamp);
+	// Enqueues a single well formed System Exclusive MIDI message.
 	bool playSysex(const Bit8u *sysex, Bit32u len, Bit32u timestamp);
-	// The MIDI event will be processed ASAP.
+
+	// Overloaded methods for the MIDI events to be processed ASAP.
 	bool playMsg(Bit32u msg);
 	bool playSysex(const Bit8u *sysex, Bit32u len);
 
 	// WARNING:
 	// The methods below don't ensure minimum 1-sample delay between sequential MIDI events,
 	// and a sequence of NoteOn and immediately succeeding NoteOff messages is always silent.
+	// A thread that invokes these methods must be explicitly synchronised with the thread performing sample rendering.
 
-	// Sends a 4-byte MIDI message to the MT-32 for immediate playback.
+	// Sends a short MIDI message to the synth for immediate playback. The message must contain a status byte.
 	void playMsgNow(Bit32u msg);
 	void playMsgOnPart(unsigned char part, unsigned char code, unsigned char note, unsigned char velocity);
 
@@ -495,12 +373,17 @@ public:
 	void setMIDIDelayMode(MIDIDelayMode mode);
 	MIDIDelayMode getMIDIDelayMode() const;
 
-	// Sets output gain factor. Applied to all output samples and unrelated with the synth's Master volume.
+	// Sets output gain factor for synth output channels. Applied to all output samples and unrelated with the synth's Master volume,
+	// it rather corresponds to the gain of the output analog circuitry of the hardware units. However, together with setReverbOutputGain()
+	// it offers to the user a capability to control the gain of reverb and non-reverb output channels independently.
 	// Ignored in DACInputMode_PURE
 	void setOutputGain(float);
 	float getOutputGain() const;
 
-	// Sets output gain factor for the reverb wet output. setOutputGain() doesn't change reverb output gain.
+	// Sets output gain factor for the reverb wet output channels. It rather corresponds to the gain of the output
+	// analog circuitry of the hardware units. However, together with setOutputGain() it offers to the user a capability
+	// to control the gain of reverb and non-reverb output channels independently.
+	//
 	// Note: We're currently emulate CM-32L/CM-64 reverb quite accurately and the reverb output level closely
 	// corresponds to the level of digital capture. Although, according to the CM-64 PCB schematic,
 	// there is a difference in the reverb analogue circuit, and the resulting output gain is 0.68
@@ -512,12 +395,21 @@ public:
 	void setReversedStereoEnabled(bool enabled);
 	bool isReversedStereoEnabled();
 
-	// Renders samples to the specified output stream.
-	// The length is in frames, not bytes (in 16-bit stereo,
-	// one frame is 4 bytes).
+	// Returns actual sample rate used in emulation of stereo analog circuitry of hardware units.
+	// See comment for render() below.
+	unsigned int getStereoOutputSampleRate() const;
+
+	// Renders samples to the specified output stream as if they were sampled at the analog stereo output.
+	// When AnalogOutputMode is set to ACCURATE, the output signal is upsampled to 48 kHz in order
+	// to retain emulation accuracy in whole audible frequency spectra. Otherwise, native digital signal sample rate is retained.
+	// getStereoOutputSampleRate() can be used to query actual sample rate of the output signal.
+	// The length is in frames, not bytes (in 16-bit stereo, one frame is 4 bytes).
 	void render(Sample *stream, Bit32u len);
 
-	// Renders samples to the specified output streams (any or all of which may be NULL).
+	// Renders samples to the specified output streams as if they appeared at the DAC entrance.
+	// No further processing performed in analog circuitry emulation is applied to the signal.
+	// NULL may be specified in place of any or all of the stream buffers.
+	// The length is in samples, not bytes.
 	void renderStreams(Sample *nonReverbLeft, Sample *nonReverbRight, Sample *reverbDryLeft, Sample *reverbDryRight, Sample *reverbWetLeft, Sample *reverbWetRight, Bit32u len);
 
 	// Returns true when there is at least one active partial, otherwise false.
@@ -526,15 +418,28 @@ public:
 	// Returns true if hasActivePartials() returns true, or reverb is (somewhat unreliably) detected as being active.
 	bool isActive() const;
 
-	const Partial *getPartial(unsigned int partialNum) const;
-
 	// Returns the maximum number of partials playing simultaneously.
 	unsigned int getPartialCount() const;
 
-	void readMemory(Bit32u addr, Bit32u len, Bit8u *data);
+	// Fills in current states of all the parts into the array provided. The array must have at least 9 entries to fit values for all the parts.
+	// If the value returned for a part is true, there is at least one active non-releasing partial playing on this part.
+	// This info is useful in emulating behaviour of LCD display of the hardware units.
+	void getPartStates(bool *partStates) const;
 
-	// partNum should be 0..7 for Part 1..8, or 8 for Rhythm
-	const Part *getPart(unsigned int partNum) const;
+	// Fills in current states of all the partials into the array provided. The array must be large enough to accommodate states of all the partials.
+	void getPartialStates(PartialState *partialStates) const;
+
+	// Fills in information about currently playing notes on the specified part into the arrays provided. The arrays must be large enough
+	// to accommodate data for all the playing notes. The maximum number of simultaneously playing notes cannot exceed the number of partials.
+	// Argument partNumber should be 0..7 for Part 1..8, or 8 for Rhythm.
+	// Returns the number of currently playing notes on the specified part.
+	unsigned int getPlayingNotes(unsigned int partNumber, Bit8u *keys, Bit8u *velocities) const;
+
+	// Returns name of the patch set on the specified part.
+	// Argument partNumber should be 0..7 for Part 1..8, or 8 for Rhythm.
+	const char *getPatchName(unsigned int partNumber) const;
+
+	void readMemory(Bit32u addr, Bit32u len, Bit8u *data);
 };
 
 }
diff --git a/audio/softsynth/mt32/TVA.cpp b/audio/softsynth/mt32/TVA.cpp
index 3fefb791f2..894e53f14a 100644
--- a/audio/softsynth/mt32/TVA.cpp
+++ b/audio/softsynth/mt32/TVA.cpp
@@ -23,6 +23,7 @@
 
 #include "mt32emu.h"
 #include "mmath.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
diff --git a/audio/softsynth/mt32/TVF.cpp b/audio/softsynth/mt32/TVF.cpp
index bf8d50a7c9..164cf2b4cb 100644
--- a/audio/softsynth/mt32/TVF.cpp
+++ b/audio/softsynth/mt32/TVF.cpp
@@ -19,6 +19,7 @@
 
 #include "mt32emu.h"
 #include "mmath.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
diff --git a/audio/softsynth/mt32/TVP.cpp b/audio/softsynth/mt32/TVP.cpp
index 374646e5f1..a8003d96dc 100644
--- a/audio/softsynth/mt32/TVP.cpp
+++ b/audio/softsynth/mt32/TVP.cpp
@@ -19,6 +19,7 @@
 //#include <cstdlib>
 
 #include "mt32emu.h"
+#include "internals.h"
 
 namespace MT32Emu {
 
diff --git a/audio/softsynth/mt32/Tables.cpp b/audio/softsynth/mt32/Tables.cpp
index ae9f11fff0..7e165b5a7a 100644
--- a/audio/softsynth/mt32/Tables.cpp
+++ b/audio/softsynth/mt32/Tables.cpp
@@ -16,14 +16,15 @@
  */
 
 //#include <cmath>
-//#include <cstdlib>
-//#include <cstring>
 
 #include "mt32emu.h"
 #include "mmath.h"
+#include "Tables.h"
 
 namespace MT32Emu {
 
+// UNUSED: const int MIDDLEC = 60;
+
 const Tables &Tables::getInstance() {
 	static const Tables instance;
 	return instance;
diff --git a/audio/softsynth/mt32/Tables.h b/audio/softsynth/mt32/Tables.h
index e7b97af515..8865c7fac8 100644
--- a/audio/softsynth/mt32/Tables.h
+++ b/audio/softsynth/mt32/Tables.h
@@ -20,24 +20,11 @@
 
 namespace MT32Emu {
 
-// Sample rate to use in mixing. With the progress of development, we've found way too many thing dependent.
-// In order to achieve further advance in emulation accuracy, sample rate made fixed throughout the emulator.
-// The output from the synth is supposed to be resampled to convert the sample rate.
-const unsigned int SAMPLE_RATE = 32000;
-
-// MIDI interface data transfer rate in samples. Used to simulate the transfer delay.
-const double MIDI_DATA_TRANSFER_RATE = (double)SAMPLE_RATE / 31250.0 * 8.0;
-
-const float CM32L_REVERB_TO_LA32_ANALOG_OUTPUT_GAIN_FACTOR = 0.68f;
-
-const int MIDDLEC = 60;
-
-class Synth;
-
 class Tables {
 private:
 	Tables();
 	Tables(Tables &);
+	~Tables() {}
 
 public:
 	static const Tables &getInstance();
diff --git a/audio/softsynth/mt32/Types.h b/audio/softsynth/mt32/Types.h
new file mode 100644
index 0000000000..934b1a1173
--- /dev/null
+++ b/audio/softsynth/mt32/Types.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MT32EMU_TYPES_H
+#define MT32EMU_TYPES_H
+
+namespace MT32Emu {
+
+typedef unsigned int       Bit32u;
+typedef   signed int       Bit32s;
+typedef unsigned short int Bit16u;
+typedef   signed short int Bit16s;
+typedef unsigned char      Bit8u;
+typedef   signed char      Bit8s;
+
+#if MT32EMU_USE_FLOAT_SAMPLES
+typedef float Sample;
+typedef float SampleEx;
+#else
+typedef Bit16s Sample;
+typedef Bit32s SampleEx;
+#endif
+
+}
+
+#endif
diff --git a/audio/softsynth/mt32/internals.h b/audio/softsynth/mt32/internals.h
new file mode 100644
index 0000000000..ef56819a42
--- /dev/null
+++ b/audio/softsynth/mt32/internals.h
@@ -0,0 +1,83 @@
+/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MT32EMU_INTERNALS_H
+#define MT32EMU_INTERNALS_H
+
+// Debugging
+
+// 0: Standard debug output is not stamped with the rendered sample count
+// 1: Standard debug output is stamped with the rendered sample count
+// NOTE: The "samplestamp" corresponds to the end of the last completed rendering run.
+//       This is important to bear in mind for debug output that occurs during a run.
+#define MT32EMU_DEBUG_SAMPLESTAMPS 0
+
+// 0: No debug output for initialisation progress
+// 1: Debug output for initialisation progress
+#define MT32EMU_MONITOR_INIT 0
+
+// 0: No debug output for MIDI events
+// 1: Debug output for weird MIDI events
+#define MT32EMU_MONITOR_MIDI 0
+
+// 0: No debug output for note on/off
+// 1: Basic debug output for note on/off
+// 2: Comprehensive debug output for note on/off
+#define MT32EMU_MONITOR_INSTRUMENTS 0
+
+// 0: No debug output for partial allocations
+// 1: Show partial stats when an allocation fails
+// 2: Show partial stats with every new poly
+// 3: Show individual partial allocations/deactivations
+#define MT32EMU_MONITOR_PARTIALS 0
+
+// 0: No debug output for sysex
+// 1: Basic debug output for sysex
+#define MT32EMU_MONITOR_SYSEX 0
+
+// 0: No debug output for sysex writes to the timbre areas
+// 1: Debug output with the name and location of newly-written timbres
+// 2: Complete dump of timbre parameters for newly-written timbres
+#define MT32EMU_MONITOR_TIMBRES 0
+
+// 0: No TVA/TVF-related debug output.
+// 1: Shows changes to TVA/TVF target, increment and phase.
+#define MT32EMU_MONITOR_TVA 0
+#define MT32EMU_MONITOR_TVF 0
+
+// Configuration
+
+// If non-zero, deletes reverb buffers that are not in use to save memory.
+// If zero, keeps reverb buffers for all modes around all the time to avoid allocating/freeing in the critical path.
+#define MT32EMU_REDUCE_REVERB_MEMORY 1
+
+// 0: Maximum speed at the cost of a bit lower emulation accuracy.
+// 1: Maximum achievable emulation accuracy.
+#define MT32EMU_BOSS_REVERB_PRECISE_MODE 0
+
+#include "Structures.h"
+#include "Tables.h"
+#include "Poly.h"
+#include "LA32Ramp.h"
+#include "LA32WaveGenerator.h"
+#include "TVA.h"
+#include "TVP.h"
+#include "TVF.h"
+#include "Partial.h"
+#include "Part.h"
+
+#endif
diff --git a/audio/softsynth/mt32/module.mk b/audio/softsynth/mt32/module.mk
index 1c8aa125ab..f966da8d08 100644
--- a/audio/softsynth/mt32/module.mk
+++ b/audio/softsynth/mt32/module.mk
@@ -1,6 +1,7 @@
 MODULE := audio/softsynth/mt32
 
 MODULE_OBJS := \
+	Analog.o \
 	BReverbModel.o \
 	LA32Ramp.o \
 	LA32WaveGenerator.o \
diff --git a/audio/softsynth/mt32/mt32emu.h b/audio/softsynth/mt32/mt32emu.h
index d738a5de35..1574c08f0d 100644
--- a/audio/softsynth/mt32/mt32emu.h
+++ b/audio/softsynth/mt32/mt32emu.h
@@ -18,63 +18,20 @@
 #ifndef MT32EMU_MT32EMU_H
 #define MT32EMU_MT32EMU_H
 
-// Debugging
-
-// 0: Standard debug output is not stamped with the rendered sample count
-// 1: Standard debug output is stamped with the rendered sample count
-// NOTE: The "samplestamp" corresponds to the end of the last completed rendering run.
-//       This is important to bear in mind for debug output that occurs during a run.
-#define MT32EMU_DEBUG_SAMPLESTAMPS 0
-
-// 0: No debug output for initialisation progress
-// 1: Debug output for initialisation progress
-#define MT32EMU_MONITOR_INIT 0
-
-// 0: No debug output for MIDI events
-// 1: Debug output for weird MIDI events
-#define MT32EMU_MONITOR_MIDI 0
-
-// 0: No debug output for note on/off
-// 1: Basic debug output for note on/off
-// 2: Comprehensive debug output for note on/off
-#define MT32EMU_MONITOR_INSTRUMENTS 0
-
-// 0: No debug output for partial allocations
-// 1: Show partial stats when an allocation fails
-// 2: Show partial stats with every new poly
-// 3: Show individual partial allocations/deactivations
-#define MT32EMU_MONITOR_PARTIALS 0
-
-// 0: No debug output for sysex
-// 1: Basic debug output for sysex
-#define MT32EMU_MONITOR_SYSEX 0
-
-// 0: No debug output for sysex writes to the timbre areas
-// 1: Debug output with the name and location of newly-written timbres
-// 2: Complete dump of timbre parameters for newly-written timbres
-#define MT32EMU_MONITOR_TIMBRES 0
-
-// 0: No TVA/TVF-related debug output.
-// 1: Shows changes to TVA/TVF target, increment and phase.
-#define MT32EMU_MONITOR_TVA 0
-#define MT32EMU_MONITOR_TVF 0
-
 // Configuration
 
-// If non-zero, deletes reverb buffers that are not in use to save memory.
-// If zero, keeps reverb buffers for all modes around all the time to avoid allocating/freeing in the critical path.
-#define MT32EMU_REDUCE_REVERB_MEMORY 1
-
-// 0: Maximum speed at the cost of a bit lower emulation accuracy.
-// 1: Maximum achievable emulation accuracy.
-#define MT32EMU_BOSS_REVERB_PRECISE_MODE 0
-
 // 0: Use 16-bit signed samples and refined wave generator based on logarithmic fixed-point computations and LUTs. Maximum emulation accuracy and speed.
 // 1: Use float samples in the wave generator and renderer. Maximum output quality and minimum noise.
 #define MT32EMU_USE_FLOAT_SAMPLES 0
 
 namespace MT32Emu
 {
+// Sample rate to use in mixing. With the progress of development, we've found way too many thing dependent.
+// In order to achieve further advance in emulation accuracy, sample rate made fixed throughout the emulator,
+// except the emulation of analogue path.
+// The output from the synth is supposed to be resampled externally in order to convert to the desired sample rate.
+const unsigned int SAMPLE_RATE = 32000;
+
 // The default value for the maximum number of partials playing simultaneously.
 const unsigned int DEFAULT_MAX_PARTIALS = 32;
 
@@ -97,17 +54,7 @@ const unsigned int MAX_SAMPLES_PER_RUN = 4096;
 const unsigned int DEFAULT_MIDI_EVENT_QUEUE_SIZE = 1024;
 }
 
-#include "Structures.h"
-#include "common/file.h"
-#include "Tables.h"
-#include "Poly.h"
-#include "LA32Ramp.h"
-#include "LA32WaveGenerator.h"
-#include "TVA.h"
-#include "TVP.h"
-#include "TVF.h"
-#include "Partial.h"
-#include "Part.h"
+#include "Types.h"
 #include "ROMInfo.h"
 #include "Synth.h"
 
-- 
cgit v1.2.3


From 965dafe31b1c1f7c4684c0d2cbdb3461e3fddac8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 21 Dec 2014 23:33:01 +0200
Subject: ZVISION: Implement the "dumpallscripts" console command again

---
 engines/zvision/core/console.cpp        | 40 ++++++++++++++++++++++++++-------
 engines/zvision/core/console.h          |  1 +
 engines/zvision/file/search_manager.cpp |  7 ++++++
 engines/zvision/file/search_manager.h   | 18 +++++++--------
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 4dd10d6f40..0789f8d4fb 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -52,6 +52,7 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 	registerCmd("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale));
 	registerCmd("location", WRAP_METHOD(Console, cmdLocation));
 	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
+	registerCmd("dumpallscripts", WRAP_METHOD(Console, cmdDumpAllScripts));
 }
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
@@ -205,6 +206,20 @@ bool Console::cmdLocation(int argc, const char **argv) {
 	return true;
 }
 
+void dumpFile(Common::SeekableReadStream *s, const char *outName) {
+	byte *buffer = new byte[s->size()];
+	s->read(buffer, s->size());
+
+	Common::DumpFile dumpFile;
+	dumpFile.open(outName);
+
+	dumpFile.write(buffer, s->size());
+	dumpFile.flush();
+	dumpFile.close();
+
+	delete[] buffer;
+}
+
 bool Console::cmdDumpFile(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Use %s <fileName> to dump a file\n", argv[0]);
@@ -217,17 +232,26 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
 		return true;
 	}
 
-	byte *buffer = new byte[f.size()];
-	f.read(buffer, f.size());
+	dumpFile(&f, argv[1]);
 
-	Common::DumpFile dumpFile;
-	dumpFile.open(argv[1]);
+	return true;
+}
 
-	dumpFile.write(buffer, f.size());
-	dumpFile.flush();
-	dumpFile.close();
+bool Console::cmdDumpAllScripts(int argc, const char **argv) {
+	Common::String fileName;
+	Common::SeekableReadStream *in;
 
-	delete[] buffer;
+	SearchManager::MatchList fileList;
+	_engine->getSearchManager()->listMembersWithExtension(fileList, "scr");
+
+	for (SearchManager::MatchList::iterator iter = fileList.begin(); iter != fileList.end(); ++iter) {
+		fileName = iter->_value.name;
+		debugPrintf("Dumping %s\n", fileName.c_str());
+
+		in = iter->_value.arch->createReadStreamForMember(iter->_value.name);
+		dumpFile(in, fileName.c_str());
+		delete in;
+	}
 
 	return true;
 }
diff --git a/engines/zvision/core/console.h b/engines/zvision/core/console.h
index 299bd6127f..7e27fe8f26 100644
--- a/engines/zvision/core/console.h
+++ b/engines/zvision/core/console.h
@@ -46,6 +46,7 @@ private:
 	bool cmdSetPanoramaScale(int argc, const char **argv);
 	bool cmdLocation(int argc, const char **argv);
 	bool cmdDumpFile(int argc, const char **argv);
+	bool cmdDumpAllScripts(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index d0d4e43d12..7a907df39c 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -275,4 +275,11 @@ void SearchManager::listDirRecursive(Common::List<Common::String> &_list, const
 	}
 }
 
+void SearchManager::listMembersWithExtension(MatchList &fileList, Common::String extension) {
+	for (SearchManager::MatchList::iterator it = _files.begin(); it != _files.end(); ++it) {
+		if (it->_key.hasSuffix(extension))
+			fileList[it->_key] = it->_value;
+	}
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/file/search_manager.h b/engines/zvision/file/search_manager.h
index fdd70fd381..b9ed02ec13 100644
--- a/engines/zvision/file/search_manager.h
+++ b/engines/zvision/file/search_manager.h
@@ -47,25 +47,23 @@ public:
 
 	void loadZix(const Common::String &name);
 
-private:
-
-	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
-
 	struct Node {
 		Common::String name;
 		Common::Archive *arch;
 	};
 
-	Common::List<Common::String> _dirList;
-
 	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
 
-	Common::List<Common::Archive *> _archList;
-	MatchList _files;
-
-	Common::String _root;
+	void listMembersWithExtension(MatchList &fileList, Common::String extension);
 
 private:
+
+	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
+
+	Common::List<Common::String> _dirList;
+	Common::List<Common::Archive *> _archList;
+	Common::String _root;
+	MatchList _files;
 };
 
 }
-- 
cgit v1.2.3


From e5ecd500cfbf1c91da31dab0a5a71ff43ed82033 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 21 Dec 2014 23:33:48 +0200
Subject: ZVISION: Document some controls that are only used in Zork: Nemesis

---
 engines/zvision/scripting/controls/fist_control.h   | 1 +
 engines/zvision/scripting/controls/hotmov_control.h | 1 +
 engines/zvision/scripting/controls/paint_control.h  | 1 +
 engines/zvision/scripting/controls/titler_control.h | 1 +
 engines/zvision/scripting/scr_file_handling.cpp     | 4 ++++
 5 files changed, 8 insertions(+)

diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index 0a6b977ead..bad2daa6d5 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -34,6 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
+// Only used in Zork Nemesis, it handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
 class FistControl : public Control {
 public:
 	FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index b18d44c7a6..640fab00c0 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -34,6 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
+// Only used in Zork Nemesis, it handles movies where the player needs to click on something (mj7g, vw3g)
 class HotMovControl : public Control {
 public:
 	HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h
index 8097290ac2..0e5b59b821 100644
--- a/engines/zvision/scripting/controls/paint_control.h
+++ b/engines/zvision/scripting/controls/paint_control.h
@@ -32,6 +32,7 @@
 
 namespace ZVision {
 
+// Only used in Zork Nemesis, it's the painting puzzle screen in Lucien's room in Irondune (ch4g)
 class PaintControl : public Control {
 public:
 	PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h
index 075e47c9e9..86bb398b3c 100644
--- a/engines/zvision/scripting/controls/titler_control.h
+++ b/engines/zvision/scripting/controls/titler_control.h
@@ -32,6 +32,7 @@
 
 namespace ZVision {
 
+// Only used in Zork Nemesis - it's the death screen with the Restore/Exit buttons
 class TitlerControl : public Control {
 public:
 	TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index c117da5ec2..47b8b0aa39 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -358,12 +358,16 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 	} else if (controlType.equalsIgnoreCase("safe")) {
 		return new SafeControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("hotmovie")) {
+		// Only used in Zork Nemesis, it handles movies where the player needs to click on something (mj7g, vw3g)
 		return new HotMovControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("fist")) {
+		// Only used in Zork Nemesis, it handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
 		return new FistControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("paint")) {
+		// Only used in Zork Nemesis, it's the painting puzzle screen in Lucien's room in Irondune (ch4g)
 		return new PaintControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("titler")) {
+		// Only used in Zork Nemesis - it's the death screen with the Restore/Exit buttons (cjde)
 		return new TitlerControl(_engine, key, stream);
 	}
 	return NULL;
-- 
cgit v1.2.3


From 24f0cce9c6b0da33d1558059c6fbdb966eb5fb4e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 21 Dec 2014 22:28:25 +0100
Subject: ACCESS: Fix bug in setHorizontalCode()

---
 engines/access/amazon/amazon_logic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index e6a96b67d6..4a313e8880 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1035,7 +1035,7 @@ void Guard::setHorizontalCode() {
 
 	if (_bottomRight.x < screen._orgX1)
 		_gCode2 |= 8;
-	else if (_bottomRight.y > screen._orgX2)
+	else if (_bottomRight.x > screen._orgX2)
 		_gCode2 |= 2;
 }
 
-- 
cgit v1.2.3


From 4a1ddd5d0c8760dbdee967d8152c8e0e650eb4df Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 21 Dec 2014 22:49:18 +0100
Subject: ACCESS: Remove unused variable

---
 engines/access/access.cpp             | 1 -
 engines/access/access.h               | 1 -
 engines/access/amazon/amazon_game.cpp | 1 -
 3 files changed, 3 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 39e6c2b530..67255ff5ea 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -93,7 +93,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_vidX = _vidY = 0;
 	_cheatFl = false;
 	_restartFl = false;
-	_et = 0;
 	_printEnd = 0;
 }
 
diff --git a/engines/access/access.h b/engines/access/access.h
index a082b969c4..be007e0cb8 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -191,7 +191,6 @@ public:
 	bool _canSaveLoad;
 
 	Resource *_establish;
-	int _et;
 	int _printEnd;
 	int _txtPages;
 	int _narateFile;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index eb4fabdad9..d6b759b308 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -268,7 +268,6 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_screen->_maxChars = 37;
 	_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
 	loadEstablish(estabIndex);
-	_et = estabIndex;
 	uint16 msgOffset;
 	if (!isCD())
 		msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2));
-- 
cgit v1.2.3


From 8bc30d0dfbc538c3631692a807d37e9007958da9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 21 Dec 2014 22:53:20 +0100
Subject: ACCESS: Initialize header in videoPlayer constructor

---
 engines/access/video.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 920c066898..edc0bcda27 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -29,6 +29,7 @@ VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
 	_vidSurface = nullptr;
 	_videoData = nullptr;
 	_startCoord = nullptr;
+
 	_frameCount = 0;
 	_xCount = 0;
 	_scanCount = 0;
@@ -37,6 +38,10 @@ VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
 	_soundFlag = false;
 	_soundFrame = 0;
 	_videoEnd = false;
+
+	_header._frameCount = 0;
+	_header._width = _header._height = 0;
+	_header._flags = 0;
 }
 
 VideoPlayer::~VideoPlayer() {
-- 
cgit v1.2.3


From 99087c7f454970665391004321c0fc510cdaf9bd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 21 Dec 2014 22:55:24 +0100
Subject: ACCESS: Use enum instead of int to initialize video flag

---
 engines/access/video.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index edc0bcda27..63d0aa5c89 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -41,7 +41,7 @@ VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm) {
 
 	_header._frameCount = 0;
 	_header._width = _header._height = 0;
-	_header._flags = 0;
+	_header._flags = VIDEOFLAG_NONE;
 }
 
 VideoPlayer::~VideoPlayer() {
-- 
cgit v1.2.3


From dfae161386a2ad9e6828f71e90dd19598ca52f36 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 00:26:53 +0200
Subject: ZVISION: Implement the Venus hint system in Zork: Nemesis

---
 engines/zvision/core/events.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 6cf0ae5d0d..f0cf3f0789 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -145,6 +145,11 @@ void ZVision::cheatCodes(uint8 key) {
 			                               getBufferedKey(2),
 			                               getBufferedKey(1),
 			                               getBufferedKey(0), 0);
+
+	// Show the Venus screen when "?" or "/" is pressed while inside the temple world
+	if (_scriptManager->getStateValue(StateKey_VenusEnable) == 1)
+		if ((checkCode("?") || checkCode("/")) && _scriptManager->getStateValue(StateKey_World) == 't')
+			_scriptManager->changeLocation('g', 'j', 'h', 'e', 0);
 }
 
 void ZVision::processEvents() {
-- 
cgit v1.2.3


From 41dbbe346c4b46b4b48cdb38687216b1dd254fb4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 00:29:19 +0200
Subject: ZVISION: Also allow the movement when the cursor is within screen
 edges

This matches the behavior of the original in Zork: Nemesis. ZGI already
fills the screen horizontally
---
 engines/zvision/core/events.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index f0cf3f0789..81ad28f29b 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -284,26 +284,30 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 	//               |
 	//               ^
 
-	if (_workingWindow.contains(pos)) {
-		cursorWasChanged = _scriptManager->onMouseMove(pos, imageCoord);
+	// Clip the horizontal mouse position to the working window
+	Common::Point clippedPos = pos;
+	clippedPos.x = CLIP<int16>(pos.x, _workingWindow.left + 1, _workingWindow.right - 1);
+
+	if (_workingWindow.contains(clippedPos)) {
+		cursorWasChanged = _scriptManager->onMouseMove(clippedPos, imageCoord);
 
 		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
 		if (renderState == RenderTable::PANORAMA) {
-			if (pos.x >= _workingWindow.left && pos.x < _workingWindow.left + ROTATION_SCREEN_EDGE_OFFSET) {
+			if (clippedPos.x >= _workingWindow.left && clippedPos.x < _workingWindow.left + ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_mouseVelocity  = (((pos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((clippedPos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
-			} else if (pos.x <= _workingWindow.right && pos.x > _workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET) {
+			} else if (clippedPos.x <= _workingWindow.right && clippedPos.x > _workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_mouseVelocity  = (((pos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((clippedPos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
@@ -311,21 +315,21 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				_mouseVelocity = 0;
 			}
 		} else if (renderState == RenderTable::TILT) {
-			if (pos.y >= _workingWindow.top && pos.y < _workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET) {
+			if (clippedPos.y >= _workingWindow.top && clippedPos.y < _workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_mouseVelocity  = (((pos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((clippedPos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
-			} else if (pos.y <= _workingWindow.bottom && pos.y > _workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET) {
+			} else if (clippedPos.y <= _workingWindow.bottom && clippedPos.y > _workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
 				if (mspeed <= 0)
 					mspeed = 400 >> 4;
-				_mouseVelocity  = (((pos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				_mouseVelocity  = (((clippedPos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 
 				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
-- 
cgit v1.2.3


From b0e6c30ee288130d6b904a6f770044564b0490e6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 00:45:34 +0200
Subject: ZVISION: Fix Venus key code handling in commit dfae161

---
 engines/zvision/core/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 81ad28f29b..6e8cf1fe4f 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -148,7 +148,7 @@ void ZVision::cheatCodes(uint8 key) {
 
 	// Show the Venus screen when "?" or "/" is pressed while inside the temple world
 	if (_scriptManager->getStateValue(StateKey_VenusEnable) == 1)
-		if ((checkCode("?") || checkCode("/")) && _scriptManager->getStateValue(StateKey_World) == 't')
+		if (getBufferedKey(0) == 0xBF && _scriptManager->getStateValue(StateKey_World) == 't')
 			_scriptManager->changeLocation('g', 'j', 'h', 'e', 0);
 }
 
-- 
cgit v1.2.3


From 85644b887944dc4fc261827ae812a4e4684651bb Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 00:54:08 +0200
Subject: ZVISION: Prefix some class member variables with an underscore

---
 engines/zvision/scripting/sidefx/ttytext_node.cpp |   6 +-
 engines/zvision/text/text.cpp                     | 132 +++++++++++-----------
 engines/zvision/text/text.h                       |  30 ++---
 3 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
index 9a7fa01649..2930118524 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.cpp
+++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp
@@ -57,7 +57,7 @@ ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file
 		delete infile;
 	}
 	_img.create(_r.width(), _r.height(), _engine->_pixelFormat);
-	_style.sharp = true;
+	_style._sharp = true;
 	_style.readAllStyle(_txtbuf);
 	_style.setFont(_fnt);
 	_engine->getScriptManager()->setStateValue(_key, 1);
@@ -96,7 +96,7 @@ bool ttyTextNode::process(uint32 deltaTimeInMillis) {
 
 				if (ret & TXT_RET_HASSTBOX) {
 					Common::String buf;
-					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style.statebox));
+					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style._statebox));
 
 					for (uint8 j = 0; j < buf.size(); j++)
 						outchar(buf[j]);
@@ -158,7 +158,7 @@ void ttyTextNode::newline() {
 }
 
 void ttyTextNode::outchar(uint16 chr) {
-	uint32 clr = _engine->_pixelFormat.RGBToColor(_style.red, _style.green, _style.blue);
+	uint32 clr = _engine->_pixelFormat.RGBToColor(_style._red, _style._green, _style._blue);
 
 	if (_dx + _fnt.getCharWidth(chr) > _r.width())
 		newline();
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 406c36e5b0..08b57914c2 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -39,21 +39,21 @@
 namespace ZVision {
 
 cTxtStyle::cTxtStyle() {
-	fontname = "Arial";
-	blue = 255;
-	green = 255;
-	red = 255;
-	bold = false;
-	escapement = 0;
-	italic = false;
-	justify = TXT_JUSTIFY_LEFT;
-	newline = false;
-	size = 12;
-	skipcolor = false;
-	strikeout = false;
-	underline = false;
-	statebox = 0;
-	sharp = false;
+	_fontname = "Arial";
+	_blue = 255;
+	_green = 255;
+	_red = 255;
+	_bold = false;
+	_escapement = 0;
+	_italic = false;
+	_justify = TXT_JUSTIFY_LEFT;
+	_newline = false;
+	_size = 12;
+	_skipcolor = false;
+	_strikeout = false;
+	_underline = false;
+	_statebox = 0;
+	_sharp = false;
 }
 
 txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
@@ -80,10 +80,10 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				if (_tmp.lastChar() == '"')
 					_tmp.deleteLastChar();
 
-				fontname = _tmp;
+				_fontname = _tmp;
 			} else {
 				if (!tokenizer.empty())
-					fontname = token;
+					_fontname = token;
 			}
 			retval |= TXT_RET_FNTCHG;
 
@@ -91,8 +91,8 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				int32 tmp = atoi(token.c_str());
-				if (blue != tmp) {
-					blue = tmp;
+				if (_blue != tmp) {
+					_blue = tmp;
 					retval |= TXT_RET_FNTSTL;
 				}
 			}
@@ -100,8 +100,8 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				int32 tmp = atoi(token.c_str());
-				if (red != tmp) {
-					red = tmp;
+				if (_red != tmp) {
+					_red = tmp;
 					retval |= TXT_RET_FNTSTL;
 				}
 			}
@@ -109,23 +109,23 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				int32 tmp = atoi(token.c_str());
-				if (green != tmp) {
-					green = tmp;
+				if (_green != tmp) {
+					_green = tmp;
 					retval |= TXT_RET_FNTSTL;
 				}
 			}
 		} else if (token.matchString("newline", true)) {
 			if ((retval & TXT_RET_NEWLN) == 0)
-				newline = 0;
+				_newline = 0;
 
-			newline++;
+			_newline++;
 			retval |= TXT_RET_NEWLN;
 		} else if (token.matchString("point", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				int32 tmp = atoi(token.c_str());
-				if (size != tmp) {
-					size = tmp;
+				if (_size != tmp) {
+					_size = tmp;
 					retval |= TXT_RET_FNTCHG;
 				}
 			}
@@ -133,19 +133,19 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				int32 tmp = atoi(token.c_str());
-				escapement = tmp;
+				_escapement = tmp;
 			}
 		} else if (token.matchString("italic", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("on", true)) {
-					if (italic != true) {
-						italic = true;
+					if (_italic != true) {
+						_italic = true;
 						retval |= TXT_RET_FNTSTL;
 					}
 				} else if (token.matchString("off", true)) {
-					if (italic != false) {
-						italic = false;
+					if (_italic != false) {
+						_italic = false;
 						retval |= TXT_RET_FNTSTL;
 					}
 				}
@@ -154,13 +154,13 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("on", true)) {
-					if (underline != true) {
-						underline = true;
+					if (_underline != true) {
+						_underline = true;
 						retval |= TXT_RET_FNTSTL;
 					}
 				} else if (token.matchString("off", true)) {
-					if (underline != false) {
-						underline = false;
+					if (_underline != false) {
+						_underline = false;
 						retval |= TXT_RET_FNTSTL;
 					}
 				}
@@ -169,13 +169,13 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("on", true)) {
-					if (strikeout != true) {
-						strikeout = true;
+					if (_strikeout != true) {
+						_strikeout = true;
 						retval |= TXT_RET_FNTSTL;
 					}
 				} else if (token.matchString("off", true)) {
-					if (strikeout != false) {
-						strikeout = false;
+					if (_strikeout != false) {
+						_strikeout = false;
 						retval |= TXT_RET_FNTSTL;
 					}
 				}
@@ -184,13 +184,13 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("on", true)) {
-					if (bold != true) {
-						bold = true;
+					if (_bold != true) {
+						_bold = true;
 						retval |= TXT_RET_FNTSTL;
 					}
 				} else if (token.matchString("off", true)) {
-					if (bold != false) {
-						bold = false;
+					if (_bold != false) {
+						_bold = false;
 						retval |= TXT_RET_FNTSTL;
 					}
 				}
@@ -199,9 +199,9 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("on", true)) {
-					skipcolor = true;
+					_skipcolor = true;
 				} else if (token.matchString("off", true)) {
-					skipcolor = false;
+					_skipcolor = false;
 				}
 			}
 		} else if (token.matchString("image", true)) {
@@ -209,18 +209,18 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 		} else if (token.matchString("statebox", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
-				statebox = atoi(token.c_str());
+				_statebox = atoi(token.c_str());
 				retval |= TXT_RET_HASSTBOX;
 			}
 		} else if (token.matchString("justify", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("center", true))
-					justify = TXT_JUSTIFY_CENTER;
+					_justify = TXT_JUSTIFY_CENTER;
 				else if (token.matchString("left", true))
-					justify = TXT_JUSTIFY_LEFT;
+					_justify = TXT_JUSTIFY_LEFT;
 				else if (token.matchString("right", true))
-					justify = TXT_JUSTIFY_RIGHT;
+					_justify = TXT_JUSTIFY_RIGHT;
 			}
 		}
 	}
@@ -247,19 +247,19 @@ void cTxtStyle::readAllStyle(const Common::String &txt) {
 void cTxtStyle::setFontStyle(StyledTTFont &font) {
 	uint tempStyle = 0;
 
-	if (bold)
+	if (_bold)
 		tempStyle |= StyledTTFont::STTF_BOLD;
 
-	if (italic)
+	if (_italic)
 		tempStyle |= StyledTTFont::STTF_ITALIC;
 
-	if (underline)
+	if (_underline)
 		tempStyle |= StyledTTFont::STTF_UNDERLINE;
 
-	if (strikeout)
+	if (_strikeout)
 		tempStyle |= StyledTTFont::STTF_STRIKEOUT;
 
-	if (sharp)
+	if (_sharp)
 		tempStyle |= StyledTTFont::STTF_SHARP;
 
 	font.setStyle(tempStyle);
@@ -268,27 +268,27 @@ void cTxtStyle::setFontStyle(StyledTTFont &font) {
 void cTxtStyle::setFont(StyledTTFont &font) {
 	uint tempStyle = 0;
 
-	if (bold)
+	if (_bold)
 		tempStyle |= StyledTTFont::STTF_BOLD;
 
-	if (italic)
+	if (_italic)
 		tempStyle |= StyledTTFont::STTF_ITALIC;
 
-	if (underline)
+	if (_underline)
 		tempStyle |= StyledTTFont::STTF_UNDERLINE;
 
-	if (strikeout)
+	if (_strikeout)
 		tempStyle |= StyledTTFont::STTF_STRIKEOUT;
 
-	if (sharp)
+	if (_sharp)
 		tempStyle |= StyledTTFont::STTF_SHARP;
 
-	font.loadFont(fontname, size, tempStyle);
+	font.loadFont(_fontname, _size, tempStyle);
 }
 
 Graphics::Surface *TextRenderer::render(StyledTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
 	style.setFontStyle(fnt);
-	uint32 clr = _engine->_pixelFormat.RGBToColor(style.red, style.green, style.blue);
+	uint32 clr = _engine->_pixelFormat.RGBToColor(style._red, style._green, style._blue);
 	return fnt.renderSolidText(txt, clr);
 }
 
@@ -307,13 +307,13 @@ int32 TextRenderer::drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Gra
 
 	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
 
-	uint32 clr = _engine->_pixelFormat.RGBToColor(fontStyle.red, fontStyle.green, fontStyle.blue);
+	uint32 clr = _engine->_pixelFormat.RGBToColor(fontStyle._red, fontStyle._green, fontStyle._blue);
 
 	int16 w;
 
 	w = font.getStringWidth(txt);
 
-	drawTxtWithJustify(txt, font, clr, dst, 0, fontStyle.justify);
+	drawTxtWithJustify(txt, font, clr, dst, 0, fontStyle._justify);
 
 	return w;
 }
@@ -352,7 +352,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 	int16 prevbufspace = 0, prevtxtspace = 0;
 
 	while (i < stringlen) {
-		TxtJustify[currentline] = style.justify;
+		TxtJustify[currentline] = style._justify;
 		if (text[i] == '<') {
 			int16 ret = 0;
 
@@ -396,7 +396,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 
 			if (ret & TXT_RET_HASSTBOX) {
 				Common::String buf3;
-				buf3 = Common::String::format("%d", _engine->getScriptManager()->getStateValue(style.statebox));
+				buf3 = Common::String::format("%d", _engine->getScriptManager()->getStateValue(style._statebox));
 				buf += buf3;
 				textPosition += buf3.size();
 			}
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index ecec3ccde6..c3c60f6b76 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -55,21 +55,21 @@ public:
 	void setFont(StyledTTFont &font);
 
 public:
-	Common::String fontname;
-	txtJustify justify;  // 0 - center, 1-left, 2-right
-	int16 size;
-	uint8 red;     // 0-255
-	uint8 green;   // 0-255
-	uint8 blue;    // 0-255
-	int8 newline;
-	int8 escapement;
-	bool italic;
-	bool bold;
-	bool underline;
-	bool strikeout;
-	bool skipcolor;
-	int32 statebox;
-	bool sharp;
+	Common::String _fontname;
+	txtJustify _justify;  // 0 - center, 1-left, 2-right
+	int16 _size;
+	uint8 _red;     // 0-255
+	uint8 _green;   // 0-255
+	uint8 _blue;    // 0-255
+	int8 _newline;
+	int8 _escapement;
+	bool _italic;
+	bool _bold;
+	bool _underline;
+	bool _strikeout;
+	bool _skipcolor;
+	int32 _statebox;
+	bool _sharp;
 	// char image ??
 };
 
-- 
cgit v1.2.3


From c2d83d287faec2bdfd6fac7d665c156670c7b7f7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 02:50:34 +0200
Subject: ZVISION: Allow dumping any file type via the new "dumpfiles" command

---
 engines/zvision/core/console.cpp | 11 ++++++++---
 engines/zvision/core/console.h   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 0789f8d4fb..07d3114ec8 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -52,7 +52,7 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 	registerCmd("setpanoramascale", WRAP_METHOD(Console, cmdSetPanoramaScale));
 	registerCmd("location", WRAP_METHOD(Console, cmdLocation));
 	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
-	registerCmd("dumpallscripts", WRAP_METHOD(Console, cmdDumpAllScripts));
+	registerCmd("dumpfiles", WRAP_METHOD(Console, cmdDumpFiles));
 }
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
@@ -237,12 +237,17 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdDumpAllScripts(int argc, const char **argv) {
+bool Console::cmdDumpFiles(int argc, const char **argv) {
 	Common::String fileName;
 	Common::SeekableReadStream *in;
 
+	if (argc != 2) {
+		debugPrintf("Use %s <file extension> to dump all files with a specific extension\n", argv[0]);
+		return true;
+	}
+
 	SearchManager::MatchList fileList;
-	_engine->getSearchManager()->listMembersWithExtension(fileList, "scr");
+	_engine->getSearchManager()->listMembersWithExtension(fileList, argv[1]);
 
 	for (SearchManager::MatchList::iterator iter = fileList.begin(); iter != fileList.end(); ++iter) {
 		fileName = iter->_value.name;
diff --git a/engines/zvision/core/console.h b/engines/zvision/core/console.h
index 7e27fe8f26..a7bd88ebc3 100644
--- a/engines/zvision/core/console.h
+++ b/engines/zvision/core/console.h
@@ -46,7 +46,7 @@ private:
 	bool cmdSetPanoramaScale(int argc, const char **argv);
 	bool cmdLocation(int argc, const char **argv);
 	bool cmdDumpFile(int argc, const char **argv);
-	bool cmdDumpAllScripts(int argc, const char **argv);
+	bool cmdDumpFiles(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From f364756bcfa952e85c2111270ffda15c9809a4b8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 02:52:55 +0200
Subject: ZVISION: Add support for GNU Freefont fonts. Also, cleanup font
 loading

The Freefont fonts can just be dropped into the extras ScummVM folder,
to get the game working under non-Windows systems
---
 engines/zvision/graphics/truetype_font.cpp | 145 +++++++++++------------------
 1 file changed, 54 insertions(+), 91 deletions(-)

diff --git a/engines/zvision/graphics/truetype_font.cpp b/engines/zvision/graphics/truetype_font.cpp
index 2dbd7ca358..5c8aa03f6a 100644
--- a/engines/zvision/graphics/truetype_font.cpp
+++ b/engines/zvision/graphics/truetype_font.cpp
@@ -54,105 +54,68 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint st
 }
 
 bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
+	struct FontStyle {
+		const char *zorkFont;
+		const char *fontBase;
+		const char *freeFontBase;
+		const char *freeFontItalicName;
+	};
+
+	const FontStyle systemFonts[] = {
+		{ "*times new roman*",    "times",   "FreeSerif", "Italic"  },
+		{ "*times*",              "times",   "FreeSerif", "Italic"  },
+		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
+		{ "*garamond*",           "gara",    "FreeSerif", "Italic"  },
+		{ "*courier new*",        "cour",    "FreeMono",  "Oblique" },
+		{ "*courier*",            "cour",    "FreeMono",  "Oblique" },
+		{ "*ZorkDeath*",          "cour",    "FreeMono",  "Oblique" },
+		{ "*arial*",              "arial",   "FreeSans",  "Oblique" },
+		{ "*ZorkNormal*",         "arial",   "FreeSans",  "Oblique" },
+	};
+
 	Common::String newFontName;
-	if (fontName.matchString("*times new roman*", true) || fontName.matchString("*times*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "timesbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "timesbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "timesi.ttf";
-		else
-			newFontName = "times.ttf";
-
-	} else if (fontName.matchString("*courier new*", true) || fontName.matchString("*courier*", true) || fontName.matchString("*ZorkDeath*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "courbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "courbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "couri.ttf";
-		else
-			newFontName = "cour.ttf";
-
-	} else if (fontName.matchString("*century schoolbook*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "censcbkbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "censcbkbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "censcbki.ttf";
-		else
-			newFontName = "censcbk.ttf";
-
-	} else if (fontName.matchString("*garamond*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "garabi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "garabd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "garai.ttf";
-		else
-			newFontName = "gara.ttf";
-
-	} else if (fontName.matchString("*arial*", true) || fontName.matchString("*ZorkNormal*", true)) {
-		if ((_style & (STTF_BOLD | STTF_ITALIC)) == (STTF_BOLD | STTF_ITALIC))
-			newFontName = "arialbi.ttf";
-		else if (_style & STTF_BOLD)
-			newFontName = "arialbd.ttf";
-		else if (_style & STTF_ITALIC)
-			newFontName = "ariali.ttf";
-		else
-			newFontName = "arial.ttf";
+	Common::String freeFontName;
+
+	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
+		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
+			newFontName = systemFonts[i].fontBase;
+			freeFontName = systemFonts[i].freeFontBase;
+
+			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
+				newFontName += "bi";
+				freeFontName += "Bold";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			} else if (_style & STTF_BOLD) {
+				newFontName += "bd";
+				freeFontName += "Bold";
+			} else if (_style & STTF_ITALIC) {
+				newFontName += "i";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			}
 
-	} else {
+			newFontName += ".ttf";
+			freeFontName += ".ttf";
+			break;
+		}
+	}
+
+	if (newFontName.empty()) {
 		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
 		newFontName = "arial.ttf";
+		freeFontName = "FreeSans.ttf";
 	}
 
 	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
 
-	Common::File *file = _engine->getSearchManager()->openFile(newFontName);
-
-	if (!file) {
-		Common::SeekableReadStream *themeFile = nullptr;
-		if (ConfMan.hasKey("themepath")) {
-			Common::FSNode themePath(ConfMan.get("themepath"));
-			if (themePath.exists()) {
-				Common::FSNode scummModern = themePath.getChild("scummmodern.zip");
-				if (scummModern.exists()) {
-					themeFile = scummModern.createReadStream();
-				}
-			}
-		}
-		if (!themeFile) { // Fallback : Search for ScummModern.zip in SearchMan.
-			themeFile = SearchMan.createReadStreamForMember("scummmodern.zip");
-		}
-		if (themeFile) {
-			Common::Archive *themeArchive = Common::makeZipArchive(themeFile);
-			if (themeArchive->hasFile("FreeSans.ttf")) {
-				Common::SeekableReadStream *stream = nullptr;
-				stream = themeArchive->createReadStreamForMember("FreeSans.ttf");
-				Graphics::Font *_newFont = Graphics::loadTTFFont(*stream, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-				if (_newFont) {
-					if (!_font)
-						delete _font;
-					_font = _newFont;
-				}
-				if (stream)
-					delete stream;
-			}
-			delete themeArchive;
-			themeArchive = nullptr;
-		}
-	} else {
-		Graphics::Font *_newFont = Graphics::loadTTFFont(*file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-		if (_newFont) {
-			if (!_font)
-				delete _font;
-			_font = _newFont;
-		}
-		delete file;
+	Common::File file;
+	if (!file.open(newFontName) && !file.open(freeFontName))
+		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
+
+	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+	if (_newFont) {
+		if (!_font)
+			delete _font;
+		_font = _newFont;
 	}
 
 	_fntName = fontName;
-- 
cgit v1.2.3


From b51852c641cf4d558d035d7d1dd9309d6d238647 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 02:58:18 +0200
Subject: ZVISION: Error out when the game string file isn't found

---
 engines/zvision/text/string_manager.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index ec10b6220c..6b870d0b8d 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -43,21 +43,18 @@ StringManager::~StringManager() {
 }
 
 void StringManager::initialize(ZVisionGameId gameId) {
-	if (gameId == GID_NEMESIS) {
-		// TODO: Check this hardcoded filename against all versions of Nemesis
+	if (gameId == GID_NEMESIS)
 		loadStrFile("nemesis.str");
-	} else if (gameId == GID_GRANDINQUISITOR) {
-		// TODO: Check this hardcoded filename against all versions of Grand Inquisitor
+	else if (gameId == GID_GRANDINQUISITOR)
 		loadStrFile("inquis.str");
-	}
 }
 
 void StringManager::loadStrFile(const Common::String &fileName) {
 	Common::File file;
 	if (!_engine->getSearchManager()->openFile(file, fileName)) {
-		warning("%s does not exist. String parsing failed", fileName.c_str());
-		return;
+		error("%s does not exist. String parsing failed", fileName.c_str());
 	}
+
 	uint lineNumber = 0;
 	while (!file.eos()) {
 		_lines[lineNumber] = readWideLine(file);
-- 
cgit v1.2.3


From b0250e72d88dcb5ddda17aa8e32efc71a4f0e4af Mon Sep 17 00:00:00 2001
From: Fedor
Date: Mon, 22 Dec 2014 19:55:10 +0300
Subject: VIDEO: Mark TheoraDecoder as used by pegasus

---
 video/theora_decoder.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/video/theora_decoder.h b/video/theora_decoder.h
index b85388426b..feb4c6b49e 100644
--- a/video/theora_decoder.h
+++ b/video/theora_decoder.h
@@ -50,6 +50,7 @@ namespace Video {
  *
  * Decoder for Theora videos.
  * Video decoder used in engines:
+ *  - pegasus
  *  - sword25
  *  - wintermute
  */
-- 
cgit v1.2.3


From 04bc635dc702606911b8777a443b9e1f6322a6bf Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 22 Dec 2014 19:05:56 +0100
Subject: ACCESS: Remove a couple of unused variables in CharManager

---
 engines/access/char.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/engines/access/char.h b/engines/access/char.h
index e89cdae49f..6fb4934978 100644
--- a/engines/access/char.h
+++ b/engines/access/char.h
@@ -51,11 +51,8 @@ private:
 	void charMenu();
 public:
 	Common::Array<CharEntry> _charTable;
-	int _converseMode;
 	int _charFlag;
 
-	// Fields that are included in savegames
-	int _conversation;
 public:
 	CharManager(AccessEngine *vm);
 
-- 
cgit v1.2.3


From fc9595efdc22aecb77800dca29fbe23291855c48 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 22 Dec 2014 19:16:11 +0100
Subject: ACCESS: Remove an unused variable in Animation manager

---
 engines/access/animation.cpp | 5 +----
 engines/access/animation.h   | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index cc699a27e3..14d7c0d4cc 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -63,7 +63,6 @@ Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Man
 	_countdownTicks = stream->readUint16LE();
 	_currentLoopCount = stream->readSint16LE();
 	stream->readUint16LE(); // unk
-	_field10 = 0;
 
 	Common::Array<uint16> frameOffsets;
 	uint16 ofs;
@@ -311,9 +310,7 @@ Animation *AnimationManager::setAnimation(int animId) {
 	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
 
-	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 :
-		anim->_loopCount;
-	anim->_field10 = 0;
+	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 : anim->_loopCount;
 
 	return anim;
 }
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 722f5430ab..72621c4d11 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -106,7 +106,6 @@ public:
 	int _loopCount;
 	int _countdownTicks;
 	int _currentLoopCount;
-	int _field10;
 public:
 	Animation(AccessEngine *vm, Common::SeekableReadStream *stream);
 	~Animation();
-- 
cgit v1.2.3


From d1bc69426eac2458b46ab7fede31c6dd71314ccb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 22 Dec 2014 19:41:40 +0100
Subject: ACCESS: Move variable from Room manager to local function

---
 engines/access/room.cpp | 6 +++---
 engines/access/room.h   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f7c2eabd0f..607259ec6f 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -370,9 +370,9 @@ void Room::loadPlayField(int fileNum, int subfile) {
 	screen.loadRawPalette(playData->_stream);
 
 	// Copy off the tile data
-	_tileSize = (int)header[2] << 8;
-	_tile = new byte[_tileSize];
-	playData->_stream->read(_tile, _tileSize);
+	int tileSize = (int)header[2] << 8;
+	_tile = new byte[tileSize];
+	playData->_stream->read(_tile, tileSize);
 
 	// Copy off the playfield data
 	_matrixSize = header[0] * header[1];
diff --git a/engines/access/room.h b/engines/access/room.h
index 44279fa6b1..eec273e3f4 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -124,7 +124,6 @@ public:
 	int _playFieldWidth;
 	int _playFieldHeight;
 	byte *_tile;
-	int _tileSize;
 	int _selectCommand;
 	bool _conFlag;
 public:
-- 
cgit v1.2.3


From 58f7c12fa941265a79b453df9b32ec41c49d53c4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 22:11:07 +0200
Subject: ZVISION: Remove dead code

---
 engines/zvision/graphics/render_table.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index c30e0bd472..df73247344 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -81,27 +81,6 @@ const Common::Point RenderTable::convertWarpedCoordToFlatCoord(const Common::Poi
 	return newPoint;
 }
 
-uint16 mixTwoRGB(uint16 colorOne, uint16 colorTwo, float percentColorOne) {
-	assert(percentColorOne < 1.0f);
-
-	float rOne = float((colorOne & Graphics::ColorMasks<555>::kRedMask) >> Graphics::ColorMasks<555>::kRedShift);
-	float rTwo = float((colorTwo & Graphics::ColorMasks<555>::kRedMask) >> Graphics::ColorMasks<555>::kRedShift);
-	float gOne = float((colorOne & Graphics::ColorMasks<555>::kGreenMask) >> Graphics::ColorMasks<555>::kGreenShift);
-	float gTwo = float((colorTwo & Graphics::ColorMasks<555>::kGreenMask) >> Graphics::ColorMasks<555>::kGreenShift);
-	float bOne = float((colorOne & Graphics::ColorMasks<555>::kBlueMask) >> Graphics::ColorMasks<555>::kBlueShift);
-	float bTwo = float((colorTwo & Graphics::ColorMasks<555>::kBlueMask) >> Graphics::ColorMasks<555>::kBlueShift);
-
-	float rFinal = rOne * percentColorOne + rTwo * (1.0f - percentColorOne);
-	float gFinal = gOne * percentColorOne + gTwo * (1.0f - percentColorOne);
-	float bFinal = bOne * percentColorOne + bTwo * (1.0f - percentColorOne);
-
-	uint16 returnColor = (byte(rFinal + 0.5f) << Graphics::ColorMasks<555>::kRedShift) |
-	                     (byte(gFinal + 0.5f) << Graphics::ColorMasks<555>::kGreenShift) |
-	                     (byte(bFinal + 0.5f) << Graphics::ColorMasks<555>::kBlueShift);
-
-	return returnColor;
-}
-
 void RenderTable::mutateImage(uint16 *sourceBuffer, uint16 *destBuffer, uint32 destWidth, const Common::Rect &subRect) {
 	uint32 destOffset = 0;
 
-- 
cgit v1.2.3


From 4e60fa705fd22069565cdb17c907f91301a67dc5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Dec 2014 22:23:36 +0200
Subject: ZVISION: Fix regression from commit 3806aa4418

---
 engines/zvision/scripting/sidefx/music_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index 56598189f6..6be08b46dc 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -88,7 +88,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 }
 
 MusicNode::~MusicNode() {
-	if (!_loaded)
+	if (_loaded)
 		_engine->_mixer->stopHandle(_handle);
 	if (_key != StateKey_NotSet)
 		_engine->getScriptManager()->setStateValue(_key, 2);
-- 
cgit v1.2.3


From 3f36cc94e45d32dc4784c16ec91b6fc44dbf0ff7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 00:02:30 +0200
Subject: ZVISION: Limit the default engine delay for all animations

This fixes the lag between frames for all in-game animations
with a default frame delay
---
 engines/zvision/scripting/actions.cpp               |  7 +++----
 engines/zvision/scripting/sidefx/animation_node.cpp | 18 +++++-------------
 engines/zvision/scripting/sidefx/animation_node.h   |  1 -
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 0422a2c028..0ada2edf81 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -577,7 +577,7 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, c
 
 	char fileName[25];
 
-	// The two %*u are always 0 and dont seem to have a use
+	// The two %*u are usually 0 and dont seem to have a use
 	sscanf(line.c_str(), "%25s %*u %*u %d %d", fileName, &_mask, &_framerate);
 
 	if (_mask > 0) {
@@ -1030,9 +1030,8 @@ bool ActionSyncSound::execute() {
 	if (!(fx->getType() & SideFX::SIDEFX_ANIM))
 		return true;
 
-	AnimationNode *animnode = (AnimationNode *)fx;
-	if (animnode->getFrameDelay() > 200) // Hack for fix incorrect framedelay in some animpreload
-		animnode->setNewFrameDelay(66); // ~15fps
+	if (((AnimationNode *)fx)->getFrameDelay() > 200)
+		warning("ActionSyncSound: animation frame delay is higher than 200");
 
 	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotKey, _fileName, _syncto));
 	return true;
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 3a21227d1a..56f1fa3e49 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -42,6 +42,11 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	_animation = engine->loadAnimation(fileName);
 	_frmDelay = 1000.0 / _animation->getDuration().framerate();
 
+	// WORKAROUND: We do not allow the engine to delay more than 66 msec
+	// per frame (15fps max)
+	if (_frmDelay > 66)
+		_frmDelay = 66;
+
 	if (frate > 0)
 		_frmDelay = 1000.0 / frate;
 }
@@ -190,19 +195,6 @@ bool AnimationNode::stop() {
 	return false;
 }
 
-void AnimationNode::setNewFrameDelay(int32 newDelay) {
-	if (newDelay > 0) {
-		PlayNodes::iterator it = _playList.begin();
-		if (it != _playList.end()) {
-			playnode *nod = &(*it);
-			float percent = (float)nod->_delay / (float)_frmDelay;
-			nod->_delay = percent * newDelay; // Scale to new max
-		}
-
-		_frmDelay = newDelay;
-	}
-}
-
 int32 AnimationNode::getFrameDelay() {
 	return _frmDelay;
 }
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index 3adfd91f32..74941aa764 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -73,7 +73,6 @@ public:
 
 	bool stop();
 
-	void setNewFrameDelay(int32 newDelay);
 	int32 getFrameDelay();
 };
 
-- 
cgit v1.2.3


From fb924089fc5f6968f5c86fc780131f67268e8de6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 00:07:17 +0200
Subject: ZVISION: Avoid using color masks for in-game animations

This fixes the transparency for some in-game animations. Since colors
can be truncated with color masks, and since accurate colors are
required for transparency, color masks can't be used. This fixes the
transparency of the in-game item examination interface in ZGI
---
 engines/zvision/video/rlf_decoder.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index bdb5dc18bc..d51dee0c6a 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -30,8 +30,6 @@
 #include "common/debug.h"
 #include "common/endian.h"
 
-#include "graphics/colormasks.h"
-
 namespace ZVision {
 
 RLFDecoder::~RLFDecoder() {
@@ -62,7 +60,7 @@ RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
 		return;
 	}
 
-	_currentFrameBuffer.create(_width, _height, Graphics::createPixelFormat<565>());
+	_currentFrameBuffer.create(_width, _height, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
 	_frameBufferByteSize = _width * _height * sizeof(uint16);
 
 	_frames = new Frame[_frameCount];
@@ -243,8 +241,10 @@ void RLFDecoder::RLFVideoTrack::decodeMaskedRunLengthEncoding(int8 *source, int8
 				}
 
 				byte r, g, b;
-				Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
-				uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+				// NOTE: Color masks can't be used here, since accurate colors
+				// are required to handle transparency correctly
+				Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
+				uint16 destColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
 				WRITE_UINT16(dest + destOffset, destColor);
 
 				sourceOffset += 2;
@@ -290,8 +290,10 @@ void RLFDecoder::RLFVideoTrack::decodeSimpleRunLengthEncoding(int8 *source, int8
 				}
 
 				byte r, g, b;
-				Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
-				uint16 destColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+				// NOTE: Color masks can't be used here, since accurate colors
+				// are required to handle transparency correctly
+				Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
+				uint16 destColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
 				WRITE_UINT16(dest + destOffset, destColor);
 
 				sourceOffset += 2;
@@ -307,8 +309,10 @@ void RLFDecoder::RLFVideoTrack::decodeSimpleRunLengthEncoding(int8 *source, int8
 			}
 
 			byte r, g, b;
-			Graphics::colorToRGB<Graphics::ColorMasks<555> >(READ_LE_UINT16(source + sourceOffset), r, g, b);
-			uint16 sampleColor = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+				// NOTE: Color masks can't be used here, since accurate colors
+				// are required to handle transparency correctly
+			Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
+			uint16 sampleColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
 			sourceOffset += 2;
 
 			numberOfCopy = numberOfSamples + 2;
-- 
cgit v1.2.3


From 9bc0686e6076bbe5ca481c6696f0f7d3c86cd570 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 00:09:18 +0200
Subject: ZVISION: Remove leftover warning

---
 engines/zvision/scripting/actions.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 0ada2edf81..2a5046f146 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -1030,9 +1030,6 @@ bool ActionSyncSound::execute() {
 	if (!(fx->getType() & SideFX::SIDEFX_ANIM))
 		return true;
 
-	if (((AnimationNode *)fx)->getFrameDelay() > 200)
-		warning("ActionSyncSound: animation frame delay is higher than 200");
-
 	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotKey, _fileName, _syncto));
 	return true;
 }
-- 
cgit v1.2.3


From eb4645cda855b0ac919124fefc79c580883903d3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 00:10:12 +0200
Subject: ZVISION: Spacing

---
 engines/zvision/video/rlf_decoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index d51dee0c6a..b798093869 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -309,8 +309,8 @@ void RLFDecoder::RLFVideoTrack::decodeSimpleRunLengthEncoding(int8 *source, int8
 			}
 
 			byte r, g, b;
-				// NOTE: Color masks can't be used here, since accurate colors
-				// are required to handle transparency correctly
+			// NOTE: Color masks can't be used here, since accurate colors
+			// are required to handle transparency correctly
 			Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
 			uint16 sampleColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
 			sourceOffset += 2;
-- 
cgit v1.2.3


From cfd00ad6afc09ca6990ce905b1a8db4ea1ad1602 Mon Sep 17 00:00:00 2001
From: Pino Toscano
Date: Mon, 22 Dec 2014 22:39:05 +0100
Subject: AGI: use Common::String::format when possible

Use Common::String::format instead of a MAXPATHLEN-sized char[] buffer.
---
 engines/agi/detection.cpp | 6 ++----
 engines/agi/loader_v2.cpp | 8 ++++----
 engines/agi/loader_v3.cpp | 3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index e7285d8112..3230b4e5d3 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -276,15 +276,13 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const {
 int AgiMetaEngine::getMaximumSaveSlot() const { return 999; }
 
 void AgiMetaEngine::removeSaveState(const char *target, int slot) const {
-	char fileName[MAXPATHLEN];
-	sprintf(fileName, "%s.%03d", target, slot);
+	Common::String fileName = Common::String::format("%s.%03d", target, slot);
 	g_system->getSavefileManager()->removeSavefile(fileName);
 }
 
 SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	const uint32 AGIflag = MKTAG('A','G','I',':');
-	char fileName[MAXPATHLEN];
-	sprintf(fileName, "%s.%03d", target, slot);
+	Common::String fileName = Common::String::format("%s.%03d", target, slot);
 
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
 
diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp
index 787eeaa0c7..3f164b7fc0 100644
--- a/engines/agi/loader_v2.cpp
+++ b/engines/agi/loader_v2.cpp
@@ -135,13 +135,13 @@ int AgiLoader_v2::unloadResource(int t, int n) {
  */
 uint8 *AgiLoader_v2::loadVolRes(struct AgiDir *agid) {
 	uint8 *data = NULL;
-	char x[MAXPATHLEN], *path;
+	char x[MAXPATHLEN];
 	Common::File fp;
 	unsigned int sig;
+	Common::String path;
 
-	sprintf(x, "vol.%i", agid->volume);
-	path = x;
-	debugC(3, kDebugLevelResources, "Vol res: path = %s", path);
+	path = Common::String::format("vol.%i", agid->volume);
+	debugC(3, kDebugLevelResources, "Vol res: path = %s", path.c_str());
 
 	if (agid->offset != _EMPTY && fp.open(path)) {
 		debugC(3, kDebugLevelResources, "loading resource at offset %d", agid->offset);
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index fa135e5476..b90c17a1f3 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -204,8 +204,7 @@ uint8 *AgiLoader_v3::loadVolRes(AgiDir *agid) {
 	Common::String path;
 
 	debugC(3, kDebugLevelResources, "(%p)", (void *)agid);
-	sprintf(x, "vol.%i", agid->volume);
-	path = Common::String(_vm->_game.name) + x;
+	path = Common::String::format("%svol.%i", _vm->_game.name, agid->volume);
 
 	if (agid->offset != _EMPTY && fp.open(path)) {
 		fp.seek(agid->offset, SEEK_SET);
-- 
cgit v1.2.3


From e8fd25e22f4bce6f6df1a49115ece58bc76bdda3 Mon Sep 17 00:00:00 2001
From: Pino Toscano
Date: Mon, 22 Dec 2014 22:43:46 +0100
Subject: DRASCULA: use Common::String::format when possible

Use Common::String::format instead of a MAXPATHLEN-sized char[] buffer.
---
 engines/drascula/detection.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 833363669d..a84bd11cb1 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -382,8 +382,7 @@ SaveStateList DrasculaMetaEngine::listSaves(const char *target) const {
 }
 
 SaveStateDescriptor DrasculaMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
-	char fileName[MAXPATHLEN];
-	sprintf(fileName, "%s.%03d", target, slot);
+	Common::String fileName = Common::String::format("%s.%03d", target, slot);
 
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
 
-- 
cgit v1.2.3


From f29b3658b0caa7af2a3972de09069b9ba80eb494 Mon Sep 17 00:00:00 2001
From: Pino Toscano
Date: Mon, 22 Dec 2014 22:46:52 +0100
Subject: AGI: use shorter sizes for buffers

Instead of allocate them with MAXPATHLEN as size, just give them the
size for the data that are going to be written on them.
---
 engines/agi/loader_v2.cpp | 2 +-
 engines/agi/loader_v3.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp
index 3f164b7fc0..693c53c2bf 100644
--- a/engines/agi/loader_v2.cpp
+++ b/engines/agi/loader_v2.cpp
@@ -135,7 +135,7 @@ int AgiLoader_v2::unloadResource(int t, int n) {
  */
 uint8 *AgiLoader_v2::loadVolRes(struct AgiDir *agid) {
 	uint8 *data = NULL;
-	char x[MAXPATHLEN];
+	char x[6];
 	Common::File fp;
 	unsigned int sig;
 	Common::String path;
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index b90c17a1f3..39759b4649 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -198,7 +198,7 @@ int AgiLoader_v3::unloadResource(int t, int n) {
  * NULL is returned if unsucsessful.
  */
 uint8 *AgiLoader_v3::loadVolRes(AgiDir *agid) {
-	char x[MAXPATHLEN];
+	char x[8];
 	uint8 *data = NULL, *compBuffer;
 	Common::File fp;
 	Common::String path;
-- 
cgit v1.2.3


From 6a53c7cac10294d022e3eb5d47142ad46ef29bd9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 01:45:44 +0200
Subject: ZVISION: Ignore the special 0xCCCC character in subtitles

This seems to be used as a newline character
---
 engines/zvision/text/text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 08b57914c2..4ea40a1d55 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -495,7 +495,7 @@ Common::String readWideLine(Common::SeekableReadStream &stream) {
 		} else if (value >= 0x80 && value < 0x800) {
 			asciiString += (char)(0xC0 | ((value >> 6) & 0x1F));
 			asciiString += (char)(0x80 | (value & 0x3F));
-		} else if (value >= 0x800 && value < 0x10000) {
+		} else if (value >= 0x800 && value < 0x10000 && value != 0xCCCC) {
 			asciiString += (char)(0xE0 | ((value >> 12) & 0xF));
 			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
 			asciiString += (char)(0x80 | (value & 0x3F));
-- 
cgit v1.2.3


From 15154641ac5ea674a4865d9478074cf1b1d8a36b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 01:53:40 +0200
Subject: ZVISION: Move all of the text related code together

---
 engines/zvision/graphics/render_manager.h         |   2 +-
 engines/zvision/graphics/subtitles.cpp            | 108 ----------
 engines/zvision/graphics/subtitles.h              |  54 -----
 engines/zvision/graphics/truetype_font.cpp        | 228 ----------------------
 engines/zvision/graphics/truetype_font.h          |  84 --------
 engines/zvision/module.mk                         |   4 +-
 engines/zvision/scripting/sidefx/music_node.h     |   2 +-
 engines/zvision/scripting/sidefx/syncsound_node.h |   2 +-
 engines/zvision/scripting/sidefx/ttytext_node.h   |   2 +-
 engines/zvision/text/string_manager.h             |   2 +-
 engines/zvision/text/subtitles.cpp                | 108 ++++++++++
 engines/zvision/text/subtitles.h                  |  54 +++++
 engines/zvision/text/text.cpp                     |   2 +-
 engines/zvision/text/text.h                       |   2 +-
 engines/zvision/text/truetype_font.cpp            | 228 ++++++++++++++++++++++
 engines/zvision/text/truetype_font.h              |  84 ++++++++
 engines/zvision/video/video.cpp                   |   2 +-
 engines/zvision/zvision.cpp                       |   2 +-
 18 files changed, 485 insertions(+), 485 deletions(-)
 delete mode 100644 engines/zvision/graphics/subtitles.cpp
 delete mode 100644 engines/zvision/graphics/subtitles.h
 delete mode 100644 engines/zvision/graphics/truetype_font.cpp
 delete mode 100644 engines/zvision/graphics/truetype_font.h
 create mode 100644 engines/zvision/text/subtitles.cpp
 create mode 100644 engines/zvision/text/subtitles.h
 create mode 100644 engines/zvision/text/truetype_font.cpp
 create mode 100644 engines/zvision/text/truetype_font.h

diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 29bbd8f411..711c607c7b 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_RENDER_MANAGER_H
 
 #include "zvision/graphics/render_table.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 #include "common/rect.h"
 #include "common/hashmap.h"
diff --git a/engines/zvision/graphics/subtitles.cpp b/engines/zvision/graphics/subtitles.cpp
deleted file mode 100644
index d2c56f0991..0000000000
--- a/engines/zvision/graphics/subtitles.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/subtitles.h"
-#include "zvision/file/search_manager.h"
-#include "zvision/text/text.h"
-
-namespace ZVision {
-
-Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
-	_engine(engine),
-	_areaId(-1),
-	_subId(-1) {
-	Common::File file;
-	if (_engine->getSearchManager()->openFile(file, subname)) {
-		while (!file.eos()) {
-			Common::String str = file.readLine();
-			if (str.lastChar() == '~')
-				str.deleteLastChar();
-
-			if (str.matchString("*Initialization*", true)) {
-				// Not used
-			} else if (str.matchString("*Rectangle*", true)) {
-				int32 x1, y1, x2, y2;
-				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
-				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
-				_areaId = _engine->getRenderManager()->createSubArea(rct);
-			} else if (str.matchString("*TextFile*", true)) {
-				char filename[64];
-				sscanf(str.c_str(), "%*[^:]:%s", filename);
-				Common::File txt;
-				if (_engine->getSearchManager()->openFile(txt, filename)) {
-					while (!txt.eos()) {
-						Common::String txtline = readWideLine(txt);
-						sub curSubtitle;
-						curSubtitle.start = -1;
-						curSubtitle.stop = -1;
-						curSubtitle.subStr = txtline;
-
-						_subs.push_back(curSubtitle);
-					}
-					txt.close();
-				}
-			} else {
-				int32 st;
-				int32 en;
-				int32 sb;
-				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
-					if (sb <= (int32)_subs.size()) {
-						_subs[sb].start = st;
-						_subs[sb].stop = en;
-					}
-				}
-			}
-		}
-	}
-}
-
-Subtitle::~Subtitle() {
-	if (_areaId != -1)
-		_engine->getRenderManager()->deleteSubArea(_areaId);
-
-	_subs.clear();
-}
-
-void Subtitle::process(int32 time) {
-	int16 j = -1;
-	for (uint16 i = 0; i < _subs.size(); i++)
-		if (time >= _subs[i].start && time <= _subs[i].stop) {
-			j = i;
-			break;
-		}
-
-	if (j == -1 && _subId != -1) {
-		if (_areaId != -1)
-			_engine->getRenderManager()->updateSubArea(_areaId, "");
-		_subId = -1;
-	}
-
-	if (j != -1 && j != _subId) {
-		if (_subs[j].subStr.size())
-			if (_areaId != -1)
-				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
-		_subId = j;
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/graphics/subtitles.h b/engines/zvision/graphics/subtitles.h
deleted file mode 100644
index c3da6583a4..0000000000
--- a/engines/zvision/graphics/subtitles.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SUBTITLES_H
-#define ZVISION_SUBTITLES_H
-
-#include "zvision/zvision.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class Subtitle {
-public:
-	Subtitle(ZVision *engine, const Common::String &subname);
-	~Subtitle();
-
-	void process(int32 time);
-private:
-	ZVision *_engine;
-	int32 _areaId;
-	int16 _subId;
-
-	struct sub {
-		int start;
-		int stop;
-		Common::String subStr;
-	};
-
-	Common::Array<sub> _subs;
-};
-
-}
-
-#endif
diff --git a/engines/zvision/graphics/truetype_font.cpp b/engines/zvision/graphics/truetype_font.cpp
deleted file mode 100644
index 5c8aa03f6a..0000000000
--- a/engines/zvision/graphics/truetype_font.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/system.h"
-#include "common/unzip.h"
-#include "graphics/font.h"
-#include "graphics/fonts/ttf.h"
-#include "graphics/surface.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/truetype_font.h"
-
-namespace ZVision {
-
-StyledTTFont::StyledTTFont(ZVision *engine) {
-	_engine = engine;
-	_style = 0;
-	_font = NULL;
-	_lineHeight = 0;
-}
-
-StyledTTFont::~StyledTTFont() {
-	if (_font)
-		delete _font;
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
-	_style = style;
-	return loadFont(fontName, point);
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
-	struct FontStyle {
-		const char *zorkFont;
-		const char *fontBase;
-		const char *freeFontBase;
-		const char *freeFontItalicName;
-	};
-
-	const FontStyle systemFonts[] = {
-		{ "*times new roman*",    "times",   "FreeSerif", "Italic"  },
-		{ "*times*",              "times",   "FreeSerif", "Italic"  },
-		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
-		{ "*garamond*",           "gara",    "FreeSerif", "Italic"  },
-		{ "*courier new*",        "cour",    "FreeMono",  "Oblique" },
-		{ "*courier*",            "cour",    "FreeMono",  "Oblique" },
-		{ "*ZorkDeath*",          "cour",    "FreeMono",  "Oblique" },
-		{ "*arial*",              "arial",   "FreeSans",  "Oblique" },
-		{ "*ZorkNormal*",         "arial",   "FreeSans",  "Oblique" },
-	};
-
-	Common::String newFontName;
-	Common::String freeFontName;
-
-	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
-		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
-			newFontName = systemFonts[i].fontBase;
-			freeFontName = systemFonts[i].freeFontBase;
-
-			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
-				newFontName += "bi";
-				freeFontName += "Bold";
-				freeFontName += systemFonts[i].freeFontItalicName;
-			} else if (_style & STTF_BOLD) {
-				newFontName += "bd";
-				freeFontName += "Bold";
-			} else if (_style & STTF_ITALIC) {
-				newFontName += "i";
-				freeFontName += systemFonts[i].freeFontItalicName;
-			}
-
-			newFontName += ".ttf";
-			freeFontName += ".ttf";
-			break;
-		}
-	}
-
-	if (newFontName.empty()) {
-		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
-		newFontName = "arial.ttf";
-		freeFontName = "FreeSans.ttf";
-	}
-
-	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
-
-	Common::File file;
-	if (!file.open(newFontName) && !file.open(freeFontName))
-		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
-
-	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-	if (_newFont) {
-		if (!_font)
-			delete _font;
-		_font = _newFont;
-	}
-
-	_fntName = fontName;
-	_lineHeight = point;
-
-	if (_font)
-		return true;
-	return false;
-}
-
-void StyledTTFont::setStyle(uint newStyle) {
-	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
-		_style = newStyle;
-		loadFont(_fntName, _lineHeight);
-	} else {
-		_style = newStyle;
-	}
-}
-
-int StyledTTFont::getFontHeight() {
-	if (_font)
-		return _font->getFontHeight();
-	return 0;
-}
-
-int StyledTTFont::getMaxCharWidth() {
-	if (_font)
-		return _font->getMaxCharWidth();
-	return 0;
-}
-
-int StyledTTFont::getCharWidth(byte chr) {
-	if (_font)
-		return _font->getCharWidth(chr);
-	return 0;
-}
-
-int StyledTTFont::getKerningOffset(byte left, byte right) {
-	if (_font)
-		return _font->getKerningOffset(left, right);
-	return 0;
-}
-
-void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
-	if (_font) {
-		_font->drawChar(dst, chr, x, y, color);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-	}
-}
-
-void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
-	if (_font) {
-		_font->drawString(dst, str, x, y, w, color, align);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-	}
-}
-
-int StyledTTFont::getStringWidth(const Common::String &str) {
-	if (_font)
-		return _font->getStringWidth(str);
-	return 0;
-}
-
-Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
-	Graphics::Surface *tmp = new Graphics::Surface;
-	if (_font) {
-		int16 w = _font->getStringWidth(str);
-		if (w && w < 1024) {
-			tmp->create(w, _font->getFontHeight(), _engine->_pixelFormat);
-			drawString(tmp, str, 0, 0, w, color);
-		}
-	}
-	return tmp;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/graphics/truetype_font.h b/engines/zvision/graphics/truetype_font.h
deleted file mode 100644
index b5fac4af8a..0000000000
--- a/engines/zvision/graphics/truetype_font.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-// This file is based on engines/wintermute/base/fonts/base_font_truetype.h/.cpp
-
-#ifndef ZVISION_TRUETYPE_FONT_H
-#define ZVISION_TRUETYPE_FONT_H
-
-#include "graphics/font.h"
-#include "graphics/pixelformat.h"
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-// Styled TTF
-class StyledTTFont {
-public:
-	StyledTTFont(ZVision *engine);
-	~StyledTTFont();
-
-	enum {
-		STTF_BOLD = 1,
-		STTF_ITALIC = 2,
-		STTF_UNDERLINE = 4,
-		STTF_STRIKEOUT = 8,
-		STTF_SHARP = 16
-	};
-
-private:
-	ZVision *_engine;
-	Graphics::Font *_font;
-	int _lineHeight;
-	uint _style;
-	Common::String _fntName;
-
-public:
-	bool loadFont(const Common::String &fontName, int32 point);
-	bool loadFont(const Common::String &fontName, int32 point, uint style);
-	void setStyle(uint newStyle);
-
-	int getFontHeight();
-	int getMaxCharWidth();
-	int getCharWidth(byte chr);
-	int getKerningOffset(byte left, byte right);
-
-	void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color);
-
-	void drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align = Graphics::kTextAlignLeft);
-	int getStringWidth(const Common::String &str);
-
-	Graphics::Surface *renderSolidText(const Common::String &str, uint32 color);
-
-	bool isLoaded() {
-		return _font != NULL;
-	};
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 00652f0824..3ea31abe1b 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -17,8 +17,6 @@ MODULE_OBJS := \
 	graphics/effects/wave.o \
 	graphics/render_manager.o \
 	graphics/render_table.o \
-	graphics/subtitles.o \
-	graphics/truetype_font.o \
 	scripting/actions.o \
 	scripting/control.o \
 	scripting/controls/fist_control.o \
@@ -44,7 +42,9 @@ MODULE_OBJS := \
 	sound/midi.o \
 	sound/zork_raw.o \
 	text/string_manager.o \
+	text/subtitles.o \
 	text/text.o \
+	text/truetype_font.o \
 	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index 09bdc3707e..8f4a46f3fc 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/scripting/sidefx.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.h b/engines/zvision/scripting/sidefx/syncsound_node.h
index 7cd02a8aef..5961fccab9 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.h
+++ b/engines/zvision/scripting/sidefx/syncsound_node.h
@@ -25,7 +25,7 @@
 
 #include "audio/mixer.h"
 #include "zvision/scripting/sidefx.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
index b6cbed3e34..26d9be8e77 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.h
+++ b/engines/zvision/scripting/sidefx/ttytext_node.h
@@ -28,7 +28,7 @@
 
 #include "zvision/scripting/sidefx.h"
 #include "zvision/text/text.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 namespace Common {
 class String;
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index b77ad65040..f4564ee1ec 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -24,7 +24,7 @@
 #define ZVISION_STRING_MANAGER_H
 
 #include "zvision/detection.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 
 namespace Graphics {
 class FontManager;
diff --git a/engines/zvision/text/subtitles.cpp b/engines/zvision/text/subtitles.cpp
new file mode 100644
index 0000000000..acf4c37c2f
--- /dev/null
+++ b/engines/zvision/text/subtitles.cpp
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "zvision/graphics/render_manager.h"
+#include "zvision/text/subtitles.h"
+#include "zvision/file/search_manager.h"
+#include "zvision/text/text.h"
+
+namespace ZVision {
+
+Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
+	_engine(engine),
+	_areaId(-1),
+	_subId(-1) {
+	Common::File file;
+	if (_engine->getSearchManager()->openFile(file, subname)) {
+		while (!file.eos()) {
+			Common::String str = file.readLine();
+			if (str.lastChar() == '~')
+				str.deleteLastChar();
+
+			if (str.matchString("*Initialization*", true)) {
+				// Not used
+			} else if (str.matchString("*Rectangle*", true)) {
+				int32 x1, y1, x2, y2;
+				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
+				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
+				_areaId = _engine->getRenderManager()->createSubArea(rct);
+			} else if (str.matchString("*TextFile*", true)) {
+				char filename[64];
+				sscanf(str.c_str(), "%*[^:]:%s", filename);
+				Common::File txt;
+				if (_engine->getSearchManager()->openFile(txt, filename)) {
+					while (!txt.eos()) {
+						Common::String txtline = readWideLine(txt);
+						sub curSubtitle;
+						curSubtitle.start = -1;
+						curSubtitle.stop = -1;
+						curSubtitle.subStr = txtline;
+
+						_subs.push_back(curSubtitle);
+					}
+					txt.close();
+				}
+			} else {
+				int32 st;
+				int32 en;
+				int32 sb;
+				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
+					if (sb <= (int32)_subs.size()) {
+						_subs[sb].start = st;
+						_subs[sb].stop = en;
+					}
+				}
+			}
+		}
+	}
+}
+
+Subtitle::~Subtitle() {
+	if (_areaId != -1)
+		_engine->getRenderManager()->deleteSubArea(_areaId);
+
+	_subs.clear();
+}
+
+void Subtitle::process(int32 time) {
+	int16 j = -1;
+	for (uint16 i = 0; i < _subs.size(); i++)
+		if (time >= _subs[i].start && time <= _subs[i].stop) {
+			j = i;
+			break;
+		}
+
+	if (j == -1 && _subId != -1) {
+		if (_areaId != -1)
+			_engine->getRenderManager()->updateSubArea(_areaId, "");
+		_subId = -1;
+	}
+
+	if (j != -1 && j != _subId) {
+		if (_subs[j].subStr.size())
+			if (_areaId != -1)
+				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
+		_subId = j;
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/text/subtitles.h b/engines/zvision/text/subtitles.h
new file mode 100644
index 0000000000..c3da6583a4
--- /dev/null
+++ b/engines/zvision/text/subtitles.h
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SUBTITLES_H
+#define ZVISION_SUBTITLES_H
+
+#include "zvision/zvision.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class Subtitle {
+public:
+	Subtitle(ZVision *engine, const Common::String &subname);
+	~Subtitle();
+
+	void process(int32 time);
+private:
+	ZVision *_engine;
+	int32 _areaId;
+	int16 _subId;
+
+	struct sub {
+		int start;
+		int stop;
+		Common::String subStr;
+	};
+
+	Common::Array<sub> _subs;
+};
+
+}
+
+#endif
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 4ea40a1d55..91a06883b6 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -33,7 +33,7 @@
 
 #include "zvision/text/text.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 #include "zvision/scripting/script_manager.h"
 
 namespace ZVision {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index c3c60f6b76..c278b011c7 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -25,7 +25,7 @@
 #define ZVISION_TEXT_H
 
 #include "zvision/detection.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 #include "zvision/zvision.h"
 
 namespace ZVision {
diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
new file mode 100644
index 0000000000..f373afe437
--- /dev/null
+++ b/engines/zvision/text/truetype_font.cpp
@@ -0,0 +1,228 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/file.h"
+#include "common/system.h"
+#include "common/unzip.h"
+#include "graphics/font.h"
+#include "graphics/fonts/ttf.h"
+#include "graphics/surface.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/text/truetype_font.h"
+
+namespace ZVision {
+
+StyledTTFont::StyledTTFont(ZVision *engine) {
+	_engine = engine;
+	_style = 0;
+	_font = NULL;
+	_lineHeight = 0;
+}
+
+StyledTTFont::~StyledTTFont() {
+	if (_font)
+		delete _font;
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
+	_style = style;
+	return loadFont(fontName, point);
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
+	struct FontStyle {
+		const char *zorkFont;
+		const char *fontBase;
+		const char *freeFontBase;
+		const char *freeFontItalicName;
+	};
+
+	const FontStyle systemFonts[] = {
+		{ "*times new roman*",    "times",   "FreeSerif", "Italic"  },
+		{ "*times*",              "times",   "FreeSerif", "Italic"  },
+		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
+		{ "*garamond*",           "gara",    "FreeSerif", "Italic"  },
+		{ "*courier new*",        "cour",    "FreeMono",  "Oblique" },
+		{ "*courier*",            "cour",    "FreeMono",  "Oblique" },
+		{ "*ZorkDeath*",          "cour",    "FreeMono",  "Oblique" },
+		{ "*arial*",              "arial",   "FreeSans",  "Oblique" },
+		{ "*ZorkNormal*",         "arial",   "FreeSans",  "Oblique" },
+	};
+
+	Common::String newFontName;
+	Common::String freeFontName;
+
+	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
+		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
+			newFontName = systemFonts[i].fontBase;
+			freeFontName = systemFonts[i].freeFontBase;
+
+			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
+				newFontName += "bi";
+				freeFontName += "Bold";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			} else if (_style & STTF_BOLD) {
+				newFontName += "bd";
+				freeFontName += "Bold";
+			} else if (_style & STTF_ITALIC) {
+				newFontName += "i";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			}
+
+			newFontName += ".ttf";
+			freeFontName += ".ttf";
+			break;
+		}
+	}
+
+	if (newFontName.empty()) {
+		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
+		newFontName = "arial.ttf";
+		freeFontName = "FreeSans.ttf";
+	}
+
+	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
+
+	Common::File file;
+	if (!file.open(newFontName) && !file.open(freeFontName))
+		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
+
+	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+	if (_newFont) {
+		if (!_font)
+			delete _font;
+		_font = _newFont;
+	}
+
+	_fntName = fontName;
+	_lineHeight = point;
+
+	if (_font)
+		return true;
+	return false;
+}
+
+void StyledTTFont::setStyle(uint newStyle) {
+	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
+		_style = newStyle;
+		loadFont(_fntName, _lineHeight);
+	} else {
+		_style = newStyle;
+	}
+}
+
+int StyledTTFont::getFontHeight() {
+	if (_font)
+		return _font->getFontHeight();
+	return 0;
+}
+
+int StyledTTFont::getMaxCharWidth() {
+	if (_font)
+		return _font->getMaxCharWidth();
+	return 0;
+}
+
+int StyledTTFont::getCharWidth(byte chr) {
+	if (_font)
+		return _font->getCharWidth(chr);
+	return 0;
+}
+
+int StyledTTFont::getKerningOffset(byte left, byte right) {
+	if (_font)
+		return _font->getKerningOffset(left, right);
+	return 0;
+}
+
+void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
+	if (_font) {
+		_font->drawChar(dst, chr, x, y, color);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+	}
+}
+
+void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
+	if (_font) {
+		_font->drawString(dst, str, x, y, w, color, align);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+	}
+}
+
+int StyledTTFont::getStringWidth(const Common::String &str) {
+	if (_font)
+		return _font->getStringWidth(str);
+	return 0;
+}
+
+Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	if (_font) {
+		int16 w = _font->getStringWidth(str);
+		if (w && w < 1024) {
+			tmp->create(w, _font->getFontHeight(), _engine->_pixelFormat);
+			drawString(tmp, str, 0, 0, w, color);
+		}
+	}
+	return tmp;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/text/truetype_font.h b/engines/zvision/text/truetype_font.h
new file mode 100644
index 0000000000..b5fac4af8a
--- /dev/null
+++ b/engines/zvision/text/truetype_font.h
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+// This file is based on engines/wintermute/base/fonts/base_font_truetype.h/.cpp
+
+#ifndef ZVISION_TRUETYPE_FONT_H
+#define ZVISION_TRUETYPE_FONT_H
+
+#include "graphics/font.h"
+#include "graphics/pixelformat.h"
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+// Styled TTF
+class StyledTTFont {
+public:
+	StyledTTFont(ZVision *engine);
+	~StyledTTFont();
+
+	enum {
+		STTF_BOLD = 1,
+		STTF_ITALIC = 2,
+		STTF_UNDERLINE = 4,
+		STTF_STRIKEOUT = 8,
+		STTF_SHARP = 16
+	};
+
+private:
+	ZVision *_engine;
+	Graphics::Font *_font;
+	int _lineHeight;
+	uint _style;
+	Common::String _fntName;
+
+public:
+	bool loadFont(const Common::String &fontName, int32 point);
+	bool loadFont(const Common::String &fontName, int32 point, uint style);
+	void setStyle(uint newStyle);
+
+	int getFontHeight();
+	int getMaxCharWidth();
+	int getCharWidth(byte chr);
+	int getKerningOffset(byte left, byte right);
+
+	void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color);
+
+	void drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align = Graphics::kTextAlignLeft);
+	int getStringWidth(const Common::String &str);
+
+	Graphics::Surface *renderSolidText(const Common::String &str, uint32 color);
+
+	bool isLoaded() {
+		return _font != NULL;
+	};
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 189fb22194..97fbd8721c 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -29,7 +29,7 @@
 #include "zvision/zvision.h"
 #include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/subtitles.h"
+#include "zvision/text/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index c32cceb26e..cf7ed288d7 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -33,7 +33,7 @@
 #include "zvision/core/menu.h"
 #include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
-#include "zvision/graphics/truetype_font.h"
+#include "zvision/text/truetype_font.h"
 #include "zvision/sound/midi.h"
 #include "zvision/file/zfs_archive.h"
 
-- 
cgit v1.2.3


From 7aeeeabba9de168e76ae4d82b7f033fc877d0671 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 01:57:37 +0200
Subject: ZVISION: Add a comment about the special 0xCCCC character

---
 engines/zvision/text/text.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 91a06883b6..d1dc784f3e 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -499,6 +499,8 @@ Common::String readWideLine(Common::SeekableReadStream &stream) {
 			asciiString += (char)(0xE0 | ((value >> 12) & 0xF));
 			asciiString += (char)(0x80 | ((value >> 6) & 0x3F));
 			asciiString += (char)(0x80 | (value & 0x3F));
+		} else if (value == 0xCCCC) {
+			// Ignore, this character is used as newline sometimes
 		} else if (value >= 0x10000 && value < 0x200000) {
 			asciiString += (char)(0xF0);
 			asciiString += (char)(0x80 | ((value >> 12) & 0x3F));
-- 
cgit v1.2.3


From 99073f9b57580570b5ecec4cb00f020867f02672 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 02:20:17 +0200
Subject: ZVISION: Fix some buffer overruns with the usage of sscanf()

---
 engines/zvision/scripting/actions.cpp                | 18 +++++++++---------
 engines/zvision/scripting/controls/input_control.cpp |  2 +-
 engines/zvision/scripting/controls/lever_control.cpp |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 2a5046f146..5af847c61a 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -363,7 +363,7 @@ ActionInventory::ActionInventory(ZVision *engine, int32 slotkey, const Common::S
 	_key = 0;
 
 	char buf[25];
-	sscanf(line.c_str(), "%25s %d", buf, &_key);
+	sscanf(line.c_str(), "%24s %d", buf, &_key);
 
 	if (strcmp(buf, "add") == 0) {
 		_type = 0;
@@ -414,7 +414,7 @@ ActionKill::ActionKill(ZVision *engine, int32 slotkey, const Common::String &lin
 	_key = 0;
 	_type = 0;
 	char keytype[25];
-	sscanf(line.c_str(), "%25s", keytype);
+	sscanf(line.c_str(), "%24s", keytype);
 	if (keytype[0] == '"') {
 		if (!scumm_stricmp(keytype, "\"ANIM\""))
 			_type = SideFX::SIDEFX_ANIM;
@@ -475,7 +475,7 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 	uint loop = 0;
 	uint volume = 255;
 
-	sscanf(line.c_str(), "%u %25s %u %u", &type, fileNameBuffer, &loop, &volume);
+	sscanf(line.c_str(), "%u %24s %u %u", &type, fileNameBuffer, &loop, &volume);
 
 	// type 4 are midi sound effect files
 	if (type == 4) {
@@ -578,7 +578,7 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, c
 	char fileName[25];
 
 	// The two %*u are usually 0 and dont seem to have a use
-	sscanf(line.c_str(), "%25s %*u %*u %d %d", fileName, &_mask, &_framerate);
+	sscanf(line.c_str(), "%24s %*u %*u %d %d", fileName, &_mask, &_framerate);
 
 	if (_mask > 0) {
 		byte r, g, b;
@@ -645,7 +645,7 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 
 	// The two %*u are always 0 and dont seem to have a use
 	sscanf(line.c_str(),
-	       "%25s %u %u %u %u %u %u %d %*u %*u %d %d",
+	       "%24s %u %u %u %u %u %u %d %*u %*u %d %d",
 	       fileName, &_x, &_y, &_x2, &_y2, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
 	if (_mask > 0) {
@@ -863,7 +863,7 @@ ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, int32 slotkey, c
 	char fileName[25];
 	int color;
 
-	sscanf(line.c_str(), "%u %u %25s %*u %d", &_x, &_y, fileName, &color);
+	sscanf(line.c_str(), "%u %u %24s %*u %d", &_x, &_y, fileName, &color);
 
 	_fileName = Common::String(fileName);
 
@@ -907,7 +907,7 @@ bool ActionSetPartialScreen::execute() {
 ActionSetScreen::ActionSetScreen(ZVision *engine, int32 slotkey, const Common::String &line) :
 	ResultAction(engine, slotkey) {
 	char fileName[25];
-	sscanf(line.c_str(), "%25s", fileName);
+	sscanf(line.c_str(), "%24s", fileName);
 
 	_fileName = Common::String(fileName);
 }
@@ -966,7 +966,7 @@ ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Commo
 	char fileName[25];
 	uint skipline = 0;    //skipline - render video with skip every second line, not skippable.
 
-	sscanf(line.c_str(), "%25s %u %u %u %u %u %u", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline);
+	sscanf(line.c_str(), "%24s %u %u %u %u %u %u", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline);
 
 	_fileName = Common::String(fileName);
 	_skippable = true;
@@ -1017,7 +1017,7 @@ ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::S
 	char fileName[25];
 	int notUsed = 0;
 
-	sscanf(line.c_str(), "%d %d %25s", &_syncto, &notUsed, fileName);
+	sscanf(line.c_str(), "%d %d %24s", &_syncto, &notUsed, fileName);
 
 	_fileName = Common::String(fileName);
 }
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index e75cc15743..d7734f6d7a 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -96,7 +96,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		} else if (param.matchString("cursor_animation", true)) {
 			char fileName[25];
 
-			sscanf(values.c_str(), "%25s %*u", fileName);
+			sscanf(values.c_str(), "%24s %*u", fileName);
 
 			_animation = _engine->loadAnimation(fileName);
 			_frame = -1;
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 8faa18357c..bef51f0e91 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -64,12 +64,12 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	while (!stream.eos() && !line.contains('}')) {
 		if (param.matchString("descfile", true)) {
 			char levFileName[25];
-			sscanf(values.c_str(), "%25s", levFileName);
+			sscanf(values.c_str(), "%24s", levFileName);
 
 			parseLevFile(levFileName);
 		} else if (param.matchString("cursor", true)) {
 			char cursorName[25];
-			sscanf(values.c_str(), "%25s", cursorName);
+			sscanf(values.c_str(), "%24s", cursorName);
 
 			_cursor = _engine->getCursorManager()->getCursorId(Common::String(cursorName));
 		}
-- 
cgit v1.2.3


From 11cb47e89772ea59fc55d2801685d1a3505235a0 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Tue, 23 Dec 2014 00:25:42 -0600
Subject: ZVISION: Remove unnecessary math

---
 engines/zvision/core/events.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 6e8cf1fe4f..72e7f33266 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -296,18 +296,20 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 			if (clippedPos.x >= _workingWindow.left && clippedPos.x < _workingWindow.left + ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				if (mspeed <= 0)
-					mspeed = 400 >> 4;
 				_mouseVelocity  = (((clippedPos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				if (mspeed <= 0) {
+					mspeed = 25;
+				}
 
 				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
 			} else if (clippedPos.x <= _workingWindow.right && clippedPos.x > _workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				if (mspeed <= 0)
-					mspeed = 400 >> 4;
 				_mouseVelocity  = (((clippedPos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				if (mspeed <= 0) {
+					mspeed = 25;
+				}
 
 				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
@@ -318,18 +320,20 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 			if (clippedPos.y >= _workingWindow.top && clippedPos.y < _workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				if (mspeed <= 0)
-					mspeed = 400 >> 4;
 				_mouseVelocity  = (((clippedPos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				if (mspeed <= 0) {
+					mspeed = 25;
+				}
 
 				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
 			} else if (clippedPos.y <= _workingWindow.bottom && clippedPos.y > _workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				if (mspeed <= 0)
-					mspeed = 400 >> 4;
 				_mouseVelocity  = (((clippedPos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
+				if (mspeed <= 0) {
+					mspeed = 25;
+				}
 
 				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
-- 
cgit v1.2.3


From 6548300a4182e1dc805b390678df800b05d07554 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Tue, 23 Dec 2014 00:27:53 -0600
Subject: ZVISION: Use Common::Rational to simplify fixed point math

---
 engines/zvision/core/events.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 72e7f33266..ccd7772975 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -296,20 +296,21 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 			if (clippedPos.x >= _workingWindow.left && clippedPos.x < _workingWindow.left + ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				_mouseVelocity  = (((clippedPos.x - (ROTATION_SCREEN_EDGE_OFFSET + _workingWindow.left)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
+				_mouseVelocity  = ((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.left)) - mspeed).toInt();
+				
 
 				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
 			} else if (clippedPos.x <= _workingWindow.right && clippedPos.x > _workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				_mouseVelocity  = (((clippedPos.x - (_workingWindow.right - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
+				_mouseVelocity  = (Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.right + ROTATION_SCREEN_EDGE_OFFSET)).toInt();
 
 				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
@@ -320,20 +321,20 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 			if (clippedPos.y >= _workingWindow.top && clippedPos.y < _workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				_mouseVelocity  = (((clippedPos.y - (_workingWindow.top + ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
+				_mouseVelocity  = ((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.top)) - mspeed).toInt();
 
 				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
 			} else if (clippedPos.y <= _workingWindow.bottom && clippedPos.y > _workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET) {
 
 				int16 mspeed = _scriptManager->getStateValue(StateKey_RotateSpeed) >> 4;
-				_mouseVelocity  = (((clippedPos.y - (_workingWindow.bottom - ROTATION_SCREEN_EDGE_OFFSET)) << 7) / ROTATION_SCREEN_EDGE_OFFSET * mspeed) >> 7;
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
+				_mouseVelocity = (Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.bottom + ROTATION_SCREEN_EDGE_OFFSET)).toInt();
 
 				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
-- 
cgit v1.2.3


From 40bd4c485f9ab24e667e66a047214eb7dcef73e8 Mon Sep 17 00:00:00 2001
From: Adrian Astley
Date: Tue, 23 Dec 2014 00:38:44 -0600
Subject: ZVISION: Clamp the rotation velocity to never be zero

Before, if we set the in-game preferences to have very low rotation speed,
the velocity ends up always being 0 - 0.99
Hence, when we convert back to an int, everything gets truncated to zero.
Therefore, we clamp, in order to ensure the user can always move, no matter
which setting they use.
---
 engines/zvision/core/events.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index ccd7772975..1920ffd769 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -299,7 +299,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
-				_mouseVelocity  = ((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.left)) - mspeed).toInt();
+				_mouseVelocity  = MIN(((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.left)) - mspeed).toInt(), -1);
 				
 
 				_cursorManager->changeCursor(CursorIndex_Left);
@@ -310,7 +310,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
-				_mouseVelocity  = (Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.right + ROTATION_SCREEN_EDGE_OFFSET)).toInt();
+				_mouseVelocity  = MAX((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.right + ROTATION_SCREEN_EDGE_OFFSET)).toInt(), 1);
 
 				_cursorManager->changeCursor(CursorIndex_Right);
 				cursorWasChanged = true;
@@ -324,7 +324,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
-				_mouseVelocity  = ((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.top)) - mspeed).toInt();
+				_mouseVelocity  = MIN(((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.top)) - mspeed).toInt(), -1);
 
 				_cursorManager->changeCursor(CursorIndex_UpArr);
 				cursorWasChanged = true;
@@ -334,7 +334,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 				if (mspeed <= 0) {
 					mspeed = 25;
 				}
-				_mouseVelocity = (Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.bottom + ROTATION_SCREEN_EDGE_OFFSET)).toInt();
+				_mouseVelocity = MAX((Common::Rational(MAX_ROTATION_SPEED, ROTATION_SCREEN_EDGE_OFFSET) * (pos.y - _workingWindow.bottom + ROTATION_SCREEN_EDGE_OFFSET)).toInt(), 1);
 
 				_cursorManager->changeCursor(CursorIndex_DownArr);
 				cursorWasChanged = true;
-- 
cgit v1.2.3


From 9f1fd0dbff6e1702f49708c8ef4cc91f3b44ca4e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 11:03:02 +0200
Subject: ZVISION: Disable unused code

---
 engines/zvision/text/text.cpp | 8 +++++++-
 engines/zvision/text/text.h   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index d1dc784f3e..53fcafd027 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -44,10 +44,12 @@ cTxtStyle::cTxtStyle() {
 	_green = 255;
 	_red = 255;
 	_bold = false;
+#if 0
+	_newline = false;
 	_escapement = 0;
+#endif
 	_italic = false;
 	_justify = TXT_JUSTIFY_LEFT;
-	_newline = false;
 	_size = 12;
 	_skipcolor = false;
 	_strikeout = false;
@@ -115,10 +117,12 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				}
 			}
 		} else if (token.matchString("newline", true)) {
+#if 0
 			if ((retval & TXT_RET_NEWLN) == 0)
 				_newline = 0;
 
 			_newline++;
+#endif
 			retval |= TXT_RET_NEWLN;
 		} else if (token.matchString("point", true)) {
 			if (!tokenizer.empty()) {
@@ -132,8 +136,10 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 		} else if (token.matchString("escapement", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
+#if 0
 				int32 tmp = atoi(token.c_str());
 				_escapement = tmp;
+#endif
 			}
 		} else if (token.matchString("italic", true)) {
 			if (!tokenizer.empty()) {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index c278b011c7..c044e91579 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -61,8 +61,10 @@ public:
 	uint8 _red;     // 0-255
 	uint8 _green;   // 0-255
 	uint8 _blue;    // 0-255
+#if  0
 	int8 _newline;
 	int8 _escapement;
+#endif
 	bool _italic;
 	bool _bold;
 	bool _underline;
-- 
cgit v1.2.3


From 490382098eb122e25aa895dc8de7330c22b1fcf8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 11:06:39 +0200
Subject: ZVISION: Disable more unused code

---
 engines/zvision/text/text.cpp | 4 ++++
 engines/zvision/text/text.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 53fcafd027..8ddba3fbab 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -51,7 +51,9 @@ cTxtStyle::cTxtStyle() {
 	_italic = false;
 	_justify = TXT_JUSTIFY_LEFT;
 	_size = 12;
+#if 0
 	_skipcolor = false;
+#endif
 	_strikeout = false;
 	_underline = false;
 	_statebox = 0;
@@ -204,11 +206,13 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 		} else if (token.matchString("skipcolor", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
+#if 0
 				if (token.matchString("on", true)) {
 					_skipcolor = true;
 				} else if (token.matchString("off", true)) {
 					_skipcolor = false;
 				}
+#endif
 			}
 		} else if (token.matchString("image", true)) {
 			// Not used
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index c044e91579..c942b8141a 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -69,7 +69,9 @@ public:
 	bool _bold;
 	bool _underline;
 	bool _strikeout;
+#if 0
 	bool _skipcolor;
+#endif
 	int32 _statebox;
 	bool _sharp;
 	// char image ??
-- 
cgit v1.2.3


From e8cc098cd4303a959e69769eae2d37dd949d27d3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 11:54:39 +0200
Subject: ZVISION: Limit the engine delay, even when a custom frame rate is set

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 56f1fa3e49..4f26f039cc 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -42,13 +42,13 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	_animation = engine->loadAnimation(fileName);
 	_frmDelay = 1000.0 / _animation->getDuration().framerate();
 
+	if (frate > 0)
+		_frmDelay = 1000.0 / frate;
+
 	// WORKAROUND: We do not allow the engine to delay more than 66 msec
 	// per frame (15fps max)
 	if (_frmDelay > 66)
 		_frmDelay = 66;
-
-	if (frate > 0)
-		_frmDelay = 1000.0 / frate;
 }
 
 AnimationNode::~AnimationNode() {
-- 
cgit v1.2.3


From 78ba3e32466992ee7d01aabff493617a6401273e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 21:46:20 +0200
Subject: ZVISION: Add error checking when loading in-game animations and
 videos

---
 engines/zvision/video/rlf_decoder.cpp | 14 +++++++-------
 engines/zvision/video/video.cpp       |  7 ++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index b798093869..76fd70cf35 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -39,9 +39,13 @@ RLFDecoder::~RLFDecoder() {
 bool RLFDecoder::loadStream(Common::SeekableReadStream *stream) {
 	close();
 
-	addTrack(new RLFVideoTrack(stream));
-
-	return true;
+	// Check if the stream is valid
+	if (stream && !stream->err() && stream->readUint32BE() == MKTAG('F', 'E', 'L', 'R')) {
+		addTrack(new RLFVideoTrack(stream));
+		return true;
+	} else {
+		return false;
+	}
 }
 
 RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
@@ -81,10 +85,6 @@ RLFDecoder::RLFVideoTrack::~RLFVideoTrack() {
 }
 
 bool RLFDecoder::RLFVideoTrack::readHeader() {
-	if (_readStream->readUint32BE() != MKTAG('F', 'E', 'L', 'R')) {
-		return false;
-	}
-
 	// Read the header
 	_readStream->readUint32LE();                // Size1
 	_readStream->readUint32LE();                // Unknown1
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 97fbd8721c..50a6fc136a 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -48,7 +48,12 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
 		error("Unknown suffix for animation %s", fileName.c_str());
 
 	Common::File *_file = getSearchManager()->openFile(tmpFileName);
-	animation->loadStream(_file);
+	if (!_file)
+		error("Error opening %s", tmpFileName.c_str());
+
+	bool loaded = animation->loadStream(_file);
+	if (!loaded)
+		error("Error loading animation %s", tmpFileName.c_str());
 	
 	return animation;
 }
-- 
cgit v1.2.3


From 6edc16b6863c3957efa5ad23596e904d89f8627c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 21:54:53 +0200
Subject: ZVISION: Spacing

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 4f26f039cc..134ab1396f 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -111,7 +111,6 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 			}
 
 			if (frame) {
-
 				uint32 dstw;
 				uint32 dsth;
 				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
-- 
cgit v1.2.3


From 6afeec129504a16ee67c77b35cd27f0808d566d2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 23 Dec 2014 21:55:42 +0200
Subject: ZVISION: Handle animation rewinding outside the RLF encoder

---
 engines/zvision/video/rlf_decoder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 76fd70cf35..f1ac10bf88 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -200,9 +200,8 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 }
 
 const Graphics::Surface *RLFDecoder::RLFVideoTrack::decodeNextFrame() {
-	// When an animation ends, rewind
 	if (_curFrame == (int)_frameCount)
-		seek(Audio::Timestamp(0, getFrameRate().toInt()));
+		return NULL;
 	
 	applyFrameToCurrent(_curFrame);
 
-- 
cgit v1.2.3


From 9948d3ca16ceff79dd3ccf6dde5024de04470f08 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 06:13:49 +0200
Subject: ZVISION: Add a hack to set the correct frame delay for RLF videos

Also, use Common::Rational to avoid using floating point math
---
 engines/zvision/scripting/sidefx/animation_node.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 134ab1396f..1f62b61310 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -39,8 +39,20 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	  _mask(mask),
 	  _animation(NULL) {
 
-	_animation = engine->loadAnimation(fileName);
-	_frmDelay = 1000.0 / _animation->getDuration().framerate();
+	if (fileName.hasSuffix(".rlf")) {
+		// HACK: Read the frame delay directly
+		Common::File *tmp = engine->getSearchManager()->openFile(fileName);
+		if (tmp) {
+			tmp->seek(176, SEEK_SET);
+			_frmDelay = tmp->readUint32LE() / 10;
+			delete tmp;
+		}
+
+		_animation = engine->loadAnimation(fileName);
+	} else {
+		_animation = engine->loadAnimation(fileName);
+		_frmDelay = Common::Rational(1000, _animation->getDuration().framerate()).toInt();
+	}
 
 	if (frate > 0)
 		_frmDelay = 1000.0 / frate;
-- 
cgit v1.2.3


From c93776e1e05bd5a683459831d61542c134d7b856 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 13:55:49 +0200
Subject: ZVISION: Remove dead code

---
 engines/zvision/graphics/cursors/cursor.cpp | 29 -----------------------------
 engines/zvision/graphics/cursors/cursor.h   |  1 -
 2 files changed, 30 deletions(-)

diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index 07323b45c4..515358fe59 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -36,35 +36,6 @@ ZorkCursor::ZorkCursor()
 	  _hotspotY(0) {
 }
 
-ZorkCursor::ZorkCursor(const Common::String &fileName)
-	: _width(0),
-	  _height(0),
-	  _hotspotX(0),
-	  _hotspotY(0) {
-	Common::File file;
-	if (!file.open(fileName))
-		return;
-
-	uint32 magic = file.readUint32BE();
-	if (magic != MKTAG('Z', 'C', 'R', '1')) {
-		warning("%s is not a Zork Cursor file", fileName.c_str());
-		return;
-	}
-
-	_hotspotX = file.readUint16LE();
-	_hotspotY = file.readUint16LE();
-	_width = file.readUint16LE();
-	_height = file.readUint16LE();
-
-	uint dataSize = _width * _height * sizeof(uint16);
-	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
-	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
-	assert(bytesRead == dataSize);
-
-	// Convert to RGB 565
-	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-}
-
 ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	: _width(0),
 	  _height(0),
diff --git a/engines/zvision/graphics/cursors/cursor.h b/engines/zvision/graphics/cursors/cursor.h
index 0c1e99411f..6e0083520a 100644
--- a/engines/zvision/graphics/cursors/cursor.h
+++ b/engines/zvision/graphics/cursors/cursor.h
@@ -39,7 +39,6 @@ namespace ZVision {
 class ZorkCursor {
 public:
 	ZorkCursor();
-	ZorkCursor(const Common::String &fileName);
 	ZorkCursor(ZVision *engine, const Common::String &fileName);
 	ZorkCursor(const ZorkCursor &other);
 	~ZorkCursor();
-- 
cgit v1.2.3


From 702adaf9f807f19cd8849af737168461169734d3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 14:04:56 +0200
Subject: ZVISION: Remove duplicate code

---
 engines/zvision/graphics/render_manager.cpp | 91 +----------------------------
 1 file changed, 1 insertion(+), 90 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index b9305f5dcc..2f0d2a3a2c 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -162,97 +162,8 @@ void RenderManager::renderImageToBackground(const Common::String &fileName, int1
 }
 
 void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination) {
-	Common::File file;
-
-	if (!_engine->getSearchManager()->openFile(file, fileName)) {
-		warning("Could not open file %s", fileName.c_str());
-		return;
-	}
-
-	// Read the magic number
-	// Some files are true TGA, while others are TGZ
-	uint32 fileType = file.readUint32BE();
-
-	uint32 imageWidth;
-	uint32 imageHeight;
-	Image::TGADecoder tga;
-	uint16 *buffer;
 	bool isTransposed = _renderTable.getRenderState() == RenderTable::PANORAMA;
-	// All ZVision images are in RGB 555
-	Graphics::PixelFormat pixelFormat555 = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
-	destination.format = pixelFormat555;
-
-	bool isTGZ;
-
-	// Check for TGZ files
-	if (fileType == MKTAG('T', 'G', 'Z', '\0')) {
-		isTGZ = true;
-
-		// TGZ files have a header and then Bitmap data that is compressed with LZSS
-		uint32 decompressedSize = file.readSint32LE();
-		imageWidth = file.readSint32LE();
-		imageHeight = file.readSint32LE();
-
-		LzssReadStream lzssStream(&file);
-		buffer = (uint16 *)(new uint16[decompressedSize]);
-		lzssStream.read(buffer, decompressedSize);
-	} else {
-		isTGZ = false;
-
-		// Reset the cursor
-		file.seek(0);
-
-		// Decode
-		if (!tga.loadStream(file)) {
-			warning("Error while reading TGA image");
-			return;
-		}
-
-		Graphics::Surface tgaSurface = *(tga.getSurface());
-		imageWidth = tgaSurface.w;
-		imageHeight = tgaSurface.h;
-
-		buffer = (uint16 *)tgaSurface.getPixels();
-	}
-
-	// Flip the width and height if transposed
-	if (isTransposed) {
-		uint16 temp = imageHeight;
-		imageHeight = imageWidth;
-		imageWidth = temp;
-	}
-
-	// If the destination internal buffer is the same size as what we're copying into it,
-	// there is no need to free() and re-create
-	if (imageWidth != destination.w || imageHeight != destination.h) {
-		destination.create(imageWidth, imageHeight, pixelFormat555);
-	}
-
-	// If transposed, 'un-transpose' the data while copying it to the destination
-	// Otherwise, just do a simple copy
-	if (isTransposed) {
-		uint16 *dest = (uint16 *)destination.getPixels();
-
-		for (uint32 y = 0; y < imageHeight; ++y) {
-			uint32 columnIndex = y * imageWidth;
-
-			for (uint32 x = 0; x < imageWidth; ++x) {
-				dest[columnIndex + x] = buffer[x * imageHeight + y];
-			}
-		}
-	} else {
-		memcpy(destination.getPixels(), buffer, imageWidth * imageHeight * _pixelFormat.bytesPerPixel);
-	}
-
-	// Cleanup
-	if (isTGZ) {
-		delete[] buffer;
-	} else {
-		tga.destroy();
-	}
-
-	// Convert in place to RGB 565 from RGB 555
-	destination.convertToInPlace(_pixelFormat);
+	readImageToSurface(fileName, destination, isTransposed);
 }
 
 void RenderManager::readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed) {
-- 
cgit v1.2.3


From bed532587b4235a3cb9f2596bf7e65afdf33568a Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 24 Dec 2014 10:35:13 -0500
Subject: VIDEO: Fix check to see if the frame rate is a whole number

Thanks to Marisa-Chan for spotting
---
 video/video_decoder.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index dce96aae03..a4bc5b81a2 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -530,7 +530,9 @@ Audio::Timestamp VideoDecoder::FixedRateVideoTrack::getFrameTime(uint frame) con
 	// (which Audio::Timestamp doesn't support).
 	Common::Rational frameRate = getFrameRate();
 
-	if (frameRate == frameRate.toInt()) // The nice case (a whole number)
+	// Try to keep it in terms of the frame rate, if the frame rate is a whole
+	// number.
+	if (frameRate.getDenominator() == 1)
 		return Audio::Timestamp(0, frame, frameRate.toInt());
 
 	// Convert as best as possible
-- 
cgit v1.2.3


From 59cd015fc90fcbb92c365ae33fe767cdf7ae863f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 24 Dec 2014 10:36:55 -0500
Subject: SCI: Silence a gcc warning

---
 engines/sci/graphics/screen.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 8b0e76332f..2f95bf7751 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -238,6 +238,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 		_vectorPutPixelPtr = &GfxScreen::putPixelDisplayUpscaled;
 		_putPixelPtr = &GfxScreen::putPixelDisplayUpscaled;
 		break;
+	case GFX_SCREEN_UPSCALED_DISABLED:
+		break;
 	}
 }
 
-- 
cgit v1.2.3


From 970116bc3821b38c9b4882178c6a34082e73698d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 24 Dec 2014 20:15:57 +0100
Subject: SCI: added LSL3/German 5 1/4" floppy version

---
 engines/sci/detection_tables.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index d6bdef946b..7c9f54aedf 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2069,6 +2069,20 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// Larry 3 - German DOS (German+English, 5 1/4" floppies)
+	// SCI interpreter version S.old.124 (executable), VERSION is "1.056"
+	{"lsl3", "", {
+		{"resource.map", 0, "2468da5d664bb6ca3df866074a05e43c", 8910},
+		{"resource.001", 0, "3827a9b17b926e12dcc336860f50612a", 163326},
+		{"resource.002", 0, "3827a9b17b926e12dcc336860f50612a", 312436},
+		{"resource.003", 0, "3827a9b17b926e12dcc336860f50612a", 347307},
+		{"resource.004", 0, "3827a9b17b926e12dcc336860f50612a", 332369},
+		{"resource.005", 0, "3827a9b17b926e12dcc336860f50612a", 347654},
+		{"resource.006", 0, "3827a9b17b926e12dcc336860f50612a", 326011},
+		{"resource.007", 0, "3827a9b17b926e12dcc336860f50612a", 309553},
+		AD_LISTEND},
+		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
 	// Larry 3 - French DOS (provided by richiefs in bug report #2670691, also includes english language)
 	// Executable scanning reports "S.old.123"
 	// SCI interpreter version 0.000.572 (just a guess)
-- 
cgit v1.2.3


From 11d3227796a5d58a6e0f362e7982e27bf6d8fcd8 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 24 Dec 2014 20:20:39 +0100
Subject: SCI: fix typo in comment for LSL3/German

---
 engines/sci/detection_tables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 7c9f54aedf..32d1a58765 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2070,7 +2070,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
 	// Larry 3 - German DOS (German+English, 5 1/4" floppies)
-	// SCI interpreter version S.old.124 (executable), VERSION is "1.056"
+	// SCI interpreter version S.old.114 (executable), VERSION is "1.056"
 	{"lsl3", "", {
 		{"resource.map", 0, "2468da5d664bb6ca3df866074a05e43c", 8910},
 		{"resource.001", 0, "3827a9b17b926e12dcc336860f50612a", 163326},
-- 
cgit v1.2.3


From 16e208318cf75dbe290060663119d1c533f4dd7b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 22:07:42 +0200
Subject: ZVISION: Plug a memory leak

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 1f62b61310..bf3509f545 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -161,6 +161,7 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
 					else
 						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top);
+					transposed->free();
 					delete transposed;
 				} else {
 					if (_mask > 0)
-- 
cgit v1.2.3


From de2c9ed5bf9e3d41ad52de8aa0ddf383efa6b24d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 22:11:21 +0200
Subject: ZVISION: Disable unused code

---
 engines/zvision/graphics/render_manager.cpp | 2 ++
 engines/zvision/graphics/render_manager.h   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 2f0d2a3a2c..01df82410f 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -983,9 +983,11 @@ void RenderManager::markDirty() {
 	_backgroundDirtyRect = Common::Rect(_backgroundWidth, _backgroundHeight);
 }
 
+#if 0
 void RenderManager::bkgFill(uint8 r, uint8 g, uint8 b) {
 	_currentBackgroundImage.fillRect(Common::Rect(_currentBackgroundImage.w, _currentBackgroundImage.h), _currentBackgroundImage.format.RGBToColor(r, g, b));
 	markDirty();
 }
+#endif
 
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 711c607c7b..c2dc169945 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -328,8 +328,10 @@ public:
 	// Mark whole background surface as dirty
 	void markDirty();
 
-	// Fille background surface by color
+#if 0
+	// Fill background surface by color
 	void bkgFill(uint8 r, uint8 g, uint8 b);
+#endif
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 1bc9b13357e36f6f52e3dd6f8223ab569e5b5362 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 22:26:23 +0200
Subject: ZVISION: Introduce pixel formats for resources (555) and screen (565)

---
 engines/zvision/zvision.cpp | 8 +++++---
 engines/zvision/zvision.h   | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index cf7ed288d7..145b2ebeac 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -82,6 +82,8 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	: Engine(syst),
 	  _gameDescription(gameDesc),
 	  _pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /*RGB 565*/
+	  _resourcePixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), /* RGB 555 */
+	  _screenPixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /* RGB 565 */
 	  _desiredFrameTime(33), /* ~30 fps */
 	  _clock(_system),
 	  _scriptManager(nullptr),
@@ -182,17 +184,17 @@ void ZVision::initialize() {
 	} else if (_gameDescription->gameId == GID_NEMESIS)
 		_searchManager->loadZix("NEMESIS.ZIX");
 
-	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_pixelFormat);
+	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
 
 	// Register random source
 	_rnd = new Common::RandomSource("zvision");
 
 	// Create managers
 	_scriptManager = new ScriptManager(this);
-	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _pixelFormat);
+	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _screenPixelFormat);
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
-	_cursorManager = new CursorManager(this, &_pixelFormat);
+	_cursorManager = new CursorManager(this, &_screenPixelFormat);
 	_textRenderer = new TextRenderer(this);
 	_midiManager = new MidiManager();
 
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 7ea10ed64d..a63b66f70f 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -69,6 +69,8 @@ public:
 	 */
 	Common::Rect _workingWindow;
 	const Graphics::PixelFormat _pixelFormat;
+	const Graphics::PixelFormat _resourcePixelFormat;
+	const Graphics::PixelFormat _screenPixelFormat;
 
 private:
 	enum {
-- 
cgit v1.2.3


From 84341a889cfafc4c7ecef6cf7d6841df8353fe4b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 22:29:52 +0200
Subject: ZVISION: Let the cursor manager do pixel format conversion for
 cursors

---
 engines/zvision/graphics/cursors/cursor.cpp         | 5 +----
 engines/zvision/graphics/cursors/cursor_manager.cpp | 2 +-
 engines/zvision/graphics/cursors/cursor_manager.h   | 4 ++--
 engines/zvision/zvision.cpp                         | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index 515358fe59..eb25e92860 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -57,12 +57,9 @@ ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	_height = file.readUint16LE();
 
 	uint dataSize = _width * _height * sizeof(uint16);
-	_surface.create(_width, _height, Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0));
+	_surface.create(_width, _height, engine->_resourcePixelFormat);
 	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
 	assert(bytesRead == dataSize);
-
-	// Convert to RGB 565
-	_surface.convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
 }
 
 ZorkCursor::ZorkCursor(const ZorkCursor &other) {
diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index 92fd461c72..a197c7ed87 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -45,7 +45,7 @@ const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow
                                                                  "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
                                                                };
 
-CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
+CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat pixelFormat)
 	: _engine(engine),
 	  _pixelFormat(pixelFormat),
 	  _cursorIsPushed(false),
diff --git a/engines/zvision/graphics/cursors/cursor_manager.h b/engines/zvision/graphics/cursors/cursor_manager.h
index bbfa085c23..35c605baf8 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.h
+++ b/engines/zvision/graphics/cursors/cursor_manager.h
@@ -58,7 +58,7 @@ enum CursorIndex {
  */
 class CursorManager {
 public:
-	CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat);
+	CursorManager(ZVision *engine, const Graphics::PixelFormat pixelFormat);
 
 private:
 	static const int NUM_CURSORS = 18;
@@ -67,7 +67,7 @@ private:
 	ZorkCursor _cursors[NUM_CURSORS + 2][2];
 
 	ZVision *_engine;
-	const Graphics::PixelFormat *_pixelFormat;
+	const Graphics::PixelFormat _pixelFormat;
 	bool _cursorIsPushed;
 	int _item;
 	int _lastitem;
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 145b2ebeac..5978316451 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -194,7 +194,7 @@ void ZVision::initialize() {
 	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _screenPixelFormat);
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
-	_cursorManager = new CursorManager(this, &_screenPixelFormat);
+	_cursorManager = new CursorManager(this, _resourcePixelFormat);
 	_textRenderer = new TextRenderer(this);
 	_midiManager = new MidiManager();
 
-- 
cgit v1.2.3


From e8e21fabe4dbe4effdfb3df05fd3fae75940f1c5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 22:40:54 +0200
Subject: ZVISION: Set all the internal graphics operations to use RGB555 (1/2)

This is the first part of the changes to make the engine use RGB555
internally again. This is done to simplify the rendering pipeline -
the engine will use RGB555 internally, but will output to RGB565.
The overall changes have been broken into two commits, thus this
first commit will break all the game colors
---
 engines/zvision/graphics/effect.h                  |  2 +-
 engines/zvision/graphics/effects/fog.cpp           | 10 ++++-----
 engines/zvision/graphics/effects/light.cpp         |  4 ++--
 engines/zvision/scripting/actions.cpp              | 25 ++--------------------
 .../zvision/scripting/controls/input_control.cpp   |  2 +-
 .../zvision/scripting/controls/titler_control.cpp  |  2 +-
 engines/zvision/scripting/sidefx/ttytext_node.cpp  |  4 ++--
 engines/zvision/text/text.cpp                      |  4 ++--
 engines/zvision/text/truetype_font.cpp             |  2 +-
 engines/zvision/video/rlf_decoder.cpp              | 22 ++++---------------
 engines/zvision/video/rlf_decoder.h                |  2 +-
 engines/zvision/zvision.cpp                        |  2 +-
 12 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/engines/zvision/graphics/effect.h b/engines/zvision/graphics/effect.h
index c6653c6037..234cd8209d 100644
--- a/engines/zvision/graphics/effect.h
+++ b/engines/zvision/graphics/effect.h
@@ -37,7 +37,7 @@ class Effect {
 public:
 
 	Effect(ZVision *engine, uint32 key, Common::Rect region, bool ported) : _engine(engine), _key(key), _region(region), _ported(ported) {
-		_surface.create(_region.width(), _region.height(), _engine->_pixelFormat);
+		_surface.create(_region.width(), _region.height(), _engine->_resourcePixelFormat);
 	}
 	virtual ~Effect() {}
 
diff --git a/engines/zvision/graphics/effects/fog.cpp b/engines/zvision/graphics/effects/fog.cpp
index f59e82a4a0..c28bdde330 100644
--- a/engines/zvision/graphics/effects/fog.cpp
+++ b/engines/zvision/graphics/effects/fog.cpp
@@ -79,10 +79,10 @@ const Graphics::Surface *FogFx::draw(const Graphics::Surface &srcSubRect) {
 			if (it->inEffect) {
 				// Not 100% equivalent, but looks nice and not buggy
 				uint8 sr, sg, sb;
-				_engine->_pixelFormat.colorToRGB(lineBuf[i], sr, sg, sb);
+				_engine->_resourcePixelFormat.colorToRGB(lineBuf[i], sr, sg, sb);
 				uint16 fogColor = *(uint16 *)_fog.getBasePtr((i + _pos) % _fog.w, j);
 				uint8 dr, dg, db;
-				_engine->_pixelFormat.colorToRGB(_colorMap[fogColor & 0x1F], dr, dg, db);
+				_engine->_resourcePixelFormat.colorToRGB(_colorMap[fogColor & 0x1F], dr, dg, db);
 				uint16 fr = dr + sr;
 				if (fr > 255)
 					fr = 255;
@@ -92,7 +92,7 @@ const Graphics::Surface *FogFx::draw(const Graphics::Surface &srcSubRect) {
 				uint16 fb = db + sb;
 				if (fb > 255)
 					fb = 255;
-				lineBuf[i] = _engine->_pixelFormat.RGBToColor(fr, fg, fb);
+				lineBuf[i] = _engine->_resourcePixelFormat.RGBToColor(fr, fg, fb);
 			}
 			cnt++;
 			if (cnt >= it->count) {
@@ -138,14 +138,14 @@ void FogFx::update() {
 
 		// Not 100% equivalent, but looks nice and not buggy
 
-		_colorMap[31] = _engine->_pixelFormat.RGBToColor(_r << 3, _g << 3, _b << 3);
+		_colorMap[31] = _engine->_resourcePixelFormat.RGBToColor(_r << 3, _g << 3, _b << 3);
 
 		for (uint8 i = 0; i < 31; i++) {
 			float perc = (float)i / 31.0;
 			uint8 cr = (float)_r * perc;
 			uint8 cg = (float)_g * perc;
 			uint8 cb = (float)_b * perc;
-			_colorMap[i] = _engine->_pixelFormat.RGBToColor(cr << 3, cg << 3, cb << 3);
+			_colorMap[i] = _engine->_resourcePixelFormat.RGBToColor(cr << 3, cg << 3, cb << 3);
 		}
 	}
 
diff --git a/engines/zvision/graphics/effects/light.cpp b/engines/zvision/graphics/effects/light.cpp
index 00b3811d65..bf6513292f 100644
--- a/engines/zvision/graphics/effects/light.cpp
+++ b/engines/zvision/graphics/effects/light.cpp
@@ -59,10 +59,10 @@ const Graphics::Surface *LightFx::draw(const Graphics::Surface &srcSubRect) {
 
 	if (_pos < 0) {
 		uint8 cc = ((-_pos) & 0x1F) << 3;
-		dcolor = _engine->_pixelFormat.RGBToColor(cc, cc, cc);
+		dcolor = _engine->_resourcePixelFormat.RGBToColor(cc, cc, cc);
 	} else {
 		uint8 cc = (_pos & 0x1F) << 3;
-		dcolor = _engine->_pixelFormat.RGBToColor(cc, cc, cc);
+		dcolor = _engine->_resourcePixelFormat.RGBToColor(cc, cc, cc);
 	}
 
 	for (uint16 j = 0; j < _surface.h; j++) {
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 5af847c61a..1b6e1e2fdc 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -580,12 +580,6 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, c
 	// The two %*u are usually 0 and dont seem to have a use
 	sscanf(line.c_str(), "%24s %*u %*u %d %d", fileName, &_mask, &_framerate);
 
-	if (_mask > 0) {
-		byte r, g, b;
-		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(_mask, r, g, b);
-		_mask = _engine->_pixelFormat.RGBToColor(r, g, b);
-	}
-
 	_fileName = Common::String(fileName);
 }
 
@@ -648,12 +642,6 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 	       "%24s %u %u %u %u %u %u %d %*u %*u %d %d",
 	       fileName, &_x, &_y, &_x2, &_y2, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
-	if (_mask > 0) {
-		byte r, g, b;
-		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(_mask, r, g, b);
-		_mask = _engine->_pixelFormat.RGBToColor(r, g, b);
-	}
-
 	_fileName = Common::String(fileName);
 }
 
@@ -861,21 +849,12 @@ ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, int32 slotkey, c
 	_y = 0;
 
 	char fileName[25];
-	int color;
 
-	sscanf(line.c_str(), "%u %u %24s %*u %d", &_x, &_y, fileName, &color);
+	sscanf(line.c_str(), "%u %u %24s %*u %d", &_x, &_y, fileName, &_backgroundColor);
 
 	_fileName = Common::String(fileName);
 
-	if (color >= 0) {
-		byte r, g, b;
-		Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(color, r, g, b);
-		_backgroundColor = _engine->_pixelFormat.RGBToColor(r, g, b);
-	} else {
-		_backgroundColor = color;
-	}
-
-	if (color > 65535) {
+	if (_backgroundColor > 65535) {
 		warning("Background color for ActionSetPartialScreen is bigger than a uint16");
 	}
 }
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index d7734f6d7a..e1e6e6ec9d 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -199,7 +199,7 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 		// Blit the text using the RenderManager
 
 		Graphics::Surface txt;
-		txt.create(_textRectangle.width(), _textRectangle.height(), _engine->_pixelFormat);
+		txt.create(_textRectangle.width(), _textRectangle.height(), _engine->_resourcePixelFormat);
 
 		if (!_readOnly || !_focused)
 			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringInit, txt);
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index 10ba0af655..d6b1d34bae 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -67,7 +67,7 @@ TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 
 	if (!_rectangle.isEmpty()) {
 		_surface = new Graphics::Surface;
-		_surface->create(_rectangle.width(), _rectangle.height(), _engine->_pixelFormat);
+		_surface->create(_rectangle.width(), _rectangle.height(), _engine->_resourcePixelFormat);
 		_surface->fillRect(Common::Rect(_surface->w, _surface->h), 0);
 	}
 }
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
index 2930118524..66a27e96c5 100644
--- a/engines/zvision/scripting/sidefx/ttytext_node.cpp
+++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp
@@ -56,7 +56,7 @@ ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file
 
 		delete infile;
 	}
-	_img.create(_r.width(), _r.height(), _engine->_pixelFormat);
+	_img.create(_r.width(), _r.height(), _engine->_resourcePixelFormat);
 	_style._sharp = true;
 	_style.readAllStyle(_txtbuf);
 	_style.setFont(_fnt);
@@ -158,7 +158,7 @@ void ttyTextNode::newline() {
 }
 
 void ttyTextNode::outchar(uint16 chr) {
-	uint32 clr = _engine->_pixelFormat.RGBToColor(_style._red, _style._green, _style._blue);
+	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(_style._red, _style._green, _style._blue);
 
 	if (_dx + _fnt.getCharWidth(chr) > _r.width())
 		newline();
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 8ddba3fbab..f28ba6ade3 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -298,7 +298,7 @@ void cTxtStyle::setFont(StyledTTFont &font) {
 
 Graphics::Surface *TextRenderer::render(StyledTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
 	style.setFontStyle(fnt);
-	uint32 clr = _engine->_pixelFormat.RGBToColor(style._red, style._green, style._blue);
+	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(style._red, style._green, style._blue);
 	return fnt.renderSolidText(txt, clr);
 }
 
@@ -317,7 +317,7 @@ int32 TextRenderer::drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Gra
 
 	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
 
-	uint32 clr = _engine->_pixelFormat.RGBToColor(fontStyle._red, fontStyle._green, fontStyle._blue);
+	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(fontStyle._red, fontStyle._green, fontStyle._blue);
 
 	int16 w;
 
diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index f373afe437..f64c0ab3bc 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -218,7 +218,7 @@ Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint
 	if (_font) {
 		int16 w = _font->getStringWidth(str);
 		if (w && w < 1024) {
-			tmp->create(w, _font->getFontHeight(), _engine->_pixelFormat);
+			tmp->create(w, _font->getFontHeight(), _engine->_resourcePixelFormat);
 			drawString(tmp, str, 0, 0, w, color);
 		}
 	}
diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index f1ac10bf88..260f912ade 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -64,7 +64,7 @@ RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
 		return;
 	}
 
-	_currentFrameBuffer.create(_width, _height, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
+	_currentFrameBuffer.create(_width, _height, getPixelFormat());
 	_frameBufferByteSize = _width * _height * sizeof(uint16);
 
 	_frames = new Frame[_frameCount];
@@ -239,12 +239,7 @@ void RLFDecoder::RLFVideoTrack::decodeMaskedRunLengthEncoding(int8 *source, int8
 					return;
 				}
 
-				byte r, g, b;
-				// NOTE: Color masks can't be used here, since accurate colors
-				// are required to handle transparency correctly
-				Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
-				uint16 destColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
-				WRITE_UINT16(dest + destOffset, destColor);
+				WRITE_UINT16(dest + destOffset, READ_LE_UINT16(source + sourceOffset));
 
 				sourceOffset += 2;
 				destOffset += 2;
@@ -288,12 +283,7 @@ void RLFDecoder::RLFVideoTrack::decodeSimpleRunLengthEncoding(int8 *source, int8
 					return;
 				}
 
-				byte r, g, b;
-				// NOTE: Color masks can't be used here, since accurate colors
-				// are required to handle transparency correctly
-				Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
-				uint16 destColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
-				WRITE_UINT16(dest + destOffset, destColor);
+				WRITE_UINT16(dest + destOffset, READ_LE_UINT16(source + sourceOffset));
 
 				sourceOffset += 2;
 				destOffset += 2;
@@ -307,11 +297,7 @@ void RLFDecoder::RLFVideoTrack::decodeSimpleRunLengthEncoding(int8 *source, int8
 				return;
 			}
 
-			byte r, g, b;
-			// NOTE: Color masks can't be used here, since accurate colors
-			// are required to handle transparency correctly
-			Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0).colorToRGB(READ_LE_UINT16(source + sourceOffset), r, g, b);
-			uint16 sampleColor = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0).RGBToColor(r, g, b);
+			uint16 sampleColor = READ_LE_UINT16(source + sourceOffset);
 			sourceOffset += 2;
 
 			numberOfCopy = numberOfSamples + 2;
diff --git a/engines/zvision/video/rlf_decoder.h b/engines/zvision/video/rlf_decoder.h
index f0f31c2128..d56ff2da92 100644
--- a/engines/zvision/video/rlf_decoder.h
+++ b/engines/zvision/video/rlf_decoder.h
@@ -45,7 +45,7 @@ private:
 
 		uint16 getWidth() const { return _width; }
 		uint16 getHeight() const { return _height; }
-		Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); /*RGB 565*/ }
+		Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); /* RGB 555 */ }
 		int getCurFrame() const { return _curFrame; }
 		int getFrameCount() const { return _frameCount; }
 		const Graphics::Surface *decodeNextFrame();
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 5978316451..b865ae9e6e 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -191,7 +191,7 @@ void ZVision::initialize() {
 
 	// Create managers
 	_scriptManager = new ScriptManager(this);
-	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _screenPixelFormat);
+	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat);
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, _resourcePixelFormat);
-- 
cgit v1.2.3


From 5f8418394b925adfc62ee6d180515157190a8cd9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 22:54:24 +0200
Subject: ZVISION: Set all the internal graphics operations to use RGB555 (2/2)

This is the second part of the changes to make the engine use RGB555
internally again. This is done to simplify the rendering pipeline -
the engine will use RGB555 internally, but will output to RGB565.
The overall changes have been broken into two commits, with this
commit finishing all the changes.

This is needed, as the game uses RGB555 graphics internally, but
its AVI animations (full screen and in-game) use RGB565
---
 .../zvision/graphics/cursors/cursor_manager.cpp    |   2 +-
 engines/zvision/graphics/render_manager.cpp        | 111 +++++++++++++--------
 engines/zvision/graphics/render_manager.h          |   2 +
 engines/zvision/video/video.cpp                    |   3 +-
 engines/zvision/zvision.cpp                        |   1 -
 engines/zvision/zvision.h                          |   1 -
 6 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index a197c7ed87..c364426bad 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -106,7 +106,7 @@ void CursorManager::initialize() {
 }
 
 void CursorManager::changeCursor(const ZorkCursor &cursor) {
-	CursorMan.replaceCursor(cursor.getSurface(), cursor.getWidth(), cursor.getHeight(), cursor.getHotspotX(), cursor.getHotspotY(), cursor.getKeyColor(), false, _pixelFormat);
+	CursorMan.replaceCursor(cursor.getSurface(), cursor.getWidth(), cursor.getHeight(), cursor.getHotspotX(), cursor.getHotspotY(), cursor.getKeyColor(), false, &_pixelFormat);
 }
 
 void CursorManager::cursorDown(bool pushed) {
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 01df82410f..07ed6d2e2b 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -127,14 +127,29 @@ void RenderManager::renderSceneToScreen() {
 	}
 
 	if (!outWndDirtyRect.isEmpty()) {
-		_system->copyRectToScreen(out->getBasePtr(outWndDirtyRect.left, outWndDirtyRect.top), out->pitch,
-		                          outWndDirtyRect.left + _workingWindow.left,
-		                          outWndDirtyRect.top + _workingWindow.top,
-		                          outWndDirtyRect.width(),
-		                          outWndDirtyRect.height());
+		Common::Rect rect(
+			outWndDirtyRect.left + _workingWindow.left,
+			outWndDirtyRect.top + _workingWindow.top,
+			outWndDirtyRect.left + _workingWindow.left + outWndDirtyRect.width(),
+			outWndDirtyRect.top + _workingWindow.top + outWndDirtyRect.height()
+		);
+		copyToScreen(*out, rect, outWndDirtyRect.left, outWndDirtyRect.top);
 	}
 }
 
+void RenderManager::copyToScreen(const Graphics::Surface &surface, Common::Rect &rect, int16 srcLeft, int16 srcTop) {
+	// Convert the surface to RGB565, if needed
+	Graphics::Surface *outSurface = surface.convertTo(_engine->_screenPixelFormat);
+	_system->copyRectToScreen(outSurface->getBasePtr(srcLeft, srcTop),
+		                        outSurface->pitch,
+		                        rect.left,
+		                        rect.top,
+		                        rect.width(),
+		                        rect.height());
+	outSurface->free();
+	delete outSurface;
+}
+
 void RenderManager::renderImageToBackground(const Common::String &fileName, int16 destX, int16 destY) {
 	Graphics::Surface surface;
 	readImageToSurface(fileName, surface);
@@ -183,8 +198,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 	Image::TGADecoder tga;
 	uint16 *buffer;
 	// All ZVision images are in RGB 555
-	Graphics::PixelFormat pixelFormat555 = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
-	destination.format = pixelFormat555;
+	destination.format = _engine->_resourcePixelFormat;
 
 	bool isTGZ;
 
@@ -229,7 +243,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 	// If the destination internal buffer is the same size as what we're copying into it,
 	// there is no need to free() and re-create
 	if (imageWidth != destination.w || imageHeight != destination.h) {
-		destination.create(imageWidth, imageHeight, pixelFormat555);
+		destination.create(imageWidth, imageHeight, _engine->_resourcePixelFormat);
 	}
 
 	// If transposed, 'un-transpose' the data while copying it to the destination
@@ -245,7 +259,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 			}
 		}
 	} else {
-		memcpy(destination.getPixels(), buffer, imageWidth * imageHeight * _pixelFormat.bytesPerPixel);
+		memcpy(destination.getPixels(), buffer, imageWidth * imageHeight * destination.format.bytesPerPixel);
 	}
 
 	// Cleanup
@@ -254,9 +268,6 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 	} else {
 		tga.destroy();
 	}
-
-	// Convert in place to RGB 565 from RGB 555
-	destination.convertToInPlace(_pixelFormat);
 }
 
 const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) {
@@ -370,10 +381,6 @@ void RenderManager::scaleBuffer(const void *src, void *dst, uint32 srcWidth, uin
 }
 
 void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y) {
-
-	if (src.format != dst.format)
-		return;
-
 	Common::Rect srcRect = _srcRect;
 	if (srcRect.isEmpty())
 		srcRect = Common::Rect(src.w, src.h);
@@ -384,8 +391,10 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (srcRect.isEmpty() || !srcRect.isValidRect())
 		return;
 
+	Graphics::Surface *srcAdapted = src.convertTo(dst.format);
+
 	// Copy srcRect from src surface to dst surface
-	const byte *srcBuffer = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
+	const byte *srcBuffer = (const byte *)srcAdapted->getBasePtr(srcRect.left, srcRect.top);
 
 	int xx = _x;
 	int yy = _y;
@@ -395,8 +404,11 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (yy < 0)
 		yy = 0;
 
-	if (_x >= dst.w || _y >= dst.h)
+	if (_x >= dst.w || _y >= dst.h) {
+		srcAdapted->free();
+		delete srcAdapted;
 		return;
+	}
 
 	byte *dstBuffer = (byte *)dst.getBasePtr(xx, yy);
 
@@ -404,17 +416,16 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	int32 h = srcRect.height();
 
 	for (int32 y = 0; y < h; y++) {
-		memcpy(dstBuffer, srcBuffer, w * src.format.bytesPerPixel);
-		srcBuffer += src.pitch;
+		memcpy(dstBuffer, srcBuffer, w * srcAdapted->format.bytesPerPixel);
+		srcBuffer += srcAdapted->pitch;
 		dstBuffer += dst.pitch;
 	}
+
+	srcAdapted->free();
+	delete srcAdapted;
 }
 
 void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y, uint32 colorkey) {
-
-	if (src.format != dst.format)
-		return;
-
 	Common::Rect srcRect = _srcRect;
 	if (srcRect.isEmpty())
 		srcRect = Common::Rect(src.w, src.h);
@@ -425,10 +436,11 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (srcRect.isEmpty() || !srcRect.isValidRect())
 		return;
 
-	uint32 _keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
+	Graphics::Surface *srcAdapted = src.convertTo(dst.format);
+	uint32 keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
 
 	// Copy srcRect from src surface to dst surface
-	const byte *srcBuffer = (const byte *)src.getBasePtr(srcRect.left, srcRect.top);
+	const byte *srcBuffer = (const byte *)srcAdapted->getBasePtr(srcRect.left, srcRect.top);
 
 	int xx = _x;
 	int yy = _y;
@@ -438,8 +450,11 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (yy < 0)
 		yy = 0;
 
-	if (_x >= dst.w || _y >= dst.h)
+	if (_x >= dst.w || _y >= dst.h) {
+		srcAdapted->free();
+		delete srcAdapted;
 		return;
+	}
 
 	byte *dstBuffer = (byte *)dst.getBasePtr(xx, yy);
 
@@ -447,12 +462,12 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	int32 h = srcRect.height();
 
 	for (int32 y = 0; y < h; y++) {
-		switch (src.format.bytesPerPixel) {
+		switch (srcAdapted->format.bytesPerPixel) {
 		case 1: {
 			const uint *srcTemp = (const uint *)srcBuffer;
 			uint *dstTemp = (uint *)dstBuffer;
 			for (int32 x = 0; x < w; x++) {
-				if (*srcTemp != _keycolor)
+				if (*srcTemp != keycolor)
 					*dstTemp = *srcTemp;
 				srcTemp++;
 				dstTemp++;
@@ -464,7 +479,7 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 			const uint16 *srcTemp = (const uint16 *)srcBuffer;
 			uint16 *dstTemp = (uint16 *)dstBuffer;
 			for (int32 x = 0; x < w; x++) {
-				if (*srcTemp != _keycolor)
+				if (*srcTemp != keycolor)
 					*dstTemp = *srcTemp;
 				srcTemp++;
 				dstTemp++;
@@ -476,7 +491,7 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 			const uint32 *srcTemp = (const uint32 *)srcBuffer;
 			uint32 *dstTemp = (uint32 *)dstBuffer;
 			for (int32 x = 0; x < w; x++) {
-				if (*srcTemp != _keycolor)
+				if (*srcTemp != keycolor)
 					*dstTemp = *srcTemp;
 				srcTemp++;
 				dstTemp++;
@@ -487,9 +502,12 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 		default:
 			break;
 		}
-		srcBuffer += src.pitch;
+		srcBuffer += srcAdapted->pitch;
 		dstBuffer += dst.pitch;
 	}
+
+	srcAdapted->free();
+	delete srcAdapted;
 }
 
 void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y) {
@@ -699,12 +717,15 @@ void RenderManager::clearMenuSurface(const Common::Rect &r) {
 void RenderManager::renderMenuToScreen() {
 	if (!_menuSurfaceDirtyRect.isEmpty()) {
 		_menuSurfaceDirtyRect.clip(Common::Rect(_menuSurface.w, _menuSurface.h));
-		if (!_menuSurfaceDirtyRect.isEmpty())
-			_system->copyRectToScreen(_menuSurface.getBasePtr(_menuSurfaceDirtyRect.left, _menuSurfaceDirtyRect.top), _menuSurface.pitch,
-			                          _menuSurfaceDirtyRect.left + _menuArea.left,
-			                          _menuSurfaceDirtyRect.top + _menuArea.top,
-			                          _menuSurfaceDirtyRect.width(),
-			                          _menuSurfaceDirtyRect.height());
+		if (!_menuSurfaceDirtyRect.isEmpty()) {
+			Common::Rect rect(
+				_menuSurfaceDirtyRect.left + _menuArea.left,
+				_menuSurfaceDirtyRect.top + _menuArea.top,
+				_menuSurfaceDirtyRect.left + _menuArea.left + _menuSurfaceDirtyRect.width(),
+				_menuSurfaceDirtyRect.top + _menuArea.top + _menuSurfaceDirtyRect.height()
+			);
+			copyToScreen(_menuSurface, rect, _menuSurfaceDirtyRect.left, _menuSurfaceDirtyRect.top);
+		}
 		_menuSurfaceDirtyRect = Common::Rect();
 	}
 }
@@ -779,7 +800,7 @@ void RenderManager::processSubs(uint16 deltatime) {
 			OneSubtitle *sub = &it->_value;
 			if (sub->txt.size()) {
 				Graphics::Surface *rndr = new Graphics::Surface();
-				rndr->create(sub->r.width(), sub->r.height(), _pixelFormat);
+				rndr->create(sub->r.width(), sub->r.height(), _engine->_resourcePixelFormat);
 				_engine->getTextRenderer()->drawTxtInOneLine(sub->txt, *rndr);
 				blitSurfaceToSurface(*rndr, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
 				rndr->free();
@@ -788,11 +809,13 @@ void RenderManager::processSubs(uint16 deltatime) {
 			sub->redraw = false;
 		}
 
-		_system->copyRectToScreen(_subtitleSurface.getPixels(), _subtitleSurface.pitch,
-		                          _subtitleArea.left,
-		                          _subtitleArea.top,
-		                          _subtitleSurface.w,
-		                          _subtitleSurface.h);
+		Common::Rect rect(
+			_subtitleArea.left,
+			_subtitleArea.top,
+			_subtitleArea.left + _subtitleSurface.w,
+			_subtitleArea.top + _subtitleSurface.h
+		);
+		copyToScreen(_subtitleSurface, rect, 0, 0);
 	}
 }
 
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index c2dc169945..d67ae29a3a 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -146,6 +146,8 @@ public:
 	 */
 	void renderSceneToScreen();
 
+	void copyToScreen(const Graphics::Surface &surface, Common::Rect &rect, int16 srcLeft, int16 srcTop);
+
 	/**
 	 * Blits the image or a portion of the image to the background.
 	 *
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 50a6fc136a..e67e6570c5 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -114,7 +114,8 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 					_renderManager->scaleBuffer(frame->getPixels(), scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, scaled->w, scaled->h);
 					frame = scaled;
 				}
-				_system->copyRectToScreen((const byte *)frame->getPixels(), frame->pitch, x, y, finalWidth, finalHeight);
+				Common::Rect rect = Common::Rect(x, y, x + finalWidth, y + finalHeight);
+				_renderManager->copyToScreen(*frame, rect, 0, 0);
 				_renderManager->processSubs(0);
 			}
 		}
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b865ae9e6e..db96884103 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -81,7 +81,6 @@ struct zvisionIniSettings {
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	: Engine(syst),
 	  _gameDescription(gameDesc),
-	  _pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /*RGB 565*/
 	  _resourcePixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), /* RGB 555 */
 	  _screenPixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /* RGB 565 */
 	  _desiredFrameTime(33), /* ~30 fps */
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index a63b66f70f..e9b8ca4547 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -68,7 +68,6 @@ public:
 	 * edges of this Rectangle
 	 */
 	Common::Rect _workingWindow;
-	const Graphics::PixelFormat _pixelFormat;
 	const Graphics::PixelFormat _resourcePixelFormat;
 	const Graphics::PixelFormat _screenPixelFormat;
 
-- 
cgit v1.2.3


From 75d78c71cc2190ae4afa655d27cdbc35a748f901 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 23:18:01 +0200
Subject: ZVISION: Plug another memory leak. Some cleanup

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index bf3509f545..dec70e2642 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -44,7 +44,7 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 		Common::File *tmp = engine->getSearchManager()->openFile(fileName);
 		if (tmp) {
 			tmp->seek(176, SEEK_SET);
-			_frmDelay = tmp->readUint32LE() / 10;
+			_frmDelay = Common::Rational(tmp->readUint32LE(), 10).toInt();
 			delete tmp;
 		}
 
@@ -73,8 +73,10 @@ AnimationNode::~AnimationNode() {
 	if (it != _playList.end()) {
 		_engine->getScriptManager()->setStateValue((*it).slot, 2);
 
-		if ((*it)._scaled)
+		if ((*it)._scaled) {
+			(*it)._scaled->free();
 			delete(*it)._scaled;
+		}
 	}
 
 	_playList.clear();
@@ -109,8 +111,10 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 					if (nod->loop == 0) {
 						if (nod->slot >= 0)
 							_engine->getScriptManager()->setStateValue(nod->slot, 2);
-						if (nod->_scaled)
+						if (nod->_scaled) {
+							nod->_scaled->free();
 							delete nod->_scaled;
+						}
 						_playList.erase(it);
 						return _DisposeAfterUse;
 					}
@@ -142,6 +146,7 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 				if (frame->w > dstw || frame->h > dsth || (frame->w == dstw / 2 && frame->h == dsth / 2)) {
 					if (nod->_scaled)
 						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
+							nod->_scaled->free();
 							delete nod->_scaled;
 							nod->_scaled = NULL;
 						}
@@ -197,8 +202,10 @@ bool AnimationNode::stop() {
 	PlayNodes::iterator it = _playList.begin();
 	if (it != _playList.end()) {
 		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-		if ((*it)._scaled)
+		if ((*it)._scaled) {
+			(*it)._scaled->free();
 			delete(*it)._scaled;
+		}
 	}
 
 	_playList.clear();
-- 
cgit v1.2.3


From fa2d8d927b353162ac9ee434b4611e03b22246e8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 24 Dec 2014 23:27:03 +0200
Subject: ZVISION: Plug more memory leaks

---
 engines/zvision/scripting/controls/paint_control.cpp  | 12 +++++++++---
 engines/zvision/scripting/controls/titler_control.cpp |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index df06bb814e..62dde3d170 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -114,12 +114,18 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 PaintControl::~PaintControl() {
 	// Clear the state value back to 0
 	//_engine->getScriptManager()->setStateValue(_key, 0);
-	if (_paint)
+	if (_paint) {
+		_paint->free();
 		delete _paint;
-	if (_brush)
+	}
+	if (_brush) {
+		_brush->free();
 		delete _brush;
-	if (_bkg)
+	}
+	if (_bkg) {
+		_bkg->free();
 		delete _bkg;
+	}
 }
 
 bool PaintControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index d6b1d34bae..542e0a0b67 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -73,8 +73,10 @@ TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 }
 
 TitlerControl::~TitlerControl() {
-	if (_surface)
+	if (_surface) {
+		_surface->free();
 		delete _surface;
+	}
 }
 
 void TitlerControl::setString(int strLine) {
-- 
cgit v1.2.3


From 381b7592a49e5d022159b5684dbba32eceaa6657 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 25 Dec 2014 00:31:17 +0100
Subject: SCI: actor file format, add debug code kPortrait

---
 engines/sci/graphics/portrait.cpp | 51 +++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 668de616fb..959c0f6817 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -57,13 +57,39 @@ void Portrait::init() {
 	// 4 bytes paletteSize (base 1)
 	//  -> 17 bytes
 	// paletteSize bytes paletteData
-	// 14 bytes bitmap header
-	//  -> 4 bytes unknown
-	//  -> 2 bytes height
-	//  -> 2 bytes width
-	//  -> 6 bytes unknown
-	// height * width bitmap data
-	// another animation count times bitmap header and data
+	//
+	// bitmap-data follows, total of [animation count]
+	//   14 bytes bitmap header
+	//    -> 4 bytes unknown
+	//    -> 2 bytes height
+	//    -> 2 bytes width
+	//    -> 6 bytes unknown
+	//   height * width bitmap data
+	//
+	// 4 bytes offset table size (may be larger than the actual known entries?!)
+	//   14 bytes all zeroes (dummy entry?!)
+	//
+	//   14 bytes for each entry
+	//    -> 2 bytes displace X
+	//    -> 2 bytes displace Y
+	//    -> 2 bytes height (again)
+	//    -> 2 bytes width (again)
+	//    -> 6 bytes unknown (normally 01 00 00 00 00 00 for delta bitmaps, 00 00 00 00 00 00 for first bitmap)
+	//   random data may be used as filler
+	//
+	// 4 bytes lip sync id table size (is [lip sync id count] * 4, should be 0x2E0 for all actors)
+	//   4 bytes per lip sync id
+	//    -> 1 byte length of ID
+	//    -> 3 bytes actual ID
+	//
+	// 4 bytes lip sync id data table size (seems to be the same for all actors, always 0x220 in size)
+	//   1 byte animation number or 0xFF as terminator
+	//   1 byte delay, if last byte was not terminator
+	//   one array for every lip sync id
+	//
+	// 4 bytes appended, seem to be random
+	//   9E11120E for alex
+	//   9E9E9E9E for vizier
 	int32 fileSize = 0;
 	Common::SeekableReadStream *file =
 		SearchMan.createReadStreamForMember("actors/" + _resourceName + ".bin");
@@ -202,6 +228,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 	if (raveResource->size < 4000) {
 		memcpy(debugPrint, raveResource->data, raveResource->size);
 		debugPrint[raveResource->size] = 0; // set terminating NUL
+		debug("kPortrait: using actor %s", _resourceName.c_str());
 		debug("kPortrait (noun %d, verb %d, cond %d, seq %d)", noun, verb, cond, seq);
 		debug("kPortrait: %s", debugPrint);
 	}
@@ -273,6 +300,10 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 			raveLipSyncData = NULL;
 		}
 
+#ifdef DEBUG_PORTRAIT
+		debug("kPortrait: %d: %x", raveTicks, raveID);
+#endif
+
 		timerPosition += raveTicks;
 
 		// Wait till syncTime passed, then show specific animation bitmap
@@ -294,6 +325,9 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 			//  Tick = 0xFF is the terminator for the data
 			timerPositionWithin = timerPosition;
 			raveLipSyncTicks = *raveLipSyncData++;
+#ifdef DEBUG_PORTRAIT
+			debug("kPortrait: waiting %d", raveLipSyncTicks);
+#endif
 			while ( (raveLipSyncData < _lipSyncDataOffsetTableEnd) && (raveLipSyncTicks != 0xFF) ) {
 				timerPositionWithin += raveLipSyncTicks;
 
@@ -308,6 +342,9 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 				} while ((curPosition != -1) && (curPosition < timerPositionWithin) && (!userAbort));
 
 				raveLipSyncBitmapNr = *raveLipSyncData++;
+#ifdef DEBUG_PORTRAIT
+				debug("kPortrait: showing bitmap %d", raveLipSyncBitmapNr);
+#endif
 
 				// bitmap nr within sync data is base 1, we need base 0
 				raveLipSyncBitmapNr--;
-- 
cgit v1.2.3


From 319323c668003b284d51b84ec95a64ba7c072450 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 15:00:49 +0200
Subject: ZVISION: Document some of the ActionRegion effects

---
 engines/zvision/graphics/effects/fog.h          | 1 +
 engines/zvision/scripting/actions.cpp           | 2 +-
 engines/zvision/scripting/scr_file_handling.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/effects/fog.h b/engines/zvision/graphics/effects/fog.h
index 45d6f9596d..fe88707bbe 100644
--- a/engines/zvision/graphics/effects/fog.h
+++ b/engines/zvision/graphics/effects/fog.h
@@ -29,6 +29,7 @@ namespace ZVision {
 
 class ZVision;
 
+// Used by Zork: Nemesis for the mixing chamber gas effect in the gas puzzle (location tt5e, when the blinds are down)
 class FogFx : public Effect {
 public:
 
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 1b6e1e2fdc..89b311e81c 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -704,7 +704,7 @@ bool ActionQuit::execute() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// ActionRegion
+// ActionRegion - only used by Zork: Nemesis
 //////////////////////////////////////////////////////////////////////////////
 
 ActionRegion::ActionRegion(ZVision *engine, int32 slotkey, const Common::String &line) :
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 47b8b0aa39..cca492d649 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -264,6 +264,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("random", true)) {
 					actionList.push_back(new ActionRandom(_engine, slot, args));
 				} else if (act.matchString("region", true)) {
+					// Only used by Zork: Nemesis
 					actionList.push_back(new ActionRegion(_engine, slot, args));
 				} else if (act.matchString("restore_game", true)) {
 					actionList.push_back(new ActionRestoreGame(_engine, slot, args));
-- 
cgit v1.2.3


From 5535cb02fc8dfaf2c77911c223c912f5b07bdb63 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 15:14:59 +0200
Subject: ZVISION: Resolve some TODOs

---
 engines/zvision/scripting/actions.h             | 2 +-
 engines/zvision/scripting/scr_file_handling.cpp | 1 +
 engines/zvision/scripting/script_manager.h      | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 292e25e19c..3501372c7f 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -338,7 +338,7 @@ private:
 	uint16 _unk2;
 };
 
-// TODO: See if this exists in ZGI. It doesn't in ZNem
+// Only used by ZGI (locations cd6e, cd6k, dg2f, dg4e, dv1j)
 class ActionUnloadAnimation : public ResultAction {
 public:
 	ActionUnloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index cca492d649..83be3b5ad4 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -216,6 +216,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("animpreload", true)) {
 					actionList.push_back(new ActionPreloadAnimation(_engine, slot, args));
 				} else if (act.matchString("animunload", true)) {
+					// Only used by ZGI (locations cd6e, cd6k, dg2f, dg4e, dv1j)
 					actionList.push_back(new ActionUnloadAnimation(_engine, slot, args));
 				} else if (act.matchString("attenuate", true)) {
 					actionList.push_back(new ActionAttenuate(_engine, slot, args));
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 1e308faf0d..c5ade08e14 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -282,7 +282,7 @@ public:
 	void inventoryDrop(int16 item);
 	void inventoryCycle();
 
-	// TODO: Make this private. It was only made public so Console::cmdParseAllScrFiles() could use it
+private:
 	/**
 	 * Parses a script file into triggers and events
 	 *
@@ -291,7 +291,6 @@ public:
 	 */
 	void parseScrFile(const Common::String &fileName, ScriptScope &scope);
 
-private:
 	/**
 	 * Parses the stream into a Puzzle object
 	 * Helper method for parseScrFile.
-- 
cgit v1.2.3


From 36c851d0e47b18205ac7ac91eb33666e4abe95ca Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 16:22:36 +0200
Subject: ZVISION: Fix frame rate for RLF videos and remove hack in
 AnimationNode

_frameTime refers to msec, not ticks
---
 engines/zvision/scripting/sidefx/animation_node.cpp | 16 ++++------------
 engines/zvision/video/rlf_decoder.h                 |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index dec70e2642..97c6eeeab5 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -39,20 +39,12 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	  _mask(mask),
 	  _animation(NULL) {
 
-	if (fileName.hasSuffix(".rlf")) {
-		// HACK: Read the frame delay directly
-		Common::File *tmp = engine->getSearchManager()->openFile(fileName);
-		if (tmp) {
-			tmp->seek(176, SEEK_SET);
-			_frmDelay = Common::Rational(tmp->readUint32LE(), 10).toInt();
-			delete tmp;
-		}
+	_animation = engine->loadAnimation(fileName);
 
-		_animation = engine->loadAnimation(fileName);
-	} else {
-		_animation = engine->loadAnimation(fileName);
+	if (fileName.hasSuffix(".rlf"))
+		_frmDelay = _animation->getTimeToNextFrame();
+	else
 		_frmDelay = Common::Rational(1000, _animation->getDuration().framerate()).toInt();
-	}
 
 	if (frate > 0)
 		_frmDelay = 1000.0 / frate;
diff --git a/engines/zvision/video/rlf_decoder.h b/engines/zvision/video/rlf_decoder.h
index d56ff2da92..740f3fdd43 100644
--- a/engines/zvision/video/rlf_decoder.h
+++ b/engines/zvision/video/rlf_decoder.h
@@ -53,7 +53,7 @@ private:
 		bool seek(const Audio::Timestamp &time);
 
 	protected:
-		Common::Rational getFrameRate() const { return Common::Rational(60, _frameTime); }
+		Common::Rational getFrameRate() const { return Common::Rational(1000, _frameTime); }
 
 	private:
 		enum EncodingType {
-- 
cgit v1.2.3


From 06fbca1e8109bdd3d1fdf72fc1056cbf658659e5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 20:10:24 +0200
Subject: ZVISION: Remove dead code

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 4 ----
 engines/zvision/scripting/sidefx/animation_node.h   | 2 --
 2 files changed, 6 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 97c6eeeab5..b966aa9cb8 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -206,8 +206,4 @@ bool AnimationNode::stop() {
 	return false;
 }
 
-int32 AnimationNode::getFrameDelay() {
-	return _frmDelay;
-}
-
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index 74941aa764..368f0291fd 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -72,8 +72,6 @@ public:
 	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops = 1);
 
 	bool stop();
-
-	int32 getFrameDelay();
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From dbbcf641874ace35b871226664370413de176c37 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 21:17:47 +0200
Subject: ZVISION: Use the search manager to open files in console commands

---
 engines/zvision/core/console.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 07d3114ec8..c7592c8d9d 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -79,12 +79,14 @@ bool Console::cmdLoadSound(int argc, const char **argv) {
 		Audio::AudioStream *soundStream = makeRawZorkStream(argv[1], _engine);
 		Audio::SoundHandle handle;
 		_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, soundStream, -1, 100, 0, DisposeAfterUse::YES, false, false);
-
 	} else if (argc == 4) {
 		int isStereo = atoi(argv[3]);
 
 		Common::File *file = new Common::File();
-		file->open(argv[1]);
+		if (!_engine->getSearchManager()->openFile(*file, argv[1])) {
+			warning("File not found: %s", argv[1]);
+			return true;
+		}
 
 		Audio::AudioStream *soundStream = makeRawZorkStream(file, atoi(argv[2]), isStereo == 0 ? false : true);
 		Audio::SoundHandle handle;
@@ -104,8 +106,10 @@ bool Console::cmdRawToWav(int argc, const char **argv) {
 	}
 
 	Common::File file;
-	if (!file.open(argv[1]))
+	if (!_engine->getSearchManager()->openFile(file, argv[1])) {
+		warning("File not found: %s", argv[1]);
 		return true;
+	}
 
 	Audio::AudioStream *audioStream = makeRawZorkStream(argv[1], _engine);
 
-- 
cgit v1.2.3


From 11cf9b53ba138b5e069d7ffbd6af7f36b26a9add Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 21:19:19 +0200
Subject: ZVISION: Remove dead code, and fix bad usage of assert()

Since some compilers, like MSVC, strip out asserts in non-debug builds,
it's a bad idea to perform active commands within assert() statements.
In this particular case, the engine would attempt to open a file in an
assert statement
---
 engines/zvision/sound/zork_raw.cpp | 11 ++---------
 engines/zvision/sound/zork_raw.h   | 14 --------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index b2c88b34df..6d1980b1af 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -213,7 +213,6 @@ RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag dis
 }
 
 int RawZorkStream::readBuffer(int16 *buffer, const int numSamples) {
-
 	int32 bytesRead = _streamReader.readBuffer(buffer, _stream.get(), numSamples);
 
 	if (_stream->eos())
@@ -241,16 +240,10 @@ Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stre
 	return new RawZorkStream(rate, stereo, disposeAfterUse, stream);
 }
 
-Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
-        int rate,
-        bool stereo,
-        DisposeAfterUse::Flag disposeAfterUse) {
-	return makeRawZorkStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, stereo, DisposeAfterUse::YES);
-}
-
 Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine) {
 	Common::File *file = new Common::File();
-	assert(engine->getSearchManager()->openFile(*file, filePath));
+	if (!engine->getSearchManager()->openFile(*file, filePath))
+		error("File not found: %s", filePath.c_str());
 
 	// Get the file name
 	Common::StringTokenizer tokenizer(filePath, "/\\");
diff --git a/engines/zvision/sound/zork_raw.h b/engines/zvision/sound/zork_raw.h
index 0b408d818c..892bad4d5f 100644
--- a/engines/zvision/sound/zork_raw.h
+++ b/engines/zvision/sound/zork_raw.h
@@ -122,20 +122,6 @@ public:
 	bool rewind();
 };
 
-/**
- * Creates an audio stream, which plays from the given buffer.
- *
- * @param buffer     Buffer to play from.
- * @param size       Size of the buffer in bytes.
- * @param rate       Rate of the sound data.
- * @param dispose    AfterUse Whether to free the buffer after use (with free!).
- * @return           The new SeekableAudioStream (or 0 on failure).
- */
-Audio::RewindableAudioStream *makeRawZorkStream(const byte *buffer, uint32 size,
-        int rate,
-        bool stereo,
-        DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
-
 /**
  * Creates an audio stream, which plays from the given stream.
  *
-- 
cgit v1.2.3


From 6c451c9cf481dcaa6261c34773b79689386ded42 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 21:48:59 +0200
Subject: ZVISION: Document where MIDI commands are used

---
 engines/zvision/scripting/actions.cpp         | 4 +++-
 engines/zvision/scripting/sidefx/music_node.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 89b311e81c..be2079736e 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -477,7 +477,9 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 
 	sscanf(line.c_str(), "%u %24s %u %u", &type, fileNameBuffer, &loop, &volume);
 
-	// type 4 are midi sound effect files
+	// Type 4 actions are MIDI commands, not files. These are only used by
+	// Zork: Nemesis, for the flute and piano puzzles (tj4e and ve6f, as well
+	// as vr)
 	if (type == 4) {
 		_midi = true;
 		int note;
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
index 8f4a46f3fc..3f1ca5cf7b 100644
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ b/engines/zvision/scripting/sidefx/music_node.h
@@ -91,6 +91,7 @@ private:
 	bool _loaded;
 };
 
+// Only used by Zork: Nemesis, for the flute and piano puzzles (tj4e and ve6f, as well as vr)
 class MusicMidiNode : public MusicNodeBASE {
 public:
 	MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume);
-- 
cgit v1.2.3


From 6368a6ea91364f90bcb0d5d9d88826d856181a52 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 22:00:55 +0200
Subject: ZVISION: Move the menu code together with the other scripting code

---
 engines/zvision/core/events.cpp    |   2 +-
 engines/zvision/core/menu.cpp      | 765 -------------------------------------
 engines/zvision/core/menu.h        | 125 ------
 engines/zvision/module.mk          |   2 +-
 engines/zvision/scripting/menu.cpp | 762 ++++++++++++++++++++++++++++++++++++
 engines/zvision/scripting/menu.h   | 125 ++++++
 engines/zvision/zvision.cpp        |   2 +-
 7 files changed, 890 insertions(+), 893 deletions(-)
 delete mode 100644 engines/zvision/core/menu.cpp
 delete mode 100644 engines/zvision/core/menu.h
 create mode 100644 engines/zvision/scripting/menu.cpp
 create mode 100644 engines/zvision/scripting/menu.h

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 1920ffd769..89f1595460 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -28,7 +28,7 @@
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
-#include "zvision/core/menu.h"
+#include "zvision/scripting/menu.h"
 #include "zvision/sound/zork_raw.h"
 
 #include "common/events.h"
diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
deleted file mode 100644
index 31e0d71370..0000000000
--- a/engines/zvision/core/menu.cpp
+++ /dev/null
@@ -1,765 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/core/menu.h"
-
-#include "zvision/graphics/render_manager.h"
-
-namespace ZVision {
-
-enum {
-	SLOT_START_SLOT = 151,
-	SLOT_SPELL_1 = 191,
-	SLOT_USER_CHOSE_THIS_SPELL = 205,
-	SLOT_REVERSED_SPELLBOOK = 206
-};
-
-enum {
-	menu_MAIN_SAVE = 0,
-	menu_MAIN_REST = 1,
-	menu_MAIN_PREF = 2,
-	menu_MAIN_EXIT = 3
-};
-
-MenuHandler::MenuHandler(ZVision *engine) {
-	_engine = engine;
-	menuBarFlag = 0xFFFF;
-}
-
-MenuZGI::MenuZGI(ZVision *engine) :
-	MenuHandler(engine) {
-	menuMouseFocus = -1;
-	inmenu = false;
-	scrolled[0] = false;
-	scrolled[1] = false;
-	scrolled[2] = false;
-	scrollPos[0] = 0.0;
-	scrollPos[1] = 0.0;
-	scrollPos[2] = 0.0;
-	mouseOnItem = -1;
-	redraw = false;
-	clean = false;
-
-	char buf[24];
-	for (int i = 1; i < 4; i++) {
-		sprintf(buf, "gmzau%2.2x1.tga", i);
-		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][0], false);
-		sprintf(buf, "gmzau%2.2x1.tga", i + 0x10);
-		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][1], false);
-	}
-	for (int i = 0; i < 4; i++) {
-		sprintf(buf, "gmzmu%2.2x1.tga", i);
-		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][0], false);
-		sprintf(buf, "gmznu%2.2x1.tga", i);
-		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][1], false);
-	}
-
-	for (int i = 0; i < 50; i++) {
-		items[i][0] = NULL;
-		items[i][1] = NULL;
-		itemId[i] = 0;
-	}
-
-	for (int i = 0; i < 12; i++) {
-		magic[i][0] = NULL;
-		magic[i][1] = NULL;
-		magicId[i] = 0;
-	}
-}
-
-MenuZGI::~MenuZGI() {
-	for (int i = 0; i < 3; i++) {
-		menuback[i][0].free();
-		menuback[i][1].free();
-	}
-	for (int i = 0; i < 4; i++) {
-		menubar[i][0].free();
-		menubar[i][1].free();
-	}
-	for (int i = 0; i < 50; i++) {
-		if (items[i][0]) {
-			items[i][0]->free();
-			delete items[i][0];
-		}
-		if (items[i][1]) {
-			items[i][1]->free();
-			delete items[i][1];
-		}
-	}
-	for (int i = 0; i < 12; i++) {
-		if (magic[i][0]) {
-			magic[i][0]->free();
-			delete magic[i][0];
-		}
-		if (magic[i][1]) {
-			magic[i][1]->free();
-			delete magic[i][1];
-		}
-	}
-}
-
-void MenuZGI::onMouseUp(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-		switch (menuMouseFocus) {
-		case menu_ITEM:
-			if (menuBarFlag & menuBar_Items) {
-				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-				if (itemCount == 0)
-					itemCount = 20;
-
-				for (int i = 0; i < itemCount; i++) {
-					int itemspace = (600 - 28) / itemCount;
-
-					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
-					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
-						int32 mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
-						if (mouseItem >= 0  && mouseItem < 0xE0) {
-							_engine->getScriptManager()->inventoryDrop(mouseItem);
-							_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
-							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouseItem);
-
-							redraw = true;
-						}
-					}
-				}
-			}
-			break;
-
-		case menu_MAGIC:
-			if (menuBarFlag & menuBar_Magic) {
-				for (int i = 0; i < 12; i++) {
-
-					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
-					if (itemnum != 0) {
-						if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
-							itemnum = 0xEE + i;
-						else
-							itemnum = 0xE0 + i;
-					}
-					if (itemnum)
-						if (_engine->getScriptManager()->getStateValue(StateKey_InventoryItem) == 0 || _engine->getScriptManager()->getStateValue(StateKey_InventoryItem) >= 0xE0)
-							if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
-							                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos))
-								_engine->getScriptManager()->setStateValue(SLOT_USER_CHOSE_THIS_SPELL, itemnum);
-				}
-
-			}
-			break;
-
-		case menu_MAIN:
-
-			// Exit
-			if (menuBarFlag & menuBar_Exit)
-				if (Common::Rect(320 + 135,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->ifQuit();
-				}
-
-			// Settings
-			if (menuBarFlag & menuBar_Settings)
-				if (Common::Rect(320 ,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
-				}
-
-			// Load
-			if (menuBarFlag & menuBar_Restore)
-				if (Common::Rect(320 - 135,
-				                 scrollPos[menu_MAIN],
-				                 320,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
-				}
-
-			// Save
-			if (menuBarFlag & menuBar_Save)
-				if (Common::Rect(320 - 135 * 2,
-				                 scrollPos[menu_MAIN],
-				                 320 - 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
-				}
-			break;
-		}
-	}
-}
-
-void MenuZGI::onMouseMove(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-
-		if (!inmenu)
-			redraw = true;
-		inmenu = true;
-		switch (menuMouseFocus) {
-		case menu_ITEM:
-			if (menuBarFlag & menuBar_Items) {
-				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-				if (itemCount == 0)
-					itemCount = 20;
-				else if (itemCount > 50)
-					itemCount = 50;
-
-				int lastItem = mouseOnItem;
-
-				mouseOnItem = -1;
-
-				for (int i = 0; i < itemCount; i++) {
-					int itemspace = (600 - 28) / itemCount;
-
-					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
-					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
-						mouseOnItem = i;
-						break;
-					}
-				}
-
-				if (lastItem != mouseOnItem)
-					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouseOnItem) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + lastItem))
-						redraw = true;
-			}
-			break;
-
-		case menu_MAGIC:
-			if (menuBarFlag & menuBar_Magic) {
-				int lastItem = mouseOnItem;
-				mouseOnItem = -1;
-				for (int i = 0; i < 12; i++) {
-					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
-					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
-						mouseOnItem = i;
-						break;
-					}
-				}
-
-				if (lastItem != mouseOnItem)
-					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouseOnItem) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + lastItem))
-						redraw = true;
-
-			}
-			break;
-
-		case menu_MAIN: {
-			int lastItem = mouseOnItem;
-			mouseOnItem = -1;
-
-			// Exit
-			if (menuBarFlag & menuBar_Exit)
-				if (Common::Rect(320 + 135,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_EXIT;
-				}
-
-			// Settings
-			if (menuBarFlag & menuBar_Settings)
-				if (Common::Rect(320 ,
-				                 scrollPos[menu_MAIN],
-				                 320 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_PREF;
-				}
-
-			// Load
-			if (menuBarFlag & menuBar_Restore)
-				if (Common::Rect(320 - 135,
-				                 scrollPos[menu_MAIN],
-				                 320,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_REST;
-				}
-
-			// Save
-			if (menuBarFlag & menuBar_Save)
-				if (Common::Rect(320 - 135 * 2,
-				                 scrollPos[menu_MAIN],
-				                 320 - 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_SAVE;
-				}
-
-			if (lastItem != mouseOnItem)
-				redraw = true;
-		}
-		break;
-
-		default:
-			int cur_menu = menuMouseFocus;
-			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
-				menuMouseFocus = menu_MAIN;
-				scrolled[menu_MAIN]  = false;
-				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
-				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
-			}
-
-			if (menuBarFlag & menuBar_Magic)
-				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
-					menuMouseFocus = menu_MAGIC;
-					scrolled[menu_MAGIC]  = false;
-					scrollPos[menu_MAGIC] = 28;
-					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
-				}
-
-			if (menuBarFlag & menuBar_Items)
-				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
-					menuMouseFocus = menu_ITEM;
-					scrolled[menu_ITEM]  = false;
-					scrollPos[menu_ITEM] = 28 - 600;
-					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
-				}
-
-			if (cur_menu != menuMouseFocus)
-				clean = true;
-
-			break;
-		}
-	} else {
-		if (inmenu)
-			clean = true;
-		inmenu = false;
-		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
-			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
-		menuMouseFocus = -1;
-	}
-}
-
-void MenuZGI::process(uint32 deltatime) {
-	if (clean) {
-		_engine->getRenderManager()->clearMenuSurface();
-		clean = false;
-	}
-	switch (menuMouseFocus) {
-	case menu_ITEM:
-		if (menuBarFlag & menuBar_Items)
-			if (!scrolled[menu_ITEM]) {
-				redraw = true;
-				float scrl = 600.0 * (deltatime / 1000.0);
-
-				if (scrl == 0)
-					scrl = 1.0;
-
-				scrollPos [menu_ITEM] += scrl;
-
-				if (scrollPos[menu_ITEM] >= 0) {
-					scrolled[menu_ITEM] = true;
-					scrollPos [menu_ITEM] = 0;
-				}
-			}
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
-
-			int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
-			if (itemCount == 0)
-				itemCount = 20;
-			else if (itemCount > 50)
-				itemCount = 50;
-
-			for (int i = 0; i < itemCount; i++) {
-				int itemspace = (600 - 28) / itemCount;
-
-				bool inrect = false;
-
-				if (mouseOnItem == i)
-					inrect = true;
-
-				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
-
-				if (curItemId != 0) {
-					if (itemId[i] != curItemId) {
-						char buf[16];
-						sprintf(buf, "gmzwu%2.2x1.tga", curItemId);
-						items[i][0] = _engine->getRenderManager()->loadImage(buf, false);
-						sprintf(buf, "gmzxu%2.2x1.tga", curItemId);
-						items[i][1] = _engine->getRenderManager()->loadImage(buf, false);
-						itemId[i] = curItemId;
-					}
-
-					if (inrect)
-						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
-					else
-						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
-
-				} else {
-					if (items[i][0]) {
-						items[i][0]->free();
-						delete items[i][0];
-						items[i][0] = NULL;
-					}
-					if (items[i][1]) {
-						items[i][1]->free();
-						delete items[i][1];
-						items[i][1] = NULL;
-					}
-					itemId[i] = 0;
-				}
-			}
-
-			redraw = false;
-		}
-		break;
-
-	case menu_MAGIC:
-		if (menuBarFlag & menuBar_Magic)
-			if (!scrolled[menu_MAGIC]) {
-				redraw = true;
-				float scrl = 600.0 * (deltatime / 1000.0);
-
-				if (scrl == 0)
-					scrl = 1.0;
-
-				scrollPos [menu_MAGIC] += scrl;
-
-				if (scrollPos[menu_MAGIC] >= 600) {
-					scrolled[menu_MAGIC] = true;
-					scrollPos [menu_MAGIC] = 600;
-				}
-			}
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][0], 640 - scrollPos[menu_MAGIC], 0);
-
-			for (int i = 0; i < 12; i++) {
-				bool inrect = false;
-
-				if (mouseOnItem == i)
-					inrect = true;
-
-				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
-				if (curItemId) {
-					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
-						curItemId = 0xEE + i;
-					else
-						curItemId = 0xE0 + i;
-				}
-
-				if (curItemId != 0) {
-					if (itemId[i] != curItemId) {
-						char buf[16];
-						sprintf(buf, "gmzwu%2.2x1.tga", curItemId);
-						magic[i][0] = _engine->getRenderManager()->loadImage(buf, false);
-						sprintf(buf, "gmzxu%2.2x1.tga", curItemId);
-						magic[i][1] = _engine->getRenderManager()->loadImage(buf, false);
-						magicId[i] = curItemId;
-					}
-
-					if (inrect)
-						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
-					else
-						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
-
-				} else {
-					if (magic[i][0]) {
-						magic[i][0]->free();
-						delete magic[i][0];
-						magic[i][0] = NULL;
-					}
-					if (magic[i][1]) {
-						magic[i][1]->free();
-						delete magic[i][1];
-						magic[i][1] = NULL;
-					}
-					magicId[i] = 0;
-				}
-			}
-			redraw = false;
-		}
-		break;
-
-	case menu_MAIN:
-		if (!scrolled[menu_MAIN]) {
-			redraw = true;
-			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
-
-			if (scrl == 0)
-				scrl = 1.0;
-
-			scrollPos [menu_MAIN] += scrl;
-
-			if (scrollPos[menu_MAIN] >= 0) {
-				scrolled[menu_MAIN] = true;
-				scrollPos [menu_MAIN] = 0;
-			}
-		}
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
-
-			if (menuBarFlag & menuBar_Exit) {
-				if (mouseOnItem == menu_MAIN_EXIT)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
-			}
-			if (menuBarFlag & menuBar_Settings) {
-				if (mouseOnItem == menu_MAIN_PREF)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
-			}
-			if (menuBarFlag & menuBar_Restore) {
-				if (mouseOnItem == menu_MAIN_REST)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
-			}
-			if (menuBarFlag & menuBar_Save) {
-				if (mouseOnItem == menu_MAIN_SAVE)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
-				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
-			}
-			redraw = false;
-		}
-		break;
-	default:
-		if (redraw) {
-			if (inmenu) {
-				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
-
-				if (menuBarFlag & menuBar_Items)
-					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
-
-				if (menuBarFlag & menuBar_Magic)
-					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
-			}
-			redraw = false;
-		}
-		break;
-	}
-}
-
-MenuNemesis::MenuNemesis(ZVision *engine) :
-	MenuHandler(engine) {
-	inmenu = false;
-	scrolled = false;
-	scrollPos = 0.0;
-	mouseOnItem = -1;
-	redraw = false;
-	delay = 0;
-
-	char buf[24];
-	for (int i = 0; i < 4; i++)
-		for (int j = 0; j < 6; j++) {
-			sprintf(buf, "butfrm%d%d.tga", i + 1, j);
-			_engine->getRenderManager()->readImageToSurface(buf, but[i][j], false);
-		}
-
-	_engine->getRenderManager()->readImageToSurface("bar.tga", menubar, false);
-
-	frm = 0;
-}
-
-MenuNemesis::~MenuNemesis() {
-	for (int i = 0; i < 4; i++)
-		for (int j = 0; j < 6; j++)
-			but[i][j].free();
-
-	menubar.free();
-}
-
-static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456} };
-
-void MenuNemesis::onMouseUp(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-		// Exit
-		if (menuBarFlag & menuBar_Exit)
-			if (Common::Rect(buts[3][1],
-			                 scrollPos,
-			                 buts[3][0] + buts[3][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->ifQuit();
-				frm = 5;
-				redraw = true;
-			}
-
-		// Settings
-		if (menuBarFlag & menuBar_Settings)
-			if (Common::Rect(buts[2][1],
-			                 scrollPos,
-			                 buts[2][0] + buts[2][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
-				frm = 5;
-				redraw = true;
-			}
-
-		// Load
-		if (menuBarFlag & menuBar_Restore)
-			if (Common::Rect(buts[1][1],
-			                 scrollPos,
-			                 buts[1][0] + buts[1][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
-				frm = 5;
-				redraw = true;
-			}
-
-		// Save
-		if (menuBarFlag & menuBar_Save)
-			if (Common::Rect(buts[0][1],
-			                 scrollPos,
-			                 buts[0][0] + buts[0][1],
-			                 scrollPos + 32).contains(Pos)) {
-				_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
-				frm = 5;
-				redraw = true;
-			}
-	}
-}
-
-void MenuNemesis::onMouseMove(const Common::Point &Pos) {
-	if (Pos.y < 40) {
-
-		inmenu = true;
-
-		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 2)
-			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
-
-		int lastItem = mouseOnItem;
-		mouseOnItem = -1;
-
-		// Exit
-		if (menuBarFlag & menuBar_Exit)
-			if (Common::Rect(buts[3][1],
-			                 scrollPos,
-			                 buts[3][0] + buts[3][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_EXIT;
-			}
-
-		// Settings
-		if (menuBarFlag & menuBar_Settings)
-			if (Common::Rect(buts[2][1],
-			                 scrollPos,
-			                 buts[2][0] + buts[2][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_PREF;
-			}
-
-		// Load
-		if (menuBarFlag & menuBar_Restore)
-			if (Common::Rect(buts[1][1],
-			                 scrollPos,
-			                 buts[1][0] + buts[1][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_REST;
-			}
-
-		// Save
-		if (menuBarFlag & menuBar_Save)
-			if (Common::Rect(buts[0][1],
-			                 scrollPos,
-			                 buts[0][0] + buts[0][1],
-			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_SAVE;
-			}
-
-		if (lastItem != mouseOnItem) {
-			redraw = true;
-			frm = 0;
-			delay = 200;
-		}
-	} else {
-		inmenu = false;
-		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
-			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
-		mouseOnItem = -1;
-	}
-}
-
-void MenuNemesis::process(uint32 deltatime) {
-	if (inmenu) {
-		if (!scrolled) {
-			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
-
-			if (scrl == 0)
-				scrl = 1.0;
-
-			scrollPos += scrl;
-			redraw = true;
-		}
-
-		if (scrollPos >= 0) {
-			scrolled = true;
-			scrollPos = 0;
-		}
-
-		if (mouseOnItem != -1) {
-			delay -= deltatime;
-			if (delay <= 0 && frm < 4) {
-				delay = 200;
-				frm++;
-				redraw = true;
-			}
-		}
-
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
-
-			if (menuBarFlag & menuBar_Exit)
-				if (mouseOnItem == menu_MAIN_EXIT)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
-
-			if (menuBarFlag & menuBar_Settings)
-				if (mouseOnItem == menu_MAIN_PREF)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
-
-			if (menuBarFlag & menuBar_Restore)
-				if (mouseOnItem == menu_MAIN_REST)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
-
-			if (menuBarFlag & menuBar_Save)
-				if (mouseOnItem == menu_MAIN_SAVE)
-					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
-
-			redraw = false;
-		}
-	} else {
-		scrolled = false;
-		if (scrollPos > -32) {
-			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
-
-			if (scrl == 0)
-				scrl = 1.0;
-
-			Common::Rect cl(64, 32 + scrollPos - scrl, 64 + 512, 32 + scrollPos + 1);
-			_engine->getRenderManager()->clearMenuSurface(cl);
-
-			scrollPos -= scrl;
-			redraw = true;
-		} else
-			scrollPos = -32;
-
-		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
-			redraw = false;
-		}
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
deleted file mode 100644
index ebe0bb50ac..0000000000
--- a/engines/zvision/core/menu.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_MENU_H
-#define ZVISION_MENU_H
-
-#include "graphics/surface.h"
-#include "common/rect.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-
-namespace ZVision {
-
-enum menuBar {
-	menuBar_Exit = 0x1,
-	menuBar_Settings = 0x2,
-	menuBar_Restore = 0x4,
-	menuBar_Save = 0x8,
-	menuBar_Items = 0x100,
-	menuBar_Magic = 0x200
-};
-
-class MenuHandler {
-public:
-	MenuHandler(ZVision *engine);
-	virtual ~MenuHandler() {};
-	virtual void onMouseMove(const Common::Point &Pos) {};
-	virtual void onMouseDown(const Common::Point &Pos) {};
-	virtual void onMouseUp(const Common::Point &Pos) {};
-	virtual void process(uint32 deltaTimeInMillis) {};
-
-	void setEnable(uint16 flags) {
-		menuBarFlag = flags;
-	}
-	uint16 getEnable() {
-		return menuBarFlag;
-	}
-protected:
-	uint16 menuBarFlag;
-	ZVision *_engine;
-};
-
-class MenuZGI: public MenuHandler {
-public:
-	MenuZGI(ZVision *engine);
-	~MenuZGI();
-	void onMouseMove(const Common::Point &Pos);
-	void onMouseUp(const Common::Point &Pos);
-	void process(uint32 deltaTimeInMillis);
-private:
-	Graphics::Surface menuback[3][2];
-	Graphics::Surface menubar[4][2];
-	Graphics::Surface *items[50][2];
-	uint itemId[50];
-
-	Graphics::Surface *magic[12][2];
-	uint magicId[12];
-
-	int menuMouseFocus;
-	bool inmenu;
-
-	int mouseOnItem;
-
-	bool   scrolled[3];
-	int16 scrollPos[3];
-
-	enum {
-		menu_ITEM = 0,
-		menu_MAGIC = 1,
-		menu_MAIN = 2
-	};
-
-	bool clean;
-	bool redraw;
-
-};
-
-class MenuNemesis: public MenuHandler {
-public:
-	MenuNemesis(ZVision *engine);
-	~MenuNemesis();
-	void onMouseMove(const Common::Point &Pos);
-	void onMouseUp(const Common::Point &Pos);
-	void process(uint32 deltaTimeInMillis);
-private:
-	Graphics::Surface but[4][6];
-	Graphics::Surface menubar;
-
-	bool inmenu;
-
-	int mouseOnItem;
-
-	bool   scrolled;
-	int16 scrollPos;
-
-	bool redraw;
-
-	int frm;
-	int16 delay;
-
-};
-
-}
-
-#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 3ea31abe1b..6955d62534 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS := \
 	core/console.o \
 	core/clock.o \
 	core/events.o \
-	core/menu.o \
 	core/save_manager.o \
 	detection.o \
 	file/lzss_read_stream.o \
@@ -30,6 +29,7 @@ MODULE_OBJS := \
 	scripting/controls/slot_control.o \
 	scripting/controls/titler_control.o \
 	scripting/inventory.o \
+	scripting/menu.o \
 	scripting/scr_file_handling.o \
 	scripting/script_manager.o \
 	scripting/sidefx/animation_node.o \
diff --git a/engines/zvision/scripting/menu.cpp b/engines/zvision/scripting/menu.cpp
new file mode 100644
index 0000000000..fa5e24f39f
--- /dev/null
+++ b/engines/zvision/scripting/menu.cpp
@@ -0,0 +1,762 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/menu.h"
+
+namespace ZVision {
+
+enum {
+	SLOT_START_SLOT = 151,
+	SLOT_SPELL_1 = 191,
+	SLOT_USER_CHOSE_THIS_SPELL = 205,
+	SLOT_REVERSED_SPELLBOOK = 206
+};
+
+enum {
+	menu_MAIN_SAVE = 0,
+	menu_MAIN_REST = 1,
+	menu_MAIN_PREF = 2,
+	menu_MAIN_EXIT = 3
+};
+
+MenuHandler::MenuHandler(ZVision *engine) {
+	_engine = engine;
+	menuBarFlag = 0xFFFF;
+}
+
+MenuZGI::MenuZGI(ZVision *engine) :
+	MenuHandler(engine) {
+	menuMouseFocus = -1;
+	inmenu = false;
+	scrolled[0] = false;
+	scrolled[1] = false;
+	scrolled[2] = false;
+	scrollPos[0] = 0.0;
+	scrollPos[1] = 0.0;
+	scrollPos[2] = 0.0;
+	mouseOnItem = -1;
+	redraw = false;
+	clean = false;
+
+	char buf[24];
+	for (int i = 1; i < 4; i++) {
+		sprintf(buf, "gmzau%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][0], false);
+		sprintf(buf, "gmzau%2.2x1.tga", i + 0x10);
+		_engine->getRenderManager()->readImageToSurface(buf, menuback[i - 1][1], false);
+	}
+	for (int i = 0; i < 4; i++) {
+		sprintf(buf, "gmzmu%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][0], false);
+		sprintf(buf, "gmznu%2.2x1.tga", i);
+		_engine->getRenderManager()->readImageToSurface(buf, menubar[i][1], false);
+	}
+
+	for (int i = 0; i < 50; i++) {
+		items[i][0] = NULL;
+		items[i][1] = NULL;
+		itemId[i] = 0;
+	}
+
+	for (int i = 0; i < 12; i++) {
+		magic[i][0] = NULL;
+		magic[i][1] = NULL;
+		magicId[i] = 0;
+	}
+}
+
+MenuZGI::~MenuZGI() {
+	for (int i = 0; i < 3; i++) {
+		menuback[i][0].free();
+		menuback[i][1].free();
+	}
+	for (int i = 0; i < 4; i++) {
+		menubar[i][0].free();
+		menubar[i][1].free();
+	}
+	for (int i = 0; i < 50; i++) {
+		if (items[i][0]) {
+			items[i][0]->free();
+			delete items[i][0];
+		}
+		if (items[i][1]) {
+			items[i][1]->free();
+			delete items[i][1];
+		}
+	}
+	for (int i = 0; i < 12; i++) {
+		if (magic[i][0]) {
+			magic[i][0]->free();
+			delete magic[i][0];
+		}
+		if (magic[i][1]) {
+			magic[i][1]->free();
+			delete magic[i][1];
+		}
+	}
+}
+
+void MenuZGI::onMouseUp(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+		switch (menuMouseFocus) {
+		case menu_ITEM:
+			if (menuBarFlag & menuBar_Items) {
+				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (itemCount == 0)
+					itemCount = 20;
+
+				for (int i = 0; i < itemCount; i++) {
+					int itemspace = (600 - 28) / itemCount;
+
+					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
+					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+						int32 mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
+						if (mouseItem >= 0  && mouseItem < 0xE0) {
+							_engine->getScriptManager()->inventoryDrop(mouseItem);
+							_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
+							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouseItem);
+
+							redraw = true;
+						}
+					}
+				}
+			}
+			break;
+
+		case menu_MAGIC:
+			if (menuBarFlag & menuBar_Magic) {
+				for (int i = 0; i < 12; i++) {
+
+					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+					if (itemnum != 0) {
+						if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+							itemnum = 0xEE + i;
+						else
+							itemnum = 0xE0 + i;
+					}
+					if (itemnum)
+						if (_engine->getScriptManager()->getStateValue(StateKey_InventoryItem) == 0 || _engine->getScriptManager()->getStateValue(StateKey_InventoryItem) >= 0xE0)
+							if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
+							                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos))
+								_engine->getScriptManager()->setStateValue(SLOT_USER_CHOSE_THIS_SPELL, itemnum);
+				}
+
+			}
+			break;
+
+		case menu_MAIN:
+
+			// Exit
+			if (menuBarFlag & menuBar_Exit)
+				if (Common::Rect(320 + 135,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->ifQuit();
+				}
+
+			// Settings
+			if (menuBarFlag & menuBar_Settings)
+				if (Common::Rect(320 ,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
+				}
+
+			// Load
+			if (menuBarFlag & menuBar_Restore)
+				if (Common::Rect(320 - 135,
+				                 scrollPos[menu_MAIN],
+				                 320,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
+				}
+
+			// Save
+			if (menuBarFlag & menuBar_Save)
+				if (Common::Rect(320 - 135 * 2,
+				                 scrollPos[menu_MAIN],
+				                 320 - 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
+				}
+			break;
+		}
+	}
+}
+
+void MenuZGI::onMouseMove(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+
+		if (!inmenu)
+			redraw = true;
+		inmenu = true;
+		switch (menuMouseFocus) {
+		case menu_ITEM:
+			if (menuBarFlag & menuBar_Items) {
+				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+				if (itemCount == 0)
+					itemCount = 20;
+				else if (itemCount > 50)
+					itemCount = 50;
+
+				int lastItem = mouseOnItem;
+
+				mouseOnItem = -1;
+
+				for (int i = 0; i < itemCount; i++) {
+					int itemspace = (600 - 28) / itemCount;
+
+					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
+					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+						mouseOnItem = i;
+						break;
+					}
+				}
+
+				if (lastItem != mouseOnItem)
+					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouseOnItem) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + lastItem))
+						redraw = true;
+			}
+			break;
+
+		case menu_MAGIC:
+			if (menuBarFlag & menuBar_Magic) {
+				int lastItem = mouseOnItem;
+				mouseOnItem = -1;
+				for (int i = 0; i < 12; i++) {
+					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
+					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
+						mouseOnItem = i;
+						break;
+					}
+				}
+
+				if (lastItem != mouseOnItem)
+					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouseOnItem) ||
+					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + lastItem))
+						redraw = true;
+
+			}
+			break;
+
+		case menu_MAIN: {
+			int lastItem = mouseOnItem;
+			mouseOnItem = -1;
+
+			// Exit
+			if (menuBarFlag & menuBar_Exit)
+				if (Common::Rect(320 + 135,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouseOnItem = menu_MAIN_EXIT;
+				}
+
+			// Settings
+			if (menuBarFlag & menuBar_Settings)
+				if (Common::Rect(320 ,
+				                 scrollPos[menu_MAIN],
+				                 320 + 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouseOnItem = menu_MAIN_PREF;
+				}
+
+			// Load
+			if (menuBarFlag & menuBar_Restore)
+				if (Common::Rect(320 - 135,
+				                 scrollPos[menu_MAIN],
+				                 320,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouseOnItem = menu_MAIN_REST;
+				}
+
+			// Save
+			if (menuBarFlag & menuBar_Save)
+				if (Common::Rect(320 - 135 * 2,
+				                 scrollPos[menu_MAIN],
+				                 320 - 135,
+				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+					mouseOnItem = menu_MAIN_SAVE;
+				}
+
+			if (lastItem != mouseOnItem)
+				redraw = true;
+		}
+		break;
+
+		default:
+			int cur_menu = menuMouseFocus;
+			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
+				menuMouseFocus = menu_MAIN;
+				scrolled[menu_MAIN]  = false;
+				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
+				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
+			}
+
+			if (menuBarFlag & menuBar_Magic)
+				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
+					menuMouseFocus = menu_MAGIC;
+					scrolled[menu_MAGIC]  = false;
+					scrollPos[menu_MAGIC] = 28;
+					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
+				}
+
+			if (menuBarFlag & menuBar_Items)
+				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
+					menuMouseFocus = menu_ITEM;
+					scrolled[menu_ITEM]  = false;
+					scrollPos[menu_ITEM] = 28 - 600;
+					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
+				}
+
+			if (cur_menu != menuMouseFocus)
+				clean = true;
+
+			break;
+		}
+	} else {
+		if (inmenu)
+			clean = true;
+		inmenu = false;
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
+		menuMouseFocus = -1;
+	}
+}
+
+void MenuZGI::process(uint32 deltatime) {
+	if (clean) {
+		_engine->getRenderManager()->clearMenuSurface();
+		clean = false;
+	}
+	switch (menuMouseFocus) {
+	case menu_ITEM:
+		if (menuBarFlag & menuBar_Items)
+			if (!scrolled[menu_ITEM]) {
+				redraw = true;
+				float scrl = 600.0 * (deltatime / 1000.0);
+
+				if (scrl == 0)
+					scrl = 1.0;
+
+				scrollPos [menu_ITEM] += scrl;
+
+				if (scrollPos[menu_ITEM] >= 0) {
+					scrolled[menu_ITEM] = true;
+					scrollPos [menu_ITEM] = 0;
+				}
+			}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
+
+			int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
+			if (itemCount == 0)
+				itemCount = 20;
+			else if (itemCount > 50)
+				itemCount = 50;
+
+			for (int i = 0; i < itemCount; i++) {
+				int itemspace = (600 - 28) / itemCount;
+
+				bool inrect = false;
+
+				if (mouseOnItem == i)
+					inrect = true;
+
+				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
+
+				if (curItemId != 0) {
+					if (itemId[i] != curItemId) {
+						char buf[16];
+						sprintf(buf, "gmzwu%2.2x1.tga", curItemId);
+						items[i][0] = _engine->getRenderManager()->loadImage(buf, false);
+						sprintf(buf, "gmzxu%2.2x1.tga", curItemId);
+						items[i][1] = _engine->getRenderManager()->loadImage(buf, false);
+						itemId[i] = curItemId;
+					}
+
+					if (inrect)
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+					else
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+
+				} else {
+					if (items[i][0]) {
+						items[i][0]->free();
+						delete items[i][0];
+						items[i][0] = NULL;
+					}
+					if (items[i][1]) {
+						items[i][1]->free();
+						delete items[i][1];
+						items[i][1] = NULL;
+					}
+					itemId[i] = 0;
+				}
+			}
+
+			redraw = false;
+		}
+		break;
+
+	case menu_MAGIC:
+		if (menuBarFlag & menuBar_Magic)
+			if (!scrolled[menu_MAGIC]) {
+				redraw = true;
+				float scrl = 600.0 * (deltatime / 1000.0);
+
+				if (scrl == 0)
+					scrl = 1.0;
+
+				scrollPos [menu_MAGIC] += scrl;
+
+				if (scrollPos[menu_MAGIC] >= 600) {
+					scrolled[menu_MAGIC] = true;
+					scrollPos [menu_MAGIC] = 600;
+				}
+			}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][0], 640 - scrollPos[menu_MAGIC], 0);
+
+			for (int i = 0; i < 12; i++) {
+				bool inrect = false;
+
+				if (mouseOnItem == i)
+					inrect = true;
+
+				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+				if (curItemId) {
+					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+						curItemId = 0xEE + i;
+					else
+						curItemId = 0xE0 + i;
+				}
+
+				if (curItemId != 0) {
+					if (itemId[i] != curItemId) {
+						char buf[16];
+						sprintf(buf, "gmzwu%2.2x1.tga", curItemId);
+						magic[i][0] = _engine->getRenderManager()->loadImage(buf, false);
+						sprintf(buf, "gmzxu%2.2x1.tga", curItemId);
+						magic[i][1] = _engine->getRenderManager()->loadImage(buf, false);
+						magicId[i] = curItemId;
+					}
+
+					if (inrect)
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+					else
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+
+				} else {
+					if (magic[i][0]) {
+						magic[i][0]->free();
+						delete magic[i][0];
+						magic[i][0] = NULL;
+					}
+					if (magic[i][1]) {
+						magic[i][1]->free();
+						delete magic[i][1];
+						magic[i][1] = NULL;
+					}
+					magicId[i] = 0;
+				}
+			}
+			redraw = false;
+		}
+		break;
+
+	case menu_MAIN:
+		if (!scrolled[menu_MAIN]) {
+			redraw = true;
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			scrollPos [menu_MAIN] += scrl;
+
+			if (scrollPos[menu_MAIN] >= 0) {
+				scrolled[menu_MAIN] = true;
+				scrollPos [menu_MAIN] = 0;
+			}
+		}
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
+
+			if (menuBarFlag & menuBar_Exit) {
+				if (mouseOnItem == menu_MAIN_EXIT)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
+			}
+			if (menuBarFlag & menuBar_Settings) {
+				if (mouseOnItem == menu_MAIN_PREF)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
+			}
+			if (menuBarFlag & menuBar_Restore) {
+				if (mouseOnItem == menu_MAIN_REST)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
+			}
+			if (menuBarFlag & menuBar_Save) {
+				if (mouseOnItem == menu_MAIN_SAVE)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
+				else
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
+			}
+			redraw = false;
+		}
+		break;
+	default:
+		if (redraw) {
+			if (inmenu) {
+				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
+
+				if (menuBarFlag & menuBar_Items)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
+
+				if (menuBarFlag & menuBar_Magic)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
+			}
+			redraw = false;
+		}
+		break;
+	}
+}
+
+MenuNemesis::MenuNemesis(ZVision *engine) :
+	MenuHandler(engine) {
+	inmenu = false;
+	scrolled = false;
+	scrollPos = 0.0;
+	mouseOnItem = -1;
+	redraw = false;
+	delay = 0;
+
+	char buf[24];
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 6; j++) {
+			sprintf(buf, "butfrm%d%d.tga", i + 1, j);
+			_engine->getRenderManager()->readImageToSurface(buf, but[i][j], false);
+		}
+
+	_engine->getRenderManager()->readImageToSurface("bar.tga", menubar, false);
+
+	frm = 0;
+}
+
+MenuNemesis::~MenuNemesis() {
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 6; j++)
+			but[i][j].free();
+
+	menubar.free();
+}
+
+static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456} };
+
+void MenuNemesis::onMouseUp(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+		// Exit
+		if (menuBarFlag & menuBar_Exit)
+			if (Common::Rect(buts[3][1],
+			                 scrollPos,
+			                 buts[3][0] + buts[3][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->ifQuit();
+				frm = 5;
+				redraw = true;
+			}
+
+		// Settings
+		if (menuBarFlag & menuBar_Settings)
+			if (Common::Rect(buts[2][1],
+			                 scrollPos,
+			                 buts[2][0] + buts[2][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+
+		// Load
+		if (menuBarFlag & menuBar_Restore)
+			if (Common::Rect(buts[1][1],
+			                 scrollPos,
+			                 buts[1][0] + buts[1][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+
+		// Save
+		if (menuBarFlag & menuBar_Save)
+			if (Common::Rect(buts[0][1],
+			                 scrollPos,
+			                 buts[0][0] + buts[0][1],
+			                 scrollPos + 32).contains(Pos)) {
+				_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
+				frm = 5;
+				redraw = true;
+			}
+	}
+}
+
+void MenuNemesis::onMouseMove(const Common::Point &Pos) {
+	if (Pos.y < 40) {
+
+		inmenu = true;
+
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 2)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
+
+		int lastItem = mouseOnItem;
+		mouseOnItem = -1;
+
+		// Exit
+		if (menuBarFlag & menuBar_Exit)
+			if (Common::Rect(buts[3][1],
+			                 scrollPos,
+			                 buts[3][0] + buts[3][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouseOnItem = menu_MAIN_EXIT;
+			}
+
+		// Settings
+		if (menuBarFlag & menuBar_Settings)
+			if (Common::Rect(buts[2][1],
+			                 scrollPos,
+			                 buts[2][0] + buts[2][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouseOnItem = menu_MAIN_PREF;
+			}
+
+		// Load
+		if (menuBarFlag & menuBar_Restore)
+			if (Common::Rect(buts[1][1],
+			                 scrollPos,
+			                 buts[1][0] + buts[1][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouseOnItem = menu_MAIN_REST;
+			}
+
+		// Save
+		if (menuBarFlag & menuBar_Save)
+			if (Common::Rect(buts[0][1],
+			                 scrollPos,
+			                 buts[0][0] + buts[0][1],
+			                 scrollPos + 32).contains(Pos)) {
+				mouseOnItem = menu_MAIN_SAVE;
+			}
+
+		if (lastItem != mouseOnItem) {
+			redraw = true;
+			frm = 0;
+			delay = 200;
+		}
+	} else {
+		inmenu = false;
+		if (_engine->getScriptManager()->getStateValue(StateKey_MenuState) != 0)
+			_engine->getScriptManager()->setStateValue(StateKey_MenuState, 0);
+		mouseOnItem = -1;
+	}
+}
+
+void MenuNemesis::process(uint32 deltatime) {
+	if (inmenu) {
+		if (!scrolled) {
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			scrollPos += scrl;
+			redraw = true;
+		}
+
+		if (scrollPos >= 0) {
+			scrolled = true;
+			scrollPos = 0;
+		}
+
+		if (mouseOnItem != -1) {
+			delay -= deltatime;
+			if (delay <= 0 && frm < 4) {
+				delay = 200;
+				frm++;
+				redraw = true;
+			}
+		}
+
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
+
+			if (menuBarFlag & menuBar_Exit)
+				if (mouseOnItem == menu_MAIN_EXIT)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
+
+			if (menuBarFlag & menuBar_Settings)
+				if (mouseOnItem == menu_MAIN_PREF)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
+
+			if (menuBarFlag & menuBar_Restore)
+				if (mouseOnItem == menu_MAIN_REST)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
+
+			if (menuBarFlag & menuBar_Save)
+				if (mouseOnItem == menu_MAIN_SAVE)
+					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
+
+			redraw = false;
+		}
+	} else {
+		scrolled = false;
+		if (scrollPos > -32) {
+			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
+
+			if (scrl == 0)
+				scrl = 1.0;
+
+			Common::Rect cl(64, 32 + scrollPos - scrl, 64 + 512, 32 + scrollPos + 1);
+			_engine->getRenderManager()->clearMenuSurface(cl);
+
+			scrollPos -= scrl;
+			redraw = true;
+		} else
+			scrollPos = -32;
+
+		if (redraw) {
+			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
+			redraw = false;
+		}
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/menu.h b/engines/zvision/scripting/menu.h
new file mode 100644
index 0000000000..ebe0bb50ac
--- /dev/null
+++ b/engines/zvision/scripting/menu.h
@@ -0,0 +1,125 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_MENU_H
+#define ZVISION_MENU_H
+
+#include "graphics/surface.h"
+#include "common/rect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+
+namespace ZVision {
+
+enum menuBar {
+	menuBar_Exit = 0x1,
+	menuBar_Settings = 0x2,
+	menuBar_Restore = 0x4,
+	menuBar_Save = 0x8,
+	menuBar_Items = 0x100,
+	menuBar_Magic = 0x200
+};
+
+class MenuHandler {
+public:
+	MenuHandler(ZVision *engine);
+	virtual ~MenuHandler() {};
+	virtual void onMouseMove(const Common::Point &Pos) {};
+	virtual void onMouseDown(const Common::Point &Pos) {};
+	virtual void onMouseUp(const Common::Point &Pos) {};
+	virtual void process(uint32 deltaTimeInMillis) {};
+
+	void setEnable(uint16 flags) {
+		menuBarFlag = flags;
+	}
+	uint16 getEnable() {
+		return menuBarFlag;
+	}
+protected:
+	uint16 menuBarFlag;
+	ZVision *_engine;
+};
+
+class MenuZGI: public MenuHandler {
+public:
+	MenuZGI(ZVision *engine);
+	~MenuZGI();
+	void onMouseMove(const Common::Point &Pos);
+	void onMouseUp(const Common::Point &Pos);
+	void process(uint32 deltaTimeInMillis);
+private:
+	Graphics::Surface menuback[3][2];
+	Graphics::Surface menubar[4][2];
+	Graphics::Surface *items[50][2];
+	uint itemId[50];
+
+	Graphics::Surface *magic[12][2];
+	uint magicId[12];
+
+	int menuMouseFocus;
+	bool inmenu;
+
+	int mouseOnItem;
+
+	bool   scrolled[3];
+	int16 scrollPos[3];
+
+	enum {
+		menu_ITEM = 0,
+		menu_MAGIC = 1,
+		menu_MAIN = 2
+	};
+
+	bool clean;
+	bool redraw;
+
+};
+
+class MenuNemesis: public MenuHandler {
+public:
+	MenuNemesis(ZVision *engine);
+	~MenuNemesis();
+	void onMouseMove(const Common::Point &Pos);
+	void onMouseUp(const Common::Point &Pos);
+	void process(uint32 deltaTimeInMillis);
+private:
+	Graphics::Surface but[4][6];
+	Graphics::Surface menubar;
+
+	bool inmenu;
+
+	int mouseOnItem;
+
+	bool   scrolled;
+	int16 scrollPos;
+
+	bool redraw;
+
+	int frm;
+	int16 delay;
+
+};
+
+}
+
+#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index db96884103..f692969942 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -30,7 +30,7 @@
 #include "zvision/core/save_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/detection.h"
-#include "zvision/core/menu.h"
+#include "zvision/scripting/menu.h"
 #include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/text/truetype_font.h"
-- 
cgit v1.2.3


From 3661bc4cf13ac9bb27e60969b4195acc82fee6c5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 25 Dec 2014 22:11:29 +0200
Subject: ZVISION: Normalize and cleanup all the menu-related enums

---
 engines/zvision/core/events.cpp            |   8 +-
 engines/zvision/scripting/menu.cpp         | 289 ++++++++++++++---------------
 engines/zvision/scripting/menu.h           |  18 +-
 engines/zvision/scripting/script_manager.h |   7 +-
 4 files changed, 160 insertions(+), 162 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 89f1595460..227cf213dc 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -43,19 +43,19 @@ void ZVision::shortKeys(Common::Event event) {
 	if (event.kbd.hasFlags(Common::KBD_CTRL)) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_s:
-			if (getMenuBarEnable() & menuBar_Save)
+			if (getMenuBarEnable() & kMenubarSave)
 				_scriptManager->changeLocation('g', 'j', 's', 'e', 0);
 			break;
 		case Common::KEYCODE_r:
-			if (getMenuBarEnable() & menuBar_Restore)
+			if (getMenuBarEnable() & kMenubarRestore)
 				_scriptManager->changeLocation('g', 'j', 'r', 'e', 0);
 			break;
 		case Common::KEYCODE_p:
-			if (getMenuBarEnable() & menuBar_Settings)
+			if (getMenuBarEnable() & kMenubarSettings)
 				_scriptManager->changeLocation('g', 'j', 'p', 'e', 0);
 			break;
 		case Common::KEYCODE_q:
-			if (getMenuBarEnable() & menuBar_Exit)
+			if (getMenuBarEnable() & kMenubarExit)
 				ifQuit();
 			break;
 		default:
diff --git a/engines/zvision/scripting/menu.cpp b/engines/zvision/scripting/menu.cpp
index fa5e24f39f..16aa57e3ae 100644
--- a/engines/zvision/scripting/menu.cpp
+++ b/engines/zvision/scripting/menu.cpp
@@ -26,17 +26,16 @@
 namespace ZVision {
 
 enum {
-	SLOT_START_SLOT = 151,
-	SLOT_SPELL_1 = 191,
-	SLOT_USER_CHOSE_THIS_SPELL = 205,
-	SLOT_REVERSED_SPELLBOOK = 206
+	kMainMenuSave = 0,
+	kMainMenuLoad = 1,
+	kMainMenuPrefs = 2,
+	kMainMenuExit = 3
 };
 
 enum {
-	menu_MAIN_SAVE = 0,
-	menu_MAIN_REST = 1,
-	menu_MAIN_PREF = 2,
-	menu_MAIN_EXIT = 3
+	kMenuItem = 0,
+	kMenuMagic = 1,
+	kMenuMain = 2
 };
 
 MenuHandler::MenuHandler(ZVision *engine) {
@@ -119,8 +118,8 @@ MenuZGI::~MenuZGI() {
 void MenuZGI::onMouseUp(const Common::Point &Pos) {
 	if (Pos.y < 40) {
 		switch (menuMouseFocus) {
-		case menu_ITEM:
-			if (menuBarFlag & menuBar_Items) {
+		case kMenuItem:
+			if (menuBarFlag & kMenubarItems) {
 				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
 				if (itemCount == 0)
 					itemCount = 20;
@@ -128,13 +127,13 @@ void MenuZGI::onMouseUp(const Common::Point &Pos) {
 				for (int i = 0; i < itemCount; i++) {
 					int itemspace = (600 - 28) / itemCount;
 
-					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
-					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+					if (Common::Rect(scrollPos[kMenuItem] + itemspace * i, 0,
+					                 scrollPos[kMenuItem] + itemspace * i + 28, 32).contains(Pos)) {
 						int32 mouseItem = _engine->getScriptManager()->getStateValue(StateKey_InventoryItem);
 						if (mouseItem >= 0  && mouseItem < 0xE0) {
 							_engine->getScriptManager()->inventoryDrop(mouseItem);
-							_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i));
-							_engine->getScriptManager()->setStateValue(SLOT_START_SLOT + i, mouseItem);
+							_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(StateKey_Inv_StartSlot + i));
+							_engine->getScriptManager()->setStateValue(StateKey_Inv_StartSlot + i, mouseItem);
 
 							redraw = true;
 						}
@@ -143,62 +142,62 @@ void MenuZGI::onMouseUp(const Common::Point &Pos) {
 			}
 			break;
 
-		case menu_MAGIC:
-			if (menuBarFlag & menuBar_Magic) {
+		case kMenuMagic:
+			if (menuBarFlag & kMenubarMagic) {
 				for (int i = 0; i < 12; i++) {
 
-					uint itemnum = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+					uint itemnum = _engine->getScriptManager()->getStateValue(StateKey_Spell_1 + i);
 					if (itemnum != 0) {
-						if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+						if (_engine->getScriptManager()->getStateValue(StateKey_Reversed_Spellbooc) == 1)
 							itemnum = 0xEE + i;
 						else
 							itemnum = 0xE0 + i;
 					}
 					if (itemnum)
 						if (_engine->getScriptManager()->getStateValue(StateKey_InventoryItem) == 0 || _engine->getScriptManager()->getStateValue(StateKey_InventoryItem) >= 0xE0)
-							if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
-							                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos))
-								_engine->getScriptManager()->setStateValue(SLOT_USER_CHOSE_THIS_SPELL, itemnum);
+							if (Common::Rect(668 + 47 * i - scrollPos[kMenuMagic], 0,
+							                 668 + 47 * i - scrollPos[kMenuMagic] + 28, 32).contains(Pos))
+								_engine->getScriptManager()->setStateValue(StateKey_Active_Spell, itemnum);
 				}
 
 			}
 			break;
 
-		case menu_MAIN:
+		case kMenuMain:
 
 			// Exit
-			if (menuBarFlag & menuBar_Exit)
+			if (menuBarFlag & kMenubarExit)
 				if (Common::Rect(320 + 135,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320 + 135 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
 					_engine->ifQuit();
 				}
 
 			// Settings
-			if (menuBarFlag & menuBar_Settings)
+			if (menuBarFlag & kMenubarSettings)
 				if (Common::Rect(320 ,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
 					_engine->getScriptManager()->changeLocation('g', 'j', 'p', 'e', 0);
 				}
 
 			// Load
-			if (menuBarFlag & menuBar_Restore)
+			if (menuBarFlag & kMenubarRestore)
 				if (Common::Rect(320 - 135,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
 					_engine->getScriptManager()->changeLocation('g', 'j', 'r', 'e', 0);
 				}
 
 			// Save
-			if (menuBarFlag & menuBar_Save)
+			if (menuBarFlag & kMenubarSave)
 				if (Common::Rect(320 - 135 * 2,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320 - 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
 					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
 				}
 			break;
@@ -213,8 +212,8 @@ void MenuZGI::onMouseMove(const Common::Point &Pos) {
 			redraw = true;
 		inmenu = true;
 		switch (menuMouseFocus) {
-		case menu_ITEM:
-			if (menuBarFlag & menuBar_Items) {
+		case kMenuItem:
+			if (menuBarFlag & kMenubarItems) {
 				int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
 				if (itemCount == 0)
 					itemCount = 20;
@@ -228,78 +227,78 @@ void MenuZGI::onMouseMove(const Common::Point &Pos) {
 				for (int i = 0; i < itemCount; i++) {
 					int itemspace = (600 - 28) / itemCount;
 
-					if (Common::Rect(scrollPos[menu_ITEM] + itemspace * i, 0,
-					                 scrollPos[menu_ITEM] + itemspace * i + 28, 32).contains(Pos)) {
+					if (Common::Rect(scrollPos[kMenuItem] + itemspace * i, 0,
+					                 scrollPos[kMenuItem] + itemspace * i + 28, 32).contains(Pos)) {
 						mouseOnItem = i;
 						break;
 					}
 				}
 
 				if (lastItem != mouseOnItem)
-					if (_engine->getScriptManager()->getStateValue(SLOT_START_SLOT + mouseOnItem) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + lastItem))
+					if (_engine->getScriptManager()->getStateValue(StateKey_Inv_StartSlot + mouseOnItem) ||
+					        _engine->getScriptManager()->getStateValue(StateKey_Inv_StartSlot + lastItem))
 						redraw = true;
 			}
 			break;
 
-		case menu_MAGIC:
-			if (menuBarFlag & menuBar_Magic) {
+		case kMenuMagic:
+			if (menuBarFlag & kMenubarMagic) {
 				int lastItem = mouseOnItem;
 				mouseOnItem = -1;
 				for (int i = 0; i < 12; i++) {
-					if (Common::Rect(668 + 47 * i - scrollPos[menu_MAGIC], 0,
-					                 668 + 47 * i - scrollPos[menu_MAGIC] + 28, 32).contains(Pos)) {
+					if (Common::Rect(668 + 47 * i - scrollPos[kMenuMagic], 0,
+					                 668 + 47 * i - scrollPos[kMenuMagic] + 28, 32).contains(Pos)) {
 						mouseOnItem = i;
 						break;
 					}
 				}
 
 				if (lastItem != mouseOnItem)
-					if (_engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + mouseOnItem) ||
-					        _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + lastItem))
+					if (_engine->getScriptManager()->getStateValue(StateKey_Spell_1 + mouseOnItem) ||
+					        _engine->getScriptManager()->getStateValue(StateKey_Spell_1 + lastItem))
 						redraw = true;
 
 			}
 			break;
 
-		case menu_MAIN: {
+		case kMenuMain: {
 			int lastItem = mouseOnItem;
 			mouseOnItem = -1;
 
 			// Exit
-			if (menuBarFlag & menuBar_Exit)
+			if (menuBarFlag & kMenubarExit)
 				if (Common::Rect(320 + 135,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320 + 135 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_EXIT;
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
+					mouseOnItem = kMainMenuExit;
 				}
 
 			// Settings
-			if (menuBarFlag & menuBar_Settings)
+			if (menuBarFlag & kMenubarSettings)
 				if (Common::Rect(320 ,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320 + 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_PREF;
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
+					mouseOnItem = kMainMenuPrefs;
 				}
 
 			// Load
-			if (menuBarFlag & menuBar_Restore)
+			if (menuBarFlag & kMenubarRestore)
 				if (Common::Rect(320 - 135,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_REST;
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
+					mouseOnItem = kMainMenuLoad;
 				}
 
 			// Save
-			if (menuBarFlag & menuBar_Save)
+			if (menuBarFlag & kMenubarSave)
 				if (Common::Rect(320 - 135 * 2,
-				                 scrollPos[menu_MAIN],
+				                 scrollPos[kMenuMain],
 				                 320 - 135,
-				                 scrollPos[menu_MAIN] + 32).contains(Pos)) {
-					mouseOnItem = menu_MAIN_SAVE;
+				                 scrollPos[kMenuMain] + 32).contains(Pos)) {
+					mouseOnItem = kMainMenuSave;
 				}
 
 			if (lastItem != mouseOnItem)
@@ -310,25 +309,25 @@ void MenuZGI::onMouseMove(const Common::Point &Pos) {
 		default:
 			int cur_menu = menuMouseFocus;
 			if (Common::Rect(64, 0, 64 + 512, 8).contains(Pos)) { // Main
-				menuMouseFocus = menu_MAIN;
-				scrolled[menu_MAIN]  = false;
-				scrollPos[menu_MAIN] = menuback[menu_MAIN][1].h - menuback[menu_MAIN][0].h;
+				menuMouseFocus = kMenuMain;
+				scrolled[kMenuMain]  = false;
+				scrollPos[kMenuMain] = menuback[kMenuMain][1].h - menuback[kMenuMain][0].h;
 				_engine->getScriptManager()->setStateValue(StateKey_MenuState, 2);
 			}
 
-			if (menuBarFlag & menuBar_Magic)
+			if (menuBarFlag & kMenubarMagic)
 				if (Common::Rect(640 - 28, 0, 640, 32).contains(Pos)) { // Magic
-					menuMouseFocus = menu_MAGIC;
-					scrolled[menu_MAGIC]  = false;
-					scrollPos[menu_MAGIC] = 28;
+					menuMouseFocus = kMenuMagic;
+					scrolled[kMenuMagic]  = false;
+					scrollPos[kMenuMagic] = 28;
 					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 3);
 				}
 
-			if (menuBarFlag & menuBar_Items)
+			if (menuBarFlag & kMenubarItems)
 				if (Common::Rect(0, 0, 28, 32).contains(Pos)) { // Items
-					menuMouseFocus = menu_ITEM;
-					scrolled[menu_ITEM]  = false;
-					scrollPos[menu_ITEM] = 28 - 600;
+					menuMouseFocus = kMenuItem;
+					scrolled[kMenuItem]  = false;
+					scrollPos[kMenuItem] = 28 - 600;
 					_engine->getScriptManager()->setStateValue(StateKey_MenuState, 1);
 				}
 
@@ -353,24 +352,24 @@ void MenuZGI::process(uint32 deltatime) {
 		clean = false;
 	}
 	switch (menuMouseFocus) {
-	case menu_ITEM:
-		if (menuBarFlag & menuBar_Items)
-			if (!scrolled[menu_ITEM]) {
+	case kMenuItem:
+		if (menuBarFlag & kMenubarItems)
+			if (!scrolled[kMenuItem]) {
 				redraw = true;
 				float scrl = 600.0 * (deltatime / 1000.0);
 
 				if (scrl == 0)
 					scrl = 1.0;
 
-				scrollPos [menu_ITEM] += scrl;
+				scrollPos [kMenuItem] += scrl;
 
-				if (scrollPos[menu_ITEM] >= 0) {
-					scrolled[menu_ITEM] = true;
-					scrollPos [menu_ITEM] = 0;
+				if (scrollPos[kMenuItem] >= 0) {
+					scrolled[kMenuItem] = true;
+					scrollPos [kMenuItem] = 0;
 				}
 			}
 		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][0], scrollPos[menu_ITEM], 0);
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[kMenuItem][0], scrollPos[kMenuItem], 0);
 
 			int itemCount = _engine->getScriptManager()->getStateValue(StateKey_Inv_TotalSlots);
 			if (itemCount == 0)
@@ -386,7 +385,7 @@ void MenuZGI::process(uint32 deltatime) {
 				if (mouseOnItem == i)
 					inrect = true;
 
-				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_START_SLOT + i);
+				uint curItemId = _engine->getScriptManager()->getStateValue(StateKey_Inv_StartSlot + i);
 
 				if (curItemId != 0) {
 					if (itemId[i] != curItemId) {
@@ -399,9 +398,9 @@ void MenuZGI::process(uint32 deltatime) {
 					}
 
 					if (inrect)
-						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][1], scrollPos[kMenuItem] + itemspace * i, 0, 0);
 					else
-						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[menu_ITEM] + itemspace * i, 0, 0);
+						_engine->getRenderManager()->blitSurfaceToMenu(*items[i][0], scrollPos[kMenuItem] + itemspace * i, 0, 0);
 
 				} else {
 					if (items[i][0]) {
@@ -422,24 +421,24 @@ void MenuZGI::process(uint32 deltatime) {
 		}
 		break;
 
-	case menu_MAGIC:
-		if (menuBarFlag & menuBar_Magic)
-			if (!scrolled[menu_MAGIC]) {
+	case kMenuMagic:
+		if (menuBarFlag & kMenubarMagic)
+			if (!scrolled[kMenuMagic]) {
 				redraw = true;
 				float scrl = 600.0 * (deltatime / 1000.0);
 
 				if (scrl == 0)
 					scrl = 1.0;
 
-				scrollPos [menu_MAGIC] += scrl;
+				scrollPos [kMenuMagic] += scrl;
 
-				if (scrollPos[menu_MAGIC] >= 600) {
-					scrolled[menu_MAGIC] = true;
-					scrollPos [menu_MAGIC] = 600;
+				if (scrollPos[kMenuMagic] >= 600) {
+					scrolled[kMenuMagic] = true;
+					scrollPos [kMenuMagic] = 600;
 				}
 			}
 		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][0], 640 - scrollPos[menu_MAGIC], 0);
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[kMenuMagic][0], 640 - scrollPos[kMenuMagic], 0);
 
 			for (int i = 0; i < 12; i++) {
 				bool inrect = false;
@@ -447,9 +446,9 @@ void MenuZGI::process(uint32 deltatime) {
 				if (mouseOnItem == i)
 					inrect = true;
 
-				uint curItemId = _engine->getScriptManager()->getStateValue(SLOT_SPELL_1 + i);
+				uint curItemId = _engine->getScriptManager()->getStateValue(StateKey_Spell_1 + i);
 				if (curItemId) {
-					if (_engine->getScriptManager()->getStateValue(SLOT_REVERSED_SPELLBOOK) == 1)
+					if (_engine->getScriptManager()->getStateValue(StateKey_Reversed_Spellbooc) == 1)
 						curItemId = 0xEE + i;
 					else
 						curItemId = 0xE0 + i;
@@ -466,9 +465,9 @@ void MenuZGI::process(uint32 deltatime) {
 					}
 
 					if (inrect)
-						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][1], 668 + 47 * i - scrollPos[kMenuMagic], 0, 0);
 					else
-						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[menu_MAGIC], 0, 0);
+						_engine->getRenderManager()->blitSurfaceToMenu(*magic[i][0], 668 + 47 * i - scrollPos[kMenuMagic], 0, 0);
 
 				} else {
 					if (magic[i][0]) {
@@ -488,47 +487,47 @@ void MenuZGI::process(uint32 deltatime) {
 		}
 		break;
 
-	case menu_MAIN:
-		if (!scrolled[menu_MAIN]) {
+	case kMenuMain:
+		if (!scrolled[kMenuMain]) {
 			redraw = true;
 			float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
 
 			if (scrl == 0)
 				scrl = 1.0;
 
-			scrollPos [menu_MAIN] += scrl;
+			scrollPos [kMenuMain] += scrl;
 
-			if (scrollPos[menu_MAIN] >= 0) {
-				scrolled[menu_MAIN] = true;
-				scrollPos [menu_MAIN] = 0;
+			if (scrollPos[kMenuMain] >= 0) {
+				scrolled[kMenuMain] = true;
+				scrollPos [kMenuMain] = 0;
 			}
 		}
 		if (redraw) {
-			_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
+			_engine->getRenderManager()->blitSurfaceToMenu(menuback[kMenuMain][0], 30, scrollPos[kMenuMain]);
 
-			if (menuBarFlag & menuBar_Exit) {
-				if (mouseOnItem == menu_MAIN_EXIT)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
+			if (menuBarFlag & kMenubarExit) {
+				if (mouseOnItem == kMainMenuExit)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuExit][1], 320 + 135, scrollPos[kMenuMain]);
 				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuExit][0], 320 + 135, scrollPos[kMenuMain]);
 			}
-			if (menuBarFlag & menuBar_Settings) {
-				if (mouseOnItem == menu_MAIN_PREF)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
+			if (menuBarFlag & kMenubarSettings) {
+				if (mouseOnItem == kMainMenuPrefs)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuPrefs][1], 320, scrollPos[kMenuMain]);
 				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuPrefs][0], 320, scrollPos[kMenuMain]);
 			}
-			if (menuBarFlag & menuBar_Restore) {
-				if (mouseOnItem == menu_MAIN_REST)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
+			if (menuBarFlag & kMenubarRestore) {
+				if (mouseOnItem == kMainMenuLoad)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuLoad][1], 320 - 135, scrollPos[kMenuMain]);
 				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuLoad][0], 320 - 135, scrollPos[kMenuMain]);
 			}
-			if (menuBarFlag & menuBar_Save) {
-				if (mouseOnItem == menu_MAIN_SAVE)
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
+			if (menuBarFlag & kMenubarSave) {
+				if (mouseOnItem == kMainMenuSave)
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuSave][1], 320 - 135 * 2, scrollPos[kMenuMain]);
 				else
-					_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][0], 320 - 135 * 2, scrollPos[menu_MAIN]);
+					_engine->getRenderManager()->blitSurfaceToMenu(menubar[kMainMenuSave][0], 320 - 135 * 2, scrollPos[kMenuMain]);
 			}
 			redraw = false;
 		}
@@ -536,13 +535,13 @@ void MenuZGI::process(uint32 deltatime) {
 	default:
 		if (redraw) {
 			if (inmenu) {
-				_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][1], 30, 0);
+				_engine->getRenderManager()->blitSurfaceToMenu(menuback[kMenuMain][1], 30, 0);
 
-				if (menuBarFlag & menuBar_Items)
-					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_ITEM][1], 0, 0);
+				if (menuBarFlag & kMenubarItems)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[kMenuItem][1], 0, 0);
 
-				if (menuBarFlag & menuBar_Magic)
-					_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAGIC][1], 640 - 28, 0);
+				if (menuBarFlag & kMenubarMagic)
+					_engine->getRenderManager()->blitSurfaceToMenu(menuback[kMenuMagic][1], 640 - 28, 0);
 			}
 			redraw = false;
 		}
@@ -584,7 +583,7 @@ static const int16 buts[4][2] = { {120 , 64}, {144, 184}, {128, 328}, {120, 456}
 void MenuNemesis::onMouseUp(const Common::Point &Pos) {
 	if (Pos.y < 40) {
 		// Exit
-		if (menuBarFlag & menuBar_Exit)
+		if (menuBarFlag & kMenubarExit)
 			if (Common::Rect(buts[3][1],
 			                 scrollPos,
 			                 buts[3][0] + buts[3][1],
@@ -595,7 +594,7 @@ void MenuNemesis::onMouseUp(const Common::Point &Pos) {
 			}
 
 		// Settings
-		if (menuBarFlag & menuBar_Settings)
+		if (menuBarFlag & kMenubarSettings)
 			if (Common::Rect(buts[2][1],
 			                 scrollPos,
 			                 buts[2][0] + buts[2][1],
@@ -606,7 +605,7 @@ void MenuNemesis::onMouseUp(const Common::Point &Pos) {
 			}
 
 		// Load
-		if (menuBarFlag & menuBar_Restore)
+		if (menuBarFlag & kMenubarRestore)
 			if (Common::Rect(buts[1][1],
 			                 scrollPos,
 			                 buts[1][0] + buts[1][1],
@@ -617,7 +616,7 @@ void MenuNemesis::onMouseUp(const Common::Point &Pos) {
 			}
 
 		// Save
-		if (menuBarFlag & menuBar_Save)
+		if (menuBarFlag & kMenubarSave)
 			if (Common::Rect(buts[0][1],
 			                 scrollPos,
 			                 buts[0][0] + buts[0][1],
@@ -641,39 +640,39 @@ void MenuNemesis::onMouseMove(const Common::Point &Pos) {
 		mouseOnItem = -1;
 
 		// Exit
-		if (menuBarFlag & menuBar_Exit)
+		if (menuBarFlag & kMenubarExit)
 			if (Common::Rect(buts[3][1],
 			                 scrollPos,
 			                 buts[3][0] + buts[3][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_EXIT;
+				mouseOnItem = kMainMenuExit;
 			}
 
 		// Settings
-		if (menuBarFlag & menuBar_Settings)
+		if (menuBarFlag & kMenubarSettings)
 			if (Common::Rect(buts[2][1],
 			                 scrollPos,
 			                 buts[2][0] + buts[2][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_PREF;
+				mouseOnItem = kMainMenuPrefs;
 			}
 
 		// Load
-		if (menuBarFlag & menuBar_Restore)
+		if (menuBarFlag & kMenubarRestore)
 			if (Common::Rect(buts[1][1],
 			                 scrollPos,
 			                 buts[1][0] + buts[1][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_REST;
+				mouseOnItem = kMainMenuLoad;
 			}
 
 		// Save
-		if (menuBarFlag & menuBar_Save)
+		if (menuBarFlag & kMenubarSave)
 			if (Common::Rect(buts[0][1],
 			                 scrollPos,
 			                 buts[0][0] + buts[0][1],
 			                 scrollPos + 32).contains(Pos)) {
-				mouseOnItem = menu_MAIN_SAVE;
+				mouseOnItem = kMainMenuSave;
 			}
 
 		if (lastItem != mouseOnItem) {
@@ -718,20 +717,20 @@ void MenuNemesis::process(uint32 deltatime) {
 		if (redraw) {
 			_engine->getRenderManager()->blitSurfaceToMenu(menubar, 64, scrollPos);
 
-			if (menuBarFlag & menuBar_Exit)
-				if (mouseOnItem == menu_MAIN_EXIT)
+			if (menuBarFlag & kMenubarExit)
+				if (mouseOnItem == kMainMenuExit)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[3][frm], buts[3][1], scrollPos);
 
-			if (menuBarFlag & menuBar_Settings)
-				if (mouseOnItem == menu_MAIN_PREF)
+			if (menuBarFlag & kMenubarSettings)
+				if (mouseOnItem == kMainMenuPrefs)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[2][frm], buts[2][1], scrollPos);
 
-			if (menuBarFlag & menuBar_Restore)
-				if (mouseOnItem == menu_MAIN_REST)
+			if (menuBarFlag & kMenubarRestore)
+				if (mouseOnItem == kMainMenuLoad)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[1][frm], buts[1][1], scrollPos);
 
-			if (menuBarFlag & menuBar_Save)
-				if (mouseOnItem == menu_MAIN_SAVE)
+			if (menuBarFlag & kMenubarSave)
+				if (mouseOnItem == kMainMenuSave)
 					_engine->getRenderManager()->blitSurfaceToMenu(but[0][frm], buts[0][1], scrollPos);
 
 			redraw = false;
diff --git a/engines/zvision/scripting/menu.h b/engines/zvision/scripting/menu.h
index ebe0bb50ac..a88587966f 100644
--- a/engines/zvision/scripting/menu.h
+++ b/engines/zvision/scripting/menu.h
@@ -32,12 +32,12 @@
 namespace ZVision {
 
 enum menuBar {
-	menuBar_Exit = 0x1,
-	menuBar_Settings = 0x2,
-	menuBar_Restore = 0x4,
-	menuBar_Save = 0x8,
-	menuBar_Items = 0x100,
-	menuBar_Magic = 0x200
+	kMenubarExit = 0x1,
+	kMenubarSettings = 0x2,
+	kMenubarRestore = 0x4,
+	kMenubarSave = 0x8,
+	kMenubarItems = 0x100,
+	kMenubarMagic = 0x200
 };
 
 class MenuHandler {
@@ -84,12 +84,6 @@ private:
 	bool   scrolled[3];
 	int16 scrollPos[3];
 
-	enum {
-		menu_ITEM = 0,
-		menu_MAGIC = 1,
-		menu_MAIN = 2
-	};
-
 	bool clean;
 	bool redraw;
 
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index c5ade08e14..9f0f2f6e10 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -94,7 +94,12 @@ enum StateKey {
 	StateKey_Inv_Cnt_Slot = 100,
 	StateKey_Inv_1_Slot = 101,
 	StateKey_Inv_49_Slot = 149,
-	StateKey_Inv_TotalSlots = 150
+	// ZGI only
+	StateKey_Inv_TotalSlots = 150,
+	StateKey_Inv_StartSlot = 151,
+	StateKey_Spell_1 = 191,
+	StateKey_Active_Spell = 205,
+	StateKey_Reversed_Spellbooc = 206
 };
 
 struct Location {
-- 
cgit v1.2.3


From 00a252fdc561b31379ddc5f568121b8040986add Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 03:58:37 +0200
Subject: ZVISION: Slight cleanup

---
 engines/zvision/core/save_manager.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
index 20bd39fde5..b45742154d 100644
--- a/engines/zvision/core/save_manager.cpp
+++ b/engines/zvision/core/save_manager.cpp
@@ -78,9 +78,6 @@ bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
 }
 
 void SaveManager::saveGame(uint slot, const Common::String &saveName) {
-	// The games only support 20 slots
-	//assert(slot <= 1 && slot <= 20);
-
 	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
 	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
 
@@ -124,7 +121,6 @@ void SaveManager::autoSave() {
 }
 
 void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName) {
-
 	file->writeUint32BE(SAVEGAME_ID);
 
 	// Write version
@@ -148,9 +144,6 @@ void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::S
 }
 
 Common::Error SaveManager::loadGame(uint slot) {
-	// The games only support 20 slots
-	//assert(slot <= 1 && slot <= 20);
-
 	Common::SeekableReadStream *saveFile = getSlotFile(slot);
 	if (saveFile == 0) {
 		return Common::kPathDoesNotExist;
@@ -226,7 +219,13 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 	// Check that the save version isn't newer than this binary
 	if (header.version > SAVE_VERSION) {
 		uint tempVersion = header.version;
-		GUI::MessageDialog dialog(Common::String::format("This save file uses version %u, but this engine only supports up to version %d. You will need an updated version of the engine to use this save file.", tempVersion, SAVE_VERSION), "OK");
+		GUI::MessageDialog dialog(
+			Common::String::format(
+				"This save file uses version %u, but this engine only "
+				"supports up to version %d. You will need an updated version "
+				"of the engine to use this save file.", tempVersion, SAVE_VERSION
+			),
+		"OK");
 		dialog.runModal();
 	}
 
-- 
cgit v1.2.3


From 4d0ebfaa2285e2741a134db36fb4f5bd0317784d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 04:03:20 +0200
Subject: ZVISION: Move the save manager together with the other file classes

---
 engines/zvision/core/save_manager.cpp              | 294 ---------------------
 engines/zvision/core/save_manager.h                | 106 --------
 engines/zvision/detection.cpp                      |   2 +-
 engines/zvision/file/save_manager.cpp              | 294 +++++++++++++++++++++
 engines/zvision/file/save_manager.h                | 106 ++++++++
 engines/zvision/module.mk                          |   2 +-
 engines/zvision/scripting/actions.cpp              |   2 +-
 .../zvision/scripting/controls/save_control.cpp    |   2 +-
 engines/zvision/scripting/script_manager.cpp       |   2 +-
 engines/zvision/zvision.cpp                        |   2 +-
 10 files changed, 406 insertions(+), 406 deletions(-)
 delete mode 100644 engines/zvision/core/save_manager.cpp
 delete mode 100644 engines/zvision/core/save_manager.h
 create mode 100644 engines/zvision/file/save_manager.cpp
 create mode 100644 engines/zvision/file/save_manager.h

diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
deleted file mode 100644
index b45742154d..0000000000
--- a/engines/zvision/core/save_manager.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/core/save_manager.h"
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-
-#include "common/system.h"
-#include "common/translation.h"
-
-#include "graphics/surface.h"
-#include "graphics/thumbnail.h"
-
-#include "gui/message.h"
-#include "gui/saveload.h"
-
-namespace ZVision {
-
-const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');
-
-bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
-	GUI::SaveLoadChooser *dialog;
-	Common::String desc;
-	int slot;
-
-	if (isSave) {
-		dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
-
-		slot = dialog->runModalWithCurrentTarget();
-		desc = dialog->getResultString();
-
-		if (desc.empty()) {
-			// create our own description for the saved game, the user didnt enter it
-			desc = dialog->createDefaultSaveDescription(slot);
-		}
-
-		if (desc.size() > 28)
-			desc = Common::String(desc.c_str(), 28);
-	} else {
-		dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
-		slot = dialog->runModalWithCurrentTarget();
-	}
-
-	delete dialog;
-
-	if (slot < 0)
-		return false;
-
-	if (isSave) {
-		saveGame(slot, desc);
-		return true;
-	} else {
-		Common::ErrorCode result = loadGame(slot).getCode();
-		return (result == Common::kNoError);
-	}
-}
-
-void SaveManager::saveGame(uint slot, const Common::String &saveName) {
-	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
-	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
-
-	writeSaveGameHeader(file, saveName);
-
-	_engine->getScriptManager()->serialize(file);
-
-	file->finalize();
-	delete file;
-}
-
-void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream) {
-	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
-	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
-
-	writeSaveGameHeader(file, saveName);
-
-	file->write(stream->getData(), stream->size());
-
-	file->finalize();
-	delete file;
-}
-
-void SaveManager::saveGameBuffered(uint slot, const Common::String &saveName) {
-	if (_tempSave) {
-		saveGame(slot, saveName, _tempSave);
-		flushSaveBuffer();
-	}
-}
-
-void SaveManager::autoSave() {
-	Common::OutSaveFile *file = g_system->getSavefileManager()->openForSaving(_engine->generateAutoSaveFileName());
-
-	writeSaveGameHeader(file, "auto");
-
-	_engine->getScriptManager()->serialize(file);
-
-	// Cleanup
-	file->finalize();
-	delete file;
-}
-
-void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName) {
-	file->writeUint32BE(SAVEGAME_ID);
-
-	// Write version
-	file->writeByte(SAVE_VERSION);
-
-	// Write savegame name
-	file->writeString(saveName);
-	file->writeByte(0);
-
-	// Create a thumbnail and save it
-	Graphics::saveThumbnail(*file);
-
-	// Write out the save date/time
-	TimeDate td;
-	g_system->getTimeAndDate(td);
-	file->writeSint16LE(td.tm_year + 1900);
-	file->writeSint16LE(td.tm_mon + 1);
-	file->writeSint16LE(td.tm_mday);
-	file->writeSint16LE(td.tm_hour);
-	file->writeSint16LE(td.tm_min);
-}
-
-Common::Error SaveManager::loadGame(uint slot) {
-	Common::SeekableReadStream *saveFile = getSlotFile(slot);
-	if (saveFile == 0) {
-		return Common::kPathDoesNotExist;
-	}
-
-	// Read the header
-	SaveGameHeader header;
-	if (!readSaveGameHeader(saveFile, header)) {
-		return Common::kUnknownError;
-	}
-
-	ScriptManager *scriptManager = _engine->getScriptManager();
-	// Update the state table values
-	scriptManager->deserialize(saveFile);
-
-	delete saveFile;
-	if (header.thumbnail)
-		delete header.thumbnail;
-
-	return Common::kNoError;
-}
-
-Common::Error SaveManager::loadGame(const Common::String &saveName) {
-	Common::File *saveFile = _engine->getSearchManager()->openFile(saveName);
-	if (saveFile == NULL) {
-		saveFile = new Common::File;
-		if (!saveFile->open(saveName)) {
-			delete saveFile;
-			return Common::kPathDoesNotExist;
-		}
-	}
-
-	// Read the header
-	SaveGameHeader header;
-	if (!readSaveGameHeader(saveFile, header)) {
-		return Common::kUnknownError;
-	}
-
-	ScriptManager *scriptManager = _engine->getScriptManager();
-	// Update the state table values
-	scriptManager->deserialize(saveFile);
-
-	delete saveFile;
-	if (header.thumbnail)
-		delete header.thumbnail;
-
-	return Common::kNoError;
-}
-
-bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header) {
-	uint32 tag = in->readUint32BE();
-	// Check if it's original savegame than fill header structure
-	if (tag == MKTAG('Z', 'N', 'S', 'G')) {
-		header.saveYear = 0;
-		header.saveMonth = 0;
-		header.saveDay = 0;
-		header.saveHour = 0;
-		header.saveMinutes = 0;
-		header.saveName = "Original Save";
-		header.thumbnail = NULL;
-		header.version = SAVE_ORIGINAL;
-		in->seek(-4, SEEK_CUR);
-		return true;
-	}
-	if (tag != SAVEGAME_ID) {
-		warning("File is not a ZVision save file. Aborting load");
-		return false;
-	}
-
-	// Read in the version
-	header.version = in->readByte();
-
-	// Check that the save version isn't newer than this binary
-	if (header.version > SAVE_VERSION) {
-		uint tempVersion = header.version;
-		GUI::MessageDialog dialog(
-			Common::String::format(
-				"This save file uses version %u, but this engine only "
-				"supports up to version %d. You will need an updated version "
-				"of the engine to use this save file.", tempVersion, SAVE_VERSION
-			),
-		"OK");
-		dialog.runModal();
-	}
-
-	// Read in the save name
-	header.saveName.clear();
-	char ch;
-	while ((ch = (char)in->readByte()) != '\0')
-		header.saveName += ch;
-
-	// Get the thumbnail
-	header.thumbnail = Graphics::loadThumbnail(*in);
-	if (!header.thumbnail)
-		return false;
-
-	// Read in save date/time
-	header.saveYear = in->readSint16LE();
-	header.saveMonth = in->readSint16LE();
-	header.saveDay = in->readSint16LE();
-	header.saveHour = in->readSint16LE();
-	header.saveMinutes = in->readSint16LE();
-
-	return true;
-}
-
-Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
-	Common::SeekableReadStream *saveFile = g_system->getSavefileManager()->openForLoading(_engine->generateSaveFileName(slot));
-	if (saveFile == NULL) {
-		// Try to load standard save file
-		Common::String filename;
-		if (_engine->getGameId() == GID_GRANDINQUISITOR)
-			filename = Common::String::format("inqsav%u.sav", slot);
-		else if (_engine->getGameId() == GID_NEMESIS)
-			filename = Common::String::format("nemsav%u.sav", slot);
-
-		saveFile = _engine->getSearchManager()->openFile(filename);
-		if (saveFile == NULL) {
-			Common::File *tmpFile = new Common::File;
-			if (!tmpFile->open(filename)) {
-				delete tmpFile;
-			} else {
-				saveFile = tmpFile;
-			}
-		}
-
-	}
-
-	return saveFile;
-}
-
-void SaveManager::prepareSaveBuffer() {
-	if (_tempSave)
-		delete _tempSave;
-
-	_tempSave = new Common::MemoryWriteStreamDynamic;
-
-	_engine->getScriptManager()->serialize(_tempSave);
-}
-
-void SaveManager::flushSaveBuffer() {
-	if (_tempSave)
-		delete _tempSave;
-
-	_tempSave = NULL;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/core/save_manager.h b/engines/zvision/core/save_manager.h
deleted file mode 100644
index 75841331e7..0000000000
--- a/engines/zvision/core/save_manager.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SAVE_MANAGER_H
-#define ZVISION_SAVE_MANAGER_H
-
-#include "common/savefile.h"
-#include "common/memstream.h"
-
-namespace Common {
-class String;
-}
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-struct SaveGameHeader {
-	byte version;
-	Common::String saveName;
-	Graphics::Surface *thumbnail;
-	int saveYear, saveMonth, saveDay;
-	int saveHour, saveMinutes;
-};
-
-class SaveManager {
-public:
-	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL) {}
-	~SaveManager() {
-		flushSaveBuffer();
-	}
-
-private:
-	ZVision *_engine;
-	static const uint32 SAVEGAME_ID;
-
-	enum {
-		SAVE_ORIGINAL = 0,
-		SAVE_VERSION = 1
-	};
-
-	Common::MemoryWriteStreamDynamic *_tempSave;
-
-public:
-	/**
-	 * Called every room change. Saves the state of the room just before
-	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to
-	 * create the save file name.
-	 */
-	void autoSave();
-	/**
-	 * Copies the data from the last auto-save into a new save file. We
-	 * can't use the current state data because the save menu *IS* a room.
-	 * The file is named using ZVision::generateSaveFileName(slot)
-	 *
-	 * @param slot        The save slot this save pertains to. Must be [1, 20]
-	 * @param saveName    The internal name for this save. This is NOT the name of the actual save file.
-	 */
-	void saveGame(uint slot, const Common::String &saveName);
-	void saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream);
-	void saveGameBuffered(uint slot, const Common::String &saveName);
-	/**
-	 * Loads the state data from the save file that slot references. Uses
-	 * ZVision::generateSaveFileName(slot) to get the save file name.
-	 *
-	 * @param slot    The save slot to load. Must be [1, 20]
-	 */
-	Common::Error loadGame(uint slot);
-	Common::Error loadGame(const Common::String &saveName);
-
-	Common::SeekableReadStream *getSlotFile(uint slot);
-	bool readSaveGameHeader(Common::SeekableReadStream *in, SaveGameHeader &header);
-
-	void prepareSaveBuffer();
-	void flushSaveBuffer();
-	bool scummVMSaveLoadDialog(bool isSave);
-private:
-	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName);
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index ebf5bdcfdd..b8d6a74eee 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -26,7 +26,7 @@
 
 #include "zvision/zvision.h"
 #include "zvision/detection.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
 #include "zvision/scripting/script_manager.h"
 
 #include "common/translation.h"
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
new file mode 100644
index 0000000000..05df834497
--- /dev/null
+++ b/engines/zvision/file/save_manager.cpp
@@ -0,0 +1,294 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/zvision.h"
+#include "zvision/file/save_manager.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+
+#include "common/system.h"
+#include "common/translation.h"
+
+#include "graphics/surface.h"
+#include "graphics/thumbnail.h"
+
+#include "gui/message.h"
+#include "gui/saveload.h"
+
+namespace ZVision {
+
+const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');
+
+bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
+	GUI::SaveLoadChooser *dialog;
+	Common::String desc;
+	int slot;
+
+	if (isSave) {
+		dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
+
+		slot = dialog->runModalWithCurrentTarget();
+		desc = dialog->getResultString();
+
+		if (desc.empty()) {
+			// create our own description for the saved game, the user didnt enter it
+			desc = dialog->createDefaultSaveDescription(slot);
+		}
+
+		if (desc.size() > 28)
+			desc = Common::String(desc.c_str(), 28);
+	} else {
+		dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+		slot = dialog->runModalWithCurrentTarget();
+	}
+
+	delete dialog;
+
+	if (slot < 0)
+		return false;
+
+	if (isSave) {
+		saveGame(slot, desc);
+		return true;
+	} else {
+		Common::ErrorCode result = loadGame(slot).getCode();
+		return (result == Common::kNoError);
+	}
+}
+
+void SaveManager::saveGame(uint slot, const Common::String &saveName) {
+	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
+	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
+
+	writeSaveGameHeader(file, saveName);
+
+	_engine->getScriptManager()->serialize(file);
+
+	file->finalize();
+	delete file;
+}
+
+void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream) {
+	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
+	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
+
+	writeSaveGameHeader(file, saveName);
+
+	file->write(stream->getData(), stream->size());
+
+	file->finalize();
+	delete file;
+}
+
+void SaveManager::saveGameBuffered(uint slot, const Common::String &saveName) {
+	if (_tempSave) {
+		saveGame(slot, saveName, _tempSave);
+		flushSaveBuffer();
+	}
+}
+
+void SaveManager::autoSave() {
+	Common::OutSaveFile *file = g_system->getSavefileManager()->openForSaving(_engine->generateAutoSaveFileName());
+
+	writeSaveGameHeader(file, "auto");
+
+	_engine->getScriptManager()->serialize(file);
+
+	// Cleanup
+	file->finalize();
+	delete file;
+}
+
+void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName) {
+	file->writeUint32BE(SAVEGAME_ID);
+
+	// Write version
+	file->writeByte(SAVE_VERSION);
+
+	// Write savegame name
+	file->writeString(saveName);
+	file->writeByte(0);
+
+	// Create a thumbnail and save it
+	Graphics::saveThumbnail(*file);
+
+	// Write out the save date/time
+	TimeDate td;
+	g_system->getTimeAndDate(td);
+	file->writeSint16LE(td.tm_year + 1900);
+	file->writeSint16LE(td.tm_mon + 1);
+	file->writeSint16LE(td.tm_mday);
+	file->writeSint16LE(td.tm_hour);
+	file->writeSint16LE(td.tm_min);
+}
+
+Common::Error SaveManager::loadGame(uint slot) {
+	Common::SeekableReadStream *saveFile = getSlotFile(slot);
+	if (saveFile == 0) {
+		return Common::kPathDoesNotExist;
+	}
+
+	// Read the header
+	SaveGameHeader header;
+	if (!readSaveGameHeader(saveFile, header)) {
+		return Common::kUnknownError;
+	}
+
+	ScriptManager *scriptManager = _engine->getScriptManager();
+	// Update the state table values
+	scriptManager->deserialize(saveFile);
+
+	delete saveFile;
+	if (header.thumbnail)
+		delete header.thumbnail;
+
+	return Common::kNoError;
+}
+
+Common::Error SaveManager::loadGame(const Common::String &saveName) {
+	Common::File *saveFile = _engine->getSearchManager()->openFile(saveName);
+	if (saveFile == NULL) {
+		saveFile = new Common::File;
+		if (!saveFile->open(saveName)) {
+			delete saveFile;
+			return Common::kPathDoesNotExist;
+		}
+	}
+
+	// Read the header
+	SaveGameHeader header;
+	if (!readSaveGameHeader(saveFile, header)) {
+		return Common::kUnknownError;
+	}
+
+	ScriptManager *scriptManager = _engine->getScriptManager();
+	// Update the state table values
+	scriptManager->deserialize(saveFile);
+
+	delete saveFile;
+	if (header.thumbnail)
+		delete header.thumbnail;
+
+	return Common::kNoError;
+}
+
+bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header) {
+	uint32 tag = in->readUint32BE();
+	// Check if it's original savegame than fill header structure
+	if (tag == MKTAG('Z', 'N', 'S', 'G')) {
+		header.saveYear = 0;
+		header.saveMonth = 0;
+		header.saveDay = 0;
+		header.saveHour = 0;
+		header.saveMinutes = 0;
+		header.saveName = "Original Save";
+		header.thumbnail = NULL;
+		header.version = SAVE_ORIGINAL;
+		in->seek(-4, SEEK_CUR);
+		return true;
+	}
+	if (tag != SAVEGAME_ID) {
+		warning("File is not a ZVision save file. Aborting load");
+		return false;
+	}
+
+	// Read in the version
+	header.version = in->readByte();
+
+	// Check that the save version isn't newer than this binary
+	if (header.version > SAVE_VERSION) {
+		uint tempVersion = header.version;
+		GUI::MessageDialog dialog(
+			Common::String::format(
+				"This save file uses version %u, but this engine only "
+				"supports up to version %d. You will need an updated version "
+				"of the engine to use this save file.", tempVersion, SAVE_VERSION
+			),
+		"OK");
+		dialog.runModal();
+	}
+
+	// Read in the save name
+	header.saveName.clear();
+	char ch;
+	while ((ch = (char)in->readByte()) != '\0')
+		header.saveName += ch;
+
+	// Get the thumbnail
+	header.thumbnail = Graphics::loadThumbnail(*in);
+	if (!header.thumbnail)
+		return false;
+
+	// Read in save date/time
+	header.saveYear = in->readSint16LE();
+	header.saveMonth = in->readSint16LE();
+	header.saveDay = in->readSint16LE();
+	header.saveHour = in->readSint16LE();
+	header.saveMinutes = in->readSint16LE();
+
+	return true;
+}
+
+Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
+	Common::SeekableReadStream *saveFile = g_system->getSavefileManager()->openForLoading(_engine->generateSaveFileName(slot));
+	if (saveFile == NULL) {
+		// Try to load standard save file
+		Common::String filename;
+		if (_engine->getGameId() == GID_GRANDINQUISITOR)
+			filename = Common::String::format("inqsav%u.sav", slot);
+		else if (_engine->getGameId() == GID_NEMESIS)
+			filename = Common::String::format("nemsav%u.sav", slot);
+
+		saveFile = _engine->getSearchManager()->openFile(filename);
+		if (saveFile == NULL) {
+			Common::File *tmpFile = new Common::File;
+			if (!tmpFile->open(filename)) {
+				delete tmpFile;
+			} else {
+				saveFile = tmpFile;
+			}
+		}
+
+	}
+
+	return saveFile;
+}
+
+void SaveManager::prepareSaveBuffer() {
+	if (_tempSave)
+		delete _tempSave;
+
+	_tempSave = new Common::MemoryWriteStreamDynamic;
+
+	_engine->getScriptManager()->serialize(_tempSave);
+}
+
+void SaveManager::flushSaveBuffer() {
+	if (_tempSave)
+		delete _tempSave;
+
+	_tempSave = NULL;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/file/save_manager.h b/engines/zvision/file/save_manager.h
new file mode 100644
index 0000000000..75841331e7
--- /dev/null
+++ b/engines/zvision/file/save_manager.h
@@ -0,0 +1,106 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SAVE_MANAGER_H
+#define ZVISION_SAVE_MANAGER_H
+
+#include "common/savefile.h"
+#include "common/memstream.h"
+
+namespace Common {
+class String;
+}
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+struct SaveGameHeader {
+	byte version;
+	Common::String saveName;
+	Graphics::Surface *thumbnail;
+	int saveYear, saveMonth, saveDay;
+	int saveHour, saveMinutes;
+};
+
+class SaveManager {
+public:
+	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL) {}
+	~SaveManager() {
+		flushSaveBuffer();
+	}
+
+private:
+	ZVision *_engine;
+	static const uint32 SAVEGAME_ID;
+
+	enum {
+		SAVE_ORIGINAL = 0,
+		SAVE_VERSION = 1
+	};
+
+	Common::MemoryWriteStreamDynamic *_tempSave;
+
+public:
+	/**
+	 * Called every room change. Saves the state of the room just before
+	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to
+	 * create the save file name.
+	 */
+	void autoSave();
+	/**
+	 * Copies the data from the last auto-save into a new save file. We
+	 * can't use the current state data because the save menu *IS* a room.
+	 * The file is named using ZVision::generateSaveFileName(slot)
+	 *
+	 * @param slot        The save slot this save pertains to. Must be [1, 20]
+	 * @param saveName    The internal name for this save. This is NOT the name of the actual save file.
+	 */
+	void saveGame(uint slot, const Common::String &saveName);
+	void saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream);
+	void saveGameBuffered(uint slot, const Common::String &saveName);
+	/**
+	 * Loads the state data from the save file that slot references. Uses
+	 * ZVision::generateSaveFileName(slot) to get the save file name.
+	 *
+	 * @param slot    The save slot to load. Must be [1, 20]
+	 */
+	Common::Error loadGame(uint slot);
+	Common::Error loadGame(const Common::String &saveName);
+
+	Common::SeekableReadStream *getSlotFile(uint slot);
+	bool readSaveGameHeader(Common::SeekableReadStream *in, SaveGameHeader &header);
+
+	void prepareSaveBuffer();
+	void flushSaveBuffer();
+	bool scummVMSaveLoadDialog(bool isSave);
+private:
+	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 6955d62534..8edd67b352 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -4,9 +4,9 @@ MODULE_OBJS := \
 	core/console.o \
 	core/clock.o \
 	core/events.o \
-	core/save_manager.o \
 	detection.o \
 	file/lzss_read_stream.o \
+	file/save_manager.o \
 	file/search_manager.o \
 	file/zfs_archive.o \
 	graphics/cursors/cursor_manager.o \
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index be2079736e..ebbd09c8b9 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -29,6 +29,7 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/video/zork_avi_decoder.h"
+#include "zvision/file/save_manager.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 #include "zvision/scripting/sidefx/music_node.h"
 #include "zvision/scripting/sidefx/syncsound_node.h"
@@ -42,7 +43,6 @@
 #include "zvision/graphics/effects/fog.h"
 #include "zvision/graphics/effects/light.h"
 #include "zvision/graphics/effects/wave.h"
-#include "zvision/core/save_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 
 #include "common/file.h"
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index b35611feca..3a4dc47fe8 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -29,7 +29,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/string_manager.h"
 
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
 
 #include "common/str.h"
 #include "common/stream.h"
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 4c1e69072d..2a4aa5fed0 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -27,7 +27,7 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f692969942..11e417d4ac 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -27,7 +27,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/detection.h"
 #include "zvision/scripting/menu.h"
-- 
cgit v1.2.3


From e4b2913e4ac5584803e65008c44addea05c3892a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 04:05:48 +0200
Subject: ZVISION: Reorder the detection entries

---
 engines/zvision/detection.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index b8d6a74eee..a361239e9e 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -100,28 +100,28 @@ static const ZVisionGameDescription gameDescriptions[] = {
 	},
 
 	{
-		// Zork Grand Inquisitor English demo version
+		// Zork Grand Inquisitor English DVD version
 		{
 			"zgi",
-			"Demo",
-			AD_ENTRY1s("SCRIPTS.ZFS", "71a2494fd2fb999347deb13401e9b998", 304239),
+			"DVD",
+			AD_ENTRY1s("SCRIPTS.ZFS", "03157a3399513bfaaf8dc6d5ab798b36", 8433326),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			ADGF_DEMO,
+			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
 		GID_GRANDINQUISITOR
 	},
 
 	{
-		// Zork Grand Inquisitor English DVD version
+		// Zork Grand Inquisitor English demo version
 		{
 			"zgi",
-			"DVD",
-			AD_ENTRY1s("SCRIPTS.ZFS", "03157a3399513bfaaf8dc6d5ab798b36", 8433326),
+			"Demo",
+			AD_ENTRY1s("SCRIPTS.ZFS", "71a2494fd2fb999347deb13401e9b998", 304239),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
+			ADGF_DEMO,
 			GUIO1(GUIO_NONE)
 		},
 		GID_GRANDINQUISITOR
-- 
cgit v1.2.3


From 2350eca546396775c6e9ac9875ebd59bcc17663f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 12:04:21 +0200
Subject: ZVISION: Remove some unused actions. Cleanup

---
 engines/zvision/scripting/actions.cpp           | 53 +++++--------------------
 engines/zvision/scripting/actions.h             | 26 ------------
 engines/zvision/scripting/scr_file_handling.cpp |  6 ++-
 3 files changed, 13 insertions(+), 72 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index ebbd09c8b9..c26a93f529 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -242,23 +242,6 @@ bool ActionDisableControl::execute() {
 	return true;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// ActionDisableVenus
-//////////////////////////////////////////////////////////////////////////////
-
-ActionDisableVenus::ActionDisableVenus(ZVision *engine, int32 slotkey, const Common::String &line) :
-	ResultAction(engine, slotkey) {
-	_key = 0;
-
-	sscanf(line.c_str(), "%d", &_key);
-}
-
-bool ActionDisableVenus::execute() {
-	_engine->getScriptManager()->setStateValue(_key, 0);
-
-	return true;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionDisplayMessage
 //////////////////////////////////////////////////////////////////////////////
@@ -295,7 +278,7 @@ bool ActionDissolve::execute() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// ActionDistort
+// ActionDistort - only used by Zork: Nemesis for the "treatment" puzzle in the Sanitarium (aj30)
 //////////////////////////////////////////////////////////////////////////////
 
 ActionDistort::ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line) :
@@ -406,7 +389,7 @@ bool ActionInventory::execute() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// ActionKill
+// ActionKill - only used by ZGI
 //////////////////////////////////////////////////////////////////////////////
 
 ActionKill::ActionKill(ZVision *engine, int32 slotkey, const Common::String &line) :
@@ -735,13 +718,13 @@ bool ActionRegion::execute() {
 	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
 
-	Effect *effct = NULL;
+	Effect *effect = NULL;
 	switch (_type) {
 	case 0: {
 		uint16 centerX, centerY, frames;
 		double amplitude, waveln, speed;
 		sscanf(_custom.c_str(), "%hu,%hu,%hu,%lf,%lf,%lf,", &centerX, &centerY, &frames, &amplitude, &waveln, &speed);
-		effct = new WaveFx(_engine, _slotKey, _rect, _unk1, frames, centerX, centerY, amplitude, waveln, speed);
+		effect = new WaveFx(_engine, _slotKey, _rect, _unk1, frames, centerX, centerY, amplitude, waveln, speed);
 	}
 	break;
 	case 1: {
@@ -753,7 +736,7 @@ bool ActionRegion::execute() {
 		int8 minD;
 		int8 maxD;
 		EffectMap *_map = _engine->getRenderManager()->makeEffectMap(Common::Point(aX, aY), aD, _rect, &minD, &maxD);
-		effct = new LightFx(_engine, _slotKey, _rect, _unk1, _map, atoi(_custom.c_str()), minD, maxD);
+		effect = new LightFx(_engine, _slotKey, _rect, _unk1, _map, atoi(_custom.c_str()), minD, maxD);
 	}
 	break;
 	case 9: {
@@ -769,16 +752,16 @@ bool ActionRegion::execute() {
 			_rect.setHeight(tempMask.h);
 
 		EffectMap *_map = _engine->getRenderManager()->makeEffectMap(tempMask, 0);
-		effct = new FogFx(_engine, _slotKey, _rect, _unk1, _map, Common::String(buf));
+		effect = new FogFx(_engine, _slotKey, _rect, _unk1, _map, Common::String(buf));
 	}
 	break;
 	default:
 		break;
 	}
 
-	if (effct) {
-		_engine->getScriptManager()->addSideFX(new RegionNode(_engine, _slotKey, effct, _delay));
-		_engine->getRenderManager()->addEffect(effct);
+	if (effect) {
+		_engine->getScriptManager()->addSideFX(new RegionNode(_engine, _slotKey, effect, _delay));
+		_engine->getRenderManager()->addEffect(effect);
 	}
 
 	return true;
@@ -899,24 +882,6 @@ bool ActionSetScreen::execute() {
 	return true;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// ActionSetVenus
-//////////////////////////////////////////////////////////////////////////////
-
-ActionSetVenus::ActionSetVenus(ZVision *engine, int32 slotkey, const Common::String &line) :
-	ResultAction(engine, slotkey) {
-	_key = 0;
-
-	sscanf(line.c_str(), "%d", &_key);
-}
-
-bool ActionSetVenus::execute() {
-	if (_engine->getScriptManager()->getStateValue(_key))
-		_engine->getScriptManager()->setStateValue(StateKey_Venus, _key);
-
-	return true;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionStop
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 3501372c7f..8d43309b74 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -124,14 +124,6 @@ private:
 	uint8 _action;
 };
 
-class ActionDebug : public ResultAction {
-public:
-	ActionDebug(ZVision *engine, int32 slotkey, const Common::String &line);
-	bool execute();
-
-private:
-};
-
 class ActionDelayRender : public ResultAction {
 public:
 	ActionDelayRender(ZVision *engine, int32 slotkey, const Common::String &line);
@@ -150,15 +142,6 @@ private:
 	uint32 _key;
 };
 
-class ActionDisableVenus : public ResultAction {
-public:
-	ActionDisableVenus(ZVision *engine, int32 slotkey, const Common::String &line);
-	bool execute();
-
-private:
-	int32 _key;
-};
-
 class ActionDisplayMessage : public ResultAction {
 public:
 	ActionDisplayMessage(ZVision *engine, int32 slotkey, const Common::String &line);
@@ -397,15 +380,6 @@ private:
 	Common::String _fileName;
 };
 
-class ActionSetVenus : public ResultAction {
-public:
-	ActionSetVenus(ZVision *engine, int32 slotkey, const Common::String &line);
-	bool execute();
-
-private:
-	int32 _key;
-};
-
 class ActionStop : public ResultAction {
 public:
 	ActionStop(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 83be3b5ad4..fd5c158fcc 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -235,12 +235,13 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("disable_control", true)) {
 					actionList.push_back(new ActionDisableControl(_engine, slot, args));
 				} else if (act.matchString("disable_venus", true)) {
-					actionList.push_back(new ActionDisableVenus(_engine, slot, args));
+					// Not used. Purposely left empty
 				} else if (act.matchString("display_message", true)) {
 					actionList.push_back(new ActionDisplayMessage(_engine, slot, args));
 				} else if (act.matchString("dissolve", true)) {
 					actionList.push_back(new ActionDissolve(_engine));
 				} else if (act.matchString("distort", true)) {
+					// Only used by Zork: Nemesis for the "treatment" puzzle in the Sanitarium (aj30)
 					actionList.push_back(new ActionDistort(_engine, slot, args));
 				} else if (act.matchString("enable_control", true)) {
 					actionList.push_back(new ActionEnableControl(_engine, slot, args));
@@ -249,6 +250,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("inventory", true)) {
 					actionList.push_back(new ActionInventory(_engine, slot, args));
 				} else if (act.matchString("kill", true)) {
+					// Only used by ZGI
 					actionList.push_back(new ActionKill(_engine, slot, args));
 				} else if (act.matchString("menu_bar_enable", true)) {
 					actionList.push_back(new ActionMenuBarEnable(_engine, slot, args));
@@ -278,7 +280,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 				} else if (act.matchString("set_screen", true)) {
 					actionList.push_back(new ActionSetScreen(_engine, slot, args));
 				} else if (act.matchString("set_venus", true)) {
-					actionList.push_back(new ActionSetVenus(_engine, slot, args));
+					// Not used. Purposely left empty
 				} else if (act.matchString("stop", true)) {
 					actionList.push_back(new ActionStop(_engine, slot, args));
 				} else if (act.matchString("streamvideo", true)) {
-- 
cgit v1.2.3


From 4258750f5025e471ba682945e3091fdaa50c7bc9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 12:07:21 +0200
Subject: ZVISION: Rename _halveDelay to _doubleFPS, to match its config
 setting

---
 engines/zvision/zvision.cpp | 12 ++++++------
 engines/zvision/zvision.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 11e417d4ac..e9a4486ded 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -96,7 +96,7 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _menu(nullptr),
 	  _searchManager(nullptr),
 	  _textRenderer(nullptr),
-	  _halveDelay(false),
+	  _doubleFPS(false),
 	  _audioId(0),
 	  _frameRenderDelay(2),
 	  _keyboardVelocity(0),
@@ -213,7 +213,7 @@ void ZVision::initialize() {
 
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
-	_halveDelay = ConfMan.getBool("doublefps");
+	_doubleFPS = ConfMan.getBool("doublefps");
 }
 
 Common::Error ZVision::run() {
@@ -255,7 +255,7 @@ Common::Error ZVision::run() {
 		// Ensure non-negative
 		delay = delay < 0 ? 0 : delay;
 
-		if (_halveDelay) {
+		if (_doubleFPS) {
 			delay >>= 1;
 		}
 
@@ -291,7 +291,7 @@ bool ZVision::askQuestion(const Common::String &str) {
 			}
 		}
 		_system->updateScreen();
-		if (_halveDelay)
+		if (_doubleFPS)
 			_system->delayMillis(33);
 		else
 			_system->delayMillis(66);
@@ -319,7 +319,7 @@ void ZVision::delayedMessage(const Common::String &str, uint16 milsecs) {
 				break;
 		}
 		_system->updateScreen();
-		if (_halveDelay)
+		if (_doubleFPS)
 			_system->delayMillis(33);
 		else
 			_system->delayMillis(66);
@@ -365,7 +365,7 @@ bool ZVision::canRender() {
 void ZVision::updateRotation() {
 	int16 _velocity = _mouseVelocity + _keyboardVelocity;
 
-	if (_halveDelay)
+	if (_doubleFPS)
 		_velocity /= 2;
 
 	if (_velocity) {
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index e9b8ca4547..d3beae5e61 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -121,7 +121,7 @@ private:
 	int _frameRenderDelay;
 	int16 _mouseVelocity;
 	int16 _keyboardVelocity;
-	bool _halveDelay;
+	bool _doubleFPS;
 	bool _videoIsPlaying;
 
 	uint8 _cheatBuffer[KEYBUF_SIZE];
-- 
cgit v1.2.3


From 5a72eea2bb102bafb6da112ea90ad1f4af11e1f2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 12:41:36 +0200
Subject: ZVISION: Move some event/rendering code out of the main engine code

---
 engines/zvision/core/events.cpp                    |  37 ++++++-
 engines/zvision/graphics/render_manager.cpp        |  82 +++++++++++++++-
 engines/zvision/graphics/render_manager.h          |   8 +-
 .../zvision/scripting/controls/save_control.cpp    |   7 +-
 engines/zvision/zvision.cpp                        | 108 +--------------------
 engines/zvision/zvision.h                          |  13 ++-
 6 files changed, 133 insertions(+), 122 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 227cf213dc..70fd425949 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -39,6 +39,33 @@
 
 namespace ZVision {
 
+void ZVision::pushKeyToCheatBuf(uint8 key) {
+	for (int i = 0; i < KEYBUF_SIZE - 1; i++)
+		_cheatBuffer[i] = _cheatBuffer[i + 1];
+
+	_cheatBuffer[KEYBUF_SIZE - 1] = key;
+}
+
+bool ZVision::checkCode(const char *code) {
+	int codeLen = strlen(code);
+
+	if (codeLen > KEYBUF_SIZE)
+		return false;
+
+	for (int i = 0; i < codeLen; i++)
+		if (code[i] != _cheatBuffer[KEYBUF_SIZE - codeLen + i] && code[i] != '?')
+			return false;
+
+	return true;
+}
+
+uint8 ZVision::getBufferedKey(uint8 pos) {
+	if (pos >= KEYBUF_SIZE)
+		return 0;
+	else
+		return _cheatBuffer[KEYBUF_SIZE - pos - 1];
+}
+
 void ZVision::shortKeys(Common::Event event) {
 	if (event.kbd.hasFlags(Common::KBD_CTRL)) {
 		switch (event.kbd.keycode) {
@@ -70,11 +97,11 @@ void ZVision::cheatCodes(uint8 key) {
 	if (getGameId() == GID_GRANDINQUISITOR) {
 		if (checkCode("IMNOTDEAF")) {
 			// Unknown cheat
-			showDebugMsg(Common::String::format("IMNOTDEAF cheat or debug, not implemented"));
+			_renderManager->showDebugMsg(Common::String::format("IMNOTDEAF cheat or debug, not implemented"));
 		}
 
 		if (checkCode("3100OPB")) {
-			showDebugMsg(Common::String::format("Current location: %c%c%c%c",
+			_renderManager->showDebugMsg(Common::String::format("Current location: %c%c%c%c",
 			                                    _scriptManager->getStateValue(StateKey_World),
 			                                    _scriptManager->getStateValue(StateKey_Room),
 			                                    _scriptManager->getStateValue(StateKey_Node),
@@ -101,7 +128,7 @@ void ZVision::cheatCodes(uint8 key) {
 		}
 
 		if (checkCode("77MASSAVE")) {
-			showDebugMsg(Common::String::format("Current location: %c%c%c%c",
+			_renderManager->showDebugMsg(Common::String::format("Current location: %c%c%c%c",
 			                                    _scriptManager->getStateValue(StateKey_World),
 			                                    _scriptManager->getStateValue(StateKey_Room),
 			                                    _scriptManager->getStateValue(StateKey_Node),
@@ -131,13 +158,13 @@ void ZVision::cheatCodes(uint8 key) {
 	}
 
 	if (checkCode("FRAME"))
-		showDebugMsg(Common::String::format("FPS: ???, not implemented"));
+		_renderManager->showDebugMsg(Common::String::format("FPS: ???, not implemented"));
 
 	if (checkCode("XYZZY"))
 		_scriptManager->setStateValue(StateKey_DebugCheats, 1 - _scriptManager->getStateValue(StateKey_DebugCheats));
 
 	if (checkCode("COMPUTERARCH"))
-		showDebugMsg(Common::String::format("COMPUTERARCH: var-viewer not implemented"));
+		_renderManager->showDebugMsg(Common::String::format("COMPUTERARCH: var-viewer not implemented"));
 
 	if (_scriptManager->getStateValue(StateKey_DebugCheats) == 1)
 		if (checkCode("GO????"))
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 07ed6d2e2b..35e3b89b09 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -39,7 +39,7 @@
 
 namespace ZVision {
 
-RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
+RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat, bool doubleFPS)
 	: _engine(engine),
 	  _system(engine->_system),
 	  _workingWidth(workingWindow.width()),
@@ -51,7 +51,8 @@ RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowH
 	  _backgroundWidth(0),
 	  _backgroundHeight(0),
 	  _backgroundOffset(0),
-	  _renderTable(_workingWidth, _workingHeight) {
+	  _renderTable(_workingWidth, _workingHeight),
+	  _doubleFPS(doubleFPS) {
 
 	_backgroundSurface.create(_workingWidth, _workingHeight, _pixelFormat);
 	_effectSurface.create(_workingWidth, _workingHeight, _pixelFormat);
@@ -1013,4 +1014,81 @@ void RenderManager::bkgFill(uint8 r, uint8 g, uint8 b) {
 }
 #endif
 
+void RenderManager::timedMessage(const Common::String &str, uint16 milsecs) {
+	uint16 msgid = createSubArea();
+	updateSubArea(msgid, str);
+	processSubs(0);
+	renderSceneToScreen();
+	deleteSubArea(msgid, milsecs);
+}
+
+bool RenderManager::askQuestion(const Common::String &str) {
+	uint16 msgid = createSubArea();
+	updateSubArea(msgid, str);
+	processSubs(0);
+	renderSceneToScreen();
+	_engine->stopClock();
+
+	int result = 0;
+
+	while (result == 0) {
+		Common::Event evnt;
+		while (_engine->getEventManager()->pollEvent(evnt)) {
+			if (evnt.type == Common::EVENT_KEYDOWN) {
+				switch (evnt.kbd.keycode) {
+				case Common::KEYCODE_y:
+					result = 2;
+					break;
+				case Common::KEYCODE_n:
+					result = 1;
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		_system->updateScreen();
+		if (_doubleFPS)
+			_system->delayMillis(33);
+		else
+			_system->delayMillis(66);
+	}
+	deleteSubArea(msgid);
+	_engine->startClock();
+	return result == 2;
+}
+
+void RenderManager::delayedMessage(const Common::String &str, uint16 milsecs) {
+	uint16 msgid = createSubArea();
+	updateSubArea(msgid, str);
+	processSubs(0);
+	renderSceneToScreen();
+	_engine->stopClock();
+
+	uint32 stopTime = _system->getMillis() + milsecs;
+	while (_system->getMillis() < stopTime) {
+		Common::Event evnt;
+		while (_engine->getEventManager()->pollEvent(evnt)) {
+			if (evnt.type == Common::EVENT_KEYDOWN &&
+			        (evnt.kbd.keycode == Common::KEYCODE_SPACE ||
+			         evnt.kbd.keycode == Common::KEYCODE_RETURN ||
+			         evnt.kbd.keycode == Common::KEYCODE_ESCAPE))
+				break;
+		}
+		_system->updateScreen();
+		if (_doubleFPS)
+			_system->delayMillis(33);
+		else
+			_system->delayMillis(66);
+	}
+	deleteSubArea(msgid);
+	_engine->startClock();
+}
+
+void RenderManager::showDebugMsg(const Common::String &msg, int16 delay) {
+	uint16 msgid = createSubArea();
+	updateSubArea(msgid, msg);
+	deleteSubArea(msgid, delay);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index d67ae29a3a..dbaa8fdc50 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -48,7 +48,7 @@ namespace ZVision {
 
 class RenderManager {
 public:
-	RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat);
+	RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat, bool doubleFPS);
 	~RenderManager();
 
 private:
@@ -137,6 +137,7 @@ private:
 	// Visual effects list
 	EffectsList _effects;
 
+	bool _doubleFPS;
 	
 public:
 	void initialize();
@@ -334,6 +335,11 @@ public:
 	// Fill background surface by color
 	void bkgFill(uint8 r, uint8 g, uint8 b);
 #endif
+
+	bool askQuestion(const Common::String &str);
+	void delayedMessage(const Common::String &str, uint16 milsecs);
+	void timedMessage(const Common::String &str, uint16 milsecs);
+	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index 3a4dc47fe8..6cedddffeb 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -30,6 +30,7 @@
 #include "zvision/text/string_manager.h"
 
 #include "zvision/file/save_manager.h"
+#include "zvision/graphics/render_manager.h"
 
 #include "common/str.h"
 #include "common/stream.h"
@@ -97,18 +98,18 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 					if (inp->getText().size() > 0) {
 						bool toSave = true;
 						if (iter->exist)
-							if (!_engine->askQuestion(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEXIST)))
+							if (!_engine->getRenderManager()->askQuestion(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEXIST)))
 								toSave = false;
 
 						if (toSave) {
 							// FIXME: At this point, the screen shows the save control, so the save game thumbnails will always
 							// show the save control
 							_engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText());
-							_engine->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
+							_engine->getRenderManager()->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
 							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
 						}
 					} else {
-						_engine->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000);
+						_engine->getRenderManager()->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000);
 					}
 				} else {
 					_engine->getSaveManager()->loadGame(iter->saveId);
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index e9a4486ded..575a7af6ab 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -190,7 +190,7 @@ void ZVision::initialize() {
 
 	// Create managers
 	_scriptManager = new ScriptManager(this);
-	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat);
+	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat, _doubleFPS);
 	_saveManager = new SaveManager(this);
 	_stringManager = new StringManager(this);
 	_cursorManager = new CursorManager(this, _resourcePixelFormat);
@@ -265,77 +265,6 @@ Common::Error ZVision::run() {
 	return Common::kNoError;
 }
 
-bool ZVision::askQuestion(const Common::String &str) {
-	uint16 msgid = _renderManager->createSubArea();
-	_renderManager->updateSubArea(msgid, str);
-	_renderManager->processSubs(0);
-	_renderManager->renderSceneToScreen();
-	_clock.stop();
-
-	int result = 0;
-
-	while (result == 0) {
-		Common::Event evnt;
-		while (_eventMan->pollEvent(evnt)) {
-			if (evnt.type == Common::EVENT_KEYDOWN) {
-				switch (evnt.kbd.keycode) {
-				case Common::KEYCODE_y:
-					result = 2;
-					break;
-				case Common::KEYCODE_n:
-					result = 1;
-					break;
-				default:
-					break;
-				}
-			}
-		}
-		_system->updateScreen();
-		if (_doubleFPS)
-			_system->delayMillis(33);
-		else
-			_system->delayMillis(66);
-	}
-	_renderManager->deleteSubArea(msgid);
-	_clock.start();
-	return result == 2;
-}
-
-void ZVision::delayedMessage(const Common::String &str, uint16 milsecs) {
-	uint16 msgid = _renderManager->createSubArea();
-	_renderManager->updateSubArea(msgid, str);
-	_renderManager->processSubs(0);
-	_renderManager->renderSceneToScreen();
-	_clock.stop();
-
-	uint32 stopTime = _system->getMillis() + milsecs;
-	while (_system->getMillis() < stopTime) {
-		Common::Event evnt;
-		while (_eventMan->pollEvent(evnt)) {
-			if (evnt.type == Common::EVENT_KEYDOWN &&
-			        (evnt.kbd.keycode == Common::KEYCODE_SPACE ||
-			         evnt.kbd.keycode == Common::KEYCODE_RETURN ||
-			         evnt.kbd.keycode == Common::KEYCODE_ESCAPE))
-				break;
-		}
-		_system->updateScreen();
-		if (_doubleFPS)
-			_system->delayMillis(33);
-		else
-			_system->delayMillis(66);
-	}
-	_renderManager->deleteSubArea(msgid);
-	_clock.start();
-}
-
-void ZVision::timedMessage(const Common::String &str, uint16 milsecs) {
-	uint16 msgid = _renderManager->createSubArea();
-	_renderManager->updateSubArea(msgid, str);
-	_renderManager->processSubs(0);
-	_renderManager->renderSceneToScreen();
-	_renderManager->deleteSubArea(msgid, milsecs);
-}
-
 void ZVision::pauseEngineIntern(bool pause) {
 	_mixer->pauseAll(pause);
 
@@ -506,44 +435,11 @@ uint16 ZVision::getMenuBarEnable() {
 }
 
 bool ZVision::ifQuit() {
-	if (askQuestion(_stringManager->getTextLine(StringManager::ZVISION_STR_EXITPROMT))) {
+	if (_renderManager->askQuestion(_stringManager->getTextLine(StringManager::ZVISION_STR_EXITPROMT))) {
 		quitGame();
 		return true;
 	}
 	return false;
 }
 
-void ZVision::pushKeyToCheatBuf(uint8 key) {
-	for (int i = 0; i < KEYBUF_SIZE - 1; i++)
-		_cheatBuffer[i] = _cheatBuffer[i + 1];
-
-	_cheatBuffer[KEYBUF_SIZE - 1] = key;
-}
-
-bool ZVision::checkCode(const char *code) {
-	int codeLen = strlen(code);
-
-	if (codeLen > KEYBUF_SIZE)
-		return false;
-
-	for (int i = 0; i < codeLen; i++)
-		if (code[i] != _cheatBuffer[KEYBUF_SIZE - codeLen + i] && code[i] != '?')
-			return false;
-
-	return true;
-}
-
-uint8 ZVision::getBufferedKey(uint8 pos) {
-	if (pos >= KEYBUF_SIZE)
-		return 0;
-	else
-		return _cheatBuffer[KEYBUF_SIZE - pos - 1];
-}
-
-void ZVision::showDebugMsg(const Common::String &msg, int16 delay) {
-	uint16 msgid = _renderManager->createSubArea();
-	_renderManager->updateSubArea(msgid, msg);
-	_renderManager->deleteSubArea(msgid, delay);
-}
-
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index d3beae5e61..848b278f69 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -164,6 +164,14 @@ public:
 
 	uint8 getZvisionKey(Common::KeyCode scummKeyCode);
 
+	void startClock() {
+		_clock.start();
+	}
+
+	void stopClock() {
+		_clock.stop();
+	}
+
 	/**
 	 * Play a video until it is finished. This is a blocking call. It will call
 	 * _clock.stop() when the video starts and _clock.start() when the video finishes.
@@ -181,10 +189,6 @@ public:
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
-	bool askQuestion(const Common::String &str);
-	void delayedMessage(const Common::String &str, uint16 milsecs);
-	void timedMessage(const Common::String &str, uint16 milsecs);
-
 	void setRenderDelay(uint);
 	bool canRender();
 
@@ -197,7 +201,6 @@ public:
 	bool ifQuit();
 
 	void checkBorders();
-	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
 
 	// Engine features
 	bool hasFeature(EngineFeature f) const;
-- 
cgit v1.2.3


From e8820d26e7d673f96c416f93dd16811107e94cb4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 12:42:01 +0200
Subject: ZVISION: Fix a warning

---
 engines/zvision/scripting/controls/input_control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index e1e6e6ec9d..4abc0c9e1b 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -223,7 +223,7 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 		if (needDraw) {
 			_animation->seekToFrame(_frame);
 			const Graphics::Surface *srf = _animation->decodeNextFrame();
-			uint32 xx = _textRectangle.left + _txtWidth;
+			int16 xx = _textRectangle.left + _txtWidth;
 			if (xx >= _textRectangle.left + (_textRectangle.width() - (int16)_animation->getWidth()))
 				xx = _textRectangle.left + _textRectangle.width() - (int16)_animation->getWidth();
 			_engine->getRenderManager()->blitSurfaceToBkg(*srf, xx, _textRectangle.top);
-- 
cgit v1.2.3


From eea1ee445fcac7ecc53e31d258aac697d6b242f1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 13:14:24 +0200
Subject: ZVISION: Move more graphics code out of the main engine code

---
 engines/zvision/core/events.cpp              |  17 ++-
 engines/zvision/graphics/render_manager.cpp  | 133 +++++++++++++++++++++++
 engines/zvision/graphics/render_manager.h    |   4 +
 engines/zvision/scripting/actions.cpp        |   5 +-
 engines/zvision/scripting/script_manager.cpp |   5 +-
 engines/zvision/zvision.cpp                  | 155 +--------------------------
 engines/zvision/zvision.h                    |  17 +--
 7 files changed, 167 insertions(+), 169 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 70fd425949..5f29a6879c 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -30,6 +30,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/scripting/menu.h"
 #include "zvision/sound/zork_raw.h"
+#include "zvision/text/string_manager.h"
 
 #include "common/events.h"
 #include "common/system.h"
@@ -70,19 +71,19 @@ void ZVision::shortKeys(Common::Event event) {
 	if (event.kbd.hasFlags(Common::KBD_CTRL)) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_s:
-			if (getMenuBarEnable() & kMenubarSave)
+			if (_menu->getEnable() & kMenubarSave)
 				_scriptManager->changeLocation('g', 'j', 's', 'e', 0);
 			break;
 		case Common::KEYCODE_r:
-			if (getMenuBarEnable() & kMenubarRestore)
+			if (_menu->getEnable() & kMenubarRestore)
 				_scriptManager->changeLocation('g', 'j', 'r', 'e', 0);
 			break;
 		case Common::KEYCODE_p:
-			if (getMenuBarEnable() & kMenubarSettings)
+			if (_menu->getEnable() & kMenubarSettings)
 				_scriptManager->changeLocation('g', 'j', 'p', 'e', 0);
 			break;
 		case Common::KEYCODE_q:
-			if (getMenuBarEnable() & kMenubarExit)
+			if (_menu->getEnable() & kMenubarExit)
 				ifQuit();
 			break;
 		default:
@@ -482,4 +483,12 @@ uint8 ZVision::getZvisionKey(Common::KeyCode scummKeyCode) {
 	return 0;
 }
 
+bool ZVision::ifQuit() {
+	if (_renderManager->askQuestion(_stringManager->getTextLine(StringManager::ZVISION_STR_EXITPROMT))) {
+		quitGame();
+		return true;
+	}
+	return false;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 35e3b89b09..0a48ae6c16 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -1091,4 +1091,137 @@ void RenderManager::showDebugMsg(const Common::String &msg, int16 delay) {
 	deleteSubArea(msgid, delay);
 }
 
+void RenderManager::updateRotation() {
+	int16 _velocity = _engine->getMouseVelocity() + _engine->getKeyboardVelocity();
+	ScriptManager *scriptManager = _engine->getScriptManager();
+
+	if (_doubleFPS)
+		_velocity /= 2;
+
+	if (_velocity) {
+		RenderTable::RenderState renderState = _renderTable.getRenderState();
+		if (renderState == RenderTable::PANORAMA) {
+			int16 startPosition = scriptManager->getStateValue(StateKey_ViewPos);
+
+			int16 newPosition = startPosition + (_renderTable.getPanoramaReverse() ? -_velocity : _velocity);
+
+			int16 zeroPoint = _renderTable.getPanoramaZeroPoint();
+			if (startPosition >= zeroPoint && newPosition < zeroPoint)
+				scriptManager->setStateValue(StateKey_Rounds, scriptManager->getStateValue(StateKey_Rounds) - 1);
+			if (startPosition <= zeroPoint && newPosition > zeroPoint)
+				scriptManager->setStateValue(StateKey_Rounds, scriptManager->getStateValue(StateKey_Rounds) + 1);
+
+			int16 screenWidth = getBkgSize().x;
+			if (screenWidth)
+				newPosition %= screenWidth;
+
+			if (newPosition < 0)
+				newPosition += screenWidth;
+
+			setBackgroundPosition(newPosition);
+		} else if (renderState == RenderTable::TILT) {
+			int16 startPosition = scriptManager->getStateValue(StateKey_ViewPos);
+
+			int16 newPosition = startPosition + _velocity;
+
+			int16 screenHeight = getBkgSize().y;
+			int16 tiltGap = _renderTable.getTiltGap();
+
+			if (newPosition >= (screenHeight - tiltGap))
+				newPosition = screenHeight - tiltGap;
+			if (newPosition <= tiltGap)
+				newPosition = tiltGap;
+
+			setBackgroundPosition(newPosition);
+		}
+	}
+}
+
+void RenderManager::checkBorders() {
+	RenderTable::RenderState renderState = _renderTable.getRenderState();
+	if (renderState == RenderTable::PANORAMA) {
+		int16 startPosition = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
+
+		int16 newPosition = startPosition;
+
+		int16 screenWidth = getBkgSize().x;
+
+		if (screenWidth)
+			newPosition %= screenWidth;
+
+		if (newPosition < 0)
+			newPosition += screenWidth;
+
+		if (startPosition != newPosition)
+			setBackgroundPosition(newPosition);
+	} else if (renderState == RenderTable::TILT) {
+		int16 startPosition = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
+
+		int16 newPosition = startPosition;
+
+		int16 screenHeight = getBkgSize().y;
+		int16 tiltGap = _renderTable.getTiltGap();
+
+		if (newPosition >= (screenHeight - tiltGap))
+			newPosition = screenHeight - tiltGap;
+		if (newPosition <= tiltGap)
+			newPosition = tiltGap;
+
+		if (startPosition != newPosition)
+			setBackgroundPosition(newPosition);
+	}
+}
+
+void RenderManager::rotateTo(int16 _toPos, int16 _time) {
+	if (_renderTable.getRenderState() != RenderTable::PANORAMA)
+		return;
+
+	if (_time == 0)
+		_time = 1;
+
+	int32 maxX = getBkgSize().x;
+	int32 curX = getCurrentBackgroundOffset();
+	int32 dx = 0;
+
+	if (curX == _toPos)
+		return;
+
+	if (curX > _toPos) {
+		if (curX - _toPos > maxX / 2)
+			dx = (_toPos + (maxX - curX)) / _time;
+		else
+			dx = -(curX - _toPos) / _time;
+	} else {
+		if (_toPos - curX > maxX / 2)
+			dx = -((maxX - _toPos) + curX) / _time;
+		else
+			dx = (_toPos - curX) / _time;
+	}
+
+	_engine->stopClock();
+
+	for (int16 i = 0; i <= _time; i++) {
+		if (i == _time)
+			curX = _toPos;
+		else
+			curX += dx;
+
+		if (curX < 0)
+			curX = maxX - curX;
+		else if (curX >= maxX)
+			curX %= maxX;
+
+		setBackgroundPosition(curX);
+
+		prepareBackground();
+		renderSceneToScreen();
+
+		_system->updateScreen();
+
+		_system->delayMillis(500 / _time);
+	}
+
+	_engine->startClock();
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index dbaa8fdc50..30e51456e9 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -340,6 +340,10 @@ public:
 	void delayedMessage(const Common::String &str, uint16 milsecs);
 	void timedMessage(const Common::String &str, uint16 milsecs);
 	void showDebugMsg(const Common::String &msg, int16 delay = 3000);
+
+	void checkBorders();
+	void rotateTo(int16 to, int16 time);
+	void updateRotation();
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index c26a93f529..7c3463b6d0 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -30,6 +30,7 @@
 #include "zvision/sound/zork_raw.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/file/save_manager.h"
+#include "zvision/scripting/menu.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 #include "zvision/scripting/sidefx/music_node.h"
 #include "zvision/scripting/sidefx/syncsound_node.h"
@@ -439,7 +440,7 @@ ActionMenuBarEnable::ActionMenuBarEnable(ZVision *engine, int32 slotkey, const C
 }
 
 bool ActionMenuBarEnable::execute() {
-	_engine->menuBarEnable(_menus);
+	_engine->getMenuHandler()->setEnable(_menus);
 	return true;
 }
 
@@ -819,7 +820,7 @@ ActionRotateTo::ActionRotateTo(ZVision *engine, int32 slotkey, const Common::Str
 }
 
 bool ActionRotateTo::execute() {
-	_engine->rotateTo(_toPos, _time);
+	_engine->getRenderManager()->rotateTo(_toPos, _time);
 
 	return true;
 }
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 2a4aa5fed0..1a2b8362f5 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -29,6 +29,7 @@
 #include "zvision/graphics/cursors/cursor_manager.h"
 #include "zvision/file/save_manager.h"
 #include "zvision/scripting/actions.h"
+#include "zvision/scripting/menu.h"
 #include "zvision/scripting/sidefx/timer_node.h"
 
 #include "common/algorithm.h"
@@ -583,7 +584,7 @@ void ScriptManager::ChangeLocationReal() {
 	_referenceTable.clear();
 	addPuzzlesToReferenceTable(universe);
 
-	_engine->menuBarEnable(0xFFFF);
+	_engine->getMenuHandler()->setEnable(0xFFFF);
 
 	if (_nextLocation.world != _currentLocation.world) {
 		cleanScriptScope(nodeview);
@@ -652,7 +653,7 @@ void ScriptManager::ChangeLocationReal() {
 		execScope(nodeview);
 	}
 
-	_engine->checkBorders();
+	_engine->getRenderManager()->checkBorders();
 }
 
 void ScriptManager::serialize(Common::WriteStream *stream) {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 575a7af6ab..bd215f4f62 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -232,7 +232,7 @@ Common::Error ZVision::run() {
 		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
 
 		processEvents();
-		updateRotation();
+		_renderManager->updateRotation();
 
 		_scriptManager->update(deltaTime);
 		_menu->process(deltaTime);
@@ -244,7 +244,7 @@ Common::Error ZVision::run() {
 		_renderManager->renderSceneToScreen();
 
 		// Update the screen
-		if (_frameRenderDelay <= 0) {
+		if (canRender()) {
 			_system->updateScreen();
 		} else {
 			_frameRenderDelay--;
@@ -291,155 +291,4 @@ bool ZVision::canRender() {
 	return _frameRenderDelay <= 0;
 }
 
-void ZVision::updateRotation() {
-	int16 _velocity = _mouseVelocity + _keyboardVelocity;
-
-	if (_doubleFPS)
-		_velocity /= 2;
-
-	if (_velocity) {
-		RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
-		if (renderState == RenderTable::PANORAMA) {
-			int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
-
-			int16 newPosition = startPosition + (_renderManager->getRenderTable()->getPanoramaReverse() ? -_velocity : _velocity);
-
-			int16 zeroPoint = _renderManager->getRenderTable()->getPanoramaZeroPoint();
-			if (startPosition >= zeroPoint && newPosition < zeroPoint)
-				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) - 1);
-			if (startPosition <= zeroPoint && newPosition > zeroPoint)
-				_scriptManager->setStateValue(StateKey_Rounds, _scriptManager->getStateValue(StateKey_Rounds) + 1);
-
-			int16 screenWidth = _renderManager->getBkgSize().x;
-			if (screenWidth)
-				newPosition %= screenWidth;
-
-			if (newPosition < 0)
-				newPosition += screenWidth;
-
-			_renderManager->setBackgroundPosition(newPosition);
-		} else if (renderState == RenderTable::TILT) {
-			int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
-
-			int16 newPosition = startPosition + _velocity;
-
-			int16 screenHeight = _renderManager->getBkgSize().y;
-			int16 tiltGap = _renderManager->getRenderTable()->getTiltGap();
-
-			if (newPosition >= (screenHeight - tiltGap))
-				newPosition = screenHeight - tiltGap;
-			if (newPosition <= tiltGap)
-				newPosition = tiltGap;
-
-			_renderManager->setBackgroundPosition(newPosition);
-		}
-	}
-}
-
-void ZVision::checkBorders() {
-	RenderTable::RenderState renderState = _renderManager->getRenderTable()->getRenderState();
-	if (renderState == RenderTable::PANORAMA) {
-		int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
-
-		int16 newPosition = startPosition;
-
-		int16 screenWidth = _renderManager->getBkgSize().x;
-
-		if (screenWidth)
-			newPosition %= screenWidth;
-
-		if (newPosition < 0)
-			newPosition += screenWidth;
-
-		if (startPosition != newPosition)
-			_renderManager->setBackgroundPosition(newPosition);
-	} else if (renderState == RenderTable::TILT) {
-		int16 startPosition = _scriptManager->getStateValue(StateKey_ViewPos);
-
-		int16 newPosition = startPosition;
-
-		int16 screenHeight = _renderManager->getBkgSize().y;
-		int16 tiltGap = _renderManager->getRenderTable()->getTiltGap();
-
-		if (newPosition >= (screenHeight - tiltGap))
-			newPosition = screenHeight - tiltGap;
-		if (newPosition <= tiltGap)
-			newPosition = tiltGap;
-
-		if (startPosition != newPosition)
-			_renderManager->setBackgroundPosition(newPosition);
-	}
-}
-
-void ZVision::rotateTo(int16 _toPos, int16 _time) {
-	if (_renderManager->getRenderTable()->getRenderState() != RenderTable::PANORAMA)
-		return;
-
-	if (_time == 0)
-		_time = 1;
-
-	int32 maxX = _renderManager->getBkgSize().x;
-	int32 curX = _renderManager->getCurrentBackgroundOffset();
-	int32 dx = 0;
-
-	if (curX == _toPos)
-		return;
-
-	if (curX > _toPos) {
-		if (curX - _toPos > maxX / 2)
-			dx = (_toPos + (maxX - curX)) / _time;
-		else
-			dx = -(curX - _toPos) / _time;
-	} else {
-		if (_toPos - curX > maxX / 2)
-			dx = -((maxX - _toPos) + curX) / _time;
-		else
-			dx = (_toPos - curX) / _time;
-	}
-
-	_clock.stop();
-
-	for (int16 i = 0; i <= _time; i++) {
-		if (i == _time)
-			curX = _toPos;
-		else
-			curX += dx;
-
-		if (curX < 0)
-			curX = maxX - curX;
-		else if (curX >= maxX)
-			curX %= maxX;
-
-		_renderManager->setBackgroundPosition(curX);
-
-		_renderManager->prepareBackground();
-		_renderManager->renderSceneToScreen();
-
-		_system->updateScreen();
-
-		_system->delayMillis(500 / _time);
-	}
-
-	_clock.start();
-}
-
-void ZVision::menuBarEnable(uint16 menus) {
-	if (_menu)
-		_menu->setEnable(menus);
-}
-
-uint16 ZVision::getMenuBarEnable() {
-	if (_menu)
-		return _menu->getEnable();
-	return 0;
-}
-
-bool ZVision::ifQuit() {
-	if (_renderManager->askQuestion(_stringManager->getTextLine(StringManager::ZVISION_STR_EXITPROMT))) {
-		quitGame();
-		return true;
-	}
-	return false;
-}
-
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 848b278f69..dc1ac1b8cb 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -155,12 +155,21 @@ public:
 	MidiManager *getMidiManager() const {
 		return _midiManager;
 	}
+	MenuHandler *getMenuHandler() const {
+		return _menu;
+	}
 	Common::RandomSource *getRandomSource() const {
 		return _rnd;
 	}
 	ZVisionGameId getGameId() const {
 		return _gameDescription->gameId;
 	}
+	int16 getKeyboardVelocity() const {
+		return _keyboardVelocity;
+	}
+	int16 getMouseVelocity() const {
+		return _mouseVelocity;
+	}
 
 	uint8 getZvisionKey(Common::KeyCode scummKeyCode);
 
@@ -184,8 +193,6 @@ public:
 	void playVideo(Video::VideoDecoder &videoDecoder, const Common::Rect &destRect = Common::Rect(0, 0, 0, 0), bool skippable = true, Subtitle *sub = NULL);
 	Video::VideoDecoder *loadAnimation(const Common::String &fileName);
 
-	void rotateTo(int16 to, int16 time);
-
 	Common::String generateSaveFileName(uint slot);
 	Common::String generateAutoSaveFileName();
 
@@ -195,13 +202,8 @@ public:
 	void loadSettings();
 	void saveSettings();
 
-	void menuBarEnable(uint16 menus);
-	uint16 getMenuBarEnable();
-
 	bool ifQuit();
 
-	void checkBorders();
-
 	// Engine features
 	bool hasFeature(EngineFeature f) const;
 	bool canLoadGameStateCurrently();
@@ -218,7 +220,6 @@ private:
 	void processEvents();
 
 	void onMouseMove(const Common::Point &pos);
-	void updateRotation();
 
 	void registerDefaultSettings();
 	void shortKeys(Common::Event);
-- 
cgit v1.2.3


From e5f0ee2271f4a43ff05b82380ab22eade9763702 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 18:22:18 +0200
Subject: ZVISION: Implement auto-saving

---
 engines/zvision/detection.cpp                |  5 +++++
 engines/zvision/file/save_manager.cpp        | 14 +++++---------
 engines/zvision/file/save_manager.h          | 10 +++++++---
 engines/zvision/scripting/script_manager.cpp |  4 ----
 engines/zvision/zvision.cpp                  |  8 ++++----
 engines/zvision/zvision.h                    |  1 -
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index a361239e9e..4fcb5c040b 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -308,6 +308,11 @@ SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, in
 	    if (successfulRead) {
 	        SaveStateDescriptor desc(slot, header.saveName);
 
+			// Do not allow save slot 0 (used for auto-saving) to be deleted or
+			// overwritten.
+			desc.setDeletableFlag(slot != 0);
+			desc.setWriteProtectedFlag(slot == 0);
+
 	        desc.setThumbnail(header.thumbnail);
 
 	        if (header.version > 0) {
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 05df834497..042fafd38e 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -87,6 +87,8 @@ void SaveManager::saveGame(uint slot, const Common::String &saveName) {
 
 	file->finalize();
 	delete file;
+
+	_lastSaveTime = g_system->getMillis();
 }
 
 void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream) {
@@ -99,6 +101,8 @@ void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::Me
 
 	file->finalize();
 	delete file;
+
+	_lastSaveTime = g_system->getMillis();
 }
 
 void SaveManager::saveGameBuffered(uint slot, const Common::String &saveName) {
@@ -109,15 +113,7 @@ void SaveManager::saveGameBuffered(uint slot, const Common::String &saveName) {
 }
 
 void SaveManager::autoSave() {
-	Common::OutSaveFile *file = g_system->getSavefileManager()->openForSaving(_engine->generateAutoSaveFileName());
-
-	writeSaveGameHeader(file, "auto");
-
-	_engine->getScriptManager()->serialize(file);
-
-	// Cleanup
-	file->finalize();
-	delete file;
+	saveGame(0, "Auto save");
 }
 
 void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName) {
diff --git a/engines/zvision/file/save_manager.h b/engines/zvision/file/save_manager.h
index 75841331e7..fc8db67566 100644
--- a/engines/zvision/file/save_manager.h
+++ b/engines/zvision/file/save_manager.h
@@ -48,13 +48,18 @@ struct SaveGameHeader {
 
 class SaveManager {
 public:
-	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL) {}
+	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL), _lastSaveTime(0) {}
 	~SaveManager() {
 		flushSaveBuffer();
 	}
 
+	uint32 getLastSaveTime() const {
+		return _lastSaveTime;
+	}
+
 private:
 	ZVision *_engine;
+	uint32 _lastSaveTime;
 	static const uint32 SAVEGAME_ID;
 
 	enum {
@@ -67,8 +72,7 @@ private:
 public:
 	/**
 	 * Called every room change. Saves the state of the room just before
-	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to
-	 * create the save file name.
+	 * the room changes.
 	 */
 	void autoSave();
 	/**
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 1a2b8362f5..d0ebb18944 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -569,10 +569,6 @@ void ScriptManager::ChangeLocationReal() {
 	} else {
 		if (_currentLocation.world == 'g' && _currentLocation.room == 'j')
 			_engine->getSaveManager()->flushSaveBuffer();
-		else {
-			// Auto save
-			//_engine->getSaveManager()->autoSave();
-		}
 	}
 
 	setStateValue(StateKey_World, _nextLocation.world);
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index bd215f4f62..b3fc02ee15 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -259,6 +259,10 @@ Common::Error ZVision::run() {
 			delay >>= 1;
 		}
 
+		if (canSaveGameStateCurrently() && shouldPerformAutoSave(_saveManager->getLastSaveTime())) {
+			_saveManager->autoSave();
+		}
+
 		_system->delayMillis(delay);
 	}
 
@@ -279,10 +283,6 @@ Common::String ZVision::generateSaveFileName(uint slot) {
 	return Common::String::format("%s.%03u", _targetName.c_str(), slot);
 }
 
-Common::String ZVision::generateAutoSaveFileName() {
-	return Common::String::format("%s.auto", _targetName.c_str());
-}
-
 void ZVision::setRenderDelay(uint delay) {
 	_frameRenderDelay = delay;
 }
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index dc1ac1b8cb..6664d0cd5d 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -194,7 +194,6 @@ public:
 	Video::VideoDecoder *loadAnimation(const Common::String &fileName);
 
 	Common::String generateSaveFileName(uint slot);
-	Common::String generateAutoSaveFileName();
 
 	void setRenderDelay(uint);
 	bool canRender();
-- 
cgit v1.2.3


From 2becc76d5c16d15d5a7a6733b40f7c59e7391c12 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 19:56:37 +0200
Subject: ZVISION: Correct the script names of the location-specific cheats

---
 engines/zvision/core/events.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 5f29a6879c..4438474078 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -119,9 +119,9 @@ void ZVision::cheatCodes(uint8 key) {
 		}
 
 		// There are 3 more cheats in script files:
-		// - "EAT ME": gjcr.scr
-		// - "WHOAMI": hp1e.scr
-		// - "HUISOK": uh1f.scr
+		// - "WHOAMI": gjcr.scr
+		// - "HUISOK": hp1e.scr
+		// - "EAT ME": uh1f.scr
 	} else if (getGameId() == GID_NEMESIS) {
 		if (checkCode("CHLOE")) {
 			_scriptManager->changeLocation('t', 'm', '2', 'g', 0);
-- 
cgit v1.2.3


From db37cfb1b04fb6d1fb21ef3bd3c0b90128bf4d89 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 22:30:32 +0200
Subject: ZVISION: Remove duplicate blitting code for images and animations

---
 engines/zvision/graphics/render_manager.cpp        | 67 +++++-----------------
 engines/zvision/graphics/render_manager.h          | 11 +---
 engines/zvision/scripting/actions.cpp              | 12 ++++
 .../zvision/scripting/sidefx/animation_node.cpp    | 10 +---
 engines/zvision/text/text.cpp                      |  7 ++-
 5 files changed, 36 insertions(+), 71 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 0a48ae6c16..7bbde81e4c 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -104,7 +104,8 @@ void RenderManager::renderSceneToScreen() {
 					post = (*it)->draw(_currentBackgroundImage.getSubArea(rect));
 				else
 					post = (*it)->draw(_effectSurface.getSubArea(rect));
-				blitSurfaceToSurface(*post, _effectSurface, screenSpaceLocation.left, screenSpaceLocation.top);
+				Common::Rect empty;
+				blitSurfaceToSurface(*post, empty, _effectSurface, screenSpaceLocation.left, screenSpaceLocation.top);
 				screenSpaceLocation.clip(windowRect);
 				if (_backgroundSurfaceDirtyRect .isEmpty()) {
 					_backgroundSurfaceDirtyRect = screenSpaceLocation;
@@ -511,30 +512,12 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	delete srcAdapted;
 }
 
-void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y) {
+void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, int32 colorkey) {
 	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, dst, x, y);
-}
-
-void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey) {
-	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, dst, x, y, colorkey);
-}
-
-void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y) {
-	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _currentBackgroundImage, x, y);
-	Common::Rect dirty(src.w, src.h);
-	dirty.translate(x, y);
-	if (_backgroundDirtyRect.isEmpty())
-		_backgroundDirtyRect = dirty;
+	if (colorkey >= 0)
+		blitSurfaceToSurface(src, empt, _currentBackgroundImage, x, y, colorkey);
 	else
-		_backgroundDirtyRect.extend(dirty);
-}
-
-void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey) {
-	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _currentBackgroundImage, x, y, colorkey);
+		blitSurfaceToSurface(src, empt, _currentBackgroundImage, x, y);
 	Common::Rect dirty(src.w, src.h);
 	dirty.translate(x, y);
 	if (_backgroundDirtyRect.isEmpty())
@@ -543,23 +526,10 @@ void RenderManager::blitSurfaceToBkg(const Graphics::Surface &src, int x, int y,
 		_backgroundDirtyRect.extend(dirty);
 }
 
-void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect) {
-	if (src.w == _dstRect.width() && src.h == _dstRect.height())
-		blitSurfaceToBkg(src, _dstRect.left, _dstRect.top);
-	else {
-		Graphics::Surface *tmp = new Graphics::Surface;
-		tmp->create(_dstRect.width(), _dstRect.height(), src.format);
-		scaleBuffer(src.getPixels(), tmp->getPixels(), src.w, src.h, src.format.bytesPerPixel, _dstRect.width(), _dstRect.height());
-		blitSurfaceToBkg(*tmp, _dstRect.left, _dstRect.top);
-		tmp->free();
-		delete tmp;
-	}
-}
-
-void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, uint32 colorkey) {
-	if (src.w == _dstRect.width() && src.h == _dstRect.height())
+void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, int32 colorkey) {
+	if (src.w == _dstRect.width() && src.h == _dstRect.height()) {
 		blitSurfaceToBkg(src, _dstRect.left, _dstRect.top, colorkey);
-	else {
+	} else {
 		Graphics::Surface *tmp = new Graphics::Surface;
 		tmp->create(_dstRect.width(), _dstRect.height(), src.format);
 		scaleBuffer(src.getPixels(), tmp->getPixels(), src.w, src.h, src.format.bytesPerPixel, _dstRect.width(), _dstRect.height());
@@ -569,20 +539,12 @@ void RenderManager::blitSurfaceToBkgScaled(const Graphics::Surface &src, const C
 	}
 }
 
-void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y) {
+void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, int32 colorkey) {
 	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _menuSurface, x, y);
-	Common::Rect dirty(src.w, src.h);
-	dirty.translate(x, y);
-	if (_menuSurfaceDirtyRect.isEmpty())
-		_menuSurfaceDirtyRect = dirty;
+	if (colorkey >= 0)
+		blitSurfaceToSurface(src, empt, _menuSurface, x, y, colorkey);
 	else
-		_menuSurfaceDirtyRect.extend(dirty);
-}
-
-void RenderManager::blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey) {
-	Common::Rect empt;
-	blitSurfaceToSurface(src, empt, _menuSurface, x, y, colorkey);
+		blitSurfaceToSurface(src, empt, _menuSurface, x, y);
 	Common::Rect dirty(src.w, src.h);
 	dirty.translate(x, y);
 	if (_menuSurfaceDirtyRect.isEmpty())
@@ -803,7 +765,8 @@ void RenderManager::processSubs(uint16 deltatime) {
 				Graphics::Surface *rndr = new Graphics::Surface();
 				rndr->create(sub->r.width(), sub->r.height(), _engine->_resourcePixelFormat);
 				_engine->getTextRenderer()->drawTxtInOneLine(sub->txt, *rndr);
-				blitSurfaceToSurface(*rndr, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
+				Common::Rect empty;
+				blitSurfaceToSurface(*rndr, empty, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
 				rndr->free();
 				delete rndr;
 			}
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 30e51456e9..a7e49b7758 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -230,20 +230,15 @@ public:
 	// Blitting surface-to-surface methods
 	void blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int x, int y);
 	void blitSurfaceToSurface(const Graphics::Surface &src, const Common::Rect &_srcRect , Graphics::Surface &dst, int _x, int _y, uint32 colorkey);
-	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y);
-	void blitSurfaceToSurface(const Graphics::Surface &src, Graphics::Surface &dst, int x, int y, uint32 colorkey);
 
 	// Blitting surface-to-background methods
-	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y);
-	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, uint32 colorkey);
+	void blitSurfaceToBkg(const Graphics::Surface &src, int x, int y, int32 colorkey = -1);
 
 	// Blitting surface-to-background methods with scale
-	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect);
-	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, uint32 colorkey);
+	void blitSurfaceToBkgScaled(const Graphics::Surface &src, const Common::Rect &_dstRect, int32 colorkey = -1);
 
 	// Blitting surface-to-menu methods
-	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y);
-	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, uint32 colorkey);
+	void blitSurfaceToMenu(const Graphics::Surface &src, int x, int y, int32 colorkey = -1);
 
 	// Subtitles methods
 
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 7c3463b6d0..a91476760d 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -566,6 +566,12 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, c
 	// The two %*u are usually 0 and dont seem to have a use
 	sscanf(line.c_str(), "%24s %*u %*u %d %d", fileName, &_mask, &_framerate);
 
+	// Mask 0 means "no transparency" in this case. Since we use a common blitting
+	// code for images and animations, we set it to -1 to avoid confusion with
+	// color 0, which is used as a mask in some images
+	if (_mask == 0)
+		_mask = -1;
+
 	_fileName = Common::String(fileName);
 }
 
@@ -628,6 +634,12 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 	       "%24s %u %u %u %u %u %u %d %*u %*u %d %d",
 	       fileName, &_x, &_y, &_x2, &_y2, &_start, &_end, &_loopCount, &_mask, &_framerate);
 
+	// Mask 0 means "no transparency" in this case. Since we use a common blitting
+	// code for images and animations, we set it to -1 to avoid confusion with
+	// color 0, which is used as a mask in some images
+	if (_mask == 0)
+		_mask = -1;
+
 	_fileName = Common::String(fileName);
 }
 
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index b966aa9cb8..7759758f56 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -154,17 +154,11 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
 					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
-					if (_mask > 0)
-						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
-					else
-						_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top);
+					_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
 					transposed->free();
 					delete transposed;
 				} else {
-					if (_mask > 0)
-						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
-					else
-						_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top);
+					_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
 				}
 			}
 		}
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index f28ba6ade3..a5ed044424 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -462,15 +462,16 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 			j++;
 		}
 		dx = 0;
+		Common::Rect empty;
 		for (int32 jj = 0; jj < j; jj++) {
 			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], empty, dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
 
 			else if (TxtJustify[i] == TXT_JUSTIFY_CENTER)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, ((dst.w - width) / 2) + dx,  dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], empty, dst, ((dst.w - width) / 2) + dx,  dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
 
 			else if (TxtJustify[i] == TXT_JUSTIFY_RIGHT)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dst.w - width + dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], empty, dst, dst.w - width + dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
 
 			dx += TxtSurfaces[i][jj]->w;
 		}
-- 
cgit v1.2.3


From a9701d04c17b6f565e5602f12546bfe7aa2848af Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 22:35:02 +0200
Subject: ZVISION: Remove duplicate image loading code

---
 engines/zvision/graphics/render_manager.cpp | 14 ++------------
 engines/zvision/graphics/render_manager.h   |  6 ++----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 7bbde81e4c..73483f2309 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -568,28 +568,18 @@ Graphics::Surface *RenderManager::getBkgRect(Common::Rect &rect) {
 	return srf;
 }
 
-Graphics::Surface *RenderManager::loadImage(Common::String &file) {
+Graphics::Surface *RenderManager::loadImage(Common::String file) {
 	Graphics::Surface *tmp = new Graphics::Surface;
 	readImageToSurface(file, *tmp);
 	return tmp;
 }
 
-Graphics::Surface *RenderManager::loadImage(const char *file) {
-	Common::String str = Common::String(file);
-	return loadImage(str);
-}
-
-Graphics::Surface *RenderManager::loadImage(Common::String &file, bool transposed) {
+Graphics::Surface *RenderManager::loadImage(Common::String file, bool transposed) {
 	Graphics::Surface *tmp = new Graphics::Surface;
 	readImageToSurface(file, *tmp, transposed);
 	return tmp;
 }
 
-Graphics::Surface *RenderManager::loadImage(const char *file, bool transposed) {
-	Common::String str = Common::String(file);
-	return loadImage(str, transposed);
-}
-
 void RenderManager::prepareBackground() {
 	_backgroundDirtyRect.clip(_backgroundWidth, _backgroundHeight);
 	RenderTable::RenderState state = _renderTable.getRenderState();
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index a7e49b7758..d9a6c88896 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -263,10 +263,8 @@ public:
 	Graphics::Surface *getBkgRect(Common::Rect &rect);
 
 	// Load image into new surface
-	Graphics::Surface *loadImage(const char *file);
-	Graphics::Surface *loadImage(Common::String &file);
-	Graphics::Surface *loadImage(const char *file, bool transposed);
-	Graphics::Surface *loadImage(Common::String &file, bool transposed);
+	Graphics::Surface *loadImage(Common::String file);
+	Graphics::Surface *loadImage(Common::String file, bool transposed);
 
 	// Clear whole/area of menu surface
 	void clearMenuSurface();
-- 
cgit v1.2.3


From 85142cd0d7fb6e24fc45b2c61611f848b8c4a102 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 22:48:58 +0200
Subject: ZVISION: Remove duplicate subtitle code

---
 engines/zvision/graphics/render_manager.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 73483f2309..4f7b16c833 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -698,18 +698,9 @@ uint16 RenderManager::createSubArea(const Common::Rect &area) {
 }
 
 uint16 RenderManager::createSubArea() {
-	_subid++;
-
-	OneSubtitle sub;
-	sub.redraw = false;
-	sub.timer = -1;
-	sub.todelete = false;
-	sub.r = Common::Rect(_subtitleArea.left, _subtitleArea.top, _subtitleArea.right, _subtitleArea.bottom);
-	sub.r.translate(-_workingWindow.left, -_workingWindow.top);
-
-	_subsList[_subid] = sub;
-
-	return _subid;
+	Common::Rect r(_subtitleArea.left, _subtitleArea.top, _subtitleArea.right, _subtitleArea.bottom);
+	r.translate(-_workingWindow.left, -_workingWindow.top);
+	return createSubArea(r);
 }
 
 void RenderManager::deleteSubArea(uint16 id) {
-- 
cgit v1.2.3


From 19ce38d40e9f273335b06a62bcb0d3643602080c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 22:51:33 +0200
Subject: ZVISION: Turn off subtitles, if requested

---
 engines/zvision/graphics/render_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 4f7b16c833..4f26123fc8 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -737,7 +737,7 @@ void RenderManager::processSubs(uint16 deltatime) {
 		}
 	}
 
-	if (redraw) {
+	if (redraw && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1) {
 		_subtitleSurface.fillRect(Common::Rect(_subtitleSurface.w, _subtitleSurface.h), 0);
 
 		for (SubtitleMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
-- 
cgit v1.2.3


From f9595b11fc2bef08d84a00b81f9b2884f77897b0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 23:18:54 +0200
Subject: ZVISION: Add an FPS timer (accessible with F10, or the "FRAME" cheat)

---
 engines/zvision/core/events.cpp | 18 +++++++++++++-----
 engines/zvision/zvision.cpp     | 19 ++++++++++++++++++-
 engines/zvision/zvision.h       |  7 +++++++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 4438474078..7804130e2a 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -158,15 +158,18 @@ void ZVision::cheatCodes(uint8 key) {
 		}
 	}
 
-	if (checkCode("FRAME"))
-		_renderManager->showDebugMsg(Common::String::format("FPS: ???, not implemented"));
+	if (checkCode("FRAME")) {
+		Common::String fpsStr = Common::String::format("FPS: %d", getFPS());
+		_renderManager->showDebugMsg(fpsStr);
+	}
+
+	if (checkCode("COMPUTERARCH"))
+		_renderManager->showDebugMsg("COMPUTERARCH: var-viewer not implemented");
 
+	// This cheat essentially toggles the GOxxxx cheat below
 	if (checkCode("XYZZY"))
 		_scriptManager->setStateValue(StateKey_DebugCheats, 1 - _scriptManager->getStateValue(StateKey_DebugCheats));
 
-	if (checkCode("COMPUTERARCH"))
-		_renderManager->showDebugMsg(Common::String::format("COMPUTERARCH: var-viewer not implemented"));
-
 	if (_scriptManager->getStateValue(StateKey_DebugCheats) == 1)
 		if (checkCode("GO????"))
 			_scriptManager->changeLocation(getBufferedKey(3),
@@ -240,6 +243,11 @@ void ZVision::processEvents() {
 					                     _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
 				break;
 
+			case Common::KEYCODE_F10: {
+				Common::String fpsStr = Common::String::format("FPS: %d", getFPS());
+				_renderManager->showDebugMsg(fpsStr);
+				}
+				break;
 			default:
 				break;
 			}
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b3fc02ee15..615574bbcd 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -101,7 +101,9 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 	  _frameRenderDelay(2),
 	  _keyboardVelocity(0),
 	  _mouseVelocity(0),
-	  _videoIsPlaying(false) {
+	  _videoIsPlaying(false),
+	  _renderedFrameCount(0),
+	  _fps(0) {
 
 	debug(1, "ZVision::ZVision");
 
@@ -130,6 +132,8 @@ ZVision::~ZVision() {
 	delete _rnd;
 	delete _midiManager;
 
+	getTimerManager()->removeTimerProc(&fpsTimerCallback);
+
 	// Remove all of our debug levels
 	DebugMan.clearAllDebugChannels();
 }
@@ -214,6 +218,9 @@ void ZVision::initialize() {
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
 	_doubleFPS = ConfMan.getBool("doublefps");
+
+	// Initialize FPS timer callback
+	getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this, "zvisionFPS");
 }
 
 Common::Error ZVision::run() {
@@ -246,6 +253,7 @@ Common::Error ZVision::run() {
 		// Update the screen
 		if (canRender()) {
 			_system->updateScreen();
+			_renderedFrameCount++;
 		} else {
 			_frameRenderDelay--;
 		}
@@ -291,4 +299,13 @@ bool ZVision::canRender() {
 	return _frameRenderDelay <= 0;
 }
 
+void ZVision::fpsTimerCallback(void *refCon) {
+	((ZVision *)refCon)->fpsTimer();
+}
+
+void ZVision::fpsTimer() {
+	_fps = _renderedFrameCount;
+	_renderedFrameCount = 0;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 6664d0cd5d..5482060cd0 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -119,6 +119,8 @@ private:
 	Common::Event _event;
 
 	int _frameRenderDelay;
+	int _renderedFrameCount;
+	int _fps;
 	int16 _mouseVelocity;
 	int16 _keyboardVelocity;
 	bool _doubleFPS;
@@ -197,6 +199,11 @@ public:
 
 	void setRenderDelay(uint);
 	bool canRender();
+	static void fpsTimerCallback(void *refCon);
+	void fpsTimer();
+	int getFPS() const {
+		return _fps;
+	}
 
 	void loadSettings();
 	void saveSettings();
-- 
cgit v1.2.3


From eb46e837969f2f650b5debaa387e63127b83db6c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 00:00:07 +0200
Subject: ZVISION: Quit with an error message dialog if no font files are found

---
 engines/zvision/zvision.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 615574bbcd..fe8e129800 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -46,8 +46,8 @@
 #include "common/system.h"
 #include "common/file.h"
 
+#include "gui/message.h"
 #include "engines/util.h"
-
 #include "audio/mixer.h"
 
 namespace ZVision {
@@ -230,6 +230,22 @@ Common::Error ZVision::run() {
 	if (ConfMan.hasKey("save_slot"))
 		_saveManager->loadGame(ConfMan.getInt("save_slot"));
 
+	// Before starting, make absolutely sure that the user has copied the needed fonts
+	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf")) {
+		GUI::MessageDialog dialog(
+				"Before playing this game, you'll need to copy the required "
+				"fonts in ScummVM's extras directory, or the game directory. "
+				"On Windows, you'll need the following font files from the Windows "
+				"font directory: Times New Roman, Century Schoolbook, Garamond, "
+				"Courier New and Arial. Alternatively, you can download the GNU "
+				"FreeFont package. You'll need all the fonts from that package, "
+				"i.e. FreeMono, FreeSans and FreeSerif."
+		);
+		dialog.runModal();
+		quitGame();
+		return Common::kUnknownError;
+	}
+
 	// Main loop
 	while (!shouldQuit()) {
 		_clock.update();
-- 
cgit v1.2.3


From fd34456bb8bcbf39667df50eb6d14a9f4fbe7087 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 01:02:51 +0200
Subject: ZVISION: Delete the render manager after the script manager on quit

This is necessary, as the script manager may include references to the
render manager, such as side effects in Zork: Nemesis. Fixes a crash on
engine exit when the current scene contains such effects
---
 engines/zvision/zvision.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index fe8e129800..7c26eba030 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -127,8 +127,8 @@ ZVision::~ZVision() {
 	delete _cursorManager;
 	delete _stringManager;
 	delete _saveManager;
-	delete _renderManager;
 	delete _scriptManager;
+	delete _renderManager;	// should be deleted after the script manager
 	delete _rnd;
 	delete _midiManager;
 
-- 
cgit v1.2.3


From 192c3df6a1b65a5e08b5fd0e2a82792393240378 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 02:20:51 +0200
Subject: CREDITS: Update the credits for the ZVISION engine

---
 AUTHORS             | 2 ++
 devtools/credits.pl | 2 ++
 gui/credits.h       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 8e90a625c9..3e8c65e5e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -261,6 +261,8 @@ ScummVM Team
 
     ZVision:
        Adrian Astley
+       Filippos Karapetis
+       Anton Yarcev
 
   Backend Teams
   -------------
diff --git a/devtools/credits.pl b/devtools/credits.pl
index e919c0b8ba..69eede756d 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -791,6 +791,8 @@ begin_credits("Credits");
             
 			begin_section("ZVision");
 				add_person("Adrian Astley", "RichieSams", "");
+				add_person("Filippos Karapetis", "[md5]", "");
+				add_person("Anton Yarcev", "Marisa-Chan", "");
 			end_section();
 
 		end_section();
diff --git a/gui/credits.h b/gui/credits.h
index 0610609983..c7d9199db9 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -324,6 +324,8 @@ static const char *credits[] = {
 "",
 "C1""ZVision",
 "C0""Adrian Astley",
+"C0""Filippos Karapetis",
+"C0""Anton Yarcev",
 "",
 "",
 "C1""Backend Teams",
-- 
cgit v1.2.3


From 569c06b5105c7bae0a72d4abc72cf5db51541702 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 11:10:14 +0100
Subject: SCI: Fix warning

---
 engines/sci/engine/state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index c07dc925e0..527c8f0ae0 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -205,7 +205,7 @@ static kLanguage charToLanguage(const char c) {
 
 Common::String SciEngine::getSciLanguageString(const Common::String &str, kLanguage requestedLanguage, kLanguage *secondaryLanguage, uint16 *languageSplitter) const {
 	kLanguage foundLanguage = K_LANG_NONE;
-	const byte *textPtr = (byte *)str.c_str();
+	const byte *textPtr = (const byte *)str.c_str();
 	byte curChar = 0;
 	byte curChar2 = 0;
 	
-- 
cgit v1.2.3


From ba40b3ea4905716fc8dd6f01bfec6d414b6b9a58 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 14:27:37 +0200
Subject: ZVISION: Clean up the game settings

---
 engines/zvision/detection.cpp | 66 ++++++++++++++++++++++--------------
 engines/zvision/zvision.cpp   | 78 ++++++++++++++++++++++++++++++-------------
 2 files changed, 95 insertions(+), 49 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 4fcb5c040b..c613278fec 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -55,6 +55,10 @@ static const PlainGameDescriptor zVisionGames[] = {
 
 namespace ZVision {
 
+#define GAMEOPTION_ORIGINAL_SAVELOAD        GUIO_GAMEOPTIONS1
+#define GAMEOPTION_DOUBLE_FPS               GUIO_GAMEOPTIONS2
+#define GAMEOPTION_ENABLE_VENUS             GUIO_GAMEOPTIONS3
+
 static const ZVisionGameDescription gameDescriptions[] = {
 
 	{
@@ -66,7 +70,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS)
 		},
 		GID_NEMESIS
 	},
@@ -80,7 +84,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_DEMO,
-			GUIO1(GUIO_NONE)
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS)
 		},
 		GID_NEMESIS
 	},
@@ -94,7 +98,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -108,7 +112,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -122,7 +126,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_DEMO,
-			GUIO1(GUIO_NONE)
+			GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -140,23 +144,43 @@ static const char *directoryGlobs[] = {
 	0
 };
 
-static const ExtraGuiOption ZVisionExtraGuiOption = {
-	_s("Use original save/load screens"),
-	_s("Use the original save/load screens, instead of the ScummVM ones"),
-	"originalsaveload",
-	false
-};
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_ORIGINAL_SAVELOAD,
+		{
+			_s("Use original save/load screens"),
+			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			"originalsaveload",
+			false
+		}
+	},
 
-static const ExtraGuiOption ZVisionExtraGuiOption2 = {
-	_s("Double FPS"),
-	_s("Halve the update delay"),
-	"doublefps",
-	false
+	{
+		GAMEOPTION_DOUBLE_FPS,
+		{
+			_s("Double FPS"),
+			_s("Halve the update delay"),
+			"doublefps",
+			false
+		}
+	},
+
+	{
+		GAMEOPTION_ENABLE_VENUS,
+		{
+			_s("Enable Venus"),
+			_s("Enable the Venus help system"),
+			"venusenabled",
+			true
+		}
+	},
+
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
 };
 
 class ZVisionMetaEngine : public AdvancedMetaEngine {
 public:
-	ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), zVisionGames) {
+	ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), zVisionGames, optionsList) {
 		_maxScanDepth = 2;
 		_directoryGlobs = directoryGlobs;
 		_singleid = "zvision";
@@ -172,7 +196,6 @@ public:
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
 	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
-	virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
 	SaveStateList listSaves(const char *target) const;
 	virtual int getMaximumSaveSlot() const;
 	void removeSaveState(const char *target, int slot) const;
@@ -223,13 +246,6 @@ bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADG
 	return gd != 0;
 }
 
-const ExtraGuiOptions ZVisionMetaEngine::getExtraGuiOptions(const Common::String &target) const {
-	ExtraGuiOptions options;
-	options.push_back(ZVisionExtraGuiOption);
-	options.push_back(ZVisionExtraGuiOption2);
-	return options;
-}
-
 SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
 	ZVision::SaveGameHeader header;
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 7c26eba030..5f4924d7cf 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -57,25 +57,29 @@ namespace ZVision {
 struct zvisionIniSettings {
 	const char *name;
 	int16 slot;
-	int16 deflt;
+	int16 defaultValue;	// -1: use the bool value
+	bool defaultBoolValue;
+	bool allowEditing;
 } settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
-	{"ZVision_KeyboardTurnSpeed", StateKey_KbdRotateSpeed, 5},
-	{"ZVision_PanaRotateSpeed", StateKey_RotateSpeed, 540},
-	{"ZVision_QSoundEnabled", StateKey_Qsound, 1},
-	{"ZVision_VenusEnabled", StateKey_VenusEnable, 1},
-	{"ZVision_HighQuality", StateKey_HighQuality, 1},
-	{"ZVision_Platform", StateKey_Platform, 0},
-	{"ZVision_InstallLevel", StateKey_InstallLevel, 0},
-	{"ZVision_CountryCode", StateKey_CountryCode, 0},
-	{"ZVision_CPU", StateKey_CPU, 1},
-	{"ZVision_MovieCursor", StateKey_MovieCursor, 1},
-	{"ZVision_NoAnimWhileTurning", StateKey_NoTurnAnim, 0},
-	{"ZVision_Win958", StateKey_WIN958, 0},
-	{"ZVision_ShowErrorDialogs", StateKey_ShowErrorDlg, 0},
-	{"ZVision_ShowSubtitles", StateKey_Subtitles, 1},
-	{"ZVision_DebugCheats", StateKey_DebugCheats, 0},
-	{"ZVision_JapaneseFonts", StateKey_JapanFonts, 0},
-	{"ZVision_Brightness", StateKey_Brightness, 0}
+	// Hardcoded settings
+	{"qsoundenabled", StateKey_Qsound, 1, false, false},
+	{"highquality", StateKey_HighQuality, 1, false, false},
+	{"platform", StateKey_Platform, 0, false, false},
+	{"installlevel", StateKey_InstallLevel, 0, false, false},
+	{"countrycode", StateKey_CountryCode, 0, false, false},
+	{"cpu", StateKey_CPU, 1, false, false},
+	{"moviecursor", StateKey_MovieCursor, 1, false, false},
+	{"noanimwhileturning", StateKey_NoTurnAnim, 0, false, false},
+	{"win958", StateKey_WIN958, 0, false, false},
+	{"showerrordialogs", StateKey_ShowErrorDlg, 0, false, false},
+	{"japanesefonts", StateKey_JapanFonts, 0, false, false},
+	{"brightness", StateKey_Brightness, 0, false, false},
+	{"debugcheats", StateKey_DebugCheats, 1, false, false},
+	// Editable settings
+	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
+	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},
+	{"venusenabled", StateKey_VenusEnable, -1, true, true},
+	{"subtitles", StateKey_Subtitles, -1, true, true},
 };
 
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
@@ -139,14 +143,33 @@ ZVision::~ZVision() {
 }
 
 void ZVision::registerDefaultSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++)
-		ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].deflt);
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].allowEditing) {
+			if (settingsKeys[i].defaultValue >= 0)
+				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultValue);
+			else
+				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultBoolValue);
+		}
+	}
+
+	ConfMan.registerDefault("originalsaveload", false);
 	ConfMan.registerDefault("doublefps", false);
 }
 
 void ZVision::loadSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++)
-		_scriptManager->setStateValue(settingsKeys[i].slot, ConfMan.getInt(settingsKeys[i].name));
+	int16 value = 0;
+	bool boolValue = false;
+
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].defaultValue >= 0) {
+			value = (settingsKeys[i].allowEditing) ? ConfMan.getInt(settingsKeys[i].name) : settingsKeys[i].defaultValue;
+		} else {
+			boolValue = value = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
+			value = (boolValue) ? 1 : 0;
+		}
+
+		_scriptManager->setStateValue(settingsKeys[i].slot, value);
+	}
 
 	if (getGameId() == GID_NEMESIS)
 		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 1);
@@ -155,8 +178,15 @@ void ZVision::loadSettings() {
 }
 
 void ZVision::saveSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++)
-		ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].allowEditing) {
+			if (settingsKeys[i].defaultValue >= 0)
+				ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
+			else
+				ConfMan.setBool(settingsKeys[i].name, (_scriptManager->getStateValue(settingsKeys[i].slot) == 1));
+		}
+	}
+
 	ConfMan.flushToDisk();
 }
 
-- 
cgit v1.2.3


From e862172460640188363873b9fa1fb46a3f4c7f78 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 14:29:17 +0200
Subject: ZVISION: Add some advanced engine features, and document the engine

---
 engines/zvision/zvision.cpp | 10 ++++++++++
 engines/zvision/zvision.h   | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 5f4924d7cf..03103553cc 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -345,6 +345,16 @@ bool ZVision::canRender() {
 	return _frameRenderDelay <= 0;
 }
 
+GUI::Debugger *ZVision::getDebugger() {
+	return _console;
+}
+
+void ZVision::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
+	_scriptManager->setStateValue(StateKey_Subtitles, ConfMan.getBool("subtitles") ? 1 : 0);
+}
+
 void ZVision::fpsTimerCallback(void *refCon) {
 	((ZVision *)refCon)->fpsTimer();
 }
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 5482060cd0..ad22ddaaa2 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -41,6 +41,17 @@ namespace Video {
 class VideoDecoder;
 }
 
+/**
+ * This is the namespace of the ZVision engine.
+ *
+ * Status of this engine: complete
+ *
+ * Games using this engine:
+ * - Zork Nemesis: The Forbidden Lands
+ * - Zork: Grand Inquisitor
+ *
+ */
+
 namespace ZVision {
 
 struct ZVisionGameDescription;
@@ -205,6 +216,9 @@ public:
 		return _fps;
 	}
 
+	GUI::Debugger *getDebugger();
+	void syncSoundSettings();
+
 	void loadSettings();
 	void saveSettings();
 
-- 
cgit v1.2.3


From 39eab59388c6dc43d1f2c72ee708807ef1bdb198 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 27 Dec 2014 15:31:43 +0100
Subject: ACCESS: Rewrite sound queueing (WIP)

---
 engines/access/amazon/amazon_logic.cpp | 52 ++++++++++++++++++----------------
 engines/access/events.cpp              |  2 ++
 engines/access/sound.cpp               | 50 ++++++++++++++++++++------------
 engines/access/sound.h                 |  5 +++-
 4 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 4a313e8880..c045377f8a 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -341,15 +341,12 @@ void Opening::doTitle() {
 		_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
 		delete spriteData;
 
-		_vm->_sound->playSound(1);
-
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 4);
 		_vm->_sound->playSound(1);
 
 		_vm->_buffer2.copyFrom(*_vm->_screen);
 		_vm->_buffer1.copyFrom(*_vm->_screen);
-		_vm->_sound->playSound(1);
 
 		const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
 		for (_pCount = 0; _pCount < 3 && !_vm->shouldQuit(); ++_pCount) {
@@ -508,40 +505,47 @@ void Opening::doTent() {
 	_vm->_screen->forceFadeIn();
 
 	_vm->_video->setVideo(_vm->_screen, Common::Point(126, 73), FileIdent(2, 1), 10);
+	int previousFrame = -1;
 	while (!_vm->shouldQuit() && !_vm->_video->_videoEnd) {
 		_vm->_video->playVideo();
-		if ((_vm->_video->_videoFrame == 32) || (_vm->_video->_videoFrame == 34))
-			_vm->_sound->playSound(4);
-		else if (_vm->_video->_videoFrame == 36) {
-			if (step != 2) {
-				_vm->_sound->playSound(2);
-				step = 2;
-			}
-		} else if (_vm->_video->_videoFrame == 18) {
-			if (step != 1) {
-				_vm->_midi->newMusic(73, 1);
-				_vm->_midi->newMusic(11, 0);
-				step = 1;
-				_vm->_sound->playSound(1);
+		if (previousFrame != _vm->_video->_videoFrame) {
+			previousFrame = _vm->_video->_videoFrame;
+
+			if ((_vm->_video->_videoFrame == 32) || (_vm->_video->_videoFrame == 34))
+				_vm->_sound->playSound(4);
+			else if (_vm->_video->_videoFrame == 36) {
+				if (step != 2) {
+					_vm->_sound->playSound(2);
+					step = 2;
+				}
+			} else if (_vm->_video->_videoFrame == 18) {
+				if (step != 1) {
+					_vm->_midi->newMusic(73, 1);
+					_vm->_midi->newMusic(11, 0);
+					step = 1;
+					_vm->_sound->playSound(1);
+				}
 			}
 		}
-
 		_vm->_events->pollEventsAndWait();
 	}
 
 	_vm->_sound->playSound(5);
 	_vm->_video->setVideo(_vm->_screen, Common::Point(43, 11), FileIdent(2, 2), 10);
+	previousFrame = -1;
 	while (!_vm->shouldQuit() && !_vm->_video->_videoEnd) {
 		_vm->_video->playVideo();
-		if (_vm->_video->_videoFrame == 26) {
-			_vm->_sound->playSound(5);
-		} else if (_vm->_video->_videoFrame == 15) {
-			if (step !=3) {
-				_vm->_sound->playSound(3);
-				step = 3;
+		if (previousFrame != _vm->_video->_videoFrame) {
+			previousFrame = _vm->_video->_videoFrame;
+			if (_vm->_video->_videoFrame == 26) {
+				_vm->_sound->playSound(5);
+			} else if (_vm->_video->_videoFrame == 15) {
+				if (step !=3) {
+					_vm->_sound->playSound(3);
+					step = 3;
+				}
 			}
 		}
-
 		_vm->_events->pollEventsAndWait();
 	}
 
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 0867b09765..6ffe67acfb 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -140,6 +140,8 @@ void EventsManager::pollEvents(bool skipTimers) {
 	if (checkForNextTimerUpdate() && !skipTimers)
 		nextTimer();
 
+	_vm->_sound->checkSoundQueue();
+
 	_wheelUp = _wheelDown = false;
 
 	Common::Event event;
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index a7d96dac9a..82199a8286 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -22,7 +22,6 @@
 
 #include "common/algorithm.h"
 #include "audio/mixer.h"
-#include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/wave.h"
 #include "access/access.h"
@@ -44,7 +43,19 @@ void SoundManager::clearSounds() {
 
 	for (uint i = 0; i < _soundTable.size(); ++i)
 		delete _soundTable[i]._res;
+
 	_soundTable.clear();
+
+	if (_mixer->isSoundHandleActive(_effectsHandle))
+		_mixer->stopHandle(_effectsHandle);
+
+	if (_queue.size())
+		_queue.remove_at(0);
+
+	while (_queue.size()) {
+		delete _queue[0];
+		_queue.remove_at(0);
+	}
 }
 
 void SoundManager::queueSound(int idx, int fileNum, int subfile) {
@@ -77,19 +88,14 @@ void SoundManager::playSound(Resource *res, int priority) {
 	debugC(1, kDebugSound, "playSound");
 
 	byte *resourceData = res->data();
-	Audio::SoundHandle audioHandle;
-	Audio::RewindableAudioStream *audioStream = 0;
 
 	assert(res->_size >= 32);
 
-	// HACK: Simulates queueing for the rare sounds played one after the other
-	while (_mixer->hasActiveChannelOfType(Audio::Mixer::kSFXSoundType))
-		;
-
 	if (READ_BE_UINT32(resourceData) == MKTAG('R','I','F','F')) {
 		// CD version uses WAVE-files
 		Common::SeekableReadStream *waveStream = new Common::MemoryReadStream(resourceData, res->_size, DisposeAfterUse::NO);
-		audioStream = Audio::makeWAVStream(waveStream, DisposeAfterUse::YES);
+		Audio::RewindableAudioStream *audioStream = Audio::makeWAVStream(waveStream, DisposeAfterUse::YES);
+		_queue.push_back(audioStream);
 
 	} else if (READ_BE_UINT32(resourceData) == MKTAG('S', 'T', 'E', 'V')) {
 		// sound files have a fixed header of 32 bytes in total
@@ -130,22 +136,30 @@ void SoundManager::playSound(Resource *res, int priority) {
 			return;
 		}
 
-		audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0);
+		Audio::RewindableAudioStream *audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0);
+		_queue.push_back(audioStream);
 
 	} else
 		error("Unknown format");
 
-	audioHandle = Audio::SoundHandle();
-	_mixer->playStream(Audio::Mixer::kSFXSoundType, &audioHandle,
-						audioStream, -1, _mixer->kMaxChannelVolume, 0,
+	if (!_mixer->isSoundHandleActive(_effectsHandle))
+		_mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle,
+						_queue[0], -1, _mixer->kMaxChannelVolume, 0,
 						DisposeAfterUse::NO);
+}
+
+void SoundManager::checkSoundQueue() {
+	debugC(5, kDebugSound, "checkSoundQueue");
+
+	if (_queue.empty() || _mixer->isSoundHandleActive(_effectsHandle))
+		return;
+
+	_queue.remove_at(0);
 
-	/*
-	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
-	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
-	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream, -1,
-		Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::YES, false);
-		*/
+	if (_queue.size())
+		_mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle,
+		   _queue[0], -1, _mixer->kMaxChannelVolume, 0,
+		   DisposeAfterUse::YES);
 }
 
 void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index d0f4584fac..c276648477 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -24,6 +24,7 @@
 #define ACCESS_SOUND_H
 
 #include "common/scummsys.h"
+#include "audio/audiostream.h"
 #include "audio/mixer.h"
 #include "access/files.h"
 #include "audio/midiplayer.h"
@@ -47,7 +48,8 @@ class SoundManager {
 private:
 	AccessEngine *_vm;
 	Audio::Mixer *_mixer;
-	Audio::SoundHandle _soundHandle;
+	Audio::SoundHandle _effectsHandle;
+	Common::Array<Audio::RewindableAudioStream *> _queue;
 
 	void clearSounds();
 
@@ -63,6 +65,7 @@ public:
 	void queueSound(int idx, int fileNum, int subfile);
 
 	void playSound(int soundIndex);
+	void checkSoundQueue();
 
 	Resource *loadSound(int fileNum, int subfile);
 	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
-- 
cgit v1.2.3


From 1016838bd5e556a4882f2b07e993ea9e78d12f7f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 16:33:43 +0200
Subject: ZVISION: Add support for disabling animations while turning

Also, clean up and document game configuration options, and add a TODO
for QSound support
---
 engines/zvision/detection.cpp                      | 27 ++++++++++++++------
 .../zvision/scripting/sidefx/animation_node.cpp    | 25 +++++++++++++------
 engines/zvision/scripting/sidefx/distort_node.cpp  |  1 -
 engines/zvision/zvision.cpp                        | 29 +++++++++++-----------
 4 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index c613278fec..1eaff83413 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -55,9 +55,10 @@ static const PlainGameDescriptor zVisionGames[] = {
 
 namespace ZVision {
 
-#define GAMEOPTION_ORIGINAL_SAVELOAD        GUIO_GAMEOPTIONS1
-#define GAMEOPTION_DOUBLE_FPS               GUIO_GAMEOPTIONS2
-#define GAMEOPTION_ENABLE_VENUS             GUIO_GAMEOPTIONS3
+#define GAMEOPTION_ORIGINAL_SAVELOAD          GUIO_GAMEOPTIONS1
+#define GAMEOPTION_DOUBLE_FPS                 GUIO_GAMEOPTIONS2
+#define GAMEOPTION_ENABLE_VENUS               GUIO_GAMEOPTIONS3
+#define GAMEOPTION_DISABLE_ANIM_WHILE_TURNING GUIO_GAMEOPTIONS4
 
 static const ZVisionGameDescription gameDescriptions[] = {
 
@@ -70,7 +71,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS)
+			GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
 		},
 		GID_NEMESIS
 	},
@@ -84,7 +85,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_DEMO,
-			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS)
+			GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
 		},
 		GID_NEMESIS
 	},
@@ -98,7 +99,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
-			GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS)
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -112,7 +113,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
-			GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS)
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -126,7 +127,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_DEMO,
-			GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS)
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -175,6 +176,16 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		}
 	},
 
+	{
+		GAMEOPTION_DISABLE_ANIM_WHILE_TURNING,
+		{
+			_s("Disable animation while turning"),
+			_s("Disable animation while turning in panoramic mode"),
+			"noanimwhileturning",
+			false
+		}
+	},
+
 	AD_EXTRA_GUI_OPTIONS_TERMINATOR
 };
 
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 7759758f56..3dd80f3699 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -75,6 +75,17 @@ AnimationNode::~AnimationNode() {
 }
 
 bool AnimationNode::process(uint32 deltaTimeInMillis) {
+	ScriptManager *scriptManager = _engine->getScriptManager();
+	RenderManager *renderManager = _engine->getRenderManager();
+	RenderTable::RenderState renderState = renderManager->getRenderTable()->getRenderState();
+	bool isPanorama = (renderState == RenderTable::PANORAMA);
+	int16 velocity = _engine->getMouseVelocity() + _engine->getKeyboardVelocity();
+
+	// Do not update animation nodes in panoramic mode while turning, if the user
+	// has set this option
+	if (scriptManager->getStateValue(StateKey_NoTurnAnim) == 1 && isPanorama && velocity)
+		return false;
+
 	PlayNodes::iterator it = _playList.begin();
 	if (it != _playList.end()) {
 		playnode *nod = &(*it);
@@ -93,7 +104,7 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 				nod->_delay = _frmDelay;
 				if (nod->slot)
-					_engine->getScriptManager()->setStateValue(nod->slot, 1);
+					scriptManager->setStateValue(nod->slot, 1);
 			} else {
 				nod->_curFrame++;
 
@@ -102,7 +113,7 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 
 					if (nod->loop == 0) {
 						if (nod->slot >= 0)
-							_engine->getScriptManager()->setStateValue(nod->slot, 2);
+							scriptManager->setStateValue(nod->slot, 2);
 						if (nod->_scaled) {
 							nod->_scaled->free();
 							delete nod->_scaled;
@@ -121,7 +132,7 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 			if (frame) {
 				uint32 dstw;
 				uint32 dsth;
-				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+				if (isPanorama) {
 					dstw = nod->pos.height();
 					dsth = nod->pos.width();
 				} else {
@@ -148,17 +159,17 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 						nod->_scaled->create(dstw, dsth, frame->format);
 					}
 
-					_engine->getRenderManager()->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
+					renderManager->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
 					frame = nod->_scaled;
 				}
 
-				if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
+				if (isPanorama) {
 					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
-					_engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
+					renderManager->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
 					transposed->free();
 					delete transposed;
 				} else {
-					_engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
+					renderManager->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
 				}
 			}
 		}
diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp
index 0d5c8b1ed5..7d25adc031 100644
--- a/engines/zvision/scripting/sidefx/distort_node.cpp
+++ b/engines/zvision/scripting/sidefx/distort_node.cpp
@@ -65,7 +65,6 @@ DistortNode::~DistortNode() {
 }
 
 bool DistortNode::process(uint32 deltaTimeInMillis) {
-
 	float updTime = deltaTimeInMillis / (1000.0 / 60.0);
 
 	if (_incr)
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 03103553cc..a28ad862d9 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -62,22 +62,23 @@ struct zvisionIniSettings {
 	bool allowEditing;
 } settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
 	// Hardcoded settings
-	{"qsoundenabled", StateKey_Qsound, 1, false, false},
-	{"highquality", StateKey_HighQuality, 1, false, false},
-	{"platform", StateKey_Platform, 0, false, false},
-	{"installlevel", StateKey_InstallLevel, 0, false, false},
-	{"countrycode", StateKey_CountryCode, 0, false, false},
-	{"cpu", StateKey_CPU, 1, false, false},
-	{"moviecursor", StateKey_MovieCursor, 1, false, false},
-	{"noanimwhileturning", StateKey_NoTurnAnim, 0, false, false},
-	{"win958", StateKey_WIN958, 0, false, false},
-	{"showerrordialogs", StateKey_ShowErrorDlg, 0, false, false},
-	{"japanesefonts", StateKey_JapanFonts, 0, false, false},
-	{"brightness", StateKey_Brightness, 0, false, false},
-	{"debugcheats", StateKey_DebugCheats, 1, false, false},
+	//{"platform", StateKey_Platform, 0, false, false},	// 0 = Windows, 1 = DOS, 2 = DOS, unused
+	//{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, unused
+	//{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, unused
+	//{"cpu", StateKey_CPU, 1, false, false},	// always 1 = Pentium (0 is 486), unused
+	//{"win958", StateKey_WIN958, 0, false, false},	// unused, probably Windows version flag
+	//{"showerrordialogs", StateKey_ShowErrorDlg, 0, false, false},	// unused
+	//{"japanesefonts", StateKey_JapanFonts, 0, false, false},
+	//{"brightness", StateKey_Brightness, 0, false, false},
+	//{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
+	//{"highquality", StateKey_HighQuality, 0, false, false},	// performance related, always high
+	//{"moviecursor", StateKey_MovieCursor, 0, false, false},	// show mouse cursor in movies, unused
+	{"qsoundenabled", StateKey_Qsound, 1, false, false},	// 1 = enable QSound - TODO: not supported yet
+	{"debugcheats", StateKey_DebugCheats, 1, false, false},	// always start with the GOxxxx cheat enabled
 	// Editable settings
 	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
 	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},
+	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
 	{"venusenabled", StateKey_VenusEnable, -1, true, true},
 	{"subtitles", StateKey_Subtitles, -1, true, true},
 };
@@ -164,7 +165,7 @@ void ZVision::loadSettings() {
 		if (settingsKeys[i].defaultValue >= 0) {
 			value = (settingsKeys[i].allowEditing) ? ConfMan.getInt(settingsKeys[i].name) : settingsKeys[i].defaultValue;
 		} else {
-			boolValue = value = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
+			boolValue = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
 			value = (boolValue) ? 1 : 0;
 		}
 
-- 
cgit v1.2.3


From b3712cc877482e150a3532fa0f21f5c03dc839f1 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sat, 27 Dec 2014 16:36:41 +0200
Subject: ZVISION: Remove dead code (uint is always > 0)

---
 engines/zvision/video/rlf_decoder.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 260f912ade..1478822d00 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -164,11 +164,6 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 	if ((uint)_curFrame == frame)
 		return true;
 
-	if (frame < 0) {
-		_curFrame = 0;
-		return false;
-	}
-
 	int closestFrame = _curFrame;
 	int distance = (int)frame - _curFrame;
 
-- 
cgit v1.2.3


From 6fe9bdf6c6f63320e351c348970c2864af708c42 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 27 Dec 2014 16:05:23 +0100
Subject: ACCESS: Fix speech

---
 engines/access/access.cpp | 6 ++++--
 engines/access/sound.cpp  | 4 ++++
 engines/access/sound.h    | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 67255ff5ea..080a8ef975 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -227,7 +227,8 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 				_sound->playSound(0);
 				_scripts->cmdFreeSound();
 
-				_events->pollEvents();
+				while(_sound->isSFXPlaying() && !shouldQuit())
+					_events->pollEvents();
 
 				if (_events->isKeyMousePressed()) {
 					_sndSubFile += soundsLeft;
@@ -258,7 +259,8 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 		_sound->playSound(0);
 		_scripts->cmdFreeSound();
 
-		_events->pollEvents();
+		while(_sound->isSFXPlaying() && !shouldQuit())
+			_events->pollEvents();
 
 		if (_events->_leftButton) {
 			_events->debounceLeft();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 82199a8286..cfc8b7a64c 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -162,6 +162,10 @@ void SoundManager::checkSoundQueue() {
 		   DisposeAfterUse::YES);
 }
 
+bool SoundManager::isSFXPlaying() {
+	return _mixer->isSoundHandleActive(_effectsHandle);
+}
+
 void SoundManager::loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds) {
 	debugC(1, kDebugSound, "loadSounds");
 
diff --git a/engines/access/sound.h b/engines/access/sound.h
index c276648477..3646c2cc16 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -66,6 +66,7 @@ public:
 
 	void playSound(int soundIndex);
 	void checkSoundQueue();
+	bool isSFXPlaying();
 
 	Resource *loadSound(int fileNum, int subfile);
 	void loadSounds(Common::Array<RoomInfo::SoundIdent> &sounds);
-- 
cgit v1.2.3


From 3c3ff0a3aab13b876e0425c365402ff334743282 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 27 Dec 2014 16:46:33 +0100
Subject: ACCESS: Remove two useless variables

---
 engines/access/scripts.cpp | 2 +-
 engines/access/sound.cpp   | 2 --
 engines/access/sound.h     | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 074c781352..1bd24894d7 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -794,7 +794,7 @@ void Scripts::cmdFreeSound() {
 				charLoop();
 
 			_vm->_events->pollEvents();
-		} while (!_vm->shouldQuit() && sound._playingSound);
+		} while (!_vm->shouldQuit() && sound.isSFXPlaying());
 
 		// Free the sounds
 		while (sound._soundTable.size() > 0) {
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index cfc8b7a64c..fc574dc083 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -30,8 +30,6 @@
 namespace Access {
 
 SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
-	_playingSound = false;
-	_isVoice = false;
 }
 
 SoundManager::~SoundManager() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 3646c2cc16..384e9ac615 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -56,8 +56,6 @@ private:
 	void playSound(Resource *res, int priority);
 public:
 	Common::Array<SoundEntry> _soundTable;
-	bool _playingSound;
-	bool _isVoice;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
-- 
cgit v1.2.3


From 6a7834a05ed880cba32f0adb87950179c4ec404c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 27 Dec 2014 16:55:07 +0100
Subject: ACCESS: Rename loadSoundTable

---
 engines/access/amazon/amazon_logic.cpp   | 4 ++--
 engines/access/amazon/amazon_scripts.cpp | 2 +-
 engines/access/sound.cpp                 | 4 ++--
 engines/access/sound.h                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c045377f8a..82f0edfa6e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -317,8 +317,8 @@ void Opening::doTitle() {
 	_vm->_events->hideCursor();
 
 	if (!_vm->isDemo()) {
-		_vm->_sound->queueSound(0, 98, 30);
-		_vm->_sound->queueSound(1, 98, 8);
+		_vm->_sound->loadSoundTable(0, 98, 30);
+		_vm->_sound->loadSoundTable(1, 98, 8);
 
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 3);
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0b2ddbc854..92acb3686d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -95,7 +95,7 @@ void AmazonScripts::mWhile1() {
 	_vm->_oldRects.clear();
 	_sequence = 2200;
 
-	_vm->_sound->queueSound(0, 14, 15);
+	_vm->_sound->loadSoundTable(0, 14, 15);
 
 	do {
 		cLoop();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index fc574dc083..53b611b65b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -56,8 +56,8 @@ void SoundManager::clearSounds() {
 	}
 }
 
-void SoundManager::queueSound(int idx, int fileNum, int subfile) {
-	debugC(1, kDebugSound, "queueSound(%d, %d, %d)", idx, fileNum, subfile);
+void SoundManager::loadSoundTable(int idx, int fileNum, int subfile) {
+	debugC(1, kDebugSound, "loadSoundTable(%d, %d, %d)", idx, fileNum, subfile);
 
 	Resource *soundResource;
 
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 384e9ac615..7109438f43 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -60,7 +60,7 @@ public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
 
-	void queueSound(int idx, int fileNum, int subfile);
+	void loadSoundTable(int idx, int fileNum, int subfile);
 
 	void playSound(int soundIndex);
 	void checkSoundQueue();
-- 
cgit v1.2.3


From 576bab349c862b16fcca1e9e0fb3fbb52cc6edc4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 27 Dec 2014 17:21:04 +0100
Subject: ACCESS: Use loadSoundTable instead of push_back in several places

---
 engines/access/access.cpp              |  9 +++++----
 engines/access/amazon/amazon_game.cpp  |  4 ++--
 engines/access/amazon/amazon_logic.cpp | 12 ++++++------
 engines/access/sound.cpp               |  4 ++--
 engines/access/sound.h                 |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 080a8ef975..7f59ae7ad6 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -222,14 +222,14 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 			_events->clearEvents();
 			while (!shouldQuit()) {
 				_sound->freeSounds();
-				Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile);
-				_sound->_soundTable.push_back(SoundEntry(sound, 1));
+				_sound->loadSoundTable(0, _narateFile + 99, _sndSubFile);
 				_sound->playSound(0);
-				_scripts->cmdFreeSound();
 
 				while(_sound->isSFXPlaying() && !shouldQuit())
 					_events->pollEvents();
 
+				_scripts->cmdFreeSound();
+
 				if (_events->isKeyMousePressed()) {
 					_sndSubFile += soundsLeft;
 					break;
@@ -257,11 +257,12 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 		Resource *res = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundTable.push_back(SoundEntry(res, 1));
 		_sound->playSound(0);
-		_scripts->cmdFreeSound();
 
 		while(_sound->isSFXPlaying() && !shouldQuit())
 			_events->pollEvents();
 
+		_scripts->cmdFreeSound();
+
 		if (_events->_leftButton) {
 			_events->debounceLeft();
 			_sndSubFile += soundsLeft;
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index d6b759b308..4c9df7b8ff 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -528,8 +528,8 @@ void AmazonEngine::startChapter(int chapter) {
 		_sound->freeSounds();
 
 		if (isCD()) {
-			_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 0), 1));
-			_sound->_soundTable.push_back(SoundEntry(_sound->loadSound(115, 1), 1));
+			_sound->loadSoundTable(0, 115, 0);
+			_sound->loadSoundTable(1, 115, 1);
 			_sound->playSound(0);
 			_sound->playSound(1);
 
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 82f0edfa6e..6dffb85e5e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -490,12 +490,12 @@ void Opening::doTent() {
 	_vm->_screen->setDisplayScan();
 	_vm->_screen->forceFadeOut();
 	_vm->_events->hideCursor();
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 39), 1));
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 14), 1));
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 15), 1));
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 16), 1));
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 31), 2));
-	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_sound->loadSound(98, 52), 2));
+	_vm->_sound->loadSoundTable(0, 98, 39);
+	_vm->_sound->loadSoundTable(1, 98, 14);
+	_vm->_sound->loadSoundTable(2, 98, 15);
+	_vm->_sound->loadSoundTable(3, 98, 16);
+	_vm->_sound->loadSoundTable(4, 98, 31, 2);
+	_vm->_sound->loadSoundTable(5, 98, 52, 2);
 	_vm->_sound->playSound(0);
 
 	_vm->_files->_setPaletteFlag = false;
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 53b611b65b..221b409aa9 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -56,7 +56,7 @@ void SoundManager::clearSounds() {
 	}
 }
 
-void SoundManager::loadSoundTable(int idx, int fileNum, int subfile) {
+void SoundManager::loadSoundTable(int idx, int fileNum, int subfile, int priority) {
 	debugC(1, kDebugSound, "loadSoundTable(%d, %d, %d)", idx, fileNum, subfile);
 
 	Resource *soundResource;
@@ -67,7 +67,7 @@ void SoundManager::loadSoundTable(int idx, int fileNum, int subfile) {
 	delete _soundTable[idx]._res;
 	soundResource = _vm->_files->loadFile(fileNum, subfile);
 	_soundTable[idx]._res = soundResource;
-	_soundTable[idx]._priority = 1;
+	_soundTable[idx]._priority = priority;
 }
 
 Resource *SoundManager::loadSound(int fileNum, int subfile) {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 7109438f43..90f6656e26 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -60,7 +60,7 @@ public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
 
-	void loadSoundTable(int idx, int fileNum, int subfile);
+	void loadSoundTable(int idx, int fileNum, int subfile, int priority = 1);
 
 	void playSound(int soundIndex);
 	void checkSoundQueue();
-- 
cgit v1.2.3


From 99fabffde0c8f88d02bba341cd9d504483b86409 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 27 Dec 2014 20:51:39 +0200
Subject: ZVISION: Clean up settings and initialize the ones used by game
 scripts

---
 engines/zvision/zvision.cpp | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index a28ad862d9..0d06f3ce90 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -52,7 +52,7 @@
 
 namespace ZVision {
 
-#define ZVISION_SETTINGS_KEYS_COUNT 17
+#define ZVISION_SETTINGS_KEYS_COUNT 11
 
 struct zvisionIniSettings {
 	const char *name;
@@ -62,25 +62,18 @@ struct zvisionIniSettings {
 	bool allowEditing;
 } settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
 	// Hardcoded settings
-	//{"platform", StateKey_Platform, 0, false, false},	// 0 = Windows, 1 = DOS, 2 = DOS, unused
-	//{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, unused
-	//{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, unused
-	//{"cpu", StateKey_CPU, 1, false, false},	// always 1 = Pentium (0 is 486), unused
-	//{"win958", StateKey_WIN958, 0, false, false},	// unused, probably Windows version flag
-	//{"showerrordialogs", StateKey_ShowErrorDlg, 0, false, false},	// unused
-	//{"japanesefonts", StateKey_JapanFonts, 0, false, false},
-	//{"brightness", StateKey_Brightness, 0, false, false},
-	//{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
-	//{"highquality", StateKey_HighQuality, 0, false, false},	// performance related, always high
-	//{"moviecursor", StateKey_MovieCursor, 0, false, false},	// show mouse cursor in movies, unused
-	{"qsoundenabled", StateKey_Qsound, 1, false, false},	// 1 = enable QSound - TODO: not supported yet
-	{"debugcheats", StateKey_DebugCheats, 1, false, false},	// always start with the GOxxxx cheat enabled
+	{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, subtitles are shown for codes 0 - 4, unused
+	{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
+	{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, checked by universe.scr
+	{"highquality", StateKey_HighQuality, -1, true, false},	// high panorama quality, unused
+	{"qsoundenabled", StateKey_Qsound, -1, true, false},	// 1 = enable QSound - TODO: not supported yet
+	{"debugcheats", StateKey_DebugCheats, -1, true, false},	// always start with the GOxxxx cheat enabled
 	// Editable settings
 	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
-	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},
+	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},	// checked by universe.scr
 	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
 	{"venusenabled", StateKey_VenusEnable, -1, true, true},
-	{"subtitles", StateKey_Subtitles, -1, true, true},
+	{"subtitles", StateKey_Subtitles, -1, true, true}
 };
 
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
-- 
cgit v1.2.3


From 58f328b9af50d66bf8d1be1b19e6059f706ef226 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 22:22:28 +0100
Subject: ZVISION: Slightly clarify font error message

---
 engines/zvision/zvision.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 0d06f3ce90..88cc1e2fea 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -258,12 +258,12 @@ Common::Error ZVision::run() {
 	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf")) {
 		GUI::MessageDialog dialog(
 				"Before playing this game, you'll need to copy the required "
-				"fonts in ScummVM's extras directory, or the game directory. "
+				"fonts into ScummVM's extras directory, or into the game directory. "
 				"On Windows, you'll need the following font files from the Windows "
 				"font directory: Times New Roman, Century Schoolbook, Garamond, "
 				"Courier New and Arial. Alternatively, you can download the GNU "
 				"FreeFont package. You'll need all the fonts from that package, "
-				"i.e. FreeMono, FreeSans and FreeSerif."
+				"i.e., FreeMono, FreeSans and FreeSerif."
 		);
 		dialog.runModal();
 		quitGame();
-- 
cgit v1.2.3


From 02eada1d0ddd5f5c179ca39840bb7f73286df6e1 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 23:12:54 +0100
Subject: ZVISION: Fix Zork AVI audio on BE systems

---
 engines/zvision/video/zork_avi_decoder.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index 67fab0a114..5618250d79 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -45,8 +45,14 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 			RawChunkStream::RawChunk chunk = decoder->readNextChunk(stream);
 			delete stream;
 
-			if (chunk.data)
-				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_STEREO);
+			if (chunk.data) {
+				byte flags = Audio::FLAG_16BITS | Audio::FLAG_STEREO;
+#ifdef SCUMM_LITTLE_ENDIAN
+				// RawChunkStream produces native endianness int16
+				flags |= Audio::FLAG_LITTLE_ENDIAN;
+#endif
+				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, flags);
+			}
 		} else {
 			AVIAudioTrack::queueSound(stream);
 		}
-- 
cgit v1.2.3


From 5791f600e9b9808714b40a63acd09b5657c855f5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 23:35:35 +0100
Subject: ZVISION: Fix TGZ images on BE systems

---
 engines/zvision/graphics/render_manager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 4f26123fc8..a178c97639 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -209,13 +209,17 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 		isTGZ = true;
 
 		// TGZ files have a header and then Bitmap data that is compressed with LZSS
-		uint32 decompressedSize = file.readSint32LE();
+		uint32 decompressedSize = file.readSint32LE() / 2;
 		imageWidth = file.readSint32LE();
 		imageHeight = file.readSint32LE();
 
 		LzssReadStream lzssStream(&file);
 		buffer = (uint16 *)(new uint16[decompressedSize]);
-		lzssStream.read(buffer, decompressedSize);
+		lzssStream.read(buffer, 2 * decompressedSize);
+#ifndef SCUMMVM_LITTLE_ENDIAN
+		for (uint32 i = 0; i < decompressedSize; ++i)
+			buffer[i] = FROM_LE_16(buffer[i]);
+#endif
 	} else {
 		isTGZ = false;
 
-- 
cgit v1.2.3


From cd595cb0ea65b5bd8b79cb7af35457d032d82e98 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 23:35:47 +0100
Subject: ZVISION: Fix cursors on BE systems

---
 engines/zvision/graphics/cursors/cursor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index eb25e92860..1b471d88b8 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -60,6 +60,12 @@ ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	_surface.create(_width, _height, engine->_resourcePixelFormat);
 	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
 	assert(bytesRead == dataSize);
+
+#ifndef SCUMMVM_LITTLE_ENDIAN
+	int16 *buffer = (int16 *)_surface.getPixels();
+	for (uint32 i = 0; i < dataSize / 2; ++i)
+		buffer[i] = FROM_LE_16(buffer[i]);
+#endif
 }
 
 ZorkCursor::ZorkCursor(const ZorkCursor &other) {
-- 
cgit v1.2.3


From 4931aee954704a7ee984ce8cee85bdbec3ddb640 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 23:51:59 +0100
Subject: ZVISION: Fix typo

---
 engines/zvision/graphics/cursors/cursor.cpp | 2 +-
 engines/zvision/graphics/render_manager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index 1b471d88b8..f32c68645d 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -61,7 +61,7 @@ ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
 	assert(bytesRead == dataSize);
 
-#ifndef SCUMMVM_LITTLE_ENDIAN
+#ifndef SCUMM_LITTLE_ENDIAN
 	int16 *buffer = (int16 *)_surface.getPixels();
 	for (uint32 i = 0; i < dataSize / 2; ++i)
 		buffer[i] = FROM_LE_16(buffer[i]);
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index a178c97639..033d099042 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -216,7 +216,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 		LzssReadStream lzssStream(&file);
 		buffer = (uint16 *)(new uint16[decompressedSize]);
 		lzssStream.read(buffer, 2 * decompressedSize);
-#ifndef SCUMMVM_LITTLE_ENDIAN
+#ifndef SCUMM_LITTLE_ENDIAN
 		for (uint32 i = 0; i < decompressedSize; ++i)
 			buffer[i] = FROM_LE_16(buffer[i]);
 #endif
-- 
cgit v1.2.3


From c823a6e825a6474c75f1ddecfcb67a602393fae6 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 27 Dec 2014 23:52:18 +0100
Subject: ZVISION: Fix cmdRawToWav on BE systems

---
 engines/zvision/core/console.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index c7592c8d9d..b5e542d777 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -138,6 +138,10 @@ bool Console::cmdRawToWav(int argc, const char **argv) {
 	output.writeUint32LE(file.size() * 2);
 	int16 *buffer = new int16[file.size()];
 	audioStream->readBuffer(buffer, file.size());
+#ifndef SCUMM_LITTLE_ENDIAN
+	for (int i = 0; i < file.size(); ++i)
+		buffer[i] = TO_LE_16(buffer[i]);
+#endif
 	output.write(buffer, file.size() * 2);
 
 	delete[] buffer;
-- 
cgit v1.2.3


From 329c9386c6db79b3c52fbd6712f3ae1718d04c1f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 28 Dec 2014 00:22:30 +0100
Subject: SCI: improve kPortrait debug support + fix

---
 engines/sci/graphics/portrait.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 959c0f6817..3311f47022 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -230,7 +230,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 		debugPrint[raveResource->size] = 0; // set terminating NUL
 		debug("kPortrait: using actor %s", _resourceName.c_str());
 		debug("kPortrait (noun %d, verb %d, cond %d, seq %d)", noun, verb, cond, seq);
-		debug("kPortrait: %s", debugPrint);
+		debug("kPortrait: rave data is '%s'", debugPrint);
 	}
 #endif
 
@@ -301,7 +301,11 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 		}
 
 #ifdef DEBUG_PORTRAIT
-		debug("kPortrait: %d: %x", raveTicks, raveID);
+		if (raveID & 0x0ff) {
+			debug("kPortrait: rave '%c%c' after %d ticks", raveID >> 8, raveID & 0x0ff, raveTicks);
+		} else if (raveID) {
+			debug("kPortrait: rave '%c' after %d ticks", raveID >> 8, raveTicks);
+		}
 #endif
 
 		timerPosition += raveTicks;
@@ -325,10 +329,9 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 			//  Tick = 0xFF is the terminator for the data
 			timerPositionWithin = timerPosition;
 			raveLipSyncTicks = *raveLipSyncData++;
-#ifdef DEBUG_PORTRAIT
-			debug("kPortrait: waiting %d", raveLipSyncTicks);
-#endif
 			while ( (raveLipSyncData < _lipSyncDataOffsetTableEnd) && (raveLipSyncTicks != 0xFF) ) {
+				if (raveLipSyncTicks)
+					raveLipSyncTicks--; // 1 -> wait 0 ticks, 2 -> wait 1 tick, etc.
 				timerPositionWithin += raveLipSyncTicks;
 
 				do {
@@ -343,7 +346,11 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 
 				raveLipSyncBitmapNr = *raveLipSyncData++;
 #ifdef DEBUG_PORTRAIT
-				debug("kPortrait: showing bitmap %d", raveLipSyncBitmapNr);
+				if (!raveLipSyncTicks) {
+					debug("kPortrait: showing frame %d", raveLipSyncBitmapNr);
+				} else {
+					debug("kPortrait: showing frame %d after %d ticks", raveLipSyncBitmapNr, raveLipSyncTicks);
+				}
 #endif
 
 				// bitmap nr within sync data is base 1, we need base 0
-- 
cgit v1.2.3


From d0ac19062526e5617d08b587e64aee00fd395876 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 28 Dec 2014 04:43:22 -0500
Subject: ZVISION: Use VideoDecoder facilities better in AnimationNode

setEndFrame() will ensure the audio stops when it is supposed to. Also removes the hack of retrieving the frame rate through the getDuration()'s timestamp return value.

Thanks to md5 for testing
---
 .../zvision/scripting/sidefx/animation_node.cpp    | 99 ++++++++++++----------
 engines/zvision/scripting/sidefx/animation_node.h  |  2 +-
 2 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 3dd80f3699..1657a6e0ec 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -40,19 +40,18 @@ AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::S
 	  _animation(NULL) {
 
 	_animation = engine->loadAnimation(fileName);
+	_animation->start();
 
-	if (fileName.hasSuffix(".rlf"))
-		_frmDelay = _animation->getTimeToNextFrame();
-	else
-		_frmDelay = Common::Rational(1000, _animation->getDuration().framerate()).toInt();
+	if (frate > 0) {
+		_frmDelayOverride = (int32)(1000.0 / frate);
 
-	if (frate > 0)
-		_frmDelay = 1000.0 / frate;
-
-	// WORKAROUND: We do not allow the engine to delay more than 66 msec
-	// per frame (15fps max)
-	if (_frmDelay > 66)
-		_frmDelay = 66;
+		// WORKAROUND: We do not allow the engine to delay more than 66 msec
+		// per frame (15fps max)
+		if (_frmDelayOverride > 66)
+			_frmDelayOverride = 66;
+	} else {
+		_frmDelayOverride = 0;
+	}
 }
 
 AnimationNode::~AnimationNode() {
@@ -90,44 +89,52 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 	if (it != _playList.end()) {
 		playnode *nod = &(*it);
 
-		nod->_delay -= deltaTimeInMillis;
-		if (nod->_delay <= 0) {
-			nod->_delay += _frmDelay;
-
-			const Graphics::Surface *frame = NULL;
-
-			if (nod->_curFrame == -1) { // Start of new playlist node
-				nod->_curFrame = nod->start;
-
-				_animation->seekToFrame(nod->_curFrame);
-				frame = _animation->decodeNextFrame();
-
-				nod->_delay = _frmDelay;
-				if (nod->slot)
-					scriptManager->setStateValue(nod->slot, 1);
-			} else {
-				nod->_curFrame++;
-
-				if (nod->_curFrame > nod->stop) {
-					nod->loop--;
-
-					if (nod->loop == 0) {
-						if (nod->slot >= 0)
-							scriptManager->setStateValue(nod->slot, 2);
-						if (nod->_scaled) {
-							nod->_scaled->free();
-							delete nod->_scaled;
-						}
-						_playList.erase(it);
-						return _DisposeAfterUse;
-					}
-
-					nod->_curFrame = nod->start;
-					_animation->seekToFrame(nod->_curFrame);
+		if (nod->_curFrame == -1) {
+			// The node is just beginning playback
+			nod->_curFrame = nod->start;
+
+			_animation->seekToFrame(nod->start);
+			_animation->setEndFrame(nod->stop);
+
+			nod->_delay = deltaTimeInMillis; // Force the frame to draw
+			if (nod->slot)
+				scriptManager->setStateValue(nod->slot, 1);
+		} else if (_animation->endOfVideo()) {
+			// The node has reached the end; check if we need to loop
+			nod->loop--;
+
+			if (nod->loop == 0) {
+				if (nod->slot >= 0)
+					scriptManager->setStateValue(nod->slot, 2);
+				if (nod->_scaled) {
+					nod->_scaled->free();
+					delete nod->_scaled;
 				}
+				_playList.erase(it);
+				return _DisposeAfterUse;
+			}
 
-				frame = _animation->decodeNextFrame();
+			nod->_curFrame = nod->start;
+			_animation->seekToFrame(nod->start);
+		}
+
+		// Check if we need to draw a frame
+		bool needsUpdate = false;
+		if (_frmDelayOverride == 0) {
+			// If not overridden, use the VideoDecoder's check
+			needsUpdate = _animation->needsUpdate();
+		} else {
+			// Otherwise, implement our own timing
+			nod->_delay -= deltaTimeInMillis;
+
+			if (nod->_delay <= 0) {
+				nod->_delay += _frmDelayOverride;
+				needsUpdate = true;
 			}
+		}
+
+		if (needsUpdate) {
+			const Graphics::Surface *frame = _animation->decodeNextFrame();
 
 			if (frame) {
 				uint32 dstw;
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index 368f0291fd..64270ebc79 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -64,7 +64,7 @@ private:
 	bool _DisposeAfterUse;
 
 	Video::VideoDecoder *_animation;
-	int32 _frmDelay;
+	int32 _frmDelayOverride;
 
 public:
 	bool process(uint32 deltaTimeInMillis);
-- 
cgit v1.2.3


From 46cd10c5255a7c99620a335094d5af3ccf5a2092 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 28 Dec 2014 11:35:53 +0100
Subject: ACCESS: Fix DisposeAfterUse flags in sound code (thanks to fuzzie)

---
 engines/access/sound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 221b409aa9..da267bdc4c 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -134,7 +134,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 			return;
 		}
 
-		Audio::RewindableAudioStream *audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0);
+		Audio::RewindableAudioStream *audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0, DisposeAfterUse::NO);
 		_queue.push_back(audioStream);
 
 	} else
@@ -143,7 +143,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 	if (!_mixer->isSoundHandleActive(_effectsHandle))
 		_mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle,
 						_queue[0], -1, _mixer->kMaxChannelVolume, 0,
-						DisposeAfterUse::NO);
+						DisposeAfterUse::YES);
 }
 
 void SoundManager::checkSoundQueue() {
-- 
cgit v1.2.3


From 78b2c87d510f1ad83e8915e15b7e345a2512d99a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 28 Dec 2014 15:27:55 +0200
Subject: ZVISION: Document some more controls

---
 engines/zvision/scripting/control.cpp               |  1 +
 engines/zvision/scripting/controls/fist_control.h   |  2 +-
 engines/zvision/scripting/controls/hotmov_control.h |  2 +-
 engines/zvision/scripting/controls/lever_control.h  |  1 +
 engines/zvision/scripting/controls/paint_control.h  |  2 +-
 engines/zvision/scripting/controls/safe_control.h   |  1 +
 engines/zvision/scripting/controls/titler_control.h |  2 +-
 engines/zvision/scripting/scr_file_handling.cpp     | 15 +++++++++------
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp
index 127f35ef12..81123eb99b 100644
--- a/engines/zvision/scripting/control.cpp
+++ b/engines/zvision/scripting/control.cpp
@@ -72,6 +72,7 @@ void Control::parsePanoramaControl(ZVision *engine, Common::SeekableReadStream &
 	renderTable->generateRenderTable();
 }
 
+// Only used in Zork Nemesis, handles tilt controls (ZGI doesn't have a tilt view)
 void Control::parseTiltControl(ZVision *engine, Common::SeekableReadStream &stream) {
 	RenderTable *renderTable = engine->getRenderManager()->getRenderTable();
 	renderTable->setRenderState(RenderTable::TILT);
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index bad2daa6d5..a41d8511ea 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -34,7 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
-// Only used in Zork Nemesis, it handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
+// Only used in Zork Nemesis, handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
 class FistControl : public Control {
 public:
 	FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index 640fab00c0..01c83b5837 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -34,7 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
-// Only used in Zork Nemesis, it handles movies where the player needs to click on something (mj7g, vw3g)
+// Only used in Zork Nemesis, handles movies where the player needs to click on something (mj7g, vw3g)
 class HotMovControl : public Control {
 public:
 	HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h
index fdf4a649dc..8787234c51 100644
--- a/engines/zvision/scripting/controls/lever_control.h
+++ b/engines/zvision/scripting/controls/lever_control.h
@@ -34,6 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
+// Only used in Zork Nemesis, handles draggable levers (te2e, tm7e, tp2e, tt2e, tz2e)
 class LeverControl : public Control {
 public:
 	LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h
index 0e5b59b821..8c01f0e68a 100644
--- a/engines/zvision/scripting/controls/paint_control.h
+++ b/engines/zvision/scripting/controls/paint_control.h
@@ -32,7 +32,7 @@
 
 namespace ZVision {
 
-// Only used in Zork Nemesis, it's the painting puzzle screen in Lucien's room in Irondune (ch4g)
+// Only used in Zork Nemesis, handles the painting puzzle screen in Lucien's room in Irondune (ch4g)
 class PaintControl : public Control {
 public:
 	PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h
index 6e1095e304..2577ff4f79 100644
--- a/engines/zvision/scripting/controls/safe_control.h
+++ b/engines/zvision/scripting/controls/safe_control.h
@@ -34,6 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
+// Only used in Zork Nemesis, handles the safe in the Asylum (ac4g)
 class SafeControl : public Control {
 public:
 	SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h
index 86bb398b3c..dd96e4a846 100644
--- a/engines/zvision/scripting/controls/titler_control.h
+++ b/engines/zvision/scripting/controls/titler_control.h
@@ -32,7 +32,7 @@
 
 namespace ZVision {
 
-// Only used in Zork Nemesis - it's the death screen with the Restore/Exit buttons
+// Only used in Zork Nemesis, handles the death screen with the Restore/Exit buttons
 class TitlerControl : public Control {
 public:
 	TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index fd5c158fcc..4e8c8a6b33 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -349,29 +349,32 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		Control::parsePanoramaControl(_engine, stream);
 		return NULL;
 	} else if (controlType.equalsIgnoreCase("tilt")) {
+		// Only used in Zork Nemesis, handles tilt controls (ZGI doesn't have a tilt view)
 		Control::parseTiltControl(_engine, stream);
 		return NULL;
-	} else if (controlType.equalsIgnoreCase("lever")) {
-		return new LeverControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("slot")) {
 		return new SlotControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("input")) {
 		return new InputControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("save")) {
 		return new SaveControl(_engine, key, stream);
+	} else if (controlType.equalsIgnoreCase("lever")) {
+		// Only used in Zork Nemesis, handles draggable levers (te2e, tm7e, tp2e, tt2e, tz2e)
+		return new LeverControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("safe")) {
+		// Only used in Zork Nemesis, handles the safe in the Asylum (ac4g)
 		return new SafeControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("hotmovie")) {
-		// Only used in Zork Nemesis, it handles movies where the player needs to click on something (mj7g, vw3g)
+		// Only used in Zork Nemesis, handles movies where the player needs to click on something (mj7g, vw3g)
 		return new HotMovControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("fist")) {
-		// Only used in Zork Nemesis, it handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
+		// Only used in Zork Nemesis, handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
 		return new FistControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("paint")) {
-		// Only used in Zork Nemesis, it's the painting puzzle screen in Lucien's room in Irondune (ch4g)
+		// Only used in Zork Nemesis, handles the painting puzzle screen in Lucien's room in Irondune (ch4g)
 		return new PaintControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("titler")) {
-		// Only used in Zork Nemesis - it's the death screen with the Restore/Exit buttons (cjde)
+		// Only used in Zork Nemesis, handles the death screen with the Restore/Exit buttons (cjde)
 		return new TitlerControl(_engine, key, stream);
 	}
 	return NULL;
-- 
cgit v1.2.3


From dd347dec83e0d074585cdfd99aa93a17da94ccd4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 28 Dec 2014 16:57:00 +0200
Subject: DEBUGGER: Extend the md5 and md5mac commands to handle any chunk
 length

This will be useful in matching the MD5 checksums with what the
advanced detector returns
---
 gui/debugger.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 216bd626fe..466681e89d 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -522,11 +522,25 @@ struct ArchiveMemberLess {
 
 bool Debugger::cmdMd5(int argc, const char **argv) {
 	if (argc < 2) {
-		debugPrintf("md5 <filename | pattern>\n");
+		debugPrintf("md5 [-n length] <filename | pattern>\n");
 	} else {
+		uint32 length = 0;
+		uint paramOffset = 0;
+
+		// If the user supplied an -n parameter, set the bytes to read
+		if (!strcmp(argv[1], "-n")) {
+			// Make sure that we have at least two more parameters
+			if (argc < 4) {
+				debugPrintf("md5 [-n length] <filename | pattern>\n");
+				return true;
+			}
+			length = atoi(argv[2]);
+			paramOffset = 2;
+		}
+		
 		// Assume that spaces are part of a single filename.
-		Common::String filename = argv[1];
-		for (int i = 2; i < argc; i++) {
+		Common::String filename = argv[1 + paramOffset];
+		for (int i = 2 + paramOffset; i < argc; i++) {
 			filename = filename + " " + argv[i];
 		}
 		Common::ArchiveMemberList list;
@@ -536,9 +550,9 @@ bool Debugger::cmdMd5(int argc, const char **argv) {
 		} else {
 			sort(list.begin(), list.end(), ArchiveMemberLess());
 			for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-				Common::ReadStream *stream = (*iter)->createReadStream();
-				Common::String md5 = Common::computeStreamMD5AsString(*stream, 0);
-				debugPrintf("%s  %s\n", md5.c_str(), (*iter)->getDisplayName().c_str());
+				Common::SeekableReadStream *stream = (*iter)->createReadStream();
+				Common::String md5 = Common::computeStreamMD5AsString(*stream, length);
+				debugPrintf("%s  %s  %d\n", md5.c_str(), (*iter)->getDisplayName().c_str(), stream->size());
 				delete stream;
 			}
 		}
@@ -548,11 +562,25 @@ bool Debugger::cmdMd5(int argc, const char **argv) {
 
 bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 	if (argc < 2) {
-		debugPrintf("md5mac <base filename>\n");
+		debugPrintf("md5mac [-n length] <base filename>\n");
 	} else {
+		uint32 length = 0;
+		uint paramOffset = 0;
+
+		// If the user supplied an -n parameter, set the bytes to read
+		if (!strcmp(argv[1], "-n")) {
+			// Make sure that we have at least two more parameters
+			if (argc < 4) {
+				debugPrintf("md5mac [-n length] <base filename>\n");
+				return true;
+			}
+			length = atoi(argv[2]);
+			paramOffset = 2;
+		}
+		
 		// Assume that spaces are part of a single filename.
-		Common::String filename = argv[1];
-		for (int i = 2; i < argc; i++) {
+		Common::String filename = argv[1 + paramOffset];
+		for (int i = 2 + paramOffset; i < argc; i++) {
 			filename = filename + " " + argv[i];
 		}
 		Common::MacResManager macResMan;
@@ -568,13 +596,13 @@ bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 			} else {
 				// The resource fork is probably the most relevant one.
 				if (macResMan.hasResFork()) {
-					Common::String md5 = macResMan.computeResForkMD5AsString(0);
-					debugPrintf("%s  %s (resource)\n", md5.c_str(), macResMan.getBaseFileName().c_str());
+					Common::String md5 = macResMan.computeResForkMD5AsString(length);
+					debugPrintf("%s  %s (resource)  %d\n", md5.c_str(), macResMan.getBaseFileName().c_str(), macResMan.getResForkDataSize());
 				}
 				if (macResMan.hasDataFork()) {
-					Common::ReadStream *stream = macResMan.getDataFork();
-					Common::String md5 = Common::computeStreamMD5AsString(*stream, 0);
-					debugPrintf("%s  %s (data)\n", md5.c_str(), macResMan.getBaseFileName().c_str());
+					Common::SeekableReadStream *stream = macResMan.getDataFork();
+					Common::String md5 = Common::computeStreamMD5AsString(*stream, length);
+					debugPrintf("%s  %s (data)  %d\n", md5.c_str(), macResMan.getBaseFileName().c_str(), stream->size());
 				}
 			}
 			macResMan.close();
-- 
cgit v1.2.3


From 587b1ad69c200ee5b5c987328a65bd8092d9ea4f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 28 Dec 2014 18:42:18 +0200
Subject: ZVISION: The fist control is only used in one location

---
 engines/zvision/scripting/controls/fist_control.h | 2 +-
 engines/zvision/scripting/scr_file_handling.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index a41d8511ea..74e8f8d8a5 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -34,7 +34,7 @@ namespace Video {
 
 namespace ZVision {
 
-// Only used in Zork Nemesis, handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
+// Only used in Zork Nemesis, handles the door lock puzzle with the skeletal fingers (td9e)
 class FistControl : public Control {
 public:
 	FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 4e8c8a6b33..227c43557c 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -368,7 +368,7 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 		// Only used in Zork Nemesis, handles movies where the player needs to click on something (mj7g, vw3g)
 		return new HotMovControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("fist")) {
-		// Only used in Zork Nemesis, handles the door lock puzzle with the skeletal fingers (td60, td90, td9e)
+		// Only used in Zork Nemesis, handles the door lock puzzle with the skeletal fingers (td9e)
 		return new FistControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("paint")) {
 		// Only used in Zork Nemesis, handles the painting puzzle screen in Lucien's room in Irondune (ch4g)
-- 
cgit v1.2.3


From f1d6ba7085be53cb641f71ef726dadf3f075b311 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 28 Dec 2014 23:35:14 +0100
Subject: ACCESS: Remove useless variable

---
 engines/access/player.cpp | 1 -
 engines/access/player.h   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index bcd553c6dc..e47daf532c 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -48,7 +48,6 @@ Player::Player(AccessEngine *vm) : Manager(vm), ImageEntry() {
 	_playerSprites1 = nullptr;
 	_manPal1 = nullptr;
 	_frameNumber = 0;
-	_monData = nullptr;
 	_rawTempL = 0;
 	_rawXTemp = 0;
 	_rawYTempL = 0;
diff --git a/engines/access/player.h b/engines/access/player.h
index 26caec681f..329cc15ed2 100644
--- a/engines/access/player.h
+++ b/engines/access/player.h
@@ -84,7 +84,6 @@ public:
 	Direction _playerDirection;
 	SpriteResource *_playerSprites;
 	// Fields in original Player structure
-	byte *_monData;
 	int _walkOffRight[PLAYER_DATA_COUNT];
 	int _walkOffLeft[PLAYER_DATA_COUNT];
 	int _walkOffUp[PLAYER_DATA_COUNT];
-- 
cgit v1.2.3


From 6d55998b40f62518959f849922919b6b0562981e Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 28 Dec 2014 21:19:27 -0500
Subject: ZVISION: Make the rest of the controls properly use VideoDecoder
 timing

The hacky use of getDuration() to retrieve the framerate() is gone

Thanks to md5 for testing (and for filling in a few gaps since I was coding in the blind ;))
---
 .../zvision/scripting/controls/fist_control.cpp    | 53 +++++++---------------
 engines/zvision/scripting/controls/fist_control.h  |  5 --
 .../zvision/scripting/controls/hotmov_control.cpp  | 53 +++++++++-------------
 .../zvision/scripting/controls/hotmov_control.h    |  4 --
 .../zvision/scripting/controls/input_control.cpp   | 19 ++------
 .../zvision/scripting/controls/safe_control.cpp    | 53 ++++++----------------
 engines/zvision/scripting/controls/safe_control.h  |  7 ---
 7 files changed, 58 insertions(+), 136 deletions(-)

diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 34a64b4298..4a8e8b1bbd 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -46,10 +46,6 @@ FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 	_order = 0;
 	_fistnum = 0;
 
-	_frameCur = -1;
-	_frameEnd = -1;
-	_frameTime = 0;
-	_lastRenderedFrame = -1;
 	_animationId = 0;
 
 	clearFistArray(_fistsUp);
@@ -95,41 +91,23 @@ FistControl::~FistControl() {
 	_entries.clear();
 }
 
-void FistControl::renderFrame(uint frameNumber) {
-	if ((int32)frameNumber == _lastRenderedFrame)
-		return;
-
-	_lastRenderedFrame = frameNumber;
-
-	const Graphics::Surface *frameData;
-
-	if (_animation) {
-		_animation->seekToFrame(frameNumber);
-		frameData = _animation->decodeNextFrame();
-		if (frameData)
-			_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _anmRect);
-	}
-}
-
 bool FistControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_frameCur >= 0 && _frameEnd >= 0)
-		if (_frameCur <= _frameEnd) {
-			_frameTime -= deltaTimeInMillis;
-
-			if (_frameTime <= 0) {
-				_frameTime = 1000.0 / _animation->getDuration().framerate();
-
-				renderFrame(_frameCur);
-
-				_frameCur++;
+	if (_animation && _animation->isPlaying()) {
+		if (_animation->endOfVideo()) {
+			_animation->stop();
+			_engine->getScriptManager()->setStateValue(_animationId, 2);
+			return false;
+		}
 
-				if (_frameCur > _frameEnd)
-					_engine->getScriptManager()->setStateValue(_animationId, 2);
-			}
+		if (_animation->needsUpdate()) {
+			const Graphics::Surface *frameData = _animation->decodeNextFrame();
+			if (frameData)
+				_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _anmRect);
 		}
+	}
 
 	return false;
 }
@@ -160,9 +138,12 @@ bool FistControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 
 		for (int i = 0; i < _numEntries; i++)
 			if (_entries[i]._bitsStrt == oldStatus && _entries[i]._bitsEnd == _fiststatus) {
-				_frameCur = _entries[i]._anmStrt;
-				_frameEnd = _entries[i]._anmEnd;
-				_frameTime = 0;
+				if (_animation) {
+					_animation->stop();
+					_animation->seekToFrame(_entries[i]._anmStrt);
+					_animation->setEndFrame(_entries[i]._anmEnd);
+					_animation->start();
+				}
 
 				_engine->getScriptManager()->setStateValue(_animationId, 1);
 				_engine->getScriptManager()->setStateValue(_soundKey, _entries[i]._sound);
diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h
index 74e8f8d8a5..d7cbcb1f71 100644
--- a/engines/zvision/scripting/controls/fist_control.h
+++ b/engines/zvision/scripting/controls/fist_control.h
@@ -64,10 +64,6 @@ private:
 	Video::VideoDecoder *_animation;
 	Common::Rect _anmRect;
 	int32   _soundKey;
-	int32   _frameCur;
-	int32   _frameEnd;
-	int32   _frameTime;
-	int32   _lastRenderedFrame;
 	int32   _animationId;
 
 public:
@@ -76,7 +72,6 @@ public:
 	bool process(uint32 deltaTimeInMillis);
 
 private:
-	void renderFrame(uint frameNumber);
 	void readDescFile(const Common::String &fileName);
 	void clearFistArray(Common::Array< Common::Array<Common::Rect> > &arr);
 	uint32 readBits(const char *str);
diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index e77272ec73..182447a990 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -41,10 +41,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 	: Control(engine, key, CONTROL_HOTMOV) {
 	_animation = NULL;
 	_cycle = 0;
-	_curFrame = -1;
-	_lastRenderedFrame = -1;
 	_frames.clear();
-	_frameTime = 0;
 	_cyclesCount = 0;
 	_framesCount = 0;
 
@@ -78,6 +75,7 @@ HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadSt
 			sscanf(values.c_str(), "%s", filename);
 			values = Common::String(filename);
 			_animation = _engine->loadAnimation(values);
+			_animation->start();
 		} else if (param.matchString("venus_id", true)) {
 			_venusId = atoi(values.c_str());
 		}
@@ -95,41 +93,26 @@ HotMovControl::~HotMovControl() {
 	_frames.clear();
 }
 
-void HotMovControl::renderFrame(uint frameNumber) {
-	if ((int)frameNumber == _lastRenderedFrame)
-		return;
-
-	_lastRenderedFrame = frameNumber;
-
-	const Graphics::Surface *frameData;
-
-	if (_animation) {
-		_animation->seekToFrame(frameNumber);
-		frameData = _animation->decodeNextFrame();
-		if (frameData)
-			_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _rectangle);
-	}
-}
-
 bool HotMovControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
 	if (_cycle < _cyclesCount) {
-		_frameTime -= deltaTimeInMillis;
+		if (_animation && _animation->endOfVideo()) {
+			_cycle++;
 
-		if (_frameTime <= 0) {
-			_curFrame++;
-			if (_curFrame >= _framesCount) {
-				_curFrame = 0;
-				_cycle++;
-			}
-			if (_cycle != _cyclesCount)
-				renderFrame(_curFrame);
-			else
+			if (_cycle == _cyclesCount) {
 				_engine->getScriptManager()->setStateValue(_key, 2);
+				return false;
+			}
+
+			_animation->rewind();
+		}
 
-			_frameTime = 1000.0 / _animation->getDuration().framerate();
+		if (_animation && _animation->needsUpdate()) {
+			const Graphics::Surface *frameData = _animation->decodeNextFrame();
+			if (frameData)
+				_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _rectangle);
 		}
 	}
 
@@ -140,8 +123,11 @@ bool HotMovControl::onMouseMove(const Common::Point &screenSpacePos, const Commo
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
+	if (!_animation)
+		return false;
+
 	if (_cycle < _cyclesCount) {
-		if (_frames[_curFrame].contains(backgroundImageSpacePos)) {
+		if (_frames[_animation->getCurFrame()].contains(backgroundImageSpacePos)) {
 			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
 			return true;
 		}
@@ -154,8 +140,11 @@ bool HotMovControl::onMouseUp(const Common::Point &screenSpacePos, const Common:
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
+	if (!_animation)
+		return false;
+
 	if (_cycle < _cyclesCount) {
-		if (_frames[_curFrame].contains(backgroundImageSpacePos)) {
+		if (_frames[_animation->getCurFrame()].contains(backgroundImageSpacePos)) {
 			setVenus();
 			_engine->getScriptManager()->setStateValue(_key, 1);
 			return true;
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index 01c83b5837..99d1fd0979 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -42,9 +42,6 @@ public:
 
 private:
 	int32  _framesCount;
-	int32  _frameTime;
-	int32  _curFrame;
-	int32  _lastRenderedFrame;
 	int32  _cycle;
 	int32  _cyclesCount;
 	Video::VideoDecoder *_animation;
@@ -56,7 +53,6 @@ public:
 	bool process(uint32 deltaTimeInMillis);
 
 private:
-	void renderFrame(uint frameNumber);
 	void readHsFile(const Common::String &fileName);
 };
 
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 4abc0c9e1b..47da27fa08 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -46,9 +46,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _enterPressed(false),
 	  _readOnly(false),
 	  _txtWidth(0),
-	  _animation(NULL),
-	  _frameDelay(0),
-	  _frame(-1) {
+	  _animation(NULL) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
@@ -99,8 +97,7 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 			sscanf(values.c_str(), "%24s %*u", fileName);
 
 			_animation = _engine->loadAnimation(fileName);
-			_frame = -1;
-			_frameDelay = 0;
+			_animation->start();
 		} else if (param.matchString("focus", true)) {
 			_focused = true;
 			_engine->getScriptManager()->setFocusControlKey(_key);
@@ -212,16 +209,10 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 	}
 
 	if (_animation && !_readOnly && _focused) {
-		bool needDraw = true;// = _textChanged;
-		_frameDelay -= deltaTimeInMillis;
-		if (_frameDelay <= 0) {
-			_frame = (_frame + 1) % _animation->getFrameCount();
-			_frameDelay = 1000.0 / _animation->getDuration().framerate();
-			needDraw = true;
-		}
+		if (_animation->endOfVideo())
+			_animation->rewind();
 
-		if (needDraw) {
-			_animation->seekToFrame(_frame);
+		if (_animation->needsUpdate()) {
 			const Graphics::Surface *srf = _animation->decodeNextFrame();
 			int16 xx = _textRectangle.left + _txtWidth;
 			if (xx >= _textRectangle.left + (_textRectangle.width() - (int16)_animation->getWidth()))
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 71be692431..6ba34106d0 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -49,10 +49,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 	_outerRadiusSqr = 0;
 	_zeroPointer = 0;
 	_startPointer = 0;
-	_curFrame = -1;
 	_targetFrame = 0;
-	_frameTime = 0;
-	_lastRenderedFrame = -1;
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
@@ -64,6 +61,7 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 	while (!stream.eos() && !line.contains('}')) {
 		if (param.matchString("animation", true)) {
 			_animation = _engine->loadAnimation(values);
+			_animation->start();
 		} else if (param.matchString("rectangle", true)) {
 			int x;
 			int y;
@@ -104,7 +102,9 @@ SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
-	renderFrame(_curState);
+
+	if (_animation)
+		_animation->seekToFrame(_curState);
 }
 
 SafeControl::~SafeControl() {
@@ -113,44 +113,20 @@ SafeControl::~SafeControl() {
 
 }
 
-void SafeControl::renderFrame(uint frameNumber) {
-	if (frameNumber == 0) {
-		_lastRenderedFrame = frameNumber;
-	} else if ((int16)frameNumber < _lastRenderedFrame) {
-		_lastRenderedFrame = frameNumber;
-		frameNumber = (_statesCount * 2) - frameNumber;
-	} else {
-		_lastRenderedFrame = frameNumber;
-	}
-
-	const Graphics::Surface *frameData;
-	int x = _rectangle.left;
-	int y = _rectangle.top;
-
-	_animation->seekToFrame(frameNumber);
-	frameData = _animation->decodeNextFrame();
-	if (frameData)
-		_engine->getRenderManager()->blitSurfaceToBkg(*frameData, x, y);
-}
-
 bool SafeControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
-	if (_curFrame != _targetFrame) {
-		_frameTime -= deltaTimeInMillis;
-
-		if (_frameTime <= 0) {
-			if (_curFrame < _targetFrame) {
-				_curFrame++;
-				renderFrame(_curFrame);
-			} else if (_curFrame > _targetFrame) {
-				_curFrame--;
-				renderFrame(_curFrame);
-			}
-			_frameTime = 1000.0 / _animation->getDuration().framerate();
-		}
+	if (_animation && _animation->getCurFrame() != _targetFrame && _animation->needsUpdate()) {
+		// If we're past the target frame, move back one
+		if (_animation->getCurFrame() > _targetFrame)
+			_animation->seekToFrame(_animation->getCurFrame() - 1);
+
+		const Graphics::Surface *frameData = _animation->decodeNextFrame();
+		if (frameData)
+			_engine->getRenderManager()->blitSurfaceToBkg(*frameData, _rectangle.left, _rectangle.top);
 	}
+
 	return false;
 }
 
@@ -187,7 +163,8 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 
 			int16 tmp2 = (m_state + _curState - _zeroPointer + _statesCount - 1) % _statesCount;
 
-			_curFrame = (_curState + _statesCount - _startPointer) % _statesCount;
+			if (_animation)
+				_animation->seekToFrame((_curState + _statesCount - _startPointer) % _statesCount);
 
 			_curState = (_statesCount * 2 + tmp2) % _statesCount;
 
diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h
index 2577ff4f79..3e8c17635c 100644
--- a/engines/zvision/scripting/controls/safe_control.h
+++ b/engines/zvision/scripting/controls/safe_control.h
@@ -52,19 +52,12 @@ private:
 	int32  _outerRadiusSqr;
 	int16  _zeroPointer;
 	int16  _startPointer;
-	int16  _curFrame;
 	int16  _targetFrame;
-	int32  _frameTime;
-
-	int16 _lastRenderedFrame;
 
 public:
 	bool onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	bool onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos);
 	bool process(uint32 deltaTimeInMillis);
-
-private:
-	void renderFrame(uint frameNumber);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 83dd389d255ae63affc3600742d564a8d2cb914c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 29 Dec 2014 12:13:43 +0200
Subject: CREDITS: Update credits for ZVision again

---
 devtools/credits.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/credits.pl b/devtools/credits.pl
index 69eede756d..7dc954a6a7 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -792,7 +792,7 @@ begin_credits("Credits");
 			begin_section("ZVision");
 				add_person("Adrian Astley", "RichieSams", "");
 				add_person("Filippos Karapetis", "[md5]", "");
-				add_person("Anton Yarcev", "Marisa-Chan", "");
+				add_person("Anton Yarcev", "Zidane", "");
 			end_section();
 
 		end_section();
-- 
cgit v1.2.3


From f4d5b150f1e4b786f2f6f79a1acd3315da9a8699 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 29 Dec 2014 12:34:55 +0200
Subject: ZVISION: Show system messages when subtitles are disabled

Thanks to Marisa-Chan for spotting this
---
 engines/zvision/graphics/render_manager.cpp         | 2 +-
 engines/zvision/scripting/sidefx/music_node.cpp     | 2 +-
 engines/zvision/scripting/sidefx/syncsound_node.cpp | 2 +-
 engines/zvision/video/video.cpp                     | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 033d099042..1b80b379bf 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -741,7 +741,7 @@ void RenderManager::processSubs(uint16 deltatime) {
 		}
 	}
 
-	if (redraw && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1) {
+	if (redraw) {
 		_subtitleSurface.fillRect(Common::Rect(_subtitleSurface.w, _subtitleSurface.h), 0);
 
 		for (SubtitleMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index 6be08b46dc..0cada6d748 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -137,7 +137,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 		if (_pantrack || _volume != _newvol)
 			setVolume(_newvol);
 
-		if (_sub)
+		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
 			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
 	}
 	return false;
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
index c1f139694b..eec320bf2e 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.cpp
+++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp
@@ -76,7 +76,7 @@ bool SyncSoundNode::process(uint32 deltaTimeInMillis) {
 		if (_engine->getScriptManager()->getSideFX(_syncto) == NULL)
 			return stop();
 
-		if (_sub)
+		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
 			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
 	}
 	return false;
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index e67e6570c5..0913b28818 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -29,6 +29,7 @@
 #include "zvision/zvision.h"
 #include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/scripting//script_manager.h"
 #include "zvision/text/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
@@ -75,6 +76,7 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 	uint16 y = _workingWindow.top + dst.top;
 	uint16 finalWidth = dst.width() < _workingWindow.width() ? dst.width() : _workingWindow.width();
 	uint16 finalHeight = dst.height() < _workingWindow.height() ? dst.height() : _workingWindow.height();
+	bool showSubs = (_scriptManager->getStateValue(StateKey_Subtitles) == 1);
 
 	_clock.stop();
 	vid.start();
@@ -106,7 +108,7 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 
 		if (vid.needsUpdate()) {
 			const Graphics::Surface *frame = vid.decodeNextFrame();
-			if (sub)
+			if (sub && showSubs)
 				sub->process(vid.getCurFrame());
 
 			if (frame) {
-- 
cgit v1.2.3


From bbfff93c6455247d9875003cdfd18c09d0c30e0f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 29 Dec 2014 14:56:02 +0100
Subject: GUI: Do not overwrite write protected saves in grid based save
 dialog.

This fixes overwriting of, for example, autosaves in the grid based save load
dialog when using "New Save".
---
 gui/saveload-dialog.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index 339ec95c50..a333c5fe57 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -654,16 +654,25 @@ void SaveLoadChooserGrid::open() {
 
 			// In case there was a gap found use the slot.
 			if (lastSlot + 1 < curSlot) {
-				_nextFreeSaveSlot = lastSlot + 1;
-				break;
+				// Check that the save slot can be used for user saves.
+				SaveStateDescriptor desc = _metaEngine->querySaveMetaInfos(_target.c_str(), lastSlot + 1);
+				if (!desc.getWriteProtectedFlag()) {
+					_nextFreeSaveSlot = lastSlot + 1;
+					break;
+				}
 			}
 
 			lastSlot = curSlot;
 		}
 
 		// Use the next available slot otherwise.
-		if (_nextFreeSaveSlot == -1 && lastSlot + 1 < _metaEngine->getMaximumSaveSlot()) {
-			_nextFreeSaveSlot = lastSlot + 1;
+		const int maxSlot = _metaEngine->getMaximumSaveSlot();
+		for (int i = lastSlot; _nextFreeSaveSlot == -1 && i < maxSlot; ++i) {
+			// Check that the save slot can be used for user saves.
+			SaveStateDescriptor desc = _metaEngine->querySaveMetaInfos(_target.c_str(), i + 1);
+			if (!desc.getWriteProtectedFlag()) {
+				_nextFreeSaveSlot = i + 1;
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 45280d035afe29dc1f8971eac713ea1fdb64bfb5 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Mon, 29 Dec 2014 15:30:12 +0600
Subject: ZVISION: Fix font error message condition

---
 engines/zvision/zvision.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 88cc1e2fea..10e0aaedc4 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -255,7 +255,7 @@ Common::Error ZVision::run() {
 		_saveManager->loadGame(ConfMan.getInt("save_slot"));
 
 	// Before starting, make absolutely sure that the user has copied the needed fonts
-	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf")) {
+	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf") && !_searchManager->hasFile("arial.ttf")  && !_searchManager->hasFile("FreeSans.ttf") ) {
 		GUI::MessageDialog dialog(
 				"Before playing this game, you'll need to copy the required "
 				"fonts into ScummVM's extras directory, or into the game directory. "
-- 
cgit v1.2.3


From 47b90ef3cde832b6314bbcc0321cb074408d944e Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 24 Dec 2014 09:31:02 +0600
Subject: ZVISION: Search fonts in game directory (e.g. in game/FONTS/)

---
 engines/zvision/text/truetype_font.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index f64c0ab3bc..85d9fa5a29 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -108,7 +108,7 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
 
 	Common::File file;
-	if (!file.open(newFontName) && !file.open(freeFontName))
+	if (!file.open(newFontName) && !file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, newFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
 		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
 
 	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-- 
cgit v1.2.3


From 0c4e0673c3a7d17aef7c586251c3990104163bc3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 30 Dec 2014 03:08:39 +0200
Subject: ZVISION: Further cleanup to the AnimationNode class

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 20 ++++++--------------
 engines/zvision/scripting/sidefx/animation_node.h   |  6 ++----
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index 1657a6e0ec..a0870bf7c2 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -33,14 +33,13 @@
 
 namespace ZVision {
 
-AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
+AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool disposeAfterUse)
 	: SideFX(engine, controlKey, SIDEFX_ANIM),
-	  _DisposeAfterUse(DisposeAfterUse),
+	  _disposeAfterUse(disposeAfterUse),
 	  _mask(mask),
 	  _animation(NULL) {
 
 	_animation = engine->loadAnimation(fileName);
-	_animation->start();
 
 	if (frate > 0) {
 		_frmDelayOverride = (int32)(1000.0 / frate);
@@ -89,12 +88,10 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 	if (it != _playList.end()) {
 		playnode *nod = &(*it);
 
-		if (nod->_curFrame == -1) {
+		if (!_animation->isPlaying()) {
 			// The node is just beginning playback
-			nod->_curFrame = nod->start;
-
+			_animation->start();
 			_animation->seekToFrame(nod->start);
-			_animation->setEndFrame(nod->stop);
 
 			nod->_delay = deltaTimeInMillis; // Force the frame to draw
 			if (nod->slot)
@@ -111,10 +108,9 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
 					delete nod->_scaled;
 				}
 				_playList.erase(it);
-				return _DisposeAfterUse;
+				return _disposeAfterUse;
 			}
 
-			nod->_curFrame = nod->start;
 			_animation->seekToFrame(nod->start);
 		}
 
@@ -190,13 +186,9 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.loop = loops;
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = startFrame;
-	nod.stop = endFrame;
-
-	if (nod.stop >= (int)_animation->getFrameCount())
-		nod.stop = _animation->getFrameCount() - 1;
+	_animation->setEndFrame(CLIP<int>(endFrame, 0,_animation->getFrameCount() - 1));
 
 	nod.slot = slot;
-	nod._curFrame = -1;
 	nod._delay = 0;
 	nod._scaled = NULL;
 	_playList.push_back(nod);
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
index 64270ebc79..1dc0dc71b8 100644
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ b/engines/zvision/scripting/sidefx/animation_node.h
@@ -41,16 +41,14 @@ class ZVision;
 
 class AnimationNode : public SideFX {
 public:
-	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse = true);
+	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool disposeAfterUse = true);
 	~AnimationNode();
 
 	struct playnode {
 		Common::Rect pos;
 		int32 slot;
 		int32 start;
-		int32 stop;
 		int32 loop;
-		int32 _curFrame;
 		int32 _delay;
 		Graphics::Surface *_scaled;
 	};
@@ -61,7 +59,7 @@ private:
 	PlayNodes _playList;
 
 	int32 _mask;
-	bool _DisposeAfterUse;
+	bool _disposeAfterUse;
 
 	Video::VideoDecoder *_animation;
 	int32 _frmDelayOverride;
-- 
cgit v1.2.3


From 7182b4f704a312427dc701ccc8452331ca66faae Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 30 Dec 2014 03:51:15 +0200
Subject: ZVISION: Initialize the starting frame to -1 in RLF animations

---
 engines/zvision/video/rlf_decoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 1478822d00..6e2000f93c 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -56,7 +56,7 @@ RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _curFrame(0),
+	  _curFrame(-1),
 	  _frameBufferByteSize(0) {
 
 	if (!readHeader()) {
-- 
cgit v1.2.3


From 6c3af3c2e7b8d2852669c141944964c82a11ce1b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 30 Dec 2014 03:51:31 +0200
Subject: ZVISION: White space

---
 engines/zvision/scripting/sidefx/animation_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index a0870bf7c2..07eda692c1 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -186,7 +186,7 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.loop = loops;
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = startFrame;
-	_animation->setEndFrame(CLIP<int>(endFrame, 0,_animation->getFrameCount() - 1));
+	_animation->setEndFrame(CLIP<int>(endFrame, 0, _animation->getFrameCount() - 1));
 
 	nod.slot = slot;
 	nod._delay = 0;
-- 
cgit v1.2.3


From f74ba29753de23bad9a07f531fc4c03ea3375594 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 30 Dec 2014 03:45:14 +0100
Subject: SCUMM: Enable Day of the Tentacle easter egg

Instead of returning to the launcher, a game may now specify a list
of "chained" games and optional save slots. The first game is popped
from the list and started. Quitting still quits the entire ScummVM.
It seemed like the sensible thing to do.
---
 base/main.cpp               | 50 +++++++++++++++++++++++++++++++++++++++++----
 engines/scumm/saveload.cpp  |  2 +-
 engines/scumm/script_v6.cpp |  6 +++++-
 engines/scumm/scumm.cpp     | 44 ++++++++++++++++++++++++++++++++++++---
 engines/scumm/scumm.h       |  2 +-
 5 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/base/main.cpp b/base/main.cpp
index b5de7d94d2..b9bd97dbef 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -523,22 +523,64 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			}
 			#endif
 
+			// At this point, we usually return to the launcher. However, the
+			// game may have requested that one or more other games be "chained"
+			// to the current one, with optional save slots to start the games
+			// at. At the time of writing, this is used for the Maniac Mansion
+			// easter egg in Day of the Tentacle.
+
+			Common::String chainedGames, nextGame, saveSlot;
+
+			if (ConfMan.hasKey("chained_games", Common::ConfigManager::kTransientDomain)) {
+				chainedGames = ConfMan.get("chained_games", Common::ConfigManager::kTransientDomain);
+			}
+
 			// Discard any command line options. It's unlikely that the user
 			// wanted to apply them to *all* games ever launched.
 			ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
 
-			// Clear the active config domain
-			ConfMan.setActiveDomain("");
+			if (!chainedGames.empty()) {
+				if (chainedGames.contains(',')) {
+					for (uint i = 0; i < chainedGames.size(); i++) {
+						if (chainedGames[i] == ',') {
+							chainedGames.erase(0, i + 1);
+							break;
+						}
+						nextGame += chainedGames[i];
+					}
+					ConfMan.set("chained_games", chainedGames, Common::ConfigManager::kTransientDomain);
+				} else {
+					nextGame = chainedGames;
+					chainedGames.clear();
+					ConfMan.removeKey("chained_games", Common::ConfigManager::kTransientDomain);
+				}
+				if (nextGame.contains(':')) {
+					for (int i = nextGame.size() - 1; i >= 0; i--) {
+						if (nextGame[i] == ':') {
+							nextGame.erase(i);
+							break;
+						}
+						saveSlot = nextGame[i] + saveSlot;
+					}
+					ConfMan.setInt("save_slot", atoi(saveSlot.c_str()), Common::ConfigManager::kTransientDomain);
+				}
+				// Start the next game
+				ConfMan.setActiveDomain(nextGame);
+			} else {
+				// Clear the active config domain
+				ConfMan.setActiveDomain("");
+			}
 
 			PluginManager::instance().loadAllPlugins(); // only for cached manager
-
 		} else {
 			GUI::displayErrorDialog(_("Could not find any engine capable of running the selected game"));
 		}
 
 		// reset the graphics to default
 		setupGraphics(system);
-		launcherDialog();
+		if (0 == ConfMan.getActiveDomain()) {
+			launcherDialog();
+		}
 	}
 	PluginManager::instance().unloadAllPlugins();
 	PluginManager::destroy();
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 0c0f6be73b..e5673c1803 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -149,7 +149,7 @@ void ScummEngine::requestSave(int slot, const Common::String &name) {
 
 void ScummEngine::requestLoad(int slot) {
 	_saveLoadSlot = slot;
-	_saveTemporaryState = false;
+	_saveTemporaryState = (slot == 100);
 	_saveLoadFlag = 2;		// 2 for load
 }
 
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index d2f4133f74..6c81f17f2f 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2597,7 +2597,11 @@ void ScummEngine_v6::o6_kernelSetFunctions() {
 		fadeIn(args[1]);
 		break;
 	case 8:
-		startManiac();
+		if (startManiac()) {
+			// This is so that the surprised exclamation happens
+			// after we return to the game again, not before.
+			o6_breakHere();
+		}
 		break;
 	case 9:
 		killAllScriptsExceptCurrent();
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 6040344c2c..34ae957951 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2597,9 +2597,47 @@ void ScummEngine_v90he::runBootscript() {
 }
 #endif
 
-void ScummEngine::startManiac() {
-	debug(0, "stub startManiac()");
-	displayMessage(0, "%s", _("Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory."));
+bool ScummEngine::startManiac() {
+	Common::String currentPath = ConfMan.get("path");
+	Common::String maniacTarget;
+
+	// Look for a game with a game path pointing to a 'Maniac' directory
+	// as a subdirectory to the current game.
+	Common::ConfigManager::DomainMap::iterator iter = ConfMan.beginGameDomains();
+	for (; iter != ConfMan.endGameDomains(); ++iter) {
+		Common::ConfigManager::Domain &dom = iter->_value;
+		Common::String path = dom.getVal("path");
+
+		if (path.hasPrefix(currentPath)) {
+			path.erase(0, currentPath.size() + 1);
+			if (path.equalsIgnoreCase("maniac")) {
+				maniacTarget = dom.getVal("gameid");
+				break;
+			}
+		}
+	}
+
+	if (!maniacTarget.empty()) {
+		// Request a temporary save game to be made.
+		_saveLoadFlag = 1;
+		_saveLoadSlot = 100;
+		_saveTemporaryState = true;
+
+		// Set up the chanined games to Maniac Mansion, and then back
+		// to the current game again with that save slot.
+		ConfMan.set("chained_games", maniacTarget + "," + ConfMan.getActiveDomainName() + ":100", Common::ConfigManager::kTransientDomain);
+
+		// Force a return to the launcher. This will start the first
+		// chained game.
+		Common::EventManager *eventMan = g_system->getEventManager();
+		Common::Event event;
+		event.type = Common::EVENT_RTL;
+		eventMan->pushEvent(event);
+		return true;
+	} else {
+		displayMessage(0, "%s", _("Usually, Maniac Mansion would start now. But for that to work, the game files for Maniac Mansion have to be in the 'Maniac' directory inside the Tentacle game directory, and the game has to be added to ScummVM."));
+		return false;
+	}
 }
 
 #pragma mark -
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 967909e505..30b4d61880 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -654,7 +654,7 @@ protected:
 	int	getScriptSlot();
 
 	void startScene(int room, Actor *a, int b);
-	void startManiac();
+	bool startManiac();
 
 public:
 	void runScript(int script, bool freezeResistant, bool recursive, int *lvarptr, int cycle = 0);
-- 
cgit v1.2.3


From 68d3ebd57b0313e517032681a119b47956803e71 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 01:10:36 -0600
Subject: ZVISION: Rename some scripting classes to better represent what the
 classes are

Also, rename the graphics 'Effect' class in order to avoid naming clashes (and/or coder
confusion) with the newly named ScriptingEffect class.
Lastly, add some documentation for the classes for further clarity.
---
 engines/zvision/graphics/effect.h                  |  83 -------
 engines/zvision/graphics/effects/fog.cpp           |   2 +-
 engines/zvision/graphics/effects/fog.h             |   4 +-
 engines/zvision/graphics/effects/light.cpp         |   2 +-
 engines/zvision/graphics/effects/light.h           |   4 +-
 engines/zvision/graphics/effects/wave.cpp          |   2 +-
 engines/zvision/graphics/effects/wave.h            |   4 +-
 engines/zvision/graphics/graphics_effect.h         |  83 +++++++
 engines/zvision/graphics/render_manager.cpp        |   2 +-
 engines/zvision/graphics/render_manager.h          |   6 +-
 engines/zvision/module.mk                          |  14 +-
 engines/zvision/scripting/actions.cpp              |  66 +++---
 engines/zvision/scripting/control.h                |   5 +
 .../zvision/scripting/effects/animation_effect.cpp | 213 ++++++++++++++++++
 .../zvision/scripting/effects/animation_effect.h   |  77 +++++++
 .../zvision/scripting/effects/distort_effect.cpp   | 104 +++++++++
 engines/zvision/scripting/effects/distort_effect.h |  63 ++++++
 engines/zvision/scripting/effects/music_effect.cpp | 248 +++++++++++++++++++++
 engines/zvision/scripting/effects/music_effect.h   | 135 +++++++++++
 .../zvision/scripting/effects/region_effect.cpp    |  56 +++++
 engines/zvision/scripting/effects/region_effect.h  |  57 +++++
 .../zvision/scripting/effects/syncsound_effect.cpp |  85 +++++++
 .../zvision/scripting/effects/syncsound_effect.h   |  56 +++++
 engines/zvision/scripting/effects/timer_effect.cpp |  81 +++++++
 engines/zvision/scripting/effects/timer_effect.h   |  59 +++++
 .../zvision/scripting/effects/ttytext_effect.cpp   | 174 +++++++++++++++
 engines/zvision/scripting/effects/ttytext_effect.h |  73 ++++++
 engines/zvision/scripting/script_manager.cpp       |   8 +-
 engines/zvision/scripting/script_manager.h         |  10 +-
 engines/zvision/scripting/scripting_effect.h       | 124 +++++++++++
 engines/zvision/scripting/sidefx.h                 | 114 ----------
 .../zvision/scripting/sidefx/animation_node.cpp    | 213 ------------------
 engines/zvision/scripting/sidefx/animation_node.h  |  77 -------
 engines/zvision/scripting/sidefx/distort_node.cpp  | 104 ---------
 engines/zvision/scripting/sidefx/distort_node.h    |  63 ------
 engines/zvision/scripting/sidefx/music_node.cpp    | 248 ---------------------
 engines/zvision/scripting/sidefx/music_node.h      | 135 -----------
 engines/zvision/scripting/sidefx/region_node.cpp   |  56 -----
 engines/zvision/scripting/sidefx/region_node.h     |  57 -----
 .../zvision/scripting/sidefx/syncsound_node.cpp    |  85 -------
 engines/zvision/scripting/sidefx/syncsound_node.h  |  56 -----
 engines/zvision/scripting/sidefx/timer_node.cpp    |  81 -------
 engines/zvision/scripting/sidefx/timer_node.h      |  59 -----
 engines/zvision/scripting/sidefx/ttytext_node.cpp  | 174 ---------------
 engines/zvision/scripting/sidefx/ttytext_node.h    |  73 ------
 45 files changed, 1755 insertions(+), 1740 deletions(-)
 delete mode 100644 engines/zvision/graphics/effect.h
 create mode 100644 engines/zvision/graphics/graphics_effect.h
 create mode 100644 engines/zvision/scripting/effects/animation_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/animation_effect.h
 create mode 100644 engines/zvision/scripting/effects/distort_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/distort_effect.h
 create mode 100644 engines/zvision/scripting/effects/music_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/music_effect.h
 create mode 100644 engines/zvision/scripting/effects/region_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/region_effect.h
 create mode 100644 engines/zvision/scripting/effects/syncsound_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/syncsound_effect.h
 create mode 100644 engines/zvision/scripting/effects/timer_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/timer_effect.h
 create mode 100644 engines/zvision/scripting/effects/ttytext_effect.cpp
 create mode 100644 engines/zvision/scripting/effects/ttytext_effect.h
 create mode 100644 engines/zvision/scripting/scripting_effect.h
 delete mode 100644 engines/zvision/scripting/sidefx.h
 delete mode 100644 engines/zvision/scripting/sidefx/animation_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/animation_node.h
 delete mode 100644 engines/zvision/scripting/sidefx/distort_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/distort_node.h
 delete mode 100644 engines/zvision/scripting/sidefx/music_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/music_node.h
 delete mode 100644 engines/zvision/scripting/sidefx/region_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/region_node.h
 delete mode 100644 engines/zvision/scripting/sidefx/syncsound_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/syncsound_node.h
 delete mode 100644 engines/zvision/scripting/sidefx/timer_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/timer_node.h
 delete mode 100644 engines/zvision/scripting/sidefx/ttytext_node.cpp
 delete mode 100644 engines/zvision/scripting/sidefx/ttytext_node.h

diff --git a/engines/zvision/graphics/effect.h b/engines/zvision/graphics/effect.h
deleted file mode 100644
index 234cd8209d..0000000000
--- a/engines/zvision/graphics/effect.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef EFFECT_H_INCLUDED
-#define EFFECT_H_INCLUDED
-
-#include "common/rect.h"
-#include "common/list.h"
-#include "graphics/surface.h"
-
-#include "zvision/zvision.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class Effect {
-public:
-
-	Effect(ZVision *engine, uint32 key, Common::Rect region, bool ported) : _engine(engine), _key(key), _region(region), _ported(ported) {
-		_surface.create(_region.width(), _region.height(), _engine->_resourcePixelFormat);
-	}
-	virtual ~Effect() {}
-
-	uint32 getKey() {
-		return _key;
-	}
-
-	Common::Rect getRegion() {
-		return _region;
-	}
-
-	bool isPort() {
-		return _ported;
-	}
-
-	virtual const Graphics::Surface *draw(const Graphics::Surface &srcSubRect) {
-		return &_surface;
-	}
-
-	virtual void update() {}
-
-protected:
-	ZVision *_engine;
-	uint32 _key;
-	Common::Rect _region;
-	bool _ported;
-	Graphics::Surface _surface;
-
-// Static member functions
-public:
-
-};
-
-struct EffectMapUnit {
-	uint32 count;
-	bool inEffect;
-};
-
-typedef Common::List<EffectMapUnit> EffectMap;
-
-} // End of namespace ZVision
-
-#endif // EFFECT_H_INCLUDED
diff --git a/engines/zvision/graphics/effects/fog.cpp b/engines/zvision/graphics/effects/fog.cpp
index c28bdde330..32a01915d3 100644
--- a/engines/zvision/graphics/effects/fog.cpp
+++ b/engines/zvision/graphics/effects/fog.cpp
@@ -31,7 +31,7 @@
 namespace ZVision {
 
 FogFx::FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds):
-	Effect(engine, key, region, ported) {
+	GraphicsEffect(engine, key, region, ported) {
 
 	_map = Map;
 
diff --git a/engines/zvision/graphics/effects/fog.h b/engines/zvision/graphics/effects/fog.h
index fe88707bbe..498347609e 100644
--- a/engines/zvision/graphics/effects/fog.h
+++ b/engines/zvision/graphics/effects/fog.h
@@ -23,14 +23,14 @@
 #ifndef ZVISION_FOG_H
 #define ZVISION_FOG_H
 
-#include "zvision/graphics/effect.h"
+#include "zvision/graphics/graphics_effect.h"
 
 namespace ZVision {
 
 class ZVision;
 
 // Used by Zork: Nemesis for the mixing chamber gas effect in the gas puzzle (location tt5e, when the blinds are down)
-class FogFx : public Effect {
+class FogFx : public GraphicsEffect {
 public:
 
 	FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds);
diff --git a/engines/zvision/graphics/effects/light.cpp b/engines/zvision/graphics/effects/light.cpp
index bf6513292f..39341687f8 100644
--- a/engines/zvision/graphics/effects/light.cpp
+++ b/engines/zvision/graphics/effects/light.cpp
@@ -30,7 +30,7 @@
 namespace ZVision {
 
 LightFx::LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD, int8 maxD):
-	Effect(engine, key, region, ported) {
+	GraphicsEffect(engine, key, region, ported) {
 	_map = Map;
 	_delta = delta;
 	_up = true;
diff --git a/engines/zvision/graphics/effects/light.h b/engines/zvision/graphics/effects/light.h
index ae87d66cb3..cd73a585ec 100644
--- a/engines/zvision/graphics/effects/light.h
+++ b/engines/zvision/graphics/effects/light.h
@@ -23,13 +23,13 @@
 #ifndef LIGHTFX_H_INCLUDED
 #define LIGHTFX_H_INCLUDED
 
-#include "zvision/graphics/effect.h"
+#include "zvision/graphics/graphics_effect.h"
 
 namespace ZVision {
 
 class ZVision;
 
-class LightFx : public Effect {
+class LightFx : public GraphicsEffect {
 public:
 
 	LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD = -127, int8 maxD = 127);
diff --git a/engines/zvision/graphics/effects/wave.cpp b/engines/zvision/graphics/effects/wave.cpp
index 1b3aa040e8..cec631611b 100644
--- a/engines/zvision/graphics/effects/wave.cpp
+++ b/engines/zvision/graphics/effects/wave.cpp
@@ -30,7 +30,7 @@
 namespace ZVision {
 
 WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd):
-	Effect(engine, key, region, ported) {
+	GraphicsEffect(engine, key, region, ported) {
 
 	_frame = 0;
 	_frameCount = frames;
diff --git a/engines/zvision/graphics/effects/wave.h b/engines/zvision/graphics/effects/wave.h
index 2e813ed5b6..8e912372d7 100644
--- a/engines/zvision/graphics/effects/wave.h
+++ b/engines/zvision/graphics/effects/wave.h
@@ -24,13 +24,13 @@
 #define WAVEFX_H_INCLUDED
 
 #include "common/array.h"
-#include "zvision/graphics/effect.h"
+#include "zvision/graphics/graphics_effect.h"
 
 namespace ZVision {
 
 class ZVision;
 
-class WaveFx : public Effect {
+class WaveFx : public GraphicsEffect {
 public:
 
 	WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd);
diff --git a/engines/zvision/graphics/graphics_effect.h b/engines/zvision/graphics/graphics_effect.h
new file mode 100644
index 0000000000..bfa266b11d
--- /dev/null
+++ b/engines/zvision/graphics/graphics_effect.h
@@ -0,0 +1,83 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GRAPHICS_EFFECT_H_INCLUDED
+#define GRAPHICS_EFFECT_H_INCLUDED
+
+#include "common/rect.h"
+#include "common/list.h"
+#include "graphics/surface.h"
+
+#include "zvision/zvision.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class GraphicsEffect {
+public:
+
+	GraphicsEffect(ZVision *engine, uint32 key, Common::Rect region, bool ported) : _engine(engine), _key(key), _region(region), _ported(ported) {
+		_surface.create(_region.width(), _region.height(), _engine->_resourcePixelFormat);
+	}
+	virtual ~GraphicsEffect() {}
+
+	uint32 getKey() {
+		return _key;
+	}
+
+	Common::Rect getRegion() {
+		return _region;
+	}
+
+	bool isPort() {
+		return _ported;
+	}
+
+	virtual const Graphics::Surface *draw(const Graphics::Surface &srcSubRect) {
+		return &_surface;
+	}
+
+	virtual void update() {}
+
+protected:
+	ZVision *_engine;
+	uint32 _key;
+	Common::Rect _region;
+	bool _ported;
+	Graphics::Surface _surface;
+
+// Static member functions
+public:
+
+};
+
+struct EffectMapUnit {
+	uint32 count;
+	bool inEffect;
+};
+
+typedef Common::List<EffectMapUnit> EffectMap;
+
+} // End of namespace ZVision
+
+#endif // GRAPHICS_EFFECT_H_INCLUDED
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 1b80b379bf..a1cc8ac53c 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -772,7 +772,7 @@ Common::Point RenderManager::getBkgSize() {
 	return Common::Point(_backgroundWidth, _backgroundHeight);
 }
 
-void RenderManager::addEffect(Effect *_effect) {
+void RenderManager::addEffect(GraphicsEffect *_effect) {
 	_effects.push_back(_effect);
 }
 
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index d9a6c88896..9002d66b47 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -31,7 +31,7 @@
 
 #include "graphics/surface.h"
 
-#include "effect.h"
+#include "graphics_effect.h"
 
 class OSystem;
 
@@ -61,7 +61,7 @@ private:
 	};
 
 	typedef Common::HashMap<uint16, OneSubtitle> SubtitleMap;
-	typedef Common::List<Effect *> EffectsList;
+	typedef Common::List<GraphicsEffect *> EffectsList;
 
 private:
 	ZVision *_engine;
@@ -302,7 +302,7 @@ public:
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination, bool transposed);
 
 	// Add visual effect to effects list
-	void addEffect(Effect *_effect);
+	void addEffect(GraphicsEffect *_effect);
 
 	// Delete effect(s) by ID (ID equal to slot of action:region that create this effect)
 	void deleteEffect(uint32 ID);
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 8edd67b352..93fba2879d 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -32,13 +32,13 @@ MODULE_OBJS := \
 	scripting/menu.o \
 	scripting/scr_file_handling.o \
 	scripting/script_manager.o \
-	scripting/sidefx/animation_node.o \
-	scripting/sidefx/distort_node.o \
-	scripting/sidefx/music_node.o \
-	scripting/sidefx/region_node.o \
-	scripting/sidefx/syncsound_node.o \
-	scripting/sidefx/timer_node.o \
-	scripting/sidefx/ttytext_node.o \
+	scripting/effects/animation_effect.o \
+	scripting/effects/distort_effect.o \
+	scripting/effects/music_effect.o \
+	scripting/effects/region_effect.o \
+	scripting/effects/syncsound_effect.o \
+	scripting/effects/timer_effect.o \
+	scripting/effects/ttytext_effect.o \
 	sound/midi.o \
 	sound/zork_raw.o \
 	text/string_manager.o \
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a91476760d..a61fa26223 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -31,16 +31,16 @@
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/file/save_manager.h"
 #include "zvision/scripting/menu.h"
-#include "zvision/scripting/sidefx/timer_node.h"
-#include "zvision/scripting/sidefx/music_node.h"
-#include "zvision/scripting/sidefx/syncsound_node.h"
-#include "zvision/scripting/sidefx/animation_node.h"
-#include "zvision/scripting/sidefx/distort_node.h"
-#include "zvision/scripting/sidefx/ttytext_node.h"
-#include "zvision/scripting/sidefx/region_node.h"
+#include "zvision/scripting/effects/timer_effect.h"
+#include "zvision/scripting/effects/music_effect.h"
+#include "zvision/scripting/effects/syncsound_effect.h"
+#include "zvision/scripting/effects/animation_effect.h"
+#include "zvision/scripting/effects/distort_effect.h"
+#include "zvision/scripting/effects/ttytext_effect.h"
+#include "zvision/scripting/effects/region_effect.h"
 #include "zvision/scripting/controls/titler_control.h"
 #include "zvision/graphics/render_table.h"
-#include "zvision/graphics/effect.h"
+#include "zvision/graphics/graphics_effect.h"
 #include "zvision/graphics/effects/fog.h"
 #include "zvision/graphics/effects/light.h"
 #include "zvision/graphics/effects/wave.h"
@@ -106,8 +106,8 @@ ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::S
 }
 
 bool ActionAttenuate::execute() {
-	SideFX *fx = _engine->getScriptManager()->getSideFX(_key);
-	if (fx && fx->getType() == SideFX::SIDEFX_AUDIO) {
+	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_key);
+	if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 		MusicNode *mus = (MusicNode *)fx;
 		mus->setVolume(255 - (abs(_attenuation) >> 7));
 	}
@@ -157,8 +157,8 @@ ActionCrossfade::ActionCrossfade(ZVision *engine, int32 slotkey, const Common::S
 
 bool ActionCrossfade::execute() {
 	if (_keyOne) {
-		SideFX *fx = _engine->getScriptManager()->getSideFX(_keyOne);
-		if (fx && fx->getType() == SideFX::SIDEFX_AUDIO) {
+		ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyOne);
+		if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 			MusicNode *mus = (MusicNode *)fx;
 			if (_oneStartVolume >= 0)
 				mus->setVolume((_oneStartVolume * 255) / 100);
@@ -168,8 +168,8 @@ bool ActionCrossfade::execute() {
 	}
 
 	if (_keyTwo) {
-		SideFX *fx = _engine->getScriptManager()->getSideFX(_keyTwo);
-		if (fx && fx->getType() == SideFX::SIDEFX_AUDIO) {
+		ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyTwo);
+		if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 			MusicNode *mus = (MusicNode *)fx;
 			if (_twoStartVolume >= 0)
 				mus->setVolume((_twoStartVolume * 255) / 100);
@@ -401,28 +401,28 @@ ActionKill::ActionKill(ZVision *engine, int32 slotkey, const Common::String &lin
 	sscanf(line.c_str(), "%24s", keytype);
 	if (keytype[0] == '"') {
 		if (!scumm_stricmp(keytype, "\"ANIM\""))
-			_type = SideFX::SIDEFX_ANIM;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_ANIM;
 		else if (!scumm_stricmp(keytype, "\"AUDIO\""))
-			_type = SideFX::SIDEFX_AUDIO;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_AUDIO;
 		else if (!scumm_stricmp(keytype, "\"DISTORT\""))
-			_type = SideFX::SIDEFX_DISTORT;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_DISTORT;
 		else if (!scumm_stricmp(keytype, "\"PANTRACK\""))
-			_type = SideFX::SIDEFX_PANTRACK;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_PANTRACK;
 		else if (!scumm_stricmp(keytype, "\"REGION\""))
-			_type = SideFX::SIDEFX_REGION;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_REGION;
 		else if (!scumm_stricmp(keytype, "\"TIMER\""))
-			_type = SideFX::SIDEFX_TIMER;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_TIMER;
 		else if (!scumm_stricmp(keytype, "\"TTYTEXT\""))
-			_type = SideFX::SIDEFX_TTYTXT;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_TTYTXT;
 		else if (!scumm_stricmp(keytype, "\"ALL\""))
-			_type = SideFX::SIDEFX_ALL;
+			_type = ScriptingEffect::SCRIPTING_EFFECT_ALL;
 	} else
 		_key = atoi(keytype);
 }
 
 bool ActionKill::execute() {
 	if (_type)
-		_engine->getScriptManager()->killSideFxType((SideFX::SideFXType)_type);
+		_engine->getScriptManager()->killSideFxType((ScriptingEffect::ScriptingEffectType)_type);
 	else
 		_engine->getScriptManager()->killSideFx(_key);
 	return true;
@@ -580,10 +580,10 @@ ActionPreloadAnimation::~ActionPreloadAnimation() {
 }
 
 bool ActionPreloadAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotKey);
+	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_slotKey);
 
 	if (!nod) {
-		nod = new AnimationNode(_engine, _slotKey, _fileName, _mask, _framerate, false);
+		nod = new AnimationEffect(_engine, _slotKey, _fileName, _mask, _framerate, false);
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
@@ -603,9 +603,9 @@ ActionUnloadAnimation::ActionUnloadAnimation(ZVision *engine, int32 slotkey, con
 }
 
 bool ActionUnloadAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_key);
+	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_key);
 
-	if (nod && nod->getType() == SideFX::SIDEFX_ANIM)
+	if (nod && nod->getType() == ScriptingEffect::SCRIPTING_EFFECT_ANIM)
 		_engine->getScriptManager()->deleteSideFx(_key);
 
 	return true;
@@ -648,10 +648,10 @@ ActionPlayAnimation::~ActionPlayAnimation() {
 }
 
 bool ActionPlayAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_slotKey);
+	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_slotKey);
 
 	if (!nod) {
-		nod = new AnimationNode(_engine, _slotKey, _fileName, _mask, _framerate);
+		nod = new AnimationEffect(_engine, _slotKey, _fileName, _mask, _framerate);
 		_engine->getScriptManager()->addSideFX(nod);
 	} else
 		nod->stop();
@@ -683,7 +683,7 @@ ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, int32 sl
 }
 
 bool ActionPlayPreloadAnimation::execute() {
-	AnimationNode *nod = (AnimationNode *)_engine->getScriptManager()->getSideFX(_controlKey);
+	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_controlKey);
 
 	if (nod)
 		nod->addPlayNode(_slotKey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
@@ -731,7 +731,7 @@ bool ActionRegion::execute() {
 	if (_engine->getScriptManager()->getSideFX(_slotKey))
 		return true;
 
-	Effect *effect = NULL;
+	GraphicsEffect *effect = NULL;
 	switch (_type) {
 	case 0: {
 		uint16 centerX, centerY, frames;
@@ -982,11 +982,11 @@ ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::S
 }
 
 bool ActionSyncSound::execute() {
-	SideFX *fx = _engine->getScriptManager()->getSideFX(_syncto);
+	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_syncto);
 	if (!fx)
 		return true;
 
-	if (!(fx->getType() & SideFX::SIDEFX_ANIM))
+	if (!(fx->getType() & ScriptingEffect::SCRIPTING_EFFECT_ANIM))
 		return true;
 
 	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotKey, _fileName, _syncto));
diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 803d0cf1ce..108b83fd00 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -36,6 +36,11 @@ namespace ZVision {
 
 class ZVision;
 
+/**
+ * The base class for all Controls.
+ *
+ * Controls are the things that the user interacts with. Ex: A lever on the door
+ */
 class Control {
 public:
 
diff --git a/engines/zvision/scripting/effects/animation_effect.cpp b/engines/zvision/scripting/effects/animation_effect.cpp
new file mode 100644
index 0000000000..c3cbc25406
--- /dev/null
+++ b/engines/zvision/scripting/effects/animation_effect.cpp
@@ -0,0 +1,213 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/animation_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
+
+#include "graphics/surface.h"
+#include "video/video_decoder.h"
+
+namespace ZVision {
+
+AnimationEffect::AnimationEffect(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool disposeAfterUse)
+	: ScriptingEffect(engine, controlKey, SCRIPTING_EFFECT_ANIM),
+	  _disposeAfterUse(disposeAfterUse),
+	  _mask(mask),
+	  _animation(NULL) {
+
+	_animation = engine->loadAnimation(fileName);
+
+	if (frate > 0) {
+		_frmDelayOverride = (int32)(1000.0 / frate);
+
+		// WORKAROUND: We do not allow the engine to delay more than 66 msec
+		// per frame (15fps max)
+		if (_frmDelayOverride > 66)
+			_frmDelayOverride = 66;
+	} else {
+		_frmDelayOverride = 0;
+	}
+}
+
+AnimationEffect::~AnimationEffect() {
+	if (_animation)
+		delete _animation;
+
+	_engine->getScriptManager()->setStateValue(_key, 2);
+
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+
+		if ((*it)._scaled) {
+			(*it)._scaled->free();
+			delete(*it)._scaled;
+		}
+	}
+
+	_playList.clear();
+}
+
+bool AnimationEffect::process(uint32 deltaTimeInMillis) {
+	ScriptManager *scriptManager = _engine->getScriptManager();
+	RenderManager *renderManager = _engine->getRenderManager();
+	RenderTable::RenderState renderState = renderManager->getRenderTable()->getRenderState();
+	bool isPanorama = (renderState == RenderTable::PANORAMA);
+	int16 velocity = _engine->getMouseVelocity() + _engine->getKeyboardVelocity();
+
+	// Do not update animation nodes in panoramic mode while turning, if the user
+	// has set this option
+	if (scriptManager->getStateValue(StateKey_NoTurnAnim) == 1 && isPanorama && velocity)
+		return false;
+
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		playnode *nod = &(*it);
+
+		if (!_animation->isPlaying()) {
+			// The node is just beginning playback
+			_animation->start();
+			_animation->seekToFrame(nod->start);
+
+			nod->_delay = deltaTimeInMillis; // Force the frame to draw
+			if (nod->slot)
+				scriptManager->setStateValue(nod->slot, 1);
+		} else if (_animation->endOfVideo()) {
+			// The node has reached the end; check if we need to loop
+			nod->loop--;
+
+			if (nod->loop == 0) {
+				if (nod->slot >= 0)
+					scriptManager->setStateValue(nod->slot, 2);
+				if (nod->_scaled) {
+					nod->_scaled->free();
+					delete nod->_scaled;
+				}
+				_playList.erase(it);
+				return _disposeAfterUse;
+			}
+
+			_animation->seekToFrame(nod->start);
+		}
+
+		// Check if we need to draw a frame
+		bool needsUpdate = false;
+		if (_frmDelayOverride == 0) {
+			// If not overridden, use the VideoDecoder's check
+			needsUpdate = _animation->needsUpdate();
+		} else {
+			// Otherwise, implement our own timing
+			nod->_delay -= deltaTimeInMillis;
+
+			if (nod->_delay <= 0) {
+				nod->_delay += _frmDelayOverride;
+				needsUpdate = true;
+			}
+		}
+
+		if (needsUpdate) {
+			const Graphics::Surface *frame = _animation->decodeNextFrame();
+
+			if (frame) {
+				uint32 dstw;
+				uint32 dsth;
+				if (isPanorama) {
+					dstw = nod->pos.height();
+					dsth = nod->pos.width();
+				} else {
+					dstw = nod->pos.width();
+					dsth = nod->pos.height();
+				}
+
+				// We only scale down the animation to fit its frame, not up, otherwise we
+				// end up with distorted animations - e.g. the armor visor in location cz1e
+				// in Nemesis (one of the armors inside Irondune), or the planet in location
+				// aa10 in Nemesis (Juperon, outside the asylum). We do allow scaling up only
+				// when a simple 2x filter is requested (e.g. the alchemists and cup sequence
+				// in Nemesis)
+				if (frame->w > dstw || frame->h > dsth || (frame->w == dstw / 2 && frame->h == dsth / 2)) {
+					if (nod->_scaled)
+						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
+							nod->_scaled->free();
+							delete nod->_scaled;
+							nod->_scaled = NULL;
+						}
+
+					if (!nod->_scaled) {
+						nod->_scaled = new Graphics::Surface;
+						nod->_scaled->create(dstw, dsth, frame->format);
+					}
+
+					renderManager->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
+					frame = nod->_scaled;
+				}
+
+				if (isPanorama) {
+					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
+					renderManager->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
+					transposed->free();
+					delete transposed;
+				} else {
+					renderManager->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+void AnimationEffect::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) {
+	playnode nod;
+	nod.loop = loops;
+	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
+	nod.start = startFrame;
+	_animation->setEndFrame(CLIP<int>(endFrame, 0, _animation->getFrameCount() - 1));
+
+	nod.slot = slot;
+	nod._delay = 0;
+	nod._scaled = NULL;
+	_playList.push_back(nod);
+}
+
+bool AnimationEffect::stop() {
+	PlayNodes::iterator it = _playList.begin();
+	if (it != _playList.end()) {
+		_engine->getScriptManager()->setStateValue((*it).slot, 2);
+		if ((*it)._scaled) {
+			(*it)._scaled->free();
+			delete(*it)._scaled;
+		}
+	}
+
+	_playList.clear();
+
+	// We don't need to delete, it's may be reused
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/animation_effect.h b/engines/zvision/scripting/effects/animation_effect.h
new file mode 100644
index 0000000000..a564b83ff3
--- /dev/null
+++ b/engines/zvision/scripting/effects/animation_effect.h
@@ -0,0 +1,77 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_ANIMATION_NODE_H
+#define ZVISION_ANIMATION_NODE_H
+
+#include "zvision/scripting/scripting_effect.h"
+#include "common/rect.h"
+#include "common/list.h"
+
+namespace Graphics {
+struct Surface;
+}
+
+namespace Video {
+	class VideoDecoder;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+class AnimationEffect : public ScriptingEffect {
+public:
+	AnimationEffect(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool disposeAfterUse = true);
+	~AnimationEffect();
+
+	struct playnode {
+		Common::Rect pos;
+		int32 slot;
+		int32 start;
+		int32 loop;
+		int32 _delay;
+		Graphics::Surface *_scaled;
+	};
+
+private:
+	typedef Common::List<playnode> PlayNodes;
+
+	PlayNodes _playList;
+
+	int32 _mask;
+	bool _disposeAfterUse;
+
+	Video::VideoDecoder *_animation;
+	int32 _frmDelayOverride;
+
+public:
+	bool process(uint32 deltaTimeInMillis);
+
+	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops = 1);
+
+	bool stop();
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/effects/distort_effect.cpp b/engines/zvision/scripting/effects/distort_effect.cpp
new file mode 100644
index 0000000000..78c4a1b9a8
--- /dev/null
+++ b/engines/zvision/scripting/effects/distort_effect.cpp
@@ -0,0 +1,104 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/distort_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/render_table.h"
+
+#include "common/stream.h"
+
+namespace ZVision {
+
+DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale)
+	: ScriptingEffect(engine, key, SCRIPTING_EFFECT_DISTORT) {
+
+	_angle = _engine->getRenderManager()->getRenderTable()->getAngle();
+	_linScale = _engine->getRenderManager()->getRenderTable()->getLinscale();
+
+	_speed = speed;
+	_incr = true;
+	_startAngle = startAngle;
+	_endAngle = endAngle;
+	_startLineScale = startLineScale;
+	_endLineScale = endLineScale;
+
+	_curFrame = 1.0;
+
+	_diffAngle = endAngle - startAngle;
+	_diffLinScale = endLineScale - startLineScale;
+
+	_frmSpeed = (float)speed / 15.0;
+	_frames = ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed);
+	if (_frames <= 0)
+		_frames = 1;
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+DistortNode::~DistortNode() {
+	setParams(_angle, _linScale);
+}
+
+bool DistortNode::process(uint32 deltaTimeInMillis) {
+	float updTime = deltaTimeInMillis / (1000.0 / 60.0);
+
+	if (_incr)
+		_curFrame += updTime;
+	else
+		_curFrame -= updTime;
+
+	if (_curFrame < 1.0) {
+		_curFrame = 1.0;
+		_incr = true;
+	} else if (_curFrame > _frames) {
+		_curFrame = _frames;
+		_incr = false;
+	}
+
+	float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed);
+	setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale);
+
+	return false;
+}
+
+void DistortNode::setParams(float angl, float linScale) {
+	RenderTable *table = _engine->getRenderManager()->getRenderTable();
+	if (table->getRenderState() == RenderTable::PANORAMA) {
+		table->setPanoramaFoV(angl);
+		table->setPanoramaScale(linScale);
+		table->generateRenderTable();
+		_engine->getRenderManager()->markDirty();
+	} else if (table->getRenderState() == RenderTable::TILT) {
+		table->setTiltFoV(angl);
+		table->setTiltScale(linScale);
+		table->generateRenderTable();
+		_engine->getRenderManager()->markDirty();
+	}
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/distort_effect.h b/engines/zvision/scripting/effects/distort_effect.h
new file mode 100644
index 0000000000..c64f10e6ff
--- /dev/null
+++ b/engines/zvision/scripting/effects/distort_effect.h
@@ -0,0 +1,63 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_DISTORT_NODE_H
+#define ZVISION_DISTORT_NODE_H
+
+#include "zvision/scripting/scripting_effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class DistortNode : public ScriptingEffect {
+public:
+	DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale);
+	~DistortNode();
+
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	int16 _speed;
+	float _startAngle;
+	float _endAngle;
+	float _startLineScale;
+	float _endLineScale;
+
+	float _frmSpeed;
+	float _diffAngle;
+	float _diffLinScale;
+	bool _incr;
+	int16 _frames;
+
+	float _curFrame;
+
+	float _angle;
+	float _linScale;
+
+private:
+	void setParams(float angl, float linScale);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
new file mode 100644
index 0000000000..102f330305
--- /dev/null
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -0,0 +1,248 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/music_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/midi.h"
+#include "zvision/sound/zork_raw.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "audio/decoders/wave.h"
+
+namespace ZVision {
+
+MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
+	: MusicNodeBASE(engine, key, SCRIPTING_EFFECT_AUDIO) {
+	_loop = loop;
+	_volume = volume;
+	_crossfade = false;
+	_crossfadeTarget = 0;
+	_crossfadeTime = 0;
+	_attenuate = 0;
+	_pantrack = false;
+	_pantrackPosition = 0;
+	_sub = NULL;
+	_stereo = false;
+	_loaded = false;
+
+	Audio::RewindableAudioStream *audioStream = NULL;
+
+	if (filename.contains(".wav")) {
+		Common::File *file = new Common::File();
+		if (_engine->getSearchManager()->openFile(*file, filename)) {
+			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+		}
+	} else {
+		audioStream = makeRawZorkStream(filename, _engine);
+	}
+
+	if (audioStream) {
+		_stereo = audioStream->isStereo();
+
+		if (_loop) {
+			Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
+			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
+		} else {
+			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
+		}
+
+		if (_key != StateKey_NotSet)
+			_engine->getScriptManager()->setStateValue(_key, 1);
+
+		// Change filename.raw into filename.sub
+		Common::String subname = filename;
+		subname.setChar('s', subname.size() - 3);
+		subname.setChar('u', subname.size() - 2);
+		subname.setChar('b', subname.size() - 1);
+
+		if (_engine->getSearchManager()->hasFile(subname))
+			_sub = new Subtitle(_engine, subname);
+
+		_loaded = true;
+	}
+}
+
+MusicNode::~MusicNode() {
+	if (_loaded)
+		_engine->_mixer->stopHandle(_handle);
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	if (_sub)
+		delete _sub;
+	debug(1, "MusicNode: %d destroyed\n", _key);
+}
+
+void MusicNode::setPanTrack(int16 pos) {
+	if (!_stereo) {
+		_pantrack = true;
+		_pantrackPosition = pos;
+		setVolume(_volume);
+	}
+}
+
+void MusicNode::unsetPanTrack() {
+	_pantrack = false;
+	setVolume(_volume);
+}
+
+void MusicNode::setFade(int32 time, uint8 target) {
+	_crossfadeTarget = target;
+	_crossfadeTime = time;
+	_crossfade = true;
+}
+
+bool MusicNode::process(uint32 deltaTimeInMillis) {
+	if (!_loaded || ! _engine->_mixer->isSoundHandleActive(_handle))
+		return stop();
+	else {
+		uint8 _newvol = _volume;
+
+		if (_crossfade) {
+			if (_crossfadeTime > 0) {
+				if ((int32)deltaTimeInMillis > _crossfadeTime)
+					deltaTimeInMillis = _crossfadeTime;
+				_newvol += floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis;
+				_crossfadeTime -= deltaTimeInMillis;
+			} else {
+				_crossfade = false;
+				_newvol = _crossfadeTarget;
+			}
+		}
+
+		if (_pantrack || _volume != _newvol)
+			setVolume(_newvol);
+
+		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
+			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
+	}
+	return false;
+}
+
+void MusicNode::setVolume(uint8 newVolume) {
+	if (!_loaded)
+		return;
+	if (_pantrack) {
+		int curX = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
+		curX -= _pantrackPosition;
+		int32 _width = _engine->getRenderManager()->getBkgSize().x;
+		if (curX < (-_width) / 2)
+			curX += _width;
+		else if (curX >= _width / 2)
+			curX -= _width;
+
+		float norm = (float)curX / ((float)_width / 2.0);
+		float lvl = fabs(norm);
+		if (lvl > 0.5)
+			lvl = (lvl - 0.5) * 1.7;
+		else
+			lvl = 1.0;
+
+		float bal = sin(-norm * 3.1415926) * 127.0;
+
+		if (_engine->_mixer->isSoundHandleActive(_handle)) {
+			_engine->_mixer->setChannelBalance(_handle, bal);
+			_engine->_mixer->setChannelVolume(_handle, newVolume * lvl);
+		}
+	} else {
+		if (_engine->_mixer->isSoundHandleActive(_handle)) {
+			_engine->_mixer->setChannelBalance(_handle, 0);
+			_engine->_mixer->setChannelVolume(_handle, newVolume);
+		}
+	}
+
+	_volume = newVolume;
+}
+
+PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
+	: ScriptingEffect(engine, key, SCRIPTING_EFFECT_PANTRACK) {
+	_slot = slot;
+
+	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(slot);
+	if (fx && fx->getType() == SCRIPTING_EFFECT_AUDIO) {
+		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
+		mus->setPanTrack(pos);
+	}
+}
+
+PanTrackNode::~PanTrackNode() {
+	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_slot);
+	if (fx && fx->getType() == SCRIPTING_EFFECT_AUDIO) {
+		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
+		mus->unsetPanTrack();
+	}
+}
+
+MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
+	: MusicNodeBASE(engine, key, SCRIPTING_EFFECT_AUDIO) {
+	_volume = volume;
+	_prog = program;
+	_noteNumber = note;
+	_pan = 0;
+
+	_chan = _engine->getMidiManager()->getFreeChannel();
+
+	if (_chan >= 0) {
+		_engine->getMidiManager()->setVolume(_chan, _volume);
+		_engine->getMidiManager()->setPan(_chan, _pan);
+		_engine->getMidiManager()->setProgram(_chan, _prog);
+		_engine->getMidiManager()->noteOn(_chan, _noteNumber, _volume);
+	}
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+MusicMidiNode::~MusicMidiNode() {
+	if (_chan >= 0) {
+		_engine->getMidiManager()->noteOff(_chan);
+	}
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+}
+
+void MusicMidiNode::setPanTrack(int16 pos) {
+}
+
+void MusicMidiNode::unsetPanTrack() {
+}
+
+void MusicMidiNode::setFade(int32 time, uint8 target) {
+}
+
+bool MusicMidiNode::process(uint32 deltaTimeInMillis) {
+	return false;
+}
+
+void MusicMidiNode::setVolume(uint8 newVolume) {
+	if (_chan >= 0) {
+		_engine->getMidiManager()->setVolume(_chan, newVolume);
+	}
+	_volume = newVolume;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/music_effect.h b/engines/zvision/scripting/effects/music_effect.h
new file mode 100644
index 0000000000..31d538f668
--- /dev/null
+++ b/engines/zvision/scripting/effects/music_effect.h
@@ -0,0 +1,135 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_MUSIC_NODE_H
+#define ZVISION_MUSIC_NODE_H
+
+#include "audio/mixer.h"
+#include "zvision/scripting/scripting_effect.h"
+#include "zvision/text/subtitles.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+
+class MusicNodeBASE : public ScriptingEffect {
+public:
+	MusicNodeBASE(ZVision *engine, uint32 key, ScriptingEffectType type) : ScriptingEffect(engine, key, type) {}
+	~MusicNodeBASE() {}
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	virtual bool process(uint32 deltaTimeInMillis) = 0;
+
+	virtual void setVolume(uint8 volume) = 0;
+
+	virtual void setPanTrack(int16 pos) = 0;
+	virtual void unsetPanTrack() = 0;
+
+	virtual void setFade(int32 time, uint8 target) = 0;
+};
+
+class MusicNode : public MusicNodeBASE {
+public:
+	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
+	~MusicNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+	void setVolume(uint8 volume);
+
+	void setPanTrack(int16 pos);
+	void unsetPanTrack();
+
+	void setFade(int32 time, uint8 target);
+
+private:
+	bool _pantrack;
+	int32 _pantrackPosition;
+	int32 _attenuate;
+	uint8 _volume;
+	bool _loop;
+	bool _crossfade;
+	uint8 _crossfadeTarget;
+	int32 _crossfadeTime;
+	bool _stereo;
+	Audio::SoundHandle _handle;
+	Subtitle *_sub;
+	bool _loaded;
+};
+
+// Only used by Zork: Nemesis, for the flute and piano puzzles (tj4e and ve6f, as well as vr)
+class MusicMidiNode : public MusicNodeBASE {
+public:
+	MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume);
+	~MusicMidiNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+	void setVolume(uint8 volume);
+
+	void setPanTrack(int16 pos);
+	void unsetPanTrack();
+
+	void setFade(int32 time, uint8 target);
+
+private:
+	int8 _chan;
+	int8 _noteNumber;
+	int8 _pan;
+	int8 _volume;
+	int8 _prog;
+};
+
+class PanTrackNode : public ScriptingEffect {
+public:
+	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
+	~PanTrackNode();
+
+private:
+	uint32 _slot;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/effects/region_effect.cpp b/engines/zvision/scripting/effects/region_effect.cpp
new file mode 100644
index 0000000000..78061cf4de
--- /dev/null
+++ b/engines/zvision/scripting/effects/region_effect.cpp
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/region_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+
+namespace ZVision {
+
+RegionNode::RegionNode(ZVision *engine, uint32 key, GraphicsEffect *effect, uint32 delay)
+	: ScriptingEffect(engine, key, SCRIPTING_EFFECT_REGION) {
+	_effect = effect;
+	_delay = delay;
+	_timeLeft = 0;
+}
+
+RegionNode::~RegionNode() {
+	_engine->getRenderManager()->deleteEffect(_key);
+}
+
+bool RegionNode::process(uint32 deltaTimeInMillis) {
+	_timeLeft -= deltaTimeInMillis;
+
+	if (_timeLeft <= 0) {
+		_timeLeft = _delay;
+		if (_effect)
+			_effect->update();
+	}
+
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/region_effect.h b/engines/zvision/scripting/effects/region_effect.h
new file mode 100644
index 0000000000..4fc16224ff
--- /dev/null
+++ b/engines/zvision/scripting/effects/region_effect.h
@@ -0,0 +1,57 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_REGION_NODE_H
+#define ZVISION_REGION_NODE_H
+
+#include "graphics/surface.h"
+
+#include "zvision/scripting/scripting_effect.h"
+#include "zvision/graphics/graphics_effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class RegionNode : public ScriptingEffect {
+public:
+	RegionNode(ZVision *engine, uint32 key, GraphicsEffect *effect, uint32 delay);
+	~RegionNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+
+private:
+	int32 _timeLeft;
+	uint32 _delay;
+	GraphicsEffect *_effect;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/effects/syncsound_effect.cpp b/engines/zvision/scripting/effects/syncsound_effect.cpp
new file mode 100644
index 0000000000..70ba97deb8
--- /dev/null
+++ b/engines/zvision/scripting/effects/syncsound_effect.cpp
@@ -0,0 +1,85 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/syncsound_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/sound/zork_raw.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+#include "audio/decoders/wave.h"
+
+namespace ZVision {
+
+SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)
+	: ScriptingEffect(engine, key, SCRIPTING_EFFECT_AUDIO) {
+	_syncto = syncto;
+	_sub = NULL;
+
+	Audio::RewindableAudioStream *audioStream = NULL;
+
+	if (filename.contains(".wav")) {
+		Common::File *file = new Common::File();
+		if (_engine->getSearchManager()->openFile(*file, filename)) {
+			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
+		}
+	} else {
+		audioStream = makeRawZorkStream(filename, _engine);
+	}
+
+	_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream);
+
+	Common::String subname = filename;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
+
+	if (_engine->getSearchManager()->hasFile(subname))
+		_sub = new Subtitle(_engine, subname);
+}
+
+SyncSoundNode::~SyncSoundNode() {
+	_engine->_mixer->stopHandle(_handle);
+	if (_sub)
+		delete _sub;
+}
+
+bool SyncSoundNode::process(uint32 deltaTimeInMillis) {
+	if (! _engine->_mixer->isSoundHandleActive(_handle))
+		return stop();
+	else {
+
+		if (_engine->getScriptManager()->getSideFX(_syncto) == NULL)
+			return stop();
+
+		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
+			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
+	}
+	return false;
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/syncsound_effect.h b/engines/zvision/scripting/effects/syncsound_effect.h
new file mode 100644
index 0000000000..0eabff77a3
--- /dev/null
+++ b/engines/zvision/scripting/effects/syncsound_effect.h
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_SYNCSOUND_NODE_H
+#define ZVISION_SYNCSOUND_NODE_H
+
+#include "audio/mixer.h"
+#include "zvision/scripting/scripting_effect.h"
+#include "zvision/text/subtitles.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class SyncSoundNode : public ScriptingEffect {
+public:
+	SyncSoundNode(ZVision *engine, uint32 key, Common::String &file, int32 syncto);
+	~SyncSoundNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+private:
+	int32 _syncto;
+	Audio::SoundHandle _handle;
+	Subtitle *_sub;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/effects/timer_effect.cpp b/engines/zvision/scripting/effects/timer_effect.cpp
new file mode 100644
index 0000000000..778f9dec6c
--- /dev/null
+++ b/engines/zvision/scripting/effects/timer_effect.cpp
@@ -0,0 +1,81 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/timer_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+
+#include "common/stream.h"
+
+namespace ZVision {
+
+TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
+	: ScriptingEffect(engine, key, SCRIPTING_EFFECT_TIMER) {
+	_timeLeft = 0;
+
+	if (_engine->getGameId() == GID_NEMESIS)
+		_timeLeft = timeInSeconds * 1000;
+	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
+		_timeLeft = timeInSeconds * 100;
+
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+TimerNode::~TimerNode() {
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	int32 timeLeft = _timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100);
+	if (timeLeft > 0)
+		_engine->getScriptManager()->setStateValue(_key, timeLeft); // If timer was stopped by stop or kill
+}
+
+bool TimerNode::process(uint32 deltaTimeInMillis) {
+	_timeLeft -= deltaTimeInMillis;
+
+	if (_timeLeft <= 0)
+		return stop();
+
+	return false;
+}
+
+bool TimerNode::stop() {
+	if (_key != StateKey_NotSet)
+		_engine->getScriptManager()->setStateValue(_key, 2);
+	return true;
+}
+
+void TimerNode::serialize(Common::WriteStream *stream) {
+	stream->writeUint32BE(MKTAG('T', 'I', 'M', 'R'));
+	stream->writeUint32LE(8); // size
+	stream->writeUint32LE(_key);
+	stream->writeUint32LE(_timeLeft);
+}
+
+void TimerNode::deserialize(Common::SeekableReadStream *stream) {
+	_timeLeft = stream->readUint32LE();
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/timer_effect.h b/engines/zvision/scripting/effects/timer_effect.h
new file mode 100644
index 0000000000..5e45d54d7d
--- /dev/null
+++ b/engines/zvision/scripting/effects/timer_effect.h
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_TIMER_NODE_H
+#define ZVISION_TIMER_NODE_H
+
+#include "zvision/scripting/scripting_effect.h"
+
+namespace ZVision {
+
+class ZVision;
+
+class TimerNode : public ScriptingEffect {
+public:
+	TimerNode(ZVision *engine, uint32 key, uint timeInSeconds);
+	~TimerNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+	void serialize(Common::WriteStream *stream);
+	void deserialize(Common::SeekableReadStream *stream);
+	inline bool needsSerialization() {
+		return true;
+	}
+
+	bool stop();
+
+private:
+	int32 _timeLeft;
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/effects/ttytext_effect.cpp b/engines/zvision/scripting/effects/ttytext_effect.cpp
new file mode 100644
index 0000000000..c60b3aa8c5
--- /dev/null
+++ b/engines/zvision/scripting/effects/ttytext_effect.cpp
@@ -0,0 +1,174 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/scripting/effects/ttytext_effect.h"
+
+#include "zvision/zvision.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/text/text.h"
+
+#include "common/stream.h"
+#include "common/file.h"
+
+namespace ZVision {
+
+ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :
+	ScriptingEffect(engine, key, SCRIPTING_EFFECT_TTYTXT),
+	_fnt(engine) {
+	_delay = delay;
+	_r = r;
+	_txtpos = 0;
+	_nexttime = 0;
+	_dx = 0;
+	_dy = 0;
+
+	Common::File *infile = _engine->getSearchManager()->openFile(file);
+	if (infile) {
+		while (!infile->eos()) {
+			Common::String asciiLine = readWideLine(*infile);
+			if (asciiLine.empty()) {
+				continue;
+			}
+			_txtbuf += asciiLine;
+		}
+
+		delete infile;
+	}
+	_img.create(_r.width(), _r.height(), _engine->_resourcePixelFormat);
+	_style._sharp = true;
+	_style.readAllStyle(_txtbuf);
+	_style.setFont(_fnt);
+	_engine->getScriptManager()->setStateValue(_key, 1);
+}
+
+ttyTextNode::~ttyTextNode() {
+	_engine->getScriptManager()->setStateValue(_key, 2);
+	_img.free();
+}
+
+bool ttyTextNode::process(uint32 deltaTimeInMillis) {
+	_nexttime -= deltaTimeInMillis;
+
+	if (_nexttime < 0) {
+		if (_txtpos < _txtbuf.size()) {
+			if (_txtbuf[_txtpos] == '<') {
+				int32 strt = _txtpos;
+				int32 endt = 0;
+				int16 ret = 0;
+				while (_txtbuf[_txtpos] != '>' && _txtpos < _txtbuf.size())
+					_txtpos++;
+				endt = _txtpos;
+				if (strt != -1)
+					if ((endt - strt - 1) > 0)
+						ret = _style.parseStyle(_txtbuf.c_str() + strt + 1, endt - strt - 1);
+
+				if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
+					if (ret & TXT_RET_FNTCHG)
+						_style.setFont(_fnt);
+					if (ret & TXT_RET_FNTSTL)
+						_style.setFontStyle(_fnt);
+
+					if (ret & TXT_RET_NEWLN)
+						newline();
+				}
+
+				if (ret & TXT_RET_HASSTBOX) {
+					Common::String buf;
+					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style._statebox));
+
+					for (uint8 j = 0; j < buf.size(); j++)
+						outchar(buf[j]);
+				}
+
+				_txtpos++;
+			} else {
+				int8 charsz = getUtf8CharSize(_txtbuf[_txtpos]);
+
+				uint16 chr = readUtf8Char(_txtbuf.c_str() + _txtpos);
+
+				if (chr == ' ') {
+					uint32 i = _txtpos + charsz;
+					uint16 width = _fnt.getCharWidth(chr);
+
+					while (i < _txtbuf.size() && _txtbuf[i] != ' ' && _txtbuf[i] != '<') {
+
+						int8 chsz   = getUtf8CharSize(_txtbuf[i]);
+						uint16 uchr = readUtf8Char(_txtbuf.c_str() + _txtpos);
+
+						width += _fnt.getCharWidth(uchr);
+
+						i += chsz;
+					}
+
+					if (_dx + width > _r.width())
+						newline();
+					else
+						outchar(chr);
+				} else
+					outchar(chr);
+
+				_txtpos += charsz;
+			}
+			_nexttime = _delay;
+			_engine->getRenderManager()->blitSurfaceToBkg(_img, _r.left, _r.top);
+		} else
+			return stop();
+	}
+
+	return false;
+}
+
+void ttyTextNode::scroll() {
+	int32 scrl = 0;
+	while (_dy - scrl > _r.height() - _fnt.getFontHeight())
+		scrl += _fnt.getFontHeight();
+	int8 *pixels = (int8 *)_img.getPixels();
+	for (uint16 h = scrl; h < _img.h; h++)
+		memcpy(pixels + _img.pitch * (h - scrl), pixels + _img.pitch * h, _img.pitch);
+
+	_img.fillRect(Common::Rect(0, _img.h - scrl, _img.w, _img.h), 0);
+	_dy -= scrl;
+}
+
+void ttyTextNode::newline() {
+	_dy += _fnt.getFontHeight();
+	_dx = 0;
+}
+
+void ttyTextNode::outchar(uint16 chr) {
+	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(_style._red, _style._green, _style._blue);
+
+	if (_dx + _fnt.getCharWidth(chr) > _r.width())
+		newline();
+
+	if (_dy + _fnt.getFontHeight() >= _r.height())
+		scroll();
+
+	_fnt.drawChar(&_img, chr, _dx, _dy, clr);
+
+	_dx += _fnt.getCharWidth(chr);
+}
+
+} // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/ttytext_effect.h b/engines/zvision/scripting/effects/ttytext_effect.h
new file mode 100644
index 0000000000..8d8a2518c7
--- /dev/null
+++ b/engines/zvision/scripting/effects/ttytext_effect.h
@@ -0,0 +1,73 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef ZVISION_TTYTEXT_NODE_H
+#define ZVISION_TTYTEXT_NODE_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+#include "zvision/scripting/scripting_effect.h"
+#include "zvision/text/text.h"
+#include "zvision/text/truetype_font.h"
+
+namespace Common {
+class String;
+}
+
+namespace ZVision {
+class ttyTextNode : public ScriptingEffect {
+public:
+	ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay);
+	~ttyTextNode();
+
+	/**
+	 * Decrement the timer by the delta time. If the timer is finished, set the status
+	 * in _globalState and let this node be deleted
+	 *
+	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
+	 * @return                     If true, the node can be deleted after process() finishes
+	 */
+	bool process(uint32 deltaTimeInMillis);
+private:
+	Common::Rect _r;
+
+	cTxtStyle _style;
+	StyledTTFont _fnt;
+	Common::String _txtbuf;
+	uint32 _txtpos;
+
+	int32 _delay;
+	int32 _nexttime;
+	Graphics::Surface _img;
+	int16 _dx;
+	int16 _dy;
+private:
+
+	void newline();
+	void scroll();
+	void outchar(uint16 chr);
+};
+
+} // End of namespace ZVision
+
+#endif
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index d0ebb18944..464e8bfe4d 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -30,7 +30,7 @@
 #include "zvision/file/save_manager.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/menu.h"
-#include "zvision/scripting/sidefx/timer_node.h"
+#include "zvision/scripting/effects/timer_effect.h"
 
 #include "common/algorithm.h"
 #include "common/hashmap.h"
@@ -382,11 +382,11 @@ void ScriptManager::setFocusControlKey(uint32 key) {
 	_currentlyFocusedControl = key;
 }
 
-void ScriptManager::addSideFX(SideFX *fx) {
+void ScriptManager::addSideFX(ScriptingEffect *fx) {
 	_activeSideFx.push_back(fx);
 }
 
-SideFX *ScriptManager::getSideFX(uint32 key) {
+ScriptingEffect *ScriptManager::getSideFX(uint32 key) {
 	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter) {
 		if ((*iter)->getKey() == key) {
 			return (*iter);
@@ -430,7 +430,7 @@ void ScriptManager::killSideFx(uint32 key) {
 	}
 }
 
-void ScriptManager::killSideFxType(SideFX::SideFXType type) {
+void ScriptManager::killSideFxType(ScriptingEffect::ScriptingEffectType type) {
 	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end();) {
 		if ((*iter)->getType() & type) {
 			(*iter)->kill();
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 9f0f2f6e10..78c1b77dea 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -25,7 +25,7 @@
 
 #include "zvision/scripting/puzzle.h"
 #include "zvision/scripting/control.h"
-#include "zvision/scripting/sidefx.h"
+#include "zvision/scripting/scripting_effect.h"
 
 #include "common/hashmap.h"
 #include "common/queue.h"
@@ -116,7 +116,7 @@ typedef Common::List<Puzzle *> PuzzleList;
 typedef Common::Queue<Puzzle *> PuzzleQueue;
 typedef Common::List<Control *> ControlList;
 typedef Common::HashMap<uint32, int32> StateMap;
-typedef Common::List<SideFX *> SideFXList;
+typedef Common::List<ScriptingEffect *> SideFXList;
 typedef Common::List<Common::Event> EventList;
 
 class ScriptManager {
@@ -196,12 +196,12 @@ public:
 	// Only change focus control without call focus/unfocus.
 	void setFocusControlKey(uint32 key);
 
-	void addSideFX(SideFX *fx);
-	SideFX *getSideFX(uint32 key);
+	void addSideFX(ScriptingEffect *fx);
+	ScriptingEffect *getSideFX(uint32 key);
 	void deleteSideFx(uint32 key);
 	void stopSideFx(uint32 key);
 	void killSideFx(uint32 key);
-	void killSideFxType(SideFX::SideFXType type);
+	void killSideFxType(ScriptingEffect::ScriptingEffectType type);
 
 	void addEvent(Common::Event);
 	void flushEvent(Common::EventType type);
diff --git a/engines/zvision/scripting/scripting_effect.h b/engines/zvision/scripting/scripting_effect.h
new file mode 100644
index 0000000000..0af1d9c21c
--- /dev/null
+++ b/engines/zvision/scripting/scripting_effect.h
@@ -0,0 +1,124 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SCRIPTING_EFFECT_H_INCLUDED
+#define SCRIPTING_EFFECT_H_INCLUDED
+
+namespace Common {
+class SeekableReadStream;
+struct Point;
+class WriteStream;
+}
+
+namespace ZVision {
+
+class ZVision;
+
+/**
+  * The base class that represents effects created from Actions.
+  * This class is virtual.
+  *
+  * Detailed Description: 
+  *     A scene has Controls. By interacting with the controls, the user
+  *     causes Actions to execute. Certain Actions create 'effects', for
+  *     example, a sound or an animation. This is the base class for
+  *     those effects.
+  */
+class ScriptingEffect {
+public:
+
+	enum ScriptingEffectType {
+		SCRIPTING_EFFECT_ANIM  = 1,
+		SCRIPTING_EFFECT_AUDIO = 2,
+		SCRIPTING_EFFECT_DISTORT = 4,
+		SCRIPTING_EFFECT_PANTRACK = 8,
+		SCRIPTING_EFFECT_REGION = 16,
+		SCRIPTING_EFFECT_TIMER = 32,
+		SCRIPTING_EFFECT_TTYTXT = 64,
+		SCRIPTING_EFFECT_UNKNOWN = 128,
+		SCRIPTING_EFFECT_ALL = 255
+	};
+
+	ScriptingEffect() : _engine(0), _key(0), _type(SCRIPTING_EFFECT_UNKNOWN) {}
+	ScriptingEffect(ZVision *engine, uint32 key, ScriptingEffectType type) : _engine(engine), _key(key), _type(type) {}
+	virtual ~ScriptingEffect() {}
+
+	uint32 getKey() {
+		return _key;
+	}
+	ScriptingEffectType getType() {
+		return _type;
+	}
+
+	virtual bool process(uint32 deltaTimeInMillis) {
+		return false;
+	}
+	/**
+	 * Serialize a SideFX for save game use. This should only be used if a SideFX needs
+	 * to save values that would be different from initialization. AKA a TimerNode needs to
+	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
+	 * their key as the first data outputted. The default implementation is NOP.
+	 *
+	 * NOTE: If this method is overridden, you MUST also override deserialize()
+	 * and needsSerialization()
+	 *
+	 * @param stream    Stream to write any needed data to
+	 */
+	virtual void serialize(Common::WriteStream *stream) {}
+	/**
+	 * De-serialize data from a save game stream. This should only be implemented if the
+	 * SideFX also implements serialize(). The calling method assumes the size of the
+	 * data read from the stream exactly equals that written in serialize(). The default
+	 * implementation is NOP.
+	 *
+	 * NOTE: If this method is overridden, you MUST also override serialize()
+	 * and needsSerialization()
+	 *
+	 * @param stream    Save game file stream
+	 */
+	virtual void deserialize(Common::SeekableReadStream *stream) {}
+	/**
+	 * If a SideFX overrides serialize() and deserialize(), this should return true
+	 *
+	 * @return    Does the SideFX need save game serialization?
+	 */
+	virtual inline bool needsSerialization() {
+		return false;
+	}
+
+	virtual bool stop() {
+		return true;
+	}
+	virtual void kill() {}
+
+protected:
+	ZVision *_engine;
+	uint32 _key;
+	ScriptingEffectType _type;
+
+// Static member functions
+public:
+
+};
+} // End of namespace ZVision
+
+#endif // SCRIPTING_EFFECT_H_INCLUDED
diff --git a/engines/zvision/scripting/sidefx.h b/engines/zvision/scripting/sidefx.h
deleted file mode 100644
index 5bb14f0cdd..0000000000
--- a/engines/zvision/scripting/sidefx.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SIDEFX_H_INCLUDED
-#define SIDEFX_H_INCLUDED
-
-namespace Common {
-class SeekableReadStream;
-struct Point;
-class WriteStream;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-class SideFX {
-public:
-
-	enum SideFXType {
-		SIDEFX_ANIM  = 1,
-		SIDEFX_AUDIO = 2,
-		SIDEFX_DISTORT = 4,
-		SIDEFX_PANTRACK = 8,
-		SIDEFX_REGION = 16,
-		SIDEFX_TIMER = 32,
-		SIDEFX_TTYTXT = 64,
-		SIDEFX_UNK = 128,
-		SIDEFX_ALL = 255
-	};
-
-	SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
-	SideFX(ZVision *engine, uint32 key, SideFXType type) : _engine(engine), _key(key), _type(type) {}
-	virtual ~SideFX() {}
-
-	uint32 getKey() {
-		return _key;
-	}
-	SideFXType getType() {
-		return _type;
-	}
-
-	virtual bool process(uint32 deltaTimeInMillis) {
-		return false;
-	}
-	/**
-	 * Serialize a SideFX for save game use. This should only be used if a SideFX needs
-	 * to save values that would be different from initialization. AKA a TimerNode needs to
-	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
-	 * their key as the first data outputted. The default implementation is NOP.
-	 *
-	 * NOTE: If this method is overridden, you MUST also override deserialize()
-	 * and needsSerialization()
-	 *
-	 * @param stream    Stream to write any needed data to
-	 */
-	virtual void serialize(Common::WriteStream *stream) {}
-	/**
-	 * De-serialize data from a save game stream. This should only be implemented if the
-	 * SideFX also implements serialize(). The calling method assumes the size of the
-	 * data read from the stream exactly equals that written in serialize(). The default
-	 * implementation is NOP.
-	 *
-	 * NOTE: If this method is overridden, you MUST also override serialize()
-	 * and needsSerialization()
-	 *
-	 * @param stream    Save game file stream
-	 */
-	virtual void deserialize(Common::SeekableReadStream *stream) {}
-	/**
-	 * If a SideFX overrides serialize() and deserialize(), this should return true
-	 *
-	 * @return    Does the SideFX need save game serialization?
-	 */
-	virtual inline bool needsSerialization() {
-		return false;
-	}
-
-	virtual bool stop() {
-		return true;
-	}
-	virtual void kill() {}
-
-protected:
-	ZVision *_engine;
-	uint32 _key;
-	SideFXType _type;
-
-// Static member functions
-public:
-
-};
-} // End of namespace ZVision
-
-#endif // SIDEFX_H_INCLUDED
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
deleted file mode 100644
index 07eda692c1..0000000000
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/animation_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/scripting/script_manager.h"
-
-#include "graphics/surface.h"
-#include "video/video_decoder.h"
-
-namespace ZVision {
-
-AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool disposeAfterUse)
-	: SideFX(engine, controlKey, SIDEFX_ANIM),
-	  _disposeAfterUse(disposeAfterUse),
-	  _mask(mask),
-	  _animation(NULL) {
-
-	_animation = engine->loadAnimation(fileName);
-
-	if (frate > 0) {
-		_frmDelayOverride = (int32)(1000.0 / frate);
-
-		// WORKAROUND: We do not allow the engine to delay more than 66 msec
-		// per frame (15fps max)
-		if (_frmDelayOverride > 66)
-			_frmDelayOverride = 66;
-	} else {
-		_frmDelayOverride = 0;
-	}
-}
-
-AnimationNode::~AnimationNode() {
-	if (_animation)
-		delete _animation;
-
-	_engine->getScriptManager()->setStateValue(_key, 2);
-
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-
-		if ((*it)._scaled) {
-			(*it)._scaled->free();
-			delete(*it)._scaled;
-		}
-	}
-
-	_playList.clear();
-}
-
-bool AnimationNode::process(uint32 deltaTimeInMillis) {
-	ScriptManager *scriptManager = _engine->getScriptManager();
-	RenderManager *renderManager = _engine->getRenderManager();
-	RenderTable::RenderState renderState = renderManager->getRenderTable()->getRenderState();
-	bool isPanorama = (renderState == RenderTable::PANORAMA);
-	int16 velocity = _engine->getMouseVelocity() + _engine->getKeyboardVelocity();
-
-	// Do not update animation nodes in panoramic mode while turning, if the user
-	// has set this option
-	if (scriptManager->getStateValue(StateKey_NoTurnAnim) == 1 && isPanorama && velocity)
-		return false;
-
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		playnode *nod = &(*it);
-
-		if (!_animation->isPlaying()) {
-			// The node is just beginning playback
-			_animation->start();
-			_animation->seekToFrame(nod->start);
-
-			nod->_delay = deltaTimeInMillis; // Force the frame to draw
-			if (nod->slot)
-				scriptManager->setStateValue(nod->slot, 1);
-		} else if (_animation->endOfVideo()) {
-			// The node has reached the end; check if we need to loop
-			nod->loop--;
-
-			if (nod->loop == 0) {
-				if (nod->slot >= 0)
-					scriptManager->setStateValue(nod->slot, 2);
-				if (nod->_scaled) {
-					nod->_scaled->free();
-					delete nod->_scaled;
-				}
-				_playList.erase(it);
-				return _disposeAfterUse;
-			}
-
-			_animation->seekToFrame(nod->start);
-		}
-
-		// Check if we need to draw a frame
-		bool needsUpdate = false;
-		if (_frmDelayOverride == 0) {
-			// If not overridden, use the VideoDecoder's check
-			needsUpdate = _animation->needsUpdate();
-		} else {
-			// Otherwise, implement our own timing
-			nod->_delay -= deltaTimeInMillis;
-
-			if (nod->_delay <= 0) {
-				nod->_delay += _frmDelayOverride;
-				needsUpdate = true;
-			}
-		}
-
-		if (needsUpdate) {
-			const Graphics::Surface *frame = _animation->decodeNextFrame();
-
-			if (frame) {
-				uint32 dstw;
-				uint32 dsth;
-				if (isPanorama) {
-					dstw = nod->pos.height();
-					dsth = nod->pos.width();
-				} else {
-					dstw = nod->pos.width();
-					dsth = nod->pos.height();
-				}
-
-				// We only scale down the animation to fit its frame, not up, otherwise we
-				// end up with distorted animations - e.g. the armor visor in location cz1e
-				// in Nemesis (one of the armors inside Irondune), or the planet in location
-				// aa10 in Nemesis (Juperon, outside the asylum). We do allow scaling up only
-				// when a simple 2x filter is requested (e.g. the alchemists and cup sequence
-				// in Nemesis)
-				if (frame->w > dstw || frame->h > dsth || (frame->w == dstw / 2 && frame->h == dsth / 2)) {
-					if (nod->_scaled)
-						if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
-							nod->_scaled->free();
-							delete nod->_scaled;
-							nod->_scaled = NULL;
-						}
-
-					if (!nod->_scaled) {
-						nod->_scaled = new Graphics::Surface;
-						nod->_scaled->create(dstw, dsth, frame->format);
-					}
-
-					renderManager->scaleBuffer(frame->getPixels(), nod->_scaled->getPixels(), frame->w, frame->h, frame->format.bytesPerPixel, dstw, dsth);
-					frame = nod->_scaled;
-				}
-
-				if (isPanorama) {
-					Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
-					renderManager->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
-					transposed->free();
-					delete transposed;
-				} else {
-					renderManager->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) {
-	playnode nod;
-	nod.loop = loops;
-	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
-	nod.start = startFrame;
-	_animation->setEndFrame(CLIP<int>(endFrame, 0, _animation->getFrameCount() - 1));
-
-	nod.slot = slot;
-	nod._delay = 0;
-	nod._scaled = NULL;
-	_playList.push_back(nod);
-}
-
-bool AnimationNode::stop() {
-	PlayNodes::iterator it = _playList.begin();
-	if (it != _playList.end()) {
-		_engine->getScriptManager()->setStateValue((*it).slot, 2);
-		if ((*it)._scaled) {
-			(*it)._scaled->free();
-			delete(*it)._scaled;
-		}
-	}
-
-	_playList.clear();
-
-	// We don't need to delete, it's may be reused
-	return false;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h
deleted file mode 100644
index 1dc0dc71b8..0000000000
--- a/engines/zvision/scripting/sidefx/animation_node.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_ANIMATION_NODE_H
-#define ZVISION_ANIMATION_NODE_H
-
-#include "zvision/scripting/sidefx.h"
-#include "common/rect.h"
-#include "common/list.h"
-
-namespace Graphics {
-struct Surface;
-}
-
-namespace Video {
-	class VideoDecoder;
-}
-
-namespace ZVision {
-
-class ZVision;
-
-class AnimationNode : public SideFX {
-public:
-	AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool disposeAfterUse = true);
-	~AnimationNode();
-
-	struct playnode {
-		Common::Rect pos;
-		int32 slot;
-		int32 start;
-		int32 loop;
-		int32 _delay;
-		Graphics::Surface *_scaled;
-	};
-
-private:
-	typedef Common::List<playnode> PlayNodes;
-
-	PlayNodes _playList;
-
-	int32 _mask;
-	bool _disposeAfterUse;
-
-	Video::VideoDecoder *_animation;
-	int32 _frmDelayOverride;
-
-public:
-	bool process(uint32 deltaTimeInMillis);
-
-	void addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops = 1);
-
-	bool stop();
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp
deleted file mode 100644
index 7d25adc031..0000000000
--- a/engines/zvision/scripting/sidefx/distort_node.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/distort_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/render_table.h"
-
-#include "common/stream.h"
-
-namespace ZVision {
-
-DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale)
-	: SideFX(engine, key, SIDEFX_DISTORT) {
-
-	_angle = _engine->getRenderManager()->getRenderTable()->getAngle();
-	_linScale = _engine->getRenderManager()->getRenderTable()->getLinscale();
-
-	_speed = speed;
-	_incr = true;
-	_startAngle = startAngle;
-	_endAngle = endAngle;
-	_startLineScale = startLineScale;
-	_endLineScale = endLineScale;
-
-	_curFrame = 1.0;
-
-	_diffAngle = endAngle - startAngle;
-	_diffLinScale = endLineScale - startLineScale;
-
-	_frmSpeed = (float)speed / 15.0;
-	_frames = ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed);
-	if (_frames <= 0)
-		_frames = 1;
-
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 1);
-}
-
-DistortNode::~DistortNode() {
-	setParams(_angle, _linScale);
-}
-
-bool DistortNode::process(uint32 deltaTimeInMillis) {
-	float updTime = deltaTimeInMillis / (1000.0 / 60.0);
-
-	if (_incr)
-		_curFrame += updTime;
-	else
-		_curFrame -= updTime;
-
-	if (_curFrame < 1.0) {
-		_curFrame = 1.0;
-		_incr = true;
-	} else if (_curFrame > _frames) {
-		_curFrame = _frames;
-		_incr = false;
-	}
-
-	float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed);
-	setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale);
-
-	return false;
-}
-
-void DistortNode::setParams(float angl, float linScale) {
-	RenderTable *table = _engine->getRenderManager()->getRenderTable();
-	if (table->getRenderState() == RenderTable::PANORAMA) {
-		table->setPanoramaFoV(angl);
-		table->setPanoramaScale(linScale);
-		table->generateRenderTable();
-		_engine->getRenderManager()->markDirty();
-	} else if (table->getRenderState() == RenderTable::TILT) {
-		table->setTiltFoV(angl);
-		table->setTiltScale(linScale);
-		table->generateRenderTable();
-		_engine->getRenderManager()->markDirty();
-	}
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/distort_node.h b/engines/zvision/scripting/sidefx/distort_node.h
deleted file mode 100644
index 787a69bdde..0000000000
--- a/engines/zvision/scripting/sidefx/distort_node.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_DISTORT_NODE_H
-#define ZVISION_DISTORT_NODE_H
-
-#include "zvision/scripting/sidefx.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class DistortNode : public SideFX {
-public:
-	DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale);
-	~DistortNode();
-
-	bool process(uint32 deltaTimeInMillis);
-
-private:
-	int16 _speed;
-	float _startAngle;
-	float _endAngle;
-	float _startLineScale;
-	float _endLineScale;
-
-	float _frmSpeed;
-	float _diffAngle;
-	float _diffLinScale;
-	bool _incr;
-	int16 _frames;
-
-	float _curFrame;
-
-	float _angle;
-	float _linScale;
-
-private:
-	void setParams(float angl, float linScale);
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
deleted file mode 100644
index 0cada6d748..0000000000
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/music_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/sound/midi.h"
-#include "zvision/sound/zork_raw.h"
-
-#include "common/stream.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
-
-namespace ZVision {
-
-MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
-	: MusicNodeBASE(engine, key, SIDEFX_AUDIO) {
-	_loop = loop;
-	_volume = volume;
-	_crossfade = false;
-	_crossfadeTarget = 0;
-	_crossfadeTime = 0;
-	_attenuate = 0;
-	_pantrack = false;
-	_pantrackPosition = 0;
-	_sub = NULL;
-	_stereo = false;
-	_loaded = false;
-
-	Audio::RewindableAudioStream *audioStream = NULL;
-
-	if (filename.contains(".wav")) {
-		Common::File *file = new Common::File();
-		if (_engine->getSearchManager()->openFile(*file, filename)) {
-			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
-		}
-	} else {
-		audioStream = makeRawZorkStream(filename, _engine);
-	}
-
-	if (audioStream) {
-		_stereo = audioStream->isStereo();
-
-		if (_loop) {
-			Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
-		} else {
-			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
-		}
-
-		if (_key != StateKey_NotSet)
-			_engine->getScriptManager()->setStateValue(_key, 1);
-
-		// Change filename.raw into filename.sub
-		Common::String subname = filename;
-		subname.setChar('s', subname.size() - 3);
-		subname.setChar('u', subname.size() - 2);
-		subname.setChar('b', subname.size() - 1);
-
-		if (_engine->getSearchManager()->hasFile(subname))
-			_sub = new Subtitle(_engine, subname);
-
-		_loaded = true;
-	}
-}
-
-MusicNode::~MusicNode() {
-	if (_loaded)
-		_engine->_mixer->stopHandle(_handle);
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-	if (_sub)
-		delete _sub;
-	debug(1, "MusicNode: %d destroyed\n", _key);
-}
-
-void MusicNode::setPanTrack(int16 pos) {
-	if (!_stereo) {
-		_pantrack = true;
-		_pantrackPosition = pos;
-		setVolume(_volume);
-	}
-}
-
-void MusicNode::unsetPanTrack() {
-	_pantrack = false;
-	setVolume(_volume);
-}
-
-void MusicNode::setFade(int32 time, uint8 target) {
-	_crossfadeTarget = target;
-	_crossfadeTime = time;
-	_crossfade = true;
-}
-
-bool MusicNode::process(uint32 deltaTimeInMillis) {
-	if (!_loaded || ! _engine->_mixer->isSoundHandleActive(_handle))
-		return stop();
-	else {
-		uint8 _newvol = _volume;
-
-		if (_crossfade) {
-			if (_crossfadeTime > 0) {
-				if ((int32)deltaTimeInMillis > _crossfadeTime)
-					deltaTimeInMillis = _crossfadeTime;
-				_newvol += floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis;
-				_crossfadeTime -= deltaTimeInMillis;
-			} else {
-				_crossfade = false;
-				_newvol = _crossfadeTarget;
-			}
-		}
-
-		if (_pantrack || _volume != _newvol)
-			setVolume(_newvol);
-
-		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
-			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
-	}
-	return false;
-}
-
-void MusicNode::setVolume(uint8 newVolume) {
-	if (!_loaded)
-		return;
-	if (_pantrack) {
-		int curX = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
-		curX -= _pantrackPosition;
-		int32 _width = _engine->getRenderManager()->getBkgSize().x;
-		if (curX < (-_width) / 2)
-			curX += _width;
-		else if (curX >= _width / 2)
-			curX -= _width;
-
-		float norm = (float)curX / ((float)_width / 2.0);
-		float lvl = fabs(norm);
-		if (lvl > 0.5)
-			lvl = (lvl - 0.5) * 1.7;
-		else
-			lvl = 1.0;
-
-		float bal = sin(-norm * 3.1415926) * 127.0;
-
-		if (_engine->_mixer->isSoundHandleActive(_handle)) {
-			_engine->_mixer->setChannelBalance(_handle, bal);
-			_engine->_mixer->setChannelVolume(_handle, newVolume * lvl);
-		}
-	} else {
-		if (_engine->_mixer->isSoundHandleActive(_handle)) {
-			_engine->_mixer->setChannelBalance(_handle, 0);
-			_engine->_mixer->setChannelVolume(_handle, newVolume);
-		}
-	}
-
-	_volume = newVolume;
-}
-
-PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
-	: SideFX(engine, key, SIDEFX_PANTRACK) {
-	_slot = slot;
-
-	SideFX *fx = _engine->getScriptManager()->getSideFX(slot);
-	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
-		mus->setPanTrack(pos);
-	}
-}
-
-PanTrackNode::~PanTrackNode() {
-	SideFX *fx = _engine->getScriptManager()->getSideFX(_slot);
-	if (fx && fx->getType() == SIDEFX_AUDIO) {
-		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
-		mus->unsetPanTrack();
-	}
-}
-
-MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
-	: MusicNodeBASE(engine, key, SIDEFX_AUDIO) {
-	_volume = volume;
-	_prog = program;
-	_noteNumber = note;
-	_pan = 0;
-
-	_chan = _engine->getMidiManager()->getFreeChannel();
-
-	if (_chan >= 0) {
-		_engine->getMidiManager()->setVolume(_chan, _volume);
-		_engine->getMidiManager()->setPan(_chan, _pan);
-		_engine->getMidiManager()->setProgram(_chan, _prog);
-		_engine->getMidiManager()->noteOn(_chan, _noteNumber, _volume);
-	}
-
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 1);
-}
-
-MusicMidiNode::~MusicMidiNode() {
-	if (_chan >= 0) {
-		_engine->getMidiManager()->noteOff(_chan);
-	}
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-}
-
-void MusicMidiNode::setPanTrack(int16 pos) {
-}
-
-void MusicMidiNode::unsetPanTrack() {
-}
-
-void MusicMidiNode::setFade(int32 time, uint8 target) {
-}
-
-bool MusicMidiNode::process(uint32 deltaTimeInMillis) {
-	return false;
-}
-
-void MusicMidiNode::setVolume(uint8 newVolume) {
-	if (_chan >= 0) {
-		_engine->getMidiManager()->setVolume(_chan, newVolume);
-	}
-	_volume = newVolume;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/music_node.h b/engines/zvision/scripting/sidefx/music_node.h
deleted file mode 100644
index 3f1ca5cf7b..0000000000
--- a/engines/zvision/scripting/sidefx/music_node.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_MUSIC_NODE_H
-#define ZVISION_MUSIC_NODE_H
-
-#include "audio/mixer.h"
-#include "zvision/scripting/sidefx.h"
-#include "zvision/text/subtitles.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-
-class MusicNodeBASE : public SideFX {
-public:
-	MusicNodeBASE(ZVision *engine, uint32 key, SideFXType type) : SideFX(engine, key, type) {}
-	~MusicNodeBASE() {}
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	virtual bool process(uint32 deltaTimeInMillis) = 0;
-
-	virtual void setVolume(uint8 volume) = 0;
-
-	virtual void setPanTrack(int16 pos) = 0;
-	virtual void unsetPanTrack() = 0;
-
-	virtual void setFade(int32 time, uint8 target) = 0;
-};
-
-class MusicNode : public MusicNodeBASE {
-public:
-	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
-	~MusicNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-
-	void setVolume(uint8 volume);
-
-	void setPanTrack(int16 pos);
-	void unsetPanTrack();
-
-	void setFade(int32 time, uint8 target);
-
-private:
-	bool _pantrack;
-	int32 _pantrackPosition;
-	int32 _attenuate;
-	uint8 _volume;
-	bool _loop;
-	bool _crossfade;
-	uint8 _crossfadeTarget;
-	int32 _crossfadeTime;
-	bool _stereo;
-	Audio::SoundHandle _handle;
-	Subtitle *_sub;
-	bool _loaded;
-};
-
-// Only used by Zork: Nemesis, for the flute and piano puzzles (tj4e and ve6f, as well as vr)
-class MusicMidiNode : public MusicNodeBASE {
-public:
-	MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume);
-	~MusicMidiNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-
-	void setVolume(uint8 volume);
-
-	void setPanTrack(int16 pos);
-	void unsetPanTrack();
-
-	void setFade(int32 time, uint8 target);
-
-private:
-	int8 _chan;
-	int8 _noteNumber;
-	int8 _pan;
-	int8 _volume;
-	int8 _prog;
-};
-
-class PanTrackNode : public SideFX {
-public:
-	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
-	~PanTrackNode();
-
-private:
-	uint32 _slot;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/sidefx/region_node.cpp b/engines/zvision/scripting/sidefx/region_node.cpp
deleted file mode 100644
index de613d8af2..0000000000
--- a/engines/zvision/scripting/sidefx/region_node.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/region_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-
-namespace ZVision {
-
-RegionNode::RegionNode(ZVision *engine, uint32 key, Effect *effect, uint32 delay)
-	: SideFX(engine, key, SIDEFX_REGION) {
-	_effect = effect;
-	_delay = delay;
-	_timeLeft = 0;
-}
-
-RegionNode::~RegionNode() {
-	_engine->getRenderManager()->deleteEffect(_key);
-}
-
-bool RegionNode::process(uint32 deltaTimeInMillis) {
-	_timeLeft -= deltaTimeInMillis;
-
-	if (_timeLeft <= 0) {
-		_timeLeft = _delay;
-		if (_effect)
-			_effect->update();
-	}
-
-	return false;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/region_node.h b/engines/zvision/scripting/sidefx/region_node.h
deleted file mode 100644
index ec716b6e3e..0000000000
--- a/engines/zvision/scripting/sidefx/region_node.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_REGION_NODE_H
-#define ZVISION_REGION_NODE_H
-
-#include "graphics/surface.h"
-
-#include "zvision/scripting/sidefx.h"
-#include "zvision/graphics/effect.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class RegionNode : public SideFX {
-public:
-	RegionNode(ZVision *engine, uint32 key, Effect *effect, uint32 delay);
-	~RegionNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-
-private:
-	int32 _timeLeft;
-	uint32 _delay;
-	Effect *_effect;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
deleted file mode 100644
index eec320bf2e..0000000000
--- a/engines/zvision/scripting/sidefx/syncsound_node.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/syncsound_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/sound/zork_raw.h"
-
-#include "common/stream.h"
-#include "common/file.h"
-#include "audio/decoders/wave.h"
-
-namespace ZVision {
-
-SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)
-	: SideFX(engine, key, SIDEFX_AUDIO) {
-	_syncto = syncto;
-	_sub = NULL;
-
-	Audio::RewindableAudioStream *audioStream = NULL;
-
-	if (filename.contains(".wav")) {
-		Common::File *file = new Common::File();
-		if (_engine->getSearchManager()->openFile(*file, filename)) {
-			audioStream = Audio::makeWAVStream(file, DisposeAfterUse::YES);
-		}
-	} else {
-		audioStream = makeRawZorkStream(filename, _engine);
-	}
-
-	_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream);
-
-	Common::String subname = filename;
-	subname.setChar('s', subname.size() - 3);
-	subname.setChar('u', subname.size() - 2);
-	subname.setChar('b', subname.size() - 1);
-
-	if (_engine->getSearchManager()->hasFile(subname))
-		_sub = new Subtitle(_engine, subname);
-}
-
-SyncSoundNode::~SyncSoundNode() {
-	_engine->_mixer->stopHandle(_handle);
-	if (_sub)
-		delete _sub;
-}
-
-bool SyncSoundNode::process(uint32 deltaTimeInMillis) {
-	if (! _engine->_mixer->isSoundHandleActive(_handle))
-		return stop();
-	else {
-
-		if (_engine->getScriptManager()->getSideFX(_syncto) == NULL)
-			return stop();
-
-		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
-			_sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100);
-	}
-	return false;
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.h b/engines/zvision/scripting/sidefx/syncsound_node.h
deleted file mode 100644
index 5961fccab9..0000000000
--- a/engines/zvision/scripting/sidefx/syncsound_node.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_SYNCSOUND_NODE_H
-#define ZVISION_SYNCSOUND_NODE_H
-
-#include "audio/mixer.h"
-#include "zvision/scripting/sidefx.h"
-#include "zvision/text/subtitles.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-class SyncSoundNode : public SideFX {
-public:
-	SyncSoundNode(ZVision *engine, uint32 key, Common::String &file, int32 syncto);
-	~SyncSoundNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-private:
-	int32 _syncto;
-	Audio::SoundHandle _handle;
-	Subtitle *_sub;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/sidefx/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp
deleted file mode 100644
index 170f6e7472..0000000000
--- a/engines/zvision/scripting/sidefx/timer_node.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/timer_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-
-#include "common/stream.h"
-
-namespace ZVision {
-
-TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
-	: SideFX(engine, key, SIDEFX_TIMER) {
-	_timeLeft = 0;
-
-	if (_engine->getGameId() == GID_NEMESIS)
-		_timeLeft = timeInSeconds * 1000;
-	else if (_engine->getGameId() == GID_GRANDINQUISITOR)
-		_timeLeft = timeInSeconds * 100;
-
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 1);
-}
-
-TimerNode::~TimerNode() {
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-	int32 timeLeft = _timeLeft / (_engine->getGameId() == GID_NEMESIS ? 1000 : 100);
-	if (timeLeft > 0)
-		_engine->getScriptManager()->setStateValue(_key, timeLeft); // If timer was stopped by stop or kill
-}
-
-bool TimerNode::process(uint32 deltaTimeInMillis) {
-	_timeLeft -= deltaTimeInMillis;
-
-	if (_timeLeft <= 0)
-		return stop();
-
-	return false;
-}
-
-bool TimerNode::stop() {
-	if (_key != StateKey_NotSet)
-		_engine->getScriptManager()->setStateValue(_key, 2);
-	return true;
-}
-
-void TimerNode::serialize(Common::WriteStream *stream) {
-	stream->writeUint32BE(MKTAG('T', 'I', 'M', 'R'));
-	stream->writeUint32LE(8); // size
-	stream->writeUint32LE(_key);
-	stream->writeUint32LE(_timeLeft);
-}
-
-void TimerNode::deserialize(Common::SeekableReadStream *stream) {
-	_timeLeft = stream->readUint32LE();
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/timer_node.h b/engines/zvision/scripting/sidefx/timer_node.h
deleted file mode 100644
index 7a26aff251..0000000000
--- a/engines/zvision/scripting/sidefx/timer_node.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_TIMER_NODE_H
-#define ZVISION_TIMER_NODE_H
-
-#include "zvision/scripting/sidefx.h"
-
-namespace ZVision {
-
-class ZVision;
-
-class TimerNode : public SideFX {
-public:
-	TimerNode(ZVision *engine, uint32 key, uint timeInSeconds);
-	~TimerNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-	void serialize(Common::WriteStream *stream);
-	void deserialize(Common::SeekableReadStream *stream);
-	inline bool needsSerialization() {
-		return true;
-	}
-
-	bool stop();
-
-private:
-	int32 _timeLeft;
-};
-
-} // End of namespace ZVision
-
-#endif
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp
deleted file mode 100644
index 66a27e96c5..0000000000
--- a/engines/zvision/scripting/sidefx/ttytext_node.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/scripting/sidefx/ttytext_node.h"
-
-#include "zvision/zvision.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/text/text.h"
-
-#include "common/stream.h"
-#include "common/file.h"
-
-namespace ZVision {
-
-ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :
-	SideFX(engine, key, SIDEFX_TTYTXT),
-	_fnt(engine) {
-	_delay = delay;
-	_r = r;
-	_txtpos = 0;
-	_nexttime = 0;
-	_dx = 0;
-	_dy = 0;
-
-	Common::File *infile = _engine->getSearchManager()->openFile(file);
-	if (infile) {
-		while (!infile->eos()) {
-			Common::String asciiLine = readWideLine(*infile);
-			if (asciiLine.empty()) {
-				continue;
-			}
-			_txtbuf += asciiLine;
-		}
-
-		delete infile;
-	}
-	_img.create(_r.width(), _r.height(), _engine->_resourcePixelFormat);
-	_style._sharp = true;
-	_style.readAllStyle(_txtbuf);
-	_style.setFont(_fnt);
-	_engine->getScriptManager()->setStateValue(_key, 1);
-}
-
-ttyTextNode::~ttyTextNode() {
-	_engine->getScriptManager()->setStateValue(_key, 2);
-	_img.free();
-}
-
-bool ttyTextNode::process(uint32 deltaTimeInMillis) {
-	_nexttime -= deltaTimeInMillis;
-
-	if (_nexttime < 0) {
-		if (_txtpos < _txtbuf.size()) {
-			if (_txtbuf[_txtpos] == '<') {
-				int32 strt = _txtpos;
-				int32 endt = 0;
-				int16 ret = 0;
-				while (_txtbuf[_txtpos] != '>' && _txtpos < _txtbuf.size())
-					_txtpos++;
-				endt = _txtpos;
-				if (strt != -1)
-					if ((endt - strt - 1) > 0)
-						ret = _style.parseStyle(_txtbuf.c_str() + strt + 1, endt - strt - 1);
-
-				if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
-					if (ret & TXT_RET_FNTCHG)
-						_style.setFont(_fnt);
-					if (ret & TXT_RET_FNTSTL)
-						_style.setFontStyle(_fnt);
-
-					if (ret & TXT_RET_NEWLN)
-						newline();
-				}
-
-				if (ret & TXT_RET_HASSTBOX) {
-					Common::String buf;
-					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style._statebox));
-
-					for (uint8 j = 0; j < buf.size(); j++)
-						outchar(buf[j]);
-				}
-
-				_txtpos++;
-			} else {
-				int8 charsz = getUtf8CharSize(_txtbuf[_txtpos]);
-
-				uint16 chr = readUtf8Char(_txtbuf.c_str() + _txtpos);
-
-				if (chr == ' ') {
-					uint32 i = _txtpos + charsz;
-					uint16 width = _fnt.getCharWidth(chr);
-
-					while (i < _txtbuf.size() && _txtbuf[i] != ' ' && _txtbuf[i] != '<') {
-
-						int8 chsz   = getUtf8CharSize(_txtbuf[i]);
-						uint16 uchr = readUtf8Char(_txtbuf.c_str() + _txtpos);
-
-						width += _fnt.getCharWidth(uchr);
-
-						i += chsz;
-					}
-
-					if (_dx + width > _r.width())
-						newline();
-					else
-						outchar(chr);
-				} else
-					outchar(chr);
-
-				_txtpos += charsz;
-			}
-			_nexttime = _delay;
-			_engine->getRenderManager()->blitSurfaceToBkg(_img, _r.left, _r.top);
-		} else
-			return stop();
-	}
-
-	return false;
-}
-
-void ttyTextNode::scroll() {
-	int32 scrl = 0;
-	while (_dy - scrl > _r.height() - _fnt.getFontHeight())
-		scrl += _fnt.getFontHeight();
-	int8 *pixels = (int8 *)_img.getPixels();
-	for (uint16 h = scrl; h < _img.h; h++)
-		memcpy(pixels + _img.pitch * (h - scrl), pixels + _img.pitch * h, _img.pitch);
-
-	_img.fillRect(Common::Rect(0, _img.h - scrl, _img.w, _img.h), 0);
-	_dy -= scrl;
-}
-
-void ttyTextNode::newline() {
-	_dy += _fnt.getFontHeight();
-	_dx = 0;
-}
-
-void ttyTextNode::outchar(uint16 chr) {
-	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(_style._red, _style._green, _style._blue);
-
-	if (_dx + _fnt.getCharWidth(chr) > _r.width())
-		newline();
-
-	if (_dy + _fnt.getFontHeight() >= _r.height())
-		scroll();
-
-	_fnt.drawChar(&_img, chr, _dx, _dy, clr);
-
-	_dx += _fnt.getCharWidth(chr);
-}
-
-} // End of namespace ZVision
diff --git a/engines/zvision/scripting/sidefx/ttytext_node.h b/engines/zvision/scripting/sidefx/ttytext_node.h
deleted file mode 100644
index 26d9be8e77..0000000000
--- a/engines/zvision/scripting/sidefx/ttytext_node.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ZVISION_TTYTEXT_NODE_H
-#define ZVISION_TTYTEXT_NODE_H
-
-#include "common/rect.h"
-#include "graphics/surface.h"
-
-#include "zvision/scripting/sidefx.h"
-#include "zvision/text/text.h"
-#include "zvision/text/truetype_font.h"
-
-namespace Common {
-class String;
-}
-
-namespace ZVision {
-class ttyTextNode : public SideFX {
-public:
-	ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay);
-	~ttyTextNode();
-
-	/**
-	 * Decrement the timer by the delta time. If the timer is finished, set the status
-	 * in _globalState and let this node be deleted
-	 *
-	 * @param deltaTimeInMillis    The number of milliseconds that have passed since last frame
-	 * @return                     If true, the node can be deleted after process() finishes
-	 */
-	bool process(uint32 deltaTimeInMillis);
-private:
-	Common::Rect _r;
-
-	cTxtStyle _style;
-	StyledTTFont _fnt;
-	Common::String _txtbuf;
-	uint32 _txtpos;
-
-	int32 _delay;
-	int32 _nexttime;
-	Graphics::Surface _img;
-	int16 _dx;
-	int16 _dy;
-private:
-
-	void newline();
-	void scroll();
-	void outchar(uint16 chr);
-};
-
-} // End of namespace ZVision
-
-#endif
-- 
cgit v1.2.3


From 1f5736a9020796e6986a15ea4d3b627b81233241 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 01:19:54 -0600
Subject: ZVISION: Update function documentation to represent the changes to
 the internal pixel format

Aka: We keep everything as 555, and only convert to 565 before we send everything to the backend
---
 engines/zvision/graphics/render_manager.h |   6 +-
 engines/zvision/zvision.cpp               | 720 +++++++++++++++---------------
 2 files changed, 362 insertions(+), 364 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 9002d66b47..c22f9a78c9 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -277,8 +277,7 @@ public:
 	void prepareBackground();
 
 	/**
-	 * Reads an image file pixel data into a Surface buffer. In the process
-	 * it converts the pixel data from RGB 555 to RGB 565. Also, if the image
+	 * Reads an image file pixel data into a Surface buffer. Also, if the image
 	 * is transposed, it will un-transpose the pixel data. The function will
 	 * call destination::create() if the dimensions of destination do not match
 	 * up with the dimensions of the image.
@@ -289,8 +288,7 @@ public:
 	void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination);
 
 	/**
-	 * Reads an image file pixel data into a Surface buffer. In the process
-	 * it converts the pixel data from RGB 555 to RGB 565. Also, if the image
+	 * Reads an image file pixel data into a Surface buffer. Also, if the image
 	 * is transposed, it will un-transpose the pixel data. The function will
 	 * call destination::create() if the dimensions of destination do not match
 	 * up with the dimensions of the image.
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 10e0aaedc4..a70f9d8e39 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -1,361 +1,361 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/zvision.h"
-#include "zvision/core/console.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/file/save_manager.h"
-#include "zvision/text/string_manager.h"
-#include "zvision/detection.h"
-#include "zvision/scripting/menu.h"
-#include "zvision/file/search_manager.h"
-#include "zvision/text/text.h"
-#include "zvision/text/truetype_font.h"
-#include "zvision/sound/midi.h"
-#include "zvision/file/zfs_archive.h"
-
-#include "common/config-manager.h"
-#include "common/str.h"
-#include "common/debug.h"
-#include "common/debug-channels.h"
-#include "common/textconsole.h"
-#include "common/error.h"
-#include "common/system.h"
-#include "common/file.h"
-
-#include "gui/message.h"
-#include "engines/util.h"
-#include "audio/mixer.h"
-
-namespace ZVision {
-
-#define ZVISION_SETTINGS_KEYS_COUNT 11
-
-struct zvisionIniSettings {
-	const char *name;
-	int16 slot;
-	int16 defaultValue;	// -1: use the bool value
-	bool defaultBoolValue;
-	bool allowEditing;
-} settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
-	// Hardcoded settings
-	{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, subtitles are shown for codes 0 - 4, unused
-	{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
-	{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, checked by universe.scr
-	{"highquality", StateKey_HighQuality, -1, true, false},	// high panorama quality, unused
-	{"qsoundenabled", StateKey_Qsound, -1, true, false},	// 1 = enable QSound - TODO: not supported yet
-	{"debugcheats", StateKey_DebugCheats, -1, true, false},	// always start with the GOxxxx cheat enabled
-	// Editable settings
-	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
-	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},	// checked by universe.scr
-	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
-	{"venusenabled", StateKey_VenusEnable, -1, true, true},
-	{"subtitles", StateKey_Subtitles, -1, true, true}
-};
-
-ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
-	: Engine(syst),
-	  _gameDescription(gameDesc),
-	  _resourcePixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), /* RGB 555 */
-	  _screenPixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /* RGB 565 */
-	  _desiredFrameTime(33), /* ~30 fps */
-	  _clock(_system),
-	  _scriptManager(nullptr),
-	  _renderManager(nullptr),
-	  _saveManager(nullptr),
-	  _stringManager(nullptr),
-	  _cursorManager(nullptr),
-	  _midiManager(nullptr),
-	  _rnd(nullptr),
-	  _console(nullptr),
-	  _menu(nullptr),
-	  _searchManager(nullptr),
-	  _textRenderer(nullptr),
-	  _doubleFPS(false),
-	  _audioId(0),
-	  _frameRenderDelay(2),
-	  _keyboardVelocity(0),
-	  _mouseVelocity(0),
-	  _videoIsPlaying(false),
-	  _renderedFrameCount(0),
-	  _fps(0) {
-
-	debug(1, "ZVision::ZVision");
-
-	uint16 workingWindowWidth  = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
-	uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
-	_workingWindow = Common::Rect(
-						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
-						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
-						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
-						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
-					 );
-
-	memset(_cheatBuffer, 0, sizeof(_cheatBuffer));
-}
-
-ZVision::~ZVision() {
-	debug(1, "ZVision::~ZVision");
-
-	// Dispose of resources
-	delete _console;
-	delete _cursorManager;
-	delete _stringManager;
-	delete _saveManager;
-	delete _scriptManager;
-	delete _renderManager;	// should be deleted after the script manager
-	delete _rnd;
-	delete _midiManager;
-
-	getTimerManager()->removeTimerProc(&fpsTimerCallback);
-
-	// Remove all of our debug levels
-	DebugMan.clearAllDebugChannels();
-}
-
-void ZVision::registerDefaultSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
-		if (settingsKeys[i].allowEditing) {
-			if (settingsKeys[i].defaultValue >= 0)
-				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultValue);
-			else
-				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultBoolValue);
-		}
-	}
-
-	ConfMan.registerDefault("originalsaveload", false);
-	ConfMan.registerDefault("doublefps", false);
-}
-
-void ZVision::loadSettings() {
-	int16 value = 0;
-	bool boolValue = false;
-
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
-		if (settingsKeys[i].defaultValue >= 0) {
-			value = (settingsKeys[i].allowEditing) ? ConfMan.getInt(settingsKeys[i].name) : settingsKeys[i].defaultValue;
-		} else {
-			boolValue = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
-			value = (boolValue) ? 1 : 0;
-		}
-
-		_scriptManager->setStateValue(settingsKeys[i].slot, value);
-	}
-
-	if (getGameId() == GID_NEMESIS)
-		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 1);
-	else
-		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 0);
-}
-
-void ZVision::saveSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
-		if (settingsKeys[i].allowEditing) {
-			if (settingsKeys[i].defaultValue >= 0)
-				ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
-			else
-				ConfMan.setBool(settingsKeys[i].name, (_scriptManager->getStateValue(settingsKeys[i].slot) == 1));
-		}
-	}
-
-	ConfMan.flushToDisk();
-}
-
-void ZVision::initialize() {
-	const Common::FSNode gameDataDir(ConfMan.get("path"));
-
-	_searchManager = new SearchManager(ConfMan.get("path"), 6);
-
-	_searchManager->addDir("FONTS");
-	_searchManager->addDir("addon");
-
-	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
-		_searchManager->loadZix("INQUIS.ZIX");
-		_searchManager->addPatch("C000H01Q.RAW", "C000H01Q.SRC");
-		_searchManager->addPatch("CM00H01Q.RAW", "CM00H01Q.SRC");
-		_searchManager->addPatch("DM00H01Q.RAW", "DM00H01Q.SRC");
-		_searchManager->addPatch("E000H01Q.RAW", "E000H01Q.SRC");
-		_searchManager->addPatch("EM00H50Q.RAW", "EM00H50Q.SRC");
-		_searchManager->addPatch("GJNPH65P.RAW", "GJNPH65P.SRC");
-		_searchManager->addPatch("GJNPH72P.RAW", "GJNPH72P.SRC");
-		_searchManager->addPatch("H000H01Q.RAW", "H000H01Q.SRC");
-		_searchManager->addPatch("M000H01Q.RAW", "M000H01Q.SRC");
-		_searchManager->addPatch("P000H01Q.RAW", "P000H01Q.SRC");
-		_searchManager->addPatch("Q000H01Q.RAW", "Q000H01Q.SRC");
-		_searchManager->addPatch("SW00H01Q.RAW", "SW00H01Q.SRC");
-		_searchManager->addPatch("T000H01Q.RAW", "T000H01Q.SRC");
-		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
-	} else if (_gameDescription->gameId == GID_NEMESIS)
-		_searchManager->loadZix("NEMESIS.ZIX");
-
-	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
-
-	// Register random source
-	_rnd = new Common::RandomSource("zvision");
-
-	// Create managers
-	_scriptManager = new ScriptManager(this);
-	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat, _doubleFPS);
-	_saveManager = new SaveManager(this);
-	_stringManager = new StringManager(this);
-	_cursorManager = new CursorManager(this, _resourcePixelFormat);
-	_textRenderer = new TextRenderer(this);
-	_midiManager = new MidiManager();
-
-	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
-		_menu = new MenuZGI(this);
-	else
-		_menu = new MenuNemesis(this);
-
-	// Initialize the managers
-	_cursorManager->initialize();
-	_scriptManager->initialize();
-	_stringManager->initialize(_gameDescription->gameId);
-
-	registerDefaultSettings();
-
-	loadSettings();
-
-	// Create debugger console. It requires GFX to be initialized
-	_console = new Console(this);
-	_doubleFPS = ConfMan.getBool("doublefps");
-
-	// Initialize FPS timer callback
-	getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this, "zvisionFPS");
-}
-
-Common::Error ZVision::run() {
-	initialize();
-
-	// Check if a saved game is to be loaded from the launcher
-	if (ConfMan.hasKey("save_slot"))
-		_saveManager->loadGame(ConfMan.getInt("save_slot"));
-
-	// Before starting, make absolutely sure that the user has copied the needed fonts
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/zvision.h"
+#include "zvision/core/console.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
+#include "zvision/file/save_manager.h"
+#include "zvision/text/string_manager.h"
+#include "zvision/detection.h"
+#include "zvision/scripting/menu.h"
+#include "zvision/file/search_manager.h"
+#include "zvision/text/text.h"
+#include "zvision/text/truetype_font.h"
+#include "zvision/sound/midi.h"
+#include "zvision/file/zfs_archive.h"
+
+#include "common/config-manager.h"
+#include "common/str.h"
+#include "common/debug.h"
+#include "common/debug-channels.h"
+#include "common/textconsole.h"
+#include "common/error.h"
+#include "common/system.h"
+#include "common/file.h"
+
+#include "gui/message.h"
+#include "engines/util.h"
+#include "audio/mixer.h"
+
+namespace ZVision {
+
+#define ZVISION_SETTINGS_KEYS_COUNT 11
+
+struct zvisionIniSettings {
+	const char *name;
+	int16 slot;
+	int16 defaultValue;	// -1: use the bool value
+	bool defaultBoolValue;
+	bool allowEditing;
+} settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
+	// Hardcoded settings
+	{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, subtitles are shown for codes 0 - 4, unused
+	{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
+	{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, checked by universe.scr
+	{"highquality", StateKey_HighQuality, -1, true, false},	// high panorama quality, unused
+	{"qsoundenabled", StateKey_Qsound, -1, true, false},	// 1 = enable QSound - TODO: not supported yet
+	{"debugcheats", StateKey_DebugCheats, -1, true, false},	// always start with the GOxxxx cheat enabled
+	// Editable settings
+	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
+	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},	// checked by universe.scr
+	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
+	{"venusenabled", StateKey_VenusEnable, -1, true, true},
+	{"subtitles", StateKey_Subtitles, -1, true, true}
+};
+
+ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
+	: Engine(syst),
+	  _gameDescription(gameDesc),
+	  _resourcePixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), /* RGB 555 */
+	  _screenPixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /* RGB 565 */
+	  _desiredFrameTime(33), /* ~30 fps */
+	  _clock(_system),
+	  _scriptManager(nullptr),
+	  _renderManager(nullptr),
+	  _saveManager(nullptr),
+	  _stringManager(nullptr),
+	  _cursorManager(nullptr),
+	  _midiManager(nullptr),
+	  _rnd(nullptr),
+	  _console(nullptr),
+	  _menu(nullptr),
+	  _searchManager(nullptr),
+	  _textRenderer(nullptr),
+	  _doubleFPS(false),
+	  _audioId(0),
+	  _frameRenderDelay(2),
+	  _keyboardVelocity(0),
+	  _mouseVelocity(0),
+	  _videoIsPlaying(false),
+	  _renderedFrameCount(0),
+	  _fps(0) {
+
+	debug(1, "ZVision::ZVision");
+
+	uint16 workingWindowWidth  = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
+	uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
+	_workingWindow = Common::Rect(
+						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
+						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
+						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
+						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
+					 );
+
+	memset(_cheatBuffer, 0, sizeof(_cheatBuffer));
+}
+
+ZVision::~ZVision() {
+	debug(1, "ZVision::~ZVision");
+
+	// Dispose of resources
+	delete _console;
+	delete _cursorManager;
+	delete _stringManager;
+	delete _saveManager;
+	delete _scriptManager;
+	delete _renderManager;	// should be deleted after the script manager
+	delete _rnd;
+	delete _midiManager;
+
+	getTimerManager()->removeTimerProc(&fpsTimerCallback);
+
+	// Remove all of our debug levels
+	DebugMan.clearAllDebugChannels();
+}
+
+void ZVision::registerDefaultSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].allowEditing) {
+			if (settingsKeys[i].defaultValue >= 0)
+				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultValue);
+			else
+				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultBoolValue);
+		}
+	}
+
+	ConfMan.registerDefault("originalsaveload", false);
+	ConfMan.registerDefault("doublefps", false);
+}
+
+void ZVision::loadSettings() {
+	int16 value = 0;
+	bool boolValue = false;
+
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].defaultValue >= 0) {
+			value = (settingsKeys[i].allowEditing) ? ConfMan.getInt(settingsKeys[i].name) : settingsKeys[i].defaultValue;
+		} else {
+			boolValue = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
+			value = (boolValue) ? 1 : 0;
+		}
+
+		_scriptManager->setStateValue(settingsKeys[i].slot, value);
+	}
+
+	if (getGameId() == GID_NEMESIS)
+		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 1);
+	else
+		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 0);
+}
+
+void ZVision::saveSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].allowEditing) {
+			if (settingsKeys[i].defaultValue >= 0)
+				ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
+			else
+				ConfMan.setBool(settingsKeys[i].name, (_scriptManager->getStateValue(settingsKeys[i].slot) == 1));
+		}
+	}
+
+	ConfMan.flushToDisk();
+}
+
+void ZVision::initialize() {
+	const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+	_searchManager = new SearchManager(ConfMan.get("path"), 6);
+
+	_searchManager->addDir("FONTS");
+	_searchManager->addDir("addon");
+
+	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
+		_searchManager->loadZix("INQUIS.ZIX");
+		_searchManager->addPatch("C000H01Q.RAW", "C000H01Q.SRC");
+		_searchManager->addPatch("CM00H01Q.RAW", "CM00H01Q.SRC");
+		_searchManager->addPatch("DM00H01Q.RAW", "DM00H01Q.SRC");
+		_searchManager->addPatch("E000H01Q.RAW", "E000H01Q.SRC");
+		_searchManager->addPatch("EM00H50Q.RAW", "EM00H50Q.SRC");
+		_searchManager->addPatch("GJNPH65P.RAW", "GJNPH65P.SRC");
+		_searchManager->addPatch("GJNPH72P.RAW", "GJNPH72P.SRC");
+		_searchManager->addPatch("H000H01Q.RAW", "H000H01Q.SRC");
+		_searchManager->addPatch("M000H01Q.RAW", "M000H01Q.SRC");
+		_searchManager->addPatch("P000H01Q.RAW", "P000H01Q.SRC");
+		_searchManager->addPatch("Q000H01Q.RAW", "Q000H01Q.SRC");
+		_searchManager->addPatch("SW00H01Q.RAW", "SW00H01Q.SRC");
+		_searchManager->addPatch("T000H01Q.RAW", "T000H01Q.SRC");
+		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
+	} else if (_gameDescription->gameId == GID_NEMESIS)
+		_searchManager->loadZix("NEMESIS.ZIX");
+
+	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
+
+	// Register random source
+	_rnd = new Common::RandomSource("zvision");
+
+	// Create managers
+	_scriptManager = new ScriptManager(this);
+	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat, _doubleFPS);
+	_saveManager = new SaveManager(this);
+	_stringManager = new StringManager(this);
+	_cursorManager = new CursorManager(this, _resourcePixelFormat);
+	_textRenderer = new TextRenderer(this);
+	_midiManager = new MidiManager();
+
+	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
+		_menu = new MenuZGI(this);
+	else
+		_menu = new MenuNemesis(this);
+
+	// Initialize the managers
+	_cursorManager->initialize();
+	_scriptManager->initialize();
+	_stringManager->initialize(_gameDescription->gameId);
+
+	registerDefaultSettings();
+
+	loadSettings();
+
+	// Create debugger console. It requires GFX to be initialized
+	_console = new Console(this);
+	_doubleFPS = ConfMan.getBool("doublefps");
+
+	// Initialize FPS timer callback
+	getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this, "zvisionFPS");
+}
+
+Common::Error ZVision::run() {
+	initialize();
+
+	// Check if a saved game is to be loaded from the launcher
+	if (ConfMan.hasKey("save_slot"))
+		_saveManager->loadGame(ConfMan.getInt("save_slot"));
+
+	// Before starting, make absolutely sure that the user has copied the needed fonts
 	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf") && !_searchManager->hasFile("arial.ttf")  && !_searchManager->hasFile("FreeSans.ttf") ) {
-		GUI::MessageDialog dialog(
-				"Before playing this game, you'll need to copy the required "
-				"fonts into ScummVM's extras directory, or into the game directory. "
-				"On Windows, you'll need the following font files from the Windows "
-				"font directory: Times New Roman, Century Schoolbook, Garamond, "
-				"Courier New and Arial. Alternatively, you can download the GNU "
-				"FreeFont package. You'll need all the fonts from that package, "
-				"i.e., FreeMono, FreeSans and FreeSerif."
-		);
-		dialog.runModal();
-		quitGame();
-		return Common::kUnknownError;
-	}
-
-	// Main loop
-	while (!shouldQuit()) {
-		_clock.update();
-		uint32 currentTime = _clock.getLastMeasuredTime();
-		uint32 deltaTime = _clock.getDeltaTime();
-
-		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
-
-		processEvents();
-		_renderManager->updateRotation();
-
-		_scriptManager->update(deltaTime);
-		_menu->process(deltaTime);
-
-		// Render the backBuffer to the screen
-		_renderManager->prepareBackground();
-		_renderManager->renderMenuToScreen();
-		_renderManager->processSubs(deltaTime);
-		_renderManager->renderSceneToScreen();
-
-		// Update the screen
-		if (canRender()) {
-			_system->updateScreen();
-			_renderedFrameCount++;
-		} else {
-			_frameRenderDelay--;
-		}
-
-		// Calculate the frame delay based off a desired frame time
-		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
-		// Ensure non-negative
-		delay = delay < 0 ? 0 : delay;
-
-		if (_doubleFPS) {
-			delay >>= 1;
-		}
-
-		if (canSaveGameStateCurrently() && shouldPerformAutoSave(_saveManager->getLastSaveTime())) {
-			_saveManager->autoSave();
-		}
-
-		_system->delayMillis(delay);
-	}
-
-	return Common::kNoError;
-}
-
-void ZVision::pauseEngineIntern(bool pause) {
-	_mixer->pauseAll(pause);
-
-	if (pause) {
-		_clock.stop();
-	} else {
-		_clock.start();
-	}
-}
-
-Common::String ZVision::generateSaveFileName(uint slot) {
-	return Common::String::format("%s.%03u", _targetName.c_str(), slot);
-}
-
-void ZVision::setRenderDelay(uint delay) {
-	_frameRenderDelay = delay;
-}
-
-bool ZVision::canRender() {
-	return _frameRenderDelay <= 0;
-}
-
-GUI::Debugger *ZVision::getDebugger() {
-	return _console;
-}
-
-void ZVision::syncSoundSettings() {
-	Engine::syncSoundSettings();
-
-	_scriptManager->setStateValue(StateKey_Subtitles, ConfMan.getBool("subtitles") ? 1 : 0);
-}
-
-void ZVision::fpsTimerCallback(void *refCon) {
-	((ZVision *)refCon)->fpsTimer();
-}
-
-void ZVision::fpsTimer() {
-	_fps = _renderedFrameCount;
-	_renderedFrameCount = 0;
-}
-
-} // End of namespace ZVision
+		GUI::MessageDialog dialog(
+				"Before playing this game, you'll need to copy the required "
+				"fonts into ScummVM's extras directory, or into the game directory. "
+				"On Windows, you'll need the following font files from the Windows "
+				"font directory: Times New Roman, Century Schoolbook, Garamond, "
+				"Courier New and Arial. Alternatively, you can download the GNU "
+				"FreeFont package. You'll need all the fonts from that package, "
+				"i.e., FreeMono, FreeSans and FreeSerif."
+		);
+		dialog.runModal();
+		quitGame();
+		return Common::kUnknownError;
+	}
+
+	// Main loop
+	while (!shouldQuit()) {
+		_clock.update();
+		uint32 currentTime = _clock.getLastMeasuredTime();
+		uint32 deltaTime = _clock.getDeltaTime();
+
+		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
+
+		processEvents();
+		_renderManager->updateRotation();
+
+		_scriptManager->update(deltaTime);
+		_menu->process(deltaTime);
+
+		// Render the backBuffer to the screen
+		_renderManager->prepareBackground();
+		_renderManager->renderMenuToScreen();
+		_renderManager->processSubs(deltaTime);
+		_renderManager->renderSceneToScreen();
+
+		// Update the screen
+		if (canRender()) {
+			_system->updateScreen();
+			_renderedFrameCount++;
+		} else {
+			_frameRenderDelay--;
+		}
+
+		// Calculate the frame delay based off a desired frame time
+		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
+		// Ensure non-negative
+		delay = delay < 0 ? 0 : delay;
+
+		if (_doubleFPS) {
+			delay >>= 1;
+		}
+
+		if (canSaveGameStateCurrently() && shouldPerformAutoSave(_saveManager->getLastSaveTime())) {
+			_saveManager->autoSave();
+		}
+
+		_system->delayMillis(delay);
+	}
+
+	return Common::kNoError;
+}
+
+void ZVision::pauseEngineIntern(bool pause) {
+	_mixer->pauseAll(pause);
+
+	if (pause) {
+		_clock.stop();
+	} else {
+		_clock.start();
+	}
+}
+
+Common::String ZVision::generateSaveFileName(uint slot) {
+	return Common::String::format("%s.%03u", _targetName.c_str(), slot);
+}
+
+void ZVision::setRenderDelay(uint delay) {
+	_frameRenderDelay = delay;
+}
+
+bool ZVision::canRender() {
+	return _frameRenderDelay <= 0;
+}
+
+GUI::Debugger *ZVision::getDebugger() {
+	return _console;
+}
+
+void ZVision::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
+	_scriptManager->setStateValue(StateKey_Subtitles, ConfMan.getBool("subtitles") ? 1 : 0);
+}
+
+void ZVision::fpsTimerCallback(void *refCon) {
+	((ZVision *)refCon)->fpsTimer();
+}
+
+void ZVision::fpsTimer() {
+	_fps = _renderedFrameCount;
+	_renderedFrameCount = 0;
+}
+
+} // End of namespace ZVision
-- 
cgit v1.2.3


From df605069552d680e203b7e16f3bcd0fb31825c2c Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 01:51:22 -0600
Subject: ZVISION: Restore LF line ending that was accidentally changed in
 1f5736a9020796e6986a15ea4d3b627b81233241

---
 engines/zvision/zvision.cpp | 722 ++++++++++++++++++++++----------------------
 1 file changed, 361 insertions(+), 361 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index a70f9d8e39..54991aced3 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -1,361 +1,361 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#include "zvision/zvision.h"
-#include "zvision/core/console.h"
-#include "zvision/scripting/script_manager.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/graphics/cursors/cursor_manager.h"
-#include "zvision/file/save_manager.h"
-#include "zvision/text/string_manager.h"
-#include "zvision/detection.h"
-#include "zvision/scripting/menu.h"
-#include "zvision/file/search_manager.h"
-#include "zvision/text/text.h"
-#include "zvision/text/truetype_font.h"
-#include "zvision/sound/midi.h"
-#include "zvision/file/zfs_archive.h"
-
-#include "common/config-manager.h"
-#include "common/str.h"
-#include "common/debug.h"
-#include "common/debug-channels.h"
-#include "common/textconsole.h"
-#include "common/error.h"
-#include "common/system.h"
-#include "common/file.h"
-
-#include "gui/message.h"
-#include "engines/util.h"
-#include "audio/mixer.h"
-
-namespace ZVision {
-
-#define ZVISION_SETTINGS_KEYS_COUNT 11
-
-struct zvisionIniSettings {
-	const char *name;
-	int16 slot;
-	int16 defaultValue;	// -1: use the bool value
-	bool defaultBoolValue;
-	bool allowEditing;
-} settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
-	// Hardcoded settings
-	{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, subtitles are shown for codes 0 - 4, unused
-	{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
-	{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, checked by universe.scr
-	{"highquality", StateKey_HighQuality, -1, true, false},	// high panorama quality, unused
-	{"qsoundenabled", StateKey_Qsound, -1, true, false},	// 1 = enable QSound - TODO: not supported yet
-	{"debugcheats", StateKey_DebugCheats, -1, true, false},	// always start with the GOxxxx cheat enabled
-	// Editable settings
-	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
-	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},	// checked by universe.scr
-	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
-	{"venusenabled", StateKey_VenusEnable, -1, true, true},
-	{"subtitles", StateKey_Subtitles, -1, true, true}
-};
-
-ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
-	: Engine(syst),
-	  _gameDescription(gameDesc),
-	  _resourcePixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), /* RGB 555 */
-	  _screenPixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /* RGB 565 */
-	  _desiredFrameTime(33), /* ~30 fps */
-	  _clock(_system),
-	  _scriptManager(nullptr),
-	  _renderManager(nullptr),
-	  _saveManager(nullptr),
-	  _stringManager(nullptr),
-	  _cursorManager(nullptr),
-	  _midiManager(nullptr),
-	  _rnd(nullptr),
-	  _console(nullptr),
-	  _menu(nullptr),
-	  _searchManager(nullptr),
-	  _textRenderer(nullptr),
-	  _doubleFPS(false),
-	  _audioId(0),
-	  _frameRenderDelay(2),
-	  _keyboardVelocity(0),
-	  _mouseVelocity(0),
-	  _videoIsPlaying(false),
-	  _renderedFrameCount(0),
-	  _fps(0) {
-
-	debug(1, "ZVision::ZVision");
-
-	uint16 workingWindowWidth  = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
-	uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
-	_workingWindow = Common::Rect(
-						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
-						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
-						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
-						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
-					 );
-
-	memset(_cheatBuffer, 0, sizeof(_cheatBuffer));
-}
-
-ZVision::~ZVision() {
-	debug(1, "ZVision::~ZVision");
-
-	// Dispose of resources
-	delete _console;
-	delete _cursorManager;
-	delete _stringManager;
-	delete _saveManager;
-	delete _scriptManager;
-	delete _renderManager;	// should be deleted after the script manager
-	delete _rnd;
-	delete _midiManager;
-
-	getTimerManager()->removeTimerProc(&fpsTimerCallback);
-
-	// Remove all of our debug levels
-	DebugMan.clearAllDebugChannels();
-}
-
-void ZVision::registerDefaultSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
-		if (settingsKeys[i].allowEditing) {
-			if (settingsKeys[i].defaultValue >= 0)
-				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultValue);
-			else
-				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultBoolValue);
-		}
-	}
-
-	ConfMan.registerDefault("originalsaveload", false);
-	ConfMan.registerDefault("doublefps", false);
-}
-
-void ZVision::loadSettings() {
-	int16 value = 0;
-	bool boolValue = false;
-
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
-		if (settingsKeys[i].defaultValue >= 0) {
-			value = (settingsKeys[i].allowEditing) ? ConfMan.getInt(settingsKeys[i].name) : settingsKeys[i].defaultValue;
-		} else {
-			boolValue = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
-			value = (boolValue) ? 1 : 0;
-		}
-
-		_scriptManager->setStateValue(settingsKeys[i].slot, value);
-	}
-
-	if (getGameId() == GID_NEMESIS)
-		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 1);
-	else
-		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 0);
-}
-
-void ZVision::saveSettings() {
-	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
-		if (settingsKeys[i].allowEditing) {
-			if (settingsKeys[i].defaultValue >= 0)
-				ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
-			else
-				ConfMan.setBool(settingsKeys[i].name, (_scriptManager->getStateValue(settingsKeys[i].slot) == 1));
-		}
-	}
-
-	ConfMan.flushToDisk();
-}
-
-void ZVision::initialize() {
-	const Common::FSNode gameDataDir(ConfMan.get("path"));
-
-	_searchManager = new SearchManager(ConfMan.get("path"), 6);
-
-	_searchManager->addDir("FONTS");
-	_searchManager->addDir("addon");
-
-	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
-		_searchManager->loadZix("INQUIS.ZIX");
-		_searchManager->addPatch("C000H01Q.RAW", "C000H01Q.SRC");
-		_searchManager->addPatch("CM00H01Q.RAW", "CM00H01Q.SRC");
-		_searchManager->addPatch("DM00H01Q.RAW", "DM00H01Q.SRC");
-		_searchManager->addPatch("E000H01Q.RAW", "E000H01Q.SRC");
-		_searchManager->addPatch("EM00H50Q.RAW", "EM00H50Q.SRC");
-		_searchManager->addPatch("GJNPH65P.RAW", "GJNPH65P.SRC");
-		_searchManager->addPatch("GJNPH72P.RAW", "GJNPH72P.SRC");
-		_searchManager->addPatch("H000H01Q.RAW", "H000H01Q.SRC");
-		_searchManager->addPatch("M000H01Q.RAW", "M000H01Q.SRC");
-		_searchManager->addPatch("P000H01Q.RAW", "P000H01Q.SRC");
-		_searchManager->addPatch("Q000H01Q.RAW", "Q000H01Q.SRC");
-		_searchManager->addPatch("SW00H01Q.RAW", "SW00H01Q.SRC");
-		_searchManager->addPatch("T000H01Q.RAW", "T000H01Q.SRC");
-		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
-	} else if (_gameDescription->gameId == GID_NEMESIS)
-		_searchManager->loadZix("NEMESIS.ZIX");
-
-	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
-
-	// Register random source
-	_rnd = new Common::RandomSource("zvision");
-
-	// Create managers
-	_scriptManager = new ScriptManager(this);
-	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat, _doubleFPS);
-	_saveManager = new SaveManager(this);
-	_stringManager = new StringManager(this);
-	_cursorManager = new CursorManager(this, _resourcePixelFormat);
-	_textRenderer = new TextRenderer(this);
-	_midiManager = new MidiManager();
-
-	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
-		_menu = new MenuZGI(this);
-	else
-		_menu = new MenuNemesis(this);
-
-	// Initialize the managers
-	_cursorManager->initialize();
-	_scriptManager->initialize();
-	_stringManager->initialize(_gameDescription->gameId);
-
-	registerDefaultSettings();
-
-	loadSettings();
-
-	// Create debugger console. It requires GFX to be initialized
-	_console = new Console(this);
-	_doubleFPS = ConfMan.getBool("doublefps");
-
-	// Initialize FPS timer callback
-	getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this, "zvisionFPS");
-}
-
-Common::Error ZVision::run() {
-	initialize();
-
-	// Check if a saved game is to be loaded from the launcher
-	if (ConfMan.hasKey("save_slot"))
-		_saveManager->loadGame(ConfMan.getInt("save_slot"));
-
-	// Before starting, make absolutely sure that the user has copied the needed fonts
-	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf") && !_searchManager->hasFile("arial.ttf")  && !_searchManager->hasFile("FreeSans.ttf") ) {
-		GUI::MessageDialog dialog(
-				"Before playing this game, you'll need to copy the required "
-				"fonts into ScummVM's extras directory, or into the game directory. "
-				"On Windows, you'll need the following font files from the Windows "
-				"font directory: Times New Roman, Century Schoolbook, Garamond, "
-				"Courier New and Arial. Alternatively, you can download the GNU "
-				"FreeFont package. You'll need all the fonts from that package, "
-				"i.e., FreeMono, FreeSans and FreeSerif."
-		);
-		dialog.runModal();
-		quitGame();
-		return Common::kUnknownError;
-	}
-
-	// Main loop
-	while (!shouldQuit()) {
-		_clock.update();
-		uint32 currentTime = _clock.getLastMeasuredTime();
-		uint32 deltaTime = _clock.getDeltaTime();
-
-		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
-
-		processEvents();
-		_renderManager->updateRotation();
-
-		_scriptManager->update(deltaTime);
-		_menu->process(deltaTime);
-
-		// Render the backBuffer to the screen
-		_renderManager->prepareBackground();
-		_renderManager->renderMenuToScreen();
-		_renderManager->processSubs(deltaTime);
-		_renderManager->renderSceneToScreen();
-
-		// Update the screen
-		if (canRender()) {
-			_system->updateScreen();
-			_renderedFrameCount++;
-		} else {
-			_frameRenderDelay--;
-		}
-
-		// Calculate the frame delay based off a desired frame time
-		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
-		// Ensure non-negative
-		delay = delay < 0 ? 0 : delay;
-
-		if (_doubleFPS) {
-			delay >>= 1;
-		}
-
-		if (canSaveGameStateCurrently() && shouldPerformAutoSave(_saveManager->getLastSaveTime())) {
-			_saveManager->autoSave();
-		}
-
-		_system->delayMillis(delay);
-	}
-
-	return Common::kNoError;
-}
-
-void ZVision::pauseEngineIntern(bool pause) {
-	_mixer->pauseAll(pause);
-
-	if (pause) {
-		_clock.stop();
-	} else {
-		_clock.start();
-	}
-}
-
-Common::String ZVision::generateSaveFileName(uint slot) {
-	return Common::String::format("%s.%03u", _targetName.c_str(), slot);
-}
-
-void ZVision::setRenderDelay(uint delay) {
-	_frameRenderDelay = delay;
-}
-
-bool ZVision::canRender() {
-	return _frameRenderDelay <= 0;
-}
-
-GUI::Debugger *ZVision::getDebugger() {
-	return _console;
-}
-
-void ZVision::syncSoundSettings() {
-	Engine::syncSoundSettings();
-
-	_scriptManager->setStateValue(StateKey_Subtitles, ConfMan.getBool("subtitles") ? 1 : 0);
-}
-
-void ZVision::fpsTimerCallback(void *refCon) {
-	((ZVision *)refCon)->fpsTimer();
-}
-
-void ZVision::fpsTimer() {
-	_fps = _renderedFrameCount;
-	_renderedFrameCount = 0;
-}
-
-} // End of namespace ZVision
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+#include "zvision/zvision.h"
+#include "zvision/core/console.h"
+#include "zvision/scripting/script_manager.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/graphics/cursors/cursor_manager.h"
+#include "zvision/file/save_manager.h"
+#include "zvision/text/string_manager.h"
+#include "zvision/detection.h"
+#include "zvision/scripting/menu.h"
+#include "zvision/file/search_manager.h"
+#include "zvision/text/text.h"
+#include "zvision/text/truetype_font.h"
+#include "zvision/sound/midi.h"
+#include "zvision/file/zfs_archive.h"
+
+#include "common/config-manager.h"
+#include "common/str.h"
+#include "common/debug.h"
+#include "common/debug-channels.h"
+#include "common/textconsole.h"
+#include "common/error.h"
+#include "common/system.h"
+#include "common/file.h"
+
+#include "gui/message.h"
+#include "engines/util.h"
+#include "audio/mixer.h"
+
+namespace ZVision {
+
+#define ZVISION_SETTINGS_KEYS_COUNT 11
+
+struct zvisionIniSettings {
+	const char *name;
+	int16 slot;
+	int16 defaultValue;	// -1: use the bool value
+	bool defaultBoolValue;
+	bool allowEditing;
+} settingsKeys[ZVISION_SETTINGS_KEYS_COUNT] = {
+	// Hardcoded settings
+	{"countrycode", StateKey_CountryCode, 0, false, false},	// always 0 = US, subtitles are shown for codes 0 - 4, unused
+	{"lineskipvideo", StateKey_VideoLineSkip, 0, false, false},	// video line skip, 0 = default, 1 = always, 2 = pixel double when possible, unused
+	{"installlevel", StateKey_InstallLevel, 0, false, false},	// 0 = full, checked by universe.scr
+	{"highquality", StateKey_HighQuality, -1, true, false},	// high panorama quality, unused
+	{"qsoundenabled", StateKey_Qsound, -1, true, false},	// 1 = enable QSound - TODO: not supported yet
+	{"debugcheats", StateKey_DebugCheats, -1, true, false},	// always start with the GOxxxx cheat enabled
+	// Editable settings
+	{"keyboardturnspeed", StateKey_KbdRotateSpeed, 5, false, true},
+	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},	// checked by universe.scr
+	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
+	{"venusenabled", StateKey_VenusEnable, -1, true, true},
+	{"subtitles", StateKey_Subtitles, -1, true, true}
+};
+
+ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
+	: Engine(syst),
+	  _gameDescription(gameDesc),
+	  _resourcePixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), /* RGB 555 */
+	  _screenPixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0), /* RGB 565 */
+	  _desiredFrameTime(33), /* ~30 fps */
+	  _clock(_system),
+	  _scriptManager(nullptr),
+	  _renderManager(nullptr),
+	  _saveManager(nullptr),
+	  _stringManager(nullptr),
+	  _cursorManager(nullptr),
+	  _midiManager(nullptr),
+	  _rnd(nullptr),
+	  _console(nullptr),
+	  _menu(nullptr),
+	  _searchManager(nullptr),
+	  _textRenderer(nullptr),
+	  _doubleFPS(false),
+	  _audioId(0),
+	  _frameRenderDelay(2),
+	  _keyboardVelocity(0),
+	  _mouseVelocity(0),
+	  _videoIsPlaying(false),
+	  _renderedFrameCount(0),
+	  _fps(0) {
+
+	debug(1, "ZVision::ZVision");
+
+	uint16 workingWindowWidth  = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
+	uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
+	_workingWindow = Common::Rect(
+						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
+						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
+						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
+						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
+					 );
+
+	memset(_cheatBuffer, 0, sizeof(_cheatBuffer));
+}
+
+ZVision::~ZVision() {
+	debug(1, "ZVision::~ZVision");
+
+	// Dispose of resources
+	delete _console;
+	delete _cursorManager;
+	delete _stringManager;
+	delete _saveManager;
+	delete _scriptManager;
+	delete _renderManager;	// should be deleted after the script manager
+	delete _rnd;
+	delete _midiManager;
+
+	getTimerManager()->removeTimerProc(&fpsTimerCallback);
+
+	// Remove all of our debug levels
+	DebugMan.clearAllDebugChannels();
+}
+
+void ZVision::registerDefaultSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].allowEditing) {
+			if (settingsKeys[i].defaultValue >= 0)
+				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultValue);
+			else
+				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultBoolValue);
+		}
+	}
+
+	ConfMan.registerDefault("originalsaveload", false);
+	ConfMan.registerDefault("doublefps", false);
+}
+
+void ZVision::loadSettings() {
+	int16 value = 0;
+	bool boolValue = false;
+
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].defaultValue >= 0) {
+			value = (settingsKeys[i].allowEditing) ? ConfMan.getInt(settingsKeys[i].name) : settingsKeys[i].defaultValue;
+		} else {
+			boolValue = (settingsKeys[i].allowEditing) ? ConfMan.getBool(settingsKeys[i].name) : settingsKeys[i].defaultBoolValue;
+			value = (boolValue) ? 1 : 0;
+		}
+
+		_scriptManager->setStateValue(settingsKeys[i].slot, value);
+	}
+
+	if (getGameId() == GID_NEMESIS)
+		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 1);
+	else
+		_scriptManager->setStateValue(StateKey_ExecScopeStyle, 0);
+}
+
+void ZVision::saveSettings() {
+	for (int i = 0; i < ZVISION_SETTINGS_KEYS_COUNT; i++) {
+		if (settingsKeys[i].allowEditing) {
+			if (settingsKeys[i].defaultValue >= 0)
+				ConfMan.setInt(settingsKeys[i].name, _scriptManager->getStateValue(settingsKeys[i].slot));
+			else
+				ConfMan.setBool(settingsKeys[i].name, (_scriptManager->getStateValue(settingsKeys[i].slot) == 1));
+		}
+	}
+
+	ConfMan.flushToDisk();
+}
+
+void ZVision::initialize() {
+	const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+	_searchManager = new SearchManager(ConfMan.get("path"), 6);
+
+	_searchManager->addDir("FONTS");
+	_searchManager->addDir("addon");
+
+	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
+		_searchManager->loadZix("INQUIS.ZIX");
+		_searchManager->addPatch("C000H01Q.RAW", "C000H01Q.SRC");
+		_searchManager->addPatch("CM00H01Q.RAW", "CM00H01Q.SRC");
+		_searchManager->addPatch("DM00H01Q.RAW", "DM00H01Q.SRC");
+		_searchManager->addPatch("E000H01Q.RAW", "E000H01Q.SRC");
+		_searchManager->addPatch("EM00H50Q.RAW", "EM00H50Q.SRC");
+		_searchManager->addPatch("GJNPH65P.RAW", "GJNPH65P.SRC");
+		_searchManager->addPatch("GJNPH72P.RAW", "GJNPH72P.SRC");
+		_searchManager->addPatch("H000H01Q.RAW", "H000H01Q.SRC");
+		_searchManager->addPatch("M000H01Q.RAW", "M000H01Q.SRC");
+		_searchManager->addPatch("P000H01Q.RAW", "P000H01Q.SRC");
+		_searchManager->addPatch("Q000H01Q.RAW", "Q000H01Q.SRC");
+		_searchManager->addPatch("SW00H01Q.RAW", "SW00H01Q.SRC");
+		_searchManager->addPatch("T000H01Q.RAW", "T000H01Q.SRC");
+		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
+	} else if (_gameDescription->gameId == GID_NEMESIS)
+		_searchManager->loadZix("NEMESIS.ZIX");
+
+	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
+
+	// Register random source
+	_rnd = new Common::RandomSource("zvision");
+
+	// Create managers
+	_scriptManager = new ScriptManager(this);
+	_renderManager = new RenderManager(this, WINDOW_WIDTH, WINDOW_HEIGHT, _workingWindow, _resourcePixelFormat, _doubleFPS);
+	_saveManager = new SaveManager(this);
+	_stringManager = new StringManager(this);
+	_cursorManager = new CursorManager(this, _resourcePixelFormat);
+	_textRenderer = new TextRenderer(this);
+	_midiManager = new MidiManager();
+
+	if (_gameDescription->gameId == GID_GRANDINQUISITOR)
+		_menu = new MenuZGI(this);
+	else
+		_menu = new MenuNemesis(this);
+
+	// Initialize the managers
+	_cursorManager->initialize();
+	_scriptManager->initialize();
+	_stringManager->initialize(_gameDescription->gameId);
+
+	registerDefaultSettings();
+
+	loadSettings();
+
+	// Create debugger console. It requires GFX to be initialized
+	_console = new Console(this);
+	_doubleFPS = ConfMan.getBool("doublefps");
+
+	// Initialize FPS timer callback
+	getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this, "zvisionFPS");
+}
+
+Common::Error ZVision::run() {
+	initialize();
+
+	// Check if a saved game is to be loaded from the launcher
+	if (ConfMan.hasKey("save_slot"))
+		_saveManager->loadGame(ConfMan.getInt("save_slot"));
+
+	// Before starting, make absolutely sure that the user has copied the needed fonts
+	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf") && !_searchManager->hasFile("arial.ttf")  && !_searchManager->hasFile("FreeSans.ttf") ) {
+		GUI::MessageDialog dialog(
+				"Before playing this game, you'll need to copy the required "
+				"fonts into ScummVM's extras directory, or into the game directory. "
+				"On Windows, you'll need the following font files from the Windows "
+				"font directory: Times New Roman, Century Schoolbook, Garamond, "
+				"Courier New and Arial. Alternatively, you can download the GNU "
+				"FreeFont package. You'll need all the fonts from that package, "
+				"i.e., FreeMono, FreeSans and FreeSerif."
+		);
+		dialog.runModal();
+		quitGame();
+		return Common::kUnknownError;
+	}
+
+	// Main loop
+	while (!shouldQuit()) {
+		_clock.update();
+		uint32 currentTime = _clock.getLastMeasuredTime();
+		uint32 deltaTime = _clock.getDeltaTime();
+
+		_cursorManager->setItemID(_scriptManager->getStateValue(StateKey_InventoryItem));
+
+		processEvents();
+		_renderManager->updateRotation();
+
+		_scriptManager->update(deltaTime);
+		_menu->process(deltaTime);
+
+		// Render the backBuffer to the screen
+		_renderManager->prepareBackground();
+		_renderManager->renderMenuToScreen();
+		_renderManager->processSubs(deltaTime);
+		_renderManager->renderSceneToScreen();
+
+		// Update the screen
+		if (canRender()) {
+			_system->updateScreen();
+			_renderedFrameCount++;
+		} else {
+			_frameRenderDelay--;
+		}
+
+		// Calculate the frame delay based off a desired frame time
+		int delay = _desiredFrameTime - int32(_system->getMillis() - currentTime);
+		// Ensure non-negative
+		delay = delay < 0 ? 0 : delay;
+
+		if (_doubleFPS) {
+			delay >>= 1;
+		}
+
+		if (canSaveGameStateCurrently() && shouldPerformAutoSave(_saveManager->getLastSaveTime())) {
+			_saveManager->autoSave();
+		}
+
+		_system->delayMillis(delay);
+	}
+
+	return Common::kNoError;
+}
+
+void ZVision::pauseEngineIntern(bool pause) {
+	_mixer->pauseAll(pause);
+
+	if (pause) {
+		_clock.stop();
+	} else {
+		_clock.start();
+	}
+}
+
+Common::String ZVision::generateSaveFileName(uint slot) {
+	return Common::String::format("%s.%03u", _targetName.c_str(), slot);
+}
+
+void ZVision::setRenderDelay(uint delay) {
+	_frameRenderDelay = delay;
+}
+
+bool ZVision::canRender() {
+	return _frameRenderDelay <= 0;
+}
+
+GUI::Debugger *ZVision::getDebugger() {
+	return _console;
+}
+
+void ZVision::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
+	_scriptManager->setStateValue(StateKey_Subtitles, ConfMan.getBool("subtitles") ? 1 : 0);
+}
+
+void ZVision::fpsTimerCallback(void *refCon) {
+	((ZVision *)refCon)->fpsTimer();
+}
+
+void ZVision::fpsTimer() {
+	_fps = _renderedFrameCount;
+	_renderedFrameCount = 0;
+}
+
+} // End of namespace ZVision
-- 
cgit v1.2.3


From cc916625d9025ffaa898854c4de19da5dc2e2925 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 30 Dec 2014 10:47:51 +0100
Subject: SCUMM: Add a "chained games manager"

This replaces the somewhat ugly use of the config manager to store
the chained games.
---
 base/main.cpp           | 38 ++++++++------------------------------
 engines/engine.cpp      | 31 +++++++++++++++++++++++++++++++
 engines/engine.h        | 28 ++++++++++++++++++++++++++++
 engines/scumm/scumm.cpp |  3 ++-
 4 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/base/main.cpp b/base/main.cpp
index b9bd97dbef..0f5ebc7845 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -529,43 +529,21 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			// at. At the time of writing, this is used for the Maniac Mansion
 			// easter egg in Day of the Tentacle.
 
-			Common::String chainedGames, nextGame, saveSlot;
+			Common::String chainedGame;
+			int saveSlot = -1;
 
-			if (ConfMan.hasKey("chained_games", Common::ConfigManager::kTransientDomain)) {
-				chainedGames = ConfMan.get("chained_games", Common::ConfigManager::kTransientDomain);
-			}
+			ChainedGamesMan.pop(chainedGame, saveSlot);
 
 			// Discard any command line options. It's unlikely that the user
 			// wanted to apply them to *all* games ever launched.
 			ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
 
-			if (!chainedGames.empty()) {
-				if (chainedGames.contains(',')) {
-					for (uint i = 0; i < chainedGames.size(); i++) {
-						if (chainedGames[i] == ',') {
-							chainedGames.erase(0, i + 1);
-							break;
-						}
-						nextGame += chainedGames[i];
-					}
-					ConfMan.set("chained_games", chainedGames, Common::ConfigManager::kTransientDomain);
-				} else {
-					nextGame = chainedGames;
-					chainedGames.clear();
-					ConfMan.removeKey("chained_games", Common::ConfigManager::kTransientDomain);
-				}
-				if (nextGame.contains(':')) {
-					for (int i = nextGame.size() - 1; i >= 0; i--) {
-						if (nextGame[i] == ':') {
-							nextGame.erase(i);
-							break;
-						}
-						saveSlot = nextGame[i] + saveSlot;
-					}
-					ConfMan.setInt("save_slot", atoi(saveSlot.c_str()), Common::ConfigManager::kTransientDomain);
+			if (!chainedGame.empty()) {
+				if (saveSlot != -1) {
+					ConfMan.setInt("save_slot", saveSlot, Common::ConfigManager::kTransientDomain);
 				}
-				// Start the next game
-				ConfMan.setActiveDomain(nextGame);
+				// Start the chained game
+				ConfMan.setActiveDomain(chainedGame);
 			} else {
 				// Clear the active config domain
 				ConfMan.setActiveDomain("");
diff --git a/engines/engine.cpp b/engines/engine.cpp
index c63437f800..24008dd073 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -45,6 +45,7 @@
 #include "common/taskbar.h"
 #include "common/textconsole.h"
 #include "common/translation.h"
+#include "common/singleton.h"
 
 #include "backends/keymapper/keymapper.h"
 
@@ -101,6 +102,36 @@ static void defaultErrorHandler(const char *msg) {
 	}
 }
 
+// Chained games manager
+
+ChainedGamesManager::ChainedGamesManager() {
+	clear();
+}
+
+void ChainedGamesManager::clear() {
+	_chainedGames.clear();
+}
+
+void ChainedGamesManager::push(const Common::String target, const int slot) {
+	Game game;
+	game.target = target;
+	game.slot = slot;
+	_chainedGames.push(game);
+}
+
+bool ChainedGamesManager::pop(Common::String &target, int &slot) {
+	if (_chainedGames.empty()) {
+		return false;
+	}
+	Game game = _chainedGames.pop();
+	target = game.target;
+	slot = game.slot;
+	return true;
+}
+
+namespace Common {
+DECLARE_SINGLETON(ChainedGamesManager);
+}
 
 Engine::Engine(OSystem *syst)
 	: _system(syst),
diff --git a/engines/engine.h b/engines/engine.h
index e325cc1ba2..d3415d584c 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -27,6 +27,8 @@
 #include "common/str.h"
 #include "common/language.h"
 #include "common/platform.h"
+#include "common/queue.h"
+#include "common/singleton.h"
 
 class OSystem;
 
@@ -334,6 +336,32 @@ protected:
 
 };
 
+// Chained games
+
+/**
+ * Singleton class which manages chained games. A chained game is one that
+ * starts automatically, optionally loading a saved game, instead of returning
+ * to the launcher.
+ */
+class ChainedGamesManager : public Common::Singleton<ChainedGamesManager> {
+private:
+	struct Game {
+		Common::String target;
+		int slot;
+	};
+
+	Common::Queue<Game> _chainedGames;
+
+public:
+	ChainedGamesManager();
+	void clear();
+	void push(const Common::String target, const int slot = -1);
+	bool pop(Common::String &target, int &slot);
+};
+
+/** Convenience shortcut for accessing the chained games manager. */
+#define ChainedGamesMan ChainedGamesManager::instance()
+
 // FIXME: HACK for MidiEmu & error()
 extern Engine *g_engine;
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 34ae957951..9518ed4e5c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2625,7 +2625,8 @@ bool ScummEngine::startManiac() {
 
 		// Set up the chanined games to Maniac Mansion, and then back
 		// to the current game again with that save slot.
-		ConfMan.set("chained_games", maniacTarget + "," + ConfMan.getActiveDomainName() + ":100", Common::ConfigManager::kTransientDomain);
+		ChainedGamesMan.push(maniacTarget);
+		ChainedGamesMan.push(ConfMan.getActiveDomainName(), 100);
 
 		// Force a return to the launcher. This will start the first
 		// chained game.
-- 
cgit v1.2.3


From 7dc316cced4c7a45a376d76a6ca0c84bd563132f Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 30 Dec 2014 10:54:49 +0100
Subject: SCUMM: Add secret "easter_egg" config key

This makes it possible to override the detection of Maniac Mansion
when starting the Day of the Tentacle easter egg. There is no GUI
for setting this, no error handling, and setting it to Day of the
Tentacle itself is probably a bad idea...
---
 engines/scumm/scumm.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9518ed4e5c..7d927b0cda 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2601,20 +2601,24 @@ bool ScummEngine::startManiac() {
 	Common::String currentPath = ConfMan.get("path");
 	Common::String maniacTarget;
 
-	// Look for a game with a game path pointing to a 'Maniac' directory
-	// as a subdirectory to the current game.
-	Common::ConfigManager::DomainMap::iterator iter = ConfMan.beginGameDomains();
-	for (; iter != ConfMan.endGameDomains(); ++iter) {
-		Common::ConfigManager::Domain &dom = iter->_value;
-		Common::String path = dom.getVal("path");
-
-		if (path.hasPrefix(currentPath)) {
-			path.erase(0, currentPath.size() + 1);
-			if (path.equalsIgnoreCase("maniac")) {
-				maniacTarget = dom.getVal("gameid");
-				break;
+	if (!ConfMan.hasKey("easter_egg")) {
+		// Look for a game with a game path pointing to a 'Maniac' directory
+		// as a subdirectory to the current game.
+		Common::ConfigManager::DomainMap::iterator iter = ConfMan.beginGameDomains();
+		for (; iter != ConfMan.endGameDomains(); ++iter) {
+			Common::ConfigManager::Domain &dom = iter->_value;
+			Common::String path = dom.getVal("path");
+
+			if (path.hasPrefix(currentPath)) {
+				path.erase(0, currentPath.size() + 1);
+				if (path.equalsIgnoreCase("maniac")) {
+					maniacTarget = dom.getVal("gameid");
+					break;
+				}
 			}
 		}
+	} else {
+		maniacTarget = ConfMan.get("easter_egg");
 	}
 
 	if (!maniacTarget.empty()) {
-- 
cgit v1.2.3


From 88ba96aa3cb76c7d251a60f32d41f415a40b3dc4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 30 Dec 2014 12:55:19 +0200
Subject: ZVISION: Fix an off-by-one error in the RLF decoder

A regression from 7f61a09478. The current frame is the currently
displayed frame, not the frame that should be displayed next. Thanks to
clone2727 and Marisa-Chan for the explanation and fixes
---
 engines/zvision/video/rlf_decoder.cpp | 16 ++++++++--------
 engines/zvision/video/rlf_decoder.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 6e2000f93c..db598a25b6 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -56,7 +56,7 @@ RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _curFrame(-1),
+	  _displayedFrame(-1),
 	  _frameBufferByteSize(0) {
 
 	if (!readHeader()) {
@@ -161,11 +161,11 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 	uint frame = getFrameAtTime(time);
 	assert(frame < (int)_frameCount);
 
-	if ((uint)_curFrame == frame)
+	if ((uint)_displayedFrame == frame)
 		return true;
 
-	int closestFrame = _curFrame;
-	int distance = (int)frame - _curFrame;
+	int closestFrame = _displayedFrame;
+	int distance = (int)frame - closestFrame;
 
 	if (distance < 0) {
 		for (uint i = 0; i < _completeFrames.size(); ++i) {
@@ -189,18 +189,18 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 		applyFrameToCurrent(i);
 	}
 
-	_curFrame = frame;
+	_displayedFrame = frame - 1;
 
 	return true;
 }
 
 const Graphics::Surface *RLFDecoder::RLFVideoTrack::decodeNextFrame() {
-	if (_curFrame == (int)_frameCount)
+	if (_displayedFrame >= (int)_frameCount)
 		return NULL;
 	
-	applyFrameToCurrent(_curFrame);
+	_displayedFrame++;
+	applyFrameToCurrent(_displayedFrame);
 
-	_curFrame++;
 	return &_currentFrameBuffer;
 }
 
diff --git a/engines/zvision/video/rlf_decoder.h b/engines/zvision/video/rlf_decoder.h
index 740f3fdd43..8b8cbaecd5 100644
--- a/engines/zvision/video/rlf_decoder.h
+++ b/engines/zvision/video/rlf_decoder.h
@@ -46,7 +46,7 @@ private:
 		uint16 getWidth() const { return _width; }
 		uint16 getHeight() const { return _height; }
 		Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); /* RGB 555 */ }
-		int getCurFrame() const { return _curFrame; }
+		int getCurFrame() const { return _displayedFrame; }
 		int getFrameCount() const { return _frameCount; }
 		const Graphics::Surface *decodeNextFrame();
 		bool isSeekable() const { return true; }
@@ -121,7 +121,7 @@ private:
 		Frame *_frames;
 		Common::Array<uint> _completeFrames;
 
-		int _curFrame;
+		int _displayedFrame;
 		Graphics::Surface _currentFrameBuffer;
 		uint32 _frameBufferByteSize;
 
-- 
cgit v1.2.3


From 64979d5e453bd279c88e559d295d47b175a6559b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 30 Dec 2014 15:38:03 +0200
Subject: ZVISION: Fix regression in the handling of multiple animations

A regression from 0c4e0673c3. Thanks to Marisa-Chan for noticing
---
 engines/zvision/scripting/effects/animation_effect.cpp | 10 +++++++---
 engines/zvision/scripting/effects/animation_effect.h   |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/effects/animation_effect.cpp b/engines/zvision/scripting/effects/animation_effect.cpp
index c3cbc25406..511a0db353 100644
--- a/engines/zvision/scripting/effects/animation_effect.cpp
+++ b/engines/zvision/scripting/effects/animation_effect.cpp
@@ -88,10 +88,13 @@ bool AnimationEffect::process(uint32 deltaTimeInMillis) {
 	if (it != _playList.end()) {
 		playnode *nod = &(*it);
 
-		if (!_animation->isPlaying()) {
+		if (nod->_curFrame == -1) {
 			// The node is just beginning playback
+			nod->_curFrame = nod->start;
+
 			_animation->start();
 			_animation->seekToFrame(nod->start);
+			_animation->setEndFrame(nod->stop);
 
 			nod->_delay = deltaTimeInMillis; // Force the frame to draw
 			if (nod->slot)
@@ -111,6 +114,7 @@ bool AnimationEffect::process(uint32 deltaTimeInMillis) {
 				return _disposeAfterUse;
 			}
 
+			nod->_curFrame = nod->start;
 			_animation->seekToFrame(nod->start);
 		}
 
@@ -186,9 +190,9 @@ void AnimationEffect::addPlayNode(int32 slot, int x, int y, int x2, int y2, int
 	nod.loop = loops;
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = startFrame;
-	_animation->setEndFrame(CLIP<int>(endFrame, 0, _animation->getFrameCount() - 1));
-
+	nod.stop = CLIP<int>(endFrame, 0, _animation->getFrameCount() - 1);
 	nod.slot = slot;
+	nod._curFrame = -1;
 	nod._delay = 0;
 	nod._scaled = NULL;
 	_playList.push_back(nod);
diff --git a/engines/zvision/scripting/effects/animation_effect.h b/engines/zvision/scripting/effects/animation_effect.h
index a564b83ff3..fd6e24ab8b 100644
--- a/engines/zvision/scripting/effects/animation_effect.h
+++ b/engines/zvision/scripting/effects/animation_effect.h
@@ -48,7 +48,9 @@ public:
 		Common::Rect pos;
 		int32 slot;
 		int32 start;
+		int32 stop;
 		int32 loop;
+		int32 _curFrame;
 		int32 _delay;
 		Graphics::Surface *_scaled;
 	};
-- 
cgit v1.2.3


From d9ae84808f6314ec8c3b7b0a73e3e746bc8fc201 Mon Sep 17 00:00:00 2001
From: Fedor Strizhnev
Date: Tue, 30 Dec 2014 17:18:28 +0300
Subject: SYMBIAN: Add symbian support for access and princes engines

---
 backends/platform/symbian/AdaptAllMMPs.pl          |  2 +
 .../symbian/BuildPackageUpload_LocalSettings.pl    | 40 ++++++-----
 backends/platform/symbian/help/ScummVM.rtf         | 78 ++++++++++++----------
 .../platform/symbian/mmp/scummvm_access.mmp.in     | 52 +++++++++++++++
 .../platform/symbian/mmp/scummvm_prince.mmp.in     | 52 +++++++++++++++
 5 files changed, 169 insertions(+), 55 deletions(-)
 create mode 100644 backends/platform/symbian/mmp/scummvm_access.mmp.in
 create mode 100644 backends/platform/symbian/mmp/scummvm_prince.mmp.in

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 6eed7f0690..ead28ba4b1 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -48,12 +48,14 @@ chdir("../../../");
 	"mmp/scummvm_voyeur.mmp",
 	"mmp/scummvm_wintermute.mmp",
 	# New engines
+	"mmp/scummvm_access.mmp",
 	"mmp/scummvm_avalanche.mmp",
 	"mmp/scummvm_bbvs.mmp",
 	"mmp/scummvm_cge2.mmp",
 	"mmp/scummvm_fullpipe.mmp",
 	"mmp/scummvm_lastexpress.mmp",
 	"mmp/scummvm_mads.mmp",
+	"mmp/scummvm_prince.mmp",
 	"mmp/scummvm_sword25.mmp",
 	"mmp/scummvm_testbed.mmp",
 	"mmp/scummvm_zvision.mmp",
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index f9b376d674..8c19631524 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -3,32 +3,36 @@
 
 	@WorkingEngines = qw(
 		agos agi cine cge composer cruise draci dreamweb
-		drascula hugo gob groovie kyra lastexpress
-		lure made mohawk parallaction pegasus queen
-		saga sci scumm sky sword1 sword2 teenagent tinsel
-		toltecs tony toon touche tsage tucker wintermute
-		bbvs fullpipe hopkins mortevielle mads cge2
-		neverhood testbed avalanche zvision voyeur
+		drascula hugo gob groovie hopkins kyra lastexpress
+		lure made mohawk mortevielle neverhood parallaction
+		pegasus queen saga sci scumm sky sword1 sword2
+		teenagent tinsel toltecs tony toon touche tsage
+		tucker voyeur wintermute
+		access avalanche bbvs cge2 fullpipe mads prince
+		testbed zvision
 	);
-#### New engines
-####		sword25
+	
+####	sword25 yet not added
+
+#### In progress engines are :
+####  access avalanche bbvs cge2 fullpipe mads prince
+####  testbed zvision
 
 	@WorkingEngines_1st = qw(
-		cge2 cine composer cruise drascula groovie
-		lastexpress made parallaction queen
-		saga scumm touche tucker wintermute
-		avalanche zvision voyeur
+		cine composer cruise drascula groovie
+		lastexpress made parallaction queen saga
+		scumm touche tucker wintermute voyeur
+		access avalanche cge2 zvision
 	);
 
 	@WorkingEngines_2nd = qw(
-		agi agos bbvs cge draci gob hopkins
-		hugo kyra lure mohawk pegasus sci
-		sky sword1 sword2 teenagent mads
+		agi agos cge draci dreamweb gob hopkins
+		hugo kyra lure mohawk mortevielle neverhood  
+		pegasus sci sky sword1 sword2 teenagent
 		tinsel tsage toltecs tony toon
-		dreamweb fullpipe mortevielle
-		neverhood testbed
+		bbvs fullpipe mads prince testbed
 	);
-####		sword25
+####	sword25 yet not added
 
 	@TestingEngines = qw(
 
diff --git a/backends/platform/symbian/help/ScummVM.rtf b/backends/platform/symbian/help/ScummVM.rtf
index 8e9d37363c..15b2105ecd 100644
--- a/backends/platform/symbian/help/ScummVM.rtf
+++ b/backends/platform/symbian/help/ScummVM.rtf
@@ -51,24 +51,27 @@ Synonyms;}{\*\cs33 \additive \super \sbasedon10 endnote reference;}{\s34\ql \fi-
 {\listoverride\listid-125\listoverridecount0\ls12}{\listoverride\listid-120\listoverridecount0\ls13}{\listoverride\listid-129\listoverridecount0\ls14}{\listoverride\listid-119\listoverridecount0\ls15}{\listoverride\listid-125\listoverridecount0\ls16}
 {\listoverride\listid-120\listoverridecount0\ls17}{\listoverride\listid-129\listoverridecount0\ls18}{\listoverride\listid-119\listoverridecount0\ls19}{\listoverride\listid-125\listoverridecount0\ls20}{\listoverride\listid-120\listoverridecount0\ls21}
 {\listoverride\listid-129\listoverridecount0\ls22}{\listoverride\listid-119\listoverridecount0\ls23}{\listoverride\listid-125\listoverridecount0\ls24}{\listoverride\listid-120\listoverridecount0\ls25}{\listoverride\listid-129\listoverridecount0\ls26}
-{\listoverride\listid-119\listoverridecount0\ls27}{\listoverride\listid-125\listoverridecount0\ls28}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls29}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel
-\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls30}}{\info{\author Fedor}
-{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo9\dy9\hr19\min22}{\version99}{\edmins93}{\nofpages8}{\nofwords1514}{\nofchars8634}{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 
-\deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template 
-E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang
-{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang
-{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain 
-\s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 
-\par }{\lang1033\langfe1033\langnp1033 Date: November 2013}{\f28 
-\par }{\lang1033\langfe1033\langnp1033 Version: 1.7.0
+{\listoverride\listid-119\listoverridecount0\ls27}{\listoverride\listid-125\listoverridecount0\ls28}{\listoverride\listid-120\listoverridecount0\ls29}{\listoverride\listid-129\listoverridecount0\ls30}{\listoverride\listid-119\listoverridecount0\ls31}
+{\listoverride\listid-125\listoverridecount0\ls32}{\listoverride\listid-120\listoverridecount0\ls33}{\listoverride\listid-129\listoverridecount0\ls34}{\listoverride\listid-119\listoverridecount0\ls35}{\listoverride\listid-125\listoverridecount0\ls36}
+{\listoverride\listid-120\listoverridecount0\ls37}{\listoverride\listid-129\listoverridecount0\ls38}{\listoverride\listid-119\listoverridecount0\ls39}{\listoverride\listid-125\listoverridecount0\ls40}{\listoverride\listid-2\listoverridecount1{\lfolevel
+\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 
+}}\ls41}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr
+\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls42}}{\info{\author Fedor}{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo12\dy29\hr22\min52}{\version102}{\edmins95}{\nofpages8}{\nofwords1514}{\nofchars8634}
+{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 \deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0
+\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1
+\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5
+\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
+{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {
+\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 
+\par }{\lang1033\langfe1033\langnp1033 Date: November 2014}{\f28 
+\par }{\lang1033\langfe1033\langnp1033 Version: 1.8.0
 \par }\pard\plain \s1\ql \li0\ri0\sb360\sa240\keepn\widctlpar\nooverflow\faroman\outlinelevel0\rin0\lin0\itap0 \b\f1\fs32\lang2057\langfe1033\kerning28\cgrid\langnp2057\langfenp1033 {ScummVM Help
 \par }\pard\plain \s16\ql \li0\ri0\sb360\sa240\keepn\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \b\f1\fs32\cf9\lang2057\langfe1033\kerning28\cgrid\langnp2057\langfenp1033 {\lang1033\langfe1033\langnp1033 0x100039ce}{\lang1059\langfe1033\langnp1059 
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 
 About ScummVM Help
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }{
 This help file based on ScummVM forum thread with some elaborations(in Anotherguest section) and text correction. If you wish add some text or translate you may download and modify source document from https://sourceforge.net/projects/scummvms60git/ and t
@@ -79,8 +82,8 @@ hen send me to fedor_qd@mail.ru
 \par }{\f29 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 1st guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }{UIQ3 devices: To the top right (holding the phone portrait) you four icons, from the top they are
 \par 
@@ -126,17 +129,17 @@ through directorylist (one hand use perhaps!?) or save games etc. Keyboard mode
  of events that ScummVM receives from SDL.
 \par What are these Shrinked, Zoomed and Upscaled modes anyway?
 \par 
-\par Shrink displays the game on your screen but in a shrinked way, either in Portrait or Landscape mode, so not all the pixels c
-an be seen. Zoom mode uses the maximum resolution of your phone displaying a smaller part of the game zoomed at 1:1 pixels. For scrolling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to center view. Upscale tries to fill the larger screen
-s on S80/S90 devices in a better way for low resolution games. Currently it uses a pixel interpolation upscaling routine.
+\par Shrink displays the game on your screen but in a shrinked way, either in Port
+rait or Landscape mode, so not all the pixels can be seen. Zoom mode uses the maximum resolution of your phone displaying a smaller part of the game zoomed at 1:1 pixels. For scrolling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to cente
+r view. Upscale tries to fill the larger screens on S80/S90 devices in a better way for low resolution games. Currently it uses a pixel interpolation upscaling routine.
 \par 
 \par You can also use a bluetooth mouse with S60v3 devices to control your game. You need the bluetooth hid library from Hinkka http://koti.mbnet.fi/hinkka/Download.html to get it to work properly.
 \par }{\f29 
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 2nd guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par 
 \par }{More user-friendly guide for Nokia phones (based on N96 but should apply to most phones)
@@ -161,9 +164,8 @@ s on S80/S90 devices in a better way for low resolution games. Currently it uses
 \par }{1 - Change Input.
 \par This is the option you'll probably use the most. There are three settings; A,C and J.
 \par 
-\par A -
- This is the "Text Input" mode. It allows you to type directly into ScummVM as if you were using a keyboard. Type the same way you would when sending a text message off of your phone. Please note that the pointer is disabled when in this mode. Don't forge
-t to exit Configuration Mode before typing!
+\par A - This is the "Text Input" mode. It allows you to type directly into ScummVM as if you were using a keyboard. Type the same way you would when sending a text message o
+ff of your phone. Please note that the pointer is disabled when in this mode. Don't forget to exit Configuration Mode before typing!
 \par 
 \par C - This is the "Cursor" mode. This emulates the arrow keys of the keyboard. Some games require using this instead of the mouse (e.g. the destruction derby section towards the end of Full Throttle).
 \par 
@@ -178,8 +180,9 @@ t to exit Configuration Mode before typing!
 \par Only applies to Landscape mode, simply swaps the screen output between having the phone tilted on its left side or on its right side.
 \par 
 \par 4 - Toggle Zoom On and Off
-\par Zooms in on a portion of the screen. Handy for when you are looking through a screen for items or having trouble reading subtitles. Use the navigation buttons for panning around
- the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom level. 
+\par Zooms in on a portion of the screen. Handy for when you are looking through a screen fo
+r items or having trouble reading subtitles. Use the navigation buttons for panning around the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom 
+level. 
 \par }{\f29 
 \par }{5 & 6 - Unused
 \par 
@@ -200,12 +203,12 @@ t to exit Configuration Mode before typing!
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 3rd guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par 
-\par }{ScummVM keys on Nokia e71 (most likely on any other qwerty-device, too), tested on version 0.14.0svn (Feb. 18 2009
- 05:56:07). Number keys are inserted by first pressing fn-key (leftmost key at bottom row on E71) and then pressing correct key (e.g. 5 is fn+g). You don't have to press both keys simultaneously.
+\par }{ScummVM keys on Nokia e71 (most likely on any other qwerty-device, too), tested on version 0.14.0svn (Feb. 18 20
+09 05:56:07). Number keys are inserted by first pressing fn-key (leftmost key at bottom row on E71) and then pressing correct key (e.g. 5 is fn+g). You don't have to press both keys simultaneously.
 \par 
 \par Basic keys:
 \par 
@@ -255,9 +258,8 @@ t to exit Configuration Mode before typing!
 \par p -- punch (hand)
 \par 
 \par AGI games (King's Quest, Police Quest etc.):
-\par The
- games work beautifully on the E71, but there's some stupid bugs (in input). I recall finding some debug keys and "last sentence" / "inventory" -keys in earlier version, but I can't find them any more. Also you can't turn on sirens in Police Quest, which 
-kinda makes it unplayable.
+\par The games work beautifully on the E71, but there's some stupid bugs (in input). I recall finding some debug keys and "last sentence" / "inventory" -keys in earlier version, but I can't find them any more. Also you can't turn on sirens in Police Quest, whi
+ch kinda makes it unplayable.
 \par 
 \par There's good side and bad side to each input mode:
 \par Keyboard (I use this primarily)
@@ -278,9 +280,10 @@ kinda makes it unplayable.
 \par }{\f28 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM1 engines list
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
-\par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {agi
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls42\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls42\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
+\par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {access
+\par agi
 \par agos
 \par \tab AGOS2
 \par cge2
@@ -312,8 +315,8 @@ kinda makes it unplayable.
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM2 engines list
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls42\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls42\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {avalanche
 \par cge
 \par composer
@@ -330,6 +333,7 @@ kinda makes it unplayable.
 \par \tab RIVEN
 \par mortevielle
 \par pegasus
+\par prince
 \par sci
 \par \tab SCI32
 \par sky
diff --git a/backends/platform/symbian/mmp/scummvm_access.mmp.in b/backends/platform/symbian/mmp/scummvm_access.mmp.in
new file mode 100644
index 0000000000..4f8b258ec0
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_access.mmp.in
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2013 The ScummVM project
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_access.lib
+TARGETTYPE      lib
+#include "config.mmh"
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\access
+
+//START_AUTO_OBJECTS_ACCESS_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_ACCESS_//
+
diff --git a/backends/platform/symbian/mmp/scummvm_prince.mmp.in b/backends/platform/symbian/mmp/scummvm_prince.mmp.in
new file mode 100644
index 0000000000..7dfec04f46
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_prince.mmp.in
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2014 Strizniou Fedor
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_prince.lib
+TARGETTYPE      lib
+#include "config.mmh"
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\prince
+
+//START_AUTO_OBJECTS_PRINCE_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_PRINCE_//
-- 
cgit v1.2.3


From da18e796d0d2f928ef8b1d0988f4457329d2f31e Mon Sep 17 00:00:00 2001
From: Fedor Strizhnev
Date: Tue, 30 Dec 2014 17:18:28 +0300
Subject: SYMBIAN: Add symbian support for access and prince engines

---
 backends/platform/symbian/AdaptAllMMPs.pl          |  2 +
 .../symbian/BuildPackageUpload_LocalSettings.pl    | 40 ++++++-----
 backends/platform/symbian/help/ScummVM.rtf         | 78 ++++++++++++----------
 .../platform/symbian/mmp/scummvm_access.mmp.in     | 52 +++++++++++++++
 .../platform/symbian/mmp/scummvm_prince.mmp.in     | 52 +++++++++++++++
 5 files changed, 169 insertions(+), 55 deletions(-)
 create mode 100644 backends/platform/symbian/mmp/scummvm_access.mmp.in
 create mode 100644 backends/platform/symbian/mmp/scummvm_prince.mmp.in

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 6eed7f0690..ead28ba4b1 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -48,12 +48,14 @@ chdir("../../../");
 	"mmp/scummvm_voyeur.mmp",
 	"mmp/scummvm_wintermute.mmp",
 	# New engines
+	"mmp/scummvm_access.mmp",
 	"mmp/scummvm_avalanche.mmp",
 	"mmp/scummvm_bbvs.mmp",
 	"mmp/scummvm_cge2.mmp",
 	"mmp/scummvm_fullpipe.mmp",
 	"mmp/scummvm_lastexpress.mmp",
 	"mmp/scummvm_mads.mmp",
+	"mmp/scummvm_prince.mmp",
 	"mmp/scummvm_sword25.mmp",
 	"mmp/scummvm_testbed.mmp",
 	"mmp/scummvm_zvision.mmp",
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index f9b376d674..8c19631524 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -3,32 +3,36 @@
 
 	@WorkingEngines = qw(
 		agos agi cine cge composer cruise draci dreamweb
-		drascula hugo gob groovie kyra lastexpress
-		lure made mohawk parallaction pegasus queen
-		saga sci scumm sky sword1 sword2 teenagent tinsel
-		toltecs tony toon touche tsage tucker wintermute
-		bbvs fullpipe hopkins mortevielle mads cge2
-		neverhood testbed avalanche zvision voyeur
+		drascula hugo gob groovie hopkins kyra lastexpress
+		lure made mohawk mortevielle neverhood parallaction
+		pegasus queen saga sci scumm sky sword1 sword2
+		teenagent tinsel toltecs tony toon touche tsage
+		tucker voyeur wintermute
+		access avalanche bbvs cge2 fullpipe mads prince
+		testbed zvision
 	);
-#### New engines
-####		sword25
+	
+####	sword25 yet not added
+
+#### In progress engines are :
+####  access avalanche bbvs cge2 fullpipe mads prince
+####  testbed zvision
 
 	@WorkingEngines_1st = qw(
-		cge2 cine composer cruise drascula groovie
-		lastexpress made parallaction queen
-		saga scumm touche tucker wintermute
-		avalanche zvision voyeur
+		cine composer cruise drascula groovie
+		lastexpress made parallaction queen saga
+		scumm touche tucker wintermute voyeur
+		access avalanche cge2 zvision
 	);
 
 	@WorkingEngines_2nd = qw(
-		agi agos bbvs cge draci gob hopkins
-		hugo kyra lure mohawk pegasus sci
-		sky sword1 sword2 teenagent mads
+		agi agos cge draci dreamweb gob hopkins
+		hugo kyra lure mohawk mortevielle neverhood  
+		pegasus sci sky sword1 sword2 teenagent
 		tinsel tsage toltecs tony toon
-		dreamweb fullpipe mortevielle
-		neverhood testbed
+		bbvs fullpipe mads prince testbed
 	);
-####		sword25
+####	sword25 yet not added
 
 	@TestingEngines = qw(
 
diff --git a/backends/platform/symbian/help/ScummVM.rtf b/backends/platform/symbian/help/ScummVM.rtf
index 8e9d37363c..15b2105ecd 100644
--- a/backends/platform/symbian/help/ScummVM.rtf
+++ b/backends/platform/symbian/help/ScummVM.rtf
@@ -51,24 +51,27 @@ Synonyms;}{\*\cs33 \additive \super \sbasedon10 endnote reference;}{\s34\ql \fi-
 {\listoverride\listid-125\listoverridecount0\ls12}{\listoverride\listid-120\listoverridecount0\ls13}{\listoverride\listid-129\listoverridecount0\ls14}{\listoverride\listid-119\listoverridecount0\ls15}{\listoverride\listid-125\listoverridecount0\ls16}
 {\listoverride\listid-120\listoverridecount0\ls17}{\listoverride\listid-129\listoverridecount0\ls18}{\listoverride\listid-119\listoverridecount0\ls19}{\listoverride\listid-125\listoverridecount0\ls20}{\listoverride\listid-120\listoverridecount0\ls21}
 {\listoverride\listid-129\listoverridecount0\ls22}{\listoverride\listid-119\listoverridecount0\ls23}{\listoverride\listid-125\listoverridecount0\ls24}{\listoverride\listid-120\listoverridecount0\ls25}{\listoverride\listid-129\listoverridecount0\ls26}
-{\listoverride\listid-119\listoverridecount0\ls27}{\listoverride\listid-125\listoverridecount0\ls28}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls29}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel
-\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls30}}{\info{\author Fedor}
-{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo9\dy9\hr19\min22}{\version99}{\edmins93}{\nofpages8}{\nofwords1514}{\nofchars8634}{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 
-\deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template 
-E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang
-{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang
-{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain 
-\s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 
-\par }{\lang1033\langfe1033\langnp1033 Date: November 2013}{\f28 
-\par }{\lang1033\langfe1033\langnp1033 Version: 1.7.0
+{\listoverride\listid-119\listoverridecount0\ls27}{\listoverride\listid-125\listoverridecount0\ls28}{\listoverride\listid-120\listoverridecount0\ls29}{\listoverride\listid-129\listoverridecount0\ls30}{\listoverride\listid-119\listoverridecount0\ls31}
+{\listoverride\listid-125\listoverridecount0\ls32}{\listoverride\listid-120\listoverridecount0\ls33}{\listoverride\listid-129\listoverridecount0\ls34}{\listoverride\listid-119\listoverridecount0\ls35}{\listoverride\listid-125\listoverridecount0\ls36}
+{\listoverride\listid-120\listoverridecount0\ls37}{\listoverride\listid-129\listoverridecount0\ls38}{\listoverride\listid-119\listoverridecount0\ls39}{\listoverride\listid-125\listoverridecount0\ls40}{\listoverride\listid-2\listoverridecount1{\lfolevel
+\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 
+}}\ls41}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr
+\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls42}}{\info{\author Fedor}{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo12\dy29\hr22\min52}{\version102}{\edmins95}{\nofpages8}{\nofwords1514}{\nofchars8634}
+{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 \deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0
+\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1
+\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5
+\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
+{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {
+\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 
+\par }{\lang1033\langfe1033\langnp1033 Date: November 2014}{\f28 
+\par }{\lang1033\langfe1033\langnp1033 Version: 1.8.0
 \par }\pard\plain \s1\ql \li0\ri0\sb360\sa240\keepn\widctlpar\nooverflow\faroman\outlinelevel0\rin0\lin0\itap0 \b\f1\fs32\lang2057\langfe1033\kerning28\cgrid\langnp2057\langfenp1033 {ScummVM Help
 \par }\pard\plain \s16\ql \li0\ri0\sb360\sa240\keepn\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \b\f1\fs32\cf9\lang2057\langfe1033\kerning28\cgrid\langnp2057\langfenp1033 {\lang1033\langfe1033\langnp1033 0x100039ce}{\lang1059\langfe1033\langnp1059 
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 
 About ScummVM Help
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }{
 This help file based on ScummVM forum thread with some elaborations(in Anotherguest section) and text correction. If you wish add some text or translate you may download and modify source document from https://sourceforge.net/projects/scummvms60git/ and t
@@ -79,8 +82,8 @@ hen send me to fedor_qd@mail.ru
 \par }{\f29 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 1st guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }{UIQ3 devices: To the top right (holding the phone portrait) you four icons, from the top they are
 \par 
@@ -126,17 +129,17 @@ through directorylist (one hand use perhaps!?) or save games etc. Keyboard mode
  of events that ScummVM receives from SDL.
 \par What are these Shrinked, Zoomed and Upscaled modes anyway?
 \par 
-\par Shrink displays the game on your screen but in a shrinked way, either in Portrait or Landscape mode, so not all the pixels c
-an be seen. Zoom mode uses the maximum resolution of your phone displaying a smaller part of the game zoomed at 1:1 pixels. For scrolling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to center view. Upscale tries to fill the larger screen
-s on S80/S90 devices in a better way for low resolution games. Currently it uses a pixel interpolation upscaling routine.
+\par Shrink displays the game on your screen but in a shrinked way, either in Port
+rait or Landscape mode, so not all the pixels can be seen. Zoom mode uses the maximum resolution of your phone displaying a smaller part of the game zoomed at 1:1 pixels. For scrolling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to cente
+r view. Upscale tries to fill the larger screens on S80/S90 devices in a better way for low resolution games. Currently it uses a pixel interpolation upscaling routine.
 \par 
 \par You can also use a bluetooth mouse with S60v3 devices to control your game. You need the bluetooth hid library from Hinkka http://koti.mbnet.fi/hinkka/Download.html to get it to work properly.
 \par }{\f29 
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 2nd guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par 
 \par }{More user-friendly guide for Nokia phones (based on N96 but should apply to most phones)
@@ -161,9 +164,8 @@ s on S80/S90 devices in a better way for low resolution games. Currently it uses
 \par }{1 - Change Input.
 \par This is the option you'll probably use the most. There are three settings; A,C and J.
 \par 
-\par A -
- This is the "Text Input" mode. It allows you to type directly into ScummVM as if you were using a keyboard. Type the same way you would when sending a text message off of your phone. Please note that the pointer is disabled when in this mode. Don't forge
-t to exit Configuration Mode before typing!
+\par A - This is the "Text Input" mode. It allows you to type directly into ScummVM as if you were using a keyboard. Type the same way you would when sending a text message o
+ff of your phone. Please note that the pointer is disabled when in this mode. Don't forget to exit Configuration Mode before typing!
 \par 
 \par C - This is the "Cursor" mode. This emulates the arrow keys of the keyboard. Some games require using this instead of the mouse (e.g. the destruction derby section towards the end of Full Throttle).
 \par 
@@ -178,8 +180,9 @@ t to exit Configuration Mode before typing!
 \par Only applies to Landscape mode, simply swaps the screen output between having the phone tilted on its left side or on its right side.
 \par 
 \par 4 - Toggle Zoom On and Off
-\par Zooms in on a portion of the screen. Handy for when you are looking through a screen for items or having trouble reading subtitles. Use the navigation buttons for panning around
- the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom level. 
+\par Zooms in on a portion of the screen. Handy for when you are looking through a screen fo
+r items or having trouble reading subtitles. Use the navigation buttons for panning around the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom 
+level. 
 \par }{\f29 
 \par }{5 & 6 - Unused
 \par 
@@ -200,12 +203,12 @@ t to exit Configuration Mode before typing!
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 3rd guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls41\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls41\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par 
-\par }{ScummVM keys on Nokia e71 (most likely on any other qwerty-device, too), tested on version 0.14.0svn (Feb. 18 2009
- 05:56:07). Number keys are inserted by first pressing fn-key (leftmost key at bottom row on E71) and then pressing correct key (e.g. 5 is fn+g). You don't have to press both keys simultaneously.
+\par }{ScummVM keys on Nokia e71 (most likely on any other qwerty-device, too), tested on version 0.14.0svn (Feb. 18 20
+09 05:56:07). Number keys are inserted by first pressing fn-key (leftmost key at bottom row on E71) and then pressing correct key (e.g. 5 is fn+g). You don't have to press both keys simultaneously.
 \par 
 \par Basic keys:
 \par 
@@ -255,9 +258,8 @@ t to exit Configuration Mode before typing!
 \par p -- punch (hand)
 \par 
 \par AGI games (King's Quest, Police Quest etc.):
-\par The
- games work beautifully on the E71, but there's some stupid bugs (in input). I recall finding some debug keys and "last sentence" / "inventory" -keys in earlier version, but I can't find them any more. Also you can't turn on sirens in Police Quest, which 
-kinda makes it unplayable.
+\par The games work beautifully on the E71, but there's some stupid bugs (in input). I recall finding some debug keys and "last sentence" / "inventory" -keys in earlier version, but I can't find them any more. Also you can't turn on sirens in Police Quest, whi
+ch kinda makes it unplayable.
 \par 
 \par There's good side and bad side to each input mode:
 \par Keyboard (I use this primarily)
@@ -278,9 +280,10 @@ kinda makes it unplayable.
 \par }{\f28 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM1 engines list
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
-\par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {agi
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls42\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls42\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
+\par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {access
+\par agi
 \par agos
 \par \tab AGOS2
 \par cge2
@@ -312,8 +315,8 @@ kinda makes it unplayable.
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM2 engines list
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls42\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls42\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {avalanche
 \par cge
 \par composer
@@ -330,6 +333,7 @@ kinda makes it unplayable.
 \par \tab RIVEN
 \par mortevielle
 \par pegasus
+\par prince
 \par sci
 \par \tab SCI32
 \par sky
diff --git a/backends/platform/symbian/mmp/scummvm_access.mmp.in b/backends/platform/symbian/mmp/scummvm_access.mmp.in
new file mode 100644
index 0000000000..4f8b258ec0
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_access.mmp.in
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2013 The ScummVM project
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_access.lib
+TARGETTYPE      lib
+#include "config.mmh"
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\access
+
+//START_AUTO_OBJECTS_ACCESS_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_ACCESS_//
+
diff --git a/backends/platform/symbian/mmp/scummvm_prince.mmp.in b/backends/platform/symbian/mmp/scummvm_prince.mmp.in
new file mode 100644
index 0000000000..7dfec04f46
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_prince.mmp.in
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2014 Strizniou Fedor
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_prince.lib
+TARGETTYPE      lib
+#include "config.mmh"
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\prince
+
+//START_AUTO_OBJECTS_PRINCE_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_PRINCE_//
-- 
cgit v1.2.3


From e27f5f69882345e45d6b2f1c8b449ea622d7d464 Mon Sep 17 00:00:00 2001
From: Fedor Strizhnev
Date: Tue, 30 Dec 2014 19:05:27 +0300
Subject: Symbian: completely disabled MT32

---
 backends/platform/symbian/AdaptAllMMPs.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index ead28ba4b1..6b9f918a51 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -105,6 +105,7 @@ my @sections_scumm = ("", "ENABLE_SCUMM_7_8", "ENABLE_HE"); # special sections f
 # files excluded from build, case insensitive, will be matched in filename string only
 my @excludes_snd = (
 	"mt32.*",
+	"Analog.cpp",
 	"fluidsynth.cpp",
 	"i386.cpp",
 	"part.*",
@@ -193,6 +194,7 @@ ParseModule("_tucker",	"tucker",	\@section_empty);
 ParseModule("_voyeur"     ,"voyeur",	\@section_empty);
 ParseModule("_wintermute","wintermute",	\@section_empty);
 ##### new engines
+ParseModule("_access"     ,"access",	\@section_empty);
 ParseModule("_avalanche"     ,"avalanche",	\@section_empty);
 ParseModule("_bbvs"     	,"bbvs",	\@section_empty);
 ParseModule("_cge2"     	,"cge2",	\@section_empty);
@@ -200,6 +202,7 @@ ParseModule("_fullpipe"     ,"fullpipe",	\@section_empty);
 ParseModule("_lastexpress","lastexpress",	\@section_empty);
 ParseModule("_m4",		"m4",		\@section_empty);
 ParseModule("_mads"			,"mads",	\@section_empty);
+ParseModule("_prince"			,"prince",	\@section_empty);
 ParseModule("_sword25"     ,"sword25",	\@section_empty);
 ParseModule("_testbed"     ,"testbed",	\@section_empty);
 ParseModule("_zvision"     ,"zvision",	\@section_empty);
-- 
cgit v1.2.3


From 2fb116f10eaa1bf682a220c33016fc61492af4fe Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 13:32:44 -0600
Subject: SWORD25: Move all lua serialization helper functions to their own
 file

---
 engines/sword25/util/lua_serialization_util.cpp | 269 +++++++++++++++++
 engines/sword25/util/lua_serialization_util.h   |  55 ++++
 engines/sword25/util/lua_serializer.cpp         |  56 ++--
 engines/sword25/util/lua_unserializer.cpp       | 368 ++----------------------
 4 files changed, 376 insertions(+), 372 deletions(-)

diff --git a/engines/sword25/util/lua_serialization_util.cpp b/engines/sword25/util/lua_serialization_util.cpp
index 80c5f86b20..fc3f73eca6 100644
--- a/engines/sword25/util/lua_serialization_util.cpp
+++ b/engines/sword25/util/lua_serialization_util.cpp
@@ -27,10 +27,20 @@
 #include "lua/lobject.h"
 #include "lua/lstate.h"
 #include "lua/lgc.h"
+#include "lua/lopcodes.h"
 
 
 namespace Lua {
 
+void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize) {
+	global_State *globalState = G(luaState);
+
+	block = (*globalState->frealloc)(globalState->ud, block, osize, nsize);
+	globalState->totalbytes = (globalState->totalbytes - osize) + nsize;
+
+	return block;
+}
+
 void pushObject(lua_State *luaState, TValue *obj) {
 	setobj2s(luaState, luaState->top, obj);
 
@@ -74,4 +84,263 @@ StkId getObject(lua_State *luaState, int stackpos) {
 	}
 }
 
+void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type) {
+	global_State *globalState = G(luaState);
+
+	obj->gch.next = globalState->rootgc;
+	globalState->rootgc = obj;
+	obj->gch.marked = luaC_white(globalState);
+	obj->gch.tt = type;
+}
+
+Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable) {
+	Closure *c = (Closure *)lua_malloc(luaState, sizeLclosure(numElements));
+	lua_linkObjToGC(luaState, obj2gco(c), LUA_TFUNCTION);
+
+	c->l.isC = 0;
+	c->l.env = elementTable;
+	c->l.nupvalues = cast_byte(numElements);
+
+	while (numElements--) {
+		c->l.upvals[numElements] = NULL;
+	}
+
+	return c;
+}
+
+void pushClosure(lua_State *luaState, Closure *closure) {
+	TValue obj;
+	setclvalue(luaState, &obj, closure);
+	pushObject(luaState, &obj);
+}
+
+Proto *createProto(lua_State *luaState) {
+	Proto *newProto = (Proto *)lua_malloc(luaState, sizeof(Proto));
+	lua_linkObjToGC(luaState, obj2gco(newProto), LUA_TPROTO);
+
+	newProto->k = NULL;
+	newProto->sizek = 0;
+	newProto->p = NULL;
+	newProto->sizep = 0;
+	newProto->code = NULL;
+	newProto->sizecode = 0;
+	newProto->sizelineinfo = 0;
+	newProto->sizeupvalues = 0;
+	newProto->nups = 0;
+	newProto->upvalues = NULL;
+	newProto->numparams = 0;
+	newProto->is_vararg = 0;
+	newProto->maxstacksize = 0;
+	newProto->lineinfo = NULL;
+	newProto->sizelocvars = 0;
+	newProto->locvars = NULL;
+	newProto->linedefined = 0;
+	newProto->lastlinedefined = 0;
+	newProto->source = NULL;
+
+	return newProto;
+}
+
+TString *createString(lua_State *luaState, const char *str, size_t len) {
+	TString *res;
+	lua_pushlstring(luaState, str, len);
+
+	res = rawtsvalue(luaState->top - 1);
+	lua_pop(luaState, 1);
+
+	return res;
+}
+
+Proto *makeFakeProto(lua_State *L, lu_byte nups) {
+	Proto *p = createProto(L);
+
+	p->sizelineinfo = 1;
+	p->lineinfo = lua_newVector(L, 1, int);
+	p->lineinfo[0] = 1;
+	p->sizecode = 1;
+	p->code = lua_newVector(L, 1, Instruction);
+	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
+	p->source = createString(L, "", 0);
+	p->maxstacksize = 2;
+	p->nups = nups;
+	p->sizek = 0;
+	p->sizep = 0;
+
+	return p;
+}
+
+UpVal *createUpValue(lua_State *luaState, int stackpos) {
+	UpVal *upValue = (UpVal *)lua_malloc(luaState, sizeof(UpVal));
+	lua_linkObjToGC(luaState, (GCObject *)upValue, LUA_TUPVAL);
+	upValue->tt = LUA_TUPVAL;
+	upValue->v = &upValue->u.value;
+	upValue->u.l.prev = NULL;
+	upValue->u.l.next = NULL;
+
+	const TValue *o2 = (TValue *)getObject(luaState, stackpos);
+	upValue->v->value = o2->value;
+	upValue->v->tt = o2->tt;
+	checkliveness(G(L), upValue->v);
+
+	return upValue;
+}
+
+void unboxUpValue(lua_State *luaState) {
+	// >>>>> ...... func
+	LClosure *lcl;
+	UpVal *uv;
+
+	lcl = (LClosure *)clvalue(getObject(luaState, -1));
+	uv = lcl->upvals[0];
+
+	lua_pop(luaState, 1);
+	// >>>>> ......
+
+	pushUpValue(luaState, uv);
+	// >>>>> ...... upValue
+}
+
+size_t appendStackToStack_reverse(lua_State *from, lua_State *to) {
+	for (StkId id = from->top - 1; id >= from->stack; --id) {
+		setobj2s(to, to->top, id);
+		to->top++;
+	}
+
+	return from->top - from->stack;
+}
+
+void correctStack(lua_State *L, TValue *oldstack) {
+	CallInfo *ci;
+	GCObject *up;
+	L->top = (L->top - oldstack) + L->stack;
+	for (up = L->openupval; up != NULL; up = up->gch.next)
+		gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
+	for (ci = L->base_ci; ci <= L->ci; ci++) {
+		ci->top = (ci->top - oldstack) + L->stack;
+		ci->base = (ci->base - oldstack) + L->stack;
+		ci->func = (ci->func - oldstack) + L->stack;
+	}
+	L->base = (L->base - oldstack) + L->stack;
+}
+
+void lua_reallocstack(lua_State *L, int newsize) {
+	TValue *oldstack = L->stack;
+	int realsize = newsize + 1 + EXTRA_STACK;
+
+	lua_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
+	L->stacksize = realsize;
+	L->stack_last = L->stack + newsize;
+	correctStack(L, oldstack);
+}
+
+void lua_growstack(lua_State *L, int n) {
+	// Double size is enough?
+	if (n <= L->stacksize) {
+		lua_reallocstack(L, 2 * L->stacksize);
+	} else {
+		lua_reallocstack(L, L->stacksize + n);
+	}
+}
+
+void lua_reallocCallInfo(lua_State *lauState, int newsize) {
+	CallInfo *oldci = lauState->base_ci;
+	lua_reallocvector(lauState, lauState->base_ci, lauState->size_ci, newsize, CallInfo);
+
+	lauState->size_ci = newsize;
+	lauState->ci = (lauState->ci - oldci) + lauState->base_ci;
+	lauState->end_ci = lauState->base_ci + lauState->size_ci - 1;
+}
+
+void GCUnlink(lua_State *luaState, GCObject *gco) {
+	GCObject *prevslot;
+	if (G(luaState)->rootgc == gco) {
+		G(luaState)->rootgc = G(luaState)->rootgc->gch.next;
+		return;
+	}
+
+	prevslot = G(luaState)->rootgc;
+	while (prevslot->gch.next != gco) {
+		prevslot = prevslot->gch.next;
+	}
+
+	prevslot->gch.next = prevslot->gch.next->gch.next;
+}
+
+TString *lua_newlstr(lua_State *luaState, const char *str, size_t len) {
+	lua_pushlstring(luaState, str, len);
+	TString *luaStr = &(luaState->top - 1)->value.gc->ts;
+
+	lua_pop(luaState, 1);
+
+	return luaStr;
+}
+
+void lua_link(lua_State *luaState, GCObject *o, lu_byte tt) {
+	global_State *g = G(luaState);
+	o->gch.next = g->rootgc;
+	g->rootgc = o;
+	o->gch.marked = luaC_white(g);
+	o->gch.tt = tt;
+}
+
+Proto *lua_newproto(lua_State *luaState) {
+	Proto *f = (Proto *)lua_malloc(luaState, sizeof(Proto));
+	lua_link(luaState, obj2gco(f), LUA_TPROTO);
+	f->k = NULL;
+	f->sizek = 0;
+	f->p = NULL;
+	f->sizep = 0;
+	f->code = NULL;
+	f->sizecode = 0;
+	f->sizelineinfo = 0;
+	f->sizeupvalues = 0;
+	f->nups = 0;
+	f->upvalues = NULL;
+	f->numparams = 0;
+	f->is_vararg = 0;
+	f->maxstacksize = 0;
+	f->lineinfo = NULL;
+	f->sizelocvars = 0;
+	f->locvars = NULL;
+	f->linedefined = 0;
+	f->lastlinedefined = 0;
+	f->source = NULL;
+	return f;
+}
+
+UpVal *makeUpValue(lua_State *luaState, int stackPos) {
+	UpVal *uv = lua_new(luaState, UpVal);
+	lua_link(luaState, (GCObject *)uv, LUA_TUPVAL);
+	uv->tt = LUA_TUPVAL;
+	uv->v = &uv->u.value;
+	uv->u.l.prev = NULL;
+	uv->u.l.next = NULL;
+
+	setobj(luaState, uv->v, getObject(luaState, stackPos));
+
+	return uv;
+}
+
+void boxUpValue_start(lua_State *luaState) {
+	LClosure *closure;
+	closure = (LClosure *)lua_newLclosure(luaState, 1, hvalue(&luaState->l_gt));
+	pushClosure(luaState, (Closure *)closure);
+	// >>>>> ...... func
+	closure->p = makeFakeProto(luaState, 1);
+
+	// Temporarily initialize the upvalue to nil
+	lua_pushnil(luaState);
+	closure->upvals[0] = makeUpValue(luaState, -1);
+	lua_pop(luaState, 1);
+}
+
+void boxUpValue_finish(lua_State *luaState) {
+	// >>>>> ...... func obj
+	LClosure *lcl = (LClosure *)clvalue(getObject(luaState, -2));
+
+	lcl->upvals[0]->u.value = *getObject(luaState, -1);
+	lua_pop(luaState, 1);
+	// >>>>> ...... func
+}
+
 } // End of namespace Lua
diff --git a/engines/sword25/util/lua_serialization_util.h b/engines/sword25/util/lua_serialization_util.h
index 6c55d0dd53..345996f606 100644
--- a/engines/sword25/util/lua_serialization_util.h
+++ b/engines/sword25/util/lua_serialization_util.h
@@ -32,12 +32,67 @@ typedef TValue *StkId;
 
 namespace Lua {
 
+#define lua_malloc(luaState, nsize) lua_realloc(luaState, nullptr, 0, nsize)
+#define lua_reallocv(luaState, block, on, n, e) lua_realloc(luaState, block, (on) * (e), (n) * (e))
+#define lua_reallocvector(luaState, vec, oldn, n, T) ((vec) = (T *)(lua_reallocv(luaState, vec, oldn, n, sizeof(T))))
+#define lua_newVector(luaState, num, T) ((T *)lua_reallocv(luaState, nullptr, 0, num, sizeof(T)))
+#define lua_new(luaState,T) (T *)lua_malloc(luaState, sizeof(T))
+
+void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize);
+
 void pushObject(lua_State *luaState, TValue *obj);
 void pushProto(lua_State *luaState, Proto *proto);
 void pushUpValue(lua_State *luaState, UpVal *upval);
 void pushString(lua_State *luaState, TString *str);
+
 StkId getObject(lua_State *luaState, int stackpos);
 
+void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type);
+
+#define sizeLclosure(n) ((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
+
+Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable);
+void pushClosure(lua_State *luaState, Closure *closure);
+
+Proto *createProto(lua_State *luaState);
+Proto *makeFakeProto(lua_State *L, lu_byte nups);
+
+TString *createString(lua_State *luaState, const char *str, size_t len);
+
+UpVal *createUpValue(lua_State *luaState, int stackpos);
+void unboxUpValue(lua_State *luaState);
+
+/* Appends one stack to another stack, but the stack is reversed in the process */
+size_t appendStackToStack_reverse(lua_State *from, lua_State *to);
+void correctStack(lua_State *L, TValue *oldstack);
+void lua_reallocstack(lua_State *L, int newsize);
+void lua_growstack(lua_State *L, int n);
+
+void lua_reallocCallInfo(lua_State *lauState, int newsize);
+
+/* Does basically the opposite of luaC_link().
+ * Right now this function is rather inefficient; it requires traversing the
+ * entire root GC set in order to find one object. If the GC list were doubly
+ * linked this would be much easier, but there's no reason for Lua to have
+ * that. */
+void GCUnlink(lua_State *luaState, GCObject *gco);
+
+TString *lua_newlstr(lua_State *luaState, const char *str, size_t len);
+void lua_link(lua_State *luaState, GCObject *o, lu_byte tt);
+Proto *lua_newproto(lua_State *luaState) ;
+
+UpVal *makeUpValue(lua_State *luaState, int stackPos);
+/**
+ * The GC is not fond of finding upvalues in tables. We get around this
+ * during persistence using a weakly keyed table, so that the GC doesn't
+ * bother to mark them. This won't work in unpersisting, however, since
+ * if we make the values weak they'll be collected (since nothing else
+ * references them). Our solution, during unpersisting, is to represent
+ * upvalues as dummy functions, each with one upvalue.
+ */
+void boxUpValue_start(lua_State *luaState);
+void boxUpValue_finish(lua_State *luaState);
+
 } // End of namespace Lua
 
 #endif
diff --git a/engines/sword25/util/lua_serializer.cpp b/engines/sword25/util/lua_serializer.cpp
index c6c5f99342..55b6257324 100644
--- a/engines/sword25/util/lua_serializer.cpp
+++ b/engines/sword25/util/lua_serializer.cpp
@@ -42,7 +42,7 @@ struct SerializationInfo {
 	uint counter;
 };
 
-static void serializeObject(SerializationInfo *info);
+static void serialize(SerializationInfo *info);
 
 static void serializeBoolean(SerializationInfo *info);
 static void serializeNumber(SerializationInfo *info);
@@ -103,14 +103,14 @@ void serializeLua(lua_State *luaState, Common::WriteStream *writeStream) {
 	// >>>>> permTbl indexTbl rootObj
 
 	// Serialize the root recursively
-	serializeObject(&info);
+	serialize(&info);
 
 	// Return the stack back to the original state
 	lua_remove(luaState, 2);
 	// >>>>> permTbl rootObj
 }
 
-static void serializeObject(SerializationInfo *info) {
+static void serialize(SerializationInfo *info) {
 	// The stack can potentially have many things on it
 	// The object we want to serialize is the item on the top of the stack
 	// >>>>> permTbl indexTbl rootObj ...... obj
@@ -188,7 +188,7 @@ static void serializeObject(SerializationInfo *info) {
 		info->writeStream->writeSint32LE(PERMANENT_TYPE);
 
 		// Serialize the key
-		serializeObject(info);
+		serialize(info);
 
 		// Pop the key off the stack
 		lua_pop(info->luaState, 1);
@@ -368,7 +368,7 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 	info->writeStream->writeSint32LE(1);
 
 	// Serialize the function
-	serializeObject(info);
+	serialize(info);
 
 	lua_pop(info->luaState, 2);
 	// >>>>> permTbl indexTbl ...... obj
@@ -395,7 +395,7 @@ static void serializeTable(SerializationInfo *info) {
 	}
 
 	// >>>>> permTbl indexTbl ...... tbl metaTbl/nil */
-	serializeObject(info);
+	serialize(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... tbl
@@ -412,13 +412,13 @@ static void serializeTable(SerializationInfo *info) {
 		// >>>>> permTbl indexTbl ...... tbl k v k */
 
 		// Serialize the key
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... tbl k v */
 
 		// Serialize the value
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... tbl k */
@@ -430,7 +430,7 @@ static void serializeTable(SerializationInfo *info) {
 	lua_pushnil(info->luaState);
 	// >>>>> permTbl indexTbl ...... tbl
 
-	serializeObject(info);
+	serialize(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... tbl
@@ -457,7 +457,7 @@ static void serializeFunction(SerializationInfo *info) {
 		pushProto(info->luaState, cl->l.p);
 		// >>>>> permTbl indexTbl ...... func proto */
 
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... func
@@ -468,7 +468,7 @@ static void serializeFunction(SerializationInfo *info) {
 			pushUpValue(info->luaState, cl->l.upvals[i]);
 			// >>>>> permTbl indexTbl ...... func upval
 
-			serializeObject(info);
+			serialize(info);
 
 			lua_pop(info->luaState, 1);
 			// >>>>> permTbl indexTbl ...... func
@@ -492,23 +492,13 @@ static void serializeFunction(SerializationInfo *info) {
 		}
 
 		// >>>>> permTbl indexTbl ...... func fenv/nil
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... func
 	}
 }
 
-/* Appends one stack to another stack, but the stack is reversed in the process */
-static size_t appendStackToStack_rev(lua_State *from, lua_State *to) {
-	for (StkId id = from->top - 1; id >= from->stack; --id) {
-		setobj2s(to, to->top, id);
-		to->top++;
-	}
-
-	return from->top - from->stack;
-}
-
 static void serializeThread(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... thread
 	lua_State *threadState = lua_tothread(info->luaState, -1);
@@ -525,12 +515,12 @@ static void serializeThread(SerializationInfo *info) {
 	// Persist the stack
 
 	// We *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
-	uint32 stackSize = static_cast<uint32>(appendStackToStack_rev(threadState, info->luaState));
+	uint32 stackSize = static_cast<uint32>(appendStackToStack_reverse(threadState, info->luaState));
 	info->writeStream->writeUint32LE(stackSize);
 
 	// >>>>> permTbl indexTbl ...... thread (reversed contents of thread stack) */
 	for (; stackSize > 0; --stackSize) {
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 	}
@@ -592,7 +582,7 @@ static void serializeThread(SerializationInfo *info) {
 		pushUpValue(info->luaState, upVal);
 		// >>>>> permTbl indexTbl ...... thread upVal
 
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... thread
@@ -607,7 +597,7 @@ static void serializeThread(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... thread nil
 
 	// Use nil as a terminator
-	serializeObject(info);
+	serialize(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... thread
@@ -627,7 +617,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushObject(info->luaState, &proto->k[i]);
 		// >>>>> permTbl indexTbl ...... proto const
 
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -643,7 +633,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushProto(info->luaState, proto->p[i]);
 		// >>>>> permTbl indexTbl ...... proto subProto */
 
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -666,7 +656,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushString(info->luaState, proto->upvalues[i]);
 		// >>>>> permTbl indexTbl ...... proto str
 
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -680,7 +670,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushString(info->luaState, proto->locvars[i].varname);
 		// >>>>> permTbl indexTbl ...... proto str
 
-		serializeObject(info);
+		serialize(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -694,7 +684,7 @@ static void serializeProto(SerializationInfo *info) {
 	pushString(info->luaState, proto->source);
 	// >>>>> permTbl indexTbl ...... proto sourceStr
 
-	serializeObject(info);
+	serialize(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... proto
@@ -757,7 +747,7 @@ static void serializeUpValue(SerializationInfo *info) {
 	pushObject(info->luaState, upValue->v);
 	// >>>>> permTbl indexTbl ...... obj
 
-	serializeObject(info);
+	serialize(info);
 	// >>>>> permTbl indexTbl ...... obj
 }
 
@@ -787,7 +777,7 @@ static void serializeUserData(SerializationInfo *info) {
 	}
 
 	// >>>>> permTbl rootObj ...... udata metaTbl/nil
-	serializeObject(info);
+	serialize(info);
 
 	lua_pop(info->luaState, 1);
 	/* perms reftbl ... udata */
diff --git a/engines/sword25/util/lua_unserializer.cpp b/engines/sword25/util/lua_unserializer.cpp
index 69cb764dd2..803c79c8c2 100644
--- a/engines/sword25/util/lua_unserializer.cpp
+++ b/engines/sword25/util/lua_unserializer.cpp
@@ -40,7 +40,7 @@ struct UnSerializationInfo {
 	Common::ReadStream *readStream;
 };
 
-static void unserializeObject(UnSerializationInfo *info);
+static void unserialize(UnSerializationInfo *info);
 
 static void unserializeBoolean(UnSerializationInfo *info);
 static void unserializeNumber(UnSerializationInfo *info);
@@ -74,7 +74,7 @@ void unserializeLua(lua_State *luaState, Common::ReadStream *readStream) {
 	lua_gc(luaState, LUA_GCSTOP, 0);
 
 	// Unserialize the root object
-	unserializeObject(&info);
+	unserialize(&info);
 	// >>>>> permTbl indexTbl rootObj
 
 	// Re-start garbage collection
@@ -85,7 +85,7 @@ void unserializeLua(lua_State *luaState, Common::ReadStream *readStream) {
 	// >>>>> permTbl rootObj
 }
 
-/* The object is left on the stack. This is primarily used by unpersist, but
+/* The object is left on the stack. This is primarily used by unserialize, but
  * may be used by GCed objects that may incur cycles in order to preregister
  * the object. */
 static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
@@ -105,7 +105,7 @@ static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... obj
 }
 
-static void unserializeObject(UnSerializationInfo *info) {
+static void unserialize(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -241,7 +241,7 @@ static void unserializeSpecialTable(UnSerializationInfo *info, int index) {
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 1);
 
-	unserializeObject(info);
+	unserialize(info);
 
 	// >>>>> permTbl indexTbl ...... spfunc
 	lua_call(info->luaState, 0, 1);
@@ -262,7 +262,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... tbl
 
 	// Unserialize metatable
-	unserializeObject(info);
+	unserialize(info);
 	// >>>>> permTbl indexTbl ...... tbl ?metaTbl/nil?
 
 	if (lua_istable(info->luaState, -1)) {
@@ -279,7 +279,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 
 	while (1) {
 		// >>>>> permTbl indexTbl ...... tbl
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... tbl key/nil
 
 		// The table serialization is nil terminated
@@ -292,7 +292,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 		}
 
 		// >>>>> permTbl indexTbl ...... tbl key
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... tbl value
 
 		lua_rawset(info->luaState, -3);
@@ -317,142 +317,6 @@ void unserializeTable(UnSerializationInfo *info, int index) {
 	}
 }
 
-
-
-void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize) {
-	global_State *globalState = G(luaState);
-
-	block = (*globalState->frealloc)(globalState->ud, block, osize, nsize);
-	globalState->totalbytes = (globalState->totalbytes - osize) + nsize;
-
-	return block;
-}
-
-#define lua_malloc(luaState, nsize) lua_realloc(luaState, nullptr, 0, nsize)
-#define lua_reallocv(luaState, block, on, n, e) lua_realloc(luaState, block, (on) * (e), (n) * (e))
-#define lua_reallocvector(luaState, vec, oldn, n, T) ((vec) = (T *)(lua_reallocv(luaState, vec, oldn, n, sizeof(T))))
-#define lua_newVector(luaState, num, T) ((T *)lua_reallocv(luaState, nullptr, 0, num, sizeof(T)))
-#define lua_new(luaState,T) (T *)lua_malloc(luaState, sizeof(T))
-
-void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type) {
-	global_State *globalState = G(luaState);
-
-	obj->gch.next = globalState->rootgc;
-	globalState->rootgc = obj;
-	obj->gch.marked = luaC_white(globalState);
-	obj->gch.tt = type;
-}
-
-#define sizeLclosure(n) ((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
-
-Closure *newLClosure(lua_State *luaState, byte numUpValues, Table *env) {
-	Closure *newClosure = (Closure *)lua_malloc(luaState, sizeLclosure(numUpValues));
-
-	lua_linkObjToGC(luaState, obj2gco(newClosure), LUA_TFUNCTION);
-
-	newClosure->l.isC = 0;
-	newClosure->l.env = env;
-	newClosure->l.nupvalues = numUpValues;
-
-	while (numUpValues--) {
-		newClosure->l.upvals[numUpValues] = NULL;
-	}
-
-	return newClosure;
-}
-
-static void pushClosure(lua_State *luaState, Closure *closure) {
-	TValue obj;
-	setclvalue(luaState, &obj, closure);
-	pushObject(luaState, &obj);
-}
-
-Proto *createProto(lua_State *luaState) {
-	Proto *newProto = (Proto *)lua_malloc(luaState, sizeof(Proto));
-	lua_linkObjToGC(luaState, obj2gco(newProto), LUA_TPROTO);
-
-	newProto->k = NULL;
-	newProto->sizek = 0;
-	newProto->p = NULL;
-	newProto->sizep = 0;
-	newProto->code = NULL;
-	newProto->sizecode = 0;
-	newProto->sizelineinfo = 0;
-	newProto->sizeupvalues = 0;
-	newProto->nups = 0;
-	newProto->upvalues = NULL;
-	newProto->numparams = 0;
-	newProto->is_vararg = 0;
-	newProto->maxstacksize = 0;
-	newProto->lineinfo = NULL;
-	newProto->sizelocvars = 0;
-	newProto->locvars = NULL;
-	newProto->linedefined = 0;
-	newProto->lastlinedefined = 0;
-	newProto->source = NULL;
-
-	return newProto;
-}
-
-TString *createString(lua_State *luaState, const char *str, size_t len) {
-	TString *res;
-	lua_pushlstring(luaState, str, len);
-
-	res = rawtsvalue(luaState->top - 1);
-	lua_pop(luaState, 1);
-
-	return res;
-}
-
-static Proto *makeFakeProto(lua_State *L, lu_byte nups) {
-	Proto *p = createProto(L);
-
-	p->sizelineinfo = 1;
-	p->lineinfo = lua_newVector(L, 1, int);
-	p->lineinfo[0] = 1;
-	p->sizecode = 1;
-	p->code = lua_newVector(L, 1, Instruction);
-	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
-	p->source = createString(L, "", 0);
-	p->maxstacksize = 2;
-	p->nups = nups;
-	p->sizek = 0;
-	p->sizep = 0;
-
-	return p;
-}
-
-static UpVal *createUpValue(lua_State *luaState, int stackpos) {
-	UpVal *upValue = (UpVal *)lua_malloc(luaState, sizeof(UpVal));
-	lua_linkObjToGC(luaState, (GCObject *)upValue, LUA_TUPVAL);
-	upValue->tt = LUA_TUPVAL;
-	upValue->v = &upValue->u.value;
-	upValue->u.l.prev = NULL;
-	upValue->u.l.next = NULL;
-
-	const TValue *o2 = (TValue *)getObject(luaState, stackpos);
-	upValue->v->value = o2->value;
-	upValue->v->tt = o2->tt;
-	checkliveness(G(L), upValue->v);
-
-	return upValue;
-}
-
-static void unboxUpValue(lua_State *luaState) {
-	// >>>>> ...... func
-	LClosure *lcl;
-	UpVal *uv;
-
-	lcl = (LClosure *)clvalue(getObject(luaState, -1));
-	uv = lcl->upvals[0];
-
-	lua_pop(luaState, 1);
-	// >>>>> ......
-
-	pushUpValue(luaState, uv);
-	// >>>>> ...... upValue
-}
-
 void unserializeFunction(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
@@ -461,7 +325,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 
 	byte numUpValues = info->readStream->readByte();
 
-	LClosure *lclosure = (LClosure *)newLClosure(info->luaState, numUpValues, hvalue(&info->luaState->l_gt));
+	LClosure *lclosure = (LClosure *)lua_newLclosure(info->luaState, numUpValues, hvalue(&info->luaState->l_gt));
 	pushClosure(info->luaState, (Closure *)lclosure);
 	// >>>>> permTbl indexTbl ...... func
 
@@ -484,7 +348,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	registerObjectInIndexTable(info, index);
 
 	// Now that it's safe, we can get the real proto
-	unserializeObject(info);
+	unserialize(info);
 	// >>>>> permTbl indexTbl ...... func proto
 
 	lclosure->p = gco2p(getObject(info->luaState, -1)->value.gc);
@@ -494,7 +358,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 
 	for (byte i = 0; i < numUpValues; ++i) {
 		// >>>>> permTbl indexTbl ...... func
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... func func2
 
 		unboxUpValue(info->luaState);
@@ -506,7 +370,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	}
 
 	// Finally, the fenv
-	unserializeObject(info);
+	unserialize(info);
 
 	// >>>>> permTbl indexTbl ...... func ?fenv/nil?
 	if (!lua_isnil(info->luaState, -1)) {
@@ -522,81 +386,6 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... func
 }
 
-static void correctStack(lua_State *L, TValue *oldstack) {
-	CallInfo *ci;
-	GCObject *up;
-	L->top = (L->top - oldstack) + L->stack;
-	for (up = L->openupval; up != NULL; up = up->gch.next)
-		gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
-	for (ci = L->base_ci; ci <= L->ci; ci++) {
-		ci->top = (ci->top - oldstack) + L->stack;
-		ci->base = (ci->base - oldstack) + L->stack;
-		ci->func = (ci->func - oldstack) + L->stack;
-	}
-	L->base = (L->base - oldstack) + L->stack;
-}
-
-void lua_reallocstack(lua_State *L, int newsize) {
-	TValue *oldstack = L->stack;
-	int realsize = newsize + 1 + EXTRA_STACK;
-
-	lua_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
-	L->stacksize = realsize;
-	L->stack_last = L->stack + newsize;
-	correctStack(L, oldstack);
-}
-
-void lua_growstack(lua_State *L, int n) {
-	// Double size is enough?
-	if (n <= L->stacksize) {
-		lua_reallocstack(L, 2 * L->stacksize);
-	} else {
-		lua_reallocstack(L, L->stacksize + n);
-	}
-}
-
-void lua_reallocCallInfo(lua_State *lauState, int newsize) {
-	CallInfo *oldci = lauState->base_ci;
-	lua_reallocvector(lauState, lauState->base_ci, lauState->size_ci, newsize, CallInfo);
-
-	lauState->size_ci = newsize;
-	lauState->ci = (lauState->ci - oldci) + lauState->base_ci;
-	lauState->end_ci = lauState->base_ci + lauState->size_ci - 1;
-}
-
-void unboxUpVal(lua_State *luaState) {
-	// >>>>> ... func
-	LClosure *lcl;
-	UpVal *uv;
-
-	lcl = (LClosure *)(&getObject(luaState, -1)->value.gc->cl);
-	uv = lcl->upvals[0];
-	lua_pop(luaState, 1);
-	// >>>>> ...
-	pushUpValue(luaState, uv);
-	// >>>>> ... upVal
-}
-
-/* Does basically the opposite of luaC_link().
- * Right now this function is rather inefficient; it requires traversing the
- * entire root GC set in order to find one object. If the GC list were doubly
- * linked this would be much easier, but there's no reason for Lua to have
- * that. */
-static void GCUnlink(lua_State *luaState, GCObject *gco) {
-	GCObject *prevslot;
-	if (G(luaState)->rootgc == gco) {
-		G(luaState)->rootgc = G(luaState)->rootgc->gch.next;
-		return;
-	}
-
-	prevslot = G(luaState)->rootgc;
-	while (prevslot->gch.next != gco) {
-		prevslot = prevslot->gch.next;
-	}
-
-	prevslot->gch.next = prevslot->gch.next->gch.next;
-}
-
 void unserializeThread(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
@@ -619,7 +408,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	// very bottom of the stack
 	L2->top--;
 	for (uint32 i = 0; i < stackSize; ++i) {
-		unserializeObject(info);
+		unserialize(info);
 		// L1: permTbl indexTbl ...... thread obj*
 	}
 
@@ -679,7 +468,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	global_State *g = G(L2);
 
 	while (true) {
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... thread upVal/nil
 
 		// The list is terminated by a nil
@@ -691,7 +480,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 		}
 
 		// >>>>> permTbl indexTbl ...... thread boxedUpVal
-		unboxUpVal(info->luaState);
+		unboxUpValue(info->luaState);
 		// >>>>> permTbl indexTbl ...... thread boxedUpVal
 
 		uv = &(getObject(info->luaState, -1)->value.gc->uv);
@@ -722,48 +511,6 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	}
 }
 
-TString *lua_newlstr(lua_State *luaState, const char *str, size_t len) {
-	lua_pushlstring(luaState, str, len);
-	TString *luaStr = &(luaState->top - 1)->value.gc->ts;
-
-	lua_pop(luaState, 1);
-
-	return luaStr;
-}
-
-void lua_link(lua_State *luaState, GCObject *o, lu_byte tt) {
-	global_State *g = G(luaState);
-	o->gch.next = g->rootgc;
-	g->rootgc = o;
-	o->gch.marked = luaC_white(g);
-	o->gch.tt = tt;
-}
-
-Proto *lua_newproto(lua_State *luaState) {
-	Proto *f = (Proto *)lua_malloc(luaState, sizeof(Proto));
-	lua_link(luaState, obj2gco(f), LUA_TPROTO);
-	f->k = NULL;
-	f->sizek = 0;
-	f->p = NULL;
-	f->sizep = 0;
-	f->code = NULL;
-	f->sizecode = 0;
-	f->sizelineinfo = 0;
-	f->sizeupvalues = 0;
-	f->nups = 0;
-	f->upvalues = NULL;
-	f->numparams = 0;
-	f->is_vararg = 0;
-	f->maxstacksize = 0;
-	f->lineinfo = NULL;
-	f->sizelocvars = 0;
-	f->locvars = NULL;
-	f->linedefined = 0;
-	f->lastlinedefined = 0;
-	f->source = NULL;
-	return f;
-}
-
 void unserializeProto(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
@@ -793,7 +540,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	lua_reallocvector(info->luaState, p->k, 0, sizek, TValue);
 	for (int i = 0; i < sizek; ++i) {
 		// >>>>> permTbl indexTbl ...... proto
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... proto  k
 
 		setobj2s(info->luaState, &p->k[i], getObject(info->luaState, -1));
@@ -810,7 +557,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	lua_reallocvector(info->luaState, p->p, 0, sizep, Proto *);
 	for (int i = 0; i < sizep; ++i) {
 		// >>>>> permTbl indexTbl ...... proto
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... proto  subproto
 
 		p->p[i] = (Proto *)getObject(info->luaState, -1)->value.gc;
@@ -834,7 +581,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 		lua_reallocvector(info->luaState, p->upvalues, 0, p->sizeupvalues, TString *);
 		for (int i = 0; i < p->sizeupvalues; ++i) {
 			// >>>>> permTbl indexTbl ...... proto
-			unserializeObject(info);
+			unserialize(info);
 			// >>>>> permTbl indexTbl ...... proto str
 
 			p->upvalues[i] = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
@@ -850,7 +597,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 		lua_reallocvector(info->luaState, p->locvars, 0, p->sizelocvars, LocVar);
 		for (int i = 0; i < p->sizelocvars; ++i) {
 			// >>>>> permTbl indexTbl ...... proto
-			unserializeObject(info);
+			unserialize(info);
 			// >>>>> permTbl indexTbl ...... proto str
 
 			p->locvars[i].varname = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
@@ -864,7 +611,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... proto
 
 	// Read in source string
-	unserializeObject(info);
+	unserialize(info);
 	// >>>>> permTbl indexTbl ...... proto sourceStr
 
 	p->source = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
@@ -890,75 +637,18 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	p->maxstacksize = info->readStream->readByte();
 }
 
-Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable) {
-	Closure *c = (Closure *)lua_malloc(luaState, sizeLclosure(numElements));
-	lua_link(luaState, obj2gco(c), LUA_TFUNCTION);
-	c->l.isC = 0;
-	c->l.env = elementTable;
-	c->l.nupvalues = cast_byte(numElements);
-
-	while (numElements--) {
-		c->l.upvals[numElements] = NULL;
-	}
-
-	return c;
-}
-
-static UpVal *makeUpVal(lua_State *luaState, int stackPos) {
-	UpVal *uv = lua_new(luaState, UpVal);
-	lua_link(luaState, (GCObject *)uv, LUA_TUPVAL);
-	uv->tt = LUA_TUPVAL;
-	uv->v = &uv->u.value;
-	uv->u.l.prev = NULL;
-	uv->u.l.next = NULL;
-
-	setobj(luaState, uv->v, getObject(luaState, stackPos));
-
-	return uv;
-}
-
-/**
- * The GC is not fond of finding upvalues in tables. We get around this
- * during persistence using a weakly keyed table, so that the GC doesn't
- * bother to mark them. This won't work in unpersisting, however, since
- * if we make the values weak they'll be collected (since nothing else
- * references them). Our solution, during unpersisting, is to represent
- * upvalues as dummy functions, each with one upvalue.
- */
-static void boxupval_start(lua_State *luaState) {
-	LClosure *closure;
-	closure = (LClosure *)lua_newLclosure(luaState, 1, hvalue(&luaState->l_gt));
-	pushClosure(luaState, (Closure *)closure);
-	// >>>>> ...... func
-	closure->p = makeFakeProto(luaState, 1);
-
-	// Temporarily initialize the upvalue to nil
-	lua_pushnil(luaState);
-	closure->upvals[0] = makeUpVal(luaState, -1);
-	lua_pop(luaState, 1);
-}
-
-static void boxupval_finish(lua_State *luaState) {
-	// >>>>> ...... func obj
-	LClosure *lcl = (LClosure *)clvalue(getObject(luaState, -2));
-
-	lcl->upvals[0]->u.value = *getObject(luaState, -1);
-	lua_pop(luaState, 1);
-	// >>>>> ...... func
-}
-
 void unserializeUpValue(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
-	lua_checkstack(upi->L, 2);
+	lua_checkstack(info->luaState, 2);
 
-	boxupval_start(upi->L);
+	boxUpValue_start(info->luaState);
 	// >>>>> permTbl indexTbl ...... func
 	registerObjectInIndexTable(info, index);
 
-	unserializeObject(info);
+	unserialize(info);
 	// >>>>> permTbl indexTbl ...... func obj
 
-	boxupval_finish(upi->L);
+	boxUpValue_finish(info->luaState);
 	// >>>>> permTbl indexTbl ...... func
 }
 
@@ -970,7 +660,7 @@ void unserializeUserData(UnSerializationInfo *info, int index) {
 
 	int isspecial = info->readStream->readSint32LE();
 	if (isspecial) {
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... specialFunc
 
 		lua_call(info->luaState, 0, 1);
@@ -981,12 +671,12 @@ void unserializeUserData(UnSerializationInfo *info, int index) {
 		// >>>>> permTbl indexTbl ...... udata
 		registerObjectInIndexTable(info, index);
 
-		info->readStream->read(lua_touserdata(upi->L, -1), length);
+		info->readStream->read(lua_touserdata(info->luaState, -1), length);
 
-		unserializeObject(info);
+		unserialize(info);
 		// >>>>> permTbl indexTbl ...... udata metaTable/nil
 
-		lua_setmetatable(upi->L, -2);
+		lua_setmetatable(info->luaState, -2);
 		// >>>>> permTbl indexTbl ...... udata
 	}
 	// >>>>> permTbl indexTbl ...... udata
@@ -998,7 +688,7 @@ void unserializePermanent(UnSerializationInfo *info, int index) {
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 2);
 
-	unserializeObject(info);
+	unserialize(info);
 	// >>>>> permTbl indexTbl ...... permKey
 
 	lua_gettable(info->luaState, 1);
-- 
cgit v1.2.3


From 0b8482b55fb38147927d2c27478aae59c0f98dab Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 13:42:02 -0600
Subject: SWORD25: Update module.mk with lua serialization changes

---
 engines/sword25/module.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk
index 234baec165..0135f53783 100644
--- a/engines/sword25/module.mk
+++ b/engines/sword25/module.mk
@@ -82,9 +82,10 @@ MODULE_OBJS := \
 	util/lua/lvm.o \
 	util/lua/lzio.o \
 	util/lua/scummvm_file.o \
-	util/pluto/pdep.o \
-	util/pluto/pluto.o \
-	util/pluto/plzio.o
+	util/double_serializer.o \
+	util/lua_serialization_util.o \
+	util/lua_serializer.o \
+	util/lua_unserializer.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
-- 
cgit v1.2.3


From a188b31d15711bd86725ca4feb0dc36fb2ab71ac Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 13:42:45 -0600
Subject: SWORD25: Use new lua serialization functions to persist state

---
 engines/sword25/kernel/outputpersistenceblock.cpp |  7 +++
 engines/sword25/kernel/outputpersistenceblock.h   |  1 +
 engines/sword25/script/luascript.cpp              | 61 +++++------------------
 3 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/engines/sword25/kernel/outputpersistenceblock.cpp b/engines/sword25/kernel/outputpersistenceblock.cpp
index 9003b5d58a..3e25fce5c7 100644
--- a/engines/sword25/kernel/outputpersistenceblock.cpp
+++ b/engines/sword25/kernel/outputpersistenceblock.cpp
@@ -41,6 +41,13 @@ OutputPersistenceBlock::OutputPersistenceBlock() {
 	_data.reserve(INITIAL_BUFFER_SIZE);
 }
 
+void OutputPersistenceBlock::write(const void *data, uint32 size) {
+	writeMarker(BLOCK_MARKER);
+
+	write(size);
+	rawWrite(data, size);
+}
+
 void OutputPersistenceBlock::write(int32 value) {
 	writeMarker(SINT_MARKER);
 	value = TO_LE_32(value);
diff --git a/engines/sword25/kernel/outputpersistenceblock.h b/engines/sword25/kernel/outputpersistenceblock.h
index c7d8dfc6aa..bdbd20d3e0 100644
--- a/engines/sword25/kernel/outputpersistenceblock.h
+++ b/engines/sword25/kernel/outputpersistenceblock.h
@@ -41,6 +41,7 @@ class OutputPersistenceBlock : public PersistenceBlock {
 public:
 	OutputPersistenceBlock();
 
+	void write(const void *data, uint32 size);
 	void write(int32 value);
 	void write(uint32 value);
 	void write(float value);
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index f62a08005b..6cf287c643 100644
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -29,7 +29,7 @@
  *
  */
 
-#include "common/array.h"
+#include "common/memstream.h"
 #include "common/debug-channels.h"
 
 #include "sword25/sword25.h"
@@ -43,7 +43,7 @@
 #include "sword25/util/lua/lua.h"
 #include "sword25/util/lua/lualib.h"
 #include "sword25/util/lua/lauxlib.h"
-#include "sword25/util/pluto/pluto.h"
+#include "sword25/util/lua_serialization.h"
 
 namespace Sword25 {
 
@@ -112,10 +112,6 @@ bool LuaScriptEngine::init() {
 	// Place the error handler function in the Lua registry, and remember the index
 	_pcallErrorhandlerRegistryIndex = luaL_ref(_state, LUA_REGISTRYINDEX);
 
-	// Initialize the Pluto-Persistence library
-	luaopen_pluto(_state);
-	lua_pop(_state, 1);
-
 	// Initialize debugging callback
 	if (DebugMan.isDebugChannelEnabled(kDebugScript)) {
 		int mask = 0;
@@ -383,19 +379,8 @@ bool pushPermanentsTable(lua_State *L, PERMANENT_TABLE_TYPE tableType) {
 
 	return true;
 }
-}
-
-namespace {
-int chunkwriter(lua_State *L, const void *p, size_t sz, void *ud) {
-	Common::Array<byte> & chunkData = *reinterpret_cast<Common::Array<byte> * >(ud);
-	const byte *buffer = reinterpret_cast<const byte *>(p);
 
-	while (sz--)
-		chunkData.push_back(*buffer++);
-
-	return 1;
-}
-}
+} // End of anonymous namespace
 
 bool LuaScriptEngine::persist(OutputPersistenceBlock &writer) {
 	// Empty the Lua stack. pluto_persist() xepects that the stack is empty except for its parameters
@@ -409,12 +394,12 @@ bool LuaScriptEngine::persist(OutputPersistenceBlock &writer) {
 	pushPermanentsTable(_state, PTT_PERSIST);
 	lua_getglobal(_state, "_G");
 
-	// Lua persists and stores the data in a Common::Array
-	Common::Array<byte> chunkData;
-	pluto_persist(_state, chunkwriter, &chunkData);
+	// Lua persists and stores the data in a WriteStream
+	Common::MemoryWriteStreamDynamic writeStream;
+	Lua::serializeLua(_state, &writeStream);
 
 	// Persistenzdaten in den Writer schreiben.
-	writer.writeByteArray(chunkData);
+	writer.write(writeStream.getData(), writeStream.size());
 
 	// Die beiden Tabellen vom Stack nehmen.
 	lua_pop(_state, 2);
@@ -424,24 +409,6 @@ bool LuaScriptEngine::persist(OutputPersistenceBlock &writer) {
 
 namespace {
 
-struct ChunkreaderData {
-	void   *BufferPtr;
-	size_t  Size;
-	bool    BufferReturned;
-};
-
-const char *chunkreader(lua_State *L, void *ud, size_t *sz) {
-	ChunkreaderData &cd = *reinterpret_cast<ChunkreaderData *>(ud);
-
-	if (!cd.BufferReturned) {
-		cd.BufferReturned = true;
-		*sz = cd.Size;
-		return reinterpret_cast<const char *>(cd.BufferPtr);
-	} else {
-		return 0;
-	}
-}
-
 void clearGlobalTable(lua_State *L, const char **exceptions) {
 	// Iterate over all elements of the global table
 	lua_pushvalue(L, LUA_GLOBALSINDEX);
@@ -479,7 +446,8 @@ void clearGlobalTable(lua_State *L, const char **exceptions) {
 	// Perform garbage collection, so that all removed elements are deleted
 	lua_gc(L, LUA_GCCOLLECT, 0);
 }
-}
+
+} // End of anonymous namespace
 
 bool LuaScriptEngine::unpersist(InputPersistenceBlock &reader) {
 	// Empty the Lua stack. pluto_persist() xepects that the stack is empty except for its parameters
@@ -512,14 +480,9 @@ bool LuaScriptEngine::unpersist(InputPersistenceBlock &reader) {
 	// Persisted Lua data
 	Common::Array<byte> chunkData;
 	reader.readByteArray(chunkData);
+	Common::MemoryReadStream readStream(&chunkData[0], chunkData.size(), DisposeAfterUse::NO);
 
-	// Chunk-Reader initialisation. It is used with pluto_unpersist to restore read data
-	ChunkreaderData cd;
-	cd.BufferPtr = &chunkData[0];
-	cd.Size = chunkData.size();
-	cd.BufferReturned = false;
-
-	pluto_unpersist(_state, chunkreader, &cd);
+	Lua::unserializeLua(_state, &readStream);
 
 	// Permanents-Table is removed from stack
 	lua_remove(_state, -2);
@@ -527,7 +490,7 @@ bool LuaScriptEngine::unpersist(InputPersistenceBlock &reader) {
 	// The read elements in the global table about
 	lua_pushnil(_state);
 	while (lua_next(_state, -2) != 0) {
-		// The referenec to the global table (_G) must not be overwritten, or ticks from Lua total
+		// The reference to the global table (_G) must not be overwritten, or ticks from Lua total
 		bool isGlobalReference = lua_isstring(_state, -2) && strcmp(lua_tostring(_state, -2), "_G") == 0;
 		if (!isGlobalReference) {
 			lua_pushvalue(_state, -2);
-- 
cgit v1.2.3


From 97c35714ce3986b99848a780f6b195a63f8910b7 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 15:19:29 -0600
Subject: SWORD25: Rename lua serialization functions to use 'persist' in order
 to match the rest of the engine

---
 engines/sword25/module.mk                       |   6 +-
 engines/sword25/script/luascript.cpp            |   6 +-
 engines/sword25/util/lua_persist.cpp            | 787 ++++++++++++++++++++++++
 engines/sword25/util/lua_persistence.h          |  44 ++
 engines/sword25/util/lua_persistence_util.cpp   | 346 +++++++++++
 engines/sword25/util/lua_persistence_util.h     |  98 +++
 engines/sword25/util/lua_serialization.h        |  44 --
 engines/sword25/util/lua_serialization_util.cpp | 346 -----------
 engines/sword25/util/lua_serialization_util.h   |  98 ---
 engines/sword25/util/lua_serializer.cpp         | 787 ------------------------
 engines/sword25/util/lua_unpersist.cpp          | 698 +++++++++++++++++++++
 engines/sword25/util/lua_unserializer.cpp       | 698 ---------------------
 12 files changed, 1979 insertions(+), 1979 deletions(-)
 create mode 100644 engines/sword25/util/lua_persist.cpp
 create mode 100644 engines/sword25/util/lua_persistence.h
 create mode 100644 engines/sword25/util/lua_persistence_util.cpp
 create mode 100644 engines/sword25/util/lua_persistence_util.h
 delete mode 100644 engines/sword25/util/lua_serialization.h
 delete mode 100644 engines/sword25/util/lua_serialization_util.cpp
 delete mode 100644 engines/sword25/util/lua_serialization_util.h
 delete mode 100644 engines/sword25/util/lua_serializer.cpp
 create mode 100644 engines/sword25/util/lua_unpersist.cpp
 delete mode 100644 engines/sword25/util/lua_unserializer.cpp

diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk
index 0135f53783..129b4f040e 100644
--- a/engines/sword25/module.mk
+++ b/engines/sword25/module.mk
@@ -83,9 +83,9 @@ MODULE_OBJS := \
 	util/lua/lzio.o \
 	util/lua/scummvm_file.o \
 	util/double_serializer.o \
-	util/lua_serialization_util.o \
-	util/lua_serializer.o \
-	util/lua_unserializer.o
+	util/lua_persistence_util.o \
+	util/lua_persist.o \
+	util/lua_unpersist.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index 6cf287c643..e93289596b 100644
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -43,7 +43,7 @@
 #include "sword25/util/lua/lua.h"
 #include "sword25/util/lua/lualib.h"
 #include "sword25/util/lua/lauxlib.h"
-#include "sword25/util/lua_serialization.h"
+#include "sword25/util/lua_persistence.h"
 
 namespace Sword25 {
 
@@ -396,7 +396,7 @@ bool LuaScriptEngine::persist(OutputPersistenceBlock &writer) {
 
 	// Lua persists and stores the data in a WriteStream
 	Common::MemoryWriteStreamDynamic writeStream;
-	Lua::serializeLua(_state, &writeStream);
+	Lua::persistLua(_state, &writeStream);
 
 	// Persistenzdaten in den Writer schreiben.
 	writer.write(writeStream.getData(), writeStream.size());
@@ -482,7 +482,7 @@ bool LuaScriptEngine::unpersist(InputPersistenceBlock &reader) {
 	reader.readByteArray(chunkData);
 	Common::MemoryReadStream readStream(&chunkData[0], chunkData.size(), DisposeAfterUse::NO);
 
-	Lua::unserializeLua(_state, &readStream);
+	Lua::unpersistLua(_state, &readStream);
 
 	// Permanents-Table is removed from stack
 	lua_remove(_state, -2);
diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
new file mode 100644
index 0000000000..b9c0b13e11
--- /dev/null
+++ b/engines/sword25/util/lua_persist.cpp
@@ -0,0 +1,787 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/lua_persistence.h"
+
+#include "sword25/util/double_serializer.h"
+#include "sword25/util/lua_persistence_util.h"
+
+#include "common/stream.h"
+
+#include "lua/lobject.h"
+#include "lua/lstate.h"
+#include "lua/lgc.h"
+
+
+namespace Lua {
+
+#define PERMANENT_TYPE 101
+
+struct SerializationInfo {
+	lua_State *luaState;
+	Common::WriteStream *writeStream;
+	uint counter;
+};
+
+static void serialize(SerializationInfo *info);
+
+static void serializeBoolean(SerializationInfo *info);
+static void serializeNumber(SerializationInfo *info);
+static void serializeString(SerializationInfo *info);
+static void serializeTable(SerializationInfo *info);
+static void serializeFunction(SerializationInfo *info);
+static void serializeThread(SerializationInfo *info);
+static void serializeProto(SerializationInfo *info);
+static void serializeUpValue(SerializationInfo *info);
+static void serializeUserData(SerializationInfo *info);
+
+
+void persistLua(lua_State *luaState, Common::WriteStream *writeStream) {
+	SerializationInfo info;
+	info.luaState = luaState;
+	info.writeStream = writeStream;
+	info.counter = 0u;
+
+	// The process starts with the lua stack as follows:
+	// >>>>> permTbl rootObj
+	// That's the table of permanents and the root object to be serialized
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(luaState, 4);
+	assert(lua_gettop(luaState) == 2);
+	// And that the root isn't nil
+	assert(!lua_isnil(luaState, 2));
+
+	// Create a table to hold indexes of everything that's serialized
+	// This allows us to only serialize an object once
+	// Every other time, just reference the index
+	lua_newtable(luaState);
+	// >>>>> permTbl rootObj indexTbl
+
+	// Now we're going to make the table weakly keyed. This prevents the
+	// GC from visiting it and trying to mark things it doesn't want to
+	// mark in tables, e.g. upvalues. All objects in the table are
+	// a priori reachable, so it doesn't matter that we do this.
+
+	// Create the metatable
+	lua_newtable(luaState);
+	// >>>>> permTbl rootObj indexTbl metaTbl
+
+	lua_pushstring(luaState, "__mode");
+	// >>>>> permTbl rootObj indexTbl metaTbl "__mode"
+
+	lua_pushstring(luaState, "k");
+	// >>>>> permTbl rootObj indexTbl metaTbl "__mode" "k"
+
+	lua_settable(luaState, 4);
+	// >>>>> permTbl rootObj indexTbl metaTbl
+
+	lua_setmetatable(luaState, 3);
+	// >>>>> permTbl rootObj indexTbl
+
+	// Swap the indexTable and the rootObj
+	lua_insert(luaState, 2);
+	// >>>>> permTbl indexTbl rootObj
+
+	// Serialize the root recursively
+	serialize(&info);
+
+	// Return the stack back to the original state
+	lua_remove(luaState, 2);
+	// >>>>> permTbl rootObj
+}
+
+static void serialize(SerializationInfo *info) {
+	// The stack can potentially have many things on it
+	// The object we want to serialize is the item on the top of the stack
+	// >>>>> permTbl indexTbl rootObj ...... obj
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	// If the object has already been written, don't write it again
+	// Instead write the index of the object from the indexTbl
+
+	// Check the indexTbl
+	lua_pushvalue(info->luaState, -1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj
+
+	lua_rawget(info->luaState, 2);
+	// >>>>> permTbl indexTbl rootObj ...... obj ?index?
+
+	// If the index isn't nil, the object has already been written
+	if (!lua_isnil(info->luaState, -1)) {
+		// Write out a flag that indicates that it's an index
+		info->writeStream->writeByte(0);
+
+		// Retrieve the index from the stack
+		uint *index = (uint *)lua_touserdata(info->luaState, -1);
+
+		// Write out the index
+		info->writeStream->writeUint32LE(*index);
+
+		// Pop the index off the stack
+		lua_pop(info->luaState, 1);
+
+		return;
+	}
+
+	// Pop the nil off the stack
+	lua_pop(info->luaState, 1);
+
+	// Write out a flag that indicates that this is a real object
+	info->writeStream->writeByte(1);
+
+	// If the object itself is nil, then write out a zero as a placeholder
+	if (lua_isnil(info->luaState, -1)) {
+		info->writeStream->writeByte(0);
+
+		return;
+	}
+
+	// Add the object to the indexTbl
+
+	lua_pushvalue(info->luaState, -1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj
+
+	uint *ref = (uint *)lua_newuserdata(info->luaState, sizeof(uint));
+	*ref = ++(info->counter);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj index
+
+	lua_rawset(info->luaState, 2);
+	// >>>>> permTbl indexTbl rootObj ...... obj
+
+
+	// Write out the index
+	info->writeStream->writeUint32LE(info->counter);
+
+
+	// Objects that are in the permanents table are serialized in a special way
+
+	lua_pushvalue(info->luaState, -1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj
+
+	lua_gettable(info->luaState, 1);
+	// >>>>> permTbl indexTbl rootObj ...... obj obj ?permKey?
+
+	if (!lua_isnil(info->luaState, -1)) {
+		// Write out the type
+		info->writeStream->writeSint32LE(PERMANENT_TYPE);
+
+		// Serialize the key
+		serialize(info);
+
+		// Pop the key off the stack
+		lua_pop(info->luaState, 1);
+
+		return;
+	}
+
+	// Pop the nil off the stack
+	lua_pop(info->luaState, 1);
+
+	// Query the type of the object
+	int objType = lua_type(info->luaState, -1);
+
+	// Write it out
+	info->writeStream->writeSint32LE(objType);
+
+	// Serialize the object by its type
+
+	switch (objType) {
+	case LUA_TBOOLEAN:
+		serializeBoolean(info);
+		break;
+	case LUA_TLIGHTUSERDATA:
+		// You can't serialize a pointer
+		// It would be meaningless on the next run
+		assert(0);
+		break;
+	case LUA_TNUMBER:
+		serializeNumber(info);
+		break;
+	case LUA_TSTRING:
+		serializeString(info);
+		break;
+	case LUA_TTABLE:
+		serializeTable(info);
+		break;
+	case LUA_TFUNCTION:
+		serializeFunction(info);
+		break;
+	case LUA_TTHREAD:
+		serializeThread(info);
+		break;
+	case LUA_TPROTO:
+		serializeProto(info);
+		break;
+	case LUA_TUPVAL:
+		serializeUpValue(info);
+		break;
+	case LUA_TUSERDATA:
+		serializeUserData(info);
+		break;
+	default:
+		assert(0);
+	}
+}
+
+static void serializeBoolean(SerializationInfo *info) {
+	int value = lua_toboolean(info->luaState, -1);
+
+	info->writeStream->writeSint32LE(value);
+}
+
+static void serializeNumber(SerializationInfo *info) {
+	lua_Number value = lua_tonumber(info->luaState, -1);
+
+	#if 1
+		Util::SerializedDouble serializedValue(Util::encodeDouble(value));
+
+		info->writeStream->writeUint32LE(serializedValue.significandOne);
+		info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
+		info->writeStream->writeSint16LE(serializedValue.exponent);
+	#else
+		// NOTE: We need to store a double. Unfortunately, we have to accommodate endianness.
+		// Also, I don't know if we can assume all compilers use IEEE double
+		// Therefore, I have chosen to store the double as a string.
+		Common::String buffer = Common::String::format("%f", value);
+
+		info->writeStream->write(buffer.c_str(), buffer.size());
+	#endif
+
+}
+
+static void serializeString(SerializationInfo *info) {
+	// Hard cast to a uint32 to force size_t to an explicit size
+	// *Theoretically* this could truncate, but if we have a 4gb string, we have bigger problems
+	uint32 length = static_cast<uint32>(lua_strlen(info->luaState, -1));
+	info->writeStream->writeUint32LE(length);
+
+	const char *str = lua_tostring(info->luaState, -1);
+	info->writeStream->write(str, length);
+}
+
+/* Choose whether to do a regular or special persistence based on an object's
+ * metatable. "default" is whether the object, if it doesn't have a __persist
+ * entry, is literally persistable or not.
+ * Pushes the unpersist closure and returns true if special persistence is
+ * used. */
+static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 4);
+
+	// Check whether we should persist literally, or via the __persist metafunction
+	if (!lua_getmetatable(info->luaState, -1)) {
+		if (defaction) {
+			// Write out a flag declaring that the object isn't special and should be persisted normally
+			info->writeStream->writeSint32LE(0);
+
+			return false;
+		} else {
+			lua_pushstring(info->luaState, "Type not literally persistable by default");
+			lua_error(info->luaState);
+
+			return false; // Not reached
+		}
+	}
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl
+	lua_pushstring(info->luaState, "__persist");
+	// >>>>> permTbl indexTbl rootObj ...... obj metaTbl "__persist"
+
+	lua_rawget(info->luaState, -2);
+	// >>>>> permTbl indexTbl ...... obj metaTbl ?__persist?
+
+	if (lua_isnil(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... obj metaTbl nil
+		lua_pop(info->luaState, 2);
+		// >>>>> permTbl indexTbl ...... obj
+
+		if (defaction) {
+			// Write out a flag declaring that the object isn't special and should be persisted normally
+			info->writeStream->writeSint32LE(0);
+
+			return false;
+		} else {
+			lua_pushstring(info->luaState, "Type not literally persistable by default");
+			lua_error(info->luaState);
+
+			return false; // Return false
+		}
+
+	} else if (lua_isboolean(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... obj metaTbl bool
+		if (lua_toboolean(info->luaState, -1)) {
+			// Write out a flag declaring that the object isn't special and should be persisted normally
+			info->writeStream->writeSint32LE(0);
+
+			// >>>>> permTbl indexTbl ...... obj metaTbl true */
+			lua_pop(info->luaState, 2);
+			// >>>>> permTbl indexTbl ...... obj
+
+			return false;
+		} else {
+			lua_pushstring(info->luaState, "Metatable forbade persistence");
+			lua_error(info->luaState);
+
+			return false; // Not reached
+		}
+	} else if (!lua_isfunction(info->luaState, -1)) {
+		lua_pushstring(info->luaState, "__persist not nil, boolean, or function");
+		lua_error(info->luaState);
+	}
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl __persist
+	lua_pushvalue(info->luaState, -3);
+	// >>>>> permTbl indexTbl ...... obj metaTbl __persist obj
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl ?func?
+
+	if (!lua_isfunction(info->luaState, -1)) {
+		lua_pushstring(info->luaState, "__persist function did not return a function");
+		lua_error(info->luaState);
+	}
+
+	// >>>>> permTbl indexTbl ...... obj metaTbl func
+
+	// Write out a flag that the function exists
+	info->writeStream->writeSint32LE(1);
+
+	// Serialize the function
+	serialize(info);
+
+	lua_pop(info->luaState, 2);
+	// >>>>> permTbl indexTbl ...... obj
+
+	return true;
+}
+
+static void serializeTable(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 3);
+
+	// Test if the object needs special serialization
+	if (serializeSpecialObject(info, 1)) {
+		return;
+	}
+
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// First, serialize the metatable (if any)
+	if (!lua_getmetatable(info->luaState, -1)) {
+		lua_pushnil(info->luaState);
+	}
+
+	// >>>>> permTbl indexTbl ...... tbl metaTbl/nil */
+	serialize(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... tbl
+
+
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... tbl nil
+
+	// Now, persist all k/v pairs
+	while (lua_next(info->luaState, -2)) {
+		// >>>>> permTbl indexTbl ...... tbl k v */
+
+		lua_pushvalue(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... tbl k v k */
+
+		// Serialize the key
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... tbl k v */
+
+		// Serialize the value
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... tbl k */
+	}
+
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// Terminate the list with a nil
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... tbl
+
+	serialize(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... tbl
+}
+
+static void serializeFunction(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... func
+	Closure *cl = clvalue(getObject(info->luaState, -1));
+	lua_checkstack(info->luaState, 2);
+
+	if (cl->c.isC) {
+		/* It's a C function. For now, we aren't going to allow
+		 * persistence of C closures, even if the "C proto" is
+		 * already in the permanents table. */
+		lua_pushstring(info->luaState, "Attempt to persist a C function");
+		lua_error(info->luaState);
+	} else {
+		// It's a Lua closure
+
+		// We don't really _NEED_ the number of upvals, but it'll simplify things a bit
+		info->writeStream->writeByte(cl->l.p->nups);
+
+		// Serialize the prototype
+		pushProto(info->luaState, cl->l.p);
+		// >>>>> permTbl indexTbl ...... func proto */
+
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+
+		// Serialize upvalue values (not the upvalue objects themselves)
+		for (byte i = 0; i < cl->l.p->nups; i++) {
+			// >>>>> permTbl indexTbl ...... func
+			pushUpValue(info->luaState, cl->l.upvals[i]);
+			// >>>>> permTbl indexTbl ...... func upval
+
+			serialize(info);
+
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... func
+		}
+
+		// >>>>> permTbl indexTbl ...... func
+
+		// Serialize function environment
+		lua_getfenv(info->luaState, -1);
+		// >>>>> permTbl indexTbl ...... func fenv
+
+		if (lua_equal(info->luaState, -1, LUA_GLOBALSINDEX)) {
+			// Function has the default fenv
+
+			// >>>>> permTbl indexTbl ...... func _G
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... func
+
+			lua_pushnil(info->luaState);
+			// >>>>> permTbl indexTbl ...... func nil
+		}
+
+		// >>>>> permTbl indexTbl ...... func fenv/nil
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+	}
+}
+
+static void serializeThread(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... thread
+	lua_State *threadState = lua_tothread(info->luaState, -1);
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, threadState->top - threadState->stack + 1);
+
+	if (info->luaState == threadState) {
+		lua_pushstring(info->luaState, "Can't persist currently running thread");
+		lua_error(info->luaState);
+		return; /* not reached */
+	}
+
+	// Persist the stack
+
+	// We *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
+	uint32 stackSize = static_cast<uint32>(appendStackToStack_reverse(threadState, info->luaState));
+	info->writeStream->writeUint32LE(stackSize);
+
+	// >>>>> permTbl indexTbl ...... thread (reversed contents of thread stack) */
+	for (; stackSize > 0; --stackSize) {
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+	}
+
+	// >>>>> permTbl indexTbl ...... thread
+
+	// Now, serialize the CallInfo stack
+
+	// Again, we *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
+	uint32 numFrames = static_cast<uint32>((threadState->ci - threadState->base_ci) + 1);
+	info->writeStream->writeUint32LE(numFrames);
+
+	for (uint32 i = 0; i < numFrames; i++) {
+		CallInfo *ci = threadState->base_ci + i;
+
+		// Same argument as above about truncation
+		uint32 stackBase = static_cast<uint32>(ci->base - threadState->stack);
+		uint32 stackFunc = static_cast<uint32>(ci->func - threadState->stack);
+		uint32 stackTop = static_cast<uint32>(ci->top - threadState->stack);
+
+		info->writeStream->writeUint32LE(stackBase);
+		info->writeStream->writeUint32LE(stackFunc);
+		info->writeStream->writeUint32LE(stackTop);
+
+		info->writeStream->writeSint32LE(ci->nresults);
+
+		uint32 savedpc = (ci != threadState->base_ci) ? static_cast<uint32>(ci->savedpc - ci_func(ci)->l.p->code) : 0u;
+		info->writeStream->writeUint32LE(savedpc);
+	}
+
+
+	// Serialize the state's other parameters, with the exception of upval stuff
+
+	assert(threadState->nCcalls <= 1);
+	info->writeStream->writeByte(threadState->status);
+
+	// Same argument as above about truncation
+	uint32 stackBase = static_cast<uint32>(threadState->base - threadState->stack);
+	uint32 stackFunc = static_cast<uint32>(threadState->top - threadState->stack);
+	info->writeStream->writeUint32LE(stackBase);
+	info->writeStream->writeUint32LE(stackFunc);
+
+	// Same argument as above about truncation
+	uint32 stackOffset = static_cast<uint32>(threadState->errfunc);
+	info->writeStream->writeUint32LE(stackOffset);
+
+	// Finally, record upvalues which need to be reopened
+	// See the comment above serializeUpVal() for why we do this
+
+	UpVal *upVal;
+
+	// >>>>> permTbl indexTbl ...... thread
+	for (GCObject *gcObject = threadState->openupval; gcObject != NULL; gcObject = upVal->next) {
+		upVal = gco2uv(gcObject);
+
+		/* Make sure upvalue is really open */
+		assert(upVal->v != &upVal->u.value);
+
+		pushUpValue(info->luaState, upVal);
+		// >>>>> permTbl indexTbl ...... thread upVal
+
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... thread
+
+		// Same argument as above about truncation
+		uint32 stackpos = static_cast<uint32>(upVal->v - threadState->stack);
+		info->writeStream->writeUint32LE(stackpos);
+	}
+
+	// >>>>> permTbl indexTbl ...... thread
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... thread nil
+
+	// Use nil as a terminator
+	serialize(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... thread
+}
+
+static void serializeProto(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... proto
+	Proto *proto = gco2p(getObject(info->luaState, -1)->value.gc);
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	// Serialize constant refs */
+	info->writeStream->writeSint32LE(proto->sizek);
+
+	for (int i = 0; i < proto->sizek; ++i) {
+		pushObject(info->luaState, &proto->k[i]);
+		// >>>>> permTbl indexTbl ...... proto const
+
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Serialize inner Proto refs
+	info->writeStream->writeSint32LE(proto->sizep);
+
+	for (int i = 0; i < proto->sizep; ++i)
+	{
+		pushProto(info->luaState, proto->p[i]);
+		// >>>>> permTbl indexTbl ...... proto subProto */
+
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Serialize the code
+	info->writeStream->writeSint32LE(proto->sizecode);
+
+	uint32 len = static_cast<uint32>(sizeof(Instruction) * proto->sizecode);
+	info->writeStream->write(proto->code, len);
+
+
+	// Serialize upvalue names
+	info->writeStream->writeSint32LE(proto->sizeupvalues);
+
+	for (int i = 0; i < proto->sizeupvalues; ++i)
+	{
+		pushString(info->luaState, proto->upvalues[i]);
+		// >>>>> permTbl indexTbl ...... proto str
+
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+
+
+	// Serialize local variable infos
+	info->writeStream->writeSint32LE(proto->sizelocvars);
+
+	for (int i = 0; i < proto->sizelocvars; ++i) {
+		pushString(info->luaState, proto->locvars[i].varname);
+		// >>>>> permTbl indexTbl ...... proto str
+
+		serialize(info);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+
+		info->writeStream->writeSint32LE(proto->locvars[i].startpc);
+		info->writeStream->writeSint32LE(proto->locvars[i].endpc);
+	}
+
+
+	// Serialize source string
+	pushString(info->luaState, proto->source);
+	// >>>>> permTbl indexTbl ...... proto sourceStr
+
+	serialize(info);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Serialize line numbers
+	info->writeStream->writeSint32LE(proto->sizelineinfo);
+
+	if (proto->sizelineinfo) {
+		uint32 len = static_cast<uint32>(sizeof(int) * proto->sizelineinfo);
+		info->writeStream->write(proto->lineinfo, len);
+	}
+
+	// Serialize linedefined and lastlinedefined
+	info->writeStream->writeSint32LE(proto->linedefined);
+	info->writeStream->writeSint32LE(proto->lastlinedefined);
+
+
+	// Serialize misc values
+	info->writeStream->writeByte(proto->nups);
+	info->writeStream->writeByte(proto->numparams);
+	info->writeStream->writeByte(proto->is_vararg);
+	info->writeStream->writeByte(proto->maxstacksize);
+}
+
+/* Upvalues are tricky. Here's why.
+ *
+ * A particular upvalue may be either "open", in which case its member v
+ * points into a thread's stack, or "closed" in which case it points to the
+ * upvalue itself. An upvalue is closed under any of the following conditions:
+ * -- The function that initially declared the variable "local" returns
+ * -- The thread in which the closure was created is garbage collected
+ *
+ * To make things wackier, just because a thread is reachable by Lua doesn't
+ * mean it's in our root set. We need to be able to treat an open upvalue
+ * from an unreachable thread as a closed upvalue.
+ *
+ * The solution:
+ * (a) For the purposes of serializing, don't indicate whether an upvalue is
+ *     closed or not.
+ * (b) When unserializing, pretend that all upvalues are closed.
+ * (c) When serializing, persist all open upvalues referenced by a thread
+ *     that is persisted, and tag each one with the corresponding stack position
+ * (d) When unserializing, "reopen" each of these upvalues as the thread is
+ *     unserialized
+ */
+static void serializeUpValue(SerializationInfo *info) {
+	// >>>>> permTbl indexTbl ...... upval
+	assert(ttype(getObject(info->luaState, -1)) == LUA_TUPVAL);
+	UpVal *upValue = gco2uv(getObject(info->luaState, -1)->value.gc);
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	// We can't permit the upValue to linger around on the stack, as Lua
+	// will bail if its GC finds it.
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ......
+
+	pushObject(info->luaState, upValue->v);
+	// >>>>> permTbl indexTbl ...... obj
+
+	serialize(info);
+	// >>>>> permTbl indexTbl ...... obj
+}
+
+static void serializeUserData(SerializationInfo *info) {
+	// >>>>> permTbl rootObj ...... udata
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	// Test if the object needs special serialization
+	if (serializeSpecialObject(info, 0)) {
+		return;
+	}
+
+	// Use literal persistence
+
+	// Hard cast to a uint32 length
+	// This could lead to truncation, but if we have a 4gb block of data, we have bigger problems
+	uint32 length = static_cast<uint32>(uvalue(getObject(info->luaState, -1))->len);
+	info->writeStream->writeUint32LE(length);
+
+	info->writeStream->write(lua_touserdata(info->luaState, -1), length);
+
+	// Serialize the metatable (if any)
+	if (!lua_getmetatable(info->luaState, -1)) {
+		lua_pushnil(info->luaState);
+	}
+
+	// >>>>> permTbl rootObj ...... udata metaTbl/nil
+	serialize(info);
+
+	lua_pop(info->luaState, 1);
+	/* perms reftbl ... udata */
+}
+
+
+} // End of namespace Lua
diff --git a/engines/sword25/util/lua_persistence.h b/engines/sword25/util/lua_persistence.h
new file mode 100644
index 0000000000..cf7d7e03ca
--- /dev/null
+++ b/engines/sword25/util/lua_persistence.h
@@ -0,0 +1,44 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef LUA_SERIALIZATION_H
+#define LUA_SERIALIZATION_H
+
+#include "sword25/util/lua/lua.h"
+
+
+namespace Common {
+class WriteStream;
+class ReadStream;
+}
+
+
+namespace Lua {
+
+#define PERMANENT_TYPE 101
+
+void persistLua(lua_State *luaState, Common::WriteStream *writeStream);
+void unpersistLua(lua_State *luaState, Common::ReadStream *readStream);
+
+} // End of namespace Lua
+
+#endif
diff --git a/engines/sword25/util/lua_persistence_util.cpp b/engines/sword25/util/lua_persistence_util.cpp
new file mode 100644
index 0000000000..8365f5d483
--- /dev/null
+++ b/engines/sword25/util/lua_persistence_util.cpp
@@ -0,0 +1,346 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distri8buted in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/lua_persistence_util.h"
+
+#include "common/scummsys.h"
+
+#include "lua/lobject.h"
+#include "lua/lstate.h"
+#include "lua/lgc.h"
+#include "lua/lopcodes.h"
+
+
+namespace Lua {
+
+void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize) {
+	global_State *globalState = G(luaState);
+
+	block = (*globalState->frealloc)(globalState->ud, block, osize, nsize);
+	globalState->totalbytes = (globalState->totalbytes - osize) + nsize;
+
+	return block;
+}
+
+void pushObject(lua_State *luaState, TValue *obj) {
+	setobj2s(luaState, luaState->top, obj);
+
+	api_check(luaState, luaState->top < luaState->ci->top);
+	luaState->top++;
+}
+
+void pushProto(lua_State *luaState, Proto *proto) {
+	TValue obj;
+	setptvalue(luaState, &obj, proto);
+
+	pushObject(luaState, &obj);
+}
+
+void pushUpValue(lua_State *luaState, UpVal *upval) {
+	TValue obj;
+
+	obj.value.gc = cast(GCObject *, upval);
+	obj.tt = LUA_TUPVAL;
+	checkliveness(G(L), obj);
+
+	pushObject(luaState, &obj);
+}
+
+void pushString(lua_State *luaState, TString *str) {
+	TValue o;
+	setsvalue(luaState, &o, str);
+
+	pushObject(luaState, &o);
+}
+
+/* A simple reimplementation of the unfortunately static function luaA_index.
+ * Does not support the global table, registry, or upvalues. */
+StkId getObject(lua_State *luaState, int stackpos) {
+	if (stackpos > 0) {
+		lua_assert(luaState->base + stackpos - 1 < luaState->top);
+		return luaState->base + stackpos - 1;
+	} else {
+		lua_assert(L->top - stackpos >= L->base);
+		return luaState->top + stackpos;
+	}
+}
+
+void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type) {
+	global_State *globalState = G(luaState);
+
+	obj->gch.next = globalState->rootgc;
+	globalState->rootgc = obj;
+	obj->gch.marked = luaC_white(globalState);
+	obj->gch.tt = type;
+}
+
+Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable) {
+	Closure *c = (Closure *)lua_malloc(luaState, sizeLclosure(numElements));
+	lua_linkObjToGC(luaState, obj2gco(c), LUA_TFUNCTION);
+
+	c->l.isC = 0;
+	c->l.env = elementTable;
+	c->l.nupvalues = cast_byte(numElements);
+
+	while (numElements--) {
+		c->l.upvals[numElements] = NULL;
+	}
+
+	return c;
+}
+
+void pushClosure(lua_State *luaState, Closure *closure) {
+	TValue obj;
+	setclvalue(luaState, &obj, closure);
+	pushObject(luaState, &obj);
+}
+
+Proto *createProto(lua_State *luaState) {
+	Proto *newProto = (Proto *)lua_malloc(luaState, sizeof(Proto));
+	lua_linkObjToGC(luaState, obj2gco(newProto), LUA_TPROTO);
+
+	newProto->k = NULL;
+	newProto->sizek = 0;
+	newProto->p = NULL;
+	newProto->sizep = 0;
+	newProto->code = NULL;
+	newProto->sizecode = 0;
+	newProto->sizelineinfo = 0;
+	newProto->sizeupvalues = 0;
+	newProto->nups = 0;
+	newProto->upvalues = NULL;
+	newProto->numparams = 0;
+	newProto->is_vararg = 0;
+	newProto->maxstacksize = 0;
+	newProto->lineinfo = NULL;
+	newProto->sizelocvars = 0;
+	newProto->locvars = NULL;
+	newProto->linedefined = 0;
+	newProto->lastlinedefined = 0;
+	newProto->source = NULL;
+
+	return newProto;
+}
+
+TString *createString(lua_State *luaState, const char *str, size_t len) {
+	TString *res;
+	lua_pushlstring(luaState, str, len);
+
+	res = rawtsvalue(luaState->top - 1);
+	lua_pop(luaState, 1);
+
+	return res;
+}
+
+Proto *makeFakeProto(lua_State *L, lu_byte nups) {
+	Proto *p = createProto(L);
+
+	p->sizelineinfo = 1;
+	p->lineinfo = lua_newVector(L, 1, int);
+	p->lineinfo[0] = 1;
+	p->sizecode = 1;
+	p->code = lua_newVector(L, 1, Instruction);
+	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
+	p->source = createString(L, "", 0);
+	p->maxstacksize = 2;
+	p->nups = nups;
+	p->sizek = 0;
+	p->sizep = 0;
+
+	return p;
+}
+
+UpVal *createUpValue(lua_State *luaState, int stackpos) {
+	UpVal *upValue = (UpVal *)lua_malloc(luaState, sizeof(UpVal));
+	lua_linkObjToGC(luaState, (GCObject *)upValue, LUA_TUPVAL);
+	upValue->tt = LUA_TUPVAL;
+	upValue->v = &upValue->u.value;
+	upValue->u.l.prev = NULL;
+	upValue->u.l.next = NULL;
+
+	const TValue *o2 = (TValue *)getObject(luaState, stackpos);
+	upValue->v->value = o2->value;
+	upValue->v->tt = o2->tt;
+	checkliveness(G(L), upValue->v);
+
+	return upValue;
+}
+
+void unboxUpValue(lua_State *luaState) {
+	// >>>>> ...... func
+	LClosure *lcl;
+	UpVal *uv;
+
+	lcl = (LClosure *)clvalue(getObject(luaState, -1));
+	uv = lcl->upvals[0];
+
+	lua_pop(luaState, 1);
+	// >>>>> ......
+
+	pushUpValue(luaState, uv);
+	// >>>>> ...... upValue
+}
+
+size_t appendStackToStack_reverse(lua_State *from, lua_State *to) {
+	for (StkId id = from->top - 1; id >= from->stack; --id) {
+		setobj2s(to, to->top, id);
+		to->top++;
+	}
+
+	return from->top - from->stack;
+}
+
+void correctStack(lua_State *L, TValue *oldstack) {
+	CallInfo *ci;
+	GCObject *up;
+	L->top = (L->top - oldstack) + L->stack;
+	for (up = L->openupval; up != NULL; up = up->gch.next)
+		gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
+	for (ci = L->base_ci; ci <= L->ci; ci++) {
+		ci->top = (ci->top - oldstack) + L->stack;
+		ci->base = (ci->base - oldstack) + L->stack;
+		ci->func = (ci->func - oldstack) + L->stack;
+	}
+	L->base = (L->base - oldstack) + L->stack;
+}
+
+void lua_reallocstack(lua_State *L, int newsize) {
+	TValue *oldstack = L->stack;
+	int realsize = newsize + 1 + EXTRA_STACK;
+
+	lua_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
+	L->stacksize = realsize;
+	L->stack_last = L->stack + newsize;
+	correctStack(L, oldstack);
+}
+
+void lua_growstack(lua_State *L, int n) {
+	// Double size is enough?
+	if (n <= L->stacksize) {
+		lua_reallocstack(L, 2 * L->stacksize);
+	} else {
+		lua_reallocstack(L, L->stacksize + n);
+	}
+}
+
+void lua_reallocCallInfo(lua_State *lauState, int newsize) {
+	CallInfo *oldci = lauState->base_ci;
+	lua_reallocvector(lauState, lauState->base_ci, lauState->size_ci, newsize, CallInfo);
+
+	lauState->size_ci = newsize;
+	lauState->ci = (lauState->ci - oldci) + lauState->base_ci;
+	lauState->end_ci = lauState->base_ci + lauState->size_ci - 1;
+}
+
+void GCUnlink(lua_State *luaState, GCObject *gco) {
+	GCObject *prevslot;
+	if (G(luaState)->rootgc == gco) {
+		G(luaState)->rootgc = G(luaState)->rootgc->gch.next;
+		return;
+	}
+
+	prevslot = G(luaState)->rootgc;
+	while (prevslot->gch.next != gco) {
+		prevslot = prevslot->gch.next;
+	}
+
+	prevslot->gch.next = prevslot->gch.next->gch.next;
+}
+
+TString *lua_newlstr(lua_State *luaState, const char *str, size_t len) {
+	lua_pushlstring(luaState, str, len);
+	TString *luaStr = &(luaState->top - 1)->value.gc->ts;
+
+	lua_pop(luaState, 1);
+
+	return luaStr;
+}
+
+void lua_link(lua_State *luaState, GCObject *o, lu_byte tt) {
+	global_State *g = G(luaState);
+	o->gch.next = g->rootgc;
+	g->rootgc = o;
+	o->gch.marked = luaC_white(g);
+	o->gch.tt = tt;
+}
+
+Proto *lua_newproto(lua_State *luaState) {
+	Proto *f = (Proto *)lua_malloc(luaState, sizeof(Proto));
+	lua_link(luaState, obj2gco(f), LUA_TPROTO);
+	f->k = NULL;
+	f->sizek = 0;
+	f->p = NULL;
+	f->sizep = 0;
+	f->code = NULL;
+	f->sizecode = 0;
+	f->sizelineinfo = 0;
+	f->sizeupvalues = 0;
+	f->nups = 0;
+	f->upvalues = NULL;
+	f->numparams = 0;
+	f->is_vararg = 0;
+	f->maxstacksize = 0;
+	f->lineinfo = NULL;
+	f->sizelocvars = 0;
+	f->locvars = NULL;
+	f->linedefined = 0;
+	f->lastlinedefined = 0;
+	f->source = NULL;
+	return f;
+}
+
+UpVal *makeUpValue(lua_State *luaState, int stackPos) {
+	UpVal *uv = lua_new(luaState, UpVal);
+	lua_link(luaState, (GCObject *)uv, LUA_TUPVAL);
+	uv->tt = LUA_TUPVAL;
+	uv->v = &uv->u.value;
+	uv->u.l.prev = NULL;
+	uv->u.l.next = NULL;
+
+	setobj(luaState, uv->v, getObject(luaState, stackPos));
+
+	return uv;
+}
+
+void boxUpValue_start(lua_State *luaState) {
+	LClosure *closure;
+	closure = (LClosure *)lua_newLclosure(luaState, 1, hvalue(&luaState->l_gt));
+	pushClosure(luaState, (Closure *)closure);
+	// >>>>> ...... func
+	closure->p = makeFakeProto(luaState, 1);
+
+	// Temporarily initialize the upvalue to nil
+	lua_pushnil(luaState);
+	closure->upvals[0] = makeUpValue(luaState, -1);
+	lua_pop(luaState, 1);
+}
+
+void boxUpValue_finish(lua_State *luaState) {
+	// >>>>> ...... func obj
+	LClosure *lcl = (LClosure *)clvalue(getObject(luaState, -2));
+
+	lcl->upvals[0]->u.value = *getObject(luaState, -1);
+	lua_pop(luaState, 1);
+	// >>>>> ...... func
+}
+
+} // End of namespace Lua
diff --git a/engines/sword25/util/lua_persistence_util.h b/engines/sword25/util/lua_persistence_util.h
new file mode 100644
index 0000000000..345996f606
--- /dev/null
+++ b/engines/sword25/util/lua_persistence_util.h
@@ -0,0 +1,98 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distri8buted in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef LUA_SERIALIZATION_UTIL_H
+#define LUA_SERIALIZATION_UTIL_H
+
+
+struct lua_State;
+
+#include "lua/lobject.h"
+
+typedef TValue *StkId;
+
+namespace Lua {
+
+#define lua_malloc(luaState, nsize) lua_realloc(luaState, nullptr, 0, nsize)
+#define lua_reallocv(luaState, block, on, n, e) lua_realloc(luaState, block, (on) * (e), (n) * (e))
+#define lua_reallocvector(luaState, vec, oldn, n, T) ((vec) = (T *)(lua_reallocv(luaState, vec, oldn, n, sizeof(T))))
+#define lua_newVector(luaState, num, T) ((T *)lua_reallocv(luaState, nullptr, 0, num, sizeof(T)))
+#define lua_new(luaState,T) (T *)lua_malloc(luaState, sizeof(T))
+
+void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize);
+
+void pushObject(lua_State *luaState, TValue *obj);
+void pushProto(lua_State *luaState, Proto *proto);
+void pushUpValue(lua_State *luaState, UpVal *upval);
+void pushString(lua_State *luaState, TString *str);
+
+StkId getObject(lua_State *luaState, int stackpos);
+
+void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type);
+
+#define sizeLclosure(n) ((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
+
+Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable);
+void pushClosure(lua_State *luaState, Closure *closure);
+
+Proto *createProto(lua_State *luaState);
+Proto *makeFakeProto(lua_State *L, lu_byte nups);
+
+TString *createString(lua_State *luaState, const char *str, size_t len);
+
+UpVal *createUpValue(lua_State *luaState, int stackpos);
+void unboxUpValue(lua_State *luaState);
+
+/* Appends one stack to another stack, but the stack is reversed in the process */
+size_t appendStackToStack_reverse(lua_State *from, lua_State *to);
+void correctStack(lua_State *L, TValue *oldstack);
+void lua_reallocstack(lua_State *L, int newsize);
+void lua_growstack(lua_State *L, int n);
+
+void lua_reallocCallInfo(lua_State *lauState, int newsize);
+
+/* Does basically the opposite of luaC_link().
+ * Right now this function is rather inefficient; it requires traversing the
+ * entire root GC set in order to find one object. If the GC list were doubly
+ * linked this would be much easier, but there's no reason for Lua to have
+ * that. */
+void GCUnlink(lua_State *luaState, GCObject *gco);
+
+TString *lua_newlstr(lua_State *luaState, const char *str, size_t len);
+void lua_link(lua_State *luaState, GCObject *o, lu_byte tt);
+Proto *lua_newproto(lua_State *luaState) ;
+
+UpVal *makeUpValue(lua_State *luaState, int stackPos);
+/**
+ * The GC is not fond of finding upvalues in tables. We get around this
+ * during persistence using a weakly keyed table, so that the GC doesn't
+ * bother to mark them. This won't work in unpersisting, however, since
+ * if we make the values weak they'll be collected (since nothing else
+ * references them). Our solution, during unpersisting, is to represent
+ * upvalues as dummy functions, each with one upvalue.
+ */
+void boxUpValue_start(lua_State *luaState);
+void boxUpValue_finish(lua_State *luaState);
+
+} // End of namespace Lua
+
+#endif
diff --git a/engines/sword25/util/lua_serialization.h b/engines/sword25/util/lua_serialization.h
deleted file mode 100644
index 549ea7968d..0000000000
--- a/engines/sword25/util/lua_serialization.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef LUA_SERIALIZATION_H
-#define LUA_SERIALIZATION_H
-
-#include "sword25/util/lua/lua.h"
-
-
-namespace Common {
-class WriteStream;
-class ReadStream;
-}
-
-
-namespace Lua {
-
-#define PERMANENT_TYPE 101
-
-void serializeLua(lua_State *luaState, Common::WriteStream *writeStream);
-void unserializeLua(lua_State *luaState, Common::ReadStream *readStream);
-
-} // End of namespace Lua
-
-#endif
diff --git a/engines/sword25/util/lua_serialization_util.cpp b/engines/sword25/util/lua_serialization_util.cpp
deleted file mode 100644
index fc3f73eca6..0000000000
--- a/engines/sword25/util/lua_serialization_util.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distri8buted in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sword25/util/lua_serialization_util.h"
-
-#include "common/scummsys.h"
-
-#include "lua/lobject.h"
-#include "lua/lstate.h"
-#include "lua/lgc.h"
-#include "lua/lopcodes.h"
-
-
-namespace Lua {
-
-void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize) {
-	global_State *globalState = G(luaState);
-
-	block = (*globalState->frealloc)(globalState->ud, block, osize, nsize);
-	globalState->totalbytes = (globalState->totalbytes - osize) + nsize;
-
-	return block;
-}
-
-void pushObject(lua_State *luaState, TValue *obj) {
-	setobj2s(luaState, luaState->top, obj);
-
-	api_check(luaState, luaState->top < luaState->ci->top);
-	luaState->top++;
-}
-
-void pushProto(lua_State *luaState, Proto *proto) {
-	TValue obj;
-	setptvalue(luaState, &obj, proto);
-
-	pushObject(luaState, &obj);
-}
-
-void pushUpValue(lua_State *luaState, UpVal *upval) {
-	TValue obj;
-
-	obj.value.gc = cast(GCObject *, upval);
-	obj.tt = LUA_TUPVAL;
-	checkliveness(G(L), obj);
-
-	pushObject(luaState, &obj);
-}
-
-void pushString(lua_State *luaState, TString *str) {
-	TValue o;
-	setsvalue(luaState, &o, str);
-
-	pushObject(luaState, &o);
-}
-
-/* A simple reimplementation of the unfortunately static function luaA_index.
- * Does not support the global table, registry, or upvalues. */
-StkId getObject(lua_State *luaState, int stackpos) {
-	if (stackpos > 0) {
-		lua_assert(luaState->base + stackpos - 1 < luaState->top);
-		return luaState->base + stackpos - 1;
-	} else {
-		lua_assert(L->top - stackpos >= L->base);
-		return luaState->top + stackpos;
-	}
-}
-
-void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type) {
-	global_State *globalState = G(luaState);
-
-	obj->gch.next = globalState->rootgc;
-	globalState->rootgc = obj;
-	obj->gch.marked = luaC_white(globalState);
-	obj->gch.tt = type;
-}
-
-Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable) {
-	Closure *c = (Closure *)lua_malloc(luaState, sizeLclosure(numElements));
-	lua_linkObjToGC(luaState, obj2gco(c), LUA_TFUNCTION);
-
-	c->l.isC = 0;
-	c->l.env = elementTable;
-	c->l.nupvalues = cast_byte(numElements);
-
-	while (numElements--) {
-		c->l.upvals[numElements] = NULL;
-	}
-
-	return c;
-}
-
-void pushClosure(lua_State *luaState, Closure *closure) {
-	TValue obj;
-	setclvalue(luaState, &obj, closure);
-	pushObject(luaState, &obj);
-}
-
-Proto *createProto(lua_State *luaState) {
-	Proto *newProto = (Proto *)lua_malloc(luaState, sizeof(Proto));
-	lua_linkObjToGC(luaState, obj2gco(newProto), LUA_TPROTO);
-
-	newProto->k = NULL;
-	newProto->sizek = 0;
-	newProto->p = NULL;
-	newProto->sizep = 0;
-	newProto->code = NULL;
-	newProto->sizecode = 0;
-	newProto->sizelineinfo = 0;
-	newProto->sizeupvalues = 0;
-	newProto->nups = 0;
-	newProto->upvalues = NULL;
-	newProto->numparams = 0;
-	newProto->is_vararg = 0;
-	newProto->maxstacksize = 0;
-	newProto->lineinfo = NULL;
-	newProto->sizelocvars = 0;
-	newProto->locvars = NULL;
-	newProto->linedefined = 0;
-	newProto->lastlinedefined = 0;
-	newProto->source = NULL;
-
-	return newProto;
-}
-
-TString *createString(lua_State *luaState, const char *str, size_t len) {
-	TString *res;
-	lua_pushlstring(luaState, str, len);
-
-	res = rawtsvalue(luaState->top - 1);
-	lua_pop(luaState, 1);
-
-	return res;
-}
-
-Proto *makeFakeProto(lua_State *L, lu_byte nups) {
-	Proto *p = createProto(L);
-
-	p->sizelineinfo = 1;
-	p->lineinfo = lua_newVector(L, 1, int);
-	p->lineinfo[0] = 1;
-	p->sizecode = 1;
-	p->code = lua_newVector(L, 1, Instruction);
-	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
-	p->source = createString(L, "", 0);
-	p->maxstacksize = 2;
-	p->nups = nups;
-	p->sizek = 0;
-	p->sizep = 0;
-
-	return p;
-}
-
-UpVal *createUpValue(lua_State *luaState, int stackpos) {
-	UpVal *upValue = (UpVal *)lua_malloc(luaState, sizeof(UpVal));
-	lua_linkObjToGC(luaState, (GCObject *)upValue, LUA_TUPVAL);
-	upValue->tt = LUA_TUPVAL;
-	upValue->v = &upValue->u.value;
-	upValue->u.l.prev = NULL;
-	upValue->u.l.next = NULL;
-
-	const TValue *o2 = (TValue *)getObject(luaState, stackpos);
-	upValue->v->value = o2->value;
-	upValue->v->tt = o2->tt;
-	checkliveness(G(L), upValue->v);
-
-	return upValue;
-}
-
-void unboxUpValue(lua_State *luaState) {
-	// >>>>> ...... func
-	LClosure *lcl;
-	UpVal *uv;
-
-	lcl = (LClosure *)clvalue(getObject(luaState, -1));
-	uv = lcl->upvals[0];
-
-	lua_pop(luaState, 1);
-	// >>>>> ......
-
-	pushUpValue(luaState, uv);
-	// >>>>> ...... upValue
-}
-
-size_t appendStackToStack_reverse(lua_State *from, lua_State *to) {
-	for (StkId id = from->top - 1; id >= from->stack; --id) {
-		setobj2s(to, to->top, id);
-		to->top++;
-	}
-
-	return from->top - from->stack;
-}
-
-void correctStack(lua_State *L, TValue *oldstack) {
-	CallInfo *ci;
-	GCObject *up;
-	L->top = (L->top - oldstack) + L->stack;
-	for (up = L->openupval; up != NULL; up = up->gch.next)
-		gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
-	for (ci = L->base_ci; ci <= L->ci; ci++) {
-		ci->top = (ci->top - oldstack) + L->stack;
-		ci->base = (ci->base - oldstack) + L->stack;
-		ci->func = (ci->func - oldstack) + L->stack;
-	}
-	L->base = (L->base - oldstack) + L->stack;
-}
-
-void lua_reallocstack(lua_State *L, int newsize) {
-	TValue *oldstack = L->stack;
-	int realsize = newsize + 1 + EXTRA_STACK;
-
-	lua_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
-	L->stacksize = realsize;
-	L->stack_last = L->stack + newsize;
-	correctStack(L, oldstack);
-}
-
-void lua_growstack(lua_State *L, int n) {
-	// Double size is enough?
-	if (n <= L->stacksize) {
-		lua_reallocstack(L, 2 * L->stacksize);
-	} else {
-		lua_reallocstack(L, L->stacksize + n);
-	}
-}
-
-void lua_reallocCallInfo(lua_State *lauState, int newsize) {
-	CallInfo *oldci = lauState->base_ci;
-	lua_reallocvector(lauState, lauState->base_ci, lauState->size_ci, newsize, CallInfo);
-
-	lauState->size_ci = newsize;
-	lauState->ci = (lauState->ci - oldci) + lauState->base_ci;
-	lauState->end_ci = lauState->base_ci + lauState->size_ci - 1;
-}
-
-void GCUnlink(lua_State *luaState, GCObject *gco) {
-	GCObject *prevslot;
-	if (G(luaState)->rootgc == gco) {
-		G(luaState)->rootgc = G(luaState)->rootgc->gch.next;
-		return;
-	}
-
-	prevslot = G(luaState)->rootgc;
-	while (prevslot->gch.next != gco) {
-		prevslot = prevslot->gch.next;
-	}
-
-	prevslot->gch.next = prevslot->gch.next->gch.next;
-}
-
-TString *lua_newlstr(lua_State *luaState, const char *str, size_t len) {
-	lua_pushlstring(luaState, str, len);
-	TString *luaStr = &(luaState->top - 1)->value.gc->ts;
-
-	lua_pop(luaState, 1);
-
-	return luaStr;
-}
-
-void lua_link(lua_State *luaState, GCObject *o, lu_byte tt) {
-	global_State *g = G(luaState);
-	o->gch.next = g->rootgc;
-	g->rootgc = o;
-	o->gch.marked = luaC_white(g);
-	o->gch.tt = tt;
-}
-
-Proto *lua_newproto(lua_State *luaState) {
-	Proto *f = (Proto *)lua_malloc(luaState, sizeof(Proto));
-	lua_link(luaState, obj2gco(f), LUA_TPROTO);
-	f->k = NULL;
-	f->sizek = 0;
-	f->p = NULL;
-	f->sizep = 0;
-	f->code = NULL;
-	f->sizecode = 0;
-	f->sizelineinfo = 0;
-	f->sizeupvalues = 0;
-	f->nups = 0;
-	f->upvalues = NULL;
-	f->numparams = 0;
-	f->is_vararg = 0;
-	f->maxstacksize = 0;
-	f->lineinfo = NULL;
-	f->sizelocvars = 0;
-	f->locvars = NULL;
-	f->linedefined = 0;
-	f->lastlinedefined = 0;
-	f->source = NULL;
-	return f;
-}
-
-UpVal *makeUpValue(lua_State *luaState, int stackPos) {
-	UpVal *uv = lua_new(luaState, UpVal);
-	lua_link(luaState, (GCObject *)uv, LUA_TUPVAL);
-	uv->tt = LUA_TUPVAL;
-	uv->v = &uv->u.value;
-	uv->u.l.prev = NULL;
-	uv->u.l.next = NULL;
-
-	setobj(luaState, uv->v, getObject(luaState, stackPos));
-
-	return uv;
-}
-
-void boxUpValue_start(lua_State *luaState) {
-	LClosure *closure;
-	closure = (LClosure *)lua_newLclosure(luaState, 1, hvalue(&luaState->l_gt));
-	pushClosure(luaState, (Closure *)closure);
-	// >>>>> ...... func
-	closure->p = makeFakeProto(luaState, 1);
-
-	// Temporarily initialize the upvalue to nil
-	lua_pushnil(luaState);
-	closure->upvals[0] = makeUpValue(luaState, -1);
-	lua_pop(luaState, 1);
-}
-
-void boxUpValue_finish(lua_State *luaState) {
-	// >>>>> ...... func obj
-	LClosure *lcl = (LClosure *)clvalue(getObject(luaState, -2));
-
-	lcl->upvals[0]->u.value = *getObject(luaState, -1);
-	lua_pop(luaState, 1);
-	// >>>>> ...... func
-}
-
-} // End of namespace Lua
diff --git a/engines/sword25/util/lua_serialization_util.h b/engines/sword25/util/lua_serialization_util.h
deleted file mode 100644
index 345996f606..0000000000
--- a/engines/sword25/util/lua_serialization_util.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distri8buted in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef LUA_SERIALIZATION_UTIL_H
-#define LUA_SERIALIZATION_UTIL_H
-
-
-struct lua_State;
-
-#include "lua/lobject.h"
-
-typedef TValue *StkId;
-
-namespace Lua {
-
-#define lua_malloc(luaState, nsize) lua_realloc(luaState, nullptr, 0, nsize)
-#define lua_reallocv(luaState, block, on, n, e) lua_realloc(luaState, block, (on) * (e), (n) * (e))
-#define lua_reallocvector(luaState, vec, oldn, n, T) ((vec) = (T *)(lua_reallocv(luaState, vec, oldn, n, sizeof(T))))
-#define lua_newVector(luaState, num, T) ((T *)lua_reallocv(luaState, nullptr, 0, num, sizeof(T)))
-#define lua_new(luaState,T) (T *)lua_malloc(luaState, sizeof(T))
-
-void *lua_realloc(lua_State *luaState, void *block, size_t osize, size_t nsize);
-
-void pushObject(lua_State *luaState, TValue *obj);
-void pushProto(lua_State *luaState, Proto *proto);
-void pushUpValue(lua_State *luaState, UpVal *upval);
-void pushString(lua_State *luaState, TString *str);
-
-StkId getObject(lua_State *luaState, int stackpos);
-
-void lua_linkObjToGC(lua_State *luaState, GCObject *obj, lu_byte type);
-
-#define sizeLclosure(n) ((sizeof(LClosure)) + sizeof(TValue *) * ((n) - 1))
-
-Closure *lua_newLclosure(lua_State *luaState, int numElements, Table *elementTable);
-void pushClosure(lua_State *luaState, Closure *closure);
-
-Proto *createProto(lua_State *luaState);
-Proto *makeFakeProto(lua_State *L, lu_byte nups);
-
-TString *createString(lua_State *luaState, const char *str, size_t len);
-
-UpVal *createUpValue(lua_State *luaState, int stackpos);
-void unboxUpValue(lua_State *luaState);
-
-/* Appends one stack to another stack, but the stack is reversed in the process */
-size_t appendStackToStack_reverse(lua_State *from, lua_State *to);
-void correctStack(lua_State *L, TValue *oldstack);
-void lua_reallocstack(lua_State *L, int newsize);
-void lua_growstack(lua_State *L, int n);
-
-void lua_reallocCallInfo(lua_State *lauState, int newsize);
-
-/* Does basically the opposite of luaC_link().
- * Right now this function is rather inefficient; it requires traversing the
- * entire root GC set in order to find one object. If the GC list were doubly
- * linked this would be much easier, but there's no reason for Lua to have
- * that. */
-void GCUnlink(lua_State *luaState, GCObject *gco);
-
-TString *lua_newlstr(lua_State *luaState, const char *str, size_t len);
-void lua_link(lua_State *luaState, GCObject *o, lu_byte tt);
-Proto *lua_newproto(lua_State *luaState) ;
-
-UpVal *makeUpValue(lua_State *luaState, int stackPos);
-/**
- * The GC is not fond of finding upvalues in tables. We get around this
- * during persistence using a weakly keyed table, so that the GC doesn't
- * bother to mark them. This won't work in unpersisting, however, since
- * if we make the values weak they'll be collected (since nothing else
- * references them). Our solution, during unpersisting, is to represent
- * upvalues as dummy functions, each with one upvalue.
- */
-void boxUpValue_start(lua_State *luaState);
-void boxUpValue_finish(lua_State *luaState);
-
-} // End of namespace Lua
-
-#endif
diff --git a/engines/sword25/util/lua_serializer.cpp b/engines/sword25/util/lua_serializer.cpp
deleted file mode 100644
index 55b6257324..0000000000
--- a/engines/sword25/util/lua_serializer.cpp
+++ /dev/null
@@ -1,787 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sword25/util/lua_serialization.h"
-
-#include "sword25/util/double_serializer.h"
-#include "sword25/util/lua_serialization_util.h"
-
-#include "common/stream.h"
-
-#include "lua/lobject.h"
-#include "lua/lstate.h"
-#include "lua/lgc.h"
-
-
-namespace Lua {
-
-#define PERMANENT_TYPE 101
-
-struct SerializationInfo {
-	lua_State *luaState;
-	Common::WriteStream *writeStream;
-	uint counter;
-};
-
-static void serialize(SerializationInfo *info);
-
-static void serializeBoolean(SerializationInfo *info);
-static void serializeNumber(SerializationInfo *info);
-static void serializeString(SerializationInfo *info);
-static void serializeTable(SerializationInfo *info);
-static void serializeFunction(SerializationInfo *info);
-static void serializeThread(SerializationInfo *info);
-static void serializeProto(SerializationInfo *info);
-static void serializeUpValue(SerializationInfo *info);
-static void serializeUserData(SerializationInfo *info);
-
-
-void serializeLua(lua_State *luaState, Common::WriteStream *writeStream) {
-	SerializationInfo info;
-	info.luaState = luaState;
-	info.writeStream = writeStream;
-	info.counter = 0u;
-
-	// The process starts with the lua stack as follows:
-	// >>>>> permTbl rootObj
-	// That's the table of permanents and the root object to be serialized
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(luaState, 4);
-	assert(lua_gettop(luaState) == 2);
-	// And that the root isn't nil
-	assert(!lua_isnil(luaState, 2));
-
-	// Create a table to hold indexes of everything that's serialized
-	// This allows us to only serialize an object once
-	// Every other time, just reference the index
-	lua_newtable(luaState);
-	// >>>>> permTbl rootObj indexTbl
-
-	// Now we're going to make the table weakly keyed. This prevents the
-	// GC from visiting it and trying to mark things it doesn't want to
-	// mark in tables, e.g. upvalues. All objects in the table are
-	// a priori reachable, so it doesn't matter that we do this.
-
-	// Create the metatable
-	lua_newtable(luaState);
-	// >>>>> permTbl rootObj indexTbl metaTbl
-
-	lua_pushstring(luaState, "__mode");
-	// >>>>> permTbl rootObj indexTbl metaTbl "__mode"
-
-	lua_pushstring(luaState, "k");
-	// >>>>> permTbl rootObj indexTbl metaTbl "__mode" "k"
-
-	lua_settable(luaState, 4);
-	// >>>>> permTbl rootObj indexTbl metaTbl
-
-	lua_setmetatable(luaState, 3);
-	// >>>>> permTbl rootObj indexTbl
-
-	// Swap the indexTable and the rootObj
-	lua_insert(luaState, 2);
-	// >>>>> permTbl indexTbl rootObj
-
-	// Serialize the root recursively
-	serialize(&info);
-
-	// Return the stack back to the original state
-	lua_remove(luaState, 2);
-	// >>>>> permTbl rootObj
-}
-
-static void serialize(SerializationInfo *info) {
-	// The stack can potentially have many things on it
-	// The object we want to serialize is the item on the top of the stack
-	// >>>>> permTbl indexTbl rootObj ...... obj
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	// If the object has already been written, don't write it again
-	// Instead write the index of the object from the indexTbl
-
-	// Check the indexTbl
-	lua_pushvalue(info->luaState, -1);
-	// >>>>> permTbl indexTbl rootObj ...... obj obj
-
-	lua_rawget(info->luaState, 2);
-	// >>>>> permTbl indexTbl rootObj ...... obj ?index?
-
-	// If the index isn't nil, the object has already been written
-	if (!lua_isnil(info->luaState, -1)) {
-		// Write out a flag that indicates that it's an index
-		info->writeStream->writeByte(0);
-
-		// Retrieve the index from the stack
-		uint *index = (uint *)lua_touserdata(info->luaState, -1);
-
-		// Write out the index
-		info->writeStream->writeUint32LE(*index);
-
-		// Pop the index off the stack
-		lua_pop(info->luaState, 1);
-
-		return;
-	}
-
-	// Pop the nil off the stack
-	lua_pop(info->luaState, 1);
-
-	// Write out a flag that indicates that this is a real object
-	info->writeStream->writeByte(1);
-
-	// If the object itself is nil, then write out a zero as a placeholder
-	if (lua_isnil(info->luaState, -1)) {
-		info->writeStream->writeByte(0);
-
-		return;
-	}
-
-	// Add the object to the indexTbl
-
-	lua_pushvalue(info->luaState, -1);
-	// >>>>> permTbl indexTbl rootObj ...... obj obj
-
-	uint *ref = (uint *)lua_newuserdata(info->luaState, sizeof(uint));
-	*ref = ++(info->counter);
-	// >>>>> permTbl indexTbl rootObj ...... obj obj index
-
-	lua_rawset(info->luaState, 2);
-	// >>>>> permTbl indexTbl rootObj ...... obj
-
-
-	// Write out the index
-	info->writeStream->writeUint32LE(info->counter);
-
-
-	// Objects that are in the permanents table are serialized in a special way
-
-	lua_pushvalue(info->luaState, -1);
-	// >>>>> permTbl indexTbl rootObj ...... obj obj
-
-	lua_gettable(info->luaState, 1);
-	// >>>>> permTbl indexTbl rootObj ...... obj obj ?permKey?
-
-	if (!lua_isnil(info->luaState, -1)) {
-		// Write out the type
-		info->writeStream->writeSint32LE(PERMANENT_TYPE);
-
-		// Serialize the key
-		serialize(info);
-
-		// Pop the key off the stack
-		lua_pop(info->luaState, 1);
-
-		return;
-	}
-
-	// Pop the nil off the stack
-	lua_pop(info->luaState, 1);
-
-	// Query the type of the object
-	int objType = lua_type(info->luaState, -1);
-
-	// Write it out
-	info->writeStream->writeSint32LE(objType);
-
-	// Serialize the object by its type
-
-	switch (objType) {
-	case LUA_TBOOLEAN:
-		serializeBoolean(info);
-		break;
-	case LUA_TLIGHTUSERDATA:
-		// You can't serialize a pointer
-		// It would be meaningless on the next run
-		assert(0);
-		break;
-	case LUA_TNUMBER:
-		serializeNumber(info);
-		break;
-	case LUA_TSTRING:
-		serializeString(info);
-		break;
-	case LUA_TTABLE:
-		serializeTable(info);
-		break;
-	case LUA_TFUNCTION:
-		serializeFunction(info);
-		break;
-	case LUA_TTHREAD:
-		serializeThread(info);
-		break;
-	case LUA_TPROTO:
-		serializeProto(info);
-		break;
-	case LUA_TUPVAL:
-		serializeUpValue(info);
-		break;
-	case LUA_TUSERDATA:
-		serializeUserData(info);
-		break;
-	default:
-		assert(0);
-	}
-}
-
-static void serializeBoolean(SerializationInfo *info) {
-	int value = lua_toboolean(info->luaState, -1);
-
-	info->writeStream->writeSint32LE(value);
-}
-
-static void serializeNumber(SerializationInfo *info) {
-	lua_Number value = lua_tonumber(info->luaState, -1);
-
-	#if 1
-		Util::SerializedDouble serializedValue(Util::encodeDouble(value));
-
-		info->writeStream->writeUint32LE(serializedValue.significandOne);
-		info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
-		info->writeStream->writeSint16LE(serializedValue.exponent);
-	#else
-		// NOTE: We need to store a double. Unfortunately, we have to accommodate endianness.
-		// Also, I don't know if we can assume all compilers use IEEE double
-		// Therefore, I have chosen to store the double as a string.
-		Common::String buffer = Common::String::format("%f", value);
-
-		info->writeStream->write(buffer.c_str(), buffer.size());
-	#endif
-
-}
-
-static void serializeString(SerializationInfo *info) {
-	// Hard cast to a uint32 to force size_t to an explicit size
-	// *Theoretically* this could truncate, but if we have a 4gb string, we have bigger problems
-	uint32 length = static_cast<uint32>(lua_strlen(info->luaState, -1));
-	info->writeStream->writeUint32LE(length);
-
-	const char *str = lua_tostring(info->luaState, -1);
-	info->writeStream->write(str, length);
-}
-
-/* Choose whether to do a regular or special persistence based on an object's
- * metatable. "default" is whether the object, if it doesn't have a __persist
- * entry, is literally persistable or not.
- * Pushes the unpersist closure and returns true if special persistence is
- * used. */
-static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 4);
-
-	// Check whether we should persist literally, or via the __persist metafunction
-	if (!lua_getmetatable(info->luaState, -1)) {
-		if (defaction) {
-			// Write out a flag declaring that the object isn't special and should be persisted normally
-			info->writeStream->writeSint32LE(0);
-
-			return false;
-		} else {
-			lua_pushstring(info->luaState, "Type not literally persistable by default");
-			lua_error(info->luaState);
-
-			return false; // Not reached
-		}
-	}
-
-	// >>>>> permTbl indexTbl ...... obj metaTbl
-	lua_pushstring(info->luaState, "__persist");
-	// >>>>> permTbl indexTbl rootObj ...... obj metaTbl "__persist"
-
-	lua_rawget(info->luaState, -2);
-	// >>>>> permTbl indexTbl ...... obj metaTbl ?__persist?
-
-	if (lua_isnil(info->luaState, -1)) {
-		// >>>>> permTbl indexTbl ...... obj metaTbl nil
-		lua_pop(info->luaState, 2);
-		// >>>>> permTbl indexTbl ...... obj
-
-		if (defaction) {
-			// Write out a flag declaring that the object isn't special and should be persisted normally
-			info->writeStream->writeSint32LE(0);
-
-			return false;
-		} else {
-			lua_pushstring(info->luaState, "Type not literally persistable by default");
-			lua_error(info->luaState);
-
-			return false; // Return false
-		}
-
-	} else if (lua_isboolean(info->luaState, -1)) {
-		// >>>>> permTbl indexTbl ...... obj metaTbl bool
-		if (lua_toboolean(info->luaState, -1)) {
-			// Write out a flag declaring that the object isn't special and should be persisted normally
-			info->writeStream->writeSint32LE(0);
-
-			// >>>>> permTbl indexTbl ...... obj metaTbl true */
-			lua_pop(info->luaState, 2);
-			// >>>>> permTbl indexTbl ...... obj
-
-			return false;
-		} else {
-			lua_pushstring(info->luaState, "Metatable forbade persistence");
-			lua_error(info->luaState);
-
-			return false; // Not reached
-		}
-	} else if (!lua_isfunction(info->luaState, -1)) {
-		lua_pushstring(info->luaState, "__persist not nil, boolean, or function");
-		lua_error(info->luaState);
-	}
-
-	// >>>>> permTbl indexTbl ...... obj metaTbl __persist
-	lua_pushvalue(info->luaState, -3);
-	// >>>>> permTbl indexTbl ...... obj metaTbl __persist obj
-
-	// >>>>> permTbl indexTbl ...... obj metaTbl ?func?
-
-	if (!lua_isfunction(info->luaState, -1)) {
-		lua_pushstring(info->luaState, "__persist function did not return a function");
-		lua_error(info->luaState);
-	}
-
-	// >>>>> permTbl indexTbl ...... obj metaTbl func
-
-	// Write out a flag that the function exists
-	info->writeStream->writeSint32LE(1);
-
-	// Serialize the function
-	serialize(info);
-
-	lua_pop(info->luaState, 2);
-	// >>>>> permTbl indexTbl ...... obj
-
-	return true;
-}
-
-static void serializeTable(SerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... tbl
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 3);
-
-	// Test if the object needs special serialization
-	if (serializeSpecialObject(info, 1)) {
-		return;
-	}
-
-	// >>>>> permTbl indexTbl ...... tbl
-
-	// First, serialize the metatable (if any)
-	if (!lua_getmetatable(info->luaState, -1)) {
-		lua_pushnil(info->luaState);
-	}
-
-	// >>>>> permTbl indexTbl ...... tbl metaTbl/nil */
-	serialize(info);
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... tbl
-
-
-	lua_pushnil(info->luaState);
-	// >>>>> permTbl indexTbl ...... tbl nil
-
-	// Now, persist all k/v pairs
-	while (lua_next(info->luaState, -2)) {
-		// >>>>> permTbl indexTbl ...... tbl k v */
-
-		lua_pushvalue(info->luaState, -2);
-		// >>>>> permTbl indexTbl ...... tbl k v k */
-
-		// Serialize the key
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... tbl k v */
-
-		// Serialize the value
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... tbl k */
-	}
-
-	// >>>>> permTbl indexTbl ...... tbl
-
-	// Terminate the list with a nil
-	lua_pushnil(info->luaState);
-	// >>>>> permTbl indexTbl ...... tbl
-
-	serialize(info);
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... tbl
-}
-
-static void serializeFunction(SerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... func
-	Closure *cl = clvalue(getObject(info->luaState, -1));
-	lua_checkstack(info->luaState, 2);
-
-	if (cl->c.isC) {
-		/* It's a C function. For now, we aren't going to allow
-		 * persistence of C closures, even if the "C proto" is
-		 * already in the permanents table. */
-		lua_pushstring(info->luaState, "Attempt to persist a C function");
-		lua_error(info->luaState);
-	} else {
-		// It's a Lua closure
-
-		// We don't really _NEED_ the number of upvals, but it'll simplify things a bit
-		info->writeStream->writeByte(cl->l.p->nups);
-
-		// Serialize the prototype
-		pushProto(info->luaState, cl->l.p);
-		// >>>>> permTbl indexTbl ...... func proto */
-
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... func
-
-		// Serialize upvalue values (not the upvalue objects themselves)
-		for (byte i = 0; i < cl->l.p->nups; i++) {
-			// >>>>> permTbl indexTbl ...... func
-			pushUpValue(info->luaState, cl->l.upvals[i]);
-			// >>>>> permTbl indexTbl ...... func upval
-
-			serialize(info);
-
-			lua_pop(info->luaState, 1);
-			// >>>>> permTbl indexTbl ...... func
-		}
-
-		// >>>>> permTbl indexTbl ...... func
-
-		// Serialize function environment
-		lua_getfenv(info->luaState, -1);
-		// >>>>> permTbl indexTbl ...... func fenv
-
-		if (lua_equal(info->luaState, -1, LUA_GLOBALSINDEX)) {
-			// Function has the default fenv
-
-			// >>>>> permTbl indexTbl ...... func _G
-			lua_pop(info->luaState, 1);
-			// >>>>> permTbl indexTbl ...... func
-
-			lua_pushnil(info->luaState);
-			// >>>>> permTbl indexTbl ...... func nil
-		}
-
-		// >>>>> permTbl indexTbl ...... func fenv/nil
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... func
-	}
-}
-
-static void serializeThread(SerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... thread
-	lua_State *threadState = lua_tothread(info->luaState, -1);
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, threadState->top - threadState->stack + 1);
-
-	if (info->luaState == threadState) {
-		lua_pushstring(info->luaState, "Can't persist currently running thread");
-		lua_error(info->luaState);
-		return; /* not reached */
-	}
-
-	// Persist the stack
-
-	// We *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
-	uint32 stackSize = static_cast<uint32>(appendStackToStack_reverse(threadState, info->luaState));
-	info->writeStream->writeUint32LE(stackSize);
-
-	// >>>>> permTbl indexTbl ...... thread (reversed contents of thread stack) */
-	for (; stackSize > 0; --stackSize) {
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-	}
-
-	// >>>>> permTbl indexTbl ...... thread
-
-	// Now, serialize the CallInfo stack
-
-	// Again, we *could* have truncation here, but if we have more than 4 billion items on a stack, we have bigger problems
-	uint32 numFrames = static_cast<uint32>((threadState->ci - threadState->base_ci) + 1);
-	info->writeStream->writeUint32LE(numFrames);
-
-	for (uint32 i = 0; i < numFrames; i++) {
-		CallInfo *ci = threadState->base_ci + i;
-
-		// Same argument as above about truncation
-		uint32 stackBase = static_cast<uint32>(ci->base - threadState->stack);
-		uint32 stackFunc = static_cast<uint32>(ci->func - threadState->stack);
-		uint32 stackTop = static_cast<uint32>(ci->top - threadState->stack);
-
-		info->writeStream->writeUint32LE(stackBase);
-		info->writeStream->writeUint32LE(stackFunc);
-		info->writeStream->writeUint32LE(stackTop);
-
-		info->writeStream->writeSint32LE(ci->nresults);
-
-		uint32 savedpc = (ci != threadState->base_ci) ? static_cast<uint32>(ci->savedpc - ci_func(ci)->l.p->code) : 0u;
-		info->writeStream->writeUint32LE(savedpc);
-	}
-
-
-	// Serialize the state's other parameters, with the exception of upval stuff
-
-	assert(threadState->nCcalls <= 1);
-	info->writeStream->writeByte(threadState->status);
-
-	// Same argument as above about truncation
-	uint32 stackBase = static_cast<uint32>(threadState->base - threadState->stack);
-	uint32 stackFunc = static_cast<uint32>(threadState->top - threadState->stack);
-	info->writeStream->writeUint32LE(stackBase);
-	info->writeStream->writeUint32LE(stackFunc);
-
-	// Same argument as above about truncation
-	uint32 stackOffset = static_cast<uint32>(threadState->errfunc);
-	info->writeStream->writeUint32LE(stackOffset);
-
-	// Finally, record upvalues which need to be reopened
-	// See the comment above serializeUpVal() for why we do this
-
-	UpVal *upVal;
-
-	// >>>>> permTbl indexTbl ...... thread
-	for (GCObject *gcObject = threadState->openupval; gcObject != NULL; gcObject = upVal->next) {
-		upVal = gco2uv(gcObject);
-
-		/* Make sure upvalue is really open */
-		assert(upVal->v != &upVal->u.value);
-
-		pushUpValue(info->luaState, upVal);
-		// >>>>> permTbl indexTbl ...... thread upVal
-
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... thread
-
-		// Same argument as above about truncation
-		uint32 stackpos = static_cast<uint32>(upVal->v - threadState->stack);
-		info->writeStream->writeUint32LE(stackpos);
-	}
-
-	// >>>>> permTbl indexTbl ...... thread
-	lua_pushnil(info->luaState);
-	// >>>>> permTbl indexTbl ...... thread nil
-
-	// Use nil as a terminator
-	serialize(info);
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... thread
-}
-
-static void serializeProto(SerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... proto
-	Proto *proto = gco2p(getObject(info->luaState, -1)->value.gc);
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	// Serialize constant refs */
-	info->writeStream->writeSint32LE(proto->sizek);
-
-	for (int i = 0; i < proto->sizek; ++i) {
-		pushObject(info->luaState, &proto->k[i]);
-		// >>>>> permTbl indexTbl ...... proto const
-
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto
-	}
-
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Serialize inner Proto refs
-	info->writeStream->writeSint32LE(proto->sizep);
-
-	for (int i = 0; i < proto->sizep; ++i)
-	{
-		pushProto(info->luaState, proto->p[i]);
-		// >>>>> permTbl indexTbl ...... proto subProto */
-
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto
-	}
-
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Serialize the code
-	info->writeStream->writeSint32LE(proto->sizecode);
-
-	uint32 len = static_cast<uint32>(sizeof(Instruction) * proto->sizecode);
-	info->writeStream->write(proto->code, len);
-
-
-	// Serialize upvalue names
-	info->writeStream->writeSint32LE(proto->sizeupvalues);
-
-	for (int i = 0; i < proto->sizeupvalues; ++i)
-	{
-		pushString(info->luaState, proto->upvalues[i]);
-		// >>>>> permTbl indexTbl ...... proto str
-
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto
-	}
-
-
-	// Serialize local variable infos
-	info->writeStream->writeSint32LE(proto->sizelocvars);
-
-	for (int i = 0; i < proto->sizelocvars; ++i) {
-		pushString(info->luaState, proto->locvars[i].varname);
-		// >>>>> permTbl indexTbl ...... proto str
-
-		serialize(info);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto
-
-		info->writeStream->writeSint32LE(proto->locvars[i].startpc);
-		info->writeStream->writeSint32LE(proto->locvars[i].endpc);
-	}
-
-
-	// Serialize source string
-	pushString(info->luaState, proto->source);
-	// >>>>> permTbl indexTbl ...... proto sourceStr
-
-	serialize(info);
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Serialize line numbers
-	info->writeStream->writeSint32LE(proto->sizelineinfo);
-
-	if (proto->sizelineinfo) {
-		uint32 len = static_cast<uint32>(sizeof(int) * proto->sizelineinfo);
-		info->writeStream->write(proto->lineinfo, len);
-	}
-
-	// Serialize linedefined and lastlinedefined
-	info->writeStream->writeSint32LE(proto->linedefined);
-	info->writeStream->writeSint32LE(proto->lastlinedefined);
-
-
-	// Serialize misc values
-	info->writeStream->writeByte(proto->nups);
-	info->writeStream->writeByte(proto->numparams);
-	info->writeStream->writeByte(proto->is_vararg);
-	info->writeStream->writeByte(proto->maxstacksize);
-}
-
-/* Upvalues are tricky. Here's why.
- *
- * A particular upvalue may be either "open", in which case its member v
- * points into a thread's stack, or "closed" in which case it points to the
- * upvalue itself. An upvalue is closed under any of the following conditions:
- * -- The function that initially declared the variable "local" returns
- * -- The thread in which the closure was created is garbage collected
- *
- * To make things wackier, just because a thread is reachable by Lua doesn't
- * mean it's in our root set. We need to be able to treat an open upvalue
- * from an unreachable thread as a closed upvalue.
- *
- * The solution:
- * (a) For the purposes of serializing, don't indicate whether an upvalue is
- *     closed or not.
- * (b) When unserializing, pretend that all upvalues are closed.
- * (c) When serializing, persist all open upvalues referenced by a thread
- *     that is persisted, and tag each one with the corresponding stack position
- * (d) When unserializing, "reopen" each of these upvalues as the thread is
- *     unserialized
- */
-static void serializeUpValue(SerializationInfo *info) {
-	// >>>>> permTbl indexTbl ...... upval
-	assert(ttype(getObject(info->luaState, -1)) == LUA_TUPVAL);
-	UpVal *upValue = gco2uv(getObject(info->luaState, -1)->value.gc);
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 1);
-
-	// We can't permit the upValue to linger around on the stack, as Lua
-	// will bail if its GC finds it.
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ......
-
-	pushObject(info->luaState, upValue->v);
-	// >>>>> permTbl indexTbl ...... obj
-
-	serialize(info);
-	// >>>>> permTbl indexTbl ...... obj
-}
-
-static void serializeUserData(SerializationInfo *info) {
-	// >>>>> permTbl rootObj ...... udata
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	// Test if the object needs special serialization
-	if (serializeSpecialObject(info, 0)) {
-		return;
-	}
-
-	// Use literal persistence
-
-	// Hard cast to a uint32 length
-	// This could lead to truncation, but if we have a 4gb block of data, we have bigger problems
-	uint32 length = static_cast<uint32>(uvalue(getObject(info->luaState, -1))->len);
-	info->writeStream->writeUint32LE(length);
-
-	info->writeStream->write(lua_touserdata(info->luaState, -1), length);
-
-	// Serialize the metatable (if any)
-	if (!lua_getmetatable(info->luaState, -1)) {
-		lua_pushnil(info->luaState);
-	}
-
-	// >>>>> permTbl rootObj ...... udata metaTbl/nil
-	serialize(info);
-
-	lua_pop(info->luaState, 1);
-	/* perms reftbl ... udata */
-}
-
-
-} // End of namespace Lua
diff --git a/engines/sword25/util/lua_unpersist.cpp b/engines/sword25/util/lua_unpersist.cpp
new file mode 100644
index 0000000000..aa924ff7c5
--- /dev/null
+++ b/engines/sword25/util/lua_unpersist.cpp
@@ -0,0 +1,698 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/lua_persistence.h"
+
+#include "sword25/util/double_serializer.h"
+#include "sword25/util/lua_persistence_util.h"
+
+#include "common/stream.h"
+
+#include "lua/lobject.h"
+#include "lua/lstate.h"
+#include "lua/lgc.h"
+#include "lua/lopcodes.h"
+
+
+namespace Lua {
+
+struct UnSerializationInfo {
+	lua_State *luaState;
+	Common::ReadStream *readStream;
+};
+
+static void unserialize(UnSerializationInfo *info);
+
+static void unserializeBoolean(UnSerializationInfo *info);
+static void unserializeNumber(UnSerializationInfo *info);
+static void unserializeString(UnSerializationInfo *info);
+static void unserializeTable(UnSerializationInfo *info, int index);
+static void unserializeFunction(UnSerializationInfo *info, int index);
+static void unserializeThread(UnSerializationInfo *info, int index);
+static void unserializeProto(UnSerializationInfo *info, int index);
+static void unserializeUpValue(UnSerializationInfo *info, int index);
+static void unserializeUserData(UnSerializationInfo *info, int index);
+static void unserializePermanent(UnSerializationInfo *info, int index);
+
+
+void unpersistLua(lua_State *luaState, Common::ReadStream *readStream) {
+	UnSerializationInfo info;
+	info.luaState = luaState;
+	info.readStream = readStream;
+
+	// The process starts with the lua stack as follows:
+	// >>>>> permTbl
+	// That's the table of permanents
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(luaState, 3);
+
+	// Create a table to hold indexes of everything thats already been read
+	lua_newtable(luaState);
+	// >>>>> permTbl indexTbl
+
+	// Prevent garbage collection while we unserialize
+	lua_gc(luaState, LUA_GCSTOP, 0);
+
+	// Unserialize the root object
+	unserialize(&info);
+	// >>>>> permTbl indexTbl rootObj
+
+	// Re-start garbage collection
+	lua_gc(luaState, LUA_GCRESTART, 0);
+
+	// Remove the indexTbl
+	lua_replace(luaState, 2);
+	// >>>>> permTbl rootObj
+}
+
+/* The object is left on the stack. This is primarily used by unserialize, but
+ * may be used by GCed objects that may incur cycles in order to preregister
+ * the object. */
+static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ...... obj
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	lua_pushlightuserdata(info->luaState, (void *)index);
+	// >>>>> permTbl indexTbl ...... obj index
+
+	lua_pushvalue(info->luaState, -2);
+	// >>>>> permTbl indexTbl ...... obj index obj
+
+	// Push the k/v pair into the indexTbl
+	lua_settable(info->luaState, 2);
+	// >>>>> permTbl indexTbl ...... obj
+}
+
+static void unserialize(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	byte isARealValue = info->readStream->readByte();
+	if (isARealValue) {
+		int index = info->readStream->readSint32LE();
+		int type = info->readStream->readSint32LE();
+
+		switch (type) {
+		case LUA_TBOOLEAN:
+			unserializeBoolean(info);
+			break;
+		case LUA_TLIGHTUSERDATA:
+			// You can't serialize a pointer
+			// It would be meaningless on the next run
+			assert(0);
+			break;
+		case LUA_TNUMBER:
+			unserializeNumber(info);
+			break;
+		case LUA_TSTRING:
+			unserializeString(info);
+			break;
+		case LUA_TTABLE:
+			unserializeTable(info, index);
+			break;
+		case LUA_TFUNCTION:
+			unserializeFunction(info, index);
+			break;
+		case LUA_TTHREAD:
+			unserializeThread(info, index);
+			break;
+		case LUA_TPROTO:
+			unserializeProto(info, index);
+			break;
+		case LUA_TUPVAL:
+			unserializeUpValue(info, index);
+			break;
+		case LUA_TUSERDATA:
+			unserializeUserData(info, index);
+			break;
+		case PERMANENT_TYPE:
+			unserializePermanent(info, index);
+			break;
+		default:
+			assert(0);
+		}
+
+
+		// >>>>> permTbl indexTbl ...... obj
+		assert(lua_type(info->luaState, -1) == type ||
+		       type == PERMANENT_TYPE ||
+		       // Remember, upvalues get a special dispensation, as described in boxUpValue
+		       (lua_type(info->luaState, -1) == LUA_TFUNCTION && type == LUA_TUPVAL));
+
+		registerObjectInIndexTable(info, index);
+		// >>>>> permTbl indexTbl ...... obj
+	} else {
+		int index = info->readStream->readSint32LE();
+
+		if (index == 0) {
+			lua_pushnil(info->luaState);
+			// >>>>> permTbl indexTbl ...... nil
+		} else {
+			// Fetch the object from the indexTbl
+
+			lua_pushlightuserdata(info->luaState, (void *)index);
+			// >>>>> permTbl indexTbl ...... index
+
+			lua_gettable(info->luaState, 2);
+			// >>>>> permTbl indexTbl ...... ?obj?
+
+			assert(!lua_isnil(info->luaState, -1));
+		}
+		// >>>>> permTbl indexTbl ...... obj/nil
+	}
+
+	// >>>>> permTbl indexTbl ...... obj/nil
+}
+
+static void unserializeBoolean(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	int value = info->readStream->readSint32LE();
+
+	lua_pushboolean(info->luaState, value);
+	// >>>>> permTbl indexTbl ...... bool
+}
+
+static void unserializeNumber(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	// Read the serialized double
+	Util::SerializedDouble serializedValue;
+	serializedValue.significandOne = info->readStream->readUint32LE();
+	serializedValue.signAndSignificandTwo = info->readStream->readUint32LE();
+	serializedValue.exponent = info->readStream->readSint16LE();
+
+	lua_Number value = Util::decodeDouble(serializedValue);
+
+	lua_pushnumber(info->luaState, value);
+	// >>>>> permTbl indexTbl ...... num
+}
+
+static void unserializeString(UnSerializationInfo *info) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	uint32 length = info->readStream->readUint32LE();
+	char *string = new char[length];
+
+	info->readStream->read(string, length);
+	lua_pushlstring(info->luaState, string, length);
+
+	// >>>>> permTbl indexTbl ...... string
+
+	delete[] string;
+}
+
+static void unserializeSpecialTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	unserialize(info);
+
+	// >>>>> permTbl indexTbl ...... spfunc
+	lua_call(info->luaState, 0, 1);
+	// >>>>> permTbl indexTbl ...... tbl
+}
+
+static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 3);
+
+	// Preregister table for handling of cycles
+	lua_newtable(info->luaState);
+
+	// >>>>> permTbl indexTbl ...... tbl
+	registerObjectInIndexTable(info, index);
+	// >>>>> permTbl indexTbl ...... tbl
+
+	// Unserialize metatable
+	unserialize(info);
+	// >>>>> permTbl indexTbl ...... tbl ?metaTbl/nil?
+
+	if (lua_istable(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... tbl metaTbl
+		lua_setmetatable(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... tbl
+	} else {
+		// >>>>> permTbl indexTbl ...... tbl nil
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... tbl
+	}
+	// >>>>> permTbl indexTbl ...... tbl
+
+
+	while (1) {
+		// >>>>> permTbl indexTbl ...... tbl
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... tbl key/nil
+
+		// The table serialization is nil terminated
+		if (lua_isnil(info->luaState, -1)) {
+			// >>>>> permTbl indexTbl ...... tbl nil
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... tbl
+
+			break;
+		}
+
+		// >>>>> permTbl indexTbl ...... tbl key
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... tbl value
+
+		lua_rawset(info->luaState, -3);
+		// >>>>> permTbl indexTbl ...... tbl
+	}
+}
+
+void unserializeTable(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 1);
+
+	int isSpecial = info->readStream->readSint32LE();
+
+	if (isSpecial) {
+		unserializeSpecialTable(info, index);
+		// >>>>> permTbl indexTbl ...... tbl
+	} else {
+		unserializeLiteralTable(info, index);
+		// >>>>> permTbl indexTbl ...... tbl
+	}
+}
+
+void unserializeFunction(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	byte numUpValues = info->readStream->readByte();
+
+	LClosure *lclosure = (LClosure *)lua_newLclosure(info->luaState, numUpValues, hvalue(&info->luaState->l_gt));
+	pushClosure(info->luaState, (Closure *)lclosure);
+	// >>>>> permTbl indexTbl ...... func
+
+	// Put *some* proto in the closure, before the GC can find it
+	lclosure->p = makeFakeProto(info->luaState, numUpValues);
+
+	//Also, we need to temporarily fill the upvalues
+	lua_pushnil(info->luaState);
+	// >>>>> permTbl indexTbl ...... func nil
+
+	for (byte i = 0; i < numUpValues; ++i) {
+		lclosure->upvals[i] = createUpValue(info->luaState, -1);
+	}
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... func
+
+	// I can't see offhand how a function would ever get to be self-
+	// referential, but just in case let's register it early
+	registerObjectInIndexTable(info, index);
+
+	// Now that it's safe, we can get the real proto
+	unserialize(info);
+	// >>>>> permTbl indexTbl ...... func proto
+
+	lclosure->p = gco2p(getObject(info->luaState, -1)->value.gc);
+
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... func
+
+	for (byte i = 0; i < numUpValues; ++i) {
+		// >>>>> permTbl indexTbl ...... func
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... func func2
+
+		unboxUpValue(info->luaState);
+		// >>>>> permTbl indexTbl ...... func upValue
+		lclosure->upvals[i] = gco2uv(getObject(info->luaState, -1)->value.gc);
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+	}
+
+	// Finally, the fenv
+	unserialize(info);
+
+	// >>>>> permTbl indexTbl ...... func ?fenv/nil?
+	if (!lua_isnil(info->luaState, -1)) {
+		// >>>>> permTbl indexTbl ...... func fenv
+		lua_setfenv(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... func
+	} else {
+		// >>>>> permTbl indexTbl ...... func nil
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... func
+	}
+
+	// >>>>> permTbl indexTbl ...... func
+}
+
+void unserializeThread(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	lua_State *L2;
+	uint32 stacklimit = 0;
+
+	L2 = lua_newthread(info->luaState);
+	lua_checkstack(info->luaState, 3);
+
+	// L1: permTbl indexTbl ...... thread
+	// L2: (empty)
+	registerObjectInIndexTable(info, index);
+
+	// First, deserialize the object stack
+	uint32 stackSize = info->readStream->readUint32LE();
+	lua_growstack(info->luaState, (int)stackSize);
+
+	// Make sure that the first stack element (a nil, representing
+	// the imaginary top-level C function) is written to the very,
+	// very bottom of the stack
+	L2->top--;
+	for (uint32 i = 0; i < stackSize; ++i) {
+		unserialize(info);
+		// L1: permTbl indexTbl ...... thread obj*
+	}
+
+	lua_xmove(info->luaState, L2, stackSize);
+	// L1: permTbl indexTbl ...... thread
+	// L2: obj*
+
+	// Hereafter, stacks refer to L1
+
+
+	// Now, deserialize the CallInfo stack
+
+	uint32 numFrames = info->readStream->readUint32LE();
+
+	lua_reallocCallInfo(L2, numFrames * 2);
+	for (uint32 i = 0; i < numFrames; ++i) {
+		CallInfo *ci = L2->base_ci + i;
+		uint32 stackbase = info->readStream->readUint32LE();
+		uint32 stackfunc = info->readStream->readUint32LE();
+		uint32 stacktop = info->readStream->readUint32LE();
+
+		ci->nresults = info->readStream->readSint32LE();
+
+		uint32 savedpc = info->readStream->readUint32LE();
+
+		if (stacklimit < stacktop) {
+			stacklimit = stacktop;
+		}
+
+		ci->base = L2->stack + stackbase;
+		ci->func = L2->stack + stackfunc;
+		ci->top = L2->stack + stacktop;
+		ci->savedpc = (ci != L2->base_ci) ? ci_func(ci)->l.p->code + savedpc : 0;
+		ci->tailcalls = 0;
+
+		// Update the pointer each time, to keep the GC happy
+		L2->ci = ci;
+	}
+
+	// >>>>> permTbl indexTbl ...... thread
+	// Deserialize the state's other parameters, with the exception of upval stuff
+
+	L2->savedpc = L2->ci->savedpc;
+	L2->status = info->readStream->readByte();
+	uint32 stackbase = info->readStream->readUint32LE();
+	uint32 stacktop = info->readStream->readUint32LE();
+
+
+	L2->errfunc = info->readStream->readUint32LE();
+
+	L2->base = L2->stack + stackbase;
+	L2->top = L2->stack + stacktop;
+
+	// Finally, "reopen" upvalues. See serializeUpVal() for why we do this
+	UpVal *uv;
+	GCObject **nextslot = &L2->openupval;
+	global_State *g = G(L2);
+
+	while (true) {
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... thread upVal/nil
+
+		// The list is terminated by a nil
+		if (lua_isnil(info->luaState, -1)) {
+			// >>>>> permTbl indexTbl ...... thread nil
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... thread
+			break;
+		}
+
+		// >>>>> permTbl indexTbl ...... thread boxedUpVal
+		unboxUpValue(info->luaState);
+		// >>>>> permTbl indexTbl ...... thread boxedUpVal
+
+		uv = &(getObject(info->luaState, -1)->value.gc->uv);
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... thread
+
+		uint32 stackpos = info->readStream->readUint32LE();
+		uv->v = L2->stack + stackpos;
+
+		GCUnlink(info->luaState, (GCObject *)uv);
+
+		uv->marked = luaC_white(g);
+		*nextslot = (GCObject *)uv;
+		nextslot = &uv->next;
+		uv->u.l.prev = &G(L2)->uvhead;
+		uv->u.l.next = G(L2)->uvhead.u.l.next;
+		uv->u.l.next->u.l.prev = uv;
+		G(L2)->uvhead.u.l.next = uv;
+		lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+	}
+	*nextslot = NULL;
+
+	// The stack must be valid at least to the highest value among the CallInfos
+	// 'top' and the values up to there must be filled with 'nil'
+	lua_checkstack(L2, (int)stacklimit);
+	for (StkId o = L2->top; o <= L2->top + stacklimit; ++o) {
+		setnilvalue(o);
+	}
+}
+
+void unserializeProto(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// We have to be careful. The GC expects a lot out of protos. In particular, we need
+	// to give the function a valid string for its source, and valid code, even before we
+	// actually read in the real code.
+	TString *source = lua_newlstr(info->luaState, "", 0);
+	Proto *p = lua_newproto(info->luaState);
+	p->source = source;
+	p->sizecode = 1;
+	p->code = (Instruction *)lua_reallocv(info->luaState, NULL, 0, 1, sizeof(Instruction));
+	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
+	p->maxstacksize = 2;
+	p->sizek = 0;
+	p->sizep = 0;
+
+	lua_checkstack(info->luaState, 2);
+
+	pushProto(info->luaState, p);
+	// >>>>> permTbl indexTbl ...... proto
+
+	// We don't need to register early, since protos can never ever be
+	// involved in cyclic references
+
+	// Read in constant references
+	int sizek = info->readStream->readSint32LE();
+	lua_reallocvector(info->luaState, p->k, 0, sizek, TValue);
+	for (int i = 0; i < sizek; ++i) {
+		// >>>>> permTbl indexTbl ...... proto
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... proto  k
+
+		setobj2s(info->luaState, &p->k[i], getObject(info->luaState, -1));
+		p->sizek++;
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in sub-proto references
+
+	int sizep = info->readStream->readSint32LE();
+	lua_reallocvector(info->luaState, p->p, 0, sizep, Proto *);
+	for (int i = 0; i < sizep; ++i) {
+		// >>>>> permTbl indexTbl ...... proto
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... proto  subproto
+
+		p->p[i] = (Proto *)getObject(info->luaState, -1)->value.gc;
+		p->sizep++;
+
+		lua_pop(info->luaState, 1);
+		// >>>>> permTbl indexTbl ...... proto
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+
+	// Read in code
+	p->sizecode = info->readStream->readSint32LE();
+	lua_reallocvector(info->luaState, p->code, 1, p->sizecode, Instruction);
+	info->readStream->read(p->code, sizeof(Instruction) * p->sizecode);
+
+
+	/* Read in upvalue names */
+	p->sizeupvalues = info->readStream->readSint32LE();
+	if (p->sizeupvalues) {
+		lua_reallocvector(info->luaState, p->upvalues, 0, p->sizeupvalues, TString *);
+		for (int i = 0; i < p->sizeupvalues; ++i) {
+			// >>>>> permTbl indexTbl ...... proto
+			unserialize(info);
+			// >>>>> permTbl indexTbl ...... proto str
+
+			p->upvalues[i] = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... proto
+		}
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in local variable infos
+	p->sizelocvars = info->readStream->readSint32LE();
+	if (p->sizelocvars) {
+		lua_reallocvector(info->luaState, p->locvars, 0, p->sizelocvars, LocVar);
+		for (int i = 0; i < p->sizelocvars; ++i) {
+			// >>>>> permTbl indexTbl ...... proto
+			unserialize(info);
+			// >>>>> permTbl indexTbl ...... proto str
+
+			p->locvars[i].varname = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
+			lua_pop(info->luaState, 1);
+			// >>>>> permTbl indexTbl ...... proto
+
+			p->locvars[i].startpc = info->readStream->readSint32LE();
+			p->locvars[i].endpc = info->readStream->readSint32LE();
+		}
+	}
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in source string
+	unserialize(info);
+	// >>>>> permTbl indexTbl ...... proto sourceStr
+
+	p->source = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
+	lua_pop(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... proto
+
+	// Read in line numbers
+	p->sizelineinfo = info->readStream->readSint32LE();
+	if (p->sizelineinfo) {
+		lua_reallocvector(info->luaState, p->lineinfo, 0, p->sizelineinfo, int);
+		info->readStream->read(p->lineinfo, sizeof(int) * p->sizelineinfo);
+	}
+
+
+	/* Read in linedefined and lastlinedefined */
+	p->linedefined = info->readStream->readSint32LE();
+	p->lastlinedefined = info->readStream->readSint32LE();
+
+	// Read in misc values
+	p->nups = info->readStream->readByte();
+	p->numparams = info->readStream->readByte();
+	p->is_vararg = info->readStream->readByte();
+	p->maxstacksize = info->readStream->readByte();
+}
+
+void unserializeUpValue(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+	lua_checkstack(info->luaState, 2);
+
+	boxUpValue_start(info->luaState);
+	// >>>>> permTbl indexTbl ...... func
+	registerObjectInIndexTable(info, index);
+
+	unserialize(info);
+	// >>>>> permTbl indexTbl ...... func obj
+
+	boxUpValue_finish(info->luaState);
+	// >>>>> permTbl indexTbl ...... func
+}
+
+void unserializeUserData(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	int isspecial = info->readStream->readSint32LE();
+	if (isspecial) {
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... specialFunc
+
+		lua_call(info->luaState, 0, 1);
+		// >>>>> permTbl indexTbl ...... udata
+	} else {
+		uint32 length = info->readStream->readUint32LE();
+		lua_newuserdata(info->luaState, length);
+		// >>>>> permTbl indexTbl ...... udata
+		registerObjectInIndexTable(info, index);
+
+		info->readStream->read(lua_touserdata(info->luaState, -1), length);
+
+		unserialize(info);
+		// >>>>> permTbl indexTbl ...... udata metaTable/nil
+
+		lua_setmetatable(info->luaState, -2);
+		// >>>>> permTbl indexTbl ...... udata
+	}
+	// >>>>> permTbl indexTbl ...... udata
+}
+
+void unserializePermanent(UnSerializationInfo *info, int index) {
+	// >>>>> permTbl indexTbl ......
+
+	// Make sure there is enough room on the stack
+	lua_checkstack(info->luaState, 2);
+
+	unserialize(info);
+	// >>>>> permTbl indexTbl ...... permKey
+
+	lua_gettable(info->luaState, 1);
+	// >>>>> permTbl indexTbl ...... perm
+}
+
+} // End of namespace Lua
diff --git a/engines/sword25/util/lua_unserializer.cpp b/engines/sword25/util/lua_unserializer.cpp
deleted file mode 100644
index 803c79c8c2..0000000000
--- a/engines/sword25/util/lua_unserializer.cpp
+++ /dev/null
@@ -1,698 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sword25/util/lua_serialization.h"
-
-#include "sword25/util/double_serializer.h"
-#include "sword25/util/lua_serialization_util.h"
-
-#include "common/stream.h"
-
-#include "lua/lobject.h"
-#include "lua/lstate.h"
-#include "lua/lgc.h"
-#include "lua/lopcodes.h"
-
-
-namespace Lua {
-
-struct UnSerializationInfo {
-	lua_State *luaState;
-	Common::ReadStream *readStream;
-};
-
-static void unserialize(UnSerializationInfo *info);
-
-static void unserializeBoolean(UnSerializationInfo *info);
-static void unserializeNumber(UnSerializationInfo *info);
-static void unserializeString(UnSerializationInfo *info);
-static void unserializeTable(UnSerializationInfo *info, int index);
-static void unserializeFunction(UnSerializationInfo *info, int index);
-static void unserializeThread(UnSerializationInfo *info, int index);
-static void unserializeProto(UnSerializationInfo *info, int index);
-static void unserializeUpValue(UnSerializationInfo *info, int index);
-static void unserializeUserData(UnSerializationInfo *info, int index);
-static void unserializePermanent(UnSerializationInfo *info, int index);
-
-
-void unserializeLua(lua_State *luaState, Common::ReadStream *readStream) {
-	UnSerializationInfo info;
-	info.luaState = luaState;
-	info.readStream = readStream;
-
-	// The process starts with the lua stack as follows:
-	// >>>>> permTbl
-	// That's the table of permanents
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(luaState, 3);
-
-	// Create a table to hold indexes of everything thats already been read
-	lua_newtable(luaState);
-	// >>>>> permTbl indexTbl
-
-	// Prevent garbage collection while we unserialize
-	lua_gc(luaState, LUA_GCSTOP, 0);
-
-	// Unserialize the root object
-	unserialize(&info);
-	// >>>>> permTbl indexTbl rootObj
-
-	// Re-start garbage collection
-	lua_gc(luaState, LUA_GCRESTART, 0);
-
-	// Remove the indexTbl
-	lua_replace(luaState, 2);
-	// >>>>> permTbl rootObj
-}
-
-/* The object is left on the stack. This is primarily used by unserialize, but
- * may be used by GCed objects that may incur cycles in order to preregister
- * the object. */
-static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ...... obj
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	lua_pushlightuserdata(info->luaState, (void *)index);
-	// >>>>> permTbl indexTbl ...... obj index
-
-	lua_pushvalue(info->luaState, -2);
-	// >>>>> permTbl indexTbl ...... obj index obj
-
-	// Push the k/v pair into the indexTbl
-	lua_settable(info->luaState, 2);
-	// >>>>> permTbl indexTbl ...... obj
-}
-
-static void unserialize(UnSerializationInfo *info) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	byte isARealValue = info->readStream->readByte();
-	if (isARealValue) {
-		int index = info->readStream->readSint32LE();
-		int type = info->readStream->readSint32LE();
-
-		switch (type) {
-		case LUA_TBOOLEAN:
-			unserializeBoolean(info);
-			break;
-		case LUA_TLIGHTUSERDATA:
-			// You can't serialize a pointer
-			// It would be meaningless on the next run
-			assert(0);
-			break;
-		case LUA_TNUMBER:
-			unserializeNumber(info);
-			break;
-		case LUA_TSTRING:
-			unserializeString(info);
-			break;
-		case LUA_TTABLE:
-			unserializeTable(info, index);
-			break;
-		case LUA_TFUNCTION:
-			unserializeFunction(info, index);
-			break;
-		case LUA_TTHREAD:
-			unserializeThread(info, index);
-			break;
-		case LUA_TPROTO:
-			unserializeProto(info, index);
-			break;
-		case LUA_TUPVAL:
-			unserializeUpValue(info, index);
-			break;
-		case LUA_TUSERDATA:
-			unserializeUserData(info, index);
-			break;
-		case PERMANENT_TYPE:
-			unserializePermanent(info, index);
-			break;
-		default:
-			assert(0);
-		}
-
-
-		// >>>>> permTbl indexTbl ...... obj
-		assert(lua_type(info->luaState, -1) == type ||
-		       type == PERMANENT_TYPE ||
-		       // Remember, upvalues get a special dispensation, as described in boxUpValue
-		       (lua_type(info->luaState, -1) == LUA_TFUNCTION && type == LUA_TUPVAL));
-
-		registerObjectInIndexTable(info, index);
-		// >>>>> permTbl indexTbl ...... obj
-	} else {
-		int index = info->readStream->readSint32LE();
-
-		if (index == 0) {
-			lua_pushnil(info->luaState);
-			// >>>>> permTbl indexTbl ...... nil
-		} else {
-			// Fetch the object from the indexTbl
-
-			lua_pushlightuserdata(info->luaState, (void *)index);
-			// >>>>> permTbl indexTbl ...... index
-
-			lua_gettable(info->luaState, 2);
-			// >>>>> permTbl indexTbl ...... ?obj?
-
-			assert(!lua_isnil(info->luaState, -1));
-		}
-		// >>>>> permTbl indexTbl ...... obj/nil
-	}
-
-	// >>>>> permTbl indexTbl ...... obj/nil
-}
-
-static void unserializeBoolean(UnSerializationInfo *info) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 1);
-
-	int value = info->readStream->readSint32LE();
-
-	lua_pushboolean(info->luaState, value);
-	// >>>>> permTbl indexTbl ...... bool
-}
-
-static void unserializeNumber(UnSerializationInfo *info) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 1);
-
-	// Read the serialized double
-	Util::SerializedDouble serializedValue;
-	serializedValue.significandOne = info->readStream->readUint32LE();
-	serializedValue.signAndSignificandTwo = info->readStream->readUint32LE();
-	serializedValue.exponent = info->readStream->readSint16LE();
-
-	lua_Number value = Util::decodeDouble(serializedValue);
-
-	lua_pushnumber(info->luaState, value);
-	// >>>>> permTbl indexTbl ...... num
-}
-
-static void unserializeString(UnSerializationInfo *info) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 1);
-
-	uint32 length = info->readStream->readUint32LE();
-	char *string = new char[length];
-
-	info->readStream->read(string, length);
-	lua_pushlstring(info->luaState, string, length);
-
-	// >>>>> permTbl indexTbl ...... string
-
-	delete[] string;
-}
-
-static void unserializeSpecialTable(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 1);
-
-	unserialize(info);
-
-	// >>>>> permTbl indexTbl ...... spfunc
-	lua_call(info->luaState, 0, 1);
-	// >>>>> permTbl indexTbl ...... tbl
-}
-
-static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 3);
-
-	// Preregister table for handling of cycles
-	lua_newtable(info->luaState);
-
-	// >>>>> permTbl indexTbl ...... tbl
-	registerObjectInIndexTable(info, index);
-	// >>>>> permTbl indexTbl ...... tbl
-
-	// Unserialize metatable
-	unserialize(info);
-	// >>>>> permTbl indexTbl ...... tbl ?metaTbl/nil?
-
-	if (lua_istable(info->luaState, -1)) {
-		// >>>>> permTbl indexTbl ...... tbl metaTbl
-		lua_setmetatable(info->luaState, -2);
-		// >>>>> permTbl indexTbl ...... tbl
-	} else {
-		// >>>>> permTbl indexTbl ...... tbl nil
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... tbl
-	}
-	// >>>>> permTbl indexTbl ...... tbl
-
-
-	while (1) {
-		// >>>>> permTbl indexTbl ...... tbl
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... tbl key/nil
-
-		// The table serialization is nil terminated
-		if (lua_isnil(info->luaState, -1)) {
-			// >>>>> permTbl indexTbl ...... tbl nil
-			lua_pop(info->luaState, 1);
-			// >>>>> permTbl indexTbl ...... tbl
-
-			break;
-		}
-
-		// >>>>> permTbl indexTbl ...... tbl key
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... tbl value
-
-		lua_rawset(info->luaState, -3);
-		// >>>>> permTbl indexTbl ...... tbl
-	}
-}
-
-void unserializeTable(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 1);
-
-	int isSpecial = info->readStream->readSint32LE();
-
-	if (isSpecial) {
-		unserializeSpecialTable(info, index);
-		// >>>>> permTbl indexTbl ...... tbl
-	} else {
-		unserializeLiteralTable(info, index);
-		// >>>>> permTbl indexTbl ...... tbl
-	}
-}
-
-void unserializeFunction(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	byte numUpValues = info->readStream->readByte();
-
-	LClosure *lclosure = (LClosure *)lua_newLclosure(info->luaState, numUpValues, hvalue(&info->luaState->l_gt));
-	pushClosure(info->luaState, (Closure *)lclosure);
-	// >>>>> permTbl indexTbl ...... func
-
-	// Put *some* proto in the closure, before the GC can find it
-	lclosure->p = makeFakeProto(info->luaState, numUpValues);
-
-	//Also, we need to temporarily fill the upvalues
-	lua_pushnil(info->luaState);
-	// >>>>> permTbl indexTbl ...... func nil
-
-	for (byte i = 0; i < numUpValues; ++i) {
-		lclosure->upvals[i] = createUpValue(info->luaState, -1);
-	}
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... func
-
-	// I can't see offhand how a function would ever get to be self-
-	// referential, but just in case let's register it early
-	registerObjectInIndexTable(info, index);
-
-	// Now that it's safe, we can get the real proto
-	unserialize(info);
-	// >>>>> permTbl indexTbl ...... func proto
-
-	lclosure->p = gco2p(getObject(info->luaState, -1)->value.gc);
-
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... func
-
-	for (byte i = 0; i < numUpValues; ++i) {
-		// >>>>> permTbl indexTbl ...... func
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... func func2
-
-		unboxUpValue(info->luaState);
-		// >>>>> permTbl indexTbl ...... func upValue
-		lclosure->upvals[i] = gco2uv(getObject(info->luaState, -1)->value.gc);
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... func
-	}
-
-	// Finally, the fenv
-	unserialize(info);
-
-	// >>>>> permTbl indexTbl ...... func ?fenv/nil?
-	if (!lua_isnil(info->luaState, -1)) {
-		// >>>>> permTbl indexTbl ...... func fenv
-		lua_setfenv(info->luaState, -2);
-		// >>>>> permTbl indexTbl ...... func
-	} else {
-		// >>>>> permTbl indexTbl ...... func nil
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... func
-	}
-
-	// >>>>> permTbl indexTbl ...... func
-}
-
-void unserializeThread(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	lua_State *L2;
-	uint32 stacklimit = 0;
-
-	L2 = lua_newthread(info->luaState);
-	lua_checkstack(info->luaState, 3);
-
-	// L1: permTbl indexTbl ...... thread
-	// L2: (empty)
-	registerObjectInIndexTable(info, index);
-
-	// First, deserialize the object stack
-	uint32 stackSize = info->readStream->readUint32LE();
-	lua_growstack(info->luaState, (int)stackSize);
-
-	// Make sure that the first stack element (a nil, representing
-	// the imaginary top-level C function) is written to the very,
-	// very bottom of the stack
-	L2->top--;
-	for (uint32 i = 0; i < stackSize; ++i) {
-		unserialize(info);
-		// L1: permTbl indexTbl ...... thread obj*
-	}
-
-	lua_xmove(info->luaState, L2, stackSize);
-	// L1: permTbl indexTbl ...... thread
-	// L2: obj*
-
-	// Hereafter, stacks refer to L1
-
-
-	// Now, deserialize the CallInfo stack
-
-	uint32 numFrames = info->readStream->readUint32LE();
-
-	lua_reallocCallInfo(L2, numFrames * 2);
-	for (uint32 i = 0; i < numFrames; ++i) {
-		CallInfo *ci = L2->base_ci + i;
-		uint32 stackbase = info->readStream->readUint32LE();
-		uint32 stackfunc = info->readStream->readUint32LE();
-		uint32 stacktop = info->readStream->readUint32LE();
-
-		ci->nresults = info->readStream->readSint32LE();
-
-		uint32 savedpc = info->readStream->readUint32LE();
-
-		if (stacklimit < stacktop) {
-			stacklimit = stacktop;
-		}
-
-		ci->base = L2->stack + stackbase;
-		ci->func = L2->stack + stackfunc;
-		ci->top = L2->stack + stacktop;
-		ci->savedpc = (ci != L2->base_ci) ? ci_func(ci)->l.p->code + savedpc : 0;
-		ci->tailcalls = 0;
-
-		// Update the pointer each time, to keep the GC happy
-		L2->ci = ci;
-	}
-
-	// >>>>> permTbl indexTbl ...... thread
-	// Deserialize the state's other parameters, with the exception of upval stuff
-
-	L2->savedpc = L2->ci->savedpc;
-	L2->status = info->readStream->readByte();
-	uint32 stackbase = info->readStream->readUint32LE();
-	uint32 stacktop = info->readStream->readUint32LE();
-
-
-	L2->errfunc = info->readStream->readUint32LE();
-
-	L2->base = L2->stack + stackbase;
-	L2->top = L2->stack + stacktop;
-
-	// Finally, "reopen" upvalues. See serializeUpVal() for why we do this
-	UpVal *uv;
-	GCObject **nextslot = &L2->openupval;
-	global_State *g = G(L2);
-
-	while (true) {
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... thread upVal/nil
-
-		// The list is terminated by a nil
-		if (lua_isnil(info->luaState, -1)) {
-			// >>>>> permTbl indexTbl ...... thread nil
-			lua_pop(info->luaState, 1);
-			// >>>>> permTbl indexTbl ...... thread
-			break;
-		}
-
-		// >>>>> permTbl indexTbl ...... thread boxedUpVal
-		unboxUpValue(info->luaState);
-		// >>>>> permTbl indexTbl ...... thread boxedUpVal
-
-		uv = &(getObject(info->luaState, -1)->value.gc->uv);
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... thread
-
-		uint32 stackpos = info->readStream->readUint32LE();
-		uv->v = L2->stack + stackpos;
-
-		GCUnlink(info->luaState, (GCObject *)uv);
-
-		uv->marked = luaC_white(g);
-		*nextslot = (GCObject *)uv;
-		nextslot = &uv->next;
-		uv->u.l.prev = &G(L2)->uvhead;
-		uv->u.l.next = G(L2)->uvhead.u.l.next;
-		uv->u.l.next->u.l.prev = uv;
-		G(L2)->uvhead.u.l.next = uv;
-		lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
-	}
-	*nextslot = NULL;
-
-	// The stack must be valid at least to the highest value among the CallInfos
-	// 'top' and the values up to there must be filled with 'nil'
-	lua_checkstack(L2, (int)stacklimit);
-	for (StkId o = L2->top; o <= L2->top + stacklimit; ++o) {
-		setnilvalue(o);
-	}
-}
-
-void unserializeProto(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// We have to be careful. The GC expects a lot out of protos. In particular, we need
-	// to give the function a valid string for its source, and valid code, even before we
-	// actually read in the real code.
-	TString *source = lua_newlstr(info->luaState, "", 0);
-	Proto *p = lua_newproto(info->luaState);
-	p->source = source;
-	p->sizecode = 1;
-	p->code = (Instruction *)lua_reallocv(info->luaState, NULL, 0, 1, sizeof(Instruction));
-	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
-	p->maxstacksize = 2;
-	p->sizek = 0;
-	p->sizep = 0;
-
-	lua_checkstack(info->luaState, 2);
-
-	pushProto(info->luaState, p);
-	// >>>>> permTbl indexTbl ...... proto
-
-	// We don't need to register early, since protos can never ever be
-	// involved in cyclic references
-
-	// Read in constant references
-	int sizek = info->readStream->readSint32LE();
-	lua_reallocvector(info->luaState, p->k, 0, sizek, TValue);
-	for (int i = 0; i < sizek; ++i) {
-		// >>>>> permTbl indexTbl ...... proto
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... proto  k
-
-		setobj2s(info->luaState, &p->k[i], getObject(info->luaState, -1));
-		p->sizek++;
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto
-	}
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Read in sub-proto references
-
-	int sizep = info->readStream->readSint32LE();
-	lua_reallocvector(info->luaState, p->p, 0, sizep, Proto *);
-	for (int i = 0; i < sizep; ++i) {
-		// >>>>> permTbl indexTbl ...... proto
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... proto  subproto
-
-		p->p[i] = (Proto *)getObject(info->luaState, -1)->value.gc;
-		p->sizep++;
-
-		lua_pop(info->luaState, 1);
-		// >>>>> permTbl indexTbl ...... proto
-	}
-	// >>>>> permTbl indexTbl ...... proto
-
-
-	// Read in code
-	p->sizecode = info->readStream->readSint32LE();
-	lua_reallocvector(info->luaState, p->code, 1, p->sizecode, Instruction);
-	info->readStream->read(p->code, sizeof(Instruction) * p->sizecode);
-
-
-	/* Read in upvalue names */
-	p->sizeupvalues = info->readStream->readSint32LE();
-	if (p->sizeupvalues) {
-		lua_reallocvector(info->luaState, p->upvalues, 0, p->sizeupvalues, TString *);
-		for (int i = 0; i < p->sizeupvalues; ++i) {
-			// >>>>> permTbl indexTbl ...... proto
-			unserialize(info);
-			// >>>>> permTbl indexTbl ...... proto str
-
-			p->upvalues[i] = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
-			lua_pop(info->luaState, 1);
-			// >>>>> permTbl indexTbl ...... proto
-		}
-	}
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Read in local variable infos
-	p->sizelocvars = info->readStream->readSint32LE();
-	if (p->sizelocvars) {
-		lua_reallocvector(info->luaState, p->locvars, 0, p->sizelocvars, LocVar);
-		for (int i = 0; i < p->sizelocvars; ++i) {
-			// >>>>> permTbl indexTbl ...... proto
-			unserialize(info);
-			// >>>>> permTbl indexTbl ...... proto str
-
-			p->locvars[i].varname = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
-			lua_pop(info->luaState, 1);
-			// >>>>> permTbl indexTbl ...... proto
-
-			p->locvars[i].startpc = info->readStream->readSint32LE();
-			p->locvars[i].endpc = info->readStream->readSint32LE();
-		}
-	}
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Read in source string
-	unserialize(info);
-	// >>>>> permTbl indexTbl ...... proto sourceStr
-
-	p->source = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
-	lua_pop(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... proto
-
-	// Read in line numbers
-	p->sizelineinfo = info->readStream->readSint32LE();
-	if (p->sizelineinfo) {
-		lua_reallocvector(info->luaState, p->lineinfo, 0, p->sizelineinfo, int);
-		info->readStream->read(p->lineinfo, sizeof(int) * p->sizelineinfo);
-	}
-
-
-	/* Read in linedefined and lastlinedefined */
-	p->linedefined = info->readStream->readSint32LE();
-	p->lastlinedefined = info->readStream->readSint32LE();
-
-	// Read in misc values
-	p->nups = info->readStream->readByte();
-	p->numparams = info->readStream->readByte();
-	p->is_vararg = info->readStream->readByte();
-	p->maxstacksize = info->readStream->readByte();
-}
-
-void unserializeUpValue(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-	lua_checkstack(info->luaState, 2);
-
-	boxUpValue_start(info->luaState);
-	// >>>>> permTbl indexTbl ...... func
-	registerObjectInIndexTable(info, index);
-
-	unserialize(info);
-	// >>>>> permTbl indexTbl ...... func obj
-
-	boxUpValue_finish(info->luaState);
-	// >>>>> permTbl indexTbl ...... func
-}
-
-void unserializeUserData(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	int isspecial = info->readStream->readSint32LE();
-	if (isspecial) {
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... specialFunc
-
-		lua_call(info->luaState, 0, 1);
-		// >>>>> permTbl indexTbl ...... udata
-	} else {
-		uint32 length = info->readStream->readUint32LE();
-		lua_newuserdata(info->luaState, length);
-		// >>>>> permTbl indexTbl ...... udata
-		registerObjectInIndexTable(info, index);
-
-		info->readStream->read(lua_touserdata(info->luaState, -1), length);
-
-		unserialize(info);
-		// >>>>> permTbl indexTbl ...... udata metaTable/nil
-
-		lua_setmetatable(info->luaState, -2);
-		// >>>>> permTbl indexTbl ...... udata
-	}
-	// >>>>> permTbl indexTbl ...... udata
-}
-
-void unserializePermanent(UnSerializationInfo *info, int index) {
-	// >>>>> permTbl indexTbl ......
-
-	// Make sure there is enough room on the stack
-	lua_checkstack(info->luaState, 2);
-
-	unserialize(info);
-	// >>>>> permTbl indexTbl ...... permKey
-
-	lua_gettable(info->luaState, 1);
-	// >>>>> permTbl indexTbl ...... perm
-}
-
-} // End of namespace Lua
-- 
cgit v1.2.3


From 08e3f21a8df184bc697e6c03adf968d0cbdbac21 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 15:22:43 -0600
Subject: SWORD25: Rename double serialization file to better represent what it
 is

AKA functions, rather than a class
---
 engines/sword25/module.mk                     |   2 +-
 engines/sword25/util/double_serialization.cpp | 138 ++++++++++++++++++++++++++
 engines/sword25/util/double_serialization.h   |  95 ++++++++++++++++++
 engines/sword25/util/double_serializer.cpp    | 138 --------------------------
 engines/sword25/util/double_serializer.h      |  95 ------------------
 engines/sword25/util/lua_persist.cpp          |   2 +-
 engines/sword25/util/lua_unpersist.cpp        |   2 +-
 7 files changed, 236 insertions(+), 236 deletions(-)
 create mode 100644 engines/sword25/util/double_serialization.cpp
 create mode 100644 engines/sword25/util/double_serialization.h
 delete mode 100644 engines/sword25/util/double_serializer.cpp
 delete mode 100644 engines/sword25/util/double_serializer.h

diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk
index 129b4f040e..0842eb9aa8 100644
--- a/engines/sword25/module.mk
+++ b/engines/sword25/module.mk
@@ -82,7 +82,7 @@ MODULE_OBJS := \
 	util/lua/lvm.o \
 	util/lua/lzio.o \
 	util/lua/scummvm_file.o \
-	util/double_serializer.o \
+	util/double_serialization.o \
 	util/lua_persistence_util.o \
 	util/lua_persist.o \
 	util/lua_unpersist.o
diff --git a/engines/sword25/util/double_serialization.cpp b/engines/sword25/util/double_serialization.cpp
new file mode 100644
index 0000000000..48fd75cb33
--- /dev/null
+++ b/engines/sword25/util/double_serialization.cpp
@@ -0,0 +1,138 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sword25/util/double_serialization.h"
+
+#include "common/scummsys.h"
+
+
+namespace Util {
+
+SerializedDouble encodeDouble(double value) {
+	// Split the value into its significand and exponent
+	int exponent;
+	double significand = frexp(value, &exponent);
+
+	// Shift the the first part of the significand into the integer range
+	double shiftedsignificandPart = ldexp(abs(significand), 32);
+	uint32 significandOne = uint32(floor(shiftedsignificandPart));
+
+	// Shift the remainder of the significand into the integer range
+	shiftedsignificandPart -= significandOne;
+	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 31));
+
+	SerializedDouble returnValue;
+	returnValue.significandOne = significandOne;                                // SignificandOne
+	returnValue.signAndSignificandTwo = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
+	                                    significandTwo;                         // SignificandTwo
+	returnValue.exponent = (int16)exponent;
+	return returnValue;
+}
+
+double decodeDouble(SerializedDouble value) {
+	// Expand the exponent and the parts of the significand
+	int exponent = (int)value.exponent;
+	double expandedsignificandOne = (double)value.significandOne;
+	double expandedsignificandTwo = (double)(value.signAndSignificandTwo & 0x7FFFFFFF);
+
+	// Deflate the significand
+	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
+	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
+
+	// Re-calculate the actual double
+	double returnValue = ldexp(significand, exponent);
+
+	// Check the sign bit and return
+	return ((value.signAndSignificandTwo & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
+}
+
+uint64 encodeDouble_64(double value) {
+	// Split the value into its significand and exponent
+	int exponent;
+	double significand = frexp(value, &exponent);
+
+	// Shift the significand into the integer range
+	double shiftedsignificand = ldexp(abs(significand), 53);
+
+	// Combine everything using the IEEE standard
+	uint64 uintsignificand = (uint64)shiftedsignificand;
+	return ((uint64)(value < 0 ? 1 : 0) << 63) |        // Sign
+	       ((uint64)(exponent + 1023) << 52) |          // Exponent stored as an offset to 1023
+	       (uintsignificand & 0x000FFFFFFFFFFFFF);      // significand with MSB inferred
+}
+
+double decodeDouble_64(uint64 value) {
+	// Expand the exponent and significand
+	int exponent = (int)((value >> 52) & 0x7FF) - 1023;
+	double expandedsignificand = (double)(0x10000000000000 /* Inferred MSB */ | (value & 0x000FFFFFFFFFFFFF));
+
+	// Deflate the significand
+	int temp;
+	double significand = frexp(expandedsignificand, &temp);
+
+	// Re-calculate the actual double
+	double returnValue = ldexp(significand, exponent);
+
+	// Check the sign bit and return
+	return ((value & 0x8000000000000000) == 0x8000000000000000) ? -returnValue : returnValue;
+}
+
+CompactSerializedDouble encodeDouble_Compact(double value) {
+	// Split the value into its significand and exponent
+	int exponent;
+	double significand = frexp(value, &exponent);
+
+	// Shift the the first part of the significand into the integer range
+	double shiftedsignificandPart = ldexp(abs(significand), 32);
+	uint32 significandOne = uint32(floor(shiftedsignificandPart));
+
+	// Shift the remainder of the significand into the integer range
+	shiftedsignificandPart -= significandOne;
+	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 21));
+
+	CompactSerializedDouble returnValue;
+	returnValue.signAndSignificandOne = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
+	                                    (significandOne & 0x7FFFFFFF);          // significandOne with MSB inferred
+	// Exponent stored as an offset to 1023
+	returnValue.exponentAndSignificandTwo = ((uint32)(exponent + 1023) << 21) | significandTwo;
+
+	return returnValue;
+}
+
+double decodeDouble_Compact(CompactSerializedDouble value) {
+	// Expand the exponent and the parts of the significand
+	int exponent = (int)(value.exponentAndSignificandTwo >> 21) - 1023;
+	double expandedsignificandOne = (double)(0x80000000 /* Inferred MSB */ | (value.signAndSignificandOne & 0x7FFFFFFF));
+	double expandedsignificandTwo = (double)(value.exponentAndSignificandTwo & 0x1FFFFF);
+
+	// Deflate the significand
+	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
+	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
+
+	// Re-calculate the actual double
+	double returnValue = ldexp(significand, exponent);
+
+	// Check the sign bit and return
+	return ((value.signAndSignificandOne & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
+}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/util/double_serialization.h b/engines/sword25/util/double_serialization.h
new file mode 100644
index 0000000000..e90338c369
--- /dev/null
+++ b/engines/sword25/util/double_serialization.h
@@ -0,0 +1,95 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef DOUBLE_SERIALIZATION_H
+#define DOUBLE_SERIALIZATION_H
+
+#include "common/types.h"
+
+
+namespace Util {
+
+struct SerializedDouble {
+	uint32 significandOne;
+	uint32 signAndSignificandTwo;
+	int16 exponent;
+};
+
+struct CompactSerializedDouble {
+	uint32 signAndSignificandOne;
+	uint32 exponentAndSignificandTwo;
+};
+
+/**
+ * Encodes a double as two uint32 and a one int16
+ *
+ * Supports denormalized numbers. Does NOT support NaN, or Inf
+ *
+ * @param value    The value to encode
+ * @return         The encoded value
+ */
+SerializedDouble encodeDouble(double value);
+/**
+ * Decodes a previously encoded double
+ *
+ * @param value    The value to decode
+ * @return         The decoded value
+ */
+double decodeDouble(SerializedDouble value);
+
+/**
+ * Encodes a double as a uint64
+ *
+ * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
+ *
+ * @param value    The value to encode
+ * @return         The encoded value
+ */
+uint64 encodeDouble_64(double value);
+/**
+ * Decodes a previously encoded double
+ *
+ * @param value    The value to decode
+ * @return         The decoded value
+ */
+double decodeDouble_64(uint64 value);
+
+/**
+ * Encodes a double as two uint32
+ *
+ * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
+ *
+ * @param value    The value to encode
+ * @return         The encoded value
+ */
+CompactSerializedDouble encodeDouble_Compact(double value);
+/**
+ * Decodes a previously encoded double
+ *
+ * @param value    The value to decode
+ * @return         The decoded value
+ */
+double decodeDouble_Compact(CompactSerializedDouble value);
+
+} // End of namespace Sword25
+
+#endif
diff --git a/engines/sword25/util/double_serializer.cpp b/engines/sword25/util/double_serializer.cpp
deleted file mode 100644
index d7ba4f3052..0000000000
--- a/engines/sword25/util/double_serializer.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sword25/util/double_serializer.h"
-
-#include "common/scummsys.h"
-
-
-namespace Util {
-
-SerializedDouble encodeDouble(double value) {
-	// Split the value into its significand and exponent
-	int exponent;
-	double significand = frexp(value, &exponent);
-
-	// Shift the the first part of the significand into the integer range
-	double shiftedsignificandPart = ldexp(abs(significand), 32);
-	uint32 significandOne = uint32(floor(shiftedsignificandPart));
-
-	// Shift the remainder of the significand into the integer range
-	shiftedsignificandPart -= significandOne;
-	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 31));
-
-	SerializedDouble returnValue;
-	returnValue.significandOne = significandOne;                                // SignificandOne
-	returnValue.signAndSignificandTwo = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
-	                                    significandTwo;                         // SignificandTwo
-	returnValue.exponent = (int16)exponent;
-	return returnValue;
-}
-
-double decodeDouble(SerializedDouble value) {
-	// Expand the exponent and the parts of the significand
-	int exponent = (int)value.exponent;
-	double expandedsignificandOne = (double)value.significandOne;
-	double expandedsignificandTwo = (double)(value.signAndSignificandTwo & 0x7FFFFFFF);
-
-	// Deflate the significand
-	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
-	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
-
-	// Re-calculate the actual double
-	double returnValue = ldexp(significand, exponent);
-
-	// Check the sign bit and return
-	return ((value.signAndSignificandTwo & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
-}
-
-uint64 encodeDouble_64(double value) {
-	// Split the value into its significand and exponent
-	int exponent;
-	double significand = frexp(value, &exponent);
-
-	// Shift the significand into the integer range
-	double shiftedsignificand = ldexp(abs(significand), 53);
-
-	// Combine everything using the IEEE standard
-	uint64 uintsignificand = (uint64)shiftedsignificand;
-	return ((uint64)(value < 0 ? 1 : 0) << 63) |        // Sign
-	       ((uint64)(exponent + 1023) << 52) |          // Exponent stored as an offset to 1023
-	       (uintsignificand & 0x000FFFFFFFFFFFFF);      // significand with MSB inferred
-}
-
-double decodeDouble_64(uint64 value) {
-	// Expand the exponent and significand
-	int exponent = (int)((value >> 52) & 0x7FF) - 1023;
-	double expandedsignificand = (double)(0x10000000000000 /* Inferred MSB */ | (value & 0x000FFFFFFFFFFFFF));
-
-	// Deflate the significand
-	int temp;
-	double significand = frexp(expandedsignificand, &temp);
-
-	// Re-calculate the actual double
-	double returnValue = ldexp(significand, exponent);
-
-	// Check the sign bit and return
-	return ((value & 0x8000000000000000) == 0x8000000000000000) ? -returnValue : returnValue;
-}
-
-CompactSerializedDouble encodeDouble_Compact(double value) {
-	// Split the value into its significand and exponent
-	int exponent;
-	double significand = frexp(value, &exponent);
-
-	// Shift the the first part of the significand into the integer range
-	double shiftedsignificandPart = ldexp(abs(significand), 32);
-	uint32 significandOne = uint32(floor(shiftedsignificandPart));
-
-	// Shift the remainder of the significand into the integer range
-	shiftedsignificandPart -= significandOne;
-	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 21));
-
-	CompactSerializedDouble returnValue;
-	returnValue.signAndSignificandOne = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
-	                                    (significandOne & 0x7FFFFFFF);          // significandOne with MSB inferred
-	// Exponent stored as an offset to 1023
-	returnValue.exponentAndSignificandTwo = ((uint32)(exponent + 1023) << 21) | significandTwo;
-
-	return returnValue;
-}
-
-double decodeDouble_Compact(CompactSerializedDouble value) {
-	// Expand the exponent and the parts of the significand
-	int exponent = (int)(value.exponentAndSignificandTwo >> 21) - 1023;
-	double expandedsignificandOne = (double)(0x80000000 /* Inferred MSB */ | (value.signAndSignificandOne & 0x7FFFFFFF));
-	double expandedsignificandTwo = (double)(value.exponentAndSignificandTwo & 0x1FFFFF);
-
-	// Deflate the significand
-	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
-	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
-
-	// Re-calculate the actual double
-	double returnValue = ldexp(significand, exponent);
-
-	// Check the sign bit and return
-	return ((value.signAndSignificandOne & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
-}
-
-} // End of namespace Sword25
diff --git a/engines/sword25/util/double_serializer.h b/engines/sword25/util/double_serializer.h
deleted file mode 100644
index e90338c369..0000000000
--- a/engines/sword25/util/double_serializer.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef DOUBLE_SERIALIZATION_H
-#define DOUBLE_SERIALIZATION_H
-
-#include "common/types.h"
-
-
-namespace Util {
-
-struct SerializedDouble {
-	uint32 significandOne;
-	uint32 signAndSignificandTwo;
-	int16 exponent;
-};
-
-struct CompactSerializedDouble {
-	uint32 signAndSignificandOne;
-	uint32 exponentAndSignificandTwo;
-};
-
-/**
- * Encodes a double as two uint32 and a one int16
- *
- * Supports denormalized numbers. Does NOT support NaN, or Inf
- *
- * @param value    The value to encode
- * @return         The encoded value
- */
-SerializedDouble encodeDouble(double value);
-/**
- * Decodes a previously encoded double
- *
- * @param value    The value to decode
- * @return         The decoded value
- */
-double decodeDouble(SerializedDouble value);
-
-/**
- * Encodes a double as a uint64
- *
- * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
- *
- * @param value    The value to encode
- * @return         The encoded value
- */
-uint64 encodeDouble_64(double value);
-/**
- * Decodes a previously encoded double
- *
- * @param value    The value to decode
- * @return         The decoded value
- */
-double decodeDouble_64(uint64 value);
-
-/**
- * Encodes a double as two uint32
- *
- * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
- *
- * @param value    The value to encode
- * @return         The encoded value
- */
-CompactSerializedDouble encodeDouble_Compact(double value);
-/**
- * Decodes a previously encoded double
- *
- * @param value    The value to decode
- * @return         The decoded value
- */
-double decodeDouble_Compact(CompactSerializedDouble value);
-
-} // End of namespace Sword25
-
-#endif
diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
index b9c0b13e11..939dbf38a8 100644
--- a/engines/sword25/util/lua_persist.cpp
+++ b/engines/sword25/util/lua_persist.cpp
@@ -22,7 +22,7 @@
 
 #include "sword25/util/lua_persistence.h"
 
-#include "sword25/util/double_serializer.h"
+#include "sword25/util/double_serialization.h"
 #include "sword25/util/lua_persistence_util.h"
 
 #include "common/stream.h"
diff --git a/engines/sword25/util/lua_unpersist.cpp b/engines/sword25/util/lua_unpersist.cpp
index aa924ff7c5..8d644302f9 100644
--- a/engines/sword25/util/lua_unpersist.cpp
+++ b/engines/sword25/util/lua_unpersist.cpp
@@ -22,7 +22,7 @@
 
 #include "sword25/util/lua_persistence.h"
 
-#include "sword25/util/double_serializer.h"
+#include "sword25/util/double_serialization.h"
 #include "sword25/util/lua_persistence_util.h"
 
 #include "common/stream.h"
-- 
cgit v1.2.3


From 8668707f160fa171edfa68df036f28c7ba4e9a88 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 15:11:17 -0600
Subject: SWORD25: Fix how nils are persisted

The unpersist code expects nils to be represented as an index with value 0.
The persist code incorrectly wrote out this data
---
 engines/sword25/util/lua_persist.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
index 939dbf38a8..6d758067ad 100644
--- a/engines/sword25/util/lua_persist.cpp
+++ b/engines/sword25/util/lua_persist.cpp
@@ -59,7 +59,7 @@ void persistLua(lua_State *luaState, Common::WriteStream *writeStream) {
 	SerializationInfo info;
 	info.luaState = luaState;
 	info.writeStream = writeStream;
-	info.counter = 0u;
+	info.counter = 1u;
 
 	// The process starts with the lua stack as follows:
 	// >>>>> permTbl rootObj
@@ -145,19 +145,22 @@ static void serialize(SerializationInfo *info) {
 		return;
 	}
 
-	// Pop the nil off the stack
+	// Pop the index/nil off the stack
 	lua_pop(info->luaState, 1);
 
-	// Write out a flag that indicates that this is a real object
-	info->writeStream->writeByte(1);
-
-	// If the object itself is nil, then write out a zero as a placeholder
+	// If the obj itself is nil, we represent it as an index of 0
 	if (lua_isnil(info->luaState, -1)) {
+		// Write out a flag that indicates that it's an index
 		info->writeStream->writeByte(0);
+		// Write out the index
+		info->writeStream->writeUint32LE(0);
 
 		return;
 	}
 
+	// Write out a flag that indicates that this is a real object
+	info->writeStream->writeByte(1);
+
 	// Add the object to the indexTbl
 
 	lua_pushvalue(info->luaState, -1);
-- 
cgit v1.2.3


From 67114c3e7eafdd6ba8c7bc799a40f789acc1efa3 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 15:30:55 -0600
Subject: SWORD25: Remove old lua persistence files

---
 engines/sword25/util/pluto/CHANGELOG   |   37 -
 engines/sword25/util/pluto/FILEFORMAT  |  168 ---
 engines/sword25/util/pluto/README      |  133 --
 engines/sword25/util/pluto/THANKS      |    9 -
 engines/sword25/util/pluto/pdep.cpp    |  112 --
 engines/sword25/util/pluto/pdep/README |    5 -
 engines/sword25/util/pluto/pdep/lzio.h |   65 -
 engines/sword25/util/pluto/pdep/pdep.h |   42 -
 engines/sword25/util/pluto/pluto.cpp   | 2083 --------------------------------
 engines/sword25/util/pluto/pluto.h     |   25 -
 engines/sword25/util/pluto/plzio.cpp   |   74 --
 11 files changed, 2753 deletions(-)
 delete mode 100644 engines/sword25/util/pluto/CHANGELOG
 delete mode 100644 engines/sword25/util/pluto/FILEFORMAT
 delete mode 100644 engines/sword25/util/pluto/README
 delete mode 100644 engines/sword25/util/pluto/THANKS
 delete mode 100644 engines/sword25/util/pluto/pdep.cpp
 delete mode 100644 engines/sword25/util/pluto/pdep/README
 delete mode 100644 engines/sword25/util/pluto/pdep/lzio.h
 delete mode 100644 engines/sword25/util/pluto/pdep/pdep.h
 delete mode 100644 engines/sword25/util/pluto/pluto.cpp
 delete mode 100644 engines/sword25/util/pluto/pluto.h
 delete mode 100644 engines/sword25/util/pluto/plzio.cpp

diff --git a/engines/sword25/util/pluto/CHANGELOG b/engines/sword25/util/pluto/CHANGELOG
deleted file mode 100644
index 1be321f898..0000000000
--- a/engines/sword25/util/pluto/CHANGELOG
+++ /dev/null
@@ -1,37 +0,0 @@
-$Id$
-
--- 2.4 --
-* Changed upval unboxing to allow upvals which contain func-housed cycles
-* Added stack checking to all stack-growing functions
-* Serialized debug information for functions
-
--- 2.3 --
-* Added LUALIB_API declaration for luaopen_pluto
-
--- 2.2 --
-* Rolled all internal Lua dependencies into the Pluto distribution
-* Made the unit tests depend on dynamically loading Pluto
-
--- 2.1 --
-* Various fixes to make the GC happy
-* stack size always expanded where necessary
-* fixed some memory leaks
-* GC disabled during unpersist
-* callstack initialized for traversal
-
-This changelog is maintained as of version 2.0alpha1. 
-Earlier versions are changelogged on the LuaForge site.
-
--- 2.0 --
-* Fixed a few format changes to 5.1.3
-* Fixed myriad warnings
-* GCC compliance: not incrementing cast results
-* Fix for self-referring upvals
-* Renamed loading function to work with Lua module system
-* Loading tables with __newindex works
-* unpersist makes buffer copy
-
--- 2.0alpha1 --
-* Fixed all outstanding 5.0->5.1 conversion issues
-* Made heavier use of size_t in preference to int
-* Fixed GC/Upval issue (thanks to Eric Jacobs)
diff --git a/engines/sword25/util/pluto/FILEFORMAT b/engines/sword25/util/pluto/FILEFORMAT
deleted file mode 100644
index e7716675c7..0000000000
--- a/engines/sword25/util/pluto/FILEFORMAT
+++ /dev/null
@@ -1,168 +0,0 @@
-$Id$
-
-pluto_persist() produces a "hunk" of objects. Here's the file format adhered
-to by the function, and expected by pluto_unpersist(). 
-
-As a developer, I feel that where file format information is given it is of
-utmost importance that that information precisely and accurately reflects the
-actual operation of the application. Therefore, if you find any discrepancy
-between this and actual operation, please lambast me thoroughly over email.
-
-Pseudo-C is used to express the file format. Padding is assumed to be
-nonexistent. The keyword "one_of" is used to express a concept similar to
-"union", except that its size is the size of the actual datatype chosen. Thus,
-objects which contain, directly or indirectly, a one_of, may vary  in size.
-
-
-struct Object {
-	int firstTime;		/* Whether this is the first time the object
-				is being referenced */
-	one_of {
-		RealObject o;	/* if firstTime == 1 */
-		Reference r;	/* if firstTime == 0 */
-	};
-};
-
-struct Reference {
-	int ref;	/* The index the object was registered with */
-};
-
-struct RealObject {
-	int type;		/* The type of the object */
-	one_of {
-		Boolean b;	/* If type == LUA_TBOOLEAN */
-		LightUserData l;	/* If type == LUA_TLIGHTUSERDATA */
-		Number n;	/* If type == LUA_TNUMBER */
-		String s;	/* If type == LUA_TSTRING */
-		Table t;	/* If type == LUA_TTABLE */
-		Function f;	/* If type == LUA_TFUNCTION */
-		Userdata u;	/* If type == LUA_TUSERDATA */
-		Thread th;	/* If type == LUA_TTHREAD */
-		Proto p;	/* If type == LUA_TPROTO (from lobject.h) */
-		Upval uv;	/* If type == LUA_TUPVAL (from lobject.h) */
-	};			/* The actual object */
-};
-
-struct Boolean {
-	int32 bvalue;		/* 0 for false, 1 for true */
-};
-
-struct LightUserData {
-	void* luvalue;		/* The actual, literal pointer */
-};
-
-struct Number {
-	lua_Number nvalue;	/* The actual number */
-};
-
-struct String {
-	int length;		/* The length of the string */
-	char str[length];	/* The actual string (not null terminated) */
-};
-
-struct Table {
-	int isspecial;		/* 1 if SP is used; 0 otherwise */
-	one_of {
-		Closure c;	/* if isspecial == 1; closure to refill the table */
-		LiteralTable t;	/* if isspecial == 0; literal table info */
-	};
-};
-
-struct LiteralTable {
-	Object metatable;	/* nil for default metatable */
-	Pair p[];		/* key/value pairs */
-	Object nil = nil;	/* Nil reference to terminate */
-};
-
-struct Pair {
-	Object key;
-	Object value;
-};
-
-struct Function { 		/* Actually a closure */
-	lu_byte nups;		/* Number of upvalues the function uses */
-	Object proto;		/* The proto this function uses */
-	Object upvals[nups];	/* All upvalues */
-	Object fenv;		/* The FEnv (nil for the global table)
-};
-
-struct Upval {
-	Object obj;		/* The object this upval refers to */
-}
-
-struct Userdata {
-	int isSpecial; 		/* 1 for special persistence, 0 for literal
-	one_of {
-		LiteralUserdata lu;	/* if is_special is 0 */
-		SpecialUserdata su;	/* if is_special is 1 */
-	};
-};
-
-struct LiteralUserdata {
-	Object metatable;		/* The metatable (nil for default) */
-	int length;		/* Size of the data */
-	char data[length];	/* The actual data */
-};
-
-struct SpecialUserdata {
-	int length;		/* The size of the data */
-	Object func;		/* The closure used to fill the userdata */
-};
-
-struct Thread {
-	int stacksize;		/* The size of the stack filled with objects,
-				 * including the "nil" that is hidden below
-				 * the bottom of the stack visible to C */
-	Object stack[stacksize];/* Indices of all stack values, bottom up */
-	int callinfosize;	/* Number of elements in the CallInfo stack */
-	CallInfo callinfostack[callinfosize];	/* The CallInfo stack */
-	int base;		/* base = L->base - L->stack; */
-	int top;		/* top = L->top - L->stack; */
-	OpenUpval openupvals[]; /* Upvalues to open */
-	Object nil = nil;	/* To terminate the open upvalues list */
-};
-
-struct OpenUpval {
-	Object upval;		/* The upvalue */
-	int stackpos;		/* The stack position to "reopen" it to */
-
-};
-
-struct CallInfo {
-	int base;		/* base = ci->base - L->stack; */
-	int top;		/* top = ci->top - L->stack; */
-	int pc;			/* pc = ci->pc - proto->code; */
-	int state;		/* flags used by the CallInfo */
-};
-
-struct Proto {
-	int sizek;		/* Number of constants referenced */
-	Object k[sizek];	/* Constants referenced */
-	int sizep;		/* Number of inner Protos referenced */
-	Object p[sizep];	/* Inner Protos referenced */
-	int sizecode;		/* Number of instructions in code */
-	Instruction code[sizecode];	/* The proto's code */
-	ProtoDebug debuginfo;	/* Debug information for the proto */
-	lu_byte nups;		/* Number of upvalues used */
-	lu_byte numparams;	/* Number of parameters taken */
-	lu_byte is_vararg;	/* 1 if function accepts varargs, 0 otherwise */
-	lu_byte maxstacksize;	/* Size of stack reserved for the function */
-};
-
-struct ProtoDebug {
-	int sizeupvals;		/* Number of upvalue names */
-	Object upvals;		/* Upvalue names */
-	int sizelocvars;	/* Number of local variable names */
-	LocVar[sizelocvars];	/* Local variable names */
-	Object source;		/* The source code */
-	int sizelineinfo;	/* Number of opcode-line mappings */
-	int lineinfo[sizelineinfo];	/* opcode-line mappings */
-	int linedefined;	/* Start of line range */
-	int lastlinedefined;	/* End of line range */
-};
-
-struct LocVar {
-	Object name;		/* Name of the local variable */
-	int startpc;		/* Point where variable is active */
-	int endpc;		/* Point where variable is dead */
-};
diff --git a/engines/sword25/util/pluto/README b/engines/sword25/util/pluto/README
deleted file mode 100644
index 838fce498b..0000000000
--- a/engines/sword25/util/pluto/README
+++ /dev/null
@@ -1,133 +0,0 @@
-$Id$
-
-PLUTO - Heavy duty persistence for Lua
-
-Pluto is a library which allows users to write arbitrarily large portions
-of the "Lua universe" into a flat file, and later read them back into the
-same or a different Lua universe. Object references are appropriately
-handled, such that the file contains everything needed to recreate the
-objects in question.
-
-Pluto has the following major features: 
-* Can persist any Lua function
-* Can persist threads 
-* Works with any Lua chunkreader/chunkwriter 
-* Support for "invariant" permanent objects, of all datatypes
-* Can invoke metafunctions for custom persistence of tables and userdata
-
-Pluto 2.2 requires Lua 5.1.3. If you need to use Pluto with Lua
-5.0, please use version 1.2 of Pluto.
-
-Starting with version 2.2, Pluto no longer depends on the Lua sources.
-Instead, it subsumes the required headers into its own codebase.
-As a result, it may not work properly with Lua version 5.1.4 or later.
-
-Pluto may have bugs. Users are advised to define lua_assert in 
-luaconf.h to something useful when compiling in debug mode, to catch
-assertions by Pluto and Lua.
-
-The Pluto library consists of two public functions.
-
-int pluto_persist(lua_State *L, lua_Chunkwriter writer, void *ud)
-
-This function recursively persists the Lua object in stack position 2
-and all other objects which are directly or indirectly referenced by
-it, except those referenced in the permanent object table. The data
-is written using the chunk-writer given, and that writer is passed
-the arbitrary pointer value ud.
-
-The Lua stack must contain exactly and only these two items, in order:
-
-1. A table of permanent objects, that should not be persisted. For each
-permanent object, the object itself should be the key, and a unique
-object of any type should be the value. Likely candidates for this table 
-include Lua functions (including those in the Lua libraries) that are 
-loaded at load-time. It must include all non-persistable objects that 
-are referenced by the object to be persisted. The table is not modified 
-by the function. Objects in this table are considered "opaque" and are 
-not examined or descended into. Objects should not appear in the table 
-multiple times; the result of doing this is undefined (though probably 
-harmless). NOTE: If you are planning to persist threads, keep in mind 
-that all yielded threads have coroutine.yield on the tops of their 
-stacks. Since it's a C function, it should be put here.  For complex 
-permanents, it may be a good idea to use the __index meta-function of 
-the permanents table to "search" for permanents.
-
-2. The single object to be persisted. In many cases, this will be the
-global table. For more flexibility, however, it may be something like a
-table built for the occasion, with various values to keep track of. The
-object may not be nil.
-
-
-int pluto_unpersist(lua_State *L, lua_Chunkreader reader, void *ud)
-
-This function loads in a Lua object and places it on top of the stack. All
-objects directly or indirectly referenced by it are also loaded.
-
-The Lua stack must contain, as its top value, a table of permanent
-objects. This table should be like the permanent object table used when
-persisting, but with the key and value of each pair reversed. These 
-objects are used as substitutes for those referenced in their positions 
-when persisting, and under most circumstances should be identical objects
-to those referenced in the permanents table used for persisting. It's 
-okay for multiple keys to refer to the same object.
-
-
-RUNNING PLUTO FROM LUA:
-It is also possible to invoke pluto from a Lua script. The C function
-pluto_open() will register pluto.persist and pluto.unpersist, lua functions
-which operate on strings. The first takes a permanents table and a root 
-object, and returns a string; the second takes a permanents table and a 
-string, and returns the root object.
-
-An error will be raised if pluto.persist is called from a thread which is
-itself referenced by the root object.
-
-SPECIAL PERSISTENCE:
-Tables and userdata have special persistence semantics. These semantics are
-keyed to the value of the object's metatable's __persist member, if any. This
-member may be any of the following four values:
-1. Boolean "true": The table or userdata is persisted literally; tables are
-persisted member-by-member, and userdata are written out as literal data.
-2. Boolean "false": An error is returned, indicating that the object cannot
-be persisted.
-3. A function: This function should take one argument, the object in question,
-and return one result, a closure. This "fixup closure", in turn, will be 
-persisted, and during unpersistence will be called. The closure will be 
-responsible for recreating the object with the appropriate data, based on 
-its upvalues.
-4. Nil, or no metatable. In the case of tables, the table is literally
-persisted. In the case of userdata, an error is returned.
-
-Here's an example of special persistence for a simple 3d vector object:
-
-vec = { x = 2, y = 1, z = 4 }
-setmetatable(vec, { __persist = function(oldtbl)
-	local x = oldtbl.x
-	local y = oldtbl.y
-	local z = oldtbl.z
-	local mt = getmetatable(oldtbl)
-	return function()
-		newtbl = {}
-		newtbl.x = x
-		newtbl.y = y
-		newtbl.z = z
-		setmetatable(newtbl, mt)
-		return newtbl
-	end
-end })
-
-Note how x, y, z, and the mt are explicitly pulled out of the table. It is 
-important that the fixup closure returned not reference the original table 
-directly, as that table would again be persisted as an upvalue, leading to an 
-infinite loop. Also note that the object's metatable is NOT automatically 
-persisted; it is necessary for the fixup closure to reset it, if it wants.
-
-LIMITATIONS/TODO: 
-* Light userdata are persisted literally, as their pointer values. This 
-may or may not be what you want.  
-* Closures of C functions may not be persisted. Once it becomes possible
-to specify a C function "proto" as a permanent object, this restriction
-will be relaxed.
-
-BUGS: None known. Emphasis on the 'known'.
diff --git a/engines/sword25/util/pluto/THANKS b/engines/sword25/util/pluto/THANKS
deleted file mode 100644
index 443713fa61..0000000000
--- a/engines/sword25/util/pluto/THANKS
+++ /dev/null
@@ -1,9 +0,0 @@
-Pluto is surprisingly robust and useful. This would not be the case without
-the hard work and helpfulness of the following people, mentioned in no
-particular order:
-
-Ivko Stanilov
-Goran Adrinek
-Eric Jacobs
-Anolan Milanes
-Malte Thiesen
diff --git a/engines/sword25/util/pluto/pdep.cpp b/engines/sword25/util/pluto/pdep.cpp
deleted file mode 100644
index a32c43b42d..0000000000
--- a/engines/sword25/util/pluto/pdep.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/* This file is derived from the Lua source code. Please see lua.h for
-the copyright statement.
-*/
-
-#include "pdep/pdep.h"
-
-#define api_incr_top(L)   {api_check(L, L->top < L->ci->top); L->top++;}
-
-void pdep_pushobject (lua_State *L, const TValue *o) {
-	setobj2s(L, L->top, o);
-	api_incr_top(L);
-}
-
-void *pdep_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
-	global_State *g = G(L);
-	lua_assert((osize == 0) == (block == NULL));
-	block = (*g->frealloc)(g->ud, block, osize, nsize);
-	lua_assert((nsize == 0) == (block == NULL));
-	g->totalbytes = (g->totalbytes - osize) + nsize;
-	return block;
-}
-
-void pdep_link (lua_State *L, GCObject *o, lu_byte tt) {
-	global_State *g = G(L);
-	o->gch.next = g->rootgc;
-	g->rootgc = o;
-	o->gch.marked = luaC_white(g);
-	o->gch.tt = tt;
-}
-
-Proto *pdep_newproto (lua_State *L) {
-	Proto *f = pdep_new(L, Proto);
-	pdep_link(L, obj2gco(f), LUA_TPROTO);
-	f->k = NULL;
-	f->sizek = 0;
-	f->p = NULL;
-	f->sizep = 0;
-	f->code = NULL;
-	f->sizecode = 0;
-	f->sizelineinfo = 0;
-	f->sizeupvalues = 0;
-	f->nups = 0;
-	f->upvalues = NULL;
-	f->numparams = 0;
-	f->is_vararg = 0;
-	f->maxstacksize = 0;
-	f->lineinfo = NULL;
-	f->sizelocvars = 0;
-	f->locvars = NULL;
-	f->linedefined = 0;
-	f->lastlinedefined = 0;
-	f->source = NULL;
-	return f;
-}
-
-Closure *pdep_newLclosure (lua_State *L, int nelems, Table *e) {
-	Closure *c = cast(Closure *, pdep_malloc(L, sizeLclosure(nelems)));
-	pdep_link(L, obj2gco(c), LUA_TFUNCTION);
-	c->l.isC = 0;
-	c->l.env = e;
-	c->l.nupvalues = cast_byte(nelems);
-	while (nelems--) c->l.upvals[nelems] = NULL;
-	return c;
-}
-
-static void correctstack (lua_State *L, TValue *oldstack) {
-  CallInfo *ci;
-  GCObject *up;
-  L->top = (L->top - oldstack) + L->stack;
-  for (up = L->openupval; up != NULL; up = up->gch.next)
-    gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
-  for (ci = L->base_ci; ci <= L->ci; ci++) {
-    ci->top = (ci->top - oldstack) + L->stack;
-    ci->base = (ci->base - oldstack) + L->stack;
-    ci->func = (ci->func - oldstack) + L->stack;
-  }
-  L->base = (L->base - oldstack) + L->stack;
-}
-
-
-void pdep_reallocstack (lua_State *L, int newsize) {
-	TValue *oldstack = L->stack;
-	int realsize = newsize + 1 + EXTRA_STACK;
-	lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK - 1);
-	pdep_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
-	L->stacksize = realsize;
-	L->stack_last = L->stack+newsize;
-	correctstack(L, oldstack);
-}
-
-void pdep_growstack (lua_State *L, int n) {
-	if (n <= L->stacksize)  /* double size is enough? */
-		pdep_reallocstack(L, 2*L->stacksize);
-	else
-		pdep_reallocstack(L, L->stacksize + n);
-}
-
-void pdep_reallocCI (lua_State *L, int newsize) {
-	CallInfo *oldci = L->base_ci;
-	pdep_reallocvector(L, L->base_ci, L->size_ci, newsize, CallInfo);
-	L->size_ci = newsize;
-	L->ci = (L->ci - oldci) + L->base_ci;
-	L->end_ci = L->base_ci + L->size_ci - 1;
-}
-
-TString *pdep_newlstr (lua_State *L, const char *str, size_t l) {
-	TString *res;
-	lua_pushlstring(L, str, l);
-	res = rawtsvalue(L->top-1);
-	lua_pop(L, 1);
-	return res;
-}
diff --git a/engines/sword25/util/pluto/pdep/README b/engines/sword25/util/pluto/pdep/README
deleted file mode 100644
index 3592754da0..0000000000
--- a/engines/sword25/util/pluto/pdep/README
+++ /dev/null
@@ -1,5 +0,0 @@
-These files are directly copied from the Lua distribution, with the
-exception of lzio.h, which is s/lua{ZM}/pdep/g and has an include removed.
-
-As such, unlike the rest of Pluto, they are released under the
-same terms as Lua. See "lua.h" for the copyright notice.
diff --git a/engines/sword25/util/pluto/pdep/lzio.h b/engines/sword25/util/pluto/pdep/lzio.h
deleted file mode 100644
index 2e37f8d202..0000000000
--- a/engines/sword25/util/pluto/pdep/lzio.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-** $Id$
-** Buffered streams
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef lzio_h
-#define lzio_h
-
-#include "sword25/util/lua/lua.h"
-
-
-#define EOZ	(-1)			/* end of stream */
-
-typedef struct Zio ZIO;
-
-#define char2int(c)	cast(int, cast(unsigned char, (c)))
-
-#define zgetc(z)  (((z)->n--)>0 ?  char2int(*(z)->p++) : pdep_fill(z))
-
-typedef struct Mbuffer {
-  char *buffer;
-  size_t n;
-  size_t buffsize;
-} Mbuffer;
-
-#define pdep_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
-
-#define pdep_buffer(buff)	((buff)->buffer)
-#define pdep_sizebuffer(buff)	((buff)->buffsize)
-#define pdep_bufflen(buff)	((buff)->n)
-
-#define pdep_resetbuffer(buff) ((buff)->n = 0)
-
-
-#define pdep_resizebuffer(L, buff, size) \
-	(pdep_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
-	(buff)->buffsize = size)
-
-#define pdep_freebuffer(L, buff)	pdep_resizebuffer(L, buff, 0)
-
-
-LUAI_FUNC char *pdep_openspace (lua_State *L, Mbuffer *buff, size_t n);
-LUAI_FUNC void pdep_init (lua_State *L, ZIO *z, lua_Reader reader,
-                                        void *data);
-LUAI_FUNC size_t pdep_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
-LUAI_FUNC int pdep_lookahead (ZIO *z);
-
-
-
-/* --------- Private Part ------------------ */
-
-struct Zio {
-  size_t n;			/* bytes still unread */
-  const char *p;		/* current position in buffer */
-  lua_Reader reader;
-  void* data;			/* additional data */
-  lua_State *L;			/* Lua state (for reader) */
-};
-
-
-LUAI_FUNC int pdep_fill (ZIO *z);
-
-#endif
diff --git a/engines/sword25/util/pluto/pdep/pdep.h b/engines/sword25/util/pluto/pdep/pdep.h
deleted file mode 100644
index 664fc812b5..0000000000
--- a/engines/sword25/util/pluto/pdep/pdep.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef PDEP_H
-#define PDEP_H
-
-#include "sword25/util/lua/lua.h"
-#include "sword25/util/pluto/pdep/lzio.h"
-#include "sword25/util/lua/ldo.h"
-#include "sword25/util/lua/lfunc.h"
-#include "sword25/util/lua/lgc.h"
-#include "sword25/util/lua/llimits.h"
-#include "sword25/util/lua/lobject.h"
-#include "sword25/util/lua/lopcodes.h"
-#include "sword25/util/lua/lstate.h"
-#include "sword25/util/lua/lstring.h"
-#include "sword25/util/lua/lauxlib.h"
-
-
-#define pdep_reallocv(L,b,on,n,e) \
-	pdep_realloc_(L, (b), (on)*(e), (n)*(e))
-#define pdep_reallocvector(L, v,oldn,n,t) \
-	((v)=cast(t *, pdep_reallocv(L, v, oldn, n, sizeof(t))))
-#define pdep_freearray(L, b, n, t)   pdep_reallocv(L, (b), n, 0, sizeof(t))
-#define pdep_newvector(L,n,t) \
-	cast(t *, pdep_reallocv(L, NULL, 0, n, sizeof(t)))
-#define pdep_new(L,t)		cast(t *, pdep_malloc(L, sizeof(t)))
-#define pdep_malloc(L,t)	pdep_realloc_(L, NULL, 0, (t))
-#define pdep_checkstack(L,n)	\
-  if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TValue)) \
-    pdep_growstack(L, n); \
-  else pdep_reallocstack(L, L->stacksize - EXTRA_STACK - 1);
-
-
-void pdep_pushobject (lua_State *L, const TValue *o);
-void *pdep_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize);
-void pdep_link (lua_State *L, GCObject *o, lu_byte tt);
-Proto *pdep_newproto (lua_State *L);
-Closure *pdep_newLclosure (lua_State *L, int nelems, Table *e);
-void pdep_reallocstack (lua_State *L, int newsize);
-void pdep_growstack (lua_State *L, int n);
-void pdep_reallocCI (lua_State *L, int newsize);
-TString *pdep_newlstr (lua_State *L, const char *str, size_t l);
-
-#endif
diff --git a/engines/sword25/util/pluto/pluto.cpp b/engines/sword25/util/pluto/pluto.cpp
deleted file mode 100644
index cbe16b0d5b..0000000000
--- a/engines/sword25/util/pluto/pluto.cpp
+++ /dev/null
@@ -1,2083 +0,0 @@
-/* $Id$ */
-
-/* Tamed Pluto - Heavy-duty persistence for Lua
- * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
- * domain. People making use of this software as part of an application
- * are politely requested to email the author at sneftel@gmail.com
- * with a brief description of the application, primarily to satisfy his
- * curiosity.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Instrumented by Stefan Reich (info@luaos.net)
- * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
- */
-
-#include "sword25/util/lua/lua.h"
-#include "pluto.h"
-
-#undef TOTEXT
-
-#define USE_PDEP
-
-#ifdef USE_PDEP
-#include "pdep/pdep.h"
-#define LIF(prefix, name) pdep ## _ ## name
-#else
-#include "lapi.h"
-#include "ldo.h"
-#include "lfunc.h"
-#include "lgc.h"
-#include "llimits.h"
-#include "lmem.h"
-#include "lobject.h"
-#include "lopcodes.h"
-#include "lstate.h"
-#include "lstring.h"
-#include "lauxlib.h"
-#define LIF(prefix, name) lua ## prefix ## _ ## name
-#endif
-
-#include <string.h>
-
-
-/* Define this if you want size_t values to be written in 64-bit
-   (even on 32-bit systems). Should eliminate at least one source of
-   32/64 bit incompatibility. */
-#define SIZES64
-
-
-/* #define PLUTO_DEBUG */
-
-
-#ifdef SIZES64
-#define VERSION "Tamed Pluto 1.0 with SIZES64 flag"
-#else
-#define VERSION "Tamed Pluto 1.0"
-#endif
-
-
-#ifdef PLUTO_DEBUG
-#include <stdio.h>
-#endif
-
-#define PLUTO_TPERMANENT 101
-
-#define verify(x) { int v = (int)((x)); v=v; lua_assert(v); }
-
-#define NUMTYPES 9
-static const char* typenames[] = {
-	"nil",
-	"boolean",
-	"lightuserdata",
-	"number",
-	"string",
-	"table",
-	"function",
-	"userdata",
-	"thread"
-};
-
-static int humanReadable = 0;
-#define hrBufSize 200
-static char hrBuf[hrBufSize];
-
-typedef struct PersistInfo_t {
-	lua_State *L;
-	int counter;
-	lua_Chunkwriter writer;
-	void *ud;
-#ifdef PLUTO_DEBUG
-	int level;
-#endif
-} PersistInfo;
-
-#ifdef PLUTO_DEBUG
-void printindent(int indent)
-{
-	int il;
-	for(il=0; il<indent; il++) {
-		printf("  ");
-	}
-}
-#endif
-
-/* lua_Chunkwriter signature: (lua_State *L, const void *p, size_t sz, void *ud).
-   ud is a pointer to the WriterInfo struct (holds the buffer pointer)
-*/
-
-static void pi_write(PersistInfo *pi, const void *p, size_t size, void *ud) {
-	if (humanReadable) {
-		uint i;
-		snprintf(hrBuf, hrBufSize, "  pi_write %d ", (int) size);
-		pi->writer(pi->L, hrBuf, strlen(hrBuf), ud);
-		for (i = 0; i < size; i++) {
-			char b = ((char *)p)[i];
-			snprintf(hrBuf, hrBufSize, "%X%X", (b >> 4) & 0xF, b & 0xF);
-			pi->writer(pi->L, hrBuf, strlen(hrBuf), ud);
-		}
-		snprintf(hrBuf, hrBufSize, "\n");
-		pi->writer(pi->L, hrBuf, strlen(hrBuf), ud);
-	} else {
-		pi->writer(pi->L, p, size, ud);
-	}
-#ifdef TOTEXT
-	int i;
-	printf("  pi_write %d ", (int) size);
-	for (i = 0; i < size; i++) {
-		char b = ((char *)p)[i];
-		printf("%X%X", (b >> 4) & 0xF, b & 0xF);
-	}
-	printf("\n");
-#endif
-}
-
-static void hrOut(PersistInfo *pi) {
-	pi->writer(pi->L, hrBuf, strlen(hrBuf), pi->ud);
-}
-
-static void write_size(PersistInfo *pi, size_t *val)
-{
-#ifdef SIZES64
-	int64 longval; /* yeah, you really need long long to get 8 bytes on win32... duh. */
-	longval = *val;
-	pi_write(pi, &longval, 8, pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "write_size64 %ld\n", longval);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("write_size64 %ld\n", longval);
-#endif
-#else
-	pi_write(pi, val, sizeof(size_t), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "write_size %ld\n", *((size_t *)val));
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("write_size %ld\n", *val);
-#endif
-#endif
-}
-
-static void read_size(ZIO *zio, size_t *val)
-{
-#ifdef SIZES64
-	int64 longval;
-	verify(LIF(Z,read)(zio, &longval, 8) == 0);
-	*val = longval;
-#else
-	verify(LIF(Z,read)(zio, val, sizeof(size_t)) == 0);
-#endif
-}
-
-
-/* Mutual recursion requires prototype */
-static void persist(PersistInfo *pi);
-
-/* A simple reimplementation of the unfortunately static function luaA_index.
- * Does not support the global table, registry, or upvalues. */
-static StkId getobject(lua_State *L, int stackpos)
-{
-	if(stackpos > 0) {
-		lua_assert(L->base+stackpos-1 < L->top);
-		return L->base+stackpos-1;
-	} else {
-		lua_assert(L->top-stackpos >= L->base);
-		return L->top+stackpos;
-	}
-}
-
-/* Choose whether to do a regular or special persistence based on an object's
- * metatable. "default" is whether the object, if it doesn't have a __persist
- * entry, is literally persistable or not.
- * Pushes the unpersist closure and returns true if special persistence is
- * used. */
-static int persistspecialobject(PersistInfo *pi, int defaction)
-{
-					/* perms reftbl ... obj */
-	lua_checkstack(pi->L, 4);
-	/* Check whether we should persist literally, or via the __persist
-	 * metafunction */
-	if(!lua_getmetatable(pi->L, -1)) {
-		if(defaction) {
-			{
-				int zero = 0;
-				pi_write(pi, &zero, sizeof(int), pi->ud);
-				if (humanReadable) {
-					snprintf(hrBuf, hrBufSize, "persistspecialobject_write_zero\n");
-					hrOut(pi);
-				}
-#ifdef TOTEXT
-				printf("persistspecialobject_write_zero\n");
-#endif
-			}
-			return 0;
-		} else {
-			lua_pushstring(pi->L, "Type not literally persistable by default");
-			lua_error(pi->L);
-		}
-	}
-					/* perms reftbl sptbl ... obj mt */
-	lua_pushstring(pi->L, "__persist");
-					/* perms reftbl sptbl ... obj mt "__persist" */
-	lua_rawget(pi->L, -2);
-					/* perms reftbl sptbl ... obj mt __persist? */
-	if(lua_isnil(pi->L, -1)) {
-					/* perms reftbl sptbl ... obj mt nil */
-		lua_pop(pi->L, 2);
-					/* perms reftbl sptbl ... obj */
-		if(defaction) {
-			{
-				int zero = 0;
-				pi_write(pi, &zero, sizeof(int), pi->ud);
-				if (humanReadable) {
-					snprintf(hrBuf, hrBufSize, "persistspecialobject_write_zero2\n");
-					hrOut(pi);
-				}
-#ifdef TOTEXT
-				printf("persistspecialobject_write_zero2\n");
-#endif
-			}
-			return 0;
-		} else {
-			lua_pushstring(pi->L, "Type not literally persistable by default");
-			lua_error(pi->L);
-			return 0; /* not reached */
-		}
-	} else if(lua_isboolean(pi->L, -1)) {
-					/* perms reftbl sptbl ... obj mt bool */
-		if(lua_toboolean(pi->L, -1)) {
-					/* perms reftbl sptbl ... obj mt true */
-			lua_pop(pi->L, 2);
-					/* perms reftbl sptbl ... obj */
-			{
-				int zero = 0;
-				pi_write(pi, &zero, sizeof(int), pi->ud);
-				if (humanReadable) {
-					snprintf(hrBuf, hrBufSize, "persistspecialobject_write_zero3\n");
-					hrOut(pi);
-				}
-#ifdef TOTEXT
-				printf("persistspecialobject_write_zero3\n");
-#endif
-			}
-			return 0;
-		} else {
-			lua_pushstring(pi->L, "Metatable forbade persistence");
-			lua_error(pi->L);
-			return 0; /* not reached */
-		}
-	} else if(!lua_isfunction(pi->L, -1)) {
-		lua_pushstring(pi->L, "__persist not nil, boolean, or function");
-		lua_error(pi->L);
-	}
-					/* perms reftbl ... obj mt __persist */
-	lua_pushvalue(pi->L, -3);
-					/* perms reftbl ... obj mt __persist obj */
-#ifdef PLUTO_PASS_USERDATA_TO_PERSIST
-	lua_pushlightuserdata(pi->L, (void *)pi->writer);
-	lua_pushlightuserdata(pi->L, pi->ud);
-					/* perms reftbl ... obj mt __persist obj ud */
-	lua_call(pi->L, 3, 1);
-					/* perms reftbl ... obj mt func? */
-#else
-	lua_call(pi->L, 1, 1);
-					/* perms reftbl ... obj mt func? */
-#endif
-					/* perms reftbl ... obj mt func? */
-	if(!lua_isfunction(pi->L, -1)) {
-		lua_pushstring(pi->L, "__persist function did not return a function");
-		lua_error(pi->L);
-	}
-					/* perms reftbl ... obj mt func */
-	{
-		int one = 1;
-		pi_write(pi, &one, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistspecialobject_write_one\n");
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistspecialobject_write_one\n");
-#endif
-	}
-	persist(pi);
-					/* perms reftbl ... obj mt func */
-	lua_pop(pi->L, 2);
-					/* perms reftbl ... obj */
-	return 1;
-}
-
-static void persisttable(PersistInfo *pi)
-{
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persisttable\n");
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persisttable\n");
-#endif
-
-					/* perms reftbl ... tbl */
-	lua_checkstack(pi->L, 3);
-	if(persistspecialobject(pi, 1)) {
-					/* perms reftbl ... tbl */
-		return;
-	}
-					/* perms reftbl ... tbl */
-	/* First, persist the metatable (if any) */
-	if(!lua_getmetatable(pi->L, -1)) {
-		lua_pushnil(pi->L);
-	}
-					/* perms reftbl ... tbl mt/nil */
-	persist(pi);
-	lua_pop(pi->L, 1);
-					/* perms reftbl ... tbl */
-
-	/* Now, persist all k/v pairs */
-	lua_pushnil(pi->L);
-					/* perms reftbl ... tbl nil */
-	while(lua_next(pi->L, -2)) {
-					/* perms reftbl ... tbl k v */
-		lua_pushvalue(pi->L, -2);
-					/* perms reftbl ... tbl k v k */
-		persist(pi);
-		lua_pop(pi->L, 1);
-					/* perms reftbl ... tbl k v */
-		persist(pi);
-		lua_pop(pi->L, 1);
-					/* perms reftbl ... tbl k */
-	}
-					/* perms reftbl ... tbl */
-	/* Terminate list */
-	lua_pushnil(pi->L);
-					/* perms reftbl ... tbl nil */
-	persist(pi);
-	lua_pop(pi->L, 1);
-					/* perms reftbl ... tbl */
-}
-
-static void persistuserdata(PersistInfo *pi) {
-					/* perms reftbl ... udata */
-	lua_checkstack(pi->L, 2);
-	if(persistspecialobject(pi, 0)) {
-					/* perms reftbl ... udata */
-		return;
-	} else {
-	/* Use literal persistence */
-		size_t length = uvalue(getobject(pi->L, -1))->len;
-		write_size(pi, &length);
-		pi_write(pi, lua_touserdata(pi->L, -1), length, pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistuserdata %ld\n", (long) length);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistuserdata %ld\n", (long) length);
-#endif
-		if(!lua_getmetatable(pi->L, -1)) {
-					/* perms reftbl ... udata */
-			lua_pushnil(pi->L);
-					/* perms reftbl ... udata mt/nil */
-		}
-		persist(pi);
-		lua_pop(pi->L, 1);
-					/* perms reftbl ... udata */
-	}
-}
-
-
-static Proto *toproto(lua_State *L, int stackpos)
-{
-	return gco2p(getobject(L, stackpos)->value.gc);
-}
-
-static UpVal *toupval(lua_State *L, int stackpos)
-{
-	lua_assert(ttype(getobject(L, stackpos)) == LUA_TUPVAL);
-	return gco2uv(getobject(L, stackpos)->value.gc);
-}
-
-static void pushproto(lua_State *L, Proto *proto)
-{
-	TValue o;
-	setptvalue(L, &o, proto);
-	LIF(A,pushobject)(L, &o);
-}
-
-#define setuvvalue(L,obj,x) \
-  { TValue *i_o=(obj); \
-	i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TUPVAL; \
-	checkliveness(G(L),i_o); }
-
-static void pushupval(lua_State *L, UpVal *upval)
-{
-	TValue o;
-	setuvvalue(L, &o, upval);
-	LIF(A,pushobject)(L, &o);
-}
-
-static void pushclosure(lua_State *L, Closure *closure)
-{
-	TValue o;
-	setclvalue(L, &o, closure);
-	LIF(A,pushobject)(L, &o);
-}
-
-static void pushstring(lua_State *L, TString *s)
-{
-	TValue o;
-	setsvalue(L, &o, s);
-	LIF(A,pushobject)(L, &o);
-}
-
-static void persistfunction(PersistInfo *pi)
-{
-					/* perms reftbl ... func */
-	Closure *cl = clvalue(getobject(pi->L, -1));
-	lua_checkstack(pi->L, 2);
-	if(cl->c.isC) {
-		/* It's a C function. For now, we aren't going to allow
-		 * persistence of C closures, even if the "C proto" is
-		 * already in the permanents table. */
-		lua_pushstring(pi->L, "Attempt to persist a C function");
-		lua_error(pi->L);
-	} else {
-		/* It's a Lua closure. */
-		{
-			/* We don't really _NEED_ the number of upvals,
-			 * but it'll simplify things a bit */
-			pi_write(pi, &cl->l.p->nups, sizeof(lu_byte), pi->ud);
-			if (humanReadable) {
-				snprintf(hrBuf, hrBufSize, "persistfunction_number_upvalues %d\n", (int) cl->l.p->nups);
-				hrOut(pi);
-			}
-#ifdef TOTEXT
-			printf("persistfunction_number_upvalues %d\n", (int) cl->l.p->nups);
-#endif
-		}
-		/* Persist prototype */
-		{
-			pushproto(pi->L, cl->l.p);
-					/* perms reftbl ... func proto */
-			persist(pi);
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... func */
-		}
-		/* Persist upvalue values (not the upvalue objects
-		 * themselves) */
-		{
-			int i;
-			for(i=0; i<cl->l.p->nups; i++) {
-					/* perms reftbl ... func */
-				pushupval(pi->L, cl->l.upvals[i]);
-					/* perms reftbl ... func upval */
-				persist(pi);
-				lua_pop(pi->L, 1);
-					/* perms reftbl ... func */
-			}
-					/* perms reftbl ... func */
-		}
-		/* Persist function environment */
-		{
-			lua_getfenv(pi->L, -1);
-					/* perms reftbl ... func fenv */
-			if(lua_equal(pi->L, -1, LUA_GLOBALSINDEX)) {
-				/* Function has the default fenv */
-					/* perms reftbl ... func _G */
-				lua_pop(pi->L, 1);
-					/* perms reftbl ... func */
-				lua_pushnil(pi->L);
-					/* perms reftbl ... func nil */
-			}
-					/* perms reftbl ... func fenv/nil */
-			persist(pi);
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... func */
-		}
-	}
-}
-
-
-/* Upvalues are tricky. Here's why.
- *
- * A particular upvalue may be either "open", in which case its member v
- * points into a thread's stack, or "closed" in which case it points to the
- * upvalue itself. An upvalue is closed under any of the following conditions:
- * -- The function that initially declared the variable "local" returns
- * -- The thread in which the closure was created is garbage collected
- *
- * To make things wackier, just because a thread is reachable by Lua doesn't
- * mean it's in our root set. We need to be able to treat an open upvalue
- * from an unreachable thread as a closed upvalue.
- *
- * The solution:
- * (a) For the purposes of persisting, don't indicate whether an upvalue is
- * closed or not.
- * (b) When unpersisting, pretend that all upvalues are closed.
- * (c) When persisting, persist all open upvalues referenced by a thread
- * that is persisted, and tag each one with the corresponding stack position
- * (d) When unpersisting, "reopen" each of these upvalues as the thread is
- * unpersisted
- */
-static void persistupval(PersistInfo *pi)
-{
-					/* perms reftbl ... upval */
-	UpVal *uv = toupval(pi->L, -1);
-	lua_checkstack(pi->L, 1);
-
-	/* We can't permit the upval to linger around on the stack, as Lua
-	* will bail if its GC finds it. */
-
-	lua_pop(pi->L, 1);
-					/* perms reftbl ... */
-	LIF(A,pushobject)(pi->L, uv->v);
-					/* perms reftbl ... obj */
-	persist(pi);
-					/* perms reftbl ... obj */
-}
-
-static void persistproto(PersistInfo *pi)
-{
-					/* perms reftbl ... proto */
-	Proto *p = toproto(pi->L, -1);
-	lua_checkstack(pi->L, 2);
-
-	/* Persist constant refs */
-	{
-		int i;
-		pi_write(pi, &p->sizek, sizeof(int), pi->ud);
-	if (humanReadable) {
-	  snprintf(hrBuf, hrBufSize, "persistproto_sizek %d\n", p->sizek);
-	  hrOut(pi);
-	}
-	#ifdef TOTEXT
-	  printf("persistproto_sizek %d\n", p->sizek);
-	#endif
-		for(i=0; i<p->sizek; i++) {
-			LIF(A,pushobject)(pi->L, &p->k[i]);
-					/* perms reftbl ... proto const */
-			persist(pi);
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... proto */
-		}
-	}
-					/* perms reftbl ... proto */
-
-	/* serialize inner Proto refs */
-	{
-		int i;
-		pi_write(pi, &p->sizep, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_sizep %d\n", p->sizep);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_sizep %d\n", p->sizep);
-#endif
-		for(i=0; i<p->sizep; i++)
-		{
-			pushproto(pi->L, p->p[i]);
-					/* perms reftbl ... proto subproto */
-			persist(pi);
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... proto */
-		}
-	}
-					/* perms reftbl ... proto */
-
-	/* Serialize code */
-	{
-		int len;
-		pi_write(pi, &p->sizecode, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_sizecode %d\n", p->sizecode);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_sizecode %d\n", p->sizecode);
-#endif
-		len = sizeof(Instruction) * p->sizecode;
-		pi_write(pi, p->code, len, pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_code %d\n", len);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_code %d\n", len);
-#endif
-	}
-
-	/* Serialize upvalue names */
-	{
-		int i;
-		pi_write(pi, &p->sizeupvalues, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_upvalues %d\n", p->sizeupvalues);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_upvalues %d\n", p->sizeupvalues);
-#endif
-		for(i=0; i<p->sizeupvalues; i++)
-		{
-			pushstring(pi->L, p->upvalues[i]);
-			persist(pi);
-			lua_pop(pi->L, 1);
-		}
-	}
-	/* Serialize local variable infos */
-	{
-		int i;
-		pi_write(pi, &p->sizelocvars, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_sizelocvars %d\n", p->sizelocvars);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_sizelocvars %d\n", p->sizelocvars);
-#endif
-		for(i=0; i<p->sizelocvars; i++)
-		{
-			pushstring(pi->L, p->locvars[i].varname);
-			persist(pi);
-			lua_pop(pi->L, 1);
-
-			pi_write(pi, &p->locvars[i].startpc, sizeof(int), pi->ud);
-			if (humanReadable) {
-				snprintf(hrBuf, hrBufSize, "persistproto_startpc %d\n", p->locvars[i].startpc);
-				hrOut(pi);
-			}
-#ifdef TOTEXT
-			printf("persistproto_startpc %d\n", p->locvars[i].startpc);
-#endif
-			pi_write(pi, &p->locvars[i].endpc, sizeof(int), pi->ud);
-			if (humanReadable) {
-				snprintf(hrBuf, hrBufSize, "persistproto_endpc %d\n", p->locvars[i].endpc);
-				hrOut(pi);
-			}
-#ifdef TOTEXT
-			printf("persistproto_endpc %d\n", p->locvars[i].endpc);
-#endif
-		}
-	}
-
-	/* Serialize source string */
-	pushstring(pi->L, p->source);
-	persist(pi);
-	lua_pop(pi->L, 1);
-
-	/* Serialize line numbers */
-	{
-		pi_write(pi, &p->sizelineinfo, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_sizelineinfo %d\n", p->sizelineinfo);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_sizelineinfo %d\n", p->sizelineinfo);
-#endif
-		if (p->sizelineinfo)
-		{
-			int len;
-			len = sizeof(int) * p->sizelineinfo;
-			pi_write(pi, p->lineinfo, len, pi->ud);
-			if (humanReadable) {
-				snprintf(hrBuf, hrBufSize, "persistproto_lineinfo %d\n", len);
-				hrOut(pi);
-			}
-#ifdef TOTEXT
-			printf("persistproto_lineinfo %d\n", len);
-#endif
-		}
-	}
-
-	/* Serialize linedefined and lastlinedefined */
-	pi_write(pi, &p->linedefined, sizeof(int), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persistproto_linedefined %d\n", p->linedefined);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persistproto_linedefined %d\n", p->linedefined);
-#endif
-	pi_write(pi, &p->lastlinedefined, sizeof(int), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persistproto_lastlinedefined %d\n", p->lastlinedefined);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persistproto_lastlinedefined %d\n", p->lastlinedefined);
-#endif
-
-	/* Serialize misc values */
-	{
-		pi_write(pi, &p->nups, sizeof(lu_byte), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_nups %d\n", (int) p->nups);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_nups %d\n", (int) p->nups);
-#endif
-		pi_write(pi, &p->numparams, sizeof(lu_byte), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_numparams %d\n", (int) p->numparams);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_numparams %d\n", (int) p->numparams);
-#endif
-		pi_write(pi, &p->is_vararg, sizeof(lu_byte), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_is_vararg %d\n", (int) p->is_vararg);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_is_vararg %d\n", (int) p->is_vararg);
-#endif
-		pi_write(pi, &p->maxstacksize, sizeof(lu_byte), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistproto_maxstacksize %d\n", (int) p->maxstacksize);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistproto_maxstacksize %d\n", (int) p->maxstacksize);
-#endif
-	}
-	/* We do not currently persist upvalue names, local variable names,
-	 * variable lifetimes, line info, or source code. */
-}
-
-/* Copies a stack, but the stack is reversed in the process
- */
-static size_t revappendstack(lua_State *from, lua_State *to)
-{
-	StkId o;
-	for(o=from->top-1; o>=from->stack; o--) {
-		setobj2s(to, to->top, o);
-		to->top++;
-	}
-	return from->top - from->stack;
-}
-
-/* Persist all stack members
- */
-static void persistthread(PersistInfo *pi)
-{
-	size_t posremaining;
-	lua_State *L2;
-					/* perms reftbl ... thr */
-	L2 = lua_tothread(pi->L, -1);
-	lua_checkstack(pi->L, L2->top - L2->stack + 1);
-	if(pi->L == L2) {
-		lua_pushstring(pi->L, "Can't persist currently running thread");
-		lua_error(pi->L);
-		return; /* not reached */
-	}
-
-	/* Persist the stack */
-	posremaining = revappendstack(L2, pi->L);
-					/* perms reftbl ... thr (rev'ed contents of L2) */
-	write_size(pi, &posremaining);
-	for(; posremaining > 0; posremaining--) {
-		persist(pi);
-		lua_pop(pi->L, 1);
-	}
-					/* perms reftbl ... thr */
-	/* Now, persist the CallInfo stack. */
-	{
-		size_t i, numframes = (L2->ci - L2->base_ci) + 1;
-		write_size(pi, &numframes);
-		for(i=0; i<numframes; i++) {
-			CallInfo *ci = L2->base_ci + i;
-			size_t stackbase = ci->base - L2->stack;
-			size_t stackfunc = ci->func - L2->stack;
-			size_t stacktop = ci->top - L2->stack;
-			size_t savedpc = (ci != L2->base_ci) ?
-				ci->savedpc - ci_func(ci)->l.p->code :
-				0;
-			write_size(pi, &stackbase);
-			write_size(pi, &stackfunc);
-			write_size(pi, &stacktop);
-			pi_write(pi, &ci->nresults, sizeof(int), pi->ud);
-			if (humanReadable) {
-				snprintf(hrBuf, hrBufSize, "persistthread %d\n", ci->nresults);
-				hrOut(pi);
-			}
-#ifdef TOTEXT
-			printf("persistthread %d\n", ci->nresults);
-#endif
-			write_size(pi, &savedpc);
-		}
-	}
-
-	/* Serialize the state's other parameters, with the exception of upval stuff */
-	{
-		size_t stackbase = L2->base - L2->stack;
-		size_t stacktop = L2->top - L2->stack;
-		lua_assert(L2->nCcalls <= 1);
-		pi_write(pi, &L2->status, sizeof(lu_byte), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persistthread_status %d\n", (int) L2->status);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persistthread_status %d\n", (int) L2->status);
-#endif
-		write_size(pi, &stackbase);
-		write_size(pi, &stacktop);
-
-		// ptrdiff_t changes sizes based on 32/64 bit
-		// Hard cast to 64 bit size if SIZE64 is defined
-#ifdef SIZES64
-		uint64 ptrIndex = static_cast<uint64>(L2->errfunc);
-		pi_write(pi, &ptrIndex, sizeof(uint64), pi->ud);
-#else
-		pi_write(pi, &L2->errfunc, sizeof(ptrdiff_t), pi->ud);
-#endif
-		//write_size(pi, (size_t *)&L2->errfunc);
-	}
-
-	/* Finally, record upvalues which need to be reopened */
-	/* See the comment above persistupval() for why we do this */
-	{
-		GCObject *gco;
-		UpVal *uv;
-					/* perms reftbl ... thr */
-		for(gco = L2->openupval; gco != NULL; gco = uv->next) {
-			size_t stackpos;
-			uv = gco2uv(gco);
-
-			/* Make sure upvalue is really open */
-			lua_assert(uv->v != &uv->u.value);
-			pushupval(pi->L, uv);
-					/* perms reftbl ... thr uv */
-			persist(pi);
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... thr */
-			stackpos = uv->v - L2->stack;
-			write_size(pi, &stackpos);
-		}
-					/* perms reftbl ... thr */
-		lua_pushnil(pi->L);
-					/* perms reftbl ... thr nil */
-		persist(pi);
-		lua_pop(pi->L, 1);
-					/* perms reftbl ... thr */
-	}
-					/* perms reftbl ... thr */
-}
-
-static void persistboolean(PersistInfo *pi)
-{
-	int b = lua_toboolean(pi->L, -1);
-	pi_write(pi, &b, sizeof(int), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persistboolean %d\n", b);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persistboolean %d\n", b);
-#endif
-}
-
-static void persistlightuserdata(PersistInfo *pi)
-{
-	void *p = lua_touserdata(pi->L, -1);
-	pi_write(pi, &p, sizeof(void *), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persistlightuserdata %p\n", p);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persistlightuserdata %d\n", (int) p);
-#endif
-}
-
-static void persistnumber(PersistInfo *pi)
-{
-	lua_Number n = lua_tonumber(pi->L, -1);
-	pi_write(pi, &n, sizeof(lua_Number), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persistnumber %d (%d)\n", (int) n, (int) sizeof(lua_Number));
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persistnumber %d (%d)\n", (int) n, (int) sizeof(lua_Number));
-#endif
-}
-
-static void persiststring(PersistInfo *pi)
-{
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persiststring\n");
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persiststring\n");
-#endif
-	size_t length = lua_strlen(pi->L, -1);
-	write_size(pi, &length);
-	const char* s = lua_tostring(pi->L, -1);
-	pi_write(pi, s, length, pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persiststring %d \"%s\"\n", (int)length, s);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persiststring %d \"%s\"\n", length, s);
-#endif
-}
-
-/* Top-level delegating persist function
- */
-static void persist(PersistInfo *pi)
-{
-					/* perms reftbl ... obj */
-	lua_checkstack(pi->L, 2);
-	/* If the object has already been written, write a reference to it */
-	lua_pushvalue(pi->L, -1);
-					/* perms reftbl ... obj obj */
-	lua_rawget(pi->L, 2);
-					/* perms reftbl ... obj ref? */
-	if(!lua_isnil(pi->L, -1)) {
-					/* perms reftbl ... obj ref */
-		int zero = 0;
-		pi_write(pi, &zero, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persist_seenobject\n");
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persist_seenobject\n");
-#endif
-		int *ref = (int *)lua_touserdata(pi->L, -1);
-		pi_write(pi, ref, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persist_touserdata_ref %d\n", ref);
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persist_touserdata_ref %d\n", ref);
-#endif
-		lua_pop(pi->L, 1);
-					/* perms reftbl ... obj ref */
-#ifdef PLUTO_DEBUG
-		printindent(pi->level);
-		printf("0 %d\n", ref);
-#endif
-		return;
-	}
-					/* perms reftbl ... obj nil */
-	lua_pop(pi->L, 1);
-					/* perms reftbl ... obj */
-	/* If the object is nil, write the pseudoreference 0 */
-	if(lua_isnil(pi->L, -1)) {
-		int zero = 0;
-		/* firsttime */
-		pi_write(pi, &zero, sizeof(int), pi->ud);
-		/* ref */
-		pi_write(pi, &zero, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persist_nil (last 2 lines)\n");
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persist_nil (last 2 lines)\n");
-#endif
-#ifdef PLUTO_DEBUG
-		printindent(pi->level);
-		printf("0 0\n");
-#endif
-		return;
-	}
-	{
-		/* indicate that it's the first time */
-		int one = 1;
-		pi_write(pi, &one, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persist_newobject\n");
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persist_newobject\n");
-#endif
-	}
-	lua_pushvalue(pi->L, -1);
-					/* perms reftbl ... obj obj */
-	int *ref = (int *)lua_newuserdata(pi->L, sizeof(int));
-	*ref = ++(pi->counter);
-					/* perms reftbl ... obj obj ref */
-	lua_rawset(pi->L, 2);
-					/* perms reftbl ... obj */
-
-	pi_write(pi, &pi->counter, sizeof(int), pi->ud);
-	if (humanReadable) {
-		snprintf(hrBuf, hrBufSize, "persist_counter %d\n", pi->counter);
-		hrOut(pi);
-	}
-#ifdef TOTEXT
-	printf("persist_counter %d\n", pi->counter);
-#endif
-
-
-	/* At this point, we'll give the permanents table a chance to play. */
-	{
-		lua_pushvalue(pi->L, -1);
-					/* perms reftbl ... obj obj */
-		lua_gettable(pi->L, 1);
-					/* perms reftbl ... obj permkey? */
-		if(!lua_isnil(pi->L, -1)) {
-					/* perms reftbl ... obj permkey */
-			int type = PLUTO_TPERMANENT;
-#ifdef PLUTO_DEBUG
-			printindent(pi->level);
-			printf("1 %d PERM\n", pi->counter);
-			pi->level++;
-#endif
-			pi_write(pi, &type, sizeof(int), pi->ud);
-			if (humanReadable) {
-				snprintf(hrBuf, hrBufSize, "persist_permtype %d\n", type);
-				hrOut(pi);
-			}
-#ifdef TOTEXT
-			printf("persist_permtype %d\n", type);
-#endif
-			persist(pi);
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... obj */
-#ifdef PLUTO_DEBUG
-			pi->level--;
-#endif
-			return;
-		} else {
-					/* perms reftbl ... obj nil */
-			lua_pop(pi->L, 1);
-					/* perms reftbl ... obj */
-		}
-					/* perms reftbl ... obj */
-	}
-	{
-		int type = lua_type(pi->L, -1);
-		pi_write(pi, &type, sizeof(int), pi->ud);
-		if (humanReadable) {
-			snprintf(hrBuf, hrBufSize, "persist %s\n", type >= 0 && type < NUMTYPES ? typenames[type] : "?");
-			hrOut(pi);
-		}
-#ifdef TOTEXT
-		printf("persist %s\n", type >= 0 && type < NUMTYPES ? typenames[type] : "?");
-#endif
-
-#ifdef PLUTO_DEBUG
-		printindent(pi->level);
-		printf("1 %d %d\n", pi->counter, type);
-		pi->level++;
-#endif
-	}
-
-	switch(lua_type(pi->L, -1)) {
-		case LUA_TBOOLEAN:
-			persistboolean(pi);
-			break;
-		case LUA_TLIGHTUSERDATA:
-			persistlightuserdata(pi);
-			break;
-		case LUA_TNUMBER:
-			persistnumber(pi);
-			break;
-		case LUA_TSTRING:
-			persiststring(pi);
-			break;
-		case LUA_TTABLE:
-			persisttable(pi);
-			break;
-		case LUA_TFUNCTION:
-			persistfunction(pi);
-			break;
-		case LUA_TTHREAD:
-			persistthread(pi);
-			break;
-		case LUA_TPROTO:
-			persistproto(pi);
-			break;
-		case LUA_TUPVAL:
-			persistupval(pi);
-			break;
-		case LUA_TUSERDATA:
-			persistuserdata(pi);
-			break;
-		default:
-			lua_assert(0);
-	}
-#ifdef PLUTO_DEBUG
-	pi->level--;
-#endif
-}
-
-void pluto_persist(lua_State *L, lua_Chunkwriter writer, void *ud)
-{
-	PersistInfo pi;
-
-	pi.counter = 0;
-	pi.L = L;
-	pi.writer = writer;
-	pi.ud = ud;
-#ifdef PLUTO_DEBUG
-	pi.level = 0;
-#endif
-
-	lua_checkstack(L, 4);
-					/* perms? rootobj? ...? */
-	lua_assert(lua_gettop(L) == 2);
-					/* perms rootobj */
-	lua_assert(!lua_isnil(L, 2));
-					/* perms rootobj */
-	lua_newtable(L);
-					/* perms rootobj reftbl */
-
-	/* Now we're going to make the table weakly keyed. This prevents the
-	 * GC from visiting it and trying to mark things it doesn't want to
-	 * mark in tables, e.g. upvalues. All objects in the table are
-	 * a priori reachable, so it doesn't matter that we do this. */
-	lua_newtable(L);
-					/* perms rootobj reftbl mt */
-	lua_pushstring(L, "__mode");
-					/* perms rootobj reftbl mt "__mode" */
-	lua_pushstring(L, "k");
-					/* perms rootobj reftbl mt "__mode" "k" */
-	lua_settable(L, 4);
-					/* perms rootobj reftbl mt */
-	lua_setmetatable(L, 3);
-					/* perms rootobj reftbl */
-	lua_insert(L, 2);
-					/* perms reftbl rootobj */
-	persist(&pi);
-					/* perms reftbl rootobj */
-	lua_remove(L, 2);
-					/* perms rootobj */
-}
-
-typedef struct WriterInfo_t {
-	char* buf;
-	size_t buflen;
-} WriterInfo;
-
-static int bufwriter (lua_State *L, const void *p, size_t sz, void *ud) {
-	const char *cp = (const char *)p;
-	WriterInfo *wi = (WriterInfo *)ud;
-
-	LIF(M,reallocvector)(L, wi->buf, wi->buflen, wi->buflen+sz, char);
-	while(sz)
-	{
-		/* how dearly I love ugly C pointer twiddling */
-		wi->buf[wi->buflen++] = *cp++;
-		sz--;
-	}
-	return 0;
-}
-
-int persist_l(lua_State *L)
-{
-					/* perms? rootobj? ...? */
-	WriterInfo wi;
-
-	wi.buf = NULL;
-	wi.buflen = 0;
-
-	lua_settop(L, 2);
-					/* perms? rootobj? */
-	luaL_checktype(L, 1, LUA_TTABLE);
-					/* perms rootobj? */
-	luaL_checktype(L, 1, LUA_TTABLE);
-					/* perms rootobj */
-
-	pluto_persist(L, bufwriter, &wi);
-
-	lua_settop(L, 0);
-					/* (empty) */
-	lua_pushlstring(L, wi.buf, wi.buflen);
-					/* str */
-	pdep_freearray(L, wi.buf, wi.buflen, char);
-	return 1;
-}
-
-typedef struct UnpersistInfo_t {
-	lua_State *L;
-	ZIO zio;
-#ifdef PLUTO_DEBUG
-	int level;
-#endif
-} UnpersistInfo;
-
-static void unpersist(UnpersistInfo *upi);
-
-/* The object is left on the stack. This is primarily used by unpersist, but
- * may be used by GCed objects that may incur cycles in order to preregister
- * the object. */
-static void registerobject(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... obj */
-	lua_checkstack(upi->L, 2);
-	lua_pushlightuserdata(upi->L, (void *)ref);
-					/* perms reftbl ... obj ref */
-	lua_pushvalue(upi->L, -2);
-					/* perms reftbl ... obj ref obj */
-	lua_settable(upi->L, 2);
-					/* perms reftbl ... obj */
-}
-
-static void unpersistboolean(UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	int b;
-	lua_checkstack(upi->L, 1);
-	verify(LIF(Z,read)(&upi->zio, &b, sizeof(int)) == 0);
-	lua_pushboolean(upi->L, b);
-					/* perms reftbl ... bool */
-}
-
-static void unpersistlightuserdata(UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	void *p;
-	lua_checkstack(upi->L, 1);
-	verify(LIF(Z,read)(&upi->zio, &p, sizeof(void *)) == 0);
-	lua_pushlightuserdata(upi->L, p);
-					/* perms reftbl ... ludata */
-}
-
-static void unpersistnumber(UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_Number n;
-	lua_checkstack(upi->L, 1);
-	verify(LIF(Z,read)(&upi->zio, &n, sizeof(lua_Number)) == 0);
-	lua_pushnumber(upi->L, n);
-					/* perms reftbl ... num */
-}
-
-static void unpersiststring(UnpersistInfo *upi)
-{
-					/* perms reftbl sptbl ref */
-	/*int length;*/
-	size_t length;
-	char* string;
-	lua_checkstack(upi->L, 1);
-	/*verify(LIF(Z,read)(&upi->zio, &length, sizeof(int)) == 0);*/
-	/*verify(LIF(Z,read)(&upi->zio, &length, sizeof(size_t)) == 0);*/
-	read_size(&upi->zio, &length);
-	string = pdep_newvector(upi->L, length, char);
-	verify(LIF(Z,read)(&upi->zio, string, length) == 0);
-	lua_pushlstring(upi->L, string, length);
-					/* perms reftbl sptbl ref str */
-	pdep_freearray(upi->L, string, length, char);
-}
-
-static void unpersistspecialtable(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_checkstack(upi->L, 1);
-	unpersist(upi);
-					/* perms reftbl ... spfunc? */
-	lua_assert(lua_isfunction(upi->L, -1));
-					/* perms reftbl ... spfunc */
-	lua_call(upi->L, 0, 1);
-					/* perms reftbl ... tbl? */
-	lua_assert(lua_istable(upi->L, -1));
-					/* perms reftbl ... tbl */
-}
-
-static void unpersistliteraltable(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_checkstack(upi->L, 3);
-	/* Preregister table for handling of cycles */
-	lua_newtable(upi->L);
-					/* perms reftbl ... tbl */
-	registerobject(ref, upi);
-					/* perms reftbl ... tbl */
-	/* Unpersist metatable */
-	{
-		unpersist(upi);
-					/* perms reftbl ... tbl mt/nil? */
-		if(lua_istable(upi->L, -1)) {
-					/* perms reftbl ... tbl mt */
-			lua_setmetatable(upi->L, -2);
-					/* perms reftbl ... tbl */
-		} else {
-					/* perms reftbl ... tbl nil? */
-			lua_assert(lua_isnil(upi->L, -1));
-					/* perms reftbl ... tbl nil */
-			lua_pop(upi->L, 1);
-					/* perms reftbl ... tbl */
-		}
-					/* perms reftbl ... tbl */
-	}
-
-	while(1)
-	{
-					/* perms reftbl ... tbl */
-		unpersist(upi);
-					/* perms reftbl ... tbl key/nil */
-		if(lua_isnil(upi->L, -1)) {
-					/* perms reftbl ... tbl nil */
-			lua_pop(upi->L, 1);
-					/* perms reftbl ... tbl */
-			break;
-		}
-					/* perms reftbl ... tbl key */
-		unpersist(upi);
-					/* perms reftbl ... tbl key value? */
-		lua_assert(!lua_isnil(upi->L, -1));
-					/* perms reftbl ... tbl key value */
-		lua_rawset(upi->L, -3);
-					/* perms reftbl ... tbl */
-	}
-}
-
-static void unpersisttable(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_checkstack(upi->L, 1);
-	{
-		int isspecial;
-		verify(LIF(Z,read)(&upi->zio, &isspecial, sizeof(int)) == 0);
-		if(isspecial) {
-			unpersistspecialtable(ref, upi);
-					/* perms reftbl ... tbl */
-		} else {
-			unpersistliteraltable(ref, upi);
-					/* perms reftbl ... tbl */
-		}
-					/* perms reftbl ... tbl */
-	}
-}
-
-static UpVal *makeupval(lua_State *L, int stackpos)
-{
-	UpVal *uv = pdep_new(L, UpVal);
-	pdep_link(L, (GCObject *)uv, LUA_TUPVAL);
-	uv->tt = LUA_TUPVAL;
-	uv->v = &uv->u.value;
-	uv->u.l.prev = NULL;
-	uv->u.l.next = NULL;
-	setobj(L, uv->v, getobject(L, stackpos));
-	return uv;
-}
-
-static Proto *makefakeproto(lua_State *L, lu_byte nups)
-{
-	Proto *p = pdep_newproto(L);
-	p->sizelineinfo = 1;
-	p->lineinfo = pdep_newvector(L, 1, int);
-	p->lineinfo[0] = 1;
-	p->sizecode = 1;
-	p->code = pdep_newvector(L, 1, Instruction);
-	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
-	p->source = pdep_newlstr(L, "", 0);
-	p->maxstacksize = 2;
-	p->nups = nups;
-	p->sizek = 0;
-	p->sizep = 0;
-
-	return p;
-}
-
-/* The GC is not fond of finding upvalues in tables. We get around this
- * during persistence using a weakly keyed table, so that the GC doesn't
- * bother to mark them. This won't work in unpersisting, however, since
- * if we make the values weak they'll be collected (since nothing else
- * references them). Our solution, during unpersisting, is to represent
- * upvalues as dummy functions, each with one upvalue. */
-static void boxupval_start(lua_State *L)
-{
-	LClosure *lcl;
-	lcl = (LClosure *)pdep_newLclosure(L, 1, hvalue(&L->l_gt));
-	pushclosure(L, (Closure *)lcl);
-					/* ... func */
-	lcl->p = makefakeproto(L, 1);
-
-	/* Temporarily initialize the upvalue to nil */
-
-	lua_pushnil(L);
-	lcl->upvals[0] = makeupval(L, -1);
-	lua_pop(L, 1);
-}
-
-static void boxupval_finish(lua_State *L)
-{
-					/* ... func obj */
-	LClosure *lcl = (LClosure *) clvalue(getobject(L, -2));
-
-	lcl->upvals[0]->u.value = *getobject(L, -1);
-	lua_pop(L, 1);
-}
-
-
-static void unboxupval(lua_State *L)
-{
-					/* ... func */
-	LClosure *lcl;
-	UpVal *uv;
-
-	lcl = (LClosure *)clvalue(getobject(L, -1));
-	uv = lcl->upvals[0];
-	lua_pop(L, 1);
-					/* ... */
-	pushupval(L, uv);
-					/* ... upval */
-}
-
-static void unpersistfunction(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	LClosure *lcl;
-	int i;
-	lu_byte nupvalues;
-	lua_checkstack(upi->L, 2);
-
-	verify(LIF(Z,read)(&upi->zio, &nupvalues, sizeof(lu_byte)) == 0);
-
-	lcl = (LClosure *)pdep_newLclosure(upi->L, nupvalues, hvalue(&upi->L->l_gt));
-	pushclosure(upi->L, (Closure *)lcl);
-
-					/* perms reftbl ... func */
-	/* Put *some* proto in the closure, before the GC can find it */
-	lcl->p = makefakeproto(upi->L, nupvalues);
-
-	/* Also, we need to temporarily fill the upvalues */
-	lua_pushnil(upi->L);
-					/* perms reftbl ... func nil */
-	for(i=0; i<nupvalues; i++) {
-		lcl->upvals[i] = makeupval(upi->L, -1);
-	}
-	lua_pop(upi->L, 1);
-					/* perms reftbl ... func */
-
-	/* I can't see offhand how a function would ever get to be self-
-	 * referential, but just in case let's register it early */
-	registerobject(ref, upi);
-
-	/* Now that it's safe, we can get the real proto */
-	unpersist(upi);
-					/* perms reftbl ... func proto? */
-	lua_assert(lua_type(upi->L, -1) == LUA_TPROTO);
-					/* perms reftbl ... func proto */
-	lcl->p = toproto(upi->L, -1);
-	lua_pop(upi->L, 1);
-					/* perms reftbl ... func */
-
-	for(i=0; i<nupvalues; i++) {
-					/* perms reftbl ... func */
-		unpersist(upi);
-					/* perms reftbl ... func func2 */
-		unboxupval(upi->L);
-					/* perms reftbl ... func upval */
-		lcl->upvals[i] = toupval(upi->L, -1);
-		lua_pop(upi->L, 1);
-					/* perms reftbl ... func */
-	}
-					/* perms reftbl ... func */
-
-	/* Finally, the fenv */
-	unpersist(upi);
-					/* perms reftbl ... func fenv/nil? */
-	lua_assert(lua_type(upi->L, -1) == LUA_TNIL ||
-		lua_type(upi->L, -1) == LUA_TTABLE);
-					/* perms reftbl ... func fenv/nil */
-	if(!lua_isnil(upi->L, -1)) {
-					/* perms reftbl ... func fenv */
-		lua_setfenv(upi->L, -2);
-					/* perms reftbl ... func */
-	} else {
-					/* perms reftbl ... func nil */
-		lua_pop(upi->L, 1);
-					/* perms reftbl ... func */
-	}
-					/* perms reftbl ... func */
-}
-
-static void unpersistupval(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_checkstack(upi->L, 2);
-
-	boxupval_start(upi->L);
-					/* perms reftbl ... func */
-	registerobject(ref, upi);
-
-	unpersist(upi);
-					/* perms reftbl ... func obj */
-	boxupval_finish(upi->L);
-					/* perms reftbl ... func */
-}
-
-static void unpersistproto(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	Proto *p;
-	int i;
-	int sizep, sizek;
-
-	/* We have to be careful. The GC expects a lot out of protos. In
-	 * particular, we need to give the function a valid string for its
-	 * source, and valid code, even before we actually read in the real
-	 * code. */
-	TString *source = pdep_newlstr(upi->L, "", 0);
-	p = pdep_newproto(upi->L);
-	p->source = source;
-	p->sizecode=1;
-	p->code = pdep_newvector(upi->L, 1, Instruction);
-	p->code[0] = CREATE_ABC(OP_RETURN, 0, 1, 0);
-	p->maxstacksize = 2;
-	p->sizek = 0;
-	p->sizep = 0;
-
-	lua_checkstack(upi->L, 2);
-
-	pushproto(upi->L, p);
-					/* perms reftbl ... proto */
-	/* We don't need to register early, since protos can never ever be
-	 * involved in cyclic references */
-
-	/* Read in constant references */
-	{
-		verify(LIF(Z,read)(&upi->zio, &sizek, sizeof(int)) == 0);
-		LIF(M,reallocvector)(upi->L, p->k, 0, sizek, TValue);
-		for(i=0; i<sizek; i++) {
-					/* perms reftbl ... proto */
-			unpersist(upi);
-					/* perms reftbl ... proto k */
-			setobj2s(upi->L, &p->k[i], getobject(upi->L, -1));
-			p->sizek++;
-			lua_pop(upi->L, 1);
-					/* perms reftbl ... proto */
-		}
-					/* perms reftbl ... proto */
-	}
-	/* Read in sub-proto references */
-	{
-		verify(LIF(Z,read)(&upi->zio, &sizep, sizeof(int)) == 0);
-		LIF(M,reallocvector)(upi->L, p->p, 0, sizep, Proto*);
-		for(i=0; i<sizep; i++) {
-					/* perms reftbl ... proto */
-			unpersist(upi);
-					/* perms reftbl ... proto subproto */
-			p->p[i] = toproto(upi->L, -1);
-			p->sizep++;
-			lua_pop(upi->L, 1);
-					/* perms reftbl ... proto */
-		}
-					/* perms reftbl ... proto */
-	}
-
-	/* Read in code */
-	{
-		verify(LIF(Z,read)(&upi->zio, &p->sizecode, sizeof(int)) == 0);
-		LIF(M,reallocvector)(upi->L, p->code, 1, p->sizecode, Instruction);
-		verify(LIF(Z,read)(&upi->zio, p->code,
-			sizeof(Instruction) * p->sizecode) == 0);
-	}
-
-	/* Read in upvalue names */
-	{
-		verify(LIF(Z,read)(&upi->zio, &p->sizeupvalues, sizeof(int)) == 0);
-		if (p->sizeupvalues)
-		{
-			LIF(M,reallocvector)(upi->L, p->upvalues, 0, p->sizeupvalues, TString *);
-			for(i=0; i<p->sizeupvalues; i++)
-			{
-				unpersist(upi);
-				p->upvalues[i] = pdep_newlstr(upi->L, lua_tostring(upi->L, -1), strlen(lua_tostring(upi->L, -1)));
-				lua_pop(upi->L, 1);
-			}
-		}
-	}
-
-	/* Read in local variable infos */
-	{
-		verify(LIF(Z,read)(&upi->zio, &p->sizelocvars, sizeof(int)) == 0);
-		if (p->sizelocvars)
-		{
-			LIF(M,reallocvector)(upi->L, p->locvars, 0, p->sizelocvars, LocVar);
-			for(i=0; i<p->sizelocvars; i++)
-			{
-				unpersist(upi);
-				p->locvars[i].varname = pdep_newlstr(upi->L, lua_tostring(upi->L, -1), strlen(lua_tostring(upi->L, -1)));
-				lua_pop(upi->L, 1);
-
-				verify(LIF(Z,read)(&upi->zio, &p->locvars[i].startpc, sizeof(int)) == 0);
-				verify(LIF(Z,read)(&upi->zio, &p->locvars[i].endpc, sizeof(int)) == 0);
-			}
-		}
-	}
-
-	/* Read in source string*/
-	unpersist(upi);
-	p->source = pdep_newlstr(upi->L, lua_tostring(upi->L, -1), strlen(lua_tostring(upi->L, -1)));
-	lua_pop(upi->L, 1);
-
-	/* Read in line numbers */
-	{
-		verify(LIF(Z,read)(&upi->zio, &p->sizelineinfo, sizeof(int)) == 0);
-		if (p->sizelineinfo)
-		{
-			LIF(M,reallocvector)(upi->L, p->lineinfo, 0, p->sizelineinfo, int);
-			verify(LIF(Z,read)(&upi->zio, p->lineinfo,
-			sizeof(int) * p->sizelineinfo) == 0);
-		}
-	}
-
-	/* Read in linedefined and lastlinedefined */
-	verify(LIF(Z,read)(&upi->zio, &p->linedefined, sizeof(int)) == 0);
-	verify(LIF(Z,read)(&upi->zio, &p->lastlinedefined, sizeof(int)) == 0);
-
-	/* Read in misc values */
-	{
-		verify(LIF(Z,read)(&upi->zio, &p->nups, sizeof(lu_byte)) == 0);
-		verify(LIF(Z,read)(&upi->zio, &p->numparams, sizeof(lu_byte)) == 0);
-		verify(LIF(Z,read)(&upi->zio, &p->is_vararg, sizeof(lu_byte)) == 0);
-		verify(LIF(Z,read)(&upi->zio, &p->maxstacksize, sizeof(lu_byte)) == 0);
-	}
-}
-
-
-/* Does basically the opposite of luaC_link().
- * Right now this function is rather inefficient; it requires traversing the
- * entire root GC set in order to find one object. If the GC list were doubly
- * linked this would be much easier, but there's no reason for Lua to have
- * that. */
-static void gcunlink(lua_State *L, GCObject *gco)
-{
-	GCObject *prevslot;
-	if(G(L)->rootgc == gco) {
-		G(L)->rootgc = G(L)->rootgc->gch.next;
-		return;
-	}
-
-	prevslot = G(L)->rootgc;
-	while(prevslot->gch.next != gco) {
-		lua_assert(prevslot->gch.next != NULL);
-		prevslot = prevslot->gch.next;
-	}
-
-	prevslot->gch.next = prevslot->gch.next->gch.next;
-}
-
-/* FIXME __ALL__ field ordering */
-static void unpersistthread(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_State *L2;
-	size_t stacklimit = 0;
-	L2 = lua_newthread(upi->L);
-	lua_checkstack(upi->L, 3);
-					/* L1: perms reftbl ... thr */
-					/* L2: (empty) */
-	registerobject(ref, upi);
-
-	/* First, deserialize the object stack. */
-	{
-		size_t i, stacksize;
-		read_size(&upi->zio, &stacksize);
-		LIF(D,growstack)(L2, (int)stacksize);
-		/* Make sure that the first stack element (a nil, representing
-		 * the imaginary top-level C function) is written to the very,
-		 * very bottom of the stack */
-		L2->top--;
-		for(i=0; i<stacksize; i++) {
-			unpersist(upi);
-					/* L1: perms reftbl ... thr obj* */
-		}
-		lua_xmove(upi->L, L2, stacksize);
-					/* L1: perms reftbl ... thr */
-					/* L2: obj* */
-	}
-					/* (hereafter, stacks refer to L1) */
-
-	/* Now, deserialize the CallInfo stack. */
-	{
-		size_t i, numframes;
-		read_size(&upi->zio, &numframes);
-		LIF(D,reallocCI)(L2,numframes*2);
-		for(i=0; i<numframes; i++) {
-			CallInfo *ci = L2->base_ci + i;
-			size_t stackbase, stackfunc, stacktop, savedpc;
-			read_size(&upi->zio, &stackbase);
-			read_size(&upi->zio, &stackfunc);
-			read_size(&upi->zio, &stacktop);
-			verify(LIF(Z,read)(&upi->zio, &ci->nresults, sizeof(int)) == 0);
-			read_size(&upi->zio, &savedpc);
-
-			if(stacklimit < stacktop)
-				stacklimit = stacktop;
-
-			ci->base = L2->stack+stackbase;
-			ci->func = L2->stack+stackfunc;
-			ci->top = L2->stack+stacktop;
-			ci->savedpc = (ci != L2->base_ci) ?
-				ci_func(ci)->l.p->code+savedpc :
-				0;
-			ci->tailcalls = 0;
-			/* Update the pointer each time, to keep the GC
-			 * happy*/
-			L2->ci = ci;
-		}
-	}
-					/* perms reftbl ... thr */
-	/* Deserialize the state's other parameters, with the exception of upval stuff */
-	{
-		size_t stackbase, stacktop;
-		L2->savedpc = L2->ci->savedpc;
-		verify(LIF(Z,read)(&upi->zio, &L2->status, sizeof(lu_byte)) == 0);
-		read_size(&upi->zio, &stackbase);
-		read_size(&upi->zio, &stacktop);
-
-#ifdef SIZES64
-		uint64 value;
-		verify(LIF(Z,read)(&upi->zio, &value, sizeof(uint64)) == 0);
-
-		L2->errfunc = static_cast<ptrdiff_t>(value);
-#else
-		verify(LIF(Z,read)(&upi->zio, &L2->errfunc, sizeof(ptrdiff_t)) == 0);
-#endif
-
-		//read_size(&upi->zio, (size_t *)&L2->errfunc);
-		L2->base = L2->stack + stackbase;
-		L2->top = L2->stack + stacktop;
-	}
-	/* Finally, "reopen" upvalues (see persistupval() for why) */
-	{
-		UpVal* uv;
-		GCObject **nextslot = &L2->openupval;
-		global_State *g = G(L2);
-		while(1) {
-			size_t stackpos;
-			unpersist(upi);
-					/* perms reftbl ... thr uv/nil */
-			if(lua_isnil(upi->L, -1)) {
-					/* perms reftbl ... thr nil */
-				lua_pop(upi->L, 1);
-					/* perms reftbl ... thr */
-				break;
-			}
-					/* perms reftbl ... thr boxeduv */
-			unboxupval(upi->L);
-					/* perms reftbl ... thr uv */
-			uv = toupval(upi->L, -1);
-			lua_pop(upi->L, 1);
-					/* perms reftbl ... thr */
-
-			read_size(&upi->zio, &stackpos);
-			uv->v = L2->stack + stackpos;
-			gcunlink(upi->L, (GCObject *)uv);
-			uv->marked = luaC_white(g);
-			*nextslot = (GCObject *)uv;
-			nextslot = &uv->next;
-			uv->u.l.prev = &G(L2)->uvhead;
-			uv->u.l.next = G(L2)->uvhead.u.l.next;
-			uv->u.l.next->u.l.prev = uv;
-			G(L2)->uvhead.u.l.next = uv;
-			lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
-		}
-		*nextslot = NULL;
-	}
-
-	/* The stack must be valid at least to the highest value among the CallInfos */
-	/* 'top' and the values up to there must be filled with 'nil' */
-	{
-		StkId o;
-		LIF(D,checkstack)(L2, (int)stacklimit);
-		for (o = L2->top; o <= L2->top + stacklimit; o++)
-			setnilvalue(o);
-	}
-}
-
-static void unpersistuserdata(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	int isspecial;
-	lua_checkstack(upi->L, 2);
-	verify(LIF(Z,read)(&upi->zio, &isspecial, sizeof(int)) == 0);
-	if(isspecial) {
-		unpersist(upi);
-					/* perms reftbl ... spfunc? */
-		lua_assert(lua_isfunction(upi->L, -1));
-					/* perms reftbl ... spfunc */
-#ifdef PLUTO_PASS_USERDATA_TO_PERSIST
-		lua_pushlightuserdata(upi->L, &upi->zio);
-		lua_call(upi->L, 1, 1);
-#else
-		lua_call(upi->L, 0, 1);
-#endif
-					/* perms reftbl ... udata? */
-/* This assertion might not be necessary; it's conceivable, for
- * example, that the SP function might decide to return a table
- * with equivalent functionality. For the time being, we'll
- * ignore this possibility in favor of stricter and more testable
- * requirements. */
-		lua_assert(lua_isuserdata(upi->L, -1));
-					/* perms reftbl ... udata */
-	} else {
-		size_t length;
-		read_size(&upi->zio, &length);
-
-		lua_newuserdata(upi->L, length);
-					/* perms reftbl ... udata */
-		registerobject(ref, upi);
-		verify(LIF(Z,read)(&upi->zio, lua_touserdata(upi->L, -1), length) == 0);
-
-		unpersist(upi);
-					/* perms reftbl ... udata mt/nil? */
-		lua_assert(lua_istable(upi->L, -1) || lua_isnil(upi->L, -1));
-					/* perms reftbl ... udata mt/nil */
-		lua_setmetatable(upi->L, -2);
-					/* perms reftbl ... udata */
-	}
-					/* perms reftbl ... udata */
-}
-
-static void unpersistpermanent(int ref, UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	lua_checkstack(upi->L, 2);
-	unpersist(upi);
-					/* perms reftbl permkey */
-	lua_gettable(upi->L, 1);
-					/* perms reftbl perm? */
-	/* We assume currently that the substituted permanent value
-	 * shouldn't be nil. This may be a bad assumption. Real-life
-	 * experience is needed to evaluate this. */
-	lua_assert(!lua_isnil(upi->L, -1));
-					/* perms reftbl perm */
-}
-
-#if 0
-/* For debugging only; not called when lua_assert is empty */
-static int inreftable(lua_State *L, int ref)
-{
-	int res;
-	lua_checkstack(L, 1);
-					/* perms reftbl ... */
-	lua_pushlightuserdata(L, (void *)ref);
-					/* perms reftbl ... ref */
-	lua_gettable(L, 2);
-					/* perms reftbl ... obj? */
-	res = !lua_isnil(L, -1);
-	lua_pop(L, 1);
-					/* perms reftbl ... */
-	return res;
-}
-#endif
-
-static void unpersist(UnpersistInfo *upi)
-{
-					/* perms reftbl ... */
-	int firstTime;
-	int stacksize = lua_gettop(upi->L); stacksize = stacksize; /* DEBUG */
-	lua_checkstack(upi->L, 2);
-	LIF(Z,read)(&upi->zio, &firstTime, sizeof(int));
-	if(firstTime) {
-		int ref;
-		int type;
-		LIF(Z,read)(&upi->zio, &ref, sizeof(int));
-		lua_assert(!inreftable(upi->L, ref));
-		LIF(Z,read)(&upi->zio, &type, sizeof(int));
-#ifdef PLUTO_DEBUG
-		printindent(upi->level);
-		printf("1 %d %d\n", ref, type);
-		upi->level++;
-#endif
-		switch(type) {
-		case LUA_TBOOLEAN:
-			unpersistboolean(upi);
-			break;
-		case LUA_TLIGHTUSERDATA:
-			unpersistlightuserdata(upi);
-			break;
-		case LUA_TNUMBER:
-			unpersistnumber(upi);
-			break;
-		case LUA_TSTRING:
-			unpersiststring(upi);
-			break;
-		case LUA_TTABLE:
-			unpersisttable(ref, upi);
-			break;
-		case LUA_TFUNCTION:
-			unpersistfunction(ref, upi);
-			break;
-		case LUA_TTHREAD:
-			unpersistthread(ref, upi);
-			break;
-		case LUA_TPROTO:
-			unpersistproto(ref, upi);
-			break;
-		case LUA_TUPVAL:
-			unpersistupval(ref, upi);
-			break;
-		case LUA_TUSERDATA:
-			unpersistuserdata(ref, upi);
-			break;
-		case PLUTO_TPERMANENT:
-			unpersistpermanent(ref, upi);
-			break;
-		default:
-			lua_assert(0);
-		}
-					/* perms reftbl ... obj */
-		lua_assert(lua_type(upi->L, -1) == type ||
-			type == PLUTO_TPERMANENT ||
-			/* Remember, upvalues get a special dispensation, as
-			 * described in boxupval */
-			(lua_type(upi->L, -1) == LUA_TFUNCTION &&
-				type == LUA_TUPVAL));
-		registerobject(ref, upi);
-					/* perms reftbl ... obj */
-#ifdef PLUTO_DEBUG
-		upi->level--;
-#endif
-	} else {
-		int ref;
-		LIF(Z,read)(&upi->zio, &ref, sizeof(int));
-#ifdef PLUTO_DEBUG
-		printindent(upi->level);
-		printf("0 %d\n", ref);
-#endif
-		if(ref == 0) {
-			lua_pushnil(upi->L);
-					/* perms reftbl ... nil */
-		} else {
-			lua_pushlightuserdata(upi->L, (void *)ref);
-					/* perms reftbl ... ref */
-			lua_gettable(upi->L, 2);
-					/* perms reftbl ... obj? */
-			lua_assert(!lua_isnil(upi->L, -1));
-		}
-					/* perms reftbl ... obj/nil */
-	}
-					/* perms reftbl ... obj/nil */
-	lua_assert(lua_gettop(upi->L) == stacksize + 1);
-}
-
-void pluto_unpersist(lua_State *L, lua_Chunkreader reader, void *ud)
-{
-	/* We use the graciously provided ZIO (what the heck does the Z stand
-	 * for?) library so that we don't have to deal with the reader directly.
-	 * Letting the reader function decide how much data to return can be
-	 * very unpleasant.
-	 */
-	UnpersistInfo upi;
-	upi.L = L;
-#ifdef PLUTO_DEBUG
-	upi.level = 0;
-#endif
-
-	lua_checkstack(L, 3);
-	LIF(Z,init)(L, &upi.zio, reader, ud);
-
-					/* perms */
-	lua_newtable(L);
-					/* perms reftbl */
-	lua_gc(L, LUA_GCSTOP, 0);
-	unpersist(&upi);
-	lua_gc(L, LUA_GCRESTART, 0);
-					/* perms reftbl rootobj */
-	lua_replace(L, 2);
-					/* perms rootobj  */
-}
-
-typedef struct LoadInfo_t {
-	char *buf;
-	size_t size;
-} LoadInfo;
-
-
-static const char *bufreader(lua_State *L, void *ud, size_t *sz) {
-	LoadInfo *li = (LoadInfo *)ud;
-	if(li->size == 0) {
-		return NULL;
-	}
-	*sz = li->size;
-	li->size = 0;
-	return li->buf;
-}
-
-int unpersist_l(lua_State *L)
-{
-	LoadInfo li;
-	char const *origbuf;
-	char *tempbuf;
-	size_t bufsize;
-					/* perms? str? ...? */
-	lua_settop(L, 2);
-					/* perms? str? */
-	origbuf = luaL_checklstring(L, 2, &bufsize);
-	tempbuf = LIF(M,newvector)(L, bufsize, char);
-	memcpy(tempbuf, origbuf, bufsize);
-
-	li.buf = tempbuf;
-	li.size = bufsize;
-
-					/* perms? str */
-	lua_pop(L, 1);
-					/* perms? */
-	luaL_checktype(L, 1, LUA_TTABLE);
-					/* perms */
-	pluto_unpersist(L, bufreader, &li);
-					/* perms rootobj */
-	LIF(M,freearray)(L, tempbuf, bufsize, char);
-	return 1;
-}
-
-/* Stefan's first C function for Lua! :)
-   Returns a string describing the Pluto version you're using. */
-
-int version_l(lua_State *L)
-{
-	const char *version = VERSION;
-
-	lua_settop(L, 0);
-					/* (empty) */
-	lua_pushlstring(L, version, strlen(version));
-					/* str */
-	return 1;
-}
-
-/* Set human-readable output on or off. */
-int human_l(lua_State *L)
-{
-					/* flag? ...? */
-	lua_settop(L, 1);
-					/* flag? */
-	/*luaL_checktype(L, 1, LUA_TBOOLEAN);*/
-					/* flag */
-
-	humanReadable = lua_toboolean(L, 1);
-
-	lua_settop(L, 0);
-					/* (empty) */
-	return 0;
-}
-
-static luaL_reg pluto_reg[] = {
-	{ "persist", persist_l },
-	{ "unpersist", unpersist_l },
-	{ "version", version_l },
-	{ "human", human_l },
-	{ NULL, NULL }
-};
-
-LUALIB_API int luaopen_pluto(lua_State *L) {
-	luaL_openlib(L, "pluto", pluto_reg, 0);
-	return 1;
-}
diff --git a/engines/sword25/util/pluto/pluto.h b/engines/sword25/util/pluto/pluto.h
deleted file mode 100644
index 3674842d44..0000000000
--- a/engines/sword25/util/pluto/pluto.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $Id$ */
-
-/* Pluto - Heavy-duty persistence for Lua
- * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
- * domain. People making use of this software as part of an application
- * are politely requested to email the author at sneftel@gmail.com
- * with a brief description of the application, primarily to satisfy his
- * curiosity.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* lua.h must be included before this file */
-
-void pluto_persist(lua_State *L, lua_Chunkwriter writer, void *ud);
-
-void pluto_unpersist(lua_State *L, lua_Chunkreader reader, void *ud);
-
-LUALIB_API int luaopen_pluto(lua_State *L);
diff --git a/engines/sword25/util/pluto/plzio.cpp b/engines/sword25/util/pluto/plzio.cpp
deleted file mode 100644
index 21f69a9e8d..0000000000
--- a/engines/sword25/util/pluto/plzio.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-** $Id$
-** a generic input stream interface
-** See Copyright Notice in lua.h
-*/
-
-
-#include <string.h>
-
-#define lzio_c
-#define LUA_CORE
-
-#include "pdep/pdep.h"
-
-int pdep_fill (ZIO *z) {
-  size_t size;
-  lua_State *L = z->L;
-  const char *buff;
-  lua_unlock(L);
-  buff = z->reader(L, z->data, &size);
-  lua_lock(L);
-  if (buff == NULL || size == 0) return EOZ;
-  z->n = size - 1;
-  z->p = buff;
-  return char2int(*(z->p++));
-}
-
-
-int pdep_lookahead (ZIO *z) {
-  if (z->n == 0) {
-    if (pdep_fill(z) == EOZ)
-      return EOZ;
-    else {
-      z->n++;  /* pdep_fill removed first byte; put back it */
-      z->p--;
-    }
-  }
-  return char2int(*z->p);
-}
-
-
-void pdep_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
-  z->L = L;
-  z->reader = reader;
-  z->data = data;
-  z->n = 0;
-  z->p = NULL;
-}
-
-
-/* --------------------------------------------------------------- read --- */
-size_t pdep_read (ZIO *z, void *b, size_t n) {
-  while (n) {
-    size_t m;
-    if (pdep_lookahead(z) == EOZ)
-      return n;  /* return number of missing bytes */
-    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
-    memcpy(b, z->p, m);
-    z->n -= m;
-    z->p += m;
-    b = (char *)b + m;
-    n -= m;
-  }
-  return 0;
-}
-
-/* ------------------------------------------------------------------------ */
-char *pdep_openspace (lua_State *L, Mbuffer *buff, size_t n) {
-  if (n > buff->buffsize) {
-    if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
-    pdep_resizebuffer(L, buff, n);
-  }
-  return buff->buffer;
-}
-- 
cgit v1.2.3


From eaff6a40f6f9cb8a5817c7b90a7e24c8c12da3fe Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 18:21:43 -0600
Subject: SWORD25: Correct include guards to reflect the changes to the file
 names

---
 engines/sword25/util/lua_persistence.h      | 4 ++--
 engines/sword25/util/lua_persistence_util.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sword25/util/lua_persistence.h b/engines/sword25/util/lua_persistence.h
index cf7d7e03ca..88cbb04ad2 100644
--- a/engines/sword25/util/lua_persistence.h
+++ b/engines/sword25/util/lua_persistence.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef LUA_SERIALIZATION_H
-#define LUA_SERIALIZATION_H
+#ifndef LUA_PERSISTENCE_H
+#define LUA_PERSISTENCE_H
 
 #include "sword25/util/lua/lua.h"
 
diff --git a/engines/sword25/util/lua_persistence_util.h b/engines/sword25/util/lua_persistence_util.h
index 345996f606..305eea4aaf 100644
--- a/engines/sword25/util/lua_persistence_util.h
+++ b/engines/sword25/util/lua_persistence_util.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef LUA_SERIALIZATION_UTIL_H
-#define LUA_SERIALIZATION_UTIL_H
+#ifndef LUA_PERISTENCE_UTIL_H
+#define LUA_PERISTENCE_UTIL_H
 
 
 struct lua_State;
-- 
cgit v1.2.3


From 8ee75e1dc56681337a3ae98c9d207e70e28c5ff5 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 18:22:15 -0600
Subject: SWORD25: Add Pluto copyright message to new persistence code

Since the code is based off the Pluto code
---
 engines/sword25/util/lua_persist.cpp          | 24 ++++++++++++++
 engines/sword25/util/lua_persistence.h        | 23 +++++++++++++
 engines/sword25/util/lua_persistence_util.cpp | 47 +++++++++++++++++++++++++++
 engines/sword25/util/lua_persistence_util.h   | 24 ++++++++++++++
 engines/sword25/util/lua_unpersist.cpp        | 24 ++++++++++++++
 5 files changed, 142 insertions(+)

diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
index 6d758067ad..aea4e70036 100644
--- a/engines/sword25/util/lua_persist.cpp
+++ b/engines/sword25/util/lua_persist.cpp
@@ -20,6 +20,30 @@
  *
  */
 
+/**
+ * This code is heavily based on the Pluto code base. Copyright below
+ */
+
+/* Tamed Pluto - Heavy-duty persistence for Lua
+ * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ * domain. People making use of this software as part of an application
+ * are politely requested to email the author at sneftel@gmail.com
+ * with a brief description of the application, primarily to satisfy his
+ * curiosity.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Instrumented by Stefan Reich (info@luaos.net)
+ * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
+ */
+
+
 #include "sword25/util/lua_persistence.h"
 
 #include "sword25/util/double_serialization.h"
diff --git a/engines/sword25/util/lua_persistence.h b/engines/sword25/util/lua_persistence.h
index 88cbb04ad2..53e3dee02e 100644
--- a/engines/sword25/util/lua_persistence.h
+++ b/engines/sword25/util/lua_persistence.h
@@ -20,6 +20,29 @@
  *
  */
 
+/**
+ * This code is heavily based on the Pluto code base. Copyright below
+ */
+
+/* Tamed Pluto - Heavy-duty persistence for Lua
+ * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ * domain. People making use of this software as part of an application
+ * are politely requested to email the author at sneftel@gmail.com
+ * with a brief description of the application, primarily to satisfy his
+ * curiosity.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Instrumented by Stefan Reich (info@luaos.net)
+ * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
+ */
+
 #ifndef LUA_PERSISTENCE_H
 #define LUA_PERSISTENCE_H
 
diff --git a/engines/sword25/util/lua_persistence_util.cpp b/engines/sword25/util/lua_persistence_util.cpp
index 8365f5d483..958fb7ac3c 100644
--- a/engines/sword25/util/lua_persistence_util.cpp
+++ b/engines/sword25/util/lua_persistence_util.cpp
@@ -20,6 +20,53 @@
  *
  */
 
+/**
+ * This code is heavily based on the pluto code base. Copyright below
+ */
+
+/* Tamed Pluto - Heavy-duty persistence for Lua
+ * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ * domain. People making use of this software as part of an application
+ * are politely requested to email the author at sneftel@gmail.com
+ * with a brief description of the application, primarily to satisfy his
+ * curiosity.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Instrumented by Stefan Reich (info@luaos.net)
+ * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
+ */
+
+/**
+ * This code is heavily based on the Pluto code base. Copyright below
+ */
+
+/* Tamed Pluto - Heavy-duty persistence for Lua
+ * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ * domain. People making use of this software as part of an application
+ * are politely requested to email the author at sneftel@gmail.com
+ * with a brief description of the application, primarily to satisfy his
+ * curiosity.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Instrumented by Stefan Reich (info@luaos.net)
+ * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
+ */
+
+
 #include "sword25/util/lua_persistence_util.h"
 
 #include "common/scummsys.h"
diff --git a/engines/sword25/util/lua_persistence_util.h b/engines/sword25/util/lua_persistence_util.h
index 305eea4aaf..4d0085e242 100644
--- a/engines/sword25/util/lua_persistence_util.h
+++ b/engines/sword25/util/lua_persistence_util.h
@@ -20,6 +20,30 @@
  *
  */
 
+/**
+ * This code is heavily based on the Pluto code base. Copyright below
+ */
+
+/* Tamed Pluto - Heavy-duty persistence for Lua
+ * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ * domain. People making use of this software as part of an application
+ * are politely requested to email the author at sneftel@gmail.com
+ * with a brief description of the application, primarily to satisfy his
+ * curiosity.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Instrumented by Stefan Reich (info@luaos.net)
+ * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
+ */
+
+
 #ifndef LUA_PERISTENCE_UTIL_H
 #define LUA_PERISTENCE_UTIL_H
 
diff --git a/engines/sword25/util/lua_unpersist.cpp b/engines/sword25/util/lua_unpersist.cpp
index 8d644302f9..6f3275741a 100644
--- a/engines/sword25/util/lua_unpersist.cpp
+++ b/engines/sword25/util/lua_unpersist.cpp
@@ -20,6 +20,30 @@
  *
  */
 
+/**
+ * This code is heavily based on the Pluto code base. Copyright below
+ */
+
+/* Tamed Pluto - Heavy-duty persistence for Lua
+ * Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ * domain. People making use of this software as part of an application
+ * are politely requested to email the author at sneftel@gmail.com
+ * with a brief description of the application, primarily to satisfy his
+ * curiosity.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Instrumented by Stefan Reich (info@luaos.net)
+ * for Mobile Lua (http://luaos.net/pages/mobile-lua.php)
+ */
+
+
 #include "sword25/util/lua_persistence.h"
 
 #include "sword25/util/double_serialization.h"
-- 
cgit v1.2.3


From 9a4d62e76a29647ed7f2c0b16f009ff143fdf739 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 18:26:59 -0600
Subject: SWORD25: Change function names to use persist instead of serialize

Same argument as in 97c35714ce3986b99848a780f6b195a63f8910b7.
To match the rest of the SWORD25 code base
---
 engines/sword25/util/lua_persist.cpp   |  98 +++++++++++++++----------------
 engines/sword25/util/lua_unpersist.cpp | 102 ++++++++++++++++-----------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
index aea4e70036..6038111bbc 100644
--- a/engines/sword25/util/lua_persist.cpp
+++ b/engines/sword25/util/lua_persist.cpp
@@ -66,17 +66,17 @@ struct SerializationInfo {
 	uint counter;
 };
 
-static void serialize(SerializationInfo *info);
+static void persist(SerializationInfo *info);
 
-static void serializeBoolean(SerializationInfo *info);
-static void serializeNumber(SerializationInfo *info);
-static void serializeString(SerializationInfo *info);
-static void serializeTable(SerializationInfo *info);
-static void serializeFunction(SerializationInfo *info);
-static void serializeThread(SerializationInfo *info);
-static void serializeProto(SerializationInfo *info);
-static void serializeUpValue(SerializationInfo *info);
-static void serializeUserData(SerializationInfo *info);
+static void persistBoolean(SerializationInfo *info);
+static void persistNumber(SerializationInfo *info);
+static void persistString(SerializationInfo *info);
+static void persistTable(SerializationInfo *info);
+static void persistFunction(SerializationInfo *info);
+static void persistThread(SerializationInfo *info);
+static void persistProto(SerializationInfo *info);
+static void persistUpValue(SerializationInfo *info);
+static void persistUserData(SerializationInfo *info);
 
 
 void persistLua(lua_State *luaState, Common::WriteStream *writeStream) {
@@ -127,14 +127,14 @@ void persistLua(lua_State *luaState, Common::WriteStream *writeStream) {
 	// >>>>> permTbl indexTbl rootObj
 
 	// Serialize the root recursively
-	serialize(&info);
+	persist(&info);
 
 	// Return the stack back to the original state
 	lua_remove(luaState, 2);
 	// >>>>> permTbl rootObj
 }
 
-static void serialize(SerializationInfo *info) {
+static void persist(SerializationInfo *info) {
 	// The stack can potentially have many things on it
 	// The object we want to serialize is the item on the top of the stack
 	// >>>>> permTbl indexTbl rootObj ...... obj
@@ -215,7 +215,7 @@ static void serialize(SerializationInfo *info) {
 		info->writeStream->writeSint32LE(PERMANENT_TYPE);
 
 		// Serialize the key
-		serialize(info);
+		persist(info);
 
 		// Pop the key off the stack
 		lua_pop(info->luaState, 1);
@@ -236,7 +236,7 @@ static void serialize(SerializationInfo *info) {
 
 	switch (objType) {
 	case LUA_TBOOLEAN:
-		serializeBoolean(info);
+		persistBoolean(info);
 		break;
 	case LUA_TLIGHTUSERDATA:
 		// You can't serialize a pointer
@@ -244,41 +244,41 @@ static void serialize(SerializationInfo *info) {
 		assert(0);
 		break;
 	case LUA_TNUMBER:
-		serializeNumber(info);
+		persistNumber(info);
 		break;
 	case LUA_TSTRING:
-		serializeString(info);
+		persistString(info);
 		break;
 	case LUA_TTABLE:
-		serializeTable(info);
+		persistTable(info);
 		break;
 	case LUA_TFUNCTION:
-		serializeFunction(info);
+		persistFunction(info);
 		break;
 	case LUA_TTHREAD:
-		serializeThread(info);
+		persistThread(info);
 		break;
 	case LUA_TPROTO:
-		serializeProto(info);
+		persistProto(info);
 		break;
 	case LUA_TUPVAL:
-		serializeUpValue(info);
+		persistUpValue(info);
 		break;
 	case LUA_TUSERDATA:
-		serializeUserData(info);
+		persistUserData(info);
 		break;
 	default:
 		assert(0);
 	}
 }
 
-static void serializeBoolean(SerializationInfo *info) {
+static void persistBoolean(SerializationInfo *info) {
 	int value = lua_toboolean(info->luaState, -1);
 
 	info->writeStream->writeSint32LE(value);
 }
 
-static void serializeNumber(SerializationInfo *info) {
+static void persistNumber(SerializationInfo *info) {
 	lua_Number value = lua_tonumber(info->luaState, -1);
 
 	#if 1
@@ -298,7 +298,7 @@ static void serializeNumber(SerializationInfo *info) {
 
 }
 
-static void serializeString(SerializationInfo *info) {
+static void persistString(SerializationInfo *info) {
 	// Hard cast to a uint32 to force size_t to an explicit size
 	// *Theoretically* this could truncate, but if we have a 4gb string, we have bigger problems
 	uint32 length = static_cast<uint32>(lua_strlen(info->luaState, -1));
@@ -395,7 +395,7 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 	info->writeStream->writeSint32LE(1);
 
 	// Serialize the function
-	serialize(info);
+	persist(info);
 
 	lua_pop(info->luaState, 2);
 	// >>>>> permTbl indexTbl ...... obj
@@ -403,7 +403,7 @@ static bool serializeSpecialObject(SerializationInfo *info, bool defaction) {
 	return true;
 }
 
-static void serializeTable(SerializationInfo *info) {
+static void persistTable(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... tbl
 
 	// Make sure there is enough room on the stack
@@ -422,7 +422,7 @@ static void serializeTable(SerializationInfo *info) {
 	}
 
 	// >>>>> permTbl indexTbl ...... tbl metaTbl/nil */
-	serialize(info);
+	persist(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... tbl
@@ -439,13 +439,13 @@ static void serializeTable(SerializationInfo *info) {
 		// >>>>> permTbl indexTbl ...... tbl k v k */
 
 		// Serialize the key
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... tbl k v */
 
 		// Serialize the value
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... tbl k */
@@ -457,13 +457,13 @@ static void serializeTable(SerializationInfo *info) {
 	lua_pushnil(info->luaState);
 	// >>>>> permTbl indexTbl ...... tbl
 
-	serialize(info);
+	persist(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... tbl
 }
 
-static void serializeFunction(SerializationInfo *info) {
+static void persistFunction(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... func
 	Closure *cl = clvalue(getObject(info->luaState, -1));
 	lua_checkstack(info->luaState, 2);
@@ -484,7 +484,7 @@ static void serializeFunction(SerializationInfo *info) {
 		pushProto(info->luaState, cl->l.p);
 		// >>>>> permTbl indexTbl ...... func proto */
 
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... func
@@ -495,7 +495,7 @@ static void serializeFunction(SerializationInfo *info) {
 			pushUpValue(info->luaState, cl->l.upvals[i]);
 			// >>>>> permTbl indexTbl ...... func upval
 
-			serialize(info);
+			persist(info);
 
 			lua_pop(info->luaState, 1);
 			// >>>>> permTbl indexTbl ...... func
@@ -519,14 +519,14 @@ static void serializeFunction(SerializationInfo *info) {
 		}
 
 		// >>>>> permTbl indexTbl ...... func fenv/nil
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... func
 	}
 }
 
-static void serializeThread(SerializationInfo *info) {
+static void persistThread(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... thread
 	lua_State *threadState = lua_tothread(info->luaState, -1);
 
@@ -547,7 +547,7 @@ static void serializeThread(SerializationInfo *info) {
 
 	// >>>>> permTbl indexTbl ...... thread (reversed contents of thread stack) */
 	for (; stackSize > 0; --stackSize) {
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 	}
@@ -609,7 +609,7 @@ static void serializeThread(SerializationInfo *info) {
 		pushUpValue(info->luaState, upVal);
 		// >>>>> permTbl indexTbl ...... thread upVal
 
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... thread
@@ -624,13 +624,13 @@ static void serializeThread(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... thread nil
 
 	// Use nil as a terminator
-	serialize(info);
+	persist(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... thread
 }
 
-static void serializeProto(SerializationInfo *info) {
+static void persistProto(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... proto
 	Proto *proto = gco2p(getObject(info->luaState, -1)->value.gc);
 
@@ -644,7 +644,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushObject(info->luaState, &proto->k[i]);
 		// >>>>> permTbl indexTbl ...... proto const
 
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -660,7 +660,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushProto(info->luaState, proto->p[i]);
 		// >>>>> permTbl indexTbl ...... proto subProto */
 
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -683,7 +683,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushString(info->luaState, proto->upvalues[i]);
 		// >>>>> permTbl indexTbl ...... proto str
 
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -697,7 +697,7 @@ static void serializeProto(SerializationInfo *info) {
 		pushString(info->luaState, proto->locvars[i].varname);
 		// >>>>> permTbl indexTbl ...... proto str
 
-		serialize(info);
+		persist(info);
 
 		lua_pop(info->luaState, 1);
 		// >>>>> permTbl indexTbl ...... proto
@@ -711,7 +711,7 @@ static void serializeProto(SerializationInfo *info) {
 	pushString(info->luaState, proto->source);
 	// >>>>> permTbl indexTbl ...... proto sourceStr
 
-	serialize(info);
+	persist(info);
 
 	lua_pop(info->luaState, 1);
 	// >>>>> permTbl indexTbl ...... proto
@@ -757,7 +757,7 @@ static void serializeProto(SerializationInfo *info) {
  * (d) When unserializing, "reopen" each of these upvalues as the thread is
  *     unserialized
  */
-static void serializeUpValue(SerializationInfo *info) {
+static void persistUpValue(SerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... upval
 	assert(ttype(getObject(info->luaState, -1)) == LUA_TUPVAL);
 	UpVal *upValue = gco2uv(getObject(info->luaState, -1)->value.gc);
@@ -774,11 +774,11 @@ static void serializeUpValue(SerializationInfo *info) {
 	pushObject(info->luaState, upValue->v);
 	// >>>>> permTbl indexTbl ...... obj
 
-	serialize(info);
+	persist(info);
 	// >>>>> permTbl indexTbl ...... obj
 }
 
-static void serializeUserData(SerializationInfo *info) {
+static void persistUserData(SerializationInfo *info) {
 	// >>>>> permTbl rootObj ...... udata
 
 	// Make sure there is enough room on the stack
@@ -804,7 +804,7 @@ static void serializeUserData(SerializationInfo *info) {
 	}
 
 	// >>>>> permTbl rootObj ...... udata metaTbl/nil
-	serialize(info);
+	persist(info);
 
 	lua_pop(info->luaState, 1);
 	/* perms reftbl ... udata */
diff --git a/engines/sword25/util/lua_unpersist.cpp b/engines/sword25/util/lua_unpersist.cpp
index 6f3275741a..ef0ef31041 100644
--- a/engines/sword25/util/lua_unpersist.cpp
+++ b/engines/sword25/util/lua_unpersist.cpp
@@ -64,18 +64,18 @@ struct UnSerializationInfo {
 	Common::ReadStream *readStream;
 };
 
-static void unserialize(UnSerializationInfo *info);
+static void unpersist(UnSerializationInfo *info);
 
-static void unserializeBoolean(UnSerializationInfo *info);
-static void unserializeNumber(UnSerializationInfo *info);
-static void unserializeString(UnSerializationInfo *info);
-static void unserializeTable(UnSerializationInfo *info, int index);
-static void unserializeFunction(UnSerializationInfo *info, int index);
-static void unserializeThread(UnSerializationInfo *info, int index);
-static void unserializeProto(UnSerializationInfo *info, int index);
-static void unserializeUpValue(UnSerializationInfo *info, int index);
-static void unserializeUserData(UnSerializationInfo *info, int index);
-static void unserializePermanent(UnSerializationInfo *info, int index);
+static void unpersistBoolean(UnSerializationInfo *info);
+static void unpersistNumber(UnSerializationInfo *info);
+static void unpersistString(UnSerializationInfo *info);
+static void unpersistTable(UnSerializationInfo *info, int index);
+static void unpersistFunction(UnSerializationInfo *info, int index);
+static void unpersistThread(UnSerializationInfo *info, int index);
+static void unpersistProto(UnSerializationInfo *info, int index);
+static void unpersistUpValue(UnSerializationInfo *info, int index);
+static void unpersistUserData(UnSerializationInfo *info, int index);
+static void unpersistPermanent(UnSerializationInfo *info, int index);
 
 
 void unpersistLua(lua_State *luaState, Common::ReadStream *readStream) {
@@ -98,7 +98,7 @@ void unpersistLua(lua_State *luaState, Common::ReadStream *readStream) {
 	lua_gc(luaState, LUA_GCSTOP, 0);
 
 	// Unserialize the root object
-	unserialize(&info);
+	unpersist(&info);
 	// >>>>> permTbl indexTbl rootObj
 
 	// Re-start garbage collection
@@ -129,7 +129,7 @@ static void registerObjectInIndexTable(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... obj
 }
 
-static void unserialize(UnSerializationInfo *info) {
+static void unpersist(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -142,7 +142,7 @@ static void unserialize(UnSerializationInfo *info) {
 
 		switch (type) {
 		case LUA_TBOOLEAN:
-			unserializeBoolean(info);
+			unpersistBoolean(info);
 			break;
 		case LUA_TLIGHTUSERDATA:
 			// You can't serialize a pointer
@@ -150,31 +150,31 @@ static void unserialize(UnSerializationInfo *info) {
 			assert(0);
 			break;
 		case LUA_TNUMBER:
-			unserializeNumber(info);
+			unpersistNumber(info);
 			break;
 		case LUA_TSTRING:
-			unserializeString(info);
+			unpersistString(info);
 			break;
 		case LUA_TTABLE:
-			unserializeTable(info, index);
+			unpersistTable(info, index);
 			break;
 		case LUA_TFUNCTION:
-			unserializeFunction(info, index);
+			unpersistFunction(info, index);
 			break;
 		case LUA_TTHREAD:
-			unserializeThread(info, index);
+			unpersistThread(info, index);
 			break;
 		case LUA_TPROTO:
-			unserializeProto(info, index);
+			unpersistProto(info, index);
 			break;
 		case LUA_TUPVAL:
-			unserializeUpValue(info, index);
+			unpersistUpValue(info, index);
 			break;
 		case LUA_TUSERDATA:
-			unserializeUserData(info, index);
+			unpersistUserData(info, index);
 			break;
 		case PERMANENT_TYPE:
-			unserializePermanent(info, index);
+			unpersistPermanent(info, index);
 			break;
 		default:
 			assert(0);
@@ -212,7 +212,7 @@ static void unserialize(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... obj/nil
 }
 
-static void unserializeBoolean(UnSerializationInfo *info) {
+static void unpersistBoolean(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -224,7 +224,7 @@ static void unserializeBoolean(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... bool
 }
 
-static void unserializeNumber(UnSerializationInfo *info) {
+static void unpersistNumber(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -242,7 +242,7 @@ static void unserializeNumber(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ...... num
 }
 
-static void unserializeString(UnSerializationInfo *info) {
+static void unpersistString(UnSerializationInfo *info) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -265,7 +265,7 @@ static void unserializeSpecialTable(UnSerializationInfo *info, int index) {
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 1);
 
-	unserialize(info);
+	unpersist(info);
 
 	// >>>>> permTbl indexTbl ...... spfunc
 	lua_call(info->luaState, 0, 1);
@@ -286,7 +286,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... tbl
 
 	// Unserialize metatable
-	unserialize(info);
+	unpersist(info);
 	// >>>>> permTbl indexTbl ...... tbl ?metaTbl/nil?
 
 	if (lua_istable(info->luaState, -1)) {
@@ -303,7 +303,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 
 	while (1) {
 		// >>>>> permTbl indexTbl ...... tbl
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... tbl key/nil
 
 		// The table serialization is nil terminated
@@ -316,7 +316,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 		}
 
 		// >>>>> permTbl indexTbl ...... tbl key
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... tbl value
 
 		lua_rawset(info->luaState, -3);
@@ -324,7 +324,7 @@ static void unserializeLiteralTable(UnSerializationInfo *info, int index) {
 	}
 }
 
-void unserializeTable(UnSerializationInfo *info, int index) {
+void unpersistTable(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -341,7 +341,7 @@ void unserializeTable(UnSerializationInfo *info, int index) {
 	}
 }
 
-void unserializeFunction(UnSerializationInfo *info, int index) {
+void unpersistFunction(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -372,7 +372,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	registerObjectInIndexTable(info, index);
 
 	// Now that it's safe, we can get the real proto
-	unserialize(info);
+	unpersist(info);
 	// >>>>> permTbl indexTbl ...... func proto
 
 	lclosure->p = gco2p(getObject(info->luaState, -1)->value.gc);
@@ -382,7 +382,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 
 	for (byte i = 0; i < numUpValues; ++i) {
 		// >>>>> permTbl indexTbl ...... func
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... func func2
 
 		unboxUpValue(info->luaState);
@@ -394,7 +394,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	}
 
 	// Finally, the fenv
-	unserialize(info);
+	unpersist(info);
 
 	// >>>>> permTbl indexTbl ...... func ?fenv/nil?
 	if (!lua_isnil(info->luaState, -1)) {
@@ -410,7 +410,7 @@ void unserializeFunction(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... func
 }
 
-void unserializeThread(UnSerializationInfo *info, int index) {
+void unpersistThread(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
 	lua_State *L2;
@@ -432,7 +432,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	// very bottom of the stack
 	L2->top--;
 	for (uint32 i = 0; i < stackSize; ++i) {
-		unserialize(info);
+		unpersist(info);
 		// L1: permTbl indexTbl ...... thread obj*
 	}
 
@@ -492,7 +492,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	global_State *g = G(L2);
 
 	while (true) {
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... thread upVal/nil
 
 		// The list is terminated by a nil
@@ -535,7 +535,7 @@ void unserializeThread(UnSerializationInfo *info, int index) {
 	}
 }
 
-void unserializeProto(UnSerializationInfo *info, int index) {
+void unpersistProto(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
 	// We have to be careful. The GC expects a lot out of protos. In particular, we need
@@ -564,7 +564,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	lua_reallocvector(info->luaState, p->k, 0, sizek, TValue);
 	for (int i = 0; i < sizek; ++i) {
 		// >>>>> permTbl indexTbl ...... proto
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... proto  k
 
 		setobj2s(info->luaState, &p->k[i], getObject(info->luaState, -1));
@@ -581,7 +581,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	lua_reallocvector(info->luaState, p->p, 0, sizep, Proto *);
 	for (int i = 0; i < sizep; ++i) {
 		// >>>>> permTbl indexTbl ...... proto
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... proto  subproto
 
 		p->p[i] = (Proto *)getObject(info->luaState, -1)->value.gc;
@@ -605,7 +605,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 		lua_reallocvector(info->luaState, p->upvalues, 0, p->sizeupvalues, TString *);
 		for (int i = 0; i < p->sizeupvalues; ++i) {
 			// >>>>> permTbl indexTbl ...... proto
-			unserialize(info);
+			unpersist(info);
 			// >>>>> permTbl indexTbl ...... proto str
 
 			p->upvalues[i] = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
@@ -621,7 +621,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 		lua_reallocvector(info->luaState, p->locvars, 0, p->sizelocvars, LocVar);
 		for (int i = 0; i < p->sizelocvars; ++i) {
 			// >>>>> permTbl indexTbl ...... proto
-			unserialize(info);
+			unpersist(info);
 			// >>>>> permTbl indexTbl ...... proto str
 
 			p->locvars[i].varname = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
@@ -635,7 +635,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... proto
 
 	// Read in source string
-	unserialize(info);
+	unpersist(info);
 	// >>>>> permTbl indexTbl ...... proto sourceStr
 
 	p->source = lua_newlstr(info->luaState, lua_tostring(info->luaState, -1), strlen(lua_tostring(info->luaState, -1)));
@@ -661,7 +661,7 @@ void unserializeProto(UnSerializationInfo *info, int index) {
 	p->maxstacksize = info->readStream->readByte();
 }
 
-void unserializeUpValue(UnSerializationInfo *info, int index) {
+void unpersistUpValue(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 	lua_checkstack(info->luaState, 2);
 
@@ -669,14 +669,14 @@ void unserializeUpValue(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... func
 	registerObjectInIndexTable(info, index);
 
-	unserialize(info);
+	unpersist(info);
 	// >>>>> permTbl indexTbl ...... func obj
 
 	boxUpValue_finish(info->luaState);
 	// >>>>> permTbl indexTbl ...... func
 }
 
-void unserializeUserData(UnSerializationInfo *info, int index) {
+void unpersistUserData(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
@@ -684,7 +684,7 @@ void unserializeUserData(UnSerializationInfo *info, int index) {
 
 	int isspecial = info->readStream->readSint32LE();
 	if (isspecial) {
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... specialFunc
 
 		lua_call(info->luaState, 0, 1);
@@ -697,7 +697,7 @@ void unserializeUserData(UnSerializationInfo *info, int index) {
 
 		info->readStream->read(lua_touserdata(info->luaState, -1), length);
 
-		unserialize(info);
+		unpersist(info);
 		// >>>>> permTbl indexTbl ...... udata metaTable/nil
 
 		lua_setmetatable(info->luaState, -2);
@@ -706,13 +706,13 @@ void unserializeUserData(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ...... udata
 }
 
-void unserializePermanent(UnSerializationInfo *info, int index) {
+void unpersistPermanent(UnSerializationInfo *info, int index) {
 	// >>>>> permTbl indexTbl ......
 
 	// Make sure there is enough room on the stack
 	lua_checkstack(info->luaState, 2);
 
-	unserialize(info);
+	unpersist(info);
 	// >>>>> permTbl indexTbl ...... permKey
 
 	lua_gettable(info->luaState, 1);
-- 
cgit v1.2.3


From e4f74b6c346023608841d9f871b16069e5b54194 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 30 Dec 2014 18:28:14 -0600
Subject: SWORD25: Remove the option to persist a double as a string

Since the current method *should* be more accurate
---
 engines/sword25/util/lua_persist.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
index 6038111bbc..6fe88fe9a3 100644
--- a/engines/sword25/util/lua_persist.cpp
+++ b/engines/sword25/util/lua_persist.cpp
@@ -281,21 +281,11 @@ static void persistBoolean(SerializationInfo *info) {
 static void persistNumber(SerializationInfo *info) {
 	lua_Number value = lua_tonumber(info->luaState, -1);
 
-	#if 1
-		Util::SerializedDouble serializedValue(Util::encodeDouble(value));
-
-		info->writeStream->writeUint32LE(serializedValue.significandOne);
-		info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
-		info->writeStream->writeSint16LE(serializedValue.exponent);
-	#else
-		// NOTE: We need to store a double. Unfortunately, we have to accommodate endianness.
-		// Also, I don't know if we can assume all compilers use IEEE double
-		// Therefore, I have chosen to store the double as a string.
-		Common::String buffer = Common::String::format("%f", value);
-
-		info->writeStream->write(buffer.c_str(), buffer.size());
-	#endif
+	Util::SerializedDouble serializedValue(Util::encodeDouble(value));
 
+	info->writeStream->writeUint32LE(serializedValue.significandOne);
+	info->writeStream->writeUint32LE(serializedValue.signAndSignificandTwo);
+	info->writeStream->writeSint16LE(serializedValue.exponent);
 }
 
 static void persistString(SerializationInfo *info) {
-- 
cgit v1.2.3


From 0c54278f6c2ea6d2a2ba10ed1e833695620625ca Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 2 Jan 2015 00:28:20 +0200
Subject: ZVISION: Fix newline in truetype_font.cpp

---
 engines/zvision/text/truetype_font.cpp | 454 ++++++++++++++++-----------------
 1 file changed, 227 insertions(+), 227 deletions(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 85d9fa5a29..e378ccd127 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -1,228 +1,228 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/system.h"
-#include "common/unzip.h"
-#include "graphics/font.h"
-#include "graphics/fonts/ttf.h"
-#include "graphics/surface.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/text/truetype_font.h"
-
-namespace ZVision {
-
-StyledTTFont::StyledTTFont(ZVision *engine) {
-	_engine = engine;
-	_style = 0;
-	_font = NULL;
-	_lineHeight = 0;
-}
-
-StyledTTFont::~StyledTTFont() {
-	if (_font)
-		delete _font;
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
-	_style = style;
-	return loadFont(fontName, point);
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
-	struct FontStyle {
-		const char *zorkFont;
-		const char *fontBase;
-		const char *freeFontBase;
-		const char *freeFontItalicName;
-	};
-
-	const FontStyle systemFonts[] = {
-		{ "*times new roman*",    "times",   "FreeSerif", "Italic"  },
-		{ "*times*",              "times",   "FreeSerif", "Italic"  },
-		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
-		{ "*garamond*",           "gara",    "FreeSerif", "Italic"  },
-		{ "*courier new*",        "cour",    "FreeMono",  "Oblique" },
-		{ "*courier*",            "cour",    "FreeMono",  "Oblique" },
-		{ "*ZorkDeath*",          "cour",    "FreeMono",  "Oblique" },
-		{ "*arial*",              "arial",   "FreeSans",  "Oblique" },
-		{ "*ZorkNormal*",         "arial",   "FreeSans",  "Oblique" },
-	};
-
-	Common::String newFontName;
-	Common::String freeFontName;
-
-	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
-		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
-			newFontName = systemFonts[i].fontBase;
-			freeFontName = systemFonts[i].freeFontBase;
-
-			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
-				newFontName += "bi";
-				freeFontName += "Bold";
-				freeFontName += systemFonts[i].freeFontItalicName;
-			} else if (_style & STTF_BOLD) {
-				newFontName += "bd";
-				freeFontName += "Bold";
-			} else if (_style & STTF_ITALIC) {
-				newFontName += "i";
-				freeFontName += systemFonts[i].freeFontItalicName;
-			}
-
-			newFontName += ".ttf";
-			freeFontName += ".ttf";
-			break;
-		}
-	}
-
-	if (newFontName.empty()) {
-		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
-		newFontName = "arial.ttf";
-		freeFontName = "FreeSans.ttf";
-	}
-
-	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
-
-	Common::File file;
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/file.h"
+#include "common/system.h"
+#include "common/unzip.h"
+#include "graphics/font.h"
+#include "graphics/fonts/ttf.h"
+#include "graphics/surface.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/text/truetype_font.h"
+
+namespace ZVision {
+
+StyledTTFont::StyledTTFont(ZVision *engine) {
+	_engine = engine;
+	_style = 0;
+	_font = NULL;
+	_lineHeight = 0;
+}
+
+StyledTTFont::~StyledTTFont() {
+	if (_font)
+		delete _font;
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
+	_style = style;
+	return loadFont(fontName, point);
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
+	struct FontStyle {
+		const char *zorkFont;
+		const char *fontBase;
+		const char *freeFontBase;
+		const char *freeFontItalicName;
+	};
+
+	const FontStyle systemFonts[] = {
+		{ "*times new roman*",    "times",   "FreeSerif", "Italic"  },
+		{ "*times*",              "times",   "FreeSerif", "Italic"  },
+		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
+		{ "*garamond*",           "gara",    "FreeSerif", "Italic"  },
+		{ "*courier new*",        "cour",    "FreeMono",  "Oblique" },
+		{ "*courier*",            "cour",    "FreeMono",  "Oblique" },
+		{ "*ZorkDeath*",          "cour",    "FreeMono",  "Oblique" },
+		{ "*arial*",              "arial",   "FreeSans",  "Oblique" },
+		{ "*ZorkNormal*",         "arial",   "FreeSans",  "Oblique" },
+	};
+
+	Common::String newFontName;
+	Common::String freeFontName;
+
+	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
+		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
+			newFontName = systemFonts[i].fontBase;
+			freeFontName = systemFonts[i].freeFontBase;
+
+			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
+				newFontName += "bi";
+				freeFontName += "Bold";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			} else if (_style & STTF_BOLD) {
+				newFontName += "bd";
+				freeFontName += "Bold";
+			} else if (_style & STTF_ITALIC) {
+				newFontName += "i";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			}
+
+			newFontName += ".ttf";
+			freeFontName += ".ttf";
+			break;
+		}
+	}
+
+	if (newFontName.empty()) {
+		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
+		newFontName = "arial.ttf";
+		freeFontName = "FreeSans.ttf";
+	}
+
+	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
+
+	Common::File file;
 	if (!file.open(newFontName) && !file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, newFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
-		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
-
-	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-	if (_newFont) {
-		if (!_font)
-			delete _font;
-		_font = _newFont;
-	}
-
-	_fntName = fontName;
-	_lineHeight = point;
-
-	if (_font)
-		return true;
-	return false;
-}
-
-void StyledTTFont::setStyle(uint newStyle) {
-	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
-		_style = newStyle;
-		loadFont(_fntName, _lineHeight);
-	} else {
-		_style = newStyle;
-	}
-}
-
-int StyledTTFont::getFontHeight() {
-	if (_font)
-		return _font->getFontHeight();
-	return 0;
-}
-
-int StyledTTFont::getMaxCharWidth() {
-	if (_font)
-		return _font->getMaxCharWidth();
-	return 0;
-}
-
-int StyledTTFont::getCharWidth(byte chr) {
-	if (_font)
-		return _font->getCharWidth(chr);
-	return 0;
-}
-
-int StyledTTFont::getKerningOffset(byte left, byte right) {
-	if (_font)
-		return _font->getKerningOffset(left, right);
-	return 0;
-}
-
-void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
-	if (_font) {
-		_font->drawChar(dst, chr, x, y, color);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-	}
-}
-
-void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
-	if (_font) {
-		_font->drawString(dst, str, x, y, w, color, align);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-	}
-}
-
-int StyledTTFont::getStringWidth(const Common::String &str) {
-	if (_font)
-		return _font->getStringWidth(str);
-	return 0;
-}
-
-Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
-	Graphics::Surface *tmp = new Graphics::Surface;
-	if (_font) {
-		int16 w = _font->getStringWidth(str);
-		if (w && w < 1024) {
-			tmp->create(w, _font->getFontHeight(), _engine->_resourcePixelFormat);
-			drawString(tmp, str, 0, 0, w, color);
-		}
-	}
-	return tmp;
-}
-
-} // End of namespace ZVision
+		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
+
+	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+	if (_newFont) {
+		if (!_font)
+			delete _font;
+		_font = _newFont;
+	}
+
+	_fntName = fontName;
+	_lineHeight = point;
+
+	if (_font)
+		return true;
+	return false;
+}
+
+void StyledTTFont::setStyle(uint newStyle) {
+	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
+		_style = newStyle;
+		loadFont(_fntName, _lineHeight);
+	} else {
+		_style = newStyle;
+	}
+}
+
+int StyledTTFont::getFontHeight() {
+	if (_font)
+		return _font->getFontHeight();
+	return 0;
+}
+
+int StyledTTFont::getMaxCharWidth() {
+	if (_font)
+		return _font->getMaxCharWidth();
+	return 0;
+}
+
+int StyledTTFont::getCharWidth(byte chr) {
+	if (_font)
+		return _font->getCharWidth(chr);
+	return 0;
+}
+
+int StyledTTFont::getKerningOffset(byte left, byte right) {
+	if (_font)
+		return _font->getKerningOffset(left, right);
+	return 0;
+}
+
+void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
+	if (_font) {
+		_font->drawChar(dst, chr, x, y, color);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+	}
+}
+
+void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
+	if (_font) {
+		_font->drawString(dst, str, x, y, w, color, align);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+	}
+}
+
+int StyledTTFont::getStringWidth(const Common::String &str) {
+	if (_font)
+		return _font->getStringWidth(str);
+	return 0;
+}
+
+Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	if (_font) {
+		int16 w = _font->getStringWidth(str);
+		if (w && w < 1024) {
+			tmp->create(w, _font->getFontHeight(), _engine->_resourcePixelFormat);
+			drawString(tmp, str, 0, 0, w, color);
+		}
+	}
+	return tmp;
+}
+
+} // End of namespace ZVision
-- 
cgit v1.2.3


From 976b4adb4e114c19e47efb3b18a52b1c1c1f44c4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 2 Jan 2015 00:31:19 +0200
Subject: ZVISION: Add support for unmodified INQUIS.ZIX files

This will greatly help users copy the unmodified file from the game
CDs of ZGI and get the game working straight away
---
 engines/zvision/file/search_manager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 7a907df39c..ec250ff648 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -169,8 +169,13 @@ void SearchManager::loadZix(const Common::String &name) {
 		line.trim();
 		if (line.matchString("----------*", true))
 			break;
-		else if (line.matchString("DIR:*", true)) {
+		else if (line.matchString("DIR:*", true) || line.matchString("CD0:*", true) || line.matchString("CD1:*", true)) {
 			Common::String path(line.c_str() + 5);
+			// Check if INQUIS.ZIX refers to the ZGI folder, and check the game
+			// root folder instead
+			if (path.hasPrefix("zgi\\"))
+				path = Common::String(path.c_str() + 4);
+
 			Common::Archive *arc;
 			char tempPath[128];
 			strcpy(tempPath, path.c_str());
-- 
cgit v1.2.3


From 34ec4ed6b51b81afa012543040951091ee1208ee Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 1 Jan 2015 17:36:12 -0500
Subject: ZVISION: Really fix truetype_font.cpp newlines

They are now all LF.
---
 engines/zvision/text/truetype_font.cpp | 456 ++++++++++++++++-----------------
 1 file changed, 228 insertions(+), 228 deletions(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index e378ccd127..622a02a6a8 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -1,228 +1,228 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/system.h"
-#include "common/unzip.h"
-#include "graphics/font.h"
-#include "graphics/fonts/ttf.h"
-#include "graphics/surface.h"
-
-#include "zvision/zvision.h"
-#include "zvision/graphics/render_manager.h"
-#include "zvision/text/truetype_font.h"
-
-namespace ZVision {
-
-StyledTTFont::StyledTTFont(ZVision *engine) {
-	_engine = engine;
-	_style = 0;
-	_font = NULL;
-	_lineHeight = 0;
-}
-
-StyledTTFont::~StyledTTFont() {
-	if (_font)
-		delete _font;
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
-	_style = style;
-	return loadFont(fontName, point);
-}
-
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
-	struct FontStyle {
-		const char *zorkFont;
-		const char *fontBase;
-		const char *freeFontBase;
-		const char *freeFontItalicName;
-	};
-
-	const FontStyle systemFonts[] = {
-		{ "*times new roman*",    "times",   "FreeSerif", "Italic"  },
-		{ "*times*",              "times",   "FreeSerif", "Italic"  },
-		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
-		{ "*garamond*",           "gara",    "FreeSerif", "Italic"  },
-		{ "*courier new*",        "cour",    "FreeMono",  "Oblique" },
-		{ "*courier*",            "cour",    "FreeMono",  "Oblique" },
-		{ "*ZorkDeath*",          "cour",    "FreeMono",  "Oblique" },
-		{ "*arial*",              "arial",   "FreeSans",  "Oblique" },
-		{ "*ZorkNormal*",         "arial",   "FreeSans",  "Oblique" },
-	};
-
-	Common::String newFontName;
-	Common::String freeFontName;
-
-	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
-		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
-			newFontName = systemFonts[i].fontBase;
-			freeFontName = systemFonts[i].freeFontBase;
-
-			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
-				newFontName += "bi";
-				freeFontName += "Bold";
-				freeFontName += systemFonts[i].freeFontItalicName;
-			} else if (_style & STTF_BOLD) {
-				newFontName += "bd";
-				freeFontName += "Bold";
-			} else if (_style & STTF_ITALIC) {
-				newFontName += "i";
-				freeFontName += systemFonts[i].freeFontItalicName;
-			}
-
-			newFontName += ".ttf";
-			freeFontName += ".ttf";
-			break;
-		}
-	}
-
-	if (newFontName.empty()) {
-		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
-		newFontName = "arial.ttf";
-		freeFontName = "FreeSans.ttf";
-	}
-
-	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
-
-	Common::File file;
-	if (!file.open(newFontName) && !file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, newFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
-		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
-
-	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-	if (_newFont) {
-		if (!_font)
-			delete _font;
-		_font = _newFont;
-	}
-
-	_fntName = fontName;
-	_lineHeight = point;
-
-	if (_font)
-		return true;
-	return false;
-}
-
-void StyledTTFont::setStyle(uint newStyle) {
-	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
-		_style = newStyle;
-		loadFont(_fntName, _lineHeight);
-	} else {
-		_style = newStyle;
-	}
-}
-
-int StyledTTFont::getFontHeight() {
-	if (_font)
-		return _font->getFontHeight();
-	return 0;
-}
-
-int StyledTTFont::getMaxCharWidth() {
-	if (_font)
-		return _font->getMaxCharWidth();
-	return 0;
-}
-
-int StyledTTFont::getCharWidth(byte chr) {
-	if (_font)
-		return _font->getCharWidth(chr);
-	return 0;
-}
-
-int StyledTTFont::getKerningOffset(byte left, byte right) {
-	if (_font)
-		return _font->getKerningOffset(left, right);
-	return 0;
-}
-
-void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
-	if (_font) {
-		_font->drawChar(dst, chr, x, y, color);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
-		}
-	}
-}
-
-void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
-	if (_font) {
-		_font->drawString(dst, str, x, y, w, color, align);
-		if (_style & STTF_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-		if (_style & STTF_STRIKEOUT) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int16 wd = MIN(_font->getStringWidth(str), w);
-			int16 stX = x;
-			if (align == Graphics::kTextAlignCenter)
-				stX += (w - wd) / 2;
-			else if (align == Graphics::kTextAlignRight)
-				stX += (w - wd);
-
-			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
-
-			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
-		}
-	}
-}
-
-int StyledTTFont::getStringWidth(const Common::String &str) {
-	if (_font)
-		return _font->getStringWidth(str);
-	return 0;
-}
-
-Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
-	Graphics::Surface *tmp = new Graphics::Surface;
-	if (_font) {
-		int16 w = _font->getStringWidth(str);
-		if (w && w < 1024) {
-			tmp->create(w, _font->getFontHeight(), _engine->_resourcePixelFormat);
-			drawString(tmp, str, 0, 0, w, color);
-		}
-	}
-	return tmp;
-}
-
-} // End of namespace ZVision
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/file.h"
+#include "common/system.h"
+#include "common/unzip.h"
+#include "graphics/font.h"
+#include "graphics/fonts/ttf.h"
+#include "graphics/surface.h"
+
+#include "zvision/zvision.h"
+#include "zvision/graphics/render_manager.h"
+#include "zvision/text/truetype_font.h"
+
+namespace ZVision {
+
+StyledTTFont::StyledTTFont(ZVision *engine) {
+	_engine = engine;
+	_style = 0;
+	_font = NULL;
+	_lineHeight = 0;
+}
+
+StyledTTFont::~StyledTTFont() {
+	if (_font)
+		delete _font;
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
+	_style = style;
+	return loadFont(fontName, point);
+}
+
+bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
+	struct FontStyle {
+		const char *zorkFont;
+		const char *fontBase;
+		const char *freeFontBase;
+		const char *freeFontItalicName;
+	};
+
+	const FontStyle systemFonts[] = {
+		{ "*times new roman*",	  "times",   "FreeSerif", "Italic"  },
+		{ "*times*",		  "times",   "FreeSerif", "Italic"  },
+		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
+		{ "*garamond*", 	  "gara",    "FreeSerif", "Italic"  },
+		{ "*courier new*",	  "cour",    "FreeMono",  "Oblique" },
+		{ "*courier*",		  "cour",    "FreeMono",  "Oblique" },
+		{ "*ZorkDeath*",	  "cour",    "FreeMono",  "Oblique" },
+		{ "*arial*",		  "arial",   "FreeSans",  "Oblique" },
+		{ "*ZorkNormal*",	  "arial",   "FreeSans",  "Oblique" },
+	};
+
+	Common::String newFontName;
+	Common::String freeFontName;
+
+	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
+		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
+			newFontName = systemFonts[i].fontBase;
+			freeFontName = systemFonts[i].freeFontBase;
+
+			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
+				newFontName += "bi";
+				freeFontName += "Bold";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			} else if (_style & STTF_BOLD) {
+				newFontName += "bd";
+				freeFontName += "Bold";
+			} else if (_style & STTF_ITALIC) {
+				newFontName += "i";
+				freeFontName += systemFonts[i].freeFontItalicName;
+			}
+
+			newFontName += ".ttf";
+			freeFontName += ".ttf";
+			break;
+		}
+	}
+
+	if (newFontName.empty()) {
+		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
+		newFontName = "arial.ttf";
+		freeFontName = "FreeSans.ttf";
+	}
+
+	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
+
+	Common::File file;
+	if (!file.open(newFontName) && !file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, newFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
+		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
+
+	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+	if (_newFont) {
+		if (!_font)
+			delete _font;
+		_font = _newFont;
+	}
+
+	_fntName = fontName;
+	_lineHeight = point;
+
+	if (_font)
+		return true;
+	return false;
+}
+
+void StyledTTFont::setStyle(uint newStyle) {
+	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
+		_style = newStyle;
+		loadFont(_fntName, _lineHeight);
+	} else {
+		_style = newStyle;
+	}
+}
+
+int StyledTTFont::getFontHeight() {
+	if (_font)
+		return _font->getFontHeight();
+	return 0;
+}
+
+int StyledTTFont::getMaxCharWidth() {
+	if (_font)
+		return _font->getMaxCharWidth();
+	return 0;
+}
+
+int StyledTTFont::getCharWidth(byte chr) {
+	if (_font)
+		return _font->getCharWidth(chr);
+	return 0;
+}
+
+int StyledTTFont::getKerningOffset(byte left, byte right) {
+	if (_font)
+		return _font->getKerningOffset(left, right);
+	return 0;
+}
+
+void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
+	if (_font) {
+		_font->drawChar(dst, chr, x, y, color);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
+		}
+	}
+}
+
+void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
+	if (_font) {
+		_font->drawString(dst, str, x, y, w, color, align);
+		if (_style & STTF_UNDERLINE) {
+			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+		if (_style & STTF_STRIKEOUT) {
+			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 stX = x;
+			if (align == Graphics::kTextAlignCenter)
+				stX += (w - wd) / 2;
+			else if (align == Graphics::kTextAlignRight)
+				stX += (w - wd);
+
+			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
+
+			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
+		}
+	}
+}
+
+int StyledTTFont::getStringWidth(const Common::String &str) {
+	if (_font)
+		return _font->getStringWidth(str);
+	return 0;
+}
+
+Graphics::Surface *StyledTTFont::renderSolidText(const Common::String &str, uint32 color) {
+	Graphics::Surface *tmp = new Graphics::Surface;
+	if (_font) {
+		int16 w = _font->getStringWidth(str);
+		if (w && w < 1024) {
+			tmp->create(w, _font->getFontHeight(), _engine->_resourcePixelFormat);
+			drawString(tmp, str, 0, 0, w, color);
+		}
+	}
+	return tmp;
+}
+
+} // End of namespace ZVision
-- 
cgit v1.2.3


From f4a99656ceab94cfc1c75d34180a5a49dfd43c0f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 2 Jan 2015 01:38:49 +0100
Subject: FULLPIPE: Fix bug with spring in scene04

---
 engines/fullpipe/scenes/scene04.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index fd1ececdf2..6b3ddf9640 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -949,7 +949,7 @@ void sceneHandler04_springWobble() {
 	if (g_vars->scene04_bottleWeight < newdelta)
 		g_vars->scene04_springOffset--;
 
-	if ((oldDynIndex > g_vars->scene04_bottleWeight && newdelta > g_vars->scene04_bottleWeight) || newdelta <= g_vars->scene04_bottleWeight) {
+	if ((oldDynIndex <= g_vars->scene04_bottleWeight && newdelta > g_vars->scene04_bottleWeight) || newdelta <= g_vars->scene04_bottleWeight) {
 		g_vars->scene04_springDelay++;
 
 		if (g_vars->scene04_springOffset && g_vars->scene04_springDelay > 1) {
-- 
cgit v1.2.3


From 76b71cabb9946b443afc803d04b1ca9e71cf5143 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 2 Jan 2015 13:10:04 +0100
Subject: FULLPIPE: Fix bug with unmovable jar in scene04

---
 engines/fullpipe/scenes/scene04.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 6b3ddf9640..4a87ae5b87 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -960,6 +960,8 @@ void sceneHandler04_springWobble() {
 
 	Common::Point point;
 
+	int oldpos = g_vars->scene04_spring->getCurrDimensions(point)->y - oldDynIndex;
+
 	if (g_vars->scene04_dynamicPhaseIndex) {
 		if (!g_vars->scene04_spring->_movement)
 			g_vars->scene04_spring->startAnim(MV_SPR_LOWER, 0, -1);
@@ -969,8 +971,9 @@ void sceneHandler04_springWobble() {
 		g_vars->scene04_spring->changeStatics2(ST_SPR_UP);
 	}
 
-	if (g_vars->scene04_dynamicPhaseIndex != oldDynIndex)
-		sceneHandler04_bottleUpdateObjects(oldDynIndex - g_vars->scene04_dynamicPhaseIndex);
+	if (g_vars->scene04_dynamicPhaseIndex != oldDynIndex) {
+		sceneHandler04_bottleUpdateObjects(oldpos - (g_vars->scene04_spring->getCurrDimensions(point)->y - g_vars->scene04_dynamicPhaseIndex));
+	}
 }
 
 void sceneHandler04_leaveScene() {
-- 
cgit v1.2.3


From c3def28b9964066165b8627d0129578504734ab2 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 3 Jan 2015 20:17:47 +0100
Subject: FULLPIPE: Fix crash in scene04

---
 engines/fullpipe/mgm.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/fullpipe/mgm.cpp b/engines/fullpipe/mgm.cpp
index aacfd5452a..1c8ca2a7b1 100644
--- a/engines/fullpipe/mgm.cpp
+++ b/engines/fullpipe/mgm.cpp
@@ -155,13 +155,14 @@ void MGM::rebuildTables(int objId) {
 	if (!obj)
 		return;
 
-	for (uint i = 0; i < obj->_staticsList.size(); i++)
+	for (uint i = 0; i < obj->_staticsList.size(); i++) {
 		_items[idx]->statics.push_back((Statics *)obj->_staticsList[i]);
 
+		_items[idx]->subItems.push_back(new MGMSubItem);
+	}
+
 	for (uint i = 0; i < obj->_movements.size(); i++)
 		_items[idx]->movements1.push_back((Movement *)obj->_movements[i]);
-
-	_items[idx]->subItems.clear();
 }
 
 int MGM::getItemIndexById(int objId) {
-- 
cgit v1.2.3


From ee9b60676a3efe015638763eed69161ee76ed846 Mon Sep 17 00:00:00 2001
From: Joel Teichroeb
Date: Sun, 4 Jan 2015 09:39:55 -0800
Subject: SDL: Warn if the selected joystick does not exist

---
 backends/events/sdl/sdl-events.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 2480e7c370..284e0970fd 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -55,16 +55,18 @@ SdlEventSource::SdlEventSource()
 	memset(&_km, 0, sizeof(_km));
 
 	int joystick_num = ConfMan.getInt("joystick_num");
-	if (joystick_num > -1) {
+	if (joystick_num >= 0) {
 		// Initialize SDL joystick subsystem
 		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1) {
 			error("Could not initialize SDL: %s", SDL_GetError());
 		}
 
 		// Enable joystick
-		if (SDL_NumJoysticks() > 0) {
-			debug("Using joystick: %s", SDL_JoystickName(0));
+		if (SDL_NumJoysticks() > joystick_num) {
+			debug("Using joystick: %s", SDL_JoystickName(joystick_num));
 			_joystick = SDL_JoystickOpen(joystick_num);
+		} else {
+			warning("Invalid joystick: %d", joystick_num);
 		}
 	}
 }
-- 
cgit v1.2.3


From 308bfe3b9cfda6ae2dd0558fcecfaa628e816b60 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 19:16:34 +0100
Subject: FULLPIPE: Remove redundant check

---
 engines/fullpipe/scenes/scene16.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index e9d3a37efd..df005950d2 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -182,7 +182,7 @@ void sceneHandler16_fillMug() {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1);
 
 			mq->replaceKeyCode(-1, g_vars->scene16_walkingBoy->_okeyCode);
-			if (!mq || mq->chain(g_vars->scene16_walkingBoy))
+			if (mq->chain(g_vars->scene16_walkingBoy))
 				return;
 		} else {
 			if (!g_vars->scene16_walkingGirl)
-- 
cgit v1.2.3


From 4393d38a311df69f473febc5c2fdf135694609e9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 19:18:41 +0100
Subject: FULLPIPE: Plug memory leak

---
 engines/fullpipe/statics.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 880c2eb0df..6b35159fd1 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1048,8 +1048,11 @@ MessageQueue *StaticANIObject::changeStatics1(int msgNum) {
 		if (_flags & 1)
 			_messageQueueId = mq->_id;
 	} else {
-		if (!queueMessageQueue(mq))
+		if (!queueMessageQueue(mq)) {
+			delete mq;
+
 			return 0;
+		}
 
 		g_fp->_globalMessageQueueList->addMessageQueue(mq);
 	}
-- 
cgit v1.2.3


From 882e0ca8cbc507cfba8dec1a340be9f5462069c3 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 19:23:43 +0100
Subject: FULLPIPE: Sanity check

---
 engines/fullpipe/statics.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 6b35159fd1..de3e1ea728 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1597,6 +1597,12 @@ Movement::Movement(Movement *src, int *oldIdxs, int newSize, StaticANIObject *an
 		newSize = src->_dynamicPhases.size();
 	}
 
+	if (!newSize) {
+		warning("Movement::Movement: newSize = 0");
+
+		return;
+	}
+
 	_framePosOffsets = (Common::Point **)calloc(newSize, sizeof(Common::Point *));
 
 	for (int i = 0; i < newSize; i++)
-- 
cgit v1.2.3


From 7da48233ce9a0154364bf26c1e419d24e70f2a26 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 19:32:26 +0100
Subject: FULLPIPE: Fix bug in inventory

---
 engines/fullpipe/inventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp
index e79f9c54df..f9b507c50b 100644
--- a/engines/fullpipe/inventory.cpp
+++ b/engines/fullpipe/inventory.cpp
@@ -126,7 +126,7 @@ void Inventory2::removeItem2(Scene *sceneObj, int itemId, int x, int y, int prio
 	int idx = getInventoryItemIndexById(itemId);
 
 	if (idx >= 0) {
-		if (_inventoryItems[idx]->itemId >> 16) {
+		if (_inventoryItems[idx]->count) {
 			removeItem(itemId, 1);
 
 			Scene *sc = g_fp->accessScene(_sceneId);
-- 
cgit v1.2.3


From 5b19913eb83d7f82ac0d2a153e11db43e7e88616 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 20:22:04 +0100
Subject: CONFIGURE: define HAVE_INT64 when we have 64-bit types.

This has been hanging in the air forever, but for the sake of cleanness
now is defined.
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index eba1ebcb32..7c4c87e3af 100755
--- a/configure
+++ b/configure
@@ -4504,6 +4504,7 @@ $_def_64bit_type_unsigned
 #else
 $_def_64bit_type_unsigned
 #endif
+#define HAVE_INT64
 EOF
 fi
 
-- 
cgit v1.2.3


From f1765db70fd7d1350e163a306a78ca293ef119cb Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 20:41:50 +0100
Subject: COMMON: Put all 64-bit code under new HAVE_INT64 constant

I regrouped all functions in order to make the code less noisy
with #ifdefs
---
 common/endian.h | 126 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 77 insertions(+), 49 deletions(-)

diff --git a/common/endian.h b/common/endian.h
index a18e6f088b..70cc8b434f 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -49,7 +49,7 @@
 #	error No endianness defined
 #endif
 
-
+#ifdef HAVE_INT64
 #define SWAP_CONSTANT_64(a) \
 	((uint64)((((a) >> 56) & 0x000000FF) | \
 	          (((a) >> 40) & 0x0000FF00) | \
@@ -59,6 +59,7 @@
 	          (((a) & 0x00FF0000) << 24) | \
 	          (((a) & 0x0000FF00) << 40) | \
 	          (((a) & 0x000000FF) << 56) ))
+#endif
 
 #define SWAP_CONSTANT_32(a) \
 	((uint32)((((a) >> 24) & 0x00FF) | \
@@ -70,6 +71,7 @@
 	((uint16)((((a) >>  8) & 0x00FF) | \
 	          (((a) <<  8) & 0xFF00) ))
 
+#ifdef HAVE_INT64
 /**
  * Swap the bytes in a 64 bit word in order to convert LE encoded data to BE
  * and vice versa.
@@ -122,10 +124,11 @@
 		return ((uint64)(((uint32)(uint16)((lowLow   >> 8) | (lowLow   << 8)) << 16) |
 		                          (uint16)((lowHigh  >> 8) | (lowHigh  << 8))) << 32) |
 		                (((uint32)(uint16)((highLow  >> 8) | (highLow  << 8)) << 16) |
-		                          (uint16)((highHigh >> 8) | (highHigh << 8)))
+		                          (uint16)((highHigh >> 8) | (highHigh << 8)));
 	}
 #endif
 
+#endif // HAVE_INT64
 /**
  * Swap the bytes in a 32 bit word in order to convert LE encoded data to BE
  * and vice versa.
@@ -240,11 +243,6 @@
 		return ((const Unaligned32 *)ptr)->val;
 	}
 
-	FORCEINLINE uint64 READ_UINT64(const void *ptr) {
-		struct Unaligned64 { uint64 val; } __attribute__ ((__packed__, __may_alias__));
-		return ((const Unaligned64 *)ptr)->val;
-	}
-
 	FORCEINLINE void WRITE_UINT16(void *ptr, uint16 value) {
 		struct Unaligned16 { uint16 val; } __attribute__ ((__packed__, __may_alias__));
 		((Unaligned16 *)ptr)->val = value;
@@ -255,10 +253,17 @@
 		((Unaligned32 *)ptr)->val = value;
 	}
 
+#ifdef HAVE_INT64
+	FORCEINLINE uint64 READ_UINT64(const void *ptr) {
+		struct Unaligned64 { uint64 val; } __attribute__ ((__packed__, __may_alias__));
+		return ((const Unaligned64 *)ptr)->val;
+	}
+
 	FORCEINLINE void WRITE_UINT64(void *ptr, uint64 value) {
 		struct Unaligned64 { uint64 val; } __attribute__((__packed__, __may_alias__));
 		((Unaligned64 *)ptr)->val = value;
 	}
+#endif
 
 #elif !defined(SCUMM_NEED_ALIGNMENT)
 
@@ -270,10 +275,6 @@
 		return *(const uint32 *)(ptr);
 	}
 
-	FORCEINLINE uint64 READ_UINT64(const void *ptr) {
-		return *(const uint64 *)(ptr);
-	}
-
 	FORCEINLINE void WRITE_UINT16(void *ptr, uint16 value) {
 		*(uint16 *)(ptr) = value;
 	}
@@ -282,9 +283,15 @@
 		*(uint32 *)(ptr) = value;
 	}
 
+#ifdef HAVE_INT64
+	FORCEINLINE uint64 READ_UINT64(const void *ptr) {
+		return *(const uint64 *)(ptr);
+	}
+
 	FORCEINLINE void WRITE_UINT64(void *ptr, uint64 value) {
 		*(uint64 *)(ptr) = value;
 	}
+#endif
 
 
 // use software fallback by loading each byte explicitely
@@ -300,10 +307,6 @@
 			const uint8 *b = (const uint8 *)ptr;
 			return (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
 		}
-		inline uint64 READ_UINT64(const void *ptr) {
-			const uint8 *b = (const uint8 *)ptr;
-			return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
-		}
 		inline void WRITE_UINT16(void *ptr, uint16 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 0);
@@ -316,6 +319,11 @@
 			b[2] = (uint8)(value >> 16);
 			b[3] = (uint8)(value >> 24);
 		}
+#ifdef HAVE_INT64
+		inline uint64 READ_UINT64(const void *ptr) {
+			const uint8 *b = (const uint8 *)ptr;
+			return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
+		}
 		inline void WRITE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >>  0);
@@ -327,6 +335,7 @@
 			b[6] = (uint8)(value >> 48);
 			b[7] = (uint8)(value >> 56);
 		}
+#endif
 
 #	elif defined(SCUMM_BIG_ENDIAN)
 
@@ -338,10 +347,6 @@
 			const uint8 *b = (const uint8 *)ptr;
 			return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | (b[3]);
 		}
-		inline uint64 READ_UINT64(const void *ptr) {
-			const uint8 *b = (const uint8 *)ptr;
-			return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
-		}
 		inline void WRITE_UINT16(void *ptr, uint16 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 8);
@@ -354,6 +359,11 @@
 			b[2] = (uint8)(value >>  8);
 			b[3] = (uint8)(value >>  0);
 		}
+#ifdef HAVE_INT64
+		inline uint64 READ_UINT64(const void *ptr) {
+			const uint8 *b = (const uint8 *)ptr;
+			return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+		}
 		inline void WRITE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 56);
@@ -365,6 +375,7 @@
 			b[6] = (uint8)(value >>  8);
 			b[7] = (uint8)(value >>  0);
 		}
+#endif
 
 #	endif
 
@@ -376,36 +387,39 @@
 
 	#define READ_LE_UINT16(a) READ_UINT16(a)
 	#define READ_LE_UINT32(a) READ_UINT32(a)
-	#define READ_LE_UINT64(a) READ_UINT64(a)
 
 	#define WRITE_LE_UINT16(a, v) WRITE_UINT16(a, v)
 	#define WRITE_LE_UINT32(a, v) WRITE_UINT32(a, v)
-	#define WRITE_LE_UINT64(a, v) WRITE_UINT64(a, v)
 
-	#define FROM_LE_64(a) ((uint64)(a))
 	#define FROM_LE_32(a) ((uint32)(a))
 	#define FROM_LE_16(a) ((uint16)(a))
 
-	#define FROM_BE_64(a) SWAP_BYTES_64(a)
 	#define FROM_BE_32(a) SWAP_BYTES_32(a)
 	#define FROM_BE_16(a) SWAP_BYTES_16(a)
 
-	#define TO_LE_64(a) ((uint64)(a))
 	#define TO_LE_32(a) ((uint32)(a))
 	#define TO_LE_16(a) ((uint16)(a))
 
-	#define TO_BE_64(a) SWAP_BYTES_64(a)
 	#define TO_BE_32(a) SWAP_BYTES_32(a)
 	#define TO_BE_16(a) SWAP_BYTES_16(a)
 
-	#define CONSTANT_LE_64(a) ((uint64)(a))
 	#define CONSTANT_LE_32(a) ((uint32)(a))
 	#define CONSTANT_LE_16(a) ((uint16)(a))
 
-	#define CONSTANT_BE_64(a) SWAP_CONSTANT_64(a)
 	#define CONSTANT_BE_32(a) SWAP_CONSTANT_32(a)
 	#define CONSTANT_BE_16(a) SWAP_CONSTANT_16(a)
 
+#ifdef HAVE_INT64
+	#define READ_LE_UINT64(a) READ_UINT64(a)
+	#define WRITE_LE_UINT64(a, v) WRITE_UINT64(a, v)
+	#define FROM_LE_64(a) ((uint64)(a))
+	#define FROM_BE_64(a) SWAP_BYTES_64(a)
+	#define TO_LE_64(a) ((uint64)(a))
+	#define TO_BE_64(a) SWAP_BYTES_64(a)
+	#define CONSTANT_LE_64(a) ((uint64)(a))
+	#define CONSTANT_BE_64(a) SWAP_CONSTANT_64(a)
+#endif
+
 // if the unaligned load and the byteswap take alot instructions its better to directly read and invert
 #	if defined(SCUMM_NEED_ALIGNMENT) && !defined(__mips__)
 
@@ -417,10 +431,6 @@
 			const uint8 *b = (const uint8 *)ptr;
 			return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | (b[3]);
 		}
-		inline uint64 READ_BE_UINT64(const void *ptr) {
-			const uint8 *b = (const uint8 *)ptr;
-			return (b[0] << 56) | b[1] << 48) | b[2] << 40) | b[3] << 32) | b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
-		}
 		inline void WRITE_BE_UINT16(void *ptr, uint16 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 8);
@@ -433,6 +443,11 @@
 			b[2] = (uint8)(value >>  8);
 			b[3] = (uint8)(value >>  0);
 		}
+#ifdef HAVE_INT64
+		inline uint64 READ_BE_UINT64(const void *ptr) {
+			const uint8 *b = (const uint8 *)ptr;
+			return (b[0] << 56) | b[1] << 48) | b[2] << 40) | b[3] << 32) | b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+		}
 		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
 			b[0] = (uint8)(value >> 56);
@@ -444,6 +459,8 @@
 			b[6] = (uint8)(value >> 8);
 			b[7] = (uint8)(value >> 0);
 		}
+#endif
+
 #	else
 
 		inline uint16 READ_BE_UINT16(const void *ptr) {
@@ -452,18 +469,20 @@
 		inline uint32 READ_BE_UINT32(const void *ptr) {
 			return SWAP_BYTES_32(READ_UINT32(ptr));
 		}
-		inline uint32 READ_BE_UINT64(const void *ptr) {
-			return SWAP_BYTES_64(READ_UINT64(ptr));
-		}
 		inline void WRITE_BE_UINT16(void *ptr, uint16 value) {
 			WRITE_UINT16(ptr, SWAP_BYTES_16(value));
 		}
 		inline void WRITE_BE_UINT32(void *ptr, uint32 value) {
 			WRITE_UINT32(ptr, SWAP_BYTES_32(value));
 		}
+#ifdef HAVE_INT64
+		inline uint32 READ_BE_UINT64(const void *ptr) {
+			return SWAP_BYTES_64(READ_UINT64(ptr));
+		}
 		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
 			WRITE_UINT64(ptr, SWAP_BYTES_64(value));
 		}
+#endif
 
 #	endif	// if defined(SCUMM_NEED_ALIGNMENT)
 
@@ -471,36 +490,39 @@
 
 	#define READ_BE_UINT16(a) READ_UINT16(a)
 	#define READ_BE_UINT32(a) READ_UINT32(a)
-	#define READ_BE_UINT64(a) READ_UINT64(a)
 
 	#define WRITE_BE_UINT16(a, v) WRITE_UINT16(a, v)
 	#define WRITE_BE_UINT32(a, v) WRITE_UINT32(a, v)
-	#define WRITE_BE_UINT64(a, v) WRITE_UINT64(a, v)
 
-	#define FROM_LE_64(a) SWAP_BYTES_64(a)
 	#define FROM_LE_32(a) SWAP_BYTES_32(a)
 	#define FROM_LE_16(a) SWAP_BYTES_16(a)
 
-	#define FROM_BE_64(a) ((uint64)(a))
 	#define FROM_BE_32(a) ((uint32)(a))
 	#define FROM_BE_16(a) ((uint16)(a))
 
-	#define TO_LE_64(a) SWAP_BYTES_64(a)
 	#define TO_LE_32(a) SWAP_BYTES_32(a)
 	#define TO_LE_16(a) SWAP_BYTES_16(a)
 
-	#define TO_BE_64(a) ((uint64)(a))	
 	#define TO_BE_32(a) ((uint32)(a))
 	#define TO_BE_16(a) ((uint16)(a))
 
-	#define CONSTANT_LE_64(a) SWAP_CONSTANT_64(a)	
 	#define CONSTANT_LE_32(a) SWAP_CONSTANT_32(a)
 	#define CONSTANT_LE_16(a) SWAP_CONSTANT_16(a)
 
-	#define CONSTANT_BE_64(a) ((uint64)(a))
 	#define CONSTANT_BE_32(a) ((uint32)(a))
 	#define CONSTANT_BE_16(a) ((uint16)(a))
 
+#ifdef HAVE_INT64
+	#define READ_BE_UINT64(a) READ_UINT64(a)
+	#define WRITE_BE_UINT64(a, v) WRITE_UINT64(a, v)
+	#define FROM_LE_64(a) SWAP_BYTES_64(a)
+	#define FROM_BE_64(a) ((uint64)(a))
+	#define TO_LE_64(a) SWAP_BYTES_64(a)
+	#define TO_BE_64(a) ((uint64)(a))
+	#define CONSTANT_LE_64(a) SWAP_CONSTANT_64(a)
+	#define CONSTANT_BE_64(a) ((uint64)(a))
+#endif
+
 // if the unaligned load and the byteswap take alot instructions its better to directly read and invert
 #	if defined(SCUMM_NEED_ALIGNMENT) && !defined(__mips__)
 
@@ -512,10 +534,6 @@
 		const uint8 *b = (const uint8 *)ptr;
 		return (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
 	}
-	inline uint64 READ_LE_UINT64(const void *ptr) {
-		const uint8 *b = (const uint8 *)ptr;
-		return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
-	}
 	inline void WRITE_LE_UINT16(void *ptr, uint16 value) {
 		uint8 *b = (uint8 *)ptr;
 		b[0] = (uint8)(value >> 0);
@@ -528,6 +546,12 @@
 		b[2] = (uint8)(value >> 16);
 		b[3] = (uint8)(value >> 24);
 	}
+
+#ifdef HAVE_INT64
+	inline uint64 READ_LE_UINT64(const void *ptr) {
+		const uint8 *b = (const uint8 *)ptr;
+		return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
+	}
 	inline void WRITE_LE_UINT64(void *ptr, uint64 value) {
 		uint8 *b = (uint8 *)ptr;
 		b[0] = (uint8)(value >>  0);
@@ -539,6 +563,8 @@
 		b[6] = (uint8)(value >> 48);
 		b[7] = (uint8)(value >> 56);
 	}
+#endif
+
 #	else
 
 	inline uint16 READ_LE_UINT16(const void *ptr) {
@@ -547,18 +573,20 @@
 	inline uint32 READ_LE_UINT32(const void *ptr) {
 		return SWAP_BYTES_32(READ_UINT32(ptr));
 	}
-	inline uint64 READ_LE_UINT64(const void *ptr) {
-		return SWAP_BYTES_64(READ_UINT64(ptr));
-	}
 	inline void WRITE_LE_UINT16(void *ptr, uint16 value) {
 		WRITE_UINT16(ptr, SWAP_BYTES_16(value));
 	}
 	inline void WRITE_LE_UINT32(void *ptr, uint32 value) {
 		WRITE_UINT32(ptr, SWAP_BYTES_32(value));
 	}
+#ifdef HAVE_INT64
+	inline uint64 READ_LE_UINT64(const void *ptr) {
+		return SWAP_BYTES_64(READ_UINT64(ptr));
+	}
 	inline void WRITE_LE_UINT64(void *ptr, uint64 value) {
 		WRITE_UINT64(ptr, SWAP_BYTES_64(value));
 	}
+#endif
 
 #	endif	// if defined(SCUMM_NEED_ALIGNMENT)
 
-- 
cgit v1.2.3


From 7865c7821140a2b83a1473c66e90644cbf39a2c9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 20:47:12 +0100
Subject: COMMON: Put more 64-bit stuff under HAVE_INT64

---
 common/stream.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/common/stream.h b/common/stream.h
index 251995001c..3021df304c 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -125,10 +125,12 @@ public:
 		write(&value, 4);
 	}
 
+#ifdef HAVE_INT64
 	void writeUint64LE(uint64 value) {
 		value = TO_LE_64(value);
 		write(&value, 8);
 	}
+#endif
 
 	void writeUint16BE(uint16 value) {
 		value = TO_BE_16(value);
@@ -140,10 +142,12 @@ public:
 		write(&value, 4);
 	}
 
+#ifdef HAVE_INT64
 	void writeUint64BE(uint64 value) {
 		value = TO_BE_64(value);
 		write(&value, 8);
 	}
+#endif
 
 	FORCEINLINE void writeSint16LE(int16 value) {
 		writeUint16LE((uint16)value);
@@ -153,9 +157,11 @@ public:
 		writeUint32LE((uint32)value);
 	}
 
+#ifdef HAVE_INT64
 	FORCEINLINE void writeSint64LE(int64 value) {
 		writeUint64LE((uint64)value);
 	}
+#endif
 
 	FORCEINLINE void writeSint16BE(int16 value) {
 		writeUint16BE((uint16)value);
@@ -165,9 +171,11 @@ public:
 		writeUint32BE((uint32)value);
 	}
 
+#ifdef HAVE_INT64
 	FORCEINLINE void writeSint64BE(int64 value) {
 		writeUint64BE((uint64)value);
 	}
+#endif
 
 	/**
 	 * Write the given string to the stream.
@@ -259,6 +267,7 @@ public:
 		return FROM_LE_32(val);
 	}
 
+#ifdef HAVE_INT64
 	/**
 	 * Read an unsigned 64-bit word stored in little endian (LSB first) order
 	 * from the stream and return it.
@@ -271,6 +280,7 @@ public:
 		read(&val, 8);
 		return FROM_LE_64(val);
 	}
+#endif
 
 	/**
 	 * Read an unsigned 16-bit word stored in big endian (MSB first) order
@@ -298,6 +308,7 @@ public:
 		return FROM_BE_32(val);
 	}
 
+#ifdef HAVE_INT64
 	/**
 	 * Read an unsigned 64-bit word stored in big endian (MSB first) order
 	 * from the stream and return it.
@@ -310,6 +321,7 @@ public:
 		read(&val, 8);
 		return FROM_BE_64(val);
 	}
+#endif
 
 	/**
 	 * Read a signed 16-bit word stored in little endian (LSB first) order
@@ -333,6 +345,7 @@ public:
 		return (int32)readUint32LE();
 	}
 
+#ifdef HAVE_INT64
 	/**
 	 * Read a signed 64-bit word stored in little endian (LSB first) order
 	 * from the stream and return it.
@@ -343,6 +356,7 @@ public:
 	FORCEINLINE int64 readSint64LE() {
 		return (int64)readUint64LE();
 	}
+#endif
 
 	/**
 	 * Read a signed 16-bit word stored in big endian (MSB first) order
@@ -366,6 +380,7 @@ public:
 		return (int32)readUint32BE();
 	}
 
+#ifdef HAVE_INT64
 	/**
 	 * Read a signed 64-bit word stored in big endian (MSB first) order
 	 * from the stream and return it.
@@ -376,6 +391,7 @@ public:
 	FORCEINLINE int64 readSint64BE() {
 		return (int64)readUint64BE();
 	}
+#endif
 
 	/**
 	 * Read the specified amount of data into a malloc'ed buffer
-- 
cgit v1.2.3


From ce45caaf83cae5990416aa2d6e833f309f7ce5c0 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 21:06:49 +0100
Subject: SWORD25: Fix warning

---
 engines/sword25/util/lua_persist.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/engines/sword25/util/lua_persist.cpp b/engines/sword25/util/lua_persist.cpp
index 6fe88fe9a3..03f305b2c5 100644
--- a/engines/sword25/util/lua_persist.cpp
+++ b/engines/sword25/util/lua_persist.cpp
@@ -645,8 +645,7 @@ static void persistProto(SerializationInfo *info) {
 	// Serialize inner Proto refs
 	info->writeStream->writeSint32LE(proto->sizep);
 
-	for (int i = 0; i < proto->sizep; ++i)
-	{
+	for (int i = 0; i < proto->sizep; ++i) {
 		pushProto(info->luaState, proto->p[i]);
 		// >>>>> permTbl indexTbl ...... proto subProto */
 
@@ -668,8 +667,7 @@ static void persistProto(SerializationInfo *info) {
 	// Serialize upvalue names
 	info->writeStream->writeSint32LE(proto->sizeupvalues);
 
-	for (int i = 0; i < proto->sizeupvalues; ++i)
-	{
+	for (int i = 0; i < proto->sizeupvalues; ++i) {
 		pushString(info->luaState, proto->upvalues[i]);
 		// >>>>> permTbl indexTbl ...... proto str
 
@@ -710,7 +708,7 @@ static void persistProto(SerializationInfo *info) {
 	info->writeStream->writeSint32LE(proto->sizelineinfo);
 
 	if (proto->sizelineinfo) {
-		uint32 len = static_cast<uint32>(sizeof(int) * proto->sizelineinfo);
+		len = static_cast<uint32>(sizeof(int) * proto->sizelineinfo);
 		info->writeStream->write(proto->lineinfo, len);
 	}
 
-- 
cgit v1.2.3


From f1e58efe90e2c3ae6740a41db4642b3e47c0c81f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 4 Jan 2015 20:55:01 +0100
Subject: TEST: Fix C++11 compat warnings.

---
 test/common/endian.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/common/endian.h b/test/common/endian.h
index f083d1248c..08e93e41ef 100644
--- a/test/common/endian.h
+++ b/test/common/endian.h
@@ -11,13 +11,13 @@ class EndianTestSuite : public CxxTest::TestSuite
 	}
 
 	void test_READ_BE_UINT64() {
-		const char data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
+		const byte data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
 		uint64 value = READ_BE_UINT64(data);
 		TS_ASSERT_EQUALS(value, 0x123456789ABCDEFFULL);
 	}
 
 	void test_READ_LE_UINT64() {
-		const char data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
+		const byte data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
 		uint64 value = READ_LE_UINT64(data);
 		TS_ASSERT_EQUALS(value, 0xFFEDCBA978563412ULL);
 	}
-- 
cgit v1.2.3


From eb4d1a69255b06f93c497aabd9cf950bfe0756ec Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 4 Jan 2015 21:07:36 +0100
Subject: COMMON: Add missing readUint64/readSint64 to ReadStreamEndian.

---
 common/stream.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/common/stream.h b/common/stream.h
index 3021df304c..abe5192b70 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -517,6 +517,14 @@ public:
 		return (_bigEndian) ? TO_BE_32(val) : TO_LE_32(val);
 	}
 
+#ifdef HAVE_INT64
+	uint64 readUint64() {
+		uint64 val;
+		read(&val, 8);
+		return (_bigEndian) ? TO_BE_64(val) : TO_LE_64(val);
+	}
+#endif
+
 	FORCEINLINE int16 readSint16() {
 		return (int16)readUint16();
 	}
@@ -524,6 +532,12 @@ public:
 	FORCEINLINE int32 readSint32() {
 		return (int32)readUint32();
 	}
+
+#ifdef HAVE_INT64
+	FORCEINLINE int64 readSint64() {
+		return (int64)readUint64();
+	}
+#endif
 };
 
 /**
-- 
cgit v1.2.3


From daa8fca001c0eddd5b0856d60aa7ecd59c7d6acc Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 4 Jan 2015 20:58:19 +0100
Subject: TEST: Fix uint64 endian related test code.

This does not fix the actual implementation issues which are present right
now!
---
 test/common/endian.h                 | 2 +-
 test/common/memoryreadstreamendian.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/common/endian.h b/test/common/endian.h
index 08e93e41ef..065b6997fc 100644
--- a/test/common/endian.h
+++ b/test/common/endian.h
@@ -19,7 +19,7 @@ class EndianTestSuite : public CxxTest::TestSuite
 	void test_READ_LE_UINT64() {
 		const byte data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
 		uint64 value = READ_LE_UINT64(data);
-		TS_ASSERT_EQUALS(value, 0xFFEDCBA978563412ULL);
+		TS_ASSERT_EQUALS(value, 0xFFDEBC9A78563412ULL);
 	}
 
 	void test_READ_BE_UINT32() {
diff --git a/test/common/memoryreadstreamendian.h b/test/common/memoryreadstreamendian.h
index 515128ea2a..c25ec29e1a 100644
--- a/test/common/memoryreadstreamendian.h
+++ b/test/common/memoryreadstreamendian.h
@@ -82,7 +82,7 @@ class MemoryReadStreamEndianTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32BE(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.readUint64BE(), 0x0708090A0B0C0D0EULL);
 		TS_ASSERT_EQUALS(ms.pos(), 14);
 		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
 		TS_ASSERT_EQUALS(ms.pos(), 15);
@@ -97,7 +97,7 @@ class MemoryReadStreamEndianTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.readUint64(), 0x0E0D0C0B0A090807ULL);
 		TS_ASSERT_EQUALS(ms.pos(), 14);
 		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
 		TS_ASSERT_EQUALS(ms.pos(), 15);
@@ -112,7 +112,7 @@ class MemoryReadStreamEndianTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.readUint64(), 0x0708090A0B0C0D0EULL);
 		TS_ASSERT_EQUALS(ms.pos(), 14);
 		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
 		TS_ASSERT_EQUALS(ms.pos(), 15);
-- 
cgit v1.2.3


From 64bad2ec4a2bfe9d607883ca06df03279ba83943 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 4 Jan 2015 21:17:33 +0100
Subject: COMMON: Fix some syntax issues.

Not compile tested. Then again it didn't look test before either. So, yay!
---
 common/endian.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/endian.h b/common/endian.h
index 70cc8b434f..21e0d9ee11 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -446,7 +446,7 @@
 #ifdef HAVE_INT64
 		inline uint64 READ_BE_UINT64(const void *ptr) {
 			const uint8 *b = (const uint8 *)ptr;
-			return (b[0] << 56) | b[1] << 48) | b[2] << 40) | b[3] << 32) | b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+			return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
 		}
 		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
-- 
cgit v1.2.3


From ba228f2bea145f6f8c6d575affc8efac4ed5e87f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 4 Jan 2015 21:22:43 +0100
Subject: TEST: Fix another typo in uint64 endian tests.

---
 test/common/memoryreadstream.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/common/memoryreadstream.h b/test/common/memoryreadstream.h
index 79c4079e9b..3e1472f408 100644
--- a/test/common/memoryreadstream.h
+++ b/test/common/memoryreadstream.h
@@ -82,7 +82,7 @@ class MemoryReadStreamTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32BE(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.readUint64BE(), 0x0708090A0B0C0D0EULL);
 		TS_ASSERT_EQUALS(ms.pos(), 14);
 		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
 		TS_ASSERT_EQUALS(ms.pos(), 15);
-- 
cgit v1.2.3


From e2e61184c6c75554702721434920d0e5772976cf Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 4 Jan 2015 21:30:05 +0100
Subject: COMMON: Fix return type of one READ_BE_UINT64 implementation.

This makes all unit tests pass for my on amd64 again. Thanks clone2727.
---
 common/endian.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/endian.h b/common/endian.h
index 21e0d9ee11..9a6c0cd42c 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -476,7 +476,7 @@
 			WRITE_UINT32(ptr, SWAP_BYTES_32(value));
 		}
 #ifdef HAVE_INT64
-		inline uint32 READ_BE_UINT64(const void *ptr) {
+		inline uint64 READ_BE_UINT64(const void *ptr) {
 			return SWAP_BYTES_64(READ_UINT64(ptr));
 		}
 		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
-- 
cgit v1.2.3


From 7c7bdf3543ee198b4dfbb06c9a95ea387342b56d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 4 Jan 2015 21:49:56 +0100
Subject: COMMON: Swap order of functions to 16, 32, 64

---
 common/endian.h | 101 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/common/endian.h b/common/endian.h
index 9a6c0cd42c..9f10b63053 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -71,64 +71,36 @@
 	((uint16)((((a) >>  8) & 0x00FF) | \
 	          (((a) <<  8) & 0xFF00) ))
 
-#ifdef HAVE_INT64
+
+
 /**
- * Swap the bytes in a 64 bit word in order to convert LE encoded data to BE
+ * Swap the bytes in a 16 bit word in order to convert LE encoded data to BE
  * and vice versa.
  */
 
-// machine/compiler-specific variants come first, fallback last
+// compilerspecific variants come first, fallback last
 
 // Test for GCC and if the target has the MIPS rel.2 instructions (we know the psp does)
-//
-// TODO: Fix this #if statement. It isn't changed from 32 bit. Is there a 64 bit swap instruction?
 #if defined(__GNUC__) && (defined(__psp__) || defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2))
 
-	FORCEINLINE uint32 SWAP_BYTES_32(const uint32 a) {
+	FORCEINLINE uint16 SWAP_BYTES_16(const uint16 a) {
 		if (__builtin_constant_p(a)) {
-			return SWAP_CONSTANT_32(a);
+			return SWAP_CONSTANT_16(a);
 		} else {
-			uint32 result;
-#	if defined(__psp__)
-			// use special allegrex instruction
-			__asm__ ("wsbw %0,%1" : "=r" (result) : "r" (a));
-#	else
-			__asm__ ("wsbh %0,%1\n"
-			         "rotr %0,%0,16" : "=r" (result) : "r" (a));
-#	endif
+			uint16 result;
+			__asm__ ("wsbh %0,%1" : "=r" (result) : "r" (a));
 			return result;
 		}
 	}
-
-// Test for GCC >= 4.3.0 as this version added the bswap builtin
-#elif GCC_ATLEAST(4, 3)
-
-	FORCEINLINE uint64 SWAP_BYTES_64(uint64 a) {
-		return __builtin_bswap64(a);
-	}
-
-#elif defined(_MSC_VER)
-
-	FORCEINLINE uint64 SWAP_BYTES_64(uint64 a) {
-		return _byteswap_uint64(a);
-	}
-
-// generic fallback
 #else
 
-	inline uint64 SWAP_BYTES_64(uint64 a) {
-		uint32 low = (uint32)a, high = (uint32)(a >> 32);
-		uint16 lowLow = (uint16)low, lowHigh = (uint16)(low >> 16),
-		       highLow = (uint16)high, highHigh = (uint16)(high >> 16);
-
-		return ((uint64)(((uint32)(uint16)((lowLow   >> 8) | (lowLow   << 8)) << 16) |
-		                          (uint16)((lowHigh  >> 8) | (lowHigh  << 8))) << 32) |
-		                (((uint32)(uint16)((highLow  >> 8) | (highLow  << 8)) << 16) |
-		                          (uint16)((highHigh >> 8) | (highHigh << 8)));
+	inline uint16 SWAP_BYTES_16(const uint16 a) {
+		return (a >> 8) | (a << 8);
 	}
 #endif
 
-#endif // HAVE_INT64
+
+
 /**
  * Swap the bytes in a 32 bit word in order to convert LE encoded data to BE
  * and vice versa.
@@ -178,32 +150,65 @@
 	}
 #endif
 
+#ifdef HAVE_INT64
 /**
- * Swap the bytes in a 16 bit word in order to convert LE encoded data to BE
+ * Swap the bytes in a 64 bit word in order to convert LE encoded data to BE
  * and vice versa.
  */
 
-// compilerspecific variants come first, fallback last
+// machine/compiler-specific variants come first, fallback last
 
 // Test for GCC and if the target has the MIPS rel.2 instructions (we know the psp does)
+//
+// TODO: Fix this #if statement. It isn't changed from 32 bit. Is there a 64 bit swap instruction?
 #if defined(__GNUC__) && (defined(__psp__) || defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2))
 
-	FORCEINLINE uint16 SWAP_BYTES_16(const uint16 a) {
+	FORCEINLINE uint32 SWAP_BYTES_32(const uint32 a) {
 		if (__builtin_constant_p(a)) {
-			return SWAP_CONSTANT_16(a);
+			return SWAP_CONSTANT_32(a);
 		} else {
-			uint16 result;
-			__asm__ ("wsbh %0,%1" : "=r" (result) : "r" (a));
+			uint32 result;
+#	if defined(__psp__)
+			// use special allegrex instruction
+			__asm__ ("wsbw %0,%1" : "=r" (result) : "r" (a));
+#	else
+			__asm__ ("wsbh %0,%1\n"
+			         "rotr %0,%0,16" : "=r" (result) : "r" (a));
+#	endif
 			return result;
 		}
 	}
+
+// Test for GCC >= 4.3.0 as this version added the bswap builtin
+#elif GCC_ATLEAST(4, 3)
+
+	FORCEINLINE uint64 SWAP_BYTES_64(uint64 a) {
+		return __builtin_bswap64(a);
+	}
+
+#elif defined(_MSC_VER)
+
+	FORCEINLINE uint64 SWAP_BYTES_64(uint64 a) {
+		return _byteswap_uint64(a);
+	}
+
+// generic fallback
 #else
 
-	inline uint16 SWAP_BYTES_16(const uint16 a) {
-		return (a >> 8) | (a << 8);
+	inline uint64 SWAP_BYTES_64(uint64 a) {
+		uint32 low = (uint32)a, high = (uint32)(a >> 32);
+		uint16 lowLow = (uint16)low, lowHigh = (uint16)(low >> 16),
+		       highLow = (uint16)high, highHigh = (uint16)(high >> 16);
+
+		return ((uint64)(((uint32)(uint16)((lowLow   >> 8) | (lowLow   << 8)) << 16) |
+		                          (uint16)((lowHigh  >> 8) | (lowHigh  << 8))) << 32) |
+		                (((uint32)(uint16)((highLow  >> 8) | (highLow  << 8)) << 16) |
+		                          (uint16)((highHigh >> 8) | (highHigh << 8)));
 	}
 #endif
 
+#endif // HAVE_INT64
+
 
 /**
  * A wrapper macro used around four character constants, like 'DATA', to
-- 
cgit v1.2.3


From 1084f2eea67d3a7f2293392af0c7a2c1d97b1b2b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 4 Jan 2015 21:54:11 +0100
Subject: COMMON: Implement MIPS SWAP_BYTES_64 in terms of SWAP_BYTES_32

---
 common/endian.h | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/common/endian.h b/common/endian.h
index 9f10b63053..0c6b3db621 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -160,22 +160,17 @@
 
 // Test for GCC and if the target has the MIPS rel.2 instructions (we know the psp does)
 //
-// TODO: Fix this #if statement. It isn't changed from 32 bit. Is there a 64 bit swap instruction?
 #if defined(__GNUC__) && (defined(__psp__) || defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2))
 
-	FORCEINLINE uint32 SWAP_BYTES_32(const uint32 a) {
+	FORCEINLINE uint64 SWAP_BYTES_64(const uint64 a) {
 		if (__builtin_constant_p(a)) {
-			return SWAP_CONSTANT_32(a);
+			return SWAP_CONSTANT_64(a);
 		} else {
-			uint32 result;
-#	if defined(__psp__)
-			// use special allegrex instruction
-			__asm__ ("wsbw %0,%1" : "=r" (result) : "r" (a));
-#	else
-			__asm__ ("wsbh %0,%1\n"
-			         "rotr %0,%0,16" : "=r" (result) : "r" (a));
-#	endif
-			return result;
+			uint32 low = (uint32)a, high = (uint32)(a >> 32);
+			low = SWAP_BYTES_32(low);
+			high = SWAP_BYTES_32(high);
+
+			return (((uint64)low) << 32) | high;
 		}
 	}
 
-- 
cgit v1.2.3


From 17fe53a34c442da7ccf28721179a88ed2087f7b2 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 22:09:46 +0100
Subject: SWORD25: Hopefully fix compilation errors

---
 engines/sword25/util/double_serialization.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sword25/util/double_serialization.cpp b/engines/sword25/util/double_serialization.cpp
index 48fd75cb33..0d41ddc503 100644
--- a/engines/sword25/util/double_serialization.cpp
+++ b/engines/sword25/util/double_serialization.cpp
@@ -77,13 +77,13 @@ uint64 encodeDouble_64(double value) {
 	uint64 uintsignificand = (uint64)shiftedsignificand;
 	return ((uint64)(value < 0 ? 1 : 0) << 63) |        // Sign
 	       ((uint64)(exponent + 1023) << 52) |          // Exponent stored as an offset to 1023
-	       (uintsignificand & 0x000FFFFFFFFFFFFF);      // significand with MSB inferred
+	       (uintsignificand & 0x000FFFFFFFFFFFFFLL);      // significand with MSB inferred
 }
 
 double decodeDouble_64(uint64 value) {
 	// Expand the exponent and significand
 	int exponent = (int)((value >> 52) & 0x7FF) - 1023;
-	double expandedsignificand = (double)(0x10000000000000 /* Inferred MSB */ | (value & 0x000FFFFFFFFFFFFF));
+	double expandedsignificand = (double)(0x10000000000000LL /* Inferred MSB */ | (value & 0x000FFFFFFFFFFFFFLL));
 
 	// Deflate the significand
 	int temp;
@@ -93,7 +93,7 @@ double decodeDouble_64(uint64 value) {
 	double returnValue = ldexp(significand, exponent);
 
 	// Check the sign bit and return
-	return ((value & 0x8000000000000000) == 0x8000000000000000) ? -returnValue : returnValue;
+	return ((value & 0x8000000000000000LL) == 0x8000000000000000LL) ? -returnValue : returnValue;
 }
 
 CompactSerializedDouble encodeDouble_Compact(double value) {
-- 
cgit v1.2.3


From baacf0be61cf8f31a72b593d320c62393241e951 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 22:16:50 +0100
Subject: SWORD25: Commend unused and unportable functions

---
 engines/sword25/util/double_serialization.cpp | 6 ++++++
 engines/sword25/util/double_serialization.h   | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/engines/sword25/util/double_serialization.cpp b/engines/sword25/util/double_serialization.cpp
index 0d41ddc503..a34eb0fbff 100644
--- a/engines/sword25/util/double_serialization.cpp
+++ b/engines/sword25/util/double_serialization.cpp
@@ -65,6 +65,10 @@ double decodeDouble(SerializedDouble value) {
 	return ((value.signAndSignificandTwo & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
 }
 
+#if 0
+
+// Why these are needed?
+
 uint64 encodeDouble_64(double value) {
 	// Split the value into its significand and exponent
 	int exponent;
@@ -135,4 +139,6 @@ double decodeDouble_Compact(CompactSerializedDouble value) {
 	return ((value.signAndSignificandOne & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
 }
 
+#endif
+
 } // End of namespace Sword25
diff --git a/engines/sword25/util/double_serialization.h b/engines/sword25/util/double_serialization.h
index e90338c369..a910a66f20 100644
--- a/engines/sword25/util/double_serialization.h
+++ b/engines/sword25/util/double_serialization.h
@@ -56,6 +56,7 @@ SerializedDouble encodeDouble(double value);
  */
 double decodeDouble(SerializedDouble value);
 
+#if 0
 /**
  * Encodes a double as a uint64
  *
@@ -90,6 +91,8 @@ CompactSerializedDouble encodeDouble_Compact(double value);
  */
 double decodeDouble_Compact(CompactSerializedDouble value);
 
+#endif
+
 } // End of namespace Sword25
 
 #endif
-- 
cgit v1.2.3


From f7ba09dcfcef0b7009e0b48bee2daf3f7b09194c Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 23:18:16 +0100
Subject: NEWS: Mention DOTT easter egg support

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 470ddc01bd..d66eb55d0e 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ For a more comprehensive changelog of the latest experimental code, see:
      head scene (bug #6728). It may have been happening in other scenes as
      well.
 
+SCUMM:
+   - It is now possible to play Maniac Mansion from within Day of the
+     Tentacle, with a few caveats. See README for details.
+
 1.7.0 (2014-07-21)
  New Games:
    - Added support for Chivalry is Not Dead.
-- 
cgit v1.2.3


From c44c0f09bfdff1567f2560962c5f2053156245f8 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 23:18:37 +0100
Subject: README: Describe DOTT easter egg support. Text by eriktorbjorn.

---
 README | 111 +++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 67 insertions(+), 44 deletions(-)

diff --git a/README b/README
index 5b0569089c..b78ee24dfd 100644
--- a/README
+++ b/README
@@ -15,26 +15,27 @@ Table of Contents:
  * 2.1 Reporting Bugs
 3.0) Supported Games
  * 3.1 Copy Protection
- * 3.2 Commodore64 games notes
- * 3.3 Maniac Mansion NES notes
- * 3.4 Macintosh games notes
- * 3.5 Multi-CD games notes
- * 3.6 The Curse of Monkey Island notes
- * 3.7 Broken Sword games notes
- * 3.8 Beneath a Steel Sky notes
- * 3.9 Flight of the Amazon Queen notes
- * 3.10 Gobliiins notes
- * 3.11 Inherit the Earth: Quest for the Orb notes
- * 3.12 Simon the Sorcerer notes
- * 3.13 The Feeble Files notes
- * 3.14 The Legend of Kyrandia notes
- * 3.15 Sierra AGI games Predictive Input Dialog notes
- * 3.16 Mickey's Space Adventure notes
- * 3.17 Winnie the Pooh notes
- * 3.18 Troll's Tale notes
- * 3.19 Dragon History notes
- * 3.20 Simultaneous speech and subtitles in Sierra SCI games
- * 3.21 Known Problems
+ * 3.2 Day of the Tentacle notes
+ * 3.3 Commodore64 games notes
+ * 3.4 Maniac Mansion NES notes
+ * 3.5 Macintosh games notes
+ * 3.6 Multi-CD games notes
+ * 3.7 The Curse of Monkey Island notes
+ * 3.8 Broken Sword games notes
+ * 3.9 Beneath a Steel Sky notes
+ * 3.10 Flight of the Amazon Queen notes
+ * 3.11 Gobliiins notes
+ * 3.12 Inherit the Earth: Quest for the Orb notes
+ * 3.13 Simon the Sorcerer notes
+ * 3.14 The Feeble Files notes
+ * 3.15 The Legend of Kyrandia notes
+ * 3.16 Sierra AGI games Predictive Input Dialog notes
+ * 3.17 Mickey's Space Adventure notes
+ * 3.18 Winnie the Pooh notes
+ * 3.19 Troll's Tale notes
+ * 3.20 Dragon History notes
+ * 3.21 Simultaneous speech and subtitles in Sierra SCI games
+ * 3.22 Known Problems
 4.0) Supported Platforms
 5.0) Running ScummVM
  * 5.1 Command Line Options
@@ -410,7 +411,29 @@ ScummVM will skip copy protection in the following games:
   * Zak McKracken and the Alien Mindbenders
 
 
-3.2) Commodore64 games notes:
+3.2) Day of the Tentacle notes:
+---- --------------------------
+
+At one point in the game, you come across a computer that allows you
+to play the original Maniac Mansion as an easter egg. ScummVM supports
+this, with a few caveats:
+
+ScummVM will scan your configuration file for a game that's in a
+'Maniac' sub-folder of your Day of the Tentacle folder. If you've
+copied the data files from the CD version, this should already be the
+case but you have to add the game to ScummVM as well.
+
+To return to Day of the Tentacle, press F5 and select "Return to
+Launcher".
+
+This means that you could in theory use any game as the easter egg.
+Indeed, there is a "secret" configuration setting, "easter_egg", to
+override the ID of the game to run. Be aware, though, that not all
+games support returning to the launcher, and setting it up to use Day
+of the Tentacle itself as the easter egg game is not recommended.
+
+
+3.3) Commodore64 games notes:
 ---- ------------------------
 Both Maniac Mansion and Zak McKracken run but Maniac Mansion is not yet
 playable. Simply name the D64 disks "maniac1.d64" and "maniac2.d64"
@@ -424,7 +447,7 @@ to Commodore64. We recommend using the much simpler approach described
 in the previous paragraph.
 
 
-3.3) Maniac Mansion NES notes:
+3.4) Maniac Mansion NES notes:
 ---- -------------------------
 Supported versions are English GB (E), French (F), German (G), Italian (I),
 Swedish (SW) and English US (U). ScummVM requires just the PRG section
@@ -453,7 +476,7 @@ section. To do so use the 'extract_mm_nes' utility from the tools
 package.
 
 
-3.4) Macintosh games notes:
+3.5) Macintosh games notes:
 ---- ----------------------
 All LucasArts SCUMM based adventures, except COMI, also exist in versions
 for the Macintosh. ScummVM can use most (all?) of them, however, in some
@@ -481,7 +504,7 @@ disk see:
   http://wiki.scummvm.org/index.php/HOWTO-Mac_Games
 
 
-3.5) Multi-CD games notes:
+3.6) Multi-CD games notes:
 ---- ---------------------
 In general, ScummVM does not deal very well with Multi-CD games. This is
 because ScummVM assumes everything about a game can be found in one
@@ -496,7 +519,7 @@ files. Usually, when a file appears on more than one CD you can pick
 either of them.
 
 
-3.6) The Curse of Monkey Island notes:
+3.7) The Curse of Monkey Island notes:
 ---- ---------------------------------
 For this game, you will need the comi.la0, comi.la1 and comi.la2 files.
 The comi.la0 file can be found on either CD, but since they are
@@ -508,7 +531,7 @@ two CDs. Some of the files appear on both CDs, but again they're
 identical.
 
 
-3.7) Broken Sword games notes:
+3.8) Broken Sword games notes:
 ---- -------------------------
 The instructions for the Broken Sword games are for the Sold-Out
 Software versions, with each game on two CDs, since these were the
@@ -517,7 +540,7 @@ them. Hopefully they are general enough to be useful to other releases
 as well.
 
 
-3.7.1) Broken Sword games cutscenes:
+3.8.1) Broken Sword games cutscenes:
 ------ -----------------------------
 The cutscenes for the Broken Sword games have a bit of a history (see
 the next section, if you are interested), but in general all you need to
@@ -558,7 +581,7 @@ currently does not work when running PlayStation videos. (Broken Sword
 II already has subtitles; no extra work is needed for them.)
 
 
-3.7.2) Broken Sword games cutscenes, in retrospect:
+3.8.2) Broken Sword games cutscenes, in retrospect:
 ------ --------------------------------------------
 The original releases of the Broken Sword games used RAD Game Tools's
 Smacker(tm) format. As RAD was unwilling to open the older legacy
@@ -583,7 +606,7 @@ decoding MPEG movies added a lot of complexity, and they didn't look as
 good as the Smacker and DXA versions anyway.
 
 
-3.7.3) Broken Sword:
+3.8.3) Broken Sword:
 ------ -------------
 For this game, you will need all of the files from the clusters
 directories on both CDs. For the Windows and Macintosh versions, you
@@ -600,7 +623,7 @@ makes little difference. The PlayStation version requires tunes.dat and
 tunes.tab.
 
 
-3.7.4) Broken Sword II:
+3.8.4) Broken Sword II:
 ------ ----------------
 For this game, you will need all of the files from the clusters
 directories on both CDs. (Actually, a few of them may not be strictly
@@ -615,7 +638,7 @@ In addition, you will need the cd.inf and, optionally, the startup.inf
 files from the sword2 directory on CD 1.
 
 
-3.8) Beneath a Steel Sky notes:
+3.9) Beneath a Steel Sky notes:
 ---- --------------------------
 Starting with ScummVM 0.8.0 you need the additional 'SKY.CPT' file to
 run Beneath a Steel Sky.
@@ -626,7 +649,7 @@ files (SKY.DNR, SKY.DSK), in your extrapath, or in the directory where
 your ScummVM executable resides.
 
 
-3.9) Flight of the Amazon Queen notes:
+3.10) Flight of the Amazon Queen notes:
 ---- ---------------------------------
 In order to use a non-freeware version of Flight of the Amazon Queen
 (from original CD), you will need to place the 'queen.tbl' file
@@ -641,7 +664,7 @@ specific version, and thus removing the run-time dependency on the
 sound effects with MP3, OGG or FLAC.
 
 
-3.10) Gobliiins notes:
+3.11) Gobliiins notes:
 ----- ----------------
 The CD versions of the Gobliiins series contain one big audio track
 which you need to rip (see the section on using compressed audio files)
@@ -651,7 +674,7 @@ track and its volume is therefore changed with the music volume control
 as well.
 
 
-3.11) Inherit the Earth: Quest for the Orb notes:
+3.12) Inherit the Earth: Quest for the Orb notes:
 ----- -------------------------------------------
 In order to run the Mac OS X Wyrmkeep re-release of the game you will
 need to copy over data from the CD to your hard disk. If you're on a PC
@@ -671,14 +694,14 @@ format, as they should include both resource and data forks. Copy all
 'ITE *' files.
 
 
-3.12) Simon the Sorcerer 1 and 2 notes:
+3.13) Simon the Sorcerer 1 and 2 notes:
 ----- ---------------------------------
 If you have the dual version of Simon the Sorcerer 1 or 2 on CD, you
 will find the Windows version in the main directory of the CD and the
 DOS version in the DOS directory of the CD.
 
 
-3.13) The Feeble Files notes:
+3.14) The Feeble Files notes:
 ----- -----------------------
 If you have the Windows version of The Feeble Files, there are several
 things to note.
@@ -696,7 +719,7 @@ Rename voices.wav on CD3 to voices3.wav
 Rename voices.wav on CD4 to voices4.wav
 
 
-3.14) The Legend of Kyrandia notes:
+3.15) The Legend of Kyrandia notes:
 ----- -----------------------------
 To run The Legend of Kyrandia under ScummVM you need the 'kyra.dat'
 file. The file should always be included in official ScummVM packages.
@@ -707,7 +730,7 @@ thus you only need to grab it in case ScummVM complains about the file
 being missing.
 
 
-3.15) Sierra AGI games Predictive Input Dialog notes:
+3.16) Sierra AGI games Predictive Input Dialog notes:
 ----- -----------------------------------------------
 The Predictive Input Dialog is a ScummVM aid for running AGI engine
 games (which notoriously require command line input) on devices with
@@ -761,7 +784,7 @@ naturally mapping the functionality to the numeric keypad. Also, the
 dialog's buttons can be navigated with the arrow and the enter keys.
 
 
-3.16) Mickey's Space Adventure notes:
+3.17) Mickey's Space Adventure notes:
 ----- -------------------------------
 To run Mickey's Space Adventure under ScummVM, the original executable
 of the game (mickey.exe) is needed together with the game's data files.
@@ -776,7 +799,7 @@ game's screen to change location, similar to many adventure games, which
 is simpler and more straightforward than moving around using the menu.
 
 
-3.17) Winnie the Pooh notes:
+3.18) Winnie the Pooh notes:
 ----- ----------------------
 It is possible to import saved games from the original interpreter of the
 game into ScummVM.
@@ -791,14 +814,14 @@ game's screen to change location, similar to many adventure games, which
 is simpler and more straightforward than moving around using the menu.
 
 
-3.18) Troll's Tale notes:
+3.19) Troll's Tale notes:
 ----- -------------------
 The original game came in a PC booter disk, therefore it is necessary to
 dump the contents of that disk in an image file and name it "troll.img"
 to be able to play the game under ScummVM.
 
 
-3.19) Dragon History notes:
+3.20) Dragon History notes:
 ----- ---------------------
 There are 4 language variants of the game: Czech, English, Polish and
 German.  Each of them is distributed in a separate archive.  The only
@@ -816,7 +839,7 @@ All game files and the walkthrough can be downloaded from
 http://www.ucw.cz/draci-historie/index-en.html
 
 
-3.20) Simultaneous speech and subtitles in Sierra SCI games:
+3.21) Simultaneous speech and subtitles in Sierra SCI games:
 ----- ------------------------------------------------------
 Certain CD versions of Sierra SCI games had both speech and text
 resources. Some have an option to toggle between the two, but there are
@@ -864,7 +887,7 @@ Space Quest 4 CD:
     options dialog, or via ScummVM's audio options.
 
 
-3.21) Known Problems:
+3.22) Known Problems:
 ----- ---------------
 This release has the following known problems. There is no need to
 report them, although patches to fix them are welcome. If you discover a
-- 
cgit v1.2.3


From 1d596b023024abe7b4781803ee7442462719bcc8 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 4 Jan 2015 23:55:54 +0100
Subject: README: A (huge) update of compatible games

Somehow we missed to update it for ages!
---
 README | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 97 insertions(+), 20 deletions(-)

diff --git a/README b/README
index b78ee24dfd..e5a4229afd 100644
--- a/README
+++ b/README
@@ -201,7 +201,7 @@ SCUMM Games by LucasArts:
      The Dig                                     [dig]
      The Curse of Monkey Island                  [comi]
 
-AGI Games by Sierra:
+AGI and preAGI Games by Sierra:
      The Black Cauldron                          [bc]
      Gold Rush!                                  [goldrush]
      King's Quest I                              [kq1]
@@ -218,6 +218,9 @@ AGI Games by Sierra:
      Space Quest I: The Sarien Encounter         [sq1]
      Space Quest II: Vohaul's Revenge            [sq2]
      Fanmade Games                               [agi-fanmade]
+     Mickey's Space Adventure                    [mickey]
+     Troll's Tale                                [troll]
+     Winnie the Pooh in the Hundred Acre Wood    [winnie]
 
 AGOS Games by Adventuresoft/Horrorsoft:
      Elvira - Mistress of the Dark               [elvira1]
@@ -236,6 +239,13 @@ AGOS Games by Adventuresoft/Horrorsoft:
          - Swampy Adventures                     [swampy]
      The Feeble Files                            [feeble]
 
+Composer Games by Animation Magic:
+     Darby the Dragon                            [darby]
+     Gregory and the Hot Air Balloon             [gregory]
+     Magic Tales: Liam Finds a Story             [liam]
+     The Princess and the Crab                   [princess]
+     Sleeping Cub's Test of Courage              [sleepingcub]
+
 GOB Games by Coktel Vision:
      Bambou le sauveur de la jungle              [bambou]
      Bargon Attack                               [bargon]
@@ -251,6 +261,22 @@ GOB Games by Coktel Vision:
      Urban Runner                                [urban]
      Ween: The Prophecy                          [ween]
 
+Living Books Games:
+     Aesop's Fables: The Tortoise and the Hare   [tortoise]
+     Arthur's Birthday                           [arthurbday]
+     Arthur's Teacher Trouble                    [arthur]
+     Dr. Seuss's ABC                             [seussabc]
+     Green Eggs and Ham                          [greeneggs]
+     Harry and the Haunted House                 [harryhh]
+     Just Grandma and Me                         [grandma]
+     Little Monster at School                    [lilmonster]
+     Ruff's Bone                                 [ruff]
+     Sheila Rae, the Brave                       [sheila]
+     Stellaluna                                  [stellaluna]
+     The Berenstain Bears Get in a Fight         [bearfight]
+     The Berenstain Bears in the Dark            [beardark]
+     The New Kid on the Block                    [newkid]
+
 MADE Games by Activision:
      Leather Goddesses of Phobos 2               [lgop2]
      Return to Zork                              [rtz]
@@ -258,34 +284,102 @@ MADE Games by Activision:
      The Manhole                                 [manhole]
 
 Other Games:
+     3 Skulls of the Toltecs                     [toltecs]
+     Blue Force                                  [blueforce]
      Beneath a Steel Sky                         [sky]
      Broken Sword: The Shadow of the Templars    [sword1]
      Broken Sword II: The Smoking Mirror         [sword2]
+     Bud Tucker in Double Trouble                [tucker]
      Cruise for a Corpse                         [cruise]
      Discworld                                   [dw]
      Discworld 2: Missing Presumed ...!?         [dw2]
      Dragon History                              [draci]
      Drascula: The Vampire Strikes Back          [drascula]
+     DreamWeb                                    [dreamweb]
      Eye of the Beholder                         [eob]
      Eye of the Beholder II: The Legend of
          Darkmoon                                [eob2]
      Flight of the Amazon Queen                  [queen]
      Future Wars                                 [fw]
+     Hopkins FBI                                 [hopkins]
+     Hugo's House of Horrors                     [hugo1]
+     Hugo 2: Whodunit?                           [hugo2]
+     Hugo 3: Jungle of Doom                      [hugo3]
+     I Have No Mouth, and I Must Scream          [ihnm]
      Inherit the Earth: Quest for the Orb        [ite]
      Nippon Safes Inc.                           [nippon]
      Lands of Lore: The Throne of Chaos          [lol]
+     Lure of the Temptress                       [lure]
+     Mortville Manor                             [mortevielle]
+     Nippon Safes Inc.                           [nippon]
+     Ringworld: Revenge Of The Patriarch         [ringworld]
+     Return to Ringworld                         [ringworld2]
+     Sfinx                                       [sfinx]
+     Soltys                                      [soltys]
+     TeenAgent                                   [teenagent]
      The Journeyman Project: Pegasus Prime       [pegasus]
      The Legend of Kyrandia                      [kyra1]
      The Legend of Kyrandia: The Hand of Fate    [kyra2]
      The Legend of Kyrandia: Malcolm's Revenge   [kyra3]
+     The 7th Guest                               [t7g]
+     The Neverhood                               [neverhood]
+     Tony Tough and the Night of Roasted Moths   [tony]
+     Toonstruck                                  [toon]
      Touche: The Adventures of the Fifth
          Musketeer                               [touche]
+     Voyeur                                      [voyeur]
+
+SCI Games by Sierra Entertainment:
+     Castle of Dr. Brain                         [castlebrain]
+     Codename: ICEMAN                            [iceman]
+     Conquests of Camelot                        [camelot]
+     Conquests of the Longbow                    [longbow]
+     EcoQuest: The Search for Cetus              [ecoquest]
+     EcoQuest 2: Lost Secret of the Rainforest   [ecoquest2]
+     Freddy Pharkas: Frontier Pharmacist         [freddypharkas]
+     Hoyle's Book of Games 1                     [hoyle1]
+     Hoyle's Book of Games 2                     [hoyle2]
+     Hoyle's Book of Games 3                     [hoyle3]
+     Hoyle Classic Card Games                    [hoyle4]
+     Jones in the Fast Lane                      [jones]
+     King's Quest I                              [kq1sci]
+     King's Quest IV                             [kq4sci]
+     King's Quest V                              [kq5]
+     King's Quest VI                             [kq6]
+     Laura Bow: The Colonel's Bequest            [laurabow]
+     Laura Bow 2: The Dagger of Amon Ra          [laurabow2]
+     Leisure Suit Larry 1                        [lsl1sci]
+     Leisure Suit Larry 2                        [lsl2]
+     Leisure Suit Larry 3                        [lsl3]
+     Leisure Suit Larry 5                        [lsl5]
+     Leisure Suit Larry 6                        [lsl6]
+     Mixed-up Fairy Tales                        [fairytales]
+     Mixed-up Mother Goose                       [mothergoose]
+     Pepper's Adventures in Time                 [pepper]
+     Police Quest 1                              [pq1sci]
+     Police Quest 2                              [pq2]
+     Police Quest 3                              [pq3]
+     Quest for Glory 1/Hero's Quest              [qfg1]
+     Quest for Glory 1                           [qfg1vga]
+     Quest for Glory 2                           [qfg2]
+     Quest for Glory 3                           [qfg3]
+     Slater & Charlie Go Camping                 [slater]
+     Space Quest I                               [sq1sci]
+     Space Quest III                             [sq3]
+     Space Quest IV                              [sq4]
+     Space Quest V                               [sq5]
+     The Island of Dr. Brain                     [islandbrain]
+
+Wintermute Games:
+     Chivalry is Not Dead                        [chivalry]
 
 SCUMM Games by Humongous Entertainment:
      Backyard Baseball                           [baseball]
      Backyard Baseball 2001                      [baseball2001]
      Backyard Baseball 2003                      [baseball2003]
      Backyard Football                           [football]
+     Backyard Football 2002                      [football2002]
+     Bear Stormin'                               [brstorm]
      Big Thinkers First Grade                    [thinker1]
      Big Thinkers Kindergarten                   [thinkerk]
      Blue's 123 Time Activities                  [Blues123Time]
@@ -310,6 +404,7 @@ SCUMM Games by Humongous Entertainment:
      Let's Explore the Airport with Buzzy        [airport]
      Let's Explore the Farm with Buzzy           [farm]
      Let's Explore the Jungle with Buzzy         [jungle]
+     Pajama Sam: Games to Play on Any Day        [pjgames]
      Pajama Sam 1: No Need to Hide When It's
          Dark Outside                            [pajama]
      Pajama Sam 2: Thunder and Lightning
@@ -334,38 +429,20 @@ SCUMM Games by Humongous Entertainment:
      SPY Fox in Cheese Chase                     [chase]
      SPY Fox in Hold the Mustard                 [mustard]
 
-Living Books Games:
-     Aesop's Fables: The Tortoise and the Hare   [tortoise]
-     Arthur's Birthday                           [arthurbday]
-     Arthur's Teacher Trouble                    [arthur]
-     Dr. Seuss's ABC                             [seussabc]
-     Green Eggs and Ham                          [greeneggs]
-     Harry and the Haunted House                 [harryhh]
-     Just Grandma and Me                         [grandma]
-     Little Monster at School                    [lilmonster]
-     Ruff's Bone                                 [ruff]
-     Sheila Rae, the Brave                       [sheila]
-     Stellaluna                                  [stellaluna]
-     The Berenstain Bears Get in a Fight         [bearfight]
-     The Berenstain Bears in the Dark            [beardark]
-     The New Kid on the Block                    [newkid]
-
 The following games should load, but are not yet fully playable. Play
 these at your own risk, and please do not file bug reports about them.
 If you want the latest updates on game compatibility, visit our web site
 and view the compatibility chart.
 
-     Backyard Football 2002                      [football2002]
      Backyard Soccer                             [soccer]
      Backyard Soccer MLS                         [soccermls]
      Backyard Soccer 2004                        [soccer2004]
      Blue's Treasure Hunt                        [BluesTreasureHunt]
-     Pajama Sam: Games to Play on Any Day        [pjgames]
 
 The following games are based on the SCUMM engine, but NOT supported
 by ScummVM (yet):
 
-     Other Humongous Entertainment games
+     Moonbase Commander
 
 Please be aware that the engines may contain bugs and unimplemented
 features that sometimes make it impossible to finish the game. Save
-- 
cgit v1.2.3


From 02e3e82e8210abe9f496f978917c9b134b5e0ad9 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Mon, 5 Jan 2015 22:33:19 +1100
Subject: SCUMM: Correct game flags for HE72 version of Putt-Putt Saves the
 Zoo.

---
 engines/scumm/detection_tables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 82a8b4452b..6eab5c752f 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -310,7 +310,7 @@ static const GameSettings gameVariantsTable[] = {
 	// Changed o_getResourceSize to cover all resource types
 	{"farm", "", 0, GID_HEGAME, 6, 73, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"puttzoo", "", 0, GID_PUTTZOO, 6, 73, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
-	{"puttzoo", "HE 72", 0, GID_PUTTZOO, 6, 72, MDT_NONE, GF_USE_KEY | GF_HE_985, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
+	{"puttzoo", "HE 72", 0, GID_PUTTZOO, 6, 72, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"puttzoo", "HE 98.5", 0, GID_PUTTZOO, 6, 98, MDT_NONE, GF_USE_KEY | GF_HE_985, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"puttzoo", "HE 99", 0, GID_PUTTZOO, 6, 99, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"puttzoo", "HE 100", 0, GID_PUTTZOO, 6, 100, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
-- 
cgit v1.2.3


From 7225101e6257d0574fb94be8a6016a3b67a09855 Mon Sep 17 00:00:00 2001
From: Fedor Strizhnev
Date: Mon, 5 Jan 2015 16:53:35 +0300
Subject: Add Theora support to systems which use libtremor

---
 video/theora_decoder.cpp | 4 ++++
 video/theora_decoder.h   | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp
index cb6289bd60..ba596c6032 100644
--- a/video/theora_decoder.cpp
+++ b/video/theora_decoder.cpp
@@ -360,7 +360,11 @@ static double rint(double v) {
 }
 
 bool TheoraDecoder::VorbisAudioTrack::decodeSamples() {
+#ifdef USE_TREMOR
+	ogg_int32_t **pcm;
+#else
 	float **pcm;
+#endif
 
 	// if there's pending, decoded audio, grab it
 	int ret = vorbis_synthesis_pcmout(&_vorbisDSP, &pcm);
diff --git a/video/theora_decoder.h b/video/theora_decoder.h
index feb4c6b49e..5b683cf6af 100644
--- a/video/theora_decoder.h
+++ b/video/theora_decoder.h
@@ -33,7 +33,12 @@
 #include "graphics/surface.h"
 
 #include <theora/theoradec.h>
+
+#ifdef USE_TREMOR
+#include <tremor/ivorbiscodec.h>
+#else
 #include <vorbis/codec.h>
+#endif
 
 namespace Common {
 class SeekableReadStream;
-- 
cgit v1.2.3


From 59934881a1dc27e0c6030d2133ec3f9aae583df7 Mon Sep 17 00:00:00 2001
From: Joel Teichroeb
Date: Mon, 5 Jan 2015 20:14:17 -0800
Subject: ANDROID: Remove unpacker and fix support for non arm

---
 backends/platform/android/android.cpp              |  12 -
 backends/platform/android/android.h                |   8 -
 backends/platform/android/android.mk               |   6 +-
 backends/platform/android/jni.cpp                  |  46 ---
 backends/platform/android/jni.h                    |   2 -
 .../org/scummvm/scummvm/PluginProvider.java        |  63 ----
 .../android/org/scummvm/scummvm/ScummVM.java       |   7 +-
 .../org/scummvm/scummvm/ScummVMActivity.java       |   7 -
 .../org/scummvm/scummvm/ScummVMApplication.java    |  31 --
 .../android/org/scummvm/scummvm/Unpacker.java      | 388 ---------------------
 configure                                          |   2 +
 dists/android/AndroidManifest.xml                  |  19 +-
 dists/android/AndroidManifest.xml.in               |  19 +-
 dists/android/jni/Android.mk                       |   2 +-
 dists/android/mkplugin.sh                          |  16 -
 dists/android/plugin-manifest.xml                  |  35 --
 dists/android/plugin-manifest.xml.in               |  35 --
 dists/android/plugin-strings.xml                   |   6 -
 dists/android/res/drawable/gradient.xml            |   7 -
 dists/android/res/layout/splash.xml                |  19 -
 20 files changed, 8 insertions(+), 722 deletions(-)
 delete mode 100644 backends/platform/android/org/scummvm/scummvm/PluginProvider.java
 delete mode 100644 backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
 delete mode 100644 backends/platform/android/org/scummvm/scummvm/Unpacker.java
 delete mode 100755 dists/android/mkplugin.sh
 delete mode 100644 dists/android/plugin-manifest.xml
 delete mode 100644 dists/android/plugin-manifest.xml.in
 delete mode 100644 dists/android/plugin-strings.xml
 delete mode 100644 dists/android/res/drawable/gradient.xml
 delete mode 100644 dists/android/res/layout/splash.xml

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 3ff1b939ef..798772cc24 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -396,12 +396,6 @@ void OSystem_Android::initBackend() {
 	EventsBaseBackend::initBackend();
 }
 
-void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const {
-	ENTER();
-
-	JNI::getPluginDirectories(dirs);
-}
-
 bool OSystem_Android::hasFeature(Feature f) {
 	return (f == kFeatureFullscreenMode ||
 			f == kFeatureAspectRatioCorrection ||
@@ -600,10 +594,4 @@ Common::String OSystem_Android::getSystemProperty(const char *name) const {
 	return Common::String(value, len);
 }
 
-#ifdef DYNAMIC_MODULES
-void AndroidPluginProvider::addCustomDirectories(Common::FSList &dirs) const {
-	((OSystem_Android *)g_system)->addPluginDirectories(dirs);
-}
-#endif
-
 #endif
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 28016f5e3e..ade84dd42d 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -96,13 +96,6 @@ extern void checkGlError(const char *expr, const char *file, int line);
 #define GLTHREADCHECK do {  } while (false)
 #endif
 
-#ifdef DYNAMIC_MODULES
-class AndroidPluginProvider : public POSIXPluginProvider {
-protected:
-	virtual void addCustomDirectories(Common::FSList &dirs) const;
-};
-#endif
-
 class OSystem_Android : public EventsBaseBackend, public PaletteManager {
 private:
 	// passed from the dark side
@@ -177,7 +170,6 @@ public:
 	virtual ~OSystem_Android();
 
 	virtual void initBackend();
-	void addPluginDirectories(Common::FSList &dirs) const;
 	void enableZoning(bool enable) { _enable_zoning = enable; }
 
 	virtual bool hasFeature(Feature f);
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index f9a2bc9813..5be9f86770 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -5,7 +5,7 @@ ANDROID_VERSIONCODE = 6
 
 ANDROID_TARGET_VERSION = 14
 
-NDK_BUILD = $(ANDROID_NDK)/ndk-build
+NDK_BUILD = $(ANDROID_NDK)/ndk-build APP_ABI=$(ABI)
 SDK_ANDROID = $(ANDROID_SDK)/tools/android
 
 PATH_DIST = $(srcdir)/dists/android
@@ -18,8 +18,6 @@ RESOURCES = \
 	$(PATH_BUILD_RES)/values/strings.xml \
 	$(PATH_BUILD_RES)/values-television/margins.xml \
 	$(PATH_BUILD_RES)/layout/main.xml \
-	$(PATH_BUILD_RES)/layout/splash.xml \
-	$(PATH_BUILD_RES)/drawable/gradient.xml \
 	$(PATH_BUILD_RES)/drawable/scummvm.png \
 	$(PATH_BUILD_RES)/drawable/scummvm_big.png \
 	$(PATH_BUILD_RES)/drawable-xhdpi/ouya_icon.png
@@ -30,7 +28,7 @@ DIST_BUILD_XML = $(PATH_DIST)/custom_rules.xml
 PATH_BUILD = ./build.tmp
 PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
 PATH_BUILD_RES = $(PATH_BUILD)/res
-PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/mylib/armeabi/libscummvm.so
+PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/lib/$(ABI)/libscummvm.so
 
 FILE_MANIFEST_SRC = $(srcdir)/dists/android/AndroidManifest.xml
 FILE_MANIFEST = $(PATH_BUILD)/AndroidManifest.xml
diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index 764c84ce1c..22e6a749c2 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -79,7 +79,6 @@ jmethodID JNI::_MID_displayMessageOnOSD = 0;
 jmethodID JNI::_MID_setWindowCaption = 0;
 jmethodID JNI::_MID_showVirtualKeyboard = 0;
 jmethodID JNI::_MID_getSysArchives = 0;
-jmethodID JNI::_MID_getPluginDirectories = 0;
 jmethodID JNI::_MID_initSurface = 0;
 jmethodID JNI::_MID_deinitSurface = 0;
 
@@ -293,46 +292,6 @@ void JNI::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
 	}
 }
 
-void JNI::getPluginDirectories(Common::FSList &dirs) {
-	JNIEnv *env = JNI::getEnv();
-
-	jobjectArray array =
-		(jobjectArray)env->CallObjectMethod(_jobj, _MID_getPluginDirectories);
-
-	if (env->ExceptionCheck()) {
-		LOGE("Error finding plugin directories");
-
-		env->ExceptionDescribe();
-		env->ExceptionClear();
-
-		return;
-	}
-
-	jsize size = env->GetArrayLength(array);
-	for (jsize i = 0; i < size; ++i) {
-		jstring path_obj = (jstring)env->GetObjectArrayElement(array, i);
-
-		if (path_obj == 0)
-			continue;
-
-		const char *path = env->GetStringUTFChars(path_obj, 0);
-
-		if (path == 0) {
-			LOGE("Error getting string characters from plugin directory");
-
-			env->ExceptionClear();
-			env->DeleteLocalRef(path_obj);
-
-			continue;
-		}
-
-		dirs.push_back(Common::FSNode(path));
-
-		env->ReleaseStringUTFChars(path_obj, path);
-		env->DeleteLocalRef(path_obj);
-	}
-}
-
 bool JNI::initSurface() {
 	JNIEnv *env = JNI::getEnv();
 
@@ -454,7 +413,6 @@ void JNI::create(JNIEnv *env, jobject self, jobject asset_manager,
 	FIND_METHOD(, displayMessageOnOSD, "(Ljava/lang/String;)V");
 	FIND_METHOD(, showVirtualKeyboard, "(Z)V");
 	FIND_METHOD(, getSysArchives, "()[Ljava/lang/String;");
-	FIND_METHOD(, getPluginDirectories, "()[Ljava/lang/String;");
 	FIND_METHOD(, initSurface, "()Ljavax/microedition/khronos/egl/EGLSurface;");
 	FIND_METHOD(, deinitSurface, "()V");
 
@@ -543,10 +501,6 @@ jint JNI::main(JNIEnv *env, jobject self, jobjectArray args) {
 		env->DeleteLocalRef(arg);
 	}
 
-#ifdef DYNAMIC_MODULES
-	PluginManager::instance().addPluginProvider(new AndroidPluginProvider());
-#endif
-
 	LOGI("Entering scummvm_main with %d args", argc);
 
 	res = scummvm_main(argc, argv);
diff --git a/backends/platform/android/jni.h b/backends/platform/android/jni.h
index 326869b1ee..70feaaf72a 100644
--- a/backends/platform/android/jni.h
+++ b/backends/platform/android/jni.h
@@ -55,7 +55,6 @@ public:
 
 	static void setReadyForEvents(bool ready);
 
-	static void getPluginDirectories(Common::FSList &dirs);
 	static void setWindowCaption(const char *caption);
 	static void getDPI(float *values);
 	static void displayMessageOnOSD(const char *msg);
@@ -93,7 +92,6 @@ private:
 	static jmethodID _MID_setWindowCaption;
 	static jmethodID _MID_showVirtualKeyboard;
 	static jmethodID _MID_getSysArchives;
-	static jmethodID _MID_getPluginDirectories;
 	static jmethodID _MID_initSurface;
 	static jmethodID _MID_deinitSurface;
 
diff --git a/backends/platform/android/org/scummvm/scummvm/PluginProvider.java b/backends/platform/android/org/scummvm/scummvm/PluginProvider.java
deleted file mode 100644
index e27e8d41a8..0000000000
--- a/backends/platform/android/org/scummvm/scummvm/PluginProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.scummvm.scummvm;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-
-import java.util.ArrayList;
-
-public class PluginProvider extends BroadcastReceiver {
-	private final static String LOG_TAG = "ScummVM";
-
-	public final static String META_UNPACK_LIB =
-		"org.scummvm.scummvm.meta.UNPACK_LIB";
-
-	public void onReceive(Context context, Intent intent) {
-		if (!intent.getAction().equals(ScummVMApplication.ACTION_PLUGIN_QUERY))
-			return;
-
-		Bundle extras = getResultExtras(true);
-
-		final ActivityInfo info;
-		final PackageInfo pinfo;
-		try {
-			info = context.getPackageManager()
-				.getReceiverInfo(new ComponentName(context, this.getClass()),
-									PackageManager.GET_META_DATA);
-			pinfo = context.getPackageManager()
-				.getPackageInfo(context.getPackageName(), 0);
-		} catch (PackageManager.NameNotFoundException e) {
-			Log.e(LOG_TAG, "Error finding my own info?", e);
-			return;
-		}
-
-		String host_version = extras.getString(ScummVMApplication.EXTRA_VERSION);
-		if (!pinfo.versionName.equals(host_version)) {
-			Log.e(LOG_TAG, "Plugin version " + pinfo.versionName + " is not equal to ScummVM version " + host_version);
-			return;
-		}
-
-		String mylib = info.metaData.getString(META_UNPACK_LIB);
-		if (mylib != null) {
-			ArrayList<String> all_libs =
-				extras.getStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS);
-			all_libs.add(new Uri.Builder()
-							.scheme("plugin")
-							.authority(context.getPackageName())
-							.path(mylib)
-							.toString());
-
-			extras.putStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS,
-										all_libs);
-		}
-
-		setResultExtras(extras);
-	}
-}
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
index 5047502e61..3b370a583d 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
@@ -54,7 +54,6 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
 	abstract protected void getDPI(float[] values);
 	abstract protected void displayMessageOnOSD(String msg);
 	abstract protected void setWindowCaption(String caption);
-	abstract protected String[] getPluginDirectories();
 	abstract protected void showVirtualKeyboard(boolean enable);
 	abstract protected String[] getSysArchives();
 
@@ -444,10 +443,6 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
 			}
 		}
 
-		File cache_dir = ScummVMApplication.getLastCacheDir();
-		String libname = System.mapLibraryName("scummvm");
-		File libpath = new File(cache_dir, libname);
-
-		System.load(libpath.getPath());
+		System.loadLibrary("scummvm");
 	}
 }
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index f4eb7ddd0b..5b2dcae175 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -83,13 +83,6 @@ public class ScummVMActivity extends Activity {
 				});
 		}
 
-		@Override
-		protected String[] getPluginDirectories() {
-			String[] dirs = new String[1];
-			dirs[0] = ScummVMApplication.getLastCacheDir().getPath();
-			return dirs;
-		}
-
 		@Override
 		protected void showVirtualKeyboard(final boolean enable) {
 			runOnUiThread(new Runnable() {
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java b/backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
deleted file mode 100644
index 0adc166222..0000000000
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.scummvm.scummvm;
-
-import android.app.Application;
-
-import java.io.File;
-
-public class ScummVMApplication extends Application {
-	public final static String ACTION_PLUGIN_QUERY = "org.scummvm.scummvm.action.PLUGIN_QUERY";
-	public final static String EXTRA_UNPACK_LIBS = "org.scummvm.scummvm.extra.UNPACK_LIBS";
-	public final static String EXTRA_VERSION = "org.scummvm.scummvm.extra.VERSION";
-
-	private static File _cache_dir;
-
-	@Override
-	public void onCreate() {
-		super.onCreate();
-
-		// This is still on /data :(
-		_cache_dir = getCacheDir();
-		// This is mounted noexec :(
-		//cache_dir = new File(Environment.getExternalStorageDirectory(),
-		//				"/.ScummVM.tmp");
-		// This is owned by download manager and requires special
-		// permissions to access :(
-		//cache_dir = Environment.getDownloadCacheDirectory();
-	}
-
-	public static File getLastCacheDir() {
-		return _cache_dir;
-	}
-}
diff --git a/backends/platform/android/org/scummvm/scummvm/Unpacker.java b/backends/platform/android/org/scummvm/scummvm/Unpacker.java
deleted file mode 100644
index da76ceb5e5..0000000000
--- a/backends/platform/android/org/scummvm/scummvm/Unpacker.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.scummvm.scummvm;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.ProgressBar;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
-
-public class Unpacker extends Activity {
-	protected final static String LOG_TAG = "ScummVM";
-	// TODO don't hardcode this
-	private final static boolean PLUGINS_ENABLED = false;
-	private final static String META_NEXT_ACTIVITY =
-		"org.scummvm.unpacker.nextActivity";
-	private ProgressBar mProgress;
-	private File mUnpackDest;  // location to unpack into
-	private AsyncTask<String, Integer, Void> mUnpacker;
-	private final static int REQUEST_MARKET = 1;
-
-	// Android 3.1+ only
-	public static final int FLAG_INCLUDE_STOPPED_PACKAGES = 32;
-
-	private static class UnpackJob {
-		public ZipFile zipfile;
-		public Set<String> paths;
-
-		public UnpackJob(ZipFile zipfile, Set<String> paths) {
-			this.zipfile = zipfile;
-			this.paths = paths;
-		}
-
-		public long UnpackSize() {
-			long size = 0;
-			for (String path: paths) {
-				ZipEntry entry = zipfile.getEntry(path);
-				if (entry != null) size += entry.getSize();
-			}
-			return size;
-		}
-	}
-
-	private class UnpackTask extends AsyncTask<String, Integer, Void> {
-		@Override
-		protected void onProgressUpdate(Integer... progress) {
-			mProgress.setIndeterminate(false);
-			mProgress.setMax(progress[1]);
-			mProgress.setProgress(progress[0]);
-			mProgress.postInvalidate();
-		}
-
-		@Override
-		protected void onPostExecute(Void result) {
-			Bundle md = getMetaData();
-			String nextActivity = md.getString(META_NEXT_ACTIVITY);
-			if (nextActivity != null) {
-				final ComponentName cn =
-					ComponentName.unflattenFromString(nextActivity);
-				if (cn != null) {
-					final Intent origIntent = getIntent();
-					Intent intent = new Intent();
-					intent.setComponent(cn);
-					if (origIntent.getExtras() != null)
-						intent.putExtras(origIntent.getExtras());
-					intent.putExtra(Intent.EXTRA_INTENT, origIntent);
-					intent.setDataAndType(origIntent.getData(),
-										  origIntent.getType());
-					//intent.fillIn(getIntent(), 0);
-					intent.addFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
-					Log.i(LOG_TAG,
-						  "Starting next activity with intent " + intent);
-					startActivity(intent);
-				} else {
-					Log.w(LOG_TAG,
-						  "Unable to extract a component name from " + nextActivity);
-				}
-			}
-
-			finish();
-		}
-
-		@Override
-		protected Void doInBackground(String... all_libs) {
-			// This will contain all unpack jobs
-			Map<String, UnpackJob> unpack_jobs =
-				new HashMap<String, UnpackJob>(all_libs.length);
-
-			// This will contain all unpack filenames (so we can
-			// detect stale files in the unpack directory)
-			Set<String> all_files = new HashSet<String>(all_libs.length);
-
-			for (String lib: all_libs) {
-				final Uri uri = Uri.parse(lib);
-				final String pkg = uri.getAuthority();
-				final String path = uri.getPath().substring(1); // skip first /
-
-				all_files.add(new File(path).getName());
-
-				UnpackJob job = unpack_jobs.get(pkg);
-				if (job == null) {
-					try {
-						// getPackageResourcePath is hidden in Context,
-						// but exposed in ContextWrapper...
-						ContextWrapper context =
-							new ContextWrapper(createPackageContext(pkg, 0));
-						ZipFile zipfile =
-							new ZipFile(context.getPackageResourcePath());
-						job = new UnpackJob(zipfile, new HashSet<String>(1));
-					} catch (PackageManager.NameNotFoundException e) {
-						Log.e(LOG_TAG, "Package " + pkg +
-							  " not found", e);
-						continue;
-					} catch (IOException e) {
-						// FIXME: show some sort of GUI error dialog
-						Log.e(LOG_TAG,
-							  "Error opening ZIP for package " + pkg, e);
-						continue;
-					}
-					unpack_jobs.put(pkg, job);
-				}
-				job.paths.add(path);
-			}
-
-			// Delete stale filenames from mUnpackDest
-			for (File file: mUnpackDest.listFiles()) {
-				if (!all_files.contains(file.getName())) {
-					Log.i(LOG_TAG,
-						  "Deleting stale cached file " + file);
-					file.delete();
-				}
-			}
-
-			int total_size = 0;
-			for (UnpackJob job: unpack_jobs.values())
-				total_size += job.UnpackSize();
-
-			publishProgress(0, total_size);
-
-			mUnpackDest.mkdirs();
-
-			int progress = 0;
-
-			for (UnpackJob job: unpack_jobs.values()) {
-				try {
-					ZipFile zipfile = job.zipfile;
-					for (String path: job.paths) {
-						ZipEntry zipentry = zipfile.getEntry(path);
-						if (zipentry == null)
-							throw new FileNotFoundException(
-															"Couldn't find " + path + " in zip");
-						File dest = new File(mUnpackDest, new File(path).getName());
-						if (dest.exists() &&
-							dest.lastModified() == zipentry.getTime() &&
-							dest.length() == zipentry.getSize()) {
-							// Already unpacked
-							progress += zipentry.getSize();
-						} else {
-							if (dest.exists())
-								Log.d(LOG_TAG,
-									  "Replacing " + dest.getPath() +
-									  " old.mtime=" + dest.lastModified() +
-									  " new.mtime=" + zipentry.getTime() +
-									  " old.size=" + dest.length() +
-									  " new.size=" + zipentry.getSize());
-							else
-								Log.i(LOG_TAG,
-									  "Extracting " + zipentry.getName() +
-									  " from " + zipfile.getName() +
-									  " to " + dest.getPath());
-
-							long next_update = progress;
-
-							InputStream in = zipfile.getInputStream(zipentry);
-							OutputStream out = new FileOutputStream(dest);
-							int len;
-							byte[] buffer = new byte[4096];
-							while ((len = in.read(buffer)) != -1) {
-								out.write(buffer, 0, len);
-								progress += len;
-								if (progress >= next_update) {
-									publishProgress(progress, total_size);
-									// Arbitrary limit of 2% update steps
-									next_update += total_size / 50;
-								}
-							}
-
-							in.close();
-							out.close();
-							dest.setLastModified(zipentry.getTime());
-						}
-						publishProgress(progress, total_size);
-					}
-
-					zipfile.close();
-				} catch (IOException e) {
-					// FIXME: show some sort of GUI error dialog
-					Log.e(LOG_TAG, "Error unpacking plugin", e);
-				}
-			}
-
-			if (progress != total_size)
-				Log.d(LOG_TAG, "Ended with progress " + progress +
-					  " != total size " + total_size);
-
-			setResult(RESULT_OK);
-
-			return null;
-		}
-	}
-
-	private class PluginBroadcastReciever extends BroadcastReceiver {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			if (!intent.getAction()
-				.equals(ScummVMApplication.ACTION_PLUGIN_QUERY)) {
-				Log.e(LOG_TAG,
-					  "Received unexpected action " + intent.getAction());
-				return;
-			}
-
-			Bundle extras = getResultExtras(false);
-			if (extras == null) {
-				// Nothing for us to do.
-				Unpacker.this.setResult(RESULT_OK);
-				finish();
-			}
-
-			ArrayList<String> unpack_libs =
-				extras.getStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS);
-
-			if (unpack_libs != null && !unpack_libs.isEmpty()) {
-				final String[] libs =
-					unpack_libs.toArray(new String[unpack_libs.size()]);
-				mUnpacker = new UnpackTask().execute(libs);
-			}
-		}
-	}
-
-	private void initPlugins() {
-		Bundle extras = new Bundle(1);
-
-		ArrayList<String> unpack_libs = new ArrayList<String>(1);
-		// This is the common ScummVM code (not really a "plugin" as such)
-		unpack_libs.add(new Uri.Builder()
-						.scheme("plugin")
-						.authority(getPackageName())
-						.path("mylib/armeabi/libscummvm.so")
-						.toString());
-		extras.putStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS,
-								  unpack_libs);
-
-		final PackageInfo info;
-		try {
-			info = getPackageManager().getPackageInfo(getPackageName(), 0);
-		} catch (PackageManager.NameNotFoundException e) {
-			Log.e(LOG_TAG, "Error finding my own info?", e);
-			return;
-		}
-		extras.putString(ScummVMApplication.EXTRA_VERSION, info.versionName);
-
-		Intent intent = new Intent(ScummVMApplication.ACTION_PLUGIN_QUERY);
-		// Android 3.1 defaults to FLAG_EXCLUDE_STOPPED_PACKAGES, and since
-		// none of our plugins will ever be running, that is not helpful
-		intent.setFlags(FLAG_INCLUDE_STOPPED_PACKAGES);
-		sendOrderedBroadcast(intent, Manifest.permission.SCUMMVM_PLUGIN,
-							 new PluginBroadcastReciever(),
-							 null, RESULT_OK, null, extras);
-	}
-
-	@Override
-	public void onCreate(Bundle b) {
-		super.onCreate(b);
-
-		mUnpackDest = ScummVMApplication.getLastCacheDir();
-
-		setContentView(R.layout.splash);
-		mProgress = (ProgressBar)findViewById(R.id.progress);
-
-		setResult(RESULT_CANCELED);
-
-		tryUnpack();
-	}
-
-	private void tryUnpack() {
-		Intent intent = new Intent(ScummVMApplication.ACTION_PLUGIN_QUERY);
-		List<ResolveInfo> plugins = getPackageManager()
-			.queryBroadcastReceivers(intent, 0);
-		if (PLUGINS_ENABLED && plugins.isEmpty()) {
-			// No plugins installed
-			AlertDialog.Builder alert = new AlertDialog.Builder(this)
-				.setTitle(R.string.no_plugins_title)
-				.setMessage(R.string.no_plugins_found)
-				.setIcon(android.R.drawable.ic_dialog_alert)
-				.setOnCancelListener(new DialogInterface.OnCancelListener() {
-						public void onCancel(DialogInterface dialog) {
-							finish();
-						}
-					})
-				.setNegativeButton(R.string.quit,
-								   new DialogInterface.OnClickListener() {
-									   public void onClick(DialogInterface dialog, int which) {
-										   finish();
-									   }
-								   });
-
-			final Uri uri = Uri.parse("market://search?q=ScummVM plugin");
-			final Intent market_intent = new Intent(Intent.ACTION_VIEW, uri);
-			if (getPackageManager().resolveActivity(market_intent, 0) != null) {
-				alert.setPositiveButton(R.string.to_market,
-										new DialogInterface.OnClickListener() {
-											public void onClick(DialogInterface dialog, int which) {
-												dialog.dismiss();
-												try {
-													startActivityForResult(market_intent,
-																		   REQUEST_MARKET);
-												} catch (ActivityNotFoundException e) {
-													Log.e(LOG_TAG,
-														  "Error starting market", e);
-												}
-											}
-										});
-			}
-
-			alert.show();
-
-		} else {
-			// Already have at least one plugin installed
-			initPlugins();
-		}
-	}
-
-	@Override
-	public void onStop() {
-		if (mUnpacker != null)
-			mUnpacker.cancel(true);
-		super.onStop();
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode,
-										Intent data) {
-		switch (requestCode) {
-		case REQUEST_MARKET:
-			if (resultCode != RESULT_OK)
-				Log.w(LOG_TAG, "Market returned " + resultCode);
-			tryUnpack();
-			break;
-		}
-	}
-
-	private Bundle getMetaData() {
-		try {
-			ActivityInfo ai = getPackageManager()
-				.getActivityInfo(getComponentName(), PackageManager.GET_META_DATA);
-			return ai.metaData;
-		} catch (PackageManager.NameNotFoundException e) {
-			Log.w(LOG_TAG, "Unable to find my own meta-data", e);
-			return new Bundle();
-		}
-	}
-}
diff --git a/configure b/configure
index 7c4c87e3af..5f73d77242 100755
--- a/configure
+++ b/configure
@@ -4533,6 +4533,8 @@ WIN32PATH=$_win32path
 AMIGAOSPATH=$_amigaospath
 STATICLIBPATH=$_staticlibpath
 
+ABI := $ABI
+
 BACKEND := $_backend
 MODULES += $MODULES
 MODULE_DIRS += $MODULE_DIRS
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index db8a9adc54..ba1046e85c 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -5,7 +5,6 @@
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="1.8.0git"
-		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
@@ -13,7 +12,7 @@
 	<uses-sdk android:minSdkVersion="3"
 			android:targetSdkVersion="8"/>
 
-	<application android:name=".ScummVMApplication"
+	<application
 			android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
@@ -22,17 +21,6 @@
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden"
 				android:windowSoftInputMode="adjustResize">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-			</intent-filter>
-		</activity>
-
-		<activity android:name=".Unpacker"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape"
-				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.scummvm.unpacker.nextActivity"
-				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -41,11 +29,6 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
-		android:label="@string/scummvm_perm_plugin_label"
-		android:description="@string/scummvm_perm_plugin_desc"
-		android:protectionLevel="signature"/>
-
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
 	<!-- Always needs some sort of qwerty keyboard.
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index bf45ffcc0e..d90e282e3d 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -5,7 +5,6 @@
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="@VERSION@"
-		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
@@ -13,7 +12,7 @@
 	<uses-sdk android:minSdkVersion="3"
 			android:targetSdkVersion="8"/>
 
-	<application android:name=".ScummVMApplication"
+	<application
 			android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
@@ -22,17 +21,6 @@
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden"
 				android:windowSoftInputMode="adjustResize">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-			</intent-filter>
-		</activity>
-
-		<activity android:name=".Unpacker"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape"
-				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.scummvm.unpacker.nextActivity"
-				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -41,11 +29,6 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
-		android:label="@string/scummvm_perm_plugin_label"
-		android:description="@string/scummvm_perm_plugin_desc"
-		android:protectionLevel="signature"/>
-
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
 	<!-- Always needs some sort of qwerty keyboard.
diff --git a/dists/android/jni/Android.mk b/dists/android/jni/Android.mk
index d5b398412f..0b3ee4d22e 100644
--- a/dists/android/jni/Android.mk
+++ b/dists/android/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-APP_ABI := armeabi
+APP_ABI := $(ABI)
 LOCAL_MODULE := scummvm
 LOCAL_SRC_FILES := ../libscummvm.so
 
diff --git a/dists/android/mkplugin.sh b/dists/android/mkplugin.sh
deleted file mode 100755
index 30a7ef66d6..0000000000
--- a/dists/android/mkplugin.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 5 ]; then
-	echo "usage: $0 configure plugin template versioncode target"
-	exit 1
-fi
-
-CONFIGURE=$1
-PLUGIN_NAME=$2
-TEMPLATE=$3
-PLUGIN_VERSION_CODE=$4
-TARGET=$5
-
-PLUGIN_DESC=`sed -n "s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p" < $CONFIGURE`
-
-sed "s|@PLUGIN_NAME@|$PLUGIN_NAME|;s|@PLUGIN_VERSION_CODE@|$PLUGIN_VERSION_CODE|;s|@PLUGIN_DESC@|$PLUGIN_DESC|" < $TEMPLATE > $TARGET
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
deleted file mode 100644
index 040d1ea57c..0000000000
--- a/dists/android/plugin-manifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
-		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="1.8.0git"
-		android:installLocation="preferExternal"
-		android:sharedUserId="org.scummvm.scummvm">
-
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
-
-	<application android:label="@string/app_name"
-			android:description="@string/app_desc"
-			android:icon="@drawable/scummvm">
-		<receiver android:name="org.scummvm.scummvm.PluginProvider"
-				android:process="org.scummvm.scummvm">
-			<intent-filter>
-				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
-				<category android:name="android.intent.category.INFO"/>
-			</intent-filter>
-			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
-					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
-		</receiver>
-	</application>
-
-	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
-	<uses-configuration android:reqFiveWayNav="true"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="finger"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
-</manifest>
diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in
deleted file mode 100644
index 4b429097ae..0000000000
--- a/dists/android/plugin-manifest.xml.in
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
-		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="@VERSION@"
-		android:installLocation="preferExternal"
-		android:sharedUserId="org.scummvm.scummvm">
-
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
-
-	<application android:label="@string/app_name"
-			android:description="@string/app_desc"
-			android:icon="@drawable/scummvm">
-		<receiver android:name="org.scummvm.scummvm.PluginProvider"
-				android:process="org.scummvm.scummvm">
-			<intent-filter>
-				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
-				<category android:name="android.intent.category.INFO"/>
-			</intent-filter>
-			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
-					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
-		</receiver>
-	</application>
-
-	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
-	<uses-configuration android:reqFiveWayNav="true"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="finger"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
-</manifest>
diff --git a/dists/android/plugin-strings.xml b/dists/android/plugin-strings.xml
deleted file mode 100644
index ade37e0aca..0000000000
--- a/dists/android/plugin-strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-	<string name="app_name">ScummVM plugin: "@PLUGIN_NAME@"</string>
-	<string name="app_desc">Game engine for: @PLUGIN_DESC@</string>
-</resources>
diff --git a/dists/android/res/drawable/gradient.xml b/dists/android/res/drawable/gradient.xml
deleted file mode 100644
index dbfd9b5b34..0000000000
--- a/dists/android/res/drawable/gradient.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-      android:startColor="#e9bb8b"
-      android:endColor="#d16e09"
-      android:angle="315" />
-</shape>
diff --git a/dists/android/res/layout/splash.xml b/dists/android/res/layout/splash.xml
deleted file mode 100644
index e9fd5f70e7..0000000000
--- a/dists/android/res/layout/splash.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:gravity="center"
-  android:background="@drawable/gradient"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  <ImageView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:adjustViewBounds="true"
-    android:scaleType="fitCenter"
-    android:src="@drawable/scummvm_big" />
-  <ProgressBar android:id="@+id/progress"
-    style="?android:attr/progressBarStyleHorizontal"
-    android:layout_width="300dip"
-    android:layout_height="wrap_content"
-    android:padding="20dip"/>
-</LinearLayout>
-- 
cgit v1.2.3


From 762910d8bb72c587bb7aa76274577a82b7a8b74a Mon Sep 17 00:00:00 2001
From: Fedor Strizhnev
Date: Tue, 6 Jan 2015 12:45:20 +0300
Subject: SYMBIAN: Updated settings and moved to config.mmh

---
 .../platform/symbian/mmp/scummvm_voyeur.mmp.in     | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
index 86dc32b3f8..4221e34195 100644
--- a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_voyeur.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -52,20 +49,3 @@ SOURCEPATH ..\..\..\..\engines\voyeur
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_OBJECTS_VOYEUR_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
-- 
cgit v1.2.3


From dd5f5588d9fb29179dfd0f354728dc6cacf26897 Mon Sep 17 00:00:00 2001
From: Fedor Strizhnev
Date: Tue, 6 Jan 2015 12:45:55 +0300
Subject: SYMBIAN: Updated settings

---
 backends/platform/symbian/mmp/scummvm_zvision.mmp.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
index e647275dbc..ea0a7b0102 100644
--- a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
@@ -33,6 +33,7 @@
 
 TARGET          scummvm_zvision.lib
 TARGETTYPE      lib
+USERINCLUDE     ..\..\..\..\engines\zvision\graphics
 #include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
-- 
cgit v1.2.3


From 5d852b5c56cf54cbd447ad29b6ab2318ac8ef8ae Mon Sep 17 00:00:00 2001
From: MestreLion
Date: Tue, 6 Jan 2015 08:39:23 -0200
Subject: SCUMM: Improve FOA keyboard help

---
 engines/scumm/help.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp
index cfb23a392a..2281e954ef 100644
--- a/engines/scumm/help.cpp
+++ b/engines/scumm/help.cpp
@@ -36,6 +36,8 @@ int ScummHelp::numPages(byte gameId) {
 	case GID_MANIAC:
 	case GID_ZAK:
 		return 4;
+	case GID_INDY4:
+		return 5;
 	case GID_INDY3:
 		return 6;
 	case GID_LOOM:
@@ -43,7 +45,6 @@ int ScummHelp::numPages(byte gameId) {
 	case GID_MONKEY_VGA:
 	case GID_MONKEY:
 	case GID_MONKEY2:
-	case GID_INDY4:
 	case GID_TENTACLE:
 	case GID_SAMNMAX:
 	case GID_DIG:
@@ -287,10 +288,19 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo
 			ADD_BIND("F3", "Melissa");
 			ADD_BIND("F4", "Leslie");
 		}
+		if (gameId == GID_INDY4) {
+			ADD_BIND("i", _("Toggle Inventory/IQ Points display"));
+			ADD_BIND("f", _("Toggle Keyboard/Mouse Fighting (*)"));
+			ADD_LINE;
+			ADD_TEXT(_("* Keyboard Fighting is always on,"));
+			ADD_TEXT(_("  so despite the in-game message this"));
+			ADD_TEXT(_("  actually toggles Mouse Fighting Off/On"));
+		}
 		break;
 	case 5:
 		switch (gameId) {
 		case GID_INDY3:
+		case GID_INDY4:
 			title = _("Fighting controls (numpad):");
 			ADD_BIND("7", _("Step back"));
 			ADD_BIND("4", _("Step back"));
@@ -301,7 +311,9 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo
 			ADD_BIND("9", _("Punch high"));
 			ADD_BIND("6", _("Punch middle"));
 			ADD_BIND("3", _("Punch low"));
-			ADD_LINE;
+			if (gameId == GID_INDY4) {
+				ADD_BIND("0", _("Sucker punch"));
+			}
 			ADD_LINE;
 			ADD_TEXT(_("These are for Indy on left."));
 			ADD_TEXT(_("When Indy is on the right,"));
-- 
cgit v1.2.3


From 6dbdf037461eced4a86b7da0b2da13329d9cb3f7 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 7 Jan 2015 00:23:28 -0500
Subject: SCI: Fix Mac games with a height of 190

A regression from 72e6a9eeab1082892e5d77fabc4f0b50f839615a
---
 engines/sci/graphics/screen.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 2f95bf7751..5a3b30f7ef 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -81,7 +81,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 		case GID_LSL1:
 		case GID_LSL5:
 		case GID_SQ1:
-			_width = 190;
+			_scriptHeight = 190;
+			break;
 		default:
 			break;
 		}
-- 
cgit v1.2.3


From 535249389a16f780fba51dd2c7ca8e1eddf65de9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 2 Jan 2015 03:59:35 +0200
Subject: ZVISION: Add a new command, "dumpimage", to dump any game image to
 BMP

---
 engines/zvision/core/console.cpp | 59 ++++++++++++++++++++++++++++++++++++++++
 engines/zvision/core/console.h   |  1 +
 2 files changed, 60 insertions(+)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index b5e542d777..65821b1702 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -53,6 +53,7 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 	registerCmd("location", WRAP_METHOD(Console, cmdLocation));
 	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
 	registerCmd("dumpfiles", WRAP_METHOD(Console, cmdDumpFiles));
+	registerCmd("dumpimage", WRAP_METHOD(Console, cmdDumpImage));
 }
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
@@ -269,4 +270,62 @@ bool Console::cmdDumpFiles(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdDumpImage(int argc, const char **argv) {
+	if (argc != 2) {
+		debugPrintf("Use %s <TGA/TGZ name> to dump a ZVision TGA/TGZ image into a regular BMP image\n", argv[0]);
+		return true;
+	}
+
+	Common::String fileName = argv[1];
+	if (!fileName.hasSuffix(".tga")) {
+		debugPrintf("%s is not an image file", argv[1]);
+	}
+
+	Common::File f;
+	if (!_engine->getSearchManager()->openFile(f, argv[1])) {
+		warning("File not found: %s", argv[1]);
+		return true;
+	}
+
+	Graphics::Surface surface;
+	_engine->getRenderManager()->readImageToSurface(argv[1], surface, false);
+
+	// Open file
+	Common::DumpFile out;
+
+	fileName.setChar('b', fileName.size() - 3);
+	fileName.setChar('m', fileName.size() - 2);
+	fileName.setChar('p', fileName.size() - 1);
+
+	out.open(fileName);
+
+	// Write BMP header
+	out.writeByte('B');
+	out.writeByte('M');
+	out.writeUint32LE(surface.h * surface.pitch + 54);
+	out.writeUint32LE(0);
+	out.writeUint32LE(54);
+	out.writeUint32LE(40);
+	out.writeUint32LE(surface.w);
+	out.writeUint32LE(surface.h);
+	out.writeUint16LE(1);
+	out.writeUint16LE(16);
+	out.writeUint32LE(0);
+	out.writeUint32LE(0);
+	out.writeUint32LE(0);
+	out.writeUint32LE(0);
+	out.writeUint32LE(0);
+	out.writeUint32LE(0);
+
+	// Write pixel data to BMP
+	out.write(surface.getPixels(), surface.pitch * surface.h);
+
+	out.flush();
+	out.close();
+
+	surface.free();
+
+	return true;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/core/console.h b/engines/zvision/core/console.h
index a7bd88ebc3..ffce87869f 100644
--- a/engines/zvision/core/console.h
+++ b/engines/zvision/core/console.h
@@ -47,6 +47,7 @@ private:
 	bool cmdLocation(int argc, const char **argv);
 	bool cmdDumpFile(int argc, const char **argv);
 	bool cmdDumpFiles(int argc, const char **argv);
+	bool cmdDumpImage(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From 9420cc2faaa54a782084d7386be29e72d97ffcef Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 2 Jan 2015 04:01:40 +0200
Subject: ZVISION: Also handle paths in INQUIS.ZIX for the DVD version of ZGI

---
 engines/zvision/file/search_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index ec250ff648..814393a374 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -175,6 +175,8 @@ void SearchManager::loadZix(const Common::String &name) {
 			// root folder instead
 			if (path.hasPrefix("zgi\\"))
 				path = Common::String(path.c_str() + 4);
+			if (path.hasPrefix("zgi_e\\"))
+				path = Common::String(path.c_str() + 6);
 
 			Common::Archive *arc;
 			char tempPath[128];
-- 
cgit v1.2.3


From 9f642074ba8e17aa23b01bcee82b2293fe84f8f1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 2 Jan 2015 04:52:53 +0200
Subject: ZVISION: Remove ActionRestoreGame and loading of r.svr (restart slot)

This is handled internally now, so r.svr isn't needed anymore
---
 engines/zvision/scripting/actions.cpp           | 19 +------------------
 engines/zvision/scripting/actions.h             |  9 ---------
 engines/zvision/scripting/scr_file_handling.cpp |  4 +++-
 engines/zvision/scripting/script_manager.cpp    |  6 +++++-
 engines/zvision/scripting/script_manager.h      |  1 +
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a61fa26223..e41ac90c20 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -22,14 +22,13 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/scripting/actions.h"
-
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/sound/zork_raw.h"
 #include "zvision/video/zork_avi_decoder.h"
 #include "zvision/file/save_manager.h"
+#include "zvision/scripting/actions.h"
 #include "zvision/scripting/menu.h"
 #include "zvision/scripting/effects/timer_effect.h"
 #include "zvision/scripting/effects/music_effect.h"
@@ -803,22 +802,6 @@ bool ActionRandom::execute() {
 	return true;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// ActionRestoreGame
-//////////////////////////////////////////////////////////////////////////////
-
-ActionRestoreGame::ActionRestoreGame(ZVision *engine, int32 slotkey, const Common::String &line) :
-	ResultAction(engine, slotkey) {
-	char buf[128];
-	sscanf(line.c_str(), "%s", buf);
-	_fileName = Common::String(buf);
-}
-
-bool ActionRestoreGame::execute() {
-	_engine->getSaveManager()->loadGame(_fileName);
-	return false;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // ActionRotateTo
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 8d43309b74..c2350bc83a 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -340,15 +340,6 @@ private:
 	ValueSlot *_max;
 };
 
-class ActionRestoreGame : public ResultAction {
-public:
-	ActionRestoreGame(ZVision *engine, int32 slotkey, const Common::String &line);
-	bool execute();
-
-private:
-	Common::String _fileName;
-};
-
 class ActionRotateTo : public ResultAction {
 public:
 	ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 227c43557c..7856bf7b2e 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -270,7 +270,9 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 					// Only used by Zork: Nemesis
 					actionList.push_back(new ActionRegion(_engine, slot, args));
 				} else if (act.matchString("restore_game", true)) {
-					actionList.push_back(new ActionRestoreGame(_engine, slot, args));
+					// Only used by ZGI to load the restart game slot, r.svr.
+					_engine->getScriptManager()->reset();
+					_engine->getScriptManager()->changeLocation('g', 'a', 'r', 'y', 0);
 				} else if (act.matchString("rotate_to", true)) {
 					actionList.push_back(new ActionRotateTo(_engine, slot, args));
 				} else if (act.matchString("save_game", true)) {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 464e8bfe4d..ba38d3a0e4 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -686,7 +686,7 @@ void ScriptManager::serialize(Common::WriteStream *stream) {
 		stream->writeSint16LE(getStateValue(i));
 }
 
-void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
+void ScriptManager::reset() {
 	// Clear out the current table values
 	_globalState.clear();
 	_globalStateFlags.clear();
@@ -706,6 +706,10 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	_activeSideFx.clear();
 
 	_referenceTable.clear();
+}
+
+void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
+	reset();
 
 	if (stream->readUint32BE() != MKTAG('Z', 'N', 'S', 'G') || stream->readUint32LE() != 4) {
 		changeLocation('g', 'a', 'r', 'y', 0);
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 78c1b77dea..136b3427f7 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -247,6 +247,7 @@ public:
 
 	void serialize(Common::WriteStream *stream);
 	void deserialize(Common::SeekableReadStream *stream);
+	void reset();
 
 	Location getCurrentLocation() const;
 	Location getLastLocation();
-- 
cgit v1.2.3


From 5949ab5aa6ce6a8b39ea44795e638204393adaf6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:02:24 +0200
Subject: ZVISION: Error out when a cursor file can't be found

---
 engines/zvision/graphics/cursors/cursor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index f32c68645d..2c011668ac 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -43,7 +43,7 @@ ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	  _hotspotY(0) {
 	Common::File file;
 	if (!engine->getSearchManager()->openFile(file, fileName))
-		return;
+		error("Cursor file %s does not exist", fileName.c_str());
 
 	uint32 magic = file.readUint32BE();
 	if (magic != MKTAG('Z', 'C', 'R', '1')) {
-- 
cgit v1.2.3


From 364b72c29b2f4e9d3cd45f644523966c6564e5d5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:02:56 +0200
Subject: ZVISION: Fix incorrect reference to cursor file

---
 engines/zvision/graphics/cursors/cursor_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index c364426bad..f3a5e736f6 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -37,7 +37,7 @@ const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "bac
                                                          "hright", "hup", "idle", "leftarrow", "rightarrow", "suggest_surround", "suggest_tilt", "turnaround", "zuparrow"
                                                        };
 
-const char *CursorManager::_zgiCursorFileNames[NUM_CURSORS] = { "g0gbc011.zcr", "g0gac001.zcr", "g0gac021.zcr", "g0gac031.zcr", "g0gac041.zcr", "g0gac051.zcr", "g0gac061.zcr", "g0gac071.zcr", "g0gac081.zcr",
+const char *CursorManager::_zgiCursorFileNames[NUM_CURSORS] = { "g0gbc011.zcr", "g0gac011.zcr", "g0gac021.zcr", "g0gac031.zcr", "g0gac041.zcr", "g0gac051.zcr", "g0gac061.zcr", "g0gac071.zcr", "g0gac081.zcr",
                                                                 "g0gac091.zcr", "g0gac101.zcr", "g0gac011.zcr", "g0gac111.zcr", "g0gac121.zcr", "g0gac131.zcr", "g0gac141.zcr", "g0gac151.zcr", "g0gac161.zcr"
                                                               };
 
-- 
cgit v1.2.3


From d70503cc9842059302c73c7861ada557e25a52b5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:08:02 +0200
Subject: ZVISION: Cleanup the ZIX file code

Also, add handling for 3 CDs, for Zork: Nemesis
---
 engines/zvision/file/search_manager.cpp | 38 +++++++++++----------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 814393a374..626c7775a1 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -169,44 +169,32 @@ void SearchManager::loadZix(const Common::String &name) {
 		line.trim();
 		if (line.matchString("----------*", true))
 			break;
-		else if (line.matchString("DIR:*", true) || line.matchString("CD0:*", true) || line.matchString("CD1:*", true)) {
+		else if (line.matchString("DIR:*", true) || line.matchString("CD0:*", true) || line.matchString("CD1:*", true) || line.matchString("CD2:*", true)) {
+			Common::Archive *arc;
+
 			Common::String path(line.c_str() + 5);
+			for (uint i = 0; i < path.size(); i++)
+				if (path[i] == '\\')
+					path.setChar('/', i);
+
 			// Check if INQUIS.ZIX refers to the ZGI folder, and check the game
 			// root folder instead
-			if (path.hasPrefix("zgi\\"))
+			if (path.hasPrefix("zgi/"))
 				path = Common::String(path.c_str() + 4);
-			if (path.hasPrefix("zgi_e\\"))
+			if (path.hasPrefix("zgi_e/"))
 				path = Common::String(path.c_str() + 6);
 
-			Common::Archive *arc;
-			char tempPath[128];
-			strcpy(tempPath, path.c_str());
-			for (uint i = 0; i < path.size(); i++)
-				if (tempPath[i] == '\\')
-					tempPath[i] = '/';
-
-			path = Common::String(tempPath);
 			if (path.size() && path[0] == '.')
 				path.deleteChar(0);
 			if (path.size() && path[0] == '/')
 				path.deleteChar(0);
+			if (path.size() && path.hasSuffix("/"))
+				path.deleteLastChar();
 
-			if (path.matchString("*.zfs", true))
+			if (path.matchString("*.zfs", true)) {
 				arc = new ZfsArchive(path);
-			else {
-				if (path.size()) {
-					if (path[path.size() - 1] == '\\' || path[path.size() - 1] == '/')
-						path.deleteLastChar();
-					if (path.size())
-						for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it)
-							if (path.equalsIgnoreCase(*it)) {
-								path = *it;
-								break;
-							}
-				}
-
+			} else {
 				path = Common::String::format("%s/%s", _root.c_str(), path.c_str());
-
 				arc = new Common::FSDirectory(path);
 			}
 			archives.push_back(arc);
-- 
cgit v1.2.3


From fb135b38ed25605d7b7bece9180784376e8408cc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:08:39 +0200
Subject: ZVISION: Cleanup

---
 engines/zvision/text/string_manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index 6b870d0b8d..c62e18f4b0 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -51,9 +51,8 @@ void StringManager::initialize(ZVisionGameId gameId) {
 
 void StringManager::loadStrFile(const Common::String &fileName) {
 	Common::File file;
-	if (!_engine->getSearchManager()->openFile(file, fileName)) {
+	if (!_engine->getSearchManager()->openFile(file, fileName))
 		error("%s does not exist. String parsing failed", fileName.c_str());
-	}
 
 	uint lineNumber = 0;
 	while (!file.eos()) {
-- 
cgit v1.2.3


From 2d0e9fc74afd7578b368794a40afbc06f05c92db Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:22:26 +0200
Subject: ZVISION: Move the screen initialization code into a separate function

---
 engines/zvision/zvision.cpp | 24 ++++++++++++++----------
 engines/zvision/zvision.h   |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 54991aced3..b05c790109 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -105,15 +105,6 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 
 	debug(1, "ZVision::ZVision");
 
-	uint16 workingWindowWidth  = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
-	uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
-	_workingWindow = Common::Rect(
-						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
-						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
-						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
-						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
-					 );
-
 	memset(_cheatBuffer, 0, sizeof(_cheatBuffer));
 }
 
@@ -211,7 +202,7 @@ void ZVision::initialize() {
 	} else if (_gameDescription->gameId == GID_NEMESIS)
 		_searchManager->loadZix("NEMESIS.ZIX");
 
-	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
+	initScreen();
 
 	// Register random source
 	_rnd = new Common::RandomSource("zvision");
@@ -358,4 +349,17 @@ void ZVision::fpsTimer() {
 	_renderedFrameCount = 0;
 }
 
+void ZVision::initScreen() {
+	uint16 workingWindowWidth  = (_gameDescription->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH  : ZGI_WORKING_WINDOW_WIDTH;
+	uint16 workingWindowHeight = (_gameDescription->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT;
+	_workingWindow = Common::Rect(
+						 (WINDOW_WIDTH  -  workingWindowWidth) / 2,
+						 (WINDOW_HEIGHT - workingWindowHeight) / 2,
+						((WINDOW_WIDTH  -  workingWindowWidth) / 2) + workingWindowWidth,
+						((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight
+					 );
+
+	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index ad22ddaaa2..a3bcb384d1 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -194,6 +194,8 @@ public:
 		_clock.stop();
 	}
 
+	void initScreen();
+
 	/**
 	 * Play a video until it is finished. This is a blocking call. It will call
 	 * _clock.stop() when the video starts and _clock.start() when the video finishes.
-- 
cgit v1.2.3


From cdbc06d0f74453584eac0611fcbe01785c6619c4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:29:28 +0200
Subject: ZVISION: Use a common function for loading game animations

---
 engines/zvision/scripting/actions.cpp | 45 +++++++++++++++--------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index e41ac90c20..4474a8801a 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -21,12 +21,11 @@
  */
 
 #include "common/scummsys.h"
+#include "video/video_decoder.h"
 
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/sound/zork_raw.h"
-#include "zvision/video/zork_avi_decoder.h"
 #include "zvision/file/save_manager.h"
 #include "zvision/scripting/actions.h"
 #include "zvision/scripting/menu.h"
@@ -45,10 +44,6 @@
 #include "zvision/graphics/effects/wave.h"
 #include "zvision/graphics/cursors/cursor_manager.h"
 
-#include "common/file.h"
-
-#include "audio/decoders/wave.h"
-
 namespace ZVision {
 
 //////////////////////////////////////////////////////////////////////////////
@@ -915,35 +910,33 @@ ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Commo
 }
 
 bool ActionStreamVideo::execute() {
-	ZorkAVIDecoder decoder;
-	Common::File *_file = _engine->getSearchManager()->openFile(_fileName);
+	Video::VideoDecoder *decoder;
+	Common::Rect destRect = Common::Rect(_x1, _y1, _x2 + 1, _y2 + 1);
 
-	if (_file) {
-		if (!decoder.loadStream(_file)) {
-			return true;
-		}
+	Common::String subname = _fileName;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
 
-		_engine->getCursorManager()->showMouse(false);
+	if (!_engine->getSearchManager()->hasFile(_fileName))
+		return true;
 
-		Common::Rect destRect = Common::Rect(_x1, _y1, _x2 + 1, _y2 + 1);
+	decoder = _engine->loadAnimation(_fileName);
 
-		Common::String subname = _fileName;
-		subname.setChar('s', subname.size() - 3);
-		subname.setChar('u', subname.size() - 2);
-		subname.setChar('b', subname.size() - 1);
+	_engine->getCursorManager()->showMouse(false);
 
-		Subtitle *sub = NULL;
+	Subtitle *sub = NULL;
 
-		if (_engine->getSearchManager()->hasFile(subname))
-			sub = new Subtitle(_engine, subname);
+	if (_engine->getSearchManager()->hasFile(subname))
+		sub = new Subtitle(_engine, subname);
 
-		_engine->playVideo(decoder, destRect, _skippable, sub);
+	_engine->playVideo(*decoder, destRect, _skippable, sub);
+	delete decoder;
 
-		_engine->getCursorManager()->showMouse(true);
+	_engine->getCursorManager()->showMouse(true);
 
-		if (sub)
-			delete sub;
-	}
+	if (sub)
+		delete sub;
 
 	return true;
 }
-- 
cgit v1.2.3


From e4969a98f82f151382106b89f170990cb7eed54b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:31:07 +0200
Subject: ZVISION: Fix typo in include

---
 engines/zvision/video/video.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 0913b28818..3edad7a193 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -29,7 +29,7 @@
 #include "zvision/zvision.h"
 #include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
-#include "zvision/scripting//script_manager.h"
+#include "zvision/scripting/script_manager.h"
 #include "zvision/text/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
-- 
cgit v1.2.3


From 4ffaf4df376e6d93c1b5c4c820c975fdee64ec8f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 11:39:02 +0200
Subject: ZVISION: Add stubs for the hires VOB MPEG2 videos of ZGI DVD

VOB file handling is based on clone2727's work. The lowres videos are
played for now, until AC3 sound handling is implemented
---
 engines/zvision/detection.cpp              | 13 ++++++++++++-
 engines/zvision/scripting/actions.cpp      | 13 +++++++++++++
 engines/zvision/scripting/script_manager.h |  1 +
 engines/zvision/video/video.cpp            | 11 +++++++++++
 engines/zvision/zvision.cpp                | 10 ++++++++--
 5 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 1eaff83413..5792377f8e 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -59,6 +59,7 @@ namespace ZVision {
 #define GAMEOPTION_DOUBLE_FPS                 GUIO_GAMEOPTIONS2
 #define GAMEOPTION_ENABLE_VENUS               GUIO_GAMEOPTIONS3
 #define GAMEOPTION_DISABLE_ANIM_WHILE_TURNING GUIO_GAMEOPTIONS4
+#define GAMEOPTION_USE_HIRES_MPEG_MOVIES      GUIO_GAMEOPTIONS5
 
 static const ZVisionGameDescription gameDescriptions[] = {
 
@@ -113,7 +114,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
-			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+			GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING, GAMEOPTION_USE_HIRES_MPEG_MOVIES)
 		},
 		GID_GRANDINQUISITOR
 	},
@@ -186,6 +187,16 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		}
 	},
 
+	{
+		GAMEOPTION_USE_HIRES_MPEG_MOVIES,
+		{
+			_s("Use the hires MPEG movies"),
+			_s("Use the hires MPEG movies of the DVD version, instead of the lowres AVI ones"),
+			"mpegmovies",
+			true
+		}
+	},
+
 	AD_EXTRA_GUI_OPTIONS_TERMINATOR
 };
 
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 4474a8801a..f60fdbb973 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -913,6 +913,19 @@ bool ActionStreamVideo::execute() {
 	Video::VideoDecoder *decoder;
 	Common::Rect destRect = Common::Rect(_x1, _y1, _x2 + 1, _y2 + 1);
 
+#ifdef USE_MPEG2
+	Common::String hiresFileName = _fileName;
+	hiresFileName.setChar('d', hiresFileName.size() - 8);
+	hiresFileName.setChar('v', hiresFileName.size() - 3);
+	hiresFileName.setChar('o', hiresFileName.size() - 2);
+	hiresFileName.setChar('b', hiresFileName.size() - 1);
+
+	if (_engine->getScriptManager()->getStateValue(StateKey_MPEGMovies) == 1 &&_engine->getSearchManager()->hasFile(hiresFileName))
+		// TODO: Enable once VOB + AC3 support is implemented
+		//_fileName = hiresFileName;
+		warning("The hires videos of the DVD version of ZGI aren't supported yet, using lowres");
+#endif
+
 	Common::String subname = _fileName;
 	subname.setChar('s', subname.size() - 3);
 	subname.setChar('u', subname.size() - 2);
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 136b3427f7..a05c112a18 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -87,6 +87,7 @@ enum StateKey {
 	StateKey_JapanFonts = 75,
 	StateKey_ExecScopeStyle = 76,
 	StateKey_Brightness = 77,
+	StateKey_MPEGMovies = 78,
 	StateKey_EF9_R = 91,
 	StateKey_EF9_G = 92,
 	StateKey_EF9_B = 93,
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 3edad7a193..66a567abb2 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -23,6 +23,11 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "video/video_decoder.h"
+// TODO: Enable once VOB + AC3 support is implemented
+#if 0
+//#ifdef USE_MPEG2
+#include "video/mpegps_decoder.h"
+#endif
 #include "engines/util.h"
 #include "graphics/surface.h"
 
@@ -45,6 +50,12 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
 		animation = new RLFDecoder();
 	else if (tmpFileName.hasSuffix(".avi"))
 		animation = new ZorkAVIDecoder();
+// TODO: Enable once VOB + AC3 support is implemented
+#if 0
+//#ifdef USE_MPEG2
+	else if (tmpFileName.hasSuffix(".vob"))
+		animation = new Video::MPEGPSDecoder();
+#endif
 	else
 		error("Unknown suffix for animation %s", fileName.c_str());
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b05c790109..1349aaa683 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -52,7 +52,7 @@
 
 namespace ZVision {
 
-#define ZVISION_SETTINGS_KEYS_COUNT 11
+#define ZVISION_SETTINGS_KEYS_COUNT 12
 
 struct zvisionIniSettings {
 	const char *name;
@@ -73,7 +73,8 @@ struct zvisionIniSettings {
 	{"panarotatespeed", StateKey_RotateSpeed, 540, false, true},	// checked by universe.scr
 	{"noanimwhileturning", StateKey_NoTurnAnim, -1, false, true},	// toggle playing animations during pana rotation
 	{"venusenabled", StateKey_VenusEnable, -1, true, true},
-	{"subtitles", StateKey_Subtitles, -1, true, true}
+	{"subtitles", StateKey_Subtitles, -1, true, true},
+	{"mpegmovies", StateKey_MPEGMovies, -1, true, true}		// Zork: Grand Inquisitor DVD hi-res MPEG movies (0 = normal, 1 = hires, 2 = disable option)
 };
 
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
@@ -230,6 +231,11 @@ void ZVision::initialize() {
 
 	loadSettings();
 
+#ifndef USE_MPEG2
+	// libmpeg2 not loaded, disable the MPEG2 movies option
+	_scriptManager->setStateValue(StateKey_MPEGMovies, 2);
+#endif
+
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
 	_doubleFPS = ConfMan.getBool("doublefps");
-- 
cgit v1.2.3


From 4c64f7e194e5ce74a9213ef09648e615f3661de6 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Wed, 7 Jan 2015 07:00:13 -0600
Subject: SWORD25: Remove unused code

The original idea was to keep the code variation and pick the best one. However,
these two methods we're portable enough for our needs.
---
 engines/sword25/util/double_serialization.cpp | 76 ---------------------------
 engines/sword25/util/double_serialization.h   | 37 -------------
 2 files changed, 113 deletions(-)

diff --git a/engines/sword25/util/double_serialization.cpp b/engines/sword25/util/double_serialization.cpp
index a34eb0fbff..73da296e40 100644
--- a/engines/sword25/util/double_serialization.cpp
+++ b/engines/sword25/util/double_serialization.cpp
@@ -65,80 +65,4 @@ double decodeDouble(SerializedDouble value) {
 	return ((value.signAndSignificandTwo & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
 }
 
-#if 0
-
-// Why these are needed?
-
-uint64 encodeDouble_64(double value) {
-	// Split the value into its significand and exponent
-	int exponent;
-	double significand = frexp(value, &exponent);
-
-	// Shift the significand into the integer range
-	double shiftedsignificand = ldexp(abs(significand), 53);
-
-	// Combine everything using the IEEE standard
-	uint64 uintsignificand = (uint64)shiftedsignificand;
-	return ((uint64)(value < 0 ? 1 : 0) << 63) |        // Sign
-	       ((uint64)(exponent + 1023) << 52) |          // Exponent stored as an offset to 1023
-	       (uintsignificand & 0x000FFFFFFFFFFFFFLL);      // significand with MSB inferred
-}
-
-double decodeDouble_64(uint64 value) {
-	// Expand the exponent and significand
-	int exponent = (int)((value >> 52) & 0x7FF) - 1023;
-	double expandedsignificand = (double)(0x10000000000000LL /* Inferred MSB */ | (value & 0x000FFFFFFFFFFFFFLL));
-
-	// Deflate the significand
-	int temp;
-	double significand = frexp(expandedsignificand, &temp);
-
-	// Re-calculate the actual double
-	double returnValue = ldexp(significand, exponent);
-
-	// Check the sign bit and return
-	return ((value & 0x8000000000000000LL) == 0x8000000000000000LL) ? -returnValue : returnValue;
-}
-
-CompactSerializedDouble encodeDouble_Compact(double value) {
-	// Split the value into its significand and exponent
-	int exponent;
-	double significand = frexp(value, &exponent);
-
-	// Shift the the first part of the significand into the integer range
-	double shiftedsignificandPart = ldexp(abs(significand), 32);
-	uint32 significandOne = uint32(floor(shiftedsignificandPart));
-
-	// Shift the remainder of the significand into the integer range
-	shiftedsignificandPart -= significandOne;
-	uint32 significandTwo = (uint32)(ldexp(shiftedsignificandPart, 21));
-
-	CompactSerializedDouble returnValue;
-	returnValue.signAndSignificandOne = ((uint32)(value < 0 ? 1 : 0) << 31) |   // Sign
-	                                    (significandOne & 0x7FFFFFFF);          // significandOne with MSB inferred
-	// Exponent stored as an offset to 1023
-	returnValue.exponentAndSignificandTwo = ((uint32)(exponent + 1023) << 21) | significandTwo;
-
-	return returnValue;
-}
-
-double decodeDouble_Compact(CompactSerializedDouble value) {
-	// Expand the exponent and the parts of the significand
-	int exponent = (int)(value.exponentAndSignificandTwo >> 21) - 1023;
-	double expandedsignificandOne = (double)(0x80000000 /* Inferred MSB */ | (value.signAndSignificandOne & 0x7FFFFFFF));
-	double expandedsignificandTwo = (double)(value.exponentAndSignificandTwo & 0x1FFFFF);
-
-	// Deflate the significand
-	double shiftedsignificand = ldexp(expandedsignificandTwo, -21);
-	double significand = ldexp(expandedsignificandOne + shiftedsignificand, -32);
-
-	// Re-calculate the actual double
-	double returnValue = ldexp(significand, exponent);
-
-	// Check the sign bit and return
-	return ((value.signAndSignificandOne & 0x80000000) == 0x80000000) ? -returnValue : returnValue;
-}
-
-#endif
-
 } // End of namespace Sword25
diff --git a/engines/sword25/util/double_serialization.h b/engines/sword25/util/double_serialization.h
index a910a66f20..af58d03c17 100644
--- a/engines/sword25/util/double_serialization.h
+++ b/engines/sword25/util/double_serialization.h
@@ -56,43 +56,6 @@ SerializedDouble encodeDouble(double value);
  */
 double decodeDouble(SerializedDouble value);
 
-#if 0
-/**
- * Encodes a double as a uint64
- *
- * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
- *
- * @param value    The value to encode
- * @return         The encoded value
- */
-uint64 encodeDouble_64(double value);
-/**
- * Decodes a previously encoded double
- *
- * @param value    The value to decode
- * @return         The decoded value
- */
-double decodeDouble_64(uint64 value);
-
-/**
- * Encodes a double as two uint32
- *
- * Does NOT support denormalized numbers. Does NOT support NaN, or Inf
- *
- * @param value    The value to encode
- * @return         The encoded value
- */
-CompactSerializedDouble encodeDouble_Compact(double value);
-/**
- * Decodes a previously encoded double
- *
- * @param value    The value to decode
- * @return         The decoded value
- */
-double decodeDouble_Compact(CompactSerializedDouble value);
-
-#endif
-
 } // End of namespace Sword25
 
 #endif
-- 
cgit v1.2.3


From f879f8af04b5114d05d3adadf3c1efac49cf8b91 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 7 Jan 2015 20:02:10 +0100
Subject: OPENGL: Limit mouse cursor drawing to inside game screen when no
 overlay is visible.

---
 backends/graphics/opengl/opengl-graphics.cpp | 80 +++++++++++++++++++++++++---
 backends/graphics/opengl/opengl-graphics.h   | 17 +++++-
 2 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index c455c4ce2e..bace9f468f 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -49,9 +49,9 @@ OpenGLGraphicsManager::OpenGLGraphicsManager()
       _displayWidth(0), _displayHeight(0), _defaultFormat(), _defaultFormatAlpha(),
       _gameScreen(nullptr), _gameScreenShakeOffset(0), _overlay(nullptr),
       _overlayVisible(false), _cursor(nullptr),
-      _cursorX(0), _cursorY(0), _cursorHotspotX(0), _cursorHotspotY(0), _cursorHotspotXScaled(0),
-      _cursorHotspotYScaled(0), _cursorWidthScaled(0), _cursorHeightScaled(0), _cursorKeyColor(0),
-      _cursorVisible(false), _cursorDontScale(false), _cursorPaletteEnabled(false)
+      _cursorX(0), _cursorY(0), _cursorDisplayX(0),_cursorDisplayY(0), _cursorHotspotX(0), _cursorHotspotY(0),
+      _cursorHotspotXScaled(0), _cursorHotspotYScaled(0), _cursorWidthScaled(0), _cursorHeightScaled(0),
+      _cursorKeyColor(0), _cursorVisible(false), _cursorDontScale(false), _cursorPaletteEnabled(false)
 #ifdef USE_OSD
       , _osdAlpha(0), _osdFadeStartTime(0), _osd(nullptr)
 #endif
@@ -351,7 +351,7 @@ void OpenGLGraphicsManager::updateScreen() {
 		return;
 	}
 
-	// Clear the screen buffer
+	// Clear the screen buffer.
 	GLCALL(glClear(GL_COLOR_BUFFER_BIT));
 
 	const GLfloat shakeOffset = _gameScreenShakeOffset * (GLfloat)_displayHeight / _gameScreen->getHeight();
@@ -370,12 +370,42 @@ void OpenGLGraphicsManager::updateScreen() {
 		// visible.
 		const GLfloat cursorOffset = _overlayVisible ? 0 : shakeOffset;
 
-		_cursor->draw(_cursorX - _cursorHotspotXScaled, _cursorY - _cursorHotspotYScaled + cursorOffset,
+		_cursor->draw(_cursorDisplayX - _cursorHotspotXScaled,
+		              _cursorDisplayY - _cursorHotspotYScaled + cursorOffset,
 		              _cursorWidthScaled, _cursorHeightScaled);
 	}
 
+	// Fourth step: Draw black borders around the game screen when no overlay
+	// is visible. This makes sure that the mouse cursor etc. is only drawn
+	// in the actual game screen area in this case.
+	if (!_overlayVisible) {
+		GLCALL(glColor4f(0.0f, 0.0f, 0.0f, 1.0f));
+
+		GLCALL(glDisable(GL_TEXTURE_2D));
+		GLCALL(glDisableClientState(GL_TEXTURE_COORD_ARRAY));
+
+		// Top border.
+		drawRect(0, 0, _outputScreenWidth, _displayY);
+
+		// Left border.
+		drawRect(0, 0, _displayX, _outputScreenHeight);
+
+		// Bottom border.
+		const int y = _displayY + _displayHeight;
+		drawRect(0, y, _outputScreenWidth, _outputScreenHeight - y);
+
+		// Right border.
+		const int x = _displayX + _displayWidth;
+		drawRect(x, 0, _outputScreenWidth - x, _outputScreenHeight);
+
+		GLCALL(glEnableClientState(GL_TEXTURE_COORD_ARRAY));
+		GLCALL(glEnable(GL_TEXTURE_2D));
+
+		GLCALL(glColor4f(1.0f, 1.0f, 1.0f, 1.0f));
+	}
+
 #ifdef USE_OSD
-	// Fourth step: Draw the OSD.
+	// Fifth step: Draw the OSD.
 	if (_osdAlpha > 0) {
 		Common::StackLock lock(_osdMutex);
 
@@ -435,10 +465,16 @@ int16 OpenGLGraphicsManager::getOverlayHeight() {
 
 void OpenGLGraphicsManager::showOverlay() {
 	_overlayVisible = true;
+
+	// Update cursor position.
+	setMousePosition(_cursorX, _cursorY);
 }
 
 void OpenGLGraphicsManager::hideOverlay() {
 	_overlayVisible = false;
+
+	// Update cursor position.
+	setMousePosition(_cursorX, _cursorY);
 }
 
 Graphics::PixelFormat OpenGLGraphicsManager::getOverlayFormat() const {
@@ -901,6 +937,19 @@ void OpenGLGraphicsManager::adjustMousePosition(int16 &x, int16 &y) {
 	}
 }
 
+void OpenGLGraphicsManager::setMousePosition(int x, int y) {
+	_cursorX = x;
+	_cursorY = y;
+
+	if (_overlayVisible) {
+		_cursorDisplayX = x;
+		_cursorDisplayY = y;
+	} else {
+		_cursorDisplayX = CLIP<int>(x, _displayX, _displayX + _displayWidth  - 1);
+		_cursorDisplayY = CLIP<int>(y, _displayY, _displayY + _displayHeight - 1);
+	}
+}
+
 Texture *OpenGLGraphicsManager::createTexture(const Graphics::PixelFormat &format, bool wantAlpha) {
 	GLenum glIntFormat, glFormat, glType;
 	if (format.bytesPerPixel == 1) {
@@ -1046,6 +1095,9 @@ void OpenGLGraphicsManager::recalculateDisplayArea() {
 	// We center the screen in the middle for now.
 	_displayX = (_outputScreenWidth  - _displayWidth ) / 2;
 	_displayY = (_outputScreenHeight - _displayHeight) / 2;
+
+	// Update the cursor position to adjust for new display area.
+	setMousePosition(_cursorX, _cursorY);
 }
 
 void OpenGLGraphicsManager::updateCursorPalette() {
@@ -1163,4 +1215,20 @@ void OpenGLGraphicsManager::saveScreenshot(const Common::String &filename) const
 	delete[] pixels;
 }
 
+void OpenGLGraphicsManager::drawRect(GLfloat x, GLfloat y, GLfloat w, GLfloat h) {
+	if (w < 0 || h < 0) {
+		return;
+	}
+
+	const GLfloat vertices[4*2] = {
+		x,     y,
+		x + w, y,
+		x,     y + h,
+		x + w, y + h
+	};
+	GLCALL(glVertexPointer(2, GL_FLOAT, 0, vertices));
+
+	GLCALL(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
+}
+
 } // End of namespace OpenGL
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index dde21533b0..cec970e0cc 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -155,7 +155,7 @@ protected:
 	 * @param x X coordinate in physical coordinates.
 	 * @param y Y coordinate in physical coordinates.
 	 */
-	void setMousePosition(int x, int y) { _cursorX = x; _cursorY = y; }
+	void setMousePosition(int x, int y);
 
 	/**
 	 * Query the mouse position in physical coordinates.
@@ -393,6 +393,16 @@ private:
 	 */
 	int _cursorY;
 
+	/**
+	 * X coordinate used for drawing the cursor.
+	 */
+	int _cursorDisplayX;
+
+	/**
+	 * Y coordinate used for drawing the cursor.
+	 */
+	int _cursorDisplayY;
+
 	/**
 	 * The X offset for the cursor hotspot in unscaled coordinates.
 	 */
@@ -454,6 +464,11 @@ private:
 	 */
 	byte _cursorPalette[3 * 256];
 
+	/**
+	 * Draws a rectangle
+	 */
+	void drawRect(GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+
 #ifdef USE_OSD
 	//
 	// OSD
-- 
cgit v1.2.3


From 1124d1db316c8b1bd67bcb00520b3a55d99d5cf4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 7 Jan 2015 20:37:08 +0100
Subject: OPENGL: Fix truncation issue resulting in wrong mouse coordinates.

---
 backends/graphics/opengl/opengl-graphics.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index bace9f468f..5821856c30 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -928,8 +928,8 @@ void OpenGLGraphicsManager::adjustMousePosition(int16 &x, int16 &y) {
 		const int16 width  = _gameScreen->getWidth();
 		const int16 height = _gameScreen->getHeight();
 
-		x = (x * width)  / _displayWidth;
-		y = (y * height) / _displayHeight;
+		x = (x * width)  / (int)_displayWidth;
+		y = (y * height) / (int)_displayHeight;
 
 		// Make sure we only supply valid coordinates.
 		x = CLIP<int16>(x, 0, width - 1);
-- 
cgit v1.2.3


From 339abc781c09cec263a67e886ab4305368f7bfb5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 23:40:30 +0200
Subject: ZVISION: Add detection for the French version of Zork: Nemesis

---
 engines/zvision/detection.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 5792377f8e..66152403cf 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -77,6 +77,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_NEMESIS
 	},
 
+	{
+		// Zork Nemesis French version
+		{
+			"znemesis",
+			0,
+			AD_ENTRY1s("CSCR.ZFS", "f04113357b4748c13efcb58b4629887c", 2577873),
+			Common::FR_FRA,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+		},
+		GID_NEMESIS
+	},
+
 	{
 		// Zork Nemesis English demo version
 		{
-- 
cgit v1.2.3


From 5e1702d60e4e6b6e618be36a64dc4ef563c80e47 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 23:42:10 +0200
Subject: Cursors "arrowa.zcr" and "arrowb.zcr" are missing from Zork: Nemesis

---
 engines/zvision/graphics/cursors/cursor_manager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index f3a5e736f6..1e048efedf 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -55,6 +55,11 @@ CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat pixelF
 	for (int i = 0; i < NUM_CURSORS; i++) {
 		if (_engine->getGameId() == GID_NEMESIS) {
 			Common::String name;
+			if (i == 1) {
+				// Cursors "arrowa.zcr" and "arrowb.zcr" are missing
+				_cursors[i][0] = _cursors[i][1] = ZorkCursor();
+				continue;
+			}
 			name = Common::String::format("%sa.zcr", _zNemCursorFileNames[i]);
 			_cursors[i][0] = ZorkCursor(_engine, name); // Up cursor
 			name = Common::String::format("%sb.zcr", _zNemCursorFileNames[i]);
-- 
cgit v1.2.3


From 07ad10babe6eed96ac1d3ff8e9fc9580ec21b7bd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 23:45:43 +0200
Subject: ZVISION: Handle sound patches (.src files) dynamically

---
 engines/zvision/file/search_manager.cpp | 13 -------------
 engines/zvision/file/search_manager.h   |  1 -
 engines/zvision/sound/zork_raw.cpp      | 22 +++++++++++++++++++---
 engines/zvision/zvision.cpp             | 14 --------------
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 626c7775a1..aecfff5208 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -62,19 +62,6 @@ SearchManager::~SearchManager() {
 	_archList.clear();
 }
 
-void SearchManager::addPatch(const Common::String &src, const Common::String &dst) {
-	Common::String lowerCaseName = dst;
-	lowerCaseName.toLowercase();
-
-	SearchManager::MatchList::iterator it = _files.find(lowerCaseName);
-
-	if (it != _files.end()) {
-		lowerCaseName = src;
-		lowerCaseName.toLowercase();
-		_files[lowerCaseName] = it->_value;
-	}
-}
-
 void SearchManager::addFile(const Common::String &name, Common::Archive *arch) {
 	bool addArch = true;
 	Common::List<Common::Archive *>::iterator it = _archList.begin();
diff --git a/engines/zvision/file/search_manager.h b/engines/zvision/file/search_manager.h
index b9ed02ec13..43e7ff4d14 100644
--- a/engines/zvision/file/search_manager.h
+++ b/engines/zvision/file/search_manager.h
@@ -39,7 +39,6 @@ public:
 
 	void addFile(const Common::String &name, Common::Archive *arch);
 	void addDir(const Common::String &name);
-	void addPatch(const Common::String &src, const Common::String &dst);
 
 	Common::File *openFile(const Common::String &name);
 	bool openFile(Common::File &file, const Common::String &name);
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 6d1980b1af..0ef5de2f55 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -242,11 +242,27 @@ Audio::RewindableAudioStream *makeRawZorkStream(Common::SeekableReadStream *stre
 
 Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, ZVision *engine) {
 	Common::File *file = new Common::File();
-	if (!engine->getSearchManager()->openFile(*file, filePath))
-		error("File not found: %s", filePath.c_str());
+	Common::String actualName = filePath;
+	bool found = engine->getSearchManager()->openFile(*file, actualName);
+	bool isRaw = actualName.hasSuffix(".raw");
+
+	if ((!found && isRaw) || (found && isRaw && file->size() < 10)) {
+		if (found)
+			file->close();
+
+		// Check for an audio patch (.src)
+		actualName.setChar('s', actualName.size() - 3);
+		actualName.setChar('r', actualName.size() - 2);
+		actualName.setChar('c', actualName.size() - 1);
+
+		if (!engine->getSearchManager()->openFile(*file, actualName))
+			error("File not found: %s", actualName.c_str());
+	} else if (!found && !isRaw) {
+		error("File not found: %s", actualName.c_str());
+	}
 
 	// Get the file name
-	Common::StringTokenizer tokenizer(filePath, "/\\");
+	Common::StringTokenizer tokenizer(actualName, "/\\");
 	Common::String fileName;
 	while (!tokenizer.empty()) {
 		fileName = tokenizer.nextToken();
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 1349aaa683..848cba0f66 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -186,20 +186,6 @@ void ZVision::initialize() {
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
 		_searchManager->loadZix("INQUIS.ZIX");
-		_searchManager->addPatch("C000H01Q.RAW", "C000H01Q.SRC");
-		_searchManager->addPatch("CM00H01Q.RAW", "CM00H01Q.SRC");
-		_searchManager->addPatch("DM00H01Q.RAW", "DM00H01Q.SRC");
-		_searchManager->addPatch("E000H01Q.RAW", "E000H01Q.SRC");
-		_searchManager->addPatch("EM00H50Q.RAW", "EM00H50Q.SRC");
-		_searchManager->addPatch("GJNPH65P.RAW", "GJNPH65P.SRC");
-		_searchManager->addPatch("GJNPH72P.RAW", "GJNPH72P.SRC");
-		_searchManager->addPatch("H000H01Q.RAW", "H000H01Q.SRC");
-		_searchManager->addPatch("M000H01Q.RAW", "M000H01Q.SRC");
-		_searchManager->addPatch("P000H01Q.RAW", "P000H01Q.SRC");
-		_searchManager->addPatch("Q000H01Q.RAW", "Q000H01Q.SRC");
-		_searchManager->addPatch("SW00H01Q.RAW", "SW00H01Q.SRC");
-		_searchManager->addPatch("T000H01Q.RAW", "T000H01Q.SRC");
-		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
 	} else if (_gameDescription->gameId == GID_NEMESIS)
 		_searchManager->loadZix("NEMESIS.ZIX");
 
-- 
cgit v1.2.3


From 474ef741226ac56bd146c79be96c55c00551593b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 23:46:49 +0200
Subject: ZVISION: Check the validity of ZIX files

---
 engines/zvision/file/search_manager.cpp | 11 +++++++----
 engines/zvision/file/search_manager.h   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index aecfff5208..80792b07d8 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -134,9 +134,10 @@ bool SearchManager::hasFile(const Common::String &name) {
 	return false;
 }
 
-void SearchManager::loadZix(const Common::String &name) {
+bool SearchManager::loadZix(const Common::String &name) {
 	Common::File file;
-	file.open(name);
+	if (!file.open(name))
+		return false;
 
 	Common::String line;
 
@@ -147,7 +148,7 @@ void SearchManager::loadZix(const Common::String &name) {
 	}
 
 	if (file.eos())
-		return;
+		error("Corrupt ZIX file: %s", name.c_str());
 
 	Common::Array<Common::Archive *> archives;
 
@@ -189,7 +190,7 @@ void SearchManager::loadZix(const Common::String &name) {
 	}
 
 	if (file.eos())
-		return;
+		error("Corrupt ZIX file: %s", name.c_str());
 
 	while (!file.eos()) {
 		line = file.readLine();
@@ -202,6 +203,8 @@ void SearchManager::loadZix(const Common::String &name) {
 			}
 		}
 	}
+
+	return true;
 }
 
 void SearchManager::addDir(const Common::String &name) {
diff --git a/engines/zvision/file/search_manager.h b/engines/zvision/file/search_manager.h
index 43e7ff4d14..0d0ab14d31 100644
--- a/engines/zvision/file/search_manager.h
+++ b/engines/zvision/file/search_manager.h
@@ -44,7 +44,7 @@ public:
 	bool openFile(Common::File &file, const Common::String &name);
 	bool hasFile(const Common::String &name);
 
-	void loadZix(const Common::String &name);
+	bool loadZix(const Common::String &name);
 
 	struct Node {
 		Common::String name;
-- 
cgit v1.2.3


From a9b79544a11eba0649905330f58c4ff6161687e8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Jan 2015 23:48:01 +0200
Subject: ZVISION: Add support for an unmodified ZIX file for Zork: Nemesis

This helps in copying the game files straight off the CD
---
 engines/zvision/zvision.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 848cba0f66..5b6d63e869 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -185,9 +185,15 @@ void ZVision::initialize() {
 	_searchManager->addDir("addon");
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
-		_searchManager->loadZix("INQUIS.ZIX");
-	} else if (_gameDescription->gameId == GID_NEMESIS)
-		_searchManager->loadZix("NEMESIS.ZIX");
+		if (!_searchManager->loadZix("INQUIS.ZIX"))
+			error("Unable to load the game ZIX file");
+	} else if (_gameDescription->gameId == GID_NEMESIS) {
+		if (!_searchManager->loadZix("NEMESIS.ZIX")) {
+			// The game might not be installed, try MEDIUM.ZIX instead
+			if (!_searchManager->loadZix("ZNEMSCR/MEDIUM.ZIX"))
+				error("Unable to load the game ZIX file");
+		}
+	}
 
 	initScreen();
 
-- 
cgit v1.2.3


From 913075df90307a5331870009e0b29bfc87103ef6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 8 Jan 2015 01:44:06 +0200
Subject: ZVISION: Also handle paths in NEMESIS.ZIX for the DVD ver. of Nemesis

---
 engines/zvision/file/search_manager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 80792b07d8..9f709dd0a1 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -165,6 +165,11 @@ bool SearchManager::loadZix(const Common::String &name) {
 				if (path[i] == '\\')
 					path.setChar('/', i);
 
+			// Check if NEMESIS.ZIX/MEDIUM.ZIX refers to the znemesis folder, and
+			// check the game root folder instead
+			if (path.hasPrefix("znemesis/"))
+				path = Common::String(path.c_str() + 9);
+
 			// Check if INQUIS.ZIX refers to the ZGI folder, and check the game
 			// root folder instead
 			if (path.hasPrefix("zgi/"))
-- 
cgit v1.2.3


From 7054bcd9c53f704f0fdd08a67fec00289f075c32 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 19 Nov 2012 11:27:22 -0500
Subject: VIDEO: Add MPEG-PS demuxer

For use with ZVision and later MADE
---
 video/module.mk          |   1 +
 video/mpegps_decoder.cpp | 732 +++++++++++++++++++++++++++++++++++++++++++++++
 video/mpegps_decoder.h   | 189 ++++++++++++
 3 files changed, 922 insertions(+)
 create mode 100644 video/mpegps_decoder.cpp
 create mode 100644 video/mpegps_decoder.h

diff --git a/video/module.mk b/video/module.mk
index 5754350e42..be014598f2 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	coktel_decoder.o \
 	dxa_decoder.o \
 	flic_decoder.o \
+	mpegps_decoder.o \
 	psx_decoder.o \
 	qt_decoder.o \
 	smk_decoder.o \
diff --git a/video/mpegps_decoder.cpp b/video/mpegps_decoder.cpp
new file mode 100644
index 0000000000..d8f7f5a68c
--- /dev/null
+++ b/video/mpegps_decoder.cpp
@@ -0,0 +1,732 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
+#include "common/debug.h"
+#include "common/endian.h"
+#include "common/stream.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+
+#include "video/mpegps_decoder.h"
+#include "image/codecs/mpeg.h"
+
+// The demuxing code is based on libav's demuxing code
+
+namespace Video {
+
+enum {
+	kStartCodePack = 0x1BA,
+	kStartCodeSystemHeader = 0x1BB,
+	kStartCodeProgramStreamMap = 0x1BC,
+	kStartCodePrivateStream1 = 0x1BD,
+	kStartCodePaddingStream = 0x1BE,
+	kStartCodePrivateStream2 = 0x1BF
+};
+
+MPEGPSDecoder::MPEGPSDecoder() {
+	_stream = 0;
+	memset(_psmESType, 0, 256);
+}
+
+MPEGPSDecoder::~MPEGPSDecoder() {
+	close();
+}
+
+bool MPEGPSDecoder::loadStream(Common::SeekableReadStream *stream) {
+	close();
+
+	_stream = stream;
+
+	if (!addFirstVideoTrack()) {
+		close();
+		return false;
+	}
+
+	_stream->seek(0);
+	return true;
+}
+
+void MPEGPSDecoder::close() {
+	VideoDecoder::close();
+
+	delete _stream;
+	_stream = 0;
+
+	_streamMap.clear();
+
+	memset(_psmESType, 0, 256);
+}
+
+void MPEGPSDecoder::readNextPacket() {
+	if (_stream->eos())
+		return;
+
+	for (;;) {
+		int32 startCode;
+		uint32 pts, dts;
+		int size = readNextPacketHeader(startCode, pts, dts);
+
+		if (size < 0) {
+			// End of stream
+			for (TrackListIterator it = getTrackListBegin(); it != getTrackListEnd(); it++)
+				if ((*it)->getTrackType() == Track::kTrackTypeVideo)
+					((MPEGVideoTrack *)*it)->setEndOfTrack();
+			return;
+		}
+
+		MPEGStream *stream = 0;
+		Common::SeekableReadStream *packet = _stream->readStream(size);
+
+		if (_streamMap.contains(startCode)) {
+			// We already found the stream
+			stream = _streamMap[startCode];
+		} else {
+			// We haven't seen this before
+
+			if (startCode == kStartCodePrivateStream1) {
+				PrivateStreamType streamType = detectPrivateStreamType(packet);
+				packet->seek(0);
+
+				// TODO: Handling of these types (as needed)
+
+				const char *typeName;
+
+				switch (streamType) {
+				case kPrivateStreamAC3:
+					typeName = "AC-3";
+					break;
+				case kPrivateStreamDTS:
+					typeName = "DTS";
+					break;
+				case kPrivateStreamDVDPCM:
+					typeName = "DVD PCM";
+					break;
+				case kPrivateStreamPS2Audio:
+					typeName = "PS2 Audio";
+					break;
+				default:
+					typeName = "Unknown";
+					break;
+				}
+
+				warning("Unhandled DVD private stream: %s", typeName);
+
+				// Make it 0 so we don't get the warning twice
+				_streamMap[startCode] = 0;
+			} else if (startCode >= 0x1E0 && startCode <= 0x1EF) {
+				// Video stream
+				// TODO: Multiple video streams
+				warning("Found extra video stream 0x%04X", startCode);
+				_streamMap[startCode] = 0;
+			} else if (startCode >= 0x1C0 && startCode <= 0x1DF) {
+#ifdef USE_MAD
+				// MPEG Audio stream
+				MPEGAudioTrack *audioTrack = new MPEGAudioTrack(packet);
+				stream = audioTrack;
+				_streamMap[startCode] = audioTrack;
+				addTrack(audioTrack);
+#else
+				warning("Found audio stream 0x%04X, but no MAD support compiled in", startCode);
+				_streamMap[startCode] = 0;
+#endif
+			} else {
+				// Probably not relevant
+				debug(0, "Found unhandled MPEG-PS stream type 0x%04x", startCode);
+				_streamMap[startCode] = 0;
+			}
+		}
+
+		if (stream) {
+			bool done = stream->sendPacket(packet, pts, dts);
+
+			if (done && stream->getStreamType() == MPEGStream::kStreamTypeVideo)
+				return;
+		} else {
+			delete packet;
+		}
+	}
+}
+
+#define MAX_SYNC_SIZE 100000
+
+int MPEGPSDecoder::findNextStartCode(uint32 &size) {
+	size = MAX_SYNC_SIZE;
+	int32 state = 0xFF;
+
+	while (size > 0) {
+		byte v = _stream->readByte();
+
+		if (_stream->eos())
+			return -1;
+
+		size--;
+
+		if (state == 0x1)
+			return ((state << 8) | v) & 0xFFFFFF;
+
+		state = ((state << 8) | v) & 0xFFFFFF;
+	}
+
+	return -1;
+}
+
+int MPEGPSDecoder::readNextPacketHeader(int32 &startCode, uint32 &pts, uint32 &dts) {
+	for (;;) {
+		uint32 size;
+		startCode = findNextStartCode(size);
+
+		if (_stream->eos())
+			return -1;
+
+		if (startCode < 0)
+			continue;
+
+		uint32 lastSync = _stream->pos();
+
+		if (startCode == kStartCodePack || startCode == kStartCodeSystemHeader)
+			continue;
+
+		int length = _stream->readUint16BE();
+
+		if (startCode == kStartCodePaddingStream || startCode == kStartCodePrivateStream2) {
+			_stream->skip(length);
+			continue;
+		}
+
+		if (startCode == kStartCodeProgramStreamMap) {
+			parseProgramStreamMap(length);
+			continue;
+		}
+
+		// Find matching stream
+		if (!((startCode >= 0x1C0 && startCode <= 0x1DF) ||
+				(startCode >= 0x1E0 && startCode <= 0x1EF) ||
+				startCode == kStartCodePrivateStream1 || startCode == 0x1FD))
+			continue;
+
+		// Stuffing
+		byte c;
+		for (;;) {
+			if (length < 1) {
+				_stream->seek(lastSync);
+				continue;
+			}
+
+			c = _stream->readByte();
+			length--;
+
+			// XXX: for mpeg1, should test only bit 7
+			if (c != 0xFF)
+				break;
+		}
+
+		if ((c & 0xC0) == 0x40) {
+			// Buffer scale and size
+			_stream->readByte();
+			c = _stream->readByte();
+			length -= 2;
+		}
+
+		pts = 0xFFFFFFFF;
+		dts = 0xFFFFFFFF;
+
+		if ((c & 0xE0) == 0x20) {
+			dts = pts = readPTS(c);
+			length -= 4;
+
+			if (c & 0x10) {
+				dts = readPTS(-1);
+				length -= 5;
+			}
+		} else if ((c & 0xC0) == 0x80) {
+			// MPEG-2 PES
+			byte flags = _stream->readByte();
+			int headerLength = _stream->readByte();
+			length -= 2;
+
+			if (headerLength > length) {
+				_stream->seek(lastSync);
+				continue;
+			}
+
+			length -= headerLength;
+
+			if (flags & 0x80) {
+				dts = pts = readPTS(-1);
+				headerLength -= 5;
+
+				if (flags & 0x40) {
+					dts = readPTS(-1);
+					headerLength -= 5;
+				}
+			}
+
+			if (flags & 0x3F && headerLength == 0) {
+				flags &= 0xC0;
+				warning("Further flags set but no bytes left");
+			}
+
+			if (flags & 0x01) { // PES extension
+				byte pesExt =_stream->readByte();
+				headerLength--;
+
+				// Skip PES private data, program packet sequence
+				int skip = (pesExt >> 4) & 0xB;
+				skip += skip & 0x9;
+
+				if (pesExt & 0x40 || skip > headerLength) {
+					warning("pesExt %x is invalid", pesExt);
+					pesExt = skip = 0;
+				} else {
+					_stream->skip(skip);
+					headerLength -= skip;
+				}
+
+				if (pesExt & 0x01) { // PES extension 2
+					byte ext2Length = _stream->readByte();
+					headerLength--;
+
+					if ((ext2Length & 0x7F) != 0) {
+						byte idExt = _stream->readByte();
+
+						if ((idExt & 0x80) == 0)
+							startCode = (startCode & 0xFF) << 8;
+
+						headerLength--;
+					}
+				}
+			}
+
+			if (headerLength < 0) {
+				_stream->seek(lastSync);
+				continue;
+			}
+
+			_stream->skip(headerLength);
+		} else if (c != 0xF) {
+			continue;
+		}
+
+		if (length < 0) {
+			_stream->seek(lastSync);
+			continue;
+		}
+
+		return length;
+	}
+}
+
+uint32 MPEGPSDecoder::readPTS(int c) {
+	byte buf[5];
+
+	buf[0] = (c < 0) ? _stream->readByte() : c;
+	_stream->read(buf + 1, 4);
+
+	return ((buf[0] & 0x0E) << 29) | ((READ_BE_UINT16(buf + 1) >> 1) << 15) | (READ_BE_UINT16(buf + 3) >> 1);
+}
+
+void MPEGPSDecoder::parseProgramStreamMap(int length) {
+	_stream->readByte();
+	_stream->readByte();
+
+	// skip program stream info
+	_stream->skip(_stream->readUint16BE());
+
+	int esMapLength = _stream->readUint16BE();
+
+	while (esMapLength >= 4) {
+		byte type = _stream->readByte();
+		byte esID = _stream->readByte();
+		uint16 esInfoLength = _stream->readUint16BE();
+
+		// Remember mapping from stream id to stream type
+		_psmESType[esID] = type;
+
+		// Skip program stream info
+		_stream->skip(esInfoLength);
+
+		esMapLength -= 4 + esInfoLength;
+	}
+
+	_stream->readUint32BE(); // CRC32
+}
+
+bool MPEGPSDecoder::addFirstVideoTrack() {
+	for (;;) {
+		int32 startCode;
+		uint32 pts, dts;
+		int size = readNextPacketHeader(startCode, pts, dts);
+
+		// End of stream? We failed
+		if (size < 0)
+			return false;
+
+		if (startCode >= 0x1E0 && startCode <= 0x1EF) {
+			// Video stream
+			// Can be MPEG-1/2 or MPEG-4/h.264. We'll assume the former and
+			// I hope we never need the latter.
+			Common::SeekableReadStream *firstPacket = _stream->readStream(size);
+			MPEGVideoTrack *track = new MPEGVideoTrack(firstPacket, getDefaultHighColorFormat());
+			addTrack(track);
+			_streamMap[startCode] = track;
+			delete firstPacket;
+			break;
+		}
+
+		_stream->skip(size);
+	}
+
+	return true;
+}
+
+MPEGPSDecoder::PrivateStreamType MPEGPSDecoder::detectPrivateStreamType(Common::SeekableReadStream *packet) {
+	uint32 dvdCode = packet->readUint32LE();
+	if (packet->eos())
+		return kPrivateStreamUnknown;
+
+	uint32 ps2Header = packet->readUint32BE();
+	if (!packet->eos() && ps2Header == MKTAG('S', 'S', 'h', 'd'))
+		return kPrivateStreamPS2Audio;
+
+	switch (dvdCode & 0xE0) {
+	case 0x80:
+		if ((dvdCode & 0xF8) == 0x88)
+			return kPrivateStreamDTS;
+
+		return kPrivateStreamAC3;
+	case 0xA0:
+		return kPrivateStreamDVDPCM;
+	}
+
+	return kPrivateStreamUnknown;
+}
+
+MPEGPSDecoder::MPEGVideoTrack::MPEGVideoTrack(Common::SeekableReadStream *firstPacket, const Graphics::PixelFormat &format) {
+	_surface = 0;
+	_endOfTrack = false;
+	_curFrame = -1;
+	_nextFrameStartTime = Audio::Timestamp(0, 27000000); // 27 MHz timer
+
+	findDimensions(firstPacket, format);
+
+#ifdef USE_MPEG2
+	_mpegDecoder = new Image::MPEGDecoder();
+#endif
+}
+
+MPEGPSDecoder::MPEGVideoTrack::~MPEGVideoTrack() {
+#ifdef USE_MPEG2
+	delete _mpegDecoder;
+#endif
+
+	if (_surface) {
+		_surface->free();
+		delete _surface;
+	}
+}
+
+uint16 MPEGPSDecoder::MPEGVideoTrack::getWidth() const {
+	return _surface ? _surface->w : 0;
+}
+
+uint16 MPEGPSDecoder::MPEGVideoTrack::getHeight() const {
+	return _surface ? _surface->h : 0;
+}
+
+Graphics::PixelFormat MPEGPSDecoder::MPEGVideoTrack::getPixelFormat() const {
+	if (!_surface)
+		return Graphics::PixelFormat();
+
+	return _surface->format;
+}
+
+const Graphics::Surface *MPEGPSDecoder::MPEGVideoTrack::decodeNextFrame() {
+	return _surface;
+}
+
+bool MPEGPSDecoder::MPEGVideoTrack::sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts) {
+#ifdef USE_MPEG2
+	uint32 framePeriod;
+	bool foundFrame = _mpegDecoder->decodePacket(*packet, framePeriod, _surface);
+
+	if (foundFrame) {
+		_curFrame++;
+		_nextFrameStartTime = _nextFrameStartTime.addFrames(framePeriod);
+	}
+#endif
+
+	delete packet;
+
+#ifdef USE_MPEG2
+	return foundFrame;
+#else
+	return true;
+#endif
+}
+
+void MPEGPSDecoder::MPEGVideoTrack::findDimensions(Common::SeekableReadStream *firstPacket, const Graphics::PixelFormat &format) {
+	// First, check for the picture start code
+	if (firstPacket->readUint32BE() != 0x1B3)
+		error("Failed to detect MPEG sequence start");
+
+	// This is part of the bitstream, but there's really no purpose
+	// to use Common::BitStream just for this: 12 bits width, 12 bits
+	// height
+	uint16 width = firstPacket->readByte() << 4;
+	uint16 height = firstPacket->readByte();
+	width |= (height & 0xF0) >> 4;
+	height = ((height & 0x0F) << 8) | firstPacket->readByte();
+
+	debug(0, "MPEG dimensions: %dx%d", width, height);
+
+	_surface = new Graphics::Surface();
+	_surface->create(width, height, format);
+
+	firstPacket->seek(0);
+}
+
+#ifdef USE_MAD
+
+// The audio code here is almost entirely based on what we do in mp3.cpp
+
+MPEGPSDecoder::MPEGAudioTrack::MPEGAudioTrack(Common::SeekableReadStream *firstPacket) {
+	// The MAD_BUFFER_GUARD must always contain zeros (the reason
+	// for this is that the Layer III Huffman decoder of libMAD
+	// may read a few bytes beyond the end of the input buffer).
+	memset(_buf + BUFFER_SIZE, 0, MAD_BUFFER_GUARD);
+
+	_state = MP3_STATE_INIT;
+	_audStream = 0;
+
+	// Find out our audio parameters
+	initStream(firstPacket);
+
+	while (_state != MP3_STATE_EOS)
+		readHeader(firstPacket);
+
+	_audStream = Audio::makeQueuingAudioStream(_frame.header.samplerate, MAD_NCHANNELS(&_frame.header) == 2);
+
+	deinitStream();
+
+	firstPacket->seek(0);
+	_state = MP3_STATE_INIT;
+}
+
+MPEGPSDecoder::MPEGAudioTrack::~MPEGAudioTrack() {
+	deinitStream();
+	delete _audStream;
+}
+
+static inline int scaleSample(mad_fixed_t sample) {
+	// round
+	sample += (1L << (MAD_F_FRACBITS - 16));
+
+	// clip
+	if (sample > MAD_F_ONE - 1)
+		sample = MAD_F_ONE - 1;
+	else if (sample < -MAD_F_ONE)
+		sample = -MAD_F_ONE;
+
+	// quantize and scale to not saturate when mixing a lot of channels
+	return sample >> (MAD_F_FRACBITS + 1 - 16);
+}
+
+bool MPEGPSDecoder::MPEGAudioTrack::sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts) {
+	while (_state != MP3_STATE_EOS)
+		decodeMP3Data(packet);
+
+	_state = MP3_STATE_READY;
+	delete packet;
+	return true;
+}
+
+Audio::AudioStream *MPEGPSDecoder::MPEGAudioTrack::getAudioStream() const {
+	return _audStream;
+}
+
+void MPEGPSDecoder::MPEGAudioTrack::initStream(Common::SeekableReadStream *packet) {
+	if (_state != MP3_STATE_INIT)
+		deinitStream();
+
+	// Init MAD
+	mad_stream_init(&_stream);
+	mad_frame_init(&_frame);
+	mad_synth_init(&_synth);
+
+	// Reset the stream data
+	packet->seek(0, SEEK_SET);
+
+	// Update state
+	_state = MP3_STATE_READY;
+
+	// Read the first few sample bytes
+	readMP3Data(packet);
+}
+
+void MPEGPSDecoder::MPEGAudioTrack::deinitStream() {
+	if (_state == MP3_STATE_INIT)
+		return;
+
+	// Deinit MAD
+	mad_synth_finish(&_synth);
+	mad_frame_finish(&_frame);
+	mad_stream_finish(&_stream);
+
+	_state = MP3_STATE_EOS;
+}
+
+void MPEGPSDecoder::MPEGAudioTrack::readMP3Data(Common::SeekableReadStream *packet) {
+	uint32 remaining = 0;
+
+	// Give up immediately if we already used up all data in the stream
+	if (packet->eos()) {
+		_state = MP3_STATE_EOS;
+		return;
+	}
+
+	if (_stream.next_frame) {
+		// If there is still data in the MAD stream, we need to preserve it.
+		// Note that we use memmove, as we are reusing the same buffer,
+		// and hence the data regions we copy from and to may overlap.
+		remaining = _stream.bufend - _stream.next_frame;
+		assert(remaining < BUFFER_SIZE);	// Paranoia check
+		memmove(_buf, _stream.next_frame, remaining);
+	}
+
+	memset(_buf + remaining, 0, BUFFER_SIZE - remaining);
+
+	// Try to read the next block
+	uint32 size = packet->read(_buf + remaining, BUFFER_SIZE - remaining);
+	if (size == 0) {
+		_state = MP3_STATE_EOS;
+		return;
+	}
+
+	// Feed the data we just read into the stream decoder
+	_stream.error = MAD_ERROR_NONE;
+	mad_stream_buffer(&_stream, _buf, size + remaining);
+}
+
+void MPEGPSDecoder::MPEGAudioTrack::readHeader(Common::SeekableReadStream *packet) {
+	if (_state != MP3_STATE_READY)
+		return;
+
+	// If necessary, load more data into the stream decoder
+	if (_stream.error == MAD_ERROR_BUFLEN)
+		readMP3Data(packet);
+
+	while (_state != MP3_STATE_EOS) {
+		_stream.error = MAD_ERROR_NONE;
+
+		// Decode the next header. Note: mad_frame_decode would do this for us, too.
+		// However, for seeking we don't want to decode the full frame (else it would
+		// be far too slow). Hence we perform this explicitly in a separate step.
+		if (mad_header_decode(&_frame.header, &_stream) == -1) {
+			if (_stream.error == MAD_ERROR_BUFLEN) {
+				readMP3Data(packet);  // Read more data
+				continue;
+			} else if (MAD_RECOVERABLE(_stream.error)) {
+				debug(6, "MPEGAudioTrack::readHeader(): Recoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream));
+				continue;
+			} else {
+				warning("MPEGAudioTrack::readHeader(): Unrecoverable error in mad_header_decode (%s)", mad_stream_errorstr(&_stream));
+				break;
+			}
+		}
+
+		break;
+	}
+
+	if (_stream.error != MAD_ERROR_NONE)
+		_state = MP3_STATE_EOS;
+}
+
+void MPEGPSDecoder::MPEGAudioTrack::decodeMP3Data(Common::SeekableReadStream *packet) {
+	if (_state == MP3_STATE_INIT)
+		initStream(packet);
+
+	if (_state == MP3_STATE_EOS)
+		return;
+
+	do {
+		// If necessary, load more data into the stream decoder
+		if (_stream.error == MAD_ERROR_BUFLEN)
+			readMP3Data(packet);
+
+		while (_state == MP3_STATE_READY) {
+			_stream.error = MAD_ERROR_NONE;
+
+			// Decode the next frame
+			if (mad_frame_decode(&_frame, &_stream) == -1) {
+				if (_stream.error == MAD_ERROR_BUFLEN) {
+					break; // Read more data
+				} else if (MAD_RECOVERABLE(_stream.error)) {
+					// Note: we will occasionally see MAD_ERROR_BADDATAPTR errors here.
+					// These are normal and expected (caused by our frame skipping (i.e. "seeking")
+					// code above).
+					debug(6, "MPEGAudioTrack::decodeMP3Data(): Recoverable error in mad_frame_decode (%s)", mad_stream_errorstr(&_stream));
+					continue;
+				} else {
+					warning("MPEGAudioTrack::decodeMP3Data(): Unrecoverable error in mad_frame_decode (%s)", mad_stream_errorstr(&_stream));
+					break;
+				}
+			}
+
+			// Synthesize PCM data
+			mad_synth_frame(&_synth, &_frame);
+
+			// Output it to our queue
+			if (_synth.pcm.length != 0) {
+				byte *buffer = (byte *)malloc(_synth.pcm.length * 2 * MAD_NCHANNELS(&_frame.header));
+				int16 *ptr = (int16 *)buffer;
+
+				for (int i = 0; i < _synth.pcm.length; i++) {
+					*ptr++ = (int16)scaleSample(_synth.pcm.samples[0][i]);
+
+					if (MAD_NCHANNELS(&_frame.header) == 2)
+						*ptr++ = (int16)scaleSample(_synth.pcm.samples[1][i]);
+				}
+
+				int flags = Audio::FLAG_16BITS;
+
+				if (_audStream->isStereo())
+					flags |= Audio::FLAG_STEREO;
+
+#ifdef SCUMM_LITTLE_ENDIAN
+				flags |= Audio::FLAG_LITTLE_ENDIAN;
+#endif
+
+				_audStream->queueBuffer(buffer, _synth.pcm.length * 2 * MAD_NCHANNELS(&_frame.header), DisposeAfterUse::YES, flags);
+			}
+			break;
+		}
+	} while (_state != MP3_STATE_EOS && _stream.error == MAD_ERROR_BUFLEN);
+
+	if (_stream.error != MAD_ERROR_NONE)
+		_state = MP3_STATE_EOS;
+}
+
+#endif
+
+} // End of namespace Video
diff --git a/video/mpegps_decoder.h b/video/mpegps_decoder.h
new file mode 100644
index 0000000000..0184d6f9ba
--- /dev/null
+++ b/video/mpegps_decoder.h
@@ -0,0 +1,189 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef VIDEO_MPEGPS_DECODER_H
+#define VIDEO_MPEGPS_DECODER_H
+
+#include "common/hashmap.h"
+#include "graphics/surface.h"
+#include "video/video_decoder.h"
+
+#ifdef USE_MAD
+#include <mad.h>
+#endif
+
+namespace Audio {
+class QueuingAudioStream;
+}
+
+namespace Common {
+class SeekableReadStream;
+}
+
+namespace Graphics {
+struct PixelFormat;
+}
+
+namespace Image {
+class MPEGDecoder;
+}
+
+namespace Video {
+
+/**
+ * Decoder for MPEG Program Stream videos.
+ * Video decoder used in engines:
+ *  - zvision
+ */
+class MPEGPSDecoder : public VideoDecoder {
+public:
+	MPEGPSDecoder();
+	virtual ~MPEGPSDecoder();
+
+	bool loadStream(Common::SeekableReadStream *stream);
+	void close();
+
+protected:
+	void readNextPacket();
+	bool useAudioSync() const { return false; }
+
+private:
+	// Base class for handling MPEG streams
+	class MPEGStream {
+	public:
+		virtual ~MPEGStream() {}
+
+		enum StreamType {
+			kStreamTypeVideo,
+			kStreamTypeAudio
+		};
+
+		virtual bool sendPacket(Common::SeekableReadStream *firstPacket, uint32 pts, uint32 dts) = 0;
+		virtual StreamType getStreamType() const = 0;
+	};
+
+	// An MPEG 1/2 video track
+	class MPEGVideoTrack : public VideoTrack, public MPEGStream {
+	public:
+		MPEGVideoTrack(Common::SeekableReadStream *firstPacket, const Graphics::PixelFormat &format);
+		~MPEGVideoTrack();
+
+		bool endOfTrack() const { return _endOfTrack; }
+		uint16 getWidth() const;
+		uint16 getHeight() const;
+		Graphics::PixelFormat getPixelFormat() const;
+		int getCurFrame() const { return _curFrame; }
+		uint32 getNextFrameStartTime() const { return _nextFrameStartTime.msecs(); }
+		const Graphics::Surface *decodeNextFrame();
+
+		bool sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts);
+		StreamType getStreamType() const { return kStreamTypeVideo; }
+
+		void setEndOfTrack() { _endOfTrack = true; }
+
+	private:
+		bool _endOfTrack;
+		int _curFrame;
+		Audio::Timestamp _nextFrameStartTime;
+		Graphics::Surface *_surface;
+
+		void findDimensions(Common::SeekableReadStream *firstPacket, const Graphics::PixelFormat &format);
+
+#ifdef USE_MPEG2
+		Image::MPEGDecoder *_mpegDecoder;
+#endif
+	};
+
+#ifdef USE_MAD
+	// An MPEG audio track
+	// TODO: Merge this with the normal MP3Stream somehow
+	class MPEGAudioTrack : public AudioTrack, public MPEGStream {
+	public:
+		MPEGAudioTrack(Common::SeekableReadStream *firstPacket);
+		~MPEGAudioTrack();
+
+		bool sendPacket(Common::SeekableReadStream *packet, uint32 pts, uint32 dts);
+		StreamType getStreamType() const { return kStreamTypeAudio; }
+
+	protected:
+		Audio::AudioStream *getAudioStream() const;
+
+	private:
+		Audio::QueuingAudioStream *_audStream;
+
+		enum State {
+			MP3_STATE_INIT,  // Need to init the decoder
+			MP3_STATE_READY, // ready for processing data
+			MP3_STATE_EOS    // end of data reached (may need to loop)
+		};
+
+		State _state;
+
+		mad_stream _stream;
+		mad_frame _frame;
+		mad_synth _synth;
+
+		enum {
+			BUFFER_SIZE = 5 * 8192
+		};
+
+		// This buffer contains a slab of input data
+		byte _buf[BUFFER_SIZE + MAD_BUFFER_GUARD];
+
+		void initStream(Common::SeekableReadStream *packet);
+		void deinitStream();
+		void readMP3Data(Common::SeekableReadStream *packet);
+		void readHeader(Common::SeekableReadStream *packet);
+		void decodeMP3Data(Common::SeekableReadStream *packet);
+	};
+#endif
+
+	// The different types of private streams we can detect at the moment
+	enum PrivateStreamType {
+		kPrivateStreamUnknown,
+		kPrivateStreamAC3,
+		kPrivateStreamDTS,
+		kPrivateStreamDVDPCM,
+		kPrivateStreamPS2Audio
+	};
+
+	PrivateStreamType detectPrivateStreamType(Common::SeekableReadStream *packet);
+
+	bool addFirstVideoTrack();
+
+	int readNextPacketHeader(int32 &startCode, uint32 &pts, uint32 &dts);
+	int findNextStartCode(uint32 &size);
+	uint32 readPTS(int c);
+
+	void parseProgramStreamMap(int length);
+	byte _psmESType[256];
+
+	// A map from stream types to stream handlers
+	typedef Common::HashMap<int, MPEGStream *> StreamMap;
+	StreamMap _streamMap;
+
+	Common::SeekableReadStream *_stream;
+};
+
+} // End of namespace Video
+
+#endif
-- 
cgit v1.2.3


From 9e1510e715465db8930d8d241bdad2ca6020326d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 9 Jan 2015 00:37:16 +0200
Subject: ZVISION: Provide a better description for the double FPS game option

---
 engines/zvision/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 66152403cf..0385a0fd99 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -175,7 +175,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_DOUBLE_FPS,
 		{
 			_s("Double FPS"),
-			_s("Halve the update delay"),
+			_s("Increase game FPS from 30 to 60"),
 			"doublefps",
 			false
 		}
-- 
cgit v1.2.3


From 345b33d9f0ea971e0ca69f1165d9d3b69d67984c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 9 Jan 2015 00:38:15 +0200
Subject: ZVISION: Remove dead code

---
 engines/zvision/file/save_manager.cpp | 27 ---------------------------
 engines/zvision/file/save_manager.h   |  1 -
 2 files changed, 28 deletions(-)

diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 042fafd38e..022b08884f 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -162,33 +162,6 @@ Common::Error SaveManager::loadGame(uint slot) {
 	return Common::kNoError;
 }
 
-Common::Error SaveManager::loadGame(const Common::String &saveName) {
-	Common::File *saveFile = _engine->getSearchManager()->openFile(saveName);
-	if (saveFile == NULL) {
-		saveFile = new Common::File;
-		if (!saveFile->open(saveName)) {
-			delete saveFile;
-			return Common::kPathDoesNotExist;
-		}
-	}
-
-	// Read the header
-	SaveGameHeader header;
-	if (!readSaveGameHeader(saveFile, header)) {
-		return Common::kUnknownError;
-	}
-
-	ScriptManager *scriptManager = _engine->getScriptManager();
-	// Update the state table values
-	scriptManager->deserialize(saveFile);
-
-	delete saveFile;
-	if (header.thumbnail)
-		delete header.thumbnail;
-
-	return Common::kNoError;
-}
-
 bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &header) {
 	uint32 tag = in->readUint32BE();
 	// Check if it's original savegame than fill header structure
diff --git a/engines/zvision/file/save_manager.h b/engines/zvision/file/save_manager.h
index fc8db67566..516d0e75cd 100644
--- a/engines/zvision/file/save_manager.h
+++ b/engines/zvision/file/save_manager.h
@@ -93,7 +93,6 @@ public:
 	 * @param slot    The save slot to load. Must be [1, 20]
 	 */
 	Common::Error loadGame(uint slot);
-	Common::Error loadGame(const Common::String &saveName);
 
 	Common::SeekableReadStream *getSlotFile(uint slot);
 	bool readSaveGameHeader(Common::SeekableReadStream *in, SaveGameHeader &header);
-- 
cgit v1.2.3


From 79b92fe04698d3336f1d5232d4701133ff3ac10c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 9 Jan 2015 01:09:53 +0200
Subject: ZVISION: Clean up save logic, and fix a thumbnail-related FIXME

This fixes the save game thumbnails when using the original save/load
screens
---
 engines/zvision/detection.cpp                      |  2 +-
 engines/zvision/file/save_manager.cpp              | 59 ++++++++++------------
 engines/zvision/file/save_manager.h                |  9 ++--
 .../zvision/scripting/controls/save_control.cpp    |  4 +-
 4 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 0385a0fd99..1295f76705 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -261,7 +261,7 @@ Common::Error ZVision::ZVision::loadGameState(int slot) {
 }
 
 Common::Error ZVision::ZVision::saveGameState(int slot, const Common::String &desc) {
-	_saveManager->saveGame(slot, desc);
+	_saveManager->saveGame(slot, desc, false);
 	return Common::kNoError;
 }
 
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 022b08884f..fb9cceecbe 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -69,7 +69,7 @@ bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
 		return false;
 
 	if (isSave) {
-		saveGame(slot, desc);
+		saveGame(slot, desc, false);
 		return true;
 	} else {
 		Common::ErrorCode result = loadGame(slot).getCode();
@@ -77,46 +77,34 @@ bool SaveManager::scummVMSaveLoadDialog(bool isSave) {
 	}
 }
 
-void SaveManager::saveGame(uint slot, const Common::String &saveName) {
-	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
-	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
-
-	writeSaveGameHeader(file, saveName);
+void SaveManager::saveGame(uint slot, const Common::String &saveName, bool useSaveBuffer) {
+	if (!_tempSave && useSaveBuffer)
+		return;
 
-	_engine->getScriptManager()->serialize(file);
-
-	file->finalize();
-	delete file;
-
-	_lastSaveTime = g_system->getMillis();
-}
-
-void SaveManager::saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream) {
 	Common::SaveFileManager *saveFileManager = g_system->getSavefileManager();
 	Common::OutSaveFile *file = saveFileManager->openForSaving(_engine->generateSaveFileName(slot));
 
-	writeSaveGameHeader(file, saveName);
+	writeSaveGameHeader(file, saveName, useSaveBuffer);
 
-	file->write(stream->getData(), stream->size());
+	if (useSaveBuffer)
+		file->write(_tempSave->getData(), _tempSave->size());
+	else
+		_engine->getScriptManager()->serialize(file);
 
 	file->finalize();
 	delete file;
 
-	_lastSaveTime = g_system->getMillis();
-}
-
-void SaveManager::saveGameBuffered(uint slot, const Common::String &saveName) {
-	if (_tempSave) {
-		saveGame(slot, saveName, _tempSave);
+	if (useSaveBuffer)
 		flushSaveBuffer();
-	}
+
+	_lastSaveTime = g_system->getMillis();
 }
 
 void SaveManager::autoSave() {
-	saveGame(0, "Auto save");
+	saveGame(0, "Auto save", false);
 }
 
-void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName) {
+void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName, bool useSaveBuffer) {
 	file->writeUint32BE(SAVEGAME_ID);
 
 	// Write version
@@ -126,8 +114,11 @@ void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::S
 	file->writeString(saveName);
 	file->writeByte(0);
 
-	// Create a thumbnail and save it
-	Graphics::saveThumbnail(*file);
+	// Save the game thumbnail
+	if (useSaveBuffer)
+		file->write(_tempThumbnail->getData(), _tempThumbnail->size());
+	else
+		Graphics::saveThumbnail(*file);
 
 	// Write out the save date/time
 	TimeDate td;
@@ -245,18 +236,20 @@ Common::SeekableReadStream *SaveManager::getSlotFile(uint slot) {
 }
 
 void SaveManager::prepareSaveBuffer() {
-	if (_tempSave)
-		delete _tempSave;
+	delete _tempThumbnail;
+	_tempThumbnail = new Common::MemoryWriteStreamDynamic;
+	Graphics::saveThumbnail(*_tempThumbnail);
 
+	delete _tempSave;
 	_tempSave = new Common::MemoryWriteStreamDynamic;
-
 	_engine->getScriptManager()->serialize(_tempSave);
 }
 
 void SaveManager::flushSaveBuffer() {
-	if (_tempSave)
-		delete _tempSave;
+	delete _tempThumbnail;
+	_tempThumbnail = NULL;
 
+	delete _tempSave;
 	_tempSave = NULL;
 }
 
diff --git a/engines/zvision/file/save_manager.h b/engines/zvision/file/save_manager.h
index 516d0e75cd..d3f6aaaedc 100644
--- a/engines/zvision/file/save_manager.h
+++ b/engines/zvision/file/save_manager.h
@@ -48,7 +48,7 @@ struct SaveGameHeader {
 
 class SaveManager {
 public:
-	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL), _lastSaveTime(0) {}
+	SaveManager(ZVision *engine) : _engine(engine), _tempSave(NULL), _tempThumbnail(NULL), _lastSaveTime(0) {}
 	~SaveManager() {
 		flushSaveBuffer();
 	}
@@ -67,6 +67,7 @@ private:
 		SAVE_VERSION = 1
 	};
 
+	Common::MemoryWriteStreamDynamic *_tempThumbnail;
 	Common::MemoryWriteStreamDynamic *_tempSave;
 
 public:
@@ -83,9 +84,7 @@ public:
 	 * @param slot        The save slot this save pertains to. Must be [1, 20]
 	 * @param saveName    The internal name for this save. This is NOT the name of the actual save file.
 	 */
-	void saveGame(uint slot, const Common::String &saveName);
-	void saveGame(uint slot, const Common::String &saveName, Common::MemoryWriteStreamDynamic *stream);
-	void saveGameBuffered(uint slot, const Common::String &saveName);
+	void saveGame(uint slot, const Common::String &saveName, bool useSaveBuffer);
 	/**
 	 * Loads the state data from the save file that slot references. Uses
 	 * ZVision::generateSaveFileName(slot) to get the save file name.
@@ -101,7 +100,7 @@ public:
 	void flushSaveBuffer();
 	bool scummVMSaveLoadDialog(bool isSave);
 private:
-	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName);
+	void writeSaveGameHeader(Common::OutSaveFile *file, const Common::String &saveName, bool useSaveBuffer);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index 6cedddffeb..2ac77c4776 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -102,9 +102,7 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 								toSave = false;
 
 						if (toSave) {
-							// FIXME: At this point, the screen shows the save control, so the save game thumbnails will always
-							// show the save control
-							_engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText());
+							_engine->getSaveManager()->saveGame(iter->saveId, inp->getText(), true);
 							_engine->getRenderManager()->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
 							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
 						}
-- 
cgit v1.2.3


From c82480461cacab7893053d8e4821b3a6987552c9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 10 Jan 2015 01:36:20 +0200
Subject: ZVISION: Make sure only existing files are dumped

---
 engines/zvision/core/console.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 65821b1702..f39c06b57e 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -263,7 +263,8 @@ bool Console::cmdDumpFiles(int argc, const char **argv) {
 		debugPrintf("Dumping %s\n", fileName.c_str());
 
 		in = iter->_value.arch->createReadStreamForMember(iter->_value.name);
-		dumpFile(in, fileName.c_str());
+		if (in)
+			dumpFile(in, fileName.c_str());
 		delete in;
 	}
 
-- 
cgit v1.2.3


From 2d0075817ae6203063fb01f61b0828712e0259f0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 10 Jan 2015 01:37:39 +0200
Subject: ZVISION: Remove unused variable

---
 engines/zvision/graphics/render_manager.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index c22f9a78c9..6081e982f9 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -106,7 +106,6 @@ private:
 
 	// A buffer for subtitles
 	Graphics::Surface _subtitleSurface;
-	Common::Rect _subtitleSurfaceDirtyRect;
 
 	// Rectangle for subtitles area
 	Common::Rect _subtitleArea;
-- 
cgit v1.2.3


From 616b34e629686d7bfc3e5a74658c6a76b4a45c94 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 10 Jan 2015 17:30:11 +0200
Subject: ZVISION: Change wording

---
 engines/zvision/scripting/script_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index ba38d3a0e4..8220d5c37c 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -500,7 +500,7 @@ void ScriptManager::changeLocation(char _world, char _room, char _node, char _vi
 	_nextLocation.node = _node;
 	_nextLocation.view = _view;
 	_nextLocation.offset = offset;
-	// If next location 0000 - it's indicate to go to previous location.
+	// If next location is 0000, return to the previous location.
 	if (_nextLocation.world == '0' && _nextLocation.room == '0' && _nextLocation.node == '0' && _nextLocation.view == '0') {
 		if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
 			_nextLocation.world = getStateValue(StateKey_LastWorld);
-- 
cgit v1.2.3


From 899cf4813c7e009e1dbee56be8ad10d20650cf10 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 10 Jan 2015 21:32:15 +0200
Subject: ZVISION: Change screen resolution for the hires DVD videos to 800x600

Also, this hooks up the MPEG-PS decoder, but only if libmpeg2 is
compiled in. The DVD videos are still disabled until AC3 audio support
is implemented.
The hires DVD videos are encoded a 720x480 resolution, with double the
frame rate of the lowres ones (29.97FPS up from 15FPS)
---
 engines/zvision/graphics/render_manager.cpp | 57 ++++++++++++++++++-----------
 engines/zvision/graphics/render_manager.h   | 10 ++---
 engines/zvision/scripting/actions.cpp       | 50 ++++++++++++++++---------
 engines/zvision/text/subtitles.cpp          |  9 ++++-
 engines/zvision/text/subtitles.h            |  2 +-
 engines/zvision/video/video.cpp             |  8 +---
 engines/zvision/zvision.cpp                 |  6 +++
 engines/zvision/zvision.h                   | 40 +++++++++++---------
 8 files changed, 112 insertions(+), 70 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index a1cc8ac53c..4a43e09b07 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -42,28 +42,25 @@ namespace ZVision {
 RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat, bool doubleFPS)
 	: _engine(engine),
 	  _system(engine->_system),
-	  _workingWidth(workingWindow.width()),
-	  _workingHeight(workingWindow.height()),
-	  _screenCenterX(_workingWidth / 2),
-	  _screenCenterY(_workingHeight / 2),
+	  _screenCenterX(_workingWindow.width() / 2),
+	  _screenCenterY(_workingWindow.height() / 2),
 	  _workingWindow(workingWindow),
 	  _pixelFormat(pixelFormat),
 	  _backgroundWidth(0),
 	  _backgroundHeight(0),
 	  _backgroundOffset(0),
-	  _renderTable(_workingWidth, _workingHeight),
-	  _doubleFPS(doubleFPS) {
+	  _renderTable(_workingWindow.width(), _workingWindow.height()),
+	  _doubleFPS(doubleFPS),
+	  _subid(0) {
 
-	_backgroundSurface.create(_workingWidth, _workingHeight, _pixelFormat);
-	_effectSurface.create(_workingWidth, _workingHeight, _pixelFormat);
-	_warpedSceneSurface.create(_workingWidth, _workingHeight, _pixelFormat);
+	_backgroundSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat);
+	_effectSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat);
+	_warpedSceneSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat);
 	_menuSurface.create(windowWidth, workingWindow.top, _pixelFormat);
-	_subtitleSurface.create(windowWidth, windowHeight - workingWindow.bottom, _pixelFormat);
-
+	
 	_menuArea = Common::Rect(0, 0, windowWidth, workingWindow.top);
-	_subtitleArea = Common::Rect(0, workingWindow.bottom, windowWidth, windowHeight);
 
-	_subid = 0;
+	initSubArea(windowWidth, windowHeight, workingWindow);
 }
 
 RenderManager::~RenderManager() {
@@ -83,7 +80,7 @@ void RenderManager::renderSceneToScreen() {
 	// If we have graphical effects, we apply them using a temporary buffer
 	if (!_effects.empty()) {
 		bool copied = false;
-		Common::Rect windowRect(_workingWidth, _workingHeight);
+		Common::Rect windowRect(_workingWindow.width(), _workingWindow.height());
 
 		for (EffectsList::iterator it = _effects.begin(); it != _effects.end(); it++) {
 			Common::Rect rect = (*it)->getRegion();
@@ -121,7 +118,7 @@ void RenderManager::renderSceneToScreen() {
 		if (!_backgroundSurfaceDirtyRect.isEmpty()) {
 			_renderTable.mutateImage(&_warpedSceneSurface, in);
 			out = &_warpedSceneSurface;
-			outWndDirtyRect = Common::Rect(_workingWidth, _workingHeight);
+			outWndDirtyRect = Common::Rect(_workingWindow.width(), _workingWindow.height());
 		}
 	} else {
 		out = in;
@@ -590,7 +587,7 @@ void RenderManager::prepareBackground() {
 
 	if (state == RenderTable::PANORAMA) {
 		// Calculate the visible portion of the background
-		Common::Rect viewPort(_workingWidth, _workingHeight);
+		Common::Rect viewPort(_workingWindow.width(), _workingWindow.height());
 		viewPort.translate(-(_screenCenterX - _backgroundOffset), 0);
 		Common::Rect drawRect = _backgroundDirtyRect;
 		drawRect.clip(viewPort);
@@ -635,7 +632,7 @@ void RenderManager::prepareBackground() {
 		}
 	} else if (state == RenderTable::TILT) {
 		// Tilt doesn't allow wrapping, so we just do a simple clip
-		Common::Rect viewPort(_workingWidth, _workingHeight);
+		Common::Rect viewPort(_workingWindow.width(), _workingWindow.height());
 		viewPort.translate(0, -(_screenCenterY - _backgroundOffset));
 		Common::Rect drawRect = _backgroundDirtyRect;
 		drawRect.clip(viewPort);
@@ -655,7 +652,7 @@ void RenderManager::prepareBackground() {
 	// Clear the dirty rect since everything is clean now
 	_backgroundDirtyRect = Common::Rect();
 
-	_backgroundSurfaceDirtyRect.clip(_workingWidth, _workingHeight);
+	_backgroundSurfaceDirtyRect.clip(_workingWindow.width(), _workingWindow.height());
 }
 
 void RenderManager::clearMenuSurface() {
@@ -687,6 +684,15 @@ void RenderManager::renderMenuToScreen() {
 	}
 }
 
+void RenderManager::initSubArea(uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow) {
+	_workingWindow = workingWindow;
+
+	_subtitleSurface.free();
+
+	_subtitleSurface.create(windowWidth, windowHeight - workingWindow.bottom, _pixelFormat);
+	_subtitleArea = Common::Rect(0, workingWindow.bottom, windowWidth, windowHeight);
+}
+
 uint16 RenderManager::createSubArea(const Common::Rect &area) {
 	_subid++;
 
@@ -791,8 +797,8 @@ Common::Rect RenderManager::transformBackgroundSpaceRectToScreenSpace(const Comm
 
 	if (state == RenderTable::PANORAMA) {
 		if (_backgroundOffset < _screenCenterX) {
-			Common::Rect rScreen(_screenCenterX + _backgroundOffset, _workingHeight);
-			Common::Rect lScreen(_workingWidth - rScreen.width(), _workingHeight);
+			Common::Rect rScreen(_screenCenterX + _backgroundOffset, _workingWindow.height());
+			Common::Rect lScreen(_workingWindow.width() - rScreen.width(), _workingWindow.height());
 			lScreen.translate(_backgroundWidth - lScreen.width(), 0);
 			lScreen.clip(src);
 			rScreen.clip(src);
@@ -802,8 +808,8 @@ Common::Rect RenderManager::transformBackgroundSpaceRectToScreenSpace(const Comm
 				tmp.translate(_screenCenterX - _backgroundOffset, 0);
 			}
 		} else if (_backgroundWidth - _backgroundOffset < _screenCenterX) {
-			Common::Rect rScreen(_screenCenterX - (_backgroundWidth - _backgroundOffset), _workingHeight);
-			Common::Rect lScreen(_workingWidth - rScreen.width(), _workingHeight);
+			Common::Rect rScreen(_screenCenterX - (_backgroundWidth - _backgroundOffset), _workingWindow.height());
+			Common::Rect lScreen(_workingWindow.width() - rScreen.width(), _workingWindow.height());
 			lScreen.translate(_backgroundWidth - lScreen.width(), 0);
 			lScreen.clip(src);
 			rScreen.clip(src);
@@ -1172,4 +1178,11 @@ void RenderManager::rotateTo(int16 _toPos, int16 _time) {
 	_engine->startClock();
 }
 
+void RenderManager::upscaleRect(Common::Rect &rect) {
+	rect.top = rect.top * HIRES_WINDOW_HEIGHT / WINDOW_HEIGHT;
+	rect.left = rect.left * HIRES_WINDOW_WIDTH / WINDOW_WIDTH;
+	rect.bottom = rect.bottom * HIRES_WINDOW_HEIGHT / WINDOW_HEIGHT;
+	rect.right = rect.right * HIRES_WINDOW_WIDTH / WINDOW_WIDTH;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index 6081e982f9..e3cbbc34ce 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -73,12 +73,8 @@ private:
 	 * are given in this coordinate space. Also, all images are clipped to the
 	 * edges of this Rectangle
 	 */
-	const Common::Rect _workingWindow;
+	Common::Rect _workingWindow;
 
-	// Width of the working window. Saved to prevent extraneous calls to _workingWindow.width()
-	const int _workingWidth;
-	// Height of the working window. Saved to prevent extraneous calls to _workingWindow.height()
-	const int _workingHeight;
 	// Center of the screen in the x direction
 	const int _screenCenterX;
 	// Center of the screen in the y direction
@@ -241,6 +237,8 @@ public:
 
 	// Subtitles methods
 
+	void initSubArea(uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow);
+
 	// Create subtitle area and return ID
 	uint16 createSubArea(const Common::Rect &area);
 	uint16 createSubArea();
@@ -334,6 +332,8 @@ public:
 	void checkBorders();
 	void rotateTo(int16 to, int16 time);
 	void updateRotation();
+
+	void upscaleRect(Common::Rect &rect);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index f60fdbb973..e3fc6fa549 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -912,7 +912,15 @@ ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Commo
 bool ActionStreamVideo::execute() {
 	Video::VideoDecoder *decoder;
 	Common::Rect destRect = Common::Rect(_x1, _y1, _x2 + 1, _y2 + 1);
+	Common::String subname = _fileName;
+	subname.setChar('s', subname.size() - 3);
+	subname.setChar('u', subname.size() - 2);
+	subname.setChar('b', subname.size() - 1);
+	bool subtitleExists = _engine->getSearchManager()->hasFile(subname);
+	bool switchToHires = false;
 
+// NOTE: We only show the hires MPEG2 videos when libmpeg2 is compiled in,
+// otherwise we fall back to the lowres ones
 #ifdef USE_MPEG2
 	Common::String hiresFileName = _fileName;
 	hiresFileName.setChar('d', hiresFileName.size() - 8);
@@ -920,36 +928,44 @@ bool ActionStreamVideo::execute() {
 	hiresFileName.setChar('o', hiresFileName.size() - 2);
 	hiresFileName.setChar('b', hiresFileName.size() - 1);
 
-	if (_engine->getScriptManager()->getStateValue(StateKey_MPEGMovies) == 1 &&_engine->getSearchManager()->hasFile(hiresFileName))
-		// TODO: Enable once VOB + AC3 support is implemented
-		//_fileName = hiresFileName;
+	if (_engine->getScriptManager()->getStateValue(StateKey_MPEGMovies) == 1 &&_engine->getSearchManager()->hasFile(hiresFileName)) {
+		// TODO: Enable once AC3 support is implemented
+		if (!_engine->getSearchManager()->hasFile(_fileName))	// Check for the regular video
+			return true;
 		warning("The hires videos of the DVD version of ZGI aren't supported yet, using lowres");
-#endif
-
-	Common::String subname = _fileName;
-	subname.setChar('s', subname.size() - 3);
-	subname.setChar('u', subname.size() - 2);
-	subname.setChar('b', subname.size() - 1);
-
+		//_fileName = hiresFileName;
+		//switchToHires = true;
+	} else if (!_engine->getSearchManager()->hasFile(_fileName))
+		return true;
+#else
 	if (!_engine->getSearchManager()->hasFile(_fileName))
 		return true;
+#endif
 
 	decoder = _engine->loadAnimation(_fileName);
+	Subtitle *sub = (subtitleExists) ? new Subtitle(_engine, subname, switchToHires) : NULL;
 
 	_engine->getCursorManager()->showMouse(false);
 
-	Subtitle *sub = NULL;
-
-	if (_engine->getSearchManager()->hasFile(subname))
-		sub = new Subtitle(_engine, subname);
+	if (switchToHires) {
+		_engine->initHiresScreen();
+		destRect = Common::Rect(40, -40, 760, 440);
+		Common::Rect workingWindow = _engine->_workingWindow;
+		workingWindow.translate(0, -40);
+		_engine->getRenderManager()->initSubArea(HIRES_WINDOW_WIDTH, HIRES_WINDOW_HEIGHT, workingWindow);
+	}
 
 	_engine->playVideo(*decoder, destRect, _skippable, sub);
-	delete decoder;
+
+	if (switchToHires) {
+		_engine->initScreen();
+		_engine->getRenderManager()->initSubArea(WINDOW_WIDTH, WINDOW_HEIGHT, _engine->_workingWindow);
+	}
 
 	_engine->getCursorManager()->showMouse(true);
 
-	if (sub)
-		delete sub;
+	delete decoder;
+	delete sub;
 
 	return true;
 }
diff --git a/engines/zvision/text/subtitles.cpp b/engines/zvision/text/subtitles.cpp
index acf4c37c2f..d549e2a0c6 100644
--- a/engines/zvision/text/subtitles.cpp
+++ b/engines/zvision/text/subtitles.cpp
@@ -27,7 +27,7 @@
 
 namespace ZVision {
 
-Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
+Subtitle::Subtitle(ZVision *engine, const Common::String &subname, bool upscaleToHires) :
 	_engine(engine),
 	_areaId(-1),
 	_subId(-1) {
@@ -44,6 +44,8 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
 				int32 x1, y1, x2, y2;
 				sscanf(str.c_str(), "%*[^:]:%d %d %d %d", &x1, &y1, &x2, &y2);
 				Common::Rect rct = Common::Rect(x1, y1, x2, y2);
+				if (upscaleToHires)
+					_engine->getRenderManager()->upscaleRect(rct);
 				_areaId = _engine->getRenderManager()->createSubArea(rct);
 			} else if (str.matchString("*TextFile*", true)) {
 				char filename[64];
@@ -67,6 +69,11 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
 				int32 sb;
 				if (sscanf(str.c_str(), "%*[^:]:(%d,%d)=%d", &st, &en, &sb) == 3) {
 					if (sb <= (int32)_subs.size()) {
+						if (upscaleToHires) {
+							// Convert from 15FPS (AVI) to 29.97FPS (VOB)
+							st = st * 29.97 / 15;
+							en = en * 29.97 / 15;
+						}
 						_subs[sb].start = st;
 						_subs[sb].stop = en;
 					}
diff --git a/engines/zvision/text/subtitles.h b/engines/zvision/text/subtitles.h
index c3da6583a4..329339be55 100644
--- a/engines/zvision/text/subtitles.h
+++ b/engines/zvision/text/subtitles.h
@@ -31,7 +31,7 @@ class ZVision;
 
 class Subtitle {
 public:
-	Subtitle(ZVision *engine, const Common::String &subname);
+	Subtitle(ZVision *engine, const Common::String &subname, bool upscaleToHires = false);
 	~Subtitle();
 
 	void process(int32 time);
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index 66a567abb2..d5ffbeb536 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -23,9 +23,7 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "video/video_decoder.h"
-// TODO: Enable once VOB + AC3 support is implemented
-#if 0
-//#ifdef USE_MPEG2
+#ifdef USE_MPEG2
 #include "video/mpegps_decoder.h"
 #endif
 #include "engines/util.h"
@@ -50,9 +48,7 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
 		animation = new RLFDecoder();
 	else if (tmpFileName.hasSuffix(".avi"))
 		animation = new ZorkAVIDecoder();
-// TODO: Enable once VOB + AC3 support is implemented
-#if 0
-//#ifdef USE_MPEG2
+#ifdef USE_MPEG2
 	else if (tmpFileName.hasSuffix(".vob"))
 		animation = new Video::MPEGPSDecoder();
 #endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 5b6d63e869..b42906fef3 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -360,4 +360,10 @@ void ZVision::initScreen() {
 	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat);
 }
 
+void ZVision::initHiresScreen() {
+	_renderManager->upscaleRect(_workingWindow);
+
+	initGraphics(HIRES_WINDOW_WIDTH, HIRES_WINDOW_HEIGHT, true, &_screenPixelFormat);
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index a3bcb384d1..854cd77bb8 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -67,6 +67,27 @@ class TextRenderer;
 class Subtitle;
 class MidiManager;
 
+enum {
+	WINDOW_WIDTH = 640,
+	WINDOW_HEIGHT = 480,
+
+	HIRES_WINDOW_WIDTH = 800,
+	HIRES_WINDOW_HEIGHT = 600,
+
+	// Zork nemesis working window sizes
+	ZNM_WORKING_WINDOW_WIDTH  = 512,
+	ZNM_WORKING_WINDOW_HEIGHT = 320,
+
+	// ZGI working window sizes
+	ZGI_WORKING_WINDOW_WIDTH  = 640,
+	ZGI_WORKING_WINDOW_HEIGHT = 344,
+
+	ROTATION_SCREEN_EDGE_OFFSET = 60,
+	MAX_ROTATION_SPEED = 400, // Pixels per second
+
+	KEYBUF_SIZE = 20
+};
+
 class ZVision : public Engine {
 public:
 	ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc);
@@ -83,24 +104,6 @@ public:
 	const Graphics::PixelFormat _screenPixelFormat;
 
 private:
-	enum {
-		WINDOW_WIDTH = 640,
-		WINDOW_HEIGHT = 480,
-
-		// Zork nemesis working window sizes
-		ZNM_WORKING_WINDOW_WIDTH  = 512,
-		ZNM_WORKING_WINDOW_HEIGHT = 320,
-
-		// ZGI working window sizes
-		ZGI_WORKING_WINDOW_WIDTH  = 640,
-		ZGI_WORKING_WINDOW_HEIGHT = 344,
-
-		ROTATION_SCREEN_EDGE_OFFSET = 60,
-		MAX_ROTATION_SPEED = 400, // Pixels per second
-
-		KEYBUF_SIZE = 20
-	};
-
 	Console *_console;
 	const ZVisionGameDescription *_gameDescription;
 
@@ -195,6 +198,7 @@ public:
 	}
 
 	void initScreen();
+	void initHiresScreen();
 
 	/**
 	 * Play a video until it is finished. This is a blocking call. It will call
-- 
cgit v1.2.3


From 21e9007d80ee60e519896c330324e5e3a95f772f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 10 Jan 2015 22:03:15 +0200
Subject: Revert "ZVISION: Remove ActionRestoreGame and loading of r.svr
 (restart slot)"

This reverts commit 9f642074ba8e17aa23b01bcee82b2293fe84f8f1, as it
broke the credits screen in ZGI.

This has been rewritten to use the common save code
---
 engines/zvision/file/save_manager.cpp           | 21 +++++++++++++++++----
 engines/zvision/file/save_manager.h             |  2 +-
 engines/zvision/scripting/actions.cpp           | 19 ++++++++++++++++++-
 engines/zvision/scripting/actions.h             |  9 +++++++++
 engines/zvision/scripting/scr_file_handling.cpp |  4 ++--
 engines/zvision/scripting/script_manager.cpp    |  6 +-----
 engines/zvision/scripting/script_manager.h      |  1 -
 7 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index fb9cceecbe..5e96e4ab5e 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -130,12 +130,25 @@ void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::S
 	file->writeSint16LE(td.tm_min);
 }
 
-Common::Error SaveManager::loadGame(uint slot) {
-	Common::SeekableReadStream *saveFile = getSlotFile(slot);
-	if (saveFile == 0) {
-		return Common::kPathDoesNotExist;
+Common::Error SaveManager::loadGame(int slot) {
+	Common::SeekableReadStream *saveFile = NULL;
+	
+	if (slot >= 0) {
+		saveFile = getSlotFile(slot);
+	} else {
+		Common::File *saveFile = _engine->getSearchManager()->openFile("r.svr");
+		if (!saveFile) {
+			saveFile = new Common::File;
+			if (!saveFile->open("r.svr")) {
+				delete saveFile;
+				return Common::kPathDoesNotExist;
+			}
+		}
 	}
 
+	if (!saveFile)
+		return Common::kPathDoesNotExist;
+
 	// Read the header
 	SaveGameHeader header;
 	if (!readSaveGameHeader(saveFile, header)) {
diff --git a/engines/zvision/file/save_manager.h b/engines/zvision/file/save_manager.h
index d3f6aaaedc..9e816373ea 100644
--- a/engines/zvision/file/save_manager.h
+++ b/engines/zvision/file/save_manager.h
@@ -91,7 +91,7 @@ public:
 	 *
 	 * @param slot    The save slot to load. Must be [1, 20]
 	 */
-	Common::Error loadGame(uint slot);
+	Common::Error loadGame(int slot);
 
 	Common::SeekableReadStream *getSlotFile(uint slot);
 	bool readSaveGameHeader(Common::SeekableReadStream *in, SaveGameHeader &header);
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index e3fc6fa549..e989478dd1 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -23,11 +23,12 @@
 #include "common/scummsys.h"
 #include "video/video_decoder.h"
 
+#include "zvision/scripting/actions.h"
+
 #include "zvision/zvision.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/file/save_manager.h"
-#include "zvision/scripting/actions.h"
 #include "zvision/scripting/menu.h"
 #include "zvision/scripting/effects/timer_effect.h"
 #include "zvision/scripting/effects/music_effect.h"
@@ -797,6 +798,22 @@ bool ActionRandom::execute() {
 	return true;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// ActionRestoreGame
+//////////////////////////////////////////////////////////////////////////////
+
+ActionRestoreGame::ActionRestoreGame(ZVision *engine, int32 slotkey, const Common::String &line) :
+	ResultAction(engine, slotkey) {
+	char buf[128];
+	sscanf(line.c_str(), "%s", buf);
+	_fileName = Common::String(buf);
+}
+
+bool ActionRestoreGame::execute() {
+	_engine->getSaveManager()->loadGame(-1);
+	return false;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionRotateTo
 //////////////////////////////////////////////////////////////////////////////
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index c2350bc83a..8d43309b74 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -340,6 +340,15 @@ private:
 	ValueSlot *_max;
 };
 
+class ActionRestoreGame : public ResultAction {
+public:
+	ActionRestoreGame(ZVision *engine, int32 slotkey, const Common::String &line);
+	bool execute();
+
+private:
+	Common::String _fileName;
+};
+
 class ActionRotateTo : public ResultAction {
 public:
 	ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line);
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 7856bf7b2e..b4da61a119 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -271,8 +271,8 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
 					actionList.push_back(new ActionRegion(_engine, slot, args));
 				} else if (act.matchString("restore_game", true)) {
 					// Only used by ZGI to load the restart game slot, r.svr.
-					_engine->getScriptManager()->reset();
-					_engine->getScriptManager()->changeLocation('g', 'a', 'r', 'y', 0);
+					// Used by the credits screen.
+					actionList.push_back(new ActionRestoreGame(_engine, slot, args));
 				} else if (act.matchString("rotate_to", true)) {
 					actionList.push_back(new ActionRotateTo(_engine, slot, args));
 				} else if (act.matchString("save_game", true)) {
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 8220d5c37c..ad049434c3 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -686,7 +686,7 @@ void ScriptManager::serialize(Common::WriteStream *stream) {
 		stream->writeSint16LE(getStateValue(i));
 }
 
-void ScriptManager::reset() {
+void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	// Clear out the current table values
 	_globalState.clear();
 	_globalStateFlags.clear();
@@ -706,10 +706,6 @@ void ScriptManager::reset() {
 	_activeSideFx.clear();
 
 	_referenceTable.clear();
-}
-
-void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
-	reset();
 
 	if (stream->readUint32BE() != MKTAG('Z', 'N', 'S', 'G') || stream->readUint32LE() != 4) {
 		changeLocation('g', 'a', 'r', 'y', 0);
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index a05c112a18..f6201c3572 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -248,7 +248,6 @@ public:
 
 	void serialize(Common::WriteStream *stream);
 	void deserialize(Common::SeekableReadStream *stream);
-	void reset();
 
 	Location getCurrentLocation() const;
 	Location getLastLocation();
-- 
cgit v1.2.3


From 5b3705660dd075ed249b3f18ef106e71f259af21 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 11 Jan 2015 04:51:07 +0200
Subject: ZVISION: Avoid using floating point math when upscaling subtitle
 timing

Spotted by clone2727
---
 engines/zvision/text/subtitles.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/text/subtitles.cpp b/engines/zvision/text/subtitles.cpp
index d549e2a0c6..ffc9e2b808 100644
--- a/engines/zvision/text/subtitles.cpp
+++ b/engines/zvision/text/subtitles.cpp
@@ -71,8 +71,8 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname, bool upscaleT
 					if (sb <= (int32)_subs.size()) {
 						if (upscaleToHires) {
 							// Convert from 15FPS (AVI) to 29.97FPS (VOB)
-							st = st * 29.97 / 15;
-							en = en * 29.97 / 15;
+							st = st * 2997 / 1500;
+							en = en * 2997 / 1500;
 						}
 						_subs[sb].start = st;
 						_subs[sb].stop = en;
-- 
cgit v1.2.3


From 468a26be405f17de00186f51978b00f6b2406726 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sat, 10 Jan 2015 22:19:46 -0600
Subject: ZVISION: Add detection for Nemesis CD - German version

CSCR.ZFS is the same between the German and the French versions. Therefore
we added a detection entry using the language file NEMESIS.STR
---
 engines/zvision/detection.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 1295f76705..545ebe35d4 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -82,7 +82,10 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		{
 			"znemesis",
 			0,
-			AD_ENTRY1s("CSCR.ZFS", "f04113357b4748c13efcb58b4629887c", 2577873),
+			{{"CSCR.ZFS", 0, "f04113357b4748c13efcb58b4629887c", 2577873},
+			 {"NEMESIS.STR", 0, "333bcb17bbb7f57cae742fbbe44f56f3", 9219},
+			 AD_LISTEND
+			},
 			Common::FR_FRA,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
@@ -91,6 +94,23 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_NEMESIS
 	},
 
+	{
+		// Zork Nemesis German version
+		{
+			"znemesis",
+			0,
+			{{"CSCR.ZFS", 0, "f04113357b4748c13efcb58b4629887c", 2577873},
+			 {"NEMESIS.STR", 0, "3d1a12b907751653866cffc6d4dfb331", 9505},
+			 AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+		},
+		GID_NEMESIS
+	},
+
 	{
 		// Zork Nemesis English demo version
 		{
-- 
cgit v1.2.3


From bc959e54dc96b702a0bddaef2b8fc006087c035a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 11 Jan 2015 17:00:00 +0200
Subject: ZVISION: Build the engine by default

---
 engines/zvision/configure.engine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/configure.engine b/engines/zvision/configure.engine
index 02e31943af..38a5959995 100644
--- a/engines/zvision/configure.engine
+++ b/engines/zvision/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine zvision "ZVision" no "" "" "freetype2 16bit"
+add_engine zvision "ZVision" yes "" "" "freetype2 16bit"
-- 
cgit v1.2.3


From 3a0ea6ec2a42d43aa9e552b37a945224c3688aca Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 11 Jan 2015 17:00:41 +0200
Subject: NEWS: Mention support for Zork Nemesis and Zork Grand Inquisitor

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index d66eb55d0e..45b0afd2d7 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ For a more comprehensive changelog of the latest experimental code, see:
 1.8.0 (????-??-??)
  New Games:
    - Added support for Sfinx.
+   - Added support for Zork Nemesis: The Forbidden Lands.
+   - Added support for Zork: Grand Inquisitor.
 
  General:
    - Updated Munt MT-32 emulation code to version 1.5.0.
-- 
cgit v1.2.3


From e972eb32f46d1db4400ab9708bb973de0c694914 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 11 Jan 2015 17:01:07 +0200
Subject: README: Add game-specific information for Zork Nemesis and Zork Grand
 Inquisitor

---
 README | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/README b/README
index e5a4229afd..3e2cacc05b 100644
--- a/README
+++ b/README
@@ -373,6 +373,10 @@ SCI Games by Sierra Entertainment:
 Wintermute Games:
      Chivalry is Not Dead                        [chivalry]
 
+ZVISION Games by Activision:
+     Zork Nemesis: The Forbidden Lands           [znemesis]
+     Zork: Grand Inquisitor                      [zgi]
+
 SCUMM Games by Humongous Entertainment:
      Backyard Baseball                           [baseball]
      Backyard Baseball 2001                      [baseball2001]
@@ -1344,6 +1348,7 @@ Engines which currently support returning to the Launcher are:
     TOUCHE
     TSAGE
     TUCKER
+    ZVISION
 
 
 5.5) Hotkeys:
@@ -1508,6 +1513,26 @@ other games.
     t                      - Switch between 'Voice only',
                              'Voice and Text' and 'Text only'
 
+  Zork: Grand Inquisitor
+    Ctrl-s                 - Save
+    Ctrl-r                 - Restore
+    Ctrl-q                 - Quit
+    Ctrl-p                 - Preferences
+    F1                     - Help
+    F5                     - Inventory
+    F6                     - Spellbook
+    F7                     - Score
+    F8                     - Put away current object/forget spell
+    F9                     - Extract coin (must have the coin bag)
+    Space                  - Skips movies
+
+  Zork Nemesis: The Forbidden Lands
+    Ctrl-s                 - Save
+    Ctrl-r                 - Restore
+    Ctrl-q                 - Quit
+    Ctrl-p                 - Preferences
+    Space                  - Skips movies
+
 Note that using Ctrl-f or Ctrl-g is not recommended: games can crash
 when being run faster than their normal speed, as scripts will lose
 synchronisation.
@@ -1627,6 +1652,7 @@ Where 'xxx' is exact the saved game slot (ie 001) under ScummVM
        TOUCHE
        TSAGE
        TUCKER
+       ZVISION
 
 --save-slot/-x:
 
@@ -1659,6 +1685,7 @@ Where 'xxx' is exact the saved game slot (ie 001) under ScummVM
        TOUCHE
        TSAGE
        TUCKER
+       ZVISION
 
 
 7.0) Music and Sound:
@@ -2340,6 +2367,27 @@ The 7th Guest adds the following non-standard keyword:
                                 normal speed, to avoid music synchronization
                                 issues
 
+Zork Nemesis: The Forbidden Lands adds the following non-standard keywords:
+
+    originalsaveload   bool     If true, the original save/load screens are
+                                used instead of the enhanced ScummVM ones
+    doublefps          bool     If true, game FPS are increased from 30 to 60
+    venusenabled       bool     If true, the in-game Venus help system is
+                                enabled
+    noanimwhileturning bool     If true, animations are disabled while turning
+                                in panoramic mode
+
+Zork: Grand Inquisitor adds the following non-standard keywords:
+
+    originalsaveload   bool     If true, the original save/load screens are
+                                used instead of the enhanced ScummVM ones
+    doublefps          bool     If true, game FPS are increased from 30 to 60
+    noanimwhileturning bool     If true, animations are disabled while turning
+                                in panoramic mode
+    mpegmovies         bool     If true, the hires MPEG movies are used in the
+                                DVD version of the game, instead of the lowres
+                                AVI ones
+
 
 8.2) Custom game options that can be toggled via the GUI
 ---- ---------------------------------------------------
-- 
cgit v1.2.3


From d603fe32e4b94f6b5c9382eaf6725664b9d68a95 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Sun, 11 Jan 2015 21:14:36 +0000
Subject: SCI: fix definition of GK1 police-sleep patch

---
 engines/sci/engine/script_patches.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 03cd1d06e9..c2a0b8b95d 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -562,12 +562,12 @@ static const uint16 gk1SignatureDay6PoliceSleep[] = {
 	0x34, SIG_UINT16(0x00dc),           // ldi 220
 	0x65, SIG_ADDTOOFFSET(+1),          // aTop cycles (1a for PC, 1c for Mac)
 	0x32,                               // jmp [end]
-	0
+	SIG_END
 };
 
 static const uint16 gk1PatchDay6PoliceSleep[] = {
 	PATCH_ADDTOOFFSET(+5),
-	0x34, SIG_UINT16(0x002a),           // ldi 42
+	0x34, PATCH_UINT16(0x002a),         // ldi 42
 	0x65, PATCH_GETORIGINALBYTEADJUST(+9, +2), // aTop seconds (1c for PC, 1e for Mac)
 	PATCH_END
 };
-- 
cgit v1.2.3


From 3f4c924c9e6b26260e06d385a71b874d32371903 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Jan 2015 02:37:27 +0200
Subject: ZVISION: Check for all the required fonts before starting a game

---
 engines/zvision/text/truetype_font.cpp | 19 -------------------
 engines/zvision/text/truetype_font.h   | 19 +++++++++++++++++++
 engines/zvision/zvision.cpp            | 30 +++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 622a02a6a8..5cb09226e8 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -54,25 +54,6 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint st
 }
 
 bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
-	struct FontStyle {
-		const char *zorkFont;
-		const char *fontBase;
-		const char *freeFontBase;
-		const char *freeFontItalicName;
-	};
-
-	const FontStyle systemFonts[] = {
-		{ "*times new roman*",	  "times",   "FreeSerif", "Italic"  },
-		{ "*times*",		  "times",   "FreeSerif", "Italic"  },
-		{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
-		{ "*garamond*", 	  "gara",    "FreeSerif", "Italic"  },
-		{ "*courier new*",	  "cour",    "FreeMono",  "Oblique" },
-		{ "*courier*",		  "cour",    "FreeMono",  "Oblique" },
-		{ "*ZorkDeath*",	  "cour",    "FreeMono",  "Oblique" },
-		{ "*arial*",		  "arial",   "FreeSans",  "Oblique" },
-		{ "*ZorkNormal*",	  "arial",   "FreeSans",  "Oblique" },
-	};
-
 	Common::String newFontName;
 	Common::String freeFontName;
 
diff --git a/engines/zvision/text/truetype_font.h b/engines/zvision/text/truetype_font.h
index b5fac4af8a..f63e09b1fc 100644
--- a/engines/zvision/text/truetype_font.h
+++ b/engines/zvision/text/truetype_font.h
@@ -34,6 +34,25 @@ struct Surface;
 
 namespace ZVision {
 
+struct FontStyle {
+	const char *zorkFont;
+	const char *fontBase;
+	const char *freeFontBase;
+	const char *freeFontItalicName;
+};
+
+const FontStyle systemFonts[] = {
+	{ "*times new roman*",	  "times",   "FreeSerif", "Italic"  },
+	{ "*times*",		  "times",   "FreeSerif", "Italic"  },
+	{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
+	{ "*garamond*", 	  "gara",    "FreeSerif", "Italic"  },
+	{ "*courier new*",	  "cour",    "FreeMono",  "Oblique" },
+	{ "*courier*",		  "cour",    "FreeMono",  "Oblique" },
+	{ "*ZorkDeath*",	  "cour",    "FreeMono",  "Oblique" },
+	{ "*arial*",		  "arial",   "FreeSans",  "Oblique" },
+	{ "*ZorkNormal*",	  "arial",   "FreeSans",  "Oblique" },
+};
+
 class ZVision;
 
 // Styled TTF
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index b42906fef3..103839158a 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -243,8 +243,36 @@ Common::Error ZVision::run() {
 	if (ConfMan.hasKey("save_slot"))
 		_saveManager->loadGame(ConfMan.getInt("save_slot"));
 
+	bool foundAllFonts = true;
+
 	// Before starting, make absolutely sure that the user has copied the needed fonts
-	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf") && !_searchManager->hasFile("arial.ttf")  && !_searchManager->hasFile("FreeSans.ttf") ) {
+	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
+		Common::String freeFontBoldItalic = Common::String("Bold") + systemFonts[i].freeFontItalicName;
+		
+		const char *fontSuffixes[4] = { "", "bd", "i", "bi" };
+		const char *freeFontSuffixes[4] = { "", "Bold", systemFonts[i].freeFontItalicName, freeFontBoldItalic.c_str() };
+
+		for (int j = 0; j < 4; j++) {
+			Common::String fontName = systemFonts[i].fontBase;
+			fontName += fontSuffixes[j];
+			fontName += ".ttf";
+
+			Common::String freeFontName = systemFonts[i].freeFontBase;
+			freeFontName += freeFontSuffixes[j];
+			freeFontName += ".ttf";
+
+			if (!Common::File::exists(fontName) && !Common::File::exists(freeFontName) &&
+				!_searchManager->hasFile(fontName) && !_searchManager->hasFile(freeFontName)) {
+				foundAllFonts = false;
+				break;
+			}
+		}
+
+		if (!foundAllFonts)
+			break;
+	}
+
+	if (!foundAllFonts) {
 		GUI::MessageDialog dialog(
 				"Before playing this game, you'll need to copy the required "
 				"fonts into ScummVM's extras directory, or into the game directory. "
-- 
cgit v1.2.3


From b247515c587e1b9da4765b7108ce2ae0321f13c5 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 12 Jan 2015 06:47:12 +0100
Subject: ZVISION: Check eos() after reading from stream, not before

This fixes stray character in ZGI game over screen, when it reads
an empty line of text.
---
 engines/zvision/text/text.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index a5ed044424..e0501ae9c8 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -490,8 +490,10 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 Common::String readWideLine(Common::SeekableReadStream &stream) {
 	Common::String asciiString;
 
-	while (!stream.eos()) {
+	while (true) {
 		uint32 value = stream.readUint16LE();
+		if (stream.eos())
+			break;
 		// Check for CRLF
 		if (value == 0x0A0D) {
 			// Read in the extra NULL char
-- 
cgit v1.2.3


From 1b829b95b42e1123c8079e8d7628307ba5a9103f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Jan 2015 03:07:53 +0200
Subject: ZVISION: Add support for Liberation Fonts

These look better than the GNU FreeType fonts, and are thus preferred
over them. Many thanks to eriktorbjorn for his work on the different
fonts available

Also, this commit cleans up the font style array, moving it back into
the CPP file
---
 engines/zvision/text/truetype_font.cpp | 44 +++++++++++++++++++++++++++-------
 engines/zvision/text/truetype_font.h   | 13 ++--------
 engines/zvision/zvision.cpp            | 31 ++++++++++++++++--------
 3 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 5cb09226e8..9f4fbe797b 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -36,6 +36,22 @@
 
 namespace ZVision {
 
+const FontStyle systemFonts[] = {
+	{ "*times new roman*",	  "times",   "FreeSerif", "Italic", "LiberationSerif"  },
+	{ "*times*",		  "times",   "FreeSerif", "Italic", "LiberationSerif"  },
+	{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic", "LiberationSerif"  },
+	{ "*garamond*", 	  "gara",    "FreeSerif", "Italic", "LiberationSerif"  },
+	{ "*courier new*",	  "cour",    "FreeMono",  "Oblique", "LiberationMono" },
+	{ "*courier*",		  "cour",    "FreeMono",  "Oblique", "LiberationMono" },
+	{ "*ZorkDeath*",	  "cour",    "FreeMono",  "Oblique", "LiberationMono" },
+	{ "*arial*",		  "arial",   "FreeSans",  "Oblique", "LiberationSans" },
+	{ "*ZorkNormal*",	  "arial",   "FreeSans",  "Oblique", "LiberationSans" }
+};
+
+const FontStyle getSystemFont(int fontIndex) {
+	return systemFonts[fontIndex];
+}
+
 StyledTTFont::StyledTTFont(ZVision *engine) {
 	_engine = engine;
 	_style = 0;
@@ -56,26 +72,35 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint st
 bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 	Common::String newFontName;
 	Common::String freeFontName;
+	Common::String liberationFontName;
 
-	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
-		if (fontName.matchString(systemFonts[i].zorkFont, true)) {
-			newFontName = systemFonts[i].fontBase;
-			freeFontName = systemFonts[i].freeFontBase;
+	for (int i = 0; i < FONT_COUNT; i++) {
+		FontStyle curFont = getSystemFont(i);
+		if (fontName.matchString(curFont.zorkFont, true)) {
+			newFontName = curFont.fontBase;
+			freeFontName = curFont.freeFontBase;
+			liberationFontName = curFont.liberationFontBase;
 
 			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
 				newFontName += "bi";
 				freeFontName += "Bold";
-				freeFontName += systemFonts[i].freeFontItalicName;
+				freeFontName += curFont.freeFontItalicName;
+				liberationFontName += "-BoldItalic";
 			} else if (_style & STTF_BOLD) {
 				newFontName += "bd";
 				freeFontName += "Bold";
+				liberationFontName += "-Bold";
 			} else if (_style & STTF_ITALIC) {
 				newFontName += "i";
-				freeFontName += systemFonts[i].freeFontItalicName;
+				freeFontName += curFont.freeFontItalicName;
+				liberationFontName += "-Italic";
+			} else {
+				liberationFontName += "-Regular";
 			}
 
 			newFontName += ".ttf";
 			freeFontName += ".ttf";
+			liberationFontName += ".ttf";
 			break;
 		}
 	}
@@ -84,13 +109,16 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 		debug("Could not identify font: %s. Reverting to Arial", fontName.c_str());
 		newFontName = "arial.ttf";
 		freeFontName = "FreeSans.ttf";
+		liberationFontName = "LiberationSans-Regular.ttf";
 	}
 
 	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
 
 	Common::File file;
-	if (!file.open(newFontName) && !file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, newFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
-		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
+	if (!file.open(newFontName) && !_engine->getSearchManager()->openFile(file, newFontName) &&
+		!file.open(liberationFontName) && !_engine->getSearchManager()->openFile(file, liberationFontName) &&
+		!file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
+		error("Unable to open font file %s (Liberation Font alternative: %s, FreeFont alternative: %s)", newFontName.c_str(), liberationFontName.c_str(), freeFontName.c_str());
 
 	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
 	if (_newFont) {
diff --git a/engines/zvision/text/truetype_font.h b/engines/zvision/text/truetype_font.h
index f63e09b1fc..6fbb1f0504 100644
--- a/engines/zvision/text/truetype_font.h
+++ b/engines/zvision/text/truetype_font.h
@@ -39,19 +39,10 @@ struct FontStyle {
 	const char *fontBase;
 	const char *freeFontBase;
 	const char *freeFontItalicName;
+	const char *liberationFontBase;
 };
 
-const FontStyle systemFonts[] = {
-	{ "*times new roman*",	  "times",   "FreeSerif", "Italic"  },
-	{ "*times*",		  "times",   "FreeSerif", "Italic"  },
-	{ "*century schoolbook*", "censcbk", "FreeSerif", "Italic"  },
-	{ "*garamond*", 	  "gara",    "FreeSerif", "Italic"  },
-	{ "*courier new*",	  "cour",    "FreeMono",  "Oblique" },
-	{ "*courier*",		  "cour",    "FreeMono",  "Oblique" },
-	{ "*ZorkDeath*",	  "cour",    "FreeMono",  "Oblique" },
-	{ "*arial*",		  "arial",   "FreeSans",  "Oblique" },
-	{ "*ZorkNormal*",	  "arial",   "FreeSans",  "Oblique" },
-};
+#define FONT_COUNT 9
 
 class ZVision;
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 103839158a..f9973d2280 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -236,6 +236,8 @@ void ZVision::initialize() {
 	getTimerManager()->installTimerProc(&fpsTimerCallback, 1000000, this, "zvisionFPS");
 }
 
+extern const FontStyle getSystemFont(int fontIndex);
+
 Common::Error ZVision::run() {
 	initialize();
 
@@ -246,23 +248,30 @@ Common::Error ZVision::run() {
 	bool foundAllFonts = true;
 
 	// Before starting, make absolutely sure that the user has copied the needed fonts
-	for (int i = 0; i < ARRAYSIZE(systemFonts); i++) {
-		Common::String freeFontBoldItalic = Common::String("Bold") + systemFonts[i].freeFontItalicName;
+	for (int i = 0; i < FONT_COUNT; i++) {
+		FontStyle curFont = getSystemFont(i);
+		Common::String freeFontBoldItalic = Common::String("Bold") + curFont.freeFontItalicName;
 		
 		const char *fontSuffixes[4] = { "", "bd", "i", "bi" };
-		const char *freeFontSuffixes[4] = { "", "Bold", systemFonts[i].freeFontItalicName, freeFontBoldItalic.c_str() };
+		const char *freeFontSuffixes[4] = { "", "Bold", curFont.freeFontItalicName, freeFontBoldItalic.c_str() };
+		const char *liberationFontSuffixes[4] = { "-Regular", "-Bold", "-Italic", "-BoldItalic" };
 
 		for (int j = 0; j < 4; j++) {
-			Common::String fontName = systemFonts[i].fontBase;
+			Common::String fontName = curFont.fontBase;
 			fontName += fontSuffixes[j];
 			fontName += ".ttf";
 
-			Common::String freeFontName = systemFonts[i].freeFontBase;
+			Common::String freeFontName = curFont.freeFontBase;
 			freeFontName += freeFontSuffixes[j];
 			freeFontName += ".ttf";
 
-			if (!Common::File::exists(fontName) && !Common::File::exists(freeFontName) &&
-				!_searchManager->hasFile(fontName) && !_searchManager->hasFile(freeFontName)) {
+			Common::String liberationFontName = curFont.liberationFontBase;
+			liberationFontName += liberationFontSuffixes[j];
+			liberationFontName += ".ttf";
+
+			if (!Common::File::exists(fontName) && !_searchManager->hasFile(fontName) &&
+				!Common::File::exists(liberationFontName) && !_searchManager->hasFile(liberationFontName) &&
+				!Common::File::exists(freeFontName) && !_searchManager->hasFile(freeFontName)) {
 				foundAllFonts = false;
 				break;
 			}
@@ -278,9 +287,11 @@ Common::Error ZVision::run() {
 				"fonts into ScummVM's extras directory, or into the game directory. "
 				"On Windows, you'll need the following font files from the Windows "
 				"font directory: Times New Roman, Century Schoolbook, Garamond, "
-				"Courier New and Arial. Alternatively, you can download the GNU "
-				"FreeFont package. You'll need all the fonts from that package, "
-				"i.e., FreeMono, FreeSans and FreeSerif."
+				"Courier New and Arial. Alternatively, you can download the "
+				"Liberation Fonts or the GNU FreeFont package. You'll need all the "
+				"fonts from the font package you choose, i.e., LiberationMono, "
+				"LiberationSans and LiberationSerif, or FreeMono, FreeSans and "
+				"FreeSerif respectively."
 		);
 		dialog.runModal();
 		quitGame();
-- 
cgit v1.2.3


From 4b1cec62473c821cf0701a46f3989ff3c82990b9 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Tue, 13 Jan 2015 15:47:30 +0100
Subject: ZVISION: Add detection for the French version of ZGI

---
 engines/zvision/detection.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 545ebe35d4..82150a6489 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -139,6 +139,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_GRANDINQUISITOR
 	},
 
+	{
+		// Zork Grand Inquisitor French CD version, reported by ulrichh on IRC
+		{
+			"zgi",
+			"CD",
+			AD_ENTRY1s("SCRIPTS.ZFS", "4d1ec4ade7ecc9ee9ec591d43ca3d213", 8338133),
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+		},
+		GID_GRANDINQUISITOR
+	},
+
 	{
 		// Zork Grand Inquisitor English DVD version
 		{
-- 
cgit v1.2.3


From fb97e58886832f695c8cb217b1d8d4ee2d7958f0 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Tue, 13 Jan 2015 19:53:38 -0600
Subject: ZVISION: Add support for German ZGI - CD version

Fixes #6760
---
 engines/zvision/detection.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 82150a6489..c1592ff5a4 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -153,6 +153,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_GRANDINQUISITOR
 	},
 
+	{
+		// Zork Grand Inquisitor German CD version, reported by breit in bug #6760
+		{
+			"zgi",
+			"CD",
+			AD_ENTRY1s("SCRIPTS.ZFS", "b7ac7e331b9b7f884590b0b325b560c8", 8338133),
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+		},
+		GID_GRANDINQUISITOR
+	},
+
 	{
 		// Zork Grand Inquisitor English DVD version
 		{
-- 
cgit v1.2.3


From cc045f7a83b1282ee453d0c1d90ca2372de554c8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 14 Jan 2015 23:20:33 +0100
Subject: COMMON: Fix strict-alignment READ_UINT64

---
 common/endian.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/endian.h b/common/endian.h
index 0c6b3db621..1c06bb91d3 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -322,7 +322,7 @@
 #ifdef HAVE_INT64
 		inline uint64 READ_UINT64(const void *ptr) {
 			const uint8 *b = (const uint8 *)ptr;
-			return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
+			return ((uint64)b[7] << 56) | ((uint64)b[6] << 48) | ((uint64)b[5] << 40) | ((uint64)b[4] << 32) | ((uint64)b[3] << 24) | ((uint64)b[2] << 16) | ((uint64)b[1] << 8) | ((uint64)b[0]);
 		}
 		inline void WRITE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
@@ -362,7 +362,7 @@
 #ifdef HAVE_INT64
 		inline uint64 READ_UINT64(const void *ptr) {
 			const uint8 *b = (const uint8 *)ptr;
-			return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+			return ((uint64)b[0] << 56) | ((uint64)b[1] << 48) | ((uint64)b[2] << 40) | ((uint64)b[3] << 32) | ((uint64)b[4] << 24) | ((uint64)b[5] << 16) | ((uint64)b[6] << 8) | ((uint64)b[7]);
 		}
 		inline void WRITE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
-- 
cgit v1.2.3


From 28e27ea1d94f1df4c8e68216c086cb57c396ccd8 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Thu, 15 Jan 2015 00:31:39 -0600
Subject: ZVISION: Allow multiple sound effects to play at the same time

This is the original behavior. This was noted in bug #6761. Specifically,
the knocker on the door plays a sound whenever it is a the top of the bottom
of the swing. By only allowing one sound effect to play at the same time, the
knocker would only play once, even though it bounces at the bottom.
---
 engines/zvision/scripting/actions.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index e989478dd1..3aab6d8830 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -486,9 +486,6 @@ ActionMusic::~ActionMusic() {
 }
 
 bool ActionMusic::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotKey))
-		return true;
-
 	if (_midi) {
 		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, _volume));
 	} else {
-- 
cgit v1.2.3


From 4f28cec6ac7ef68df373f6c1139a852150789851 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Thu, 15 Jan 2015 00:37:39 -0600
Subject: ZVISION: Keep the hand cursor during lever movement

We have to explicitly set the cursor each call otherwise the cursor will
be reset to the idle cursor. Addresses part of bug #6761
---
 engines/zvision/scripting/controls/lever_control.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index bef51f0e91..249c4c6f9b 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -236,6 +236,8 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 				}
 			}
 		}
+		_engine->getCursorManager()->changeCursor(_cursor);
+		cursorWasChanged = true;
 	} else if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_cursor);
 		cursorWasChanged = true;
-- 
cgit v1.2.3


From 89f233f4881589b925e871becbf3ec1b08db108e Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Thu, 15 Jan 2015 00:40:07 -0600
Subject: ZVISION: Set the state value for the lever position during user
 dragging

Not just during the "returning" animation. Addresses part of bug #6761
---
 engines/zvision/scripting/controls/lever_control.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 249c4c6f9b..0f105b424c 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -232,6 +232,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 				if (angle >= (int)iter->angle - ANGLE_DELTA && angle <= (int)iter->angle + ANGLE_DELTA) {
 					_currentFrame = iter->toFrame;
 					renderFrame(_currentFrame);
+					_engine->getScriptManager()->setStateValue(_key, _currentFrame);
 					break;
 				}
 			}
-- 
cgit v1.2.3


From 4287e2ebcaf2d78d5dd0d112ec8db4a8c916f6d1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Jan 2015 01:44:15 +0200
Subject: ZVISION: Allow empty sound streams. Fixes bugs #6762 and #6763

A regression from commit 07ad10babe
---
 engines/zvision/sound/zork_raw.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 0ef5de2f55..7bdd4875fc 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -256,9 +256,9 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 		actualName.setChar('c', actualName.size() - 1);
 
 		if (!engine->getSearchManager()->openFile(*file, actualName))
-			error("File not found: %s", actualName.c_str());
+			return NULL;
 	} else if (!found && !isRaw) {
-		error("File not found: %s", actualName.c_str());
+		return NULL;
 	}
 
 	// Get the file name
-- 
cgit v1.2.3


From 11e429672e59f69a67820c937269026f651d4998 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Jan 2015 01:52:24 +0200
Subject: ZVISION: Add detection for the Spanish version of ZGI (bug #6764)

---
 engines/zvision/detection.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index c1592ff5a4..b69eee000a 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -167,6 +167,20 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_GRANDINQUISITOR
 	},
 
+	{
+		// Zork Grand Inquisitor Spanish CD version, reported by dianiu in bug #6764
+		{
+			"zgi",
+			"CD",
+			AD_ENTRY1s("SCRIPTS.ZFS", "5cdc4b99c1134053af135aae71326fd1", 8338141),
+			Common::ES_ESP,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO3(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+		},
+		GID_GRANDINQUISITOR
+	},
+
 	{
 		// Zork Grand Inquisitor English DVD version
 		{
-- 
cgit v1.2.3


From 3fe7c645ed11d57cc5f7e1da588fb43cfe1affa3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Jan 2015 03:43:42 +0200
Subject: ZVISION: Fix detection of Windows fonts

---
 engines/zvision/zvision.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f9973d2280..3085a79de8 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -258,9 +258,18 @@ Common::Error ZVision::run() {
 
 		for (int j = 0; j < 4; j++) {
 			Common::String fontName = curFont.fontBase;
+			if (fontName == "censcbk" && j > 0)
+				fontName = "schlbk";
 			fontName += fontSuffixes[j];
 			fontName += ".ttf";
 
+			if (fontName == "schlbkbd.ttf")
+				fontName = "schlbkb.ttf";
+			if (fontName == "garabi.ttf")
+				continue;
+			if (fontName == "garai.ttf")
+				fontName = "garait.ttf";
+
 			Common::String freeFontName = curFont.freeFontBase;
 			freeFontName += freeFontSuffixes[j];
 			freeFontName += ".ttf";
-- 
cgit v1.2.3


From 9f00880aa40abb7584a007e10591ee5aa593ae7a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Jan 2015 14:08:15 +0200
Subject: ZVISION: Properly handle sounds reusing the same sound slot (bug
 #6761)

This is based on Marisa-Chan's observations in commit 28e27ea1d9.
Tested with both ZNEM and ZGI
---
 engines/zvision/scripting/actions.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 3aab6d8830..ce6bd31ee4 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -486,6 +486,11 @@ ActionMusic::~ActionMusic() {
 }
 
 bool ActionMusic::execute() {
+	if (_engine->getScriptManager()->getSideFX(_slotKey)) {
+		_engine->getScriptManager()->killSideFx(_slotKey);
+		_engine->getScriptManager()->setStateValue(_slotKey, 2);
+	}
+
 	if (_midi) {
 		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, _volume));
 	} else {
-- 
cgit v1.2.3


From 9c25e2eea0e257de67c8d8f8cbd3e114585ed72b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Jan 2015 10:57:51 -0500
Subject: MADS: Fix crash on exit after watching introduction twice

---
 engines/mads/sound.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index 1652550ba3..fbf217ba0c 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -62,6 +62,9 @@ SoundManager::~SoundManager() {
 void SoundManager::init(int sectionNumber) {
 	assert(sectionNumber > 0 && sectionNumber < 10);
 
+	if (_driver != nullptr)
+		delete _driver;
+
 	switch (_vm->getGameID()) {
 	case GType_RexNebular:
 		switch (sectionNumber) {
-- 
cgit v1.2.3


From b3c204e2ba5350b81690e48fb7a23accaf257d0a Mon Sep 17 00:00:00 2001
From: Fedor
Date: Sat, 17 Jan 2015 19:24:21 +0300
Subject: ZVISION: made error messages more detailed

---
 engines/zvision/zvision.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 3085a79de8..d50c7d53c4 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -186,12 +186,12 @@ void ZVision::initialize() {
 
 	if (_gameDescription->gameId == GID_GRANDINQUISITOR) {
 		if (!_searchManager->loadZix("INQUIS.ZIX"))
-			error("Unable to load the game ZIX file");
+			error("Unable to load file INQUIS.ZIX");
 	} else if (_gameDescription->gameId == GID_NEMESIS) {
 		if (!_searchManager->loadZix("NEMESIS.ZIX")) {
 			// The game might not be installed, try MEDIUM.ZIX instead
 			if (!_searchManager->loadZix("ZNEMSCR/MEDIUM.ZIX"))
-				error("Unable to load the game ZIX file");
+				error("Unable to load the file ZNEMSCR/MEDIUM.ZIX");
 		}
 	}
 
-- 
cgit v1.2.3


From ccd0c63a7b91031c8a172a60634506a3c810554b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Jan 2015 12:23:41 -0500
Subject: MADS: Implement background scrolling in anim views

---
 engines/mads/animation.cpp  |  2 +-
 engines/mads/menu_views.cpp | 25 +++++++++++++++++++++++++
 engines/mads/menu_views.h   |  3 +++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 2b999fa305..469d42cc1b 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -41,7 +41,7 @@ void AAHeader::load(Common::SeekableReadStream *f) {
 	_spritesIndex = f->readUint16LE();
 	_scrollPosition.x = f->readSint16LE();
 	_scrollPosition.y = f->readSint16LE();
-	_scrollTicks = f->readUint32LE();
+	_scrollTicks = f->readUint32LE() & 0xffff;
 	f->skip(6);
 
 	char buffer[FILENAME_SIZE];
diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index ee4268a650..b492d98125 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -484,6 +484,7 @@ AnimationView::AnimationView(MADSEngine *vm) : MenuView(vm) {
 	_animFrameNumber = 0;
 	_nextCyclingActive = false;
 	_sceneInfo = SceneInfo::init(_vm);
+	_scrollFrameCtr = 0;
 
 	load();
 }
@@ -549,6 +550,11 @@ void AnimationView::doFrame() {
 		scene._cyclingActive = _nextCyclingActive;
 	}
 
+	if (++_scrollFrameCtr >= _currentAnimation->_header._scrollTicks) {
+		_scrollFrameCtr = 0;
+		scroll();
+	}
+
 	if (_currentAnimation) {
 		++scene._frameStartTime;
 		_currentAnimation->update();
@@ -636,6 +642,21 @@ void AnimationView::loadNextResource() {
 	scene.initPaletteAnimation(paletteCycles, _nextCyclingActive && !_vm->_game->_fx);
 }
 
+void AnimationView::scroll() {
+	Scene &scene = _vm->_game->_scene;
+	Common::Point pt = _currentAnimation->_header._scrollPosition;
+
+	if (pt.x != 0) {
+		scene._backgroundSurface.scrollX(pt.x);
+		scene._spriteSlots.fullRefresh();
+	}
+
+	if (pt.y != 0) {
+		scene._backgroundSurface.scrollY(pt.y);
+		scene._spriteSlots.fullRefresh();
+	}
+}
+
 void AnimationView::scriptDone() {
 	_breakFlag = true;
 	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
@@ -657,6 +678,10 @@ void AnimationView::processLines() {
 				_currentLine += c;
 		}
 
+		// Check for comment line
+		if (_currentLine.hasPrefix("#"))
+			continue;
+
 		// Process the line
 		while (!_currentLine.empty()) {
 			if (_currentLine.hasPrefix("-")) {
diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index cc5a13006f..871c0d1d37 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -191,6 +191,7 @@ private:
 	int _manualFrame2;
 	int _animFrameNumber;
 	bool _nextCyclingActive;
+	int _scrollFrameCtr;
 private:
 	void load();
 
@@ -201,6 +202,8 @@ private:
 	int getParameter();
 
 	void loadNextResource();
+
+	void scroll();
 protected:
 	virtual void display();
 
-- 
cgit v1.2.3


From 263c5924906b2fcb3303850ad919e158cb06e120 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Jan 2015 23:37:59 +0200
Subject: ZVISION: Fix bug #6769 (the "Alchemical debacle" video in ZGI)

---
 engines/zvision/scripting/actions.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index ce6bd31ee4..758158817e 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -638,6 +638,13 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 		_mask = -1;
 
 	_fileName = Common::String(fileName);
+
+	// WORKAROUND for bug #6769, location me1g.scr (the "Alchemical debacle"
+	// video in ZGI). We only scale up by 2x, in AnimationEffect::process(),
+	// but the dimensions of the target frame are off by 2 pixels. We fix that
+	// here, so that the video can be scaled.
+	if (_fileName == "me1ga011.avi" && _y2 == 213)
+		_y2 = 215;
 }
 
 ActionPlayAnimation::~ActionPlayAnimation() {
-- 
cgit v1.2.3


From 4ee29ef3a84186b79e00e3f50d3fb15e4c13d213 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Jan 2015 16:46:57 -0500
Subject: MADS: Add loading of SpriteInfo frame numbers for scene background
 sprites

---
 engines/mads/scene_data.cpp | 5 +++--
 engines/mads/scene_data.h   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index b5e219ed04..7233e42456 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -86,7 +86,8 @@ void ARTHeader::load(Common::SeekableReadStream *f, bool isV2) {
 void SceneInfo::SpriteInfo::load(Common::SeekableReadStream *f) {
 	f->skip(3);
 	_spriteSetIndex = f->readByte();
-	f->skip(2);
+	_frameNumber = f->readSByte();
+	f->skip(1);
 	_position.x = f->readSint16LE();
 	_position.y = f->readSint16LE();
 	_depth = f->readByte();
@@ -263,7 +264,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 		SpriteAsset *asset = spriteSets[si._spriteSetIndex];
 		assert(asset && _depthStyle != 2);
 
-		MSprite *spr = asset->getFrame(asset->getCount() - 1);
+		MSprite *spr = asset->getFrame(si._frameNumber);
 		bgSurface.copyFrom(spr, si._position, si._depth, &depthSurface,
 			si._scale, spr->getTransparencyIndex());
 	}
diff --git a/engines/mads/scene_data.h b/engines/mads/scene_data.h
index 41e094b8f5..41a08f74eb 100644
--- a/engines/mads/scene_data.h
+++ b/engines/mads/scene_data.h
@@ -144,6 +144,7 @@ class SceneInfo {
 	public:
 		int _spriteSetIndex;
 		Common::Point _position;
+		int _frameNumber;
 		int _depth;
 		int _scale;
 
-- 
cgit v1.2.3


From 9b8fa20c7610567475c5b41678d41fa618adc49e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Jan 2015 17:29:08 -0500
Subject: MADS: Fix horizontal flipping of scene background sprites

---
 engines/mads/scene_data.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index 7233e42456..d0e96be1d7 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -266,7 +266,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 
 		MSprite *spr = asset->getFrame(si._frameNumber);
 		bgSurface.copyFrom(spr, si._position, si._depth, &depthSurface,
-			si._scale, spr->getTransparencyIndex());
+			si._scale, false, spr->getTransparencyIndex());
 	}
 
 	// Free the sprite sets
-- 
cgit v1.2.3


From 926404bd10309e98d353acd5515c678234de28aa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Jan 2015 20:51:52 -0500
Subject: MADS: Renamings of Layer and a transition type

---
 engines/mads/dialogs.cpp                 |  2 +-
 engines/mads/game.cpp                    |  4 ++--
 engines/mads/hotspots.cpp                |  2 +-
 engines/mads/nebular/dialogs_nebular.cpp |  8 ++++----
 engines/mads/nebular/menu_nebular.cpp    |  4 ++--
 engines/mads/scene.cpp                   |  2 +-
 engines/mads/scene.h                     |  2 +-
 engines/mads/screen.cpp                  | 20 ++++++++++----------
 engines/mads/screen.h                    | 10 +++++-----
 engines/mads/user_interface.cpp          | 14 +++++++-------
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 5e38f34fc6..c02f027302 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -449,7 +449,7 @@ void FullScreenDialog::display() {
 	}
 
 	// Set Fx state and palette entries
-	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kCenterVertTransition;
+	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kNullPaletteCopy;
 	game._trigger = 0;
 
 	// Clear the screen and draw the upper and lower horizontal lines
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 94653f9a39..0ce24daf7a 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -240,7 +240,7 @@ void Game::sectionLoop() {
 			_fx = kTransitionFadeOutIn;
 			break;
 		case SCREEN_FADE_FAST:
-			_fx = kCenterVertTransition;
+			_fx = kNullPaletteCopy;
 			break;
 		default:
 			_fx = kTransitionNone;
@@ -324,7 +324,7 @@ void Game::initSection(int sectionNumber) {
 	_vm->_palette->resetGamePalette(18, 10);
 	_vm->_palette->setLowRange();
 
-	if (_scene._layer == LAYER_GUI)
+	if (_scene._mode == SCREENMODE_VGA)
 		_vm->_palette->setPalette(_vm->_palette->_mainPalette, 0, 4);
 
 	_vm->_events->loadCursors("*CURSOR.SS");
diff --git a/engines/mads/hotspots.cpp b/engines/mads/hotspots.cpp
index d75d7ae13e..2af421a112 100644
--- a/engines/mads/hotspots.cpp
+++ b/engines/mads/hotspots.cpp
@@ -137,7 +137,7 @@ void DynamicHotspots::refresh() {
 			switch (scrObjects._inputMode) {
 			case kInputBuildingSentences:
 			case kInputLimitedSentences:
-				scrObjects.add(dh._bounds, _vm->_game->_scene._layer, CAT_12, dh._descId);
+				scrObjects.add(dh._bounds, _vm->_game->_scene._mode, CAT_12, dh._descId);
 				scrObjects._forceRescan = true;
 				break;
 			default:
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index f5355517bd..74da378128 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -643,14 +643,14 @@ void GameDialog::setClickableLines() {
 			int maxHeight = _lines[idx]._font->getHeight();
 
 			screenObjects.add(Common::Rect(pt.x, pt.y, pt.x + strWidth, pt.y + maxHeight - 1),
-				LAYER_GUI, CAT_COMMAND, idx);
+				SCREENMODE_VGA, CAT_COMMAND, idx);
 		}
 	}
 
 	if (_vm->_dialogs->_pendingDialog == DIALOG_SAVE ||
 			_vm->_dialogs->_pendingDialog == DIALOG_RESTORE) {
-		screenObjects.add(Common::Rect(293, 26, 312, 75), LAYER_GUI, CAT_INV_LIST, 50);
-		screenObjects.add(Common::Rect(293, 78, 312, 127), LAYER_GUI, CAT_INV_LIST, 51);
+		screenObjects.add(Common::Rect(293, 26, 312, 75), SCREENMODE_VGA, CAT_INV_LIST, 50);
+		screenObjects.add(Common::Rect(293, 78, 312, 127), SCREENMODE_VGA, CAT_INV_LIST, 51);
 	}
 }
 
@@ -825,7 +825,7 @@ void GameDialog::handleEvents() {
 
 	// Scan for objects in the dialog
 	Common::Point mousePos = events.currentPos() - Common::Point(0, DIALOG_TOP);
-	int objIndex = screenObjects.scan(mousePos, LAYER_GUI);
+	int objIndex = screenObjects.scan(mousePos, SCREENMODE_VGA);
 
 	if (_movedFlag) {
 		int yp = mousePos.y;
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 28de4e5650..2fdef3443d 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -86,7 +86,7 @@ void MainMenu::display() {
 			frame0->_offset.y - frame0->h);
 		screenObjects.add(
 			Common::Rect(pt.x, pt.y + DIALOG_TOP, pt.x + frame0->w,
-			pt.y + frame0->h + DIALOG_TOP), LAYER_GUI, CAT_COMMAND, i);
+			pt.y + frame0->h + DIALOG_TOP), SCREENMODE_VGA, CAT_COMMAND, i);
 	}
 
 	// Set the cursor for when it's shown
@@ -292,7 +292,7 @@ bool MainMenu::onEvent(Common::Event &event) {
 }
 
 int MainMenu::getHighlightedItem(const Common::Point &pt) {
-	return _vm->_game->_screenObjects.scan(pt, LAYER_GUI) - 1;
+	return _vm->_game->_screenObjects.scan(pt, SCREENMODE_VGA) - 1;
 }
 
 void MainMenu::unhighlightItem() {
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index d2b4b29622..ea3fe2c148 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -52,7 +52,7 @@ Scene::Scene(MADSEngine *vm)
 	_activeAnimation = nullptr;
 	_textSpacing = -1;
 	_frameStartTime = 0;
-	_layer = LAYER_GUI;
+	_mode = SCREENMODE_VGA;
 	_lookFlag = false;
 	_bandsRange = 0;
 	_scaleRange = 0;
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index 9fd99ad8e5..05053c3166 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -121,7 +121,7 @@ public:
 	bool _reloadSceneFlag;
 	Common::Point _posAdjust;
 	uint32 _frameStartTime;
-	Layer _layer;
+	ScreenMode _mode;
 	bool _lookFlag;
 	Common::Point _customDest;
 	Common::Array<PaletteUsage::UsageEntry> _paletteUsageF;
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index c9a0863d85..8552effd98 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -244,7 +244,7 @@ void DirtyAreas::reset() {
 ScreenObject::ScreenObject() {
 	_category = CAT_NONE;
 	_descId = 0;
-	_layer = 0;
+	_mode = 0;
 	_active = false;
 }
 
@@ -265,14 +265,12 @@ ScreenObjects::ScreenObjects(MADSEngine *vm) : _vm(vm) {
 	_baseTime = 0;
 }
 
-void ScreenObjects::add(const Common::Rect &bounds, Layer layer, ScrCategory category, int descId) {
-	//assert(size() < 100);
-
+void ScreenObjects::add(const Common::Rect &bounds, ScreenMode mode, ScrCategory category, int descId) {
 	ScreenObject so;
 	so._bounds = bounds;
 	so._category = category;
 	so._descId = descId;
-	so._layer = layer;
+	so._mode = mode;
 	so._active = true;
 
 	push_back(so);
@@ -288,7 +286,7 @@ void ScreenObjects::check(bool scanFlag) {
 	if ((_vm->_events->_mouseMoved || userInterface._scrollbarActive
 			|| _v8332A || _forceRescan) && scanFlag) {
 		_category = CAT_NONE;
-		_selectedObject = scanBackwards(_vm->_events->currentPos(), LAYER_GUI);
+		_selectedObject = scanBackwards(_vm->_events->currentPos(), SCREENMODE_VGA);
 		if (_selectedObject > 0) {
 			ScreenObject &scrObject = (*this)[_selectedObject];
 			_category = (ScrCategory)(scrObject._category & 7);
@@ -365,7 +363,7 @@ void ScreenObjects::check(bool scanFlag) {
 int ScreenObjects::scan(const Common::Point &pt, int layer) {
 	for (uint i = 1; i <= size(); ++i) {
 		ScreenObject &sObj = (*this)[i];
-		if (sObj._active && sObj._bounds.contains(pt) && sObj._layer == layer)
+		if (sObj._active && sObj._bounds.contains(pt) && sObj._mode == layer)
 			return i;
 	}
 
@@ -376,7 +374,7 @@ int ScreenObjects::scan(const Common::Point &pt, int layer) {
 int ScreenObjects::scanBackwards(const Common::Point &pt, int layer) {
 	for (int i = (int)size(); i >= 1; --i) {
 		ScreenObject &sObj = (*this)[i];
-		if (sObj._active && sObj._bounds.contains(pt) && sObj._layer == layer)
+		if (sObj._active && sObj._bounds.contains(pt) && sObj._mode == layer)
 			return i;
 	}
 
@@ -653,8 +651,10 @@ void ScreenSurface::transition(ScreenTransition transitionType, bool surfaceFlag
 		transition(kTransitionFadeIn, surfaceFlag);
 		break;
 
-	case kCenterVertTransition:
-		warning("TODO: center vert transition");
+	case kNullPaletteCopy:
+		// Original temporarily set the palette to black, copied the scene to the
+		// screen, and then restored the palette. We can give a similiar effect
+		// by doing a standard quick palette fade in
 		transition(kTransitionFadeIn, surfaceFlag);
 		break;
 
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index 9d01ca82e3..6800523f92 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -33,8 +33,8 @@ namespace MADS {
 #define MADS_SCREEN_WIDTH 320
 #define MADS_SCREEN_HEIGHT 200
 
-enum Layer {
-	LAYER_GUI = 19
+enum ScreenMode {
+	SCREENMODE_VGA = 19
 };
 
 enum ScreenTransition {
@@ -47,7 +47,7 @@ enum ScreenTransition {
 	kTransitionCircleIn3, kTransitionCircleIn4,
 	kVertTransition1, kVertTransition2, kVertTransition3,
 	kVertTransition4, kVertTransition5, kVertTransition6,
-	kVertTransition7, kCenterVertTransition
+	kVertTransition7, kNullPaletteCopy
 };
 
 enum InputMode {
@@ -130,7 +130,7 @@ public:
 	Common::Rect _bounds;
 	ScrCategory _category;
 	int _descId;
-	int _layer;
+	int _mode;
 
 	ScreenObject();
 };
@@ -162,7 +162,7 @@ public:
 	/**
 	* Add a new item to the list
 	*/
-	void add(const Common::Rect &bounds, Layer layer, ScrCategory category, int descId);
+	void add(const Common::Rect &bounds, ScreenMode mode, ScrCategory category, int descId);
 
 	/**
 	 * Check objects on the screen
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 1f8d5037bc..822460d549 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -673,7 +673,7 @@ void UserInterface::loadElements() {
 			getBounds(CAT_INV_SCROLLER, idx, bounds);
 			moveRect(bounds);
 
-			_vm->_game->_screenObjects.add(bounds, LAYER_GUI, CAT_INV_SCROLLER, idx);
+			_vm->_game->_screenObjects.add(bounds, SCREENMODE_VGA, CAT_INV_SCROLLER, idx);
 		}
 
 		// Set up actions
@@ -682,7 +682,7 @@ void UserInterface::loadElements() {
 			getBounds(CAT_COMMAND, idx, bounds);
 			moveRect(bounds);
 
-			_vm->_game->_screenObjects.add(bounds, LAYER_GUI, CAT_COMMAND, idx);
+			_vm->_game->_screenObjects.add(bounds, SCREENMODE_VGA, CAT_COMMAND, idx);
 		}
 
 		// Set up inventory list
@@ -691,7 +691,7 @@ void UserInterface::loadElements() {
 			getBounds(CAT_INV_LIST, _inventoryTopIndex + idx, bounds);
 			moveRect(bounds);
 
-			_vm->_game->_screenObjects.add(bounds, LAYER_GUI, CAT_INV_LIST, idx);
+			_vm->_game->_screenObjects.add(bounds, SCREENMODE_VGA, CAT_INV_LIST, idx);
 		}
 
 		// Set up the inventory vocab list
@@ -700,12 +700,12 @@ void UserInterface::loadElements() {
 			getBounds(CAT_INV_VOCAB, idx, bounds);
 			moveRect(bounds);
 
-			_vm->_game->_screenObjects.add(bounds, LAYER_GUI, CAT_INV_VOCAB, idx);
+			_vm->_game->_screenObjects.add(bounds, SCREENMODE_VGA, CAT_INV_VOCAB, idx);
 		}
 
 		// Set up the inventory item picture
 		_categoryIndexes[CAT_INV_ANIM - 1] = _vm->_game->_screenObjects.size() + 1;
-		_vm->_game->_screenObjects.add(Common::Rect(160, 159, 231, 194), LAYER_GUI,
+		_vm->_game->_screenObjects.add(Common::Rect(160, 159, 231, 194), SCREENMODE_VGA,
 			CAT_INV_ANIM, 0);
 	}
 
@@ -714,7 +714,7 @@ void UserInterface::loadElements() {
 		_categoryIndexes[CAT_HOTSPOT - 1] = _vm->_game->_screenObjects.size() + 1;
 		for (int hotspotIdx = scene._hotspots.size() - 1; hotspotIdx >= 0; --hotspotIdx) {
 			Hotspot &hs = scene._hotspots[hotspotIdx];
-			_vm->_game->_screenObjects.add(hs._bounds, LAYER_GUI, CAT_HOTSPOT, hotspotIdx);
+			_vm->_game->_screenObjects.add(hs._bounds, SCREENMODE_VGA, CAT_HOTSPOT, hotspotIdx);
 		}
 	}
 
@@ -725,7 +725,7 @@ void UserInterface::loadElements() {
 			getBounds(CAT_TALK_ENTRY, idx, bounds);
 			moveRect(bounds);
 
-			_vm->_game->_screenObjects.add(bounds, LAYER_GUI, CAT_TALK_ENTRY, idx);
+			_vm->_game->_screenObjects.add(bounds, SCREENMODE_VGA, CAT_TALK_ENTRY, idx);
 		}
 	}
 
-- 
cgit v1.2.3


From 124459784987ece0088e829d3ce354997e9d6bb6 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 18 Jan 2015 02:24:25 +0000
Subject: JANITORIAL: Update copyright year

---
 COPYRIGHT                                                     | 2 +-
 backends/platform/symbian/README                              | 2 +-
 backends/platform/symbian/S60/ScummVM_S60.mmp.in              | 2 +-
 backends/platform/symbian/S60/ScummVM_S60_App.mmp             | 2 +-
 backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in | 2 +-
 backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in          | 2 +-
 backends/platform/symbian/S80/ScummVM_S80.mmp.in              | 2 +-
 backends/platform/symbian/S80/ScummVM_S80_App.mmp             | 2 +-
 backends/platform/symbian/S90/Scummvm_S90.mmp.in              | 2 +-
 backends/platform/symbian/S90/Scummvm_S90_App.mmp             | 2 +-
 backends/platform/symbian/UIQ2/ScummVM.rss                    | 2 +-
 backends/platform/symbian/UIQ3/ScummVM.rss                    | 2 +-
 backends/platform/symbian/UIQ3/ScummVM_A0000658.rss           | 2 +-
 backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in   | 2 +-
 backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in            | 2 +-
 backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss       | 2 +-
 backends/platform/symbian/mmp/config.mmh                      | 2 +-
 backends/platform/symbian/mmp/scummvm_agi.mmp.in              | 2 +-
 backends/platform/symbian/mmp/scummvm_agos.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_avalanche.mmp.in        | 2 +-
 backends/platform/symbian/mmp/scummvm_base.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_bbvs.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_cge.mmp.in              | 2 +-
 backends/platform/symbian/mmp/scummvm_cge2.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_cine.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_composer.mmp.in         | 2 +-
 backends/platform/symbian/mmp/scummvm_cruise.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_draci.mmp.in            | 2 +-
 backends/platform/symbian/mmp/scummvm_drascula.mmp.in         | 2 +-
 backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in         | 2 +-
 backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in         | 2 +-
 backends/platform/symbian/mmp/scummvm_gob.mmp.in              | 2 +-
 backends/platform/symbian/mmp/scummvm_groovie.mmp.in          | 2 +-
 backends/platform/symbian/mmp/scummvm_hopkins.mmp.in          | 2 +-
 backends/platform/symbian/mmp/scummvm_hugo.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_kyra.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in      | 2 +-
 backends/platform/symbian/mmp/scummvm_lure.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_m4.mmp.in               | 2 +-
 backends/platform/symbian/mmp/scummvm_made.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_mads.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_mohawk.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in      | 2 +-
 backends/platform/symbian/mmp/scummvm_neverhood.mmp.in        | 2 +-
 backends/platform/symbian/mmp/scummvm_parallaction.mmp.in     | 2 +-
 backends/platform/symbian/mmp/scummvm_pegasus.mmp.in          | 2 +-
 backends/platform/symbian/mmp/scummvm_queen.mmp.in            | 2 +-
 backends/platform/symbian/mmp/scummvm_saga.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_sci.mmp.in              | 2 +-
 backends/platform/symbian/mmp/scummvm_scumm.mmp.in            | 2 +-
 backends/platform/symbian/mmp/scummvm_sky.mmp.in              | 2 +-
 backends/platform/symbian/mmp/scummvm_sword1.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_sword2.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_sword25.mmp.in          | 2 +-
 backends/platform/symbian/mmp/scummvm_teenagent.mmp.in        | 2 +-
 backends/platform/symbian/mmp/scummvm_testbed.mmp.in          | 2 +-
 backends/platform/symbian/mmp/scummvm_tinsel.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_toltecs.mmp.in          | 2 +-
 backends/platform/symbian/mmp/scummvm_tony.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_toon.mmp.in             | 2 +-
 backends/platform/symbian/mmp/scummvm_touche.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_tsage.mmp.in            | 2 +-
 backends/platform/symbian/mmp/scummvm_tucker.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_voyeur.mmp.in           | 2 +-
 backends/platform/symbian/mmp/scummvm_wintermute.mmp.in       | 2 +-
 backends/platform/symbian/mmp/scummvm_zvision.mmp.in          | 2 +-
 backends/platform/symbian/res/ScummVmAif.rss                  | 2 +-
 backends/platform/symbian/res/scummvm.rss                     | 2 +-
 backends/platform/symbian/res/scummvm_A0000658.rss            | 2 +-
 backends/platform/symbian/src/ScummVm.hrh                     | 2 +-
 dists/debian/copyright                                        | 2 +-
 dists/macosx/Info.plist                                       | 4 ++--
 dists/macosx/Info.plist.in                                    | 4 ++--
 dists/scummvm.rc                                              | 2 +-
 dists/scummvm.rc.in                                           | 2 +-
 dists/win32/scummvm.nsi                                       | 2 +-
 dists/win32/scummvm.nsi.in                                    | 2 +-
 gui/about.cpp                                                 | 2 +-
 po/be_BY.po                                                   | 2 +-
 po/ca_ES.po                                                   | 2 +-
 po/cs_CZ.po                                                   | 2 +-
 po/da_DA.po                                                   | 2 +-
 po/de_DE.po                                                   | 2 +-
 po/es_ES.po                                                   | 2 +-
 po/eu.po                                                      | 2 +-
 po/fi_FI.po                                                   | 2 +-
 po/fr_FR.po                                                   | 2 +-
 po/gl_ES.po                                                   | 2 +-
 po/hu_HU.po                                                   | 2 +-
 po/it_IT.po                                                   | 2 +-
 po/nb_NO.po                                                   | 2 +-
 po/nl_NL.po                                                   | 2 +-
 po/nn_NO.po                                                   | 2 +-
 po/pl_PL.po                                                   | 2 +-
 po/pt_BR.po                                                   | 2 +-
 po/ru_RU.po                                                   | 2 +-
 po/scummvm.pot                                                | 2 +-
 po/se_SE.po                                                   | 2 +-
 po/uk_UA.po                                                   | 2 +-
 99 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 3344dd64d1..8e6b12cd04 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
 ScummVM
-Copyright (C) 2001-2014 by the following:
+Copyright (C) 2001-2015 by the following:
 
 If you have contributed to this project then you deserve to be on this
 list.  Contact us (see: AUTHORS) and we'll add you.
diff --git a/backends/platform/symbian/README b/backends/platform/symbian/README
index 8a44e9399d..655ec5137a 100644
--- a/backends/platform/symbian/README
+++ b/backends/platform/symbian/README
@@ -1,7 +1,7 @@
 
  ScummVM - ScummVM ported to EPOC/SymbianOS
 
- Copyright (C) 2008-2014 ScummVM Team
+ Copyright (C) 2008-2015 ScummVM Team
  Copyright (C) 2013-2013 Fedor Strizhniou aka zanac
  Copyright (C) 2003-2013 Lars 'AnotherGuest' Persson
  Copyright (C) 2002-2008 Jurgen 'SumthinWicked' Braam
diff --git a/backends/platform/symbian/S60/ScummVM_S60.mmp.in b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
index ca2ec7f930..c4b0bf49df 100644
--- a/backends/platform/symbian/S60/ScummVM_S60.mmp.in
+++ b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S60/ScummVM_S60_App.mmp b/backends/platform/symbian/S60/ScummVM_S60_App.mmp
index 2fc39c6838..f9bd30025c 100644
--- a/backends/platform/symbian/S60/ScummVM_S60_App.mmp
+++ b/backends/platform/symbian/S60/ScummVM_S60_App.mmp
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
index 3a08763e64..c9e4769484 100644
--- a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2014 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
  * Copyright (C) 2013-2014 Fedor Strizhniou Additional library porting, engine support, help files etc
- * Copyright (C) 2005-2014 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index f65be1208e..f2d7b51a7a 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -3,7 +3,7 @@
  * Copyright (C) 2003-2014 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
  * Copyright (C) 2013-2014 Fedor Strizhniou Additional library porting, engine support, help files etc
- * Copyright (C) 2005-2014 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S80/ScummVM_S80.mmp.in b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
index 34d1979fe5..0a7a755e47 100644
--- a/backends/platform/symbian/S80/ScummVM_S80.mmp.in
+++ b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S80/ScummVM_S80_App.mmp b/backends/platform/symbian/S80/ScummVM_S80_App.mmp
index de96963d80..a949c10169 100644
--- a/backends/platform/symbian/S80/ScummVM_S80_App.mmp
+++ b/backends/platform/symbian/S80/ScummVM_S80_App.mmp
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S90/Scummvm_S90.mmp.in b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
index e65397b145..eaf4673de8 100644
--- a/backends/platform/symbian/S90/Scummvm_S90.mmp.in
+++ b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/S90/Scummvm_S90_App.mmp b/backends/platform/symbian/S90/Scummvm_S90_App.mmp
index 88a3e4d221..e4426a3351 100644
--- a/backends/platform/symbian/S90/Scummvm_S90_App.mmp
+++ b/backends/platform/symbian/S90/Scummvm_S90_App.mmp
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/UIQ2/ScummVM.rss b/backends/platform/symbian/UIQ2/ScummVM.rss
index 2e02f1da1d..b8b48cd8f7 100644
--- a/backends/platform/symbian/UIQ2/ScummVM.rss
+++ b/backends/platform/symbian/UIQ2/ScummVM.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/backends/platform/symbian/UIQ3/ScummVM.rss b/backends/platform/symbian/UIQ3/ScummVM.rss
index 11cc767671..612c52e0b2 100644
--- a/backends/platform/symbian/UIQ3/ScummVM.rss
+++ b/backends/platform/symbian/UIQ3/ScummVM.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss b/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss
index 11cc767671..612c52e0b2 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
index 6e84ab7b08..7d580255bc 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2009 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2009 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index fee0c81e7a..33a2276b0d 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss b/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss
index f54bcc24d3..b79beddcb7 100644
--- a/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss
+++ b/backends/platform/symbian/UIQ3/scummvm_A0000658_loc.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh
index 075697d99a..f397e5ec64 100644
--- a/backends/platform/symbian/mmp/config.mmh
+++ b/backends/platform/symbian/mmp/config.mmh
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2014 Fedor Strizhniou
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_agi.mmp.in b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
index f24e3ef1a9..e4bdae3e2f 100644
--- a/backends/platform/symbian/mmp/scummvm_agi.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_agos.mmp.in b/backends/platform/symbian/mmp/scummvm_agos.mmp.in
index ff15c8d5b0..8db7132a96 100644
--- a/backends/platform/symbian/mmp/scummvm_agos.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agos.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
index 40047bb6b7..49c73222ca 100644
--- a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 88aa689f5b..559d070452 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in b/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
index 20d91a910d..8f643377fc 100644
--- a/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2014 Fedor Strizhniou - Epoc project file
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_cge.mmp.in b/backends/platform/symbian/mmp/scummvm_cge.mmp.in
index 29bdad0600..2b11ef94a6 100644
--- a/backends/platform/symbian/mmp/scummvm_cge.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cge.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_cge2.mmp.in b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
index f9c97e1d83..1561b0f479 100644
--- a/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_cine.mmp.in b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
index f93cd30c9f..d0a9f86808 100644
--- a/backends/platform/symbian/mmp/scummvm_cine.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_composer.mmp.in b/backends/platform/symbian/mmp/scummvm_composer.mmp.in
index 72117fbc19..8761718a12 100644
--- a/backends/platform/symbian/mmp/scummvm_composer.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_composer.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
index ceb5a2124f..a586a67c0d 100644
--- a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_draci.mmp.in b/backends/platform/symbian/mmp/scummvm_draci.mmp.in
index 77750ff696..4101ce680f 100644
--- a/backends/platform/symbian/mmp/scummvm_draci.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_draci.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_drascula.mmp.in b/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
index 7f39126e68..2ac3e6000f 100644
--- a/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in b/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in
index 22d5050597..a238904653 100644
--- a/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in b/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
index dc5d4da6b7..aae44bda97 100644
--- a/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_gob.mmp.in b/backends/platform/symbian/mmp/scummvm_gob.mmp.in
index a46ee9c403..1bb8982a9e 100644
--- a/backends/platform/symbian/mmp/scummvm_gob.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_gob.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_groovie.mmp.in b/backends/platform/symbian/mmp/scummvm_groovie.mmp.in
index a2a3d5c47d..199bb4c4a8 100644
--- a/backends/platform/symbian/mmp/scummvm_groovie.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_groovie.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in b/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in
index 82728942a7..59adffb1ea 100644
--- a/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
index 1f250bda3f..6ccdb2e95e 100644
--- a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
index f3b30b1318..365c041b27 100644
--- a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in b/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in
index 38d63b4648..4791307aa6 100644
--- a/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_lure.mmp.in b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
index 2922c9df49..1cd46de184 100644
--- a/backends/platform/symbian/mmp/scummvm_lure.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_m4.mmp.in b/backends/platform/symbian/mmp/scummvm_m4.mmp.in
index 0b3a0b60e4..e6621d812d 100644
--- a/backends/platform/symbian/mmp/scummvm_m4.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_m4.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_made.mmp.in b/backends/platform/symbian/mmp/scummvm_made.mmp.in
index e240685753..e8835b6428 100644
--- a/backends/platform/symbian/mmp/scummvm_made.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_made.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_mads.mmp.in b/backends/platform/symbian/mmp/scummvm_mads.mmp.in
index e5e990dd2d..eb1d20749e 100644
--- a/backends/platform/symbian/mmp/scummvm_mads.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_mads.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2014 Fedor Strizhniou - Epoc project file
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in b/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in
index 19bed823d5..694032ede6 100644
--- a/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in b/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in
index 06f9333c37..caf8e330f3 100644
--- a/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in b/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in
index b6deeb2d73..db0f445089 100644
--- a/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in b/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
index c61e40626c..7c5c4c8abd 100644
--- a/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in b/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in
index 3ef85bf29d..fa65964f3f 100644
--- a/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_queen.mmp.in b/backends/platform/symbian/mmp/scummvm_queen.mmp.in
index 3a15fdd0a2..9280b94fea 100644
--- a/backends/platform/symbian/mmp/scummvm_queen.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_queen.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_saga.mmp.in b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
index ce5de459b2..838ee18ccf 100644
--- a/backends/platform/symbian/mmp/scummvm_saga.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_sci.mmp.in b/backends/platform/symbian/mmp/scummvm_sci.mmp.in
index 49484b8c7c..daed96856d 100644
--- a/backends/platform/symbian/mmp/scummvm_sci.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sci.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
index 60c54697d0..91c6e79fde 100644
--- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_sky.mmp.in b/backends/platform/symbian/mmp/scummvm_sky.mmp.in
index 5363bb32ef..51054597ef 100644
--- a/backends/platform/symbian/mmp/scummvm_sky.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sky.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
index b4b2b91dae..9ce462f517 100644
--- a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
index a8c963a618..bd4756c903 100644
--- a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_sword25.mmp.in b/backends/platform/symbian/mmp/scummvm_sword25.mmp.in
index 67efc10c45..b395a25799 100644
--- a/backends/platform/symbian/mmp/scummvm_sword25.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword25.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in b/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in
index 9551eda7b6..fa976791c3 100644
--- a/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_testbed.mmp.in b/backends/platform/symbian/mmp/scummvm_testbed.mmp.in
index 24b87d154c..e15e02fe1c 100644
--- a/backends/platform/symbian/mmp/scummvm_testbed.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_testbed.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in b/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
index a5a62ffc15..095e693372 100644
--- a/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in b/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
index 1512dfed06..5f92b2f376 100644
--- a/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_tony.mmp.in b/backends/platform/symbian/mmp/scummvm_tony.mmp.in
index 18c4f6d3cb..de1d497412 100644
--- a/backends/platform/symbian/mmp/scummvm_tony.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tony.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_toon.mmp.in b/backends/platform/symbian/mmp/scummvm_toon.mmp.in
index 9c7568cc8b..49f0b0e19d 100644
--- a/backends/platform/symbian/mmp/scummvm_toon.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_toon.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_touche.mmp.in b/backends/platform/symbian/mmp/scummvm_touche.mmp.in
index 73e14ee691..1ff5d66cb5 100644
--- a/backends/platform/symbian/mmp/scummvm_touche.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_touche.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
index e18db61683..93f278e279 100644
--- a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_tucker.mmp.in b/backends/platform/symbian/mmp/scummvm_tucker.mmp.in
index aef8841cf2..3be99ab47d 100644
--- a/backends/platform/symbian/mmp/scummvm_tucker.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tucker.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
index 4221e34195..c31d3fcfa2 100644
--- a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in b/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
index 716484755f..97fbd6e3ea 100644
--- a/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
index ea0a7b0102..838520799e 100644
--- a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2005-2015 The ScummVM Team
  * Copyright (C) 2013 Strizniou Fedor - Epoc project file
  *
  * ScummVM is the legal property of its developers, whose names
diff --git a/backends/platform/symbian/res/ScummVmAif.rss b/backends/platform/symbian/res/ScummVmAif.rss
index 2dbf436a8f..8238bdd005 100644
--- a/backends/platform/symbian/res/ScummVmAif.rss
+++ b/backends/platform/symbian/res/ScummVmAif.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/res/scummvm.rss b/backends/platform/symbian/res/scummvm.rss
index 6a0ab24ff0..ae34e9fbaa 100644
--- a/backends/platform/symbian/res/scummvm.rss
+++ b/backends/platform/symbian/res/scummvm.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/res/scummvm_A0000658.rss b/backends/platform/symbian/res/scummvm_A0000658.rss
index 562fef54c6..3b31f9f0a0 100644
--- a/backends/platform/symbian/res/scummvm_A0000658.rss
+++ b/backends/platform/symbian/res/scummvm_A0000658.rss
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/backends/platform/symbian/src/ScummVm.hrh b/backends/platform/symbian/src/ScummVm.hrh
index 316e4d08f6..f756912d96 100644
--- a/backends/platform/symbian/src/ScummVm.hrh
+++ b/backends/platform/symbian/src/ScummVm.hrh
@@ -2,7 +2,7 @@
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
  * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2005-2015 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
diff --git a/dists/debian/copyright b/dists/debian/copyright
index 1317fc6cee..734ec77039 100644
--- a/dists/debian/copyright
+++ b/dists/debian/copyright
@@ -7,7 +7,7 @@ It was downloaded from <http://www.scummvm.org/>.
 
 Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'.
 
-ScummVM is Copyright © 2002-2014 The ScummVM Team
+ScummVM is Copyright © 2002-2015 The ScummVM Team
 
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index fff0e47668..fffb18056e 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.8.0git, Copyright 2001-2014 The ScummVM Team</string>
+	<string>1.8.0git, Copyright 2001-2015 The ScummVM Team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -46,7 +46,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2001-2014 The ScummVM Team</string>
+	<string>Copyright 2001-2015 The ScummVM Team</string>
 	<key>SUFeedURL</key>
 	<string>http://www.scummvm.org/appcasts/macosx/release.xml</string>
 	<key>SUPublicDSAKeyFile</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 9ef1584440..7e91984f39 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -28,7 +28,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>@VERSION@, Copyright 2001-2014 The ScummVM Team</string>
+	<string>@VERSION@, Copyright 2001-2015 The ScummVM Team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -46,7 +46,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2001-2014 The ScummVM Team</string>
+	<string>Copyright 2001-2015 The ScummVM Team</string>
 	<key>SUFeedURL</key>
 	<string>http://www.scummvm.org/appcasts/macosx/release.xml</string>
 	<key>SUPublicDSAKeyFile</key>
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index def6ee49f7..2028a5bfd3 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -81,7 +81,7 @@ BEGIN
             VALUE "FileDescription", "http://www.scummvm.org/\0"
             VALUE "FileVersion", "1.8.0git\0"
             VALUE "InternalName", "scummvm\0"
-            VALUE "LegalCopyright", "Copyright � 2001-2014 The ScummVM Team\0"
+            VALUE "LegalCopyright", "Copyright � 2001-2015 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 401c0abb0d..3a619334d5 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -81,7 +81,7 @@ BEGIN
             VALUE "FileDescription", "http://www.scummvm.org/\0"
             VALUE "FileVersion", "@VERSION@\0"
             VALUE "InternalName", "scummvm\0"
-            VALUE "LegalCopyright", "Copyright � 2001-2014 The ScummVM Team\0"
+            VALUE "LegalCopyright", "Copyright � 2001-2015 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index bdefad43da..a7e891acc2 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -76,7 +76,7 @@ Name ScummVM
 !define COMPANY     "ScummVM Team"
 !define URL         "http://scummvm.org/"
 !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT   "Copyright � 2001-2014 The ScummVM Team"
+!define COPYRIGHT   "Copyright � 2001-2015 The ScummVM Team"
 
 #########################################################################################
 # Installer configuration
diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in
index b8ddc74a86..7a156fb7b4 100644
--- a/dists/win32/scummvm.nsi.in
+++ b/dists/win32/scummvm.nsi.in
@@ -76,7 +76,7 @@ Name ScummVM
 !define COMPANY     "ScummVM Team"
 !define URL         "http://scummvm.org/"
 !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT   "Copyright � 2001-2014 The ScummVM Team"
+!define COPYRIGHT   "Copyright � 2001-2015 The ScummVM Team"
 
 #########################################################################################
 # Installer configuration
diff --git a/gui/about.cpp b/gui/about.cpp
index b25efc1cd0..daec2b7e48 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -57,7 +57,7 @@ enum {
 
 static const char *copyright_text[] = {
 "",
-"C0""Copyright (C) 2001-2014 The ScummVM Team",
+"C0""Copyright (C) 2001-2015 The ScummVM Team",
 "C0""http://www.scummvm.org",
 "",
 "C0""ScummVM is the legal property of its developers, whose names are too numerous to list here. Please refer to the COPYRIGHT file distributed with this binary.",
diff --git a/po/be_BY.po b/po/be_BY.po
index 868ade94fb..1403a8a052 100644
--- a/po/be_BY.po
+++ b/po/be_BY.po
@@ -1,5 +1,5 @@
 # Belarusian translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Ivan Lukyanov <greencis@mail.ru>, 2013-2014.
 #
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 86f8bbed86..12a86b5db7 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -1,5 +1,5 @@
 # Catalan translation for ScummVM.
-# Copyright (C) 2007-2014 ScummVM Team
+# Copyright (C) 2007-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Jordi Vilalta Prat <jvprat@jvprat.com>, 2007-2011.
 #
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 0b5a3c88bf..4832a1f107 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,5 +1,5 @@
 # Czech translation for ScummVM.
-# Copyright (C) 2001-2014 ScummVM Team
+# Copyright (C) 2001-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Zbyn�k Schwarz <zbynek.schwarz@gmail.com>, 2011-2013.
 #
diff --git a/po/da_DA.po b/po/da_DA.po
index 480e2005d0..554694f66d 100644
--- a/po/da_DA.po
+++ b/po/da_DA.po
@@ -1,5 +1,5 @@
 # Dansk translation for ScummVM
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Steffen Nyeland <steffen@nyeland.dk>, 2010.
 #
diff --git a/po/de_DE.po b/po/de_DE.po
index c127f109bf..d757050d6e 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,5 +1,5 @@
 # German translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Simon Sawatzki <SimSaw@gmx.de>, Lothar Serra Mari, 2014.
 #
diff --git a/po/es_ES.po b/po/es_ES.po
index 479747bb20..9f070de306 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,5 +1,5 @@
 # Spanish translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Tom�s Maidagan, 2011.
 #
diff --git a/po/eu.po b/po/eu.po
index 7babff50b6..41318f72b6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,5 +1,5 @@
 # Basque translation for ScummVM.
-# Copyright (C) 2012-2014 ScummVM Team
+# Copyright (C) 2012-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Mikel Iturbe Urretxa <mikel@hamahiru.org>, 2012.
 #
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1958be3139..e00799e1d6 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,5 +1,5 @@
 # Finnish translation for ScummVM.
-# Copyright (c) 2012-2014 ScummVM Team
+# Copyright (c) 2012-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Toni Saarela <saarela@gmail.com>, 2012.
 #
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 6e47183fe3..4e2654e706 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # French translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Thierry Crozat <criezy@scummvm.org>, 2011.
 #
diff --git a/po/gl_ES.po b/po/gl_ES.po
index cc8569d2f1..971e6be4b8 100644
--- a/po/gl_ES.po
+++ b/po/gl_ES.po
@@ -1,5 +1,5 @@
 # Galician translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Santiago G. Sanz <s.sanz@uvigo.es>, 2013.
 #
diff --git a/po/hu_HU.po b/po/hu_HU.po
index ef3507be98..614fe401fc 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,5 +1,5 @@
 # Hungarian translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # George Kormendi <grubycza@hotmail.com>, 2010.
 #
diff --git a/po/it_IT.po b/po/it_IT.po
index a0192b29bb..3db0122682 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,5 +1,5 @@
 # Italian translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Matteo 'Maff' Angelino <matteo.maff at gmail dot com>, 2010.
 #
diff --git a/po/nb_NO.po b/po/nb_NO.po
index cf211a46a4..fe04c50aca 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,5 +1,5 @@
 # Norwegian (Bokmaal) translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Einar Johan T. S�m�en <einarjohants@gmail.com>, 2010.
 #
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 3a9e6d8172..48527ebe9c 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,5 +1,5 @@
 # LANGUAGE translation for ScummVM.
-# Copyright (C) YEAR ScummVM Team
+# Copyright (C) 2014-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # FIRST AUTHOR scummvm@bencastricum.nl, 2014.
 #
diff --git a/po/nn_NO.po b/po/nn_NO.po
index de5698e61d..13a19fe8d3 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -1,5 +1,5 @@
 # Norwegian (Nynorsk) translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Einar Johan T. S�m�en <einarjohants@gmail.com>, 2010.
 #
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 83df595da5..87163748cd 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,5 +1,5 @@
 # Polish translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Grajpopolsku.pl <grajpopolsku@gmail.com>, 2011-2013.
 #
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 71161bde14..aa517ef1ed 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Portuguese (Brazilian) translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Saulo Benigno <saulobenigno@gmail.com>, 2010.
 #
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 89ee15e7ce..adc5fcdc1d 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,5 +1,5 @@
 # Russian translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Eugene Sandulenko <sev@scummvm.org>, 2010-2014
 #
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 72600ff994..3c780ac0bd 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -1,5 +1,5 @@
 # LANGUAGE translation for ScummVM.
-# Copyright (C) YEAR ScummVM Team
+# Copyright (C) YEAR The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
diff --git a/po/se_SE.po b/po/se_SE.po
index d08f6962c9..5e746a3fd7 100644
--- a/po/se_SE.po
+++ b/po/se_SE.po
@@ -1,5 +1,5 @@
 # Swedish translation for ScummVM.
-# Copyright (C) 2011-2014 ScummVM Team
+# Copyright (C) 2011-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Hampus Flink <hampus.flink@gmail.com>, 2011.
 #
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 5a7554189e..865bb48db8 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -1,5 +1,5 @@
 # Ukrainian translation for ScummVM.
-# Copyright (C) 2010-2014 ScummVM Team
+# Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Lubomyr Lisen, 2010.
 # Eugene Sandulenko <sev@scummvm.org>, 2010-2014
-- 
cgit v1.2.3


From cac7be425a92781341e3dc4b6882d42b4f17f9f3 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Sun, 18 Jan 2015 12:04:15 +0100
Subject: ANDROID: Remove plugins/unpacker from makefile.

---
 backends/platform/android/android.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 5be9f86770..e11ad0724e 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -35,7 +35,6 @@ FILE_MANIFEST = $(PATH_BUILD)/AndroidManifest.xml
 
 APK_MAIN = ScummVM-debug.apk
 APK_MAIN_RELEASE = ScummVM-release-unsigned.apk
-APK_PLUGINS = $(patsubst plugins/lib%.so, scummvm-engine-%.apk, $(PLUGINS))
 
 $(FILE_MANIFEST): $(FILE_MANIFEST_SRC) | $(PATH_BUILD)
 	@$(MKDIR) -p $(@D)
@@ -89,18 +88,18 @@ androidrelease: $(APK_MAIN_RELEASE)
 
 androidtestmain: $(APK_MAIN)
 	$(ADB) install -r $(APK_MAIN)
-	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.ScummVMActivity
 
-androidtest: $(APK_MAIN) $(APK_PLUGINS)
+androidtest: $(APK_MAIN)
 	@set -e; for apk in $^; do \
 		$(ADB) install -r $$apk; \
 	done
-	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.ScummVMActivity
 
 # used by buildbot!
 androiddistdebug: all
 	$(MKDIR) debug
-	$(CP) $(APK_MAIN) $(APK_PLUGINS) debug/
+	$(CP) $(APK_MAIN) debug/
 	for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
 		sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \
 	done
-- 
cgit v1.2.3


From 7c23eae1027d242c9169b791d99d5f22e3159816 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Jan 2015 21:30:07 +0200
Subject: ZVISION: Fix path handling in case-sensitive file systems (bug #6775)

A regression from commit d70503cc98. Thanks to wjp for bisecting.
---
 engines/zvision/file/search_manager.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 9f709dd0a1..1ae1ff71ae 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -183,6 +183,16 @@ bool SearchManager::loadZix(const Common::String &name) {
 				path.deleteChar(0);
 			if (path.size() && path.hasSuffix("/"))
 				path.deleteLastChar();
+			
+			// Handle paths in case-sensitive file systems (bug #6775)
+			if (path.size()) {
+				for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it) {
+					if (path.equalsIgnoreCase(*it)) {
+						path = *it;
+						break;
+					}
+				}
+			}
 
 			if (path.matchString("*.zfs", true)) {
 				arc = new ZfsArchive(path);
-- 
cgit v1.2.3


From 3f66f28624812910834600d8a2cecb084dedea9f Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 18 Jan 2015 20:32:55 +0100
Subject: ZVISION: Remove trailing whitespace

---
 engines/zvision/core/console.cpp             | 2 +-
 engines/zvision/core/events.cpp              | 2 +-
 engines/zvision/file/save_manager.cpp        | 2 +-
 engines/zvision/file/search_manager.cpp      | 2 +-
 engines/zvision/graphics/render_manager.cpp  | 4 ++--
 engines/zvision/graphics/render_manager.h    | 4 ++--
 engines/zvision/scripting/scripting_effect.h | 2 +-
 engines/zvision/video/rlf_decoder.cpp        | 2 +-
 engines/zvision/video/video.cpp              | 2 +-
 engines/zvision/zvision.cpp                  | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index f39c06b57e..e54e986bd7 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -204,7 +204,7 @@ bool Console::cmdLocation(int argc, const char **argv) {
 	Common::String scrFile = Common::String::format("%c%c%c%c.scr", curLocation.world, curLocation.room, curLocation.node, curLocation.view);
 	debugPrintf("Current location: world '%c', room '%c', node '%c', view '%c', offset %d, script %s\n",
 				curLocation.world, curLocation.room, curLocation.node, curLocation.view, curLocation.offset, scrFile.c_str());
-	
+
 	if (argc != 6) {
 		debugPrintf("Use %s <char: world> <char: room> <char:node> <char:view> <int: x offset> to change your location\n", argv[0]);
 		return true;
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 7804130e2a..4c7d395892 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -336,7 +336,7 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 					mspeed = 25;
 				}
 				_mouseVelocity  = MIN(((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.left)) - mspeed).toInt(), -1);
-				
+
 
 				_cursorManager->changeCursor(CursorIndex_Left);
 				cursorWasChanged = true;
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 5e96e4ab5e..55be8d2530 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -132,7 +132,7 @@ void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::S
 
 Common::Error SaveManager::loadGame(int slot) {
 	Common::SeekableReadStream *saveFile = NULL;
-	
+
 	if (slot >= 0) {
 		saveFile = getSlotFile(slot);
 	} else {
diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 1ae1ff71ae..821b85b053 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -183,7 +183,7 @@ bool SearchManager::loadZix(const Common::String &name) {
 				path.deleteChar(0);
 			if (path.size() && path.hasSuffix("/"))
 				path.deleteLastChar();
-			
+
 			// Handle paths in case-sensitive file systems (bug #6775)
 			if (path.size()) {
 				for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it) {
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 4a43e09b07..da6655b310 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -57,7 +57,7 @@ RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowH
 	_effectSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat);
 	_warpedSceneSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat);
 	_menuSurface.create(windowWidth, workingWindow.top, _pixelFormat);
-	
+
 	_menuArea = Common::Rect(0, 0, windowWidth, workingWindow.top);
 
 	initSubArea(windowWidth, windowHeight, workingWindow);
@@ -601,7 +601,7 @@ void RenderManager::prepareBackground() {
 		_backgroundSurfaceDirtyRect = _backgroundDirtyRect;
 		_backgroundSurfaceDirtyRect.translate(_screenCenterX - _backgroundOffset, 0);
 
-		// Panorama mode allows the user to spin in circles. Therefore, we need to render 
+		// Panorama mode allows the user to spin in circles. Therefore, we need to render
 		// the portion of the image that wrapped to the other side of the screen
 		if (_backgroundOffset < _screenCenterX) {
 			viewPort.moveTo(-(_screenCenterX - (_backgroundOffset + _backgroundWidth)), 0);
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index e3cbbc34ce..33d8a88e78 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -84,7 +84,7 @@ private:
 	Graphics::Surface _currentBackgroundImage;
 	Common::Rect _backgroundDirtyRect;
 
-	/** 
+	/**
 	 * The x1 or y1 offset of the subRectangle of the background that is currently displayed on the screen
 	 * It will be x1 if PANORAMA, or y1 if TILT
 	 */
@@ -133,7 +133,7 @@ private:
 	EffectsList _effects;
 
 	bool _doubleFPS;
-	
+
 public:
 	void initialize();
 
diff --git a/engines/zvision/scripting/scripting_effect.h b/engines/zvision/scripting/scripting_effect.h
index 0af1d9c21c..2a2153204f 100644
--- a/engines/zvision/scripting/scripting_effect.h
+++ b/engines/zvision/scripting/scripting_effect.h
@@ -37,7 +37,7 @@ class ZVision;
   * The base class that represents effects created from Actions.
   * This class is virtual.
   *
-  * Detailed Description: 
+  * Detailed Description:
   *     A scene has Controls. By interacting with the controls, the user
   *     causes Actions to execute. Certain Actions create 'effects', for
   *     example, a sound or an animation. This is the base class for
diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index db598a25b6..040582bcf8 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -197,7 +197,7 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 const Graphics::Surface *RLFDecoder::RLFVideoTrack::decodeNextFrame() {
 	if (_displayedFrame >= (int)_frameCount)
 		return NULL;
-	
+
 	_displayedFrame++;
 	applyFrameToCurrent(_displayedFrame);
 
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index d5ffbeb536..1cfd0f4197 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -62,7 +62,7 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) {
 	bool loaded = animation->loadStream(_file);
 	if (!loaded)
 		error("Error loading animation %s", tmpFileName.c_str());
-	
+
 	return animation;
 }
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index d50c7d53c4..da80ff9d02 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -251,7 +251,7 @@ Common::Error ZVision::run() {
 	for (int i = 0; i < FONT_COUNT; i++) {
 		FontStyle curFont = getSystemFont(i);
 		Common::String freeFontBoldItalic = Common::String("Bold") + curFont.freeFontItalicName;
-		
+
 		const char *fontSuffixes[4] = { "", "bd", "i", "bi" };
 		const char *freeFontSuffixes[4] = { "", "Bold", curFont.freeFontItalicName, freeFontBoldItalic.c_str() };
 		const char *liberationFontSuffixes[4] = { "-Regular", "-Bold", "-Italic", "-BoldItalic" };
-- 
cgit v1.2.3


From db64442c4aedd29864cb37f610dec7463ffd07a7 Mon Sep 17 00:00:00 2001
From: clone2727
Date: Sun, 18 Jan 2015 12:50:53 -0500
Subject: COMMON: Fix strict-alignment READ_BE_UINT64 on LE and READ_LE_UINT64
 on BE

---
 common/endian.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/endian.h b/common/endian.h
index 1c06bb91d3..7278265961 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -446,7 +446,7 @@
 #ifdef HAVE_INT64
 		inline uint64 READ_BE_UINT64(const void *ptr) {
 			const uint8 *b = (const uint8 *)ptr;
-			return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]);
+			return ((uint64)b[0] << 56) | ((uint64)b[1] << 48) | ((uint64)b[2] << 40) | ((uint64)b[3] << 32) | ((uint64)b[4] << 24) | ((uint64)b[5] << 16) | ((uint64)b[6] << 8) | ((uint64)b[7]);
 		}
 		inline void WRITE_BE_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
@@ -550,7 +550,7 @@
 #ifdef HAVE_INT64
 	inline uint64 READ_LE_UINT64(const void *ptr) {
 		const uint8 *b = (const uint8 *)ptr;
-		return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]);
+		return ((uint64)b[7] << 56) | ((uint64)b[6] << 48) | ((uint64)b[5] << 40) | ((uint64)b[4] << 32) | ((uint64)b[3] << 24) | ((uint64)b[2] << 16) | ((uint64)b[1] << 8) | ((uint64)b[0]);
 	}
 	inline void WRITE_LE_UINT64(void *ptr, uint64 value) {
 		uint8 *b = (uint8 *)ptr;
-- 
cgit v1.2.3


From 79c902338b3671e7a7e7cc855c6af0f0148e0ad8 Mon Sep 17 00:00:00 2001
From: clone2727
Date: Sun, 18 Jan 2015 13:33:27 -0500
Subject: TEST: Use "/usr/bin/env python" as the shebang line in cxxtestgen.py

---
 test/cxxtest/cxxtestgen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cxxtest/cxxtestgen.py b/test/cxxtest/cxxtestgen.py
index 4145c3ca3e..46267ac3e3 100755
--- a/test/cxxtest/cxxtestgen.py
+++ b/test/cxxtest/cxxtestgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''Usage: %s [OPTIONS] <input file(s)>
 Generate test source file for CxxTest.
 
-- 
cgit v1.2.3


From e10512c8b94d2a83ad67d5f854e1f5149bc41f13 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 18 Jan 2015 16:58:03 -0500
Subject: CONFIGURE: Use "powerpc" instead of "ppc" as config.guess outputs

powerpc-* targets get detected properly again now
---
 configure | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 5f73d77242..dbb36c3812 100755
--- a/configure
+++ b/configure
@@ -1318,7 +1318,7 @@ ds)
 	;;
 gamecube)
 	_host_os=gamecube
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	_host_alias=powerpc-eabi
 	;;
 gp2x)
@@ -1386,7 +1386,7 @@ openpandora)
 	;;
 ppc-amigaos)
 	_host_os=amigaos
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	;;
 ps2)
 	_host_os=ps2
@@ -1398,7 +1398,7 @@ ps2)
 	;;
 ps3)
 	_host_os=ps3
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	_host_alias=powerpc64-ps3-elf
 
 	# The prefix is always the same on PS3 so we hardcode the default
@@ -1444,7 +1444,7 @@ webos)
 	;;
 wii)
 	_host_os=wii
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	_host_alias=powerpc-eabi
 	;;
 wince)
@@ -2004,7 +2004,7 @@ cc_check_clean tmp_find_type_with_size.cpp
 # for the smaller sizes.
 echo_n "Alignment required... "
 case $_host_cpu in
-	i[3-6]86 | amd64 | x86_64 | ppc*)
+	i[3-6]86 | amd64 | x86_64 | powerpc*)
 		# Unaligned access should work
 		_need_memalign=no
 		;;
@@ -2047,7 +2047,7 @@ case $_host_cpu in
 		echo "MIPS"
 		DEFINES="$DEFINES -DMIPS_TARGET"
 		;;
-	ppc*)
+	powerpc*)
 		echo "PowerPC"
 		DEFINES="$DEFINES -DPPC_TARGET"
 		;;
-- 
cgit v1.2.3


From 762e2ca69be7f4bba789ed7decad39e241dd03c5 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 18 Jan 2015 17:00:51 -0500
Subject: CONFIGURE: Use -mlongcall on Mac PPC builds

Calls larger than 32MB away should no longer cause linker errors, provided libraries are rebuilt with that too
---
 configure | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure b/configure
index dbb36c3812..61e82f158f 100755
--- a/configure
+++ b/configure
@@ -2181,6 +2181,17 @@ case $_host_os in
 		exit 1
 		;;
 	darwin*)
+		# Pass -mlongcall to gcc so that it emits long calls
+		# which will allow for calls larger than 32MB. The linker
+		# will discard the calls if they are not needed, but we
+		# need to ensure the compiler emits them in the first place.
+		case $_host_cpu in
+		powerpc*)
+			CFLAGS="$CFLAGS -mlongcall"
+			CXXFLAGS="$CXXFLAGS -mlongcall"
+			;;
+		esac
+
 		DEFINES="$DEFINES -DMACOSX"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'
-- 
cgit v1.2.3


From a26a9c7268d27cb1f7407f5cf48038303f443197 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sun, 18 Jan 2015 17:06:24 -0600
Subject: ZVISION: Fix formatting and add curlies

---
 .../zvision/graphics/cursors/cursor_manager.cpp    |  31 ++--
 engines/zvision/scripting/script_manager.cpp       | 196 +++++++++++++--------
 2 files changed, 141 insertions(+), 86 deletions(-)

diff --git a/engines/zvision/graphics/cursors/cursor_manager.cpp b/engines/zvision/graphics/cursors/cursor_manager.cpp
index 1e048efedf..eeab18f4ba 100644
--- a/engines/zvision/graphics/cursors/cursor_manager.cpp
+++ b/engines/zvision/graphics/cursors/cursor_manager.cpp
@@ -124,31 +124,30 @@ void CursorManager::cursorDown(bool pushed) {
 }
 
 void CursorManager::changeCursor(int id) {
-	int _id = id;
-
-	if (_item &&
-	        (_id == CursorIndex_Active ||
-	         _id == CursorIndex_Idle ||
-	         _id == CursorIndex_HandPu)) {
-
-		if (_id == CursorIndex_Idle)
-			_id = CursorIndex_ItemIdle;
-		else
-			_id = CursorIndex_ItemAct;
+	if (_item && (id == CursorIndex_Active ||
+	              id == CursorIndex_Idle ||
+	              id == CursorIndex_HandPu)) {
+		if (id == CursorIndex_Idle) {
+			id = CursorIndex_ItemIdle;
+		} else {
+			id = CursorIndex_ItemAct;
+		}
 	}
 
-	if (_currentCursor != _id ||
-	        ((_id == CursorIndex_ItemAct || _id == CursorIndex_ItemIdle) && _lastitem != _item)) {
-		_currentCursor = _id;
+	if (_currentCursor != id || ((id == CursorIndex_ItemAct || id == CursorIndex_ItemIdle) && _lastitem != _item)) {
+		_currentCursor = id;
 		_lastitem = _item;
 		changeCursor(_cursors[_currentCursor][_cursorIsPushed]);
 	}
 }
 
 int CursorManager::getCursorId(const Common::String &name) {
-	for (int i = 0; i < NUM_CURSORS; i++)
-		if (name.equals(_cursorNames[i]))
+	for (int i = 0; i < NUM_CURSORS; i++) {
+		if (name.equals(_cursorNames[i])) {
 			return i;
+		}
+	}
+
 	return CursorIndex_Idle;
 }
 
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index ad049434c3..4792a02045 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -72,21 +72,24 @@ void ScriptManager::initialize() {
 }
 
 void ScriptManager::update(uint deltaTimeMillis) {
-	if (_currentLocation.node != _nextLocation.node ||
-	        _currentLocation.room != _nextLocation.room ||
-	        _currentLocation.view != _nextLocation.view ||
-	        _currentLocation.world != _nextLocation.world)
+	if (_currentLocation.node != _nextLocation.node || _currentLocation.room != _nextLocation.room ||
+	        _currentLocation.view != _nextLocation.view || _currentLocation.world != _nextLocation.world) {
 		ChangeLocationReal();
+	}
 
 	updateNodes(deltaTimeMillis);
-	if (! execScope(nodeview))
+	if (! execScope(nodeview)) {
 		return;
-	if (! execScope(room))
+	}
+	if (! execScope(room)) {
 		return;
-	if (! execScope(world))
+	}
+	if (! execScope(world)) {
 		return;
-	if (! execScope(universe))
+	}
+	if (! execScope(universe)) {
 		return;
+	}
 	updateControls(deltaTimeMillis);
 }
 
@@ -97,17 +100,22 @@ bool ScriptManager::execScope(ScriptScope &scope) {
 	scope.scopeQueue = tmp;
 	scope.scopeQueue->clear();
 
-	for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter)
+	for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter) {
 		(*PuzzleIter)->addedBySetState = false;
+	}
 
 	if (scope.procCount < 2 || getStateValue(StateKey_ExecScopeStyle)) {
-		for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter)
-			if (!checkPuzzleCriteria(*PuzzleIter, scope.procCount))
+		for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter) {
+			if (!checkPuzzleCriteria(*PuzzleIter, scope.procCount)) {
 				return false;
+			}
+		}
 	} else {
-		for (PuzzleList::iterator PuzzleIter = scope.execQueue->begin(); PuzzleIter != scope.execQueue->end(); ++PuzzleIter)
-			if (!checkPuzzleCriteria(*PuzzleIter, scope.procCount))
+		for (PuzzleList::iterator PuzzleIter = scope.execQueue->begin(); PuzzleIter != scope.execQueue->end(); ++PuzzleIter) {
+			if (!checkPuzzleCriteria(*PuzzleIter, scope.procCount)) {
 				return false;
+			}
+		}
 	}
 
 	if (scope.procCount < 2) {
@@ -119,9 +127,11 @@ bool ScriptManager::execScope(ScriptScope &scope) {
 void ScriptManager::referenceTableAddPuzzle(uint32 key, PuzzleRef ref) {
 	if (_referenceTable.contains(key)) {
 		Common::Array<PuzzleRef> *arr = &_referenceTable[key];
-		for (uint32 i = 0; i < arr->size(); i++)
-			if ((*arr)[i].puz == ref.puz)
+		for (uint32 i = 0; i < arr->size(); i++) {
+			if ((*arr)[i].puz == ref.puz) {
 				return;
+			}
+		}
 	}
 
 	_referenceTable[key].push_back(ref);
@@ -139,9 +149,11 @@ void ScriptManager::addPuzzlesToReferenceTable(ScriptScope &scope) {
 		referenceTableAddPuzzle(puzzlePtr->key, ref);
 
 		// Iterate through each CriteriaEntry and add a reference from the criteria key to the Puzzle
-		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*PuzzleIter)->criteriaList.begin(); criteriaIter != (*PuzzleIter)->criteriaList.end(); ++criteriaIter)
-			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter)
+		for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = (*PuzzleIter)->criteriaList.begin(); criteriaIter != (*PuzzleIter)->criteriaList.end(); ++criteriaIter) {
+			for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
 				referenceTableAddPuzzle(entryIter->key, ref);
+			}
+		}
 	}
 }
 
@@ -159,8 +171,9 @@ void ScriptManager::updateNodes(uint deltaTimeMillis) {
 }
 
 void ScriptManager::updateControls(uint deltaTimeMillis) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return;
+	}
 
 	// Process only one event
 	if (!_controlEvents.empty()) {
@@ -187,9 +200,11 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 		_controlEvents.pop_front();
 	}
 
-	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
-		if ((*iter)->process(deltaTimeMillis))
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++) {
+		if ((*iter)->process(deltaTimeMillis)) {
 			break;
+		}
+	}
 }
 
 bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
@@ -200,8 +215,9 @@ bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 	}
 
 	// Check each Criteria
-	if (counter == 0 && (getStateFlag(puzzle->key) & Puzzle::DO_ME_NOW) == 0)
+	if (counter == 0 && (getStateFlag(puzzle->key) & Puzzle::DO_ME_NOW) == 0) {
 		return true;
+	}
 
 	bool criteriaMet = false;
 	for (Common::List<Common::List<Puzzle::CriteriaEntry> >::iterator criteriaIter = puzzle->criteriaList.begin(); criteriaIter != puzzle->criteriaList.end(); ++criteriaIter) {
@@ -210,10 +226,11 @@ bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 		for (Common::List<Puzzle::CriteriaEntry>::iterator entryIter = criteriaIter->begin(); entryIter != criteriaIter->end(); ++entryIter) {
 			// Get the value to compare against
 			int argumentValue;
-			if (entryIter->argumentIsAKey)
+			if (entryIter->argumentIsAKey) {
 				argumentValue = getStateValue(entryIter->argument);
-			else
+			} else {
 				argumentValue = entryIter->argument;
+			}
 
 			// Do the comparison
 			switch (entryIter->criteriaOperator) {
@@ -251,8 +268,9 @@ bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 		setStateValue(puzzle->key, 1);
 
 		for (Common::List<ResultAction *>::iterator resultIter = puzzle->resultActions.begin(); resultIter != puzzle->resultActions.end(); ++resultIter) {
-			if (!(*resultIter)->execute())
+			if (!(*resultIter)->execute()) {
 				return false;
+			}
 		}
 	}
 
@@ -275,13 +293,15 @@ void ScriptManager::cleanScriptScope(ScriptScope &scope) {
 	scope.privQueueTwo.clear();
 	scope.scopeQueue = &scope.privQueueOne;
 	scope.execQueue = &scope.privQueueTwo;
-	for (PuzzleList::iterator iter = scope.puzzles.begin(); iter != scope.puzzles.end(); ++iter)
+	for (PuzzleList::iterator iter = scope.puzzles.begin(); iter != scope.puzzles.end(); ++iter) {
 		delete(*iter);
+	}
 
 	scope.puzzles.clear();
 
-	for (ControlList::iterator iter = scope.controls.begin(); iter != scope.controls.end(); ++iter)
+	for (ControlList::iterator iter = scope.controls.begin(); iter != scope.controls.end(); ++iter) {
 		delete(*iter);
+	}
 
 	scope.controls.clear();
 
@@ -289,44 +309,49 @@ void ScriptManager::cleanScriptScope(ScriptScope &scope) {
 }
 
 int ScriptManager::getStateValue(uint32 key) {
-	if (_globalState.contains(key))
+	if (_globalState.contains(key)) {
 		return _globalState[key];
-	else
+	} else {
 		return 0;
+	}
 }
 
 void ScriptManager::queuePuzzles(uint32 key) {
 	if (_referenceTable.contains(key)) {
 		Common::Array<PuzzleRef> *arr = &_referenceTable[key];
-		for (int32 i = arr->size() - 1; i >= 0; i--)
+		for (int32 i = arr->size() - 1; i >= 0; i--) {
 			if (!(*arr)[i].puz->addedBySetState) {
 				(*arr)[i].scope->scopeQueue->push_back((*arr)[i].puz);
 				(*arr)[i].puz->addedBySetState = true;
 			}
+		}
 	}
 }
 
 void ScriptManager::setStateValue(uint32 key, int value) {
-	if (value == 0)
+	if (value == 0) {
 		_globalState.erase(key);
-	else
+	} else {
 		_globalState[key] = value;
+	}
 
 	queuePuzzles(key);
 }
 
 void ScriptManager::setStateValueSilent(uint32 key, int value) {
-	if (value == 0)
+	if (value == 0) {
 		_globalState.erase(key);
-	else
+	} else {
 		_globalState[key] = value;
+	}
 }
 
 uint ScriptManager::getStateFlag(uint32 key) {
-	if (_globalStateFlags.contains(key))
+	if (_globalStateFlags.contains(key)) {
 		return _globalStateFlags[key];
-	else
+	} else {
 		return 0;
+	}
 }
 
 void ScriptManager::setStateFlag(uint32 key, uint value) {
@@ -336,10 +361,11 @@ void ScriptManager::setStateFlag(uint32 key, uint value) {
 }
 
 void ScriptManager::setStateFlagSilent(uint32 key, uint value) {
-	if (value == 0)
+	if (value == 0) {
 		_globalStateFlags.erase(key);
-	else
+	} else {
 		_globalStateFlags[key] = value;
+	}
 }
 
 void ScriptManager::unsetStateFlag(uint32 key, uint value) {
@@ -348,23 +374,29 @@ void ScriptManager::unsetStateFlag(uint32 key, uint value) {
 	if (_globalStateFlags.contains(key)) {
 		_globalStateFlags[key] &= ~value;
 
-		if (_globalStateFlags[key] == 0)
+		if (_globalStateFlags[key] == 0) {
 			_globalStateFlags.erase(key);
+		}
 	}
 }
 
 Control *ScriptManager::getControl(uint32 key) {
-	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter)
-		if ((*iter)->getKey() == key)
+	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
+		if ((*iter)->getKey() == key) {
 			return *iter;
+		}
+	}
+
 	return nullptr;
 }
 
 void ScriptManager::focusControl(uint32 key) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return;
-	if (_currentlyFocusedControl == key)
+	}
+	if (_currentlyFocusedControl == key) {
 		return;
+	}
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
 		uint32 controlKey = (*iter)->getKey();
 
@@ -443,50 +475,60 @@ void ScriptManager::killSideFxType(ScriptingEffect::ScriptingEffectType type) {
 }
 
 void ScriptManager::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return;
+	}
 	for (ControlList::iterator iter = _activeControls->reverse_begin(); iter != _activeControls->end(); iter--) {
-		if ((*iter)->onMouseDown(screenSpacePos, backgroundImageSpacePos))
+		if ((*iter)->onMouseDown(screenSpacePos, backgroundImageSpacePos)) {
 			return;
+		}
 	}
 }
 
 void ScriptManager::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return;
+	}
 	for (ControlList::iterator iter = _activeControls->reverse_begin(); iter != _activeControls->end(); iter--) {
-		if ((*iter)->onMouseUp(screenSpacePos, backgroundImageSpacePos))
+		if ((*iter)->onMouseUp(screenSpacePos, backgroundImageSpacePos)) {
 			return;
+		}
 	}
 }
 
 bool ScriptManager::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return false;
+	}
 
 	for (ControlList::iterator iter = _activeControls->reverse_begin(); iter != _activeControls->end(); iter--) {
-		if ((*iter)->onMouseMove(screenSpacePos, backgroundImageSpacePos))
+		if ((*iter)->onMouseMove(screenSpacePos, backgroundImageSpacePos)) {
 			return true;
+		}
 	}
 
 	return false;
 }
 
 void ScriptManager::onKeyDown(Common::KeyState keyState) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return;
+	}
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		if ((*iter)->onKeyDown(keyState))
+		if ((*iter)->onKeyDown(keyState)) {
 			return;
+		}
 	}
 }
 
 void ScriptManager::onKeyUp(Common::KeyState keyState) {
-	if (!_activeControls)
+	if (!_activeControls) {
 		return;
+	}
 	for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); ++iter) {
-		if ((*iter)->onKeyUp(keyState))
+		if ((*iter)->onKeyUp(keyState)) {
 			return;
+		}
 	}
 }
 
@@ -539,8 +581,9 @@ void ScriptManager::ChangeLocationReal() {
 				_currentLocation.node = '0';
 				_currentLocation.view = '0';
 				_currentLocation.offset = 0;
-			} else
+			} else {
 				return;
+			}
 		}
 	}
 
@@ -563,12 +606,13 @@ void ScriptManager::ChangeLocationReal() {
 	}
 
 	if (_nextLocation.world == 'g' && _nextLocation.room == 'j') {
-		if (_nextLocation.node == 's' && _nextLocation.view == 'e' &&
-		        _currentLocation.world != 'g' && _currentLocation.room != 'j')
+		if (_nextLocation.node == 's' && _nextLocation.view == 'e' && _currentLocation.world != 'g' && _currentLocation.room != 'j') {
 			_engine->getSaveManager()->prepareSaveBuffer();
+		}
 	} else {
-		if (_currentLocation.world == 'g' && _currentLocation.room == 'j')
+		if (_currentLocation.world == 'g' && _currentLocation.room == 'j') {
 			_engine->getSaveManager()->flushSaveBuffer();
+		}
 	}
 
 	setStateValue(StateKey_World, _nextLocation.world);
@@ -664,26 +708,30 @@ void ScriptManager::serialize(Common::WriteStream *stream) {
 	stream->writeByte(getStateValue(StateKey_View));
 	stream->writeUint32LE(getStateValue(StateKey_ViewPos));
 
-	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter)
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); ++iter) {
 		(*iter)->serialize(stream);
+	}
 
 	stream->writeUint32BE(MKTAG('F', 'L', 'A', 'G'));
 
 	int32 slots = 20000;
-	if (_engine->getGameId() == GID_NEMESIS)
+	if (_engine->getGameId() == GID_NEMESIS) {
 		slots = 30000;
+	}
 
 	stream->writeUint32LE(slots * 2);
 
-	for (int32 i = 0; i < slots; i++)
+	for (int32 i = 0; i < slots; i++) {
 		stream->writeUint16LE(getStateFlag(i));
+	}
 
 	stream->writeUint32BE(MKTAG('P', 'U', 'Z', 'Z'));
 
 	stream->writeUint32LE(slots * 2);
 
-	for (int32 i = 0; i < slots; i++)
+	for (int32 i = 0; i < slots; i++) {
 		stream->writeSint16LE(getStateValue(i));
+	}
 }
 
 void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
@@ -700,8 +748,9 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	_currentLocation.room = 0;
 	_currentLocation.view = 0;
 
-	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); iter++)
+	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); iter++) {
 		delete(*iter);
+	}
 
 	_activeSideFx.clear();
 
@@ -734,20 +783,23 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 		case MKTAG('T', 'I', 'M', 'R'): {
 			uint32 key = stream->readUint32LE();
 			uint32 time = stream->readUint32LE();
-			if (_engine->getGameId() == GID_GRANDINQUISITOR)
+			if (_engine->getGameId() == GID_GRANDINQUISITOR) {
 				time /= 100;
-			else if (_engine->getGameId() == GID_NEMESIS)
+			} else if (_engine->getGameId() == GID_NEMESIS) {
 				time /= 1000;
+			}
 			addSideFX(new TimerNode(_engine, key, time));
 		}
 		break;
 		case MKTAG('F', 'L', 'A', 'G'):
-			for (uint32 i = 0; i < tagSize / 2; i++)
+			for (uint32 i = 0; i < tagSize / 2; i++) {
 				setStateFlagSilent(i, stream->readUint16LE());
+			}
 			break;
 		case MKTAG('P', 'U', 'Z', 'Z'):
-			for (uint32 i = 0; i < tagSize / 2; i++)
+			for (uint32 i = 0; i < tagSize / 2; i++) {
 				setStateValueSilent(i, stream->readUint16LE());
+			}
 			break;
 		default:
 			stream->seek(tagSize, SEEK_CUR);
@@ -801,10 +853,11 @@ void ScriptManager::flushEvent(Common::EventType type) {
 	EventList::iterator it = _controlEvents.begin();
 	while (it != _controlEvents.end()) {
 
-		if ((*it).type == type)
+		if ((*it).type == type) {
 			it = _controlEvents.erase(it);
-		else
+		} else {
 			it++;
+		}
 	}
 }
 
@@ -833,12 +886,15 @@ ValueSlot::ValueSlot(ScriptManager *scriptManager, const char *slotValue):
 }
 int16 ValueSlot::getValue() {
 	if (slot) {
-		if (value >= 0)
+		if (value >= 0) {
 			return _scriptManager->getStateValue(value);
-		else
+		}
+		else {
 			return 0;
-	} else
+		}
+	} else {
 		return value;
+	}
 }
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From b835eacc0cd401bb0d15a33e60d2ac47ebb4d718 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sun, 18 Jan 2015 19:26:49 -0600
Subject: ZVISION: Don't change location when coming back from ScummVM save
 dialog

Fixes bug # 6771

We don't need to change locations, since we use the ScummVM save dialog instead
of the original one (which is actually a location). Instead we just need to reset _nextLocation to
_currentLocation so the engine can stop trying to save. If we change locations, the
StateKey_LastWorld/Room/etc. end up being overwritten with the current room. So if a script
refers to location 0, 0, 0, 0 (aka, the last room), the engine will try to change location to the same room.
---
 engines/zvision/scripting/script_manager.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 4792a02045..a4ab4579b5 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -576,11 +576,8 @@ void ScriptManager::ChangeLocationReal() {
 				_nextLocation.node = _currentLocation.node;
 				_nextLocation.view = _currentLocation.view;
 				_nextLocation.offset = _currentLocation.offset;
-				_currentLocation.world = '0';
-				_currentLocation.room = '0';
-				_currentLocation.node = '0';
-				_currentLocation.view = '0';
-				_currentLocation.offset = 0;
+				
+				return;
 			} else {
 				return;
 			}
@@ -743,11 +740,6 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	cleanScriptScope(room);
 	cleanScriptScope(world);
 
-	_currentLocation.node = 0;
-	_currentLocation.world = 0;
-	_currentLocation.room = 0;
-	_currentLocation.view = 0;
-
 	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); iter++) {
 		delete(*iter);
 	}
-- 
cgit v1.2.3


From 0fafb6a62c13f6f5a4ef6215a4be592ed84f248c Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sun, 18 Jan 2015 20:11:10 -0600
Subject: Revert "ZVISION: Don't change location when coming back from ScummVM
 save dialog"

This reverts commit b835eacc0cd401bb0d15a33e60d2ac47ebb4d718.
---
 engines/zvision/scripting/script_manager.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a4ab4579b5..4792a02045 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -576,8 +576,11 @@ void ScriptManager::ChangeLocationReal() {
 				_nextLocation.node = _currentLocation.node;
 				_nextLocation.view = _currentLocation.view;
 				_nextLocation.offset = _currentLocation.offset;
-				
-				return;
+				_currentLocation.world = '0';
+				_currentLocation.room = '0';
+				_currentLocation.node = '0';
+				_currentLocation.view = '0';
+				_currentLocation.offset = 0;
 			} else {
 				return;
 			}
@@ -740,6 +743,11 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 	cleanScriptScope(room);
 	cleanScriptScope(world);
 
+	_currentLocation.node = 0;
+	_currentLocation.world = 0;
+	_currentLocation.room = 0;
+	_currentLocation.view = 0;
+
 	for (SideFXList::iterator iter = _activeSideFx.begin(); iter != _activeSideFx.end(); iter++) {
 		delete(*iter);
 	}
-- 
cgit v1.2.3


From 3a31e1de96a860b9f971cef939cb8a4aed8bcd5d Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sun, 18 Jan 2015 20:22:02 -0600
Subject: ZVISION: Don't change location when coming back from ScummVM save
 dialog and do change location when coming back from restore dialog

Fixes bug # 6771

We don't need to change locations, since we use the ScummVM save dialog instead
of the original one (which is actually a location). Instead we just need to reset _nextLocation to
_currentLocation so the engine can stop trying to save. If we change locations, the
StateKey_LastWorld/Room/etc. end up being overwritten with the current room. So if a script
refers to location 0, 0, 0, 0 (aka, the last room), the engine will try to change location to the same room.

On restore, we have to force a location change, just in case we restore to the same room. (Since the logic
will only do a location change if _nextLocation != _currentLocation)
---
 engines/zvision/scripting/script_manager.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 4792a02045..b45f17a6f1 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -576,13 +576,14 @@ void ScriptManager::ChangeLocationReal() {
 				_nextLocation.node = _currentLocation.node;
 				_nextLocation.view = _currentLocation.view;
 				_nextLocation.offset = _currentLocation.offset;
-				_currentLocation.world = '0';
+				
+				return;
+			} else {
+				_currentLocation.world = 'g';
 				_currentLocation.room = '0';
 				_currentLocation.node = '0';
 				_currentLocation.view = '0';
 				_currentLocation.offset = 0;
-			} else {
-				return;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 68b7839d994d536c7e65b3bfe5045ba164bbedd5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 19 Jan 2015 05:09:03 +0200
Subject: ZVISION: Fix bug #6768 (unable to save in the prison area)

The save buffer preparation code had a bug, which triggered in the
jail area because its room is 'j'
---
 engines/zvision/scripting/script_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index b45f17a6f1..df74fd69dc 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -607,7 +607,7 @@ void ScriptManager::ChangeLocationReal() {
 	}
 
 	if (_nextLocation.world == 'g' && _nextLocation.room == 'j') {
-		if (_nextLocation.node == 's' && _nextLocation.view == 'e' && _currentLocation.world != 'g' && _currentLocation.room != 'j') {
+		if (_nextLocation.node == 's' && _nextLocation.view == 'e' && _currentLocation.world != 'g') {
 			_engine->getSaveManager()->prepareSaveBuffer();
 		}
 	} else {
-- 
cgit v1.2.3


From 08b6a5b4865453e916709003e3a0b1a032b8e97e Mon Sep 17 00:00:00 2001
From: Fedor
Date: Mon, 19 Jan 2015 23:25:40 +0300
Subject: ZVISION: Fix comparison between signed and unsigned integers

---
 engines/zvision/video/rlf_decoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 040582bcf8..3e11a70f27 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -169,7 +169,7 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 
 	if (distance < 0) {
 		for (uint i = 0; i < _completeFrames.size(); ++i) {
-			if ((int)_completeFrames[i] > frame)
+			if (_completeFrames[i] > frame)
 				break;
 			closestFrame = _completeFrames[i];
 		}
-- 
cgit v1.2.3


From dcac5be493a98764239619d5da60d6bc0f608383 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 19 Jan 2015 23:52:08 +0200
Subject: ZVISION: Simplify the checks in the location changing code

---
 engines/zvision/scripting/script_manager.cpp | 42 ++++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index df74fd69dc..bcc1f0a5ff 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -564,12 +564,16 @@ void ScriptManager::ChangeLocationReal() {
 	assert(_nextLocation.world != 0);
 	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
-	if (_nextLocation.world == 'g' && _nextLocation.room == 'j' && !ConfMan.getBool("originalsaveload")) {
-		if ((_nextLocation.node == 's' || _nextLocation.node == 'r') && _nextLocation.view == 'e') {
+	const bool enteringMenu = (_nextLocation.world == 'g' && _nextLocation.room == 'j');
+	const bool leavingMenu = (_currentLocation.world == 'g' && _currentLocation.room == 'j');
+	const bool isSaveScreen = (enteringMenu && _nextLocation.node == 's' && _nextLocation.view == 'e');
+	const bool isRestoreScreen = (enteringMenu && _nextLocation.node == 'r' && _nextLocation.view == 'e');
+
+	if (enteringMenu && !ConfMan.getBool("originalsaveload")) {
+		if (isSaveScreen || isRestoreScreen) {
 			// Hook up the ScummVM save/restore dialog
-			bool isSave = (_nextLocation.node == 's');
-			bool gameSavedOrLoaded = _engine->getSaveManager()->scummVMSaveLoadDialog(isSave);
-			if (!gameSavedOrLoaded || isSave) {
+			bool gameSavedOrLoaded = _engine->getSaveManager()->scummVMSaveLoadDialog(isSaveScreen);
+			if (!gameSavedOrLoaded || isSaveScreen) {
 				// Reload the current room
 				_nextLocation.world = _currentLocation.world;
 				_nextLocation.room = _currentLocation.room;
@@ -590,30 +594,26 @@ void ScriptManager::ChangeLocationReal() {
 
 	_engine->setRenderDelay(2);
 
-	if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
-		if (_nextLocation.world != 'g' || _nextLocation.room != 'j') {
+	if (!enteringMenu) {
+		if (!leavingMenu) {
 			setStateValue(StateKey_LastWorld, getStateValue(StateKey_World));
 			setStateValue(StateKey_LastRoom, getStateValue(StateKey_Room));
 			setStateValue(StateKey_LastNode, getStateValue(StateKey_Node));
 			setStateValue(StateKey_LastView, getStateValue(StateKey_View));
 			setStateValue(StateKey_LastViewPos, getStateValue(StateKey_ViewPos));
-		} else {
-			setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
-			setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
-			setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
-			setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
-			setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
 		}
+	} else {
+		setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
+		setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
+		setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
+		setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
+		setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
 	}
 
-	if (_nextLocation.world == 'g' && _nextLocation.room == 'j') {
-		if (_nextLocation.node == 's' && _nextLocation.view == 'e' && _currentLocation.world != 'g') {
-			_engine->getSaveManager()->prepareSaveBuffer();
-		}
-	} else {
-		if (_currentLocation.world == 'g' && _currentLocation.room == 'j') {
-			_engine->getSaveManager()->flushSaveBuffer();
-		}
+	if (isSaveScreen && !leavingMenu) {
+		_engine->getSaveManager()->prepareSaveBuffer();
+	} else if (leavingMenu) {
+		_engine->getSaveManager()->flushSaveBuffer();
 	}
 
 	setStateValue(StateKey_World, _nextLocation.world);
-- 
cgit v1.2.3


From 5df2e08c1668c6649f7817688ce1ce198e563083 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 19 Jan 2015 23:54:07 +0200
Subject: ZVISION: Fix bug #6771 (unable to leave room when loading a game)

Avoid overwriting the previous location when loading a saved game
---
 engines/zvision/scripting/script_manager.cpp | 8 ++++----
 engines/zvision/scripting/script_manager.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index bcc1f0a5ff..34376cee5b 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -74,7 +74,7 @@ void ScriptManager::initialize() {
 void ScriptManager::update(uint deltaTimeMillis) {
 	if (_currentLocation.node != _nextLocation.node || _currentLocation.room != _nextLocation.room ||
 	        _currentLocation.view != _nextLocation.view || _currentLocation.world != _nextLocation.world) {
-		ChangeLocationReal();
+		ChangeLocationReal(false);
 	}
 
 	updateNodes(deltaTimeMillis);
@@ -560,7 +560,7 @@ void ScriptManager::changeLocation(char _world, char _room, char _node, char _vi
 	}
 }
 
-void ScriptManager::ChangeLocationReal() {
+void ScriptManager::ChangeLocationReal(bool isLoading) {
 	assert(_nextLocation.world != 0);
 	debug(1, "Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
@@ -595,7 +595,7 @@ void ScriptManager::ChangeLocationReal() {
 	_engine->setRenderDelay(2);
 
 	if (!enteringMenu) {
-		if (!leavingMenu) {
+		if (!isLoading && !leavingMenu) {
 			setStateValue(StateKey_LastWorld, getStateValue(StateKey_World));
 			setStateValue(StateKey_LastRoom, getStateValue(StateKey_Room));
 			setStateValue(StateKey_LastNode, getStateValue(StateKey_Node));
@@ -809,7 +809,7 @@ void ScriptManager::deserialize(Common::SeekableReadStream *stream) {
 
 	_nextLocation = nextLocation;
 
-	ChangeLocationReal();
+	ChangeLocationReal(true);
 
 	_engine->setRenderDelay(10);
 	setStateValue(StateKey_RestoreFlag, 1);
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index f6201c3572..6d025bf2e9 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -273,7 +273,7 @@ private:
 	bool execScope(ScriptScope &scope);
 
 	/** Perform change location */
-	void ChangeLocationReal();
+	void ChangeLocationReal(bool isLoading);
 
 	int8 inventoryGetCount();
 	void inventorySetCount(int8 cnt);
-- 
cgit v1.2.3


From 5f9858844a24b00e75ef2c504b2d68c189261dd2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 20 Jan 2015 01:21:16 +0200
Subject: ZVISION: Fix saving when using the original save dialog

A regression from commit dcac5be493
---
 engines/zvision/scripting/script_manager.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 34376cee5b..a4491103e6 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -594,26 +594,30 @@ void ScriptManager::ChangeLocationReal(bool isLoading) {
 
 	_engine->setRenderDelay(2);
 
-	if (!enteringMenu) {
-		if (!isLoading && !leavingMenu) {
+	if (!leavingMenu) {
+		if (!isLoading && !enteringMenu) {
 			setStateValue(StateKey_LastWorld, getStateValue(StateKey_World));
 			setStateValue(StateKey_LastRoom, getStateValue(StateKey_Room));
 			setStateValue(StateKey_LastNode, getStateValue(StateKey_Node));
 			setStateValue(StateKey_LastView, getStateValue(StateKey_View));
 			setStateValue(StateKey_LastViewPos, getStateValue(StateKey_ViewPos));
+		} else {
+			setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
+			setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
+			setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
+			setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
+			setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
 		}
-	} else {
-		setStateValue(StateKey_Menu_LastWorld, getStateValue(StateKey_World));
-		setStateValue(StateKey_Menu_LastRoom, getStateValue(StateKey_Room));
-		setStateValue(StateKey_Menu_LastNode, getStateValue(StateKey_Node));
-		setStateValue(StateKey_Menu_LastView, getStateValue(StateKey_View));
-		setStateValue(StateKey_Menu_LastViewPos, getStateValue(StateKey_ViewPos));
 	}
 
-	if (isSaveScreen && !leavingMenu) {
-		_engine->getSaveManager()->prepareSaveBuffer();
-	} else if (leavingMenu) {
-		_engine->getSaveManager()->flushSaveBuffer();
+	if (enteringMenu) {
+		if (isSaveScreen && !leavingMenu) {
+			_engine->getSaveManager()->prepareSaveBuffer();
+		}
+	} else {
+		if (leavingMenu) {
+			_engine->getSaveManager()->flushSaveBuffer();
+		}
 	}
 
 	setStateValue(StateKey_World, _nextLocation.world);
-- 
cgit v1.2.3


From 750d72812b36bfed3043080d633798854dc4008d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 20 Jan 2015 02:16:21 +0200
Subject: ZVISION: Properly skip commented out puzzle criteria - fixes bug
 #6776

In the Zork: Nemesis version bundled in the ZGI SE DVD, the bell rope
puzzle has been modified so that it's non-interactive, i.e. there isn't
a hotspot to click while the video is playing, and the player is
transported to the next room. In the patched script, all criteria of
that puzzle were commented out, resulting in an invalid criteria list.
Skip any commented out criteria, to avoid ending with an invalid list.
---
 engines/zvision/scripting/scr_file_handling.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index b4da61a119..277702d287 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -104,6 +104,13 @@ bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::Li
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
 
+	// Skip any commented out criteria. If all the criteria are commented out,
+	// we might end up with an invalid criteria list (bug #6776).
+	while (line.empty()) {
+		line = stream.readLine();
+		trimCommentsAndWhiteSpace(&line);
+	}
+
 	// Criteria can be empty
 	if (line.contains('}')) {
 		return false;
-- 
cgit v1.2.3


From ad83f033151ac6cf6345e6a83a0903ad6499c0ca Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 20 Jan 2015 19:21:39 +0100
Subject: ZVISION: Fix mis-parsing of criteria, a.k.a bug #6774

A condition in a criteria is made up of three tokens: An id, an
operator and an id/value. However, in my copy of ZGI, puzzle:07507
has "[00202] !3  # SPELL_12_IN_BOOK", i.e. there was no space
between the second and third tokens. This caused the "glorf" spell
to not be properly inscribed in your spell book.

To fix this, if the second token is more than one character we use
the rest of it as the third token.
---
 engines/zvision/scripting/scr_file_handling.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 277702d287..8f0f80e39e 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -141,9 +141,17 @@ bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::Li
 		else if (token.c_str()[0] == '<')
 			entry.criteriaOperator = Puzzle::LESS_THAN;
 
+		// There are supposed to be three tokens, but there is no
+		// guarantee that there will be a space between the second and
+		// the third one (bug #6774)
+		if (token.size() == 1) {
+			token = tokenizer.nextToken();
+		} else {
+			token.deleteChar(0);
+		}
+
 		// First determine if the last token is an id or a value
 		// Then parse it into 'argument'
-		token = tokenizer.nextToken();
 		if (token.contains('[')) {
 			sscanf(token.c_str(), "[%u]", &(entry.argument));
 			entry.argumentIsAKey = true;
-- 
cgit v1.2.3


From 1d6a80734969d2475c7d97945a74225b12dae297 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 20 Jan 2015 05:19:44 +0200
Subject: ZVISION: Adapt confirmation dialogs for non-English versions

---
 engines/zvision/graphics/render_manager.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index da6655b310..a65117f2b5 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -989,14 +989,33 @@ bool RenderManager::askQuestion(const Common::String &str) {
 		Common::Event evnt;
 		while (_engine->getEventManager()->pollEvent(evnt)) {
 			if (evnt.type == Common::EVENT_KEYDOWN) {
+				// English: yes/no
+				// German: ja/nein
+				// Spanish: si/no
+				// French: F4/any other key
 				switch (evnt.kbd.keycode) {
 				case Common::KEYCODE_y:
-					result = 2;
+					if (_engine->getLanguage() == Common::EN_ANY)
+						result = 2;
+					break;
+				case Common::KEYCODE_j:
+					if (_engine->getLanguage() == Common::DE_DEU)
+						result = 2;
+					break;
+				case Common::KEYCODE_s:
+					if (_engine->getLanguage() == Common::ES_ESP)
+						result = 2;
+					break;
+				case Common::KEYCODE_F4:
+					if (_engine->getLanguage() == Common::FR_FRA)
+						result = 2;
 					break;
 				case Common::KEYCODE_n:
 					result = 1;
 					break;
 				default:
+					if (_engine->getLanguage() == Common::FR_FRA)
+						result = 1;
 					break;
 				}
 			}
-- 
cgit v1.2.3


From 0776709f3175da3ebca69f8a4866d4d98a1e9be9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 21 Jan 2015 00:33:54 +0200
Subject: ZVISION: Do not process cheat codes while in the game menus

This prevents the cheat codes from being accidentally triggered when
using the save screen, for example
---
 engines/zvision/core/events.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 4c7d395892..9cf5d04a7a 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -93,6 +93,11 @@ void ZVision::shortKeys(Common::Event event) {
 }
 
 void ZVision::cheatCodes(uint8 key) {
+	Location loc = _scriptManager->getCurrentLocation();
+	// Do not process cheat codes while in the game menus
+	if (loc.world == 'g' && loc.room == 'j')
+		return;
+
 	pushKeyToCheatBuf(key);
 
 	if (getGameId() == GID_GRANDINQUISITOR) {
@@ -146,7 +151,6 @@ void ZVision::cheatCodes(uint8 key) {
 		}
 
 		if (checkCode("HELLOSAILOR")) {
-			Location loc = _scriptManager->getCurrentLocation();
 			Audio::AudioStream *soundStream;
 			if (loc.world == 'v' && loc.room == 'b' && loc.node == '1' && loc.view == '0') {
 				soundStream = makeRawZorkStream("v000hpta.raw", this);
-- 
cgit v1.2.3


From 5a6f711d07f64193692451c9969b661c094e2021 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 20 Jan 2015 23:30:32 +0100
Subject: ZVISION: Convert subtitles to UTF-32 before rendering them (bug
 #6772)

Because we use Common::String to store UTF-8 data, the font
renderer will draw the wrong glyphs for non-ASCII characters,
unless we first convert the string to UTF-32. (I thought the same
change would have to be made for the ZGI game over screens, but
apparently they work anyway. At least the German version, I'm told.)

I've discussed this change with [md5], and while it would probably
be more correct to make the engine use UTF-32 throughout, that is
also rather painful.
---
 engines/zvision/text/truetype_font.cpp | 38 +++++++++++++++++++++++++++++++---
 engines/zvision/text/truetype_font.h   |  2 ++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 9f4fbe797b..f7580fb553 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -26,6 +26,7 @@
 #include "common/file.h"
 #include "common/system.h"
 #include "common/unzip.h"
+#include "common/ustr.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
 #include "graphics/surface.h"
@@ -168,6 +169,36 @@ int StyledTTFont::getKerningOffset(byte left, byte right) {
 	return 0;
 }
 
+Common::U32String StyledTTFont::convertUtf8ToUtf32(const Common::String &str) {
+	// The String class, and therefore the Font class as well, assume one
+	// character is one byte, but in this case it's actually an UTF-8
+	// string with up to 4 bytes per character. To work around this,
+	// convert it to an U32String before drawing it, because our Font class
+	// can handle that.
+	Common::U32String u32str;
+	uint i = 0;
+	while (i < str.size()) {
+		uint32 chr = 0;
+		if ((str[i] & 0xF8) == 0xF0) {
+			chr |= (str[i++] & 0x07) << 18;
+			chr |= (str[i++] & 0x3F) << 12;
+			chr |= (str[i++] & 0x3F) << 6;
+			chr |= (str[i++] & 0x3F);
+		} else if ((str[i] & 0xF0) == 0xE0) {
+			chr |= (str[i++] & 0x0F) << 12;
+			chr |= (str[i++] & 0x3F) << 6;
+			chr |= (str[i++] & 0x3F);
+		} else if ((str[i] & 0xE0) == 0xC0) {
+			chr |= (str[i++] & 0x1F) << 6;
+			chr |= (str[i++] & 0x3F);
+		} else {
+			chr = (str[i++] & 0x7F);
+		}
+		u32str += chr;
+	}
+	return u32str;
+}
+
 void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
 	if (_font) {
 		_font->drawChar(dst, chr, x, y, color);
@@ -186,10 +217,11 @@ void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint
 
 void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align) {
 	if (_font) {
-		_font->drawString(dst, str, x, y, w, color, align);
+		Common::U32String u32str = convertUtf8ToUtf32(str);
+		_font->drawString(dst, u32str, x, y, w, color, align);
 		if (_style & STTF_UNDERLINE) {
 			int16 pos = floor(_font->getFontHeight() * 0.87);
-			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 wd = MIN(_font->getStringWidth(u32str), w);
 			int16 stX = x;
 			if (align == Graphics::kTextAlignCenter)
 				stX += (w - wd) / 2;
@@ -202,7 +234,7 @@ void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str,
 		}
 		if (_style & STTF_STRIKEOUT) {
 			int16 pos = floor(_font->getFontHeight() * 0.60);
-			int16 wd = MIN(_font->getStringWidth(str), w);
+			int16 wd = MIN(_font->getStringWidth(u32str), w);
 			int16 stX = x;
 			if (align == Graphics::kTextAlignCenter)
 				stX += (w - wd) / 2;
diff --git a/engines/zvision/text/truetype_font.h b/engines/zvision/text/truetype_font.h
index 6fbb1f0504..caa9c09a76 100644
--- a/engines/zvision/text/truetype_font.h
+++ b/engines/zvision/text/truetype_font.h
@@ -77,6 +77,8 @@ public:
 	int getCharWidth(byte chr);
 	int getKerningOffset(byte left, byte right);
 
+	Common::U32String convertUtf8ToUtf32(const Common::String &str);
+
 	void drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color);
 
 	void drawString(Graphics::Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, Graphics::TextAlign align = Graphics::kTextAlignLeft);
-- 
cgit v1.2.3


From 1330cb7c99478c67a722ff3bd35567dcd59f8fdf Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 21 Jan 2015 01:41:35 +0200
Subject: ZVISION: Remove superfluous check

---
 engines/zvision/scripting/script_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a4491103e6..d10cd81438 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -210,7 +210,7 @@ void ScriptManager::updateControls(uint deltaTimeMillis) {
 bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 	// Check if the puzzle is already finished
 	// Also check that the puzzle isn't disabled
-	if (getStateValue(puzzle->key) == 1 || (getStateFlag(puzzle->key) & Puzzle::DISABLED) == Puzzle::DISABLED) {
+	if (getStateValue(puzzle->key) == 1 || (getStateFlag(puzzle->key) & Puzzle::DISABLED)) {
 		return true;
 	}
 
-- 
cgit v1.2.3


From 796fb134f1af6b3617b7687d2a89ab51dd1aa63d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 21 Jan 2015 01:24:59 +0100
Subject: ZVISION: Remove unnecessary spaces

---
 engines/zvision/scripting/script_manager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index d10cd81438..71966b3125 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -78,16 +78,16 @@ void ScriptManager::update(uint deltaTimeMillis) {
 	}
 
 	updateNodes(deltaTimeMillis);
-	if (! execScope(nodeview)) {
+	if (!execScope(nodeview)) {
 		return;
 	}
-	if (! execScope(room)) {
+	if (!execScope(room)) {
 		return;
 	}
-	if (! execScope(world)) {
+	if (!execScope(world)) {
 		return;
 	}
-	if (! execScope(universe)) {
+	if (!execScope(universe)) {
 		return;
 	}
 	updateControls(deltaTimeMillis);
-- 
cgit v1.2.3


From dfe04491c1d8ecb45f4952af96c9d73e9e654a32 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 21 Jan 2015 01:29:22 +0100
Subject: JANITORIAL: Remove unnecessary semicolons

---
 engines/access/player.cpp             | 2 +-
 engines/fullpipe/gameloader.cpp       | 2 +-
 engines/fullpipe/modal.cpp            | 2 +-
 engines/fullpipe/scenes/scene23.cpp   | 4 ++--
 engines/hopkins/lines.cpp             | 2 +-
 engines/mads/nebular/game_nebular.cpp | 2 +-
 engines/neverhood/menumodule.cpp      | 2 +-
 engines/wintermute/debugger.cpp       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index e47daf532c..5a2b98293f 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -388,7 +388,7 @@ void Player::walkUpLeft() {
 	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTempL = (byte)tempL;
 	_rawYTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOffset] -
-		(tempL < 0 ? 1 : 0);;
+		(tempL < 0 ? 1 : 0);
 
 	if (_vm->_room->codeWalls()) {
 		plotCom2();
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index fbf96b3060..7815475d37 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -323,7 +323,7 @@ bool preloadCallback(PreloadItem &pre, int flag) {
 
 		if (!g_fp->_loaderScene) {
 			g_fp->_gameLoader->loadScene(SC_LDR);
-			g_fp->_loaderScene = g_fp->accessScene(SC_LDR);;
+			g_fp->_loaderScene = g_fp->accessScene(SC_LDR);
 		}
 
 		StaticANIObject *pbar = g_fp->_loaderScene->getStaticANIObject1ById(ANI_PBAR, -1);
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 2fd7ef0c21..096323781f 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -305,7 +305,7 @@ bool ModalMap::init(int counterdiff) {
 
 	if (_flag) {
 		_rect2.left = _mouseX + _field_38 - g_fp->_mouseScreenPos.x;
-		_rect2.top = _mouseY + _field_3C - g_fp->_mouseScreenPos.y;;
+		_rect2.top = _mouseY + _field_3C - g_fp->_mouseScreenPos.y;
 		_rect2.right = _rect2.left + 800;
 		_rect2.bottom = _rect2.top + 600;
 
diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/fullpipe/scenes/scene23.cpp
index f66ea12b4b..ded467e438 100644
--- a/engines/fullpipe/scenes/scene23.cpp
+++ b/engines/fullpipe/scenes/scene23.cpp
@@ -299,14 +299,14 @@ void sceneHandler23_pushButton(ExCommand *cmd) {
 					MessageQueue *mq = getCurrSceneSc2MotionController()->method34(g_fp->_aniMan, 276, 438, 1, ST_MAN_RIGHT);
 
 					if (mq) {
-						mq->addExCommandToEnd(cmd->createClone());;
+						mq->addExCommandToEnd(cmd->createClone());
 
 						postExCommand(g_fp->_aniMan->_id, 2, 276, 438, 0, -1);
 					}
 				} else {
 					MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC23_TOCALENDAR), 0, 0);
 
-					mq->addExCommandToEnd(cmd->createClone());;
+					mq->addExCommandToEnd(cmd->createClone());
 					mq->setFlags(mq->getFlags() | 1);
 					mq->chain(0);
 				}
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 709f17a8b2..f511e6aa5a 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2110,7 +2110,7 @@ RouteItem *LinesManager::cityMapCarRoute(int x1, int y1, int x2, int y2) {
 				_testRoute0[superRouteIdx].set(curRouteX, curRouteY, curRouteDir);
 				superRouteIdx++;
 				if (curRouteX == -1)
-					break;;
+					break;
 			}
 			if (curRouteX != -1) {
 				curRouteLineIdx = arrLineIdx[DIR_UP];
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index fd669bc5cf..8c0c00428a 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -810,7 +810,7 @@ void GameNebular::step() {
 		(_player._facing == _player._turnToFacing)) {
 		if (_scene._frameStartTime >= *((uint32 *)&_globals[kWalkerTiming])) {
 			if (!_player._stopWalkerIndex) {
-				int randomVal = _vm->getRandomNumber(29999);;
+				int randomVal = _vm->getRandomNumber(29999);
 				if (_globals[kSexOfRex] == REX_MALE) {
 					switch (_player._facing) {
 					case FACING_SOUTHWEST:
diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp
index 255d04dc86..6911041e58 100644
--- a/engines/neverhood/menumodule.cpp
+++ b/engines/neverhood/menumodule.cpp
@@ -202,7 +202,7 @@ uint32 MenuModule::handleMessage(int messageNum, const MessageParam &param, Enti
 		break;
 	}
 
-	return Module::handleMessage(messageNum, param, sender);;
+	return Module::handleMessage(messageNum, param, sender);
 }
 
 void MenuModule::createLoadGameMenu() {
diff --git a/engines/wintermute/debugger.cpp b/engines/wintermute/debugger.cpp
index a313314a8b..5b617d9db9 100644
--- a/engines/wintermute/debugger.cpp
+++ b/engines/wintermute/debugger.cpp
@@ -42,7 +42,7 @@ bool Console::Cmd_ShowFps(int argc, const char **argv) {
 		if (Common::String(argv[1]) == "true") {
 			_engineRef->_game->setShowFPS(true);
 		} else if (Common::String(argv[1]) == "false") {
-			_engineRef->_game->setShowFPS(false);;
+			_engineRef->_game->setShowFPS(false);
 		}
 	}
 	return true;
-- 
cgit v1.2.3


From a59f5db505ffce9567c3bc8adf30d2f843910d65 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Jan 2015 01:51:31 -0500
Subject: VIDEO: Fix timing with frames going past the edit boundary

---
 video/qt_decoder.cpp | 48 +++++++++++++++++++++++++++++++++---------------
 video/qt_decoder.h   |  1 +
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 0a29692948..2012e369e7 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -397,8 +397,22 @@ uint32 QuickTimeDecoder::VideoTrackHandler::getNextFrameStartTime() const {
 	if (endOfTrack())
 		return 0;
 
-	// Convert to milliseconds so the tracks can be compared
-	return getRateAdjustedFrameTime() * 1000 / _parent->timeScale;
+	Audio::Timestamp frameTime(0, getRateAdjustedFrameTime(), _parent->timeScale);
+
+	// Check if the frame goes beyond the end of the edit. In that case, the next frame
+	// should really be when we cross the edit boundary.
+	if (_reversed) {
+		Audio::Timestamp editStartTime(0, _parent->editList[_curEdit].timeOffset, _decoder->_timeScale);
+		if (frameTime < editStartTime)
+			return editStartTime.msecs();
+	} else {
+		Audio::Timestamp nextEditStartTime(0, _parent->editList[_curEdit].timeOffset + _parent->editList[_curEdit].trackDuration, _decoder->_timeScale);
+		if (frameTime > nextEditStartTime)
+			return nextEditStartTime.msecs();
+	}
+
+	// Not past an edit boundary, so the frame time is what should be used
+	return frameTime.msecs();
 }
 
 const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame() {
@@ -422,6 +436,16 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame()
 			bufferNextFrame();
 	}
 
+	// Update the edit list, if applicable
+	if (endOfCurEdit()) {
+		_curEdit++;
+
+		if (atLastEdit())
+			return 0;
+
+		enterNewEditList(true);
+	}
+
 	const Graphics::Surface *frame = bufferNextFrame();
 
 	if (_reversed) {
@@ -443,16 +467,6 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame()
 		} else {
 			_nextFrameStartTime += getFrameDuration();
 		}
-
-		// Update the edit list, if applicable
-		// HACK: We're also accepting the time minus one because edit lists
-		// aren't as accurate as one would hope.
-		if (!atLastEdit() && getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration() - 1) {
-			_curEdit++;
-
-			if (!atLastEdit())
-				enterNewEditList(true);
-		}
 	}
 
 	if (frame && (_parent->scaleFactorX != 1 || _parent->scaleFactorY != 1)) {
@@ -497,9 +511,7 @@ bool QuickTimeDecoder::VideoTrackHandler::setReverse(bool reverse) {
 		}
 	} else {
 		// Update the edit list, if applicable
-		// HACK: We're also accepting the time minus one because edit lists
-		// aren't as accurate as one would hope.
-		if (!atLastEdit() && getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration() - 1) {
+		if (!atLastEdit() && endOfCurEdit()) {
 			_curEdit++;
 
 			if (atLastEdit())
@@ -739,4 +751,10 @@ bool QuickTimeDecoder::VideoTrackHandler::atLastEdit() const {
 	return _curEdit == _parent->editCount;
 }
 
+bool QuickTimeDecoder::VideoTrackHandler::endOfCurEdit() const {
+	// HACK: We're also accepting the time minus one because edit lists
+	// aren't as accurate as one would hope.
+	return getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration() - 1;
+}
+
 } // End of namespace Video
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 7e87d21ae7..aa16ffc4db 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -166,6 +166,7 @@ private:
 		uint32 getCurEditTimeOffset() const;
 		uint32 getCurEditTrackDuration() const;
 		bool atLastEdit() const;
+		bool endOfCurEdit() const;
 	};
 };
 
-- 
cgit v1.2.3


From aaf4d38a56219c63ee41638e93ef83f66f309b23 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Jan 2015 01:53:53 -0500
Subject: VIDEO: Round the edit time offset instead of truncating it

Allows for the KQ6 Mac intro to play without the edit "-1" hack
---
 video/qt_decoder.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 2012e369e7..14102794c4 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -721,7 +721,12 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::bufferNextFrame()
 
 uint32 QuickTimeDecoder::VideoTrackHandler::getRateAdjustedFrameTime() const {
 	// Figure out what time the next frame is at taking the edit list rate into account
-	uint32 convertedTime = (Common::Rational(_nextFrameStartTime - getCurEditTimeOffset()) / _parent->editList[_curEdit].mediaRate).toInt();
+	Common::Rational offsetFromEdit = Common::Rational(_nextFrameStartTime - getCurEditTimeOffset()) / _parent->editList[_curEdit].mediaRate;
+	uint32 convertedTime = offsetFromEdit.toInt();
+
+	if ((offsetFromEdit.getNumerator() % offsetFromEdit.getDenominator()) > (offsetFromEdit.getDenominator() / 2))
+		convertedTime++;
+
 	return convertedTime + getCurEditTimeOffset();
 }
 
-- 
cgit v1.2.3


From 8e2a438dd9cf8d2c9b6413cfb4cd5e6b81a3c4d0 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Jan 2015 01:58:27 -0500
Subject: VIDEO: Fix edit frame calculation

An edit that seeks to the last frame of the media would not show
---
 video/qt_decoder.cpp | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 14102794c4..ee2bd02717 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -629,30 +629,32 @@ void QuickTimeDecoder::VideoTrackHandler::enterNewEditList(bool bufferFrames) {
 	if (atLastEdit())
 		return;
 
+	uint32 mediaTime = _parent->editList[_curEdit].mediaTime;
 	uint32 frameNum = 0;
-	bool done = false;
 	uint32 totalDuration = 0;
-	uint32 prevDuration = 0;
+	_durationOverride = -1;
 
 	// Track down where the mediaTime is in the media
 	// This is basically time -> frame mapping
 	// Note that this code uses first frame = 0
-	for (int32 i = 0; i < _parent->timeToSampleCount && !done; i++) {
-		for (int32 j = 0; j < _parent->timeToSample[i].count; j++) {
-			if (totalDuration == (uint32)_parent->editList[_curEdit].mediaTime) {
-				done = true;
-				prevDuration = totalDuration;
-				break;
-			} else if (totalDuration > (uint32)_parent->editList[_curEdit].mediaTime) {
-				done = true;
-				frameNum--;
-				break;
-			}
+	for (int32 i = 0; i < _parent->timeToSampleCount; i++) {
+		uint32 duration = _parent->timeToSample[i].count * _parent->timeToSample[i].duration;
+
+		if (totalDuration + duration >= mediaTime) {
+			uint32 frameInc = (mediaTime - totalDuration) / _parent->timeToSample[i].duration;
+			frameNum += frameInc;
+			totalDuration += frameInc * _parent->timeToSample[i].duration;
 
-			prevDuration = totalDuration;
-			totalDuration += _parent->timeToSample[i].duration;
-			frameNum++;
+			// If we didn't get to the exact media time, mark an override for
+			// the time.
+			if (totalDuration != mediaTime)
+				_durationOverride = totalDuration + _parent->timeToSample[i].duration - mediaTime;
+
+			break;
 		}
+
+		frameNum += _parent->timeToSample[i].count;
+		totalDuration += duration;
 	}
 
 	if (bufferFrames) {
@@ -668,12 +670,6 @@ void QuickTimeDecoder::VideoTrackHandler::enterNewEditList(bool bufferFrames) {
 	}
 
 	_nextFrameStartTime = getCurEditTimeOffset();
-
-	// Set an override for the duration since we came up in-between two frames
-	if (prevDuration != totalDuration)
-		_durationOverride = totalDuration - prevDuration;
-	else
-		_durationOverride = -1;
 }
 
 const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::bufferNextFrame() {
-- 
cgit v1.2.3


From 1a0f104acfd465fa577dd14a43b368f92794a9d0 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Jan 2015 02:03:08 -0500
Subject: VIDEO: Fix potential off-by-one frame time after seek

If seeking to the final frame of an edit, _nextFrameStartTime wouldn't be adjust properly and would wrongly say that it's at the end of the edit. This never affected anything because of the edit "-1" hack.
---
 video/qt_decoder.cpp | 49 ++++++++++++++++++++++---------------------------
 video/qt_decoder.h   |  1 -
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index ee2bd02717..8ce10d9917 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -286,7 +286,6 @@ QuickTimeDecoder::VideoTrackHandler::VideoTrackHandler(QuickTimeDecoder *decoder
 	_curEdit = 0;
 	enterNewEditList(false);
 
-	_holdNextFrameStartTime = false;
 	_curFrame = -1;
 	_durationOverride = -1;
 	_scaledSurface = 0;
@@ -347,15 +346,12 @@ bool QuickTimeDecoder::VideoTrackHandler::seek(const Audio::Timestamp &requested
 		}
 	}
 
-	// All that's left is to figure out what our starting time is going to be
-	// Compare the starting point for the frame to where we need to be
-	_holdNextFrameStartTime = getRateAdjustedFrameTime() != (uint32)time.totalNumberOfFrames();
-
-	// If we went past the time, go back a frame. _curFrame before this point is at the frame
-	// that should be displayed. This adjustment ensures it is on the frame before the one that
-	// should be displayed.
-	if (_holdNextFrameStartTime)
+	// Check if we went past, then adjust the frame times
+	if (getRateAdjustedFrameTime() != (uint32)time.totalNumberOfFrames()) {
 		_curFrame--;
+		_durationOverride = getRateAdjustedFrameTime() - time.totalNumberOfFrames();
+		_nextFrameStartTime = time.totalNumberOfFrames();
+	}
 
 	if (_reversed) {
 		// Call setReverse again to update
@@ -449,20 +445,18 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame()
 	const Graphics::Surface *frame = bufferNextFrame();
 
 	if (_reversed) {
-		if (_holdNextFrameStartTime) {
-			// Don't set the next frame start time here; we just did a seek
-			_holdNextFrameStartTime = false;
+		if (_durationOverride >= 0) {
+			// Use our own duration overridden from a media seek
+			_nextFrameStartTime -= _durationOverride;
+			_durationOverride = -1;
 		} else {
 			// Just need to subtract the time
 			_nextFrameStartTime -= getFrameDuration();
 		}
 	} else {
-		if (_holdNextFrameStartTime) {
-			// Don't set the next frame start time here; we just did a seek
-			_holdNextFrameStartTime = false;
-		} else if (_durationOverride >= 0) {
-			// Use our own duration from the edit list calculation
-			_nextFrameStartTime += _durationOverride;
+		if (_durationOverride >= 0) {
+			// Use our own duration overridden from a media seek
+ 			_nextFrameStartTime += _durationOverride;
 			_durationOverride = -1;
 		} else {
 			_nextFrameStartTime += getFrameDuration();
@@ -499,11 +493,11 @@ bool QuickTimeDecoder::VideoTrackHandler::setReverse(bool reverse) {
 			_curEdit = _parent->editCount - 1;
 			_curFrame = _parent->frameCount;
 			_nextFrameStartTime = _parent->editList[_curEdit].trackDuration + _parent->editList[_curEdit].timeOffset;
-		} else if (_holdNextFrameStartTime) {
-			// We just seeked, so "pivot" around the frame that should be displayed
-			_curFrame++;
-			_nextFrameStartTime -= getFrameDuration();
-			_curFrame++;
+		} else if (_durationOverride >= 0) {
+			// We just had a media seek, so "pivot" around the frame that should
+			// be displayed.
+			_curFrame += 2;
+			_nextFrameStartTime += _durationOverride;
 		} else {
 			// We need to put _curFrame to be the one after the one that should be displayed.
 			// Since we're on the frame that should be displaying right now, add one.
@@ -518,11 +512,12 @@ bool QuickTimeDecoder::VideoTrackHandler::setReverse(bool reverse) {
 				return true;
 		}
 
-		if (_holdNextFrameStartTime) {
-			// We just seeked, so "pivot" around the frame that should be displayed
+		if (_durationOverride >= 0) {
+			// We just had a media seek, so "pivot" around the frame that should
+			// be displayed.
 			_curFrame--;
-			_nextFrameStartTime += getFrameDuration();
-		}
+			_nextFrameStartTime -= _durationOverride;
+ 		}
 
 		// We need to put _curFrame to be the one before the one that should be displayed.
 		// Since we're on the frame that should be displaying right now, subtract one.
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index aa16ffc4db..99ac9ff5f7 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -151,7 +151,6 @@ private:
 		int32 _curFrame;
 		uint32 _nextFrameStartTime;
 		Graphics::Surface *_scaledSurface;
-		bool _holdNextFrameStartTime;
 		int32 _durationOverride;
 		const byte *_curPalette;
 		mutable bool _dirtyPalette;
-- 
cgit v1.2.3


From 7d1ee5563a7168843b9f6400010ddd9983abebbc Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Jan 2015 02:10:25 -0500
Subject: VIDEO: Remove the "-1" edit hack

With the previous commits' fixes, it's no longer needed
---
 video/qt_decoder.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 8ce10d9917..08d7620fb2 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -748,9 +748,9 @@ bool QuickTimeDecoder::VideoTrackHandler::atLastEdit() const {
 }
 
 bool QuickTimeDecoder::VideoTrackHandler::endOfCurEdit() const {
-	// HACK: We're also accepting the time minus one because edit lists
-	// aren't as accurate as one would hope.
-	return getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration() - 1;
+	// We're at the end of the edit once the next frame's time would
+	// bring us past the end of the edit.
+	return getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration();
 }
 
 } // End of namespace Video
-- 
cgit v1.2.3


From cb25b7b5eea53769fc378dc8ae3d360eca685e74 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Jan 2015 02:11:20 -0500
Subject: VIDEO: Make the QuickTime code error out again if the frame data
 can't be found

The case shouldn't actually ever happen; the off-by-one bug when seeking to the last frame of the media (in an edit) caused this originally
---
 video/qt_decoder.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 08d7620fb2..9b77ef70c1 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -566,10 +566,8 @@ Common::SeekableReadStream *QuickTimeDecoder::VideoTrackHandler::getNextFramePac
 		}
 	}
 
-	if (actualChunk < 0) {
-		warning("Could not find data for frame %d", _curFrame);
-		return 0;
-	}
+	if (actualChunk < 0)
+		error("Could not find data for frame %d", _curFrame);
 
 	// Next seek to that frame
 	Common::SeekableReadStream *stream = _decoder->_fd;
-- 
cgit v1.2.3


From 46fe6b64b9bac081384107192b7bcd24fbb255f5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 21 Jan 2015 12:35:12 +0200
Subject: ZVISION: Properly handle confirmation dialogs in the French ver. of
 ZGI

---
 engines/zvision/graphics/render_manager.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index a65117f2b5..3cd9701b7c 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -992,7 +992,8 @@ bool RenderManager::askQuestion(const Common::String &str) {
 				// English: yes/no
 				// German: ja/nein
 				// Spanish: si/no
-				// French: F4/any other key
+				// French Nemesis: F4/any other key
+				// French ZGI: oui/non
 				switch (evnt.kbd.keycode) {
 				case Common::KEYCODE_y:
 					if (_engine->getLanguage() == Common::EN_ANY)
@@ -1006,15 +1007,19 @@ bool RenderManager::askQuestion(const Common::String &str) {
 					if (_engine->getLanguage() == Common::ES_ESP)
 						result = 2;
 					break;
+				case Common::KEYCODE_o:
+					if (_engine->getLanguage() == Common::FR_FRA && _engine->getGameId() == GID_GRANDINQUISITOR)
+						result = 2;
+					break;
 				case Common::KEYCODE_F4:
-					if (_engine->getLanguage() == Common::FR_FRA)
+					if (_engine->getLanguage() == Common::FR_FRA && _engine->getGameId() == GID_NEMESIS)
 						result = 2;
 					break;
 				case Common::KEYCODE_n:
 					result = 1;
 					break;
 				default:
-					if (_engine->getLanguage() == Common::FR_FRA)
+					if (_engine->getLanguage() == Common::FR_FRA && _engine->getGameId() == GID_NEMESIS)
 						result = 1;
 					break;
 				}
-- 
cgit v1.2.3


From e66883d5cbae4d92264cd1c2b5784af79d30f152 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 21 Jan 2015 14:06:13 +0200
Subject: ZVISION: Add console commands to manipulate state flags and variables

---
 engines/zvision/core/console.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 engines/zvision/core/console.h   |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index e54e986bd7..f5cacb582c 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -54,6 +54,8 @@ Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {
 	registerCmd("dumpfile", WRAP_METHOD(Console, cmdDumpFile));
 	registerCmd("dumpfiles", WRAP_METHOD(Console, cmdDumpFiles));
 	registerCmd("dumpimage", WRAP_METHOD(Console, cmdDumpImage));
+	registerCmd("statevalue", WRAP_METHOD(Console, cmdStateValue));
+	registerCmd("stateflag", WRAP_METHOD(Console, cmdStateFlag));
 }
 
 bool Console::cmdLoadVideo(int argc, const char **argv) {
@@ -329,4 +331,40 @@ bool Console::cmdDumpImage(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdStateValue(int argc, const char **argv) {
+	if (argc < 2) {
+		debugPrintf("Use %s <valuenum> to show the value of a state variable\n", argv[0]);
+		debugPrintf("Use %s <valuenum> <newvalue> to set the value of a state variable\n", argv[0]);
+		return true;
+	}
+
+	int valueNum = atoi(argv[1]);
+	int newValue = (argc > 2) ? atoi(argv[2]) : -1;
+
+	if (argc == 2)
+		debugPrintf("[%d] = %d\n", valueNum, _engine->getScriptManager()->getStateValue(valueNum));
+	else if (argc == 3)
+		_engine->getScriptManager()->setStateValue(valueNum, newValue);
+
+	return true;
+}
+
+bool Console::cmdStateFlag(int argc, const char **argv) {
+	if (argc < 2) {
+		debugPrintf("Use %s <flagnum> to show the value of a state flag\n", argv[0]);
+		debugPrintf("Use %s <flagnum> <newvalue> to set the value of a state flag\n", argv[0]);
+		return true;
+	}
+
+	int valueNum = atoi(argv[1]);
+	int newValue = (argc > 2) ? atoi(argv[2]) : -1;
+
+	if (argc == 2)
+		debugPrintf("[%d] = %d\n", valueNum, _engine->getScriptManager()->getStateFlag(valueNum));
+	else if (argc == 3)
+		_engine->getScriptManager()->setStateFlag(valueNum, newValue);
+
+	return true;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/core/console.h b/engines/zvision/core/console.h
index ffce87869f..ac834185a0 100644
--- a/engines/zvision/core/console.h
+++ b/engines/zvision/core/console.h
@@ -48,6 +48,8 @@ private:
 	bool cmdDumpFile(int argc, const char **argv);
 	bool cmdDumpFiles(int argc, const char **argv);
 	bool cmdDumpImage(int argc, const char **argv);
+	bool cmdStateValue(int argc, const char **argv);
+	bool cmdStateFlag(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From f7e0d1e958f3b6a4bfff9ba2c9ade03375e8f9d9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 23 Jan 2015 03:01:29 +0200
Subject: ZVISION: Fix shadowed variable

A bug in commit 21e9007d80. Thanks to fingolfin for pointing it out
---
 engines/zvision/file/save_manager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 55be8d2530..1e0c57e2b3 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -136,13 +136,15 @@ Common::Error SaveManager::loadGame(int slot) {
 	if (slot >= 0) {
 		saveFile = getSlotFile(slot);
 	} else {
-		Common::File *saveFile = _engine->getSearchManager()->openFile("r.svr");
+		saveFile = _engine->getSearchManager()->openFile("r.svr");
 		if (!saveFile) {
-			saveFile = new Common::File;
-			if (!saveFile->open("r.svr")) {
-				delete saveFile;
+			Common::File *restoreFile = new Common::File();
+			if (!restoreFile->open("r.svr")) {
+				delete restoreFile;
 				return Common::kPathDoesNotExist;
 			}
+
+			saveFile = restoreFile;
 		}
 	}
 
-- 
cgit v1.2.3


From 1bd83a96f00c4d25cf4060ba8faffda81865ad7d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 23 Jan 2015 03:02:24 +0200
Subject: ZVISION: Fix script bug #6780 (invalid hotspot at base of tower in
 ZGI)

---
 engines/zvision/scripting/scr_file_handling.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 8f0f80e39e..b9cafa77ed 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -358,6 +358,16 @@ Control *ScriptManager::parseControl(Common::String &line, Common::SeekableReadS
 	Common::String controlType(controlTypeBuffer);
 
 	if (controlType.equalsIgnoreCase("push_toggle")) {
+		// WORKAROUND for a script bug in ZGI: There is an invalid hotspot
+		// at scene em1h (bottom of tower), which points to a missing
+		// script em1n. This is a hotspot at the right of the screen.
+		// In the original, this hotspot doesn't lead anywhere anyway,
+		// so instead of moving to a missing scene, we just remove the
+		// hotspot altogether. The alternative would be to just process
+		// and ignore invalid scenes, but I don't think it's worth the
+		// effort. Fixes bug #6780.
+		if (_engine->getGameId() == GID_GRANDINQUISITOR && key == 5653)
+			return NULL;
 		return new PushToggleControl(_engine, key, stream);
 	} else if (controlType.equalsIgnoreCase("flat")) {
 		Control::parseFlatControl(_engine);
-- 
cgit v1.2.3


From d75fbe79f064e3ee017764024aac173a7d599583 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 23 Jan 2015 03:04:50 +0200
Subject: ZVISION: Error out when a script file can't be found or be parsed

This should be an error, as we've effectively reached a non-existing
scene (such as in bug #6780), or we haven't parsed script files of a
scene fully, thus unexpected behavior will likely occur
---
 engines/zvision/scripting/scr_file_handling.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index b9cafa77ed..b047c14430 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -47,15 +47,13 @@ namespace ZVision {
 void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) {
 	Common::File file;
 	if (!_engine->getSearchManager()->openFile(file, fileName)) {
-		warning("Script file not found: %s", fileName.c_str());
-		return;
+		error("Script file not found: %s", fileName.c_str());
 	}
 
 	while (!file.eos()) {
 		Common::String line = file.readLine();
 		if (file.err()) {
-			warning("Error parsing scr file: %s", fileName.c_str());
-			return;
+			error("Error parsing scr file: %s", fileName.c_str());
 		}
 
 		trimCommentsAndWhiteSpace(&line);
-- 
cgit v1.2.3


From d67727a7a452354587fb49e58ac3a61cd4ac1fec Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 23 Jan 2015 11:13:06 +0600
Subject: ZVISION: Fix sound bug #6767 by making pan_track code similar to
 original

---
 engines/zvision/scripting/effects/music_effect.cpp | 129 +++++++++++++--------
 engines/zvision/scripting/effects/music_effect.h   |  26 +++--
 2 files changed, 94 insertions(+), 61 deletions(-)

diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
index 102f330305..3d3fc88751 100644
--- a/engines/zvision/scripting/effects/music_effect.cpp
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -40,12 +40,11 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	: MusicNodeBASE(engine, key, SCRIPTING_EFFECT_AUDIO) {
 	_loop = loop;
 	_volume = volume;
+	_deltaVolume = 0;
+	_balance = 0;
 	_crossfade = false;
 	_crossfadeTarget = 0;
 	_crossfadeTime = 0;
-	_attenuate = 0;
-	_pantrack = false;
-	_pantrackPosition = 0;
 	_sub = NULL;
 	_stereo = false;
 	_loaded = false;
@@ -97,17 +96,14 @@ MusicNode::~MusicNode() {
 	debug(1, "MusicNode: %d destroyed\n", _key);
 }
 
-void MusicNode::setPanTrack(int16 pos) {
-	if (!_stereo) {
-		_pantrack = true;
-		_pantrackPosition = pos;
-		setVolume(_volume);
-	}
+void MusicNode::setDeltaVolume(uint8 volume) {
+	_deltaVolume = volume;
+	setVolume(_volume);
 }
 
-void MusicNode::unsetPanTrack() {
-	_pantrack = false;
-	setVolume(_volume);
+void MusicNode::setBalance(int8 balance) {
+	_balance = balance;
+	_engine->_mixer->setChannelBalance(_handle, _balance);
 }
 
 void MusicNode::setFade(int32 time, uint8 target) {
@@ -134,7 +130,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 			}
 		}
 
-		if (_pantrack || _volume != _newvol)
+		if (_volume != _newvol)
 			setVolume(_newvol);
 
 		if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1)
@@ -146,55 +142,86 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 void MusicNode::setVolume(uint8 newVolume) {
 	if (!_loaded)
 		return;
-	if (_pantrack) {
-		int curX = _engine->getScriptManager()->getStateValue(StateKey_ViewPos);
-		curX -= _pantrackPosition;
-		int32 _width = _engine->getRenderManager()->getBkgSize().x;
-		if (curX < (-_width) / 2)
-			curX += _width;
-		else if (curX >= _width / 2)
-			curX -= _width;
-
-		float norm = (float)curX / ((float)_width / 2.0);
-		float lvl = fabs(norm);
-		if (lvl > 0.5)
-			lvl = (lvl - 0.5) * 1.7;
-		else
-			lvl = 1.0;
 
-		float bal = sin(-norm * 3.1415926) * 127.0;
+	_volume = newVolume;
 
-		if (_engine->_mixer->isSoundHandleActive(_handle)) {
-			_engine->_mixer->setChannelBalance(_handle, bal);
-			_engine->_mixer->setChannelVolume(_handle, newVolume * lvl);
-		}
-	} else {
-		if (_engine->_mixer->isSoundHandleActive(_handle)) {
-			_engine->_mixer->setChannelBalance(_handle, 0);
-			_engine->_mixer->setChannelVolume(_handle, newVolume);
-		}
-	}
+	if (_deltaVolume >= _volume)
+		_engine->_mixer->setChannelVolume(_handle, 0);
+	else
+		_engine->_mixer->setChannelVolume(_handle, _volume - _deltaVolume);
+}
 
-	_volume = newVolume;
+uint8 MusicNode::getVolume() {
+	return _volume;
 }
 
 PanTrackNode::PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos)
 	: ScriptingEffect(engine, key, SCRIPTING_EFFECT_PANTRACK) {
 	_slot = slot;
+	_position = pos;
 
-	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(slot);
-	if (fx && fx->getType() == SCRIPTING_EFFECT_AUDIO) {
-		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
-		mus->setPanTrack(pos);
-	}
+	// Try to set pan value for music node immediately
+	process(0);
 }
 
 PanTrackNode::~PanTrackNode() {
-	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_slot);
+}
+
+bool PanTrackNode::process(uint32 deltaTimeInMillis) {
+	ScriptManager * scriptManager = _engine->getScriptManager();
+	ScriptingEffect *fx = scriptManager->getSideFX(_slot);
 	if (fx && fx->getType() == SCRIPTING_EFFECT_AUDIO) {
 		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
-		mus->unsetPanTrack();
+
+		int curPos = scriptManager->getStateValue(StateKey_ViewPos);
+		int16 _width = _engine->getRenderManager()->getBkgSize().x;
+		int16 _halfWidth = _width / 2;
+		int16 _quarterWidth = _width / 4;
+
+		int tmp = 0;
+		if (curPos <= _position)
+			tmp = _position - curPos;
+		else
+			tmp = _position - curPos + _width;
+
+		int balance = 0;
+
+		if (tmp > _halfWidth)
+			tmp -= _width;
+
+		if (tmp > _quarterWidth) {
+			balance = 1;
+			tmp = _halfWidth - tmp;
+		} else if (tmp < -_quarterWidth) {
+			balance = -1;
+			tmp = -_halfWidth - tmp;
+		}
+
+		// Originally it's value -90...90 but we use -127...127 and therefore 360 replaced by 508
+		mus->setBalance( (508 * tmp) / _width );
+
+		tmp = (360 * tmp) / _width;
+
+		int deltaVol = balance;
+
+		// This value sets how fast volume goes off than sound source back of you
+		// By this value we can hack some "bugs" have place in originall game engine like beat sound in ZGI-dc10
+		int volumeCorrection = 2;
+
+		if (_engine->getGameId() == GID_GRANDINQUISITOR) {
+			Location loc = scriptManager->getCurrentLocation();
+			if (loc.world == 'd' && loc.room == 'c' && loc.node == '1' && loc.view == '0')
+				volumeCorrection = 5;
+		}
+
+		if (deltaVol != 0)
+			deltaVol = (mus->getVolume() * volumeCorrection) * (90 - tmp * balance) / 90;
+		if (deltaVol > 255)
+			deltaVol = 255;
+
+		mus->setDeltaVolume(deltaVol);
 	}
+	return false;
 }
 
 MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
@@ -225,10 +252,10 @@ MusicMidiNode::~MusicMidiNode() {
 		_engine->getScriptManager()->setStateValue(_key, 2);
 }
 
-void MusicMidiNode::setPanTrack(int16 pos) {
+void MusicMidiNode::setDeltaVolume(uint8 volume) {
 }
 
-void MusicMidiNode::unsetPanTrack() {
+void MusicMidiNode::setBalance(int8 balance) {
 }
 
 void MusicMidiNode::setFade(int32 time, uint8 target) {
@@ -245,4 +272,8 @@ void MusicMidiNode::setVolume(uint8 newVolume) {
 	_volume = newVolume;
 }
 
+uint8 MusicMidiNode::getVolume() {
+	return _volume;
+}
+
 } // End of namespace ZVision
diff --git a/engines/zvision/scripting/effects/music_effect.h b/engines/zvision/scripting/effects/music_effect.h
index 31d538f668..f6cb4a5a1c 100644
--- a/engines/zvision/scripting/effects/music_effect.h
+++ b/engines/zvision/scripting/effects/music_effect.h
@@ -48,9 +48,9 @@ public:
 	virtual bool process(uint32 deltaTimeInMillis) = 0;
 
 	virtual void setVolume(uint8 volume) = 0;
-
-	virtual void setPanTrack(int16 pos) = 0;
-	virtual void unsetPanTrack() = 0;
+	virtual uint8 getVolume() = 0;
+	virtual void setDeltaVolume(uint8 volume) = 0;
+	virtual void setBalance(int8 balance) = 0;
 
 	virtual void setFade(int32 time, uint8 target) = 0;
 };
@@ -70,17 +70,16 @@ public:
 	bool process(uint32 deltaTimeInMillis);
 
 	void setVolume(uint8 volume);
-
-	void setPanTrack(int16 pos);
-	void unsetPanTrack();
+	uint8 getVolume();
+	void setDeltaVolume(uint8 volume);
+	void setBalance(int8 balance);
 
 	void setFade(int32 time, uint8 target);
 
 private:
-	bool _pantrack;
-	int32 _pantrackPosition;
-	int32 _attenuate;
 	uint8 _volume;
+	uint8 _deltaVolume;
+	int8 _balance;
 	bool _loop;
 	bool _crossfade;
 	uint8 _crossfadeTarget;
@@ -107,9 +106,9 @@ public:
 	bool process(uint32 deltaTimeInMillis);
 
 	void setVolume(uint8 volume);
-
-	void setPanTrack(int16 pos);
-	void unsetPanTrack();
+	uint8 getVolume();
+	void setDeltaVolume(uint8 volume);
+	void setBalance(int8 balance);
 
 	void setFade(int32 time, uint8 target);
 
@@ -126,8 +125,11 @@ public:
 	PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos);
 	~PanTrackNode();
 
+	bool process(uint32 deltaTimeInMillis);
+
 private:
 	uint32 _slot;
+	int16 _position;
 };
 
 } // End of namespace ZVision
-- 
cgit v1.2.3


From ad2ab98474cecc8f8764697b3aa2acc16912368f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 23 Jan 2015 16:20:59 +0600
Subject: ZVISION: Use correct int type for volume

---
 engines/zvision/scripting/effects/music_effect.cpp | 2 +-
 engines/zvision/scripting/effects/music_effect.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
index 3d3fc88751..6c1a5f7376 100644
--- a/engines/zvision/scripting/effects/music_effect.cpp
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -36,7 +36,7 @@
 
 namespace ZVision {
 
-MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
+MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, uint8 volume)
 	: MusicNodeBASE(engine, key, SCRIPTING_EFFECT_AUDIO) {
 	_loop = loop;
 	_volume = volume;
diff --git a/engines/zvision/scripting/effects/music_effect.h b/engines/zvision/scripting/effects/music_effect.h
index f6cb4a5a1c..7657be8e09 100644
--- a/engines/zvision/scripting/effects/music_effect.h
+++ b/engines/zvision/scripting/effects/music_effect.h
@@ -57,7 +57,7 @@ public:
 
 class MusicNode : public MusicNodeBASE {
 public:
-	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, int8 volume);
+	MusicNode(ZVision *engine, uint32 key, Common::String &file, bool loop, uint8 volume);
 	~MusicNode();
 
 	/**
-- 
cgit v1.2.3


From 0bc61d3c2130981e06199b60fe553b2095af287a Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 23 Jan 2015 16:25:21 +0600
Subject: ZVISION: Volume is not linear value, use dB map to linear for
 -100...0dB

---
 engines/zvision/scripting/effects/music_effect.cpp | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
index 6c1a5f7376..ee2232d962 100644
--- a/engines/zvision/scripting/effects/music_effect.cpp
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -36,6 +36,24 @@
 
 namespace ZVision {
 
+static const uint8 dbMapLinear[256] =
+{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2,
+2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
+4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
+8, 8, 8, 9, 9, 9, 10, 10, 11, 11, 11, 12, 12, 13, 13, 14,
+14, 15, 15, 16, 16, 17, 18, 18, 19, 20, 21, 21, 22, 23, 24, 25,
+26, 27, 28, 29, 30, 31, 32, 33, 34, 36, 37, 38, 40, 41, 43, 45,
+46, 48, 50, 52, 53, 55, 57, 60, 62, 64, 67, 69, 72, 74, 77, 80,
+83, 86, 89, 92, 96, 99, 103, 107, 111, 115, 119, 123, 128, 133, 137, 143,
+148, 153, 159, 165, 171, 177, 184, 191, 198, 205, 212, 220, 228, 237, 245, 255};
+
 MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, uint8 volume)
 	: MusicNodeBASE(engine, key, SCRIPTING_EFFECT_AUDIO) {
 	_loop = loop;
@@ -65,9 +83,9 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 
 		if (_loop) {
 			Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
-			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, _volume);
+			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopingAudioStream, -1, dbMapLinear[_volume]);
 		} else {
-			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, _volume);
+			_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, audioStream, -1, dbMapLinear[_volume]);
 		}
 
 		if (_key != StateKey_NotSet)
@@ -148,7 +166,7 @@ void MusicNode::setVolume(uint8 newVolume) {
 	if (_deltaVolume >= _volume)
 		_engine->_mixer->setChannelVolume(_handle, 0);
 	else
-		_engine->_mixer->setChannelVolume(_handle, _volume - _deltaVolume);
+		_engine->_mixer->setChannelVolume(_handle, dbMapLinear[_volume - _deltaVolume]);
 }
 
 uint8 MusicNode::getVolume() {
-- 
cgit v1.2.3


From 9b498d576ed9b922ef61175310a6b369e4d30e3f Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 23 Jan 2015 16:26:17 +0600
Subject: ZVISION: Correct value for attenuate

---
 engines/zvision/scripting/actions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 758158817e..b12ecf66ee 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -104,7 +104,7 @@ bool ActionAttenuate::execute() {
 	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_key);
 	if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 		MusicNode *mus = (MusicNode *)fx;
-		mus->setVolume(255 - (abs(_attenuation) >> 7));
+		mus->setVolume(255 * (10000 - abs(_attenuation)) / 10000 );
 	}
 	return true;
 }
-- 
cgit v1.2.3


From 568c13b11531fcfb10b53bbc84d723e6fd1d0e40 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 23 Jan 2015 16:31:10 +0600
Subject: ZVISION: Use correct virtual class type instead of MusicNode

---
 engines/zvision/scripting/actions.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index b12ecf66ee..9a2f1d10ff 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -103,7 +103,7 @@ ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::S
 bool ActionAttenuate::execute() {
 	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_key);
 	if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
-		MusicNode *mus = (MusicNode *)fx;
+		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 		mus->setVolume(255 * (10000 - abs(_attenuation)) / 10000 );
 	}
 	return true;
@@ -154,7 +154,7 @@ bool ActionCrossfade::execute() {
 	if (_keyOne) {
 		ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyOne);
 		if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
-			MusicNode *mus = (MusicNode *)fx;
+			MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 			if (_oneStartVolume >= 0)
 				mus->setVolume((_oneStartVolume * 255) / 100);
 
@@ -165,7 +165,7 @@ bool ActionCrossfade::execute() {
 	if (_keyTwo) {
 		ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyTwo);
 		if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
-			MusicNode *mus = (MusicNode *)fx;
+			MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 			if (_twoStartVolume >= 0)
 				mus->setVolume((_twoStartVolume * 255) / 100);
 
-- 
cgit v1.2.3


From 3839d9ce0b0b746da62cd3380f91a48c9748b033 Mon Sep 17 00:00:00 2001
From: chrilith
Date: Fri, 23 Jan 2015 13:11:28 +0100
Subject: MORTEVIELLE: Fixed drawBox() to match original code

---
 engines/mortevielle/dialogs.cpp  | 2 +-
 engines/mortevielle/graphics.cpp | 2 ++
 engines/mortevielle/utils.cpp    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 89098fabe5..95388c7b6a 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -405,7 +405,7 @@ void DialogManager::drawF3F8() {
 	int f8Width = _vm->_screenSurface->getStringWidth(f8);
 
 	// Write out the bounding box
-	_vm->_screenSurface->drawBox(0, 42, MAX(f3Width, f8Width) + 6, 18, 7);
+	_vm->_screenSurface->drawBox(0, 42, MAX(f3Width, f8Width) + 4, 16, 7);
 }
 
 /**
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 553c1a759e..aa479fdd44 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -1019,6 +1019,8 @@ void ScreenSurface::writeCharacter(const Common::Point &pt, unsigned char ch, in
  *		simulate the original 640x400 surface, all Y values have to be doubled
  */
 void ScreenSurface::drawBox(int x, int y, int dx, int dy, int col) {
+	dx++; dy++;	// Original function draws 1px bigger
+
 	Graphics::Surface destSurface = lockArea(Common::Rect(x, y * 2, x + dx, (y + dy) * 2));
 
 	destSurface.hLine(0, 0, dx, col);
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 40136ad78b..8ae4951c50 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1653,11 +1653,11 @@ void MortevielleEngine::clearDescriptionBar() {
 	_mouse->hideMouse();
 	if (_largestClearScreen) {
 		_screenSurface->fillRect(0, Common::Rect(1, 176, 633, 199));
-		_screenSurface->drawBox(0, 176, 634, 23, 15);
+		_screenSurface->drawBox(0, 175, 634, 24, 15);
 		_largestClearScreen = false;
 	} else {
 		_screenSurface->fillRect(0, Common::Rect(1, 176, 633, 190));
-		_screenSurface->drawBox(0, 176, 634, 14, 15);
+		_screenSurface->drawBox(0, 175, 634, 15, 15);
 	}
 	_mouse->showMouse();
 }
-- 
cgit v1.2.3


From a7d5ac9963ceb209d99f3c00fe1b16694e6ab8e0 Mon Sep 17 00:00:00 2001
From: chrilith
Date: Fri, 23 Jan 2015 13:13:59 +0100
Subject: MORTEVIELLE: Fixed read index parsing alert strings

because Pascal code is base 1
---
 engines/mortevielle/dialogs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 95388c7b6a..9df66846d2 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -66,12 +66,12 @@ int DialogManager::show(const Common::String &msg) {
 		drawAlertBox(10, 5, colNumb);
 	} else {
 		drawAlertBox(8, 7, colNumb);
-		int i = 0;
+		int i = -1;
 		_vm->_screenSurface->_textPos.y = 70;
 		do {
 			curPos.x = 320;
 			Common::String displayStr = "";
-			while ((alertStr[i + 1] != '\174') && (alertStr[i + 1] != '\135')) {
+			while ((alertStr[i + 1] != '|') && (alertStr[i + 1] != ']')) {
 				++i;
 				displayStr += alertStr[i];
 				curPos.x -= 3;
-- 
cgit v1.2.3


From 6691f9d8122aa36a0640fa33f6c2a3c6a72a6dd8 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Sat, 24 Jan 2015 10:51:51 +0100
Subject: MORTEVIELLE: Added missing mesgId handling for 3rd intro screen

This message is displayed during disk access, so it is not visible as
is in ScummVM version, a delay is required. Also delay should hide the
mouse to prevent frozen screen.
---
 engines/mortevielle/mortevielle.h |  1 +
 engines/mortevielle/mouse.cpp     |  4 ++--
 engines/mortevielle/utils.cpp     | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 5f7f175c26..b6fee3f19f 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -92,6 +92,7 @@ enum DataType {
 #define MORT_DAT_REQUIRED_VERSION 1
 #define MORT_DAT "mort.dat"
 #define GAME_FRAME_DELAY (1000 / 50)
+#define DISK_ACCESS_DELAY 3000
 
 const int kTime1 = 410;
 const int kTime2 = 250;
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 8f96ba3ef5..7551da3934 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -51,7 +51,7 @@ void MouseHandler::initMouse() {
  * @remarks	Originally called 'hide_mouse'
  */
 void MouseHandler::hideMouse() {
-	// No implementation needed in ScummVM
+	g_system->showMouse(false);
 }
 
 /**
@@ -59,7 +59,7 @@ void MouseHandler::hideMouse() {
  * @remarks	Originally called 'show_mouse'
  */
 void MouseHandler::showMouse() {
-	// ScummVM implementation uses CursorMan for drawing the cursor
+	g_system->showMouse(true);
 }
 
 /**
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 40136ad78b..a89af1ab5c 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -234,6 +234,7 @@ void MortevielleEngine::setMousePos(const Common::Point &pt) {
 void MortevielleEngine::delay(int amount) {
 	uint32 endTime = g_system->getMillis() + amount;
 
+	_mouse->hideMouse();
 	while (g_system->getMillis() < endTime) {
 		if (g_system->getMillis() > (_lastGameFrame + GAME_FRAME_DELAY)) {
 			_lastGameFrame = g_system->getMillis();
@@ -244,6 +245,7 @@ void MortevielleEngine::delay(int amount) {
 
 		g_system->delayMillis(10);
 	}
+	_mouse->showMouse();
 }
 
 /**
@@ -2124,6 +2126,7 @@ void MortevielleEngine::showTitleScreen() {
 	_caff = 51;
 	_text->taffich();
 	testKeyboard();
+	delay(DISK_ACCESS_DELAY);
 	clearScreen();
 	draw(0, 0);
 
@@ -2521,6 +2524,18 @@ void MortevielleEngine::handleDescriptionText(int f, int mesgId) {
 				_coreVar._pctHintFound[10] = '*';
 			}
 			break;
+		case 7: {
+			prepareScreenType3();
+			Common::String tmpStr = getString(mesgId);
+			// CHECKME: original code seems to consider one extra character
+			// See text position in the 3rd intro screen
+			int size = tmpStr.size() + 1;
+			if (size < 40)
+				_text->displayStr(tmpStr, 252 - size * 3, 86, 50, 3, 5);
+			else
+				_text->displayStr(tmpStr, 144, 86, 50, 3, 5);
+			}
+			break;
 		default:
 			break;
 		}
-- 
cgit v1.2.3


From a4d822f98a3df3c64daafbc1cb5166ad6295d47a Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Sat, 24 Jan 2015 14:03:22 +0100
Subject: MORTEVIELLE: alternatively we can make it local to delay()

---
 engines/mortevielle/mouse.cpp | 4 ++--
 engines/mortevielle/utils.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 7551da3934..8f96ba3ef5 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -51,7 +51,7 @@ void MouseHandler::initMouse() {
  * @remarks	Originally called 'hide_mouse'
  */
 void MouseHandler::hideMouse() {
-	g_system->showMouse(false);
+	// No implementation needed in ScummVM
 }
 
 /**
@@ -59,7 +59,7 @@ void MouseHandler::hideMouse() {
  * @remarks	Originally called 'show_mouse'
  */
 void MouseHandler::showMouse() {
-	g_system->showMouse(true);
+	// ScummVM implementation uses CursorMan for drawing the cursor
 }
 
 /**
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index a89af1ab5c..50dcb4eb9b 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -234,7 +234,7 @@ void MortevielleEngine::setMousePos(const Common::Point &pt) {
 void MortevielleEngine::delay(int amount) {
 	uint32 endTime = g_system->getMillis() + amount;
 
-	_mouse->hideMouse();
+	g_system->showMouse(false);
 	while (g_system->getMillis() < endTime) {
 		if (g_system->getMillis() > (_lastGameFrame + GAME_FRAME_DELAY)) {
 			_lastGameFrame = g_system->getMillis();
@@ -245,7 +245,7 @@ void MortevielleEngine::delay(int amount) {
 
 		g_system->delayMillis(10);
 	}
-	_mouse->showMouse();
+	g_system->showMouse(true);
 }
 
 /**
-- 
cgit v1.2.3


From ca83ecd8c22c132da3f9b8963ffb76702692a272 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 24 Jan 2015 14:54:25 +0100
Subject: ZVISION: Fix lag at beginning of cutscenes

We have to update _curChunk when decoding audio, otherwise it will
decode the entire audio track on the first frame. For the ZGI intro
this would take 700-800 ms, and since the audio started playing
before the video it looked to me as if it had to play the first bit
faster to catch up.

Thanks to fuzzie for setting me on the right track with an off-hand
remark about the Zork AVI decoder (I was looking at the standard
AVI decoder), and for finding the cause a few seconds before I did.
---
 engines/zvision/video/zork_avi_decoder.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index 5618250d79..abf48543c9 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -39,6 +39,7 @@ Video::AVIDecoder::AVIAudioTrack *ZorkAVIDecoder::createAudioTrack(Video::AVIDec
 }
 
 void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *stream) {
+	bool updateCurChunk = true;
 	if (_audStream) {
 		if (_wvInfo.tag == kWaveFormatZorkPCM) {
 			assert(_wvInfo.size == 8);
@@ -54,9 +55,17 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 				_audStream->queueBuffer((byte *)chunk.data, chunk.size, DisposeAfterUse::YES, flags);
 			}
 		} else {
+			updateCurChunk = false;
 			AVIAudioTrack::queueSound(stream);
 		}
 	}
+
+	// The superclass always updates _curChunk, whether or not audio has
+	// been queued, so we should do that too. Unless the superclass already
+	// has done it for us.
+	if (updateCurChunk) {
+		_curChunk++;
+	}
 }
 
 void ZorkAVIDecoder::ZorkAVIAudioTrack::resetStream() {
-- 
cgit v1.2.3


From 4e1ffc9434f771d3f43e66104adeea9e0166123c Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 24 Jan 2015 14:56:48 +0100
Subject: ZVISION: Delete stream if there is no audio stream to queue to

This probably never happens, but is consistent with our common AVI
decoder.
---
 engines/zvision/video/zork_avi_decoder.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index abf48543c9..cf8505ec82 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -58,6 +58,8 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *s
 			updateCurChunk = false;
 			AVIAudioTrack::queueSound(stream);
 		}
+	} else {
+		delete stream;
 	}
 
 	// The superclass always updates _curChunk, whether or not audio has
-- 
cgit v1.2.3


From 3a2db0135d93b5f12fd42f04db3b6ad9d40834d3 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 24 Jan 2015 23:42:12 +0100
Subject: SDL: Refactor WM specific functionality into SdlGraphicsManager.

---
 backends/events/sdl/sdl-events.cpp                 | 15 ++++-----
 backends/events/sdl/sdl-events.h                   |  5 ---
 backends/events/symbiansdl/symbiansdl-events.cpp   |  4 ++-
 backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp |  2 +-
 .../linuxmotosdl/linuxmotosdl-graphics.cpp         |  2 +-
 backends/graphics/openglsdl/openglsdl-graphics.cpp |  4 +--
 backends/graphics/sdl/sdl-graphics.cpp             | 31 ++++++++++++++++++
 backends/graphics/sdl/sdl-graphics.h               | 38 ++++++++++++++++++++++
 .../graphics/surfacesdl/surfacesdl-graphics.cpp    |  8 ++---
 backends/platform/sdl/sdl.cpp                      |  5 ++-
 10 files changed, 88 insertions(+), 26 deletions(-)

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 284e0970fd..d6d0731202 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -173,7 +173,9 @@ void SdlEventSource::handleKbdMouse() {
 				_km.y_down_count = 1;
 			}
 
-			SDL_WarpMouse((Uint16)_km.x, (Uint16)_km.y);
+			if (_graphicsManager) {
+				_graphicsManager->warpMouseInWindow((Uint16)_km.x, (Uint16)_km.y);
+			}
 		}
 	}
 }
@@ -429,7 +431,9 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
 
 	// Ctrl-m toggles mouse capture
 	if (event.kbd.hasFlags(Common::KBD_CTRL) && ev.key.keysym.sym == 'm') {
-		toggleMouseGrab();
+		if (_graphicsManager) {
+			_graphicsManager->toggleMouseGrab();
+		}
 		return false;
 	}
 
@@ -752,13 +756,6 @@ bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	return false;
 }
 
-void SdlEventSource::toggleMouseGrab() {
-	if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF)
-		SDL_WM_GrabInput(SDL_GRAB_ON);
-	else
-		SDL_WM_GrabInput(SDL_GRAB_OFF);
-}
-
 void SdlEventSource::resetKeyboadEmulation(int16 x_max, int16 y_max) {
 	_km.x_max = x_max;
 	_km.y_max = y_max;
diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index a1b6d5ec3c..7001e41db1 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -49,11 +49,6 @@ public:
 	 */
 	virtual void resetKeyboadEmulation(int16 x_max, int16 y_max);
 
-	/**
-	 * Toggles mouse input grab
-	 */
-	virtual void toggleMouseGrab();
-
 protected:
 	/** @name Keyboard mouse emulation
 	 * Disabled by fingolfin 2004-12-18.
diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp
index 36018f1024..97361e3df0 100644
--- a/backends/events/symbiansdl/symbiansdl-events.cpp
+++ b/backends/events/symbiansdl/symbiansdl-events.cpp
@@ -133,7 +133,9 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 							_currentZone = 0;
 						event.type = Common::EVENT_MOUSEMOVE;
 						processMouseEvent(event, _mouseXZone[_currentZone], _mouseYZone[_currentZone]);
-						SDL_WarpMouse(event.mouse.x, event.mouse.y);
+						if (_graphicsManager) {
+							_graphicsManager->warpMouseInWindow(event.mouse.x, event.mouse.y);
+						}
 				}
 
 				return true;
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 343efa4da6..975e34a314 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -122,7 +122,7 @@ void DINGUXSdlGraphicsManager::initSize(uint w, uint h) {
 	if (w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		_eventSource->toggleMouseGrab();
+		toggleMouseGrab();
 	}
 
 	_transactionDetails.sizeChanged = true;
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index 22b271ae1a..f8ab9930d7 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -134,7 +134,7 @@ void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h) {
 	if	(w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		_eventSource->toggleMouseGrab();
+		toggleMouseGrab();
 	}
 
 	_transactionDetails.sizeChanged = true;
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index b028cd5b1a..fc2956755d 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -108,7 +108,7 @@ void OpenGLSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
 
 	case OSystem::kFeatureIconifyWindow:
 		if (enable) {
-			SDL_WM_IconifyWindow();
+			iconifyWindow();
 		}
 		break;
 
@@ -229,7 +229,7 @@ void OpenGLSdlGraphicsManager::notifyMousePos(Common::Point mouse) {
 }
 
 void OpenGLSdlGraphicsManager::setInternalMousePosition(int x, int y) {
-	SDL_WarpMouse(x, y);
+	warpMouseInWindow(x, y);
 }
 
 bool OpenGLSdlGraphicsManager::loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) {
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index b5e49fa397..d42c88f5d6 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -22,7 +22,9 @@
 
 #include "backends/graphics/sdl/sdl-graphics.h"
 
+#include "backends/platform/sdl/sdl-sys.h"
 #include "backends/events/sdl/sdl-events.h"
+#include "common/textconsole.h"
 
 SdlGraphicsManager::SdlGraphicsManager(SdlEventSource *source)
 	: _eventSource(source) {
@@ -38,3 +40,32 @@ void SdlGraphicsManager::activateManager() {
 void SdlGraphicsManager::deactivateManager() {
 	_eventSource->setGraphicsManager(0);
 }
+
+void SdlGraphicsManager::setWindowCaption(const Common::String &caption) {
+	SDL_WM_SetCaption(caption.c_str(), caption.c_str());
+}
+
+void SdlGraphicsManager::setWindowIcon(SDL_Surface *icon) {
+	SDL_WM_SetIcon(icon, NULL);
+	SDL_FreeSurface(icon);
+}
+
+void SdlGraphicsManager::toggleMouseGrab() {
+	if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF) {
+		SDL_WM_GrabInput(SDL_GRAB_ON);
+	} else {
+		SDL_WM_GrabInput(SDL_GRAB_OFF);
+	}
+}
+
+bool SdlGraphicsManager::hasMouseFocus() const {
+	return (SDL_GetAppState() & SDL_APPMOUSEFOCUS);
+}
+
+void SdlGraphicsManager::warpMouseInWindow(uint x, uint y) {
+	SDL_WarpMouse(x, y);
+}
+
+void SdlGraphicsManager::iconifyWindow() {
+	SDL_WM_IconifyWindow();
+}
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index 3ef540708a..216fc2d200 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -25,7 +25,9 @@
 
 #include "backends/graphics/graphics.h"
 
+#include "backends/platform/sdl/sdl-sys.h"
 #include "common/rect.h"
+#include "common/str.h"
 
 class SdlEventSource;
 
@@ -91,6 +93,42 @@ public:
 	 */
 	virtual void notifyMousePos(Common::Point mouse) = 0;
 
+	/**
+	 * Change the caption of the window.
+	 *
+	 * @param caption New window caption in UTF-8 encoding.
+	 */
+	void setWindowCaption(const Common::String &caption);
+
+	/**
+	 * Attach an icon to the window.
+	 *
+	 * @param icon The surface to use as icon. SdlGraphicsManager takes
+	 *             ownership over it.
+	 */
+	void setWindowIcon(SDL_Surface *icon);
+
+	/**
+	 * Toggle mouse grab state. This decides whether the cursor can leave the
+	 * window or not.
+	 */
+	void toggleMouseGrab();
+
+	/**
+	 * Check whether the application has mouse focus.
+	 */
+	bool hasMouseFocus() const;
+
+	/**
+	 * Warp the mouse to the specified position in window coordinates.
+	 */
+	void warpMouseInWindow(uint x, uint y);
+
+	/**
+	 * Iconifies the window.
+	 */
+	void iconifyWindow();
+
 protected:
 	SdlEventSource *_eventSource;
 };
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 7f3c99fcea..583c85e446 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -235,7 +235,7 @@ void SurfaceSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
 		break;
 	case OSystem::kFeatureIconifyWindow:
 		if (enable)
-			SDL_WM_IconifyWindow();
+			iconifyWindow();
 		break;
 	default:
 		break;
@@ -1710,7 +1710,7 @@ void SurfaceSdlGraphicsManager::warpMouse(int x, int y) {
 	int y1 = y;
 
 	// Don't change actual mouse position, when mouse is outside of our window (in case of windowed mode)
-	if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS)) {
+	if (!hasMouseFocus()) {
 		setMousePos(x, y); // but change game cursor position
 		return;
 	}
@@ -1720,9 +1720,9 @@ void SurfaceSdlGraphicsManager::warpMouse(int x, int y) {
 
 	if (_mouseCurState.x != x || _mouseCurState.y != y) {
 		if (!_overlayVisible)
-			SDL_WarpMouse(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
+			warpMouseInWindow(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
 		else
-			SDL_WarpMouse(x, y1);
+			warpMouseInWindow(x, y1);
 
 		// SDL_WarpMouse() generates a mouse movement event, so
 		// setMousePos() would be called eventually. However, the
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 4dc5929dab..6a2643b048 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -314,7 +314,7 @@ void OSystem_SDL::setWindowCaption(const char *caption) {
 		}
 	}
 
-	SDL_WM_SetCaption(cap.c_str(), cap.c_str());
+	dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->setWindowCaption(cap);
 }
 
 void OSystem_SDL::quit() {
@@ -477,8 +477,7 @@ void OSystem_SDL::setupIcon() {
 	if (!sdl_surf) {
 		warning("SDL_CreateRGBSurfaceFrom(icon) failed");
 	}
-	SDL_WM_SetIcon(sdl_surf, NULL);
-	SDL_FreeSurface(sdl_surf);
+	dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->setWindowIcon(sdl_surf);
 	free(icon);
 }
 
-- 
cgit v1.2.3


From d97889cea719dd5a5d129ceed7ecc809cd290f51 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 19:23:06 +0100
Subject: SDL: Cleanup graphics manager switching a bit.

---
 backends/graphics/sdl/sdl-graphics.cpp | 33 ++++++++++++++++++++++++++++
 backends/graphics/sdl/sdl-graphics.h   | 25 +++++++++++++++++++++
 backends/platform/sdl/sdl.cpp          | 40 +++++++++-------------------------
 3 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index d42c88f5d6..58253c9509 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -69,3 +69,36 @@ void SdlGraphicsManager::warpMouseInWindow(uint x, uint y) {
 void SdlGraphicsManager::iconifyWindow() {
 	SDL_WM_IconifyWindow();
 }
+
+SdlGraphicsManager::State SdlGraphicsManager::getState() {
+	State state;
+
+	state.screenWidth   = getWidth();
+	state.screenHeight  = getHeight();
+	state.aspectRatio   = getFeatureState(OSystem::kFeatureAspectRatioCorrection);
+	state.fullscreen    = getFeatureState(OSystem::kFeatureFullscreenMode);
+	state.cursorPalette = getFeatureState(OSystem::kFeatureCursorPalette);
+#ifdef USE_RGB_COLOR
+	state.pixelFormat   = getScreenFormat();
+#endif
+
+	return state;
+}
+
+bool SdlGraphicsManager::setState(const State &state) {
+	beginGFXTransaction();
+#ifdef USE_RGB_COLOR
+		initSize(state.screenWidth, state.screenHeight, &state.pixelFormat);
+#else
+		initSize(state.screenWidth, state.screenHeight, 0);
+#endif
+		setFeatureState(OSystem::kFeatureAspectRatioCorrection, state.aspectRatio);
+		setFeatureState(OSystem::kFeatureFullscreenMode, state.fullscreen);
+		setFeatureState(OSystem::kFeatureCursorPalette, state.cursorPalette);
+
+	if (endGFXTransaction() != OSystem::kTransactionSuccess) {
+		return false;
+	} else {
+		return true;
+	}
+}
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index 216fc2d200..3a53a4e40e 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -129,6 +129,31 @@ public:
 	 */
 	void iconifyWindow();
 
+	/**
+	 * A (subset) of the graphic manager's state. This is used when switching
+	 * between different SDL graphic managers on runtime.
+	 */
+	struct State {
+		int screenWidth, screenHeight;
+		bool aspectRatio;
+		bool fullscreen;
+		bool cursorPalette;
+
+#ifdef USE_RGB_COLOR
+		Graphics::PixelFormat pixelFormat;
+#endif
+	};
+
+	/**
+	 * Queries the current state of the graphic manager.
+	 */
+	State getState();
+
+	/**
+	 * Setup a basic state of the graphic manager.
+	 */
+	bool setState(const State &state);
+
 protected:
 	SdlEventSource *_eventSource;
 };
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 6a2643b048..d3a6e5e658 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -571,14 +571,8 @@ bool OSystem_SDL::setGraphicsMode(int mode) {
 	//
 	// This is a probably temporary workaround to fix bugs like #3368143
 	// "SDL/OpenGL: Crash when switching renderer backend".
-	const int screenWidth = _graphicsManager->getWidth();
-	const int screenHeight = _graphicsManager->getHeight();
-	const bool arState = _graphicsManager->getFeatureState(kFeatureAspectRatioCorrection);
-	const bool fullscreen = _graphicsManager->getFeatureState(kFeatureFullscreenMode);
-	const bool cursorPalette = _graphicsManager->getFeatureState(kFeatureCursorPalette);
-#ifdef USE_RGB_COLOR
-	const Graphics::PixelFormat pixelFormat = _graphicsManager->getScreenFormat();
-#endif
+	SdlGraphicsManager *sdlGraphicsManager = dynamic_cast<SdlGraphicsManager *>(_graphicsManager);
+	SdlGraphicsManager::State state = sdlGraphicsManager->getState();
 
 	bool switchedManager = false;
 
@@ -586,16 +580,16 @@ bool OSystem_SDL::setGraphicsMode(int mode) {
 	// manager, delete and create the new mode graphics manager
 	if (_graphicsMode >= _firstGLMode && mode < _firstGLMode) {
 		debug(1, "switching to plain SDL graphics");
-		dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->deactivateManager();
+		sdlGraphicsManager->deactivateManager();
 		delete _graphicsManager;
-		_graphicsManager = new SurfaceSdlGraphicsManager(_eventSource);
+		_graphicsManager = sdlGraphicsManager = new SurfaceSdlGraphicsManager(_eventSource);
 
 		switchedManager = true;
 	} else if (_graphicsMode < _firstGLMode && mode >= _firstGLMode) {
 		debug(1, "switching to OpenGL graphics");
-		dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->deactivateManager();
+		sdlGraphicsManager->deactivateManager();
 		delete _graphicsManager;
-		_graphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource);
+		_graphicsManager = sdlGraphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource);
 
 		switchedManager = true;
 	}
@@ -603,24 +597,10 @@ bool OSystem_SDL::setGraphicsMode(int mode) {
 	_graphicsMode = mode;
 
 	if (switchedManager) {
-		dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->activateManager();
-
-		_graphicsManager->beginGFXTransaction();
-#ifdef USE_RGB_COLOR
-		_graphicsManager->initSize(screenWidth, screenHeight, &pixelFormat);
-#else
-		_graphicsManager->initSize(screenWidth, screenHeight, 0);
-#endif
-		_graphicsManager->setFeatureState(kFeatureAspectRatioCorrection, arState);
-		_graphicsManager->setFeatureState(kFeatureFullscreenMode, fullscreen);
-		_graphicsManager->setFeatureState(kFeatureCursorPalette, cursorPalette);
-
-		// Worst part about this right now, tell the cursor manager to
-		// resetup the cursor + cursor palette if necessarily
+		sdlGraphicsManager->activateManager();
 
-		// First we need to try to setup the old state on the new manager...
-		if (_graphicsManager->endGFXTransaction() != kTransactionSuccess) {
-			// Oh my god if this failed the client code might just explode.
+		// This failing will probably have bad consequences...
+		if (!sdlGraphicsManager->setState(state)) {
 			return false;
 		}
 
@@ -629,7 +609,7 @@ bool OSystem_SDL::setGraphicsMode(int mode) {
 		CursorMan.popCursor();
 
 		// Next setup cursor palette if needed
-		if (cursorPalette) {
+		if (_graphicsManager->getFeatureState(kFeatureCursorPalette)) {
 			CursorMan.pushCursorPalette(0, 0, 0);
 			CursorMan.popCursorPalette();
 		}
-- 
cgit v1.2.3


From defe71792dfc0ab4bcb14a64a9fc8eab9a638e69 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 18:41:57 +0100
Subject: CONFIGURE: Allow to overwrite sdl-config to use with SDL_CONFIG.

---
 Makefile  | 1 +
 configure | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 93a84a5c7b..36b4592b20 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,7 @@ ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
 	LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \
 			CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \
 			ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \
+			SDL_CONFIG="$(SAVED_SDL_CONFIG)" \
 			$(srcdir)/configure $(SAVED_CONFIGFLAGS)
 else
 	$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
diff --git a/configure b/configure
index 61e82f158f..17fbe15af2 100755
--- a/configure
+++ b/configure
@@ -35,6 +35,7 @@ SAVED_CXXFLAGS=$CXXFLAGS
 SAVED_CPPFLAGS=$CPPFLAGS
 SAVED_ASFLAGS=$ASFLAGS
 SAVED_WINDRESFLAGS=$WINDRESFLAGS
+SAVED_SDL_CONFIG=$SDL_CONFIG
 
 # Use environment vars if set
 CXXFLAGS="$CXXFLAGS $CPPFLAGS"
@@ -170,7 +171,7 @@ _stagingpath="staging"
 _win32path="c:/scummvm"
 _amigaospath="Games:ScummVM"
 _staticlibpath=
-_sdlconfig=sdl-config
+_sdlconfig="$SDL_CONFIG"
 _freetypeconfig=freetype-config
 _sdlpath="$PATH"
 _freetypepath="$PATH"
@@ -4581,6 +4582,7 @@ SAVED_CXXFLAGS     := $SAVED_CXXFLAGS
 SAVED_CPPFLAGS     := $SAVED_CPPFLAGS
 SAVED_ASFLAGS      := $SAVED_ASFLAGS
 SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
+SAVED_SDL_CONFIG   := $SAVED_SDL_CONFIG
 EOF
 
 #
-- 
cgit v1.2.3


From 8530997fff7b5b9d558f7dd6a0d07c236e4de16f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 01:34:57 +0100
Subject: SDL: Add experimental support for SDL2.

This is based upon skristiansson's change set to make ScummVM work with SDL2.
---
 backends/events/sdl/sdl-events.cpp                 | 143 +++++++++++++++++----
 backends/events/sdl/sdl-events.h                   |  13 +-
 backends/graphics/openglsdl/openglsdl-graphics.cpp | 134 ++++++++++++++++---
 backends/graphics/openglsdl/openglsdl-graphics.h   |   6 +
 backends/graphics/sdl/sdl-graphics.cpp             | 131 ++++++++++++++++++-
 backends/graphics/sdl/sdl-graphics.h               |  20 +++
 .../graphics/surfacesdl/surfacesdl-graphics.cpp    |  94 +++++++++++++-
 backends/graphics/surfacesdl/surfacesdl-graphics.h |  11 ++
 backends/mixer/sdl/sdl-mixer.cpp                   |   2 +
 backends/module.mk                                 |   2 +
 backends/platform/sdl/sdl-sys.h                    |  45 +++++++
 backends/platform/sdl/sdl.cpp                      |  47 +++++++
 configure                                          |   3 +
 13 files changed, 604 insertions(+), 47 deletions(-)

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index d6d0731202..21b0fbad32 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -63,8 +63,14 @@ SdlEventSource::SdlEventSource()
 
 		// Enable joystick
 		if (SDL_NumJoysticks() > joystick_num) {
-			debug("Using joystick: %s", SDL_JoystickName(joystick_num));
 			_joystick = SDL_JoystickOpen(joystick_num);
+			debug("Using joystick: %s",
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+			      SDL_JoystickName(_joystick)
+#else
+			      SDL_JoystickName(joystick_num)
+#endif
+			     );
 		} else {
 			warning("Invalid joystick: %d", joystick_num);
 		}
@@ -76,21 +82,24 @@ SdlEventSource::~SdlEventSource() {
 		SDL_JoystickClose(_joystick);
 }
 
-int SdlEventSource::mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
-	if (key >= SDLK_F1 && key <= SDLK_F9) {
+int SdlEventSource::mapKey(SDLKey sdlKey, SDLMod mod, Uint16 unicode) {
+	Common::KeyCode key = SDLToOSystemKeycode(sdlKey);
+
+	if (key >= Common::KEYCODE_F1 && key <= Common::KEYCODE_F9) {
 		return key - SDLK_F1 + Common::ASCII_F1;
-	} else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
-		return key - SDLK_KP0 + '0';
-	} else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
+	} else if (key >= Common::KEYCODE_KP0 && key <= Common::KEYCODE_KP9) {
+		return key - Common::KEYCODE_KP0 + '0';
+	} else if (key >= Common::KEYCODE_UP && key <= Common::KEYCODE_PAGEDOWN) {
 		return key;
 	} else if (unicode) {
 		return unicode;
 	} else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) {
 		return key & ~0x20;
-	} else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
+	} else if (key >= Common::KEYCODE_NUMLOCK && key <= Common::KEYCODE_EURO) {
 		return 0;
+	} else {
+		return key;
 	}
-	return key;
 }
 
 void SdlEventSource::processMouseEvent(Common::Event &event, int x, int y) {
@@ -342,7 +351,9 @@ Common::KeyCode SdlEventSource::SDLToOSystemKeycode(const SDLKey key) {
 	case SDLK_HELP: return Common::KEYCODE_HELP;
 	case SDLK_PRINT: return Common::KEYCODE_PRINT;
 	case SDLK_SYSREQ: return Common::KEYCODE_SYSREQ;
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
 	case SDLK_BREAK: return Common::KEYCODE_BREAK;
+#endif
 	case SDLK_MENU: return Common::KEYCODE_MENU;
 	case SDLK_POWER: return Common::KEYCODE_POWER;
 	case SDLK_UNDO: return Common::KEYCODE_UNDO;
@@ -389,24 +400,52 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) {
 	case SDL_JOYAXISMOTION:
 		return handleJoyAxisMotion(ev, event);
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	case SDL_MOUSEWHEEL: {
+		Sint32 yDir = ev.wheel.y;
+#if SDL_VERSION_ATLEAST(2, 0, 4)
+		if (ev.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
+			yDir *= -1;
+		}
+#endif
+		// HACK: It seems we want the mouse coordinates supplied
+		// with a mouse wheel event. However, SDL2 does not supply
+		// these, thus we use whatever we got last time. It seems
+		// these are always stored in _km.x, _km.y.
+		processMouseEvent(event, _km.x, _km.y);
+		if (yDir < 0) {
+			event.type = Common::EVENT_WHEELDOWN;
+			return true;
+		} else if (yDir > 0) {
+			event.type = Common::EVENT_WHEELUP;
+			return true;
+		} else {
+			return false;
+		}
+		}
+
+	case SDL_WINDOWEVENT:
+		switch (ev.window.event) {
+		case SDL_WINDOWEVENT_EXPOSED:
+			if (_graphicsManager)
+				_graphicsManager->notifyVideoExpose();
+			return false;
+
+		case SDL_WINDOWEVENT_RESIZED:
+			return handleResizeEvent(event, ev.window.data1, ev.window.data2);
+
+		default:
+			return false;
+		}
+#else
 	case SDL_VIDEOEXPOSE:
 		if (_graphicsManager)
 			_graphicsManager->notifyVideoExpose();
 		return false;
 
 	case SDL_VIDEORESIZE:
-		if (_graphicsManager) {
-			_graphicsManager->notifyResize(ev.resize.w, ev.resize.h);
-
-			// If the screen changed, send an Common::EVENT_SCREEN_CHANGED
-			int screenID = ((OSystem_SDL *)g_system)->getGraphicsManager()->getScreenChangeID();
-			if (screenID != _lastScreenID) {
-				_lastScreenID = screenID;
-				event.type = Common::EVENT_SCREEN_CHANGED;
-				return true;
-			}
-		}
-		return false;
+		return handleResizeEvent(event, ev.resize.w, ev.resize.h);
+#endif
 
 	case SDL_QUIT:
 		event.type = Common::EVENT_QUIT;
@@ -476,7 +515,7 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
 
 	event.type = Common::EVENT_KEYDOWN;
 	event.kbd.keycode = SDLToOSystemKeycode(ev.key.keysym.sym);
-	event.kbd.ascii = mapKey(ev.key.keysym.sym, (SDLMod)ev.key.keysym.mod, (Uint16)ev.key.keysym.unicode);
+	event.kbd.ascii = mapKey(ev.key.keysym.sym, (SDLMod)ev.key.keysym.mod, obtainUnicode(ev.key.keysym));
 
 	return true;
 }
@@ -520,7 +559,7 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
 
 	event.type = Common::EVENT_KEYUP;
 	event.kbd.keycode = SDLToOSystemKeycode(ev.key.keysym.sym);
-	event.kbd.ascii = mapKey(ev.key.keysym.sym, (SDLMod)ev.key.keysym.mod, (Uint16)ev.key.keysym.unicode);
+	event.kbd.ascii = mapKey(ev.key.keysym.sym, (SDLMod)ev.key.keysym.mod, 0);
 
 	// Ctrl-Alt-<key> will change the GFX mode
 	SDLModToOSystemKeyFlags(mod, event);
@@ -763,4 +802,64 @@ void SdlEventSource::resetKeyboadEmulation(int16 x_max, int16 y_max) {
 	_km.last_time = 0;
 }
 
+bool SdlEventSource::handleResizeEvent(Common::Event &event, int w, int h) {
+	if (_graphicsManager) {
+		_graphicsManager->notifyResize(w, h);
+
+		// If the screen changed, send an Common::EVENT_SCREEN_CHANGED
+		int screenID = ((OSystem_SDL *)g_system)->getGraphicsManager()->getScreenChangeID();
+		if (screenID != _lastScreenID) {
+			_lastScreenID = screenID;
+			event.type = Common::EVENT_SCREEN_CHANGED;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+static uint32 convUTF8ToUTF32(const char *src) {
+	uint32 utf32 = 0;
+
+	char *dst = SDL_iconv_string(
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+	                             "UTF-32BE",
+#else
+	                             "UTF-32LE",
+#endif
+                                 "UTF-8", src, SDL_strlen(src) + 1);
+
+	if (dst) {
+		utf32 = *((uint32 *)dst);
+		SDL_free(dst);
+	}
+
+	return utf32;
+}
+#endif
+
+uint32 SdlEventSource::obtainUnicode(const SDL_keysym keySym) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_Event events[2];
+
+	// In SDL2, the unicode field has been removed from the keysym struct.
+	// Instead a SDL_TEXTINPUT event is generated on key combinations that
+	// generates unicode.
+	// Here we peek into the event queue for the event to see if it exists.
+	int n = SDL_PeepEvents(events, 2, SDL_PEEKEVENT, SDL_KEYDOWN, SDL_TEXTINPUT);
+	// Make sure that the TEXTINPUT event belongs to this KEYDOWN
+	// event and not another pending one.
+	if (n > 0 && events[0].type == SDL_TEXTINPUT) {
+		return convUTF8ToUTF32(events[0].text.text);
+	} else if (n > 1 && events[0].type != SDL_KEYDOWN && events[1].type == SDL_TEXTINPUT) {
+		return convUTF8ToUTF32(events[1].text.text);
+	} else {
+		return 0;
+	}
+#else
+	return keySym.unicode;
+#endif
+}
+
 #endif
diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index 7001e41db1..7fc52a01cb 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -125,7 +125,7 @@ protected:
 	/**
 	 * Maps the ASCII value of key
 	 */
-	virtual int mapKey(SDLKey key, SDLMod mod, Uint16 unicode);
+	int mapKey(SDLKey key, SDLMod mod, Uint16 unicode);
 
 	/**
 	 * Configures the key modifiers flags status
@@ -136,6 +136,17 @@ protected:
 	 * Translates SDL key codes to OSystem key codes
 	 */
 	Common::KeyCode SDLToOSystemKeycode(const SDLKey key);
+
+	/**
+	 * Notify graphics manager of a resize request.
+	 */
+	bool handleResizeEvent(Common::Event &event, int w, int h);
+
+	/**
+	 * Extracts unicode information for the specific key sym.
+	 * May only be used for key down events.
+	 */
+	uint32 obtainUnicode(const SDL_keysym keySym);
 };
 
 #endif
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index fc2956755d..2710b66ecd 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -29,7 +29,12 @@
 #endif
 
 OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource)
-    : SdlGraphicsManager(eventSource), _lastVideoModeLoad(0), _hwScreen(nullptr), _lastRequestedWidth(0), _lastRequestedHeight(0),
+    : SdlGraphicsManager(eventSource), _lastRequestedHeight(0),
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+      _glContext(),
+#else
+      _lastVideoModeLoad(0), _hwScreen(nullptr),
+#endif
       _graphicsScale(2), _ignoreLoadVideoMode(false), _gotResize(false), _wantsFullScreen(false), _ignoreResizeEvents(0),
       _desiredFullscreenWidth(0), _desiredFullscreenHeight(0) {
 	// Setup OpenGL attributes for SDL
@@ -40,6 +45,17 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint deskt
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
 	// Retrieve a list of working fullscreen modes
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	const int numModes = SDL_GetNumDisplayModes(0);
+	for (int i = 0; i < numModes; ++i) {
+		SDL_DisplayMode mode;
+		if (SDL_GetDisplayMode(0, i, &mode)) {
+			continue;
+		}
+
+		_fullscreenVideoModes.push_back(VideoMode(mode.w, mode.h));
+	}
+#else
 	const SDL_Rect *const *availableModes = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);
 	if (availableModes != (void *)-1) {
 		for (;*availableModes; ++availableModes) {
@@ -47,9 +63,19 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint deskt
 
 			_fullscreenVideoModes.push_back(VideoMode(mode->w, mode->h));
 		}
+	}
+#endif
+
+	// Sort the modes in ascending order.
+	Common::sort(_fullscreenVideoModes.begin(), _fullscreenVideoModes.end());
 
-		// Sort the modes in ascending order.
-		Common::sort(_fullscreenVideoModes.begin(), _fullscreenVideoModes.end());
+	// Strip duplicates in video modes.
+	for (uint i = 0; i + 1 < _fullscreenVideoModes.size();) {
+		if (_fullscreenVideoModes[i] == _fullscreenVideoModes[i + 1]) {
+			_fullscreenVideoModes.remove_at(i);
+		} else {
+			++i;
+		}
 	}
 
 	// In case SDL is fine with every mode we will force the desktop mode.
@@ -120,11 +146,19 @@ void OpenGLSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
 bool OpenGLSdlGraphicsManager::getFeatureState(OSystem::Feature f) {
 	switch (f) {
 	case OSystem::kFeatureFullscreenMode:
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		if (_window) {
+			return (SDL_GetWindowFlags(_window) & SDL_WINDOW_FULLSCREEN) != 0;
+		} else {
+			return _wantsFullScreen;
+		}
+#else
 		if (_hwScreen) {
 			return (_hwScreen->flags & SDL_FULLSCREEN) != 0;
 		} else {
 			return _wantsFullScreen;
 		}
+#endif
 
 	default:
 		return OpenGLGraphicsManager::getFeatureState(f);
@@ -201,13 +235,20 @@ void OpenGLSdlGraphicsManager::updateScreen() {
 	OpenGLGraphicsManager::updateScreen();
 
 	// Swap OpenGL buffers
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_GL_SwapWindow(_window);
+#else
 	SDL_GL_SwapBuffers();
+#endif
 }
 
 void OpenGLSdlGraphicsManager::notifyVideoExpose() {
 }
 
 void OpenGLSdlGraphicsManager::notifyResize(const uint width, const uint height) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	setActualScreenSize(width, height);
+#else
 	if (!_ignoreResizeEvents && _hwScreen && !(_hwScreen->flags & SDL_FULLSCREEN)) {
 		// We save that we handled a resize event here. We need to know this
 		// so we do not overwrite the users requested window size whenever we
@@ -218,6 +259,7 @@ void OpenGLSdlGraphicsManager::notifyResize(const uint width, const uint height)
 			g_system->quit();
 		}
 	}
+#endif
 }
 
 void OpenGLSdlGraphicsManager::transformMouseCoordinates(Common::Point &point) {
@@ -300,6 +342,58 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		height = _desiredFullscreenHeight;
 	}
 
+	// This is pretty confusing since RGBA8888 talks about the memory
+	// layout here. This is a different logical layout depending on
+	// whether we run on little endian or big endian. However, we can
+	// only safely assume that RGBA8888 in memory layout is supported.
+	// Thus, we chose this one.
+	const Graphics::PixelFormat rgba8888 =
+#ifdef SCUMM_LITTLE_ENDIAN
+	                                       Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24);
+#else
+	                                       Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0);
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_glContext) {
+		notifyContextDestroy();
+
+		SDL_GL_DeleteContext(_glContext);
+		_glContext = nullptr;
+	}
+
+	destroyWindow();
+
+	uint32 flags = SDL_WINDOW_OPENGL;
+	if (_wantsFullScreen) {
+		flags |= SDL_WINDOW_FULLSCREEN;
+	} else {
+		flags |= SDL_WINDOW_RESIZABLE;
+	}
+
+	if (!createWindow(width, height, flags)) {
+		// We treat fullscreen requests as a "hint" for now. This means in
+		// case it is not available we simply ignore it.
+		if (_wantsFullScreen) {
+			createWindow(width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
+		}
+
+		if (!_window) {
+			return false;
+		}
+	}
+
+	_glContext = SDL_GL_CreateContext(_window);
+	if (!_glContext) {
+		return false;
+	}
+
+	notifyContextCreate(rgba8888, rgba8888);
+	int actualWidth, actualHeight;
+	SDL_GetWindowSize(_window, &actualWidth, &actualHeight);
+	setActualScreenSize(actualWidth, actualHeight);
+	return true;
+#else
 	// WORKAROUND: Working around infamous SDL bugs when switching
 	// resolutions too fast. This might cause the event system to supply
 	// incorrect mouse position events otherwise.
@@ -341,17 +435,6 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 	_lastVideoModeLoad = SDL_GetTicks();
 
 	if (_hwScreen) {
-		// This is pretty confusing since RGBA8888 talks about the memory
-		// layout here. This is a different logical layout depending on
-		// whether we run on little endian or big endian. However, we can
-		// only safely assume that RGBA8888 in memory layout is supported.
-		// Thus, we chose this one.
-		const Graphics::PixelFormat rgba8888 =
-#ifdef SCUMM_LITTLE_ENDIAN
-		                                       Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24);
-#else
-		                                       Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0);
-#endif
 		notifyContextCreate(rgba8888, rgba8888);
 		setActualScreenSize(_hwScreen->w, _hwScreen->h);
 	}
@@ -363,6 +446,21 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		_ignoreResizeEvents = 10;
 
 	return _hwScreen != nullptr;
+#endif
+}
+
+void OpenGLSdlGraphicsManager::getWindowDimensions(int *width, int *height) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_GetWindowSize(_window, width, height);
+#else
+	if (width) {
+		*width = _hwScreen->w;
+	}
+
+	if (height) {
+		*height = _hwScreen->h;
+	}
+#endif
 }
 
 bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
@@ -456,7 +554,9 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 					// Calculate the next scaling setting. We approximate the
 					// current scale setting in case the user resized the
 					// window. Then we apply the direction change.
-					_graphicsScale = MAX<int>(_hwScreen->w / _lastRequestedWidth, _hwScreen->h / _lastRequestedHeight);
+					int windowWidth = 0, windowHeight = 0;
+					getWindowDimensions(&windowWidth, &windowHeight);
+					_graphicsScale = MAX<int>(windowWidth / _lastRequestedWidth, windowHeight / _lastRequestedHeight);
 					_graphicsScale = MAX<int>(_graphicsScale + direction, 1);
 
 					// Since we overwrite a user resize here we reset its
@@ -472,7 +572,9 @@ bool OpenGLSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 				}
 
 #ifdef USE_OSD
-				const Common::String osdMsg = Common::String::format("Resolution: %dx%d", _hwScreen->w, _hwScreen->h);
+				int windowWidth = 0, windowHeight = 0;
+				getWindowDimensions(&windowWidth, &windowHeight);
+				const Common::String osdMsg = Common::String::format("Resolution: %dx%d", windowWidth, windowHeight);
 				displayMessageOnOSD(osdMsg.c_str());
 #endif
 
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index 9934ca79e2..1e927df766 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -68,8 +68,14 @@ protected:
 private:
 	bool setupMode(uint width, uint height);
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_GLContext _glContext;
+#else
 	uint32 _lastVideoModeLoad;
 	SDL_Surface *_hwScreen;
+#endif
+
+	void getWindowDimensions(int *width, int *height);
 
 	uint _lastRequestedWidth;
 	uint _lastRequestedHeight;
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index 58253c9509..f6d56ece01 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -27,10 +27,18 @@
 #include "common/textconsole.h"
 
 SdlGraphicsManager::SdlGraphicsManager(SdlEventSource *source)
-	: _eventSource(source) {
+	: _eventSource(source)
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	  , _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
+#endif
+	{
 }
 
 SdlGraphicsManager::~SdlGraphicsManager() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_FreeSurface(_windowIcon);
+	destroyWindow();
+#endif
 }
 
 void SdlGraphicsManager::activateManager() {
@@ -42,33 +50,111 @@ void SdlGraphicsManager::deactivateManager() {
 }
 
 void SdlGraphicsManager::setWindowCaption(const Common::String &caption) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	_windowCaption = caption;
+	if (_window) {
+		SDL_SetWindowTitle(_window, caption.c_str());
+	}
+#else
 	SDL_WM_SetCaption(caption.c_str(), caption.c_str());
+#endif
 }
 
 void SdlGraphicsManager::setWindowIcon(SDL_Surface *icon) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_FreeSurface(_windowIcon);
+	_windowIcon = icon;
+	if (_window) {
+		SDL_SetWindowIcon(_window, icon);
+	}
+#else
 	SDL_WM_SetIcon(icon, NULL);
 	SDL_FreeSurface(icon);
+#endif
 }
 
 void SdlGraphicsManager::toggleMouseGrab() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		_inputGrabState = !(SDL_GetWindowGrab(_window) == SDL_TRUE);
+		SDL_SetWindowGrab(_window, _inputGrabState ? SDL_TRUE : SDL_FALSE);
+	}
+#else
 	if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF) {
 		SDL_WM_GrabInput(SDL_GRAB_ON);
 	} else {
 		SDL_WM_GrabInput(SDL_GRAB_OFF);
 	}
+#endif
 }
 
 bool SdlGraphicsManager::hasMouseFocus() const {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		return (SDL_GetWindowFlags(_window) & SDL_WINDOW_MOUSE_FOCUS);
+	} else {
+		return false;
+	}
+#else
 	return (SDL_GetAppState() & SDL_APPMOUSEFOCUS);
+#endif
 }
 
 void SdlGraphicsManager::warpMouseInWindow(uint x, uint y) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		SDL_WarpMouseInWindow(_window, x, y);
+	}
+#else
 	SDL_WarpMouse(x, y);
+#endif
 }
 
 void SdlGraphicsManager::iconifyWindow() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		SDL_MinimizeWindow(_window);
+	}
+#else
 	SDL_WM_IconifyWindow();
+#endif
+}
+
+SdlGraphicsManager::State::State()
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+    : windowIcon(nullptr)
+#endif
+    {
+}
+
+SdlGraphicsManager::State::~State() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_FreeSurface(windowIcon);
+#endif
+}
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+SDL_Surface *copySDLSurface(SDL_Surface *src) {
+	const bool locked = SDL_MUSTLOCK(src) == SDL_TRUE;
+
+	if (locked) {
+		if (SDL_LockSurface(src) != 0) {
+			return nullptr;
+		}
+	}
+
+	SDL_Surface *res = SDL_CreateRGBSurfaceFrom(src->pixels,
+	                       src->w, src->h, src->format->BitsPerPixel,
+	                       src->pitch, src->format->Rmask, src->format->Gmask,
+	                       src->format->Bmask, src->format->Amask);
+
+	if (locked) {
+		SDL_UnlockSurface(src);
+	}
+
+	return res;
 }
+#endif
 
 SdlGraphicsManager::State SdlGraphicsManager::getState() {
 	State state;
@@ -82,10 +168,29 @@ SdlGraphicsManager::State SdlGraphicsManager::getState() {
 	state.pixelFormat   = getScreenFormat();
 #endif
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	state.inputGrabState = _inputGrabState;
+	state.windowCaption  = _windowCaption;
+	state.windowIcon     = copySDLSurface(_windowIcon);
+#endif
+
 	return state;
 }
 
 bool SdlGraphicsManager::setState(const State &state) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	_inputGrabState = state.inputGrabState;
+	if (!_window) {
+		_windowCaption  = state.windowCaption;
+		SDL_FreeSurface(_windowIcon);
+		_windowIcon     = copySDLSurface(state.windowIcon);
+	} else {
+		SDL_SetWindowGrab(_window, _inputGrabState ? SDL_TRUE : SDL_FALSE);
+		setWindowCaption(state.windowCaption);
+		setWindowIcon(copySDLSurface(state.windowIcon));
+	}
+#endif
+
 	beginGFXTransaction();
 #ifdef USE_RGB_COLOR
 		initSize(state.screenWidth, state.screenHeight, &state.pixelFormat);
@@ -102,3 +207,27 @@ bool SdlGraphicsManager::setState(const State &state) {
 		return true;
 	}
 }
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+bool SdlGraphicsManager::createWindow(int width, int height, uint32 flags) {
+	destroyWindow();
+
+	if (_inputGrabState) {
+		flags |= SDL_WINDOW_INPUT_GRABBED;
+	}
+
+	_window = SDL_CreateWindow(_windowCaption.c_str(), SDL_WINDOWPOS_UNDEFINED,
+	                           SDL_WINDOWPOS_UNDEFINED, width, height, flags);
+	if (!_window) {
+		return false;
+	}
+	SDL_SetWindowIcon(_window, _windowIcon);
+
+	return true;
+}
+
+void SdlGraphicsManager::destroyWindow() {
+	SDL_DestroyWindow(_window);
+	_window = nullptr;
+}
+#endif
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index 3a53a4e40e..af7242b99e 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -134,6 +134,9 @@ public:
 	 * between different SDL graphic managers on runtime.
 	 */
 	struct State {
+		State();
+		~State();
+
 		int screenWidth, screenHeight;
 		bool aspectRatio;
 		bool fullscreen;
@@ -142,6 +145,12 @@ public:
 #ifdef USE_RGB_COLOR
 		Graphics::PixelFormat pixelFormat;
 #endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		bool inputGrabState;
+		Common::String windowCaption;
+		SDL_Surface *windowIcon;
+#endif
 	};
 
 	/**
@@ -156,6 +165,17 @@ public:
 
 protected:
 	SdlEventSource *_eventSource;
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_Window *_window;
+
+	bool createWindow(int width, int height, uint32 flags);
+	void destroyWindow();
+private:
+	bool _inputGrabState;
+	Common::String _windowCaption;
+	SDL_Surface *_windowIcon;
+#endif
 };
 
 #endif
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 583c85e446..8e349653d0 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -122,7 +122,11 @@ SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSou
 #ifdef USE_OSD
 	_osdSurface(0), _osdAlpha(SDL_ALPHA_TRANSPARENT), _osdFadeStartTime(0),
 #endif
-	_hwscreen(0), _screen(0), _tmpscreen(0),
+	_hwscreen(0),
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	_renderer(nullptr), _screenTexture(nullptr),
+#endif
+	_screen(0), _tmpscreen(0),
 #ifdef USE_RGB_COLOR
 	_screenFormat(Graphics::PixelFormat::createFormatCLUT8()),
 	_cursorFormat(Graphics::PixelFormat::createFormatCLUT8()),
@@ -681,12 +685,22 @@ static void fixupResolutionForAspectRatio(AspectRatio desiredAspectRatio, int &w
 	const int w = width;
 	const int h = height;
 
+	int bestW = 0, bestH = 0;
+	uint bestMetric = (uint)-1; // Metric is wasted space
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	const int numModes = SDL_GetNumDisplayModes(0);
+	SDL_DisplayMode modeData, *mode = &modeData;
+	for (int i = 0; i < numModes; ++i) {
+		if (SDL_GetDisplayMode(0, i, &modeData)) {
+			continue;
+		}
+#else
 	SDL_Rect const* const*availableModes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_SWSURFACE); //TODO : Maybe specify a pixel format
 	assert(availableModes);
 
-	const SDL_Rect *bestMode = NULL;
-	uint bestMetric = (uint)-1; // Metric is wasted space
 	while (const SDL_Rect *mode = *availableModes++) {
+#endif
 		if (mode->w < w)
 			continue;
 		if (mode->h < h)
@@ -699,15 +713,23 @@ static void fixupResolutionForAspectRatio(AspectRatio desiredAspectRatio, int &w
 			continue;
 
 		bestMetric = metric;
-		bestMode = mode;
+		bestW = mode->w;
+		bestH = mode->h;
+
+	// Make editors a bit more happy by having the same amount of closing as
+	// opening curley braces.
+#if SDL_VERSION_ATLEAST(2, 0, 0)
 	}
+#else
+	}
+#endif
 
-	if (!bestMode) {
+	if (!bestW || !bestH) {
 		warning("Unable to enforce the desired aspect ratio");
 		return;
 	}
-	width = bestMode->w;
-	height = bestMode->h;
+	width = bestW;
+	height = bestH;
 }
 
 bool SurfaceSdlGraphicsManager::loadGFXMode() {
@@ -876,6 +898,10 @@ void SurfaceSdlGraphicsManager::unloadGFXMode() {
 		_screen = NULL;
 	}
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	deinitializeRenderer();
+#endif
+
 	if (_hwscreen) {
 		SDL_FreeSurface(_hwscreen);
 		_hwscreen = NULL;
@@ -1443,6 +1469,9 @@ void SurfaceSdlGraphicsManager::setPalette(const byte *colors, uint start, uint
 		base[i].r = b[0];
 		base[i].g = b[1];
 		base[i].b = b[2];
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		base[i].a = 255;
+#endif
 	}
 
 	if (start < _paletteDirtyStart)
@@ -1481,6 +1510,9 @@ void SurfaceSdlGraphicsManager::setCursorPalette(const byte *colors, uint start,
 		base[i].r = b[0];
 		base[i].g = b[1];
 		base[i].b = b[2];
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		base[i].a = 255;
+#endif
 	}
 
 	_cursorPaletteDisabled = false;
@@ -2317,4 +2349,52 @@ void SurfaceSdlGraphicsManager::notifyMousePos(Common::Point mouse) {
 	setMousePos(mouse.x, mouse.y);
 }
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+void SurfaceSdlGraphicsManager::deinitializeRenderer() {
+	SDL_DestroyTexture(_screenTexture);
+	_screenTexture = nullptr;
+
+	SDL_DestroyRenderer(_renderer);
+	_renderer = nullptr;
+
+	destroyWindow();
+}
+
+SDL_Surface *SurfaceSdlGraphicsManager::SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags) {
+	deinitializeRenderer();
+
+	if (!createWindow(width, height, (flags & SDL_FULLSCREEN) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0)) {
+		return nullptr;
+	}
+
+	_renderer = SDL_CreateRenderer(_window, -1, 0);
+	if (!_renderer) {
+		deinitializeRenderer();
+		return nullptr;
+	}
+
+	_screenTexture = SDL_CreateTexture(_renderer, SDL_PIXELFORMAT_RGB565, SDL_TEXTUREACCESS_STREAMING, width, height);
+	if (!_screenTexture) {
+		deinitializeRenderer();
+		return nullptr;
+	}
+
+	SDL_Surface *screen = SDL_CreateRGBSurface(0, width, height, 16, 0xF800, 0x7E0, 0x1F, 0);
+	if (!screen) {
+		deinitializeRenderer();
+		return nullptr;
+	} else {
+		return screen;
+	}
+}
+
+void SurfaceSdlGraphicsManager::SDL_UpdateRects(SDL_Surface *screen, int numrects, SDL_Rect *rects) {
+	SDL_UpdateTexture(_screenTexture, nullptr, screen->pixels, screen->pitch);
+
+	SDL_RenderClear(_renderer);
+	SDL_RenderCopy(_renderer, _screenTexture, NULL, NULL);
+	SDL_RenderPresent(_renderer);
+}
+#endif // SDL_VERSION_ATLEAST(2, 0, 0)
+
 #endif
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h
index 49bd66b3e5..c4227475c0 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.h
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h
@@ -166,6 +166,17 @@ protected:
 	/** Hardware screen */
 	SDL_Surface *_hwscreen;
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	/* SDL2 features a different API for 2D graphics. We create a wrapper
+	 * around this API to keep the code paths as close as possible. */
+	SDL_Renderer *_renderer;
+	SDL_Texture *_screenTexture;
+	void deinitializeRenderer();
+
+	SDL_Surface *SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags);
+	void SDL_UpdateRects(SDL_Surface *screen, int numrects, SDL_Rect *rects);
+#endif
+
 	/** Unseen game screen */
 	SDL_Surface *_screen;
 #ifdef USE_RGB_COLOR
diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index e3b15b8c59..fa363a7ad4 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -57,11 +57,13 @@ void SdlMixerManager::init() {
 		error("Could not initialize SDL: %s", SDL_GetError());
 	}
 
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
 	const int maxNameLen = 20;
 	char sdlDriverName[maxNameLen];
 	sdlDriverName[0] = '\0';
 	SDL_AudioDriverName(sdlDriverName, maxNameLen);
 	debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName);
+#endif
 
 	// Get the desired audio specs
 	SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC);
diff --git a/backends/module.mk b/backends/module.mk
index 34e2928419..e5e2905781 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -74,9 +74,11 @@ MODULE_OBJS += \
 
 # SDL 1.3 removed audio CD support
 ifndef USE_SDL13
+ifndef USE_SDL2
 MODULE_OBJS += \
 	audiocd/sdl/sdl-audiocd.o
 endif
+endif
 
 ifdef USE_OPENGL
 MODULE_OBJS += \
diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index eec3741ed6..1ae43dbd8b 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -74,5 +74,50 @@ typedef struct { int FAKE; } FAKE_FILE;
 #define strncasecmp    FORBIDDEN_SYMBOL_REPLACEMENT
 #endif
 
+// SDL 2 has major API changes. We redefine constants which got renamed to
+// ease the transition. This is sometimes dangerous because the values changed
+// too!
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+
+// Type names which changed between SDL 1.2 and SDL 2.
+#define SDLKey     SDL_Keycode
+#define SDLMod     SDL_Keymod
+#define SDL_keysym SDL_Keysym
+
+// Key code constants which got renamed.
+#define SDLK_SCROLLOCK SDLK_SCROLLLOCK
+#define SDLK_NUMLOCK   SDLK_NUMLOCKCLEAR
+#define SDLK_LSUPER    SDLK_LGUI
+#define SDLK_RSUPER    SDLK_RGUI
+#define SDLK_PRINT     SDLK_PRINTSCREEN
+#define SDLK_COMPOSE   SDLK_APPLICATION
+#define SDLK_KP0       SDLK_KP_0
+#define SDLK_KP1       SDLK_KP_1
+#define SDLK_KP2       SDLK_KP_2
+#define SDLK_KP3       SDLK_KP_3
+#define SDLK_KP4       SDLK_KP_4
+#define SDLK_KP5       SDLK_KP_5
+#define SDLK_KP6       SDLK_KP_6
+#define SDLK_KP7       SDLK_KP_7
+#define SDLK_KP8       SDLK_KP_8
+#define SDLK_KP9       SDLK_KP_9
+
+// Meta key constants which got renamed.
+#define KMOD_META KMOD_GUI
+
+// SDL surface flags which got removed.
+#define SDL_SRCCOLORKEY 0
+#define SDL_SRCALPHA    0
+#define SDL_FULLSCREEN  0x40000000
+
+// Compatability implementations for removed functionality.
+int SDL_SetColors(SDL_Surface *surface, SDL_Color *colors, int firstcolor, int ncolors);
+int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
+
+#define SDL_SetColorKey SDL_SetColorKey_replacement
+int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key);
+
+#endif
+
 
 #endif
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index d3a6e5e658..434a4ce18a 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -126,8 +126,10 @@ void OSystem_SDL::init() {
 	// Initialize SDL
 	initSDL();
 
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
 	// Enable unicode support if possible
 	SDL_EnableUNICODE(1);
+#endif
 
 	// Disable OS cursor
 	SDL_ShowCursor(SDL_DISABLE);
@@ -158,10 +160,14 @@ void OSystem_SDL::initBackend() {
 	// Check if backend has not been initialized
 	assert(!_inited);
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	const char *sdlDriverName = SDL_GetCurrentVideoDriver();
+#else
 	const int maxNameLen = 20;
 	char sdlDriverName[maxNameLen];
 	sdlDriverName[0] = '\0';
 	SDL_VideoDriverName(sdlDriverName, maxNameLen);
+#endif
 	// Using printf rather than debug() here as debug()/logging
 	// is not active by this point.
 	debug(1, "Using SDL Video Driver \"%s\"", sdlDriverName);
@@ -172,6 +178,13 @@ void OSystem_SDL::initBackend() {
 		_eventSource = new SdlEventSource();
 
 #ifdef USE_OPENGL
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_DisplayMode displayMode;
+	if (!SDL_GetDesktopDisplayMode(0, &displayMode)) {
+		_desktopWidth  = displayMode.w;
+		_desktopHeight = displayMode.h;
+	}
+#else
 	// Query the desktop resolution. We simply hope nothing tried to change
 	// the resolution so far.
 	const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
@@ -179,6 +192,7 @@ void OSystem_SDL::initBackend() {
 		_desktopWidth  = videoInfo->current_w;
 		_desktopHeight = videoInfo->current_h;
 	}
+#endif
 #endif
 
 	if (_graphicsManager == 0) {
@@ -681,5 +695,38 @@ void OSystem_SDL::setupGraphicsModes() {
 		mode++;
 	}
 }
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+int SDL_SetColors(SDL_Surface *surface, SDL_Color *colors, int firstcolor, int ncolors) {
+	if (surface->format->palette) {
+		return !SDL_SetPaletteColors(surface->format->palette, colors, firstcolor, ncolors) ? 1 : 0;
+	} else {
+		return 0;
+	}
+}
 
+int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha) {
+	if (SDL_SetSurfaceAlphaMod(surface, alpha)) {
+		return -1;
+	}
+
+	if (alpha == 255 || !flag) {
+		if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE)) {
+			return -1;
+		}
+	} else {
+		if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND)) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+#undef SDL_SetColorKey
+int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key) {
+	return SDL_SetColorKey(surface, SDL_TRUE, key) ? -1 : 0;
+}
 #endif
+
diff --git a/configure b/configure
index 17fbe15af2..3e85e42054 100755
--- a/configure
+++ b/configure
@@ -3070,6 +3070,9 @@ case $_backend in
 			1.3.*)
 				add_line_to_config_mk "USE_SDL13 = 1"
 				;;
+			2.0.*)
+				add_line_to_config_mk "USE_SDL2 = 1"
+				;;
 			*)
 				;;
 		esac
-- 
cgit v1.2.3


From 975b1cf7fb7f936971c553e5ed30492ad9e7e94d Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Sun, 25 Jan 2015 20:53:42 +0100
Subject: MORTEVIELLE: more drawBox() adjustments

---
 engines/mortevielle/utils.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 61f58c0972..aa58dc6f7c 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -391,7 +391,7 @@ void MortevielleEngine::setTextColor(int col) {
  */
 void MortevielleEngine::prepareScreenType1() {
 	// Large drawing
-	_screenSurface->drawBox(0, 11, 512, 164, 15);
+	_screenSurface->drawBox(0, 11, 512, 163, 15);
 }
 
 /**
@@ -1381,7 +1381,7 @@ void MortevielleEngine::gotoDiningRoom() {
 		showPeoplePresent(_currBitIndex);
 		_caff = 77;
 		drawPictureWithText();
-		_screenSurface->drawBox(223, 47, 155, 92, 15);
+		_screenSurface->drawBox(223, 47, 155, 91, 15);
 		handleDescriptionText(2, 33);
 		testKey(false);
 		menuUp();
@@ -2885,10 +2885,10 @@ void MortevielleEngine::drawPicture() {
 	clearUpperLeftPart();
 	if (_caff > 99) {
 		draw(60, 33);
-		_screenSurface->drawBox(118, 32, 291, 122, 15);         // Medium box
+		_screenSurface->drawBox(118, 32, 291, 121, 15);         // Medium box
 	} else if (_caff > 69) {
 		draw(112, 48);           // Heads
-		_screenSurface->drawBox(222, 47, 155, 92, 15);
+		_screenSurface->drawBox(222, 47, 155, 91, 15);
 	} else {
 		draw(0, 12);
 		prepareScreenType1();
@@ -2926,6 +2926,9 @@ void MortevielleEngine::drawPicture() {
 	}
 }
 
+/**
+ * @remarks	Originally called 'afdes'
+ */
 void MortevielleEngine::drawPictureWithText() {
 	_text->taffich();
 	drawPicture();
@@ -3087,7 +3090,7 @@ void MortevielleEngine::menuUp() {
  */
 void MortevielleEngine::drawDiscussionBox() {
 	draw(10, 80);
-	_screenSurface->drawBox(18, 79, 155, 92, 15);
+	_screenSurface->drawBox(18, 79, 155, 91, 15);
 }
 
 /**
-- 
cgit v1.2.3


From e695c018629a1a648892fe5474d2049a429e8dc8 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Sun, 25 Jan 2015 20:54:09 +0100
Subject: MORTEVIELLE: 1sec seems to be far enough here

---
 engines/mortevielle/mortevielle.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index b6fee3f19f..b0faff3510 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -92,7 +92,7 @@ enum DataType {
 #define MORT_DAT_REQUIRED_VERSION 1
 #define MORT_DAT "mort.dat"
 #define GAME_FRAME_DELAY (1000 / 50)
-#define DISK_ACCESS_DELAY 3000
+#define DISK_ACCESS_DELAY 1000
 
 const int kTime1 = 410;
 const int kTime2 = 250;
-- 
cgit v1.2.3


From 8d57b766a97f563d621db09176c0813efe5a1323 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 21:11:18 +0100
Subject: SDL: Fix typo.

---
 backends/platform/sdl/sdl-sys.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index 1ae43dbd8b..bc3678e350 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -110,7 +110,7 @@ typedef struct { int FAKE; } FAKE_FILE;
 #define SDL_SRCALPHA    0
 #define SDL_FULLSCREEN  0x40000000
 
-// Compatability implementations for removed functionality.
+// Compatibility implementations for removed functionality.
 int SDL_SetColors(SDL_Surface *surface, SDL_Color *colors, int firstcolor, int ncolors);
 int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha);
 
-- 
cgit v1.2.3


From 99f4dafa72d497529fb7a15dcecb56fe3f717d37 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 21:23:26 +0100
Subject: SDL: Also print audio driver used when built with SDL2.

---
 backends/mixer/sdl/sdl-mixer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index fa363a7ad4..dc0c853808 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -57,13 +57,15 @@ void SdlMixerManager::init() {
 		error("Could not initialize SDL: %s", SDL_GetError());
 	}
 
-#if !SDL_VERSION_ATLEAST(2, 0, 0)
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	const char *sdlDriverName = SDL_GetCurrentAudioDriver();
+#else
 	const int maxNameLen = 20;
 	char sdlDriverName[maxNameLen];
 	sdlDriverName[0] = '\0';
 	SDL_AudioDriverName(sdlDriverName, maxNameLen);
-	debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName);
 #endif
+	debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName);
 
 	// Get the desired audio specs
 	SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC);
-- 
cgit v1.2.3


From b00050439f0f602cb54500f7fda268a7589b4c8b Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 21:51:54 +0100
Subject: SDL: Guard audio CD code to be SDL 1.2 only.

---
 backends/audiocd/sdl/sdl-audiocd.cpp | 7 ++++++-
 backends/audiocd/sdl/sdl-audiocd.h   | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index 5093c03a1c..c7b089af09 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -24,9 +24,12 @@
 
 #if defined(SDL_BACKEND)
 
-#include "common/textconsole.h"
 #include "backends/audiocd/sdl/sdl-audiocd.h"
 
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+
+#include "common/textconsole.h"
+
 SdlAudioCDManager::SdlAudioCDManager()
 	:
 	_cdrom(0),
@@ -133,4 +136,6 @@ void SdlAudioCDManager::updateCD() {
 	}
 }
 
+#endif // !SDL_VERSION_ATLEAST(1, 3, 0)
+
 #endif
diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h
index ff98fcdd77..783d4fe0f0 100644
--- a/backends/audiocd/sdl/sdl-audiocd.h
+++ b/backends/audiocd/sdl/sdl-audiocd.h
@@ -27,6 +27,8 @@
 
 #include "backends/platform/sdl/sdl-sys.h"
 
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+
 /**
  * The SDL audio cd manager. Implements real audio cd playback.
  */
@@ -47,4 +49,6 @@ protected:
 	uint32 _cdEndTime, _cdStopTime;
 };
 
+#endif // !SDL_VERSION_ATLEAST(1, 3, 0)
+
 #endif
-- 
cgit v1.2.3


From 5eefa62899950ea9e1644a2f597fcfa6b9ad50b9 Mon Sep 17 00:00:00 2001
From: Hubert Maier
Date: Mon, 26 Jan 2015 19:56:24 +0200
Subject: AMIGAOS: Re-add a DosList feature

To keep consistency with the original code i re-added the DosList feature dol_Port (which was taken out due to a compiler error using SDK 53.24 and was named wrong anyway).
It offers a message port for the DosList.---
 backends/fs/amigaos4/amigaos4-fs.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 7bebdf8ce6..6d5b099736 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -381,15 +381,17 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
 	dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES);
 	while (dosList) {
 		if (dosList->dol_Type == DLT_VOLUME &&
-			dosList->dol_Name) {
+			dosList->dol_Name &&
+			dosList->dol_Port) {
 
 			// The original line was
 			//if (dosList->dol_Type == DLT_VOLUME &&
 			//dosList->dol_Name &&
 			//dosList->dol_Task) {
 			// which errored using SDK 53.24 with a 'struct dosList' has no member called 'dol_Task'
-			// I removed dol_Task because it's not used anywhere else
-			// and it neither brought up further errors nor crashes or regressions
+			// The reason for that was that
+			// 1) dol_Task wasn't a task pointer, it is a message port instead
+			// 2) It was redefined to be dol_Port in dos/obsolete.h in afore mentioned SDK
 
 			// Copy name to buffer
 			IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN);
-- 
cgit v1.2.3


From 51e90b2422f0bf3b4b9b1a71c23ae12a359dead2 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 26 Jan 2015 19:34:21 +0100
Subject: ZVISION: Fix ActionMusic volume

The volume can be either a constant or a state value. The latter is
used by ZGI to simulate a sound being heard at different distances,
e.g. the beehive in the Dungeon Master's hideout.
---
 engines/zvision/scripting/actions.cpp | 63 ++++++++++++++++++++++-------------
 engines/zvision/scripting/actions.h   |  3 +-
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 9a2f1d10ff..81d6655fa9 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/scummsys.h"
+#include "common/tokenizer.h"
 #include "video/video_decoder.h"
 
 #include "zvision/scripting/actions.h"
@@ -449,33 +450,40 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 	_note(0),
 	_prog(0),
 	_universe(global) {
-	uint type = 0;
-	char fileNameBuffer[25];
-	uint loop = 0;
-	uint volume = 255;
+	Common::StringTokenizer tokenizer(line);
 
-	sscanf(line.c_str(), "%u %24s %u %u", &type, fileNameBuffer, &loop, &volume);
+	// Parse the type of action. Type 4 actions are MIDI commands, not
+	// files. These are only used by Zork: Nemesis, for the flute and piano
+	// puzzles (tj4e and ve6f, as well as vr)
+	uint type = atoi(tokenizer.nextToken().c_str());
 
-	// Type 4 actions are MIDI commands, not files. These are only used by
-	// Zork: Nemesis, for the flute and piano puzzles (tj4e and ve6f, as well
-	// as vr)
 	if (type == 4) {
 		_midi = true;
-		int note;
-		int prog;
-		sscanf(line.c_str(), "%u %d %d %u", &type, &prog, &note, &volume);
-		_volume = volume;
-		_note = note;
-		_prog = prog;
+		_prog = atoi(tokenizer.nextToken().c_str());
+		_note = atoi(tokenizer.nextToken().c_str());
+		_volume = atoi(tokenizer.nextToken().c_str());
+		_volumeIsAKey = false;
 	} else {
 		_midi = false;
-		_fileName = Common::String(fileNameBuffer);
-		_loop = loop == 1 ? true : false;
-
-		// Volume is optional. If it doesn't appear, assume full volume
-		if (volume != 255) {
-			// Volume in the script files is mapped to [0, 100], but the ScummVM mixer uses [0, 255]
-			_volume = volume * 255 / 100;
+		_fileName = tokenizer.nextToken();
+		_loop = atoi(tokenizer.nextToken().c_str()) == 1;
+		if (!tokenizer.empty()) {
+			Common::String token = tokenizer.nextToken();
+			if (token.contains('[')) {
+				sscanf(token.c_str(), "[%u]", &_volume);
+				_volumeIsAKey = true;
+			} else {
+				_volume = atoi(token.c_str());
+				if (_volume > 100) {
+					warning("ActionMusic: Adjusting volume for %s from %d to 100", _fileName.c_str(), _volume);
+					_volume = 100;
+				}
+				_volumeIsAKey = false;
+			}
+		} else {
+			// Volume is optional. If it doesn't appear, assume full volume
+			_volume = 100;
+			_volumeIsAKey = false;
 		}
 	}
 }
@@ -491,13 +499,22 @@ bool ActionMusic::execute() {
 		_engine->getScriptManager()->setStateValue(_slotKey, 2);
 	}
 
+	uint volume;
+	if (_volumeIsAKey) {
+		volume = _engine->getScriptManager()->getStateValue(_volume);
+	} else {
+		volume = _volume;
+	}
+
 	if (_midi) {
-		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, _volume));
+		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, volume));
 	} else {
 		if (!_engine->getSearchManager()->hasFile(_fileName))
 			return true;
 
-		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotKey, _fileName, _loop, _volume));
+		// Volume in the script files is mapped to [0, 100], but the ScummVM mixer uses [0, 255]
+
+		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotKey, _fileName, _loop, volume * 255 / 100));
 	}
 
 	return true;
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 8d43309b74..cbb91fa8d3 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -224,7 +224,8 @@ public:
 private:
 	Common::String _fileName;
 	bool _loop;
-	byte _volume;
+	uint32 _volume;
+	bool _volumeIsAKey;
 	bool _universe;
 	bool _midi;
 	int8 _note;
-- 
cgit v1.2.3


From d0f95b40e8ae38f871fc84040820687de6ef8ff1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 19:45:08 +0100
Subject: AMIGAOS: Update icons to use glow and cleanup (Courtesy of Raziel^)

---
 icons/scummvm.info        | Bin 17326 -> 23078 bytes
 icons/scummvm_drawer.info | Bin 20738 -> 22916 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/scummvm.info b/icons/scummvm.info
index e30a7129ef..f603627122 100644
Binary files a/icons/scummvm.info and b/icons/scummvm.info differ
diff --git a/icons/scummvm_drawer.info b/icons/scummvm_drawer.info
index 26f6a8633d..03b62536a2 100644
Binary files a/icons/scummvm_drawer.info and b/icons/scummvm_drawer.info differ
-- 
cgit v1.2.3


From bdd75f975df17679af140895f8c544cd019eeb61 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Mon, 26 Jan 2015 22:16:31 +0100
Subject: MORTEVIELLE: added missing inter screen messages

---
 engines/mortevielle/actions.cpp   |  6 +++---
 engines/mortevielle/mortevielle.h |  2 ++
 engines/mortevielle/outtext.cpp   | 24 ++++++++++++++++++++++++
 engines/mortevielle/utils.cpp     | 23 +++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 556475d515..b7b9c1e000 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -571,6 +571,7 @@ void MortevielleEngine::fctSearch() {
 				_curSearchObjId = getFirstObject();
 				if (_curSearchObjId != 0) {
 					_searchCount = 0;
+					_is = 0;
 					_heroSearching = true;
 					_menu->setSearchMenu();
 					prepareNextObject();
@@ -1678,9 +1679,8 @@ void MortevielleEngine::endGame() {
 	handleDescriptionText(2, 35);
 	startMusicOrSpeech(0);
 	testKey(false);
-	// A wait message was displayed.
-	// testKey (aka tkey1) was called before and after.
-	// This double call is useless, thus removed
+	displayInterScreenMessage(2036);
+	testKey(false);
 	resetVariables();
 }
 
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index b0faff3510..f260edba09 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -416,6 +416,7 @@ public:
 	int _maff;
 	int _caff;
 	int _crep;
+	int _is;		// ???
 
 	byte _destinationArray[7][25];
 
@@ -466,6 +467,7 @@ public:
 	void gameLoaded();
 	void initGame();
 	void displayAloneText();
+	void displayInterScreenMessage(int mesgId);
 	void draw(int x, int y);
 	void charToHour();
 	void hourToChar();
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index 6a479c0859..5cbe4deab3 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -227,7 +227,31 @@ void TextHandler::taffich() {
 	Common::String filename, altFilename;
 
 	if ((a != 50) && (a != 51)) {
+		int m = a + 2000;
+
+		if ((m > 2001) && (m < 2010))
+			m = 2001;
+		else if (m == 2011)
+			m = 2010;
+		if (a == 32)
+			m = 2034;
+		else if ((a == 17) && (_vm->_maff == 14))
+			m = 2018;
+		else if (a > 99) {
+			if ((_vm->_is == 1) || (_vm->_is == 0))
+				m = 2031;
+			else
+				m = 2032;
+		}
+
+		if ( ((a > 69) && (a < 80)) || (a == 30) || (a == 31) || (a == 144) || (a == 147) || (a == 149) )
+			m = 2030;
+		else if ( ((a < 27) && ( ((_vm->_maff > 69) && (!_vm->_coreVar._alreadyEnteredManor)) || (_vm->_maff > 99) )) || ((_vm->_maff > 29) && (_vm->_maff < 33)) )
+			m = 2033;
+
+		_vm->displayInterScreenMessage(m);
 		_vm->_maff = a;
+
 		if (a == 159)
 			a = 86;
 		else if (a > 140)
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index aa58dc6f7c..74f2bc5897 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1359,6 +1359,7 @@ void MortevielleEngine::endSearch() {
 	_heroSearching = false;
 	_obpart = false;
 	_searchCount = 0;
+	_is = 0;
 	_menu->unsetSearchMenu();
 }
 
@@ -1469,6 +1470,7 @@ void MortevielleEngine::gameLoaded() {
 	_num = 0;
 	_startTime = 0;
 	_endTime = 0;
+	_is = 0;
 	_searchCount = 0;
 	_roomDoorId = OWN_ROOM;
 	_syn = true;
@@ -2988,6 +2990,26 @@ void MortevielleEngine::displayNarrativePicture(int af, int ob) {
 	_crep = 998;
 }
 
+/**
+ * Display a message switching from a screen to another.
+ * @remarks	Originally called 'messint'
+ */
+void MortevielleEngine::displayInterScreenMessage(int mesgId) {
+	clearUpperLeftPart();
+	clearDescriptionBar();
+	clearVerbBar();
+
+	GfxSurface surface;
+	surface.decode(_rightFramePict + 1008);
+	surface._offset.x = 80;
+	surface._offset.y = 40;
+	setPal(90);
+	_screenSurface->drawPicture(surface, 0, 0);
+	_screenSurface->drawPicture(surface, 0, 70);
+	handleDescriptionText(7, mesgId);
+	delay(DISK_ACCESS_DELAY);
+}
+
 /**
  * Prepare Display Text
  * @remarks	Originally called 'affrep'
@@ -3196,6 +3218,7 @@ void MortevielleEngine::prepareNextObject() {
 	} while ((objId == 0) && (_searchCount <= 9));
 
 	if ((objId != 0) && (_searchCount < 11)) {
+		_is++;
 		_caff = objId;
 		_crep = _caff + 400;
 		if (_currBitIndex != 0)
-- 
cgit v1.2.3


From dd5cd42f2eff7ca320fe507916b65a06c3a0ee74 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 26 Jan 2015 22:07:47 +0100
Subject: ZVISION: Use ValueSlot for volume in ActionMusic

As suggested by Marisa-Chan. I had based my earlier implementation
on parseCritera(), and was unaware of this alternative. The good
thing is that the diff from the old code is now much smaller, which
should reduce the risk of regressions. (There is a lot I haven't
tested here...)
---
 engines/zvision/scripting/actions.cpp | 64 +++++++++++++++--------------------
 engines/zvision/scripting/actions.h   |  3 +-
 2 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 81d6655fa9..d851a74dec 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "common/scummsys.h"
-#include "common/tokenizer.h"
 #include "video/video_decoder.h"
 
 #include "zvision/scripting/actions.h"
@@ -446,51 +445,48 @@ bool ActionMenuBarEnable::execute() {
 
 ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &line, bool global) :
 	ResultAction(engine, slotkey),
-	_volume(255),
 	_note(0),
 	_prog(0),
 	_universe(global) {
-	Common::StringTokenizer tokenizer(line);
+	uint type = 0;
+	char fileNameBuffer[25];
+	uint loop = 0;
+	char volumeBuffer[15];
 
-	// Parse the type of action. Type 4 actions are MIDI commands, not
-	// files. These are only used by Zork: Nemesis, for the flute and piano
-	// puzzles (tj4e and ve6f, as well as vr)
-	uint type = atoi(tokenizer.nextToken().c_str());
+	// Volume is optional. If it doesn't appear, assume full volume
+	strcpy(volumeBuffer, "100");
 
+	sscanf(line.c_str(), "%u %24s %u %14s", &type, fileNameBuffer, &loop, volumeBuffer);
+
+	// Type 4 actions are MIDI commands, not files. These are only used by
+	// Zork: Nemesis, for the flute and piano puzzles (tj4e and ve6f, as well
+	// as vr)
 	if (type == 4) {
 		_midi = true;
-		_prog = atoi(tokenizer.nextToken().c_str());
-		_note = atoi(tokenizer.nextToken().c_str());
-		_volume = atoi(tokenizer.nextToken().c_str());
-		_volumeIsAKey = false;
+		int note;
+		int prog;
+		sscanf(line.c_str(), "%u %d %d %14s", &type, &prog, &note, volumeBuffer);
+		_volume = new ValueSlot(_engine->getScriptManager(), volumeBuffer);
+		_note = note;
+		_prog = prog;
 	} else {
 		_midi = false;
-		_fileName = tokenizer.nextToken();
-		_loop = atoi(tokenizer.nextToken().c_str()) == 1;
-		if (!tokenizer.empty()) {
-			Common::String token = tokenizer.nextToken();
-			if (token.contains('[')) {
-				sscanf(token.c_str(), "[%u]", &_volume);
-				_volumeIsAKey = true;
-			} else {
-				_volume = atoi(token.c_str());
-				if (_volume > 100) {
-					warning("ActionMusic: Adjusting volume for %s from %d to 100", _fileName.c_str(), _volume);
-					_volume = 100;
-				}
-				_volumeIsAKey = false;
-			}
-		} else {
-			// Volume is optional. If it doesn't appear, assume full volume
-			_volume = 100;
-			_volumeIsAKey = false;
+		_fileName = Common::String(fileNameBuffer);
+		_loop = loop == 1 ? true : false;
+		if (volumeBuffer[0] != '[' && atoi(volumeBuffer) > 100) {
+			// I thought I saw a case like this in Zork Nemesis, so
+			// let's guard against it.
+			warning("ActionMusic: Adjusting volume for %s from %s to 100", _fileName.c_str(), volumeBuffer);
+			strcpy(volumeBuffer, "100");
 		}
+		_volume = new ValueSlot(engine->getScriptManager(), volumeBuffer);
 	}
 }
 
 ActionMusic::~ActionMusic() {
 	if (!_universe)
 		_engine->getScriptManager()->killSideFx(_slotKey);
+	delete _volume;
 }
 
 bool ActionMusic::execute() {
@@ -499,12 +495,7 @@ bool ActionMusic::execute() {
 		_engine->getScriptManager()->setStateValue(_slotKey, 2);
 	}
 
-	uint volume;
-	if (_volumeIsAKey) {
-		volume = _engine->getScriptManager()->getStateValue(_volume);
-	} else {
-		volume = _volume;
-	}
+	uint volume = _volume->getValue();
 
 	if (_midi) {
 		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, volume));
@@ -513,7 +504,6 @@ bool ActionMusic::execute() {
 			return true;
 
 		// Volume in the script files is mapped to [0, 100], but the ScummVM mixer uses [0, 255]
-
 		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotKey, _fileName, _loop, volume * 255 / 100));
 	}
 
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index cbb91fa8d3..94c2d041fc 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -224,8 +224,7 @@ public:
 private:
 	Common::String _fileName;
 	bool _loop;
-	uint32 _volume;
-	bool _volumeIsAKey;
+	ValueSlot *_volume;
 	bool _universe;
 	bool _midi;
 	int8 _note;
-- 
cgit v1.2.3


From 8c8261aa2a381c3e7f12c5dd0aaf33a69e1f7eb3 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 26 Jan 2015 22:14:26 +0100
Subject: ZVISION: Cleanup.

We usually don't check a pointer before deleting it.
---
 engines/zvision/scripting/actions.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index d851a74dec..5238561149 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -79,8 +79,7 @@ ActionAssign::ActionAssign(ZVision *engine, int32 slotkey, const Common::String
 }
 
 ActionAssign::~ActionAssign() {
-	if (_value)
-		delete _value;
+	delete _value;
 }
 
 bool ActionAssign::execute() {
@@ -804,8 +803,7 @@ ActionRandom::ActionRandom(ZVision *engine, int32 slotkey, const Common::String
 }
 
 ActionRandom::~ActionRandom() {
-	if (_max)
-		delete _max;
+	delete _max;
 }
 
 bool ActionRandom::execute() {
@@ -1044,8 +1042,7 @@ ActionTimer::ActionTimer(ZVision *engine, int32 slotkey, const Common::String &l
 }
 
 ActionTimer::~ActionTimer() {
-	if (_time)
-		delete _time;
+	delete _time;
 	_engine->getScriptManager()->killSideFx(_slotKey);
 }
 
-- 
cgit v1.2.3


From 21a66189194d277a98b8337cc077c11179d81d34 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 22:30:51 +0100
Subject: VOYEUR: Add missing break

---
 engines/voyeur/files_threads.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 0615c67ba0..53eb5ce3c5 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -1082,6 +1082,7 @@ int ThreadResource::doApt() {
 		break;
 	case 2:
 		_vm->_voy->_aptLoadMode = 142;
+		break;
 	case 5:
 		_vm->_voy->_aptLoadMode = 141;
 		break;
-- 
cgit v1.2.3


From b336e9b12c819d663484a044ea5730a8ec1aa01e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 22:51:41 +0100
Subject: TSAGE: BF - Remove unused variable

---
 engines/tsage/blue_force/blueforce_scenes8.cpp | 3 ++-
 engines/tsage/blue_force/blueforce_scenes8.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 6855fd41b9..698162c71d 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -964,9 +964,10 @@ Scene810::Scene810(): SceneExt() {
 }
 
 void Scene810::synchronize(Serializer &s) {
+	int dummy = 0;
 	SceneExt::synchronize(s);
 	s.syncAsSint16LE(_fieldA70);
-	s.syncAsSint16LE(_fieldA72);
+	s.syncAsSint16LE(dummy);
 	s.syncAsSint16LE(_fieldA74);
 }
 
diff --git a/engines/tsage/blue_force/blueforce_scenes8.h b/engines/tsage/blue_force/blueforce_scenes8.h
index 140327e85d..09de14f150 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.h
+++ b/engines/tsage/blue_force/blueforce_scenes8.h
@@ -229,7 +229,7 @@ public:
 	Exit _exit;
 	ASoundExt _sound1;
 	Rect _rect1, _rect2, _rect3;
-	int _fieldA70, _fieldA72, _fieldA74;
+	int _fieldA70, _fieldA74;
 
 	Scene810();
 	virtual void synchronize(Serializer &s);
-- 
cgit v1.2.3


From 46c3b8c3187736e12c433104de7ad247f31534a5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 22:59:04 +0100
Subject: TSAGE: Ringworld - Fix unitialized variable

---
 engines/tsage/blue_force/blueforce_scenes8.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 698162c71d..337e73dad0 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -2221,6 +2221,7 @@ Scene840::Scene840(): PalettedScene() {
 	_field1AC2 = 0;
 	_field1AC4 = 0;
 	_field1AC6 = (BF_GLOBALS._dayNumber > 3) ? 1 : 0;
+	_field1ABA = 0;
 }
 
 void Scene840::synchronize(Serializer &s) {
-- 
cgit v1.2.3


From 3e8456e0f861b968410c3ab4a750be52f522b743 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 22:59:32 +0100
Subject: TSAGE: Ringworld - Fix unitialized variable

---
 engines/tsage/ringworld/ringworld_scenes3.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index d8556c691e..735722a062 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -5789,6 +5789,7 @@ Scene2320::Scene2320() :
 	_area3._pt = Common::Point(200, 75);
 	_area4.setup(2153, 1, 1, 10);
 	_area4._pt = Common::Point(237, 77);
+	_hotspotPtr = nullptr;
 }
 
 void Scene2320::postInit(SceneObjectList *OwnerList) {
-- 
cgit v1.2.3


From 27febf8574c81c43375067346f9733df37f2d6d2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 23:13:40 +0100
Subject: TSAGE: Ringworld - Declare _sitFl as a boolean

---
 engines/tsage/ringworld/ringworld_scenes3.cpp | 13 +++++++------
 engines/tsage/ringworld/ringworld_scenes3.h   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 735722a062..a515224964 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -494,7 +494,7 @@ void Scene2100::Action1::signal() {
 			setDelay(1);
 		else {
 			setAction(&scene->_sequenceManager, this, 2102, &g_globals->_player, NULL);
-			scene->_sitFl = 0;
+			scene->_sitFl = false;
 		}
 		break;
 	case 1: {
@@ -1548,6 +1548,7 @@ Scene2100::Scene2100() :
 	_area3._pt = Common::Point(200, 75);
 	_area4.setup(2153, 1, 1, OBJECT_TRANSLATOR);
 	_area4._pt = Common::Point(237, 77);
+	_sitFl = false;
 }
 
 void Scene2100::postInit(SceneObjectList *OwnerList) {
@@ -1688,7 +1689,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) {
 	g_globals->_player._moveDiff.x = 4;
 	g_globals->_player.changeZoom(-1);
 	g_globals->_player.disableControl();
-	_sitFl = 0;
+	_sitFl = false;
 
 	switch (g_globals->_sceneManager._previousScene) {
 	case 2120:
@@ -1824,7 +1825,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) {
 		g_globals->_player.fixPriority(152);
 		g_globals->_player.setStrip(2);
 
-		_sitFl = 1;
+		_sitFl = true;
 
 		_object4.postInit();
 		_object4.setVisage(2102);
@@ -1858,7 +1859,7 @@ void Scene2100::postInit(SceneObjectList *OwnerList) {
 			g_globals->_player.fixPriority(152);
 			g_globals->_player.setStrip(2);
 
-			_sitFl = 1;
+			_sitFl = true;
 			setAction(&_action16);
 		}
 		break;
@@ -1932,12 +1933,12 @@ void Scene2100::stripCallback(int v) {
 void Scene2100::signal() {
 	switch (_sceneMode) {
 	case 2101:
-		_sitFl = 1;
+		_sitFl = true;
 		g_globals->_player._uiEnabled = true;
 		g_globals->_events.setCursor(CURSOR_USE);
 		break;
 	case 2102:
-		_sitFl = 0;
+		_sitFl = false;
 		g_globals->_player.enableControl();
 		break;
 	case 2103:
diff --git a/engines/tsage/ringworld/ringworld_scenes3.h b/engines/tsage/ringworld/ringworld_scenes3.h
index a371f800b9..752b6acd48 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.h
+++ b/engines/tsage/ringworld/ringworld_scenes3.h
@@ -283,7 +283,7 @@ public:
 	Action15 _action15;
 	Action16 _action16;
 	Action17 _action17;
-	int _sitFl;
+	bool _sitFl;
 	SceneArea _area1, _area2, _area3, _area4;
 
 	Scene2100();
-- 
cgit v1.2.3


From 7ebd6c974cb0aed319b2f7c6a38f909a920b4e6c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 23:14:16 +0100
Subject: VOYEUR: Fix bug in vDoCycleInt

---
 engines/voyeur/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 7ce7351e65..320c92283c 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -403,7 +403,7 @@ void EventsManager::vDoCycleInt() {
 					int palIndex = READ_LE_UINT16(pSrc);
 					pPal[palIndex * 3] = pSrc[3];
 					pPal[palIndex * 3 + 1] = pSrc[4];
-					pPal[palIndex * 3 + 1] = pSrc[5];
+					pPal[palIndex * 3 + 2] = pSrc[5];
 					pSrc += 6;
 
 					if ((int16)READ_LE_UINT16(pSrc) >= 0) {
-- 
cgit v1.2.3


From e8c9a828da890fb6803629e66f18f9096ca03e8e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 23:14:42 +0100
Subject: TSAGE: Fix 3 uninitialized variables

---
 engines/tsage/core.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index f35aa583e2..3105a9008e 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -56,6 +56,9 @@ InvObject::InvObject(int sceneNumber, int rlbNum, int cursorNum, CursorType curs
 	_bounds = s.getBounds();
 
 	DEALLOCATE(imgData);
+	_visage = 0;
+	_strip = 0;
+	_frame = 0;
 }
 
 InvObject::InvObject(int visage, int strip, int frame) {
-- 
cgit v1.2.3


From 50be542f9cacc7eba5879d8279d65b2637205b1d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 23:33:26 +0100
Subject: TSAGE: BF - Fix a glitch in scene 935

---
 engines/tsage/blue_force/blueforce_scenes9.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index 53000d6997..fcbfcb8cd7 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -3521,7 +3521,7 @@ void Scene935::Action1::signal() {
 		scene->_visualSpeaker.removeText();
 		scene->_visualSpeaker._textPos.y = scene->_sceneBounds.top + 80;
 		scene->_visualSpeaker._color1 = 252;
-		scene->_visualSpeaker._color1 = 251;
+		scene->_visualSpeaker._color2 = 251;
 		scene->_visualSpeaker.setText("Jake! Hide in the closet!");
 		setDelay(3);
 		break;
-- 
cgit v1.2.3


From f2e3bdd2e887aac3f749184bf31c41da6cb571d8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Jan 2015 23:34:48 +0100
Subject: TSAGE: BF - Fix another color glitch

---
 engines/tsage/blue_force/blueforce_scenes9.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index fcbfcb8cd7..5ba82a4714 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -3538,7 +3538,7 @@ void Scene935::Action1::signal() {
 		scene->_visualSpeaker.removeText();
 		scene->_visualSpeaker._textPos.y = scene->_sceneBounds.top + 150;
 		scene->_visualSpeaker._color1 = 250;
-		scene->_visualSpeaker._color1 = 249;
+		scene->_visualSpeaker._color2 = 249;
 		scene->_visualSpeaker.setText("Jake! Hide in the closet!");
 		setDelay(3);
 		break;
-- 
cgit v1.2.3


From d58f250918f742fd7fd035d7764433f492520e45 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 26 Jan 2015 19:51:18 -0500
Subject: AUDIO: Fix skipping samples when the skip length is greater than the
 first chunk

---
 audio/decoders/quicktime.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp
index 331c850b1a..ff87e7a9f8 100644
--- a/audio/decoders/quicktime.cpp
+++ b/audio/decoders/quicktime.cpp
@@ -241,6 +241,15 @@ void QuickTimeAudioDecoder::QuickTimeAudioTrack::queueAudio(const Timestamp &len
 			// If we have any samples that we need to skip (ie. we seeked into
 			// the middle of a chunk), skip them here.
 			if (_skipSamples != Timestamp()) {
+				if (_skipSamples > chunkLength) {
+					// If the amount we need to skip is greater than the size
+					// of the chunk, just skip it altogether.
+					_curMediaPos = _curMediaPos + chunkLength;
+					_skipSamples = _skipSamples - chunkLength;
+					delete stream;
+					continue;
+				}
+
 				skipSamples(_skipSamples, stream);
 				_curMediaPos = _curMediaPos + _skipSamples;
 				chunkLength = chunkLength - _skipSamples;
-- 
cgit v1.2.3


From 77302c406f5fa3641ff7dd3454d8b87d43274c86 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 27 Jan 2015 07:02:46 +0100
Subject: ACCESS: Initialize some variables

---
 engines/access/access.cpp | 3 +++
 engines/access/files.cpp  | 4 ++++
 engines/access/files.h    | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 7f59ae7ad6..0a4e519c91 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -94,6 +94,9 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
 	_cheatFl = false;
 	_restartFl = false;
 	_printEnd = 0;
+	for (int i = 0; i < 100; i++)
+		_objectsTable[i] = nullptr;
+	_clearSummaryFlag = false;
 }
 
 AccessEngine::~AccessEngine() {
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 42a7914638..4d734a67a9 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -40,6 +40,10 @@ void FileIdent::load(Common::SeekableReadStream &s) {
 
 /*------------------------------------------------------------------------*/
 
+CellIdent::	CellIdent() {
+	_cell = 0;
+}
+
 CellIdent::CellIdent(int cell, int fileNum, int subfile) {
 	_cell = cell;
 	_fileNum = fileNum;
diff --git a/engines/access/files.h b/engines/access/files.h
index 8b1aef0363..714ea44c75 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -46,7 +46,7 @@ struct FileIdent {
 struct CellIdent : FileIdent {
 	byte _cell;
 
-	CellIdent() {}
+	CellIdent();
 	CellIdent(int cell, int fileNum, int subfile);
 };
 
-- 
cgit v1.2.3


From 849f383169d57b0dee7b33ab0c2166007b50b8c2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 27 Jan 2015 07:14:55 +0100
Subject: MADE: Initialize some variables, remove a useless variable

---
 engines/made/script.cpp      | 5 +++++
 engines/made/script.h        | 1 -
 engines/made/scriptfuncs.cpp | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/engines/made/script.cpp b/engines/made/script.cpp
index 20fa026a40..f9f7acffde 100644
--- a/engines/made/script.cpp
+++ b/engines/made/script.cpp
@@ -122,6 +122,11 @@ ScriptInterpreter::ScriptInterpreter(MadeEngine *vm) : _vm(vm) {
 	_functions = new ScriptFunctions(_vm);
 	_functions->setupExternalsTable();
 
+	_localStackPos = 0;
+	_runningScriptObjectIndex = 0;
+	_codeBase = nullptr;
+	_codeIp = nullptr;
+
 #undef COMMAND
 }
 
diff --git a/engines/made/script.h b/engines/made/script.h
index bf75bc0875..f28425d13b 100644
--- a/engines/made/script.h
+++ b/engines/made/script.h
@@ -84,7 +84,6 @@ protected:
 	int16 _localStackPos;
 	int16 _runningScriptObjectIndex;
 	byte *_codeBase, *_codeIp;
-	bool _terminated;
 
 	ScriptFunctions *_functions;
 
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index efa765c7eb..bcc08e0dcc 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -42,6 +42,8 @@ ScriptFunctions::ScriptFunctions(MadeEngine *vm) : _vm(vm), _soundStarted(false)
 	_pcSpeaker2 = new Audio::PCSpeaker();
 	_vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_pcSpeakerHandle1, _pcSpeaker1);
 	_vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_pcSpeakerHandle2, _pcSpeaker2);
+	_soundResource = nullptr;
+	_musicRes = nullptr;
 }
 
 ScriptFunctions::~ScriptFunctions() {
-- 
cgit v1.2.3


From a1a99745f6f120354c0565e96e0636c0d303ed52 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 27 Jan 2015 07:21:52 +0100
Subject: MADE: Initialize some more variables, remove an useless variable

---
 engines/made/resource.cpp | 4 ++++
 engines/made/screenfx.cpp | 7 ++++++-
 engines/made/screenfx.h   | 1 -
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index 2c75965976..f8e763e74e 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -241,6 +241,7 @@ void AnimationResource::load(byte *source, int size) {
 /* SoundResource */
 
 SoundResource::SoundResource() : _soundSize(0), _soundData(NULL) {
+	_soundEnergyArray = nullptr;
 }
 
 SoundResource::~SoundResource() {
@@ -377,6 +378,9 @@ void GenericResource::load(byte *source, int size) {
 ResourceReader::ResourceReader() {
 	_isV1 = false;
 	_cacheDataSize = 0;
+
+	_fd = _fdMusic = _fdPics = _fdSounds = nullptr;
+	_cacheCount = 0;
 }
 
 ResourceReader::~ResourceReader() {
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index 2a155d67ac..3f98cbb9ab 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -51,7 +51,12 @@ ScreenEffects::ScreenEffects(Screen *screen) : _screen(screen) {
 	vfxHeight = 0;
 
 	_fxPalette = new byte[768];
-
+	
+	_blendedPaletteStatus._active = false;
+	_blendedPaletteStatus._palette = _blendedPaletteStatus._newPalette = nullptr;
+	_blendedPaletteStatus._colorCount = 0;
+	_blendedPaletteStatus._value = _blendedPaletteStatus._maxValue = 0;
+	_blendedPaletteStatus._incr = 0;
 }
 
 ScreenEffects::~ScreenEffects() {
diff --git a/engines/made/screenfx.h b/engines/made/screenfx.h
index fd216bfd63..cedb059927 100644
--- a/engines/made/screenfx.h
+++ b/engines/made/screenfx.h
@@ -38,7 +38,6 @@ struct BlendedPaletteStatus {
 	byte *_palette, *_newPalette;
 	int _colorCount;
 	int16 _value, _maxValue, _incr;
-	int cnt;
 };
 
 class ScreenEffects {
-- 
cgit v1.2.3


From d928871f7a03b410f4fcac43c44315e2f999efc9 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Tue, 27 Jan 2015 20:48:31 +0100
Subject: MORTEVIELLE: added starting screen

To give credits to the original authors and developers.
---
 engines/mortevielle/utils.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 74f2bc5897..49e1777c5e 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1726,6 +1726,22 @@ void MortevielleEngine::showMoveMenuAlert() {
  * @remarks	Originally called 'dialpre'
  */
 void MortevielleEngine::showConfigScreen() {
+	// FIXME: need a DOS palette, index 9 (light blue). Also we should show DOS font here
+	Common::String tmpStr;
+	int width, cy = 0;
+	clearScreen();
+ 	do {
+ 		++cy;
+ 		tmpStr = getString(cy + 456);
+ 		width = _screenSurface->getStringWidth(tmpStr);
+ 		_text->displayStr(tmpStr, 320 - width / 2, cy * 8, 80, 1, 2);
+ 	} while (cy != 20);
+
+ 	int ix = 0;
+ 	do {
+ 		++ix;
+ 	} while (!(keyPressed() || ix == 0x5e5));
+
 	_crep = 998;
 }
 
@@ -2132,6 +2148,7 @@ void MortevielleEngine::showTitleScreen() {
 	clearScreen();
 	draw(0, 0);
 
+	// FIXME: should be a DOS font here
 	Common::String cpr = "COPYRIGHT 1989 : LANKHOR";
 	_screenSurface->putxy(104 + 72 * kResolutionScaler, 185);
 	_screenSurface->drawString(cpr, 0);
-- 
cgit v1.2.3


From 58565c43da24553bfd9bea4e58de2d9191993ed3 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Tue, 27 Jan 2015 20:55:47 +0100
Subject: MORTEVIELLE: added starting screen string index constant

---
 engines/mortevielle/mortevielle.h | 1 +
 engines/mortevielle/utils.cpp     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index f260edba09..42d70fcb37 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -116,6 +116,7 @@ const int kInventoryStringIndex = 186;
 const int kQuestionStringIndex = 247;
 const int kDialogStringIndex = 292;
 const int kMenuPlaceStringIndex = 435;
+const int kStartingScreenStringIndex = 456;
 const int kMenuActionStringIndex = 476;
 const int kMenuSelfStringIndex = 497;
 const int kMenuSayStringIndex = 502;
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 49e1777c5e..5fe47674c8 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1732,7 +1732,7 @@ void MortevielleEngine::showConfigScreen() {
 	clearScreen();
  	do {
  		++cy;
- 		tmpStr = getString(cy + 456);
+ 		tmpStr = getString(cy + kStartingScreenStringIndex);
  		width = _screenSurface->getStringWidth(tmpStr);
  		_text->displayStr(tmpStr, 320 - width / 2, cy * 8, 80, 1, 2);
  	} while (cy != 20);
-- 
cgit v1.2.3


From f46af2eded0155a05d0e19717e6c4efd1191dab3 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Wed, 28 Jan 2015 09:26:45 +0600
Subject: ZVISION: Fix bug #6787 init lzss window by same values as in original
 game

---
 engines/zvision/file/lzss_read_stream.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/file/lzss_read_stream.cpp b/engines/zvision/file/lzss_read_stream.cpp
index 6f27eaa765..ca10af7d72 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) {
-- 
cgit v1.2.3


From ae2ba18af360b5578eaa38ac7aacce3264f8d7bf Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 28 Jan 2015 07:47:28 +0100
Subject: MADE: Initialize some variables

---
 engines/made/database.cpp  |  6 ++++++
 engines/made/pmvplayer.cpp | 15 ++++++++++-----
 engines/made/redreader.cpp | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index a9855ba1fe..3eab31acc2 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -252,6 +252,10 @@ byte *ObjectV3::getData() {
 
 
 GameDatabase::GameDatabase(MadeEngine *vm) : _vm(vm) {
+	_gameState = nullptr;
+	_gameStateSize = 0;
+	_mainCodeObjectIndex = 0;
+	_isRedSource = false;
 }
 
 GameDatabase::~GameDatabase() {
@@ -595,6 +599,8 @@ const char *GameDatabaseV2::getString(uint16 offset) {
 /* GameDatabaseV3 */
 
 GameDatabaseV3::GameDatabaseV3(MadeEngine *vm) : GameDatabase(vm) {
+	_gameText = nullptr;
+	_gameStateOffs = 0;
 }
 
 void GameDatabaseV3::load(Common::SeekableReadStream &sourceS) {
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp
index 3cac017e10..6ea0dc24d0 100644
--- a/engines/made/pmvplayer.cpp
+++ b/engines/made/pmvplayer.cpp
@@ -37,16 +37,18 @@
 
 namespace Made {
 
-PmvPlayer::PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer) : _fd(NULL), _vm(vm), _mixer(mixer) {
+PmvPlayer::PmvPlayer(MadeEngine *vm, Audio::Mixer *mixer) : _fd(nullptr), _vm(vm), _mixer(mixer) {
+	_audioStream = nullptr;
+	_surface = nullptr;
+	_aborted = false;
 }
 
 PmvPlayer::~PmvPlayer() {
 }
 
 bool PmvPlayer::play(const char *filename) {
-
 	_aborted = false;
-	_surface = NULL;
+	_surface = nullptr;
 
 	_fd = new Common::File();
 	if (!_fd->open(filename)) {
@@ -81,8 +83,11 @@ bool PmvPlayer::play(const char *filename) {
 	// results to sound being choppy. Therefore, we set them to more
 	// "common" values here (11025 instead of 11127 and 22050 instead
 	// of 22254)
-	if (soundFreq == 11127) soundFreq = 11025;
-	if (soundFreq == 22254) soundFreq = 22050;
+	if (soundFreq == 11127)
+		soundFreq = 11025;
+
+	if (soundFreq == 22254)
+		soundFreq = 22050;
 
 	for (int i = 0; i < 22; i++) {
 		int unk = _fd->readUint16LE();
diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp
index f5e6ca85b3..f92ffd8dd8 100644
--- a/engines/made/redreader.cpp
+++ b/engines/made/redreader.cpp
@@ -76,6 +76,22 @@ bool RedReader::seekFile(Common::File &fd, FileEntry &fileEntry, const char *fil
 }
 
 LzhDecompressor::LzhDecompressor() {
+	freq = nullptr;
+	len_table = nullptr;
+	sortptr = nullptr;
+	_source = nullptr;
+
+	_compSize = 0;
+	_blockPos = 0;
+	_bitbuf = 0;
+	_subbitbuf = 0;
+	_bitcount = 0;
+	_blocksize = 0;
+	tree_n = 0;
+	heapsize = 0;
+	decode_i = 0;
+	decode_j = 0;
+	count_len_depth = 0;
 }
 
 LzhDecompressor::~LzhDecompressor() {
-- 
cgit v1.2.3


From a48a6ad30e52f52793ba9b09271146f2553a656d Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Thu, 22 Jan 2015 13:06:02 +0100
Subject: BBVS: Implement loading and saving in the air guitar minigame

---
 engines/bbvs/minigames/bbairguitar.cpp | 113 ++++++++++++++++++++++++++++++++-
 engines/bbvs/minigames/bbairguitar.h   |  11 +++-
 2 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp
index 1984dbb0fd..6f198cb42a 100644
--- a/engines/bbvs/minigames/bbairguitar.cpp
+++ b/engines/bbvs/minigames/bbairguitar.cpp
@@ -22,6 +22,12 @@
 
 #include "bbvs/minigames/bbairguitar.h"
 
+#include "common/savefile.h"
+#include "common/translation.h"
+
+#include "gui/dialog.h"
+#include "gui/message.h"
+
 namespace Bbvs {
 
 static const char * const kNoteSoundFilenames[] = {
@@ -805,7 +811,7 @@ void MinigameBbAirGuitar::update() {
 	}
 
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
-		_gameDone = true;
+		_gameDone = querySaveModifiedTracks();
 		return;
 	}
 
@@ -925,7 +931,8 @@ void MinigameBbAirGuitar::afterButtonReleased() {
 			break;
 		case 4:
 			*_currFrameIndex = 1;
-			// TODO Run load dialog
+			loadTracks();
+			_objects[1].kind = 0;
 			break;
 		case 5:
 			_objects[3].kind = 0;
@@ -950,7 +957,8 @@ void MinigameBbAirGuitar::afterButtonReleased() {
 			break;
 		case 12:
 			*_currFrameIndex = 1;
-			// TODO Run save dialog
+			saveTracks();
+			_objects[2].kind = 0;
 			break;
 		case 13:
 			_objects[4].kind = 0;
@@ -1195,4 +1203,103 @@ void MinigameBbAirGuitar::stopNote(int noteNum) {
 		stopSound(2 + _currPatchNum * kNoteSoundFilenamesCount + noteNum);
 }
 
+bool MinigameBbAirGuitar::getLoadFilename(Common::String &filename) {
+	// TODO Run dialog and return actual filename
+	filename = "test.air";
+	return true;
+}
+
+bool MinigameBbAirGuitar::getSaveFilename(Common::String &filename) {
+	// TODO Run dialog and return actual filename
+	filename = "test.air";
+	return true;
+}
+
+bool MinigameBbAirGuitar::querySaveModifiedDialog() {
+	/* NOTE The original button captions don't fit so shortened variants are used
+		Original ok button caption: "Yeah, heh, heh, save it!"
+		Original discard button caption: "Who cares?  It sucked!"
+	*/
+	GUI::MessageDialog query(_("Hey Beavis - you didn't save that last Jam!"),
+		_("Save it!"),
+		_("It sucked!"));
+	return query.runModal() == GUI::kMessageOK;
+}
+
+bool MinigameBbAirGuitar::querySaveModifiedTracks() {
+	if (_modified && querySaveModifiedDialog()) {
+		if (!saveTracks())
+			return false;
+	}
+	return true;
+}
+
+bool MinigameBbAirGuitar::loadTracks() {
+	if (_playerMode != 0)
+		return false;
+
+	if (!querySaveModifiedTracks())
+		return false;
+	
+	Common::String filename;
+	if (!getLoadFilename(filename))
+		return false;
+
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::InSaveFile *stream = saveFileMan->openForLoading(filename);
+	if (!loadFromStream(stream)) {
+		Common::String msg = Common::String::format("%s is not a valid Air Guitar file", filename.c_str());
+		GUI::MessageDialog dialog(msg);
+		dialog.runModal();
+	}
+	delete stream;
+
+	return true;
+}
+
+bool MinigameBbAirGuitar::saveTracks() {
+	if (_playerMode != 0)
+		return false;
+
+	Common::String filename;
+	if (!getSaveFilename(filename))
+		return false;
+
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::OutSaveFile *stream = saveFileMan->openForSaving(filename);
+	saveToStream(stream);
+	delete stream;
+	_modified = false;
+
+	return true;
+}
+
+bool MinigameBbAirGuitar::loadFromStream(Common::ReadStream *stream) {
+	uint32 magic = stream->readUint32BE();
+	if (magic != MKTAG('A', 'I', 'R', 'G'))
+		return false;
+	for (uint i = 0; i < kMaxTracks; ++i) {
+		_track[i].noteNum = stream->readByte();
+		_track[i].ticks = stream->readUint16LE();
+	}
+	_trackCount = 0;
+	_actionTrackPos = 0;
+	while (_track[_trackCount].noteNum != -1) {
+		_actionTrackPos += _track[_trackCount].ticks;
+		++_trackCount;
+	}
+	_totalTrackLength = _actionTrackPos;
+	_trackIndex = 0;
+	_currTrackPos = 0;
+	return true;
+}
+
+void MinigameBbAirGuitar::saveToStream(Common::WriteStream *stream) {
+	stream->writeUint32BE(MKTAG('A', 'I', 'R', 'G'));
+	for (uint i = 0; i < kMaxTracks; ++i) {
+		stream->writeByte(_track[i].noteNum);
+		stream->writeUint16LE(_track[i].ticks);
+	}
+}
+
 } // End of namespace Bbvs
diff --git a/engines/bbvs/minigames/bbairguitar.h b/engines/bbvs/minigames/bbairguitar.h
index 40b8a50a03..b8b92ef433 100644
--- a/engines/bbvs/minigames/bbairguitar.h
+++ b/engines/bbvs/minigames/bbairguitar.h
@@ -47,7 +47,7 @@ public:
 
 	enum {
 		kMaxObjectsCount = 256,
-		kMaxTracks = 2049
+		kMaxTracks = 2048
 	};
 
 	struct PianoKeyInfo {
@@ -141,6 +141,15 @@ public:
 	void playNote(int noteNum);
 	void stopNote(int noteNum);
 
+	bool getLoadFilename(Common::String &filename);
+	bool getSaveFilename(Common::String &filename);
+	bool querySaveModifiedDialog();
+	bool querySaveModifiedTracks();
+	bool loadTracks();
+	bool saveTracks();
+	bool loadFromStream(Common::ReadStream *stream);
+	void saveToStream(Common::WriteStream *stream);
+
 };
 
 } // End of namespace Bbvs
-- 
cgit v1.2.3


From ebc5c55ce3d22f6e353bce07d1d797176a641208 Mon Sep 17 00:00:00 2001
From: Chris Apers
Date: Thu, 29 Jan 2015 12:47:23 +0100
Subject: MORTEVIELLE: fixed text position

Checked against french and german versions. “Your are alone” text isn’t
centred in original code.
---
 engines/mortevielle/utils.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 5fe47674c8..5137e1892b 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -707,11 +707,11 @@ void MortevielleEngine::displayAloneText() {
 	Common::String sAlone = getEngineString(S_ALONE);
 
 	clearUpperRightPart();
-	_screenSurface->putxy(580 - (_screenSurface->getStringWidth(sYou) / 2), 30);
+	_screenSurface->putxy(560, 30);
 	_screenSurface->drawString(sYou, 4);
-	_screenSurface->putxy(580 - (_screenSurface->getStringWidth(sAre) / 2), 50);
+	_screenSurface->putxy(560, 50);
 	_screenSurface->drawString(sAre, 4);
-	_screenSurface->putxy(580 - (_screenSurface->getStringWidth(sAlone) / 2), 70);
+	_screenSurface->putxy(560, 70);
 	_screenSurface->drawString(sAlone, 4);
 
 	_currBitIndex = 0;
@@ -1695,7 +1695,7 @@ void MortevielleEngine::clearUpperRightPart() {
 	else if (_coreVar._faithScore > 65)
 		st = getEngineString(S_MALSAINE);
 
-	int x1 = 580 - (_screenSurface->getStringWidth(st) / 2);
+	int x1 = 574 - (_screenSurface->getStringWidth(st) / 2);
 	_screenSurface->putxy(x1, 92);
 	_screenSurface->drawString(st, 4);
 
-- 
cgit v1.2.3


From c0b2d47f383984d7f36743b9b8b51fd23e34632a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Jan 2015 12:10:55 +0100
Subject: MADS: Add safeguards in DialogsNebular::show

---
 engines/mads/nebular/dialogs_nebular.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 74da378128..b3d3e0687d 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -91,6 +91,8 @@ bool DialogsNebular::show(int messageId, int objectId) {
 							dialog->incNumLines();
 						}
 					} else if (commandCheck("ASK", valStr, commandText)) {
+						if (!dialog)
+							error("DialogsNebular::show - Uninitialized dialog");
 						dialog->addInput();
 					} else if (commandCheck("VERB", valStr, commandText)) {
 						dialogText += getVocab(action._activeAction._verbId);
@@ -114,12 +116,18 @@ bool DialogsNebular::show(int messageId, int objectId) {
 					} else if (commandCheck("WIDTH", valStr, commandText)) {
 						_dialogWidth = atoi(valStr.c_str());
 					} else if (commandCheck("BAR", valStr, commandText)) {
+						if (!dialog)
+							error("DialogsNebular::show - Uninitialized dialog");
 						dialog->addBarLine();
 					} else if (commandCheck("UNDER", valStr, commandText)) {
 						underlineFlag = true;
 					} else if (commandCheck("DOWN", valStr, commandText)) {
+						if (!dialog)
+							error("DialogsNebular::show - Uninitialized dialog");
 						dialog->downPixelLine();
 					} else if (commandCheck("TAB", valStr, commandText)) {
+						if (!dialog)
+							error("DialogsNebular::show - Uninitialized dialog");
 						int xp = atoi(valStr.c_str());
 						dialog->setLineXp(xp);
 					}
@@ -164,6 +172,9 @@ bool DialogsNebular::show(int messageId, int objectId) {
 	if (!centerFlag)
 		dialog->incNumLines();
 
+	if (!dialog)
+		error("DialogsNebular::show - Uninitialized dialog");
+
 	// Show the dialog
 	_vm->_events->setCursor(CURSOR_ARROW);
 	dialog->show();
-- 
cgit v1.2.3


From 15a10d27449d039dc01a712f2ad4bb93f062db01 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Jan 2015 12:41:03 +0100
Subject: MADS: Remove a useless variable

---
 engines/mads/events.cpp | 3 +--
 engines/mads/events.h   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index de4dc3c070..e7ec8b0821 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -44,7 +44,6 @@ EventsManager::EventsManager(MADSEngine *vm) {
 	_vD2 = 0;
 	_mouseStatusCopy = 0;
 	_mouseMoved = false;
-	_vD8 = 0;
 	_rightMousePressed = false;
 	_eventTarget = nullptr;
 }
@@ -261,7 +260,7 @@ void EventsManager::waitForNextFrame() {
 void EventsManager::initVars() {
 	_mousePos = Common::Point(-1, -1);
 	_mouseStatusCopy = _mouseStatus;
-	_vD2 = _vD8 = 0;
+	_vD2 = 0;
 }
 
 } // End of namespace MADS
diff --git a/engines/mads/events.h b/engines/mads/events.h
index 54df337efd..870d6e03b8 100644
--- a/engines/mads/events.h
+++ b/engines/mads/events.h
@@ -70,7 +70,6 @@ public:
 	int _vD2;
 	int _mouseStatusCopy;
 	bool _mouseMoved;
-	int _vD8;
 	Common::Stack<Common::Event> _pendingKeys;
 public:
 	/**
-- 
cgit v1.2.3


From 1c8ecb41bde0bdaba132af3c6fc768813de6d26f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Jan 2015 12:41:46 +0100
Subject: MADS: Fix signed/unsigned comparison warning

---
 engines/mads/menu_views.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index 871c0d1d37..f39ea4c3b5 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -191,7 +191,7 @@ private:
 	int _manualFrame2;
 	int _animFrameNumber;
 	bool _nextCyclingActive;
-	int _scrollFrameCtr;
+	uint _scrollFrameCtr;
 private:
 	void load();
 
-- 
cgit v1.2.3


From 772cbc122d4cbfc06021facaa687921a138b98ab Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Jan 2015 12:42:36 +0100
Subject: MADS: Fix a bug in PaletteUsage::process, some renaming

---
 engines/mads/palette.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 836d04f7c0..95de307f8e 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -178,31 +178,29 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 		}
 
 		if (!changed && !noUsageFlag) {
-			int var2 = (palette[palIndex]._flags & 0x20) ||
-				(((flags & 0x2000) || (palette[palIndex]._flags & 0x4000)) &&
+			int bestHash = (palette[palIndex]._flags & 0x20) ||
+				(((flags & 0x2000) || (palette[palIndex]._flags & 0x40)) &&
 				((flags & 0x1000) || (palCount == 0))) ? 0x7fff : 1;
 			int var36 = (palette[palIndex]._flags & 0x80) ? 0 : 2;
 
 			for (int idx = palLow; idx < palIdx; ++idx) {
 				uint32 v = _vm->_palette->_palFlags[idx];
 				if ((v & var3A) && !(v & var36)) {
-					int var10;
-
-					if (var2 > 1) {
-						var10 = rgbFactor(&_vm->_palette->_mainPalette[idx * 3], palette[palIndex]);
-					}
-					else if (_vm->_palette->_mainPalette[idx * 3] != palette[palIndex].r ||
+					int hash;
+					if (bestHash > 1) {
+						hash = rgbFactor(&_vm->_palette->_mainPalette[idx * 3], palette[palIndex]);
+					} else if (_vm->_palette->_mainPalette[idx * 3] != palette[palIndex].r ||
 							_vm->_palette->_mainPalette[idx * 3 + 1] != palette[palIndex].g ||
 							_vm->_palette->_mainPalette[idx * 3 + 2] != palette[palIndex].b) {
-						var10 = 1;
+						hash = 1;
 					} else {
-						var10 = 0;
+						hash = 0;
 					}
 
-					if (var2 > var10) {
+					if (bestHash > hash) {
 						changed = true;
 						newPalIndex = idx;
-						var2 = var10;
+						bestHash = hash;
 					}
 				}
 			}
-- 
cgit v1.2.3


From 0fcd78391b584cee9ca6435d9ee5e88c339aa0cc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Jan 2015 12:53:35 +0100
Subject: MADS: Add a safeguard in doFrame

---
 engines/mads/menu_views.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index b492d98125..8f1fd2d7a5 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -550,7 +550,7 @@ void AnimationView::doFrame() {
 		scene._cyclingActive = _nextCyclingActive;
 	}
 
-	if (++_scrollFrameCtr >= _currentAnimation->_header._scrollTicks) {
+	if (_currentAnimation && (++_scrollFrameCtr >= _currentAnimation->_header._scrollTicks)) {
 		_scrollFrameCtr = 0;
 		scroll();
 	}
-- 
cgit v1.2.3


From 35c17d50663eeeecec5d14744149ac6004135a93 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Jan 2015 13:01:23 +0100
Subject: MADS: Janitorial - fix some else statements with braces on separate
 lines or extra tabs

---
 engines/mads/action.cpp                  |  3 +--
 engines/mads/nebular/dialogs_nebular.cpp |  3 +--
 engines/mads/nebular/game_nebular.cpp    |  2 +-
 engines/mads/nebular/nebular_scenes8.cpp |  3 +--
 engines/mads/palette.cpp                 | 10 +++-------
 engines/mads/sequence.cpp                |  3 +--
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index 199ae39000..628f03526f 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -567,9 +567,8 @@ void MADSAction::leftClick() {
 		switch (userInterface._category) {
 		case CAT_COMMAND:
 			if (_selectedRow >= 0) {
-				if (_verbType == VERB_ONLY) {
+				if (_verbType == VERB_ONLY)
 					_selectedAction = -1;
-				}
 				else {
 					_recentCommand = _selectedRow;
 					_recentCommandSource = _commandSource;
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index b3d3e0687d..05c2e4ba96 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -387,8 +387,7 @@ TextDialog(vm, FONT_INTERFACE, Common::Point(-1, -1), 32) {
 		addLine("ANSWER INCORRECT!", true);
 		wordWrap("\n");
 		addLine("(But we'll give you another chance!)");
-	}
-	else {
+	} else {
 		addLine("REX NEBULAR version 8.43", true);
 		wordWrap("\n");
 		addLine("(Copy Protection, for your convenience)");
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 8c0c00428a..965ef7fad2 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -454,7 +454,7 @@ void GameNebular::doObjectAction() {
 		dialogs.show(464);
 	} else if (action.isAction(VERB_REFLECT)) {
 		dialogs.show(466);
-	} 	else if (action.isAction(VERB_GAZE_INTO, NOUN_REARVIEW_MIRROR)) {
+	} else if (action.isAction(VERB_GAZE_INTO, NOUN_REARVIEW_MIRROR)) {
 		dialogs.show(467);
 	} else if (action.isAction(VERB_EAT, NOUN_CHICKEN_BOMB)) {
 		dialogs.show(469);
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 62a1a262b0..7e8366c179 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1129,8 +1129,7 @@ void Scene804::actions() {
 		} else {
 			_messWithThrottle = true;
 		}
-	}
-	else if (_action.isAction(VERB_APPLY, NOUN_POLYCEMENT, NOUN_CRACK) ||
+	} else if (_action.isAction(VERB_APPLY, NOUN_POLYCEMENT, NOUN_CRACK) ||
 		_action.isAction(VERB_PUT, NOUN_POLYCEMENT, NOUN_CRACK)) {
 		if (!_globals[kWindowFixed]) {
 			_resetFrame = 2;
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 95de307f8e..250eb75955 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -503,16 +503,12 @@ void Fader::fadeIn(byte palette[PALETTE_SIZE], byte destPalette[PALETTE_SIZE],
 		for (int colorCtr = 0; colorCtr < 3; ++colorCtr) {
 			if (_colorFlags[colorCtr]) {
 				int shiftSign = _colorValues[colorCtr];
-				if (shiftSign >= 0) {
+				if (shiftSign >= 0)
 					intensity = map[index]._intensity << shiftSign;
-				}
-				else {
+				else
 					intensity = map[index]._intensity >> abs(shiftSign);
-				}
-			}
-			else {
+			} else
 				intensity = _colorValues[colorCtr];
-			}
 
 			int diff = _rgb64Map[destPalette[palCtr * 3 + colorCtr]] - intensity;
 			palIndex[palCtr][colorCtr] = (byte)ABS(diff);
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index 05f00afb5a..c94f3e3ad4 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -526,8 +526,7 @@ void SequenceList::setMotion(int seqIndex, int flags, int deltaX, int deltaY) {
 
 	if (deltaY > 0) {
 		se._posSign.y = 1;
-	}
-	else if (deltaY < 0) {
+	} else if (deltaY < 0) {
 		se._posSign.y = -1;
 	} else {
 		se._posSign.y = 0;
-- 
cgit v1.2.3


From 76eadc75e27ae5cb64b2114835db0bfacd516768 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 31 Jan 2015 19:43:57 +0100
Subject: ZVISION: Add detection for Italian Zork Nemeis (bug #6786)

---
 engines/zvision/detection.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index b69eee000a..c817cbf3e9 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -111,6 +111,23 @@ static const ZVisionGameDescription gameDescriptions[] = {
 		GID_NEMESIS
 	},
 
+	{
+		// Zork Nemesis Italian version
+		{
+			"znemesis",
+			0,
+			{{"CSCR.ZFS", 0, "f04113357b4748c13efcb58b4629887c", 2577873},
+			 {"NEMESIS.STR", 0, "7c568feca8d9f9ae855c47183612c305", 9061},
+			 AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_ENABLE_VENUS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING)
+		},
+		GID_NEMESIS
+	},
+
 	{
 		// Zork Nemesis English demo version
 		{
-- 
cgit v1.2.3


From ed037a527cae1c90baca7ed3bdfae755088395d7 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 1 Feb 2015 10:35:23 +0100
Subject: COMMON: Add getRevTab to FFT

---
 common/fft.cpp | 4 ++++
 common/fft.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/common/fft.cpp b/common/fft.cpp
index ac7386083f..477f7aca62 100644
--- a/common/fft.cpp
+++ b/common/fft.cpp
@@ -61,6 +61,10 @@ FFT::~FFT() {
 	delete[] _tmpBuf;
 }
 
+const uint16 *FFT::getRevTab() const {
+	return _revTab;
+}
+
 void FFT::permute(Complex *z) {
 	int np = 1 << _bits;
 
diff --git a/common/fft.h b/common/fft.h
index 6eb72c3f84..ed66d32b71 100644
--- a/common/fft.h
+++ b/common/fft.h
@@ -47,6 +47,8 @@ public:
 	FFT(int bits, int inverse);
 	~FFT();
 
+	const uint16 *getRevTab() const;
+
 	/** Do the permutation needed BEFORE calling calc(). */
 	void permute(Complex *z);
 
-- 
cgit v1.2.3


From aa518306b8a82e22806cdb9820a6ac217a06c16f Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Sun, 1 Feb 2015 17:21:34 +0100
Subject: BBVS: Fix out-of-bounds array access in air guitar minigame as
 reported by Coverity

---
 engines/bbvs/minigames/bbairguitar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp
index 6f198cb42a..26e27a966f 100644
--- a/engines/bbvs/minigames/bbairguitar.cpp
+++ b/engines/bbvs/minigames/bbairguitar.cpp
@@ -1121,7 +1121,7 @@ void MinigameBbAirGuitar::noteOff(int noteNum) {
 		if (_actionTrackPos + _ticksDelta > 15000)
 			_ticksDelta = 15000 - _actionTrackPos;
 		_track[_trackCount].ticks = _ticksDelta;
-		if (_trackCount < 2048)
+		if (_trackCount + 1 < 2048)
 			++_trackCount;
 		_track[_trackCount].noteNum = -2;
 		_noteStartTime = _vm->_system->getMillis();
-- 
cgit v1.2.3


From bc2c1c6a3c11c10883e21dde1b68aafc9bf42620 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 2 Feb 2015 01:11:53 +0100
Subject: ZVISION: Remove \n from debug message

---
 engines/zvision/scripting/effects/music_effect.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
index ee2232d962..2e2084783d 100644
--- a/engines/zvision/scripting/effects/music_effect.cpp
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -111,7 +111,7 @@ MusicNode::~MusicNode() {
 		_engine->getScriptManager()->setStateValue(_key, 2);
 	if (_sub)
 		delete _sub;
-	debug(1, "MusicNode: %d destroyed\n", _key);
+	debug(1, "MusicNode: %d destroyed", _key);
 }
 
 void MusicNode::setDeltaVolume(uint8 volume) {
-- 
cgit v1.2.3


From 1adcb23d71a1f1ef6c4bc3b98fb474959fd14462 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 3 Feb 2015 04:15:11 +0200
Subject: ZVISION: Fix bug #6784 (wrong scaling in the fist control)

---
 engines/zvision/scripting/controls/fist_control.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp
index 4a8e8b1bbd..f79c82dc79 100644
--- a/engines/zvision/scripting/controls/fist_control.cpp
+++ b/engines/zvision/scripting/controls/fist_control.cpp
@@ -105,7 +105,12 @@ bool FistControl::process(uint32 deltaTimeInMillis) {
 		if (_animation->needsUpdate()) {
 			const Graphics::Surface *frameData = _animation->decodeNextFrame();
 			if (frameData)
-				_engine->getRenderManager()->blitSurfaceToBkgScaled(*frameData, _anmRect);
+				// WORKAROUND: Ignore the target frame dimensions for the finger animations.
+				// The target dimensions specify an area smaller than expected, thus if we
+				// scale the finger videos to fit these dimensions, they are not aligned
+				// correctly. Not scaling these videos yields a result identical to the
+				// original. Fixes bug #6784.
+				_engine->getRenderManager()->blitSurfaceToBkg(*frameData, _anmRect.left, _anmRect.top);
 		}
 	}
 
-- 
cgit v1.2.3


From f1c64c2afe7d9de5ea337d61b4443376e4685ab0 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 3 Feb 2015 08:49:26 +0000
Subject: SCUMM: Fix handling of string resources in smash player for Steam mac
 games

The Dig Steam/mac uses LF instead of CRLF for end of line.
This fixes display of subtitles in that version. This also fixes the crash
described in bug #6796.
---
 engines/scumm/smush/smush_player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 7617fc541f..2014462ab7 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -115,6 +115,10 @@ public:
 				if (data_end[-2] == '\r' && data_end[-1] == '\n' && data_end[0] == '\r' && data_end[1] == '\n') {
 					break;
 				}
+				// In Steam mac version LF is used instead of CR-LF
+				if (data_end[-2] == '\n' && data_end[-1] == '\n') {
+					break;
+				}
 				// In Russian Full Throttle strings are finished with
 				// just one pair of CR-LF
 				if (data_end[-2] == '\r' && data_end[-1] == '\n' && data_end[0] == '#') {
-- 
cgit v1.2.3


From 6c07f918c698ff23a917857434200e51179bc111 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 3 Feb 2015 12:31:30 +0200
Subject: ZVISION: Fix for script bug #6783 (no sound in the ZNem fist puzzle)

This is a bug in the original game script of the Zork Nemesis fist
puzzle, which we now patch so that the sound checks are correct for the
left fist animation
---
 engines/zvision/scripting/scr_file_handling.cpp | 26 +++++++++++++++++++++++--
 engines/zvision/scripting/script_manager.h      |  3 ++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index b047c14430..a9f3a55021 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -83,7 +83,7 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
 
 	while (!stream.eos() && !line.contains('}')) {
 		if (line.matchString("criteria {", true)) {
-			parseCriteria(stream, puzzle->criteriaList);
+			parseCriteria(stream, puzzle->criteriaList, puzzle->key);
 		} else if (line.matchString("results {", true)) {
 			parseResults(stream, puzzle->resultActions);
 		} else if (line.matchString("flags {", true)) {
@@ -97,7 +97,7 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
 	puzzle->addedBySetState = false;
 }
 
-bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList) const {
+bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList, uint32 key) const {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	trimCommentsAndWhiteSpace(&line);
@@ -117,6 +117,21 @@ bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::Li
 	// Create a new List to hold the CriteriaEntries
 	criteriaList.push_back(Common::List<Puzzle::CriteriaEntry>());
 
+	// WORKAROUND for a script bug in Zork: Nemesis, room td9e (fist puzzle)
+	// Since we patch the script that triggers when manipulating the left fist
+	// (below), we add an additional check for the left fist sound, so that it
+	// doesn't get killed immediately when the left fist animation starts.
+	// Together with the workaround below, it fixes bug #6783.
+	if (_engine->getGameId() == GID_NEMESIS && key == 3594) {
+		Puzzle::CriteriaEntry entry;
+		entry.key = 567;
+		entry.criteriaOperator = Puzzle::NOT_EQUAL_TO;
+		entry.argumentIsAKey = false;
+		entry.argument = 1;
+
+		criteriaList.back().push_back(entry);
+	}
+
 	while (!stream.eos() && !line.contains('}')) {
 		Puzzle::CriteriaEntry entry;
 
@@ -128,6 +143,13 @@ bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::Li
 		token = tokenizer.nextToken();
 		sscanf(token.c_str(), "[%u]", &(entry.key));
 
+		// WORKAROUND for a script bug in Zork: Nemesis, room td9e (fist puzzle)
+		// Check for the state of animation 567 (left fist) when manipulating
+		// the fingers of the left fist (puzzle slots 3582, 3583).
+		// Together with the workaround above, it fixes bug #6783.
+		if (_engine->getGameId() == GID_NEMESIS && (key == 3582 || key == 3583) && entry.key == 568)
+			entry.key = 567;
+
 		// Parse the operator out of the second token
 		token = tokenizer.nextToken();
 		if (token.c_str()[0] == '=')
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index 6d025bf2e9..d8e3721d43 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -312,9 +312,10 @@ private:
 	 *
 	 * @param criteria    Pointer to the Criteria object to fill
 	 * @param stream      Scr file stream
+	 * @param key         Puzzle key (for workarounds)
 	 * @return            Whether any criteria were read
 	 */
-	bool parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList) const;
+	bool parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList, uint32 key) const;
 
 	/**
 	 * Parses the stream into a ResultAction objects
-- 
cgit v1.2.3


From 666a4f3a57361e711a2854a4aa4fb5df19bc5569 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 3 Feb 2015 12:35:17 +0200
Subject: SCUMM: Adapt wording for the fix in commit f1c64c2afe

---
 engines/scumm/smush/smush_player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 2014462ab7..05c7ff2d9a 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -115,7 +115,8 @@ public:
 				if (data_end[-2] == '\r' && data_end[-1] == '\n' && data_end[0] == '\r' && data_end[1] == '\n') {
 					break;
 				}
-				// In Steam mac version LF is used instead of CR-LF
+				// In the Steam Mac version of The Dig, LF-LF is used
+				// instead of CR-LF
 				if (data_end[-2] == '\n' && data_end[-1] == '\n') {
 					break;
 				}
-- 
cgit v1.2.3


From 531029f54aa5381a72d5f08a2e31721932dcfaa0 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 5 Feb 2015 00:04:04 +0100
Subject: HUGO: Avoid drawing text above screen (bug #6799)

When drawing cursor text, don't draw it above the top of the screen,
since this would lead to memory corruption and crashes. I'm not quite
sure this is all of bug #6799 since it also mentioned that "sometimes
simply using a hotspot will be enough", but it's a start.
---
 engines/hugo/mouse.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/hugo/mouse.cpp b/engines/hugo/mouse.cpp
index 558a596b35..3674c90757 100644
--- a/engines/hugo/mouse.cpp
+++ b/engines/hugo/mouse.cpp
@@ -121,12 +121,24 @@ void MouseHandler::cursorText(const char *buffer, const int16 cx, const int16 cy
 	int16 sx, sy;
 	if (cx < kXPix / 2) {
 		sx = cx + kCursorNameOffX;
-		sy = (_vm->_inventory->getInventoryObjId() == -1) ? cy + kCursorNameOffY : cy + kCursorNameOffY - (_vm->_screen->fontHeight() + 1);
+		if (_vm->_inventory->getInventoryObjId() == -1) {
+			sy = cy + kCursorNameOffY;
+		} else {
+			sy = cy + kCursorNameOffY - (_vm->_screen->fontHeight() + 1);
+			if (sy < 0) {
+				sx = cx + kCursorNameOffX + 25;
+				sy = cy + kCursorNameOffY;
+			}
+		}
 	} else {
 		sx = cx - sdx - kCursorNameOffX / 2;
 		sy = cy + kCursorNameOffY;
 	}
 
+	if (sy < 0) {
+		sy = 0;
+	}
+
 	// Display the string and add rect to display list
 	_vm->_screen->shadowStr(sx, sy, buffer, _TBRIGHTWHITE);
 	_vm->_screen->displayList(kDisplayAdd, sx, sy, sdx, sdy);
-- 
cgit v1.2.3


From a0661328b94f0d452995da4f91318d0952ab8346 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 7 Feb 2015 21:55:24 +0100
Subject: SCUMM: Fix detection of the DoTT Maniac Mansion easter egg target

It's the key, not the gameid, that is the proper target name. In
my case, the key for that version of MM had the target name
"maniac-old" and gameid "maniac" (can you tell I've messed around
with this file a bit on my own?), so it tried to use "maniac" as
the target, which happened to be the target name for the enhanced
version instead.
---
 engines/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 7d927b0cda..99b4e695bb 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2612,7 +2612,7 @@ bool ScummEngine::startManiac() {
 			if (path.hasPrefix(currentPath)) {
 				path.erase(0, currentPath.size() + 1);
 				if (path.equalsIgnoreCase("maniac")) {
-					maniacTarget = dom.getVal("gameid");
+					maniacTarget = iter->_key;
 					break;
 				}
 			}
-- 
cgit v1.2.3


From b7b4e9cc5899eff0810d97a848ace0fa2ede5548 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 8 Feb 2015 10:13:18 +0100
Subject: ZVISION: Draw transparent text in original save dialog

Before this change, text was drawn in black boxes in Zork Nemesis,
so while this does make it look better (and more like the original)
this may actually make the text slightly harder to read. The
original dialogs allowed only upper-case letters, but I think that
it's better to leave that to the player.
---
 engines/zvision/scripting/controls/input_control.cpp | 12 +++++++++++-
 engines/zvision/scripting/controls/input_control.h   |  2 ++
 engines/zvision/text/text.cpp                        |  2 --
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 47da27fa08..b25aa13543 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -39,6 +39,7 @@ namespace ZVision {
 
 InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
 	: Control(engine, key, CONTROL_INPUT),
+	  _background(0),
 	  _nextTabstop(0),
 	  _focused(false),
 	  _textChanged(false),
@@ -111,6 +112,11 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	}
 }
 
+InputControl::~InputControl() {
+	_background->free();
+	delete _background;
+}
+
 bool InputControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
@@ -191,12 +197,16 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
 
+	if (!_background) {
+		_background = _engine->getRenderManager()->getBkgRect(_textRectangle);
+	}
+
 	// First see if we need to render the text
 	if (_textChanged) {
 		// Blit the text using the RenderManager
 
 		Graphics::Surface txt;
-		txt.create(_textRectangle.width(), _textRectangle.height(), _engine->_resourcePixelFormat);
+		txt.copyFrom(*_background);
 
 		if (!_readOnly || !_focused)
 			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringInit, txt);
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 99f7f5287d..e23ba0b9de 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -38,8 +38,10 @@ namespace ZVision {
 class InputControl : public Control {
 public:
 	InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream);
+	~InputControl();
 
 private:
+	Graphics::Surface *_background;
 	Common::Rect _textRectangle;
 	Common::Rect _headerRectangle;
 	cTxtStyle _stringInit;
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index e0501ae9c8..4af3b967f3 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -315,8 +315,6 @@ int32 TextRenderer::drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Gra
 	StyledTTFont font(_engine);
 	fontStyle.setFont(font);
 
-	dst.fillRect(Common::Rect(dst.w, dst.h), 0);
-
 	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(fontStyle._red, fontStyle._green, fontStyle._blue);
 
 	int16 w;
-- 
cgit v1.2.3


From 8725f2cff2357049a3759f24e3fa530c25644e25 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 8 Feb 2015 13:56:01 +0100
Subject: ZVISION: Limit input text to the width of the input control

This is to prevent the player from entering ridiculously long
savegame descriptions.
---
 engines/zvision/scripting/controls/input_control.cpp | 14 +++++++++++++-
 engines/zvision/scripting/controls/input_control.h   |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index b25aa13543..20c8e7ccbc 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -110,6 +110,10 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
 		getParams(line, param, values);
 	}
+
+	_maxTxtWidth = _textRectangle.width();
+	if (_animation)
+		_maxTxtWidth -= _animation->getWidth();
 }
 
 InputControl::~InputControl() {
@@ -208,12 +212,20 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 		Graphics::Surface txt;
 		txt.copyFrom(*_background);
 
+		int32 oldTxtWidth = _txtWidth;
+
 		if (!_readOnly || !_focused)
 			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringInit, txt);
 		else
 			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringChooserInit, txt);
 
-		_engine->getRenderManager()->blitSurfaceToBkg(txt, _textRectangle.left, _textRectangle.top);
+		if (_readOnly || _txtWidth <= _maxTxtWidth)
+			_engine->getRenderManager()->blitSurfaceToBkg(txt, _textRectangle.left, _textRectangle.top);
+		else {
+			// Assume the last character caused the overflow.
+			_currentInputText.deleteLastChar();
+			_txtWidth = oldTxtWidth;
+		}
 
 		txt.free();
 	}
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index e23ba0b9de..7f272e8d81 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -56,6 +56,7 @@ private:
 	bool _readOnly;
 
 	int16 _txtWidth;
+	int16 _maxTxtWidth;
 	Video::VideoDecoder *_animation;
 	int32 _frameDelay;
 	int16 _frame;
-- 
cgit v1.2.3


From cbbd1a92192ad118897f645f1aa6e968bff01466 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 8 Feb 2015 15:47:20 +0100
Subject: ZVISION: Set safe control state value after animation finishes

If we set it before the animation starts, the final turn of the
wheel won't be animated, because the puzzle will already be solved.
---
 engines/zvision/scripting/controls/safe_control.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index 6ba34106d0..4d2a91a1ad 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -123,6 +123,8 @@ bool SafeControl::process(uint32 deltaTimeInMillis) {
 			_animation->seekToFrame(_animation->getCurFrame() - 1);
 
 		const Graphics::Surface *frameData = _animation->decodeNextFrame();
+		if (_animation->getCurFrame() == _targetFrame)
+			_engine->getScriptManager()->setStateValue(_key, _curState);
 		if (frameData)
 			_engine->getRenderManager()->blitSurfaceToBkg(*frameData, _rectangle.left, _rectangle.top);
 	}
@@ -169,8 +171,6 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 			_curState = (_statesCount * 2 + tmp2) % _statesCount;
 
 			_targetFrame = (_curState + _statesCount - _startPointer) % _statesCount;
-
-			_engine->getScriptManager()->setStateValue(_key, _curState);
 			return true;
 		}
 	}
-- 
cgit v1.2.3


From 5e00b39caec66e1c5626a89f207c26c577fd30d8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Feb 2015 22:07:42 -0500
Subject: MADS: Implementing code for panning screen transitions

---
 engines/mads/msurface.cpp |  15 +++++-
 engines/mads/msurface.h   |   7 +++
 engines/mads/palette.cpp  |  26 ++++++++++
 engines/mads/palette.h    |   3 ++
 engines/mads/screen.cpp   | 122 +++++++++++++++++++++++++++++++++++++++++++++-
 engines/mads/screen.h     |  13 +++++
 6 files changed, 183 insertions(+), 3 deletions(-)

diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index 39824bac4b..d8d01f307c 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -485,7 +485,6 @@ void MSurface::scrollY(int yAmount) {
 	delete[] tempData;
 }
 
-
 void MSurface::translate(Common::Array<RGB6> &palette) {
 	for (int y = 0; y < this->h; ++y) {
 		byte *pDest = getBasePtr(0, y);
@@ -521,6 +520,20 @@ MSurface *MSurface::flipHorizontal() const {
 	return dest;
 }
 
+void MSurface::copyRectTranslate(MSurface &srcSurface, const byte *paletteMap,
+		const Common::Point &destPos, const Common::Rect &srcRect) {
+	// Loop through the lines
+	for (int yCtr = 0; yCtr < srcRect.height(); ++yCtr) {
+		const byte *srcP = srcSurface.getBasePtr(srcRect.left, srcRect.top + yCtr);
+		byte *destP = getBasePtr(destPos.x, destPos.y + yCtr);
+
+		// Copy the line over
+		for (int xCtr = 0; xCtr < srcRect.width(); ++xCtr, ++srcP, ++destP) {
+			*destP = paletteMap[*srcP];
+		}
+	}
+}
+
 /*------------------------------------------------------------------------*/
 
 int DepthSurface::getDepth(const Common::Point &pt) {
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index 650d7fdaee..754e70bf7f 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -220,6 +220,13 @@ public:
 	 * Create a new surface which is a flipped horizontal copy of the current one
 	 */
 	MSurface *flipHorizontal() const;
+
+	/**
+	 * Copy an area from one surface to another, translating it using a palette
+	 * map as it's done
+	 */
+	void copyRectTranslate(MSurface &srcSurface, const byte *paletteMap,
+		const Common::Point &destPos, const Common::Rect &srcRect);
 };
 
 class DepthSurface : public MSurface {
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 250eb75955..250c98b074 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -885,4 +885,30 @@ void Palette::refreshSceneColors() {
 	setPalette(_mainPalette + (val * 3), val, 256 - val);
 }
 
+int Palette::closestColor(const byte *matchColor, const byte *refPalette,
+		int listWrap, int count) {
+	int bestColor = 0;
+	int bestDifference = 0x7fff;
+
+	for (int idx = 0; idx < count; ++idx) {
+		// Figure out hash for color
+		int hash = 0;
+		for (int rgbIdx = 0; rgbIdx < 3; ++rgbIdx, ++refPalette) {
+			byte diff = *refPalette - matchColor[rgbIdx];
+			hash += (int)diff * (int)diff;
+		}
+
+		// If the given color is a closer match to our color, store the index
+		if (hash < bestDifference) {
+			bestDifference = hash;
+			bestColor = idx;
+		}
+
+		refPalette += listWrap - 3;
+	}
+
+	return bestColor;
+}
+
+
 } // End of namespace MADS
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 27d25f266b..1c387b4368 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -318,6 +318,9 @@ public:
 	void unlock();
 
 	void refreshSceneColors();
+
+	static int closestColor(const byte *matchColor, const byte *refPalette, 
+		int listWrap, int count);
 };
 
 } // End of namespace MADS
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 8552effd98..f7179877d5 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -607,6 +607,7 @@ void ScreenSurface::updateScreen() {
 
 void ScreenSurface::transition(ScreenTransition transitionType, bool surfaceFlag) {
 	Palette &pal = *_vm->_palette;
+	Scene &scene = _vm->_game->_scene;
 	byte palData[PALETTE_SIZE];
 
 	switch (transitionType) {
@@ -639,8 +640,9 @@ void ScreenSurface::transition(ScreenTransition transitionType, bool surfaceFlag
 
 	case kTransitionPanLeftToRight:
 	case kTransitionPanRightToLeft:
-		warning("TODO: pan transition");
-		transition(kTransitionFadeIn, surfaceFlag);
+		panTransition(scene._backgroundSurface, pal._mainPalette,
+			transitionType - kTransitionPanLeftToRight,
+			Common::Point(0, 0), scene._posAdjust, THROUGH_BLACK2, true, 1);
 		break;
 
 	case kTransitionCircleIn1:
@@ -674,5 +676,121 @@ void ScreenSurface::resetClipBounds() {
 	setClipBounds(Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
 }
 
+void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entrySide,
+		const Common::Point &srcPos, const Common::Point &destPos,
+		ThroughBlack throughBlack, bool setPalette, int numTicks) {
+	EventsManager &events = *_vm->_events;
+	Palette &palette = *_vm->_palette;
+	Common::Point size;
+	int y1, y2;
+	int startX = 0;
+	int deltaX;
+	int sizeY;
+	int xAt;
+	int loopStart;
+//	uint32 baseTicks, currentTicks;
+	byte paletteMap[256];
+
+	size.x = MIN(newScreen.w, (uint16)MADS_SCREEN_WIDTH);
+	size.y = newScreen.h;
+	if (newScreen.h >= MADS_SCREEN_HEIGHT)
+		size.y = MADS_SCENE_HEIGHT;
+
+	// Set starting position and direction delta for the transition
+	if (entrySide == 1)
+		// Right to left
+		startX = size.x - 1;
+	deltaX = startX ? -1 : 1;
+
+	if (setPalette & !throughBlack)
+		palette.setFullPalette(palData);
+
+	// TODO: Original uses a different frequency ticks counter. Need to
+	// confirm frequency and see whether we need to implement it, or
+	// if the current frame ticks can substitute for it
+//	baseTicks = events.getFrameCounter();
+
+	y1 = 0;
+	y2 = size.y - 1;
+	sizeY = y2 - y1 + 1;
+
+	if (throughBlack == THROUGH_BLACK2)
+		swapForeground(palData, &paletteMap[0]);
+
+	loopStart = throughBlack == THROUGH_BLACK1 ? 0 : 1;
+	for (int loop = loopStart; loop < 2; ++loop) {
+		xAt = startX;
+		for (int xCtr = 0; xCtr < size.x; ++xCtr, xAt += deltaX) {
+			if (!loop) {
+				fillRect(Common::Rect(xAt + destPos.x, y1 + destPos.y,
+					xAt + destPos.x + 1, y2 + destPos.y), 0);
+			} else if (throughBlack == THROUGH_BLACK2) {
+				copyRectTranslate(newScreen, paletteMap,
+					Common::Point(xAt, destPos.y),
+					Common::Rect(srcPos.x + xAt, srcPos.y,
+					srcPos.x + xAt + 1, srcPos.y + size.y));
+			} else {
+				newScreen.copyRectToSurface(*this, xAt, destPos.y,
+					Common::Rect(srcPos.x + xAt, srcPos.y, 
+					srcPos.x + xAt + 1, srcPos.y + size.y));
+			}
+
+			copyRectToScreen(Common::Rect(xAt, destPos.y, xAt + 1, destPos.y + size.y));
+
+			// Slight delay
+			events.delay(1);
+		}
+
+		if ((setPalette && !loop) || throughBlack == THROUGH_BLACK2)
+			palette.setFullPalette(palData);
+	}
+
+	if (throughBlack == THROUGH_BLACK2) {
+		Common::Rect r(srcPos.x, srcPos.y, srcPos.x + size.x, srcPos.y + size.y);
+		copyRectToSurface(newScreen, destPos.x, destPos.y, r);
+		copyRectToScreen(r);
+	}
+}
+
+void ScreenSurface::swapForeground(byte palData[PALETTE_SIZE], byte *paletteMap) {
+	Palette &palette = *_vm->_palette;
+	byte oldPalette[PALETTE_SIZE];
+	byte oldMap[256];
+	byte newMap[256];
+
+	palette.getFullPalette(oldPalette);
+	swapPalette(oldPalette, oldMap, true);
+	swapPalette(palData, newMap, false);
+
+	Common::copy(&palData[3], &palData[PALETTE_SIZE], &oldPalette[3]);
+
+	copyRectTranslate(*this, oldMap, Common::Point(0, 0), 
+		Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
+	palette.setFullPalette(oldPalette);
+}
+
+void ScreenSurface::swapPalette(byte *palData, byte swapTable[PALETTE_COUNT], 
+		int start) {
+	byte *dynamicList = &palData[start * 3];
+	int staticStart = 1 - start;
+	byte *staticList = &palData[staticStart * 3];
+	const int PALETTE_START = 1;
+	const int PALETTE_END = 252;
+
+	// Set initial index values
+	for (int idx = 0; idx < PALETTE_COUNT; ++idx)
+		swapTable[idx] = idx;
+
+	for (int idx = 0; idx < 128; ++idx) {
+		if (start >= PALETTE_START && start <= PALETTE_END) {
+			swapTable[start] = Palette::closestColor(dynamicList, staticList, 
+				6, 128) * 2 + staticStart;
+		}
+
+		dynamicList += 6;
+		start += 2;
+	}
+}
+
 
 } // End of namespace MADS
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index 6800523f92..35042e88d2 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -56,6 +56,11 @@ enum InputMode {
 	kInputLimitedSentences = 2		// Use only scene hotspots
 };
 
+enum ThroughBlack {
+	THROUGH_BLACK1 = 1,
+	THROUGH_BLACK2 = 2
+};
+
 class SpriteSlot;
 class TextDisplay;
 class UISlot;
@@ -207,6 +212,14 @@ private:
 	uint16 _random;
 	byte *_surfacePixels;
 	Common::Rect _clipBounds;
+
+	void panTransition(MSurface &newScreen, byte *palData, int entrySide,
+		const Common::Point &srcPos, const Common::Point &destPos,
+		ThroughBlack throughBlack, bool setPalette, int numTicks);
+
+	void swapForeground(byte *palData, byte *paletteMap);
+
+	void swapPalette(byte palData[PALETTE_SIZE], byte swapTable[PALETTE_COUNT], int start);
 public:
 	int _shakeCountdown;
 public:
-- 
cgit v1.2.3


From 55be1b82a84454ae838419e22ce15cade5298665 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Feb 2015 23:54:51 -0500
Subject: MADS: Variable renaming in closestColor

---
 engines/mads/palette.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 250c98b074..b41eaedfcc 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -888,19 +888,19 @@ void Palette::refreshSceneColors() {
 int Palette::closestColor(const byte *matchColor, const byte *refPalette,
 		int listWrap, int count) {
 	int bestColor = 0;
-	int bestDifference = 0x7fff;
+	int bestDistance = 0x7fff;
 
 	for (int idx = 0; idx < count; ++idx) {
 		// Figure out hash for color
-		int hash = 0;
+		int distance = 0;
 		for (int rgbIdx = 0; rgbIdx < 3; ++rgbIdx, ++refPalette) {
 			byte diff = *refPalette - matchColor[rgbIdx];
-			hash += (int)diff * (int)diff;
+			distance += (int)diff * (int)diff;
 		}
 
 		// If the given color is a closer match to our color, store the index
-		if (hash < bestDifference) {
-			bestDifference = hash;
+		if (distance < bestDistance) {
+			bestDistance = distance;
 			bestColor = idx;
 		}
 
-- 
cgit v1.2.3


From a851fa8e1aef50334402fec65bf89ee8b582ea62 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Wed, 11 Feb 2015 14:57:05 -0600
Subject: ZVISION: Refactor text rendering code in order to fix word wrapping

and clarify the logic. Fixes bug #6801
---
 engines/zvision/graphics/render_manager.cpp        |   2 +-
 .../zvision/scripting/controls/input_control.cpp   |   8 +-
 engines/zvision/scripting/controls/input_control.h |   4 +-
 .../zvision/scripting/controls/titler_control.cpp  |   2 +-
 .../zvision/scripting/effects/ttytext_effect.cpp   |  40 +-
 engines/zvision/scripting/effects/ttytext_effect.h |   2 +-
 engines/zvision/text/text.cpp                      | 425 +++++++++++----------
 engines/zvision/text/text.h                        |  52 ++-
 engines/zvision/text/truetype_font.cpp             |  60 ++-
 engines/zvision/text/truetype_font.h               |  14 +-
 10 files changed, 308 insertions(+), 301 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 3cd9701b7c..8758097c93 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -755,7 +755,7 @@ void RenderManager::processSubs(uint16 deltatime) {
 			if (sub->txt.size()) {
 				Graphics::Surface *rndr = new Graphics::Surface();
 				rndr->create(sub->r.width(), sub->r.height(), _engine->_resourcePixelFormat);
-				_engine->getTextRenderer()->drawTxtInOneLine(sub->txt, *rndr);
+				_engine->getTextRenderer()->drawTextWithWordWrapping(sub->txt, *rndr);
 				Common::Rect empty;
 				blitSurfaceToSurface(*rndr, empty, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
 				rndr->free();
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 20c8e7ccbc..df0c77ba96 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -79,13 +79,13 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 
 			sscanf(values.c_str(), "%u", &fontFormatNumber);
 
-			_stringInit.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
+			_stringInit.readAllStyles(_engine->getStringManager()->getTextLine(fontFormatNumber));
 		} else if (param.matchString("chooser_init_string", true)) {
 			uint fontFormatNumber;
 
 			sscanf(values.c_str(), "%u", &fontFormatNumber);
 
-			_stringChooserInit.readAllStyle(_engine->getStringManager()->getTextLine(fontFormatNumber));
+			_stringChooserInit.readAllStyles(_engine->getStringManager()->getTextLine(fontFormatNumber));
 		} else if (param.matchString("next_tabstop", true)) {
 			sscanf(values.c_str(), "%u", &_nextTabstop);
 		} else if (param.matchString("cursor_dimensions", true)) {
@@ -215,9 +215,9 @@ bool InputControl::process(uint32 deltaTimeInMillis) {
 		int32 oldTxtWidth = _txtWidth;
 
 		if (!_readOnly || !_focused)
-			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringInit, txt);
+			_txtWidth = _engine->getTextRenderer()->drawText(_currentInputText, _stringInit, txt);
 		else
-			_txtWidth = _engine->getTextRenderer()->drawTxt(_currentInputText, _stringChooserInit, txt);
+			_txtWidth = _engine->getTextRenderer()->drawText(_currentInputText, _stringChooserInit, txt);
 
 		if (_readOnly || _txtWidth <= _maxTxtWidth)
 			_engine->getRenderManager()->blitSurfaceToBkg(txt, _textRectangle.left, _textRectangle.top);
diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h
index 7f272e8d81..9b48514e16 100644
--- a/engines/zvision/scripting/controls/input_control.h
+++ b/engines/zvision/scripting/controls/input_control.h
@@ -44,8 +44,8 @@ private:
 	Graphics::Surface *_background;
 	Common::Rect _textRectangle;
 	Common::Rect _headerRectangle;
-	cTxtStyle _stringInit;
-	cTxtStyle _stringChooserInit;
+	TextStyleState _stringInit;
+	TextStyleState _stringChooserInit;
 	uint32 _nextTabstop;
 	bool _focused;
 
diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp
index 542e0a0b67..683d6660af 100644
--- a/engines/zvision/scripting/controls/titler_control.cpp
+++ b/engines/zvision/scripting/controls/titler_control.cpp
@@ -82,7 +82,7 @@ TitlerControl::~TitlerControl() {
 void TitlerControl::setString(int strLine) {
 	if (strLine != _curString && strLine >= 0 && strLine < (int)_strings.size()) {
 		_surface->fillRect(Common::Rect(_surface->w, _surface->h), 0);
-		_engine->getTextRenderer()->drawTxtInOneLine(_strings[strLine], *_surface);
+		_engine->getTextRenderer()->drawTextWithWordWrapping(_strings[strLine], *_surface);
 		_engine->getRenderManager()->blitSurfaceToBkg(*_surface, _rectangle.left, _rectangle.top);
 		_curString = strLine;
 	}
diff --git a/engines/zvision/scripting/effects/ttytext_effect.cpp b/engines/zvision/scripting/effects/ttytext_effect.cpp
index c60b3aa8c5..8d340dae39 100644
--- a/engines/zvision/scripting/effects/ttytext_effect.cpp
+++ b/engines/zvision/scripting/effects/ttytext_effect.cpp
@@ -57,9 +57,9 @@ ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file
 		delete infile;
 	}
 	_img.create(_r.width(), _r.height(), _engine->_resourcePixelFormat);
-	_style._sharp = true;
-	_style.readAllStyle(_txtbuf);
-	_style.setFont(_fnt);
+	_state._sharp = true;
+	_state.readAllStyles(_txtbuf);
+	_state.updateFontWithTextState(_fnt);
 	_engine->getScriptManager()->setStateValue(_key, 1);
 }
 
@@ -74,29 +74,27 @@ bool ttyTextNode::process(uint32 deltaTimeInMillis) {
 	if (_nexttime < 0) {
 		if (_txtpos < _txtbuf.size()) {
 			if (_txtbuf[_txtpos] == '<') {
-				int32 strt = _txtpos;
-				int32 endt = 0;
+				int32 start = _txtpos;
+				int32 end = 0;
 				int16 ret = 0;
 				while (_txtbuf[_txtpos] != '>' && _txtpos < _txtbuf.size())
 					_txtpos++;
-				endt = _txtpos;
-				if (strt != -1)
-					if ((endt - strt - 1) > 0)
-						ret = _style.parseStyle(_txtbuf.c_str() + strt + 1, endt - strt - 1);
-
-				if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
-					if (ret & TXT_RET_FNTCHG)
-						_style.setFont(_fnt);
-					if (ret & TXT_RET_FNTSTL)
-						_style.setFontStyle(_fnt);
-
-					if (ret & TXT_RET_NEWLN)
-						newline();
+				end = _txtpos;
+				if (start != -1) {
+					if ((end - start - 1) > 0) {
+						ret = _state.parseStyle(_txtbuf.c_str() + start + 1, end - start - 1);
+					}
+				}
+
+				if (ret & (TEXT_CHANGE_FONT_TYPE | TEXT_CHANGE_FONT_STYLE)) {
+					_state.updateFontWithTextState(_fnt);
+				} else if (ret & TEXT_CHANGE_NEWLINE) {
+					newline();
 				}
 
-				if (ret & TXT_RET_HASSTBOX) {
+				if (ret & TEXT_CHANGE_HAS_STATE_BOX) {
 					Common::String buf;
-					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_style._statebox));
+					buf = Common::String::format("%d", _engine->getScriptManager()->getStateValue(_state._statebox));
 
 					for (uint8 j = 0; j < buf.size(); j++)
 						outchar(buf[j]);
@@ -158,7 +156,7 @@ void ttyTextNode::newline() {
 }
 
 void ttyTextNode::outchar(uint16 chr) {
-	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(_style._red, _style._green, _style._blue);
+	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(_state._red, _state._green, _state._blue);
 
 	if (_dx + _fnt.getCharWidth(chr) > _r.width())
 		newline();
diff --git a/engines/zvision/scripting/effects/ttytext_effect.h b/engines/zvision/scripting/effects/ttytext_effect.h
index 8d8a2518c7..18cbbbaee3 100644
--- a/engines/zvision/scripting/effects/ttytext_effect.h
+++ b/engines/zvision/scripting/effects/ttytext_effect.h
@@ -51,7 +51,7 @@ public:
 private:
 	Common::Rect _r;
 
-	cTxtStyle _style;
+	TextStyleState _state;
 	StyledTTFont _fnt;
 	Common::String _txtbuf;
 	uint32 _txtpos;
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 4af3b967f3..868ee4f1ae 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -38,7 +38,7 @@
 
 namespace ZVision {
 
-cTxtStyle::cTxtStyle() {
+TextStyleState::TextStyleState() {
 	_fontname = "Arial";
 	_blue = 255;
 	_green = 255;
@@ -49,7 +49,7 @@ cTxtStyle::cTxtStyle() {
 	_escapement = 0;
 #endif
 	_italic = false;
-	_justify = TXT_JUSTIFY_LEFT;
+	_justification = TEXT_JUSTIFY_LEFT;
 	_size = 12;
 #if 0
 	_skipcolor = false;
@@ -60,10 +60,10 @@ cTxtStyle::cTxtStyle() {
 	_sharp = false;
 }
 
-txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
-	Common::String buf = Common::String(strin.c_str(), ln);
+TextChange TextStyleState::parseStyle(const Common::String &str, int16 len) {
+	Common::String buf = Common::String(str.c_str(), len);
 
-	int8 retval = TXT_RET_NOTHING;
+	uint retval = TEXT_CHANGE_NONE;
 
 	Common::StringTokenizer tokenizer(buf, " ");
 	Common::String token;
@@ -89,7 +89,7 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				if (!tokenizer.empty())
 					_fontname = token;
 			}
-			retval |= TXT_RET_FNTCHG;
+			retval |= TEXT_CHANGE_FONT_TYPE;
 
 		} else if (token.matchString("blue", true)) {
 			if (!tokenizer.empty()) {
@@ -97,7 +97,7 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				int32 tmp = atoi(token.c_str());
 				if (_blue != tmp) {
 					_blue = tmp;
-					retval |= TXT_RET_FNTSTL;
+					retval |= TEXT_CHANGE_FONT_STYLE;
 				}
 			}
 		} else if (token.matchString("red", true)) {
@@ -106,7 +106,7 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				int32 tmp = atoi(token.c_str());
 				if (_red != tmp) {
 					_red = tmp;
-					retval |= TXT_RET_FNTSTL;
+					retval |= TEXT_CHANGE_FONT_STYLE;
 				}
 			}
 		} else if (token.matchString("green", true)) {
@@ -115,7 +115,7 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				int32 tmp = atoi(token.c_str());
 				if (_green != tmp) {
 					_green = tmp;
-					retval |= TXT_RET_FNTSTL;
+					retval |= TEXT_CHANGE_FONT_STYLE;
 				}
 			}
 		} else if (token.matchString("newline", true)) {
@@ -125,14 +125,14 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 
 			_newline++;
 #endif
-			retval |= TXT_RET_NEWLN;
+			retval |= TEXT_CHANGE_NEWLINE;
 		} else if (token.matchString("point", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				int32 tmp = atoi(token.c_str());
 				if (_size != tmp) {
 					_size = tmp;
-					retval |= TXT_RET_FNTCHG;
+					retval |= TEXT_CHANGE_FONT_TYPE;
 				}
 			}
 		} else if (token.matchString("escapement", true)) {
@@ -149,12 +149,12 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				if (token.matchString("on", true)) {
 					if (_italic != true) {
 						_italic = true;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				} else if (token.matchString("off", true)) {
 					if (_italic != false) {
 						_italic = false;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				}
 			}
@@ -164,12 +164,12 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				if (token.matchString("on", true)) {
 					if (_underline != true) {
 						_underline = true;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				} else if (token.matchString("off", true)) {
 					if (_underline != false) {
 						_underline = false;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				}
 			}
@@ -179,12 +179,12 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				if (token.matchString("on", true)) {
 					if (_strikeout != true) {
 						_strikeout = true;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				} else if (token.matchString("off", true)) {
 					if (_strikeout != false) {
 						_strikeout = false;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				}
 			}
@@ -194,12 +194,12 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 				if (token.matchString("on", true)) {
 					if (_bold != true) {
 						_bold = true;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				} else if (token.matchString("off", true)) {
 					if (_bold != false) {
 						_bold = false;
-						retval |= TXT_RET_FNTSTL;
+						retval |= TEXT_CHANGE_FONT_STYLE;
 					}
 				}
 			}
@@ -220,24 +220,24 @@ txtReturn cTxtStyle::parseStyle(const Common::String &strin, int16 ln) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				_statebox = atoi(token.c_str());
-				retval |= TXT_RET_HASSTBOX;
+				retval |= TEXT_CHANGE_HAS_STATE_BOX;
 			}
 		} else if (token.matchString("justify", true)) {
 			if (!tokenizer.empty()) {
 				token = tokenizer.nextToken();
 				if (token.matchString("center", true))
-					_justify = TXT_JUSTIFY_CENTER;
+					_justification = TEXT_JUSTIFY_CENTER;
 				else if (token.matchString("left", true))
-					_justify = TXT_JUSTIFY_LEFT;
+					_justification = TEXT_JUSTIFY_LEFT;
 				else if (token.matchString("right", true))
-					_justify = TXT_JUSTIFY_RIGHT;
+					_justification = TEXT_JUSTIFY_RIGHT;
 			}
 		}
 	}
-	return (txtReturn)retval;
+	return (TextChange)retval;
 }
 
-void cTxtStyle::readAllStyle(const Common::String &txt) {
+void TextStyleState::readAllStyles(const Common::String &txt) {
 	int16 startTextPosition = -1;
 	int16 endTextPosition = -1;
 
@@ -246,243 +246,264 @@ void cTxtStyle::readAllStyle(const Common::String &txt) {
 			startTextPosition = i;
 		else if (txt[i] == '>') {
 			endTextPosition = i;
-			if (startTextPosition != -1)
-				if ((endTextPosition - startTextPosition - 1) > 0)
+			if (startTextPosition != -1) {
+				if ((endTextPosition - startTextPosition - 1) > 0) {
 					parseStyle(Common::String(txt.c_str() + startTextPosition + 1), endTextPosition - startTextPosition - 1);
+				}
+			}
 		}
 
 	}
 }
 
-void cTxtStyle::setFontStyle(StyledTTFont &font) {
+void TextStyleState::updateFontWithTextState(StyledTTFont &font) {
 	uint tempStyle = 0;
 
-	if (_bold)
-		tempStyle |= StyledTTFont::STTF_BOLD;
-
-	if (_italic)
-		tempStyle |= StyledTTFont::STTF_ITALIC;
-
-	if (_underline)
-		tempStyle |= StyledTTFont::STTF_UNDERLINE;
-
-	if (_strikeout)
-		tempStyle |= StyledTTFont::STTF_STRIKEOUT;
-
-	if (_sharp)
-		tempStyle |= StyledTTFont::STTF_SHARP;
+	if (_bold) {
+		tempStyle |= StyledTTFont::TTF_STYLE_BOLD;
+	}
+	if (_italic) {
+		tempStyle |= StyledTTFont::TTF_STYLE_ITALIC;
+	}
+	if (_underline) {
+		tempStyle |= StyledTTFont::TTF_STYLE_UNDERLINE;
+	}
+	if (_strikeout) {
+		tempStyle |= StyledTTFont::TTF_STYLE_STRIKETHROUGH;
+	}
+	if (_sharp) {
+		tempStyle |= StyledTTFont::TTF_STYLE_SHARP;
+	}
 
-	font.setStyle(tempStyle);
+	font.loadFont(_fontname, _size, tempStyle);
 }
 
-void cTxtStyle::setFont(StyledTTFont &font) {
-	uint tempStyle = 0;
-
-	if (_bold)
-		tempStyle |= StyledTTFont::STTF_BOLD;
+void TextRenderer::drawTextWithJustification(const Common::String &text, StyledTTFont &font, uint32 color, Graphics::Surface &dest, int lineY, TextJustification justify) {
+	if (justify == TEXT_JUSTIFY_LEFT)
+		font.drawString(&dest, text, 0, lineY, dest.w, color, Graphics::kTextAlignLeft);
+	else if (justify == TEXT_JUSTIFY_CENTER)
+		font.drawString(&dest, text, 0, lineY, dest.w, color, Graphics::kTextAlignCenter);
+	else if (justify == TEXT_JUSTIFY_RIGHT)
+		font.drawString(&dest, text, 0, lineY, dest.w, color, Graphics::kTextAlignRight);
+}
 
-	if (_italic)
-		tempStyle |= StyledTTFont::STTF_ITALIC;
+int32 TextRenderer::drawText(const Common::String &text, TextStyleState &state, Graphics::Surface &dest) {
+	StyledTTFont font(_engine);
+	state.updateFontWithTextState(font);
 
-	if (_underline)
-		tempStyle |= StyledTTFont::STTF_UNDERLINE;
+	uint32 color = _engine->_resourcePixelFormat.RGBToColor(state._red, state._green, state._blue);
+	drawTextWithJustification(text, font, color, dest, 0, state._justification);
 
-	if (_strikeout)
-		tempStyle |= StyledTTFont::STTF_STRIKEOUT;
+	return font.getStringWidth(text);
+}
 
-	if (_sharp)
-		tempStyle |= StyledTTFont::STTF_SHARP;
+struct TextSurface {
+	TextSurface(Graphics::Surface *surface, Common::Point surfaceOffset, uint lineNumber)
+		: _surface(surface),
+		  _surfaceOffset(surfaceOffset),
+		  _lineNumber(lineNumber) {
+	}
 
-	font.loadFont(_fontname, _size, tempStyle);
-}
+	Graphics::Surface *_surface;
+	Common::Point _surfaceOffset;
+	uint _lineNumber;
+};
 
-Graphics::Surface *TextRenderer::render(StyledTTFont &fnt, const Common::String &txt, cTxtStyle &style) {
-	style.setFontStyle(fnt);
-	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(style._red, style._green, style._blue);
-	return fnt.renderSolidText(txt, clr);
-}
+void TextRenderer::drawTextWithWordWrapping(const Common::String &text, Graphics::Surface &dest) {
+	Common::Array<TextSurface> textSurfaces;
+	Common::Array<uint> lineWidths;
+	Common::Array<TextJustification> lineJustifications;
 
-void TextRenderer::drawTxtWithJustify(const Common::String &txt, StyledTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify) {
-	if (justify == TXT_JUSTIFY_LEFT)
-		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignLeft);
-	else if (justify == TXT_JUSTIFY_CENTER)
-		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignCenter);
-	else if (justify == TXT_JUSTIFY_RIGHT)
-		fnt.drawString(&dst, txt, 0, lineY, dst.w, color, Graphics::kTextAlignRight);
-}
+	// Create the initial text state
+	TextStyleState currentState;
 
-int32 TextRenderer::drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Graphics::Surface &dst) {
+	// Create an empty font and bind it to the state
 	StyledTTFont font(_engine);
-	fontStyle.setFont(font);
+	currentState.updateFontWithTextState(font);
 
-	uint32 clr = _engine->_resourcePixelFormat.RGBToColor(fontStyle._red, fontStyle._green, fontStyle._blue);
+	Common::String currentSentence; // Not a true 'grammatical' sentence. Rather, it's just a collection of words
+	Common::String currentWord;
+	int sentenceWidth = 0;
+	int wordWidth = 0;
+	int lineWidth = 0;
+	int lineHeight = font.getFontHeight();
 
-	int16 w;
+	uint currentLineNumber = 0u;
 
-	w = font.getStringWidth(txt);
+	uint numSpaces = 0u;
+	int spaceWidth = 0;
 
-	drawTxtWithJustify(txt, font, clr, dst, 0, fontStyle._justify);
+	// The pixel offset to the currentSentence
+	Common::Point sentencePixelOffset;
 
-	return w;
-}
+	uint i = 0u;
+	uint stringlen = text.size();
 
-void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surface &dst) {
-	const int16 TXT_CFG_TEXTURES_LINES = 256; // For now I don't want remake it
-	const int TXT_CFG_TEXTURES_PER_LINE = 6;
-	cTxtStyle style, style2;
-	int16 startTextPosition = -1;
-	int16 endTextPosition = -1;
-	int16 i = 0;
-	int16 dx = 0, dy = 0;
-	int16 textPixelWidth;
-	int16 textPosition = 0;
-	Common::String buf;
-	Common::String buf2;
-
-	Graphics::Surface *TxtSurfaces[TXT_CFG_TEXTURES_LINES][TXT_CFG_TEXTURES_PER_LINE];
-	int16 currentline = 0, currentlineitm = 0;
-
-	int TxtJustify[TXT_CFG_TEXTURES_LINES];
-	int TxtPoint[TXT_CFG_TEXTURES_LINES];
-
-	for (int16 k = 0; k < TXT_CFG_TEXTURES_LINES; k++) {
-		TxtPoint[k] = 0;
-		for (int j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
-			TxtSurfaces[k][j] = NULL;
-	}
-
-	int16 stringlen = text.size();
+	while (i < stringlen) {
+		if (text[i] == '<') {
+			// Flush the currentWord to the currentSentence			
+			currentSentence += currentWord;
+			sentenceWidth += wordWidth;
+
+			// Reset the word variables
+			currentWord.clear();
+			wordWidth = 0;
+			
+			// Parse the style tag
+			uint startTextPosition = i;
+			while (i < stringlen && text[i] != '>') {
+				++i;
+			}
+			uint endTextPosition = i;
 
-	StyledTTFont font(_engine);
+			uint32 textColor = currentState.getTextColor(_engine);
 
-	style.setFont(font);
+			uint stateChanges = 0u;
+			if ((endTextPosition - startTextPosition - 1) > 0) {
+				stateChanges = currentState.parseStyle(Common::String(text.c_str() + startTextPosition + 1), endTextPosition - startTextPosition - 1);
+			}
 
-	int16 prevbufspace = 0, prevtxtspace = 0;
+			if (stateChanges & (TEXT_CHANGE_FONT_TYPE | TEXT_CHANGE_FONT_STYLE)) {
+				// Use the last state to render out the current sentence
+				// Styles apply to the text 'after' them
+				if (!currentSentence.empty()) {
+					textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, textColor), sentencePixelOffset, currentLineNumber));
 
-	while (i < stringlen) {
-		TxtJustify[currentline] = style._justify;
-		if (text[i] == '<') {
-			int16 ret = 0;
+					lineWidth += sentenceWidth;
+					sentencePixelOffset.x += sentenceWidth;
 
-			startTextPosition = i;
-			while (i < stringlen && text[i] != '>')
-				i++;
-			endTextPosition = i;
-			if (startTextPosition != -1)
-				if ((endTextPosition - startTextPosition - 1) > 0) {
-					style2 = style;
-					ret = style.parseStyle(Common::String(text.c_str() + startTextPosition + 1), endTextPosition - startTextPosition - 1);
+					// Reset the sentence variables
+					currentSentence.clear();
+					sentenceWidth = 0;
 				}
 
-			if (ret & (TXT_RET_FNTCHG | TXT_RET_FNTSTL | TXT_RET_NEWLN)) {
-				if (buf.size() > 0) {
-					textPixelWidth = font.getStringWidth(buf);
+				// Update the current state with the style information
+				currentState.updateFontWithTextState(font);
+
+				lineHeight = MAX(lineHeight, font.getFontHeight());
+				spaceWidth = font.getCharWidth(' ');
+			}
+			if (stateChanges & TEXT_CHANGE_NEWLINE) {
+				// If the current sentence has content, render it out
+				if (!currentSentence.empty()) {
+					textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, textColor), sentencePixelOffset, currentLineNumber));
+				}
+				
+				// Set line width
+				lineWidths.push_back(lineWidth + sentenceWidth - (numSpaces * spaceWidth));
+
+				currentSentence.clear();
+				sentenceWidth = 0;
+				
+				// Update the offsets
+				sentencePixelOffset.x = 0u;
+				sentencePixelOffset.y += lineHeight;
+
+				// Reset the line variables
+				lineHeight = font.getFontHeight();
+				lineWidth = 0;
+				++currentLineNumber;
+				lineJustifications.push_back(currentState._justification);
+			}
+			if (stateChanges & TEXT_CHANGE_HAS_STATE_BOX) {
+				Common::String temp = Common::String::format("%d", _engine->getScriptManager()->getStateValue(currentState._statebox));
+				wordWidth += font.getStringWidth(temp);
 
-					TxtSurfaces[currentline][currentlineitm] = render(font, buf, style2);
-					TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+				// If the word causes the line to overflow, render the sentence and start a new line
+				if (lineWidth + sentenceWidth + wordWidth > dest.w) {
+					textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, textColor), sentencePixelOffset, currentLineNumber));
 
-					currentlineitm++;
+					// Set line width
+					lineWidths.push_back(lineWidth + sentenceWidth - (numSpaces * spaceWidth));
 
-					buf.clear();
-					prevbufspace = 0;
-					textPosition = 0;
-					dx += textPixelWidth;
+					currentSentence.clear();
+					sentenceWidth = 0;
 
-				}
-				if (ret & TXT_RET_FNTCHG) {
-					style.setFont(font);
-				}
-				if (ret & TXT_RET_FNTSTL)
-					style.setFontStyle(font);
+					// Update the offsets
+					sentencePixelOffset.x = 0u;
+					sentencePixelOffset.y += lineHeight;
 
-				if (ret & TXT_RET_NEWLN) {
-					currentline++;
-					currentlineitm = 0;
-					dx = 0;
+					// Reset the line variables
+					lineHeight = font.getFontHeight();
+					lineWidth = 0;
+					++currentLineNumber;
+					lineJustifications.push_back(currentState._justification);
 				}
 			}
-
-			if (ret & TXT_RET_HASSTBOX) {
-				Common::String buf3;
-				buf3 = Common::String::format("%d", _engine->getScriptManager()->getStateValue(style._statebox));
-				buf += buf3;
-				textPosition += buf3.size();
-			}
-
 		} else {
-
-			buf += text[i];
-			textPosition++;
+			currentWord += text[i];
+			wordWidth += font.getCharWidth(text[i]);
 
 			if (text[i] == ' ') {
-				prevbufspace = textPosition - 1;
-				prevtxtspace = i;
-			}
+				// When we hit the first space, flush the current word to the sentence
+				if (!currentWord.empty()) {
+					currentSentence += currentWord;
+					sentenceWidth += wordWidth;
 
-			if (font.isLoaded()) {
-				textPixelWidth = font.getStringWidth(buf);
-				if (textPixelWidth + dx > dst.w) {
-					if (prevbufspace == 0) {
-						prevtxtspace = i;
-						prevbufspace = textPosition - 1;
-					}
-					buf2 = Common::String(buf.c_str(), prevbufspace + 1);
+					currentWord.clear();
+					wordWidth = 0;
+				}
 
-					if (buf2.size() > 0) {
-						TxtSurfaces[currentline][currentlineitm] = render(font, buf2, style);
-						TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+				// We track the number of spaces so we can disregard their width in lineWidth calculations
+				++numSpaces;
+			} else {			
+				// If the word causes the line to overflow, render the sentence and start a new line
+				if (lineWidth + sentenceWidth + wordWidth > dest.w) {
+					// Only render out content
+					if (!currentSentence.empty()) {
+						textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, currentState.getTextColor(_engine)), sentencePixelOffset, currentLineNumber));
 					}
 
-					buf.clear();
-					i = prevtxtspace;
-					prevbufspace = 0;
-					textPosition = 0;
-					currentline++;
-					currentlineitm = 0;
-					dx = 0;
+					// Set line width
+					lineWidths.push_back(lineWidth + sentenceWidth - (numSpaces * spaceWidth));
+
+					currentSentence.clear();
+					sentenceWidth = 0;
+
+					// Update the offsets
+					sentencePixelOffset.x = 0u;
+					sentencePixelOffset.y += lineHeight;
+
+					// Reset the line variables
+					lineHeight = font.getFontHeight();
+					lineWidth = 0;
+					++currentLineNumber;
+					lineJustifications.push_back(currentState._justification);
 				}
+
+				numSpaces = 0u;
 			}
 		}
+
 		i++;
 	}
 
-	if (buf.size() > 0) {
-		TxtSurfaces[currentline][currentlineitm] = render(font, buf, style);
-		TxtPoint[currentline] = MAX(font.getFontHeight(), TxtPoint[currentline]);
+	// Render out any remaining words/sentences
+	if (!currentWord.empty() || !currentSentence.empty()) {
+		currentSentence += currentWord;
+		sentenceWidth += wordWidth;
+		
+		textSurfaces.push_back(TextSurface(font.renderSolidText(currentSentence, currentState.getTextColor(_engine)), sentencePixelOffset, currentLineNumber));
 	}
 
-	dy = 0;
-	for (i = 0; i <= currentline; i++) {
-		int16 j = 0;
-		int16 width = 0;
-		while (TxtSurfaces[i][j] != NULL) {
-			width += TxtSurfaces[i][j]->w;
-			j++;
-		}
-		dx = 0;
-		Common::Rect empty;
-		for (int32 jj = 0; jj < j; jj++) {
-			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], empty, dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
-
-			else if (TxtJustify[i] == TXT_JUSTIFY_CENTER)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], empty, dst, ((dst.w - width) / 2) + dx,  dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+	lineWidths.push_back(lineWidth + sentenceWidth);
+	lineJustifications.push_back(currentState._justification);
 
-			else if (TxtJustify[i] == TXT_JUSTIFY_RIGHT)
-				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], empty, dst, dst.w - width + dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
+	for (Common::Array<TextSurface>::iterator iter = textSurfaces.begin(); iter != textSurfaces.end(); ++iter) {
+		Common::Rect empty;
 
-			dx += TxtSurfaces[i][jj]->w;
+		if (lineJustifications[iter->_lineNumber] == TEXT_JUSTIFY_LEFT) {
+			_engine->getRenderManager()->blitSurfaceToSurface(*iter->_surface, empty, dest, iter->_surfaceOffset.x, iter->_surfaceOffset.y, 0);
+		} else if (lineJustifications[iter->_lineNumber] == TEXT_JUSTIFY_CENTER) {
+			_engine->getRenderManager()->blitSurfaceToSurface(*iter->_surface, empty, dest, ((dest.w - lineWidths[iter->_lineNumber]) / 2) + iter->_surfaceOffset.x, iter->_surfaceOffset.y, 0);
+		} else if (lineJustifications[iter->_lineNumber] == TEXT_JUSTIFY_RIGHT) {
+			_engine->getRenderManager()->blitSurfaceToSurface(*iter->_surface, empty, dest, dest.w - lineWidths[iter->_lineNumber]  + iter->_surfaceOffset.x, iter->_surfaceOffset.y, 0);
 		}
 
-		dy += TxtPoint[i];
+		// Release memory
+		iter->_surface->free();
+		delete iter->_surface;
 	}
-
-	for (i = 0; i < TXT_CFG_TEXTURES_LINES; i++)
-		for (int32 j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
-			if (TxtSurfaces[i][j] != NULL) {
-				TxtSurfaces[i][j]->free();
-				delete TxtSurfaces[i][j];
-			}
 }
 
 Common::String readWideLine(Common::SeekableReadStream &stream) {
diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h
index c942b8141a..d35b90499d 100644
--- a/engines/zvision/text/text.h
+++ b/engines/zvision/text/text.h
@@ -32,59 +32,53 @@ namespace ZVision {
 
 class ZVision;
 
-enum txtJustify {
-	TXT_JUSTIFY_CENTER = 0,
-	TXT_JUSTIFY_LEFT = 1,
-	TXT_JUSTIFY_RIGHT = 2
+enum TextJustification {
+	TEXT_JUSTIFY_CENTER = 0,
+	TEXT_JUSTIFY_LEFT = 1,
+	TEXT_JUSTIFY_RIGHT = 2
 };
 
-enum txtReturn {
-	TXT_RET_NOTHING = 0x0,
-	TXT_RET_FNTCHG = 0x1,
-	TXT_RET_FNTSTL = 0x2,
-	TXT_RET_NEWLN = 0x4,
-	TXT_RET_HASSTBOX = 0x8
+enum TextChange {
+	TEXT_CHANGE_NONE = 0x0,
+	TEXT_CHANGE_FONT_TYPE = 0x1,
+	TEXT_CHANGE_FONT_STYLE = 0x2,
+	TEXT_CHANGE_NEWLINE = 0x4,
+	TEXT_CHANGE_HAS_STATE_BOX = 0x8
 };
 
-class cTxtStyle {
+class TextStyleState {
 public:
-	cTxtStyle();
-	txtReturn parseStyle(const Common::String &strin, int16 len);
-	void readAllStyle(const Common::String &txt);
-	void setFontStyle(StyledTTFont &font);
-	void setFont(StyledTTFont &font);
+	TextStyleState();
+	TextChange parseStyle(const Common::String &str, int16 len);
+	void readAllStyles(const Common::String &txt);
+	void updateFontWithTextState(StyledTTFont &font);
+
+	uint32 getTextColor(ZVision *engine) {
+		return engine->_resourcePixelFormat.RGBToColor(_red, _green, _blue);
+	}
 
 public:
 	Common::String _fontname;
-	txtJustify _justify;  // 0 - center, 1-left, 2-right
+	TextJustification _justification;  // 0 - center, 1-left, 2-right
 	int16 _size;
 	uint8 _red;     // 0-255
 	uint8 _green;   // 0-255
 	uint8 _blue;    // 0-255
-#if  0
-	int8 _newline;
-	int8 _escapement;
-#endif
 	bool _italic;
 	bool _bold;
 	bool _underline;
 	bool _strikeout;
-#if 0
-	bool _skipcolor;
-#endif
 	int32 _statebox;
 	bool _sharp;
-	// char image ??
 };
 
 class TextRenderer {
 public:
 	TextRenderer(ZVision *engine): _engine(engine) {};
 
-	void drawTxtWithJustify(const Common::String &txt, StyledTTFont &fnt, uint32 color, Graphics::Surface &dst, int lineY, txtJustify justify);
-	int32 drawTxt(const Common::String &txt, cTxtStyle &fontStyle, Graphics::Surface &dst);
-	Graphics::Surface *render(StyledTTFont &fnt, const Common::String &txt, cTxtStyle &style);
-	void drawTxtInOneLine(const Common::String &txt, Graphics::Surface &dst);
+	void drawTextWithJustification(const Common::String &text, StyledTTFont &font, uint32 color, Graphics::Surface &dest, int lineY, TextJustification jusification);
+	int32 drawText(const Common::String &text, TextStyleState &state, Graphics::Surface &dest);
+	void drawTextWithWordWrapping(const Common::String &text, Graphics::Surface &dest);
 
 private:
 	ZVision *_engine;
diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index f7580fb553..8e402efc08 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -56,21 +56,23 @@ const FontStyle getSystemFont(int fontIndex) {
 StyledTTFont::StyledTTFont(ZVision *engine) {
 	_engine = engine;
 	_style = 0;
-	_font = NULL;
+	_font = nullptr;
 	_lineHeight = 0;
 }
 
 StyledTTFont::~StyledTTFont() {
-	if (_font)
-		delete _font;
+	delete _font;
 }
 
 bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
 	_style = style;
-	return loadFont(fontName, point);
-}
 
-bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
+	// Don't re-load the font if we've already loaded it
+	// We have to check for empty so we can default to Arial 
+	if (!fontName.empty() && _fontName.equalsIgnoreCase(fontName)) {
+		return true;
+	}
+
 	Common::String newFontName;
 	Common::String freeFontName;
 	Common::String liberationFontName;
@@ -82,16 +84,16 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 			freeFontName = curFont.freeFontBase;
 			liberationFontName = curFont.liberationFontBase;
 
-			if ((_style & STTF_BOLD) && (_style & STTF_ITALIC)) {
+			if ((_style & TTF_STYLE_BOLD) && (_style & TTF_STYLE_ITALIC)) {
 				newFontName += "bi";
 				freeFontName += "Bold";
 				freeFontName += curFont.freeFontItalicName;
 				liberationFontName += "-BoldItalic";
-			} else if (_style & STTF_BOLD) {
+			} else if (_style & TTF_STYLE_BOLD) {
 				newFontName += "bd";
 				freeFontName += "Bold";
 				liberationFontName += "-Bold";
-			} else if (_style & STTF_ITALIC) {
+			} else if (_style & TTF_STYLE_ITALIC) {
 				newFontName += "i";
 				freeFontName += curFont.freeFontItalicName;
 				liberationFontName += "-Italic";
@@ -113,7 +115,7 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 		liberationFontName = "LiberationSans-Regular.ttf";
 	}
 
-	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
+	bool sharp = (_style & TTF_STYLE_SHARP) == TTF_STYLE_SHARP;
 
 	Common::File file;
 	if (!file.open(newFontName) && !_engine->getSearchManager()->openFile(file, newFontName) &&
@@ -121,51 +123,45 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 		!file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
 		error("Unable to open font file %s (Liberation Font alternative: %s, FreeFont alternative: %s)", newFontName.c_str(), liberationFontName.c_str(), freeFontName.c_str());
 
-	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
-	if (_newFont) {
-		if (!_font)
-			delete _font;
-		_font = _newFont;
+	Graphics::Font *newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display
+	if (newFont == nullptr) {
+		return false;
 	}
 
-	_fntName = fontName;
-	_lineHeight = point;
+	delete _font;
+	_font = newFont;
 
-	if (_font)
-		return true;
-	return false;
-}
+	_fontName = fontName;
+	_lineHeight = point;
 
-void StyledTTFont::setStyle(uint newStyle) {
-	if ((_style & (STTF_BOLD | STTF_ITALIC | STTF_SHARP)) != (newStyle & (STTF_BOLD | STTF_ITALIC | STTF_SHARP))) {
-		_style = newStyle;
-		loadFont(_fntName, _lineHeight);
-	} else {
-		_style = newStyle;
-	}
+	return true;
 }
 
 int StyledTTFont::getFontHeight() {
 	if (_font)
 		return _font->getFontHeight();
+
 	return 0;
 }
 
 int StyledTTFont::getMaxCharWidth() {
 	if (_font)
 		return _font->getMaxCharWidth();
+
 	return 0;
 }
 
 int StyledTTFont::getCharWidth(byte chr) {
 	if (_font)
 		return _font->getCharWidth(chr);
+
 	return 0;
 }
 
 int StyledTTFont::getKerningOffset(byte left, byte right) {
 	if (_font)
 		return _font->getKerningOffset(left, right);
+
 	return 0;
 }
 
@@ -202,12 +198,12 @@ Common::U32String StyledTTFont::convertUtf8ToUtf32(const Common::String &str) {
 void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint32 color) {
 	if (_font) {
 		_font->drawChar(dst, chr, x, y, color);
-		if (_style & STTF_UNDERLINE) {
+		if (_style & TTF_STYLE_UNDERLINE) {
 			int16 pos = floor(_font->getFontHeight() * 0.87);
 			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
 			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
 		}
-		if (_style & STTF_STRIKEOUT) {
+		if (_style & TTF_STYLE_STRIKETHROUGH) {
 			int16 pos = floor(_font->getFontHeight() * 0.60);
 			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
 			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
@@ -219,7 +215,7 @@ void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str,
 	if (_font) {
 		Common::U32String u32str = convertUtf8ToUtf32(str);
 		_font->drawString(dst, u32str, x, y, w, color, align);
-		if (_style & STTF_UNDERLINE) {
+		if (_style & TTF_STYLE_UNDERLINE) {
 			int16 pos = floor(_font->getFontHeight() * 0.87);
 			int16 wd = MIN(_font->getStringWidth(u32str), w);
 			int16 stX = x;
@@ -232,7 +228,7 @@ void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str,
 
 			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
 		}
-		if (_style & STTF_STRIKEOUT) {
+		if (_style & TTF_STYLE_STRIKETHROUGH) {
 			int16 pos = floor(_font->getFontHeight() * 0.60);
 			int16 wd = MIN(_font->getStringWidth(u32str), w);
 			int16 stX = x;
diff --git a/engines/zvision/text/truetype_font.h b/engines/zvision/text/truetype_font.h
index caa9c09a76..6abe05cda6 100644
--- a/engines/zvision/text/truetype_font.h
+++ b/engines/zvision/text/truetype_font.h
@@ -53,11 +53,11 @@ public:
 	~StyledTTFont();
 
 	enum {
-		STTF_BOLD = 1,
-		STTF_ITALIC = 2,
-		STTF_UNDERLINE = 4,
-		STTF_STRIKEOUT = 8,
-		STTF_SHARP = 16
+		TTF_STYLE_BOLD = 0x01,
+		TTF_STYLE_ITALIC = 0x02,
+		TTF_STYLE_UNDERLINE = 0x04,
+		TTF_STYLE_STRIKETHROUGH = 0x08,
+		TTF_STYLE_SHARP = 0x10
 	};
 
 private:
@@ -65,12 +65,10 @@ private:
 	Graphics::Font *_font;
 	int _lineHeight;
 	uint _style;
-	Common::String _fntName;
+	Common::String _fontName;
 
 public:
-	bool loadFont(const Common::String &fontName, int32 point);
 	bool loadFont(const Common::String &fontName, int32 point, uint style);
-	void setStyle(uint newStyle);
 
 	int getFontHeight();
 	int getMaxCharWidth();
-- 
cgit v1.2.3


From cff81cd70cbd2453619f43ec0e3cc5cab826d91e Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Wed, 11 Feb 2015 15:01:46 -0600
Subject: ZVISION: Remove forced render to screen

timedMessage() is always called from the scripting system. Which is updated before the rendering system.
Therefore, the message will already be rendered this frame, when the renderingManager->update() is called.
---
 engines/zvision/graphics/render_manager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 8758097c93..b8fa16bc1b 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -971,8 +971,6 @@ void RenderManager::bkgFill(uint8 r, uint8 g, uint8 b) {
 void RenderManager::timedMessage(const Common::String &str, uint16 milsecs) {
 	uint16 msgid = createSubArea();
 	updateSubArea(msgid, str);
-	processSubs(0);
-	renderSceneToScreen();
 	deleteSubArea(msgid, milsecs);
 }
 
-- 
cgit v1.2.3


From 8ecc5e52c5ad49d9fe40490d666d47349569d151 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Wed, 11 Feb 2015 15:03:21 -0600
Subject: ZVISION: Handle question text rendering manually, rather than forcing
 an entire screen refresh

---
 engines/zvision/graphics/render_manager.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index b8fa16bc1b..67410b4b6a 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -975,10 +975,11 @@ void RenderManager::timedMessage(const Common::String &str, uint16 milsecs) {
 }
 
 bool RenderManager::askQuestion(const Common::String &str) {
-	uint16 msgid = createSubArea();
-	updateSubArea(msgid, str);
-	processSubs(0);
-	renderSceneToScreen();
+	Graphics::Surface textSurface;
+	textSurface.create(_subtitleArea.width(), _subtitleArea.height(), _engine->_resourcePixelFormat);
+	_engine->getTextRenderer()->drawTextWithWordWrapping(str, textSurface);
+	copyToScreen(textSurface, _subtitleArea, 0, 0);
+
 	_engine->stopClock();
 
 	int result = 0;
@@ -1029,7 +1030,14 @@ bool RenderManager::askQuestion(const Common::String &str) {
 		else
 			_system->delayMillis(66);
 	}
-	deleteSubArea(msgid);
+
+	// Draw over the text in order to clear it
+	textSurface.fillRect(Common::Rect(_subtitleArea.width(), _subtitleArea.height()), 0);
+	copyToScreen(textSurface, _subtitleArea, 0, 0);
+
+	// Free the surface
+	textSurface.free();
+
 	_engine->startClock();
 	return result == 2;
 }
-- 
cgit v1.2.3


From 2d2cfbe005b93397f1e121888b0358e137ccc863 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Wed, 11 Feb 2015 15:08:32 -0600
Subject: ZVISION: Create temporary subtitle surfaces on the stack rather than
 the heap

---
 engines/zvision/graphics/render_manager.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 67410b4b6a..3772d5909e 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -753,13 +753,12 @@ void RenderManager::processSubs(uint16 deltatime) {
 		for (SubtitleMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
 			OneSubtitle *sub = &it->_value;
 			if (sub->txt.size()) {
-				Graphics::Surface *rndr = new Graphics::Surface();
-				rndr->create(sub->r.width(), sub->r.height(), _engine->_resourcePixelFormat);
-				_engine->getTextRenderer()->drawTextWithWordWrapping(sub->txt, *rndr);
+				Graphics::Surface subtitleSurface;
+				subtitleSurface.create(sub->r.width(), sub->r.height(), _engine->_resourcePixelFormat);
+				_engine->getTextRenderer()->drawTextWithWordWrapping(sub->txt, subtitleSurface);
 				Common::Rect empty;
-				blitSurfaceToSurface(*rndr, empty, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
-				rndr->free();
-				delete rndr;
+				blitSurfaceToSurface(subtitleSurface, empty, _subtitleSurface, sub->r.left - _subtitleArea.left + _workingWindow.left, sub->r.top - _subtitleArea.top + _workingWindow.top);
+				subtitleSurface.free();
 			}
 			sub->redraw = false;
 		}
-- 
cgit v1.2.3


From 14914b2a31399ceb6b2e4d7616535e346ee3acd6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Feb 2015 14:45:08 +0200
Subject: ZVISION: Add custom equality operators for game location

This makes the location checks more readable
---
 engines/zvision/core/events.cpp                    |  2 +-
 engines/zvision/scripting/effects/music_effect.cpp |  3 +--
 engines/zvision/scripting/script_manager.cpp       |  7 +++----
 engines/zvision/scripting/script_manager.h         | 22 ++++++++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 9cf5d04a7a..cc1c00b6d0 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -152,7 +152,7 @@ void ZVision::cheatCodes(uint8 key) {
 
 		if (checkCode("HELLOSAILOR")) {
 			Audio::AudioStream *soundStream;
-			if (loc.world == 'v' && loc.room == 'b' && loc.node == '1' && loc.view == '0') {
+			if (loc == "vb10") {
 				soundStream = makeRawZorkStream("v000hpta.raw", this);
 			} else {
 				soundStream = makeRawZorkStream("v000hnta.raw", this);
diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
index 2e2084783d..ad3c0f6d22 100644
--- a/engines/zvision/scripting/effects/music_effect.cpp
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -227,8 +227,7 @@ bool PanTrackNode::process(uint32 deltaTimeInMillis) {
 		int volumeCorrection = 2;
 
 		if (_engine->getGameId() == GID_GRANDINQUISITOR) {
-			Location loc = scriptManager->getCurrentLocation();
-			if (loc.world == 'd' && loc.room == 'c' && loc.node == '1' && loc.view == '0')
+			if (scriptManager->getCurrentLocation() == "dc10")
 				volumeCorrection = 5;
 		}
 
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index 71966b3125..70eaab2a0a 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -72,8 +72,7 @@ void ScriptManager::initialize() {
 }
 
 void ScriptManager::update(uint deltaTimeMillis) {
-	if (_currentLocation.node != _nextLocation.node || _currentLocation.room != _nextLocation.room ||
-	        _currentLocation.view != _nextLocation.view || _currentLocation.world != _nextLocation.world) {
+	if (_currentLocation != _nextLocation) {
 		ChangeLocationReal(false);
 	}
 
@@ -543,7 +542,7 @@ void ScriptManager::changeLocation(char _world, char _room, char _node, char _vi
 	_nextLocation.view = _view;
 	_nextLocation.offset = offset;
 	// If next location is 0000, return to the previous location.
-	if (_nextLocation.world == '0' && _nextLocation.room == '0' && _nextLocation.node == '0' && _nextLocation.view == '0') {
+	if (_nextLocation == "0000") {
 		if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
 			_nextLocation.world = getStateValue(StateKey_LastWorld);
 			_nextLocation.room = getStateValue(StateKey_LastRoom);
@@ -680,7 +679,7 @@ void ScriptManager::ChangeLocationReal(bool isLoading) {
 	// Change the background position
 	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
 
-	if (_currentLocation.world == 0 && _currentLocation.room == 0 && _currentLocation.node == 0 && _currentLocation.view == 0) {
+	if (_currentLocation == "0000") {
 		_currentLocation = _nextLocation;
 		execScope(world);
 		execScope(room);
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index d8e3721d43..7c276bf917 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -113,6 +113,28 @@ struct Location {
 	uint32 offset;
 };
 
+inline bool operator==(const Location& lhs, const Location& rhs) {
+	return (
+		lhs.world == rhs.world &&
+		lhs.room == rhs.room &&
+		lhs.node == rhs.node &&
+		lhs.view == rhs.view
+	);
+}
+
+inline bool operator==(const Location& lhs, const char* rhs) {
+	Common::String lhsStr = Common::String::format("%c%c%c%c", lhs.world, lhs.room, lhs.node, lhs.view);
+	return lhsStr == rhs;
+}
+
+inline bool operator!=(const Location& lhs, const Location& rhs) {
+	return !(lhs == rhs);
+}
+
+inline bool operator!=(const Location& lhs, const char* rhs) {
+	return !(lhs == rhs);
+}
+
 typedef Common::List<Puzzle *> PuzzleList;
 typedef Common::Queue<Puzzle *> PuzzleQueue;
 typedef Common::List<Control *> ControlList;
-- 
cgit v1.2.3


From 60c06b84b68a5711db442d8fd296f3978d685da5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Feb 2015 14:55:09 +0200
Subject: ZVISION: Fix script bug #6794 - "ZVISION: Yoruk's coffin instant
 death"

Fixes an edge case where the player goes to the dark room with the grue
without holding a torch, and then quickly runs away before the grue's
sound effect finishes. Many thanks to eriktorbjorn for the original
workaround
---
 engines/zvision/scripting/actions.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 5238561149..248ebaec49 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -480,6 +480,14 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 		}
 		_volume = new ValueSlot(engine->getScriptManager(), volumeBuffer);
 	}
+
+	// WORKAROUND for a script bug in Zork Nemesis, rooms mq70/mq80.
+	// Fixes an edge case where the player goes to the dark room with the grue
+	// without holding a torch, and then quickly runs away before the grue's
+	// sound effect finishes. Fixes script bug #6794.
+	if (engine->getGameId() == GID_NEMESIS && _slotKey == 14822 && engine->getScriptManager()->getStateValue(_slotKey) == 2)
+		engine->getScriptManager()->setStateValue(_slotKey, 0);
+
 }
 
 ActionMusic::~ActionMusic() {
-- 
cgit v1.2.3


From 9ce285a11e1bfc981c518e89f2401b1896b4a367 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Feb 2015 15:07:15 +0200
Subject: ZVISION: Also reference the script manager in ResultAction members

---
 engines/zvision/scripting/actions.cpp | 127 +++++++++++++++++-----------------
 engines/zvision/scripting/actions.h   |   4 +-
 2 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 248ebaec49..90d32e47ce 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -47,6 +47,9 @@
 
 namespace ZVision {
 
+ResultAction::ResultAction(ZVision *engine, int32 slotkey) : _engine(engine), _slotKey(slotkey), _scriptManager(engine->getScriptManager()) {
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // ActionAdd
 //////////////////////////////////////////////////////////////////////////////
@@ -60,7 +63,7 @@ ActionAdd::ActionAdd(ZVision *engine, int32 slotkey, const Common::String &line)
 }
 
 bool ActionAdd::execute() {
-	_engine->getScriptManager()->setStateValue(_key, _engine->getScriptManager()->getStateValue(_key) + _value);
+	_scriptManager->setStateValue(_key, _scriptManager->getStateValue(_key) + _value);
 	return true;
 }
 
@@ -75,7 +78,7 @@ ActionAssign::ActionAssign(ZVision *engine, int32 slotkey, const Common::String
 	char buf[64];
 	memset(buf, 0, 64);
 	sscanf(line.c_str(), "%u, %s", &_key, buf);
-	_value = new ValueSlot(_engine->getScriptManager(), buf);
+	_value = new ValueSlot(_scriptManager, buf);
 }
 
 ActionAssign::~ActionAssign() {
@@ -83,7 +86,7 @@ ActionAssign::~ActionAssign() {
 }
 
 bool ActionAssign::execute() {
-	_engine->getScriptManager()->setStateValue(_key, _value->getValue());
+	_scriptManager->setStateValue(_key, _value->getValue());
 	return true;
 }
 
@@ -100,7 +103,7 @@ ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::S
 }
 
 bool ActionAttenuate::execute() {
-	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_key);
+	ScriptingEffect *fx = _scriptManager->getSideFX(_key);
 	if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 		MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 		mus->setVolume(255 * (10000 - abs(_attenuation)) / 10000 );
@@ -125,7 +128,7 @@ ActionChangeLocation::ActionChangeLocation(ZVision *engine, int32 slotkey, const
 
 bool ActionChangeLocation::execute() {
 	// We can't directly call ScriptManager::ChangeLocationIntern() because doing so clears all the Puzzles, and thus would corrupt the current puzzle checking
-	_engine->getScriptManager()->changeLocation(_world, _room, _node, _view, _offset);
+	_scriptManager->changeLocation(_world, _room, _node, _view, _offset);
 	// Tell the puzzle system to stop checking any more puzzles
 	return false;
 }
@@ -151,7 +154,7 @@ ActionCrossfade::ActionCrossfade(ZVision *engine, int32 slotkey, const Common::S
 
 bool ActionCrossfade::execute() {
 	if (_keyOne) {
-		ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyOne);
+		ScriptingEffect *fx = _scriptManager->getSideFX(_keyOne);
 		if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 			MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 			if (_oneStartVolume >= 0)
@@ -162,7 +165,7 @@ bool ActionCrossfade::execute() {
 	}
 
 	if (_keyTwo) {
-		ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyTwo);
+		ScriptingEffect *fx = _scriptManager->getSideFX(_keyTwo);
 		if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) {
 			MusicNodeBASE *mus = (MusicNodeBASE *)fx;
 			if (_twoStartVolume >= 0)
@@ -233,7 +236,7 @@ ActionDisableControl::ActionDisableControl(ZVision *engine, int32 slotkey, const
 }
 
 bool ActionDisableControl::execute() {
-	_engine->getScriptManager()->setStateFlag(_key, Puzzle::DISABLED);
+	_scriptManager->setStateFlag(_key, Puzzle::DISABLED);
 	return true;
 }
 
@@ -250,7 +253,7 @@ ActionDisplayMessage::ActionDisplayMessage(ZVision *engine, int32 slotkey, const
 }
 
 bool ActionDisplayMessage::execute() {
-	Control *ctrl = _engine->getScriptManager()->getControl(_control);
+	Control *ctrl = _scriptManager->getControl(_control);
 	if (ctrl && ctrl->getType() == Control::CONTROL_TITLER) {
 		TitlerControl *titler = (TitlerControl *)ctrl;
 		titler->setString(_msgid);
@@ -289,14 +292,14 @@ ActionDistort::ActionDistort(ZVision *engine, int32 slotkey, const Common::Strin
 }
 
 ActionDistort::~ActionDistort() {
-	_engine->getScriptManager()->killSideFx(_distSlot);
+	_scriptManager->killSideFx(_distSlot);
 }
 
 bool ActionDistort::execute() {
-	if (_engine->getScriptManager()->getSideFX(_distSlot))
+	if (_scriptManager->getSideFX(_distSlot))
 		return true;
 
-	_engine->getScriptManager()->addSideFX(new DistortNode(_engine, _distSlot, _speed, _startAngle, _endAngle, _startLineScale, _endLineScale));
+	_scriptManager->addSideFX(new DistortNode(_engine, _distSlot, _speed, _startAngle, _endAngle, _startLineScale, _endLineScale));
 
 	return true;
 }
@@ -313,7 +316,7 @@ ActionEnableControl::ActionEnableControl(ZVision *engine, int32 slotkey, const C
 }
 
 bool ActionEnableControl::execute() {
-	_engine->getScriptManager()->unsetStateFlag(_key, Puzzle::DISABLED);
+	_scriptManager->unsetStateFlag(_key, Puzzle::DISABLED);
 	return true;
 }
 
@@ -326,8 +329,8 @@ ActionFlushMouseEvents::ActionFlushMouseEvents(ZVision *engine, int32 slotkey) :
 }
 
 bool ActionFlushMouseEvents::execute() {
-	_engine->getScriptManager()->flushEvent(Common::EVENT_LBUTTONUP);
-	_engine->getScriptManager()->flushEvent(Common::EVENT_LBUTTONDOWN);
+	_scriptManager->flushEvent(Common::EVENT_LBUTTONUP);
+	_scriptManager->flushEvent(Common::EVENT_LBUTTONDOWN);
 	return true;
 }
 
@@ -360,22 +363,22 @@ ActionInventory::ActionInventory(ZVision *engine, int32 slotkey, const Common::S
 bool ActionInventory::execute() {
 	switch (_type) {
 	case 0: // add
-		_engine->getScriptManager()->inventoryAdd(_key);
+		_scriptManager->inventoryAdd(_key);
 		break;
 	case 1: // addi
-		_engine->getScriptManager()->inventoryAdd(_engine->getScriptManager()->getStateValue(_key));
+		_scriptManager->inventoryAdd(_scriptManager->getStateValue(_key));
 		break;
 	case 2: // drop
 		if (_key >= 0)
-			_engine->getScriptManager()->inventoryDrop(_key);
+			_scriptManager->inventoryDrop(_key);
 		else
-			_engine->getScriptManager()->inventoryDrop(_engine->getScriptManager()->getStateValue(StateKey_InventoryItem));
+			_scriptManager->inventoryDrop(_scriptManager->getStateValue(StateKey_InventoryItem));
 		break;
 	case 3: // dropi
-		_engine->getScriptManager()->inventoryDrop(_engine->getScriptManager()->getStateValue(_key));
+		_scriptManager->inventoryDrop(_scriptManager->getStateValue(_key));
 		break;
 	case 4: // cycle
-		_engine->getScriptManager()->inventoryCycle();
+		_scriptManager->inventoryCycle();
 		break;
 	default:
 		break;
@@ -416,9 +419,9 @@ ActionKill::ActionKill(ZVision *engine, int32 slotkey, const Common::String &lin
 
 bool ActionKill::execute() {
 	if (_type)
-		_engine->getScriptManager()->killSideFxType((ScriptingEffect::ScriptingEffectType)_type);
+		_scriptManager->killSideFxType((ScriptingEffect::ScriptingEffectType)_type);
 	else
-		_engine->getScriptManager()->killSideFx(_key);
+		_scriptManager->killSideFx(_key);
 	return true;
 }
 
@@ -465,7 +468,7 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 		int note;
 		int prog;
 		sscanf(line.c_str(), "%u %d %d %14s", &type, &prog, &note, volumeBuffer);
-		_volume = new ValueSlot(_engine->getScriptManager(), volumeBuffer);
+		_volume = new ValueSlot(_scriptManager, volumeBuffer);
 		_note = note;
 		_prog = prog;
 	} else {
@@ -478,40 +481,40 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
 			warning("ActionMusic: Adjusting volume for %s from %s to 100", _fileName.c_str(), volumeBuffer);
 			strcpy(volumeBuffer, "100");
 		}
-		_volume = new ValueSlot(engine->getScriptManager(), volumeBuffer);
+		_volume = new ValueSlot(_scriptManager, volumeBuffer);
 	}
 
 	// WORKAROUND for a script bug in Zork Nemesis, rooms mq70/mq80.
 	// Fixes an edge case where the player goes to the dark room with the grue
 	// without holding a torch, and then quickly runs away before the grue's
 	// sound effect finishes. Fixes script bug #6794.
-	if (engine->getGameId() == GID_NEMESIS && _slotKey == 14822 && engine->getScriptManager()->getStateValue(_slotKey) == 2)
-		engine->getScriptManager()->setStateValue(_slotKey, 0);
+	if (engine->getGameId() == GID_NEMESIS && _slotKey == 14822 && _scriptManager->getStateValue(_slotKey) == 2)
+		_scriptManager->setStateValue(_slotKey, 0);
 
 }
 
 ActionMusic::~ActionMusic() {
 	if (!_universe)
-		_engine->getScriptManager()->killSideFx(_slotKey);
+		_scriptManager->killSideFx(_slotKey);
 	delete _volume;
 }
 
 bool ActionMusic::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotKey)) {
-		_engine->getScriptManager()->killSideFx(_slotKey);
-		_engine->getScriptManager()->setStateValue(_slotKey, 2);
+	if (_scriptManager->getSideFX(_slotKey)) {
+		_scriptManager->killSideFx(_slotKey);
+		_scriptManager->setStateValue(_slotKey, 2);
 	}
 
 	uint volume = _volume->getValue();
 
 	if (_midi) {
-		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, volume));
+		_scriptManager->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, volume));
 	} else {
 		if (!_engine->getSearchManager()->hasFile(_fileName))
 			return true;
 
 		// Volume in the script files is mapped to [0, 100], but the ScummVM mixer uses [0, 255]
-		_engine->getScriptManager()->addSideFX(new MusicNode(_engine, _slotKey, _fileName, _loop, volume * 255 / 100));
+		_scriptManager->addSideFX(new MusicNode(_engine, _slotKey, _fileName, _loop, volume * 255 / 100));
 	}
 
 	return true;
@@ -530,14 +533,14 @@ ActionPanTrack::ActionPanTrack(ZVision *engine, int32 slotkey, const Common::Str
 }
 
 ActionPanTrack::~ActionPanTrack() {
-	_engine->getScriptManager()->killSideFx(_slotKey);
+	_scriptManager->killSideFx(_slotKey);
 }
 
 bool ActionPanTrack::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotKey))
+	if (_scriptManager->getSideFX(_slotKey))
 		return true;
 
-	_engine->getScriptManager()->addSideFX(new PanTrackNode(_engine, _slotKey, _musicSlot, _pos));
+	_scriptManager->addSideFX(new PanTrackNode(_engine, _slotKey, _musicSlot, _pos));
 
 	return true;
 }
@@ -587,18 +590,18 @@ ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, c
 }
 
 ActionPreloadAnimation::~ActionPreloadAnimation() {
-	_engine->getScriptManager()->deleteSideFx(_slotKey);
+	_scriptManager->deleteSideFx(_slotKey);
 }
 
 bool ActionPreloadAnimation::execute() {
-	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_slotKey);
+	AnimationEffect *nod = (AnimationEffect *)_scriptManager->getSideFX(_slotKey);
 
 	if (!nod) {
 		nod = new AnimationEffect(_engine, _slotKey, _fileName, _mask, _framerate, false);
-		_engine->getScriptManager()->addSideFX(nod);
+		_scriptManager->addSideFX(nod);
 	} else
 		nod->stop();
-	_engine->getScriptManager()->setStateValue(_slotKey, 2);
+	_scriptManager->setStateValue(_slotKey, 2);
 	return true;
 }
 
@@ -614,10 +617,10 @@ ActionUnloadAnimation::ActionUnloadAnimation(ZVision *engine, int32 slotkey, con
 }
 
 bool ActionUnloadAnimation::execute() {
-	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_key);
+	AnimationEffect *nod = (AnimationEffect *)_scriptManager->getSideFX(_key);
 
 	if (nod && nod->getType() == ScriptingEffect::SCRIPTING_EFFECT_ANIM)
-		_engine->getScriptManager()->deleteSideFx(_key);
+		_scriptManager->deleteSideFx(_key);
 
 	return true;
 }
@@ -662,15 +665,15 @@ ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const C
 }
 
 ActionPlayAnimation::~ActionPlayAnimation() {
-	_engine->getScriptManager()->deleteSideFx(_slotKey);
+	_scriptManager->deleteSideFx(_slotKey);
 }
 
 bool ActionPlayAnimation::execute() {
-	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_slotKey);
+	AnimationEffect *nod = (AnimationEffect *)_scriptManager->getSideFX(_slotKey);
 
 	if (!nod) {
 		nod = new AnimationEffect(_engine, _slotKey, _fileName, _mask, _framerate);
-		_engine->getScriptManager()->addSideFX(nod);
+		_scriptManager->addSideFX(nod);
 	} else
 		nod->stop();
 
@@ -701,7 +704,7 @@ ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, int32 sl
 }
 
 bool ActionPlayPreloadAnimation::execute() {
-	AnimationEffect *nod = (AnimationEffect *)_engine->getScriptManager()->getSideFX(_controlKey);
+	AnimationEffect *nod = (AnimationEffect *)_scriptManager->getSideFX(_controlKey);
 
 	if (nod)
 		nod->addPlayNode(_slotKey, _x1, _y1, _x2, _y2, _startFrame, _endFrame, _loopCount);
@@ -742,11 +745,11 @@ ActionRegion::ActionRegion(ZVision *engine, int32 slotkey, const Common::String
 }
 
 ActionRegion::~ActionRegion() {
-	_engine->getScriptManager()->killSideFx(_slotKey);
+	_scriptManager->killSideFx(_slotKey);
 }
 
 bool ActionRegion::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotKey))
+	if (_scriptManager->getSideFX(_slotKey))
 		return true;
 
 	GraphicsEffect *effect = NULL;
@@ -791,7 +794,7 @@ bool ActionRegion::execute() {
 	}
 
 	if (effect) {
-		_engine->getScriptManager()->addSideFX(new RegionNode(_engine, _slotKey, effect, _delay));
+		_scriptManager->addSideFX(new RegionNode(_engine, _slotKey, effect, _delay));
 		_engine->getRenderManager()->addEffect(effect);
 	}
 
@@ -807,7 +810,7 @@ ActionRandom::ActionRandom(ZVision *engine, int32 slotkey, const Common::String
 	char maxBuffer[64];
 	memset(maxBuffer, 0, 64);
 	sscanf(line.c_str(), "%s", maxBuffer);
-	_max = new ValueSlot(_engine->getScriptManager(), maxBuffer);
+	_max = new ValueSlot(_scriptManager, maxBuffer);
 }
 
 ActionRandom::~ActionRandom() {
@@ -816,7 +819,7 @@ ActionRandom::~ActionRandom() {
 
 bool ActionRandom::execute() {
 	uint randNumber = _engine->getRandomSource()->getRandomNumber(_max->getValue());
-	_engine->getScriptManager()->setStateValue(_slotKey, randNumber);
+	_scriptManager->setStateValue(_slotKey, randNumber);
 	return true;
 }
 
@@ -923,7 +926,7 @@ ActionStop::ActionStop(ZVision *engine, int32 slotkey, const Common::String &lin
 }
 
 bool ActionStop::execute() {
-	_engine->getScriptManager()->stopSideFx(_key);
+	_scriptManager->stopSideFx(_key);
 	return true;
 }
 
@@ -967,7 +970,7 @@ bool ActionStreamVideo::execute() {
 	hiresFileName.setChar('o', hiresFileName.size() - 2);
 	hiresFileName.setChar('b', hiresFileName.size() - 1);
 
-	if (_engine->getScriptManager()->getStateValue(StateKey_MPEGMovies) == 1 &&_engine->getSearchManager()->hasFile(hiresFileName)) {
+	if (_scriptManager->getStateValue(StateKey_MPEGMovies) == 1 &&_engine->getSearchManager()->hasFile(hiresFileName)) {
 		// TODO: Enable once AC3 support is implemented
 		if (!_engine->getSearchManager()->hasFile(_fileName))	// Check for the regular video
 			return true;
@@ -1026,14 +1029,14 @@ ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::S
 }
 
 bool ActionSyncSound::execute() {
-	ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_syncto);
+	ScriptingEffect *fx = _scriptManager->getSideFX(_syncto);
 	if (!fx)
 		return true;
 
 	if (!(fx->getType() & ScriptingEffect::SCRIPTING_EFFECT_ANIM))
 		return true;
 
-	_engine->getScriptManager()->addSideFX(new SyncSoundNode(_engine, _slotKey, _fileName, _syncto));
+	_scriptManager->addSideFX(new SyncSoundNode(_engine, _slotKey, _fileName, _syncto));
 	return true;
 }
 
@@ -1046,18 +1049,18 @@ ActionTimer::ActionTimer(ZVision *engine, int32 slotkey, const Common::String &l
 	char timeBuffer[64];
 	memset(timeBuffer, 0, 64);
 	sscanf(line.c_str(), "%s", timeBuffer);
-	_time = new ValueSlot(_engine->getScriptManager(), timeBuffer);
+	_time = new ValueSlot(_scriptManager, timeBuffer);
 }
 
 ActionTimer::~ActionTimer() {
 	delete _time;
-	_engine->getScriptManager()->killSideFx(_slotKey);
+	_scriptManager->killSideFx(_slotKey);
 }
 
 bool ActionTimer::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotKey))
+	if (_scriptManager->getSideFX(_slotKey))
 		return true;
-	_engine->getScriptManager()->addSideFX(new TimerNode(_engine, _slotKey, _time->getValue()));
+	_scriptManager->addSideFX(new TimerNode(_engine, _slotKey, _time->getValue()));
 	return true;
 }
 
@@ -1077,13 +1080,13 @@ ActionTtyText::ActionTtyText(ZVision *engine, int32 slotkey, const Common::Strin
 }
 
 ActionTtyText::~ActionTtyText() {
-	_engine->getScriptManager()->killSideFx(_slotKey);
+	_scriptManager->killSideFx(_slotKey);
 }
 
 bool ActionTtyText::execute() {
-	if (_engine->getScriptManager()->getSideFX(_slotKey))
+	if (_scriptManager->getSideFX(_slotKey))
 		return true;
-	_engine->getScriptManager()->addSideFX(new ttyTextNode(_engine, _slotKey, _filename, _r, _delay));
+	_scriptManager->addSideFX(new ttyTextNode(_engine, _slotKey, _filename, _r, _delay));
 	return true;
 }
 
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index 94c2d041fc..ff19fc54fc 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -32,6 +32,7 @@ namespace ZVision {
 
 // Forward declaration of ZVision. This file is included before ZVision is declared
 class ZVision;
+class ScriptManager;
 class ValueSlot;
 
 /**
@@ -40,7 +41,7 @@ class ValueSlot;
   */
 class ResultAction {
 public:
-	ResultAction(ZVision *engine, int32 slotkey) : _engine(engine), _slotKey(slotkey) {}
+	ResultAction(ZVision *engine, int32 slotkey);
 	virtual ~ResultAction() {}
 	/**
 	 * This is called by the script system whenever a Puzzle's criteria are found to be true.
@@ -53,6 +54,7 @@ public:
 	virtual bool execute() = 0;
 protected:
 	ZVision *_engine;
+	ScriptManager *_scriptManager;
 	int32 _slotKey;
 };
 
-- 
cgit v1.2.3


From 53a2c30cb014997887e29f5fd0db1348d05990f0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Feb 2015 15:27:01 +0200
Subject: ZVISION: Fix script bug #6791 (max value of delay_render)

This fixes the delay outside the Frobozz Electric building.
In all other places, delay_render is called with a value
ranging from 1 to 10, so the 100 here looks to be a script
bug, and causes an unnecessary long pause in that scene.
Thus, we're capping the frame delay value to 10.
---
 engines/zvision/scripting/actions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 90d32e47ce..21c97e766b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -217,6 +217,9 @@ ActionDelayRender::ActionDelayRender(ZVision *engine, int32 slotkey, const Commo
 	ResultAction(engine, slotkey) {
 	_framesToDelay = 0;
 	sscanf(line.c_str(), "%u", &_framesToDelay);
+	// Limit to 10 frames maximum. This fixes the script bug in ZGI scene px10
+	// (outside Frobozz Electric building), where this is set to 100 (bug #6791).
+	_framesToDelay = MIN<uint32>(_framesToDelay, 10);
 }
 
 bool ActionDelayRender::execute() {
-- 
cgit v1.2.3


From 84d2414a7dceca9d5140936667aae05fbbfdcf99 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 2 Oct 2014 18:22:41 +0200
Subject: SCI: Avoid resetting already unused channels

---
 engines/sci/sound/music.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 7a6eaf62b4..5a37357045 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1063,7 +1063,7 @@ void SciMusic::remapChannels() {
 
 	// And finally, stop any empty channels
 	for (int i = _driverFirstChannel; i <= _driverLastChannel; ++i) {
-		if (!_channelMap[i]._song)
+		if (!_channelMap[i]._song && currentMap[i]._song)
 			resetDeviceChannel(i);
 	}
 
-- 
cgit v1.2.3


From f1e34f11d742ef32ed48926092d93f3448732f2e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 2 Oct 2014 18:23:00 +0200
Subject: SCI: Initialize voice counts in SCI1+

---
 engines/sci/sound/midiparser_sci.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index c0b4f3122e..7ee9cc9d28 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -360,6 +360,13 @@ void MidiParser_SCI::sendInitCommands() {
 					sendToDriver(0xB0 | i, 0x4B, voiceCount);
 				}
 			}
+		} else {
+			for (int i = 0; i < _track->channelCount; ++i) {
+				byte voiceCount = _track->channels[i].poly;
+				byte num = _track->channels[i].number;
+				// TODO: Should we skip the control channel?
+				sendToDriver(0xB0 | num, 0x4B, voiceCount);
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 26d55b09a8b198b0a9b9349d684eec6376d98c8c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 2 Oct 2014 18:24:14 +0200
Subject: SCI: Match SSCI channel reset order

It may or may not matter for a driver's voice mapping.
---
 engines/sci/sound/music.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 5a37357045..05605c0c45 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1062,7 +1062,7 @@ void SciMusic::remapChannels() {
 	}
 
 	// And finally, stop any empty channels
-	for (int i = _driverFirstChannel; i <= _driverLastChannel; ++i) {
+	for (int i = _driverLastChannel; i >= _driverFirstChannel; --i) {
 		if (!_channelMap[i]._song && currentMap[i]._song)
 			resetDeviceChannel(i);
 	}
-- 
cgit v1.2.3


From 58ef44eb8d9d3eb78eb013441a8d6d12940ee5e3 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 7 Oct 2014 19:48:18 +0200
Subject: SCI: Register and save playBed option to PlaySound

The playBed option is not handled yet, only stored. This increases
the savegame format version.
---
 engines/sci/console.cpp            |  8 +++++---
 engines/sci/engine/kernel_tables.h |  4 ----
 engines/sci/engine/savegame.cpp    |  6 +++++-
 engines/sci/engine/savegame.h      |  3 ++-
 engines/sci/sound/music.cpp        |  2 ++
 engines/sci/sound/music.h          |  1 +
 engines/sci/sound/soundcmd.cpp     | 16 +++++++++++-----
 engines/sci/sound/soundcmd.h       |  2 +-
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index e233c4cba4..a3abf606d0 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -2172,6 +2172,7 @@ bool Console::cmdStartSound(int argc, const char **argv) {
 		return true;
 	}
 
+	// TODO: Maybe also add a playBed option.
 	g_sci->_soundCmd->startNewSound(number);
 	return cmdExit(0, 0);
 }
@@ -2198,9 +2199,10 @@ bool Console::cmdToggleSound(int argc, const char **argv) {
 	Common::String newState = argv[2];
 	newState.toLowercase();
 
-	if (newState == "play")
-		g_sci->_soundCmd->processPlaySound(id);
-	else if (newState == "stop")
+	if (newState == "play") {
+		// Maybe also have a 'playbed' option. (Second argument to processPlaySound.)
+		g_sci->_soundCmd->processPlaySound(id, false);
+	} else if (newState == "stop")
 		g_sci->_soundCmd->processStopSound(id, false);
 	else
 		debugPrintf("New state can either be 'play' or 'stop'");
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 0c2fd4e3ea..2cbd79366d 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -105,10 +105,6 @@ static const SciKernelMapSubEntry kDoSound_subops[] = {
 	{ SIG_SOUNDSCI1EARLY,  5, MAP_CALL(DoSoundInit),               NULL,                   NULL },
 	{ SIG_SOUNDSCI1EARLY,  6, MAP_CALL(DoSoundDispose),            NULL,                   NULL },
 	{ SIG_SOUNDSCI1EARLY,  7, MAP_CALL(DoSoundPlay),               "oi",                   NULL },
-	// ^^ TODO: In SCI1-SCI1.1 DoSound (play) is called by 2 methods of the Sound object: play and
-	//  playBed. The methods are the same, apart from the second integer parameter: it's 0 in
-	//  play and 1 in playBed, to distinguish the caller. It's passed on, we should find out what
-	//  it actually does internally
 	{ SIG_SOUNDSCI1EARLY,  8, MAP_CALL(DoSoundStop),               NULL,                   NULL },
 	{ SIG_SOUNDSCI1EARLY,  9, MAP_CALL(DoSoundPause),              "[o0]i",                NULL },
 	{ SIG_SOUNDSCI1EARLY, 10, MAP_CALL(DoSoundFade),               "oiiii",                kDoSoundFade_workarounds },
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 0b55425406..692fa77a80 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -617,6 +617,10 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncAsSint32LE(fadeTicker);
 	s.syncAsSint32LE(fadeTickerStep);
 	s.syncAsByte(status);
+	if (s.getVersion() >= 32)
+		s.syncAsByte(playBed);
+	else if (s.isLoading())
+		playBed = false;
 
 	// pMidiParser and pStreamAud will be initialized when the
 	// sound list is reconstructed in gamestate_restore()
@@ -650,7 +654,7 @@ void SoundCommandParser::reconstructPlayList() {
 			if (_soundVersion >= SCI_VERSION_1_EARLY)
 				writeSelectorValue(_segMan, (*i)->soundObj, SELECTOR(vol), (*i)->volume);
 
-			processPlaySound((*i)->soundObj);
+			processPlaySound((*i)->soundObj, (*i)->playBed);
 		}
 	}
 }
diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h
index 8f2835654b..be6d05cdc5 100644
--- a/engines/sci/engine/savegame.h
+++ b/engines/sci/engine/savegame.h
@@ -37,6 +37,7 @@ struct EngineState;
  *
  * Version - new/changed feature
  * =============================
+ *      32 - new playBed flag in MusicEntry
  *      31 - priority for sound effects/music is now a signed int16, instead of a byte
  *      30 - synonyms
  *      29 - system strings
@@ -56,7 +57,7 @@ struct EngineState;
  */
 
 enum {
-	CURRENT_SAVEGAME_VERSION = 31,
+	CURRENT_SAVEGAME_VERSION = 32,
 	MINIMUM_SAVEGAME_VERSION = 14
 };
 
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 05605c0c45..4606d66ace 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -334,6 +334,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 			pSnd->pLoopStream = 0;
 			pSnd->soundType = Audio::Mixer::kSFXSoundType;
 			pSnd->hCurrentAud = Audio::SoundHandle();
+			pSnd->playBed = false;
 		} else {
 			// play MIDI track
 			Common::StackLock lock(_mutex);
@@ -380,6 +381,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 			int16 prevHold = pSnd->hold;
 			pSnd->loop = 0;
 			pSnd->hold = -1;
+			pSnd->playBed = false;
 
 			pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);
 			pSnd->reverb = pSnd->pMidiParser->getSongReverb();
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 4e44074630..0fbd5a0c0e 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -85,6 +85,7 @@ public:
 	int16 volume;
 	int16 hold;
 	int8 reverb;
+	bool playBed;
 
 	int16 pauseCounter;
 	uint sampleLoopCounter;
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 73e0a23a6a..47ab9bdc71 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -142,11 +142,14 @@ void SoundCommandParser::processInitSound(reg_t obj) {
 
 reg_t SoundCommandParser::kDoSoundPlay(int argc, reg_t *argv, reg_t acc) {
 	debugC(kDebugLevelSound, "kDoSound(play): %04x:%04x", PRINT_REG(argv[0]));
-	processPlaySound(argv[0]);
+	bool playBed = false;
+	if (argc >= 2 && !argv[1].isNull())
+		playBed = true;
+	processPlaySound(argv[0], playBed);
 	return acc;
 }
 
-void SoundCommandParser::processPlaySound(reg_t obj) {
+void SoundCommandParser::processPlaySound(reg_t obj, bool playBed) {
 	MusicEntry *musicSlot = _music->getSlot(obj);
 	if (!musicSlot) {
 		warning("kDoSound(play): Slot not found (%04x:%04x), initializing it manually", PRINT_REG(obj));
@@ -185,11 +188,12 @@ void SoundCommandParser::processPlaySound(reg_t obj) {
 	// Reset hold when starting a new song. kDoSoundSetHold is always called after
 	// kDoSoundPlay to set it properly, if needed. Fixes bug #3413589.
 	musicSlot->hold = -1;
+	musicSlot->playBed = playBed;
 	if (_soundVersion >= SCI_VERSION_1_EARLY)
 		musicSlot->volume = readSelectorValue(_segMan, obj, SELECTOR(vol));
 
-	debugC(kDebugLevelSound, "kDoSound(play): %04x:%04x number %d, loop %d, prio %d, vol %d", PRINT_REG(obj),
-			resourceId, musicSlot->loop, musicSlot->priority, musicSlot->volume);
+	debugC(kDebugLevelSound, "kDoSound(play): %04x:%04x number %d, loop %d, prio %d, vol %d, bed %d", PRINT_REG(obj),
+			resourceId, musicSlot->loop, musicSlot->priority, musicSlot->volume, playBed ? 1 : 0);
 
 	_music->soundPlay(musicSlot);
 
@@ -777,6 +781,8 @@ void SoundCommandParser::stopAllSounds() {
 }
 
 void SoundCommandParser::startNewSound(int number) {
+	// NB: This is only used by the debugging console.
+
 	Common::StackLock lock(_music->_mutex);
 
 	// Overwrite the first sound in the playlist
@@ -785,7 +791,7 @@ void SoundCommandParser::startNewSound(int number) {
 	processDisposeSound(soundObj);
 	writeSelectorValue(_segMan, soundObj, SELECTOR(number), number);
 	processInitSound(soundObj);
-	processPlaySound(soundObj);
+	processPlaySound(soundObj, false);
 }
 
 void SoundCommandParser::setMasterVolume(int vol) {
diff --git a/engines/sci/sound/soundcmd.h b/engines/sci/sound/soundcmd.h
index 4effda68e4..5bb7cf2cb1 100644
--- a/engines/sci/sound/soundcmd.h
+++ b/engines/sci/sound/soundcmd.h
@@ -63,7 +63,7 @@ public:
 	void printPlayList(Console *con);
 	void printSongInfo(reg_t obj, Console *con);
 
-	void processPlaySound(reg_t obj);
+	void processPlaySound(reg_t obj, bool playBed);
 	void processStopSound(reg_t obj, bool sampleFinishedPlaying);
 	void initSoundResource(MusicEntry *newSound);
 
-- 
cgit v1.2.3


From 52adf5135b7b075c1cfc63ce8094538edf279039 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sat, 14 Feb 2015 12:06:14 -0600
Subject: ZVISION: Check for point and style changes when early breaking from a
 font change

---
 engines/zvision/text/truetype_font.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 8e402efc08..7ad8d6db61 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -65,14 +65,14 @@ StyledTTFont::~StyledTTFont() {
 }
 
 bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint style) {
-	_style = style;
-
 	// Don't re-load the font if we've already loaded it
 	// We have to check for empty so we can default to Arial 
-	if (!fontName.empty() && _fontName.equalsIgnoreCase(fontName)) {
+	if (!fontName.empty() && _fontName.equalsIgnoreCase(fontName) && _lineHeight == point && _style == style) {
 		return true;
 	}
 
+	_style = style;
+
 	Common::String newFontName;
 	Common::String freeFontName;
 	Common::String liberationFontName;
-- 
cgit v1.2.3


From 1aa9181466d1916824abb7301ea3e67781d08183 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Feb 2015 15:34:11 -0500
Subject: MADS: Cleanup and bugfixes for panning transition support methods

---
 engines/mads/palette.cpp | 22 +++++++++++++-------
 engines/mads/palette.h   | 11 ++++------
 engines/mads/screen.cpp  | 53 ++++++++++++++++++++++++++++++++++--------------
 engines/mads/screen.h    |  4 ++--
 4 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index b41eaedfcc..b5ea136abd 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -428,6 +428,14 @@ void Fader::grabPalette(byte *colors, uint start, uint num) {
 	g_system->getPaletteManager()->grabPalette(colors, start, num);
 }
 
+void Fader::getFullPalette(byte palette[PALETTE_SIZE]) {
+	grabPalette(&palette[0], 0, PALETTE_COUNT);
+}
+
+void Fader::setFullPalette(byte palette[PALETTE_SIZE]) {
+	setPalette(&palette[0], 0, PALETTE_COUNT);
+}
+
 void Fader::fadeOut(byte palette[PALETTE_SIZE], byte *paletteMap,
 		int baseColor, int numColors, int baseGrey, int numGreys,
 		int tickDelay, int steps) {
@@ -886,25 +894,25 @@ void Palette::refreshSceneColors() {
 }
 
 int Palette::closestColor(const byte *matchColor, const byte *refPalette,
-		int listWrap, int count) {
+		int paletteInc, int count) {
 	int bestColor = 0;
 	int bestDistance = 0x7fff;
 
 	for (int idx = 0; idx < count; ++idx) {
-		// Figure out hash for color
+		// Figure out figure for 'distance' between two colors
 		int distance = 0;
-		for (int rgbIdx = 0; rgbIdx < 3; ++rgbIdx, ++refPalette) {
-			byte diff = *refPalette - matchColor[rgbIdx];
-			distance += (int)diff * (int)diff;
+		for (int rgbIdx = 0; rgbIdx < RGB_SIZE; ++rgbIdx) {
+			int diff = refPalette[rgbIdx] - matchColor[rgbIdx];
+			distance += diff * diff;
 		}
 
 		// If the given color is a closer match to our color, store the index
-		if (distance < bestDistance) {
+		if (distance <= bestDistance) {
 			bestDistance = distance;
 			bestColor = idx;
 		}
 
-		refPalette += listWrap - 3;
+		refPalette += paletteInc;
 	}
 
 	return bestColor;
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 1c387b4368..5d3bc3a82e 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -36,6 +36,7 @@ class MADSEngine;
 #define PALETTE_RESERVED_HIGH_COUNT 10
 
 #define PALETTE_COUNT 256
+#define RGB_SIZE 3
 #define PALETTE_SIZE (256 * 3)
 
 /**
@@ -212,16 +213,12 @@ public:
 	/**
 	* Gets the entire palette at once
 	*/
-	void getFullPalette(byte palette[PALETTE_SIZE]) {
-		grabPalette(&palette[0], 0, PALETTE_COUNT);
-	}
+	void getFullPalette(byte palette[PALETTE_SIZE]);
 
 	/**
 	* Sets the entire palette at once
 	*/
-	void setFullPalette(byte palette[PALETTE_SIZE]) {
-		setPalette(&palette[0], 0, PALETTE_COUNT);
-	}
+	void setFullPalette(byte palette[PALETTE_SIZE]);
 
 	/**
 	* Calculates a merge/hash for a given palette entry
@@ -320,7 +317,7 @@ public:
 	void refreshSceneColors();
 
 	static int closestColor(const byte *matchColor, const byte *refPalette, 
-		int listWrap, int count);
+		int paletteInc, int count);
 };
 
 } // End of namespace MADS
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index f7179877d5..60f3d8aeaf 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -610,7 +610,7 @@ void ScreenSurface::transition(ScreenTransition transitionType, bool surfaceFlag
 	Scene &scene = _vm->_game->_scene;
 	byte palData[PALETTE_SIZE];
 
-	switch (transitionType) {
+ 	switch (transitionType) {
 	case kTransitionFadeIn:
 	case kTransitionFadeOutIn:
 		Common::fill(&pal._colorValues[0], &pal._colorValues[3], 0);
@@ -738,7 +738,8 @@ void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entryS
 			copyRectToScreen(Common::Rect(xAt, destPos.y, xAt + 1, destPos.y + size.y));
 
 			// Slight delay
-			events.delay(1);
+			events.pollEvents();
+			g_system->delayMillis(1);
 		}
 
 		if ((setPalette && !loop) || throughBlack == THROUGH_BLACK2)
@@ -752,28 +753,49 @@ void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entryS
 	}
 }
 
-void ScreenSurface::swapForeground(byte palData[PALETTE_SIZE], byte *paletteMap) {
+/**
+ * Translates the current screen from the old palette to the new palette
+ */
+void ScreenSurface::swapForeground(byte newPalette[PALETTE_SIZE], byte *paletteMap) {
 	Palette &palette = *_vm->_palette;
 	byte oldPalette[PALETTE_SIZE];
-	byte oldMap[256];
-	byte newMap[256];
+	byte oldMap[PALETTE_COUNT];
 
 	palette.getFullPalette(oldPalette);
 	swapPalette(oldPalette, oldMap, true);
-	swapPalette(palData, newMap, false);
-
-	Common::copy(&palData[3], &palData[PALETTE_SIZE], &oldPalette[3]);
+	swapPalette(newPalette, paletteMap, false);
+
+	// Transfer translated foreground colors. Since foregrounds are interleaved
+	// with background, we only copy over each alternate RGB tuplet
+	const byte *srcP = &newPalette[RGB_SIZE];
+	byte *destP = &oldPalette[RGB_SIZE];
+	while (destP < &oldPalette[PALETTE_SIZE]) {
+		Common::copy(srcP, srcP + RGB_SIZE, destP);
+		srcP += 2 * RGB_SIZE;
+		destP += 2 * RGB_SIZE;
+	}
 
+	Common::Rect oldClip = _clipBounds;
+	resetClipBounds();
+	
 	copyRectTranslate(*this, oldMap, Common::Point(0, 0), 
 		Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
 	palette.setFullPalette(oldPalette);
+
+	setClipBounds(oldClip);
 }
 
-void ScreenSurface::swapPalette(byte *palData, byte swapTable[PALETTE_COUNT], 
-		int start) {
-	byte *dynamicList = &palData[start * 3];
+/**
+ * Translates a given palette into a mapping table.
+ * Palettes consist of 128 RGB entries for the foreground and background
+ * respectively, with the two interleaved together. So the start 
+ */
+void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUNT], 
+		bool foreground) {
+	int start = foreground ? 1 : 0;
+	const byte *dynamicList = &palData[start * RGB_SIZE];
 	int staticStart = 1 - start;
-	byte *staticList = &palData[staticStart * 3];
+	const byte *staticList = &palData[staticStart * RGB_SIZE];
 	const int PALETTE_START = 1;
 	const int PALETTE_END = 252;
 
@@ -781,13 +803,14 @@ void ScreenSurface::swapPalette(byte *palData, byte swapTable[PALETTE_COUNT],
 	for (int idx = 0; idx < PALETTE_COUNT; ++idx)
 		swapTable[idx] = idx;
 
-	for (int idx = 0; idx < 128; ++idx) {
+	// Handle the 128 palette entries for the foreground or background
+	for (int idx = 0; idx < (PALETTE_COUNT / 2); ++idx) {
 		if (start >= PALETTE_START && start <= PALETTE_END) {
 			swapTable[start] = Palette::closestColor(dynamicList, staticList, 
-				6, 128) * 2 + staticStart;
+				2 * RGB_SIZE, PALETTE_COUNT / 2) * 2 + staticStart;
 		}
 
-		dynamicList += 6;
+		dynamicList += 2 * RGB_SIZE;
 		start += 2;
 	}
 }
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index 35042e88d2..e2462aff18 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -217,9 +217,9 @@ private:
 		const Common::Point &srcPos, const Common::Point &destPos,
 		ThroughBlack throughBlack, bool setPalette, int numTicks);
 
-	void swapForeground(byte *palData, byte *paletteMap);
+	void swapForeground(byte newPalette[PALETTE_SIZE], byte *paletteMap);
 
-	void swapPalette(byte palData[PALETTE_SIZE], byte swapTable[PALETTE_COUNT], int start);
+	void swapPalette(const byte palData[PALETTE_SIZE], byte swapTable[PALETTE_COUNT], bool foreground);
 public:
 	int _shakeCountdown;
 public:
-- 
cgit v1.2.3


From d31e602add7e5466754d4b651ce7f947f6effdda Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Feb 2015 16:54:47 -0500
Subject: MADS: Allow Escape key to close game options dialog

---
 engines/mads/events.cpp                  |  2 +-
 engines/mads/events.h                    |  4 +++-
 engines/mads/game.cpp                    |  8 ++++----
 engines/mads/game.h                      |  2 +-
 engines/mads/nebular/dialogs_nebular.cpp | 21 ++++++++++++++++-----
 engines/mads/scene.cpp                   |  8 +++++---
 6 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index e7ec8b0821..586ef7cbf3 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -157,7 +157,7 @@ void EventsManager::pollEvents() {
 				_vm->_debugger->attach();
 				_vm->_debugger->onFrame();
 			} else {
-				_pendingKeys.push(event);
+				_pendingKeys.push(event.kbd);
 			}
 			return;
 		case Common::EVENT_KEYUP:
diff --git a/engines/mads/events.h b/engines/mads/events.h
index 870d6e03b8..21ef37407b 100644
--- a/engines/mads/events.h
+++ b/engines/mads/events.h
@@ -70,7 +70,7 @@ public:
 	int _vD2;
 	int _mouseStatusCopy;
 	bool _mouseMoved;
-	Common::Stack<Common::Event> _pendingKeys;
+	Common::Stack<Common::KeyState> _pendingKeys;
 public:
 	/**
 	 * Constructor
@@ -168,6 +168,8 @@ public:
 	 * Returns true if there's any pending keys to be processed
 	 */
 	bool isKeyPressed() const { return !_pendingKeys.empty(); }
+
+	Common::KeyState getKey() { return _pendingKeys.pop(); }
 };
 
 } // End of namespace MADS
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 0ce24daf7a..27691d3380 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -403,12 +403,12 @@ Common::StringArray Game::getMessage(uint32 id) {
 
 static const char *const DEBUG_STRING = "WIDEPIPE";
 
-void Game::handleKeypress(const Common::Event &event) {
-	if (event.kbd.flags & Common::KBD_CTRL) {
+void Game::handleKeypress(const Common::KeyState &kbd) {
+	if (kbd.flags & Common::KBD_CTRL) {
 		if (_widepipeCtr == 8) {
 			// Implement original game cheating keys here someday
 		} else {
-			if (event.kbd.keycode == (Common::KEYCODE_a +
+			if (kbd.keycode == (Common::KEYCODE_a +
 					(DEBUG_STRING[_widepipeCtr] - 'a'))) {
 				if (++_widepipeCtr == 8) {
 					MessageDialog *dlg = new MessageDialog(_vm, 2,
@@ -420,7 +420,7 @@ void Game::handleKeypress(const Common::Event &event) {
 		}
 	}
 
-	switch (event.kbd.keycode) {
+	switch (kbd.keycode) {
 	case Common::KEYCODE_F1:
 		_vm->_dialogs->_pendingDialog = DIALOG_GAME_MENU;
 		break;
diff --git a/engines/mads/game.h b/engines/mads/game.h
index 1a61fc8ac8..66f2580249 100644
--- a/engines/mads/game.h
+++ b/engines/mads/game.h
@@ -204,7 +204,7 @@ public:
 	/**
 	* Handle a keyboard event
 	*/
-	void handleKeypress(const Common::Event &event);
+	void handleKeypress(const Common::KeyState &kbd);
 
 	/**
 	 * Starts a savegame loading.
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 05c2e4ba96..be683d0b51 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -804,7 +804,7 @@ void GameDialog::show() {
 
 	Scene &scene = _vm->_game->_scene;
 
-	while (_selectedLine < 1 && !_vm->shouldQuit()) {
+	while (_selectedLine == -1 && !_vm->shouldQuit()) {
 		handleEvents();
 		if (_redrawFlag) {
 			if (!_tempLine)
@@ -831,7 +831,17 @@ void GameDialog::handleEvents() {
 		_lines[i]._state = DLGSTATE_UNSELECTED;
 
 	// Process pending events
-	_vm->_events->pollEvents();
+	events.pollEvents();
+
+	if (events.isKeyPressed()) {
+		switch (events.getKey().keycode) {
+		case Common::KEYCODE_ESCAPE:
+			_selectedLine = 0;
+			break;
+		default:
+			break;
+		}
+	}
 
 	// Scan for objects in the dialog
 	Common::Point mousePos = events.currentPos() - Common::Point(0, DIALOG_TOP);
@@ -1010,12 +1020,13 @@ void GameMenuDialog::show() {
 		_vm->_dialogs->_pendingDialog = DIALOG_OPTIONS;
 		_vm->_dialogs->showDialog();
 		break;
+	case 5:
+		_vm->quitGame();
+		break;
 	case 4:
+	default:
 		// Resume game
 		break;
-	case 5:
-	default:
-		_vm->quitGame();
 	}
 }
 
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index ea3fe2c148..61db1a6a32 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -592,12 +592,14 @@ void Scene::doSceneStep() {
 }
 
 void Scene::checkKeyboard() {
-	if (_vm->_events->isKeyPressed()) {
-		Common::Event evt = _vm->_events->_pendingKeys.pop();
+	EventsManager &events = *_vm->_events;
+
+	if (events.isKeyPressed()) {
+		Common::KeyState evt = events.getKey();
 		_vm->_game->handleKeypress(evt);
 	}
 
-	if ((_vm->_events->_mouseStatus & 3) == 3 && _vm->_game->_player._stepEnabled) {
+	if ((events._mouseStatus & 3) == 3 && _vm->_game->_player._stepEnabled) {
 		_reloadSceneFlag = true;
 		_vm->_dialogs->_pendingDialog = DIALOG_GAME_MENU;
 		_action.clear();
-- 
cgit v1.2.3


From be489d88e6f4e17e4c1873f97831237091c899c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Feb 2015 18:03:45 -0500
Subject: MADS: Fix palette loading for in-game dialogs

---
 engines/mads/nebular/dialogs_nebular.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index be683d0b51..6985455d2a 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -612,9 +612,12 @@ GameDialog::GameDialog(MADSEngine *vm) : FullScreenDialog(vm) {
 }
 
 void GameDialog::display() {
+	Palette &palette = *_vm->_palette;
+	palette.initPalette();
+	palette.resetGamePalette(18, 10);
+
 	FullScreenDialog::display();
 
-	Palette &palette = *_vm->_palette;
 	palette.setEntry(10, 0, 63, 0);
 	palette.setEntry(11, 0, 45, 0);
 	palette.setEntry(12, 63, 63, 0);
@@ -1094,7 +1097,7 @@ void OptionsDialog::show() {
 	StoryMode prevStoryMode = game._storyMode;
 
 	do {
-		_selectedLine = 0;
+		_selectedLine = -1;
 		GameDialog::show();
 
 		switch (_selectedLine) {
@@ -1133,22 +1136,16 @@ void OptionsDialog::show() {
 		clearLines();
 		setLines();
 		setClickableLines();
-	} while (_selectedLine <= 7);
+	} while (!_vm->shouldQuit() && _selectedLine != 0 && _selectedLine <= 7);
 
-	switch (_selectedLine) {
-	case 8:	// Done
-		// New options will be applied
-		break;
-	case 9:	// Cancel
+	// If Done button not pressed, reset settings
+	if (_selectedLine != 8) {
 		// Revert all options from the saved ones
 		_vm->_easyMouse = prevEasyMouse;
 		_vm->_invObjectsAnimated = prevInvObjectsAnimated;
 		_vm->_textWindowStill = prevTextWindowStill;
 		_vm->_screenFade = prevScreenFade;
 		game._storyMode = prevStoryMode;
-		break;
-	default:
-		break;
 	}
 }
 
-- 
cgit v1.2.3


From a505ae941c22149c9892470f6b11087f8ececb91 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Feb 2015 20:44:59 -0500
Subject: MADS: Fix picture when picking up timer module

---
 engines/mads/nebular/nebular_scenes1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index ab072c1d3c..7c85fd44db 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -1453,7 +1453,7 @@ void Scene103::actions() {
 			_scene->_hotspots.activate(371, false);
 			_vm->_game->_player._visible = true;
 			_vm->_game->_player._stepEnabled = true;
-			_vm->_dialogs->showItem(OBJ_REBREATHER, 805);
+			_vm->_dialogs->showItem(OBJ_TIMER_MODULE, 805);
 			break;
 
 		default:
-- 
cgit v1.2.3


From 2c9ad1ee9b439998b2dac178d295ce3f328b41ae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Feb 2015 21:34:09 -0500
Subject: MADS: Fix death animations for seaweed and underwater mine

---
 engines/mads/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 61db1a6a32..a72648f0c9 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -675,7 +675,7 @@ void Scene::freeCurrentScene() {
 }
 
 void Scene::removeSprites() {
-	for (int idx = _sprites.size() - 1; idx >= _spritesCount; --idx)
+	for (int idx = _sprites._assetCount - 1; idx >= _spritesCount; --idx)
 		_sprites.remove(idx);
 }
 
-- 
cgit v1.2.3


From 51561c80c0002ea3f59bc513592f04c656d32a65 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Feb 2015 07:19:42 -0500
Subject: MADS: Fix left edge screen clipping for non-scaled flipped sprites

---
 engines/mads/msurface.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index d8d01f307c..cc12442db1 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -308,6 +308,9 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth,
 		if (!copyRect.isValidRect())
 			return;
 
+		if (flipped)
+			copyRect.moveTo(0, copyRect.top);
+
 		byte *data = src->getData();
 		byte *srcPtr = data + (src->getWidth() * copyRect.top + copyRect.left);
 		byte *destPtr = (byte *)pixels + (destY * pitch) + destX;
-- 
cgit v1.2.3


From 5964cc239b920a4a5d3b8475cb6c0b111e968e03 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 7 Oct 2014 21:24:49 +0200
Subject: SCI: Always re-sort playlist in soundPlay

Previously, it would only sort if a song wasn't already in the playlist.
Since initSound already adds it, this effectively prevented the list
from being sorted.
---
 engines/sci/engine/savegame.cpp | 8 ++++++--
 engines/sci/sound/music.cpp     | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 692fa77a80..eee4c49729 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -639,8 +639,12 @@ void SoundCommandParser::syncPlayList(Common::Serializer &s) {
 void SoundCommandParser::reconstructPlayList() {
 	Common::StackLock lock(_music->_mutex);
 
-	const MusicList::iterator end = _music->getPlayListEnd();
-	for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) {
+	// We store all songs here because starting songs may re-shuffle their order
+	MusicList songs;
+	for (MusicList::iterator i = _music->getPlayListStart(); i != _music->getPlayListEnd(); ++i)
+		songs.push_back(*i);
+
+	for (MusicList::iterator i = songs.begin(); i != songs.end(); ++i) {
 		initSoundResource(*i);
 
 		if ((*i)->status == kSoundPlaying) {
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 4606d66ace..5b205c82d7 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -410,9 +410,10 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
 	}
 	if (playListNo == playListCount) { // not found
 		_playList.push_back(pSnd);
-		sortPlayList();
 	}
 
+	sortPlayList();
+
 	_mutex.unlock();	// unlock to perform mixer-related calls
 
 	if (pSnd->pMidiParser) {
-- 
cgit v1.2.3


From e42a5123572cabf435a90eee2f9c01ababbe8528 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 7 Oct 2014 21:30:45 +0200
Subject: SCI: Don't remap channels from playBed songs

---
 engines/sci/sound/music.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 5b205c82d7..d58479f18e 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -397,6 +397,9 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 void SciMusic::soundPlay(MusicEntry *pSnd) {
 	_mutex.lock();
 
+	// TODO: if pSnd->playBed, and version <= SCI1_EARLY, then kill
+	// existing sounds with playBed enabled.
+
 	uint playListCount = _playList.size();
 	uint playListNo = playListCount;
 	MusicEntry *alreadyPlaying = NULL;
@@ -1126,8 +1129,10 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 			if (channel._mute)
 				continue;
 
+			bool dontRemap = channel._dontRemap || song->playBed;
+
 #ifdef DEBUG_REMAP
-			debug("  Channel %d: prio %d, %d voice%s%s", c, channel._prio, channel._voices, channel._voices == 1 ? "" : "s", channel._dontRemap ? ", dontRemap" : "" );
+			debug("  Channel %d: prio %d, %d voice%s%s", c, channel._prio, channel._voices, channel._voices == 1 ? "" : "s", dontRemap ? ", dontRemap" : "" );
 #endif
 
 			DeviceChannelUsage dc = { song, c };
@@ -1135,7 +1140,7 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 			// our target
 			int devChannel = -1;
 
-			if (channel._dontRemap && map->_map[c]._song == 0) {
+			if (dontRemap && map->_map[c]._song == 0) {
 				// unremappable channel, with channel still free
 				devChannel = c;
 			}
@@ -1232,10 +1237,10 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 			map->_map[devChannel] = dc;
 			map->_voices[devChannel] = neededVoices;
 			map->_prio[devChannel] = prio;
-			map->_dontRemap[devChannel] = channel._dontRemap;
+			map->_dontRemap[devChannel] = dontRemap;
 			map->_freeVoices -= neededVoices;
 
-			if (!channel._dontRemap || devChannel == c) {
+			if (!dontRemap || devChannel == c) {
 				// If this channel fits here, we're done.
 #ifdef DEBUG_REMAP
 				debug("    OK");
-- 
cgit v1.2.3


From b80e74af5dec7675a2bf4a3f51da8501518c2be2 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 11 Oct 2014 17:31:12 +0200
Subject: SCI: Handle voice limits differently

For playBed songs, SCI1early remappers didn't unmap the entire song when
there weren't enough voices for a channel. Thanks waltervn.
---
 engines/sci/sound/music.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index d58479f18e..f69f40eeca 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1200,8 +1200,12 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 			int neededVoices = channel._voices;
 			// do we have enough free voices?
 			if (map->_freeVoices < neededVoices) {
-				// We only care for essential channels
-				if (prio > 0) {
+				// We only care for essential channels.
+				// Note: In early SCI1 interpreters, a song started by 'playBed'
+				// would not be skipped even if some channels couldn't be
+				// mapped due to voice limits. So, we treat all channels as
+				// non-essential here for playBed songs.
+				if (prio > 0 || (song->playBed && _soundVersion <= SCI_VERSION_1_EARLY)) {
 #ifdef DEBUG_REMAP
 					debug("   not enough voices; need %d, have %d. Skipping this channel.", neededVoices, map->_freeVoices);
 #endif
-- 
cgit v1.2.3


From 0aadd20aeaac1d241087e913a2bf8171bb0def68 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 19 Oct 2014 11:34:14 +0200
Subject: SCI: Add debugging output

---
 engines/sci/sound/midiparser_sci.cpp | 2 ++
 engines/sci/sound/music.cpp          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 7ee9cc9d28..7ebe47633a 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -487,6 +487,8 @@ void MidiParser_SCI::trackState(uint32 b) {
 			s._sustain = (op2 != 0);
 			break;
 		case 0x4B: // voices
+			if (s._voices != op2)
+				warning("Voice change (%d to %d) without remapping", s._voices, op2);
 			s._voices = op2;
 			_pSnd->_chan[channel]._voices = op2; // Also sync our MusicEntry
 			break;
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index f69f40eeca..62b17b2064 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1111,7 +1111,8 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 
 
 #ifdef DEBUG_REMAP
-		debug(" Song %d (%p), prio %d", songIndex, (void*)song, song->priority);
+		const char* name = g_sci->getEngineState()->_segMan->getObjectName(song->soundObj);
+		debug(" Song %d (%p) [%s], prio %d%s", songIndex, (void*)song, name, song->priority, song->playBed ? ", bed" : "");
 #endif
 
 		// Store backup. If we fail to map this song, we will revert to this.
-- 
cgit v1.2.3


From 0018bb0f6f36fd1798ec92d2e7e6654e026fe19b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 19 Oct 2014 13:01:56 +0200
Subject: SCI: Give songs that start playing later higher priority

---
 engines/sci/sound/music.cpp | 9 ++++++++-
 engines/sci/sound/music.h   | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 62b17b2064..2b73bcf8b3 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -144,6 +144,7 @@ void SciMusic::init() {
 		_globalReverb = _pMidiDrv->getReverb();	// Init global reverb for SCI0
 
 	_currentlyPlayingSample = NULL;
+	_timeCounter = 0;
 }
 
 void SciMusic::miditimerCallback(void *p) {
@@ -285,8 +286,10 @@ byte SciMusic::getCurrentReverb() {
 	return _pMidiDrv->getReverb();
 }
 
+// A larger priority value has higher priority. For equal priority values,
+// songs that have been added later have higher priority.
 static bool musicEntryCompare(const MusicEntry *l, const MusicEntry *r) {
-	return (l->priority > r->priority);
+	return (l->priority > r->priority) || (l->priority == r->priority && l->time > r->time);
 }
 
 void SciMusic::sortPlayList() {
@@ -317,6 +320,8 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 			track = digital;
 	}
 
+	pSnd->time = ++_timeCounter;
+
 	if (track) {
 		// Play digital sample
 		if (track->digitalChannelNr != -1) {
@@ -415,6 +420,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
 		_playList.push_back(pSnd);
 	}
 
+	pSnd->time = ++_timeCounter;
 	sortPlayList();
 
 	_mutex.unlock();	// unlock to perform mixer-related calls
@@ -560,6 +566,7 @@ void SciMusic::soundSetPriority(MusicEntry *pSnd, byte prio) {
 	Common::StackLock lock(_mutex);
 
 	pSnd->priority = prio;
+	pSnd->time = ++_timeCounter;
 	sortPlayList();
 }
 
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 0fbd5a0c0e..1347177054 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -75,6 +75,8 @@ public:
 	SoundResource *soundRes;
 	uint16 resourceId;
 
+	int time; // "tim"estamp to indicate in which order songs have been added
+
 	bool isQueued; // for SCI0 only!
 
 	uint16 dataInc;
@@ -267,6 +269,9 @@ private:
 	int _driverLastChannel;
 
 	MusicEntry *_currentlyPlayingSample;
+
+	int _timeCounter; // Used to keep track of the order in which MusicEntries
+	                  // are added, for priority purposes.
 };
 
 } // End of namespace Sci
-- 
cgit v1.2.3


From 5028487038fd3572d68af3cd253fc28917245e63 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 14 Feb 2015 15:20:23 +0100
Subject: SCI: Use sound resource priority by default for songs

SCI1 sound resources can have an embedded priority. We now use that by
default, unless an explicit DoSound/SetPriority call overrides it.
Thanks waltervn.

This fixes relative priority of songs in at least PQ3 room 29.

Also increase savegame version to 33.
---
 engines/sci/engine/savegame.cpp |  4 ++++
 engines/sci/engine/savegame.h   |  3 ++-
 engines/sci/resource.h          |  2 ++
 engines/sci/resource_audio.cpp  |  4 ++++
 engines/sci/sound/music.cpp     |  2 ++
 engines/sci/sound/music.h       |  1 +
 engines/sci/sound/soundcmd.cpp  | 26 +++++++++++++++-----------
 7 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index eee4c49729..61f8058e45 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -621,6 +621,10 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
 		s.syncAsByte(playBed);
 	else if (s.isLoading())
 		playBed = false;
+	if (s.getVersion() >= 33)
+		s.syncAsByte(overridePriority);
+	else if (s.isLoading())
+		overridePriority = false;
 
 	// pMidiParser and pStreamAud will be initialized when the
 	// sound list is reconstructed in gamestate_restore()
diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h
index be6d05cdc5..7f482ed0a1 100644
--- a/engines/sci/engine/savegame.h
+++ b/engines/sci/engine/savegame.h
@@ -37,6 +37,7 @@ struct EngineState;
  *
  * Version - new/changed feature
  * =============================
+ *      33 - new overridePriority flag in MusicEntry
  *      32 - new playBed flag in MusicEntry
  *      31 - priority for sound effects/music is now a signed int16, instead of a byte
  *      30 - synonyms
@@ -57,7 +58,7 @@ struct EngineState;
  */
 
 enum {
-	CURRENT_SAVEGAME_VERSION = 32,
+	CURRENT_SAVEGAME_VERSION = 33,
 	MINIMUM_SAVEGAME_VERSION = 14
 };
 
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 62f3c584ac..ef48998b04 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -596,6 +596,7 @@ public:
 	Track *getDigitalTrack();
 	int getChannelFilterMask(int hardwareMask, bool wantsRhythm);
 	byte getInitialVoiceCount(byte channel);
+	byte getSoundPriority() const { return _soundPriority; }
 
 private:
 	SciVersion _soundVersion;
@@ -603,6 +604,7 @@ private:
 	Track *_tracks;
 	Resource *_innerResource;
 	ResourceManager *_resMan;
+	byte _soundPriority;
 };
 
 } // End of namespace Sci
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index c775f502c5..3a43774492 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -579,6 +579,7 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
 		return;
 
 	_innerResource = resource;
+	_soundPriority = 0xFF;
 
 	byte *data, *data2;
 	byte *dataEnd;
@@ -725,6 +726,9 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
 					data += 6;
 				}
 			} else {
+				// The first byte of the 0xF0 track's channel list is priority
+				_soundPriority = *data;
+
 				// Skip over digital track
 				data += 6;
 			}
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 2b73bcf8b3..dab02c9eb7 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -340,6 +340,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 			pSnd->soundType = Audio::Mixer::kSFXSoundType;
 			pSnd->hCurrentAud = Audio::SoundHandle();
 			pSnd->playBed = false;
+			pSnd->overridePriority = false;
 		} else {
 			// play MIDI track
 			Common::StackLock lock(_mutex);
@@ -387,6 +388,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 			pSnd->loop = 0;
 			pSnd->hold = -1;
 			pSnd->playBed = false;
+			pSnd->overridePriority = false;
 
 			pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);
 			pSnd->reverb = pSnd->pMidiParser->getSongReverb();
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 1347177054..8770748c3d 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -88,6 +88,7 @@ public:
 	int16 hold;
 	int8 reverb;
 	bool playBed;
+	bool overridePriority; // Use soundObj's priority instead of resource's
 
 	int16 pauseCounter;
 	uint sampleLoopCounter;
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 47ab9bdc71..682c88f382 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -184,7 +184,15 @@ void SoundCommandParser::processPlaySound(reg_t obj, bool playBed) {
 	}
 
 	musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop));
-	musicSlot->priority = readSelectorValue(_segMan, obj, SELECTOR(priority));
+
+	// Get song priority from either obj or soundRes
+	byte resourcePriority = musicSlot->soundRes->getSoundPriority();
+	if (!musicSlot->overridePriority && resourcePriority != 0xFF) {
+		musicSlot->priority = resourcePriority;
+	} else {
+		musicSlot->priority = readSelectorValue(_segMan, obj, SELECTOR(priority));
+	}
+
 	// Reset hold when starting a new song. kDoSoundSetHold is always called after
 	// kDoSoundPlay to set it properly, if needed. Fixes bug #3413589.
 	musicSlot->hold = -1;
@@ -677,23 +685,19 @@ reg_t SoundCommandParser::kDoSoundSetPriority(int argc, reg_t *argv, reg_t acc)
 	}
 
 	if (value == -1) {
-		uint16 resourceId = musicSlot->resourceId;
+		musicSlot->overridePriority = false;
+		musicSlot->priority = 0;
 
-		// Set priority from the song data
-		Resource *song = _resMan->findResource(ResourceId(kResourceTypeSound, resourceId), 0);
-		if (song->data[0] == 0xf0)
-			_music->soundSetPriority(musicSlot, song->data[1]);
-		else
-			warning("kDoSound(setPriority): Attempt to unset song priority when there is no built-in value");
+		// NB: It seems SSCI doesn't actually reset the priority here.
 
-		//pSnd->prio=0;field_15B=0
 		writeSelectorValue(_segMan, obj, SELECTOR(flags), readSelectorValue(_segMan, obj, SELECTOR(flags)) & 0xFD);
 	} else {
 		// Scripted priority
+		musicSlot->overridePriority = true;
 
-		//pSnd->field_15B=1;
 		writeSelectorValue(_segMan, obj, SELECTOR(flags), readSelectorValue(_segMan, obj, SELECTOR(flags)) | 2);
-		//DoSOund(0xF,hobj,w)
+
+		_music->soundSetPriority(musicSlot, value);
 	}
 	return acc;
 }
-- 
cgit v1.2.3


From 1c5722f014d1f5a34c79d8d1cb7f5ed86e0b822d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 14 Feb 2015 15:58:47 +0100
Subject: SCI: Allow channel remapping from audio thread too

---
 engines/sci/sound/midiparser_sci.cpp | 12 +++++++----
 engines/sci/sound/music.cpp          | 42 ++++++++++++++++++++++--------------
 engines/sci/sound/music.h            |  7 ++++--
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 7ebe47633a..25facacced 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -487,8 +487,11 @@ void MidiParser_SCI::trackState(uint32 b) {
 			s._sustain = (op2 != 0);
 			break;
 		case 0x4B: // voices
-			if (s._voices != op2)
-				warning("Voice change (%d to %d) without remapping", s._voices, op2);
+			if (s._voices != op2) {
+				// CHECKME: Should we directly call remapChannels() if _mainThreadCalled?
+				debugC(2, kDebugLevelSound, "Dynamic voice change (%d to %d)", s._voices, op2);
+				_music->needsRemap();
+			}
 			s._voices = op2;
 			_pSnd->_chan[channel]._voices = op2; // Also sync our MusicEntry
 			break;
@@ -500,8 +503,9 @@ void MidiParser_SCI::trackState(uint32 b) {
 				bool m = op2;
 				if (_pSnd->_chan[channel]._mute != m) {
 					_pSnd->_chan[channel]._mute = m;
-					// TODO: If muting/unmuting a channel, remap channels.
-					warning("Mute change without immediate remapping (mainThread = %d)", _mainThreadCalled);
+					// CHECKME: Should we directly call remapChannels() if _mainThreadCalled?
+					_music->needsRemap();
+					debugC(2, kDebugLevelSound, "Dynamic mute change (mainThread = %d)", _mainThreadCalled);
 				}
 			}
 			break;
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index dab02c9eb7..37bf6a7b1b 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -145,6 +145,7 @@ void SciMusic::init() {
 
 	_currentlyPlayingSample = NULL;
 	_timeCounter = 0;
+	_needsRemap = false;
 }
 
 void SciMusic::miditimerCallback(void *p) {
@@ -159,6 +160,11 @@ void SciMusic::onTimer() {
 	// sending out queued commands that were "sent" via main thread
 	sendMidiCommandsFromQueue();
 
+	// remap channels, if requested
+	if (_needsRemap)
+		remapChannels(false);
+	_needsRemap = false;
+
 	for (MusicList::iterator i = _playList.begin(); i != end; ++i)
 		(*i)->onTimer();
 }
@@ -920,12 +926,12 @@ int ChannelRemapping::lowestPrio() const {
 }
 
 
-void SciMusic::remapChannels() {
+void SciMusic::remapChannels(bool mainThread) {
 	if (_soundVersion <= SCI_VERSION_0_LATE)
 		return;
 
-	// NB: This function should only be called from the main thread,
-	// with _mutex locked
+	// NB: This function should only be called with _mutex locked
+	// Make sure to set the mainThread argument correctly.
 
 
 	ChannelRemapping *map = determineChannelMap();
@@ -978,9 +984,9 @@ void SciMusic::remapChannels() {
 
 		for (int j = 0; j < 16; ++j) {
 			if (!channelMapped[j]) {
-				song->pMidiParser->mainThreadBegin();
+				if (mainThread) song->pMidiParser->mainThreadBegin();
 				song->pMidiParser->remapChannel(j, -1);
-				song->pMidiParser->mainThreadEnd();
+				if (mainThread) song->pMidiParser->mainThreadEnd();
 #ifdef DEBUG_REMAP
 				if (channelUsed[j])
 					debug(" Unmapping song %d, channel %d", songIndex, j);
@@ -1012,9 +1018,9 @@ void SciMusic::remapChannels() {
 #ifdef DEBUG_REMAP
 			debug(" Mapping (dontRemap) song %d, channel %d to device channel %d", songIndex, _channelMap[i]._channel, i);
 #endif
-			_channelMap[i]._song->pMidiParser->mainThreadBegin();
+			if (mainThread) _channelMap[i]._song->pMidiParser->mainThreadBegin();
 			_channelMap[i]._song->pMidiParser->remapChannel(_channelMap[i]._channel, i);
-			_channelMap[i]._song->pMidiParser->mainThreadEnd();
+			if (mainThread) _channelMap[i]._song->pMidiParser->mainThreadEnd();
 		}
 
 	}
@@ -1067,9 +1073,9 @@ void SciMusic::remapChannels() {
 #ifdef DEBUG_REMAP
 				debug(" Mapping song %d, channel %d to device channel %d", songIndex, _channelMap[j]._channel, j);
 #endif
-				_channelMap[j]._song->pMidiParser->mainThreadBegin();
+				if (mainThread) _channelMap[j]._song->pMidiParser->mainThreadBegin();
 				_channelMap[j]._song->pMidiParser->remapChannel(_channelMap[j]._channel, j);
-				_channelMap[j]._song->pMidiParser->mainThreadEnd();
+				if (mainThread) _channelMap[j]._song->pMidiParser->mainThreadEnd();
 				break;
 			}
 		}
@@ -1079,7 +1085,7 @@ void SciMusic::remapChannels() {
 	// And finally, stop any empty channels
 	for (int i = _driverLastChannel; i >= _driverFirstChannel; --i) {
 		if (!_channelMap[i]._song && currentMap[i]._song)
-			resetDeviceChannel(i);
+			resetDeviceChannel(i, mainThread);
 	}
 
 	delete map;
@@ -1307,14 +1313,18 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 	return map;
 }
 
-void SciMusic::resetDeviceChannel(int devChannel) {
-	// NB: This function should only be called from the main thread
-
+void SciMusic::resetDeviceChannel(int devChannel, bool mainThread) {
 	assert(devChannel >= 0 && devChannel <= 0x0F);
 
-	putMidiCommandInQueue(0x0040B0 | devChannel); // sustain off
-	putMidiCommandInQueue(0x007BB0 | devChannel); // notes off
-	putMidiCommandInQueue(0x004BB0 | devChannel); // release voices
+	if (mainThread) {
+		putMidiCommandInQueue(0x0040B0 | devChannel); // sustain off
+		putMidiCommandInQueue(0x007BB0 | devChannel); // notes off
+		putMidiCommandInQueue(0x004BB0 | devChannel); // release voices
+	} else {
+		_pMidiDrv->send(0x0040B0 | devChannel); // sustain off
+		_pMidiDrv->send(0x007BB0 | devChannel); // notes off
+		_pMidiDrv->send(0x004BB0 | devChannel); // release voices
+	}
 }
 
 
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 8770748c3d..a610f32d89 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -228,6 +228,8 @@ public:
 
 	byte getCurrentReverb();
 
+	void needsRemap() { _needsRemap = true; }
+
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 
 	// Mutex for music code. Used to guard access to the song playlist, to the
@@ -249,9 +251,9 @@ protected:
 	bool _useDigitalSFX;
 
 	// remapping:
-	void remapChannels();
+	void remapChannels(bool mainThread = true);
 	ChannelRemapping *determineChannelMap();
-	void resetDeviceChannel(int devChannel);
+	void resetDeviceChannel(int devChannel, bool mainThread);
 
 private:
 	MusicList _playList;
@@ -260,6 +262,7 @@ private:
 	MusicEntry *_usedChannel[16];
 	int8 _channelRemap[16];
 	int8 _globalReverb;
+	bool _needsRemap;
 
 	DeviceChannelUsage _channelMap[16];
 
-- 
cgit v1.2.3


From 7658821afd7a6d2e70286866c15eff7dd2618115 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Feb 2015 08:10:13 -0500
Subject: MADS: Fix left screen clipping for scaled flipped sprites

---
 engines/mads/msurface.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index cc12442db1..702b9e5f08 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -400,14 +400,16 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth,
 		const byte *srcP = srcPixelsP;
 		byte *destP = destPixelsP;
 
-		for (int xp = 0, sprX = 0; xp < frameWidth; ++xp, ++srcP) {
-			if (xp < spriteLeft)
-				// Not yet reached start of display area
-				continue;
-			if (!lineDist[sprX++])
+		for (int xp = 0, sprX = -1; xp < frameWidth; ++xp, ++srcP) {
+			if (!lineDist[xp])
 				// Not a display pixel
 				continue;
 
+			++sprX;
+			if (sprX < spriteLeft || sprX >= spriteRight)
+				// Skip pixel if it's not in horizontal display portion
+				continue;
+
 			// Get depth of current output pixel in depth surface
 			Common::Point pt((destP - (byte *)this->pixels) % this->pitch,
 				(destP - (byte *)this->pixels) / this->pitch);
-- 
cgit v1.2.3


From d0cb5f51fddcd74461914fb28ef4fbd685833eae Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 15 Feb 2015 10:28:06 +0100
Subject: SCI: Only allow a single 'playBed' song in SCI1early

---
 engines/sci/sound/music.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 37bf6a7b1b..7156e3c099 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -410,8 +410,22 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 void SciMusic::soundPlay(MusicEntry *pSnd) {
 	_mutex.lock();
 
-	// TODO: if pSnd->playBed, and version <= SCI1_EARLY, then kill
-	// existing sounds with playBed enabled.
+	if (_soundVersion <= SCI_VERSION_1_EARLY && pSnd->playBed) {
+		// If pSnd->playBed, and version <= SCI1_EARLY, then kill
+		// existing sounds with playBed enabled.
+
+		uint playListCount = _playList.size();
+		for (uint i = 0; i < playListCount; i++) {
+			if (_playList[i] != pSnd && _playList[i]->playBed) {
+				debugC(2, kDebugLevelSound, "Automatically stopping old playBed song from soundPlay");
+				MusicEntry *old = _playList[i];
+				_mutex.unlock();
+				soundStop(old);
+				_mutex.lock();
+				break;
+			}
+		}
+	}
 
 	uint playListCount = _playList.size();
 	uint playListNo = playListCount;
-- 
cgit v1.2.3


From 2b49b5f95e8d6bd5ea3ab8ffb20ebad2ae7fc95e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 15 Feb 2015 14:14:46 +0100
Subject: SCI: Fix sound object frame selector rate

Thanks waltervn. Verified against asm (QfG2, KQ6CD)
---
 engines/sci/sound/soundcmd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 682c88f382..64991cbf5c 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -550,7 +550,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 	if (_soundVersion >= SCI_VERSION_1_EARLY) {
 		writeSelectorValue(_segMan, obj, SELECTOR(min), musicSlot->ticker / 3600);
 		writeSelectorValue(_segMan, obj, SELECTOR(sec), musicSlot->ticker % 3600 / 60);
-		writeSelectorValue(_segMan, obj, SELECTOR(frame), musicSlot->ticker);
+		writeSelectorValue(_segMan, obj, SELECTOR(frame), musicSlot->ticker % 60 / 2);
 	}
 }
 
-- 
cgit v1.2.3


From 7739e12e42edae68264a9675ede1bd840ae3be6b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Feb 2015 09:50:14 -0500
Subject: MADS: Stop player disappearing after cutscene of fish being eaten

---
 engines/mads/player.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index bde313af8d..e7993f378a 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -509,10 +509,11 @@ void Player::idle() {
 		return;
 	}
 
-	if ((_spritesStart + _spritesIdx) < 0 || !_spriteSetsPresent[_spritesStart + _spritesIdx])
+	int idx = _spritesStart + _spritesIdx;
+	if (idx < 0 || (idx < PLAYER_SPRITES_FILE_COUNT && !_spriteSetsPresent[idx]))
 		return;
 
-	SpriteAsset &spriteSet = *scene._sprites[_spritesStart + _spritesIdx];
+	SpriteAsset &spriteSet = *scene._sprites[idx];
 	assert(spriteSet._charInfo);
 	if (spriteSet._charInfo->_numEntries == 0)
 		// No entries, so exit immediately
-- 
cgit v1.2.3


From db325695f42e2dec3163b9a371085d8561e5a42a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Feb 2015 11:07:33 -0500
Subject: MADS: Fix proper cycling of idle animations

---
 engines/mads/player.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index e7993f378a..1622031c6c 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -235,11 +235,12 @@ void Player::selectSeries() {
 
 void Player::updateFrame() {
 	// WORKAROUND: Prevent character info being referenced when not present
-	if ((_spritesStart + _spritesIdx) < 0 || !_spriteSetsPresent[_spritesStart + _spritesIdx])
+	int idx = _spritesStart + _spritesIdx;
+	if (idx < 0 || (idx < PLAYER_SPRITES_FILE_COUNT && !_spriteSetsPresent[idx]))
 		return;
 
 	Scene &scene = _vm->_game->_scene;
-	SpriteAsset &spriteSet = *scene._sprites[_spritesStart + _spritesIdx];
+	SpriteAsset &spriteSet = *scene._sprites[idx];
 	assert(spriteSet._charInfo);
 
 	if (!spriteSet._charInfo->_numEntries) {
@@ -529,11 +530,11 @@ void Player::idle() {
 		_frameNumber += direction;
 		_forceRefresh = true;
 
-		if (spriteSet._charInfo->_stopFrames[frameIndex] < _frameNumber) {
+		if (_frameNumber > spriteSet._charInfo->_stopFrames[frameIndex]) {
 			_trigger = _upcomingTrigger;
 			updateFrame();
 		}
-		if (spriteSet._charInfo->_startFrames[frameIndex] < _frameNumber) {
+		if (_frameNumber < spriteSet._charInfo->_startFrames[frameIndex]) {
 			_trigger = _upcomingTrigger;
 			updateFrame();
 		}
-- 
cgit v1.2.3


From 165a8c26b9c47c056e679eb55ae9e73e15af2b14 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 15 Feb 2015 18:25:50 +0100
Subject: SCI: Fix version check for MIDI controller 4E

This is only supported since SCI1 middle, as verified with xmas1990, SCI1 mgoose, SQ4 floppy, LSL1, Jones floppy.

Fixes missing sounds in Jones floppy.
---
 engines/sci/sound/midiparser_sci.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 25facacced..ed61a57729 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -498,7 +498,7 @@ void MidiParser_SCI::trackState(uint32 b) {
 		case 0x4E: // mute
 			// This is channel mute only for sci1.
 			// (It's velocity control for sci0, but we don't need state in sci0)
-			if (_soundVersion >= SCI_VERSION_1_EARLY) {
+			if (_soundVersion > SCI_VERSION_1_EARLY) {
 				// FIXME: mute is a level, not a bool, in some SCI versions
 				bool m = op2;
 				if (_pSnd->_chan[channel]._mute != m) {
-- 
cgit v1.2.3


From f477de200916f68fe8e82025f80b13e8288f6589 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 15 Feb 2015 18:28:34 +0100
Subject: SCI: Add more audio debugging output

---
 engines/sci/sound/midiparser_sci.cpp |  2 +-
 engines/sci/sound/music.cpp          | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index ed61a57729..9f0d8d150f 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -505,7 +505,7 @@ void MidiParser_SCI::trackState(uint32 b) {
 					_pSnd->_chan[channel]._mute = m;
 					// CHECKME: Should we directly call remapChannels() if _mainThreadCalled?
 					_music->needsRemap();
-					debugC(2, kDebugLevelSound, "Dynamic mute change (mainThread = %d)", _mainThreadCalled);
+					debugC(2, kDebugLevelSound, "Dynamic mute change (arg = %d, mainThread = %d)", m, _mainThreadCalled);
 				}
 			}
 			break;
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 7156e3c099..dca73c3f51 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1154,10 +1154,18 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 			if (c == 0xFF || c == 0xFE || c == 0x0F)
 				continue;
 			const MusicEntryChannel &channel = song->_chan[c];
-			if (channel._dontMap)
+			if (channel._dontMap) {
+#ifdef DEBUG_REMAP
+				debug("  Channel %d dontMap, skipping", c);
+#endif
 				continue;
-			if (channel._mute)
+			}
+			if (channel._mute) {
+#ifdef DEBUG_REMAP
+				debug("  Channel %d muted, skipping", c);
+#endif
 				continue;
+			}
 
 			bool dontRemap = channel._dontRemap || song->playBed;
 
-- 
cgit v1.2.3


From 60e83c2d9ca68e4dd90c0d644ac500b5f3be491e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Feb 2015 20:49:16 +0200
Subject: PEGASUS: Silence two MSVC warnings

---
 engines/pegasus/menu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp
index 4bbda8fd93..3e9bf540fe 100644
--- a/engines/pegasus/menu.cpp
+++ b/engines/pegasus/menu.cpp
@@ -258,12 +258,12 @@ void MainMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
 	bool isDemo = vm->isDemo();
 
 	if (input.upButtonDown()) {
-		if (_menuSelection > (isDemo ? kFirstSelectionDemo : kFirstSelection)) {
+		if (_menuSelection > (uint32)(isDemo ? kFirstSelectionDemo : kFirstSelection)) {
 			_menuSelection--;
 			updateDisplay();
 		}
 	} else if (input.downButtonDown()) {
-		if (_menuSelection < (isDemo ? kLastSelectionDemo : kLastSelection)) {
+		if (_menuSelection < (uint32)(isDemo ? kLastSelectionDemo : kLastSelection)) {
 			_menuSelection++;
 			updateDisplay();
 		}
-- 
cgit v1.2.3


From 627d766325e1d435816648f85dbf9c007269b3f2 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 16 Feb 2015 00:49:42 +0100
Subject: SDL: Add basic abstraction class for the SDL window.

---
 backends/events/sdl/sdl-events.cpp                 |   4 +-
 backends/events/symbiansdl/symbiansdl-events.cpp   |   2 +-
 backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp |   6 +-
 backends/graphics/dinguxsdl/dinguxsdl-graphics.h   |   2 +-
 backends/graphics/gph/gph-graphics.cpp             |   6 +-
 backends/graphics/gph/gph-graphics.h               |   2 +-
 .../linuxmotosdl/linuxmotosdl-graphics.cpp         |   6 +-
 .../graphics/linuxmotosdl/linuxmotosdl-graphics.h  |   2 +-
 backends/graphics/maemosdl/maemosdl-graphics.cpp   |   4 +-
 backends/graphics/maemosdl/maemosdl-graphics.h     |   2 +-
 backends/graphics/openglsdl/openglsdl-graphics.cpp |  26 ++--
 backends/graphics/openglsdl/openglsdl-graphics.h   |   2 +-
 backends/graphics/openpandora/op-graphics.cpp      |   4 +-
 backends/graphics/openpandora/op-graphics.h        |   2 +-
 .../samsungtvsdl/samsungtvsdl-graphics.cpp         |   4 +-
 .../graphics/samsungtvsdl/samsungtvsdl-graphics.h  |   2 +-
 backends/graphics/sdl/sdl-graphics.cpp             | 162 +--------------------
 backends/graphics/sdl/sdl-graphics.h               |  67 +--------
 .../graphics/surfacesdl/surfacesdl-graphics.cpp    |  18 +--
 backends/graphics/surfacesdl/surfacesdl-graphics.h |   2 +-
 .../graphics/symbiansdl/symbiansdl-graphics.cpp    |   4 +-
 backends/graphics/symbiansdl/symbiansdl-graphics.h |   2 +-
 backends/graphics/wincesdl/wincesdl-graphics.cpp   |   4 +-
 backends/graphics/wincesdl/wincesdl-graphics.h     |   2 +-
 backends/platform/dingux/dingux.cpp                |   2 +-
 backends/platform/gph/gph-backend.cpp              |   2 +-
 backends/platform/linuxmoto/linuxmoto-sdl.cpp      |   2 +-
 backends/platform/maemo/maemo.cpp                  |   2 +-
 backends/platform/openpandora/op-backend.cpp       |   2 +-
 backends/platform/samsungtv/samsungtv.cpp          |   2 +-
 backends/platform/sdl/module.mk                    |   3 +-
 backends/platform/sdl/sdl-window.cpp               | 155 ++++++++++++++++++++
 backends/platform/sdl/sdl-window.h                 | 103 +++++++++++++
 backends/platform/sdl/sdl.cpp                      |  24 +--
 backends/platform/sdl/sdl.h                        |   6 +
 backends/platform/symbian/src/SymbianOS.cpp        |   2 +-
 backends/platform/wince/wince-sdl.cpp              |   2 +-
 37 files changed, 353 insertions(+), 291 deletions(-)
 create mode 100644 backends/platform/sdl/sdl-window.cpp
 create mode 100644 backends/platform/sdl/sdl-window.h

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 21b0fbad32..18fe5453f8 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -183,7 +183,7 @@ void SdlEventSource::handleKbdMouse() {
 			}
 
 			if (_graphicsManager) {
-				_graphicsManager->warpMouseInWindow((Uint16)_km.x, (Uint16)_km.y);
+				_graphicsManager->getWindow()->warpMouseInWindow((Uint16)_km.x, (Uint16)_km.y);
 			}
 		}
 	}
@@ -471,7 +471,7 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
 	// Ctrl-m toggles mouse capture
 	if (event.kbd.hasFlags(Common::KBD_CTRL) && ev.key.keysym.sym == 'm') {
 		if (_graphicsManager) {
-			_graphicsManager->toggleMouseGrab();
+			_graphicsManager->getWindow()->toggleMouseGrab();
 		}
 		return false;
 	}
diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp
index 97361e3df0..b0d2c25302 100644
--- a/backends/events/symbiansdl/symbiansdl-events.cpp
+++ b/backends/events/symbiansdl/symbiansdl-events.cpp
@@ -134,7 +134,7 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 						event.type = Common::EVENT_MOUSEMOVE;
 						processMouseEvent(event, _mouseXZone[_currentZone], _mouseYZone[_currentZone]);
 						if (_graphicsManager) {
-							_graphicsManager->warpMouseInWindow(event.mouse.x, event.mouse.y);
+							_graphicsManager->getWindow()->warpMouseInWindow(event.mouse.x, event.mouse.y);
 						}
 				}
 
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 975e34a314..0b9cc0c7e8 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -35,8 +35,8 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{0, 0, 0}
 };
 
-DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss)
-	: SurfaceSdlGraphicsManager(boss) {
+DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(boss, window) {
 }
 
 const OSystem::GraphicsMode *DINGUXSdlGraphicsManager::getSupportedGraphicsModes() const {
@@ -122,7 +122,7 @@ void DINGUXSdlGraphicsManager::initSize(uint w, uint h) {
 	if (w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		toggleMouseGrab();
+		_window->toggleMouseGrab();
 	}
 
 	_transactionDetails.sizeChanged = true;
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.h b/backends/graphics/dinguxsdl/dinguxsdl-graphics.h
index fc70e721cf..8a356106ad 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.h
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.h
@@ -34,7 +34,7 @@ enum {
 
 class DINGUXSdlGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	DINGUXSdlGraphicsManager(SdlEventSource *boss);
+	DINGUXSdlGraphicsManager(SdlEventSource *boss, SdlWindow *window);
 
 	bool hasFeature(OSystem::Feature f);
 	void setFeatureState(OSystem::Feature f, bool enable);
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index 247e5ed490..65cb3d1d65 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -35,8 +35,8 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{0, 0, 0}
 };
 
-GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *sdlEventSource)
-	: SurfaceSdlGraphicsManager(sdlEventSource) {
+GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(sdlEventSource, window) {
 }
 
 const OSystem::GraphicsMode *GPHGraphicsManager::getSupportedGraphicsModes() const {
@@ -141,7 +141,7 @@ void GPHGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFormat *f
 	if (w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		_eventSource->toggleMouseGrab();
+		_window->toggleMouseGrab();
 	}
 
 	_videoMode.overlayWidth = 320;
diff --git a/backends/graphics/gph/gph-graphics.h b/backends/graphics/gph/gph-graphics.h
index 4a68ea6eed..152d29ddf4 100644
--- a/backends/graphics/gph/gph-graphics.h
+++ b/backends/graphics/gph/gph-graphics.h
@@ -33,7 +33,7 @@ enum {
 
 class GPHGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	GPHGraphicsManager(SdlEventSource *boss);
+	GPHGraphicsManager(SdlEventSource *boss, SdlWindow *window);
 
 	bool hasFeature(OSystem::Feature f);
 	void setFeatureState(OSystem::Feature f, bool enable);
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index f8ab9930d7..52e5b42e8b 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -45,8 +45,8 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{0, 0, 0}
 };
 
-LinuxmotoSdlGraphicsManager::LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource)
- : SurfaceSdlGraphicsManager(sdlEventSource) {
+LinuxmotoSdlGraphicsManager::LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+ : SurfaceSdlGraphicsManager(sdlEventSource, window) {
 }
 
 const OSystem::GraphicsMode *LinuxmotoSdlGraphicsManager::getSupportedGraphicsModes() const {
@@ -134,7 +134,7 @@ void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h) {
 	if	(w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		toggleMouseGrab();
+		_window->toggleMouseGrab();
 	}
 
 	_transactionDetails.sizeChanged = true;
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
index 8760c5004d..d7a13b1cb4 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
@@ -27,7 +27,7 @@
 
 class LinuxmotoSdlGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource);
+	LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
 	virtual void initSize(uint w, uint h);
 	virtual void setGraphicsModeIntern();
diff --git a/backends/graphics/maemosdl/maemosdl-graphics.cpp b/backends/graphics/maemosdl/maemosdl-graphics.cpp
index 07d6d32d3a..478d022aa0 100644
--- a/backends/graphics/maemosdl/maemosdl-graphics.cpp
+++ b/backends/graphics/maemosdl/maemosdl-graphics.cpp
@@ -29,8 +29,8 @@
 #include "backends/events/maemosdl/maemosdl-events.h"
 #include "backends/graphics/maemosdl/maemosdl-graphics.h"
 
-MaemoSdlGraphicsManager::MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource)
-	: SurfaceSdlGraphicsManager(sdlEventSource) {
+MaemoSdlGraphicsManager::MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(sdlEventSource, window) {
 }
 
 bool MaemoSdlGraphicsManager::loadGFXMode() {
diff --git a/backends/graphics/maemosdl/maemosdl-graphics.h b/backends/graphics/maemosdl/maemosdl-graphics.h
index c255e94653..4cb84c81ee 100644
--- a/backends/graphics/maemosdl/maemosdl-graphics.h
+++ b/backends/graphics/maemosdl/maemosdl-graphics.h
@@ -29,7 +29,7 @@
 
 class MaemoSdlGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource);
+	MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
 protected:
 	virtual bool loadGFXMode();
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 2710b66ecd..c71b9c9219 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -28,8 +28,8 @@
 #include "common/translation.h"
 #endif
 
-OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource)
-    : SdlGraphicsManager(eventSource), _lastRequestedHeight(0),
+OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource, SdlWindow *window)
+    : SdlGraphicsManager(eventSource, window), _lastRequestedHeight(0),
 #if SDL_VERSION_ATLEAST(2, 0, 0)
       _glContext(),
 #else
@@ -134,7 +134,7 @@ void OpenGLSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
 
 	case OSystem::kFeatureIconifyWindow:
 		if (enable) {
-			iconifyWindow();
+			_window->iconifyWindow();
 		}
 		break;
 
@@ -148,7 +148,7 @@ bool OpenGLSdlGraphicsManager::getFeatureState(OSystem::Feature f) {
 	case OSystem::kFeatureFullscreenMode:
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 		if (_window) {
-			return (SDL_GetWindowFlags(_window) & SDL_WINDOW_FULLSCREEN) != 0;
+			return (SDL_GetWindowFlags(_window->getSDLWindow()) & SDL_WINDOW_FULLSCREEN) != 0;
 		} else {
 			return _wantsFullScreen;
 		}
@@ -236,7 +236,7 @@ void OpenGLSdlGraphicsManager::updateScreen() {
 
 	// Swap OpenGL buffers
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_GL_SwapWindow(_window);
+	SDL_GL_SwapWindow(_window->getSDLWindow());
 #else
 	SDL_GL_SwapBuffers();
 #endif
@@ -271,7 +271,7 @@ void OpenGLSdlGraphicsManager::notifyMousePos(Common::Point mouse) {
 }
 
 void OpenGLSdlGraphicsManager::setInternalMousePosition(int x, int y) {
-	warpMouseInWindow(x, y);
+	_window->warpMouseInWindow(x, y);
 }
 
 bool OpenGLSdlGraphicsManager::loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) {
@@ -362,7 +362,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		_glContext = nullptr;
 	}
 
-	destroyWindow();
+	_window->destroyWindow();
 
 	uint32 flags = SDL_WINDOW_OPENGL;
 	if (_wantsFullScreen) {
@@ -371,26 +371,26 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		flags |= SDL_WINDOW_RESIZABLE;
 	}
 
-	if (!createWindow(width, height, flags)) {
+	if (!_window->createWindow(width, height, flags)) {
 		// We treat fullscreen requests as a "hint" for now. This means in
 		// case it is not available we simply ignore it.
 		if (_wantsFullScreen) {
-			createWindow(width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
+			_window->createWindow(width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
 		}
 
-		if (!_window) {
+		if (!_window->getSDLWindow()) {
 			return false;
 		}
 	}
 
-	_glContext = SDL_GL_CreateContext(_window);
+	_glContext = SDL_GL_CreateContext(_window->getSDLWindow());
 	if (!_glContext) {
 		return false;
 	}
 
 	notifyContextCreate(rgba8888, rgba8888);
 	int actualWidth, actualHeight;
-	SDL_GetWindowSize(_window, &actualWidth, &actualHeight);
+	getWindowDimensions(&actualWidth, &actualHeight);
 	setActualScreenSize(actualWidth, actualHeight);
 	return true;
 #else
@@ -451,7 +451,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 
 void OpenGLSdlGraphicsManager::getWindowDimensions(int *width, int *height) {
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_GetWindowSize(_window, width, height);
+	SDL_GetWindowSize(_window->getSDLWindow(), width, height);
 #else
 	if (width) {
 		*width = _hwScreen->w;
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index 1e927df766..845880eb14 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -32,7 +32,7 @@
 
 class OpenGLSdlGraphicsManager : public OpenGL::OpenGLGraphicsManager, public SdlGraphicsManager, public Common::EventObserver {
 public:
-	OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource);
+	OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource, SdlWindow *window);
 	virtual ~OpenGLSdlGraphicsManager();
 
 	// GraphicsManager API
diff --git a/backends/graphics/openpandora/op-graphics.cpp b/backends/graphics/openpandora/op-graphics.cpp
index 1ded1614de..f4c9dc16cc 100644
--- a/backends/graphics/openpandora/op-graphics.cpp
+++ b/backends/graphics/openpandora/op-graphics.cpp
@@ -32,8 +32,8 @@
 
 static SDL_Cursor *hiddenCursor;
 
-OPGraphicsManager::OPGraphicsManager(SdlEventSource *sdlEventSource)
-	: SurfaceSdlGraphicsManager(sdlEventSource) {
+OPGraphicsManager::OPGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(sdlEventSource, window) {
 }
 
 bool OPGraphicsManager::loadGFXMode() {
diff --git a/backends/graphics/openpandora/op-graphics.h b/backends/graphics/openpandora/op-graphics.h
index 8b498d632b..50994072bb 100644
--- a/backends/graphics/openpandora/op-graphics.h
+++ b/backends/graphics/openpandora/op-graphics.h
@@ -32,7 +32,7 @@ enum {
 
 class OPGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	OPGraphicsManager(SdlEventSource *sdlEventSource);
+	OPGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
 	bool loadGFXMode();
 	void unloadGFXMode();
diff --git a/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp b/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
index 3603d8a861..0c98462891 100644
--- a/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
+++ b/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
@@ -28,8 +28,8 @@
 #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
 #include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
 
-SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource)
-	: SurfaceSdlGraphicsManager(sdlEventSource) {
+SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(sdlEventSource, window) {
 }
 
 bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) {
diff --git a/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h b/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h
index 15ba3dca48..8699d77bc8 100644
--- a/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h
+++ b/backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h
@@ -29,7 +29,7 @@
 
 class SamsungTVSdlGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource);
+	SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
 	bool hasFeature(OSystem::Feature f);
 	void setFeatureState(OSystem::Feature f, bool enable);
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index f6d56ece01..a13ca45477 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -26,19 +26,11 @@
 #include "backends/events/sdl/sdl-events.h"
 #include "common/textconsole.h"
 
-SdlGraphicsManager::SdlGraphicsManager(SdlEventSource *source)
-	: _eventSource(source)
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	  , _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
-#endif
-	{
+SdlGraphicsManager::SdlGraphicsManager(SdlEventSource *source, SdlWindow *window)
+	: _eventSource(source), _window(window) {
 }
 
 SdlGraphicsManager::~SdlGraphicsManager() {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_FreeSurface(_windowIcon);
-	destroyWindow();
-#endif
 }
 
 void SdlGraphicsManager::activateManager() {
@@ -49,113 +41,6 @@ void SdlGraphicsManager::deactivateManager() {
 	_eventSource->setGraphicsManager(0);
 }
 
-void SdlGraphicsManager::setWindowCaption(const Common::String &caption) {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	_windowCaption = caption;
-	if (_window) {
-		SDL_SetWindowTitle(_window, caption.c_str());
-	}
-#else
-	SDL_WM_SetCaption(caption.c_str(), caption.c_str());
-#endif
-}
-
-void SdlGraphicsManager::setWindowIcon(SDL_Surface *icon) {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_FreeSurface(_windowIcon);
-	_windowIcon = icon;
-	if (_window) {
-		SDL_SetWindowIcon(_window, icon);
-	}
-#else
-	SDL_WM_SetIcon(icon, NULL);
-	SDL_FreeSurface(icon);
-#endif
-}
-
-void SdlGraphicsManager::toggleMouseGrab() {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	if (_window) {
-		_inputGrabState = !(SDL_GetWindowGrab(_window) == SDL_TRUE);
-		SDL_SetWindowGrab(_window, _inputGrabState ? SDL_TRUE : SDL_FALSE);
-	}
-#else
-	if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF) {
-		SDL_WM_GrabInput(SDL_GRAB_ON);
-	} else {
-		SDL_WM_GrabInput(SDL_GRAB_OFF);
-	}
-#endif
-}
-
-bool SdlGraphicsManager::hasMouseFocus() const {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	if (_window) {
-		return (SDL_GetWindowFlags(_window) & SDL_WINDOW_MOUSE_FOCUS);
-	} else {
-		return false;
-	}
-#else
-	return (SDL_GetAppState() & SDL_APPMOUSEFOCUS);
-#endif
-}
-
-void SdlGraphicsManager::warpMouseInWindow(uint x, uint y) {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	if (_window) {
-		SDL_WarpMouseInWindow(_window, x, y);
-	}
-#else
-	SDL_WarpMouse(x, y);
-#endif
-}
-
-void SdlGraphicsManager::iconifyWindow() {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	if (_window) {
-		SDL_MinimizeWindow(_window);
-	}
-#else
-	SDL_WM_IconifyWindow();
-#endif
-}
-
-SdlGraphicsManager::State::State()
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-    : windowIcon(nullptr)
-#endif
-    {
-}
-
-SdlGraphicsManager::State::~State() {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_FreeSurface(windowIcon);
-#endif
-}
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-SDL_Surface *copySDLSurface(SDL_Surface *src) {
-	const bool locked = SDL_MUSTLOCK(src) == SDL_TRUE;
-
-	if (locked) {
-		if (SDL_LockSurface(src) != 0) {
-			return nullptr;
-		}
-	}
-
-	SDL_Surface *res = SDL_CreateRGBSurfaceFrom(src->pixels,
-	                       src->w, src->h, src->format->BitsPerPixel,
-	                       src->pitch, src->format->Rmask, src->format->Gmask,
-	                       src->format->Bmask, src->format->Amask);
-
-	if (locked) {
-		SDL_UnlockSurface(src);
-	}
-
-	return res;
-}
-#endif
-
 SdlGraphicsManager::State SdlGraphicsManager::getState() {
 	State state;
 
@@ -167,30 +52,10 @@ SdlGraphicsManager::State SdlGraphicsManager::getState() {
 #ifdef USE_RGB_COLOR
 	state.pixelFormat   = getScreenFormat();
 #endif
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	state.inputGrabState = _inputGrabState;
-	state.windowCaption  = _windowCaption;
-	state.windowIcon     = copySDLSurface(_windowIcon);
-#endif
-
 	return state;
 }
 
 bool SdlGraphicsManager::setState(const State &state) {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	_inputGrabState = state.inputGrabState;
-	if (!_window) {
-		_windowCaption  = state.windowCaption;
-		SDL_FreeSurface(_windowIcon);
-		_windowIcon     = copySDLSurface(state.windowIcon);
-	} else {
-		SDL_SetWindowGrab(_window, _inputGrabState ? SDL_TRUE : SDL_FALSE);
-		setWindowCaption(state.windowCaption);
-		setWindowIcon(copySDLSurface(state.windowIcon));
-	}
-#endif
-
 	beginGFXTransaction();
 #ifdef USE_RGB_COLOR
 		initSize(state.screenWidth, state.screenHeight, &state.pixelFormat);
@@ -208,26 +73,3 @@ bool SdlGraphicsManager::setState(const State &state) {
 	}
 }
 
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-bool SdlGraphicsManager::createWindow(int width, int height, uint32 flags) {
-	destroyWindow();
-
-	if (_inputGrabState) {
-		flags |= SDL_WINDOW_INPUT_GRABBED;
-	}
-
-	_window = SDL_CreateWindow(_windowCaption.c_str(), SDL_WINDOWPOS_UNDEFINED,
-	                           SDL_WINDOWPOS_UNDEFINED, width, height, flags);
-	if (!_window) {
-		return false;
-	}
-	SDL_SetWindowIcon(_window, _windowIcon);
-
-	return true;
-}
-
-void SdlGraphicsManager::destroyWindow() {
-	SDL_DestroyWindow(_window);
-	_window = nullptr;
-}
-#endif
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index af7242b99e..7f8790a9b4 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -24,10 +24,9 @@
 #define BACKENDS_GRAPHICS_SDL_SDLGRAPHICS_H
 
 #include "backends/graphics/graphics.h"
+#include "backends/platform/sdl/sdl-window.h"
 
-#include "backends/platform/sdl/sdl-sys.h"
 #include "common/rect.h"
-#include "common/str.h"
 
 class SdlEventSource;
 
@@ -38,7 +37,7 @@ class SdlEventSource;
  */
 class SdlGraphicsManager : virtual public GraphicsManager {
 public:
-	SdlGraphicsManager(SdlEventSource *source);
+	SdlGraphicsManager(SdlEventSource *source, SdlWindow *window);
 	virtual ~SdlGraphicsManager();
 
 	/**
@@ -93,50 +92,11 @@ public:
 	 */
 	virtual void notifyMousePos(Common::Point mouse) = 0;
 
-	/**
-	 * Change the caption of the window.
-	 *
-	 * @param caption New window caption in UTF-8 encoding.
-	 */
-	void setWindowCaption(const Common::String &caption);
-
-	/**
-	 * Attach an icon to the window.
-	 *
-	 * @param icon The surface to use as icon. SdlGraphicsManager takes
-	 *             ownership over it.
-	 */
-	void setWindowIcon(SDL_Surface *icon);
-
-	/**
-	 * Toggle mouse grab state. This decides whether the cursor can leave the
-	 * window or not.
-	 */
-	void toggleMouseGrab();
-
-	/**
-	 * Check whether the application has mouse focus.
-	 */
-	bool hasMouseFocus() const;
-
-	/**
-	 * Warp the mouse to the specified position in window coordinates.
-	 */
-	void warpMouseInWindow(uint x, uint y);
-
-	/**
-	 * Iconifies the window.
-	 */
-	void iconifyWindow();
-
 	/**
 	 * A (subset) of the graphic manager's state. This is used when switching
 	 * between different SDL graphic managers on runtime.
 	 */
 	struct State {
-		State();
-		~State();
-
 		int screenWidth, screenHeight;
 		bool aspectRatio;
 		bool fullscreen;
@@ -145,12 +105,6 @@ public:
 #ifdef USE_RGB_COLOR
 		Graphics::PixelFormat pixelFormat;
 #endif
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-		bool inputGrabState;
-		Common::String windowCaption;
-		SDL_Surface *windowIcon;
-#endif
 	};
 
 	/**
@@ -163,19 +117,14 @@ public:
 	 */
 	bool setState(const State &state);
 
+	/**
+	 * Queries the SDL window.
+	 */
+	SdlWindow *getWindow() const { return _window; }
+
 protected:
 	SdlEventSource *_eventSource;
-
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_Window *_window;
-
-	bool createWindow(int width, int height, uint32 flags);
-	void destroyWindow();
-private:
-	bool _inputGrabState;
-	Common::String _windowCaption;
-	SDL_Surface *_windowIcon;
-#endif
+	SdlWindow *_window;
 };
 
 #endif
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 8e349653d0..d08925349a 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -116,9 +116,9 @@ static AspectRatio getDesiredAspectRatio() {
 }
 #endif
 
-SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource)
+SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
 	:
-	SdlGraphicsManager(sdlEventSource),
+	SdlGraphicsManager(sdlEventSource, window),
 #ifdef USE_OSD
 	_osdSurface(0), _osdAlpha(SDL_ALPHA_TRANSPARENT), _osdFadeStartTime(0),
 #endif
@@ -239,7 +239,7 @@ void SurfaceSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
 		break;
 	case OSystem::kFeatureIconifyWindow:
 		if (enable)
-			iconifyWindow();
+			_window->iconifyWindow();
 		break;
 	default:
 		break;
@@ -1742,7 +1742,7 @@ void SurfaceSdlGraphicsManager::warpMouse(int x, int y) {
 	int y1 = y;
 
 	// Don't change actual mouse position, when mouse is outside of our window (in case of windowed mode)
-	if (!hasMouseFocus()) {
+	if (!_window->hasMouseFocus()) {
 		setMousePos(x, y); // but change game cursor position
 		return;
 	}
@@ -1752,9 +1752,9 @@ void SurfaceSdlGraphicsManager::warpMouse(int x, int y) {
 
 	if (_mouseCurState.x != x || _mouseCurState.y != y) {
 		if (!_overlayVisible)
-			warpMouseInWindow(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
+			_window->warpMouseInWindow(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
 		else
-			warpMouseInWindow(x, y1);
+			_window->warpMouseInWindow(x, y1);
 
 		// SDL_WarpMouse() generates a mouse movement event, so
 		// setMousePos() would be called eventually. However, the
@@ -2357,17 +2357,17 @@ void SurfaceSdlGraphicsManager::deinitializeRenderer() {
 	SDL_DestroyRenderer(_renderer);
 	_renderer = nullptr;
 
-	destroyWindow();
+	_window->destroyWindow();
 }
 
 SDL_Surface *SurfaceSdlGraphicsManager::SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags) {
 	deinitializeRenderer();
 
-	if (!createWindow(width, height, (flags & SDL_FULLSCREEN) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0)) {
+	if (!_window->createWindow(width, height, (flags & SDL_FULLSCREEN) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0)) {
 		return nullptr;
 	}
 
-	_renderer = SDL_CreateRenderer(_window, -1, 0);
+	_renderer = SDL_CreateRenderer(_window->getSDLWindow(), -1, 0);
 	if (!_renderer) {
 		deinitializeRenderer();
 		return nullptr;
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h
index c4227475c0..4ba15a304b 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.h
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h
@@ -77,7 +77,7 @@ public:
  */
 class SurfaceSdlGraphicsManager : public SdlGraphicsManager, public Common::EventObserver {
 public:
-	SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource);
+	SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 	virtual ~SurfaceSdlGraphicsManager();
 
 	virtual void activateManager();
diff --git a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
index e339fecd1c..c17cfd5efa 100644
--- a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
+++ b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp
@@ -27,8 +27,8 @@
 #include "backends/graphics/symbiansdl/symbiansdl-graphics.h"
 #include "backends/platform/symbian/src/SymbianActions.h"
 
-SymbianSdlGraphicsManager::SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource)
-	: SurfaceSdlGraphicsManager(sdlEventSource) {
+SymbianSdlGraphicsManager::SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(sdlEventSource, window) {
 }
 
 int SymbianSdlGraphicsManager::getDefaultGraphicsMode() const {
diff --git a/backends/graphics/symbiansdl/symbiansdl-graphics.h b/backends/graphics/symbiansdl/symbiansdl-graphics.h
index f514db286c..fb9a49a834 100644
--- a/backends/graphics/symbiansdl/symbiansdl-graphics.h
+++ b/backends/graphics/symbiansdl/symbiansdl-graphics.h
@@ -27,7 +27,7 @@
 
 class SymbianSdlGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource);
+	SymbianSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
 public:
 	virtual bool hasFeature(OSystem::Feature f);
diff --git a/backends/graphics/wincesdl/wincesdl-graphics.cpp b/backends/graphics/wincesdl/wincesdl-graphics.cpp
index 8e4685dbd8..07f7d47262 100644
--- a/backends/graphics/wincesdl/wincesdl-graphics.cpp
+++ b/backends/graphics/wincesdl/wincesdl-graphics.cpp
@@ -42,8 +42,8 @@
 #include "backends/platform/wince/CEScaler.h"
 #include "backends/platform/wince/CEgui/ItemAction.h"
 
-WINCESdlGraphicsManager::WINCESdlGraphicsManager(SdlEventSource *sdlEventSource)
-	: SurfaceSdlGraphicsManager(sdlEventSource),
+WINCESdlGraphicsManager::WINCESdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
+	: SurfaceSdlGraphicsManager(sdlEventSource, window),
 	  _panelInitialized(false), _noDoubleTapRMB(false), _noDoubleTapPT(false),
 	  _toolbarHighDrawn(false), _newOrientation(0), _orientationLandscape(0),
 	  _panelVisible(true), _saveActiveToolbar(NAME_MAIN_PANEL), _panelStateForced(false),
diff --git a/backends/graphics/wincesdl/wincesdl-graphics.h b/backends/graphics/wincesdl/wincesdl-graphics.h
index 50b422c10d..9316c69e44 100644
--- a/backends/graphics/wincesdl/wincesdl-graphics.h
+++ b/backends/graphics/wincesdl/wincesdl-graphics.h
@@ -41,7 +41,7 @@ extern bool _hasSmartphoneResolution;
 
 class WINCESdlGraphicsManager : public SurfaceSdlGraphicsManager {
 public:
-	WINCESdlGraphicsManager(SdlEventSource *sdlEventSource);
+	WINCESdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
 
 	const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
 	void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL);
diff --git a/backends/platform/dingux/dingux.cpp b/backends/platform/dingux/dingux.cpp
index 2f11dd31ad..afd80acc1b 100644
--- a/backends/platform/dingux/dingux.cpp
+++ b/backends/platform/dingux/dingux.cpp
@@ -33,7 +33,7 @@ void OSystem_SDL_Dingux::initBackend() {
 
 	// Create the graphics manager
 	if (_graphicsManager == 0) {
-		_graphicsManager = new DINGUXSdlGraphicsManager(_eventSource);
+		_graphicsManager = new DINGUXSdlGraphicsManager(_eventSource, _window);
 	}
 
 	// Call parent implementation of this method
diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp
index d033191d54..fb1cbe030c 100644
--- a/backends/platform/gph/gph-backend.cpp
+++ b/backends/platform/gph/gph-backend.cpp
@@ -159,7 +159,7 @@ void OSystem_GPH::initBackend() {
 
 	// Create the graphics manager
 	if (_graphicsManager == 0) {
-		_graphicsManager = new GPHGraphicsManager(_eventSource);
+		_graphicsManager = new GPHGraphicsManager(_eventSource, _window);
 	}
 
 	/* Pass to POSIX method to do the heavy lifting */
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.cpp b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
index a0310079de..a2b527e6ce 100644
--- a/backends/platform/linuxmoto/linuxmoto-sdl.cpp
+++ b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
@@ -31,7 +31,7 @@ void OSystem_LINUXMOTO::initBackend() {
 		_eventSource = new LinuxmotoSdlEventSource();
 
 	if (_graphicsManager == 0)
-		_graphicsManager = new LinuxmotoSdlGraphicsManager(_eventSource);
+		_graphicsManager = new LinuxmotoSdlGraphicsManager(_eventSource, _window);
 
 	// Call parent implementation of this method
 	OSystem_POSIX::initBackend();
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index e81a208f7b..0ada9da313 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -93,7 +93,7 @@ void OSystem_SDL_Maemo::initBackend() {
 		_eventSource = new MaemoSdlEventSource();
 
 	if (_graphicsManager == 0)
-		_graphicsManager = new MaemoSdlGraphicsManager(_eventSource);
+		_graphicsManager = new MaemoSdlGraphicsManager(_eventSource, _window);
 
 	if (_eventObserver == 0)
 		_eventObserver = new MaemoSdlEventObserver((MaemoSdlEventSource *)_eventSource);
diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp
index abe288f5d7..e7975a6aa0 100644
--- a/backends/platform/openpandora/op-backend.cpp
+++ b/backends/platform/openpandora/op-backend.cpp
@@ -147,7 +147,7 @@ void OSystem_OP::initBackend() {
 
 	// Create the graphics manager
 	if (_graphicsManager == 0) {
-		_graphicsManager = new OPGraphicsManager(_eventSource);
+		_graphicsManager = new OPGraphicsManager(_eventSource, _window);
 	}
 
 	/* Pass to POSIX method to do the heavy lifting */
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index a1d15930f2..a766916fab 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -40,7 +40,7 @@ void OSystem_SDL_SamsungTV::initBackend() {
 		_eventSource = new SamsungTVSdlEventSource();
 
 	if (_graphicsManager == 0)
-		_graphicsManager = new SamsungTVSdlGraphicsManager(_eventSource);
+		_graphicsManager = new SamsungTVSdlGraphicsManager(_eventSource, _window);
 
 	// Call parent implementation of this method
 	OSystem_POSIX::initBackend();
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk
index a17a326889..6da86706c6 100644
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -1,7 +1,8 @@
 MODULE := backends/platform/sdl
 
 MODULE_OBJS := \
-	sdl.o
+	sdl.o \
+	sdl-window.o
 
 ifdef POSIX
 MODULE_OBJS += \
diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
new file mode 100644
index 0000000000..b8cf4cfb4d
--- /dev/null
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -0,0 +1,155 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "backends/platform/sdl/sdl-window.h"
+
+SdlWindow::SdlWindow()
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
+#endif
+	{
+}
+
+SdlWindow::~SdlWindow() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_FreeSurface(_windowIcon);
+	destroyWindow();
+#endif
+}
+
+void SdlWindow::setWindowCaption(const Common::String &caption) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	_windowCaption = caption;
+	if (_window) {
+		SDL_SetWindowTitle(_window, caption.c_str());
+	}
+#else
+	SDL_WM_SetCaption(caption.c_str(), caption.c_str());
+#endif
+}
+
+void SdlWindow::setWindowIcon(SDL_Surface *icon) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_FreeSurface(_windowIcon);
+	_windowIcon = icon;
+	if (_window) {
+		SDL_SetWindowIcon(_window, icon);
+	}
+#else
+	SDL_WM_SetIcon(icon, NULL);
+	SDL_FreeSurface(icon);
+#endif
+}
+
+void SdlWindow::toggleMouseGrab() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		_inputGrabState = !(SDL_GetWindowGrab(_window) == SDL_TRUE);
+		SDL_SetWindowGrab(_window, _inputGrabState ? SDL_TRUE : SDL_FALSE);
+	}
+#else
+	if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF) {
+		SDL_WM_GrabInput(SDL_GRAB_ON);
+	} else {
+		SDL_WM_GrabInput(SDL_GRAB_OFF);
+	}
+#endif
+}
+
+bool SdlWindow::hasMouseFocus() const {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		return (SDL_GetWindowFlags(_window) & SDL_WINDOW_MOUSE_FOCUS);
+	} else {
+		return false;
+	}
+#else
+	return (SDL_GetAppState() & SDL_APPMOUSEFOCUS);
+#endif
+}
+
+void SdlWindow::warpMouseInWindow(uint x, uint y) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		SDL_WarpMouseInWindow(_window, x, y);
+	}
+#else
+	SDL_WarpMouse(x, y);
+#endif
+}
+
+void SdlWindow::iconifyWindow() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	if (_window) {
+		SDL_MinimizeWindow(_window);
+	}
+#else
+	SDL_WM_IconifyWindow();
+#endif
+}
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+SDL_Surface *copySDLSurface(SDL_Surface *src) {
+	const bool locked = SDL_MUSTLOCK(src) == SDL_TRUE;
+
+	if (locked) {
+		if (SDL_LockSurface(src) != 0) {
+			return nullptr;
+		}
+	}
+
+	SDL_Surface *res = SDL_CreateRGBSurfaceFrom(src->pixels,
+	                       src->w, src->h, src->format->BitsPerPixel,
+	                       src->pitch, src->format->Rmask, src->format->Gmask,
+	                       src->format->Bmask, src->format->Amask);
+
+	if (locked) {
+		SDL_UnlockSurface(src);
+	}
+
+	return res;
+}
+
+bool SdlWindow::createWindow(int width, int height, uint32 flags) {
+	destroyWindow();
+
+	if (_inputGrabState) {
+		flags |= SDL_WINDOW_INPUT_GRABBED;
+	}
+
+	_window = SDL_CreateWindow(_windowCaption.c_str(), SDL_WINDOWPOS_UNDEFINED,
+	                           SDL_WINDOWPOS_UNDEFINED, width, height, flags);
+	if (!_window) {
+		return false;
+	}
+	SDL_SetWindowIcon(_window, _windowIcon);
+
+	return true;
+}
+
+void SdlWindow::destroyWindow() {
+	SDL_DestroyWindow(_window);
+	_window = nullptr;
+}
+#endif
diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h
new file mode 100644
index 0000000000..da3dda7f2d
--- /dev/null
+++ b/backends/platform/sdl/sdl-window.h
@@ -0,0 +1,103 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef BACKENDS_PLATFORM_SDL_WINDOW_H
+#define BACKENDS_PLATFORM_SDL_WINDOW_H
+
+#include "backends/platform/sdl/sdl-sys.h"
+
+#include "common/str.h"
+
+class SdlWindow {
+public:
+	SdlWindow();
+	virtual ~SdlWindow();
+
+	/**
+	 * Change the caption of the window.
+	 *
+	 * @param caption New window caption in UTF-8 encoding.
+	 */
+	void setWindowCaption(const Common::String &caption);
+
+	/**
+	 * Attach an icon to the window.
+	 *
+	 * @param icon The surface to use as icon. SdlGraphicsManager takes
+	 *             ownership over it.
+	 */
+	void setWindowIcon(SDL_Surface *icon);
+
+	/**
+	 * Toggle mouse grab state. This decides whether the cursor can leave the
+	 * window or not.
+	 */
+	void toggleMouseGrab();
+
+	/**
+	 * Check whether the application has mouse focus.
+	 */
+	bool hasMouseFocus() const;
+
+	/**
+	 * Warp the mouse to the specified position in window coordinates.
+	 */
+	void warpMouseInWindow(uint x, uint y);
+
+	/**
+	 * Iconifies the window.
+	 */
+	void iconifyWindow();
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+public:
+	/**
+	 * @return The window ScummVM has setup with SDL.
+	 */
+	SDL_Window *getSDLWindow() const { return _window; }
+
+	/**
+	 * Creates a new SDL window (and destroies the old one).
+	 *
+	 * @param width   Width of the window.
+	 * @param height  Height of the window.
+	 * @param flags   SDL flags passed to SDL_CreateWindow
+	 * @return true on success, false otherwise
+	 */
+	bool createWindow(int width, int height, uint32 flags);
+
+	/**
+	 * Destroies the current SDL window.
+	 */
+	void destroyWindow();
+
+protected:
+	SDL_Window *_window;
+
+private:
+	bool _inputGrabState;
+	Common::String _windowCaption;
+	SDL_Surface *_windowIcon;
+#endif
+};
+
+#endif
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 434a4ce18a..7978022d6b 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -77,7 +77,8 @@ OSystem_SDL::OSystem_SDL()
 	_initedSDL(false),
 	_logger(0),
 	_mixerManager(0),
-	_eventSource(0) {
+	_eventSource(0),
+	_window(0) {
 
 }
 
@@ -95,6 +96,8 @@ OSystem_SDL::~OSystem_SDL() {
 	}
 	delete _graphicsManager;
 	_graphicsManager = 0;
+	delete _window;
+	_window = 0;
 	delete _eventManager;
 	_eventManager = 0;
 	delete _eventSource;
@@ -149,6 +152,9 @@ void OSystem_SDL::init() {
 	if (_mutexManager == 0)
 		_mutexManager = new SdlMutexManager();
 
+	if (_window == 0)
+		_window = new SdlWindow();
+
 #if defined(USE_TASKBAR)
 	if (_taskbarManager == 0)
 		_taskbarManager = new Common::TaskbarManager();
@@ -210,7 +216,7 @@ void OSystem_SDL::initBackend() {
 			Common::String gfxMode(ConfMan.get("gfx_mode"));
 			for (uint i = _firstGLMode; i < _graphicsModeIds.size(); ++i) {
 				if (!scumm_stricmp(_graphicsModes[i].name, gfxMode.c_str())) {
-					_graphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource);
+					_graphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource, _window);
 					_graphicsMode = i;
 					break;
 				}
@@ -219,7 +225,7 @@ void OSystem_SDL::initBackend() {
 #endif
 
 		if (_graphicsManager == 0) {
-			_graphicsManager = new SurfaceSdlGraphicsManager(_eventSource);
+			_graphicsManager = new SurfaceSdlGraphicsManager(_eventSource, _window);
 		}
 	}
 
@@ -328,7 +334,7 @@ void OSystem_SDL::setWindowCaption(const char *caption) {
 		}
 	}
 
-	dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->setWindowCaption(cap);
+	_window->setWindowCaption(cap);
 }
 
 void OSystem_SDL::quit() {
@@ -491,7 +497,7 @@ void OSystem_SDL::setupIcon() {
 	if (!sdl_surf) {
 		warning("SDL_CreateRGBSurfaceFrom(icon) failed");
 	}
-	dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->setWindowIcon(sdl_surf);
+	_window->setWindowIcon(sdl_surf);
 	free(icon);
 }
 
@@ -596,14 +602,14 @@ bool OSystem_SDL::setGraphicsMode(int mode) {
 		debug(1, "switching to plain SDL graphics");
 		sdlGraphicsManager->deactivateManager();
 		delete _graphicsManager;
-		_graphicsManager = sdlGraphicsManager = new SurfaceSdlGraphicsManager(_eventSource);
+		_graphicsManager = sdlGraphicsManager = new SurfaceSdlGraphicsManager(_eventSource, _window);
 
 		switchedManager = true;
 	} else if (_graphicsMode < _firstGLMode && mode >= _firstGLMode) {
 		debug(1, "switching to OpenGL graphics");
 		sdlGraphicsManager->deactivateManager();
 		delete _graphicsManager;
-		_graphicsManager = sdlGraphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource);
+		_graphicsManager = sdlGraphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource, _window);
 
 		switchedManager = true;
 	}
@@ -653,7 +659,7 @@ void OSystem_SDL::setupGraphicsModes() {
 	const OSystem::GraphicsMode *srcMode;
 	int defaultMode;
 
-	GraphicsManager *manager = new SurfaceSdlGraphicsManager(_eventSource);
+	GraphicsManager *manager = new SurfaceSdlGraphicsManager(_eventSource, _window);
 	srcMode = manager->getSupportedGraphicsModes();
 	defaultMode = manager->getDefaultGraphicsMode();
 	while (srcMode->name) {
@@ -667,7 +673,7 @@ void OSystem_SDL::setupGraphicsModes() {
 	assert(_defaultSDLMode != -1);
 
 	_firstGLMode = _graphicsModes.size();
-	manager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource);
+	manager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource, _window);
 	srcMode = manager->getSupportedGraphicsModes();
 	defaultMode = manager->getDefaultGraphicsMode();
 	while (srcMode->name) {
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 5dcc269e55..0f07f6d18d 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -29,6 +29,7 @@
 #include "backends/mixer/sdl/sdl-mixer.h"
 #include "backends/events/sdl/sdl-events.h"
 #include "backends/log/log.h"
+#include "backends/platform/sdl/sdl-window.h"
 
 #include "common/array.h"
 
@@ -91,6 +92,11 @@ protected:
 	 */
 	SdlEventSource *_eventSource;
 
+	/**
+	 * The SDL output window.
+	 */
+	SdlWindow *_window;
+
 	virtual Common::EventSource *getDefaultEventSource() { return _eventSource; }
 
 	/**
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 1fca7f5df5..57903d3d26 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -109,7 +109,7 @@ void OSystem_SDL_Symbian::initBackend() {
 		_mixerManager->init();
 	}
 	if (_graphicsManager == 0)
-		_graphicsManager = new SymbianSdlGraphicsManager(_eventSource);
+		_graphicsManager = new SymbianSdlGraphicsManager(_eventSource, _window);
 
 	// Call parent implementation of this method
 	OSystem_SDL::initBackend();
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 96c9313c5d..c1b0c7f692 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -420,7 +420,7 @@ void OSystem_WINCE3::initBackend() {
 	}
 
 	if (_graphicsManager == 0)
-		_graphicsManager = new WINCESdlGraphicsManager(_eventSource);
+		_graphicsManager = new WINCESdlGraphicsManager(_eventSource, _window);
 
 	((WINCESdlEventSource *)_eventSource)->init(dynamic_cast<WINCESdlGraphicsManager *>(_graphicsManager));
 
-- 
cgit v1.2.3


From 3f22c12c56572d7c0b46e734179255062f81f45c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 16 Feb 2015 01:24:42 +0100
Subject: SDL: Handle icon setup in SdlWindow.

---
 backends/platform/maemo/maemo.cpp            | 15 +++--
 backends/platform/maemo/maemo.h              |  2 +-
 backends/platform/sdl/macosx/macosx.cpp      |  5 +-
 backends/platform/sdl/macosx/macosx.h        |  1 -
 backends/platform/sdl/module.mk              |  1 +
 backends/platform/sdl/sdl-window.cpp         | 82 ++++++++++++++++++++++++----
 backends/platform/sdl/sdl-window.h           | 18 +++---
 backends/platform/sdl/sdl.cpp                | 65 +---------------------
 backends/platform/sdl/sdl.h                  |  5 --
 backends/platform/sdl/win32/win32-window.cpp | 58 ++++++++++++++++++++
 backends/platform/sdl/win32/win32-window.h   | 37 +++++++++++++
 backends/platform/sdl/win32/win32.cpp        | 28 ++--------
 backends/platform/sdl/win32/win32.h          |  1 -
 backends/platform/symbian/src/SymbianOS.cpp  |  6 +-
 backends/platform/symbian/src/SymbianOS.h    |  1 -
 15 files changed, 198 insertions(+), 127 deletions(-)
 create mode 100644 backends/platform/sdl/win32/win32-window.cpp
 create mode 100644 backends/platform/sdl/win32/win32-window.h

diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 0ada9da313..5e1ecfe335 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -84,6 +84,15 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap
 }
 #endif
 
+void OSystem_SDL_Maemo::init() {
+	// Use an iconless window for Maemo
+	// also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
+	// http://bugzilla.libsdl.org/show_bug.cgi?id=586
+	_window = new SdlIconlessWindow();
+
+	OSystem_POSIX::init();
+}
+
 void OSystem_SDL_Maemo::initBackend() {
 	ConfMan.registerDefault("fullscreen", true);
 	ConfMan.registerDefault("aspect_ratio", true);
@@ -178,12 +187,6 @@ const Maemo::Model OSystem_SDL_Maemo::detectModel() {
 	return *model;
 }
 
-void OSystem_SDL_Maemo::setupIcon() {
-	// no Maemo version needs setupIcon
-	// also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
-	// http://bugzilla.libsdl.org/show_bug.cgi?id=586
-}
-
 #ifdef ENABLE_KEYMAPPER
 static const Common::KeyTableEntry maemoKeys[] = {
 	// Function keys
diff --git a/backends/platform/maemo/maemo.h b/backends/platform/maemo/maemo.h
index 532a2de08c..6d6e09bee1 100644
--- a/backends/platform/maemo/maemo.h
+++ b/backends/platform/maemo/maemo.h
@@ -36,11 +36,11 @@ public:
 	OSystem_SDL_Maemo();
 	~OSystem_SDL_Maemo();
 
+	virtual void init();
 	virtual void initBackend();
 	virtual void quit();
 	virtual void fatalError();
 	virtual void setWindowCaption(const char *caption);
-	virtual void setupIcon();
 #ifdef ENABLE_KEYMAPPER
 	virtual Common::HardwareInputSet *getHardwareInputSet();
 	virtual Common::Keymap *getGlobalKeymap();
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index c48076c42f..fa9f3ad16c 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -47,6 +47,9 @@ OSystem_MacOSX::OSystem_MacOSX()
 }
 
 void OSystem_MacOSX::init() {
+	// Use an iconless window on OS X, as we use a nicer external icon there.
+	_window = new SdlIconlessWindow();
+
 #if defined(USE_TASKBAR)
 	// Initialize taskbar manager
 	_taskbarManager = new MacOSXTaskbarManager();
@@ -101,8 +104,6 @@ void OSystem_MacOSX::addSysArchivesToSearchSet(Common::SearchSet &s, int priorit
 	}
 }
 
-void OSystem_MacOSX::setupIcon() {
-	// Don't set icon on OS X, as we use a nicer external icon there.
 }
 
 bool OSystem_MacOSX::hasFeature(Feature f) {
diff --git a/backends/platform/sdl/macosx/macosx.h b/backends/platform/sdl/macosx/macosx.h
index 50cef60353..c8b4beaeec 100644
--- a/backends/platform/sdl/macosx/macosx.h
+++ b/backends/platform/sdl/macosx/macosx.h
@@ -38,7 +38,6 @@ public:
 	virtual void init();
 	virtual void initBackend();
 	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
-	virtual void setupIcon();
 };
 
 #endif
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk
index 6da86706c6..74dd506d31 100644
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -20,6 +20,7 @@ endif
 ifdef WIN32
 MODULE_OBJS += \
 	win32/win32-main.o \
+	win32/win32-window.o \
 	win32/win32.o
 endif
 
diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index b8cf4cfb4d..d603ba0114 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -24,6 +24,10 @@
 
 #include "backends/platform/sdl/sdl-window.h"
 
+#include "common/textconsole.h"
+
+#include "icons/scummvm.xpm"
+
 SdlWindow::SdlWindow()
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
@@ -38,27 +42,85 @@ SdlWindow::~SdlWindow() {
 #endif
 }
 
-void SdlWindow::setWindowCaption(const Common::String &caption) {
+void SdlWindow::setupIcon() {
+	int x, y, w, h, ncols, nbytes, i;
+	unsigned int rgba[256];
+	unsigned int *icon;
+
+	if (sscanf(scummvm_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes) != 4) {
+		warning("Wrong format of scummvm_icon[0] (%s)", scummvm_icon[0]);
+
+		return;
+	}
+	if ((w > 512) || (h > 512) || (ncols > 255) || (nbytes > 1)) {
+		warning("Could not load the built-in icon (%d %d %d %d)", w, h, ncols, nbytes);
+		return;
+	}
+	icon = (unsigned int*)malloc(w*h*sizeof(unsigned int));
+	if (!icon) {
+		warning("Could not allocate temp storage for the built-in icon");
+		return;
+	}
+
+	for (i = 0; i < ncols; i++) {
+		unsigned char code;
+		char color[32];
+		memset(color, 0, sizeof(color));
+		unsigned int col;
+		if (sscanf(scummvm_icon[1 + i], "%c c %s", &code, color) != 2) {
+			warning("Wrong format of scummvm_icon[%d] (%s)", 1 + i, scummvm_icon[1 + i]);
+		}
+		if (!strcmp(color, "None"))
+			col = 0x00000000;
+		else if (!strcmp(color, "black"))
+			col = 0xFF000000;
+		else if (color[0] == '#') {
+			if (sscanf(color + 1, "%06x", &col) != 1) {
+				warning("Wrong format of color (%s)", color + 1);
+			}
+			col |= 0xFF000000;
+		} else {
+			warning("Could not load the built-in icon (%d %s - %s) ", code, color, scummvm_icon[1 + i]);
+			free(icon);
+			return;
+		}
+
+		rgba[code] = col;
+	}
+	for (y = 0; y < h; y++) {
+		const char *line = scummvm_icon[1 + ncols + y];
+		for (x = 0; x < w; x++) {
+			icon[x + w * y] = rgba[(int)line[x]];
+		}
+	}
+
+	SDL_Surface *sdl_surf = SDL_CreateRGBSurfaceFrom(icon, w, h, 32, w * 4, 0xFF0000, 0x00FF00, 0x0000FF, 0xFF000000);
+	if (!sdl_surf) {
+		warning("SDL_CreateRGBSurfaceFrom(icon) failed");
+	}
+
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	_windowCaption = caption;
+	SDL_FreeSurface(_windowIcon);
+	_windowIcon = sdl_surf;
 	if (_window) {
-		SDL_SetWindowTitle(_window, caption.c_str());
+		SDL_SetWindowIcon(_window, sdl_surf);
 	}
 #else
-	SDL_WM_SetCaption(caption.c_str(), caption.c_str());
+	SDL_WM_SetIcon(sdl_surf, NULL);
+	SDL_FreeSurface(sdl_surf);
 #endif
+
+	free(icon);
 }
 
-void SdlWindow::setWindowIcon(SDL_Surface *icon) {
+void SdlWindow::setWindowCaption(const Common::String &caption) {
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_FreeSurface(_windowIcon);
-	_windowIcon = icon;
+	_windowCaption = caption;
 	if (_window) {
-		SDL_SetWindowIcon(_window, icon);
+		SDL_SetWindowTitle(_window, caption.c_str());
 	}
 #else
-	SDL_WM_SetIcon(icon, NULL);
-	SDL_FreeSurface(icon);
+	SDL_WM_SetCaption(caption.c_str(), caption.c_str());
 #endif
 }
 
diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h
index da3dda7f2d..46997f373d 100644
--- a/backends/platform/sdl/sdl-window.h
+++ b/backends/platform/sdl/sdl-window.h
@@ -33,19 +33,16 @@ public:
 	virtual ~SdlWindow();
 
 	/**
-	 * Change the caption of the window.
-	 *
-	 * @param caption New window caption in UTF-8 encoding.
+	 * Setup the window icon.
 	 */
-	void setWindowCaption(const Common::String &caption);
+	virtual void setupIcon();
 
 	/**
-	 * Attach an icon to the window.
+	 * Change the caption of the window.
 	 *
-	 * @param icon The surface to use as icon. SdlGraphicsManager takes
-	 *             ownership over it.
+	 * @param caption New window caption in UTF-8 encoding.
 	 */
-	void setWindowIcon(SDL_Surface *icon);
+	void setWindowCaption(const Common::String &caption);
 
 	/**
 	 * Toggle mouse grab state. This decides whether the cursor can leave the
@@ -100,4 +97,9 @@ private:
 #endif
 };
 
+class SdlIconlessWindow : public SdlWindow {
+public:
+	virtual void setupIcon() {}
+};
+
 #endif
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 7978022d6b..6d4dede212 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -52,8 +52,6 @@
 #include "graphics/cursorman.h"
 #endif
 
-#include "icons/scummvm.xpm"
-
 #include <time.h>	// for getTimeAndDate()
 
 #ifdef USE_DETECTLANG
@@ -258,7 +256,7 @@ void OSystem_SDL::initBackend() {
 	}
 
 	// Setup a custom program icon.
-	setupIcon();
+	_window->setupIcon();
 
 	_inited = true;
 
@@ -441,67 +439,6 @@ Common::String OSystem_SDL::getSystemLanguage() const {
 #endif // USE_DETECTLANG
 }
 
-void OSystem_SDL::setupIcon() {
-	int x, y, w, h, ncols, nbytes, i;
-	unsigned int rgba[256];
-	unsigned int *icon;
-
-	if (sscanf(scummvm_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes) != 4) {
-		warning("Wrong format of scummvm_icon[0] (%s)", scummvm_icon[0]);
-
-		return;
-	}
-	if ((w > 512) || (h > 512) || (ncols > 255) || (nbytes > 1)) {
-		warning("Could not load the built-in icon (%d %d %d %d)", w, h, ncols, nbytes);
-		return;
-	}
-	icon = (unsigned int*)malloc(w*h*sizeof(unsigned int));
-	if (!icon) {
-		warning("Could not allocate temp storage for the built-in icon");
-		return;
-	}
-
-	for (i = 0; i < ncols; i++) {
-		unsigned char code;
-		char color[32];
-		memset(color, 0, sizeof(color));
-		unsigned int col;
-		if (sscanf(scummvm_icon[1 + i], "%c c %s", &code, color) != 2) {
-			warning("Wrong format of scummvm_icon[%d] (%s)", 1 + i, scummvm_icon[1 + i]);
-		}
-		if (!strcmp(color, "None"))
-			col = 0x00000000;
-		else if (!strcmp(color, "black"))
-			col = 0xFF000000;
-		else if (color[0] == '#') {
-			if (sscanf(color + 1, "%06x", &col) != 1) {
-				warning("Wrong format of color (%s)", color + 1);
-			}
-			col |= 0xFF000000;
-		} else {
-			warning("Could not load the built-in icon (%d %s - %s) ", code, color, scummvm_icon[1 + i]);
-			free(icon);
-			return;
-		}
-
-		rgba[code] = col;
-	}
-	for (y = 0; y < h; y++) {
-		const char *line = scummvm_icon[1 + ncols + y];
-		for (x = 0; x < w; x++) {
-			icon[x + w * y] = rgba[(int)line[x]];
-		}
-	}
-
-	SDL_Surface *sdl_surf = SDL_CreateRGBSurfaceFrom(icon, w, h, 32, w * 4, 0xFF0000, 0x00FF00, 0x0000FF, 0xFF000000);
-	if (!sdl_surf) {
-		warning("SDL_CreateRGBSurfaceFrom(icon) failed");
-	}
-	_window->setWindowIcon(sdl_surf);
-	free(icon);
-}
-
-
 uint32 OSystem_SDL::getMillis(bool skipRecord) {
 	uint32 millis = SDL_GetTicks();
 
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 0f07f6d18d..5ee56d0568 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -104,11 +104,6 @@ protected:
 	 */
 	virtual void initSDL();
 
-	/**
-	 * Setup the window icon.
-	 */
-	virtual void setupIcon();
-
 	// Logging
 	virtual Common::WriteStream *createLogFile() { return 0; }
 	Backends::Log::Log *_logger;
diff --git a/backends/platform/sdl/win32/win32-window.cpp b/backends/platform/sdl/win32/win32-window.cpp
new file mode 100644
index 0000000000..a418d899d5
--- /dev/null
+++ b/backends/platform/sdl/win32/win32-window.cpp
@@ -0,0 +1,58 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#ifdef WIN32
+
+#include "backends/platform/sdl/win32/win32-window.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one...
+
+#include <SDL_syswm.h> // For setting the icon
+
+void SdlWindow_Win32::setupIcon() {
+	HMODULE handle = GetModuleHandle(NULL);
+	HICON   ico    = LoadIcon(handle, MAKEINTRESOURCE(1001 /* IDI_ICON */));
+	if (ico) {
+		SDL_SysWMinfo  wminfo;
+		SDL_VERSION(&wminfo.version);
+		if (SDL_GetWMInfo(&wminfo)) {
+			// Replace the handle to the icon associated with the window class by our custom icon
+			SetClassLongPtr(wminfo.window, GCLP_HICON, (ULONG_PTR)ico);
+
+			// Since there wasn't any default icon, we can't use the return value from SetClassLong
+			// to check for errors (it would be 0 in both cases: error or no previous value for the
+			// icon handle). Instead we check for the last-error code value.
+			if (GetLastError() == ERROR_SUCCESS)
+				return;
+		}
+	}
+
+	// If no icon has been set, fallback to default path
+	SdlWindow::setupIcon();
+}
+
+#endif
diff --git a/backends/platform/sdl/win32/win32-window.h b/backends/platform/sdl/win32/win32-window.h
new file mode 100644
index 0000000000..3bda697bc7
--- /dev/null
+++ b/backends/platform/sdl/win32/win32-window.h
@@ -0,0 +1,37 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef BACKENDS_PLATFORM_SDL_WIN32_WIN32_WINDOW_H
+#define BACKENDS_PLATFORM_SDL_WIN32_WIN32_WINDOW_H
+
+#ifdef WIN32
+
+#include "backends/platform/sdl/sdl-window.h"
+
+class SdlWindow_Win32 : public SdlWindow {
+public:
+	virtual void setupIcon();
+};
+
+#endif
+
+#endif
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 5f860ad32d..78a7c685eb 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -35,9 +35,8 @@
 #include "common/error.h"
 #include "common/textconsole.h"
 
-#include <SDL_syswm.h> // For setting the icon
-
 #include "backends/platform/sdl/win32/win32.h"
+#include "backends/platform/sdl/win32/win32-window.h"
 #include "backends/saves/windows/windows-saves.h"
 #include "backends/fs/windows/windows-fs-factory.h"
 #include "backends/taskbar/win32/win32-taskbar.h"
@@ -50,6 +49,9 @@ void OSystem_Win32::init() {
 	// Initialize File System Factory
 	_fsFactory = new WindowsFilesystemFactory();
 
+	// Create Win32 specific window
+	_window = new SdlWindow_Win32();
+
 #if defined(USE_TASKBAR)
 	// Initialize taskbar manager
 	_taskbarManager = new Win32TaskbarManager();
@@ -126,28 +128,6 @@ bool OSystem_Win32::displayLogFile() {
 	return false;
 }
 
-void OSystem_Win32::setupIcon() {
-	HMODULE handle = GetModuleHandle(NULL);
-	HICON   ico    = LoadIcon(handle, MAKEINTRESOURCE(1001 /* IDI_ICON */));
-	if (ico) {
-		SDL_SysWMinfo  wminfo;
-		SDL_VERSION(&wminfo.version);
-		if (SDL_GetWMInfo(&wminfo)) {
-			// Replace the handle to the icon associated with the window class by our custom icon
-			SetClassLongPtr(wminfo.window, GCLP_HICON, (ULONG_PTR)ico);
-
-			// Since there wasn't any default icon, we can't use the return value from SetClassLong
-			// to check for errors (it would be 0 in both cases: error or no previous value for the
-			// icon handle). Instead we check for the last-error code value.
-			if (GetLastError() == ERROR_SUCCESS)
-				return;
-		}
-	}
-
-	// If no icon has been set, fallback to default path
-	OSystem_SDL::setupIcon();
-}
-
 Common::String OSystem_Win32::getDefaultConfigFileName() {
 	char configFile[MAXPATHLEN];
 
diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h
index d72d80bc26..473e78ff0b 100644
--- a/backends/platform/sdl/win32/win32.h
+++ b/backends/platform/sdl/win32/win32.h
@@ -47,7 +47,6 @@ protected:
 	 */
 	Common::String _logFilePath;
 
-	virtual void setupIcon();
 	virtual Common::String getDefaultConfigFileName();
 	virtual Common::WriteStream *createLogFile();
 };
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 57903d3d26..e28b78900c 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -63,6 +63,8 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian()
 
 void OSystem_SDL_Symbian::init() {
 	_RFs = &CEikonEnv::Static()->FsSession();
+	// Use iconless window: it uses the EScummVM.aif file for the icon.
+	_window = new SdlIconlessWindow();
 	_fsFactory = new SymbianFilesystemFactory();
 	OSystem_SDL::init();
 }
@@ -171,10 +173,6 @@ Common::String OSystem_SDL_Symbian::getDefaultConfigFileName() {
 	return configFile;
 }
 
-void OSystem_SDL_Symbian::setupIcon() {
-	// Don't for Symbian: it uses the EScummVM.aif file for the icon.
-}
-
 RFs& OSystem_SDL_Symbian::FsSession() {
 	return *_RFs;
 }
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 57a471f1a9..617540941d 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -39,7 +39,6 @@ public:
 	virtual void engineDone();
 	virtual bool setGraphicsMode(const char *name);
 	virtual Common::String getDefaultConfigFileName();
-	virtual void setupIcon();
 
 	/**
 	 * Returns reference to File session
-- 
cgit v1.2.3


From 3745ddbefd6ab401458b862d124ebe80592a88bc Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 16 Feb 2015 02:13:11 +0100
Subject: WIN32: Add experimental SDL2 support.

Based on changes by aquadran.
---
 backends/platform/sdl/sdl-window.cpp         | 11 +++++++++++
 backends/platform/sdl/sdl-window.h           | 10 ++++++++++
 backends/platform/sdl/win32/win32-main.cpp   |  2 ++
 backends/platform/sdl/win32/win32-window.cpp |  9 ++++++---
 backends/platform/sdl/win32/win32.cpp        |  2 +-
 backends/taskbar/win32/win32-taskbar.cpp     | 15 +++++++++------
 backends/taskbar/win32/win32-taskbar.h       |  6 +++++-
 7 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index d603ba0114..8dec27d948 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -28,6 +28,8 @@
 
 #include "icons/scummvm.xpm"
 
+#include <SDL_syswm.h>
+
 SdlWindow::SdlWindow()
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
@@ -171,6 +173,15 @@ void SdlWindow::iconifyWindow() {
 #endif
 }
 
+bool SdlWindow::getSDLWMInformation(SDL_SysWMinfo *info) const {
+	SDL_VERSION(&info->version);
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	return SDL_GetWindowWMInfo(_window, info);
+#else
+	return SDL_GetWMInfo(info);
+#endif
+}
+
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 SDL_Surface *copySDLSurface(SDL_Surface *src) {
 	const bool locked = SDL_MUSTLOCK(src) == SDL_TRUE;
diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h
index 46997f373d..cc54673f4c 100644
--- a/backends/platform/sdl/sdl-window.h
+++ b/backends/platform/sdl/sdl-window.h
@@ -27,6 +27,8 @@
 
 #include "common/str.h"
 
+struct SDL_SysWMinfo;
+
 class SdlWindow {
 public:
 	SdlWindow();
@@ -65,6 +67,14 @@ public:
 	 */
 	void iconifyWindow();
 
+	/**
+	 * Query platform specific SDL window manager information.
+	 *
+	 * Since this is an SDL internal structure clients are responsible
+	 * for accessing it in a version safe manner.
+	 */
+	bool getSDLWMInformation(SDL_SysWMinfo *info) const;
+
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 public:
 	/**
diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp
index e5b26c3ff0..c6c15c00e8 100644
--- a/backends/platform/sdl/win32/win32-main.cpp
+++ b/backends/platform/sdl/win32/win32-main.cpp
@@ -40,7 +40,9 @@
 #include "base/main.h"
 
 int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/,  LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_SetModuleHandle(GetModuleHandle(NULL));
+#endif
 	return main(__argc, __argv);
 }
 
diff --git a/backends/platform/sdl/win32/win32-window.cpp b/backends/platform/sdl/win32/win32-window.cpp
index a418d899d5..814c165f6f 100644
--- a/backends/platform/sdl/win32/win32-window.cpp
+++ b/backends/platform/sdl/win32/win32-window.cpp
@@ -37,11 +37,14 @@ void SdlWindow_Win32::setupIcon() {
 	HMODULE handle = GetModuleHandle(NULL);
 	HICON   ico    = LoadIcon(handle, MAKEINTRESOURCE(1001 /* IDI_ICON */));
 	if (ico) {
-		SDL_SysWMinfo  wminfo;
-		SDL_VERSION(&wminfo.version);
-		if (SDL_GetWMInfo(&wminfo)) {
+		SDL_SysWMinfo wminfo;
+		if (getSDLWMInformation(&wminfo)) {
 			// Replace the handle to the icon associated with the window class by our custom icon
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+			SetClassLongPtr(wminfo.info.win.window, GCLP_HICON, (ULONG_PTR)ico);
+#else
 			SetClassLongPtr(wminfo.window, GCLP_HICON, (ULONG_PTR)ico);
+#endif
 
 			// Since there wasn't any default icon, we can't use the return value from SetClassLong
 			// to check for errors (it would be 0 in both cases: error or no previous value for the
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 78a7c685eb..0f70c00b40 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -54,7 +54,7 @@ void OSystem_Win32::init() {
 
 #if defined(USE_TASKBAR)
 	// Initialize taskbar manager
-	_taskbarManager = new Win32TaskbarManager();
+	_taskbarManager = new Win32TaskbarManager(_window);
 #endif
 
 	// Invoke parent implementation of this method
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 5c9105b0eb..322ddc4c67 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -62,7 +62,7 @@
 // System.Title property key, values taken from http://msdn.microsoft.com/en-us/library/bb787584.aspx
 const PROPERTYKEY PKEY_Title = { /* fmtid = */ { 0xF29F85E0, 0x4FF9, 0x1068, { 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9 } }, /* propID = */ 2 };
 
-Win32TaskbarManager::Win32TaskbarManager() : _taskbar(NULL), _count(0), _icon(NULL) {
+Win32TaskbarManager::Win32TaskbarManager(SdlWindow *window) : _window(window), _taskbar(NULL), _count(0), _icon(NULL) {
 	// Do nothing if not running on Windows 7 or later
 	if (!isWin7OrLater())
 		return;
@@ -408,12 +408,15 @@ LPWSTR Win32TaskbarManager::ansiToUnicode(const char *s) {
 
 HWND Win32TaskbarManager::getHwnd() {
 	SDL_SysWMinfo wmi;
-	SDL_VERSION(&wmi.version);
-
-	if(!SDL_GetWMInfo(&wmi))
+	if (_window->getSDLWMInformation(&wmi)) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		return wmi.info.win.window;
+#else
+		return wmi.window;
+#endif
+	} else {
 		return NULL;
-
-	return wmi.window;
+	}
 }
 
 #endif
diff --git a/backends/taskbar/win32/win32-taskbar.h b/backends/taskbar/win32/win32-taskbar.h
index 36415c1c57..a6d1b49213 100644
--- a/backends/taskbar/win32/win32-taskbar.h
+++ b/backends/taskbar/win32/win32-taskbar.h
@@ -25,6 +25,8 @@
 
 #if defined(WIN32) && defined(USE_TASKBAR)
 
+#include "backends/platform/sdl/sdl-window.h"
+
 #include "common/str.h"
 #include "common/taskbar.h"
 
@@ -32,7 +34,7 @@ struct ITaskbarList3;
 
 class Win32TaskbarManager : public Common::TaskbarManager {
 public:
-	Win32TaskbarManager();
+	Win32TaskbarManager(SdlWindow *window);
 	virtual ~Win32TaskbarManager();
 
 	virtual void setOverlayIcon(const Common::String &name, const Common::String &description);
@@ -44,6 +46,8 @@ public:
 	virtual void clearError();
 
 private:
+	SdlWindow *_window;
+
 	ITaskbarList3 *_taskbar;
 
 	// Count handling
-- 
cgit v1.2.3


From 6ed60538c68a4ec098da30cad39c16770610e5e3 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 16 Feb 2015 02:32:27 +0100
Subject: CONFIGURE: Make SDL_CONFIG override work with a MinGW host.

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 3e85e42054..3835342395 100755
--- a/configure
+++ b/configure
@@ -171,7 +171,7 @@ _stagingpath="staging"
 _win32path="c:/scummvm"
 _amigaospath="Games:ScummVM"
 _staticlibpath=
-_sdlconfig="$SDL_CONFIG"
+_sdlconfig=sdl-config
 _freetypeconfig=freetype-config
 _sdlpath="$PATH"
 _freetypepath="$PATH"
@@ -354,7 +354,7 @@ define_in_config_if_yes() {
 # TODO: small bit of code to test sdl usability
 find_sdlconfig() {
 	echo_n "Looking for sdl-config... "
-	sdlconfigs="$_sdlconfig:sdl-config:sdl11-config:sdl12-config"
+	sdlconfigs="$SDL_CONFIG:$_sdlconfig:sdl-config:sdl11-config:sdl12-config"
 	_sdlconfig=
 
 	IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"
-- 
cgit v1.2.3


From f04ef8b7282477cda5121b6c8a6e838eb35a1760 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 16 Feb 2015 12:11:50 +0200
Subject: ZVISION: Fix script bug #6793 in Zork Nemesis

---
 engines/zvision/file/save_manager.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 1e0c57e2b3..63b54269de 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -165,6 +165,27 @@ Common::Error SaveManager::loadGame(int slot) {
 	if (header.thumbnail)
 		delete header.thumbnail;
 
+	if (_engine->getGameId() == GID_NEMESIS && scriptManager->getCurrentLocation() == "tv2f") {
+		// WORKAROUND for script bug #6793: location tv2f (stairs) has two states:
+		// one at the top of the stairs, and one at the bottom. When the player
+		// goes to the bottom of the stairs, the screen changes, and hotspot
+		// 4652 (exit opposite the stairs) is enabled. However, the variable that
+		// controls the state (2408) is reset when the player goes down the stairs.
+		// Furthermore, the room's initialization script disables the stair exit
+		// control (4652). This leads to an impossible situation, where all the
+		// exit controls are disabled, and the player can't more anywhere. Thus,
+		// when loading a game in that room, we check for that impossible
+		// situation, which only occurs after the player has moved down the stairs,
+		// and fix it here by setting the correct background, and enabling the
+		// stair exit hotspot.
+		if ((scriptManager->getStateFlag(2411) & Puzzle::DISABLED) &&
+			(scriptManager->getStateFlag(2408) & Puzzle::DISABLED) &&
+			(scriptManager->getStateFlag(4652) & Puzzle::DISABLED)) {
+			_engine->getRenderManager()->setBackgroundImage("tv2fb21c.tga");
+			scriptManager->unsetStateFlag(4652, Puzzle::DISABLED);
+		}
+	}
+
 	return Common::kNoError;
 }
 
-- 
cgit v1.2.3


From b45e706012d7131035867fdd1e6f7109db1ae635 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 17 Feb 2015 01:49:59 +0200
Subject: ZVISION: Fix script bug #6803 (tuning fork box state)

---
 engines/zvision/scripting/scr_file_handling.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index a9f3a55021..edc1b8622c 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -86,6 +86,15 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
 			parseCriteria(stream, puzzle->criteriaList, puzzle->key);
 		} else if (line.matchString("results {", true)) {
 			parseResults(stream, puzzle->resultActions);
+
+			// WORKAROUND for a script bug in Zork Nemesis, room ve5e (tuning
+			// fork box closeup). If the player leaves the screen while the
+			// box is open, puzzle 19398 shows the animation where the box
+			// closes, but the box state (state variable 19397) is not updated.
+			// We insert the missing assignment for the box state here.
+			// Fixes bug #6803.
+			if (_engine->getGameId() == GID_NEMESIS && puzzle->key == 19398)
+				puzzle->resultActions.push_back(new ActionAssign(_engine, 11, "19397, 0"));
 		} else if (line.matchString("flags {", true)) {
 			setStateFlag(puzzle->key, parseFlags(stream));
 		}
-- 
cgit v1.2.3


From fdc09c2cb7ff3041dbd11c146d3d669cc7aa4777 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 17 Feb 2015 19:53:43 +0100
Subject: SCI: Add alternative version of QfG3 "Woo" dialog patch

The GOG version of QfG3 is shipped with a patch to script 440 that broke
our existing internal script patch for this script bug.

See bug #6806.
---
 engines/sci/engine/script_patches.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index c2a0b8b95d..45e0155950 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2282,10 +2282,40 @@ static const uint16 qfg3PatchWooDialog[] = {
 	PATCH_END
 };
 
+// Alternative version, with uint16 offsets, for GOG release of QfG3.
+static const uint16 qfg3SignatureWooDialogAlt[] = {
+	SIG_MAGICDWORD,
+	0x67, 0x12,                         // pTos 12 (query)
+	0x35, 0xb6,                         // ldi b6
+	0x1a,                               // eq?
+	0x2e, SIG_UINT16(0x0005),           // bt 05
+	0x67, 0x12,                         // pTos 12 (query)
+	0x35, 0x9b,                         // ldi 9b
+	0x1a,                               // eq?
+	0x30, SIG_UINT16(0x000c),           // bnt 0c
+	0x38, SIG_SELECTOR16(solvePuzzle),  // pushi 0297
+	0x7a,                               // push2
+	0x38, SIG_UINT16(0x010c),           // pushi 010c
+	0x7a,                               // push2
+	0x81, 0x00,                         // lag 00
+	0x4a, 0x08,                         // send 08
+	0x67, 0x12,                         // pTos 12 (query)
+	0x35, 0xb5,                         // ldi b5
+	SIG_END
+};
+
+static const uint16 qfg3PatchWooDialogAlt[] = {
+	PATCH_ADDTOOFFSET(+0x2C),
+	0x33, 0x12,                         // jmp to 0x708, the call to hero::solvePuzzle for 0xFFFC
+	PATCH_END
+};
+
+
 //          script, description,                                      signature                  patch
 static const SciScriptPatcherEntry qfg3Signatures[] = {
 	{  true,   944, "import dialog continuous calls",              1, qfg3SignatureImportDialog, qfg3PatchImportDialog },
 	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialog,    qfg3PatchWooDialog },
+	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialogAlt, qfg3PatchWooDialogAlt },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 71cc9e41e8e61e560ed5cb8e1fe1d0c539f001be Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 18 Feb 2015 04:52:01 +0100
Subject: WINCE: Fix compilation.

---
 backends/platform/sdl/sdl-sys.h              | 37 ++++++++++++++++++++++++++++
 backends/platform/sdl/sdl-window.cpp         |  2 --
 backends/platform/sdl/sdl-window.h           |  2 --
 backends/platform/sdl/win32/win32-window.cpp |  2 --
 backends/taskbar/win32/win32-taskbar.cpp     |  3 ---
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index bc3678e350..59952323f4 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -52,12 +52,49 @@ typedef struct { int FAKE; } FAKE_FILE;
 #define strncasecmp FAKE_strncasecmp
 #endif
 
+// HACK: SDL might include windows.h which defines its own ARRAYSIZE.
+// However, we want to use the version from common/util.h. Thus, we make sure
+// that we actually have this definition after including the SDL headers.
+#if defined(ARRAYSIZE) && defined(COMMON_UTIL_H)
+#define HACK_REDEFINE_ARRAYSIZE
+#undef ARRAYSIZE
+#endif
+
 #if defined(__SYMBIAN32__)
 #include <esdl\SDL.h>
 #else
 #include <SDL.h>
 #endif
 
+#include <SDL_syswm.h>
+// SDL_syswm.h will include windows.h on Win32. We need to undefine its
+// ARRAYSIZE definition because we supply our own.
+#undef ARRAYSIZE
+
+#ifdef HACK_REDEFINE_ARRAYSIZE
+#undef HACK_REDEFINE_ARRAYSIZE
+#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
+#endif
+
+// In a moment of brilliance Xlib.h included by SDL_syswm.h #defines the
+// following names. In a moment of mental breakdown, which occured upon
+// gazing at Xlib.h, LordHoto decided to undefine them to prevent havoc.
+#ifdef Status
+#undef Status
+#endif
+
+#ifdef Bool
+#undef Bool
+#endif
+
+#ifdef True
+#undef True
+#endif
+
+#ifdef False
+#undef False
+#endif
+
 // Finally forbid FILE again (if it was forbidden to start with)
 #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE)
 #undef FILE
diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index 8dec27d948..2a3877c523 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -28,8 +28,6 @@
 
 #include "icons/scummvm.xpm"
 
-#include <SDL_syswm.h>
-
 SdlWindow::SdlWindow()
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h
index cc54673f4c..2608ea4a8f 100644
--- a/backends/platform/sdl/sdl-window.h
+++ b/backends/platform/sdl/sdl-window.h
@@ -27,8 +27,6 @@
 
 #include "common/str.h"
 
-struct SDL_SysWMinfo;
-
 class SdlWindow {
 public:
 	SdlWindow();
diff --git a/backends/platform/sdl/win32/win32-window.cpp b/backends/platform/sdl/win32/win32-window.cpp
index 814c165f6f..de10be6b57 100644
--- a/backends/platform/sdl/win32/win32-window.cpp
+++ b/backends/platform/sdl/win32/win32-window.cpp
@@ -31,8 +31,6 @@
 #include <windows.h>
 #undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one...
 
-#include <SDL_syswm.h> // For setting the icon
-
 void SdlWindow_Win32::setupIcon() {
 	HMODULE handle = GetModuleHandle(NULL);
 	HICON   ico    = LoadIcon(handle, MAKEINTRESOURCE(1001 /* IDI_ICON */));
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 322ddc4c67..d45253c676 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -48,9 +48,6 @@
 
 #include <shlobj.h>
 
-// For HWND
-#include <SDL_syswm.h>
-
 #include "common/scummsys.h"
 
 #include "backends/taskbar/win32/win32-taskbar.h"
-- 
cgit v1.2.3


From 4f6f0fb148133df632104071185efa049c7d5fea Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 18 Feb 2015 09:33:03 +0100
Subject: SCI: Fix digital audio

Regression from 5028487038fd, where I assumed all songs were MIDI.
---
 engines/sci/sound/soundcmd.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 64991cbf5c..ee5903fda2 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -186,7 +186,9 @@ void SoundCommandParser::processPlaySound(reg_t obj, bool playBed) {
 	musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop));
 
 	// Get song priority from either obj or soundRes
-	byte resourcePriority = musicSlot->soundRes->getSoundPriority();
+	byte resourcePriority = 0xFF;
+	if (musicSlot->soundRes)
+		resourcePriority = musicSlot->soundRes->getSoundPriority();
 	if (!musicSlot->overridePriority && resourcePriority != 0xFF) {
 		musicSlot->priority = resourcePriority;
 	} else {
-- 
cgit v1.2.3


From df5742eee41abe7e74a2b47a0ddcc183bf52fe09 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Feb 2015 15:52:01 -0500
Subject: MADS: Fix player animation when getting blown up by mine

---
 engines/mads/player.cpp  | 10 +++++++---
 engines/mads/sprites.cpp |  7 ++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 1622031c6c..8720aeead3 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -240,8 +240,13 @@ void Player::updateFrame() {
 		return;
 
 	Scene &scene = _vm->_game->_scene;
+	assert(scene._sprites[idx] != nullptr);
 	SpriteAsset &spriteSet = *scene._sprites[idx];
-	assert(spriteSet._charInfo);
+	
+	// WORKAROUND: Certain cutscenes set up player sprites that don't have any 
+	// character info. In such cases, simply ignore player updates
+	if (!spriteSet._charInfo)
+		return;
 
 	if (!spriteSet._charInfo->_numEntries) {
 		_frameNumber = 1;
@@ -515,8 +520,7 @@ void Player::idle() {
 		return;
 
 	SpriteAsset &spriteSet = *scene._sprites[idx];
-	assert(spriteSet._charInfo);
-	if (spriteSet._charInfo->_numEntries == 0)
+	if (spriteSet._charInfo == nullptr || spriteSet._charInfo->_numEntries == 0)
 		// No entries, so exit immediately
 		return;
 
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index fd73930475..f74edafc93 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -371,16 +371,13 @@ int SpriteSets::add(SpriteAsset *asset, int idx) {
 	if (idx)
 		idx = idx + 49;
 	else
-		idx = size();
+		idx = _assetCount++;
 
 	if (idx >= (int)size())
 		resize(idx + 1);
 
-	if ((*this)[idx]) {
+	if ((*this)[idx])
 		delete (*this)[idx];
-	} else {
-		++_assetCount;
-	}
 
 	(*this)[idx] = asset;
 	return idx;
-- 
cgit v1.2.3


From 549b5d435a897e1f6d306d2bdb902cac18159491 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Feb 2015 16:14:59 -0500
Subject: MADS: Fix crash when trapping bouncy native in pit

---
 engines/mads/nebular/nebular_scenes2.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 94e30aa4f2..d00857f0a2 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1745,7 +1745,8 @@ void Scene208::enter() {
 }
 
 void Scene208::step() {
-	if (_boundingFl && (_rhotundaTime <= _scene->_activeAnimation->getCurrentFrame())) {
+	if (_boundingFl && _scene->_activeAnimation &&
+			(_rhotundaTime <= _scene->_activeAnimation->getCurrentFrame())) {
 		_rhotundaTime = _scene->_activeAnimation->getCurrentFrame();
 
 		if (_rhotundaTime == 125)
-- 
cgit v1.2.3


From 6ca8d22fb100f2b3f3549b8785801ffd470135b9 Mon Sep 17 00:00:00 2001
From: jammm
Date: Sun, 22 Feb 2015 02:02:41 +0530
Subject: WINTERMUTE: Fixed parentFolder name check when testing for
 "language"/"languages", Fix bug #6655 (Dead City - hotspot text issue)

Fixed Wintermute incorretly parsing folder names with trailing \

(Windows-only issue)
It seems that calling getParent returns trailing '\' which is absent on POSIX based file systems but not on Windows. This causes Wintermute to load outline_red2.font from russian.dcp, which is not desired. This is fixed by calling it->getName() directly, which returns the folder name (without the trailing '\').
---
 engines/wintermute/base/base_file_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 58684b66a0..05830ffcd8 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -227,7 +227,7 @@ bool BaseFileManager::registerPackages() {
 
 			// Again, make the parent's name all lowercase to avoid any case
 			// issues.
-			Common::String parentName = fileIt->getParent().getName();
+			Common::String parentName = it->getName();
 			parentName.toLowercase();
 
 			// Avoid registering all the language files
-- 
cgit v1.2.3


From c660119c2282a4a501ab88e9a65e3064fccad21d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Feb 2015 16:48:04 -0500
Subject: MADS: Fix depth for seaweed in scene 104

---
 engines/mads/nebular/nebular_scenes1.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 7c85fd44db..3149343aee 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -1621,6 +1621,7 @@ void Scene104::setup() {
 void Scene104::enter() {
 	_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('h', -1));
 	_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 14, 0, 0, 1);
+	_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 8);
 
 	if (_scene->_priorSceneId == 105)
 		_game._player._playerPos = Common::Point(302, 107);
-- 
cgit v1.2.3


From 076ce7e6c158878305ace5d7f334d54f8d44e966 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Feb 2015 17:45:20 -0500
Subject: MADS: Implement scroll wheel support for scrolling inventory

---
 engines/mads/events.cpp         |  6 +++
 engines/mads/game.cpp           | 11 +++++
 engines/mads/user_interface.cpp | 90 +++++++++++++++++++++++------------------
 engines/mads/user_interface.h   |  7 +++-
 4 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index 586ef7cbf3..06c6055f01 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -162,6 +162,12 @@ void EventsManager::pollEvents() {
 			return;
 		case Common::EVENT_KEYUP:
 			return;
+		case Common::EVENT_WHEELUP:
+			_pendingKeys.push(Common::KeyState(Common::KEYCODE_PAGEUP));
+			return;
+		case Common::EVENT_WHEELDOWN:
+			_pendingKeys.push(Common::KeyState(Common::KEYCODE_PAGEDOWN));
+			return;
 		case Common::EVENT_LBUTTONDOWN:
 		case Common::EVENT_RBUTTONDOWN:
 			_mouseClicked = true;
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 27691d3380..3b8b053fec 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -420,6 +420,7 @@ void Game::handleKeypress(const Common::KeyState &kbd) {
 		}
 	}
 
+	Scene &scene = _vm->_game->_scene;
 	switch (kbd.keycode) {
 	case Common::KEYCODE_F1:
 		_vm->_dialogs->_pendingDialog = DIALOG_GAME_MENU;
@@ -430,6 +431,16 @@ void Game::handleKeypress(const Common::KeyState &kbd) {
 	case Common::KEYCODE_F7:
 		_vm->_dialogs->_pendingDialog = DIALOG_RESTORE;
 		break;
+	case Common::KEYCODE_PAGEUP:
+		scene._userInterface._scrollbarStrokeType = SCROLLBAR_UP;
+		scene._userInterface.changeScrollBar();
+		break;
+	case Common::KEYCODE_PAGEDOWN:
+		scene._userInterface._scrollbarStrokeType = SCROLLBAR_DOWN;
+		scene._userInterface.changeScrollBar();
+		break;
+
+
 	default:
 		break;
 	}
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 822460d549..929390a073 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -495,7 +495,6 @@ void UserInterface::drawScroller() {
 
 void UserInterface::updateInventoryScroller() {
 	ScreenObjects &screenObjects = _vm->_game->_screenObjects;
-	Common::Array<int> &inventoryList = _vm->_game->_objects._inventoryList;
 
 	if (screenObjects._inputMode != kInputBuildingSentences)
 		return;
@@ -518,45 +517,8 @@ void UserInterface::updateInventoryScroller() {
 					_scrollbarQuickly = _vm->_events->_vD2 < 1;
 					_scrollbarMilliTime = currentMilli;
 
-					switch (_scrollbarStrokeType) {
-					case SCROLLBAR_UP:
-						// Scroll up
-						if (_inventoryTopIndex > 0 && inventoryList.size() > 0) {
-							--_inventoryTopIndex;
-							_inventoryChanged = true;
-						}
-						break;
-
-					case SCROLLBAR_DOWN:
-						// Scroll down
-						if (_inventoryTopIndex < ((int)inventoryList.size() - 1) && inventoryList.size() > 1) {
-							++_inventoryTopIndex;
-							_inventoryChanged = true;
-						}
-						break;
-
-					case SCROLLBAR_ELEVATOR: {
-						// Inventory slider
-						int newIndex = CLIP((int)_vm->_events->currentPos().y - 170, 0, 17)
-							* inventoryList.size() / 10;
-						if (newIndex >= (int)inventoryList.size())
-							newIndex = inventoryList.size() - 1;
-
-						if (inventoryList.size() > 0) {
-							_inventoryChanged = newIndex != _inventoryTopIndex;
-							_inventoryTopIndex = newIndex;
-						}
-						break;
-					}
-
-					default:
-						break;
-					}
-
-					if (_inventoryChanged) {
-						int dummy;
-						updateSelection(CAT_INV_LIST, 0, &dummy);
-					}
+					// Change the scrollbar and visible inventory list
+					changeScrollBar();
 				}
 			}
 		}
@@ -569,6 +531,54 @@ void UserInterface::updateInventoryScroller() {
 	_scrollbarOldElevator = _scrollbarElevator;
 }
 
+void UserInterface::changeScrollBar() {
+	Common::Array<int> &inventoryList = _vm->_game->_objects._inventoryList;
+	ScreenObjects &screenObjects = _vm->_game->_screenObjects;
+
+	if (screenObjects._inputMode != kInputBuildingSentences)
+		return;
+
+	switch (_scrollbarStrokeType) {
+	case SCROLLBAR_UP:
+		// Scroll up
+		if (_inventoryTopIndex > 0 && inventoryList.size() > 0) {
+			--_inventoryTopIndex;
+			_inventoryChanged = true;
+		}
+		break;
+
+	case SCROLLBAR_DOWN:
+		// Scroll down
+		if (_inventoryTopIndex < ((int)inventoryList.size() - 1) && inventoryList.size() > 1) {
+			++_inventoryTopIndex;
+			_inventoryChanged = true;
+		}
+		break;
+
+	case SCROLLBAR_ELEVATOR: {
+		// Inventory slider
+		int newIndex = CLIP((int)_vm->_events->currentPos().y - 170, 0, 17)
+			* inventoryList.size() / 10;
+		if (newIndex >= (int)inventoryList.size())
+			newIndex = inventoryList.size() - 1;
+
+		if (inventoryList.size() > 0) {
+			_inventoryChanged = newIndex != _inventoryTopIndex;
+			_inventoryTopIndex = newIndex;
+		}
+		break;
+	}
+
+	default:
+		break;
+	}
+
+	if (_inventoryChanged) {
+		int dummy;
+		updateSelection(CAT_INV_LIST, 0, &dummy);
+	}
+}
+
 void UserInterface::scrollbarChanged() {
 	Common::Rect r(73, 4, 73 + 9, 4 + 38);
 	_uiSlots.add(r);
diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h
index 89044c9bf1..71c6f64c2a 100644
--- a/engines/mads/user_interface.h
+++ b/engines/mads/user_interface.h
@@ -140,7 +140,6 @@ private:
 	bool _scrollFlag;
 	int _noSegmentsActive;
 	int _someSegmentsActive;
-	ScrollbarActive _scrollbarStrokeType;
 
 	/**
 	 * Loads the elements of the user interface
@@ -216,6 +215,7 @@ public:
 	bool _scrollbarQuickly;
 	uint32 _scrollbarMilliTime;
 	int _scrollbarElevator, _scrollbarOldElevator;
+	ScrollbarActive _scrollbarStrokeType;
 public:
 	/**
 	* Constructor
@@ -275,6 +275,11 @@ public:
 
 	void updateSelection(ScrCategory category, int newIndex, int *idx);
 
+	/**
+	* Updates the current top visible item of the scrollbar
+	*/
+	void changeScrollBar();
+
 	void scrollerChanged();
 
 	void scrollInventory();
-- 
cgit v1.2.3


From 85aecfaad4d9a0067a10580cea587996f2f37461 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Feb 2015 18:56:06 -0500
Subject: MADS: Fix animations of spider and vulture in witch doctor's hut
 scene

---
 engines/mads/nebular/nebular_scenes2.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index d00857f0a2..3eef545b09 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1448,12 +1448,14 @@ Scene207::Scene207(MADSEngine *vm) : Scene2xx(vm) {
 	_eyeFl = false;
 	_spiderHotspotId = -1;
 	_vultureHotspotId = -1;
-	_spiderTime = 0;
-	_vultureTime = 0;
+
+	_spiderTime = _game._player._priorTimer;
+	_vultureTime = _game._player._priorTimer;
 }
 
 void Scene207::synchronize(Common::Serializer &s) {
 	Scene2xx::synchronize(s);
+	uint32 unused;
 
 	s.syncAsByte(_vultureFl);
 	s.syncAsByte(_spiderFl);
@@ -1461,8 +1463,8 @@ void Scene207::synchronize(Common::Serializer &s) {
 
 	s.syncAsSint32LE(_spiderHotspotId);
 	s.syncAsSint32LE(_vultureHotspotId);
-	s.syncAsSint32LE(_spiderTime);
-	s.syncAsSint32LE(_vultureTime);
+	s.syncAsSint32LE(unused);
+	s.syncAsSint32LE(unused);
 }
 
 void Scene207::setup() {
@@ -1501,7 +1503,6 @@ void Scene207::enter() {
 
 	if (_vultureFl) {
 		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 30, 0, 0, 400);
-		_vultureTime = _game._player._priorTimer;
 		_vultureHotspotId = _scene->_dynamicHotspots.add(389, 13, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(_vultureHotspotId, Common::Point(254, 94), FACING_WEST);
 	}
@@ -1509,7 +1510,6 @@ void Scene207::enter() {
 	if (_spiderFl) {
 		_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], -1, -1);
-		_spiderTime = _game._player._priorTimer;
 		_spiderHotspotId = _scene->_dynamicHotspots.add(333, 13, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(_spiderHotspotId, Common::Point(59, 132), FACING_SOUTH);
 	}
@@ -1549,11 +1549,17 @@ void Scene207::moveSpider() {
 }
 
 void Scene207::step() {
-	if (!_vultureFl)
-		moveVulture();
+	Player &player = _game._player;
+
+	if (_vultureFl) {
+		if (((int32)player._priorTimer - _vultureTime) > 1700)
+			moveVulture();
+	}
 
-	if (_spiderFl)
-		moveSpider();
+	if (_spiderFl) {
+		if (((int32)player._priorTimer - _spiderTime) > 800)
+			moveSpider();
+	}
 
 	if (_game._trigger == 70) {
 		_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 10, 0, 0, 0);
-- 
cgit v1.2.3


From 877474cd327c1fab98c296b4786f3c98b9c93714 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 22 Feb 2015 01:43:02 +0100
Subject: MADS: Allow text to scroll off screen before removing it

For example in the credits scroll. Clipping was already done
elsewhere, so this really is just a change in how soon the line is
removed from the list of text to display.
---
 engines/mads/menu_views.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 8f1fd2d7a5..5a0c7ee92e 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -426,7 +426,7 @@ void TextView::doFrame() {
 			scene._textDisplay.expire(tl._textDisplayIndex);
 
 		tl._pos.y--;
-		if (tl._pos.y < 0) {
+		if (tl._pos.y + _font->getHeight() < 0) {
 			_textLines.remove_at(i);
 		} else {
 			tl._textDisplayIndex = scene._textDisplay.add(tl._pos.x, tl._pos.y,
-- 
cgit v1.2.3


From bab1afa6ccd5f9d3c53dfa494145cbd947ffcde2 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 22 Feb 2015 16:49:00 -0500
Subject: BASE: Fix infinite loop upon trying to play a game and not finding
 the engine

A regression from f74ba29753de23bad9a07f531fc4c03ea3375594
---
 base/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/base/main.cpp b/base/main.cpp
index 0f5ebc7845..3ea38b547a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -552,6 +552,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			PluginManager::instance().loadAllPlugins(); // only for cached manager
 		} else {
 			GUI::displayErrorDialog(_("Could not find any engine capable of running the selected game"));
+
+			// Clear the active domain
+			ConfMan.setActiveDomain("");
 		}
 
 		// reset the graphics to default
-- 
cgit v1.2.3


From 320139760cf4e964f5cc7ce8d71938377e293ec9 Mon Sep 17 00:00:00 2001
From: jammm
Date: Mon, 23 Feb 2015 23:37:04 +0530
Subject: WINTERMUTE: Add mappings for VKeyCodes->ScummVM KeyCodes

Fix bug #6654 (white chamber - some keys don't work)

Wintermute games on ScummVM used ScummVM keycodes for keyboard mapping,
whereas the game scripts only accepted Windows VKeyCodes. Therefore an initial
set of mappings are added and the debug room is now loading properly, when
HOME is pressed (Rest of the keys need to be tested in-game)
---
 engines/wintermute/base/base_keyboard_state.cpp | 101 ++++++++++++++++++------
 engines/wintermute/base/base_keyboard_state.h   |   2 +-
 2 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index 0babc07586..f672c83d39 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -261,42 +261,93 @@ bool BaseKeyboardState::isCurrentPrintable() const {
 	return _currentPrintable;
 }
 
+//////////////////////////////////////////////////////////////////////////
+enum VKeyCodes {
+	kVkReturn     = 13,
+
+	kVkEscape     = 27,
+
+	kVkSpace      = 32,
+	kVkEnd        = 35,
+	kVkHome       = 36,
+	kVkLeft       = 37,
+	kVkUp         = 38,
+	kVkRight      = 39,
+	kVkDown       = 40,
+
+	kVkF1         = 112,
+	kVkF2         = 113,
+	kVkF3         = 114,
+	kVkF4         = 115,
+	kVkF5         = 116,
+	kVkF6         = 117,
+	kVkF7         = 118,
+	kVkF8         = 119,
+	kVkF9         = 120,
+	kVkF10        = 121,
+	kVkF11        = 122,
+	kVkF12        = 123
+
+};
+
 //////////////////////////////////////////////////////////////////////////
 uint32 BaseKeyboardState::keyCodeToVKey(Common::Event *event) {
+	// todo
 	if (event->type != Common::EVENT_KEYDOWN) {
 		return 0;
 	}
 
 	switch (event->kbd.keycode) {
+	case Common::KEYCODE_RETURN:
 	case Common::KEYCODE_KP_ENTER:
-		return Common::KEYCODE_RETURN;
+		return kVkReturn;
+	case Common::KEYCODE_ESCAPE:
+		return kVkEscape;
+	case Common::KEYCODE_SPACE:
+		return kVkSpace;
+	case Common::KEYCODE_END:
+		return kVkEnd;
+	case Common::KEYCODE_HOME:
+		return kVkHome;
+	case Common::KEYCODE_LEFT:
+		return kVkLeft;
+	case Common::KEYCODE_RIGHT:
+		return kVkRight;
+	case Common::KEYCODE_UP:
+		return kVkUp;
+	case Common::KEYCODE_DOWN:
+		return kVkDown;
+	case Common::KEYCODE_F1:
+		return kVkF1;
+	case Common::KEYCODE_F2:
+		return kVkF2;
+	case Common::KEYCODE_F3:
+		return kVkF3;
+	case Common::KEYCODE_F4:
+		return kVkF4;
+	case Common::KEYCODE_F5:
+		return kVkF5;
+	case Common::KEYCODE_F6:
+		return kVkF6;
+	case Common::KEYCODE_F7:
+		return kVkF7;
+	case Common::KEYCODE_F8:
+		return kVkF8;
+	case Common::KEYCODE_F9:
+		return kVkF9;
+	case Common::KEYCODE_F10:
+		return kVkF10;
+	case Common::KEYCODE_F11:
+		return kVkF11;
+	case Common::KEYCODE_F12:
+		return kVkF12;
 	default:
-		return (uint32)event->kbd.ascii;
+		warning("Key not handled: %d '%c'", event->kbd.keycode, event->kbd.keycode);
+		return event->kbd.keycode;
+		break;
 	}
-}
 
-enum VKeyCodes {
-	kVkEscape = 27,
-	kVkSpace  = 32,
-	kVkHome   = 36,
-	kVkLeft   = 37,
-	kVkUp     = 38,
-	kVkRight  = 39,
-	kVkDown   = 40,
-
-	kVkF1     = 112,
-	kVkF2     = 113,
-	kVkF3     = 114,
-	kVkF4     = 115,
-	kVkF5     = 116,
-	kVkF6     = 117,
-	kVkF7     = 118,
-	kVkF8     = 119,
-	kVkF9     = 120,
-	kVkF10    = 121,
-	kVkF11    = 122,
-	kVkF12    = 123
-};
+}
 
 //////////////////////////////////////////////////////////////////////////
 Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {
diff --git a/engines/wintermute/base/base_keyboard_state.h b/engines/wintermute/base/base_keyboard_state.h
index c74bd5b0f7..32680b34c1 100644
--- a/engines/wintermute/base/base_keyboard_state.h
+++ b/engines/wintermute/base/base_keyboard_state.h
@@ -67,7 +67,7 @@ private:
 	bool _currentControl;
 
 	uint8 *_keyStates;
-	uint32 keyCodeToVKey(Common::Event *event);
+	uint32 keyCodeToVKey(Common::Event *event); //TODO, add more mappings
 	Common::KeyCode vKeyToKeyCode(uint32 vkey); //TODO, reimplement using ScummVM-backend
 };
 
-- 
cgit v1.2.3


From 8778603d342da33957cf995dd3547231795b14ba Mon Sep 17 00:00:00 2001
From: Norbert Bajkó
Date: Sun, 1 Mar 2015 14:48:34 +0100
Subject: DRASCULA: fix crash/graphic glitch at castle towers

Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
---
 engines/drascula/actors.cpp |  7 +++++++
 engines/drascula/talk.cpp   | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index 51148bbc05..0c18f513e1 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -396,6 +396,13 @@ void DrasculaEngine::increaseFrameNum() {
 		curHeight = (int)newHeight;
 		curWidth = (int)newWidth;
 	}
+
+	if ((currentChapter == 5) && (_roomNumber == 45)) {
+		curY = 0;
+		curX = 0;
+		curHeight = 0;
+		curWidth = 0;
+	}
 }
 
 void DrasculaEngine::walkDown() {
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index ed29dc5fe4..9773ceca5c 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -379,6 +379,7 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 
 	int y_mask_talk = 170;
 	int face;
+	bool notTowers = !((currentChapter == 5) && (_roomNumber == 45));
 
 	if (currentChapter == 6) {
 		if (flags[0] == 0 && _roomNumber == 102) {
@@ -434,44 +435,54 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 			if (currentChapter == 2)
 				copyRect(x_talk_izq[face], y_mask_talk, curX + 8, curY - 1, TALK_WIDTH, TALK_HEIGHT,
 						extraSurface, screenSurface);
-			else
+			else if (notTowers) {
 				reduce_hare_chico(x_talk_izq[face], y_mask_talk, curX + (int)((8.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-						curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
-						extraSurface, screenSurface);
-
+					curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
+					extraSurface, screenSurface);
+			}
 			updateRefresh();
 		} else if (trackProtagonist == 1) {
 			if (currentChapter == 2)
 				copyRect(x_talk_dch[face], y_mask_talk, curX + 12, curY, TALK_WIDTH, TALK_HEIGHT,
 					extraSurface, screenSurface);
-			else
+			else if (notTowers) {
 				reduce_hare_chico(x_talk_dch[face], y_mask_talk, curX + (int)((12.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
 					curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)], extraSurface, screenSurface);
+			}
 			updateRefresh();
 		} else if (trackProtagonist == 2) {
 			if (currentChapter == 2)
 				copyRect(x_talk_izq[face], y_mask_talk, curX + 12, curY, TALK_WIDTH, TALK_HEIGHT,
 					frontSurface, screenSurface);
-			else
+			else if (notTowers) {
 				reduce_hare_chico(x_talk_izq[face], y_mask_talk,
-						talkOffset + curX + (int)((12.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-						curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
-						frontSurface, screenSurface);
+					talkOffset + curX + (int)((12.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
+					curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
+					frontSurface, screenSurface);
+			}
 			updateRefresh();
 		} else if (trackProtagonist == 3) {
 			if (currentChapter == 2)
 				copyRect(x_talk_dch[face], y_mask_talk, curX + 8, curY, TALK_WIDTH, TALK_HEIGHT,
 					frontSurface, screenSurface);
-			else
+			else if (notTowers) {
 				reduce_hare_chico(x_talk_dch[face], y_mask_talk,
-						talkOffset + curX + (int)((8.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
-						curY, TALK_WIDTH,TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
-						frontSurface, screenSurface);
+					talkOffset + curX + (int)((8.0f / 100) * factor_red[MIN(201, curY + curHeight)]),
+					curY, TALK_WIDTH, TALK_HEIGHT, factor_red[MIN(201, curY + curHeight)],
+					frontSurface, screenSurface);
+			}
 			updateRefresh();
 		}
 
-		if (!_subtitlesDisabled)
-			centerText(said, curX, curY);
+		if (!_subtitlesDisabled) {
+			if (notTowers) {
+				centerText(said, curX, curY);
+			}
+			else {
+				centerText(said, 160, 25);
+			}
+		}
+	
 
 		updateScreen();
 		updateEvents();
-- 
cgit v1.2.3


From 066e71f61a0d3b83c0c9c071a11cfdffdef40a41 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 1 Mar 2015 16:20:02 +0100
Subject: SDL: Call setupIcon for each window creation with SDL2.

This should make sure that the logo is properly set on Win32 with SDL2.
---
 backends/platform/sdl/sdl-window.cpp | 9 +++------
 backends/platform/sdl/sdl-window.h   | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index 2a3877c523..6d35f77ae0 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -30,14 +30,13 @@
 
 SdlWindow::SdlWindow()
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
+	: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM")
 #endif
 	{
 }
 
 SdlWindow::~SdlWindow() {
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_FreeSurface(_windowIcon);
 	destroyWindow();
 #endif
 }
@@ -100,16 +99,14 @@ void SdlWindow::setupIcon() {
 	}
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	SDL_FreeSurface(_windowIcon);
-	_windowIcon = sdl_surf;
 	if (_window) {
 		SDL_SetWindowIcon(_window, sdl_surf);
 	}
 #else
 	SDL_WM_SetIcon(sdl_surf, NULL);
-	SDL_FreeSurface(sdl_surf);
 #endif
 
+	SDL_FreeSurface(sdl_surf);
 	free(icon);
 }
 
@@ -214,7 +211,7 @@ bool SdlWindow::createWindow(int width, int height, uint32 flags) {
 	if (!_window) {
 		return false;
 	}
-	SDL_SetWindowIcon(_window, _windowIcon);
+	setupIcon();
 
 	return true;
 }
diff --git a/backends/platform/sdl/sdl-window.h b/backends/platform/sdl/sdl-window.h
index 2608ea4a8f..58b898f824 100644
--- a/backends/platform/sdl/sdl-window.h
+++ b/backends/platform/sdl/sdl-window.h
@@ -101,7 +101,6 @@ protected:
 private:
 	bool _inputGrabState;
 	Common::String _windowCaption;
-	SDL_Surface *_windowIcon;
 #endif
 };
 
-- 
cgit v1.2.3


From 43a09925381838efbcd36dadba465cb5cae3eb11 Mon Sep 17 00:00:00 2001
From: norbertbajko
Date: Sun, 1 Mar 2015 17:06:20 +0100
Subject: DRASCULA: comment "actors.cpp"

Explain #5903 DRASCULA-IT bug fix---
 engines/drascula/actors.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index 0c18f513e1..849e2ccd24 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -396,7 +396,10 @@ void DrasculaEngine::increaseFrameNum() {
 		curHeight = (int)newHeight;
 		curWidth = (int)newWidth;
 	}
-
+	
+	// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
+	// Chapter 5 Room 45 is the castle tower part
+	// Fixing the character's coordinate(0,0) in the tower section to prevent out of window coordinates and crash
 	if ((currentChapter == 5) && (_roomNumber == 45)) {
 		curY = 0;
 		curX = 0;
-- 
cgit v1.2.3


From 0abf6d72b0ca15a81518190cb2040eb798754ebd Mon Sep 17 00:00:00 2001
From: norbertbajko
Date: Sun, 1 Mar 2015 17:16:54 +0100
Subject: DRASCULA: comment "talk.cpp"

Explain #5903 DRASCULA-IT bug fix---
 engines/drascula/talk.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 9773ceca5c..6e0dd2a011 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -379,6 +379,10 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 
 	int y_mask_talk = 170;
 	int face;
+	
+	// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
+	// Chapter 5 Room 45 is the castle tower part
+	// We use this variable as a condition below because at the castle towers we don't want to draw out the head 
 	bool notTowers = !((currentChapter == 5) && (_roomNumber == 45));
 
 	if (currentChapter == 6) {
-- 
cgit v1.2.3


From bcf2e8204c481d9c4df17786e16591c100eb6c82 Mon Sep 17 00:00:00 2001
From: norbertbajko
Date: Sun, 1 Mar 2015 17:23:28 +0100
Subject: DRASCULA: comment "talk.cpp"

Explain #5903 DRASCULA-IT bug fix---
 engines/drascula/talk.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 6e0dd2a011..e9fec868f8 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -478,6 +478,8 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 			updateRefresh();
 		}
 
+		// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
+		// Without the head we have to fix the subtitle's coordinates(upper-center) at the tower section
 		if (!_subtitlesDisabled) {
 			if (notTowers) {
 				centerText(said, curX, curY);
-- 
cgit v1.2.3


From e664e9167a599e1e8ac7d8bb8f5349547fb49832 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Mar 2015 18:21:39 -0500
Subject: MADS: Fix display of teleporter values with leading zeroes

---
 engines/mads/nebular/nebular_scenes.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index b5e2491624..0019118593 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -451,7 +451,10 @@ void SceneTeleporter::teleporterHandleKey() {
 				_curCode *= 10;
 				_curCode += _buttonTyped;
 				_digitCount++;
-				_msgText = Common::String::format("%d", _curCode);
+
+				Common::String format = "%01d";
+				format.setChar('0' + _digitCount, 2);
+				_msgText = Common::String::format(format.c_str(), _curCode);
 				if (_digitCount < 4)
 					_msgText += "_";
 
-- 
cgit v1.2.3


From aef874cf50da10f4c18ba450648ac7b84224d710 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Mar 2015 19:05:47 -0500
Subject: MADS: Fix animation of hand typing code in teleporter

---
 engines/mads/nebular/nebular_scenes.cpp  |  2 +-
 engines/mads/nebular/nebular_scenes1.cpp | 16 +++----
 engines/mads/nebular/nebular_scenes2.cpp | 44 +++++++++---------
 engines/mads/nebular/nebular_scenes3.cpp | 68 ++++++++++++++--------------
 engines/mads/nebular/nebular_scenes4.cpp | 46 +++++++++----------
 engines/mads/nebular/nebular_scenes5.cpp | 54 +++++++++++-----------
 engines/mads/nebular/nebular_scenes6.cpp | 78 ++++++++++++++++----------------
 engines/mads/nebular/nebular_scenes7.cpp | 30 ++++++------
 engines/mads/nebular/nebular_scenes8.cpp | 32 ++++++-------
 engines/mads/sequence.cpp                |  6 +--
 engines/mads/sequence.h                  |  4 +-
 11 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index 0019118593..72073b1c7b 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -432,7 +432,7 @@ void SceneTeleporter::teleporterHandleKey() {
 	case 0: {
 		_game._player._stepEnabled = false;
 		Common::Point msgPos = teleporterComputeLocation();
-		_handSequenceId = _scene->_sequences.startReverseCycle(_handSpriteId, false, 4, 2, 0, 0);
+		_handSequenceId = _scene->_sequences.startPingPongCycle(_handSpriteId, false, 4, 2, 0, 0);
 		_scene->_sequences.setPosition(_handSequenceId, msgPos);
 		_scene->_sequences.setDepth(_handSequenceId, 2);
 		_scene->_sequences.addSubEntry(_handSequenceId, SEQUENCE_TRIGGER_LOOP, 0, 1);
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 3149343aee..f21ab94bcb 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -134,7 +134,7 @@ void Scene101::sayDang() {
 	switch (_game._trigger) {
 	case 0:
 		_scene->_sequences.remove(_globals._sequenceIndexes[11]);
-		_globals._sequenceIndexes[11] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[11], false, 3, 6, 0, 0);
+		_globals._sequenceIndexes[11] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[11], false, 3, 6, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[11], 17, 21);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[11], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
 		_vm->_sound->command(17);
@@ -696,7 +696,7 @@ void Scene102::enter() {
 	_globals._spriteIndexes[11] = _scene->_sprites.addSprites("*RXMRC_8");
 	_globals._spriteIndexes[13] = _scene->_sprites.addSprites(formAnimName('x', 0));
 
-	_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 8, 0, 0, 0);
+	_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 8, 0, 0, 0);
 	_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 170, 0, 1, 6);
 	_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 11, 0, 2, 3);
 	_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 4, 0, 1, 0);
@@ -1201,7 +1201,7 @@ void Scene102::actions() {
 	if (_action.isAction(VERB_TAKE, NOUN_BINOCULARS) && _game._objects.isInRoom(OBJ_BINOCULARS)) {
 		switch (_game._trigger) {
 		case 0:
-			_globals._sequenceIndexes[11] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[11], false, 3, 1, 0, 0);
+			_globals._sequenceIndexes[11] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[11], false, 3, 1, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[11]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[11], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			_game._player._visible = false;
@@ -1433,7 +1433,7 @@ void Scene103::actions() {
 		switch (_vm->_game->_trigger) {
 		case 0:
 			_scene->changeVariant(1);
-			_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 3, 2);
+			_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 3, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[13]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_SPRITE, 7, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -1463,7 +1463,7 @@ void Scene103::actions() {
 		switch (_vm->_game->_trigger) {
 		case 0:
 			_scene->changeVariant(1);
-			_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 3, 2);
+			_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 3, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[12]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2010,7 +2010,7 @@ void Scene106::enter() {
 	}
 
 	_globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('G', -1));
-	_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 21, 0, 0, 0);
+	_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 21, 0, 0, 0);
 	_globals._spriteIndexes[4] = _scene->_sprites.addSprites(formAnimName('I', -1));
 	_globals._sequenceIndexes[4] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[4], false, 6, 0, 32, 47);
 
@@ -2503,7 +2503,7 @@ void Scene109::enter() {
 		_globals._spriteIndexes[10] = _scene->_sprites.addSprites(Resources::formatName(105, 'F', 1, EXT_SS, ""));
 		_globals._spriteIndexes[9] = _scene->_sprites.addSprites(formAnimName('H', 1));
 
-		_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], true, 4, 0, 0, 0);
+		_globals._sequenceIndexes[10] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[10], true, 4, 0, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 5);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[10], Common::Point(126, 39));
 		_scene->_sequences.setMotion(_globals._sequenceIndexes[10], 0, 200, 0);
@@ -2676,7 +2676,7 @@ void Scene109::actions() {
 
 					case 2:
 						if (_hoovicDifficultFl)
-							_globals._sequenceIndexes[8] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[8], false, 4, 2, 0, 0);
+							_globals._sequenceIndexes[8] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[8], false, 4, 2, 0, 0);
 						else
 							_globals._sequenceIndexes[8] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[8], false, 4, 1, 0, 0);
 
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 3eef545b09..b8629a3915 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -556,7 +556,7 @@ void Scene202::step() {
 	case 90:
 		_vm->_sound->command(41);
 		_scene->_sequences.remove(_globals._sequenceIndexes[10]);
-		_globals._sequenceIndexes[9] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
+		_globals._sequenceIndexes[9] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 91);
@@ -811,7 +811,7 @@ void Scene202::actions() {
 			} else {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[7] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[7], false, 3, 2, 0, 0);
+				_globals._sequenceIndexes[7] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[7], false, 3, 2, 0, 0);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[7]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[7], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[7], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -1502,7 +1502,7 @@ void Scene207::enter() {
 	_spiderFl = (var2 & 1);
 
 	if (_vultureFl) {
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 30, 0, 0, 400);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 30, 0, 0, 400);
 		_vultureHotspotId = _scene->_dynamicHotspots.add(389, 13, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(_vultureHotspotId, Common::Point(254, 94), FACING_WEST);
 	}
@@ -2164,7 +2164,7 @@ void Scene209::handleLookRight() {
 	switch (_game._trigger) {
 	case 151:
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 8, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 8, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 8, 14);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 152);
 		break;
@@ -2231,7 +2231,7 @@ void Scene209::handleGetBinoculars() {
 
 	case 162: {
 		int oldIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 8, 6, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 8, 6, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 25);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 163);
@@ -2240,7 +2240,7 @@ void Scene209::handleGetBinoculars() {
 
 	case 163: {
 		int oldIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 8, 0, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 8, 0, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 24);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addTimer(8, 164);
@@ -2264,7 +2264,7 @@ void Scene209::handleBinocularBlink() {
 	case 167: {
 		int oldIdx = _globals._sequenceIndexes[3];
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 8, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 8, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 25);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 168);
@@ -2273,7 +2273,7 @@ void Scene209::handleBinocularBlink() {
 
 	case 168: {
 		int oldIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 8, 0, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 8, 0, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 24);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addTimer(30, 169);
@@ -2293,7 +2293,7 @@ void Scene209::handleBinocularScan() {
 	case 171: {
 		int oldIdx = _globals._sequenceIndexes[3];
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 43, 45);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 172);
@@ -2305,10 +2305,10 @@ void Scene209::handleBinocularScan() {
 		int randAction = _vm->getRandomNumber(1,2);
 		switch (randAction) {
 		case 1:
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
 			break;
 		case 2:
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 4, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 4, 0, 0);
 			break;
 		}
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 25);
@@ -2319,7 +2319,7 @@ void Scene209::handleBinocularScan() {
 
 	case 173: {
 		int oldIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 26, 30);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 174);
@@ -2328,7 +2328,7 @@ void Scene209::handleBinocularScan() {
 
 	case 174: {
 		int oldIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 0, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 0, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 24);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addTimer(60, 175);
@@ -2414,7 +2414,7 @@ void Scene209::handleTongue() {
 	case 185: {
 		_vm->_sound->command(18);
 		int oldIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 6, 20, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 6, 20, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 38, 39);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 186);
@@ -2534,7 +2534,7 @@ void Scene209::handleMonkeyEating() {
 
 	case 200: {
 		int oldIdx = _globals._sequenceIndexes[4];
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 10, 10, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 10, 10, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 15, 16);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 201);
@@ -2563,14 +2563,14 @@ void Scene209::handleMonkeyEating() {
 
 	case 204:
 		_scene->_sequences.remove(_globals._sequenceIndexes[4]);
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 10, 8, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 10, 8, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 18, 19);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 205);
 		break;
 
 	case 205: {
 		int oldIdx = _globals._sequenceIndexes[4];
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 10, 8, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 10, 8, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 20, 21);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 206);
@@ -2595,7 +2595,7 @@ void Scene209::handleMonkeyEating() {
 		 _scene->_kernelMessages.setQuoted(msgIndex, 4, true);
 
 		 int oldIdx = _globals._sequenceIndexes[4];
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 15, 4, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 15, 4, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 26, 27);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 208);
@@ -2605,7 +2605,7 @@ void Scene209::handleMonkeyEating() {
 	case 208: {
 		_scene->_kernelMessages.add(Common::Point(180, 39), 0xFDFC, 0, 0, 90, _game.getQuote(131));
 		int oldIdx = _globals._sequenceIndexes[4];
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 10, 4, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 10, 4, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 28, 29);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], oldIdx);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 209);
@@ -3448,7 +3448,7 @@ void Scene209::actions() {
 			_globals._spriteIndexes[11] = _scene->_sprites.addSprites("*RXMBD_2");
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[11] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[11], false, 3, 2, 0, 0);
+			_globals._sequenceIndexes[11] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[11], false, 3, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[11]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[11], SEQUENCE_TRIGGER_SPRITE, 4, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[11], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -3480,7 +3480,7 @@ void Scene209::actions() {
 			_globals._spriteIndexes[10] = _scene->_sprites.addSprites("*RXMBD_8");
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 3, 2, 0, 0);
+			_globals._sequenceIndexes[10] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[10], false, 3, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[10]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[10], SEQUENCE_TRIGGER_SPRITE, 4, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[10], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -5297,7 +5297,7 @@ void Scene215::actions() {
 				if (_globals[kSexOfRex] == REX_MALE) {
 					_game._player._visible = false;
 					_game._player._stepEnabled = false;
-					_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 6, 2, 0, 0);
+					_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 2, 0, 0);
 					_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 4);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_LOOP, 0, 1);
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index bcedf95a27..478a733485 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -370,7 +370,7 @@ void Scene304::enter() {
 		_globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('a', 1));
 		_globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('b', 0));
 
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 150, 0, 3, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 150, 0, 3, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 2);
 		_vm->_palette->setEntry(252, 45, 63, 45);
 		_vm->_palette->setEntry(253, 20, 45, 20);
@@ -953,7 +953,7 @@ void Scene307::actions() {
 
 		case 2: {
 			int oldIdx = _globals._sequenceIndexes[5];
-			_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 12, 6, 0, 0);
+			_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 12, 6, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 2, 3);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[5], oldIdx);
@@ -1245,7 +1245,7 @@ void Scene308::step() {
 	switch (_game._trigger) {
 	case 70: {
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 18, 9, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 18, 9, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 2, 3);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 9);
 		_scene->_kernelMessages.reset();
@@ -1266,7 +1266,7 @@ void Scene308::step() {
 
 	case 72:
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 20, 5, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 20, 5, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 3, 4);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 9);
 		_scene->_kernelMessages.reset();
@@ -1284,7 +1284,7 @@ void Scene308::step() {
 
 	case 74: {
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 20, 8, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 20, 8, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 6, 7);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 9);
 		_scene->_kernelMessages.reset();
@@ -1306,7 +1306,7 @@ void Scene308::step() {
 
 	case 76: {
 		int seqIdx = _globals._sequenceIndexes[3];
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 26, 0, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 26, 0, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 2, 3);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 9);
 		_scene->_kernelMessages.reset();
@@ -1441,7 +1441,7 @@ void Scene309::step() {
 		case 70: {
 			int idx = _scene->_dynamicHotspots.add(689, 690, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0));
 			_scene->_dynamicHotspots.setPosition(idx, Common::Point(142, 146), FACING_NORTHEAST);
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 4, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 4, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 2, 3);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 11);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
@@ -1462,7 +1462,7 @@ void Scene309::step() {
 
 		case 72: {
 			int _oldIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 8, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 8, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 8, 11);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 11);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], _oldIdx);
@@ -1484,7 +1484,7 @@ void Scene309::step() {
 
 		case 74: {
 			int _oldIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 6, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 6, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 21, 23);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 11);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], _oldIdx);
@@ -1494,7 +1494,7 @@ void Scene309::step() {
 
 		case 75: {
 			int _oldIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 6, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 6, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 24, 25);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], _oldIdx);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 11);
@@ -1513,7 +1513,7 @@ void Scene309::step() {
 			break;
 
 		case 77: {
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 90, 0, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 90, 0, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 29, 30);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 11);
 			int idx = _scene->_kernelMessages.add(Common::Point(15, 46), 0xFDFC, 0, 0, 120, _game.getQuote(247));
@@ -1965,7 +1965,7 @@ void Scene316::handleRexInGrate() {
 
 	case 1:
 		_scene->_sequences.setDone(_globals._sequenceIndexes[4]);
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 12, 3, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 12, 3, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 2, 3);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2085,7 +2085,7 @@ void Scene316::handleRoxInGrate() {
 
 	case 1:
 		_scene->_sequences.setDone(_globals._sequenceIndexes[5]);
-		_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 17, 3, 0, 0);
+		_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 17, 3, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 2, 3);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2523,7 +2523,7 @@ void Scene318::handleDialog() {
 		case 0x19C:
 		case 0x19D:
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 6, 8);
@@ -2883,7 +2883,7 @@ void Scene318::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 8, 2, 0, 80);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 8, 2, 0, 80);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 2, 5);
@@ -3588,7 +3588,7 @@ void Scene320::setLeftView(int view) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[0]);
 
 	if (view != 10) {
-		_globals._sequenceIndexes[0] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[view], false, 6, 0, 0, 18);
+		_globals._sequenceIndexes[0] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[view], false, 6, 0, 0, 18);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[0], 0);
 		if (!_blinkFl)
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[0], 2, 2);
@@ -3752,7 +3752,7 @@ void Scene320::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			handleButtons();
-			_globals._sequenceIndexes[18] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[18], _flippedFl, 4, 2, 0, 0);
+			_globals._sequenceIndexes[18] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[18], _flippedFl, 4, 2, 0, 0);
 			_scene->_sequences.setScale(_globals._sequenceIndexes[18], 60);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[18], Common::Point(_posX, 170));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[18], 0);
@@ -4053,12 +4053,12 @@ void Scene351::actions() {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
 				if (_globals[kSexOfRex] == REX_FEMALE) {
-					_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 5, 2, 0, 0);
+					_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 5, 2, 0, 0);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 5, 1);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 				} else {
-					_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 5, 2, 0, 0);
+					_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 5, 2, 0, 0);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -4160,12 +4160,12 @@ void Scene352::putArmDown(bool corridorExit, bool doorwayExit) {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		if (_globals[kSexOfRex] == REX_FEMALE) {
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 5, 2, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 5, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_SPRITE, 5, 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 3);
 		} else {
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 5, 2, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 5, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_SPRITE, 6, 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 3);
@@ -4305,7 +4305,7 @@ void Scene352::preActions() {
 				_game._player._stepEnabled = false;
 				_scene->_sequences.remove(_commonSequenceIdx);
 				_vm->_sound->command(20);
-				_commonSequenceIdx = _scene->_sequences.startReverseCycle(_commonSpriteIndex, false, 6, 1, 0, 0);
+				_commonSequenceIdx = _scene->_sequences.startPingPongCycle(_commonSpriteIndex, false, 6, 1, 0, 0);
 				_scene->_sequences.addSubEntry(_commonSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 				_scene->_sequences.setDepth(_commonSequenceIdx, 15);
 			}
@@ -4364,7 +4364,7 @@ void Scene352::actions() {
 
 			case 1: {
 				_vm->_sound->command(21);
-				_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 7, 2, 20, 0);
+				_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 7, 2, 20, 0);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[12], FACING_NORTH);
 				int oldIdx = _commonSequenceIdx;
 				_commonSequenceIdx = _scene->_sequences.startCycle(_commonSpriteIndex, false, -2);
@@ -4376,7 +4376,7 @@ void Scene352::actions() {
 			case 2:
 				_vm->_sound->command(22);
 				_scene->_sequences.remove(_commonSequenceIdx);
-				_commonSequenceIdx = _scene->_sequences.startReverseCycle(_commonSpriteIndex, false, 8, 1, 0, 0);
+				_commonSequenceIdx = _scene->_sequences.startPingPongCycle(_commonSpriteIndex, false, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_commonSequenceIdx, 1, 3);
 				_scene->_sequences.addSubEntry(_commonSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 3);
 				break;
@@ -4431,12 +4431,12 @@ void Scene352::actions() {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
 				if (_globals[kSexOfRex] == REX_FEMALE) {
-					_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 5, 2, 0, 0);
+					_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 5, 2, 0, 0);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_SPRITE, 5, 1);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 				} else {
-					_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 5, 2, 0, 0);
+					_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 5, 2, 0, 0);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -4478,7 +4478,7 @@ void Scene352::actions() {
 
 			case 1: {
 				_vm->_sound->command(21);
-				_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 7, 2, 20, 0);
+				_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 7, 2, 20, 0);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[12], 8);
 				int oldIdx = _commonSequenceIdx;
 				_commonSequenceIdx = _scene->_sequences.startCycle(_commonSpriteIndex, false, -2);
@@ -4490,7 +4490,7 @@ void Scene352::actions() {
 			case 2:
 				_vm->_sound->command(23);
 				_scene->_sequences.remove(_commonSequenceIdx);
-				_commonSequenceIdx = _scene->_sequences.startReverseCycle(_commonSpriteIndex, false, 8, 1, 0, 0);
+				_commonSequenceIdx = _scene->_sequences.startPingPongCycle(_commonSpriteIndex, false, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_commonSequenceIdx, 1, 4);
 				_scene->_sequences.addSubEntry(_commonSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 3);
 				break;
@@ -4545,13 +4545,13 @@ void Scene352::actions() {
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
 			if (_globals[kSexOfRex] == REX_MALE) {
-				_globals._sequenceIndexes[14] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[14], false, 8, 1, 0, 0);
+				_globals._sequenceIndexes[14] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[14], false, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[14], 1, 2);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[14]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[14], SEQUENCE_TRIGGER_SPRITE, 2, 1);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[14], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 			} else {
-				_globals._sequenceIndexes[15] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[15], false, 8, 1, 0, 0);
+				_globals._sequenceIndexes[15] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[15], false, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[15], 1, 2);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[15]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[15], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -4592,12 +4592,12 @@ void Scene352::actions() {
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
 			if (_globals[kSexOfRex] == REX_MALE) {
-				_globals._sequenceIndexes[6] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[6], true, 6, 2, 0, 0);
+				_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], true, 6, 2, 0, 0);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[6]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 			} else {
-				_globals._sequenceIndexes[7] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[7], true, 6, 2, 0, 0);
+				_globals._sequenceIndexes[7] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[7], true, 6, 2, 0, 0);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[7]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[7], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[7], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -4980,12 +4980,12 @@ void Scene359::actions() {
 				_game._player._visible = false;
 				_vm->_dialogs->show(35920);
 				if (_globals[kSexOfRex] == REX_MALE) {
-					_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 4, 2, 0, 0);
+					_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 4, 2, 0, 0);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 6, 1);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 				} else {
-					_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], true, 7, 2, 0, 0);
+					_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], true, 7, 2, 0, 0);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 					_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(106, 110));
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_SPRITE, 6, 1);
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 56f6fb4466..8a9e510591 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -962,7 +962,7 @@ void Scene402::step() {
 		}
 
 		if (!_bartenderTalking) {
-			_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 7, 0, 0, 0);
+			_globals._sequenceIndexes[10] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[10], false, 7, 0, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 3, 4);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 8);
 			int idx = _scene->_dynamicHotspots.add(NOUN_BARTENDER, VERB_WALKTO, _globals._sequenceIndexes[10], Common::Rect(0, 0, 0, 0));
@@ -1514,7 +1514,7 @@ void Scene402::step() {
 				break;
 
 			case 3:
-				_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
+				_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 2, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 4, 5);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 32);
 				_rightWomanMoving = true;
@@ -1697,7 +1697,7 @@ void Scene402::step() {
 		_scene->_kernelMessages.add(Common::Point(171, 47), 0xFBFA, 0, 0, 130, _game.getQuote(0x200));
 		_scene->_sequences.addTimer(150, 63);
 		_scene->_sequences.remove(_globals._sequenceIndexes[13]);
-		_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 30, 4, 0, 0);
+		_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 30, 4, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[13], 10, 11);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[13], 8);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 62);
@@ -1769,7 +1769,7 @@ void Scene402::step() {
 
 	case 69: {
 		int seqIdx = _globals._sequenceIndexes[13];
-		_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 25, 4, 0, 0);
+		_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 25, 4, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[13], 10, 11);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[13], 8);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[13], seqIdx);
@@ -1783,7 +1783,7 @@ void Scene402::step() {
 		break;
 
 	case 70:
-		_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 25, 4, 0, 0);
+		_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 25, 4, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[13], 10, 12);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[13], 8);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
@@ -1840,7 +1840,7 @@ void Scene402::step() {
 				_cutSceneReady = false;
 				_helgaReady = false;
 				_scene->_sequences.remove(_globals._sequenceIndexes[13]);
-				_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 15, 2, 0, 0);
+				_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 15, 2, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[13], 11, 13);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[13], 8);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 26);
@@ -1860,7 +1860,7 @@ void Scene402::step() {
 				_cutSceneReady = false;
 				_helgaReady = false;
 				_scene->_sequences.remove(_globals._sequenceIndexes[13]);
-				_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 15, 2, 0, 0);
+				_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 15, 2, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[13], 14, 15);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[13], 8);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 26);
@@ -2069,7 +2069,7 @@ void Scene402::actions() {
 		if (_game._trigger == 0) {
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[21] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[21], false, 7, 2, 0, 0);
+			_globals._sequenceIndexes[21] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[21], false, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[21], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[21]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[21], SEQUENCE_TRIGGER_SPRITE, 2, 165);
@@ -2202,7 +2202,7 @@ void Scene402::actions() {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[22] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[22], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[22] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[22], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[22], 1, 2);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[22], Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1));
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[22], 5);
@@ -2445,7 +2445,7 @@ void Scene405::step() {
 	if (_game._trigger == 70) {
 		_game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount ;
 		_game._player._visible = true;
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		_vm->_sound->command(19);
 	}
@@ -2495,7 +2495,7 @@ void Scene405::actions() {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 75);
 		Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1);
@@ -2505,7 +2505,7 @@ void Scene405::actions() {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[3], _game._player._playerPos);
@@ -2514,7 +2514,7 @@ void Scene405::actions() {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[3], _game._player._playerPos);
@@ -2609,7 +2609,7 @@ void Scene406::enter() {
 	else {
 		_game._player._stepEnabled = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 3, 1, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 3, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
 		_vm->_sound->command(19);
 	}
@@ -2647,7 +2647,7 @@ void Scene406::step() {
 	if (_game._trigger == 70) {
 		_game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount;
 		_game._player._visible = true;
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 4, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 4, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		_vm->_sound->command(19);
 	}
@@ -2703,7 +2703,7 @@ void Scene406::actions() {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 75);
 		Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1);
@@ -2713,7 +2713,7 @@ void Scene406::actions() {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
 		Common::Point msgPos = Common::Point(_game._player._playerPos.x, _game._player._playerPos.y + 1);
@@ -2723,7 +2723,7 @@ void Scene406::actions() {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 110);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[2], _game._player._playerPos);
@@ -2934,7 +2934,7 @@ void Scene408::actions() {
 			_vm->_sound->command(57);
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], true, 7, 2, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], true, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[1]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -3182,7 +3182,7 @@ void Scene410::actions() {
 			_vm->_sound->command(57);
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 3);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 3, 1);
@@ -3842,7 +3842,7 @@ void Scene411::actions() {
 			_vm->_sound->command(57);
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[8] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[8], false, 7, 2, 0, 0);
+			_globals._sequenceIndexes[8] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[8], false, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[8], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[8]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[8], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -3879,7 +3879,7 @@ void Scene411::actions() {
 			_vm->_sound->command(57);
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[8] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[8], false, 7, 2, 0, 0);
+			_globals._sequenceIndexes[8] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[8], false, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[8], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[8]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[8], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -4078,7 +4078,7 @@ void Scene413::enter() {
 		case 1:
 			_vm->_sound->command(30);
 			_game._player._visible = false;
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 19);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 8);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 76);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 66d8294fc6..fe15fe0636 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -132,7 +132,7 @@ void Scene501::handleSlotActions() {
 			frameIndex = 2;
 		}
 
-		_mainSequenceId = _scene->_sequences.startReverseCycle(_mainSpriteId, false, numTicks, 1, 0, 0);
+		_mainSequenceId = _scene->_sequences.startPingPongCycle(_mainSpriteId, false, numTicks, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_mainSequenceId, 1, frameIndex);
 		_scene->_sequences.setMsgLayout(_mainSequenceId);
 		_vm->_sound->command(10);
@@ -238,7 +238,7 @@ void Scene501::step() {
 			break;
 
 		case 82:
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
 			_vm->_sound->command(12);
 			_doorHotspotid = _scene->_dynamicHotspots.add(NOUN_DOOR, VERB_WALK_THROUGH, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0));
@@ -273,7 +273,7 @@ void Scene501::step() {
 
 		case 72:
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 73);
 			break;
@@ -415,7 +415,7 @@ void Scene501::actions() {
 		case 7: {
 			_vm->_sound->command(12);
 			int syncIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], syncIdx);
 			_vm->_sound->command(12);
@@ -581,13 +581,13 @@ void Scene503::actions() {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
 				if (_globals[kSexOfRex] == REX_MALE) {
-					_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
+					_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
 					_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 3);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 3, 1);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 				} else {
-					_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], true, 8, 1, 0, 0);
+					_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], true, 8, 1, 0, 0);
 					_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 4);
 					_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_SPRITE, 4, 1);
@@ -800,7 +800,7 @@ void Scene504::actions() {
 
 		case 1: {
 			int syncIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 13);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 6);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -913,7 +913,7 @@ void Scene505::enter() {
 	_globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('e', -1));
 
 	if (_scene->_priorSceneId != -2)
-		_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 6, 1, 0, 0);
 
 	_globals._sequenceIndexes[13] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[13], false, 6, 1, 120, 0);
 	_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 60);
@@ -996,7 +996,7 @@ void Scene505::step() {
 					_scene->_sequences.remove(_globals._sequenceIndexes[1]);
 					_scene->_sequences.remove(_globals._sequenceIndexes[0]);
 					_scene->_sequences.remove(_globals._sequenceIndexes[13]);
-					_globals._sequenceIndexes[13] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[13], false, 6, 1, 0, 0);
+					_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 6, 1, 0, 0);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
 					_vm->_sound->command(18);
 				}
@@ -1260,7 +1260,7 @@ void Scene506::step() {
 
 		case 71:
 			_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 5);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
 			break;
@@ -1317,7 +1317,7 @@ void Scene506::handleDoorSequences() {
 
 	case 82:
 		_scene->_sequences.remove(_doorSequenceIdx);
-		_doorSequenceIdx = _scene->_sequences.startReverseCycle(_doorSpriteIdx, false, 7, 1, 0, 0);
+		_doorSequenceIdx = _scene->_sequences.startPingPongCycle(_doorSpriteIdx, false, 7, 1, 0, 0);
 		_scene->_sequences.setDepth(_doorSequenceIdx, _doorDepth);
 		if (_actionFl)
 			_scene->_sequences.addSubEntry(_doorSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 84);
@@ -1487,7 +1487,7 @@ void Scene507::actions() {
 			case 0:
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+				_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 5);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 5, 1);
@@ -1613,7 +1613,7 @@ void Scene508::enter() {
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 11);
 		int idx = _scene->_dynamicHotspots.add(NOUN_LASER_BEAM, VERB_WALKTO, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(57, 116), FACING_NORTHEAST);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 15, 0, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 15, 0, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 6, 8);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 6);
 		if (_globals[kLaserHoleIsThere]) {
@@ -1659,7 +1659,7 @@ void Scene508::handlePedestral() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[6] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[6], false, 9, 1, 0, 0);
+			_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], false, 9, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[6], 1, 4);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[6]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_SPRITE, 4, 1);
@@ -1732,7 +1732,7 @@ void Scene508::actions() {
 				break;
 
 			case 4:
-				_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 15, 0, 0, 0);
+				_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 15, 0, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 6, 8);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 6);
 				break;
@@ -2024,7 +2024,7 @@ void Scene511::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -2257,7 +2257,7 @@ void Scene512::actions() {
 			case 0:
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
+				_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 5, 1);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2293,7 +2293,7 @@ void Scene512::actions() {
 
 			case 1:
 				_game._player._visible = false;
-				_globals._sequenceIndexes[8] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[8], false, 9, 1, 0, 0);
+				_globals._sequenceIndexes[8] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[8], false, 9, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[8], 1, 3);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[8]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[8], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2326,7 +2326,7 @@ void Scene512::actions() {
 				break;
 
 			case 5:
-				_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 14, 0, 0, 0);
+				_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 14, 0, 0, 0);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 3);
 				_scene->_hotspots.activate(NOUN_PADLOCK_KEY, true);
 				_scene->_sequences.addTimer(60, 6);
@@ -2347,7 +2347,7 @@ void Scene512::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 10, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 10, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
@@ -2358,12 +2358,12 @@ void Scene512::actions() {
 			_game._player._visible = true;
 			if (!_game._objects.isInRoom(OBJ_PADLOCK_KEY) || _game._difficulty == DIFFICULTY_EASY) {
 				_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-				_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 12, 1, 0, 0);
+				_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 1, 0, 0);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 3);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 			} else {
 				_scene->_sequences.remove(_globals._sequenceIndexes[5]);
-				_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 12, 1, 0, 0);
+				_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 12, 1, 0, 0);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 3);
 				_scene->_hotspots.activate(NOUN_PADLOCK_KEY, false);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2391,7 +2391,7 @@ void Scene512::actions() {
 				else
 					endVal = 2;
 
-				_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 10, 1, 0, 0);
+				_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 10, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, endVal);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, endVal, 1);
@@ -2529,7 +2529,7 @@ void Scene513::step() {
 	case 80:
 		_game._player._stepEnabled = false;
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 2);
 		_vm->_sound->command(24);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
@@ -2588,7 +2588,7 @@ void Scene513::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -2626,7 +2626,7 @@ void Scene513::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 7, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 7, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
@@ -2636,7 +2636,7 @@ void Scene513::actions() {
 			_scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[4]);
 			_game._player._visible = true;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 2);
 			_vm->_sound->command(24);
 			_scene->_kernelMessages.reset();
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 679039535f..b0777c13c3 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -130,7 +130,7 @@ void Scene601::step() {
 
 	case 71:
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 3);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
 		break;
@@ -313,7 +313,7 @@ void Scene602::handleSafeActions() {
 	case 0:
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], true, 12, 1, 0, 0);
+		_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], true, 12, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 1, 3);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_SPRITE, 3, 1);
@@ -348,7 +348,7 @@ void Scene602::handleSafeActions() {
 			else
 				_lastSpriteIdx = _globals._spriteIndexes[3];
 
-			_lastSequenceIdx = _scene->_sequences.startReverseCycle(_lastSpriteIdx, false, 12, 1, 0, 0);
+			_lastSequenceIdx = _scene->_sequences.startPingPongCycle(_lastSpriteIdx, false, 12, 1, 0, 0);
 			_scene->_sequences.setDepth(_lastSequenceIdx, 14);
 			if (_game._objects[OBJ_DOOR_KEY]._roomNumber == _scene->_currentSceneId)
 				_scene->_hotspots.activate(NOUN_DOOR_KEY, false);
@@ -460,7 +460,7 @@ void Scene602::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], true, 8, 1, 0, 0);
+			_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], true, 8, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 1, 3);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_SPRITE, 3, 1);
@@ -600,7 +600,7 @@ void Scene603::actions() {
 			case 0:
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 8, 1, 0, 0);
+				_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 1, 5);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_SPRITE, 5, 1);
@@ -858,7 +858,7 @@ void Scene604::handleBombActions() {
 	case 0:
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 9, 1, 0, 0);
+		_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 9, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 1, 3);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 		if (_bombMode == 1)
@@ -908,7 +908,7 @@ void Scene604::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -1003,12 +1003,12 @@ void Scene605::enter() {
 	_globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('n', -1));
 	_globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('f', -1));
 
-	_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 15, 0, 0, 0);
-	_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 17, 0, 0, 0);
-	_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 14, 0, 0, 0);
-	_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 13, 0, 0, 0);
-	_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 17, 0, 0, 0);
-	_globals._sequenceIndexes[6] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[6], false, 18, 0, 0, 0);
+	_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 15, 0, 0, 0);
+	_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 17, 0, 0, 0);
+	_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 14, 0, 0, 0);
+	_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 13, 0, 0, 0);
+	_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 17, 0, 0, 0);
+	_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], false, 18, 0, 0, 0);
 
 	_game._player._visible = false;
 	_game._player._stepEnabled = false;
@@ -1164,7 +1164,7 @@ void Scene607::step() {
 	 && !_dogBarking && (_vm->getRandomNumber(1, 50) == 10)) {
 		_dogBarking = true;
 		_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 8, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 8, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 6);
 		_scene->_kernelMessages.reset();
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_SPRITE, 2, 100);
@@ -1250,7 +1250,7 @@ void Scene607::step() {
 
 		case 61: {
 			int syncIdx = _globals._sequenceIndexes[4];
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 15, 3, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 15, 3, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 46, -2);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], syncIdx);
@@ -1397,7 +1397,7 @@ void Scene607::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -1791,7 +1791,7 @@ void Scene608::enter() {
 		if (!_dogUnderCar)
 			resetDogVariables();
 		else {
-			_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0);
+			_globals._sequenceIndexes[10] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 10, 11);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 6);
 		}
@@ -1833,7 +1833,7 @@ void Scene608::step() {
 			if (_vm->getRandomNumber(1, 50) == 10) {
 				_dogBarkingFl = true;
 				_scene->_sequences.remove(_globals._sequenceIndexes[5]);
-				_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 5, 8, 0, 0);
+				_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 5, 8, 0, 0);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 4);
 				int idx = _scene->_dynamicHotspots.add(NOUN_OBNOXIOUS_DOG, VERB_WALKTO, _globals._sequenceIndexes[5], Common::Rect(0, 0, 0, 0));
 				_scene->_dynamicHotspots.setPosition(idx, Common::Point(194, 142), FACING_EAST);
@@ -1958,7 +1958,7 @@ void Scene608::step() {
 				_game._player._visible = true;
 				_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
 			} else if (_carFrame == 41) {
-				_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0);
+				_globals._sequenceIndexes[10] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 10, 11);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 6);
 				_dogUnderCar = true;
@@ -2148,7 +2148,7 @@ void Scene608::step() {
 
 		case 82: {
 			int syncIdx = _globals._sequenceIndexes[9];
-			_globals._sequenceIndexes[9] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[9], false, 15, 5, 0, 0);
+			_globals._sequenceIndexes[9] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[9], false, 15, 5, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[9], 39, 40);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 5);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[9], syncIdx);
@@ -2219,7 +2219,7 @@ void Scene608::actions() {
 			if ((_globals[kCarStatus] == CAR_UP) || (_globals[kCarStatus] == CAR_SQUASHES_DOG) || (_globals[kCarStatus] == CAR_SQUASHES_DOG_AGAIN)) {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], true, 6, 2, 0, 0);
+				_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], true, 6, 2, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
@@ -2293,7 +2293,7 @@ void Scene608::actions() {
 			if ((_globals[kCarStatus] == CAR_DOWN) || (_globals[kCarStatus] == CAR_DOWN_ON_SQUASHED_DOG)) {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], true, 6, 2, 0, 0);
+				_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], true, 6, 2, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 3);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
@@ -2379,7 +2379,7 @@ void Scene608::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], true, 6, 2, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], true, 6, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 4, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2407,7 +2407,7 @@ void Scene608::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], true, 6, 2, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], true, 6, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -2574,7 +2574,7 @@ void Scene609::step() {
 
 	case 62:
 		_scene->_sequences.remove( _globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_hotspots.activate(NOUN_VIDEO_STORE_DOOR, true);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
@@ -2582,7 +2582,7 @@ void Scene609::step() {
 
 	case 63:
 		if (!_globals[kHasTalkedToHermit] && (_game._difficulty != DIFFICULTY_HARD)) {
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 26, 2, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 26, 2, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(287, 73));
 			_scene->_sequences.setScale(_globals._sequenceIndexes[3], 47);
@@ -2605,7 +2605,7 @@ void Scene609::step() {
 
 	case 71:
 		if (!_globals[kHasTalkedToHermit]) {
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 26, 2, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 26, 2, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[3], Common::Point(287, 73));
 			_scene->_sequences.setScale(_globals._sequenceIndexes[3], 47);
@@ -2648,7 +2648,7 @@ void Scene609::enterStore() {
 
 	case 2:
 		_game._player._visible = false;
-		_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], true, 11, 2, 0, 0);
+		_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], true, 11, 2, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 1, 2);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 3);
@@ -2690,7 +2690,7 @@ void Scene609::enterStore() {
 
 	case 7:
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 8);
 		break;
@@ -2766,7 +2766,7 @@ void Scene609::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 5);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -2922,7 +2922,7 @@ void Scene610::actions() {
 			case 0:
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
-				_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], true, 8, 1, 0, 0);
+				_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], true, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 				_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 				_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -2952,7 +2952,7 @@ void Scene610::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], true, 8, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], true, 8, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -4012,7 +4012,7 @@ void Scene611::step() {
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
 	} else if (_game._trigger == 81) {
 		int syncId = _globals._sequenceIndexes[1];
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 20, 0, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 20, 0, 0, 0);
 		int idx = _scene->_dynamicHotspots.add(NOUN_RAT, VERB_WALKTO, _globals._sequenceIndexes[1], Common::Rect(0, 0, 0, 0));
 		_ratHotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(272, 154), FACING_SOUTHEAST);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 9, 10);
@@ -4040,7 +4040,7 @@ void Scene611::step() {
 			break;
 
 		case 6:
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 12, 3, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 12, 3, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 2, 4);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
@@ -4260,7 +4260,7 @@ void Scene611::step() {
 	if (_hermitMode == 6) {
 		if ((_scene->_activeAnimation->getCurrentFrame() == 9) && _check1Fl) {
 			_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-			_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 112);
@@ -4300,7 +4300,7 @@ void Scene611::step() {
 		_resetBatterieText = true;
 		int syncIdx = _globals._sequenceIndexes[3];
 		_nextFrame = 10;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 2);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], syncIdx);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
@@ -4488,7 +4488,7 @@ void Scene612::handleWinchMovement() {
 	case 0:
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 10, 1, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 10, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 1, 5);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[4]);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_SPRITE, 5, 1);
@@ -4506,7 +4506,7 @@ void Scene612::handleWinchMovement() {
 			_globals[kBoatRaised] = false;
 		} else {
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 17, 9, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 17, 9, 0, 0);
 			_vm->_sound->command(18);
 		}
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
@@ -4608,7 +4608,7 @@ void Scene612::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 0f019c4b19..4838ee27d9 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -148,11 +148,11 @@ void Scene701::enter() {
 
 	switch (boatStatus) {
 	case BOAT_TIED_FLOATING:
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 20, 0, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 20, 0, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 10);
 		break;
 	case BOAT_ADRIFT:
-		_globals._sequenceIndexes[6] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[6], false, 20, 0, 0, 0);
+		_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], false, 20, 0, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 10);
 		break;
 	case BOAT_TIED:
@@ -206,7 +206,7 @@ void Scene701::step() {
 	switch(_game._trigger) {
 	case 60:
 		_scene->_sequences.remove(_globals._sequenceIndexes[5]);
-		_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 61);
 		break;
@@ -326,7 +326,7 @@ void Scene701::actions() {
 
 		case 3:
 			_vm->_sound->command(17);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
@@ -502,7 +502,7 @@ void Scene702::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 5, 2, 0, 0);
+			_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 5, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[12]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_SPRITE, 4, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -1218,7 +1218,7 @@ void Scene704::handleFillBottle(int quote) {
 void Scene704::enter() {
 	if (_game._objects[OBJ_BOTTLE]._roomNumber == _scene->_currentSceneId) {
 		_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('b', 0));
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
 		if (_scene->_priorSceneId == 705) {
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(123, 125));
@@ -1585,7 +1585,7 @@ void Scene705::enter() {
 void Scene705::step() {
 	switch (_game._trigger) {
 	case 70:
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 4);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		break;
@@ -1798,7 +1798,7 @@ void Scene706::handleTakeVase() {
 	case 0:
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[3], false, 4, 2, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 4, 2, 0, 0);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[3]);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_SPRITE, 7, 1);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2087,7 +2087,7 @@ void Scene710::enter() {
 
 	if (_game._objects[OBJ_VASE]._roomNumber == 706) {
 		_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('g', -1));
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 0, 0, 0);
 	}
 
 	_game._player._visible = false;
@@ -2248,7 +2248,7 @@ void Scene751::step() {
 	switch (_game._trigger) {
 	case 70:
 		_scene->_sequences.remove(_globals._sequenceIndexes[4]);
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 6, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		break;
@@ -2287,7 +2287,7 @@ void Scene751::step() {
 
 	case 62:
 		_vm->_sound->command(17);
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
@@ -2329,7 +2329,7 @@ void Scene751::preActions() {
 			_game._player._readyToWalk = false;
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 11, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 11, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, 7);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -2398,7 +2398,7 @@ void Scene751::actions() {
 
 		case 3:
 			_vm->_sound->command(17);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
@@ -2597,7 +2597,7 @@ void Scene752::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 5, 2, 0, 0);
+			_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 5, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[12]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_SPRITE, 4, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
@@ -2622,7 +2622,7 @@ void Scene752::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[12] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[12], false, 5, 2, 0, 0);
+			_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 5, 2, 0, 0);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[12]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_SPRITE, 4, 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 7e8366c179..95b3c24938 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -145,7 +145,7 @@ void Scene801::enter() {
 		case 2:
 			_game._player._playerPos = Common::Point(8, 117);
 			_globals[kTeleporterUnderstood] = true;
-			_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 8, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 8, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 13);
 			_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 8090);
@@ -283,7 +283,7 @@ void Scene801::actions() {
 		_globals[kBetweenRooms] = true;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 4, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 4, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 5);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 13);
@@ -419,7 +419,7 @@ void Scene802::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], true, 7, 2, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], true, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[2]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 2, 1);
@@ -451,7 +451,7 @@ void Scene802::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
-			_globals._sequenceIndexes[5] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[5], true, 7, 2, 0, 0);
+			_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], true, 7, 2, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 1, 4);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_SPRITE, 4, 1);
@@ -692,7 +692,7 @@ void Scene803::step() {
 
 	if (_game._trigger == 90) {
 		int syncIdx = _globals._sequenceIndexes[4];
-		_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 15, 0, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 15, 0, 0, 0);
 		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[4], syncIdx);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[4], 4, 9);
 		if (_globals[kHoppyDead])
@@ -726,7 +726,7 @@ void Scene803::step() {
 	if (_game._trigger == 150) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[6]);
 		_vm->_sound->command(18);
-		_globals._sequenceIndexes[6] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[6], false, 8, 1, 0, 0);
+		_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], false, 8, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[6], 1, 19);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 4);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 151);
@@ -778,7 +778,7 @@ void Scene803::actions() {
 
 		case 162:
 			_scene->_sequences.remove(_globals._sequenceIndexes[9]);
-			_globals._sequenceIndexes[9] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
+			_globals._sequenceIndexes[9] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[9], 1, 4);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[9]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 163);
@@ -899,7 +899,7 @@ void Scene804::enter() {
 			_scene->_sequences.addTimer(60, 100);
 		} else {
 			_globals._sequenceIndexes[6] = _scene->_sequences.startCycle(_globals._spriteIndexes[6], false, 1);
-			_globals._sequenceIndexes[7] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[7], false, 4, 0, 0, 0);
+			_globals._sequenceIndexes[7] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[7], false, 4, 0, 0, 0);
 			_scene->_sequences.addTimer(160, 70);
 			_game._player._stepEnabled = false;
 		}
@@ -1277,14 +1277,14 @@ void Scene805::actions() {
 	} else if (_action.isAction(VERB_REMOVE, NOUN_SHIELD_MODULATOR) && _globals[kShieldModInstalled]) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[1]);
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		_game._player._stepEnabled = false;
 	} else if (_action.isAction(VERB_REMOVE, NOUN_TARGET_MODULE) && _globals[kTargetModInstalled]) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
 		_game._player._stepEnabled = false;
@@ -1433,7 +1433,7 @@ void Scene808::actions() {
 				_vm->_sound->command(20);
 				_vm->_sound->command(25);
 			}
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 211));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
@@ -1468,7 +1468,7 @@ void Scene808::actions() {
 				_vm->_sound->command(20);
 			}
 			_globals[kTopButtonPushed] = false;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 186));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 91);
@@ -1499,7 +1499,7 @@ void Scene808::actions() {
 				_vm->_sound->command(20);
 			 }
 			_globals[kTopButtonPushed] = true;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 163));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
@@ -1516,7 +1516,7 @@ void Scene808::actions() {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(168, 211));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
@@ -1533,7 +1533,7 @@ void Scene808::actions() {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(172, 163));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
@@ -1550,7 +1550,7 @@ void Scene808::actions() {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 2, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(172, 186));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index c94f3e3ad4..ab73d70b10 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -466,15 +466,15 @@ int SequenceList::startCycle(int srcSpriteIndex, bool flipped, int cycleIndex) {
 	return result;
 }
 
-int SequenceList::startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks,
+int SequenceList::startPingPongCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown, int timeoutTicks, int extraTicks) {
 	SpriteAsset *sprites = _vm->_game->_scene._sprites[srcSpriteIndex];
 	MSprite *frame = sprites->getFrame(0);
 	int depth = _vm->_game->_scene._depthSurface.getDepth(Common::Point(
 		frame->_offset.x + frame->w / 2, frame->_offset.y + frame->h / 2));
 
-	return add(srcSpriteIndex, flipped, sprites->getCount(), triggerCountdown, timeoutTicks,
-		extraTicks, numTicks, 0, 0, true, 100, depth - 1, -1, ANIMTYPE_REVERSIBLE, 0, 0);
+	return add(srcSpriteIndex, flipped, 1, triggerCountdown, timeoutTicks,
+		extraTicks, numTicks, 0, 0, true, 100, depth - 1, 1, ANIMTYPE_PING_PONG, 0, 0);
 }
 
 void SequenceList::updateTimeout(int spriteIdx, int seqIndex) {
diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index ee587ff02d..9603296717 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -38,7 +38,7 @@ enum SequenceTrigger {
 	SEQUENCE_TRIGGER_SPRITE = 2		// Trigger when sequence reaches specific sprite
 };
 
-enum SpriteAnimType { ANIMTYPE_NONE = 0, ANIMTYPE_CYCLED = 1, ANIMTYPE_REVERSIBLE = 2 };
+enum SpriteAnimType { ANIMTYPE_NONE = 0, ANIMTYPE_CYCLED = 1, ANIMTYPE_PING_PONG = 2 };
 
 #define SEQUENCE_ENTRY_SUBSET_MAX 5
 
@@ -117,7 +117,7 @@ public:
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 
 	int startCycle(int srcSpriteIdx, bool flipped, int cycleIndex);
-	int startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks,
+	int startPingPongCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 	void updateTimeout(int spriteIdx, int seqIndex);
 	void setScale(int spriteIdx, int scale);
-- 
cgit v1.2.3


From 6f7b0311afbd4df63aa9ac7b8604758286b1ae71 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 2 Mar 2015 08:38:33 +0100
Subject: GRAPHICS: Fix GCC signed/unsigned warnings.

---
 graphics/fonts/ttf.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index ba57613601..7373a965c8 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -474,11 +474,11 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const {
 
 	switch (bitmap.pixel_mode) {
 	case FT_PIXEL_MODE_MONO:
-		for (int y = 0; y < bitmap.rows; ++y) {
+		for (uint y = 0; y < bitmap.rows; ++y) {
 			const uint8 *curSrc = src;
 			uint8 mask = 0;
 
-			for (int x = 0; x < bitmap.width; ++x) {
+			for (uint x = 0; x < bitmap.width; ++x) {
 				if ((x % 8) == 0)
 					mask = *curSrc++;
 
@@ -494,7 +494,7 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const {
 		break;
 
 	case FT_PIXEL_MODE_GRAY:
-		for (int y = 0; y < bitmap.rows; ++y) {
+		for (uint y = 0; y < bitmap.rows; ++y) {
 			memcpy(dst, src, bitmap.width);
 			dst += glyph.image.pitch;
 			src += srcPitch;
-- 
cgit v1.2.3


From cecb9a9ecc1ec1897fdd27e1bafc7f6d494cd6af Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Mar 2015 18:55:05 -0500
Subject: MADS: Fix crash throwing bones to dog

---
 engines/mads/player.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 8720aeead3..a257cea264 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -790,9 +790,7 @@ void Player::removePlayerSprites() {
 		}
 	}
 
-	if (scene._activeAnimation != nullptr)
-		scene._activeAnimation->resetSpriteSetsCount();
-
+	scene._spriteSlots.clear();
 	scene._spriteSlots.fullRefresh();
 	_visible = false;
 }
-- 
cgit v1.2.3


From b5ac3ecb1f25b2d47fd99a3c4fd3b1cddcb695c6 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 01:08:02 +0100
Subject: CREDITS: Mention skristiansson for his initial SDL2 support work.

---
 AUTHORS             | 1 +
 devtools/credits.pl | 1 +
 gui/credits.h       | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 3e8c65e5e2..370f4e9401 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -565,6 +565,7 @@ Other contributions
      Jeroen Janssen               - Numerous readability and bugfix patches
      Keith Kaisershot             - Several Pegasus Prime patches
      Andreas Karlsson             - Initial port for SymbianOS
+     Stefan Kristiansson          - Initial work on SDL2 support
      Claudio Matsuoka             - Daily Linux builds
      Thomas Mayer                 - PSP port contributions
      Sean Murray                  - ScummVM tools GUI application (GSoC 2007
diff --git a/devtools/credits.pl b/devtools/credits.pl
index 7dc954a6a7..f82d0d4212 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -1133,6 +1133,7 @@ begin_credits("Credits");
 				add_person("Jeroen Janssen", "japj", "Numerous readability and bugfix patches");
 				add_person("Keith Kaisershot", "blitter", "Several Pegasus Prime patches");
 				add_person("Andreas Karlsson", "Sprawl", "Initial port for SymbianOS");
+				add_person("Stefan Kristiansson", "skristiansson", "Initial work on SDL2 support");
 				add_person("Claudio Matsuoka", "", "Daily Linux builds");
 				add_person("Thomas Mayer", "", "PSP port contributions");
 				add_person("Sean Murray", "lightcast", "ScummVM tools GUI application (GSoC 2007 task)");
diff --git a/gui/credits.h b/gui/credits.h
index c7d9199db9..12e75b01fc 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -694,6 +694,8 @@ static const char *credits[] = {
 "C2""Several Pegasus Prime patches",
 "C0""Andreas Karlsson",
 "C2""Initial port for SymbianOS",
+"C0""Stefan Kristiansson",
+"C2""Initial work on SDL2 support",
 "C0""Claudio Matsuoka",
 "C2""Daily Linux builds",
 "C0""Thomas Mayer",
-- 
cgit v1.2.3


From 86a514ed938d148b7d98eb5ce3dbe250b3f3ec8a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 01:30:18 +0100
Subject: IPHONE: Remove out-dated XCode project files.

---
 dists/iphone/scummvm.xcodeproj/project.pbxproj | 12331 -----------------------
 1 file changed, 12331 deletions(-)
 delete mode 100644 dists/iphone/scummvm.xcodeproj/project.pbxproj

diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj
deleted file mode 100644
index 8f6ba6429d..0000000000
--- a/dists/iphone/scummvm.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,12331 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		8CB5A9C11253FD6900CB6BC7 /* m4_scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9B71253FD6800CB6BC7 /* m4_scene.cpp */; };
-		8CB5A9C21253FD6900CB6BC7 /* mads_logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9B91253FD6800CB6BC7 /* mads_logic.cpp */; };
-		8CB5A9C31253FD6900CB6BC7 /* mads_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BB1253FD6800CB6BC7 /* mads_player.cpp */; };
-		8CB5A9C41253FD6900CB6BC7 /* mads_scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BD1253FD6800CB6BC7 /* mads_scene.cpp */; };
-		8CB5A9C51253FD6900CB6BC7 /* mads_views.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BF1253FD6900CB6BC7 /* mads_views.cpp */; };
-		8CB5A9C61253FD6900CB6BC7 /* m4_scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9B71253FD6800CB6BC7 /* m4_scene.cpp */; };
-		8CB5A9C71253FD6900CB6BC7 /* mads_logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9B91253FD6800CB6BC7 /* mads_logic.cpp */; };
-		8CB5A9C81253FD6900CB6BC7 /* mads_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BB1253FD6800CB6BC7 /* mads_player.cpp */; };
-		8CB5A9C91253FD6900CB6BC7 /* mads_scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BD1253FD6800CB6BC7 /* mads_scene.cpp */; };
-		8CB5A9CA1253FD6900CB6BC7 /* mads_views.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BF1253FD6900CB6BC7 /* mads_views.cpp */; };
-		8CB5A9CB1253FD6900CB6BC7 /* m4_scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9B71253FD6800CB6BC7 /* m4_scene.cpp */; };
-		8CB5A9CC1253FD6900CB6BC7 /* mads_logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9B91253FD6800CB6BC7 /* mads_logic.cpp */; };
-		8CB5A9CD1253FD6900CB6BC7 /* mads_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BB1253FD6800CB6BC7 /* mads_player.cpp */; };
-		8CB5A9CE1253FD6900CB6BC7 /* mads_scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BD1253FD6800CB6BC7 /* mads_scene.cpp */; };
-		8CB5A9CF1253FD6900CB6BC7 /* mads_views.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB5A9BF1253FD6900CB6BC7 /* mads_views.cpp */; };
-		8CB5A9D91253FDF500CB6BC7 /* drascula.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D51253FDF400CB6BC7 /* drascula.dat */; };
-		8CB5A9DA1253FDF500CB6BC7 /* hugo.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D61253FDF500CB6BC7 /* hugo.dat */; };
-		8CB5A9DB1253FDF500CB6BC7 /* m4.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D71253FDF500CB6BC7 /* m4.dat */; };
-		8CB5A9DC1253FDF500CB6BC7 /* teenagent.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */; };
-		8CB5A9DD1253FDF500CB6BC7 /* drascula.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D51253FDF400CB6BC7 /* drascula.dat */; };
-		8CB5A9DE1253FDF500CB6BC7 /* hugo.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D61253FDF500CB6BC7 /* hugo.dat */; };
-		8CB5A9DF1253FDF500CB6BC7 /* m4.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D71253FDF500CB6BC7 /* m4.dat */; };
-		8CB5A9E01253FDF500CB6BC7 /* teenagent.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */; };
-		8CB5A9E11253FDF500CB6BC7 /* drascula.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D51253FDF400CB6BC7 /* drascula.dat */; };
-		8CB5A9E21253FDF500CB6BC7 /* hugo.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D61253FDF500CB6BC7 /* hugo.dat */; };
-		8CB5A9E31253FDF500CB6BC7 /* m4.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D71253FDF500CB6BC7 /* m4.dat */; };
-		8CB5A9E41253FDF500CB6BC7 /* teenagent.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */; };
-		8CD1ED0B126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; };
-		8CD1ED0C126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; };
-		8CD1ED0E126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; };
-		8CD1ED0F126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; };
-		8CD1ED10126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; };
-		8CD1ED11126202AB00FA198C /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD3126202AA00FA198C /* inventory.cpp */; };
-		8CD1ED14126202AB00FA198C /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD7126202AA00FA198C /* mouse.cpp */; };
-		8CD1ED15126202AB00FA198C /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD9126202AA00FA198C /* parser.cpp */; };
-		8CD1ED16126202AB00FA198C /* route.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDB126202AA00FA198C /* route.cpp */; };
-		8CD1ED17126202AB00FA198C /* schedule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDD126202AA00FA198C /* schedule.cpp */; };
-		8CD1ED18126202AB00FA198C /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDF126202AA00FA198C /* sound.cpp */; };
-		8CD1ED19126202AB00FA198C /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE1126202AA00FA198C /* util.cpp */; };
-		8CD1ED1A126202AB00FA198C /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE4126202AA00FA198C /* anim.cpp */; };
-		8CD1ED1B126202AB00FA198C /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE6126202AA00FA198C /* audio.cpp */; };
-		8CD1ED1C126202AB00FA198C /* character.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE8126202AA00FA198C /* character.cpp */; };
-		8CD1ED1D126202AB00FA198C /* conversation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEA126202AA00FA198C /* conversation.cpp */; };
-		8CD1ED1E126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEC126202AA00FA198C /* detection.cpp */; };
-		8CD1ED1F126202AB00FA198C /* drew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECED126202AA00FA198C /* drew.cpp */; };
-		8CD1ED20126202AB00FA198C /* flux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEF126202AA00FA198C /* flux.cpp */; };
-		8CD1ED21126202AB00FA198C /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF1126202AA00FA198C /* font.cpp */; };
-		8CD1ED22126202AB00FA198C /* hotspot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF3126202AA00FA198C /* hotspot.cpp */; };
-		8CD1ED25126202AB00FA198C /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF7126202AA00FA198C /* movie.cpp */; };
-		8CD1ED26126202AB00FA198C /* path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF9126202AA00FA198C /* path.cpp */; };
-		8CD1ED27126202AB00FA198C /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFB126202AA00FA198C /* picture.cpp */; };
-		8CD1ED28126202AB00FA198C /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFD126202AA00FA198C /* resource.cpp */; };
-		8CD1ED29126202AB00FA198C /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFF126202AA00FA198C /* script.cpp */; };
-		8CD1ED2A126202AB00FA198C /* script_func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED01126202AA00FA198C /* script_func.cpp */; };
-		8CD1ED2B126202AB00FA198C /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED03126202AA00FA198C /* state.cpp */; };
-		8CD1ED2C126202AB00FA198C /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED05126202AA00FA198C /* text.cpp */; };
-		8CD1ED2D126202AB00FA198C /* tools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED07126202AA00FA198C /* tools.cpp */; };
-		8CD1ED2E126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; };
-		8CD1ED2F126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; };
-		8CD1ED30126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; };
-		8CD1ED32126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; };
-		8CD1ED33126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; };
-		8CD1ED34126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; };
-		8CD1ED35126202AB00FA198C /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD3126202AA00FA198C /* inventory.cpp */; };
-		8CD1ED38126202AB00FA198C /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD7126202AA00FA198C /* mouse.cpp */; };
-		8CD1ED39126202AB00FA198C /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD9126202AA00FA198C /* parser.cpp */; };
-		8CD1ED3A126202AB00FA198C /* route.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDB126202AA00FA198C /* route.cpp */; };
-		8CD1ED3B126202AB00FA198C /* schedule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDD126202AA00FA198C /* schedule.cpp */; };
-		8CD1ED3C126202AB00FA198C /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDF126202AA00FA198C /* sound.cpp */; };
-		8CD1ED3D126202AB00FA198C /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE1126202AA00FA198C /* util.cpp */; };
-		8CD1ED3E126202AB00FA198C /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE4126202AA00FA198C /* anim.cpp */; };
-		8CD1ED3F126202AB00FA198C /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE6126202AA00FA198C /* audio.cpp */; };
-		8CD1ED40126202AB00FA198C /* character.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE8126202AA00FA198C /* character.cpp */; };
-		8CD1ED41126202AB00FA198C /* conversation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEA126202AA00FA198C /* conversation.cpp */; };
-		8CD1ED42126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEC126202AA00FA198C /* detection.cpp */; };
-		8CD1ED43126202AB00FA198C /* drew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECED126202AA00FA198C /* drew.cpp */; };
-		8CD1ED44126202AB00FA198C /* flux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEF126202AA00FA198C /* flux.cpp */; };
-		8CD1ED45126202AB00FA198C /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF1126202AA00FA198C /* font.cpp */; };
-		8CD1ED46126202AB00FA198C /* hotspot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF3126202AA00FA198C /* hotspot.cpp */; };
-		8CD1ED49126202AB00FA198C /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF7126202AA00FA198C /* movie.cpp */; };
-		8CD1ED4A126202AB00FA198C /* path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF9126202AA00FA198C /* path.cpp */; };
-		8CD1ED4B126202AB00FA198C /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFB126202AA00FA198C /* picture.cpp */; };
-		8CD1ED4C126202AB00FA198C /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFD126202AA00FA198C /* resource.cpp */; };
-		8CD1ED4D126202AB00FA198C /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFF126202AA00FA198C /* script.cpp */; };
-		8CD1ED4E126202AB00FA198C /* script_func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED01126202AA00FA198C /* script_func.cpp */; };
-		8CD1ED4F126202AB00FA198C /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED03126202AA00FA198C /* state.cpp */; };
-		8CD1ED50126202AB00FA198C /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED05126202AA00FA198C /* text.cpp */; };
-		8CD1ED51126202AB00FA198C /* tools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED07126202AA00FA198C /* tools.cpp */; };
-		8CD1ED52126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; };
-		8CD1ED53126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC6126202AA00FA198C /* detection.cpp */; };
-		8CD1ED54126202AB00FA198C /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECC7126202AA00FA198C /* display.cpp */; };
-		8CD1ED56126202AB00FA198C /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCB126202AA00FA198C /* file.cpp */; };
-		8CD1ED57126202AB00FA198C /* hugo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECCF126202AA00FA198C /* hugo.cpp */; };
-		8CD1ED58126202AB00FA198C /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD1126202AA00FA198C /* intro.cpp */; };
-		8CD1ED59126202AB00FA198C /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD3126202AA00FA198C /* inventory.cpp */; };
-		8CD1ED5C126202AB00FA198C /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD7126202AA00FA198C /* mouse.cpp */; };
-		8CD1ED5D126202AB00FA198C /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECD9126202AA00FA198C /* parser.cpp */; };
-		8CD1ED5E126202AB00FA198C /* route.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDB126202AA00FA198C /* route.cpp */; };
-		8CD1ED5F126202AB00FA198C /* schedule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDD126202AA00FA198C /* schedule.cpp */; };
-		8CD1ED60126202AB00FA198C /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECDF126202AA00FA198C /* sound.cpp */; };
-		8CD1ED61126202AB00FA198C /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE1126202AA00FA198C /* util.cpp */; };
-		8CD1ED62126202AB00FA198C /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE4126202AA00FA198C /* anim.cpp */; };
-		8CD1ED63126202AB00FA198C /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE6126202AA00FA198C /* audio.cpp */; };
-		8CD1ED64126202AB00FA198C /* character.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECE8126202AA00FA198C /* character.cpp */; };
-		8CD1ED65126202AB00FA198C /* conversation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEA126202AA00FA198C /* conversation.cpp */; };
-		8CD1ED66126202AB00FA198C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEC126202AA00FA198C /* detection.cpp */; };
-		8CD1ED67126202AB00FA198C /* drew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECED126202AA00FA198C /* drew.cpp */; };
-		8CD1ED68126202AB00FA198C /* flux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECEF126202AA00FA198C /* flux.cpp */; };
-		8CD1ED69126202AB00FA198C /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF1126202AA00FA198C /* font.cpp */; };
-		8CD1ED6A126202AB00FA198C /* hotspot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF3126202AA00FA198C /* hotspot.cpp */; };
-		8CD1ED6D126202AB00FA198C /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF7126202AA00FA198C /* movie.cpp */; };
-		8CD1ED6E126202AB00FA198C /* path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECF9126202AA00FA198C /* path.cpp */; };
-		8CD1ED6F126202AB00FA198C /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFB126202AA00FA198C /* picture.cpp */; };
-		8CD1ED70126202AB00FA198C /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFD126202AA00FA198C /* resource.cpp */; };
-		8CD1ED71126202AB00FA198C /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ECFF126202AA00FA198C /* script.cpp */; };
-		8CD1ED72126202AB00FA198C /* script_func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED01126202AA00FA198C /* script_func.cpp */; };
-		8CD1ED73126202AB00FA198C /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED03126202AA00FA198C /* state.cpp */; };
-		8CD1ED74126202AB00FA198C /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED05126202AA00FA198C /* text.cpp */; };
-		8CD1ED75126202AB00FA198C /* tools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED07126202AA00FA198C /* tools.cpp */; };
-		8CD1ED76126202AB00FA198C /* toon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD1ED09126202AA00FA198C /* toon.cpp */; };
-		8CD1ED881262030100FA198C /* toon.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CD1ED871262030100FA198C /* toon.dat */; };
-		8CD1ED891262030100FA198C /* toon.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CD1ED871262030100FA198C /* toon.dat */; };
-		8CD1ED8A1262030100FA198C /* toon.dat in Resources */ = {isa = PBXBuildFile; fileRef = 8CD1ED871262030100FA198C /* toon.dat */; };
-		8CD80C8B126271A9001C6C87 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80C89126271A9001C6C87 /* surface.cpp */; };
-		8CD80C8C126271A9001C6C87 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80C89126271A9001C6C87 /* surface.cpp */; };
-		8CD80C8D126271A9001C6C87 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80C89126271A9001C6C87 /* surface.cpp */; };
-		8CD80C91126271BD001C6C87 /* gfx_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80C90126271BD001C6C87 /* gfx_towns.cpp */; };
-		8CD80C92126271BD001C6C87 /* gfx_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80C90126271BD001C6C87 /* gfx_towns.cpp */; };
-		8CD80C93126271BD001C6C87 /* gfx_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80C90126271BD001C6C87 /* gfx_towns.cpp */; };
-		8CD80CE0126272A0001C6C87 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CBF1262729F001C6C87 /* actor.cpp */; };
-		8CD80CE1126272A0001C6C87 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC11262729F001C6C87 /* animation.cpp */; };
-		8CD80CE2126272A0001C6C87 /* callbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC31262729F001C6C87 /* callbacks.cpp */; };
-		8CD80CE3126272A0001C6C87 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC41262729F001C6C87 /* console.cpp */; };
-		8CD80CE4126272A0001C6C87 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC61262729F001C6C87 /* detection.cpp */; };
-		8CD80CE5126272A0001C6C87 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC71262729F001C6C87 /* dialog.cpp */; };
-		8CD80CE6126272A0001C6C87 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC91262729F001C6C87 /* font.cpp */; };
-		8CD80CE7126272A0001C6C87 /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CCB1262729F001C6C87 /* inventory.cpp */; };
-		8CD80CE9126272A0001C6C87 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CCE1262729F001C6C87 /* music.cpp */; };
-		8CD80CEA126272A0001C6C87 /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD01262729F001C6C87 /* objects.cpp */; };
-		8CD80CEB126272A0001C6C87 /* pack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD21262729F001C6C87 /* pack.cpp */; };
-		8CD80CEC126272A0001C6C87 /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD4126272A0001C6C87 /* resources.cpp */; };
-		8CD80CED126272A0001C6C87 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD6126272A0001C6C87 /* scene.cpp */; };
-		8CD80CEE126272A0001C6C87 /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD8126272A0001C6C87 /* segment.cpp */; };
-		8CD80CEF126272A0001C6C87 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDA126272A0001C6C87 /* surface.cpp */; };
-		8CD80CF0126272A0001C6C87 /* surface_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDC126272A0001C6C87 /* surface_list.cpp */; };
-		8CD80CF1126272A0001C6C87 /* teenagent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDE126272A0001C6C87 /* teenagent.cpp */; };
-		8CD80CF2126272A0001C6C87 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CBF1262729F001C6C87 /* actor.cpp */; };
-		8CD80CF3126272A0001C6C87 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC11262729F001C6C87 /* animation.cpp */; };
-		8CD80CF4126272A0001C6C87 /* callbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC31262729F001C6C87 /* callbacks.cpp */; };
-		8CD80CF5126272A0001C6C87 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC41262729F001C6C87 /* console.cpp */; };
-		8CD80CF6126272A0001C6C87 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC61262729F001C6C87 /* detection.cpp */; };
-		8CD80CF7126272A0001C6C87 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC71262729F001C6C87 /* dialog.cpp */; };
-		8CD80CF8126272A0001C6C87 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC91262729F001C6C87 /* font.cpp */; };
-		8CD80CF9126272A0001C6C87 /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CCB1262729F001C6C87 /* inventory.cpp */; };
-		8CD80CFB126272A0001C6C87 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CCE1262729F001C6C87 /* music.cpp */; };
-		8CD80CFC126272A0001C6C87 /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD01262729F001C6C87 /* objects.cpp */; };
-		8CD80CFD126272A0001C6C87 /* pack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD21262729F001C6C87 /* pack.cpp */; };
-		8CD80CFE126272A0001C6C87 /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD4126272A0001C6C87 /* resources.cpp */; };
-		8CD80CFF126272A0001C6C87 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD6126272A0001C6C87 /* scene.cpp */; };
-		8CD80D00126272A0001C6C87 /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD8126272A0001C6C87 /* segment.cpp */; };
-		8CD80D01126272A0001C6C87 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDA126272A0001C6C87 /* surface.cpp */; };
-		8CD80D02126272A0001C6C87 /* surface_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDC126272A0001C6C87 /* surface_list.cpp */; };
-		8CD80D03126272A0001C6C87 /* teenagent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDE126272A0001C6C87 /* teenagent.cpp */; };
-		8CD80D04126272A0001C6C87 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CBF1262729F001C6C87 /* actor.cpp */; };
-		8CD80D05126272A0001C6C87 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC11262729F001C6C87 /* animation.cpp */; };
-		8CD80D06126272A0001C6C87 /* callbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC31262729F001C6C87 /* callbacks.cpp */; };
-		8CD80D07126272A0001C6C87 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC41262729F001C6C87 /* console.cpp */; };
-		8CD80D08126272A0001C6C87 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC61262729F001C6C87 /* detection.cpp */; };
-		8CD80D09126272A0001C6C87 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC71262729F001C6C87 /* dialog.cpp */; };
-		8CD80D0A126272A0001C6C87 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CC91262729F001C6C87 /* font.cpp */; };
-		8CD80D0B126272A0001C6C87 /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CCB1262729F001C6C87 /* inventory.cpp */; };
-		8CD80D0D126272A0001C6C87 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CCE1262729F001C6C87 /* music.cpp */; };
-		8CD80D0E126272A0001C6C87 /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD01262729F001C6C87 /* objects.cpp */; };
-		8CD80D0F126272A0001C6C87 /* pack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD21262729F001C6C87 /* pack.cpp */; };
-		8CD80D10126272A0001C6C87 /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD4126272A0001C6C87 /* resources.cpp */; };
-		8CD80D11126272A0001C6C87 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD6126272A0001C6C87 /* scene.cpp */; };
-		8CD80D12126272A0001C6C87 /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CD8126272A0001C6C87 /* segment.cpp */; };
-		8CD80D13126272A0001C6C87 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDA126272A0001C6C87 /* surface.cpp */; };
-		8CD80D14126272A0001C6C87 /* surface_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDC126272A0001C6C87 /* surface_list.cpp */; };
-		8CD80D15126272A0001C6C87 /* teenagent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CD80CDE126272A0001C6C87 /* teenagent.cpp */; };
-		DF093E5F0F63CAD4002D821E /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; };
-		DF093E600F63CAD4002D821E /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; };
-		DF093E610F63CAD4002D821E /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; };
-		DF093E770F63CB26002D821E /* scummclassic.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFBDB0F485E480006E566 /* scummclassic.zip */; };
-		DF093E780F63CB26002D821E /* scummmodern.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF7E8C7A0ED601E5001CB19F /* scummmodern.zip */; };
-		DF093E7A0F63CB26002D821E /* kyra.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C810D81F86900B6D1FB /* kyra.dat */; };
-		DF093E7B0F63CB26002D821E /* lure.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C820D81F86900B6D1FB /* lure.dat */; };
-		DF093E7C0F63CB26002D821E /* queen.tbl in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C830D81F86900B6D1FB /* queen.tbl */; };
-		DF093E7D0F63CB26002D821E /* sky.cpt in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C850D81F86900B6D1FB /* sky.cpt */; };
-		DF093E810F63CB26002D821E /* commandLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470C10D81F4BA00B6D1FB /* commandLine.cpp */; };
-		DF093E820F63CB26002D821E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470C70D81F4BA00B6D1FB /* main.cpp */; };
-		DF093E830F63CB26002D821E /* plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470CA0D81F4BA00B6D1FB /* plugins.cpp */; };
-		DF093E840F63CB26002D821E /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470CC0D81F4BA00B6D1FB /* version.cpp */; };
-		DF093E850F63CB26002D821E /* default-events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470D80D81F4E700B6D1FB /* default-events.cpp */; };
-		DF093E860F63CB26002D821E /* posix-fs-factory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */; };
-		DF093E890F63CB26002D821E /* posix-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473810D81F4E800B6D1FB /* posix-provider.cpp */; };
-		DF093E8A0F63CB26002D821E /* default-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4738E0D81F4E800B6D1FB /* default-saves.cpp */; };
-		DF093E8B0F63CB26002D821E /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473900D81F4E800B6D1FB /* savefile.cpp */; };
-		DF093E8C0F63CB26002D821E /* default-timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473930D81F4E800B6D1FB /* default-timer.cpp */; };
-		DF093E8D0F63CB26002D821E /* config-file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4739A0D81F4E800B6D1FB /* config-file.cpp */; };
-		DF093E8E0F63CB26002D821E /* config-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4739C0D81F4E800B6D1FB /* config-manager.cpp */; };
-		DF093E8F0F63CB26002D821E /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A10D81F4E800B6D1FB /* file.cpp */; };
-		DF093E900F63CB26002D821E /* fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A40D81F4E800B6D1FB /* fs.cpp */; };
-		DF093E910F63CB26002D821E /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A80D81F4E800B6D1FB /* hashmap.cpp */; };
-		DF093E920F63CB26002D821E /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473AD0D81F4E800B6D1FB /* md5.cpp */; };
-		DF093E930F63CB26002D821E /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473B00D81F4E800B6D1FB /* mutex.cpp */; };
-		DF093E940F63CB26002D821E /* str.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BA0D81F4E800B6D1FB /* str.cpp */; };
-		DF093E950F63CB26002D821E /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BC0D81F4E800B6D1FB /* stream.cpp */; };
-		DF093E960F63CB26002D821E /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BE0D81F4E800B6D1FB /* system.cpp */; };
-		DF093E970F63CB26002D821E /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C30D81F4E800B6D1FB /* util.cpp */; };
-		DF093E980F63CB26002D821E /* zlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C50D81F4E800B6D1FB /* zlib.cpp */; };
-		DF093E990F63CB26002D821E /* cursorman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477540D81F4E900B6D1FB /* cursorman.cpp */; };
-		DF093E9A0F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477580D81F4E900B6D1FB /* font.cpp */; };
-		DF093E9B0F63CB26002D821E /* fontman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775A0D81F4E900B6D1FB /* fontman.cpp */; };
-		DF093E9C0F63CB26002D821E /* consolefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */; };
-		DF093E9D0F63CB26002D821E /* newfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775E0D81F4E900B6D1FB /* newfont.cpp */; };
-		DF093E9E0F63CB26002D821E /* newfont_big.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */; };
-		DF093EA00F63CB26002D821E /* iff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477610D81F4E900B6D1FB /* iff.cpp */; };
-		DF093EA10F63CB26002D821E /* imagedec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477630D81F4E900B6D1FB /* imagedec.cpp */; };
-		DF093EA20F63CB26002D821E /* primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4776A0D81F4E900B6D1FB /* primitives.cpp */; };
-		DF093EA30F63CB26002D821E /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477860D81F4E900B6D1FB /* surface.cpp */; };
-		DF093EA40F63CB26002D821E /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477890D81F4E900B6D1FB /* about.cpp */; };
-		DF093EA50F63CB26002D821E /* Actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778B0D81F4E900B6D1FB /* Actions.cpp */; };
-		DF093EA70F63CB26002D821E /* chooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778F0D81F4E900B6D1FB /* chooser.cpp */; };
-		DF093EA80F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; };
-		DF093EA90F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; };
-		DF093EAA0F63CB26002D821E /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; };
-		DF093EAD0F63CB26002D821E /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; };
-		DF093EAE0F63CB26002D821E /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; };
-		DF093EB00F63CB26002D821E /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; };
-		DF093EB10F63CB26002D821E /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; };
-		DF093EB20F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; };
-		DF093EB30F63CB26002D821E /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; };
-		DF093EB70F63CB26002D821E /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; };
-		DF093EB80F63CB26002D821E /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; };
-		DF093ED60F63CB26002D821E /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; };
-		DF093ED70F63CB26002D821E /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; };
-		DF093ED80F63CB26002D821E /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; };
-		DF093ED90F63CB26002D821E /* scalebit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518A00DF34B2500854012 /* scalebit.cpp */; };
-		DF093EDA0F63CB26002D821E /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AA0DF34BA600854012 /* 2xsai.cpp */; };
-		DF093EDB0F63CB26002D821E /* aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AB0DF34BA600854012 /* aspect.cpp */; };
-		DF093EDE0F63CB26002D821E /* scale2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B50DF34BA600854012 /* scale2x.cpp */; };
-		DF093EDF0F63CB26002D821E /* scale3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B80DF34BA600854012 /* scale3x.cpp */; };
-		DF093EE20F63CB26002D821E /* agi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF70E7BA6A600F5680E /* agi.cpp */; };
-		DF093EE30F63CB26002D821E /* checks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF90E7BA6A600F5680E /* checks.cpp */; };
-		DF093EE40F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFA0E7BA6A600F5680E /* console.cpp */; };
-		DF093EE50F63CB26002D821E /* cycle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFC0E7BA6A600F5680E /* cycle.cpp */; };
-		DF093EE60F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFD0E7BA6A600F5680E /* detection.cpp */; };
-		DF093EE70F63CB26002D821E /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFF0E7BA6A600F5680E /* global.cpp */; };
-		DF093EE80F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420000E7BA6A600F5680E /* graphics.cpp */; };
-		DF093EE90F63CB26002D821E /* id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420020E7BA6A600F5680E /* id.cpp */; };
-		DF093EEA0F63CB26002D821E /* inv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420030E7BA6A600F5680E /* inv.cpp */; };
-		DF093EEB0F63CB26002D821E /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420040E7BA6A600F5680E /* keyboard.cpp */; };
-		DF093EEC0F63CB26002D821E /* loader_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420060E7BA6A600F5680E /* loader_v2.cpp */; };
-		DF093EED0F63CB26002D821E /* loader_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420070E7BA6A600F5680E /* loader_v3.cpp */; };
-		DF093EEE0F63CB26002D821E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420080E7BA6A600F5680E /* logic.cpp */; };
-		DF093EEF0F63CB26002D821E /* lzw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200A0E7BA6A600F5680E /* lzw.cpp */; };
-		DF093EF00F63CB26002D821E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200C0E7BA6A600F5680E /* menu.cpp */; };
-		DF093EF10F63CB26002D821E /* motion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200F0E7BA6A600F5680E /* motion.cpp */; };
-		DF093EF20F63CB26002D821E /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420100E7BA6A600F5680E /* objects.cpp */; };
-		DF093EF30F63CB26002D821E /* op_cmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420110E7BA6A600F5680E /* op_cmd.cpp */; };
-		DF093EF40F63CB26002D821E /* op_dbg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420120E7BA6A600F5680E /* op_dbg.cpp */; };
-		DF093EF50F63CB26002D821E /* op_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420130E7BA6A600F5680E /* op_test.cpp */; };
-		DF093EF60F63CB26002D821E /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420150E7BA6A600F5680E /* picture.cpp */; };
-		DF093EF70F63CB26002D821E /* preagi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420170E7BA6A600F5680E /* preagi.cpp */; };
-		DF093EF80F63CB26002D821E /* preagi_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420190E7BA6A600F5680E /* preagi_common.cpp */; };
-		DF093EF90F63CB26002D821E /* preagi_mickey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201B0E7BA6A600F5680E /* preagi_mickey.cpp */; };
-		DF093EFA0F63CB26002D821E /* preagi_troll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201D0E7BA6A600F5680E /* preagi_troll.cpp */; };
-		DF093EFB0F63CB26002D821E /* preagi_winnie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201F0E7BA6A600F5680E /* preagi_winnie.cpp */; };
-		DF093EFC0F63CB26002D821E /* predictive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420210E7BA6A600F5680E /* predictive.cpp */; };
-		DF093EFD0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420220E7BA6A600F5680E /* saveload.cpp */; };
-		DF093EFE0F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420230E7BA6A600F5680E /* sound.cpp */; };
-		DF093EFF0F63CB26002D821E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420250E7BA6A600F5680E /* sprite.cpp */; };
-		DF093F000F63CB26002D821E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420270E7BA6A600F5680E /* text.cpp */; };
-		DF093F010F63CB26002D821E /* view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420280E7BA6A600F5680E /* view.cpp */; };
-		DF093F020F63CB26002D821E /* wagparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202A0E7BA6A600F5680E /* wagparser.cpp */; };
-		DF093F030F63CB26002D821E /* words.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202C0E7BA6A600F5680E /* words.cpp */; };
-		DF093F040F63CB26002D821E /* agos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202E0E7BA6A600F5680E /* agos.cpp */; };
-		DF093F050F63CB26002D821E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420300E7BA6A600F5680E /* animation.cpp */; };
-		DF093F060F63CB26002D821E /* charset-fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420320E7BA6A600F5680E /* charset-fontdata.cpp */; };
-		DF093F070F63CB26002D821E /* charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420330E7BA6A600F5680E /* charset.cpp */; };
-		DF093F080F63CB26002D821E /* contain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420340E7BA6A600F5680E /* contain.cpp */; };
-		DF093F090F63CB26002D821E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420350E7BA6A600F5680E /* cursor.cpp */; };
-		DF093F0A0F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420360E7BA6A600F5680E /* debug.cpp */; };
-		DF093F0B0F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420380E7BA6A600F5680E /* debugger.cpp */; };
-		DF093F0C0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203A0E7BA6A600F5680E /* detection.cpp */; };
-		DF093F0D0F63CB26002D821E /* draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203C0E7BA6A600F5680E /* draw.cpp */; };
-		DF093F0E0F63CB26002D821E /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203D0E7BA6A600F5680E /* event.cpp */; };
-		DF093F0F0F63CB26002D821E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203E0E7BA6A600F5680E /* gfx.cpp */; };
-		DF093F100F63CB26002D821E /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203F0E7BA6A600F5680E /* icons.cpp */; };
-		DF093F110F63CB26002D821E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420400E7BA6A600F5680E /* input.cpp */; };
-		DF093F120F63CB26002D821E /* items.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420420E7BA6A600F5680E /* items.cpp */; };
-		DF093F130F63CB26002D821E /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420430E7BA6A600F5680E /* menus.cpp */; };
-		DF093F140F63CB26002D821E /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420440E7BA6A600F5680E /* midi.cpp */; };
-		DF093F150F63CB26002D821E /* midiparser_s1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420460E7BA6A600F5680E /* midiparser_s1d.cpp */; };
-		DF093F160F63CB26002D821E /* oracle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420480E7BA6A600F5680E /* oracle.cpp */; };
-		DF093F170F63CB26002D821E /* res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420490E7BA6A600F5680E /* res.cpp */; };
-		DF093F180F63CB26002D821E /* res_ami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204A0E7BA6A600F5680E /* res_ami.cpp */; };
-		DF093F190F63CB26002D821E /* res_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204B0E7BA6A600F5680E /* res_snd.cpp */; };
-		DF093F1A0F63CB26002D821E /* rooms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204C0E7BA6A600F5680E /* rooms.cpp */; };
-		DF093F1B0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204D0E7BA6A600F5680E /* saveload.cpp */; };
-		DF093F1C0F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204E0E7BA6A600F5680E /* script.cpp */; };
-		DF093F1D0F63CB26002D821E /* script_e1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204F0E7BA6A600F5680E /* script_e1.cpp */; };
-		DF093F1E0F63CB26002D821E /* script_e2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420500E7BA6A600F5680E /* script_e2.cpp */; };
-		DF093F1F0F63CB26002D821E /* script_ff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420510E7BA6A600F5680E /* script_ff.cpp */; };
-		DF093F200F63CB26002D821E /* script_pp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420520E7BA6A600F5680E /* script_pp.cpp */; };
-		DF093F210F63CB26002D821E /* script_s1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420530E7BA6A600F5680E /* script_s1.cpp */; };
-		DF093F220F63CB26002D821E /* script_s2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420540E7BA6A600F5680E /* script_s2.cpp */; };
-		DF093F230F63CB26002D821E /* script_ww.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420550E7BA6A600F5680E /* script_ww.cpp */; };
-		DF093F240F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420560E7BA6A600F5680E /* sound.cpp */; };
-		DF093F250F63CB26002D821E /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420580E7BA6A600F5680E /* string.cpp */; };
-		DF093F260F63CB26002D821E /* subroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420590E7BA6A600F5680E /* subroutine.cpp */; };
-		DF093F270F63CB26002D821E /* verb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205A0E7BA6A600F5680E /* verb.cpp */; };
-		DF093F280F63CB26002D821E /* vga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205B0E7BA6A600F5680E /* vga.cpp */; };
-		DF093F290F63CB26002D821E /* vga_e2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205D0E7BA6A600F5680E /* vga_e2.cpp */; };
-		DF093F2A0F63CB26002D821E /* vga_ff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205E0E7BA6A600F5680E /* vga_ff.cpp */; };
-		DF093F2B0F63CB26002D821E /* vga_s1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205F0E7BA6A600F5680E /* vga_s1.cpp */; };
-		DF093F2C0F63CB26002D821E /* vga_s2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420600E7BA6A600F5680E /* vga_s2.cpp */; };
-		DF093F2D0F63CB26002D821E /* vga_ww.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420610E7BA6A600F5680E /* vga_ww.cpp */; };
-		DF093F2E0F63CB26002D821E /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420620E7BA6A600F5680E /* window.cpp */; };
-		DF093F2F0F63CB26002D821E /* zones.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420630E7BA6A600F5680E /* zones.cpp */; };
-		DF093F300F63CB26002D821E /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420650E7BA6A600F5680E /* anim.cpp */; };
-		DF093F310F63CB26002D821E /* bg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420670E7BA6A600F5680E /* bg.cpp */; };
-		DF093F320F63CB26002D821E /* bg_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420690E7BA6A600F5680E /* bg_list.cpp */; };
-		DF093F330F63CB26002D821E /* cine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206B0E7BA6A600F5680E /* cine.cpp */; };
-		DF093F340F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206D0E7BA6A600F5680E /* detection.cpp */; };
-		DF093F350F63CB26002D821E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206E0E7BA6A600F5680E /* gfx.cpp */; };
-		DF093F360F63CB26002D821E /* main_loop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420700E7BA6A600F5680E /* main_loop.cpp */; };
-		DF093F370F63CB26002D821E /* msg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420730E7BA6A600F5680E /* msg.cpp */; };
-		DF093F380F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420750E7BA6A600F5680E /* object.cpp */; };
-		DF093F390F63CB26002D821E /* pal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420770E7BA6A600F5680E /* pal.cpp */; };
-		DF093F3A0F63CB26002D821E /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420790E7BA6A600F5680E /* part.cpp */; };
-		DF093F3B0F63CB26002D821E /* prc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84207B0E7BA6A600F5680E /* prc.cpp */; };
-		DF093F3C0F63CB26002D821E /* rel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84207D0E7BA6A600F5680E /* rel.cpp */; };
-		DF093F3D0F63CB26002D821E /* script_fw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420800E7BA6A600F5680E /* script_fw.cpp */; };
-		DF093F3E0F63CB26002D821E /* script_os.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420810E7BA6A600F5680E /* script_os.cpp */; };
-		DF093F3F0F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420820E7BA6A600F5680E /* sound.cpp */; };
-		DF093F400F63CB26002D821E /* texte.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420840E7BA6A600F5680E /* texte.cpp */; };
-		DF093F410F63CB26002D821E /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420860E7BA6A600F5680E /* unpack.cpp */; };
-		DF093F420F63CB26002D821E /* various.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420880E7BA6A600F5680E /* various.cpp */; };
-		DF093F430F63CB26002D821E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420AB0E7BA6A600F5680E /* actor.cpp */; };
-		DF093F440F63CB26002D821E /* background.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420AE0E7BA6A600F5680E /* background.cpp */; };
-		DF093F450F63CB26002D821E /* backgroundIncrust.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B10E7BA6A600F5680E /* backgroundIncrust.cpp */; };
-		DF093F460F63CB26002D821E /* cell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B40E7BA6A600F5680E /* cell.cpp */; };
-		DF093F470F63CB26002D821E /* cruise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B70E7BA6A600F5680E /* cruise.cpp */; };
-		DF093F480F63CB26002D821E /* cruise_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420BA0E7BA6A700F5680E /* cruise_main.cpp */; };
-		DF093F490F63CB26002D821E /* ctp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420BD0E7BA6A700F5680E /* ctp.cpp */; };
-		DF093F4A0F63CB26002D821E /* dataLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C00E7BA6A700F5680E /* dataLoader.cpp */; };
-		DF093F4B0F63CB26002D821E /* decompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C30E7BA6A700F5680E /* decompiler.cpp */; };
-		DF093F4C0F63CB26002D821E /* delphine-unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C50E7BA6A700F5680E /* delphine-unpack.cpp */; };
-		DF093F4D0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C70E7BA6A700F5680E /* detection.cpp */; };
-		DF093F4E0F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C90E7BA6A700F5680E /* font.cpp */; };
-		DF093F4F0F63CB26002D821E /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420CF0E7BA6A700F5680E /* function.cpp */; };
-		DF093F500F63CB26002D821E /* gfxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D20E7BA6A700F5680E /* gfxModule.cpp */; };
-		DF093F510F63CB26002D821E /* linker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D60E7BA6A700F5680E /* linker.cpp */; };
-		DF093F520F63CB26002D821E /* mainDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D90E7BA6A700F5680E /* mainDraw.cpp */; };
-		DF093F530F63CB26002D821E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420DC0E7BA6A700F5680E /* menu.cpp */; };
-		DF093F540F63CB26002D821E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E00E7BA6A700F5680E /* mouse.cpp */; };
-		DF093F550F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E30E7BA6A700F5680E /* object.cpp */; };
-		DF093F560F63CB26002D821E /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E60E7BA6A700F5680E /* overlay.cpp */; };
-		DF093F570F63CB26002D821E /* perso.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E90E7BA6A700F5680E /* perso.cpp */; };
-		DF093F580F63CB26002D821E /* polys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420EC0E7BA6A700F5680E /* polys.cpp */; };
-		DF093F590F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420EF0E7BA6A700F5680E /* saveload.cpp */; };
-		DF093F5A0F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F20E7BA6A700F5680E /* script.cpp */; };
-		DF093F5B0F63CB26002D821E /* stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F50E7BA6A700F5680E /* stack.cpp */; };
-		DF093F5C0F63CB26002D821E /* various.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F90E7BA6A700F5680E /* various.cpp */; };
-		DF093F5D0F63CB26002D821E /* vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420FC0E7BA6A700F5680E /* vars.cpp */; };
-		DF093F5E0F63CB26002D821E /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420FF0E7BA6A700F5680E /* volume.cpp */; };
-		DF093F5F0F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421020E7BA6A700F5680E /* dialogs.cpp */; };
-		DF093F600F63CB26002D821E /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421050E7BA6A700F5680E /* actors.cpp */; };
-		DF093F610F63CB26002D821E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421060E7BA6A700F5680E /* animation.cpp */; };
-		DF093F620F63CB26002D821E /* converse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421070E7BA6A700F5680E /* converse.cpp */; };
-		DF093F630F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421080E7BA6A700F5680E /* detection.cpp */; };
-		DF093F640F63CB26002D821E /* drascula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421090E7BA6A700F5680E /* drascula.cpp */; };
-		DF093F650F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210B0E7BA6A700F5680E /* graphics.cpp */; };
-		DF093F660F63CB26002D821E /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210C0E7BA6A700F5680E /* interface.cpp */; };
-		DF093F670F63CB26002D821E /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210E0E7BA6A700F5680E /* objects.cpp */; };
-		DF093F680F63CB26002D821E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210F0E7BA6A700F5680E /* palette.cpp */; };
-		DF093F690F63CB26002D821E /* rooms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421100E7BA6A700F5680E /* rooms.cpp */; };
-		DF093F6A0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421110E7BA6A700F5680E /* saveload.cpp */; };
-		DF093F6B0F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421120E7BA6A700F5680E /* sound.cpp */; };
-		DF093F6C0F63CB26002D821E /* talk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421130E7BA6A700F5680E /* talk.cpp */; };
-		DF093F6D0F63CB26002D821E /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421140E7BA6A700F5680E /* engine.cpp */; };
-		DF093F6F0F63CB26002D821E /* dataio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211B0E7BA6A700F5680E /* dataio.cpp */; };
-		DF093F700F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211D0E7BA6A700F5680E /* detection.cpp */; };
-		DF093F710F63CB26002D821E /* draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211E0E7BA6A700F5680E /* draw.cpp */; };
-		DF093F720F63CB26002D821E /* draw_bargon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421200E7BA6A700F5680E /* draw_bargon.cpp */; };
-		DF093F730F63CB26002D821E /* draw_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421210E7BA6A700F5680E /* draw_v1.cpp */; };
-		DF093F740F63CB26002D821E /* draw_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421220E7BA6A700F5680E /* draw_v2.cpp */; };
-		DF093F760F63CB26002D821E /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421250E7BA6A700F5680E /* game.cpp */; };
-		DF093F790F63CB26002D821E /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421290E7BA6A700F5680E /* global.cpp */; };
-		DF093F7A0F63CB26002D821E /* gob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212B0E7BA6A700F5680E /* gob.cpp */; };
-		DF093F7B0F63CB26002D821E /* goblin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212D0E7BA6A700F5680E /* goblin.cpp */; };
-		DF093F7C0F63CB26002D821E /* goblin_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212F0E7BA6A700F5680E /* goblin_v1.cpp */; };
-		DF093F7D0F63CB26002D821E /* goblin_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421300E7BA6A700F5680E /* goblin_v2.cpp */; };
-		DF093F7E0F63CB26002D821E /* goblin_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421310E7BA6A700F5680E /* goblin_v3.cpp */; };
-		DF093F7F0F63CB26002D821E /* goblin_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421320E7BA6A700F5680E /* goblin_v4.cpp */; };
-		DF093F800F63CB26002D821E /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421330E7BA6A700F5680E /* init.cpp */; };
-		DF093F810F63CB26002D821E /* init_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421350E7BA6A700F5680E /* init_v1.cpp */; };
-		DF093F820F63CB26002D821E /* init_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421360E7BA6A700F5680E /* init_v2.cpp */; };
-		DF093F830F63CB26002D821E /* init_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421370E7BA6A700F5680E /* init_v3.cpp */; };
-		DF093F840F63CB26002D821E /* inter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421380E7BA6A700F5680E /* inter.cpp */; };
-		DF093F850F63CB26002D821E /* inter_bargon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213A0E7BA6A700F5680E /* inter_bargon.cpp */; };
-		DF093F860F63CB26002D821E /* inter_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213B0E7BA6A700F5680E /* inter_v1.cpp */; };
-		DF093F870F63CB26002D821E /* inter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213C0E7BA6A700F5680E /* inter_v2.cpp */; };
-		DF093F880F63CB26002D821E /* inter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213D0E7BA6A700F5680E /* inter_v3.cpp */; };
-		DF093F890F63CB26002D821E /* inter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213E0E7BA6A700F5680E /* inter_v4.cpp */; };
-		DF093F8A0F63CB26002D821E /* inter_v5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213F0E7BA6A700F5680E /* inter_v5.cpp */; };
-		DF093F8B0F63CB26002D821E /* inter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421400E7BA6A700F5680E /* inter_v6.cpp */; };
-		DF093F8C0F63CB26002D821E /* map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421410E7BA6A700F5680E /* map.cpp */; };
-		DF093F8D0F63CB26002D821E /* map_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421430E7BA6A700F5680E /* map_v1.cpp */; };
-		DF093F8E0F63CB26002D821E /* map_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421440E7BA6A700F5680E /* map_v2.cpp */; };
-		DF093F900F63CB26002D821E /* mult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421470E7BA6A700F5680E /* mult.cpp */; };
-		DF093F910F63CB26002D821E /* mult_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421490E7BA6A700F5680E /* mult_v1.cpp */; };
-		DF093F920F63CB26002D821E /* mult_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84214A0E7BA6A700F5680E /* mult_v2.cpp */; };
-		DF093F930F63CB26002D821E /* palanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84214C0E7BA6A700F5680E /* palanim.cpp */; };
-		DF093F9B0F63CB26002D821E /* scenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421570E7BA6A700F5680E /* scenery.cpp */; };
-		DF093F9C0F63CB26002D821E /* scenery_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421590E7BA6A700F5680E /* scenery_v1.cpp */; };
-		DF093F9D0F63CB26002D821E /* scenery_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215A0E7BA6A700F5680E /* scenery_v2.cpp */; };
-		DF093F9E0F63CB26002D821E /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215C0E7BA6A700F5680E /* adlib.cpp */; };
-		DF093F9F0F63CB26002D821E /* bgatmosphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215E0E7BA6A700F5680E /* bgatmosphere.cpp */; };
-		DF093FA00F63CB26002D821E /* cdrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421600E7BA6A700F5680E /* cdrom.cpp */; };
-		DF093FA10F63CB26002D821E /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421620E7BA6A700F5680E /* infogrames.cpp */; };
-		DF093FA20F63CB26002D821E /* pcspeaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421640E7BA6A700F5680E /* pcspeaker.cpp */; };
-		DF093FA30F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421660E7BA6A700F5680E /* sound.cpp */; };
-		DF093FA40F63CB26002D821E /* soundblaster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421680E7BA6A700F5680E /* soundblaster.cpp */; };
-		DF093FA50F63CB26002D821E /* sounddesc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216A0E7BA6A700F5680E /* sounddesc.cpp */; };
-		DF093FA60F63CB26002D821E /* soundmixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216C0E7BA6A700F5680E /* soundmixer.cpp */; };
-		DF093FA70F63CB26002D821E /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216F0E7BA6A700F5680E /* util.cpp */; };
-		DF093FA80F63CB26002D821E /* variables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421710E7BA6A700F5680E /* variables.cpp */; };
-		DF093FA90F63CB26002D821E /* video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421730E7BA6A700F5680E /* video.cpp */; };
-		DF093FAA0F63CB26002D821E /* video_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421750E7BA6A700F5680E /* video_v1.cpp */; };
-		DF093FAB0F63CB26002D821E /* video_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421760E7BA6A700F5680E /* video_v2.cpp */; };
-		DF093FAC0F63CB26002D821E /* video_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421770E7BA6A700F5680E /* video_v6.cpp */; };
-		DF093FAD0F63CB26002D821E /* videoplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421780E7BA6A700F5680E /* videoplayer.cpp */; };
-		DF093FD10F63CB26002D821E /* animator_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A40E7BA6A800F5680E /* animator_hof.cpp */; };
-		DF093FD20F63CB26002D821E /* animator_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A50E7BA6A800F5680E /* animator_lok.cpp */; };
-		DF093FD30F63CB26002D821E /* animator_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A70E7BA6A800F5680E /* animator_mr.cpp */; };
-		DF093FD40F63CB26002D821E /* animator_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A90E7BA6A800F5680E /* animator_v2.cpp */; };
-		DF093FD50F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AB0E7BA6A800F5680E /* debugger.cpp */; };
-		DF093FD60F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AD0E7BA6A800F5680E /* detection.cpp */; };
-		DF093FD70F63CB26002D821E /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AE0E7BA6A800F5680E /* gui.cpp */; };
-		DF093FD80F63CB26002D821E /* gui_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B00E7BA6A800F5680E /* gui_hof.cpp */; };
-		DF093FD90F63CB26002D821E /* gui_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B20E7BA6A800F5680E /* gui_lok.cpp */; };
-		DF093FDA0F63CB26002D821E /* gui_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B40E7BA6A800F5680E /* gui_mr.cpp */; };
-		DF093FDB0F63CB26002D821E /* gui_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B70E7BA6A800F5680E /* gui_v2.cpp */; };
-		DF093FDC0F63CB26002D821E /* items_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BA0E7BA6A800F5680E /* items_hof.cpp */; };
-		DF093FDD0F63CB26002D821E /* items_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BB0E7BA6A800F5680E /* items_lok.cpp */; };
-		DF093FDE0F63CB26002D821E /* items_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BC0E7BA6A800F5680E /* items_mr.cpp */; };
-		DF093FDF0F63CB26002D821E /* items_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BE0E7BA6A800F5680E /* items_v2.cpp */; };
-		DF093FE00F63CB26002D821E /* kyra_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C10E7BA6A800F5680E /* kyra_hof.cpp */; };
-		DF093FE10F63CB26002D821E /* kyra_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C30E7BA6A800F5680E /* kyra_lok.cpp */; };
-		DF093FE20F63CB26002D821E /* kyra_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C50E7BA6A800F5680E /* kyra_mr.cpp */; };
-		DF093FE30F63CB26002D821E /* kyra_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C70E7BA6A800F5680E /* kyra_v1.cpp */; };
-		DF093FE40F63CB26002D821E /* kyra_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C90E7BA6A800F5680E /* kyra_v2.cpp */; };
-		DF093FE50F63CB26002D821E /* lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421CC0E7BA6A800F5680E /* lol.cpp */; };
-		DF093FE60F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421CF0E7BA6A800F5680E /* resource.cpp */; };
-		DF093FE70F63CB26002D821E /* resource_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D10E7BA6A800F5680E /* resource_intern.cpp */; };
-		DF093FE80F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D30E7BA6A800F5680E /* saveload.cpp */; };
-		DF093FE90F63CB26002D821E /* saveload_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D40E7BA6A800F5680E /* saveload_hof.cpp */; };
-		DF093FEA0F63CB26002D821E /* saveload_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D50E7BA6A800F5680E /* saveload_lok.cpp */; };
-		DF093FEB0F63CB26002D821E /* saveload_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D60E7BA6A800F5680E /* saveload_mr.cpp */; };
-		DF093FEC0F63CB26002D821E /* scene_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DA0E7BA6A800F5680E /* scene_hof.cpp */; };
-		DF093FED0F63CB26002D821E /* scene_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DB0E7BA6A800F5680E /* scene_lok.cpp */; };
-		DF093FEE0F63CB26002D821E /* scene_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DC0E7BA6A800F5680E /* scene_mr.cpp */; };
-		DF093FEF0F63CB26002D821E /* scene_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DD0E7BA6A800F5680E /* scene_v1.cpp */; };
-		DF093FF00F63CB26002D821E /* scene_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DE0E7BA6A800F5680E /* scene_v2.cpp */; };
-		DF093FF10F63CB26002D821E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E00E7BA6A800F5680E /* screen.cpp */; };
-		DF093FF20F63CB26002D821E /* screen_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E20E7BA6A800F5680E /* screen_hof.cpp */; };
-		DF093FF30F63CB26002D821E /* screen_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E40E7BA6A800F5680E /* screen_lok.cpp */; };
-		DF093FF40F63CB26002D821E /* screen_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E60E7BA6A800F5680E /* screen_lol.cpp */; };
-		DF093FF50F63CB26002D821E /* screen_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E80E7BA6A800F5680E /* screen_mr.cpp */; };
-		DF093FF60F63CB26002D821E /* screen_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421EB0E7BA6A800F5680E /* screen_v2.cpp */; };
-		DF093FF70F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421EE0E7BA6A800F5680E /* script.cpp */; };
-		DF093FF80F63CB26002D821E /* script_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F00E7BA6A800F5680E /* script_hof.cpp */; };
-		DF093FF90F63CB26002D821E /* script_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F10E7BA6A800F5680E /* script_lok.cpp */; };
-		DF093FFA0F63CB26002D821E /* script_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F20E7BA6A800F5680E /* script_mr.cpp */; };
-		DF093FFB0F63CB26002D821E /* script_tim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F30E7BA6A800F5680E /* script_tim.cpp */; };
-		DF093FFC0F63CB26002D821E /* script_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F50E7BA6A800F5680E /* script_v1.cpp */; };
-		DF093FFD0F63CB26002D821E /* script_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F60E7BA6A800F5680E /* script_v2.cpp */; };
-		DF093FFE0F63CB26002D821E /* seqplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F80E7BA6A800F5680E /* seqplayer.cpp */; };
-		DF093FFF0F63CB26002D821E /* sequences_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FA0E7BA6A800F5680E /* sequences_hof.cpp */; };
-		DF0940000F63CB26002D821E /* sequences_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FB0E7BA6A800F5680E /* sequences_lok.cpp */; };
-		DF0940010F63CB26002D821E /* sequences_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FC0E7BA6A800F5680E /* sequences_mr.cpp */; };
-		DF0940020F63CB26002D821E /* sequences_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FE0E7BA6A800F5680E /* sequences_v2.cpp */; };
-		DF0940030F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422000E7BA6A800F5680E /* sound.cpp */; };
-		DF0940040F63CB26002D821E /* sound_adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422020E7BA6A800F5680E /* sound_adlib.cpp */; };
-		DF0940050F63CB26002D821E /* sound_digital.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422030E7BA6A800F5680E /* sound_digital.cpp */; };
-		DF0940060F63CB26002D821E /* sound_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422040E7BA6A800F5680E /* sound_lok.cpp */; };
-		DF0940070F63CB26002D821E /* sound_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422050E7BA6A800F5680E /* sound_towns.cpp */; };
-		DF0940080F63CB26002D821E /* sprites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422070E7BA6A800F5680E /* sprites.cpp */; };
-		DF0940090F63CB26002D821E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422090E7BA6A800F5680E /* staticres.cpp */; };
-		DF09400A0F63CB26002D821E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220A0E7BA6A800F5680E /* text.cpp */; };
-		DF09400B0F63CB26002D821E /* text_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220C0E7BA6A800F5680E /* text_hof.cpp */; };
-		DF09400C0F63CB26002D821E /* text_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220E0E7BA6A800F5680E /* text_lok.cpp */; };
-		DF09400D0F63CB26002D821E /* text_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220F0E7BA6A800F5680E /* text_mr.cpp */; };
-		DF09400E0F63CB26002D821E /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422140E7BA6A800F5680E /* timer.cpp */; };
-		DF09400F0F63CB26002D821E /* timer_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422160E7BA6A800F5680E /* timer_hof.cpp */; };
-		DF0940100F63CB26002D821E /* timer_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422170E7BA6A800F5680E /* timer_lok.cpp */; };
-		DF0940110F63CB26002D821E /* timer_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422180E7BA6A800F5680E /* timer_mr.cpp */; };
-		DF0940120F63CB26002D821E /* vqa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84221C0E7BA6A800F5680E /* vqa.cpp */; };
-		DF0940130F63CB26002D821E /* wsamovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84221E0E7BA6A800F5680E /* wsamovie.cpp */; };
-		DF0940140F63CB26002D821E /* animseq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422210E7BA6A800F5680E /* animseq.cpp */; };
-		DF0940150F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422230E7BA6A800F5680E /* debugger.cpp */; };
-		DF0940160F63CB26002D821E /* decode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422250E7BA6A800F5680E /* decode.cpp */; };
-		DF0940170F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422270E7BA6A800F5680E /* detection.cpp */; };
-		DF0940180F63CB26002D821E /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422280E7BA6A800F5680E /* disk.cpp */; };
-		DF0940190F63CB26002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222A0E7BA6A800F5680E /* events.cpp */; };
-		DF09401A0F63CB26002D821E /* fights.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222C0E7BA6A800F5680E /* fights.cpp */; };
-		DF09401B0F63CB26002D821E /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222E0E7BA6A800F5680E /* game.cpp */; };
-		DF09401C0F63CB26002D821E /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422300E7BA6A800F5680E /* hotspots.cpp */; };
-		DF09401D0F63CB26002D821E /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422320E7BA6A800F5680E /* intro.cpp */; };
-		DF09401E0F63CB26002D821E /* lure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422340E7BA6A800F5680E /* lure.cpp */; };
-		DF09401F0F63CB26002D821E /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422370E7BA6A800F5680E /* memory.cpp */; };
-		DF0940200F63CB26002D821E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422390E7BA6A800F5680E /* menu.cpp */; };
-		DF0940210F63CB26002D821E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84223C0E7BA6A800F5680E /* palette.cpp */; };
-		DF0940220F63CB26002D821E /* res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84223E0E7BA6A800F5680E /* res.cpp */; };
-		DF0940230F63CB26002D821E /* res_struct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422400E7BA6A800F5680E /* res_struct.cpp */; };
-		DF0940240F63CB26002D821E /* room.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422420E7BA6A800F5680E /* room.cpp */; };
-		DF0940250F63CB26002D821E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422440E7BA6A800F5680E /* screen.cpp */; };
-		DF0940260F63CB26002D821E /* scripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422460E7BA6A800F5680E /* scripts.cpp */; };
-		DF0940270F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422480E7BA6A800F5680E /* sound.cpp */; };
-		DF0940280F63CB26002D821E /* strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84224A0E7BA6A800F5680E /* strings.cpp */; };
-		DF0940290F63CB26002D821E /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84224C0E7BA6A800F5680E /* surface.cpp */; };
-		DF09402A0F63CB26002D821E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84226E0E7BA6A800F5680E /* actor.cpp */; };
-		DF09402B0F63CB26002D821E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422710E7BA6A800F5680E /* animation.cpp */; };
-		DF09402C0F63CB26002D821E /* assets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422740E7BA6A800F5680E /* assets.cpp */; };
-		DF09402D0F63CB26002D821E /* compression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422780E7BA6A900F5680E /* compression.cpp */; };
-		DF09402E0F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84227B0E7BA6A900F5680E /* console.cpp */; };
-		DF09402F0F63CB26002D821E /* converse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84227E0E7BA6A900F5680E /* converse.cpp */; };
-		DF0940300F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422810E7BA6A900F5680E /* detection.cpp */; };
-		DF0940310F63CB26002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422830E7BA6A900F5680E /* events.cpp */; };
-		DF0940320F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422860E7BA6A900F5680E /* font.cpp */; };
-		DF0940330F63CB26002D821E /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422890E7BA6A900F5680E /* globals.cpp */; };
-		DF0940340F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84228C0E7BA6A900F5680E /* graphics.cpp */; };
-		DF0940350F63CB26002D821E /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84228F0E7BA6A900F5680E /* gui.cpp */; };
-		DF0940360F63CB26002D821E /* hotspot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422920E7BA6A900F5680E /* hotspot.cpp */; };
-		DF0940370F63CB26002D821E /* m4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422960E7BA6A900F5680E /* m4.cpp */; };
-		DF0940380F63CB26002D821E /* m4_menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422990E7BA6A900F5680E /* m4_menus.cpp */; };
-		DF0940390F63CB26002D821E /* m4_views.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84229C0E7BA6A900F5680E /* m4_views.cpp */; };
-		DF09403A0F63CB26002D821E /* mads_anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84229F0E7BA6A900F5680E /* mads_anim.cpp */; };
-		DF09403B0F63CB26002D821E /* mads_menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A20E7BA6A900F5680E /* mads_menus.cpp */; };
-		DF09403C0F63CB26002D821E /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A50E7BA6A900F5680E /* midi.cpp */; };
-		DF09403D0F63CB26002D821E /* rails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A90E7BA6A900F5680E /* rails.cpp */; };
-		DF09403E0F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422AC0E7BA6A900F5680E /* resource.cpp */; };
-		DF09403F0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422AF0E7BA6A900F5680E /* saveload.cpp */; };
-		DF0940400F63CB26002D821E /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B20E7BA6A900F5680E /* scene.cpp */; };
-		DF0940410F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B50E7BA6A900F5680E /* script.cpp */; };
-		DF0940420F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B90E7BA6A900F5680E /* sound.cpp */; };
-		DF0940430F63CB26002D821E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422BC0E7BA6A900F5680E /* sprite.cpp */; };
-		DF0940440F63CB26002D821E /* viewmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422BF0E7BA6A900F5680E /* viewmgr.cpp */; };
-		DF0940450F63CB26002D821E /* woodscript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C20E7BA6A900F5680E /* woodscript.cpp */; };
-		DF0940460F63CB26002D821E /* ws_machine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C50E7BA6A900F5680E /* ws_machine.cpp */; };
-		DF0940470F63CB26002D821E /* ws_sequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C70E7BA6A900F5680E /* ws_sequence.cpp */; };
-		DF0940480F63CB26002D821E /* database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CA0E7BA6A900F5680E /* database.cpp */; };
-		DF0940490F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CC0E7BA6A900F5680E /* detection.cpp */; };
-		DF09404A0F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CD0E7BA6A900F5680E /* graphics.cpp */; };
-		DF09404B0F63CB26002D821E /* made.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CF0E7BA6A900F5680E /* made.cpp */; };
-		DF09404C0F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D20E7BA6A900F5680E /* music.cpp */; };
-		DF09404D0F63CB26002D821E /* pmvplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D40E7BA6A900F5680E /* pmvplayer.cpp */; };
-		DF09404E0F63CB26002D821E /* redreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D60E7BA6A900F5680E /* redreader.cpp */; };
-		DF09404F0F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D80E7BA6A900F5680E /* resource.cpp */; };
-		DF0940500F63CB26002D821E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DA0E7BA6A900F5680E /* screen.cpp */; };
-		DF0940510F63CB26002D821E /* screenfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DC0E7BA6A900F5680E /* screenfx.cpp */; };
-		DF0940520F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DE0E7BA6A900F5680E /* script.cpp */; };
-		DF0940530F63CB26002D821E /* scriptfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E00E7BA6A900F5680E /* scriptfuncs.cpp */; };
-		DF0940540F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E20E7BA6A900F5680E /* sound.cpp */; };
-		DF0940550F63CB26002D821E /* balloons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E70E7BA6A900F5680E /* balloons.cpp */; };
-		DF0940560F63CB26002D821E /* callables_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E80E7BA6A900F5680E /* callables_br.cpp */; };
-		DF0940570F63CB26002D821E /* callables_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E90E7BA6A900F5680E /* callables_ns.cpp */; };
-		DF0940580F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EA0E7BA6A900F5680E /* debug.cpp */; };
-		DF0940590F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EC0E7BA6A900F5680E /* detection.cpp */; };
-		DF09405A0F63CB26002D821E /* dialogue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422ED0E7BA6A900F5680E /* dialogue.cpp */; };
-		DF09405B0F63CB26002D821E /* disk_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EF0E7BA6A900F5680E /* disk_br.cpp */; };
-		DF09405C0F63CB26002D821E /* disk_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F00E7BA6A900F5680E /* disk_ns.cpp */; };
-		DF09405D0F63CB26002D821E /* exec_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F20E7BA6A900F5680E /* exec_br.cpp */; };
-		DF09405E0F63CB26002D821E /* exec_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F30E7BA6A900F5680E /* exec_ns.cpp */; };
-		DF09405F0F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F40E7BA6A900F5680E /* font.cpp */; };
-		DF0940600F63CB26002D821E /* gfxbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F50E7BA6A900F5680E /* gfxbase.cpp */; };
-		DF0940610F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F60E7BA6A900F5680E /* graphics.cpp */; };
-		DF0940620F63CB26002D821E /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F80E7BA6A900F5680E /* gui.cpp */; };
-		DF0940630F63CB26002D821E /* gui_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FA0E7BA6A900F5680E /* gui_br.cpp */; };
-		DF0940640F63CB26002D821E /* gui_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FB0E7BA6A900F5680E /* gui_ns.cpp */; };
-		DF0940650F63CB26002D821E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FC0E7BA6A900F5680E /* input.cpp */; };
-		DF0940660F63CB26002D821E /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FE0E7BA6A900F5680E /* inventory.cpp */; };
-		DF0940670F63CB26002D821E /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423010E7BA6A900F5680E /* objects.cpp */; };
-		DF0940680F63CB26002D821E /* parallaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423030E7BA6A900F5680E /* parallaction.cpp */; };
-		DF0940690F63CB26002D821E /* parallaction_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423050E7BA6A900F5680E /* parallaction_br.cpp */; };
-		DF09406A0F63CB26002D821E /* parallaction_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423060E7BA6A900F5680E /* parallaction_ns.cpp */; };
-		DF09406B0F63CB26002D821E /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423070E7BA6A900F5680E /* parser.cpp */; };
-		DF09406C0F63CB26002D821E /* parser_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423090E7BA6A900F5680E /* parser_br.cpp */; };
-		DF09406D0F63CB26002D821E /* parser_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230A0E7BA6A900F5680E /* parser_ns.cpp */; };
-		DF09406E0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230B0E7BA6A900F5680E /* saveload.cpp */; };
-		DF0940700F63CB26002D821E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230F0E7BA6A900F5680E /* staticres.cpp */; };
-		DF0940710F63CB26002D821E /* walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423100E7BA6A900F5680E /* walk.cpp */; };
-		DF0940720F63CB26002D821E /* bankman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423130E7BA6A900F5680E /* bankman.cpp */; };
-		DF0940730F63CB26002D821E /* command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423150E7BA6A900F5680E /* command.cpp */; };
-		DF0940740F63CB26002D821E /* credits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423170E7BA6A900F5680E /* credits.cpp */; };
-		DF0940750F63CB26002D821E /* cutaway.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423190E7BA6A900F5680E /* cutaway.cpp */; };
-		DF0940760F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84231B0E7BA6A900F5680E /* debug.cpp */; };
-		DF0940770F63CB26002D821E /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84231E0E7BA6A900F5680E /* display.cpp */; };
-		DF0940780F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423200E7BA6A900F5680E /* graphics.cpp */; };
-		DF0940790F63CB26002D821E /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423220E7BA6A900F5680E /* grid.cpp */; };
-		DF09407A0F63CB26002D821E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423240E7BA6A900F5680E /* input.cpp */; };
-		DF09407B0F63CB26002D821E /* journal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423260E7BA6A900F5680E /* journal.cpp */; };
-		DF09407C0F63CB26002D821E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423280E7BA6A900F5680E /* logic.cpp */; };
-		DF09407D0F63CB26002D821E /* midiadlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232A0E7BA6A900F5680E /* midiadlib.cpp */; };
-		DF09407E0F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232C0E7BA6A900F5680E /* music.cpp */; };
-		DF09407F0F63CB26002D821E /* musicdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232E0E7BA6A900F5680E /* musicdata.cpp */; };
-		DF0940800F63CB26002D821E /* queen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232F0E7BA6A900F5680E /* queen.cpp */; };
-		DF0940810F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423310E7BA6A900F5680E /* resource.cpp */; };
-		DF0940820F63CB26002D821E /* restables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423330E7BA6A900F5680E /* restables.cpp */; };
-		DF0940830F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423340E7BA6A900F5680E /* sound.cpp */; };
-		DF0940840F63CB26002D821E /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423360E7BA6A900F5680E /* state.cpp */; };
-		DF0940850F63CB26002D821E /* talk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423390E7BA6A900F5680E /* talk.cpp */; };
-		DF0940860F63CB26002D821E /* walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84233B0E7BA6A900F5680E /* walk.cpp */; };
-		DF0940870F63CB26002D821E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84233F0E7BA6AA00F5680E /* actor.cpp */; };
-		DF0940880F63CB26002D821E /* actor_path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423410E7BA6AA00F5680E /* actor_path.cpp */; };
-		DF0940890F63CB26002D821E /* actor_walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423420E7BA6AA00F5680E /* actor_walk.cpp */; };
-		DF09408A0F63CB26002D821E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423430E7BA6AA00F5680E /* animation.cpp */; };
-		DF09408B0F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423450E7BA6AA00F5680E /* console.cpp */; };
-		DF09408C0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423470E7BA6AA00F5680E /* detection.cpp */; };
-		DF09408D0F63CB26002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234A0E7BA6AA00F5680E /* events.cpp */; };
-		DF09408E0F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234C0E7BA6AA00F5680E /* font.cpp */; };
-		DF09408F0F63CB26002D821E /* font_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234E0E7BA6AA00F5680E /* font_map.cpp */; };
-		DF0940900F63CB26002D821E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234F0E7BA6AA00F5680E /* gfx.cpp */; };
-		DF0940910F63CB26002D821E /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423520E7BA6AA00F5680E /* image.cpp */; };
-		DF0940920F63CB26002D821E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423530E7BA6AA00F5680E /* input.cpp */; };
-		DF0940930F63CB26002D821E /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423540E7BA6AA00F5680E /* interface.cpp */; };
-		DF0940940F63CB26002D821E /* introproc_ihnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423560E7BA6AA00F5680E /* introproc_ihnm.cpp */; };
-		DF0940950F63CB26002D821E /* introproc_ite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423570E7BA6AA00F5680E /* introproc_ite.cpp */; };
-		DF0940960F63CB26002D821E /* isomap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423580E7BA6AA00F5680E /* isomap.cpp */; };
-		DF0940970F63CB26002D821E /* itedata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84235B0E7BA6AA00F5680E /* itedata.cpp */; };
-		DF0940980F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84235F0E7BA6AA00F5680E /* music.cpp */; };
-		DF0940990F63CB26002D821E /* objectmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423610E7BA6AA00F5680E /* objectmap.cpp */; };
-		DF09409A0F63CB26002D821E /* palanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423630E7BA6AA00F5680E /* palanim.cpp */; };
-		DF09409B0F63CB26002D821E /* puzzle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423650E7BA6AA00F5680E /* puzzle.cpp */; };
-		DF09409C0F63CB26002D821E /* render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423670E7BA6AA00F5680E /* render.cpp */; };
-		DF09409D0F63CB26002D821E /* saga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236B0E7BA6AA00F5680E /* saga.cpp */; };
-		DF09409E0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236D0E7BA6AA00F5680E /* saveload.cpp */; };
-		DF09409F0F63CB26002D821E /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236E0E7BA6AA00F5680E /* scene.cpp */; };
-		DF0940A00F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423700E7BA6AA00F5680E /* script.cpp */; };
-		DF0940A10F63CB26002D821E /* sfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423720E7BA6AA00F5680E /* sfuncs.cpp */; };
-		DF0940A20F63CB26002D821E /* sndres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423730E7BA6AA00F5680E /* sndres.cpp */; };
-		DF0940A30F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423750E7BA6AA00F5680E /* sound.cpp */; };
-		DF0940A40F63CB26002D821E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423770E7BA6AA00F5680E /* sprite.cpp */; };
-		DF0940A50F63CB26002D821E /* sthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423790E7BA6AA00F5680E /* sthread.cpp */; };
-		DF0940A60F63CB26002D821E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84237C0E7BA6AA00F5680E /* actor.cpp */; };
-		DF0940A70F63CB26002D821E /* akos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84237E0E7BA6AA00F5680E /* akos.cpp */; };
-		DF0940A80F63CB26002D821E /* base-costume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423800E7BA6AA00F5680E /* base-costume.cpp */; };
-		DF0940A90F63CB26002D821E /* bomp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423820E7BA6AA00F5680E /* bomp.cpp */; };
-		DF0940AA0F63CB26002D821E /* boxes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423840E7BA6AA00F5680E /* boxes.cpp */; };
-		DF0940AB0F63CB26002D821E /* camera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423860E7BA6AA00F5680E /* camera.cpp */; };
-		DF0940AC0F63CB26002D821E /* charset-fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423870E7BA6AA00F5680E /* charset-fontdata.cpp */; };
-		DF0940AD0F63CB26002D821E /* charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423880E7BA6AA00F5680E /* charset.cpp */; };
-		DF0940AE0F63CB26002D821E /* costume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238A0E7BA6AA00F5680E /* costume.cpp */; };
-		DF0940AF0F63CB26002D821E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238C0E7BA6AA00F5680E /* cursor.cpp */; };
-		DF0940B00F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238D0E7BA6AA00F5680E /* debugger.cpp */; };
-		DF0940B10F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238F0E7BA6AA00F5680E /* detection.cpp */; };
-		DF0940B20F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423920E7BA6AA00F5680E /* dialogs.cpp */; };
-		DF0940B30F63CB26002D821E /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423940E7BA6AA00F5680E /* file.cpp */; };
-		DF0940B40F63CB26002D821E /* file_nes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423960E7BA6AA00F5680E /* file_nes.cpp */; };
-		DF0940B50F63CB26002D821E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423980E7BA6AA00F5680E /* gfx.cpp */; };
-		DF0940B60F63CB26002D821E /* animation_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84239C0E7BA6AA00F5680E /* animation_he.cpp */; };
-		DF0940B70F63CB26002D821E /* cup_player_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84239E0E7BA6AA00F5680E /* cup_player_he.cpp */; };
-		DF0940B80F63CB26002D821E /* floodfill_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A00E7BA6AA00F5680E /* floodfill_he.cpp */; };
-		DF0940B90F63CB26002D821E /* logic_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A30E7BA6AA00F5680E /* logic_he.cpp */; };
-		DF0940BA0F63CB26002D821E /* palette_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A50E7BA6AA00F5680E /* palette_he.cpp */; };
-		DF0940BB0F63CB26002D821E /* resource_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A60E7BA6AA00F5680E /* resource_he.cpp */; };
-		DF0940BC0F63CB26002D821E /* script_v100he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A80E7BA6AA00F5680E /* script_v100he.cpp */; };
-		DF0940BD0F63CB26002D821E /* script_v60he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A90E7BA6AA00F5680E /* script_v60he.cpp */; };
-		DF0940BE0F63CB26002D821E /* script_v70he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AA0E7BA6AA00F5680E /* script_v70he.cpp */; };
-		DF0940BF0F63CB26002D821E /* script_v71he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AB0E7BA6AA00F5680E /* script_v71he.cpp */; };
-		DF0940C00F63CB26002D821E /* script_v72he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AC0E7BA6AA00F5680E /* script_v72he.cpp */; };
-		DF0940C10F63CB26002D821E /* script_v80he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AD0E7BA6AA00F5680E /* script_v80he.cpp */; };
-		DF0940C20F63CB26002D821E /* script_v90he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AE0E7BA6AA00F5680E /* script_v90he.cpp */; };
-		DF0940C30F63CB26002D821E /* sound_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AF0E7BA6AA00F5680E /* sound_he.cpp */; };
-		DF0940C40F63CB26002D821E /* sprite_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B10E7BA6AA00F5680E /* sprite_he.cpp */; };
-		DF0940C50F63CB26002D821E /* wiz_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B30E7BA6AA00F5680E /* wiz_he.cpp */; };
-		DF0940C60F63CB26002D821E /* help.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B50E7BA6AA00F5680E /* help.cpp */; };
-		DF0940C70F63CB26002D821E /* imuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B80E7BA6AA00F5680E /* imuse.cpp */; };
-		DF0940C80F63CB26002D821E /* imuse_part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BB0E7BA6AA00F5680E /* imuse_part.cpp */; };
-		DF0940C90F63CB26002D821E /* imuse_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BC0E7BA6AA00F5680E /* imuse_player.cpp */; };
-		DF0940CA0F63CB26002D821E /* instrument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BD0E7BA6AA00F5680E /* instrument.cpp */; };
-		DF0940CB0F63CB26002D821E /* sysex_samnmax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C00E7BA6AA00F5680E /* sysex_samnmax.cpp */; };
-		DF0940CC0F63CB26002D821E /* sysex_scumm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C10E7BA6AA00F5680E /* sysex_scumm.cpp */; };
-		DF0940CD0F63CB26002D821E /* dimuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C30E7BA6AA00F5680E /* dimuse.cpp */; };
-		DF0940CE0F63CB26002D821E /* dimuse_bndmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C50E7BA6AA00F5680E /* dimuse_bndmgr.cpp */; };
-		DF0940CF0F63CB26002D821E /* dimuse_codecs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C70E7BA6AA00F5680E /* dimuse_codecs.cpp */; };
-		DF0940D00F63CB26002D821E /* dimuse_music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C80E7BA6AA00F5680E /* dimuse_music.cpp */; };
-		DF0940D10F63CB26002D821E /* dimuse_script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C90E7BA6AA00F5680E /* dimuse_script.cpp */; };
-		DF0940D20F63CB26002D821E /* dimuse_sndmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CA0E7BA6AA00F5680E /* dimuse_sndmgr.cpp */; };
-		DF0940D30F63CB26002D821E /* dimuse_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CC0E7BA6AA00F5680E /* dimuse_tables.cpp */; };
-		DF0940D40F63CB26002D821E /* dimuse_track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CE0E7BA6AA00F5680E /* dimuse_track.cpp */; };
-		DF0940D50F63CB26002D821E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D00E7BA6AA00F5680E /* input.cpp */; };
-		DF0940D60F63CB26002D821E /* insane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D20E7BA6AA00F5680E /* insane.cpp */; };
-		DF0940D70F63CB26002D821E /* insane_ben.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D40E7BA6AA00F5680E /* insane_ben.cpp */; };
-		DF0940D80F63CB26002D821E /* insane_enemy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D50E7BA6AA00F5680E /* insane_enemy.cpp */; };
-		DF0940D90F63CB26002D821E /* insane_iact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D60E7BA6AA00F5680E /* insane_iact.cpp */; };
-		DF0940DA0F63CB26002D821E /* insane_scenes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D70E7BA6AA00F5680E /* insane_scenes.cpp */; };
-		DF0940DC0F63CB26002D821E /* midiparser_ro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DA0E7BA6AA00F5680E /* midiparser_ro.cpp */; };
-		DF0940DD0F63CB26002D821E /* nut_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DD0E7BA6AA00F5680E /* nut_renderer.cpp */; };
-		DF0940DE0F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DF0E7BA6AA00F5680E /* object.cpp */; };
-		DF0940DF0F63CB26002D821E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E10E7BA6AA00F5680E /* palette.cpp */; };
-		DF0940E00F63CB26002D821E /* player_mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E20E7BA6AA00F5680E /* player_mod.cpp */; };
-		DF0940E10F63CB26002D821E /* player_nes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E40E7BA6AA00F5680E /* player_nes.cpp */; };
-		DF0940E20F63CB26002D821E /* player_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E60E7BA6AA00F5680E /* player_v1.cpp */; };
-		DF0940E30F63CB26002D821E /* player_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E80E7BA6AA00F5680E /* player_v2.cpp */; };
-		DF0940E40F63CB26002D821E /* player_v2a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EA0E7BA6AA00F5680E /* player_v2a.cpp */; };
-		DF0940E50F63CB26002D821E /* player_v3a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EC0E7BA6AA00F5680E /* player_v3a.cpp */; };
-		DF0940E60F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EF0E7BA6AA00F5680E /* resource.cpp */; };
-		DF0940E70F63CB26002D821E /* resource_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F10E7BA6AA00F5680E /* resource_v2.cpp */; };
-		DF0940E80F63CB26002D821E /* resource_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F20E7BA6AA00F5680E /* resource_v3.cpp */; };
-		DF0940E90F63CB26002D821E /* resource_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F30E7BA6AA00F5680E /* resource_v4.cpp */; };
-		DF0940EA0F63CB26002D821E /* room.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F40E7BA6AA00F5680E /* room.cpp */; };
-		DF0940EB0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F50E7BA6AA00F5680E /* saveload.cpp */; };
-		DF0940EC0F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F70E7BA6AA00F5680E /* script.cpp */; };
-		DF0940ED0F63CB26002D821E /* script_v0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F90E7BA6AA00F5680E /* script_v0.cpp */; };
-		DF0940EE0F63CB26002D821E /* script_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FA0E7BA6AA00F5680E /* script_v2.cpp */; };
-		DF0940EF0F63CB26002D821E /* script_v5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FB0E7BA6AA00F5680E /* script_v5.cpp */; };
-		DF0940F00F63CB26002D821E /* script_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FC0E7BA6AA00F5680E /* script_v6.cpp */; };
-		DF0940F10F63CB26002D821E /* script_v8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FD0E7BA6AA00F5680E /* script_v8.cpp */; };
-		DF0940F20F63CB26002D821E /* scumm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FF0E7BA6AA00F5680E /* scumm.cpp */; };
-		DF0940F30F63CB26002D821E /* channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424020E7BA6AA00F5680E /* channel.cpp */; };
-		DF0940F40F63CB26002D821E /* codec1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424060E7BA6AA00F5680E /* codec1.cpp */; };
-		DF0940F50F63CB26002D821E /* codec37.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424070E7BA6AA00F5680E /* codec37.cpp */; };
-		DF0940F60F63CB26002D821E /* codec47.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424090E7BA6AA00F5680E /* codec47.cpp */; };
-		DF0940F70F63CB26002D821E /* imuse_channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240D0E7BA6AA00F5680E /* imuse_channel.cpp */; };
-		DF0940F80F63CB26002D821E /* saud_channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240E0E7BA6AA00F5680E /* saud_channel.cpp */; };
-		DF0940F90F63CB26002D821E /* smush_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240F0E7BA6AA00F5680E /* smush_font.cpp */; };
-		DF0940FA0F63CB26002D821E /* smush_mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424110E7BA6AA00F5680E /* smush_mixer.cpp */; };
-		DF0940FB0F63CB26002D821E /* smush_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424130E7BA6AA00F5680E /* smush_player.cpp */; };
-		DF0940FC0F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424150E7BA6AB00F5680E /* sound.cpp */; };
-		DF0940FD0F63CB26002D821E /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424170E7BA6AB00F5680E /* string.cpp */; };
-		DF0940FE0F63CB26002D821E /* usage_bits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424190E7BA6AB00F5680E /* usage_bits.cpp */; };
-		DF0940FF0F63CB26002D821E /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241B0E7BA6AB00F5680E /* util.cpp */; };
-		DF0941000F63CB26002D821E /* vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241D0E7BA6AB00F5680E /* vars.cpp */; };
-		DF0941010F63CB26002D821E /* verbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241E0E7BA6AB00F5680E /* verbs.cpp */; };
-		DF0941020F63CB26002D821E /* autoroute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424210E7BA6AB00F5680E /* autoroute.cpp */; };
-		DF0941030F63CB26002D821E /* compact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424230E7BA6AB00F5680E /* compact.cpp */; };
-		DF0941040F63CB26002D821E /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424250E7BA6AB00F5680E /* control.cpp */; };
-		DF0941050F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424270E7BA6AB00F5680E /* debug.cpp */; };
-		DF0941060F63CB26002D821E /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424290E7BA6AB00F5680E /* disk.cpp */; };
-		DF0941070F63CB26002D821E /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242B0E7BA6AB00F5680E /* grid.cpp */; };
-		DF0941080F63CB26002D821E /* hufftext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242D0E7BA6AB00F5680E /* hufftext.cpp */; };
-		DF0941090F63CB26002D821E /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242E0E7BA6AB00F5680E /* intro.cpp */; };
-		DF09410A0F63CB26002D821E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424300E7BA6AB00F5680E /* logic.cpp */; };
-		DF09410B0F63CB26002D821E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424330E7BA6AB00F5680E /* mouse.cpp */; };
-		DF09410C0F63CB26002D821E /* adlibchannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424360E7BA6AB00F5680E /* adlibchannel.cpp */; };
-		DF09410D0F63CB26002D821E /* adlibmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424380E7BA6AB00F5680E /* adlibmusic.cpp */; };
-		DF09410E0F63CB26002D821E /* gmchannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243A0E7BA6AB00F5680E /* gmchannel.cpp */; };
-		DF09410F0F63CB26002D821E /* gmmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243C0E7BA6AB00F5680E /* gmmusic.cpp */; };
-		DF0941100F63CB26002D821E /* mt32music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243E0E7BA6AB00F5680E /* mt32music.cpp */; };
-		DF0941110F63CB26002D821E /* musicbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424400E7BA6AB00F5680E /* musicbase.cpp */; };
-		DF0941120F63CB26002D821E /* rnc_deco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424420E7BA6AB00F5680E /* rnc_deco.cpp */; };
-		DF0941130F63CB26002D821E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424440E7BA6AB00F5680E /* screen.cpp */; };
-		DF0941140F63CB26002D821E /* sky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424460E7BA6AB00F5680E /* sky.cpp */; };
-		DF0941150F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424490E7BA6AB00F5680E /* sound.cpp */; };
-		DF0941160F63CB26002D821E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84244C0E7BA6AB00F5680E /* text.cpp */; };
-		DF0941170F63CB26002D821E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84244F0E7BA6AB00F5680E /* animation.cpp */; };
-		DF0941180F63CB26002D821E /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424520E7BA6AB00F5680E /* control.cpp */; };
-		DF0941190F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424560E7BA6AB00F5680E /* debug.cpp */; };
-		DF09411A0F63CB26002D821E /* eventman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424580E7BA6AB00F5680E /* eventman.cpp */; };
-		DF09411B0F63CB26002D821E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245A0E7BA6AB00F5680E /* logic.cpp */; };
-		DF09411C0F63CB26002D821E /* memman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245C0E7BA6AB00F5680E /* memman.cpp */; };
-		DF09411D0F63CB26002D821E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245E0E7BA6AB00F5680E /* menu.cpp */; };
-		DF09411E0F63CB26002D821E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424610E7BA6AB00F5680E /* mouse.cpp */; };
-		DF09411F0F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424630E7BA6AB00F5680E /* music.cpp */; };
-		DF0941200F63CB26002D821E /* objectman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424660E7BA6AB00F5680E /* objectman.cpp */; };
-		DF0941210F63CB26002D821E /* resman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424680E7BA6AB00F5680E /* resman.cpp */; };
-		DF0941220F63CB26002D821E /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246A0E7BA6AB00F5680E /* router.cpp */; };
-		DF0941230F63CB26002D821E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246C0E7BA6AB00F5680E /* screen.cpp */; };
-		DF0941240F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246E0E7BA6AB00F5680E /* sound.cpp */; };
-		DF0941250F63CB26002D821E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424700E7BA6AB00F5680E /* staticres.cpp */; };
-		DF0941260F63CB26002D821E /* sword1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424710E7BA6AB00F5680E /* sword1.cpp */; };
-		DF0941270F63CB26002D821E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424750E7BA6AB00F5680E /* text.cpp */; };
-		DF0941280F63CB26002D821E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424780E7BA6AB00F5680E /* animation.cpp */; };
-		DF0941290F63CB26002D821E /* anims.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247A0E7BA6AB00F5680E /* anims.cpp */; };
-		DF09412A0F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247B0E7BA6AB00F5680E /* console.cpp */; };
-		DF09412B0F63CB26002D821E /* controls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247D0E7BA6AB00F5680E /* controls.cpp */; };
-		DF09412C0F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247F0E7BA6AB00F5680E /* debug.cpp */; };
-		DF09412D0F63CB26002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424820E7BA6AB00F5680E /* events.cpp */; };
-		DF09412E0F63CB26002D821E /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424830E7BA6AB00F5680E /* function.cpp */; };
-		DF09412F0F63CB26002D821E /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424850E7BA6AB00F5680E /* icons.cpp */; };
-		DF0941300F63CB26002D821E /* interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424860E7BA6AB00F5680E /* interpreter.cpp */; };
-		DF0941310F63CB26002D821E /* layers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424880E7BA6AB00F5680E /* layers.cpp */; };
-		DF0941320F63CB26002D821E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424890E7BA6AB00F5680E /* logic.cpp */; };
-		DF0941330F63CB26002D821E /* maketext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248B0E7BA6AB00F5680E /* maketext.cpp */; };
-		DF0941340F63CB26002D821E /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248D0E7BA6AB00F5680E /* memory.cpp */; };
-		DF0941350F63CB26002D821E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248F0E7BA6AB00F5680E /* menu.cpp */; };
-		DF0941360F63CB26002D821E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424910E7BA6AB00F5680E /* mouse.cpp */; };
-		DF0941370F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424930E7BA6AB00F5680E /* music.cpp */; };
-		DF0941380F63CB26002D821E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424950E7BA6AB00F5680E /* palette.cpp */; };
-		DF0941390F63CB26002D821E /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424960E7BA6AB00F5680E /* protocol.cpp */; };
-		DF09413A0F63CB26002D821E /* render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424970E7BA6AB00F5680E /* render.cpp */; };
-		DF09413B0F63CB26002D821E /* resman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424980E7BA6AB00F5680E /* resman.cpp */; };
-		DF09413C0F63CB26002D821E /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249A0E7BA6AB00F5680E /* router.cpp */; };
-		DF09413D0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249C0E7BA6AB00F5680E /* saveload.cpp */; };
-		DF09413E0F63CB26002D821E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249E0E7BA6AB00F5680E /* screen.cpp */; };
-		DF09413F0F63CB26002D821E /* scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A00E7BA6AB00F5680E /* scroll.cpp */; };
-		DF0941400F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A10E7BA6AB00F5680E /* sound.cpp */; };
-		DF0941410F63CB26002D821E /* speech.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A30E7BA6AB00F5680E /* speech.cpp */; };
-		DF0941420F63CB26002D821E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A40E7BA6AB00F5680E /* sprite.cpp */; };
-		DF0941430F63CB26002D821E /* startup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A50E7BA6AB00F5680E /* startup.cpp */; };
-		DF0941440F63CB26002D821E /* sword2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A60E7BA6AB00F5680E /* sword2.cpp */; };
-		DF0941450F63CB26002D821E /* sync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A80E7BA6AB00F5680E /* sync.cpp */; };
-		DF0941460F63CB26002D821E /* walker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A90E7BA6AB00F5680E /* walker.cpp */; };
-		DF0941470F63CB26002D821E /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AB0E7BA6AB00F5680E /* actors.cpp */; };
-		DF0941480F63CB26002D821E /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AD0E7BA6AB00F5680E /* anim.cpp */; };
-		DF0941490F63CB26002D821E /* background.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AF0E7BA6AB00F5680E /* background.cpp */; };
-		DF09414A0F63CB26002D821E /* bg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B10E7BA6AB00F5680E /* bg.cpp */; };
-		DF09414B0F63CB26002D821E /* cliprect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B20E7BA6AB00F5680E /* cliprect.cpp */; };
-		DF09414C0F63CB26002D821E /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B40E7BA6AB00F5680E /* config.cpp */; };
-		DF09414D0F63CB26002D821E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B70E7BA6AB00F5680E /* cursor.cpp */; };
-		DF09414E0F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B90E7BA6AB00F5680E /* debugger.cpp */; };
-		DF09414F0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BB0E7BA6AB00F5680E /* detection.cpp */; };
-		DF0941500F63CB26002D821E /* effect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BD0E7BA6AB00F5680E /* effect.cpp */; };
-		DF0941510F63CB26002D821E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BE0E7BA6AB00F5680E /* events.cpp */; };
-		DF0941520F63CB26002D821E /* faders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C00E7BA6AB00F5680E /* faders.cpp */; };
-		DF0941530F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C30E7BA6AB00F5680E /* font.cpp */; };
-		DF0941540F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C50E7BA6AB00F5680E /* graphics.cpp */; };
-		DF0941550F63CB26002D821E /* handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C70E7BA6AB00F5680E /* handle.cpp */; };
-		DF0941560F63CB26002D821E /* heapmem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C90E7BA6AB00F5680E /* heapmem.cpp */; };
-		DF0941570F63CB26002D821E /* mareels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424CD0E7BA6AB00F5680E /* mareels.cpp */; };
-		DF0941580F63CB26002D821E /* move.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424CF0E7BA6AB00F5680E /* move.cpp */; };
-		DF0941590F63CB26002D821E /* multiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D10E7BA6AB00F5680E /* multiobj.cpp */; };
-		DF09415A0F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D30E7BA6AB00F5680E /* music.cpp */; };
-		DF09415B0F63CB26002D821E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D50E7BA6AB00F5680E /* object.cpp */; };
-		DF09415C0F63CB26002D821E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D70E7BA6AB00F5680E /* palette.cpp */; };
-		DF09415D0F63CB26002D821E /* pcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D90E7BA6AB00F5680E /* pcode.cpp */; };
-		DF09415E0F63CB26002D821E /* pdisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DB0E7BA6AB00F5680E /* pdisplay.cpp */; };
-		DF09415F0F63CB26002D821E /* play.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DD0E7BA6AB00F5680E /* play.cpp */; };
-		DF0941600F63CB26002D821E /* polygons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DE0E7BA6AB00F5680E /* polygons.cpp */; };
-		DF0941610F63CB26002D821E /* rince.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E00E7BA6AB00F5680E /* rince.cpp */; };
-		DF0941620F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E20E7BA6AB00F5680E /* saveload.cpp */; };
-		DF0941630F63CB26002D821E /* savescn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E30E7BA6AB00F5680E /* savescn.cpp */; };
-		DF0941640F63CB26002D821E /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E50E7BA6AB00F5680E /* scene.cpp */; };
-		DF0941650F63CB26002D821E /* sched.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E70E7BA6AB00F5680E /* sched.cpp */; };
-		DF0941660F63CB26002D821E /* scn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E90E7BA6AB00F5680E /* scn.cpp */; };
-		DF0941670F63CB26002D821E /* scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424EB0E7BA6AB00F5680E /* scroll.cpp */; };
-		DF0941680F63CB26002D821E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424EE0E7BA6AB00F5680E /* sound.cpp */; };
-		DF0941690F63CB26002D821E /* strres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F00E7BA6AB00F5680E /* strres.cpp */; };
-		DF09416A0F63CB26002D821E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F20E7BA6AB00F5680E /* text.cpp */; };
-		DF09416B0F63CB26002D821E /* timers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F40E7BA6AB00F5680E /* timers.cpp */; };
-		DF09416C0F63CB26002D821E /* tinlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F60E7BA6AB00F5680E /* tinlib.cpp */; };
-		DF09416D0F63CB26002D821E /* tinsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F80E7BA6AB00F5680E /* tinsel.cpp */; };
-		DF09416E0F63CB26002D821E /* token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FA0E7BA6AB00F5680E /* token.cpp */; };
-		DF09416F0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FD0E7BA6AB00F5680E /* detection.cpp */; };
-		DF0941700F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FE0E7BA6AB00F5680E /* graphics.cpp */; };
-		DF0941710F63CB26002D821E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425000E7BA6AB00F5680E /* menu.cpp */; };
-		DF0941720F63CB26002D821E /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425010E7BA6AB00F5680E /* midi.cpp */; };
-		DF0941730F63CB26002D821E /* opcodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425040E7BA6AB00F5680E /* opcodes.cpp */; };
-		DF0941740F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425050E7BA6AB00F5680E /* resource.cpp */; };
-		DF0941750F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425060E7BA6AB00F5680E /* saveload.cpp */; };
-		DF0941760F63CB26002D821E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425070E7BA6AB00F5680E /* staticres.cpp */; };
-		DF0941770F63CB26002D821E /* touche.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425080E7BA6AB00F5680E /* touche.cpp */; };
-		DF0941790F63CB26002D821E /* timidity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A3D0E7BBB5000F5680E /* timidity.cpp */; };
-		DF09417A0F63CB26002D821E /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; };
-		DF09417B0F63CB26002D821E /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; };
-		DF09417C0F63CB26002D821E /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; };
-		DF09417E0F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; };
-		DF09417F0F63CB26002D821E /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; };
-		DF0941800F63CB26002D821E /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; };
-		DF0941810F63CB26002D821E /* ThemeLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF80ED5FC77001CB19F /* ThemeLayout.cpp */; };
-		DF0941820F63CB26002D821E /* ThemeParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BFA0ED5FC77001CB19F /* ThemeParser.cpp */; };
-		DF0941830F63CB26002D821E /* thumbnail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C050ED5FCAF001CB19F /* thumbnail.cpp */; };
-		DF0941840F63CB26002D821E /* VectorRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C070ED5FCAF001CB19F /* VectorRenderer.cpp */; };
-		DF0941850F63CB26002D821E /* VectorRendererSpec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */; };
-		DF0941860F63CB26002D821E /* xmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C0F0ED5FCC2001CB19F /* xmlparser.cpp */; };
-		DF0941870F63CB26002D821E /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C510ED60067001CB19F /* game.cpp */; };
-		DF0941880F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFF50F0112AD003E9390 /* saveload.cpp */; };
-		DF0941890F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFF80F0112C1003E9390 /* detection.cpp */; };
-		DF09418A0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFFB0F0112DF003E9390 /* detection.cpp */; };
-		DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
-		DF09418C0F63CB26002D821E /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
-		DF0941920F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
-		DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
-		DF0941950F63CB26002D821E /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
-		DF0941960F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
-		DF0941970F63CB26002D821E /* drives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC220F4862520006E566 /* drives.cpp */; };
-		DF0941980F63CB26002D821E /* sysvar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC270F4862520006E566 /* sysvar.cpp */; };
-		DF0941990F63CB26002D821E /* gui_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC2E0F48628A0006E566 /* gui_lol.cpp */; };
-		DF09419A0F63CB26002D821E /* items_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC300F48628A0006E566 /* items_lol.cpp */; };
-		DF09419B0F63CB26002D821E /* script_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC310F48628A0006E566 /* script_lol.cpp */; };
-		DF09419C0F63CB26002D821E /* sequences_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC320F48628A0006E566 /* sequences_lol.cpp */; };
-		DF09419D0F63CB26002D821E /* sound_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC330F48628A0006E566 /* sound_midi.cpp */; };
-		DF09419E0F63CB26002D821E /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC360F48628A0006E566 /* util.cpp */; };
-		DF0941A20F63CB26002D821E /* scene_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC490F4863100006E566 /* scene_lol.cpp */; };
-		DF0941A30F63CB26002D821E /* advancedDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */; };
-		DF0941A40F63CB26002D821E /* base-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC5B0F4866E70006E566 /* base-backend.cpp */; };
-		DF0941A60F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC600F48672D0006E566 /* resource.cpp */; };
-		DF0941A70F63CB26002D821E /* resource_hrs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC620F48672D0006E566 /* resource_hrs.cpp */; };
-		DF0941A80F63CB26002D821E /* resource_res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC630F48672D0006E566 /* resource_res.cpp */; };
-		DF0941A90F63CB26002D821E /* resource_rsc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC640F48672D0006E566 /* resource_rsc.cpp */; };
-		DF0941AA0F63CB26002D821E /* sfuncs_ihnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC650F48672D0006E566 /* sfuncs_ihnm.cpp */; };
-		DF0941AB0F63CB26002D821E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC700F4867910006E566 /* debugger.cpp */; };
-		DF0941AC0F63CB26002D821E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC720F4867910006E566 /* staticres.cpp */; };
-		DF0941AD0F63CB26002D821E /* cell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCBD0F4870690006E566 /* cell.cpp */; };
-		DF0941AE0F63CB26002D821E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCBF0F4870690006E566 /* cursor.cpp */; };
-		DF0941AF0F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC10F4870690006E566 /* debug.cpp */; };
-		DF0941B00F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC30F4870690006E566 /* detection.cpp */; };
-		DF0941B10F63CB26002D821E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC40F4870690006E566 /* font.cpp */; };
-		DF0941B20F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC60F4870690006E566 /* graphics.cpp */; };
-		DF0941B30F63CB26002D821E /* groovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC80F4870690006E566 /* groovie.cpp */; };
-		DF0941B40F63CB26002D821E /* lzss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCA0F4870690006E566 /* lzss.cpp */; };
-		DF0941B50F63CB26002D821E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCD0F4870690006E566 /* music.cpp */; };
-		DF0941B60F63CB26002D821E /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCF0F4870690006E566 /* player.cpp */; };
-		DF0941B70F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD10F4870690006E566 /* resource.cpp */; };
-		DF0941B80F63CB26002D821E /* roq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD30F4870690006E566 /* roq.cpp */; };
-		DF0941B90F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD50F4870690006E566 /* saveload.cpp */; };
-		DF0941BA0F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD70F4870690006E566 /* script.cpp */; };
-		DF0941BB0F63CB26002D821E /* vdx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD90F4870690006E566 /* vdx.cpp */; };
-		DF0941BC0F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD050F4870E50006E566 /* detection.cpp */; };
-		DF0941BD0F63CB26002D821E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD060F4870E50006E566 /* graphics.cpp */; };
-		DF0941BE0F63CB26002D821E /* locations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD080F4870E50006E566 /* locations.cpp */; };
-		DF0941BF0F63CB26002D821E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0A0F4870E50006E566 /* resource.cpp */; };
-		DF0941C00F63CB26002D821E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0B0F4870E50006E566 /* saveload.cpp */; };
-		DF0941C10F63CB26002D821E /* sequences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0C0F4870E50006E566 /* sequences.cpp */; };
-		DF0941C20F63CB26002D821E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0D0F4870E50006E566 /* staticres.cpp */; };
-		DF0941C30F63CB26002D821E /* tucker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0E0F4870E50006E566 /* tucker.cpp */; };
-		DF0941C40F63CB26002D821E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301A0F48AF18005EF03C /* detection.cpp */; };
-		DF0941C60F63CB26002D821E /* gc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301E0F48AF18005EF03C /* gc.cpp */; };
-		DF0941C80F63CB26002D821E /* kernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830230F48AF18005EF03C /* kernel.cpp */; };
-		DF0941C90F63CB26002D821E /* kevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830260F48AF18005EF03C /* kevent.cpp */; };
-		DF0941CA0F63CB26002D821E /* kfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830270F48AF18005EF03C /* kfile.cpp */; };
-		DF0941CB0F63CB26002D821E /* kgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830280F48AF18005EF03C /* kgraphics.cpp */; };
-		DF0941CC0F63CB26002D821E /* klists.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830290F48AF18005EF03C /* klists.cpp */; };
-		DF0941CD0F63CB26002D821E /* kmath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302A0F48AF18005EF03C /* kmath.cpp */; };
-		DF0941CE0F63CB26002D821E /* kmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302B0F48AF18005EF03C /* kmenu.cpp */; };
-		DF0941CF0F63CB26002D821E /* kmovement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302C0F48AF18005EF03C /* kmovement.cpp */; };
-		DF0941D00F63CB26002D821E /* kpathing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302D0F48AF18005EF03C /* kpathing.cpp */; };
-		DF0941D10F63CB26002D821E /* kscripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302E0F48AF18005EF03C /* kscripts.cpp */; };
-		DF0941D20F63CB26002D821E /* ksound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302F0F48AF18005EF03C /* ksound.cpp */; };
-		DF0941D30F63CB26002D821E /* kstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830300F48AF18005EF03C /* kstring.cpp */; };
-		DF0941D40F63CB26002D821E /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830310F48AF18005EF03C /* message.cpp */; };
-		DF0941D60F63CB26002D821E /* savegame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830360F48AF18005EF03C /* savegame.cpp */; };
-		DF0941D80F63CB26002D821E /* scriptdebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830390F48AF18005EF03C /* scriptdebug.cpp */; };
-		DF0941D90F63CB26002D821E /* seg_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8303A0F48AF18005EF03C /* seg_manager.cpp */; };
-		DF0941DA0F63CB26002D821E /* vm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8303C0F48AF18005EF03C /* vm.cpp */; };
-		DF0941EC0F63CB26002D821E /* sci.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830960F48AF18005EF03C /* sci.cpp */; };
-		DF0942020F63CB26002D821E /* unzip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C10D81F4E800B6D1FB /* unzip.cpp */; };
-		DF0942030F63CB26002D821E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAD2390F50120E00C3A4E2 /* console.cpp */; };
-		DF0942090F63CB26002D821E /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573C010F5A81EA00961A72 /* state.cpp */; };
-		DF09420C0F63CB26002D821E /* exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBA0F5A85B300961A72 /* exec.cpp */; };
-		DF09420D0F63CB26002D821E /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; };
-		DF0942100F63CB26002D821E /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; };
-		DF0942110F63CB26002D821E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; };
-		DF0942150F63CB26002D821E /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; };
-		DF0942160F63CB26002D821E /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; };
-		DF0942170F63CB26002D821E /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; };
-		DF0942470F63CB9A002D821E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0942390F63CB9A002D821E /* main.cpp */; };
-		DF09424A0F63CB9A002D821E /* sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09423C0F63CB9A002D821E /* sdl.cpp */; };
-		DF0943730F63D1DA002D821E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; };
-		DF0943740F63D1DD002D821E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A180E7BB34E00F5680E /* Foundation.framework */; };
-		DF0943750F63D1DE002D821E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A270E7BB37500F5680E /* AudioToolbox.framework */; };
-		DF0944180F63FA8F002D821E /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0944170F63FA8F002D821E /* QuickTime.framework */; };
-		DF0944250F63FB2C002D821E /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0944240F63FB2C002D821E /* CoreMIDI.framework */; };
-		DF0944290F63FB60002D821E /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A160E7BB34E00F5680E /* CoreAudio.framework */; };
-		DF09442B0F63FB75002D821E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A2E0E7BB39E00F5680E /* QuartzCore.framework */; };
-		DF0944330F63FBB3002D821E /* coreaudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0944300F63FBB3002D821E /* coreaudio.cpp */; };
-		DF0944340F63FBB3002D821E /* coremidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0944310F63FBB3002D821E /* coremidi.cpp */; };
-		DF0944380F63FBFE002D821E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0944370F63FBFE002D821E /* Carbon.framework */; };
-		DF09446F0F63FCCB002D821E /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF09446D0F63FCCB002D821E /* ApplicationServices.framework */; };
-		DF0944700F63FCCB002D821E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF09446E0F63FCCB002D821E /* IOKit.framework */; };
-		DF0944780F63FD10002D821E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF0944770F63FD10002D821E /* Cocoa.framework */; };
-		DF0944800F63FD67002D821E /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF09447F0F63FD67002D821E /* AudioUnit.framework */; };
-		DF0944B10F6430ED002D821E /* scummvm.icns in Resources */ = {isa = PBXBuildFile; fileRef = DF0944B00F6430ED002D821E /* scummvm.icns */; };
-		DF09CC100FAC4E1900A5AFD7 /* batplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC070FAC4E1900A5AFD7 /* batplayer.cpp */; };
-		DF09CC110FAC4E1900A5AFD7 /* demoplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC090FAC4E1900A5AFD7 /* demoplayer.cpp */; };
-		DF09CC120FAC4E1900A5AFD7 /* scnplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0B0FAC4E1900A5AFD7 /* scnplayer.cpp */; };
-		DF09CC130FAC4E1900A5AFD7 /* draw_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0D0FAC4E1900A5AFD7 /* draw_fascin.cpp */; };
-		DF09CC150FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */; };
-		DF09CC160FAC4E1900A5AFD7 /* batplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC070FAC4E1900A5AFD7 /* batplayer.cpp */; };
-		DF09CC170FAC4E1900A5AFD7 /* demoplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC090FAC4E1900A5AFD7 /* demoplayer.cpp */; };
-		DF09CC180FAC4E1900A5AFD7 /* scnplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0B0FAC4E1900A5AFD7 /* scnplayer.cpp */; };
-		DF09CC190FAC4E1900A5AFD7 /* draw_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0D0FAC4E1900A5AFD7 /* draw_fascin.cpp */; };
-		DF09CC1B0FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */; };
-		DF09CC280FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */; };
-		DF09CC290FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */; };
-		DF09CC2A0FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */; };
-		DF09CC2B0FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */; };
-		DF0E303A1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; };
-		DF0E303B1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; };
-		DF0E303C1252C5BD0082D593 /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0E30391252C5BD0082D593 /* cms.cpp */; };
-		DF203F471380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; };
-		DF203F481380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; };
-		DF203F491380C06E0056300A /* gui-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F461380C06E0056300A /* gui-manager.cpp */; };
-		DF203F631380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; };
-		DF203F641380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; };
-		DF203F651380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; };
-		DF203F661380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; };
-		DF203F681380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; };
-		DF203F691380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; };
-		DF203F6A1380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; };
-		DF203F6B1380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; };
-		DF203F6C1380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; };
-		DF203F6D1380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; };
-		DF203F6E1380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; };
-		DF203F701380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; };
-		DF203F711380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; };
-		DF203F721380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; };
-		DF203F731380C2750056300A /* avi_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F531380C2740056300A /* avi_decoder.cpp */; };
-		DF203F741380C2750056300A /* coktel_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F551380C2740056300A /* coktel_decoder.cpp */; };
-		DF203F751380C2750056300A /* dxa_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F571380C2740056300A /* dxa_decoder.cpp */; };
-		DF203F761380C2750056300A /* flic_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F591380C2740056300A /* flic_decoder.cpp */; };
-		DF203F781380C2750056300A /* qt_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5D1380C2740056300A /* qt_decoder.cpp */; };
-		DF203F791380C2750056300A /* smk_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F5F1380C2750056300A /* smk_decoder.cpp */; };
-		DF203F7A1380C2750056300A /* video_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F611380C2750056300A /* video_decoder.cpp */; };
-		DF203F951380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; };
-		DF203F961380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; };
-		DF203F971380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; };
-		DF203F981380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; };
-		DF203F991380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; };
-		DF203F9A1380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; };
-		DF203F9C1380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; };
-		DF203F9D1380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; };
-		DF203F9E1380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; };
-		DF203F9F1380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; };
-		DF203FA01380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; };
-		DF203FA11380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; };
-		DF203FA21380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; };
-		DF203FA31380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; };
-		DF203FA41380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; };
-		DF203FA51380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; };
-		DF203FA71380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; };
-		DF203FA81380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; };
-		DF203FA91380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; };
-		DF203FAA1380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; };
-		DF203FAB1380C2920056300A /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7C1380C2920056300A /* cdtoons.cpp */; };
-		DF203FAC1380C2920056300A /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F7E1380C2920056300A /* cinepak.cpp */; };
-		DF203FAD1380C2920056300A /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F811380C2920056300A /* indeo3.cpp */; };
-		DF203FAE1380C2920056300A /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F831380C2920056300A /* mjpeg.cpp */; };
-		DF203FAF1380C2920056300A /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F851380C2920056300A /* msrle.cpp */; };
-		DF203FB01380C2920056300A /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F871380C2920056300A /* msvideo1.cpp */; };
-		DF203FB21380C2920056300A /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8C1380C2920056300A /* qtrle.cpp */; };
-		DF203FB31380C2920056300A /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F8E1380C2920056300A /* rpza.cpp */; };
-		DF203FB41380C2920056300A /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F901380C2920056300A /* smc.cpp */; };
-		DF203FB51380C2920056300A /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203F921380C2920056300A /* truemotion1.cpp */; };
-		DF203FD51380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; };
-		DF203FD61380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; };
-		DF203FD71380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; };
-		DF203FD81380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; };
-		DF203FD91380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; };
-		DF203FDA1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; };
-		DF203FDB1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; };
-		DF203FDC1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; };
-		DF203FDD1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; };
-		DF203FDE1380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; };
-		DF203FDF1380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; };
-		DF203FE01380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; };
-		DF203FE11380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; };
-		DF203FE21380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; };
-		DF203FE31380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; };
-		DF203FE41380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; };
-		DF203FE51380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; };
-		DF203FE61380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; };
-		DF203FE71380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; };
-		DF203FE81380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; };
-		DF203FE91380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; };
-		DF203FEA1380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; };
-		DF203FEB1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; };
-		DF203FEC1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; };
-		DF203FED1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; };
-		DF203FEE1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; };
-		DF203FEF1380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; };
-		DF203FF01380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; };
-		DF203FF11380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; };
-		DF203FF21380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; };
-		DF203FF31380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; };
-		DF203FF41380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; };
-		DF203FF51380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; };
-		DF203FF61380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; };
-		DF203FF71380C3BC0056300A /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC01380C3BC0056300A /* console.cpp */; };
-		DF203FF81380C3BC0056300A /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC21380C3BC0056300A /* dialogs.cpp */; };
-		DF203FF91380C3BC0056300A /* file_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC41380C3BC0056300A /* file_v1d.cpp */; };
-		DF203FFA1380C3BC0056300A /* file_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC51380C3BC0056300A /* file_v1w.cpp */; };
-		DF203FFB1380C3BC0056300A /* file_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC61380C3BC0056300A /* file_v2d.cpp */; };
-		DF203FFC1380C3BC0056300A /* file_v2w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC71380C3BC0056300A /* file_v2w.cpp */; };
-		DF203FFD1380C3BC0056300A /* file_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC81380C3BC0056300A /* file_v3d.cpp */; };
-		DF203FFE1380C3BC0056300A /* object_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FC91380C3BC0056300A /* object_v1d.cpp */; };
-		DF203FFF1380C3BC0056300A /* object_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCA1380C3BC0056300A /* object_v1w.cpp */; };
-		DF2040001380C3BC0056300A /* object_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCB1380C3BC0056300A /* object_v2d.cpp */; };
-		DF2040011380C3BC0056300A /* object_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCC1380C3BC0056300A /* object_v3d.cpp */; };
-		DF2040021380C3BC0056300A /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCD1380C3BC0056300A /* object.cpp */; };
-		DF2040031380C3BC0056300A /* parser_v1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FCF1380C3BC0056300A /* parser_v1d.cpp */; };
-		DF2040041380C3BC0056300A /* parser_v1w.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD01380C3BC0056300A /* parser_v1w.cpp */; };
-		DF2040051380C3BC0056300A /* parser_v2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD11380C3BC0056300A /* parser_v2d.cpp */; };
-		DF2040061380C3BC0056300A /* parser_v3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD21380C3BC0056300A /* parser_v3d.cpp */; };
-		DF2040071380C3BC0056300A /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF203FD31380C3BC0056300A /* text.cpp */; };
-		DF20402E1380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; };
-		DF20402F1380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; };
-		DF2040301380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; };
-		DF2040311380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; };
-		DF2040321380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; };
-		DF2040331380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; };
-		DF2040341380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; };
-		DF2040351380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; };
-		DF2040361380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; };
-		DF2040371380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; };
-		DF2040381380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; };
-		DF2040391380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; };
-		DF20403A1380C8B70056300A /* editable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040221380C8B70056300A /* editable.cpp */; };
-		DF20403B1380C8B70056300A /* edittext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040241380C8B70056300A /* edittext.cpp */; };
-		DF20403C1380C8B70056300A /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040261380C8B70056300A /* list.cpp */; };
-		DF20403D1380C8B70056300A /* popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040281380C8B70056300A /* popup.cpp */; };
-		DF20403E1380C8B70056300A /* scrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402A1380C8B70056300A /* scrollbar.cpp */; };
-		DF20403F1380C8B70056300A /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20402C1380C8B70056300A /* tab.cpp */; };
-		DF20405E1380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; };
-		DF20405F1380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; };
-		DF2040601380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; };
-		DF2040611380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; };
-		DF2040621380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; };
-		DF2040631380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; };
-		DF2040641380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; };
-		DF2040651380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; };
-		DF2040661380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; };
-		DF2040671380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; };
-		DF2040681380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; };
-		DF2040691380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; };
-		DF20406A1380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; };
-		DF20406B1380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; };
-		DF20406C1380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; };
-		DF20406D1380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; };
-		DF20406E1380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; };
-		DF20406F1380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; };
-		DF2040701380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; };
-		DF2040711380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; };
-		DF2040721380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; };
-		DF2040731380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; };
-		DF2040741380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; };
-		DF2040751380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; };
-		DF2040761380CA230056300A /* audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040471380CA230056300A /* audiostream.cpp */; };
-		DF2040771380CA230056300A /* fmopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040491380CA230056300A /* fmopl.cpp */; };
-		DF2040781380CA230056300A /* mididrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404B1380CA230056300A /* mididrv.cpp */; };
-		DF2040791380CA230056300A /* midiparser_smf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404D1380CA230056300A /* midiparser_smf.cpp */; };
-		DF20407A1380CA230056300A /* midiparser_xmidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404E1380CA230056300A /* midiparser_xmidi.cpp */; };
-		DF20407B1380CA230056300A /* midiparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20404F1380CA230056300A /* midiparser.cpp */; };
-		DF20407C1380CA230056300A /* midiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040511380CA230056300A /* midiplayer.cpp */; };
-		DF20407D1380CA230056300A /* mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040541380CA230056300A /* mixer.cpp */; };
-		DF20407E1380CA230056300A /* mpu401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040561380CA230056300A /* mpu401.cpp */; };
-		DF20407F1380CA230056300A /* musicplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040581380CA230056300A /* musicplugin.cpp */; };
-		DF2040801380CA230056300A /* rate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405A1380CA230056300A /* rate.cpp */; };
-		DF2040811380CA230056300A /* timestamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20405C1380CA230056300A /* timestamp.cpp */; };
-		DF20409A1380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; };
-		DF20409B1380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; };
-		DF20409C1380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; };
-		DF20409D1380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; };
-		DF20409E1380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; };
-		DF20409F1380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; };
-		DF2040A01380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; };
-		DF2040A11380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; };
-		DF2040A21380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; };
-		DF2040A31380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; };
-		DF2040A41380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; };
-		DF2040A51380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; };
-		DF2040A61380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; };
-		DF2040A71380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; };
-		DF2040A81380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; };
-		DF2040A91380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; };
-		DF2040AA1380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; };
-		DF2040AB1380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; };
-		DF2040AC1380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; };
-		DF2040AD1380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; };
-		DF2040AE1380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; };
-		DF2040AF1380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; };
-		DF2040B01380CA400056300A /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040841380CA400056300A /* adpcm.cpp */; };
-		DF2040B11380CA400056300A /* aiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040861380CA400056300A /* aiff.cpp */; };
-		DF2040B21380CA400056300A /* flac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040881380CA400056300A /* flac.cpp */; };
-		DF2040B31380CA400056300A /* iff_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408A1380CA400056300A /* iff_sound.cpp */; };
-		DF2040B41380CA400056300A /* mac_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408C1380CA400056300A /* mac_snd.cpp */; };
-		DF2040B51380CA400056300A /* mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF20408E1380CA400056300A /* mp3.cpp */; };
-		DF2040B61380CA400056300A /* raw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040901380CA400056300A /* raw.cpp */; };
-		DF2040B71380CA400056300A /* vag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040921380CA400056300A /* vag.cpp */; };
-		DF2040B81380CA400056300A /* voc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040941380CA400056300A /* voc.cpp */; };
-		DF2040B91380CA400056300A /* vorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040961380CA400056300A /* vorbis.cpp */; };
-		DF2040BA1380CA400056300A /* wave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040981380CA400056300A /* wave.cpp */; };
-		DF2040CC1380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; };
-		DF2040CD1380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; };
-		DF2040CE1380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; };
-		DF2040CF1380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; };
-		DF2040D01380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; };
-		DF2040D11380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; };
-		DF2040D21380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; };
-		DF2040D31380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; };
-		DF2040D41380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; };
-		DF2040D51380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; };
-		DF2040D61380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; };
-		DF2040D71380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; };
-		DF2040D81380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; };
-		DF2040D91380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; };
-		DF2040DA1380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; };
-		DF2040DB1380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; };
-		DF2040DC1380CA810056300A /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BC1380CA810056300A /* infogrames.cpp */; };
-		DF2040DD1380CA810056300A /* maxtrax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040BE1380CA810056300A /* maxtrax.cpp */; };
-		DF2040DE1380CA810056300A /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C01380CA810056300A /* module.cpp */; };
-		DF2040DF1380CA810056300A /* paula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C21380CA810056300A /* paula.cpp */; };
-		DF2040E01380CA810056300A /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C41380CA810056300A /* protracker.cpp */; };
-		DF2040E11380CA810056300A /* rjp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C61380CA810056300A /* rjp1.cpp */; };
-		DF2040E21380CA810056300A /* soundfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040C81380CA810056300A /* soundfx.cpp */; };
-		DF2040E31380CA810056300A /* tfmx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040CA1380CA810056300A /* tfmx.cpp */; };
-		DF2040F41380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; };
-		DF2040F51380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; };
-		DF2040F61380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; };
-		DF2040F71380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; };
-		DF2040F81380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; };
-		DF2040F91380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; };
-		DF2040FA1380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; };
-		DF2040FB1380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; };
-		DF2040FC1380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; };
-		DF2040FE1380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; };
-		DF2040FF1380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; };
-		DF2041001380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; };
-		DF2041011380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; };
-		DF2041021380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; };
-		DF2041031380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; };
-		DF2041041380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; };
-		DF2041051380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; };
-		DF2041061380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; };
-		DF2041081380CAA40056300A /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E51380CAA40056300A /* adlib.cpp */; };
-		DF2041091380CAA40056300A /* appleiigs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E61380CAA40056300A /* appleiigs.cpp */; };
-		DF20410A1380CAA40056300A /* cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E71380CAA40056300A /* cms.cpp */; };
-		DF20410B1380CAA40056300A /* eas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040E91380CAA40056300A /* eas.cpp */; };
-		DF20410C1380CAA40056300A /* fluidsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EB1380CAA40056300A /* fluidsynth.cpp */; };
-		DF20410D1380CAA40056300A /* mt32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EC1380CAA40056300A /* mt32.cpp */; };
-		DF20410E1380CAA40056300A /* pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040ED1380CAA40056300A /* pcspk.cpp */; };
-		DF20410F1380CAA40056300A /* sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040EF1380CAA40056300A /* sid.cpp */; };
-		DF2041101380CAA40056300A /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2040F11380CAA40056300A /* wave6581.cpp */; };
-		DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF224E020FB23BC500C8E453 /* OpenGLES.framework */; };
-		DF224E050FB23BC500C8E453 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF224E020FB23BC500C8E453 /* OpenGLES.framework */; };
-		DF2EC3E510E6490800765801 /* browser_osx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3E410E6490800765801 /* browser_osx.mm */; };
-		DF2EC3F810E64C0C00765801 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3F610E64C0C00765801 /* dialogs.cpp */; };
-		DF2EC3F910E64C0C00765801 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3F610E64C0C00765801 /* dialogs.cpp */; };
-		DF2EC3FA10E64C0C00765801 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3F610E64C0C00765801 /* dialogs.cpp */; };
-		DF2EC3FE10E64C4300765801 /* animator_tim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3FD10E64C4300765801 /* animator_tim.cpp */; };
-		DF2EC3FF10E64C4300765801 /* animator_tim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3FD10E64C4300765801 /* animator_tim.cpp */; };
-		DF2EC40010E64C4300765801 /* animator_tim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC3FD10E64C4300765801 /* animator_tim.cpp */; };
-		DF2EC40510E64C8000765801 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC40310E64C8000765801 /* event.cpp */; };
-		DF2EC40610E64C8000765801 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC40310E64C8000765801 /* event.cpp */; };
-		DF2EC40710E64C8000765801 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC40310E64C8000765801 /* event.cpp */; };
-		DF2EC50110E64D7C00765801 /* player_pce.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC4FD10E64D7C00765801 /* player_pce.cpp */; };
-		DF2EC50210E64D7C00765801 /* player_sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC4FF10E64D7C00765801 /* player_sid.cpp */; };
-		DF2EC50310E64D7C00765801 /* player_pce.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC4FD10E64D7C00765801 /* player_pce.cpp */; };
-		DF2EC50410E64D7C00765801 /* player_sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC4FF10E64D7C00765801 /* player_sid.cpp */; };
-		DF2EC50510E64D7C00765801 /* player_pce.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC4FD10E64D7C00765801 /* player_pce.cpp */; };
-		DF2EC50610E64D7C00765801 /* player_sid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC4FF10E64D7C00765801 /* player_sid.cpp */; };
-		DF2EC50B10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; };
-		DF2EC50C10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; };
-		DF2EC50D10E64DB300765801 /* textconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC50910E64DB300765801 /* textconsole.cpp */; };
-		DF2FFB930F485D890006E566 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
-		DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
-		DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
-		DF2FFC290F4862520006E566 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
-		DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
-		DF2FFC2B0F4862520006E566 /* drives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC220F4862520006E566 /* drives.cpp */; };
-		DF2FFC2C0F4862520006E566 /* sysvar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC270F4862520006E566 /* sysvar.cpp */; };
-		DF2FFC380F48628A0006E566 /* gui_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC2E0F48628A0006E566 /* gui_lol.cpp */; };
-		DF2FFC390F48628A0006E566 /* items_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC300F48628A0006E566 /* items_lol.cpp */; };
-		DF2FFC3A0F48628A0006E566 /* script_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC310F48628A0006E566 /* script_lol.cpp */; };
-		DF2FFC3B0F48628A0006E566 /* sequences_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC320F48628A0006E566 /* sequences_lol.cpp */; };
-		DF2FFC3C0F48628A0006E566 /* sound_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC330F48628A0006E566 /* sound_midi.cpp */; };
-		DF2FFC3E0F48628A0006E566 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC360F48628A0006E566 /* util.cpp */; };
-		DF2FFC4A0F4863100006E566 /* scene_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC490F4863100006E566 /* scene_lol.cpp */; };
-		DF2FFC4E0F4863560006E566 /* advancedDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */; };
-		DF2FFC5D0F4866E70006E566 /* base-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC5B0F4866E70006E566 /* base-backend.cpp */; };
-		DF2FFC670F48672D0006E566 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC600F48672D0006E566 /* resource.cpp */; };
-		DF2FFC680F48672D0006E566 /* resource_hrs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC620F48672D0006E566 /* resource_hrs.cpp */; };
-		DF2FFC690F48672D0006E566 /* resource_res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC630F48672D0006E566 /* resource_res.cpp */; };
-		DF2FFC6A0F48672D0006E566 /* resource_rsc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC640F48672D0006E566 /* resource_rsc.cpp */; };
-		DF2FFC6B0F48672D0006E566 /* sfuncs_ihnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC650F48672D0006E566 /* sfuncs_ihnm.cpp */; };
-		DF2FFC740F4867910006E566 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC700F4867910006E566 /* debugger.cpp */; };
-		DF2FFC750F4867910006E566 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC720F4867910006E566 /* staticres.cpp */; };
-		DF2FFCDB0F4870690006E566 /* cell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCBD0F4870690006E566 /* cell.cpp */; };
-		DF2FFCDC0F4870690006E566 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCBF0F4870690006E566 /* cursor.cpp */; };
-		DF2FFCDD0F4870690006E566 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC10F4870690006E566 /* debug.cpp */; };
-		DF2FFCDE0F4870690006E566 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC30F4870690006E566 /* detection.cpp */; };
-		DF2FFCDF0F4870690006E566 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC40F4870690006E566 /* font.cpp */; };
-		DF2FFCE00F4870690006E566 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC60F4870690006E566 /* graphics.cpp */; };
-		DF2FFCE10F4870690006E566 /* groovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC80F4870690006E566 /* groovie.cpp */; };
-		DF2FFCE20F4870690006E566 /* lzss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCA0F4870690006E566 /* lzss.cpp */; };
-		DF2FFCE40F4870690006E566 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCD0F4870690006E566 /* music.cpp */; };
-		DF2FFCE50F4870690006E566 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCF0F4870690006E566 /* player.cpp */; };
-		DF2FFCE60F4870690006E566 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD10F4870690006E566 /* resource.cpp */; };
-		DF2FFCE70F4870690006E566 /* roq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD30F4870690006E566 /* roq.cpp */; };
-		DF2FFCE80F4870690006E566 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD50F4870690006E566 /* saveload.cpp */; };
-		DF2FFCE90F4870690006E566 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD70F4870690006E566 /* script.cpp */; };
-		DF2FFCEA0F4870690006E566 /* vdx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD90F4870690006E566 /* vdx.cpp */; };
-		DF2FFD100F4870E50006E566 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD050F4870E50006E566 /* detection.cpp */; };
-		DF2FFD110F4870E50006E566 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD060F4870E50006E566 /* graphics.cpp */; };
-		DF2FFD120F4870E50006E566 /* locations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD080F4870E50006E566 /* locations.cpp */; };
-		DF2FFD140F4870E50006E566 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0A0F4870E50006E566 /* resource.cpp */; };
-		DF2FFD150F4870E50006E566 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0B0F4870E50006E566 /* saveload.cpp */; };
-		DF2FFD160F4870E50006E566 /* sequences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0C0F4870E50006E566 /* sequences.cpp */; };
-		DF2FFD170F4870E50006E566 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0D0F4870E50006E566 /* staticres.cpp */; };
-		DF2FFD180F4870E50006E566 /* tucker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0E0F4870E50006E566 /* tucker.cpp */; };
-		DF2FFD2B0F48717F0006E566 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD290F48717F0006E566 /* Default.png */; };
-		DF2FFD2C0F48717F0006E566 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD2A0F48717F0006E566 /* icon.png */; };
-		DF2FFD2D0F48719E0006E566 /* scummclassic.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFBDB0F485E480006E566 /* scummclassic.zip */; };
-		DF45B1CA116628A5009B85CC /* animate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B176116628A5009B85CC /* animate.cpp */; };
-		DF45B1CB116628A5009B85CC /* cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B178116628A5009B85CC /* cache.cpp */; };
-		DF45B1CC116628A5009B85CC /* compare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17A116628A5009B85CC /* compare.cpp */; };
-		DF45B1CD116628A5009B85CC /* controls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17C116628A5009B85CC /* controls.cpp */; };
-		DF45B1CE116628A5009B85CC /* coordadjuster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17E116628A5009B85CC /* coordadjuster.cpp */; };
-		DF45B1CF116628A5009B85CC /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B180116628A5009B85CC /* cursor.cpp */; };
-		DF45B1D0116628A5009B85CC /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B182116628A5009B85CC /* font.cpp */; };
-		DF45B1D4116628A5009B85CC /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18B116628A5009B85CC /* menu.cpp */; };
-		DF45B1D5116628A5009B85CC /* paint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18D116628A5009B85CC /* paint.cpp */; };
-		DF45B1D6116628A5009B85CC /* paint16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18F116628A5009B85CC /* paint16.cpp */; };
-		DF45B1D8116628A5009B85CC /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B193116628A5009B85CC /* palette.cpp */; };
-		DF45B1D9116628A5009B85CC /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B195116628A5009B85CC /* picture.cpp */; };
-		DF45B1DA116628A5009B85CC /* portrait.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B197116628A5009B85CC /* portrait.cpp */; };
-		DF45B1DB116628A5009B85CC /* ports.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B199116628A5009B85CC /* ports.cpp */; };
-		DF45B1DD116628A5009B85CC /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B19D116628A5009B85CC /* screen.cpp */; };
-		DF45B1DE116628A5009B85CC /* text16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B19F116628A5009B85CC /* text16.cpp */; };
-		DF45B1DF116628A5009B85CC /* transitions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A1116628A5009B85CC /* transitions.cpp */; };
-		DF45B1E0116628A5009B85CC /* view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A3116628A5009B85CC /* view.cpp */; };
-		DF45B1E1116628A5009B85CC /* grammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A6116628A5009B85CC /* grammar.cpp */; };
-		DF45B1E2116628A5009B85CC /* said.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A7116628A5009B85CC /* said.cpp */; };
-		DF45B1E4116628A5009B85CC /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A9116628A5009B85CC /* vocabulary.cpp */; };
-		DF45B1E5116628A5009B85CC /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1AC116628A5009B85CC /* audio.cpp */; };
-		DF45B1E6116628A5009B85CC /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1AF116628A5009B85CC /* adlib.cpp */; };
-		DF45B1E8116628A5009B85CC /* fb01.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B1116628A5009B85CC /* fb01.cpp */; };
-		DF45B1E9116628A5009B85CC /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B3116628A5009B85CC /* midi.cpp */; };
-		DF45B1EA116628A5009B85CC /* pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B5116628A5009B85CC /* pcjr.cpp */; };
-		DF45B1EF116628A5009B85CC /* midiparser_sci.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1BF116628A5009B85CC /* midiparser_sci.cpp */; };
-		DF45B1F0116628A5009B85CC /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C1116628A5009B85CC /* music.cpp */; };
-		DF45B1F1116628A5009B85CC /* soundcmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C3116628A5009B85CC /* soundcmd.cpp */; };
-		DF45B1F2116628A5009B85CC /* seq_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C6116628A5009B85CC /* seq_decoder.cpp */; };
-		DF45B1F4116628A5009B85CC /* animate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B176116628A5009B85CC /* animate.cpp */; };
-		DF45B1F5116628A5009B85CC /* cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B178116628A5009B85CC /* cache.cpp */; };
-		DF45B1F6116628A5009B85CC /* compare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17A116628A5009B85CC /* compare.cpp */; };
-		DF45B1F7116628A5009B85CC /* controls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17C116628A5009B85CC /* controls.cpp */; };
-		DF45B1F8116628A5009B85CC /* coordadjuster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17E116628A5009B85CC /* coordadjuster.cpp */; };
-		DF45B1F9116628A5009B85CC /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B180116628A5009B85CC /* cursor.cpp */; };
-		DF45B1FA116628A5009B85CC /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B182116628A5009B85CC /* font.cpp */; };
-		DF45B1FE116628A5009B85CC /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18B116628A5009B85CC /* menu.cpp */; };
-		DF45B1FF116628A5009B85CC /* paint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18D116628A5009B85CC /* paint.cpp */; };
-		DF45B200116628A5009B85CC /* paint16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18F116628A5009B85CC /* paint16.cpp */; };
-		DF45B202116628A5009B85CC /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B193116628A5009B85CC /* palette.cpp */; };
-		DF45B203116628A5009B85CC /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B195116628A5009B85CC /* picture.cpp */; };
-		DF45B204116628A5009B85CC /* portrait.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B197116628A5009B85CC /* portrait.cpp */; };
-		DF45B205116628A5009B85CC /* ports.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B199116628A5009B85CC /* ports.cpp */; };
-		DF45B207116628A5009B85CC /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B19D116628A5009B85CC /* screen.cpp */; };
-		DF45B208116628A5009B85CC /* text16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B19F116628A5009B85CC /* text16.cpp */; };
-		DF45B209116628A5009B85CC /* transitions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A1116628A5009B85CC /* transitions.cpp */; };
-		DF45B20A116628A5009B85CC /* view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A3116628A5009B85CC /* view.cpp */; };
-		DF45B20B116628A5009B85CC /* grammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A6116628A5009B85CC /* grammar.cpp */; };
-		DF45B20C116628A5009B85CC /* said.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A7116628A5009B85CC /* said.cpp */; };
-		DF45B20E116628A5009B85CC /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A9116628A5009B85CC /* vocabulary.cpp */; };
-		DF45B20F116628A5009B85CC /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1AC116628A5009B85CC /* audio.cpp */; };
-		DF45B210116628A5009B85CC /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1AF116628A5009B85CC /* adlib.cpp */; };
-		DF45B212116628A5009B85CC /* fb01.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B1116628A5009B85CC /* fb01.cpp */; };
-		DF45B213116628A5009B85CC /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B3116628A5009B85CC /* midi.cpp */; };
-		DF45B214116628A5009B85CC /* pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B5116628A5009B85CC /* pcjr.cpp */; };
-		DF45B219116628A5009B85CC /* midiparser_sci.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1BF116628A5009B85CC /* midiparser_sci.cpp */; };
-		DF45B21A116628A5009B85CC /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C1116628A5009B85CC /* music.cpp */; };
-		DF45B21B116628A5009B85CC /* soundcmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C3116628A5009B85CC /* soundcmd.cpp */; };
-		DF45B21C116628A5009B85CC /* seq_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C6116628A5009B85CC /* seq_decoder.cpp */; };
-		DF45B21E116628A5009B85CC /* animate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B176116628A5009B85CC /* animate.cpp */; };
-		DF45B21F116628A5009B85CC /* cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B178116628A5009B85CC /* cache.cpp */; };
-		DF45B220116628A5009B85CC /* compare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17A116628A5009B85CC /* compare.cpp */; };
-		DF45B221116628A5009B85CC /* controls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17C116628A5009B85CC /* controls.cpp */; };
-		DF45B222116628A5009B85CC /* coordadjuster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B17E116628A5009B85CC /* coordadjuster.cpp */; };
-		DF45B223116628A5009B85CC /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B180116628A5009B85CC /* cursor.cpp */; };
-		DF45B224116628A5009B85CC /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B182116628A5009B85CC /* font.cpp */; };
-		DF45B228116628A5009B85CC /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18B116628A5009B85CC /* menu.cpp */; };
-		DF45B229116628A5009B85CC /* paint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18D116628A5009B85CC /* paint.cpp */; };
-		DF45B22A116628A5009B85CC /* paint16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B18F116628A5009B85CC /* paint16.cpp */; };
-		DF45B22C116628A5009B85CC /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B193116628A5009B85CC /* palette.cpp */; };
-		DF45B22D116628A5009B85CC /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B195116628A5009B85CC /* picture.cpp */; };
-		DF45B22E116628A5009B85CC /* portrait.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B197116628A5009B85CC /* portrait.cpp */; };
-		DF45B22F116628A5009B85CC /* ports.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B199116628A5009B85CC /* ports.cpp */; };
-		DF45B231116628A5009B85CC /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B19D116628A5009B85CC /* screen.cpp */; };
-		DF45B232116628A5009B85CC /* text16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B19F116628A5009B85CC /* text16.cpp */; };
-		DF45B233116628A5009B85CC /* transitions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A1116628A5009B85CC /* transitions.cpp */; };
-		DF45B234116628A5009B85CC /* view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A3116628A5009B85CC /* view.cpp */; };
-		DF45B235116628A5009B85CC /* grammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A6116628A5009B85CC /* grammar.cpp */; };
-		DF45B236116628A5009B85CC /* said.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A7116628A5009B85CC /* said.cpp */; };
-		DF45B238116628A5009B85CC /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1A9116628A5009B85CC /* vocabulary.cpp */; };
-		DF45B239116628A5009B85CC /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1AC116628A5009B85CC /* audio.cpp */; };
-		DF45B23A116628A5009B85CC /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1AF116628A5009B85CC /* adlib.cpp */; };
-		DF45B23C116628A5009B85CC /* fb01.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B1116628A5009B85CC /* fb01.cpp */; };
-		DF45B23D116628A5009B85CC /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B3116628A5009B85CC /* midi.cpp */; };
-		DF45B23E116628A5009B85CC /* pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1B5116628A5009B85CC /* pcjr.cpp */; };
-		DF45B243116628A5009B85CC /* midiparser_sci.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1BF116628A5009B85CC /* midiparser_sci.cpp */; };
-		DF45B244116628A5009B85CC /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C1116628A5009B85CC /* music.cpp */; };
-		DF45B245116628A5009B85CC /* soundcmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C3116628A5009B85CC /* soundcmd.cpp */; };
-		DF45B246116628A5009B85CC /* seq_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF45B1C6116628A5009B85CC /* seq_decoder.cpp */; };
-		DF46B6F31381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; };
-		DF46B6F41381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; };
-		DF46B6F51381E18900D08723 /* coroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F21381E18900D08723 /* coroutine.cpp */; };
-		DF46B6FF1381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; };
-		DF46B7001381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; };
-		DF46B7011381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; };
-		DF46B7021381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; };
-		DF46B7031381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; };
-		DF46B7041381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; };
-		DF46B7051381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; };
-		DF46B7061381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; };
-		DF46B7071381E1FF00D08723 /* towns_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F71381E1FF00D08723 /* towns_audio.cpp */; };
-		DF46B7081381E1FF00D08723 /* towns_euphony.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */; };
-		DF46B7091381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */; };
-		DF46B70A1381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */; };
-		DF46B7191381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; };
-		DF46B71A1381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; };
-		DF46B71B1381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; };
-		DF46B71C1381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; };
-		DF46B71D1381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; };
-		DF46B71E1381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; };
-		DF46B71F1381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; };
-		DF46B7201381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; };
-		DF46B7211381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; };
-		DF46B7221381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; };
-		DF46B7231381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; };
-		DF46B7241381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; };
-		DF46B7251381E27000D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B70F1381E27000D08723 /* console.cpp */; };
-		DF46B7261381E27000D08723 /* databases.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7111381E27000D08723 /* databases.cpp */; };
-		DF46B7271381E27000D08723 /* dbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7131381E27000D08723 /* dbase.cpp */; };
-		DF46B7281381E27000D08723 /* iniconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7151381E27000D08723 /* iniconfig.cpp */; };
-		DF46B7291381E27000D08723 /* init_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7171381E27000D08723 /* init_v7.cpp */; };
-		DF46B72A1381E27000D08723 /* inter_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7181381E27000D08723 /* inter_inca2.cpp */; };
-		DF46B7441381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; };
-		DF46B7451381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; };
-		DF46B7461381E40500D08723 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7421381E40500D08723 /* log.cpp */; };
-		DF46B7491381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; };
-		DF46B74A1381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; };
-		DF46B74B1381E40F00D08723 /* modular-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7471381E40F00D08723 /* modular-backend.cpp */; };
-		DF46B7541381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; };
-		DF46B7551381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; };
-		DF46B7561381E46700D08723 /* player_v2base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7511381E46700D08723 /* player_v2base.cpp */; };
-		DF46B75E1381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; };
-		DF46B75F1381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; };
-		DF46B7601381E4A400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B75B1381E4A400D08723 /* console.cpp */; };
-		DF46B7631381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; };
-		DF46B7641381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; };
-		DF46B7651381E4D400D08723 /* robot_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7611381E4D400D08723 /* robot_decoder.cpp */; };
-		DF46B7671381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; };
-		DF46B7681381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; };
-		DF46B7691381E4E400D08723 /* vm_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7661381E4E400D08723 /* vm_types.cpp */; };
-		DF46B77B1381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; };
-		DF46B77C1381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; };
-		DF46B77D1381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; };
-		DF46B77E1381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; };
-		DF46B77F1381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; };
-		DF46B7801381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; };
-		DF46B7811381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; };
-		DF46B7821381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; };
-		DF46B7831381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; };
-		DF46B7841381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; };
-		DF46B7851381E54200D08723 /* dcl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B76F1381E54200D08723 /* dcl.cpp */; };
-		DF46B7861381E54200D08723 /* iff_container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7721381E54200D08723 /* iff_container.cpp */; };
-		DF46B7871381E54200D08723 /* winexe_ne.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7751381E54200D08723 /* winexe_ne.cpp */; };
-		DF46B7881381E54200D08723 /* winexe_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7771381E54200D08723 /* winexe_pe.cpp */; };
-		DF46B7891381E54200D08723 /* winexe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7791381E54200D08723 /* winexe.cpp */; };
-		DF46B7931381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; };
-		DF46B7941381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; };
-		DF46B7951381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; };
-		DF46B7961381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; };
-		DF46B7971381E58000D08723 /* png.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B78F1381E58000D08723 /* png.cpp */; };
-		DF46B7981381E58000D08723 /* wincursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7911381E58000D08723 /* wincursor.cpp */; };
-		DF46B79F1381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; };
-		DF46B7A01381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; };
-		DF46B7A11381E5B500D08723 /* winfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B79D1381E5B500D08723 /* winfont.cpp */; };
-		DF46B7A51381E5D900D08723 /* sdl-timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A31381E5D900D08723 /* sdl-timer.cpp */; };
-		DF46B7A91381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; };
-		DF46B7AA1381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; };
-		DF46B7AB1381E5F100D08723 /* header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7A81381E5F100D08723 /* header.cpp */; };
-		DF46B7B41381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; };
-		DF46B7B51381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; };
-		DF46B7B61381E67800D08723 /* sdl-mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7B21381E67800D08723 /* sdl-mutex.cpp */; };
-		DF46B7BD1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; };
-		DF46B7BE1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; };
-		DF46B7BF1381E6C000D08723 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7BB1381E6C000D08723 /* object.cpp */; };
-		DF46B7C81381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; };
-		DF46B7C91381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; };
-		DF46B7CA1381E72500D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7C61381E72500D08723 /* console.cpp */; };
-		DF46B7CF1381E76300D08723 /* sdl-events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7CD1381E76300D08723 /* sdl-events.cpp */; };
-		DF46B7D61381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; };
-		DF46B7D71381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; };
-		DF46B7D81381E7C600D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B7D41381E7C600D08723 /* console.cpp */; };
-		DF46B83C1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; };
-		DF46B83D1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; };
-		DF46B83E1381F13500D08723 /* saveload_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B83B1381F13500D08723 /* saveload_v7.cpp */; };
-		DF46B8441381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; };
-		DF46B8451381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; };
-		DF46B8461381F35500D08723 /* saveload_inca2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8431381F35500D08723 /* saveload_inca2.cpp */; };
-		DF46B8481381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; };
-		DF46B8491381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; };
-		DF46B84A1381F38700D08723 /* inter_v7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8471381F38700D08723 /* inter_v7.cpp */; };
-		DF46B84D1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; };
-		DF46B84E1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; };
-		DF46B84F1381F39E00D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B84B1381F39E00D08723 /* console.cpp */; };
-		DF46B8521381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; };
-		DF46B8531381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; };
-		DF46B8541381F3B400D08723 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8501381F3B400D08723 /* console.cpp */; };
-		DF46B8601381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; };
-		DF46B8611381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; };
-		DF46B8621381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; };
-		DF46B8631381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; };
-		DF46B8641381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; };
-		DF46B8651381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; };
-		DF46B8661381F44E00D08723 /* dbopl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85A1381F44E00D08723 /* dbopl.cpp */; };
-		DF46B8671381F44E00D08723 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85C1381F44E00D08723 /* dosbox.cpp */; };
-		DF46B8681381F44E00D08723 /* mame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B85E1381F44E00D08723 /* mame.cpp */; };
-		DF46B8711381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; };
-		DF46B8721381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; };
-		DF46B8731381F4A200D08723 /* sdl-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */; };
-		DF46B87D1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; };
-		DF46B87E1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; };
-		DF46B87F1381F4F200D08723 /* default-audiocd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B87B1381F4F200D08723 /* default-audiocd.cpp */; };
-		DF46B8891381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; };
-		DF46B88A1381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; };
-		DF46B88B1381F5D800D08723 /* sdl-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8871381F5D800D08723 /* sdl-provider.cpp */; };
-		DF46B8921381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; };
-		DF46B8931381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; };
-		DF46B8941381F62B00D08723 /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8901381F62B00D08723 /* adpcm.cpp */; };
-		DF46B89B1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; };
-		DF46B89C1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; };
-		DF46B89D1381F6C400D08723 /* null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF46B8991381F6C400D08723 /* null.cpp */; };
-		DF573C080F5A81EA00961A72 /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573C010F5A81EA00961A72 /* state.cpp */; };
-		DF573CBB0F5A85B300961A72 /* exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBA0F5A85B300961A72 /* exec.cpp */; };
-		DF573CBE0F5A85E100961A72 /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; };
-		DF5CEB290F75535000DEA624 /* sound_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB260F75535000DEA624 /* sound_br.cpp */; };
-		DF5CEB2A0F75535000DEA624 /* sound_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB270F75535000DEA624 /* sound_ns.cpp */; };
-		DF5CEB2C0F75535000DEA624 /* sound_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB260F75535000DEA624 /* sound_br.cpp */; };
-		DF5CEB2D0F75535000DEA624 /* sound_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB270F75535000DEA624 /* sound_ns.cpp */; };
-		DF5CEB310F75538000DEA624 /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB2F0F75538000DEA624 /* protracker.cpp */; };
-		DF5CEB320F75538000DEA624 /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB2F0F75538000DEA624 /* protracker.cpp */; };
-		DF61183C0FE3A8080042AD3F /* kmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118380FE3A8080042AD3F /* kmisc.cpp */; };
-		DF61183D0FE3A8080042AD3F /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* segment.cpp */; };
-		DF61183E0FE3A8080042AD3F /* kmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118380FE3A8080042AD3F /* kmisc.cpp */; };
-		DF61183F0FE3A8080042AD3F /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* segment.cpp */; };
-		DF6118400FE3A8080042AD3F /* kmisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118380FE3A8080042AD3F /* kmisc.cpp */; };
-		DF6118410FE3A8080042AD3F /* segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118390FE3A8080042AD3F /* segment.cpp */; };
-		DF6118490FE3A8250042AD3F /* decompressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118430FE3A8250042AD3F /* decompressor.cpp */; };
-		DF61184A0FE3A8250042AD3F /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118450FE3A8250042AD3F /* resource.cpp */; };
-		DF61184C0FE3A8250042AD3F /* decompressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118430FE3A8250042AD3F /* decompressor.cpp */; };
-		DF61184D0FE3A8250042AD3F /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118450FE3A8250042AD3F /* resource.cpp */; };
-		DF61184F0FE3A8250042AD3F /* decompressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118430FE3A8250042AD3F /* decompressor.cpp */; };
-		DF6118500FE3A8250042AD3F /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118450FE3A8250042AD3F /* resource.cpp */; };
-		DF6118550FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; };
-		DF6118560FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; };
-		DF6118570FE3A8990042AD3F /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118540FE3A8990042AD3F /* disk.cpp */; };
-		DF6118890FE3A9AA0042AD3F /* saveconverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */; };
-		DF61188A0FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; };
-		DF61188B0FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; };
-		DF61188C0FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; };
-		DF61188E0FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; };
-		DF61188F0FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; };
-		DF6118900FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; };
-		DF6118910FE3A9AA0042AD3F /* saveload_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118850FE3A9AA0042AD3F /* saveload_v2.cpp */; };
-		DF6118920FE3A9AA0042AD3F /* saveload_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118860FE3A9AA0042AD3F /* saveload_v3.cpp */; };
-		DF6118930FE3A9AA0042AD3F /* saveload_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118870FE3A9AA0042AD3F /* saveload_v4.cpp */; };
-		DF6118940FE3A9AA0042AD3F /* saveload_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118880FE3A9AA0042AD3F /* saveload_v6.cpp */; };
-		DF6118950FE3A9AA0042AD3F /* saveconverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */; };
-		DF6118960FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; };
-		DF6118970FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; };
-		DF6118980FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; };
-		DF61189A0FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; };
-		DF61189B0FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; };
-		DF61189C0FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; };
-		DF61189D0FE3A9AA0042AD3F /* saveload_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118850FE3A9AA0042AD3F /* saveload_v2.cpp */; };
-		DF61189E0FE3A9AA0042AD3F /* saveload_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118860FE3A9AA0042AD3F /* saveload_v3.cpp */; };
-		DF61189F0FE3A9AA0042AD3F /* saveload_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118870FE3A9AA0042AD3F /* saveload_v4.cpp */; };
-		DF6118A00FE3A9AA0042AD3F /* saveload_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118880FE3A9AA0042AD3F /* saveload_v6.cpp */; };
-		DF6118A10FE3A9AA0042AD3F /* saveconverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */; };
-		DF6118A20FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */; };
-		DF6118A30FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */; };
-		DF6118A40FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */; };
-		DF6118A60FE3A9AA0042AD3F /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF61187F0FE3A9AA0042AD3F /* savefile.cpp */; };
-		DF6118A70FE3A9AA0042AD3F /* savehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118810FE3A9AA0042AD3F /* savehandler.cpp */; };
-		DF6118A80FE3A9AA0042AD3F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118830FE3A9AA0042AD3F /* saveload.cpp */; };
-		DF6118A90FE3A9AA0042AD3F /* saveload_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118850FE3A9AA0042AD3F /* saveload_v2.cpp */; };
-		DF6118AA0FE3A9AA0042AD3F /* saveload_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118860FE3A9AA0042AD3F /* saveload_v3.cpp */; };
-		DF6118AB0FE3A9AA0042AD3F /* saveload_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118870FE3A9AA0042AD3F /* saveload_v4.cpp */; };
-		DF6118AC0FE3A9AA0042AD3F /* saveload_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118880FE3A9AA0042AD3F /* saveload_v6.cpp */; };
-		DF6118AF0FE3A9EA0042AD3F /* feeble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118AE0FE3A9EA0042AD3F /* feeble.cpp */; };
-		DF6118B00FE3A9EA0042AD3F /* feeble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118AE0FE3A9EA0042AD3F /* feeble.cpp */; };
-		DF6118B10FE3A9EA0042AD3F /* feeble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118AE0FE3A9EA0042AD3F /* feeble.cpp */; };
-		DF6118B80FE3AA280042AD3F /* saveload_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B30FE3AA280042AD3F /* saveload_lol.cpp */; };
-		DF6118B90FE3AA280042AD3F /* sound_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B40FE3AA280042AD3F /* sound_lol.cpp */; };
-		DF6118BA0FE3AA280042AD3F /* sound_pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B50FE3AA280042AD3F /* sound_pcspk.cpp */; };
-		DF6118BB0FE3AA280042AD3F /* text_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B60FE3AA280042AD3F /* text_lol.cpp */; };
-		DF6118BC0FE3AA280042AD3F /* saveload_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B30FE3AA280042AD3F /* saveload_lol.cpp */; };
-		DF6118BD0FE3AA280042AD3F /* sound_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B40FE3AA280042AD3F /* sound_lol.cpp */; };
-		DF6118BE0FE3AA280042AD3F /* sound_pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B50FE3AA280042AD3F /* sound_pcspk.cpp */; };
-		DF6118BF0FE3AA280042AD3F /* text_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B60FE3AA280042AD3F /* text_lol.cpp */; };
-		DF6118C00FE3AA280042AD3F /* saveload_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B30FE3AA280042AD3F /* saveload_lol.cpp */; };
-		DF6118C10FE3AA280042AD3F /* sound_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B40FE3AA280042AD3F /* sound_lol.cpp */; };
-		DF6118C20FE3AA280042AD3F /* sound_pcspk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B50FE3AA280042AD3F /* sound_pcspk.cpp */; };
-		DF6118C30FE3AA280042AD3F /* text_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118B60FE3AA280042AD3F /* text_lol.cpp */; };
-		DF6118C70FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; };
-		DF6118C80FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; };
-		DF6118C90FE3AABD0042AD3F /* player_v2cms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */; };
-		DF6118CC0FE3AAFD0042AD3F /* hardwarekeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */; };
-		DF6BF4C410529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; };
-		DF6BF4C510529DA50069811F /* jpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C210529DA50069811F /* jpeg.cpp */; };
-		DF6BF4C610529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; };
-		DF6BF4C710529DA50069811F /* jpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C210529DA50069811F /* jpeg.cpp */; };
-		DF6BF4C810529DA50069811F /* conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C010529DA50069811F /* conversion.cpp */; };
-		DF6BF4C910529DA50069811F /* jpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4C210529DA50069811F /* jpeg.cpp */; };
-		DF6BF4D810529DE90069811F /* input_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D510529DE90069811F /* input_pn.cpp */; };
-		DF6BF4D910529DE90069811F /* string_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D610529DE90069811F /* string_pn.cpp */; };
-		DF6BF4DA10529DE90069811F /* verb_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D710529DE90069811F /* verb_pn.cpp */; };
-		DF6BF4DB10529DE90069811F /* input_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D510529DE90069811F /* input_pn.cpp */; };
-		DF6BF4DC10529DE90069811F /* string_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D610529DE90069811F /* string_pn.cpp */; };
-		DF6BF4DD10529DE90069811F /* verb_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D710529DE90069811F /* verb_pn.cpp */; };
-		DF6BF4DE10529DE90069811F /* input_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D510529DE90069811F /* input_pn.cpp */; };
-		DF6BF4DF10529DE90069811F /* string_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D610529DE90069811F /* string_pn.cpp */; };
-		DF6BF4E010529DE90069811F /* verb_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4D710529DE90069811F /* verb_pn.cpp */; };
-		DF6BF4E410529E260069811F /* sound_amiga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E310529E260069811F /* sound_amiga.cpp */; };
-		DF6BF4E510529E260069811F /* sound_amiga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E310529E260069811F /* sound_amiga.cpp */; };
-		DF6BF4E610529E260069811F /* sound_amiga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E310529E260069811F /* sound_amiga.cpp */; };
-		DF6BF4EA10529E6E0069811F /* init_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E810529E6E0069811F /* init_v4.cpp */; };
-		DF6BF4EB10529E6E0069811F /* inter_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E910529E6E0069811F /* inter_playtoons.cpp */; };
-		DF6BF4EC10529E6E0069811F /* init_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E810529E6E0069811F /* init_v4.cpp */; };
-		DF6BF4ED10529E6E0069811F /* inter_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E910529E6E0069811F /* inter_playtoons.cpp */; };
-		DF6BF4EE10529E6E0069811F /* init_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E810529E6E0069811F /* init_v4.cpp */; };
-		DF6BF4EF10529E6E0069811F /* inter_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4E910529E6E0069811F /* inter_playtoons.cpp */; };
-		DF6BF4F310529EE40069811F /* player_v4a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F110529EE40069811F /* player_v4a.cpp */; };
-		DF6BF4F410529EE40069811F /* player_v4a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F110529EE40069811F /* player_v4a.cpp */; };
-		DF6BF4F510529EE40069811F /* player_v4a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F110529EE40069811F /* player_v4a.cpp */; };
-		DF6BF4FC10529F140069811F /* EventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F710529F140069811F /* EventDispatcher.cpp */; };
-		DF6BF4FD10529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; };
-		DF6BF4FE10529F140069811F /* EventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F710529F140069811F /* EventDispatcher.cpp */; };
-		DF6BF4FF10529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; };
-		DF6BF50010529F140069811F /* EventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F710529F140069811F /* EventDispatcher.cpp */; };
-		DF6BF50110529F140069811F /* EventRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6BF4F810529F140069811F /* EventRecorder.cpp */; };
-		DF7585CE100CB66E00CC3324 /* expression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C3100CB66E00CC3324 /* expression.cpp */; };
-		DF7585CF100CB66E00CC3324 /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C5100CB66E00CC3324 /* hotspots.cpp */; };
-		DF7585D0100CB66E00CC3324 /* init_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C7100CB66E00CC3324 /* init_v6.cpp */; };
-		DF7585D1100CB66E00CC3324 /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C8100CB66E00CC3324 /* resources.cpp */; };
-		DF7585D2100CB66E00CC3324 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585CA100CB66E00CC3324 /* script.cpp */; };
-		DF7585D3100CB66E00CC3324 /* totfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585CC100CB66E00CC3324 /* totfile.cpp */; };
-		DF7585D4100CB66E00CC3324 /* expression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C3100CB66E00CC3324 /* expression.cpp */; };
-		DF7585D5100CB66E00CC3324 /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C5100CB66E00CC3324 /* hotspots.cpp */; };
-		DF7585D6100CB66E00CC3324 /* init_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C7100CB66E00CC3324 /* init_v6.cpp */; };
-		DF7585D7100CB66E00CC3324 /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C8100CB66E00CC3324 /* resources.cpp */; };
-		DF7585D8100CB66E00CC3324 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585CA100CB66E00CC3324 /* script.cpp */; };
-		DF7585D9100CB66E00CC3324 /* totfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585CC100CB66E00CC3324 /* totfile.cpp */; };
-		DF7585DA100CB66E00CC3324 /* expression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C3100CB66E00CC3324 /* expression.cpp */; };
-		DF7585DB100CB66E00CC3324 /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C5100CB66E00CC3324 /* hotspots.cpp */; };
-		DF7585DC100CB66E00CC3324 /* init_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C7100CB66E00CC3324 /* init_v6.cpp */; };
-		DF7585DD100CB66E00CC3324 /* resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585C8100CB66E00CC3324 /* resources.cpp */; };
-		DF7585DE100CB66E00CC3324 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585CA100CB66E00CC3324 /* script.cpp */; };
-		DF7585DF100CB66E00CC3324 /* totfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585CC100CB66E00CC3324 /* totfile.cpp */; };
-		DF7585EC100CB6EA00CC3324 /* sjis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585EA100CB6EA00CC3324 /* sjis.cpp */; };
-		DF7585ED100CB6EA00CC3324 /* sjis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585EA100CB6EA00CC3324 /* sjis.cpp */; };
-		DF7585EE100CB6EA00CC3324 /* sjis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585EA100CB6EA00CC3324 /* sjis.cpp */; };
-		DF7585F1100CB70600CC3324 /* saveload_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */; };
-		DF7585F2100CB70600CC3324 /* saveload_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */; };
-		DF7585F3100CB70600CC3324 /* saveload_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */; };
-		DF7585F7100CB75800CC3324 /* static_selectors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585F6100CB75800CC3324 /* static_selectors.cpp */; };
-		DF7585F8100CB75800CC3324 /* static_selectors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585F6100CB75800CC3324 /* static_selectors.cpp */; };
-		DF7585F9100CB75800CC3324 /* static_selectors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7585F6100CB75800CC3324 /* static_selectors.cpp */; };
-		DF758619100CBA0200CC3324 /* osys_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758614100CBA0200CC3324 /* osys_events.cpp */; };
-		DF75861A100CBA0200CC3324 /* osys_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758615100CBA0200CC3324 /* osys_main.cpp */; };
-		DF75861B100CBA0200CC3324 /* osys_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758617100CBA0200CC3324 /* osys_sound.cpp */; };
-		DF75861C100CBA0200CC3324 /* osys_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758618100CBA0200CC3324 /* osys_video.cpp */; };
-		DF75861D100CBA0200CC3324 /* osys_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758614100CBA0200CC3324 /* osys_events.cpp */; };
-		DF75861E100CBA0200CC3324 /* osys_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758615100CBA0200CC3324 /* osys_main.cpp */; };
-		DF75861F100CBA0200CC3324 /* osys_sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758617100CBA0200CC3324 /* osys_sound.cpp */; };
-		DF758620100CBA0200CC3324 /* osys_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF758618100CBA0200CC3324 /* osys_video.cpp */; };
-		DF7E8BFD0ED5FC77001CB19F /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; };
-		DF7E8BFF0ED5FC77001CB19F /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; };
-		DF7E8C000ED5FC77001CB19F /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; };
-		DF7E8C010ED5FC77001CB19F /* ThemeLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF80ED5FC77001CB19F /* ThemeLayout.cpp */; };
-		DF7E8C020ED5FC77001CB19F /* ThemeParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BFA0ED5FC77001CB19F /* ThemeParser.cpp */; };
-		DF7E8C0C0ED5FCAF001CB19F /* thumbnail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C050ED5FCAF001CB19F /* thumbnail.cpp */; };
-		DF7E8C0D0ED5FCAF001CB19F /* VectorRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C070ED5FCAF001CB19F /* VectorRenderer.cpp */; };
-		DF7E8C0E0ED5FCAF001CB19F /* VectorRendererSpec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */; };
-		DF7E8C110ED5FCC2001CB19F /* xmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C0F0ED5FCC2001CB19F /* xmlparser.cpp */; };
-		DF7E8C530ED60067001CB19F /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C510ED60067001CB19F /* game.cpp */; };
-		DF7E8C810ED60271001CB19F /* scummmodern.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF7E8C7A0ED601E5001CB19F /* scummmodern.zip */; };
-		DF7F286111FF23D500159131 /* amigamac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286011FF23D500159131 /* amigamac.cpp */; };
-		DF7F286211FF23D500159131 /* amigamac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286011FF23D500159131 /* amigamac.cpp */; };
-		DF7F286311FF23D500159131 /* amigamac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286011FF23D500159131 /* amigamac.cpp */; };
-		DF7F286711FF23EF00159131 /* kvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286411FF23EF00159131 /* kvideo.cpp */; };
-		DF7F286811FF23EF00159131 /* workarounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286511FF23EF00159131 /* workarounds.cpp */; };
-		DF7F286911FF23EF00159131 /* kvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286411FF23EF00159131 /* kvideo.cpp */; };
-		DF7F286A11FF23EF00159131 /* workarounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286511FF23EF00159131 /* workarounds.cpp */; };
-		DF7F286B11FF23EF00159131 /* kvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286411FF23EF00159131 /* kvideo.cpp */; };
-		DF7F286C11FF23EF00159131 /* workarounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F286511FF23EF00159131 /* workarounds.cpp */; };
-		DF7F287A11FF243B00159131 /* sound_2gs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287011FF243A00159131 /* sound_2gs.cpp */; };
-		DF7F287B11FF243B00159131 /* sound_coco3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287211FF243B00159131 /* sound_coco3.cpp */; };
-		DF7F287C11FF243B00159131 /* sound_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287411FF243B00159131 /* sound_midi.cpp */; };
-		DF7F287D11FF243B00159131 /* sound_pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287611FF243B00159131 /* sound_pcjr.cpp */; };
-		DF7F287E11FF243B00159131 /* sound_sarien.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287811FF243B00159131 /* sound_sarien.cpp */; };
-		DF7F287F11FF243B00159131 /* sound_2gs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287011FF243A00159131 /* sound_2gs.cpp */; };
-		DF7F288011FF243B00159131 /* sound_coco3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287211FF243B00159131 /* sound_coco3.cpp */; };
-		DF7F288111FF243B00159131 /* sound_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287411FF243B00159131 /* sound_midi.cpp */; };
-		DF7F288211FF243B00159131 /* sound_pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287611FF243B00159131 /* sound_pcjr.cpp */; };
-		DF7F288311FF243B00159131 /* sound_sarien.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287811FF243B00159131 /* sound_sarien.cpp */; };
-		DF7F288411FF243B00159131 /* sound_2gs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287011FF243A00159131 /* sound_2gs.cpp */; };
-		DF7F288511FF243B00159131 /* sound_coco3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287211FF243B00159131 /* sound_coco3.cpp */; };
-		DF7F288611FF243B00159131 /* sound_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287411FF243B00159131 /* sound_midi.cpp */; };
-		DF7F288711FF243B00159131 /* sound_pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287611FF243B00159131 /* sound_pcjr.cpp */; };
-		DF7F288811FF243B00159131 /* sound_sarien.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F287811FF243B00159131 /* sound_sarien.cpp */; };
-		DF7F288B11FF244F00159131 /* Tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F288911FF244F00159131 /* Tooltip.cpp */; };
-		DF7F288C11FF244F00159131 /* Tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F288911FF244F00159131 /* Tooltip.cpp */; };
-		DF7F288D11FF244F00159131 /* Tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F288911FF244F00159131 /* Tooltip.cpp */; };
-		DF7F289311FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; };
-		DF7F289511FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; };
-		DF7F289711FF247300159131 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F289111FF247300159131 /* translation.cpp */; };
-		DF7F28A511FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; };
-		DF7F28A611FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; };
-		DF7F28A711FF24C400159131 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7F28A311FF24C400159131 /* console.cpp */; };
-		DF841FDD0E7BA61800F5680E /* iphone_keyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = DF841FD90E7BA61800F5680E /* iphone_keyboard.m */; };
-		DF841FDE0E7BA61800F5680E /* iphone_video.m in Sources */ = {isa = PBXBuildFile; fileRef = DF841FDB0E7BA61800F5680E /* iphone_video.m */; };
-		DF84250A0E7BA6AC00F5680E /* agi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF70E7BA6A600F5680E /* agi.cpp */; };
-		DF84250B0E7BA6AC00F5680E /* checks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF90E7BA6A600F5680E /* checks.cpp */; };
-		DF84250C0E7BA6AC00F5680E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFA0E7BA6A600F5680E /* console.cpp */; };
-		DF84250D0E7BA6AC00F5680E /* cycle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFC0E7BA6A600F5680E /* cycle.cpp */; };
-		DF84250E0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFD0E7BA6A600F5680E /* detection.cpp */; };
-		DF84250F0E7BA6AC00F5680E /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFF0E7BA6A600F5680E /* global.cpp */; };
-		DF8425100E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420000E7BA6A600F5680E /* graphics.cpp */; };
-		DF8425110E7BA6AC00F5680E /* id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420020E7BA6A600F5680E /* id.cpp */; };
-		DF8425120E7BA6AC00F5680E /* inv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420030E7BA6A600F5680E /* inv.cpp */; };
-		DF8425130E7BA6AC00F5680E /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420040E7BA6A600F5680E /* keyboard.cpp */; };
-		DF8425140E7BA6AC00F5680E /* loader_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420060E7BA6A600F5680E /* loader_v2.cpp */; };
-		DF8425150E7BA6AC00F5680E /* loader_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420070E7BA6A600F5680E /* loader_v3.cpp */; };
-		DF8425160E7BA6AC00F5680E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420080E7BA6A600F5680E /* logic.cpp */; };
-		DF8425170E7BA6AC00F5680E /* lzw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200A0E7BA6A600F5680E /* lzw.cpp */; };
-		DF8425180E7BA6AC00F5680E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200C0E7BA6A600F5680E /* menu.cpp */; };
-		DF84251A0E7BA6AC00F5680E /* motion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200F0E7BA6A600F5680E /* motion.cpp */; };
-		DF84251B0E7BA6AC00F5680E /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420100E7BA6A600F5680E /* objects.cpp */; };
-		DF84251C0E7BA6AC00F5680E /* op_cmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420110E7BA6A600F5680E /* op_cmd.cpp */; };
-		DF84251D0E7BA6AC00F5680E /* op_dbg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420120E7BA6A600F5680E /* op_dbg.cpp */; };
-		DF84251E0E7BA6AC00F5680E /* op_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420130E7BA6A600F5680E /* op_test.cpp */; };
-		DF84251F0E7BA6AC00F5680E /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420150E7BA6A600F5680E /* picture.cpp */; };
-		DF8425200E7BA6AC00F5680E /* preagi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420170E7BA6A600F5680E /* preagi.cpp */; };
-		DF8425210E7BA6AC00F5680E /* preagi_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420190E7BA6A600F5680E /* preagi_common.cpp */; };
-		DF8425220E7BA6AC00F5680E /* preagi_mickey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201B0E7BA6A600F5680E /* preagi_mickey.cpp */; };
-		DF8425230E7BA6AC00F5680E /* preagi_troll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201D0E7BA6A600F5680E /* preagi_troll.cpp */; };
-		DF8425240E7BA6AC00F5680E /* preagi_winnie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201F0E7BA6A600F5680E /* preagi_winnie.cpp */; };
-		DF8425250E7BA6AC00F5680E /* predictive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420210E7BA6A600F5680E /* predictive.cpp */; };
-		DF8425260E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420220E7BA6A600F5680E /* saveload.cpp */; };
-		DF8425270E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420230E7BA6A600F5680E /* sound.cpp */; };
-		DF8425280E7BA6AC00F5680E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420250E7BA6A600F5680E /* sprite.cpp */; };
-		DF8425290E7BA6AC00F5680E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420270E7BA6A600F5680E /* text.cpp */; };
-		DF84252A0E7BA6AC00F5680E /* view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420280E7BA6A600F5680E /* view.cpp */; };
-		DF84252B0E7BA6AC00F5680E /* wagparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202A0E7BA6A600F5680E /* wagparser.cpp */; };
-		DF84252C0E7BA6AC00F5680E /* words.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202C0E7BA6A600F5680E /* words.cpp */; };
-		DF84252D0E7BA6AC00F5680E /* agos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202E0E7BA6A600F5680E /* agos.cpp */; };
-		DF84252E0E7BA6AC00F5680E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420300E7BA6A600F5680E /* animation.cpp */; };
-		DF84252F0E7BA6AC00F5680E /* charset-fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420320E7BA6A600F5680E /* charset-fontdata.cpp */; };
-		DF8425300E7BA6AC00F5680E /* charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420330E7BA6A600F5680E /* charset.cpp */; };
-		DF8425310E7BA6AC00F5680E /* contain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420340E7BA6A600F5680E /* contain.cpp */; };
-		DF8425320E7BA6AC00F5680E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420350E7BA6A600F5680E /* cursor.cpp */; };
-		DF8425330E7BA6AC00F5680E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420360E7BA6A600F5680E /* debug.cpp */; };
-		DF8425340E7BA6AC00F5680E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420380E7BA6A600F5680E /* debugger.cpp */; };
-		DF8425350E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203A0E7BA6A600F5680E /* detection.cpp */; };
-		DF8425360E7BA6AC00F5680E /* draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203C0E7BA6A600F5680E /* draw.cpp */; };
-		DF8425370E7BA6AC00F5680E /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203D0E7BA6A600F5680E /* event.cpp */; };
-		DF8425380E7BA6AC00F5680E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203E0E7BA6A600F5680E /* gfx.cpp */; };
-		DF8425390E7BA6AC00F5680E /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203F0E7BA6A600F5680E /* icons.cpp */; };
-		DF84253A0E7BA6AC00F5680E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420400E7BA6A600F5680E /* input.cpp */; };
-		DF84253B0E7BA6AC00F5680E /* items.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420420E7BA6A600F5680E /* items.cpp */; };
-		DF84253C0E7BA6AC00F5680E /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420430E7BA6A600F5680E /* menus.cpp */; };
-		DF84253D0E7BA6AC00F5680E /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420440E7BA6A600F5680E /* midi.cpp */; };
-		DF84253E0E7BA6AC00F5680E /* midiparser_s1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420460E7BA6A600F5680E /* midiparser_s1d.cpp */; };
-		DF8425400E7BA6AC00F5680E /* oracle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420480E7BA6A600F5680E /* oracle.cpp */; };
-		DF8425410E7BA6AC00F5680E /* res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420490E7BA6A600F5680E /* res.cpp */; };
-		DF8425420E7BA6AC00F5680E /* res_ami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204A0E7BA6A600F5680E /* res_ami.cpp */; };
-		DF8425430E7BA6AC00F5680E /* res_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204B0E7BA6A600F5680E /* res_snd.cpp */; };
-		DF8425440E7BA6AC00F5680E /* rooms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204C0E7BA6A600F5680E /* rooms.cpp */; };
-		DF8425450E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204D0E7BA6A600F5680E /* saveload.cpp */; };
-		DF8425460E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204E0E7BA6A600F5680E /* script.cpp */; };
-		DF8425470E7BA6AC00F5680E /* script_e1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204F0E7BA6A600F5680E /* script_e1.cpp */; };
-		DF8425480E7BA6AC00F5680E /* script_e2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420500E7BA6A600F5680E /* script_e2.cpp */; };
-		DF8425490E7BA6AC00F5680E /* script_ff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420510E7BA6A600F5680E /* script_ff.cpp */; };
-		DF84254A0E7BA6AC00F5680E /* script_pp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420520E7BA6A600F5680E /* script_pp.cpp */; };
-		DF84254B0E7BA6AC00F5680E /* script_s1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420530E7BA6A600F5680E /* script_s1.cpp */; };
-		DF84254C0E7BA6AC00F5680E /* script_s2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420540E7BA6A600F5680E /* script_s2.cpp */; };
-		DF84254D0E7BA6AC00F5680E /* script_ww.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420550E7BA6A600F5680E /* script_ww.cpp */; };
-		DF84254E0E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420560E7BA6A600F5680E /* sound.cpp */; };
-		DF84254F0E7BA6AC00F5680E /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420580E7BA6A600F5680E /* string.cpp */; };
-		DF8425500E7BA6AC00F5680E /* subroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420590E7BA6A600F5680E /* subroutine.cpp */; };
-		DF8425510E7BA6AC00F5680E /* verb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205A0E7BA6A600F5680E /* verb.cpp */; };
-		DF8425520E7BA6AC00F5680E /* vga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205B0E7BA6A600F5680E /* vga.cpp */; };
-		DF8425530E7BA6AC00F5680E /* vga_e2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205D0E7BA6A600F5680E /* vga_e2.cpp */; };
-		DF8425540E7BA6AC00F5680E /* vga_ff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205E0E7BA6A600F5680E /* vga_ff.cpp */; };
-		DF8425550E7BA6AC00F5680E /* vga_s1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205F0E7BA6A600F5680E /* vga_s1.cpp */; };
-		DF8425560E7BA6AC00F5680E /* vga_s2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420600E7BA6A600F5680E /* vga_s2.cpp */; };
-		DF8425570E7BA6AC00F5680E /* vga_ww.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420610E7BA6A600F5680E /* vga_ww.cpp */; };
-		DF8425580E7BA6AC00F5680E /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420620E7BA6A600F5680E /* window.cpp */; };
-		DF8425590E7BA6AC00F5680E /* zones.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420630E7BA6A600F5680E /* zones.cpp */; };
-		DF84255A0E7BA6AC00F5680E /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420650E7BA6A600F5680E /* anim.cpp */; };
-		DF84255B0E7BA6AC00F5680E /* bg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420670E7BA6A600F5680E /* bg.cpp */; };
-		DF84255C0E7BA6AC00F5680E /* bg_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420690E7BA6A600F5680E /* bg_list.cpp */; };
-		DF84255D0E7BA6AC00F5680E /* cine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206B0E7BA6A600F5680E /* cine.cpp */; };
-		DF84255E0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206D0E7BA6A600F5680E /* detection.cpp */; };
-		DF84255F0E7BA6AC00F5680E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206E0E7BA6A600F5680E /* gfx.cpp */; };
-		DF8425600E7BA6AC00F5680E /* main_loop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420700E7BA6A600F5680E /* main_loop.cpp */; };
-		DF8425620E7BA6AC00F5680E /* msg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420730E7BA6A600F5680E /* msg.cpp */; };
-		DF8425630E7BA6AC00F5680E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420750E7BA6A600F5680E /* object.cpp */; };
-		DF8425640E7BA6AC00F5680E /* pal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420770E7BA6A600F5680E /* pal.cpp */; };
-		DF8425650E7BA6AC00F5680E /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420790E7BA6A600F5680E /* part.cpp */; };
-		DF8425660E7BA6AC00F5680E /* prc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84207B0E7BA6A600F5680E /* prc.cpp */; };
-		DF8425670E7BA6AC00F5680E /* rel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84207D0E7BA6A600F5680E /* rel.cpp */; };
-		DF8425680E7BA6AC00F5680E /* script_fw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420800E7BA6A600F5680E /* script_fw.cpp */; };
-		DF8425690E7BA6AC00F5680E /* script_os.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420810E7BA6A600F5680E /* script_os.cpp */; };
-		DF84256A0E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420820E7BA6A600F5680E /* sound.cpp */; };
-		DF84256B0E7BA6AC00F5680E /* texte.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420840E7BA6A600F5680E /* texte.cpp */; };
-		DF84256C0E7BA6AC00F5680E /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420860E7BA6A600F5680E /* unpack.cpp */; };
-		DF84256D0E7BA6AC00F5680E /* various.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420880E7BA6A600F5680E /* various.cpp */; };
-		DF84258D0E7BA6AC00F5680E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420AB0E7BA6A600F5680E /* actor.cpp */; };
-		DF84258F0E7BA6AC00F5680E /* background.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420AE0E7BA6A600F5680E /* background.cpp */; };
-		DF8425910E7BA6AC00F5680E /* backgroundIncrust.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B10E7BA6A600F5680E /* backgroundIncrust.cpp */; };
-		DF8425930E7BA6AC00F5680E /* cell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B40E7BA6A600F5680E /* cell.cpp */; };
-		DF8425950E7BA6AC00F5680E /* cruise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B70E7BA6A600F5680E /* cruise.cpp */; };
-		DF8425970E7BA6AC00F5680E /* cruise_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420BA0E7BA6A700F5680E /* cruise_main.cpp */; };
-		DF8425990E7BA6AC00F5680E /* ctp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420BD0E7BA6A700F5680E /* ctp.cpp */; };
-		DF84259B0E7BA6AC00F5680E /* dataLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C00E7BA6A700F5680E /* dataLoader.cpp */; };
-		DF84259D0E7BA6AC00F5680E /* decompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C30E7BA6A700F5680E /* decompiler.cpp */; };
-		DF84259F0E7BA6AC00F5680E /* delphine-unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C50E7BA6A700F5680E /* delphine-unpack.cpp */; };
-		DF8425A10E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C70E7BA6A700F5680E /* detection.cpp */; };
-		DF8425A30E7BA6AC00F5680E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C90E7BA6A700F5680E /* font.cpp */; };
-		DF8425A70E7BA6AC00F5680E /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420CF0E7BA6A700F5680E /* function.cpp */; };
-		DF8425A90E7BA6AC00F5680E /* gfxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D20E7BA6A700F5680E /* gfxModule.cpp */; };
-		DF8425AC0E7BA6AC00F5680E /* linker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D60E7BA6A700F5680E /* linker.cpp */; };
-		DF8425AE0E7BA6AC00F5680E /* mainDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D90E7BA6A700F5680E /* mainDraw.cpp */; };
-		DF8425B00E7BA6AC00F5680E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420DC0E7BA6A700F5680E /* menu.cpp */; };
-		DF8425B30E7BA6AC00F5680E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E00E7BA6A700F5680E /* mouse.cpp */; };
-		DF8425B50E7BA6AC00F5680E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E30E7BA6A700F5680E /* object.cpp */; };
-		DF8425B70E7BA6AC00F5680E /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E60E7BA6A700F5680E /* overlay.cpp */; };
-		DF8425B90E7BA6AC00F5680E /* perso.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E90E7BA6A700F5680E /* perso.cpp */; };
-		DF8425BB0E7BA6AC00F5680E /* polys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420EC0E7BA6A700F5680E /* polys.cpp */; };
-		DF8425BD0E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420EF0E7BA6A700F5680E /* saveload.cpp */; };
-		DF8425BF0E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F20E7BA6A700F5680E /* script.cpp */; };
-		DF8425C10E7BA6AC00F5680E /* stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F50E7BA6A700F5680E /* stack.cpp */; };
-		DF8425C40E7BA6AC00F5680E /* various.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F90E7BA6A700F5680E /* various.cpp */; };
-		DF8425C60E7BA6AC00F5680E /* vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420FC0E7BA6A700F5680E /* vars.cpp */; };
-		DF8425C80E7BA6AC00F5680E /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420FF0E7BA6A700F5680E /* volume.cpp */; };
-		DF8425CA0E7BA6AC00F5680E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421020E7BA6A700F5680E /* dialogs.cpp */; };
-		DF8425CB0E7BA6AC00F5680E /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421050E7BA6A700F5680E /* actors.cpp */; };
-		DF8425CC0E7BA6AC00F5680E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421060E7BA6A700F5680E /* animation.cpp */; };
-		DF8425CD0E7BA6AC00F5680E /* converse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421070E7BA6A700F5680E /* converse.cpp */; };
-		DF8425CE0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421080E7BA6A700F5680E /* detection.cpp */; };
-		DF8425CF0E7BA6AC00F5680E /* drascula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421090E7BA6A700F5680E /* drascula.cpp */; };
-		DF8425D00E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210B0E7BA6A700F5680E /* graphics.cpp */; };
-		DF8425D10E7BA6AC00F5680E /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210C0E7BA6A700F5680E /* interface.cpp */; };
-		DF8425D30E7BA6AC00F5680E /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210E0E7BA6A700F5680E /* objects.cpp */; };
-		DF8425D40E7BA6AC00F5680E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210F0E7BA6A700F5680E /* palette.cpp */; };
-		DF8425D50E7BA6AC00F5680E /* rooms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421100E7BA6A700F5680E /* rooms.cpp */; };
-		DF8425D60E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421110E7BA6A700F5680E /* saveload.cpp */; };
-		DF8425D70E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421120E7BA6A700F5680E /* sound.cpp */; };
-		DF8425D80E7BA6AC00F5680E /* talk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421130E7BA6A700F5680E /* talk.cpp */; };
-		DF8425D90E7BA6AC00F5680E /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421140E7BA6A700F5680E /* engine.cpp */; };
-		DF8425DD0E7BA6AC00F5680E /* dataio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211B0E7BA6A700F5680E /* dataio.cpp */; };
-		DF8425DE0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211D0E7BA6A700F5680E /* detection.cpp */; };
-		DF8425DF0E7BA6AC00F5680E /* draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211E0E7BA6A700F5680E /* draw.cpp */; };
-		DF8425E00E7BA6AC00F5680E /* draw_bargon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421200E7BA6A700F5680E /* draw_bargon.cpp */; };
-		DF8425E10E7BA6AC00F5680E /* draw_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421210E7BA6A700F5680E /* draw_v1.cpp */; };
-		DF8425E20E7BA6AC00F5680E /* draw_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421220E7BA6A700F5680E /* draw_v2.cpp */; };
-		DF8425E40E7BA6AC00F5680E /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421250E7BA6A700F5680E /* game.cpp */; };
-		DF8425E70E7BA6AC00F5680E /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421290E7BA6A700F5680E /* global.cpp */; };
-		DF8425E80E7BA6AC00F5680E /* gob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212B0E7BA6A700F5680E /* gob.cpp */; };
-		DF8425E90E7BA6AC00F5680E /* goblin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212D0E7BA6A700F5680E /* goblin.cpp */; };
-		DF8425EA0E7BA6AC00F5680E /* goblin_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212F0E7BA6A700F5680E /* goblin_v1.cpp */; };
-		DF8425EB0E7BA6AC00F5680E /* goblin_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421300E7BA6A700F5680E /* goblin_v2.cpp */; };
-		DF8425EC0E7BA6AC00F5680E /* goblin_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421310E7BA6A700F5680E /* goblin_v3.cpp */; };
-		DF8425ED0E7BA6AC00F5680E /* goblin_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421320E7BA6A700F5680E /* goblin_v4.cpp */; };
-		DF8425EE0E7BA6AC00F5680E /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421330E7BA6A700F5680E /* init.cpp */; };
-		DF8425EF0E7BA6AC00F5680E /* init_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421350E7BA6A700F5680E /* init_v1.cpp */; };
-		DF8425F00E7BA6AC00F5680E /* init_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421360E7BA6A700F5680E /* init_v2.cpp */; };
-		DF8425F10E7BA6AC00F5680E /* init_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421370E7BA6A700F5680E /* init_v3.cpp */; };
-		DF8425F20E7BA6AC00F5680E /* inter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421380E7BA6A700F5680E /* inter.cpp */; };
-		DF8425F30E7BA6AC00F5680E /* inter_bargon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213A0E7BA6A700F5680E /* inter_bargon.cpp */; };
-		DF8425F40E7BA6AC00F5680E /* inter_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213B0E7BA6A700F5680E /* inter_v1.cpp */; };
-		DF8425F50E7BA6AC00F5680E /* inter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213C0E7BA6A700F5680E /* inter_v2.cpp */; };
-		DF8425F60E7BA6AC00F5680E /* inter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213D0E7BA6A700F5680E /* inter_v3.cpp */; };
-		DF8425F70E7BA6AC00F5680E /* inter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213E0E7BA6A700F5680E /* inter_v4.cpp */; };
-		DF8425F80E7BA6AC00F5680E /* inter_v5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213F0E7BA6A700F5680E /* inter_v5.cpp */; };
-		DF8425F90E7BA6AC00F5680E /* inter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421400E7BA6A700F5680E /* inter_v6.cpp */; };
-		DF8425FA0E7BA6AC00F5680E /* map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421410E7BA6A700F5680E /* map.cpp */; };
-		DF8425FB0E7BA6AC00F5680E /* map_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421430E7BA6A700F5680E /* map_v1.cpp */; };
-		DF8425FC0E7BA6AC00F5680E /* map_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421440E7BA6A700F5680E /* map_v2.cpp */; };
-		DF8425FF0E7BA6AC00F5680E /* mult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421470E7BA6A700F5680E /* mult.cpp */; };
-		DF8426000E7BA6AC00F5680E /* mult_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421490E7BA6A700F5680E /* mult_v1.cpp */; };
-		DF8426010E7BA6AC00F5680E /* mult_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84214A0E7BA6A700F5680E /* mult_v2.cpp */; };
-		DF8426030E7BA6AC00F5680E /* palanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84214C0E7BA6A700F5680E /* palanim.cpp */; };
-		DF84260B0E7BA6AC00F5680E /* scenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421570E7BA6A700F5680E /* scenery.cpp */; };
-		DF84260C0E7BA6AC00F5680E /* scenery_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421590E7BA6A700F5680E /* scenery_v1.cpp */; };
-		DF84260D0E7BA6AC00F5680E /* scenery_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215A0E7BA6A700F5680E /* scenery_v2.cpp */; };
-		DF84260E0E7BA6AC00F5680E /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215C0E7BA6A700F5680E /* adlib.cpp */; };
-		DF84260F0E7BA6AC00F5680E /* bgatmosphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215E0E7BA6A700F5680E /* bgatmosphere.cpp */; };
-		DF8426100E7BA6AC00F5680E /* cdrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421600E7BA6A700F5680E /* cdrom.cpp */; };
-		DF8426110E7BA6AC00F5680E /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421620E7BA6A700F5680E /* infogrames.cpp */; };
-		DF8426120E7BA6AC00F5680E /* pcspeaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421640E7BA6A700F5680E /* pcspeaker.cpp */; };
-		DF8426130E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421660E7BA6A700F5680E /* sound.cpp */; };
-		DF8426140E7BA6AC00F5680E /* soundblaster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421680E7BA6A700F5680E /* soundblaster.cpp */; };
-		DF8426150E7BA6AC00F5680E /* sounddesc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216A0E7BA6A700F5680E /* sounddesc.cpp */; };
-		DF8426160E7BA6AC00F5680E /* soundmixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216C0E7BA6A700F5680E /* soundmixer.cpp */; };
-		DF8426180E7BA6AC00F5680E /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216F0E7BA6A700F5680E /* util.cpp */; };
-		DF8426190E7BA6AC00F5680E /* variables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421710E7BA6A700F5680E /* variables.cpp */; };
-		DF84261A0E7BA6AC00F5680E /* video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421730E7BA6A700F5680E /* video.cpp */; };
-		DF84261B0E7BA6AC00F5680E /* video_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421750E7BA6A700F5680E /* video_v1.cpp */; };
-		DF84261C0E7BA6AC00F5680E /* video_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421760E7BA6A700F5680E /* video_v2.cpp */; };
-		DF84261D0E7BA6AC00F5680E /* video_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421770E7BA6A700F5680E /* video_v6.cpp */; };
-		DF84261E0E7BA6AC00F5680E /* videoplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421780E7BA6A700F5680E /* videoplayer.cpp */; };
-		DF8426430E7BA6AC00F5680E /* animator_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A40E7BA6A800F5680E /* animator_hof.cpp */; };
-		DF8426440E7BA6AC00F5680E /* animator_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A50E7BA6A800F5680E /* animator_lok.cpp */; };
-		DF8426450E7BA6AC00F5680E /* animator_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A70E7BA6A800F5680E /* animator_mr.cpp */; };
-		DF8426470E7BA6AC00F5680E /* animator_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A90E7BA6A800F5680E /* animator_v2.cpp */; };
-		DF8426490E7BA6AC00F5680E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AB0E7BA6A800F5680E /* debugger.cpp */; };
-		DF84264A0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AD0E7BA6A800F5680E /* detection.cpp */; };
-		DF84264B0E7BA6AC00F5680E /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AE0E7BA6A800F5680E /* gui.cpp */; };
-		DF84264C0E7BA6AC00F5680E /* gui_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B00E7BA6A800F5680E /* gui_hof.cpp */; };
-		DF84264D0E7BA6AC00F5680E /* gui_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B20E7BA6A800F5680E /* gui_lok.cpp */; };
-		DF84264E0E7BA6AC00F5680E /* gui_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B40E7BA6A800F5680E /* gui_mr.cpp */; };
-		DF8426500E7BA6AC00F5680E /* gui_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B70E7BA6A800F5680E /* gui_v2.cpp */; };
-		DF8426520E7BA6AC00F5680E /* items_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BA0E7BA6A800F5680E /* items_hof.cpp */; };
-		DF8426530E7BA6AC00F5680E /* items_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BB0E7BA6A800F5680E /* items_lok.cpp */; };
-		DF8426540E7BA6AC00F5680E /* items_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BC0E7BA6A800F5680E /* items_mr.cpp */; };
-		DF8426560E7BA6AC00F5680E /* items_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BE0E7BA6A800F5680E /* items_v2.cpp */; };
-		DF8426590E7BA6AC00F5680E /* kyra_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C10E7BA6A800F5680E /* kyra_hof.cpp */; };
-		DF84265A0E7BA6AC00F5680E /* kyra_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C30E7BA6A800F5680E /* kyra_lok.cpp */; };
-		DF84265B0E7BA6AC00F5680E /* kyra_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C50E7BA6A800F5680E /* kyra_mr.cpp */; };
-		DF84265C0E7BA6AC00F5680E /* kyra_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C70E7BA6A800F5680E /* kyra_v1.cpp */; };
-		DF84265D0E7BA6AC00F5680E /* kyra_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C90E7BA6A800F5680E /* kyra_v2.cpp */; };
-		DF84265F0E7BA6AC00F5680E /* lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421CC0E7BA6A800F5680E /* lol.cpp */; };
-		DF8426610E7BA6AC00F5680E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421CF0E7BA6A800F5680E /* resource.cpp */; };
-		DF8426620E7BA6AC00F5680E /* resource_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D10E7BA6A800F5680E /* resource_intern.cpp */; };
-		DF8426630E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D30E7BA6A800F5680E /* saveload.cpp */; };
-		DF8426640E7BA6AC00F5680E /* saveload_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D40E7BA6A800F5680E /* saveload_hof.cpp */; };
-		DF8426650E7BA6AC00F5680E /* saveload_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D50E7BA6A800F5680E /* saveload_lok.cpp */; };
-		DF8426660E7BA6AC00F5680E /* saveload_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D60E7BA6A800F5680E /* saveload_mr.cpp */; };
-		DF84266A0E7BA6AC00F5680E /* scene_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DA0E7BA6A800F5680E /* scene_hof.cpp */; };
-		DF84266B0E7BA6AC00F5680E /* scene_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DB0E7BA6A800F5680E /* scene_lok.cpp */; };
-		DF84266C0E7BA6AC00F5680E /* scene_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DC0E7BA6A800F5680E /* scene_mr.cpp */; };
-		DF84266D0E7BA6AC00F5680E /* scene_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DD0E7BA6A800F5680E /* scene_v1.cpp */; };
-		DF84266E0E7BA6AC00F5680E /* scene_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DE0E7BA6A800F5680E /* scene_v2.cpp */; };
-		DF8426700E7BA6AC00F5680E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E00E7BA6A800F5680E /* screen.cpp */; };
-		DF8426710E7BA6AC00F5680E /* screen_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E20E7BA6A800F5680E /* screen_hof.cpp */; };
-		DF8426720E7BA6AC00F5680E /* screen_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E40E7BA6A800F5680E /* screen_lok.cpp */; };
-		DF8426730E7BA6AC00F5680E /* screen_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E60E7BA6A800F5680E /* screen_lol.cpp */; };
-		DF8426740E7BA6AC00F5680E /* screen_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E80E7BA6A800F5680E /* screen_mr.cpp */; };
-		DF8426760E7BA6AC00F5680E /* screen_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421EB0E7BA6A800F5680E /* screen_v2.cpp */; };
-		DF8426780E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421EE0E7BA6A800F5680E /* script.cpp */; };
-		DF8426790E7BA6AC00F5680E /* script_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F00E7BA6A800F5680E /* script_hof.cpp */; };
-		DF84267A0E7BA6AC00F5680E /* script_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F10E7BA6A800F5680E /* script_lok.cpp */; };
-		DF84267B0E7BA6AC00F5680E /* script_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F20E7BA6A800F5680E /* script_mr.cpp */; };
-		DF84267C0E7BA6AC00F5680E /* script_tim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F30E7BA6A800F5680E /* script_tim.cpp */; };
-		DF84267D0E7BA6AC00F5680E /* script_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F50E7BA6A800F5680E /* script_v1.cpp */; };
-		DF84267E0E7BA6AC00F5680E /* script_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F60E7BA6A800F5680E /* script_v2.cpp */; };
-		DF8426800E7BA6AC00F5680E /* seqplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F80E7BA6A800F5680E /* seqplayer.cpp */; };
-		DF8426810E7BA6AC00F5680E /* sequences_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FA0E7BA6A800F5680E /* sequences_hof.cpp */; };
-		DF8426820E7BA6AC00F5680E /* sequences_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FB0E7BA6A800F5680E /* sequences_lok.cpp */; };
-		DF8426830E7BA6AC00F5680E /* sequences_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FC0E7BA6A800F5680E /* sequences_mr.cpp */; };
-		DF8426850E7BA6AC00F5680E /* sequences_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FE0E7BA6A800F5680E /* sequences_v2.cpp */; };
-		DF8426870E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422000E7BA6A800F5680E /* sound.cpp */; };
-		DF8426880E7BA6AC00F5680E /* sound_adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422020E7BA6A800F5680E /* sound_adlib.cpp */; };
-		DF8426890E7BA6AC00F5680E /* sound_digital.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422030E7BA6A800F5680E /* sound_digital.cpp */; };
-		DF84268A0E7BA6AC00F5680E /* sound_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422040E7BA6A800F5680E /* sound_lok.cpp */; };
-		DF84268B0E7BA6AC00F5680E /* sound_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422050E7BA6A800F5680E /* sound_towns.cpp */; };
-		DF84268D0E7BA6AC00F5680E /* sprites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422070E7BA6A800F5680E /* sprites.cpp */; };
-		DF84268E0E7BA6AC00F5680E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422090E7BA6A800F5680E /* staticres.cpp */; };
-		DF84268F0E7BA6AC00F5680E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220A0E7BA6A800F5680E /* text.cpp */; };
-		DF8426900E7BA6AC00F5680E /* text_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220C0E7BA6A800F5680E /* text_hof.cpp */; };
-		DF8426910E7BA6AC00F5680E /* text_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220E0E7BA6A800F5680E /* text_lok.cpp */; };
-		DF8426920E7BA6AC00F5680E /* text_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220F0E7BA6A800F5680E /* text_mr.cpp */; };
-		DF8426960E7BA6AC00F5680E /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422140E7BA6A800F5680E /* timer.cpp */; };
-		DF8426970E7BA6AC00F5680E /* timer_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422160E7BA6A800F5680E /* timer_hof.cpp */; };
-		DF8426980E7BA6AC00F5680E /* timer_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422170E7BA6A800F5680E /* timer_lok.cpp */; };
-		DF8426990E7BA6AC00F5680E /* timer_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422180E7BA6A800F5680E /* timer_mr.cpp */; };
-		DF84269D0E7BA6AC00F5680E /* vqa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84221C0E7BA6A800F5680E /* vqa.cpp */; };
-		DF84269E0E7BA6AC00F5680E /* wsamovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84221E0E7BA6A800F5680E /* wsamovie.cpp */; };
-		DF84269F0E7BA6AC00F5680E /* animseq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422210E7BA6A800F5680E /* animseq.cpp */; };
-		DF8426A00E7BA6AC00F5680E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422230E7BA6A800F5680E /* debugger.cpp */; };
-		DF8426A10E7BA6AC00F5680E /* decode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422250E7BA6A800F5680E /* decode.cpp */; };
-		DF8426A20E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422270E7BA6A800F5680E /* detection.cpp */; };
-		DF8426A30E7BA6AC00F5680E /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422280E7BA6A800F5680E /* disk.cpp */; };
-		DF8426A40E7BA6AC00F5680E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222A0E7BA6A800F5680E /* events.cpp */; };
-		DF8426A50E7BA6AC00F5680E /* fights.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222C0E7BA6A800F5680E /* fights.cpp */; };
-		DF8426A60E7BA6AC00F5680E /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222E0E7BA6A800F5680E /* game.cpp */; };
-		DF8426A70E7BA6AC00F5680E /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422300E7BA6A800F5680E /* hotspots.cpp */; };
-		DF8426A80E7BA6AC00F5680E /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422320E7BA6A800F5680E /* intro.cpp */; };
-		DF8426A90E7BA6AC00F5680E /* lure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422340E7BA6A800F5680E /* lure.cpp */; };
-		DF8426AA0E7BA6AC00F5680E /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422370E7BA6A800F5680E /* memory.cpp */; };
-		DF8426AB0E7BA6AC00F5680E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422390E7BA6A800F5680E /* menu.cpp */; };
-		DF8426AD0E7BA6AC00F5680E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84223C0E7BA6A800F5680E /* palette.cpp */; };
-		DF8426AE0E7BA6AC00F5680E /* res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84223E0E7BA6A800F5680E /* res.cpp */; };
-		DF8426AF0E7BA6AC00F5680E /* res_struct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422400E7BA6A800F5680E /* res_struct.cpp */; };
-		DF8426B00E7BA6AC00F5680E /* room.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422420E7BA6A800F5680E /* room.cpp */; };
-		DF8426B10E7BA6AC00F5680E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422440E7BA6A800F5680E /* screen.cpp */; };
-		DF8426B20E7BA6AC00F5680E /* scripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422460E7BA6A800F5680E /* scripts.cpp */; };
-		DF8426B30E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422480E7BA6A800F5680E /* sound.cpp */; };
-		DF8426B40E7BA6AC00F5680E /* strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84224A0E7BA6A800F5680E /* strings.cpp */; };
-		DF8426B50E7BA6AC00F5680E /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84224C0E7BA6A800F5680E /* surface.cpp */; };
-		DF8426D40E7BA6AC00F5680E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84226E0E7BA6A800F5680E /* actor.cpp */; };
-		DF8426D60E7BA6AC00F5680E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422710E7BA6A800F5680E /* animation.cpp */; };
-		DF8426D80E7BA6AC00F5680E /* assets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422740E7BA6A800F5680E /* assets.cpp */; };
-		DF8426DA0E7BA6AC00F5680E /* compression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422780E7BA6A900F5680E /* compression.cpp */; };
-		DF8426DC0E7BA6AC00F5680E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84227B0E7BA6A900F5680E /* console.cpp */; };
-		DF8426DE0E7BA6AC00F5680E /* converse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84227E0E7BA6A900F5680E /* converse.cpp */; };
-		DF8426E00E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422810E7BA6A900F5680E /* detection.cpp */; };
-		DF8426E20E7BA6AC00F5680E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422830E7BA6A900F5680E /* events.cpp */; };
-		DF8426E40E7BA6AC00F5680E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422860E7BA6A900F5680E /* font.cpp */; };
-		DF8426E60E7BA6AC00F5680E /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422890E7BA6A900F5680E /* globals.cpp */; };
-		DF8426E80E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84228C0E7BA6A900F5680E /* graphics.cpp */; };
-		DF8426EA0E7BA6AC00F5680E /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84228F0E7BA6A900F5680E /* gui.cpp */; };
-		DF8426EC0E7BA6AC00F5680E /* hotspot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422920E7BA6A900F5680E /* hotspot.cpp */; };
-		DF8426EF0E7BA6AC00F5680E /* m4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422960E7BA6A900F5680E /* m4.cpp */; };
-		DF8426F10E7BA6AC00F5680E /* m4_menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422990E7BA6A900F5680E /* m4_menus.cpp */; };
-		DF8426F30E7BA6AC00F5680E /* m4_views.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84229C0E7BA6A900F5680E /* m4_views.cpp */; };
-		DF8426F50E7BA6AC00F5680E /* mads_anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84229F0E7BA6A900F5680E /* mads_anim.cpp */; };
-		DF8426F70E7BA6AC00F5680E /* mads_menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A20E7BA6A900F5680E /* mads_menus.cpp */; };
-		DF8426F90E7BA6AC00F5680E /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A50E7BA6A900F5680E /* midi.cpp */; };
-		DF8426FC0E7BA6AC00F5680E /* rails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A90E7BA6A900F5680E /* rails.cpp */; };
-		DF8426FE0E7BA6AC00F5680E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422AC0E7BA6A900F5680E /* resource.cpp */; };
-		DF8427000E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422AF0E7BA6A900F5680E /* saveload.cpp */; };
-		DF8427020E7BA6AC00F5680E /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B20E7BA6A900F5680E /* scene.cpp */; };
-		DF8427040E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B50E7BA6A900F5680E /* script.cpp */; };
-		DF8427060E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B90E7BA6A900F5680E /* sound.cpp */; };
-		DF8427080E7BA6AC00F5680E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422BC0E7BA6A900F5680E /* sprite.cpp */; };
-		DF84270A0E7BA6AC00F5680E /* viewmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422BF0E7BA6A900F5680E /* viewmgr.cpp */; };
-		DF84270C0E7BA6AC00F5680E /* woodscript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C20E7BA6A900F5680E /* woodscript.cpp */; };
-		DF84270E0E7BA6AC00F5680E /* ws_machine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C50E7BA6A900F5680E /* ws_machine.cpp */; };
-		DF8427100E7BA6AC00F5680E /* ws_sequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C70E7BA6A900F5680E /* ws_sequence.cpp */; };
-		DF8427120E7BA6AC00F5680E /* database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CA0E7BA6A900F5680E /* database.cpp */; };
-		DF8427130E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CC0E7BA6A900F5680E /* detection.cpp */; };
-		DF8427140E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CD0E7BA6A900F5680E /* graphics.cpp */; };
-		DF8427150E7BA6AC00F5680E /* made.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CF0E7BA6A900F5680E /* made.cpp */; };
-		DF8427170E7BA6AC00F5680E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D20E7BA6A900F5680E /* music.cpp */; };
-		DF8427180E7BA6AC00F5680E /* pmvplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D40E7BA6A900F5680E /* pmvplayer.cpp */; };
-		DF8427190E7BA6AC00F5680E /* redreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D60E7BA6A900F5680E /* redreader.cpp */; };
-		DF84271A0E7BA6AC00F5680E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D80E7BA6A900F5680E /* resource.cpp */; };
-		DF84271B0E7BA6AC00F5680E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DA0E7BA6A900F5680E /* screen.cpp */; };
-		DF84271C0E7BA6AC00F5680E /* screenfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DC0E7BA6A900F5680E /* screenfx.cpp */; };
-		DF84271D0E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DE0E7BA6A900F5680E /* script.cpp */; };
-		DF84271E0E7BA6AC00F5680E /* scriptfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E00E7BA6A900F5680E /* scriptfuncs.cpp */; };
-		DF84271F0E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E20E7BA6A900F5680E /* sound.cpp */; };
-		DF8427210E7BA6AC00F5680E /* balloons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E70E7BA6A900F5680E /* balloons.cpp */; };
-		DF8427220E7BA6AC00F5680E /* callables_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E80E7BA6A900F5680E /* callables_br.cpp */; };
-		DF8427230E7BA6AC00F5680E /* callables_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E90E7BA6A900F5680E /* callables_ns.cpp */; };
-		DF8427240E7BA6AC00F5680E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EA0E7BA6A900F5680E /* debug.cpp */; };
-		DF8427250E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EC0E7BA6A900F5680E /* detection.cpp */; };
-		DF8427260E7BA6AC00F5680E /* dialogue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422ED0E7BA6A900F5680E /* dialogue.cpp */; };
-		DF8427270E7BA6AC00F5680E /* disk_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EF0E7BA6A900F5680E /* disk_br.cpp */; };
-		DF8427280E7BA6AC00F5680E /* disk_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F00E7BA6A900F5680E /* disk_ns.cpp */; };
-		DF8427290E7BA6AC00F5680E /* exec_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F20E7BA6A900F5680E /* exec_br.cpp */; };
-		DF84272A0E7BA6AC00F5680E /* exec_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F30E7BA6A900F5680E /* exec_ns.cpp */; };
-		DF84272B0E7BA6AC00F5680E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F40E7BA6A900F5680E /* font.cpp */; };
-		DF84272C0E7BA6AC00F5680E /* gfxbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F50E7BA6A900F5680E /* gfxbase.cpp */; };
-		DF84272D0E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F60E7BA6A900F5680E /* graphics.cpp */; };
-		DF84272E0E7BA6AC00F5680E /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F80E7BA6A900F5680E /* gui.cpp */; };
-		DF84272F0E7BA6AC00F5680E /* gui_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FA0E7BA6A900F5680E /* gui_br.cpp */; };
-		DF8427300E7BA6AC00F5680E /* gui_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FB0E7BA6A900F5680E /* gui_ns.cpp */; };
-		DF8427310E7BA6AC00F5680E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FC0E7BA6A900F5680E /* input.cpp */; };
-		DF8427320E7BA6AC00F5680E /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FE0E7BA6A900F5680E /* inventory.cpp */; };
-		DF8427340E7BA6AC00F5680E /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423010E7BA6A900F5680E /* objects.cpp */; };
-		DF8427350E7BA6AC00F5680E /* parallaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423030E7BA6A900F5680E /* parallaction.cpp */; };
-		DF8427360E7BA6AC00F5680E /* parallaction_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423050E7BA6A900F5680E /* parallaction_br.cpp */; };
-		DF8427370E7BA6AC00F5680E /* parallaction_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423060E7BA6A900F5680E /* parallaction_ns.cpp */; };
-		DF8427380E7BA6AC00F5680E /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423070E7BA6A900F5680E /* parser.cpp */; };
-		DF8427390E7BA6AC00F5680E /* parser_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423090E7BA6A900F5680E /* parser_br.cpp */; };
-		DF84273A0E7BA6AC00F5680E /* parser_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230A0E7BA6A900F5680E /* parser_ns.cpp */; };
-		DF84273B0E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230B0E7BA6A900F5680E /* saveload.cpp */; };
-		DF84273D0E7BA6AC00F5680E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230F0E7BA6A900F5680E /* staticres.cpp */; };
-		DF84273E0E7BA6AC00F5680E /* walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423100E7BA6A900F5680E /* walk.cpp */; };
-		DF84273F0E7BA6AC00F5680E /* bankman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423130E7BA6A900F5680E /* bankman.cpp */; };
-		DF8427400E7BA6AC00F5680E /* command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423150E7BA6A900F5680E /* command.cpp */; };
-		DF8427410E7BA6AC00F5680E /* credits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423170E7BA6A900F5680E /* credits.cpp */; };
-		DF8427420E7BA6AC00F5680E /* cutaway.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423190E7BA6A900F5680E /* cutaway.cpp */; };
-		DF8427430E7BA6AC00F5680E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84231B0E7BA6A900F5680E /* debug.cpp */; };
-		DF8427440E7BA6AC00F5680E /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84231E0E7BA6A900F5680E /* display.cpp */; };
-		DF8427450E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423200E7BA6A900F5680E /* graphics.cpp */; };
-		DF8427460E7BA6AC00F5680E /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423220E7BA6A900F5680E /* grid.cpp */; };
-		DF8427470E7BA6AC00F5680E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423240E7BA6A900F5680E /* input.cpp */; };
-		DF8427480E7BA6AC00F5680E /* journal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423260E7BA6A900F5680E /* journal.cpp */; };
-		DF8427490E7BA6AC00F5680E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423280E7BA6A900F5680E /* logic.cpp */; };
-		DF84274A0E7BA6AC00F5680E /* midiadlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232A0E7BA6A900F5680E /* midiadlib.cpp */; };
-		DF84274C0E7BA6AC00F5680E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232C0E7BA6A900F5680E /* music.cpp */; };
-		DF84274D0E7BA6AC00F5680E /* musicdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232E0E7BA6A900F5680E /* musicdata.cpp */; };
-		DF84274E0E7BA6AC00F5680E /* queen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232F0E7BA6A900F5680E /* queen.cpp */; };
-		DF84274F0E7BA6AC00F5680E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423310E7BA6A900F5680E /* resource.cpp */; };
-		DF8427500E7BA6AC00F5680E /* restables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423330E7BA6A900F5680E /* restables.cpp */; };
-		DF8427510E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423340E7BA6A900F5680E /* sound.cpp */; };
-		DF8427520E7BA6AC00F5680E /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423360E7BA6A900F5680E /* state.cpp */; };
-		DF8427530E7BA6AC00F5680E /* talk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423390E7BA6A900F5680E /* talk.cpp */; };
-		DF8427540E7BA6AC00F5680E /* walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84233B0E7BA6A900F5680E /* walk.cpp */; };
-		DF8427560E7BA6AC00F5680E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84233F0E7BA6AA00F5680E /* actor.cpp */; };
-		DF8427570E7BA6AC00F5680E /* actor_path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423410E7BA6AA00F5680E /* actor_path.cpp */; };
-		DF8427580E7BA6AC00F5680E /* actor_walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423420E7BA6AA00F5680E /* actor_walk.cpp */; };
-		DF8427590E7BA6AC00F5680E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423430E7BA6AA00F5680E /* animation.cpp */; };
-		DF84275A0E7BA6AC00F5680E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423450E7BA6AA00F5680E /* console.cpp */; };
-		DF84275B0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423470E7BA6AA00F5680E /* detection.cpp */; };
-		DF84275C0E7BA6AC00F5680E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234A0E7BA6AA00F5680E /* events.cpp */; };
-		DF84275D0E7BA6AC00F5680E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234C0E7BA6AA00F5680E /* font.cpp */; };
-		DF84275E0E7BA6AC00F5680E /* font_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234E0E7BA6AA00F5680E /* font_map.cpp */; };
-		DF84275F0E7BA6AC00F5680E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234F0E7BA6AA00F5680E /* gfx.cpp */; };
-		DF8427610E7BA6AC00F5680E /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423520E7BA6AA00F5680E /* image.cpp */; };
-		DF8427620E7BA6AC00F5680E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423530E7BA6AA00F5680E /* input.cpp */; };
-		DF8427630E7BA6AC00F5680E /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423540E7BA6AA00F5680E /* interface.cpp */; };
-		DF8427640E7BA6AC00F5680E /* introproc_ihnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423560E7BA6AA00F5680E /* introproc_ihnm.cpp */; };
-		DF8427650E7BA6AC00F5680E /* introproc_ite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423570E7BA6AA00F5680E /* introproc_ite.cpp */; };
-		DF8427660E7BA6AC00F5680E /* isomap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423580E7BA6AA00F5680E /* isomap.cpp */; };
-		DF8427680E7BA6AC00F5680E /* itedata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84235B0E7BA6AA00F5680E /* itedata.cpp */; };
-		DF84276A0E7BA6AC00F5680E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84235F0E7BA6AA00F5680E /* music.cpp */; };
-		DF84276B0E7BA6AC00F5680E /* objectmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423610E7BA6AA00F5680E /* objectmap.cpp */; };
-		DF84276C0E7BA6AC00F5680E /* palanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423630E7BA6AA00F5680E /* palanim.cpp */; };
-		DF84276D0E7BA6AC00F5680E /* puzzle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423650E7BA6AA00F5680E /* puzzle.cpp */; };
-		DF84276E0E7BA6AC00F5680E /* render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423670E7BA6AA00F5680E /* render.cpp */; };
-		DF8427700E7BA6AC00F5680E /* saga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236B0E7BA6AA00F5680E /* saga.cpp */; };
-		DF8427710E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236D0E7BA6AA00F5680E /* saveload.cpp */; };
-		DF8427720E7BA6AC00F5680E /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236E0E7BA6AA00F5680E /* scene.cpp */; };
-		DF8427730E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423700E7BA6AA00F5680E /* script.cpp */; };
-		DF8427740E7BA6AC00F5680E /* sfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423720E7BA6AA00F5680E /* sfuncs.cpp */; };
-		DF8427750E7BA6AC00F5680E /* sndres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423730E7BA6AA00F5680E /* sndres.cpp */; };
-		DF8427760E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423750E7BA6AA00F5680E /* sound.cpp */; };
-		DF8427770E7BA6AC00F5680E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423770E7BA6AA00F5680E /* sprite.cpp */; };
-		DF8427780E7BA6AC00F5680E /* sthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423790E7BA6AA00F5680E /* sthread.cpp */; };
-		DF84277A0E7BA6AC00F5680E /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84237C0E7BA6AA00F5680E /* actor.cpp */; };
-		DF84277B0E7BA6AC00F5680E /* akos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84237E0E7BA6AA00F5680E /* akos.cpp */; };
-		DF84277C0E7BA6AC00F5680E /* base-costume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423800E7BA6AA00F5680E /* base-costume.cpp */; };
-		DF84277D0E7BA6AC00F5680E /* bomp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423820E7BA6AA00F5680E /* bomp.cpp */; };
-		DF84277E0E7BA6AC00F5680E /* boxes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423840E7BA6AA00F5680E /* boxes.cpp */; };
-		DF84277F0E7BA6AC00F5680E /* camera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423860E7BA6AA00F5680E /* camera.cpp */; };
-		DF8427800E7BA6AC00F5680E /* charset-fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423870E7BA6AA00F5680E /* charset-fontdata.cpp */; };
-		DF8427810E7BA6AC00F5680E /* charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423880E7BA6AA00F5680E /* charset.cpp */; };
-		DF8427820E7BA6AC00F5680E /* costume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238A0E7BA6AA00F5680E /* costume.cpp */; };
-		DF8427830E7BA6AC00F5680E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238C0E7BA6AA00F5680E /* cursor.cpp */; };
-		DF8427840E7BA6AC00F5680E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238D0E7BA6AA00F5680E /* debugger.cpp */; };
-		DF8427850E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238F0E7BA6AA00F5680E /* detection.cpp */; };
-		DF8427860E7BA6AC00F5680E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423920E7BA6AA00F5680E /* dialogs.cpp */; };
-		DF8427870E7BA6AC00F5680E /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423940E7BA6AA00F5680E /* file.cpp */; };
-		DF8427880E7BA6AC00F5680E /* file_nes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423960E7BA6AA00F5680E /* file_nes.cpp */; };
-		DF8427890E7BA6AC00F5680E /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423980E7BA6AA00F5680E /* gfx.cpp */; };
-		DF84278B0E7BA6AC00F5680E /* animation_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84239C0E7BA6AA00F5680E /* animation_he.cpp */; };
-		DF84278C0E7BA6AC00F5680E /* cup_player_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84239E0E7BA6AA00F5680E /* cup_player_he.cpp */; };
-		DF84278D0E7BA6AC00F5680E /* floodfill_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A00E7BA6AA00F5680E /* floodfill_he.cpp */; };
-		DF84278E0E7BA6AC00F5680E /* logic_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A30E7BA6AA00F5680E /* logic_he.cpp */; };
-		DF84278F0E7BA6AC00F5680E /* palette_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A50E7BA6AA00F5680E /* palette_he.cpp */; };
-		DF8427900E7BA6AC00F5680E /* resource_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A60E7BA6AA00F5680E /* resource_he.cpp */; };
-		DF8427910E7BA6AC00F5680E /* script_v100he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A80E7BA6AA00F5680E /* script_v100he.cpp */; };
-		DF8427920E7BA6AC00F5680E /* script_v60he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A90E7BA6AA00F5680E /* script_v60he.cpp */; };
-		DF8427930E7BA6AC00F5680E /* script_v70he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AA0E7BA6AA00F5680E /* script_v70he.cpp */; };
-		DF8427940E7BA6AC00F5680E /* script_v71he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AB0E7BA6AA00F5680E /* script_v71he.cpp */; };
-		DF8427950E7BA6AC00F5680E /* script_v72he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AC0E7BA6AA00F5680E /* script_v72he.cpp */; };
-		DF8427960E7BA6AC00F5680E /* script_v80he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AD0E7BA6AA00F5680E /* script_v80he.cpp */; };
-		DF8427970E7BA6AC00F5680E /* script_v90he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AE0E7BA6AA00F5680E /* script_v90he.cpp */; };
-		DF8427980E7BA6AC00F5680E /* sound_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AF0E7BA6AA00F5680E /* sound_he.cpp */; };
-		DF8427990E7BA6AC00F5680E /* sprite_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B10E7BA6AA00F5680E /* sprite_he.cpp */; };
-		DF84279A0E7BA6AC00F5680E /* wiz_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B30E7BA6AA00F5680E /* wiz_he.cpp */; };
-		DF84279B0E7BA6AC00F5680E /* help.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B50E7BA6AA00F5680E /* help.cpp */; };
-		DF84279C0E7BA6AC00F5680E /* imuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B80E7BA6AA00F5680E /* imuse.cpp */; };
-		DF84279D0E7BA6AC00F5680E /* imuse_part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BB0E7BA6AA00F5680E /* imuse_part.cpp */; };
-		DF84279E0E7BA6AC00F5680E /* imuse_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BC0E7BA6AA00F5680E /* imuse_player.cpp */; };
-		DF84279F0E7BA6AC00F5680E /* instrument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BD0E7BA6AA00F5680E /* instrument.cpp */; };
-		DF8427A00E7BA6AC00F5680E /* sysex_samnmax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C00E7BA6AA00F5680E /* sysex_samnmax.cpp */; };
-		DF8427A10E7BA6AC00F5680E /* sysex_scumm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C10E7BA6AA00F5680E /* sysex_scumm.cpp */; };
-		DF8427A20E7BA6AC00F5680E /* dimuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C30E7BA6AA00F5680E /* dimuse.cpp */; };
-		DF8427A30E7BA6AC00F5680E /* dimuse_bndmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C50E7BA6AA00F5680E /* dimuse_bndmgr.cpp */; };
-		DF8427A40E7BA6AC00F5680E /* dimuse_codecs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C70E7BA6AA00F5680E /* dimuse_codecs.cpp */; };
-		DF8427A50E7BA6AC00F5680E /* dimuse_music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C80E7BA6AA00F5680E /* dimuse_music.cpp */; };
-		DF8427A60E7BA6AC00F5680E /* dimuse_script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C90E7BA6AA00F5680E /* dimuse_script.cpp */; };
-		DF8427A70E7BA6AC00F5680E /* dimuse_sndmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CA0E7BA6AA00F5680E /* dimuse_sndmgr.cpp */; };
-		DF8427A80E7BA6AC00F5680E /* dimuse_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CC0E7BA6AA00F5680E /* dimuse_tables.cpp */; };
-		DF8427A90E7BA6AC00F5680E /* dimuse_track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CE0E7BA6AA00F5680E /* dimuse_track.cpp */; };
-		DF8427AA0E7BA6AC00F5680E /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D00E7BA6AA00F5680E /* input.cpp */; };
-		DF8427AB0E7BA6AC00F5680E /* insane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D20E7BA6AA00F5680E /* insane.cpp */; };
-		DF8427AC0E7BA6AC00F5680E /* insane_ben.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D40E7BA6AA00F5680E /* insane_ben.cpp */; };
-		DF8427AD0E7BA6AC00F5680E /* insane_enemy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D50E7BA6AA00F5680E /* insane_enemy.cpp */; };
-		DF8427AE0E7BA6AC00F5680E /* insane_iact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D60E7BA6AA00F5680E /* insane_iact.cpp */; };
-		DF8427AF0E7BA6AC00F5680E /* insane_scenes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D70E7BA6AA00F5680E /* insane_scenes.cpp */; };
-		DF8427B10E7BA6AC00F5680E /* midiparser_ro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DA0E7BA6AA00F5680E /* midiparser_ro.cpp */; };
-		DF8427B30E7BA6AC00F5680E /* nut_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DD0E7BA6AA00F5680E /* nut_renderer.cpp */; };
-		DF8427B40E7BA6AC00F5680E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DF0E7BA6AA00F5680E /* object.cpp */; };
-		DF8427B50E7BA6AC00F5680E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E10E7BA6AA00F5680E /* palette.cpp */; };
-		DF8427B60E7BA6AC00F5680E /* player_mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E20E7BA6AA00F5680E /* player_mod.cpp */; };
-		DF8427B70E7BA6AC00F5680E /* player_nes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E40E7BA6AA00F5680E /* player_nes.cpp */; };
-		DF8427B80E7BA6AC00F5680E /* player_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E60E7BA6AA00F5680E /* player_v1.cpp */; };
-		DF8427B90E7BA6AC00F5680E /* player_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E80E7BA6AA00F5680E /* player_v2.cpp */; };
-		DF8427BA0E7BA6AC00F5680E /* player_v2a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EA0E7BA6AA00F5680E /* player_v2a.cpp */; };
-		DF8427BB0E7BA6AC00F5680E /* player_v3a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EC0E7BA6AA00F5680E /* player_v3a.cpp */; };
-		DF8427BD0E7BA6AC00F5680E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EF0E7BA6AA00F5680E /* resource.cpp */; };
-		DF8427BE0E7BA6AC00F5680E /* resource_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F10E7BA6AA00F5680E /* resource_v2.cpp */; };
-		DF8427BF0E7BA6AC00F5680E /* resource_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F20E7BA6AA00F5680E /* resource_v3.cpp */; };
-		DF8427C00E7BA6AC00F5680E /* resource_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F30E7BA6AA00F5680E /* resource_v4.cpp */; };
-		DF8427C10E7BA6AC00F5680E /* room.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F40E7BA6AA00F5680E /* room.cpp */; };
-		DF8427C20E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F50E7BA6AA00F5680E /* saveload.cpp */; };
-		DF8427C30E7BA6AC00F5680E /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F70E7BA6AA00F5680E /* script.cpp */; };
-		DF8427C40E7BA6AC00F5680E /* script_v0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F90E7BA6AA00F5680E /* script_v0.cpp */; };
-		DF8427C50E7BA6AC00F5680E /* script_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FA0E7BA6AA00F5680E /* script_v2.cpp */; };
-		DF8427C60E7BA6AC00F5680E /* script_v5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FB0E7BA6AA00F5680E /* script_v5.cpp */; };
-		DF8427C70E7BA6AC00F5680E /* script_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FC0E7BA6AA00F5680E /* script_v6.cpp */; };
-		DF8427C80E7BA6AC00F5680E /* script_v8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FD0E7BA6AA00F5680E /* script_v8.cpp */; };
-		DF8427C90E7BA6AC00F5680E /* scumm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FF0E7BA6AA00F5680E /* scumm.cpp */; };
-		DF8427CA0E7BA6AC00F5680E /* channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424020E7BA6AA00F5680E /* channel.cpp */; };
-		DF8427CC0E7BA6AC00F5680E /* codec1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424060E7BA6AA00F5680E /* codec1.cpp */; };
-		DF8427CD0E7BA6AC00F5680E /* codec37.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424070E7BA6AA00F5680E /* codec37.cpp */; };
-		DF8427CE0E7BA6AC00F5680E /* codec47.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424090E7BA6AA00F5680E /* codec47.cpp */; };
-		DF8427D10E7BA6AC00F5680E /* imuse_channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240D0E7BA6AA00F5680E /* imuse_channel.cpp */; };
-		DF8427D20E7BA6AC00F5680E /* saud_channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240E0E7BA6AA00F5680E /* saud_channel.cpp */; };
-		DF8427D30E7BA6AC00F5680E /* smush_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240F0E7BA6AA00F5680E /* smush_font.cpp */; };
-		DF8427D40E7BA6AC00F5680E /* smush_mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424110E7BA6AA00F5680E /* smush_mixer.cpp */; };
-		DF8427D50E7BA6AC00F5680E /* smush_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424130E7BA6AA00F5680E /* smush_player.cpp */; };
-		DF8427D60E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424150E7BA6AB00F5680E /* sound.cpp */; };
-		DF8427D70E7BA6AC00F5680E /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424170E7BA6AB00F5680E /* string.cpp */; };
-		DF8427D90E7BA6AC00F5680E /* usage_bits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424190E7BA6AB00F5680E /* usage_bits.cpp */; };
-		DF8427DA0E7BA6AC00F5680E /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241B0E7BA6AB00F5680E /* util.cpp */; };
-		DF8427DB0E7BA6AC00F5680E /* vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241D0E7BA6AB00F5680E /* vars.cpp */; };
-		DF8427DC0E7BA6AC00F5680E /* verbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241E0E7BA6AB00F5680E /* verbs.cpp */; };
-		DF8427DD0E7BA6AC00F5680E /* autoroute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424210E7BA6AB00F5680E /* autoroute.cpp */; };
-		DF8427DE0E7BA6AC00F5680E /* compact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424230E7BA6AB00F5680E /* compact.cpp */; };
-		DF8427DF0E7BA6AC00F5680E /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424250E7BA6AB00F5680E /* control.cpp */; };
-		DF8427E00E7BA6AC00F5680E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424270E7BA6AB00F5680E /* debug.cpp */; };
-		DF8427E10E7BA6AC00F5680E /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424290E7BA6AB00F5680E /* disk.cpp */; };
-		DF8427E20E7BA6AC00F5680E /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242B0E7BA6AB00F5680E /* grid.cpp */; };
-		DF8427E30E7BA6AC00F5680E /* hufftext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242D0E7BA6AB00F5680E /* hufftext.cpp */; };
-		DF8427E40E7BA6AC00F5680E /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242E0E7BA6AB00F5680E /* intro.cpp */; };
-		DF8427E50E7BA6AC00F5680E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424300E7BA6AB00F5680E /* logic.cpp */; };
-		DF8427E70E7BA6AC00F5680E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424330E7BA6AB00F5680E /* mouse.cpp */; };
-		DF8427E80E7BA6AC00F5680E /* adlibchannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424360E7BA6AB00F5680E /* adlibchannel.cpp */; };
-		DF8427E90E7BA6AC00F5680E /* adlibmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424380E7BA6AB00F5680E /* adlibmusic.cpp */; };
-		DF8427EA0E7BA6AC00F5680E /* gmchannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243A0E7BA6AB00F5680E /* gmchannel.cpp */; };
-		DF8427EB0E7BA6AC00F5680E /* gmmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243C0E7BA6AB00F5680E /* gmmusic.cpp */; };
-		DF8427EC0E7BA6AC00F5680E /* mt32music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243E0E7BA6AB00F5680E /* mt32music.cpp */; };
-		DF8427ED0E7BA6AC00F5680E /* musicbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424400E7BA6AB00F5680E /* musicbase.cpp */; };
-		DF8427EE0E7BA6AC00F5680E /* rnc_deco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424420E7BA6AB00F5680E /* rnc_deco.cpp */; };
-		DF8427EF0E7BA6AC00F5680E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424440E7BA6AB00F5680E /* screen.cpp */; };
-		DF8427F00E7BA6AC00F5680E /* sky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424460E7BA6AB00F5680E /* sky.cpp */; };
-		DF8427F10E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424490E7BA6AB00F5680E /* sound.cpp */; };
-		DF8427F20E7BA6AC00F5680E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84244C0E7BA6AB00F5680E /* text.cpp */; };
-		DF8427F30E7BA6AC00F5680E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84244F0E7BA6AB00F5680E /* animation.cpp */; };
-		DF8427F40E7BA6AC00F5680E /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424520E7BA6AB00F5680E /* control.cpp */; };
-		DF8427F60E7BA6AC00F5680E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424560E7BA6AB00F5680E /* debug.cpp */; };
-		DF8427F70E7BA6AC00F5680E /* eventman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424580E7BA6AB00F5680E /* eventman.cpp */; };
-		DF8427F80E7BA6AC00F5680E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245A0E7BA6AB00F5680E /* logic.cpp */; };
-		DF8427F90E7BA6AC00F5680E /* memman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245C0E7BA6AB00F5680E /* memman.cpp */; };
-		DF8427FA0E7BA6AC00F5680E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245E0E7BA6AB00F5680E /* menu.cpp */; };
-		DF8427FC0E7BA6AC00F5680E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424610E7BA6AB00F5680E /* mouse.cpp */; };
-		DF8427FD0E7BA6AC00F5680E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424630E7BA6AB00F5680E /* music.cpp */; };
-		DF8427FE0E7BA6AC00F5680E /* objectman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424660E7BA6AB00F5680E /* objectman.cpp */; };
-		DF8427FF0E7BA6AC00F5680E /* resman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424680E7BA6AB00F5680E /* resman.cpp */; };
-		DF8428000E7BA6AC00F5680E /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246A0E7BA6AB00F5680E /* router.cpp */; };
-		DF8428010E7BA6AC00F5680E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246C0E7BA6AB00F5680E /* screen.cpp */; };
-		DF8428020E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246E0E7BA6AB00F5680E /* sound.cpp */; };
-		DF8428030E7BA6AC00F5680E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424700E7BA6AB00F5680E /* staticres.cpp */; };
-		DF8428040E7BA6AC00F5680E /* sword1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424710E7BA6AB00F5680E /* sword1.cpp */; };
-		DF8428050E7BA6AC00F5680E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424750E7BA6AB00F5680E /* text.cpp */; };
-		DF8428060E7BA6AC00F5680E /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424780E7BA6AB00F5680E /* animation.cpp */; };
-		DF8428070E7BA6AC00F5680E /* anims.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247A0E7BA6AB00F5680E /* anims.cpp */; };
-		DF8428080E7BA6AC00F5680E /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247B0E7BA6AB00F5680E /* console.cpp */; };
-		DF8428090E7BA6AC00F5680E /* controls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247D0E7BA6AB00F5680E /* controls.cpp */; };
-		DF84280A0E7BA6AC00F5680E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247F0E7BA6AB00F5680E /* debug.cpp */; };
-		DF84280B0E7BA6AC00F5680E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424820E7BA6AB00F5680E /* events.cpp */; };
-		DF84280C0E7BA6AC00F5680E /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424830E7BA6AB00F5680E /* function.cpp */; };
-		DF84280D0E7BA6AC00F5680E /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424850E7BA6AB00F5680E /* icons.cpp */; };
-		DF84280E0E7BA6AC00F5680E /* interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424860E7BA6AB00F5680E /* interpreter.cpp */; };
-		DF84280F0E7BA6AC00F5680E /* layers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424880E7BA6AB00F5680E /* layers.cpp */; };
-		DF8428100E7BA6AC00F5680E /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424890E7BA6AB00F5680E /* logic.cpp */; };
-		DF8428110E7BA6AC00F5680E /* maketext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248B0E7BA6AB00F5680E /* maketext.cpp */; };
-		DF8428120E7BA6AC00F5680E /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248D0E7BA6AB00F5680E /* memory.cpp */; };
-		DF8428130E7BA6AC00F5680E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248F0E7BA6AB00F5680E /* menu.cpp */; };
-		DF8428150E7BA6AC00F5680E /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424910E7BA6AB00F5680E /* mouse.cpp */; };
-		DF8428160E7BA6AC00F5680E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424930E7BA6AB00F5680E /* music.cpp */; };
-		DF8428170E7BA6AC00F5680E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424950E7BA6AB00F5680E /* palette.cpp */; };
-		DF8428180E7BA6AC00F5680E /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424960E7BA6AB00F5680E /* protocol.cpp */; };
-		DF8428190E7BA6AC00F5680E /* render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424970E7BA6AB00F5680E /* render.cpp */; };
-		DF84281A0E7BA6AC00F5680E /* resman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424980E7BA6AB00F5680E /* resman.cpp */; };
-		DF84281B0E7BA6AC00F5680E /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249A0E7BA6AB00F5680E /* router.cpp */; };
-		DF84281C0E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249C0E7BA6AB00F5680E /* saveload.cpp */; };
-		DF84281D0E7BA6AC00F5680E /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249E0E7BA6AB00F5680E /* screen.cpp */; };
-		DF84281E0E7BA6AC00F5680E /* scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A00E7BA6AB00F5680E /* scroll.cpp */; };
-		DF84281F0E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A10E7BA6AB00F5680E /* sound.cpp */; };
-		DF8428200E7BA6AC00F5680E /* speech.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A30E7BA6AB00F5680E /* speech.cpp */; };
-		DF8428210E7BA6AC00F5680E /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A40E7BA6AB00F5680E /* sprite.cpp */; };
-		DF8428220E7BA6AC00F5680E /* startup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A50E7BA6AB00F5680E /* startup.cpp */; };
-		DF8428230E7BA6AC00F5680E /* sword2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A60E7BA6AB00F5680E /* sword2.cpp */; };
-		DF8428240E7BA6AC00F5680E /* sync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A80E7BA6AB00F5680E /* sync.cpp */; };
-		DF8428250E7BA6AC00F5680E /* walker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A90E7BA6AB00F5680E /* walker.cpp */; };
-		DF8428260E7BA6AC00F5680E /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AB0E7BA6AB00F5680E /* actors.cpp */; };
-		DF8428270E7BA6AC00F5680E /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AD0E7BA6AB00F5680E /* anim.cpp */; };
-		DF8428280E7BA6AC00F5680E /* background.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AF0E7BA6AB00F5680E /* background.cpp */; };
-		DF8428290E7BA6AC00F5680E /* bg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B10E7BA6AB00F5680E /* bg.cpp */; };
-		DF84282A0E7BA6AC00F5680E /* cliprect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B20E7BA6AB00F5680E /* cliprect.cpp */; };
-		DF84282B0E7BA6AC00F5680E /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B40E7BA6AB00F5680E /* config.cpp */; };
-		DF84282C0E7BA6AC00F5680E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B70E7BA6AB00F5680E /* cursor.cpp */; };
-		DF84282D0E7BA6AC00F5680E /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B90E7BA6AB00F5680E /* debugger.cpp */; };
-		DF84282E0E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BB0E7BA6AB00F5680E /* detection.cpp */; };
-		DF84282F0E7BA6AC00F5680E /* effect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BD0E7BA6AB00F5680E /* effect.cpp */; };
-		DF8428300E7BA6AC00F5680E /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BE0E7BA6AB00F5680E /* events.cpp */; };
-		DF8428310E7BA6AC00F5680E /* faders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C00E7BA6AB00F5680E /* faders.cpp */; };
-		DF8428320E7BA6AC00F5680E /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C30E7BA6AB00F5680E /* font.cpp */; };
-		DF8428330E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C50E7BA6AB00F5680E /* graphics.cpp */; };
-		DF8428340E7BA6AC00F5680E /* handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C70E7BA6AB00F5680E /* handle.cpp */; };
-		DF8428350E7BA6AC00F5680E /* heapmem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C90E7BA6AB00F5680E /* heapmem.cpp */; };
-		DF8428370E7BA6AC00F5680E /* mareels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424CD0E7BA6AB00F5680E /* mareels.cpp */; };
-		DF8428390E7BA6AC00F5680E /* move.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424CF0E7BA6AB00F5680E /* move.cpp */; };
-		DF84283A0E7BA6AC00F5680E /* multiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D10E7BA6AB00F5680E /* multiobj.cpp */; };
-		DF84283B0E7BA6AC00F5680E /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D30E7BA6AB00F5680E /* music.cpp */; };
-		DF84283C0E7BA6AC00F5680E /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D50E7BA6AB00F5680E /* object.cpp */; };
-		DF84283D0E7BA6AC00F5680E /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D70E7BA6AB00F5680E /* palette.cpp */; };
-		DF84283E0E7BA6AC00F5680E /* pcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D90E7BA6AB00F5680E /* pcode.cpp */; };
-		DF84283F0E7BA6AC00F5680E /* pdisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DB0E7BA6AB00F5680E /* pdisplay.cpp */; };
-		DF8428400E7BA6AC00F5680E /* play.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DD0E7BA6AB00F5680E /* play.cpp */; };
-		DF8428410E7BA6AC00F5680E /* polygons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DE0E7BA6AB00F5680E /* polygons.cpp */; };
-		DF8428420E7BA6AC00F5680E /* rince.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E00E7BA6AB00F5680E /* rince.cpp */; };
-		DF8428430E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E20E7BA6AB00F5680E /* saveload.cpp */; };
-		DF8428440E7BA6AC00F5680E /* savescn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E30E7BA6AB00F5680E /* savescn.cpp */; };
-		DF8428450E7BA6AC00F5680E /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E50E7BA6AB00F5680E /* scene.cpp */; };
-		DF8428460E7BA6AC00F5680E /* sched.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E70E7BA6AB00F5680E /* sched.cpp */; };
-		DF8428470E7BA6AC00F5680E /* scn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E90E7BA6AB00F5680E /* scn.cpp */; };
-		DF8428480E7BA6AC00F5680E /* scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424EB0E7BA6AB00F5680E /* scroll.cpp */; };
-		DF8428490E7BA6AC00F5680E /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424EE0E7BA6AB00F5680E /* sound.cpp */; };
-		DF84284A0E7BA6AC00F5680E /* strres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F00E7BA6AB00F5680E /* strres.cpp */; };
-		DF84284B0E7BA6AC00F5680E /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F20E7BA6AB00F5680E /* text.cpp */; };
-		DF84284C0E7BA6AC00F5680E /* timers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F40E7BA6AB00F5680E /* timers.cpp */; };
-		DF84284D0E7BA6AC00F5680E /* tinlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F60E7BA6AB00F5680E /* tinlib.cpp */; };
-		DF84284E0E7BA6AC00F5680E /* tinsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F80E7BA6AB00F5680E /* tinsel.cpp */; };
-		DF84284F0E7BA6AC00F5680E /* token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FA0E7BA6AB00F5680E /* token.cpp */; };
-		DF8428500E7BA6AC00F5680E /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FD0E7BA6AB00F5680E /* detection.cpp */; };
-		DF8428510E7BA6AC00F5680E /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FE0E7BA6AB00F5680E /* graphics.cpp */; };
-		DF8428520E7BA6AC00F5680E /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425000E7BA6AB00F5680E /* menu.cpp */; };
-		DF8428530E7BA6AC00F5680E /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425010E7BA6AB00F5680E /* midi.cpp */; };
-		DF8428550E7BA6AC00F5680E /* opcodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425040E7BA6AB00F5680E /* opcodes.cpp */; };
-		DF8428560E7BA6AC00F5680E /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425050E7BA6AB00F5680E /* resource.cpp */; };
-		DF8428570E7BA6AC00F5680E /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425060E7BA6AB00F5680E /* saveload.cpp */; };
-		DF8428580E7BA6AC00F5680E /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425070E7BA6AB00F5680E /* staticres.cpp */; };
-		DF8428590E7BA6AC00F5680E /* touche.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425080E7BA6AB00F5680E /* touche.cpp */; };
-		DF8428970E7BAAAB00F5680E /* blit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8428960E7BAAAB00F5680E /* blit.cpp */; };
-		DF842A1A0E7BB34E00F5680E /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A160E7BB34E00F5680E /* CoreAudio.framework */; };
-		DF842A1B0E7BB34E00F5680E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; };
-		DF842A1C0E7BB34E00F5680E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A180E7BB34E00F5680E /* Foundation.framework */; };
-		DF842A1D0E7BB34E00F5680E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A190E7BB34E00F5680E /* UIKit.framework */; };
-		DF842A280E7BB37500F5680E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A270E7BB37500F5680E /* AudioToolbox.framework */; };
-		DF842A2F0E7BB39E00F5680E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A2E0E7BB39E00F5680E /* QuartzCore.framework */; };
-		DF842A3E0E7BBB5000F5680E /* timidity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A3D0E7BBB5000F5680E /* timidity.cpp */; };
-		DF842A470E7BBBB400F5680E /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; };
-		DF842A490E7BBBB400F5680E /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; };
-		DF842A6D0E7BBD5700F5680E /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; };
-		DF895C03124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; };
-		DF895C04124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; };
-		DF895C05124C24680077F6E8 /* player_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C01124C24680077F6E8 /* player_towns.cpp */; };
-		DF895C25124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; };
-		DF895C26124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; };
-		DF895C27124C25150077F6E8 /* init_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C24124C25150077F6E8 /* init_fascin.cpp */; };
-		DF895C2A124C25350077F6E8 /* script_patches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C29124C25350077F6E8 /* script_patches.cpp */; };
-		DF895C2B124C25350077F6E8 /* script_patches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C29124C25350077F6E8 /* script_patches.cpp */; };
-		DF895C2C124C25350077F6E8 /* script_patches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF895C29124C25350077F6E8 /* script_patches.cpp */; };
-		DF895C34124C26660077F6E8 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C33124C26660077F6E8 /* icon-72.png */; };
-		DF895C35124C26660077F6E8 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C33124C26660077F6E8 /* icon-72.png */; };
-		DF895C36124C26660077F6E8 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C33124C26660077F6E8 /* icon-72.png */; };
-		DF895C41124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; };
-		DF895C42124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; };
-		DF895C43124C271F0077F6E8 /* icon4.png in Resources */ = {isa = PBXBuildFile; fileRef = DF895C40124C271F0077F6E8 /* icon4.png */; };
-		DF89C2880F62D55C00D756B6 /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; };
-		DF89C2A40F62D79E00D756B6 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; };
-		DF90E9BF10AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; };
-		DF90E9C110AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; };
-		DF90E9C310AEDA9B00C8F93F /* selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90E9BD10AEDA9B00C8F93F /* selector.cpp */; };
-		DF90EAA410B0234300C8F93F /* draw_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */; };
-		DF90EAA510B0234300C8F93F /* draw_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */; };
-		DF90EAA610B0234300C8F93F /* draw_playtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */; };
-		DF90EAAD10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; };
-		DF90EAAE10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; };
-		DF90EAAF10B0236F00C8F93F /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF90EAAB10B0236F00C8F93F /* staticres.cpp */; };
-		DF9B9248118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; };
-		DF9B9249118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; };
-		DF9B924A118E46730069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9246118E46730069C19D /* error.cpp */; };
-		DF9B9252118E46A00069C19D /* fontsjis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B924F118E46A00069C19D /* fontsjis.cpp */; };
-		DF9B9254118E46A00069C19D /* fontsjis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B924F118E46A00069C19D /* fontsjis.cpp */; };
-		DF9B9256118E46A00069C19D /* fontsjis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B924F118E46A00069C19D /* fontsjis.cpp */; };
-		DF9B9262118E46FE0069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9261118E46FE0069C19D /* error.cpp */; };
-		DF9B9263118E46FE0069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9261118E46FE0069C19D /* error.cpp */; };
-		DF9B9264118E46FE0069C19D /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF9B9261118E46FE0069C19D /* error.cpp */; };
-		DFAAAFF70F0112AD003E9390 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFF50F0112AD003E9390 /* saveload.cpp */; };
-		DFAAAFF90F0112C1003E9390 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFF80F0112C1003E9390 /* detection.cpp */; };
-		DFAAAFFC0F0112DF003E9390 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFFB0F0112DF003E9390 /* detection.cpp */; };
-		DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
-		DFAAD23D0F50120E00C3A4E2 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAD2390F50120E00C3A4E2 /* console.cpp */; };
-		DFADEBB313820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; };
-		DFADEBB413820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; };
-		DFADEBB513820DF500C46364 /* maccursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB113820DF500C46364 /* maccursor.cpp */; };
-		DFADEBB713820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; };
-		DFADEBB813820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; };
-		DFADEBB913820E0C00C46364 /* posix-fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFADEBB613820E0C00C46364 /* posix-fs.cpp */; };
-		DFADEC071382140300C46364 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DFADEC061382140300C46364 /* libz.dylib */; };
-		DFB0577611B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; };
-		DFB0577711B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; };
-		DFB0577811B753DA0015AE65 /* rational.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577411B753DA0015AE65 /* rational.cpp */; };
-		DFB0578011B7541F0015AE65 /* resource_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577D11B7541F0015AE65 /* resource_audio.cpp */; };
-		DFB0578111B7541F0015AE65 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577E11B7541F0015AE65 /* util.cpp */; };
-		DFB0578211B7541F0015AE65 /* resource_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577D11B7541F0015AE65 /* resource_audio.cpp */; };
-		DFB0578311B7541F0015AE65 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577E11B7541F0015AE65 /* util.cpp */; };
-		DFB0578411B7541F0015AE65 /* resource_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577D11B7541F0015AE65 /* resource_audio.cpp */; };
-		DFB0578511B7541F0015AE65 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0577E11B7541F0015AE65 /* util.cpp */; };
-		DFB0578A11B754570015AE65 /* maciconbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578811B754570015AE65 /* maciconbar.cpp */; };
-		DFB0578B11B754570015AE65 /* maciconbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578811B754570015AE65 /* maciconbar.cpp */; };
-		DFB0578C11B754570015AE65 /* maciconbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578811B754570015AE65 /* maciconbar.cpp */; };
-		DFB0579111B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; };
-		DFB0579211B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; };
-		DFB0579311B7547D0015AE65 /* pict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB0578F11B7547D0015AE65 /* pict.cpp */; };
-		DFC831210F48AF19005EF03C /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301A0F48AF18005EF03C /* detection.cpp */; };
-		DFC831240F48AF19005EF03C /* gc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301E0F48AF18005EF03C /* gc.cpp */; };
-		DFC831270F48AF19005EF03C /* kernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830230F48AF18005EF03C /* kernel.cpp */; };
-		DFC831280F48AF19005EF03C /* kevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830260F48AF18005EF03C /* kevent.cpp */; };
-		DFC831290F48AF19005EF03C /* kfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830270F48AF18005EF03C /* kfile.cpp */; };
-		DFC8312A0F48AF19005EF03C /* kgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830280F48AF18005EF03C /* kgraphics.cpp */; };
-		DFC8312B0F48AF19005EF03C /* klists.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830290F48AF18005EF03C /* klists.cpp */; };
-		DFC8312C0F48AF19005EF03C /* kmath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302A0F48AF18005EF03C /* kmath.cpp */; };
-		DFC8312D0F48AF19005EF03C /* kmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302B0F48AF18005EF03C /* kmenu.cpp */; };
-		DFC8312E0F48AF19005EF03C /* kmovement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302C0F48AF18005EF03C /* kmovement.cpp */; };
-		DFC8312F0F48AF19005EF03C /* kpathing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302D0F48AF18005EF03C /* kpathing.cpp */; };
-		DFC831300F48AF19005EF03C /* kscripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302E0F48AF18005EF03C /* kscripts.cpp */; };
-		DFC831310F48AF19005EF03C /* ksound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302F0F48AF18005EF03C /* ksound.cpp */; };
-		DFC831320F48AF19005EF03C /* kstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830300F48AF18005EF03C /* kstring.cpp */; };
-		DFC831330F48AF19005EF03C /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830310F48AF18005EF03C /* message.cpp */; };
-		DFC831370F48AF19005EF03C /* savegame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830360F48AF18005EF03C /* savegame.cpp */; };
-		DFC831390F48AF19005EF03C /* scriptdebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830390F48AF18005EF03C /* scriptdebug.cpp */; };
-		DFC8313A0F48AF19005EF03C /* seg_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8303A0F48AF18005EF03C /* seg_manager.cpp */; };
-		DFC8313C0F48AF19005EF03C /* vm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8303C0F48AF18005EF03C /* vm.cpp */; };
-		DFC8315C0F48AF19005EF03C /* sci.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830960F48AF18005EF03C /* sci.cpp */; };
-		DFCDC6D9116629CE00A7D2A0 /* features.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6D5116629CE00A7D2A0 /* features.cpp */; };
-		DFCDC6DA116629CE00A7D2A0 /* kparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */; };
-		DFCDC6DB116629CE00A7D2A0 /* features.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6D5116629CE00A7D2A0 /* features.cpp */; };
-		DFCDC6DC116629CE00A7D2A0 /* kparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */; };
-		DFCDC6DD116629CE00A7D2A0 /* features.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6D5116629CE00A7D2A0 /* features.cpp */; };
-		DFCDC6DE116629CE00A7D2A0 /* kparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */; };
-		DFCDC6F711662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; };
-		DFCDC6F811662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; };
-		DFCDC6F911662AAB00A7D2A0 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC6F611662AAB00A7D2A0 /* resource.cpp */; };
-		DFCDC70411662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; };
-		DFCDC70511662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; };
-		DFCDC70611662B0200A7D2A0 /* saveload_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */; };
-		DFCDC70B11662B6B00A7D2A0 /* macresman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70911662B6B00A7D2A0 /* macresman.cpp */; };
-		DFCDC70C11662B6B00A7D2A0 /* macresman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70911662B6B00A7D2A0 /* macresman.cpp */; };
-		DFCDC70D11662B6B00A7D2A0 /* macresman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCDC70911662B6B00A7D2A0 /* macresman.cpp */; };
-		DFD511480DF3383500854012 /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; };
-		DFD517E20DF33CAC00854012 /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; };
-		DFD5183D0DF3411800854012 /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; };
-		DFD518A20DF34B2500854012 /* scalebit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518A00DF34B2500854012 /* scalebit.cpp */; };
-		DFD518BC0DF34BA600854012 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AA0DF34BA600854012 /* 2xsai.cpp */; };
-		DFD518BD0DF34BA600854012 /* aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AB0DF34BA600854012 /* aspect.cpp */; };
-		DFD518C50DF34BA600854012 /* scale2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B50DF34BA600854012 /* scale2x.cpp */; };
-		DFD518C70DF34BA600854012 /* scale3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B80DF34BA600854012 /* scale3x.cpp */; };
-		DFD6470C0F495B51008E18EF /* unzip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C10D81F4E800B6D1FB /* unzip.cpp */; };
-		DFE470CE0D81F4BA00B6D1FB /* commandLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470C10D81F4BA00B6D1FB /* commandLine.cpp */; };
-		DFE470D10D81F4BA00B6D1FB /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470C70D81F4BA00B6D1FB /* main.cpp */; };
-		DFE470D30D81F4BA00B6D1FB /* plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470CA0D81F4BA00B6D1FB /* plugins.cpp */; };
-		DFE470D40D81F4BA00B6D1FB /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470CC0D81F4BA00B6D1FB /* version.cpp */; };
-		DFE4782B0D81F4E900B6D1FB /* default-events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470D80D81F4E700B6D1FB /* default-events.cpp */; };
-		DFE478380D81F4E900B6D1FB /* posix-fs-factory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */; };
-		DFE478C50D81F4E900B6D1FB /* iphone_main.m in Sources */ = {isa = PBXBuildFile; fileRef = DFE471E10D81F4E700B6D1FB /* iphone_main.m */; };
-		DFE479B60D81F4E900B6D1FB /* posix-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473810D81F4E800B6D1FB /* posix-provider.cpp */; };
-		DFE479BA0D81F4E900B6D1FB /* default-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4738E0D81F4E800B6D1FB /* default-saves.cpp */; };
-		DFE479BB0D81F4E900B6D1FB /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473900D81F4E800B6D1FB /* savefile.cpp */; };
-		DFE479BC0D81F4E900B6D1FB /* default-timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473930D81F4E800B6D1FB /* default-timer.cpp */; };
-		DFE479BE0D81F4E900B6D1FB /* config-file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4739A0D81F4E800B6D1FB /* config-file.cpp */; };
-		DFE479BF0D81F4E900B6D1FB /* config-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4739C0D81F4E800B6D1FB /* config-manager.cpp */; };
-		DFE479C00D81F4E900B6D1FB /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A10D81F4E800B6D1FB /* file.cpp */; };
-		DFE479C10D81F4E900B6D1FB /* fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A40D81F4E800B6D1FB /* fs.cpp */; };
-		DFE479C20D81F4E900B6D1FB /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A80D81F4E800B6D1FB /* hashmap.cpp */; };
-		DFE479C30D81F4E900B6D1FB /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473AD0D81F4E800B6D1FB /* md5.cpp */; };
-		DFE479C50D81F4E900B6D1FB /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473B00D81F4E800B6D1FB /* mutex.cpp */; };
-		DFE479C60D81F4E900B6D1FB /* str.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BA0D81F4E800B6D1FB /* str.cpp */; };
-		DFE479C70D81F4E900B6D1FB /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BC0D81F4E800B6D1FB /* stream.cpp */; };
-		DFE479C80D81F4E900B6D1FB /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BE0D81F4E800B6D1FB /* system.cpp */; };
-		DFE479CA0D81F4E900B6D1FB /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C30D81F4E800B6D1FB /* util.cpp */; };
-		DFE479CB0D81F4E900B6D1FB /* zlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C50D81F4E800B6D1FB /* zlib.cpp */; };
-		DFE47BFB0D81F4E900B6D1FB /* cursorman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477540D81F4E900B6D1FB /* cursorman.cpp */; };
-		DFE47BFD0D81F4E900B6D1FB /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477580D81F4E900B6D1FB /* font.cpp */; };
-		DFE47BFE0D81F4E900B6D1FB /* fontman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775A0D81F4E900B6D1FB /* fontman.cpp */; };
-		DFE47BFF0D81F4E900B6D1FB /* consolefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */; };
-		DFE47C000D81F4E900B6D1FB /* newfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775E0D81F4E900B6D1FB /* newfont.cpp */; };
-		DFE47C010D81F4E900B6D1FB /* newfont_big.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */; };
-		DFE47C030D81F4E900B6D1FB /* iff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477610D81F4E900B6D1FB /* iff.cpp */; };
-		DFE47C040D81F4E900B6D1FB /* imagedec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477630D81F4E900B6D1FB /* imagedec.cpp */; };
-		DFE47C080D81F4E900B6D1FB /* primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4776A0D81F4E900B6D1FB /* primitives.cpp */; };
-		DFE47C1B0D81F4E900B6D1FB /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477860D81F4E900B6D1FB /* surface.cpp */; };
-		DFE47C1C0D81F4E900B6D1FB /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477890D81F4E900B6D1FB /* about.cpp */; };
-		DFE47C1D0D81F4E900B6D1FB /* Actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778B0D81F4E900B6D1FB /* Actions.cpp */; };
-		DFE47C1E0D81F4E900B6D1FB /* browser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778D0D81F4E900B6D1FB /* browser.cpp */; };
-		DFE47C1F0D81F4E900B6D1FB /* chooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778F0D81F4E900B6D1FB /* chooser.cpp */; };
-		DFE47C200D81F4E900B6D1FB /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; };
-		DFE47C210D81F4E900B6D1FB /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; };
-		DFE47C220D81F4E900B6D1FB /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; };
-		DFE47C260D81F4E900B6D1FB /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; };
-		DFE47C280D81F4E900B6D1FB /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; };
-		DFE47C2A0D81F4E900B6D1FB /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; };
-		DFE47C2B0D81F4E900B6D1FB /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; };
-		DFE47C2E0D81F4E900B6D1FB /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; };
-		DFE47C2F0D81F4E900B6D1FB /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; };
-		DFE47C350D81F4E900B6D1FB /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; };
-		DFE47C3B0D81F4E900B6D1FB /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; };
-		DFE47C870D81F86900B6D1FB /* kyra.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C810D81F86900B6D1FB /* kyra.dat */; };
-		DFE47C880D81F86900B6D1FB /* lure.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C820D81F86900B6D1FB /* lure.dat */; };
-		DFE47C890D81F86900B6D1FB /* queen.tbl in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C830D81F86900B6D1FB /* queen.tbl */; };
-		DFE47C8B0D81F86900B6D1FB /* sky.cpt in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C850D81F86900B6D1FB /* sky.cpt */; };
-		DFE88C460F874A1100C555C5 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE88C440F874A1100C555C5 /* sound.cpp */; };
-		DFE88C470F874A1100C555C5 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE88C440F874A1100C555C5 /* sound.cpp */; };
-		DFEC5D101166C5CF00C90552 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D0A1166C5CF00C90552 /* random.cpp */; };
-		DFEC5D111166C5CF00C90552 /* tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D0D1166C5CF00C90552 /* tokenizer.cpp */; };
-		DFEC5D121166C5CF00C90552 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D0A1166C5CF00C90552 /* random.cpp */; };
-		DFEC5D131166C5CF00C90552 /* tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D0D1166C5CF00C90552 /* tokenizer.cpp */; };
-		DFEC5D141166C5CF00C90552 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D0A1166C5CF00C90552 /* random.cpp */; };
-		DFEC5D151166C5CF00C90552 /* tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D0D1166C5CF00C90552 /* tokenizer.cpp */; };
-		DFEC5D361166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; };
-		DFEC5D371166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; };
-		DFEC5D381166C67300C90552 /* savestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFEC5D341166C67300C90552 /* savestate.cpp */; };
-		DFF959050FB22D3000A3EC78 /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476C0F49F7EF008E18EF /* libmad.a */; };
-		DFF959060FB22D3100A3EC78 /* libFLAC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476B0F49F7EF008E18EF /* libFLAC.a */; };
-		DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476F0F49F7EF008E18EF /* libvorbisidec.a */; };
-		DFF9590D0FB22D5700A3EC78 /* scummclassic.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFBDB0F485E480006E566 /* scummclassic.zip */; };
-		DFF9590E0FB22D5700A3EC78 /* scummmodern.zip in Resources */ = {isa = PBXBuildFile; fileRef = DF7E8C7A0ED601E5001CB19F /* scummmodern.zip */; };
-		DFF959100FB22D5700A3EC78 /* kyra.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C810D81F86900B6D1FB /* kyra.dat */; };
-		DFF959110FB22D5700A3EC78 /* lure.dat in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C820D81F86900B6D1FB /* lure.dat */; };
-		DFF959120FB22D5700A3EC78 /* queen.tbl in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C830D81F86900B6D1FB /* queen.tbl */; };
-		DFF959130FB22D5700A3EC78 /* sky.cpt in Resources */ = {isa = PBXBuildFile; fileRef = DFE47C850D81F86900B6D1FB /* sky.cpt */; };
-		DFF959140FB22D5700A3EC78 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD290F48717F0006E566 /* Default.png */; };
-		DFF959150FB22D5700A3EC78 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = DF2FFD2A0F48717F0006E566 /* icon.png */; };
-		DFF959170FB22D5700A3EC78 /* commandLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470C10D81F4BA00B6D1FB /* commandLine.cpp */; };
-		DFF959180FB22D5700A3EC78 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470C70D81F4BA00B6D1FB /* main.cpp */; };
-		DFF959190FB22D5700A3EC78 /* plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470CA0D81F4BA00B6D1FB /* plugins.cpp */; };
-		DFF9591A0FB22D5700A3EC78 /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470CC0D81F4BA00B6D1FB /* version.cpp */; };
-		DFF9591B0FB22D5700A3EC78 /* default-events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470D80D81F4E700B6D1FB /* default-events.cpp */; };
-		DFF9591C0FB22D5700A3EC78 /* posix-fs-factory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */; };
-		DFF9591D0FB22D5700A3EC78 /* iphone_main.m in Sources */ = {isa = PBXBuildFile; fileRef = DFE471E10D81F4E700B6D1FB /* iphone_main.m */; };
-		DFF9591F0FB22D5700A3EC78 /* posix-provider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473810D81F4E800B6D1FB /* posix-provider.cpp */; };
-		DFF959200FB22D5700A3EC78 /* default-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4738E0D81F4E800B6D1FB /* default-saves.cpp */; };
-		DFF959210FB22D5700A3EC78 /* savefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473900D81F4E800B6D1FB /* savefile.cpp */; };
-		DFF959220FB22D5700A3EC78 /* default-timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473930D81F4E800B6D1FB /* default-timer.cpp */; };
-		DFF959230FB22D5700A3EC78 /* config-file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4739A0D81F4E800B6D1FB /* config-file.cpp */; };
-		DFF959240FB22D5700A3EC78 /* config-manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4739C0D81F4E800B6D1FB /* config-manager.cpp */; };
-		DFF959250FB22D5700A3EC78 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A10D81F4E800B6D1FB /* file.cpp */; };
-		DFF959260FB22D5700A3EC78 /* fs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A40D81F4E800B6D1FB /* fs.cpp */; };
-		DFF959270FB22D5700A3EC78 /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473A80D81F4E800B6D1FB /* hashmap.cpp */; };
-		DFF959280FB22D5700A3EC78 /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473AD0D81F4E800B6D1FB /* md5.cpp */; };
-		DFF959290FB22D5700A3EC78 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473B00D81F4E800B6D1FB /* mutex.cpp */; };
-		DFF9592A0FB22D5700A3EC78 /* str.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BA0D81F4E800B6D1FB /* str.cpp */; };
-		DFF9592B0FB22D5700A3EC78 /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BC0D81F4E800B6D1FB /* stream.cpp */; };
-		DFF9592C0FB22D5700A3EC78 /* system.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473BE0D81F4E800B6D1FB /* system.cpp */; };
-		DFF9592D0FB22D5700A3EC78 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C30D81F4E800B6D1FB /* util.cpp */; };
-		DFF9592E0FB22D5700A3EC78 /* zlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C50D81F4E800B6D1FB /* zlib.cpp */; };
-		DFF9592F0FB22D5700A3EC78 /* cursorman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477540D81F4E900B6D1FB /* cursorman.cpp */; };
-		DFF959300FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477580D81F4E900B6D1FB /* font.cpp */; };
-		DFF959310FB22D5700A3EC78 /* fontman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775A0D81F4E900B6D1FB /* fontman.cpp */; };
-		DFF959320FB22D5700A3EC78 /* consolefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */; };
-		DFF959330FB22D5700A3EC78 /* newfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775E0D81F4E900B6D1FB /* newfont.cpp */; };
-		DFF959340FB22D5700A3EC78 /* newfont_big.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */; };
-		DFF959360FB22D5700A3EC78 /* iff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477610D81F4E900B6D1FB /* iff.cpp */; };
-		DFF959370FB22D5700A3EC78 /* imagedec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477630D81F4E900B6D1FB /* imagedec.cpp */; };
-		DFF959380FB22D5700A3EC78 /* primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4776A0D81F4E900B6D1FB /* primitives.cpp */; };
-		DFF959390FB22D5700A3EC78 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477860D81F4E900B6D1FB /* surface.cpp */; };
-		DFF9593A0FB22D5700A3EC78 /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477890D81F4E900B6D1FB /* about.cpp */; };
-		DFF9593B0FB22D5700A3EC78 /* Actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778B0D81F4E900B6D1FB /* Actions.cpp */; };
-		DFF9593C0FB22D5700A3EC78 /* browser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778D0D81F4E900B6D1FB /* browser.cpp */; };
-		DFF9593D0FB22D5700A3EC78 /* chooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4778F0D81F4E900B6D1FB /* chooser.cpp */; };
-		DFF9593E0FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477910D81F4E900B6D1FB /* console.cpp */; };
-		DFF9593F0FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477940D81F4E900B6D1FB /* debugger.cpp */; };
-		DFF959400FB22D5700A3EC78 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477960D81F4E900B6D1FB /* dialog.cpp */; };
-		DFF959430FB22D5700A3EC78 /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE4779E0D81F4E900B6D1FB /* Key.cpp */; };
-		DFF959440FB22D5700A3EC78 /* launcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A20D81F4E900B6D1FB /* launcher.cpp */; };
-		DFF959460FB22D5700A3EC78 /* massadd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A60D81F4E900B6D1FB /* massadd.cpp */; };
-		DFF959470FB22D5700A3EC78 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477A80D81F4E900B6D1FB /* message.cpp */; };
-		DFF959480FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AD0D81F4E900B6D1FB /* object.cpp */; };
-		DFF959490FB22D5700A3EC78 /* options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477AF0D81F4E900B6D1FB /* options.cpp */; };
-		DFF9594D0FB22D5700A3EC78 /* themebrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */; };
-		DFF9594E0FB22D5700A3EC78 /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE477C40D81F4E900B6D1FB /* widget.cpp */; };
-		DFF9596C0FB22D5700A3EC78 /* memorypool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD511460DF3383500854012 /* memorypool.cpp */; };
-		DFF9596D0FB22D5700A3EC78 /* seq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD517E10DF33CAC00854012 /* seq.cpp */; };
-		DFF9596E0FB22D5700A3EC78 /* scaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD5183B0DF3411800854012 /* scaler.cpp */; };
-		DFF9596F0FB22D5700A3EC78 /* scalebit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518A00DF34B2500854012 /* scalebit.cpp */; };
-		DFF959700FB22D5700A3EC78 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AA0DF34BA600854012 /* 2xsai.cpp */; };
-		DFF959710FB22D5700A3EC78 /* aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518AB0DF34BA600854012 /* aspect.cpp */; };
-		DFF959740FB22D5700A3EC78 /* scale2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B50DF34BA600854012 /* scale2x.cpp */; };
-		DFF959750FB22D5700A3EC78 /* scale3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD518B80DF34BA600854012 /* scale3x.cpp */; };
-		DFF959760FB22D5700A3EC78 /* iphone_keyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = DF841FD90E7BA61800F5680E /* iphone_keyboard.m */; };
-		DFF959770FB22D5700A3EC78 /* iphone_video.m in Sources */ = {isa = PBXBuildFile; fileRef = DF841FDB0E7BA61800F5680E /* iphone_video.m */; };
-		DFF959780FB22D5700A3EC78 /* agi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF70E7BA6A600F5680E /* agi.cpp */; };
-		DFF959790FB22D5700A3EC78 /* checks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FF90E7BA6A600F5680E /* checks.cpp */; };
-		DFF9597A0FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFA0E7BA6A600F5680E /* console.cpp */; };
-		DFF9597B0FB22D5700A3EC78 /* cycle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFC0E7BA6A600F5680E /* cycle.cpp */; };
-		DFF9597C0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFD0E7BA6A600F5680E /* detection.cpp */; };
-		DFF9597D0FB22D5700A3EC78 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF841FFF0E7BA6A600F5680E /* global.cpp */; };
-		DFF9597E0FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420000E7BA6A600F5680E /* graphics.cpp */; };
-		DFF9597F0FB22D5700A3EC78 /* id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420020E7BA6A600F5680E /* id.cpp */; };
-		DFF959800FB22D5700A3EC78 /* inv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420030E7BA6A600F5680E /* inv.cpp */; };
-		DFF959810FB22D5700A3EC78 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420040E7BA6A600F5680E /* keyboard.cpp */; };
-		DFF959820FB22D5700A3EC78 /* loader_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420060E7BA6A600F5680E /* loader_v2.cpp */; };
-		DFF959830FB22D5700A3EC78 /* loader_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420070E7BA6A600F5680E /* loader_v3.cpp */; };
-		DFF959840FB22D5700A3EC78 /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420080E7BA6A600F5680E /* logic.cpp */; };
-		DFF959850FB22D5700A3EC78 /* lzw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200A0E7BA6A600F5680E /* lzw.cpp */; };
-		DFF959860FB22D5700A3EC78 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200C0E7BA6A600F5680E /* menu.cpp */; };
-		DFF959870FB22D5700A3EC78 /* motion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84200F0E7BA6A600F5680E /* motion.cpp */; };
-		DFF959880FB22D5700A3EC78 /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420100E7BA6A600F5680E /* objects.cpp */; };
-		DFF959890FB22D5700A3EC78 /* op_cmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420110E7BA6A600F5680E /* op_cmd.cpp */; };
-		DFF9598A0FB22D5700A3EC78 /* op_dbg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420120E7BA6A600F5680E /* op_dbg.cpp */; };
-		DFF9598B0FB22D5700A3EC78 /* op_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420130E7BA6A600F5680E /* op_test.cpp */; };
-		DFF9598C0FB22D5700A3EC78 /* picture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420150E7BA6A600F5680E /* picture.cpp */; };
-		DFF9598D0FB22D5700A3EC78 /* preagi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420170E7BA6A600F5680E /* preagi.cpp */; };
-		DFF9598E0FB22D5700A3EC78 /* preagi_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420190E7BA6A600F5680E /* preagi_common.cpp */; };
-		DFF9598F0FB22D5700A3EC78 /* preagi_mickey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201B0E7BA6A600F5680E /* preagi_mickey.cpp */; };
-		DFF959900FB22D5700A3EC78 /* preagi_troll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201D0E7BA6A600F5680E /* preagi_troll.cpp */; };
-		DFF959910FB22D5700A3EC78 /* preagi_winnie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84201F0E7BA6A600F5680E /* preagi_winnie.cpp */; };
-		DFF959920FB22D5700A3EC78 /* predictive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420210E7BA6A600F5680E /* predictive.cpp */; };
-		DFF959930FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420220E7BA6A600F5680E /* saveload.cpp */; };
-		DFF959940FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420230E7BA6A600F5680E /* sound.cpp */; };
-		DFF959950FB22D5700A3EC78 /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420250E7BA6A600F5680E /* sprite.cpp */; };
-		DFF959960FB22D5700A3EC78 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420270E7BA6A600F5680E /* text.cpp */; };
-		DFF959970FB22D5700A3EC78 /* view.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420280E7BA6A600F5680E /* view.cpp */; };
-		DFF959980FB22D5700A3EC78 /* wagparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202A0E7BA6A600F5680E /* wagparser.cpp */; };
-		DFF959990FB22D5700A3EC78 /* words.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202C0E7BA6A600F5680E /* words.cpp */; };
-		DFF9599A0FB22D5700A3EC78 /* agos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84202E0E7BA6A600F5680E /* agos.cpp */; };
-		DFF9599B0FB22D5700A3EC78 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420300E7BA6A600F5680E /* animation.cpp */; };
-		DFF9599C0FB22D5700A3EC78 /* charset-fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420320E7BA6A600F5680E /* charset-fontdata.cpp */; };
-		DFF9599D0FB22D5700A3EC78 /* charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420330E7BA6A600F5680E /* charset.cpp */; };
-		DFF9599E0FB22D5700A3EC78 /* contain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420340E7BA6A600F5680E /* contain.cpp */; };
-		DFF9599F0FB22D5700A3EC78 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420350E7BA6A600F5680E /* cursor.cpp */; };
-		DFF959A00FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420360E7BA6A600F5680E /* debug.cpp */; };
-		DFF959A10FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420380E7BA6A600F5680E /* debugger.cpp */; };
-		DFF959A20FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203A0E7BA6A600F5680E /* detection.cpp */; };
-		DFF959A30FB22D5700A3EC78 /* draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203C0E7BA6A600F5680E /* draw.cpp */; };
-		DFF959A40FB22D5700A3EC78 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203D0E7BA6A600F5680E /* event.cpp */; };
-		DFF959A50FB22D5700A3EC78 /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203E0E7BA6A600F5680E /* gfx.cpp */; };
-		DFF959A60FB22D5700A3EC78 /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84203F0E7BA6A600F5680E /* icons.cpp */; };
-		DFF959A70FB22D5700A3EC78 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420400E7BA6A600F5680E /* input.cpp */; };
-		DFF959A80FB22D5700A3EC78 /* items.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420420E7BA6A600F5680E /* items.cpp */; };
-		DFF959A90FB22D5700A3EC78 /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420430E7BA6A600F5680E /* menus.cpp */; };
-		DFF959AA0FB22D5700A3EC78 /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420440E7BA6A600F5680E /* midi.cpp */; };
-		DFF959AB0FB22D5700A3EC78 /* midiparser_s1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420460E7BA6A600F5680E /* midiparser_s1d.cpp */; };
-		DFF959AC0FB22D5700A3EC78 /* oracle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420480E7BA6A600F5680E /* oracle.cpp */; };
-		DFF959AD0FB22D5700A3EC78 /* res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420490E7BA6A600F5680E /* res.cpp */; };
-		DFF959AE0FB22D5700A3EC78 /* res_ami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204A0E7BA6A600F5680E /* res_ami.cpp */; };
-		DFF959AF0FB22D5700A3EC78 /* res_snd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204B0E7BA6A600F5680E /* res_snd.cpp */; };
-		DFF959B00FB22D5700A3EC78 /* rooms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204C0E7BA6A600F5680E /* rooms.cpp */; };
-		DFF959B10FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204D0E7BA6A600F5680E /* saveload.cpp */; };
-		DFF959B20FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204E0E7BA6A600F5680E /* script.cpp */; };
-		DFF959B30FB22D5700A3EC78 /* script_e1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84204F0E7BA6A600F5680E /* script_e1.cpp */; };
-		DFF959B40FB22D5700A3EC78 /* script_e2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420500E7BA6A600F5680E /* script_e2.cpp */; };
-		DFF959B50FB22D5700A3EC78 /* script_ff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420510E7BA6A600F5680E /* script_ff.cpp */; };
-		DFF959B60FB22D5700A3EC78 /* script_pp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420520E7BA6A600F5680E /* script_pp.cpp */; };
-		DFF959B70FB22D5700A3EC78 /* script_s1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420530E7BA6A600F5680E /* script_s1.cpp */; };
-		DFF959B80FB22D5700A3EC78 /* script_s2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420540E7BA6A600F5680E /* script_s2.cpp */; };
-		DFF959B90FB22D5700A3EC78 /* script_ww.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420550E7BA6A600F5680E /* script_ww.cpp */; };
-		DFF959BA0FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420560E7BA6A600F5680E /* sound.cpp */; };
-		DFF959BB0FB22D5700A3EC78 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420580E7BA6A600F5680E /* string.cpp */; };
-		DFF959BC0FB22D5700A3EC78 /* subroutine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420590E7BA6A600F5680E /* subroutine.cpp */; };
-		DFF959BD0FB22D5700A3EC78 /* verb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205A0E7BA6A600F5680E /* verb.cpp */; };
-		DFF959BE0FB22D5700A3EC78 /* vga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205B0E7BA6A600F5680E /* vga.cpp */; };
-		DFF959BF0FB22D5700A3EC78 /* vga_e2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205D0E7BA6A600F5680E /* vga_e2.cpp */; };
-		DFF959C00FB22D5700A3EC78 /* vga_ff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205E0E7BA6A600F5680E /* vga_ff.cpp */; };
-		DFF959C10FB22D5700A3EC78 /* vga_s1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84205F0E7BA6A600F5680E /* vga_s1.cpp */; };
-		DFF959C20FB22D5700A3EC78 /* vga_s2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420600E7BA6A600F5680E /* vga_s2.cpp */; };
-		DFF959C30FB22D5700A3EC78 /* vga_ww.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420610E7BA6A600F5680E /* vga_ww.cpp */; };
-		DFF959C40FB22D5700A3EC78 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420620E7BA6A600F5680E /* window.cpp */; };
-		DFF959C50FB22D5700A3EC78 /* zones.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420630E7BA6A600F5680E /* zones.cpp */; };
-		DFF959C60FB22D5700A3EC78 /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420650E7BA6A600F5680E /* anim.cpp */; };
-		DFF959C70FB22D5700A3EC78 /* bg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420670E7BA6A600F5680E /* bg.cpp */; };
-		DFF959C80FB22D5700A3EC78 /* bg_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420690E7BA6A600F5680E /* bg_list.cpp */; };
-		DFF959C90FB22D5700A3EC78 /* cine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206B0E7BA6A600F5680E /* cine.cpp */; };
-		DFF959CA0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206D0E7BA6A600F5680E /* detection.cpp */; };
-		DFF959CB0FB22D5700A3EC78 /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84206E0E7BA6A600F5680E /* gfx.cpp */; };
-		DFF959CC0FB22D5700A3EC78 /* main_loop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420700E7BA6A600F5680E /* main_loop.cpp */; };
-		DFF959CD0FB22D5700A3EC78 /* msg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420730E7BA6A600F5680E /* msg.cpp */; };
-		DFF959CE0FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420750E7BA6A600F5680E /* object.cpp */; };
-		DFF959CF0FB22D5700A3EC78 /* pal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420770E7BA6A600F5680E /* pal.cpp */; };
-		DFF959D00FB22D5700A3EC78 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420790E7BA6A600F5680E /* part.cpp */; };
-		DFF959D10FB22D5700A3EC78 /* prc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84207B0E7BA6A600F5680E /* prc.cpp */; };
-		DFF959D20FB22D5700A3EC78 /* rel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84207D0E7BA6A600F5680E /* rel.cpp */; };
-		DFF959D30FB22D5700A3EC78 /* script_fw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420800E7BA6A600F5680E /* script_fw.cpp */; };
-		DFF959D40FB22D5700A3EC78 /* script_os.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420810E7BA6A600F5680E /* script_os.cpp */; };
-		DFF959D50FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420820E7BA6A600F5680E /* sound.cpp */; };
-		DFF959D60FB22D5700A3EC78 /* texte.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420840E7BA6A600F5680E /* texte.cpp */; };
-		DFF959D70FB22D5700A3EC78 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420860E7BA6A600F5680E /* unpack.cpp */; };
-		DFF959D80FB22D5700A3EC78 /* various.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420880E7BA6A600F5680E /* various.cpp */; };
-		DFF959D90FB22D5700A3EC78 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420AB0E7BA6A600F5680E /* actor.cpp */; };
-		DFF959DA0FB22D5700A3EC78 /* background.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420AE0E7BA6A600F5680E /* background.cpp */; };
-		DFF959DB0FB22D5700A3EC78 /* backgroundIncrust.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B10E7BA6A600F5680E /* backgroundIncrust.cpp */; };
-		DFF959DC0FB22D5700A3EC78 /* cell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B40E7BA6A600F5680E /* cell.cpp */; };
-		DFF959DD0FB22D5700A3EC78 /* cruise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420B70E7BA6A600F5680E /* cruise.cpp */; };
-		DFF959DE0FB22D5700A3EC78 /* cruise_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420BA0E7BA6A700F5680E /* cruise_main.cpp */; };
-		DFF959DF0FB22D5700A3EC78 /* ctp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420BD0E7BA6A700F5680E /* ctp.cpp */; };
-		DFF959E00FB22D5700A3EC78 /* dataLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C00E7BA6A700F5680E /* dataLoader.cpp */; };
-		DFF959E10FB22D5700A3EC78 /* decompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C30E7BA6A700F5680E /* decompiler.cpp */; };
-		DFF959E20FB22D5700A3EC78 /* delphine-unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C50E7BA6A700F5680E /* delphine-unpack.cpp */; };
-		DFF959E30FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C70E7BA6A700F5680E /* detection.cpp */; };
-		DFF959E40FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420C90E7BA6A700F5680E /* font.cpp */; };
-		DFF959E50FB22D5700A3EC78 /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420CF0E7BA6A700F5680E /* function.cpp */; };
-		DFF959E60FB22D5700A3EC78 /* gfxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D20E7BA6A700F5680E /* gfxModule.cpp */; };
-		DFF959E70FB22D5700A3EC78 /* linker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D60E7BA6A700F5680E /* linker.cpp */; };
-		DFF959E80FB22D5700A3EC78 /* mainDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420D90E7BA6A700F5680E /* mainDraw.cpp */; };
-		DFF959E90FB22D5700A3EC78 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420DC0E7BA6A700F5680E /* menu.cpp */; };
-		DFF959EA0FB22D5700A3EC78 /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E00E7BA6A700F5680E /* mouse.cpp */; };
-		DFF959EB0FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E30E7BA6A700F5680E /* object.cpp */; };
-		DFF959EC0FB22D5700A3EC78 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E60E7BA6A700F5680E /* overlay.cpp */; };
-		DFF959ED0FB22D5700A3EC78 /* perso.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420E90E7BA6A700F5680E /* perso.cpp */; };
-		DFF959EE0FB22D5700A3EC78 /* polys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420EC0E7BA6A700F5680E /* polys.cpp */; };
-		DFF959EF0FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420EF0E7BA6A700F5680E /* saveload.cpp */; };
-		DFF959F00FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F20E7BA6A700F5680E /* script.cpp */; };
-		DFF959F10FB22D5700A3EC78 /* stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F50E7BA6A700F5680E /* stack.cpp */; };
-		DFF959F20FB22D5700A3EC78 /* various.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420F90E7BA6A700F5680E /* various.cpp */; };
-		DFF959F30FB22D5700A3EC78 /* vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420FC0E7BA6A700F5680E /* vars.cpp */; };
-		DFF959F40FB22D5700A3EC78 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8420FF0E7BA6A700F5680E /* volume.cpp */; };
-		DFF959F50FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421020E7BA6A700F5680E /* dialogs.cpp */; };
-		DFF959F60FB22D5700A3EC78 /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421050E7BA6A700F5680E /* actors.cpp */; };
-		DFF959F70FB22D5700A3EC78 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421060E7BA6A700F5680E /* animation.cpp */; };
-		DFF959F80FB22D5700A3EC78 /* converse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421070E7BA6A700F5680E /* converse.cpp */; };
-		DFF959F90FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421080E7BA6A700F5680E /* detection.cpp */; };
-		DFF959FA0FB22D5700A3EC78 /* drascula.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421090E7BA6A700F5680E /* drascula.cpp */; };
-		DFF959FB0FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210B0E7BA6A700F5680E /* graphics.cpp */; };
-		DFF959FC0FB22D5700A3EC78 /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210C0E7BA6A700F5680E /* interface.cpp */; };
-		DFF959FD0FB22D5700A3EC78 /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210E0E7BA6A700F5680E /* objects.cpp */; };
-		DFF959FE0FB22D5700A3EC78 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84210F0E7BA6A700F5680E /* palette.cpp */; };
-		DFF959FF0FB22D5700A3EC78 /* rooms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421100E7BA6A700F5680E /* rooms.cpp */; };
-		DFF95A000FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421110E7BA6A700F5680E /* saveload.cpp */; };
-		DFF95A010FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421120E7BA6A700F5680E /* sound.cpp */; };
-		DFF95A020FB22D5700A3EC78 /* talk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421130E7BA6A700F5680E /* talk.cpp */; };
-		DFF95A030FB22D5700A3EC78 /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421140E7BA6A700F5680E /* engine.cpp */; };
-		DFF95A050FB22D5700A3EC78 /* dataio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211B0E7BA6A700F5680E /* dataio.cpp */; };
-		DFF95A060FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211D0E7BA6A700F5680E /* detection.cpp */; };
-		DFF95A070FB22D5700A3EC78 /* draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84211E0E7BA6A700F5680E /* draw.cpp */; };
-		DFF95A080FB22D5700A3EC78 /* draw_bargon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421200E7BA6A700F5680E /* draw_bargon.cpp */; };
-		DFF95A090FB22D5700A3EC78 /* draw_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421210E7BA6A700F5680E /* draw_v1.cpp */; };
-		DFF95A0A0FB22D5700A3EC78 /* draw_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421220E7BA6A700F5680E /* draw_v2.cpp */; };
-		DFF95A0C0FB22D5700A3EC78 /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421250E7BA6A700F5680E /* game.cpp */; };
-		DFF95A0F0FB22D5700A3EC78 /* global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421290E7BA6A700F5680E /* global.cpp */; };
-		DFF95A100FB22D5700A3EC78 /* gob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212B0E7BA6A700F5680E /* gob.cpp */; };
-		DFF95A110FB22D5700A3EC78 /* goblin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212D0E7BA6A700F5680E /* goblin.cpp */; };
-		DFF95A120FB22D5700A3EC78 /* goblin_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84212F0E7BA6A700F5680E /* goblin_v1.cpp */; };
-		DFF95A130FB22D5700A3EC78 /* goblin_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421300E7BA6A700F5680E /* goblin_v2.cpp */; };
-		DFF95A140FB22D5700A3EC78 /* goblin_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421310E7BA6A700F5680E /* goblin_v3.cpp */; };
-		DFF95A150FB22D5700A3EC78 /* goblin_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421320E7BA6A700F5680E /* goblin_v4.cpp */; };
-		DFF95A160FB22D5700A3EC78 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421330E7BA6A700F5680E /* init.cpp */; };
-		DFF95A170FB22D5700A3EC78 /* init_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421350E7BA6A700F5680E /* init_v1.cpp */; };
-		DFF95A180FB22D5700A3EC78 /* init_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421360E7BA6A700F5680E /* init_v2.cpp */; };
-		DFF95A190FB22D5700A3EC78 /* init_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421370E7BA6A700F5680E /* init_v3.cpp */; };
-		DFF95A1A0FB22D5700A3EC78 /* inter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421380E7BA6A700F5680E /* inter.cpp */; };
-		DFF95A1B0FB22D5700A3EC78 /* inter_bargon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213A0E7BA6A700F5680E /* inter_bargon.cpp */; };
-		DFF95A1C0FB22D5700A3EC78 /* inter_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213B0E7BA6A700F5680E /* inter_v1.cpp */; };
-		DFF95A1D0FB22D5700A3EC78 /* inter_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213C0E7BA6A700F5680E /* inter_v2.cpp */; };
-		DFF95A1E0FB22D5700A3EC78 /* inter_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213D0E7BA6A700F5680E /* inter_v3.cpp */; };
-		DFF95A1F0FB22D5700A3EC78 /* inter_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213E0E7BA6A700F5680E /* inter_v4.cpp */; };
-		DFF95A200FB22D5700A3EC78 /* inter_v5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84213F0E7BA6A700F5680E /* inter_v5.cpp */; };
-		DFF95A210FB22D5700A3EC78 /* inter_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421400E7BA6A700F5680E /* inter_v6.cpp */; };
-		DFF95A220FB22D5700A3EC78 /* map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421410E7BA6A700F5680E /* map.cpp */; };
-		DFF95A230FB22D5700A3EC78 /* map_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421430E7BA6A700F5680E /* map_v1.cpp */; };
-		DFF95A240FB22D5700A3EC78 /* map_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421440E7BA6A700F5680E /* map_v2.cpp */; };
-		DFF95A260FB22D5700A3EC78 /* mult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421470E7BA6A700F5680E /* mult.cpp */; };
-		DFF95A270FB22D5700A3EC78 /* mult_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421490E7BA6A700F5680E /* mult_v1.cpp */; };
-		DFF95A280FB22D5700A3EC78 /* mult_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84214A0E7BA6A700F5680E /* mult_v2.cpp */; };
-		DFF95A290FB22D5700A3EC78 /* palanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84214C0E7BA6A700F5680E /* palanim.cpp */; };
-		DFF95A310FB22D5700A3EC78 /* scenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421570E7BA6A700F5680E /* scenery.cpp */; };
-		DFF95A320FB22D5700A3EC78 /* scenery_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421590E7BA6A700F5680E /* scenery_v1.cpp */; };
-		DFF95A330FB22D5700A3EC78 /* scenery_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215A0E7BA6A700F5680E /* scenery_v2.cpp */; };
-		DFF95A340FB22D5700A3EC78 /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215C0E7BA6A700F5680E /* adlib.cpp */; };
-		DFF95A350FB22D5700A3EC78 /* bgatmosphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84215E0E7BA6A700F5680E /* bgatmosphere.cpp */; };
-		DFF95A360FB22D5700A3EC78 /* cdrom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421600E7BA6A700F5680E /* cdrom.cpp */; };
-		DFF95A370FB22D5700A3EC78 /* infogrames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421620E7BA6A700F5680E /* infogrames.cpp */; };
-		DFF95A380FB22D5700A3EC78 /* pcspeaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421640E7BA6A700F5680E /* pcspeaker.cpp */; };
-		DFF95A390FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421660E7BA6A700F5680E /* sound.cpp */; };
-		DFF95A3A0FB22D5700A3EC78 /* soundblaster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421680E7BA6A700F5680E /* soundblaster.cpp */; };
-		DFF95A3B0FB22D5700A3EC78 /* sounddesc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216A0E7BA6A700F5680E /* sounddesc.cpp */; };
-		DFF95A3C0FB22D5700A3EC78 /* soundmixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216C0E7BA6A700F5680E /* soundmixer.cpp */; };
-		DFF95A3D0FB22D5700A3EC78 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84216F0E7BA6A700F5680E /* util.cpp */; };
-		DFF95A3E0FB22D5700A3EC78 /* variables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421710E7BA6A700F5680E /* variables.cpp */; };
-		DFF95A3F0FB22D5700A3EC78 /* video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421730E7BA6A700F5680E /* video.cpp */; };
-		DFF95A400FB22D5700A3EC78 /* video_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421750E7BA6A700F5680E /* video_v1.cpp */; };
-		DFF95A410FB22D5700A3EC78 /* video_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421760E7BA6A700F5680E /* video_v2.cpp */; };
-		DFF95A420FB22D5700A3EC78 /* video_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421770E7BA6A700F5680E /* video_v6.cpp */; };
-		DFF95A430FB22D5700A3EC78 /* videoplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421780E7BA6A700F5680E /* videoplayer.cpp */; };
-		DFF95A670FB22D5700A3EC78 /* animator_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A40E7BA6A800F5680E /* animator_hof.cpp */; };
-		DFF95A680FB22D5700A3EC78 /* animator_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A50E7BA6A800F5680E /* animator_lok.cpp */; };
-		DFF95A690FB22D5700A3EC78 /* animator_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A70E7BA6A800F5680E /* animator_mr.cpp */; };
-		DFF95A6A0FB22D5700A3EC78 /* animator_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421A90E7BA6A800F5680E /* animator_v2.cpp */; };
-		DFF95A6B0FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AB0E7BA6A800F5680E /* debugger.cpp */; };
-		DFF95A6C0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AD0E7BA6A800F5680E /* detection.cpp */; };
-		DFF95A6D0FB22D5700A3EC78 /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421AE0E7BA6A800F5680E /* gui.cpp */; };
-		DFF95A6E0FB22D5700A3EC78 /* gui_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B00E7BA6A800F5680E /* gui_hof.cpp */; };
-		DFF95A6F0FB22D5700A3EC78 /* gui_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B20E7BA6A800F5680E /* gui_lok.cpp */; };
-		DFF95A700FB22D5700A3EC78 /* gui_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B40E7BA6A800F5680E /* gui_mr.cpp */; };
-		DFF95A710FB22D5700A3EC78 /* gui_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421B70E7BA6A800F5680E /* gui_v2.cpp */; };
-		DFF95A720FB22D5700A3EC78 /* items_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BA0E7BA6A800F5680E /* items_hof.cpp */; };
-		DFF95A730FB22D5700A3EC78 /* items_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BB0E7BA6A800F5680E /* items_lok.cpp */; };
-		DFF95A740FB22D5700A3EC78 /* items_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BC0E7BA6A800F5680E /* items_mr.cpp */; };
-		DFF95A750FB22D5700A3EC78 /* items_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421BE0E7BA6A800F5680E /* items_v2.cpp */; };
-		DFF95A760FB22D5700A3EC78 /* kyra_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C10E7BA6A800F5680E /* kyra_hof.cpp */; };
-		DFF95A770FB22D5700A3EC78 /* kyra_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C30E7BA6A800F5680E /* kyra_lok.cpp */; };
-		DFF95A780FB22D5700A3EC78 /* kyra_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C50E7BA6A800F5680E /* kyra_mr.cpp */; };
-		DFF95A790FB22D5700A3EC78 /* kyra_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C70E7BA6A800F5680E /* kyra_v1.cpp */; };
-		DFF95A7A0FB22D5700A3EC78 /* kyra_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421C90E7BA6A800F5680E /* kyra_v2.cpp */; };
-		DFF95A7B0FB22D5700A3EC78 /* lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421CC0E7BA6A800F5680E /* lol.cpp */; };
-		DFF95A7C0FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421CF0E7BA6A800F5680E /* resource.cpp */; };
-		DFF95A7D0FB22D5700A3EC78 /* resource_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D10E7BA6A800F5680E /* resource_intern.cpp */; };
-		DFF95A7E0FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D30E7BA6A800F5680E /* saveload.cpp */; };
-		DFF95A7F0FB22D5700A3EC78 /* saveload_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D40E7BA6A800F5680E /* saveload_hof.cpp */; };
-		DFF95A800FB22D5700A3EC78 /* saveload_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D50E7BA6A800F5680E /* saveload_lok.cpp */; };
-		DFF95A810FB22D5700A3EC78 /* saveload_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421D60E7BA6A800F5680E /* saveload_mr.cpp */; };
-		DFF95A820FB22D5700A3EC78 /* scene_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DA0E7BA6A800F5680E /* scene_hof.cpp */; };
-		DFF95A830FB22D5700A3EC78 /* scene_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DB0E7BA6A800F5680E /* scene_lok.cpp */; };
-		DFF95A840FB22D5700A3EC78 /* scene_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DC0E7BA6A800F5680E /* scene_mr.cpp */; };
-		DFF95A850FB22D5700A3EC78 /* scene_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DD0E7BA6A800F5680E /* scene_v1.cpp */; };
-		DFF95A860FB22D5700A3EC78 /* scene_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421DE0E7BA6A800F5680E /* scene_v2.cpp */; };
-		DFF95A870FB22D5700A3EC78 /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E00E7BA6A800F5680E /* screen.cpp */; };
-		DFF95A880FB22D5700A3EC78 /* screen_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E20E7BA6A800F5680E /* screen_hof.cpp */; };
-		DFF95A890FB22D5700A3EC78 /* screen_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E40E7BA6A800F5680E /* screen_lok.cpp */; };
-		DFF95A8A0FB22D5700A3EC78 /* screen_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E60E7BA6A800F5680E /* screen_lol.cpp */; };
-		DFF95A8B0FB22D5700A3EC78 /* screen_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421E80E7BA6A800F5680E /* screen_mr.cpp */; };
-		DFF95A8C0FB22D5700A3EC78 /* screen_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421EB0E7BA6A800F5680E /* screen_v2.cpp */; };
-		DFF95A8D0FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421EE0E7BA6A800F5680E /* script.cpp */; };
-		DFF95A8E0FB22D5700A3EC78 /* script_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F00E7BA6A800F5680E /* script_hof.cpp */; };
-		DFF95A8F0FB22D5700A3EC78 /* script_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F10E7BA6A800F5680E /* script_lok.cpp */; };
-		DFF95A900FB22D5700A3EC78 /* script_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F20E7BA6A800F5680E /* script_mr.cpp */; };
-		DFF95A910FB22D5700A3EC78 /* script_tim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F30E7BA6A800F5680E /* script_tim.cpp */; };
-		DFF95A920FB22D5700A3EC78 /* script_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F50E7BA6A800F5680E /* script_v1.cpp */; };
-		DFF95A930FB22D5700A3EC78 /* script_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F60E7BA6A800F5680E /* script_v2.cpp */; };
-		DFF95A940FB22D5700A3EC78 /* seqplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421F80E7BA6A800F5680E /* seqplayer.cpp */; };
-		DFF95A950FB22D5700A3EC78 /* sequences_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FA0E7BA6A800F5680E /* sequences_hof.cpp */; };
-		DFF95A960FB22D5700A3EC78 /* sequences_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FB0E7BA6A800F5680E /* sequences_lok.cpp */; };
-		DFF95A970FB22D5700A3EC78 /* sequences_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FC0E7BA6A800F5680E /* sequences_mr.cpp */; };
-		DFF95A980FB22D5700A3EC78 /* sequences_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8421FE0E7BA6A800F5680E /* sequences_v2.cpp */; };
-		DFF95A990FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422000E7BA6A800F5680E /* sound.cpp */; };
-		DFF95A9A0FB22D5700A3EC78 /* sound_adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422020E7BA6A800F5680E /* sound_adlib.cpp */; };
-		DFF95A9B0FB22D5700A3EC78 /* sound_digital.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422030E7BA6A800F5680E /* sound_digital.cpp */; };
-		DFF95A9C0FB22D5700A3EC78 /* sound_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422040E7BA6A800F5680E /* sound_lok.cpp */; };
-		DFF95A9D0FB22D5700A3EC78 /* sound_towns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422050E7BA6A800F5680E /* sound_towns.cpp */; };
-		DFF95A9E0FB22D5700A3EC78 /* sprites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422070E7BA6A800F5680E /* sprites.cpp */; };
-		DFF95A9F0FB22D5700A3EC78 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422090E7BA6A800F5680E /* staticres.cpp */; };
-		DFF95AA00FB22D5700A3EC78 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220A0E7BA6A800F5680E /* text.cpp */; };
-		DFF95AA10FB22D5700A3EC78 /* text_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220C0E7BA6A800F5680E /* text_hof.cpp */; };
-		DFF95AA20FB22D5700A3EC78 /* text_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220E0E7BA6A800F5680E /* text_lok.cpp */; };
-		DFF95AA30FB22D5700A3EC78 /* text_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84220F0E7BA6A800F5680E /* text_mr.cpp */; };
-		DFF95AA40FB22D5700A3EC78 /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422140E7BA6A800F5680E /* timer.cpp */; };
-		DFF95AA50FB22D5700A3EC78 /* timer_hof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422160E7BA6A800F5680E /* timer_hof.cpp */; };
-		DFF95AA60FB22D5700A3EC78 /* timer_lok.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422170E7BA6A800F5680E /* timer_lok.cpp */; };
-		DFF95AA70FB22D5700A3EC78 /* timer_mr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422180E7BA6A800F5680E /* timer_mr.cpp */; };
-		DFF95AA80FB22D5700A3EC78 /* vqa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84221C0E7BA6A800F5680E /* vqa.cpp */; };
-		DFF95AA90FB22D5700A3EC78 /* wsamovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84221E0E7BA6A800F5680E /* wsamovie.cpp */; };
-		DFF95AAA0FB22D5700A3EC78 /* animseq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422210E7BA6A800F5680E /* animseq.cpp */; };
-		DFF95AAB0FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422230E7BA6A800F5680E /* debugger.cpp */; };
-		DFF95AAC0FB22D5700A3EC78 /* decode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422250E7BA6A800F5680E /* decode.cpp */; };
-		DFF95AAD0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422270E7BA6A800F5680E /* detection.cpp */; };
-		DFF95AAE0FB22D5700A3EC78 /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422280E7BA6A800F5680E /* disk.cpp */; };
-		DFF95AAF0FB22D5700A3EC78 /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222A0E7BA6A800F5680E /* events.cpp */; };
-		DFF95AB00FB22D5700A3EC78 /* fights.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222C0E7BA6A800F5680E /* fights.cpp */; };
-		DFF95AB10FB22D5700A3EC78 /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84222E0E7BA6A800F5680E /* game.cpp */; };
-		DFF95AB20FB22D5700A3EC78 /* hotspots.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422300E7BA6A800F5680E /* hotspots.cpp */; };
-		DFF95AB30FB22D5700A3EC78 /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422320E7BA6A800F5680E /* intro.cpp */; };
-		DFF95AB40FB22D5700A3EC78 /* lure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422340E7BA6A800F5680E /* lure.cpp */; };
-		DFF95AB50FB22D5700A3EC78 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422370E7BA6A800F5680E /* memory.cpp */; };
-		DFF95AB60FB22D5700A3EC78 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422390E7BA6A800F5680E /* menu.cpp */; };
-		DFF95AB70FB22D5700A3EC78 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84223C0E7BA6A800F5680E /* palette.cpp */; };
-		DFF95AB80FB22D5700A3EC78 /* res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84223E0E7BA6A800F5680E /* res.cpp */; };
-		DFF95AB90FB22D5700A3EC78 /* res_struct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422400E7BA6A800F5680E /* res_struct.cpp */; };
-		DFF95ABA0FB22D5700A3EC78 /* room.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422420E7BA6A800F5680E /* room.cpp */; };
-		DFF95ABB0FB22D5700A3EC78 /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422440E7BA6A800F5680E /* screen.cpp */; };
-		DFF95ABC0FB22D5700A3EC78 /* scripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422460E7BA6A800F5680E /* scripts.cpp */; };
-		DFF95ABD0FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422480E7BA6A800F5680E /* sound.cpp */; };
-		DFF95ABE0FB22D5700A3EC78 /* strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84224A0E7BA6A800F5680E /* strings.cpp */; };
-		DFF95ABF0FB22D5700A3EC78 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84224C0E7BA6A800F5680E /* surface.cpp */; };
-		DFF95AC00FB22D5700A3EC78 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84226E0E7BA6A800F5680E /* actor.cpp */; };
-		DFF95AC10FB22D5700A3EC78 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422710E7BA6A800F5680E /* animation.cpp */; };
-		DFF95AC20FB22D5700A3EC78 /* assets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422740E7BA6A800F5680E /* assets.cpp */; };
-		DFF95AC30FB22D5700A3EC78 /* compression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422780E7BA6A900F5680E /* compression.cpp */; };
-		DFF95AC40FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84227B0E7BA6A900F5680E /* console.cpp */; };
-		DFF95AC50FB22D5700A3EC78 /* converse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84227E0E7BA6A900F5680E /* converse.cpp */; };
-		DFF95AC60FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422810E7BA6A900F5680E /* detection.cpp */; };
-		DFF95AC70FB22D5700A3EC78 /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422830E7BA6A900F5680E /* events.cpp */; };
-		DFF95AC80FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422860E7BA6A900F5680E /* font.cpp */; };
-		DFF95AC90FB22D5700A3EC78 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422890E7BA6A900F5680E /* globals.cpp */; };
-		DFF95ACA0FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84228C0E7BA6A900F5680E /* graphics.cpp */; };
-		DFF95ACB0FB22D5700A3EC78 /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84228F0E7BA6A900F5680E /* gui.cpp */; };
-		DFF95ACC0FB22D5700A3EC78 /* hotspot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422920E7BA6A900F5680E /* hotspot.cpp */; };
-		DFF95ACD0FB22D5700A3EC78 /* m4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422960E7BA6A900F5680E /* m4.cpp */; };
-		DFF95ACE0FB22D5700A3EC78 /* m4_menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422990E7BA6A900F5680E /* m4_menus.cpp */; };
-		DFF95ACF0FB22D5700A3EC78 /* m4_views.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84229C0E7BA6A900F5680E /* m4_views.cpp */; };
-		DFF95AD00FB22D5700A3EC78 /* mads_anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84229F0E7BA6A900F5680E /* mads_anim.cpp */; };
-		DFF95AD10FB22D5700A3EC78 /* mads_menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A20E7BA6A900F5680E /* mads_menus.cpp */; };
-		DFF95AD20FB22D5700A3EC78 /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A50E7BA6A900F5680E /* midi.cpp */; };
-		DFF95AD30FB22D5700A3EC78 /* rails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422A90E7BA6A900F5680E /* rails.cpp */; };
-		DFF95AD40FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422AC0E7BA6A900F5680E /* resource.cpp */; };
-		DFF95AD50FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422AF0E7BA6A900F5680E /* saveload.cpp */; };
-		DFF95AD60FB22D5700A3EC78 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B20E7BA6A900F5680E /* scene.cpp */; };
-		DFF95AD70FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B50E7BA6A900F5680E /* script.cpp */; };
-		DFF95AD80FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422B90E7BA6A900F5680E /* sound.cpp */; };
-		DFF95AD90FB22D5700A3EC78 /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422BC0E7BA6A900F5680E /* sprite.cpp */; };
-		DFF95ADA0FB22D5700A3EC78 /* viewmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422BF0E7BA6A900F5680E /* viewmgr.cpp */; };
-		DFF95ADB0FB22D5700A3EC78 /* woodscript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C20E7BA6A900F5680E /* woodscript.cpp */; };
-		DFF95ADC0FB22D5700A3EC78 /* ws_machine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C50E7BA6A900F5680E /* ws_machine.cpp */; };
-		DFF95ADD0FB22D5700A3EC78 /* ws_sequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422C70E7BA6A900F5680E /* ws_sequence.cpp */; };
-		DFF95ADE0FB22D5700A3EC78 /* database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CA0E7BA6A900F5680E /* database.cpp */; };
-		DFF95ADF0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CC0E7BA6A900F5680E /* detection.cpp */; };
-		DFF95AE00FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CD0E7BA6A900F5680E /* graphics.cpp */; };
-		DFF95AE10FB22D5700A3EC78 /* made.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422CF0E7BA6A900F5680E /* made.cpp */; };
-		DFF95AE20FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D20E7BA6A900F5680E /* music.cpp */; };
-		DFF95AE30FB22D5700A3EC78 /* pmvplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D40E7BA6A900F5680E /* pmvplayer.cpp */; };
-		DFF95AE40FB22D5700A3EC78 /* redreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D60E7BA6A900F5680E /* redreader.cpp */; };
-		DFF95AE50FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422D80E7BA6A900F5680E /* resource.cpp */; };
-		DFF95AE60FB22D5700A3EC78 /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DA0E7BA6A900F5680E /* screen.cpp */; };
-		DFF95AE70FB22D5700A3EC78 /* screenfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DC0E7BA6A900F5680E /* screenfx.cpp */; };
-		DFF95AE80FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422DE0E7BA6A900F5680E /* script.cpp */; };
-		DFF95AE90FB22D5700A3EC78 /* scriptfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E00E7BA6A900F5680E /* scriptfuncs.cpp */; };
-		DFF95AEA0FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E20E7BA6A900F5680E /* sound.cpp */; };
-		DFF95AEB0FB22D5700A3EC78 /* balloons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E70E7BA6A900F5680E /* balloons.cpp */; };
-		DFF95AEC0FB22D5700A3EC78 /* callables_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E80E7BA6A900F5680E /* callables_br.cpp */; };
-		DFF95AED0FB22D5700A3EC78 /* callables_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422E90E7BA6A900F5680E /* callables_ns.cpp */; };
-		DFF95AEE0FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EA0E7BA6A900F5680E /* debug.cpp */; };
-		DFF95AEF0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EC0E7BA6A900F5680E /* detection.cpp */; };
-		DFF95AF00FB22D5700A3EC78 /* dialogue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422ED0E7BA6A900F5680E /* dialogue.cpp */; };
-		DFF95AF10FB22D5700A3EC78 /* disk_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422EF0E7BA6A900F5680E /* disk_br.cpp */; };
-		DFF95AF20FB22D5700A3EC78 /* disk_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F00E7BA6A900F5680E /* disk_ns.cpp */; };
-		DFF95AF30FB22D5700A3EC78 /* exec_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F20E7BA6A900F5680E /* exec_br.cpp */; };
-		DFF95AF40FB22D5700A3EC78 /* exec_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F30E7BA6A900F5680E /* exec_ns.cpp */; };
-		DFF95AF50FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F40E7BA6A900F5680E /* font.cpp */; };
-		DFF95AF60FB22D5700A3EC78 /* gfxbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F50E7BA6A900F5680E /* gfxbase.cpp */; };
-		DFF95AF70FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F60E7BA6A900F5680E /* graphics.cpp */; };
-		DFF95AF80FB22D5700A3EC78 /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422F80E7BA6A900F5680E /* gui.cpp */; };
-		DFF95AF90FB22D5700A3EC78 /* gui_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FA0E7BA6A900F5680E /* gui_br.cpp */; };
-		DFF95AFA0FB22D5700A3EC78 /* gui_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FB0E7BA6A900F5680E /* gui_ns.cpp */; };
-		DFF95AFB0FB22D5700A3EC78 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FC0E7BA6A900F5680E /* input.cpp */; };
-		DFF95AFC0FB22D5700A3EC78 /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8422FE0E7BA6A900F5680E /* inventory.cpp */; };
-		DFF95AFD0FB22D5700A3EC78 /* objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423010E7BA6A900F5680E /* objects.cpp */; };
-		DFF95AFE0FB22D5700A3EC78 /* parallaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423030E7BA6A900F5680E /* parallaction.cpp */; };
-		DFF95AFF0FB22D5700A3EC78 /* parallaction_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423050E7BA6A900F5680E /* parallaction_br.cpp */; };
-		DFF95B000FB22D5700A3EC78 /* parallaction_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423060E7BA6A900F5680E /* parallaction_ns.cpp */; };
-		DFF95B010FB22D5700A3EC78 /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423070E7BA6A900F5680E /* parser.cpp */; };
-		DFF95B020FB22D5700A3EC78 /* parser_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423090E7BA6A900F5680E /* parser_br.cpp */; };
-		DFF95B030FB22D5700A3EC78 /* parser_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230A0E7BA6A900F5680E /* parser_ns.cpp */; };
-		DFF95B040FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230B0E7BA6A900F5680E /* saveload.cpp */; };
-		DFF95B050FB22D5700A3EC78 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84230F0E7BA6A900F5680E /* staticres.cpp */; };
-		DFF95B060FB22D5700A3EC78 /* walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423100E7BA6A900F5680E /* walk.cpp */; };
-		DFF95B070FB22D5700A3EC78 /* bankman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423130E7BA6A900F5680E /* bankman.cpp */; };
-		DFF95B080FB22D5700A3EC78 /* command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423150E7BA6A900F5680E /* command.cpp */; };
-		DFF95B090FB22D5700A3EC78 /* credits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423170E7BA6A900F5680E /* credits.cpp */; };
-		DFF95B0A0FB22D5700A3EC78 /* cutaway.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423190E7BA6A900F5680E /* cutaway.cpp */; };
-		DFF95B0B0FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84231B0E7BA6A900F5680E /* debug.cpp */; };
-		DFF95B0C0FB22D5700A3EC78 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84231E0E7BA6A900F5680E /* display.cpp */; };
-		DFF95B0D0FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423200E7BA6A900F5680E /* graphics.cpp */; };
-		DFF95B0E0FB22D5700A3EC78 /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423220E7BA6A900F5680E /* grid.cpp */; };
-		DFF95B0F0FB22D5700A3EC78 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423240E7BA6A900F5680E /* input.cpp */; };
-		DFF95B100FB22D5700A3EC78 /* journal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423260E7BA6A900F5680E /* journal.cpp */; };
-		DFF95B110FB22D5700A3EC78 /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423280E7BA6A900F5680E /* logic.cpp */; };
-		DFF95B120FB22D5700A3EC78 /* midiadlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232A0E7BA6A900F5680E /* midiadlib.cpp */; };
-		DFF95B130FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232C0E7BA6A900F5680E /* music.cpp */; };
-		DFF95B140FB22D5700A3EC78 /* musicdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232E0E7BA6A900F5680E /* musicdata.cpp */; };
-		DFF95B150FB22D5700A3EC78 /* queen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84232F0E7BA6A900F5680E /* queen.cpp */; };
-		DFF95B160FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423310E7BA6A900F5680E /* resource.cpp */; };
-		DFF95B170FB22D5700A3EC78 /* restables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423330E7BA6A900F5680E /* restables.cpp */; };
-		DFF95B180FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423340E7BA6A900F5680E /* sound.cpp */; };
-		DFF95B190FB22D5700A3EC78 /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423360E7BA6A900F5680E /* state.cpp */; };
-		DFF95B1A0FB22D5700A3EC78 /* talk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423390E7BA6A900F5680E /* talk.cpp */; };
-		DFF95B1B0FB22D5700A3EC78 /* walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84233B0E7BA6A900F5680E /* walk.cpp */; };
-		DFF95B1C0FB22D5700A3EC78 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84233F0E7BA6AA00F5680E /* actor.cpp */; };
-		DFF95B1D0FB22D5700A3EC78 /* actor_path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423410E7BA6AA00F5680E /* actor_path.cpp */; };
-		DFF95B1E0FB22D5700A3EC78 /* actor_walk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423420E7BA6AA00F5680E /* actor_walk.cpp */; };
-		DFF95B1F0FB22D5700A3EC78 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423430E7BA6AA00F5680E /* animation.cpp */; };
-		DFF95B200FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423450E7BA6AA00F5680E /* console.cpp */; };
-		DFF95B210FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423470E7BA6AA00F5680E /* detection.cpp */; };
-		DFF95B220FB22D5700A3EC78 /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234A0E7BA6AA00F5680E /* events.cpp */; };
-		DFF95B230FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234C0E7BA6AA00F5680E /* font.cpp */; };
-		DFF95B240FB22D5700A3EC78 /* font_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234E0E7BA6AA00F5680E /* font_map.cpp */; };
-		DFF95B250FB22D5700A3EC78 /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84234F0E7BA6AA00F5680E /* gfx.cpp */; };
-		DFF95B260FB22D5700A3EC78 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423520E7BA6AA00F5680E /* image.cpp */; };
-		DFF95B270FB22D5700A3EC78 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423530E7BA6AA00F5680E /* input.cpp */; };
-		DFF95B280FB22D5700A3EC78 /* interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423540E7BA6AA00F5680E /* interface.cpp */; };
-		DFF95B290FB22D5700A3EC78 /* introproc_ihnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423560E7BA6AA00F5680E /* introproc_ihnm.cpp */; };
-		DFF95B2A0FB22D5700A3EC78 /* introproc_ite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423570E7BA6AA00F5680E /* introproc_ite.cpp */; };
-		DFF95B2B0FB22D5700A3EC78 /* isomap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423580E7BA6AA00F5680E /* isomap.cpp */; };
-		DFF95B2C0FB22D5700A3EC78 /* itedata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84235B0E7BA6AA00F5680E /* itedata.cpp */; };
-		DFF95B2D0FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84235F0E7BA6AA00F5680E /* music.cpp */; };
-		DFF95B2E0FB22D5700A3EC78 /* objectmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423610E7BA6AA00F5680E /* objectmap.cpp */; };
-		DFF95B2F0FB22D5700A3EC78 /* palanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423630E7BA6AA00F5680E /* palanim.cpp */; };
-		DFF95B300FB22D5700A3EC78 /* puzzle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423650E7BA6AA00F5680E /* puzzle.cpp */; };
-		DFF95B310FB22D5700A3EC78 /* render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423670E7BA6AA00F5680E /* render.cpp */; };
-		DFF95B320FB22D5700A3EC78 /* saga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236B0E7BA6AA00F5680E /* saga.cpp */; };
-		DFF95B330FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236D0E7BA6AA00F5680E /* saveload.cpp */; };
-		DFF95B340FB22D5700A3EC78 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84236E0E7BA6AA00F5680E /* scene.cpp */; };
-		DFF95B350FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423700E7BA6AA00F5680E /* script.cpp */; };
-		DFF95B360FB22D5700A3EC78 /* sfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423720E7BA6AA00F5680E /* sfuncs.cpp */; };
-		DFF95B370FB22D5700A3EC78 /* sndres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423730E7BA6AA00F5680E /* sndres.cpp */; };
-		DFF95B380FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423750E7BA6AA00F5680E /* sound.cpp */; };
-		DFF95B390FB22D5700A3EC78 /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423770E7BA6AA00F5680E /* sprite.cpp */; };
-		DFF95B3A0FB22D5700A3EC78 /* sthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423790E7BA6AA00F5680E /* sthread.cpp */; };
-		DFF95B3B0FB22D5700A3EC78 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84237C0E7BA6AA00F5680E /* actor.cpp */; };
-		DFF95B3C0FB22D5700A3EC78 /* akos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84237E0E7BA6AA00F5680E /* akos.cpp */; };
-		DFF95B3D0FB22D5700A3EC78 /* base-costume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423800E7BA6AA00F5680E /* base-costume.cpp */; };
-		DFF95B3E0FB22D5700A3EC78 /* bomp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423820E7BA6AA00F5680E /* bomp.cpp */; };
-		DFF95B3F0FB22D5700A3EC78 /* boxes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423840E7BA6AA00F5680E /* boxes.cpp */; };
-		DFF95B400FB22D5700A3EC78 /* camera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423860E7BA6AA00F5680E /* camera.cpp */; };
-		DFF95B410FB22D5700A3EC78 /* charset-fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423870E7BA6AA00F5680E /* charset-fontdata.cpp */; };
-		DFF95B420FB22D5700A3EC78 /* charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423880E7BA6AA00F5680E /* charset.cpp */; };
-		DFF95B430FB22D5700A3EC78 /* costume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238A0E7BA6AA00F5680E /* costume.cpp */; };
-		DFF95B440FB22D5700A3EC78 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238C0E7BA6AA00F5680E /* cursor.cpp */; };
-		DFF95B450FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238D0E7BA6AA00F5680E /* debugger.cpp */; };
-		DFF95B460FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84238F0E7BA6AA00F5680E /* detection.cpp */; };
-		DFF95B470FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423920E7BA6AA00F5680E /* dialogs.cpp */; };
-		DFF95B480FB22D5700A3EC78 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423940E7BA6AA00F5680E /* file.cpp */; };
-		DFF95B490FB22D5700A3EC78 /* file_nes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423960E7BA6AA00F5680E /* file_nes.cpp */; };
-		DFF95B4A0FB22D5700A3EC78 /* gfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423980E7BA6AA00F5680E /* gfx.cpp */; };
-		DFF95B4B0FB22D5700A3EC78 /* animation_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84239C0E7BA6AA00F5680E /* animation_he.cpp */; };
-		DFF95B4C0FB22D5700A3EC78 /* cup_player_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84239E0E7BA6AA00F5680E /* cup_player_he.cpp */; };
-		DFF95B4D0FB22D5700A3EC78 /* floodfill_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A00E7BA6AA00F5680E /* floodfill_he.cpp */; };
-		DFF95B4E0FB22D5700A3EC78 /* logic_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A30E7BA6AA00F5680E /* logic_he.cpp */; };
-		DFF95B4F0FB22D5700A3EC78 /* palette_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A50E7BA6AA00F5680E /* palette_he.cpp */; };
-		DFF95B500FB22D5700A3EC78 /* resource_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A60E7BA6AA00F5680E /* resource_he.cpp */; };
-		DFF95B510FB22D5700A3EC78 /* script_v100he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A80E7BA6AA00F5680E /* script_v100he.cpp */; };
-		DFF95B520FB22D5700A3EC78 /* script_v60he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423A90E7BA6AA00F5680E /* script_v60he.cpp */; };
-		DFF95B530FB22D5700A3EC78 /* script_v70he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AA0E7BA6AA00F5680E /* script_v70he.cpp */; };
-		DFF95B540FB22D5700A3EC78 /* script_v71he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AB0E7BA6AA00F5680E /* script_v71he.cpp */; };
-		DFF95B550FB22D5700A3EC78 /* script_v72he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AC0E7BA6AA00F5680E /* script_v72he.cpp */; };
-		DFF95B560FB22D5700A3EC78 /* script_v80he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AD0E7BA6AA00F5680E /* script_v80he.cpp */; };
-		DFF95B570FB22D5700A3EC78 /* script_v90he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AE0E7BA6AA00F5680E /* script_v90he.cpp */; };
-		DFF95B580FB22D5700A3EC78 /* sound_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423AF0E7BA6AA00F5680E /* sound_he.cpp */; };
-		DFF95B590FB22D5700A3EC78 /* sprite_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B10E7BA6AA00F5680E /* sprite_he.cpp */; };
-		DFF95B5A0FB22D5700A3EC78 /* wiz_he.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B30E7BA6AA00F5680E /* wiz_he.cpp */; };
-		DFF95B5B0FB22D5700A3EC78 /* help.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B50E7BA6AA00F5680E /* help.cpp */; };
-		DFF95B5C0FB22D5700A3EC78 /* imuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423B80E7BA6AA00F5680E /* imuse.cpp */; };
-		DFF95B5D0FB22D5700A3EC78 /* imuse_part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BB0E7BA6AA00F5680E /* imuse_part.cpp */; };
-		DFF95B5E0FB22D5700A3EC78 /* imuse_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BC0E7BA6AA00F5680E /* imuse_player.cpp */; };
-		DFF95B5F0FB22D5700A3EC78 /* instrument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423BD0E7BA6AA00F5680E /* instrument.cpp */; };
-		DFF95B600FB22D5700A3EC78 /* sysex_samnmax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C00E7BA6AA00F5680E /* sysex_samnmax.cpp */; };
-		DFF95B610FB22D5700A3EC78 /* sysex_scumm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C10E7BA6AA00F5680E /* sysex_scumm.cpp */; };
-		DFF95B620FB22D5700A3EC78 /* dimuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C30E7BA6AA00F5680E /* dimuse.cpp */; };
-		DFF95B630FB22D5700A3EC78 /* dimuse_bndmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C50E7BA6AA00F5680E /* dimuse_bndmgr.cpp */; };
-		DFF95B640FB22D5700A3EC78 /* dimuse_codecs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C70E7BA6AA00F5680E /* dimuse_codecs.cpp */; };
-		DFF95B650FB22D5700A3EC78 /* dimuse_music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C80E7BA6AA00F5680E /* dimuse_music.cpp */; };
-		DFF95B660FB22D5700A3EC78 /* dimuse_script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423C90E7BA6AA00F5680E /* dimuse_script.cpp */; };
-		DFF95B670FB22D5700A3EC78 /* dimuse_sndmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CA0E7BA6AA00F5680E /* dimuse_sndmgr.cpp */; };
-		DFF95B680FB22D5700A3EC78 /* dimuse_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CC0E7BA6AA00F5680E /* dimuse_tables.cpp */; };
-		DFF95B690FB22D5700A3EC78 /* dimuse_track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423CE0E7BA6AA00F5680E /* dimuse_track.cpp */; };
-		DFF95B6A0FB22D5700A3EC78 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D00E7BA6AA00F5680E /* input.cpp */; };
-		DFF95B6B0FB22D5700A3EC78 /* insane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D20E7BA6AA00F5680E /* insane.cpp */; };
-		DFF95B6C0FB22D5700A3EC78 /* insane_ben.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D40E7BA6AA00F5680E /* insane_ben.cpp */; };
-		DFF95B6D0FB22D5700A3EC78 /* insane_enemy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D50E7BA6AA00F5680E /* insane_enemy.cpp */; };
-		DFF95B6E0FB22D5700A3EC78 /* insane_iact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D60E7BA6AA00F5680E /* insane_iact.cpp */; };
-		DFF95B6F0FB22D5700A3EC78 /* insane_scenes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423D70E7BA6AA00F5680E /* insane_scenes.cpp */; };
-		DFF95B710FB22D5700A3EC78 /* midiparser_ro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DA0E7BA6AA00F5680E /* midiparser_ro.cpp */; };
-		DFF95B720FB22D5700A3EC78 /* nut_renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DD0E7BA6AA00F5680E /* nut_renderer.cpp */; };
-		DFF95B730FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423DF0E7BA6AA00F5680E /* object.cpp */; };
-		DFF95B740FB22D5700A3EC78 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E10E7BA6AA00F5680E /* palette.cpp */; };
-		DFF95B750FB22D5700A3EC78 /* player_mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E20E7BA6AA00F5680E /* player_mod.cpp */; };
-		DFF95B760FB22D5700A3EC78 /* player_nes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E40E7BA6AA00F5680E /* player_nes.cpp */; };
-		DFF95B770FB22D5700A3EC78 /* player_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E60E7BA6AA00F5680E /* player_v1.cpp */; };
-		DFF95B780FB22D5700A3EC78 /* player_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423E80E7BA6AA00F5680E /* player_v2.cpp */; };
-		DFF95B790FB22D5700A3EC78 /* player_v2a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EA0E7BA6AA00F5680E /* player_v2a.cpp */; };
-		DFF95B7A0FB22D5700A3EC78 /* player_v3a.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EC0E7BA6AA00F5680E /* player_v3a.cpp */; };
-		DFF95B7B0FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423EF0E7BA6AA00F5680E /* resource.cpp */; };
-		DFF95B7C0FB22D5700A3EC78 /* resource_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F10E7BA6AA00F5680E /* resource_v2.cpp */; };
-		DFF95B7D0FB22D5700A3EC78 /* resource_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F20E7BA6AA00F5680E /* resource_v3.cpp */; };
-		DFF95B7E0FB22D5700A3EC78 /* resource_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F30E7BA6AA00F5680E /* resource_v4.cpp */; };
-		DFF95B7F0FB22D5700A3EC78 /* room.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F40E7BA6AA00F5680E /* room.cpp */; };
-		DFF95B800FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F50E7BA6AA00F5680E /* saveload.cpp */; };
-		DFF95B810FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F70E7BA6AA00F5680E /* script.cpp */; };
-		DFF95B820FB22D5700A3EC78 /* script_v0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423F90E7BA6AA00F5680E /* script_v0.cpp */; };
-		DFF95B830FB22D5700A3EC78 /* script_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FA0E7BA6AA00F5680E /* script_v2.cpp */; };
-		DFF95B840FB22D5700A3EC78 /* script_v5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FB0E7BA6AA00F5680E /* script_v5.cpp */; };
-		DFF95B850FB22D5700A3EC78 /* script_v6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FC0E7BA6AA00F5680E /* script_v6.cpp */; };
-		DFF95B860FB22D5700A3EC78 /* script_v8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FD0E7BA6AA00F5680E /* script_v8.cpp */; };
-		DFF95B870FB22D5700A3EC78 /* scumm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8423FF0E7BA6AA00F5680E /* scumm.cpp */; };
-		DFF95B880FB22D5700A3EC78 /* channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424020E7BA6AA00F5680E /* channel.cpp */; };
-		DFF95B890FB22D5700A3EC78 /* codec1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424060E7BA6AA00F5680E /* codec1.cpp */; };
-		DFF95B8A0FB22D5700A3EC78 /* codec37.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424070E7BA6AA00F5680E /* codec37.cpp */; };
-		DFF95B8B0FB22D5700A3EC78 /* codec47.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424090E7BA6AA00F5680E /* codec47.cpp */; };
-		DFF95B8C0FB22D5700A3EC78 /* imuse_channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240D0E7BA6AA00F5680E /* imuse_channel.cpp */; };
-		DFF95B8D0FB22D5700A3EC78 /* saud_channel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240E0E7BA6AA00F5680E /* saud_channel.cpp */; };
-		DFF95B8E0FB22D5700A3EC78 /* smush_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84240F0E7BA6AA00F5680E /* smush_font.cpp */; };
-		DFF95B8F0FB22D5700A3EC78 /* smush_mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424110E7BA6AA00F5680E /* smush_mixer.cpp */; };
-		DFF95B900FB22D5700A3EC78 /* smush_player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424130E7BA6AA00F5680E /* smush_player.cpp */; };
-		DFF95B910FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424150E7BA6AB00F5680E /* sound.cpp */; };
-		DFF95B920FB22D5700A3EC78 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424170E7BA6AB00F5680E /* string.cpp */; };
-		DFF95B930FB22D5700A3EC78 /* usage_bits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424190E7BA6AB00F5680E /* usage_bits.cpp */; };
-		DFF95B940FB22D5700A3EC78 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241B0E7BA6AB00F5680E /* util.cpp */; };
-		DFF95B950FB22D5700A3EC78 /* vars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241D0E7BA6AB00F5680E /* vars.cpp */; };
-		DFF95B960FB22D5700A3EC78 /* verbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84241E0E7BA6AB00F5680E /* verbs.cpp */; };
-		DFF95B970FB22D5700A3EC78 /* autoroute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424210E7BA6AB00F5680E /* autoroute.cpp */; };
-		DFF95B980FB22D5700A3EC78 /* compact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424230E7BA6AB00F5680E /* compact.cpp */; };
-		DFF95B990FB22D5700A3EC78 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424250E7BA6AB00F5680E /* control.cpp */; };
-		DFF95B9A0FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424270E7BA6AB00F5680E /* debug.cpp */; };
-		DFF95B9B0FB22D5700A3EC78 /* disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424290E7BA6AB00F5680E /* disk.cpp */; };
-		DFF95B9C0FB22D5700A3EC78 /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242B0E7BA6AB00F5680E /* grid.cpp */; };
-		DFF95B9D0FB22D5700A3EC78 /* hufftext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242D0E7BA6AB00F5680E /* hufftext.cpp */; };
-		DFF95B9E0FB22D5700A3EC78 /* intro.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84242E0E7BA6AB00F5680E /* intro.cpp */; };
-		DFF95B9F0FB22D5700A3EC78 /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424300E7BA6AB00F5680E /* logic.cpp */; };
-		DFF95BA00FB22D5700A3EC78 /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424330E7BA6AB00F5680E /* mouse.cpp */; };
-		DFF95BA10FB22D5700A3EC78 /* adlibchannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424360E7BA6AB00F5680E /* adlibchannel.cpp */; };
-		DFF95BA20FB22D5700A3EC78 /* adlibmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424380E7BA6AB00F5680E /* adlibmusic.cpp */; };
-		DFF95BA30FB22D5700A3EC78 /* gmchannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243A0E7BA6AB00F5680E /* gmchannel.cpp */; };
-		DFF95BA40FB22D5700A3EC78 /* gmmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243C0E7BA6AB00F5680E /* gmmusic.cpp */; };
-		DFF95BA50FB22D5700A3EC78 /* mt32music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84243E0E7BA6AB00F5680E /* mt32music.cpp */; };
-		DFF95BA60FB22D5700A3EC78 /* musicbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424400E7BA6AB00F5680E /* musicbase.cpp */; };
-		DFF95BA70FB22D5700A3EC78 /* rnc_deco.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424420E7BA6AB00F5680E /* rnc_deco.cpp */; };
-		DFF95BA80FB22D5700A3EC78 /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424440E7BA6AB00F5680E /* screen.cpp */; };
-		DFF95BA90FB22D5700A3EC78 /* sky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424460E7BA6AB00F5680E /* sky.cpp */; };
-		DFF95BAA0FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424490E7BA6AB00F5680E /* sound.cpp */; };
-		DFF95BAB0FB22D5700A3EC78 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84244C0E7BA6AB00F5680E /* text.cpp */; };
-		DFF95BAC0FB22D5700A3EC78 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84244F0E7BA6AB00F5680E /* animation.cpp */; };
-		DFF95BAD0FB22D5700A3EC78 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424520E7BA6AB00F5680E /* control.cpp */; };
-		DFF95BAE0FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424560E7BA6AB00F5680E /* debug.cpp */; };
-		DFF95BAF0FB22D5700A3EC78 /* eventman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424580E7BA6AB00F5680E /* eventman.cpp */; };
-		DFF95BB00FB22D5700A3EC78 /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245A0E7BA6AB00F5680E /* logic.cpp */; };
-		DFF95BB10FB22D5700A3EC78 /* memman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245C0E7BA6AB00F5680E /* memman.cpp */; };
-		DFF95BB20FB22D5700A3EC78 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84245E0E7BA6AB00F5680E /* menu.cpp */; };
-		DFF95BB30FB22D5700A3EC78 /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424610E7BA6AB00F5680E /* mouse.cpp */; };
-		DFF95BB40FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424630E7BA6AB00F5680E /* music.cpp */; };
-		DFF95BB50FB22D5700A3EC78 /* objectman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424660E7BA6AB00F5680E /* objectman.cpp */; };
-		DFF95BB60FB22D5700A3EC78 /* resman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424680E7BA6AB00F5680E /* resman.cpp */; };
-		DFF95BB70FB22D5700A3EC78 /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246A0E7BA6AB00F5680E /* router.cpp */; };
-		DFF95BB80FB22D5700A3EC78 /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246C0E7BA6AB00F5680E /* screen.cpp */; };
-		DFF95BB90FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84246E0E7BA6AB00F5680E /* sound.cpp */; };
-		DFF95BBA0FB22D5700A3EC78 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424700E7BA6AB00F5680E /* staticres.cpp */; };
-		DFF95BBB0FB22D5700A3EC78 /* sword1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424710E7BA6AB00F5680E /* sword1.cpp */; };
-		DFF95BBC0FB22D5700A3EC78 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424750E7BA6AB00F5680E /* text.cpp */; };
-		DFF95BBD0FB22D5700A3EC78 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424780E7BA6AB00F5680E /* animation.cpp */; };
-		DFF95BBE0FB22D5700A3EC78 /* anims.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247A0E7BA6AB00F5680E /* anims.cpp */; };
-		DFF95BBF0FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247B0E7BA6AB00F5680E /* console.cpp */; };
-		DFF95BC00FB22D5700A3EC78 /* controls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247D0E7BA6AB00F5680E /* controls.cpp */; };
-		DFF95BC10FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84247F0E7BA6AB00F5680E /* debug.cpp */; };
-		DFF95BC20FB22D5700A3EC78 /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424820E7BA6AB00F5680E /* events.cpp */; };
-		DFF95BC30FB22D5700A3EC78 /* function.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424830E7BA6AB00F5680E /* function.cpp */; };
-		DFF95BC40FB22D5700A3EC78 /* icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424850E7BA6AB00F5680E /* icons.cpp */; };
-		DFF95BC50FB22D5700A3EC78 /* interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424860E7BA6AB00F5680E /* interpreter.cpp */; };
-		DFF95BC60FB22D5700A3EC78 /* layers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424880E7BA6AB00F5680E /* layers.cpp */; };
-		DFF95BC70FB22D5700A3EC78 /* logic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424890E7BA6AB00F5680E /* logic.cpp */; };
-		DFF95BC80FB22D5700A3EC78 /* maketext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248B0E7BA6AB00F5680E /* maketext.cpp */; };
-		DFF95BC90FB22D5700A3EC78 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248D0E7BA6AB00F5680E /* memory.cpp */; };
-		DFF95BCA0FB22D5700A3EC78 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84248F0E7BA6AB00F5680E /* menu.cpp */; };
-		DFF95BCB0FB22D5700A3EC78 /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424910E7BA6AB00F5680E /* mouse.cpp */; };
-		DFF95BCC0FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424930E7BA6AB00F5680E /* music.cpp */; };
-		DFF95BCD0FB22D5700A3EC78 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424950E7BA6AB00F5680E /* palette.cpp */; };
-		DFF95BCE0FB22D5700A3EC78 /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424960E7BA6AB00F5680E /* protocol.cpp */; };
-		DFF95BCF0FB22D5700A3EC78 /* render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424970E7BA6AB00F5680E /* render.cpp */; };
-		DFF95BD00FB22D5700A3EC78 /* resman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424980E7BA6AB00F5680E /* resman.cpp */; };
-		DFF95BD10FB22D5700A3EC78 /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249A0E7BA6AB00F5680E /* router.cpp */; };
-		DFF95BD20FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249C0E7BA6AB00F5680E /* saveload.cpp */; };
-		DFF95BD30FB22D5700A3EC78 /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF84249E0E7BA6AB00F5680E /* screen.cpp */; };
-		DFF95BD40FB22D5700A3EC78 /* scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A00E7BA6AB00F5680E /* scroll.cpp */; };
-		DFF95BD50FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A10E7BA6AB00F5680E /* sound.cpp */; };
-		DFF95BD60FB22D5700A3EC78 /* speech.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A30E7BA6AB00F5680E /* speech.cpp */; };
-		DFF95BD70FB22D5700A3EC78 /* sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A40E7BA6AB00F5680E /* sprite.cpp */; };
-		DFF95BD80FB22D5700A3EC78 /* startup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A50E7BA6AB00F5680E /* startup.cpp */; };
-		DFF95BD90FB22D5700A3EC78 /* sword2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A60E7BA6AB00F5680E /* sword2.cpp */; };
-		DFF95BDA0FB22D5700A3EC78 /* sync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A80E7BA6AB00F5680E /* sync.cpp */; };
-		DFF95BDB0FB22D5700A3EC78 /* walker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424A90E7BA6AB00F5680E /* walker.cpp */; };
-		DFF95BDC0FB22D5700A3EC78 /* actors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AB0E7BA6AB00F5680E /* actors.cpp */; };
-		DFF95BDD0FB22D5700A3EC78 /* anim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AD0E7BA6AB00F5680E /* anim.cpp */; };
-		DFF95BDE0FB22D5700A3EC78 /* background.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424AF0E7BA6AB00F5680E /* background.cpp */; };
-		DFF95BDF0FB22D5700A3EC78 /* bg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B10E7BA6AB00F5680E /* bg.cpp */; };
-		DFF95BE00FB22D5700A3EC78 /* cliprect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B20E7BA6AB00F5680E /* cliprect.cpp */; };
-		DFF95BE10FB22D5700A3EC78 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B40E7BA6AB00F5680E /* config.cpp */; };
-		DFF95BE20FB22D5700A3EC78 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B70E7BA6AB00F5680E /* cursor.cpp */; };
-		DFF95BE30FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424B90E7BA6AB00F5680E /* debugger.cpp */; };
-		DFF95BE40FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BB0E7BA6AB00F5680E /* detection.cpp */; };
-		DFF95BE50FB22D5700A3EC78 /* effect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BD0E7BA6AB00F5680E /* effect.cpp */; };
-		DFF95BE60FB22D5700A3EC78 /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424BE0E7BA6AB00F5680E /* events.cpp */; };
-		DFF95BE70FB22D5700A3EC78 /* faders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C00E7BA6AB00F5680E /* faders.cpp */; };
-		DFF95BE80FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C30E7BA6AB00F5680E /* font.cpp */; };
-		DFF95BE90FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C50E7BA6AB00F5680E /* graphics.cpp */; };
-		DFF95BEA0FB22D5700A3EC78 /* handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C70E7BA6AB00F5680E /* handle.cpp */; };
-		DFF95BEB0FB22D5700A3EC78 /* heapmem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424C90E7BA6AB00F5680E /* heapmem.cpp */; };
-		DFF95BEC0FB22D5700A3EC78 /* mareels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424CD0E7BA6AB00F5680E /* mareels.cpp */; };
-		DFF95BED0FB22D5700A3EC78 /* move.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424CF0E7BA6AB00F5680E /* move.cpp */; };
-		DFF95BEE0FB22D5700A3EC78 /* multiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D10E7BA6AB00F5680E /* multiobj.cpp */; };
-		DFF95BEF0FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D30E7BA6AB00F5680E /* music.cpp */; };
-		DFF95BF00FB22D5700A3EC78 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D50E7BA6AB00F5680E /* object.cpp */; };
-		DFF95BF10FB22D5700A3EC78 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D70E7BA6AB00F5680E /* palette.cpp */; };
-		DFF95BF20FB22D5700A3EC78 /* pcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424D90E7BA6AB00F5680E /* pcode.cpp */; };
-		DFF95BF30FB22D5700A3EC78 /* pdisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DB0E7BA6AB00F5680E /* pdisplay.cpp */; };
-		DFF95BF40FB22D5700A3EC78 /* play.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DD0E7BA6AB00F5680E /* play.cpp */; };
-		DFF95BF50FB22D5700A3EC78 /* polygons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424DE0E7BA6AB00F5680E /* polygons.cpp */; };
-		DFF95BF60FB22D5700A3EC78 /* rince.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E00E7BA6AB00F5680E /* rince.cpp */; };
-		DFF95BF70FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E20E7BA6AB00F5680E /* saveload.cpp */; };
-		DFF95BF80FB22D5700A3EC78 /* savescn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E30E7BA6AB00F5680E /* savescn.cpp */; };
-		DFF95BF90FB22D5700A3EC78 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E50E7BA6AB00F5680E /* scene.cpp */; };
-		DFF95BFA0FB22D5700A3EC78 /* sched.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E70E7BA6AB00F5680E /* sched.cpp */; };
-		DFF95BFB0FB22D5700A3EC78 /* scn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424E90E7BA6AB00F5680E /* scn.cpp */; };
-		DFF95BFC0FB22D5700A3EC78 /* scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424EB0E7BA6AB00F5680E /* scroll.cpp */; };
-		DFF95BFD0FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424EE0E7BA6AB00F5680E /* sound.cpp */; };
-		DFF95BFE0FB22D5700A3EC78 /* strres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F00E7BA6AB00F5680E /* strres.cpp */; };
-		DFF95BFF0FB22D5700A3EC78 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F20E7BA6AB00F5680E /* text.cpp */; };
-		DFF95C000FB22D5700A3EC78 /* timers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F40E7BA6AB00F5680E /* timers.cpp */; };
-		DFF95C010FB22D5700A3EC78 /* tinlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F60E7BA6AB00F5680E /* tinlib.cpp */; };
-		DFF95C020FB22D5700A3EC78 /* tinsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424F80E7BA6AB00F5680E /* tinsel.cpp */; };
-		DFF95C030FB22D5700A3EC78 /* token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FA0E7BA6AB00F5680E /* token.cpp */; };
-		DFF95C040FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FD0E7BA6AB00F5680E /* detection.cpp */; };
-		DFF95C050FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8424FE0E7BA6AB00F5680E /* graphics.cpp */; };
-		DFF95C060FB22D5700A3EC78 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425000E7BA6AB00F5680E /* menu.cpp */; };
-		DFF95C070FB22D5700A3EC78 /* midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425010E7BA6AB00F5680E /* midi.cpp */; };
-		DFF95C080FB22D5700A3EC78 /* opcodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425040E7BA6AB00F5680E /* opcodes.cpp */; };
-		DFF95C090FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425050E7BA6AB00F5680E /* resource.cpp */; };
-		DFF95C0A0FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425060E7BA6AB00F5680E /* saveload.cpp */; };
-		DFF95C0B0FB22D5700A3EC78 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425070E7BA6AB00F5680E /* staticres.cpp */; };
-		DFF95C0C0FB22D5700A3EC78 /* touche.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8425080E7BA6AB00F5680E /* touche.cpp */; };
-		DFF95C0D0FB22D5700A3EC78 /* blit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF8428960E7BAAAB00F5680E /* blit.cpp */; };
-		DFF95C0E0FB22D5700A3EC78 /* timidity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A3D0E7BBB5000F5680E /* timidity.cpp */; };
-		DFF95C0F0FB22D5700A3EC78 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A400E7BBBB400F5680E /* archive.cpp */; };
-		DFF95C100FB22D5700A3EC78 /* unarj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A450E7BBBB400F5680E /* unarj.cpp */; };
-		DFF95C110FB22D5700A3EC78 /* stdiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */; };
-		DFF95C130FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF00ED5FC77001CB19F /* saveload.cpp */; };
-		DFF95C140FB22D5700A3EC78 /* ThemeEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */; };
-		DFF95C150FB22D5700A3EC78 /* ThemeEval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */; };
-		DFF95C160FB22D5700A3EC78 /* ThemeLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BF80ED5FC77001CB19F /* ThemeLayout.cpp */; };
-		DFF95C170FB22D5700A3EC78 /* ThemeParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8BFA0ED5FC77001CB19F /* ThemeParser.cpp */; };
-		DFF95C180FB22D5700A3EC78 /* thumbnail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C050ED5FCAF001CB19F /* thumbnail.cpp */; };
-		DFF95C190FB22D5700A3EC78 /* VectorRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C070ED5FCAF001CB19F /* VectorRenderer.cpp */; };
-		DFF95C1A0FB22D5700A3EC78 /* VectorRendererSpec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */; };
-		DFF95C1B0FB22D5700A3EC78 /* xmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C0F0ED5FCC2001CB19F /* xmlparser.cpp */; };
-		DFF95C1C0FB22D5700A3EC78 /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E8C510ED60067001CB19F /* game.cpp */; };
-		DFF95C1D0FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFF50F0112AD003E9390 /* saveload.cpp */; };
-		DFF95C1E0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFF80F0112C1003E9390 /* detection.cpp */; };
-		DFF95C1F0FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAAFFB0F0112DF003E9390 /* detection.cpp */; };
-		DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
-		DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
-		DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
-		DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
-		DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
-		DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
-		DFF95C2C0FB22D5700A3EC78 /* drives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC220F4862520006E566 /* drives.cpp */; };
-		DFF95C2D0FB22D5700A3EC78 /* sysvar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC270F4862520006E566 /* sysvar.cpp */; };
-		DFF95C2E0FB22D5700A3EC78 /* gui_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC2E0F48628A0006E566 /* gui_lol.cpp */; };
-		DFF95C2F0FB22D5700A3EC78 /* items_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC300F48628A0006E566 /* items_lol.cpp */; };
-		DFF95C300FB22D5700A3EC78 /* script_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC310F48628A0006E566 /* script_lol.cpp */; };
-		DFF95C310FB22D5700A3EC78 /* sequences_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC320F48628A0006E566 /* sequences_lol.cpp */; };
-		DFF95C320FB22D5700A3EC78 /* sound_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC330F48628A0006E566 /* sound_midi.cpp */; };
-		DFF95C330FB22D5700A3EC78 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC360F48628A0006E566 /* util.cpp */; };
-		DFF95C370FB22D5700A3EC78 /* scene_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC490F4863100006E566 /* scene_lol.cpp */; };
-		DFF95C380FB22D5700A3EC78 /* advancedDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */; };
-		DFF95C390FB22D5700A3EC78 /* base-backend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC5B0F4866E70006E566 /* base-backend.cpp */; };
-		DFF95C3A0FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC600F48672D0006E566 /* resource.cpp */; };
-		DFF95C3B0FB22D5700A3EC78 /* resource_hrs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC620F48672D0006E566 /* resource_hrs.cpp */; };
-		DFF95C3C0FB22D5700A3EC78 /* resource_res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC630F48672D0006E566 /* resource_res.cpp */; };
-		DFF95C3D0FB22D5700A3EC78 /* resource_rsc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC640F48672D0006E566 /* resource_rsc.cpp */; };
-		DFF95C3E0FB22D5700A3EC78 /* sfuncs_ihnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC650F48672D0006E566 /* sfuncs_ihnm.cpp */; };
-		DFF95C3F0FB22D5700A3EC78 /* debugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC700F4867910006E566 /* debugger.cpp */; };
-		DFF95C400FB22D5700A3EC78 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC720F4867910006E566 /* staticres.cpp */; };
-		DFF95C410FB22D5700A3EC78 /* cell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCBD0F4870690006E566 /* cell.cpp */; };
-		DFF95C420FB22D5700A3EC78 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCBF0F4870690006E566 /* cursor.cpp */; };
-		DFF95C430FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC10F4870690006E566 /* debug.cpp */; };
-		DFF95C440FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC30F4870690006E566 /* detection.cpp */; };
-		DFF95C450FB22D5700A3EC78 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC40F4870690006E566 /* font.cpp */; };
-		DFF95C460FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC60F4870690006E566 /* graphics.cpp */; };
-		DFF95C470FB22D5700A3EC78 /* groovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCC80F4870690006E566 /* groovie.cpp */; };
-		DFF95C480FB22D5700A3EC78 /* lzss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCA0F4870690006E566 /* lzss.cpp */; };
-		DFF95C490FB22D5700A3EC78 /* music.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCD0F4870690006E566 /* music.cpp */; };
-		DFF95C4A0FB22D5700A3EC78 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCCF0F4870690006E566 /* player.cpp */; };
-		DFF95C4B0FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD10F4870690006E566 /* resource.cpp */; };
-		DFF95C4C0FB22D5700A3EC78 /* roq.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD30F4870690006E566 /* roq.cpp */; };
-		DFF95C4D0FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD50F4870690006E566 /* saveload.cpp */; };
-		DFF95C4E0FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD70F4870690006E566 /* script.cpp */; };
-		DFF95C4F0FB22D5700A3EC78 /* vdx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFCD90F4870690006E566 /* vdx.cpp */; };
-		DFF95C500FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD050F4870E50006E566 /* detection.cpp */; };
-		DFF95C510FB22D5700A3EC78 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD060F4870E50006E566 /* graphics.cpp */; };
-		DFF95C520FB22D5700A3EC78 /* locations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD080F4870E50006E566 /* locations.cpp */; };
-		DFF95C530FB22D5700A3EC78 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0A0F4870E50006E566 /* resource.cpp */; };
-		DFF95C540FB22D5700A3EC78 /* saveload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0B0F4870E50006E566 /* saveload.cpp */; };
-		DFF95C550FB22D5700A3EC78 /* sequences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0C0F4870E50006E566 /* sequences.cpp */; };
-		DFF95C560FB22D5700A3EC78 /* staticres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0D0F4870E50006E566 /* staticres.cpp */; };
-		DFF95C570FB22D5700A3EC78 /* tucker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFD0E0F4870E50006E566 /* tucker.cpp */; };
-		DFF95C580FB22D5700A3EC78 /* detection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301A0F48AF18005EF03C /* detection.cpp */; };
-		DFF95C5A0FB22D5700A3EC78 /* gc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8301E0F48AF18005EF03C /* gc.cpp */; };
-		DFF95C5C0FB22D5700A3EC78 /* kernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830230F48AF18005EF03C /* kernel.cpp */; };
-		DFF95C5D0FB22D5700A3EC78 /* kevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830260F48AF18005EF03C /* kevent.cpp */; };
-		DFF95C5E0FB22D5700A3EC78 /* kfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830270F48AF18005EF03C /* kfile.cpp */; };
-		DFF95C5F0FB22D5700A3EC78 /* kgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830280F48AF18005EF03C /* kgraphics.cpp */; };
-		DFF95C600FB22D5700A3EC78 /* klists.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830290F48AF18005EF03C /* klists.cpp */; };
-		DFF95C610FB22D5700A3EC78 /* kmath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302A0F48AF18005EF03C /* kmath.cpp */; };
-		DFF95C620FB22D5700A3EC78 /* kmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302B0F48AF18005EF03C /* kmenu.cpp */; };
-		DFF95C630FB22D5700A3EC78 /* kmovement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302C0F48AF18005EF03C /* kmovement.cpp */; };
-		DFF95C640FB22D5700A3EC78 /* kpathing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302D0F48AF18005EF03C /* kpathing.cpp */; };
-		DFF95C650FB22D5700A3EC78 /* kscripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302E0F48AF18005EF03C /* kscripts.cpp */; };
-		DFF95C660FB22D5700A3EC78 /* ksound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8302F0F48AF18005EF03C /* ksound.cpp */; };
-		DFF95C670FB22D5700A3EC78 /* kstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830300F48AF18005EF03C /* kstring.cpp */; };
-		DFF95C680FB22D5700A3EC78 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830310F48AF18005EF03C /* message.cpp */; };
-		DFF95C6A0FB22D5700A3EC78 /* savegame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830360F48AF18005EF03C /* savegame.cpp */; };
-		DFF95C6C0FB22D5700A3EC78 /* scriptdebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830390F48AF18005EF03C /* scriptdebug.cpp */; };
-		DFF95C6D0FB22D5700A3EC78 /* seg_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8303A0F48AF18005EF03C /* seg_manager.cpp */; };
-		DFF95C6E0FB22D5700A3EC78 /* vm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8303C0F48AF18005EF03C /* vm.cpp */; };
-		DFF95C770FB22D5700A3EC78 /* sci.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830960F48AF18005EF03C /* sci.cpp */; };
-		DFF95C880FB22D5700A3EC78 /* unzip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE473C10D81F4E800B6D1FB /* unzip.cpp */; };
-		DFF95C890FB22D5700A3EC78 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAD2390F50120E00C3A4E2 /* console.cpp */; };
-		DFF95C8E0FB22D5700A3EC78 /* state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573C010F5A81EA00961A72 /* state.cpp */; };
-		DFF95C910FB22D5700A3EC78 /* exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBA0F5A85B300961A72 /* exec.cpp */; };
-		DFF95C920FB22D5700A3EC78 /* timer_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF573CBD0F5A85E100961A72 /* timer_lol.cpp */; };
-		DFF95C940FB22D5700A3EC78 /* sprites_lol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */; };
-		DFF95C950FB22D5700A3EC78 /* script.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF89C2A30F62D79E00D756B6 /* script.cpp */; };
-		DFF95C990FB22D5700A3EC78 /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; };
-		DFF95C9A0FB22D5700A3EC78 /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; };
-		DFF95C9B0FB22D5700A3EC78 /* vga_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5E0F63CAD4002D821E /* vga_pn.cpp */; };
-		DFF95CA70FB22D5700A3EC78 /* sound_br.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB260F75535000DEA624 /* sound_br.cpp */; };
-		DFF95CA80FB22D5700A3EC78 /* sound_ns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB270F75535000DEA624 /* sound_ns.cpp */; };
-		DFF95CA90FB22D5700A3EC78 /* protracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF5CEB2F0F75538000DEA624 /* protracker.cpp */; };
-		DFF95CAC0FB22D5700A3EC78 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE88C440F874A1100C555C5 /* sound.cpp */; };
-		DFF95CAE0FB22D5700A3EC78 /* batplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC070FAC4E1900A5AFD7 /* batplayer.cpp */; };
-		DFF95CAF0FB22D5700A3EC78 /* demoplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC090FAC4E1900A5AFD7 /* demoplayer.cpp */; };
-		DFF95CB00FB22D5700A3EC78 /* scnplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0B0FAC4E1900A5AFD7 /* scnplayer.cpp */; };
-		DFF95CB10FB22D5700A3EC78 /* draw_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0D0FAC4E1900A5AFD7 /* draw_fascin.cpp */; };
-		DFF95CB30FB22D5700A3EC78 /* inter_fascin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */; };
-		DFF95CB40FB22D5700A3EC78 /* script_v3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */; };
-		DFF95CB50FB22D5700A3EC78 /* script_v4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */; };
-		DFF95CBC0FB22D5700A3EC78 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A160E7BB34E00F5680E /* CoreAudio.framework */; };
-		DFF95CBD0FB22D5700A3EC78 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A170E7BB34E00F5680E /* CoreFoundation.framework */; };
-		DFF95CBE0FB22D5700A3EC78 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A180E7BB34E00F5680E /* Foundation.framework */; };
-		DFF95CBF0FB22D5700A3EC78 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A190E7BB34E00F5680E /* UIKit.framework */; };
-		DFF95CC00FB22D5700A3EC78 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A270E7BB37500F5680E /* AudioToolbox.framework */; };
-		DFF95CC10FB22D5700A3EC78 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF842A2E0E7BB39E00F5680E /* QuartzCore.framework */; };
-		F92B4DCE139DD428000D1BF1 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DCC139DD428000D1BF1 /* quicktime.cpp */; };
-		F92B4DCF139DD428000D1BF1 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DCC139DD428000D1BF1 /* quicktime.cpp */; };
-		F92B4DD0139DD428000D1BF1 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DCC139DD428000D1BF1 /* quicktime.cpp */; };
-		F92B4DD3139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */; };
-		F92B4DD4139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */; };
-		F92B4DD5139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */; };
-		F92B4DDA139DDC92000D1BF1 /* macosx-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD7139DDC92000D1BF1 /* macosx-main.cpp */; };
-		F92B4DDB139DDC92000D1BF1 /* macosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F92B4DD8139DDC92000D1BF1 /* macosx.cpp */; };
-		F9946D90139E1A260072D195 /* cdtoons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D7A139E1A260072D195 /* cdtoons.cpp */; };
-		F9946D91139E1A260072D195 /* cinepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D7C139E1A260072D195 /* cinepak.cpp */; };
-		F9946D92139E1A260072D195 /* indeo3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D7F139E1A260072D195 /* indeo3.cpp */; };
-		F9946D93139E1A260072D195 /* mjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D81139E1A260072D195 /* mjpeg.cpp */; };
-		F9946D94139E1A260072D195 /* msrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D83139E1A260072D195 /* msrle.cpp */; };
-		F9946D95139E1A260072D195 /* msvideo1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D85139E1A260072D195 /* msvideo1.cpp */; };
-		F9946D96139E1A260072D195 /* qtrle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D87139E1A260072D195 /* qtrle.cpp */; };
-		F9946D97139E1A260072D195 /* rpza.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D89139E1A260072D195 /* rpza.cpp */; };
-		F9946D98139E1A260072D195 /* smc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D8B139E1A260072D195 /* smc.cpp */; };
-		F9946D99139E1A260072D195 /* truemotion1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D8D139E1A260072D195 /* truemotion1.cpp */; };
-		F9946D9D139E1A560072D195 /* towns_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9A139E1A560072D195 /* towns_midi.cpp */; };
-		F9946D9E139E1A560072D195 /* towns_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9A139E1A560072D195 /* towns_midi.cpp */; };
-		F9946D9F139E1A560072D195 /* towns_midi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9A139E1A560072D195 /* towns_midi.cpp */; };
-		F9946DA0139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */; };
-		F9946DA1139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */; };
-		F9946DA2139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */; };
-		F9946DB5139E1A880072D195 /* freeverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA3139E1A880072D195 /* freeverb.cpp */; };
-		F9946DB6139E1A880072D195 /* freeverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA3139E1A880072D195 /* freeverb.cpp */; };
-		F9946DB7139E1A880072D195 /* freeverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA3139E1A880072D195 /* freeverb.cpp */; };
-		F9946DB8139E1A880072D195 /* i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA5139E1A880072D195 /* i386.cpp */; };
-		F9946DB9139E1A880072D195 /* i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA5139E1A880072D195 /* i386.cpp */; };
-		F9946DBA139E1A880072D195 /* i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA5139E1A880072D195 /* i386.cpp */; };
-		F9946DBB139E1A880072D195 /* mt32_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA7139E1A880072D195 /* mt32_file.cpp */; };
-		F9946DBC139E1A880072D195 /* mt32_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA7139E1A880072D195 /* mt32_file.cpp */; };
-		F9946DBD139E1A880072D195 /* mt32_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DA7139E1A880072D195 /* mt32_file.cpp */; };
-		F9946DBE139E1A880072D195 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAA139E1A880072D195 /* part.cpp */; };
-		F9946DBF139E1A880072D195 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAA139E1A880072D195 /* part.cpp */; };
-		F9946DC0139E1A880072D195 /* part.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAA139E1A880072D195 /* part.cpp */; };
-		F9946DC1139E1A880072D195 /* partial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAC139E1A880072D195 /* partial.cpp */; };
-		F9946DC2139E1A880072D195 /* partial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAC139E1A880072D195 /* partial.cpp */; };
-		F9946DC3139E1A880072D195 /* partial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAC139E1A880072D195 /* partial.cpp */; };
-		F9946DC4139E1A880072D195 /* partialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAE139E1A880072D195 /* partialManager.cpp */; };
-		F9946DC5139E1A880072D195 /* partialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAE139E1A880072D195 /* partialManager.cpp */; };
-		F9946DC6139E1A880072D195 /* partialManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DAE139E1A880072D195 /* partialManager.cpp */; };
-		F9946DC7139E1A880072D195 /* synth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB1139E1A880072D195 /* synth.cpp */; };
-		F9946DC8139E1A880072D195 /* synth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB1139E1A880072D195 /* synth.cpp */; };
-		F9946DC9139E1A880072D195 /* synth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB1139E1A880072D195 /* synth.cpp */; };
-		F9946DCA139E1A880072D195 /* tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB3139E1A880072D195 /* tables.cpp */; };
-		F9946DCB139E1A880072D195 /* tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB3139E1A880072D195 /* tables.cpp */; };
-		F9946DCC139E1A880072D195 /* tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DB3139E1A880072D195 /* tables.cpp */; };
-		F9946DD6139E1AD30072D195 /* aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DCE139E1AD30072D195 /* aac.cpp */; };
-		F9946DD7139E1AD30072D195 /* aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DCE139E1AD30072D195 /* aac.cpp */; };
-		F9946DD8139E1AD30072D195 /* aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DCE139E1AD30072D195 /* aac.cpp */; };
-		F9946DD9139E1AD30072D195 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD0139E1AD30072D195 /* qdm2.cpp */; };
-		F9946DDA139E1AD30072D195 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD0139E1AD30072D195 /* qdm2.cpp */; };
-		F9946DDB139E1AD30072D195 /* qdm2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD0139E1AD30072D195 /* qdm2.cpp */; };
-		F9946DDC139E1AD30072D195 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD4139E1AD30072D195 /* quicktime.cpp */; };
-		F9946DDD139E1AD30072D195 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD4139E1AD30072D195 /* quicktime.cpp */; };
-		F9946DDE139E1AD30072D195 /* quicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DD4139E1AD30072D195 /* quicktime.cpp */; };
-		F9946DE3139E1B180072D195 /* posix-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE0139E1B180072D195 /* posix-main.cpp */; };
-		F9946DE4139E1B180072D195 /* posix-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE0139E1B180072D195 /* posix-main.cpp */; };
-		F9946DE5139E1B180072D195 /* posix-main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE0139E1B180072D195 /* posix-main.cpp */; };
-		F9946DE6139E1B180072D195 /* posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE1139E1B180072D195 /* posix.cpp */; };
-		F9946DE7139E1B180072D195 /* posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE1139E1B180072D195 /* posix.cpp */; };
-		F9946DE8139E1B180072D195 /* posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DE1139E1B180072D195 /* posix.cpp */; };
-		F9946DEC139E1B6F0072D195 /* downscaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEA139E1B6F0072D195 /* downscaler.cpp */; };
-		F9946DED139E1B6F0072D195 /* downscaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEA139E1B6F0072D195 /* downscaler.cpp */; };
-		F9946DEE139E1B6F0072D195 /* downscaler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEA139E1B6F0072D195 /* downscaler.cpp */; };
-		F9946DF1139E1BA00072D195 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEF139E1BA00072D195 /* console.cpp */; };
-		F9946DF2139E1BA00072D195 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEF139E1BA00072D195 /* console.cpp */; };
-		F9946DF3139E1BA00072D195 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DEF139E1BA00072D195 /* console.cpp */; };
-		F9946DF7139E1BBF0072D195 /* sdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */; };
-		F9946DF8139E1BBF0072D195 /* sdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */; };
-		F9946DF9139E1BBF0072D195 /* sdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */; };
-		F9946DFE139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */; };
-		F9946DFF139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */; };
-		F9946E00139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */; };
-		F9946E04139E1C390072D195 /* sdl-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946E02139E1C390072D195 /* sdl-graphics.cpp */; };
-		F9946E05139E1C390072D195 /* sdl-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946E02139E1C390072D195 /* sdl-graphics.cpp */; };
-		F9946E06139E1C3A0072D195 /* sdl-graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9946E02139E1C390072D195 /* sdl-graphics.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		DF0942260F63CB26002D821E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 7;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DF573CB30F5A84DF00961A72 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 7;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DFF95CC60FB22D5700A3EC78 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 7;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1D6058910D05DD3D006BFB54 /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		8CB5A9B71253FD6800CB6BC7 /* m4_scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = m4_scene.cpp; sourceTree = "<group>"; };
-		8CB5A9B81253FD6800CB6BC7 /* m4_scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m4_scene.h; sourceTree = "<group>"; };
-		8CB5A9B91253FD6800CB6BC7 /* mads_logic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mads_logic.cpp; sourceTree = "<group>"; };
-		8CB5A9BA1253FD6800CB6BC7 /* mads_logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mads_logic.h; sourceTree = "<group>"; };
-		8CB5A9BB1253FD6800CB6BC7 /* mads_player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mads_player.cpp; sourceTree = "<group>"; };
-		8CB5A9BC1253FD6800CB6BC7 /* mads_player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mads_player.h; sourceTree = "<group>"; };
-		8CB5A9BD1253FD6800CB6BC7 /* mads_scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mads_scene.cpp; sourceTree = "<group>"; };
-		8CB5A9BE1253FD6800CB6BC7 /* mads_scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mads_scene.h; sourceTree = "<group>"; };
-		8CB5A9BF1253FD6900CB6BC7 /* mads_views.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mads_views.cpp; sourceTree = "<group>"; };
-		8CB5A9C01253FD6900CB6BC7 /* mads_views.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mads_views.h; sourceTree = "<group>"; };
-		8CB5A9D51253FDF400CB6BC7 /* drascula.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = drascula.dat; sourceTree = "<group>"; };
-		8CB5A9D61253FDF500CB6BC7 /* hugo.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = hugo.dat; sourceTree = "<group>"; };
-		8CB5A9D71253FDF500CB6BC7 /* m4.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = m4.dat; sourceTree = "<group>"; };
-		8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = teenagent.dat; sourceTree = "<group>"; };
-		8CD1ECC6126202AA00FA198C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		8CD1ECC7126202AA00FA198C /* display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display.cpp; sourceTree = "<group>"; };
-		8CD1ECC8126202AA00FA198C /* display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = display.h; sourceTree = "<group>"; };
-		8CD1ECCB126202AA00FA198C /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = "<group>"; };
-		8CD1ECCC126202AA00FA198C /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
-		8CD1ECCD126202AA00FA198C /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
-		8CD1ECCF126202AA00FA198C /* hugo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hugo.cpp; sourceTree = "<group>"; };
-		8CD1ECD0126202AA00FA198C /* hugo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hugo.h; sourceTree = "<group>"; };
-		8CD1ECD1126202AA00FA198C /* intro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intro.cpp; sourceTree = "<group>"; };
-		8CD1ECD2126202AA00FA198C /* intro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intro.h; sourceTree = "<group>"; };
-		8CD1ECD3126202AA00FA198C /* inventory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inventory.cpp; sourceTree = "<group>"; };
-		8CD1ECD4126202AA00FA198C /* inventory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inventory.h; sourceTree = "<group>"; };
-		8CD1ECD7126202AA00FA198C /* mouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouse.cpp; sourceTree = "<group>"; };
-		8CD1ECD8126202AA00FA198C /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
-		8CD1ECD9126202AA00FA198C /* parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser.cpp; sourceTree = "<group>"; };
-		8CD1ECDA126202AA00FA198C /* parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser.h; sourceTree = "<group>"; };
-		8CD1ECDB126202AA00FA198C /* route.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = route.cpp; sourceTree = "<group>"; };
-		8CD1ECDC126202AA00FA198C /* route.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = route.h; sourceTree = "<group>"; };
-		8CD1ECDD126202AA00FA198C /* schedule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = schedule.cpp; sourceTree = "<group>"; };
-		8CD1ECDE126202AA00FA198C /* schedule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = schedule.h; sourceTree = "<group>"; };
-		8CD1ECDF126202AA00FA198C /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		8CD1ECE0126202AA00FA198C /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		8CD1ECE1126202AA00FA198C /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		8CD1ECE2126202AA00FA198C /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		8CD1ECE4126202AA00FA198C /* anim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anim.cpp; sourceTree = "<group>"; };
-		8CD1ECE5126202AA00FA198C /* anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = anim.h; sourceTree = "<group>"; };
-		8CD1ECE6126202AA00FA198C /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audio.cpp; sourceTree = "<group>"; };
-		8CD1ECE7126202AA00FA198C /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio.h; sourceTree = "<group>"; };
-		8CD1ECE8126202AA00FA198C /* character.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = character.cpp; sourceTree = "<group>"; };
-		8CD1ECE9126202AA00FA198C /* character.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = character.h; sourceTree = "<group>"; };
-		8CD1ECEA126202AA00FA198C /* conversation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conversation.cpp; sourceTree = "<group>"; };
-		8CD1ECEB126202AA00FA198C /* conversation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conversation.h; sourceTree = "<group>"; };
-		8CD1ECEC126202AA00FA198C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		8CD1ECED126202AA00FA198C /* drew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drew.cpp; sourceTree = "<group>"; };
-		8CD1ECEE126202AA00FA198C /* drew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drew.h; sourceTree = "<group>"; };
-		8CD1ECEF126202AA00FA198C /* flux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flux.cpp; sourceTree = "<group>"; };
-		8CD1ECF0126202AA00FA198C /* flux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flux.h; sourceTree = "<group>"; };
-		8CD1ECF1126202AA00FA198C /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		8CD1ECF2126202AA00FA198C /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		8CD1ECF3126202AA00FA198C /* hotspot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotspot.cpp; sourceTree = "<group>"; };
-		8CD1ECF4126202AA00FA198C /* hotspot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotspot.h; sourceTree = "<group>"; };
-		8CD1ECF7126202AA00FA198C /* movie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = movie.cpp; sourceTree = "<group>"; };
-		8CD1ECF8126202AA00FA198C /* movie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = movie.h; sourceTree = "<group>"; };
-		8CD1ECF9126202AA00FA198C /* path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = path.cpp; sourceTree = "<group>"; };
-		8CD1ECFA126202AA00FA198C /* path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = path.h; sourceTree = "<group>"; };
-		8CD1ECFB126202AA00FA198C /* picture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture.cpp; sourceTree = "<group>"; };
-		8CD1ECFC126202AA00FA198C /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
-		8CD1ECFD126202AA00FA198C /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		8CD1ECFE126202AA00FA198C /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		8CD1ECFF126202AA00FA198C /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		8CD1ED00126202AA00FA198C /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		8CD1ED01126202AA00FA198C /* script_func.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_func.cpp; sourceTree = "<group>"; };
-		8CD1ED02126202AA00FA198C /* script_func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script_func.h; sourceTree = "<group>"; };
-		8CD1ED03126202AA00FA198C /* state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = state.cpp; sourceTree = "<group>"; };
-		8CD1ED04126202AA00FA198C /* state.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = state.h; sourceTree = "<group>"; };
-		8CD1ED05126202AA00FA198C /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		8CD1ED06126202AA00FA198C /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
-		8CD1ED07126202AA00FA198C /* tools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tools.cpp; sourceTree = "<group>"; };
-		8CD1ED08126202AA00FA198C /* tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tools.h; sourceTree = "<group>"; };
-		8CD1ED09126202AA00FA198C /* toon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = toon.cpp; sourceTree = "<group>"; };
-		8CD1ED0A126202AA00FA198C /* toon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toon.h; sourceTree = "<group>"; };
-		8CD1ED871262030100FA198C /* toon.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = toon.dat; sourceTree = "<group>"; };
-		8CD80C89126271A9001C6C87 /* surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surface.cpp; sourceTree = "<group>"; };
-		8CD80C8A126271A9001C6C87 /* surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = "<group>"; };
-		8CD80C90126271BD001C6C87 /* gfx_towns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfx_towns.cpp; sourceTree = "<group>"; };
-		8CD80CBF1262729F001C6C87 /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor.cpp; sourceTree = "<group>"; };
-		8CD80CC01262729F001C6C87 /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
-		8CD80CC11262729F001C6C87 /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		8CD80CC21262729F001C6C87 /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = "<group>"; };
-		8CD80CC31262729F001C6C87 /* callbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callbacks.cpp; sourceTree = "<group>"; };
-		8CD80CC41262729F001C6C87 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		8CD80CC51262729F001C6C87 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		8CD80CC61262729F001C6C87 /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		8CD80CC71262729F001C6C87 /* dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialog.cpp; sourceTree = "<group>"; };
-		8CD80CC81262729F001C6C87 /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialog.h; sourceTree = "<group>"; };
-		8CD80CC91262729F001C6C87 /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		8CD80CCA1262729F001C6C87 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		8CD80CCB1262729F001C6C87 /* inventory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inventory.cpp; sourceTree = "<group>"; };
-		8CD80CCC1262729F001C6C87 /* inventory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inventory.h; sourceTree = "<group>"; };
-		8CD80CCE1262729F001C6C87 /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		8CD80CCF1262729F001C6C87 /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		8CD80CD01262729F001C6C87 /* objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = objects.cpp; sourceTree = "<group>"; };
-		8CD80CD11262729F001C6C87 /* objects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objects.h; sourceTree = "<group>"; };
-		8CD80CD21262729F001C6C87 /* pack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pack.cpp; sourceTree = "<group>"; };
-		8CD80CD3126272A0001C6C87 /* pack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pack.h; sourceTree = "<group>"; };
-		8CD80CD4126272A0001C6C87 /* resources.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resources.cpp; sourceTree = "<group>"; };
-		8CD80CD5126272A0001C6C87 /* resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resources.h; sourceTree = "<group>"; };
-		8CD80CD6126272A0001C6C87 /* scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene.cpp; sourceTree = "<group>"; };
-		8CD80CD7126272A0001C6C87 /* scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene.h; sourceTree = "<group>"; };
-		8CD80CD8126272A0001C6C87 /* segment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment.cpp; sourceTree = "<group>"; };
-		8CD80CD9126272A0001C6C87 /* segment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = segment.h; sourceTree = "<group>"; };
-		8CD80CDA126272A0001C6C87 /* surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surface.cpp; sourceTree = "<group>"; };
-		8CD80CDB126272A0001C6C87 /* surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = "<group>"; };
-		8CD80CDC126272A0001C6C87 /* surface_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surface_list.cpp; sourceTree = "<group>"; };
-		8CD80CDD126272A0001C6C87 /* surface_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface_list.h; sourceTree = "<group>"; };
-		8CD80CDE126272A0001C6C87 /* teenagent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teenagent.cpp; sourceTree = "<group>"; };
-		8CD80CDF126272A0001C6C87 /* teenagent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = teenagent.h; sourceTree = "<group>"; };
-		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		DF093E5C0F63CAD4002D821E /* pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pn.cpp; sourceTree = "<group>"; };
-		DF093E5D0F63CAD4002D821E /* script_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_pn.cpp; sourceTree = "<group>"; };
-		DF093E5E0F63CAD4002D821E /* vga_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_pn.cpp; sourceTree = "<group>"; };
-		DF09422A0F63CB26002D821E /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		DF0942390F63CB9A002D821E /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
-		DF09423C0F63CB9A002D821E /* sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl.cpp; sourceTree = "<group>"; };
-		DF09423D0F63CB9A002D821E /* sdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl.h; sourceTree = "<group>"; };
-		DF0944170F63FA8F002D821E /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
-		DF0944240F63FB2C002D821E /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
-		DF0944300F63FBB3002D821E /* coreaudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coreaudio.cpp; sourceTree = "<group>"; };
-		DF0944310F63FBB3002D821E /* coremidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coremidi.cpp; sourceTree = "<group>"; };
-		DF0944370F63FBFE002D821E /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
-		DF09446D0F63FCCB002D821E /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
-		DF09446E0F63FCCB002D821E /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		DF0944770F63FD10002D821E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
-		DF09447F0F63FD67002D821E /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
-		DF0944B00F6430ED002D821E /* scummvm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = scummvm.icns; path = ../../icons/scummvm.icns; sourceTree = SOURCE_ROOT; };
-		DF09CC070FAC4E1900A5AFD7 /* batplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = batplayer.cpp; sourceTree = "<group>"; };
-		DF09CC080FAC4E1900A5AFD7 /* batplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = batplayer.h; sourceTree = "<group>"; };
-		DF09CC090FAC4E1900A5AFD7 /* demoplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = demoplayer.cpp; sourceTree = "<group>"; };
-		DF09CC0A0FAC4E1900A5AFD7 /* demoplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = demoplayer.h; sourceTree = "<group>"; };
-		DF09CC0B0FAC4E1900A5AFD7 /* scnplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scnplayer.cpp; sourceTree = "<group>"; };
-		DF09CC0C0FAC4E1900A5AFD7 /* scnplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scnplayer.h; sourceTree = "<group>"; };
-		DF09CC0D0FAC4E1900A5AFD7 /* draw_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_fascin.cpp; sourceTree = "<group>"; };
-		DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_fascin.cpp; sourceTree = "<group>"; };
-		DF09CC1D0FAC4E6200A5AFD7 /* scumm_v0.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v0.h; sourceTree = "<group>"; };
-		DF09CC1E0FAC4E6200A5AFD7 /* scumm_v2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v2.h; sourceTree = "<group>"; };
-		DF09CC1F0FAC4E6200A5AFD7 /* scumm_v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v3.h; sourceTree = "<group>"; };
-		DF09CC200FAC4E6200A5AFD7 /* scumm_v4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v4.h; sourceTree = "<group>"; };
-		DF09CC210FAC4E6200A5AFD7 /* scumm_v5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v5.h; sourceTree = "<group>"; };
-		DF09CC220FAC4E6200A5AFD7 /* scumm_v6.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v6.h; sourceTree = "<group>"; };
-		DF09CC230FAC4E6200A5AFD7 /* scumm_v7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v7.h; sourceTree = "<group>"; };
-		DF09CC240FAC4E6200A5AFD7 /* scumm_v8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm_v8.h; sourceTree = "<group>"; };
-		DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v3.cpp; sourceTree = "<group>"; };
-		DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v4.cpp; sourceTree = "<group>"; };
-		DF0E30391252C5BD0082D593 /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cms.cpp; sourceTree = "<group>"; };
-		DF203F461380C06E0056300A /* gui-manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gui-manager.cpp"; sourceTree = "<group>"; };
-		DF203F531380C2740056300A /* avi_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = avi_decoder.cpp; path = ../../video/avi_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F541380C2740056300A /* avi_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avi_decoder.h; path = ../../video/avi_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F551380C2740056300A /* coktel_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = coktel_decoder.cpp; path = ../../video/coktel_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F561380C2740056300A /* coktel_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coktel_decoder.h; path = ../../video/coktel_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F571380C2740056300A /* dxa_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dxa_decoder.cpp; path = ../../video/dxa_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F581380C2740056300A /* dxa_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dxa_decoder.h; path = ../../video/dxa_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F591380C2740056300A /* flic_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flic_decoder.cpp; path = ../../video/flic_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F5A1380C2740056300A /* flic_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flic_decoder.h; path = ../../video/flic_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F5D1380C2740056300A /* qt_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qt_decoder.cpp; path = ../../video/qt_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F5E1380C2750056300A /* qt_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qt_decoder.h; path = ../../video/qt_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F5F1380C2750056300A /* smk_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smk_decoder.cpp; path = ../../video/smk_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F601380C2750056300A /* smk_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smk_decoder.h; path = ../../video/smk_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F611380C2750056300A /* video_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_decoder.cpp; path = ../../video/video_decoder.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F621380C2750056300A /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_decoder.h; path = ../../video/video_decoder.h; sourceTree = SOURCE_ROOT; };
-		DF203F7C1380C2920056300A /* cdtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cdtoons.cpp; path = ../../video/codecs/cdtoons.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F7D1380C2920056300A /* cdtoons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cdtoons.h; path = ../../video/codecs/cdtoons.h; sourceTree = SOURCE_ROOT; };
-		DF203F7E1380C2920056300A /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cinepak.cpp; path = ../../video/codecs/cinepak.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F7F1380C2920056300A /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cinepak.h; path = ../../video/codecs/cinepak.h; sourceTree = SOURCE_ROOT; };
-		DF203F801380C2920056300A /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codec.h; path = ../../video/codecs/codec.h; sourceTree = SOURCE_ROOT; };
-		DF203F811380C2920056300A /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = indeo3.cpp; path = ../../video/codecs/indeo3.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F821380C2920056300A /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = indeo3.h; path = ../../video/codecs/indeo3.h; sourceTree = SOURCE_ROOT; };
-		DF203F831380C2920056300A /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mjpeg.cpp; path = ../../video/codecs/mjpeg.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F841380C2920056300A /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mjpeg.h; path = ../../video/codecs/mjpeg.h; sourceTree = SOURCE_ROOT; };
-		DF203F851380C2920056300A /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msrle.cpp; path = ../../video/codecs/msrle.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F861380C2920056300A /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msrle.h; path = ../../video/codecs/msrle.h; sourceTree = SOURCE_ROOT; };
-		DF203F871380C2920056300A /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msvideo1.cpp; path = ../../video/codecs/msvideo1.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F881380C2920056300A /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msvideo1.h; path = ../../video/codecs/msvideo1.h; sourceTree = SOURCE_ROOT; };
-		DF203F8C1380C2920056300A /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qtrle.cpp; path = ../../video/codecs/qtrle.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F8D1380C2920056300A /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qtrle.h; path = ../../video/codecs/qtrle.h; sourceTree = SOURCE_ROOT; };
-		DF203F8E1380C2920056300A /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rpza.cpp; path = ../../video/codecs/rpza.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F8F1380C2920056300A /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rpza.h; path = ../../video/codecs/rpza.h; sourceTree = SOURCE_ROOT; };
-		DF203F901380C2920056300A /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smc.cpp; path = ../../video/codecs/smc.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F911380C2920056300A /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smc.h; path = ../../video/codecs/smc.h; sourceTree = SOURCE_ROOT; };
-		DF203F921380C2920056300A /* truemotion1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = truemotion1.cpp; path = ../../video/codecs/truemotion1.cpp; sourceTree = SOURCE_ROOT; };
-		DF203F931380C2920056300A /* truemotion1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = truemotion1.h; path = ../../video/codecs/truemotion1.h; sourceTree = SOURCE_ROOT; };
-		DF203F941380C2920056300A /* truemotion1data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = truemotion1data.h; path = ../../video/codecs/truemotion1data.h; sourceTree = SOURCE_ROOT; };
-		DF203FC01380C3BC0056300A /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF203FC11380C3BC0056300A /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF203FC21380C3BC0056300A /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
-		DF203FC31380C3BC0056300A /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; };
-		DF203FC41380C3BC0056300A /* file_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v1d.cpp; sourceTree = "<group>"; };
-		DF203FC51380C3BC0056300A /* file_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v1w.cpp; sourceTree = "<group>"; };
-		DF203FC61380C3BC0056300A /* file_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v2d.cpp; sourceTree = "<group>"; };
-		DF203FC71380C3BC0056300A /* file_v2w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v2w.cpp; sourceTree = "<group>"; };
-		DF203FC81380C3BC0056300A /* file_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_v3d.cpp; sourceTree = "<group>"; };
-		DF203FC91380C3BC0056300A /* object_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v1d.cpp; sourceTree = "<group>"; };
-		DF203FCA1380C3BC0056300A /* object_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v1w.cpp; sourceTree = "<group>"; };
-		DF203FCB1380C3BC0056300A /* object_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v2d.cpp; sourceTree = "<group>"; };
-		DF203FCC1380C3BC0056300A /* object_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_v3d.cpp; sourceTree = "<group>"; };
-		DF203FCD1380C3BC0056300A /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DF203FCE1380C3BC0056300A /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF203FCF1380C3BC0056300A /* parser_v1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v1d.cpp; sourceTree = "<group>"; };
-		DF203FD01380C3BC0056300A /* parser_v1w.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v1w.cpp; sourceTree = "<group>"; };
-		DF203FD11380C3BC0056300A /* parser_v2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v2d.cpp; sourceTree = "<group>"; };
-		DF203FD21380C3BC0056300A /* parser_v3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_v3d.cpp; sourceTree = "<group>"; };
-		DF203FD31380C3BC0056300A /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		DF203FD41380C3BC0056300A /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
-		DF2040221380C8B70056300A /* editable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = editable.cpp; path = widgets/editable.cpp; sourceTree = "<group>"; };
-		DF2040231380C8B70056300A /* editable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = editable.h; path = widgets/editable.h; sourceTree = "<group>"; };
-		DF2040241380C8B70056300A /* edittext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = edittext.cpp; path = widgets/edittext.cpp; sourceTree = "<group>"; };
-		DF2040251380C8B70056300A /* edittext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = edittext.h; path = widgets/edittext.h; sourceTree = "<group>"; };
-		DF2040261380C8B70056300A /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = list.cpp; path = widgets/list.cpp; sourceTree = "<group>"; };
-		DF2040271380C8B70056300A /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = list.h; path = widgets/list.h; sourceTree = "<group>"; };
-		DF2040281380C8B70056300A /* popup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = popup.cpp; path = widgets/popup.cpp; sourceTree = "<group>"; };
-		DF2040291380C8B70056300A /* popup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = popup.h; path = widgets/popup.h; sourceTree = "<group>"; };
-		DF20402A1380C8B70056300A /* scrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scrollbar.cpp; path = widgets/scrollbar.cpp; sourceTree = "<group>"; };
-		DF20402B1380C8B70056300A /* scrollbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scrollbar.h; path = widgets/scrollbar.h; sourceTree = "<group>"; };
-		DF20402C1380C8B70056300A /* tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tab.cpp; path = widgets/tab.cpp; sourceTree = "<group>"; };
-		DF20402D1380C8B70056300A /* tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tab.h; path = widgets/tab.h; sourceTree = "<group>"; };
-		DF2040471380CA230056300A /* audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audiostream.cpp; path = ../../audio/audiostream.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040481380CA230056300A /* audiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audiostream.h; path = ../../audio/audiostream.h; sourceTree = SOURCE_ROOT; };
-		DF2040491380CA230056300A /* fmopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fmopl.cpp; path = ../../audio/fmopl.cpp; sourceTree = SOURCE_ROOT; };
-		DF20404A1380CA230056300A /* fmopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fmopl.h; path = ../../audio/fmopl.h; sourceTree = SOURCE_ROOT; };
-		DF20404B1380CA230056300A /* mididrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mididrv.cpp; path = ../../audio/mididrv.cpp; sourceTree = SOURCE_ROOT; };
-		DF20404C1380CA230056300A /* mididrv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mididrv.h; path = ../../audio/mididrv.h; sourceTree = SOURCE_ROOT; };
-		DF20404D1380CA230056300A /* midiparser_smf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser_smf.cpp; path = ../../audio/midiparser_smf.cpp; sourceTree = SOURCE_ROOT; };
-		DF20404E1380CA230056300A /* midiparser_xmidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser_xmidi.cpp; path = ../../audio/midiparser_xmidi.cpp; sourceTree = SOURCE_ROOT; };
-		DF20404F1380CA230056300A /* midiparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiparser.cpp; path = ../../audio/midiparser.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040501380CA230056300A /* midiparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midiparser.h; path = ../../audio/midiparser.h; sourceTree = SOURCE_ROOT; };
-		DF2040511380CA230056300A /* midiplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midiplayer.cpp; path = ../../audio/midiplayer.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040521380CA230056300A /* midiplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midiplayer.h; path = ../../audio/midiplayer.h; sourceTree = SOURCE_ROOT; };
-		DF2040531380CA230056300A /* mixer_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer_intern.h; path = ../../audio/mixer_intern.h; sourceTree = SOURCE_ROOT; };
-		DF2040541380CA230056300A /* mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mixer.cpp; path = ../../audio/mixer.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040551380CA230056300A /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer.h; path = ../../audio/mixer.h; sourceTree = SOURCE_ROOT; };
-		DF2040561380CA230056300A /* mpu401.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mpu401.cpp; path = ../../audio/mpu401.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040571380CA230056300A /* mpu401.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpu401.h; path = ../../audio/mpu401.h; sourceTree = SOURCE_ROOT; };
-		DF2040581380CA230056300A /* musicplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = musicplugin.cpp; path = ../../audio/musicplugin.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040591380CA230056300A /* musicplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = musicplugin.h; path = ../../audio/musicplugin.h; sourceTree = SOURCE_ROOT; };
-		DF20405A1380CA230056300A /* rate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rate.cpp; path = ../../audio/rate.cpp; sourceTree = SOURCE_ROOT; };
-		DF20405B1380CA230056300A /* rate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rate.h; path = ../../audio/rate.h; sourceTree = SOURCE_ROOT; };
-		DF20405C1380CA230056300A /* timestamp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = timestamp.cpp; path = ../../audio/timestamp.cpp; sourceTree = SOURCE_ROOT; };
-		DF20405D1380CA230056300A /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = timestamp.h; path = ../../audio/timestamp.h; sourceTree = SOURCE_ROOT; };
-		DF2040831380CA400056300A /* adpcm_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adpcm_intern.h; path = ../../audio/decoders/adpcm_intern.h; sourceTree = SOURCE_ROOT; };
-		DF2040841380CA400056300A /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adpcm.cpp; path = ../../audio/decoders/adpcm.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040851380CA400056300A /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adpcm.h; path = ../../audio/decoders/adpcm.h; sourceTree = SOURCE_ROOT; };
-		DF2040861380CA400056300A /* aiff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aiff.cpp; path = ../../audio/decoders/aiff.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040871380CA400056300A /* aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aiff.h; path = ../../audio/decoders/aiff.h; sourceTree = SOURCE_ROOT; };
-		DF2040881380CA400056300A /* flac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = flac.cpp; path = ../../audio/decoders/flac.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040891380CA400056300A /* flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flac.h; path = ../../audio/decoders/flac.h; sourceTree = SOURCE_ROOT; };
-		DF20408A1380CA400056300A /* iff_sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iff_sound.cpp; path = ../../audio/decoders/iff_sound.cpp; sourceTree = SOURCE_ROOT; };
-		DF20408B1380CA400056300A /* iff_sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iff_sound.h; path = ../../audio/decoders/iff_sound.h; sourceTree = SOURCE_ROOT; };
-		DF20408C1380CA400056300A /* mac_snd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mac_snd.cpp; path = ../../audio/decoders/mac_snd.cpp; sourceTree = SOURCE_ROOT; };
-		DF20408D1380CA400056300A /* mac_snd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mac_snd.h; path = ../../audio/decoders/mac_snd.h; sourceTree = SOURCE_ROOT; };
-		DF20408E1380CA400056300A /* mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mp3.cpp; path = ../../audio/decoders/mp3.cpp; sourceTree = SOURCE_ROOT; };
-		DF20408F1380CA400056300A /* mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mp3.h; path = ../../audio/decoders/mp3.h; sourceTree = SOURCE_ROOT; };
-		DF2040901380CA400056300A /* raw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = raw.cpp; path = ../../audio/decoders/raw.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040911380CA400056300A /* raw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = raw.h; path = ../../audio/decoders/raw.h; sourceTree = SOURCE_ROOT; };
-		DF2040921380CA400056300A /* vag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vag.cpp; path = ../../audio/decoders/vag.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040931380CA400056300A /* vag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vag.h; path = ../../audio/decoders/vag.h; sourceTree = SOURCE_ROOT; };
-		DF2040941380CA400056300A /* voc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = voc.cpp; path = ../../audio/decoders/voc.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040951380CA400056300A /* voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = voc.h; path = ../../audio/decoders/voc.h; sourceTree = SOURCE_ROOT; };
-		DF2040961380CA400056300A /* vorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vorbis.cpp; path = ../../audio/decoders/vorbis.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040971380CA400056300A /* vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vorbis.h; path = ../../audio/decoders/vorbis.h; sourceTree = SOURCE_ROOT; };
-		DF2040981380CA400056300A /* wave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wave.cpp; path = ../../audio/decoders/wave.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040991380CA400056300A /* wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wave.h; path = ../../audio/decoders/wave.h; sourceTree = SOURCE_ROOT; };
-		DF2040BC1380CA810056300A /* infogrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = infogrames.cpp; path = ../../audio/mods/infogrames.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040BD1380CA810056300A /* infogrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = infogrames.h; path = ../../audio/mods/infogrames.h; sourceTree = SOURCE_ROOT; };
-		DF2040BE1380CA810056300A /* maxtrax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = maxtrax.cpp; path = ../../audio/mods/maxtrax.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040BF1380CA810056300A /* maxtrax.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maxtrax.h; path = ../../audio/mods/maxtrax.h; sourceTree = SOURCE_ROOT; };
-		DF2040C01380CA810056300A /* module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../audio/mods/module.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040C11380CA810056300A /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = module.h; path = ../../audio/mods/module.h; sourceTree = SOURCE_ROOT; };
-		DF2040C21380CA810056300A /* paula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = paula.cpp; path = ../../audio/mods/paula.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040C31380CA810056300A /* paula.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = paula.h; path = ../../audio/mods/paula.h; sourceTree = SOURCE_ROOT; };
-		DF2040C41380CA810056300A /* protracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = protracker.cpp; path = ../../audio/mods/protracker.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040C51380CA810056300A /* protracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = protracker.h; path = ../../audio/mods/protracker.h; sourceTree = SOURCE_ROOT; };
-		DF2040C61380CA810056300A /* rjp1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rjp1.cpp; path = ../../audio/mods/rjp1.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040C71380CA810056300A /* rjp1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rjp1.h; path = ../../audio/mods/rjp1.h; sourceTree = SOURCE_ROOT; };
-		DF2040C81380CA810056300A /* soundfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = soundfx.cpp; path = ../../audio/mods/soundfx.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040C91380CA810056300A /* soundfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soundfx.h; path = ../../audio/mods/soundfx.h; sourceTree = SOURCE_ROOT; };
-		DF2040CA1380CA810056300A /* tfmx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tfmx.cpp; path = ../../audio/mods/tfmx.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040CB1380CA810056300A /* tfmx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tfmx.h; path = ../../audio/mods/tfmx.h; sourceTree = SOURCE_ROOT; };
-		DF2040E51380CAA40056300A /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adlib.cpp; path = ../../audio/softsynth/adlib.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040E61380CAA40056300A /* appleiigs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = appleiigs.cpp; path = ../../audio/softsynth/appleiigs.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040E71380CAA40056300A /* cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cms.cpp; path = ../../audio/softsynth/cms.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040E81380CAA40056300A /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cms.h; path = ../../audio/softsynth/cms.h; sourceTree = SOURCE_ROOT; };
-		DF2040E91380CAA40056300A /* eas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = eas.cpp; path = ../../audio/softsynth/eas.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040EA1380CAA40056300A /* emumidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = emumidi.h; path = ../../audio/softsynth/emumidi.h; sourceTree = SOURCE_ROOT; };
-		DF2040EB1380CAA40056300A /* fluidsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fluidsynth.cpp; path = ../../audio/softsynth/fluidsynth.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040EC1380CAA40056300A /* mt32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mt32.cpp; path = ../../audio/softsynth/mt32.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040ED1380CAA40056300A /* pcspk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcspk.cpp; path = ../../audio/softsynth/pcspk.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040EE1380CAA40056300A /* pcspk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pcspk.h; path = ../../audio/softsynth/pcspk.h; sourceTree = SOURCE_ROOT; };
-		DF2040EF1380CAA40056300A /* sid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sid.cpp; path = ../../audio/softsynth/sid.cpp; sourceTree = SOURCE_ROOT; };
-		DF2040F01380CAA40056300A /* sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sid.h; path = ../../audio/softsynth/sid.h; sourceTree = SOURCE_ROOT; };
-		DF2040F11380CAA40056300A /* wave6581.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wave6581.cpp; path = ../../audio/softsynth/wave6581.cpp; sourceTree = SOURCE_ROOT; };
-		DF224E020FB23BC500C8E453 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-		DF2EC3E410E6490800765801 /* browser_osx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = browser_osx.mm; sourceTree = "<group>"; };
-		DF2EC3F610E64C0C00765801 /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
-		DF2EC3F710E64C0C00765801 /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; };
-		DF2EC3FD10E64C4300765801 /* animator_tim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animator_tim.cpp; sourceTree = "<group>"; };
-		DF2EC40310E64C8000765801 /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = event.cpp; sourceTree = "<group>"; };
-		DF2EC40410E64C8000765801 /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = "<group>"; };
-		DF2EC4FD10E64D7C00765801 /* player_pce.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_pce.cpp; sourceTree = "<group>"; };
-		DF2EC4FE10E64D7C00765801 /* player_pce.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_pce.h; sourceTree = "<group>"; };
-		DF2EC4FF10E64D7C00765801 /* player_sid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_sid.cpp; sourceTree = "<group>"; };
-		DF2EC50010E64D7C00765801 /* player_sid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_sid.h; sourceTree = "<group>"; };
-		DF2EC50910E64DB300765801 /* textconsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textconsole.cpp; sourceTree = "<group>"; };
-		DF2EC50A10E64DB300765801 /* textconsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textconsole.h; sourceTree = "<group>"; };
-		DF2FFB900F485D890006E566 /* dither.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dither.cpp; sourceTree = "<group>"; };
-		DF2FFB910F485D890006E566 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; };
-		DF2FFB920F485D890006E566 /* pixelformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixelformat.h; sourceTree = "<group>"; };
-		DF2FFBD10F485DFB0006E566 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF2FFBD20F485DFB0006E566 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gui-manager.h"; sourceTree = "<group>"; };
-		DF2FFBDB0F485E480006E566 /* scummclassic.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = scummclassic.zip; sourceTree = "<group>"; };
-		DF2FFBF80F4860A60006E566 /* posix-saves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-saves.cpp"; sourceTree = "<group>"; };
-		DF2FFBF90F4860A60006E566 /* posix-saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-saves.h"; sourceTree = "<group>"; };
-		DF2FFC1F0F4862520006E566 /* bmv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bmv.cpp; sourceTree = "<group>"; };
-		DF2FFC200F4862520006E566 /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
-		DF2FFC210F4862520006E566 /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; };
-		DF2FFC220F4862520006E566 /* drives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drives.cpp; sourceTree = "<group>"; };
-		DF2FFC230F4862520006E566 /* drives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drives.h; sourceTree = "<group>"; };
-		DF2FFC240F4862520006E566 /* mareels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mareels.h; sourceTree = "<group>"; };
-		DF2FFC250F4862520006E566 /* pdisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pdisplay.h; sourceTree = "<group>"; };
-		DF2FFC260F4862520006E566 /* play.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = play.h; sourceTree = "<group>"; };
-		DF2FFC270F4862520006E566 /* sysvar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sysvar.cpp; sourceTree = "<group>"; };
-		DF2FFC280F4862520006E566 /* sysvar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysvar.h; sourceTree = "<group>"; };
-		DF2FFC2E0F48628A0006E566 /* gui_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_lol.cpp; sourceTree = "<group>"; };
-		DF2FFC2F0F48628A0006E566 /* gui_lol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_lol.h; sourceTree = "<group>"; };
-		DF2FFC300F48628A0006E566 /* items_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = items_lol.cpp; sourceTree = "<group>"; };
-		DF2FFC310F48628A0006E566 /* script_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_lol.cpp; sourceTree = "<group>"; };
-		DF2FFC320F48628A0006E566 /* sequences_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequences_lol.cpp; sourceTree = "<group>"; };
-		DF2FFC330F48628A0006E566 /* sound_midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_midi.cpp; sourceTree = "<group>"; };
-		DF2FFC360F48628A0006E566 /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		DF2FFC370F48628A0006E566 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		DF2FFC490F4863100006E566 /* scene_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_lol.cpp; sourceTree = "<group>"; };
-		DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = advancedDetector.cpp; sourceTree = "<group>"; };
-		DF2FFC4D0F4863560006E566 /* advancedDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = advancedDetector.h; sourceTree = "<group>"; };
-		DF2FFC5B0F4866E70006E566 /* base-backend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "base-backend.cpp"; sourceTree = "<group>"; };
-		DF2FFC5C0F4866E70006E566 /* base-backend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "base-backend.h"; sourceTree = "<group>"; };
-		DF2FFC600F48672D0006E566 /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF2FFC610F48672D0006E566 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF2FFC620F48672D0006E566 /* resource_hrs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_hrs.cpp; sourceTree = "<group>"; };
-		DF2FFC630F48672D0006E566 /* resource_res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_res.cpp; sourceTree = "<group>"; };
-		DF2FFC640F48672D0006E566 /* resource_rsc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_rsc.cpp; sourceTree = "<group>"; };
-		DF2FFC650F48672D0006E566 /* sfuncs_ihnm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sfuncs_ihnm.cpp; sourceTree = "<group>"; };
-		DF2FFC700F4867910006E566 /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DF2FFC710F4867910006E566 /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DF2FFC720F4867910006E566 /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF2FFC730F4867910006E566 /* staticres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = staticres.h; sourceTree = "<group>"; };
-		DF2FFCBD0F4870690006E566 /* cell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell.cpp; sourceTree = "<group>"; };
-		DF2FFCBE0F4870690006E566 /* cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cell.h; sourceTree = "<group>"; };
-		DF2FFCBF0F4870690006E566 /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
-		DF2FFCC00F4870690006E566 /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
-		DF2FFCC10F4870690006E566 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF2FFCC20F4870690006E566 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF2FFCC30F4870690006E566 /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF2FFCC40F4870690006E566 /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF2FFCC50F4870690006E566 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF2FFCC60F4870690006E566 /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF2FFCC70F4870690006E566 /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF2FFCC80F4870690006E566 /* groovie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = groovie.cpp; sourceTree = "<group>"; };
-		DF2FFCC90F4870690006E566 /* groovie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = groovie.h; sourceTree = "<group>"; };
-		DF2FFCCA0F4870690006E566 /* lzss.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lzss.cpp; sourceTree = "<group>"; };
-		DF2FFCCB0F4870690006E566 /* lzss.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzss.h; sourceTree = "<group>"; };
-		DF2FFCCD0F4870690006E566 /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF2FFCCE0F4870690006E566 /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF2FFCCF0F4870690006E566 /* player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player.cpp; sourceTree = "<group>"; };
-		DF2FFCD00F4870690006E566 /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player.h; sourceTree = "<group>"; };
-		DF2FFCD10F4870690006E566 /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF2FFCD20F4870690006E566 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF2FFCD30F4870690006E566 /* roq.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = roq.cpp; sourceTree = "<group>"; };
-		DF2FFCD40F4870690006E566 /* roq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = roq.h; sourceTree = "<group>"; };
-		DF2FFCD50F4870690006E566 /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF2FFCD60F4870690006E566 /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF2FFCD70F4870690006E566 /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF2FFCD80F4870690006E566 /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF2FFCD90F4870690006E566 /* vdx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vdx.cpp; sourceTree = "<group>"; };
-		DF2FFCDA0F4870690006E566 /* vdx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vdx.h; sourceTree = "<group>"; };
-		DF2FFD050F4870E50006E566 /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF2FFD060F4870E50006E566 /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF2FFD070F4870E50006E566 /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF2FFD080F4870E50006E566 /* locations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locations.cpp; sourceTree = "<group>"; };
-		DF2FFD0A0F4870E50006E566 /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF2FFD0B0F4870E50006E566 /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF2FFD0C0F4870E50006E566 /* sequences.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequences.cpp; sourceTree = "<group>"; };
-		DF2FFD0D0F4870E50006E566 /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF2FFD0E0F4870E50006E566 /* tucker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tucker.cpp; sourceTree = "<group>"; };
-		DF2FFD0F0F4870E50006E566 /* tucker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tucker.h; sourceTree = "<group>"; };
-		DF2FFD290F48717F0006E566 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
-		DF2FFD2A0F48717F0006E566 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
-		DF45B176116628A5009B85CC /* animate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animate.cpp; sourceTree = "<group>"; };
-		DF45B177116628A5009B85CC /* animate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animate.h; sourceTree = "<group>"; };
-		DF45B178116628A5009B85CC /* cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cache.cpp; sourceTree = "<group>"; };
-		DF45B179116628A5009B85CC /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cache.h; sourceTree = "<group>"; };
-		DF45B17A116628A5009B85CC /* compare.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compare.cpp; sourceTree = "<group>"; };
-		DF45B17B116628A5009B85CC /* compare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compare.h; sourceTree = "<group>"; };
-		DF45B17C116628A5009B85CC /* controls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controls.cpp; sourceTree = "<group>"; };
-		DF45B17D116628A5009B85CC /* controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controls.h; sourceTree = "<group>"; };
-		DF45B17E116628A5009B85CC /* coordadjuster.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coordadjuster.cpp; sourceTree = "<group>"; };
-		DF45B17F116628A5009B85CC /* coordadjuster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coordadjuster.h; sourceTree = "<group>"; };
-		DF45B180116628A5009B85CC /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
-		DF45B181116628A5009B85CC /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
-		DF45B182116628A5009B85CC /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF45B183116628A5009B85CC /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF45B185116628A5009B85CC /* frameout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frameout.h; sourceTree = "<group>"; };
-		DF45B18A116628A5009B85CC /* helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = helpers.h; sourceTree = "<group>"; };
-		DF45B18B116628A5009B85CC /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF45B18C116628A5009B85CC /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
-		DF45B18D116628A5009B85CC /* paint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paint.cpp; sourceTree = "<group>"; };
-		DF45B18E116628A5009B85CC /* paint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paint.h; sourceTree = "<group>"; };
-		DF45B18F116628A5009B85CC /* paint16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paint16.cpp; sourceTree = "<group>"; };
-		DF45B190116628A5009B85CC /* paint16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paint16.h; sourceTree = "<group>"; };
-		DF45B191116628A5009B85CC /* paint32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paint32.cpp; sourceTree = "<group>"; };
-		DF45B192116628A5009B85CC /* paint32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = paint32.h; sourceTree = "<group>"; };
-		DF45B193116628A5009B85CC /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
-		DF45B194116628A5009B85CC /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
-		DF45B195116628A5009B85CC /* picture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture.cpp; sourceTree = "<group>"; };
-		DF45B196116628A5009B85CC /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
-		DF45B197116628A5009B85CC /* portrait.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = portrait.cpp; sourceTree = "<group>"; };
-		DF45B198116628A5009B85CC /* portrait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = portrait.h; sourceTree = "<group>"; };
-		DF45B199116628A5009B85CC /* ports.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ports.cpp; sourceTree = "<group>"; };
-		DF45B19A116628A5009B85CC /* ports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ports.h; sourceTree = "<group>"; };
-		DF45B19B116628A5009B85CC /* robot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = robot.cpp; sourceTree = "<group>"; };
-		DF45B19C116628A5009B85CC /* robot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = robot.h; sourceTree = "<group>"; };
-		DF45B19D116628A5009B85CC /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF45B19E116628A5009B85CC /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF45B19F116628A5009B85CC /* text16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text16.cpp; sourceTree = "<group>"; };
-		DF45B1A0116628A5009B85CC /* text16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text16.h; sourceTree = "<group>"; };
-		DF45B1A1116628A5009B85CC /* transitions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transitions.cpp; sourceTree = "<group>"; };
-		DF45B1A2116628A5009B85CC /* transitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = transitions.h; sourceTree = "<group>"; };
-		DF45B1A3116628A5009B85CC /* view.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = view.cpp; sourceTree = "<group>"; };
-		DF45B1A4116628A5009B85CC /* view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = view.h; sourceTree = "<group>"; };
-		DF45B1A6116628A5009B85CC /* grammar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grammar.cpp; sourceTree = "<group>"; };
-		DF45B1A7116628A5009B85CC /* said.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = said.cpp; sourceTree = "<group>"; };
-		DF45B1A9116628A5009B85CC /* vocabulary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vocabulary.cpp; sourceTree = "<group>"; };
-		DF45B1AA116628A5009B85CC /* vocabulary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vocabulary.h; sourceTree = "<group>"; };
-		DF45B1AC116628A5009B85CC /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audio.cpp; sourceTree = "<group>"; };
-		DF45B1AD116628A5009B85CC /* audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio.h; sourceTree = "<group>"; };
-		DF45B1AF116628A5009B85CC /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; };
-		DF45B1B1116628A5009B85CC /* fb01.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fb01.cpp; sourceTree = "<group>"; };
-		DF45B1B2116628A5009B85CC /* map-mt32-to-gm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "map-mt32-to-gm.h"; sourceTree = "<group>"; };
-		DF45B1B3116628A5009B85CC /* midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midi.cpp; sourceTree = "<group>"; };
-		DF45B1B4116628A5009B85CC /* mididriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mididriver.h; sourceTree = "<group>"; };
-		DF45B1B5116628A5009B85CC /* pcjr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcjr.cpp; sourceTree = "<group>"; };
-		DF45B1BF116628A5009B85CC /* midiparser_sci.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_sci.cpp; sourceTree = "<group>"; };
-		DF45B1C0116628A5009B85CC /* midiparser_sci.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midiparser_sci.h; sourceTree = "<group>"; };
-		DF45B1C1116628A5009B85CC /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF45B1C2116628A5009B85CC /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF45B1C3116628A5009B85CC /* soundcmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundcmd.cpp; sourceTree = "<group>"; };
-		DF45B1C4116628A5009B85CC /* soundcmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundcmd.h; sourceTree = "<group>"; };
-		DF45B1C6116628A5009B85CC /* seq_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seq_decoder.cpp; sourceTree = "<group>"; };
-		DF45B1C7116628A5009B85CC /* seq_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seq_decoder.h; sourceTree = "<group>"; };
-		DF46B6F21381E18900D08723 /* coroutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coroutine.cpp; sourceTree = "<group>"; };
-		DF46B6F71381E1FF00D08723 /* towns_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_audio.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_audio.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B6F81381E1FF00D08723 /* towns_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_audio.h; path = ../../audio/softsynth/fmtowns_pc98/towns_audio.h; sourceTree = SOURCE_ROOT; };
-		DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_euphony.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_euphony.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B6FA1381E1FF00D08723 /* towns_euphony.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_euphony.h; path = ../../audio/softsynth/fmtowns_pc98/towns_euphony.h; sourceTree = SOURCE_ROOT; };
-		DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_driver.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B6FC1381E1FF00D08723 /* towns_pc98_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_pc98_driver.h; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_driver.h; sourceTree = SOURCE_ROOT; };
-		DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_fmsynth.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B6FE1381E1FF00D08723 /* towns_pc98_fmsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_pc98_fmsynth.h; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h; sourceTree = SOURCE_ROOT; };
-		DF46B70F1381E27000D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF46B7101381E27000D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF46B7111381E27000D08723 /* databases.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = databases.cpp; sourceTree = "<group>"; };
-		DF46B7121381E27000D08723 /* databases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = databases.h; sourceTree = "<group>"; };
-		DF46B7131381E27000D08723 /* dbase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dbase.cpp; sourceTree = "<group>"; };
-		DF46B7141381E27000D08723 /* dbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dbase.h; sourceTree = "<group>"; };
-		DF46B7151381E27000D08723 /* iniconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iniconfig.cpp; sourceTree = "<group>"; };
-		DF46B7161381E27000D08723 /* iniconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iniconfig.h; sourceTree = "<group>"; };
-		DF46B7171381E27000D08723 /* init_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v7.cpp; sourceTree = "<group>"; };
-		DF46B7181381E27000D08723 /* inter_inca2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_inca2.cpp; sourceTree = "<group>"; };
-		DF46B7421381E40500D08723 /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = log/log.cpp; sourceTree = "<group>"; };
-		DF46B7431381E40500D08723 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = log/log.h; sourceTree = "<group>"; };
-		DF46B7471381E40F00D08723 /* modular-backend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "modular-backend.cpp"; sourceTree = "<group>"; };
-		DF46B7481381E40F00D08723 /* modular-backend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "modular-backend.h"; sourceTree = "<group>"; };
-		DF46B7501381E46700D08723 /* actor_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor_he.h; sourceTree = "<group>"; };
-		DF46B7511381E46700D08723 /* player_v2base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2base.cpp; sourceTree = "<group>"; };
-		DF46B7521381E46700D08723 /* player_v2base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2base.h; sourceTree = "<group>"; };
-		DF46B7531381E46700D08723 /* player_v2cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2cms.h; sourceTree = "<group>"; };
-		DF46B75B1381E4A400D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF46B75C1381E4A400D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF46B75D1381E4A400D08723 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF46B7611381E4D400D08723 /* robot_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = robot_decoder.cpp; sourceTree = "<group>"; };
-		DF46B7621381E4D400D08723 /* robot_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = robot_decoder.h; sourceTree = "<group>"; };
-		DF46B7661381E4E400D08723 /* vm_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vm_types.cpp; sourceTree = "<group>"; };
-		DF46B76E1381E54200D08723 /* bufferedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bufferedstream.h; sourceTree = "<group>"; };
-		DF46B76F1381E54200D08723 /* dcl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dcl.cpp; sourceTree = "<group>"; };
-		DF46B7701381E54200D08723 /* dcl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dcl.h; sourceTree = "<group>"; };
-		DF46B7711381E54200D08723 /* forbidden.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = forbidden.h; sourceTree = "<group>"; };
-		DF46B7721381E54200D08723 /* iff_container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff_container.cpp; sourceTree = "<group>"; };
-		DF46B7731381E54200D08723 /* substream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = substream.h; sourceTree = "<group>"; };
-		DF46B7741381E54200D08723 /* translation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = translation.h; sourceTree = "<group>"; };
-		DF46B7751381E54200D08723 /* winexe_ne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe_ne.cpp; sourceTree = "<group>"; };
-		DF46B7761381E54200D08723 /* winexe_ne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe_ne.h; sourceTree = "<group>"; };
-		DF46B7771381E54200D08723 /* winexe_pe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe_pe.cpp; sourceTree = "<group>"; };
-		DF46B7781381E54200D08723 /* winexe_pe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe_pe.h; sourceTree = "<group>"; };
-		DF46B7791381E54200D08723 /* winexe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winexe.cpp; sourceTree = "<group>"; };
-		DF46B77A1381E54200D08723 /* winexe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winexe.h; sourceTree = "<group>"; };
-		DF46B78E1381E58000D08723 /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
-		DF46B78F1381E58000D08723 /* png.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = png.cpp; sourceTree = "<group>"; };
-		DF46B7901381E58000D08723 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = png.h; sourceTree = "<group>"; };
-		DF46B7911381E58000D08723 /* wincursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wincursor.cpp; sourceTree = "<group>"; };
-		DF46B7921381E58000D08723 /* wincursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wincursor.h; sourceTree = "<group>"; };
-		DF46B79D1381E5B500D08723 /* winfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winfont.cpp; sourceTree = "<group>"; };
-		DF46B79E1381E5B500D08723 /* winfont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winfont.h; sourceTree = "<group>"; };
-		DF46B7A31381E5D900D08723 /* sdl-timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-timer.cpp"; path = "sdl/sdl-timer.cpp"; sourceTree = "<group>"; };
-		DF46B7A41381E5D900D08723 /* sdl-timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-timer.h"; path = "sdl/sdl-timer.h"; sourceTree = "<group>"; };
-		DF46B7A81381E5F100D08723 /* header.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = header.cpp; sourceTree = "<group>"; };
-		DF46B7B21381E67800D08723 /* sdl-mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-mutex.cpp"; path = "mutex/sdl/sdl-mutex.cpp"; sourceTree = "<group>"; };
-		DF46B7B31381E67800D08723 /* sdl-mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-mutex.h"; path = "mutex/sdl/sdl-mutex.h"; sourceTree = "<group>"; };
-		DF46B7BB1381E6C000D08723 /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DF46B7BC1381E6C000D08723 /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF46B7C61381E72500D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF46B7C71381E72500D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF46B7CD1381E76300D08723 /* sdl-events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-events.cpp"; path = "events/sdl/sdl-events.cpp"; sourceTree = "<group>"; };
-		DF46B7CE1381E76300D08723 /* sdl-events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-events.h"; path = "events/sdl/sdl-events.h"; sourceTree = "<group>"; };
-		DF46B7D41381E7C600D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF46B7D51381E7C600D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF46B83B1381F13500D08723 /* saveload_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v7.cpp; sourceTree = "<group>"; };
-		DF46B8431381F35500D08723 /* saveload_inca2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_inca2.cpp; sourceTree = "<group>"; };
-		DF46B8471381F38700D08723 /* inter_v7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v7.cpp; sourceTree = "<group>"; };
-		DF46B84B1381F39E00D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF46B84C1381F39E00D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF46B8501381F3B400D08723 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF46B8511381F3B400D08723 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF46B85A1381F44E00D08723 /* dbopl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dbopl.cpp; path = ../../audio/softsynth/opl/dbopl.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B85B1381F44E00D08723 /* dbopl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dbopl.h; path = ../../audio/softsynth/opl/dbopl.h; sourceTree = SOURCE_ROOT; };
-		DF46B85C1381F44E00D08723 /* dosbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dosbox.cpp; path = ../../audio/softsynth/opl/dosbox.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B85D1381F44E00D08723 /* dosbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dosbox.h; path = ../../audio/softsynth/opl/dosbox.h; sourceTree = SOURCE_ROOT; };
-		DF46B85E1381F44E00D08723 /* mame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mame.cpp; path = ../../audio/softsynth/opl/mame.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B85F1381F44E00D08723 /* mame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mame.h; path = ../../audio/softsynth/opl/mame.h; sourceTree = SOURCE_ROOT; };
-		DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-audiocd.cpp"; path = "audiocd/sdl/sdl-audiocd.cpp"; sourceTree = "<group>"; };
-		DF46B8701381F4A200D08723 /* sdl-audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-audiocd.h"; path = "audiocd/sdl/sdl-audiocd.h"; sourceTree = "<group>"; };
-		DF46B87B1381F4F200D08723 /* default-audiocd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "default-audiocd.cpp"; path = "audiocd/default/default-audiocd.cpp"; sourceTree = "<group>"; };
-		DF46B87C1381F4F200D08723 /* default-audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "default-audiocd.h"; path = "audiocd/default/default-audiocd.h"; sourceTree = "<group>"; };
-		DF46B8801381F4FF00D08723 /* audiocd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audiocd.h; path = audiocd/audiocd.h; sourceTree = "<group>"; };
-		DF46B8851381F56400D08723 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		DF46B8871381F5D800D08723 /* sdl-provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "sdl-provider.cpp"; path = "sdl/sdl-provider.cpp"; sourceTree = "<group>"; };
-		DF46B8881381F5D800D08723 /* sdl-provider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sdl-provider.h"; path = "sdl/sdl-provider.h"; sourceTree = "<group>"; };
-		DF46B8901381F62B00D08723 /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adpcm.cpp; sourceTree = "<group>"; };
-		DF46B8911381F62B00D08723 /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; };
-		DF46B8991381F6C400D08723 /* null.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = null.cpp; path = ../../audio/null.cpp; sourceTree = SOURCE_ROOT; };
-		DF46B89A1381F6C400D08723 /* null.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = null.h; path = ../../audio/null.h; sourceTree = SOURCE_ROOT; };
-		DF573BFE0F5A81EA00961A72 /* kernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel.h; sourceTree = "<group>"; };
-		DF573BFF0F5A81EA00961A72 /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF573C000F5A81EA00961A72 /* seg_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seg_manager.h; sourceTree = "<group>"; };
-		DF573C010F5A81EA00961A72 /* state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = state.cpp; sourceTree = "<group>"; };
-		DF573C020F5A81EA00961A72 /* state.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = state.h; sourceTree = "<group>"; };
-		DF573C030F5A81EA00961A72 /* vm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vm.h; sourceTree = "<group>"; };
-		DF573C040F5A81EA00961A72 /* vm_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vm_types.h; sourceTree = "<group>"; };
-		DF573CBA0F5A85B300961A72 /* exec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exec.cpp; sourceTree = "<group>"; };
-		DF573CBD0F5A85E100961A72 /* timer_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_lol.cpp; sourceTree = "<group>"; };
-		DF5CEB260F75535000DEA624 /* sound_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_br.cpp; sourceTree = "<group>"; };
-		DF5CEB270F75535000DEA624 /* sound_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_ns.cpp; sourceTree = "<group>"; };
-		DF5CEB2F0F75538000DEA624 /* protracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protracker.cpp; sourceTree = "<group>"; };
-		DF5CEB300F75538000DEA624 /* protracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = protracker.h; sourceTree = "<group>"; };
-		DF6118380FE3A8080042AD3F /* kmisc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmisc.cpp; sourceTree = "<group>"; };
-		DF6118390FE3A8080042AD3F /* segment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment.cpp; sourceTree = "<group>"; };
-		DF61183A0FE3A8080042AD3F /* segment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = segment.h; sourceTree = "<group>"; };
-		DF61183B0FE3A8080042AD3F /* savegame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savegame.h; sourceTree = "<group>"; };
-		DF6118420FE3A8250042AD3F /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF6118430FE3A8250042AD3F /* decompressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decompressor.cpp; sourceTree = "<group>"; };
-		DF6118440FE3A8250042AD3F /* decompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decompressor.h; sourceTree = "<group>"; };
-		DF6118450FE3A8250042AD3F /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF6118460FE3A8250042AD3F /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF6118540FE3A8990042AD3F /* disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk.cpp; sourceTree = "<group>"; };
-		DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter.cpp; sourceTree = "<group>"; };
-		DF61187A0FE3A9AA0042AD3F /* saveconverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveconverter.h; sourceTree = "<group>"; };
-		DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v2.cpp; sourceTree = "<group>"; };
-		DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v3.cpp; sourceTree = "<group>"; };
-		DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveconverter_v4.cpp; sourceTree = "<group>"; };
-		DF61187F0FE3A9AA0042AD3F /* savefile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savefile.cpp; sourceTree = "<group>"; };
-		DF6118800FE3A9AA0042AD3F /* savefile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savefile.h; sourceTree = "<group>"; };
-		DF6118810FE3A9AA0042AD3F /* savehandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savehandler.cpp; sourceTree = "<group>"; };
-		DF6118820FE3A9AA0042AD3F /* savehandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savehandler.h; sourceTree = "<group>"; };
-		DF6118830FE3A9AA0042AD3F /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF6118840FE3A9AA0042AD3F /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF6118850FE3A9AA0042AD3F /* saveload_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v2.cpp; sourceTree = "<group>"; };
-		DF6118860FE3A9AA0042AD3F /* saveload_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v3.cpp; sourceTree = "<group>"; };
-		DF6118870FE3A9AA0042AD3F /* saveload_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v4.cpp; sourceTree = "<group>"; };
-		DF6118880FE3A9AA0042AD3F /* saveload_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_v6.cpp; sourceTree = "<group>"; };
-		DF6118AE0FE3A9EA0042AD3F /* feeble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feeble.cpp; sourceTree = "<group>"; };
-		DF6118B30FE3AA280042AD3F /* saveload_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_lol.cpp; sourceTree = "<group>"; };
-		DF6118B40FE3AA280042AD3F /* sound_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_lol.cpp; sourceTree = "<group>"; };
-		DF6118B50FE3AA280042AD3F /* sound_pcspk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_pcspk.cpp; sourceTree = "<group>"; };
-		DF6118B60FE3AA280042AD3F /* text_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_lol.cpp; sourceTree = "<group>"; };
-		DF6118B70FE3AA280042AD3F /* text_lol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_lol.h; sourceTree = "<group>"; };
-		DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2cms.cpp; sourceTree = "<group>"; };
-		DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hardwarekeys.cpp; sourceTree = "<group>"; };
-		DF6BF4C010529DA50069811F /* conversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conversion.cpp; sourceTree = "<group>"; };
-		DF6BF4C110529DA50069811F /* conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conversion.h; sourceTree = "<group>"; };
-		DF6BF4C210529DA50069811F /* jpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jpeg.cpp; sourceTree = "<group>"; };
-		DF6BF4C310529DA50069811F /* jpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpeg.h; sourceTree = "<group>"; };
-		DF6BF4D510529DE90069811F /* input_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input_pn.cpp; sourceTree = "<group>"; };
-		DF6BF4D610529DE90069811F /* string_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_pn.cpp; sourceTree = "<group>"; };
-		DF6BF4D710529DE90069811F /* verb_pn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = verb_pn.cpp; sourceTree = "<group>"; };
-		DF6BF4E210529E260069811F /* sound_adlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_adlib.h; sourceTree = "<group>"; };
-		DF6BF4E310529E260069811F /* sound_amiga.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_amiga.cpp; sourceTree = "<group>"; };
-		DF6BF4E810529E6E0069811F /* init_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v4.cpp; sourceTree = "<group>"; };
-		DF6BF4E910529E6E0069811F /* inter_playtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_playtoons.cpp; sourceTree = "<group>"; };
-		DF6BF4F110529EE40069811F /* player_v4a.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v4a.cpp; sourceTree = "<group>"; };
-		DF6BF4F210529EE40069811F /* player_v4a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v4a.h; sourceTree = "<group>"; };
-		DF6BF4F710529F140069811F /* EventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatcher.cpp; sourceTree = "<group>"; };
-		DF6BF4F810529F140069811F /* EventRecorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventRecorder.cpp; sourceTree = "<group>"; };
-		DF6BF4F910529F140069811F /* EventRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventRecorder.h; sourceTree = "<group>"; };
-		DF6BF4FA10529F140069811F /* list_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list_intern.h; sourceTree = "<group>"; };
-		DF6BF4FB10529F140069811F /* serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serializer.h; sourceTree = "<group>"; };
-		DF7585C3100CB66E00CC3324 /* expression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = expression.cpp; sourceTree = "<group>"; };
-		DF7585C4100CB66E00CC3324 /* expression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expression.h; sourceTree = "<group>"; };
-		DF7585C5100CB66E00CC3324 /* hotspots.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotspots.cpp; sourceTree = "<group>"; };
-		DF7585C6100CB66E00CC3324 /* hotspots.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotspots.h; sourceTree = "<group>"; };
-		DF7585C7100CB66E00CC3324 /* init_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v6.cpp; sourceTree = "<group>"; };
-		DF7585C8100CB66E00CC3324 /* resources.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resources.cpp; sourceTree = "<group>"; };
-		DF7585C9100CB66E00CC3324 /* resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resources.h; sourceTree = "<group>"; };
-		DF7585CA100CB66E00CC3324 /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF7585CB100CB66E00CC3324 /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF7585CC100CB66E00CC3324 /* totfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = totfile.cpp; sourceTree = "<group>"; };
-		DF7585CD100CB66E00CC3324 /* totfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = totfile.h; sourceTree = "<group>"; };
-		DF7585EA100CB6EA00CC3324 /* sjis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sjis.cpp; sourceTree = "<group>"; };
-		DF7585EB100CB6EA00CC3324 /* sjis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sjis.h; sourceTree = "<group>"; };
-		DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_playtoons.cpp; sourceTree = "<group>"; };
-		DF7585F6100CB75800CC3324 /* static_selectors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = static_selectors.cpp; sourceTree = "<group>"; };
-		DF758614100CBA0200CC3324 /* osys_events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osys_events.cpp; sourceTree = "<group>"; };
-		DF758615100CBA0200CC3324 /* osys_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osys_main.cpp; sourceTree = "<group>"; };
-		DF758616100CBA0200CC3324 /* osys_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osys_main.h; sourceTree = "<group>"; };
-		DF758617100CBA0200CC3324 /* osys_sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osys_sound.cpp; sourceTree = "<group>"; };
-		DF758618100CBA0200CC3324 /* osys_video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osys_video.cpp; sourceTree = "<group>"; };
-		DF7E8BF00ED5FC77001CB19F /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF7E8BF10ED5FC77001CB19F /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThemeEngine.cpp; sourceTree = "<group>"; };
-		DF7E8BF50ED5FC77001CB19F /* ThemeEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeEngine.h; sourceTree = "<group>"; };
-		DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThemeEval.cpp; sourceTree = "<group>"; };
-		DF7E8BF70ED5FC77001CB19F /* ThemeEval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeEval.h; sourceTree = "<group>"; };
-		DF7E8BF80ED5FC77001CB19F /* ThemeLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThemeLayout.cpp; sourceTree = "<group>"; };
-		DF7E8BF90ED5FC77001CB19F /* ThemeLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeLayout.h; sourceTree = "<group>"; };
-		DF7E8BFA0ED5FC77001CB19F /* ThemeParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThemeParser.cpp; sourceTree = "<group>"; };
-		DF7E8BFB0ED5FC77001CB19F /* ThemeParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeParser.h; sourceTree = "<group>"; };
-		DF7E8C050ED5FCAF001CB19F /* thumbnail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thumbnail.cpp; sourceTree = "<group>"; };
-		DF7E8C060ED5FCAF001CB19F /* thumbnail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thumbnail.h; sourceTree = "<group>"; };
-		DF7E8C070ED5FCAF001CB19F /* VectorRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VectorRenderer.cpp; sourceTree = "<group>"; };
-		DF7E8C080ED5FCAF001CB19F /* VectorRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VectorRenderer.h; sourceTree = "<group>"; };
-		DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VectorRendererSpec.cpp; sourceTree = "<group>"; };
-		DF7E8C0A0ED5FCAF001CB19F /* VectorRendererSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VectorRendererSpec.h; sourceTree = "<group>"; };
-		DF7E8C0F0ED5FCC2001CB19F /* xmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmlparser.cpp; sourceTree = "<group>"; };
-		DF7E8C100ED5FCC2001CB19F /* xmlparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlparser.h; sourceTree = "<group>"; };
-		DF7E8C510ED60067001CB19F /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game.cpp; sourceTree = "<group>"; };
-		DF7E8C520ED60067001CB19F /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
-		DF7E8C7A0ED601E5001CB19F /* scummmodern.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = scummmodern.zip; sourceTree = "<group>"; };
-		DF7F285C11FF23B700159131 /* frameout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = frameout.cpp; sourceTree = "<group>"; };
-		DF7F286011FF23D500159131 /* amigamac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = amigamac.cpp; sourceTree = "<group>"; };
-		DF7F286411FF23EF00159131 /* kvideo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kvideo.cpp; sourceTree = "<group>"; };
-		DF7F286511FF23EF00159131 /* workarounds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = workarounds.cpp; sourceTree = "<group>"; };
-		DF7F286611FF23EF00159131 /* workarounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = workarounds.h; sourceTree = "<group>"; };
-		DF7F286F11FF243A00159131 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF7F287011FF243A00159131 /* sound_2gs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_2gs.cpp; sourceTree = "<group>"; };
-		DF7F287111FF243A00159131 /* sound_2gs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_2gs.h; sourceTree = "<group>"; };
-		DF7F287211FF243B00159131 /* sound_coco3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_coco3.cpp; sourceTree = "<group>"; };
-		DF7F287311FF243B00159131 /* sound_coco3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_coco3.h; sourceTree = "<group>"; };
-		DF7F287411FF243B00159131 /* sound_midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_midi.cpp; sourceTree = "<group>"; };
-		DF7F287511FF243B00159131 /* sound_midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_midi.h; sourceTree = "<group>"; };
-		DF7F287611FF243B00159131 /* sound_pcjr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_pcjr.cpp; sourceTree = "<group>"; };
-		DF7F287711FF243B00159131 /* sound_pcjr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_pcjr.h; sourceTree = "<group>"; };
-		DF7F287811FF243B00159131 /* sound_sarien.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_sarien.cpp; sourceTree = "<group>"; };
-		DF7F287911FF243B00159131 /* sound_sarien.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_sarien.h; sourceTree = "<group>"; };
-		DF7F288911FF244F00159131 /* Tooltip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Tooltip.cpp; sourceTree = "<group>"; };
-		DF7F288A11FF244F00159131 /* Tooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tooltip.h; sourceTree = "<group>"; };
-		DF7F289111FF247300159131 /* translation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = translation.cpp; sourceTree = "<group>"; };
-		DF7F28A311FF24C400159131 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF7F28A411FF24C400159131 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF841FD90E7BA61800F5680E /* iphone_keyboard.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = iphone_keyboard.m; sourceTree = "<group>"; };
-		DF841FDA0E7BA61800F5680E /* iphone_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iphone_video.h; sourceTree = "<group>"; };
-		DF841FDB0E7BA61800F5680E /* iphone_video.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = iphone_video.m; sourceTree = "<group>"; };
-		DF841FF70E7BA6A600F5680E /* agi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = agi.cpp; sourceTree = "<group>"; };
-		DF841FF80E7BA6A600F5680E /* agi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = agi.h; sourceTree = "<group>"; };
-		DF841FF90E7BA6A600F5680E /* checks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checks.cpp; sourceTree = "<group>"; };
-		DF841FFA0E7BA6A600F5680E /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF841FFB0E7BA6A600F5680E /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF841FFC0E7BA6A600F5680E /* cycle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cycle.cpp; sourceTree = "<group>"; };
-		DF841FFD0E7BA6A600F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF841FFE0E7BA6A600F5680E /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF841FFF0E7BA6A600F5680E /* global.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = global.cpp; sourceTree = "<group>"; };
-		DF8420000E7BA6A600F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF8420010E7BA6A600F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF8420020E7BA6A600F5680E /* id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = id.cpp; sourceTree = "<group>"; };
-		DF8420030E7BA6A600F5680E /* inv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inv.cpp; sourceTree = "<group>"; };
-		DF8420040E7BA6A600F5680E /* keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyboard.cpp; sourceTree = "<group>"; };
-		DF8420050E7BA6A600F5680E /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboard.h; sourceTree = "<group>"; };
-		DF8420060E7BA6A600F5680E /* loader_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loader_v2.cpp; sourceTree = "<group>"; };
-		DF8420070E7BA6A600F5680E /* loader_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loader_v3.cpp; sourceTree = "<group>"; };
-		DF8420080E7BA6A600F5680E /* logic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logic.cpp; sourceTree = "<group>"; };
-		DF8420090E7BA6A600F5680E /* logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logic.h; sourceTree = "<group>"; };
-		DF84200A0E7BA6A600F5680E /* lzw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lzw.cpp; sourceTree = "<group>"; };
-		DF84200B0E7BA6A600F5680E /* lzw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzw.h; sourceTree = "<group>"; };
-		DF84200C0E7BA6A600F5680E /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF84200D0E7BA6A600F5680E /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
-		DF84200F0E7BA6A600F5680E /* motion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = motion.cpp; sourceTree = "<group>"; };
-		DF8420100E7BA6A600F5680E /* objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = objects.cpp; sourceTree = "<group>"; };
-		DF8420110E7BA6A600F5680E /* op_cmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = op_cmd.cpp; sourceTree = "<group>"; };
-		DF8420120E7BA6A600F5680E /* op_dbg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = op_dbg.cpp; sourceTree = "<group>"; };
-		DF8420130E7BA6A600F5680E /* op_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = op_test.cpp; sourceTree = "<group>"; };
-		DF8420140E7BA6A600F5680E /* opcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opcodes.h; sourceTree = "<group>"; };
-		DF8420150E7BA6A600F5680E /* picture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture.cpp; sourceTree = "<group>"; };
-		DF8420160E7BA6A600F5680E /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; };
-		DF8420170E7BA6A600F5680E /* preagi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preagi.cpp; sourceTree = "<group>"; };
-		DF8420180E7BA6A600F5680E /* preagi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preagi.h; sourceTree = "<group>"; };
-		DF8420190E7BA6A600F5680E /* preagi_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preagi_common.cpp; sourceTree = "<group>"; };
-		DF84201A0E7BA6A600F5680E /* preagi_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preagi_common.h; sourceTree = "<group>"; };
-		DF84201B0E7BA6A600F5680E /* preagi_mickey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preagi_mickey.cpp; sourceTree = "<group>"; };
-		DF84201C0E7BA6A600F5680E /* preagi_mickey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preagi_mickey.h; sourceTree = "<group>"; };
-		DF84201D0E7BA6A600F5680E /* preagi_troll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preagi_troll.cpp; sourceTree = "<group>"; };
-		DF84201E0E7BA6A600F5680E /* preagi_troll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preagi_troll.h; sourceTree = "<group>"; };
-		DF84201F0E7BA6A600F5680E /* preagi_winnie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preagi_winnie.cpp; sourceTree = "<group>"; };
-		DF8420200E7BA6A600F5680E /* preagi_winnie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preagi_winnie.h; sourceTree = "<group>"; };
-		DF8420210E7BA6A600F5680E /* predictive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = predictive.cpp; sourceTree = "<group>"; };
-		DF8420220E7BA6A600F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8420230E7BA6A600F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8420240E7BA6A600F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8420250E7BA6A600F5680E /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite.cpp; sourceTree = "<group>"; };
-		DF8420260E7BA6A600F5680E /* sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = "<group>"; };
-		DF8420270E7BA6A600F5680E /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		DF8420280E7BA6A600F5680E /* view.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = view.cpp; sourceTree = "<group>"; };
-		DF8420290E7BA6A600F5680E /* view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = view.h; sourceTree = "<group>"; };
-		DF84202A0E7BA6A600F5680E /* wagparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wagparser.cpp; sourceTree = "<group>"; };
-		DF84202B0E7BA6A600F5680E /* wagparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wagparser.h; sourceTree = "<group>"; };
-		DF84202C0E7BA6A600F5680E /* words.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = words.cpp; sourceTree = "<group>"; };
-		DF84202E0E7BA6A600F5680E /* agos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = agos.cpp; sourceTree = "<group>"; };
-		DF84202F0E7BA6A600F5680E /* agos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = agos.h; sourceTree = "<group>"; };
-		DF8420300E7BA6A600F5680E /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		DF8420310E7BA6A600F5680E /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = "<group>"; };
-		DF8420320E7BA6A600F5680E /* charset-fontdata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "charset-fontdata.cpp"; sourceTree = "<group>"; };
-		DF8420330E7BA6A600F5680E /* charset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charset.cpp; sourceTree = "<group>"; };
-		DF8420340E7BA6A600F5680E /* contain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = contain.cpp; sourceTree = "<group>"; };
-		DF8420350E7BA6A600F5680E /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
-		DF8420360E7BA6A600F5680E /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF8420370E7BA6A600F5680E /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF8420380E7BA6A600F5680E /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DF8420390E7BA6A600F5680E /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DF84203A0E7BA6A600F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF84203B0E7BA6A600F5680E /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF84203C0E7BA6A600F5680E /* draw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw.cpp; sourceTree = "<group>"; };
-		DF84203D0E7BA6A600F5680E /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = event.cpp; sourceTree = "<group>"; };
-		DF84203E0E7BA6A600F5680E /* gfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfx.cpp; sourceTree = "<group>"; };
-		DF84203F0E7BA6A600F5680E /* icons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = icons.cpp; sourceTree = "<group>"; };
-		DF8420400E7BA6A600F5680E /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input.cpp; sourceTree = "<group>"; };
-		DF8420410E7BA6A600F5680E /* intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intern.h; sourceTree = "<group>"; };
-		DF8420420E7BA6A600F5680E /* items.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = items.cpp; sourceTree = "<group>"; };
-		DF8420430E7BA6A600F5680E /* menus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menus.cpp; sourceTree = "<group>"; };
-		DF8420440E7BA6A600F5680E /* midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midi.cpp; sourceTree = "<group>"; };
-		DF8420450E7BA6A600F5680E /* midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midi.h; sourceTree = "<group>"; };
-		DF8420460E7BA6A600F5680E /* midiparser_s1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_s1d.cpp; sourceTree = "<group>"; };
-		DF8420480E7BA6A600F5680E /* oracle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = oracle.cpp; sourceTree = "<group>"; };
-		DF8420490E7BA6A600F5680E /* res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = res.cpp; sourceTree = "<group>"; };
-		DF84204A0E7BA6A600F5680E /* res_ami.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = res_ami.cpp; sourceTree = "<group>"; };
-		DF84204B0E7BA6A600F5680E /* res_snd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = res_snd.cpp; sourceTree = "<group>"; };
-		DF84204C0E7BA6A600F5680E /* rooms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rooms.cpp; sourceTree = "<group>"; };
-		DF84204D0E7BA6A600F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF84204E0E7BA6A600F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF84204F0E7BA6A600F5680E /* script_e1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_e1.cpp; sourceTree = "<group>"; };
-		DF8420500E7BA6A600F5680E /* script_e2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_e2.cpp; sourceTree = "<group>"; };
-		DF8420510E7BA6A600F5680E /* script_ff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_ff.cpp; sourceTree = "<group>"; };
-		DF8420520E7BA6A600F5680E /* script_pp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_pp.cpp; sourceTree = "<group>"; };
-		DF8420530E7BA6A600F5680E /* script_s1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_s1.cpp; sourceTree = "<group>"; };
-		DF8420540E7BA6A600F5680E /* script_s2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_s2.cpp; sourceTree = "<group>"; };
-		DF8420550E7BA6A600F5680E /* script_ww.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_ww.cpp; sourceTree = "<group>"; };
-		DF8420560E7BA6A600F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8420570E7BA6A600F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8420580E7BA6A600F5680E /* string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string.cpp; sourceTree = "<group>"; };
-		DF8420590E7BA6A600F5680E /* subroutine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = subroutine.cpp; sourceTree = "<group>"; };
-		DF84205A0E7BA6A600F5680E /* verb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = verb.cpp; sourceTree = "<group>"; };
-		DF84205B0E7BA6A600F5680E /* vga.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga.cpp; sourceTree = "<group>"; };
-		DF84205C0E7BA6A600F5680E /* vga.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vga.h; sourceTree = "<group>"; };
-		DF84205D0E7BA6A600F5680E /* vga_e2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_e2.cpp; sourceTree = "<group>"; };
-		DF84205E0E7BA6A600F5680E /* vga_ff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_ff.cpp; sourceTree = "<group>"; };
-		DF84205F0E7BA6A600F5680E /* vga_s1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_s1.cpp; sourceTree = "<group>"; };
-		DF8420600E7BA6A600F5680E /* vga_s2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_s2.cpp; sourceTree = "<group>"; };
-		DF8420610E7BA6A600F5680E /* vga_ww.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vga_ww.cpp; sourceTree = "<group>"; };
-		DF8420620E7BA6A600F5680E /* window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = window.cpp; sourceTree = "<group>"; };
-		DF8420630E7BA6A600F5680E /* zones.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zones.cpp; sourceTree = "<group>"; };
-		DF8420650E7BA6A600F5680E /* anim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anim.cpp; sourceTree = "<group>"; };
-		DF8420660E7BA6A600F5680E /* anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = anim.h; sourceTree = "<group>"; };
-		DF8420670E7BA6A600F5680E /* bg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bg.cpp; sourceTree = "<group>"; };
-		DF8420680E7BA6A600F5680E /* bg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg.h; sourceTree = "<group>"; };
-		DF8420690E7BA6A600F5680E /* bg_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bg_list.cpp; sourceTree = "<group>"; };
-		DF84206A0E7BA6A600F5680E /* bg_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_list.h; sourceTree = "<group>"; };
-		DF84206B0E7BA6A600F5680E /* cine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cine.cpp; sourceTree = "<group>"; };
-		DF84206C0E7BA6A600F5680E /* cine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cine.h; sourceTree = "<group>"; };
-		DF84206D0E7BA6A600F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF84206E0E7BA6A600F5680E /* gfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfx.cpp; sourceTree = "<group>"; };
-		DF84206F0E7BA6A600F5680E /* gfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gfx.h; sourceTree = "<group>"; };
-		DF8420700E7BA6A600F5680E /* main_loop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main_loop.cpp; sourceTree = "<group>"; };
-		DF8420710E7BA6A600F5680E /* main_loop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main_loop.h; sourceTree = "<group>"; };
-		DF8420730E7BA6A600F5680E /* msg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msg.cpp; sourceTree = "<group>"; };
-		DF8420740E7BA6A600F5680E /* msg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msg.h; sourceTree = "<group>"; };
-		DF8420750E7BA6A600F5680E /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DF8420760E7BA6A600F5680E /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF8420770E7BA6A600F5680E /* pal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pal.cpp; sourceTree = "<group>"; };
-		DF8420780E7BA6A600F5680E /* pal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal.h; sourceTree = "<group>"; };
-		DF8420790E7BA6A600F5680E /* part.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = part.cpp; sourceTree = "<group>"; };
-		DF84207A0E7BA6A600F5680E /* part.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = part.h; sourceTree = "<group>"; };
-		DF84207B0E7BA6A600F5680E /* prc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = prc.cpp; sourceTree = "<group>"; };
-		DF84207C0E7BA6A600F5680E /* prc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prc.h; sourceTree = "<group>"; };
-		DF84207D0E7BA6A600F5680E /* rel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rel.cpp; sourceTree = "<group>"; };
-		DF84207E0E7BA6A600F5680E /* rel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rel.h; sourceTree = "<group>"; };
-		DF84207F0E7BA6A600F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8420800E7BA6A600F5680E /* script_fw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_fw.cpp; sourceTree = "<group>"; };
-		DF8420810E7BA6A600F5680E /* script_os.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_os.cpp; sourceTree = "<group>"; };
-		DF8420820E7BA6A600F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8420830E7BA6A600F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8420840E7BA6A600F5680E /* texte.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = texte.cpp; sourceTree = "<group>"; };
-		DF8420850E7BA6A600F5680E /* texte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = texte.h; sourceTree = "<group>"; };
-		DF8420860E7BA6A600F5680E /* unpack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unpack.cpp; sourceTree = "<group>"; };
-		DF8420870E7BA6A600F5680E /* unpack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unpack.h; sourceTree = "<group>"; };
-		DF8420880E7BA6A600F5680E /* various.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = various.cpp; sourceTree = "<group>"; };
-		DF8420890E7BA6A600F5680E /* various.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = various.h; sourceTree = "<group>"; };
-		DF8420AB0E7BA6A600F5680E /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor.cpp; sourceTree = "<group>"; };
-		DF8420AC0E7BA6A600F5680E /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
-		DF8420AE0E7BA6A600F5680E /* background.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = background.cpp; sourceTree = "<group>"; };
-		DF8420AF0E7BA6A600F5680E /* background.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = background.h; sourceTree = "<group>"; };
-		DF8420B10E7BA6A600F5680E /* backgroundIncrust.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = backgroundIncrust.cpp; sourceTree = "<group>"; };
-		DF8420B20E7BA6A600F5680E /* backgroundIncrust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = backgroundIncrust.h; sourceTree = "<group>"; };
-		DF8420B40E7BA6A600F5680E /* cell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell.cpp; sourceTree = "<group>"; };
-		DF8420B50E7BA6A600F5680E /* cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cell.h; sourceTree = "<group>"; };
-		DF8420B70E7BA6A600F5680E /* cruise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cruise.cpp; sourceTree = "<group>"; };
-		DF8420B80E7BA6A700F5680E /* cruise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cruise.h; sourceTree = "<group>"; };
-		DF8420BA0E7BA6A700F5680E /* cruise_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cruise_main.cpp; sourceTree = "<group>"; };
-		DF8420BB0E7BA6A700F5680E /* cruise_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cruise_main.h; sourceTree = "<group>"; };
-		DF8420BD0E7BA6A700F5680E /* ctp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ctp.cpp; sourceTree = "<group>"; };
-		DF8420BE0E7BA6A700F5680E /* ctp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ctp.h; sourceTree = "<group>"; };
-		DF8420C00E7BA6A700F5680E /* dataLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dataLoader.cpp; sourceTree = "<group>"; };
-		DF8420C10E7BA6A700F5680E /* dataLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dataLoader.h; sourceTree = "<group>"; };
-		DF8420C30E7BA6A700F5680E /* decompiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decompiler.cpp; sourceTree = "<group>"; };
-		DF8420C50E7BA6A700F5680E /* delphine-unpack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "delphine-unpack.cpp"; sourceTree = "<group>"; };
-		DF8420C70E7BA6A700F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8420C90E7BA6A700F5680E /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF8420CA0E7BA6A700F5680E /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF8420CF0E7BA6A700F5680E /* function.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function.cpp; sourceTree = "<group>"; };
-		DF8420D00E7BA6A700F5680E /* function.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = function.h; sourceTree = "<group>"; };
-		DF8420D20E7BA6A700F5680E /* gfxModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfxModule.cpp; sourceTree = "<group>"; };
-		DF8420D30E7BA6A700F5680E /* gfxModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gfxModule.h; sourceTree = "<group>"; };
-		DF8420D60E7BA6A700F5680E /* linker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = linker.cpp; sourceTree = "<group>"; };
-		DF8420D70E7BA6A700F5680E /* linker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linker.h; sourceTree = "<group>"; };
-		DF8420D90E7BA6A700F5680E /* mainDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mainDraw.cpp; sourceTree = "<group>"; };
-		DF8420DA0E7BA6A700F5680E /* mainDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mainDraw.h; sourceTree = "<group>"; };
-		DF8420DC0E7BA6A700F5680E /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF8420DD0E7BA6A700F5680E /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
-		DF8420E00E7BA6A700F5680E /* mouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouse.cpp; sourceTree = "<group>"; };
-		DF8420E10E7BA6A700F5680E /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
-		DF8420E30E7BA6A700F5680E /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DF8420E40E7BA6A700F5680E /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF8420E60E7BA6A700F5680E /* overlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = overlay.cpp; sourceTree = "<group>"; };
-		DF8420E70E7BA6A700F5680E /* overlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overlay.h; sourceTree = "<group>"; };
-		DF8420E90E7BA6A700F5680E /* perso.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = perso.cpp; sourceTree = "<group>"; };
-		DF8420EA0E7BA6A700F5680E /* perso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = perso.h; sourceTree = "<group>"; };
-		DF8420EC0E7BA6A700F5680E /* polys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = polys.cpp; sourceTree = "<group>"; };
-		DF8420ED0E7BA6A700F5680E /* polys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = polys.h; sourceTree = "<group>"; };
-		DF8420EF0E7BA6A700F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8420F00E7BA6A700F5680E /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF8420F20E7BA6A700F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF8420F30E7BA6A700F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8420F50E7BA6A700F5680E /* stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stack.cpp; sourceTree = "<group>"; };
-		DF8420F60E7BA6A700F5680E /* stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = "<group>"; };
-		DF8420F90E7BA6A700F5680E /* various.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = various.cpp; sourceTree = "<group>"; };
-		DF8420FA0E7BA6A700F5680E /* various.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = various.h; sourceTree = "<group>"; };
-		DF8420FC0E7BA6A700F5680E /* vars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vars.cpp; sourceTree = "<group>"; };
-		DF8420FD0E7BA6A700F5680E /* vars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vars.h; sourceTree = "<group>"; };
-		DF8420FF0E7BA6A700F5680E /* volume.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = volume.cpp; sourceTree = "<group>"; };
-		DF8421000E7BA6A700F5680E /* volume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = volume.h; sourceTree = "<group>"; };
-		DF8421020E7BA6A700F5680E /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
-		DF8421030E7BA6A700F5680E /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; };
-		DF8421050E7BA6A700F5680E /* actors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actors.cpp; sourceTree = "<group>"; };
-		DF8421060E7BA6A700F5680E /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		DF8421070E7BA6A700F5680E /* converse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = converse.cpp; sourceTree = "<group>"; };
-		DF8421080E7BA6A700F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8421090E7BA6A700F5680E /* drascula.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drascula.cpp; sourceTree = "<group>"; };
-		DF84210A0E7BA6A700F5680E /* drascula.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drascula.h; sourceTree = "<group>"; };
-		DF84210B0E7BA6A700F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF84210C0E7BA6A700F5680E /* interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interface.cpp; sourceTree = "<group>"; };
-		DF84210E0E7BA6A700F5680E /* objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = objects.cpp; sourceTree = "<group>"; };
-		DF84210F0E7BA6A700F5680E /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
-		DF8421100E7BA6A700F5680E /* rooms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rooms.cpp; sourceTree = "<group>"; };
-		DF8421110E7BA6A700F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8421120E7BA6A700F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8421130E7BA6A700F5680E /* talk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talk.cpp; sourceTree = "<group>"; };
-		DF8421140E7BA6A700F5680E /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cpp; sourceTree = "<group>"; };
-		DF8421150E7BA6A700F5680E /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = "<group>"; };
-		DF84211B0E7BA6A700F5680E /* dataio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dataio.cpp; sourceTree = "<group>"; };
-		DF84211C0E7BA6A700F5680E /* dataio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dataio.h; sourceTree = "<group>"; };
-		DF84211D0E7BA6A700F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF84211E0E7BA6A700F5680E /* draw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw.cpp; sourceTree = "<group>"; };
-		DF84211F0E7BA6A700F5680E /* draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = draw.h; sourceTree = "<group>"; };
-		DF8421200E7BA6A700F5680E /* draw_bargon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_bargon.cpp; sourceTree = "<group>"; };
-		DF8421210E7BA6A700F5680E /* draw_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_v1.cpp; sourceTree = "<group>"; };
-		DF8421220E7BA6A700F5680E /* draw_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_v2.cpp; sourceTree = "<group>"; };
-		DF8421250E7BA6A700F5680E /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game.cpp; sourceTree = "<group>"; };
-		DF8421260E7BA6A700F5680E /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
-		DF8421290E7BA6A700F5680E /* global.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = global.cpp; sourceTree = "<group>"; };
-		DF84212A0E7BA6A700F5680E /* global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = global.h; sourceTree = "<group>"; };
-		DF84212B0E7BA6A700F5680E /* gob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gob.cpp; sourceTree = "<group>"; };
-		DF84212C0E7BA6A700F5680E /* gob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gob.h; sourceTree = "<group>"; };
-		DF84212D0E7BA6A700F5680E /* goblin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = goblin.cpp; sourceTree = "<group>"; };
-		DF84212E0E7BA6A700F5680E /* goblin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = goblin.h; sourceTree = "<group>"; };
-		DF84212F0E7BA6A700F5680E /* goblin_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = goblin_v1.cpp; sourceTree = "<group>"; };
-		DF8421300E7BA6A700F5680E /* goblin_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = goblin_v2.cpp; sourceTree = "<group>"; };
-		DF8421310E7BA6A700F5680E /* goblin_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = goblin_v3.cpp; sourceTree = "<group>"; };
-		DF8421320E7BA6A700F5680E /* goblin_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = goblin_v4.cpp; sourceTree = "<group>"; };
-		DF8421330E7BA6A700F5680E /* init.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init.cpp; sourceTree = "<group>"; };
-		DF8421340E7BA6A700F5680E /* init.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init.h; sourceTree = "<group>"; };
-		DF8421350E7BA6A700F5680E /* init_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v1.cpp; sourceTree = "<group>"; };
-		DF8421360E7BA6A700F5680E /* init_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v2.cpp; sourceTree = "<group>"; };
-		DF8421370E7BA6A700F5680E /* init_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_v3.cpp; sourceTree = "<group>"; };
-		DF8421380E7BA6A700F5680E /* inter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter.cpp; sourceTree = "<group>"; };
-		DF8421390E7BA6A700F5680E /* inter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inter.h; sourceTree = "<group>"; };
-		DF84213A0E7BA6A700F5680E /* inter_bargon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_bargon.cpp; sourceTree = "<group>"; };
-		DF84213B0E7BA6A700F5680E /* inter_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v1.cpp; sourceTree = "<group>"; };
-		DF84213C0E7BA6A700F5680E /* inter_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v2.cpp; sourceTree = "<group>"; };
-		DF84213D0E7BA6A700F5680E /* inter_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v3.cpp; sourceTree = "<group>"; };
-		DF84213E0E7BA6A700F5680E /* inter_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v4.cpp; sourceTree = "<group>"; };
-		DF84213F0E7BA6A700F5680E /* inter_v5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v5.cpp; sourceTree = "<group>"; };
-		DF8421400E7BA6A700F5680E /* inter_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inter_v6.cpp; sourceTree = "<group>"; };
-		DF8421410E7BA6A700F5680E /* map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map.cpp; sourceTree = "<group>"; };
-		DF8421420E7BA6A700F5680E /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = map.h; sourceTree = "<group>"; };
-		DF8421430E7BA6A700F5680E /* map_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_v1.cpp; sourceTree = "<group>"; };
-		DF8421440E7BA6A700F5680E /* map_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_v2.cpp; sourceTree = "<group>"; };
-		DF8421470E7BA6A700F5680E /* mult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mult.cpp; sourceTree = "<group>"; };
-		DF8421480E7BA6A700F5680E /* mult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mult.h; sourceTree = "<group>"; };
-		DF8421490E7BA6A700F5680E /* mult_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mult_v1.cpp; sourceTree = "<group>"; };
-		DF84214A0E7BA6A700F5680E /* mult_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mult_v2.cpp; sourceTree = "<group>"; };
-		DF84214C0E7BA6A700F5680E /* palanim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palanim.cpp; sourceTree = "<group>"; };
-		DF84214D0E7BA6A700F5680E /* palanim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palanim.h; sourceTree = "<group>"; };
-		DF8421570E7BA6A700F5680E /* scenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scenery.cpp; sourceTree = "<group>"; };
-		DF8421580E7BA6A700F5680E /* scenery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scenery.h; sourceTree = "<group>"; };
-		DF8421590E7BA6A700F5680E /* scenery_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scenery_v1.cpp; sourceTree = "<group>"; };
-		DF84215A0E7BA6A700F5680E /* scenery_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scenery_v2.cpp; sourceTree = "<group>"; };
-		DF84215C0E7BA6A700F5680E /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; };
-		DF84215D0E7BA6A700F5680E /* adlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlib.h; sourceTree = "<group>"; };
-		DF84215E0E7BA6A700F5680E /* bgatmosphere.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bgatmosphere.cpp; sourceTree = "<group>"; };
-		DF84215F0E7BA6A700F5680E /* bgatmosphere.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bgatmosphere.h; sourceTree = "<group>"; };
-		DF8421600E7BA6A700F5680E /* cdrom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cdrom.cpp; sourceTree = "<group>"; };
-		DF8421610E7BA6A700F5680E /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdrom.h; sourceTree = "<group>"; };
-		DF8421620E7BA6A700F5680E /* infogrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = infogrames.cpp; sourceTree = "<group>"; };
-		DF8421630E7BA6A700F5680E /* infogrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infogrames.h; sourceTree = "<group>"; };
-		DF8421640E7BA6A700F5680E /* pcspeaker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcspeaker.cpp; sourceTree = "<group>"; };
-		DF8421650E7BA6A700F5680E /* pcspeaker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcspeaker.h; sourceTree = "<group>"; };
-		DF8421660E7BA6A700F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8421670E7BA6A700F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8421680E7BA6A700F5680E /* soundblaster.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundblaster.cpp; sourceTree = "<group>"; };
-		DF8421690E7BA6A700F5680E /* soundblaster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundblaster.h; sourceTree = "<group>"; };
-		DF84216A0E7BA6A700F5680E /* sounddesc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sounddesc.cpp; sourceTree = "<group>"; };
-		DF84216B0E7BA6A700F5680E /* sounddesc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sounddesc.h; sourceTree = "<group>"; };
-		DF84216C0E7BA6A700F5680E /* soundmixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundmixer.cpp; sourceTree = "<group>"; };
-		DF84216D0E7BA6A700F5680E /* soundmixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundmixer.h; sourceTree = "<group>"; };
-		DF84216F0E7BA6A700F5680E /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		DF8421700E7BA6A700F5680E /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		DF8421710E7BA6A700F5680E /* variables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = variables.cpp; sourceTree = "<group>"; };
-		DF8421720E7BA6A700F5680E /* variables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = variables.h; sourceTree = "<group>"; };
-		DF8421730E7BA6A700F5680E /* video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video.cpp; sourceTree = "<group>"; };
-		DF8421740E7BA6A700F5680E /* video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = video.h; sourceTree = "<group>"; };
-		DF8421750E7BA6A700F5680E /* video_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_v1.cpp; sourceTree = "<group>"; };
-		DF8421760E7BA6A700F5680E /* video_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_v2.cpp; sourceTree = "<group>"; };
-		DF8421770E7BA6A700F5680E /* video_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_v6.cpp; sourceTree = "<group>"; };
-		DF8421780E7BA6A700F5680E /* videoplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = videoplayer.cpp; sourceTree = "<group>"; };
-		DF8421790E7BA6A700F5680E /* videoplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = videoplayer.h; sourceTree = "<group>"; };
-		DF8421A40E7BA6A800F5680E /* animator_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animator_hof.cpp; sourceTree = "<group>"; };
-		DF8421A50E7BA6A800F5680E /* animator_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animator_lok.cpp; sourceTree = "<group>"; };
-		DF8421A60E7BA6A800F5680E /* animator_lok.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animator_lok.h; sourceTree = "<group>"; };
-		DF8421A70E7BA6A800F5680E /* animator_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animator_mr.cpp; sourceTree = "<group>"; };
-		DF8421A90E7BA6A800F5680E /* animator_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animator_v2.cpp; sourceTree = "<group>"; };
-		DF8421AB0E7BA6A800F5680E /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DF8421AC0E7BA6A800F5680E /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DF8421AD0E7BA6A800F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8421AE0E7BA6A800F5680E /* gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui.cpp; sourceTree = "<group>"; };
-		DF8421AF0E7BA6A800F5680E /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
-		DF8421B00E7BA6A800F5680E /* gui_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_hof.cpp; sourceTree = "<group>"; };
-		DF8421B10E7BA6A800F5680E /* gui_hof.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_hof.h; sourceTree = "<group>"; };
-		DF8421B20E7BA6A800F5680E /* gui_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_lok.cpp; sourceTree = "<group>"; };
-		DF8421B30E7BA6A800F5680E /* gui_lok.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_lok.h; sourceTree = "<group>"; };
-		DF8421B40E7BA6A800F5680E /* gui_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_mr.cpp; sourceTree = "<group>"; };
-		DF8421B50E7BA6A800F5680E /* gui_mr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_mr.h; sourceTree = "<group>"; };
-		DF8421B70E7BA6A800F5680E /* gui_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_v2.cpp; sourceTree = "<group>"; };
-		DF8421B80E7BA6A800F5680E /* gui_v2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_v2.h; sourceTree = "<group>"; };
-		DF8421BA0E7BA6A800F5680E /* items_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = items_hof.cpp; sourceTree = "<group>"; };
-		DF8421BB0E7BA6A800F5680E /* items_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = items_lok.cpp; sourceTree = "<group>"; };
-		DF8421BC0E7BA6A800F5680E /* items_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = items_mr.cpp; sourceTree = "<group>"; };
-		DF8421BE0E7BA6A800F5680E /* items_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = items_v2.cpp; sourceTree = "<group>"; };
-		DF8421C10E7BA6A800F5680E /* kyra_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kyra_hof.cpp; sourceTree = "<group>"; };
-		DF8421C20E7BA6A800F5680E /* kyra_hof.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kyra_hof.h; sourceTree = "<group>"; };
-		DF8421C30E7BA6A800F5680E /* kyra_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kyra_lok.cpp; sourceTree = "<group>"; };
-		DF8421C40E7BA6A800F5680E /* kyra_lok.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kyra_lok.h; sourceTree = "<group>"; };
-		DF8421C50E7BA6A800F5680E /* kyra_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kyra_mr.cpp; sourceTree = "<group>"; };
-		DF8421C60E7BA6A800F5680E /* kyra_mr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kyra_mr.h; sourceTree = "<group>"; };
-		DF8421C70E7BA6A800F5680E /* kyra_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kyra_v1.cpp; sourceTree = "<group>"; };
-		DF8421C80E7BA6A800F5680E /* kyra_v1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kyra_v1.h; sourceTree = "<group>"; };
-		DF8421C90E7BA6A800F5680E /* kyra_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kyra_v2.cpp; sourceTree = "<group>"; };
-		DF8421CA0E7BA6A800F5680E /* kyra_v2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kyra_v2.h; sourceTree = "<group>"; };
-		DF8421CC0E7BA6A800F5680E /* lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lol.cpp; sourceTree = "<group>"; };
-		DF8421CD0E7BA6A800F5680E /* lol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lol.h; sourceTree = "<group>"; };
-		DF8421CF0E7BA6A800F5680E /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF8421D00E7BA6A800F5680E /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF8421D10E7BA6A800F5680E /* resource_intern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_intern.cpp; sourceTree = "<group>"; };
-		DF8421D20E7BA6A800F5680E /* resource_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource_intern.h; sourceTree = "<group>"; };
-		DF8421D30E7BA6A800F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8421D40E7BA6A800F5680E /* saveload_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_hof.cpp; sourceTree = "<group>"; };
-		DF8421D50E7BA6A800F5680E /* saveload_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_lok.cpp; sourceTree = "<group>"; };
-		DF8421D60E7BA6A800F5680E /* saveload_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_mr.cpp; sourceTree = "<group>"; };
-		DF8421DA0E7BA6A800F5680E /* scene_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_hof.cpp; sourceTree = "<group>"; };
-		DF8421DB0E7BA6A800F5680E /* scene_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_lok.cpp; sourceTree = "<group>"; };
-		DF8421DC0E7BA6A800F5680E /* scene_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_mr.cpp; sourceTree = "<group>"; };
-		DF8421DD0E7BA6A800F5680E /* scene_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_v1.cpp; sourceTree = "<group>"; };
-		DF8421DE0E7BA6A800F5680E /* scene_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_v2.cpp; sourceTree = "<group>"; };
-		DF8421E00E7BA6A800F5680E /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF8421E10E7BA6A800F5680E /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF8421E20E7BA6A800F5680E /* screen_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_hof.cpp; sourceTree = "<group>"; };
-		DF8421E30E7BA6A800F5680E /* screen_hof.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_hof.h; sourceTree = "<group>"; };
-		DF8421E40E7BA6A800F5680E /* screen_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_lok.cpp; sourceTree = "<group>"; };
-		DF8421E50E7BA6A800F5680E /* screen_lok.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_lok.h; sourceTree = "<group>"; };
-		DF8421E60E7BA6A800F5680E /* screen_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_lol.cpp; sourceTree = "<group>"; };
-		DF8421E70E7BA6A800F5680E /* screen_lol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_lol.h; sourceTree = "<group>"; };
-		DF8421E80E7BA6A800F5680E /* screen_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_mr.cpp; sourceTree = "<group>"; };
-		DF8421E90E7BA6A800F5680E /* screen_mr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_mr.h; sourceTree = "<group>"; };
-		DF8421EB0E7BA6A800F5680E /* screen_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen_v2.cpp; sourceTree = "<group>"; };
-		DF8421EC0E7BA6A800F5680E /* screen_v2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen_v2.h; sourceTree = "<group>"; };
-		DF8421EE0E7BA6A800F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF8421EF0E7BA6A800F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8421F00E7BA6A800F5680E /* script_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_hof.cpp; sourceTree = "<group>"; };
-		DF8421F10E7BA6A800F5680E /* script_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_lok.cpp; sourceTree = "<group>"; };
-		DF8421F20E7BA6A800F5680E /* script_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_mr.cpp; sourceTree = "<group>"; };
-		DF8421F30E7BA6A800F5680E /* script_tim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_tim.cpp; sourceTree = "<group>"; };
-		DF8421F40E7BA6A800F5680E /* script_tim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script_tim.h; sourceTree = "<group>"; };
-		DF8421F50E7BA6A800F5680E /* script_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v1.cpp; sourceTree = "<group>"; };
-		DF8421F60E7BA6A800F5680E /* script_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v2.cpp; sourceTree = "<group>"; };
-		DF8421F80E7BA6A800F5680E /* seqplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seqplayer.cpp; sourceTree = "<group>"; };
-		DF8421F90E7BA6A800F5680E /* seqplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seqplayer.h; sourceTree = "<group>"; };
-		DF8421FA0E7BA6A800F5680E /* sequences_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequences_hof.cpp; sourceTree = "<group>"; };
-		DF8421FB0E7BA6A800F5680E /* sequences_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequences_lok.cpp; sourceTree = "<group>"; };
-		DF8421FC0E7BA6A800F5680E /* sequences_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequences_mr.cpp; sourceTree = "<group>"; };
-		DF8421FE0E7BA6A800F5680E /* sequences_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequences_v2.cpp; sourceTree = "<group>"; };
-		DF8422000E7BA6A800F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8422010E7BA6A800F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8422020E7BA6A800F5680E /* sound_adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_adlib.cpp; sourceTree = "<group>"; };
-		DF8422030E7BA6A800F5680E /* sound_digital.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_digital.cpp; sourceTree = "<group>"; };
-		DF8422040E7BA6A800F5680E /* sound_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_lok.cpp; sourceTree = "<group>"; };
-		DF8422050E7BA6A800F5680E /* sound_towns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_towns.cpp; sourceTree = "<group>"; };
-		DF8422070E7BA6A800F5680E /* sprites.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprites.cpp; sourceTree = "<group>"; };
-		DF8422080E7BA6A800F5680E /* sprites.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprites.h; sourceTree = "<group>"; };
-		DF8422090E7BA6A800F5680E /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF84220A0E7BA6A800F5680E /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		DF84220B0E7BA6A800F5680E /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
-		DF84220C0E7BA6A800F5680E /* text_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_hof.cpp; sourceTree = "<group>"; };
-		DF84220D0E7BA6A800F5680E /* text_hof.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_hof.h; sourceTree = "<group>"; };
-		DF84220E0E7BA6A800F5680E /* text_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_lok.cpp; sourceTree = "<group>"; };
-		DF84220F0E7BA6A800F5680E /* text_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_mr.cpp; sourceTree = "<group>"; };
-		DF8422100E7BA6A800F5680E /* text_mr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text_mr.h; sourceTree = "<group>"; };
-		DF8422140E7BA6A800F5680E /* timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer.cpp; sourceTree = "<group>"; };
-		DF8422150E7BA6A800F5680E /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
-		DF8422160E7BA6A800F5680E /* timer_hof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_hof.cpp; sourceTree = "<group>"; };
-		DF8422170E7BA6A800F5680E /* timer_lok.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_lok.cpp; sourceTree = "<group>"; };
-		DF8422180E7BA6A800F5680E /* timer_mr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_mr.cpp; sourceTree = "<group>"; };
-		DF84221C0E7BA6A800F5680E /* vqa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vqa.cpp; sourceTree = "<group>"; };
-		DF84221D0E7BA6A800F5680E /* vqa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vqa.h; sourceTree = "<group>"; };
-		DF84221E0E7BA6A800F5680E /* wsamovie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wsamovie.cpp; sourceTree = "<group>"; };
-		DF84221F0E7BA6A800F5680E /* wsamovie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wsamovie.h; sourceTree = "<group>"; };
-		DF8422210E7BA6A800F5680E /* animseq.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animseq.cpp; sourceTree = "<group>"; };
-		DF8422220E7BA6A800F5680E /* animseq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animseq.h; sourceTree = "<group>"; };
-		DF8422230E7BA6A800F5680E /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DF8422240E7BA6A800F5680E /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DF8422250E7BA6A800F5680E /* decode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decode.cpp; sourceTree = "<group>"; };
-		DF8422260E7BA6A800F5680E /* decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = "<group>"; };
-		DF8422270E7BA6A800F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8422280E7BA6A800F5680E /* disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk.cpp; sourceTree = "<group>"; };
-		DF8422290E7BA6A800F5680E /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = "<group>"; };
-		DF84222A0E7BA6A800F5680E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		DF84222B0E7BA6A800F5680E /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events.h; sourceTree = "<group>"; };
-		DF84222C0E7BA6A800F5680E /* fights.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fights.cpp; sourceTree = "<group>"; };
-		DF84222D0E7BA6A800F5680E /* fights.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fights.h; sourceTree = "<group>"; };
-		DF84222E0E7BA6A800F5680E /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game.cpp; sourceTree = "<group>"; };
-		DF84222F0E7BA6A800F5680E /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
-		DF8422300E7BA6A800F5680E /* hotspots.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotspots.cpp; sourceTree = "<group>"; };
-		DF8422310E7BA6A800F5680E /* hotspots.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotspots.h; sourceTree = "<group>"; };
-		DF8422320E7BA6A800F5680E /* intro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intro.cpp; sourceTree = "<group>"; };
-		DF8422330E7BA6A800F5680E /* intro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intro.h; sourceTree = "<group>"; };
-		DF8422340E7BA6A800F5680E /* lure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lure.cpp; sourceTree = "<group>"; };
-		DF8422350E7BA6A800F5680E /* lure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lure.h; sourceTree = "<group>"; };
-		DF8422360E7BA6A800F5680E /* luredefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = luredefs.h; sourceTree = "<group>"; };
-		DF8422370E7BA6A800F5680E /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
-		DF8422380E7BA6A800F5680E /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
-		DF8422390E7BA6A800F5680E /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF84223A0E7BA6A800F5680E /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
-		DF84223C0E7BA6A800F5680E /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
-		DF84223D0E7BA6A800F5680E /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
-		DF84223E0E7BA6A800F5680E /* res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = res.cpp; sourceTree = "<group>"; };
-		DF84223F0E7BA6A800F5680E /* res.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = res.h; sourceTree = "<group>"; };
-		DF8422400E7BA6A800F5680E /* res_struct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = res_struct.cpp; sourceTree = "<group>"; };
-		DF8422410E7BA6A800F5680E /* res_struct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = res_struct.h; sourceTree = "<group>"; };
-		DF8422420E7BA6A800F5680E /* room.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = room.cpp; sourceTree = "<group>"; };
-		DF8422430E7BA6A800F5680E /* room.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = room.h; sourceTree = "<group>"; };
-		DF8422440E7BA6A800F5680E /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF8422450E7BA6A800F5680E /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF8422460E7BA6A800F5680E /* scripts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scripts.cpp; sourceTree = "<group>"; };
-		DF8422470E7BA6A800F5680E /* scripts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scripts.h; sourceTree = "<group>"; };
-		DF8422480E7BA6A800F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8422490E7BA6A800F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF84224A0E7BA6A800F5680E /* strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strings.cpp; sourceTree = "<group>"; };
-		DF84224B0E7BA6A800F5680E /* strings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strings.h; sourceTree = "<group>"; };
-		DF84224C0E7BA6A800F5680E /* surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surface.cpp; sourceTree = "<group>"; };
-		DF84224D0E7BA6A800F5680E /* surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = "<group>"; };
-		DF84226E0E7BA6A800F5680E /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor.cpp; sourceTree = "<group>"; };
-		DF84226F0E7BA6A800F5680E /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
-		DF8422710E7BA6A800F5680E /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		DF8422720E7BA6A800F5680E /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = "<group>"; };
-		DF8422740E7BA6A800F5680E /* assets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = assets.cpp; sourceTree = "<group>"; };
-		DF8422750E7BA6A800F5680E /* assets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = assets.h; sourceTree = "<group>"; };
-		DF8422770E7BA6A900F5680E /* burger_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = burger_data.h; sourceTree = "<group>"; };
-		DF8422780E7BA6A900F5680E /* compression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compression.cpp; sourceTree = "<group>"; };
-		DF8422790E7BA6A900F5680E /* compression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compression.h; sourceTree = "<group>"; };
-		DF84227B0E7BA6A900F5680E /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF84227C0E7BA6A900F5680E /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF84227E0E7BA6A900F5680E /* converse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = converse.cpp; sourceTree = "<group>"; };
-		DF84227F0E7BA6A900F5680E /* converse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = converse.h; sourceTree = "<group>"; };
-		DF8422810E7BA6A900F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8422830E7BA6A900F5680E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		DF8422840E7BA6A900F5680E /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events.h; sourceTree = "<group>"; };
-		DF8422860E7BA6A900F5680E /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF8422870E7BA6A900F5680E /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF8422890E7BA6A900F5680E /* globals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = globals.cpp; sourceTree = "<group>"; };
-		DF84228A0E7BA6A900F5680E /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globals.h; sourceTree = "<group>"; };
-		DF84228C0E7BA6A900F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF84228D0E7BA6A900F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF84228F0E7BA6A900F5680E /* gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui.cpp; sourceTree = "<group>"; };
-		DF8422900E7BA6A900F5680E /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
-		DF8422920E7BA6A900F5680E /* hotspot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotspot.cpp; sourceTree = "<group>"; };
-		DF8422930E7BA6A900F5680E /* hotspot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotspot.h; sourceTree = "<group>"; };
-		DF8422960E7BA6A900F5680E /* m4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = m4.cpp; sourceTree = "<group>"; };
-		DF8422970E7BA6A900F5680E /* m4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m4.h; sourceTree = "<group>"; };
-		DF8422990E7BA6A900F5680E /* m4_menus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = m4_menus.cpp; sourceTree = "<group>"; };
-		DF84229A0E7BA6A900F5680E /* m4_menus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m4_menus.h; sourceTree = "<group>"; };
-		DF84229C0E7BA6A900F5680E /* m4_views.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = m4_views.cpp; sourceTree = "<group>"; };
-		DF84229D0E7BA6A900F5680E /* m4_views.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m4_views.h; sourceTree = "<group>"; };
-		DF84229F0E7BA6A900F5680E /* mads_anim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mads_anim.cpp; sourceTree = "<group>"; };
-		DF8422A00E7BA6A900F5680E /* mads_anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mads_anim.h; sourceTree = "<group>"; };
-		DF8422A20E7BA6A900F5680E /* mads_menus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mads_menus.cpp; sourceTree = "<group>"; };
-		DF8422A30E7BA6A900F5680E /* mads_menus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mads_menus.h; sourceTree = "<group>"; };
-		DF8422A50E7BA6A900F5680E /* midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midi.cpp; sourceTree = "<group>"; };
-		DF8422A60E7BA6A900F5680E /* midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midi.h; sourceTree = "<group>"; };
-		DF8422A90E7BA6A900F5680E /* rails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rails.cpp; sourceTree = "<group>"; };
-		DF8422AA0E7BA6A900F5680E /* rails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rails.h; sourceTree = "<group>"; };
-		DF8422AC0E7BA6A900F5680E /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF8422AD0E7BA6A900F5680E /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF8422AF0E7BA6A900F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8422B00E7BA6A900F5680E /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF8422B20E7BA6A900F5680E /* scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene.cpp; sourceTree = "<group>"; };
-		DF8422B30E7BA6A900F5680E /* scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene.h; sourceTree = "<group>"; };
-		DF8422B50E7BA6A900F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF8422B60E7BA6A900F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8422B80E7BA6A900F5680E /* scripttab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scripttab.h; sourceTree = "<group>"; };
-		DF8422B90E7BA6A900F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8422BA0E7BA6A900F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8422BC0E7BA6A900F5680E /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite.cpp; sourceTree = "<group>"; };
-		DF8422BD0E7BA6A900F5680E /* sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = "<group>"; };
-		DF8422BF0E7BA6A900F5680E /* viewmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viewmgr.cpp; sourceTree = "<group>"; };
-		DF8422C00E7BA6A900F5680E /* viewmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viewmgr.h; sourceTree = "<group>"; };
-		DF8422C20E7BA6A900F5680E /* woodscript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = woodscript.cpp; sourceTree = "<group>"; };
-		DF8422C30E7BA6A900F5680E /* woodscript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = woodscript.h; sourceTree = "<group>"; };
-		DF8422C50E7BA6A900F5680E /* ws_machine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ws_machine.cpp; sourceTree = "<group>"; };
-		DF8422C70E7BA6A900F5680E /* ws_sequence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ws_sequence.cpp; sourceTree = "<group>"; };
-		DF8422CA0E7BA6A900F5680E /* database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = database.cpp; sourceTree = "<group>"; };
-		DF8422CB0E7BA6A900F5680E /* database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = database.h; sourceTree = "<group>"; };
-		DF8422CC0E7BA6A900F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8422CD0E7BA6A900F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF8422CE0E7BA6A900F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF8422CF0E7BA6A900F5680E /* made.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = made.cpp; sourceTree = "<group>"; };
-		DF8422D00E7BA6A900F5680E /* made.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = made.h; sourceTree = "<group>"; };
-		DF8422D20E7BA6A900F5680E /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF8422D30E7BA6A900F5680E /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF8422D40E7BA6A900F5680E /* pmvplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pmvplayer.cpp; sourceTree = "<group>"; };
-		DF8422D50E7BA6A900F5680E /* pmvplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pmvplayer.h; sourceTree = "<group>"; };
-		DF8422D60E7BA6A900F5680E /* redreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = redreader.cpp; sourceTree = "<group>"; };
-		DF8422D70E7BA6A900F5680E /* redreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = redreader.h; sourceTree = "<group>"; };
-		DF8422D80E7BA6A900F5680E /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF8422D90E7BA6A900F5680E /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF8422DA0E7BA6A900F5680E /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF8422DB0E7BA6A900F5680E /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF8422DC0E7BA6A900F5680E /* screenfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screenfx.cpp; sourceTree = "<group>"; };
-		DF8422DD0E7BA6A900F5680E /* screenfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screenfx.h; sourceTree = "<group>"; };
-		DF8422DE0E7BA6A900F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF8422DF0E7BA6A900F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8422E00E7BA6A900F5680E /* scriptfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scriptfuncs.cpp; sourceTree = "<group>"; };
-		DF8422E10E7BA6A900F5680E /* scriptfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scriptfuncs.h; sourceTree = "<group>"; };
-		DF8422E20E7BA6A900F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8422E30E7BA6A900F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8422E40E7BA6A900F5680E /* metaengine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = metaengine.h; sourceTree = "<group>"; };
-		DF8422E70E7BA6A900F5680E /* balloons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = balloons.cpp; sourceTree = "<group>"; };
-		DF8422E80E7BA6A900F5680E /* callables_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callables_br.cpp; sourceTree = "<group>"; };
-		DF8422E90E7BA6A900F5680E /* callables_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callables_ns.cpp; sourceTree = "<group>"; };
-		DF8422EA0E7BA6A900F5680E /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF8422EB0E7BA6A900F5680E /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF8422EC0E7BA6A900F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8422ED0E7BA6A900F5680E /* dialogue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogue.cpp; sourceTree = "<group>"; };
-		DF8422EE0E7BA6A900F5680E /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = "<group>"; };
-		DF8422EF0E7BA6A900F5680E /* disk_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk_br.cpp; sourceTree = "<group>"; };
-		DF8422F00E7BA6A900F5680E /* disk_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk_ns.cpp; sourceTree = "<group>"; };
-		DF8422F10E7BA6A900F5680E /* exec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = exec.h; sourceTree = "<group>"; };
-		DF8422F20E7BA6A900F5680E /* exec_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exec_br.cpp; sourceTree = "<group>"; };
-		DF8422F30E7BA6A900F5680E /* exec_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exec_ns.cpp; sourceTree = "<group>"; };
-		DF8422F40E7BA6A900F5680E /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF8422F50E7BA6A900F5680E /* gfxbase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfxbase.cpp; sourceTree = "<group>"; };
-		DF8422F60E7BA6A900F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF8422F70E7BA6A900F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF8422F80E7BA6A900F5680E /* gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui.cpp; sourceTree = "<group>"; };
-		DF8422F90E7BA6A900F5680E /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
-		DF8422FA0E7BA6A900F5680E /* gui_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_br.cpp; sourceTree = "<group>"; };
-		DF8422FB0E7BA6A900F5680E /* gui_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui_ns.cpp; sourceTree = "<group>"; };
-		DF8422FC0E7BA6A900F5680E /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input.cpp; sourceTree = "<group>"; };
-		DF8422FD0E7BA6A900F5680E /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input.h; sourceTree = "<group>"; };
-		DF8422FE0E7BA6A900F5680E /* inventory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inventory.cpp; sourceTree = "<group>"; };
-		DF8422FF0E7BA6A900F5680E /* inventory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inventory.h; sourceTree = "<group>"; };
-		DF8423010E7BA6A900F5680E /* objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = objects.cpp; sourceTree = "<group>"; };
-		DF8423020E7BA6A900F5680E /* objects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objects.h; sourceTree = "<group>"; };
-		DF8423030E7BA6A900F5680E /* parallaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parallaction.cpp; sourceTree = "<group>"; };
-		DF8423040E7BA6A900F5680E /* parallaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parallaction.h; sourceTree = "<group>"; };
-		DF8423050E7BA6A900F5680E /* parallaction_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parallaction_br.cpp; sourceTree = "<group>"; };
-		DF8423060E7BA6A900F5680E /* parallaction_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parallaction_ns.cpp; sourceTree = "<group>"; };
-		DF8423070E7BA6A900F5680E /* parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser.cpp; sourceTree = "<group>"; };
-		DF8423080E7BA6A900F5680E /* parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser.h; sourceTree = "<group>"; };
-		DF8423090E7BA6A900F5680E /* parser_br.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_br.cpp; sourceTree = "<group>"; };
-		DF84230A0E7BA6A900F5680E /* parser_ns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parser_ns.cpp; sourceTree = "<group>"; };
-		DF84230B0E7BA6A900F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF84230C0E7BA6A900F5680E /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF84230E0E7BA6A900F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF84230F0E7BA6A900F5680E /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF8423100E7BA6A900F5680E /* walk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = walk.cpp; sourceTree = "<group>"; };
-		DF8423110E7BA6A900F5680E /* walk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = walk.h; sourceTree = "<group>"; };
-		DF8423130E7BA6A900F5680E /* bankman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bankman.cpp; sourceTree = "<group>"; };
-		DF8423140E7BA6A900F5680E /* bankman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bankman.h; sourceTree = "<group>"; };
-		DF8423150E7BA6A900F5680E /* command.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command.cpp; sourceTree = "<group>"; };
-		DF8423160E7BA6A900F5680E /* command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = command.h; sourceTree = "<group>"; };
-		DF8423170E7BA6A900F5680E /* credits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = credits.cpp; sourceTree = "<group>"; };
-		DF8423180E7BA6A900F5680E /* credits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = credits.h; sourceTree = "<group>"; };
-		DF8423190E7BA6A900F5680E /* cutaway.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cutaway.cpp; sourceTree = "<group>"; };
-		DF84231A0E7BA6A900F5680E /* cutaway.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cutaway.h; sourceTree = "<group>"; };
-		DF84231B0E7BA6A900F5680E /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF84231C0E7BA6A900F5680E /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF84231D0E7BA6A900F5680E /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
-		DF84231E0E7BA6A900F5680E /* display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display.cpp; sourceTree = "<group>"; };
-		DF84231F0E7BA6A900F5680E /* display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = display.h; sourceTree = "<group>"; };
-		DF8423200E7BA6A900F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF8423210E7BA6A900F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF8423220E7BA6A900F5680E /* grid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grid.cpp; sourceTree = "<group>"; };
-		DF8423230E7BA6A900F5680E /* grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = grid.h; sourceTree = "<group>"; };
-		DF8423240E7BA6A900F5680E /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input.cpp; sourceTree = "<group>"; };
-		DF8423250E7BA6A900F5680E /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input.h; sourceTree = "<group>"; };
-		DF8423260E7BA6A900F5680E /* journal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = journal.cpp; sourceTree = "<group>"; };
-		DF8423270E7BA6A900F5680E /* journal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = journal.h; sourceTree = "<group>"; };
-		DF8423280E7BA6A900F5680E /* logic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logic.cpp; sourceTree = "<group>"; };
-		DF8423290E7BA6A900F5680E /* logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logic.h; sourceTree = "<group>"; };
-		DF84232A0E7BA6A900F5680E /* midiadlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiadlib.cpp; sourceTree = "<group>"; };
-		DF84232C0E7BA6A900F5680E /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF84232D0E7BA6A900F5680E /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF84232E0E7BA6A900F5680E /* musicdata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = musicdata.cpp; sourceTree = "<group>"; };
-		DF84232F0E7BA6A900F5680E /* queen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queen.cpp; sourceTree = "<group>"; };
-		DF8423300E7BA6A900F5680E /* queen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = queen.h; sourceTree = "<group>"; };
-		DF8423310E7BA6A900F5680E /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF8423320E7BA6A900F5680E /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF8423330E7BA6A900F5680E /* restables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restables.cpp; sourceTree = "<group>"; };
-		DF8423340E7BA6A900F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8423350E7BA6A900F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8423360E7BA6A900F5680E /* state.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = state.cpp; sourceTree = "<group>"; };
-		DF8423370E7BA6A900F5680E /* state.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = state.h; sourceTree = "<group>"; };
-		DF8423380E7BA6A900F5680E /* structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = structs.h; sourceTree = "<group>"; };
-		DF8423390E7BA6A900F5680E /* talk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talk.cpp; sourceTree = "<group>"; };
-		DF84233A0E7BA6A900F5680E /* talk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = talk.h; sourceTree = "<group>"; };
-		DF84233B0E7BA6A900F5680E /* walk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = walk.cpp; sourceTree = "<group>"; };
-		DF84233C0E7BA6A900F5680E /* walk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = walk.h; sourceTree = "<group>"; };
-		DF84233F0E7BA6AA00F5680E /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor.cpp; sourceTree = "<group>"; };
-		DF8423400E7BA6AA00F5680E /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
-		DF8423410E7BA6AA00F5680E /* actor_path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor_path.cpp; sourceTree = "<group>"; };
-		DF8423420E7BA6AA00F5680E /* actor_walk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor_walk.cpp; sourceTree = "<group>"; };
-		DF8423430E7BA6AA00F5680E /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		DF8423440E7BA6AA00F5680E /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = "<group>"; };
-		DF8423450E7BA6AA00F5680E /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF8423460E7BA6AA00F5680E /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF8423470E7BA6AA00F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8423480E7BA6AA00F5680E /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF8423490E7BA6AA00F5680E /* displayinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = displayinfo.h; sourceTree = "<group>"; };
-		DF84234A0E7BA6AA00F5680E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		DF84234B0E7BA6AA00F5680E /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events.h; sourceTree = "<group>"; };
-		DF84234C0E7BA6AA00F5680E /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF84234D0E7BA6AA00F5680E /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF84234E0E7BA6AA00F5680E /* font_map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font_map.cpp; sourceTree = "<group>"; };
-		DF84234F0E7BA6AA00F5680E /* gfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfx.cpp; sourceTree = "<group>"; };
-		DF8423500E7BA6AA00F5680E /* gfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gfx.h; sourceTree = "<group>"; };
-		DF8423520E7BA6AA00F5680E /* image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image.cpp; sourceTree = "<group>"; };
-		DF8423530E7BA6AA00F5680E /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input.cpp; sourceTree = "<group>"; };
-		DF8423540E7BA6AA00F5680E /* interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interface.cpp; sourceTree = "<group>"; };
-		DF8423550E7BA6AA00F5680E /* interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interface.h; sourceTree = "<group>"; };
-		DF8423560E7BA6AA00F5680E /* introproc_ihnm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = introproc_ihnm.cpp; sourceTree = "<group>"; };
-		DF8423570E7BA6AA00F5680E /* introproc_ite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = introproc_ite.cpp; sourceTree = "<group>"; };
-		DF8423580E7BA6AA00F5680E /* isomap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = isomap.cpp; sourceTree = "<group>"; };
-		DF8423590E7BA6AA00F5680E /* isomap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isomap.h; sourceTree = "<group>"; };
-		DF84235B0E7BA6AA00F5680E /* itedata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itedata.cpp; sourceTree = "<group>"; };
-		DF84235C0E7BA6AA00F5680E /* itedata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itedata.h; sourceTree = "<group>"; };
-		DF84235F0E7BA6AA00F5680E /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF8423600E7BA6AA00F5680E /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF8423610E7BA6AA00F5680E /* objectmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = objectmap.cpp; sourceTree = "<group>"; };
-		DF8423620E7BA6AA00F5680E /* objectmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objectmap.h; sourceTree = "<group>"; };
-		DF8423630E7BA6AA00F5680E /* palanim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palanim.cpp; sourceTree = "<group>"; };
-		DF8423640E7BA6AA00F5680E /* palanim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palanim.h; sourceTree = "<group>"; };
-		DF8423650E7BA6AA00F5680E /* puzzle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = puzzle.cpp; sourceTree = "<group>"; };
-		DF8423660E7BA6AA00F5680E /* puzzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puzzle.h; sourceTree = "<group>"; };
-		DF8423670E7BA6AA00F5680E /* render.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render.cpp; sourceTree = "<group>"; };
-		DF8423680E7BA6AA00F5680E /* render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render.h; sourceTree = "<group>"; };
-		DF84236B0E7BA6AA00F5680E /* saga.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saga.cpp; sourceTree = "<group>"; };
-		DF84236C0E7BA6AA00F5680E /* saga.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saga.h; sourceTree = "<group>"; };
-		DF84236D0E7BA6AA00F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF84236E0E7BA6AA00F5680E /* scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene.cpp; sourceTree = "<group>"; };
-		DF84236F0E7BA6AA00F5680E /* scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene.h; sourceTree = "<group>"; };
-		DF8423700E7BA6AA00F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF8423710E7BA6AA00F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8423720E7BA6AA00F5680E /* sfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sfuncs.cpp; sourceTree = "<group>"; };
-		DF8423730E7BA6AA00F5680E /* sndres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sndres.cpp; sourceTree = "<group>"; };
-		DF8423740E7BA6AA00F5680E /* sndres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sndres.h; sourceTree = "<group>"; };
-		DF8423750E7BA6AA00F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8423760E7BA6AA00F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8423770E7BA6AA00F5680E /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite.cpp; sourceTree = "<group>"; };
-		DF8423780E7BA6AA00F5680E /* sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = "<group>"; };
-		DF8423790E7BA6AA00F5680E /* sthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sthread.cpp; sourceTree = "<group>"; };
-		DF84237C0E7BA6AA00F5680E /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor.cpp; sourceTree = "<group>"; };
-		DF84237D0E7BA6AA00F5680E /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
-		DF84237E0E7BA6AA00F5680E /* akos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = akos.cpp; sourceTree = "<group>"; };
-		DF84237F0E7BA6AA00F5680E /* akos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = akos.h; sourceTree = "<group>"; };
-		DF8423800E7BA6AA00F5680E /* base-costume.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "base-costume.cpp"; sourceTree = "<group>"; };
-		DF8423810E7BA6AA00F5680E /* base-costume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "base-costume.h"; sourceTree = "<group>"; };
-		DF8423820E7BA6AA00F5680E /* bomp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bomp.cpp; sourceTree = "<group>"; };
-		DF8423830E7BA6AA00F5680E /* bomp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bomp.h; sourceTree = "<group>"; };
-		DF8423840E7BA6AA00F5680E /* boxes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = boxes.cpp; sourceTree = "<group>"; };
-		DF8423850E7BA6AA00F5680E /* boxes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = boxes.h; sourceTree = "<group>"; };
-		DF8423860E7BA6AA00F5680E /* camera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = camera.cpp; sourceTree = "<group>"; };
-		DF8423870E7BA6AA00F5680E /* charset-fontdata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "charset-fontdata.cpp"; sourceTree = "<group>"; };
-		DF8423880E7BA6AA00F5680E /* charset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charset.cpp; sourceTree = "<group>"; };
-		DF8423890E7BA6AA00F5680E /* charset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charset.h; sourceTree = "<group>"; };
-		DF84238A0E7BA6AA00F5680E /* costume.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = costume.cpp; sourceTree = "<group>"; };
-		DF84238B0E7BA6AA00F5680E /* costume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = costume.h; sourceTree = "<group>"; };
-		DF84238C0E7BA6AA00F5680E /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
-		DF84238D0E7BA6AA00F5680E /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DF84238E0E7BA6AA00F5680E /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DF84238F0E7BA6AA00F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8423900E7BA6AA00F5680E /* detection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection.h; sourceTree = "<group>"; };
-		DF8423910E7BA6AA00F5680E /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF8423920E7BA6AA00F5680E /* dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialogs.cpp; sourceTree = "<group>"; };
-		DF8423930E7BA6AA00F5680E /* dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialogs.h; sourceTree = "<group>"; };
-		DF8423940E7BA6AA00F5680E /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = "<group>"; };
-		DF8423950E7BA6AA00F5680E /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
-		DF8423960E7BA6AA00F5680E /* file_nes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_nes.cpp; sourceTree = "<group>"; };
-		DF8423970E7BA6AA00F5680E /* file_nes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file_nes.h; sourceTree = "<group>"; };
-		DF8423980E7BA6AA00F5680E /* gfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfx.cpp; sourceTree = "<group>"; };
-		DF8423990E7BA6AA00F5680E /* gfx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gfx.h; sourceTree = "<group>"; };
-		DF84239C0E7BA6AA00F5680E /* animation_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation_he.cpp; sourceTree = "<group>"; };
-		DF84239D0E7BA6AA00F5680E /* animation_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation_he.h; sourceTree = "<group>"; };
-		DF84239E0E7BA6AA00F5680E /* cup_player_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cup_player_he.cpp; sourceTree = "<group>"; };
-		DF84239F0E7BA6AA00F5680E /* cup_player_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cup_player_he.h; sourceTree = "<group>"; };
-		DF8423A00E7BA6AA00F5680E /* floodfill_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = floodfill_he.cpp; sourceTree = "<group>"; };
-		DF8423A10E7BA6AA00F5680E /* floodfill_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = floodfill_he.h; sourceTree = "<group>"; };
-		DF8423A20E7BA6AA00F5680E /* intern_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intern_he.h; sourceTree = "<group>"; };
-		DF8423A30E7BA6AA00F5680E /* logic_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logic_he.cpp; sourceTree = "<group>"; };
-		DF8423A40E7BA6AA00F5680E /* logic_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logic_he.h; sourceTree = "<group>"; };
-		DF8423A50E7BA6AA00F5680E /* palette_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette_he.cpp; sourceTree = "<group>"; };
-		DF8423A60E7BA6AA00F5680E /* resource_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_he.cpp; sourceTree = "<group>"; };
-		DF8423A70E7BA6AA00F5680E /* resource_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource_he.h; sourceTree = "<group>"; };
-		DF8423A80E7BA6AA00F5680E /* script_v100he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v100he.cpp; sourceTree = "<group>"; };
-		DF8423A90E7BA6AA00F5680E /* script_v60he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v60he.cpp; sourceTree = "<group>"; };
-		DF8423AA0E7BA6AA00F5680E /* script_v70he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v70he.cpp; sourceTree = "<group>"; };
-		DF8423AB0E7BA6AA00F5680E /* script_v71he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v71he.cpp; sourceTree = "<group>"; };
-		DF8423AC0E7BA6AA00F5680E /* script_v72he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v72he.cpp; sourceTree = "<group>"; };
-		DF8423AD0E7BA6AA00F5680E /* script_v80he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v80he.cpp; sourceTree = "<group>"; };
-		DF8423AE0E7BA6AA00F5680E /* script_v90he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v90he.cpp; sourceTree = "<group>"; };
-		DF8423AF0E7BA6AA00F5680E /* sound_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound_he.cpp; sourceTree = "<group>"; };
-		DF8423B00E7BA6AA00F5680E /* sound_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound_he.h; sourceTree = "<group>"; };
-		DF8423B10E7BA6AA00F5680E /* sprite_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite_he.cpp; sourceTree = "<group>"; };
-		DF8423B20E7BA6AA00F5680E /* sprite_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite_he.h; sourceTree = "<group>"; };
-		DF8423B30E7BA6AA00F5680E /* wiz_he.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wiz_he.cpp; sourceTree = "<group>"; };
-		DF8423B40E7BA6AA00F5680E /* wiz_he.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wiz_he.h; sourceTree = "<group>"; };
-		DF8423B50E7BA6AA00F5680E /* help.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = help.cpp; sourceTree = "<group>"; };
-		DF8423B60E7BA6AA00F5680E /* help.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = help.h; sourceTree = "<group>"; };
-		DF8423B80E7BA6AA00F5680E /* imuse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imuse.cpp; sourceTree = "<group>"; };
-		DF8423B90E7BA6AA00F5680E /* imuse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imuse.h; sourceTree = "<group>"; };
-		DF8423BA0E7BA6AA00F5680E /* imuse_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imuse_internal.h; sourceTree = "<group>"; };
-		DF8423BB0E7BA6AA00F5680E /* imuse_part.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imuse_part.cpp; sourceTree = "<group>"; };
-		DF8423BC0E7BA6AA00F5680E /* imuse_player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imuse_player.cpp; sourceTree = "<group>"; };
-		DF8423BD0E7BA6AA00F5680E /* instrument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = instrument.cpp; sourceTree = "<group>"; };
-		DF8423BE0E7BA6AA00F5680E /* instrument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = instrument.h; sourceTree = "<group>"; };
-		DF8423BF0E7BA6AA00F5680E /* sysex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysex.h; sourceTree = "<group>"; };
-		DF8423C00E7BA6AA00F5680E /* sysex_samnmax.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sysex_samnmax.cpp; sourceTree = "<group>"; };
-		DF8423C10E7BA6AA00F5680E /* sysex_scumm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sysex_scumm.cpp; sourceTree = "<group>"; };
-		DF8423C30E7BA6AA00F5680E /* dimuse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse.cpp; sourceTree = "<group>"; };
-		DF8423C40E7BA6AA00F5680E /* dimuse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dimuse.h; sourceTree = "<group>"; };
-		DF8423C50E7BA6AA00F5680E /* dimuse_bndmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_bndmgr.cpp; sourceTree = "<group>"; };
-		DF8423C60E7BA6AA00F5680E /* dimuse_bndmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dimuse_bndmgr.h; sourceTree = "<group>"; };
-		DF8423C70E7BA6AA00F5680E /* dimuse_codecs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_codecs.cpp; sourceTree = "<group>"; };
-		DF8423C80E7BA6AA00F5680E /* dimuse_music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_music.cpp; sourceTree = "<group>"; };
-		DF8423C90E7BA6AA00F5680E /* dimuse_script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_script.cpp; sourceTree = "<group>"; };
-		DF8423CA0E7BA6AA00F5680E /* dimuse_sndmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_sndmgr.cpp; sourceTree = "<group>"; };
-		DF8423CB0E7BA6AA00F5680E /* dimuse_sndmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dimuse_sndmgr.h; sourceTree = "<group>"; };
-		DF8423CC0E7BA6AA00F5680E /* dimuse_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_tables.cpp; sourceTree = "<group>"; };
-		DF8423CD0E7BA6AA00F5680E /* dimuse_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dimuse_tables.h; sourceTree = "<group>"; };
-		DF8423CE0E7BA6AA00F5680E /* dimuse_track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dimuse_track.cpp; sourceTree = "<group>"; };
-		DF8423CF0E7BA6AA00F5680E /* dimuse_track.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dimuse_track.h; sourceTree = "<group>"; };
-		DF8423D00E7BA6AA00F5680E /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input.cpp; sourceTree = "<group>"; };
-		DF8423D20E7BA6AA00F5680E /* insane.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = insane.cpp; sourceTree = "<group>"; };
-		DF8423D30E7BA6AA00F5680E /* insane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = insane.h; sourceTree = "<group>"; };
-		DF8423D40E7BA6AA00F5680E /* insane_ben.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = insane_ben.cpp; sourceTree = "<group>"; };
-		DF8423D50E7BA6AA00F5680E /* insane_enemy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = insane_enemy.cpp; sourceTree = "<group>"; };
-		DF8423D60E7BA6AA00F5680E /* insane_iact.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = insane_iact.cpp; sourceTree = "<group>"; };
-		DF8423D70E7BA6AA00F5680E /* insane_scenes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = insane_scenes.cpp; sourceTree = "<group>"; };
-		DF8423DA0E7BA6AA00F5680E /* midiparser_ro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midiparser_ro.cpp; sourceTree = "<group>"; };
-		DF8423DC0E7BA6AA00F5680E /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF8423DD0E7BA6AA00F5680E /* nut_renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nut_renderer.cpp; sourceTree = "<group>"; };
-		DF8423DE0E7BA6AA00F5680E /* nut_renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nut_renderer.h; sourceTree = "<group>"; };
-		DF8423DF0E7BA6AA00F5680E /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DF8423E00E7BA6AA00F5680E /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF8423E10E7BA6AA00F5680E /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
-		DF8423E20E7BA6AA00F5680E /* player_mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_mod.cpp; sourceTree = "<group>"; };
-		DF8423E30E7BA6AA00F5680E /* player_mod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_mod.h; sourceTree = "<group>"; };
-		DF8423E40E7BA6AA00F5680E /* player_nes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_nes.cpp; sourceTree = "<group>"; };
-		DF8423E50E7BA6AA00F5680E /* player_nes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_nes.h; sourceTree = "<group>"; };
-		DF8423E60E7BA6AA00F5680E /* player_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v1.cpp; sourceTree = "<group>"; };
-		DF8423E70E7BA6AA00F5680E /* player_v1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v1.h; sourceTree = "<group>"; };
-		DF8423E80E7BA6AA00F5680E /* player_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2.cpp; sourceTree = "<group>"; };
-		DF8423E90E7BA6AA00F5680E /* player_v2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2.h; sourceTree = "<group>"; };
-		DF8423EA0E7BA6AA00F5680E /* player_v2a.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v2a.cpp; sourceTree = "<group>"; };
-		DF8423EB0E7BA6AA00F5680E /* player_v2a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v2a.h; sourceTree = "<group>"; };
-		DF8423EC0E7BA6AA00F5680E /* player_v3a.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_v3a.cpp; sourceTree = "<group>"; };
-		DF8423ED0E7BA6AA00F5680E /* player_v3a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_v3a.h; sourceTree = "<group>"; };
-		DF8423EF0E7BA6AA00F5680E /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF8423F00E7BA6AA00F5680E /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
-		DF8423F10E7BA6AA00F5680E /* resource_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_v2.cpp; sourceTree = "<group>"; };
-		DF8423F20E7BA6AA00F5680E /* resource_v3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_v3.cpp; sourceTree = "<group>"; };
-		DF8423F30E7BA6AA00F5680E /* resource_v4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_v4.cpp; sourceTree = "<group>"; };
-		DF8423F40E7BA6AA00F5680E /* room.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = room.cpp; sourceTree = "<group>"; };
-		DF8423F50E7BA6AA00F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8423F60E7BA6AA00F5680E /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF8423F70E7BA6AA00F5680E /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF8423F80E7BA6AA00F5680E /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
-		DF8423F90E7BA6AA00F5680E /* script_v0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v0.cpp; sourceTree = "<group>"; };
-		DF8423FA0E7BA6AA00F5680E /* script_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v2.cpp; sourceTree = "<group>"; };
-		DF8423FB0E7BA6AA00F5680E /* script_v5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v5.cpp; sourceTree = "<group>"; };
-		DF8423FC0E7BA6AA00F5680E /* script_v6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v6.cpp; sourceTree = "<group>"; };
-		DF8423FD0E7BA6AA00F5680E /* script_v8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_v8.cpp; sourceTree = "<group>"; };
-		DF8423FE0E7BA6AA00F5680E /* scumm-md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "scumm-md5.h"; sourceTree = "<group>"; };
-		DF8423FF0E7BA6AA00F5680E /* scumm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scumm.cpp; sourceTree = "<group>"; };
-		DF8424000E7BA6AA00F5680E /* scumm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scumm.h; sourceTree = "<group>"; };
-		DF8424020E7BA6AA00F5680E /* channel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = channel.cpp; sourceTree = "<group>"; };
-		DF8424030E7BA6AA00F5680E /* channel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = channel.h; sourceTree = "<group>"; };
-		DF8424060E7BA6AA00F5680E /* codec1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = codec1.cpp; sourceTree = "<group>"; };
-		DF8424070E7BA6AA00F5680E /* codec37.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = codec37.cpp; sourceTree = "<group>"; };
-		DF8424080E7BA6AA00F5680E /* codec37.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec37.h; sourceTree = "<group>"; };
-		DF8424090E7BA6AA00F5680E /* codec47.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = codec47.cpp; sourceTree = "<group>"; };
-		DF84240A0E7BA6AA00F5680E /* codec47.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec47.h; sourceTree = "<group>"; };
-		DF84240D0E7BA6AA00F5680E /* imuse_channel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imuse_channel.cpp; sourceTree = "<group>"; };
-		DF84240E0E7BA6AA00F5680E /* saud_channel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saud_channel.cpp; sourceTree = "<group>"; };
-		DF84240F0E7BA6AA00F5680E /* smush_font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smush_font.cpp; sourceTree = "<group>"; };
-		DF8424100E7BA6AA00F5680E /* smush_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smush_font.h; sourceTree = "<group>"; };
-		DF8424110E7BA6AA00F5680E /* smush_mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smush_mixer.cpp; sourceTree = "<group>"; };
-		DF8424120E7BA6AA00F5680E /* smush_mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smush_mixer.h; sourceTree = "<group>"; };
-		DF8424130E7BA6AA00F5680E /* smush_player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smush_player.cpp; sourceTree = "<group>"; };
-		DF8424140E7BA6AB00F5680E /* smush_player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smush_player.h; sourceTree = "<group>"; };
-		DF8424150E7BA6AB00F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8424160E7BA6AB00F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8424170E7BA6AB00F5680E /* string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string.cpp; sourceTree = "<group>"; };
-		DF8424190E7BA6AB00F5680E /* usage_bits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = usage_bits.cpp; sourceTree = "<group>"; };
-		DF84241A0E7BA6AB00F5680E /* usage_bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usage_bits.h; sourceTree = "<group>"; };
-		DF84241B0E7BA6AB00F5680E /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		DF84241C0E7BA6AB00F5680E /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		DF84241D0E7BA6AB00F5680E /* vars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vars.cpp; sourceTree = "<group>"; };
-		DF84241E0E7BA6AB00F5680E /* verbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = verbs.cpp; sourceTree = "<group>"; };
-		DF84241F0E7BA6AB00F5680E /* verbs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = verbs.h; sourceTree = "<group>"; };
-		DF8424210E7BA6AB00F5680E /* autoroute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = autoroute.cpp; sourceTree = "<group>"; };
-		DF8424220E7BA6AB00F5680E /* autoroute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autoroute.h; sourceTree = "<group>"; };
-		DF8424230E7BA6AB00F5680E /* compact.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compact.cpp; sourceTree = "<group>"; };
-		DF8424240E7BA6AB00F5680E /* compact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compact.h; sourceTree = "<group>"; };
-		DF8424250E7BA6AB00F5680E /* control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = control.cpp; sourceTree = "<group>"; };
-		DF8424260E7BA6AB00F5680E /* control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = control.h; sourceTree = "<group>"; };
-		DF8424270E7BA6AB00F5680E /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF8424280E7BA6AB00F5680E /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF8424290E7BA6AB00F5680E /* disk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = disk.cpp; sourceTree = "<group>"; };
-		DF84242A0E7BA6AB00F5680E /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = "<group>"; };
-		DF84242B0E7BA6AB00F5680E /* grid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grid.cpp; sourceTree = "<group>"; };
-		DF84242C0E7BA6AB00F5680E /* grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = grid.h; sourceTree = "<group>"; };
-		DF84242D0E7BA6AB00F5680E /* hufftext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hufftext.cpp; sourceTree = "<group>"; };
-		DF84242E0E7BA6AB00F5680E /* intro.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intro.cpp; sourceTree = "<group>"; };
-		DF84242F0E7BA6AB00F5680E /* intro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intro.h; sourceTree = "<group>"; };
-		DF8424300E7BA6AB00F5680E /* logic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logic.cpp; sourceTree = "<group>"; };
-		DF8424310E7BA6AB00F5680E /* logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logic.h; sourceTree = "<group>"; };
-		DF8424330E7BA6AB00F5680E /* mouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouse.cpp; sourceTree = "<group>"; };
-		DF8424340E7BA6AB00F5680E /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
-		DF8424360E7BA6AB00F5680E /* adlibchannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlibchannel.cpp; sourceTree = "<group>"; };
-		DF8424370E7BA6AB00F5680E /* adlibchannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlibchannel.h; sourceTree = "<group>"; };
-		DF8424380E7BA6AB00F5680E /* adlibmusic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlibmusic.cpp; sourceTree = "<group>"; };
-		DF8424390E7BA6AB00F5680E /* adlibmusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlibmusic.h; sourceTree = "<group>"; };
-		DF84243A0E7BA6AB00F5680E /* gmchannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmchannel.cpp; sourceTree = "<group>"; };
-		DF84243B0E7BA6AB00F5680E /* gmchannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gmchannel.h; sourceTree = "<group>"; };
-		DF84243C0E7BA6AB00F5680E /* gmmusic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmmusic.cpp; sourceTree = "<group>"; };
-		DF84243D0E7BA6AB00F5680E /* gmmusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gmmusic.h; sourceTree = "<group>"; };
-		DF84243E0E7BA6AB00F5680E /* mt32music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mt32music.cpp; sourceTree = "<group>"; };
-		DF84243F0E7BA6AB00F5680E /* mt32music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mt32music.h; sourceTree = "<group>"; };
-		DF8424400E7BA6AB00F5680E /* musicbase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = musicbase.cpp; sourceTree = "<group>"; };
-		DF8424410E7BA6AB00F5680E /* musicbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = musicbase.h; sourceTree = "<group>"; };
-		DF8424420E7BA6AB00F5680E /* rnc_deco.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rnc_deco.cpp; sourceTree = "<group>"; };
-		DF8424430E7BA6AB00F5680E /* rnc_deco.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rnc_deco.h; sourceTree = "<group>"; };
-		DF8424440E7BA6AB00F5680E /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF8424450E7BA6AB00F5680E /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF8424460E7BA6AB00F5680E /* sky.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sky.cpp; sourceTree = "<group>"; };
-		DF8424470E7BA6AB00F5680E /* sky.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sky.h; sourceTree = "<group>"; };
-		DF8424480E7BA6AB00F5680E /* skydefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skydefs.h; sourceTree = "<group>"; };
-		DF8424490E7BA6AB00F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF84244A0E7BA6AB00F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF84244B0E7BA6AB00F5680E /* struc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = struc.h; sourceTree = "<group>"; };
-		DF84244C0E7BA6AB00F5680E /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		DF84244D0E7BA6AB00F5680E /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
-		DF84244F0E7BA6AB00F5680E /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		DF8424500E7BA6AB00F5680E /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = "<group>"; };
-		DF8424510E7BA6AB00F5680E /* collision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collision.h; sourceTree = "<group>"; };
-		DF8424520E7BA6AB00F5680E /* control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = control.cpp; sourceTree = "<group>"; };
-		DF8424530E7BA6AB00F5680E /* control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = control.h; sourceTree = "<group>"; };
-		DF8424560E7BA6AB00F5680E /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF8424570E7BA6AB00F5680E /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF8424580E7BA6AB00F5680E /* eventman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eventman.cpp; sourceTree = "<group>"; };
-		DF8424590E7BA6AB00F5680E /* eventman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eventman.h; sourceTree = "<group>"; };
-		DF84245A0E7BA6AB00F5680E /* logic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logic.cpp; sourceTree = "<group>"; };
-		DF84245B0E7BA6AB00F5680E /* logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logic.h; sourceTree = "<group>"; };
-		DF84245C0E7BA6AB00F5680E /* memman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memman.cpp; sourceTree = "<group>"; };
-		DF84245D0E7BA6AB00F5680E /* memman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memman.h; sourceTree = "<group>"; };
-		DF84245E0E7BA6AB00F5680E /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF84245F0E7BA6AB00F5680E /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
-		DF8424610E7BA6AB00F5680E /* mouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouse.cpp; sourceTree = "<group>"; };
-		DF8424620E7BA6AB00F5680E /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
-		DF8424630E7BA6AB00F5680E /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF8424640E7BA6AB00F5680E /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF8424650E7BA6AB00F5680E /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF8424660E7BA6AB00F5680E /* objectman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = objectman.cpp; sourceTree = "<group>"; };
-		DF8424670E7BA6AB00F5680E /* objectman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objectman.h; sourceTree = "<group>"; };
-		DF8424680E7BA6AB00F5680E /* resman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resman.cpp; sourceTree = "<group>"; };
-		DF8424690E7BA6AB00F5680E /* resman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resman.h; sourceTree = "<group>"; };
-		DF84246A0E7BA6AB00F5680E /* router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = router.cpp; sourceTree = "<group>"; };
-		DF84246B0E7BA6AB00F5680E /* router.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = router.h; sourceTree = "<group>"; };
-		DF84246C0E7BA6AB00F5680E /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF84246D0E7BA6AB00F5680E /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF84246E0E7BA6AB00F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF84246F0E7BA6AB00F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8424700E7BA6AB00F5680E /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF8424710E7BA6AB00F5680E /* sword1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sword1.cpp; sourceTree = "<group>"; };
-		DF8424720E7BA6AB00F5680E /* sword1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sword1.h; sourceTree = "<group>"; };
-		DF8424730E7BA6AB00F5680E /* sworddefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sworddefs.h; sourceTree = "<group>"; };
-		DF8424740E7BA6AB00F5680E /* swordres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swordres.h; sourceTree = "<group>"; };
-		DF8424750E7BA6AB00F5680E /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		DF8424760E7BA6AB00F5680E /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
-		DF8424780E7BA6AB00F5680E /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cpp; sourceTree = "<group>"; };
-		DF8424790E7BA6AB00F5680E /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = "<group>"; };
-		DF84247A0E7BA6AB00F5680E /* anims.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anims.cpp; sourceTree = "<group>"; };
-		DF84247B0E7BA6AB00F5680E /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DF84247C0E7BA6AB00F5680E /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DF84247D0E7BA6AB00F5680E /* controls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controls.cpp; sourceTree = "<group>"; };
-		DF84247E0E7BA6AB00F5680E /* controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controls.h; sourceTree = "<group>"; };
-		DF84247F0E7BA6AB00F5680E /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
-		DF8424800E7BA6AB00F5680E /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DF8424810E7BA6AB00F5680E /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
-		DF8424820E7BA6AB00F5680E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		DF8424830E7BA6AB00F5680E /* function.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function.cpp; sourceTree = "<group>"; };
-		DF8424840E7BA6AB00F5680E /* header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = header.h; sourceTree = "<group>"; };
-		DF8424850E7BA6AB00F5680E /* icons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = icons.cpp; sourceTree = "<group>"; };
-		DF8424860E7BA6AB00F5680E /* interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interpreter.cpp; sourceTree = "<group>"; };
-		DF8424870E7BA6AB00F5680E /* interpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interpreter.h; sourceTree = "<group>"; };
-		DF8424880E7BA6AB00F5680E /* layers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = layers.cpp; sourceTree = "<group>"; };
-		DF8424890E7BA6AB00F5680E /* logic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logic.cpp; sourceTree = "<group>"; };
-		DF84248A0E7BA6AB00F5680E /* logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logic.h; sourceTree = "<group>"; };
-		DF84248B0E7BA6AB00F5680E /* maketext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maketext.cpp; sourceTree = "<group>"; };
-		DF84248C0E7BA6AB00F5680E /* maketext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maketext.h; sourceTree = "<group>"; };
-		DF84248D0E7BA6AB00F5680E /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
-		DF84248E0E7BA6AB00F5680E /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
-		DF84248F0E7BA6AB00F5680E /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF8424910E7BA6AB00F5680E /* mouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouse.cpp; sourceTree = "<group>"; };
-		DF8424920E7BA6AB00F5680E /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouse.h; sourceTree = "<group>"; };
-		DF8424930E7BA6AB00F5680E /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF8424940E7BA6AB00F5680E /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF8424950E7BA6AB00F5680E /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
-		DF8424960E7BA6AB00F5680E /* protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protocol.cpp; sourceTree = "<group>"; };
-		DF8424970E7BA6AB00F5680E /* render.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render.cpp; sourceTree = "<group>"; };
-		DF8424980E7BA6AB00F5680E /* resman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resman.cpp; sourceTree = "<group>"; };
-		DF8424990E7BA6AB00F5680E /* resman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resman.h; sourceTree = "<group>"; };
-		DF84249A0E7BA6AB00F5680E /* router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = router.cpp; sourceTree = "<group>"; };
-		DF84249B0E7BA6AB00F5680E /* router.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = router.h; sourceTree = "<group>"; };
-		DF84249C0E7BA6AB00F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF84249D0E7BA6AB00F5680E /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DF84249E0E7BA6AB00F5680E /* screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = screen.cpp; sourceTree = "<group>"; };
-		DF84249F0E7BA6AB00F5680E /* screen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screen.h; sourceTree = "<group>"; };
-		DF8424A00E7BA6AB00F5680E /* scroll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scroll.cpp; sourceTree = "<group>"; };
-		DF8424A10E7BA6AB00F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8424A20E7BA6AB00F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8424A30E7BA6AB00F5680E /* speech.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speech.cpp; sourceTree = "<group>"; };
-		DF8424A40E7BA6AB00F5680E /* sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite.cpp; sourceTree = "<group>"; };
-		DF8424A50E7BA6AB00F5680E /* startup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = startup.cpp; sourceTree = "<group>"; };
-		DF8424A60E7BA6AB00F5680E /* sword2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sword2.cpp; sourceTree = "<group>"; };
-		DF8424A70E7BA6AB00F5680E /* sword2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sword2.h; sourceTree = "<group>"; };
-		DF8424A80E7BA6AB00F5680E /* sync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sync.cpp; sourceTree = "<group>"; };
-		DF8424A90E7BA6AB00F5680E /* walker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = walker.cpp; sourceTree = "<group>"; };
-		DF8424AB0E7BA6AB00F5680E /* actors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actors.cpp; sourceTree = "<group>"; };
-		DF8424AC0E7BA6AB00F5680E /* actors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actors.h; sourceTree = "<group>"; };
-		DF8424AD0E7BA6AB00F5680E /* anim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anim.cpp; sourceTree = "<group>"; };
-		DF8424AE0E7BA6AB00F5680E /* anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = anim.h; sourceTree = "<group>"; };
-		DF8424AF0E7BA6AB00F5680E /* background.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = background.cpp; sourceTree = "<group>"; };
-		DF8424B00E7BA6AB00F5680E /* background.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = background.h; sourceTree = "<group>"; };
-		DF8424B10E7BA6AB00F5680E /* bg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bg.cpp; sourceTree = "<group>"; };
-		DF8424B20E7BA6AB00F5680E /* cliprect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cliprect.cpp; sourceTree = "<group>"; };
-		DF8424B30E7BA6AB00F5680E /* cliprect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cliprect.h; sourceTree = "<group>"; };
-		DF8424B40E7BA6AB00F5680E /* config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = config.cpp; sourceTree = "<group>"; };
-		DF8424B50E7BA6AB00F5680E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		DF8424B60E7BA6AB00F5680E /* coroutine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coroutine.h; sourceTree = "<group>"; };
-		DF8424B70E7BA6AB00F5680E /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
-		DF8424B80E7BA6AB00F5680E /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
-		DF8424B90E7BA6AB00F5680E /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DF8424BA0E7BA6AB00F5680E /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DF8424BB0E7BA6AB00F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8424BC0E7BA6AB00F5680E /* dw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dw.h; sourceTree = "<group>"; };
-		DF8424BD0E7BA6AB00F5680E /* effect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = effect.cpp; sourceTree = "<group>"; };
-		DF8424BE0E7BA6AB00F5680E /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		DF8424BF0E7BA6AB00F5680E /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events.h; sourceTree = "<group>"; };
-		DF8424C00E7BA6AB00F5680E /* faders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = faders.cpp; sourceTree = "<group>"; };
-		DF8424C10E7BA6AB00F5680E /* faders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = faders.h; sourceTree = "<group>"; };
-		DF8424C20E7BA6AB00F5680E /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = "<group>"; };
-		DF8424C30E7BA6AB00F5680E /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DF8424C40E7BA6AB00F5680E /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DF8424C50E7BA6AB00F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF8424C60E7BA6AB00F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF8424C70E7BA6AB00F5680E /* handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = handle.cpp; sourceTree = "<group>"; };
-		DF8424C80E7BA6AB00F5680E /* handle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = handle.h; sourceTree = "<group>"; };
-		DF8424C90E7BA6AB00F5680E /* heapmem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = heapmem.cpp; sourceTree = "<group>"; };
-		DF8424CA0E7BA6AB00F5680E /* heapmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = heapmem.h; sourceTree = "<group>"; };
-		DF8424CD0E7BA6AB00F5680E /* mareels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mareels.cpp; sourceTree = "<group>"; };
-		DF8424CF0E7BA6AB00F5680E /* move.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = move.cpp; sourceTree = "<group>"; };
-		DF8424D00E7BA6AB00F5680E /* move.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = move.h; sourceTree = "<group>"; };
-		DF8424D10E7BA6AB00F5680E /* multiobj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = multiobj.cpp; sourceTree = "<group>"; };
-		DF8424D20E7BA6AB00F5680E /* multiobj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = multiobj.h; sourceTree = "<group>"; };
-		DF8424D30E7BA6AB00F5680E /* music.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = music.cpp; sourceTree = "<group>"; };
-		DF8424D40E7BA6AB00F5680E /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
-		DF8424D50E7BA6AB00F5680E /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DF8424D60E7BA6AB00F5680E /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DF8424D70E7BA6AB00F5680E /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
-		DF8424D80E7BA6AB00F5680E /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
-		DF8424D90E7BA6AB00F5680E /* pcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcode.cpp; sourceTree = "<group>"; };
-		DF8424DA0E7BA6AB00F5680E /* pcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcode.h; sourceTree = "<group>"; };
-		DF8424DB0E7BA6AB00F5680E /* pdisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pdisplay.cpp; sourceTree = "<group>"; };
-		DF8424DC0E7BA6AB00F5680E /* pid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pid.h; sourceTree = "<group>"; };
-		DF8424DD0E7BA6AB00F5680E /* play.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = play.cpp; sourceTree = "<group>"; };
-		DF8424DE0E7BA6AB00F5680E /* polygons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = polygons.cpp; sourceTree = "<group>"; };
-		DF8424DF0E7BA6AB00F5680E /* polygons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = polygons.h; sourceTree = "<group>"; };
-		DF8424E00E7BA6AB00F5680E /* rince.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rince.cpp; sourceTree = "<group>"; };
-		DF8424E10E7BA6AB00F5680E /* rince.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rince.h; sourceTree = "<group>"; };
-		DF8424E20E7BA6AB00F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8424E30E7BA6AB00F5680E /* savescn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savescn.cpp; sourceTree = "<group>"; };
-		DF8424E40E7BA6AB00F5680E /* savescn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savescn.h; sourceTree = "<group>"; };
-		DF8424E50E7BA6AB00F5680E /* scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene.cpp; sourceTree = "<group>"; };
-		DF8424E60E7BA6AB00F5680E /* scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene.h; sourceTree = "<group>"; };
-		DF8424E70E7BA6AB00F5680E /* sched.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sched.cpp; sourceTree = "<group>"; };
-		DF8424E80E7BA6AB00F5680E /* sched.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sched.h; sourceTree = "<group>"; };
-		DF8424E90E7BA6AB00F5680E /* scn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scn.cpp; sourceTree = "<group>"; };
-		DF8424EA0E7BA6AB00F5680E /* scn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scn.h; sourceTree = "<group>"; };
-		DF8424EB0E7BA6AB00F5680E /* scroll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scroll.cpp; sourceTree = "<group>"; };
-		DF8424EC0E7BA6AB00F5680E /* scroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scroll.h; sourceTree = "<group>"; };
-		DF8424EE0E7BA6AB00F5680E /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DF8424EF0E7BA6AB00F5680E /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DF8424F00E7BA6AB00F5680E /* strres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strres.cpp; sourceTree = "<group>"; };
-		DF8424F10E7BA6AB00F5680E /* strres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strres.h; sourceTree = "<group>"; };
-		DF8424F20E7BA6AB00F5680E /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text.cpp; sourceTree = "<group>"; };
-		DF8424F30E7BA6AB00F5680E /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = text.h; sourceTree = "<group>"; };
-		DF8424F40E7BA6AB00F5680E /* timers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timers.cpp; sourceTree = "<group>"; };
-		DF8424F50E7BA6AB00F5680E /* timers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timers.h; sourceTree = "<group>"; };
-		DF8424F60E7BA6AB00F5680E /* tinlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinlib.cpp; sourceTree = "<group>"; };
-		DF8424F70E7BA6AB00F5680E /* tinlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinlib.h; sourceTree = "<group>"; };
-		DF8424F80E7BA6AB00F5680E /* tinsel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinsel.cpp; sourceTree = "<group>"; };
-		DF8424F90E7BA6AB00F5680E /* tinsel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinsel.h; sourceTree = "<group>"; };
-		DF8424FA0E7BA6AB00F5680E /* token.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = token.cpp; sourceTree = "<group>"; };
-		DF8424FB0E7BA6AB00F5680E /* token.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = token.h; sourceTree = "<group>"; };
-		DF8424FD0E7BA6AB00F5680E /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DF8424FE0E7BA6AB00F5680E /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
-		DF8424FF0E7BA6AB00F5680E /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
-		DF8425000E7BA6AB00F5680E /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
-		DF8425010E7BA6AB00F5680E /* midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = midi.cpp; sourceTree = "<group>"; };
-		DF8425020E7BA6AB00F5680E /* midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = midi.h; sourceTree = "<group>"; };
-		DF8425040E7BA6AB00F5680E /* opcodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opcodes.cpp; sourceTree = "<group>"; };
-		DF8425050E7BA6AB00F5680E /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DF8425060E7BA6AB00F5680E /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DF8425070E7BA6AB00F5680E /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF8425080E7BA6AB00F5680E /* touche.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = touche.cpp; sourceTree = "<group>"; };
-		DF8425090E7BA6AB00F5680E /* touche.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = touche.h; sourceTree = "<group>"; };
-		DF8428960E7BAAAB00F5680E /* blit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = blit.cpp; sourceTree = "<group>"; };
-		DF842A160E7BB34E00F5680E /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
-		DF842A170E7BB34E00F5680E /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
-		DF842A180E7BB34E00F5680E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		DF842A190E7BB34E00F5680E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		DF842A270E7BB37500F5680E /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		DF842A2E0E7BB39E00F5680E /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		DF842A3D0E7BBB5000F5680E /* timidity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timidity.cpp; sourceTree = "<group>"; };
-		DF842A400E7BBBB400F5680E /* archive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = archive.cpp; sourceTree = "<group>"; };
-		DF842A410E7BBBB400F5680E /* archive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = archive.h; sourceTree = "<group>"; };
-		DF842A430E7BBBB400F5680E /* ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ptr.h; sourceTree = "<group>"; };
-		DF842A440E7BBBB400F5680E /* queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = queue.h; sourceTree = "<group>"; };
-		DF842A450E7BBBB400F5680E /* unarj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unarj.cpp; sourceTree = "<group>"; };
-		DF842A460E7BBBB400F5680E /* unarj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unarj.h; sourceTree = "<group>"; };
-		DF842A4C0E7BBBEB00F5680E /* posix-fs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-fs.h"; sourceTree = "<group>"; };
-		DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stdiostream.cpp; sourceTree = "<group>"; };
-		DF842A6C0E7BBD5700F5680E /* stdiostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdiostream.h; sourceTree = "<group>"; };
-		DF895C01124C24680077F6E8 /* player_towns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player_towns.cpp; sourceTree = "<group>"; };
-		DF895C02124C24680077F6E8 /* player_towns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player_towns.h; sourceTree = "<group>"; };
-		DF895C23124C25150077F6E8 /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF895C24124C25150077F6E8 /* init_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_fascin.cpp; sourceTree = "<group>"; };
-		DF895C28124C25350077F6E8 /* kernel_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel_tables.h; sourceTree = "<group>"; };
-		DF895C29124C25350077F6E8 /* script_patches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script_patches.cpp; sourceTree = "<group>"; };
-		DF895C33124C26660077F6E8 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72.png"; sourceTree = "<group>"; };
-		DF895C40124C271F0077F6E8 /* icon4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon4.png; sourceTree = "<group>"; };
-		DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprites_lol.cpp; sourceTree = "<group>"; };
-		DF89C2A30F62D79E00D756B6 /* script.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = script.cpp; sourceTree = "<group>"; };
-		DF90E9B410AEDA5300C8F93F /* detection_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = detection_tables.h; sourceTree = "<group>"; };
-		DF90E9BD10AEDA9B00C8F93F /* selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selector.cpp; sourceTree = "<group>"; };
-		DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_playtoons.cpp; sourceTree = "<group>"; };
-		DF90EAAB10B0236F00C8F93F /* staticres.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = staticres.cpp; sourceTree = "<group>"; };
-		DF90EAAC10B0236F00C8F93F /* staticres.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = staticres.h; sourceTree = "<group>"; };
-		DF9B9246118E46730069C19D /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = "<group>"; };
-		DF9B9247118E46730069C19D /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
-		DF9B924F118E46A00069C19D /* fontsjis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fontsjis.cpp; sourceTree = "<group>"; };
-		DF9B9250118E46A00069C19D /* fontsjis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fontsjis.h; sourceTree = "<group>"; };
-		DF9B9261118E46FE0069C19D /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = "<group>"; };
-		DFAAAFF50F0112AD003E9390 /* saveload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload.cpp; sourceTree = "<group>"; };
-		DFAAAFF60F0112AD003E9390 /* saveload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = saveload.h; sourceTree = "<group>"; };
-		DFAAAFF80F0112C1003E9390 /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DFAAAFFB0F0112DF003E9390 /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thumbnail_intern.cpp; sourceTree = "<group>"; };
-		DFAAD2390F50120E00C3A4E2 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DFAAD23A0F50120E00C3A4E2 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DFADEBB113820DF500C46364 /* maccursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maccursor.cpp; sourceTree = "<group>"; };
-		DFADEBB213820DF500C46364 /* maccursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maccursor.h; sourceTree = "<group>"; };
-		DFADEBB613820E0C00C46364 /* posix-fs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-fs.cpp"; sourceTree = "<group>"; };
-		DFADEC061382140300C46364 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		DFB0577311B753DA0015AE65 /* debug-channels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "debug-channels.h"; sourceTree = "<group>"; };
-		DFB0577411B753DA0015AE65 /* rational.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rational.cpp; sourceTree = "<group>"; };
-		DFB0577511B753DA0015AE65 /* rational.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rational.h; sourceTree = "<group>"; };
-		DFB0577D11B7541F0015AE65 /* resource_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_audio.cpp; sourceTree = "<group>"; };
-		DFB0577E11B7541F0015AE65 /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		DFB0577F11B7541F0015AE65 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		DFB0578811B754570015AE65 /* maciconbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = maciconbar.cpp; sourceTree = "<group>"; };
-		DFB0578911B754570015AE65 /* maciconbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maciconbar.h; sourceTree = "<group>"; };
-		DFB0578F11B7547D0015AE65 /* pict.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pict.cpp; sourceTree = "<group>"; };
-		DFB0579011B7547D0015AE65 /* pict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pict.h; sourceTree = "<group>"; };
-		DFC8301A0F48AF18005EF03C /* detection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detection.cpp; sourceTree = "<group>"; };
-		DFC8301E0F48AF18005EF03C /* gc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gc.cpp; sourceTree = "<group>"; };
-		DFC8301F0F48AF18005EF03C /* gc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gc.h; sourceTree = "<group>"; };
-		DFC830230F48AF18005EF03C /* kernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kernel.cpp; sourceTree = "<group>"; };
-		DFC830260F48AF18005EF03C /* kevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kevent.cpp; sourceTree = "<group>"; };
-		DFC830270F48AF18005EF03C /* kfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kfile.cpp; sourceTree = "<group>"; };
-		DFC830280F48AF18005EF03C /* kgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kgraphics.cpp; sourceTree = "<group>"; };
-		DFC830290F48AF18005EF03C /* klists.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = klists.cpp; sourceTree = "<group>"; };
-		DFC8302A0F48AF18005EF03C /* kmath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmath.cpp; sourceTree = "<group>"; };
-		DFC8302B0F48AF18005EF03C /* kmenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmenu.cpp; sourceTree = "<group>"; };
-		DFC8302C0F48AF18005EF03C /* kmovement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmovement.cpp; sourceTree = "<group>"; };
-		DFC8302D0F48AF18005EF03C /* kpathing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kpathing.cpp; sourceTree = "<group>"; };
-		DFC8302E0F48AF18005EF03C /* kscripts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kscripts.cpp; sourceTree = "<group>"; };
-		DFC8302F0F48AF18005EF03C /* ksound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ksound.cpp; sourceTree = "<group>"; };
-		DFC830300F48AF18005EF03C /* kstring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kstring.cpp; sourceTree = "<group>"; };
-		DFC830310F48AF18005EF03C /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
-		DFC830320F48AF18005EF03C /* message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = message.h; sourceTree = "<group>"; };
-		DFC830360F48AF18005EF03C /* savegame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savegame.cpp; sourceTree = "<group>"; };
-		DFC830390F48AF18005EF03C /* scriptdebug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scriptdebug.cpp; sourceTree = "<group>"; };
-		DFC8303A0F48AF18005EF03C /* seg_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seg_manager.cpp; sourceTree = "<group>"; };
-		DFC8303C0F48AF18005EF03C /* vm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vm.cpp; sourceTree = "<group>"; };
-		DFC830960F48AF18005EF03C /* sci.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sci.cpp; sourceTree = "<group>"; };
-		DFC830970F48AF18005EF03C /* sci.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sci.h; sourceTree = "<group>"; };
-		DFCDC6D5116629CE00A7D2A0 /* features.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features.cpp; sourceTree = "<group>"; };
-		DFCDC6D6116629CE00A7D2A0 /* features.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = features.h; sourceTree = "<group>"; };
-		DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kparse.cpp; sourceTree = "<group>"; };
-		DFCDC6D8116629CE00A7D2A0 /* selector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selector.h; sourceTree = "<group>"; };
-		DFCDC6F611662AAB00A7D2A0 /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
-		DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saveload_fascin.cpp; sourceTree = "<group>"; };
-		DFCDC70911662B6B00A7D2A0 /* macresman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macresman.cpp; sourceTree = "<group>"; };
-		DFCDC70A11662B6B00A7D2A0 /* macresman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macresman.h; sourceTree = "<group>"; };
-		DFD511460DF3383500854012 /* memorypool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memorypool.cpp; sourceTree = "<group>"; };
-		DFD511470DF3383500854012 /* memorypool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memorypool.h; sourceTree = "<group>"; };
-		DFD517E10DF33CAC00854012 /* seq.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = seq.cpp; sourceTree = "<group>"; };
-		DFD5183B0DF3411800854012 /* scaler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scaler.cpp; sourceTree = "<group>"; };
-		DFD5183C0DF3411800854012 /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler.h; sourceTree = "<group>"; };
-		DFD5189E0DF34AD700854012 /* intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intern.h; sourceTree = "<group>"; };
-		DFD518A00DF34B2500854012 /* scalebit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scalebit.cpp; sourceTree = "<group>"; };
-		DFD518A10DF34B2500854012 /* scalebit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scalebit.h; sourceTree = "<group>"; };
-		DFD518AA0DF34BA600854012 /* 2xsai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 2xsai.cpp; sourceTree = "<group>"; };
-		DFD518AB0DF34BA600854012 /* aspect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aspect.cpp; sourceTree = "<group>"; };
-		DFD518B50DF34BA600854012 /* scale2x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scale2x.cpp; sourceTree = "<group>"; };
-		DFD518B60DF34BA600854012 /* scale2x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scale2x.h; sourceTree = "<group>"; };
-		DFD518B80DF34BA600854012 /* scale3x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scale3x.cpp; sourceTree = "<group>"; };
-		DFD518B90DF34BA600854012 /* scale3x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scale3x.h; sourceTree = "<group>"; };
-		DFD6476B0F49F7EF008E18EF /* libFLAC.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libFLAC.a; path = lib/libFLAC.a; sourceTree = "<group>"; };
-		DFD6476C0F49F7EF008E18EF /* libmad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmad.a; path = lib/libmad.a; sourceTree = "<group>"; };
-		DFD6476F0F49F7EF008E18EF /* libvorbisidec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisidec.a; path = lib/libvorbisidec.a; sourceTree = "<group>"; };
-		DFE470C10D81F4BA00B6D1FB /* commandLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = commandLine.cpp; sourceTree = "<group>"; };
-		DFE470C20D81F4BA00B6D1FB /* commandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = commandLine.h; sourceTree = "<group>"; };
-		DFE470C70D81F4BA00B6D1FB /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
-		DFE470C80D81F4BA00B6D1FB /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = "<group>"; };
-		DFE470CA0D81F4BA00B6D1FB /* plugins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = plugins.cpp; sourceTree = "<group>"; };
-		DFE470CB0D81F4BA00B6D1FB /* plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plugins.h; sourceTree = "<group>"; };
-		DFE470CC0D81F4BA00B6D1FB /* version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = version.cpp; sourceTree = "<group>"; };
-		DFE470CD0D81F4BA00B6D1FB /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		DFE470D80D81F4E700B6D1FB /* default-events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "default-events.cpp"; sourceTree = "<group>"; };
-		DFE470D90D81F4E700B6D1FB /* default-events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "default-events.h"; sourceTree = "<group>"; };
-		DFE470DE0D81F4E700B6D1FB /* abstract-fs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "abstract-fs.h"; sourceTree = "<group>"; };
-		DFE470E80D81F4E700B6D1FB /* fs-factory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "fs-factory.h"; sourceTree = "<group>"; };
-		DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-fs-factory.cpp"; sourceTree = "<group>"; };
-		DFE470F70D81F4E700B6D1FB /* posix-fs-factory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-fs-factory.h"; sourceTree = "<group>"; };
-		DFE471DC0D81F4E700B6D1FB /* blit_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = blit_arm.h; sourceTree = "<group>"; };
-		DFE471DE0D81F4E700B6D1FB /* iphone_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iphone_common.h; sourceTree = "<group>"; };
-		DFE471DF0D81F4E700B6D1FB /* iphone_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iphone_keyboard.h; sourceTree = "<group>"; };
-		DFE471E10D81F4E700B6D1FB /* iphone_main.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = iphone_main.m; sourceTree = "<group>"; };
-		DFE4737F0D81F4E800B6D1FB /* dynamic-plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "dynamic-plugin.h"; sourceTree = "<group>"; };
-		DFE473810D81F4E800B6D1FB /* posix-provider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-provider.cpp"; sourceTree = "<group>"; };
-		DFE473820D81F4E800B6D1FB /* posix-provider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-provider.h"; sourceTree = "<group>"; };
-		DFE4738E0D81F4E800B6D1FB /* default-saves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "default-saves.cpp"; sourceTree = "<group>"; };
-		DFE4738F0D81F4E800B6D1FB /* default-saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "default-saves.h"; sourceTree = "<group>"; };
-		DFE473900D81F4E800B6D1FB /* savefile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savefile.cpp; sourceTree = "<group>"; };
-		DFE473930D81F4E800B6D1FB /* default-timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "default-timer.cpp"; sourceTree = "<group>"; };
-		DFE473940D81F4E800B6D1FB /* default-timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "default-timer.h"; sourceTree = "<group>"; };
-		DFE473980D81F4E800B6D1FB /* algorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = algorithm.h; sourceTree = "<group>"; };
-		DFE473990D81F4E800B6D1FB /* array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = array.h; sourceTree = "<group>"; };
-		DFE4739A0D81F4E800B6D1FB /* config-file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "config-file.cpp"; sourceTree = "<group>"; };
-		DFE4739B0D81F4E800B6D1FB /* config-file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-file.h"; sourceTree = "<group>"; };
-		DFE4739C0D81F4E800B6D1FB /* config-manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "config-manager.cpp"; sourceTree = "<group>"; };
-		DFE4739D0D81F4E800B6D1FB /* config-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-manager.h"; sourceTree = "<group>"; };
-		DFE4739E0D81F4E800B6D1FB /* endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = endian.h; sourceTree = "<group>"; };
-		DFE4739F0D81F4E800B6D1FB /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
-		DFE473A00D81F4E800B6D1FB /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events.h; sourceTree = "<group>"; };
-		DFE473A10D81F4E800B6D1FB /* file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cpp; sourceTree = "<group>"; };
-		DFE473A20D81F4E800B6D1FB /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = "<group>"; };
-		DFE473A30D81F4E800B6D1FB /* frac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frac.h; sourceTree = "<group>"; };
-		DFE473A40D81F4E800B6D1FB /* fs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fs.cpp; sourceTree = "<group>"; };
-		DFE473A50D81F4E800B6D1FB /* fs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fs.h; sourceTree = "<group>"; };
-		DFE473A60D81F4E800B6D1FB /* func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = func.h; sourceTree = "<group>"; };
-		DFE473A70D81F4E800B6D1FB /* hash-str.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "hash-str.h"; sourceTree = "<group>"; };
-		DFE473A80D81F4E800B6D1FB /* hashmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hashmap.cpp; sourceTree = "<group>"; };
-		DFE473A90D81F4E800B6D1FB /* hashmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hashmap.h; sourceTree = "<group>"; };
-		DFE473AA0D81F4E800B6D1FB /* iff_container.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iff_container.h; sourceTree = "<group>"; };
-		DFE473AB0D81F4E800B6D1FB /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboard.h; sourceTree = "<group>"; };
-		DFE473AC0D81F4E800B6D1FB /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
-		DFE473AD0D81F4E800B6D1FB /* md5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = md5.cpp; sourceTree = "<group>"; };
-		DFE473AE0D81F4E800B6D1FB /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = "<group>"; };
-		DFE473B00D81F4E800B6D1FB /* mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mutex.cpp; sourceTree = "<group>"; };
-		DFE473B10D81F4E800B6D1FB /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutex.h; sourceTree = "<group>"; };
-		DFE473B20D81F4E800B6D1FB /* noncopyable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = noncopyable.h; sourceTree = "<group>"; };
-		DFE473B30D81F4E800B6D1FB /* pack-end.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "pack-end.h"; sourceTree = "<group>"; };
-		DFE473B40D81F4E800B6D1FB /* pack-start.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "pack-start.h"; sourceTree = "<group>"; };
-		DFE473B50D81F4E800B6D1FB /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = "<group>"; };
-		DFE473B60D81F4E800B6D1FB /* savefile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savefile.h; sourceTree = "<group>"; };
-		DFE473B70D81F4E800B6D1FB /* scummsys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scummsys.h; sourceTree = "<group>"; };
-		DFE473B80D81F4E800B6D1FB /* singleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = singleton.h; sourceTree = "<group>"; };
-		DFE473B90D81F4E800B6D1FB /* stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = "<group>"; };
-		DFE473BA0D81F4E800B6D1FB /* str.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = str.cpp; sourceTree = "<group>"; };
-		DFE473BB0D81F4E800B6D1FB /* str.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = str.h; sourceTree = "<group>"; };
-		DFE473BC0D81F4E800B6D1FB /* stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stream.cpp; sourceTree = "<group>"; };
-		DFE473BD0D81F4E800B6D1FB /* stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stream.h; sourceTree = "<group>"; };
-		DFE473BE0D81F4E800B6D1FB /* system.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = system.cpp; sourceTree = "<group>"; };
-		DFE473BF0D81F4E800B6D1FB /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = "<group>"; };
-		DFE473C00D81F4E800B6D1FB /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
-		DFE473C10D81F4E800B6D1FB /* unzip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unzip.cpp; sourceTree = "<group>"; };
-		DFE473C20D81F4E800B6D1FB /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
-		DFE473C30D81F4E800B6D1FB /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		DFE473C40D81F4E800B6D1FB /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
-		DFE473C50D81F4E800B6D1FB /* zlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zlib.cpp; sourceTree = "<group>"; };
-		DFE473C60D81F4E800B6D1FB /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = "<group>"; };
-		DFE477530D81F4E900B6D1FB /* colormasks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = colormasks.h; sourceTree = "<group>"; };
-		DFE477540D81F4E900B6D1FB /* cursorman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursorman.cpp; sourceTree = "<group>"; };
-		DFE477550D81F4E900B6D1FB /* cursorman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursorman.h; sourceTree = "<group>"; };
-		DFE477580D81F4E900B6D1FB /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
-		DFE477590D81F4E900B6D1FB /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
-		DFE4775A0D81F4E900B6D1FB /* fontman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fontman.cpp; sourceTree = "<group>"; };
-		DFE4775B0D81F4E900B6D1FB /* fontman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fontman.h; sourceTree = "<group>"; };
-		DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = consolefont.cpp; sourceTree = "<group>"; };
-		DFE4775E0D81F4E900B6D1FB /* newfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = newfont.cpp; sourceTree = "<group>"; };
-		DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = newfont_big.cpp; sourceTree = "<group>"; };
-		DFE477610D81F4E900B6D1FB /* iff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iff.cpp; sourceTree = "<group>"; };
-		DFE477620D81F4E900B6D1FB /* iff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iff.h; sourceTree = "<group>"; };
-		DFE477630D81F4E900B6D1FB /* imagedec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagedec.cpp; sourceTree = "<group>"; };
-		DFE477640D81F4E900B6D1FB /* imagedec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imagedec.h; sourceTree = "<group>"; };
-		DFE4776A0D81F4E900B6D1FB /* primitives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = primitives.cpp; sourceTree = "<group>"; };
-		DFE4776B0D81F4E900B6D1FB /* primitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = primitives.h; sourceTree = "<group>"; };
-		DFE477860D81F4E900B6D1FB /* surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surface.cpp; sourceTree = "<group>"; };
-		DFE477870D81F4E900B6D1FB /* surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = "<group>"; };
-		DFE477890D81F4E900B6D1FB /* about.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = about.cpp; sourceTree = "<group>"; };
-		DFE4778A0D81F4E900B6D1FB /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = about.h; sourceTree = "<group>"; };
-		DFE4778B0D81F4E900B6D1FB /* Actions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Actions.cpp; sourceTree = "<group>"; };
-		DFE4778C0D81F4E900B6D1FB /* Actions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Actions.h; sourceTree = "<group>"; };
-		DFE4778D0D81F4E900B6D1FB /* browser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = browser.cpp; sourceTree = "<group>"; };
-		DFE4778E0D81F4E900B6D1FB /* browser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser.h; sourceTree = "<group>"; };
-		DFE4778F0D81F4E900B6D1FB /* chooser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chooser.cpp; sourceTree = "<group>"; };
-		DFE477900D81F4E900B6D1FB /* chooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chooser.h; sourceTree = "<group>"; };
-		DFE477910D81F4E900B6D1FB /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		DFE477920D81F4E900B6D1FB /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		DFE477930D81F4E900B6D1FB /* credits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = credits.h; sourceTree = "<group>"; };
-		DFE477940D81F4E900B6D1FB /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; };
-		DFE477950D81F4E900B6D1FB /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; };
-		DFE477960D81F4E900B6D1FB /* dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialog.cpp; sourceTree = "<group>"; };
-		DFE477970D81F4E900B6D1FB /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialog.h; sourceTree = "<group>"; };
-		DFE4779E0D81F4E900B6D1FB /* Key.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Key.cpp; sourceTree = "<group>"; };
-		DFE4779F0D81F4E900B6D1FB /* Key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Key.h; sourceTree = "<group>"; };
-		DFE477A20D81F4E900B6D1FB /* launcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = launcher.cpp; sourceTree = "<group>"; };
-		DFE477A30D81F4E900B6D1FB /* launcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = launcher.h; sourceTree = "<group>"; };
-		DFE477A60D81F4E900B6D1FB /* massadd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = massadd.cpp; sourceTree = "<group>"; };
-		DFE477A70D81F4E900B6D1FB /* massadd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = massadd.h; sourceTree = "<group>"; };
-		DFE477A80D81F4E900B6D1FB /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
-		DFE477A90D81F4E900B6D1FB /* message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = message.h; sourceTree = "<group>"; };
-		DFE477AD0D81F4E900B6D1FB /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; };
-		DFE477AE0D81F4E900B6D1FB /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; };
-		DFE477AF0D81F4E900B6D1FB /* options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = options.cpp; sourceTree = "<group>"; };
-		DFE477B00D81F4E900B6D1FB /* options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = options.h; sourceTree = "<group>"; };
-		DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = themebrowser.cpp; sourceTree = "<group>"; };
-		DFE477BB0D81F4E900B6D1FB /* themebrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = themebrowser.h; sourceTree = "<group>"; };
-		DFE477C40D81F4E900B6D1FB /* widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget.cpp; sourceTree = "<group>"; };
-		DFE477C50D81F4E900B6D1FB /* widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = "<group>"; };
-		DFE47C810D81F86900B6D1FB /* kyra.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = kyra.dat; sourceTree = "<group>"; };
-		DFE47C820D81F86900B6D1FB /* lure.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = lure.dat; sourceTree = "<group>"; };
-		DFE47C830D81F86900B6D1FB /* queen.tbl */ = {isa = PBXFileReference; lastKnownFileType = file; path = queen.tbl; sourceTree = "<group>"; };
-		DFE47C850D81F86900B6D1FB /* sky.cpt */ = {isa = PBXFileReference; lastKnownFileType = file; path = sky.cpt; sourceTree = "<group>"; };
-		DFE88C440F874A1100C555C5 /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
-		DFE88C450F874A1100C555C5 /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
-		DFEC5D0A1166C5CF00C90552 /* random.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = random.cpp; sourceTree = "<group>"; };
-		DFEC5D0B1166C5CF00C90552 /* random.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random.h; sourceTree = "<group>"; };
-		DFEC5D0C1166C5CF00C90552 /* str-array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "str-array.h"; sourceTree = "<group>"; };
-		DFEC5D0D1166C5CF00C90552 /* tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tokenizer.cpp; sourceTree = "<group>"; };
-		DFEC5D0E1166C5CF00C90552 /* tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tokenizer.h; sourceTree = "<group>"; };
-		DFEC5D0F1166C5CF00C90552 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
-		DFEC5D341166C67300C90552 /* savestate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = savestate.cpp; sourceTree = "<group>"; };
-		DFEC5D351166C67300C90552 /* savestate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = savestate.h; sourceTree = "<group>"; };
-		DFF4DFFC0F4B449F00C50BC7 /* Info.plist.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist.in; sourceTree = "<group>"; };
-		DFF95CCA0FB22D5700A3EC78 /* ScummVM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScummVM.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		F92B4DCB139DD428000D1BF1 /* memstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memstream.h; sourceTree = "<group>"; };
-		F92B4DCC139DD428000D1BF1 /* quicktime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quicktime.cpp; sourceTree = "<group>"; };
-		F92B4DCD139DD428000D1BF1 /* quicktime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quicktime.h; sourceTree = "<group>"; };
-		F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = yuv_to_rgb.cpp; sourceTree = "<group>"; };
-		F92B4DD2139DD449000D1BF1 /* yuv_to_rgb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = yuv_to_rgb.h; sourceTree = "<group>"; };
-		F92B4DD6139DDC7A000D1BF1 /* sdl-sys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sdl-sys.h"; sourceTree = "<group>"; };
-		F92B4DD7139DDC92000D1BF1 /* macosx-main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "macosx-main.cpp"; path = "sdl/macosx/macosx-main.cpp"; sourceTree = "<group>"; };
-		F92B4DD8139DDC92000D1BF1 /* macosx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macosx.cpp; path = sdl/macosx/macosx.cpp; sourceTree = "<group>"; };
-		F92B4DD9139DDC92000D1BF1 /* macosx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macosx.h; path = sdl/macosx/macosx.h; sourceTree = "<group>"; };
-		F9946D7A139E1A260072D195 /* cdtoons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cdtoons.cpp; sourceTree = "<group>"; };
-		F9946D7B139E1A260072D195 /* cdtoons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdtoons.h; sourceTree = "<group>"; };
-		F9946D7C139E1A260072D195 /* cinepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cinepak.cpp; sourceTree = "<group>"; };
-		F9946D7D139E1A260072D195 /* cinepak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cinepak.h; sourceTree = "<group>"; };
-		F9946D7E139E1A260072D195 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
-		F9946D7F139E1A260072D195 /* indeo3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = indeo3.cpp; sourceTree = "<group>"; };
-		F9946D80139E1A260072D195 /* indeo3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = indeo3.h; sourceTree = "<group>"; };
-		F9946D81139E1A260072D195 /* mjpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mjpeg.cpp; sourceTree = "<group>"; };
-		F9946D82139E1A260072D195 /* mjpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mjpeg.h; sourceTree = "<group>"; };
-		F9946D83139E1A260072D195 /* msrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msrle.cpp; sourceTree = "<group>"; };
-		F9946D84139E1A260072D195 /* msrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msrle.h; sourceTree = "<group>"; };
-		F9946D85139E1A260072D195 /* msvideo1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = msvideo1.cpp; sourceTree = "<group>"; };
-		F9946D86139E1A260072D195 /* msvideo1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvideo1.h; sourceTree = "<group>"; };
-		F9946D87139E1A260072D195 /* qtrle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qtrle.cpp; sourceTree = "<group>"; };
-		F9946D88139E1A260072D195 /* qtrle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qtrle.h; sourceTree = "<group>"; };
-		F9946D89139E1A260072D195 /* rpza.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rpza.cpp; sourceTree = "<group>"; };
-		F9946D8A139E1A260072D195 /* rpza.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rpza.h; sourceTree = "<group>"; };
-		F9946D8B139E1A260072D195 /* smc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = smc.cpp; sourceTree = "<group>"; };
-		F9946D8C139E1A260072D195 /* smc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smc.h; sourceTree = "<group>"; };
-		F9946D8D139E1A260072D195 /* truemotion1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = truemotion1.cpp; sourceTree = "<group>"; };
-		F9946D8E139E1A260072D195 /* truemotion1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = truemotion1.h; sourceTree = "<group>"; };
-		F9946D8F139E1A260072D195 /* truemotion1data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = truemotion1data.h; sourceTree = "<group>"; };
-		F9946D9A139E1A560072D195 /* towns_midi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_midi.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_midi.cpp; sourceTree = "<group>"; };
-		F9946D9B139E1A560072D195 /* towns_midi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = towns_midi.h; path = ../../audio/softsynth/fmtowns_pc98/towns_midi.h; sourceTree = "<group>"; };
-		F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = towns_pc98_plugins.cpp; path = ../../audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp; sourceTree = "<group>"; };
-		F9946DA3139E1A880072D195 /* freeverb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = freeverb.cpp; path = ../../audio/softsynth/mt32/freeverb.cpp; sourceTree = "<group>"; };
-		F9946DA4139E1A880072D195 /* freeverb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = freeverb.h; path = ../../audio/softsynth/mt32/freeverb.h; sourceTree = "<group>"; };
-		F9946DA5139E1A880072D195 /* i386.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = i386.cpp; path = ../../audio/softsynth/mt32/i386.cpp; sourceTree = "<group>"; };
-		F9946DA6139E1A880072D195 /* i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = i386.h; path = ../../audio/softsynth/mt32/i386.h; sourceTree = "<group>"; };
-		F9946DA7139E1A880072D195 /* mt32_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mt32_file.cpp; path = ../../audio/softsynth/mt32/mt32_file.cpp; sourceTree = "<group>"; };
-		F9946DA8139E1A880072D195 /* mt32_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mt32_file.h; path = ../../audio/softsynth/mt32/mt32_file.h; sourceTree = "<group>"; };
-		F9946DA9139E1A880072D195 /* mt32emu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mt32emu.h; path = ../../audio/softsynth/mt32/mt32emu.h; sourceTree = "<group>"; };
-		F9946DAA139E1A880072D195 /* part.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = part.cpp; path = ../../audio/softsynth/mt32/part.cpp; sourceTree = "<group>"; };
-		F9946DAB139E1A880072D195 /* part.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = part.h; path = ../../audio/softsynth/mt32/part.h; sourceTree = "<group>"; };
-		F9946DAC139E1A880072D195 /* partial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = partial.cpp; path = ../../audio/softsynth/mt32/partial.cpp; sourceTree = "<group>"; };
-		F9946DAD139E1A880072D195 /* partial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = partial.h; path = ../../audio/softsynth/mt32/partial.h; sourceTree = "<group>"; };
-		F9946DAE139E1A880072D195 /* partialManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = partialManager.cpp; path = ../../audio/softsynth/mt32/partialManager.cpp; sourceTree = "<group>"; };
-		F9946DAF139E1A880072D195 /* partialManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = partialManager.h; path = ../../audio/softsynth/mt32/partialManager.h; sourceTree = "<group>"; };
-		F9946DB0139E1A880072D195 /* structures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = structures.h; path = ../../audio/softsynth/mt32/structures.h; sourceTree = "<group>"; };
-		F9946DB1139E1A880072D195 /* synth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = synth.cpp; path = ../../audio/softsynth/mt32/synth.cpp; sourceTree = "<group>"; };
-		F9946DB2139E1A880072D195 /* synth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = synth.h; path = ../../audio/softsynth/mt32/synth.h; sourceTree = "<group>"; };
-		F9946DB3139E1A880072D195 /* tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tables.cpp; path = ../../audio/softsynth/mt32/tables.cpp; sourceTree = "<group>"; };
-		F9946DB4139E1A880072D195 /* tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tables.h; path = ../../audio/softsynth/mt32/tables.h; sourceTree = "<group>"; };
-		F9946DCE139E1AD30072D195 /* aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aac.cpp; path = ../../audio/decoders/aac.cpp; sourceTree = "<group>"; };
-		F9946DCF139E1AD30072D195 /* aac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aac.h; path = ../../audio/decoders/aac.h; sourceTree = "<group>"; };
-		F9946DD0139E1AD30072D195 /* qdm2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qdm2.cpp; path = ../../audio/decoders/qdm2.cpp; sourceTree = "<group>"; };
-		F9946DD1139E1AD30072D195 /* qdm2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qdm2.h; path = ../../audio/decoders/qdm2.h; sourceTree = "<group>"; };
-		F9946DD2139E1AD30072D195 /* qdm2data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qdm2data.h; path = ../../audio/decoders/qdm2data.h; sourceTree = "<group>"; };
-		F9946DD3139E1AD30072D195 /* quicktime_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quicktime_intern.h; path = ../../audio/decoders/quicktime_intern.h; sourceTree = "<group>"; };
-		F9946DD4139E1AD30072D195 /* quicktime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = quicktime.cpp; path = ../../audio/decoders/quicktime.cpp; sourceTree = "<group>"; };
-		F9946DD5139E1AD30072D195 /* quicktime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quicktime.h; path = ../../audio/decoders/quicktime.h; sourceTree = "<group>"; };
-		F9946DE0139E1B180072D195 /* posix-main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-main.cpp"; sourceTree = "<group>"; };
-		F9946DE1139E1B180072D195 /* posix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = posix.cpp; sourceTree = "<group>"; };
-		F9946DE2139E1B180072D195 /* posix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = posix.h; sourceTree = "<group>"; };
-		F9946DE9139E1B6F0072D195 /* aspect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aspect.h; sourceTree = "<group>"; };
-		F9946DEA139E1B6F0072D195 /* downscaler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downscaler.cpp; sourceTree = "<group>"; };
-		F9946DEB139E1B6F0072D195 /* downscaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = downscaler.h; sourceTree = "<group>"; };
-		F9946DEF139E1BA00072D195 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = "<group>"; };
-		F9946DF0139E1BA00072D195 /* console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
-		F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "sdl-mixer.cpp"; sourceTree = "<group>"; };
-		F9946DF6139E1BBF0072D195 /* sdl-mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sdl-mixer.h"; sourceTree = "<group>"; };
-		F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "doublebuffersdl-mixer.cpp"; sourceTree = "<group>"; };
-		F9946DFD139E1BEB0072D195 /* doublebuffersdl-mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "doublebuffersdl-mixer.h"; sourceTree = "<group>"; };
-		F9946E02139E1C390072D195 /* sdl-graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "sdl-graphics.cpp"; sourceTree = "<group>"; };
-		F9946E03139E1C390072D195 /* sdl-graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sdl-graphics.h"; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DF842A1A0E7BB34E00F5680E /* CoreAudio.framework in Frameworks */,
-				DF842A1B0E7BB34E00F5680E /* CoreFoundation.framework in Frameworks */,
-				DF842A1C0E7BB34E00F5680E /* Foundation.framework in Frameworks */,
-				DF842A1D0E7BB34E00F5680E /* UIKit.framework in Frameworks */,
-				DF842A280E7BB37500F5680E /* AudioToolbox.framework in Frameworks */,
-				DF842A2F0E7BB39E00F5680E /* QuartzCore.framework in Frameworks */,
-				DFF959050FB22D3000A3EC78 /* libmad.a in Frameworks */,
-				DFF959060FB22D3100A3EC78 /* libFLAC.a in Frameworks */,
-				DFF959080FB22D3300A3EC78 /* libvorbisidec.a in Frameworks */,
-				DF224E040FB23BC500C8E453 /* OpenGLES.framework in Frameworks */,
-				DFADEC071382140300C46364 /* libz.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DF0942180F63CB26002D821E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DF0943730F63D1DA002D821E /* CoreFoundation.framework in Frameworks */,
-				DF0943740F63D1DD002D821E /* Foundation.framework in Frameworks */,
-				DF0943750F63D1DE002D821E /* AudioToolbox.framework in Frameworks */,
-				DF0944180F63FA8F002D821E /* QuickTime.framework in Frameworks */,
-				DF0944250F63FB2C002D821E /* CoreMIDI.framework in Frameworks */,
-				DF0944290F63FB60002D821E /* CoreAudio.framework in Frameworks */,
-				DF09442B0F63FB75002D821E /* QuartzCore.framework in Frameworks */,
-				DF0944380F63FBFE002D821E /* Carbon.framework in Frameworks */,
-				DF09446F0F63FCCB002D821E /* ApplicationServices.framework in Frameworks */,
-				DF0944700F63FCCB002D821E /* IOKit.framework in Frameworks */,
-				DF0944780F63FD10002D821E /* Cocoa.framework in Frameworks */,
-				DF0944800F63FD67002D821E /* AudioUnit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DFF95CBB0FB22D5700A3EC78 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DFF95CBC0FB22D5700A3EC78 /* CoreAudio.framework in Frameworks */,
-				DFF95CBD0FB22D5700A3EC78 /* CoreFoundation.framework in Frameworks */,
-				DFF95CBE0FB22D5700A3EC78 /* Foundation.framework in Frameworks */,
-				DFF95CBF0FB22D5700A3EC78 /* UIKit.framework in Frameworks */,
-				DFF95CC00FB22D5700A3EC78 /* AudioToolbox.framework in Frameworks */,
-				DFF95CC10FB22D5700A3EC78 /* QuartzCore.framework in Frameworks */,
-				DF224E050FB23BC500C8E453 /* OpenGLES.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				DF224E020FB23BC500C8E453 /* OpenGLES.framework */,
-				DF09447F0F63FD67002D821E /* AudioUnit.framework */,
-				DF0944770F63FD10002D821E /* Cocoa.framework */,
-				DF09446D0F63FCCB002D821E /* ApplicationServices.framework */,
-				DF09446E0F63FCCB002D821E /* IOKit.framework */,
-				DF0944370F63FBFE002D821E /* Carbon.framework */,
-				DF0944240F63FB2C002D821E /* CoreMIDI.framework */,
-				DF0944170F63FA8F002D821E /* QuickTime.framework */,
-				DF842A2E0E7BB39E00F5680E /* QuartzCore.framework */,
-				DF842A270E7BB37500F5680E /* AudioToolbox.framework */,
-				DF842A160E7BB34E00F5680E /* CoreAudio.framework */,
-				DF842A170E7BB34E00F5680E /* CoreFoundation.framework */,
-				DF842A180E7BB34E00F5680E /* Foundation.framework */,
-				DF842A190E7BB34E00F5680E /* UIKit.framework */,
-				DFADEC061382140300C46364 /* libz.dylib */,
-			);
-			name = "Linked Frameworks";
-			sourceTree = "<group>";
-		};
-		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = "Other Frameworks";
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1D6058910D05DD3D006BFB54 /* ScummVM.app */,
-				DF09422A0F63CB26002D821E /* ScummVM.app */,
-				DFF95CCA0FB22D5700A3EC78 /* ScummVM.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-			isa = PBXGroup;
-			children = (
-				DF2040461380C9ED0056300A /* audio */,
-				DF203F521380C2470056300A /* video */,
-				DF9B9277118E475D0069C19D /* games */,
-				DFD6476A0F49F7D2008E18EF /* libs */,
-				DF841FF50E7BA6A600F5680E /* engines */,
-				DFE470D50D81F4E700B6D1FB /* backends */,
-				DFE470C00D81F4BA00B6D1FB /* base */,
-				DFE473950D81F4E800B6D1FB /* common */,
-				DFE477520D81F4E900B6D1FB /* graphics */,
-				DFE477880D81F4E900B6D1FB /* gui */,
-				29B97317FDCFA39411CA2CEA /* Resources */,
-				DFA2A57A118E433A00344DFD /* Resources-iPad */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = CustomTemplate;
-			sourceTree = "<group>";
-		};
-		29B97317FDCFA39411CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				8CB5A9D21253FD9100CB6BC7 /* engine-data */,
-				DF895C40124C271F0077F6E8 /* icon4.png */,
-				DF895C33124C26660077F6E8 /* icon-72.png */,
-				DF0944B00F6430ED002D821E /* scummvm.icns */,
-				DFF4DFFC0F4B449F00C50BC7 /* Info.plist.in */,
-				DF2FFD290F48717F0006E566 /* Default.png */,
-				DF2FFD2A0F48717F0006E566 /* icon.png */,
-				8D1107310486CEB800E47090 /* Info.plist */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		8CB5A9D21253FD9100CB6BC7 /* engine-data */ = {
-			isa = PBXGroup;
-			children = (
-				8CB5A9D51253FDF400CB6BC7 /* drascula.dat */,
-				8CB5A9D61253FDF500CB6BC7 /* hugo.dat */,
-				DFE47C810D81F86900B6D1FB /* kyra.dat */,
-				DFE47C820D81F86900B6D1FB /* lure.dat */,
-				8CB5A9D71253FDF500CB6BC7 /* m4.dat */,
-				DFE47C830D81F86900B6D1FB /* queen.tbl */,
-				DFE47C850D81F86900B6D1FB /* sky.cpt */,
-				8CB5A9D81253FDF500CB6BC7 /* teenagent.dat */,
-				8CD1ED871262030100FA198C /* toon.dat */,
-			);
-			name = "engine-data";
-			path = "../engine-data";
-			sourceTree = "<group>";
-		};
-		8CD1ECC5126202AA00FA198C /* hugo */ = {
-			isa = PBXGroup;
-			children = (
-				DF203FC01380C3BC0056300A /* console.cpp */,
-				DF203FC11380C3BC0056300A /* console.h */,
-				DF203FC21380C3BC0056300A /* dialogs.cpp */,
-				DF203FC31380C3BC0056300A /* dialogs.h */,
-				DF203FC41380C3BC0056300A /* file_v1d.cpp */,
-				DF203FC51380C3BC0056300A /* file_v1w.cpp */,
-				DF203FC61380C3BC0056300A /* file_v2d.cpp */,
-				DF203FC71380C3BC0056300A /* file_v2w.cpp */,
-				DF203FC81380C3BC0056300A /* file_v3d.cpp */,
-				DF203FC91380C3BC0056300A /* object_v1d.cpp */,
-				DF203FCA1380C3BC0056300A /* object_v1w.cpp */,
-				DF203FCB1380C3BC0056300A /* object_v2d.cpp */,
-				DF203FCC1380C3BC0056300A /* object_v3d.cpp */,
-				DF203FCD1380C3BC0056300A /* object.cpp */,
-				DF203FCE1380C3BC0056300A /* object.h */,
-				DF203FCF1380C3BC0056300A /* parser_v1d.cpp */,
-				DF203FD01380C3BC0056300A /* parser_v1w.cpp */,
-				DF203FD11380C3BC0056300A /* parser_v2d.cpp */,
-				DF203FD21380C3BC0056300A /* parser_v3d.cpp */,
-				DF203FD31380C3BC0056300A /* text.cpp */,
-				DF203FD41380C3BC0056300A /* text.h */,
-				8CD1ECC6126202AA00FA198C /* detection.cpp */,
-				8CD1ECC7126202AA00FA198C /* display.cpp */,
-				8CD1ECC8126202AA00FA198C /* display.h */,
-				8CD1ECCB126202AA00FA198C /* file.cpp */,
-				8CD1ECCC126202AA00FA198C /* file.h */,
-				8CD1ECCD126202AA00FA198C /* game.h */,
-				8CD1ECCF126202AA00FA198C /* hugo.cpp */,
-				8CD1ECD0126202AA00FA198C /* hugo.h */,
-				8CD1ECD1126202AA00FA198C /* intro.cpp */,
-				8CD1ECD2126202AA00FA198C /* intro.h */,
-				8CD1ECD3126202AA00FA198C /* inventory.cpp */,
-				8CD1ECD4126202AA00FA198C /* inventory.h */,
-				8CD1ECD7126202AA00FA198C /* mouse.cpp */,
-				8CD1ECD8126202AA00FA198C /* mouse.h */,
-				8CD1ECD9126202AA00FA198C /* parser.cpp */,
-				8CD1ECDA126202AA00FA198C /* parser.h */,
-				8CD1ECDB126202AA00FA198C /* route.cpp */,
-				8CD1ECDC126202AA00FA198C /* route.h */,
-				8CD1ECDD126202AA00FA198C /* schedule.cpp */,
-				8CD1ECDE126202AA00FA198C /* schedule.h */,
-				8CD1ECDF126202AA00FA198C /* sound.cpp */,
-				8CD1ECE0126202AA00FA198C /* sound.h */,
-				8CD1ECE1126202AA00FA198C /* util.cpp */,
-				8CD1ECE2126202AA00FA198C /* util.h */,
-			);
-			path = hugo;
-			sourceTree = "<group>";
-		};
-		8CD1ECE3126202AA00FA198C /* toon */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DEF139E1BA00072D195 /* console.cpp */,
-				F9946DF0139E1BA00072D195 /* console.h */,
-				8CD1ECE4126202AA00FA198C /* anim.cpp */,
-				8CD1ECE5126202AA00FA198C /* anim.h */,
-				8CD1ECE6126202AA00FA198C /* audio.cpp */,
-				8CD1ECE7126202AA00FA198C /* audio.h */,
-				8CD1ECE8126202AA00FA198C /* character.cpp */,
-				8CD1ECE9126202AA00FA198C /* character.h */,
-				8CD1ECEA126202AA00FA198C /* conversation.cpp */,
-				8CD1ECEB126202AA00FA198C /* conversation.h */,
-				8CD1ECEC126202AA00FA198C /* detection.cpp */,
-				8CD1ECED126202AA00FA198C /* drew.cpp */,
-				8CD1ECEE126202AA00FA198C /* drew.h */,
-				8CD1ECEF126202AA00FA198C /* flux.cpp */,
-				8CD1ECF0126202AA00FA198C /* flux.h */,
-				8CD1ECF1126202AA00FA198C /* font.cpp */,
-				8CD1ECF2126202AA00FA198C /* font.h */,
-				8CD1ECF3126202AA00FA198C /* hotspot.cpp */,
-				8CD1ECF4126202AA00FA198C /* hotspot.h */,
-				8CD1ECF7126202AA00FA198C /* movie.cpp */,
-				8CD1ECF8126202AA00FA198C /* movie.h */,
-				8CD1ECF9126202AA00FA198C /* path.cpp */,
-				8CD1ECFA126202AA00FA198C /* path.h */,
-				8CD1ECFB126202AA00FA198C /* picture.cpp */,
-				8CD1ECFC126202AA00FA198C /* picture.h */,
-				8CD1ECFD126202AA00FA198C /* resource.cpp */,
-				8CD1ECFE126202AA00FA198C /* resource.h */,
-				8CD1ECFF126202AA00FA198C /* script.cpp */,
-				8CD1ED00126202AA00FA198C /* script.h */,
-				8CD1ED01126202AA00FA198C /* script_func.cpp */,
-				8CD1ED02126202AA00FA198C /* script_func.h */,
-				8CD1ED03126202AA00FA198C /* state.cpp */,
-				8CD1ED04126202AA00FA198C /* state.h */,
-				8CD1ED05126202AA00FA198C /* text.cpp */,
-				8CD1ED06126202AA00FA198C /* text.h */,
-				8CD1ED07126202AA00FA198C /* tools.cpp */,
-				8CD1ED08126202AA00FA198C /* tools.h */,
-				8CD1ED09126202AA00FA198C /* toon.cpp */,
-				8CD1ED0A126202AA00FA198C /* toon.h */,
-			);
-			path = toon;
-			sourceTree = "<group>";
-		};
-		8CD80CBE1262729F001C6C87 /* teenagent */ = {
-			isa = PBXGroup;
-			children = (
-				8CD80CBF1262729F001C6C87 /* actor.cpp */,
-				8CD80CC01262729F001C6C87 /* actor.h */,
-				8CD80CC11262729F001C6C87 /* animation.cpp */,
-				8CD80CC21262729F001C6C87 /* animation.h */,
-				8CD80CC31262729F001C6C87 /* callbacks.cpp */,
-				8CD80CC41262729F001C6C87 /* console.cpp */,
-				8CD80CC51262729F001C6C87 /* console.h */,
-				8CD80CC61262729F001C6C87 /* detection.cpp */,
-				8CD80CC71262729F001C6C87 /* dialog.cpp */,
-				8CD80CC81262729F001C6C87 /* dialog.h */,
-				8CD80CC91262729F001C6C87 /* font.cpp */,
-				8CD80CCA1262729F001C6C87 /* font.h */,
-				8CD80CCB1262729F001C6C87 /* inventory.cpp */,
-				8CD80CCC1262729F001C6C87 /* inventory.h */,
-				8CD80CCE1262729F001C6C87 /* music.cpp */,
-				8CD80CCF1262729F001C6C87 /* music.h */,
-				8CD80CD01262729F001C6C87 /* objects.cpp */,
-				8CD80CD11262729F001C6C87 /* objects.h */,
-				8CD80CD21262729F001C6C87 /* pack.cpp */,
-				8CD80CD3126272A0001C6C87 /* pack.h */,
-				8CD80CD4126272A0001C6C87 /* resources.cpp */,
-				8CD80CD5126272A0001C6C87 /* resources.h */,
-				8CD80CD6126272A0001C6C87 /* scene.cpp */,
-				8CD80CD7126272A0001C6C87 /* scene.h */,
-				8CD80CD8126272A0001C6C87 /* segment.cpp */,
-				8CD80CD9126272A0001C6C87 /* segment.h */,
-				8CD80CDA126272A0001C6C87 /* surface.cpp */,
-				8CD80CDB126272A0001C6C87 /* surface.h */,
-				8CD80CDC126272A0001C6C87 /* surface_list.cpp */,
-				8CD80CDD126272A0001C6C87 /* surface_list.h */,
-				8CD80CDE126272A0001C6C87 /* teenagent.cpp */,
-				8CD80CDF126272A0001C6C87 /* teenagent.h */,
-			);
-			path = teenagent;
-			sourceTree = "<group>";
-		};
-		DF09422F0F63CB9A002D821E /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DDF139E1B180072D195 /* posix */,
-				F92B4DD6139DDC7A000D1BF1 /* sdl-sys.h */,
-				DF6118CB0FE3AAFD0042AD3F /* hardwarekeys.cpp */,
-				DF0942390F63CB9A002D821E /* main.cpp */,
-				DF09423C0F63CB9A002D821E /* sdl.cpp */,
-				DF09423D0F63CB9A002D821E /* sdl.h */,
-			);
-			path = sdl;
-			sourceTree = "<group>";
-		};
-		DF09CC060FAC4E1900A5AFD7 /* demos */ = {
-			isa = PBXGroup;
-			children = (
-				DF09CC070FAC4E1900A5AFD7 /* batplayer.cpp */,
-				DF09CC080FAC4E1900A5AFD7 /* batplayer.h */,
-				DF09CC090FAC4E1900A5AFD7 /* demoplayer.cpp */,
-				DF09CC0A0FAC4E1900A5AFD7 /* demoplayer.h */,
-				DF09CC0B0FAC4E1900A5AFD7 /* scnplayer.cpp */,
-				DF09CC0C0FAC4E1900A5AFD7 /* scnplayer.h */,
-			);
-			path = demos;
-			sourceTree = "<group>";
-		};
-		DF203F521380C2470056300A /* video */ = {
-			isa = PBXGroup;
-			children = (
-				DF203F7B1380C27A0056300A /* codecs */,
-				DF203F531380C2740056300A /* avi_decoder.cpp */,
-				DF203F541380C2740056300A /* avi_decoder.h */,
-				DF203F551380C2740056300A /* coktel_decoder.cpp */,
-				DF203F561380C2740056300A /* coktel_decoder.h */,
-				DF203F571380C2740056300A /* dxa_decoder.cpp */,
-				DF203F581380C2740056300A /* dxa_decoder.h */,
-				DF203F591380C2740056300A /* flic_decoder.cpp */,
-				DF203F5A1380C2740056300A /* flic_decoder.h */,
-				DF203F5D1380C2740056300A /* qt_decoder.cpp */,
-				DF203F5E1380C2750056300A /* qt_decoder.h */,
-				DF203F5F1380C2750056300A /* smk_decoder.cpp */,
-				DF203F601380C2750056300A /* smk_decoder.h */,
-				DF203F611380C2750056300A /* video_decoder.cpp */,
-				DF203F621380C2750056300A /* video_decoder.h */,
-			);
-			name = video;
-			sourceTree = "<group>";
-		};
-		DF203F7B1380C27A0056300A /* codecs */ = {
-			isa = PBXGroup;
-			children = (
-				DF203F7C1380C2920056300A /* cdtoons.cpp */,
-				DF203F7D1380C2920056300A /* cdtoons.h */,
-				DF203F7E1380C2920056300A /* cinepak.cpp */,
-				DF203F7F1380C2920056300A /* cinepak.h */,
-				DF203F801380C2920056300A /* codec.h */,
-				DF203F811380C2920056300A /* indeo3.cpp */,
-				DF203F821380C2920056300A /* indeo3.h */,
-				DF203F831380C2920056300A /* mjpeg.cpp */,
-				DF203F841380C2920056300A /* mjpeg.h */,
-				DF203F851380C2920056300A /* msrle.cpp */,
-				DF203F861380C2920056300A /* msrle.h */,
-				DF203F871380C2920056300A /* msvideo1.cpp */,
-				DF203F881380C2920056300A /* msvideo1.h */,
-				DF203F8C1380C2920056300A /* qtrle.cpp */,
-				DF203F8D1380C2920056300A /* qtrle.h */,
-				DF203F8E1380C2920056300A /* rpza.cpp */,
-				DF203F8F1380C2920056300A /* rpza.h */,
-				DF203F901380C2920056300A /* smc.cpp */,
-				DF203F911380C2920056300A /* smc.h */,
-				DF203F921380C2920056300A /* truemotion1.cpp */,
-				DF203F931380C2920056300A /* truemotion1.h */,
-				DF203F941380C2920056300A /* truemotion1data.h */,
-			);
-			name = codecs;
-			sourceTree = "<group>";
-		};
-		DF2040211380C8A60056300A /* widgets */ = {
-			isa = PBXGroup;
-			children = (
-				DF2040221380C8B70056300A /* editable.cpp */,
-				DF2040231380C8B70056300A /* editable.h */,
-				DF2040241380C8B70056300A /* edittext.cpp */,
-				DF2040251380C8B70056300A /* edittext.h */,
-				DF2040261380C8B70056300A /* list.cpp */,
-				DF2040271380C8B70056300A /* list.h */,
-				DF2040281380C8B70056300A /* popup.cpp */,
-				DF2040291380C8B70056300A /* popup.h */,
-				DF20402A1380C8B70056300A /* scrollbar.cpp */,
-				DF20402B1380C8B70056300A /* scrollbar.h */,
-				DF20402C1380C8B70056300A /* tab.cpp */,
-				DF20402D1380C8B70056300A /* tab.h */,
-			);
-			name = widgets;
-			sourceTree = "<group>";
-		};
-		DF2040461380C9ED0056300A /* audio */ = {
-			isa = PBXGroup;
-			children = (
-				F9946D79139E1A260072D195 /* codecs */,
-				DF46B8991381F6C400D08723 /* null.cpp */,
-				DF46B89A1381F6C400D08723 /* null.h */,
-				DF2040E41380CA8C0056300A /* softsynth */,
-				DF2040BB1380CA5C0056300A /* mods */,
-				DF2040821380CA280056300A /* decoders */,
-				DF2040471380CA230056300A /* audiostream.cpp */,
-				DF2040481380CA230056300A /* audiostream.h */,
-				DF2040491380CA230056300A /* fmopl.cpp */,
-				DF20404A1380CA230056300A /* fmopl.h */,
-				DF20404B1380CA230056300A /* mididrv.cpp */,
-				DF20404C1380CA230056300A /* mididrv.h */,
-				DF20404D1380CA230056300A /* midiparser_smf.cpp */,
-				DF20404E1380CA230056300A /* midiparser_xmidi.cpp */,
-				DF20404F1380CA230056300A /* midiparser.cpp */,
-				DF2040501380CA230056300A /* midiparser.h */,
-				DF2040511380CA230056300A /* midiplayer.cpp */,
-				DF2040521380CA230056300A /* midiplayer.h */,
-				DF2040531380CA230056300A /* mixer_intern.h */,
-				DF2040541380CA230056300A /* mixer.cpp */,
-				DF2040551380CA230056300A /* mixer.h */,
-				DF2040561380CA230056300A /* mpu401.cpp */,
-				DF2040571380CA230056300A /* mpu401.h */,
-				DF2040581380CA230056300A /* musicplugin.cpp */,
-				DF2040591380CA230056300A /* musicplugin.h */,
-				DF20405A1380CA230056300A /* rate.cpp */,
-				DF20405B1380CA230056300A /* rate.h */,
-				DF20405C1380CA230056300A /* timestamp.cpp */,
-				DF20405D1380CA230056300A /* timestamp.h */,
-			);
-			name = audio;
-			sourceTree = "<group>";
-		};
-		DF2040821380CA280056300A /* decoders */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DCE139E1AD30072D195 /* aac.cpp */,
-				F9946DCF139E1AD30072D195 /* aac.h */,
-				F9946DD0139E1AD30072D195 /* qdm2.cpp */,
-				F9946DD1139E1AD30072D195 /* qdm2.h */,
-				F9946DD2139E1AD30072D195 /* qdm2data.h */,
-				F9946DD3139E1AD30072D195 /* quicktime_intern.h */,
-				F9946DD4139E1AD30072D195 /* quicktime.cpp */,
-				F9946DD5139E1AD30072D195 /* quicktime.h */,
-				DF2040831380CA400056300A /* adpcm_intern.h */,
-				DF2040841380CA400056300A /* adpcm.cpp */,
-				DF2040851380CA400056300A /* adpcm.h */,
-				DF2040861380CA400056300A /* aiff.cpp */,
-				DF2040871380CA400056300A /* aiff.h */,
-				DF2040881380CA400056300A /* flac.cpp */,
-				DF2040891380CA400056300A /* flac.h */,
-				DF20408A1380CA400056300A /* iff_sound.cpp */,
-				DF20408B1380CA400056300A /* iff_sound.h */,
-				DF20408C1380CA400056300A /* mac_snd.cpp */,
-				DF20408D1380CA400056300A /* mac_snd.h */,
-				DF20408E1380CA400056300A /* mp3.cpp */,
-				DF20408F1380CA400056300A /* mp3.h */,
-				DF2040901380CA400056300A /* raw.cpp */,
-				DF2040911380CA400056300A /* raw.h */,
-				DF2040921380CA400056300A /* vag.cpp */,
-				DF2040931380CA400056300A /* vag.h */,
-				DF2040941380CA400056300A /* voc.cpp */,
-				DF2040951380CA400056300A /* voc.h */,
-				DF2040961380CA400056300A /* vorbis.cpp */,
-				DF2040971380CA400056300A /* vorbis.h */,
-				DF2040981380CA400056300A /* wave.cpp */,
-				DF2040991380CA400056300A /* wave.h */,
-			);
-			name = decoders;
-			sourceTree = "<group>";
-		};
-		DF2040BB1380CA5C0056300A /* mods */ = {
-			isa = PBXGroup;
-			children = (
-				DF2040BC1380CA810056300A /* infogrames.cpp */,
-				DF2040BD1380CA810056300A /* infogrames.h */,
-				DF2040BE1380CA810056300A /* maxtrax.cpp */,
-				DF2040BF1380CA810056300A /* maxtrax.h */,
-				DF2040C01380CA810056300A /* module.cpp */,
-				DF2040C11380CA810056300A /* module.h */,
-				DF2040C21380CA810056300A /* paula.cpp */,
-				DF2040C31380CA810056300A /* paula.h */,
-				DF2040C41380CA810056300A /* protracker.cpp */,
-				DF2040C51380CA810056300A /* protracker.h */,
-				DF2040C61380CA810056300A /* rjp1.cpp */,
-				DF2040C71380CA810056300A /* rjp1.h */,
-				DF2040C81380CA810056300A /* soundfx.cpp */,
-				DF2040C91380CA810056300A /* soundfx.h */,
-				DF2040CA1380CA810056300A /* tfmx.cpp */,
-				DF2040CB1380CA810056300A /* tfmx.h */,
-			);
-			name = mods;
-			sourceTree = "<group>";
-		};
-		DF2040E41380CA8C0056300A /* softsynth */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DCD139E1A9A0072D195 /* mt32 */,
-				DF46B8591381F43100D08723 /* opl */,
-				DF46B6F61381E1D100D08723 /* fmtowns_pc98 */,
-				DF2040E51380CAA40056300A /* adlib.cpp */,
-				DF2040E61380CAA40056300A /* appleiigs.cpp */,
-				DF2040E71380CAA40056300A /* cms.cpp */,
-				DF2040E81380CAA40056300A /* cms.h */,
-				DF2040E91380CAA40056300A /* eas.cpp */,
-				DF2040EA1380CAA40056300A /* emumidi.h */,
-				DF2040EB1380CAA40056300A /* fluidsynth.cpp */,
-				DF2040EC1380CAA40056300A /* mt32.cpp */,
-				DF2040ED1380CAA40056300A /* pcspk.cpp */,
-				DF2040EE1380CAA40056300A /* pcspk.h */,
-				DF2040EF1380CAA40056300A /* sid.cpp */,
-				DF2040F01380CAA40056300A /* sid.h */,
-				DF2040F11380CAA40056300A /* wave6581.cpp */,
-			);
-			name = softsynth;
-			sourceTree = "<group>";
-		};
-		DF2FFBF50F4860A60006E566 /* posix */ = {
-			isa = PBXGroup;
-			children = (
-				DF2FFBF80F4860A60006E566 /* posix-saves.cpp */,
-				DF2FFBF90F4860A60006E566 /* posix-saves.h */,
-			);
-			path = posix;
-			sourceTree = "<group>";
-		};
-		DF2FFCBC0F4870690006E566 /* groovie */ = {
-			isa = PBXGroup;
-			children = (
-				DF2FFCBD0F4870690006E566 /* cell.cpp */,
-				DF2FFCBE0F4870690006E566 /* cell.h */,
-				DF2FFCBF0F4870690006E566 /* cursor.cpp */,
-				DF2FFCC00F4870690006E566 /* cursor.h */,
-				DF2FFCC10F4870690006E566 /* debug.cpp */,
-				DF2FFCC20F4870690006E566 /* debug.h */,
-				DF2FFCC30F4870690006E566 /* detection.cpp */,
-				DF2FFCC40F4870690006E566 /* font.cpp */,
-				DF2FFCC50F4870690006E566 /* font.h */,
-				DF2FFCC60F4870690006E566 /* graphics.cpp */,
-				DF2FFCC70F4870690006E566 /* graphics.h */,
-				DF2FFCC80F4870690006E566 /* groovie.cpp */,
-				DF2FFCC90F4870690006E566 /* groovie.h */,
-				DF2FFCCA0F4870690006E566 /* lzss.cpp */,
-				DF2FFCCB0F4870690006E566 /* lzss.h */,
-				DF2FFCCD0F4870690006E566 /* music.cpp */,
-				DF2FFCCE0F4870690006E566 /* music.h */,
-				DF2FFCCF0F4870690006E566 /* player.cpp */,
-				DF2FFCD00F4870690006E566 /* player.h */,
-				DF2FFCD10F4870690006E566 /* resource.cpp */,
-				DF2FFCD20F4870690006E566 /* resource.h */,
-				DF2FFCD30F4870690006E566 /* roq.cpp */,
-				DF2FFCD40F4870690006E566 /* roq.h */,
-				DF2FFCD50F4870690006E566 /* saveload.cpp */,
-				DF2FFCD60F4870690006E566 /* saveload.h */,
-				DF2FFCD70F4870690006E566 /* script.cpp */,
-				DF2FFCD80F4870690006E566 /* script.h */,
-				DF2FFCD90F4870690006E566 /* vdx.cpp */,
-				DF2FFCDA0F4870690006E566 /* vdx.h */,
-			);
-			path = groovie;
-			sourceTree = "<group>";
-		};
-		DF2FFD040F4870E50006E566 /* tucker */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7D41381E7C600D08723 /* console.cpp */,
-				DF46B7D51381E7C600D08723 /* console.h */,
-				DF2FFD050F4870E50006E566 /* detection.cpp */,
-				DF2FFD060F4870E50006E566 /* graphics.cpp */,
-				DF2FFD070F4870E50006E566 /* graphics.h */,
-				DF2FFD080F4870E50006E566 /* locations.cpp */,
-				DF2FFD0A0F4870E50006E566 /* resource.cpp */,
-				DF2FFD0B0F4870E50006E566 /* saveload.cpp */,
-				DF2FFD0C0F4870E50006E566 /* sequences.cpp */,
-				DF2FFD0D0F4870E50006E566 /* staticres.cpp */,
-				DF2FFD0E0F4870E50006E566 /* tucker.cpp */,
-				DF2FFD0F0F4870E50006E566 /* tucker.h */,
-			);
-			path = tucker;
-			sourceTree = "<group>";
-		};
-		DF45B175116628A5009B85CC /* graphics */ = {
-			isa = PBXGroup;
-			children = (
-				DF45B176116628A5009B85CC /* animate.cpp */,
-				DF45B177116628A5009B85CC /* animate.h */,
-				DF45B178116628A5009B85CC /* cache.cpp */,
-				DF45B179116628A5009B85CC /* cache.h */,
-				DF45B17A116628A5009B85CC /* compare.cpp */,
-				DF45B17B116628A5009B85CC /* compare.h */,
-				DF45B17C116628A5009B85CC /* controls.cpp */,
-				DF45B17D116628A5009B85CC /* controls.h */,
-				DF45B17E116628A5009B85CC /* coordadjuster.cpp */,
-				DF45B17F116628A5009B85CC /* coordadjuster.h */,
-				DF45B180116628A5009B85CC /* cursor.cpp */,
-				DF45B181116628A5009B85CC /* cursor.h */,
-				DF45B182116628A5009B85CC /* font.cpp */,
-				DF45B183116628A5009B85CC /* font.h */,
-				DF9B924F118E46A00069C19D /* fontsjis.cpp */,
-				DF9B9250118E46A00069C19D /* fontsjis.h */,
-				DF7F285C11FF23B700159131 /* frameout.cpp */,
-				DF45B185116628A5009B85CC /* frameout.h */,
-				DF45B18A116628A5009B85CC /* helpers.h */,
-				DFB0578811B754570015AE65 /* maciconbar.cpp */,
-				DFB0578911B754570015AE65 /* maciconbar.h */,
-				DF45B18B116628A5009B85CC /* menu.cpp */,
-				DF45B18C116628A5009B85CC /* menu.h */,
-				DF45B18D116628A5009B85CC /* paint.cpp */,
-				DF45B18E116628A5009B85CC /* paint.h */,
-				DF45B18F116628A5009B85CC /* paint16.cpp */,
-				DF45B190116628A5009B85CC /* paint16.h */,
-				DF45B191116628A5009B85CC /* paint32.cpp */,
-				DF45B192116628A5009B85CC /* paint32.h */,
-				DF45B193116628A5009B85CC /* palette.cpp */,
-				DF45B194116628A5009B85CC /* palette.h */,
-				DF45B195116628A5009B85CC /* picture.cpp */,
-				DF45B196116628A5009B85CC /* picture.h */,
-				DF45B197116628A5009B85CC /* portrait.cpp */,
-				DF45B198116628A5009B85CC /* portrait.h */,
-				DF45B199116628A5009B85CC /* ports.cpp */,
-				DF45B19A116628A5009B85CC /* ports.h */,
-				DF45B19B116628A5009B85CC /* robot.cpp */,
-				DF45B19C116628A5009B85CC /* robot.h */,
-				DF45B19D116628A5009B85CC /* screen.cpp */,
-				DF45B19E116628A5009B85CC /* screen.h */,
-				DF45B19F116628A5009B85CC /* text16.cpp */,
-				DF45B1A0116628A5009B85CC /* text16.h */,
-				DF45B1A1116628A5009B85CC /* transitions.cpp */,
-				DF45B1A2116628A5009B85CC /* transitions.h */,
-				DF45B1A3116628A5009B85CC /* view.cpp */,
-				DF45B1A4116628A5009B85CC /* view.h */,
-			);
-			path = graphics;
-			sourceTree = "<group>";
-		};
-		DF45B1A5116628A5009B85CC /* parser */ = {
-			isa = PBXGroup;
-			children = (
-				DF45B1A6116628A5009B85CC /* grammar.cpp */,
-				DF45B1A7116628A5009B85CC /* said.cpp */,
-				DF45B1A9116628A5009B85CC /* vocabulary.cpp */,
-				DF45B1AA116628A5009B85CC /* vocabulary.h */,
-			);
-			path = parser;
-			sourceTree = "<group>";
-		};
-		DF45B1AB116628A5009B85CC /* sound */ = {
-			isa = PBXGroup;
-			children = (
-				DF45B1AC116628A5009B85CC /* audio.cpp */,
-				DF45B1AD116628A5009B85CC /* audio.h */,
-				DF45B1AE116628A5009B85CC /* drivers */,
-				DF45B1BF116628A5009B85CC /* midiparser_sci.cpp */,
-				DF45B1C0116628A5009B85CC /* midiparser_sci.h */,
-				DF45B1C1116628A5009B85CC /* music.cpp */,
-				DF45B1C2116628A5009B85CC /* music.h */,
-				DF45B1C3116628A5009B85CC /* soundcmd.cpp */,
-				DF45B1C4116628A5009B85CC /* soundcmd.h */,
-			);
-			path = sound;
-			sourceTree = "<group>";
-		};
-		DF45B1AE116628A5009B85CC /* drivers */ = {
-			isa = PBXGroup;
-			children = (
-				DF0E30391252C5BD0082D593 /* cms.cpp */,
-				DF7F286011FF23D500159131 /* amigamac.cpp */,
-				DF45B1AF116628A5009B85CC /* adlib.cpp */,
-				DF45B1B1116628A5009B85CC /* fb01.cpp */,
-				DF45B1B2116628A5009B85CC /* map-mt32-to-gm.h */,
-				DF45B1B3116628A5009B85CC /* midi.cpp */,
-				DF45B1B4116628A5009B85CC /* mididriver.h */,
-				DF45B1B5116628A5009B85CC /* pcjr.cpp */,
-			);
-			path = drivers;
-			sourceTree = "<group>";
-		};
-		DF45B1C5116628A5009B85CC /* video */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7611381E4D400D08723 /* robot_decoder.cpp */,
-				DF46B7621381E4D400D08723 /* robot_decoder.h */,
-				DF45B1C6116628A5009B85CC /* seq_decoder.cpp */,
-				DF45B1C7116628A5009B85CC /* seq_decoder.h */,
-			);
-			path = video;
-			sourceTree = "<group>";
-		};
-		DF46B6F61381E1D100D08723 /* fmtowns_pc98 */ = {
-			isa = PBXGroup;
-			children = (
-				F9946D9A139E1A560072D195 /* towns_midi.cpp */,
-				F9946D9B139E1A560072D195 /* towns_midi.h */,
-				F9946D9C139E1A560072D195 /* towns_pc98_plugins.cpp */,
-				DF46B6F71381E1FF00D08723 /* towns_audio.cpp */,
-				DF46B6F81381E1FF00D08723 /* towns_audio.h */,
-				DF46B6F91381E1FF00D08723 /* towns_euphony.cpp */,
-				DF46B6FA1381E1FF00D08723 /* towns_euphony.h */,
-				DF46B6FB1381E1FF00D08723 /* towns_pc98_driver.cpp */,
-				DF46B6FC1381E1FF00D08723 /* towns_pc98_driver.h */,
-				DF46B6FD1381E1FF00D08723 /* towns_pc98_fmsynth.cpp */,
-				DF46B6FE1381E1FF00D08723 /* towns_pc98_fmsynth.h */,
-			);
-			name = fmtowns_pc98;
-			sourceTree = "<group>";
-		};
-		DF46B7411381E3F200D08723 /* log */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7421381E40500D08723 /* log.cpp */,
-				DF46B7431381E40500D08723 /* log.h */,
-			);
-			name = log;
-			sourceTree = "<group>";
-		};
-		DF46B7A21381E5CC00D08723 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7A31381E5D900D08723 /* sdl-timer.cpp */,
-				DF46B7A41381E5D900D08723 /* sdl-timer.h */,
-			);
-			name = sdl;
-			sourceTree = "<group>";
-		};
-		DF46B7B01381E64E00D08723 /* mutex */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7B11381E66000D08723 /* sdl */,
-			);
-			name = mutex;
-			sourceTree = "<group>";
-		};
-		DF46B7B11381E66000D08723 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7B21381E67800D08723 /* sdl-mutex.cpp */,
-				DF46B7B31381E67800D08723 /* sdl-mutex.h */,
-			);
-			name = sdl;
-			sourceTree = "<group>";
-		};
-		DF46B7CC1381E74D00D08723 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7CD1381E76300D08723 /* sdl-events.cpp */,
-				DF46B7CE1381E76300D08723 /* sdl-events.h */,
-			);
-			name = sdl;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		DF46B8591381F43100D08723 /* opl */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B85A1381F44E00D08723 /* dbopl.cpp */,
-				DF46B85B1381F44E00D08723 /* dbopl.h */,
-				DF46B85C1381F44E00D08723 /* dosbox.cpp */,
-				DF46B85D1381F44E00D08723 /* dosbox.h */,
-				DF46B85E1381F44E00D08723 /* mame.cpp */,
-				DF46B85F1381F44E00D08723 /* mame.h */,
-			);
-			name = opl;
-			sourceTree = "<group>";
-		};
-		DF46B86D1381F47B00D08723 /* audiocd */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8801381F4FF00D08723 /* audiocd.h */,
-				DF46B8781381F4C500D08723 /* default */,
-				DF46B86E1381F48D00D08723 /* sdl */,
-			);
-			name = audiocd;
-			sourceTree = "<group>";
-		};
-		DF46B86E1381F48D00D08723 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B86F1381F4A200D08723 /* sdl-audiocd.cpp */,
-				DF46B8701381F4A200D08723 /* sdl-audiocd.h */,
-			);
-			name = sdl;
-			sourceTree = "<group>";
-		};
-		DF46B8781381F4C500D08723 /* default */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B87B1381F4F200D08723 /* default-audiocd.cpp */,
-				DF46B87C1381F4F200D08723 /* default-audiocd.h */,
-			);
-			name = default;
-			sourceTree = "<group>";
-		};
-		DF46B8861381F5C600D08723 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8871381F5D800D08723 /* sdl-provider.cpp */,
-				DF46B8881381F5D800D08723 /* sdl-provider.h */,
-			);
-			name = sdl;
-			sourceTree = "<group>";
-		};
-		DF6118780FE3A9AA0042AD3F /* save */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8431381F35500D08723 /* saveload_inca2.cpp */,
-				DF46B83B1381F13500D08723 /* saveload_v7.cpp */,
-				DFCDC70311662B0200A7D2A0 /* saveload_fascin.cpp */,
-				DF7585F0100CB70600CC3324 /* saveload_playtoons.cpp */,
-				DF6118790FE3A9AA0042AD3F /* saveconverter.cpp */,
-				DF61187A0FE3A9AA0042AD3F /* saveconverter.h */,
-				DF61187B0FE3A9AA0042AD3F /* saveconverter_v2.cpp */,
-				DF61187C0FE3A9AA0042AD3F /* saveconverter_v3.cpp */,
-				DF61187D0FE3A9AA0042AD3F /* saveconverter_v4.cpp */,
-				DF61187F0FE3A9AA0042AD3F /* savefile.cpp */,
-				DF6118800FE3A9AA0042AD3F /* savefile.h */,
-				DF6118810FE3A9AA0042AD3F /* savehandler.cpp */,
-				DF6118820FE3A9AA0042AD3F /* savehandler.h */,
-				DF6118830FE3A9AA0042AD3F /* saveload.cpp */,
-				DF6118840FE3A9AA0042AD3F /* saveload.h */,
-				DF6118850FE3A9AA0042AD3F /* saveload_v2.cpp */,
-				DF6118860FE3A9AA0042AD3F /* saveload_v3.cpp */,
-				DF6118870FE3A9AA0042AD3F /* saveload_v4.cpp */,
-				DF6118880FE3A9AA0042AD3F /* saveload_v6.cpp */,
-			);
-			path = save;
-			sourceTree = "<group>";
-		};
-		DF841FF50E7BA6A600F5680E /* engines */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8851381F56400D08723 /* util.h */,
-				DF2FFC4C0F4863560006E566 /* advancedDetector.cpp */,
-				DF2FFC4D0F4863560006E566 /* advancedDetector.h */,
-				DF841FF60E7BA6A600F5680E /* agi */,
-				DF84202D0E7BA6A600F5680E /* agos */,
-				DF8420640E7BA6A600F5680E /* cine */,
-				DF84208B0E7BA6A600F5680E /* cruise */,
-				DF8421020E7BA6A700F5680E /* dialogs.cpp */,
-				DF8421030E7BA6A700F5680E /* dialogs.h */,
-				DF8421040E7BA6A700F5680E /* drascula */,
-				DF8421140E7BA6A700F5680E /* engine.cpp */,
-				DF8421150E7BA6A700F5680E /* engine.h */,
-				DF7E8C510ED60067001CB19F /* game.cpp */,
-				DF7E8C520ED60067001CB19F /* game.h */,
-				DF8421170E7BA6A700F5680E /* gob */,
-				DF2FFCBC0F4870690006E566 /* groovie */,
-				8CD1ECC5126202AA00FA198C /* hugo */,
-				DF8421A30E7BA6A800F5680E /* kyra */,
-				DF8422200E7BA6A800F5680E /* lure */,
-				DF84224E0E7BA6A800F5680E /* m4 */,
-				DF8422C90E7BA6A900F5680E /* made */,
-				DF8422E40E7BA6A900F5680E /* metaengine.h */,
-				DF8422E60E7BA6A900F5680E /* parallaction */,
-				DF8423120E7BA6A900F5680E /* queen */,
-				DF84233E0E7BA6AA00F5680E /* saga */,
-				DFEC5D341166C67300C90552 /* savestate.cpp */,
-				DFEC5D351166C67300C90552 /* savestate.h */,
-				DFC830190F48AF18005EF03C /* sci */,
-				DF84237B0E7BA6AA00F5680E /* scumm */,
-				DF8424200E7BA6AB00F5680E /* sky */,
-				DF84244E0E7BA6AB00F5680E /* sword1 */,
-				DF8424770E7BA6AB00F5680E /* sword2 */,
-				8CD80CBE1262729F001C6C87 /* teenagent */,
-				DF8424AA0E7BA6AB00F5680E /* tinsel */,
-				8CD1ECE3126202AA00FA198C /* toon */,
-				DF8424FC0E7BA6AB00F5680E /* touche */,
-				DF2FFD040F4870E50006E566 /* tucker */,
-			);
-			name = engines;
-			path = ../../engines;
-			sourceTree = SOURCE_ROOT;
-		};
-		DF841FF60E7BA6A600F5680E /* agi */ = {
-			isa = PBXGroup;
-			children = (
-				DF841FF70E7BA6A600F5680E /* agi.cpp */,
-				DF841FF80E7BA6A600F5680E /* agi.h */,
-				DF841FF90E7BA6A600F5680E /* checks.cpp */,
-				DF841FFA0E7BA6A600F5680E /* console.cpp */,
-				DF841FFB0E7BA6A600F5680E /* console.h */,
-				DF841FFC0E7BA6A600F5680E /* cycle.cpp */,
-				DF841FFD0E7BA6A600F5680E /* detection.cpp */,
-				DF7F286F11FF243A00159131 /* detection_tables.h */,
-				DF841FFE0E7BA6A600F5680E /* font.h */,
-				DF841FFF0E7BA6A600F5680E /* global.cpp */,
-				DF8420000E7BA6A600F5680E /* graphics.cpp */,
-				DF8420010E7BA6A600F5680E /* graphics.h */,
-				DF8420020E7BA6A600F5680E /* id.cpp */,
-				DF8420030E7BA6A600F5680E /* inv.cpp */,
-				DF8420040E7BA6A600F5680E /* keyboard.cpp */,
-				DF8420050E7BA6A600F5680E /* keyboard.h */,
-				DF8420060E7BA6A600F5680E /* loader_v2.cpp */,
-				DF8420070E7BA6A600F5680E /* loader_v3.cpp */,
-				DF8420080E7BA6A600F5680E /* logic.cpp */,
-				DF8420090E7BA6A600F5680E /* logic.h */,
-				DF84200A0E7BA6A600F5680E /* lzw.cpp */,
-				DF84200B0E7BA6A600F5680E /* lzw.h */,
-				DF84200C0E7BA6A600F5680E /* menu.cpp */,
-				DF84200D0E7BA6A600F5680E /* menu.h */,
-				DF84200F0E7BA6A600F5680E /* motion.cpp */,
-				DF8420100E7BA6A600F5680E /* objects.cpp */,
-				DF8420110E7BA6A600F5680E /* op_cmd.cpp */,
-				DF8420120E7BA6A600F5680E /* op_dbg.cpp */,
-				DF8420130E7BA6A600F5680E /* op_test.cpp */,
-				DF8420140E7BA6A600F5680E /* opcodes.h */,
-				DF8420150E7BA6A600F5680E /* picture.cpp */,
-				DF8420160E7BA6A600F5680E /* picture.h */,
-				DF8420170E7BA6A600F5680E /* preagi.cpp */,
-				DF8420180E7BA6A600F5680E /* preagi.h */,
-				DF8420190E7BA6A600F5680E /* preagi_common.cpp */,
-				DF84201A0E7BA6A600F5680E /* preagi_common.h */,
-				DF84201B0E7BA6A600F5680E /* preagi_mickey.cpp */,
-				DF84201C0E7BA6A600F5680E /* preagi_mickey.h */,
-				DF84201D0E7BA6A600F5680E /* preagi_troll.cpp */,
-				DF84201E0E7BA6A600F5680E /* preagi_troll.h */,
-				DF84201F0E7BA6A600F5680E /* preagi_winnie.cpp */,
-				DF8420200E7BA6A600F5680E /* preagi_winnie.h */,
-				DF8420210E7BA6A600F5680E /* predictive.cpp */,
-				DF8420220E7BA6A600F5680E /* saveload.cpp */,
-				DF8420230E7BA6A600F5680E /* sound.cpp */,
-				DF8420240E7BA6A600F5680E /* sound.h */,
-				DF7F287011FF243A00159131 /* sound_2gs.cpp */,
-				DF7F287111FF243A00159131 /* sound_2gs.h */,
-				DF7F287211FF243B00159131 /* sound_coco3.cpp */,
-				DF7F287311FF243B00159131 /* sound_coco3.h */,
-				DF7F287411FF243B00159131 /* sound_midi.cpp */,
-				DF7F287511FF243B00159131 /* sound_midi.h */,
-				DF7F287611FF243B00159131 /* sound_pcjr.cpp */,
-				DF7F287711FF243B00159131 /* sound_pcjr.h */,
-				DF7F287811FF243B00159131 /* sound_sarien.cpp */,
-				DF7F287911FF243B00159131 /* sound_sarien.h */,
-				DF8420250E7BA6A600F5680E /* sprite.cpp */,
-				DF8420260E7BA6A600F5680E /* sprite.h */,
-				DF8420270E7BA6A600F5680E /* text.cpp */,
-				DF8420280E7BA6A600F5680E /* view.cpp */,
-				DF8420290E7BA6A600F5680E /* view.h */,
-				DF84202A0E7BA6A600F5680E /* wagparser.cpp */,
-				DF84202B0E7BA6A600F5680E /* wagparser.h */,
-				DF84202C0E7BA6A600F5680E /* words.cpp */,
-			);
-			path = agi;
-			sourceTree = "<group>";
-		};
-		DF84202D0E7BA6A600F5680E /* agos */ = {
-			isa = PBXGroup;
-			children = (
-				DF84202E0E7BA6A600F5680E /* agos.cpp */,
-				DF84202F0E7BA6A600F5680E /* agos.h */,
-				DF8420300E7BA6A600F5680E /* animation.cpp */,
-				DF8420310E7BA6A600F5680E /* animation.h */,
-				DF8420320E7BA6A600F5680E /* charset-fontdata.cpp */,
-				DF8420330E7BA6A600F5680E /* charset.cpp */,
-				DF8420340E7BA6A600F5680E /* contain.cpp */,
-				DF8420350E7BA6A600F5680E /* cursor.cpp */,
-				DF8420360E7BA6A600F5680E /* debug.cpp */,
-				DF8420370E7BA6A600F5680E /* debug.h */,
-				DF8420380E7BA6A600F5680E /* debugger.cpp */,
-				DF8420390E7BA6A600F5680E /* debugger.h */,
-				DF84203A0E7BA6A600F5680E /* detection.cpp */,
-				DF84203B0E7BA6A600F5680E /* detection_tables.h */,
-				DF84203C0E7BA6A600F5680E /* draw.cpp */,
-				DF84203D0E7BA6A600F5680E /* event.cpp */,
-				DF6118AE0FE3A9EA0042AD3F /* feeble.cpp */,
-				DF84203E0E7BA6A600F5680E /* gfx.cpp */,
-				DF84203F0E7BA6A600F5680E /* icons.cpp */,
-				DF8420400E7BA6A600F5680E /* input.cpp */,
-				DF6BF4D510529DE90069811F /* input_pn.cpp */,
-				DF8420410E7BA6A600F5680E /* intern.h */,
-				DF8420420E7BA6A600F5680E /* items.cpp */,
-				DF8420430E7BA6A600F5680E /* menus.cpp */,
-				DF8420440E7BA6A600F5680E /* midi.cpp */,
-				DF8420450E7BA6A600F5680E /* midi.h */,
-				DF8420460E7BA6A600F5680E /* midiparser_s1d.cpp */,
-				DF8420480E7BA6A600F5680E /* oracle.cpp */,
-				DF093E5C0F63CAD4002D821E /* pn.cpp */,
-				DF8420490E7BA6A600F5680E /* res.cpp */,
-				DF84204A0E7BA6A600F5680E /* res_ami.cpp */,
-				DF84204B0E7BA6A600F5680E /* res_snd.cpp */,
-				DF84204C0E7BA6A600F5680E /* rooms.cpp */,
-				DF84204D0E7BA6A600F5680E /* saveload.cpp */,
-				DF84204E0E7BA6A600F5680E /* script.cpp */,
-				DF84204F0E7BA6A600F5680E /* script_e1.cpp */,
-				DF8420500E7BA6A600F5680E /* script_e2.cpp */,
-				DF8420510E7BA6A600F5680E /* script_ff.cpp */,
-				DF093E5D0F63CAD4002D821E /* script_pn.cpp */,
-				DF8420520E7BA6A600F5680E /* script_pp.cpp */,
-				DF8420530E7BA6A600F5680E /* script_s1.cpp */,
-				DF8420540E7BA6A600F5680E /* script_s2.cpp */,
-				DF8420550E7BA6A600F5680E /* script_ww.cpp */,
-				DF8420560E7BA6A600F5680E /* sound.cpp */,
-				DF8420570E7BA6A600F5680E /* sound.h */,
-				DF8420580E7BA6A600F5680E /* string.cpp */,
-				DF6BF4D610529DE90069811F /* string_pn.cpp */,
-				DF8420590E7BA6A600F5680E /* subroutine.cpp */,
-				DF84205A0E7BA6A600F5680E /* verb.cpp */,
-				DF6BF4D710529DE90069811F /* verb_pn.cpp */,
-				DF84205B0E7BA6A600F5680E /* vga.cpp */,
-				DF84205C0E7BA6A600F5680E /* vga.h */,
-				DF84205D0E7BA6A600F5680E /* vga_e2.cpp */,
-				DF84205E0E7BA6A600F5680E /* vga_ff.cpp */,
-				DF093E5E0F63CAD4002D821E /* vga_pn.cpp */,
-				DF84205F0E7BA6A600F5680E /* vga_s1.cpp */,
-				DF8420600E7BA6A600F5680E /* vga_s2.cpp */,
-				DF8420610E7BA6A600F5680E /* vga_ww.cpp */,
-				DF8420620E7BA6A600F5680E /* window.cpp */,
-				DF8420630E7BA6A600F5680E /* zones.cpp */,
-			);
-			path = agos;
-			sourceTree = "<group>";
-		};
-		DF8420640E7BA6A600F5680E /* cine */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B75B1381E4A400D08723 /* console.cpp */,
-				DF46B75C1381E4A400D08723 /* console.h */,
-				DF46B75D1381E4A400D08723 /* detection_tables.h */,
-				DF8420650E7BA6A600F5680E /* anim.cpp */,
-				DF8420660E7BA6A600F5680E /* anim.h */,
-				DF8420670E7BA6A600F5680E /* bg.cpp */,
-				DF8420680E7BA6A600F5680E /* bg.h */,
-				DF8420690E7BA6A600F5680E /* bg_list.cpp */,
-				DF84206A0E7BA6A600F5680E /* bg_list.h */,
-				DF84206B0E7BA6A600F5680E /* cine.cpp */,
-				DF84206C0E7BA6A600F5680E /* cine.h */,
-				DF84206D0E7BA6A600F5680E /* detection.cpp */,
-				DF84206E0E7BA6A600F5680E /* gfx.cpp */,
-				DF84206F0E7BA6A600F5680E /* gfx.h */,
-				DF8420700E7BA6A600F5680E /* main_loop.cpp */,
-				DF8420710E7BA6A600F5680E /* main_loop.h */,
-				DF8420730E7BA6A600F5680E /* msg.cpp */,
-				DF8420740E7BA6A600F5680E /* msg.h */,
-				DF8420750E7BA6A600F5680E /* object.cpp */,
-				DF8420760E7BA6A600F5680E /* object.h */,
-				DF8420770E7BA6A600F5680E /* pal.cpp */,
-				DF8420780E7BA6A600F5680E /* pal.h */,
-				DF8420790E7BA6A600F5680E /* part.cpp */,
-				DF84207A0E7BA6A600F5680E /* part.h */,
-				DF84207B0E7BA6A600F5680E /* prc.cpp */,
-				DF84207C0E7BA6A600F5680E /* prc.h */,
-				DF84207D0E7BA6A600F5680E /* rel.cpp */,
-				DF84207E0E7BA6A600F5680E /* rel.h */,
-				DFAAAFF50F0112AD003E9390 /* saveload.cpp */,
-				DFAAAFF60F0112AD003E9390 /* saveload.h */,
-				DF84207F0E7BA6A600F5680E /* script.h */,
-				DF8420800E7BA6A600F5680E /* script_fw.cpp */,
-				DF8420810E7BA6A600F5680E /* script_os.cpp */,
-				DF8420820E7BA6A600F5680E /* sound.cpp */,
-				DF8420830E7BA6A600F5680E /* sound.h */,
-				DF8420840E7BA6A600F5680E /* texte.cpp */,
-				DF8420850E7BA6A600F5680E /* texte.h */,
-				DF8420860E7BA6A600F5680E /* unpack.cpp */,
-				DF8420870E7BA6A600F5680E /* unpack.h */,
-				DF8420880E7BA6A600F5680E /* various.cpp */,
-				DF8420890E7BA6A600F5680E /* various.h */,
-			);
-			path = cine;
-			sourceTree = "<group>";
-		};
-		DF84208B0E7BA6A600F5680E /* cruise */ = {
-			isa = PBXGroup;
-			children = (
-				DF8420AB0E7BA6A600F5680E /* actor.cpp */,
-				DF8420AC0E7BA6A600F5680E /* actor.h */,
-				DF8420AE0E7BA6A600F5680E /* background.cpp */,
-				DF8420AF0E7BA6A600F5680E /* background.h */,
-				DF8420B10E7BA6A600F5680E /* backgroundIncrust.cpp */,
-				DF8420B20E7BA6A600F5680E /* backgroundIncrust.h */,
-				DF8420B40E7BA6A600F5680E /* cell.cpp */,
-				DF8420B50E7BA6A600F5680E /* cell.h */,
-				DF8420B70E7BA6A600F5680E /* cruise.cpp */,
-				DF8420B80E7BA6A700F5680E /* cruise.h */,
-				DF8420BA0E7BA6A700F5680E /* cruise_main.cpp */,
-				DF8420BB0E7BA6A700F5680E /* cruise_main.h */,
-				DF8420BD0E7BA6A700F5680E /* ctp.cpp */,
-				DF8420BE0E7BA6A700F5680E /* ctp.h */,
-				DF8420C00E7BA6A700F5680E /* dataLoader.cpp */,
-				DF8420C10E7BA6A700F5680E /* dataLoader.h */,
-				DF2FFC700F4867910006E566 /* debugger.cpp */,
-				DF2FFC710F4867910006E566 /* debugger.h */,
-				DF8420C30E7BA6A700F5680E /* decompiler.cpp */,
-				DF8420C50E7BA6A700F5680E /* delphine-unpack.cpp */,
-				DF8420C70E7BA6A700F5680E /* detection.cpp */,
-				DF8420C90E7BA6A700F5680E /* font.cpp */,
-				DF8420CA0E7BA6A700F5680E /* font.h */,
-				DF8420CF0E7BA6A700F5680E /* function.cpp */,
-				DF8420D00E7BA6A700F5680E /* function.h */,
-				DF8420D20E7BA6A700F5680E /* gfxModule.cpp */,
-				DF8420D30E7BA6A700F5680E /* gfxModule.h */,
-				DF8420D60E7BA6A700F5680E /* linker.cpp */,
-				DF8420D70E7BA6A700F5680E /* linker.h */,
-				DF8420D90E7BA6A700F5680E /* mainDraw.cpp */,
-				DF8420DA0E7BA6A700F5680E /* mainDraw.h */,
-				DF8420DC0E7BA6A700F5680E /* menu.cpp */,
-				DF8420DD0E7BA6A700F5680E /* menu.h */,
-				DF8420E00E7BA6A700F5680E /* mouse.cpp */,
-				DF8420E10E7BA6A700F5680E /* mouse.h */,
-				DF8420E30E7BA6A700F5680E /* object.cpp */,
-				DF8420E40E7BA6A700F5680E /* object.h */,
-				DF8420E60E7BA6A700F5680E /* overlay.cpp */,
-				DF8420E70E7BA6A700F5680E /* overlay.h */,
-				DF8420E90E7BA6A700F5680E /* perso.cpp */,
-				DF8420EA0E7BA6A700F5680E /* perso.h */,
-				DF8420EC0E7BA6A700F5680E /* polys.cpp */,
-				DF8420ED0E7BA6A700F5680E /* polys.h */,
-				DF8420EF0E7BA6A700F5680E /* saveload.cpp */,
-				DF8420F00E7BA6A700F5680E /* saveload.h */,
-				DF8420F20E7BA6A700F5680E /* script.cpp */,
-				DF8420F30E7BA6A700F5680E /* script.h */,
-				DFE88C440F874A1100C555C5 /* sound.cpp */,
-				DFE88C450F874A1100C555C5 /* sound.h */,
-				DF8420F50E7BA6A700F5680E /* stack.cpp */,
-				DF8420F60E7BA6A700F5680E /* stack.h */,
-				DF2FFC720F4867910006E566 /* staticres.cpp */,
-				DF2FFC730F4867910006E566 /* staticres.h */,
-				DF8420F90E7BA6A700F5680E /* various.cpp */,
-				DF8420FA0E7BA6A700F5680E /* various.h */,
-				DF8420FC0E7BA6A700F5680E /* vars.cpp */,
-				DF8420FD0E7BA6A700F5680E /* vars.h */,
-				DF8420FF0E7BA6A700F5680E /* volume.cpp */,
-				DF8421000E7BA6A700F5680E /* volume.h */,
-			);
-			path = cruise;
-			sourceTree = "<group>";
-		};
-		DF8421040E7BA6A700F5680E /* drascula */ = {
-			isa = PBXGroup;
-			children = (
-				DF8421050E7BA6A700F5680E /* actors.cpp */,
-				DF8421060E7BA6A700F5680E /* animation.cpp */,
-				DF7F28A311FF24C400159131 /* console.cpp */,
-				DF7F28A411FF24C400159131 /* console.h */,
-				DF8421070E7BA6A700F5680E /* converse.cpp */,
-				DF8421080E7BA6A700F5680E /* detection.cpp */,
-				DF8421090E7BA6A700F5680E /* drascula.cpp */,
-				DF84210A0E7BA6A700F5680E /* drascula.h */,
-				DF84210B0E7BA6A700F5680E /* graphics.cpp */,
-				DF84210C0E7BA6A700F5680E /* interface.cpp */,
-				DF84210E0E7BA6A700F5680E /* objects.cpp */,
-				DF84210F0E7BA6A700F5680E /* palette.cpp */,
-				DFCDC6F611662AAB00A7D2A0 /* resource.cpp */,
-				DF8421100E7BA6A700F5680E /* rooms.cpp */,
-				DF8421110E7BA6A700F5680E /* saveload.cpp */,
-				DF8421120E7BA6A700F5680E /* sound.cpp */,
-				DF8421130E7BA6A700F5680E /* talk.cpp */,
-			);
-			path = drascula;
-			sourceTree = "<group>";
-		};
-		DF8421170E7BA6A700F5680E /* gob */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8471381F38700D08723 /* inter_v7.cpp */,
-				DF46B70F1381E27000D08723 /* console.cpp */,
-				DF46B7101381E27000D08723 /* console.h */,
-				DF46B7111381E27000D08723 /* databases.cpp */,
-				DF46B7121381E27000D08723 /* databases.h */,
-				DF46B7131381E27000D08723 /* dbase.cpp */,
-				DF46B7141381E27000D08723 /* dbase.h */,
-				DF46B7151381E27000D08723 /* iniconfig.cpp */,
-				DF46B7161381E27000D08723 /* iniconfig.h */,
-				DF46B7171381E27000D08723 /* init_v7.cpp */,
-				DF46B7181381E27000D08723 /* inter_inca2.cpp */,
-				DF84211B0E7BA6A700F5680E /* dataio.cpp */,
-				DF84211C0E7BA6A700F5680E /* dataio.h */,
-				DF09CC060FAC4E1900A5AFD7 /* demos */,
-				DF84211D0E7BA6A700F5680E /* detection.cpp */,
-				DF895C23124C25150077F6E8 /* detection_tables.h */,
-				DF84211E0E7BA6A700F5680E /* draw.cpp */,
-				DF84211F0E7BA6A700F5680E /* draw.h */,
-				DF8421200E7BA6A700F5680E /* draw_bargon.cpp */,
-				DF09CC0D0FAC4E1900A5AFD7 /* draw_fascin.cpp */,
-				DF90EAA310B0234300C8F93F /* draw_playtoons.cpp */,
-				DF8421210E7BA6A700F5680E /* draw_v1.cpp */,
-				DF8421220E7BA6A700F5680E /* draw_v2.cpp */,
-				DF7585C3100CB66E00CC3324 /* expression.cpp */,
-				DF7585C4100CB66E00CC3324 /* expression.h */,
-				DF8421250E7BA6A700F5680E /* game.cpp */,
-				DF8421260E7BA6A700F5680E /* game.h */,
-				DF8421290E7BA6A700F5680E /* global.cpp */,
-				DF84212A0E7BA6A700F5680E /* global.h */,
-				DF84212B0E7BA6A700F5680E /* gob.cpp */,
-				DF84212C0E7BA6A700F5680E /* gob.h */,
-				DF84212D0E7BA6A700F5680E /* goblin.cpp */,
-				DF84212E0E7BA6A700F5680E /* goblin.h */,
-				DF84212F0E7BA6A700F5680E /* goblin_v1.cpp */,
-				DF8421300E7BA6A700F5680E /* goblin_v2.cpp */,
-				DF8421310E7BA6A700F5680E /* goblin_v3.cpp */,
-				DF8421320E7BA6A700F5680E /* goblin_v4.cpp */,
-				DF7585C5100CB66E00CC3324 /* hotspots.cpp */,
-				DF7585C6100CB66E00CC3324 /* hotspots.h */,
-				DF8421330E7BA6A700F5680E /* init.cpp */,
-				DF8421340E7BA6A700F5680E /* init.h */,
-				DF895C24124C25150077F6E8 /* init_fascin.cpp */,
-				DF8421350E7BA6A700F5680E /* init_v1.cpp */,
-				DF8421360E7BA6A700F5680E /* init_v2.cpp */,
-				DF8421370E7BA6A700F5680E /* init_v3.cpp */,
-				DF6BF4E810529E6E0069811F /* init_v4.cpp */,
-				DF7585C7100CB66E00CC3324 /* init_v6.cpp */,
-				DF8421380E7BA6A700F5680E /* inter.cpp */,
-				DF8421390E7BA6A700F5680E /* inter.h */,
-				DF84213A0E7BA6A700F5680E /* inter_bargon.cpp */,
-				DF09CC0F0FAC4E1900A5AFD7 /* inter_fascin.cpp */,
-				DF6BF4E910529E6E0069811F /* inter_playtoons.cpp */,
-				DF84213B0E7BA6A700F5680E /* inter_v1.cpp */,
-				DF84213C0E7BA6A700F5680E /* inter_v2.cpp */,
-				DF84213D0E7BA6A700F5680E /* inter_v3.cpp */,
-				DF84213E0E7BA6A700F5680E /* inter_v4.cpp */,
-				DF84213F0E7BA6A700F5680E /* inter_v5.cpp */,
-				DF8421400E7BA6A700F5680E /* inter_v6.cpp */,
-				DF8421410E7BA6A700F5680E /* map.cpp */,
-				DF8421420E7BA6A700F5680E /* map.h */,
-				DF8421430E7BA6A700F5680E /* map_v1.cpp */,
-				DF8421440E7BA6A700F5680E /* map_v2.cpp */,
-				DF8421470E7BA6A700F5680E /* mult.cpp */,
-				DF8421480E7BA6A700F5680E /* mult.h */,
-				DF8421490E7BA6A700F5680E /* mult_v1.cpp */,
-				DF84214A0E7BA6A700F5680E /* mult_v2.cpp */,
-				DF84214C0E7BA6A700F5680E /* palanim.cpp */,
-				DF84214D0E7BA6A700F5680E /* palanim.h */,
-				DF7585C8100CB66E00CC3324 /* resources.cpp */,
-				DF7585C9100CB66E00CC3324 /* resources.h */,
-				DF6118780FE3A9AA0042AD3F /* save */,
-				DF8421570E7BA6A700F5680E /* scenery.cpp */,
-				DF8421580E7BA6A700F5680E /* scenery.h */,
-				DF8421590E7BA6A700F5680E /* scenery_v1.cpp */,
-				DF84215A0E7BA6A700F5680E /* scenery_v2.cpp */,
-				DF7585CA100CB66E00CC3324 /* script.cpp */,
-				DF7585CB100CB66E00CC3324 /* script.h */,
-				DF84215B0E7BA6A700F5680E /* sound */,
-				8CD80C89126271A9001C6C87 /* surface.cpp */,
-				8CD80C8A126271A9001C6C87 /* surface.h */,
-				DF7585CC100CB66E00CC3324 /* totfile.cpp */,
-				DF7585CD100CB66E00CC3324 /* totfile.h */,
-				DF84216F0E7BA6A700F5680E /* util.cpp */,
-				DF8421700E7BA6A700F5680E /* util.h */,
-				DF8421710E7BA6A700F5680E /* variables.cpp */,
-				DF8421720E7BA6A700F5680E /* variables.h */,
-				DF8421730E7BA6A700F5680E /* video.cpp */,
-				DF8421740E7BA6A700F5680E /* video.h */,
-				DF8421750E7BA6A700F5680E /* video_v1.cpp */,
-				DF8421760E7BA6A700F5680E /* video_v2.cpp */,
-				DF8421770E7BA6A700F5680E /* video_v6.cpp */,
-				DF8421780E7BA6A700F5680E /* videoplayer.cpp */,
-				DF8421790E7BA6A700F5680E /* videoplayer.h */,
-			);
-			path = gob;
-			sourceTree = "<group>";
-		};
-		DF84215B0E7BA6A700F5680E /* sound */ = {
-			isa = PBXGroup;
-			children = (
-				DF5CEB2F0F75538000DEA624 /* protracker.cpp */,
-				DF5CEB300F75538000DEA624 /* protracker.h */,
-				DF84215C0E7BA6A700F5680E /* adlib.cpp */,
-				DF84215D0E7BA6A700F5680E /* adlib.h */,
-				DF84215E0E7BA6A700F5680E /* bgatmosphere.cpp */,
-				DF84215F0E7BA6A700F5680E /* bgatmosphere.h */,
-				DF8421600E7BA6A700F5680E /* cdrom.cpp */,
-				DF8421610E7BA6A700F5680E /* cdrom.h */,
-				DF8421620E7BA6A700F5680E /* infogrames.cpp */,
-				DF8421630E7BA6A700F5680E /* infogrames.h */,
-				DF8421640E7BA6A700F5680E /* pcspeaker.cpp */,
-				DF8421650E7BA6A700F5680E /* pcspeaker.h */,
-				DF8421660E7BA6A700F5680E /* sound.cpp */,
-				DF8421670E7BA6A700F5680E /* sound.h */,
-				DF8421680E7BA6A700F5680E /* soundblaster.cpp */,
-				DF8421690E7BA6A700F5680E /* soundblaster.h */,
-				DF84216A0E7BA6A700F5680E /* sounddesc.cpp */,
-				DF84216B0E7BA6A700F5680E /* sounddesc.h */,
-				DF84216C0E7BA6A700F5680E /* soundmixer.cpp */,
-				DF84216D0E7BA6A700F5680E /* soundmixer.h */,
-			);
-			path = sound;
-			sourceTree = "<group>";
-		};
-		DF8421A30E7BA6A800F5680E /* kyra */ = {
-			isa = PBXGroup;
-			children = (
-				DF8421A40E7BA6A800F5680E /* animator_hof.cpp */,
-				DF8421A50E7BA6A800F5680E /* animator_lok.cpp */,
-				DF8421A60E7BA6A800F5680E /* animator_lok.h */,
-				DF8421A70E7BA6A800F5680E /* animator_mr.cpp */,
-				DF2EC3FD10E64C4300765801 /* animator_tim.cpp */,
-				DF8421A90E7BA6A800F5680E /* animator_v2.cpp */,
-				DF8421AB0E7BA6A800F5680E /* debugger.cpp */,
-				DF8421AC0E7BA6A800F5680E /* debugger.h */,
-				DF8421AD0E7BA6A800F5680E /* detection.cpp */,
-				DF8421AE0E7BA6A800F5680E /* gui.cpp */,
-				DF8421AF0E7BA6A800F5680E /* gui.h */,
-				DF8421B00E7BA6A800F5680E /* gui_hof.cpp */,
-				DF8421B10E7BA6A800F5680E /* gui_hof.h */,
-				DF8421B20E7BA6A800F5680E /* gui_lok.cpp */,
-				DF8421B30E7BA6A800F5680E /* gui_lok.h */,
-				DF2FFC2E0F48628A0006E566 /* gui_lol.cpp */,
-				DF2FFC2F0F48628A0006E566 /* gui_lol.h */,
-				DF8421B40E7BA6A800F5680E /* gui_mr.cpp */,
-				DF8421B50E7BA6A800F5680E /* gui_mr.h */,
-				DF8421B70E7BA6A800F5680E /* gui_v2.cpp */,
-				DF8421B80E7BA6A800F5680E /* gui_v2.h */,
-				DF8421BA0E7BA6A800F5680E /* items_hof.cpp */,
-				DF8421BB0E7BA6A800F5680E /* items_lok.cpp */,
-				DF2FFC300F48628A0006E566 /* items_lol.cpp */,
-				DF8421BC0E7BA6A800F5680E /* items_mr.cpp */,
-				DF8421BE0E7BA6A800F5680E /* items_v2.cpp */,
-				DF8421C10E7BA6A800F5680E /* kyra_hof.cpp */,
-				DF8421C20E7BA6A800F5680E /* kyra_hof.h */,
-				DF8421C30E7BA6A800F5680E /* kyra_lok.cpp */,
-				DF8421C40E7BA6A800F5680E /* kyra_lok.h */,
-				DF8421C50E7BA6A800F5680E /* kyra_mr.cpp */,
-				DF8421C60E7BA6A800F5680E /* kyra_mr.h */,
-				DF8421C70E7BA6A800F5680E /* kyra_v1.cpp */,
-				DF8421C80E7BA6A800F5680E /* kyra_v1.h */,
-				DF8421C90E7BA6A800F5680E /* kyra_v2.cpp */,
-				DF8421CA0E7BA6A800F5680E /* kyra_v2.h */,
-				DF8421CC0E7BA6A800F5680E /* lol.cpp */,
-				DF8421CD0E7BA6A800F5680E /* lol.h */,
-				DF8421CF0E7BA6A800F5680E /* resource.cpp */,
-				DF8421D00E7BA6A800F5680E /* resource.h */,
-				DF8421D10E7BA6A800F5680E /* resource_intern.cpp */,
-				DF8421D20E7BA6A800F5680E /* resource_intern.h */,
-				DF8421D30E7BA6A800F5680E /* saveload.cpp */,
-				DF8421D40E7BA6A800F5680E /* saveload_hof.cpp */,
-				DF8421D50E7BA6A800F5680E /* saveload_lok.cpp */,
-				DF6118B30FE3AA280042AD3F /* saveload_lol.cpp */,
-				DF8421D60E7BA6A800F5680E /* saveload_mr.cpp */,
-				DF8421DA0E7BA6A800F5680E /* scene_hof.cpp */,
-				DF8421DB0E7BA6A800F5680E /* scene_lok.cpp */,
-				DF2FFC490F4863100006E566 /* scene_lol.cpp */,
-				DF8421DC0E7BA6A800F5680E /* scene_mr.cpp */,
-				DF8421DD0E7BA6A800F5680E /* scene_v1.cpp */,
-				DF8421DE0E7BA6A800F5680E /* scene_v2.cpp */,
-				DF8421E00E7BA6A800F5680E /* screen.cpp */,
-				DF8421E10E7BA6A800F5680E /* screen.h */,
-				DF8421E20E7BA6A800F5680E /* screen_hof.cpp */,
-				DF8421E30E7BA6A800F5680E /* screen_hof.h */,
-				DF8421E40E7BA6A800F5680E /* screen_lok.cpp */,
-				DF8421E50E7BA6A800F5680E /* screen_lok.h */,
-				DF8421E60E7BA6A800F5680E /* screen_lol.cpp */,
-				DF8421E70E7BA6A800F5680E /* screen_lol.h */,
-				DF8421E80E7BA6A800F5680E /* screen_mr.cpp */,
-				DF8421E90E7BA6A800F5680E /* screen_mr.h */,
-				DF8421EB0E7BA6A800F5680E /* screen_v2.cpp */,
-				DF8421EC0E7BA6A800F5680E /* screen_v2.h */,
-				DF8421EE0E7BA6A800F5680E /* script.cpp */,
-				DF8421EF0E7BA6A800F5680E /* script.h */,
-				DF8421F00E7BA6A800F5680E /* script_hof.cpp */,
-				DF8421F10E7BA6A800F5680E /* script_lok.cpp */,
-				DF2FFC310F48628A0006E566 /* script_lol.cpp */,
-				DF8421F20E7BA6A800F5680E /* script_mr.cpp */,
-				DF8421F30E7BA6A800F5680E /* script_tim.cpp */,
-				DF8421F40E7BA6A800F5680E /* script_tim.h */,
-				DF8421F50E7BA6A800F5680E /* script_v1.cpp */,
-				DF8421F60E7BA6A800F5680E /* script_v2.cpp */,
-				DF8421F80E7BA6A800F5680E /* seqplayer.cpp */,
-				DF8421F90E7BA6A800F5680E /* seqplayer.h */,
-				DF8421FA0E7BA6A800F5680E /* sequences_hof.cpp */,
-				DF8421FB0E7BA6A800F5680E /* sequences_lok.cpp */,
-				DF2FFC320F48628A0006E566 /* sequences_lol.cpp */,
-				DF8421FC0E7BA6A800F5680E /* sequences_mr.cpp */,
-				DF8421FE0E7BA6A800F5680E /* sequences_v2.cpp */,
-				DF8422000E7BA6A800F5680E /* sound.cpp */,
-				DF8422010E7BA6A800F5680E /* sound.h */,
-				DF8422020E7BA6A800F5680E /* sound_adlib.cpp */,
-				DF6BF4E210529E260069811F /* sound_adlib.h */,
-				DF6BF4E310529E260069811F /* sound_amiga.cpp */,
-				DF8422030E7BA6A800F5680E /* sound_digital.cpp */,
-				DF8422040E7BA6A800F5680E /* sound_lok.cpp */,
-				DF6118B40FE3AA280042AD3F /* sound_lol.cpp */,
-				DF2FFC330F48628A0006E566 /* sound_midi.cpp */,
-				DF6118B50FE3AA280042AD3F /* sound_pcspk.cpp */,
-				DF8422050E7BA6A800F5680E /* sound_towns.cpp */,
-				DF8422070E7BA6A800F5680E /* sprites.cpp */,
-				DF8422080E7BA6A800F5680E /* sprites.h */,
-				DF89C2870F62D55C00D756B6 /* sprites_lol.cpp */,
-				DF8422090E7BA6A800F5680E /* staticres.cpp */,
-				DF84220A0E7BA6A800F5680E /* text.cpp */,
-				DF84220B0E7BA6A800F5680E /* text.h */,
-				DF84220C0E7BA6A800F5680E /* text_hof.cpp */,
-				DF84220D0E7BA6A800F5680E /* text_hof.h */,
-				DF84220E0E7BA6A800F5680E /* text_lok.cpp */,
-				DF6118B60FE3AA280042AD3F /* text_lol.cpp */,
-				DF6118B70FE3AA280042AD3F /* text_lol.h */,
-				DF84220F0E7BA6A800F5680E /* text_mr.cpp */,
-				DF8422100E7BA6A800F5680E /* text_mr.h */,
-				DF8422140E7BA6A800F5680E /* timer.cpp */,
-				DF8422150E7BA6A800F5680E /* timer.h */,
-				DF8422160E7BA6A800F5680E /* timer_hof.cpp */,
-				DF8422170E7BA6A800F5680E /* timer_lok.cpp */,
-				DF573CBD0F5A85E100961A72 /* timer_lol.cpp */,
-				DF8422180E7BA6A800F5680E /* timer_mr.cpp */,
-				DF2FFC360F48628A0006E566 /* util.cpp */,
-				DF2FFC370F48628A0006E566 /* util.h */,
-				DF84221C0E7BA6A800F5680E /* vqa.cpp */,
-				DF84221D0E7BA6A800F5680E /* vqa.h */,
-				DF84221E0E7BA6A800F5680E /* wsamovie.cpp */,
-				DF84221F0E7BA6A800F5680E /* wsamovie.h */,
-			);
-			path = kyra;
-			sourceTree = "<group>";
-		};
-		DF8422200E7BA6A800F5680E /* lure */ = {
-			isa = PBXGroup;
-			children = (
-				DF8422210E7BA6A800F5680E /* animseq.cpp */,
-				DF8422220E7BA6A800F5680E /* animseq.h */,
-				DF8422230E7BA6A800F5680E /* debugger.cpp */,
-				DF8422240E7BA6A800F5680E /* debugger.h */,
-				DF8422250E7BA6A800F5680E /* decode.cpp */,
-				DF8422260E7BA6A800F5680E /* decode.h */,
-				DF8422270E7BA6A800F5680E /* detection.cpp */,
-				DF8422280E7BA6A800F5680E /* disk.cpp */,
-				DF8422290E7BA6A800F5680E /* disk.h */,
-				DF84222A0E7BA6A800F5680E /* events.cpp */,
-				DF84222B0E7BA6A800F5680E /* events.h */,
-				DF84222C0E7BA6A800F5680E /* fights.cpp */,
-				DF84222D0E7BA6A800F5680E /* fights.h */,
-				DF84222E0E7BA6A800F5680E /* game.cpp */,
-				DF84222F0E7BA6A800F5680E /* game.h */,
-				DF8422300E7BA6A800F5680E /* hotspots.cpp */,
-				DF8422310E7BA6A800F5680E /* hotspots.h */,
-				DF8422320E7BA6A800F5680E /* intro.cpp */,
-				DF8422330E7BA6A800F5680E /* intro.h */,
-				DF8422340E7BA6A800F5680E /* lure.cpp */,
-				DF8422350E7BA6A800F5680E /* lure.h */,
-				DF8422360E7BA6A800F5680E /* luredefs.h */,
-				DF8422370E7BA6A800F5680E /* memory.cpp */,
-				DF8422380E7BA6A800F5680E /* memory.h */,
-				DF8422390E7BA6A800F5680E /* menu.cpp */,
-				DF84223A0E7BA6A800F5680E /* menu.h */,
-				DF84223C0E7BA6A800F5680E /* palette.cpp */,
-				DF84223D0E7BA6A800F5680E /* palette.h */,
-				DF84223E0E7BA6A800F5680E /* res.cpp */,
-				DF84223F0E7BA6A800F5680E /* res.h */,
-				DF8422400E7BA6A800F5680E /* res_struct.cpp */,
-				DF8422410E7BA6A800F5680E /* res_struct.h */,
-				DF8422420E7BA6A800F5680E /* room.cpp */,
-				DF8422430E7BA6A800F5680E /* room.h */,
-				DF8422440E7BA6A800F5680E /* screen.cpp */,
-				DF8422450E7BA6A800F5680E /* screen.h */,
-				DF8422460E7BA6A800F5680E /* scripts.cpp */,
-				DF8422470E7BA6A800F5680E /* scripts.h */,
-				DF8422480E7BA6A800F5680E /* sound.cpp */,
-				DF8422490E7BA6A800F5680E /* sound.h */,
-				DF84224A0E7BA6A800F5680E /* strings.cpp */,
-				DF84224B0E7BA6A800F5680E /* strings.h */,
-				DF84224C0E7BA6A800F5680E /* surface.cpp */,
-				DF84224D0E7BA6A800F5680E /* surface.h */,
-			);
-			path = lure;
-			sourceTree = "<group>";
-		};
-		DF84224E0E7BA6A800F5680E /* m4 */ = {
-			isa = PBXGroup;
-			children = (
-				DF84226E0E7BA6A800F5680E /* actor.cpp */,
-				DF84226F0E7BA6A800F5680E /* actor.h */,
-				DF8422710E7BA6A800F5680E /* animation.cpp */,
-				DF8422720E7BA6A800F5680E /* animation.h */,
-				DF8422740E7BA6A800F5680E /* assets.cpp */,
-				DF8422750E7BA6A800F5680E /* assets.h */,
-				DF8422770E7BA6A900F5680E /* burger_data.h */,
-				DF8422780E7BA6A900F5680E /* compression.cpp */,
-				DF8422790E7BA6A900F5680E /* compression.h */,
-				DF84227B0E7BA6A900F5680E /* console.cpp */,
-				DF84227C0E7BA6A900F5680E /* console.h */,
-				DF84227E0E7BA6A900F5680E /* converse.cpp */,
-				DF84227F0E7BA6A900F5680E /* converse.h */,
-				DF8422810E7BA6A900F5680E /* detection.cpp */,
-				DF2EC3F610E64C0C00765801 /* dialogs.cpp */,
-				DF2EC3F710E64C0C00765801 /* dialogs.h */,
-				DF8422830E7BA6A900F5680E /* events.cpp */,
-				DF8422840E7BA6A900F5680E /* events.h */,
-				DF8422860E7BA6A900F5680E /* font.cpp */,
-				DF8422870E7BA6A900F5680E /* font.h */,
-				DF8422890E7BA6A900F5680E /* globals.cpp */,
-				DF84228A0E7BA6A900F5680E /* globals.h */,
-				DF84228C0E7BA6A900F5680E /* graphics.cpp */,
-				DF84228D0E7BA6A900F5680E /* graphics.h */,
-				DF84228F0E7BA6A900F5680E /* gui.cpp */,
-				DF8422900E7BA6A900F5680E /* gui.h */,
-				DF8422920E7BA6A900F5680E /* hotspot.cpp */,
-				DF8422930E7BA6A900F5680E /* hotspot.h */,
-				DF8422960E7BA6A900F5680E /* m4.cpp */,
-				DF8422970E7BA6A900F5680E /* m4.h */,
-				DF8422990E7BA6A900F5680E /* m4_menus.cpp */,
-				DF84229A0E7BA6A900F5680E /* m4_menus.h */,
-				8CB5A9B71253FD6800CB6BC7 /* m4_scene.cpp */,
-				8CB5A9B81253FD6800CB6BC7 /* m4_scene.h */,
-				DF84229C0E7BA6A900F5680E /* m4_views.cpp */,
-				DF84229D0E7BA6A900F5680E /* m4_views.h */,
-				DF84229F0E7BA6A900F5680E /* mads_anim.cpp */,
-				DF8422A00E7BA6A900F5680E /* mads_anim.h */,
-				8CB5A9B91253FD6800CB6BC7 /* mads_logic.cpp */,
-				8CB5A9BA1253FD6800CB6BC7 /* mads_logic.h */,
-				DF8422A20E7BA6A900F5680E /* mads_menus.cpp */,
-				DF8422A30E7BA6A900F5680E /* mads_menus.h */,
-				8CB5A9BB1253FD6800CB6BC7 /* mads_player.cpp */,
-				8CB5A9BC1253FD6800CB6BC7 /* mads_player.h */,
-				8CB5A9BD1253FD6800CB6BC7 /* mads_scene.cpp */,
-				8CB5A9BE1253FD6800CB6BC7 /* mads_scene.h */,
-				8CB5A9BF1253FD6900CB6BC7 /* mads_views.cpp */,
-				8CB5A9C01253FD6900CB6BC7 /* mads_views.h */,
-				DF8422A50E7BA6A900F5680E /* midi.cpp */,
-				DF8422A60E7BA6A900F5680E /* midi.h */,
-				DF8422A90E7BA6A900F5680E /* rails.cpp */,
-				DF8422AA0E7BA6A900F5680E /* rails.h */,
-				DF8422AC0E7BA6A900F5680E /* resource.cpp */,
-				DF8422AD0E7BA6A900F5680E /* resource.h */,
-				DF8422AF0E7BA6A900F5680E /* saveload.cpp */,
-				DF8422B00E7BA6A900F5680E /* saveload.h */,
-				DF8422B20E7BA6A900F5680E /* scene.cpp */,
-				DF8422B30E7BA6A900F5680E /* scene.h */,
-				DF8422B50E7BA6A900F5680E /* script.cpp */,
-				DF8422B60E7BA6A900F5680E /* script.h */,
-				DF8422B80E7BA6A900F5680E /* scripttab.h */,
-				DF8422B90E7BA6A900F5680E /* sound.cpp */,
-				DF8422BA0E7BA6A900F5680E /* sound.h */,
-				DF8422BC0E7BA6A900F5680E /* sprite.cpp */,
-				DF8422BD0E7BA6A900F5680E /* sprite.h */,
-				DF90EAAB10B0236F00C8F93F /* staticres.cpp */,
-				DF90EAAC10B0236F00C8F93F /* staticres.h */,
-				DF8422BF0E7BA6A900F5680E /* viewmgr.cpp */,
-				DF8422C00E7BA6A900F5680E /* viewmgr.h */,
-				DF8422C20E7BA6A900F5680E /* woodscript.cpp */,
-				DF8422C30E7BA6A900F5680E /* woodscript.h */,
-				DF8422C50E7BA6A900F5680E /* ws_machine.cpp */,
-				DF8422C70E7BA6A900F5680E /* ws_sequence.cpp */,
-			);
-			path = m4;
-			sourceTree = "<group>";
-		};
-		DF8422C90E7BA6A900F5680E /* made */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8501381F3B400D08723 /* console.cpp */,
-				DF46B8511381F3B400D08723 /* console.h */,
-				DF8422CA0E7BA6A900F5680E /* database.cpp */,
-				DF8422CB0E7BA6A900F5680E /* database.h */,
-				DF8422CC0E7BA6A900F5680E /* detection.cpp */,
-				DF8422CD0E7BA6A900F5680E /* graphics.cpp */,
-				DF8422CE0E7BA6A900F5680E /* graphics.h */,
-				DF8422CF0E7BA6A900F5680E /* made.cpp */,
-				DF8422D00E7BA6A900F5680E /* made.h */,
-				DF8422D20E7BA6A900F5680E /* music.cpp */,
-				DF8422D30E7BA6A900F5680E /* music.h */,
-				DF8422D40E7BA6A900F5680E /* pmvplayer.cpp */,
-				DF8422D50E7BA6A900F5680E /* pmvplayer.h */,
-				DF8422D60E7BA6A900F5680E /* redreader.cpp */,
-				DF8422D70E7BA6A900F5680E /* redreader.h */,
-				DF8422D80E7BA6A900F5680E /* resource.cpp */,
-				DF8422D90E7BA6A900F5680E /* resource.h */,
-				DF8422DA0E7BA6A900F5680E /* screen.cpp */,
-				DF8422DB0E7BA6A900F5680E /* screen.h */,
-				DF8422DC0E7BA6A900F5680E /* screenfx.cpp */,
-				DF8422DD0E7BA6A900F5680E /* screenfx.h */,
-				DF8422DE0E7BA6A900F5680E /* script.cpp */,
-				DF8422DF0E7BA6A900F5680E /* script.h */,
-				DF8422E00E7BA6A900F5680E /* scriptfuncs.cpp */,
-				DF8422E10E7BA6A900F5680E /* scriptfuncs.h */,
-				DF8422E20E7BA6A900F5680E /* sound.cpp */,
-				DF8422E30E7BA6A900F5680E /* sound.h */,
-			);
-			path = made;
-			sourceTree = "<group>";
-		};
-		DF8422E60E7BA6A900F5680E /* parallaction */ = {
-			isa = PBXGroup;
-			children = (
-				DF8422E70E7BA6A900F5680E /* balloons.cpp */,
-				DF8422E80E7BA6A900F5680E /* callables_br.cpp */,
-				DF8422E90E7BA6A900F5680E /* callables_ns.cpp */,
-				DF8422EA0E7BA6A900F5680E /* debug.cpp */,
-				DF8422EB0E7BA6A900F5680E /* debug.h */,
-				DF8422EC0E7BA6A900F5680E /* detection.cpp */,
-				DF8422ED0E7BA6A900F5680E /* dialogue.cpp */,
-				DF6118540FE3A8990042AD3F /* disk.cpp */,
-				DF8422EE0E7BA6A900F5680E /* disk.h */,
-				DF8422EF0E7BA6A900F5680E /* disk_br.cpp */,
-				DF8422F00E7BA6A900F5680E /* disk_ns.cpp */,
-				DF573CBA0F5A85B300961A72 /* exec.cpp */,
-				DF8422F10E7BA6A900F5680E /* exec.h */,
-				DF8422F20E7BA6A900F5680E /* exec_br.cpp */,
-				DF8422F30E7BA6A900F5680E /* exec_ns.cpp */,
-				DF8422F40E7BA6A900F5680E /* font.cpp */,
-				DF8422F50E7BA6A900F5680E /* gfxbase.cpp */,
-				DF8422F60E7BA6A900F5680E /* graphics.cpp */,
-				DF8422F70E7BA6A900F5680E /* graphics.h */,
-				DF8422F80E7BA6A900F5680E /* gui.cpp */,
-				DF8422F90E7BA6A900F5680E /* gui.h */,
-				DF8422FA0E7BA6A900F5680E /* gui_br.cpp */,
-				DF8422FB0E7BA6A900F5680E /* gui_ns.cpp */,
-				DF8422FC0E7BA6A900F5680E /* input.cpp */,
-				DF8422FD0E7BA6A900F5680E /* input.h */,
-				DF8422FE0E7BA6A900F5680E /* inventory.cpp */,
-				DF8422FF0E7BA6A900F5680E /* inventory.h */,
-				DF8423010E7BA6A900F5680E /* objects.cpp */,
-				DF8423020E7BA6A900F5680E /* objects.h */,
-				DF8423030E7BA6A900F5680E /* parallaction.cpp */,
-				DF8423040E7BA6A900F5680E /* parallaction.h */,
-				DF8423050E7BA6A900F5680E /* parallaction_br.cpp */,
-				DF8423060E7BA6A900F5680E /* parallaction_ns.cpp */,
-				DF8423070E7BA6A900F5680E /* parser.cpp */,
-				DF8423080E7BA6A900F5680E /* parser.h */,
-				DF8423090E7BA6A900F5680E /* parser_br.cpp */,
-				DF84230A0E7BA6A900F5680E /* parser_ns.cpp */,
-				DF84230B0E7BA6A900F5680E /* saveload.cpp */,
-				DF84230C0E7BA6A900F5680E /* saveload.h */,
-				DF84230E0E7BA6A900F5680E /* sound.h */,
-				DF5CEB260F75535000DEA624 /* sound_br.cpp */,
-				DF5CEB270F75535000DEA624 /* sound_ns.cpp */,
-				DF84230F0E7BA6A900F5680E /* staticres.cpp */,
-				DF8423100E7BA6A900F5680E /* walk.cpp */,
-				DF8423110E7BA6A900F5680E /* walk.h */,
-			);
-			path = parallaction;
-			sourceTree = "<group>";
-		};
-		DF8423120E7BA6A900F5680E /* queen */ = {
-			isa = PBXGroup;
-			children = (
-				DF8423130E7BA6A900F5680E /* bankman.cpp */,
-				DF8423140E7BA6A900F5680E /* bankman.h */,
-				DF8423150E7BA6A900F5680E /* command.cpp */,
-				DF8423160E7BA6A900F5680E /* command.h */,
-				DF8423170E7BA6A900F5680E /* credits.cpp */,
-				DF8423180E7BA6A900F5680E /* credits.h */,
-				DF8423190E7BA6A900F5680E /* cutaway.cpp */,
-				DF84231A0E7BA6A900F5680E /* cutaway.h */,
-				DF84231B0E7BA6A900F5680E /* debug.cpp */,
-				DF84231C0E7BA6A900F5680E /* debug.h */,
-				DF84231D0E7BA6A900F5680E /* defs.h */,
-				DF84231E0E7BA6A900F5680E /* display.cpp */,
-				DF84231F0E7BA6A900F5680E /* display.h */,
-				DF8423200E7BA6A900F5680E /* graphics.cpp */,
-				DF8423210E7BA6A900F5680E /* graphics.h */,
-				DF8423220E7BA6A900F5680E /* grid.cpp */,
-				DF8423230E7BA6A900F5680E /* grid.h */,
-				DF8423240E7BA6A900F5680E /* input.cpp */,
-				DF8423250E7BA6A900F5680E /* input.h */,
-				DF8423260E7BA6A900F5680E /* journal.cpp */,
-				DF8423270E7BA6A900F5680E /* journal.h */,
-				DF8423280E7BA6A900F5680E /* logic.cpp */,
-				DF8423290E7BA6A900F5680E /* logic.h */,
-				DF84232A0E7BA6A900F5680E /* midiadlib.cpp */,
-				DF84232C0E7BA6A900F5680E /* music.cpp */,
-				DF84232D0E7BA6A900F5680E /* music.h */,
-				DF84232E0E7BA6A900F5680E /* musicdata.cpp */,
-				DF84232F0E7BA6A900F5680E /* queen.cpp */,
-				DF8423300E7BA6A900F5680E /* queen.h */,
-				DF8423310E7BA6A900F5680E /* resource.cpp */,
-				DF8423320E7BA6A900F5680E /* resource.h */,
-				DF8423330E7BA6A900F5680E /* restables.cpp */,
-				DF8423340E7BA6A900F5680E /* sound.cpp */,
-				DF8423350E7BA6A900F5680E /* sound.h */,
-				DF8423360E7BA6A900F5680E /* state.cpp */,
-				DF8423370E7BA6A900F5680E /* state.h */,
-				DF8423380E7BA6A900F5680E /* structs.h */,
-				DF8423390E7BA6A900F5680E /* talk.cpp */,
-				DF84233A0E7BA6A900F5680E /* talk.h */,
-				DF84233B0E7BA6A900F5680E /* walk.cpp */,
-				DF84233C0E7BA6A900F5680E /* walk.h */,
-			);
-			path = queen;
-			sourceTree = "<group>";
-		};
-		DF84233E0E7BA6AA00F5680E /* saga */ = {
-			isa = PBXGroup;
-			children = (
-				DF84233F0E7BA6AA00F5680E /* actor.cpp */,
-				DF8423400E7BA6AA00F5680E /* actor.h */,
-				DF8423410E7BA6AA00F5680E /* actor_path.cpp */,
-				DF8423420E7BA6AA00F5680E /* actor_walk.cpp */,
-				DF8423430E7BA6AA00F5680E /* animation.cpp */,
-				DF8423440E7BA6AA00F5680E /* animation.h */,
-				DF8423450E7BA6AA00F5680E /* console.cpp */,
-				DF8423460E7BA6AA00F5680E /* console.h */,
-				DF8423470E7BA6AA00F5680E /* detection.cpp */,
-				DF8423480E7BA6AA00F5680E /* detection_tables.h */,
-				DF8423490E7BA6AA00F5680E /* displayinfo.h */,
-				DF84234A0E7BA6AA00F5680E /* events.cpp */,
-				DF84234B0E7BA6AA00F5680E /* events.h */,
-				DF84234C0E7BA6AA00F5680E /* font.cpp */,
-				DF84234D0E7BA6AA00F5680E /* font.h */,
-				DF84234E0E7BA6AA00F5680E /* font_map.cpp */,
-				DF84234F0E7BA6AA00F5680E /* gfx.cpp */,
-				DF8423500E7BA6AA00F5680E /* gfx.h */,
-				DF8423520E7BA6AA00F5680E /* image.cpp */,
-				DF8423530E7BA6AA00F5680E /* input.cpp */,
-				DF8423540E7BA6AA00F5680E /* interface.cpp */,
-				DF8423550E7BA6AA00F5680E /* interface.h */,
-				DF8423560E7BA6AA00F5680E /* introproc_ihnm.cpp */,
-				DF8423570E7BA6AA00F5680E /* introproc_ite.cpp */,
-				DF8423580E7BA6AA00F5680E /* isomap.cpp */,
-				DF8423590E7BA6AA00F5680E /* isomap.h */,
-				DF84235B0E7BA6AA00F5680E /* itedata.cpp */,
-				DF84235C0E7BA6AA00F5680E /* itedata.h */,
-				DF84235F0E7BA6AA00F5680E /* music.cpp */,
-				DF8423600E7BA6AA00F5680E /* music.h */,
-				DF8423610E7BA6AA00F5680E /* objectmap.cpp */,
-				DF8423620E7BA6AA00F5680E /* objectmap.h */,
-				DF8423630E7BA6AA00F5680E /* palanim.cpp */,
-				DF8423640E7BA6AA00F5680E /* palanim.h */,
-				DF8423650E7BA6AA00F5680E /* puzzle.cpp */,
-				DF8423660E7BA6AA00F5680E /* puzzle.h */,
-				DF8423670E7BA6AA00F5680E /* render.cpp */,
-				DF8423680E7BA6AA00F5680E /* render.h */,
-				DF2FFC600F48672D0006E566 /* resource.cpp */,
-				DF2FFC610F48672D0006E566 /* resource.h */,
-				DF2FFC620F48672D0006E566 /* resource_hrs.cpp */,
-				DF2FFC630F48672D0006E566 /* resource_res.cpp */,
-				DF2FFC640F48672D0006E566 /* resource_rsc.cpp */,
-				DF84236B0E7BA6AA00F5680E /* saga.cpp */,
-				DF84236C0E7BA6AA00F5680E /* saga.h */,
-				DF84236D0E7BA6AA00F5680E /* saveload.cpp */,
-				DF84236E0E7BA6AA00F5680E /* scene.cpp */,
-				DF84236F0E7BA6AA00F5680E /* scene.h */,
-				DF8423700E7BA6AA00F5680E /* script.cpp */,
-				DF8423710E7BA6AA00F5680E /* script.h */,
-				DF8423720E7BA6AA00F5680E /* sfuncs.cpp */,
-				DF2FFC650F48672D0006E566 /* sfuncs_ihnm.cpp */,
-				DF8423730E7BA6AA00F5680E /* sndres.cpp */,
-				DF8423740E7BA6AA00F5680E /* sndres.h */,
-				DF8423750E7BA6AA00F5680E /* sound.cpp */,
-				DF8423760E7BA6AA00F5680E /* sound.h */,
-				DF8423770E7BA6AA00F5680E /* sprite.cpp */,
-				DF8423780E7BA6AA00F5680E /* sprite.h */,
-				DF8423790E7BA6AA00F5680E /* sthread.cpp */,
-			);
-			path = saga;
-			sourceTree = "<group>";
-		};
-		DF84237B0E7BA6AA00F5680E /* scumm */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7501381E46700D08723 /* actor_he.h */,
-				DF46B7511381E46700D08723 /* player_v2base.cpp */,
-				DF46B7521381E46700D08723 /* player_v2base.h */,
-				DF46B7531381E46700D08723 /* player_v2cms.h */,
-				DF84237C0E7BA6AA00F5680E /* actor.cpp */,
-				DF84237D0E7BA6AA00F5680E /* actor.h */,
-				DF84237E0E7BA6AA00F5680E /* akos.cpp */,
-				DF84237F0E7BA6AA00F5680E /* akos.h */,
-				DF8423800E7BA6AA00F5680E /* base-costume.cpp */,
-				DF8423810E7BA6AA00F5680E /* base-costume.h */,
-				DF8423820E7BA6AA00F5680E /* bomp.cpp */,
-				DF8423830E7BA6AA00F5680E /* bomp.h */,
-				DF8423840E7BA6AA00F5680E /* boxes.cpp */,
-				DF8423850E7BA6AA00F5680E /* boxes.h */,
-				DF8423860E7BA6AA00F5680E /* camera.cpp */,
-				DF8423870E7BA6AA00F5680E /* charset-fontdata.cpp */,
-				DF8423880E7BA6AA00F5680E /* charset.cpp */,
-				DF8423890E7BA6AA00F5680E /* charset.h */,
-				DF84238A0E7BA6AA00F5680E /* costume.cpp */,
-				DF84238B0E7BA6AA00F5680E /* costume.h */,
-				DF84238C0E7BA6AA00F5680E /* cursor.cpp */,
-				DF84238D0E7BA6AA00F5680E /* debugger.cpp */,
-				DF84238E0E7BA6AA00F5680E /* debugger.h */,
-				DF84238F0E7BA6AA00F5680E /* detection.cpp */,
-				DF8423900E7BA6AA00F5680E /* detection.h */,
-				DF8423910E7BA6AA00F5680E /* detection_tables.h */,
-				DF8423920E7BA6AA00F5680E /* dialogs.cpp */,
-				DF8423930E7BA6AA00F5680E /* dialogs.h */,
-				DF8423940E7BA6AA00F5680E /* file.cpp */,
-				DF8423950E7BA6AA00F5680E /* file.h */,
-				DF8423960E7BA6AA00F5680E /* file_nes.cpp */,
-				DF8423970E7BA6AA00F5680E /* file_nes.h */,
-				DF8423980E7BA6AA00F5680E /* gfx.cpp */,
-				DF8423990E7BA6AA00F5680E /* gfx.h */,
-				8CD80C90126271BD001C6C87 /* gfx_towns.cpp */,
-				DF84239B0E7BA6AA00F5680E /* he */,
-				DF8423B50E7BA6AA00F5680E /* help.cpp */,
-				DF8423B60E7BA6AA00F5680E /* help.h */,
-				DF8423B70E7BA6AA00F5680E /* imuse */,
-				DF8423C20E7BA6AA00F5680E /* imuse_digi */,
-				DF8423D00E7BA6AA00F5680E /* input.cpp */,
-				DF8423D10E7BA6AA00F5680E /* insane */,
-				DF8423DA0E7BA6AA00F5680E /* midiparser_ro.cpp */,
-				DF8423DC0E7BA6AA00F5680E /* music.h */,
-				DF8423DD0E7BA6AA00F5680E /* nut_renderer.cpp */,
-				DF8423DE0E7BA6AA00F5680E /* nut_renderer.h */,
-				DF8423DF0E7BA6AA00F5680E /* object.cpp */,
-				DF8423E00E7BA6AA00F5680E /* object.h */,
-				DF8423E10E7BA6AA00F5680E /* palette.cpp */,
-				DF8423E20E7BA6AA00F5680E /* player_mod.cpp */,
-				DF8423E30E7BA6AA00F5680E /* player_mod.h */,
-				DF8423E40E7BA6AA00F5680E /* player_nes.cpp */,
-				DF8423E50E7BA6AA00F5680E /* player_nes.h */,
-				DF2EC4FD10E64D7C00765801 /* player_pce.cpp */,
-				DF2EC4FE10E64D7C00765801 /* player_pce.h */,
-				DF2EC4FF10E64D7C00765801 /* player_sid.cpp */,
-				DF2EC50010E64D7C00765801 /* player_sid.h */,
-				DF895C01124C24680077F6E8 /* player_towns.cpp */,
-				DF895C02124C24680077F6E8 /* player_towns.h */,
-				DF8423E60E7BA6AA00F5680E /* player_v1.cpp */,
-				DF8423E70E7BA6AA00F5680E /* player_v1.h */,
-				DF8423E80E7BA6AA00F5680E /* player_v2.cpp */,
-				DF8423E90E7BA6AA00F5680E /* player_v2.h */,
-				DF8423EA0E7BA6AA00F5680E /* player_v2a.cpp */,
-				DF8423EB0E7BA6AA00F5680E /* player_v2a.h */,
-				DF6118C60FE3AABD0042AD3F /* player_v2cms.cpp */,
-				DF8423EC0E7BA6AA00F5680E /* player_v3a.cpp */,
-				DF8423ED0E7BA6AA00F5680E /* player_v3a.h */,
-				DF6BF4F110529EE40069811F /* player_v4a.cpp */,
-				DF6BF4F210529EE40069811F /* player_v4a.h */,
-				DF8423EF0E7BA6AA00F5680E /* resource.cpp */,
-				DF8423F00E7BA6AA00F5680E /* resource.h */,
-				DF8423F10E7BA6AA00F5680E /* resource_v2.cpp */,
-				DF8423F20E7BA6AA00F5680E /* resource_v3.cpp */,
-				DF8423F30E7BA6AA00F5680E /* resource_v4.cpp */,
-				DF8423F40E7BA6AA00F5680E /* room.cpp */,
-				DF8423F50E7BA6AA00F5680E /* saveload.cpp */,
-				DF8423F60E7BA6AA00F5680E /* saveload.h */,
-				DF8423F70E7BA6AA00F5680E /* script.cpp */,
-				DF8423F80E7BA6AA00F5680E /* script.h */,
-				DF8423F90E7BA6AA00F5680E /* script_v0.cpp */,
-				DF8423FA0E7BA6AA00F5680E /* script_v2.cpp */,
-				DF09CC260FAC4EAB00A5AFD7 /* script_v3.cpp */,
-				DF09CC270FAC4EAB00A5AFD7 /* script_v4.cpp */,
-				DF8423FB0E7BA6AA00F5680E /* script_v5.cpp */,
-				DF8423FC0E7BA6AA00F5680E /* script_v6.cpp */,
-				DF8423FD0E7BA6AA00F5680E /* script_v8.cpp */,
-				DF8423FE0E7BA6AA00F5680E /* scumm-md5.h */,
-				DF8423FF0E7BA6AA00F5680E /* scumm.cpp */,
-				DF8424000E7BA6AA00F5680E /* scumm.h */,
-				DF09CC1D0FAC4E6200A5AFD7 /* scumm_v0.h */,
-				DF09CC1E0FAC4E6200A5AFD7 /* scumm_v2.h */,
-				DF09CC1F0FAC4E6200A5AFD7 /* scumm_v3.h */,
-				DF09CC200FAC4E6200A5AFD7 /* scumm_v4.h */,
-				DF09CC210FAC4E6200A5AFD7 /* scumm_v5.h */,
-				DF09CC220FAC4E6200A5AFD7 /* scumm_v6.h */,
-				DF09CC230FAC4E6200A5AFD7 /* scumm_v7.h */,
-				DF09CC240FAC4E6200A5AFD7 /* scumm_v8.h */,
-				DF8424010E7BA6AA00F5680E /* smush */,
-				DF8424150E7BA6AB00F5680E /* sound.cpp */,
-				DF8424160E7BA6AB00F5680E /* sound.h */,
-				DF8424170E7BA6AB00F5680E /* string.cpp */,
-				DF8424190E7BA6AB00F5680E /* usage_bits.cpp */,
-				DF84241A0E7BA6AB00F5680E /* usage_bits.h */,
-				DF84241B0E7BA6AB00F5680E /* util.cpp */,
-				DF84241C0E7BA6AB00F5680E /* util.h */,
-				DF84241D0E7BA6AB00F5680E /* vars.cpp */,
-				DF84241E0E7BA6AB00F5680E /* verbs.cpp */,
-				DF84241F0E7BA6AB00F5680E /* verbs.h */,
-			);
-			path = scumm;
-			sourceTree = "<group>";
-		};
-		DF84239B0E7BA6AA00F5680E /* he */ = {
-			isa = PBXGroup;
-			children = (
-				DF84239C0E7BA6AA00F5680E /* animation_he.cpp */,
-				DF84239D0E7BA6AA00F5680E /* animation_he.h */,
-				DF84239E0E7BA6AA00F5680E /* cup_player_he.cpp */,
-				DF84239F0E7BA6AA00F5680E /* cup_player_he.h */,
-				DF8423A00E7BA6AA00F5680E /* floodfill_he.cpp */,
-				DF8423A10E7BA6AA00F5680E /* floodfill_he.h */,
-				DF8423A20E7BA6AA00F5680E /* intern_he.h */,
-				DF8423A30E7BA6AA00F5680E /* logic_he.cpp */,
-				DF8423A40E7BA6AA00F5680E /* logic_he.h */,
-				DF8423A50E7BA6AA00F5680E /* palette_he.cpp */,
-				DF8423A60E7BA6AA00F5680E /* resource_he.cpp */,
-				DF8423A70E7BA6AA00F5680E /* resource_he.h */,
-				DF8423A80E7BA6AA00F5680E /* script_v100he.cpp */,
-				DF8423A90E7BA6AA00F5680E /* script_v60he.cpp */,
-				DF8423AA0E7BA6AA00F5680E /* script_v70he.cpp */,
-				DF8423AB0E7BA6AA00F5680E /* script_v71he.cpp */,
-				DF8423AC0E7BA6AA00F5680E /* script_v72he.cpp */,
-				DF8423AD0E7BA6AA00F5680E /* script_v80he.cpp */,
-				DF8423AE0E7BA6AA00F5680E /* script_v90he.cpp */,
-				DF8423AF0E7BA6AA00F5680E /* sound_he.cpp */,
-				DF8423B00E7BA6AA00F5680E /* sound_he.h */,
-				DF8423B10E7BA6AA00F5680E /* sprite_he.cpp */,
-				DF8423B20E7BA6AA00F5680E /* sprite_he.h */,
-				DF8423B30E7BA6AA00F5680E /* wiz_he.cpp */,
-				DF8423B40E7BA6AA00F5680E /* wiz_he.h */,
-			);
-			path = he;
-			sourceTree = "<group>";
-		};
-		DF8423B70E7BA6AA00F5680E /* imuse */ = {
-			isa = PBXGroup;
-			children = (
-				DF8423B80E7BA6AA00F5680E /* imuse.cpp */,
-				DF8423B90E7BA6AA00F5680E /* imuse.h */,
-				DF8423BA0E7BA6AA00F5680E /* imuse_internal.h */,
-				DF8423BB0E7BA6AA00F5680E /* imuse_part.cpp */,
-				DF8423BC0E7BA6AA00F5680E /* imuse_player.cpp */,
-				DF8423BD0E7BA6AA00F5680E /* instrument.cpp */,
-				DF8423BE0E7BA6AA00F5680E /* instrument.h */,
-				DF8423BF0E7BA6AA00F5680E /* sysex.h */,
-				DF8423C00E7BA6AA00F5680E /* sysex_samnmax.cpp */,
-				DF8423C10E7BA6AA00F5680E /* sysex_scumm.cpp */,
-			);
-			path = imuse;
-			sourceTree = "<group>";
-		};
-		DF8423C20E7BA6AA00F5680E /* imuse_digi */ = {
-			isa = PBXGroup;
-			children = (
-				DF8423C30E7BA6AA00F5680E /* dimuse.cpp */,
-				DF8423C40E7BA6AA00F5680E /* dimuse.h */,
-				DF8423C50E7BA6AA00F5680E /* dimuse_bndmgr.cpp */,
-				DF8423C60E7BA6AA00F5680E /* dimuse_bndmgr.h */,
-				DF8423C70E7BA6AA00F5680E /* dimuse_codecs.cpp */,
-				DF8423C80E7BA6AA00F5680E /* dimuse_music.cpp */,
-				DF8423C90E7BA6AA00F5680E /* dimuse_script.cpp */,
-				DF8423CA0E7BA6AA00F5680E /* dimuse_sndmgr.cpp */,
-				DF8423CB0E7BA6AA00F5680E /* dimuse_sndmgr.h */,
-				DF8423CC0E7BA6AA00F5680E /* dimuse_tables.cpp */,
-				DF8423CD0E7BA6AA00F5680E /* dimuse_tables.h */,
-				DF8423CE0E7BA6AA00F5680E /* dimuse_track.cpp */,
-				DF8423CF0E7BA6AA00F5680E /* dimuse_track.h */,
-			);
-			path = imuse_digi;
-			sourceTree = "<group>";
-		};
-		DF8423D10E7BA6AA00F5680E /* insane */ = {
-			isa = PBXGroup;
-			children = (
-				DF8423D20E7BA6AA00F5680E /* insane.cpp */,
-				DF8423D30E7BA6AA00F5680E /* insane.h */,
-				DF8423D40E7BA6AA00F5680E /* insane_ben.cpp */,
-				DF8423D50E7BA6AA00F5680E /* insane_enemy.cpp */,
-				DF8423D60E7BA6AA00F5680E /* insane_iact.cpp */,
-				DF8423D70E7BA6AA00F5680E /* insane_scenes.cpp */,
-			);
-			path = insane;
-			sourceTree = "<group>";
-		};
-		DF8424010E7BA6AA00F5680E /* smush */ = {
-			isa = PBXGroup;
-			children = (
-				DF8424020E7BA6AA00F5680E /* channel.cpp */,
-				DF8424030E7BA6AA00F5680E /* channel.h */,
-				DF8424060E7BA6AA00F5680E /* codec1.cpp */,
-				DF8424070E7BA6AA00F5680E /* codec37.cpp */,
-				DF8424080E7BA6AA00F5680E /* codec37.h */,
-				DF8424090E7BA6AA00F5680E /* codec47.cpp */,
-				DF84240A0E7BA6AA00F5680E /* codec47.h */,
-				DF84240D0E7BA6AA00F5680E /* imuse_channel.cpp */,
-				DF84240E0E7BA6AA00F5680E /* saud_channel.cpp */,
-				DF84240F0E7BA6AA00F5680E /* smush_font.cpp */,
-				DF8424100E7BA6AA00F5680E /* smush_font.h */,
-				DF8424110E7BA6AA00F5680E /* smush_mixer.cpp */,
-				DF8424120E7BA6AA00F5680E /* smush_mixer.h */,
-				DF8424130E7BA6AA00F5680E /* smush_player.cpp */,
-				DF8424140E7BA6AB00F5680E /* smush_player.h */,
-			);
-			path = smush;
-			sourceTree = "<group>";
-		};
-		DF8424200E7BA6AB00F5680E /* sky */ = {
-			isa = PBXGroup;
-			children = (
-				DF8424210E7BA6AB00F5680E /* autoroute.cpp */,
-				DF8424220E7BA6AB00F5680E /* autoroute.h */,
-				DF8424230E7BA6AB00F5680E /* compact.cpp */,
-				DF8424240E7BA6AB00F5680E /* compact.h */,
-				DF8424250E7BA6AB00F5680E /* control.cpp */,
-				DF8424260E7BA6AB00F5680E /* control.h */,
-				DF8424270E7BA6AB00F5680E /* debug.cpp */,
-				DF8424280E7BA6AB00F5680E /* debug.h */,
-				DFAAAFF80F0112C1003E9390 /* detection.cpp */,
-				DF8424290E7BA6AB00F5680E /* disk.cpp */,
-				DF84242A0E7BA6AB00F5680E /* disk.h */,
-				DF84242B0E7BA6AB00F5680E /* grid.cpp */,
-				DF84242C0E7BA6AB00F5680E /* grid.h */,
-				DF84242D0E7BA6AB00F5680E /* hufftext.cpp */,
-				DF84242E0E7BA6AB00F5680E /* intro.cpp */,
-				DF84242F0E7BA6AB00F5680E /* intro.h */,
-				DF8424300E7BA6AB00F5680E /* logic.cpp */,
-				DF8424310E7BA6AB00F5680E /* logic.h */,
-				DF8424330E7BA6AB00F5680E /* mouse.cpp */,
-				DF8424340E7BA6AB00F5680E /* mouse.h */,
-				DF8424350E7BA6AB00F5680E /* music */,
-				DF8424420E7BA6AB00F5680E /* rnc_deco.cpp */,
-				DF8424430E7BA6AB00F5680E /* rnc_deco.h */,
-				DF8424440E7BA6AB00F5680E /* screen.cpp */,
-				DF8424450E7BA6AB00F5680E /* screen.h */,
-				DF8424460E7BA6AB00F5680E /* sky.cpp */,
-				DF8424470E7BA6AB00F5680E /* sky.h */,
-				DF8424480E7BA6AB00F5680E /* skydefs.h */,
-				DF8424490E7BA6AB00F5680E /* sound.cpp */,
-				DF84244A0E7BA6AB00F5680E /* sound.h */,
-				DF84244B0E7BA6AB00F5680E /* struc.h */,
-				DF84244C0E7BA6AB00F5680E /* text.cpp */,
-				DF84244D0E7BA6AB00F5680E /* text.h */,
-			);
-			path = sky;
-			sourceTree = "<group>";
-		};
-		DF8424350E7BA6AB00F5680E /* music */ = {
-			isa = PBXGroup;
-			children = (
-				DF8424360E7BA6AB00F5680E /* adlibchannel.cpp */,
-				DF8424370E7BA6AB00F5680E /* adlibchannel.h */,
-				DF8424380E7BA6AB00F5680E /* adlibmusic.cpp */,
-				DF8424390E7BA6AB00F5680E /* adlibmusic.h */,
-				DF84243A0E7BA6AB00F5680E /* gmchannel.cpp */,
-				DF84243B0E7BA6AB00F5680E /* gmchannel.h */,
-				DF84243C0E7BA6AB00F5680E /* gmmusic.cpp */,
-				DF84243D0E7BA6AB00F5680E /* gmmusic.h */,
-				DF84243E0E7BA6AB00F5680E /* mt32music.cpp */,
-				DF84243F0E7BA6AB00F5680E /* mt32music.h */,
-				DF8424400E7BA6AB00F5680E /* musicbase.cpp */,
-				DF8424410E7BA6AB00F5680E /* musicbase.h */,
-			);
-			path = music;
-			sourceTree = "<group>";
-		};
-		DF84244E0E7BA6AB00F5680E /* sword1 */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7C61381E72500D08723 /* console.cpp */,
-				DF46B7C71381E72500D08723 /* console.h */,
-				DF84244F0E7BA6AB00F5680E /* animation.cpp */,
-				DF8424500E7BA6AB00F5680E /* animation.h */,
-				DF8424510E7BA6AB00F5680E /* collision.h */,
-				DF8424520E7BA6AB00F5680E /* control.cpp */,
-				DF8424530E7BA6AB00F5680E /* control.h */,
-				DF8424560E7BA6AB00F5680E /* debug.cpp */,
-				DF8424570E7BA6AB00F5680E /* debug.h */,
-				DFAAAFFB0F0112DF003E9390 /* detection.cpp */,
-				DF8424580E7BA6AB00F5680E /* eventman.cpp */,
-				DF8424590E7BA6AB00F5680E /* eventman.h */,
-				DF84245A0E7BA6AB00F5680E /* logic.cpp */,
-				DF84245B0E7BA6AB00F5680E /* logic.h */,
-				DF84245C0E7BA6AB00F5680E /* memman.cpp */,
-				DF84245D0E7BA6AB00F5680E /* memman.h */,
-				DF84245E0E7BA6AB00F5680E /* menu.cpp */,
-				DF84245F0E7BA6AB00F5680E /* menu.h */,
-				DF8424610E7BA6AB00F5680E /* mouse.cpp */,
-				DF8424620E7BA6AB00F5680E /* mouse.h */,
-				DF8424630E7BA6AB00F5680E /* music.cpp */,
-				DF8424640E7BA6AB00F5680E /* music.h */,
-				DF8424650E7BA6AB00F5680E /* object.h */,
-				DF8424660E7BA6AB00F5680E /* objectman.cpp */,
-				DF8424670E7BA6AB00F5680E /* objectman.h */,
-				DF8424680E7BA6AB00F5680E /* resman.cpp */,
-				DF8424690E7BA6AB00F5680E /* resman.h */,
-				DF84246A0E7BA6AB00F5680E /* router.cpp */,
-				DF84246B0E7BA6AB00F5680E /* router.h */,
-				DF84246C0E7BA6AB00F5680E /* screen.cpp */,
-				DF84246D0E7BA6AB00F5680E /* screen.h */,
-				DF84246E0E7BA6AB00F5680E /* sound.cpp */,
-				DF84246F0E7BA6AB00F5680E /* sound.h */,
-				DF8424700E7BA6AB00F5680E /* staticres.cpp */,
-				DF8424710E7BA6AB00F5680E /* sword1.cpp */,
-				DF8424720E7BA6AB00F5680E /* sword1.h */,
-				DF8424730E7BA6AB00F5680E /* sworddefs.h */,
-				DF8424740E7BA6AB00F5680E /* swordres.h */,
-				DF8424750E7BA6AB00F5680E /* text.cpp */,
-				DF8424760E7BA6AB00F5680E /* text.h */,
-			);
-			path = sword1;
-			sourceTree = "<group>";
-		};
-		DF8424770E7BA6AB00F5680E /* sword2 */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7A81381E5F100D08723 /* header.cpp */,
-				DF8424780E7BA6AB00F5680E /* animation.cpp */,
-				DF8424790E7BA6AB00F5680E /* animation.h */,
-				DF84247A0E7BA6AB00F5680E /* anims.cpp */,
-				DF84247B0E7BA6AB00F5680E /* console.cpp */,
-				DF84247C0E7BA6AB00F5680E /* console.h */,
-				DF84247D0E7BA6AB00F5680E /* controls.cpp */,
-				DF84247E0E7BA6AB00F5680E /* controls.h */,
-				DF84247F0E7BA6AB00F5680E /* debug.cpp */,
-				DF8424800E7BA6AB00F5680E /* debug.h */,
-				DF8424810E7BA6AB00F5680E /* defs.h */,
-				DF8424820E7BA6AB00F5680E /* events.cpp */,
-				DF8424830E7BA6AB00F5680E /* function.cpp */,
-				DF8424840E7BA6AB00F5680E /* header.h */,
-				DF8424850E7BA6AB00F5680E /* icons.cpp */,
-				DF8424860E7BA6AB00F5680E /* interpreter.cpp */,
-				DF8424870E7BA6AB00F5680E /* interpreter.h */,
-				DF8424880E7BA6AB00F5680E /* layers.cpp */,
-				DF8424890E7BA6AB00F5680E /* logic.cpp */,
-				DF84248A0E7BA6AB00F5680E /* logic.h */,
-				DF84248B0E7BA6AB00F5680E /* maketext.cpp */,
-				DF84248C0E7BA6AB00F5680E /* maketext.h */,
-				DF84248D0E7BA6AB00F5680E /* memory.cpp */,
-				DF84248E0E7BA6AB00F5680E /* memory.h */,
-				DF84248F0E7BA6AB00F5680E /* menu.cpp */,
-				DF8424910E7BA6AB00F5680E /* mouse.cpp */,
-				DF8424920E7BA6AB00F5680E /* mouse.h */,
-				DF8424930E7BA6AB00F5680E /* music.cpp */,
-				DF8424940E7BA6AB00F5680E /* object.h */,
-				DF8424950E7BA6AB00F5680E /* palette.cpp */,
-				DF8424960E7BA6AB00F5680E /* protocol.cpp */,
-				DF8424970E7BA6AB00F5680E /* render.cpp */,
-				DF8424980E7BA6AB00F5680E /* resman.cpp */,
-				DF8424990E7BA6AB00F5680E /* resman.h */,
-				DF84249A0E7BA6AB00F5680E /* router.cpp */,
-				DF84249B0E7BA6AB00F5680E /* router.h */,
-				DF84249C0E7BA6AB00F5680E /* saveload.cpp */,
-				DF84249D0E7BA6AB00F5680E /* saveload.h */,
-				DF84249E0E7BA6AB00F5680E /* screen.cpp */,
-				DF84249F0E7BA6AB00F5680E /* screen.h */,
-				DF8424A00E7BA6AB00F5680E /* scroll.cpp */,
-				DF8424A10E7BA6AB00F5680E /* sound.cpp */,
-				DF8424A20E7BA6AB00F5680E /* sound.h */,
-				DF8424A30E7BA6AB00F5680E /* speech.cpp */,
-				DF8424A40E7BA6AB00F5680E /* sprite.cpp */,
-				DF8424A50E7BA6AB00F5680E /* startup.cpp */,
-				DF8424A60E7BA6AB00F5680E /* sword2.cpp */,
-				DF8424A70E7BA6AB00F5680E /* sword2.h */,
-				DF8424A80E7BA6AB00F5680E /* sync.cpp */,
-				DF8424A90E7BA6AB00F5680E /* walker.cpp */,
-			);
-			path = sword2;
-			sourceTree = "<group>";
-		};
-		DF8424AA0E7BA6AB00F5680E /* tinsel */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8901381F62B00D08723 /* adpcm.cpp */,
-				DF46B8911381F62B00D08723 /* adpcm.h */,
-				DF46B6F21381E18900D08723 /* coroutine.cpp */,
-				DF8424AB0E7BA6AB00F5680E /* actors.cpp */,
-				DF8424AC0E7BA6AB00F5680E /* actors.h */,
-				DF8424AD0E7BA6AB00F5680E /* anim.cpp */,
-				DF8424AE0E7BA6AB00F5680E /* anim.h */,
-				DF8424AF0E7BA6AB00F5680E /* background.cpp */,
-				DF8424B00E7BA6AB00F5680E /* background.h */,
-				DF8424B10E7BA6AB00F5680E /* bg.cpp */,
-				DF2FFC1F0F4862520006E566 /* bmv.cpp */,
-				DF8424B20E7BA6AB00F5680E /* cliprect.cpp */,
-				DF8424B30E7BA6AB00F5680E /* cliprect.h */,
-				DF8424B40E7BA6AB00F5680E /* config.cpp */,
-				DF8424B50E7BA6AB00F5680E /* config.h */,
-				DF8424B60E7BA6AB00F5680E /* coroutine.h */,
-				DF8424B70E7BA6AB00F5680E /* cursor.cpp */,
-				DF8424B80E7BA6AB00F5680E /* cursor.h */,
-				DF8424B90E7BA6AB00F5680E /* debugger.cpp */,
-				DF8424BA0E7BA6AB00F5680E /* debugger.h */,
-				DF8424BB0E7BA6AB00F5680E /* detection.cpp */,
-				DF2FFC200F4862520006E566 /* dialogs.cpp */,
-				DF2FFC210F4862520006E566 /* dialogs.h */,
-				DF2FFC220F4862520006E566 /* drives.cpp */,
-				DF2FFC230F4862520006E566 /* drives.h */,
-				DF8424BC0E7BA6AB00F5680E /* dw.h */,
-				DF8424BD0E7BA6AB00F5680E /* effect.cpp */,
-				DF8424BE0E7BA6AB00F5680E /* events.cpp */,
-				DF8424BF0E7BA6AB00F5680E /* events.h */,
-				DF8424C00E7BA6AB00F5680E /* faders.cpp */,
-				DF8424C10E7BA6AB00F5680E /* faders.h */,
-				DF8424C20E7BA6AB00F5680E /* film.h */,
-				DF8424C30E7BA6AB00F5680E /* font.cpp */,
-				DF8424C40E7BA6AB00F5680E /* font.h */,
-				DF8424C50E7BA6AB00F5680E /* graphics.cpp */,
-				DF8424C60E7BA6AB00F5680E /* graphics.h */,
-				DF8424C70E7BA6AB00F5680E /* handle.cpp */,
-				DF8424C80E7BA6AB00F5680E /* handle.h */,
-				DF8424C90E7BA6AB00F5680E /* heapmem.cpp */,
-				DF8424CA0E7BA6AB00F5680E /* heapmem.h */,
-				DF8424CD0E7BA6AB00F5680E /* mareels.cpp */,
-				DF2FFC240F4862520006E566 /* mareels.h */,
-				DF8424CF0E7BA6AB00F5680E /* move.cpp */,
-				DF8424D00E7BA6AB00F5680E /* move.h */,
-				DF8424D10E7BA6AB00F5680E /* multiobj.cpp */,
-				DF8424D20E7BA6AB00F5680E /* multiobj.h */,
-				DF8424D30E7BA6AB00F5680E /* music.cpp */,
-				DF8424D40E7BA6AB00F5680E /* music.h */,
-				DF8424D50E7BA6AB00F5680E /* object.cpp */,
-				DF8424D60E7BA6AB00F5680E /* object.h */,
-				DF8424D70E7BA6AB00F5680E /* palette.cpp */,
-				DF8424D80E7BA6AB00F5680E /* palette.h */,
-				DF8424D90E7BA6AB00F5680E /* pcode.cpp */,
-				DF8424DA0E7BA6AB00F5680E /* pcode.h */,
-				DF8424DB0E7BA6AB00F5680E /* pdisplay.cpp */,
-				DF2FFC250F4862520006E566 /* pdisplay.h */,
-				DF8424DC0E7BA6AB00F5680E /* pid.h */,
-				DF8424DD0E7BA6AB00F5680E /* play.cpp */,
-				DF2FFC260F4862520006E566 /* play.h */,
-				DF8424DE0E7BA6AB00F5680E /* polygons.cpp */,
-				DF8424DF0E7BA6AB00F5680E /* polygons.h */,
-				DF8424E00E7BA6AB00F5680E /* rince.cpp */,
-				DF8424E10E7BA6AB00F5680E /* rince.h */,
-				DF8424E20E7BA6AB00F5680E /* saveload.cpp */,
-				DF8424E30E7BA6AB00F5680E /* savescn.cpp */,
-				DF8424E40E7BA6AB00F5680E /* savescn.h */,
-				DF8424E50E7BA6AB00F5680E /* scene.cpp */,
-				DF8424E60E7BA6AB00F5680E /* scene.h */,
-				DF8424E70E7BA6AB00F5680E /* sched.cpp */,
-				DF8424E80E7BA6AB00F5680E /* sched.h */,
-				DF8424E90E7BA6AB00F5680E /* scn.cpp */,
-				DF8424EA0E7BA6AB00F5680E /* scn.h */,
-				DF8424EB0E7BA6AB00F5680E /* scroll.cpp */,
-				DF8424EC0E7BA6AB00F5680E /* scroll.h */,
-				DF8424EE0E7BA6AB00F5680E /* sound.cpp */,
-				DF8424EF0E7BA6AB00F5680E /* sound.h */,
-				DF8424F00E7BA6AB00F5680E /* strres.cpp */,
-				DF8424F10E7BA6AB00F5680E /* strres.h */,
-				DF2FFC270F4862520006E566 /* sysvar.cpp */,
-				DF2FFC280F4862520006E566 /* sysvar.h */,
-				DF8424F20E7BA6AB00F5680E /* text.cpp */,
-				DF8424F30E7BA6AB00F5680E /* text.h */,
-				DF8424F40E7BA6AB00F5680E /* timers.cpp */,
-				DF8424F50E7BA6AB00F5680E /* timers.h */,
-				DF8424F60E7BA6AB00F5680E /* tinlib.cpp */,
-				DF8424F70E7BA6AB00F5680E /* tinlib.h */,
-				DF8424F80E7BA6AB00F5680E /* tinsel.cpp */,
-				DF8424F90E7BA6AB00F5680E /* tinsel.h */,
-				DF8424FA0E7BA6AB00F5680E /* token.cpp */,
-				DF8424FB0E7BA6AB00F5680E /* token.h */,
-			);
-			path = tinsel;
-			sourceTree = "<group>";
-		};
-		DF8424FC0E7BA6AB00F5680E /* touche */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B84B1381F39E00D08723 /* console.cpp */,
-				DF46B84C1381F39E00D08723 /* console.h */,
-				DF8424FD0E7BA6AB00F5680E /* detection.cpp */,
-				DF8424FE0E7BA6AB00F5680E /* graphics.cpp */,
-				DF8424FF0E7BA6AB00F5680E /* graphics.h */,
-				DF8425000E7BA6AB00F5680E /* menu.cpp */,
-				DF8425010E7BA6AB00F5680E /* midi.cpp */,
-				DF8425020E7BA6AB00F5680E /* midi.h */,
-				DF8425040E7BA6AB00F5680E /* opcodes.cpp */,
-				DF8425050E7BA6AB00F5680E /* resource.cpp */,
-				DF8425060E7BA6AB00F5680E /* saveload.cpp */,
-				DF8425070E7BA6AB00F5680E /* staticres.cpp */,
-				DF8425080E7BA6AB00F5680E /* touche.cpp */,
-				DF8425090E7BA6AB00F5680E /* touche.h */,
-			);
-			path = touche;
-			sourceTree = "<group>";
-		};
-		DF9B9277118E475D0069C19D /* games */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = games;
-			sourceTree = "<group>";
-		};
-		DFA2A57A118E433A00344DFD /* Resources-iPad */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = "Resources-iPad";
-			sourceTree = "<group>";
-		};
-		DFC830190F48AF18005EF03C /* sci */ = {
-			isa = PBXGroup;
-			children = (
-				DFAAD2390F50120E00C3A4E2 /* console.cpp */,
-				DFAAD23A0F50120E00C3A4E2 /* console.h */,
-				DF6118420FE3A8250042AD3F /* debug.h */,
-				DF6118430FE3A8250042AD3F /* decompressor.cpp */,
-				DF6118440FE3A8250042AD3F /* decompressor.h */,
-				DFC8301A0F48AF18005EF03C /* detection.cpp */,
-				DF90E9B410AEDA5300C8F93F /* detection_tables.h */,
-				DFC8301B0F48AF18005EF03C /* engine */,
-				DF2EC40310E64C8000765801 /* event.cpp */,
-				DF2EC40410E64C8000765801 /* event.h */,
-				DF45B175116628A5009B85CC /* graphics */,
-				DF45B1A5116628A5009B85CC /* parser */,
-				DF6118450FE3A8250042AD3F /* resource.cpp */,
-				DF6118460FE3A8250042AD3F /* resource.h */,
-				DFB0577D11B7541F0015AE65 /* resource_audio.cpp */,
-				DFC830960F48AF18005EF03C /* sci.cpp */,
-				DFC830970F48AF18005EF03C /* sci.h */,
-				DF45B1AB116628A5009B85CC /* sound */,
-				DFB0577E11B7541F0015AE65 /* util.cpp */,
-				DFB0577F11B7541F0015AE65 /* util.h */,
-				DF45B1C5116628A5009B85CC /* video */,
-			);
-			path = sci;
-			sourceTree = "<group>";
-		};
-		DFC8301B0F48AF18005EF03C /* engine */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7BB1381E6C000D08723 /* object.cpp */,
-				DF46B7BC1381E6C000D08723 /* object.h */,
-				DF46B7661381E4E400D08723 /* vm_types.cpp */,
-				DFCDC6D5116629CE00A7D2A0 /* features.cpp */,
-				DFCDC6D6116629CE00A7D2A0 /* features.h */,
-				DFC8301E0F48AF18005EF03C /* gc.cpp */,
-				DFC8301F0F48AF18005EF03C /* gc.h */,
-				DFC830230F48AF18005EF03C /* kernel.cpp */,
-				DF573BFE0F5A81EA00961A72 /* kernel.h */,
-				DF895C28124C25350077F6E8 /* kernel_tables.h */,
-				DFC830260F48AF18005EF03C /* kevent.cpp */,
-				DFC830270F48AF18005EF03C /* kfile.cpp */,
-				DFC830280F48AF18005EF03C /* kgraphics.cpp */,
-				DFC830290F48AF18005EF03C /* klists.cpp */,
-				DFC8302A0F48AF18005EF03C /* kmath.cpp */,
-				DFC8302B0F48AF18005EF03C /* kmenu.cpp */,
-				DF6118380FE3A8080042AD3F /* kmisc.cpp */,
-				DFC8302C0F48AF18005EF03C /* kmovement.cpp */,
-				DFCDC6D7116629CE00A7D2A0 /* kparse.cpp */,
-				DFC8302D0F48AF18005EF03C /* kpathing.cpp */,
-				DFC8302E0F48AF18005EF03C /* kscripts.cpp */,
-				DFC8302F0F48AF18005EF03C /* ksound.cpp */,
-				DFC830300F48AF18005EF03C /* kstring.cpp */,
-				DF7F286411FF23EF00159131 /* kvideo.cpp */,
-				DFC830310F48AF18005EF03C /* message.cpp */,
-				DFC830320F48AF18005EF03C /* message.h */,
-				DFC830360F48AF18005EF03C /* savegame.cpp */,
-				DF61183B0FE3A8080042AD3F /* savegame.h */,
-				DF89C2A30F62D79E00D756B6 /* script.cpp */,
-				DF573BFF0F5A81EA00961A72 /* script.h */,
-				DF895C29124C25350077F6E8 /* script_patches.cpp */,
-				DFC830390F48AF18005EF03C /* scriptdebug.cpp */,
-				DFC8303A0F48AF18005EF03C /* seg_manager.cpp */,
-				DF573C000F5A81EA00961A72 /* seg_manager.h */,
-				DF6118390FE3A8080042AD3F /* segment.cpp */,
-				DF61183A0FE3A8080042AD3F /* segment.h */,
-				DF90E9BD10AEDA9B00C8F93F /* selector.cpp */,
-				DFCDC6D8116629CE00A7D2A0 /* selector.h */,
-				DF573C010F5A81EA00961A72 /* state.cpp */,
-				DF573C020F5A81EA00961A72 /* state.h */,
-				DF7585F6100CB75800CC3324 /* static_selectors.cpp */,
-				DFC8303C0F48AF18005EF03C /* vm.cpp */,
-				DF573C030F5A81EA00961A72 /* vm.h */,
-				DF573C040F5A81EA00961A72 /* vm_types.h */,
-				DF7F286511FF23EF00159131 /* workarounds.cpp */,
-				DF7F286611FF23EF00159131 /* workarounds.h */,
-			);
-			path = engine;
-			sourceTree = "<group>";
-		};
-		DFD5184C0DF3420D00854012 /* scaler */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DE9139E1B6F0072D195 /* aspect.h */,
-				F9946DEA139E1B6F0072D195 /* downscaler.cpp */,
-				F9946DEB139E1B6F0072D195 /* downscaler.h */,
-				DFD518AA0DF34BA600854012 /* 2xsai.cpp */,
-				DFD518AB0DF34BA600854012 /* aspect.cpp */,
-				DFD5189E0DF34AD700854012 /* intern.h */,
-				DFD518B50DF34BA600854012 /* scale2x.cpp */,
-				DFD518B60DF34BA600854012 /* scale2x.h */,
-				DFD518B80DF34BA600854012 /* scale3x.cpp */,
-				DFD518B90DF34BA600854012 /* scale3x.h */,
-				DFD518A00DF34B2500854012 /* scalebit.cpp */,
-				DFD518A10DF34B2500854012 /* scalebit.h */,
-				DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */,
-			);
-			path = scaler;
-			sourceTree = "<group>";
-		};
-		DFD6476A0F49F7D2008E18EF /* libs */ = {
-			isa = PBXGroup;
-			children = (
-				DFD6476B0F49F7EF008E18EF /* libFLAC.a */,
-				DFD6476C0F49F7EF008E18EF /* libmad.a */,
-				DFD6476F0F49F7EF008E18EF /* libvorbisidec.a */,
-			);
-			name = libs;
-			sourceTree = "<group>";
-		};
-		DFE470C00D81F4BA00B6D1FB /* base */ = {
-			isa = PBXGroup;
-			children = (
-				DFE470C10D81F4BA00B6D1FB /* commandLine.cpp */,
-				DFE470C20D81F4BA00B6D1FB /* commandLine.h */,
-				DFE470C70D81F4BA00B6D1FB /* main.cpp */,
-				DFE470C80D81F4BA00B6D1FB /* main.h */,
-				DFE470CA0D81F4BA00B6D1FB /* plugins.cpp */,
-				DFE470CB0D81F4BA00B6D1FB /* plugins.h */,
-				DFE470CC0D81F4BA00B6D1FB /* version.cpp */,
-				DFE470CD0D81F4BA00B6D1FB /* version.h */,
-			);
-			name = base;
-			path = ../../base;
-			sourceTree = SOURCE_ROOT;
-		};
-		DFE470D50D81F4E700B6D1FB /* backends */ = {
-			isa = PBXGroup;
-			children = (
-				F9946E07139E1C3E0072D195 /* graphics */,
-				F9946DFA139E1BCB0072D195 /* mixer */,
-				DF46B86D1381F47B00D08723 /* audiocd */,
-				DF46B7B01381E64E00D08723 /* mutex */,
-				DF46B7471381E40F00D08723 /* modular-backend.cpp */,
-				DF46B7481381E40F00D08723 /* modular-backend.h */,
-				DF46B7411381E3F200D08723 /* log */,
-				DF2FFC5B0F4866E70006E566 /* base-backend.cpp */,
-				DF2FFC5C0F4866E70006E566 /* base-backend.h */,
-				DFE470D60D81F4E700B6D1FB /* events */,
-				DFE470DA0D81F4E700B6D1FB /* fs */,
-				DFE471090D81F4E700B6D1FB /* midi */,
-				DFE471170D81F4E700B6D1FB /* platform */,
-				DFE4737B0D81F4E800B6D1FB /* plugins */,
-				DFE473890D81F4E800B6D1FB /* saves */,
-				DFE473910D81F4E800B6D1FB /* timer */,
-			);
-			name = backends;
-			path = ../../backends;
-			sourceTree = SOURCE_ROOT;
-		};
-		DFE470D60D81F4E700B6D1FB /* events */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7CC1381E74D00D08723 /* sdl */,
-				DFE470D70D81F4E700B6D1FB /* default */,
-			);
-			path = events;
-			sourceTree = "<group>";
-		};
-		DFE470D70D81F4E700B6D1FB /* default */ = {
-			isa = PBXGroup;
-			children = (
-				DFE470D80D81F4E700B6D1FB /* default-events.cpp */,
-				DFE470D90D81F4E700B6D1FB /* default-events.h */,
-			);
-			path = default;
-			sourceTree = "<group>";
-		};
-		DFE470DA0D81F4E700B6D1FB /* fs */ = {
-			isa = PBXGroup;
-			children = (
-				DF842A6B0E7BBD5700F5680E /* stdiostream.cpp */,
-				DF842A6C0E7BBD5700F5680E /* stdiostream.h */,
-				DFE470DE0D81F4E700B6D1FB /* abstract-fs.h */,
-				DFE470E80D81F4E700B6D1FB /* fs-factory.h */,
-				DFE470F50D81F4E700B6D1FB /* posix */,
-			);
-			path = fs;
-			sourceTree = "<group>";
-		};
-		DFE470F50D81F4E700B6D1FB /* posix */ = {
-			isa = PBXGroup;
-			children = (
-				DFADEBB613820E0C00C46364 /* posix-fs.cpp */,
-				DF842A4C0E7BBBEB00F5680E /* posix-fs.h */,
-				DFE470F60D81F4E700B6D1FB /* posix-fs-factory.cpp */,
-				DFE470F70D81F4E700B6D1FB /* posix-fs-factory.h */,
-			);
-			path = posix;
-			sourceTree = "<group>";
-		};
-		DFE471090D81F4E700B6D1FB /* midi */ = {
-			isa = PBXGroup;
-			children = (
-				DF0944300F63FBB3002D821E /* coreaudio.cpp */,
-				DF0944310F63FBB3002D821E /* coremidi.cpp */,
-				DF842A3D0E7BBB5000F5680E /* timidity.cpp */,
-				DFD517E10DF33CAC00854012 /* seq.cpp */,
-			);
-			path = midi;
-			sourceTree = "<group>";
-		};
-		DFE471170D81F4E700B6D1FB /* platform */ = {
-			isa = PBXGroup;
-			children = (
-				F92B4DDC139DDC9E000D1BF1 /* macosx */,
-				DF09422F0F63CB9A002D821E /* sdl */,
-				DFE471D70D81F4E700B6D1FB /* iphone */,
-			);
-			path = platform;
-			sourceTree = "<group>";
-		};
-		DFE471D70D81F4E700B6D1FB /* iphone */ = {
-			isa = PBXGroup;
-			children = (
-				DF758614100CBA0200CC3324 /* osys_events.cpp */,
-				DF758615100CBA0200CC3324 /* osys_main.cpp */,
-				DF758616100CBA0200CC3324 /* osys_main.h */,
-				DF758617100CBA0200CC3324 /* osys_sound.cpp */,
-				DF758618100CBA0200CC3324 /* osys_video.cpp */,
-				DF8428960E7BAAAB00F5680E /* blit.cpp */,
-				DF841FD90E7BA61800F5680E /* iphone_keyboard.m */,
-				DF841FDA0E7BA61800F5680E /* iphone_video.h */,
-				DF841FDB0E7BA61800F5680E /* iphone_video.m */,
-				DFE471DC0D81F4E700B6D1FB /* blit_arm.h */,
-				DFE471DE0D81F4E700B6D1FB /* iphone_common.h */,
-				DFE471DF0D81F4E700B6D1FB /* iphone_keyboard.h */,
-				DFE471E10D81F4E700B6D1FB /* iphone_main.m */,
-			);
-			path = iphone;
-			sourceTree = "<group>";
-		};
-		DFE4737B0D81F4E800B6D1FB /* plugins */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B8861381F5C600D08723 /* sdl */,
-				DFE4737F0D81F4E800B6D1FB /* dynamic-plugin.h */,
-				DFE473800D81F4E800B6D1FB /* posix */,
-			);
-			path = plugins;
-			sourceTree = "<group>";
-		};
-		DFE473800D81F4E800B6D1FB /* posix */ = {
-			isa = PBXGroup;
-			children = (
-				DFE473810D81F4E800B6D1FB /* posix-provider.cpp */,
-				DFE473820D81F4E800B6D1FB /* posix-provider.h */,
-			);
-			path = posix;
-			sourceTree = "<group>";
-		};
-		DFE473890D81F4E800B6D1FB /* saves */ = {
-			isa = PBXGroup;
-			children = (
-				DF2FFBF50F4860A60006E566 /* posix */,
-				DFE4738D0D81F4E800B6D1FB /* default */,
-				DFE473900D81F4E800B6D1FB /* savefile.cpp */,
-			);
-			path = saves;
-			sourceTree = "<group>";
-		};
-		DFE4738D0D81F4E800B6D1FB /* default */ = {
-			isa = PBXGroup;
-			children = (
-				DFE4738E0D81F4E800B6D1FB /* default-saves.cpp */,
-				DFE4738F0D81F4E800B6D1FB /* default-saves.h */,
-			);
-			path = default;
-			sourceTree = "<group>";
-		};
-		DFE473910D81F4E800B6D1FB /* timer */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B7A21381E5CC00D08723 /* sdl */,
-				DFE473920D81F4E800B6D1FB /* default */,
-			);
-			path = timer;
-			sourceTree = "<group>";
-		};
-		DFE473920D81F4E800B6D1FB /* default */ = {
-			isa = PBXGroup;
-			children = (
-				DFE473930D81F4E800B6D1FB /* default-timer.cpp */,
-				DFE473940D81F4E800B6D1FB /* default-timer.h */,
-			);
-			path = default;
-			sourceTree = "<group>";
-		};
-		DFE473950D81F4E800B6D1FB /* common */ = {
-			isa = PBXGroup;
-			children = (
-				F92B4DCB139DD428000D1BF1 /* memstream.h */,
-				F92B4DCC139DD428000D1BF1 /* quicktime.cpp */,
-				F92B4DCD139DD428000D1BF1 /* quicktime.h */,
-				DF46B76E1381E54200D08723 /* bufferedstream.h */,
-				DF46B76F1381E54200D08723 /* dcl.cpp */,
-				DF46B7701381E54200D08723 /* dcl.h */,
-				DF46B7711381E54200D08723 /* forbidden.h */,
-				DF46B7721381E54200D08723 /* iff_container.cpp */,
-				DF46B7731381E54200D08723 /* substream.h */,
-				DF46B7741381E54200D08723 /* translation.h */,
-				DF46B7751381E54200D08723 /* winexe_ne.cpp */,
-				DF46B7761381E54200D08723 /* winexe_ne.h */,
-				DF46B7771381E54200D08723 /* winexe_pe.cpp */,
-				DF46B7781381E54200D08723 /* winexe_pe.h */,
-				DF46B7791381E54200D08723 /* winexe.cpp */,
-				DF46B77A1381E54200D08723 /* winexe.h */,
-				DFE473980D81F4E800B6D1FB /* algorithm.h */,
-				DF842A400E7BBBB400F5680E /* archive.cpp */,
-				DF842A410E7BBBB400F5680E /* archive.h */,
-				DFE473990D81F4E800B6D1FB /* array.h */,
-				DFE4739A0D81F4E800B6D1FB /* config-file.cpp */,
-				DFE4739B0D81F4E800B6D1FB /* config-file.h */,
-				DFE4739C0D81F4E800B6D1FB /* config-manager.cpp */,
-				DFE4739D0D81F4E800B6D1FB /* config-manager.h */,
-				DFB0577311B753DA0015AE65 /* debug-channels.h */,
-				DF2FFBD10F485DFB0006E566 /* debug.cpp */,
-				DF2FFBD20F485DFB0006E566 /* debug.h */,
-				DFE4739E0D81F4E800B6D1FB /* endian.h */,
-				DF9B9261118E46FE0069C19D /* error.cpp */,
-				DFE4739F0D81F4E800B6D1FB /* error.h */,
-				DF6BF4F710529F140069811F /* EventDispatcher.cpp */,
-				DF6BF4F810529F140069811F /* EventRecorder.cpp */,
-				DF6BF4F910529F140069811F /* EventRecorder.h */,
-				DFE473A00D81F4E800B6D1FB /* events.h */,
-				DFE473A10D81F4E800B6D1FB /* file.cpp */,
-				DFE473A20D81F4E800B6D1FB /* file.h */,
-				DFE473A30D81F4E800B6D1FB /* frac.h */,
-				DFE473A40D81F4E800B6D1FB /* fs.cpp */,
-				DFE473A50D81F4E800B6D1FB /* fs.h */,
-				DFE473A60D81F4E800B6D1FB /* func.h */,
-				DFE473A70D81F4E800B6D1FB /* hash-str.h */,
-				DFE473A80D81F4E800B6D1FB /* hashmap.cpp */,
-				DFE473A90D81F4E800B6D1FB /* hashmap.h */,
-				DFE473AA0D81F4E800B6D1FB /* iff_container.h */,
-				DFE473AB0D81F4E800B6D1FB /* keyboard.h */,
-				DFE473AC0D81F4E800B6D1FB /* list.h */,
-				DF6BF4FA10529F140069811F /* list_intern.h */,
-				DFCDC70911662B6B00A7D2A0 /* macresman.cpp */,
-				DFCDC70A11662B6B00A7D2A0 /* macresman.h */,
-				DFE473AD0D81F4E800B6D1FB /* md5.cpp */,
-				DFE473AE0D81F4E800B6D1FB /* md5.h */,
-				DFD511460DF3383500854012 /* memorypool.cpp */,
-				DFD511470DF3383500854012 /* memorypool.h */,
-				DFE473B00D81F4E800B6D1FB /* mutex.cpp */,
-				DFE473B10D81F4E800B6D1FB /* mutex.h */,
-				DFE473B20D81F4E800B6D1FB /* noncopyable.h */,
-				DFE473B30D81F4E800B6D1FB /* pack-end.h */,
-				DFE473B40D81F4E800B6D1FB /* pack-start.h */,
-				DF842A430E7BBBB400F5680E /* ptr.h */,
-				DF842A440E7BBBB400F5680E /* queue.h */,
-				DFEC5D0A1166C5CF00C90552 /* random.cpp */,
-				DFEC5D0B1166C5CF00C90552 /* random.h */,
-				DFB0577411B753DA0015AE65 /* rational.cpp */,
-				DFB0577511B753DA0015AE65 /* rational.h */,
-				DFE473B50D81F4E800B6D1FB /* rect.h */,
-				DFE473B60D81F4E800B6D1FB /* savefile.h */,
-				DFE473B70D81F4E800B6D1FB /* scummsys.h */,
-				DF6BF4FB10529F140069811F /* serializer.h */,
-				DFE473B80D81F4E800B6D1FB /* singleton.h */,
-				DFE473B90D81F4E800B6D1FB /* stack.h */,
-				DFEC5D0C1166C5CF00C90552 /* str-array.h */,
-				DFE473BA0D81F4E800B6D1FB /* str.cpp */,
-				DFE473BB0D81F4E800B6D1FB /* str.h */,
-				DFE473BC0D81F4E800B6D1FB /* stream.cpp */,
-				DFE473BD0D81F4E800B6D1FB /* stream.h */,
-				DFE473BE0D81F4E800B6D1FB /* system.cpp */,
-				DFE473BF0D81F4E800B6D1FB /* system.h */,
-				DF2EC50910E64DB300765801 /* textconsole.cpp */,
-				DF2EC50A10E64DB300765801 /* textconsole.h */,
-				DFE473C00D81F4E800B6D1FB /* timer.h */,
-				DFEC5D0D1166C5CF00C90552 /* tokenizer.cpp */,
-				DFEC5D0E1166C5CF00C90552 /* tokenizer.h */,
-				DF7F289111FF247300159131 /* translation.cpp */,
-				DFEC5D0F1166C5CF00C90552 /* types.h */,
-				DF842A450E7BBBB400F5680E /* unarj.cpp */,
-				DF842A460E7BBBB400F5680E /* unarj.h */,
-				DFE473C10D81F4E800B6D1FB /* unzip.cpp */,
-				DFE473C20D81F4E800B6D1FB /* unzip.h */,
-				DFE473C30D81F4E800B6D1FB /* util.cpp */,
-				DFE473C40D81F4E800B6D1FB /* util.h */,
-				DF7E8C0F0ED5FCC2001CB19F /* xmlparser.cpp */,
-				DF7E8C100ED5FCC2001CB19F /* xmlparser.h */,
-				DFE473C50D81F4E800B6D1FB /* zlib.cpp */,
-				DFE473C60D81F4E800B6D1FB /* zlib.h */,
-			);
-			name = common;
-			path = ../../common;
-			sourceTree = SOURCE_ROOT;
-		};
-		DFE477520D81F4E900B6D1FB /* graphics */ = {
-			isa = PBXGroup;
-			children = (
-				F92B4DD1139DD449000D1BF1 /* yuv_to_rgb.cpp */,
-				F92B4DD2139DD449000D1BF1 /* yuv_to_rgb.h */,
-				DFADEBB113820DF500C46364 /* maccursor.cpp */,
-				DFADEBB213820DF500C46364 /* maccursor.h */,
-				DF46B78E1381E58000D08723 /* palette.h */,
-				DF46B78F1381E58000D08723 /* png.cpp */,
-				DF46B7901381E58000D08723 /* png.h */,
-				DF46B7911381E58000D08723 /* wincursor.cpp */,
-				DF46B7921381E58000D08723 /* wincursor.h */,
-				DFE477530D81F4E900B6D1FB /* colormasks.h */,
-				DF6BF4C010529DA50069811F /* conversion.cpp */,
-				DF6BF4C110529DA50069811F /* conversion.h */,
-				DFE477540D81F4E900B6D1FB /* cursorman.cpp */,
-				DFE477550D81F4E900B6D1FB /* cursorman.h */,
-				DF2FFB900F485D890006E566 /* dither.cpp */,
-				DF2FFB910F485D890006E566 /* dither.h */,
-				DFE477580D81F4E900B6D1FB /* font.cpp */,
-				DFE477590D81F4E900B6D1FB /* font.h */,
-				DFE4775A0D81F4E900B6D1FB /* fontman.cpp */,
-				DFE4775B0D81F4E900B6D1FB /* fontman.h */,
-				DFE4775C0D81F4E900B6D1FB /* fonts */,
-				DFE477610D81F4E900B6D1FB /* iff.cpp */,
-				DFE477620D81F4E900B6D1FB /* iff.h */,
-				DFE477630D81F4E900B6D1FB /* imagedec.cpp */,
-				DFE477640D81F4E900B6D1FB /* imagedec.h */,
-				DF6BF4C210529DA50069811F /* jpeg.cpp */,
-				DF6BF4C310529DA50069811F /* jpeg.h */,
-				DFB0578F11B7547D0015AE65 /* pict.cpp */,
-				DFB0579011B7547D0015AE65 /* pict.h */,
-				DF2FFB920F485D890006E566 /* pixelformat.h */,
-				DFE4776A0D81F4E900B6D1FB /* primitives.cpp */,
-				DFE4776B0D81F4E900B6D1FB /* primitives.h */,
-				DFD5184C0DF3420D00854012 /* scaler */,
-				DFD5183B0DF3411800854012 /* scaler.cpp */,
-				DFD5183C0DF3411800854012 /* scaler.h */,
-				DF7585EA100CB6EA00CC3324 /* sjis.cpp */,
-				DF7585EB100CB6EA00CC3324 /* sjis.h */,
-				DFE477860D81F4E900B6D1FB /* surface.cpp */,
-				DFE477870D81F4E900B6D1FB /* surface.h */,
-				DF7E8C050ED5FCAF001CB19F /* thumbnail.cpp */,
-				DF7E8C060ED5FCAF001CB19F /* thumbnail.h */,
-				DF7E8C070ED5FCAF001CB19F /* VectorRenderer.cpp */,
-				DF7E8C080ED5FCAF001CB19F /* VectorRenderer.h */,
-				DF7E8C090ED5FCAF001CB19F /* VectorRendererSpec.cpp */,
-				DF7E8C0A0ED5FCAF001CB19F /* VectorRendererSpec.h */,
-			);
-			name = graphics;
-			path = ../../graphics;
-			sourceTree = SOURCE_ROOT;
-		};
-		DFE4775C0D81F4E900B6D1FB /* fonts */ = {
-			isa = PBXGroup;
-			children = (
-				DF46B79D1381E5B500D08723 /* winfont.cpp */,
-				DF46B79E1381E5B500D08723 /* winfont.h */,
-				DFE4775D0D81F4E900B6D1FB /* consolefont.cpp */,
-				DFE4775E0D81F4E900B6D1FB /* newfont.cpp */,
-				DFE4775F0D81F4E900B6D1FB /* newfont_big.cpp */,
-			);
-			path = fonts;
-			sourceTree = "<group>";
-		};
-		DFE477880D81F4E900B6D1FB /* gui */ = {
-			isa = PBXGroup;
-			children = (
-				DF2040211380C8A60056300A /* widgets */,
-				DF203F461380C06E0056300A /* gui-manager.cpp */,
-				DFE477890D81F4E900B6D1FB /* about.cpp */,
-				DFE4778A0D81F4E900B6D1FB /* about.h */,
-				DFE4778B0D81F4E900B6D1FB /* Actions.cpp */,
-				DFE4778C0D81F4E900B6D1FB /* Actions.h */,
-				DFE4778D0D81F4E900B6D1FB /* browser.cpp */,
-				DFE4778E0D81F4E900B6D1FB /* browser.h */,
-				DF2EC3E410E6490800765801 /* browser_osx.mm */,
-				DFE4778F0D81F4E900B6D1FB /* chooser.cpp */,
-				DFE477900D81F4E900B6D1FB /* chooser.h */,
-				DFE477910D81F4E900B6D1FB /* console.cpp */,
-				DFE477920D81F4E900B6D1FB /* console.h */,
-				DFE477930D81F4E900B6D1FB /* credits.h */,
-				DFE477940D81F4E900B6D1FB /* debugger.cpp */,
-				DFE477950D81F4E900B6D1FB /* debugger.h */,
-				DFE477960D81F4E900B6D1FB /* dialog.cpp */,
-				DFE477970D81F4E900B6D1FB /* dialog.h */,
-				DF9B9246118E46730069C19D /* error.cpp */,
-				DF9B9247118E46730069C19D /* error.h */,
-				DF2FFBD60F485E360006E566 /* gui-manager.h */,
-				DFE4779E0D81F4E900B6D1FB /* Key.cpp */,
-				DFE4779F0D81F4E900B6D1FB /* Key.h */,
-				DFE477A20D81F4E900B6D1FB /* launcher.cpp */,
-				DFE477A30D81F4E900B6D1FB /* launcher.h */,
-				DFE477A60D81F4E900B6D1FB /* massadd.cpp */,
-				DFE477A70D81F4E900B6D1FB /* massadd.h */,
-				DFE477A80D81F4E900B6D1FB /* message.cpp */,
-				DFE477A90D81F4E900B6D1FB /* message.h */,
-				DFE477AD0D81F4E900B6D1FB /* object.cpp */,
-				DFE477AE0D81F4E900B6D1FB /* object.h */,
-				DFE477AF0D81F4E900B6D1FB /* options.cpp */,
-				DFE477B00D81F4E900B6D1FB /* options.h */,
-				DF7E8BF00ED5FC77001CB19F /* saveload.cpp */,
-				DF7E8BF10ED5FC77001CB19F /* saveload.h */,
-				DFE477BA0D81F4E900B6D1FB /* themebrowser.cpp */,
-				DFE477BB0D81F4E900B6D1FB /* themebrowser.h */,
-				DF7E8BF40ED5FC77001CB19F /* ThemeEngine.cpp */,
-				DF7E8BF50ED5FC77001CB19F /* ThemeEngine.h */,
-				DF7E8BF60ED5FC77001CB19F /* ThemeEval.cpp */,
-				DF7E8BF70ED5FC77001CB19F /* ThemeEval.h */,
-				DF7E8BF80ED5FC77001CB19F /* ThemeLayout.cpp */,
-				DF7E8BF90ED5FC77001CB19F /* ThemeLayout.h */,
-				DF7E8BFA0ED5FC77001CB19F /* ThemeParser.cpp */,
-				DF7E8BFB0ED5FC77001CB19F /* ThemeParser.h */,
-				DFE477C00D81F4E900B6D1FB /* themes */,
-				DF7F288911FF244F00159131 /* Tooltip.cpp */,
-				DF7F288A11FF244F00159131 /* Tooltip.h */,
-				DFE477C40D81F4E900B6D1FB /* widget.cpp */,
-				DFE477C50D81F4E900B6D1FB /* widget.h */,
-			);
-			name = gui;
-			path = ../../gui;
-			sourceTree = SOURCE_ROOT;
-		};
-		DFE477C00D81F4E900B6D1FB /* themes */ = {
-			isa = PBXGroup;
-			children = (
-				DF2FFBDB0F485E480006E566 /* scummclassic.zip */,
-				DF7E8C7A0ED601E5001CB19F /* scummmodern.zip */,
-			);
-			path = themes;
-			sourceTree = "<group>";
-		};
-		F92B4DDC139DDC9E000D1BF1 /* macosx */ = {
-			isa = PBXGroup;
-			children = (
-				F92B4DD7139DDC92000D1BF1 /* macosx-main.cpp */,
-				F92B4DD8139DDC92000D1BF1 /* macosx.cpp */,
-				F92B4DD9139DDC92000D1BF1 /* macosx.h */,
-			);
-			name = macosx;
-			sourceTree = "<group>";
-		};
-		F9946D79139E1A260072D195 /* codecs */ = {
-			isa = PBXGroup;
-			children = (
-				F9946D7A139E1A260072D195 /* cdtoons.cpp */,
-				F9946D7B139E1A260072D195 /* cdtoons.h */,
-				F9946D7C139E1A260072D195 /* cinepak.cpp */,
-				F9946D7D139E1A260072D195 /* cinepak.h */,
-				F9946D7E139E1A260072D195 /* codec.h */,
-				F9946D7F139E1A260072D195 /* indeo3.cpp */,
-				F9946D80139E1A260072D195 /* indeo3.h */,
-				F9946D81139E1A260072D195 /* mjpeg.cpp */,
-				F9946D82139E1A260072D195 /* mjpeg.h */,
-				F9946D83139E1A260072D195 /* msrle.cpp */,
-				F9946D84139E1A260072D195 /* msrle.h */,
-				F9946D85139E1A260072D195 /* msvideo1.cpp */,
-				F9946D86139E1A260072D195 /* msvideo1.h */,
-				F9946D87139E1A260072D195 /* qtrle.cpp */,
-				F9946D88139E1A260072D195 /* qtrle.h */,
-				F9946D89139E1A260072D195 /* rpza.cpp */,
-				F9946D8A139E1A260072D195 /* rpza.h */,
-				F9946D8B139E1A260072D195 /* smc.cpp */,
-				F9946D8C139E1A260072D195 /* smc.h */,
-				F9946D8D139E1A260072D195 /* truemotion1.cpp */,
-				F9946D8E139E1A260072D195 /* truemotion1.h */,
-				F9946D8F139E1A260072D195 /* truemotion1data.h */,
-			);
-			name = codecs;
-			path = ../../video/codecs;
-			sourceTree = "<group>";
-		};
-		F9946DCD139E1A9A0072D195 /* mt32 */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DA3139E1A880072D195 /* freeverb.cpp */,
-				F9946DA4139E1A880072D195 /* freeverb.h */,
-				F9946DA5139E1A880072D195 /* i386.cpp */,
-				F9946DA6139E1A880072D195 /* i386.h */,
-				F9946DA7139E1A880072D195 /* mt32_file.cpp */,
-				F9946DA8139E1A880072D195 /* mt32_file.h */,
-				F9946DA9139E1A880072D195 /* mt32emu.h */,
-				F9946DAA139E1A880072D195 /* part.cpp */,
-				F9946DAB139E1A880072D195 /* part.h */,
-				F9946DAC139E1A880072D195 /* partial.cpp */,
-				F9946DAD139E1A880072D195 /* partial.h */,
-				F9946DAE139E1A880072D195 /* partialManager.cpp */,
-				F9946DAF139E1A880072D195 /* partialManager.h */,
-				F9946DB0139E1A880072D195 /* structures.h */,
-				F9946DB1139E1A880072D195 /* synth.cpp */,
-				F9946DB2139E1A880072D195 /* synth.h */,
-				F9946DB3139E1A880072D195 /* tables.cpp */,
-				F9946DB4139E1A880072D195 /* tables.h */,
-			);
-			name = mt32;
-			sourceTree = "<group>";
-		};
-		F9946DDF139E1B180072D195 /* posix */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DE0139E1B180072D195 /* posix-main.cpp */,
-				F9946DE1139E1B180072D195 /* posix.cpp */,
-				F9946DE2139E1B180072D195 /* posix.h */,
-			);
-			path = posix;
-			sourceTree = "<group>";
-		};
-		F9946DF4139E1BBF0072D195 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DF5139E1BBF0072D195 /* sdl-mixer.cpp */,
-				F9946DF6139E1BBF0072D195 /* sdl-mixer.h */,
-			);
-			name = sdl;
-			path = mixer/sdl;
-			sourceTree = "<group>";
-		};
-		F9946DFA139E1BCB0072D195 /* mixer */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DFB139E1BEB0072D195 /* doublebuffersdl */,
-				F9946DF4139E1BBF0072D195 /* sdl */,
-			);
-			name = mixer;
-			sourceTree = "<group>";
-		};
-		F9946DFB139E1BEB0072D195 /* doublebuffersdl */ = {
-			isa = PBXGroup;
-			children = (
-				F9946DFC139E1BEB0072D195 /* doublebuffersdl-mixer.cpp */,
-				F9946DFD139E1BEB0072D195 /* doublebuffersdl-mixer.h */,
-			);
-			name = doublebuffersdl;
-			path = mixer/doublebuffersdl;
-			sourceTree = "<group>";
-		};
-		F9946E01139E1C390072D195 /* sdl */ = {
-			isa = PBXGroup;
-			children = (
-				F9946E02139E1C390072D195 /* sdl-graphics.cpp */,
-				F9946E03139E1C390072D195 /* sdl-graphics.h */,
-			);
-			name = sdl;
-			path = graphics/sdl;
-			sourceTree = "<group>";
-		};
-		F9946E07139E1C3E0072D195 /* graphics */ = {
-			isa = PBXGroup;
-			children = (
-				F9946E01139E1C390072D195 /* sdl */,
-			);
-			name = graphics;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		1D6058900D05DD3D006BFB54 /* ScummVM-iPhone */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "ScummVM-iPhone" */;
-			buildPhases = (
-				1D60588D0D05DD3D006BFB54 /* Resources */,
-				1D60588E0D05DD3D006BFB54 /* Sources */,
-				1D60588F0D05DD3D006BFB54 /* Frameworks */,
-				DF573CB30F5A84DF00961A72 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "ScummVM-iPhone";
-			productName = scummvm;
-			productReference = 1D6058910D05DD3D006BFB54 /* ScummVM.app */;
-			productType = "com.apple.product-type.application";
-		};
-		DF093E730F63CB26002D821E /* ScummVM-OS X */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DF0942270F63CB26002D821E /* Build configuration list for PBXNativeTarget "ScummVM-OS X" */;
-			buildPhases = (
-				DF093E760F63CB26002D821E /* Resources */,
-				DF093E800F63CB26002D821E /* Sources */,
-				DF0942180F63CB26002D821E /* Frameworks */,
-				DF0942260F63CB26002D821E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "ScummVM-OS X";
-			productName = scummvm;
-			productReference = DF09422A0F63CB26002D821E /* ScummVM.app */;
-			productType = "com.apple.product-type.application";
-		};
-		DFF959090FB22D5700A3EC78 /* ScummVM-Simulator */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DFF95CC70FB22D5700A3EC78 /* Build configuration list for PBXNativeTarget "ScummVM-Simulator" */;
-			buildPhases = (
-				DFF9590C0FB22D5700A3EC78 /* Resources */,
-				DFF959160FB22D5700A3EC78 /* Sources */,
-				DFF95CBB0FB22D5700A3EC78 /* Frameworks */,
-				DFF95CC60FB22D5700A3EC78 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "ScummVM-Simulator";
-			productName = scummvm;
-			productReference = DFF95CCA0FB22D5700A3EC78 /* ScummVM.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "scummvm" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				1D6058900D05DD3D006BFB54 /* ScummVM-iPhone */,
-				DF093E730F63CB26002D821E /* ScummVM-OS X */,
-				DFF959090FB22D5700A3EC78 /* ScummVM-Simulator */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		1D60588D0D05DD3D006BFB54 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DF2FFD2D0F48719E0006E566 /* scummclassic.zip in Resources */,
-				DF7E8C810ED60271001CB19F /* scummmodern.zip in Resources */,
-				DFE47C870D81F86900B6D1FB /* kyra.dat in Resources */,
-				DFE47C880D81F86900B6D1FB /* lure.dat in Resources */,
-				DFE47C890D81F86900B6D1FB /* queen.tbl in Resources */,
-				DFE47C8B0D81F86900B6D1FB /* sky.cpt in Resources */,
-				DF2FFD2B0F48717F0006E566 /* Default.png in Resources */,
-				DF2FFD2C0F48717F0006E566 /* icon.png in Resources */,
-				DF895C34124C26660077F6E8 /* icon-72.png in Resources */,
-				DF895C41124C271F0077F6E8 /* icon4.png in Resources */,
-				8CB5A9E11253FDF500CB6BC7 /* drascula.dat in Resources */,
-				8CB5A9E21253FDF500CB6BC7 /* hugo.dat in Resources */,
-				8CB5A9E31253FDF500CB6BC7 /* m4.dat in Resources */,
-				8CB5A9E41253FDF500CB6BC7 /* teenagent.dat in Resources */,
-				8CD1ED8A1262030100FA198C /* toon.dat in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DF093E760F63CB26002D821E /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DF093E770F63CB26002D821E /* scummclassic.zip in Resources */,
-				DF093E780F63CB26002D821E /* scummmodern.zip in Resources */,
-				DF093E7A0F63CB26002D821E /* kyra.dat in Resources */,
-				DF093E7B0F63CB26002D821E /* lure.dat in Resources */,
-				DF093E7C0F63CB26002D821E /* queen.tbl in Resources */,
-				DF093E7D0F63CB26002D821E /* sky.cpt in Resources */,
-				DF0944B10F6430ED002D821E /* scummvm.icns in Resources */,
-				DF895C35124C26660077F6E8 /* icon-72.png in Resources */,
-				DF895C42124C271F0077F6E8 /* icon4.png in Resources */,
-				8CB5A9DD1253FDF500CB6BC7 /* drascula.dat in Resources */,
-				8CB5A9DE1253FDF500CB6BC7 /* hugo.dat in Resources */,
-				8CB5A9DF1253FDF500CB6BC7 /* m4.dat in Resources */,
-				8CB5A9E01253FDF500CB6BC7 /* teenagent.dat in Resources */,
-				8CD1ED891262030100FA198C /* toon.dat in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DFF9590C0FB22D5700A3EC78 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DFF9590D0FB22D5700A3EC78 /* scummclassic.zip in Resources */,
-				DFF9590E0FB22D5700A3EC78 /* scummmodern.zip in Resources */,
-				DFF959100FB22D5700A3EC78 /* kyra.dat in Resources */,
-				DFF959110FB22D5700A3EC78 /* lure.dat in Resources */,
-				DFF959120FB22D5700A3EC78 /* queen.tbl in Resources */,
-				DFF959130FB22D5700A3EC78 /* sky.cpt in Resources */,
-				DFF959140FB22D5700A3EC78 /* Default.png in Resources */,
-				DFF959150FB22D5700A3EC78 /* icon.png in Resources */,
-				DF895C36124C26660077F6E8 /* icon-72.png in Resources */,
-				DF895C43124C271F0077F6E8 /* icon4.png in Resources */,
-				8CB5A9D91253FDF500CB6BC7 /* drascula.dat in Resources */,
-				8CB5A9DA1253FDF500CB6BC7 /* hugo.dat in Resources */,
-				8CB5A9DB1253FDF500CB6BC7 /* m4.dat in Resources */,
-				8CB5A9DC1253FDF500CB6BC7 /* teenagent.dat in Resources */,
-				8CD1ED881262030100FA198C /* toon.dat in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		1D60588E0D05DD3D006BFB54 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DFE470CE0D81F4BA00B6D1FB /* commandLine.cpp in Sources */,
-				DFE470D10D81F4BA00B6D1FB /* main.cpp in Sources */,
-				DFE470D30D81F4BA00B6D1FB /* plugins.cpp in Sources */,
-				DFE470D40D81F4BA00B6D1FB /* version.cpp in Sources */,
-				DFE4782B0D81F4E900B6D1FB /* default-events.cpp in Sources */,
-				DFE478380D81F4E900B6D1FB /* posix-fs-factory.cpp in Sources */,
-				DFE478C50D81F4E900B6D1FB /* iphone_main.m in Sources */,
-				DFE479B60D81F4E900B6D1FB /* posix-provider.cpp in Sources */,
-				DFE479BA0D81F4E900B6D1FB /* default-saves.cpp in Sources */,
-				DFE479BB0D81F4E900B6D1FB /* savefile.cpp in Sources */,
-				DFE479BC0D81F4E900B6D1FB /* default-timer.cpp in Sources */,
-				DFE479BE0D81F4E900B6D1FB /* config-file.cpp in Sources */,
-				DFE479BF0D81F4E900B6D1FB /* config-manager.cpp in Sources */,
-				DFE479C00D81F4E900B6D1FB /* file.cpp in Sources */,
-				DFE479C10D81F4E900B6D1FB /* fs.cpp in Sources */,
-				DFE479C20D81F4E900B6D1FB /* hashmap.cpp in Sources */,
-				DFE479C30D81F4E900B6D1FB /* md5.cpp in Sources */,
-				DFE479C50D81F4E900B6D1FB /* mutex.cpp in Sources */,
-				DFE479C60D81F4E900B6D1FB /* str.cpp in Sources */,
-				DFE479C70D81F4E900B6D1FB /* stream.cpp in Sources */,
-				DFE479C80D81F4E900B6D1FB /* system.cpp in Sources */,
-				DFE479CA0D81F4E900B6D1FB /* util.cpp in Sources */,
-				DFE479CB0D81F4E900B6D1FB /* zlib.cpp in Sources */,
-				DFE47BFB0D81F4E900B6D1FB /* cursorman.cpp in Sources */,
-				DFE47BFD0D81F4E900B6D1FB /* font.cpp in Sources */,
-				DFE47BFE0D81F4E900B6D1FB /* fontman.cpp in Sources */,
-				DFE47BFF0D81F4E900B6D1FB /* consolefont.cpp in Sources */,
-				DFE47C000D81F4E900B6D1FB /* newfont.cpp in Sources */,
-				DFE47C010D81F4E900B6D1FB /* newfont_big.cpp in Sources */,
-				DFE47C030D81F4E900B6D1FB /* iff.cpp in Sources */,
-				DFE47C040D81F4E900B6D1FB /* imagedec.cpp in Sources */,
-				DFE47C080D81F4E900B6D1FB /* primitives.cpp in Sources */,
-				DFE47C1B0D81F4E900B6D1FB /* surface.cpp in Sources */,
-				DFE47C1C0D81F4E900B6D1FB /* about.cpp in Sources */,
-				DFE47C1D0D81F4E900B6D1FB /* Actions.cpp in Sources */,
-				DFE47C1E0D81F4E900B6D1FB /* browser.cpp in Sources */,
-				DFE47C1F0D81F4E900B6D1FB /* chooser.cpp in Sources */,
-				DFE47C200D81F4E900B6D1FB /* console.cpp in Sources */,
-				DFE47C210D81F4E900B6D1FB /* debugger.cpp in Sources */,
-				DFE47C220D81F4E900B6D1FB /* dialog.cpp in Sources */,
-				DFE47C260D81F4E900B6D1FB /* Key.cpp in Sources */,
-				DFE47C280D81F4E900B6D1FB /* launcher.cpp in Sources */,
-				DFE47C2A0D81F4E900B6D1FB /* massadd.cpp in Sources */,
-				DFE47C2B0D81F4E900B6D1FB /* message.cpp in Sources */,
-				DFE47C2E0D81F4E900B6D1FB /* object.cpp in Sources */,
-				DFE47C2F0D81F4E900B6D1FB /* options.cpp in Sources */,
-				DFE47C350D81F4E900B6D1FB /* themebrowser.cpp in Sources */,
-				DFE47C3B0D81F4E900B6D1FB /* widget.cpp in Sources */,
-				DFD511480DF3383500854012 /* memorypool.cpp in Sources */,
-				DFD517E20DF33CAC00854012 /* seq.cpp in Sources */,
-				DFD5183D0DF3411800854012 /* scaler.cpp in Sources */,
-				DFD518A20DF34B2500854012 /* scalebit.cpp in Sources */,
-				DFD518BC0DF34BA600854012 /* 2xsai.cpp in Sources */,
-				DFD518BD0DF34BA600854012 /* aspect.cpp in Sources */,
-				DFD518C50DF34BA600854012 /* scale2x.cpp in Sources */,
-				DFD518C70DF34BA600854012 /* scale3x.cpp in Sources */,
-				DF841FDD0E7BA61800F5680E /* iphone_keyboard.m in Sources */,
-				DF841FDE0E7BA61800F5680E /* iphone_video.m in Sources */,
-				DF84250A0E7BA6AC00F5680E /* agi.cpp in Sources */,
-				DF84250B0E7BA6AC00F5680E /* checks.cpp in Sources */,
-				DF84250C0E7BA6AC00F5680E /* console.cpp in Sources */,
-				DF84250D0E7BA6AC00F5680E /* cycle.cpp in Sources */,
-				DF84250E0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF84250F0E7BA6AC00F5680E /* global.cpp in Sources */,
-				DF8425100E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8425110E7BA6AC00F5680E /* id.cpp in Sources */,
-				DF8425120E7BA6AC00F5680E /* inv.cpp in Sources */,
-				DF8425130E7BA6AC00F5680E /* keyboard.cpp in Sources */,
-				DF8425140E7BA6AC00F5680E /* loader_v2.cpp in Sources */,
-				DF8425150E7BA6AC00F5680E /* loader_v3.cpp in Sources */,
-				DF8425160E7BA6AC00F5680E /* logic.cpp in Sources */,
-				DF8425170E7BA6AC00F5680E /* lzw.cpp in Sources */,
-				DF8425180E7BA6AC00F5680E /* menu.cpp in Sources */,
-				DF84251A0E7BA6AC00F5680E /* motion.cpp in Sources */,
-				DF84251B0E7BA6AC00F5680E /* objects.cpp in Sources */,
-				DF84251C0E7BA6AC00F5680E /* op_cmd.cpp in Sources */,
-				DF84251D0E7BA6AC00F5680E /* op_dbg.cpp in Sources */,
-				DF84251E0E7BA6AC00F5680E /* op_test.cpp in Sources */,
-				DF84251F0E7BA6AC00F5680E /* picture.cpp in Sources */,
-				DF8425200E7BA6AC00F5680E /* preagi.cpp in Sources */,
-				DF8425210E7BA6AC00F5680E /* preagi_common.cpp in Sources */,
-				DF8425220E7BA6AC00F5680E /* preagi_mickey.cpp in Sources */,
-				DF8425230E7BA6AC00F5680E /* preagi_troll.cpp in Sources */,
-				DF8425240E7BA6AC00F5680E /* preagi_winnie.cpp in Sources */,
-				DF8425250E7BA6AC00F5680E /* predictive.cpp in Sources */,
-				DF8425260E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8425270E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8425280E7BA6AC00F5680E /* sprite.cpp in Sources */,
-				DF8425290E7BA6AC00F5680E /* text.cpp in Sources */,
-				DF84252A0E7BA6AC00F5680E /* view.cpp in Sources */,
-				DF84252B0E7BA6AC00F5680E /* wagparser.cpp in Sources */,
-				DF84252C0E7BA6AC00F5680E /* words.cpp in Sources */,
-				DF84252D0E7BA6AC00F5680E /* agos.cpp in Sources */,
-				DF84252E0E7BA6AC00F5680E /* animation.cpp in Sources */,
-				DF84252F0E7BA6AC00F5680E /* charset-fontdata.cpp in Sources */,
-				DF8425300E7BA6AC00F5680E /* charset.cpp in Sources */,
-				DF8425310E7BA6AC00F5680E /* contain.cpp in Sources */,
-				DF8425320E7BA6AC00F5680E /* cursor.cpp in Sources */,
-				DF8425330E7BA6AC00F5680E /* debug.cpp in Sources */,
-				DF8425340E7BA6AC00F5680E /* debugger.cpp in Sources */,
-				DF8425350E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8425360E7BA6AC00F5680E /* draw.cpp in Sources */,
-				DF8425370E7BA6AC00F5680E /* event.cpp in Sources */,
-				DF8425380E7BA6AC00F5680E /* gfx.cpp in Sources */,
-				DF8425390E7BA6AC00F5680E /* icons.cpp in Sources */,
-				DF84253A0E7BA6AC00F5680E /* input.cpp in Sources */,
-				DF84253B0E7BA6AC00F5680E /* items.cpp in Sources */,
-				DF84253C0E7BA6AC00F5680E /* menus.cpp in Sources */,
-				DF84253D0E7BA6AC00F5680E /* midi.cpp in Sources */,
-				DF84253E0E7BA6AC00F5680E /* midiparser_s1d.cpp in Sources */,
-				DF8425400E7BA6AC00F5680E /* oracle.cpp in Sources */,
-				DF8425410E7BA6AC00F5680E /* res.cpp in Sources */,
-				DF8425420E7BA6AC00F5680E /* res_ami.cpp in Sources */,
-				DF8425430E7BA6AC00F5680E /* res_snd.cpp in Sources */,
-				DF8425440E7BA6AC00F5680E /* rooms.cpp in Sources */,
-				DF8425450E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8425460E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF8425470E7BA6AC00F5680E /* script_e1.cpp in Sources */,
-				DF8425480E7BA6AC00F5680E /* script_e2.cpp in Sources */,
-				DF8425490E7BA6AC00F5680E /* script_ff.cpp in Sources */,
-				DF84254A0E7BA6AC00F5680E /* script_pp.cpp in Sources */,
-				DF84254B0E7BA6AC00F5680E /* script_s1.cpp in Sources */,
-				DF84254C0E7BA6AC00F5680E /* script_s2.cpp in Sources */,
-				DF84254D0E7BA6AC00F5680E /* script_ww.cpp in Sources */,
-				DF84254E0E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF84254F0E7BA6AC00F5680E /* string.cpp in Sources */,
-				DF8425500E7BA6AC00F5680E /* subroutine.cpp in Sources */,
-				DF8425510E7BA6AC00F5680E /* verb.cpp in Sources */,
-				DF8425520E7BA6AC00F5680E /* vga.cpp in Sources */,
-				DF8425530E7BA6AC00F5680E /* vga_e2.cpp in Sources */,
-				DF8425540E7BA6AC00F5680E /* vga_ff.cpp in Sources */,
-				DF8425550E7BA6AC00F5680E /* vga_s1.cpp in Sources */,
-				DF8425560E7BA6AC00F5680E /* vga_s2.cpp in Sources */,
-				DF8425570E7BA6AC00F5680E /* vga_ww.cpp in Sources */,
-				DF8425580E7BA6AC00F5680E /* window.cpp in Sources */,
-				DF8425590E7BA6AC00F5680E /* zones.cpp in Sources */,
-				DF84255A0E7BA6AC00F5680E /* anim.cpp in Sources */,
-				DF84255B0E7BA6AC00F5680E /* bg.cpp in Sources */,
-				DF84255C0E7BA6AC00F5680E /* bg_list.cpp in Sources */,
-				DF84255D0E7BA6AC00F5680E /* cine.cpp in Sources */,
-				DF84255E0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF84255F0E7BA6AC00F5680E /* gfx.cpp in Sources */,
-				DF8425600E7BA6AC00F5680E /* main_loop.cpp in Sources */,
-				DF8425620E7BA6AC00F5680E /* msg.cpp in Sources */,
-				DF8425630E7BA6AC00F5680E /* object.cpp in Sources */,
-				DF8425640E7BA6AC00F5680E /* pal.cpp in Sources */,
-				DF8425650E7BA6AC00F5680E /* part.cpp in Sources */,
-				DF8425660E7BA6AC00F5680E /* prc.cpp in Sources */,
-				DF8425670E7BA6AC00F5680E /* rel.cpp in Sources */,
-				DF8425680E7BA6AC00F5680E /* script_fw.cpp in Sources */,
-				DF8425690E7BA6AC00F5680E /* script_os.cpp in Sources */,
-				DF84256A0E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF84256B0E7BA6AC00F5680E /* texte.cpp in Sources */,
-				DF84256C0E7BA6AC00F5680E /* unpack.cpp in Sources */,
-				DF84256D0E7BA6AC00F5680E /* various.cpp in Sources */,
-				DF84258D0E7BA6AC00F5680E /* actor.cpp in Sources */,
-				DF84258F0E7BA6AC00F5680E /* background.cpp in Sources */,
-				DF8425910E7BA6AC00F5680E /* backgroundIncrust.cpp in Sources */,
-				DF8425930E7BA6AC00F5680E /* cell.cpp in Sources */,
-				DF8425950E7BA6AC00F5680E /* cruise.cpp in Sources */,
-				DF8425970E7BA6AC00F5680E /* cruise_main.cpp in Sources */,
-				DF8425990E7BA6AC00F5680E /* ctp.cpp in Sources */,
-				DF84259B0E7BA6AC00F5680E /* dataLoader.cpp in Sources */,
-				DF84259D0E7BA6AC00F5680E /* decompiler.cpp in Sources */,
-				DF84259F0E7BA6AC00F5680E /* delphine-unpack.cpp in Sources */,
-				DF8425A10E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8425A30E7BA6AC00F5680E /* font.cpp in Sources */,
-				DF8425A70E7BA6AC00F5680E /* function.cpp in Sources */,
-				DF8425A90E7BA6AC00F5680E /* gfxModule.cpp in Sources */,
-				DF8425AC0E7BA6AC00F5680E /* linker.cpp in Sources */,
-				DF8425AE0E7BA6AC00F5680E /* mainDraw.cpp in Sources */,
-				DF8425B00E7BA6AC00F5680E /* menu.cpp in Sources */,
-				DF8425B30E7BA6AC00F5680E /* mouse.cpp in Sources */,
-				DF8425B50E7BA6AC00F5680E /* object.cpp in Sources */,
-				DF8425B70E7BA6AC00F5680E /* overlay.cpp in Sources */,
-				DF8425B90E7BA6AC00F5680E /* perso.cpp in Sources */,
-				DF8425BB0E7BA6AC00F5680E /* polys.cpp in Sources */,
-				DF8425BD0E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8425BF0E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF8425C10E7BA6AC00F5680E /* stack.cpp in Sources */,
-				DF8425C40E7BA6AC00F5680E /* various.cpp in Sources */,
-				DF8425C60E7BA6AC00F5680E /* vars.cpp in Sources */,
-				DF8425C80E7BA6AC00F5680E /* volume.cpp in Sources */,
-				DF8425CA0E7BA6AC00F5680E /* dialogs.cpp in Sources */,
-				DF8425CB0E7BA6AC00F5680E /* actors.cpp in Sources */,
-				DF8425CC0E7BA6AC00F5680E /* animation.cpp in Sources */,
-				DF8425CD0E7BA6AC00F5680E /* converse.cpp in Sources */,
-				DF8425CE0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8425CF0E7BA6AC00F5680E /* drascula.cpp in Sources */,
-				DF8425D00E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8425D10E7BA6AC00F5680E /* interface.cpp in Sources */,
-				DF8425D30E7BA6AC00F5680E /* objects.cpp in Sources */,
-				DF8425D40E7BA6AC00F5680E /* palette.cpp in Sources */,
-				DF8425D50E7BA6AC00F5680E /* rooms.cpp in Sources */,
-				DF8425D60E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8425D70E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8425D80E7BA6AC00F5680E /* talk.cpp in Sources */,
-				DF8425D90E7BA6AC00F5680E /* engine.cpp in Sources */,
-				DF8425DD0E7BA6AC00F5680E /* dataio.cpp in Sources */,
-				DF8425DE0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8425DF0E7BA6AC00F5680E /* draw.cpp in Sources */,
-				DF8425E00E7BA6AC00F5680E /* draw_bargon.cpp in Sources */,
-				DF8425E10E7BA6AC00F5680E /* draw_v1.cpp in Sources */,
-				DF8425E20E7BA6AC00F5680E /* draw_v2.cpp in Sources */,
-				DF8425E40E7BA6AC00F5680E /* game.cpp in Sources */,
-				DF8425E70E7BA6AC00F5680E /* global.cpp in Sources */,
-				DF8425E80E7BA6AC00F5680E /* gob.cpp in Sources */,
-				DF8425E90E7BA6AC00F5680E /* goblin.cpp in Sources */,
-				DF8425EA0E7BA6AC00F5680E /* goblin_v1.cpp in Sources */,
-				DF8425EB0E7BA6AC00F5680E /* goblin_v2.cpp in Sources */,
-				DF8425EC0E7BA6AC00F5680E /* goblin_v3.cpp in Sources */,
-				DF8425ED0E7BA6AC00F5680E /* goblin_v4.cpp in Sources */,
-				DF8425EE0E7BA6AC00F5680E /* init.cpp in Sources */,
-				DF8425EF0E7BA6AC00F5680E /* init_v1.cpp in Sources */,
-				DF8425F00E7BA6AC00F5680E /* init_v2.cpp in Sources */,
-				DF8425F10E7BA6AC00F5680E /* init_v3.cpp in Sources */,
-				DF8425F20E7BA6AC00F5680E /* inter.cpp in Sources */,
-				DF8425F30E7BA6AC00F5680E /* inter_bargon.cpp in Sources */,
-				DF8425F40E7BA6AC00F5680E /* inter_v1.cpp in Sources */,
-				DF8425F50E7BA6AC00F5680E /* inter_v2.cpp in Sources */,
-				DF8425F60E7BA6AC00F5680E /* inter_v3.cpp in Sources */,
-				DF8425F70E7BA6AC00F5680E /* inter_v4.cpp in Sources */,
-				DF8425F80E7BA6AC00F5680E /* inter_v5.cpp in Sources */,
-				DF8425F90E7BA6AC00F5680E /* inter_v6.cpp in Sources */,
-				DF8425FA0E7BA6AC00F5680E /* map.cpp in Sources */,
-				DF8425FB0E7BA6AC00F5680E /* map_v1.cpp in Sources */,
-				DF8425FC0E7BA6AC00F5680E /* map_v2.cpp in Sources */,
-				DF8425FF0E7BA6AC00F5680E /* mult.cpp in Sources */,
-				DF8426000E7BA6AC00F5680E /* mult_v1.cpp in Sources */,
-				DF8426010E7BA6AC00F5680E /* mult_v2.cpp in Sources */,
-				DF8426030E7BA6AC00F5680E /* palanim.cpp in Sources */,
-				DF84260B0E7BA6AC00F5680E /* scenery.cpp in Sources */,
-				DF84260C0E7BA6AC00F5680E /* scenery_v1.cpp in Sources */,
-				DF84260D0E7BA6AC00F5680E /* scenery_v2.cpp in Sources */,
-				DF84260E0E7BA6AC00F5680E /* adlib.cpp in Sources */,
-				DF84260F0E7BA6AC00F5680E /* bgatmosphere.cpp in Sources */,
-				DF8426100E7BA6AC00F5680E /* cdrom.cpp in Sources */,
-				DF8426110E7BA6AC00F5680E /* infogrames.cpp in Sources */,
-				DF8426120E7BA6AC00F5680E /* pcspeaker.cpp in Sources */,
-				DF8426130E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8426140E7BA6AC00F5680E /* soundblaster.cpp in Sources */,
-				DF8426150E7BA6AC00F5680E /* sounddesc.cpp in Sources */,
-				DF8426160E7BA6AC00F5680E /* soundmixer.cpp in Sources */,
-				DF8426180E7BA6AC00F5680E /* util.cpp in Sources */,
-				DF8426190E7BA6AC00F5680E /* variables.cpp in Sources */,
-				DF84261A0E7BA6AC00F5680E /* video.cpp in Sources */,
-				DF84261B0E7BA6AC00F5680E /* video_v1.cpp in Sources */,
-				DF84261C0E7BA6AC00F5680E /* video_v2.cpp in Sources */,
-				DF84261D0E7BA6AC00F5680E /* video_v6.cpp in Sources */,
-				DF84261E0E7BA6AC00F5680E /* videoplayer.cpp in Sources */,
-				DF8426430E7BA6AC00F5680E /* animator_hof.cpp in Sources */,
-				DF8426440E7BA6AC00F5680E /* animator_lok.cpp in Sources */,
-				DF8426450E7BA6AC00F5680E /* animator_mr.cpp in Sources */,
-				DF8426470E7BA6AC00F5680E /* animator_v2.cpp in Sources */,
-				DF8426490E7BA6AC00F5680E /* debugger.cpp in Sources */,
-				DF84264A0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF84264B0E7BA6AC00F5680E /* gui.cpp in Sources */,
-				DF84264C0E7BA6AC00F5680E /* gui_hof.cpp in Sources */,
-				DF84264D0E7BA6AC00F5680E /* gui_lok.cpp in Sources */,
-				DF84264E0E7BA6AC00F5680E /* gui_mr.cpp in Sources */,
-				DF8426500E7BA6AC00F5680E /* gui_v2.cpp in Sources */,
-				DF8426520E7BA6AC00F5680E /* items_hof.cpp in Sources */,
-				DF8426530E7BA6AC00F5680E /* items_lok.cpp in Sources */,
-				DF8426540E7BA6AC00F5680E /* items_mr.cpp in Sources */,
-				DF8426560E7BA6AC00F5680E /* items_v2.cpp in Sources */,
-				DF8426590E7BA6AC00F5680E /* kyra_hof.cpp in Sources */,
-				DF84265A0E7BA6AC00F5680E /* kyra_lok.cpp in Sources */,
-				DF84265B0E7BA6AC00F5680E /* kyra_mr.cpp in Sources */,
-				DF84265C0E7BA6AC00F5680E /* kyra_v1.cpp in Sources */,
-				DF84265D0E7BA6AC00F5680E /* kyra_v2.cpp in Sources */,
-				DF84265F0E7BA6AC00F5680E /* lol.cpp in Sources */,
-				DF8426610E7BA6AC00F5680E /* resource.cpp in Sources */,
-				DF8426620E7BA6AC00F5680E /* resource_intern.cpp in Sources */,
-				DF8426630E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8426640E7BA6AC00F5680E /* saveload_hof.cpp in Sources */,
-				DF8426650E7BA6AC00F5680E /* saveload_lok.cpp in Sources */,
-				DF8426660E7BA6AC00F5680E /* saveload_mr.cpp in Sources */,
-				DF84266A0E7BA6AC00F5680E /* scene_hof.cpp in Sources */,
-				DF84266B0E7BA6AC00F5680E /* scene_lok.cpp in Sources */,
-				DF84266C0E7BA6AC00F5680E /* scene_mr.cpp in Sources */,
-				DF84266D0E7BA6AC00F5680E /* scene_v1.cpp in Sources */,
-				DF84266E0E7BA6AC00F5680E /* scene_v2.cpp in Sources */,
-				DF8426700E7BA6AC00F5680E /* screen.cpp in Sources */,
-				DF8426710E7BA6AC00F5680E /* screen_hof.cpp in Sources */,
-				DF8426720E7BA6AC00F5680E /* screen_lok.cpp in Sources */,
-				DF8426730E7BA6AC00F5680E /* screen_lol.cpp in Sources */,
-				DF8426740E7BA6AC00F5680E /* screen_mr.cpp in Sources */,
-				DF8426760E7BA6AC00F5680E /* screen_v2.cpp in Sources */,
-				DF8426780E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF8426790E7BA6AC00F5680E /* script_hof.cpp in Sources */,
-				DF84267A0E7BA6AC00F5680E /* script_lok.cpp in Sources */,
-				DF84267B0E7BA6AC00F5680E /* script_mr.cpp in Sources */,
-				DF84267C0E7BA6AC00F5680E /* script_tim.cpp in Sources */,
-				DF84267D0E7BA6AC00F5680E /* script_v1.cpp in Sources */,
-				DF84267E0E7BA6AC00F5680E /* script_v2.cpp in Sources */,
-				DF8426800E7BA6AC00F5680E /* seqplayer.cpp in Sources */,
-				DF8426810E7BA6AC00F5680E /* sequences_hof.cpp in Sources */,
-				DF8426820E7BA6AC00F5680E /* sequences_lok.cpp in Sources */,
-				DF8426830E7BA6AC00F5680E /* sequences_mr.cpp in Sources */,
-				DF8426850E7BA6AC00F5680E /* sequences_v2.cpp in Sources */,
-				DF8426870E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8426880E7BA6AC00F5680E /* sound_adlib.cpp in Sources */,
-				DF8426890E7BA6AC00F5680E /* sound_digital.cpp in Sources */,
-				DF84268A0E7BA6AC00F5680E /* sound_lok.cpp in Sources */,
-				DF84268B0E7BA6AC00F5680E /* sound_towns.cpp in Sources */,
-				DF84268D0E7BA6AC00F5680E /* sprites.cpp in Sources */,
-				DF84268E0E7BA6AC00F5680E /* staticres.cpp in Sources */,
-				DF84268F0E7BA6AC00F5680E /* text.cpp in Sources */,
-				DF8426900E7BA6AC00F5680E /* text_hof.cpp in Sources */,
-				DF8426910E7BA6AC00F5680E /* text_lok.cpp in Sources */,
-				DF8426920E7BA6AC00F5680E /* text_mr.cpp in Sources */,
-				DF8426960E7BA6AC00F5680E /* timer.cpp in Sources */,
-				DF8426970E7BA6AC00F5680E /* timer_hof.cpp in Sources */,
-				DF8426980E7BA6AC00F5680E /* timer_lok.cpp in Sources */,
-				DF8426990E7BA6AC00F5680E /* timer_mr.cpp in Sources */,
-				DF84269D0E7BA6AC00F5680E /* vqa.cpp in Sources */,
-				DF84269E0E7BA6AC00F5680E /* wsamovie.cpp in Sources */,
-				DF84269F0E7BA6AC00F5680E /* animseq.cpp in Sources */,
-				DF8426A00E7BA6AC00F5680E /* debugger.cpp in Sources */,
-				DF8426A10E7BA6AC00F5680E /* decode.cpp in Sources */,
-				DF8426A20E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8426A30E7BA6AC00F5680E /* disk.cpp in Sources */,
-				DF8426A40E7BA6AC00F5680E /* events.cpp in Sources */,
-				DF8426A50E7BA6AC00F5680E /* fights.cpp in Sources */,
-				DF8426A60E7BA6AC00F5680E /* game.cpp in Sources */,
-				DF8426A70E7BA6AC00F5680E /* hotspots.cpp in Sources */,
-				DF8426A80E7BA6AC00F5680E /* intro.cpp in Sources */,
-				DF8426A90E7BA6AC00F5680E /* lure.cpp in Sources */,
-				DF8426AA0E7BA6AC00F5680E /* memory.cpp in Sources */,
-				DF8426AB0E7BA6AC00F5680E /* menu.cpp in Sources */,
-				DF8426AD0E7BA6AC00F5680E /* palette.cpp in Sources */,
-				DF8426AE0E7BA6AC00F5680E /* res.cpp in Sources */,
-				DF8426AF0E7BA6AC00F5680E /* res_struct.cpp in Sources */,
-				DF8426B00E7BA6AC00F5680E /* room.cpp in Sources */,
-				DF8426B10E7BA6AC00F5680E /* screen.cpp in Sources */,
-				DF8426B20E7BA6AC00F5680E /* scripts.cpp in Sources */,
-				DF8426B30E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8426B40E7BA6AC00F5680E /* strings.cpp in Sources */,
-				DF8426B50E7BA6AC00F5680E /* surface.cpp in Sources */,
-				DF8426D40E7BA6AC00F5680E /* actor.cpp in Sources */,
-				DF8426D60E7BA6AC00F5680E /* animation.cpp in Sources */,
-				DF8426D80E7BA6AC00F5680E /* assets.cpp in Sources */,
-				DF8426DA0E7BA6AC00F5680E /* compression.cpp in Sources */,
-				DF8426DC0E7BA6AC00F5680E /* console.cpp in Sources */,
-				DF8426DE0E7BA6AC00F5680E /* converse.cpp in Sources */,
-				DF8426E00E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8426E20E7BA6AC00F5680E /* events.cpp in Sources */,
-				DF8426E40E7BA6AC00F5680E /* font.cpp in Sources */,
-				DF8426E60E7BA6AC00F5680E /* globals.cpp in Sources */,
-				DF8426E80E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8426EA0E7BA6AC00F5680E /* gui.cpp in Sources */,
-				DF8426EC0E7BA6AC00F5680E /* hotspot.cpp in Sources */,
-				DF8426EF0E7BA6AC00F5680E /* m4.cpp in Sources */,
-				DF8426F10E7BA6AC00F5680E /* m4_menus.cpp in Sources */,
-				DF8426F30E7BA6AC00F5680E /* m4_views.cpp in Sources */,
-				DF8426F50E7BA6AC00F5680E /* mads_anim.cpp in Sources */,
-				DF8426F70E7BA6AC00F5680E /* mads_menus.cpp in Sources */,
-				DF8426F90E7BA6AC00F5680E /* midi.cpp in Sources */,
-				DF8426FC0E7BA6AC00F5680E /* rails.cpp in Sources */,
-				DF8426FE0E7BA6AC00F5680E /* resource.cpp in Sources */,
-				DF8427000E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8427020E7BA6AC00F5680E /* scene.cpp in Sources */,
-				DF8427040E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF8427060E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8427080E7BA6AC00F5680E /* sprite.cpp in Sources */,
-				DF84270A0E7BA6AC00F5680E /* viewmgr.cpp in Sources */,
-				DF84270C0E7BA6AC00F5680E /* woodscript.cpp in Sources */,
-				DF84270E0E7BA6AC00F5680E /* ws_machine.cpp in Sources */,
-				DF8427100E7BA6AC00F5680E /* ws_sequence.cpp in Sources */,
-				DF8427120E7BA6AC00F5680E /* database.cpp in Sources */,
-				DF8427130E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8427140E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8427150E7BA6AC00F5680E /* made.cpp in Sources */,
-				DF8427170E7BA6AC00F5680E /* music.cpp in Sources */,
-				DF8427180E7BA6AC00F5680E /* pmvplayer.cpp in Sources */,
-				DF8427190E7BA6AC00F5680E /* redreader.cpp in Sources */,
-				DF84271A0E7BA6AC00F5680E /* resource.cpp in Sources */,
-				DF84271B0E7BA6AC00F5680E /* screen.cpp in Sources */,
-				DF84271C0E7BA6AC00F5680E /* screenfx.cpp in Sources */,
-				DF84271D0E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF84271E0E7BA6AC00F5680E /* scriptfuncs.cpp in Sources */,
-				DF84271F0E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8427210E7BA6AC00F5680E /* balloons.cpp in Sources */,
-				DF8427220E7BA6AC00F5680E /* callables_br.cpp in Sources */,
-				DF8427230E7BA6AC00F5680E /* callables_ns.cpp in Sources */,
-				DF8427240E7BA6AC00F5680E /* debug.cpp in Sources */,
-				DF8427250E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8427260E7BA6AC00F5680E /* dialogue.cpp in Sources */,
-				DF8427270E7BA6AC00F5680E /* disk_br.cpp in Sources */,
-				DF8427280E7BA6AC00F5680E /* disk_ns.cpp in Sources */,
-				DF8427290E7BA6AC00F5680E /* exec_br.cpp in Sources */,
-				DF84272A0E7BA6AC00F5680E /* exec_ns.cpp in Sources */,
-				DF84272B0E7BA6AC00F5680E /* font.cpp in Sources */,
-				DF84272C0E7BA6AC00F5680E /* gfxbase.cpp in Sources */,
-				DF84272D0E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF84272E0E7BA6AC00F5680E /* gui.cpp in Sources */,
-				DF84272F0E7BA6AC00F5680E /* gui_br.cpp in Sources */,
-				DF8427300E7BA6AC00F5680E /* gui_ns.cpp in Sources */,
-				DF8427310E7BA6AC00F5680E /* input.cpp in Sources */,
-				DF8427320E7BA6AC00F5680E /* inventory.cpp in Sources */,
-				DF8427340E7BA6AC00F5680E /* objects.cpp in Sources */,
-				DF8427350E7BA6AC00F5680E /* parallaction.cpp in Sources */,
-				DF8427360E7BA6AC00F5680E /* parallaction_br.cpp in Sources */,
-				DF8427370E7BA6AC00F5680E /* parallaction_ns.cpp in Sources */,
-				DF8427380E7BA6AC00F5680E /* parser.cpp in Sources */,
-				DF8427390E7BA6AC00F5680E /* parser_br.cpp in Sources */,
-				DF84273A0E7BA6AC00F5680E /* parser_ns.cpp in Sources */,
-				DF84273B0E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF84273D0E7BA6AC00F5680E /* staticres.cpp in Sources */,
-				DF84273E0E7BA6AC00F5680E /* walk.cpp in Sources */,
-				DF84273F0E7BA6AC00F5680E /* bankman.cpp in Sources */,
-				DF8427400E7BA6AC00F5680E /* command.cpp in Sources */,
-				DF8427410E7BA6AC00F5680E /* credits.cpp in Sources */,
-				DF8427420E7BA6AC00F5680E /* cutaway.cpp in Sources */,
-				DF8427430E7BA6AC00F5680E /* debug.cpp in Sources */,
-				DF8427440E7BA6AC00F5680E /* display.cpp in Sources */,
-				DF8427450E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8427460E7BA6AC00F5680E /* grid.cpp in Sources */,
-				DF8427470E7BA6AC00F5680E /* input.cpp in Sources */,
-				DF8427480E7BA6AC00F5680E /* journal.cpp in Sources */,
-				DF8427490E7BA6AC00F5680E /* logic.cpp in Sources */,
-				DF84274A0E7BA6AC00F5680E /* midiadlib.cpp in Sources */,
-				DF84274C0E7BA6AC00F5680E /* music.cpp in Sources */,
-				DF84274D0E7BA6AC00F5680E /* musicdata.cpp in Sources */,
-				DF84274E0E7BA6AC00F5680E /* queen.cpp in Sources */,
-				DF84274F0E7BA6AC00F5680E /* resource.cpp in Sources */,
-				DF8427500E7BA6AC00F5680E /* restables.cpp in Sources */,
-				DF8427510E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8427520E7BA6AC00F5680E /* state.cpp in Sources */,
-				DF8427530E7BA6AC00F5680E /* talk.cpp in Sources */,
-				DF8427540E7BA6AC00F5680E /* walk.cpp in Sources */,
-				DF8427560E7BA6AC00F5680E /* actor.cpp in Sources */,
-				DF8427570E7BA6AC00F5680E /* actor_path.cpp in Sources */,
-				DF8427580E7BA6AC00F5680E /* actor_walk.cpp in Sources */,
-				DF8427590E7BA6AC00F5680E /* animation.cpp in Sources */,
-				DF84275A0E7BA6AC00F5680E /* console.cpp in Sources */,
-				DF84275B0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF84275C0E7BA6AC00F5680E /* events.cpp in Sources */,
-				DF84275D0E7BA6AC00F5680E /* font.cpp in Sources */,
-				DF84275E0E7BA6AC00F5680E /* font_map.cpp in Sources */,
-				DF84275F0E7BA6AC00F5680E /* gfx.cpp in Sources */,
-				DF8427610E7BA6AC00F5680E /* image.cpp in Sources */,
-				DF8427620E7BA6AC00F5680E /* input.cpp in Sources */,
-				DF8427630E7BA6AC00F5680E /* interface.cpp in Sources */,
-				DF8427640E7BA6AC00F5680E /* introproc_ihnm.cpp in Sources */,
-				DF8427650E7BA6AC00F5680E /* introproc_ite.cpp in Sources */,
-				DF8427660E7BA6AC00F5680E /* isomap.cpp in Sources */,
-				DF8427680E7BA6AC00F5680E /* itedata.cpp in Sources */,
-				DF84276A0E7BA6AC00F5680E /* music.cpp in Sources */,
-				DF84276B0E7BA6AC00F5680E /* objectmap.cpp in Sources */,
-				DF84276C0E7BA6AC00F5680E /* palanim.cpp in Sources */,
-				DF84276D0E7BA6AC00F5680E /* puzzle.cpp in Sources */,
-				DF84276E0E7BA6AC00F5680E /* render.cpp in Sources */,
-				DF8427700E7BA6AC00F5680E /* saga.cpp in Sources */,
-				DF8427710E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8427720E7BA6AC00F5680E /* scene.cpp in Sources */,
-				DF8427730E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF8427740E7BA6AC00F5680E /* sfuncs.cpp in Sources */,
-				DF8427750E7BA6AC00F5680E /* sndres.cpp in Sources */,
-				DF8427760E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8427770E7BA6AC00F5680E /* sprite.cpp in Sources */,
-				DF8427780E7BA6AC00F5680E /* sthread.cpp in Sources */,
-				DF84277A0E7BA6AC00F5680E /* actor.cpp in Sources */,
-				DF84277B0E7BA6AC00F5680E /* akos.cpp in Sources */,
-				DF84277C0E7BA6AC00F5680E /* base-costume.cpp in Sources */,
-				DF84277D0E7BA6AC00F5680E /* bomp.cpp in Sources */,
-				DF84277E0E7BA6AC00F5680E /* boxes.cpp in Sources */,
-				DF84277F0E7BA6AC00F5680E /* camera.cpp in Sources */,
-				DF8427800E7BA6AC00F5680E /* charset-fontdata.cpp in Sources */,
-				DF8427810E7BA6AC00F5680E /* charset.cpp in Sources */,
-				DF8427820E7BA6AC00F5680E /* costume.cpp in Sources */,
-				DF8427830E7BA6AC00F5680E /* cursor.cpp in Sources */,
-				DF8427840E7BA6AC00F5680E /* debugger.cpp in Sources */,
-				DF8427850E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8427860E7BA6AC00F5680E /* dialogs.cpp in Sources */,
-				DF8427870E7BA6AC00F5680E /* file.cpp in Sources */,
-				DF8427880E7BA6AC00F5680E /* file_nes.cpp in Sources */,
-				DF8427890E7BA6AC00F5680E /* gfx.cpp in Sources */,
-				DF84278B0E7BA6AC00F5680E /* animation_he.cpp in Sources */,
-				DF84278C0E7BA6AC00F5680E /* cup_player_he.cpp in Sources */,
-				DF84278D0E7BA6AC00F5680E /* floodfill_he.cpp in Sources */,
-				DF84278E0E7BA6AC00F5680E /* logic_he.cpp in Sources */,
-				DF84278F0E7BA6AC00F5680E /* palette_he.cpp in Sources */,
-				DF8427900E7BA6AC00F5680E /* resource_he.cpp in Sources */,
-				DF8427910E7BA6AC00F5680E /* script_v100he.cpp in Sources */,
-				DF8427920E7BA6AC00F5680E /* script_v60he.cpp in Sources */,
-				DF8427930E7BA6AC00F5680E /* script_v70he.cpp in Sources */,
-				DF8427940E7BA6AC00F5680E /* script_v71he.cpp in Sources */,
-				DF8427950E7BA6AC00F5680E /* script_v72he.cpp in Sources */,
-				DF8427960E7BA6AC00F5680E /* script_v80he.cpp in Sources */,
-				DF8427970E7BA6AC00F5680E /* script_v90he.cpp in Sources */,
-				DF8427980E7BA6AC00F5680E /* sound_he.cpp in Sources */,
-				DF8427990E7BA6AC00F5680E /* sprite_he.cpp in Sources */,
-				DF84279A0E7BA6AC00F5680E /* wiz_he.cpp in Sources */,
-				DF84279B0E7BA6AC00F5680E /* help.cpp in Sources */,
-				DF84279C0E7BA6AC00F5680E /* imuse.cpp in Sources */,
-				DF84279D0E7BA6AC00F5680E /* imuse_part.cpp in Sources */,
-				DF84279E0E7BA6AC00F5680E /* imuse_player.cpp in Sources */,
-				DF84279F0E7BA6AC00F5680E /* instrument.cpp in Sources */,
-				DF8427A00E7BA6AC00F5680E /* sysex_samnmax.cpp in Sources */,
-				DF8427A10E7BA6AC00F5680E /* sysex_scumm.cpp in Sources */,
-				DF8427A20E7BA6AC00F5680E /* dimuse.cpp in Sources */,
-				DF8427A30E7BA6AC00F5680E /* dimuse_bndmgr.cpp in Sources */,
-				DF8427A40E7BA6AC00F5680E /* dimuse_codecs.cpp in Sources */,
-				DF8427A50E7BA6AC00F5680E /* dimuse_music.cpp in Sources */,
-				DF8427A60E7BA6AC00F5680E /* dimuse_script.cpp in Sources */,
-				DF8427A70E7BA6AC00F5680E /* dimuse_sndmgr.cpp in Sources */,
-				DF8427A80E7BA6AC00F5680E /* dimuse_tables.cpp in Sources */,
-				DF8427A90E7BA6AC00F5680E /* dimuse_track.cpp in Sources */,
-				DF8427AA0E7BA6AC00F5680E /* input.cpp in Sources */,
-				DF8427AB0E7BA6AC00F5680E /* insane.cpp in Sources */,
-				DF8427AC0E7BA6AC00F5680E /* insane_ben.cpp in Sources */,
-				DF8427AD0E7BA6AC00F5680E /* insane_enemy.cpp in Sources */,
-				DF8427AE0E7BA6AC00F5680E /* insane_iact.cpp in Sources */,
-				DF8427AF0E7BA6AC00F5680E /* insane_scenes.cpp in Sources */,
-				DF8427B10E7BA6AC00F5680E /* midiparser_ro.cpp in Sources */,
-				DF8427B30E7BA6AC00F5680E /* nut_renderer.cpp in Sources */,
-				DF8427B40E7BA6AC00F5680E /* object.cpp in Sources */,
-				DF8427B50E7BA6AC00F5680E /* palette.cpp in Sources */,
-				DF8427B60E7BA6AC00F5680E /* player_mod.cpp in Sources */,
-				DF8427B70E7BA6AC00F5680E /* player_nes.cpp in Sources */,
-				DF8427B80E7BA6AC00F5680E /* player_v1.cpp in Sources */,
-				DF8427B90E7BA6AC00F5680E /* player_v2.cpp in Sources */,
-				DF8427BA0E7BA6AC00F5680E /* player_v2a.cpp in Sources */,
-				DF8427BB0E7BA6AC00F5680E /* player_v3a.cpp in Sources */,
-				DF8427BD0E7BA6AC00F5680E /* resource.cpp in Sources */,
-				DF8427BE0E7BA6AC00F5680E /* resource_v2.cpp in Sources */,
-				DF8427BF0E7BA6AC00F5680E /* resource_v3.cpp in Sources */,
-				DF8427C00E7BA6AC00F5680E /* resource_v4.cpp in Sources */,
-				DF8427C10E7BA6AC00F5680E /* room.cpp in Sources */,
-				DF8427C20E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8427C30E7BA6AC00F5680E /* script.cpp in Sources */,
-				DF8427C40E7BA6AC00F5680E /* script_v0.cpp in Sources */,
-				DF8427C50E7BA6AC00F5680E /* script_v2.cpp in Sources */,
-				DF8427C60E7BA6AC00F5680E /* script_v5.cpp in Sources */,
-				DF8427C70E7BA6AC00F5680E /* script_v6.cpp in Sources */,
-				DF8427C80E7BA6AC00F5680E /* script_v8.cpp in Sources */,
-				DF8427C90E7BA6AC00F5680E /* scumm.cpp in Sources */,
-				DF8427CA0E7BA6AC00F5680E /* channel.cpp in Sources */,
-				DF8427CC0E7BA6AC00F5680E /* codec1.cpp in Sources */,
-				DF8427CD0E7BA6AC00F5680E /* codec37.cpp in Sources */,
-				DF8427CE0E7BA6AC00F5680E /* codec47.cpp in Sources */,
-				DF8427D10E7BA6AC00F5680E /* imuse_channel.cpp in Sources */,
-				DF8427D20E7BA6AC00F5680E /* saud_channel.cpp in Sources */,
-				DF8427D30E7BA6AC00F5680E /* smush_font.cpp in Sources */,
-				DF8427D40E7BA6AC00F5680E /* smush_mixer.cpp in Sources */,
-				DF8427D50E7BA6AC00F5680E /* smush_player.cpp in Sources */,
-				DF8427D60E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8427D70E7BA6AC00F5680E /* string.cpp in Sources */,
-				DF8427D90E7BA6AC00F5680E /* usage_bits.cpp in Sources */,
-				DF8427DA0E7BA6AC00F5680E /* util.cpp in Sources */,
-				DF8427DB0E7BA6AC00F5680E /* vars.cpp in Sources */,
-				DF8427DC0E7BA6AC00F5680E /* verbs.cpp in Sources */,
-				DF8427DD0E7BA6AC00F5680E /* autoroute.cpp in Sources */,
-				DF8427DE0E7BA6AC00F5680E /* compact.cpp in Sources */,
-				DF8427DF0E7BA6AC00F5680E /* control.cpp in Sources */,
-				DF8427E00E7BA6AC00F5680E /* debug.cpp in Sources */,
-				DF8427E10E7BA6AC00F5680E /* disk.cpp in Sources */,
-				DF8427E20E7BA6AC00F5680E /* grid.cpp in Sources */,
-				DF8427E30E7BA6AC00F5680E /* hufftext.cpp in Sources */,
-				DF8427E40E7BA6AC00F5680E /* intro.cpp in Sources */,
-				DF8427E50E7BA6AC00F5680E /* logic.cpp in Sources */,
-				DF8427E70E7BA6AC00F5680E /* mouse.cpp in Sources */,
-				DF8427E80E7BA6AC00F5680E /* adlibchannel.cpp in Sources */,
-				DF8427E90E7BA6AC00F5680E /* adlibmusic.cpp in Sources */,
-				DF8427EA0E7BA6AC00F5680E /* gmchannel.cpp in Sources */,
-				DF8427EB0E7BA6AC00F5680E /* gmmusic.cpp in Sources */,
-				DF8427EC0E7BA6AC00F5680E /* mt32music.cpp in Sources */,
-				DF8427ED0E7BA6AC00F5680E /* musicbase.cpp in Sources */,
-				DF8427EE0E7BA6AC00F5680E /* rnc_deco.cpp in Sources */,
-				DF8427EF0E7BA6AC00F5680E /* screen.cpp in Sources */,
-				DF8427F00E7BA6AC00F5680E /* sky.cpp in Sources */,
-				DF8427F10E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8427F20E7BA6AC00F5680E /* text.cpp in Sources */,
-				DF8427F30E7BA6AC00F5680E /* animation.cpp in Sources */,
-				DF8427F40E7BA6AC00F5680E /* control.cpp in Sources */,
-				DF8427F60E7BA6AC00F5680E /* debug.cpp in Sources */,
-				DF8427F70E7BA6AC00F5680E /* eventman.cpp in Sources */,
-				DF8427F80E7BA6AC00F5680E /* logic.cpp in Sources */,
-				DF8427F90E7BA6AC00F5680E /* memman.cpp in Sources */,
-				DF8427FA0E7BA6AC00F5680E /* menu.cpp in Sources */,
-				DF8427FC0E7BA6AC00F5680E /* mouse.cpp in Sources */,
-				DF8427FD0E7BA6AC00F5680E /* music.cpp in Sources */,
-				DF8427FE0E7BA6AC00F5680E /* objectman.cpp in Sources */,
-				DF8427FF0E7BA6AC00F5680E /* resman.cpp in Sources */,
-				DF8428000E7BA6AC00F5680E /* router.cpp in Sources */,
-				DF8428010E7BA6AC00F5680E /* screen.cpp in Sources */,
-				DF8428020E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8428030E7BA6AC00F5680E /* staticres.cpp in Sources */,
-				DF8428040E7BA6AC00F5680E /* sword1.cpp in Sources */,
-				DF8428050E7BA6AC00F5680E /* text.cpp in Sources */,
-				DF8428060E7BA6AC00F5680E /* animation.cpp in Sources */,
-				DF8428070E7BA6AC00F5680E /* anims.cpp in Sources */,
-				DF8428080E7BA6AC00F5680E /* console.cpp in Sources */,
-				DF8428090E7BA6AC00F5680E /* controls.cpp in Sources */,
-				DF84280A0E7BA6AC00F5680E /* debug.cpp in Sources */,
-				DF84280B0E7BA6AC00F5680E /* events.cpp in Sources */,
-				DF84280C0E7BA6AC00F5680E /* function.cpp in Sources */,
-				DF84280D0E7BA6AC00F5680E /* icons.cpp in Sources */,
-				DF84280E0E7BA6AC00F5680E /* interpreter.cpp in Sources */,
-				DF84280F0E7BA6AC00F5680E /* layers.cpp in Sources */,
-				DF8428100E7BA6AC00F5680E /* logic.cpp in Sources */,
-				DF8428110E7BA6AC00F5680E /* maketext.cpp in Sources */,
-				DF8428120E7BA6AC00F5680E /* memory.cpp in Sources */,
-				DF8428130E7BA6AC00F5680E /* menu.cpp in Sources */,
-				DF8428150E7BA6AC00F5680E /* mouse.cpp in Sources */,
-				DF8428160E7BA6AC00F5680E /* music.cpp in Sources */,
-				DF8428170E7BA6AC00F5680E /* palette.cpp in Sources */,
-				DF8428180E7BA6AC00F5680E /* protocol.cpp in Sources */,
-				DF8428190E7BA6AC00F5680E /* render.cpp in Sources */,
-				DF84281A0E7BA6AC00F5680E /* resman.cpp in Sources */,
-				DF84281B0E7BA6AC00F5680E /* router.cpp in Sources */,
-				DF84281C0E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF84281D0E7BA6AC00F5680E /* screen.cpp in Sources */,
-				DF84281E0E7BA6AC00F5680E /* scroll.cpp in Sources */,
-				DF84281F0E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF8428200E7BA6AC00F5680E /* speech.cpp in Sources */,
-				DF8428210E7BA6AC00F5680E /* sprite.cpp in Sources */,
-				DF8428220E7BA6AC00F5680E /* startup.cpp in Sources */,
-				DF8428230E7BA6AC00F5680E /* sword2.cpp in Sources */,
-				DF8428240E7BA6AC00F5680E /* sync.cpp in Sources */,
-				DF8428250E7BA6AC00F5680E /* walker.cpp in Sources */,
-				DF8428260E7BA6AC00F5680E /* actors.cpp in Sources */,
-				DF8428270E7BA6AC00F5680E /* anim.cpp in Sources */,
-				DF8428280E7BA6AC00F5680E /* background.cpp in Sources */,
-				DF8428290E7BA6AC00F5680E /* bg.cpp in Sources */,
-				DF84282A0E7BA6AC00F5680E /* cliprect.cpp in Sources */,
-				DF84282B0E7BA6AC00F5680E /* config.cpp in Sources */,
-				DF84282C0E7BA6AC00F5680E /* cursor.cpp in Sources */,
-				DF84282D0E7BA6AC00F5680E /* debugger.cpp in Sources */,
-				DF84282E0E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF84282F0E7BA6AC00F5680E /* effect.cpp in Sources */,
-				DF8428300E7BA6AC00F5680E /* events.cpp in Sources */,
-				DF8428310E7BA6AC00F5680E /* faders.cpp in Sources */,
-				DF8428320E7BA6AC00F5680E /* font.cpp in Sources */,
-				DF8428330E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8428340E7BA6AC00F5680E /* handle.cpp in Sources */,
-				DF8428350E7BA6AC00F5680E /* heapmem.cpp in Sources */,
-				DF8428370E7BA6AC00F5680E /* mareels.cpp in Sources */,
-				DF8428390E7BA6AC00F5680E /* move.cpp in Sources */,
-				DF84283A0E7BA6AC00F5680E /* multiobj.cpp in Sources */,
-				DF84283B0E7BA6AC00F5680E /* music.cpp in Sources */,
-				DF84283C0E7BA6AC00F5680E /* object.cpp in Sources */,
-				DF84283D0E7BA6AC00F5680E /* palette.cpp in Sources */,
-				DF84283E0E7BA6AC00F5680E /* pcode.cpp in Sources */,
-				DF84283F0E7BA6AC00F5680E /* pdisplay.cpp in Sources */,
-				DF8428400E7BA6AC00F5680E /* play.cpp in Sources */,
-				DF8428410E7BA6AC00F5680E /* polygons.cpp in Sources */,
-				DF8428420E7BA6AC00F5680E /* rince.cpp in Sources */,
-				DF8428430E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8428440E7BA6AC00F5680E /* savescn.cpp in Sources */,
-				DF8428450E7BA6AC00F5680E /* scene.cpp in Sources */,
-				DF8428460E7BA6AC00F5680E /* sched.cpp in Sources */,
-				DF8428470E7BA6AC00F5680E /* scn.cpp in Sources */,
-				DF8428480E7BA6AC00F5680E /* scroll.cpp in Sources */,
-				DF8428490E7BA6AC00F5680E /* sound.cpp in Sources */,
-				DF84284A0E7BA6AC00F5680E /* strres.cpp in Sources */,
-				DF84284B0E7BA6AC00F5680E /* text.cpp in Sources */,
-				DF84284C0E7BA6AC00F5680E /* timers.cpp in Sources */,
-				DF84284D0E7BA6AC00F5680E /* tinlib.cpp in Sources */,
-				DF84284E0E7BA6AC00F5680E /* tinsel.cpp in Sources */,
-				DF84284F0E7BA6AC00F5680E /* token.cpp in Sources */,
-				DF8428500E7BA6AC00F5680E /* detection.cpp in Sources */,
-				DF8428510E7BA6AC00F5680E /* graphics.cpp in Sources */,
-				DF8428520E7BA6AC00F5680E /* menu.cpp in Sources */,
-				DF8428530E7BA6AC00F5680E /* midi.cpp in Sources */,
-				DF8428550E7BA6AC00F5680E /* opcodes.cpp in Sources */,
-				DF8428560E7BA6AC00F5680E /* resource.cpp in Sources */,
-				DF8428570E7BA6AC00F5680E /* saveload.cpp in Sources */,
-				DF8428580E7BA6AC00F5680E /* staticres.cpp in Sources */,
-				DF8428590E7BA6AC00F5680E /* touche.cpp in Sources */,
-				DF8428970E7BAAAB00F5680E /* blit.cpp in Sources */,
-				DF842A3E0E7BBB5000F5680E /* timidity.cpp in Sources */,
-				DF842A470E7BBBB400F5680E /* archive.cpp in Sources */,
-				DF842A490E7BBBB400F5680E /* unarj.cpp in Sources */,
-				DF842A6D0E7BBD5700F5680E /* stdiostream.cpp in Sources */,
-				DF7E8BFD0ED5FC77001CB19F /* saveload.cpp in Sources */,
-				DF7E8BFF0ED5FC77001CB19F /* ThemeEngine.cpp in Sources */,
-				DF7E8C000ED5FC77001CB19F /* ThemeEval.cpp in Sources */,
-				DF7E8C010ED5FC77001CB19F /* ThemeLayout.cpp in Sources */,
-				DF7E8C020ED5FC77001CB19F /* ThemeParser.cpp in Sources */,
-				DF7E8C0C0ED5FCAF001CB19F /* thumbnail.cpp in Sources */,
-				DF7E8C0D0ED5FCAF001CB19F /* VectorRenderer.cpp in Sources */,
-				DF7E8C0E0ED5FCAF001CB19F /* VectorRendererSpec.cpp in Sources */,
-				DF7E8C110ED5FCC2001CB19F /* xmlparser.cpp in Sources */,
-				DF7E8C530ED60067001CB19F /* game.cpp in Sources */,
-				DFAAAFF70F0112AD003E9390 /* saveload.cpp in Sources */,
-				DFAAAFF90F0112C1003E9390 /* detection.cpp in Sources */,
-				DFAAAFFC0F0112DF003E9390 /* detection.cpp in Sources */,
-				DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */,
-				DF2FFB930F485D890006E566 /* dither.cpp in Sources */,
-				DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */,
-				DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */,
-				DF2FFC290F4862520006E566 /* bmv.cpp in Sources */,
-				DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */,
-				DF2FFC2B0F4862520006E566 /* drives.cpp in Sources */,
-				DF2FFC2C0F4862520006E566 /* sysvar.cpp in Sources */,
-				DF2FFC380F48628A0006E566 /* gui_lol.cpp in Sources */,
-				DF2FFC390F48628A0006E566 /* items_lol.cpp in Sources */,
-				DF2FFC3A0F48628A0006E566 /* script_lol.cpp in Sources */,
-				DF2FFC3B0F48628A0006E566 /* sequences_lol.cpp in Sources */,
-				DF2FFC3C0F48628A0006E566 /* sound_midi.cpp in Sources */,
-				DF2FFC3E0F48628A0006E566 /* util.cpp in Sources */,
-				DF2FFC4A0F4863100006E566 /* scene_lol.cpp in Sources */,
-				DF2FFC4E0F4863560006E566 /* advancedDetector.cpp in Sources */,
-				DF2FFC5D0F4866E70006E566 /* base-backend.cpp in Sources */,
-				DF2FFC670F48672D0006E566 /* resource.cpp in Sources */,
-				DF2FFC680F48672D0006E566 /* resource_hrs.cpp in Sources */,
-				DF2FFC690F48672D0006E566 /* resource_res.cpp in Sources */,
-				DF2FFC6A0F48672D0006E566 /* resource_rsc.cpp in Sources */,
-				DF2FFC6B0F48672D0006E566 /* sfuncs_ihnm.cpp in Sources */,
-				DF2FFC740F4867910006E566 /* debugger.cpp in Sources */,
-				DF2FFC750F4867910006E566 /* staticres.cpp in Sources */,
-				DF2FFCDB0F4870690006E566 /* cell.cpp in Sources */,
-				DF2FFCDC0F4870690006E566 /* cursor.cpp in Sources */,
-				DF2FFCDD0F4870690006E566 /* debug.cpp in Sources */,
-				DF2FFCDE0F4870690006E566 /* detection.cpp in Sources */,
-				DF2FFCDF0F4870690006E566 /* font.cpp in Sources */,
-				DF2FFCE00F4870690006E566 /* graphics.cpp in Sources */,
-				DF2FFCE10F4870690006E566 /* groovie.cpp in Sources */,
-				DF2FFCE20F4870690006E566 /* lzss.cpp in Sources */,
-				DF2FFCE40F4870690006E566 /* music.cpp in Sources */,
-				DF2FFCE50F4870690006E566 /* player.cpp in Sources */,
-				DF2FFCE60F4870690006E566 /* resource.cpp in Sources */,
-				DF2FFCE70F4870690006E566 /* roq.cpp in Sources */,
-				DF2FFCE80F4870690006E566 /* saveload.cpp in Sources */,
-				DF2FFCE90F4870690006E566 /* script.cpp in Sources */,
-				DF2FFCEA0F4870690006E566 /* vdx.cpp in Sources */,
-				DF2FFD100F4870E50006E566 /* detection.cpp in Sources */,
-				DF2FFD110F4870E50006E566 /* graphics.cpp in Sources */,
-				DF2FFD120F4870E50006E566 /* locations.cpp in Sources */,
-				DF2FFD140F4870E50006E566 /* resource.cpp in Sources */,
-				DF2FFD150F4870E50006E566 /* saveload.cpp in Sources */,
-				DF2FFD160F4870E50006E566 /* sequences.cpp in Sources */,
-				DF2FFD170F4870E50006E566 /* staticres.cpp in Sources */,
-				DF2FFD180F4870E50006E566 /* tucker.cpp in Sources */,
-				DFC831210F48AF19005EF03C /* detection.cpp in Sources */,
-				DFC831240F48AF19005EF03C /* gc.cpp in Sources */,
-				DFC831270F48AF19005EF03C /* kernel.cpp in Sources */,
-				DFC831280F48AF19005EF03C /* kevent.cpp in Sources */,
-				DFC831290F48AF19005EF03C /* kfile.cpp in Sources */,
-				DFC8312A0F48AF19005EF03C /* kgraphics.cpp in Sources */,
-				DFC8312B0F48AF19005EF03C /* klists.cpp in Sources */,
-				DFC8312C0F48AF19005EF03C /* kmath.cpp in Sources */,
-				DFC8312D0F48AF19005EF03C /* kmenu.cpp in Sources */,
-				DFC8312E0F48AF19005EF03C /* kmovement.cpp in Sources */,
-				DFC8312F0F48AF19005EF03C /* kpathing.cpp in Sources */,
-				DFC831300F48AF19005EF03C /* kscripts.cpp in Sources */,
-				DFC831310F48AF19005EF03C /* ksound.cpp in Sources */,
-				DFC831320F48AF19005EF03C /* kstring.cpp in Sources */,
-				DFC831330F48AF19005EF03C /* message.cpp in Sources */,
-				DFC831370F48AF19005EF03C /* savegame.cpp in Sources */,
-				DFC831390F48AF19005EF03C /* scriptdebug.cpp in Sources */,
-				DFC8313A0F48AF19005EF03C /* seg_manager.cpp in Sources */,
-				DFC8313C0F48AF19005EF03C /* vm.cpp in Sources */,
-				DFC8315C0F48AF19005EF03C /* sci.cpp in Sources */,
-				DFD6470C0F495B51008E18EF /* unzip.cpp in Sources */,
-				DFAAD23D0F50120E00C3A4E2 /* console.cpp in Sources */,
-				DF573C080F5A81EA00961A72 /* state.cpp in Sources */,
-				DF573CBB0F5A85B300961A72 /* exec.cpp in Sources */,
-				DF573CBE0F5A85E100961A72 /* timer_lol.cpp in Sources */,
-				DF89C2880F62D55C00D756B6 /* sprites_lol.cpp in Sources */,
-				DF89C2A40F62D79E00D756B6 /* script.cpp in Sources */,
-				DF093E5F0F63CAD4002D821E /* pn.cpp in Sources */,
-				DF093E600F63CAD4002D821E /* script_pn.cpp in Sources */,
-				DF093E610F63CAD4002D821E /* vga_pn.cpp in Sources */,
-				DF5CEB2C0F75535000DEA624 /* sound_br.cpp in Sources */,
-				DF5CEB2D0F75535000DEA624 /* sound_ns.cpp in Sources */,
-				DF5CEB320F75538000DEA624 /* protracker.cpp in Sources */,
-				DFE88C470F874A1100C555C5 /* sound.cpp in Sources */,
-				DF09CC160FAC4E1900A5AFD7 /* batplayer.cpp in Sources */,
-				DF09CC170FAC4E1900A5AFD7 /* demoplayer.cpp in Sources */,
-				DF09CC180FAC4E1900A5AFD7 /* scnplayer.cpp in Sources */,
-				DF09CC190FAC4E1900A5AFD7 /* draw_fascin.cpp in Sources */,
-				DF09CC1B0FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */,
-				DF09CC2A0FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */,
-				DF09CC2B0FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */,
-				DF61183E0FE3A8080042AD3F /* kmisc.cpp in Sources */,
-				DF61183F0FE3A8080042AD3F /* segment.cpp in Sources */,
-				DF61184C0FE3A8250042AD3F /* decompressor.cpp in Sources */,
-				DF61184D0FE3A8250042AD3F /* resource.cpp in Sources */,
-				DF6118560FE3A8990042AD3F /* disk.cpp in Sources */,
-				DF6118950FE3A9AA0042AD3F /* saveconverter.cpp in Sources */,
-				DF6118960FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */,
-				DF6118970FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */,
-				DF6118980FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */,
-				DF61189A0FE3A9AA0042AD3F /* savefile.cpp in Sources */,
-				DF61189B0FE3A9AA0042AD3F /* savehandler.cpp in Sources */,
-				DF61189C0FE3A9AA0042AD3F /* saveload.cpp in Sources */,
-				DF61189D0FE3A9AA0042AD3F /* saveload_v2.cpp in Sources */,
-				DF61189E0FE3A9AA0042AD3F /* saveload_v3.cpp in Sources */,
-				DF61189F0FE3A9AA0042AD3F /* saveload_v4.cpp in Sources */,
-				DF6118A00FE3A9AA0042AD3F /* saveload_v6.cpp in Sources */,
-				DF6118B00FE3A9EA0042AD3F /* feeble.cpp in Sources */,
-				DF6118BC0FE3AA280042AD3F /* saveload_lol.cpp in Sources */,
-				DF6118BD0FE3AA280042AD3F /* sound_lol.cpp in Sources */,
-				DF6118BE0FE3AA280042AD3F /* sound_pcspk.cpp in Sources */,
-				DF6118BF0FE3AA280042AD3F /* text_lol.cpp in Sources */,
-				DF6118C80FE3AABD0042AD3F /* player_v2cms.cpp in Sources */,
-				DF7585DA100CB66E00CC3324 /* expression.cpp in Sources */,
-				DF7585DB100CB66E00CC3324 /* hotspots.cpp in Sources */,
-				DF7585DC100CB66E00CC3324 /* init_v6.cpp in Sources */,
-				DF7585DD100CB66E00CC3324 /* resources.cpp in Sources */,
-				DF7585DE100CB66E00CC3324 /* script.cpp in Sources */,
-				DF7585DF100CB66E00CC3324 /* totfile.cpp in Sources */,
-				DF7585EE100CB6EA00CC3324 /* sjis.cpp in Sources */,
-				DF7585F3100CB70600CC3324 /* saveload_playtoons.cpp in Sources */,
-				DF7585F9100CB75800CC3324 /* static_selectors.cpp in Sources */,
-				DF75861D100CBA0200CC3324 /* osys_events.cpp in Sources */,
-				DF75861E100CBA0200CC3324 /* osys_main.cpp in Sources */,
-				DF75861F100CBA0200CC3324 /* osys_sound.cpp in Sources */,
-				DF758620100CBA0200CC3324 /* osys_video.cpp in Sources */,
-				DF6BF4C610529DA50069811F /* conversion.cpp in Sources */,
-				DF6BF4C710529DA50069811F /* jpeg.cpp in Sources */,
-				DF6BF4DB10529DE90069811F /* input_pn.cpp in Sources */,
-				DF6BF4DC10529DE90069811F /* string_pn.cpp in Sources */,
-				DF6BF4DD10529DE90069811F /* verb_pn.cpp in Sources */,
-				DF6BF4E510529E260069811F /* sound_amiga.cpp in Sources */,
-				DF6BF4EC10529E6E0069811F /* init_v4.cpp in Sources */,
-				DF6BF4ED10529E6E0069811F /* inter_playtoons.cpp in Sources */,
-				DF6BF4F410529EE40069811F /* player_v4a.cpp in Sources */,
-				DF6BF4FE10529F140069811F /* EventDispatcher.cpp in Sources */,
-				DF6BF4FF10529F140069811F /* EventRecorder.cpp in Sources */,
-				DF90E9C310AEDA9B00C8F93F /* selector.cpp in Sources */,
-				DF90EAA610B0234300C8F93F /* draw_playtoons.cpp in Sources */,
-				DF90EAAF10B0236F00C8F93F /* staticres.cpp in Sources */,
-				DF2EC3F910E64C0C00765801 /* dialogs.cpp in Sources */,
-				DF2EC3FF10E64C4300765801 /* animator_tim.cpp in Sources */,
-				DF2EC40610E64C8000765801 /* event.cpp in Sources */,
-				DF2EC50310E64D7C00765801 /* player_pce.cpp in Sources */,
-				DF2EC50410E64D7C00765801 /* player_sid.cpp in Sources */,
-				DF2EC50C10E64DB300765801 /* textconsole.cpp in Sources */,
-				DF45B1CA116628A5009B85CC /* animate.cpp in Sources */,
-				DF45B1CB116628A5009B85CC /* cache.cpp in Sources */,
-				DF45B1CC116628A5009B85CC /* compare.cpp in Sources */,
-				DF45B1CD116628A5009B85CC /* controls.cpp in Sources */,
-				DF45B1CE116628A5009B85CC /* coordadjuster.cpp in Sources */,
-				DF45B1CF116628A5009B85CC /* cursor.cpp in Sources */,
-				DF45B1D0116628A5009B85CC /* font.cpp in Sources */,
-				DF45B1D4116628A5009B85CC /* menu.cpp in Sources */,
-				DF45B1D5116628A5009B85CC /* paint.cpp in Sources */,
-				DF45B1D6116628A5009B85CC /* paint16.cpp in Sources */,
-				DF45B1D8116628A5009B85CC /* palette.cpp in Sources */,
-				DF45B1D9116628A5009B85CC /* picture.cpp in Sources */,
-				DF45B1DA116628A5009B85CC /* portrait.cpp in Sources */,
-				DF45B1DB116628A5009B85CC /* ports.cpp in Sources */,
-				DF45B1DD116628A5009B85CC /* screen.cpp in Sources */,
-				DF45B1DE116628A5009B85CC /* text16.cpp in Sources */,
-				DF45B1DF116628A5009B85CC /* transitions.cpp in Sources */,
-				DF45B1E0116628A5009B85CC /* view.cpp in Sources */,
-				DF45B1E1116628A5009B85CC /* grammar.cpp in Sources */,
-				DF45B1E2116628A5009B85CC /* said.cpp in Sources */,
-				DF45B1E4116628A5009B85CC /* vocabulary.cpp in Sources */,
-				DF45B1E5116628A5009B85CC /* audio.cpp in Sources */,
-				DF45B1E6116628A5009B85CC /* adlib.cpp in Sources */,
-				DF45B1E8116628A5009B85CC /* fb01.cpp in Sources */,
-				DF45B1E9116628A5009B85CC /* midi.cpp in Sources */,
-				DF45B1EA116628A5009B85CC /* pcjr.cpp in Sources */,
-				DF45B1EF116628A5009B85CC /* midiparser_sci.cpp in Sources */,
-				DF45B1F0116628A5009B85CC /* music.cpp in Sources */,
-				DF45B1F1116628A5009B85CC /* soundcmd.cpp in Sources */,
-				DF45B1F2116628A5009B85CC /* seq_decoder.cpp in Sources */,
-				DFCDC6D9116629CE00A7D2A0 /* features.cpp in Sources */,
-				DFCDC6DA116629CE00A7D2A0 /* kparse.cpp in Sources */,
-				DFCDC6F711662AAB00A7D2A0 /* resource.cpp in Sources */,
-				DFCDC70411662B0200A7D2A0 /* saveload_fascin.cpp in Sources */,
-				DFCDC70B11662B6B00A7D2A0 /* macresman.cpp in Sources */,
-				DFEC5D121166C5CF00C90552 /* random.cpp in Sources */,
-				DFEC5D131166C5CF00C90552 /* tokenizer.cpp in Sources */,
-				DFEC5D371166C67300C90552 /* savestate.cpp in Sources */,
-				DF9B9249118E46730069C19D /* error.cpp in Sources */,
-				DF9B9254118E46A00069C19D /* fontsjis.cpp in Sources */,
-				DF9B9263118E46FE0069C19D /* error.cpp in Sources */,
-				DFB0577711B753DA0015AE65 /* rational.cpp in Sources */,
-				DFB0578211B7541F0015AE65 /* resource_audio.cpp in Sources */,
-				DFB0578311B7541F0015AE65 /* util.cpp in Sources */,
-				DFB0578B11B754570015AE65 /* maciconbar.cpp in Sources */,
-				DFB0579211B7547D0015AE65 /* pict.cpp in Sources */,
-				DF7F286211FF23D500159131 /* amigamac.cpp in Sources */,
-				DF7F286911FF23EF00159131 /* kvideo.cpp in Sources */,
-				DF7F286A11FF23EF00159131 /* workarounds.cpp in Sources */,
-				DF7F287F11FF243B00159131 /* sound_2gs.cpp in Sources */,
-				DF7F288011FF243B00159131 /* sound_coco3.cpp in Sources */,
-				DF7F288111FF243B00159131 /* sound_midi.cpp in Sources */,
-				DF7F288211FF243B00159131 /* sound_pcjr.cpp in Sources */,
-				DF7F288311FF243B00159131 /* sound_sarien.cpp in Sources */,
-				DF7F288C11FF244F00159131 /* Tooltip.cpp in Sources */,
-				DF7F289511FF247300159131 /* translation.cpp in Sources */,
-				DF7F28A611FF24C400159131 /* console.cpp in Sources */,
-				DF895C03124C24680077F6E8 /* player_towns.cpp in Sources */,
-				DF895C25124C25150077F6E8 /* init_fascin.cpp in Sources */,
-				DF895C2A124C25350077F6E8 /* script_patches.cpp in Sources */,
-				DF0E303B1252C5BD0082D593 /* cms.cpp in Sources */,
-				8CB5A9CB1253FD6900CB6BC7 /* m4_scene.cpp in Sources */,
-				8CB5A9CC1253FD6900CB6BC7 /* mads_logic.cpp in Sources */,
-				8CB5A9CD1253FD6900CB6BC7 /* mads_player.cpp in Sources */,
-				8CB5A9CE1253FD6900CB6BC7 /* mads_scene.cpp in Sources */,
-				8CB5A9CF1253FD6900CB6BC7 /* mads_views.cpp in Sources */,
-				8CD1ED53126202AB00FA198C /* detection.cpp in Sources */,
-				8CD1ED54126202AB00FA198C /* display.cpp in Sources */,
-				8CD1ED56126202AB00FA198C /* file.cpp in Sources */,
-				8CD1ED57126202AB00FA198C /* hugo.cpp in Sources */,
-				8CD1ED58126202AB00FA198C /* intro.cpp in Sources */,
-				8CD1ED59126202AB00FA198C /* inventory.cpp in Sources */,
-				8CD1ED5C126202AB00FA198C /* mouse.cpp in Sources */,
-				8CD1ED5D126202AB00FA198C /* parser.cpp in Sources */,
-				8CD1ED5E126202AB00FA198C /* route.cpp in Sources */,
-				8CD1ED5F126202AB00FA198C /* schedule.cpp in Sources */,
-				8CD1ED60126202AB00FA198C /* sound.cpp in Sources */,
-				8CD1ED61126202AB00FA198C /* util.cpp in Sources */,
-				8CD1ED62126202AB00FA198C /* anim.cpp in Sources */,
-				8CD1ED63126202AB00FA198C /* audio.cpp in Sources */,
-				8CD1ED64126202AB00FA198C /* character.cpp in Sources */,
-				8CD1ED65126202AB00FA198C /* conversation.cpp in Sources */,
-				8CD1ED66126202AB00FA198C /* detection.cpp in Sources */,
-				8CD1ED67126202AB00FA198C /* drew.cpp in Sources */,
-				8CD1ED68126202AB00FA198C /* flux.cpp in Sources */,
-				8CD1ED69126202AB00FA198C /* font.cpp in Sources */,
-				8CD1ED6A126202AB00FA198C /* hotspot.cpp in Sources */,
-				8CD1ED6D126202AB00FA198C /* movie.cpp in Sources */,
-				8CD1ED6E126202AB00FA198C /* path.cpp in Sources */,
-				8CD1ED6F126202AB00FA198C /* picture.cpp in Sources */,
-				8CD1ED70126202AB00FA198C /* resource.cpp in Sources */,
-				8CD1ED71126202AB00FA198C /* script.cpp in Sources */,
-				8CD1ED72126202AB00FA198C /* script_func.cpp in Sources */,
-				8CD1ED73126202AB00FA198C /* state.cpp in Sources */,
-				8CD1ED74126202AB00FA198C /* text.cpp in Sources */,
-				8CD1ED75126202AB00FA198C /* tools.cpp in Sources */,
-				8CD1ED76126202AB00FA198C /* toon.cpp in Sources */,
-				8CD80C8D126271A9001C6C87 /* surface.cpp in Sources */,
-				8CD80C93126271BD001C6C87 /* gfx_towns.cpp in Sources */,
-				8CD80D04126272A0001C6C87 /* actor.cpp in Sources */,
-				8CD80D05126272A0001C6C87 /* animation.cpp in Sources */,
-				8CD80D06126272A0001C6C87 /* callbacks.cpp in Sources */,
-				8CD80D07126272A0001C6C87 /* console.cpp in Sources */,
-				8CD80D08126272A0001C6C87 /* detection.cpp in Sources */,
-				8CD80D09126272A0001C6C87 /* dialog.cpp in Sources */,
-				8CD80D0A126272A0001C6C87 /* font.cpp in Sources */,
-				8CD80D0B126272A0001C6C87 /* inventory.cpp in Sources */,
-				8CD80D0D126272A0001C6C87 /* music.cpp in Sources */,
-				8CD80D0E126272A0001C6C87 /* objects.cpp in Sources */,
-				8CD80D0F126272A0001C6C87 /* pack.cpp in Sources */,
-				8CD80D10126272A0001C6C87 /* resources.cpp in Sources */,
-				8CD80D11126272A0001C6C87 /* scene.cpp in Sources */,
-				8CD80D12126272A0001C6C87 /* segment.cpp in Sources */,
-				8CD80D13126272A0001C6C87 /* surface.cpp in Sources */,
-				8CD80D14126272A0001C6C87 /* surface_list.cpp in Sources */,
-				8CD80D15126272A0001C6C87 /* teenagent.cpp in Sources */,
-				DF203F481380C06E0056300A /* gui-manager.cpp in Sources */,
-				DF203F6B1380C2750056300A /* avi_decoder.cpp in Sources */,
-				DF203F6C1380C2750056300A /* coktel_decoder.cpp in Sources */,
-				DF203F6D1380C2750056300A /* dxa_decoder.cpp in Sources */,
-				DF203F6E1380C2750056300A /* flic_decoder.cpp in Sources */,
-				DF203F701380C2750056300A /* qt_decoder.cpp in Sources */,
-				DF203F711380C2750056300A /* smk_decoder.cpp in Sources */,
-				DF203F721380C2750056300A /* video_decoder.cpp in Sources */,
-				DF203FA01380C2920056300A /* cdtoons.cpp in Sources */,
-				DF203FA11380C2920056300A /* cinepak.cpp in Sources */,
-				DF203FA21380C2920056300A /* indeo3.cpp in Sources */,
-				DF203FA31380C2920056300A /* mjpeg.cpp in Sources */,
-				DF203FA41380C2920056300A /* msrle.cpp in Sources */,
-				DF203FA51380C2920056300A /* msvideo1.cpp in Sources */,
-				DF203FA71380C2920056300A /* qtrle.cpp in Sources */,
-				DF203FA81380C2920056300A /* rpza.cpp in Sources */,
-				DF203FA91380C2920056300A /* smc.cpp in Sources */,
-				DF203FAA1380C2920056300A /* truemotion1.cpp in Sources */,
-				DF203FE61380C3BC0056300A /* console.cpp in Sources */,
-				DF203FE71380C3BC0056300A /* dialogs.cpp in Sources */,
-				DF203FE81380C3BC0056300A /* file_v1d.cpp in Sources */,
-				DF203FE91380C3BC0056300A /* file_v1w.cpp in Sources */,
-				DF203FEA1380C3BC0056300A /* file_v2d.cpp in Sources */,
-				DF203FEB1380C3BC0056300A /* file_v2w.cpp in Sources */,
-				DF203FEC1380C3BC0056300A /* file_v3d.cpp in Sources */,
-				DF203FED1380C3BC0056300A /* object_v1d.cpp in Sources */,
-				DF203FEE1380C3BC0056300A /* object_v1w.cpp in Sources */,
-				DF203FEF1380C3BC0056300A /* object_v2d.cpp in Sources */,
-				DF203FF01380C3BC0056300A /* object_v3d.cpp in Sources */,
-				DF203FF11380C3BC0056300A /* object.cpp in Sources */,
-				DF203FF21380C3BC0056300A /* parser_v1d.cpp in Sources */,
-				DF203FF31380C3BC0056300A /* parser_v1w.cpp in Sources */,
-				DF203FF41380C3BC0056300A /* parser_v2d.cpp in Sources */,
-				DF203FF51380C3BC0056300A /* parser_v3d.cpp in Sources */,
-				DF203FF61380C3BC0056300A /* text.cpp in Sources */,
-				DF2040341380C8B70056300A /* editable.cpp in Sources */,
-				DF2040351380C8B70056300A /* edittext.cpp in Sources */,
-				DF2040361380C8B70056300A /* list.cpp in Sources */,
-				DF2040371380C8B70056300A /* popup.cpp in Sources */,
-				DF2040381380C8B70056300A /* scrollbar.cpp in Sources */,
-				DF2040391380C8B70056300A /* tab.cpp in Sources */,
-				DF20406A1380CA230056300A /* audiostream.cpp in Sources */,
-				DF20406B1380CA230056300A /* fmopl.cpp in Sources */,
-				DF20406C1380CA230056300A /* mididrv.cpp in Sources */,
-				DF20406D1380CA230056300A /* midiparser_smf.cpp in Sources */,
-				DF20406E1380CA230056300A /* midiparser_xmidi.cpp in Sources */,
-				DF20406F1380CA230056300A /* midiparser.cpp in Sources */,
-				DF2040701380CA230056300A /* midiplayer.cpp in Sources */,
-				DF2040711380CA230056300A /* mixer.cpp in Sources */,
-				DF2040721380CA230056300A /* mpu401.cpp in Sources */,
-				DF2040731380CA230056300A /* musicplugin.cpp in Sources */,
-				DF2040741380CA230056300A /* rate.cpp in Sources */,
-				DF2040751380CA230056300A /* timestamp.cpp in Sources */,
-				DF2040A51380CA400056300A /* adpcm.cpp in Sources */,
-				DF2040A61380CA400056300A /* aiff.cpp in Sources */,
-				DF2040A71380CA400056300A /* flac.cpp in Sources */,
-				DF2040A81380CA400056300A /* iff_sound.cpp in Sources */,
-				DF2040A91380CA400056300A /* mac_snd.cpp in Sources */,
-				DF2040AA1380CA400056300A /* mp3.cpp in Sources */,
-				DF2040AB1380CA400056300A /* raw.cpp in Sources */,
-				DF2040AC1380CA400056300A /* vag.cpp in Sources */,
-				DF2040AD1380CA400056300A /* voc.cpp in Sources */,
-				DF2040AE1380CA400056300A /* vorbis.cpp in Sources */,
-				DF2040AF1380CA400056300A /* wave.cpp in Sources */,
-				DF2040D41380CA810056300A /* infogrames.cpp in Sources */,
-				DF2040D51380CA810056300A /* maxtrax.cpp in Sources */,
-				DF2040D61380CA810056300A /* module.cpp in Sources */,
-				DF2040D71380CA810056300A /* paula.cpp in Sources */,
-				DF2040D81380CA810056300A /* protracker.cpp in Sources */,
-				DF2040D91380CA810056300A /* rjp1.cpp in Sources */,
-				DF2040DA1380CA810056300A /* soundfx.cpp in Sources */,
-				DF2040DB1380CA810056300A /* tfmx.cpp in Sources */,
-				DF2040FE1380CAA40056300A /* adlib.cpp in Sources */,
-				DF2040FF1380CAA40056300A /* appleiigs.cpp in Sources */,
-				DF2041001380CAA40056300A /* cms.cpp in Sources */,
-				DF2041011380CAA40056300A /* eas.cpp in Sources */,
-				DF2041021380CAA40056300A /* fluidsynth.cpp in Sources */,
-				DF2041031380CAA40056300A /* mt32.cpp in Sources */,
-				DF2041041380CAA40056300A /* pcspk.cpp in Sources */,
-				DF2041051380CAA40056300A /* sid.cpp in Sources */,
-				DF2041061380CAA40056300A /* wave6581.cpp in Sources */,
-				DF46B6F41381E18900D08723 /* coroutine.cpp in Sources */,
-				DF46B7031381E1FF00D08723 /* towns_audio.cpp in Sources */,
-				DF46B7041381E1FF00D08723 /* towns_euphony.cpp in Sources */,
-				DF46B7051381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */,
-				DF46B7061381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */,
-				DF46B71F1381E27000D08723 /* console.cpp in Sources */,
-				DF46B7201381E27000D08723 /* databases.cpp in Sources */,
-				DF46B7211381E27000D08723 /* dbase.cpp in Sources */,
-				DF46B7221381E27000D08723 /* iniconfig.cpp in Sources */,
-				DF46B7231381E27000D08723 /* init_v7.cpp in Sources */,
-				DF46B7241381E27000D08723 /* inter_inca2.cpp in Sources */,
-				DF46B7451381E40500D08723 /* log.cpp in Sources */,
-				DF46B74A1381E40F00D08723 /* modular-backend.cpp in Sources */,
-				DF46B7551381E46700D08723 /* player_v2base.cpp in Sources */,
-				DF46B75F1381E4A400D08723 /* console.cpp in Sources */,
-				DF46B7641381E4D400D08723 /* robot_decoder.cpp in Sources */,
-				DF46B7681381E4E400D08723 /* vm_types.cpp in Sources */,
-				DF46B7801381E54200D08723 /* dcl.cpp in Sources */,
-				DF46B7811381E54200D08723 /* iff_container.cpp in Sources */,
-				DF46B7821381E54200D08723 /* winexe_ne.cpp in Sources */,
-				DF46B7831381E54200D08723 /* winexe_pe.cpp in Sources */,
-				DF46B7841381E54200D08723 /* winexe.cpp in Sources */,
-				DF46B7951381E58000D08723 /* png.cpp in Sources */,
-				DF46B7961381E58000D08723 /* wincursor.cpp in Sources */,
-				DF46B7A01381E5B500D08723 /* winfont.cpp in Sources */,
-				DF46B7AA1381E5F100D08723 /* header.cpp in Sources */,
-				DF46B7B51381E67800D08723 /* sdl-mutex.cpp in Sources */,
-				DF46B7BE1381E6C000D08723 /* object.cpp in Sources */,
-				DF46B7C91381E72500D08723 /* console.cpp in Sources */,
-				DF46B7D71381E7C600D08723 /* console.cpp in Sources */,
-				DF46B83D1381F13500D08723 /* saveload_v7.cpp in Sources */,
-				DF46B8451381F35500D08723 /* saveload_inca2.cpp in Sources */,
-				DF46B8491381F38700D08723 /* inter_v7.cpp in Sources */,
-				DF46B84E1381F39E00D08723 /* console.cpp in Sources */,
-				DF46B8531381F3B400D08723 /* console.cpp in Sources */,
-				DF46B8631381F44E00D08723 /* dbopl.cpp in Sources */,
-				DF46B8641381F44E00D08723 /* dosbox.cpp in Sources */,
-				DF46B8651381F44E00D08723 /* mame.cpp in Sources */,
-				DF46B8721381F4A200D08723 /* sdl-audiocd.cpp in Sources */,
-				DF46B87E1381F4F200D08723 /* default-audiocd.cpp in Sources */,
-				DF46B88A1381F5D800D08723 /* sdl-provider.cpp in Sources */,
-				DF46B8931381F62B00D08723 /* adpcm.cpp in Sources */,
-				DF46B89C1381F6C400D08723 /* null.cpp in Sources */,
-				DFADEBB413820DF500C46364 /* maccursor.cpp in Sources */,
-				DFADEBB813820E0C00C46364 /* posix-fs.cpp in Sources */,
-				F92B4DCE139DD428000D1BF1 /* quicktime.cpp in Sources */,
-				F92B4DD3139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */,
-				F9946D90139E1A260072D195 /* cdtoons.cpp in Sources */,
-				F9946D91139E1A260072D195 /* cinepak.cpp in Sources */,
-				F9946D92139E1A260072D195 /* indeo3.cpp in Sources */,
-				F9946D93139E1A260072D195 /* mjpeg.cpp in Sources */,
-				F9946D94139E1A260072D195 /* msrle.cpp in Sources */,
-				F9946D95139E1A260072D195 /* msvideo1.cpp in Sources */,
-				F9946D96139E1A260072D195 /* qtrle.cpp in Sources */,
-				F9946D97139E1A260072D195 /* rpza.cpp in Sources */,
-				F9946D98139E1A260072D195 /* smc.cpp in Sources */,
-				F9946D99139E1A260072D195 /* truemotion1.cpp in Sources */,
-				F9946D9D139E1A560072D195 /* towns_midi.cpp in Sources */,
-				F9946DA0139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */,
-				F9946DB5139E1A880072D195 /* freeverb.cpp in Sources */,
-				F9946DB8139E1A880072D195 /* i386.cpp in Sources */,
-				F9946DBB139E1A880072D195 /* mt32_file.cpp in Sources */,
-				F9946DBE139E1A880072D195 /* part.cpp in Sources */,
-				F9946DC1139E1A880072D195 /* partial.cpp in Sources */,
-				F9946DC4139E1A880072D195 /* partialManager.cpp in Sources */,
-				F9946DC7139E1A880072D195 /* synth.cpp in Sources */,
-				F9946DCA139E1A880072D195 /* tables.cpp in Sources */,
-				F9946DD6139E1AD30072D195 /* aac.cpp in Sources */,
-				F9946DD9139E1AD30072D195 /* qdm2.cpp in Sources */,
-				F9946DDC139E1AD30072D195 /* quicktime.cpp in Sources */,
-				F9946DE3139E1B180072D195 /* posix-main.cpp in Sources */,
-				F9946DE6139E1B180072D195 /* posix.cpp in Sources */,
-				F9946DEC139E1B6F0072D195 /* downscaler.cpp in Sources */,
-				F9946DF1139E1BA00072D195 /* console.cpp in Sources */,
-				F9946DF7139E1BBF0072D195 /* sdl-mixer.cpp in Sources */,
-				F9946DFE139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */,
-				F9946E04139E1C390072D195 /* sdl-graphics.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DF093E800F63CB26002D821E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DF093E810F63CB26002D821E /* commandLine.cpp in Sources */,
-				DF093E820F63CB26002D821E /* main.cpp in Sources */,
-				DF093E830F63CB26002D821E /* plugins.cpp in Sources */,
-				DF093E840F63CB26002D821E /* version.cpp in Sources */,
-				DF093E850F63CB26002D821E /* default-events.cpp in Sources */,
-				DF093E860F63CB26002D821E /* posix-fs-factory.cpp in Sources */,
-				DF093E890F63CB26002D821E /* posix-provider.cpp in Sources */,
-				DF093E8A0F63CB26002D821E /* default-saves.cpp in Sources */,
-				DF093E8B0F63CB26002D821E /* savefile.cpp in Sources */,
-				DF093E8C0F63CB26002D821E /* default-timer.cpp in Sources */,
-				DF093E8D0F63CB26002D821E /* config-file.cpp in Sources */,
-				DF093E8E0F63CB26002D821E /* config-manager.cpp in Sources */,
-				DF093E8F0F63CB26002D821E /* file.cpp in Sources */,
-				DF093E900F63CB26002D821E /* fs.cpp in Sources */,
-				DF093E910F63CB26002D821E /* hashmap.cpp in Sources */,
-				DF093E920F63CB26002D821E /* md5.cpp in Sources */,
-				DF093E930F63CB26002D821E /* mutex.cpp in Sources */,
-				DF093E940F63CB26002D821E /* str.cpp in Sources */,
-				DF093E950F63CB26002D821E /* stream.cpp in Sources */,
-				DF093E960F63CB26002D821E /* system.cpp in Sources */,
-				DF093E970F63CB26002D821E /* util.cpp in Sources */,
-				DF093E980F63CB26002D821E /* zlib.cpp in Sources */,
-				DF093E990F63CB26002D821E /* cursorman.cpp in Sources */,
-				DF093E9A0F63CB26002D821E /* font.cpp in Sources */,
-				DF093E9B0F63CB26002D821E /* fontman.cpp in Sources */,
-				DF093E9C0F63CB26002D821E /* consolefont.cpp in Sources */,
-				DF093E9D0F63CB26002D821E /* newfont.cpp in Sources */,
-				DF093E9E0F63CB26002D821E /* newfont_big.cpp in Sources */,
-				DF093EA00F63CB26002D821E /* iff.cpp in Sources */,
-				DF093EA10F63CB26002D821E /* imagedec.cpp in Sources */,
-				DF093EA20F63CB26002D821E /* primitives.cpp in Sources */,
-				DF093EA30F63CB26002D821E /* surface.cpp in Sources */,
-				DF093EA40F63CB26002D821E /* about.cpp in Sources */,
-				DF093EA50F63CB26002D821E /* Actions.cpp in Sources */,
-				DF093EA70F63CB26002D821E /* chooser.cpp in Sources */,
-				DF093EA80F63CB26002D821E /* console.cpp in Sources */,
-				DF093EA90F63CB26002D821E /* debugger.cpp in Sources */,
-				DF093EAA0F63CB26002D821E /* dialog.cpp in Sources */,
-				DF093EAD0F63CB26002D821E /* Key.cpp in Sources */,
-				DF093EAE0F63CB26002D821E /* launcher.cpp in Sources */,
-				DF093EB00F63CB26002D821E /* massadd.cpp in Sources */,
-				DF093EB10F63CB26002D821E /* message.cpp in Sources */,
-				DF093EB20F63CB26002D821E /* object.cpp in Sources */,
-				DF093EB30F63CB26002D821E /* options.cpp in Sources */,
-				DF093EB70F63CB26002D821E /* themebrowser.cpp in Sources */,
-				DF093EB80F63CB26002D821E /* widget.cpp in Sources */,
-				DF093ED60F63CB26002D821E /* memorypool.cpp in Sources */,
-				DF093ED70F63CB26002D821E /* seq.cpp in Sources */,
-				DF093ED80F63CB26002D821E /* scaler.cpp in Sources */,
-				DF093ED90F63CB26002D821E /* scalebit.cpp in Sources */,
-				DF093EDA0F63CB26002D821E /* 2xsai.cpp in Sources */,
-				DF093EDB0F63CB26002D821E /* aspect.cpp in Sources */,
-				DF093EDE0F63CB26002D821E /* scale2x.cpp in Sources */,
-				DF093EDF0F63CB26002D821E /* scale3x.cpp in Sources */,
-				DF093EE20F63CB26002D821E /* agi.cpp in Sources */,
-				DF093EE30F63CB26002D821E /* checks.cpp in Sources */,
-				DF093EE40F63CB26002D821E /* console.cpp in Sources */,
-				DF093EE50F63CB26002D821E /* cycle.cpp in Sources */,
-				DF093EE60F63CB26002D821E /* detection.cpp in Sources */,
-				DF093EE70F63CB26002D821E /* global.cpp in Sources */,
-				DF093EE80F63CB26002D821E /* graphics.cpp in Sources */,
-				DF093EE90F63CB26002D821E /* id.cpp in Sources */,
-				DF093EEA0F63CB26002D821E /* inv.cpp in Sources */,
-				DF093EEB0F63CB26002D821E /* keyboard.cpp in Sources */,
-				DF093EEC0F63CB26002D821E /* loader_v2.cpp in Sources */,
-				DF093EED0F63CB26002D821E /* loader_v3.cpp in Sources */,
-				DF093EEE0F63CB26002D821E /* logic.cpp in Sources */,
-				DF093EEF0F63CB26002D821E /* lzw.cpp in Sources */,
-				DF093EF00F63CB26002D821E /* menu.cpp in Sources */,
-				DF093EF10F63CB26002D821E /* motion.cpp in Sources */,
-				DF093EF20F63CB26002D821E /* objects.cpp in Sources */,
-				DF093EF30F63CB26002D821E /* op_cmd.cpp in Sources */,
-				DF093EF40F63CB26002D821E /* op_dbg.cpp in Sources */,
-				DF093EF50F63CB26002D821E /* op_test.cpp in Sources */,
-				DF093EF60F63CB26002D821E /* picture.cpp in Sources */,
-				DF093EF70F63CB26002D821E /* preagi.cpp in Sources */,
-				DF093EF80F63CB26002D821E /* preagi_common.cpp in Sources */,
-				DF093EF90F63CB26002D821E /* preagi_mickey.cpp in Sources */,
-				DF093EFA0F63CB26002D821E /* preagi_troll.cpp in Sources */,
-				DF093EFB0F63CB26002D821E /* preagi_winnie.cpp in Sources */,
-				DF093EFC0F63CB26002D821E /* predictive.cpp in Sources */,
-				DF093EFD0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF093EFE0F63CB26002D821E /* sound.cpp in Sources */,
-				DF093EFF0F63CB26002D821E /* sprite.cpp in Sources */,
-				DF093F000F63CB26002D821E /* text.cpp in Sources */,
-				DF093F010F63CB26002D821E /* view.cpp in Sources */,
-				DF093F020F63CB26002D821E /* wagparser.cpp in Sources */,
-				DF093F030F63CB26002D821E /* words.cpp in Sources */,
-				DF093F040F63CB26002D821E /* agos.cpp in Sources */,
-				DF093F050F63CB26002D821E /* animation.cpp in Sources */,
-				DF093F060F63CB26002D821E /* charset-fontdata.cpp in Sources */,
-				DF093F070F63CB26002D821E /* charset.cpp in Sources */,
-				DF093F080F63CB26002D821E /* contain.cpp in Sources */,
-				DF093F090F63CB26002D821E /* cursor.cpp in Sources */,
-				DF093F0A0F63CB26002D821E /* debug.cpp in Sources */,
-				DF093F0B0F63CB26002D821E /* debugger.cpp in Sources */,
-				DF093F0C0F63CB26002D821E /* detection.cpp in Sources */,
-				DF093F0D0F63CB26002D821E /* draw.cpp in Sources */,
-				DF093F0E0F63CB26002D821E /* event.cpp in Sources */,
-				DF093F0F0F63CB26002D821E /* gfx.cpp in Sources */,
-				DF093F100F63CB26002D821E /* icons.cpp in Sources */,
-				DF093F110F63CB26002D821E /* input.cpp in Sources */,
-				DF093F120F63CB26002D821E /* items.cpp in Sources */,
-				DF093F130F63CB26002D821E /* menus.cpp in Sources */,
-				DF093F140F63CB26002D821E /* midi.cpp in Sources */,
-				DF093F150F63CB26002D821E /* midiparser_s1d.cpp in Sources */,
-				DF093F160F63CB26002D821E /* oracle.cpp in Sources */,
-				DF093F170F63CB26002D821E /* res.cpp in Sources */,
-				DF093F180F63CB26002D821E /* res_ami.cpp in Sources */,
-				DF093F190F63CB26002D821E /* res_snd.cpp in Sources */,
-				DF093F1A0F63CB26002D821E /* rooms.cpp in Sources */,
-				DF093F1B0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF093F1C0F63CB26002D821E /* script.cpp in Sources */,
-				DF093F1D0F63CB26002D821E /* script_e1.cpp in Sources */,
-				DF093F1E0F63CB26002D821E /* script_e2.cpp in Sources */,
-				DF093F1F0F63CB26002D821E /* script_ff.cpp in Sources */,
-				DF093F200F63CB26002D821E /* script_pp.cpp in Sources */,
-				DF093F210F63CB26002D821E /* script_s1.cpp in Sources */,
-				DF093F220F63CB26002D821E /* script_s2.cpp in Sources */,
-				DF093F230F63CB26002D821E /* script_ww.cpp in Sources */,
-				DF093F240F63CB26002D821E /* sound.cpp in Sources */,
-				DF093F250F63CB26002D821E /* string.cpp in Sources */,
-				DF093F260F63CB26002D821E /* subroutine.cpp in Sources */,
-				DF093F270F63CB26002D821E /* verb.cpp in Sources */,
-				DF093F280F63CB26002D821E /* vga.cpp in Sources */,
-				DF093F290F63CB26002D821E /* vga_e2.cpp in Sources */,
-				DF093F2A0F63CB26002D821E /* vga_ff.cpp in Sources */,
-				DF093F2B0F63CB26002D821E /* vga_s1.cpp in Sources */,
-				DF093F2C0F63CB26002D821E /* vga_s2.cpp in Sources */,
-				DF093F2D0F63CB26002D821E /* vga_ww.cpp in Sources */,
-				DF093F2E0F63CB26002D821E /* window.cpp in Sources */,
-				DF093F2F0F63CB26002D821E /* zones.cpp in Sources */,
-				DF093F300F63CB26002D821E /* anim.cpp in Sources */,
-				DF093F310F63CB26002D821E /* bg.cpp in Sources */,
-				DF093F320F63CB26002D821E /* bg_list.cpp in Sources */,
-				DF093F330F63CB26002D821E /* cine.cpp in Sources */,
-				DF093F340F63CB26002D821E /* detection.cpp in Sources */,
-				DF093F350F63CB26002D821E /* gfx.cpp in Sources */,
-				DF093F360F63CB26002D821E /* main_loop.cpp in Sources */,
-				DF093F370F63CB26002D821E /* msg.cpp in Sources */,
-				DF093F380F63CB26002D821E /* object.cpp in Sources */,
-				DF093F390F63CB26002D821E /* pal.cpp in Sources */,
-				DF093F3A0F63CB26002D821E /* part.cpp in Sources */,
-				DF093F3B0F63CB26002D821E /* prc.cpp in Sources */,
-				DF093F3C0F63CB26002D821E /* rel.cpp in Sources */,
-				DF093F3D0F63CB26002D821E /* script_fw.cpp in Sources */,
-				DF093F3E0F63CB26002D821E /* script_os.cpp in Sources */,
-				DF093F3F0F63CB26002D821E /* sound.cpp in Sources */,
-				DF093F400F63CB26002D821E /* texte.cpp in Sources */,
-				DF093F410F63CB26002D821E /* unpack.cpp in Sources */,
-				DF093F420F63CB26002D821E /* various.cpp in Sources */,
-				DF093F430F63CB26002D821E /* actor.cpp in Sources */,
-				DF093F440F63CB26002D821E /* background.cpp in Sources */,
-				DF093F450F63CB26002D821E /* backgroundIncrust.cpp in Sources */,
-				DF093F460F63CB26002D821E /* cell.cpp in Sources */,
-				DF093F470F63CB26002D821E /* cruise.cpp in Sources */,
-				DF093F480F63CB26002D821E /* cruise_main.cpp in Sources */,
-				DF093F490F63CB26002D821E /* ctp.cpp in Sources */,
-				DF093F4A0F63CB26002D821E /* dataLoader.cpp in Sources */,
-				DF093F4B0F63CB26002D821E /* decompiler.cpp in Sources */,
-				DF093F4C0F63CB26002D821E /* delphine-unpack.cpp in Sources */,
-				DF093F4D0F63CB26002D821E /* detection.cpp in Sources */,
-				DF093F4E0F63CB26002D821E /* font.cpp in Sources */,
-				DF093F4F0F63CB26002D821E /* function.cpp in Sources */,
-				DF093F500F63CB26002D821E /* gfxModule.cpp in Sources */,
-				DF093F510F63CB26002D821E /* linker.cpp in Sources */,
-				DF093F520F63CB26002D821E /* mainDraw.cpp in Sources */,
-				DF093F530F63CB26002D821E /* menu.cpp in Sources */,
-				DF093F540F63CB26002D821E /* mouse.cpp in Sources */,
-				DF093F550F63CB26002D821E /* object.cpp in Sources */,
-				DF093F560F63CB26002D821E /* overlay.cpp in Sources */,
-				DF093F570F63CB26002D821E /* perso.cpp in Sources */,
-				DF093F580F63CB26002D821E /* polys.cpp in Sources */,
-				DF093F590F63CB26002D821E /* saveload.cpp in Sources */,
-				DF093F5A0F63CB26002D821E /* script.cpp in Sources */,
-				DF093F5B0F63CB26002D821E /* stack.cpp in Sources */,
-				DF093F5C0F63CB26002D821E /* various.cpp in Sources */,
-				DF093F5D0F63CB26002D821E /* vars.cpp in Sources */,
-				DF093F5E0F63CB26002D821E /* volume.cpp in Sources */,
-				DF093F5F0F63CB26002D821E /* dialogs.cpp in Sources */,
-				DF093F600F63CB26002D821E /* actors.cpp in Sources */,
-				DF093F610F63CB26002D821E /* animation.cpp in Sources */,
-				DF093F620F63CB26002D821E /* converse.cpp in Sources */,
-				DF093F630F63CB26002D821E /* detection.cpp in Sources */,
-				DF093F640F63CB26002D821E /* drascula.cpp in Sources */,
-				DF093F650F63CB26002D821E /* graphics.cpp in Sources */,
-				DF093F660F63CB26002D821E /* interface.cpp in Sources */,
-				DF093F670F63CB26002D821E /* objects.cpp in Sources */,
-				DF093F680F63CB26002D821E /* palette.cpp in Sources */,
-				DF093F690F63CB26002D821E /* rooms.cpp in Sources */,
-				DF093F6A0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF093F6B0F63CB26002D821E /* sound.cpp in Sources */,
-				DF093F6C0F63CB26002D821E /* talk.cpp in Sources */,
-				DF093F6D0F63CB26002D821E /* engine.cpp in Sources */,
-				DF093F6F0F63CB26002D821E /* dataio.cpp in Sources */,
-				DF093F700F63CB26002D821E /* detection.cpp in Sources */,
-				DF093F710F63CB26002D821E /* draw.cpp in Sources */,
-				DF093F720F63CB26002D821E /* draw_bargon.cpp in Sources */,
-				DF093F730F63CB26002D821E /* draw_v1.cpp in Sources */,
-				DF093F740F63CB26002D821E /* draw_v2.cpp in Sources */,
-				DF093F760F63CB26002D821E /* game.cpp in Sources */,
-				DF093F790F63CB26002D821E /* global.cpp in Sources */,
-				DF093F7A0F63CB26002D821E /* gob.cpp in Sources */,
-				DF093F7B0F63CB26002D821E /* goblin.cpp in Sources */,
-				DF093F7C0F63CB26002D821E /* goblin_v1.cpp in Sources */,
-				DF093F7D0F63CB26002D821E /* goblin_v2.cpp in Sources */,
-				DF093F7E0F63CB26002D821E /* goblin_v3.cpp in Sources */,
-				DF093F7F0F63CB26002D821E /* goblin_v4.cpp in Sources */,
-				DF093F800F63CB26002D821E /* init.cpp in Sources */,
-				DF093F810F63CB26002D821E /* init_v1.cpp in Sources */,
-				DF093F820F63CB26002D821E /* init_v2.cpp in Sources */,
-				DF093F830F63CB26002D821E /* init_v3.cpp in Sources */,
-				DF093F840F63CB26002D821E /* inter.cpp in Sources */,
-				DF093F850F63CB26002D821E /* inter_bargon.cpp in Sources */,
-				DF093F860F63CB26002D821E /* inter_v1.cpp in Sources */,
-				DF093F870F63CB26002D821E /* inter_v2.cpp in Sources */,
-				DF093F880F63CB26002D821E /* inter_v3.cpp in Sources */,
-				DF093F890F63CB26002D821E /* inter_v4.cpp in Sources */,
-				DF093F8A0F63CB26002D821E /* inter_v5.cpp in Sources */,
-				DF093F8B0F63CB26002D821E /* inter_v6.cpp in Sources */,
-				DF093F8C0F63CB26002D821E /* map.cpp in Sources */,
-				DF093F8D0F63CB26002D821E /* map_v1.cpp in Sources */,
-				DF093F8E0F63CB26002D821E /* map_v2.cpp in Sources */,
-				DF093F900F63CB26002D821E /* mult.cpp in Sources */,
-				DF093F910F63CB26002D821E /* mult_v1.cpp in Sources */,
-				DF093F920F63CB26002D821E /* mult_v2.cpp in Sources */,
-				DF093F930F63CB26002D821E /* palanim.cpp in Sources */,
-				DF093F9B0F63CB26002D821E /* scenery.cpp in Sources */,
-				DF093F9C0F63CB26002D821E /* scenery_v1.cpp in Sources */,
-				DF093F9D0F63CB26002D821E /* scenery_v2.cpp in Sources */,
-				DF093F9E0F63CB26002D821E /* adlib.cpp in Sources */,
-				DF093F9F0F63CB26002D821E /* bgatmosphere.cpp in Sources */,
-				DF093FA00F63CB26002D821E /* cdrom.cpp in Sources */,
-				DF093FA10F63CB26002D821E /* infogrames.cpp in Sources */,
-				DF093FA20F63CB26002D821E /* pcspeaker.cpp in Sources */,
-				DF093FA30F63CB26002D821E /* sound.cpp in Sources */,
-				DF093FA40F63CB26002D821E /* soundblaster.cpp in Sources */,
-				DF093FA50F63CB26002D821E /* sounddesc.cpp in Sources */,
-				DF093FA60F63CB26002D821E /* soundmixer.cpp in Sources */,
-				DF093FA70F63CB26002D821E /* util.cpp in Sources */,
-				DF093FA80F63CB26002D821E /* variables.cpp in Sources */,
-				DF093FA90F63CB26002D821E /* video.cpp in Sources */,
-				DF093FAA0F63CB26002D821E /* video_v1.cpp in Sources */,
-				DF093FAB0F63CB26002D821E /* video_v2.cpp in Sources */,
-				DF093FAC0F63CB26002D821E /* video_v6.cpp in Sources */,
-				DF093FAD0F63CB26002D821E /* videoplayer.cpp in Sources */,
-				DF093FD10F63CB26002D821E /* animator_hof.cpp in Sources */,
-				DF093FD20F63CB26002D821E /* animator_lok.cpp in Sources */,
-				DF093FD30F63CB26002D821E /* animator_mr.cpp in Sources */,
-				DF093FD40F63CB26002D821E /* animator_v2.cpp in Sources */,
-				DF093FD50F63CB26002D821E /* debugger.cpp in Sources */,
-				DF093FD60F63CB26002D821E /* detection.cpp in Sources */,
-				DF093FD70F63CB26002D821E /* gui.cpp in Sources */,
-				DF093FD80F63CB26002D821E /* gui_hof.cpp in Sources */,
-				DF093FD90F63CB26002D821E /* gui_lok.cpp in Sources */,
-				DF093FDA0F63CB26002D821E /* gui_mr.cpp in Sources */,
-				DF093FDB0F63CB26002D821E /* gui_v2.cpp in Sources */,
-				DF093FDC0F63CB26002D821E /* items_hof.cpp in Sources */,
-				DF093FDD0F63CB26002D821E /* items_lok.cpp in Sources */,
-				DF093FDE0F63CB26002D821E /* items_mr.cpp in Sources */,
-				DF093FDF0F63CB26002D821E /* items_v2.cpp in Sources */,
-				DF093FE00F63CB26002D821E /* kyra_hof.cpp in Sources */,
-				DF093FE10F63CB26002D821E /* kyra_lok.cpp in Sources */,
-				DF093FE20F63CB26002D821E /* kyra_mr.cpp in Sources */,
-				DF093FE30F63CB26002D821E /* kyra_v1.cpp in Sources */,
-				DF093FE40F63CB26002D821E /* kyra_v2.cpp in Sources */,
-				DF093FE50F63CB26002D821E /* lol.cpp in Sources */,
-				DF093FE60F63CB26002D821E /* resource.cpp in Sources */,
-				DF093FE70F63CB26002D821E /* resource_intern.cpp in Sources */,
-				DF093FE80F63CB26002D821E /* saveload.cpp in Sources */,
-				DF093FE90F63CB26002D821E /* saveload_hof.cpp in Sources */,
-				DF093FEA0F63CB26002D821E /* saveload_lok.cpp in Sources */,
-				DF093FEB0F63CB26002D821E /* saveload_mr.cpp in Sources */,
-				DF093FEC0F63CB26002D821E /* scene_hof.cpp in Sources */,
-				DF093FED0F63CB26002D821E /* scene_lok.cpp in Sources */,
-				DF093FEE0F63CB26002D821E /* scene_mr.cpp in Sources */,
-				DF093FEF0F63CB26002D821E /* scene_v1.cpp in Sources */,
-				DF093FF00F63CB26002D821E /* scene_v2.cpp in Sources */,
-				DF093FF10F63CB26002D821E /* screen.cpp in Sources */,
-				DF093FF20F63CB26002D821E /* screen_hof.cpp in Sources */,
-				DF093FF30F63CB26002D821E /* screen_lok.cpp in Sources */,
-				DF093FF40F63CB26002D821E /* screen_lol.cpp in Sources */,
-				DF093FF50F63CB26002D821E /* screen_mr.cpp in Sources */,
-				DF093FF60F63CB26002D821E /* screen_v2.cpp in Sources */,
-				DF093FF70F63CB26002D821E /* script.cpp in Sources */,
-				DF093FF80F63CB26002D821E /* script_hof.cpp in Sources */,
-				DF093FF90F63CB26002D821E /* script_lok.cpp in Sources */,
-				DF093FFA0F63CB26002D821E /* script_mr.cpp in Sources */,
-				DF093FFB0F63CB26002D821E /* script_tim.cpp in Sources */,
-				DF093FFC0F63CB26002D821E /* script_v1.cpp in Sources */,
-				DF093FFD0F63CB26002D821E /* script_v2.cpp in Sources */,
-				DF093FFE0F63CB26002D821E /* seqplayer.cpp in Sources */,
-				DF093FFF0F63CB26002D821E /* sequences_hof.cpp in Sources */,
-				DF0940000F63CB26002D821E /* sequences_lok.cpp in Sources */,
-				DF0940010F63CB26002D821E /* sequences_mr.cpp in Sources */,
-				DF0940020F63CB26002D821E /* sequences_v2.cpp in Sources */,
-				DF0940030F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940040F63CB26002D821E /* sound_adlib.cpp in Sources */,
-				DF0940050F63CB26002D821E /* sound_digital.cpp in Sources */,
-				DF0940060F63CB26002D821E /* sound_lok.cpp in Sources */,
-				DF0940070F63CB26002D821E /* sound_towns.cpp in Sources */,
-				DF0940080F63CB26002D821E /* sprites.cpp in Sources */,
-				DF0940090F63CB26002D821E /* staticres.cpp in Sources */,
-				DF09400A0F63CB26002D821E /* text.cpp in Sources */,
-				DF09400B0F63CB26002D821E /* text_hof.cpp in Sources */,
-				DF09400C0F63CB26002D821E /* text_lok.cpp in Sources */,
-				DF09400D0F63CB26002D821E /* text_mr.cpp in Sources */,
-				DF09400E0F63CB26002D821E /* timer.cpp in Sources */,
-				DF09400F0F63CB26002D821E /* timer_hof.cpp in Sources */,
-				DF0940100F63CB26002D821E /* timer_lok.cpp in Sources */,
-				DF0940110F63CB26002D821E /* timer_mr.cpp in Sources */,
-				DF0940120F63CB26002D821E /* vqa.cpp in Sources */,
-				DF0940130F63CB26002D821E /* wsamovie.cpp in Sources */,
-				DF0940140F63CB26002D821E /* animseq.cpp in Sources */,
-				DF0940150F63CB26002D821E /* debugger.cpp in Sources */,
-				DF0940160F63CB26002D821E /* decode.cpp in Sources */,
-				DF0940170F63CB26002D821E /* detection.cpp in Sources */,
-				DF0940180F63CB26002D821E /* disk.cpp in Sources */,
-				DF0940190F63CB26002D821E /* events.cpp in Sources */,
-				DF09401A0F63CB26002D821E /* fights.cpp in Sources */,
-				DF09401B0F63CB26002D821E /* game.cpp in Sources */,
-				DF09401C0F63CB26002D821E /* hotspots.cpp in Sources */,
-				DF09401D0F63CB26002D821E /* intro.cpp in Sources */,
-				DF09401E0F63CB26002D821E /* lure.cpp in Sources */,
-				DF09401F0F63CB26002D821E /* memory.cpp in Sources */,
-				DF0940200F63CB26002D821E /* menu.cpp in Sources */,
-				DF0940210F63CB26002D821E /* palette.cpp in Sources */,
-				DF0940220F63CB26002D821E /* res.cpp in Sources */,
-				DF0940230F63CB26002D821E /* res_struct.cpp in Sources */,
-				DF0940240F63CB26002D821E /* room.cpp in Sources */,
-				DF0940250F63CB26002D821E /* screen.cpp in Sources */,
-				DF0940260F63CB26002D821E /* scripts.cpp in Sources */,
-				DF0940270F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940280F63CB26002D821E /* strings.cpp in Sources */,
-				DF0940290F63CB26002D821E /* surface.cpp in Sources */,
-				DF09402A0F63CB26002D821E /* actor.cpp in Sources */,
-				DF09402B0F63CB26002D821E /* animation.cpp in Sources */,
-				DF09402C0F63CB26002D821E /* assets.cpp in Sources */,
-				DF09402D0F63CB26002D821E /* compression.cpp in Sources */,
-				DF09402E0F63CB26002D821E /* console.cpp in Sources */,
-				DF09402F0F63CB26002D821E /* converse.cpp in Sources */,
-				DF0940300F63CB26002D821E /* detection.cpp in Sources */,
-				DF0940310F63CB26002D821E /* events.cpp in Sources */,
-				DF0940320F63CB26002D821E /* font.cpp in Sources */,
-				DF0940330F63CB26002D821E /* globals.cpp in Sources */,
-				DF0940340F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0940350F63CB26002D821E /* gui.cpp in Sources */,
-				DF0940360F63CB26002D821E /* hotspot.cpp in Sources */,
-				DF0940370F63CB26002D821E /* m4.cpp in Sources */,
-				DF0940380F63CB26002D821E /* m4_menus.cpp in Sources */,
-				DF0940390F63CB26002D821E /* m4_views.cpp in Sources */,
-				DF09403A0F63CB26002D821E /* mads_anim.cpp in Sources */,
-				DF09403B0F63CB26002D821E /* mads_menus.cpp in Sources */,
-				DF09403C0F63CB26002D821E /* midi.cpp in Sources */,
-				DF09403D0F63CB26002D821E /* rails.cpp in Sources */,
-				DF09403E0F63CB26002D821E /* resource.cpp in Sources */,
-				DF09403F0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0940400F63CB26002D821E /* scene.cpp in Sources */,
-				DF0940410F63CB26002D821E /* script.cpp in Sources */,
-				DF0940420F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940430F63CB26002D821E /* sprite.cpp in Sources */,
-				DF0940440F63CB26002D821E /* viewmgr.cpp in Sources */,
-				DF0940450F63CB26002D821E /* woodscript.cpp in Sources */,
-				DF0940460F63CB26002D821E /* ws_machine.cpp in Sources */,
-				DF0940470F63CB26002D821E /* ws_sequence.cpp in Sources */,
-				DF0940480F63CB26002D821E /* database.cpp in Sources */,
-				DF0940490F63CB26002D821E /* detection.cpp in Sources */,
-				DF09404A0F63CB26002D821E /* graphics.cpp in Sources */,
-				DF09404B0F63CB26002D821E /* made.cpp in Sources */,
-				DF09404C0F63CB26002D821E /* music.cpp in Sources */,
-				DF09404D0F63CB26002D821E /* pmvplayer.cpp in Sources */,
-				DF09404E0F63CB26002D821E /* redreader.cpp in Sources */,
-				DF09404F0F63CB26002D821E /* resource.cpp in Sources */,
-				DF0940500F63CB26002D821E /* screen.cpp in Sources */,
-				DF0940510F63CB26002D821E /* screenfx.cpp in Sources */,
-				DF0940520F63CB26002D821E /* script.cpp in Sources */,
-				DF0940530F63CB26002D821E /* scriptfuncs.cpp in Sources */,
-				DF0940540F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940550F63CB26002D821E /* balloons.cpp in Sources */,
-				DF0940560F63CB26002D821E /* callables_br.cpp in Sources */,
-				DF0940570F63CB26002D821E /* callables_ns.cpp in Sources */,
-				DF0940580F63CB26002D821E /* debug.cpp in Sources */,
-				DF0940590F63CB26002D821E /* detection.cpp in Sources */,
-				DF09405A0F63CB26002D821E /* dialogue.cpp in Sources */,
-				DF09405B0F63CB26002D821E /* disk_br.cpp in Sources */,
-				DF09405C0F63CB26002D821E /* disk_ns.cpp in Sources */,
-				DF09405D0F63CB26002D821E /* exec_br.cpp in Sources */,
-				DF09405E0F63CB26002D821E /* exec_ns.cpp in Sources */,
-				DF09405F0F63CB26002D821E /* font.cpp in Sources */,
-				DF0940600F63CB26002D821E /* gfxbase.cpp in Sources */,
-				DF0940610F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0940620F63CB26002D821E /* gui.cpp in Sources */,
-				DF0940630F63CB26002D821E /* gui_br.cpp in Sources */,
-				DF0940640F63CB26002D821E /* gui_ns.cpp in Sources */,
-				DF0940650F63CB26002D821E /* input.cpp in Sources */,
-				DF0940660F63CB26002D821E /* inventory.cpp in Sources */,
-				DF0940670F63CB26002D821E /* objects.cpp in Sources */,
-				DF0940680F63CB26002D821E /* parallaction.cpp in Sources */,
-				DF0940690F63CB26002D821E /* parallaction_br.cpp in Sources */,
-				DF09406A0F63CB26002D821E /* parallaction_ns.cpp in Sources */,
-				DF09406B0F63CB26002D821E /* parser.cpp in Sources */,
-				DF09406C0F63CB26002D821E /* parser_br.cpp in Sources */,
-				DF09406D0F63CB26002D821E /* parser_ns.cpp in Sources */,
-				DF09406E0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0940700F63CB26002D821E /* staticres.cpp in Sources */,
-				DF0940710F63CB26002D821E /* walk.cpp in Sources */,
-				DF0940720F63CB26002D821E /* bankman.cpp in Sources */,
-				DF0940730F63CB26002D821E /* command.cpp in Sources */,
-				DF0940740F63CB26002D821E /* credits.cpp in Sources */,
-				DF0940750F63CB26002D821E /* cutaway.cpp in Sources */,
-				DF0940760F63CB26002D821E /* debug.cpp in Sources */,
-				DF0940770F63CB26002D821E /* display.cpp in Sources */,
-				DF0940780F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0940790F63CB26002D821E /* grid.cpp in Sources */,
-				DF09407A0F63CB26002D821E /* input.cpp in Sources */,
-				DF09407B0F63CB26002D821E /* journal.cpp in Sources */,
-				DF09407C0F63CB26002D821E /* logic.cpp in Sources */,
-				DF09407D0F63CB26002D821E /* midiadlib.cpp in Sources */,
-				DF09407E0F63CB26002D821E /* music.cpp in Sources */,
-				DF09407F0F63CB26002D821E /* musicdata.cpp in Sources */,
-				DF0940800F63CB26002D821E /* queen.cpp in Sources */,
-				DF0940810F63CB26002D821E /* resource.cpp in Sources */,
-				DF0940820F63CB26002D821E /* restables.cpp in Sources */,
-				DF0940830F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940840F63CB26002D821E /* state.cpp in Sources */,
-				DF0940850F63CB26002D821E /* talk.cpp in Sources */,
-				DF0940860F63CB26002D821E /* walk.cpp in Sources */,
-				DF0940870F63CB26002D821E /* actor.cpp in Sources */,
-				DF0940880F63CB26002D821E /* actor_path.cpp in Sources */,
-				DF0940890F63CB26002D821E /* actor_walk.cpp in Sources */,
-				DF09408A0F63CB26002D821E /* animation.cpp in Sources */,
-				DF09408B0F63CB26002D821E /* console.cpp in Sources */,
-				DF09408C0F63CB26002D821E /* detection.cpp in Sources */,
-				DF09408D0F63CB26002D821E /* events.cpp in Sources */,
-				DF09408E0F63CB26002D821E /* font.cpp in Sources */,
-				DF09408F0F63CB26002D821E /* font_map.cpp in Sources */,
-				DF0940900F63CB26002D821E /* gfx.cpp in Sources */,
-				DF0940910F63CB26002D821E /* image.cpp in Sources */,
-				DF0940920F63CB26002D821E /* input.cpp in Sources */,
-				DF0940930F63CB26002D821E /* interface.cpp in Sources */,
-				DF0940940F63CB26002D821E /* introproc_ihnm.cpp in Sources */,
-				DF0940950F63CB26002D821E /* introproc_ite.cpp in Sources */,
-				DF0940960F63CB26002D821E /* isomap.cpp in Sources */,
-				DF0940970F63CB26002D821E /* itedata.cpp in Sources */,
-				DF0940980F63CB26002D821E /* music.cpp in Sources */,
-				DF0940990F63CB26002D821E /* objectmap.cpp in Sources */,
-				DF09409A0F63CB26002D821E /* palanim.cpp in Sources */,
-				DF09409B0F63CB26002D821E /* puzzle.cpp in Sources */,
-				DF09409C0F63CB26002D821E /* render.cpp in Sources */,
-				DF09409D0F63CB26002D821E /* saga.cpp in Sources */,
-				DF09409E0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF09409F0F63CB26002D821E /* scene.cpp in Sources */,
-				DF0940A00F63CB26002D821E /* script.cpp in Sources */,
-				DF0940A10F63CB26002D821E /* sfuncs.cpp in Sources */,
-				DF0940A20F63CB26002D821E /* sndres.cpp in Sources */,
-				DF0940A30F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940A40F63CB26002D821E /* sprite.cpp in Sources */,
-				DF0940A50F63CB26002D821E /* sthread.cpp in Sources */,
-				DF0940A60F63CB26002D821E /* actor.cpp in Sources */,
-				DF0940A70F63CB26002D821E /* akos.cpp in Sources */,
-				DF0940A80F63CB26002D821E /* base-costume.cpp in Sources */,
-				DF0940A90F63CB26002D821E /* bomp.cpp in Sources */,
-				DF0940AA0F63CB26002D821E /* boxes.cpp in Sources */,
-				DF0940AB0F63CB26002D821E /* camera.cpp in Sources */,
-				DF0940AC0F63CB26002D821E /* charset-fontdata.cpp in Sources */,
-				DF0940AD0F63CB26002D821E /* charset.cpp in Sources */,
-				DF0940AE0F63CB26002D821E /* costume.cpp in Sources */,
-				DF0940AF0F63CB26002D821E /* cursor.cpp in Sources */,
-				DF0940B00F63CB26002D821E /* debugger.cpp in Sources */,
-				DF0940B10F63CB26002D821E /* detection.cpp in Sources */,
-				DF0940B20F63CB26002D821E /* dialogs.cpp in Sources */,
-				DF0940B30F63CB26002D821E /* file.cpp in Sources */,
-				DF0940B40F63CB26002D821E /* file_nes.cpp in Sources */,
-				DF0940B50F63CB26002D821E /* gfx.cpp in Sources */,
-				DF0940B60F63CB26002D821E /* animation_he.cpp in Sources */,
-				DF0940B70F63CB26002D821E /* cup_player_he.cpp in Sources */,
-				DF0940B80F63CB26002D821E /* floodfill_he.cpp in Sources */,
-				DF0940B90F63CB26002D821E /* logic_he.cpp in Sources */,
-				DF0940BA0F63CB26002D821E /* palette_he.cpp in Sources */,
-				DF0940BB0F63CB26002D821E /* resource_he.cpp in Sources */,
-				DF0940BC0F63CB26002D821E /* script_v100he.cpp in Sources */,
-				DF0940BD0F63CB26002D821E /* script_v60he.cpp in Sources */,
-				DF0940BE0F63CB26002D821E /* script_v70he.cpp in Sources */,
-				DF0940BF0F63CB26002D821E /* script_v71he.cpp in Sources */,
-				DF0940C00F63CB26002D821E /* script_v72he.cpp in Sources */,
-				DF0940C10F63CB26002D821E /* script_v80he.cpp in Sources */,
-				DF0940C20F63CB26002D821E /* script_v90he.cpp in Sources */,
-				DF0940C30F63CB26002D821E /* sound_he.cpp in Sources */,
-				DF0940C40F63CB26002D821E /* sprite_he.cpp in Sources */,
-				DF0940C50F63CB26002D821E /* wiz_he.cpp in Sources */,
-				DF0940C60F63CB26002D821E /* help.cpp in Sources */,
-				DF0940C70F63CB26002D821E /* imuse.cpp in Sources */,
-				DF0940C80F63CB26002D821E /* imuse_part.cpp in Sources */,
-				DF0940C90F63CB26002D821E /* imuse_player.cpp in Sources */,
-				DF0940CA0F63CB26002D821E /* instrument.cpp in Sources */,
-				DF0940CB0F63CB26002D821E /* sysex_samnmax.cpp in Sources */,
-				DF0940CC0F63CB26002D821E /* sysex_scumm.cpp in Sources */,
-				DF0940CD0F63CB26002D821E /* dimuse.cpp in Sources */,
-				DF0940CE0F63CB26002D821E /* dimuse_bndmgr.cpp in Sources */,
-				DF0940CF0F63CB26002D821E /* dimuse_codecs.cpp in Sources */,
-				DF0940D00F63CB26002D821E /* dimuse_music.cpp in Sources */,
-				DF0940D10F63CB26002D821E /* dimuse_script.cpp in Sources */,
-				DF0940D20F63CB26002D821E /* dimuse_sndmgr.cpp in Sources */,
-				DF0940D30F63CB26002D821E /* dimuse_tables.cpp in Sources */,
-				DF0940D40F63CB26002D821E /* dimuse_track.cpp in Sources */,
-				DF0940D50F63CB26002D821E /* input.cpp in Sources */,
-				DF0940D60F63CB26002D821E /* insane.cpp in Sources */,
-				DF0940D70F63CB26002D821E /* insane_ben.cpp in Sources */,
-				DF0940D80F63CB26002D821E /* insane_enemy.cpp in Sources */,
-				DF0940D90F63CB26002D821E /* insane_iact.cpp in Sources */,
-				DF0940DA0F63CB26002D821E /* insane_scenes.cpp in Sources */,
-				DF0940DC0F63CB26002D821E /* midiparser_ro.cpp in Sources */,
-				DF0940DD0F63CB26002D821E /* nut_renderer.cpp in Sources */,
-				DF0940DE0F63CB26002D821E /* object.cpp in Sources */,
-				DF0940DF0F63CB26002D821E /* palette.cpp in Sources */,
-				DF0940E00F63CB26002D821E /* player_mod.cpp in Sources */,
-				DF0940E10F63CB26002D821E /* player_nes.cpp in Sources */,
-				DF0940E20F63CB26002D821E /* player_v1.cpp in Sources */,
-				DF0940E30F63CB26002D821E /* player_v2.cpp in Sources */,
-				DF0940E40F63CB26002D821E /* player_v2a.cpp in Sources */,
-				DF0940E50F63CB26002D821E /* player_v3a.cpp in Sources */,
-				DF0940E60F63CB26002D821E /* resource.cpp in Sources */,
-				DF0940E70F63CB26002D821E /* resource_v2.cpp in Sources */,
-				DF0940E80F63CB26002D821E /* resource_v3.cpp in Sources */,
-				DF0940E90F63CB26002D821E /* resource_v4.cpp in Sources */,
-				DF0940EA0F63CB26002D821E /* room.cpp in Sources */,
-				DF0940EB0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0940EC0F63CB26002D821E /* script.cpp in Sources */,
-				DF0940ED0F63CB26002D821E /* script_v0.cpp in Sources */,
-				DF0940EE0F63CB26002D821E /* script_v2.cpp in Sources */,
-				DF0940EF0F63CB26002D821E /* script_v5.cpp in Sources */,
-				DF0940F00F63CB26002D821E /* script_v6.cpp in Sources */,
-				DF0940F10F63CB26002D821E /* script_v8.cpp in Sources */,
-				DF0940F20F63CB26002D821E /* scumm.cpp in Sources */,
-				DF0940F30F63CB26002D821E /* channel.cpp in Sources */,
-				DF0940F40F63CB26002D821E /* codec1.cpp in Sources */,
-				DF0940F50F63CB26002D821E /* codec37.cpp in Sources */,
-				DF0940F60F63CB26002D821E /* codec47.cpp in Sources */,
-				DF0940F70F63CB26002D821E /* imuse_channel.cpp in Sources */,
-				DF0940F80F63CB26002D821E /* saud_channel.cpp in Sources */,
-				DF0940F90F63CB26002D821E /* smush_font.cpp in Sources */,
-				DF0940FA0F63CB26002D821E /* smush_mixer.cpp in Sources */,
-				DF0940FB0F63CB26002D821E /* smush_player.cpp in Sources */,
-				DF0940FC0F63CB26002D821E /* sound.cpp in Sources */,
-				DF0940FD0F63CB26002D821E /* string.cpp in Sources */,
-				DF0940FE0F63CB26002D821E /* usage_bits.cpp in Sources */,
-				DF0940FF0F63CB26002D821E /* util.cpp in Sources */,
-				DF0941000F63CB26002D821E /* vars.cpp in Sources */,
-				DF0941010F63CB26002D821E /* verbs.cpp in Sources */,
-				DF0941020F63CB26002D821E /* autoroute.cpp in Sources */,
-				DF0941030F63CB26002D821E /* compact.cpp in Sources */,
-				DF0941040F63CB26002D821E /* control.cpp in Sources */,
-				DF0941050F63CB26002D821E /* debug.cpp in Sources */,
-				DF0941060F63CB26002D821E /* disk.cpp in Sources */,
-				DF0941070F63CB26002D821E /* grid.cpp in Sources */,
-				DF0941080F63CB26002D821E /* hufftext.cpp in Sources */,
-				DF0941090F63CB26002D821E /* intro.cpp in Sources */,
-				DF09410A0F63CB26002D821E /* logic.cpp in Sources */,
-				DF09410B0F63CB26002D821E /* mouse.cpp in Sources */,
-				DF09410C0F63CB26002D821E /* adlibchannel.cpp in Sources */,
-				DF09410D0F63CB26002D821E /* adlibmusic.cpp in Sources */,
-				DF09410E0F63CB26002D821E /* gmchannel.cpp in Sources */,
-				DF09410F0F63CB26002D821E /* gmmusic.cpp in Sources */,
-				DF0941100F63CB26002D821E /* mt32music.cpp in Sources */,
-				DF0941110F63CB26002D821E /* musicbase.cpp in Sources */,
-				DF0941120F63CB26002D821E /* rnc_deco.cpp in Sources */,
-				DF0941130F63CB26002D821E /* screen.cpp in Sources */,
-				DF0941140F63CB26002D821E /* sky.cpp in Sources */,
-				DF0941150F63CB26002D821E /* sound.cpp in Sources */,
-				DF0941160F63CB26002D821E /* text.cpp in Sources */,
-				DF0941170F63CB26002D821E /* animation.cpp in Sources */,
-				DF0941180F63CB26002D821E /* control.cpp in Sources */,
-				DF0941190F63CB26002D821E /* debug.cpp in Sources */,
-				DF09411A0F63CB26002D821E /* eventman.cpp in Sources */,
-				DF09411B0F63CB26002D821E /* logic.cpp in Sources */,
-				DF09411C0F63CB26002D821E /* memman.cpp in Sources */,
-				DF09411D0F63CB26002D821E /* menu.cpp in Sources */,
-				DF09411E0F63CB26002D821E /* mouse.cpp in Sources */,
-				DF09411F0F63CB26002D821E /* music.cpp in Sources */,
-				DF0941200F63CB26002D821E /* objectman.cpp in Sources */,
-				DF0941210F63CB26002D821E /* resman.cpp in Sources */,
-				DF0941220F63CB26002D821E /* router.cpp in Sources */,
-				DF0941230F63CB26002D821E /* screen.cpp in Sources */,
-				DF0941240F63CB26002D821E /* sound.cpp in Sources */,
-				DF0941250F63CB26002D821E /* staticres.cpp in Sources */,
-				DF0941260F63CB26002D821E /* sword1.cpp in Sources */,
-				DF0941270F63CB26002D821E /* text.cpp in Sources */,
-				DF0941280F63CB26002D821E /* animation.cpp in Sources */,
-				DF0941290F63CB26002D821E /* anims.cpp in Sources */,
-				DF09412A0F63CB26002D821E /* console.cpp in Sources */,
-				DF09412B0F63CB26002D821E /* controls.cpp in Sources */,
-				DF09412C0F63CB26002D821E /* debug.cpp in Sources */,
-				DF09412D0F63CB26002D821E /* events.cpp in Sources */,
-				DF09412E0F63CB26002D821E /* function.cpp in Sources */,
-				DF09412F0F63CB26002D821E /* icons.cpp in Sources */,
-				DF0941300F63CB26002D821E /* interpreter.cpp in Sources */,
-				DF0941310F63CB26002D821E /* layers.cpp in Sources */,
-				DF0941320F63CB26002D821E /* logic.cpp in Sources */,
-				DF0941330F63CB26002D821E /* maketext.cpp in Sources */,
-				DF0941340F63CB26002D821E /* memory.cpp in Sources */,
-				DF0941350F63CB26002D821E /* menu.cpp in Sources */,
-				DF0941360F63CB26002D821E /* mouse.cpp in Sources */,
-				DF0941370F63CB26002D821E /* music.cpp in Sources */,
-				DF0941380F63CB26002D821E /* palette.cpp in Sources */,
-				DF0941390F63CB26002D821E /* protocol.cpp in Sources */,
-				DF09413A0F63CB26002D821E /* render.cpp in Sources */,
-				DF09413B0F63CB26002D821E /* resman.cpp in Sources */,
-				DF09413C0F63CB26002D821E /* router.cpp in Sources */,
-				DF09413D0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF09413E0F63CB26002D821E /* screen.cpp in Sources */,
-				DF09413F0F63CB26002D821E /* scroll.cpp in Sources */,
-				DF0941400F63CB26002D821E /* sound.cpp in Sources */,
-				DF0941410F63CB26002D821E /* speech.cpp in Sources */,
-				DF0941420F63CB26002D821E /* sprite.cpp in Sources */,
-				DF0941430F63CB26002D821E /* startup.cpp in Sources */,
-				DF0941440F63CB26002D821E /* sword2.cpp in Sources */,
-				DF0941450F63CB26002D821E /* sync.cpp in Sources */,
-				DF0941460F63CB26002D821E /* walker.cpp in Sources */,
-				DF0941470F63CB26002D821E /* actors.cpp in Sources */,
-				DF0941480F63CB26002D821E /* anim.cpp in Sources */,
-				DF0941490F63CB26002D821E /* background.cpp in Sources */,
-				DF09414A0F63CB26002D821E /* bg.cpp in Sources */,
-				DF09414B0F63CB26002D821E /* cliprect.cpp in Sources */,
-				DF09414C0F63CB26002D821E /* config.cpp in Sources */,
-				DF09414D0F63CB26002D821E /* cursor.cpp in Sources */,
-				DF09414E0F63CB26002D821E /* debugger.cpp in Sources */,
-				DF09414F0F63CB26002D821E /* detection.cpp in Sources */,
-				DF0941500F63CB26002D821E /* effect.cpp in Sources */,
-				DF0941510F63CB26002D821E /* events.cpp in Sources */,
-				DF0941520F63CB26002D821E /* faders.cpp in Sources */,
-				DF0941530F63CB26002D821E /* font.cpp in Sources */,
-				DF0941540F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0941550F63CB26002D821E /* handle.cpp in Sources */,
-				DF0941560F63CB26002D821E /* heapmem.cpp in Sources */,
-				DF0941570F63CB26002D821E /* mareels.cpp in Sources */,
-				DF0941580F63CB26002D821E /* move.cpp in Sources */,
-				DF0941590F63CB26002D821E /* multiobj.cpp in Sources */,
-				DF09415A0F63CB26002D821E /* music.cpp in Sources */,
-				DF09415B0F63CB26002D821E /* object.cpp in Sources */,
-				DF09415C0F63CB26002D821E /* palette.cpp in Sources */,
-				DF09415D0F63CB26002D821E /* pcode.cpp in Sources */,
-				DF09415E0F63CB26002D821E /* pdisplay.cpp in Sources */,
-				DF09415F0F63CB26002D821E /* play.cpp in Sources */,
-				DF0941600F63CB26002D821E /* polygons.cpp in Sources */,
-				DF0941610F63CB26002D821E /* rince.cpp in Sources */,
-				DF0941620F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0941630F63CB26002D821E /* savescn.cpp in Sources */,
-				DF0941640F63CB26002D821E /* scene.cpp in Sources */,
-				DF0941650F63CB26002D821E /* sched.cpp in Sources */,
-				DF0941660F63CB26002D821E /* scn.cpp in Sources */,
-				DF0941670F63CB26002D821E /* scroll.cpp in Sources */,
-				DF0941680F63CB26002D821E /* sound.cpp in Sources */,
-				DF0941690F63CB26002D821E /* strres.cpp in Sources */,
-				DF09416A0F63CB26002D821E /* text.cpp in Sources */,
-				DF09416B0F63CB26002D821E /* timers.cpp in Sources */,
-				DF09416C0F63CB26002D821E /* tinlib.cpp in Sources */,
-				DF09416D0F63CB26002D821E /* tinsel.cpp in Sources */,
-				DF09416E0F63CB26002D821E /* token.cpp in Sources */,
-				DF09416F0F63CB26002D821E /* detection.cpp in Sources */,
-				DF0941700F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0941710F63CB26002D821E /* menu.cpp in Sources */,
-				DF0941720F63CB26002D821E /* midi.cpp in Sources */,
-				DF0941730F63CB26002D821E /* opcodes.cpp in Sources */,
-				DF0941740F63CB26002D821E /* resource.cpp in Sources */,
-				DF0941750F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0941760F63CB26002D821E /* staticres.cpp in Sources */,
-				DF0941770F63CB26002D821E /* touche.cpp in Sources */,
-				DF0941790F63CB26002D821E /* timidity.cpp in Sources */,
-				DF09417A0F63CB26002D821E /* archive.cpp in Sources */,
-				DF09417B0F63CB26002D821E /* unarj.cpp in Sources */,
-				DF09417C0F63CB26002D821E /* stdiostream.cpp in Sources */,
-				DF09417E0F63CB26002D821E /* saveload.cpp in Sources */,
-				DF09417F0F63CB26002D821E /* ThemeEngine.cpp in Sources */,
-				DF0941800F63CB26002D821E /* ThemeEval.cpp in Sources */,
-				DF0941810F63CB26002D821E /* ThemeLayout.cpp in Sources */,
-				DF0941820F63CB26002D821E /* ThemeParser.cpp in Sources */,
-				DF0941830F63CB26002D821E /* thumbnail.cpp in Sources */,
-				DF0941840F63CB26002D821E /* VectorRenderer.cpp in Sources */,
-				DF0941850F63CB26002D821E /* VectorRendererSpec.cpp in Sources */,
-				DF0941860F63CB26002D821E /* xmlparser.cpp in Sources */,
-				DF0941870F63CB26002D821E /* game.cpp in Sources */,
-				DF0941880F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0941890F63CB26002D821E /* detection.cpp in Sources */,
-				DF09418A0F63CB26002D821E /* detection.cpp in Sources */,
-				DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */,
-				DF09418C0F63CB26002D821E /* dither.cpp in Sources */,
-				DF0941920F63CB26002D821E /* debug.cpp in Sources */,
-				DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */,
-				DF0941950F63CB26002D821E /* bmv.cpp in Sources */,
-				DF0941960F63CB26002D821E /* dialogs.cpp in Sources */,
-				DF0941970F63CB26002D821E /* drives.cpp in Sources */,
-				DF0941980F63CB26002D821E /* sysvar.cpp in Sources */,
-				DF0941990F63CB26002D821E /* gui_lol.cpp in Sources */,
-				DF09419A0F63CB26002D821E /* items_lol.cpp in Sources */,
-				DF09419B0F63CB26002D821E /* script_lol.cpp in Sources */,
-				DF09419C0F63CB26002D821E /* sequences_lol.cpp in Sources */,
-				DF09419D0F63CB26002D821E /* sound_midi.cpp in Sources */,
-				DF09419E0F63CB26002D821E /* util.cpp in Sources */,
-				DF0941A20F63CB26002D821E /* scene_lol.cpp in Sources */,
-				DF0941A30F63CB26002D821E /* advancedDetector.cpp in Sources */,
-				DF0941A40F63CB26002D821E /* base-backend.cpp in Sources */,
-				DF0941A60F63CB26002D821E /* resource.cpp in Sources */,
-				DF0941A70F63CB26002D821E /* resource_hrs.cpp in Sources */,
-				DF0941A80F63CB26002D821E /* resource_res.cpp in Sources */,
-				DF0941A90F63CB26002D821E /* resource_rsc.cpp in Sources */,
-				DF0941AA0F63CB26002D821E /* sfuncs_ihnm.cpp in Sources */,
-				DF0941AB0F63CB26002D821E /* debugger.cpp in Sources */,
-				DF0941AC0F63CB26002D821E /* staticres.cpp in Sources */,
-				DF0941AD0F63CB26002D821E /* cell.cpp in Sources */,
-				DF0941AE0F63CB26002D821E /* cursor.cpp in Sources */,
-				DF0941AF0F63CB26002D821E /* debug.cpp in Sources */,
-				DF0941B00F63CB26002D821E /* detection.cpp in Sources */,
-				DF0941B10F63CB26002D821E /* font.cpp in Sources */,
-				DF0941B20F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0941B30F63CB26002D821E /* groovie.cpp in Sources */,
-				DF0941B40F63CB26002D821E /* lzss.cpp in Sources */,
-				DF0941B50F63CB26002D821E /* music.cpp in Sources */,
-				DF0941B60F63CB26002D821E /* player.cpp in Sources */,
-				DF0941B70F63CB26002D821E /* resource.cpp in Sources */,
-				DF0941B80F63CB26002D821E /* roq.cpp in Sources */,
-				DF0941B90F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0941BA0F63CB26002D821E /* script.cpp in Sources */,
-				DF0941BB0F63CB26002D821E /* vdx.cpp in Sources */,
-				DF0941BC0F63CB26002D821E /* detection.cpp in Sources */,
-				DF0941BD0F63CB26002D821E /* graphics.cpp in Sources */,
-				DF0941BE0F63CB26002D821E /* locations.cpp in Sources */,
-				DF0941BF0F63CB26002D821E /* resource.cpp in Sources */,
-				DF0941C00F63CB26002D821E /* saveload.cpp in Sources */,
-				DF0941C10F63CB26002D821E /* sequences.cpp in Sources */,
-				DF0941C20F63CB26002D821E /* staticres.cpp in Sources */,
-				DF0941C30F63CB26002D821E /* tucker.cpp in Sources */,
-				DF0941C40F63CB26002D821E /* detection.cpp in Sources */,
-				DF0941C60F63CB26002D821E /* gc.cpp in Sources */,
-				DF0941C80F63CB26002D821E /* kernel.cpp in Sources */,
-				DF0941C90F63CB26002D821E /* kevent.cpp in Sources */,
-				DF0941CA0F63CB26002D821E /* kfile.cpp in Sources */,
-				DF0941CB0F63CB26002D821E /* kgraphics.cpp in Sources */,
-				DF0941CC0F63CB26002D821E /* klists.cpp in Sources */,
-				DF0941CD0F63CB26002D821E /* kmath.cpp in Sources */,
-				DF0941CE0F63CB26002D821E /* kmenu.cpp in Sources */,
-				DF0941CF0F63CB26002D821E /* kmovement.cpp in Sources */,
-				DF0941D00F63CB26002D821E /* kpathing.cpp in Sources */,
-				DF0941D10F63CB26002D821E /* kscripts.cpp in Sources */,
-				DF0941D20F63CB26002D821E /* ksound.cpp in Sources */,
-				DF0941D30F63CB26002D821E /* kstring.cpp in Sources */,
-				DF0941D40F63CB26002D821E /* message.cpp in Sources */,
-				DF0941D60F63CB26002D821E /* savegame.cpp in Sources */,
-				DF0941D80F63CB26002D821E /* scriptdebug.cpp in Sources */,
-				DF0941D90F63CB26002D821E /* seg_manager.cpp in Sources */,
-				DF0941DA0F63CB26002D821E /* vm.cpp in Sources */,
-				DF0941EC0F63CB26002D821E /* sci.cpp in Sources */,
-				DF0942020F63CB26002D821E /* unzip.cpp in Sources */,
-				DF0942030F63CB26002D821E /* console.cpp in Sources */,
-				DF0942090F63CB26002D821E /* state.cpp in Sources */,
-				DF09420C0F63CB26002D821E /* exec.cpp in Sources */,
-				DF09420D0F63CB26002D821E /* timer_lol.cpp in Sources */,
-				DF0942100F63CB26002D821E /* sprites_lol.cpp in Sources */,
-				DF0942110F63CB26002D821E /* script.cpp in Sources */,
-				DF0942150F63CB26002D821E /* pn.cpp in Sources */,
-				DF0942160F63CB26002D821E /* script_pn.cpp in Sources */,
-				DF0942170F63CB26002D821E /* vga_pn.cpp in Sources */,
-				DF0942470F63CB9A002D821E /* main.cpp in Sources */,
-				DF09424A0F63CB9A002D821E /* sdl.cpp in Sources */,
-				DF0944330F63FBB3002D821E /* coreaudio.cpp in Sources */,
-				DF0944340F63FBB3002D821E /* coremidi.cpp in Sources */,
-				DF5CEB290F75535000DEA624 /* sound_br.cpp in Sources */,
-				DF5CEB2A0F75535000DEA624 /* sound_ns.cpp in Sources */,
-				DF5CEB310F75538000DEA624 /* protracker.cpp in Sources */,
-				DFE88C460F874A1100C555C5 /* sound.cpp in Sources */,
-				DF09CC100FAC4E1900A5AFD7 /* batplayer.cpp in Sources */,
-				DF09CC110FAC4E1900A5AFD7 /* demoplayer.cpp in Sources */,
-				DF09CC120FAC4E1900A5AFD7 /* scnplayer.cpp in Sources */,
-				DF09CC130FAC4E1900A5AFD7 /* draw_fascin.cpp in Sources */,
-				DF09CC150FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */,
-				DF09CC280FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */,
-				DF09CC290FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */,
-				DF61183C0FE3A8080042AD3F /* kmisc.cpp in Sources */,
-				DF61183D0FE3A8080042AD3F /* segment.cpp in Sources */,
-				DF6118490FE3A8250042AD3F /* decompressor.cpp in Sources */,
-				DF61184A0FE3A8250042AD3F /* resource.cpp in Sources */,
-				DF6118550FE3A8990042AD3F /* disk.cpp in Sources */,
-				DF6118890FE3A9AA0042AD3F /* saveconverter.cpp in Sources */,
-				DF61188A0FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */,
-				DF61188B0FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */,
-				DF61188C0FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */,
-				DF61188E0FE3A9AA0042AD3F /* savefile.cpp in Sources */,
-				DF61188F0FE3A9AA0042AD3F /* savehandler.cpp in Sources */,
-				DF6118900FE3A9AA0042AD3F /* saveload.cpp in Sources */,
-				DF6118910FE3A9AA0042AD3F /* saveload_v2.cpp in Sources */,
-				DF6118920FE3A9AA0042AD3F /* saveload_v3.cpp in Sources */,
-				DF6118930FE3A9AA0042AD3F /* saveload_v4.cpp in Sources */,
-				DF6118940FE3A9AA0042AD3F /* saveload_v6.cpp in Sources */,
-				DF6118AF0FE3A9EA0042AD3F /* feeble.cpp in Sources */,
-				DF6118B80FE3AA280042AD3F /* saveload_lol.cpp in Sources */,
-				DF6118B90FE3AA280042AD3F /* sound_lol.cpp in Sources */,
-				DF6118BA0FE3AA280042AD3F /* sound_pcspk.cpp in Sources */,
-				DF6118BB0FE3AA280042AD3F /* text_lol.cpp in Sources */,
-				DF6118C70FE3AABD0042AD3F /* player_v2cms.cpp in Sources */,
-				DF6118CC0FE3AAFD0042AD3F /* hardwarekeys.cpp in Sources */,
-				DF7585CE100CB66E00CC3324 /* expression.cpp in Sources */,
-				DF7585CF100CB66E00CC3324 /* hotspots.cpp in Sources */,
-				DF7585D0100CB66E00CC3324 /* init_v6.cpp in Sources */,
-				DF7585D1100CB66E00CC3324 /* resources.cpp in Sources */,
-				DF7585D2100CB66E00CC3324 /* script.cpp in Sources */,
-				DF7585D3100CB66E00CC3324 /* totfile.cpp in Sources */,
-				DF7585EC100CB6EA00CC3324 /* sjis.cpp in Sources */,
-				DF7585F1100CB70600CC3324 /* saveload_playtoons.cpp in Sources */,
-				DF7585F7100CB75800CC3324 /* static_selectors.cpp in Sources */,
-				DF6BF4C810529DA50069811F /* conversion.cpp in Sources */,
-				DF6BF4C910529DA50069811F /* jpeg.cpp in Sources */,
-				DF6BF4DE10529DE90069811F /* input_pn.cpp in Sources */,
-				DF6BF4DF10529DE90069811F /* string_pn.cpp in Sources */,
-				DF6BF4E010529DE90069811F /* verb_pn.cpp in Sources */,
-				DF6BF4E610529E260069811F /* sound_amiga.cpp in Sources */,
-				DF6BF4EE10529E6E0069811F /* init_v4.cpp in Sources */,
-				DF6BF4EF10529E6E0069811F /* inter_playtoons.cpp in Sources */,
-				DF6BF4F510529EE40069811F /* player_v4a.cpp in Sources */,
-				DF6BF50010529F140069811F /* EventDispatcher.cpp in Sources */,
-				DF6BF50110529F140069811F /* EventRecorder.cpp in Sources */,
-				DF90E9BF10AEDA9B00C8F93F /* selector.cpp in Sources */,
-				DF90EAA410B0234300C8F93F /* draw_playtoons.cpp in Sources */,
-				DF90EAAD10B0236F00C8F93F /* staticres.cpp in Sources */,
-				DF2EC3E510E6490800765801 /* browser_osx.mm in Sources */,
-				DF2EC3F810E64C0C00765801 /* dialogs.cpp in Sources */,
-				DF2EC3FE10E64C4300765801 /* animator_tim.cpp in Sources */,
-				DF2EC40510E64C8000765801 /* event.cpp in Sources */,
-				DF2EC50110E64D7C00765801 /* player_pce.cpp in Sources */,
-				DF2EC50210E64D7C00765801 /* player_sid.cpp in Sources */,
-				DF2EC50B10E64DB300765801 /* textconsole.cpp in Sources */,
-				DF45B1F4116628A5009B85CC /* animate.cpp in Sources */,
-				DF45B1F5116628A5009B85CC /* cache.cpp in Sources */,
-				DF45B1F6116628A5009B85CC /* compare.cpp in Sources */,
-				DF45B1F7116628A5009B85CC /* controls.cpp in Sources */,
-				DF45B1F8116628A5009B85CC /* coordadjuster.cpp in Sources */,
-				DF45B1F9116628A5009B85CC /* cursor.cpp in Sources */,
-				DF45B1FA116628A5009B85CC /* font.cpp in Sources */,
-				DF45B1FE116628A5009B85CC /* menu.cpp in Sources */,
-				DF45B1FF116628A5009B85CC /* paint.cpp in Sources */,
-				DF45B200116628A5009B85CC /* paint16.cpp in Sources */,
-				DF45B202116628A5009B85CC /* palette.cpp in Sources */,
-				DF45B203116628A5009B85CC /* picture.cpp in Sources */,
-				DF45B204116628A5009B85CC /* portrait.cpp in Sources */,
-				DF45B205116628A5009B85CC /* ports.cpp in Sources */,
-				DF45B207116628A5009B85CC /* screen.cpp in Sources */,
-				DF45B208116628A5009B85CC /* text16.cpp in Sources */,
-				DF45B209116628A5009B85CC /* transitions.cpp in Sources */,
-				DF45B20A116628A5009B85CC /* view.cpp in Sources */,
-				DF45B20B116628A5009B85CC /* grammar.cpp in Sources */,
-				DF45B20C116628A5009B85CC /* said.cpp in Sources */,
-				DF45B20E116628A5009B85CC /* vocabulary.cpp in Sources */,
-				DF45B20F116628A5009B85CC /* audio.cpp in Sources */,
-				DF45B210116628A5009B85CC /* adlib.cpp in Sources */,
-				DF45B212116628A5009B85CC /* fb01.cpp in Sources */,
-				DF45B213116628A5009B85CC /* midi.cpp in Sources */,
-				DF45B214116628A5009B85CC /* pcjr.cpp in Sources */,
-				DF45B219116628A5009B85CC /* midiparser_sci.cpp in Sources */,
-				DF45B21A116628A5009B85CC /* music.cpp in Sources */,
-				DF45B21B116628A5009B85CC /* soundcmd.cpp in Sources */,
-				DF45B21C116628A5009B85CC /* seq_decoder.cpp in Sources */,
-				DFCDC6DB116629CE00A7D2A0 /* features.cpp in Sources */,
-				DFCDC6DC116629CE00A7D2A0 /* kparse.cpp in Sources */,
-				DFCDC6F811662AAB00A7D2A0 /* resource.cpp in Sources */,
-				DFCDC70511662B0200A7D2A0 /* saveload_fascin.cpp in Sources */,
-				DFCDC70C11662B6B00A7D2A0 /* macresman.cpp in Sources */,
-				DFEC5D141166C5CF00C90552 /* random.cpp in Sources */,
-				DFEC5D151166C5CF00C90552 /* tokenizer.cpp in Sources */,
-				DFEC5D381166C67300C90552 /* savestate.cpp in Sources */,
-				DF9B924A118E46730069C19D /* error.cpp in Sources */,
-				DF9B9256118E46A00069C19D /* fontsjis.cpp in Sources */,
-				DF9B9264118E46FE0069C19D /* error.cpp in Sources */,
-				DFB0577811B753DA0015AE65 /* rational.cpp in Sources */,
-				DFB0578411B7541F0015AE65 /* resource_audio.cpp in Sources */,
-				DFB0578511B7541F0015AE65 /* util.cpp in Sources */,
-				DFB0578C11B754570015AE65 /* maciconbar.cpp in Sources */,
-				DFB0579311B7547D0015AE65 /* pict.cpp in Sources */,
-				DF7F286311FF23D500159131 /* amigamac.cpp in Sources */,
-				DF7F286B11FF23EF00159131 /* kvideo.cpp in Sources */,
-				DF7F286C11FF23EF00159131 /* workarounds.cpp in Sources */,
-				DF7F288411FF243B00159131 /* sound_2gs.cpp in Sources */,
-				DF7F288511FF243B00159131 /* sound_coco3.cpp in Sources */,
-				DF7F288611FF243B00159131 /* sound_midi.cpp in Sources */,
-				DF7F288711FF243B00159131 /* sound_pcjr.cpp in Sources */,
-				DF7F288811FF243B00159131 /* sound_sarien.cpp in Sources */,
-				DF7F288D11FF244F00159131 /* Tooltip.cpp in Sources */,
-				DF7F289711FF247300159131 /* translation.cpp in Sources */,
-				DF7F28A711FF24C400159131 /* console.cpp in Sources */,
-				DF895C04124C24680077F6E8 /* player_towns.cpp in Sources */,
-				DF895C26124C25150077F6E8 /* init_fascin.cpp in Sources */,
-				DF895C2B124C25350077F6E8 /* script_patches.cpp in Sources */,
-				DF0E303C1252C5BD0082D593 /* cms.cpp in Sources */,
-				8CB5A9C61253FD6900CB6BC7 /* m4_scene.cpp in Sources */,
-				8CB5A9C71253FD6900CB6BC7 /* mads_logic.cpp in Sources */,
-				8CB5A9C81253FD6900CB6BC7 /* mads_player.cpp in Sources */,
-				8CB5A9C91253FD6900CB6BC7 /* mads_scene.cpp in Sources */,
-				8CB5A9CA1253FD6900CB6BC7 /* mads_views.cpp in Sources */,
-				8CD1ED2F126202AB00FA198C /* detection.cpp in Sources */,
-				8CD1ED30126202AB00FA198C /* display.cpp in Sources */,
-				8CD1ED32126202AB00FA198C /* file.cpp in Sources */,
-				8CD1ED33126202AB00FA198C /* hugo.cpp in Sources */,
-				8CD1ED34126202AB00FA198C /* intro.cpp in Sources */,
-				8CD1ED35126202AB00FA198C /* inventory.cpp in Sources */,
-				8CD1ED38126202AB00FA198C /* mouse.cpp in Sources */,
-				8CD1ED39126202AB00FA198C /* parser.cpp in Sources */,
-				8CD1ED3A126202AB00FA198C /* route.cpp in Sources */,
-				8CD1ED3B126202AB00FA198C /* schedule.cpp in Sources */,
-				8CD1ED3C126202AB00FA198C /* sound.cpp in Sources */,
-				8CD1ED3D126202AB00FA198C /* util.cpp in Sources */,
-				8CD1ED3E126202AB00FA198C /* anim.cpp in Sources */,
-				8CD1ED3F126202AB00FA198C /* audio.cpp in Sources */,
-				8CD1ED40126202AB00FA198C /* character.cpp in Sources */,
-				8CD1ED41126202AB00FA198C /* conversation.cpp in Sources */,
-				8CD1ED42126202AB00FA198C /* detection.cpp in Sources */,
-				8CD1ED43126202AB00FA198C /* drew.cpp in Sources */,
-				8CD1ED44126202AB00FA198C /* flux.cpp in Sources */,
-				8CD1ED45126202AB00FA198C /* font.cpp in Sources */,
-				8CD1ED46126202AB00FA198C /* hotspot.cpp in Sources */,
-				8CD1ED49126202AB00FA198C /* movie.cpp in Sources */,
-				8CD1ED4A126202AB00FA198C /* path.cpp in Sources */,
-				8CD1ED4B126202AB00FA198C /* picture.cpp in Sources */,
-				8CD1ED4C126202AB00FA198C /* resource.cpp in Sources */,
-				8CD1ED4D126202AB00FA198C /* script.cpp in Sources */,
-				8CD1ED4E126202AB00FA198C /* script_func.cpp in Sources */,
-				8CD1ED4F126202AB00FA198C /* state.cpp in Sources */,
-				8CD1ED50126202AB00FA198C /* text.cpp in Sources */,
-				8CD1ED51126202AB00FA198C /* tools.cpp in Sources */,
-				8CD1ED52126202AB00FA198C /* toon.cpp in Sources */,
-				8CD80C8C126271A9001C6C87 /* surface.cpp in Sources */,
-				8CD80C92126271BD001C6C87 /* gfx_towns.cpp in Sources */,
-				8CD80CF2126272A0001C6C87 /* actor.cpp in Sources */,
-				8CD80CF3126272A0001C6C87 /* animation.cpp in Sources */,
-				8CD80CF4126272A0001C6C87 /* callbacks.cpp in Sources */,
-				8CD80CF5126272A0001C6C87 /* console.cpp in Sources */,
-				8CD80CF6126272A0001C6C87 /* detection.cpp in Sources */,
-				8CD80CF7126272A0001C6C87 /* dialog.cpp in Sources */,
-				8CD80CF8126272A0001C6C87 /* font.cpp in Sources */,
-				8CD80CF9126272A0001C6C87 /* inventory.cpp in Sources */,
-				8CD80CFB126272A0001C6C87 /* music.cpp in Sources */,
-				8CD80CFC126272A0001C6C87 /* objects.cpp in Sources */,
-				8CD80CFD126272A0001C6C87 /* pack.cpp in Sources */,
-				8CD80CFE126272A0001C6C87 /* resources.cpp in Sources */,
-				8CD80CFF126272A0001C6C87 /* scene.cpp in Sources */,
-				8CD80D00126272A0001C6C87 /* segment.cpp in Sources */,
-				8CD80D01126272A0001C6C87 /* surface.cpp in Sources */,
-				8CD80D02126272A0001C6C87 /* surface_list.cpp in Sources */,
-				8CD80D03126272A0001C6C87 /* teenagent.cpp in Sources */,
-				DF203F471380C06E0056300A /* gui-manager.cpp in Sources */,
-				DF203F631380C2750056300A /* avi_decoder.cpp in Sources */,
-				DF203F641380C2750056300A /* coktel_decoder.cpp in Sources */,
-				DF203F651380C2750056300A /* dxa_decoder.cpp in Sources */,
-				DF203F661380C2750056300A /* flic_decoder.cpp in Sources */,
-				DF203F681380C2750056300A /* qt_decoder.cpp in Sources */,
-				DF203F691380C2750056300A /* smk_decoder.cpp in Sources */,
-				DF203F6A1380C2750056300A /* video_decoder.cpp in Sources */,
-				DF203F951380C2920056300A /* cdtoons.cpp in Sources */,
-				DF203F961380C2920056300A /* cinepak.cpp in Sources */,
-				DF203F971380C2920056300A /* indeo3.cpp in Sources */,
-				DF203F981380C2920056300A /* mjpeg.cpp in Sources */,
-				DF203F991380C2920056300A /* msrle.cpp in Sources */,
-				DF203F9A1380C2920056300A /* msvideo1.cpp in Sources */,
-				DF203F9C1380C2920056300A /* qtrle.cpp in Sources */,
-				DF203F9D1380C2920056300A /* rpza.cpp in Sources */,
-				DF203F9E1380C2920056300A /* smc.cpp in Sources */,
-				DF203F9F1380C2920056300A /* truemotion1.cpp in Sources */,
-				DF203FD51380C3BC0056300A /* console.cpp in Sources */,
-				DF203FD61380C3BC0056300A /* dialogs.cpp in Sources */,
-				DF203FD71380C3BC0056300A /* file_v1d.cpp in Sources */,
-				DF203FD81380C3BC0056300A /* file_v1w.cpp in Sources */,
-				DF203FD91380C3BC0056300A /* file_v2d.cpp in Sources */,
-				DF203FDA1380C3BC0056300A /* file_v2w.cpp in Sources */,
-				DF203FDB1380C3BC0056300A /* file_v3d.cpp in Sources */,
-				DF203FDC1380C3BC0056300A /* object_v1d.cpp in Sources */,
-				DF203FDD1380C3BC0056300A /* object_v1w.cpp in Sources */,
-				DF203FDE1380C3BC0056300A /* object_v2d.cpp in Sources */,
-				DF203FDF1380C3BC0056300A /* object_v3d.cpp in Sources */,
-				DF203FE01380C3BC0056300A /* object.cpp in Sources */,
-				DF203FE11380C3BC0056300A /* parser_v1d.cpp in Sources */,
-				DF203FE21380C3BC0056300A /* parser_v1w.cpp in Sources */,
-				DF203FE31380C3BC0056300A /* parser_v2d.cpp in Sources */,
-				DF203FE41380C3BC0056300A /* parser_v3d.cpp in Sources */,
-				DF203FE51380C3BC0056300A /* text.cpp in Sources */,
-				DF20402E1380C8B70056300A /* editable.cpp in Sources */,
-				DF20402F1380C8B70056300A /* edittext.cpp in Sources */,
-				DF2040301380C8B70056300A /* list.cpp in Sources */,
-				DF2040311380C8B70056300A /* popup.cpp in Sources */,
-				DF2040321380C8B70056300A /* scrollbar.cpp in Sources */,
-				DF2040331380C8B70056300A /* tab.cpp in Sources */,
-				DF20405E1380CA230056300A /* audiostream.cpp in Sources */,
-				DF20405F1380CA230056300A /* fmopl.cpp in Sources */,
-				DF2040601380CA230056300A /* mididrv.cpp in Sources */,
-				DF2040611380CA230056300A /* midiparser_smf.cpp in Sources */,
-				DF2040621380CA230056300A /* midiparser_xmidi.cpp in Sources */,
-				DF2040631380CA230056300A /* midiparser.cpp in Sources */,
-				DF2040641380CA230056300A /* midiplayer.cpp in Sources */,
-				DF2040651380CA230056300A /* mixer.cpp in Sources */,
-				DF2040661380CA230056300A /* mpu401.cpp in Sources */,
-				DF2040671380CA230056300A /* musicplugin.cpp in Sources */,
-				DF2040681380CA230056300A /* rate.cpp in Sources */,
-				DF2040691380CA230056300A /* timestamp.cpp in Sources */,
-				DF20409A1380CA400056300A /* adpcm.cpp in Sources */,
-				DF20409B1380CA400056300A /* aiff.cpp in Sources */,
-				DF20409C1380CA400056300A /* flac.cpp in Sources */,
-				DF20409D1380CA400056300A /* iff_sound.cpp in Sources */,
-				DF20409E1380CA400056300A /* mac_snd.cpp in Sources */,
-				DF20409F1380CA400056300A /* mp3.cpp in Sources */,
-				DF2040A01380CA400056300A /* raw.cpp in Sources */,
-				DF2040A11380CA400056300A /* vag.cpp in Sources */,
-				DF2040A21380CA400056300A /* voc.cpp in Sources */,
-				DF2040A31380CA400056300A /* vorbis.cpp in Sources */,
-				DF2040A41380CA400056300A /* wave.cpp in Sources */,
-				DF2040CC1380CA810056300A /* infogrames.cpp in Sources */,
-				DF2040CD1380CA810056300A /* maxtrax.cpp in Sources */,
-				DF2040CE1380CA810056300A /* module.cpp in Sources */,
-				DF2040CF1380CA810056300A /* paula.cpp in Sources */,
-				DF2040D01380CA810056300A /* protracker.cpp in Sources */,
-				DF2040D11380CA810056300A /* rjp1.cpp in Sources */,
-				DF2040D21380CA810056300A /* soundfx.cpp in Sources */,
-				DF2040D31380CA810056300A /* tfmx.cpp in Sources */,
-				DF2040F41380CAA40056300A /* adlib.cpp in Sources */,
-				DF2040F51380CAA40056300A /* appleiigs.cpp in Sources */,
-				DF2040F61380CAA40056300A /* cms.cpp in Sources */,
-				DF2040F71380CAA40056300A /* eas.cpp in Sources */,
-				DF2040F81380CAA40056300A /* fluidsynth.cpp in Sources */,
-				DF2040F91380CAA40056300A /* mt32.cpp in Sources */,
-				DF2040FA1380CAA40056300A /* pcspk.cpp in Sources */,
-				DF2040FB1380CAA40056300A /* sid.cpp in Sources */,
-				DF2040FC1380CAA40056300A /* wave6581.cpp in Sources */,
-				DF46B6F31381E18900D08723 /* coroutine.cpp in Sources */,
-				DF46B6FF1381E1FF00D08723 /* towns_audio.cpp in Sources */,
-				DF46B7001381E1FF00D08723 /* towns_euphony.cpp in Sources */,
-				DF46B7011381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */,
-				DF46B7021381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */,
-				DF46B7191381E27000D08723 /* console.cpp in Sources */,
-				DF46B71A1381E27000D08723 /* databases.cpp in Sources */,
-				DF46B71B1381E27000D08723 /* dbase.cpp in Sources */,
-				DF46B71C1381E27000D08723 /* iniconfig.cpp in Sources */,
-				DF46B71D1381E27000D08723 /* init_v7.cpp in Sources */,
-				DF46B71E1381E27000D08723 /* inter_inca2.cpp in Sources */,
-				DF46B7441381E40500D08723 /* log.cpp in Sources */,
-				DF46B7491381E40F00D08723 /* modular-backend.cpp in Sources */,
-				DF46B7541381E46700D08723 /* player_v2base.cpp in Sources */,
-				DF46B75E1381E4A400D08723 /* console.cpp in Sources */,
-				DF46B7631381E4D400D08723 /* robot_decoder.cpp in Sources */,
-				DF46B7671381E4E400D08723 /* vm_types.cpp in Sources */,
-				DF46B77B1381E54200D08723 /* dcl.cpp in Sources */,
-				DF46B77C1381E54200D08723 /* iff_container.cpp in Sources */,
-				DF46B77D1381E54200D08723 /* winexe_ne.cpp in Sources */,
-				DF46B77E1381E54200D08723 /* winexe_pe.cpp in Sources */,
-				DF46B77F1381E54200D08723 /* winexe.cpp in Sources */,
-				DF46B7931381E58000D08723 /* png.cpp in Sources */,
-				DF46B7941381E58000D08723 /* wincursor.cpp in Sources */,
-				DF46B79F1381E5B500D08723 /* winfont.cpp in Sources */,
-				DF46B7A51381E5D900D08723 /* sdl-timer.cpp in Sources */,
-				DF46B7A91381E5F100D08723 /* header.cpp in Sources */,
-				DF46B7B41381E67800D08723 /* sdl-mutex.cpp in Sources */,
-				DF46B7BD1381E6C000D08723 /* object.cpp in Sources */,
-				DF46B7C81381E72500D08723 /* console.cpp in Sources */,
-				DF46B7CF1381E76300D08723 /* sdl-events.cpp in Sources */,
-				DF46B7D61381E7C600D08723 /* console.cpp in Sources */,
-				DF46B83C1381F13500D08723 /* saveload_v7.cpp in Sources */,
-				DF46B8441381F35500D08723 /* saveload_inca2.cpp in Sources */,
-				DF46B8481381F38700D08723 /* inter_v7.cpp in Sources */,
-				DF46B84D1381F39E00D08723 /* console.cpp in Sources */,
-				DF46B8521381F3B400D08723 /* console.cpp in Sources */,
-				DF46B8601381F44E00D08723 /* dbopl.cpp in Sources */,
-				DF46B8611381F44E00D08723 /* dosbox.cpp in Sources */,
-				DF46B8621381F44E00D08723 /* mame.cpp in Sources */,
-				DF46B8711381F4A200D08723 /* sdl-audiocd.cpp in Sources */,
-				DF46B87D1381F4F200D08723 /* default-audiocd.cpp in Sources */,
-				DF46B8891381F5D800D08723 /* sdl-provider.cpp in Sources */,
-				DF46B8921381F62B00D08723 /* adpcm.cpp in Sources */,
-				DF46B89B1381F6C400D08723 /* null.cpp in Sources */,
-				DFADEBB313820DF500C46364 /* maccursor.cpp in Sources */,
-				DFADEBB713820E0C00C46364 /* posix-fs.cpp in Sources */,
-				F92B4DCF139DD428000D1BF1 /* quicktime.cpp in Sources */,
-				F92B4DD4139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */,
-				F92B4DDA139DDC92000D1BF1 /* macosx-main.cpp in Sources */,
-				F92B4DDB139DDC92000D1BF1 /* macosx.cpp in Sources */,
-				F9946D9E139E1A560072D195 /* towns_midi.cpp in Sources */,
-				F9946DA1139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */,
-				F9946DB6139E1A880072D195 /* freeverb.cpp in Sources */,
-				F9946DB9139E1A880072D195 /* i386.cpp in Sources */,
-				F9946DBC139E1A880072D195 /* mt32_file.cpp in Sources */,
-				F9946DBF139E1A880072D195 /* part.cpp in Sources */,
-				F9946DC2139E1A880072D195 /* partial.cpp in Sources */,
-				F9946DC5139E1A880072D195 /* partialManager.cpp in Sources */,
-				F9946DC8139E1A880072D195 /* synth.cpp in Sources */,
-				F9946DCB139E1A880072D195 /* tables.cpp in Sources */,
-				F9946DD7139E1AD30072D195 /* aac.cpp in Sources */,
-				F9946DDA139E1AD30072D195 /* qdm2.cpp in Sources */,
-				F9946DDD139E1AD30072D195 /* quicktime.cpp in Sources */,
-				F9946DE4139E1B180072D195 /* posix-main.cpp in Sources */,
-				F9946DE7139E1B180072D195 /* posix.cpp in Sources */,
-				F9946DED139E1B6F0072D195 /* downscaler.cpp in Sources */,
-				F9946DF2139E1BA00072D195 /* console.cpp in Sources */,
-				F9946DF8139E1BBF0072D195 /* sdl-mixer.cpp in Sources */,
-				F9946DFF139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */,
-				F9946E05139E1C390072D195 /* sdl-graphics.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DFF959160FB22D5700A3EC78 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DFF959170FB22D5700A3EC78 /* commandLine.cpp in Sources */,
-				DFF959180FB22D5700A3EC78 /* main.cpp in Sources */,
-				DFF959190FB22D5700A3EC78 /* plugins.cpp in Sources */,
-				DFF9591A0FB22D5700A3EC78 /* version.cpp in Sources */,
-				DFF9591B0FB22D5700A3EC78 /* default-events.cpp in Sources */,
-				DFF9591C0FB22D5700A3EC78 /* posix-fs-factory.cpp in Sources */,
-				DFF9591D0FB22D5700A3EC78 /* iphone_main.m in Sources */,
-				DFF9591F0FB22D5700A3EC78 /* posix-provider.cpp in Sources */,
-				DFF959200FB22D5700A3EC78 /* default-saves.cpp in Sources */,
-				DFF959210FB22D5700A3EC78 /* savefile.cpp in Sources */,
-				DFF959220FB22D5700A3EC78 /* default-timer.cpp in Sources */,
-				DFF959230FB22D5700A3EC78 /* config-file.cpp in Sources */,
-				DFF959240FB22D5700A3EC78 /* config-manager.cpp in Sources */,
-				DFF959250FB22D5700A3EC78 /* file.cpp in Sources */,
-				DFF959260FB22D5700A3EC78 /* fs.cpp in Sources */,
-				DFF959270FB22D5700A3EC78 /* hashmap.cpp in Sources */,
-				DFF959280FB22D5700A3EC78 /* md5.cpp in Sources */,
-				DFF959290FB22D5700A3EC78 /* mutex.cpp in Sources */,
-				DFF9592A0FB22D5700A3EC78 /* str.cpp in Sources */,
-				DFF9592B0FB22D5700A3EC78 /* stream.cpp in Sources */,
-				DFF9592C0FB22D5700A3EC78 /* system.cpp in Sources */,
-				DFF9592D0FB22D5700A3EC78 /* util.cpp in Sources */,
-				DFF9592E0FB22D5700A3EC78 /* zlib.cpp in Sources */,
-				DFF9592F0FB22D5700A3EC78 /* cursorman.cpp in Sources */,
-				DFF959300FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF959310FB22D5700A3EC78 /* fontman.cpp in Sources */,
-				DFF959320FB22D5700A3EC78 /* consolefont.cpp in Sources */,
-				DFF959330FB22D5700A3EC78 /* newfont.cpp in Sources */,
-				DFF959340FB22D5700A3EC78 /* newfont_big.cpp in Sources */,
-				DFF959360FB22D5700A3EC78 /* iff.cpp in Sources */,
-				DFF959370FB22D5700A3EC78 /* imagedec.cpp in Sources */,
-				DFF959380FB22D5700A3EC78 /* primitives.cpp in Sources */,
-				DFF959390FB22D5700A3EC78 /* surface.cpp in Sources */,
-				DFF9593A0FB22D5700A3EC78 /* about.cpp in Sources */,
-				DFF9593B0FB22D5700A3EC78 /* Actions.cpp in Sources */,
-				DFF9593C0FB22D5700A3EC78 /* browser.cpp in Sources */,
-				DFF9593D0FB22D5700A3EC78 /* chooser.cpp in Sources */,
-				DFF9593E0FB22D5700A3EC78 /* console.cpp in Sources */,
-				DFF9593F0FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF959400FB22D5700A3EC78 /* dialog.cpp in Sources */,
-				DFF959430FB22D5700A3EC78 /* Key.cpp in Sources */,
-				DFF959440FB22D5700A3EC78 /* launcher.cpp in Sources */,
-				DFF959460FB22D5700A3EC78 /* massadd.cpp in Sources */,
-				DFF959470FB22D5700A3EC78 /* message.cpp in Sources */,
-				DFF959480FB22D5700A3EC78 /* object.cpp in Sources */,
-				DFF959490FB22D5700A3EC78 /* options.cpp in Sources */,
-				DFF9594D0FB22D5700A3EC78 /* themebrowser.cpp in Sources */,
-				DFF9594E0FB22D5700A3EC78 /* widget.cpp in Sources */,
-				DFF9596C0FB22D5700A3EC78 /* memorypool.cpp in Sources */,
-				DFF9596D0FB22D5700A3EC78 /* seq.cpp in Sources */,
-				DFF9596E0FB22D5700A3EC78 /* scaler.cpp in Sources */,
-				DFF9596F0FB22D5700A3EC78 /* scalebit.cpp in Sources */,
-				DFF959700FB22D5700A3EC78 /* 2xsai.cpp in Sources */,
-				DFF959710FB22D5700A3EC78 /* aspect.cpp in Sources */,
-				DFF959740FB22D5700A3EC78 /* scale2x.cpp in Sources */,
-				DFF959750FB22D5700A3EC78 /* scale3x.cpp in Sources */,
-				DFF959760FB22D5700A3EC78 /* iphone_keyboard.m in Sources */,
-				DFF959770FB22D5700A3EC78 /* iphone_video.m in Sources */,
-				DFF959780FB22D5700A3EC78 /* agi.cpp in Sources */,
-				DFF959790FB22D5700A3EC78 /* checks.cpp in Sources */,
-				DFF9597A0FB22D5700A3EC78 /* console.cpp in Sources */,
-				DFF9597B0FB22D5700A3EC78 /* cycle.cpp in Sources */,
-				DFF9597C0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF9597D0FB22D5700A3EC78 /* global.cpp in Sources */,
-				DFF9597E0FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF9597F0FB22D5700A3EC78 /* id.cpp in Sources */,
-				DFF959800FB22D5700A3EC78 /* inv.cpp in Sources */,
-				DFF959810FB22D5700A3EC78 /* keyboard.cpp in Sources */,
-				DFF959820FB22D5700A3EC78 /* loader_v2.cpp in Sources */,
-				DFF959830FB22D5700A3EC78 /* loader_v3.cpp in Sources */,
-				DFF959840FB22D5700A3EC78 /* logic.cpp in Sources */,
-				DFF959850FB22D5700A3EC78 /* lzw.cpp in Sources */,
-				DFF959860FB22D5700A3EC78 /* menu.cpp in Sources */,
-				DFF959870FB22D5700A3EC78 /* motion.cpp in Sources */,
-				DFF959880FB22D5700A3EC78 /* objects.cpp in Sources */,
-				DFF959890FB22D5700A3EC78 /* op_cmd.cpp in Sources */,
-				DFF9598A0FB22D5700A3EC78 /* op_dbg.cpp in Sources */,
-				DFF9598B0FB22D5700A3EC78 /* op_test.cpp in Sources */,
-				DFF9598C0FB22D5700A3EC78 /* picture.cpp in Sources */,
-				DFF9598D0FB22D5700A3EC78 /* preagi.cpp in Sources */,
-				DFF9598E0FB22D5700A3EC78 /* preagi_common.cpp in Sources */,
-				DFF9598F0FB22D5700A3EC78 /* preagi_mickey.cpp in Sources */,
-				DFF959900FB22D5700A3EC78 /* preagi_troll.cpp in Sources */,
-				DFF959910FB22D5700A3EC78 /* preagi_winnie.cpp in Sources */,
-				DFF959920FB22D5700A3EC78 /* predictive.cpp in Sources */,
-				DFF959930FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF959940FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF959950FB22D5700A3EC78 /* sprite.cpp in Sources */,
-				DFF959960FB22D5700A3EC78 /* text.cpp in Sources */,
-				DFF959970FB22D5700A3EC78 /* view.cpp in Sources */,
-				DFF959980FB22D5700A3EC78 /* wagparser.cpp in Sources */,
-				DFF959990FB22D5700A3EC78 /* words.cpp in Sources */,
-				DFF9599A0FB22D5700A3EC78 /* agos.cpp in Sources */,
-				DFF9599B0FB22D5700A3EC78 /* animation.cpp in Sources */,
-				DFF9599C0FB22D5700A3EC78 /* charset-fontdata.cpp in Sources */,
-				DFF9599D0FB22D5700A3EC78 /* charset.cpp in Sources */,
-				DFF9599E0FB22D5700A3EC78 /* contain.cpp in Sources */,
-				DFF9599F0FB22D5700A3EC78 /* cursor.cpp in Sources */,
-				DFF959A00FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF959A10FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF959A20FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF959A30FB22D5700A3EC78 /* draw.cpp in Sources */,
-				DFF959A40FB22D5700A3EC78 /* event.cpp in Sources */,
-				DFF959A50FB22D5700A3EC78 /* gfx.cpp in Sources */,
-				DFF959A60FB22D5700A3EC78 /* icons.cpp in Sources */,
-				DFF959A70FB22D5700A3EC78 /* input.cpp in Sources */,
-				DFF959A80FB22D5700A3EC78 /* items.cpp in Sources */,
-				DFF959A90FB22D5700A3EC78 /* menus.cpp in Sources */,
-				DFF959AA0FB22D5700A3EC78 /* midi.cpp in Sources */,
-				DFF959AB0FB22D5700A3EC78 /* midiparser_s1d.cpp in Sources */,
-				DFF959AC0FB22D5700A3EC78 /* oracle.cpp in Sources */,
-				DFF959AD0FB22D5700A3EC78 /* res.cpp in Sources */,
-				DFF959AE0FB22D5700A3EC78 /* res_ami.cpp in Sources */,
-				DFF959AF0FB22D5700A3EC78 /* res_snd.cpp in Sources */,
-				DFF959B00FB22D5700A3EC78 /* rooms.cpp in Sources */,
-				DFF959B10FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF959B20FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF959B30FB22D5700A3EC78 /* script_e1.cpp in Sources */,
-				DFF959B40FB22D5700A3EC78 /* script_e2.cpp in Sources */,
-				DFF959B50FB22D5700A3EC78 /* script_ff.cpp in Sources */,
-				DFF959B60FB22D5700A3EC78 /* script_pp.cpp in Sources */,
-				DFF959B70FB22D5700A3EC78 /* script_s1.cpp in Sources */,
-				DFF959B80FB22D5700A3EC78 /* script_s2.cpp in Sources */,
-				DFF959B90FB22D5700A3EC78 /* script_ww.cpp in Sources */,
-				DFF959BA0FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF959BB0FB22D5700A3EC78 /* string.cpp in Sources */,
-				DFF959BC0FB22D5700A3EC78 /* subroutine.cpp in Sources */,
-				DFF959BD0FB22D5700A3EC78 /* verb.cpp in Sources */,
-				DFF959BE0FB22D5700A3EC78 /* vga.cpp in Sources */,
-				DFF959BF0FB22D5700A3EC78 /* vga_e2.cpp in Sources */,
-				DFF959C00FB22D5700A3EC78 /* vga_ff.cpp in Sources */,
-				DFF959C10FB22D5700A3EC78 /* vga_s1.cpp in Sources */,
-				DFF959C20FB22D5700A3EC78 /* vga_s2.cpp in Sources */,
-				DFF959C30FB22D5700A3EC78 /* vga_ww.cpp in Sources */,
-				DFF959C40FB22D5700A3EC78 /* window.cpp in Sources */,
-				DFF959C50FB22D5700A3EC78 /* zones.cpp in Sources */,
-				DFF959C60FB22D5700A3EC78 /* anim.cpp in Sources */,
-				DFF959C70FB22D5700A3EC78 /* bg.cpp in Sources */,
-				DFF959C80FB22D5700A3EC78 /* bg_list.cpp in Sources */,
-				DFF959C90FB22D5700A3EC78 /* cine.cpp in Sources */,
-				DFF959CA0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF959CB0FB22D5700A3EC78 /* gfx.cpp in Sources */,
-				DFF959CC0FB22D5700A3EC78 /* main_loop.cpp in Sources */,
-				DFF959CD0FB22D5700A3EC78 /* msg.cpp in Sources */,
-				DFF959CE0FB22D5700A3EC78 /* object.cpp in Sources */,
-				DFF959CF0FB22D5700A3EC78 /* pal.cpp in Sources */,
-				DFF959D00FB22D5700A3EC78 /* part.cpp in Sources */,
-				DFF959D10FB22D5700A3EC78 /* prc.cpp in Sources */,
-				DFF959D20FB22D5700A3EC78 /* rel.cpp in Sources */,
-				DFF959D30FB22D5700A3EC78 /* script_fw.cpp in Sources */,
-				DFF959D40FB22D5700A3EC78 /* script_os.cpp in Sources */,
-				DFF959D50FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF959D60FB22D5700A3EC78 /* texte.cpp in Sources */,
-				DFF959D70FB22D5700A3EC78 /* unpack.cpp in Sources */,
-				DFF959D80FB22D5700A3EC78 /* various.cpp in Sources */,
-				DFF959D90FB22D5700A3EC78 /* actor.cpp in Sources */,
-				DFF959DA0FB22D5700A3EC78 /* background.cpp in Sources */,
-				DFF959DB0FB22D5700A3EC78 /* backgroundIncrust.cpp in Sources */,
-				DFF959DC0FB22D5700A3EC78 /* cell.cpp in Sources */,
-				DFF959DD0FB22D5700A3EC78 /* cruise.cpp in Sources */,
-				DFF959DE0FB22D5700A3EC78 /* cruise_main.cpp in Sources */,
-				DFF959DF0FB22D5700A3EC78 /* ctp.cpp in Sources */,
-				DFF959E00FB22D5700A3EC78 /* dataLoader.cpp in Sources */,
-				DFF959E10FB22D5700A3EC78 /* decompiler.cpp in Sources */,
-				DFF959E20FB22D5700A3EC78 /* delphine-unpack.cpp in Sources */,
-				DFF959E30FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF959E40FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF959E50FB22D5700A3EC78 /* function.cpp in Sources */,
-				DFF959E60FB22D5700A3EC78 /* gfxModule.cpp in Sources */,
-				DFF959E70FB22D5700A3EC78 /* linker.cpp in Sources */,
-				DFF959E80FB22D5700A3EC78 /* mainDraw.cpp in Sources */,
-				DFF959E90FB22D5700A3EC78 /* menu.cpp in Sources */,
-				DFF959EA0FB22D5700A3EC78 /* mouse.cpp in Sources */,
-				DFF959EB0FB22D5700A3EC78 /* object.cpp in Sources */,
-				DFF959EC0FB22D5700A3EC78 /* overlay.cpp in Sources */,
-				DFF959ED0FB22D5700A3EC78 /* perso.cpp in Sources */,
-				DFF959EE0FB22D5700A3EC78 /* polys.cpp in Sources */,
-				DFF959EF0FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF959F00FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF959F10FB22D5700A3EC78 /* stack.cpp in Sources */,
-				DFF959F20FB22D5700A3EC78 /* various.cpp in Sources */,
-				DFF959F30FB22D5700A3EC78 /* vars.cpp in Sources */,
-				DFF959F40FB22D5700A3EC78 /* volume.cpp in Sources */,
-				DFF959F50FB22D5700A3EC78 /* dialogs.cpp in Sources */,
-				DFF959F60FB22D5700A3EC78 /* actors.cpp in Sources */,
-				DFF959F70FB22D5700A3EC78 /* animation.cpp in Sources */,
-				DFF959F80FB22D5700A3EC78 /* converse.cpp in Sources */,
-				DFF959F90FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF959FA0FB22D5700A3EC78 /* drascula.cpp in Sources */,
-				DFF959FB0FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF959FC0FB22D5700A3EC78 /* interface.cpp in Sources */,
-				DFF959FD0FB22D5700A3EC78 /* objects.cpp in Sources */,
-				DFF959FE0FB22D5700A3EC78 /* palette.cpp in Sources */,
-				DFF959FF0FB22D5700A3EC78 /* rooms.cpp in Sources */,
-				DFF95A000FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95A010FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95A020FB22D5700A3EC78 /* talk.cpp in Sources */,
-				DFF95A030FB22D5700A3EC78 /* engine.cpp in Sources */,
-				DFF95A050FB22D5700A3EC78 /* dataio.cpp in Sources */,
-				DFF95A060FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95A070FB22D5700A3EC78 /* draw.cpp in Sources */,
-				DFF95A080FB22D5700A3EC78 /* draw_bargon.cpp in Sources */,
-				DFF95A090FB22D5700A3EC78 /* draw_v1.cpp in Sources */,
-				DFF95A0A0FB22D5700A3EC78 /* draw_v2.cpp in Sources */,
-				DFF95A0C0FB22D5700A3EC78 /* game.cpp in Sources */,
-				DFF95A0F0FB22D5700A3EC78 /* global.cpp in Sources */,
-				DFF95A100FB22D5700A3EC78 /* gob.cpp in Sources */,
-				DFF95A110FB22D5700A3EC78 /* goblin.cpp in Sources */,
-				DFF95A120FB22D5700A3EC78 /* goblin_v1.cpp in Sources */,
-				DFF95A130FB22D5700A3EC78 /* goblin_v2.cpp in Sources */,
-				DFF95A140FB22D5700A3EC78 /* goblin_v3.cpp in Sources */,
-				DFF95A150FB22D5700A3EC78 /* goblin_v4.cpp in Sources */,
-				DFF95A160FB22D5700A3EC78 /* init.cpp in Sources */,
-				DFF95A170FB22D5700A3EC78 /* init_v1.cpp in Sources */,
-				DFF95A180FB22D5700A3EC78 /* init_v2.cpp in Sources */,
-				DFF95A190FB22D5700A3EC78 /* init_v3.cpp in Sources */,
-				DFF95A1A0FB22D5700A3EC78 /* inter.cpp in Sources */,
-				DFF95A1B0FB22D5700A3EC78 /* inter_bargon.cpp in Sources */,
-				DFF95A1C0FB22D5700A3EC78 /* inter_v1.cpp in Sources */,
-				DFF95A1D0FB22D5700A3EC78 /* inter_v2.cpp in Sources */,
-				DFF95A1E0FB22D5700A3EC78 /* inter_v3.cpp in Sources */,
-				DFF95A1F0FB22D5700A3EC78 /* inter_v4.cpp in Sources */,
-				DFF95A200FB22D5700A3EC78 /* inter_v5.cpp in Sources */,
-				DFF95A210FB22D5700A3EC78 /* inter_v6.cpp in Sources */,
-				DFF95A220FB22D5700A3EC78 /* map.cpp in Sources */,
-				DFF95A230FB22D5700A3EC78 /* map_v1.cpp in Sources */,
-				DFF95A240FB22D5700A3EC78 /* map_v2.cpp in Sources */,
-				DFF95A260FB22D5700A3EC78 /* mult.cpp in Sources */,
-				DFF95A270FB22D5700A3EC78 /* mult_v1.cpp in Sources */,
-				DFF95A280FB22D5700A3EC78 /* mult_v2.cpp in Sources */,
-				DFF95A290FB22D5700A3EC78 /* palanim.cpp in Sources */,
-				DFF95A310FB22D5700A3EC78 /* scenery.cpp in Sources */,
-				DFF95A320FB22D5700A3EC78 /* scenery_v1.cpp in Sources */,
-				DFF95A330FB22D5700A3EC78 /* scenery_v2.cpp in Sources */,
-				DFF95A340FB22D5700A3EC78 /* adlib.cpp in Sources */,
-				DFF95A350FB22D5700A3EC78 /* bgatmosphere.cpp in Sources */,
-				DFF95A360FB22D5700A3EC78 /* cdrom.cpp in Sources */,
-				DFF95A370FB22D5700A3EC78 /* infogrames.cpp in Sources */,
-				DFF95A380FB22D5700A3EC78 /* pcspeaker.cpp in Sources */,
-				DFF95A390FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95A3A0FB22D5700A3EC78 /* soundblaster.cpp in Sources */,
-				DFF95A3B0FB22D5700A3EC78 /* sounddesc.cpp in Sources */,
-				DFF95A3C0FB22D5700A3EC78 /* soundmixer.cpp in Sources */,
-				DFF95A3D0FB22D5700A3EC78 /* util.cpp in Sources */,
-				DFF95A3E0FB22D5700A3EC78 /* variables.cpp in Sources */,
-				DFF95A3F0FB22D5700A3EC78 /* video.cpp in Sources */,
-				DFF95A400FB22D5700A3EC78 /* video_v1.cpp in Sources */,
-				DFF95A410FB22D5700A3EC78 /* video_v2.cpp in Sources */,
-				DFF95A420FB22D5700A3EC78 /* video_v6.cpp in Sources */,
-				DFF95A430FB22D5700A3EC78 /* videoplayer.cpp in Sources */,
-				DFF95A670FB22D5700A3EC78 /* animator_hof.cpp in Sources */,
-				DFF95A680FB22D5700A3EC78 /* animator_lok.cpp in Sources */,
-				DFF95A690FB22D5700A3EC78 /* animator_mr.cpp in Sources */,
-				DFF95A6A0FB22D5700A3EC78 /* animator_v2.cpp in Sources */,
-				DFF95A6B0FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF95A6C0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95A6D0FB22D5700A3EC78 /* gui.cpp in Sources */,
-				DFF95A6E0FB22D5700A3EC78 /* gui_hof.cpp in Sources */,
-				DFF95A6F0FB22D5700A3EC78 /* gui_lok.cpp in Sources */,
-				DFF95A700FB22D5700A3EC78 /* gui_mr.cpp in Sources */,
-				DFF95A710FB22D5700A3EC78 /* gui_v2.cpp in Sources */,
-				DFF95A720FB22D5700A3EC78 /* items_hof.cpp in Sources */,
-				DFF95A730FB22D5700A3EC78 /* items_lok.cpp in Sources */,
-				DFF95A740FB22D5700A3EC78 /* items_mr.cpp in Sources */,
-				DFF95A750FB22D5700A3EC78 /* items_v2.cpp in Sources */,
-				DFF95A760FB22D5700A3EC78 /* kyra_hof.cpp in Sources */,
-				DFF95A770FB22D5700A3EC78 /* kyra_lok.cpp in Sources */,
-				DFF95A780FB22D5700A3EC78 /* kyra_mr.cpp in Sources */,
-				DFF95A790FB22D5700A3EC78 /* kyra_v1.cpp in Sources */,
-				DFF95A7A0FB22D5700A3EC78 /* kyra_v2.cpp in Sources */,
-				DFF95A7B0FB22D5700A3EC78 /* lol.cpp in Sources */,
-				DFF95A7C0FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95A7D0FB22D5700A3EC78 /* resource_intern.cpp in Sources */,
-				DFF95A7E0FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95A7F0FB22D5700A3EC78 /* saveload_hof.cpp in Sources */,
-				DFF95A800FB22D5700A3EC78 /* saveload_lok.cpp in Sources */,
-				DFF95A810FB22D5700A3EC78 /* saveload_mr.cpp in Sources */,
-				DFF95A820FB22D5700A3EC78 /* scene_hof.cpp in Sources */,
-				DFF95A830FB22D5700A3EC78 /* scene_lok.cpp in Sources */,
-				DFF95A840FB22D5700A3EC78 /* scene_mr.cpp in Sources */,
-				DFF95A850FB22D5700A3EC78 /* scene_v1.cpp in Sources */,
-				DFF95A860FB22D5700A3EC78 /* scene_v2.cpp in Sources */,
-				DFF95A870FB22D5700A3EC78 /* screen.cpp in Sources */,
-				DFF95A880FB22D5700A3EC78 /* screen_hof.cpp in Sources */,
-				DFF95A890FB22D5700A3EC78 /* screen_lok.cpp in Sources */,
-				DFF95A8A0FB22D5700A3EC78 /* screen_lol.cpp in Sources */,
-				DFF95A8B0FB22D5700A3EC78 /* screen_mr.cpp in Sources */,
-				DFF95A8C0FB22D5700A3EC78 /* screen_v2.cpp in Sources */,
-				DFF95A8D0FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95A8E0FB22D5700A3EC78 /* script_hof.cpp in Sources */,
-				DFF95A8F0FB22D5700A3EC78 /* script_lok.cpp in Sources */,
-				DFF95A900FB22D5700A3EC78 /* script_mr.cpp in Sources */,
-				DFF95A910FB22D5700A3EC78 /* script_tim.cpp in Sources */,
-				DFF95A920FB22D5700A3EC78 /* script_v1.cpp in Sources */,
-				DFF95A930FB22D5700A3EC78 /* script_v2.cpp in Sources */,
-				DFF95A940FB22D5700A3EC78 /* seqplayer.cpp in Sources */,
-				DFF95A950FB22D5700A3EC78 /* sequences_hof.cpp in Sources */,
-				DFF95A960FB22D5700A3EC78 /* sequences_lok.cpp in Sources */,
-				DFF95A970FB22D5700A3EC78 /* sequences_mr.cpp in Sources */,
-				DFF95A980FB22D5700A3EC78 /* sequences_v2.cpp in Sources */,
-				DFF95A990FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95A9A0FB22D5700A3EC78 /* sound_adlib.cpp in Sources */,
-				DFF95A9B0FB22D5700A3EC78 /* sound_digital.cpp in Sources */,
-				DFF95A9C0FB22D5700A3EC78 /* sound_lok.cpp in Sources */,
-				DFF95A9D0FB22D5700A3EC78 /* sound_towns.cpp in Sources */,
-				DFF95A9E0FB22D5700A3EC78 /* sprites.cpp in Sources */,
-				DFF95A9F0FB22D5700A3EC78 /* staticres.cpp in Sources */,
-				DFF95AA00FB22D5700A3EC78 /* text.cpp in Sources */,
-				DFF95AA10FB22D5700A3EC78 /* text_hof.cpp in Sources */,
-				DFF95AA20FB22D5700A3EC78 /* text_lok.cpp in Sources */,
-				DFF95AA30FB22D5700A3EC78 /* text_mr.cpp in Sources */,
-				DFF95AA40FB22D5700A3EC78 /* timer.cpp in Sources */,
-				DFF95AA50FB22D5700A3EC78 /* timer_hof.cpp in Sources */,
-				DFF95AA60FB22D5700A3EC78 /* timer_lok.cpp in Sources */,
-				DFF95AA70FB22D5700A3EC78 /* timer_mr.cpp in Sources */,
-				DFF95AA80FB22D5700A3EC78 /* vqa.cpp in Sources */,
-				DFF95AA90FB22D5700A3EC78 /* wsamovie.cpp in Sources */,
-				DFF95AAA0FB22D5700A3EC78 /* animseq.cpp in Sources */,
-				DFF95AAB0FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF95AAC0FB22D5700A3EC78 /* decode.cpp in Sources */,
-				DFF95AAD0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95AAE0FB22D5700A3EC78 /* disk.cpp in Sources */,
-				DFF95AAF0FB22D5700A3EC78 /* events.cpp in Sources */,
-				DFF95AB00FB22D5700A3EC78 /* fights.cpp in Sources */,
-				DFF95AB10FB22D5700A3EC78 /* game.cpp in Sources */,
-				DFF95AB20FB22D5700A3EC78 /* hotspots.cpp in Sources */,
-				DFF95AB30FB22D5700A3EC78 /* intro.cpp in Sources */,
-				DFF95AB40FB22D5700A3EC78 /* lure.cpp in Sources */,
-				DFF95AB50FB22D5700A3EC78 /* memory.cpp in Sources */,
-				DFF95AB60FB22D5700A3EC78 /* menu.cpp in Sources */,
-				DFF95AB70FB22D5700A3EC78 /* palette.cpp in Sources */,
-				DFF95AB80FB22D5700A3EC78 /* res.cpp in Sources */,
-				DFF95AB90FB22D5700A3EC78 /* res_struct.cpp in Sources */,
-				DFF95ABA0FB22D5700A3EC78 /* room.cpp in Sources */,
-				DFF95ABB0FB22D5700A3EC78 /* screen.cpp in Sources */,
-				DFF95ABC0FB22D5700A3EC78 /* scripts.cpp in Sources */,
-				DFF95ABD0FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95ABE0FB22D5700A3EC78 /* strings.cpp in Sources */,
-				DFF95ABF0FB22D5700A3EC78 /* surface.cpp in Sources */,
-				DFF95AC00FB22D5700A3EC78 /* actor.cpp in Sources */,
-				DFF95AC10FB22D5700A3EC78 /* animation.cpp in Sources */,
-				DFF95AC20FB22D5700A3EC78 /* assets.cpp in Sources */,
-				DFF95AC30FB22D5700A3EC78 /* compression.cpp in Sources */,
-				DFF95AC40FB22D5700A3EC78 /* console.cpp in Sources */,
-				DFF95AC50FB22D5700A3EC78 /* converse.cpp in Sources */,
-				DFF95AC60FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95AC70FB22D5700A3EC78 /* events.cpp in Sources */,
-				DFF95AC80FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF95AC90FB22D5700A3EC78 /* globals.cpp in Sources */,
-				DFF95ACA0FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95ACB0FB22D5700A3EC78 /* gui.cpp in Sources */,
-				DFF95ACC0FB22D5700A3EC78 /* hotspot.cpp in Sources */,
-				DFF95ACD0FB22D5700A3EC78 /* m4.cpp in Sources */,
-				DFF95ACE0FB22D5700A3EC78 /* m4_menus.cpp in Sources */,
-				DFF95ACF0FB22D5700A3EC78 /* m4_views.cpp in Sources */,
-				DFF95AD00FB22D5700A3EC78 /* mads_anim.cpp in Sources */,
-				DFF95AD10FB22D5700A3EC78 /* mads_menus.cpp in Sources */,
-				DFF95AD20FB22D5700A3EC78 /* midi.cpp in Sources */,
-				DFF95AD30FB22D5700A3EC78 /* rails.cpp in Sources */,
-				DFF95AD40FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95AD50FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95AD60FB22D5700A3EC78 /* scene.cpp in Sources */,
-				DFF95AD70FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95AD80FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95AD90FB22D5700A3EC78 /* sprite.cpp in Sources */,
-				DFF95ADA0FB22D5700A3EC78 /* viewmgr.cpp in Sources */,
-				DFF95ADB0FB22D5700A3EC78 /* woodscript.cpp in Sources */,
-				DFF95ADC0FB22D5700A3EC78 /* ws_machine.cpp in Sources */,
-				DFF95ADD0FB22D5700A3EC78 /* ws_sequence.cpp in Sources */,
-				DFF95ADE0FB22D5700A3EC78 /* database.cpp in Sources */,
-				DFF95ADF0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95AE00FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95AE10FB22D5700A3EC78 /* made.cpp in Sources */,
-				DFF95AE20FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95AE30FB22D5700A3EC78 /* pmvplayer.cpp in Sources */,
-				DFF95AE40FB22D5700A3EC78 /* redreader.cpp in Sources */,
-				DFF95AE50FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95AE60FB22D5700A3EC78 /* screen.cpp in Sources */,
-				DFF95AE70FB22D5700A3EC78 /* screenfx.cpp in Sources */,
-				DFF95AE80FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95AE90FB22D5700A3EC78 /* scriptfuncs.cpp in Sources */,
-				DFF95AEA0FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95AEB0FB22D5700A3EC78 /* balloons.cpp in Sources */,
-				DFF95AEC0FB22D5700A3EC78 /* callables_br.cpp in Sources */,
-				DFF95AED0FB22D5700A3EC78 /* callables_ns.cpp in Sources */,
-				DFF95AEE0FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95AEF0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95AF00FB22D5700A3EC78 /* dialogue.cpp in Sources */,
-				DFF95AF10FB22D5700A3EC78 /* disk_br.cpp in Sources */,
-				DFF95AF20FB22D5700A3EC78 /* disk_ns.cpp in Sources */,
-				DFF95AF30FB22D5700A3EC78 /* exec_br.cpp in Sources */,
-				DFF95AF40FB22D5700A3EC78 /* exec_ns.cpp in Sources */,
-				DFF95AF50FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF95AF60FB22D5700A3EC78 /* gfxbase.cpp in Sources */,
-				DFF95AF70FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95AF80FB22D5700A3EC78 /* gui.cpp in Sources */,
-				DFF95AF90FB22D5700A3EC78 /* gui_br.cpp in Sources */,
-				DFF95AFA0FB22D5700A3EC78 /* gui_ns.cpp in Sources */,
-				DFF95AFB0FB22D5700A3EC78 /* input.cpp in Sources */,
-				DFF95AFC0FB22D5700A3EC78 /* inventory.cpp in Sources */,
-				DFF95AFD0FB22D5700A3EC78 /* objects.cpp in Sources */,
-				DFF95AFE0FB22D5700A3EC78 /* parallaction.cpp in Sources */,
-				DFF95AFF0FB22D5700A3EC78 /* parallaction_br.cpp in Sources */,
-				DFF95B000FB22D5700A3EC78 /* parallaction_ns.cpp in Sources */,
-				DFF95B010FB22D5700A3EC78 /* parser.cpp in Sources */,
-				DFF95B020FB22D5700A3EC78 /* parser_br.cpp in Sources */,
-				DFF95B030FB22D5700A3EC78 /* parser_ns.cpp in Sources */,
-				DFF95B040FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95B050FB22D5700A3EC78 /* staticres.cpp in Sources */,
-				DFF95B060FB22D5700A3EC78 /* walk.cpp in Sources */,
-				DFF95B070FB22D5700A3EC78 /* bankman.cpp in Sources */,
-				DFF95B080FB22D5700A3EC78 /* command.cpp in Sources */,
-				DFF95B090FB22D5700A3EC78 /* credits.cpp in Sources */,
-				DFF95B0A0FB22D5700A3EC78 /* cutaway.cpp in Sources */,
-				DFF95B0B0FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95B0C0FB22D5700A3EC78 /* display.cpp in Sources */,
-				DFF95B0D0FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95B0E0FB22D5700A3EC78 /* grid.cpp in Sources */,
-				DFF95B0F0FB22D5700A3EC78 /* input.cpp in Sources */,
-				DFF95B100FB22D5700A3EC78 /* journal.cpp in Sources */,
-				DFF95B110FB22D5700A3EC78 /* logic.cpp in Sources */,
-				DFF95B120FB22D5700A3EC78 /* midiadlib.cpp in Sources */,
-				DFF95B130FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95B140FB22D5700A3EC78 /* musicdata.cpp in Sources */,
-				DFF95B150FB22D5700A3EC78 /* queen.cpp in Sources */,
-				DFF95B160FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95B170FB22D5700A3EC78 /* restables.cpp in Sources */,
-				DFF95B180FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95B190FB22D5700A3EC78 /* state.cpp in Sources */,
-				DFF95B1A0FB22D5700A3EC78 /* talk.cpp in Sources */,
-				DFF95B1B0FB22D5700A3EC78 /* walk.cpp in Sources */,
-				DFF95B1C0FB22D5700A3EC78 /* actor.cpp in Sources */,
-				DFF95B1D0FB22D5700A3EC78 /* actor_path.cpp in Sources */,
-				DFF95B1E0FB22D5700A3EC78 /* actor_walk.cpp in Sources */,
-				DFF95B1F0FB22D5700A3EC78 /* animation.cpp in Sources */,
-				DFF95B200FB22D5700A3EC78 /* console.cpp in Sources */,
-				DFF95B210FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95B220FB22D5700A3EC78 /* events.cpp in Sources */,
-				DFF95B230FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF95B240FB22D5700A3EC78 /* font_map.cpp in Sources */,
-				DFF95B250FB22D5700A3EC78 /* gfx.cpp in Sources */,
-				DFF95B260FB22D5700A3EC78 /* image.cpp in Sources */,
-				DFF95B270FB22D5700A3EC78 /* input.cpp in Sources */,
-				DFF95B280FB22D5700A3EC78 /* interface.cpp in Sources */,
-				DFF95B290FB22D5700A3EC78 /* introproc_ihnm.cpp in Sources */,
-				DFF95B2A0FB22D5700A3EC78 /* introproc_ite.cpp in Sources */,
-				DFF95B2B0FB22D5700A3EC78 /* isomap.cpp in Sources */,
-				DFF95B2C0FB22D5700A3EC78 /* itedata.cpp in Sources */,
-				DFF95B2D0FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95B2E0FB22D5700A3EC78 /* objectmap.cpp in Sources */,
-				DFF95B2F0FB22D5700A3EC78 /* palanim.cpp in Sources */,
-				DFF95B300FB22D5700A3EC78 /* puzzle.cpp in Sources */,
-				DFF95B310FB22D5700A3EC78 /* render.cpp in Sources */,
-				DFF95B320FB22D5700A3EC78 /* saga.cpp in Sources */,
-				DFF95B330FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95B340FB22D5700A3EC78 /* scene.cpp in Sources */,
-				DFF95B350FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95B360FB22D5700A3EC78 /* sfuncs.cpp in Sources */,
-				DFF95B370FB22D5700A3EC78 /* sndres.cpp in Sources */,
-				DFF95B380FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95B390FB22D5700A3EC78 /* sprite.cpp in Sources */,
-				DFF95B3A0FB22D5700A3EC78 /* sthread.cpp in Sources */,
-				DFF95B3B0FB22D5700A3EC78 /* actor.cpp in Sources */,
-				DFF95B3C0FB22D5700A3EC78 /* akos.cpp in Sources */,
-				DFF95B3D0FB22D5700A3EC78 /* base-costume.cpp in Sources */,
-				DFF95B3E0FB22D5700A3EC78 /* bomp.cpp in Sources */,
-				DFF95B3F0FB22D5700A3EC78 /* boxes.cpp in Sources */,
-				DFF95B400FB22D5700A3EC78 /* camera.cpp in Sources */,
-				DFF95B410FB22D5700A3EC78 /* charset-fontdata.cpp in Sources */,
-				DFF95B420FB22D5700A3EC78 /* charset.cpp in Sources */,
-				DFF95B430FB22D5700A3EC78 /* costume.cpp in Sources */,
-				DFF95B440FB22D5700A3EC78 /* cursor.cpp in Sources */,
-				DFF95B450FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF95B460FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95B470FB22D5700A3EC78 /* dialogs.cpp in Sources */,
-				DFF95B480FB22D5700A3EC78 /* file.cpp in Sources */,
-				DFF95B490FB22D5700A3EC78 /* file_nes.cpp in Sources */,
-				DFF95B4A0FB22D5700A3EC78 /* gfx.cpp in Sources */,
-				DFF95B4B0FB22D5700A3EC78 /* animation_he.cpp in Sources */,
-				DFF95B4C0FB22D5700A3EC78 /* cup_player_he.cpp in Sources */,
-				DFF95B4D0FB22D5700A3EC78 /* floodfill_he.cpp in Sources */,
-				DFF95B4E0FB22D5700A3EC78 /* logic_he.cpp in Sources */,
-				DFF95B4F0FB22D5700A3EC78 /* palette_he.cpp in Sources */,
-				DFF95B500FB22D5700A3EC78 /* resource_he.cpp in Sources */,
-				DFF95B510FB22D5700A3EC78 /* script_v100he.cpp in Sources */,
-				DFF95B520FB22D5700A3EC78 /* script_v60he.cpp in Sources */,
-				DFF95B530FB22D5700A3EC78 /* script_v70he.cpp in Sources */,
-				DFF95B540FB22D5700A3EC78 /* script_v71he.cpp in Sources */,
-				DFF95B550FB22D5700A3EC78 /* script_v72he.cpp in Sources */,
-				DFF95B560FB22D5700A3EC78 /* script_v80he.cpp in Sources */,
-				DFF95B570FB22D5700A3EC78 /* script_v90he.cpp in Sources */,
-				DFF95B580FB22D5700A3EC78 /* sound_he.cpp in Sources */,
-				DFF95B590FB22D5700A3EC78 /* sprite_he.cpp in Sources */,
-				DFF95B5A0FB22D5700A3EC78 /* wiz_he.cpp in Sources */,
-				DFF95B5B0FB22D5700A3EC78 /* help.cpp in Sources */,
-				DFF95B5C0FB22D5700A3EC78 /* imuse.cpp in Sources */,
-				DFF95B5D0FB22D5700A3EC78 /* imuse_part.cpp in Sources */,
-				DFF95B5E0FB22D5700A3EC78 /* imuse_player.cpp in Sources */,
-				DFF95B5F0FB22D5700A3EC78 /* instrument.cpp in Sources */,
-				DFF95B600FB22D5700A3EC78 /* sysex_samnmax.cpp in Sources */,
-				DFF95B610FB22D5700A3EC78 /* sysex_scumm.cpp in Sources */,
-				DFF95B620FB22D5700A3EC78 /* dimuse.cpp in Sources */,
-				DFF95B630FB22D5700A3EC78 /* dimuse_bndmgr.cpp in Sources */,
-				DFF95B640FB22D5700A3EC78 /* dimuse_codecs.cpp in Sources */,
-				DFF95B650FB22D5700A3EC78 /* dimuse_music.cpp in Sources */,
-				DFF95B660FB22D5700A3EC78 /* dimuse_script.cpp in Sources */,
-				DFF95B670FB22D5700A3EC78 /* dimuse_sndmgr.cpp in Sources */,
-				DFF95B680FB22D5700A3EC78 /* dimuse_tables.cpp in Sources */,
-				DFF95B690FB22D5700A3EC78 /* dimuse_track.cpp in Sources */,
-				DFF95B6A0FB22D5700A3EC78 /* input.cpp in Sources */,
-				DFF95B6B0FB22D5700A3EC78 /* insane.cpp in Sources */,
-				DFF95B6C0FB22D5700A3EC78 /* insane_ben.cpp in Sources */,
-				DFF95B6D0FB22D5700A3EC78 /* insane_enemy.cpp in Sources */,
-				DFF95B6E0FB22D5700A3EC78 /* insane_iact.cpp in Sources */,
-				DFF95B6F0FB22D5700A3EC78 /* insane_scenes.cpp in Sources */,
-				DFF95B710FB22D5700A3EC78 /* midiparser_ro.cpp in Sources */,
-				DFF95B720FB22D5700A3EC78 /* nut_renderer.cpp in Sources */,
-				DFF95B730FB22D5700A3EC78 /* object.cpp in Sources */,
-				DFF95B740FB22D5700A3EC78 /* palette.cpp in Sources */,
-				DFF95B750FB22D5700A3EC78 /* player_mod.cpp in Sources */,
-				DFF95B760FB22D5700A3EC78 /* player_nes.cpp in Sources */,
-				DFF95B770FB22D5700A3EC78 /* player_v1.cpp in Sources */,
-				DFF95B780FB22D5700A3EC78 /* player_v2.cpp in Sources */,
-				DFF95B790FB22D5700A3EC78 /* player_v2a.cpp in Sources */,
-				DFF95B7A0FB22D5700A3EC78 /* player_v3a.cpp in Sources */,
-				DFF95B7B0FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95B7C0FB22D5700A3EC78 /* resource_v2.cpp in Sources */,
-				DFF95B7D0FB22D5700A3EC78 /* resource_v3.cpp in Sources */,
-				DFF95B7E0FB22D5700A3EC78 /* resource_v4.cpp in Sources */,
-				DFF95B7F0FB22D5700A3EC78 /* room.cpp in Sources */,
-				DFF95B800FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95B810FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95B820FB22D5700A3EC78 /* script_v0.cpp in Sources */,
-				DFF95B830FB22D5700A3EC78 /* script_v2.cpp in Sources */,
-				DFF95B840FB22D5700A3EC78 /* script_v5.cpp in Sources */,
-				DFF95B850FB22D5700A3EC78 /* script_v6.cpp in Sources */,
-				DFF95B860FB22D5700A3EC78 /* script_v8.cpp in Sources */,
-				DFF95B870FB22D5700A3EC78 /* scumm.cpp in Sources */,
-				DFF95B880FB22D5700A3EC78 /* channel.cpp in Sources */,
-				DFF95B890FB22D5700A3EC78 /* codec1.cpp in Sources */,
-				DFF95B8A0FB22D5700A3EC78 /* codec37.cpp in Sources */,
-				DFF95B8B0FB22D5700A3EC78 /* codec47.cpp in Sources */,
-				DFF95B8C0FB22D5700A3EC78 /* imuse_channel.cpp in Sources */,
-				DFF95B8D0FB22D5700A3EC78 /* saud_channel.cpp in Sources */,
-				DFF95B8E0FB22D5700A3EC78 /* smush_font.cpp in Sources */,
-				DFF95B8F0FB22D5700A3EC78 /* smush_mixer.cpp in Sources */,
-				DFF95B900FB22D5700A3EC78 /* smush_player.cpp in Sources */,
-				DFF95B910FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95B920FB22D5700A3EC78 /* string.cpp in Sources */,
-				DFF95B930FB22D5700A3EC78 /* usage_bits.cpp in Sources */,
-				DFF95B940FB22D5700A3EC78 /* util.cpp in Sources */,
-				DFF95B950FB22D5700A3EC78 /* vars.cpp in Sources */,
-				DFF95B960FB22D5700A3EC78 /* verbs.cpp in Sources */,
-				DFF95B970FB22D5700A3EC78 /* autoroute.cpp in Sources */,
-				DFF95B980FB22D5700A3EC78 /* compact.cpp in Sources */,
-				DFF95B990FB22D5700A3EC78 /* control.cpp in Sources */,
-				DFF95B9A0FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95B9B0FB22D5700A3EC78 /* disk.cpp in Sources */,
-				DFF95B9C0FB22D5700A3EC78 /* grid.cpp in Sources */,
-				DFF95B9D0FB22D5700A3EC78 /* hufftext.cpp in Sources */,
-				DFF95B9E0FB22D5700A3EC78 /* intro.cpp in Sources */,
-				DFF95B9F0FB22D5700A3EC78 /* logic.cpp in Sources */,
-				DFF95BA00FB22D5700A3EC78 /* mouse.cpp in Sources */,
-				DFF95BA10FB22D5700A3EC78 /* adlibchannel.cpp in Sources */,
-				DFF95BA20FB22D5700A3EC78 /* adlibmusic.cpp in Sources */,
-				DFF95BA30FB22D5700A3EC78 /* gmchannel.cpp in Sources */,
-				DFF95BA40FB22D5700A3EC78 /* gmmusic.cpp in Sources */,
-				DFF95BA50FB22D5700A3EC78 /* mt32music.cpp in Sources */,
-				DFF95BA60FB22D5700A3EC78 /* musicbase.cpp in Sources */,
-				DFF95BA70FB22D5700A3EC78 /* rnc_deco.cpp in Sources */,
-				DFF95BA80FB22D5700A3EC78 /* screen.cpp in Sources */,
-				DFF95BA90FB22D5700A3EC78 /* sky.cpp in Sources */,
-				DFF95BAA0FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95BAB0FB22D5700A3EC78 /* text.cpp in Sources */,
-				DFF95BAC0FB22D5700A3EC78 /* animation.cpp in Sources */,
-				DFF95BAD0FB22D5700A3EC78 /* control.cpp in Sources */,
-				DFF95BAE0FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95BAF0FB22D5700A3EC78 /* eventman.cpp in Sources */,
-				DFF95BB00FB22D5700A3EC78 /* logic.cpp in Sources */,
-				DFF95BB10FB22D5700A3EC78 /* memman.cpp in Sources */,
-				DFF95BB20FB22D5700A3EC78 /* menu.cpp in Sources */,
-				DFF95BB30FB22D5700A3EC78 /* mouse.cpp in Sources */,
-				DFF95BB40FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95BB50FB22D5700A3EC78 /* objectman.cpp in Sources */,
-				DFF95BB60FB22D5700A3EC78 /* resman.cpp in Sources */,
-				DFF95BB70FB22D5700A3EC78 /* router.cpp in Sources */,
-				DFF95BB80FB22D5700A3EC78 /* screen.cpp in Sources */,
-				DFF95BB90FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95BBA0FB22D5700A3EC78 /* staticres.cpp in Sources */,
-				DFF95BBB0FB22D5700A3EC78 /* sword1.cpp in Sources */,
-				DFF95BBC0FB22D5700A3EC78 /* text.cpp in Sources */,
-				DFF95BBD0FB22D5700A3EC78 /* animation.cpp in Sources */,
-				DFF95BBE0FB22D5700A3EC78 /* anims.cpp in Sources */,
-				DFF95BBF0FB22D5700A3EC78 /* console.cpp in Sources */,
-				DFF95BC00FB22D5700A3EC78 /* controls.cpp in Sources */,
-				DFF95BC10FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95BC20FB22D5700A3EC78 /* events.cpp in Sources */,
-				DFF95BC30FB22D5700A3EC78 /* function.cpp in Sources */,
-				DFF95BC40FB22D5700A3EC78 /* icons.cpp in Sources */,
-				DFF95BC50FB22D5700A3EC78 /* interpreter.cpp in Sources */,
-				DFF95BC60FB22D5700A3EC78 /* layers.cpp in Sources */,
-				DFF95BC70FB22D5700A3EC78 /* logic.cpp in Sources */,
-				DFF95BC80FB22D5700A3EC78 /* maketext.cpp in Sources */,
-				DFF95BC90FB22D5700A3EC78 /* memory.cpp in Sources */,
-				DFF95BCA0FB22D5700A3EC78 /* menu.cpp in Sources */,
-				DFF95BCB0FB22D5700A3EC78 /* mouse.cpp in Sources */,
-				DFF95BCC0FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95BCD0FB22D5700A3EC78 /* palette.cpp in Sources */,
-				DFF95BCE0FB22D5700A3EC78 /* protocol.cpp in Sources */,
-				DFF95BCF0FB22D5700A3EC78 /* render.cpp in Sources */,
-				DFF95BD00FB22D5700A3EC78 /* resman.cpp in Sources */,
-				DFF95BD10FB22D5700A3EC78 /* router.cpp in Sources */,
-				DFF95BD20FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95BD30FB22D5700A3EC78 /* screen.cpp in Sources */,
-				DFF95BD40FB22D5700A3EC78 /* scroll.cpp in Sources */,
-				DFF95BD50FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95BD60FB22D5700A3EC78 /* speech.cpp in Sources */,
-				DFF95BD70FB22D5700A3EC78 /* sprite.cpp in Sources */,
-				DFF95BD80FB22D5700A3EC78 /* startup.cpp in Sources */,
-				DFF95BD90FB22D5700A3EC78 /* sword2.cpp in Sources */,
-				DFF95BDA0FB22D5700A3EC78 /* sync.cpp in Sources */,
-				DFF95BDB0FB22D5700A3EC78 /* walker.cpp in Sources */,
-				DFF95BDC0FB22D5700A3EC78 /* actors.cpp in Sources */,
-				DFF95BDD0FB22D5700A3EC78 /* anim.cpp in Sources */,
-				DFF95BDE0FB22D5700A3EC78 /* background.cpp in Sources */,
-				DFF95BDF0FB22D5700A3EC78 /* bg.cpp in Sources */,
-				DFF95BE00FB22D5700A3EC78 /* cliprect.cpp in Sources */,
-				DFF95BE10FB22D5700A3EC78 /* config.cpp in Sources */,
-				DFF95BE20FB22D5700A3EC78 /* cursor.cpp in Sources */,
-				DFF95BE30FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF95BE40FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95BE50FB22D5700A3EC78 /* effect.cpp in Sources */,
-				DFF95BE60FB22D5700A3EC78 /* events.cpp in Sources */,
-				DFF95BE70FB22D5700A3EC78 /* faders.cpp in Sources */,
-				DFF95BE80FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF95BE90FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95BEA0FB22D5700A3EC78 /* handle.cpp in Sources */,
-				DFF95BEB0FB22D5700A3EC78 /* heapmem.cpp in Sources */,
-				DFF95BEC0FB22D5700A3EC78 /* mareels.cpp in Sources */,
-				DFF95BED0FB22D5700A3EC78 /* move.cpp in Sources */,
-				DFF95BEE0FB22D5700A3EC78 /* multiobj.cpp in Sources */,
-				DFF95BEF0FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95BF00FB22D5700A3EC78 /* object.cpp in Sources */,
-				DFF95BF10FB22D5700A3EC78 /* palette.cpp in Sources */,
-				DFF95BF20FB22D5700A3EC78 /* pcode.cpp in Sources */,
-				DFF95BF30FB22D5700A3EC78 /* pdisplay.cpp in Sources */,
-				DFF95BF40FB22D5700A3EC78 /* play.cpp in Sources */,
-				DFF95BF50FB22D5700A3EC78 /* polygons.cpp in Sources */,
-				DFF95BF60FB22D5700A3EC78 /* rince.cpp in Sources */,
-				DFF95BF70FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95BF80FB22D5700A3EC78 /* savescn.cpp in Sources */,
-				DFF95BF90FB22D5700A3EC78 /* scene.cpp in Sources */,
-				DFF95BFA0FB22D5700A3EC78 /* sched.cpp in Sources */,
-				DFF95BFB0FB22D5700A3EC78 /* scn.cpp in Sources */,
-				DFF95BFC0FB22D5700A3EC78 /* scroll.cpp in Sources */,
-				DFF95BFD0FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95BFE0FB22D5700A3EC78 /* strres.cpp in Sources */,
-				DFF95BFF0FB22D5700A3EC78 /* text.cpp in Sources */,
-				DFF95C000FB22D5700A3EC78 /* timers.cpp in Sources */,
-				DFF95C010FB22D5700A3EC78 /* tinlib.cpp in Sources */,
-				DFF95C020FB22D5700A3EC78 /* tinsel.cpp in Sources */,
-				DFF95C030FB22D5700A3EC78 /* token.cpp in Sources */,
-				DFF95C040FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95C050FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95C060FB22D5700A3EC78 /* menu.cpp in Sources */,
-				DFF95C070FB22D5700A3EC78 /* midi.cpp in Sources */,
-				DFF95C080FB22D5700A3EC78 /* opcodes.cpp in Sources */,
-				DFF95C090FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95C0A0FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95C0B0FB22D5700A3EC78 /* staticres.cpp in Sources */,
-				DFF95C0C0FB22D5700A3EC78 /* touche.cpp in Sources */,
-				DFF95C0D0FB22D5700A3EC78 /* blit.cpp in Sources */,
-				DFF95C0E0FB22D5700A3EC78 /* timidity.cpp in Sources */,
-				DFF95C0F0FB22D5700A3EC78 /* archive.cpp in Sources */,
-				DFF95C100FB22D5700A3EC78 /* unarj.cpp in Sources */,
-				DFF95C110FB22D5700A3EC78 /* stdiostream.cpp in Sources */,
-				DFF95C130FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95C140FB22D5700A3EC78 /* ThemeEngine.cpp in Sources */,
-				DFF95C150FB22D5700A3EC78 /* ThemeEval.cpp in Sources */,
-				DFF95C160FB22D5700A3EC78 /* ThemeLayout.cpp in Sources */,
-				DFF95C170FB22D5700A3EC78 /* ThemeParser.cpp in Sources */,
-				DFF95C180FB22D5700A3EC78 /* thumbnail.cpp in Sources */,
-				DFF95C190FB22D5700A3EC78 /* VectorRenderer.cpp in Sources */,
-				DFF95C1A0FB22D5700A3EC78 /* VectorRendererSpec.cpp in Sources */,
-				DFF95C1B0FB22D5700A3EC78 /* xmlparser.cpp in Sources */,
-				DFF95C1C0FB22D5700A3EC78 /* game.cpp in Sources */,
-				DFF95C1D0FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95C1E0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95C1F0FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */,
-				DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */,
-				DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */,
-				DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */,
-				DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */,
-				DFF95C2C0FB22D5700A3EC78 /* drives.cpp in Sources */,
-				DFF95C2D0FB22D5700A3EC78 /* sysvar.cpp in Sources */,
-				DFF95C2E0FB22D5700A3EC78 /* gui_lol.cpp in Sources */,
-				DFF95C2F0FB22D5700A3EC78 /* items_lol.cpp in Sources */,
-				DFF95C300FB22D5700A3EC78 /* script_lol.cpp in Sources */,
-				DFF95C310FB22D5700A3EC78 /* sequences_lol.cpp in Sources */,
-				DFF95C320FB22D5700A3EC78 /* sound_midi.cpp in Sources */,
-				DFF95C330FB22D5700A3EC78 /* util.cpp in Sources */,
-				DFF95C370FB22D5700A3EC78 /* scene_lol.cpp in Sources */,
-				DFF95C380FB22D5700A3EC78 /* advancedDetector.cpp in Sources */,
-				DFF95C390FB22D5700A3EC78 /* base-backend.cpp in Sources */,
-				DFF95C3A0FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95C3B0FB22D5700A3EC78 /* resource_hrs.cpp in Sources */,
-				DFF95C3C0FB22D5700A3EC78 /* resource_res.cpp in Sources */,
-				DFF95C3D0FB22D5700A3EC78 /* resource_rsc.cpp in Sources */,
-				DFF95C3E0FB22D5700A3EC78 /* sfuncs_ihnm.cpp in Sources */,
-				DFF95C3F0FB22D5700A3EC78 /* debugger.cpp in Sources */,
-				DFF95C400FB22D5700A3EC78 /* staticres.cpp in Sources */,
-				DFF95C410FB22D5700A3EC78 /* cell.cpp in Sources */,
-				DFF95C420FB22D5700A3EC78 /* cursor.cpp in Sources */,
-				DFF95C430FB22D5700A3EC78 /* debug.cpp in Sources */,
-				DFF95C440FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95C450FB22D5700A3EC78 /* font.cpp in Sources */,
-				DFF95C460FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95C470FB22D5700A3EC78 /* groovie.cpp in Sources */,
-				DFF95C480FB22D5700A3EC78 /* lzss.cpp in Sources */,
-				DFF95C490FB22D5700A3EC78 /* music.cpp in Sources */,
-				DFF95C4A0FB22D5700A3EC78 /* player.cpp in Sources */,
-				DFF95C4B0FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95C4C0FB22D5700A3EC78 /* roq.cpp in Sources */,
-				DFF95C4D0FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95C4E0FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95C4F0FB22D5700A3EC78 /* vdx.cpp in Sources */,
-				DFF95C500FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95C510FB22D5700A3EC78 /* graphics.cpp in Sources */,
-				DFF95C520FB22D5700A3EC78 /* locations.cpp in Sources */,
-				DFF95C530FB22D5700A3EC78 /* resource.cpp in Sources */,
-				DFF95C540FB22D5700A3EC78 /* saveload.cpp in Sources */,
-				DFF95C550FB22D5700A3EC78 /* sequences.cpp in Sources */,
-				DFF95C560FB22D5700A3EC78 /* staticres.cpp in Sources */,
-				DFF95C570FB22D5700A3EC78 /* tucker.cpp in Sources */,
-				DFF95C580FB22D5700A3EC78 /* detection.cpp in Sources */,
-				DFF95C5A0FB22D5700A3EC78 /* gc.cpp in Sources */,
-				DFF95C5C0FB22D5700A3EC78 /* kernel.cpp in Sources */,
-				DFF95C5D0FB22D5700A3EC78 /* kevent.cpp in Sources */,
-				DFF95C5E0FB22D5700A3EC78 /* kfile.cpp in Sources */,
-				DFF95C5F0FB22D5700A3EC78 /* kgraphics.cpp in Sources */,
-				DFF95C600FB22D5700A3EC78 /* klists.cpp in Sources */,
-				DFF95C610FB22D5700A3EC78 /* kmath.cpp in Sources */,
-				DFF95C620FB22D5700A3EC78 /* kmenu.cpp in Sources */,
-				DFF95C630FB22D5700A3EC78 /* kmovement.cpp in Sources */,
-				DFF95C640FB22D5700A3EC78 /* kpathing.cpp in Sources */,
-				DFF95C650FB22D5700A3EC78 /* kscripts.cpp in Sources */,
-				DFF95C660FB22D5700A3EC78 /* ksound.cpp in Sources */,
-				DFF95C670FB22D5700A3EC78 /* kstring.cpp in Sources */,
-				DFF95C680FB22D5700A3EC78 /* message.cpp in Sources */,
-				DFF95C6A0FB22D5700A3EC78 /* savegame.cpp in Sources */,
-				DFF95C6C0FB22D5700A3EC78 /* scriptdebug.cpp in Sources */,
-				DFF95C6D0FB22D5700A3EC78 /* seg_manager.cpp in Sources */,
-				DFF95C6E0FB22D5700A3EC78 /* vm.cpp in Sources */,
-				DFF95C770FB22D5700A3EC78 /* sci.cpp in Sources */,
-				DFF95C880FB22D5700A3EC78 /* unzip.cpp in Sources */,
-				DFF95C890FB22D5700A3EC78 /* console.cpp in Sources */,
-				DFF95C8E0FB22D5700A3EC78 /* state.cpp in Sources */,
-				DFF95C910FB22D5700A3EC78 /* exec.cpp in Sources */,
-				DFF95C920FB22D5700A3EC78 /* timer_lol.cpp in Sources */,
-				DFF95C940FB22D5700A3EC78 /* sprites_lol.cpp in Sources */,
-				DFF95C950FB22D5700A3EC78 /* script.cpp in Sources */,
-				DFF95C990FB22D5700A3EC78 /* pn.cpp in Sources */,
-				DFF95C9A0FB22D5700A3EC78 /* script_pn.cpp in Sources */,
-				DFF95C9B0FB22D5700A3EC78 /* vga_pn.cpp in Sources */,
-				DFF95CA70FB22D5700A3EC78 /* sound_br.cpp in Sources */,
-				DFF95CA80FB22D5700A3EC78 /* sound_ns.cpp in Sources */,
-				DFF95CA90FB22D5700A3EC78 /* protracker.cpp in Sources */,
-				DFF95CAC0FB22D5700A3EC78 /* sound.cpp in Sources */,
-				DFF95CAE0FB22D5700A3EC78 /* batplayer.cpp in Sources */,
-				DFF95CAF0FB22D5700A3EC78 /* demoplayer.cpp in Sources */,
-				DFF95CB00FB22D5700A3EC78 /* scnplayer.cpp in Sources */,
-				DFF95CB10FB22D5700A3EC78 /* draw_fascin.cpp in Sources */,
-				DFF95CB30FB22D5700A3EC78 /* inter_fascin.cpp in Sources */,
-				DFF95CB40FB22D5700A3EC78 /* script_v3.cpp in Sources */,
-				DFF95CB50FB22D5700A3EC78 /* script_v4.cpp in Sources */,
-				DF6118400FE3A8080042AD3F /* kmisc.cpp in Sources */,
-				DF6118410FE3A8080042AD3F /* segment.cpp in Sources */,
-				DF61184F0FE3A8250042AD3F /* decompressor.cpp in Sources */,
-				DF6118500FE3A8250042AD3F /* resource.cpp in Sources */,
-				DF6118570FE3A8990042AD3F /* disk.cpp in Sources */,
-				DF6118A10FE3A9AA0042AD3F /* saveconverter.cpp in Sources */,
-				DF6118A20FE3A9AA0042AD3F /* saveconverter_v2.cpp in Sources */,
-				DF6118A30FE3A9AA0042AD3F /* saveconverter_v3.cpp in Sources */,
-				DF6118A40FE3A9AA0042AD3F /* saveconverter_v4.cpp in Sources */,
-				DF6118A60FE3A9AA0042AD3F /* savefile.cpp in Sources */,
-				DF6118A70FE3A9AA0042AD3F /* savehandler.cpp in Sources */,
-				DF6118A80FE3A9AA0042AD3F /* saveload.cpp in Sources */,
-				DF6118A90FE3A9AA0042AD3F /* saveload_v2.cpp in Sources */,
-				DF6118AA0FE3A9AA0042AD3F /* saveload_v3.cpp in Sources */,
-				DF6118AB0FE3A9AA0042AD3F /* saveload_v4.cpp in Sources */,
-				DF6118AC0FE3A9AA0042AD3F /* saveload_v6.cpp in Sources */,
-				DF6118B10FE3A9EA0042AD3F /* feeble.cpp in Sources */,
-				DF6118C00FE3AA280042AD3F /* saveload_lol.cpp in Sources */,
-				DF6118C10FE3AA280042AD3F /* sound_lol.cpp in Sources */,
-				DF6118C20FE3AA280042AD3F /* sound_pcspk.cpp in Sources */,
-				DF6118C30FE3AA280042AD3F /* text_lol.cpp in Sources */,
-				DF6118C90FE3AABD0042AD3F /* player_v2cms.cpp in Sources */,
-				DF7585D4100CB66E00CC3324 /* expression.cpp in Sources */,
-				DF7585D5100CB66E00CC3324 /* hotspots.cpp in Sources */,
-				DF7585D6100CB66E00CC3324 /* init_v6.cpp in Sources */,
-				DF7585D7100CB66E00CC3324 /* resources.cpp in Sources */,
-				DF7585D8100CB66E00CC3324 /* script.cpp in Sources */,
-				DF7585D9100CB66E00CC3324 /* totfile.cpp in Sources */,
-				DF7585ED100CB6EA00CC3324 /* sjis.cpp in Sources */,
-				DF7585F2100CB70600CC3324 /* saveload_playtoons.cpp in Sources */,
-				DF7585F8100CB75800CC3324 /* static_selectors.cpp in Sources */,
-				DF758619100CBA0200CC3324 /* osys_events.cpp in Sources */,
-				DF75861A100CBA0200CC3324 /* osys_main.cpp in Sources */,
-				DF75861B100CBA0200CC3324 /* osys_sound.cpp in Sources */,
-				DF75861C100CBA0200CC3324 /* osys_video.cpp in Sources */,
-				DF6BF4C410529DA50069811F /* conversion.cpp in Sources */,
-				DF6BF4C510529DA50069811F /* jpeg.cpp in Sources */,
-				DF6BF4D810529DE90069811F /* input_pn.cpp in Sources */,
-				DF6BF4D910529DE90069811F /* string_pn.cpp in Sources */,
-				DF6BF4DA10529DE90069811F /* verb_pn.cpp in Sources */,
-				DF6BF4E410529E260069811F /* sound_amiga.cpp in Sources */,
-				DF6BF4EA10529E6E0069811F /* init_v4.cpp in Sources */,
-				DF6BF4EB10529E6E0069811F /* inter_playtoons.cpp in Sources */,
-				DF6BF4F310529EE40069811F /* player_v4a.cpp in Sources */,
-				DF6BF4FC10529F140069811F /* EventDispatcher.cpp in Sources */,
-				DF6BF4FD10529F140069811F /* EventRecorder.cpp in Sources */,
-				DF90E9C110AEDA9B00C8F93F /* selector.cpp in Sources */,
-				DF90EAA510B0234300C8F93F /* draw_playtoons.cpp in Sources */,
-				DF90EAAE10B0236F00C8F93F /* staticres.cpp in Sources */,
-				DF2EC3FA10E64C0C00765801 /* dialogs.cpp in Sources */,
-				DF2EC40010E64C4300765801 /* animator_tim.cpp in Sources */,
-				DF2EC40710E64C8000765801 /* event.cpp in Sources */,
-				DF2EC50510E64D7C00765801 /* player_pce.cpp in Sources */,
-				DF2EC50610E64D7C00765801 /* player_sid.cpp in Sources */,
-				DF2EC50D10E64DB300765801 /* textconsole.cpp in Sources */,
-				DF45B21E116628A5009B85CC /* animate.cpp in Sources */,
-				DF45B21F116628A5009B85CC /* cache.cpp in Sources */,
-				DF45B220116628A5009B85CC /* compare.cpp in Sources */,
-				DF45B221116628A5009B85CC /* controls.cpp in Sources */,
-				DF45B222116628A5009B85CC /* coordadjuster.cpp in Sources */,
-				DF45B223116628A5009B85CC /* cursor.cpp in Sources */,
-				DF45B224116628A5009B85CC /* font.cpp in Sources */,
-				DF45B228116628A5009B85CC /* menu.cpp in Sources */,
-				DF45B229116628A5009B85CC /* paint.cpp in Sources */,
-				DF45B22A116628A5009B85CC /* paint16.cpp in Sources */,
-				DF45B22C116628A5009B85CC /* palette.cpp in Sources */,
-				DF45B22D116628A5009B85CC /* picture.cpp in Sources */,
-				DF45B22E116628A5009B85CC /* portrait.cpp in Sources */,
-				DF45B22F116628A5009B85CC /* ports.cpp in Sources */,
-				DF45B231116628A5009B85CC /* screen.cpp in Sources */,
-				DF45B232116628A5009B85CC /* text16.cpp in Sources */,
-				DF45B233116628A5009B85CC /* transitions.cpp in Sources */,
-				DF45B234116628A5009B85CC /* view.cpp in Sources */,
-				DF45B235116628A5009B85CC /* grammar.cpp in Sources */,
-				DF45B236116628A5009B85CC /* said.cpp in Sources */,
-				DF45B238116628A5009B85CC /* vocabulary.cpp in Sources */,
-				DF45B239116628A5009B85CC /* audio.cpp in Sources */,
-				DF45B23A116628A5009B85CC /* adlib.cpp in Sources */,
-				DF45B23C116628A5009B85CC /* fb01.cpp in Sources */,
-				DF45B23D116628A5009B85CC /* midi.cpp in Sources */,
-				DF45B23E116628A5009B85CC /* pcjr.cpp in Sources */,
-				DF45B243116628A5009B85CC /* midiparser_sci.cpp in Sources */,
-				DF45B244116628A5009B85CC /* music.cpp in Sources */,
-				DF45B245116628A5009B85CC /* soundcmd.cpp in Sources */,
-				DF45B246116628A5009B85CC /* seq_decoder.cpp in Sources */,
-				DFCDC6DD116629CE00A7D2A0 /* features.cpp in Sources */,
-				DFCDC6DE116629CE00A7D2A0 /* kparse.cpp in Sources */,
-				DFCDC6F911662AAB00A7D2A0 /* resource.cpp in Sources */,
-				DFCDC70611662B0200A7D2A0 /* saveload_fascin.cpp in Sources */,
-				DFCDC70D11662B6B00A7D2A0 /* macresman.cpp in Sources */,
-				DFEC5D101166C5CF00C90552 /* random.cpp in Sources */,
-				DFEC5D111166C5CF00C90552 /* tokenizer.cpp in Sources */,
-				DFEC5D361166C67300C90552 /* savestate.cpp in Sources */,
-				DF9B9248118E46730069C19D /* error.cpp in Sources */,
-				DF9B9252118E46A00069C19D /* fontsjis.cpp in Sources */,
-				DF9B9262118E46FE0069C19D /* error.cpp in Sources */,
-				DFB0577611B753DA0015AE65 /* rational.cpp in Sources */,
-				DFB0578011B7541F0015AE65 /* resource_audio.cpp in Sources */,
-				DFB0578111B7541F0015AE65 /* util.cpp in Sources */,
-				DFB0578A11B754570015AE65 /* maciconbar.cpp in Sources */,
-				DFB0579111B7547D0015AE65 /* pict.cpp in Sources */,
-				DF7F286111FF23D500159131 /* amigamac.cpp in Sources */,
-				DF7F286711FF23EF00159131 /* kvideo.cpp in Sources */,
-				DF7F286811FF23EF00159131 /* workarounds.cpp in Sources */,
-				DF7F287A11FF243B00159131 /* sound_2gs.cpp in Sources */,
-				DF7F287B11FF243B00159131 /* sound_coco3.cpp in Sources */,
-				DF7F287C11FF243B00159131 /* sound_midi.cpp in Sources */,
-				DF7F287D11FF243B00159131 /* sound_pcjr.cpp in Sources */,
-				DF7F287E11FF243B00159131 /* sound_sarien.cpp in Sources */,
-				DF7F288B11FF244F00159131 /* Tooltip.cpp in Sources */,
-				DF7F289311FF247300159131 /* translation.cpp in Sources */,
-				DF7F28A511FF24C400159131 /* console.cpp in Sources */,
-				DF895C05124C24680077F6E8 /* player_towns.cpp in Sources */,
-				DF895C27124C25150077F6E8 /* init_fascin.cpp in Sources */,
-				DF895C2C124C25350077F6E8 /* script_patches.cpp in Sources */,
-				DF0E303A1252C5BD0082D593 /* cms.cpp in Sources */,
-				8CB5A9C11253FD6900CB6BC7 /* m4_scene.cpp in Sources */,
-				8CB5A9C21253FD6900CB6BC7 /* mads_logic.cpp in Sources */,
-				8CB5A9C31253FD6900CB6BC7 /* mads_player.cpp in Sources */,
-				8CB5A9C41253FD6900CB6BC7 /* mads_scene.cpp in Sources */,
-				8CB5A9C51253FD6900CB6BC7 /* mads_views.cpp in Sources */,
-				8CD1ED0B126202AB00FA198C /* detection.cpp in Sources */,
-				8CD1ED0C126202AB00FA198C /* display.cpp in Sources */,
-				8CD1ED0E126202AB00FA198C /* file.cpp in Sources */,
-				8CD1ED0F126202AB00FA198C /* hugo.cpp in Sources */,
-				8CD1ED10126202AB00FA198C /* intro.cpp in Sources */,
-				8CD1ED11126202AB00FA198C /* inventory.cpp in Sources */,
-				8CD1ED14126202AB00FA198C /* mouse.cpp in Sources */,
-				8CD1ED15126202AB00FA198C /* parser.cpp in Sources */,
-				8CD1ED16126202AB00FA198C /* route.cpp in Sources */,
-				8CD1ED17126202AB00FA198C /* schedule.cpp in Sources */,
-				8CD1ED18126202AB00FA198C /* sound.cpp in Sources */,
-				8CD1ED19126202AB00FA198C /* util.cpp in Sources */,
-				8CD1ED1A126202AB00FA198C /* anim.cpp in Sources */,
-				8CD1ED1B126202AB00FA198C /* audio.cpp in Sources */,
-				8CD1ED1C126202AB00FA198C /* character.cpp in Sources */,
-				8CD1ED1D126202AB00FA198C /* conversation.cpp in Sources */,
-				8CD1ED1E126202AB00FA198C /* detection.cpp in Sources */,
-				8CD1ED1F126202AB00FA198C /* drew.cpp in Sources */,
-				8CD1ED20126202AB00FA198C /* flux.cpp in Sources */,
-				8CD1ED21126202AB00FA198C /* font.cpp in Sources */,
-				8CD1ED22126202AB00FA198C /* hotspot.cpp in Sources */,
-				8CD1ED25126202AB00FA198C /* movie.cpp in Sources */,
-				8CD1ED26126202AB00FA198C /* path.cpp in Sources */,
-				8CD1ED27126202AB00FA198C /* picture.cpp in Sources */,
-				8CD1ED28126202AB00FA198C /* resource.cpp in Sources */,
-				8CD1ED29126202AB00FA198C /* script.cpp in Sources */,
-				8CD1ED2A126202AB00FA198C /* script_func.cpp in Sources */,
-				8CD1ED2B126202AB00FA198C /* state.cpp in Sources */,
-				8CD1ED2C126202AB00FA198C /* text.cpp in Sources */,
-				8CD1ED2D126202AB00FA198C /* tools.cpp in Sources */,
-				8CD1ED2E126202AB00FA198C /* toon.cpp in Sources */,
-				8CD80C8B126271A9001C6C87 /* surface.cpp in Sources */,
-				8CD80C91126271BD001C6C87 /* gfx_towns.cpp in Sources */,
-				8CD80CE0126272A0001C6C87 /* actor.cpp in Sources */,
-				8CD80CE1126272A0001C6C87 /* animation.cpp in Sources */,
-				8CD80CE2126272A0001C6C87 /* callbacks.cpp in Sources */,
-				8CD80CE3126272A0001C6C87 /* console.cpp in Sources */,
-				8CD80CE4126272A0001C6C87 /* detection.cpp in Sources */,
-				8CD80CE5126272A0001C6C87 /* dialog.cpp in Sources */,
-				8CD80CE6126272A0001C6C87 /* font.cpp in Sources */,
-				8CD80CE7126272A0001C6C87 /* inventory.cpp in Sources */,
-				8CD80CE9126272A0001C6C87 /* music.cpp in Sources */,
-				8CD80CEA126272A0001C6C87 /* objects.cpp in Sources */,
-				8CD80CEB126272A0001C6C87 /* pack.cpp in Sources */,
-				8CD80CEC126272A0001C6C87 /* resources.cpp in Sources */,
-				8CD80CED126272A0001C6C87 /* scene.cpp in Sources */,
-				8CD80CEE126272A0001C6C87 /* segment.cpp in Sources */,
-				8CD80CEF126272A0001C6C87 /* surface.cpp in Sources */,
-				8CD80CF0126272A0001C6C87 /* surface_list.cpp in Sources */,
-				8CD80CF1126272A0001C6C87 /* teenagent.cpp in Sources */,
-				DF203F491380C06E0056300A /* gui-manager.cpp in Sources */,
-				DF203F731380C2750056300A /* avi_decoder.cpp in Sources */,
-				DF203F741380C2750056300A /* coktel_decoder.cpp in Sources */,
-				DF203F751380C2750056300A /* dxa_decoder.cpp in Sources */,
-				DF203F761380C2750056300A /* flic_decoder.cpp in Sources */,
-				DF203F781380C2750056300A /* qt_decoder.cpp in Sources */,
-				DF203F791380C2750056300A /* smk_decoder.cpp in Sources */,
-				DF203F7A1380C2750056300A /* video_decoder.cpp in Sources */,
-				DF203FAB1380C2920056300A /* cdtoons.cpp in Sources */,
-				DF203FAC1380C2920056300A /* cinepak.cpp in Sources */,
-				DF203FAD1380C2920056300A /* indeo3.cpp in Sources */,
-				DF203FAE1380C2920056300A /* mjpeg.cpp in Sources */,
-				DF203FAF1380C2920056300A /* msrle.cpp in Sources */,
-				DF203FB01380C2920056300A /* msvideo1.cpp in Sources */,
-				DF203FB21380C2920056300A /* qtrle.cpp in Sources */,
-				DF203FB31380C2920056300A /* rpza.cpp in Sources */,
-				DF203FB41380C2920056300A /* smc.cpp in Sources */,
-				DF203FB51380C2920056300A /* truemotion1.cpp in Sources */,
-				DF203FF71380C3BC0056300A /* console.cpp in Sources */,
-				DF203FF81380C3BC0056300A /* dialogs.cpp in Sources */,
-				DF203FF91380C3BC0056300A /* file_v1d.cpp in Sources */,
-				DF203FFA1380C3BC0056300A /* file_v1w.cpp in Sources */,
-				DF203FFB1380C3BC0056300A /* file_v2d.cpp in Sources */,
-				DF203FFC1380C3BC0056300A /* file_v2w.cpp in Sources */,
-				DF203FFD1380C3BC0056300A /* file_v3d.cpp in Sources */,
-				DF203FFE1380C3BC0056300A /* object_v1d.cpp in Sources */,
-				DF203FFF1380C3BC0056300A /* object_v1w.cpp in Sources */,
-				DF2040001380C3BC0056300A /* object_v2d.cpp in Sources */,
-				DF2040011380C3BC0056300A /* object_v3d.cpp in Sources */,
-				DF2040021380C3BC0056300A /* object.cpp in Sources */,
-				DF2040031380C3BC0056300A /* parser_v1d.cpp in Sources */,
-				DF2040041380C3BC0056300A /* parser_v1w.cpp in Sources */,
-				DF2040051380C3BC0056300A /* parser_v2d.cpp in Sources */,
-				DF2040061380C3BC0056300A /* parser_v3d.cpp in Sources */,
-				DF2040071380C3BC0056300A /* text.cpp in Sources */,
-				DF20403A1380C8B70056300A /* editable.cpp in Sources */,
-				DF20403B1380C8B70056300A /* edittext.cpp in Sources */,
-				DF20403C1380C8B70056300A /* list.cpp in Sources */,
-				DF20403D1380C8B70056300A /* popup.cpp in Sources */,
-				DF20403E1380C8B70056300A /* scrollbar.cpp in Sources */,
-				DF20403F1380C8B70056300A /* tab.cpp in Sources */,
-				DF2040761380CA230056300A /* audiostream.cpp in Sources */,
-				DF2040771380CA230056300A /* fmopl.cpp in Sources */,
-				DF2040781380CA230056300A /* mididrv.cpp in Sources */,
-				DF2040791380CA230056300A /* midiparser_smf.cpp in Sources */,
-				DF20407A1380CA230056300A /* midiparser_xmidi.cpp in Sources */,
-				DF20407B1380CA230056300A /* midiparser.cpp in Sources */,
-				DF20407C1380CA230056300A /* midiplayer.cpp in Sources */,
-				DF20407D1380CA230056300A /* mixer.cpp in Sources */,
-				DF20407E1380CA230056300A /* mpu401.cpp in Sources */,
-				DF20407F1380CA230056300A /* musicplugin.cpp in Sources */,
-				DF2040801380CA230056300A /* rate.cpp in Sources */,
-				DF2040811380CA230056300A /* timestamp.cpp in Sources */,
-				DF2040B01380CA400056300A /* adpcm.cpp in Sources */,
-				DF2040B11380CA400056300A /* aiff.cpp in Sources */,
-				DF2040B21380CA400056300A /* flac.cpp in Sources */,
-				DF2040B31380CA400056300A /* iff_sound.cpp in Sources */,
-				DF2040B41380CA400056300A /* mac_snd.cpp in Sources */,
-				DF2040B51380CA400056300A /* mp3.cpp in Sources */,
-				DF2040B61380CA400056300A /* raw.cpp in Sources */,
-				DF2040B71380CA400056300A /* vag.cpp in Sources */,
-				DF2040B81380CA400056300A /* voc.cpp in Sources */,
-				DF2040B91380CA400056300A /* vorbis.cpp in Sources */,
-				DF2040BA1380CA400056300A /* wave.cpp in Sources */,
-				DF2040DC1380CA810056300A /* infogrames.cpp in Sources */,
-				DF2040DD1380CA810056300A /* maxtrax.cpp in Sources */,
-				DF2040DE1380CA810056300A /* module.cpp in Sources */,
-				DF2040DF1380CA810056300A /* paula.cpp in Sources */,
-				DF2040E01380CA810056300A /* protracker.cpp in Sources */,
-				DF2040E11380CA810056300A /* rjp1.cpp in Sources */,
-				DF2040E21380CA810056300A /* soundfx.cpp in Sources */,
-				DF2040E31380CA810056300A /* tfmx.cpp in Sources */,
-				DF2041081380CAA40056300A /* adlib.cpp in Sources */,
-				DF2041091380CAA40056300A /* appleiigs.cpp in Sources */,
-				DF20410A1380CAA40056300A /* cms.cpp in Sources */,
-				DF20410B1380CAA40056300A /* eas.cpp in Sources */,
-				DF20410C1380CAA40056300A /* fluidsynth.cpp in Sources */,
-				DF20410D1380CAA40056300A /* mt32.cpp in Sources */,
-				DF20410E1380CAA40056300A /* pcspk.cpp in Sources */,
-				DF20410F1380CAA40056300A /* sid.cpp in Sources */,
-				DF2041101380CAA40056300A /* wave6581.cpp in Sources */,
-				DF46B6F51381E18900D08723 /* coroutine.cpp in Sources */,
-				DF46B7071381E1FF00D08723 /* towns_audio.cpp in Sources */,
-				DF46B7081381E1FF00D08723 /* towns_euphony.cpp in Sources */,
-				DF46B7091381E1FF00D08723 /* towns_pc98_driver.cpp in Sources */,
-				DF46B70A1381E1FF00D08723 /* towns_pc98_fmsynth.cpp in Sources */,
-				DF46B7251381E27000D08723 /* console.cpp in Sources */,
-				DF46B7261381E27000D08723 /* databases.cpp in Sources */,
-				DF46B7271381E27000D08723 /* dbase.cpp in Sources */,
-				DF46B7281381E27000D08723 /* iniconfig.cpp in Sources */,
-				DF46B7291381E27000D08723 /* init_v7.cpp in Sources */,
-				DF46B72A1381E27000D08723 /* inter_inca2.cpp in Sources */,
-				DF46B7461381E40500D08723 /* log.cpp in Sources */,
-				DF46B74B1381E40F00D08723 /* modular-backend.cpp in Sources */,
-				DF46B7561381E46700D08723 /* player_v2base.cpp in Sources */,
-				DF46B7601381E4A400D08723 /* console.cpp in Sources */,
-				DF46B7651381E4D400D08723 /* robot_decoder.cpp in Sources */,
-				DF46B7691381E4E400D08723 /* vm_types.cpp in Sources */,
-				DF46B7851381E54200D08723 /* dcl.cpp in Sources */,
-				DF46B7861381E54200D08723 /* iff_container.cpp in Sources */,
-				DF46B7871381E54200D08723 /* winexe_ne.cpp in Sources */,
-				DF46B7881381E54200D08723 /* winexe_pe.cpp in Sources */,
-				DF46B7891381E54200D08723 /* winexe.cpp in Sources */,
-				DF46B7971381E58000D08723 /* png.cpp in Sources */,
-				DF46B7981381E58000D08723 /* wincursor.cpp in Sources */,
-				DF46B7A11381E5B500D08723 /* winfont.cpp in Sources */,
-				DF46B7AB1381E5F100D08723 /* header.cpp in Sources */,
-				DF46B7B61381E67800D08723 /* sdl-mutex.cpp in Sources */,
-				DF46B7BF1381E6C000D08723 /* object.cpp in Sources */,
-				DF46B7CA1381E72500D08723 /* console.cpp in Sources */,
-				DF46B7D81381E7C600D08723 /* console.cpp in Sources */,
-				DF46B83E1381F13500D08723 /* saveload_v7.cpp in Sources */,
-				DF46B8461381F35500D08723 /* saveload_inca2.cpp in Sources */,
-				DF46B84A1381F38700D08723 /* inter_v7.cpp in Sources */,
-				DF46B84F1381F39E00D08723 /* console.cpp in Sources */,
-				DF46B8541381F3B400D08723 /* console.cpp in Sources */,
-				DF46B8661381F44E00D08723 /* dbopl.cpp in Sources */,
-				DF46B8671381F44E00D08723 /* dosbox.cpp in Sources */,
-				DF46B8681381F44E00D08723 /* mame.cpp in Sources */,
-				DF46B8731381F4A200D08723 /* sdl-audiocd.cpp in Sources */,
-				DF46B87F1381F4F200D08723 /* default-audiocd.cpp in Sources */,
-				DF46B88B1381F5D800D08723 /* sdl-provider.cpp in Sources */,
-				DF46B8941381F62B00D08723 /* adpcm.cpp in Sources */,
-				DF46B89D1381F6C400D08723 /* null.cpp in Sources */,
-				DFADEBB513820DF500C46364 /* maccursor.cpp in Sources */,
-				DFADEBB913820E0C00C46364 /* posix-fs.cpp in Sources */,
-				F92B4DD0139DD428000D1BF1 /* quicktime.cpp in Sources */,
-				F92B4DD5139DD449000D1BF1 /* yuv_to_rgb.cpp in Sources */,
-				F9946D9F139E1A560072D195 /* towns_midi.cpp in Sources */,
-				F9946DA2139E1A560072D195 /* towns_pc98_plugins.cpp in Sources */,
-				F9946DB7139E1A880072D195 /* freeverb.cpp in Sources */,
-				F9946DBA139E1A880072D195 /* i386.cpp in Sources */,
-				F9946DBD139E1A880072D195 /* mt32_file.cpp in Sources */,
-				F9946DC0139E1A880072D195 /* part.cpp in Sources */,
-				F9946DC3139E1A880072D195 /* partial.cpp in Sources */,
-				F9946DC6139E1A880072D195 /* partialManager.cpp in Sources */,
-				F9946DC9139E1A880072D195 /* synth.cpp in Sources */,
-				F9946DCC139E1A880072D195 /* tables.cpp in Sources */,
-				F9946DD8139E1AD30072D195 /* aac.cpp in Sources */,
-				F9946DDB139E1AD30072D195 /* qdm2.cpp in Sources */,
-				F9946DDE139E1AD30072D195 /* quicktime.cpp in Sources */,
-				F9946DE5139E1B180072D195 /* posix-main.cpp in Sources */,
-				F9946DE8139E1B180072D195 /* posix.cpp in Sources */,
-				F9946DEE139E1B6F0072D195 /* downscaler.cpp in Sources */,
-				F9946DF3139E1BA00072D195 /* console.cpp in Sources */,
-				F9946DF9139E1BBF0072D195 /* sdl-mixer.cpp in Sources */,
-				F9946E00139E1BEB0072D195 /* doublebuffersdl-mixer.cpp in Sources */,
-				F9946E06139E1C3A0072D195 /* sdl-graphics.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		1D6058940D05DD3E006BFB54 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COMPRESS_PNG_FILES = NO;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
-				);
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IPHONE_OFFICIAL,
-					IPHONE,
-					POSIX,
-					ENABLE_SCUMM,
-					ENABLE_SCUMM_7_8,
-					ENABLE_HE,
-					ENABLE_AGI,
-					ENABLE_AGOS,
-					ENABLE_CINE,
-					ENABLE_CRUISE,
-					ENABLE_DRASCULA,
-					ENABLE_GOB,
-					ENABLE_GROOVIE,
-					ENABLE_IGOR,
-					ENABLE_KYRA,
-					ENABLE_LURE,
-					ENABLE_MADE,
-					ENABLE_PARALLACTION,
-					ENABLE_QUEEN,
-					ENABLE_SAGA,
-					ENABLE_IHNM,
-					ENABLE_SCI,
-					ENABLE_SKY,
-					ENABLE_SWORD1,
-					ENABLE_SWORD2,
-					ENABLE_TEENAGENT,
-					ENABLE_TINSEL,
-					ENABLE_TOUCHE,
-					ENABLE_TUCKER,
-					USE_FLAC,
-					USE_MAD,
-					USE_TREMOR,
-					USE_VORBIS,
-					USE_ZLIB,
-					USE_TREMOR,
-					USE_TRANSLATION,
-				);
-				GCC_THUMB_SUPPORT = NO;
-				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = (
-					../../engines/,
-					../../,
-					include/,
-				);
-				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/lib\"",
-				);
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "armv6 armv7";
-			};
-			name = Debug;
-		};
-		1D6058950D05DD3E006BFB54 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COMPRESS_PNG_FILES = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
-				);
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IPHONE_OFFICIAL,
-					IPHONE,
-					POSIX,
-					ENABLE_SCUMM,
-					ENABLE_SCUMM_7_8,
-					ENABLE_HE,
-					ENABLE_AGI,
-					ENABLE_AGOS,
-					ENABLE_CINE,
-					ENABLE_CRUISE,
-					ENABLE_DRASCULA,
-					ENABLE_GOB,
-					ENABLE_GROOVIE,
-					ENABLE_IGOR,
-					ENABLE_KYRA,
-					ENABLE_LURE,
-					ENABLE_MADE,
-					ENABLE_PARALLACTION,
-					ENABLE_QUEEN,
-					ENABLE_SAGA,
-					ENABLE_IHNM,
-					ENABLE_SCI,
-					ENABLE_SKY,
-					ENABLE_SWORD1,
-					ENABLE_SWORD2,
-					ENABLE_TEENAGENT,
-					ENABLE_TINSEL,
-					ENABLE_TOUCHE,
-					ENABLE_TUCKER,
-					USE_FLAC,
-					USE_MAD,
-					USE_TREMOR,
-					USE_VORBIS,
-					USE_ZLIB,
-					USE_TREMOR,
-					USE_TRANSLATION,
-				);
-				GCC_THUMB_SUPPORT = NO;
-				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = (
-					../../engines/,
-					../../,
-					include/,
-				);
-				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/lib\"",
-				);
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "armv6 armv7";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				CODE_SIGN_IDENTITY = "Don't Code Sign";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_CPP_RTTI = NO;
-				GCC_INPUT_FILETYPE = automatic;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "";
-				GCC_THUMB_SUPPORT = NO;
-				GCC_USE_GCC3_PFE_SUPPORT = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../engines/,
-					../../,
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = "";
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "-lz";
-				PREBINDING = NO;
-				SDKROOT = "";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7";
-				WARNING_CFLAGS = "-Wno-multichar";
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				CODE_SIGN_IDENTITY = "Don't Code Sign";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_CPP_RTTI = NO;
-				GCC_ENABLE_EXCEPTIONS = NO;
-				GCC_INPUT_FILETYPE = automatic;
-				GCC_PREPROCESSOR_DEFINITIONS = "";
-				GCC_THUMB_SUPPORT = NO;
-				GCC_USE_GCC3_PFE_SUPPORT = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../engines/,
-					../../,
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = "";
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
-				SDKROOT = "";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "i386 ppc ppc64 x86_64 armv6 armv7";
-				WARNING_CFLAGS = "-Wno-multichar";
-			};
-			name = Release;
-		};
-		DF0942280F63CB26002D821E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COMPRESS_PNG_FILES = NO;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					MACOSX,
-					SDL_BACKEND,
-					POSIX,
-					ENABLE_SCUMM,
-					ENABLE_SCUMM_7_8,
-					ENABLE_HE,
-					ENABLE_AGI,
-					ENABLE_AGOS,
-					ENABLE_CINE,
-					ENABLE_CRUISE,
-					ENABLE_DRASCULA,
-					ENABLE_GOB,
-					ENABLE_GROOVIE,
-					ENABLE_IGOR,
-					ENABLE_KYRA,
-					ENABLE_LURE,
-					ENABLE_MADE,
-					ENABLE_PARALLACTION,
-					ENABLE_QUEEN,
-					ENABLE_SAGA,
-					ENABLE_IHNM,
-					ENABLE_SCI,
-					ENABLE_SKY,
-					ENABLE_SWORD1,
-					ENABLE_SWORD2,
-					ENABLE_TEENAGENT,
-					ENABLE_TINSEL,
-					ENABLE_TOUCHE,
-					ENABLE_TUCKER,
-					USE_FLAC,
-					USE_MAD,
-					USE_VORBIS,
-					USE_ZLIB,
-					USE_TRANSLATION,
-				);
-				GCC_VERSION = "";
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include/SDL,
-					/opt/local/include,
-					/sw/include/SDL,
-					/sw/include,
-					../../engines/,
-					../../,
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/../macosx/Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					/sw/lib,
-					/opt/local/lib,
-					"$(inherited)",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lSDLmain",
-					"-logg",
-					"-lvorbisfile",
-					"-lvorbis",
-					"-lmad",
-					"-lFLAC",
-					"-lSDL",
-					"-lz",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				SDKROOT = "";
-				VALID_ARCHS = "i386 ppc ppc64 x86_64";
-				WARNING_CFLAGS = "-Wno-multichar";
-			};
-			name = Debug;
-		};
-		DF0942290F63CB26002D821E /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COMPRESS_PNG_FILES = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					MACOSX,
-					SDL_BACKEND,
-					POSIX,
-					ENABLE_SCUMM,
-					ENABLE_SCUMM_7_8,
-					ENABLE_HE,
-					ENABLE_AGI,
-					ENABLE_AGOS,
-					ENABLE_CINE,
-					ENABLE_CRUISE,
-					ENABLE_DRASCULA,
-					ENABLE_GOB,
-					ENABLE_GROOVIE,
-					ENABLE_IGOR,
-					ENABLE_KYRA,
-					ENABLE_LURE,
-					ENABLE_MADE,
-					ENABLE_PARALLACTION,
-					ENABLE_QUEEN,
-					ENABLE_SAGA,
-					ENABLE_IHNM,
-					ENABLE_SCI,
-					ENABLE_SKY,
-					ENABLE_SWORD1,
-					ENABLE_SWORD2,
-					ENABLE_TEENAGENT,
-					ENABLE_TINSEL,
-					ENABLE_TOUCHE,
-					ENABLE_TUCKER,
-					USE_FLAC,
-					USE_MAD,
-					USE_VORBIS,
-					USE_ZLIB,
-					USE_TRANSLATION,
-				);
-				GCC_VERSION = "";
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include/SDL,
-					/opt/local/include,
-					/sw/include/SDL,
-					/sw/include,
-					../../engines/,
-					../../,
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/../macosx/Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					/sw/lib,
-					/opt/local/lib,
-					"$(inherited)",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lSDLmain",
-					"-logg",
-					"-lvorbisfile",
-					"-lvorbis",
-					"-lmad",
-					"-lFLAC",
-					"-lSDL",
-					"-lz",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				SDKROOT = "";
-				VALID_ARCHS = "i386 ppc ppc64 x86_64";
-				WARNING_CFLAGS = "-Wno-multichar";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-		DFF95CC80FB22D5700A3EC78 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COMPRESS_PNG_FILES = NO;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_THUMB_SUPPORT = NO;
-				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include/SDL,
-					/opt/local/include,
-					/sw/include/SDL,
-					/sw/include,
-					../../engines/,
-					../../,
-				);
-				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					/sw/lib,
-					/opt/local/lib,
-					"$(inherited)",
-				);
-				ONLY_ACTIVE_ARCH = NO;
-				OTHER_LDFLAGS = (
-					"-lSDLmain",
-					"-logg",
-					"-lvorbisfile",
-					"-lvorbis",
-					"-lmad",
-					"-lFLAC",
-					"-lSDL",
-					"-lz",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos;
-				VALID_ARCHS = "i386 x86_64";
-			};
-			name = Debug;
-		};
-		DFF95CC90FB22D5700A3EC78 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COMPRESS_PNG_FILES = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_THUMB_SUPPORT = NO;
-				GCC_UNROLL_LOOPS = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include/SDL,
-					/opt/local/include,
-					/sw/include/SDL,
-					/sw/include,
-					../../engines/,
-					../../,
-				);
-				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					/sw/lib,
-					/opt/local/lib,
-					"$(inherited)",
-				);
-				ONLY_ACTIVE_ARCH = NO;
-				OTHER_LDFLAGS = (
-					"-lSDLmain",
-					"-logg",
-					"-lvorbisfile",
-					"-lvorbis",
-					"-lmad",
-					"-lFLAC",
-					"-lSDL",
-					"-lz",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ScummVM;
-				PROVISIONING_PROFILE = "EF590570-5FAC-4346-9071-D609DE2B28D8";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos;
-				VALID_ARCHS = "i386 x86_64";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "ScummVM-iPhone" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1D6058940D05DD3E006BFB54 /* Debug */,
-				1D6058950D05DD3E006BFB54 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "scummvm" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		DF0942270F63CB26002D821E /* Build configuration list for PBXNativeTarget "ScummVM-OS X" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DF0942280F63CB26002D821E /* Debug */,
-				DF0942290F63CB26002D821E /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		DFF95CC70FB22D5700A3EC78 /* Build configuration list for PBXNativeTarget "ScummVM-Simulator" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DFF95CC80FB22D5700A3EC78 /* Debug */,
-				DFF95CC90FB22D5700A3EC78 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
-- 
cgit v1.2.3


From 6f56d4e9552fa5bee9a36a33905c692effa6ff5c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 01:31:33 +0100
Subject: IPHONE: Remove readme file about XCode project generation.

This is not supported right now and thus confusing to users.
---
 dists/iphone/readme.txt | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 dists/iphone/readme.txt

diff --git a/dists/iphone/readme.txt b/dists/iphone/readme.txt
deleted file mode 100644
index b115ed335c..0000000000
--- a/dists/iphone/readme.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The Xcode project files can now be created automatically from the GCC
-files using the create_project tool inside the /tools/create_project folder.
-
-To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_xcode.bat file for a default build. You can
-run create_project.exe with no parameters to check the possible command-line
-options.
-- 
cgit v1.2.3


From 606e303f7699bcc68fe349baa5689d16160c9682 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 01:32:51 +0100
Subject: DEVTOOLS: Update codeblocks readme.txt to "new" dir structure.

---
 dists/codeblocks/readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dists/codeblocks/readme.txt b/dists/codeblocks/readme.txt
index b0456aee13..1be60262c6 100644
--- a/dists/codeblocks/readme.txt
+++ b/dists/codeblocks/readme.txt
@@ -1,5 +1,5 @@
 The Code::Blocks project files can now be created automatically from the GCC
-files using the create_project tool inside the /tools/create_project folder.
+files using the create_project tool inside the /devtools/create_project folder.
 
 To create the default project files, build create_project.exe, copy it inside
 this folder and run the create_codeblocks.bat file for a default build. You can
-- 
cgit v1.2.3


From 4119ed73ddf309d574fae471ffe074222a998a99 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 01:37:51 +0100
Subject: BUILD: Update ideprojects target to generate MSVC12 project files.

---
 ports.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports.mk b/ports.mk
index fdab7e23af..e2696305e4 100644
--- a/ports.mk
+++ b/ports.mk
@@ -324,6 +324,8 @@ endif
 	@cd $(srcdir)/dists/msvc10 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 10 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props
 	@echo Creating MSVC11 project files...
 	@cd $(srcdir)/dists/msvc11 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 11 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props
+	@echo Creating MSVC12 project files...
+	@cd $(srcdir)/dists/msvc12 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 12 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props
 	@echo
 	@echo All is done.
 	@echo Now run
-- 
cgit v1.2.3


From b66aaeb90564847d3e3bd9d3167d220096798eee Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 01:39:48 +0100
Subject: BUILD: Output working command line for git commit in ideprojects
 target.

---
 ports.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports.mk b/ports.mk
index e2696305e4..398a0c4b5a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -329,7 +329,7 @@ endif
 	@echo
 	@echo All is done.
 	@echo Now run
-	@echo "\tgit commit 'DISTS: Generated Code::Blocks and MSVC project files'"
+	@echo "\tgit commit -m 'DISTS: Generated Code::Blocks and MSVC project files'"
 
 # Mark special targets as phony
 .PHONY: deb bundle osxsnap win32dist install uninstall
-- 
cgit v1.2.3


From 0780ec95c2a035d122e2afba1beb2143033943a6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Mar 2015 20:43:57 -0500
Subject: MADS: Fix Herman animating too quickly

---
 engines/mads/animation.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 469d42cc1b..7e616bffbc 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -598,8 +598,6 @@ void Animation::setCurrentFrame(int frameNumber) {
 	_currentFrame = frameNumber;
 	_oldFrameEntry = 0;
 	_freeFlag = false;
-
-	_nextScrollTimer = _nextFrameTimer = _vm->_game->_scene._frameStartTime;
 }
 
 void Animation::setNextFrameTimer(int frameNumber) {
-- 
cgit v1.2.3


From 16ced34bc2a21c99f775103008da0f1caf99e26d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Mar 2015 20:54:35 -0500
Subject: MADS: Fix assert when there are more than 5 talk options available

---
 engines/mads/user_interface.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 929390a073..a53ab31968 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -843,10 +843,11 @@ void UserInterface::emptyConversationList() {
 }
 
 void UserInterface::addConversationMessage(int vocabId, const Common::String &msg) {
-	assert(_talkStrings.size() < 5);
-
-	_talkStrings.push_back(msg);
-	_talkIds.push_back(vocabId);
+	// Only allow a maximum of 5 talk entries to be displayed
+	if (_talkStrings.size() < 5) {
+		_talkStrings.push_back(msg);
+		_talkIds.push_back(vocabId);
+	}
 }
 
 void UserInterface::loadInventoryAnim(int objectId) {
-- 
cgit v1.2.3


From 51797d1438e1e0e34e5878e9b6e759870d7b016d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Mar 2015 21:30:04 -0500
Subject: MADS: Fix gender scanning animation in car

---
 engines/mads/nebular/nebular_scenes5.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index fe15fe0636..63b03bc097 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -800,7 +800,7 @@ void Scene504::actions() {
 
 		case 1: {
 			int syncIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 13);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 6);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
-- 
cgit v1.2.3


From ce4c030117ece5f9c0d0384556f82125b2a5ed29 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Mar 2015 21:51:01 -0500
Subject: MADS: Fix animations for opening car door at various car locations

---
 engines/mads/nebular/nebular_scenes5.cpp | 4 ++--
 engines/mads/nebular/nebular_scenes6.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 63b03bc097..b657a61c2f 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2024,7 +2024,7 @@ void Scene511::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -2588,7 +2588,7 @@ void Scene513::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index b0777c13c3..cb36064458 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -908,7 +908,7 @@ void Scene604::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -1397,7 +1397,7 @@ void Scene607::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
-- 
cgit v1.2.3


From 53cd90b32c7ad6fe7e1ac5f4c781c5e776bd9348 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 5 Mar 2015 07:28:40 +0100
Subject: ZVISION: Fix GCC signed/unsigned warning

---
 engines/zvision/video/rlf_decoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 3e11a70f27..3bbf22edff 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -159,7 +159,7 @@ RLFDecoder::RLFVideoTrack::Frame RLFDecoder::RLFVideoTrack::readNextFrame() {
 
 bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) {
 	uint frame = getFrameAtTime(time);
-	assert(frame < (int)_frameCount);
+	assert(frame < _frameCount);
 
 	if ((uint)_displayedFrame == frame)
 		return true;
-- 
cgit v1.2.3


From bb175b39c1aa9f6b03431bc2e89817ec138f91c3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 5 Mar 2015 07:40:47 -0500
Subject: MADS: Fix screwed up death animation when getting eaten in village
 stream

---
 engines/mads/player.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index a257cea264..68e0355df9 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -785,8 +785,10 @@ void Player::removePlayerSprites() {
 	int heroSpriteId = _spritesStart;
 	for (int i = 0; i < 8; i++) {
 		if (_spriteSetsPresent[i]) {
-			scene._sprites.remove(heroSpriteId++);
+			delete scene._sprites[heroSpriteId];
+			scene._sprites[heroSpriteId] = nullptr;
 			_spriteSetsPresent[i] = false;
+			++heroSpriteId;
 		}
 	}
 
-- 
cgit v1.2.3


From b84d2e8d73c18c427ef1527b2b066642cfc981c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 5 Mar 2015 07:49:00 -0500
Subject: MADS: Fix timer initialization in two scenes

---
 engines/mads/nebular/nebular_scenes2.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index b8629a3915..2eb7f93a60 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1152,8 +1152,9 @@ void Scene205::setup() {
 }
 
 Scene205::Scene205(MADSEngine *vm) : Scene2xx(vm) {
-	_lastFishTime = 0;
-	_chickenTime = 0;
+	_lastFishTime = _scene->_frameStartTime;
+	_chickenTime = _scene->_frameStartTime;
+
 	_beingKicked = false;
 	_kernelMessage = -1;
 }
@@ -1161,8 +1162,6 @@ Scene205::Scene205(MADSEngine *vm) : Scene2xx(vm) {
 void Scene205::synchronize(Common::Serializer &s) {
 	Scene2xx::synchronize(s);
 
-	s.syncAsUint32LE(_lastFishTime);
-	s.syncAsUint32LE(_chickenTime);
 	s.syncAsByte(_beingKicked);
 	s.syncAsSint16LE(_kernelMessage);
 }
@@ -1191,7 +1190,6 @@ void Scene205::enter() {
 	_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 11);
 
 	if (!_game._visitedScenes._sceneRevisited) {
-		_lastFishTime = _scene->_frameStartTime;
 		_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 7, 1, 0, 0);
 		idx = _scene->_dynamicHotspots.add(269, 13, _globals._sequenceIndexes[6], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(49, 86), FACING_NORTH);
@@ -1455,7 +1453,6 @@ Scene207::Scene207(MADSEngine *vm) : Scene2xx(vm) {
 
 void Scene207::synchronize(Common::Serializer &s) {
 	Scene2xx::synchronize(s);
-	uint32 unused;
 
 	s.syncAsByte(_vultureFl);
 	s.syncAsByte(_spiderFl);
@@ -1463,8 +1460,6 @@ void Scene207::synchronize(Common::Serializer &s) {
 
 	s.syncAsSint32LE(_spiderHotspotId);
 	s.syncAsSint32LE(_vultureHotspotId);
-	s.syncAsSint32LE(unused);
-	s.syncAsSint32LE(unused);
 }
 
 void Scene207::setup() {
-- 
cgit v1.2.3


From 5936f7c9d1faef575584cff69ca6263d82a9d773 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 5 Mar 2015 08:02:54 -0500
Subject: MACOSX: Fix compilation

Broken by 3f22c12
---
 backends/platform/sdl/macosx/macosx.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index fa9f3ad16c..38a2d7441c 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -104,8 +104,6 @@ void OSystem_MacOSX::addSysArchivesToSearchSet(Common::SearchSet &s, int priorit
 	}
 }
 
-}
-
 bool OSystem_MacOSX::hasFeature(Feature f) {
 	if (f == kFeatureDisplayLogFile)
 		return true;
-- 
cgit v1.2.3


From f501e91ed1490fde5227015dc02fbe6c0cee2b5f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 5 Mar 2015 09:12:20 -0500
Subject: MADS: Fix crash after throwing both bones to dog

---
 engines/mads/sprites.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index f74edafc93..aa73fce712 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -406,7 +406,7 @@ void SpriteSets::remove(int idx) {
 			} while (size() > 0 && (*this)[size() - 1] == nullptr);
 		}
 
-		if (_assetCount > 0)
+		if (idx < 50 && _assetCount > 0)
 			--_assetCount;
 	}
 }
-- 
cgit v1.2.3


From 3fae9f17dacaa4f8253c2f6b47adb9845cdb52b0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 5 Mar 2015 12:16:24 -0500
Subject: MADS: Show a warning if sound code reads beyond end of sound data
 blocks

---
 engines/mads/nebular/sound_nebular.cpp | 24 ++++++++++++++++++++++++
 engines/mads/nebular/sound_nebular.h   | 20 ++++++++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 0a054440b2..d41d0075eb 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -36,6 +36,7 @@ namespace Nebular {
 bool AdlibChannel::_channelsEnabled;
 
 AdlibChannel::AdlibChannel() {
+	_owner = nullptr;
 	_activeCount = 0;
 	_field1 = 0;
 	_field2 = 0;
@@ -55,6 +56,7 @@ AdlibChannel::AdlibChannel() {
 	_pSrc = nullptr;
 	_ptr3 = nullptr;
 	_ptr4 = nullptr;
+	_ptrEnd = nullptr;
 	_field17 = 0;
 	_field19 = 0;
 	_soundData = nullptr;
@@ -108,6 +110,9 @@ void AdlibChannel::load(byte *pData) {
 	_fieldB = 0;
 	_field17 = 0;
 	_field19 = 0;
+
+	CachedDataEntry &cacheEntry = _owner->getCachedData(pData);
+	_ptrEnd = cacheEntry._dataEnd;
 }
 
 void AdlibChannel::check(byte *nullPtr) {
@@ -192,6 +197,9 @@ ASound::ASound(Audio::Mixer *mixer, FM_OPL *opl, const Common::String &filename,
 		_channelData[i]._freqBase = 0;
 		_channelData[i]._field6 = 0;
 	}
+	
+	for (int i = 0; i < ADLIB_CHANNEL_COUNT; ++i)
+		_channels[i]._owner = this;
 
 	AdlibChannel::_channelsEnabled = false;
 
@@ -283,6 +291,17 @@ void ASound::noise() {
 	}
 }
 
+CachedDataEntry &ASound::getCachedData(byte *pData) {
+	Common::List<CachedDataEntry>::iterator i;
+	for (i = _dataCache.begin(); i != _dataCache.end(); ++i) {
+		CachedDataEntry &e = *i;
+		if (e._data == pData)
+			return e;
+	}
+
+	error("Could not find previously loaded data");
+}
+
 void ASound::write(int reg, int val) {
 	_queue.push(RegisterValue(reg, val));
 }
@@ -331,6 +350,7 @@ byte *ASound::loadData(int offset, int size) {
 	CachedDataEntry rec;
 	rec._offset = offset;
 	rec._data = new byte[size];
+	rec._dataEnd = rec._data + size - 1;
 	_soundFile.seek(_dataOffset + offset);
 	_soundFile.read(rec._data, size);
 	_dataCache.push_back(rec);
@@ -449,6 +469,10 @@ void ASound::pollActiveChannel() {
 					warning("pollActiveChannel(): No data found for sound channel");
 					break;
 				}
+				if (pSrc > chan->_ptrEnd) {
+					warning("Read beyond end of loaded sound data");
+				}
+
 				if (!(*pSrc & 0x80) || (*pSrc <= 0xF0)) {
 					if (updateFlag)
 						updateActiveChannel();
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index ccfd40ad52..cfacb211a4 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -37,11 +37,15 @@ class SoundManager;
 
 namespace Nebular {
 
+class ASound;
+
 /**
  * Represents the data for a channel on the Adlib
  */
 class AdlibChannel {
 public:
+	ASound *_owner;
+
 	int _activeCount;
 	int _field1;
 	int _field2;
@@ -61,6 +65,7 @@ public:
 	byte *_pSrc;
 	byte *_ptr3;
 	byte *_ptr4;
+	byte *_ptrEnd;
 	int _field17;
 	int _field19;
 	byte *_soundData;
@@ -128,15 +133,17 @@ struct RegisterValue {
 #define ADLIB_CHANNEL_MIDWAY 5
 #define CALLBACKS_PER_SECOND 60
 
+struct CachedDataEntry {
+	int _offset;
+	byte *_data;
+	byte *_dataEnd;
+};
+
 /**
  * Base class for the sound player resource files
  */
 class ASound : public Audio::AudioStream {
 private:
-	struct CachedDataEntry {
-		int _offset;
-		byte *_data;
-	};
 	Common::List<CachedDataEntry> _dataCache;
 	uint16 _randomSeed;
 
@@ -350,6 +357,11 @@ public:
 	 */
 	int getFrameCounter() { return _frameCounter; }
 
+	/**
+	 * Return the cached data block record for previously loaded sound data
+	 */
+	CachedDataEntry &getCachedData(byte *pData);
+
 	// AudioStream interface
 	/**
 	 * Main buffer read
-- 
cgit v1.2.3


From c0fafcf33f374fdf85590108835585a0411a0661 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 5 Mar 2015 12:24:25 -0500
Subject: MADS: Fix mismatched delete/free releasing screen surface

---
 engines/mads/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 60f3d8aeaf..8db034c467 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -569,7 +569,7 @@ void ScreenSurface::init() {
 }
 
 ScreenSurface::~ScreenSurface() {
-	delete[] _surfacePixels;
+	::free(_surfacePixels);
 }
 
 void ScreenSurface::copyRectToScreen(const Common::Rect &bounds) {
-- 
cgit v1.2.3


From 26fb7b2c8fa184d02bf9bfc97ec7281dd8fa7cfd Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 18:08:17 +0100
Subject: SDL: Remove TEXTINPUT events we associate with KEYDOWN.

---
 backends/events/sdl/sdl-events.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 18fe5453f8..a9f94d9fa9 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -850,10 +850,19 @@ uint32 SdlEventSource::obtainUnicode(const SDL_keysym keySym) {
 	int n = SDL_PeepEvents(events, 2, SDL_PEEKEVENT, SDL_KEYDOWN, SDL_TEXTINPUT);
 	// Make sure that the TEXTINPUT event belongs to this KEYDOWN
 	// event and not another pending one.
-	if (n > 0 && events[0].type == SDL_TEXTINPUT) {
-		return convUTF8ToUTF32(events[0].text.text);
-	} else if (n > 1 && events[0].type != SDL_KEYDOWN && events[1].type == SDL_TEXTINPUT) {
-		return convUTF8ToUTF32(events[1].text.text);
+	if ((n > 0 && events[0].type == SDL_TEXTINPUT)
+	    || (n > 1 && events[0].type != SDL_KEYDOWN && events[1].type == SDL_TEXTINPUT)) {
+		// Remove the text input event we associate with the key press. This
+		// makes sure we never get any SDL_TEXTINPUT events which do "belong"
+		// to SDL_KEYDOWN events.
+		n = SDL_PeepEvents(events, 1, SDL_GETEVENT, SDL_TEXTINPUT, SDL_TEXTINPUT);
+		// This is basically a paranoia safety check because we know there
+		// must be a text input event in the queue.
+		if (n > 0) {
+			return convUTF8ToUTF32(events[0].text.text);
+		} else {
+			return 0;
+		}
 	} else {
 		return 0;
 	}
-- 
cgit v1.2.3


From c4317a8da14180d60822b9e5c762c8807cec49de Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 Mar 2015 18:31:06 +0100
Subject: SDL: Fake key events for unassociated TEXTINPUT events.

---
 backends/events/sdl/sdl-events.cpp | 79 +++++++++++++++++++++++++++-----------
 backends/events/sdl/sdl-events.h   | 13 +++++++
 2 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index a9f94d9fa9..1e5119dbec 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -49,8 +49,33 @@
 #define JOY_BUT_SPACE 4
 #define JOY_BUT_F5 5
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+static uint32 convUTF8ToUTF32(const char *src) {
+	uint32 utf32 = 0;
+
+	char *dst = SDL_iconv_string(
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+	                             "UTF-32BE",
+#else
+	                             "UTF-32LE",
+#endif
+                                 "UTF-8", src, SDL_strlen(src) + 1);
+
+	if (dst) {
+		utf32 = *((uint32 *)dst);
+		SDL_free(dst);
+	}
+
+	return utf32;
+}
+#endif
+
 SdlEventSource::SdlEventSource()
-    : EventSource(), _scrollLock(false), _joystick(0), _lastScreenID(0), _graphicsManager(0) {
+    : EventSource(), _scrollLock(false), _joystick(0), _lastScreenID(0), _graphicsManager(0)
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+      , _queuedFakeKeyUp(false), _fakeKeyUp()
+#endif
+      {
 	// Reset mouse state
 	memset(&_km, 0, sizeof(_km));
 
@@ -364,6 +389,16 @@ Common::KeyCode SdlEventSource::SDLToOSystemKeycode(const SDLKey key) {
 bool SdlEventSource::pollEvent(Common::Event &event) {
 	handleKbdMouse();
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	// In case we still need to send a key up event for a key down from a
+	// TEXTINPUT event we do this immediately.
+	if (_queuedFakeKeyUp) {
+		event = _fakeKeyUp;
+		_queuedFakeKeyUp = false;
+		return true;
+	}
+#endif
+
 	// If the screen changed, send an Common::EVENT_SCREEN_CHANGED
 	int screenID = ((OSystem_SDL *)g_system)->getGraphicsManager()->getScreenChangeID();
 	if (screenID != _lastScreenID) {
@@ -424,6 +459,27 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) {
 		}
 		}
 
+	case SDL_TEXTINPUT: {
+		// When we get a TEXTINPUT event it means we got some user input for
+		// which no KEYDOWN exists. SDL 1.2 introduces a "fake" key down+up
+		// in such cases. We will do the same to mimic it's behavior.
+		event.type = Common::EVENT_KEYDOWN;
+
+		event.kbd = Common::KeyState(Common::KEYCODE_INVALID, convUTF8ToUTF32(ev.text.text), 0);
+
+		SDLModToOSystemKeyFlags(SDL_GetModState(), event);
+		// Set the scroll lock sticky flag
+		if (_scrollLock)
+			event.kbd.flags |= Common::KBD_SCRL;
+
+		// Fake a key up when we have a proper ascii value.
+		_queuedFakeKeyUp = (event.kbd.ascii != 0);
+		_fakeKeyUp = event;
+		_fakeKeyUp.type = Common::EVENT_KEYUP;
+
+		return _queuedFakeKeyUp;
+		}
+
 	case SDL_WINDOWEVENT:
 		switch (ev.window.event) {
 		case SDL_WINDOWEVENT_EXPOSED:
@@ -818,27 +874,6 @@ bool SdlEventSource::handleResizeEvent(Common::Event &event, int w, int h) {
 	return false;
 }
 
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-static uint32 convUTF8ToUTF32(const char *src) {
-	uint32 utf32 = 0;
-
-	char *dst = SDL_iconv_string(
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-	                             "UTF-32BE",
-#else
-	                             "UTF-32LE",
-#endif
-                                 "UTF-8", src, SDL_strlen(src) + 1);
-
-	if (dst) {
-		utf32 = *((uint32 *)dst);
-		SDL_free(dst);
-	}
-
-	return utf32;
-}
-#endif
-
 uint32 SdlEventSource::obtainUnicode(const SDL_keysym keySym) {
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_Event events[2];
diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index 7fc52a01cb..caa60c1354 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -147,6 +147,19 @@ protected:
 	 * May only be used for key down events.
 	 */
 	uint32 obtainUnicode(const SDL_keysym keySym);
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	/**
+	 * Whether _fakeKeyUp contains an event we need to send.
+	 */
+	bool _queuedFakeKeyUp;
+
+	/**
+	 * A fake key up event when we receive a TEXTINPUT without any previous
+	 * KEYDOWN event.
+	 */
+	Common::Event _fakeKeyUp;
+#endif
 };
 
 #endif
-- 
cgit v1.2.3


From 76e824eddca2afbdccd109c3c3311e8af0f2bd83 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 5 Mar 2015 17:42:16 -0500
Subject: MADS: Bugfixes and cleanup for Herman conversation

---
 engines/mads/nebular/globals_nebular.h   |  2 +-
 engines/mads/nebular/nebular_scenes6.cpp | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h
index bd1c6d84b0..ce671f653d 100644
--- a/engines/mads/nebular/globals_nebular.h
+++ b/engines/mads/nebular/globals_nebular.h
@@ -148,7 +148,7 @@ enum GlobalId {
 
 	/* Section #6 Variables */
 	kConvHermit1			= 130,
-	kconvHermit2			= 131,
+	kConvHermit2			= 131,
 	kHasTalkedToHermit		= 132,
 	kExecuted_1_11			= 133,
 	kHandsetCellStatus		= 134,
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index cb36064458..5ef175d396 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -3253,6 +3253,8 @@ void Scene611::handleSubDialog1() {
 		handleTalking(500);
 		displayHermitQuestions(17);
 		_dialog1.write(0x290, false);
+		_dialog1.write(0x28e, false);
+
 		if (!_dialog1.read(0x28F))
 			_dialog1.write(0x291, true);
 
@@ -3271,8 +3273,10 @@ void Scene611::handleSubDialog1() {
 		if ((_game._objects.isInInventory(OBJ_DURAFAIL_CELLS)) || (_game._objects.isInInventory(OBJ_PHONE_CELLS)))
 			_dialog1.write(0x294, true);
 
-		if (!_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && !_game._objects.isInInventory(OBJ_PHONE_CELLS))
-			_globals[kExecuted_1_11] = true;
+		// WORKAROUND: Fix bug in the original where the option to give Hermit batteries
+		// would be given before the player even has any batteries
+		//if (!_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && !_game._objects.isInInventory(OBJ_PHONE_CELLS))
+		//	_globals[kExecuted_1_11] = true;
 
 		setDialogNode(1);
 		break;
@@ -3921,14 +3925,14 @@ void Scene611::enter() {
 		0x2D9, 0x2DA, 0x2DB, 0x2DC, 0x2DD, 0x2DE, 0x2DF, 0x2E0, 0x2E1, 0x2E2, 0x2E3, 0x2E4, 0x2E5, 0x2E6,
 		0x323, 0x324, 0);
 
-	_dialog1.setup(0x82, 0x287, 0x288, 0x289, 0x28A, 0x28B, 0x28C, 0x28D, 0x28E, 0x28F, 0x290,
+	_dialog1.setup(kConvHermit1, 0x287, 0x288, 0x289, 0x28A, 0x28B, 0x28C, 0x28D, 0x28E, 0x28F, 0x290, 
 		0x291, 0x292, 0x293, 0x294, 0x295, 0x296, 0);
 
-	_dialog2.setup(0x83, 0x29C, 0x29D, 0x29E, 0x29F, 0);
+	_dialog2.setup(kConvHermit2, 0x29C, 0x29D, 0x29E, 0x29F, 0);
 
 	if (!_game._visitedScenes._sceneRevisited) {
-		_dialog1.set(0x82, 0x287, 0x288, 0x296, 0);
-		_dialog2.set(0x83, 0x29F, 0);
+		_dialog1.set(kConvHermit1, 0x287, 0x288, 0x296, 0);
+		_dialog2.set(kConvHermit2, 0x29F, 0);
 	}
 
 	_vm->_palette->setEntry(252, 51, 51, 47);
@@ -3964,12 +3968,14 @@ void Scene611::enter() {
 		_scene->_hotspots.activate(NOUN_HERMIT, false);
 	}
 
-	// CHECKME: The last line of the block looks extremely useless
+	/* WORKAROUND: Pretty sure this is a debugging code fragment that should be ignored
 	if (_globals[kExecuted_1_11]) {
 		_dialog1.write(0x294, true);
 		_dialog1.write(0x292, false);
 		_globals[kExecuted_1_11] = true;
-	}
+	}*/
+	if ((_game._objects.isInInventory(OBJ_DURAFAIL_CELLS)) || (_game._objects.isInInventory(OBJ_PHONE_CELLS)))
+		_dialog1.write(0x294, true);
 
 	if (_duringDialogFl) {
 		_game._player._playerPos = Common::Point(237, 129);
-- 
cgit v1.2.3


From 9a494936561a5351f5bfb9e840d70c05684239c3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 6 Mar 2015 02:39:57 +0200
Subject: DEVTOOLS: Add support for linking with SDL 2.0 in create_project

This is handled with the new command-line option, --sdl2
---
 devtools/create_project/create_project.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index e71816f575..34d30e1d69 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -125,6 +125,7 @@ int main(int argc, char *argv[]) {
 
 	ProjectType projectType = kProjectNone;
 	int msvcVersion = 9;
+	bool useSDL2 = false;
 
 	// Parse command line arguments
 	using std::cout;
@@ -267,6 +268,8 @@ int main(int argc, char *argv[]) {
 			setup.devTools = true;
 		} else if (!std::strcmp(argv[i], "--tests")) {
 			setup.tests = true;
+		} else if (!std::strcmp(argv[i], "--sdl2")) {
+			useSDL2 = true;
 		} else {
 			std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n";
 			return -1;
@@ -335,7 +338,13 @@ int main(int argc, char *argv[]) {
 	// Windows only has support for the SDL backend, so we hardcode it here (along with winmm)
 	setup.defines.push_back("WIN32");
 	setup.defines.push_back("SDL_BACKEND");
-	setup.libraries.push_back("sdl");
+	if (!useSDL2) {
+		cout << "\nLinking to SDL 1.2\n\n";
+		setup.libraries.push_back("sdl");
+	} else {
+		cout << "\nLinking to SDL 2.0\n\n";
+		setup.libraries.push_back("sdl2");
+	}
 	setup.libraries.push_back("winmm");
 
 	// Add additional project-specific library
@@ -645,6 +654,9 @@ void displayHelp(const char *exe) {
 	        "Optional features settings:\n"
 	        " --enable-<name>          enable inclusion of the feature \"name\"\n"
 	        " --disable-<name>         disable inclusion of the feature \"name\"\n"
+			"\n"
+			"SDL settings:\n"
+			" --sdl2                   link to SDL 2.0, instead of SDL 1.2\n"
 	        "\n"
 	        " There are the following features available:\n"
 	        "\n";
-- 
cgit v1.2.3


From 6cb0a4c1b0b2cb65ae8f3bfb122edead0e94f3fc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 6 Mar 2015 02:57:09 +0200
Subject: SDL: Fix compilation with SDL 2.0 under MSVC

In SDL 2.0, intrin.h is now included in SDL_cpuinfo.h, which includes
setjmp.h. SDL_cpuinfo.h is included from SDL.h and SDL_syswm.h.
Thus, we remove the exceptions for setjmp and longjmp before these two
includes.
---
 backends/platform/sdl/sdl-sys.h | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index 59952323f4..67ad84efd3 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -60,6 +60,25 @@ typedef struct { int FAKE; } FAKE_FILE;
 #undef ARRAYSIZE
 #endif
 
+// HACK to fix compilation with SDL 2.0 in MSVC.
+// In SDL 2.0, intrin.h is now included in SDL_cpuinfo.h, which includes
+// setjmp.h. SDL_cpuinfo.h is included from SDL.h and SDL_syswm.h.
+// Thus, we remove the exceptions for setjmp and longjmp before these two
+// includes. Unfortunately, we can't use SDL_VERSION_ATLEAST here, as SDL.h
+// hasn't been included yet at this point.
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && defined(_MSC_VER)
+// We unset any fake definitions of setjmp/longjmp here
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_setjmp
+#undef setjmp
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_longjmp
+#undef longjmp
+#endif
+
+#endif
+
 #if defined(__SYMBIAN32__)
 #include <esdl\SDL.h>
 #else
@@ -67,6 +86,22 @@ typedef struct { int FAKE; } FAKE_FILE;
 #endif
 
 #include <SDL_syswm.h>
+
+// Restore the forbidden exceptions from the hack above
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && defined(_MSC_VER)
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_setjmp
+#undef setjmp
+#define setjmp(a)	FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_longjmp
+#undef longjmp
+#define longjmp(a,b)	FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#endif
+
 // SDL_syswm.h will include windows.h on Win32. We need to undefine its
 // ARRAYSIZE definition because we supply our own.
 #undef ARRAYSIZE
-- 
cgit v1.2.3


From 2d858d817fb9e11f084d176211328e72dc9fd4df Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Fri, 6 Mar 2015 02:21:46 +0100
Subject: CONFIGURE: Always link against Cocoa on OS X, since SDL2 doesn't seem
 to pick it up for us.

---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index 3835342395..78f147f4b2 100755
--- a/configure
+++ b/configure
@@ -2195,6 +2195,8 @@ case $_host_os in
 
 		DEFINES="$DEFINES -DMACOSX"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
+		# SDL2 doesn't seem to add Cocoa for us.
+		LIBS="$LIBS -framework Cocoa"
 		add_line_to_config_mk 'MACOSX = 1'
 
 		# Now we may have MacPorts or Fink installed
-- 
cgit v1.2.3


From 07623530f328f7eabf29dc76484504093ff7fd94 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Fri, 6 Mar 2015 02:27:48 +0100
Subject: SDL: Special case the call to SDL_CreateThread for SDL2, since SDL2
 requires threads to be named.

- Fixes compilation on OS X with SDL2 enabled, SDL1 builds should be entirely unaffected.
---
 backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp
index d59b0ebdfc..e5f63dc908 100644
--- a/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp
+++ b/backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp
@@ -53,7 +53,11 @@ void DoubleBufferSDLMixerManager::startAudio() {
 	_soundThreadIsRunning = true;
 
 	// Finally start the thread
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	_soundThread = SDL_CreateThread(mixerProducerThreadEntry, "ScummVM Double Buffer Mixer", this);
+#else
 	_soundThread = SDL_CreateThread(mixerProducerThreadEntry, this);
+#endif
 
 	SdlMixerManager::startAudio();
 }
-- 
cgit v1.2.3


From 4c88d81cc2cbaf244922f01466447a1cef60f7fa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 08:30:26 -0500
Subject: MADS: Fix another incorrect car door opening animation

---
 engines/mads/nebular/nebular_scenes6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 5ef175d396..b50032352f 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -4614,7 +4614,7 @@ void Scene612::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
-- 
cgit v1.2.3


From 763a962e1456fd8402be4992ab9069e9e507ebc8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 08:39:39 -0500
Subject: MADS: Fix animation of lab door opening

---
 engines/mads/nebular/nebular_scenes5.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index b657a61c2f..4fc603b607 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -1317,7 +1317,7 @@ void Scene506::handleDoorSequences() {
 
 	case 82:
 		_scene->_sequences.remove(_doorSequenceIdx);
-		_doorSequenceIdx = _scene->_sequences.startPingPongCycle(_doorSpriteIdx, false, 7, 1, 0, 0);
+		_doorSequenceIdx = _scene->_sequences.addReverseSpriteCycle(_doorSpriteIdx, false, 7, 1, 0, 0);
 		_scene->_sequences.setDepth(_doorSequenceIdx, _doorDepth);
 		if (_actionFl)
 			_scene->_sequences.addSubEntry(_doorSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 84);
-- 
cgit v1.2.3


From cf845c6dbb6c57f65255e0abd70524d9b9187dd5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 18:40:53 -0500
Subject: MADS: Another car opening animation fix

---
 engines/mads/nebular/nebular_scenes6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index b50032352f..43c8193828 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -2766,7 +2766,7 @@ void Scene609::actions() {
 		case 0:
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 5);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
-- 
cgit v1.2.3


From 177d7ac24f9a1cdd884b9f947a0f50c656942ec0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 18:57:00 -0500
Subject: MADS: Fix car door exiting animations

---
 engines/mads/nebular/nebular_scenes5.cpp | 4 ++--
 engines/mads/nebular/nebular_scenes6.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 4fc603b607..85725a75ee 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -273,7 +273,7 @@ void Scene501::step() {
 
 		case 72:
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 4);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 73);
 			break;
@@ -1260,7 +1260,7 @@ void Scene506::step() {
 
 		case 71:
 			_scene->_sequences.remove(_globals._sequenceIndexes[3]);
-			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 6, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 5);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
 			break;
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 43c8193828..c862017462 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -130,7 +130,7 @@ void Scene601::step() {
 
 	case 71:
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 6, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 3);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 72);
 		break;
-- 
cgit v1.2.3


From 0deee07844f4748d00c753af283ee52a57654611 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 19:03:49 -0500
Subject: MADS: Fix map fade out when choosing a car destination

---
 engines/mads/nebular/nebular_scenes5.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 85725a75ee..dea5f678c4 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -996,7 +996,7 @@ void Scene505::step() {
 					_scene->_sequences.remove(_globals._sequenceIndexes[1]);
 					_scene->_sequences.remove(_globals._sequenceIndexes[0]);
 					_scene->_sequences.remove(_globals._sequenceIndexes[13]);
-					_globals._sequenceIndexes[13] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[13], false, 6, 1, 0, 0);
+					_globals._sequenceIndexes[13] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[13], false, 6, 1, 0, 0);
 					_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
 					_vm->_sound->command(18);
 				}
-- 
cgit v1.2.3


From 62d007168a82614f30a8aa64ae613e30ba111771 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 19:24:30 -0500
Subject: MADS: Animation fixes for scene group 8

---
 engines/mads/nebular/nebular_scenes8.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 95b3c24938..a0bfa0689a 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -283,7 +283,7 @@ void Scene801::actions() {
 		_globals[kBetweenRooms] = true;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 4, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 4, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 1, 5);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 13);
@@ -726,7 +726,7 @@ void Scene803::step() {
 	if (_game._trigger == 150) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[6]);
 		_vm->_sound->command(18);
-		_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], false, 8, 1, 0, 0);
+		_globals._sequenceIndexes[6] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[6], false, 8, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[6], 1, 19);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 4);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 151);
@@ -778,7 +778,7 @@ void Scene803::actions() {
 
 		case 162:
 			_scene->_sequences.remove(_globals._sequenceIndexes[9]);
-			_globals._sequenceIndexes[9] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
+			_globals._sequenceIndexes[9] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[9], 1, 4);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[9]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 163);
@@ -1277,14 +1277,14 @@ void Scene805::actions() {
 	} else if (_action.isAction(VERB_REMOVE, NOUN_SHIELD_MODULATOR) && _globals[kShieldModInstalled]) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[1]);
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		_game._player._stepEnabled = false;
 	} else if (_action.isAction(VERB_REMOVE, NOUN_TARGET_MODULE) && _globals[kTargetModInstalled]) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
 		_game._player._stepEnabled = false;
-- 
cgit v1.2.3


From 1cb764b08629c2171314a88c491f8fc461202cc6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 20:20:25 -0500
Subject: MADS: Fix crash after installing cards in ship

---
 engines/mads/nebular/nebular_scenes8.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index a0bfa0689a..75b6b17a94 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1218,6 +1218,8 @@ void Scene805::enter() {
 }
 
 void Scene805::step() {
+	UserInterface &userInterface = _vm->_game->_scene._userInterface;
+
 	if (_game._trigger == 70) {
 		_scene->_hotspots.activate(OBJ_SHIELD_MODULATOR, false);
 		_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 25);
@@ -1225,6 +1227,7 @@ void Scene805::step() {
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY);
 		_globals[kShieldModInstalled] = true;
 		_game._objects.setRoom(OBJ_SHIELD_MODULATOR, NOWHERE);
+		userInterface._selectedInvIndex = -1;
 		_game._player._stepEnabled = true;
 		_vm->_sound->command(24);
 	}
@@ -1236,6 +1239,7 @@ void Scene805::step() {
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY);
 		_globals[kTargetModInstalled] = true;
 		_game._objects.setRoom(OBJ_TARGET_MODULE, NOWHERE);
+		userInterface._selectedInvIndex = -1;
 		_game._player._stepEnabled = true;
 		_vm->_sound->command(24);
 	}
-- 
cgit v1.2.3


From 119c179d5aa432a0dc3e1b522639478cd5377b83 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 20:25:25 -0500
Subject: MADS: Fix hand animations on Antigrav control panel

---
 engines/mads/nebular/nebular_scenes8.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 75b6b17a94..64b6c26bbc 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1437,7 +1437,7 @@ void Scene808::actions() {
 				_vm->_sound->command(20);
 				_vm->_sound->command(25);
 			}
-			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 211));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
@@ -1472,7 +1472,7 @@ void Scene808::actions() {
 				_vm->_sound->command(20);
 			}
 			_globals[kTopButtonPushed] = false;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 186));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 91);
@@ -1503,7 +1503,7 @@ void Scene808::actions() {
 				_vm->_sound->command(20);
 			 }
 			_globals[kTopButtonPushed] = true;
-			_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
+			_globals._sequenceIndexes[4] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[4], false, 4, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(248, 163));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[4], 2);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
-- 
cgit v1.2.3


From a22d7f2d5f27701766dbf36d50e0a31ea7b26d69 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 6 Mar 2015 20:55:53 -0500
Subject: MADS: Fix crash on leaving planeet

---
 engines/mads/nebular/nebular_scenes8.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 64b6c26bbc..4b8d7d5dd8 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1604,7 +1604,8 @@ void Scene810::enter() {
 }
 
 void Scene810::step() {
-	if ((_scene->_activeAnimation->getCurrentFrame() == 200) && _moveAllowed) {
+	if (_scene->_activeAnimation && (_scene->_activeAnimation->getCurrentFrame() == 200) 
+			&& _moveAllowed) {
 		_scene->_sequences.addTimer(100, 70);
 		_moveAllowed = false;
 	}
-- 
cgit v1.2.3


From c80c74e49926daed108f73e115fda7ba5901eb61 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 17:01:07 -0500
Subject: MADS: Refactoring of text/animation views to show outside game loop

---
 engines/mads/game.cpp                    | 25 +++++++-------
 engines/mads/nebular/game_nebular.cpp    | 56 ++++++++++++++++++--------------
 engines/mads/nebular/menu_nebular.cpp    |  2 ++
 engines/mads/nebular/nebular_scenes8.cpp |  6 ++--
 4 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 3b8b053fec..74c2a3f416 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -105,8 +105,6 @@ Game::~Game() {
 }
 
 void Game::run() {
-	initializeGlobals();
-
 	// If requested, load a savegame instead of showing the intro
 	if (ConfMan.hasKey("save_slot")) {
 		int saveSlot = ConfMan.getInt("save_slot");
@@ -116,15 +114,19 @@ void Game::run() {
 
 	_statusFlag = true;
 
-	if (_loadGameSlot == -1) {
-		startGame();
-	}
+	while (!_vm->shouldQuit()) {
+		initializeGlobals();
 
-	// Get the initial starting time for the first scene
-	_scene._frameStartTime = _vm->_events->getFrameCounter();
+		if (_loadGameSlot == -1) {
+			startGame();
+		}
+
+		// Get the initial starting time for the first scene
+		_scene._frameStartTime = _vm->_events->getFrameCounter();
 
-	if (!_vm->shouldQuit())
-		gameLoop();
+		if (!_vm->shouldQuit())
+			gameLoop();
+	}
 }
 
 void Game::splitQuote(const Common::String &source, Common::String &line1, Common::String &line2) {
@@ -140,7 +142,7 @@ void Game::splitQuote(const Common::String &source, Common::String &line1, Commo
 }
 
 void Game::gameLoop() {
-	while (!_vm->shouldQuit() && _statusFlag) {
+	while (!_vm->shouldQuit() && _statusFlag && !_winStatus) {
 		if (_loadGameSlot != -1) {
 			loadGame(_loadGameSlot);
 			_loadGameSlot = -1;
@@ -168,7 +170,8 @@ void Game::gameLoop() {
 }
 
 void Game::sectionLoop() {
-	while (!_vm->shouldQuit() && _statusFlag && (_sectionNumber == _currentSectionNumber)) {
+	while (!_vm->shouldQuit() && _statusFlag && !_winStatus &&
+			(_sectionNumber == _currentSectionNumber)) {
 		_kernelMode = KERNEL_ROOM_PRELOAD;
 		_player._spritesChanged = true;
 		_quoteEmergency = false;
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 965ef7fad2..8c8d4ab974 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -61,6 +61,35 @@ ProtectionResult GameNebular::checkCopyProtection() {
 }
 
 void GameNebular::startGame() {
+	// First handle any ending credits from a just finished game session.
+	// Note that, with the exception of the decompression ending, which doesn't
+	// use animations, the remaining animations will automatically launch their
+	// own text view credits when the animation is completed
+	switch (_winStatus) {
+	case 1:
+		// No shields failure ending
+		AnimationView::execute(_vm, "rexend1");
+		break;
+	case 2:
+		// Shields, but no targetting failure ending
+		AnimationView::execute(_vm, "rexend2");
+		break;
+	case 3:
+		// Completed game successfully, so activate quotes item on the main menu
+		ConfMan.setBool("ShowQuotes", true);
+		ConfMan.flushToDisk();
+
+		AnimationView::execute(_vm, "rexend3");
+		break;
+	case 4:
+		// Decompression ending
+		TextView::execute(_vm, "ending4");
+		break;
+	}
+
+	checkShowDialog();
+	_winStatus = 0;
+
 	/*
 	// Check copy protection
 	ProtectionResult protectionResult = checkCopyProtection();
@@ -310,32 +339,9 @@ void GameNebular::setSectionHandler() {
 }
 
 void GameNebular::checkShowDialog() {
-	// Handling to start endgame sequences if the win/lose type has been set
-	switch (_winStatus) {
-	case 1:
-		// No shields failure ending
-		AnimationView::execute(_vm, "rexend1");
-		break;
-	case 2:
-		// Shields, but no targetting failure ending
-		AnimationView::execute(_vm, "rexend2");
-		break;
-	case 3:
-		// Completed game successfully, so activate quotes item on the main menu
-		ConfMan.setBool("ShowQuotes", true);
-		ConfMan.flushToDisk();
-
-		AnimationView::execute(_vm, "rexend3");
-		break;
-	case 4:
-		// Decompression ending
-		TextView::execute(_vm, "ending4");
-		break;
-	}
-	_winStatus = 0;
-
 	// Loop for showing dialogs, if any need to be shown
-	if (_vm->_dialogs->_pendingDialog && _player._stepEnabled && !_globals[kCopyProtectFailed]) {
+	if (_vm->_dialogs->_pendingDialog && (_player._stepEnabled || _winStatus) 
+			&& !_globals[kCopyProtectFailed]) {
 		_player.releasePlayerSprites();
 
 		// Make a thumbnail in case it's needed for making a savegame
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 2fdef3443d..358a978cfa 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -136,12 +136,14 @@ void MainMenu::doFrame() {
 			addSpriteSlot();
 		}
 
+		_vm->_events->setCursor(CURSOR_ARROW);
 		_vm->_events->showCursor();
 	} else {
 		if ((_menuItemIndex == -1) || (_frameIndex == 0)) {
 			if (++_menuItemIndex == 6) {
 
 				// Reached end of display animation
+				_vm->_events->setCursor(CURSOR_ARROW);
 				_vm->_events->showCursor();
 				return;
 			} else if (_menuItemIndex == 4 && !shouldShowQuotes()) {
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 4b8d7d5dd8..8a30f88548 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -719,7 +719,7 @@ void Scene803::step() {
 			else
 				_game._winStatus = 3;
 
-			_vm->quitGame();
+			return;
 		}
 	}
 
@@ -957,7 +957,7 @@ void Scene804::step() {
 
 				assert(!_globals[kCopyProtectFailed]);
 				_game._winStatus = 4;
-				_vm->quitGame();
+				return;
 			}
 			break;
 
@@ -969,7 +969,7 @@ void Scene804::step() {
 
 				assert(!_globals[kCopyProtectFailed]);
 				_game._winStatus = 4;
-				_vm->quitGame();
+				return;
 			}
 		}
 
-- 
cgit v1.2.3


From dacd7d4022ef049fbcf59a3b555b6d9ee8c1511e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 17:14:49 -0500
Subject: MADS: Correctly show main menu after showing credits

---
 engines/mads/nebular/dialogs_nebular.cpp | 2 +-
 engines/mads/nebular/game_nebular.cpp    | 2 ++
 engines/mads/nebular/menu_nebular.cpp    | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 6985455d2a..23aef6bdb5 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -328,7 +328,7 @@ void DialogsNebular::showDialog() {
 			TextView *dlg = new RexTextView(_vm);
 			dlg->show();
 			delete dlg;
-			break;
+			return;
 		}
 		case DIALOG_ANIMVIEW: {
 			AnimationView *dlg = new RexAnimationView(_vm);
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 8c8d4ab974..ce3b5a8f58 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -110,7 +110,9 @@ void GameNebular::startGame() {
 	}
 	*/
 
+	_sectionNumber = 1;
 	initSection(_sectionNumber);
+	_vm->_events->setCursor(CURSOR_ARROW);
 	_statusFlag = true;
 
 	// Show the main menu
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 358a978cfa..2fdef3443d 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -136,14 +136,12 @@ void MainMenu::doFrame() {
 			addSpriteSlot();
 		}
 
-		_vm->_events->setCursor(CURSOR_ARROW);
 		_vm->_events->showCursor();
 	} else {
 		if ((_menuItemIndex == -1) || (_frameIndex == 0)) {
 			if (++_menuItemIndex == 6) {
 
 				// Reached end of display animation
-				_vm->_events->setCursor(CURSOR_ARROW);
 				_vm->_events->showCursor();
 				return;
 			} else if (_menuItemIndex == 4 && !shouldShowQuotes()) {
-- 
cgit v1.2.3


From 27b6ded6f95fdc01faa5816b8577464685357c2d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 17:18:51 -0500
Subject: MADS: Fix Credits and Quotes option on the main menu

---
 engines/mads/nebular/game_nebular.cpp | 41 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index ce3b5a8f58..53cdc4df13 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -87,38 +87,39 @@ void GameNebular::startGame() {
 		break;
 	}
 
-	checkShowDialog();
-	_winStatus = 0;
-
-	/*
-	// Check copy protection
-	ProtectionResult protectionResult = checkCopyProtection();
-	switch (protectionResult) {
-	case PROTECTION_FAIL:
+	do {
+		checkShowDialog();
+		_winStatus = 0;
+
+		/*
+		// Check copy protection
+		ProtectionResult protectionResult = checkCopyProtection();
+		switch (protectionResult) {
+		case PROTECTION_FAIL:
 		// Copy protection failed
 		_scene._nextSceneId = 804;
 		initializeGlobals();
 		_globals[kCopyProtectFailed] = true;
 		return;
-	case PROTECTION_ESCAPE:
+		case PROTECTION_ESCAPE:
 		// User escaped out of copy protection dialog
 		_vm->quitGame();
 		return;
-	default:
+		default:
 		// Copy protection check succeeded
 		break;
-	}
-	*/
+		}
+		*/
 
-	_sectionNumber = 1;
-	initSection(_sectionNumber);
-	_vm->_events->setCursor(CURSOR_ARROW);
-	_statusFlag = true;
+		_sectionNumber = 1;
+		initSection(_sectionNumber);
+		_vm->_events->setCursor(CURSOR_ARROW);
+		_statusFlag = true;
 
-	// Show the main menu
-	_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
-	_vm->_dialogs->showDialog();
-	_vm->_dialogs->_pendingDialog = DIALOG_NONE;
+		// Show the main menu
+		_vm->_dialogs->_pendingDialog = DIALOG_MAIN_MENU;
+		_vm->_dialogs->showDialog();
+	} while (!_vm->shouldQuit() && _vm->_dialogs->_pendingDialog != DIALOG_NONE);
 
 	_priorSectionNumber = 0;
 	_priorSectionNumber = -1;
-- 
cgit v1.2.3


From d7460701ea345dbe6d610b98a9c14993ff2f1f88 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 17:36:32 -0500
Subject: MADS: Fix not being able to leave hanger via teleporter

---
 engines/mads/nebular/nebular_scenes8.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 8a30f88548..24a1855c36 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -145,10 +145,10 @@ void Scene801::enter() {
 		case 2:
 			_game._player._playerPos = Common::Point(8, 117);
 			_globals[kTeleporterUnderstood] = true;
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 8, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 8, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 13);
 			_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 8090);
+			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
 			_vm->_sound->command(30);
 			break;
 
-- 
cgit v1.2.3


From adc5b5ca2e3b967d51685fec749fc0864b55fa8f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 17:39:00 -0500
Subject: MADS: Fix animation for teleporting into conveyor belt scene

---
 engines/mads/nebular/nebular_scenes4.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 8a9e510591..8191d7fe49 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -4078,7 +4078,7 @@ void Scene413::enter() {
 		case 1:
 			_vm->_sound->command(30);
 			_game._player._visible = false;
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 19);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 8);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 76);
-- 
cgit v1.2.3


From a35aa07c7911010d21bb79209d88b07ddbfd7c30 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 17:43:15 -0500
Subject: MADS: Fix crash looking at fishing rod in restaurant

---
 engines/mads/nebular/nebular_scenes5.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index dea5f678c4..b297d2048c 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2427,7 +2427,8 @@ void Scene512::actions() {
 		_vm->_dialogs->show(51225);
 	else if (_action.isAction(VERB_LOOK, NOUN_PADLOCK_KEY) && _game._objects.isInRoom(OBJ_PADLOCK_KEY))
 		_vm->_dialogs->show(51215);
-	else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (_scene->_activeAnimation->getCurrentFrame() == 4))
+	else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (!_scene->_activeAnimation ||
+			_scene->_activeAnimation->getCurrentFrame() == 4))
 		_vm->_dialogs->show(51216);
 	else if (_action.isAction(VERB_LOOK, NOUN_SHIPS_WHEEL))
 		_vm->_dialogs->show(51218);
-- 
cgit v1.2.3


From 14a8bb52a0fd92ed1033473d5941a36d5be32d18 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Mar 2015 18:33:11 -0500
Subject: MADS: Fix a large number of incorrect animations

---
 engines/mads/nebular/nebular_scenes1.cpp |  2 +-
 engines/mads/nebular/nebular_scenes2.cpp |  2 +-
 engines/mads/nebular/nebular_scenes3.cpp |  6 +++---
 engines/mads/nebular/nebular_scenes4.cpp |  4 ++--
 engines/mads/nebular/nebular_scenes5.cpp |  8 ++++----
 engines/mads/nebular/nebular_scenes7.cpp | 12 ++++++------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index f21ab94bcb..d505bb3d4e 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -1459,7 +1459,7 @@ void Scene103::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(VERB_TAKE, 289, 0) && _game._objects.isInRoom(OBJ_REBREATHER)) {
+	} else if (_action.isAction(VERB_TAKE, NOUN_REBREATHER, 0) && _game._objects.isInRoom(OBJ_REBREATHER)) {
 		switch (_vm->_game->_trigger) {
 		case 0:
 			_scene->changeVariant(1);
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 2eb7f93a60..bd8e8aae82 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -556,7 +556,7 @@ void Scene202::step() {
 	case 90:
 		_vm->_sound->command(41);
 		_scene->_sequences.remove(_globals._sequenceIndexes[10]);
-		_globals._sequenceIndexes[9] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
+		_globals._sequenceIndexes[9] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[9], true, 6, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[9], Common::Point(247, 82));
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[9], 1);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[9], SEQUENCE_TRIGGER_EXPIRE, 0, 91);
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 478a733485..61618ff7e3 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -2523,7 +2523,7 @@ void Scene318::handleDialog() {
 		case 0x19C:
 		case 0x19D:
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 8, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[2], Common::Point(142, 121));
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], 6, 8);
@@ -3588,7 +3588,7 @@ void Scene320::setLeftView(int view) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[0]);
 
 	if (view != 10) {
-		_globals._sequenceIndexes[0] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[view], false, 6, 0, 0, 18);
+		_globals._sequenceIndexes[0] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[view], false, 6, 0, 0, 18);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[0], 0);
 		if (!_blinkFl)
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[0], 2, 2);
@@ -4305,7 +4305,7 @@ void Scene352::preActions() {
 				_game._player._stepEnabled = false;
 				_scene->_sequences.remove(_commonSequenceIdx);
 				_vm->_sound->command(20);
-				_commonSequenceIdx = _scene->_sequences.startPingPongCycle(_commonSpriteIndex, false, 6, 1, 0, 0);
+				_commonSequenceIdx = _scene->_sequences.addReverseSpriteCycle(_commonSpriteIndex, false, 6, 1, 0, 0);
 				_scene->_sequences.addSubEntry(_commonSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 				_scene->_sequences.setDepth(_commonSequenceIdx, 15);
 			}
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 8191d7fe49..9db597c312 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -2445,7 +2445,7 @@ void Scene405::step() {
 	if (_game._trigger == 70) {
 		_game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount ;
 		_game._player._visible = true;
-		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		_vm->_sound->command(19);
 	}
@@ -2609,7 +2609,7 @@ void Scene406::enter() {
 	else {
 		_game._player._stepEnabled = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 3, 1, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 3, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 90);
 		_vm->_sound->command(19);
 	}
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index b297d2048c..f520fd5ed0 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -238,7 +238,7 @@ void Scene501::step() {
 			break;
 
 		case 82:
-			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
 			_vm->_sound->command(12);
 			_doorHotspotid = _scene->_dynamicHotspots.add(NOUN_DOOR, VERB_WALK_THROUGH, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0));
@@ -415,7 +415,7 @@ void Scene501::actions() {
 		case 7: {
 			_vm->_sound->command(12);
 			int syncIdx = _globals._sequenceIndexes[3];
-			_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
+			_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 7);
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], syncIdx);
 			_vm->_sound->command(12);
@@ -913,7 +913,7 @@ void Scene505::enter() {
 	_globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('e', -1));
 
 	if (_scene->_priorSceneId != -2)
-		_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[12] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[12], false, 6, 1, 0, 0);
 
 	_globals._sequenceIndexes[13] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[13], false, 6, 1, 120, 0);
 	_scene->_sequences.addSubEntry(_globals._sequenceIndexes[13], SEQUENCE_TRIGGER_EXPIRE, 0, 60);
@@ -2530,7 +2530,7 @@ void Scene513::step() {
 	case 80:
 		_game._player._stepEnabled = false;
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 2);
 		_vm->_sound->command(24);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 4838ee27d9..006b3ca6ec 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -206,7 +206,7 @@ void Scene701::step() {
 	switch(_game._trigger) {
 	case 60:
 		_scene->_sequences.remove(_globals._sequenceIndexes[5]);
-		_globals._sequenceIndexes[5] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[5] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[5], Common::Point(155, 129));
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 61);
 		break;
@@ -326,7 +326,7 @@ void Scene701::actions() {
 
 		case 3:
 			_vm->_sound->command(17);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
@@ -1585,7 +1585,7 @@ void Scene705::enter() {
 void Scene705::step() {
 	switch (_game._trigger) {
 	case 70:
-		_globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
+		_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 4);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		break;
@@ -2248,7 +2248,7 @@ void Scene751::step() {
 	switch (_game._trigger) {
 	case 70:
 		_scene->_sequences.remove(_globals._sequenceIndexes[4]);
-		_globals._sequenceIndexes[4] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[4], false, 6, 1, 0, 0);
+		_globals._sequenceIndexes[4] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[4], false, 6, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[4], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		break;
@@ -2329,7 +2329,7 @@ void Scene751::preActions() {
 			_game._player._readyToWalk = false;
 			_game._player._stepEnabled = false;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 11, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 11, 1, 0, 0);
 			_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, 7);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 1);
 			break;
@@ -2398,7 +2398,7 @@ void Scene751::actions() {
 
 		case 3:
 			_vm->_sound->command(17);
-			_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
+			_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
 			_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 4);
-- 
cgit v1.2.3


From 10361d077a5637f4e64620011b67190bfdeaaf9b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 11:18:10 -0400
Subject: MADS: Fix game startup settings for pit & batteries based on
 difficulty

---
 engines/mads/nebular/game_nebular.cpp    | 6 ++++--
 engines/mads/nebular/nebular_scenes2.cpp | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 53cdc4df13..6de7ad9932 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -280,7 +280,9 @@ void GameNebular::initializeGlobals() {
 		_objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
 		_objects.setRoom(OBJ_PENLIGHT, NOWHERE);
 
-		_globals[kLeavesStatus] = LEAVES_ON_TRAP;
+		_globals[kLeavesStatus] = LEAVES_ON_GROUND;
+		_globals[kDurafailRecharged] = 0;
+		_globals[kPenlightCellStatus] = FIRST_TIME_UNCHARGED_DURAFAIL;
 		break;
 
 	case DIFFICULTY_MEDIUM:
@@ -295,7 +297,7 @@ void GameNebular::initializeGlobals() {
 		_objects.setRoom(OBJ_BLOWGUN, NOWHERE);
 		_objects.setRoom(OBJ_NOTE, NOWHERE);
 
-		_globals[kLeavesStatus] = LEAVES_ON_GROUND;
+		_globals[kLeavesStatus] = LEAVES_ON_TRAP;
 		_globals[kPenlightCellStatus] = FIRST_TIME_UNCHARGED_DURAFAIL;
 		_globals[kDurafailRecharged] = 0;
 		break;
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index bd8e8aae82..499073e28a 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1686,14 +1686,14 @@ void Scene208::updateTrap() {
 	}
 
 	switch (_globals[kLeavesStatus]) {
-	case 0: {
+	case LEAVES_ON_GROUND: {
 		_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, 1);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 15);
 		int idx = _scene->_dynamicHotspots.add(NOUN_PILE_OF_LEAVES, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(60, 152), FACING_NORTH);
 		}
 		break;
-	case 2: {
+	case LEAVES_ON_TRAP: {
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 15);
 		_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
 		_scene->_hotspots.activate(NOUN_DEEP_PIT, false);
-- 
cgit v1.2.3


From 2b1155711fe09bb71cc3678a70eca3aab7766885 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 11:44:06 -0400
Subject: MADS: Fix showing covered pit by default in Easy mode

---
 engines/mads/nebular/nebular_scenes2.cpp | 17 ++++++++---------
 engines/mads/sequence.cpp                | 14 +++++++-------
 engines/mads/sequence.h                  |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 499073e28a..cb22a2312d 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1697,7 +1697,7 @@ void Scene208::updateTrap() {
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[3], 15);
 		_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
 		_scene->_hotspots.activate(NOUN_DEEP_PIT, false);
-		int idx = _scene->_dynamicHotspots.add(NOUN_LEAF_COVERED_PIT, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
+		int idx = _scene->_dynamicHotspots.add(NOUN_LEAF_COVERED_PIT, VERB_WALKTO, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(100, 146), FACING_NORTH);
 		_scene->_dynamicHotspots[idx]._articleNumber = PREP_ON;
 		}
@@ -1796,7 +1796,6 @@ void Scene208::preActions() {
 }
 
 void Scene208::subAction(int mode) {
-
 	switch (_game._trigger) {
 	case 0: {
 		_game._player._stepEnabled = false;
@@ -1804,21 +1803,21 @@ void Scene208::subAction(int mode) {
 		_globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 6, 1, 0, 0);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
 
-		int abortVal;
+		int endTrigger;
 		if ((mode == 1) || (mode == 2))
-			abortVal = 1;
+			endTrigger = 1;
 		else
-			abortVal = 2;
+			endTrigger = 2;
 
-		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, abortVal);
+		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, endTrigger);
 		}
 		break;
 	case 1: {
-		int oldVal = _globals._sequenceIndexes[5];
-		_globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 12, 3, 0, 0);
+		int oldSeq = _globals._sequenceIndexes[5];
+		_globals._sequenceIndexes[5] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[5], false, 12, 3, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[5], 3, 4);
 		_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[5]);
-		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[5], oldVal);
+		_scene->_sequences.updateTimeout(_globals._sequenceIndexes[5], oldSeq);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[5], SEQUENCE_TRIGGER_EXPIRE, 0, 2);
 		_vm->_sound->command(20);
 		}
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index ab73d70b10..7dbf4cf3be 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -95,8 +95,8 @@ bool SequenceList::addSubEntry(int index, SequenceTrigger mode, int frameIndex,
 }
 
 int SequenceList::add(int spriteListIndex, bool flipped, int frameIndex, int triggerCountdown, int delayTicks, int extraTicks, int numTicks,
-	int msgX, int msgY, bool nonFixed, int scale, int depth, int frameInc, SpriteAnimType animType, int numSprites,
-	int frameStart) {
+		int msgX, int msgY, bool nonFixed, int scale, int depth, int frameInc, SpriteAnimType animType, int numSprites,
+		int frameStart) {
 	Scene &scene = _vm->_game->_scene;
 
 	// Find a free slot
@@ -477,17 +477,17 @@ int SequenceList::startPingPongCycle(int srcSpriteIndex, bool flipped, int numTi
 		extraTicks, numTicks, 0, 0, true, 100, depth - 1, 1, ANIMTYPE_PING_PONG, 0, 0);
 }
 
-void SequenceList::updateTimeout(int spriteIdx, int seqIndex) {
+void SequenceList::updateTimeout(int srcSeqIndex, int destSeqIndex) {
 	Player &player = _vm->_game->_player;
 	int timeout;
 
-	if (spriteIdx >= 0)
-		timeout = _entries[spriteIdx]._timeout;
+	if (srcSeqIndex >= 0)
+		timeout = _entries[srcSeqIndex]._timeout;
 	else
 		timeout = player._priorTimer + player._ticksAmount;
 
-	if (seqIndex >= 0)
-		_entries[seqIndex]._timeout = timeout;
+	if (destSeqIndex >= 0)
+		_entries[destSeqIndex]._timeout = timeout;
 	else
 		player._priorTimer = timeout - player._ticksAmount;
 
diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 9603296717..1555232780 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -119,7 +119,7 @@ public:
 	int startCycle(int srcSpriteIdx, bool flipped, int cycleIndex);
 	int startPingPongCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
-	void updateTimeout(int spriteIdx, int seqIndex);
+	void updateTimeout(int destSeqIndex, int srcSeqIndex);
 	void setScale(int spriteIdx, int scale);
 	void setMsgLayout(int seqIndex);
 	void setDone(int seqIndex);
-- 
cgit v1.2.3


From 6454c5f35d2fa7d749266bcdb9346944dd6709d0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 11:49:47 -0400
Subject: MADS: Fix closing door animation for video store

---
 engines/mads/nebular/nebular_scenes6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index c862017462..11e3ff78b0 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -2690,7 +2690,7 @@ void Scene609::enterStore() {
 
 	case 7:
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 8);
 		break;
-- 
cgit v1.2.3


From b25325599d4b88c323d3bf3319f7b6ee78f2e4c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 12:05:54 -0400
Subject: MADS: Fix for penlight when starting a new game in Hard mode

---
 engines/mads/nebular/game_nebular.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 6de7ad9932..cde998e66a 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -277,8 +277,8 @@ void GameNebular::initializeGlobals() {
 	// Final setup based on selected difficulty level
 	switch (_difficulty) {
 	case DIFFICULTY_HARD:
-		_objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
-		_objects.setRoom(OBJ_PENLIGHT, NOWHERE);
+		_objects.setRoom(OBJ_BLOWGUN, NOWHERE);
+		_objects.setRoom(OBJ_NOTE, NOWHERE);
 
 		_globals[kLeavesStatus] = LEAVES_ON_GROUND;
 		_globals[kDurafailRecharged] = 0;
@@ -294,12 +294,10 @@ void GameNebular::initializeGlobals() {
 		break;
 
 	case DIFFICULTY_EASY:
-		_objects.setRoom(OBJ_BLOWGUN, NOWHERE);
-		_objects.setRoom(OBJ_NOTE, NOWHERE);
+		_objects.setRoom(OBJ_PLANT_STALK, NOWHERE);
+		_objects.setRoom(OBJ_PENLIGHT, NOWHERE);
 
 		_globals[kLeavesStatus] = LEAVES_ON_TRAP;
-		_globals[kPenlightCellStatus] = FIRST_TIME_UNCHARGED_DURAFAIL;
-		_globals[kDurafailRecharged] = 0;
 		break;
 	}
 
-- 
cgit v1.2.3


From 62c1485df2ab17ab18b377b49055c6fcd6a6b15c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 19:51:33 -0400
Subject: MADS: Fix flickering message from sitting at ruined security desk

---
 engines/mads/nebular/nebular_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 61618ff7e3..2febbf6bbd 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -5466,7 +5466,7 @@ void Scene361::actions() {
 		_vm->_dialogs->show(36119);
 	else if (_action.isAction(VERB_SIT_AT, NOUN_DESK)) {
 		_scene->_kernelMessages.reset();
-		_scene->_kernelMessages.addQuote(0xFC, 120, 0);
+		_scene->_kernelMessages.addQuote(252, 0, 120);
 	} else if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) {
 		if (_globals[kSexOfRex] == REX_FEMALE)
 			handleRoxAction();
-- 
cgit v1.2.3


From 29ac19947f5c95a5133bc7d6f8ee75a0719fe58d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 19:54:00 -0400
Subject: MADS: Rename some outstanding 'abortTimers' to the more proper
 'endTrigger'

---
 engines/mads/messages.cpp                | 10 +++++-----
 engines/mads/messages.h                  |  4 ++--
 engines/mads/nebular/nebular_scenes2.cpp | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index e83b69d210..4b105630d6 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -69,7 +69,7 @@ void KernelMessages::clear() {
 }
 
 int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
-		uint8 abortTimers, uint32 timeout, const Common::String &msg) {
+		int endTrigger, uint32 timeout, const Common::String &msg) {
 	Scene &scene = _vm->_game->_scene;
 
 	// Find a free slot
@@ -77,7 +77,7 @@ int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 	while ((idx < _entries.size()) && ((_entries[idx]._flags & KMSG_ACTIVE) != 0))
 		++idx;
 	if (idx == _entries.size()) {
-		if (abortTimers == 0)
+		if (endTrigger == 0)
 			return -1;
 
 		error("KernelMessages overflow");
@@ -92,7 +92,7 @@ int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 	rec._textDisplayIndex = -1;
 	rec._timeout = timeout;
 	rec._frameTimer = _vm->_game->_priorFrameTimer;
-	rec._trigger = abortTimers;
+	rec._trigger = endTrigger;
 	rec._abortMode = _vm->_game->_triggerSetupMode;
 
 	rec._actionDetails = scene._action._activeAction;
@@ -104,10 +104,10 @@ int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 	return idx;
 }
 
-int KernelMessages::addQuote(int quoteId, int abortTimers, uint32 timeout) {
+int KernelMessages::addQuote(int quoteId, int endTrigger, uint32 timeout) {
 	Common::String quoteStr = _vm->_game->getQuote(quoteId);
 	return add(Common::Point(), 0x1110, KMSG_PLAYER_TIMEOUT | KMSG_CENTER_ALIGN,
-		abortTimers, timeout, quoteStr);
+		endTrigger, timeout, quoteStr);
 }
 
 void KernelMessages::scrollMessage(int msgIndex, int numTicks, bool quoted) {
diff --git a/engines/mads/messages.h b/engines/mads/messages.h
index a7411d98d1..22ae0b24b5 100644
--- a/engines/mads/messages.h
+++ b/engines/mads/messages.h
@@ -99,9 +99,9 @@ public:
 	~KernelMessages();
 
 	void clear();
-	int add(const Common::Point &pt, uint fontColor, uint8 flags, uint8 abortTimers,
+	int add(const Common::Point &pt, uint fontColor, uint8 flags, int endTrigger,
 		uint32 timeout, const Common::String &msg);
-	int addQuote(int quoteId, int abortTimers, uint32 timeout);
+	int addQuote(int quoteId, int endTrigger, uint32 timeout);
 	void scrollMessage(int msgIndex, int numTicks, bool quoted);
 	void setSeqIndex(int msgIndex, int seqIndex);
 	void remove(int msgIndex);
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index cb22a2312d..9d5e2185e8 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -165,16 +165,16 @@ void Scene201::enter() {
 		int sepChar = (_globals[kSexOfRex] == SEX_MALE) ? 't' : 'u';
 		// Guess values. What is the default value used by the compiler?
 		int suffixNum = -1;
-		int abortTimers = -1;
+		int endTrigger = -1;
 		switch(_globals[kTeleporterCommand]) {
 		case 1:
 			suffixNum = 3;
-			abortTimers = 76;
+			endTrigger = 76;
 			_globals[kTeleporterUnderstood] = true;
 			break;
 		case 2:
 			suffixNum = 1;
-			abortTimers = 77;
+			endTrigger = 77;
 			break;
 		case 3:
 			_game._player._visible = true;
@@ -183,12 +183,12 @@ void Scene201::enter() {
 			break;
 		case 4:
 			suffixNum = 2;
-			abortTimers = 78;
+			endTrigger = 78;
 			break;
 		}
 		_globals[kTeleporterCommand] = 0;
 		if (suffixNum >= 0)
-			_scene->loadAnimation(formAnimName(sepChar, suffixNum), abortTimers);
+			_scene->loadAnimation(formAnimName(sepChar, suffixNum), endTrigger);
 	}
 
 	if ((_scene->_priorSceneId == 202) && (_globals[kMeteorologistStatus] == METEOROLOGIST_PRESENT) && !_scene->_roomChanged) {
-- 
cgit v1.2.3


From d048776ef3658a726e1a06666453b30f27188730 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 20:44:19 -0400
Subject: MADS: Fix walking behind counter in software store

---
 engines/mads/nebular/nebular_scenes5.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index f520fd5ed0..8be52692c6 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -1547,7 +1547,9 @@ void Scene507::actions() {
 		_vm->_dialogs->show(50724);
 	else if (_action.isAction(VERB_LOOK, NOUN_WINDOW))
 		_vm->_dialogs->show(50725);
-	else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) {
+	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) {
 		if (_game._objects.isInRoom(OBJ_PENLIGHT))
 			_vm->_dialogs->show(50728);
 		else
-- 
cgit v1.2.3


From 1d76659da834d59b7a26c59951f6613d384bd532 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 20:46:40 -0400
Subject: MADS: Fix walking behind counter at Sand Bar restaurant

---
 engines/mads/nebular/nebular_scenes5.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 8be52692c6..7cdc55e03c 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2463,7 +2463,9 @@ void Scene512::actions() {
 		_vm->_dialogs->show(51233);
 	else if (_action.isAction(VERB_LOOK, NOUN_LAMP))
 		_vm->_dialogs->show(51234);
-	else if (_action.isAction(VERB_LOOK, NOUN_COUNTER))
+	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER))
 		_vm->_dialogs->show(51235);
 	else if (_action.isAction(VERB_LOOK, NOUN_ICE_CHESTS))
 		_vm->_dialogs->show(51237);
-- 
cgit v1.2.3


From 6dd6e555133dfee1fa5647bfc9ba5cabc94a5ed9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 21:15:14 -0400
Subject: MADS: Fix prior conversation list showing when crawling in vents

---
 engines/mads/user_interface.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index a53ab31968..bcd409889e 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -410,13 +410,21 @@ void UserInterface::setup(InputMode inputMode) {
 }
 
 void UserInterface::drawTextElements() {
-	if (_vm->_game->_screenObjects._inputMode) {
-		drawConversationList();
-	} else {
+	switch (_vm->_game->_screenObjects._inputMode) {
+	case kInputBuildingSentences:
 		// Draw the actions
 		drawActions();
 		drawInventoryList();
 		drawItemVocabList();
+		break;
+
+	case kInputConversation:
+		drawConversationList();
+		break;
+
+	case kInputLimitedSentences:
+	default:
+		break;
 	}
 }
 
-- 
cgit v1.2.3


From 3cb1a6dc553d5f8490728fb9fca39581d17723ed Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 21:25:15 -0400
Subject: MADS: Fix looking at magazine at security station

---
 engines/mads/nebular/nebular_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 2febbf6bbd..faf21aaa42 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -3825,7 +3825,7 @@ void Scene320::actions() {
 	else if (_action.isAction(VERB_LOOK, NOUN_DOUGHNUT))
 		_vm->_dialogs->show(32006);
 	else if (_action.isAction(VERB_LOOK, NOUN_MAGAZINE))
-		_vm->_dialogs->show(32006);
+		_vm->_dialogs->show(32007);
 	else if (_action.isAction(VERB_LOOK, NOUN_PAPER_FOOTBALL))
 		_vm->_dialogs->show(32008);
 	else if (_action.isAction(VERB_LOOK, NOUN_NEWSPAPER))
-- 
cgit v1.2.3


From 9ec28cb27f1f637cc407c6b1b50dc87aece0507f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 21:38:28 -0400
Subject: MADS: Fix trying to walk into corridor from security station

---
 engines/mads/nebular/nebular_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index faf21aaa42..2ea476008f 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -1749,7 +1749,7 @@ void Scene311::actions() {
 	else if (_checkGuardFl) {
 		_checkGuardFl = false;
 		_scene->_kernelMessages.reset();
-		_scene->_kernelMessages.addQuote(0xFA, 120, 0);
+		_scene->_kernelMessages.addQuote(250, 0, 240);
 	} else if (_action.isAction(VERB_SIT_AT, NOUN_DESK))
 		_scene->_nextSceneId = 320;
 	else if (_action.isAction(VERB_CLIMB_INTO, NOUN_AIR_VENT)) {
-- 
cgit v1.2.3


From aad048674b3d63c05742ce9091416ad5465cb541 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 22:34:40 -0400
Subject: MADS: Fix unused variable warning

---
 engines/mads/screen.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 8db034c467..6199da5925 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -685,7 +685,6 @@ void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entryS
 	int y1, y2;
 	int startX = 0;
 	int deltaX;
-	int sizeY;
 	int xAt;
 	int loopStart;
 //	uint32 baseTicks, currentTicks;
@@ -712,7 +711,7 @@ void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entryS
 
 	y1 = 0;
 	y2 = size.y - 1;
-	sizeY = y2 - y1 + 1;
+//	sizeY = y2 - y1 + 1;
 
 	if (throughBlack == THROUGH_BLACK2)
 		swapForeground(palData, &paletteMap[0]);
-- 
cgit v1.2.3


From cc0b88cc532d7708e13a6a9e22da2595223b8e49 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 23:40:50 -0400
Subject: MADS: Fix leak of SpriteAsset instances

---
 engines/mads/sprites.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index aa73fce712..19742e22b0 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -402,6 +402,7 @@ void SpriteSets::remove(int idx) {
 			(*this)[idx] = nullptr;
 		} else {
 			do {
+				delete (*this)[size() - 1];
 				remove_at(size() - 1);
 			} while (size() > 0 && (*this)[size() - 1] == nullptr);
 		}
-- 
cgit v1.2.3


From 43aad22eb2a99717b115fe2d00aaa384779eaa67 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 23:53:10 -0400
Subject: MADS: Fix SceneInfo instance leak when showing dialogs

---
 engines/mads/dialogs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index c02f027302..158d9693ad 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -430,6 +430,7 @@ void FullScreenDialog::display() {
 	if (_screenId > 0) {
 		SceneInfo *sceneInfo = SceneInfo::init(_vm);
 		sceneInfo->load(_screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
+		delete sceneInfo;
 	}
 
 	scene._priorSceneId = priorSceneId;
-- 
cgit v1.2.3


From 05250d14fa8c3b1d2d51066a18d2c96904733590 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 9 Mar 2015 08:56:33 -0400
Subject: MADS: Fix crash picking up bamboo stalk

---
 engines/mads/nebular/nebular_scenes2.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 9d5e2185e8..164b943282 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -3462,6 +3462,7 @@ void Scene209::actions() {
 
 		case 3:
 			_scene->_sprites.remove(_globals._spriteIndexes[11]);
+			_scene->_spriteSlots.fullRefresh(true);
 			break;
 		}
 		_action._inProgress = false;
-- 
cgit v1.2.3


From f37a0b215515e5466bd19c8953c4f53ff4823a59 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 9 Mar 2015 18:24:05 -0400
Subject: MADS: Improved fix for picking up plant stalk

---
 engines/mads/nebular/nebular_scenes2.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 164b943282..d62497007c 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -2838,6 +2838,7 @@ void Scene209::enter() {
 	_globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('m', 3));
 	_globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('m', 6));
 	_globals._spriteIndexes[7] = _scene->_sprites.addSprites(formAnimName('m', 8));
+	_globals._spriteIndexes[11] = _scene->_sprites.addSprites("*RXMBD_2");
 
 	_game.loadQuoteSet(0x82, 0x83, 0x84, 0x9C, 0x97, 0x95, 0x99, 0x9E, 0x98, 0x9B, 0xA0, 0x96, 0x9F,
 		0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x91, 0x92, 0x93, 0x94, 0x89, 0x85, 0x8A, 0x86, 0x87, 0x88, 0);
@@ -3439,7 +3440,6 @@ void Scene209::actions() {
 	if (_action.isAction(VERB_TAKE, NOUN_PLANT_STALK) && (_game._trigger || _game._objects.isInRoom(OBJ_PLANT_STALK))) {
 		switch (_game._trigger) {
 		case 0:
-			_globals._spriteIndexes[11] = _scene->_sprites.addSprites("*RXMBD_2");
 			_game._player._stepEnabled = false;
 			_game._player._visible = false;
 			_globals._sequenceIndexes[11] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[11], false, 3, 2, 0, 0);
@@ -3461,8 +3461,6 @@ void Scene209::actions() {
 			break;
 
 		case 3:
-			_scene->_sprites.remove(_globals._spriteIndexes[11]);
-			_scene->_spriteSlots.fullRefresh(true);
 			break;
 		}
 		_action._inProgress = false;
-- 
cgit v1.2.3


From 82faf6b50da5996b1783877a9c2685d8272ffc0e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 9 Mar 2015 20:02:55 -0400
Subject: MADS: Fix walking to exit in guard room after dropping severed arm

---
 engines/mads/nebular/nebular_scenes3.cpp | 3 +--
 engines/mads/player.cpp                  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 2ea476008f..8f07993e07 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -4152,7 +4152,7 @@ void Scene352::setup() {
 void Scene352::putArmDown(bool corridorExit, bool doorwayExit) {
 	switch (_game._trigger) {
 	case 0:
-		_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(0xFF));
+		_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0xFF));
 		_scene->_sequences.addTimer(48, 1);
 		break;
 
@@ -4197,7 +4197,6 @@ void Scene352::putArmDown(bool corridorExit, bool doorwayExit) {
 
 	case 4:
 		_game._player.walk(Common::Point(116, 107), FACING_NORTH);
-		_game._player._stepEnabled = true;
 		_mustPutArmDownFl = false;
 		_scene->_sequences.addTimer(180, 5);
 		_leaveRoomFl = true;
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 68e0355df9..38e8638415 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -664,7 +664,7 @@ void Player::startMovement() {
 	_deltaDistance = (majorChange == 0) ? 0 : _totalDistance / majorChange;
 
 	if (_playerPos.x > _targetPos.x)
-		_pixelAccum = MAX(_posChange.x, _posChange.y);
+		_pixelAccum = MIN(_posChange.x, _posChange.y);
 	else
 		_pixelAccum = 0;
 
-- 
cgit v1.2.3


From d23e493b467a24e5d61dcb936b1c2e042c3ae9ce Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 9 Mar 2015 20:35:10 -0400
Subject: MADS: Fix crash if you talk to intern in gurney room too quickly

---
 engines/mads/nebular/nebular_scenes3.cpp |  6 ++++++
 engines/mads/sequence.cpp                | 17 +++++++++++++++--
 engines/mads/sequence.h                  |  3 ++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 8f07993e07..0b22aa7720 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -2581,6 +2581,12 @@ void Scene318::handleInternDialog(int quoteId, int quoteNum, uint32 timeout) {
 	_scene->_kernelMessages.reset();
 	_internTalkingFl = true;
 
+	// WORKAROUND: In case the player launches multiple talk selections with the
+	// intern before previous ones have finished, take care of removing any
+	int seqIndex;
+	while ((seqIndex = _scene->_sequences.findByTrigger(63)) != -1)
+		_scene->_sequences.remove(seqIndex);
+
 	for (int i = 0; i < quoteNum; i++) {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_scene->_sequences.addTimer(180, 63);
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index 7dbf4cf3be..744e246321 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -144,7 +144,7 @@ int SequenceList::add(int spriteListIndex, bool flipped, int frameIndex, int tri
 	return seqIndex;
 }
 
-int SequenceList::addTimer(int timeout, int abortVal) {
+int SequenceList::addTimer(int timeout, int endTrigger) {
 	Scene &scene = _vm->_game->_scene;
 	uint seqIndex;
 	for (seqIndex = 0; seqIndex < _entries.size(); ++seqIndex) {
@@ -164,7 +164,7 @@ int SequenceList::addTimer(int timeout, int abortVal) {
 	se._entries._count = 0;
 	se._triggerMode = _vm->_game->_triggerSetupMode;
 	se._actionNouns = _vm->_game->_scene._action._activeAction;
-	addSubEntry(seqIndex, SEQUENCE_TRIGGER_EXPIRE, 0, abortVal);
+	addSubEntry(seqIndex, SEQUENCE_TRIGGER_EXPIRE, 0, endTrigger);
 
 	return seqIndex;
 }
@@ -181,6 +181,19 @@ void SequenceList::remove(int seqIndex) {
 	scene._spriteSlots.deleteTimer(seqIndex);
 }
 
+int SequenceList::findByTrigger(int trigger) {
+	for (int idx = 0; idx < _entries.size(); ++idx) {
+		if (_entries[idx]._active) {
+			for (uint subIdx = 0; subIdx < _entries[idx]._entries._count; ++subIdx) {
+				if (_entries[idx]._entries._trigger[subIdx] == trigger)
+					return idx;
+			}
+		}
+	}
+
+	return -1;
+}
+
 void SequenceList::setSpriteSlot(int seqIndex, SpriteSlot &spriteSlot) {
 	Scene &scene = _vm->_game->_scene;
 	SequenceEntry &timerEntry = _entries[seqIndex];
diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 1555232780..8b236af15e 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -101,8 +101,9 @@ public:
 		int extraTicks, int numTicks, int msgX, int msgY, bool nonFixed, int scale, int depth,
 		int frameInc, SpriteAnimType animType, int numSprites, int frameStart);
 
-	int addTimer(int timeout, int abortVal);
+	int addTimer(int timeout, int endTrigger);
 	void remove(int seqIndex);
+	int findByTrigger(int trigger);
 	void setSpriteSlot(int seqIndex, SpriteSlot &spriteSlot);
 	bool loadSprites(int seqIndex);
 	void tick();
-- 
cgit v1.2.3


From b03d46ceeb2c8969fa496298a6bfc8c49b6994f7 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 10 Mar 2015 06:39:09 +0100
Subject: MADS: Silence GCC signed/unsigned warnings

---
 engines/mads/sequence.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index 744e246321..ba0111a844 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -182,9 +182,9 @@ void SequenceList::remove(int seqIndex) {
 }
 
 int SequenceList::findByTrigger(int trigger) {
-	for (int idx = 0; idx < _entries.size(); ++idx) {
+	for (uint idx = 0; idx < _entries.size(); ++idx) {
 		if (_entries[idx]._active) {
-			for (uint subIdx = 0; subIdx < _entries[idx]._entries._count; ++subIdx) {
+			for (int subIdx = 0; subIdx < _entries[idx]._entries._count; ++subIdx) {
 				if (_entries[idx]._entries._trigger[subIdx] == trigger)
 					return idx;
 			}
-- 
cgit v1.2.3


From 98f77a66519bdf8f8004e1f78ed1822246919b58 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 20:10:55 -0400
Subject: MADS: Fix timer module hotspot remaining active after taking it

---
 engines/mads/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 6199da5925..5076bbb099 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -538,7 +538,7 @@ void ScreenObjects::elementHighlighted() {
 }
 
 void ScreenObjects::setActive(ScrCategory category, int descId, bool active) {
-	for (uint idx = 1; idx < size(); ++idx) {
+	for (uint idx = 1; idx <= size(); ++idx) {
 		ScreenObject &sObj = (*this)[idx];
 		if (sObj._category == category && sObj._descId == descId)
 			sObj._active = active;
-- 
cgit v1.2.3


From 4c765121bc0b49a115d2248850d9798303e46853 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 20:18:42 -0400
Subject: MADS: Fix door closing anim when leaving video store

---
 engines/mads/nebular/nebular_scenes6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 11e3ff78b0..7887044804 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -2574,7 +2574,7 @@ void Scene609::step() {
 
 	case 62:
 		_scene->_sequences.remove( _globals._sequenceIndexes[2]);
-		_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+		_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_hotspots.activate(NOUN_VIDEO_STORE_DOOR, true);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
-- 
cgit v1.2.3


From 0503893f1cd1f3710e65dd43c236112b62ca1ecc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 20:32:44 -0400
Subject: MADS: Improved fix for giving batteries to Herman

---
 engines/mads/nebular/globals_nebular.h   |  2 +-
 engines/mads/nebular/nebular_scenes6.cpp | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h
index ce671f653d..8d0c26d96d 100644
--- a/engines/mads/nebular/globals_nebular.h
+++ b/engines/mads/nebular/globals_nebular.h
@@ -150,7 +150,7 @@ enum GlobalId {
 	kConvHermit1			= 130,
 	kConvHermit2			= 131,
 	kHasTalkedToHermit		= 132,
-	kExecuted_1_11			= 133,
+	kHermitWantsBatteries	= 133,
 	kHandsetCellStatus		= 134,
 	kBeenInVideoStore		= 135,
 	kDurafailRecharged		= 136,
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 7887044804..0675ce1c6c 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -3275,8 +3275,7 @@ void Scene611::handleSubDialog1() {
 
 		// WORKAROUND: Fix bug in the original where the option to give Hermit batteries
 		// would be given before the player even has any batteries
-		//if (!_game._objects.isInInventory(OBJ_DURAFAIL_CELLS) && !_game._objects.isInInventory(OBJ_PHONE_CELLS))
-		//	_globals[kExecuted_1_11] = true;
+		_globals[kHermitWantsBatteries] = true;
 
 		setDialogNode(1);
 		break;
@@ -3968,14 +3967,11 @@ void Scene611::enter() {
 		_scene->_hotspots.activate(NOUN_HERMIT, false);
 	}
 
-	/* WORKAROUND: Pretty sure this is a debugging code fragment that should be ignored
-	if (_globals[kExecuted_1_11]) {
-		_dialog1.write(0x294, true);
-		_dialog1.write(0x292, false);
-		_globals[kExecuted_1_11] = true;
-	}*/
-	if ((_game._objects.isInInventory(OBJ_DURAFAIL_CELLS)) || (_game._objects.isInInventory(OBJ_PHONE_CELLS)))
-		_dialog1.write(0x294, true);
+	// WORKAROUND: Fix original adding 'give batteries' option even if you don't have them
+	if (_globals[kHermitWantsBatteries]) {
+		if ((_game._objects.isInInventory(OBJ_DURAFAIL_CELLS)) || (_game._objects.isInInventory(OBJ_PHONE_CELLS)))
+			_dialog1.write(0x294, true);
+	}
 
 	if (_duringDialogFl) {
 		_game._player._playerPos = Common::Point(237, 129);
-- 
cgit v1.2.3


From 879e44a2fb548040fdff83b82445ddea43678f32 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 20:51:55 -0400
Subject: MADS: Fix Herman's thanks for batteries speech remaining on-screen

---
 engines/mads/nebular/nebular_scenes6.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 0675ce1c6c..bcf7d73bd0 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -3829,29 +3829,29 @@ void Scene611::displayHermitQuestions(int question) {
 		Common::String curQuote = _game.getQuote(0x2D3);
 		int width = _vm->_font->getWidth(curQuote, _scene->_textSpacing);
 		int quotePosX = _defaultDialogPos.x - (width / 2);
-		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 3), 0xFDFC, 0, 0, 9999999, curQuote);
+		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 3), 0xFDFC, 0, 0, 800, curQuote);
 
 		curQuote = _game.getQuote(0x2D4);
 		width = _vm->_font->getWidth(curQuote, _scene->_textSpacing);
 		quotePosX = _defaultDialogPos.x - (width / 2);
-		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 17), 0xFDFC, 0, 0, 9999999, curQuote);
+		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 17), 0xFDFC, 0, 0, 800, curQuote);
 
 		curQuote = _game.getQuote(0x2D5);
 		width = _vm->_font->getWidth(curQuote, _scene->_textSpacing);
 		quotePosX = _defaultDialogPos.x - (width / 2);
-		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 31), 0xFDFC, 0, 0, 9999999, curQuote);
+		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 31), 0xFDFC, 0, 0, 800, curQuote);
 
 		curQuote = _game.getQuote(0x2D6);
 		width = _vm->_font->getWidth(curQuote, _scene->_textSpacing);
 		quotePosX = _defaultDialogPos.x - (width / 2);
-		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 45), 0xFDFC, 0, 0, 9999999, curQuote);
+		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 45), 0xFDFC, 0, 0, 800, curQuote);
 
 		curQuote = _game.getQuote(0x2D7);
 		width = _vm->_font->getWidth(curQuote, _scene->_textSpacing);
 		quotePosX = _defaultDialogPos.x - (width / 2);
-		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 59), 0xFDFC, 0, 0, 9999999, curQuote);
-		 }
-		 break;
+		_scene->_kernelMessages.add(Common::Point(quotePosX, _defaultDialogPos.y + 59), 0xFDFC, 0, 0, 800, curQuote);
+		}
+		break;
 
 	case 22: {
 		Common::String curQuote = _game.getQuote(0x2D8);
-- 
cgit v1.2.3


From 01c3e3b9d5dcb9393ddb659cf8f01e5dc771b38f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 21:04:36 -0400
Subject: MADS: Fix door animations for South Elevator

---
 engines/mads/nebular/nebular_scenes5.cpp | 2 +-
 engines/mads/nebular/nebular_scenes7.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 7cdc55e03c..98efeba82f 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2641,7 +2641,7 @@ void Scene513::actions() {
 			_scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[4]);
 			_game._player._visible = true;
 			_scene->_sequences.remove(_globals._sequenceIndexes[2]);
-			_globals._sequenceIndexes[2] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
+			_globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 2);
 			_vm->_sound->command(24);
 			_scene->_kernelMessages.reset();
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 006b3ca6ec..6e191b2eef 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -2287,7 +2287,7 @@ void Scene751::step() {
 
 	case 62:
 		_vm->_sound->command(17);
-		_globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
+		_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 5, 1, 0, 0);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[1], Common::Point(48, 136));
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 10);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 63);
-- 
cgit v1.2.3


From 0e03995463c7ae2c297066c89f2fb55569be0392 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 21:16:01 -0400
Subject: MADS: Fix display of crack and background in ship

---
 engines/mads/nebular/nebular_scenes8.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 24a1855c36..1a8e7efc60 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -904,10 +904,10 @@ void Scene804::enter() {
 			_game._player._stepEnabled = false;
 		}
 	} else {
-		if (_globals[kBeamIsUp] == 0)
+		if (_globals[kBeamIsUp])
 			_globals._sequenceIndexes[8] = _scene->_sequences.startCycle(_globals._spriteIndexes[8], false, 1);
 
-		if (_globals[kWindowFixed] == 0)
+		if (_globals[kWindowFixed])
 			_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
 
 		_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 1);
-- 
cgit v1.2.3


From e18a0af32b77901419865ccc8942c66cbd88e8bd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 22:17:48 -0400
Subject: MADS: Fix incorrect depth for animation when repairing crack in ship

---
 engines/mads/nebular/nebular_scenes8.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 1a8e7efc60..e18dfc634d 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -904,8 +904,10 @@ void Scene804::enter() {
 			_game._player._stepEnabled = false;
 		}
 	} else {
-		if (_globals[kBeamIsUp])
+		if (_globals[kBeamIsUp]) {
 			_globals._sequenceIndexes[8] = _scene->_sequences.startCycle(_globals._spriteIndexes[8], false, 1);
+			_scene->_sequences.setDepth(_globals._sequenceIndexes[8], 7);
+		}
 
 		if (_globals[kWindowFixed])
 			_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, 1);
-- 
cgit v1.2.3


From 1e3442ae44e804c17e51d84972092fc459908ece Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 10 Mar 2015 22:54:47 -0400
Subject: MADS: Fix boat hotspot after loading savegame for scene 801

---
 engines/mads/nebular/nebular_scenes7.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 6e191b2eef..96e56b639a 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -155,10 +155,13 @@ void Scene701::enter() {
 		_globals._sequenceIndexes[6] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[6], false, 20, 0, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[6], 10);
 		break;
-	case BOAT_TIED:
+	case BOAT_TIED: {
 		_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, -1);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 9);
+		int idx = _scene->_dynamicHotspots.add(837, 759, _globals._sequenceIndexes[2], Common::Rect());
+		_scene->_dynamicHotspots.setPosition(idx, Common::Point(231, 127), FACING_NORTH);
 		break;
+	}
 	case BOAT_GONE:
 		_scene->_hotspots.activate(NOUN_BOAT, false);
 		break;
-- 
cgit v1.2.3


From 8e3ee9523edb3aa47ad512bef82ce535f69042d9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 11 Mar 2015 22:10:41 -0400
Subject: MADS: Fix cycling remaining active when ending TextView starts

---
 engines/mads/scene.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index a72648f0c9..bbc83a791b 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -666,6 +666,7 @@ void Scene::freeCurrentScene() {
 	}
 
 	_vm->_palette->_paletteUsage.load(nullptr);
+	_cyclingActive = false;
 	_hotspots.clear();
 	_backgroundSurface.free();
 	_depthSurface.free();
-- 
cgit v1.2.3


From ed33dee7539c6b05f7dba18fb87cdd44c09ba3cd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 13 Mar 2015 08:43:27 -0400
Subject: MADS: Fix distortions when playing many of the sounds

---
 engines/mads/nebular/sound_nebular.cpp | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index d41d0075eb..6412654fd6 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -594,7 +594,7 @@ void ASound::pollActiveChannel() {
 						break;
 
 					case 8:
-						chan->_field1D = *++pSrc;
+						chan->_field1D = (int8)*++pSrc;
 						chan->_pSrc += 2;
 						break;
 
@@ -733,8 +733,8 @@ void ASound::updateChannelState() {
 		resultCheck();
 	} else {
 		int reg = 0xA0 + _activeChannelNumber;
-		int vTimes = (_activeChannelPtr->_field4 + _activeChannelPtr->_field1F) / 12;
-		int vOffset = (_activeChannelPtr->_field4 + _activeChannelPtr->_field1F) % 12;
+		int vTimes = (byte)(_activeChannelPtr->_field4 + _activeChannelPtr->_field1F) / 12;
+		int vOffset = (byte)(_activeChannelPtr->_field4 + _activeChannelPtr->_field1F) % 12;
 		int val = _vList1[vOffset] + _activeChannelPtr->_field1D;
 		write2(8, reg, val & 0xFF);
 
@@ -751,17 +751,6 @@ static const int outputIndexes[] = {
 static const int outputChannels[] = {
 	0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21, 0
 };
-static const int volumeList[] = {
-	0x3F, 0x3F, 0x36, 0x31, 0x2D, 0x2A, 0x28, 0x26, 0x24, 0x22, 0x21, 0x20, 0x1F, 0x1E, 0x1D, 0x1C,
-	0x1B, 0x1A, 0x19, 0x19, 0x18, 0x17, 0x17, 0x16, 0x16, 0x15, 0x15, 0x14, 0x14, 0x13, 0x12, 0x12,
-	0x11, 0x11, 0x10, 0x10, 0x0F, 0x0F, 0x0E, 0x0E, 0x0D, 0x0D, 0x0C, 0x0C, 0x0B, 0x0B, 0x0A, 0x0A,
-	0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04,
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
 
 void ASound::updateActiveChannel() {
 	int reg = 0x40 + outputChannels[outputIndexes[_activeChannelNumber * 2 + 1]];
@@ -770,13 +759,9 @@ void ASound::updateActiveChannel() {
 
 	// Note: Original had a whole block not seeming to be used, since the initialisation
 	// sets a variable to 5660h, and doesn't change it, so the branch is never taken
-	int val = CLIP(newVolume - volumeList[_activeChannelPtr->_fieldD], 0, 63);
-	val = (63 - val) | portVal;
+	portVal |= 63 - newVolume;
 
-	int val2 = CLIP(newVolume - volumeList[-(_activeChannelPtr->_fieldD - 127)], 0, 63);
-	val2 = (63 - val2) | portVal;
-	write2(0, reg, val);
-	write2(2, reg, val2);
+	write2(8, reg, portVal);
 }
 
 void ASound::loadSample(int sampleIndex) {
-- 
cgit v1.2.3


From c0df1248b5a73f4b0f02d0712907878aa265dff4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 13 Mar 2015 21:54:20 -0400
Subject: MADS: Properly handle reloading scenes when closing dialogs

---
 engines/mads/nebular/dialogs_nebular.cpp | 18 +++++++++++-----
 engines/mads/nebular/nebular_scenes.cpp  |  2 +-
 engines/mads/nebular/nebular_scenes1.cpp | 28 ++++++++++++------------
 engines/mads/nebular/nebular_scenes2.cpp | 28 ++++++++++++------------
 engines/mads/nebular/nebular_scenes3.cpp | 37 ++++++++++++++++----------------
 engines/mads/nebular/nebular_scenes4.cpp | 20 ++++++++---------
 engines/mads/nebular/nebular_scenes5.cpp | 26 +++++++++++-----------
 engines/mads/nebular/nebular_scenes6.cpp | 20 ++++++++---------
 engines/mads/nebular/nebular_scenes7.cpp | 16 +++++++-------
 engines/mads/nebular/nebular_scenes8.cpp |  6 +++---
 engines/mads/scene.h                     |  2 ++
 11 files changed, 107 insertions(+), 96 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 23aef6bdb5..6c57c85408 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -344,7 +344,7 @@ void DialogsNebular::showDialog() {
 
 void DialogsNebular::showScummVMSaveDialog() {
 	Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
-	Scene *scene = &(game._scene);
+	Scene &scene = game._scene;
 	GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
 
 	int slot = dialog->runModalWithCurrentTarget();
@@ -356,24 +356,31 @@ void DialogsNebular::showScummVMSaveDialog() {
 			desc = dialog->createDefaultSaveDescription(slot);
 		}
 
-		scene->_spriteSlots.reset();
-		scene->loadScene(scene->_currentSceneId, game._aaName, true);
-		scene->_userInterface.noInventoryAnim();
+		scene._spriteSlots.reset();
+		scene.loadScene(scene._currentSceneId, game._aaName, true);
+		scene._userInterface.noInventoryAnim();
 		game._scene.drawElements(kTransitionFadeIn, false);
 
 		game.saveGame(slot, desc);
 	}
+
+	// Flag for scene loading that we're returning from a dialog
+	scene._currentSceneId = RETURNING_FROM_DIALOG;
 }
 
 void DialogsNebular::showScummVMRestoreDialog() {
 	Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
 	GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false);
+	Scene &scene = game._scene;
 
 	int slot = dialog->runModalWithCurrentTarget();
 	if (slot >= 0) {
 		game._loadGameSlot = slot;
-		game._scene._currentSceneId = -1;
+		game._scene._currentSceneId = RETURNING_FROM_LOADING;
 		game._currentSectionNumber = -1;
+	} else {
+		// Flag for scene loading that we're returning from a dialog
+		scene._currentSceneId = RETURNING_FROM_DIALOG;
 	}
 }
 
@@ -637,6 +644,7 @@ void GameDialog::display() {
 
 GameDialog::~GameDialog() {
 	_vm->_screen.resetClipBounds();
+	_vm->_game->_scene._currentSceneId = RETURNING_FROM_DIALOG;
 }
 
 void GameDialog::clearLines() {
diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index 72073b1c7b..14cf71d0fc 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -538,7 +538,7 @@ void SceneTeleporter::teleporterEnter() {
 	_curMessageId        = -1;
 	_msgText = "_";
 
-	if (_scene->_priorSceneId == -2)
+	if (_scene->_priorSceneId == RETURNING_FROM_DIALOG)
 		_scene->_priorSceneId = _globals[kTeleporterDestination];
 
 	if (_scene->_priorSceneId < 101)
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index d505bb3d4e..dc2eb1f068 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -188,13 +188,13 @@ void Scene101::enter() {
 	_scene->_hotspots.activate(NOUN_SHIELD_MODULATOR, false);
 	_panelOpened = false;
 
-	if (_scene->_priorSceneId != -1)
+	if (_scene->_priorSceneId != RETURNING_FROM_LOADING)
 		_globals[kNeedToStandUp] = false;
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(100, 152);
 
-	if ((_scene->_priorSceneId == 112) || ((_scene->_priorSceneId == -2) && _sittingFl )) {
+	if ((_scene->_priorSceneId == 112) || ((_scene->_priorSceneId == RETURNING_FROM_DIALOG) && _sittingFl )) {
 		_game._player._visible = false;
 		_sittingFl = true;
 		_game._player._playerPos = Common::Point(161, 123);
@@ -721,7 +721,7 @@ void Scene102::enter() {
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[6], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
 	} else if (_scene->_priorSceneId == 103)
 		_game._player._playerPos = Common::Point(47, 152);
-	else if (_scene->_priorSceneId != -2) {
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._facing = FACING_NORTHWEST;
 		_game._player._playerPos = Common::Point(32, 129);
 	}
@@ -1342,7 +1342,7 @@ void Scene103::enter() {
 		_scene->_hotspots.activate(362, false);
 	}
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(237, 74);
 
 	if (_scene->_priorSceneId == 102) {
@@ -1625,7 +1625,7 @@ void Scene104::enter() {
 
 	if (_scene->_priorSceneId == 105)
 		_game._player._playerPos = Common::Point(302, 107);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(160, 134);
 
 	_loseFl = false;
@@ -1847,7 +1847,7 @@ void Scene105::enter() {
 
 	if (_scene->_priorSceneId == 104)
 		_game._player._playerPos = Common::Point(13, 97);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(116, 147);
 
 	_game.loadQuoteSet(0x4A, 0x4B, 0x4C, 0x35, 0x34, 0);
@@ -2021,7 +2021,7 @@ void Scene106::enter() {
 		_game._player._stepEnabled = false;
 		_game._player._facing = FACING_EAST;
 		_game._player._playerPos = Common::Point(106, 69);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		if (_scene->_priorSceneId == 107) {
 			_game._player._playerPos = Common::Point(319, 84);
 			_game._player._facing = _game._player._prepareWalkFacing = FACING_WEST;
@@ -2240,7 +2240,7 @@ void Scene107::enter() {
 		_game._player._playerPos = Common::Point(132, 47);
 	else if (_scene->_priorSceneId == 106)
 		_game._player._playerPos = Common::Point(20, 91);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(223, 151);
 
 	if (((_scene->_priorSceneId == 105) || (_scene->_priorSceneId == 106)) && (_vm->getRandomNumber(1, 3) == 1)) {
@@ -2352,7 +2352,7 @@ void Scene108::enter() {
 
 	if (_scene->_priorSceneId == 107)
 		_game._player._playerPos = Common::Point(138, 58);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(305, 98);
 
 	_game.loadQuoteSet(0x4A, 0x4B, 0x4C, 0x35, 0x34, 0);
@@ -2459,7 +2459,7 @@ void Scene109::enter() {
 	if (_scene->_priorSceneId == 110) {
 		_game._player._playerPos = Common::Point(248, 38);
 		_globals[kHoovicSated] = 2;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(20, 68);
 		_game._player._facing = FACING_EAST;
 	}
@@ -2865,7 +2865,7 @@ void Scene110::enter() {
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(-1, 0), FACING_NONE);
 		idx = _scene->_dynamicHotspots.add(91, 348, _globals._sequenceIndexes[3], Common::Rect(0, 0, 0, 0));
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(-1, 0), FACING_NONE);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(194, 23);
 		_game._player._facing = FACING_SOUTH;
 		_game._player._visible = false;
@@ -3008,7 +3008,7 @@ void Scene111::enter() {
 	_launched2Fl = false;
 	_stampedFl = false;
 
-	if ((_scene->_priorSceneId < 201) && (_scene->_priorSceneId != -2)) {
+	if ((_scene->_priorSceneId < 201) && (_scene->_priorSceneId != RETURNING_FROM_DIALOG)) {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		_scene->loadAnimation(Resources::formatName(111, 'A', 0, EXT_AA, ""), 70);
@@ -3019,7 +3019,7 @@ void Scene111::enter() {
 		_launched2Fl = true;
 
 		_vm->_sound->command(36);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(300, 130);
 		_game._player._facing = FACING_WEST;
 	}
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index d62497007c..84910c4de3 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -152,7 +152,7 @@ void Scene201::enter() {
 	int idx = _scene->_dynamicHotspots.add(NOUN_BIRDS, 209, _globals._sequenceIndexes[4], Common::Rect(0, 0, 0, 0));
 	_scene->_dynamicHotspots.setPosition(idx, Common::Point(186, 81), FACING_NORTH);
 
-	if ((_scene->_priorSceneId == 202) || (_scene->_priorSceneId == -1)) {
+	if ((_scene->_priorSceneId == 202) || (_scene->_priorSceneId == RETURNING_FROM_LOADING)) {
 		_game._player._playerPos = Common::Point(165, 152);
 	} else {
 		_game._player._playerPos = Common::Point(223, 149);
@@ -430,7 +430,7 @@ void Scene202::enter() {
 	if (_scene->_priorSceneId == 201) {
 		_game._player._playerPos = Common::Point(190, 91);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(178, 152);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -446,7 +446,7 @@ void Scene202::enter() {
 	_game.loadQuoteSet(0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x62, 0x63, 0x64, 0x65, 0x66, 0x61, 0);
 	_activeMsgFl = false;
 
-	if (_scene->_priorSceneId == -2) {
+	if (_scene->_priorSceneId == RETURNING_FROM_DIALOG) {
 		if (_waitingMeteoFl) {
 			_globals._sequenceIndexes[9] = _scene->_sequences.startCycle(_globals._spriteIndexes[9], false, 1);
 			_game._player._visible = false;
@@ -1044,7 +1044,7 @@ void Scene203::enter() {
 	} else if (_scene->_priorSceneId == 209) {
 		_game._player._playerPos = Common::Point(308, 117);
 		_game._player._facing = FACING_WEST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(155, 152);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -1222,7 +1222,7 @@ void Scene205::enter() {
 			Common::Rect(195, 99, 264, 134), 13, 2, 0xFDFC, 60,
 			108, 108, 109, 109, 110, 110, 111, 108, 0);
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(99, 152);
 
 	if (_globals[kSexOfRex] != SEX_MALE) {
@@ -1516,7 +1516,7 @@ void Scene207::enter() {
 	} else if (_scene->_priorSceneId == 214) {
 		_game._player._playerPos = Common::Point(164, 117);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(305, 131);
 	}
 
@@ -1728,7 +1728,7 @@ void Scene208::enter() {
 	} else if (_scene->_priorSceneId == 209) {
 		_game._player._playerPos = Common::Point(307, 123);
 		_game._player._facing = FACING_WEST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(162, 149);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -2856,7 +2856,7 @@ void Scene209::enter() {
 	if (_scene->_priorSceneId == 208) {
 		_game._player._playerPos = Common::Point(11, 121);
 		_game._player._facing = FACING_EAST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(28, 121);
 		_game._player._facing = FACING_SOUTH;
 	}
@@ -4173,7 +4173,7 @@ void Scene210::enter() {
 		_game._player._playerPos = Common::Point(168, 128);
 		_game._player._facing = FACING_SOUTH;
 		_globals[kCurtainOpen] = true;
-	} else if (_scene->_priorSceneId != -2)
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(308, 132);
 
 	if (!_globals[kCurtainOpen]) {
@@ -4210,7 +4210,7 @@ void Scene210::enter() {
 	_twinkleAnimationType = 0;
 	_twinklesCurrentFrame = 0;
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_shouldMoveHead = false;
 		_shouldFaceRex = false;
 		_shouldTalk = false;
@@ -4647,7 +4647,7 @@ void Scene211::enter() {
 		_game._player._visible = false;
 		_scene->loadAnimation(formAnimName('A', -1), 100);
 		_scene->_activeAnimation->setCurrentFrame(169);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(310, 31);
 		_game._player._facing = FACING_SOUTHWEST;
 	}
@@ -4905,7 +4905,7 @@ void Scene212::enter() {
 	if (_scene->_priorSceneId == 208) {
 		_game._player._playerPos = Common::Point(195, 85);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(67, 117);
 		_game._player._facing = FACING_NORTHEAST;
 	}
@@ -5061,7 +5061,7 @@ void Scene214::enter() {
 		_scene->_hotspots.activate(NOUN_BLOWGUN, false);
 	}
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(191, 152);
 
 	sceneEntrySound();
@@ -5257,7 +5257,7 @@ void Scene215::enter() {
 		_game._player._stepEnabled = false;
 		_globals._sequenceIndexes[3] = _scene->_sequences.startCycle(_globals._spriteIndexes[3], false, 1);
 		_scene->_sequences.addTimer(120, 70);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(204, 152);
 		_game._player._facing = FACING_NORTH;
 	}
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 0b22aa7720..1a477c3bb8 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -769,7 +769,7 @@ void Scene307::enter() {
 		_dialog2.write(0x11E, true);
 
 
-	if (_scene->_priorSceneId == -2) {
+	if (_scene->_priorSceneId == RETURNING_FROM_DIALOG) {
 		if (_grateOpenedFl)
 			_vm->_sound->command(10);
 		else
@@ -1618,7 +1618,7 @@ void Scene311::enter() {
 	else if (_scene->_priorSceneId == 320) {
 		_game._player._playerPos = Common::Point(129, 113);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._visible = false;
 		_game._player._stepEnabled = false;
 		_scene->loadAnimation(formAnimName('a', -1), 70);
@@ -1896,7 +1896,7 @@ void Scene313::enter() {
 	} else if (_scene->_priorSceneId == 388) {
 		_game._player._playerPos = Common::Point(199, 70);
 		_game._player._facing = FACING_WEST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(234, 70);
 		_game._player._facing = FACING_WEST;
 	}
@@ -2215,7 +2215,7 @@ void Scene316::enter() {
 		_globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[spriteIdx], false, 6, 1, 0, 0);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 60);
-	} else if (_scene->_priorSceneId != -2)
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(291, 126);
 
 	sceneEntrySound();
@@ -2617,7 +2617,7 @@ void Scene318::enter() {
 
 	if (_scene->_priorSceneId == 357)
 		_game._player._playerPos = Common::Point(15, 110);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(214, 152);
 
 	_dialog1.setup(0x47, 0x191, 0x192, 0x193, 0x194, 0x195, 0x196, 0x197, 0x198, 0x199, 0x19A, 0x19B, 0x19C, 0x19D, 0);
@@ -2638,7 +2638,7 @@ void Scene318::enter() {
 	_lastFrame = 0;
 	_scene->_hotspots.activate(NOUN_INTERN, false);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_dialogFl = false;
 		_internWalkingFl = false;
 		_counter= 0;
@@ -2655,7 +2655,8 @@ void Scene318::enter() {
 		0x1C8, 0x1C9, 0x1CA, 0x1CB, 0x1CC, 0x1CD, 0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3,
 		0x190, 0x19D, 0);
 
-	if ((_scene->_priorSceneId== -2) || (((_scene->_priorSceneId == 318) || (_scene->_priorSceneId == -1)) && (!_globals[kAfterHavoc]))) {
+	if ((_scene->_priorSceneId == RETURNING_FROM_DIALOG) || (((_scene->_priorSceneId == 318) || 
+			(_scene->_priorSceneId == RETURNING_FROM_LOADING)) && (!_globals[kAfterHavoc]))) {
 		if (!_globals[kAfterHavoc]) {
 			_game._player._visible = false;
 			_globals._spriteIndexes[2] = _scene->_sprites.addSprites(formAnimName('g', -1));
@@ -3119,7 +3120,7 @@ void Scene319::enter() {
 	_dialog2.setup(0x44, 0x171, 0x172, 0x173, 0x174, 0x175, 0x176, 0);
 	_dialog3.setup(0x45, 0x17D, 0x17E, 0x17F, 0x180, 0x181, 0x182, 0x183, 0);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_dialog1.set(0x165, 0x166, 0x167, 0x168, 0);
 		_dialog2.set(0x171, 0x172, 0x173, 0x174, 0);
 		_dialog3.set(0x17D, 0x17E, 0x17F, 0x180, 0);
@@ -3142,7 +3143,7 @@ void Scene319::enter() {
 
 	_scene->loadAnimation(formAnimName('b', 0));
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_animMode = 1;
 		_nextAction1 = 2;
 		_nextAction2 = 2;
@@ -3981,7 +3982,7 @@ void Scene351::enter() {
 
 	if (_scene->_priorSceneId == 352)
 		_game._player._playerPos = Common::Point(148, 152);
-	else if (_scene->_priorSceneId != -2) {
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(207, 81);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -4266,7 +4267,7 @@ void Scene352::enter() {
 
 	_vaultOpenFl = false;
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_mustPutArmDownFl = false;
 		if (!_game._visitedScenes._sceneRevisited)
 			_globals[kHaveYourStuff] = false;
@@ -4281,7 +4282,7 @@ void Scene352::enter() {
 
 	if (_scene->_priorSceneId == 353)
 		_game._player._playerPos = Common::Point(171, 155);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(116, 107);
 
 	sceneEntrySound();
@@ -4750,7 +4751,7 @@ void Scene354::enter() {
 		_game._player._facing = FACING_NORTH;
 	} else if (_scene->_priorSceneId == 316)
 		_game._player._playerPos = Common::Point(71, 107);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(167, 57);
 
 	sceneEntrySound();
@@ -4817,7 +4818,7 @@ void Scene357::enter() {
 		_game._player._playerPos = Common::Point(298, 142);
 	else if (_scene->_priorSceneId == 313)
 		_game._player._playerPos = Common::Point(127, 101);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(15, 148);
 
 	sceneEntrySound();
@@ -4881,7 +4882,7 @@ void Scene358::enter() {
 
 	if (_scene->_priorSceneId == 357)
 		_game._player._playerPos = Common::Point(305, 142);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(12, 141);
 
 	sceneEntrySound();
@@ -4957,7 +4958,7 @@ void Scene359::enter() {
 
 	if (_scene->_priorSceneId == 358)
 		_game._player._playerPos = Common::Point(301, 141);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(15, 148);
 
 	sceneEntrySound();
@@ -5080,7 +5081,7 @@ void Scene360::enter() {
 
 	if (_scene->_priorSceneId == 359)
 		_game._player._playerPos = Common::Point(304, 143);
-	else if (_scene->_priorSceneId != -2)
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(13, 141);
 
 	sceneEntrySound();
@@ -5346,7 +5347,7 @@ void Scene361::enter() {
 	else if (_scene->_priorSceneId == 320) {
 		_game._player._playerPos = Common::Point(129, 113);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2)
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(13, 145);
 
 	_game.loadQuoteSet(0xFB, 0xFC, 0);
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 9db597c312..29b17c42c0 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -113,7 +113,7 @@ void Scene401::setup() {
 }
 
 void Scene401::enter() {
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_northFl = false;
 
 	_timer = 0;
@@ -125,7 +125,7 @@ void Scene401::enter() {
 		_game._player._playerPos = Common::Point(149, 90);
 		_game._player._facing = FACING_SOUTH;
 		_northFl = true;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(142, 131);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -718,7 +718,7 @@ void Scene402::enter() {
 		_roxOnStool = false;
 		_bartenderDialogNode = 1;
 		_conversationFl = false;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(160, 150);
 		_game._player._facing = FACING_NORTH;
 		_game._objects.addToInventory(OBJ_CREDIT_CHIP);
@@ -2411,7 +2411,7 @@ void Scene405::enter() {
 	} else if (_scene->_priorSceneId == 413) {
 		_game._player._playerPos = Common::Point(284, 109);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(23, 123);
 		_game._player._facing = FACING_EAST;
 	}
@@ -2587,7 +2587,7 @@ void Scene406::enter() {
 	} else if (_scene->_priorSceneId == 411) {
 		_game._player._playerPos = Common::Point(153, 108);
 		_game._player._facing = FACING_SOUTH;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(15, 129);
 		_game._player._facing = FACING_EAST;
 	}
@@ -2791,14 +2791,14 @@ void Scene407::setup() {
 }
 
 void Scene407::enter() {
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_fromNorth = false;
 
 	if (_scene->_priorSceneId == 318) {
 		_game._player._playerPos = Common::Point(172, 92);
 		_game._player._facing = FACING_SOUTH;
 		_fromNorth = true;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(172, 132);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -3118,7 +3118,7 @@ void Scene410::enter() {
 	else
 		_scene->_hotspots.activate(NOUN_CHARGE_CASES, false);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(155, 150);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -3646,7 +3646,7 @@ void Scene411::enter() {
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(220, 121), FACING_NORTHEAST);
 	}
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(60, 146);
 		_game._player._facing = FACING_NORTHEAST;
 	}
@@ -4058,7 +4058,7 @@ void Scene413::enter() {
 		_game._player._playerPos = Common::Point(142, 146);
 		_game._player._facing = FACING_NORTH;
 		_game._player._visible = true;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		if (_globals[kSexOfRex] == REX_MALE) {
 			_scene->loadAnimation(Resources::formatName(413, 'd', 1, EXT_AA, ""), 78);
 			_vm->_sound->command(30);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 98efeba82f..e6ab658eb4 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -199,7 +199,7 @@ void Scene501::enter() {
 		_game._player._playerPos = Common::Point(317, 102);
 		_game._player._facing = FACING_SOUTHWEST;
 		_scene->_sequences.addTimer(15, 80);
-	} else if (_scene->_priorSceneId != -2)
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(299, 131);
 
 	if (_scene->_roomChanged) {
@@ -563,7 +563,7 @@ void Scene503::enter() {
 		_scene->_dynamicHotspots.setPosition(_detonatorHotspotId, Common::Point(254, 135), FACING_SOUTH);
 	}
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(191, 152);
 		_game._player._facing = FACING_NORTHWEST;
 	}
@@ -709,7 +709,7 @@ void Scene504::enter() {
 		_globals._spriteIndexes[3] = _scene->_sprites.addSprites(formAnimName('a', 3));
 		_carAnimationMode = 1;
 		_scene->loadAnimation(formAnimName('A', -1));
-		if ((_scene->_priorSceneId != -2) && (_scene->_priorSceneId != 505))
+		if ((_scene->_priorSceneId != RETURNING_FROM_DIALOG) && (_scene->_priorSceneId != 505))
 			_globals[kHoverCarLocation] = _scene->_priorSceneId;
 
 		_globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, 1);
@@ -912,7 +912,7 @@ void Scene505::enter() {
 	_globals._spriteIndexes[11] = _scene->_sprites.addSprites(formAnimName('t', -1));
 	_globals._spriteIndexes[12] = _scene->_sprites.addSprites(formAnimName('e', -1));
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_globals._sequenceIndexes[12] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[12], false, 6, 1, 0, 0);
 
 	_globals._sequenceIndexes[13] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[13], false, 6, 1, 120, 0);
@@ -934,7 +934,7 @@ void Scene505::enter() {
 	for (int i = 0; i < 9; i++) {
 		if (_globals[kHoverCarLocation] == _carLocations[i]) {
 			_homeSelectedId = i;
-			if (_scene->_priorSceneId != -2)
+			if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 				_selectedId = i;
 		}
 	}
@@ -1222,7 +1222,7 @@ void Scene506::enter() {
 		_game._player._facing = FACING_SOUTHEAST;
 		_scene->_sequences.addTimer(60, 80);
 		_game._player._stepEnabled = false;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(138, 116);
 		_game._player._facing = FACING_NORTHEAST;
 		_game._player._visible = false;
@@ -1471,7 +1471,7 @@ void Scene507::enter() {
 		_scene->_dynamicHotspots.setPosition(_penlightHotspotId, Common::Point(233, 152), FACING_SOUTHEAST);
 	}
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(121, 147);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -1630,7 +1630,7 @@ void Scene508::enter() {
 	if (_scene->_priorSceneId == 515) {
 		_game._player._playerPos = Common::Point(57, 116);
 		_game._player._facing = FACING_NORTHEAST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(289, 139);
 		_game._player._facing = FACING_WEST;
 	}
@@ -1868,7 +1868,7 @@ void Scene511::enter() {
 	_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('c', 0));
 	_globals._spriteIndexes[4] = _scene->_sprites.addSprites("*RXCD_6");
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_handingLine = false;
 
 	if (_globals[kBoatRaised]) {
@@ -1923,7 +1923,7 @@ void Scene511::enter() {
 	if (_scene->_priorSceneId == 512) {
 		_game._player._playerPos = Common::Point(60, 112);
 		_game._player._facing = FACING_SOUTHEAST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(55, 152);
 		_game._player._facing = FACING_NORTHWEST;
 		_game._player._visible = false;
@@ -2242,7 +2242,7 @@ void Scene512::enter() {
 	} else
 		_scene->_hotspots.activate(NOUN_PADLOCK_KEY, false);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(144, 152);
 		_game._player._facing = FACING_NORTHEAST;
 	}
@@ -2510,7 +2510,7 @@ void Scene513::enter() {
 		_game._player._facing = FACING_WEST;
 		_game._player._stepEnabled = false;
 		_scene->_sequences.addTimer(15, 80);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(63, 149);
 		_game._player._facing = FACING_NORTHEAST;
 		_game._player._visible = false;
@@ -2744,7 +2744,7 @@ void Scene551::enter() {
 
 	if (_scene->_priorSceneId == 501)
 		_game._player._playerPos = Common::Point(18, 130);
-	else if (_scene->_priorSceneId != -2) {
+	else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(124, 119);
 		_game._player._facing = FACING_NORTH;
 	}
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index bcf7d73bd0..046782b772 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -112,7 +112,7 @@ void Scene601::enter() {
 		_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, -2);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 3);
 		_scene->loadAnimation(formAnimName('R', 1), 70);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(229, 129);
 		_game._player._facing = FACING_SOUTHWEST;
 	}
@@ -293,7 +293,7 @@ void Scene602::enter() {
 	if (_scene->_priorSceneId == 603) {
 		_game._player._playerPos = Common::Point(228, 126);
 		_game._player._facing = FACING_WEST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(50, 127);
 		_game._player._facing = FACING_EAST;
 	}
@@ -585,7 +585,7 @@ void Scene603::enter() {
 		_scene->_dynamicHotspots.setPosition(_noteHotspotId, Common::Point(242, 118), FACING_NORTHEAST);
 	}
 
-	if (_scene->_priorSceneId != -2)
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG)
 		_game._player._playerPos = Common::Point(113, 134);
 
 	sceneEntrySound();
@@ -750,7 +750,7 @@ void Scene604::enter() {
 	_vm->_palette->setEntry(253, 45, 24, 17);
 	_animationActiveFl = false;
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(72, 149);
 		_game._player._facing = FACING_NORTHEAST;
 		_game._player._visible = false;
@@ -1106,7 +1106,7 @@ void Scene607::enter() {
 	if (_scene->_priorSceneId == 608) {
 		_game._player._playerPos = Common::Point(297, 50);
 		_game._player._facing = FACING_SOUTHEAST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(40, 104);
 		_game._player._facing = FACING_SOUTHEAST;
 		_game._player._visible = false;
@@ -1778,7 +1778,7 @@ void Scene608::enter() {
 	_vm->_palette->setEntry(252, 63, 44, 30);
 	_vm->_palette->setEntry(253, 63, 20, 22);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(46, 132);
 		_game._player._facing = FACING_EAST;
 		if (_game._difficulty == DIFFICULTY_HARD) {
@@ -2535,7 +2535,7 @@ void Scene609::enter() {
 		_game._player._facing = FACING_EAST;
 		_scene->_sequences.addTimer(60, 60);
 		_game._player._stepEnabled = false;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(86, 136);
 		_game._player._facing = FACING_NORTHEAST;
 		_game._player._visible = false;
@@ -2884,7 +2884,7 @@ void Scene610::enter() {
 	if (_scene->_roomChanged && _game._difficulty != DIFFICULTY_EASY)
 		_game._objects.addToInventory(OBJ_PENLIGHT);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(175, 152);
 		_game._player._facing = FACING_NORTHWEST;
 	}
@@ -3948,7 +3948,7 @@ void Scene611::enter() {
 	_alreadyTalkingFl = false;
 	_startTradingFl = false;
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(22, 132);
 		_game._player._facing = FACING_EAST;
 		_duringDialogFl = false;
@@ -4560,7 +4560,7 @@ void Scene612::enter() {
 	_globals._sequenceIndexes[2] = _scene->_sequences.startCycle(_globals._spriteIndexes[2], false, _cycleIndex);
 	_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1);
 
-	if (_scene->_priorSceneId != -2) {
+	if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(280, 75);
 		_game._player._facing = FACING_SOUTHWEST;
 		_game._player._visible = false;
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 96e56b639a..7be66670d5 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -194,7 +194,7 @@ void Scene701::enter() {
 		_game._player._stepEnabled = false;
 		_scene->loadAnimation(formAnimName('B', 1), 80);
 		_vm->_sound->command(28);
-	} else if (_scene->_priorSceneId != -2 && _scene->_priorSceneId != 620) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG && _scene->_priorSceneId != 620) {
 		_game._player._playerPos = Common::Point(22, 131);
 		_game._player._facing = FACING_EAST;
 		_game._player._stepEnabled = false;
@@ -463,7 +463,7 @@ void Scene702::enter() {
 	if (_scene->_priorSceneId == 701) {
 		_game._player._playerPos = Common::Point(13, 145);
 		_game._player._facing = FACING_EAST;
-	} else if (_scene->_priorSceneId != -2 && _scene->_priorSceneId != 620) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG && _scene->_priorSceneId != 620) {
 		_game._player._playerPos = Common::Point(289, 138);
 		_game._player.walk(Common::Point(262, 148), FACING_WEST);
 		_game._player._facing = FACING_WEST;
@@ -697,7 +697,7 @@ void Scene703::enter() {
 		_monsterMode = 0;
 		_scene->loadAnimation(formAnimName('A', -1));
 		_scene->_activeAnimation->setCurrentFrame(34);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._stepEnabled = false;
 		_boatDir = 1;
 		if (_globals[kMonsterAlive]) {
@@ -1244,7 +1244,7 @@ void Scene704::enter() {
 		_boatDirection = 2;
 		_scene->loadAnimation(formAnimName('A', -1));
 		_scene->_activeAnimation->setCurrentFrame(36);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._stepEnabled = false;
 		_boatDirection = 1;
 		_scene->loadAnimation(formAnimName('A', -1));
@@ -1570,7 +1570,7 @@ void Scene705::enter() {
 		_globals._sequenceIndexes[3] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[3], false, 9, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 1, 4);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._stepEnabled = false;
 		_scene->_sequences.addTimer(1, 80);
 		_vm->_sound->command(28);
@@ -1857,7 +1857,7 @@ void Scene706::enter() {
 	if (_scene->_priorSceneId == 707) {
 		_game._player._playerPos = Common::Point(277, 103);
 		_game._player._facing = FACING_SOUTHWEST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(167, 152);
 		_game._player._facing = FACING_NORTH;
 	}
@@ -2216,7 +2216,7 @@ void Scene751::enter() {
 		_globals._sequenceIndexes[4] = _scene->_sequences.startCycle(_globals._spriteIndexes[4], false, -2);
 		_scene->_sequences.setPosition(_globals._sequenceIndexes[4], Common::Point(155, 129));
 		_scene->_sequences.addTimer(15, 70);
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(22, 131);
 		_game._player._facing = FACING_EAST;
 		_game._player._stepEnabled = false;
@@ -2530,7 +2530,7 @@ void Scene752::enter() {
 	if (_scene->_priorSceneId == 751) {
 		_game._player._playerPos = Common::Point(13, 145);
 		_game._player._facing = FACING_EAST;
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(289, 138);
 		_game._player.walk(Common::Point(262, 148), FACING_WEST);
 		_game._player._facing = FACING_WEST;
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index e18dfc634d..8ce559b82b 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -121,7 +121,7 @@ void Scene801::enter() {
 		_game._player._playerPos = Common::Point(307, 111);
 		_game._player.walk(Common::Point(270, 118), FACING_WEST);
 		_game._player._visible = true;
-	} else if ((_scene->_priorSceneId != -2) && !_globals[kTeleporterCommand]) {
+	} else if ((_scene->_priorSceneId != RETURNING_FROM_DIALOG) && !_globals[kTeleporterCommand]) {
 		_game._player._playerPos = Common::Point(8, 117);
 		_game._player.walk(Common::Point(41, 115), FACING_EAST);
 		_game._player._visible = true;
@@ -346,7 +346,7 @@ void Scene802::enter() {
 		_game._player._playerPos = Common::Point(303, 119);
 		_game._player._facing = FACING_WEST;
 
-	} else if (_scene->_priorSceneId != -2) {
+	} else if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 		_game._player._playerPos = Common::Point(15, 129);
 		_game._player._facing = FACING_EAST;
 	}
@@ -557,7 +557,7 @@ void Scene803::enter() {
 
 	if (!_globals[kFromCockpit]) {
 		if (!_globals[kReturnFromCut]) {
-			if (_scene->_priorSceneId != -2) {
+			if (_scene->_priorSceneId != RETURNING_FROM_DIALOG) {
 				_game._player._playerPos = Common::Point(15, 130);
 				_game._player._facing = FACING_EAST;
 			}
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index 05053c3166..5927f4e70f 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -40,6 +40,8 @@
 
 namespace MADS {
 
+enum { RETURNING_FROM_DIALOG = -2, RETURNING_FROM_LOADING = -1 };
+
 class Scene {
 private:
 	/**
-- 
cgit v1.2.3


From 5c834815436014efd1f2b88455d8e44cf28ebc85 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 13 Mar 2015 22:05:21 -0400
Subject: MADS: Action fixes for top of south elevator scene

---
 engines/mads/nebular/nebular_scenes.h    | 1 -
 engines/mads/nebular/nebular_scenes7.cpp | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index cf33b21aad..8549643ff8 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -924,7 +924,6 @@ enum Noun {
 	NOUN_WHISKEY = 0x30F,
 	NOUN_ALCOHOL = 0x310,
 	NOUN_RIM = 0x311,
-	//NOUN_WALK_ALONG = 0x312,
 	NOUN_SUBMERGED_CITY = 0x313,
 	NOUN_GOVERNORS_HOUSE = 0x314,
 	NOUN_RIM_TOWARDS_EAST = 0x315,
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 7be66670d5..b40a8054f7 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -279,10 +279,8 @@ void Scene701::preActions() {
 }
 
 void Scene701::actions() {
-	if (_action.isAction(VERB_WALK_ALONG, NOUN_PLATFORM))
-		return;
-
-	if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_BUILDING) && _game._objects[OBJ_VASE]._roomNumber == 706) {
+	if (_action.isAction(VERB_WALK_ALONG, NOUN_PLATFORM)) {
+	} else if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_BUILDING) && _game._objects[OBJ_VASE]._roomNumber == 706) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -418,7 +416,7 @@ void Scene701::actions() {
 			_vm->_dialogs->show(70111);
 	} else if (_action.isAction(VERB_LOOK, NOUN_SUBMERGED_CITY))
 		_vm->_dialogs->show(70112);
-	else if (_action.isAction(VERB_LOOK, 0))
+	else if (_action.isAction(VERB_LOOK, NOUN_ELEVATOR))
 		_vm->_dialogs->show(70113);
 	else if (_action.isAction(VERB_LOOK, NOUN_PLATFORM))
 		_vm->_dialogs->show(70114);
-- 
cgit v1.2.3


From 84702e7d5c646ba757bf6fbfc59986570c43540b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 13 Mar 2015 22:52:58 -0400
Subject: MADS: Fix text display when opening the Slippery Pig fridge

---
 engines/mads/nebular/nebular_scenes1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index dc2eb1f068..0c5888b6ec 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -906,7 +906,7 @@ void Scene102::actions() {
 		_fridgeFirstOpenFl = false;
 		int quoteId = _vm->getRandomNumber(59, 63);
 		Common::String curQuote = _game.getQuote(quoteId);
-		int width = _vm->_font->getWidth(curQuote, -1);
+		int width = _scene->_kernelMessages._talkFont->getWidth(curQuote, -1);
 		_scene->_kernelMessages.reset();
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_scene->_kernelMessages.add(Common::Point(210, 60), 0x1110, 0, 73, 120, curQuote);
-- 
cgit v1.2.3


From 4c97e08e33f5a94c62c7ae480d05eae85a6721b6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Mar 2015 12:50:04 +0200
Subject: MADS: Fix some verbs

---
 engines/mads/nebular/nebular_scenes.h    | 17 +++++++++--------
 engines/mads/nebular/nebular_scenes3.cpp |  4 ++--
 engines/mads/nebular/nebular_scenes5.cpp |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index 8549643ff8..db7738f13b 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -106,6 +106,7 @@ enum Verb {
 	VERB_WALK_UP        = 0x227,
 	VERB_WALK_INTO      = 0x242,
 	VERB_EXIT           = 0x298,
+	VERB_WALK_BEHIND    = 0x2A2,
 	VERB_WALK_ONTO      = 0x2B5,
 	VERB_RETURN_TO      = 0x2D5,
 	VERB_CLIMB_INTO     = 0x2F7,
@@ -216,9 +217,9 @@ enum Noun {
 	NOUN_CLEARING_TO_EAST = 0x4B,
 	NOUN_CLEARING_TO_SOUTH = 0x4C,
 	NOUN_CLIFF_FACE = 0x4D,
-	NOUN_CLIMB_DOWN = 0x4E,
-	NOUN_CLIMB_THROUGH = 0x4F,
-	NOUN_CLIMB_UP = 0x50,
+	//NOUN_CLIMB_DOWN = 0x4E,
+	//NOUN_CLIMB_THROUGH = 0x4F,
+	//NOUN_CLIMB_UP = 0x50,
 	NOUN_CLOCK = 0x51,
 	NOUN_CLOSET = 0x52,
 	NOUN_CLOTHESLINE = 0x53,
@@ -397,7 +398,7 @@ enum Noun {
 	NOUN_PALM_TREE = 0x100,
 	NOUN_PASSAGE_WAY_TO_SOUTH = 0x101,
 	NOUN_PASSION_PUSS = 0x102,
-	NOUN_PEER_THROUGH = 0x103,
+	//NOUN_PEER_THROUGH = 0x103,
 	NOUN_PENCIL = 0x104,
 	NOUN_PENDULOUS_CRAG = 0x105,
 	NOUN_PENLIGHT = 0x106,
@@ -812,7 +813,7 @@ enum Noun {
 	NOUN_COUNTER = 0x29F,
 	NOUN_SENSOR = 0x2A0,
 	NOUN_SOFTWARE_INFORMATION = 0x2A1,
-	NOUN_WALK_BEHIND = 0x2A2,
+	//NOUN_WALK_BEHIND = 0x2A2,
 	NOUN_BARGAINS = 0x2A3,
 	NOUN_SCAN_LIGHT = 0x2A4,
 	NOUN_OLD_SOFTWARE_STAND = 0x2A5,
@@ -831,7 +832,7 @@ enum Noun {
 	//NOUN_GAWK_AT = 0x2B2,
 	NOUN_CORRIDOR_TO_SOUTH = 0x2B3,
 	NOUN_CORRIDOR_TO_NORTH = 0x2B4,
-	NOUN_WALK_ONTO = 0x2B5,
+	//NOUN_WALK_ONTO = 0x2B5,
 	NOUN_ROCK_WALL = 0x2B6,
 	NOUN_WOMAN = 0x2B7,
 	NOUN_WOMEN = 0x2B8,
@@ -897,7 +898,7 @@ enum Noun {
 	NOUN_YOUR_STUFF = 0x2F4,
 	NOUN_OTHER_STUFF = 0x2F5,
 	NOUN_LAMP = 0x2F6,
-	NOUN_CLIMB_INTO = 0x2F7,
+	//NOUN_CLIMB_INTO = 0x2F7,
 	NOUN_LIGHT_BULB = 0x2F8,
 	//NOUN_STEP_INTO = 0x2F9,
 	NOUN_ROOM = 0x2FA,
@@ -1056,7 +1057,7 @@ enum Noun {
 	NOUN_PAD_TO_EAST = 0x394,
 	NOUN_PAD_TO_WEST = 0x395,
 	NOUN_TOWER = 0x396,
-	NOUN_LOOK_OUT = 0x397,
+	//NOUN_LOOK_OUT = 0x397,
 	NOUN_SERVICE_PANEL = 0x398,
 	NOUN_CRACK = 0x399,
 	NOUN_THROTTLE = 0x39A,
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 1a477c3bb8..d6c7ba1cc7 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -521,7 +521,7 @@ void Scene307::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_AIR_VENT);
-	_scene->addActiveVocab(NOUN_CLIMB_INTO);
+	_scene->addActiveVocab(VERB_CLIMB_INTO);
 }
 
 void Scene307::handleRexDialog(int quote) {
@@ -992,7 +992,7 @@ void Scene307::actions() {
 			_scene->_sequences.remove(_globals._sequenceIndexes[5]);
 			_grateOpenedFl = true;
 			_scene->_hotspots.activate(17, false);
-			int idx = _scene->_dynamicHotspots.add(17, NOUN_CLIMB_INTO, -1, Common::Rect(117, 67, 117 + 19, 67 + 13));
+			int idx = _scene->_dynamicHotspots.add(17, VERB_CLIMB_INTO, -1, Common::Rect(117, 67, 117 + 19, 67 + 13));
 			int hotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(129, 104), FACING_NORTH);
 			_scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_UP);
 			_game._objects.removeFromInventory(OBJ_SCALPEL, NOWHERE);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index e6ab658eb4..a76edaca67 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -1547,8 +1547,8 @@ void Scene507::actions() {
 		_vm->_dialogs->show(50724);
 	else if (_action.isAction(VERB_LOOK, NOUN_WINDOW))
 		_vm->_dialogs->show(50725);
-	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
-		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	else if (_action.isAction(VERB_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORKAROUND: Empty handling to prevent default "can't do that" dialogs showing
 	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) {
 		if (_game._objects.isInRoom(OBJ_PENLIGHT))
 			_vm->_dialogs->show(50728);
@@ -2463,8 +2463,8 @@ void Scene512::actions() {
 		_vm->_dialogs->show(51233);
 	else if (_action.isAction(VERB_LOOK, NOUN_LAMP))
 		_vm->_dialogs->show(51234);
-	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
-		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	else if (_action.isAction(VERB_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORKAROUND: Empty handling to prevent default "can't do that" dialogs showing
 	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER))
 		_vm->_dialogs->show(51235);
 	else if (_action.isAction(VERB_LOOK, NOUN_ICE_CHESTS))
-- 
cgit v1.2.3


From 1f8845e9f433365c3586240b4e395cf888ec770b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Mar 2015 13:04:46 +0200
Subject: MADS: Fix toggling of game options

---
 engines/mads/nebular/dialogs_nebular.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 6c57c85408..530cf8a785 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1142,8 +1142,9 @@ void OptionsDialog::show() {
 		// Reload menu
 		_lineIndex = -1;
 		clearLines();
+		_vm->_game->_screenObjects.clear();
+		_vm->_game->_scene._spriteSlots.reset();
 		setLines();
-		setClickableLines();
 	} while (!_vm->shouldQuit() && _selectedLine != 0 && _selectedLine <= 7);
 
 	// If Done button not pressed, reset settings
-- 
cgit v1.2.3


From 0f02cdb4aa0a0e29bea414583a6db8a5ae389f49 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 10:11:19 -0400
Subject: MADS: Fix crash in stream crossing death, simplify SpriteSets class

---
 engines/mads/game.cpp    |  2 +-
 engines/mads/player.cpp  |  2 +-
 engines/mads/scene.cpp   |  2 +-
 engines/mads/sprites.cpp | 52 +++++++++++++++++++++++++-----------------------
 engines/mads/sprites.h   |  8 +++++---
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 74c2a3f416..b601a12c82 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -160,7 +160,7 @@ void Game::gameLoop() {
 			sectionLoop();
 
 		_player.releasePlayerSprites();
-		assert(_scene._sprites._assetCount == 0);
+		assert(_scene._sprites.size() == 0);
 
 		_vm->_palette->unlock();
 		_vm->_events->waitCursor();
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 38e8638415..f61a5a1592 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -709,7 +709,7 @@ void Player::releasePlayerSprites() {
 	_spritesLoaded = false;
 	_spritesChanged = true;
 
-	if (scene._sprites._assetCount > 0) {
+	if (scene._sprites.size() > 0) {
 		warning("Player::releasePlayerSprites(): leftover sprites remain, clearing list");
 		scene._sprites.clear();
 	}
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index bbc83a791b..463d4a62fd 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -676,7 +676,7 @@ void Scene::freeCurrentScene() {
 }
 
 void Scene::removeSprites() {
-	for (int idx = _sprites._assetCount - 1; idx >= _spritesCount; --idx)
+	for (int idx = _sprites.size() - 1; idx >= _spritesCount; --idx)
 		_sprites.remove(idx);
 }
 
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 19742e22b0..6488add86c 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -368,19 +368,18 @@ SpriteSets::~SpriteSets() {
 }
 
 int SpriteSets::add(SpriteAsset *asset, int idx) {
-	if (idx)
-		idx = idx + 49;
-	else
-		idx = _assetCount++;
+	if (idx) {
+		assert(idx == 1);
+		delete _uiSprites;
+		_uiSprites = asset;
 
-	if (idx >= (int)size())
-		resize(idx + 1);
+		return SPRITE_SLOTS_MAX_SIZE;
+	} else {
+		assert(size() < SPRITE_SLOTS_MAX_SIZE);
+		push_back(asset);
 
-	if ((*this)[idx])
-		delete (*this)[idx];
-
-	(*this)[idx] = asset;
-	return idx;
+		return (int)size() - 1;
+	}
 }
 
 int SpriteSets::addSprites(const Common::String &resName, int flags) {
@@ -390,26 +389,29 @@ int SpriteSets::addSprites(const Common::String &resName, int flags) {
 void SpriteSets::clear() {
 	for (uint i = 0; i < size(); ++i)
 		delete (*this)[i];
-
-	_assetCount = 0;
 	Common::Array<SpriteAsset *>::clear();
+
+	delete _uiSprites;
+	_uiSprites = nullptr;
 }
 
 void SpriteSets::remove(int idx) {
-	if (idx >= 0) {
-		if (idx < ((int)size() - 1)) {
-			delete (*this)[idx];
-			(*this)[idx] = nullptr;
-		} else {
-			do {
-				delete (*this)[size() - 1];
-				remove_at(size() - 1);
-			} while (size() > 0 && (*this)[size() - 1] == nullptr);
-		}
+	if (idx == SPRITE_SLOTS_MAX_SIZE) {
+		delete _uiSprites;
+		_uiSprites = nullptr;
+	} else if (idx >= 0) {
+		delete (*this)[idx];
 
-		if (idx < 50 && _assetCount > 0)
-			--_assetCount;
+		if (idx == ((int)size() - 1))
+			remove_at(size() - 1);
+		else
+			(*this)[idx] = nullptr;
 	}
 }
 
+SpriteAsset *&SpriteSets::operator[](int idx) {
+	return (idx == SPRITE_SLOTS_MAX_SIZE) ? _uiSprites :
+		Common::Array<SpriteAsset *>::operator[](idx);
+}
+
 } // End of namespace MADS
diff --git a/engines/mads/sprites.h b/engines/mads/sprites.h
index 6ea3c9e52e..bb5fdbe964 100644
--- a/engines/mads/sprites.h
+++ b/engines/mads/sprites.h
@@ -202,12 +202,12 @@ class SpriteSets : public Common::Array<SpriteAsset *> {
 private:
 	MADSEngine *_vm;
 public:
-	int _assetCount;
-
+	SpriteAsset *_uiSprites;
+public:
 	/**
 	 * Constructor
 	 */
-	SpriteSets(MADSEngine *vm) : _vm(vm), _assetCount(0) {}
+	SpriteSets(MADSEngine *vm) : _vm(vm), _uiSprites(nullptr) {}
 
 	/**
 	 * Destructor
@@ -233,6 +233,8 @@ public:
 	 * Remove an asset from the list
 	 */
 	void remove(int idx);
+
+	SpriteAsset *&operator[](int idx);
 };
 
 } // End of namespace MADS
-- 
cgit v1.2.3


From ff29535074c630987a99f2ac8bab9600ca2da645 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 10:23:45 -0400
Subject: MADS: Fix animation for putting severed arm on scanner

---
 engines/mads/nebular/nebular_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index d6c7ba1cc7..e1540b502b 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -4496,7 +4496,7 @@ void Scene352::actions() {
 			case 2:
 				_vm->_sound->command(23);
 				_scene->_sequences.remove(_commonSequenceIdx);
-				_commonSequenceIdx = _scene->_sequences.startPingPongCycle(_commonSpriteIndex, false, 8, 1, 0, 0);
+				_commonSequenceIdx = _scene->_sequences.addReverseSpriteCycle(_commonSpriteIndex, false, 8, 1, 0, 0);
 				_scene->_sequences.setAnimRange(_commonSequenceIdx, 1, 4);
 				_scene->_sequences.addSubEntry(_commonSequenceIdx, SEQUENCE_TRIGGER_EXPIRE, 0, 3);
 				break;
-- 
cgit v1.2.3


From d47197f1fac36082783c6236552fe64415349a94 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 11:41:27 -0400
Subject: MADS: Fix original bug re-adding disabled hotspots to scene as active

---
 engines/mads/screen.cpp         | 4 +++-
 engines/mads/screen.h           | 2 +-
 engines/mads/user_interface.cpp | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 5076bbb099..c06ff2b7b7 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -265,7 +265,7 @@ ScreenObjects::ScreenObjects(MADSEngine *vm) : _vm(vm) {
 	_baseTime = 0;
 }
 
-void ScreenObjects::add(const Common::Rect &bounds, ScreenMode mode, ScrCategory category, int descId) {
+ScreenObject *ScreenObjects::add(const Common::Rect &bounds, ScreenMode mode, ScrCategory category, int descId) {
 	ScreenObject so;
 	so._bounds = bounds;
 	so._category = category;
@@ -274,6 +274,8 @@ void ScreenObjects::add(const Common::Rect &bounds, ScreenMode mode, ScrCategory
 	so._active = true;
 
 	push_back(so);
+
+	return &(*this)[size()];
 }
 
 void ScreenObjects::check(bool scanFlag) {
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index e2462aff18..85c55419ca 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -167,7 +167,7 @@ public:
 	/**
 	* Add a new item to the list
 	*/
-	void add(const Common::Rect &bounds, ScreenMode mode, ScrCategory category, int descId);
+	ScreenObject *add(const Common::Rect &bounds, ScreenMode mode, ScrCategory category, int descId);
 
 	/**
 	 * Check objects on the screen
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index bcd409889e..0363ae5ef9 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -732,7 +732,9 @@ void UserInterface::loadElements() {
 		_categoryIndexes[CAT_HOTSPOT - 1] = _vm->_game->_screenObjects.size() + 1;
 		for (int hotspotIdx = scene._hotspots.size() - 1; hotspotIdx >= 0; --hotspotIdx) {
 			Hotspot &hs = scene._hotspots[hotspotIdx];
-			_vm->_game->_screenObjects.add(hs._bounds, SCREENMODE_VGA, CAT_HOTSPOT, hotspotIdx);
+			ScreenObject *so = _vm->_game->_screenObjects.add(hs._bounds, SCREENMODE_VGA, 
+				CAT_HOTSPOT, hotspotIdx);
+			so->_active = hs._active;
 		}
 	}
 
-- 
cgit v1.2.3


From 561481499d4cb6e1d2a85e5dc35c7c8ff0534e3d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 11:57:28 -0400
Subject: MADS: Persist gameplay options

---
 engines/mads/mads.cpp                    | 19 +++++++++++++++++++
 engines/mads/mads.h                      |  4 ++++
 engines/mads/nebular/dialogs_nebular.cpp |  3 +++
 3 files changed, 26 insertions(+)

diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 52a0b40561..a62ad2d7df 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -82,6 +82,8 @@ void MADSEngine::initialize() {
 	MSurface::setVm(this);
 	MSprite::setVm(this);
 
+	loadOptions();
+
 	Resources::init(this);
 	Conversation::init(this);
 	_debugger = new Debugger(this);
@@ -98,6 +100,23 @@ void MADSEngine::initialize() {
 	_screen.empty();
 }
 
+void MADSEngine::loadOptions() {
+	if (ConfMan.hasKey("EasyMouse"))
+		_easyMouse = ConfMan.getBool("EasyMouse");
+	if (ConfMan.hasKey("InvObjectsAnimated"))
+		_invObjectsAnimated = ConfMan.getBool("InvObjectsAnimated");
+	if (ConfMan.hasKey("TextWindowStill"))
+		_textWindowStill = ConfMan.getBool("TextWindowStill");
+}
+
+void MADSEngine::saveOptions() {
+	ConfMan.setBool("EasyMouse", _easyMouse);
+	ConfMan.setBool("InvObjectsAnimated", _invObjectsAnimated);
+	ConfMan.setBool("TextWindowStill", _textWindowStill);
+
+	ConfMan.flushToDisk();
+}
+
 Common::Error MADSEngine::run() {
 	initGraphics(MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT, false);
 	initialize();
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 9a8f2152a1..7cc0ac8bc2 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -84,6 +84,8 @@ private:
 	 * Handles basic initialisation
 	 */
 	void initialize();
+
+	void loadOptions();
 protected:
 	// Engine APIs
 	virtual Common::Error run();
@@ -145,6 +147,8 @@ public:
 	 * Handles saving the game via the GMM
 	 */
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
+
+	void saveOptions();
 };
 
 } // End of namespace MADS
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 530cf8a785..1c780c85b7 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1117,12 +1117,15 @@ void OptionsDialog::show() {
 			break;
 		case 3:	// Interface
 			_vm->_easyMouse = !_vm->_easyMouse;
+			_vm->saveOptions();
 			break;
 		case 4:	// Inventory
 			_vm->_invObjectsAnimated = !_vm->_invObjectsAnimated;
+			_vm->saveOptions();
 			break;
 		case 5:	// Text window
 			_vm->_textWindowStill = !_vm->_textWindowStill;
+			_vm->saveOptions();
 			break;
 		case 6:	// Screen fade
 			if (_vm->_screenFade == SCREEN_FADE_FAST)
-- 
cgit v1.2.3


From a924d4beefc9d82ebe4c5a1880015aa7c97503de Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 12:46:46 -0400
Subject: MADS: Fix hotspot highlighting when easy mouse is off

---
 engines/mads/events.cpp         | 4 ++--
 engines/mads/events.h           | 2 +-
 engines/mads/screen.cpp         | 6 +++---
 engines/mads/user_interface.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index 06c6055f01..767f998d81 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -41,7 +41,7 @@ EventsManager::EventsManager(MADSEngine *vm) {
 	_mouseReleased = false;
 	_mouseButtons = 0;
 	_mouseStatus = 0;
-	_vD2 = 0;
+	_strokeGoing = 0;
 	_mouseStatusCopy = 0;
 	_mouseMoved = false;
 	_rightMousePressed = false;
@@ -266,7 +266,7 @@ void EventsManager::waitForNextFrame() {
 void EventsManager::initVars() {
 	_mousePos = Common::Point(-1, -1);
 	_mouseStatusCopy = _mouseStatus;
-	_vD2 = 0;
+	_strokeGoing = 0;
 }
 
 } // End of namespace MADS
diff --git a/engines/mads/events.h b/engines/mads/events.h
index 21ef37407b..1a92754f10 100644
--- a/engines/mads/events.h
+++ b/engines/mads/events.h
@@ -67,7 +67,7 @@ public:
 	byte _mouseButtons;
 	bool _rightMousePressed;
 	int _mouseStatus;
-	int _vD2;
+	int _strokeGoing;
 	int _mouseStatusCopy;
 	bool _mouseMoved;
 	Common::Stack<Common::KeyState> _pendingKeys;
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index c06ff2b7b7..3e2fe22611 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -308,10 +308,10 @@ void ScreenObjects::check(bool scanFlag) {
 		}
 
 		//_released = _vm->_events->_mouseReleased;
-		if (_vm->_events->_vD2 || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy))
+		if (_vm->_events->_mouseButtons || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy))
 			scene._userInterface._category = _category;
 
-		if (!_vm->_events->_mouseButtons || _vm->_easyMouse) {
+		if (_vm->_events->_mouseButtons || _vm->_easyMouse) {
 			if (userInterface._category >= CAT_COMMAND && userInterface._category <= CAT_TALK_ENTRY) {
 				elementHighlighted();
 			}
@@ -526,7 +526,7 @@ void ScreenObjects::elementHighlighted() {
 	action._pickedWord = newIndex;
 
 	if (_category == CAT_INV_LIST || _category == CAT_INV_ANIM) {
-		if (action._interAwaiting == 1 && newIndex >= 0 && _released &&
+		if (action._interAwaiting == AWAITING_COMMAND && newIndex >= 0 && _released &&
 				(!_vm->_events->_mouseReleased || !_vm->_easyMouse))
 			newIndex = -1;
 	}
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 0363ae5ef9..eced2fdb12 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -522,7 +522,7 @@ void UserInterface::updateInventoryScroller() {
 				uint32 timeInc = _scrollbarQuickly ? 100 : 380;
 
 				if (_vm->_events->_mouseStatus && (_scrollbarMilliTime + timeInc) <= currentMilli) {
-					_scrollbarQuickly = _vm->_events->_vD2 < 1;
+					_scrollbarQuickly = _vm->_events->_strokeGoing < 1;
 					_scrollbarMilliTime = currentMilli;
 
 					// Change the scrollbar and visible inventory list
-- 
cgit v1.2.3


From b39abbfb4955521211847f33bcc133cdd9642fe3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 14:04:41 -0400
Subject: MADS: Save reverted options if you cancel out of Game Options dialog

---
 engines/mads/nebular/dialogs_nebular.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 1c780c85b7..10fa28c013 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1158,6 +1158,8 @@ void OptionsDialog::show() {
 		_vm->_textWindowStill = prevTextWindowStill;
 		_vm->_screenFade = prevScreenFade;
 		game._storyMode = prevStoryMode;
+
+		_vm->saveOptions();
 	}
 }
 
-- 
cgit v1.2.3


From 1e15c02d1ea56439509926b68b9e393957241e65 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 14:38:22 -0400
Subject: MADS: Fix animation of tying rope to the boat

---
 engines/mads/animation.cpp               | 14 ++++++++++----
 engines/mads/animation.h                 |  5 +++++
 engines/mads/nebular/nebular_scenes5.cpp |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 7e616bffbc..bda0bb6876 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -436,10 +436,7 @@ void Animation::update() {
 	if (_vm->_game->_scene._frameStartTime < _nextFrameTimer)
 		return;
 
-	for (uint idx = 0; idx < scene._spriteSlots.size(); ++idx) {
-		if (scene._spriteSlots[idx]._seqIndex >= 0x80)
-			scene._spriteSlots[idx]._flags = IMG_ERASE;
-	}
+	eraseSprites();
 
 	// Validate the current frame
 	if (_currentFrame >= (int)_miscEntries.size()) {
@@ -604,4 +601,13 @@ void Animation::setNextFrameTimer(int frameNumber) {
 	_nextFrameTimer = frameNumber;
 }
 
+void Animation::eraseSprites() {
+	Scene &scene = _vm->_game->_scene;
+
+	for (uint idx = 0; idx < scene._spriteSlots.size(); ++idx) {
+		if (scene._spriteSlots[idx]._seqIndex >= 0x80)
+			scene._spriteSlots[idx]._flags = IMG_ERASE;
+	}
+}
+
 } // End of namespace MADS
diff --git a/engines/mads/animation.h b/engines/mads/animation.h
index 8b85a5370d..1c87273e62 100644
--- a/engines/mads/animation.h
+++ b/engines/mads/animation.h
@@ -219,6 +219,11 @@ public:
 	 */
 	void update();
 
+	/**
+	 * Erases any sprites from the previous animation frame
+	 */
+	void eraseSprites();
+
 	void setNextFrameTimer(int frameNumber);
 	int getNextFrameTimer() const { return _nextFrameTimer; }
 	void setCurrentFrame(int frameNumber);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index a76edaca67..2470137b2e 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2066,6 +2066,7 @@ void Scene511::actions() {
 					if (_game._trigger == 0) {
 						_game._player._stepEnabled = false;
 						_game._player._visible = false;
+						_game._player.update();
 						_lineAnimationMode = 1;
 						_lineAnimationPosition = 1;
 						_lineMoving = true;
@@ -2088,7 +2089,8 @@ void Scene511::actions() {
 		} else {
 			_vm->_dialogs->show(51130);
 		}
-	} else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) {
+	} else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || 
+			_action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) {
 		if (_globals[kBoatRaised])
 			_vm->_dialogs->show(51131);
 		else if (_globals[kLineStatus] == 1)
@@ -2106,7 +2108,6 @@ void Scene511::actions() {
 						_scene->_sequences.addTimer(1, 1);
 					else {
 						_game._player._visible = true;
-						_game._player._priorTimer = _scene->_frameStartTime - _game._player._ticksAmount;
 						_globals._sequenceIndexes[7] = _scene->_sequences.startCycle(_globals._spriteIndexes[7], false, -2);
 						_scene->_sequences.setDepth(_globals._sequenceIndexes[7], 4);
 						int idx = _scene->_dynamicHotspots.add(NOUN_FISHING_LINE, VERB_WALKTO, _globals._sequenceIndexes[7], Common::Rect(0, 0, 0, 0));
@@ -2116,6 +2117,10 @@ void Scene511::actions() {
 						_lineMoving = true;
 						_globals[kLineStatus] = 3;
 						_game._player._stepEnabled = true;
+
+						if (_scene->_activeAnimation)
+							_scene->_activeAnimation->eraseSprites();
+						_game._player.update();
 					}
 				}
 			}
-- 
cgit v1.2.3


From fa7dfc396a2ca33e01a0151f63857dd64406502c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 15:05:42 -0400
Subject: MADS: Fix greeting when talking to cell wall the first time

---
 engines/mads/nebular/nebular_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index e1540b502b..383f5b509f 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -525,7 +525,7 @@ void Scene307::setup() {
 }
 
 void Scene307::handleRexDialog(int quote) {
-	Common::String curQuote = _game.getQuote(_action._activeAction._verbId);
+	Common::String curQuote = _game.getQuote(quote);
 	if (_vm->_font->getWidth(curQuote, _scene->_textSpacing) > 200) {
 		Common::String subQuote1;
 		_game.splitQuote(curQuote, subQuote1, _subQuote2);
-- 
cgit v1.2.3


From 9eb342615c4cdbc1f38374b9a7808dc54bfb7ad9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 18:34:26 -0400
Subject: MADS: Fix frequently getting endless wait cursor after doctor hits
 you

---
 engines/mads/nebular/nebular_scenes3.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 383f5b509f..4e7781e7a2 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -3313,7 +3313,7 @@ void Scene319::step() {
 
 	switch (_game._trigger) {
 	case 70:
-	case 71:
+	case 71: {
 		_animMode = 1;
 		_nextAction1 = _nextAction2;
 		_animFrame = 0;
@@ -3336,7 +3336,14 @@ void Scene319::step() {
 			_scene->_sequences.updateTimeout(_globals._sequenceIndexes[i], oldIdx);
 		}
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[0], SEQUENCE_TRIGGER_EXPIRE, 0, 74);
+
+		// WORKAROUND: This fixes the game sometimes going into an endless waiting
+		// loop even after the doctor has finished hitting Rex. Note sure if it's due
+		// to a bug in room script or in the engine, but this at least fixes it
+		int seqIndex = _scene->_sequences.findByTrigger(2);
+		_scene->_sequences[seqIndex]._doneFlag = false;
 		break;
+	}
 
 	case 72:
 		_vm->_palette->setColorFlags(0xFF, 0, 0);
-- 
cgit v1.2.3


From 97ef41707ab957099b4972bba501479001315e69 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 19:09:44 -0400
Subject: MADS: Hook up sfx/music flags

---
 engines/mads/detection_tables.h |  4 ++--
 engines/mads/mads.cpp           | 18 ++++++++++++++++++
 engines/mads/mads.h             |  6 ++++++
 engines/mads/sound.cpp          |  5 ++++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index e68ae380d0..92614ba361 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -56,7 +56,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_RexNebular,
 		0
@@ -74,7 +74,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_RexNebular,
 		0
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index a62ad2d7df..761aef3e66 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -44,6 +44,7 @@ MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
 	_textWindowStill = false;
 	_screenFade = SCREEN_FADE_SMOOTH;
 	_musicFlag = true;
+	_soundFlag = true;
 	_dithering = false;
 
 	_debugger = nullptr;
@@ -107,12 +108,23 @@ void MADSEngine::loadOptions() {
 		_invObjectsAnimated = ConfMan.getBool("InvObjectsAnimated");
 	if (ConfMan.hasKey("TextWindowStill"))
 		_textWindowStill = ConfMan.getBool("TextWindowStill");
+
+	if (ConfMan.hasKey("mute") && ConfMan.getBool("mute")) {
+		_soundFlag = false;
+		_musicFlag = false;
+	} else {
+		_soundFlag = !ConfMan.hasKey("sfx_mute") || !ConfMan.getBool("sfx_mute");
+		_musicFlag = !ConfMan.hasGameDomain("music_mute") || !ConfMan.getBool("music_mute");
+	}
 }
 
 void MADSEngine::saveOptions() {
 	ConfMan.setBool("EasyMouse", _easyMouse);
 	ConfMan.setBool("InvObjectsAnimated", _invObjectsAnimated);
 	ConfMan.setBool("TextWindowStill", _textWindowStill);
+	ConfMan.setBool("mute", !_soundFlag && !_musicFlag);
+	ConfMan.setBool("sfx_mute", !_soundFlag && _musicFlag);
+	ConfMan.setBool("music_mute", _soundFlag && !_musicFlag);
 
 	ConfMan.flushToDisk();
 }
@@ -153,6 +165,12 @@ bool MADSEngine::canSaveGameStateCurrently() {
 		&& _events->_cursorId != CURSOR_WAIT;
 }
 
+void MADSEngine::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
+	loadOptions();
+}
+
 /**
 * Support method that generates a savegame name
 * @param slot		Slot number
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 7cc0ac8bc2..1d641e7c87 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -106,6 +106,7 @@ public:
 	bool _textWindowStill;
 	ScreenFade _screenFade;
 	bool _musicFlag;
+	bool _soundFlag;
 	bool _dithering;
 public:
 	MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc);
@@ -148,6 +149,11 @@ public:
 	 */
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
 
+	/**
+	 * Handles updating sound settings after they're changed in the GMM dialog
+	 */
+	virtual void syncSoundSettings();
+
 	void saveOptions();
 };
 
diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index fbf217ba0c..1baa169c55 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -146,7 +146,10 @@ void SoundManager::command(int commandId, int param) {
 		if (_queuedCommands.size() < 8)
 			_queuedCommands.push(commandId);
 	} else if (_driver) {
-		_driver->command(commandId, param);
+		// Note: I don't know any way to identify music commands versus sfx
+		// commands, so if sfx is mute, then so is music
+		if (_vm->_soundFlag)
+			_driver->command(commandId, param);
 	}
 }
 
-- 
cgit v1.2.3


From 299bfa3696aaf3c689798faef198d714eb234f4f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 19:24:56 -0400
Subject: MADS: Fix showing inventory pictures when inventory animating is off

---
 engines/mads/user_interface.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index eced2fdb12..93a555d9c7 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -864,13 +864,13 @@ void UserInterface::loadInventoryAnim(int objectId) {
 	Scene &scene = _vm->_game->_scene;
 	noInventoryAnim();
 
-	if (_vm->_invObjectsAnimated) {
-		Common::String resName = Common::String::format("*OB%.3dI", objectId);
-		SpriteAsset *asset = new SpriteAsset(_vm, resName, ASSET_SPINNING_OBJECT);
-		_invSpritesIndex = scene._sprites.add(asset, 1);
-		if (_invSpritesIndex >= 0) {
-			_invFrameNumber = 1;
-		}
+	// WORKAROUND: Even in still mode, we now load the animation frames for the
+	// object, so we can show the first frame as a 'still'
+	Common::String resName = Common::String::format("*OB%.3dI", objectId);
+	SpriteAsset *asset = new SpriteAsset(_vm, resName, ASSET_SPINNING_OBJECT);
+	_invSpritesIndex = scene._sprites.add(asset, 1);
+	if (_invSpritesIndex >= 0) {
+		_invFrameNumber = 1;
 	}
 }
 
@@ -902,10 +902,13 @@ void UserInterface::inventoryAnim() {
 			_invSpritesIndex < 0)
 		return;
 
-	// Move to the next frame number in the sequence, resetting if at the end
-	SpriteAsset *asset = scene._sprites[_invSpritesIndex];
-	if (++_invFrameNumber > asset->getCount())
-		_invFrameNumber = 1;
+	// WORKAROUND: Fix still inventory display, which was broken in the original
+	if (_vm->_invObjectsAnimated) {
+		// Move to the next frame number in the sequence, resetting if at the end
+		SpriteAsset *asset = scene._sprites[_invSpritesIndex];
+		if (++_invFrameNumber > asset->getCount())
+			_invFrameNumber = 1;
+	}
 
 	// Loop through the slots list for inventory animation entry
 	for (uint i = 0; i < _uiSlots.size(); ++i) {
-- 
cgit v1.2.3


From d3afff9bc736175b0275d923788198706adc7d78 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Mar 2015 19:30:01 -0400
Subject: MADS: Fix animations erasing sprites on the last frame before
 transitioning

---
 engines/mads/animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index bda0bb6876..b48491626d 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -436,8 +436,6 @@ void Animation::update() {
 	if (_vm->_game->_scene._frameStartTime < _nextFrameTimer)
 		return;
 
-	eraseSprites();
-
 	// Validate the current frame
 	if (_currentFrame >= (int)_miscEntries.size()) {
 		// Is the animation allowed to be repeated?
@@ -450,6 +448,8 @@ void Animation::update() {
 		}
 	}
 
+	eraseSprites();
+
 	// Handle executing any sound command for this frame
 	AnimMiscEntry &misc = _miscEntries[_currentFrame];
 	if (misc._soundId)
-- 
cgit v1.2.3


From 19a9c068f994d5800a60dff6f14221f03f5d4cc3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Mar 2015 04:05:06 +0200
Subject: MADS: Hook up all of the remaining options, and add custom game
 options

---
 engines/mads/detection.cpp               | 63 +++++++++++++++++++++++++++++++-
 engines/mads/game.h                      |  3 ++
 engines/mads/mads.cpp                    | 35 +++++++++++++-----
 engines/mads/nebular/dialogs_nebular.cpp | 24 ++++++------
 engines/mads/nebular/game_nebular.h      |  3 ++
 5 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index 971acde024..ea71fc8539 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -29,6 +29,7 @@
 #include "common/memstream.h"
 #include "engines/advancedDetector.h"
 #include "common/system.h"
+#include "common/translation.h"
 #include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "mads/events.h"
@@ -75,11 +76,71 @@ static const PlainGameDescriptor MADSGames[] = {
 	{0, 0}
 };
 
+#define GAMEOPTION_EASY_MOUSE          GUIO_GAMEOPTIONS1
+#define GAMEOPTION_ANIMATED_INVENTORY  GUIO_GAMEOPTIONS2
+#define GAMEOPTION_ANIMATED_INTERFACE  GUIO_GAMEOPTIONS3
+#define GAMEOPTION_NAUGHTY_MODE        GUIO_GAMEOPTIONS4
+//#define GAMEOPTION_GRAPHICS_DITHERING  GUIO_GAMEOPTIONS5
+
 #include "mads/detection_tables.h"
 
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_EASY_MOUSE,
+		{
+			_s("Easy mouse interface"),
+			_s("Shows object names when hovering the mouse over them"),
+			"EasyMouse",
+			true
+		}
+	},
+
+	{
+		GAMEOPTION_ANIMATED_INVENTORY,
+		{
+			_s("Animated inventory items"),
+			_s("Animated inventory items"),
+			"InvObjectsAnimated",
+			true
+		}
+	},
+
+	{
+		GAMEOPTION_ANIMATED_INTERFACE,
+		{
+			_s("Animated game interface"),
+			_s("Animated game interface"),
+			"TextWindowAnimated",
+			true
+		}
+	},
+
+	{
+		GAMEOPTION_NAUGHTY_MODE,
+		{
+			_s("Naughty game mode"),
+			_s("Naughty game mode"),
+			"NaughtyMode",
+			true
+		}
+	},
+
+	/*{
+		GAMEOPTION_GRAPHICS_DITHERING,
+		{
+			_s("Graphics dithering"),
+			_s("Graphics dithering"),
+			"GraphicsDithering",
+			true
+		}
+	},*/
+
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
+};
+
 class MADSMetaEngine : public AdvancedMetaEngine {
 public:
-	MADSMetaEngine() : AdvancedMetaEngine(MADS::gameDescriptions, sizeof(MADS::MADSGameDescription), MADSGames) {
+	MADSMetaEngine() : AdvancedMetaEngine(MADS::gameDescriptions, sizeof(MADS::MADSGameDescription), MADSGames, optionsList) {
 		_maxScanDepth = 3;
 	}
 
diff --git a/engines/mads/game.h b/engines/mads/game.h
index 66f2580249..d246aa501e 100644
--- a/engines/mads/game.h
+++ b/engines/mads/game.h
@@ -195,6 +195,9 @@ public:
 	 */
 	virtual void synchronize(Common::Serializer &s, bool phase1);
 
+	virtual void setNaughtyMode(bool naughtyMode) {}
+	virtual bool getNaughtyMode() const { return true; }
+
 	// DEPRECATED: ScummVM re-implementation keeps all the quotes loaded, so the methods below are stubs
 	void clearQuotes() {}
 	void loadQuoteRange(int startNum, int endNum) {}
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 761aef3e66..59d600fbfb 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -38,7 +38,7 @@ namespace MADS {
 MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
 		_gameDescription(gameDesc), Engine(syst), _randomSource("MADS") {
 
-	// Initialize fields
+	// Initialize game/engine options
 	_easyMouse = true;
 	_invObjectsAnimated = true;
 	_textWindowStill = false;
@@ -83,8 +83,6 @@ void MADSEngine::initialize() {
 	MSurface::setVm(this);
 	MSprite::setVm(this);
 
-	loadOptions();
-
 	Resources::init(this);
 	Conversation::init(this);
 	_debugger = new Debugger(this);
@@ -98,16 +96,14 @@ void MADSEngine::initialize() {
 	_audio = new AudioPlayer(_mixer, getGameID());
 	_game = Game::init(this);
 
+	loadOptions();
+
 	_screen.empty();
 }
 
 void MADSEngine::loadOptions() {
 	if (ConfMan.hasKey("EasyMouse"))
 		_easyMouse = ConfMan.getBool("EasyMouse");
-	if (ConfMan.hasKey("InvObjectsAnimated"))
-		_invObjectsAnimated = ConfMan.getBool("InvObjectsAnimated");
-	if (ConfMan.hasKey("TextWindowStill"))
-		_textWindowStill = ConfMan.getBool("TextWindowStill");
 
 	if (ConfMan.hasKey("mute") && ConfMan.getBool("mute")) {
 		_soundFlag = false;
@@ -116,16 +112,37 @@ void MADSEngine::loadOptions() {
 		_soundFlag = !ConfMan.hasKey("sfx_mute") || !ConfMan.getBool("sfx_mute");
 		_musicFlag = !ConfMan.hasGameDomain("music_mute") || !ConfMan.getBool("music_mute");
 	}
+
+	if (ConfMan.hasKey("ScreenFade"))
+		_screenFade = (ScreenFade)ConfMan.getInt("ScreenFade");
+	//if (ConfMan.hasKey("GraphicsDithering"))
+	//	_dithering = ConfMan.getBool("GraphicsDithering");
+
+	if (getGameID() == GType_RexNebular) {
+		if (ConfMan.hasKey("InvObjectsAnimated"))
+			_invObjectsAnimated = ConfMan.getBool("InvObjectsAnimated");
+		if (ConfMan.hasKey("TextWindowStill"))
+			_textWindowStill = !ConfMan.getBool("TextWindowAnimated");
+		if (ConfMan.hasKey("NaughtyMode"))
+			_game->setNaughtyMode(ConfMan.getBool("NaughtyMode"));
+	}
 }
 
 void MADSEngine::saveOptions() {
 	ConfMan.setBool("EasyMouse", _easyMouse);
-	ConfMan.setBool("InvObjectsAnimated", _invObjectsAnimated);
-	ConfMan.setBool("TextWindowStill", _textWindowStill);
+	ConfMan.setInt("ScreenFade", (int)_screenFade);
+	//ConfMan.setBool("GraphicsDithering", _dithering);
+
 	ConfMan.setBool("mute", !_soundFlag && !_musicFlag);
 	ConfMan.setBool("sfx_mute", !_soundFlag && _musicFlag);
 	ConfMan.setBool("music_mute", _soundFlag && !_musicFlag);
 
+	if (getGameID() == GType_RexNebular) {
+		ConfMan.setBool("InvObjectsAnimated", _invObjectsAnimated);
+		ConfMan.setBool("TextWindowAnimated", !_textWindowStill);
+		ConfMan.setBool("NaughtyMode", _game->getNaughtyMode());
+	}
+
 	ConfMan.flushToDisk();
 }
 
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 10fa28c013..0b5e921dcc 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1050,12 +1050,11 @@ OptionsDialog::OptionsDialog(MADSEngine *vm) : GameDialog(vm) {
 int OptionsDialog::getOptionQuote(int option) {
 	Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
 
-	// TODO: Hook the rest of the options to the current config
 	switch (option) {
 	case 17:	// Music
-		return 24;	// 24: ON, 25: OFF
+		return _vm->_musicFlag ? 24 : 25;	// 24: ON, 25: OFF
 	case 18:	// Sound
-		return 26;	// 26: ON, 27: OFF
+		return _vm->_soundFlag ? 26 : 27;	// 26: ON, 27: OFF
 	case 19:	// Interface
 		return !_vm->_easyMouse ? 28 : 29;	// 28: Standard, 29: Easy
 	case 20:	// Inventory
@@ -1098,6 +1097,7 @@ void OptionsDialog::show() {
 	Nebular::GameNebular &game = *(Nebular::GameNebular *)_vm->_game;
 
 	// Previous options, restored when cancel is selected
+	bool prevMusicFlag = _vm->_musicFlag;
 	bool prevEasyMouse = _vm->_easyMouse;
 	bool prevInvObjectsAnimated = _vm->_invObjectsAnimated;
 	bool prevTextWindowStill = _vm->_textWindowStill;
@@ -1110,22 +1110,19 @@ void OptionsDialog::show() {
 
 		switch (_selectedLine) {
 		case 1:	// Music
-			warning("STUB: Music toggle");
+			_vm->_musicFlag = _vm->_soundFlag = !_vm->_musicFlag;
 			break;
 		case 2:	// Sound
-			warning("STUB: Sound toggle");
+			_vm->_musicFlag = _vm->_soundFlag = !_vm->_musicFlag;
 			break;
 		case 3:	// Interface
 			_vm->_easyMouse = !_vm->_easyMouse;
-			_vm->saveOptions();
 			break;
 		case 4:	// Inventory
 			_vm->_invObjectsAnimated = !_vm->_invObjectsAnimated;
-			_vm->saveOptions();
 			break;
 		case 5:	// Text window
 			_vm->_textWindowStill = !_vm->_textWindowStill;
-			_vm->saveOptions();
 			break;
 		case 6:	// Screen fade
 			if (_vm->_screenFade == SCREEN_FADE_FAST)
@@ -1150,16 +1147,17 @@ void OptionsDialog::show() {
 		setLines();
 	} while (!_vm->shouldQuit() && _selectedLine != 0 && _selectedLine <= 7);
 
-	// If Done button not pressed, reset settings
-	if (_selectedLine != 8) {
-		// Revert all options from the saved ones
+	if (_selectedLine == 8) {
+		// OK button, save settings
+		_vm->saveOptions();
+	} else if (_selectedLine == 9) {
+		// Cancel button, revert all options from the saved ones
+		_vm->_musicFlag = prevMusicFlag;
 		_vm->_easyMouse = prevEasyMouse;
 		_vm->_invObjectsAnimated = prevInvObjectsAnimated;
 		_vm->_textWindowStill = prevTextWindowStill;
 		_vm->_screenFade = prevScreenFade;
 		game._storyMode = prevStoryMode;
-
-		_vm->saveOptions();
 	}
 }
 
diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h
index efa21a2e73..1b89d11412 100644
--- a/engines/mads/nebular/game_nebular.h
+++ b/engines/mads/nebular/game_nebular.h
@@ -131,6 +131,9 @@ public:
 	virtual void step();
 
 	virtual void synchronize(Common::Serializer &s, bool phase1);
+
+	virtual void setNaughtyMode(bool naughtyMode) { _storyMode = naughtyMode ? STORYMODE_NAUGHTY : STORYMODE_NICE; }
+	virtual bool getNaughtyMode() const { return _storyMode == STORYMODE_NAUGHTY; }
 };
 
 // Section handlers aren't needed in ScummVM implementation
-- 
cgit v1.2.3


From 97ca67ecac3bd4e27cd2ea93c5e88e44722972a3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Mar 2015 13:45:31 +0200
Subject: MADS: Properly reset the sound flag

---
 engines/mads/nebular/dialogs_nebular.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 0b5e921dcc..4ba5366a60 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -1152,7 +1152,7 @@ void OptionsDialog::show() {
 		_vm->saveOptions();
 	} else if (_selectedLine == 9) {
 		// Cancel button, revert all options from the saved ones
-		_vm->_musicFlag = prevMusicFlag;
+		_vm->_musicFlag = _vm->_soundFlag = prevMusicFlag;
 		_vm->_easyMouse = prevEasyMouse;
 		_vm->_invObjectsAnimated = prevInvObjectsAnimated;
 		_vm->_textWindowStill = prevTextWindowStill;
-- 
cgit v1.2.3


From 74327cadad47824863f52fdb2b68d093b3a939a6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Mar 2015 13:47:45 +0200
Subject: MADS: Add custom game options to the ScummVM GUI

This should be part of commit 19a9c068f, but it wasn't committed
---
 engines/mads/detection_tables.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 92614ba361..0a8e98bb31 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -37,7 +37,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
 		0
@@ -56,7 +56,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOSPEECH)
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
 		0
@@ -74,7 +74,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOSPEECH)
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
 		0
@@ -92,7 +92,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GAMEOPTION_EASY_MOUSE)
 		},
 		GType_Phantom,
 		0
@@ -110,7 +110,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GAMEOPTION_EASY_MOUSE)
 		},
 		GType_Dragonsphere,
 		0
-- 
cgit v1.2.3


From 9caed13d906b852cd90033a2df304d19f0f0e38c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 16:18:38 -0400
Subject: MADS: Better handling for removing sprite sets

---
 engines/mads/sprites.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 6488add86c..67d5e20fe5 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -402,10 +402,13 @@ void SpriteSets::remove(int idx) {
 	} else if (idx >= 0) {
 		delete (*this)[idx];
 
-		if (idx == ((int)size() - 1))
-			remove_at(size() - 1);
-		else
+		if (idx < ((int)size() - 1)) {
 			(*this)[idx] = nullptr;
+		} else {
+			do {
+				remove_at(size() - 1);
+			} while (size() > 0 && (*this)[size() - 1] == nullptr);
+		}
 	}
 }
 
-- 
cgit v1.2.3


From 6d8134f7518a2c368a55cfc49ba0a625a9744645 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 16:20:01 -0400
Subject: MADS: Revert fix for sprites disappearing on last frame of cutscenes

The fix that kept the sprites on-screen for the last frame before scene
changes in the intro/ending sequences was also causing crashes in-game,
where the animation is getting freed before the scene update to remove
the sprites was done, so it couldn't get the areas of the screen to
refresh
---
 engines/mads/animation.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index b48491626d..cf02e7b0b5 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -436,6 +436,9 @@ void Animation::update() {
 	if (_vm->_game->_scene._frameStartTime < _nextFrameTimer)
 		return;
 
+	// Erase any active sprites
+	eraseSprites();
+
 	// Validate the current frame
 	if (_currentFrame >= (int)_miscEntries.size()) {
 		// Is the animation allowed to be repeated?
@@ -448,8 +451,6 @@ void Animation::update() {
 		}
 	}
 
-	eraseSprites();
-
 	// Handle executing any sound command for this frame
 	AnimMiscEntry &misc = _miscEntries[_currentFrame];
 	if (misc._soundId)
-- 
cgit v1.2.3


From 87a9ba5f2f5b9c3cde675c238ce718147417df03 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 16:52:55 -0400
Subject: SHERLOCK: Initial commit

---
 engines/sherlock/configure.engine    |   3 +
 engines/sherlock/decompress.cpp      |  82 +++++++++++++
 engines/sherlock/decompress.h        |  36 ++++++
 engines/sherlock/detection.cpp       | 125 ++++++++++++++++++++
 engines/sherlock/detection_tables.h  |  47 ++++++++
 engines/sherlock/graphics.cpp        |  45 +++++++
 engines/sherlock/graphics.h          |  43 +++++++
 engines/sherlock/inventory.h         |  40 +++++++
 engines/sherlock/journal.cpp         |  40 +++++++
 engines/sherlock/journal.h           |  46 ++++++++
 engines/sherlock/module.mk           |  22 ++++
 engines/sherlock/resources.cpp       | 219 +++++++++++++++++++++++++++++++++++
 engines/sherlock/resources.h         |  86 ++++++++++++++
 engines/sherlock/room.cpp            |  32 +++++
 engines/sherlock/room.h              | 102 ++++++++++++++++
 engines/sherlock/scalpel/scalpel.cpp |  40 +++++++
 engines/sherlock/scalpel/scalpel.h   |  45 +++++++
 engines/sherlock/sherlock.cpp        |  81 +++++++++++++
 engines/sherlock/sherlock.h          |  91 +++++++++++++++
 engines/sherlock/sound.h             |  39 +++++++
 engines/sherlock/sprite.cpp          | 142 +++++++++++++++++++++++
 engines/sherlock/sprite.h            |  56 +++++++++
 engines/sherlock/talk.cpp            |  30 +++++
 engines/sherlock/talk.h              |  49 ++++++++
 engines/sherlock/tattoo/tattoo.cpp   |  38 ++++++
 engines/sherlock/tattoo/tattoo.h     |  45 +++++++
 engines/sherlock/vdaplayer.h         |  34 ++++++
 27 files changed, 1658 insertions(+)
 create mode 100644 engines/sherlock/configure.engine
 create mode 100644 engines/sherlock/decompress.cpp
 create mode 100644 engines/sherlock/decompress.h
 create mode 100644 engines/sherlock/detection.cpp
 create mode 100644 engines/sherlock/detection_tables.h
 create mode 100644 engines/sherlock/graphics.cpp
 create mode 100644 engines/sherlock/graphics.h
 create mode 100644 engines/sherlock/inventory.h
 create mode 100644 engines/sherlock/journal.cpp
 create mode 100644 engines/sherlock/journal.h
 create mode 100644 engines/sherlock/module.mk
 create mode 100644 engines/sherlock/resources.cpp
 create mode 100644 engines/sherlock/resources.h
 create mode 100644 engines/sherlock/room.cpp
 create mode 100644 engines/sherlock/room.h
 create mode 100644 engines/sherlock/scalpel/scalpel.cpp
 create mode 100644 engines/sherlock/scalpel/scalpel.h
 create mode 100644 engines/sherlock/sherlock.cpp
 create mode 100644 engines/sherlock/sherlock.h
 create mode 100644 engines/sherlock/sound.h
 create mode 100644 engines/sherlock/sprite.cpp
 create mode 100644 engines/sherlock/sprite.h
 create mode 100644 engines/sherlock/talk.cpp
 create mode 100644 engines/sherlock/talk.h
 create mode 100644 engines/sherlock/tattoo/tattoo.cpp
 create mode 100644 engines/sherlock/tattoo/tattoo.h
 create mode 100644 engines/sherlock/vdaplayer.h

diff --git a/engines/sherlock/configure.engine b/engines/sherlock/configure.engine
new file mode 100644
index 0000000000..a56129a8f0
--- /dev/null
+++ b/engines/sherlock/configure.engine
@@ -0,0 +1,3 @@
+# This file is included from the main "configure" script
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+add_engine sherlock "The Lost Files of Sherlock Holmes" no
diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
new file mode 100644
index 0000000000..61110be840
--- /dev/null
+++ b/engines/sherlock/decompress.cpp
@@ -0,0 +1,82 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/decompress.h"
+
+namespace Sherlock {
+
+/**
+ * Decompresses an LZW compressed resource. If no outSize is specified, it will
+ * decompress the entire resource. If, however, an explicit size is specified,
+ * it will decompress only up to that many bytes from the stream starting at
+ * whatever position it was previously.
+ */
+Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int32 outSize) {
+	if (outSize == -1) {
+		source.seek(5);
+		outSize = source.readSint32LE();
+	}
+
+    byte lzWindow[4096];
+    uint16 lzWindowPos;
+    uint16 cmd;
+    
+    byte *outBuffer = new byte[outSize];
+    byte *outBufferEnd = outBuffer + outSize;
+    Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+    
+    memset(lzWindow, 0xFF, 0xFEE);
+    lzWindowPos = 0xFEE;
+    cmd = 0;
+
+    while (1) {
+        cmd >>= 1;
+        if (!(cmd & 0x100)) {
+            cmd = source.readByte() | 0xFF00;
+        }
+        if (cmd & 1) {
+            byte literal = source.readByte();
+            *outBuffer++ = literal;
+            lzWindow[lzWindowPos] = literal;
+            lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+        } else {
+            int copyPos, copyLen;
+            copyPos = source.readByte();
+            copyLen = source.readByte();
+            copyPos = copyPos | ((copyLen & 0xF0) << 4);
+            copyLen = (copyLen & 0x0F) + 3;
+            while (copyLen--) {
+                byte literal = lzWindow[copyPos];
+                copyPos = (copyPos + 1) & 0x0FFF;
+                *outBuffer++ = literal;
+                lzWindow[lzWindowPos] = literal;
+                lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+            }
+        }
+        if (outBuffer >= outBufferEnd)
+            break;
+    }
+
+    return outS;
+}
+
+} // namespace Sherlock
diff --git a/engines/sherlock/decompress.h b/engines/sherlock/decompress.h
new file mode 100644
index 0000000000..330e018115
--- /dev/null
+++ b/engines/sherlock/decompress.h
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_DECOMPRESS_H
+#define SHERLOCK_DECOMPRESS_H
+
+#include "common/memstream.h"
+
+namespace Sherlock {
+
+#include "common/stream.h"
+
+Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int32 outSize = -1);
+
+} // namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
new file mode 100644
index 0000000000..f207bb69d9
--- /dev/null
+++ b/engines/sherlock/detection.cpp
@@ -0,0 +1,125 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sherlock.h"
+#include "sherlock/scalpel/scalpel.h"
+#include "sherlock/tattoo/tattoo.h"
+#include "engines/advancedDetector.h"
+
+namespace Sherlock {
+
+#define MAX_SAVES 99
+
+struct SherlockGameDescription {
+	ADGameDescription desc;
+
+	int gameID;
+	uint32 features;
+};
+
+uint32 SherlockEngine::getGameID() const {
+	return _gameDescription->gameID;
+}
+
+uint32 SherlockEngine::getGameFeatures() const {
+	return _gameDescription->features;
+}
+
+Common::Platform SherlockEngine::getPlatform() const {
+	return _gameDescription->desc.platform;
+}
+
+} // End of namespace Sherlock
+
+static const PlainGameDescriptor sherlockGames[] = {
+	{"sherlock", "The Lost Files of Sherlock Holmes"},
+	{ "scalpel", "The Case of the Serrated Scalpel" },
+	{ "rosetattoo", "The Case of the Rose Tattoo" },
+	{0, 0}
+};
+
+#include "sherlock/detection_tables.h"
+
+class SherlockMetaEngine : public AdvancedMetaEngine {
+public:
+	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::gameDescriptions), sherlockGames) {}
+
+	virtual const char *getName() const {
+		return "Sherlock Engine";
+	}
+
+	virtual const char *getOriginalCopyright() const {
+		return "Sherlock Engine (C) 1992-1996 Mythos Software, 1992-1996 (C) Electronic Arts";
+	}
+
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+	virtual bool hasFeature(MetaEngineFeature f) const;
+	virtual SaveStateList listSaves(const char *target) const;
+	virtual int getMaximumSaveSlot() const;
+	virtual void removeSaveState(const char *target, int slot) const;
+	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+};
+
+bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+	const Sherlock::SherlockGameDescription *gd = (const Sherlock::SherlockGameDescription *)desc;
+	if (gd) {
+		switch (gd->gameID) {
+		case Sherlock::GType_SerratedScalpel:
+			*engine = new Sherlock::Scalpel::ScalpelEngine(syst, gd);
+			break;
+		case Sherlock::GType_RoseTattoo:
+			*engine = new Sherlock::Tattoo::TattooEngine(syst, gd);
+			break;
+		default:
+			error("Unknown game");
+			break;
+		}
+	}
+	return gd != 0;
+}
+
+bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
+	return false;
+}
+
+SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
+	SaveStateList saveList;
+	return saveList;
+}
+
+int SherlockMetaEngine::getMaximumSaveSlot() const {
+	return MAX_SAVES;
+}
+
+void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {
+}
+
+SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+	return SaveStateDescriptor();
+}
+
+
+#if PLUGIN_ENABLED_DYNAMIC(SHERLOCK)
+REGISTER_PLUGIN_DYNAMIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine);
+#else
+REGISTER_PLUGIN_STATIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine);
+#endif
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
new file mode 100644
index 0000000000..1d7326058e
--- /dev/null
+++ b/engines/sherlock/detection_tables.h
@@ -0,0 +1,47 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+namespace Sherlock {
+
+static const SherlockGameDescription gameDescriptions[] = {
+	{
+		// Case of the Serrated Scalpel - English
+		{
+			"scalpel",
+			0,
+			{
+				{ "talk.lib", 0, "ad0c4d6865edf15da4e9204c08815875", 238928 },
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOSPEECH)
+		},
+		GType_SerratedScalpel,
+		0
+	},
+
+	{ AD_TABLE_END_MARKER, 0, 0 }
+};
+
+} // End of namespace MADS
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
new file mode 100644
index 0000000000..f4a5bf1864
--- /dev/null
+++ b/engines/sherlock/graphics.cpp
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/graphics.h"
+
+namespace Sherlock {
+
+Surface::Surface(uint16 width, uint16 height) {
+	create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+}
+
+Surface::~Surface() {
+    free();
+}
+
+void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
+    Graphics::Surface::fillRect(Common::Rect(x1, y1, x2, y2), color);
+}
+
+void Surface::drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped, bool altFlag) {
+	
+	
+}
+
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
new file mode 100644
index 0000000000..64518a78c6
--- /dev/null
+++ b/engines/sherlock/graphics.h
@@ -0,0 +1,43 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_GRAPHICS_H
+#define SHERLOCK_GRAPHICS_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+#include "sherlock/sprite.h"
+
+namespace Sherlock {
+
+class Surface : public Graphics::Surface {
+public:
+    Surface(uint16 width, uint16 height);
+    ~Surface();
+	void fillRect(int x1, int y1, int x2, int y2, byte color);
+	void drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped = false, bool altFlag = false);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
new file mode 100644
index 0000000000..de4a2d7758
--- /dev/null
+++ b/engines/sherlock/inventory.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_INVENTORY_H
+#define SHERLOCK_INVENTORY_H
+
+#include "common/scummsys.h"
+
+namespace Sherlock {
+
+struct InventoryItem {
+	int stringIndex;
+	char name[12];
+	char description[41];
+	char name2[9];
+	uint16 value;
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
new file mode 100644
index 0000000000..ad7df48943
--- /dev/null
+++ b/engines/sherlock/journal.cpp
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/journal.h"
+
+namespace Sherlock {
+
+Journal::Journal() {
+	// Allow up to 1000 statements
+	_data.resize(1000);
+
+	// Initialize fields
+	_count = 0;
+	_maxPage = 0;
+	_index = 0;
+	_sub = 0;
+	_up = _down = 0;
+	_page = 0;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
new file mode 100644
index 0000000000..64158ff123
--- /dev/null
+++ b/engines/sherlock/journal.h
@@ -0,0 +1,46 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_JOURNAL_H
+#define SHERLOCK_JOURNAL_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+
+namespace Sherlock {
+
+class Journal {
+public:
+	Common::Array<int> _data;
+	int _count;
+	int _maxPage;
+	int _index;
+	int _sub;
+	int _up, _down;
+	int _page;
+public:
+	Journal();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
new file mode 100644
index 0000000000..1dfcb3a5af
--- /dev/null
+++ b/engines/sherlock/module.mk
@@ -0,0 +1,22 @@
+MODULE := engines/sherlock
+
+MODULE_OBJS = \
+	scalpel/scalpel.o \
+	tattoo/tattoo.o \
+	decompress.o \
+	detection.o \
+	graphics.o \
+	journal.o \
+	resources.o \
+	room.o \
+	sherlock.o \
+	sprite.o \
+	talk.o
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
new file mode 100644
index 0000000000..e59e65abff
--- /dev/null
+++ b/engines/sherlock/resources.cpp
@@ -0,0 +1,219 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/resources.h"
+#include "sherlock/decompress.h"
+#include "common/debug.h"
+
+namespace Sherlock {
+
+Cache::Cache() {
+}
+
+/**
+ * Returns true if a given file is currently being cached
+ */
+bool Cache::isCached(const Common::String &filename) const {
+	return _resources.contains(filename);
+}
+
+/**
+ * Loads a file into the cache if it's not already present, and returns it.
+ * If the file is LZW compressed, automatically decompresses it and loads
+ * the uncompressed version into memory
+ */
+void Cache::load(const Common::String &filename) {
+	// First check if the entry already exists
+	if (_resources.contains(filename))
+		return;
+
+	// Allocate a new cache entry
+	_resources[filename] = CacheEntry();
+	CacheEntry &cacheEntry = _resources[filename];
+
+	// Open the file for reading
+	Common::File f;
+	if (!f.open(filename))
+		error("Could not read file - %s", filename.c_str());
+
+	// Check whether the file is compressed
+	const char LZW_HEADER[5] = { "LZV\x1a" };
+	char header[5];
+	f.read(header, 5);
+	bool isCompressed = !strncmp(header, LZW_HEADER, 5);
+	f.seek(0);
+
+	if (isCompressed) {
+		// It's compressed, so decompress the file and store it's data in the cache entry
+		Common::SeekableReadStream *decompressed = decompressLZ(f);
+		cacheEntry.resize(decompressed->size());
+		decompressed->read(&cacheEntry[0], decompressed->size());
+
+		delete decompressed;
+	} else {
+		// It's not, so read the raw data of the file into the cache entry
+		cacheEntry.resize(f.size());
+		f.read(&cacheEntry[0], f.size());
+	}
+
+	f.close();
+}
+
+Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
+	// Return a memory stream that encapsulates the data
+	const CacheEntry &cacheEntry = _resources[filename];
+	return new Common::MemoryReadStream(&cacheEntry[0], cacheEntry.size());
+}
+
+/*----------------------------------------------------------------*/
+
+Resources::Resources() {
+	_resourceIndex = -1;
+
+	addToCache("vgs.lib");
+	addToCache("talk.lib");
+	addToCache("sequence.txt");
+	addToCache("journal.txt");
+	addToCache("portrait.lib");
+}
+
+
+/**
+ * Adds the specified file to the cache. If it's a library file, takes care of
+ * loading it's index for future use
+ */
+void Resources::addToCache(const Common::String &filename) { 
+	_cache.load(filename); 
+
+	// Check to see if the file is a library
+	Common::SeekableReadStream *stream = load(filename);
+	uint32 header = stream->readUint32BE();
+	if (header == MKTAG('L', 'I', 'B', 26))
+		loadLibraryIndex(filename, stream);
+
+	delete stream;
+}
+
+Common::SeekableReadStream *Resources::load(const Common::String &filename) {
+	// First check if the file is directly in the cache
+	if (_cache.isCached(filename))
+		return _cache.get(filename);
+
+	// Secondly, iterate through any loaded library file looking for a resource
+	// that has the same name
+	LibraryIndexes::iterator i;
+	for (i = _indexes.begin(); i != _indexes.end(); ++i) {
+		if ((*i)._value.contains(filename)) {
+			// Get a stream reference to the given library file
+			Common::SeekableReadStream *stream = load((*i)._key);
+			LibraryEntry &entry = (*i)._value[filename];
+			_resourceIndex = entry._index;
+
+			stream->seek(entry._offset);
+			Common::SeekableReadStream *resStream = stream->readStream(entry._size);
+
+			delete stream;
+			return resStream;
+		}
+	}
+
+	// At this point, fall back on a physical file with the given name
+	Common::File f;
+	if (!f.open(filename))
+		error("Could not load file - %s", filename.c_str());
+
+	Common::SeekableReadStream *stream = f.readStream(f.size());
+	f.close();
+
+	return stream;
+}
+
+/**
+ * Loads a specific resource from a given library file
+ */
+Common::SeekableReadStream *Resources::load(const Common::String &filename, const Common::String &libraryFile) {
+	// Open up the library for access
+	Common::SeekableReadStream *libStream = load(libraryFile);
+
+	// Check if the library has already had it's index read, and if not, load it
+	if (!_indexes.contains(libraryFile))
+		loadLibraryIndex(libraryFile, libStream);
+
+	// Extract the data for the specified resource and return it
+	LibraryEntry &entry = _indexes[libraryFile][filename];
+	libStream->seek(entry._offset);
+	Common::SeekableReadStream *stream = libStream->readStream(entry._size);
+
+	delete libStream;
+	return stream;
+}
+
+
+/**
+ * Reads in the index from a library file, and caches it's index for later use
+ */
+void Resources::loadLibraryIndex(const Common::String &libFilename,
+		Common::SeekableReadStream *stream) {
+	uint32 offset, nextOffset;
+
+	// Create an index entry
+	_indexes[libFilename] = LibraryIndex();
+	LibraryIndex &index = _indexes[libFilename];
+
+	// Read in the number of resources
+	stream->seek(4);
+	int count = stream->readUint16LE();
+
+	// Loop through reading in the entries
+	for (int idx = 0; idx < count; ++idx) {
+		// Read the name of the resource
+		char resName[13];
+		stream->read(resName, 13);
+		resName[12] = '\0';
+
+		// Read the offset
+		offset = stream->readUint32LE();
+
+		if (idx == (count - 1)) {
+			nextOffset = stream->size();
+		} else {
+			// Read the size by jumping forward to read the next entry's offset
+			stream->seek(13, SEEK_CUR);
+			nextOffset = stream->readUint32LE();
+			stream->seek(-17, SEEK_CUR);
+		}
+
+		// Add the entry to the index
+		index[resName] = LibraryEntry(idx, offset, nextOffset - offset);
+	}
+}
+
+/**
+ * Returns the index of the last loaded resource in it's given library file.
+ * This will be used primarily when loading talk files, so the engine can
+ * update the given conversation number in the journal
+ */
+int Resources::resouceIndex() const {
+	return _resourceIndex;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
new file mode 100644
index 0000000000..bfd2eb300c
--- /dev/null
+++ b/engines/sherlock/resources.h
@@ -0,0 +1,86 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_RESOURCES_H
+#define SHERLOCK_RESOURCES_H
+
+#include "common/array.h"
+#include "common/file.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+#include "common/str.h"
+#include "common/stream.h"
+
+namespace Sherlock {
+
+typedef Common::Array<byte> CacheEntry;
+typedef Common::HashMap<Common::String, CacheEntry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> CacheHash;
+
+struct LibraryEntry {
+	uint32 _offset, _size;
+	int _index;
+
+	LibraryEntry() : _index(0), _offset(0), _size(0) {}
+	LibraryEntry(int index, uint32 offset, uint32 size) : 
+		_index(index), _offset(offset), _size(size) {}
+};
+typedef Common::HashMap<Common::String, LibraryEntry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> LibraryIndex;
+typedef Common::HashMap<Common::String, LibraryIndex, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> LibraryIndexes;
+
+class SherlockEngine;
+
+class Cache {
+private:
+	CacheHash _resources;
+public:
+	Cache();
+
+	bool isCached(const Common::String &filename) const;
+
+	void load(const Common::String &name);
+
+	Common::SeekableReadStream *get(const Common::String &filename) const;
+};
+
+class Resources {
+private:
+	Cache _cache;
+	LibraryIndexes _indexes;
+	int _resourceIndex;
+
+	void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream);
+public:
+	Resources();
+
+	void addToCache(const Common::String &filename);
+
+	Common::SeekableReadStream *load(const Common::String &filename);
+
+	Common::SeekableReadStream *load(const Common::String &filename, const Common::String &libraryFile);
+
+	int resouceIndex() const;
+};
+
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/room.cpp b/engines/sherlock/room.cpp
new file mode 100644
index 0000000000..246a316562
--- /dev/null
+++ b/engines/sherlock/room.cpp
@@ -0,0 +1,32 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/room.h"
+
+namespace Sherlock {
+
+Rooms::Rooms() {
+	for (int roomNum = 0; roomNum < ROOMS_COUNT; ++roomNum)
+		Common::fill(&_stats[roomNum][0], &_stats[roomNum][9], false);
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/room.h b/engines/sherlock/room.h
new file mode 100644
index 0000000000..46755c1a10
--- /dev/null
+++ b/engines/sherlock/room.h
@@ -0,0 +1,102 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_ROOM_H
+#define SHERLOCK_ROOM_H
+
+#include "common/scummsys.h"
+#include "sherlock/sprite.h"
+
+namespace Sherlock {
+
+#define ROOMS_COUNT 63
+
+/*
+struct RoomBounds {
+	int x, y, width, height;
+};
+
+struct BgshapeSub {
+	uint16 value;
+};
+
+struct Bgshape {
+	char name[12];
+	char description[41];
+	char *textBufferPtr;
+	byte *seqBufPtr;
+	Sprite *sprite;
+	SpriteFrame *spriteFrame;
+	byte byte05;
+	byte seqBigCountFlag;
+	int16 seqIndex;
+	int16 canimIndex;
+	int16 x, y;
+	int16 xIncr, yIncr,
+	uint16 status;
+	int16 x2, y2;
+	int16 width2, height2;
+	uint16 word02;
+	uint16 word03;
+	byte flag;
+	byte itemValue;
+	uint16 word01;
+	uint16 word05;
+	uint16 stringIndex;
+	int16 width, height;
+	uint16 word04;
+	byte flagsAndIndex;
+	uint16 frameCount;
+	byte spriteFlags;
+	char string1[50];
+	byte byte07;
+	byte byte01;
+	byte byte02;
+	int16 boundsX, boundsY;
+	byte direction;
+	byte animIndex;
+	char string2[50];
+	byte byte06;
+	byte seqByte;
+	uint16 textBufferOfs;
+	byte byte03;
+	uint16 framesCopyCount;
+	byte byte08;
+	char string3[51];
+	uint16 word06;
+	uint16 word07;
+	uint16 word08;
+	uint16 word09;
+	BgshapeSub subItems[4];
+};
+*/
+class Rooms {
+public:
+	bool _stats[ROOMS_COUNT][9];
+	bool _savedStats[ROOMS_COUNT][9];
+public:
+	Rooms();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
new file mode 100644
index 0000000000..11b78946f9
--- /dev/null
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scalpel/scalpel.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+/**
+ * Initialises game flags
+ */
+void ScalpelEngine::initFlags() {
+	_flags.resize(100 * 8);
+	_flags[3] = true;		// Turn on Alley
+	_flags[39] = true;		// Turn on Baker Street
+}
+
+} // End of namespace Scalpel
+
+} // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
new file mode 100644
index 0000000000..e9f9aa05a2
--- /dev/null
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCALPEL_H
+#define SHERLOCK_SCALPEL_H
+
+#include "sherlock/sherlock.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+class ScalpelEngine : public SherlockEngine {
+public:
+	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
+		SherlockEngine(syst, gameDesc) {}
+	virtual ~ScalpelEngine() {}
+
+	virtual void initFlags();
+};
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
new file mode 100644
index 0000000000..a6ae6e215c
--- /dev/null
+++ b/engines/sherlock/sherlock.cpp
@@ -0,0 +1,81 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sherlock.h"
+#include "sherlock/graphics.h"
+#include "common/scummsys.h"
+#include "common/debug-channels.h"
+#include "engines/util.h"
+
+namespace Sherlock {
+
+SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
+		Engine(syst), _gameDescription(gameDesc) {
+	_journal = nullptr;
+	_res = nullptr;
+	_rooms = nullptr;
+	_talk = nullptr;
+}
+
+
+SherlockEngine::~SherlockEngine() {
+	delete _journal;
+	delete _res;
+	delete _rooms;
+	delete _talk;
+}
+
+void SherlockEngine::initialize() {
+	initGraphics(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, false);
+
+	DebugMan.addDebugChannel(kDebugScript, "scripts", "Script debug level");
+
+	/*
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+	bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
+
+	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
+	if (native_mt32)
+		driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
+
+	_midi = new MidiPlayer(this, driver);
+	_midi->setGM(true);
+	_midi->setNativeMT32(native_mt32);
+	*/
+
+	_journal = new Journal();
+	_res = new Resources();
+	_rooms = new Rooms();
+	_talk = new Talk();
+
+	initFlags();
+}
+
+Common::Error SherlockEngine::run() {
+	initialize();
+
+	// TODO: The rest of the game    
+	
+	return Common::kNoError;
+}
+
+} // End of namespace Comet
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
new file mode 100644
index 0000000000..a68650c0a9
--- /dev/null
+++ b/engines/sherlock/sherlock.h
@@ -0,0 +1,91 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_HOLMES_H
+#define SHERLOCK_HOLMES_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/endian.h"
+#include "common/util.h"
+#include "common/savefile.h"
+#include "common/hash-str.h"
+#include "engines/engine.h"
+#include "sherlock/journal.h"
+#include "sherlock/resources.h"
+#include "sherlock/room.h"
+#include "sherlock/talk.h"
+
+namespace Sherlock {
+
+enum {
+	kFileTypeHash
+};
+
+enum {
+	kDebugScript = 1 << 0
+};
+
+enum {
+	GType_SerratedScalpel = 0,
+	GType_RoseTattoo = 1
+};
+
+#define SHERLOCK_SCREEN_WIDTH 320
+#define SHERLOCK_SCREEN_HEIGHT 200
+
+struct SherlockGameDescription;
+
+class Resource;
+
+class SherlockEngine : public Engine {
+private:
+	bool detectGame();
+
+	void initialize();
+public:
+	const SherlockGameDescription *_gameDescription;
+	Journal *_journal;
+	Resources *_res;
+	Rooms *_rooms;
+	Talk *_talk;
+	Common::Array<bool> _flags;
+public:
+	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
+	virtual ~SherlockEngine();
+
+	virtual Common::Error run();
+
+	virtual void initFlags() = 0;
+
+	int getGameType() const;
+	uint32 getGameID() const;
+	uint32 getGameFeatures() const;
+	Common::Language getLanguage() const;
+	Common::Platform getPlatform() const;
+
+	Common::String getGameFile(int fileType);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
new file mode 100644
index 0000000000..f3b34345ef
--- /dev/null
+++ b/engines/sherlock/sound.h
@@ -0,0 +1,39 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SOUND_H
+#define SHERLOCK_SOUND_H
+
+namespace Sherlock {
+
+class Sound {
+public
+	void playSound(const char *name);
+	void cacheSound(const char *name, int index);
+	void playCachedSound(int index);
+	void clearCache();
+	
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
new file mode 100644
index 0000000000..7aa2fdc71b
--- /dev/null
+++ b/engines/sherlock/sprite.cpp
@@ -0,0 +1,142 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sprite.h"
+#include "common/debug.h"
+
+namespace Sherlock {
+
+/*
+struct SpriteFrame {
+	byte *data;
+	int width, height;
+	uint16 flags;
+	int xofs, yofs;
+	byte rleMarker;
+};
+*/
+
+Sprite::Sprite(Common::SeekableReadStream &stream) {
+	load(stream);
+}
+
+Sprite::~Sprite() {
+}
+
+int Sprite::getFrameCount() {
+	return _frames.size();
+}
+
+SpriteFrame *Sprite::getFrame(int index) {
+	return _frames[index];
+}
+
+void Sprite::load(Common::SeekableReadStream &stream) {
+
+    while (!stream.eos()) {
+    
+        debug("frameNum = %d\n", _frames.size());
+    
+        SpriteFrame *spriteFrame = new SpriteFrame();
+
+		uint32 startOfs = stream.pos();
+
+		debug("startOfs = %08X\n", startOfs);
+
+        spriteFrame->frame = NULL;
+        spriteFrame->width = stream.readUint16LE() + 1;
+        spriteFrame->height = stream.readUint16LE() + 1;
+        spriteFrame->flags = stream.readUint16LE();
+        stream.readUint16LE();
+        
+        debug("width = %d; height = %d; flags = %04X\n", spriteFrame->width, spriteFrame->height, spriteFrame->flags);
+
+        if (spriteFrame->flags & 0xFF) {
+            spriteFrame->size = (spriteFrame->width * spriteFrame->height) / 2;
+        } else if (spriteFrame->flags & 0x0100) {
+            // this size includes the header size, which we subtract
+            spriteFrame->size = stream.readUint16LE() - 11;
+            spriteFrame->rleMarker = stream.readByte();
+        } else {
+            spriteFrame->size = spriteFrame->width * spriteFrame->height;
+        }
+
+        spriteFrame->data = new byte[spriteFrame->size];
+        stream.read(spriteFrame->data, spriteFrame->size);
+        
+        decompressFrame(spriteFrame);
+
+		/*
+		debug("size = %d (%08X)\n", spriteFrame->size, spriteFrame->size);
+		if (spriteFrame->frame) {
+		    char fn[128];
+		    sndebug(fn, 128, "%04d.spr", _frames.size());
+		    FILE *x = fopen(fn, "wb");
+		    fwrite(spriteFrame->frame->pixels, spriteFrame->frame->w * spriteFrame->frame->h, 1, x);
+		    fclose(x);
+		}
+		*/
+
+		_frames.push_back(spriteFrame);
+		
+    }
+    
+   // debug("Done: %08X\n", stream.pos()); fflush(stdout);
+
+}
+
+void Sprite::decompressFrame(SpriteFrame *frame) {
+
+    frame->frame = new Graphics::Surface();
+	frame->frame->create(frame->width, frame->height, Graphics::PixelFormat::createFormatCLUT8());
+
+	if (frame->flags & 0xFF) {
+	    debug("Sprite::decompressFrame() 4-bits/pixel\n");
+	    debug("TODO\n");
+	} else if (frame->flags & 0x0100) {
+	    debug("Sprite::decompressFrame() RLE-compressed; rleMarker = %02X\n", frame->rleMarker);
+	    const byte *src = frame->data;
+	    byte *dst = (byte *)frame->frame->getPixels();
+		for (uint16 h = 0; h < frame->height; h++) {
+			int16 w = frame->width;
+			while (w > 0) {
+			    if (*src == frame->rleMarker) {
+			        byte rleColor = src[1];
+			        byte rleCount = src[2];
+			        src += 3;
+			        w -= rleCount;
+			        while (rleCount--)
+			            *dst++ = rleColor;
+				} else {
+				    *dst++ = *src++;
+				    w--;
+				}
+			}
+		}
+	} else {
+	    debug("Sprite::decompressFrame() Uncompressed\n");
+	    memcpy(frame->data, frame->frame->getPixels(), frame->width * frame->height);
+	}
+
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
new file mode 100644
index 0000000000..f56ab588bb
--- /dev/null
+++ b/engines/sherlock/sprite.h
@@ -0,0 +1,56 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SPRITE_H
+#define SHERLOCK_SPRITE_H
+
+#include "common/stream.h"
+#include "common/array.h"
+#include "graphics/surface.h"
+
+namespace Sherlock {
+
+struct SpriteFrame {
+	byte *data;
+	uint32 size;
+	uint16 width, height;
+	uint16 flags;
+	int xofs, yofs;
+	byte rleMarker;
+	Graphics::Surface *frame;
+};
+
+class Sprite {
+public:
+    Sprite(Common::SeekableReadStream &stream);
+    ~Sprite();
+	int getFrameCount();
+	SpriteFrame *getFrame(int index);
+protected:
+	Common::Array<SpriteFrame*> _frames;
+	void load(Common::SeekableReadStream &stream);
+	void decompressFrame(SpriteFrame *frame);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
new file mode 100644
index 0000000000..3122aff95f
--- /dev/null
+++ b/engines/sherlock/talk.cpp
@@ -0,0 +1,30 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/talk.h"
+
+namespace Sherlock {
+
+Talk::Talk() {
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
new file mode 100644
index 0000000000..6ffbcdd8d4
--- /dev/null
+++ b/engines/sherlock/talk.h
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_TALK_H
+#define SHERLOCK_TALK_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+
+namespace Sherlock {
+
+struct TalkHistoryEntry {
+private:
+	int _data[2];
+public:
+	TalkHistoryEntry() { _data[0] = _data[1] = 0; }
+
+	int &operator[](int idx) { return _data[idx]; }
+};
+
+class Talk {
+public:
+	Common::Array<TalkHistoryEntry> _history;
+public:
+	Talk();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
new file mode 100644
index 0000000000..bed6edb3d4
--- /dev/null
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -0,0 +1,38 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/tattoo/tattoo.h"
+
+namespace Sherlock {
+
+namespace Tattoo {
+
+/**
+ * Initialises game flags
+ */
+void TattooEngine::initFlags() {
+	_flags.resize(100 * 8);
+}
+
+} // End of namespace Tattoo
+
+} // End of namespace Scalpel
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
new file mode 100644
index 0000000000..e2977983f1
--- /dev/null
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_TATTOO_H
+#define SHERLOCK_TATTOO_H
+
+#include "sherlock/sherlock.h"
+
+namespace Sherlock {
+
+namespace Tattoo {
+
+class TattooEngine : public SherlockEngine {
+public:
+	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
+		SherlockEngine(syst, gameDesc) {}
+	virtual ~TattooEngine() {}
+
+	virtual void initFlags();
+};
+
+} // End of namespace Tattoo
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/vdaplayer.h b/engines/sherlock/vdaplayer.h
new file mode 100644
index 0000000000..9b755606d5
--- /dev/null
+++ b/engines/sherlock/vdaplayer.h
@@ -0,0 +1,34 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_VDAPLAYER_H
+#define SHERLOCK_VDAPLAYER_H
+
+namespace Sherlock {
+
+class VdaPlayer {
+
+};
+
+} // End of namespace Sherlock
+
+#endif
-- 
cgit v1.2.3


From eaab373a9687c6d6d3be3983bb77da5a69897a24 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 17:25:21 -0400
Subject: SHERLOCK: Added skeleton Screen class

---
 engines/sherlock/graphics.cpp | 21 +++++++++++++++++++++
 engines/sherlock/graphics.h   | 14 ++++++++++++++
 engines/sherlock/sherlock.cpp |  3 +++
 engines/sherlock/sherlock.h   |  2 ++
 4 files changed, 40 insertions(+)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index f4a5bf1864..695635d2ca 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "sherlock/graphics.h"
+#include "sherlock/sherlock.h"
+#include "common/system.h"
 
 namespace Sherlock {
 
@@ -41,5 +43,24 @@ void Surface::drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped, b
 	
 }
 
+/*----------------------------------------------------------------*/
+
+Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm) {
+	setFont(1);
+}
+
+void Screen::setFont(int fontNumber) {
+	_fontNumber = fontNumber;
+	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber);
+	Common::SeekableReadStream *stream = _vm->_res->load(fname);
+
+	debug("TODO: Loading font %s, size - %d", fname.c_str(), stream->size());
+
+	delete stream;
+}
+
+void Screen::update() {
+	g_system->updateScreen();
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 64518a78c6..fe03e7155d 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -30,6 +30,8 @@
 
 namespace Sherlock {
 
+class SherlockEngine;
+
 class Surface : public Graphics::Surface {
 public:
     Surface(uint16 width, uint16 height);
@@ -38,6 +40,18 @@ public:
 	void drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped = false, bool altFlag = false);
 };
 
+class Screen : public Surface {
+private:
+	SherlockEngine *_vm;
+	int _fontNumber;
+public:
+	Screen(SherlockEngine *vm);
+
+	void setFont(int fontNumber);
+
+	void update();
+};
+
 } // End of namespace Sherlock
 
 #endif
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a6ae6e215c..0d55e0ba8d 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -33,6 +33,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_journal = nullptr;
 	_res = nullptr;
 	_rooms = nullptr;
+	_screen = nullptr;
 	_talk = nullptr;
 }
 
@@ -41,6 +42,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _journal;
 	delete _res;
 	delete _rooms;
+	delete _screen;
 	delete _talk;
 }
 
@@ -65,6 +67,7 @@ void SherlockEngine::initialize() {
 	_journal = new Journal();
 	_res = new Resources();
 	_rooms = new Rooms();
+	_screen = new Screen(this);
 	_talk = new Talk();
 
 	initFlags();
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index a68650c0a9..4c5f86dd09 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -30,6 +30,7 @@
 #include "common/savefile.h"
 #include "common/hash-str.h"
 #include "engines/engine.h"
+#include "sherlock/graphics.h"
 #include "sherlock/journal.h"
 #include "sherlock/resources.h"
 #include "sherlock/room.h"
@@ -67,6 +68,7 @@ public:
 	Journal *_journal;
 	Resources *_res;
 	Rooms *_rooms;
+	Screen *_screen;
 	Talk *_talk;
 	Common::Array<bool> _flags;
 public:
-- 
cgit v1.2.3


From a6db2fb281fb5842be2d8fc0621922e70ad9668c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 17:50:10 -0400
Subject: SHERLOCK: Further game setup

---
 engines/sherlock/room.cpp            | 2 ++
 engines/sherlock/room.h              | 1 +
 engines/sherlock/scalpel/scalpel.cpp | 8 ++++++--
 engines/sherlock/scalpel/scalpel.h   | 4 ++--
 engines/sherlock/sherlock.cpp        | 2 --
 engines/sherlock/sherlock.h          | 7 ++-----
 engines/sherlock/tattoo/tattoo.cpp   | 7 -------
 engines/sherlock/tattoo/tattoo.h     | 2 --
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/engines/sherlock/room.cpp b/engines/sherlock/room.cpp
index 246a316562..9926899953 100644
--- a/engines/sherlock/room.cpp
+++ b/engines/sherlock/room.cpp
@@ -27,6 +27,8 @@ namespace Sherlock {
 Rooms::Rooms() {
 	for (int roomNum = 0; roomNum < ROOMS_COUNT; ++roomNum)
 		Common::fill(&_stats[roomNum][0], &_stats[roomNum][9], false);
+
+	_goToRoom = -1;
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/room.h b/engines/sherlock/room.h
index 46755c1a10..75800b623a 100644
--- a/engines/sherlock/room.h
+++ b/engines/sherlock/room.h
@@ -93,6 +93,7 @@ class Rooms {
 public:
 	bool _stats[ROOMS_COUNT][9];
 	bool _savedStats[ROOMS_COUNT][9];
+	int _goToRoom;
 public:
 	Rooms();
 };
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 11b78946f9..bd8c96f253 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -27,14 +27,18 @@ namespace Sherlock {
 namespace Scalpel {
 
 /**
- * Initialises game flags
+ * Game initialization
  */
-void ScalpelEngine::initFlags() {
+void ScalpelEngine::initialize() {
 	_flags.resize(100 * 8);
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
+
+	// Starting room
+	_rooms->_goToRoom = 4;
 }
 
+
 } // End of namespace Scalpel
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index e9f9aa05a2..9001c20456 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -30,12 +30,12 @@ namespace Sherlock {
 namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
+protected:
+	virtual void initialize();
 public:
 	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {}
 	virtual ~ScalpelEngine() {}
-
-	virtual void initFlags();
 };
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 0d55e0ba8d..13731e2fd8 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -69,8 +69,6 @@ void SherlockEngine::initialize() {
 	_rooms = new Rooms();
 	_screen = new Screen(this);
 	_talk = new Talk();
-
-	initFlags();
 }
 
 Common::Error SherlockEngine::run() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 4c5f86dd09..172c940c34 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -60,9 +60,8 @@ class Resource;
 
 class SherlockEngine : public Engine {
 private:
-	bool detectGame();
-
-	void initialize();
+protected:
+	virtual void initialize();
 public:
 	const SherlockGameDescription *_gameDescription;
 	Journal *_journal;
@@ -77,8 +76,6 @@ public:
 
 	virtual Common::Error run();
 
-	virtual void initFlags() = 0;
-
 	int getGameType() const;
 	uint32 getGameID() const;
 	uint32 getGameFeatures() const;
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index bed6edb3d4..57ca5c6e29 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -26,13 +26,6 @@ namespace Sherlock {
 
 namespace Tattoo {
 
-/**
- * Initialises game flags
- */
-void TattooEngine::initFlags() {
-	_flags.resize(100 * 8);
-}
-
 } // End of namespace Tattoo
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index e2977983f1..f06fa1532d 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -34,8 +34,6 @@ public:
 	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {}
 	virtual ~TattooEngine() {}
-
-	virtual void initFlags();
 };
 
 } // End of namespace Tattoo
-- 
cgit v1.2.3


From 1452c18ffb21da0d97725c7c982b25992bd75fe8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 18:42:24 -0400
Subject: SHERLOCK: Added events manager and debugger classes

---
 engines/sherlock/debugger.cpp        |  59 +++++++++++++
 engines/sherlock/debugger.h          |  45 ++++++++++
 engines/sherlock/events.cpp          | 167 +++++++++++++++++++++++++++++++++++
 engines/sherlock/events.h            |  82 +++++++++++++++++
 engines/sherlock/graphics.cpp        |   4 +-
 engines/sherlock/graphics.h          |   1 +
 engines/sherlock/module.mk           |   2 +
 engines/sherlock/scalpel/scalpel.cpp |   9 ++
 engines/sherlock/scalpel/scalpel.h   |   2 +
 engines/sherlock/sherlock.cpp        |   7 +-
 engines/sherlock/sherlock.h          |   4 +
 engines/sherlock/tattoo/tattoo.cpp   |   4 +
 engines/sherlock/tattoo/tattoo.h     |   2 +
 13 files changed, 386 insertions(+), 2 deletions(-)
 create mode 100644 engines/sherlock/debugger.cpp
 create mode 100644 engines/sherlock/debugger.h
 create mode 100644 engines/sherlock/events.cpp
 create mode 100644 engines/sherlock/events.h

diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
new file mode 100644
index 0000000000..50300322ef
--- /dev/null
+++ b/engines/sherlock/debugger.cpp
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/debugger.h"
+#include "sherlock/sherlock.h"
+
+namespace Sherlock {
+
+Debugger::Debugger(SherlockEngine *vm) : GUI::Debugger(), _vm(vm) {
+	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
+	registerCmd("scene", WRAP_METHOD(Debugger, cmd_scene));
+}
+
+static int strToInt(const char *s) {
+	if (!*s)
+		// No string at all
+		return 0;
+	else if (toupper(s[strlen(s) - 1]) != 'H')
+		// Standard decimal string
+		return atoi(s);
+
+	// Hexadecimal string
+	uint tmp = 0;
+	int read = sscanf(s, "%xh", &tmp);
+	if (read < 1)
+		error("strToInt failed on string \"%s\"", s);
+	return (int)tmp;
+}
+
+bool Debugger::cmd_scene(int argc, const char **argv) {
+	if (argc != 2) {
+		debugPrintf("Format: scene <room>\n");
+		return true;
+	} else {
+		_vm->_rooms->_goToRoom = strToInt(argv[1]);
+		return false;
+	}
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/debugger.h b/engines/sherlock/debugger.h
new file mode 100644
index 0000000000..8c7291c9e6
--- /dev/null
+++ b/engines/sherlock/debugger.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_DEBUGGER_H
+#define SHERLOCK_DEBUGGER_H
+
+#include "common/scummsys.h"
+#include "gui/debugger.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+class Debugger : public GUI::Debugger {
+private:
+	SherlockEngine *_vm;
+protected:
+	bool cmd_scene(int argc, const char **argv);
+public:
+	Debugger(SherlockEngine *vm);
+	virtual ~Debugger() {}
+};
+
+} // End of namespace Sherlock
+
+#endif	/* SHERLOCK_DEBUGGER_H */
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
new file mode 100644
index 0000000000..7e62dc075b
--- /dev/null
+++ b/engines/sherlock/events.cpp
@@ -0,0 +1,167 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/events.h"
+#include "common/system.h"
+#include "engines/util.h"
+#include "graphics/cursorman.h"
+#include "sherlock/sherlock.h"
+#include "sherlock/events.h"
+
+namespace Sherlock {
+
+EventsManager::EventsManager(SherlockEngine *vm) {
+	_vm = vm;
+	_cursorId = CURSOR_NONE;
+	_frameCounter = 1;
+	_priorFrameTime = 0;
+	_mouseClicked = false;
+	_mouseButtons = 0;
+}
+
+EventsManager::~EventsManager() {
+}
+
+/**
+ * Set the cursor to show
+ */
+void EventsManager::setCursor(CursorType cursorId) {
+	_cursorId = cursorId;
+
+	// TODO: Cursor handling
+}
+
+/**
+ * Show the mouse cursor
+ */
+void EventsManager::showCursor() {
+	CursorMan.showMouse(true);
+}
+
+/**
+ * Hide the mouse cursor
+ */
+void EventsManager::hideCursor() {
+	CursorMan.showMouse(false);
+}
+
+/**
+ * Returns true if the mouse cursor is visible
+ */
+bool EventsManager::isCursorVisible() {
+	return CursorMan.isVisible();
+}
+
+void EventsManager::pollEvents() {
+	checkForNextFrameCounter();
+
+	Common::Event event;
+	while (g_system->getEventManager()->pollEvent(event)) {
+		// Handle keypress
+		switch (event.type) {
+		case Common::EVENT_QUIT:
+		case Common::EVENT_RTL:
+			return;
+
+		case Common::EVENT_KEYDOWN:
+			// Check for debugger
+			if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL)) {
+				// Attach to the debugger
+				_vm->_debugger->attach();
+				_vm->_debugger->onFrame();
+			} else {
+				_pendingKeys.push(event.kbd);
+			}
+			return;
+		case Common::EVENT_KEYUP:
+			return;
+		case Common::EVENT_LBUTTONDOWN:
+		case Common::EVENT_RBUTTONDOWN:
+			_mouseClicked = true;
+			return;
+		case Common::EVENT_LBUTTONUP:
+		case Common::EVENT_RBUTTONUP:
+			_mouseClicked = false;
+			return;
+		case Common::EVENT_MOUSEMOVE:
+			_mousePos = event.mouse;
+			break;
+		default:
+ 			break;
+		}
+	}
+}
+
+bool EventsManager::checkForNextFrameCounter() {
+	// Check for next game frame
+	uint32 milli = g_system->getMillis();
+	if ((milli - _priorFrameTime) >= GAME_FRAME_TIME) {
+		++_frameCounter;
+		_priorFrameTime = milli;
+
+		// Give time to the debugger
+		_vm->_debugger->onFrame();
+
+		// Display the frame
+		_vm->_screen->update();
+
+		// Signal the ScummVM debugger
+		_vm->_debugger->onFrame();
+
+		return true;
+	}
+
+	return false;
+}
+
+void EventsManager::delay(int cycles) {
+	uint32 totalMilli = cycles * 1000 / GAME_FRAME_RATE;
+	uint32 delayEnd = g_system->getMillis() + totalMilli;
+
+	while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd) {
+		g_system->delayMillis(10);
+
+		pollEvents();
+	}
+}
+
+void EventsManager::waitForNextFrame() {
+	_mouseClicked = false;
+	_mouseButtons = 0;
+
+	bool mouseClicked = false;
+	int mouseButtons = 0;
+
+	uint32 frameCtr = getFrameCounter();
+	while (!_vm->shouldQuit() && frameCtr == _frameCounter) {
+		delay(1);
+
+		mouseClicked |= _mouseClicked;
+		mouseButtons |= _mouseButtons;
+	}
+
+	_mouseClicked = mouseClicked;
+	_mouseButtons = mouseButtons;
+}
+
+} // End of namespace MADS
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
new file mode 100644
index 0000000000..4ba30e0bdf
--- /dev/null
+++ b/engines/sherlock/events.h
@@ -0,0 +1,82 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_EVENTS_H
+#define SHERLOCK_EVENTS_H
+
+#include "common/scummsys.h"
+#include "common/events.h"
+#include "common/stack.h"
+
+namespace Sherlock {
+
+enum CursorType { CURSOR_NONE = 0 };
+
+#define GAME_FRAME_RATE 50
+#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
+
+class SherlockEngine;
+
+class EventsManager {
+private:
+	SherlockEngine *_vm;
+	uint32 _frameCounter;
+	uint32 _priorFrameTime;
+	Common::Point _mousePos;
+
+	bool checkForNextFrameCounter();
+public:
+	CursorType _cursorId;
+	byte _mouseButtons;
+	bool _mouseClicked;
+	Common::Stack<Common::KeyState> _pendingKeys;
+public:
+	EventsManager(SherlockEngine *vm);
+	~EventsManager();
+
+	void setCursor(CursorType cursorId);
+
+	void showCursor();
+
+	void hideCursor();
+
+	bool isCursorVisible();
+
+	void pollEvents();
+
+	Common::Point mousePos() const { return _mousePos; }
+
+	uint32 getFrameCounter() const { return _frameCounter; }
+
+	bool isKeyPressed() const { return !_pendingKeys.empty(); }
+
+	Common::KeyState getKey() { return _pendingKeys.pop(); }
+
+	void delay(int amount);
+
+	void waitForNextFrame();
+
+};
+
+} // End of namespace Sherlock
+
+#endif /* SHERLOCK_EVENTS_H */
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 695635d2ca..5c6c94606e 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -45,7 +45,9 @@ void Surface::drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped, b
 
 /*----------------------------------------------------------------*/
 
-Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm) {
+Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
+		_backBuffer1(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
+		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
 	setFont(1);
 }
 
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index fe03e7155d..801b1747ee 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -44,6 +44,7 @@ class Screen : public Surface {
 private:
 	SherlockEngine *_vm;
 	int _fontNumber;
+	Surface _backBuffer1, _backBuffer2;
 public:
 	Screen(SherlockEngine *vm);
 
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 1dfcb3a5af..19ad039262 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -4,7 +4,9 @@ MODULE_OBJS = \
 	scalpel/scalpel.o \
 	tattoo/tattoo.o \
 	decompress.o \
+	debugger.o \
 	detection.o \
+	events.o \
 	graphics.o \
 	journal.o \
 	resources.o \
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index bd8c96f253..1eaf7c91ee 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -30,6 +30,8 @@ namespace Scalpel {
  * Game initialization
  */
 void ScalpelEngine::initialize() {
+	SherlockEngine::initialize();
+
 	_flags.resize(100 * 8);
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
@@ -38,6 +40,13 @@ void ScalpelEngine::initialize() {
 	_rooms->_goToRoom = 4;
 }
 
+/**
+ * Show the opening sequence
+ */
+void ScalpelEngine::showOpening() {
+	// TODO
+}
+
 
 } // End of namespace Scalpel
 
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 9001c20456..6016984e45 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -32,6 +32,8 @@ namespace Scalpel {
 class ScalpelEngine : public SherlockEngine {
 protected:
 	virtual void initialize();
+
+	virtual void showOpening();
 public:
 	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {}
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 13731e2fd8..cfbbacccf7 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -30,6 +30,7 @@ namespace Sherlock {
 
 SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		Engine(syst), _gameDescription(gameDesc) {
+	_debugger = nullptr;
 	_journal = nullptr;
 	_res = nullptr;
 	_rooms = nullptr;
@@ -39,6 +40,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 
 
 SherlockEngine::~SherlockEngine() {
+	delete _debugger;
 	delete _journal;
 	delete _res;
 	delete _rooms;
@@ -64,6 +66,7 @@ void SherlockEngine::initialize() {
 	_midi->setNativeMT32(native_mt32);
 	*/
 
+	_debugger = new Debugger(this);
 	_journal = new Journal();
 	_res = new Resources();
 	_rooms = new Rooms();
@@ -74,7 +77,9 @@ void SherlockEngine::initialize() {
 Common::Error SherlockEngine::run() {
 	initialize();
 
-	// TODO: The rest of the game    
+	showOpening();
+
+	// TODO: Rest of game
 	
 	return Common::kNoError;
 }
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 172c940c34..781851db71 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -30,6 +30,7 @@
 #include "common/savefile.h"
 #include "common/hash-str.h"
 #include "engines/engine.h"
+#include "sherlock/debugger.h"
 #include "sherlock/graphics.h"
 #include "sherlock/journal.h"
 #include "sherlock/resources.h"
@@ -62,8 +63,11 @@ class SherlockEngine : public Engine {
 private:
 protected:
 	virtual void initialize();
+
+	virtual void showOpening() = 0;
 public:
 	const SherlockGameDescription *_gameDescription;
+	Debugger *_debugger;
 	Journal *_journal;
 	Resources *_res;
 	Rooms *_rooms;
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 57ca5c6e29..b2b45bc310 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -26,6 +26,10 @@ namespace Sherlock {
 
 namespace Tattoo {
 
+void TattooEngine::showOpening() {
+	// TODO
+}
+
 } // End of namespace Tattoo
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index f06fa1532d..6d3ec33967 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -30,6 +30,8 @@ namespace Sherlock {
 namespace Tattoo {
 
 class TattooEngine : public SherlockEngine {
+protected:
+	virtual void showOpening();
 public:
 	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {}
-- 
cgit v1.2.3


From 7a9514567f44f5a717fcfb1994431e54e06ea148 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 16 Mar 2015 01:41:08 +0200
Subject: MADS: Handle a game bug in scene 604, which prevents game completion

---
 engines/mads/nebular/nebular_scenes6.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 046782b772..d94fb17fd4 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -948,8 +948,14 @@ void Scene604::actions() {
 		_bombMode = 1;
 		if ((_game._difficulty == DIFFICULTY_HARD) || _globals[kWarnedFloodCity])
 			handleBombActions();
-		else if ((_game._objects.isInInventory(OBJ_POLYCEMENT) && _game._objects.isInInventory(OBJ_CHICKEN))
-			 && ((_globals[kLineStatus] == LINE_TIED) || ((_game._difficulty == DIFFICULTY_EASY) && (!_globals[kBoatRaised]))))
+		else if (
+			(_game._objects.isInInventory(OBJ_POLYCEMENT) && (_game._objects.isInInventory(OBJ_CHICKEN) || _game._objects.isInInventory(OBJ_CHICKEN_BOMB)))
+			 && (_globals[kLineStatus] == LINE_TIED || (_game._difficulty == DIFFICULTY_EASY && !_globals[kBoatRaised]))
+			)
+			// The original can get in an impossible state at this point, if the player has
+			// combined the chicken with the bomb before placing the timer bomb on the ledge.
+			// Therefore, we also allow the player to place the bomb if the chicken bomb is
+			// in the inventory.
 			handleBombActions();
 		else if (_game._difficulty == DIFFICULTY_EASY)
 			_vm->_dialogs->show(60424);
-- 
cgit v1.2.3


From 92c55e2bb192785e4587e143c9c367213f30233c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 21:25:07 -0400
Subject: SHERLOCK: Beginning of animation player

---
 engines/sherlock/animation.cpp       | 124 +++++++++++++++++++++++++++++++++++
 engines/sherlock/animation.h         |  50 ++++++++++++++
 engines/sherlock/events.cpp          |  20 ++++++
 engines/sherlock/events.h            |   2 +
 engines/sherlock/graphics.h          |   2 +
 engines/sherlock/module.mk           |   2 +
 engines/sherlock/scalpel/scalpel.cpp |  34 ++++++++++
 engines/sherlock/scalpel/scalpel.h   |   5 ++
 engines/sherlock/sherlock.cpp        |   8 +++
 engines/sherlock/sherlock.h          |   6 ++
 engines/sherlock/sound.cpp           |  55 ++++++++++++++++
 engines/sherlock/sound.h             |  17 ++++-
 engines/sherlock/vdaplayer.h         |  34 ----------
 13 files changed, 322 insertions(+), 37 deletions(-)
 create mode 100644 engines/sherlock/animation.cpp
 create mode 100644 engines/sherlock/animation.h
 create mode 100644 engines/sherlock/sound.cpp
 delete mode 100644 engines/sherlock/vdaplayer.h

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
new file mode 100644
index 0000000000..52859ce5e4
--- /dev/null
+++ b/engines/sherlock/animation.cpp
@@ -0,0 +1,124 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/animation.h"
+#include "sherlock/sherlock.h"
+#include "common/algorithm.h"
+
+namespace Sherlock {
+
+// The following are a list of filenames played in the prologue that have 
+// special effects associated with them at specific frames
+
+#define FRAMES_END 32000
+#define PROLOGUE_NAMES_COUNT 6
+#define TITLE_NAMES_COUNT 7
+static const char *const PROLOGUE_NAMES[6] = { 
+	"subway1", "subway2", "finale2", "suicid", "coff3", "coff4" 
+};
+static const int PROLOGUE_FRAMES[6][9] = { 
+	{ 4, 26, 54, 72, 92, 134, FRAMES_END },
+	{ 2, 80, 95, 117, 166, FRAMES_END },
+	{ 1, FRAMES_END },
+	{ 42, FRAMES_END },
+	{ FRAMES_END },
+	{ FRAMES_END } 
+};
+
+// Title animations file list
+static const char *const TITLE_NAMES[7] = { 
+	"27pro1", "14note", "coff1", "coff2", "coff3", "coff4", "14kick" 
+};
+
+static const int TITLE_FRAMES[7][9] = { 
+	{ 29, 131, FRAMES_END },
+	{ 55, 80, 95, 117, 166, FRAMES_END },
+	{ 15, FRAMES_END },
+	{ 4, 37, 92, FRAMES_END },
+	{ 2, 43, FRAMES_END },
+	{ 2, FRAMES_END },
+	{ 10, 50, FRAMES_END }
+};
+
+static const int NO_FRAMES = FRAMES_END;
+
+Animation::Animation(SherlockEngine *vm): _vm(vm) {
+	_useEpilogue2 = false;
+}
+
+void Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
+		bool setPalette, int speed) {
+	// Check for any any sound frames for the given animation
+	const int *soundFrames = checkForSoundFrames(filename);
+
+	// Strip any extension off of the passed filename and add .vdx suffix
+	Common::String baseName = filename;
+	const char *p = strchr(baseName.c_str(), '.');
+	if (p)
+		baseName = Common::String(filename.c_str(), MIN(p - 1, baseName.c_str() + 7));
+
+	Common::String vdxName = baseName + ".vdx";
+
+	// Load the animation
+	Common::SeekableReadStream *stream;
+	if (!_titleOverride.empty())
+		stream = _vm->_res->load(vdxName, _titleOverride);
+	else if (_useEpilogue2)
+		stream = _vm->_res->load(vdxName, "epilog2.lib");
+	else
+		stream = _vm->_res->load(vdxName, "epilogoue.lib");
+	int resoucreIndex = _vm->_res->resouceIndex();
+
+	// Load initial image
+	//Common::String vdaName = baseName + ".vda";
+	// TODO
+
+
+	delete stream;
+}
+
+/**
+ * Checks for whether an animation is being played that has associated sound
+ */
+const int *Animation::checkForSoundFrames(const Common::String &filename) {
+	const int *frames = &NO_FRAMES;
+
+	if (!_soundOverride.empty()) {
+		for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
+			if (!scumm_stricmp(filename.c_str(), PROLOGUE_NAMES[idx])) {
+				frames = &PROLOGUE_FRAMES[idx][0];
+				break;
+			}
+		}
+	} else {
+		for (int idx = 0; idx < TITLE_NAMES_COUNT; ++idx) {
+			if (!scumm_stricmp(filename.c_str(), TITLE_NAMES[idx])) {
+				frames = &TITLE_FRAMES[idx][0];
+				break;
+			}
+		}
+	}
+
+	return frames;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
new file mode 100644
index 0000000000..bf4429656e
--- /dev/null
+++ b/engines/sherlock/animation.h
@@ -0,0 +1,50 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_ANIMATION_H
+#define SHERLOCK_ANIMATION_H
+
+#include "common/scummsys.h"
+#include "common/str.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+class Animation {
+private:
+	SherlockEngine *_vm;
+
+	const int *checkForSoundFrames(const Common::String &filename);
+public:
+	Common::String _soundOverride;
+	Common::String _titleOverride;
+	bool _useEpilogue2;
+public:
+	Animation(SherlockEngine *vm);
+
+	void playPrologue(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 7e62dc075b..fdcf61e46f 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -72,6 +72,9 @@ bool EventsManager::isCursorVisible() {
 	return CursorMan.isVisible();
 }
 
+/**
+ * Check for any pending events
+ */
 void EventsManager::pollEvents() {
 	checkForNextFrameCounter();
 
@@ -112,6 +115,9 @@ void EventsManager::pollEvents() {
 	}
 }
 
+/**
+ * Check whether it's time to display the next screen frame
+ */
 bool EventsManager::checkForNextFrameCounter() {
 	// Check for next game frame
 	uint32 milli = g_system->getMillis();
@@ -134,6 +140,17 @@ bool EventsManager::checkForNextFrameCounter() {
 	return false;
 }
 
+/**
+ * Clear any current keypress or mouse click
+ */
+void EventsManager::clearEvents() {
+	_pendingKeys.clear();
+	_mouseClicked = false;
+}
+
+/**
+ * Delay for a given number of frames/cycles
+ */
 void EventsManager::delay(int cycles) {
 	uint32 totalMilli = cycles * 1000 / GAME_FRAME_RATE;
 	uint32 delayEnd = g_system->getMillis() + totalMilli;
@@ -145,6 +162,9 @@ void EventsManager::delay(int cycles) {
 	}
 }
 
+/**
+ * Wait for the next frame
+ */
 void EventsManager::waitForNextFrame() {
 	_mouseClicked = false;
 	_mouseButtons = 0;
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 4ba30e0bdf..26f4ddb2d5 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -71,6 +71,8 @@ public:
 
 	Common::KeyState getKey() { return _pendingKeys.pop(); }
 
+	void clearEvents();
+
 	void delay(int amount);
 
 	void waitForNextFrame();
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 801b1747ee..97daaef6e3 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -30,6 +30,8 @@
 
 namespace Sherlock {
 
+#define PALETTE_SIZE 768
+
 class SherlockEngine;
 
 class Surface : public Graphics::Surface {
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 19ad039262..7009f49d3f 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/sherlock
 MODULE_OBJS = \
 	scalpel/scalpel.o \
 	tattoo/tattoo.o \
+	animation.o \
 	decompress.o \
 	debugger.o \
 	detection.o \
@@ -12,6 +13,7 @@ MODULE_OBJS = \
 	resources.o \
 	room.o \
 	sherlock.o \
+	sound.o \
 	sprite.o \
 	talk.o
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 1eaf7c91ee..72c5f1dcf3 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "sherlock/scalpel/scalpel.h"
+#include "sherlock/sherlock.h"
 
 namespace Sherlock {
 
@@ -44,9 +45,42 @@ void ScalpelEngine::initialize() {
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
+	if (!_events->isKeyPressed())
+		showCityCutscene();
+	if (!_events->isKeyPressed())
+		showAlleyCutscene();
+	if (!_events->isKeyPressed())
+		showStreetCutscene();
+	if (!_events->isKeyPressed())
+		showOfficeCutscene();
+
+	_events->clearEvents();
+	_sound->stopMusic();
+}
+
+void ScalpelEngine::showCityCutscene() {
+	byte palette[PALETTE_SIZE];
+	
+	_sound->playMusic("prolog1.mus");
+	_animation->_titleOverride = "title.lib";
+	_animation->_soundOverride = "title.snd";
+	_animation->playPrologue("26open1", 1, 255, true, 2);
+
 	// TODO
 }
 
+void ScalpelEngine::showAlleyCutscene() {
+
+}
+
+void ScalpelEngine::showStreetCutscene() {
+
+}
+
+void ScalpelEngine::showOfficeCutscene() {
+
+}
+
 
 } // End of namespace Scalpel
 
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 6016984e45..5da33e1d52 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -30,6 +30,11 @@ namespace Sherlock {
 namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
+private:
+	void showCityCutscene();
+	void showAlleyCutscene();
+	void showStreetCutscene();
+	void showOfficeCutscene();
 protected:
 	virtual void initialize();
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index cfbbacccf7..a750741ec9 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -30,21 +30,27 @@ namespace Sherlock {
 
 SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		Engine(syst), _gameDescription(gameDesc) {
+	_animation = nullptr;
 	_debugger = nullptr;
+	_events = nullptr;
 	_journal = nullptr;
 	_res = nullptr;
 	_rooms = nullptr;
 	_screen = nullptr;
+	_sound = nullptr;
 	_talk = nullptr;
 }
 
 
 SherlockEngine::~SherlockEngine() {
+	delete _animation;
 	delete _debugger;
+	delete _events;
 	delete _journal;
 	delete _res;
 	delete _rooms;
 	delete _screen;
+	delete _sound;
 	delete _talk;
 }
 
@@ -66,7 +72,9 @@ void SherlockEngine::initialize() {
 	_midi->setNativeMT32(native_mt32);
 	*/
 
+	_animation = new Animation(this);
 	_debugger = new Debugger(this);
+	_events = new EventsManager(this);
 	_journal = new Journal();
 	_res = new Resources();
 	_rooms = new Rooms();
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 781851db71..88fbff74f9 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -30,11 +30,14 @@
 #include "common/savefile.h"
 #include "common/hash-str.h"
 #include "engines/engine.h"
+#include "sherlock/animation.h"
 #include "sherlock/debugger.h"
+#include "sherlock/events.h"
 #include "sherlock/graphics.h"
 #include "sherlock/journal.h"
 #include "sherlock/resources.h"
 #include "sherlock/room.h"
+#include "sherlock/sound.h"
 #include "sherlock/talk.h"
 
 namespace Sherlock {
@@ -67,11 +70,14 @@ protected:
 	virtual void showOpening() = 0;
 public:
 	const SherlockGameDescription *_gameDescription;
+	Animation *_animation;
 	Debugger *_debugger;
+	EventsManager *_events;
 	Journal *_journal;
 	Resources *_res;
 	Rooms *_rooms;
 	Screen *_screen;
+	Sound *_sound;
 	Talk *_talk;
 	Common::Array<bool> _flags;
 public:
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
new file mode 100644
index 0000000000..f16dd5a80d
--- /dev/null
+++ b/engines/sherlock/sound.cpp
@@ -0,0 +1,55 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sound.h"
+
+namespace Sherlock {
+
+Sound::Sound(SherlockEngine *vm): _vm(vm) {
+}
+
+void Sound::playSound(const Common::String &name) {
+	// TODO
+}
+
+void Sound::cacheSound(const Common::String &name, int index) {
+	// TODO
+}
+
+void Sound::playCachedSound(int index) {
+	// TODO
+}
+
+void Sound::clearCache() {
+	// TODO
+}
+
+void Sound::playMusic(const Common::String &name) {
+	// TODO
+}
+
+void Sound::stopMusic() {
+	// TODO
+}
+
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index f3b34345ef..b1759a9c8e 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -23,15 +23,26 @@
 #ifndef SHERLOCK_SOUND_H
 #define SHERLOCK_SOUND_H
 
+#include "common/scummsys.h"
+#include "common/str.h"
+
 namespace Sherlock {
 
+class SherlockEngine;
+
 class Sound {
-public
-	void playSound(const char *name);
-	void cacheSound(const char *name, int index);
+private:
+	SherlockEngine *_vm;
+public:
+	Sound(SherlockEngine *vm);
+
+	void playSound(const Common::String &name);
+	void cacheSound(const Common::String &name, int index);
 	void playCachedSound(int index);
 	void clearCache();
 	
+	void playMusic(const Common::String &name);
+	void stopMusic();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/vdaplayer.h b/engines/sherlock/vdaplayer.h
deleted file mode 100644
index 9b755606d5..0000000000
--- a/engines/sherlock/vdaplayer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_VDAPLAYER_H
-#define SHERLOCK_VDAPLAYER_H
-
-namespace Sherlock {
-
-class VdaPlayer {
-
-};
-
-} // End of namespace Sherlock
-
-#endif
-- 
cgit v1.2.3


From 6cfb7169b94e0c3c665d7799584eb8e5a7f337b3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Mar 2015 23:16:38 -0400
Subject: SHERLOCK: Beginnings of sprite loading for animations

---
 engines/sherlock/animation.cpp       |  17 +++---
 engines/sherlock/animation.h         |   3 -
 engines/sherlock/resources.cpp       |   2 +-
 engines/sherlock/resources.h         |   2 +-
 engines/sherlock/scalpel/scalpel.cpp |   4 +-
 engines/sherlock/sherlock.cpp        |   1 +
 engines/sherlock/sherlock.h          |   3 +
 engines/sherlock/sprite.cpp          | 114 ++++++++++++-----------------------
 engines/sherlock/sprite.h            |  27 ++++-----
 9 files changed, 67 insertions(+), 106 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 52859ce5e4..3da0201a61 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/animation.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/sprite.h"
 #include "common/algorithm.h"
 
 namespace Sherlock {
@@ -62,7 +63,6 @@ static const int TITLE_FRAMES[7][9] = {
 static const int NO_FRAMES = FRAMES_END;
 
 Animation::Animation(SherlockEngine *vm): _vm(vm) {
-	_useEpilogue2 = false;
 }
 
 void Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
@@ -80,16 +80,19 @@ void Animation::playPrologue(const Common::String &filename, int minDelay, int f
 
 	// Load the animation
 	Common::SeekableReadStream *stream;
-	if (!_titleOverride.empty())
-		stream = _vm->_res->load(vdxName, _titleOverride);
-	else if (_useEpilogue2)
+	if (!_vm->_titleOverride.empty())
+		stream = _vm->_res->load(vdxName, _vm->_titleOverride);
+	else if (_vm->_useEpilogue2)
 		stream = _vm->_res->load(vdxName, "epilog2.lib");
 	else
 		stream = _vm->_res->load(vdxName, "epilogoue.lib");
-	int resoucreIndex = _vm->_res->resouceIndex();
+	int resourceIndex = _vm->_res->resourceIndex();
 
 	// Load initial image
-	//Common::String vdaName = baseName + ".vda";
+	Common::String vdaName = baseName + ".vda";
+	Common::SeekableReadStream *vdaStream = _vm->_res->load(vdaName);
+	Sprite sprite(*vdaStream);
+	
 	// TODO
 
 
@@ -102,7 +105,7 @@ void Animation::playPrologue(const Common::String &filename, int minDelay, int f
 const int *Animation::checkForSoundFrames(const Common::String &filename) {
 	const int *frames = &NO_FRAMES;
 
-	if (!_soundOverride.empty()) {
+	if (!_vm->_soundOverride.empty()) {
 		for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
 			if (!scumm_stricmp(filename.c_str(), PROLOGUE_NAMES[idx])) {
 				frames = &PROLOGUE_FRAMES[idx][0];
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index bf4429656e..14384cfa28 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -36,9 +36,6 @@ private:
 
 	const int *checkForSoundFrames(const Common::String &filename);
 public:
-	Common::String _soundOverride;
-	Common::String _titleOverride;
-	bool _useEpilogue2;
 public:
 	Animation(SherlockEngine *vm);
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index e59e65abff..47e2046084 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -212,7 +212,7 @@ void Resources::loadLibraryIndex(const Common::String &libFilename,
  * This will be used primarily when loading talk files, so the engine can
  * update the given conversation number in the journal
  */
-int Resources::resouceIndex() const {
+int Resources::resourceIndex() const {
 	return _resourceIndex;
 }
 
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index bfd2eb300c..edb9bd8ba0 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -77,7 +77,7 @@ public:
 
 	Common::SeekableReadStream *load(const Common::String &filename, const Common::String &libraryFile);
 
-	int resouceIndex() const;
+	int resourceIndex() const;
 };
 
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 72c5f1dcf3..0b651bbb69 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -62,8 +62,8 @@ void ScalpelEngine::showCityCutscene() {
 	byte palette[PALETTE_SIZE];
 	
 	_sound->playMusic("prolog1.mus");
-	_animation->_titleOverride = "title.lib";
-	_animation->_soundOverride = "title.snd";
+	_titleOverride = "title.lib";
+	_soundOverride = "title.snd";
 	_animation->playPrologue("26open1", 1, 255, true, 2);
 
 	// TODO
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a750741ec9..cb0472feff 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -39,6 +39,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_screen = nullptr;
 	_sound = nullptr;
 	_talk = nullptr;
+	_useEpilogue2 = false;
 }
 
 
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 88fbff74f9..b04a14e8ac 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -80,6 +80,9 @@ public:
 	Sound *_sound;
 	Talk *_talk;
 	Common::Array<bool> _flags;
+	Common::String _soundOverride;
+	Common::String _titleOverride;
+	bool _useEpilogue2;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index 7aa2fdc71b..f686f0b27e 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -25,101 +25,61 @@
 
 namespace Sherlock {
 
-/*
-struct SpriteFrame {
-	byte *data;
-	int width, height;
-	uint16 flags;
-	int xofs, yofs;
-	byte rleMarker;
-};
-*/
-
 Sprite::Sprite(Common::SeekableReadStream &stream) {
 	load(stream);
 }
 
 Sprite::~Sprite() {
+	for (uint idx = 0; idx < size(); ++idx)
+		(*this)[idx]._frame.free();
 }
 
-int Sprite::getFrameCount() {
-	return _frames.size();
-}
-
-SpriteFrame *Sprite::getFrame(int index) {
-	return _frames[index];
-}
-
+/**
+ * Load the data of the sprite
+ */
 void Sprite::load(Common::SeekableReadStream &stream) {
-
     while (!stream.eos()) {
-    
-        debug("frameNum = %d\n", _frames.size());
-    
-        SpriteFrame *spriteFrame = new SpriteFrame();
-
-		uint32 startOfs = stream.pos();
-
-		debug("startOfs = %08X\n", startOfs);
+		SpriteFrame frame;
 
-        spriteFrame->frame = NULL;
-        spriteFrame->width = stream.readUint16LE() + 1;
-        spriteFrame->height = stream.readUint16LE() + 1;
-        spriteFrame->flags = stream.readUint16LE();
+		frame._width = stream.readUint16LE() + 1;
+		frame._height = stream.readUint16LE() + 1;
+		frame._flags = stream.readUint16LE();
         stream.readUint16LE();
         
-        debug("width = %d; height = %d; flags = %04X\n", spriteFrame->width, spriteFrame->height, spriteFrame->flags);
-
-        if (spriteFrame->flags & 0xFF) {
-            spriteFrame->size = (spriteFrame->width * spriteFrame->height) / 2;
-        } else if (spriteFrame->flags & 0x0100) {
+		if (frame._flags & 0xFF) {
+			frame._size = (frame._width * frame._height) / 2;
+		} else if (frame._flags & 0x0100) {
             // this size includes the header size, which we subtract
-            spriteFrame->size = stream.readUint16LE() - 11;
-            spriteFrame->rleMarker = stream.readByte();
+			frame._size = stream.readUint16LE() - 11;
+			frame._rleMarker = stream.readByte();
         } else {
-            spriteFrame->size = spriteFrame->width * spriteFrame->height;
+			frame._size = frame._width * frame._height;
         }
 
-        spriteFrame->data = new byte[spriteFrame->size];
-        stream.read(spriteFrame->data, spriteFrame->size);
-        
-        decompressFrame(spriteFrame);
+		// Load data for frame and decompress it
+		byte *data = new byte[frame._size];
+		stream.read(data, frame._size);
+        decompressFrame(frame, data);		
+		delete data;
 
-		/*
-		debug("size = %d (%08X)\n", spriteFrame->size, spriteFrame->size);
-		if (spriteFrame->frame) {
-		    char fn[128];
-		    sndebug(fn, 128, "%04d.spr", _frames.size());
-		    FILE *x = fopen(fn, "wb");
-		    fwrite(spriteFrame->frame->pixels, spriteFrame->frame->w * spriteFrame->frame->h, 1, x);
-		    fclose(x);
-		}
-		*/
-
-		_frames.push_back(spriteFrame);
-		
+		push_back(frame);
     }
-    
-   // debug("Done: %08X\n", stream.pos()); fflush(stdout);
-
 }
 
-void Sprite::decompressFrame(SpriteFrame *frame) {
-
-    frame->frame = new Graphics::Surface();
-	frame->frame->create(frame->width, frame->height, Graphics::PixelFormat::createFormatCLUT8());
-
-	if (frame->flags & 0xFF) {
-	    debug("Sprite::decompressFrame() 4-bits/pixel\n");
-	    debug("TODO\n");
-	} else if (frame->flags & 0x0100) {
-	    debug("Sprite::decompressFrame() RLE-compressed; rleMarker = %02X\n", frame->rleMarker);
-	    const byte *src = frame->data;
-	    byte *dst = (byte *)frame->frame->getPixels();
-		for (uint16 h = 0; h < frame->height; h++) {
-			int16 w = frame->width;
+/**
+ * Decompress a single frame for the sprite
+ */
+void Sprite::decompressFrame(SpriteFrame &frame, const byte *src) {
+	frame._frame.create(frame._width, frame._height, Graphics::PixelFormat::createFormatCLUT8());
+
+	if (frame._flags & 0xFF) {
+	    debug("TODO: Sprite::decompressFrame() 4-bits/pixel\n");
+	} else if (frame._flags & 0x0100) {
+	    byte *dst = (byte *)frame._frame.getPixels();
+		for (uint16 h = 0; h < frame._height; ++h) {
+			int16 w = frame._width;
 			while (w > 0) {
-			    if (*src == frame->rleMarker) {
+			    if (*src == frame._rleMarker) {
 			        byte rleColor = src[1];
 			        byte rleCount = src[2];
 			        src += 3;
@@ -133,10 +93,10 @@ void Sprite::decompressFrame(SpriteFrame *frame) {
 			}
 		}
 	} else {
-	    debug("Sprite::decompressFrame() Uncompressed\n");
-	    memcpy(frame->data, frame->frame->getPixels(), frame->width * frame->height);
+		// Uncompressed frame
+		Common::copy(src, src + frame._width * frame._height,
+			(byte *)frame._frame.getPixels());
 	}
-
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
index f56ab588bb..1f81cf8071 100644
--- a/engines/sherlock/sprite.h
+++ b/engines/sherlock/sprite.h
@@ -23,32 +23,29 @@
 #ifndef SHERLOCK_SPRITE_H
 #define SHERLOCK_SPRITE_H
 
-#include "common/stream.h"
 #include "common/array.h"
+#include "common/rect.h"
+#include "common/stream.h"
 #include "graphics/surface.h"
 
 namespace Sherlock {
 
 struct SpriteFrame {
-	byte *data;
-	uint32 size;
-	uint16 width, height;
-	uint16 flags;
-	int xofs, yofs;
-	byte rleMarker;
-	Graphics::Surface *frame;
+	uint32 _size;
+	uint16 _width, _height;
+	int _flags;
+	Common::Point _offset;
+	byte _rleMarker;
+	Graphics::Surface _frame;
 };
 
-class Sprite {
+class Sprite: public Common::Array<SpriteFrame> {
+private:
+	void load(Common::SeekableReadStream &stream);
+	void decompressFrame(SpriteFrame  &frame, const byte *src);
 public:
     Sprite(Common::SeekableReadStream &stream);
     ~Sprite();
-	int getFrameCount();
-	SpriteFrame *getFrame(int index);
-protected:
-	Common::Array<SpriteFrame*> _frames;
-	void load(Common::SeekableReadStream &stream);
-	void decompressFrame(SpriteFrame *frame);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 02657f5a91bba15c7d494f71d0c975ece7178861 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 16 Mar 2015 00:02:45 -0400
Subject: SHERLOCK: Fix loading of sprite for startup animation

---
 engines/sherlock/animation.cpp |  2 +-
 engines/sherlock/sprite.cpp    | 47 +++++++++++++++++++++++-------------------
 engines/sherlock/sprite.h      |  6 ++++--
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 3da0201a61..4111f6f88f 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -91,7 +91,7 @@ void Animation::playPrologue(const Common::String &filename, int minDelay, int f
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
 	Common::SeekableReadStream *vdaStream = _vm->_res->load(vdaName);
-	Sprite sprite(*vdaStream);
+	Sprite sprite(*vdaStream, true);
 	
 	// TODO
 
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index f686f0b27e..ee7c8e5019 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -25,8 +25,8 @@
 
 namespace Sherlock {
 
-Sprite::Sprite(Common::SeekableReadStream &stream) {
-	load(stream);
+Sprite::Sprite(Common::SeekableReadStream &stream, bool skipPal) {
+	load(stream, skipPal);
 }
 
 Sprite::~Sprite() {
@@ -37,22 +37,26 @@ Sprite::~Sprite() {
 /**
  * Load the data of the sprite
  */
-void Sprite::load(Common::SeekableReadStream &stream) {
-    while (!stream.eos()) {
+void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
+    while (stream.pos() < stream.size()) {
 		SpriteFrame frame;
-
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
 		frame._flags = stream.readUint16LE();
         stream.readUint16LE();
         
+		if (skipPal)
+			frame._flags = 0;
+
 		if (frame._flags & 0xFF) {
+			// Nibble packed frame data
 			frame._size = (frame._width * frame._height) / 2;
-		} else if (frame._flags & 0x0100) {
+		} else if (frame._flags & RLE_ENCODED) {
             // this size includes the header size, which we subtract
 			frame._size = stream.readUint16LE() - 11;
 			frame._rleMarker = stream.readByte();
         } else {
+			// Uncompressed data
 			frame._size = frame._width * frame._height;
         }
 
@@ -74,24 +78,25 @@ void Sprite::decompressFrame(SpriteFrame &frame, const byte *src) {
 
 	if (frame._flags & 0xFF) {
 	    debug("TODO: Sprite::decompressFrame() 4-bits/pixel\n");
-	} else if (frame._flags & 0x0100) {
+	} else if (frame._flags & RLE_ENCODED) {
+		// RLE encoded
 	    byte *dst = (byte *)frame._frame.getPixels();
-		for (uint16 h = 0; h < frame._height; ++h) {
-			int16 w = frame._width;
-			while (w > 0) {
-			    if (*src == frame._rleMarker) {
-			        byte rleColor = src[1];
-			        byte rleCount = src[2];
-			        src += 3;
-			        w -= rleCount;
-			        while (rleCount--)
-			            *dst++ = rleColor;
-				} else {
-				    *dst++ = *src++;
-				    w--;
-				}
+
+		int size = frame._width * frame._height;
+		while (size > 0) {
+			if (*src == frame._rleMarker) {
+			    byte rleColor = src[1];
+			    byte rleCount = src[2];
+			    src += 3;
+			    size -= rleCount;
+			    while (rleCount--)
+			        *dst++ = rleColor;
+			} else {
+				*dst++ = *src++;
+				--size;
 			}
 		}
+		assert(size == 0);
 	} else {
 		// Uncompressed frame
 		Common::copy(src, src + frame._width * frame._height,
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
index 1f81cf8071..17566c81bd 100644
--- a/engines/sherlock/sprite.h
+++ b/engines/sherlock/sprite.h
@@ -30,6 +30,8 @@
 
 namespace Sherlock {
 
+enum { RLE_ENCODED = 0x0100 };
+
 struct SpriteFrame {
 	uint32 _size;
 	uint16 _width, _height;
@@ -41,10 +43,10 @@ struct SpriteFrame {
 
 class Sprite: public Common::Array<SpriteFrame> {
 private:
-	void load(Common::SeekableReadStream &stream);
+	void load(Common::SeekableReadStream &stream, bool skipPal);
 	void decompressFrame(SpriteFrame  &frame, const byte *src);
 public:
-    Sprite(Common::SeekableReadStream &stream);
+    Sprite(Common::SeekableReadStream &stream, bool skipPal = false);
     ~Sprite();
 };
 
-- 
cgit v1.2.3


From b762bebf27ce7c231dd17fc05bc32f72911e6ed5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 16 Mar 2015 08:07:24 -0400
Subject: SHERLOCK: Implement sprite palette loading and fade out

---
 engines/sherlock/animation.cpp | 12 ++++++++++++
 engines/sherlock/events.cpp    | 11 ++++++++++-
 engines/sherlock/events.h      |  4 +++-
 engines/sherlock/graphics.cpp  | 32 ++++++++++++++++++++++++++++++++
 engines/sherlock/graphics.h    |  7 +++++++
 engines/sherlock/sprite.cpp    | 17 +++++++++++++++++
 engines/sherlock/sprite.h      |  3 +++
 7 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 4111f6f88f..2e9eb294d3 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -67,6 +67,9 @@ Animation::Animation(SherlockEngine *vm): _vm(vm) {
 
 void Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
 		bool setPalette, int speed) {
+	EventsManager &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+
 	// Check for any any sound frames for the given animation
 	const int *soundFrames = checkForSoundFrames(filename);
 
@@ -93,6 +96,15 @@ void Animation::playPrologue(const Common::String &filename, int minDelay, int f
 	Common::SeekableReadStream *vdaStream = _vm->_res->load(vdaName);
 	Sprite sprite(*vdaStream, true);
 	
+	events.delay(minDelay);
+	if (fade != 0 && fade != 255)
+		screen.fadeToBlack();
+
+	if (setPalette) {
+		if (fade != 255)
+			screen.setPalette(sprite._palette);
+	}
+
 	// TODO
 
 
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index fdcf61e46f..4a51c4a5fb 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -115,6 +115,15 @@ void EventsManager::pollEvents() {
 	}
 }
 
+/**
+ * Poll for events and introduce a small delay, to allow the system to
+ * yield to other running programs
+ */
+void EventsManager::pollEventsAndWait() {
+	pollEvents();
+	g_system->delayMillis(10);
+}
+
 /**
  * Check whether it's time to display the next screen frame
  */
@@ -149,7 +158,7 @@ void EventsManager::clearEvents() {
 }
 
 /**
- * Delay for a given number of frames/cycles
+ * Delay for a given number of cycles, where each cycle is 1/60th of a second
  */
 void EventsManager::delay(int cycles) {
 	uint32 totalMilli = cycles * 1000 / GAME_FRAME_RATE;
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 26f4ddb2d5..f4e6964ef5 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -31,7 +31,7 @@ namespace Sherlock {
 
 enum CursorType { CURSOR_NONE = 0 };
 
-#define GAME_FRAME_RATE 50
+#define GAME_FRAME_RATE 60
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
 class SherlockEngine;
@@ -63,6 +63,8 @@ public:
 
 	void pollEvents();
 
+	void pollEventsAndWait();
+
 	Common::Point mousePos() const { return _mousePos; }
 
 	uint32 getFrameCounter() const { return _frameCounter; }
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 5c6c94606e..583389e060 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -23,6 +23,7 @@
 #include "sherlock/graphics.h"
 #include "sherlock/sherlock.h"
 #include "common/system.h"
+#include "graphics/palette.h"
 
 namespace Sherlock {
 
@@ -65,4 +66,35 @@ void Screen::update() {
 	g_system->updateScreen();
 }
 
+void Screen::getPalette(byte palette[PALETTE_SIZE]) {
+	g_system->getPaletteManager()->grabPalette(palette, 0, PALETTE_COUNT);
+}
+
+void Screen::setPalette(const byte palette[PALETTE_SIZE]) {
+	g_system->getPaletteManager()->setPalette(palette, 0, PALETTE_COUNT);
+}
+
+void Screen::fadeToBlack() {
+	const int FADE_AMOUNT = 2;
+	bool repeatFlag;
+	byte *srcP;
+	int count;
+	byte tempPalette[PALETTE_SIZE];
+
+	getPalette(tempPalette);
+	do {
+		repeatFlag = false;
+		for (srcP = &tempPalette[0], count = 0; count < PALETTE_SIZE; ++count, ++srcP) {
+			int v = *srcP;
+			if (v) {
+				repeatFlag = true;
+				*srcP = MAX(*srcP - FADE_AMOUNT, 0);
+			}
+		}
+
+		setPalette(tempPalette);
+		_vm->_events->pollEventsAndWait();
+	} while (repeatFlag && !_vm->shouldQuit());
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 97daaef6e3..0385deebde 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -31,6 +31,7 @@
 namespace Sherlock {
 
 #define PALETTE_SIZE 768
+#define PALETTE_COUNT 256
 
 class SherlockEngine;
 
@@ -53,6 +54,12 @@ public:
 	void setFont(int fontNumber);
 
 	void update();
+
+	void getPalette(byte palette[PALETTE_SIZE]);
+
+	void setPalette(const byte palette[PALETTE_SIZE]);
+
+	void fadeToBlack();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index ee7c8e5019..c8d9ab55e3 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -21,11 +21,13 @@
  */
 
 #include "sherlock/sprite.h"
+#include "sherlock/graphics.h"
 #include "common/debug.h"
 
 namespace Sherlock {
 
 Sprite::Sprite(Common::SeekableReadStream &stream, bool skipPal) {
+	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
 	load(stream, skipPal);
 }
 
@@ -38,6 +40,8 @@ Sprite::~Sprite() {
  * Load the data of the sprite
  */
 void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
+	loadPalette(stream);
+
     while (stream.pos() < stream.size()) {
 		SpriteFrame frame;
 		frame._width = stream.readUint16LE() + 1;
@@ -70,6 +74,19 @@ void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
     }
 }
 
+/**
+ * Gets the palette at the start of the sprite file
+ */
+void Sprite::loadPalette(Common::SeekableReadStream &stream) {
+	int v1 = stream.readUint16LE() + 1;
+	int v2 = stream.readUint16LE() + 1;
+	int size = v1 * v2;
+	assert((size - 12) == PALETTE_SIZE);
+
+	stream.seek(4 + 12, SEEK_CUR);
+	stream.read(&_palette[0], PALETTE_SIZE);
+}
+
 /**
  * Decompress a single frame for the sprite
  */
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
index 17566c81bd..5a510b2548 100644
--- a/engines/sherlock/sprite.h
+++ b/engines/sherlock/sprite.h
@@ -44,7 +44,10 @@ struct SpriteFrame {
 class Sprite: public Common::Array<SpriteFrame> {
 private:
 	void load(Common::SeekableReadStream &stream, bool skipPal);
+	void loadPalette(Common::SeekableReadStream &stream);
 	void decompressFrame(SpriteFrame  &frame, const byte *src);
+public:
+	byte _palette[256 * 3];
 public:
     Sprite(Common::SeekableReadStream &stream, bool skipPal = false);
     ~Sprite();
-- 
cgit v1.2.3


From 0ee3f1895f6b6dcf4bbb70ba309fb66d0ca39613 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 16 Mar 2015 22:42:19 -0400
Subject: SHERLOCK: Beginnings of animation sequence loop

---
 engines/sherlock/animation.cpp       | 69 +++++++++++++++++++++++++++++++++---
 engines/sherlock/animation.h         |  2 +-
 engines/sherlock/graphics.cpp        | 26 ++++++++++++++
 engines/sherlock/graphics.h          |  2 ++
 engines/sherlock/scalpel/scalpel.cpp | 34 +++++++++---------
 engines/sherlock/scalpel/scalpel.h   |  8 ++---
 engines/sherlock/sherlock.cpp        |  1 +
 engines/sherlock/sound.cpp           | 10 +++++-
 engines/sherlock/sound.h             | 12 ++++++-
 engines/sherlock/sprite.cpp          | 13 +++----
 engines/sherlock/sprite.h            |  5 ++-
 11 files changed, 145 insertions(+), 37 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 2e9eb294d3..e4ec06b741 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -65,10 +65,13 @@ static const int NO_FRAMES = FRAMES_END;
 Animation::Animation(SherlockEngine *vm): _vm(vm) {
 }
 
-void Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
+bool Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
 		bool setPalette, int speed) {
 	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	int soundNumber = 0;
+	sound._playingEpilogue = true;
 
 	// Check for any any sound frames for the given animation
 	const int *soundFrames = checkForSoundFrames(filename);
@@ -89,7 +92,6 @@ void Animation::playPrologue(const Common::String &filename, int minDelay, int f
 		stream = _vm->_res->load(vdxName, "epilog2.lib");
 	else
 		stream = _vm->_res->load(vdxName, "epilogoue.lib");
-	int resourceIndex = _vm->_res->resourceIndex();
 
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
@@ -99,16 +101,75 @@ void Animation::playPrologue(const Common::String &filename, int minDelay, int f
 	events.delay(minDelay);
 	if (fade != 0 && fade != 255)
 		screen.fadeToBlack();
-
+	fade = 0; //***DEBUG****
 	if (setPalette) {
 		if (fade != 255)
 			screen.setPalette(sprite._palette);
 	}
 
-	// TODO
+	int frameNumber = 0;
+	int spriteFrame;
+	Common::Point pt;
+	bool skipped = false;
+	while (!_vm->shouldQuit()) {
+		spriteFrame = stream->readSint16LE();
+		if (spriteFrame != -1) {
+			if (spriteFrame < 0) {
+				spriteFrame = ABS(spriteFrame);
+				pt.x = stream->readUint16LE();
+				pt.y = stream->readUint16LE();
+			} else {
+				pt = sprite[spriteFrame]._position;
+			}
+
+			screen.copyFrom(sprite[spriteFrame]._frame);
+			events.pollEventsAndWait();
+		} else {
+			if (fade == 255) {
+				// Gradual fade in
+				if (screen.equalizePalette(sprite._palette) == 0)
+					fade = 0;
+			}
+
+			// Check if we've reached a frame with sound
+			if (frameNumber++ == *soundFrames) {
+				++soundNumber;
+				++soundFrames;
+				Common::String fname = _vm->_soundOverride.empty() ?
+					Common::String::format("%s%01d", baseName.c_str(), soundNumber) :
+					Common::String::format("%s%02d", baseName.c_str(), soundNumber);
+
+				if (sound._voicesEnabled)
+					sound.playSound(fname);
+			}
+
+			events.delay(speed);
 
+			if (stream->readSint16LE() == -2)
+				// End of animation
+				break;
+			stream->seek(-2, SEEK_CUR);
+		}
 
+		if (events.isKeyPressed()) {
+			Common::KeyState keyState = events.getKey();
+			if (keyState.keycode == Common::KEYCODE_ESCAPE ||
+				keyState.keycode == Common::KEYCODE_SPACE) {
+				skipped = true;
+				break;
+			}
+		} else if (events._mouseClicked) {
+			skipped = true;
+			break;
+		}
+	}
+	
+	events.clearEvents();
+	sound.stopSound();
 	delete stream;
+	sound._playingEpilogue = false;
+
+	return !skipped && !_vm->shouldQuit();
 }
 
 /**
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index 14384cfa28..da4c5baad7 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -39,7 +39,7 @@ public:
 public:
 	Animation(SherlockEngine *vm);
 
-	void playPrologue(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
+	bool playPrologue(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 583389e060..f4fe6b6b46 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -63,6 +63,7 @@ void Screen::setFont(int fontNumber) {
 }
 
 void Screen::update() {
+	g_system->copyRectToScreen(getPixels(), this->w, 0, 0, this->w, this->h);
 	g_system->updateScreen();
 }
 
@@ -74,6 +75,31 @@ void Screen::setPalette(const byte palette[PALETTE_SIZE]) {
 	g_system->getPaletteManager()->setPalette(palette, 0, PALETTE_COUNT);
 }
 
+int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
+	int total = 0;
+	byte tempPalette[PALETTE_SIZE];
+	getPalette(tempPalette);
+
+	// For any palette component that doesn't already match the given destination
+	// palette, change by 1 towards the reference palette component
+	for (int idx = 0; idx < PALETTE_SIZE; ++idx) {
+		if (tempPalette[idx] > palette[idx])
+		{
+			--tempPalette[idx];
+			++total;
+		} else if (tempPalette[idx] < palette[idx]) {
+			++tempPalette[idx];
+			++total;
+		}
+	}
+
+	if (total > 0)
+		// Palette changed, so reload it
+		setPalette(tempPalette);
+
+	return total;
+}
+
 void Screen::fadeToBlack() {
 	const int FADE_AMOUNT = 2;
 	bool repeatFlag;
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 0385deebde..c6611db1ce 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -59,6 +59,8 @@ public:
 
 	void setPalette(const byte palette[PALETTE_SIZE]);
 
+	int equalizePalette(const byte palette[PALETTE_SIZE]);
+
 	void fadeToBlack();
 };
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0b651bbb69..90a93de1b1 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -45,21 +45,21 @@ void ScalpelEngine::initialize() {
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
-	if (!_events->isKeyPressed())
-		showCityCutscene();
-	if (!_events->isKeyPressed())
-		showAlleyCutscene();
-	if (!_events->isKeyPressed())
-		showStreetCutscene();
-	if (!_events->isKeyPressed())
-		showOfficeCutscene();
+	if (!showCityCutscene())
+		return;
+	if (!showAlleyCutscene())
+		return;
+	if (!showStreetCutscene())
+		return;
+	if (!showOfficeCutscene())
+		return;
 
 	_events->clearEvents();
 	_sound->stopMusic();
 }
 
-void ScalpelEngine::showCityCutscene() {
-	byte palette[PALETTE_SIZE];
+bool ScalpelEngine::showCityCutscene() {
+//	byte palette[PALETTE_SIZE];
 	
 	_sound->playMusic("prolog1.mus");
 	_titleOverride = "title.lib";
@@ -67,21 +67,21 @@ void ScalpelEngine::showCityCutscene() {
 	_animation->playPrologue("26open1", 1, 255, true, 2);
 
 	// TODO
+	return true;
 }
 
-void ScalpelEngine::showAlleyCutscene() {
-
+bool ScalpelEngine::showAlleyCutscene() {
+	return true;
 }
 
-void ScalpelEngine::showStreetCutscene() {
-
+bool ScalpelEngine::showStreetCutscene() {
+	return true;
 }
 
-void ScalpelEngine::showOfficeCutscene() {
-
+bool ScalpelEngine::showOfficeCutscene() {
+	return true;
 }
 
-
 } // End of namespace Scalpel
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 5da33e1d52..584bd78a20 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -31,10 +31,10 @@ namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
 private:
-	void showCityCutscene();
-	void showAlleyCutscene();
-	void showStreetCutscene();
-	void showOfficeCutscene();
+	bool showCityCutscene();
+	bool showAlleyCutscene();
+	bool showStreetCutscene();
+	bool showOfficeCutscene();
 protected:
 	virtual void initialize();
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index cb0472feff..1fba746f8d 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -80,6 +80,7 @@ void SherlockEngine::initialize() {
 	_res = new Resources();
 	_rooms = new Rooms();
 	_screen = new Screen(this);
+	_sound = new Sound(this);
 	_talk = new Talk();
 }
 
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index f16dd5a80d..0957315a35 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -25,9 +25,13 @@
 namespace Sherlock {
 
 Sound::Sound(SherlockEngine *vm): _vm(vm) {
+	_sfxEnabled = true;
+	_musicEnabled = true;
+	_voicesEnabled = true;
+	_playingEpilogue = false;
 }
 
-void Sound::playSound(const Common::String &name) {
+void Sound::playSound(const Common::String &name, WaitType waitType) {
 	// TODO
 }
 
@@ -43,6 +47,10 @@ void Sound::clearCache() {
 	// TODO
 }
 
+void Sound::stopSound() {
+	// TODO
+}
+
 void Sound::playMusic(const Common::String &name) {
 	// TODO
 }
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index b1759a9c8e..7775016c94 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -30,16 +30,26 @@ namespace Sherlock {
 
 class SherlockEngine;
 
+enum WaitType {
+	WAIT_RETURN_IMMEDIATELY = 0, WAIT_FINISH = 1, WAIT_KBD_OR_FINISH = 2
+};
+
 class Sound {
 private:
 	SherlockEngine *_vm;
+public:
+	bool _sfxEnabled;
+	bool _musicEnabled;
+	bool _voicesEnabled;
+	bool _playingEpilogue;
 public:
 	Sound(SherlockEngine *vm);
 
-	void playSound(const Common::String &name);
+	void playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
 	void cacheSound(const Common::String &name, int index);
 	void playCachedSound(int index);
 	void clearCache();
+	void stopSound();
 	
 	void playMusic(const Common::String &name);
 	void stopMusic();
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index c8d9ab55e3..9883d078ae 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -46,16 +46,16 @@ void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
 		SpriteFrame frame;
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
-		frame._flags = stream.readUint16LE();
-        stream.readUint16LE();
+		frame._flags = stream.readByte();
+		frame._position.x = stream.readUint16LE();
+		frame._position.y = stream.readByte();
         
-		if (skipPal)
-			frame._flags = 0;
+		frame._rleEncoded = !skipPal && (frame._position.x == 1);
 
 		if (frame._flags & 0xFF) {
 			// Nibble packed frame data
 			frame._size = (frame._width * frame._height) / 2;
-		} else if (frame._flags & RLE_ENCODED) {
+		} else if (frame._rleEncoded) {
             // this size includes the header size, which we subtract
 			frame._size = stream.readUint16LE() - 11;
 			frame._rleMarker = stream.readByte();
@@ -78,6 +78,7 @@ void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
  * Gets the palette at the start of the sprite file
  */
 void Sprite::loadPalette(Common::SeekableReadStream &stream) {
+	// Read in the palette
 	int v1 = stream.readUint16LE() + 1;
 	int v2 = stream.readUint16LE() + 1;
 	int size = v1 * v2;
@@ -95,7 +96,7 @@ void Sprite::decompressFrame(SpriteFrame &frame, const byte *src) {
 
 	if (frame._flags & 0xFF) {
 	    debug("TODO: Sprite::decompressFrame() 4-bits/pixel\n");
-	} else if (frame._flags & RLE_ENCODED) {
+	} else if (frame._rleEncoded) {
 		// RLE encoded
 	    byte *dst = (byte *)frame._frame.getPixels();
 
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
index 5a510b2548..8aedbdb9c5 100644
--- a/engines/sherlock/sprite.h
+++ b/engines/sherlock/sprite.h
@@ -30,13 +30,12 @@
 
 namespace Sherlock {
 
-enum { RLE_ENCODED = 0x0100 };
-
 struct SpriteFrame {
 	uint32 _size;
 	uint16 _width, _height;
 	int _flags;
-	Common::Point _offset;
+	bool _rleEncoded;
+	Common::Point _position;
 	byte _rleMarker;
 	Graphics::Surface _frame;
 };
-- 
cgit v1.2.3


From cb874522e4fac3108070d5054977696a58ddb510 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 16 Mar 2015 23:38:58 -0400
Subject: SHERLOCK: Implement screen clipping for sprite drawing

---
 engines/sherlock/animation.cpp | 22 ++++++++++++----------
 engines/sherlock/graphics.cpp  | 38 ++++++++++++++++++++++++++++++++++++++
 engines/sherlock/graphics.h    |  6 ++++++
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index e4ec06b741..581971820d 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -101,7 +101,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 	events.delay(minDelay);
 	if (fade != 0 && fade != 255)
 		screen.fadeToBlack();
-	fade = 0; //***DEBUG****
+
 	if (setPalette) {
 		if (fade != 255)
 			screen.setPalette(sprite._palette);
@@ -112,19 +112,26 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 	Common::Point pt;
 	bool skipped = false;
 	while (!_vm->shouldQuit()) {
+		// Get the next sprite to display
 		spriteFrame = stream->readSint16LE();
-		if (spriteFrame != -1) {
+
+		if (spriteFrame == -2) {
+			// End of animation reached
+			break;
+		} else if (spriteFrame != -1) {
+			// Read position from either animation stream or the sprite frame itself
 			if (spriteFrame < 0) {
-				spriteFrame = ABS(spriteFrame);
+				spriteFrame += 32769;
 				pt.x = stream->readUint16LE();
 				pt.y = stream->readUint16LE();
 			} else {
 				pt = sprite[spriteFrame]._position;
 			}
 
-			screen.copyFrom(sprite[spriteFrame]._frame);
-			events.pollEventsAndWait();
+			// Draw the sprite
+			screen.copyFrom(sprite[spriteFrame]._frame, pt);
 		} else {
+			// No sprite to show for this animation frame
 			if (fade == 255) {
 				// Gradual fade in
 				if (screen.equalizePalette(sprite._palette) == 0)
@@ -144,11 +151,6 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 			}
 
 			events.delay(speed);
-
-			if (stream->readSint16LE() == -2)
-				// End of animation
-				break;
-			stream->seek(-2, SEEK_CUR);
 		}
 
 		if (events.isKeyPressed()) {
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index f4fe6b6b46..fbfd3b7b45 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -35,6 +35,44 @@ Surface::~Surface() {
     free();
 }
 
+/**
+ * Draws a surface into another
+ */
+void Surface::copyFrom(const Graphics::Surface &src) {
+	copyFrom(src, Common::Point());
+}
+
+/**
+ * Draws a surface at a given position within this surface
+ */
+void Surface::copyFrom(const Graphics::Surface &src, const Common::Point &pt) {
+	Common::Rect drawRect(0, 0, src.w, src.h);
+	Common::Point destPt = pt;
+	
+	if (destPt.x < 0) {
+		drawRect.left += -destPt.x;
+		destPt.x = 0;
+	}
+	if (destPt.y < 0) {
+		drawRect.top += -destPt.y;
+		destPt.y = 0;
+	}
+	int right = destPt.x + src.w;
+	if (right > this->w) {
+		drawRect.right -= (right - this->w);
+	}
+	int bottom = destPt.y + src.h;
+	if (bottom > this->h) {
+		drawRect.bottom -= (bottom - this->h);
+	}
+
+	if (drawRect.isValidRect()) {
+		addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
+			destPt.y + drawRect.height()));
+		copyRectToSurface(src, destPt.x, destPt.y, drawRect);
+	}
+}
+
 void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
     Graphics::Surface::fillRect(Common::Rect(x1, y1, x2, y2), color);
 }
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index c6611db1ce..79cffa839a 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -36,9 +36,15 @@ namespace Sherlock {
 class SherlockEngine;
 
 class Surface : public Graphics::Surface {
+protected:
+	virtual void addDirtyRect(const Common::Rect &r) {}
 public:
     Surface(uint16 width, uint16 height);
     ~Surface();
+
+	void copyFrom(const Graphics::Surface &src);
+	void copyFrom(const Graphics::Surface &src, const Common::Point &pt);
+
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
 	void drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped = false, bool altFlag = false);
 };
-- 
cgit v1.2.3


From 4b5cbc58976c1ed2a58c496aeb5f327352fc38a6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 16 Mar 2015 23:52:08 -0400
Subject: SHERLOCK: Split Screen class into it's own file

---
 engines/sherlock/graphics.cpp |  84 ---------------------------------
 engines/sherlock/graphics.h   |  29 ------------
 engines/sherlock/module.mk    |   1 +
 engines/sherlock/screen.cpp   | 107 ++++++++++++++++++++++++++++++++++++++++++
 engines/sherlock/screen.h     |  61 ++++++++++++++++++++++++
 engines/sherlock/sherlock.h   |   2 +-
 engines/sherlock/sprite.cpp   |   2 +-
 7 files changed, 171 insertions(+), 115 deletions(-)
 create mode 100644 engines/sherlock/screen.cpp
 create mode 100644 engines/sherlock/screen.h

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index fbfd3b7b45..23d3b443e8 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -77,88 +77,4 @@ void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
     Graphics::Surface::fillRect(Common::Rect(x1, y1, x2, y2), color);
 }
 
-void Surface::drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped, bool altFlag) {
-	
-	
-}
-
-/*----------------------------------------------------------------*/
-
-Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
-		_backBuffer1(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
-		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
-	setFont(1);
-}
-
-void Screen::setFont(int fontNumber) {
-	_fontNumber = fontNumber;
-	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber);
-	Common::SeekableReadStream *stream = _vm->_res->load(fname);
-
-	debug("TODO: Loading font %s, size - %d", fname.c_str(), stream->size());
-
-	delete stream;
-}
-
-void Screen::update() {
-	g_system->copyRectToScreen(getPixels(), this->w, 0, 0, this->w, this->h);
-	g_system->updateScreen();
-}
-
-void Screen::getPalette(byte palette[PALETTE_SIZE]) {
-	g_system->getPaletteManager()->grabPalette(palette, 0, PALETTE_COUNT);
-}
-
-void Screen::setPalette(const byte palette[PALETTE_SIZE]) {
-	g_system->getPaletteManager()->setPalette(palette, 0, PALETTE_COUNT);
-}
-
-int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
-	int total = 0;
-	byte tempPalette[PALETTE_SIZE];
-	getPalette(tempPalette);
-
-	// For any palette component that doesn't already match the given destination
-	// palette, change by 1 towards the reference palette component
-	for (int idx = 0; idx < PALETTE_SIZE; ++idx) {
-		if (tempPalette[idx] > palette[idx])
-		{
-			--tempPalette[idx];
-			++total;
-		} else if (tempPalette[idx] < palette[idx]) {
-			++tempPalette[idx];
-			++total;
-		}
-	}
-
-	if (total > 0)
-		// Palette changed, so reload it
-		setPalette(tempPalette);
-
-	return total;
-}
-
-void Screen::fadeToBlack() {
-	const int FADE_AMOUNT = 2;
-	bool repeatFlag;
-	byte *srcP;
-	int count;
-	byte tempPalette[PALETTE_SIZE];
-
-	getPalette(tempPalette);
-	do {
-		repeatFlag = false;
-		for (srcP = &tempPalette[0], count = 0; count < PALETTE_SIZE; ++count, ++srcP) {
-			int v = *srcP;
-			if (v) {
-				repeatFlag = true;
-				*srcP = MAX(*srcP - FADE_AMOUNT, 0);
-			}
-		}
-
-		setPalette(tempPalette);
-		_vm->_events->pollEventsAndWait();
-	} while (repeatFlag && !_vm->shouldQuit());
-}
-
 } // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 79cffa839a..1765cf04ae 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -26,15 +26,8 @@
 #include "common/rect.h"
 #include "graphics/surface.h"
 
-#include "sherlock/sprite.h"
-
 namespace Sherlock {
 
-#define PALETTE_SIZE 768
-#define PALETTE_COUNT 256
-
-class SherlockEngine;
-
 class Surface : public Graphics::Surface {
 protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
@@ -46,28 +39,6 @@ public:
 	void copyFrom(const Graphics::Surface &src, const Common::Point &pt);
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
-	void drawSprite(int x, int y, SpriteFrame *spriteFrame, bool flipped = false, bool altFlag = false);
-};
-
-class Screen : public Surface {
-private:
-	SherlockEngine *_vm;
-	int _fontNumber;
-	Surface _backBuffer1, _backBuffer2;
-public:
-	Screen(SherlockEngine *vm);
-
-	void setFont(int fontNumber);
-
-	void update();
-
-	void getPalette(byte palette[PALETTE_SIZE]);
-
-	void setPalette(const byte palette[PALETTE_SIZE]);
-
-	int equalizePalette(const byte palette[PALETTE_SIZE]);
-
-	void fadeToBlack();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 7009f49d3f..06186f1504 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -12,6 +12,7 @@ MODULE_OBJS = \
 	journal.o \
 	resources.o \
 	room.o \
+	screen.o \
 	sherlock.o \
 	sound.o \
 	sprite.o \
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
new file mode 100644
index 0000000000..d3fe68e367
--- /dev/null
+++ b/engines/sherlock/screen.cpp
@@ -0,0 +1,107 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/screen.h"
+#include "sherlock/sherlock.h"
+#include "common/system.h"
+#include "graphics/palette.h"
+
+namespace Sherlock {
+
+Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
+		_backBuffer1(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
+		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
+	setFont(1);
+}
+
+void Screen::setFont(int fontNumber) {
+	_fontNumber = fontNumber;
+	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber);
+	Common::SeekableReadStream *stream = _vm->_res->load(fname);
+
+	debug("TODO: Loading font %s, size - %d", fname.c_str(), stream->size());
+
+	delete stream;
+}
+
+void Screen::update() {
+	g_system->copyRectToScreen(getPixels(), this->w, 0, 0, this->w, this->h);
+	g_system->updateScreen();
+}
+
+void Screen::getPalette(byte palette[PALETTE_SIZE]) {
+	g_system->getPaletteManager()->grabPalette(palette, 0, PALETTE_COUNT);
+}
+
+void Screen::setPalette(const byte palette[PALETTE_SIZE]) {
+	g_system->getPaletteManager()->setPalette(palette, 0, PALETTE_COUNT);
+}
+
+int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
+	int total = 0;
+	byte tempPalette[PALETTE_SIZE];
+	getPalette(tempPalette);
+
+	// For any palette component that doesn't already match the given destination
+	// palette, change by 1 towards the reference palette component
+	for (int idx = 0; idx < PALETTE_SIZE; ++idx) {
+		if (tempPalette[idx] > palette[idx])
+		{
+			--tempPalette[idx];
+			++total;
+		} else if (tempPalette[idx] < palette[idx]) {
+			++tempPalette[idx];
+			++total;
+		}
+	}
+
+	if (total > 0)
+		// Palette changed, so reload it
+		setPalette(tempPalette);
+
+	return total;
+}
+
+void Screen::fadeToBlack() {
+	const int FADE_AMOUNT = 2;
+	bool repeatFlag;
+	byte *srcP;
+	int count;
+	byte tempPalette[PALETTE_SIZE];
+
+	getPalette(tempPalette);
+	do {
+		repeatFlag = false;
+		for (srcP = &tempPalette[0], count = 0; count < PALETTE_SIZE; ++count, ++srcP) {
+			int v = *srcP;
+			if (v) {
+				repeatFlag = true;
+				*srcP = MAX(*srcP - FADE_AMOUNT, 0);
+			}
+		}
+
+		setPalette(tempPalette);
+		_vm->_events->pollEventsAndWait();
+	} while (repeatFlag && !_vm->shouldQuit());
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
new file mode 100644
index 0000000000..3d1ad785e6
--- /dev/null
+++ b/engines/sherlock/screen.h
@@ -0,0 +1,61 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCREEN_H
+#define SHERLOCK_SCREEN_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+
+#include "sherlock/graphics.h"
+
+namespace Sherlock {
+
+#define PALETTE_SIZE 768
+#define PALETTE_COUNT 256
+
+class SherlockEngine;
+
+class Screen : public Surface {
+private:
+	SherlockEngine *_vm;
+	int _fontNumber;
+	Surface _backBuffer1, _backBuffer2;
+public:
+	Screen(SherlockEngine *vm);
+
+	void setFont(int fontNumber);
+
+	void update();
+
+	void getPalette(byte palette[PALETTE_SIZE]);
+
+	void setPalette(const byte palette[PALETTE_SIZE]);
+
+	int equalizePalette(const byte palette[PALETTE_SIZE]);
+
+	void fadeToBlack();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index b04a14e8ac..8d24a78c81 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -33,10 +33,10 @@
 #include "sherlock/animation.h"
 #include "sherlock/debugger.h"
 #include "sherlock/events.h"
-#include "sherlock/graphics.h"
 #include "sherlock/journal.h"
 #include "sherlock/resources.h"
 #include "sherlock/room.h"
+#include "sherlock/screen.h"
 #include "sherlock/sound.h"
 #include "sherlock/talk.h"
 
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index 9883d078ae..ca70932155 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "sherlock/sprite.h"
-#include "sherlock/graphics.h"
+#include "sherlock/screen.h"
 #include "common/debug.h"
 
 namespace Sherlock {
-- 
cgit v1.2.3


From 59c124aa609bc872ac00175729728bdd825e6f1d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 17 Mar 2015 00:01:12 -0400
Subject: SHERLOCK: Add dirty rect handling

---
 engines/sherlock/screen.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/screen.h   |  8 ++++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index d3fe68e367..6dcb37c448 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -44,8 +44,21 @@ void Screen::setFont(int fontNumber) {
 }
 
 void Screen::update() {
-	g_system->copyRectToScreen(getPixels(), this->w, 0, 0, this->w, this->h);
+	// Merge the dirty rects
+	mergeDirtyRects();
+
+	// Loop through copying dirty areas to the physical screen
+	Common::List<Common::Rect>::iterator i;
+	for (i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
+		const Common::Rect &r = *i;
+		const byte *srcP = (const byte *)getBasePtr(r.left, r.top);
+		g_system->copyRectToScreen(srcP, this->pitch, r.left, r.top,
+			r.width(), r.height());
+	}
+
+	// Signal the physical screen to update
 	g_system->updateScreen();
+	_dirtyRects.clear();
 }
 
 void Screen::getPalette(byte palette[PALETTE_SIZE]) {
@@ -104,4 +117,57 @@ void Screen::fadeToBlack() {
 	} while (repeatFlag && !_vm->shouldQuit());
 }
 
+/**
+ * Adds a rectangle to the list of modified areas of the screen during the
+ * current frame
+ */
+void Screen::addDirtyRect(const Common::Rect &r) {
+	_dirtyRects.push_back(r);
+	assert(r.isValidRect() && r.width() > 0 && r.height() > 0);
+}
+
+/**
+ * Merges together overlapping dirty areas of the screen
+ */
+void Screen::mergeDirtyRects() {
+	Common::List<Common::Rect>::iterator rOuter, rInner;
+
+	// Ensure dirty rect list has at least two entries
+	rOuter = _dirtyRects.begin();
+	for (int i = 0; i < 2; ++i, ++rOuter) {
+		if (rOuter == _dirtyRects.end())
+			return;
+	}
+
+	// Process the dirty rect list to find any rects to merge
+	for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
+		rInner = rOuter;
+		while (++rInner != _dirtyRects.end()) {
+
+			if ((*rOuter).intersects(*rInner)) {
+				// these two rectangles overlap or
+				// are next to each other - merge them
+
+				unionRectangle(*rOuter, *rOuter, *rInner);
+
+				// remove the inner rect from the list
+				_dirtyRects.erase(rInner);
+
+				// move back to beginning of list
+				rInner = rOuter;
+			}
+		}
+	}
+}
+
+/**
+ * Returns the union of two dirty area rectangles
+ */
+bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2) {
+	destRect = src1;
+	destRect.extend(src2);
+
+	return !destRect.isEmpty();
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 3d1ad785e6..62d3944d04 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -23,6 +23,7 @@
 #ifndef SHERLOCK_SCREEN_H
 #define SHERLOCK_SCREEN_H
 
+#include "common/list.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
 
@@ -40,6 +41,13 @@ private:
 	SherlockEngine *_vm;
 	int _fontNumber;
 	Surface _backBuffer1, _backBuffer2;
+	Common::List<Common::Rect> _dirtyRects;
+
+	void mergeDirtyRects();
+
+	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
+protected:
+	virtual void addDirtyRect(const Common::Rect &r);
 public:
 	Screen(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 51989953b616c97db4d3d433fffee2ab8395606b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 17 Mar 2015 08:12:19 -0400
Subject: SHERLOCK: Implement transparent sprite drawing

---
 engines/sherlock/animation.cpp |  2 +-
 engines/sherlock/graphics.cpp  | 54 +++++++++++++++++++++++++++++++++++-------
 engines/sherlock/graphics.h    |  4 ++--
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 581971820d..0e932b6dd2 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -129,7 +129,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 			}
 
 			// Draw the sprite
-			screen.copyFrom(sprite[spriteFrame]._frame, pt);
+			screen.transBlitFrom(sprite[spriteFrame]._frame, pt);
 		} else {
 			// No sprite to show for this animation frame
 			if (fade == 255) {
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 23d3b443e8..2bce822707 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -35,17 +35,10 @@ Surface::~Surface() {
     free();
 }
 
-/**
- * Draws a surface into another
- */
-void Surface::copyFrom(const Graphics::Surface &src) {
-	copyFrom(src, Common::Point());
-}
-
 /**
  * Draws a surface at a given position within this surface
  */
-void Surface::copyFrom(const Graphics::Surface &src, const Common::Point &pt) {
+void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
 	Common::Point destPt = pt;
 	
@@ -73,6 +66,51 @@ void Surface::copyFrom(const Graphics::Surface &src, const Common::Point &pt) {
 	}
 }
 
+
+/**
+* Draws a surface at a given position within this surface with transparency
+*/
+void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt) {
+	Common::Rect drawRect(0, 0, src.w, src.h);
+	Common::Point destPt = pt;
+
+	if (destPt.x < 0) {
+		drawRect.left += -destPt.x;
+		destPt.x = 0;
+	}
+	if (destPt.y < 0) {
+		drawRect.top += -destPt.y;
+		destPt.y = 0;
+	}
+	int right = destPt.x + src.w;
+	if (right > this->w) {
+		drawRect.right -= (right - this->w);
+	}
+	int bottom = destPt.y + src.h;
+	if (bottom > this->h) {
+		drawRect.bottom -= (bottom - this->h);
+	}
+
+	if (!drawRect.isValidRect())
+		return;
+
+	addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
+		destPt.y + drawRect.height()));
+
+	// Draw loop
+	const int TRANSPARENCY = 0xFF;
+	for (int yp = 0; yp < drawRect.height(); ++yp) {
+		const byte *srcP = (const byte *)src.getBasePtr(drawRect.left, drawRect.top + yp);
+		byte *destP = (byte *)getBasePtr(destPt.x, destPt.y + yp);
+
+		for (int xp = 0; xp < drawRect.width(); ++xp, ++srcP, ++destP) {
+			if (*srcP != TRANSPARENCY)
+				*destP = *srcP;
+		}
+	}
+}
+
+
 void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
     Graphics::Surface::fillRect(Common::Rect(x1, y1, x2, y2), color);
 }
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 1765cf04ae..983a22a790 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -35,8 +35,8 @@ public:
     Surface(uint16 width, uint16 height);
     ~Surface();
 
-	void copyFrom(const Graphics::Surface &src);
-	void copyFrom(const Graphics::Surface &src, const Common::Point &pt);
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
+	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt);
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
 };
-- 
cgit v1.2.3


From ec4319923452bebade836b43a912de06958315a6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 17 Mar 2015 08:31:29 -0400
Subject: SHERLOCK: Convert 6-bit palettes to 8-bit VGA palettes

---
 engines/sherlock/screen.cpp | 4 ++--
 engines/sherlock/screen.h   | 1 +
 engines/sherlock/sprite.cpp | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 6dcb37c448..500abc1197 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -79,10 +79,10 @@ int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
 	for (int idx = 0; idx < PALETTE_SIZE; ++idx) {
 		if (tempPalette[idx] > palette[idx])
 		{
-			--tempPalette[idx];
+			tempPalette[idx] = MAX((int)palette[idx], (int)tempPalette[idx] - 4);
 			++total;
 		} else if (tempPalette[idx] < palette[idx]) {
-			++tempPalette[idx];
+			tempPalette[idx] = MIN((int)palette[idx], (int)tempPalette[idx] + 4);
 			++total;
 		}
 	}
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 62d3944d04..d244452771 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -33,6 +33,7 @@ namespace Sherlock {
 
 #define PALETTE_SIZE 768
 #define PALETTE_COUNT 256
+#define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
 
 class SherlockEngine;
 
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index ca70932155..be5a0e0d27 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -85,7 +85,8 @@ void Sprite::loadPalette(Common::SeekableReadStream &stream) {
 	assert((size - 12) == PALETTE_SIZE);
 
 	stream.seek(4 + 12, SEEK_CUR);
-	stream.read(&_palette[0], PALETTE_SIZE);
+	for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+		_palette[idx] = VGA_COLOR_TRANS(stream.readByte());
 }
 
 /**
-- 
cgit v1.2.3


From 62f3f5d14e391cdac0bbfe200cdde2e4773afba4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 17 Mar 2015 23:09:04 -0400
Subject: SHERLOCK: Remainder of showCityCutscene implemented

---
 engines/sherlock/animation.cpp       |  7 ++-
 engines/sherlock/events.cpp          | 23 +++++++---
 engines/sherlock/events.h            |  4 +-
 engines/sherlock/graphics.cpp        | 39 ++++++++++++----
 engines/sherlock/graphics.h          |  6 ++-
 engines/sherlock/scalpel/scalpel.cpp | 70 ++++++++++++++++++++++++++---
 engines/sherlock/screen.cpp          | 87 ++++++++++++++++++++++++++++--------
 engines/sherlock/screen.h            | 11 ++++-
 engines/sherlock/sherlock.cpp        |  3 +-
 engines/sherlock/sherlock.h          |  8 +++-
 engines/sherlock/sprite.cpp          | 37 +++++++++++----
 engines/sherlock/sprite.h            | 12 ++++-
 12 files changed, 246 insertions(+), 61 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 0e932b6dd2..6788cc51d7 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -95,10 +95,9 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
-	Common::SeekableReadStream *vdaStream = _vm->_res->load(vdaName);
-	Sprite sprite(*vdaStream, true);
+	Sprite sprite(vdaName, true);
 	
-	events.delay(minDelay);
+	events.wait(minDelay);
 	if (fade != 0 && fade != 255)
 		screen.fadeToBlack();
 
@@ -150,7 +149,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 					sound.playSound(fname);
 			}
 
-			events.delay(speed);
+			events.wait(speed);
 		}
 
 		if (events.isKeyPressed()) {
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 4a51c4a5fb..c6c013193c 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -158,17 +158,26 @@ void EventsManager::clearEvents() {
 }
 
 /**
- * Delay for a given number of cycles, where each cycle is 1/60th of a second
+ * Delay for a given number of game frames, where each frame is 1/60th of a second
  */
-void EventsManager::delay(int cycles) {
-	uint32 totalMilli = cycles * 1000 / GAME_FRAME_RATE;
-	uint32 delayEnd = g_system->getMillis() + totalMilli;
+void EventsManager::wait(int numFrames) {
+	uint32 totalMilli = numFrames * 1000 / GAME_FRAME_RATE;
+	delay(totalMilli);
+}
+
+bool EventsManager::delay(uint32 time, bool interruptable) {
+	uint32 delayEnd = g_system->getMillis() + time;
 
 	while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd) {
-		g_system->delayMillis(10);
+		pollEventsAndWait();
 
-		pollEvents();
+		if (interruptable && (isKeyPressed() || _mouseClicked)) {
+			clearEvents();
+			return false;
+		}
 	}
+
+	return true;
 }
 
 /**
@@ -183,7 +192,7 @@ void EventsManager::waitForNextFrame() {
 
 	uint32 frameCtr = getFrameCounter();
 	while (!_vm->shouldQuit() && frameCtr == _frameCounter) {
-		delay(1);
+		pollEventsAndWait();
 
 		mouseClicked |= _mouseClicked;
 		mouseButtons |= _mouseButtons;
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index f4e6964ef5..4493fcdc65 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -75,7 +75,9 @@ public:
 
 	void clearEvents();
 
-	void delay(int amount);
+	void wait(int numFrames);
+
+	bool delay(uint32 time, bool interruptable = false);
 
 	void waitForNextFrame();
 
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 2bce822707..a4990fb6c6 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -35,6 +35,13 @@ Surface::~Surface() {
     free();
 }
 
+/**
+ * Copy a surface into this one
+ */
+void Surface::blitFrom(const Graphics::Surface &src) {
+	blitFrom(src, Common::Point(0, 0));
+}
+
 /**
  * Draws a surface at a given position within this surface
  */
@@ -59,18 +66,25 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
 		drawRect.bottom -= (bottom - this->h);
 	}
 
-	if (drawRect.isValidRect()) {
-		addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
-			destPt.y + drawRect.height()));
-		copyRectToSurface(src, destPt.x, destPt.y, drawRect);
-	}
+	if (drawRect.isValidRect())
+		blitFrom(src, destPt, drawRect);
 }
 
+/**
+ * Draws a sub-section of a surface at a given position within this surface
+ */
+void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		const Common::Rect &srcBounds) {
+	addDirtyRect(Common::Rect(pt.x, pt.y, pt.x + srcBounds.width(),
+		pt.y + srcBounds.height()));
+	copyRectToSurface(src, pt.x, pt.y, srcBounds);
+}
 
 /**
 * Draws a surface at a given position within this surface with transparency
 */
-void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt) {
+void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		bool flipped, int overrideColor) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
 	Common::Point destPt = pt;
 
@@ -94,18 +108,25 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 	if (!drawRect.isValidRect())
 		return;
 
+	if (flipped)
+		drawRect = Common::Rect(src.w - drawRect.right, src.h - drawRect.bottom,
+			src.w - drawRect.left, src.h - drawRect.top);
+
 	addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
 		destPt.y + drawRect.height()));
 
 	// Draw loop
 	const int TRANSPARENCY = 0xFF;
 	for (int yp = 0; yp < drawRect.height(); ++yp) {
-		const byte *srcP = (const byte *)src.getBasePtr(drawRect.left, drawRect.top + yp);
+		const byte *srcP = (const byte *)src.getBasePtr(
+			flipped ? drawRect.right : drawRect.left, drawRect.top + yp);
 		byte *destP = (byte *)getBasePtr(destPt.x, destPt.y + yp);
 
-		for (int xp = 0; xp < drawRect.width(); ++xp, ++srcP, ++destP) {
+		for (int xp = 0; xp < drawRect.width(); ++xp, ++destP) {
 			if (*srcP != TRANSPARENCY)
-				*destP = *srcP;
+				*destP = overrideColor ? overrideColor : *srcP;
+
+			srcP = flipped ? srcP - 1 : srcP + 1;
 		}
 	}
 }
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 983a22a790..82c48307d7 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -35,8 +35,12 @@ public:
     Surface(uint16 width, uint16 height);
     ~Surface();
 
+	void blitFrom(const Graphics::Surface &src);
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
-	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt);
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		const Common::Rect &srcBounds);
+	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		bool flipped = false, int overrideColor = 0);
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
 };
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 90a93de1b1..0e5a3bec34 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -59,15 +59,75 @@ void ScalpelEngine::showOpening() {
 }
 
 bool ScalpelEngine::showCityCutscene() {
-//	byte palette[PALETTE_SIZE];
+	byte palette[PALETTE_SIZE];
 	
 	_sound->playMusic("prolog1.mus");
 	_titleOverride = "title.lib";
 	_soundOverride = "title.snd";
-	_animation->playPrologue("26open1", 1, 255, true, 2);
-
-	// TODO
-	return true;
+	bool finished = _animation->playPrologue("26open1", 1, 255, true, 2);
+
+	if (finished) {
+		Sprite titleSprites("title2.vgs", true);
+		_screen->_backBuffer.blitFrom(*_screen);
+		_screen->_backBuffer2.blitFrom(*_screen);
+
+		// London, England
+		_screen->_backBuffer.transBlitFrom(titleSprites[0], Common::Point(10, 11));
+		_screen->randomTransition();
+		finished = _events->delay(1000, true);
+
+		// November, 1888
+		if (finished) {
+			_screen->_backBuffer.transBlitFrom(titleSprites[1], Common::Point(101, 102));
+			_screen->randomTransition();
+			finished = _events->delay(5000, true);
+		}
+
+		// Transition out the title
+		_screen->_backBuffer.blitFrom(_screen->_backBuffer2);
+		_screen->randomTransition();
+	}
+
+	if (finished)
+		finished = _animation->playPrologue("26open2", 1, 0, false, 2);
+
+	if (finished) {
+		Sprite titleSprites("title.vgs", true);
+		_screen->_backBuffer.blitFrom(*_screen);
+		_screen->_backBuffer2.blitFrom(*_screen);
+		
+		// The Lost Files of
+		_screen->_backBuffer.transBlitFrom(titleSprites[0], Common::Point(75, 6));
+		// Sherlock Holmes
+		_screen->_backBuffer.transBlitFrom(titleSprites[1], Common::Point(34, 21));
+		// copyright
+		_screen->_backBuffer.transBlitFrom(titleSprites[2], Common::Point(4, 190));
+
+		_screen->verticalTransition();
+		finished = _events->delay(4000, true);
+
+		if (finished) {
+			_screen->_backBuffer.blitFrom(_screen->_backBuffer2);
+			_screen->randomTransition();
+			finished = _events->delay(2000);
+		}
+
+		if (finished) {
+			_screen->getPalette(palette);
+			_screen->fadeToBlack(2);
+		}
+
+		if (finished) {
+			// In the alley...
+			_screen->transBlitFrom(titleSprites[3], Common::Point(72, 51));
+			_screen->fadeIn(palette, 3);
+			finished = _events->delay(3000, true);
+		}
+	}
+
+	_titleOverride = "";
+	_soundOverride = "";
+	return finished;
 }
 
 bool ScalpelEngine::showAlleyCutscene() {
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 500abc1197..41cf19e48c 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -28,7 +28,7 @@
 namespace Sherlock {
 
 Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
-		_backBuffer1(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
+		_backBuffer(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
 		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
 	setFont(1);
 }
@@ -94,27 +94,30 @@ int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
 	return total;
 }
 
-void Screen::fadeToBlack() {
-	const int FADE_AMOUNT = 2;
-	bool repeatFlag;
-	byte *srcP;
-	int count;
+/**
+ * Fade out the palette to black
+ */
+void Screen::fadeToBlack(int speed) {
 	byte tempPalette[PALETTE_SIZE];
+	Common::fill(&tempPalette[0], &tempPalette[PALETTE_SIZE], 0);
 
-	getPalette(tempPalette);
-	do {
-		repeatFlag = false;
-		for (srcP = &tempPalette[0], count = 0; count < PALETTE_SIZE; ++count, ++srcP) {
-			int v = *srcP;
-			if (v) {
-				repeatFlag = true;
-				*srcP = MAX(*srcP - FADE_AMOUNT, 0);
-			}
-		}
+	while (equalizePalette(tempPalette)) {
+		_vm->_events->delay(15 * speed);
+	}
 
-		setPalette(tempPalette);
-		_vm->_events->pollEventsAndWait();
-	} while (repeatFlag && !_vm->shouldQuit());
+	setPalette(tempPalette);
+}
+
+/**
+ * Fade in a given palette
+ */
+void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) {
+	int count = 50;
+	while (equalizePalette(palette) && --count) {
+		_vm->_events->delay(15 * speed);
+	}
+
+	setPalette(palette);
 }
 
 /**
@@ -170,4 +173,50 @@ bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, co
 	return !destRect.isEmpty();
 }
 
+/**
+ * Do a random pixel transition in from _backBuffer surface to the screen
+ */
+void Screen::randomTransition() {
+	EventsManager &events = *_vm->_events;
+
+	for (int idx = 0; idx <= 65535; ++idx) {
+		int offset = _vm->getRandomNumber(this->w * this->h);
+		*((byte *)getPixels() + offset) = *((const byte *)_backBuffer.getPixels() + offset);
+	
+		if (idx != 0 && (idx % 100) == 0) {
+			_dirtyRects.clear();
+			addDirtyRect(Common::Rect(0, 0, this->w, this->h));
+			events.delay(5);
+		}
+	}
+
+	// Make sure everything has been transferred
+	blitFrom(_backBuffer);
+}
+
+/**
+ * Transition to the surface from _backBuffer using a vertical transition
+ */
+void Screen::verticalTransition() {
+	EventsManager &events = *_vm->_events;
+
+	byte table[SHERLOCK_SCREEN_WIDTH];
+	Common::fill(&table[0], &table[SHERLOCK_SCREEN_WIDTH], 0);
+	
+	for (int yp = 0; yp < SHERLOCK_SCREEN_HEIGHT; ++yp) {		
+		for (int xp = 0; xp < SHERLOCK_SCREEN_WIDTH; ++xp) {
+			int temp = (table[xp] >= 197) ? SHERLOCK_SCREEN_HEIGHT - table[xp] : 
+				_vm->getRandomNumber(3) + 1;
+
+			if (temp) {
+				blitFrom(_backBuffer, Common::Point(xp, table[xp]),
+					Common::Rect(xp, table[xp], xp + 1, table[xp] + temp));
+				table[xp] += temp;
+			}
+		}
+
+		events.delay(10);
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index d244452771..0c0175d2ed 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -41,7 +41,6 @@ class Screen : public Surface {
 private:
 	SherlockEngine *_vm;
 	int _fontNumber;
-	Surface _backBuffer1, _backBuffer2;
 	Common::List<Common::Rect> _dirtyRects;
 
 	void mergeDirtyRects();
@@ -49,6 +48,8 @@ private:
 	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
 protected:
 	virtual void addDirtyRect(const Common::Rect &r);
+public:
+	Surface _backBuffer, _backBuffer2;
 public:
 	Screen(SherlockEngine *vm);
 
@@ -62,7 +63,13 @@ public:
 
 	int equalizePalette(const byte palette[PALETTE_SIZE]);
 
-	void fadeToBlack();
+	void fadeToBlack(int speed = 2);
+
+	void fadeIn(const byte palette[PALETTE_SIZE], int speed = 2);
+
+	void randomTransition();
+
+	void verticalTransition();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 1fba746f8d..add24cba9f 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -29,7 +29,7 @@
 namespace Sherlock {
 
 SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
-		Engine(syst), _gameDescription(gameDesc) {
+		Engine(syst), _gameDescription(gameDesc), _randomSource("Sherlock") {
 	_animation = nullptr;
 	_debugger = nullptr;
 	_events = nullptr;
@@ -82,6 +82,7 @@ void SherlockEngine::initialize() {
 	_screen = new Screen(this);
 	_sound = new Sound(this);
 	_talk = new Talk();
+	Sprite::setVm(this);
 }
 
 Common::Error SherlockEngine::run() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 8d24a78c81..cedc57a9f8 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -26,9 +26,10 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/endian.h"
-#include "common/util.h"
-#include "common/savefile.h"
 #include "common/hash-str.h"
+#include "common/random.h"
+#include "common/savefile.h"
+#include "common/util.h"
 #include "engines/engine.h"
 #include "sherlock/animation.h"
 #include "sherlock/debugger.h"
@@ -79,6 +80,7 @@ public:
 	Screen *_screen;
 	Sound *_sound;
 	Talk *_talk;
+	Common::RandomSource _randomSource;
 	Common::Array<bool> _flags;
 	Common::String _soundOverride;
 	Common::String _titleOverride;
@@ -96,6 +98,8 @@ public:
 	Common::Platform getPlatform() const;
 
 	Common::String getGameFile(int fileType);
+
+	int getRandomNumber(int limit) { return _randomSource.getRandomNumber(limit - 1); }
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
index be5a0e0d27..8a7bb4cf29 100644
--- a/engines/sherlock/sprite.cpp
+++ b/engines/sherlock/sprite.cpp
@@ -22,10 +22,26 @@
 
 #include "sherlock/sprite.h"
 #include "sherlock/screen.h"
+#include "sherlock/sherlock.h"
 #include "common/debug.h"
 
 namespace Sherlock {
 
+SherlockEngine *Sprite::_vm;
+
+void Sprite::setVm(SherlockEngine *vm) {
+	_vm = vm;
+}
+
+Sprite::Sprite(const Common::String &name, bool skipPal) {
+	Common::SeekableReadStream *stream = _vm->_res->load(name);
+	
+	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
+	load(*stream, skipPal);
+	
+	delete stream;
+}
+
 Sprite::Sprite(Common::SeekableReadStream &stream, bool skipPal) {
 	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
 	load(stream, skipPal);
@@ -39,7 +55,7 @@ Sprite::~Sprite() {
 /**
  * Load the data of the sprite
  */
-void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
+void Sprite::load(Common::SeekableReadStream &stream, bool skipPalette) {
 	loadPalette(stream);
 
     while (stream.pos() < stream.size()) {
@@ -50,7 +66,7 @@ void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
 		frame._position.x = stream.readUint16LE();
 		frame._position.y = stream.readByte();
         
-		frame._rleEncoded = !skipPal && (frame._position.x == 1);
+		frame._rleEncoded = !skipPalette && (frame._position.x == 1);
 
 		if (frame._flags & 0xFF) {
 			// Nibble packed frame data
@@ -78,15 +94,20 @@ void Sprite::load(Common::SeekableReadStream &stream, bool skipPal) {
  * Gets the palette at the start of the sprite file
  */
 void Sprite::loadPalette(Common::SeekableReadStream &stream) {
-	// Read in the palette
+	// Check for palette
 	int v1 = stream.readUint16LE() + 1;
 	int v2 = stream.readUint16LE() + 1;
 	int size = v1 * v2;
-	assert((size - 12) == PALETTE_SIZE);
-
-	stream.seek(4 + 12, SEEK_CUR);
-	for (int idx = 0; idx < PALETTE_SIZE; ++idx)
-		_palette[idx] = VGA_COLOR_TRANS(stream.readByte());
+	
+	if ((size - 12) == PALETTE_SIZE) {
+		// Found palette, so read it in
+		stream.seek(4 + 12, SEEK_CUR);
+		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+			_palette[idx] = VGA_COLOR_TRANS(stream.readByte());
+	} else {
+		// Not a palette, so rewind to start of frame data for normal frame processing
+		stream.seek(-4, SEEK_CUR);
+	}
 }
 
 /**
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
index 8aedbdb9c5..844013db43 100644
--- a/engines/sherlock/sprite.h
+++ b/engines/sherlock/sprite.h
@@ -30,6 +30,8 @@
 
 namespace Sherlock {
 
+class SherlockEngine;
+
 struct SpriteFrame {
 	uint32 _size;
 	uint16 _width, _height;
@@ -38,18 +40,24 @@ struct SpriteFrame {
 	Common::Point _position;
 	byte _rleMarker;
 	Graphics::Surface _frame;
+
+	operator Graphics::Surface &() { return _frame; }
 };
 
 class Sprite: public Common::Array<SpriteFrame> {
 private:
-	void load(Common::SeekableReadStream &stream, bool skipPal);
+	static SherlockEngine *_vm;
+
+	void load(Common::SeekableReadStream &stream, bool skipPalette);
 	void loadPalette(Common::SeekableReadStream &stream);
 	void decompressFrame(SpriteFrame  &frame, const byte *src);
 public:
 	byte _palette[256 * 3];
 public:
-    Sprite(Common::SeekableReadStream &stream, bool skipPal = false);
+	Sprite(const Common::String &name, bool skipPal = false);
+	Sprite(Common::SeekableReadStream &stream, bool skipPal = false);
     ~Sprite();
+	static void setVm(SherlockEngine *vm);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 9a9f569f3b24ae964506895a0b56a35e1aa2eeaf Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 18 Mar 2015 23:30:32 +0100
Subject: SCI: debugger / fix diskdump + list commands

diskdump: support for audio36+sync36
list: always show tuple for audio36+sync36
---
 engines/sci/console.cpp | 244 +++++++++++++++++++++++++++++++++---------------
 engines/sci/console.h   |   2 +
 2 files changed, 172 insertions(+), 74 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index a3abf606d0..3f5548aac7 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -660,10 +660,33 @@ bool Console::cmdRegisters(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::parseResourceNumber36(const char *userParameter, uint16 &resourceNumber, uint32 &resourceTuple) {
+	int userParameterLen = strlen(userParameter);
+	
+	if (userParameterLen != 10) {
+		debugPrintf("Audio36/Sync36 resource numbers must be specified as RRRNNVVCCS\n");
+		debugPrintf("where RRR is the resource number/map\n");
+		debugPrintf("      NN is the noun\n");
+		debugPrintf("      VV is the verb\n");
+		debugPrintf("      CC is the cond\n");
+		debugPrintf("      S  is the seq\n");
+		return false;
+	}
+
+	// input: RRRNNVVCCS
+	resourceNumber = strtol(Common::String(userParameter, 3).c_str(), 0, 36);
+	uint16 noun = strtol(Common::String(userParameter + 3, 2).c_str(), 0, 36);
+	uint16 verb = strtol(Common::String(userParameter + 5, 2).c_str(), 0, 36);
+	uint16 cond = strtol(Common::String(userParameter + 7, 2).c_str(), 0, 36);
+	uint16 seq = strtol(Common::String(userParameter + 9, 1).c_str(), 0, 36);
+	resourceTuple = ((noun & 0xff) << 24) | ((verb & 0xff) << 16) | ((cond & 0xff) << 8) | (seq & 0xff);
+	return true;
+}
+
 bool Console::cmdDiskDump(int argc, const char **argv) {
-	int resNumFrom = 0;
-	int resNumTo = 0;
-	int resNumCur = 0;
+	bool resourceAll = false;
+	uint16 resourceNumber = 0;
+	uint32 resourceTuple = 0;
 
 	if (argc != 3) {
 		debugPrintf("Dumps the specified resource to disk as a patch file\n");
@@ -673,42 +696,90 @@ bool Console::cmdDiskDump(int argc, const char **argv) {
 		return true;
 	}
 
+	ResourceType resourceType = parseResourceType(argv[1]);
+	if (resourceType == kResourceTypeInvalid) {
+		debugPrintf("Resource type '%s' is not valid\n", argv[1]);
+		return true;
+	}
+
 	if (strcmp(argv[2], "*") == 0) {
-		resNumFrom = 0;
-		resNumTo   = 65535;
+		resourceAll = true;
 	} else {
-		resNumFrom = atoi(argv[2]);
-		resNumTo   = resNumFrom;
+		switch (resourceType) {
+		case kResourceTypeAudio36:
+		case kResourceTypeSync36:
+			if (!parseResourceNumber36(argv[2], resourceNumber, resourceTuple)) {
+				return true;
+			}
+			break;
+		default:
+			resourceNumber = atoi(argv[2]);
+			break;
+		}
 	}
 
-	ResourceType res = parseResourceType(argv[1]);
-
-	if (res == kResourceTypeInvalid)
+	if (resourceType == kResourceTypeInvalid) {
 		debugPrintf("Resource type '%s' is not valid\n", argv[1]);
-	else {
-		for (resNumCur = resNumFrom; resNumCur <= resNumTo; resNumCur++) {
-			Resource *resource = _engine->getResMan()->findResource(ResourceId(res, resNumCur), 0);
-			if (resource) {
-				char outFileName[50];
-				sprintf(outFileName, "%s.%03d", getResourceTypeName(res), resNumCur);
-				Common::DumpFile *outFile = new Common::DumpFile();
-				outFile->open(outFileName);
-				resource->writeToStream(outFile);
-				outFile->finalize();
-				outFile->close();
-				delete outFile;
-				debugPrintf("Resource %s.%03d (located in %s) has been dumped to disk\n", argv[1], resNumCur, resource->getResourceLocation().c_str());
-			} else {
-				if (resNumFrom == resNumTo) {
-					debugPrintf("Resource %s.%03d not found\n", argv[1], resNumCur);
-				}
-			}
+		return true;
+	}
+
+	if (resourceAll) {
+		// "*" used, dump everything of that type
+		Common::List<ResourceId> resources = _engine->getResMan()->listResources(resourceType, -1);
+		Common::sort(resources.begin(), resources.end());
+
+		Common::List<ResourceId>::iterator itr;
+		for (itr = resources.begin(); itr != resources.end(); ++itr) {
+			resourceNumber = itr->getNumber();
+			resourceTuple = itr->getTuple();
+			cmdDiskDumpWorker(resourceType, resourceNumber, resourceTuple);
 		}
+	} else {
+		// id was given, dump only this resource
+		cmdDiskDumpWorker(resourceType, resourceNumber, resourceTuple);
 	}
 
 	return true;
 }
 
+void Console::cmdDiskDumpWorker(ResourceType resourceType, int resourceNumber, uint32 resourceTuple) {
+	const char *resourceTypeName = getResourceTypeName(resourceType);
+	ResourceId resourceId;
+	Resource *resource = NULL;
+	char outFileName[50];
+	
+	switch (resourceType) {
+	case kResourceTypeAudio36:
+	case kResourceTypeSync36: {
+		resourceId = ResourceId(resourceType, resourceNumber, resourceTuple);
+		resource = _engine->getResMan()->findResource(resourceId, 0);
+		sprintf(outFileName, "%s", resourceId.toPatchNameBase36().c_str());
+		// patch filename is: [type:1 char] [map:3 chars] [noun:2 chars] [verb:2 chars] "." [cond: 2 chars] [seq:1 char]
+		//  e.g. "@5EG0000.014"
+		break;
+	}
+	default:
+		resourceId = ResourceId(resourceType, resourceNumber);
+		resource = _engine->getResMan()->findResource(resourceId, 0);
+		sprintf(outFileName, "%s.%03d", resourceTypeName, resourceNumber);
+		// patch filename is: [resourcetype].[resourcenumber]
+		//  e.g. "Script.0"
+		break;
+	}
+
+	if (resource) {
+		Common::DumpFile *outFile = new Common::DumpFile();
+		outFile->open(outFileName);
+		resource->writeToStream(outFile);
+		outFile->finalize();
+		outFile->close();
+		delete outFile;
+		debugPrintf("Resource %s (located in %s) has been dumped to disk\n", outFileName, resource->getResourceLocation().c_str());
+	} else {
+		debugPrintf("Resource %s not found\n", outFileName);
+	}
+}
+
 bool Console::cmdHexDump(int argc, const char **argv) {
 	if (argc != 3) {
 		debugPrintf("Dumps the specified resource to standard output\n");
@@ -748,6 +819,77 @@ bool Console::cmdResourceId(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdList(int argc, const char **argv) {
+	int selectedMapNumber = -1;
+	Common::List<ResourceId> resources;
+	Common::List<ResourceId>::iterator itr;
+	int displayCount = 0;
+	int currentMap = -1;
+
+	if (argc < 2) {
+		debugPrintf("Lists all the resources of a given type\n");
+		cmdResourceTypes(argc, argv);
+		return true;
+	}
+
+	ResourceType resourceType = parseResourceType(argv[1]);
+	if (resourceType == kResourceTypeInvalid) {
+		debugPrintf("Unknown resource type: '%s'\n", argv[1]);
+		return true;
+	}
+
+	switch (resourceType) {
+	case kResourceTypeAudio36:
+	case kResourceTypeSync36:
+		if (argc != 3) {
+			debugPrintf("Please specify map number (-1: all maps)\n");
+			return true;
+		}
+		selectedMapNumber = atoi(argv[2]);
+		resources = _engine->getResMan()->listResources(resourceType, selectedMapNumber);
+		Common::sort(resources.begin(), resources.end());
+
+		for (itr = resources.begin(); itr != resources.end(); ++itr) {
+			const uint16 map = itr->getNumber();
+			const uint32 resourceTuple = itr->getTuple();
+			const uint16 noun = (resourceTuple >> 24) & 0xff;
+			const uint16 verb = (resourceTuple >> 16) & 0xff;
+			const uint16 cond = (resourceTuple >> 8) & 0xff;
+			const uint16 seq = resourceTuple & 0xff;
+
+			if (currentMap != map) {
+				if (displayCount % 3)
+					debugPrintf("\n");
+				debugPrintf("Map %04x (%i):\n", map, map);
+				currentMap = map;
+				displayCount = 0;
+			}
+			
+			if (displayCount % 3 == 0)
+				debugPrintf("  ");
+
+			debugPrintf("%02x %02x %02x %02x (%3i %3i %3i %3i)    ", noun, verb, cond, seq, noun, verb, cond, seq);
+
+			if (++displayCount % 3 == 0)
+				debugPrintf("\n");
+		}
+		break;
+	default:
+		resources = _engine->getResMan()->listResources(resourceType);
+		Common::sort(resources.begin(), resources.end());
+
+		for (itr = resources.begin(); itr != resources.end(); ++itr) {
+			debugPrintf("%8i", itr->getNumber());
+			if (++displayCount % 10 == 0)
+				debugPrintf("\n");
+		}
+		break;
+	}
+
+	debugPrintf("\n");
+	return true;
+}
+
 bool Console::cmdDissectScript(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Examines a script\n");
@@ -1124,52 +1266,6 @@ bool Console::cmdMapInstrument(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdList(int argc, const char **argv) {
-	if (argc < 2) {
-		debugPrintf("Lists all the resources of a given type\n");
-		cmdResourceTypes(argc, argv);
-		return true;
-	}
-
-
-	ResourceType res = parseResourceType(argv[1]);
-	if (res == kResourceTypeInvalid)
-		debugPrintf("Unknown resource type: '%s'\n", argv[1]);
-	else {
-		int number = -1;
-
-		if ((res == kResourceTypeAudio36) || (res == kResourceTypeSync36)) {
-			if (argc != 3) {
-				debugPrintf("Please specify map number (-1: all maps)\n");
-				return true;
-			}
-			number = atoi(argv[2]);
-		}
-
-		Common::List<ResourceId> resources = _engine->getResMan()->listResources(res, number);
-		Common::sort(resources.begin(), resources.end());
-
-		int cnt = 0;
-		Common::List<ResourceId>::iterator itr;
-		for (itr = resources.begin(); itr != resources.end(); ++itr) {
-			if (number == -1) {
-				debugPrintf("%8i", itr->getNumber());
-				if (++cnt % 10 == 0)
-					debugPrintf("\n");
-			} else if (number == (int)itr->getNumber()) {
-				const uint32 tuple = itr->getTuple();
-				debugPrintf("(%3i, %3i, %3i, %3i)   ", (tuple >> 24) & 0xff, (tuple >> 16) & 0xff,
-							(tuple >> 8) & 0xff, tuple & 0xff);
-				if (++cnt % 4 == 0)
-					debugPrintf("\n");
-			}
-		}
-		debugPrintf("\n");
-	}
-
-	return true;
-}
-
 bool Console::cmdSaveGame(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Saves the current game state to the hard disk\n");
diff --git a/engines/sci/console.h b/engines/sci/console.h
index c8e99f78f7..6d024082b5 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -68,6 +68,7 @@ private:
 	bool cmdSaid(int argc, const char **argv);
 	// Resources
 	bool cmdDiskDump(int argc, const char **argv);
+	void cmdDiskDumpWorker(ResourceType resourceType, int resourceNumber, uint32 resourceTuple);
 	bool cmdHexDump(int argc, const char **argv);
 	bool cmdResourceId(int argc, const char **argv);
 	bool cmdResourceInfo(int argc, const char **argv);
@@ -157,6 +158,7 @@ private:
 	bool cmdViewAccumulatorObject(int argc, const char **argv);
 
 	bool parseInteger(const char *argument, int &result);
+	bool parseResourceNumber36(const char *userParameter, uint16 &resourceNumber, uint32 &resourceTuple);
 
 	void printBasicVarInfo(reg_t variable);
 
-- 
cgit v1.2.3


From b8ad1ce140c91257ba79fe50f41da34a5a6e74c2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 18 Mar 2015 19:02:17 -0400
Subject: SHERLOCK: Make random pixel transitions more like the original

---
 engines/sherlock/events.cpp | 34 ++++++++++++++++++++++++----------
 engines/sherlock/screen.cpp | 19 ++++++++++++++-----
 engines/sherlock/screen.h   |  1 +
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index c6c013193c..b2d9fc65e8 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -166,18 +166,32 @@ void EventsManager::wait(int numFrames) {
 }
 
 bool EventsManager::delay(uint32 time, bool interruptable) {
-	uint32 delayEnd = g_system->getMillis() + time;
-
-	while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd) {
-		pollEventsAndWait();
-
-		if (interruptable && (isKeyPressed() || _mouseClicked)) {
-			clearEvents();
-			return false;
+	// Different handling for really short versus extended times
+	if (time < 10) {
+		// For really short periods, simply delay by the desired amount
+		pollEvents();
+		g_system->delayMillis(time);
+		bool result = !(interruptable && (isKeyPressed() || _mouseClicked));
+
+		clearEvents();
+		return result;
+	} else {
+		// For long periods go into a loop where we delay by 10ms at a time and then
+		// check for events. This ensures for longer delays that responsiveness is
+		// maintained
+		uint32 delayEnd = g_system->getMillis() + time;
+
+		while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd) {
+			pollEventsAndWait();
+
+			if (interruptable && (isKeyPressed() || _mouseClicked)) {
+				clearEvents();
+				return false;
+			}
 		}
-	}
 
-	return true;
+		return true;
+	}
 }
 
 /**
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 41cf19e48c..7a4d4863ac 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -30,6 +30,7 @@ namespace Sherlock {
 Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
 		_backBuffer(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
 		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
+	_transitionSeed = 1;
 	setFont(1);
 }
 
@@ -178,15 +179,23 @@ bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, co
  */
 void Screen::randomTransition() {
 	EventsManager &events = *_vm->_events;
+	const int TRANSITION_MULTIPLIER = 0x15a4e35;
+	_dirtyRects.clear();
 
 	for (int idx = 0; idx <= 65535; ++idx) {
-		int offset = _vm->getRandomNumber(this->w * this->h);
-		*((byte *)getPixels() + offset) = *((const byte *)_backBuffer.getPixels() + offset);
+		_transitionSeed = _transitionSeed * TRANSITION_MULTIPLIER + 1;
+		int offset = _transitionSeed & 65535;
+
+		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
+			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer.getPixels() + offset);
 	
 		if (idx != 0 && (idx % 100) == 0) {
-			_dirtyRects.clear();
-			addDirtyRect(Common::Rect(0, 0, this->w, this->h));
-			events.delay(5);
+			// Ensure there's a full screen dirty rect for the next frame update
+			if (_dirtyRects.empty())
+				addDirtyRect(Common::Rect(0, 0, this->w, this->h));
+			
+			events.pollEvents();
+			events.delay(1);
 		}
 	}
 
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 0c0175d2ed..78ccffc575 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -42,6 +42,7 @@ private:
 	SherlockEngine *_vm;
 	int _fontNumber;
 	Common::List<Common::Rect> _dirtyRects;
+	uint32 _transitionSeed;
 
 	void mergeDirtyRects();
 
-- 
cgit v1.2.3


From 4009305070f3f8a1a718526b3e00fc9902a9d87e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 18 Mar 2015 20:29:50 -0400
Subject: MADS: Hook up ScummVM volume control

---
 engines/mads/mads.cpp                  |  7 +++++++
 engines/mads/nebular/sound_nebular.cpp | 37 +++++++++++++++++++++-------------
 engines/mads/nebular/sound_nebular.h   |  8 +++++++-
 engines/mads/sound.cpp                 | 15 ++++++++++++--
 engines/mads/sound.h                   |  6 ++++++
 5 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 59d600fbfb..374e373035 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -126,6 +126,13 @@ void MADSEngine::loadOptions() {
 		if (ConfMan.hasKey("NaughtyMode"))
 			_game->setNaughtyMode(ConfMan.getBool("NaughtyMode"));
 	}
+
+	// Note: MADS is weird in that sfx and music are handled by the same driver,
+	// and the game scripts themselves check for music being enabled before playing
+	// a "music" sound. Which means we can independantly mute music in ScummVM, but
+	// otherwise all sound, music and sfx, is controlled by the SFX volume slider.
+	int soundVolume = MIN(255, ConfMan.getInt("sfx_volume"));
+	_sound->setVolume(soundVolume);
 }
 
 void MADSEngine::saveOptions() {
diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 6412654fd6..9716e6d522 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -44,6 +44,7 @@ AdlibChannel::AdlibChannel() {
 	_field4 = 0;
 	_sampleIndex = 0;
 	_volume = 0;
+	_volumeOffset = 0;
 	_field7 = 0;
 	_field8 = 0;
 	_field9 = 0;
@@ -61,7 +62,6 @@ AdlibChannel::AdlibChannel() {
 	_field19 = 0;
 	_soundData = nullptr;
 	_field1D = 0;
-	_field1E = 0;
 	_field1F = 0;
 
 	_field20 = 0;
@@ -97,6 +97,7 @@ void AdlibChannel::setPtr2(byte *pData) {
 void AdlibChannel::load(byte *pData) {
 	_ptr1 = _pSrc = _ptr3 = pData;
 	_ptr4 = _soundData = pData;
+	_volumeOffset = 0;
 	_fieldA = 0xFF;
 	_activeCount = 1;
 	_fieldD = 64;
@@ -104,7 +105,7 @@ void AdlibChannel::load(byte *pData) {
 	_field1F = 0;
 	_field2 = _field3 = 0;
 	_volume = _field7 = 0;
-	_field1D = _field1E = 0;
+	_field1D = 0;
 	_fieldE = 0;
 	_field9 = 0;
 	_fieldB = 0;
@@ -117,7 +118,7 @@ void AdlibChannel::load(byte *pData) {
 
 void AdlibChannel::check(byte *nullPtr) {
 	if (_activeCount && _fieldE) {
-		if (!_field1E) {
+		if (!_volumeOffset) {
 			_pSrc = nullPtr;
 			_fieldE = 0;
 		} else {
@@ -166,6 +167,7 @@ ASound::ASound(Audio::Mixer *mixer, FM_OPL *opl, const Common::String &filename,
 	_samplePtr = nullptr;
 	_frameCounter = 0;
 	_isDisabled = false;
+	_masterVolume = 255;
 	_v1 = 0;
 	_v2 = 0;
 	_activeChannelNumber = 0;
@@ -540,7 +542,7 @@ void ASound::pollActiveChannel() {
 						chan->_field1 = 0;
 						chan->_field2 = chan->_field3 = 0;
 						chan->_volume = chan->_field7 = 0;
-						chan->_field1D = chan->_field1E = 0;
+						chan->_field1D = chan->_volumeOffset = 0;
 						chan->_field8 = 0;
 						chan->_field9 = 0;
 						chan->_fieldB = 0;
@@ -615,7 +617,7 @@ void ASound::pollActiveChannel() {
 						if (chan->_fieldE) {
 							chan->_pSrc += 2;
 						} else {
-							chan->_field1E = *pSrc >> 1;
+							chan->_volumeOffset = *pSrc >> 1;
 							updateFlag = true;
 							chan->_pSrc += 2;
 						}
@@ -659,7 +661,7 @@ void ASound::pollActiveChannel() {
 			if (!--chan->_field9) {
 				chan->_field9 = chan->_fieldA;
 				if (chan->_field2) {
-					int8 newVal = (int8)chan->_field2 + (int8)chan->_field1E;
+					int8 newVal = (int8)chan->_field2 + (int8)chan->_volumeOffset;
 					if (newVal < 0) {
 						chan->_field9 = 0;
 						newVal = 0;
@@ -668,7 +670,7 @@ void ASound::pollActiveChannel() {
 						newVal = 63;
 					}
 
-					chan->_field1E = newVal;
+					chan->_volumeOffset = newVal;
 					updateFlag = true;
 				}
 			}
@@ -755,7 +757,8 @@ static const int outputChannels[] = {
 void ASound::updateActiveChannel() {
 	int reg = 0x40 + outputChannels[outputIndexes[_activeChannelNumber * 2 + 1]];
 	int portVal = _ports[reg] & 0xFFC0;
-	int newVolume = CLIP(_activeChannelPtr->_volume + _activeChannelPtr->_field1E, 0, 63);
+	int newVolume = CLIP(_activeChannelPtr->_volume + _activeChannelPtr->_volumeOffset, 0, 63);
+	newVolume = newVolume * _masterVolume / 255;
 
 	// Note: Original had a whole block not seeming to be used, since the initialisation
 	// sets a variable to 5660h, and doesn't change it, so the branch is never taken
@@ -857,6 +860,12 @@ int ASound::readBuffer(int16 *buffer, const int numSamples) {
 	return numSamples;
 }
 
+void ASound::setVolume(int volume) {
+	_masterVolume = volume;
+	if (!volume)
+		command0();
+}
+
 int ASound::command0() {
 	bool isDisabled = _isDisabled;
 	_isDisabled = true;
@@ -1014,22 +1023,22 @@ int ASound1::command10() {
 
 int ASound1::command11() {
 	command111213();
-	_channels[0]._field1E = 0;
-	_channels[1]._field1E = 0;
+	_channels[0]._volumeOffset = 0;
+	_channels[1]._volumeOffset = 0;
 	return 0;
 }
 
 int ASound1::command12() {
 	command111213();
-	_channels[0]._field1E = 40;
-	_channels[1]._field1E = 0;
+	_channels[0]._volumeOffset = 40;
+	_channels[1]._volumeOffset = 0;
 	return 0;
 }
 
 int ASound1::command13() {
 	command111213();
-	_channels[0]._field1E = 40;
-	_channels[1]._field1E = 50;
+	_channels[0]._volumeOffset = 40;
+	_channels[1]._volumeOffset = 50;
 	return 0;
 }
 
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index cfacb211a4..d2fc552eec 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -70,7 +70,7 @@ public:
 	int _field19;
 	byte *_soundData;
 	int _field1D;
-	int _field1E;
+	int _volumeOffset;
 	int _field1F;
 
 	// TODO: Only used by asound.003. Figure out usage
@@ -146,6 +146,7 @@ class ASound : public Audio::AudioStream {
 private:
 	Common::List<CachedDataEntry> _dataCache;
 	uint16 _randomSeed;
+	int _masterVolume;
 
 	/**
 	 * Does the initial Adlib initialisation
@@ -382,6 +383,11 @@ public:
 	 * Return sample rate
 	 */
 	virtual int getRate() const { return 11025; }
+
+	/**
+	 * Set the volume
+	 */
+	void setVolume(int volume);
 };
 
 class ASound1 : public ASound {
diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index 1baa169c55..4036ee8112 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -36,6 +36,7 @@ SoundManager::SoundManager(MADSEngine *vm, Audio::Mixer *mixer) {
 	_pollSoundEnabled = false;
 	_soundPollFlag = false;
 	_newSoundsPaused = false;
+	_masterVolume = 255;
 
 	_opl = OPL::Config::create();
 	_opl->init(11025);
@@ -97,15 +98,18 @@ void SoundManager::init(int sectionNumber) {
 			break;
 		default:
 			_driver = nullptr;
-			break;
+			return;
 		}
 		break;
 
 	default:
 		warning("SoundManager: Unknown game");
 		_driver = nullptr;
-		break;
+		return;
 	}
+
+	// Set volume for newly loaded driver
+	_driver->setVolume(_masterVolume);
 }
 
 void SoundManager::closeDriver() {
@@ -141,6 +145,13 @@ void SoundManager::startQueuedCommands() {
 	}
 }
 
+void SoundManager::setVolume(int volume) {
+	_masterVolume = volume;
+
+	if (_driver)
+		_driver->setVolume(volume);
+}
+
 void SoundManager::command(int commandId, int param) {
 	if (_newSoundsPaused) {
 		if (_queuedCommands.size() < 8)
diff --git a/engines/mads/sound.h b/engines/mads/sound.h
index 72bb21a812..5884323474 100644
--- a/engines/mads/sound.h
+++ b/engines/mads/sound.h
@@ -43,6 +43,7 @@ private:
 	bool _soundPollFlag;
 	bool _newSoundsPaused;
 	Common::Queue<int> _queuedCommands;
+	int _masterVolume;
 public:
 	SoundManager(MADSEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();
@@ -78,6 +79,11 @@ public:
 	 */
 	void startQueuedCommands();
 
+	/**
+	 * Set the master volume
+	 */
+	void setVolume(int volume);
+
 	//@{
 	/**
 	 * Executes a command on the sound driver
-- 
cgit v1.2.3


From 2dc355ff6ecbbc3650beecb341ebe4415de20101 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 18 Mar 2015 22:32:41 -0400
Subject: SHERLOCK: Implement Scalpel-specific scene starting

---
 engines/sherlock/events.cpp          |  24 ++++-
 engines/sherlock/events.h            |  10 +-
 engines/sherlock/resources.cpp       |  57 +++++++----
 engines/sherlock/resources.h         |   3 +
 engines/sherlock/room.cpp            |   2 +-
 engines/sherlock/room.h              |   3 +
 engines/sherlock/scalpel/scalpel.cpp | 177 +++++++++++++++++++++++++++++++++++
 engines/sherlock/scalpel/scalpel.h   |  12 ++-
 engines/sherlock/screen.cpp          |   1 +
 engines/sherlock/screen.h            |   1 +
 engines/sherlock/sherlock.cpp        |  16 +++-
 engines/sherlock/sherlock.h          |   4 +
 engines/sherlock/sound.cpp           |  14 +++
 engines/sherlock/sound.h             |   4 +
 14 files changed, 297 insertions(+), 31 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index b2d9fc65e8..1a882eedea 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -32,7 +32,8 @@ namespace Sherlock {
 
 EventsManager::EventsManager(SherlockEngine *vm) {
 	_vm = vm;
-	_cursorId = CURSOR_NONE;
+	_cursorSprites = nullptr;
+	_cursorIndex = -1;
 	_frameCounter = 1;
 	_priorFrameTime = 0;
 	_mouseClicked = false;
@@ -40,15 +41,30 @@ EventsManager::EventsManager(SherlockEngine *vm) {
 }
 
 EventsManager::~EventsManager() {
+	delete _cursorSprites;
+}
+
+/**
+ * Load a set of cursors from the specified file
+ */
+void EventsManager::loadCursors(const Common::String &filename) {
+	hideCursor();
+	delete _cursorSprites;
+
+	_cursorSprites = new Sprite(filename);
 }
 
 /**
  * Set the cursor to show
  */
-void EventsManager::setCursor(CursorType cursorId) {
-	_cursorId = cursorId;
+void EventsManager::changeCursor(int cursorIndex) {
+	_cursorIndex = cursorIndex;
+
+	// Set the cursor data
+	Graphics::Surface &s = (*_cursorSprites)[cursorIndex];
+	CursorMan.replaceCursor(s.getPixels(), s.w, s.h, s.w / 2, s.h / 2, 0xff);
 
-	// TODO: Cursor handling
+	showCursor();
 }
 
 /**
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 4493fcdc65..1f7352eeb5 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -26,11 +26,10 @@
 #include "common/scummsys.h"
 #include "common/events.h"
 #include "common/stack.h"
+#include "sherlock/sprite.h"
 
 namespace Sherlock {
 
-enum CursorType { CURSOR_NONE = 0 };
-
 #define GAME_FRAME_RATE 60
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
@@ -42,10 +41,11 @@ private:
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
 	Common::Point _mousePos;
+	Sprite *_cursorSprites;
 
 	bool checkForNextFrameCounter();
 public:
-	CursorType _cursorId;
+	int _cursorIndex;
 	byte _mouseButtons;
 	bool _mouseClicked;
 	Common::Stack<Common::KeyState> _pendingKeys;
@@ -53,7 +53,9 @@ public:
 	EventsManager(SherlockEngine *vm);
 	~EventsManager();
 
-	void setCursor(CursorType cursorId);
+	void loadCursors(const Common::String &filename);
+
+	void changeCursor(int cursorIndex);
 
 	void showCursor();
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 47e2046084..6636ca5be8 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -41,43 +41,57 @@ bool Cache::isCached(const Common::String &filename) const {
  * If the file is LZW compressed, automatically decompresses it and loads
  * the uncompressed version into memory
  */
-void Cache::load(const Common::String &filename) {
+void Cache::load(const Common::String &name) {
 	// First check if the entry already exists
-	if (_resources.contains(filename))
+	if (_resources.contains(name))
 		return;
 
-	// Allocate a new cache entry
-	_resources[filename] = CacheEntry();
-	CacheEntry &cacheEntry = _resources[filename];
-
 	// Open the file for reading
 	Common::File f;
-	if (!f.open(filename))
-		error("Could not read file - %s", filename.c_str());
+	if (!f.open(name))
+		error("Could not read file - %s", name.c_str());
+
+	load(name, f);
+
+	f.close();
+}
+
+/**
+ * Load a cache entry based on a passed stream
+ */
+void Cache::load(const Common::String &name, Common::SeekableReadStream &stream) {
+	// First check if the entry already exists
+	if (_resources.contains(name))
+		return;
 
 	// Check whether the file is compressed
 	const char LZW_HEADER[5] = { "LZV\x1a" };
 	char header[5];
-	f.read(header, 5);
+	stream.read(header, 5);
 	bool isCompressed = !strncmp(header, LZW_HEADER, 5);
-	f.seek(0);
+	stream.seek(0);
+
+	// Allocate a new cache entry
+	_resources[name] = CacheEntry();
+	CacheEntry &cacheEntry = _resources[name];
 
 	if (isCompressed) {
 		// It's compressed, so decompress the file and store it's data in the cache entry
-		Common::SeekableReadStream *decompressed = decompressLZ(f);
+		Common::SeekableReadStream *decompressed = decompressLZ(stream);
 		cacheEntry.resize(decompressed->size());
 		decompressed->read(&cacheEntry[0], decompressed->size());
 
 		delete decompressed;
 	} else {
 		// It's not, so read the raw data of the file into the cache entry
-		cacheEntry.resize(f.size());
-		f.read(&cacheEntry[0], f.size());
+		cacheEntry.resize(stream.size());
+		stream.read(&cacheEntry[0], stream.size());
 	}
-
-	f.close();
 }
 
+/**
+ * Get a file from the cache
+ */
 Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
 	// Return a memory stream that encapsulates the data
 	const CacheEntry &cacheEntry = _resources[filename];
@@ -96,7 +110,6 @@ Resources::Resources() {
 	addToCache("portrait.lib");
 }
 
-
 /**
  * Adds the specified file to the cache. If it's a library file, takes care of
  * loading it's index for future use
@@ -113,6 +126,18 @@ void Resources::addToCache(const Common::String &filename) {
 	delete stream;
 }
 
+/**
+ * Adds a resource from a library file tot he cache
+ */
+void Resources::addToCache(const Common::String &filename, const Common::String &libFilename) {
+	// Get the resource
+	Common::SeekableReadStream *stream = load(filename, libFilename);
+
+	_cache.load(filename, *stream);
+
+	delete stream;
+}
+
 Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 	// First check if the file is directly in the cache
 	if (_cache.isCached(filename))
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index edb9bd8ba0..cd6e60c325 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -57,6 +57,7 @@ public:
 	bool isCached(const Common::String &filename) const;
 
 	void load(const Common::String &name);
+	void load(const Common::String &name, Common::SeekableReadStream &stream);
 
 	Common::SeekableReadStream *get(const Common::String &filename) const;
 };
@@ -72,6 +73,8 @@ public:
 	Resources();
 
 	void addToCache(const Common::String &filename);
+	void addToCache(const Common::String &filename, const Common::String &libFilename);
+	bool isInCache(const Common::String &filename) const { return _cache.isCached(filename); }
 
 	Common::SeekableReadStream *load(const Common::String &filename);
 
diff --git a/engines/sherlock/room.cpp b/engines/sherlock/room.cpp
index 9926899953..c06d707b40 100644
--- a/engines/sherlock/room.cpp
+++ b/engines/sherlock/room.cpp
@@ -27,8 +27,8 @@ namespace Sherlock {
 Rooms::Rooms() {
 	for (int roomNum = 0; roomNum < ROOMS_COUNT; ++roomNum)
 		Common::fill(&_stats[roomNum][0], &_stats[roomNum][9], false);
-
 	_goToRoom = -1;
+	_oldCharPoint = 0;
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/room.h b/engines/sherlock/room.h
index 75800b623a..0f2bc56a45 100644
--- a/engines/sherlock/room.h
+++ b/engines/sherlock/room.h
@@ -94,6 +94,9 @@ public:
 	bool _stats[ROOMS_COUNT][9];
 	bool _savedStats[ROOMS_COUNT][9];
 	int _goToRoom;
+	Common::Point _bigPos;
+	Common::Point _overPos;
+	int _oldCharPoint;
 public:
 	Rooms();
 };
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0e5a3bec34..d691bbd8bb 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -27,6 +27,12 @@ namespace Sherlock {
 
 namespace Scalpel {
 
+ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
+		SherlockEngine(syst, gameDesc) {
+	_tempFadeStyle = 0;
+	_chessResult = 0;
+}
+
 /**
  * Game initialization
  */
@@ -131,17 +137,188 @@ bool ScalpelEngine::showCityCutscene() {
 }
 
 bool ScalpelEngine::showAlleyCutscene() {
+	// TODO
 	return true;
 }
 
 bool ScalpelEngine::showStreetCutscene() {
+	// TODO
 	return true;
 }
 
 bool ScalpelEngine::showOfficeCutscene() {
+	// TODO
 	return true;
 }
 
+int ScalpelEngine::doChessBoard() {
+	// TODO
+	return 0;
+}
+
+void ScalpelEngine::playDarts() {
+	// TODO
+}
+
+/**
+ * Starting a scene within the game
+ */
+void ScalpelEngine::startScene() {
+	if (_rooms->_goToRoom == 100 || _rooms->_goToRoom == 98) {
+		// Chessboard selection
+		if (_sound->_musicEnabled) {
+			if (_sound->loadSong(100)) {
+				if (_sound->_music)
+					_sound->startSong();
+			}
+		}
+
+		_rooms->_goToRoom = doChessBoard();
+
+		_sound->freeSong();
+		_hsavedPos = Common::Point(-1, -1);
+		_hsavedFs = -1;
+	}
+
+	// Some rooms are prologue cutscenes, rather than normal game scenes. These are:
+	//  2: Blackwood's capture
+	// 52: Rescuing Anna
+	// 53: Moorehead's death / subway train
+	// 55: Fade out and exit 
+	// 70: Brumwell suicide
+	switch (_rooms->_goToRoom) {
+	case 2:
+	case 52:
+	case 53:
+	case 70:
+		if (_sound->_musicEnabled && _sound->loadSong(_rooms->_goToRoom)) {
+			if (_sound->_music)
+				_sound->startSong();
+		}
+
+		switch (_rooms->_goToRoom) {
+		case 2:
+			// Blackwood's capture
+			_res->addToCache("final2.vda", "epilogue.lib");
+			_res->addToCache("final2.vdx", "epilogue.lib");
+			_animation->playPrologue("final1", 1, 3, true, 4);
+			_animation->playPrologue("final22", 1, 0, false, 4);
+			break;
+
+		case 52:
+			// Rescuing Anna
+			_res->addToCache("finalr2.vda", "epilogue.lib");
+			_res->addToCache("finalr2.vdx", "epilogue.lib");
+			_res->addToCache("finale1.vda", "epilogue.lib");
+			_res->addToCache("finale1.vdx", "epilogue.lib");
+			_res->addToCache("finale2.vda", "epilogue.lib");
+			_res->addToCache("finale2.vdx", "epilogue.lib");
+			_res->addToCache("finale3.vda", "epilogue.lib");
+			_res->addToCache("finale3.vdx", "epilogue.lib");
+			_res->addToCache("finale4.vda", "EPILOG2.lib");
+			_res->addToCache("finale4.vdx", "EPILOG2.lib");
+
+			_animation->playPrologue("finalr1", 1, 3, true, 4);
+			_animation->playPrologue("finalr2", 1, 0, false, 4);
+
+			if (!_res->isInCache("finale2.vda")) {
+				// Finale file isn't cached
+				_res->addToCache("finale2.vda", "epilogue.lib");
+				_res->addToCache("finale2.vdx", "epilogue.lib");
+				_res->addToCache("finale3.vda", "epilogue.lib");
+				_res->addToCache("finale3.vdx", "epilogue.lib");
+				_res->addToCache("finale4.vda", "EPILOG2.lib");
+				_res->addToCache("finale4.vdx", "EPILOG2.lib");
+			}
+
+			_animation->playPrologue("finale1", 1, 0, false, 4);
+			_animation->playPrologue("finale2", 1, 0, false, 4);
+			_animation->playPrologue("finale3", 1, 0, false, 4);
+
+			_useEpilogue2 = true;
+			_animation->playPrologue("finale4", 1, 0, false, 4);
+			_useEpilogue2 = false;
+			break;
+
+		case 53:
+			// Moorehead's death / subway train
+			_res->addToCache("SUBWAY2.vda", "epilogue.lib");
+			_res->addToCache("SUBWAY2.vdx", "epilogue.lib");
+			_res->addToCache("SUBWAY3.vda", "epilogue.lib");
+			_res->addToCache("SUBWAY3.vdx", "epilogue.lib");
+
+			_animation->playPrologue("SUBWAY1", 1, 3, true, 4);
+			_animation->playPrologue("SUBWAY2", 1, 0, false, 4);
+			_animation->playPrologue("SUBWAY3", 1, 0, false, 4);
+
+			// Set fading to direct fade temporary so the transition goes quickly.
+			_tempFadeStyle = _screen->_fadeStyle ? 257 : 256;
+			_screen->_fadeStyle = false;
+			break;
+
+		case 70:
+			// Brumwell suicide
+			_animation->playPrologue("suicid", 1, 3, true, 4);
+			break;
+		default:
+			break;
+		}
+
+		// Except for the Moorehead Murder scene, fade to black first
+		if (_rooms->_goToRoom != 53) {
+			_events->wait(40);
+			_screen->fadeToBlack(3);
+		}
+
+		switch (_rooms->_goToRoom) {
+		case 52:
+			_rooms->_goToRoom = 27;			// Go to the Lawyer's Office
+			_rooms->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_rooms->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
+			_rooms->_oldCharPoint = 27;
+			break;
+
+		case 53:
+			_rooms->_goToRoom = 17;			// Go to St. Pancras Station
+			_rooms->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_rooms->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
+			_rooms->_oldCharPoint = 17;
+			break;
+
+		default:
+			_rooms->_goToRoom = 4;			// Back to Baker st.
+			_rooms->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_rooms->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
+			_rooms->_oldCharPoint = 4;
+			break;
+		}
+
+		// Free any song from the previous scene
+		_sound->freeSong();
+		break;
+
+	case 55:
+		// Exit game
+		_screen->fadeToBlack(3);
+		quitGame();
+		return;
+
+	default:
+		break;
+	}
+
+	_events->loadCursors("rmouse.vgs");
+	_events->changeCursor(0);
+
+	if (_rooms->_goToRoom == 99) {
+		// Chess Board
+		playDarts();
+		_chessResult = _rooms->_goToRoom = 19;	// Go back to the bar
+	}
+
+	_chessResult = _rooms->_goToRoom;
+}
+
 } // End of namespace Scalpel
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 584bd78a20..83510064fa 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -31,17 +31,25 @@ namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
 private:
+	int _tempFadeStyle;
+	int _chessResult;
+
 	bool showCityCutscene();
 	bool showAlleyCutscene();
 	bool showStreetCutscene();
 	bool showOfficeCutscene();
+
+	int doChessBoard();
+
+	void playDarts();
 protected:
 	virtual void initialize();
 
 	virtual void showOpening();
+
+	virtual void startScene();
 public:
-	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
-		SherlockEngine(syst, gameDesc) {}
+	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~ScalpelEngine() {}
 };
 
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 7a4d4863ac..0ec5df9c4c 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -31,6 +31,7 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 		_backBuffer(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
 		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
 	_transitionSeed = 1;
+	_fadeStyle = false;
 	setFont(1);
 }
 
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 78ccffc575..05fd80a8b7 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -51,6 +51,7 @@ protected:
 	virtual void addDirtyRect(const Common::Rect &r);
 public:
 	Surface _backBuffer, _backBuffer2;
+	bool _fadeStyle;
 public:
 	Screen(SherlockEngine *vm);
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index add24cba9f..907f0a5a16 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -40,9 +40,10 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_sound = nullptr;
 	_talk = nullptr;
 	_useEpilogue2 = false;
+	_hsavedPos = Common::Point(-1, -1);
+	_hsavedFs = -1;
 }
 
-
 SherlockEngine::~SherlockEngine() {
 	delete _animation;
 	delete _debugger;
@@ -73,11 +74,11 @@ void SherlockEngine::initialize() {
 	_midi->setNativeMT32(native_mt32);
 	*/
 
+	_res = new Resources();
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_journal = new Journal();
-	_res = new Resources();
 	_rooms = new Rooms();
 	_screen = new Screen(this);
 	_sound = new Sound(this);
@@ -90,8 +91,15 @@ Common::Error SherlockEngine::run() {
 
 	showOpening();
 
-	// TODO: Rest of game
-	
+	while (!shouldQuit()) {
+		// Prepare for scene, and handle any game-specific scenes
+		startScene();
+
+		// TODO: Implement game and remove this dummy loop
+		while (!shouldQuit())
+			_events->pollEventsAndWait();
+	}
+
 	return Common::kNoError;
 }
 
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index cedc57a9f8..7906417d7e 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -69,6 +69,8 @@ protected:
 	virtual void initialize();
 
 	virtual void showOpening() = 0;
+
+	virtual void startScene() {}
 public:
 	const SherlockGameDescription *_gameDescription;
 	Animation *_animation;
@@ -85,6 +87,8 @@ public:
 	Common::String _soundOverride;
 	Common::String _titleOverride;
 	bool _useEpilogue2;
+	Common::Point _hsavedPos;
+	int _hsavedFs;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 0957315a35..efc1965637 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -29,6 +29,7 @@ Sound::Sound(SherlockEngine *vm): _vm(vm) {
 	_musicEnabled = true;
 	_voicesEnabled = true;
 	_playingEpilogue = false;
+	_music = false;
 }
 
 void Sound::playSound(const Common::String &name, WaitType waitType) {
@@ -59,5 +60,18 @@ void Sound::stopMusic() {
 	// TODO
 }
 
+int Sound::loadSong(int songNumber) {
+	// TODO
+	return 0;
+}
+
+void Sound::startSong() {
+	// TODO
+}
+
+void Sound::freeSong() {
+	// TODO
+}
+
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 7775016c94..442e908838 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -42,6 +42,7 @@ public:
 	bool _musicEnabled;
 	bool _voicesEnabled;
 	bool _playingEpilogue;
+	bool _music;
 public:
 	Sound(SherlockEngine *vm);
 
@@ -50,6 +51,9 @@ public:
 	void playCachedSound(int index);
 	void clearCache();
 	void stopSound();
+	int loadSong(int songNumber);
+	void startSong();
+	void freeSong();
 	
 	void playMusic(const Common::String &name);
 	void stopMusic();
-- 
cgit v1.2.3


From 5a7ea9318d54bd725dd2493277dc0daf17f8abb4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 18 Mar 2015 23:01:47 -0400
Subject: SHERLOCK: Refactor Rooms to Scene, added skeletons for Chess and
 Darts

---
 engines/sherlock/debugger.cpp        |   2 +-
 engines/sherlock/module.mk           |   4 +-
 engines/sherlock/room.cpp            |  34 -----------
 engines/sherlock/room.h              | 106 -----------------------------------
 engines/sherlock/scalpel/chess.cpp   |  37 ++++++++++++
 engines/sherlock/scalpel/chess.h     |  45 +++++++++++++++
 engines/sherlock/scalpel/darts.cpp   |  36 ++++++++++++
 engines/sherlock/scalpel/darts.h     |  45 +++++++++++++++
 engines/sherlock/scalpel/scalpel.cpp |  69 ++++++++++++-----------
 engines/sherlock/scalpel/scalpel.h   |  10 ++--
 engines/sherlock/scene.cpp           |  41 ++++++++++++++
 engines/sherlock/scene.h             |  55 ++++++++++++++++++
 engines/sherlock/sherlock.cpp        |   8 ++-
 engines/sherlock/sherlock.h          |   4 +-
 14 files changed, 310 insertions(+), 186 deletions(-)
 delete mode 100644 engines/sherlock/room.cpp
 delete mode 100644 engines/sherlock/room.h
 create mode 100644 engines/sherlock/scalpel/chess.cpp
 create mode 100644 engines/sherlock/scalpel/chess.h
 create mode 100644 engines/sherlock/scalpel/darts.cpp
 create mode 100644 engines/sherlock/scalpel/darts.h
 create mode 100644 engines/sherlock/scene.cpp
 create mode 100644 engines/sherlock/scene.h

diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
index 50300322ef..1e0716c3d3 100644
--- a/engines/sherlock/debugger.cpp
+++ b/engines/sherlock/debugger.cpp
@@ -51,7 +51,7 @@ bool Debugger::cmd_scene(int argc, const char **argv) {
 		debugPrintf("Format: scene <room>\n");
 		return true;
 	} else {
-		_vm->_rooms->_goToRoom = strToInt(argv[1]);
+		_vm->_scene->_goToRoom = strToInt(argv[1]);
 		return false;
 	}
 }
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 06186f1504..eef27aa0b1 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -1,6 +1,8 @@
 MODULE := engines/sherlock
 
 MODULE_OBJS = \
+	scalpel/chess.o \
+	scalpel/darts.o \
 	scalpel/scalpel.o \
 	tattoo/tattoo.o \
 	animation.o \
@@ -11,7 +13,7 @@ MODULE_OBJS = \
 	graphics.o \
 	journal.o \
 	resources.o \
-	room.o \
+	scene.o \
 	screen.o \
 	sherlock.o \
 	sound.o \
diff --git a/engines/sherlock/room.cpp b/engines/sherlock/room.cpp
deleted file mode 100644
index c06d707b40..0000000000
--- a/engines/sherlock/room.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/room.h"
-
-namespace Sherlock {
-
-Rooms::Rooms() {
-	for (int roomNum = 0; roomNum < ROOMS_COUNT; ++roomNum)
-		Common::fill(&_stats[roomNum][0], &_stats[roomNum][9], false);
-	_goToRoom = -1;
-	_oldCharPoint = 0;
-}
-
-} // End of namespace Sherlock
diff --git a/engines/sherlock/room.h b/engines/sherlock/room.h
deleted file mode 100644
index 0f2bc56a45..0000000000
--- a/engines/sherlock/room.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_ROOM_H
-#define SHERLOCK_ROOM_H
-
-#include "common/scummsys.h"
-#include "sherlock/sprite.h"
-
-namespace Sherlock {
-
-#define ROOMS_COUNT 63
-
-/*
-struct RoomBounds {
-	int x, y, width, height;
-};
-
-struct BgshapeSub {
-	uint16 value;
-};
-
-struct Bgshape {
-	char name[12];
-	char description[41];
-	char *textBufferPtr;
-	byte *seqBufPtr;
-	Sprite *sprite;
-	SpriteFrame *spriteFrame;
-	byte byte05;
-	byte seqBigCountFlag;
-	int16 seqIndex;
-	int16 canimIndex;
-	int16 x, y;
-	int16 xIncr, yIncr,
-	uint16 status;
-	int16 x2, y2;
-	int16 width2, height2;
-	uint16 word02;
-	uint16 word03;
-	byte flag;
-	byte itemValue;
-	uint16 word01;
-	uint16 word05;
-	uint16 stringIndex;
-	int16 width, height;
-	uint16 word04;
-	byte flagsAndIndex;
-	uint16 frameCount;
-	byte spriteFlags;
-	char string1[50];
-	byte byte07;
-	byte byte01;
-	byte byte02;
-	int16 boundsX, boundsY;
-	byte direction;
-	byte animIndex;
-	char string2[50];
-	byte byte06;
-	byte seqByte;
-	uint16 textBufferOfs;
-	byte byte03;
-	uint16 framesCopyCount;
-	byte byte08;
-	char string3[51];
-	uint16 word06;
-	uint16 word07;
-	uint16 word08;
-	uint16 word09;
-	BgshapeSub subItems[4];
-};
-*/
-class Rooms {
-public:
-	bool _stats[ROOMS_COUNT][9];
-	bool _savedStats[ROOMS_COUNT][9];
-	int _goToRoom;
-	Common::Point _bigPos;
-	Common::Point _overPos;
-	int _oldCharPoint;
-public:
-	Rooms();
-};
-
-} // End of namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/scalpel/chess.cpp b/engines/sherlock/scalpel/chess.cpp
new file mode 100644
index 0000000000..95c662dd01
--- /dev/null
+++ b/engines/sherlock/scalpel/chess.cpp
@@ -0,0 +1,37 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scalpel/chess.h"
+#include "sherlock/scalpel/scalpel.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+int Chess::doChessBoard() {
+	// TODO
+	return 0;
+}
+
+} // End of namespace Scalpel
+
+} // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/chess.h b/engines/sherlock/scalpel/chess.h
new file mode 100644
index 0000000000..70607472c2
--- /dev/null
+++ b/engines/sherlock/scalpel/chess.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_CHESS_H
+#define SHERLOCK_CHESS_H
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+class ScalpelEngine;
+
+class Chess {
+private:
+	ScalpelEngine *_vm;
+public:
+	Chess(ScalpelEngine *vm) : _vm(vm) {}
+
+	int doChessBoard();
+};
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
new file mode 100644
index 0000000000..857ac63f8c
--- /dev/null
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scalpel/darts.h"
+#include "sherlock/scalpel/scalpel.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+void Darts::playDarts() {
+	// TODO
+}
+
+} // End of namespace Scalpel
+
+} // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
new file mode 100644
index 0000000000..22164156c9
--- /dev/null
+++ b/engines/sherlock/scalpel/darts.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_DARTS_H
+#define SHERLOCK_DARTS_H
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+class ScalpelEngine;
+
+class Darts {
+private:
+	ScalpelEngine *_vm;
+public:
+	Darts(ScalpelEngine *vm) : _vm(vm) {}
+
+	void playDarts();
+};
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index d691bbd8bb..d5f63b9c0d 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -29,22 +29,32 @@ namespace Scalpel {
 
 ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {
+	_chess = nullptr;
+	_darts = nullptr;
 	_tempFadeStyle = 0;
 	_chessResult = 0;
 }
 
+ScalpelEngine::~ScalpelEngine() {
+	delete _chess;
+	delete _darts;
+}
+
 /**
  * Game initialization
  */
 void ScalpelEngine::initialize() {
 	SherlockEngine::initialize();
 
+	_chess = new Chess(this);
+	_darts = new Darts(this);
+
 	_flags.resize(100 * 8);
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
-	// Starting room
-	_rooms->_goToRoom = 4;
+	// Starting scene
+	_scene->_goToRoom = 4;
 }
 
 /**
@@ -151,20 +161,11 @@ bool ScalpelEngine::showOfficeCutscene() {
 	return true;
 }
 
-int ScalpelEngine::doChessBoard() {
-	// TODO
-	return 0;
-}
-
-void ScalpelEngine::playDarts() {
-	// TODO
-}
-
 /**
  * Starting a scene within the game
  */
 void ScalpelEngine::startScene() {
-	if (_rooms->_goToRoom == 100 || _rooms->_goToRoom == 98) {
+	if (_scene->_goToRoom == 100 || _scene->_goToRoom == 98) {
 		// Chessboard selection
 		if (_sound->_musicEnabled) {
 			if (_sound->loadSong(100)) {
@@ -173,7 +174,7 @@ void ScalpelEngine::startScene() {
 			}
 		}
 
-		_rooms->_goToRoom = doChessBoard();
+		_scene->_goToRoom = _chess->doChessBoard();
 
 		_sound->freeSong();
 		_hsavedPos = Common::Point(-1, -1);
@@ -186,17 +187,17 @@ void ScalpelEngine::startScene() {
 	// 53: Moorehead's death / subway train
 	// 55: Fade out and exit 
 	// 70: Brumwell suicide
-	switch (_rooms->_goToRoom) {
+	switch (_scene->_goToRoom) {
 	case 2:
 	case 52:
 	case 53:
 	case 70:
-		if (_sound->_musicEnabled && _sound->loadSong(_rooms->_goToRoom)) {
+		if (_sound->_musicEnabled && _sound->loadSong(_scene->_goToRoom)) {
 			if (_sound->_music)
 				_sound->startSong();
 		}
 
-		switch (_rooms->_goToRoom) {
+		switch (_scene->_goToRoom) {
 		case 2:
 			// Blackwood's capture
 			_res->addToCache("final2.vda", "epilogue.lib");
@@ -265,31 +266,31 @@ void ScalpelEngine::startScene() {
 		}
 
 		// Except for the Moorehead Murder scene, fade to black first
-		if (_rooms->_goToRoom != 53) {
+		if (_scene->_goToRoom != 53) {
 			_events->wait(40);
 			_screen->fadeToBlack(3);
 		}
 
-		switch (_rooms->_goToRoom) {
+		switch (_scene->_goToRoom) {
 		case 52:
-			_rooms->_goToRoom = 27;			// Go to the Lawyer's Office
-			_rooms->_bigPos = Common::Point(0, 0);	// Overland scroll position
-			_rooms->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
-			_rooms->_oldCharPoint = 27;
+			_scene->_goToRoom = 27;			// Go to the Lawyer's Office
+			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_scene->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
+			_scene->_oldCharPoint = 27;
 			break;
 
 		case 53:
-			_rooms->_goToRoom = 17;			// Go to St. Pancras Station
-			_rooms->_bigPos = Common::Point(0, 0);	// Overland scroll position
-			_rooms->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
-			_rooms->_oldCharPoint = 17;
+			_scene->_goToRoom = 17;			// Go to St. Pancras Station
+			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_scene->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
+			_scene->_oldCharPoint = 17;
 			break;
 
 		default:
-			_rooms->_goToRoom = 4;			// Back to Baker st.
-			_rooms->_bigPos = Common::Point(0, 0);	// Overland scroll position
-			_rooms->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
-			_rooms->_oldCharPoint = 4;
+			_scene->_goToRoom = 4;			// Back to Baker st.
+			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_scene->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
+			_scene->_oldCharPoint = 4;
 			break;
 		}
 
@@ -310,13 +311,13 @@ void ScalpelEngine::startScene() {
 	_events->loadCursors("rmouse.vgs");
 	_events->changeCursor(0);
 
-	if (_rooms->_goToRoom == 99) {
+	if (_scene->_goToRoom == 99) {
 		// Chess Board
-		playDarts();
-		_chessResult = _rooms->_goToRoom = 19;	// Go back to the bar
+		_darts->playDarts();
+		_chessResult = _scene->_goToRoom = 19;	// Go back to the bar
 	}
 
-	_chessResult = _rooms->_goToRoom;
+	_chessResult = _scene->_goToRoom;
 }
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 83510064fa..b096599ee1 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -24,6 +24,8 @@
 #define SHERLOCK_SCALPEL_H
 
 #include "sherlock/sherlock.h"
+#include "sherlock/scalpel/chess.h"
+#include "sherlock/scalpel/darts.h"
 
 namespace Sherlock {
 
@@ -31,6 +33,8 @@ namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
 private:
+	Chess *_chess;
+	Darts *_darts;
 	int _tempFadeStyle;
 	int _chessResult;
 
@@ -38,10 +42,6 @@ private:
 	bool showAlleyCutscene();
 	bool showStreetCutscene();
 	bool showOfficeCutscene();
-
-	int doChessBoard();
-
-	void playDarts();
 protected:
 	virtual void initialize();
 
@@ -50,7 +50,7 @@ protected:
 	virtual void startScene();
 public:
 	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
-	virtual ~ScalpelEngine() {}
+	virtual ~ScalpelEngine();
 };
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
new file mode 100644
index 0000000000..de351a5561
--- /dev/null
+++ b/engines/sherlock/scene.cpp
@@ -0,0 +1,41 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scene.h"
+
+namespace Sherlock {
+
+Scene::Scene(SherlockEngine *vm): _vm(vm) {
+	for (int idx = 0; idx < SCENES_COUNT; ++idx)
+		Common::fill(&_stats[idx][0], &_stats[idx][9], false);
+	_goToRoom = -1;
+	_oldCharPoint = 0;
+	_numExits = 0;
+
+	_controlSprites = new Sprite("menu.all");
+}
+
+Scene::~Scene() {
+	delete _controlSprites;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
new file mode 100644
index 0000000000..031245b122
--- /dev/null
+++ b/engines/sherlock/scene.h
@@ -0,0 +1,55 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCENE_H
+#define SHERLOCK_SCENE_H
+
+#include "common/scummsys.h"
+#include "sherlock/sprite.h"
+
+namespace Sherlock {
+
+#define SCENES_COUNT 63
+
+class SherlockEngine;
+
+class Scene {
+private:
+	SherlockEngine *_vm;
+public:
+	bool _stats[SCENES_COUNT][9];
+	bool _savedStats[SCENES_COUNT][9];
+	int _goToRoom;
+	Common::Point _bigPos;
+	Common::Point _overPos;
+	int _oldCharPoint;
+	Sprite *_controlSprites;
+	int _numExits;
+public:
+	Scene(SherlockEngine *vm);
+
+	~Scene();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 907f0a5a16..8b597df31b 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -35,7 +35,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_events = nullptr;
 	_journal = nullptr;
 	_res = nullptr;
-	_rooms = nullptr;
+	_scene = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
 	_talk = nullptr;
@@ -50,7 +50,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _events;
 	delete _journal;
 	delete _res;
-	delete _rooms;
+	delete _scene;
 	delete _screen;
 	delete _sound;
 	delete _talk;
@@ -79,7 +79,7 @@ void SherlockEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_journal = new Journal();
-	_rooms = new Rooms();
+	_scene = new Scene(this);
 	_screen = new Screen(this);
 	_sound = new Sound(this);
 	_talk = new Talk();
@@ -94,6 +94,8 @@ Common::Error SherlockEngine::run() {
 	while (!shouldQuit()) {
 		// Prepare for scene, and handle any game-specific scenes
 		startScene();
+		if (shouldQuit())
+			break;
 
 		// TODO: Implement game and remove this dummy loop
 		while (!shouldQuit())
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 7906417d7e..c6023684b4 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -36,7 +36,7 @@
 #include "sherlock/events.h"
 #include "sherlock/journal.h"
 #include "sherlock/resources.h"
-#include "sherlock/room.h"
+#include "sherlock/scene.h"
 #include "sherlock/screen.h"
 #include "sherlock/sound.h"
 #include "sherlock/talk.h"
@@ -78,7 +78,7 @@ public:
 	EventsManager *_events;
 	Journal *_journal;
 	Resources *_res;
-	Rooms *_rooms;
+	Scene *_scene;
 	Screen *_screen;
 	Sound *_sound;
 	Talk *_talk;
-- 
cgit v1.2.3


From 55a94d8fd4bc79c088ecb191f7e639996c6e5127 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 19 Mar 2015 20:07:01 +0100
Subject: SCI: added workaround for LSL2/Amiga bug #6818

was bug in script (amiga exclusive)
---
 engines/sci/engine/workarounds.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index c5730b5345..ed45e294a2 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -268,6 +268,7 @@ const SciWorkaroundEntry kDirLoop_workarounds[] = {
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kDisposeScript_workarounds[] = {
 	{ GID_LAURABOW,      777,   777,  0,             "myStab", "changeState",    -1,    0, { WORKAROUND_IGNORE,    0 } }, // DEMO: after the will is signed, parameter 0 is an object - bug #4967
+	{ GID_LSL2,           -1,    54,  0,               "rm54", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // Amiga: room 55, script tries to kDisposeScript an object (does not happen for DOS) - bug #6818
 	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
 	{ GID_SQ4,           150,   151,  0,        "fightScript", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object
 	{ GID_SQ4,           150,   152,  0,       "driveCloseUp", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object
-- 
cgit v1.2.3


From e73faeee681a904751db28456a1320b74232ce43 Mon Sep 17 00:00:00 2001
From: sylvaintv
Date: Thu, 19 Mar 2015 21:42:08 +0100
Subject: TOON: Add options menu

- Add options menu when pressing F1
- Add in-game font change
---
 engines/toon/anim.cpp      |  28 ++--
 engines/toon/character.cpp |   5 +
 engines/toon/font.cpp      |   6 +-
 engines/toon/toon.cpp      | 362 ++++++++++++++++++++++++++++++++++++++++++++-
 engines/toon/toon.h        |   4 +
 5 files changed, 381 insertions(+), 24 deletions(-)

diff --git a/engines/toon/anim.cpp b/engines/toon/anim.cpp
index ec23fea186..4788ba61a9 100644
--- a/engines/toon/anim.cpp
+++ b/engines/toon/anim.cpp
@@ -150,10 +150,12 @@ void Animation::drawFrame(Graphics::Surface &surface, int32 frame, int16 xx, int
 	if (_numFrames == 0)
 		return;
 
+	int16 dataFrame = frame;
+
 	if (_frames[frame]._ref != -1)
-		frame = _frames[frame]._ref;
+		dataFrame = _frames[frame]._ref;
 
-	if (!_frames[frame]._data)
+	if (!_frames[dataFrame]._data)
 		return;
 
 	int16 rectX = _frames[frame]._x2 - _frames[frame]._x1;
@@ -194,7 +196,7 @@ void Animation::drawFrame(Graphics::Surface &surface, int32 frame, int16 xx, int
 		return;
 
 	int32 destPitch = surface.pitch;
-	uint8 *srcRow = _frames[frame]._data + offsX + (_frames[frame]._x2 - _frames[frame]._x1) * offsY;
+	uint8 *srcRow = _frames[dataFrame]._data + offsX + (_frames[frame]._x2 - _frames[frame]._x1) * offsY;
 	uint8 *curRow = (uint8 *)surface.getBasePtr(xx + _x1 + _frames[frame]._x1 + offsX, yy + _frames[frame]._y1 + _y1 + offsY);
 	for (int16 y = 0; y < rectY; y++) {
 		uint8 *cur = curRow;
@@ -216,8 +218,12 @@ void Animation::drawFrameWithMask(Graphics::Surface &surface, int32 frame, int16
 
 void Animation::drawFrameWithMaskAndScale(Graphics::Surface &surface, int32 frame, int16 xx, int16 yy, int32 zz, Picture *mask, int32 scale) {
 	debugC(5, kDebugAnim, "drawFrameWithMaskAndScale(surface, %d, %d, %d, %d, mask, %d)", frame, xx, yy, zz, scale);
+	
+	int16 dataFrame = frame;
+
 	if (_frames[frame]._ref != -1)
-		frame = _frames[frame]._ref;
+		dataFrame = _frames[frame]._ref;
+
 	int16 rectX = _frames[frame]._x2 - _frames[frame]._x1;
 	int16 rectY = _frames[frame]._y2 - _frames[frame]._y1;
 
@@ -235,7 +241,7 @@ void Animation::drawFrameWithMaskAndScale(Graphics::Surface &surface, int32 fram
 
 	int32 destPitch = surface.pitch;
 	int32 destPitchMask = mask->getWidth();
-	uint8 *c = _frames[frame]._data;
+	uint8 *c = _frames[dataFrame]._data;
 	uint8 *curRow = (uint8 *)surface.getPixels();
 	uint8 *curRowMask = mask->getDataPtr();
 
@@ -287,9 +293,6 @@ int16 Animation::getFrameWidth(int32 frame) {
 	if ((frame < 0) || (frame >= _numFrames))
 		return 0;
 
-	if (_frames[frame]._ref != -1)
-		frame = _frames[frame]._ref;
-
 	return _frames[frame]._x2 - _frames[frame]._x1;
 }
 
@@ -298,9 +301,6 @@ int16 Animation::getFrameHeight(int32 frame) {
 	if (frame < 0 || frame >= _numFrames)
 		return 0;
 
-	if (_frames[frame]._ref != -1)
-		frame = _frames[frame]._ref;
-
 	return _frames[frame]._y2 - _frames[frame]._y1;
 }
 
@@ -323,8 +323,10 @@ void Animation::drawFontFrame(Graphics::Surface &surface, int32 frame, int16 xx,
 	if (_numFrames == 0)
 		return;
 
+	int16 dataFrame = frame;
+
 	if (_frames[frame]._ref != -1)
-		frame = _frames[frame]._ref;
+		dataFrame = _frames[frame]._ref;
 
 	int16 rectX = _frames[frame]._x2 - _frames[frame]._x1;
 	int16 rectY = _frames[frame]._y2 - _frames[frame]._y1;
@@ -345,7 +347,7 @@ void Animation::drawFontFrame(Graphics::Surface &surface, int32 frame, int16 xx,
 		return;
 
 	int32 destPitch = surface.pitch;
-	uint8 *c = _frames[frame]._data;
+	uint8 *c = _frames[dataFrame]._data;
 	uint8 *curRow = (uint8 *)surface.getBasePtr(xx + _x1 + _frames[frame]._x1, yy + _frames[frame]._y1 + _y1);
 	for (int16 y = 0; y < rectY; y++) {
 		unsigned char *cur = curRow;
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 686fe99beb..3d7beeeafe 100644
--- a/engines/toon/character.cpp
+++ b/engines/toon/character.cpp
@@ -226,6 +226,11 @@ bool Character::walkTo(int16 newPosX, int16 newPosY) {
 					}
 
 					setFacing(getFacingFromDirection(smoothDx, smoothDy));
+					if (_currentWalkStamp != localWalkStamp) {
+						// another walkTo was started in setFacing, we need to cancel this one.
+						return false;
+					}
+
 					playWalkAnim(0, 0);
 				}
 
diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp
index ab941e5de9..9b08e432fc 100644
--- a/engines/toon/font.cpp
+++ b/engines/toon/font.cpp
@@ -99,7 +99,7 @@ void FontRenderer::renderText(int16 x, int16 y, const Common::String &origText,
 		} else {
 			curChar = textToFont(curChar);
 			_currentFont->drawFontFrame(_vm->getMainSurface(), curChar, curX, curY, _currentFontColor);
-			curX = curX + _currentFont->getFrameWidth(curChar) - 1;
+			curX = curX + MAX<int32>(_currentFont->getFrameWidth(curChar) - 2, 0);
 			height = MAX<int32>(height, _currentFont->getFrameHeight(curChar));
 		}
 		text++;
@@ -138,8 +138,8 @@ void FontRenderer::computeSize(const Common::String &origText, int16 *retX, int1
 			// really tell how far it will stick out. For now,
 			// assume we only need to take the lower bound into
 			// consideration.
-			Common::Rect charRect = _currentFont->getFrameRect(curChar);
-			lastLineHeight = MAX(lastLineHeight, charRect.bottom);
+			//Common::Rect charRect = _currentFont->getFrameRect(curChar);
+			lastLineHeight = MAX(lastLineHeight, _currentFont->getHeight());
 		}
 		text++;
 	}
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 2f5051c157..ba455dd08c 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -210,6 +210,9 @@ void ToonEngine::parseInput() {
 			if (event.kbd.keycode == Common::KEYCODE_s && !hasModifier) {
 				_audioManager->muteSfx(!_audioManager->isSfxMuted());
 			}
+			if (event.kbd.keycode == Common::KEYCODE_F1 && !hasModifier && !_gameState->_inMenu) {
+				showOptions();
+			}
 
 			if (event.kbd.flags & Common::KBD_ALT) {
 				int slotNum = event.kbd.keycode - (event.kbd.keycode >= Common::KEYCODE_KP0 ? Common::KEYCODE_KP0 : Common::KEYCODE_0);
@@ -255,7 +258,7 @@ void ToonEngine::parseInput() {
 		}
 	}
 
-	if (!_gameState->_inConversation && !_gameState->_mouseHidden && !_gameState->_inInventory) {
+	if (!_gameState->_inConversation && !_gameState->_mouseHidden && !_gameState->_inInventory && !_gameState->_inMenu) {
 		selectHotspot();
 		clickEvent();
 	}
@@ -576,7 +579,29 @@ enum MainMenuMasks {
 	MAINMENUMASK_EVERYWHERE = 3
 };
 
-struct MainMenuFile {
+enum OptionMenuSelections {
+	OPTIONMENUHOTSPOT_NONE					= 0,
+	OPTIONMENUHOTSPOT_PLAY					= 1,
+	OPTIONMENUHOTSPOT_QUIT					= 2,
+	OPTIONMENUHOTSPOT_TEXT					= 3,
+	OPTIONMENUHOTSPOT_TEXTSPEED				= 4,
+	OPTIONMENUHOTSPOT_VOLUMESFX				= 5,
+	OPTIONMENUHOTSPOT_VOLUMESFXSLIDER		= 6,
+	OPTIONMENUHOTSPOT_VOLUMEMUSIC			= 7,
+	OPTIONMENUHOTSPOT_VOLUMEMUSICSLIDER		= 8,
+	OPTIONMENUHOTSPOT_VOLUMEVOICE			= 9,
+	OPTIONMENUHOTSPOT_VOLUMEVOICESLIDER		= 10,
+	OPTIONMENUHOTSPOT_SPEAKERBUTTON			= 11,
+	OPTIONMENUHOTSPOT_SPEAKERLEVER			= 12,
+	OPTIONMENUHOTSPOT_VIDEO_MODE			= 13,
+};
+
+enum OptionMenuMasks {
+	OPTIONMENUMASK_EVERYWHERE = 1,	
+};
+
+
+struct MenuFile {
 	int menuMask;
 	int id;
 	const char *animationFile;
@@ -584,7 +609,7 @@ struct MainMenuFile {
 };
 
 #define MAINMENU_ENTRYCOUNT 12
-static const MainMenuFile mainMenuFiles[] = {
+static const MenuFile mainMenuFiles[] = {
 	{ MAINMENUMASK_BASE,       MAINMENUHOTSPOT_START,        "STARTBUT.CAF", 0 }, // "Start" button
 	{ MAINMENUMASK_BASE,       MAINMENUHOTSPOT_INTRO,        "INTROBUT.CAF", 0 }, // "Intro" button
 	{ MAINMENUMASK_BASE,       MAINMENUHOTSPOT_LOADGAME,     "LOADBUT.CAF",  0 }, // "Load Game" button
@@ -600,7 +625,38 @@ static const MainMenuFile mainMenuFiles[] = {
 	{ MAINMENUMASK_HOTKEYS,    MAINMENUHOTSPOT_HOTKEYSCLOSE, "HOTKEYS.CAF",  0 }  // Hotkeys display - clicking on it will close hotkeys
 };
 
-struct MainMenuEntry {
+#define OPTIONMENU_ENTRYCOUNT 27
+static const MenuFile optionMenuFiles[] = {
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_PLAY,        "PLAYBUTN.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_QUIT,        "QUITBUTN.CAF", 0 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VIDEO_MODE,        "VIDMODE.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_TEXTSPEED,        "TXTSPEED.CAF", 0 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_TEXT,        "TEXTDIAL.CAF", 0}, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VOLUMESFX,        "SFXBUTN.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VOLUMESFXSLIDER,        "SFXSLDR.CAF", 0 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VOLUMEVOICE,        "VOICEBTN.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VOLUMEVOICESLIDER,        "VOICESLD.CAF", 0 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VOLUMEMUSIC,        "MUSICBTN.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_VOLUMEMUSICSLIDER,        "MUSICSLD.CAF", 0 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_SPEAKERBUTTON,        "XTRABUTN.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_SPEAKERLEVER,        "XTRALEVR.CAF", 0}, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "ANTENNAL.CAF", 6 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "ANTENNAR.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "BIGREDL.CAF", 6 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "BIGREDR.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "GRIDLTEL.CAF", 6 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "GRIDLTER.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "LSPEAKR.CAF", 0 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "RSPEAKR.CAF", 0 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "STARLITL.CAF", 6 }, // "Start" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "STARLITR.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "CHASE1.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "CHASE2.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "CHASE3.CAF", 6 }, // "Intro" button
+	{ OPTIONMENUMASK_EVERYWHERE,       OPTIONMENUHOTSPOT_NONE,        "CHASE4.CAF", 6 } // "Intro" button
+};
+
+struct MenuEntry {
 	int menuMask;
 	int id;
 	Animation *animation;
@@ -608,15 +664,291 @@ struct MainMenuEntry {
 	int animateOnFrame;
 	int animateCurFrame;
 	int activeFrame;
+	bool playOnce;
 };
 
+bool ToonEngine::showOptions() {
+
+	storePalette();
+	fadeOut(5);
+	Picture* optionPicture = new Picture(this);
+	optionPicture->loadPicture("OPTIONS.CPS");
+	optionPicture->setupPalette();
+	flushPalette(true);
+
+	int16 oldScrollValue = _gameState->_currentScrollValue;
+	_gameState->_currentScrollValue = 0;
+
+	bool oldMouseHidden = _gameState->_mouseHidden;
+	_gameState->_mouseHidden = false;
+
+	MenuEntry entries[OPTIONMENU_ENTRYCOUNT];
+
+	for (int entryNr = 0; entryNr < OPTIONMENU_ENTRYCOUNT; entryNr++) {
+		entries[entryNr].menuMask = optionMenuFiles[entryNr].menuMask;
+		entries[entryNr].id = optionMenuFiles[entryNr].id;
+		entries[entryNr].animation = new Animation(this);
+		entries[entryNr].animation->loadAnimation(optionMenuFiles[entryNr].animationFile);
+		if (entries[entryNr].id != OPTIONMENUHOTSPOT_NONE)
+			entries[entryNr].rect = entries[entryNr].animation->getRect();
+		entries[entryNr].animateOnFrame = optionMenuFiles[entryNr].animateOnFrame;
+		entries[entryNr].animateCurFrame = 0;
+		entries[entryNr].activeFrame = 0;
+		entries[entryNr].playOnce = false;
+	}
+
+	entries[10].activeFrame = _audioManager->_mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) * (entries[10].animation->_numFrames - 1) / 256;
+	entries[8].activeFrame = _audioManager->_mixer->getVolumeForSoundType(Audio::Mixer::kSpeechSoundType) * (entries[8].animation->_numFrames - 1) / 256;
+	entries[6].activeFrame = _audioManager->_mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) * (entries[6].animation->_numFrames - 1) / 256;
+
+	entries[9].activeFrame = _audioManager->isMusicMuted() ? 0 : 3;
+	entries[7].activeFrame = _audioManager->isVoiceMuted() ? 0 : 3;
+	entries[5].activeFrame = _audioManager->isSfxMuted() ? 0 : 3;
+
+	entries[2].activeFrame = entries[2].animation->_numFrames - 1;
+
+	if (!_showConversationText) {
+		entries[4].activeFrame = 4;		
+	} else if (_useAlternativeFont) {
+		entries[4].activeFrame = 8;
+	} else {
+		entries[4].activeFrame = 0;
+	}
+
+	setCursor(0);
+
+	int menuMask = OPTIONMENUMASK_EVERYWHERE;
+	int ratioX = 0;
+	bool doExit = false;
+	bool exitGame = false;
+	_gameState->_inMenu = true;
+	dirtyAllScreen();
+	_firstFrame = true;
+
+	while (!doExit) {
+
+		int clickingOn = OPTIONMENUHOTSPOT_NONE;
+		int clickingOnSprite = 0;
+		int clickRelease = false;
+
+		while (!clickRelease) {
+
+			if (_dirtyAll) {
+				optionPicture->draw(*_mainSurface, 0, 0, 0, 0);
+				addDirtyRect(0, 0, TOON_SCREEN_WIDTH, TOON_SCREEN_HEIGHT);
+			} else {
+				optionPicture->drawWithRectList(*_mainSurface, 0, 0, 0, 0, _dirtyRects);
+			}
+			clearDirtyRects();
+
+			for (int entryNr = 0; entryNr < OPTIONMENU_ENTRYCOUNT; entryNr++) {
+				if (entries[entryNr].menuMask & menuMask) {
+					if (entries[entryNr].animateOnFrame) {
+						entries[entryNr].animateCurFrame++;
+						if (entries[entryNr].animateOnFrame <= entries[entryNr].animateCurFrame) {
+							entries[entryNr].activeFrame++;
+							if (entries[entryNr].activeFrame >= entries[entryNr].animation->_numFrames) {
+								entries[entryNr].activeFrame = 0;
+								if (entries[entryNr].playOnce) {
+									entries[entryNr].animateOnFrame = 0;
+									entries[entryNr].playOnce = false;
+								}
+								if (entryNr == 20 && entries[entryNr].animateOnFrame > 0) {
+									playSFX(-3, 128);
+								}
+							}
+							entries[entryNr].animateCurFrame = 0;
+						}
+					}
+					int32 frameNr = entries[entryNr].activeFrame;
+					entries[entryNr].animation->drawFrame(*_mainSurface, frameNr, 0, 0);
+				}
+			}
+
+			parseInput();
+
+			copyToVirtualScreen(true);
+			if (_firstFrame) {
+				_firstFrame = false;
+				fadeIn(5);
+			}
+			_system->delayMillis(17);
+
+			if (_mouseButton & 1) {
+				// left mouse button pushed down
+				clickingOn = OPTIONMENUHOTSPOT_NONE;
+				for (int entryNr = 0; entryNr < OPTIONMENU_ENTRYCOUNT; entryNr++) {
+					if (entries[entryNr].menuMask & menuMask) {
+						if (entries[entryNr].id != OPTIONMENUHOTSPOT_NONE) {
+							if (entries[entryNr].rect.contains(_mouseX, _mouseY)) {
+								clickingOn = entries[entryNr].id;
+								clickingOnSprite = entryNr;
+								ratioX = (_mouseX - entries[entryNr].rect.left) * 256 / entries[entryNr].rect.width();
+							}
+						}
+					}
+				}
+			} else {
+				// left mouse button released/not pushed down
+				if (clickingOn != OPTIONMENUHOTSPOT_NONE)
+					clickRelease = true;
+			}
+
+			// handle sliders
+			if (clickingOn == OPTIONMENUHOTSPOT_VOLUMEMUSICSLIDER) {
+				entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256;
+				int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; 
+				_audioManager->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, vol);
+			}
+
+			if (clickingOn == OPTIONMENUHOTSPOT_VOLUMEVOICESLIDER) {
+				entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256;
+				int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; 
+				_audioManager->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, vol);
+			}
+
+			if (clickingOn == OPTIONMENUHOTSPOT_VOLUMESFXSLIDER) {
+				entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256;
+				int vol = entries[clickingOnSprite].activeFrame * 256 / entries[clickingOnSprite].animation->_numFrames; 
+				_audioManager->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, vol);
+			}
+
+			if (clickingOn == OPTIONMENUHOTSPOT_TEXTSPEED) {
+				entries[clickingOnSprite].activeFrame = ratioX * (entries[clickingOnSprite].animation->_numFrames) / 256;
+			}
+
+			if (clickingOn == OPTIONMENUHOTSPOT_PLAY) {
+				entries[0].activeFrame = entries[0].animation->_numFrames - 1;
+			} else {
+				entries[0].activeFrame = 0;
+			}
+
+			if (clickingOn == OPTIONMENUHOTSPOT_QUIT) {
+				entries[1].activeFrame = entries[1].animation->_numFrames - 1;
+			} else {
+				entries[1].activeFrame = 0;
+			}
+
+			if (_shouldQuit) {
+				clickingOn = OPTIONMENUHOTSPOT_NONE;
+				clickRelease = true;
+				doExit = true;
+			}
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_VOLUMEMUSIC) {
+			if (entries[9].activeFrame == 0) {
+				entries[9].activeFrame = 3;
+				_audioManager->muteMusic(false);
+			} else {
+				entries[9].activeFrame = 0;
+				_audioManager->muteMusic(true);
+			}
+			playSFX(-7, 128);
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_VOLUMEVOICE) {
+			if (entries[7].activeFrame == 0) {
+				entries[7].activeFrame = 3;
+				_audioManager->muteVoice(false);
+			} else {
+				entries[7].activeFrame = 0;
+				_audioManager->muteVoice(true);
+			}
+			playSFX(-7, 128);
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_VOLUMESFX) {
+			if (entries[5].activeFrame == 0) {
+				entries[5].activeFrame = 3;
+				_audioManager->muteSfx(false);
+			} else {
+				entries[5].activeFrame = 0;
+				_audioManager->muteSfx(true);
+			}
+			playSFX(-7, 128);
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_SPEAKERBUTTON) {
+			entries[11].animateOnFrame = 4;
+			entries[11].playOnce = true;
+
+			entries[19].animateOnFrame = 4;
+			entries[19].playOnce = true;
+
+			playSFX(-10, 128);
+			_audioManager->playVoice(316, true);
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_SPEAKERLEVER) {
+
+			entries[12].activeFrame = 1 - entries[12].activeFrame;
+			if(entries[12].activeFrame == 1) {
+				entries[20].animateOnFrame = 4;
+				entries[20].playOnce = false;
+				playSFX(-3, 128);
+			} else {
+				entries[20].playOnce = true;
+			}
+			playSFX(-9, 128);
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_TEXT) {
+
+			if (entries[4].activeFrame == 0) {
+				_showConversationText = false;
+				entries[4].activeFrame = 4;
+			} else if (entries[4].activeFrame == 4) {
+				_showConversationText = true;
+				setFont(true);
+				entries[4].activeFrame = 8;
+			} else if(entries[4].activeFrame == 8) {
+				_showConversationText = true;
+				setFont(false);
+				entries[4].activeFrame = 0;
+			}
+
+			playSFX(-9, 128);
+		}
+
+		// don't allow change to video mode
+		if (clickingOn == OPTIONMENUHOTSPOT_VIDEO_MODE) {
+			playSoundWrong();
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_PLAY) {
+			doExit = true;
+			exitGame = false;
+			_audioManager->playSFX(10, 128, true);
+		}
+
+		if (clickingOn == OPTIONMENUHOTSPOT_QUIT) {
+			doExit = true;
+			exitGame = true;
+			_shouldQuit = true;
+			_audioManager->playSFX(10, 128, true);
+		}
+	}
+
+	fadeOut(5);
+	_gameState->_mouseHidden = oldMouseHidden;
+	_gameState->_inMenu = false;
+	_firstFrame = true;
+	_gameState->_currentScrollValue = oldScrollValue;
+	
+	restorePalette();
+	dirtyAllScreen();
+
+	return exitGame;
+}
+
 bool ToonEngine::showMainmenu(bool &loadedGame) {
 	Picture *mainmenuPicture = new Picture(this);
 	mainmenuPicture->loadPicture("TITLESCR.CPS");
 	mainmenuPicture->setupPalette();
 	flushPalette(false);
 
-	MainMenuEntry entries[MAINMENU_ENTRYCOUNT];
+	MenuEntry entries[MAINMENU_ENTRYCOUNT];
 
 	for (int entryNr = 0; entryNr < MAINMENU_ENTRYCOUNT; entryNr++) {
 		entries[entryNr].menuMask = mainMenuFiles[entryNr].menuMask;
@@ -630,7 +962,7 @@ bool ToonEngine::showMainmenu(bool &loadedGame) {
 		entries[entryNr].activeFrame = 0;
 	}
 
-	setCursor(1);
+	setCursor(0);
 
 	bool doExit = false;
 	bool exitGame = false;
@@ -822,6 +1154,7 @@ ToonEngine::ToonEngine(OSystem *syst, const ADGameDescription *gameDescription)
 	_inventoryPicture = NULL;
 	_currentMask = NULL;
 	_showConversationText = true;
+	_useAlternativeFont = false;
 	_isDemo = _gameDescription->flags & ADGF_DEMO;
 
 	DebugMan.addDebugChannel(kDebugAnim, "Anim", "Animation debug level");
@@ -1853,6 +2186,17 @@ void ToonEngine::initFonts() {
 
 	_fontEZ = new Animation(this);
 	_fontEZ->loadAnimation("EZFONT.CAF");
+
+	setFont(false);
+}
+
+void ToonEngine::setFont(bool alternative) {
+	if (alternative) {
+		_currentFont = _fontEZ;
+	} else {
+		_currentFont = _fontToon;
+	}
+	_useAlternativeFont = alternative;
 }
 
 void ToonEngine::drawInfoLine() {
@@ -1870,7 +2214,7 @@ void ToonEngine::drawInfoLine() {
 		}
 		if (infoTool) {
 			_fontRenderer->setFontColor(0xc8, 0xdd, 0xe3);
-			_fontRenderer->setFont(_fontToon);
+			_fontRenderer->setFont(_currentFont);
 			_fontRenderer->renderText(320 + _gameState->_currentScrollValue, 398, infoTool, 5);
 		}
 	}
@@ -1998,6 +2342,8 @@ int32 ToonEngine::simpleCharacterTalk(int32 dialogid) {
 		_audioManager->playVoice(myId, false);
 	} else {
 		myId = _genericTexts->getId(dialogid - 1000);
+		if (myId == -1)
+			return 0;
 		_audioManager->playVoice(myId, true);
 	}
 
@@ -2936,7 +3282,7 @@ Character *ToonEngine::getCharacterById(int32 charId) {
 void ToonEngine::drawConversationLine() {
 	if (_currentTextLine && _showConversationText) {
 		_fontRenderer->setFontColorByCharacter(_currentTextLineCharacterId);
-		_fontRenderer->setFont(_fontToon);
+		_fontRenderer->setFont(_currentFont);
 		_fontRenderer->renderMultiLineText(_currentTextLineX, _currentTextLineY, _currentTextLine, 0);
 	}
 }
diff --git a/engines/toon/toon.h b/engines/toon/toon.h
index 6903e5de57..f419d491c6 100644
--- a/engines/toon/toon.h
+++ b/engines/toon/toon.h
@@ -111,6 +111,7 @@ public:
 	Common::Error run();
 	GUI::Debugger *getDebugger() { return _console; }
 	bool showMainmenu(bool &loadedGame);
+	bool showOptions();
 	void init();
 	bool loadToonDat();
 	char **loadTextsVariants(Common::File &in);
@@ -122,6 +123,7 @@ public:
 	void parseInput();
 	void initChapter();
 	void initFonts();
+	void setFont(bool alternative);
 	void loadScene(int32 SceneId, bool forGameLoad = false);
 	void exitScene();
 	void loadCursor();
@@ -421,6 +423,7 @@ protected:
 	FontRenderer *_fontRenderer;
 	Animation *_fontToon;
 	Animation *_fontEZ;
+	Animation *_currentFont;
 
 	AudioManager *_audioManager;
 
@@ -431,6 +434,7 @@ protected:
 	bool _firstFrame;
 	bool _isDemo;
 	bool _showConversationText;
+	bool _useAlternativeFont;
 	bool _needPaletteFlush;
 private:
 	ToonConsole *_console;
-- 
cgit v1.2.3


From 15a4371b2d651a382cf077b1e1edef0b21c48685 Mon Sep 17 00:00:00 2001
From: sylvaintv
Date: Thu, 19 Mar 2015 22:40:29 +0100
Subject: TOON: Fix bad enum syntax

---
 engines/toon/toon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index ba455dd08c..09f865f798 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -593,11 +593,11 @@ enum OptionMenuSelections {
 	OPTIONMENUHOTSPOT_VOLUMEVOICESLIDER		= 10,
 	OPTIONMENUHOTSPOT_SPEAKERBUTTON			= 11,
 	OPTIONMENUHOTSPOT_SPEAKERLEVER			= 12,
-	OPTIONMENUHOTSPOT_VIDEO_MODE			= 13,
+	OPTIONMENUHOTSPOT_VIDEO_MODE			= 13
 };
 
 enum OptionMenuMasks {
-	OPTIONMENUMASK_EVERYWHERE = 1,	
+	OPTIONMENUMASK_EVERYWHERE = 1
 };
 
 
-- 
cgit v1.2.3


From a02461fcb15da3b2e7e91d9cfb1bca559a1d277b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 19 Mar 2015 19:49:42 -0400
Subject: SHERLOCK: Refactorings, new Sprite and People classes

---
 engines/sherlock/animation.cpp       |  23 +++---
 engines/sherlock/events.cpp          |  10 +--
 engines/sherlock/events.h            |   4 +-
 engines/sherlock/module.mk           |   3 +-
 engines/sherlock/people.cpp          |  73 +++++++++++++++++
 engines/sherlock/people.h            |  57 ++++++++++++++
 engines/sherlock/resources.cpp       | 121 ++++++++++++++++++++++++++++
 engines/sherlock/resources.h         |  29 +++++++
 engines/sherlock/scalpel/scalpel.cpp |  16 ++--
 engines/sherlock/scene.cpp           |  19 ++++-
 engines/sherlock/scene.h             |  13 +++-
 engines/sherlock/sherlock.cpp        |   5 +-
 engines/sherlock/sherlock.h          |   2 +
 engines/sherlock/sprite.cpp          | 147 -----------------------------------
 engines/sherlock/sprite.h            |  65 ----------------
 engines/sherlock/sprites.cpp         |  27 +++++++
 engines/sherlock/sprites.h           |  83 ++++++++++++++++++++
 17 files changed, 451 insertions(+), 246 deletions(-)
 create mode 100644 engines/sherlock/people.cpp
 create mode 100644 engines/sherlock/people.h
 delete mode 100644 engines/sherlock/sprite.cpp
 delete mode 100644 engines/sherlock/sprite.h
 create mode 100644 engines/sherlock/sprites.cpp
 create mode 100644 engines/sherlock/sprites.h

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 6788cc51d7..2b12005079 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -22,7 +22,6 @@
 
 #include "sherlock/animation.h"
 #include "sherlock/sherlock.h"
-#include "sherlock/sprite.h"
 #include "common/algorithm.h"
 
 namespace Sherlock {
@@ -95,7 +94,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
-	Sprite sprite(vdaName, true);
+	ImageFile images(vdaName, true);
 	
 	events.wait(minDelay);
 	if (fade != 0 && fade != 255)
@@ -103,37 +102,37 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 
 	if (setPalette) {
 		if (fade != 255)
-			screen.setPalette(sprite._palette);
+			screen.setPalette(images._palette);
 	}
 
 	int frameNumber = 0;
-	int spriteFrame;
+	int imageFrame;
 	Common::Point pt;
 	bool skipped = false;
 	while (!_vm->shouldQuit()) {
 		// Get the next sprite to display
-		spriteFrame = stream->readSint16LE();
+		imageFrame = stream->readSint16LE();
 
-		if (spriteFrame == -2) {
+		if (imageFrame == -2) {
 			// End of animation reached
 			break;
-		} else if (spriteFrame != -1) {
+		} else if (imageFrame != -1) {
 			// Read position from either animation stream or the sprite frame itself
-			if (spriteFrame < 0) {
-				spriteFrame += 32769;
+			if (imageFrame < 0) {
+				imageFrame += 32769;
 				pt.x = stream->readUint16LE();
 				pt.y = stream->readUint16LE();
 			} else {
-				pt = sprite[spriteFrame]._position;
+				pt = images[imageFrame]._position;
 			}
 
 			// Draw the sprite
-			screen.transBlitFrom(sprite[spriteFrame]._frame, pt);
+			screen.transBlitFrom(images[imageFrame]._frame, pt);
 		} else {
 			// No sprite to show for this animation frame
 			if (fade == 255) {
 				// Gradual fade in
-				if (screen.equalizePalette(sprite._palette) == 0)
+				if (screen.equalizePalette(images._palette) == 0)
 					fade = 0;
 			}
 
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 1a882eedea..ecdbdbe8d7 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -32,7 +32,7 @@ namespace Sherlock {
 
 EventsManager::EventsManager(SherlockEngine *vm) {
 	_vm = vm;
-	_cursorSprites = nullptr;
+	_cursorImages = nullptr;
 	_cursorIndex = -1;
 	_frameCounter = 1;
 	_priorFrameTime = 0;
@@ -41,7 +41,7 @@ EventsManager::EventsManager(SherlockEngine *vm) {
 }
 
 EventsManager::~EventsManager() {
-	delete _cursorSprites;
+	delete _cursorImages;
 }
 
 /**
@@ -49,9 +49,9 @@ EventsManager::~EventsManager() {
  */
 void EventsManager::loadCursors(const Common::String &filename) {
 	hideCursor();
-	delete _cursorSprites;
+	delete _cursorImages;
 
-	_cursorSprites = new Sprite(filename);
+	_cursorImages = new ImageFile(filename);
 }
 
 /**
@@ -61,7 +61,7 @@ void EventsManager::changeCursor(int cursorIndex) {
 	_cursorIndex = cursorIndex;
 
 	// Set the cursor data
-	Graphics::Surface &s = (*_cursorSprites)[cursorIndex];
+	Graphics::Surface &s = (*_cursorImages)[cursorIndex];
 	CursorMan.replaceCursor(s.getPixels(), s.w, s.h, s.w / 2, s.h / 2, 0xff);
 
 	showCursor();
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 1f7352eeb5..0fa6bf3a5e 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "common/events.h"
 #include "common/stack.h"
-#include "sherlock/sprite.h"
+#include "sherlock/resources.h"
 
 namespace Sherlock {
 
@@ -41,7 +41,7 @@ private:
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
 	Common::Point _mousePos;
-	Sprite *_cursorSprites;
+	ImageFile *_cursorImages;
 
 	bool checkForNextFrameCounter();
 public:
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index eef27aa0b1..865b422ef9 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -12,12 +12,13 @@ MODULE_OBJS = \
 	events.o \
 	graphics.o \
 	journal.o \
+	people.o \
 	resources.o \
 	scene.o \
 	screen.o \
 	sherlock.o \
 	sound.o \
-	sprite.o \
+	sprites.o \
 	talk.o
 
 # This module can be built as a plugin
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
new file mode 100644
index 0000000000..53ccaf5baf
--- /dev/null
+++ b/engines/sherlock/people.cpp
@@ -0,0 +1,73 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/people.h"
+
+namespace Sherlock {
+
+// Characer animation sequences
+static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
+	{ 29, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Right
+	{ 22, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Down 
+	{ 29, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Left
+	{ 15, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Up
+	{ 42, 1, 2, 3, 4, 5, 0 },			// Goto Stand Right
+	{ 47, 1, 2, 3, 4, 5, 0 },			// Goto Stand Down
+	{ 42, 1, 2, 3, 4, 5, 0 },			// Goto Stand Left
+	{ 36, 1, 0 },						// Goto Stand Up
+	{ 8, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Up Right
+	{ 1, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Down Right
+	{ 8, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Up Left
+	{ 1, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Down Left
+	{ 37, 1, 2, 3, 4, 5, 0 },			// Goto Stand Up Right
+	{ 37, 1, 2, 3, 4, 5, 0 },			// Goto Stand Up Left
+	{ 52, 1, 2, 3, 4, 0 },				// Goto Stand Down Right
+	{ 52, 1, 2, 3, 4, 0 }				// Goto Stand Down Left
+};
+
+
+People::People(SherlockEngine *vm) : _vm(vm) {
+}
+
+void People::reset() {
+	Sprite &p = _data[PLAYER];
+
+	p._description = "Sherlock Holmes!";
+	p._type = CHARACTER;
+	p._position = Common::Point(10000, 11000);
+	p._sequenceNumber = STOP_DOWNRIGHT;
+	p._sequences = &CHARACTER_SEQUENCES;
+	p._spriteFrame = nullptr;
+	p._frameNumber = 1;
+	p._movement = Common::Point(0, 0);
+	p._oldPosition = Common::Point(0, 0);
+	p._oldSize = Common::Point(0, 0);
+	p._misc = 0;
+	p._walkCount = 0;
+	p._pickUp = "";
+	p._allow = 0;
+	p._noShapeSize = Common::Point(0, 0);
+	p._goto = Common::Point(0, 0);
+	p._status = 0;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
new file mode 100644
index 0000000000..4ca7f51444
--- /dev/null
+++ b/engines/sherlock/people.h
@@ -0,0 +1,57 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_PEOPLE_H
+#define SHERLOCK_PEOPLE_H
+
+#include "common/scummsys.h"
+#include "sherlock/sprites.h"
+
+namespace Sherlock {
+
+#define MAX_PEOPLE 2
+#define PLAYER 0
+
+// Animation sequence identifiers for characters
+enum {
+	WALK_RIGHT = 0, WALK_DOWN = 1, WALK_LEFT = 2, WALK_UP = 3, STOP_LEFT = 4,
+	STOP_DOWN  = 5, STOP_RIGHT = 6, STOP_UP = 7, WALK_UPRIGHT = 8,
+	WALK_DOWNRIGHT = 9, WALK_UPLEFT = 10, WALK_DOWNLEFT = 11,
+	STOP_UPRIGHT = 12, STOP_UPLEFT = 13, STOP_DOWNRIGHT = 14,
+	STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4
+};
+
+class SherlockEngine;
+
+class People {
+private:
+	SherlockEngine *_vm;
+	Sprite _data[MAX_PEOPLE];
+public:
+	People(SherlockEngine *vm);
+
+	void reset();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 6636ca5be8..cdea7bd296 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -22,6 +22,8 @@
 
 #include "sherlock/resources.h"
 #include "sherlock/decompress.h"
+#include "sherlock/screen.h"
+#include "sherlock/sherlock.h"
 #include "common/debug.h"
 
 namespace Sherlock {
@@ -241,4 +243,123 @@ int Resources::resourceIndex() const {
 	return _resourceIndex;
 }
 
+/*----------------------------------------------------------------*/
+
+SherlockEngine *ImageFile::_vm;
+
+void ImageFile::setVm(SherlockEngine *vm) {
+	_vm = vm;
+}
+
+ImageFile::ImageFile(const Common::String &name, bool skipPal) {
+	Common::SeekableReadStream *stream = _vm->_res->load(name);
+	
+	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
+	load(*stream, skipPal);
+	
+	delete stream;
+}
+
+ImageFile::ImageFile(Common::SeekableReadStream &stream, bool skipPal) {
+	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
+	load(stream, skipPal);
+}
+
+ImageFile::~ImageFile() {
+	for (uint idx = 0; idx < size(); ++idx)
+		(*this)[idx]._frame.free();
+}
+
+/**
+ * Load the data of the sprite
+ */
+void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
+	loadPalette(stream);
+
+    while (stream.pos() < stream.size()) {
+		ImageFrame frame;
+		frame._width = stream.readUint16LE() + 1;
+		frame._height = stream.readUint16LE() + 1;
+		frame._flags = stream.readByte();
+		frame._position.x = stream.readUint16LE();
+		frame._position.y = stream.readByte();
+        
+		frame._rleEncoded = !skipPalette && (frame._position.x == 1);
+
+		if (frame._flags & 0xFF) {
+			// Nibble packed frame data
+			frame._size = (frame._width * frame._height) / 2;
+		} else if (frame._rleEncoded) {
+            // this size includes the header size, which we subtract
+			frame._size = stream.readUint16LE() - 11;
+			frame._rleMarker = stream.readByte();
+        } else {
+			// Uncompressed data
+			frame._size = frame._width * frame._height;
+        }
+
+		// Load data for frame and decompress it
+		byte *data = new byte[frame._size];
+		stream.read(data, frame._size);
+        decompressFrame(frame, data);		
+		delete data;
+
+		push_back(frame);
+    }
+}
+
+/**
+ * Gets the palette at the start of the sprite file
+ */
+void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
+	// Check for palette
+	int v1 = stream.readUint16LE() + 1;
+	int v2 = stream.readUint16LE() + 1;
+	int size = v1 * v2;
+	
+	if ((size - 12) == PALETTE_SIZE) {
+		// Found palette, so read it in
+		stream.seek(4 + 12, SEEK_CUR);
+		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+			_palette[idx] = VGA_COLOR_TRANS(stream.readByte());
+	} else {
+		// Not a palette, so rewind to start of frame data for normal frame processing
+		stream.seek(-4, SEEK_CUR);
+	}
+}
+
+/**
+ * Decompress a single frame for the sprite
+ */
+void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
+	frame._frame.create(frame._width, frame._height, Graphics::PixelFormat::createFormatCLUT8());
+
+	if (frame._flags & 0xFF) {
+	    error("TODO: ImageFile::decompressFrame() 4-bits/pixel\n");
+	} else if (frame._rleEncoded) {
+		// RLE encoded
+	    byte *dst = (byte *)frame._frame.getPixels();
+
+		int size = frame._width * frame._height;
+		while (size > 0) {
+			if (*src == frame._rleMarker) {
+			    byte rleColor = src[1];
+			    byte rleCount = src[2];
+			    src += 3;
+			    size -= rleCount;
+			    while (rleCount--)
+			        *dst++ = rleColor;
+			} else {
+				*dst++ = *src++;
+				--size;
+			}
+		}
+		assert(size == 0);
+	} else {
+		// Uncompressed frame
+		Common::copy(src, src + frame._width * frame._height,
+			(byte *)frame._frame.getPixels());
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index cd6e60c325..ad9867c523 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -27,8 +27,10 @@
 #include "common/file.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
+#include "common/rect.h"
 #include "common/str.h"
 #include "common/stream.h"
+#include "graphics/surface.h"
 
 namespace Sherlock {
 
@@ -83,6 +85,33 @@ public:
 	int resourceIndex() const;
 };
 
+struct ImageFrame {
+	uint32 _size;
+	uint16 _width, _height;
+	int _flags;
+	bool _rleEncoded;
+	Common::Point _position;
+	byte _rleMarker;
+	Graphics::Surface _frame;
+
+	operator Graphics::Surface &() { return _frame; }
+};
+
+class ImageFile : public Common::Array<ImageFrame> {
+private:
+	static SherlockEngine *_vm;
+
+	void load(Common::SeekableReadStream &stream, bool skipPalette);
+	void loadPalette(Common::SeekableReadStream &stream);
+	void decompressFrame(ImageFrame  &frame, const byte *src);
+public:
+	byte _palette[256 * 3];
+public:
+	ImageFile(const Common::String &name, bool skipPal = false);
+	ImageFile(Common::SeekableReadStream &stream, bool skipPal = false);
+	~ImageFile();
+	static void setVm(SherlockEngine *vm);
+};
 
 } // End of namespace Sherlock
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index d5f63b9c0d..ca04153594 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -83,18 +83,18 @@ bool ScalpelEngine::showCityCutscene() {
 	bool finished = _animation->playPrologue("26open1", 1, 255, true, 2);
 
 	if (finished) {
-		Sprite titleSprites("title2.vgs", true);
+		ImageFile titleImages("title2.vgs", true);
 		_screen->_backBuffer.blitFrom(*_screen);
 		_screen->_backBuffer2.blitFrom(*_screen);
 
 		// London, England
-		_screen->_backBuffer.transBlitFrom(titleSprites[0], Common::Point(10, 11));
+		_screen->_backBuffer.transBlitFrom(titleImages[0], Common::Point(10, 11));
 		_screen->randomTransition();
 		finished = _events->delay(1000, true);
 
 		// November, 1888
 		if (finished) {
-			_screen->_backBuffer.transBlitFrom(titleSprites[1], Common::Point(101, 102));
+			_screen->_backBuffer.transBlitFrom(titleImages[1], Common::Point(101, 102));
 			_screen->randomTransition();
 			finished = _events->delay(5000, true);
 		}
@@ -108,16 +108,16 @@ bool ScalpelEngine::showCityCutscene() {
 		finished = _animation->playPrologue("26open2", 1, 0, false, 2);
 
 	if (finished) {
-		Sprite titleSprites("title.vgs", true);
+		ImageFile titleImages("title.vgs", true);
 		_screen->_backBuffer.blitFrom(*_screen);
 		_screen->_backBuffer2.blitFrom(*_screen);
 		
 		// The Lost Files of
-		_screen->_backBuffer.transBlitFrom(titleSprites[0], Common::Point(75, 6));
+		_screen->_backBuffer.transBlitFrom(titleImages[0], Common::Point(75, 6));
 		// Sherlock Holmes
-		_screen->_backBuffer.transBlitFrom(titleSprites[1], Common::Point(34, 21));
+		_screen->_backBuffer.transBlitFrom(titleImages[1], Common::Point(34, 21));
 		// copyright
-		_screen->_backBuffer.transBlitFrom(titleSprites[2], Common::Point(4, 190));
+		_screen->_backBuffer.transBlitFrom(titleImages[2], Common::Point(4, 190));
 
 		_screen->verticalTransition();
 		finished = _events->delay(4000, true);
@@ -135,7 +135,7 @@ bool ScalpelEngine::showCityCutscene() {
 
 		if (finished) {
 			// In the alley...
-			_screen->transBlitFrom(titleSprites[3], Common::Point(72, 51));
+			_screen->transBlitFrom(titleImages[3], Common::Point(72, 51));
 			_screen->fadeIn(palette, 3);
 			finished = _events->delay(3000, true);
 		}
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index de351a5561..84ef44d7e1 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -30,12 +30,27 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_goToRoom = -1;
 	_oldCharPoint = 0;
 	_numExits = 0;
+	_windowOpen = _infoFlag = false;
+	_menuMode = _keyboardInput = 0;
 
-	_controlSprites = new Sprite("menu.all");
+	_controls = nullptr; // new ImageFile("menu.all");
 }
 
 Scene::~Scene() {
-	delete _controlSprites;
+	delete _controls;
+}
+
+void Scene::selectScene() {
+	// Reset fields
+	_numExits = 0;
+	_windowOpen = _infoFlag = false;
+	_menuMode = _keyboardInput = 0;
+	_oldKey = _help = _oldHelp = 0;
+	_oldTemp = _temp = 0;
+
+	// Set up player
+
+
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 031245b122..f92dfccfad 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -24,7 +24,7 @@
 #define SHERLOCK_SCENE_H
 
 #include "common/scummsys.h"
-#include "sherlock/sprite.h"
+#include "sherlock/resources.h"
 
 namespace Sherlock {
 
@@ -35,6 +35,8 @@ class SherlockEngine;
 class Scene {
 private:
 	SherlockEngine *_vm;
+
+	void loadScene();
 public:
 	bool _stats[SCENES_COUNT][9];
 	bool _savedStats[SCENES_COUNT][9];
@@ -42,12 +44,17 @@ public:
 	Common::Point _bigPos;
 	Common::Point _overPos;
 	int _oldCharPoint;
-	Sprite *_controlSprites;
+	ImageFile *_controls;
 	int _numExits;
+	bool _windowOpen, _infoFlag;
+	int _menuMode, _keyboardInput;
+	int _oldKey, _help, _oldHelp;
+	int _oldTemp, _temp;
 public:
 	Scene(SherlockEngine *vm);
-
 	~Scene();
+
+	void selectScene();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 8b597df31b..a292ee675c 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -74,6 +74,7 @@ void SherlockEngine::initialize() {
 	_midi->setNativeMT32(native_mt32);
 	*/
 
+	ImageFile::setVm(this);
 	_res = new Resources();
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
@@ -83,7 +84,6 @@ void SherlockEngine::initialize() {
 	_screen = new Screen(this);
 	_sound = new Sound(this);
 	_talk = new Talk();
-	Sprite::setVm(this);
 }
 
 Common::Error SherlockEngine::run() {
@@ -97,6 +97,9 @@ Common::Error SherlockEngine::run() {
 		if (shouldQuit())
 			break;
 
+		// Initialize the scene
+		_scene->selectScene();
+
 		// TODO: Implement game and remove this dummy loop
 		while (!shouldQuit())
 			_events->pollEventsAndWait();
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index c6023684b4..210e24c320 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -35,6 +35,7 @@
 #include "sherlock/debugger.h"
 #include "sherlock/events.h"
 #include "sherlock/journal.h"
+#include "sherlock/people.h"
 #include "sherlock/resources.h"
 #include "sherlock/scene.h"
 #include "sherlock/screen.h"
@@ -77,6 +78,7 @@ public:
 	Debugger *_debugger;
 	EventsManager *_events;
 	Journal *_journal;
+	People *_people;
 	Resources *_res;
 	Scene *_scene;
 	Screen *_screen;
diff --git a/engines/sherlock/sprite.cpp b/engines/sherlock/sprite.cpp
deleted file mode 100644
index 8a7bb4cf29..0000000000
--- a/engines/sherlock/sprite.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/sprite.h"
-#include "sherlock/screen.h"
-#include "sherlock/sherlock.h"
-#include "common/debug.h"
-
-namespace Sherlock {
-
-SherlockEngine *Sprite::_vm;
-
-void Sprite::setVm(SherlockEngine *vm) {
-	_vm = vm;
-}
-
-Sprite::Sprite(const Common::String &name, bool skipPal) {
-	Common::SeekableReadStream *stream = _vm->_res->load(name);
-	
-	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
-	load(*stream, skipPal);
-	
-	delete stream;
-}
-
-Sprite::Sprite(Common::SeekableReadStream &stream, bool skipPal) {
-	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
-	load(stream, skipPal);
-}
-
-Sprite::~Sprite() {
-	for (uint idx = 0; idx < size(); ++idx)
-		(*this)[idx]._frame.free();
-}
-
-/**
- * Load the data of the sprite
- */
-void Sprite::load(Common::SeekableReadStream &stream, bool skipPalette) {
-	loadPalette(stream);
-
-    while (stream.pos() < stream.size()) {
-		SpriteFrame frame;
-		frame._width = stream.readUint16LE() + 1;
-		frame._height = stream.readUint16LE() + 1;
-		frame._flags = stream.readByte();
-		frame._position.x = stream.readUint16LE();
-		frame._position.y = stream.readByte();
-        
-		frame._rleEncoded = !skipPalette && (frame._position.x == 1);
-
-		if (frame._flags & 0xFF) {
-			// Nibble packed frame data
-			frame._size = (frame._width * frame._height) / 2;
-		} else if (frame._rleEncoded) {
-            // this size includes the header size, which we subtract
-			frame._size = stream.readUint16LE() - 11;
-			frame._rleMarker = stream.readByte();
-        } else {
-			// Uncompressed data
-			frame._size = frame._width * frame._height;
-        }
-
-		// Load data for frame and decompress it
-		byte *data = new byte[frame._size];
-		stream.read(data, frame._size);
-        decompressFrame(frame, data);		
-		delete data;
-
-		push_back(frame);
-    }
-}
-
-/**
- * Gets the palette at the start of the sprite file
- */
-void Sprite::loadPalette(Common::SeekableReadStream &stream) {
-	// Check for palette
-	int v1 = stream.readUint16LE() + 1;
-	int v2 = stream.readUint16LE() + 1;
-	int size = v1 * v2;
-	
-	if ((size - 12) == PALETTE_SIZE) {
-		// Found palette, so read it in
-		stream.seek(4 + 12, SEEK_CUR);
-		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
-			_palette[idx] = VGA_COLOR_TRANS(stream.readByte());
-	} else {
-		// Not a palette, so rewind to start of frame data for normal frame processing
-		stream.seek(-4, SEEK_CUR);
-	}
-}
-
-/**
- * Decompress a single frame for the sprite
- */
-void Sprite::decompressFrame(SpriteFrame &frame, const byte *src) {
-	frame._frame.create(frame._width, frame._height, Graphics::PixelFormat::createFormatCLUT8());
-
-	if (frame._flags & 0xFF) {
-	    debug("TODO: Sprite::decompressFrame() 4-bits/pixel\n");
-	} else if (frame._rleEncoded) {
-		// RLE encoded
-	    byte *dst = (byte *)frame._frame.getPixels();
-
-		int size = frame._width * frame._height;
-		while (size > 0) {
-			if (*src == frame._rleMarker) {
-			    byte rleColor = src[1];
-			    byte rleCount = src[2];
-			    src += 3;
-			    size -= rleCount;
-			    while (rleCount--)
-			        *dst++ = rleColor;
-			} else {
-				*dst++ = *src++;
-				--size;
-			}
-		}
-		assert(size == 0);
-	} else {
-		// Uncompressed frame
-		Common::copy(src, src + frame._width * frame._height,
-			(byte *)frame._frame.getPixels());
-	}
-}
-
-} // End of namespace Sherlock
diff --git a/engines/sherlock/sprite.h b/engines/sherlock/sprite.h
deleted file mode 100644
index 844013db43..0000000000
--- a/engines/sherlock/sprite.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_SPRITE_H
-#define SHERLOCK_SPRITE_H
-
-#include "common/array.h"
-#include "common/rect.h"
-#include "common/stream.h"
-#include "graphics/surface.h"
-
-namespace Sherlock {
-
-class SherlockEngine;
-
-struct SpriteFrame {
-	uint32 _size;
-	uint16 _width, _height;
-	int _flags;
-	bool _rleEncoded;
-	Common::Point _position;
-	byte _rleMarker;
-	Graphics::Surface _frame;
-
-	operator Graphics::Surface &() { return _frame; }
-};
-
-class Sprite: public Common::Array<SpriteFrame> {
-private:
-	static SherlockEngine *_vm;
-
-	void load(Common::SeekableReadStream &stream, bool skipPalette);
-	void loadPalette(Common::SeekableReadStream &stream);
-	void decompressFrame(SpriteFrame  &frame, const byte *src);
-public:
-	byte _palette[256 * 3];
-public:
-	Sprite(const Common::String &name, bool skipPal = false);
-	Sprite(Common::SeekableReadStream &stream, bool skipPal = false);
-    ~Sprite();
-	static void setVm(SherlockEngine *vm);
-};
-
-} // End of namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/sprites.cpp b/engines/sherlock/sprites.cpp
new file mode 100644
index 0000000000..6e33219309
--- /dev/null
+++ b/engines/sherlock/sprites.cpp
@@ -0,0 +1,27 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sprites.h"
+
+namespace Sherlock {
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/sprites.h b/engines/sherlock/sprites.h
new file mode 100644
index 0000000000..631693d815
--- /dev/null
+++ b/engines/sherlock/sprites.h
@@ -0,0 +1,83 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SPRITES_H
+#define SHERLOCK_SPRITES_H
+
+#include "common/scummsys.h"
+#include "common/rect.h"
+#include "common/str-array.h"
+#include "common/str.h"
+#include "sherlock/resources.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+enum ObjectAllow {
+	ALLOW_MOVEMENT = 1, ALLOW_OPEN = 2, ALLOW_CLOSE = 4
+};
+
+enum SpriteType {
+	INVALID = 0,
+	CHARACTER = 1,
+	CURSOR = 2,
+	STATIC_BG_SHAPE = 3,		// Background shape that doesn't animate
+	ACTIVE_BG_SHAPE = 4,		// Background shape that animates
+	REMOVE = 5,					// Object should be removed next frame
+	NO_SHAPE = 6,				// Background object with no shape
+	HIDDEN = 7,					// Hidden backgruond object
+	HIDE_SHAPE = 8				// Object needs to be hidden
+};
+
+#define MAX_HOLMES_SEQUENCE 16
+#define MAX_FRAME 30
+
+struct Sprite {
+	Common::String _name;				// Name
+	Common::String _description;		// Description
+	Common::StringArray _examine;		// Examine in-depth description
+	Common::String _pickUp;				// Message for if you can't pick up object
+
+	const uint8 (*_sequences)[MAX_HOLMES_SEQUENCE][MAX_FRAME];  // Holds animation sequences
+	Sprite *_sprites;					// Sprite shapes
+	ImageFrame *_spriteFrame;			// Pointer to shape in the sprite
+	int _walkCount;						// Character walk counter
+	int _allow;							// Allowed menu commands - ObjectAllow
+	int _frameNumber;					// Frame number in rame sequence to draw
+	int _sequenceNumber;				// Sequence being used
+	Common::Point _position;			// Current position
+	Common::Point _movement;			// Momvement amount
+	Common::Point _oldPosition;			// Old position
+	Common::Point _oldSize;				// Image's old size
+	Common::Point _goto;				// Walk destination
+	SpriteType _type;					// Type of object
+	int _pickup;
+	Common::Point _noShapeSize;			// Size of a NO_SHAPE
+	int _status;						// Status: open/closed, moved/not moved
+	byte _misc;							// Miscellaneous use
+	int _numFrames;						// How many frames the object has
+};
+
+} // End of namespace Sherlock
+
+#endif
-- 
cgit v1.2.3


From 77a4227aa4915a860accdd761fb9695d390641dd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 19 Mar 2015 23:31:28 -0400
Subject: SHERLOCK: Added loading of scene objects

---
 engines/sherlock/module.mk     |   2 +-
 engines/sherlock/objects.cpp   | 155 ++++++++++++++++++++++++++++++++++++++
 engines/sherlock/objects.h     | 166 +++++++++++++++++++++++++++++++++++++++++
 engines/sherlock/people.cpp    |   2 +-
 engines/sherlock/people.h      |   2 +-
 engines/sherlock/resources.cpp |   7 ++
 engines/sherlock/resources.h   |   2 +
 engines/sherlock/scene.cpp     | 127 ++++++++++++++++++++++++++++++-
 engines/sherlock/scene.h       |  35 +++++++++
 engines/sherlock/sherlock.cpp  |  11 ++-
 engines/sherlock/sprites.cpp   |  27 -------
 engines/sherlock/sprites.h     |  83 ---------------------
 12 files changed, 503 insertions(+), 116 deletions(-)
 create mode 100644 engines/sherlock/objects.cpp
 create mode 100644 engines/sherlock/objects.h
 delete mode 100644 engines/sherlock/sprites.cpp
 delete mode 100644 engines/sherlock/sprites.h

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 865b422ef9..dc88ab3f5f 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -12,13 +12,13 @@ MODULE_OBJS = \
 	events.o \
 	graphics.o \
 	journal.o \
+	objects.o \
 	people.o \
 	resources.o \
 	scene.o \
 	screen.o \
 	sherlock.o \
 	sound.o \
-	sprites.o \
 	talk.o
 
 # This module can be built as a plugin
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
new file mode 100644
index 0000000000..2386c00686
--- /dev/null
+++ b/engines/sherlock/objects.cpp
@@ -0,0 +1,155 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/objects.h"
+
+namespace Sherlock {
+
+/**
+ * Reset the data for the sprite
+ */
+void Sprite::clear() {
+	_name = "";
+	_description = "";
+	_examine.clear();
+	_pickUp = "";
+	_sequences = nullptr;
+	_images = nullptr;
+	_imageFrame = nullptr;
+	_walkCount = 0;
+	_allow = 0;
+	_frameNumber = _sequenceNumber = 0;
+	_position.x = _position.y = 0;
+	_movement.x = _movement.y = 0;
+	_oldPosition.x = _oldPosition.y = 0;
+	_oldSize.x = _oldSize.y = 0;
+	_goto.x = _goto.y = 0;
+	_type = INVALID;
+	_pickUp.clear();
+	_noShapeSize.x = _noShapeSize.y = 0;
+	_status = 0;
+	_misc = 0;
+	_numFrames = 0;
+}
+
+/*----------------------------------------------------------------*/
+
+void ActionType::synchronize(Common::SeekableReadStream &s) {
+	char buffer[12];
+	
+	_cAnimNum = s.readByte();
+	_cAnimSpeed = s.readByte();
+
+	for (int idx = 0; idx < 4; ++idx) {
+		s.read(buffer, 12);
+		_names[idx] = Common::String(buffer);
+	}
+}
+
+/*----------------------------------------------------------------*/
+
+void UseType::synchronize(Common::SeekableReadStream &s) {
+	char buffer[12];
+
+	_cAnimNum = s.readByte();
+	_cAnimSpeed = s.readByte();
+
+	for (int idx = 0; idx < 4; ++idx) {
+		s.read(buffer, 12);
+		_names[idx] = Common::String(buffer);
+	}
+
+	_useFlag = s.readUint16LE();
+	_dFlag[0] = s.readUint16LE();
+	_lFlag[0] = s.readUint16LE();
+	_lFlag[1] = s.readUint16LE();
+
+	s.read(buffer, 12);
+	_target = Common::String(buffer);
+}
+
+/*----------------------------------------------------------------*/
+
+void Object::synchronize(Common::SeekableReadStream &s) {
+	char buffer[50];
+
+	s.read(buffer, 12);
+	_name = Common::String(buffer);
+	s.read(buffer, 41);
+	_description = Common::String(buffer);
+
+	_examine.clear();
+	_sequences = nullptr;
+	_images = nullptr;
+	_imageFrame = nullptr;
+	s.seek(16, SEEK_CUR);
+
+	_walkCount = s.readByte();
+	_allow = s.readByte();
+	_frameNumber = s.readSint16LE();
+	_sequenceNumber = s.readSint16LE();
+	_position.x = s.readSint16LE();
+	_position.y = s.readSint16LE();
+	_movement.x = s.readSint16LE();
+	_movement.y = s.readSint16LE();
+	_type = (SpriteType)s.readUint16LE();
+	_oldPosition.x = s.readSint16LE();
+	_oldPosition.y = s.readSint16LE();
+	_oldSize.x = s.readUint16LE();
+	_oldSize.y = s.readUint16LE();
+	_goto.x = s.readSint16LE();
+	_goto.y = s.readSint16LE();
+	
+	_pickup = s.readByte();
+	_defaultCommand = s.readByte();
+	_lookFlag = s.readUint16LE();
+	_pickupFlag = s.readUint16LE();
+	_requiredFlag = s.readUint16LE();
+	_noShapeSize.x = s.readUint16LE();
+	_noShapeSize.y = s.readUint16LE();
+	_status = s.readUint16LE();
+	_misc = s.readByte();
+	_maxFrames = s.readUint16LE();
+	_flags = s.readByte();	
+	_aOpen.synchronize(s);
+	_aType = s.readByte();
+	_lookFrames = s.readByte();
+	_seqcounter = s.readByte();
+	_lookPosition.x = s.readUint16LE();
+	_lookPosition.y = s.readByte();
+	_lookFacing = s.readByte();
+	_lookcAnim = s.readByte();
+	_aClose.synchronize(s);
+	_seqStack = s.readByte();
+	_seqTo = s.readByte();
+	_descOfs = s.readUint16LE();
+	_seqcounter2 = s.readByte();
+	_seqSize = s.readUint16LE();
+	s.skip(1);
+	_aMove.synchronize(s);
+	s.skip(8);
+	
+	for (int idx = 0; idx < 4; ++idx)
+		_use[idx].synchronize(s);
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
new file mode 100644
index 0000000000..f730240479
--- /dev/null
+++ b/engines/sherlock/objects.h
@@ -0,0 +1,166 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_OBJECTS_H
+#define SHERLOCK_OBJECTS_H
+
+#include "common/scummsys.h"
+#include "common/rect.h"
+#include "common/str-array.h"
+#include "common/str.h"
+#include "sherlock/resources.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+enum ObjectAllow {
+	ALLOW_MOVEMENT = 1, ALLOW_OPEN = 2, ALLOW_CLOSE = 4
+};
+
+enum SpriteType {
+	INVALID = 0,
+	CHARACTER = 1,
+	CURSOR = 2,
+	STATIC_BG_SHAPE = 3,		// Background shape that doesn't animate
+	ACTIVE_BG_SHAPE = 4,		// Background shape that animates
+	REMOVE = 5,					// Object should be removed next frame
+	NO_SHAPE = 6,				// Background object with no shape
+	HIDDEN = 7,					// Hidden backgruond object
+	HIDE_SHAPE = 8				// Object needs to be hidden
+};
+
+#define MAX_HOLMES_SEQUENCE 16
+#define MAX_FRAME 30
+
+struct Sprite {
+	Common::String _name;				// Name
+	Common::String _description;		// Description
+	Common::StringArray _examine;		// Examine in-depth description
+	Common::String _pickUp;				// Message for if you can't pick up object
+
+	const uint8 (*_sequences)[MAX_HOLMES_SEQUENCE][MAX_FRAME];  // Holds animation sequences
+	ImageFile *_images;					// Sprite images
+	ImageFrame *_imageFrame;			// Pointer to shape in the images
+	int _walkCount;						// Character walk counter
+	int _allow;							// Allowed menu commands - ObjectAllow
+	int _frameNumber;					// Frame number in rame sequence to draw
+	int _sequenceNumber;				// Sequence being used
+	Common::Point _position;			// Current position
+	Common::Point _movement;			// Momvement amount
+	Common::Point _oldPosition;			// Old position
+	Common::Point _oldSize;				// Image's old size
+	Common::Point _goto;				// Walk destination
+	SpriteType _type;					// Type of object
+	int _pickup;
+	Common::Point _noShapeSize;			// Size of a NO_SHAPE
+	int _status;						// Status: open/closed, moved/not moved
+	int8 _misc;							// Miscellaneous use
+	int _numFrames;						// How many frames the object has
+
+	Sprite() { clear(); }
+	void clear();
+};
+
+struct ActionType {
+	char _cAnimNum;
+	char _cAnimSpeed;				// if high bit set, play in reverse
+	Common::String _names[4];
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct UseType {
+	int _cAnimNum;
+	int _cAnimSpeed;				// if high bit set, play in reverse
+	Common::String _names[4];
+	int _useFlag;					// Which flag USE will set (if any)
+	int _dFlag[1];
+	int _lFlag[2];
+	Common::String _target;
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct Object {
+	Common::String _name;			// Name
+	Common::String _description;	// Description
+	Common::StringArray _examine;	// Examine in-depth description
+	uint8 (*_sequences)[MAX_HOLMES_SEQUENCE][MAX_FRAME];  // Holds animation sequences
+	ImageFile *_images;				// Sprite images
+	ImageFrame *_imageFrame;		// Pointer to shape in the images
+	int _walkCount;					// Character walk counter
+	int _allow;						// Allowed menu commands - ObjectAllow
+	int _frameNumber;				// Frame number in rame sequence to draw
+	int _sequenceNumber;			// Sequence being used
+	SpriteType _type;				// Object type
+	Common::Point _position;		// Current position
+	Common::Point _movement;		// Momvement amount
+	Common::Point _oldPosition;		// Old position
+	Common::Point _oldSize;			// Image's old size
+	Common::Point _goto;			// Walk destination
+
+	int _pickup;
+	int _defaultCommand;			// Default right-click command
+	int _lookFlag;					// Which flag LOOK   will set (if any)
+	int _pickupFlag;				// Which flag PICKUP will set (if any)
+	int _requiredFlag;				// Object will be hidden if not set
+	Common::Point _noShapeSize;		// Size of a NO_SHAPE
+	int _status;					// Status (open/closed, moved/not)
+	int8 _misc;						// Misc field -- use varies with type
+	int _maxFrames;					// Number of frames
+	int _flags;						// Tells if object can be walked behind
+	ActionType _aOpen;				// Holds data for moving object
+	int _aType;						// Tells if this is an object, person, talk, etc.
+	int _lookFrames;				// How many frames to play of the look anim before pausing
+	int _seqcounter;				// How many times this sequence has been executed
+	Common::Point _lookPosition;	// Where to walk when examining object
+	int _lookFacing;				// Direction to face when examining object
+	int _lookcAnim;
+	ActionType _aClose;
+	int _seqStack;					// Allows gosubs to return to calling frame
+	int _seqTo;						// Allows 1-5, 8-3 type sequences encoded in 2 bytes
+	uint _descOfs;					// Tells where description starts in DescText
+	int _seqcounter2;				// Counter of calling frame sequence
+	uint _seqSize;					// Tells where description starts 
+	ActionType _aMove;
+	UseType _use[4];
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct CAnim {
+	Common::String _name;			// Name
+	int _sequences[MAX_FRAME];		// Animation sequences
+	Common::Point _position;		// Position
+	int _size;						// Size of uncompressed animation
+	SpriteType _type;
+	int _flags;						// Tells if can be walked behind
+	Common::Point _goto;			// coords holmes should walk to before starting canim
+	int _sequenceNumber;
+	Common::Point _teleportPos;		// Location Holmes shoul teleport to after
+	int _teleportS;					// playing canim
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 53ccaf5baf..cdb498e5e6 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -56,7 +56,7 @@ void People::reset() {
 	p._position = Common::Point(10000, 11000);
 	p._sequenceNumber = STOP_DOWNRIGHT;
 	p._sequences = &CHARACTER_SEQUENCES;
-	p._spriteFrame = nullptr;
+	p._imageFrame = nullptr;
 	p._frameNumber = 1;
 	p._movement = Common::Point(0, 0);
 	p._oldPosition = Common::Point(0, 0);
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 4ca7f51444..3f639a6d44 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -24,7 +24,7 @@
 #define SHERLOCK_PEOPLE_H
 
 #include "common/scummsys.h"
-#include "sherlock/sprites.h"
+#include "sherlock/objects.h"
 
 namespace Sherlock {
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index cdea7bd296..66feca6bd5 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -194,6 +194,13 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename, cons
 	return stream;
 }
 
+/**
+ * Returns true if the given file exists on disk or in the cache
+ */
+bool Resources::exists(const Common::String &filename) const {
+	Common::File f;
+	return f.exists(filename) || _cache.isCached(filename);
+}
 
 /**
  * Reads in the index from a library file, and caches it's index for later use
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index ad9867c523..2f9222c1fd 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -82,6 +82,8 @@ public:
 
 	Common::SeekableReadStream *load(const Common::String &filename, const Common::String &libraryFile);
 
+	bool exists(const Common::String &filename) const;
+
 	int resourceIndex() const;
 };
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 84ef44d7e1..267b02b43c 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -21,9 +21,37 @@
  */
 
 #include "sherlock/scene.h"
+#include "sherlock/sherlock.h"
+#include "sherlock/decompress.h"
 
 namespace Sherlock {
 
+void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
+	_numStructs = s.readUint16LE();
+	_numImages = s.readUint16LE();
+	_numcAnimations = s.readUint16LE();
+	_descSize = s.readUint16LE();
+	_seqSize = s.readUint16LE();
+	_fill = s.readUint16LE();
+}
+
+/*----------------------------------------------------------------*/
+
+void BgfileheaderInfo::synchronize(Common::SeekableReadStream &s) {
+	_fSize = s.readUint32LE();
+	_maxFrames = s.readByte();
+
+	char buffer[9];
+	s.read(buffer, 9);
+	_filename = Common::String(buffer);
+}
+
+int _fSize;					// How long images are
+int _maxFrames;				// How many unique frames in object
+Common::String _filename;	// Filename of object
+
+/*----------------------------------------------------------------*/
+
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_stats[idx][0], &_stats[idx][9], false);
@@ -32,6 +60,11 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_numExits = 0;
 	_windowOpen = _infoFlag = false;
 	_menuMode = _keyboardInput = 0;
+	_walkedInScene = false;
+	_ongoingCans = 0;
+	_version = 0;
+	_lzwMode = false;
+	_invGraphicItems = 0;
 
 	_controls = nullptr; // new ImageFile("menu.all");
 }
@@ -48,9 +81,101 @@ void Scene::selectScene() {
 	_oldKey = _help = _oldHelp = 0;
 	_oldTemp = _temp = 0;
 
-	// Set up player
+	// Load the scene
+	Common::String sceneFile = Common::String::format("res%02d", _goToRoom);
+	Common::String roomName = Common::String::format("res%02d.rrm", _goToRoom);
+	_goToRoom = -1;
+
+	loadScene(sceneFile);
+}
+
+/**
+ * Loads the data associated for a given scene. The .BGD file's format is:
+ * BGHEADER: Holds an index for the rest of the file
+ * STRUCTS:  The objects for the scene
+ * IMAGES:   The graphic information for the structures
+ *
+ * The _misc field of the structures contains the number of the graphic image
+ * that it should point to after loading; _misc is then set to 0.
+ */
+void Scene::loadScene(const Common::String &filename) {
+	bool flag;
+
+	_walkedInScene = false;
+	_ongoingCans = 0;
+
+	// Reset the list of walkable areas
+	_roomBounds.clear();
+	_roomBounds.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+	_descText.clear();
+	_comments = "";
+	_bgShapes.clear();
+	_cAnim.clear();
+	_sequenceBuffer.clear();
+
+	//
+	// Load background shapes from <filename>.rrm
+	//
+
+	Common::String rrmFile = filename + ".rrm";
+	flag = _vm->_res->exists(rrmFile);
+	if (flag) {
+		Common::SeekableReadStream *rrmStream = _vm->_res->load(rrmFile);
+
+		rrmStream->seek(39);
+		_version = rrmStream->readByte();
+		_lzwMode = _version == 10;
+
+		// Go to header and read it in
+		rrmStream->seek(rrmStream->readUint32LE());
+		BgFileHeader bgHeader;
+		bgHeader.synchronize(*rrmStream);
+
+		_cAnim.resize(bgHeader._numcAnimations);
+		_invGraphicItems = bgHeader._numImages + 1;
+
+		// Read in the shapes header info
+		Common::Array<BgfileheaderInfo> bgInfo;
+		bgInfo.resize(bgHeader._numStructs);
+
+		for (uint idx = 0; idx < bgInfo.size(); ++idx)
+			bgInfo[idx].synchronize(*rrmStream);
+
+		// Initialize the cAnim
+		for (uint idx = 0; idx < _cAnim.size(); ++idx) {
+			_cAnim[idx]._position.x = -1;
+			_cAnim[idx]._goto.x = -1;
+			_cAnim[idx]._teleportPos.x = -1;
+		}
+
+		// Read information
+		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
+			decompressLZ(*rrmStream, bgHeader._numImages * 569 + 
+				bgHeader._descSize + bgHeader._seqSize);
+
+		_bgShapes.resize(bgHeader._numStructs);
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx)
+			_bgShapes[idx].synchronize(*infoStream);
+
+		if (bgHeader._descSize) {
+			_descText.resize(bgHeader._descSize);
+			infoStream->read(&_descText[0], bgHeader._descSize);
+		}
+
+		if (bgHeader._seqSize) {
+			_sequenceBuffer.resize(bgHeader._seqSize);
+			infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
+		}			
+
+		if (_lzwMode)
+			delete infoStream;
 
+		// Load shapes
+		// TODO
 
+		delete rrmStream;
+	}
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index f92dfccfad..e216c2bd9d 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -24,6 +24,9 @@
 #define SHERLOCK_SCENE_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "sherlock/objects.h"
 #include "sherlock/resources.h"
 
 namespace Sherlock {
@@ -32,11 +35,32 @@ namespace Sherlock {
 
 class SherlockEngine;
 
+struct BgFileHeader {
+	int _numStructs;
+	int _numImages;
+	int _numcAnimations;
+	int _descSize;
+	int _seqSize;
+	int _fill;
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct BgfileheaderInfo {
+	int _fSize;					// How long images are
+	int _maxFrames;				// How many unique frames in object
+	Common::String _filename;	// Filename of object
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
 class Scene {
 private:
 	SherlockEngine *_vm;
 
 	void loadScene();
+
+	void loadScene(const Common::String &filename);
 public:
 	bool _stats[SCENES_COUNT][9];
 	bool _savedStats[SCENES_COUNT][9];
@@ -50,6 +74,17 @@ public:
 	int _menuMode, _keyboardInput;
 	int _oldKey, _help, _oldHelp;
 	int _oldTemp, _temp;
+	bool _walkedInScene;
+	int _ongoingCans;
+	int _version;
+	bool _lzwMode;
+	int _invGraphicItems;
+	Common::String _comments;
+	Common::Array<char> _descText;
+	Common::Array<Common::Rect> _roomBounds;
+	Common::Array<Object> _bgShapes;
+	Common::Array<CAnim> _cAnim;
+	Common::Array<byte> _sequenceBuffer;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a292ee675c..a963d0bfe5 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -34,6 +34,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_debugger = nullptr;
 	_events = nullptr;
 	_journal = nullptr;
+	_people = nullptr;
 	_res = nullptr;
 	_scene = nullptr;
 	_screen = nullptr;
@@ -49,6 +50,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _debugger;
 	delete _events;
 	delete _journal;
+	delete _people;
 	delete _res;
 	delete _scene;
 	delete _screen;
@@ -80,6 +82,7 @@ void SherlockEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
 	_journal = new Journal();
+	_people = new People(this);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
 	_sound = new Sound(this);
@@ -92,12 +95,16 @@ Common::Error SherlockEngine::run() {
 	showOpening();
 
 	while (!shouldQuit()) {
-		// Prepare for scene, and handle any game-specific scenes
+		// Prepare for scene, and handle any game-specific scenes. This allows 
+		// for game specific cutscenes or mini-games that aren't standard scenes
 		startScene();
 		if (shouldQuit())
 			break;
 
-		// Initialize the scene
+		// Reset the active characters to initially just Sherlock
+		_people->reset();
+
+		// Initialize and load the scene. 
 		_scene->selectScene();
 
 		// TODO: Implement game and remove this dummy loop
diff --git a/engines/sherlock/sprites.cpp b/engines/sherlock/sprites.cpp
deleted file mode 100644
index 6e33219309..0000000000
--- a/engines/sherlock/sprites.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/sprites.h"
-
-namespace Sherlock {
-
-} // End of namespace Sherlock
diff --git a/engines/sherlock/sprites.h b/engines/sherlock/sprites.h
deleted file mode 100644
index 631693d815..0000000000
--- a/engines/sherlock/sprites.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_SPRITES_H
-#define SHERLOCK_SPRITES_H
-
-#include "common/scummsys.h"
-#include "common/rect.h"
-#include "common/str-array.h"
-#include "common/str.h"
-#include "sherlock/resources.h"
-
-namespace Sherlock {
-
-class SherlockEngine;
-
-enum ObjectAllow {
-	ALLOW_MOVEMENT = 1, ALLOW_OPEN = 2, ALLOW_CLOSE = 4
-};
-
-enum SpriteType {
-	INVALID = 0,
-	CHARACTER = 1,
-	CURSOR = 2,
-	STATIC_BG_SHAPE = 3,		// Background shape that doesn't animate
-	ACTIVE_BG_SHAPE = 4,		// Background shape that animates
-	REMOVE = 5,					// Object should be removed next frame
-	NO_SHAPE = 6,				// Background object with no shape
-	HIDDEN = 7,					// Hidden backgruond object
-	HIDE_SHAPE = 8				// Object needs to be hidden
-};
-
-#define MAX_HOLMES_SEQUENCE 16
-#define MAX_FRAME 30
-
-struct Sprite {
-	Common::String _name;				// Name
-	Common::String _description;		// Description
-	Common::StringArray _examine;		// Examine in-depth description
-	Common::String _pickUp;				// Message for if you can't pick up object
-
-	const uint8 (*_sequences)[MAX_HOLMES_SEQUENCE][MAX_FRAME];  // Holds animation sequences
-	Sprite *_sprites;					// Sprite shapes
-	ImageFrame *_spriteFrame;			// Pointer to shape in the sprite
-	int _walkCount;						// Character walk counter
-	int _allow;							// Allowed menu commands - ObjectAllow
-	int _frameNumber;					// Frame number in rame sequence to draw
-	int _sequenceNumber;				// Sequence being used
-	Common::Point _position;			// Current position
-	Common::Point _movement;			// Momvement amount
-	Common::Point _oldPosition;			// Old position
-	Common::Point _oldSize;				// Image's old size
-	Common::Point _goto;				// Walk destination
-	SpriteType _type;					// Type of object
-	int _pickup;
-	Common::Point _noShapeSize;			// Size of a NO_SHAPE
-	int _status;						// Status: open/closed, moved/not moved
-	byte _misc;							// Miscellaneous use
-	int _numFrames;						// How many frames the object has
-};
-
-} // End of namespace Sherlock
-
-#endif
-- 
cgit v1.2.3


From 7c967e2f19d7552e7a9cf1b83513237c553b5567 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 20 Mar 2015 11:26:42 +0100
Subject: LOG: fix month in log file

---
 backends/log/log.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backends/log/log.cpp b/backends/log/log.cpp
index 693399bae5..e37296aada 100644
--- a/backends/log/log.cpp
+++ b/backends/log/log.cpp
@@ -93,10 +93,12 @@ void Log::print(const char *message, const bool printTime) {
 
 void Log::printTimeStamp() {
 	TimeDate date;
+	int curMonth;
 	_system->getTimeAndDate(date);
+	curMonth = date.tm_mon + 1; // month is base 0, we need base 1 (1 = january and so on)
 
 	_stream->writeString(Common::String::format("[%d-%02d-%02d %02d:%02d:%02d] ",
-	                     date.tm_year + 1900, date.tm_mon, date.tm_mday,
+	                     date.tm_year + 1900, curMonth, date.tm_mday,
 	                     date.tm_hour, date.tm_min, date.tm_sec));
 }
 
-- 
cgit v1.2.3


From 43381e98197f8adb5ee73f8dc05c81b972fedeae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 20 Mar 2015 07:54:39 -0400
Subject: SHERLOCK: Further scene loading code

---
 engines/sherlock/objects.cpp | 38 ++++++++++++++++--
 engines/sherlock/objects.h   | 19 +++++++--
 engines/sherlock/scene.cpp   | 95 ++++++++++++++++++++++++++++++++++++++------
 engines/sherlock/scene.h     |  5 ++-
 4 files changed, 136 insertions(+), 21 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 2386c00686..73e6397b50 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -101,7 +101,10 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_sequences = nullptr;
 	_images = nullptr;
 	_imageFrame = nullptr;
-	s.seek(16, SEEK_CUR);
+
+	s.skip(4);
+	_sequenceOffset = s.readUint32LE();
+	s.seek(8, SEEK_CUR);
 
 	_walkCount = s.readByte();
 	_allow = s.readByte();
@@ -133,7 +136,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_aOpen.synchronize(s);
 	_aType = s.readByte();
 	_lookFrames = s.readByte();
-	_seqcounter = s.readByte();
+	_seqCounter = s.readByte();
 	_lookPosition.x = s.readUint16LE();
 	_lookPosition.y = s.readByte();
 	_lookFacing = s.readByte();
@@ -141,7 +144,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_aClose.synchronize(s);
 	_seqStack = s.readByte();
 	_seqTo = s.readByte();
-	_descOfs = s.readUint16LE();
+	_descOffset = s.readUint16LE();
 	_seqcounter2 = s.readByte();
 	_seqSize = s.readUint16LE();
 	s.skip(1);
@@ -152,4 +155,33 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 		_use[idx].synchronize(s);
 }
 
+/*----------------------------------------------------------------*/
+
+void CAnim::synchronize(Common::SeekableReadStream &s) {
+	char buffer[12];
+	s.read(buffer, 12);
+	_name = Common::String(buffer);
+
+	s.read(_sequences, 30);
+	_position.x = s.readSint16LE();
+	_position.y = s.readSint16LE();
+	_size = s.readUint32LE();
+	_type = (SpriteType)s.readUint16LE();
+	_flags = s.readByte();
+	_goto.x = s.readSint16LE();
+	_goto.y = s.readSint16LE();
+	_sequenceNumber = s.readSint16LE();
+	_teleportPos.x = s.readSint16LE();
+	_teleportPos.y = s.readSint16LE();
+	_teleportS = s.readSint16LE();
+}
+
+/*----------------------------------------------------------------*/
+
+InvGraphicType::InvGraphicType() {
+	_images = nullptr;
+	_maxFrames = 0;
+	_filesize = 0;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index f730240479..31d9520932 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -104,8 +104,9 @@ struct UseType {
 struct Object {
 	Common::String _name;			// Name
 	Common::String _description;	// Description
-	Common::StringArray _examine;	// Examine in-depth description
-	uint8 (*_sequences)[MAX_HOLMES_SEQUENCE][MAX_FRAME];  // Holds animation sequences
+	Common::String _examine;		// Examine in-depth description
+	int _sequenceOffset;
+	uint8 *_sequences;				// Holds animation sequences
 	ImageFile *_images;				// Sprite images
 	ImageFrame *_imageFrame;		// Pointer to shape in the images
 	int _walkCount;					// Character walk counter
@@ -132,14 +133,14 @@ struct Object {
 	ActionType _aOpen;				// Holds data for moving object
 	int _aType;						// Tells if this is an object, person, talk, etc.
 	int _lookFrames;				// How many frames to play of the look anim before pausing
-	int _seqcounter;				// How many times this sequence has been executed
+	int _seqCounter;				// How many times this sequence has been executed
 	Common::Point _lookPosition;	// Where to walk when examining object
 	int _lookFacing;				// Direction to face when examining object
 	int _lookcAnim;
 	ActionType _aClose;
 	int _seqStack;					// Allows gosubs to return to calling frame
 	int _seqTo;						// Allows 1-5, 8-3 type sequences encoded in 2 bytes
-	uint _descOfs;					// Tells where description starts in DescText
+	uint _descOffset;					// Tells where description starts in DescText
 	int _seqcounter2;				// Counter of calling frame sequence
 	uint _seqSize;					// Tells where description starts 
 	ActionType _aMove;
@@ -159,8 +160,18 @@ struct CAnim {
 	int _sequenceNumber;
 	Common::Point _teleportPos;		// Location Holmes shoul teleport to after
 	int _teleportS;					// playing canim
+
+	void synchronize(Common::SeekableReadStream &s);
 };
 
+struct InvGraphicType {
+	ImageFile *_images;				// Object images
+	int _maxFrames;					// How many frames in object
+	int _filesize;					// File size
+
+	InvGraphicType();
+} ;
+
 } // End of namespace Sherlock
 
 #endif
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 267b02b43c..ffae6f60c1 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -38,7 +38,7 @@ void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
 /*----------------------------------------------------------------*/
 
 void BgfileheaderInfo::synchronize(Common::SeekableReadStream &s) {
-	_fSize = s.readUint32LE();
+	_filesize = s.readUint32LE();
 	_maxFrames = s.readByte();
 
 	char buffer[9];
@@ -71,6 +71,15 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 
 Scene::~Scene() {
 	delete _controls;
+	clear();
+}
+
+/**
+ * Takes care of clearing any scene data
+ */
+void Scene::clear() {
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx)
+		delete _bgShapes[idx]._images;
 }
 
 void Scene::selectScene() {
@@ -108,6 +117,7 @@ void Scene::loadScene(const Common::String &filename) {
 	_roomBounds.clear();
 	_roomBounds.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
+	clear();
 	_descText.clear();
 	_comments = "";
 	_bgShapes.clear();
@@ -131,8 +141,6 @@ void Scene::loadScene(const Common::String &filename) {
 		rrmStream->seek(rrmStream->readUint32LE());
 		BgFileHeader bgHeader;
 		bgHeader.synchronize(*rrmStream);
-
-		_cAnim.resize(bgHeader._numcAnimations);
 		_invGraphicItems = bgHeader._numImages + 1;
 
 		// Read in the shapes header info
@@ -142,20 +150,13 @@ void Scene::loadScene(const Common::String &filename) {
 		for (uint idx = 0; idx < bgInfo.size(); ++idx)
 			bgInfo[idx].synchronize(*rrmStream);
 
-		// Initialize the cAnim
-		for (uint idx = 0; idx < _cAnim.size(); ++idx) {
-			_cAnim[idx]._position.x = -1;
-			_cAnim[idx]._goto.x = -1;
-			_cAnim[idx]._teleportPos.x = -1;
-		}
-
 		// Read information
 		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
 			decompressLZ(*rrmStream, bgHeader._numImages * 569 + 
 				bgHeader._descSize + bgHeader._seqSize);
 
-		_bgShapes.resize(bgHeader._numStructs);
-		for (uint idx = 0; idx < _bgShapes.size(); ++idx)
+		_bgShapes.resize(bgHeader._numStructs + 1);
+		for (int idx = 0; idx < bgHeader._numStructs; ++idx)
 			_bgShapes[idx].synchronize(*infoStream);
 
 		if (bgHeader._descSize) {
@@ -171,11 +172,79 @@ void Scene::loadScene(const Common::String &filename) {
 		if (_lzwMode)
 			delete infoStream;
 
-		// Load shapes
+		// Set up inv list
+		_inv.resize(bgHeader._numImages + 1);
+		for (int idx = 0; idx < bgHeader._numImages; ++idx) {
+			_inv[idx + 1]._filesize = bgInfo[idx]._filesize;
+			_inv[idx + 1]._maxFrames = bgInfo[idx]._maxFrames;
+
+			// Read in the image data
+			Common::SeekableReadStream *imageStream = !_lzwMode ? rrmStream :
+				decompressLZ(*rrmStream, bgInfo[idx]._filesize);
+
+			_inv[idx + 1]._images = new ImageFile(*imageStream);
+
+			if (_lzwMode)
+				delete imageStream;
+		}
+
+		// Set up the bgShapes
+		for (int idx = 0; idx < bgHeader._numStructs; ++idx) {
+			_bgShapes[idx]._examine = Common::String(&_descText[_bgShapes[idx]._descOffset]);
+			_bgShapes[idx]._sequences = &_sequenceBuffer[_bgShapes[idx]._sequenceOffset];
+			_bgShapes[idx]._misc = 0;
+			_bgShapes[idx]._seqCounter = 0;
+			_bgShapes[idx]._seqcounter2 = 0;
+			_bgShapes[idx]._seqStack = 0;
+			_bgShapes[idx]._frameNumber = -1;
+			_bgShapes[idx]._position = Common::Point(0, 0);
+			_bgShapes[idx]._oldSize = Common::Point(1, 1);
+
+			_bgShapes[idx]._images = _inv[_bgShapes[idx]._misc]._images;
+			_bgShapes[idx]._imageFrame = !_bgShapes[idx]._images ? (ImageFrame *)nullptr :
+				&(*_bgShapes[idx]._images)[0];
+		}
+
+		// Set up end of list
+		_bgShapes[bgHeader._numStructs]._sequences = &_sequenceBuffer[0] + bgHeader._seqSize;
+		_bgShapes[bgHeader._numStructs]._examine = nullptr;
+
+		// Load in cAnim list
+		Common::SeekableReadStream *canimStream = !_lzwMode ? rrmStream :
+			decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations);
+
+		_cAnim.resize(bgHeader._numcAnimations);
+		for (uint idx = 0; idx < _cAnim.size(); ++idx)
+			_cAnim[idx].synchronize(*canimStream);
+
+		if (_lzwMode)
+			delete canimStream;
+		
+		// Read in the room bounding areas
+		int size = rrmStream->readUint16LE();
+		Common::SeekableReadStream *boundsStream = !_lzwMode ? rrmStream :
+			decompressLZ(*rrmStream, size);
+
+		_roomBounds.resize(size / 10);
+		for (uint idx = 0; idx < _roomBounds.size(); ++idx) {
+			_roomBounds[idx].left = boundsStream->readSint16LE();
+			_roomBounds[idx].top = boundsStream->readSint16LE();
+			_roomBounds[idx].setWidth(boundsStream->readSint16LE());
+			_roomBounds[idx].setHeight(boundsStream->readSint16LE());
+			boundsStream->skip(2);	// Skip unused scene number field
+		}
+
+		if (_lzwMode)
+			delete boundsStream;
+
+		// Back at version byte, so skip over it
+		rrmStream->skip(1);
+
 		// TODO
 
 		delete rrmStream;
 	}
+
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index e216c2bd9d..2280e169b7 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -47,7 +47,7 @@ struct BgFileHeader {
 };
 
 struct BgfileheaderInfo {
-	int _fSize;					// How long images are
+	int _filesize;				// How long images are
 	int _maxFrames;				// How many unique frames in object
 	Common::String _filename;	// Filename of object
 
@@ -85,10 +85,13 @@ public:
 	Common::Array<Object> _bgShapes;
 	Common::Array<CAnim> _cAnim;
 	Common::Array<byte> _sequenceBuffer;
+	Common::Array<InvGraphicType> _inv;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
 
+	void clear();
+
 	void selectScene();
 };
 
-- 
cgit v1.2.3


From 84631468561c3df20cfd073d20c35344be4c6f3f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 20 Mar 2015 15:30:58 +0100
Subject: SCI: SQ1VGA: added script patch for bug #6816

fixes SQ1VGA Ulence Flats force field generator
script glitch
---
 engines/sci/engine/script_patches.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 45e0155950..5c0e84fa01 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2501,6 +2501,29 @@ static const uint16 sq1vgaPatchUlenceFlatsTimepodGfxGlitch[] = {
 	PATCH_END
 };
 
+// In Ulence Flats, there is a space ship, that you will use at some point.
+//  Near that space ship are 2 force field generators.
+//  When you look at the top of those generators, the game will crash.
+//  This happens also in Sierra SCI. It's caused by a jump, that goes out of bounds.
+//  We currently do not know if this was caused by a compiler glitch or if it was a developer error.
+//  Anyway we patch this glitchy code, so that the game won't crash anymore.
+//
+// Applies to at least: English Floppy
+// Responsible method: radar1::doVerb
+// Fixes bug: #6816
+static const uint16 sq1vgaSignatureUlenceFlatsGeneratorGlitch[] = {
+	SIG_MAGICDWORD, 0x1a,               // eq?
+	0x30, SIG_UINT16(0xcdf4),           // bnt absolute 0xf000
+	SIG_END
+};
+
+static const uint16 sq1vgaPatchUlenceFlatsGeneratorGlitch[] = {
+	PATCH_ADDTOOFFSET(+1),
+	0x32, PATCH_UINT16(0x0000),         // jmp 0x0000 (waste bytes)
+	PATCH_END
+};
+
+// No documentation for this patch (TODO)
 static const uint16 sq1vgaSignatureEgoShowsCard[] = {
 	SIG_MAGICDWORD,
 	0x38, SIG_SELECTOR16(timesShownID), // push "timesShownID"
@@ -2625,6 +2648,7 @@ static const uint16 sq1vgaPatchSpiderDroidTiming[] = {
 //          script, description,                                      signature                                   patch
 static const SciScriptPatcherEntry sq1vgaSignatures[] = {
 	{  true,    45, "Ulence Flats: timepod graphic glitch",        1, sq1vgaSignatureUlenceFlatsTimepodGfxGlitch, sq1vgaPatchUlenceFlatsTimepodGfxGlitch },
+	{  true,    45, "Ulence Flats: force field generator glitch",  1, sq1vgaSignatureUlenceFlatsGeneratorGlitch,  sq1vgaPatchUlenceFlatsGeneratorGlitch },
 	{  true,    58, "Sarien armory droid zapping ego first time",  1, sq1vgaSignatureEgoShowsCard,                sq1vgaPatchEgoShowsCard },
 	{  true,   704, "spider droid timing issue",                   1, sq1vgaSignatureSpiderDroidTiming,           sq1vgaPatchSpiderDroidTiming },
 	SCI_SIGNATUREENTRY_TERMINATOR
-- 
cgit v1.2.3


From 7f9f3051117d0101088c368c925e8f40d909dc6d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 20 Mar 2015 16:06:19 +0100
Subject: SCI: improve debug output for signature mismatch

dump parameter list to debugger as well
---
 engines/sci/engine/kernel.cpp | 45 ++++++++++++++++++++++++++-----------------
 engines/sci/engine/kernel.h   |  2 +-
 engines/sci/engine/vm.cpp     | 18 +++++++++++------
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 2b16bb3d99..bfb7bfcd08 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -432,57 +432,66 @@ static const SignatureDebugType signatureDebugTypeList[] = {
 	{ 0,                      NULL }
 };
 
-static void kernelSignatureDebugType(const uint16 type) {
+static void kernelSignatureDebugType(Common::String &signatureDetailsStr, const uint16 type) {
 	bool firstPrint = true;
 
 	const SignatureDebugType *list = signatureDebugTypeList;
 	while (list->typeCheck) {
 		if (type & list->typeCheck) {
 			if (!firstPrint)
-				debugN(", ");
-			debugN("%s", list->text);
+//				debugN(", ");
+				signatureDetailsStr += ", ";
+//			debugN("%s", list->text);
+//			signatureDetailsStr += signatureDetailsStr.format("%s", list->text);
+			signatureDetailsStr += list->text;
 			firstPrint = false;
 		}
 		list++;
 	}
 }
 
-// Shows kernel call signature and current arguments for debugging purposes
-void Kernel::signatureDebug(const uint16 *sig, int argc, const reg_t *argv) {
+// Create string, that holds the details of a kernel call signature and current arguments
+//  For debugging purposes
+void Kernel::signatureDebug(Common::String &signatureDetailsStr, const uint16 *sig, int argc, const reg_t *argv) {
 	int argnr = 0;
+
+	// add ERROR: to debug output
+	debugN("ERROR:");
+
 	while (*sig || argc) {
-		debugN("parameter %d: ", argnr++);
+		// add leading spaces for additional parameters
+		signatureDetailsStr += signatureDetailsStr.format("parameter %d: ", argnr++);
 		if (argc) {
 			reg_t parameter = *argv;
-			debugN("%04x:%04x (", PRINT_REG(parameter));
+			signatureDetailsStr += signatureDetailsStr.format("%04x:%04x (", PRINT_REG(parameter));
 			int regType = findRegType(parameter);
 			if (regType)
-				kernelSignatureDebugType(regType);
+				kernelSignatureDebugType(signatureDetailsStr, regType);
 			else
-				debugN("unknown type of %04x:%04x", PRINT_REG(parameter));
-			debugN(")");
+				signatureDetailsStr += signatureDetailsStr.format("unknown type of %04x:%04x", PRINT_REG(parameter));
+			signatureDetailsStr += ")";
 			argv++;
 			argc--;
 		} else {
-			debugN("not passed");
+			signatureDetailsStr += "not passed";
 		}
 		if (*sig) {
 			const uint16 signature = *sig;
 			if ((signature & SIG_MAYBE_ANY) == SIG_MAYBE_ANY) {
-				debugN(", may be any");
+				signatureDetailsStr += ", may be any";
 			} else {
-				debugN(", should be ");
-				kernelSignatureDebugType(signature);
+				signatureDetailsStr += ", should be ";
+				kernelSignatureDebugType(signatureDetailsStr, signature);
 			}
 			if (signature & SIG_IS_OPTIONAL)
-				debugN(" (optional)");
+				signatureDetailsStr += " (optional)";
 			if (signature & SIG_NEEDS_MORE)
-				debugN(" (needs more)");
+				signatureDetailsStr += " (needs more)";
 			if (signature & SIG_MORE_MAY_FOLLOW)
-				debugN(" (more may follow)");
+				signatureDetailsStr += " (more may follow)";
 			sig++;
 		}
-		debugN("\n");
+		signatureDetailsStr += "\n";
 	}
 }
 
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index a65bcb7df5..57b4d9455b 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -186,7 +186,7 @@ public:
 	bool signatureMatch(const uint16 *sig, int argc, const reg_t *argv);
 
 	// Prints out debug information in case a signature check fails
-	void signatureDebug(const uint16 *sig, int argc, const reg_t *argv);
+	void signatureDebug(Common::String &signatureDetails, const uint16 *sig, int argc, const reg_t *argv);
 
 	/**
 	 * Determines the type of the object indicated by reg.
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 06858540ec..6f02c96de8 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -358,12 +358,15 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
 		SciTrackOriginReply originReply;
 		SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kernelCall.workarounds, &originReply);
 		switch (solution.type) {
-		case WORKAROUND_NONE:
-			kernel->signatureDebug(kernelCall.signature, argc, argv);
-			error("[VM] k%s[%x]: signature mismatch via method %s::%s (room %d, script %d, localCall 0x%x)",
+		case WORKAROUND_NONE: {
+			Common::String signatureDetailsStr;
+			kernel->signatureDebug(signatureDetailsStr, kernelCall.signature, argc, argv);
+			error("\n%s[VM] k%s[%x]: signature mismatch in method %s::%s (room %d, script %d, localCall 0x%x)",
+				signatureDetailsStr.c_str(),
 				kernelCall.name, kernelCallNr, originReply.objectName.c_str(), originReply.methodName.c_str(),
 				s->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset);
 			break;
+			}
 		case WORKAROUND_IGNORE: // don't do kernel call, leave acc alone
 			return;
 		case WORKAROUND_STILLCALL: // call kernel anyway
@@ -408,15 +411,18 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
 			SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kernelSubCall.workarounds, &originReply);
 			switch (solution.type) {
 			case WORKAROUND_NONE: {
-				kernel->signatureDebug(kernelSubCall.signature, argc, argv);
+				Common::String signatureDetailsStr;
+				kernel->signatureDebug(signatureDetailsStr, kernelSubCall.signature, argc, argv);
 				int callNameLen = strlen(kernelCall.name);
 				if (strncmp(kernelCall.name, kernelSubCall.name, callNameLen) == 0) {
 					const char *subCallName = kernelSubCall.name + callNameLen;
-					error("[VM] k%s(%s): signature mismatch via method %s::%s (room %d, script %d, localCall %x)",
+					error("\n%s[VM] k%s(%s): signature mismatch in method %s::%s (room %d, script %d, localCall %x)",
+						signatureDetailsStr.c_str(),
 						kernelCall.name, subCallName, originReply.objectName.c_str(), originReply.methodName.c_str(),
 						s->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset);
 				}
-				error("[VM] k%s: signature mismatch via method %s::%s (room %d, script %d, localCall %x)",
+				error("\n%s[VM] k%s: signature mismatch in method %s::%s (room %d, script %d, localCall %x)",
+					signatureDetailsStr.c_str(),
 					kernelSubCall.name, originReply.objectName.c_str(), originReply.methodName.c_str(),
 					s->currentRoomNumber(), originReply.scriptNr, originReply.localCallOffset);
 				break;
-- 
cgit v1.2.3


From 1f65284ada41b7156b5d68507fcdad6255694140 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 20 Mar 2015 23:58:47 +0100
Subject: SCI: QFG1VGA: added script patch fixes bug #6706

fixes healer's hut buy/steal issue
effectively removes 60 tick delay from script
---
 engines/sci/engine/script_patches.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 5c0e84fa01..b6b9f72996 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2140,6 +2140,7 @@ static const uint16 qfg1vgaPatchCheetaurDescription[] = {
 // Local 5 of that room is a timer, that closes the door (object door11).
 // Setting it to 1 during happyFace::changeState(0) stops door11::doit from
 //  calling goTo6::init, so the whole issue is stopped from happening.
+//
 // Applies to at least: English floppy
 // Responsible method: happyFace::changeState, door11::doit
 // Fixes bug #6181
@@ -2166,8 +2167,40 @@ static const uint16 qfg1vgaPatchFunnyRoomFix[] = {
 	PATCH_END
 };
 
+// The player is able to buy (and also steal) potions in the healer's hut
+//  Strangely Sierra delays the actual buy/get potion code for 60 ticks
+//  Why they did that is unknown. The code is triggered anyway only after
+//  the relevant dialog boxes are closed.
+//
+// This delay causes problems in case the user quickly enters the inventory.
+// That's why we remove the code related to the delay completely.
+//
+// Applies to at least: English floppy
+// Responsible method: cueItScript::changeState
+// Fixes bug #6706
+static const uint16 qfg1vgaSignatureHealerHutNoDelay[] = {
+	0x65, 0x14,                         // aTop 14 (state)
+	0x36,                               // push
+	0x3c,                               // dup
+	0x35, 0x00,                         // ldi 00
+	0x1a,                               // eq?
+	0x31, 0x07,                         // bnt 07 [-> next state]
+	SIG_MAGICDWORD,
+	0x35, 0x3c,                         // ldi 3c (60 ticks)
+	0x65, 0x20,                         // aTop ticks
+	0x32,                               // jmp [-> end of method]
+	SIG_END
+};
+
+static const uint16 qfg1vgaPatchHealerHutNoDelay[] = {
+	PATCH_ADDTOOFFSET(+9),
+	0x35, 0x01,                         // ldi 01 (1 tick only, so that execution will resume as soon as dialog box is closed)
+	PATCH_END
+};
+
 //          script, description,                                      signature                            patch
 static const SciScriptPatcherEntry qfg1vgaSignatures[] = {
+	{  true,    55, "healer's hut, no delay for buy/steal",        1, qfg1vgaSignatureHealerHutNoDelay,    qfg1vgaPatchHealerHutNoDelay },
 	{  true,   215, "fight event issue",                           1, qfg1vgaSignatureFightEvents,         qfg1vgaPatchFightEvents },
 	{  true,   216, "weapon master event issue",                   1, qfg1vgaSignatureFightEvents,         qfg1vgaPatchFightEvents },
 	{  true,   814, "window text temp space",                      1, qfg1vgaSignatureTempSpace,           qfg1vgaPatchTempSpace },
-- 
cgit v1.2.3


From 4550e8c5ef0429e1c917d455049419871acfabec Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 21 Mar 2015 00:05:22 +0100
Subject: SCI: fix script patch description

---
 engines/sci/engine/script_patches.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index b6b9f72996..711078d29c 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2173,7 +2173,8 @@ static const uint16 qfg1vgaPatchFunnyRoomFix[] = {
 //  the relevant dialog boxes are closed.
 //
 // This delay causes problems in case the user quickly enters the inventory.
-// That's why we remove the code related to the delay completely.
+// That's why we change the amount of ticks to 1, so that the remaining states
+//  are executed right after the dialog boxes are closed.
 //
 // Applies to at least: English floppy
 // Responsible method: cueItScript::changeState
-- 
cgit v1.2.3


From cf92e540db2d58f243abe595da40a7da4450911f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 20 Mar 2015 19:44:32 -0400
Subject: SHERLOCK: More scene loading code and support methods

---
 engines/sherlock/objects.cpp  |  37 +++++++-
 engines/sherlock/objects.h    |  26 +++++-
 engines/sherlock/scene.cpp    | 196 ++++++++++++++++++++++++++++++++++++++++--
 engines/sherlock/scene.h      |  48 ++++++++++-
 engines/sherlock/screen.cpp   |   2 +
 engines/sherlock/screen.h     |   3 +
 engines/sherlock/sherlock.cpp |   1 +
 engines/sherlock/sherlock.h   |   2 +
 engines/sherlock/sound.cpp    |   4 +
 engines/sherlock/sound.h      |   1 +
 10 files changed, 308 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 73e6397b50..aa9b391f96 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -134,7 +134,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_maxFrames = s.readUint16LE();
 	_flags = s.readByte();	
 	_aOpen.synchronize(s);
-	_aType = s.readByte();
+	_aType = (AType)s.readByte();
 	_lookFrames = s.readByte();
 	_seqCounter = s.readByte();
 	_lookPosition.x = s.readUint16LE();
@@ -155,6 +155,41 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 		_use[idx].synchronize(s);
 }
 
+void Object::toggleHidden() {
+	if (_type != HIDDEN && _type != HIDE_SHAPE && _type != INVALID) {
+		if (_seqTo != 0)
+			_sequences[_frameNumber] = _seqTo + SEQ_TO_CODE + 128;
+		_seqTo = 0;
+
+		if (_images == nullptr || _images->size() == 0)
+			// No shape to erase, so flag as hidden
+			_type = HIDDEN;
+		else
+			// Otherwise, flag it to be hidden after it gets erased
+			_type = HIDE_SHAPE;
+	} else if (_type != INVALID) {
+		if (_seqTo != 0)
+			_sequences[_frameNumber] = _seqTo + SEQ_TO_CODE + 128;
+		_seqTo = 0;
+
+		_seqCounter = _seqcounter2 = 0;
+		_seqStack = 0;
+		_frameNumber = -1;
+
+		if (_images == nullptr || _images->size() == 0) {
+			_type = NO_SHAPE;
+		} else {
+			_type = ACTIVE_BG_SHAPE;
+			int idx = _sequences[0];
+			if (idx >= _maxFrames)
+				// Turn on: set up first frame
+				idx = 0;
+
+			_imageFrame = &(*_images)[idx];
+		}
+	}
+}
+
 /*----------------------------------------------------------------*/
 
 void CAnim::synchronize(Common::SeekableReadStream &s) {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 31d9520932..f3879b1143 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -49,9 +49,31 @@ enum SpriteType {
 	HIDE_SHAPE = 8				// Object needs to be hidden
 };
 
+enum AType {
+	OBJECT		= 0,
+	PERSON		= 1,
+	SOLID		= 2,
+	TALK		= 3,  // Standard talk zone
+	FLAG_SET	= 4,
+	DELTA		= 5,
+	WALK_AROUND	= 6,
+	TALK_EVERY	= 7,  // Talk zone that turns on every room visit
+	TALK_MOVE	= 8,  // Talk zone that only activates when Holmes moves
+	PAL_CHANGE	= 9,  // Changes the palette down so that it gets darker
+	PAL_CHANGE2	= 10, // Same as PAL_CHANGE, except that it goes up
+	SCRIPT_ZONE	= 11, // If this is clicked in, it is activated
+	BLANK_ZONE	= 12, // This masks out other objects when entered
+	NOWALK_ZONE = 13  // Player cannot walk here
+};
+
 #define MAX_HOLMES_SEQUENCE 16
 #define MAX_FRAME 30
 
+// code put into sequences to defines 1-10 type seqs
+#define SEQ_TO_CODE 67			
+#define FLIP_CODE (64 + 128)
+#define SOUND_CODE (34 + 128)
+
 struct Sprite {
 	Common::String _name;				// Name
 	Common::String _description;		// Description
@@ -131,7 +153,7 @@ struct Object {
 	int _maxFrames;					// Number of frames
 	int _flags;						// Tells if object can be walked behind
 	ActionType _aOpen;				// Holds data for moving object
-	int _aType;						// Tells if this is an object, person, talk, etc.
+	AType _aType;					// Tells if this is an object, person, talk, etc.
 	int _lookFrames;				// How many frames to play of the look anim before pausing
 	int _seqCounter;				// How many times this sequence has been executed
 	Common::Point _lookPosition;	// Where to walk when examining object
@@ -147,6 +169,8 @@ struct Object {
 	UseType _use[4];
 
 	void synchronize(Common::SeekableReadStream &s);
+
+	void toggleHidden();
 };
 
 struct CAnim {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index ffae6f60c1..86e347d011 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -46,18 +46,47 @@ void BgfileheaderInfo::synchronize(Common::SeekableReadStream &s) {
 	_filename = Common::String(buffer);
 }
 
-int _fSize;					// How long images are
-int _maxFrames;				// How many unique frames in object
-Common::String _filename;	// Filename of object
+/*----------------------------------------------------------------*/
+
+void Exit::synchronize(Common::SeekableReadStream &s) {
+	_position.x = s.readSint16LE();
+	_position.y = s.readSint16LE();
+	_size.x = s.readSint16LE();
+	_size.y = s.readSint16LE();
+	_scene = s.readSint16LE();
+	_allow = s.readSint16LE();
+	_people.x = s.readSint16LE();
+	_people.y = s.readSint16LE();
+	_peopleDir = s.readUint16LE();
+}
+
+/*----------------------------------------------------------------*/
+
+void SceneEntry::synchronize(Common::SeekableReadStream &s) {
+	_startPosition.x = s.readSint16LE();
+	_startPosition.y = s.readSint16LE();
+	_startDir = s.readByte();
+	_allow = s.readByte();
+}
+
+void SceneSound::synchronize(Common::SeekableReadStream &s) {
+	char buffer[9];
+	s.read(buffer, 8);
+	buffer[8] = '\0';
+
+	_name = Common::String(buffer);
+	_priority = s.readByte();
+}
 
 /*----------------------------------------------------------------*/
 
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_stats[idx][0], &_stats[idx][9], false);
+	_currentScene = -1;
 	_goToRoom = -1;
+	_changes = false;
 	_oldCharPoint = 0;
-	_numExits = 0;
 	_windowOpen = _infoFlag = false;
 	_menuMode = _keyboardInput = 0;
 	_walkedInScene = false;
@@ -66,10 +95,12 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_lzwMode = false;
 	_invGraphicItems = 0;
 
+	_controlPanel = new ImageFile("controls.vgs");
 	_controls = nullptr; // new ImageFile("menu.all");
 }
 
 Scene::~Scene() {
+	delete _controlPanel;
 	delete _controls;
 	clear();
 }
@@ -78,13 +109,10 @@ Scene::~Scene() {
  * Takes care of clearing any scene data
  */
 void Scene::clear() {
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx)
-		delete _bgShapes[idx]._images;
 }
 
 void Scene::selectScene() {
 	// Reset fields
-	_numExits = 0;
 	_windowOpen = _infoFlag = false;
 	_menuMode = _keyboardInput = 0;
 	_oldKey = _help = _oldHelp = 0;
@@ -93,6 +121,7 @@ void Scene::selectScene() {
 	// Load the scene
 	Common::String sceneFile = Common::String::format("res%02d", _goToRoom);
 	Common::String roomName = Common::String::format("res%02d.rrm", _goToRoom);
+	_currentScene = _goToRoom;
 	_goToRoom = -1;
 
 	loadScene(sceneFile);
@@ -108,6 +137,8 @@ void Scene::selectScene() {
  * that it should point to after loading; _misc is then set to 0.
  */
 void Scene::loadScene(const Common::String &filename) {
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
 	bool flag;
 
 	_walkedInScene = false;
@@ -240,11 +271,160 @@ void Scene::loadScene(const Common::String &filename) {
 		// Back at version byte, so skip over it
 		rrmStream->skip(1);
 
-		// TODO
+		// Load the walk directory
+		for (int idx1 = 0; idx1 < MAX_ZONES; ++idx1) {
+			for (int idx2 = 0; idx2 < MAX_ZONES; ++idx2)
+				_walkDirectory[idx1][idx2] = rrmStream->readSint16LE();
+		}
+
+		// Read in the walk data
+		size = rrmStream->readUint16LE();
+		Common::SeekableReadStream *walkStream = !_lzwMode ? rrmStream :
+			decompressLZ(*rrmStream, size);
+
+		_walkData.resize(size);
+		walkStream->read(&_walkData[0], size);
+
+		if (_lzwMode)
+			delete walkStream;
+
+		// Read in the exits
+		int numExits = rrmStream->readByte();
+		_exits.resize(numExits);
+
+		for (int idx = 0; idx < numExits; ++idx)
+			_exits[idx].synchronize(*rrmStream);
+
+		// Read in the entrance
+		_entrance.synchronize(*rrmStream);
+
+		// Initialize sound list
+		int numSounds = rrmStream->readByte();
+		_sounds.resize(numSounds);
+
+		for (int idx = 0; idx < numSounds; ++idx)
+			_sounds[idx].synchronize(*rrmStream);
+
+		// If sound is turned on, load the sounds into memory
+		if (sound._sfxEnabled) {
+			for (int idx = 0; idx < numSounds; ++idx) {
+				sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
+				_sounds[idx]._name = "";
+			}
+		}
+
+		// Read in palette
+		rrmStream->read(screen._cMap, PALETTE_SIZE);
+		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+			screen._cMap[idx] = VGA_COLOR_TRANS(screen._cMap[idx]);
+		
+		Common::copy(screen._cMap, screen._cMap + PALETTE_SIZE, screen._sMap);
+
+		// Read in the background
+		Common::SeekableReadStream *bgStream = !_lzwMode ? rrmStream :
+			decompressLZ(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
+
+		bgStream->read(screen._backBuffer.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
+
+		if (_lzwMode)
+			delete bgStream;
+
+		// Set the palette
+		screen._backBuffer2.blitFrom(screen._backBuffer);
+		screen.setPalette(screen._cMap);
 
 		delete rrmStream;
 	}
 
+	// Clear user interface area and draw controls
+	screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
+	screen._backBuffer.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+
+	_changes = false;
+	checkSceneStatus();
+
+	if (!_vm->_justLoaded) {
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			if (_bgShapes[idx]._type == HIDDEN && _bgShapes[idx]._aType == TALK_EVERY)
+				_bgShapes[idx].toggleHidden();
+		}
+
+		// Check for TURNON objects
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			if (_bgShapes[idx]._type == HIDDEN && (_bgShapes[idx]._flags & 0x20))
+				_bgShapes[idx].toggleHidden();
+		}
+
+		// Check for TURNOFF objects
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			if (_bgShapes[idx]._type != HIDDEN && (_bgShapes[idx]._flags & 0x40) &&
+					_bgShapes[idx]._type != INVALID)
+				_bgShapes[idx].toggleHidden();
+		}
+	}
+
+	checkSceneFlags(false);
+	checkInventory();
+
+	// TODO
+}
+
+/**
+ * Set objects to their current persistent state. This includes things such as
+ * opening or moving them
+ */
+void Scene::checkSceneStatus() {
+	if (_stats[_currentScene][8]) {
+		for (int idx = 0; idx < 8; ++idx) {
+			int val = _stats[_currentScene][idx];
+
+			for (int bit = 0; bit < 8; ++bit) {
+				uint objNumber = idx * 8 + bit;
+				if (objNumber < _bgShapes.size()) {
+					Object &obj = _bgShapes[objNumber];
+
+					if (val & 1) {
+						// No shape to erase, so flag as hidden
+						obj._type = HIDDEN;
+					} else if (obj._images == nullptr || obj._images->size() == 0) {
+						// No shape
+						obj._type = NO_SHAPE;
+					} else {
+						obj._type = ACTIVE_BG_SHAPE;
+					}
+				} else {
+					// Finished checks
+					return;
+				}
+
+				val >>= 1;
+			}
+		}
+	}
+}
+
+/**
+ * Check the scene's objects against the game flags. If false is passed,
+ * it means the scene has just been loaded. A value of true means that the scene
+ * is in use (ie. not just loaded)
+ */
+void Scene::checkSceneFlags(bool flag) {
+	int mode = mode ? HIDE_SHAPE : HIDDEN;
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		// TODO: read_flags calls
+	}
+}
+
+/**
+ * Checks scene objects against the player's inventory items. If there are any
+ * matching names, it means the given item has already been picked up, and should
+ * be hidden in the scene.
+ */
+void Scene::checkInventory() {
+
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 2280e169b7..ae4fcfdb45 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -32,6 +32,10 @@
 namespace Sherlock {
 
 #define SCENES_COUNT 63
+#define MAX_ZONES    40
+#define INFO_LINE   140
+#define CONTROLS_Y  138
+#define CONTROLS_Y1 151
 
 class SherlockEngine;
 
@@ -54,6 +58,33 @@ struct BgfileheaderInfo {
 	void synchronize(Common::SeekableReadStream &s);
 };
 
+struct Exit {
+	Common::Point _position;
+	Common::Point _size;
+
+	int _scene;
+	int _allow;
+	Common::Point _people;
+	int _peopleDir;
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct SceneEntry {
+	Common::Point _startPosition;
+	int _startDir;
+	int _allow;
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct SceneSound {
+	Common::String _name;
+	int _priority;
+
+	void synchronize(Common::SeekableReadStream &s);
+};
+
 class Scene {
 private:
 	SherlockEngine *_vm;
@@ -61,15 +92,23 @@ private:
 	void loadScene();
 
 	void loadScene(const Common::String &filename);
+
+	void checkSceneStatus();
+
+	void checkSceneFlags(bool mode);
+
+	void checkInventory();
 public:
+	int _currentScene;
+	int _goToRoom;
+	bool _changes;
 	bool _stats[SCENES_COUNT][9];
 	bool _savedStats[SCENES_COUNT][9];
-	int _goToRoom;
 	Common::Point _bigPos;
 	Common::Point _overPos;
 	int _oldCharPoint;
 	ImageFile *_controls;
-	int _numExits;
+	ImageFile *_controlPanel;
 	bool _windowOpen, _infoFlag;
 	int _menuMode, _keyboardInput;
 	int _oldKey, _help, _oldHelp;
@@ -86,6 +125,11 @@ public:
 	Common::Array<CAnim> _cAnim;
 	Common::Array<byte> _sequenceBuffer;
 	Common::Array<InvGraphicType> _inv;
+	int _walkDirectory[MAX_ZONES][MAX_ZONES];
+	Common::Array<byte> _walkData;
+	Common::Array<Exit> _exits;
+	SceneEntry _entrance;
+	Common::Array<SceneSound> _sounds;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 0ec5df9c4c..b322b96d6b 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -32,6 +32,8 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
 	_transitionSeed = 1;
 	_fadeStyle = false;
+	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
+	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
 	setFont(1);
 }
 
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 05fd80a8b7..2c5e585475 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -34,6 +34,7 @@ namespace Sherlock {
 #define PALETTE_SIZE 768
 #define PALETTE_COUNT 256
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
+#define INFO_BLACK 1
 
 class SherlockEngine;
 
@@ -52,6 +53,8 @@ protected:
 public:
 	Surface _backBuffer, _backBuffer2;
 	bool _fadeStyle;
+	byte _cMap[PALETTE_SIZE];
+	byte _sMap[PALETTE_SIZE];
 public:
 	Screen(SherlockEngine *vm);
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a963d0bfe5..115d9f0130 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -43,6 +43,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_useEpilogue2 = false;
 	_hsavedPos = Common::Point(-1, -1);
 	_hsavedFs = -1;
+	_justLoaded = false;
 }
 
 SherlockEngine::~SherlockEngine() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 210e24c320..c31416f91e 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -59,6 +59,7 @@ enum {
 
 #define SHERLOCK_SCREEN_WIDTH 320
 #define SHERLOCK_SCREEN_HEIGHT 200
+#define SHERLOCK_SCENE_HEIGHT 138
 
 struct SherlockGameDescription;
 
@@ -91,6 +92,7 @@ public:
 	bool _useEpilogue2;
 	Common::Point _hsavedPos;
 	int _hsavedFs;
+	bool _justLoaded;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index efc1965637..61c740ea3f 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -32,6 +32,10 @@ Sound::Sound(SherlockEngine *vm): _vm(vm) {
 	_music = false;
 }
 
+void Sound::loadSound(const Common::String &name, int priority) {
+	// TODO
+}
+
 void Sound::playSound(const Common::String &name, WaitType waitType) {
 	// TODO
 }
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 442e908838..9d323833f1 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -46,6 +46,7 @@ public:
 public:
 	Sound(SherlockEngine *vm);
 
+	void loadSound(const Common::String &name, int priority);
 	void playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
 	void cacheSound(const Common::String &name, int index);
 	void playCachedSound(int index);
-- 
cgit v1.2.3


From f0ad2f624bddcc031c99a487bff1d5ec89956477 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 20 Mar 2015 22:01:52 -0400
Subject: SHERLOCK: More scene loading, implemented Inventory class

---
 engines/sherlock/inventory.cpp       | 27 ++++++++++
 engines/sherlock/inventory.h         | 18 +++++--
 engines/sherlock/module.mk           |  1 +
 engines/sherlock/objects.cpp         |  6 +++
 engines/sherlock/objects.h           |  3 ++
 engines/sherlock/people.cpp          | 18 +++++++
 engines/sherlock/people.h            |  4 ++
 engines/sherlock/scalpel/scalpel.cpp | 16 ++++++
 engines/sherlock/scene.cpp           | 96 ++++++++++++++++++++++++++++++++++--
 engines/sherlock/scene.h             | 10 ++--
 engines/sherlock/sherlock.cpp        | 24 +++++++++
 engines/sherlock/sherlock.h          |  9 ++++
 12 files changed, 218 insertions(+), 14 deletions(-)
 create mode 100644 engines/sherlock/inventory.cpp

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
new file mode 100644
index 0000000000..634e664f5a
--- /dev/null
+++ b/engines/sherlock/inventory.cpp
@@ -0,0 +1,27 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/inventory.h"
+
+namespace Sherlock {
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index de4a2d7758..dc56e93841 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -24,15 +24,23 @@
 #define SHERLOCK_INVENTORY_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
 
 namespace Sherlock {
 
 struct InventoryItem {
-	int stringIndex;
-	char name[12];
-	char description[41];
-	char name2[9];
-	uint16 value;
+	int _requiredFlag;
+	Common::String _name;
+	Common::String _description;;
+	Common::String _examine;
+	int _lookFlag;
+};
+
+class Inventory : public Common::Array<InventoryItem> {
+public:
+	uint _holdings;
+
+	Inventory() : Common::Array<InventoryItem>(), _holdings(0) {}
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index dc88ab3f5f..aa8f495742 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -11,6 +11,7 @@ MODULE_OBJS = \
 	detection.o \
 	events.o \
 	graphics.o \
+	inventory.o \
 	journal.o \
 	objects.o \
 	people.o \
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index aa9b391f96..d696954cda 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -51,6 +51,12 @@ void Sprite::clear() {
 	_numFrames = 0;
 }
 
+void Sprite::setImageFrame() {
+	// TODO: check this
+	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber];
+	_imageFrame = &(*_images)[imageNumber];
+}
+
 /*----------------------------------------------------------------*/
 
 void ActionType::synchronize(Common::SeekableReadStream &s) {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index f3879b1143..d43b70f4e9 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -100,7 +100,10 @@ struct Sprite {
 	int _numFrames;						// How many frames the object has
 
 	Sprite() { clear(); }
+	
 	void clear();
+
+	void setImageFrame();
 };
 
 struct ActionType {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index cdb498e5e6..b4bbef2e1a 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -46,6 +46,12 @@ static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 
 
 People::People(SherlockEngine *vm) : _vm(vm) {
+	_walkLoaded = false;
+}
+
+People::~People() {
+	if (_walkLoaded)
+		delete _data[PLAYER]._images;
 }
 
 void People::reset() {
@@ -70,4 +76,16 @@ void People::reset() {
 	p._status = 0;
 }
 
+bool People::loadWalk() {
+	if (_walkLoaded) {
+		return false;
+	} else {
+		_data[PLAYER]._images = new ImageFile("walk.vgs");
+		_data[PLAYER].setImageFrame();
+		_walkLoaded = true;
+
+		return true;
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 3f639a6d44..4bdc6a88f0 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -46,10 +46,14 @@ class People {
 private:
 	SherlockEngine *_vm;
 	Sprite _data[MAX_PEOPLE];
+	bool _walkLoaded;
 public:
 	People(SherlockEngine *vm);
+	~People();
 
 	void reset();
+
+	bool loadWalk();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index ca04153594..40ca9736d6 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -27,6 +27,18 @@ namespace Sherlock {
 
 namespace Scalpel {
 
+#define NUM_PLACES 100
+const int MAP_X[NUM_PLACES] = { 
+	0, 368, 0, 219, 0, 282, 0, 43, 0, 0, 396, 408, 0, 0, 0, 568, 37, 325, 
+	28, 0, 263, 36, 148, 469, 342, 143, 443, 229, 298, 0, 157, 260, 432, 
+	174, 0, 351, 0, 528, 0, 136, 0, 0, 0, 555, 165, 0, 506, 0, 0, 344, 0, 0 
+};
+const int MAP_Y[NUM_PLACES] = { 
+	0, 147, 0, 166, 0, 109, 0, 61, 0, 0, 264, 70, 0, 0, 0, 266, 341, 30, 275,
+	0, 294, 146, 311, 230, 184, 268, 133, 94, 207, 0, 142, 142, 330, 255, 0, 
+	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0 
+};
+
 ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {
 	_chess = nullptr;
@@ -53,6 +65,10 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
+	// Load the map co-ordinates for each scene
+	for (int idx = 0; idx < NUM_PLACES; ++idx)
+		_map.push_back(Common::Point(MAP_X[idx], MAP_Y[idx]));
+
 	// Starting scene
 	_scene->_goToRoom = 4;
 }
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 86e347d011..4ec5c29134 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -136,7 +136,9 @@ void Scene::selectScene() {
  * The _misc field of the structures contains the number of the graphic image
  * that it should point to after loading; _misc is then set to 0.
  */
-void Scene::loadScene(const Common::String &filename) {
+bool Scene::loadScene(const Common::String &filename) {
+	EventsManager &events = *_vm->_events;
+	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	bool flag;
@@ -367,7 +369,28 @@ void Scene::loadScene(const Common::String &filename) {
 	checkSceneFlags(false);
 	checkInventory();
 
-	// TODO
+	// Handle starting any music for the scene
+	if (sound._musicEnabled && sound.loadSong(_currentScene)) {
+		if (sound._music)
+			sound.startSong();
+	}
+
+	// Load walking images if not already loaded
+	people.loadWalk();
+
+	// Transition to the scene and setup entrance co-ordinates and animations
+	transitionToScene();
+
+	// Player has not yet walked in this scene
+	_walkedInScene = false;
+
+	// Reset the position on the overland map
+	_vm->_oldCharPoint = _currentScene;
+	_vm->_over.x = _vm->_map[_currentScene].x * 100 - 600;
+	_vm->_over.y = _vm->_map[_currentScene].y * 100 + 900;
+
+	events.clearEvents();
+	return flag;
 }
 
 /**
@@ -410,11 +433,55 @@ void Scene::checkSceneStatus() {
  * is in use (ie. not just loaded)
  */
 void Scene::checkSceneFlags(bool flag) {
-	int mode = mode ? HIDE_SHAPE : HIDDEN;
+	SpriteType mode = flag ? HIDE_SHAPE : HIDDEN;
 
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
-		// TODO: read_flags calls
+		
+		if (o._requiredFlag) {
+			if (!_vm->readFlags(_bgShapes[idx]._requiredFlag)) {
+				// Kill object
+				if (o._type != HIDDEN && o._type != INVALID) {
+					if (o._images == nullptr || o._images->size() == 0)
+						// No shape to erase, so flag as hidden
+						o._type = HIDDEN;
+					else
+						// Flag it as needing to be hidden after first erasing it
+						o._type = mode;
+				}
+			} else if (_bgShapes[idx]._requiredFlag) {
+				// Restore object
+				if (o._images == nullptr || o._images->size() == 0)
+					o._type = NO_SHAPE;
+				else
+					o._type = ACTIVE_BG_SHAPE;
+			}
+		}
+	}
+
+	// Check inventory
+	for (uint idx = 0; idx < _vm->_inventory->_holdings; ++idx) {
+		InventoryItem &ii = (*_vm->_inventory)[idx];
+		if (ii._requiredFlag && !_vm->readFlags(ii._requiredFlag)) {
+			// Kill object: move it after the active holdings
+			InventoryItem tempItem = (*_vm->_inventory)[idx];
+			_vm->_inventory->insert_at(_vm->_inventory->_holdings, tempItem);
+			_vm->_inventory->remove_at(idx);
+			_vm->_inventory->_holdings--;
+			break;
+		}
+	}
+
+	for (uint idx = _vm->_inventory->_holdings; idx < _vm->_inventory->size(); ++idx) {
+		InventoryItem &ii = (*_vm->_inventory)[idx];
+		if (ii._requiredFlag && _vm->readFlags(ii._requiredFlag)) {
+			// Restore object: move it after the active holdings
+			InventoryItem tempItem = (*_vm->_inventory)[idx];
+			_vm->_inventory->remove_at(idx);
+			_vm->_inventory->insert_at(_vm->_inventory->_holdings, tempItem);
+			_vm->_inventory->_holdings++;
+			break;
+		}
 	}
 }
 
@@ -424,7 +491,28 @@ void Scene::checkSceneFlags(bool flag) {
  * be hidden in the scene.
  */
 void Scene::checkInventory() {
+	for (uint shapeIdx = 0; shapeIdx < _bgShapes.size(); ++shapeIdx) {
+		for (uint invIdx = 0; invIdx < _vm->_inventory->size(); ++invIdx) {
+			if (scumm_stricmp(_bgShapes[shapeIdx]._name.c_str(),
+				(*_vm->_inventory)[invIdx]._name.c_str()) == 0) {
+				_bgShapes[shapeIdx]._type = INVALID;
+				break;
+			}
+		}
+	}
+}
+
+/**
+ * Set up any entrance co-ordinates or entrance canimations, and then transition
+ * in the scene
+ */
+void Scene::transitionToScene() {
+	const int FS_TRANS[8] = { 
+		STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN, 
+		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT 
+	};
 
+	// TODO
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index ae4fcfdb45..d51856b508 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -89,15 +89,13 @@ class Scene {
 private:
 	SherlockEngine *_vm;
 
-	void loadScene();
-
-	void loadScene(const Common::String &filename);
+	bool loadScene(const Common::String &filename);
 
 	void checkSceneStatus();
 
-	void checkSceneFlags(bool mode);
-
 	void checkInventory();
+
+	void transitionToScene();
 public:
 	int _currentScene;
 	int _goToRoom;
@@ -137,6 +135,8 @@ public:
 	void clear();
 
 	void selectScene();
+
+	void checkSceneFlags(bool mode);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 115d9f0130..65dc6c80a5 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -33,6 +33,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_animation = nullptr;
 	_debugger = nullptr;
 	_events = nullptr;
+	_inventory = nullptr;
 	_journal = nullptr;
 	_people = nullptr;
 	_res = nullptr;
@@ -50,6 +51,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _animation;
 	delete _debugger;
 	delete _events;
+	delete _inventory;
 	delete _journal;
 	delete _people;
 	delete _res;
@@ -82,6 +84,7 @@ void SherlockEngine::initialize() {
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
 	_events = new EventsManager(this);
+	_inventory = new Inventory();
 	_journal = new Journal();
 	_people = new People(this);
 	_scene = new Scene(this);
@@ -116,4 +119,25 @@ Common::Error SherlockEngine::run() {
 	return Common::kNoError;
 }
 
+/**
+ * Read the state of a global flag
+ */
+bool SherlockEngine::readFlags(int flagNum) {
+	bool value = _flags[ABS(flagNum)];
+	if (flagNum < 0)
+		value = !value;
+
+	return value;
+}
+
+/**
+ * Sets a global flag to either true or false depending on whether the specified
+ * flag is positive or negative
+ */
+void SherlockEngine::setFlags(int flagNum) {
+	_flags[ABS(flagNum)] = flagNum >= 0;
+
+	_scene->checkSceneFlags(true);
+}
+
 } // End of namespace Comet
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index c31416f91e..a8ca9abbfd 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -34,6 +34,7 @@
 #include "sherlock/animation.h"
 #include "sherlock/debugger.h"
 #include "sherlock/events.h"
+#include "sherlock/inventory.h"
 #include "sherlock/journal.h"
 #include "sherlock/people.h"
 #include "sherlock/resources.h"
@@ -78,6 +79,7 @@ public:
 	Animation *_animation;
 	Debugger *_debugger;
 	EventsManager *_events;
+	Inventory *_inventory;
 	Journal *_journal;
 	People *_people;
 	Resources *_res;
@@ -93,6 +95,9 @@ public:
 	Common::Point _hsavedPos;
 	int _hsavedFs;
 	bool _justLoaded;
+	int _oldCharPoint;					// Old scene
+	Common::Point _over;				// Old map position
+	Common::Array<Common::Point> _map;	// Map locations for each scene
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
@@ -108,6 +113,10 @@ public:
 	Common::String getGameFile(int fileType);
 
 	int getRandomNumber(int limit) { return _randomSource.getRandomNumber(limit - 1); }
+
+	bool readFlags(int flagNum);
+
+	void setFlags(int flagNum);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 06fbefc7875b37dd531b65c42087e4e6782c03a6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Mar 2015 09:20:39 -0400
Subject: SHERLOCK: Beginnings of transitionToScene

---
 engines/sherlock/objects.cpp         |  12 ++++
 engines/sherlock/objects.h           |   6 ++
 engines/sherlock/people.cpp          |   1 +
 engines/sherlock/people.h            |  13 +++-
 engines/sherlock/scalpel/scalpel.cpp |   4 +-
 engines/sherlock/scene.cpp           | 117 +++++++++++++++++++++++++++++++++++
 engines/sherlock/scene.h             |   6 ++
 engines/sherlock/sherlock.cpp        |   3 +-
 engines/sherlock/sherlock.h          |   3 +-
 9 files changed, 157 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index d696954cda..3fc9901a38 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -57,6 +57,18 @@ void Sprite::setImageFrame() {
 	_imageFrame = &(*_images)[imageNumber];
 }
 
+void Sprite::adjustSprite(bool onChessboard) {
+	// TODO
+}
+
+void Sprite::gotoStand() {
+	// TODO
+}
+
+void Sprite::setWalking() {
+	// TODO
+}
+
 /*----------------------------------------------------------------*/
 
 void ActionType::synchronize(Common::SeekableReadStream &s) {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index d43b70f4e9..a1bdc5933c 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -104,6 +104,12 @@ struct Sprite {
 	void clear();
 
 	void setImageFrame();
+
+	void adjustSprite(bool onChessboard = false);
+
+	void gotoStand();
+
+	void setWalking();
 };
 
 struct ActionType {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index b4bbef2e1a..b187b65ad4 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -47,6 +47,7 @@ static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 
 People::People(SherlockEngine *vm) : _vm(vm) {
 	_walkLoaded = false;
+	_holmesOn = true;
 }
 
 People::~People() {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 4bdc6a88f0..74a4575af6 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -28,8 +28,13 @@
 
 namespace Sherlock {
 
-#define MAX_PEOPLE 2
-#define PLAYER 0
+// People definitions
+enum PeopleId {
+	PLAYER	= 0,
+	AL		= 0,
+	PEG		= 1,
+	MAX_PEOPLE = 2
+};
 
 // Animation sequence identifiers for characters
 enum {
@@ -47,6 +52,8 @@ private:
 	SherlockEngine *_vm;
 	Sprite _data[MAX_PEOPLE];
 	bool _walkLoaded;
+public:
+	bool _holmesOn;
 public:
 	People(SherlockEngine *vm);
 	~People();
@@ -54,6 +61,8 @@ public:
 	void reset();
 
 	bool loadWalk();
+
+	Sprite &operator[](PeopleId id) { return _data[id]; }
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 40ca9736d6..2477f2894f 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -193,8 +193,8 @@ void ScalpelEngine::startScene() {
 		_scene->_goToRoom = _chess->doChessBoard();
 
 		_sound->freeSong();
-		_hsavedPos = Common::Point(-1, -1);
-		_hsavedFs = -1;
+		_scene->_hsavedPos = Common::Point(-1, -1);
+		_scene->_hsavedFs = -1;
 	}
 
 	// Some rooms are prologue cutscenes, rather than normal game scenes. These are:
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 4ec5c29134..8875327dcf 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -94,6 +94,8 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_version = 0;
 	_lzwMode = false;
 	_invGraphicItems = 0;
+	_hsavedPos = Common::Point(-1, -1);
+	_hsavedFs = -1;
 
 	_controlPanel = new ImageFile("controls.vgs");
 	_controls = nullptr; // new ImageFile("menu.all");
@@ -511,8 +513,123 @@ void Scene::transitionToScene() {
 		STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN, 
 		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT 
 	};
+	People &people = *_vm->_people;
+
+	if (_hsavedPos.x < 1) {
+		// No exit information from last scene-check entrance info
+		if (_entrance._startPosition.x < 1) {
+			// No entrance info either, so use defaults
+			_hsavedPos = Common::Point(16000, 10000);
+			_hsavedFs = 4;
+		} else {
+			// setup entrance info
+			_hsavedPos = _entrance._startPosition;
+			_hsavedFs = _entrance._startDir;
+		}
+	} else {
+		// Exit information exists, translate it to real sequence info
+		// Note: If a savegame was just loaded, then the data is already correct.
+		// Otherwise, this is a linked scene or entrance info, and must be translated
+		if (_hsavedFs < 8 && !_vm->_justLoaded) {
+			_hsavedFs = FS_TRANS[_hsavedFs];
+			_hsavedPos.x *= 100;
+			_hsavedPos.y *= 100;
+		}
+	}
+
+	int startcAnimNum = -1;
+
+	if (_hsavedFs < 101) {
+		// Standard info, so set it
+		people[PLAYER]._position = _hsavedPos;
+		people[PLAYER]._sequenceNumber = _hsavedFs;
+	} else {
+		// It's canimation information
+		startcAnimNum = _hsavedFs - 101;
+
+		// Prevent Holmes from being drawn
+		people[PLAYER]._position = Common::Point(0, 0);
+	}
+
+	for (uint objIdx = 0; objIdx < _bgShapes.size(); ++objIdx) {
+		Object &obj = _bgShapes[objIdx];
+
+		if (obj._aType > 1 && obj._type != INVALID && obj._type != HIDDEN) {
+			Common::Point topLeft = obj._position;
+			Common::Point bottomRight;
+
+			if (obj._type != NO_SHAPE) {
+				topLeft += obj._imageFrame->_position;
+				bottomRight.x = topLeft.x + obj._imageFrame->_frame.w;
+				bottomRight.y = topLeft.y + obj._imageFrame->_frame.h;			
+			} else {
+				bottomRight = topLeft + obj._noShapeSize;
+			}
+
+			if (Common::Rect(topLeft.x, topLeft.y, bottomRight.x, bottomRight.y).contains(
+				Common::Point(people[PLAYER]._position.x / 100, people[PLAYER]._position.y / 100))) {
+				// Current point is already inside box - impact occurred on
+				// a previous call. So simply do nothing except talk until the
+				// player is clear of the box
+				switch (obj._aType) {
+				case FLAG_SET:
+					for (int useNum = 0; useNum < 4; ++useNum) {
+						if (obj._use[useNum]._useFlag) {
+							if (!_vm->readFlags(obj._use[useNum]._useFlag))
+								_vm->setFlags(obj._use[useNum]._useFlag);
+						}
+
+						if (!_vm->_talkToAbort) {
+							for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+								toggleObject(obj._use[useNum]._names[nameIdx]);
+							}
+						}
+					}
+
+					obj._type = HIDDEN;
+					break;
+
+				default:
+					break;
+				}
+			}
+		}
+	}
 
+	updateBackground();
 	// TODO
 }
 
+/**
+ * Scans through the object list to find one with a matching name, and will
+ * call toggleHidden with all matches found. Returns the numer of matches found
+ */
+int Scene::toggleObject(const Common::String &name) {
+	int count = 0;
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		if (scumm_stricmp(name.c_str(), _bgShapes[idx]._name.c_str()) == 0) {
+			++count;
+			_bgShapes[idx].toggleHidden();
+		}
+	}
+
+	return count;
+}
+
+/**
+ * Update the screen back buffer with all of the scene objects which need
+ * to be drawn
+ */
+void Scene::updateBackground() {
+	People &people = *_vm->_people;
+	//setDisplayBounds(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT);
+
+	// Update Holmes if he's turned on
+	if (people._holmesOn)
+		people[AL].adjustSprite();
+
+
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index d51856b508..5625bb1f5b 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -96,6 +96,10 @@ private:
 	void checkInventory();
 
 	void transitionToScene();
+
+	int toggleObject(const Common::String &name);
+
+	void updateBackground();
 public:
 	int _currentScene;
 	int _goToRoom;
@@ -128,6 +132,8 @@ public:
 	Common::Array<Exit> _exits;
 	SceneEntry _entrance;
 	Common::Array<SceneSound> _sounds;
+	Common::Point _hsavedPos;
+	int _hsavedFs;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 65dc6c80a5..60e32bda82 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -42,9 +42,8 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_sound = nullptr;
 	_talk = nullptr;
 	_useEpilogue2 = false;
-	_hsavedPos = Common::Point(-1, -1);
-	_hsavedFs = -1;
 	_justLoaded = false;
+	_talkToAbort = false;
 }
 
 SherlockEngine::~SherlockEngine() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index a8ca9abbfd..84b6c48f12 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -92,12 +92,11 @@ public:
 	Common::String _soundOverride;
 	Common::String _titleOverride;
 	bool _useEpilogue2;
-	Common::Point _hsavedPos;
-	int _hsavedFs;
 	bool _justLoaded;
 	int _oldCharPoint;					// Old scene
 	Common::Point _over;				// Old map position
 	Common::Array<Common::Point> _map;	// Map locations for each scene
+	bool _talkToAbort;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
-- 
cgit v1.2.3


From b6076dd52458320f39442bc225ef8b0ce531ea51 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Mar 2015 11:24:35 -0400
Subject: SHERLOCK: Implemented setWalking

---
 engines/sherlock/objects.cpp  |  17 ++--
 engines/sherlock/objects.h    |  18 ++--
 engines/sherlock/people.cpp   | 204 +++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/people.h     |  20 ++++-
 engines/sherlock/scene.cpp    |   2 +-
 engines/sherlock/scene.h      |   2 +-
 engines/sherlock/sherlock.cpp |  15 +---
 engines/sherlock/sherlock.h   |   1 +
 8 files changed, 240 insertions(+), 39 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 3fc9901a38..63e4bdf621 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -21,9 +21,14 @@
  */
 
 #include "sherlock/objects.h"
+#include "sherlock/sherlock.h"
+#include "sherlock/people.h"
+#include "sherlock/scene.h"
 
 namespace Sherlock {
 
+SherlockEngine *Sprite::_vm;
+
 /**
  * Reset the data for the sprite
  */
@@ -39,7 +44,7 @@ void Sprite::clear() {
 	_allow = 0;
 	_frameNumber = _sequenceNumber = 0;
 	_position.x = _position.y = 0;
-	_movement.x = _movement.y = 0;
+	_delta.x = _delta.y = 0;
 	_oldPosition.x = _oldPosition.y = 0;
 	_oldSize.x = _oldSize.y = 0;
 	_goto.x = _goto.y = 0;
@@ -57,15 +62,7 @@ void Sprite::setImageFrame() {
 	_imageFrame = &(*_images)[imageNumber];
 }
 
-void Sprite::adjustSprite(bool onChessboard) {
-	// TODO
-}
-
-void Sprite::gotoStand() {
-	// TODO
-}
-
-void Sprite::setWalking() {
+void Sprite::adjustSprite() {
 	// TODO
 }
 
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index a1bdc5933c..b1207867e4 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -74,7 +74,10 @@ enum AType {
 #define FLIP_CODE (64 + 128)
 #define SOUND_CODE (34 + 128)
 
-struct Sprite {
+class Sprite {
+private:
+	static SherlockEngine *_vm;
+public:
 	Common::String _name;				// Name
 	Common::String _description;		// Description
 	Common::StringArray _examine;		// Examine in-depth description
@@ -88,7 +91,7 @@ struct Sprite {
 	int _frameNumber;					// Frame number in rame sequence to draw
 	int _sequenceNumber;				// Sequence being used
 	Common::Point _position;			// Current position
-	Common::Point _movement;			// Momvement amount
+	Common::Point _delta;				// Momvement delta
 	Common::Point _oldPosition;			// Old position
 	Common::Point _oldSize;				// Image's old size
 	Common::Point _goto;				// Walk destination
@@ -98,18 +101,15 @@ struct Sprite {
 	int _status;						// Status: open/closed, moved/not moved
 	int8 _misc;							// Miscellaneous use
 	int _numFrames;						// How many frames the object has
-
+public:
 	Sprite() { clear(); }
-	
+	static void setVm(SherlockEngine *vm) { _vm = vm; }
+
 	void clear();
 
 	void setImageFrame();
 
-	void adjustSprite(bool onChessboard = false);
-
-	void gotoStand();
-
-	void setWalking();
+	void adjustSprite();
 };
 
 struct ActionType {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index b187b65ad4..998fe4f0cf 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -21,9 +21,15 @@
  */
 
 #include "sherlock/people.h"
+#include "sherlock/sherlock.h"
 
 namespace Sherlock {
 
+// Walk speeds
+#define MWALK_SPEED 2
+#define XWALK_SPEED 4
+#define YWALK_SPEED 1
+
 // Characer animation sequences
 static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 	{ 29, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Right
@@ -45,9 +51,11 @@ static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 };
 
 
-People::People(SherlockEngine *vm) : _vm(vm) {
+People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_walkLoaded = false;
 	_holmesOn = true;
+	_oldWalkSequence = -1;
+	_allowWalkAbort = false;
 }
 
 People::~People() {
@@ -65,7 +73,7 @@ void People::reset() {
 	p._sequences = &CHARACTER_SEQUENCES;
 	p._imageFrame = nullptr;
 	p._frameNumber = 1;
-	p._movement = Common::Point(0, 0);
+	p._delta = Common::Point(0, 0);
 	p._oldPosition = Common::Point(0, 0);
 	p._oldSize = Common::Point(0, 0);
 	p._misc = 0;
@@ -89,4 +97,196 @@ bool People::loadWalk() {
 	}
 }
 
+/**
+* Set the variables for moving a character from one poisition to another
+* in a straight line - goAllTheWay must have been previously called to
+* check for any obstacles in the path.
+*/
+void People::setWalking() {
+	Scene &scene = *_vm->_scene;
+	int oldDirection, oldFrame;
+	Common::Point speed, delta;
+	int temp;
+
+	// Flag that player has now walked in the scene
+	scene._walkedInScene = true;
+
+	// Stop any previous walking, since a new dest is being set
+	_player._walkCount = 0;
+	oldDirection = _player._sequenceNumber;
+	oldFrame = _player._frameNumber;
+
+	// Set speed to use horizontal and vertical movement
+	if (_vm->_onChessboard) {
+		speed = Common::Point(MWALK_SPEED, MWALK_SPEED);
+	} else {
+		speed = Common::Point(XWALK_SPEED, YWALK_SPEED);
+	}
+
+	// If the player is already close to the given destination that no
+	// walking is needed, move to the next straight line segment in the
+	// overall walking route, if there is one
+	for (;;) {
+		// Since we want the player to be centered on the destination they
+		// clicked, but characters draw positions start at their left, move
+		// the destination half the character width to draw him centered
+		if (_walkDest.x >= (temp = _player._imageFrame->_frame.w / 2))
+			_walkDest.x -= temp;
+
+		delta = Common::Point(
+			ABS(_player._position.x / 100 - _walkDest.x),
+			ABS(_player._position.y / 100 - _walkDest.y)
+		);
+
+		// If we're ready to move a sufficient distance, that's it. Otherwise,
+		// move onto the next portion of the walk path, if there is one
+		if ((delta.x > 3 || delta.y > 0) || _walkTo.empty())
+			break;
+
+		// Pop next walk segment off the walk route stack
+		_walkDest = _walkTo.pop();
+	} while (!_vm->shouldQuit());
+
+	// If a sufficient move is being done, then start the move
+	if (delta.x > 3 || delta.y) {
+		// See whether the major movement is horizontal or vertical
+		if (delta.x >= delta.y) {
+			// Set the initial frame sequence for the left and right, as well
+			// as settting the delta x depending on direction
+			if (_walkDest.x < (_player._position.x / 100)) {
+				_player._sequenceNumber = _vm->_onChessboard ? MAP_LEFT : WALK_LEFT;
+				_player._delta.x = speed.x * -100;
+			} else {
+				_player._sequenceNumber = _vm->_onChessboard ? MAP_RIGHT : WALK_RIGHT;
+				_player._delta.x = speed.x * 100;
+			}
+
+			// See if the x delta is too small to be divided by the speed, since
+			// this would cause a divide by zero error
+			if (delta.x >= speed.x) {
+				// Det the delta y
+				_player._delta.y = (delta.y * 100) / (delta.x / speed.x);
+				if (_walkDest.y < (_player._position.y / 100))
+					_player._delta.y = -_player._delta.y;
+
+				// Set how many times we should add the delta to the player's position
+				_player._walkCount = delta.x / speed.x;
+			} else {
+				// The delta x was less than the speed (ie. we're really close to
+				// the destination). So set delta to 0 so the player won't move
+				_player._delta = Common::Point(0, 0);
+				_player._position = Common::Point(_walkDest.x * 100, _walkDest.y * 100);
+				_player._walkCount = 1;
+			}
+
+			// See if the sequence needs to be changed for diagonal walking
+			if (_player._delta.y > 150) {
+				if (!_vm->_onChessboard) {
+					switch (_player._sequenceNumber) {
+					case WALK_LEFT:
+						_player._sequenceNumber = WALK_DOWNLEFT;
+						break;
+					case WALK_RIGHT:
+						_player._sequenceNumber = WALK_DOWNRIGHT;
+						break;
+					}
+				}
+			} else if (_player._delta.y < -150) {
+				if (!_vm->_onChessboard) {
+					switch (_player._sequenceNumber) {
+					case WALK_LEFT:
+						_player._sequenceNumber = WALK_UPLEFT;
+						break;
+					case WALK_RIGHT:
+						_player._sequenceNumber = WALK_UPRIGHT;
+						break;
+					}
+				}
+			}
+		} else {
+			// Major movement is vertical, so set the sequence for up and down,
+			// and set the delta Y depending on the direction
+			if (_walkDest.y < (_player._position.y / 100)) {
+				_player._sequenceNumber = WALK_UP;
+				_player._delta.y = speed.y * -100;
+			} else {
+				_player._sequenceNumber = WALK_DOWN;
+				_player._delta.y = speed.y * 100;
+			}
+
+			// If we're on the overhead map, set the sequence so we keep moving
+			// in the same direction
+			_player._sequenceNumber = (oldDirection == -1) ? MAP_RIGHT : oldDirection;
+
+			// Set the delta x
+			_player._delta.x = (delta.x * 100) / (delta.y / speed.y);
+			if (_walkDest.x < (_player._position.x / 100))
+				_player._delta.x = -_player._delta.x;
+		}
+	}
+
+	// See if the new walk sequence is the same as the old. If it's a new one,
+	// we need to reset the frame number to zero so it's animation starts at
+	// it's beginning. Otherwise, if it's the same sequence, we can leave it
+	// as is, so it keeps the animation going at wherever it was up to
+	if (_player._sequenceNumber != _oldWalkSequence)
+		_player._frameNumber = 0;
+	_oldWalkSequence = _player._sequenceNumber;
+
+	if (!_player._walkCount)
+		gotoStand(_player);
+
+	// If the sequence is the same as when we started, then Holmes was 
+	// standing still and we're trying to re-stand him, so reset Holmes'
+	// rame to the old frame number from before it was reset to 0
+	if (_player._sequenceNumber == oldDirection)
+		_player._frameNumber = oldFrame;
+}
+
+/**
+ * Bring a moving character to a standing position. If the Scalpel chessboard 
+ * is being displayed, then the chraracter will always face down.
+ */
+void People::gotoStand(Sprite &sprite) {
+	Scene &scene = *_vm->_scene;
+	_walkTo.clear();
+	sprite._walkCount = 0;
+
+	switch (sprite._sequenceNumber) {
+	case WALK_UP:
+		sprite._sequenceNumber = STOP_UP; break;
+	case WALK_DOWN:
+		sprite._sequenceNumber = STOP_DOWN; break;
+	case TALK_LEFT:
+	case WALK_LEFT:
+		sprite._sequenceNumber = STOP_LEFT; break;
+	case TALK_RIGHT:
+	case WALK_RIGHT:
+		sprite._sequenceNumber = STOP_RIGHT; break;
+	case WALK_UPRIGHT:
+		sprite._sequenceNumber = STOP_UPRIGHT; break;
+	case WALK_UPLEFT:
+		sprite._sequenceNumber = STOP_UPLEFT; break;
+	case WALK_DOWNRIGHT:
+		sprite._sequenceNumber = STOP_DOWNRIGHT; break;
+	case WALK_DOWNLEFT:
+		sprite._sequenceNumber = STOP_DOWNLEFT; break;
+	default:
+		break;
+	}
+
+	// Only restart frame at 0 if the sequence number has changed
+	if (_oldWalkSequence != -1 || sprite._sequenceNumber == STOP_UP)
+		sprite._frameNumber = 0;
+
+	if (_vm->_onChessboard) {
+		sprite._sequenceNumber = 0;
+		_data[AL]._position.x = (_vm->_map[scene._charPoint].x -  6) * 100;
+		_data[AL]._position.y = (_vm->_map[scene._charPoint].x + 10) * 100;
+	}
+
+	_oldWalkSequence = -1;
+	_allowWalkAbort = true;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 74a4575af6..be9be006e8 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -24,6 +24,7 @@
 #define SHERLOCK_PEOPLE_H
 
 #include "common/scummsys.h"
+#include "common/stack.h"
 #include "sherlock/objects.h"
 
 namespace Sherlock {
@@ -39,10 +40,14 @@ enum PeopleId {
 // Animation sequence identifiers for characters
 enum {
 	WALK_RIGHT = 0, WALK_DOWN = 1, WALK_LEFT = 2, WALK_UP = 3, STOP_LEFT = 4,
-	STOP_DOWN  = 5, STOP_RIGHT = 6, STOP_UP = 7, WALK_UPRIGHT = 8,
+	STOP_DOWN = 5, STOP_RIGHT = 6, STOP_UP = 7, WALK_UPRIGHT = 8,
 	WALK_DOWNRIGHT = 9, WALK_UPLEFT = 10, WALK_DOWNLEFT = 11,
 	STOP_UPRIGHT = 12, STOP_UPLEFT = 13, STOP_DOWNRIGHT = 14,
-	STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4
+	STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4,
+};
+enum {
+	MAP_UP = 1, MAP_UPRIGHT = 2, MAP_RIGHT = 1, MAP_DOWNRIGHT = 4,
+	MAP_DOWN = 5, MAP_DOWNLEFT = 6, MAP_LEFT = 2, MAP_UPLEFT = 8
 };
 
 class SherlockEngine;
@@ -51,18 +56,27 @@ class People {
 private:
 	SherlockEngine *_vm;
 	Sprite _data[MAX_PEOPLE];
+	Sprite &_player;
 	bool _walkLoaded;
+	int _oldWalkSequence;
+	bool _allowWalkAbort;
 public:
+	Common::Point _walkDest;
+	Common::Stack<Common::Point> _walkTo;
 	bool _holmesOn;
 public:
 	People(SherlockEngine *vm);
 	~People();
 
+	Sprite &operator[](PeopleId id) { return _data[id]; }
+
 	void reset();
 
 	bool loadWalk();
 
-	Sprite &operator[](PeopleId id) { return _data[id]; }
+	void setWalking();
+
+	void gotoStand(Sprite &sprite);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 8875327dcf..13db8d9b94 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -86,7 +86,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_currentScene = -1;
 	_goToRoom = -1;
 	_changes = false;
-	_oldCharPoint = 0;
+	_charPoint = _oldCharPoint = 0;
 	_windowOpen = _infoFlag = false;
 	_menuMode = _keyboardInput = 0;
 	_walkedInScene = false;
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 5625bb1f5b..a4b94652c8 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -108,7 +108,7 @@ public:
 	bool _savedStats[SCENES_COUNT][9];
 	Common::Point _bigPos;
 	Common::Point _overPos;
-	int _oldCharPoint;
+	int _charPoint, _oldCharPoint;
 	ImageFile *_controls;
 	ImageFile *_controlPanel;
 	bool _windowOpen, _infoFlag;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 60e32bda82..2787e2b924 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -44,6 +44,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_useEpilogue2 = false;
 	_justLoaded = false;
 	_talkToAbort = false;
+	_onChessboard = false;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -65,20 +66,8 @@ void SherlockEngine::initialize() {
 
 	DebugMan.addDebugChannel(kDebugScript, "scripts", "Script debug level");
 
-	/*
-	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
-	bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
-
-	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
-	if (native_mt32)
-		driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
-
-	_midi = new MidiPlayer(this, driver);
-	_midi->setGM(true);
-	_midi->setNativeMT32(native_mt32);
-	*/
-
 	ImageFile::setVm(this);
+	Sprite::setVm(this);
 	_res = new Resources();
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 84b6c48f12..1607cec974 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -97,6 +97,7 @@ public:
 	Common::Point _over;				// Old map position
 	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _talkToAbort;
+	bool _onChessboard;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
-- 
cgit v1.2.3


From 16ba21259b2aaf3b9ee9acae2e0aba95df1dea36 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 21 Mar 2015 17:35:47 +0100
Subject: GUI: Adjust x and y to handleMouseWheel() for consistency

This means x and y has the same meaning as in the other handlers,
e.g. handleMouseUp(). Though as far as I can tell, these coordinates
aren't actually used anywhere at the moment.
---
 gui/dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index fa4e508494..315c24e9bf 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -219,7 +219,7 @@ void Dialog::handleMouseWheel(int x, int y, int direction) {
 	if (!w)
 		w = _focusedWidget;
 	if (w)
-		w->handleMouseWheel(x, y, direction);
+		w->handleMouseWheel(x - (w->getAbsX() - _x), y - (w->getAbsY() - _y), direction);
 }
 
 void Dialog::handleKeyDown(Common::KeyState state) {
-- 
cgit v1.2.3


From c37d4af516b65771b1580ac8cbb03759d04f00c2 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 21 Mar 2015 17:41:44 +0100
Subject: GUI: Fix bug #6813, "GUI: Tooltips eat keypresses"

The tooltip isn't really interested in any keyboard and mouse
events, other than as a signal to close itself, so pass them back
to the parent dialog. From what I understand, the tooltip isn't
part of the dialog, so there should be no risk of going into an
infinite loop here.
---
 gui/Tooltip.cpp |  2 ++
 gui/Tooltip.h   | 33 +++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index e5f06bcafe..ba313ee34f 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -40,6 +40,8 @@ Tooltip::Tooltip() :
 void Tooltip::setup(Dialog *parent, Widget *widget, int x, int y) {
 	assert(widget->hasTooltip());
 
+	_parent = parent;
+
 	_maxWidth = g_gui.xmlEval()->getVar("Globals.Tooltip.MaxWidth", 100);
 	_xdelta = g_gui.xmlEval()->getVar("Globals.Tooltip.XDelta", 0);
 	_ydelta = g_gui.xmlEval()->getVar("Globals.Tooltip.YDelta", 0);
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index f83fc40966..58b6d8a429 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -32,6 +32,9 @@ namespace GUI {
 class Widget;
 
 class Tooltip : public Dialog {
+private:
+	Dialog *_parent;
+
 public:
 	Tooltip();
 
@@ -39,12 +42,30 @@ public:
 
 	void drawDialog();
 protected:
-	virtual void handleMouseDown(int x, int y, int button, int clickCount) { close(); }
-	virtual void handleMouseUp(int x, int y, int button, int clickCount) { close(); }
-	virtual void handleMouseWheel(int x, int y, int direction) { close(); }
-	virtual void handleKeyDown(Common::KeyState state) { close(); }
-	virtual void handleKeyUp(Common::KeyState state) { close(); }
-	virtual void handleMouseMoved(int x, int y, int button) { close(); }
+	virtual void handleMouseDown(int x, int y, int button, int clickCount) {
+		close();
+		_parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
+	}
+	virtual void handleMouseUp(int x, int y, int button, int clickCount) {
+		close();
+		_parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
+	}
+	virtual void handleMouseWheel(int x, int y, int direction) {
+		close();
+		_parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction);
+	}
+	virtual void handleKeyDown(Common::KeyState state) {
+		close();
+		_parent->handleKeyDown(state);
+	}
+	virtual void handleKeyUp(Common::KeyState state) {
+		close();
+		_parent->handleKeyUp(state);
+	}
+	virtual void handleMouseMoved(int x, int y, int button) {
+		close();
+		_parent->handleMouseMoved(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button);
+	}
 
 	int _maxWidth;
 	int _xdelta, _ydelta;
-- 
cgit v1.2.3


From 8f4b4a7bc269bf454ab90d003f1cc55104c175b6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Mar 2015 13:01:45 -0400
Subject: SHERLOCK: Implemented updateBackground

---
 engines/sherlock/graphics.cpp |  26 ++++++++--
 engines/sherlock/graphics.h   |   8 +++-
 engines/sherlock/objects.cpp  | 104 ++++++++++++++++++++++++++++++++++++++--
 engines/sherlock/objects.h    |   5 ++
 engines/sherlock/people.h     |   2 +
 engines/sherlock/scene.cpp    | 107 +++++++++++++++++++++++++++++++++++++++---
 engines/sherlock/scene.h      |   8 +++-
 engines/sherlock/sherlock.cpp |   3 ++
 engines/sherlock/sherlock.h   |   3 ++
 9 files changed, 251 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index a4990fb6c6..8c096e3c72 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -27,12 +27,22 @@
 
 namespace Sherlock {
 
-Surface::Surface(uint16 width, uint16 height) {
+Surface::Surface(uint16 width, uint16 height): _freePixels(true) {
 	create(width, height, Graphics::PixelFormat::createFormatCLUT8());
 }
 
+Surface::Surface(Surface &src, const Common::Rect &r) : _freePixels(false) {
+	setPixels(src.getBasePtr(r.left, r.top));
+	w = r.width();
+	h = r.height();
+	pitch = src.pitch;
+	format = Graphics::PixelFormat::createFormatCLUT8();
+}
+
+
 Surface::~Surface() {
-    free();
+	if (_freePixels)
+		free();
 }
 
 /**
@@ -131,9 +141,19 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 	}
 }
 
-
+/**
+ * Fill a given area of the surface with a given color
+ */
 void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
     Graphics::Surface::fillRect(Common::Rect(x1, y1, x2, y2), color);
 }
 
+/**
+ * Return a sub-area of the surface as a new surface object. The surfaces
+ * are shared in common, so changes in the sub-surface affects the original.
+ */
+Surface Surface::getSubArea(const Common::Rect &r) {
+	return Surface(*this, r);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 82c48307d7..0536c016bf 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -29,11 +29,15 @@
 namespace Sherlock {
 
 class Surface : public Graphics::Surface {
+private:
+	bool _freePixels;
 protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
+
+	Surface(Surface &src, const Common::Rect &r);
 public:
     Surface(uint16 width, uint16 height);
-    ~Surface();
+	~Surface();
 
 	void blitFrom(const Graphics::Surface &src);
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
@@ -43,6 +47,8 @@ public:
 		bool flipped = false, int overrideColor = 0);
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
+
+	Surface getSubArea(const Common::Rect &r);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 63e4bdf621..a12939e787 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -24,9 +24,15 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/people.h"
 #include "sherlock/scene.h"
+#include "common/util.h"
 
 namespace Sherlock {
 
+#define UPPER_LIMIT 0
+#define LOWER_LIMIT CONTROLS_Y
+#define LEFT_LIMIT 0
+#define RIGHT_LIMIT SHERLOCK_SCREEN_WIDTH
+
 SherlockEngine *Sprite::_vm;
 
 /**
@@ -56,14 +62,106 @@ void Sprite::clear() {
 	_numFrames = 0;
 }
 
+/**
+ * Updates the image frame poiner for the sprite
+ */
 void Sprite::setImageFrame() {
-	// TODO: check this
-	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber];
+	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber] + 
+		(*_sequences)[_sequenceNumber][0] - 2;
 	_imageFrame = &(*_images)[imageNumber];
 }
 
+/**
+ * This adjusts the sprites position, as well as it's animation sequence:
+ */
 void Sprite::adjustSprite() {
-	// TODO
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	int checkFrame = _allow ? MAX_FRAME : 32000;
+
+	if (_type == INVALID || (_type == CHARACTER && _vm->_animating))
+		return;
+
+	if (!_vm->_talkCounter && _type == CHARACTER && _walkCount) {
+		// Handle active movement for the sprite
+		_position += _delta;
+		--_walkCount;
+
+		if (!_walkCount) {
+			// If there any points left for the character to walk to along the
+			// route to a destination, then move to the next point
+			if (!people._walkTo.empty()) {
+				people._walkDest = people._walkTo.pop();
+				people.setWalking();
+			} else {
+				people.gotoStand(*this);
+			}
+		}
+	}
+
+	if (_type == CHARACTER && !_vm->_onChessboard) {
+		if ((_position.y / 100) > LOWER_LIMIT) {
+			_position.y = LOWER_LIMIT * 100;
+			people.gotoStand(*this);
+		}
+
+		if ((_position.y / 100) < UPPER_LIMIT) {
+			_position.y = UPPER_LIMIT * 100;
+			people.gotoStand(*this);
+		}
+
+		if ((_position.x / 100) < LEFT_LIMIT) {
+			_position.x = LEFT_LIMIT * 100;
+			people.gotoStand(*this);
+		}
+	} else if (!_vm->_onChessboard) {
+		_position.y = CLIP((int)_position.y, UPPER_LIMIT, LOWER_LIMIT);
+		_position.x = CLIP((int)_position.x, LEFT_LIMIT, RIGHT_LIMIT);
+	}
+
+	if (!_vm->_onChessboard || (_vm->_slowChess = !_vm->_slowChess))
+		++_frameNumber;
+
+	if ((*_sequences)[_sequenceNumber][_frameNumber] == 0) {
+		switch (_sequenceNumber) {
+		case STOP_UP:
+		case STOP_DOWN:
+		case STOP_LEFT:
+		case STOP_RIGHT:
+		case STOP_UPRIGHT:
+		case STOP_UPLEFT:
+		case STOP_DOWNRIGHT:
+		case STOP_DOWNLEFT:
+			// We're in a stop sequence, so reset back to the last frame, so
+			// the character is shown as standing still
+			--_frameNumber;
+			break;
+
+		default:
+			// Move 1 past the first frame - we need to compensate, since we
+			// already passed the frame increment
+			_frameNumber = 1;
+			break;
+		}
+	}
+
+	// Update the _imageFrame to point to the new frame's image
+	setImageFrame();
+
+	// Check to see if character has entered an exit zone
+	if (!_walkCount && scene._walkedInScene && scene._goToRoom == -1) {
+		Common::Rect charRect(_position.x / 100 - 5, _position.y / 100 - 2,
+			_position.x / 100 + 5, _position.y / 100 + 2);
+		Exit *exit = scene.checkForExit(charRect);
+
+		if (exit) {
+			scene._hsavedPos = exit->_people;
+			scene._hsavedFs = exit->_peopleDir;
+
+			if (scene._hsavedFs > 100 && scene._hsavedPos.x < 1)
+				scene._hsavedPos.x = 100;
+		}		
+	}
 }
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index b1207867e4..d9f1c7409e 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -66,6 +66,11 @@ enum AType {
 	NOWALK_ZONE = 13  // Player cannot walk here
 };
 
+// Different levels for sprites to be at
+enum {
+	BEHIND = 0, NORMAL_BEHIND = 1, NORMAL_FORWARD = 2, FORWARD = 3
+};
+
 #define MAX_HOLMES_SEQUENCE 16
 #define MAX_FRAME 30
 
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index be9be006e8..e58fd33ef2 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -70,6 +70,8 @@ public:
 
 	Sprite &operator[](PeopleId id) { return _data[id]; }
 
+	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
+
 	void reset();
 
 	bool loadWalk();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 13db8d9b94..9fbec6b776 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -49,10 +49,12 @@ void BgfileheaderInfo::synchronize(Common::SeekableReadStream &s) {
 /*----------------------------------------------------------------*/
 
 void Exit::synchronize(Common::SeekableReadStream &s) {
-	_position.x = s.readSint16LE();
-	_position.y = s.readSint16LE();
-	_size.x = s.readSint16LE();
-	_size.y = s.readSint16LE();
+	int xp = s.readSint16LE();
+	int yp = s.readSint16LE();
+	int xSize = s.readSint16LE();
+	int ySize = s.readSint16LE();
+	_bounds = Common::Rect(xp, yp, xp + xSize, yp + ySize);
+
 	_scene = s.readSint16LE();
 	_allow = s.readSint16LE();
 	_people.x = s.readSint16LE();
@@ -623,13 +625,106 @@ int Scene::toggleObject(const Common::String &name) {
  */
 void Scene::updateBackground() {
 	People &people = *_vm->_people;
-	//setDisplayBounds(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT);
+	Screen &screen = *_vm->_screen;
+	Surface surface = screen._backBuffer.getSubArea(
+		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	Sprite &player = people[AL];
 
 	// Update Holmes if he's turned on
 	if (people._holmesOn)
-		people[AL].adjustSprite();
+		player.adjustSprite();
+
+	// Flag the bg shapes which need to be redrawn
+	checkBgShapes(player._imageFrame, Common::Point(player._position.x / 100,
+		player._position.y / 100));
+
+	// Draw all active shapes which are behind the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == BEHIND)
+			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
+				_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+	}
+
+	// Draw all canimations which are behind the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == BEHIND)
+			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
+				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+	}
+
+	// Draw all active shapes which are normal and behind the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == NORMAL_BEHIND)
+			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
+			_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+	}
+
+	// Draw all canimations which are normal and behind the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == NORMAL_BEHIND)
+			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
+			_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+	}
+
+	// Draw the player if he's active
+	if (player._type == CHARACTER && people.isHolmesActive()) {
+		bool flipped = player._sequenceNumber == WALK_LEFT || player._sequenceNumber == STOP_LEFT ||
+			player._sequenceNumber == WALK_UPLEFT || player._sequenceNumber == STOP_UPLEFT ||
+			player._sequenceNumber == WALK_DOWNRIGHT || player._sequenceNumber == STOP_DOWNRIGHT;
+
+		surface.transBlitFrom(player._imageFrame->_frame,
+			Common::Point(player._position.x / 100, player._position.y / 100), flipped);
+	}
 
+	// Draw all static and active shapes that are NORMAL and are in front of the player
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
+				_bgShapes[idx]._misc == NORMAL_FORWARD)
+			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
+				_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+	}
+
+	// Draw all static and active canimations that are NORMAL and are in front of the player
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
+				_canimShapes[idx]._misc == NORMAL_FORWARD)
+			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
+				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+	}
+
+	// Draw all static and active shapes that are FORWARD
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		_bgShapes[idx]._oldPosition = _bgShapes[idx]._position;
+		_bgShapes[idx]._oldSize = Common::Point(_bgShapes[idx]._imageFrame->_frame.w, 
+			_bgShapes[idx]._imageFrame->_frame.h);
+
+		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
+				_bgShapes[idx]._misc == FORWARD)
+			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
+				_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+	}
+
+	// Draw all static and active canimations that are forward
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
+			_canimShapes[idx]._misc == FORWARD)
+			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
+				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+	}
+}
+
+Exit *Scene::checkForExit(const Common::Rect &r) {
+	for (uint idx = 0; idx < _exits.size(); ++idx) {
+		if (_exits[idx]._bounds.intersects(r))
+			return &_exits[idx];
+	}
 
+	return nullptr;
 }
 
+void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
+	// TODO
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index a4b94652c8..8986b62bf5 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -59,8 +59,7 @@ struct BgfileheaderInfo {
 };
 
 struct Exit {
-	Common::Point _position;
-	Common::Point _size;
+	Common::Rect _bounds;
 
 	int _scene;
 	int _allow;
@@ -100,6 +99,8 @@ private:
 	int toggleObject(const Common::String &name);
 
 	void updateBackground();
+
+	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
 public:
 	int _currentScene;
 	int _goToRoom;
@@ -134,6 +135,7 @@ public:
 	Common::Array<SceneSound> _sounds;
 	Common::Point _hsavedPos;
 	int _hsavedFs;
+	Common::Array<Object> _canimShapes;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
@@ -143,6 +145,8 @@ public:
 	void selectScene();
 
 	void checkSceneFlags(bool mode);
+
+	Exit *checkForExit(const Common::Rect &r);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 2787e2b924..257cbb2cab 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -45,6 +45,9 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_justLoaded = false;
 	_talkToAbort = false;
 	_onChessboard = false;
+	_slowChess = false;
+	_animating = false;
+	_talkCounter = 0;
 }
 
 SherlockEngine::~SherlockEngine() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 1607cec974..7ce28cfdd7 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -98,6 +98,9 @@ public:
 	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _talkToAbort;
 	bool _onChessboard;
+	bool _slowChess;
+	bool _animating;
+	int _talkCounter;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
-- 
cgit v1.2.3


From 26c51680741882b7ee60a0e24227e6c6918aab0e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Mar 2015 18:18:12 -0400
Subject: SHERLOCK: Implemented checkObject and some support methods

---
 engines/sherlock/animation.cpp       |   2 +-
 engines/sherlock/events.cpp          |  11 +-
 engines/sherlock/events.h            |   6 +-
 engines/sherlock/objects.cpp         | 170 ++++++++++++++++++++-
 engines/sherlock/objects.h           |  25 ++-
 engines/sherlock/people.cpp          |   5 +
 engines/sherlock/people.h            |   2 +
 engines/sherlock/resources.cpp       |  12 +-
 engines/sherlock/resources.h         |   1 +
 engines/sherlock/scalpel/scalpel.cpp |   6 +-
 engines/sherlock/scene.cpp           | 285 ++++++++++++++++++++++++++++++++++-
 engines/sherlock/scene.h             |   9 ++
 engines/sherlock/sherlock.cpp        |   1 +
 engines/sherlock/sound.cpp           |  11 +-
 engines/sherlock/sound.h             |   8 +-
 15 files changed, 521 insertions(+), 33 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 2b12005079..a7f91e91cd 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -144,7 +144,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 					Common::String::format("%s%01d", baseName.c_str(), soundNumber) :
 					Common::String::format("%s%02d", baseName.c_str(), soundNumber);
 
-				if (sound._voicesEnabled)
+				if (sound._voicesOn)
 					sound.playSound(fname);
 			}
 
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index ecdbdbe8d7..69e89e7157 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -33,7 +33,7 @@ namespace Sherlock {
 EventsManager::EventsManager(SherlockEngine *vm) {
 	_vm = vm;
 	_cursorImages = nullptr;
-	_cursorIndex = -1;
+	_cursorId = INVALID_CURSOR;
 	_frameCounter = 1;
 	_priorFrameTime = 0;
 	_mouseClicked = false;
@@ -57,11 +57,14 @@ void EventsManager::loadCursors(const Common::String &filename) {
 /**
  * Set the cursor to show
  */
-void EventsManager::changeCursor(int cursorIndex) {
-	_cursorIndex = cursorIndex;
+void EventsManager::changeCursor(CursorId cursorId) {
+	if (cursorId == _cursorId)
+		return;
+
+	_cursorId = cursorId;
 
 	// Set the cursor data
-	Graphics::Surface &s = (*_cursorImages)[cursorIndex];
+	Graphics::Surface &s = (*_cursorImages)[cursorId];
 	CursorMan.replaceCursor(s.getPixels(), s.w, s.h, s.w / 2, s.h / 2, 0xff);
 
 	showCursor();
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 0fa6bf3a5e..8965489e27 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -33,6 +33,8 @@ namespace Sherlock {
 #define GAME_FRAME_RATE 60
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
+enum CursorId { ARROW = 0, MAGNIFY = 1, WAIT = 2, INVALID_CURSOR = -1 };
+
 class SherlockEngine;
 
 class EventsManager {
@@ -45,7 +47,7 @@ private:
 
 	bool checkForNextFrameCounter();
 public:
-	int _cursorIndex;
+	CursorId _cursorId;
 	byte _mouseButtons;
 	bool _mouseClicked;
 	Common::Stack<Common::KeyState> _pendingKeys;
@@ -55,7 +57,7 @@ public:
 
 	void loadCursors(const Common::String &filename);
 
-	void changeCursor(int cursorIndex);
+	void changeCursor(CursorId cursorId);
 
 	void showCursor();
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a12939e787..ece96457db 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -77,7 +77,6 @@ void Sprite::setImageFrame() {
 void Sprite::adjustSprite() {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
-	int checkFrame = _allow ? MAX_FRAME : 32000;
 
 	if (_type == INVALID || (_type == CHARACTER && _vm->_animating))
 		return;
@@ -202,6 +201,17 @@ void UseType::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
+SherlockEngine *Object::_vm;
+bool Object::_countCAnimFrames;
+
+void Object::setVm(SherlockEngine *vm) {
+	_vm = vm;
+	_countCAnimFrames = false;
+}
+
+/**
+ * Load the object data from the passed stream
+ */
 void Object::synchronize(Common::SeekableReadStream &s) {
 	char buffer[50];
 
@@ -225,8 +235,8 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_sequenceNumber = s.readSint16LE();
 	_position.x = s.readSint16LE();
 	_position.y = s.readSint16LE();
-	_movement.x = s.readSint16LE();
-	_movement.y = s.readSint16LE();
+	_delta.x = s.readSint16LE();
+	_delta.y = s.readSint16LE();
 	_type = (SpriteType)s.readUint16LE();
 	_oldPosition.x = s.readSint16LE();
 	_oldPosition.y = s.readSint16LE();
@@ -268,6 +278,9 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 		_use[idx].synchronize(s);
 }
 
+/**
+ * Toggle the type of an object between hidden and active
+ */
 void Object::toggleHidden() {
 	if (_type != HIDDEN && _type != HIDE_SHAPE && _type != INVALID) {
 		if (_seqTo != 0)
@@ -303,6 +316,153 @@ void Object::toggleHidden() {
 	}
 }
 
+/**
+ * Check the state of the object
+ */
+void Object::checkObject(Object &o) {
+	Scene &scene = *_vm->_scene;
+	Sound &sound = *_vm->_sound;
+	int checkFrame = _allow ? MAX_FRAME : 32000;
+	bool codeFound;
+
+	if (_seqTo) {
+		byte *ptr = &_sequences[_frameNumber];
+		if (*ptr == _seqTo) {
+			// The sequence is completed
+			*ptr = _seqTo + SEQ_TO_CODE + 128;	// Reset to normal
+			_seqTo = 0;
+		} else {
+			// Continue doing sequence
+			if (*ptr > _seqTo)
+				*ptr--;
+			else
+				*ptr++;
+
+			return;
+		}
+	}
+
+	++_frameNumber;
+
+	do {
+		// Check for end of sequence
+		codeFound = checkEndOfSequence();
+
+		if (_sequences[_frameNumber] >= 128 && _frameNumber < checkFrame) {
+			codeFound = true;
+			int v = _sequences[_frameNumber];
+
+			if (v >= 228) {
+				// Goto code found
+				v -= 228;
+				_seqcounter2 = _seqCounter;
+				_seqStack = _frameNumber + 1;
+				setObjSequence(v, false);
+			} else if (v >= SOUND_CODE && (v <= (SOUND_CODE + 29))) {
+				codeFound = true;
+				++_frameNumber;
+				v -= SOUND_CODE;
+
+				if (sound._soundOn && !_countCAnimFrames) {
+					if (!scene._sounds[v - 1]._name.empty() && sound._digitized)
+						sound.playLoadedSound(v - 1, 0);
+				}
+			} else if (v >= FLIP_CODE && v <= (FLIP_CODE + 2)) {
+				// Flip code
+				codeFound = true;
+				++_frameNumber;
+				v -= FLIP_CODE;
+
+				// Alter the flipped status
+				switch (v) {
+				case 0:
+					// Clear the flag
+					_flags &= ~2;
+					break;
+				case 1:
+					// Set the flag
+					_flags |= 2;
+					break;
+				case 2:
+					// Toggle the flag
+					_flags ^= 2;
+					break;
+				default:
+					break;
+				}
+			} else {
+				v -= 128;
+
+				// 68-99 is a squence code
+				if (v > SEQ_TO_CODE) {
+					byte *p = &_sequences[_frameNumber];
+					v -= SEQ_TO_CODE;	// # from 1-32
+					_seqTo = v;
+					*p = *(p - 1);
+
+					if (*p > 128)
+						// If the high bit is set, convert to a real frame
+						*p -= (byte)(SEQ_TO_CODE - 128);
+
+					if (*p > _seqTo)
+						*p -= 1;
+					else
+						*p += 1;
+
+					// Will be incremented below to return back to original value
+					--_frameNumber;
+					v = 0;
+				} else if (v == 10) {
+					// Set delta for objects
+					Common::Point pt(_sequences[_frameNumber + 1], _sequences[_frameNumber + 2]);
+					if (pt.x > 128)
+						pt.x = (pt.x - 128) *  -1;
+					else
+						pt.x--;
+
+					if (pt.y > 128)
+						pt.y = (pt.y - 128) * -1;
+					else
+						pt.y;
+
+					_delta = pt;
+					_frameNumber += 2;
+				} else if (v < 4) {
+					for (int idx = 0; idx < 4; ++idx) {
+						o.checkNameForCodes(_use[v]._names[idx], nullptr);
+					}
+
+					if (_use[v]._useFlag)
+						_vm->setFlags(_use[v]._useFlag);
+				}
+
+				++_frameNumber;
+			}
+		}
+	} while (codeFound);
+}
+
+bool Object::checkEndOfSequence() const {
+	// TODO
+	return false;
+}
+
+void Object::setObjSequence(int seq, bool wait) {
+	// TODO
+}
+
+/**
+* Checks for codes
+* @param name		The name to check for codes
+* @param messages	If provided, any messages to be returned
+* @returns		0 if no codes are found, 1 if codes were found
+*/
+int Object::checkNameForCodes(const Common::String &name, Common::StringArray *messages) {
+
+	// TODO
+	return 0;
+}
+
 /*----------------------------------------------------------------*/
 
 void CAnim::synchronize(Common::SeekableReadStream &s) {
@@ -318,10 +478,10 @@ void CAnim::synchronize(Common::SeekableReadStream &s) {
 	_flags = s.readByte();
 	_goto.x = s.readSint16LE();
 	_goto.y = s.readSint16LE();
-	_sequenceNumber = s.readSint16LE();
+	_gotoDir = s.readSint16LE();
 	_teleportPos.x = s.readSint16LE();
 	_teleportPos.y = s.readSint16LE();
-	_teleportS = s.readSint16LE();
+	_teleportDir = s.readSint16LE();
 }
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index d9f1c7409e..d7442f928f 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -137,7 +137,18 @@ struct UseType {
 	void synchronize(Common::SeekableReadStream &s);
 };
 
-struct Object {
+class Object {
+private:
+	static SherlockEngine *_vm;
+
+	bool checkEndOfSequence() const;
+
+	void setObjSequence(int seq, bool wait);
+public:
+	static bool _countCAnimFrames;
+
+	static void setVm(SherlockEngine *vm);
+public:
 	Common::String _name;			// Name
 	Common::String _description;	// Description
 	Common::String _examine;		// Examine in-depth description
@@ -151,7 +162,7 @@ struct Object {
 	int _sequenceNumber;			// Sequence being used
 	SpriteType _type;				// Object type
 	Common::Point _position;		// Current position
-	Common::Point _movement;		// Momvement amount
+	Common::Point _delta;			// Momvement amount
 	Common::Point _oldPosition;		// Old position
 	Common::Point _oldSize;			// Image's old size
 	Common::Point _goto;			// Walk destination
@@ -185,19 +196,23 @@ struct Object {
 	void synchronize(Common::SeekableReadStream &s);
 
 	void toggleHidden();
+
+	void checkObject(Object &o);
+
+	int checkNameForCodes(const Common::String &name, Common::StringArray *messages);
 };
 
 struct CAnim {
 	Common::String _name;			// Name
-	int _sequences[MAX_FRAME];		// Animation sequences
+	byte _sequences[MAX_FRAME];		// Animation sequences
 	Common::Point _position;		// Position
 	int _size;						// Size of uncompressed animation
 	SpriteType _type;
 	int _flags;						// Tells if can be walked behind
 	Common::Point _goto;			// coords holmes should walk to before starting canim
-	int _sequenceNumber;
+	int _gotoDir;
 	Common::Point _teleportPos;		// Location Holmes shoul teleport to after
-	int _teleportS;					// playing canim
+	int _teleportDir;					// playing canim
 
 	void synchronize(Common::SeekableReadStream &s);
 };
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 998fe4f0cf..43d3422f1a 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -289,4 +289,9 @@ void People::gotoStand(Sprite &sprite) {
 	_allowWalkAbort = true;
 }
 
+void People::walkToCoords(const Common::Point &destPos, int destDir) {
+	// TODO
+	warning("TODO: walkToCoords");
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index e58fd33ef2..d2d7e92512 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -79,6 +79,8 @@ public:
 	void setWalking();
 
 	void gotoStand(Sprite &sprite);
+
+	void walkToCoords(const Common::Point &destPos, int destDir);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 66feca6bd5..9e25a8dd6e 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -129,7 +129,7 @@ void Resources::addToCache(const Common::String &filename) {
 }
 
 /**
- * Adds a resource from a library file tot he cache
+ * Adds a resource from a library file to the cache
  */
 void Resources::addToCache(const Common::String &filename, const Common::String &libFilename) {
 	// Get the resource
@@ -140,6 +140,16 @@ void Resources::addToCache(const Common::String &filename, const Common::String
 	delete stream;
 }
 
+/**
+ * Adds a given stream to the cache under the given name
+ */
+void Resources::addToCache(const Common::String &filename, Common::SeekableReadStream &stream) {
+	_cache.load(filename, stream);
+}
+
+/**
+ * Returns a stream for a given file
+ */
 Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 	// First check if the file is directly in the cache
 	if (_cache.isCached(filename))
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 2f9222c1fd..1d8c601e77 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -76,6 +76,7 @@ public:
 
 	void addToCache(const Common::String &filename);
 	void addToCache(const Common::String &filename, const Common::String &libFilename);
+	void addToCache(const Common::String &filename, Common::SeekableReadStream &stream);
 	bool isInCache(const Common::String &filename) const { return _cache.isCached(filename); }
 
 	Common::SeekableReadStream *load(const Common::String &filename);
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 2477f2894f..b8c7661966 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -183,7 +183,7 @@ bool ScalpelEngine::showOfficeCutscene() {
 void ScalpelEngine::startScene() {
 	if (_scene->_goToRoom == 100 || _scene->_goToRoom == 98) {
 		// Chessboard selection
-		if (_sound->_musicEnabled) {
+		if (_sound->_musicOn) {
 			if (_sound->loadSong(100)) {
 				if (_sound->_music)
 					_sound->startSong();
@@ -208,7 +208,7 @@ void ScalpelEngine::startScene() {
 	case 52:
 	case 53:
 	case 70:
-		if (_sound->_musicEnabled && _sound->loadSong(_scene->_goToRoom)) {
+		if (_sound->_musicOn && _sound->loadSong(_scene->_goToRoom)) {
 			if (_sound->_music)
 				_sound->startSong();
 		}
@@ -325,7 +325,7 @@ void ScalpelEngine::startScene() {
 	}
 
 	_events->loadCursors("rmouse.vgs");
-	_events->changeCursor(0);
+	_events->changeCursor(ARROW);
 
 	if (_scene->_goToRoom == 99) {
 		// Chess Board
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 9fbec6b776..8158dfc705 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -98,6 +98,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_invGraphicItems = 0;
 	_hsavedPos = Common::Point(-1, -1);
 	_hsavedFs = -1;
+	_cAnimFramePause = 0;
 
 	_controlPanel = new ImageFile("controls.vgs");
 	_controls = nullptr; // new ImageFile("menu.all");
@@ -124,7 +125,7 @@ void Scene::selectScene() {
 
 	// Load the scene
 	Common::String sceneFile = Common::String::format("res%02d", _goToRoom);
-	Common::String roomName = Common::String::format("res%02d.rrm", _goToRoom);
+	_rrmName = Common::String::format("res%02d.rrm", _goToRoom);
 	_currentScene = _goToRoom;
 	_goToRoom = -1;
 
@@ -312,7 +313,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			_sounds[idx].synchronize(*rrmStream);
 
 		// If sound is turned on, load the sounds into memory
-		if (sound._sfxEnabled) {
+		if (sound._soundOn) {
 			for (int idx = 0; idx < numSounds; ++idx) {
 				sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
 				_sounds[idx]._name = "";
@@ -374,7 +375,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	checkInventory();
 
 	// Handle starting any music for the scene
-	if (sound._musicEnabled && sound.loadSong(_currentScene)) {
+	if (sound._musicOn && sound.loadSong(_currentScene)) {
 		if (sound._music)
 			sound.startSong();
 	}
@@ -516,6 +517,7 @@ void Scene::transitionToScene() {
 		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT 
 	};
 	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
 
 	if (_hsavedPos.x < 1) {
 		// No exit information from last scene-check entrance info
@@ -539,7 +541,7 @@ void Scene::transitionToScene() {
 		}
 	}
 
-	int startcAnimNum = -1;
+	int cAnimNum = -1;
 
 	if (_hsavedFs < 101) {
 		// Standard info, so set it
@@ -547,7 +549,7 @@ void Scene::transitionToScene() {
 		people[PLAYER]._sequenceNumber = _hsavedFs;
 	} else {
 		// It's canimation information
-		startcAnimNum = _hsavedFs - 101;
+		cAnimNum = _hsavedFs - 101;
 
 		// Prevent Holmes from being drawn
 		people[PLAYER]._position = Common::Point(0, 0);
@@ -599,7 +601,22 @@ void Scene::transitionToScene() {
 	}
 
 	updateBackground();
-	// TODO
+
+	if (screen._fadeStyle)
+		screen.randomTransition();
+	else
+		screen.blitFrom(screen._backBuffer);
+
+	if (cAnimNum != -1) {
+		CAnim &c = _cAnim[cAnimNum];
+		Common::Point pt = c._position;
+
+		c._position = Common::Point(-1, -1);
+		people[AL]._position = Common::Point(0, 0);
+
+		startCAnim(cAnimNum, 1);
+		c._position = pt;
+	}
 }
 
 /**
@@ -722,9 +739,265 @@ Exit *Scene::checkForExit(const Common::Rect &r) {
 	return nullptr;
 }
 
+/**
+ * Checks all the background shapes. If a background shape is animating,
+ * it will flag it as needing to be drawn. If a non-animating shape is
+ * colliding with another shape, it will also flag it as needing drawing
+ */
 void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
+	// Iterate through the shapes
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
+					NORMAL_FORWARD : NORMAL_BEHIND;
+			} else if (!(obj._flags & 1)) {
+				obj._misc = BEHIND;
+			} else if (obj._flags & 4) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+
+	// Iterate through the canimshapes
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &obj = _canimShapes[idx];
+		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
+				NORMAL_FORWARD : NORMAL_BEHIND;
+			}
+			else if (!(obj._flags & 1)) {
+				obj._misc = BEHIND;
+			}
+			else if (obj._flags & 4) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+}
+
+/**
+ * Attempt to start a canimation sequence. It will load the requisite graphics, and
+ * then copy the canim object into the _canimShapes array to start the animation.
+ *
+ * @param cAnimNum		The canim object within the current scene
+ * @param playRate		Play rate. 0 is invalid; 1=normal speed, 2=1/2 speed, etc.
+ *		A negative playRate can also be specified to play the animation in reverse
+ */
+int Scene::startCAnim(int cAnimNum, int playRate) {
+	EventsManager &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Resources &res = *_vm->_res;
+	Common::Point tpPos, walkPos;
+	int tpDir, walkDir;
+	int tFrames;
+	int gotoCode = -1;
+
+	// Validation
+	if (cAnimNum >= (int)_cAnim.size())
+		// number out of bounds
+		return -1;
+	if (_canimShapes.size() >= 3 || playRate == 0)
+		// Too many active animations, or invalid play rate
+		return 0;
+
+	CAnim &cAnim = _cAnim[cAnimNum];
+	if (playRate < 0) {
+		// Reverse direction
+		walkPos = cAnim._teleportPos;
+		walkDir = cAnim._teleportDir;
+		tpPos = cAnim._goto;
+		tpDir = cAnim._gotoDir;
+	} else {
+		// Forward direction
+		walkPos = cAnim._goto;
+		walkDir = cAnim._gotoDir;
+		tpPos = cAnim._teleportPos;
+		tpDir = cAnim._teleportDir;
+	}
+
+	events.changeCursor(WAIT);
+	_canimShapes.push_back(Object());
+	Object &cObj = _canimShapes[_canimShapes.size() - 1];
+
+	if (walkPos.x != -1) {
+		// Holmes must walk to the walk point before the cAnimation is started
+		if (people[AL]._position != walkPos)
+			people.walkToCoords(walkPos, walkDir);
+	}
+
+	if (_vm->_talkToAbort)
+		return 1;
+
+	// Copy the canimation into the bgShapes type canimation structure so it can be played
+	cObj._allow = cAnimNum + 1;				// Keep track of the parent structure
+	cObj._name = _cAnim[cAnimNum]._name;	// Copy name
+
+	// Remove any attempt to draw object frame
+	if (cAnim._type == NO_SHAPE && cAnim._sequences[0] < 100)
+		cAnim._sequences[0] = 0;
+
+	cObj._sequences = cAnim._sequences;
+	cObj._images = nullptr;
+	cObj._position = cAnim._position;
+	cObj._delta = Common::Point(0, 0);
+	cObj._type = cAnim._type;
+	cObj._flags = cAnim._flags;
+
+	cObj._maxFrames = 0;
+	cObj._frameNumber = -1;
+	cObj._sequenceNumber = cAnimNum;
+	cObj._oldPosition = Common::Point(0, 0);
+	cObj._oldPosition = Common::Point(0, 0);
+	cObj._goto = Common::Point(0, 0);
+	cObj._status = 0;
+	cObj._misc = 0;
+	cObj._imageFrame = nullptr;
+
+	if (cAnim._name.size() > 0 && cAnim._type != NO_SHAPE) {
+		if (tpPos.x != -1)
+			people[AL]._type = REMOVE;
+
+		Common::String fname = cAnim._name + ".vgs";
+		if (!res.isInCache(fname)) {
+			// Set up RRM scene data
+			Common::SeekableReadStream *rrmStream = res.load(_rrmName);
+			rrmStream->seek(44 + cAnimNum * 4);
+			rrmStream->seek(rrmStream->readUint32LE());
+
+			// Load the canimation into the cache
+			Common::SeekableReadStream *imgStream = !_lzwMode ? rrmStream :
+				decompressLZ(*rrmStream, cAnim._size);
+			res.addToCache(fname, *imgStream);
+
+			if (_lzwMode)
+				delete imgStream;
+
+			delete rrmStream;
+		}
+
+		// Now load the resource as an image
+		cObj._maxFrames = cObj._images->size();
+		cObj._images = new ImageFile(fname);
+		cObj._imageFrame = &(*cObj._images)[0];
+
+		int frames = 0;
+		if (playRate < 0) {
+			// Reverse direction
+			// Count number of frames
+			while (cObj._sequences[frames] && frames < MAX_FRAME)
+				++frames;
+		}
+		else {
+			// Forward direction
+			Object::_countCAnimFrames = true;
+
+			while (cObj._type == ACTIVE_BG_SHAPE) {
+				cObj.checkObject(_bgShapes[0]);
+				++frames;
+
+				if (frames >= 1000)
+					error("CAnim has infinite loop sequence");
+			}
+
+			if (frames > 1)
+				--frames;
+
+			Object::_countCAnimFrames = false;
+
+			cObj._type = cAnim._type;
+			cObj._frameNumber = -1;
+			cObj._position = cAnim._position;
+			cObj._delta = Common::Point(0, 0);
+		}
+
+		// Return if animation has no frames in it
+		if (frames == 0)
+			return -2;
+
+		++frames;
+		int repeat = ABS(playRate);
+		int dir;
+
+		if (playRate < 0) {
+			// Play in reverse
+			dir = -2;
+			cObj._frameNumber = frames - 3;
+		} else {
+			dir = 0;
+		}
+
+		tFrames = frames - 1;
+		int pauseFrame = (_cAnimFramePause) ? frames - _cAnimFramePause : -1;
+
+		while (--frames) {
+			if (frames == pauseFrame)
+				printObjDesc(_cAnimStr, true);
+
+			doBgAnim();
+
+			// Repeat same frame
+			int temp = repeat;
+			while (--temp > 0) {
+				cObj._frameNumber--;
+				doBgAnim();
+			}
+
+			cObj._frameNumber += dir;
+		}
+
+		people[AL]._type = CHARACTER;
+	}
+
+	// Teleport to ending coordinates if necessary
+	if (tpPos.x != -1) {
+		people[AL]._position = tpPos;	// Place the player
+		people[AL]._sequenceNumber = tpDir;
+		people.gotoStand(people[AL]);
+	}
+
+	if (playRate < 0)
+		// Reverse direction - set to end sequence
+		cObj._frameNumber = tFrames - 1;
+	
+	if (cObj._frameNumber <= 26)
+		gotoCode = cObj._sequences[cObj._frameNumber + 3];
+
+	// Set canim to REMOVE type and free memory
+	cObj.checkObject(_bgShapes[0]);
+
+	if (gotoCode > 0 && !_vm->_talkToAbort) {
+		_goToRoom = gotoCode;
+
+		if (_goToRoom < 97 && _vm->_map[_goToRoom].x) {
+			_overPos = _vm->_map[_goToRoom];
+		}
+	}
+
+	people.loadWalk();
+
+	if (tpPos.x != -1 && !_vm->_talkToAbort) {
+		// Teleport to ending coordinates
+		people[AL]._position = tpPos;
+		people[AL]._sequenceNumber = tpDir;
+
+		people.gotoStand(people[AL]);
+	}
+
+	return 1;
+}
+
+void Scene::printObjDesc(const Common::String &str, bool firstTime) {
 	// TODO
 }
 
+/**
+ * Animate all objects and people.
+ */
+void Scene::doBgAnim() {
+	// TODO
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 8986b62bf5..06ca2f4c0d 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -87,6 +87,9 @@ struct SceneSound {
 class Scene {
 private:
 	SherlockEngine *_vm;
+	Common::String _rrmName;
+	int _cAnimFramePause;
+	Common::String _cAnimStr;
 
 	bool loadScene(const Common::String &filename);
 
@@ -101,6 +104,10 @@ private:
 	void updateBackground();
 
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
+
+	int startCAnim(int cAnimNum, int playRate);
+
+	void doBgAnim();
 public:
 	int _currentScene;
 	int _goToRoom;
@@ -147,6 +154,8 @@ public:
 	void checkSceneFlags(bool mode);
 
 	Exit *checkForExit(const Common::Rect &r);
+
+	void printObjDesc(const Common::String &str, bool firstTime);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 257cbb2cab..756be22846 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -70,6 +70,7 @@ void SherlockEngine::initialize() {
 	DebugMan.addDebugChannel(kDebugScript, "scripts", "Script debug level");
 
 	ImageFile::setVm(this);
+	Object::setVm(this);
 	Sprite::setVm(this);
 	_res = new Resources();
 	_animation = new Animation(this);
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 61c740ea3f..0917f83e89 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -25,11 +25,12 @@
 namespace Sherlock {
 
 Sound::Sound(SherlockEngine *vm): _vm(vm) {
-	_sfxEnabled = true;
-	_musicEnabled = true;
-	_voicesEnabled = true;
+	_soundOn = true;
+	_musicOn = true;
+	_voicesOn = true;
 	_playingEpilogue = false;
 	_music = false;
+	_digitized = false;
 }
 
 void Sound::loadSound(const Common::String &name, int priority) {
@@ -44,6 +45,10 @@ void Sound::cacheSound(const Common::String &name, int index) {
 	// TODO
 }
 
+void Sound::playLoadedSound(int bufNum, int waitMode) {
+	// TODO
+}
+
 void Sound::playCachedSound(int index) {
 	// TODO
 }
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 9d323833f1..b6e645a28f 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -38,17 +38,19 @@ class Sound {
 private:
 	SherlockEngine *_vm;
 public:
-	bool _sfxEnabled;
-	bool _musicEnabled;
-	bool _voicesEnabled;
+	bool _soundOn;
+	bool _musicOn;
+	bool _voicesOn;
 	bool _playingEpilogue;
 	bool _music;
+	bool _digitized;
 public:
 	Sound(SherlockEngine *vm);
 
 	void loadSound(const Common::String &name, int priority);
 	void playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
 	void cacheSound(const Common::String &name, int index);
+	void playLoadedSound(int bufNum, int waitMode);
 	void playCachedSound(int index);
 	void clearCache();
 	void stopSound();
-- 
cgit v1.2.3


From 7f04ea4425bae0ebac7e51d71dc315b965bf94c9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Mar 2015 20:25:15 -0400
Subject: SHERLOCK: Implemented checkSprite

---
 engines/sherlock/animation.cpp       |   4 +-
 engines/sherlock/events.cpp          |  35 ++++---
 engines/sherlock/events.h            |  12 ++-
 engines/sherlock/objects.cpp         | 195 ++++++++++++++++++++++++++++++++++-
 engines/sherlock/objects.h           |   4 +
 engines/sherlock/resources.cpp       |   6 +-
 engines/sherlock/resources.h         |   2 +-
 engines/sherlock/scalpel/scalpel.cpp |   2 +-
 engines/sherlock/scene.cpp           |  80 +++++++++++---
 engines/sherlock/scene.h             |  29 +++++-
 engines/sherlock/screen.cpp          |   4 +-
 engines/sherlock/sherlock.cpp        |   6 +-
 engines/sherlock/sherlock.h          |   4 +-
 engines/sherlock/sound.cpp           |   3 +
 engines/sherlock/sound.h             |   3 +
 engines/sherlock/talk.cpp            |   9 +-
 engines/sherlock/talk.h              |  10 +-
 17 files changed, 355 insertions(+), 53 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index a7f91e91cd..9d32746de4 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -66,7 +66,7 @@ Animation::Animation(SherlockEngine *vm): _vm(vm) {
 
 bool Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
 		bool setPalette, int speed) {
-	EventsManager &events = *_vm->_events;
+	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	int soundNumber = 0;
@@ -123,7 +123,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 				pt.x = stream->readUint16LE();
 				pt.y = stream->readUint16LE();
 			} else {
-				pt = images[imageFrame]._position;
+				pt = images[imageFrame]._offset;
 			}
 
 			// Draw the sprite
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 69e89e7157..1a09f0600e 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -30,7 +30,7 @@
 
 namespace Sherlock {
 
-EventsManager::EventsManager(SherlockEngine *vm) {
+Events::Events(SherlockEngine *vm) {
 	_vm = vm;
 	_cursorImages = nullptr;
 	_cursorId = INVALID_CURSOR;
@@ -40,14 +40,14 @@ EventsManager::EventsManager(SherlockEngine *vm) {
 	_mouseButtons = 0;
 }
 
-EventsManager::~EventsManager() {
+Events::~Events() {
 	delete _cursorImages;
 }
 
 /**
  * Load a set of cursors from the specified file
  */
-void EventsManager::loadCursors(const Common::String &filename) {
+void Events::loadCursors(const Common::String &filename) {
 	hideCursor();
 	delete _cursorImages;
 
@@ -57,7 +57,7 @@ void EventsManager::loadCursors(const Common::String &filename) {
 /**
  * Set the cursor to show
  */
-void EventsManager::changeCursor(CursorId cursorId) {
+void Events::setCursor(CursorId cursorId) {
 	if (cursorId == _cursorId)
 		return;
 
@@ -73,28 +73,35 @@ void EventsManager::changeCursor(CursorId cursorId) {
 /**
  * Show the mouse cursor
  */
-void EventsManager::showCursor() {
+void Events::showCursor() {
 	CursorMan.showMouse(true);
 }
 
 /**
  * Hide the mouse cursor
  */
-void EventsManager::hideCursor() {
+void Events::hideCursor() {
 	CursorMan.showMouse(false);
 }
 
+/**
+ * Returns the cursor 
+ */
+CursorId Events::getCursor() const {
+	return _cursorId;
+}
+
 /**
  * Returns true if the mouse cursor is visible
  */
-bool EventsManager::isCursorVisible() {
+bool Events::isCursorVisible() const {
 	return CursorMan.isVisible();
 }
 
 /**
  * Check for any pending events
  */
-void EventsManager::pollEvents() {
+void Events::pollEvents() {
 	checkForNextFrameCounter();
 
 	Common::Event event;
@@ -138,7 +145,7 @@ void EventsManager::pollEvents() {
  * Poll for events and introduce a small delay, to allow the system to
  * yield to other running programs
  */
-void EventsManager::pollEventsAndWait() {
+void Events::pollEventsAndWait() {
 	pollEvents();
 	g_system->delayMillis(10);
 }
@@ -146,7 +153,7 @@ void EventsManager::pollEventsAndWait() {
 /**
  * Check whether it's time to display the next screen frame
  */
-bool EventsManager::checkForNextFrameCounter() {
+bool Events::checkForNextFrameCounter() {
 	// Check for next game frame
 	uint32 milli = g_system->getMillis();
 	if ((milli - _priorFrameTime) >= GAME_FRAME_TIME) {
@@ -171,7 +178,7 @@ bool EventsManager::checkForNextFrameCounter() {
 /**
  * Clear any current keypress or mouse click
  */
-void EventsManager::clearEvents() {
+void Events::clearEvents() {
 	_pendingKeys.clear();
 	_mouseClicked = false;
 }
@@ -179,12 +186,12 @@ void EventsManager::clearEvents() {
 /**
  * Delay for a given number of game frames, where each frame is 1/60th of a second
  */
-void EventsManager::wait(int numFrames) {
+void Events::wait(int numFrames) {
 	uint32 totalMilli = numFrames * 1000 / GAME_FRAME_RATE;
 	delay(totalMilli);
 }
 
-bool EventsManager::delay(uint32 time, bool interruptable) {
+bool Events::delay(uint32 time, bool interruptable) {
 	// Different handling for really short versus extended times
 	if (time < 10) {
 		// For really short periods, simply delay by the desired amount
@@ -216,7 +223,7 @@ bool EventsManager::delay(uint32 time, bool interruptable) {
 /**
  * Wait for the next frame
  */
-void EventsManager::waitForNextFrame() {
+void Events::waitForNextFrame() {
 	_mouseClicked = false;
 	_mouseButtons = 0;
 
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 8965489e27..e939b5768f 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -37,7 +37,7 @@ enum CursorId { ARROW = 0, MAGNIFY = 1, WAIT = 2, INVALID_CURSOR = -1 };
 
 class SherlockEngine;
 
-class EventsManager {
+class Events {
 private:
 	SherlockEngine *_vm;
 	uint32 _frameCounter;
@@ -52,18 +52,20 @@ public:
 	bool _mouseClicked;
 	Common::Stack<Common::KeyState> _pendingKeys;
 public:
-	EventsManager(SherlockEngine *vm);
-	~EventsManager();
+	Events(SherlockEngine *vm);
+	~Events();
 
 	void loadCursors(const Common::String &filename);
 
-	void changeCursor(CursorId cursorId);
+	void setCursor(CursorId cursorId);
 
 	void showCursor();
 
 	void hideCursor();
 
-	bool isCursorVisible();
+	CursorId getCursor() const;
+
+	bool isCursorVisible() const;
 
 	void pollEvents();
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index ece96457db..5a93ce6869 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -33,6 +33,10 @@ namespace Sherlock {
 #define LEFT_LIMIT 0
 #define RIGHT_LIMIT SHERLOCK_SCREEN_WIDTH
 
+// Distance to walk around WALK_AROUND boxes
+#define CLEAR_DIST_X 5
+#define CLEAR_DIST_Y 0
+
 SherlockEngine *Sprite::_vm;
 
 /**
@@ -77,11 +81,12 @@ void Sprite::setImageFrame() {
 void Sprite::adjustSprite() {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
 
 	if (_type == INVALID || (_type == CHARACTER && _vm->_animating))
 		return;
 
-	if (!_vm->_talkCounter && _type == CHARACTER && _walkCount) {
+	if (!talk._talkCounter && _type == CHARACTER && _walkCount) {
 		// Handle active movement for the sprite
 		_position += _delta;
 		--_walkCount;
@@ -163,6 +168,190 @@ void Sprite::adjustSprite() {
 	}
 }
 
+/**
+ * Checks the sprite's position to see if it's collided with any special objects
+ */
+void Sprite::checkSprite() {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	Common::Point pt;
+	Common::Rect objBounds;
+	Common::Point spritePt(_position.x / 100, _position.y / 100);
+
+	if (!talk._talkCounter && _type == CHARACTER) {
+		pt = _walkCount ? _position + _delta : _position;
+		pt.x /= 100;
+		pt.y /= 100;
+
+		for (uint idx = 0; idx < scene._bgShapes.size() && !talk._talkToAbort; ++idx) {
+			Object &obj = scene._bgShapes[idx];
+
+			if (obj._aType > PERSON && _type != INVALID && _type != HIDDEN) {
+				if (_type == NO_SHAPE) {
+					objBounds = Common::Rect(_position.x, _position.y,
+						_position.x + _noShapeSize.x, _position.y + _noShapeSize.y);
+				} else {
+					int xp = _position.x + _imageFrame->_offset.x;
+					int yp = _position.y + _imageFrame->_offset.y;
+					objBounds = Common::Rect(xp, yp,
+						xp + _imageFrame->_frame.w, yp + _imageFrame->_frame.h);
+				}
+			}
+
+			if (objBounds.contains(pt)) {
+				if (objBounds.contains(spritePt)) {
+					// Current point is already inside the the bounds, so impact occurred
+					// on a previous call. So simply do nothing until we're clear of the box
+					switch (obj._aType) {
+					case TALK_MOVE:
+						if (_walkCount) {
+							// Holmes is moving
+							obj._type = HIDDEN;
+							obj.setFlagsAndToggles();
+							talk.talkTo(obj._use[0]._target);
+						}
+						break;
+
+					case PAL_CHANGE:
+					case PAL_CHANGE2:
+						if (_walkCount) {
+							int palStart = atoi(obj._use[0]._names[0].c_str()) * 3;
+							int palLength = atoi(obj._use[0]._names[1].c_str()) * 3;
+							int templ = atoi(obj._use[0]._names[2].c_str()) * 3;
+							if (templ == 0)
+								templ = 100;
+
+							// Ensure only valid palette change data found
+							if (palLength > 0) {
+								// Figure out how far into the shape Holmes is so that we
+								// can figure out what percentage of the original palette
+								// to set the current palette to
+								int palPercent = (pt.x - objBounds.left) * 100 / objBounds.width();
+								palPercent = palPercent * templ / 100;
+								if (obj._aType == PAL_CHANGE)
+									// Invert percentage
+									palPercent = 100 - palPercent;
+								
+								for (int idx = palStart; idx < (palStart + palLength); ++idx)
+									screen._sMap[idx] = screen._cMap[idx] * palPercent / 100;
+
+								events.pollEvents();
+								screen.setPalette(screen._sMap);
+							}
+						}
+						break;
+
+					case TALK:
+					case TALK_EVERY:
+						_type = HIDDEN;
+						obj.setFlagsAndToggles();
+						talk.talkTo(obj._use[0]._target);
+						break;
+
+					default:
+						break;
+					}
+				} else {
+					// New impact just occurred
+					switch (obj._aType) {
+					case BLANK_ZONE:
+						// A blank zone masks out all other remaining zones underneath it.
+						// If this zone is hit, exit the outer loop so we do not check anymore
+						return;
+
+					case SOLID:
+					case TALK:
+						// Stop walking
+						if (obj._aType == TALK) {
+							obj.setFlagsAndToggles();
+							talk.talkTo(obj._use[0]._target);
+						} else {
+							people.gotoStand(*this);
+						}
+						break;
+
+					case TALK_EVERY:
+						if (obj._aType == TALK_EVERY) {
+							obj._type = HIDDEN;
+							obj.setFlagsAndToggles();
+							talk.talkTo(obj._use[0]._target);
+						} else {
+							people.gotoStand(*this);
+						}
+						break;
+
+					case FLAG_SET:
+						obj.setFlagsAndToggles();
+						obj._type = HIDDEN;
+						break;
+
+					case WALK_AROUND:
+						if (objBounds.contains(people._walkTo.top())) {
+							// Reached zone
+							people.gotoStand(*this);
+						} else {
+							// Destination not within box, walk to best corner
+							Common::Point walkPos;
+
+							if (spritePt.x >= objBounds.left && spritePt.x < objBounds.right) {
+								// Impact occurred due to vertical movement. Determine whether to
+								// travel to the left or right side
+								if (_delta.x > 0)
+									// Go to right side
+									walkPos.x = objBounds.right + CLEAR_DIST_X;
+								else if (_delta.x < 0)
+									// Go to left side
+									walkPos.x = objBounds.left - CLEAR_DIST_X;
+								else {
+									// Going straight up or down. So choose best side
+									if (spritePt.x >= (objBounds.left + objBounds.width() / 2))
+										walkPos.x = objBounds.right + CLEAR_DIST_X;
+									else
+										walkPos.x = objBounds.left - CLEAR_DIST_X;
+								}
+
+								walkPos.y = (_delta.y >= 0) ? objBounds.top - CLEAR_DIST_Y : 
+									objBounds.bottom + CLEAR_DIST_Y;
+							} else {
+								// Impact occurred due to horizontal movement
+								if (_delta.y > 0)
+									// Go to bottom of box
+									walkPos.y = objBounds.bottom + CLEAR_DIST_Y;
+								else if (_delta.y < 0)
+									// Go to top of box
+									walkPos.y = objBounds.top - CLEAR_DIST_Y;
+								else {
+									// Going straight horizontal, so choose best side
+									if (spritePt.y >= (objBounds.top + objBounds.height() / 2))
+										walkPos.y = objBounds.bottom + CLEAR_DIST_Y;
+									else
+										walkPos.y = objBounds.top - CLEAR_DIST_Y;
+								}
+
+								walkPos.x = (_delta.x >= 0) ? objBounds.left - CLEAR_DIST_X :
+									objBounds.right + CLEAR_DIST_X;
+							}
+
+							walkPos.x += people[AL]._imageFrame->_frame.w / 2;
+							people._walkDest = walkPos;
+							people._walkTo.push(walkPos);
+							people.setWalking();
+						}
+						break;
+
+					case DELTA:
+						_position.x += 200;
+						break;
+					}
+				}
+			}
+		}
+	}
+}
+
 /*----------------------------------------------------------------*/
 
 void ActionType::synchronize(Common::SeekableReadStream &s) {
@@ -463,6 +652,10 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 	return 0;
 }
 
+void Object::setFlagsAndToggles() {
+	// TODO
+}
+
 /*----------------------------------------------------------------*/
 
 void CAnim::synchronize(Common::SeekableReadStream &s) {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index d7442f928f..d099718d5b 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -115,6 +115,8 @@ public:
 	void setImageFrame();
 
 	void adjustSprite();
+
+	void checkSprite();
 };
 
 struct ActionType {
@@ -200,6 +202,8 @@ public:
 	void checkObject(Object &o);
 
 	int checkNameForCodes(const Common::String &name, Common::StringArray *messages);
+
+	void setFlagsAndToggles();
 };
 
 struct CAnim {
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 9e25a8dd6e..4b087b59b5 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -298,10 +298,10 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
 		frame._flags = stream.readByte();
-		frame._position.x = stream.readUint16LE();
-		frame._position.y = stream.readByte();
+		frame._offset.x = stream.readUint16LE();
+		frame._offset.y = stream.readByte();
         
-		frame._rleEncoded = !skipPalette && (frame._position.x == 1);
+		frame._rleEncoded = !skipPalette && (frame._offset.x == 1);
 
 		if (frame._flags & 0xFF) {
 			// Nibble packed frame data
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 1d8c601e77..ab2eb82a1e 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -93,7 +93,7 @@ struct ImageFrame {
 	uint16 _width, _height;
 	int _flags;
 	bool _rleEncoded;
-	Common::Point _position;
+	Common::Point _offset;
 	byte _rleMarker;
 	Graphics::Surface _frame;
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index b8c7661966..bb9c6c0bc2 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -325,7 +325,7 @@ void ScalpelEngine::startScene() {
 	}
 
 	_events->loadCursors("rmouse.vgs");
-	_events->changeCursor(ARROW);
+	_events->setCursor(ARROW);
 
 	if (_scene->_goToRoom == 99) {
 		// Chess Board
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 8158dfc705..13315b065b 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -90,7 +90,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_changes = false;
 	_charPoint = _oldCharPoint = 0;
 	_windowOpen = _infoFlag = false;
-	_menuMode = _keyboardInput = 0;
+	_keyboardInput = 0;
 	_walkedInScene = false;
 	_ongoingCans = 0;
 	_version = 0;
@@ -99,6 +99,9 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_hsavedPos = Common::Point(-1, -1);
 	_hsavedFs = -1;
 	_cAnimFramePause = 0;
+	_menuMode = STD_MODE;
+	_invMode = INVMODE_0;
+	_restoreFlag = false;
 
 	_controlPanel = new ImageFile("controls.vgs");
 	_controls = nullptr; // new ImageFile("menu.all");
@@ -119,7 +122,8 @@ void Scene::clear() {
 void Scene::selectScene() {
 	// Reset fields
 	_windowOpen = _infoFlag = false;
-	_menuMode = _keyboardInput = 0;
+	_menuMode = STD_MODE;
+	_keyboardInput = 0;
 	_oldKey = _help = _oldHelp = 0;
 	_oldTemp = _temp = 0;
 
@@ -142,7 +146,7 @@ void Scene::selectScene() {
  * that it should point to after loading; _misc is then set to 0.
  */
 bool Scene::loadScene(const Common::String &filename) {
-	EventsManager &events = *_vm->_events;
+	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
@@ -512,12 +516,14 @@ void Scene::checkInventory() {
  * in the scene
  */
 void Scene::transitionToScene() {
-	const int FS_TRANS[8] = { 
-		STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN, 
-		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT 
-	};
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	const int FS_TRANS[8] = {
+		STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN,
+		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT
+	};
 
 	if (_hsavedPos.x < 1) {
 		// No exit information from last scene-check entrance info
@@ -563,7 +569,7 @@ void Scene::transitionToScene() {
 			Common::Point bottomRight;
 
 			if (obj._type != NO_SHAPE) {
-				topLeft += obj._imageFrame->_position;
+				topLeft += obj._imageFrame->_offset;
 				bottomRight.x = topLeft.x + obj._imageFrame->_frame.w;
 				bottomRight.y = topLeft.y + obj._imageFrame->_frame.h;			
 			} else {
@@ -583,7 +589,7 @@ void Scene::transitionToScene() {
 								_vm->setFlags(obj._use[useNum]._useFlag);
 						}
 
-						if (!_vm->_talkToAbort) {
+						if (!talk._talkToAbort) {
 							for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
 								toggleObject(obj._use[useNum]._names[nameIdx]);
 							}
@@ -787,9 +793,10 @@ void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
  *		A negative playRate can also be specified to play the animation in reverse
  */
 int Scene::startCAnim(int cAnimNum, int playRate) {
-	EventsManager &events = *_vm->_events;
+	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Resources &res = *_vm->_res;
+	Talk &talk = *_vm->_talk;
 	Common::Point tpPos, walkPos;
 	int tpDir, walkDir;
 	int tFrames;
@@ -818,7 +825,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		tpDir = cAnim._teleportDir;
 	}
 
-	events.changeCursor(WAIT);
+	events.setCursor(WAIT);
 	_canimShapes.push_back(Object());
 	Object &cObj = _canimShapes[_canimShapes.size() - 1];
 
@@ -828,7 +835,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 			people.walkToCoords(walkPos, walkDir);
 	}
 
-	if (_vm->_talkToAbort)
+	if (talk._talkToAbort)
 		return 1;
 
 	// Copy the canimation into the bgShapes type canimation structure so it can be played
@@ -968,7 +975,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	// Set canim to REMOVE type and free memory
 	cObj.checkObject(_bgShapes[0]);
 
-	if (gotoCode > 0 && !_vm->_talkToAbort) {
+	if (gotoCode > 0 && !talk._talkToAbort) {
 		_goToRoom = gotoCode;
 
 		if (_goToRoom < 97 && _vm->_map[_goToRoom].x) {
@@ -978,7 +985,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 
 	people.loadWalk();
 
-	if (tpPos.x != -1 && !_vm->_talkToAbort) {
+	if (tpPos.x != -1 && !talk._talkToAbort) {
 		// Teleport to ending coordinates
 		people[AL]._position = tpPos;
 		people[AL]._sequenceNumber = tpDir;
@@ -997,6 +1004,51 @@ void Scene::printObjDesc(const Common::String &str, bool firstTime) {
  * Animate all objects and people.
  */
 void Scene::doBgAnim() {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	Talk &talk = *_vm->_talk;
+	Surface surface = screen._backBuffer.getSubArea(Common::Rect(0, 0,
+		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	int cursorId = events.getCursor();
+	Common::Point mousePos = events.mousePos();
+
+	talk._talkToAbort = false;
+	
+	// Animate the mouse cursor
+	if (cursorId >= WAIT) {
+		if (++cursorId > (WAIT + 2))
+			cursorId = WAIT;
+
+		events.setCursor((CursorId)cursorId);
+	}
+
+	// Check for setting magnifying glass cursor
+	if (_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) {
+		if (_invMode == INVMODE_1) {
+			// Only show Magnifying glass cursor if it's not on the inventory command line
+			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
+				events.setCursor(MAGNIFY);
+			else
+				events.setCursor(ARROW);
+		} else {
+			events.setCursor(ARROW);
+		}
+	}
+
+	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
+		// Loaded sound just finished playing
+		// TODO: This is horrible.. refactor into the Sound class
+		delete[] sound._digiBuf;
+		sound._diskSoundPlaying = false;
+	}
+
+	if (_restoreFlag) {
+		if (people[AL]._type == CHARACTER)
+			people[AL].checkSprite();
+	}
+
 	// TODO
 }
 
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 06ca2f4c0d..f48d45c34e 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -37,6 +37,30 @@ namespace Sherlock {
 #define CONTROLS_Y  138
 #define CONTROLS_Y1 151
 
+enum MenuMode {
+	STD_MODE		=  0,
+	LOOK_MODE		=  1,
+	MOVE_MODE		=  2,
+	TALK_MODE		=  3,
+	PICKUP_MODE		=  4,
+	OPEN_MODE		=  5,
+	CLOSE_MODE		=  6,
+	INV_MODE		=  7,
+	USE_MODE		=  8,
+	GIVE_MODE		=  9,
+	JOURNAL_MODE	= 10,
+	FILES_MODE		= 11,
+	SETUP_MODE		= 12
+};
+
+enum InvMode {
+	INVMODE_0	= 0,
+	INVMODE_1	= 1,
+	INVMODE_2	= 2,
+	INVMODE_3	= 3,
+	INVMODE_255 = 255
+};
+
 class SherlockEngine;
 
 struct BgFileHeader {
@@ -90,6 +114,8 @@ private:
 	Common::String _rrmName;
 	int _cAnimFramePause;
 	Common::String _cAnimStr;
+	MenuMode _menuMode;
+	InvMode _invMode;
 
 	bool loadScene(const Common::String &filename);
 
@@ -120,7 +146,7 @@ public:
 	ImageFile *_controls;
 	ImageFile *_controlPanel;
 	bool _windowOpen, _infoFlag;
-	int _menuMode, _keyboardInput;
+	int _keyboardInput;
 	int _oldKey, _help, _oldHelp;
 	int _oldTemp, _temp;
 	bool _walkedInScene;
@@ -143,6 +169,7 @@ public:
 	Common::Point _hsavedPos;
 	int _hsavedFs;
 	Common::Array<Object> _canimShapes;
+	bool _restoreFlag;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index b322b96d6b..e6c11b8cf4 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -181,7 +181,7 @@ bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, co
  * Do a random pixel transition in from _backBuffer surface to the screen
  */
 void Screen::randomTransition() {
-	EventsManager &events = *_vm->_events;
+	Events &events = *_vm->_events;
 	const int TRANSITION_MULTIPLIER = 0x15a4e35;
 	_dirtyRects.clear();
 
@@ -210,7 +210,7 @@ void Screen::randomTransition() {
  * Transition to the surface from _backBuffer using a vertical transition
  */
 void Screen::verticalTransition() {
-	EventsManager &events = *_vm->_events;
+	Events &events = *_vm->_events;
 
 	byte table[SHERLOCK_SCREEN_WIDTH];
 	Common::fill(&table[0], &table[SHERLOCK_SCREEN_WIDTH], 0);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 756be22846..637660e001 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -43,11 +43,9 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_talk = nullptr;
 	_useEpilogue2 = false;
 	_justLoaded = false;
-	_talkToAbort = false;
 	_onChessboard = false;
 	_slowChess = false;
 	_animating = false;
-	_talkCounter = 0;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -75,14 +73,14 @@ void SherlockEngine::initialize() {
 	_res = new Resources();
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
-	_events = new EventsManager(this);
+	_events = new Events(this);
 	_inventory = new Inventory();
 	_journal = new Journal();
 	_people = new People(this);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
 	_sound = new Sound(this);
-	_talk = new Talk();
+	_talk = new Talk(this);
 }
 
 Common::Error SherlockEngine::run() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 7ce28cfdd7..1c95b10ff3 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -78,7 +78,7 @@ public:
 	const SherlockGameDescription *_gameDescription;
 	Animation *_animation;
 	Debugger *_debugger;
-	EventsManager *_events;
+	Events *_events;
 	Inventory *_inventory;
 	Journal *_journal;
 	People *_people;
@@ -96,11 +96,9 @@ public:
 	int _oldCharPoint;					// Old scene
 	Common::Point _over;				// Old map position
 	Common::Array<Common::Point> _map;	// Map locations for each scene
-	bool _talkToAbort;
 	bool _onChessboard;
 	bool _slowChess;
 	bool _animating;
-	int _talkCounter;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 0917f83e89..e8e433fa84 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -31,6 +31,9 @@ Sound::Sound(SherlockEngine *vm): _vm(vm) {
 	_playingEpilogue = false;
 	_music = false;
 	_digitized = false;
+	_diskSoundPlaying = false;
+	_soundIsOn = nullptr;
+	_digiBuf = nullptr;
 }
 
 void Sound::loadSound(const Common::String &name, int priority) {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index b6e645a28f..3f32f2724a 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -44,6 +44,9 @@ public:
 	bool _playingEpilogue;
 	bool _music;
 	bool _digitized;
+	bool _diskSoundPlaying;
+	byte *_soundIsOn;
+	byte *_digiBuf;
 public:
 	Sound(SherlockEngine *vm);
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 3122aff95f..414f3b90a6 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -21,10 +21,17 @@
  */
 
 #include "sherlock/talk.h"
+#include "sherlock/sherlock.h"
 
 namespace Sherlock {
 
-Talk::Talk() {
+Talk::Talk(SherlockEngine *vm): _vm(vm) {
+	_talkCounter = 0;
+	_talkToAbort = false;
+}
+
+void Talk::talkTo(const Common::String &name) {
+	// TODO
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 6ffbcdd8d4..55a4c0fd69 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -37,11 +37,19 @@ public:
 	int &operator[](int idx) { return _data[idx]; }
 };
 
+class SherlockEngine;
+
 class Talk {
+private:
+	SherlockEngine *_vm;
 public:
 	Common::Array<TalkHistoryEntry> _history;
+	bool _talkToAbort;
+	int _talkCounter;
 public:
-	Talk();
+	Talk(SherlockEngine *vm);
+
+	void talkTo(const Common::String &name);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From ff02c29e9c2f96ed7e36878163b4b22dc8822255 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 00:52:02 -0400
Subject: SHERLOCK: Implemented doBgAnim

---
 engines/sherlock/objects.cpp         | 291 +++++++++++++++++++++++++++--
 engines/sherlock/objects.h           |   6 +-
 engines/sherlock/people.cpp          |   2 +
 engines/sherlock/people.h            |   3 +
 engines/sherlock/scalpel/scalpel.cpp |  21 +++
 engines/sherlock/scalpel/scalpel.h   |   4 +
 engines/sherlock/scene.cpp           | 348 ++++++++++++++++++++++++++++++++++-
 engines/sherlock/scene.h             |  20 +-
 engines/sherlock/screen.cpp          |  63 +++++++
 engines/sherlock/screen.h            |  12 +-
 engines/sherlock/sherlock.cpp        |   3 +-
 engines/sherlock/sherlock.h          |   4 +-
 12 files changed, 751 insertions(+), 26 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 5a93ce6869..6b681b42e9 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -28,6 +28,8 @@
 
 namespace Sherlock {
 
+#define START_FRAME 0
+
 #define UPPER_LIMIT 0
 #define LOWER_LIMIT CONTROLS_Y
 #define LEFT_LIMIT 0
@@ -37,6 +39,10 @@ namespace Sherlock {
 #define CLEAR_DIST_X 5
 #define CLEAR_DIST_Y 0
 
+#define INFO_FOREGROUND 11
+#define INFO_BACKGROUND 1
+
+
 SherlockEngine *Sprite::_vm;
 
 /**
@@ -83,7 +89,7 @@ void Sprite::adjustSprite() {
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
 
-	if (_type == INVALID || (_type == CHARACTER && _vm->_animating))
+	if (_type == INVALID || (_type == CHARACTER && scene._animating))
 		return;
 
 	if (!talk._talkCounter && _type == CHARACTER && _walkCount) {
@@ -457,7 +463,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_seqStack = s.readByte();
 	_seqTo = s.readByte();
 	_descOffset = s.readUint16LE();
-	_seqcounter2 = s.readByte();
+	_seqCounter2 = s.readByte();
 	_seqSize = s.readUint16LE();
 	s.skip(1);
 	_aMove.synchronize(s);
@@ -487,7 +493,7 @@ void Object::toggleHidden() {
 			_sequences[_frameNumber] = _seqTo + SEQ_TO_CODE + 128;
 		_seqTo = 0;
 
-		_seqCounter = _seqcounter2 = 0;
+		_seqCounter = _seqCounter2 = 0;
 		_seqStack = 0;
 		_frameNumber = -1;
 
@@ -544,7 +550,7 @@ void Object::checkObject(Object &o) {
 			if (v >= 228) {
 				// Goto code found
 				v -= 228;
-				_seqcounter2 = _seqCounter;
+				_seqCounter2 = _seqCounter;
 				_seqStack = _frameNumber + 1;
 				setObjSequence(v, false);
 			} else if (v >= SOUND_CODE && (v <= (SOUND_CODE + 29))) {
@@ -631,29 +637,290 @@ void Object::checkObject(Object &o) {
 	} while (codeFound);
 }
 
-bool Object::checkEndOfSequence() const {
-	// TODO
-	return false;
+/**
+ * This will check to see if the object has reached the end of a sequence.
+ * If it has, it switch to whichever next sequence should be started.
+ * @returns		true if the end of a sequence was reached
+ */
+bool Object::checkEndOfSequence() {
+	Screen &screen = *_vm->_screen;
+	int checkFrame = _allow ? MAX_FRAME : 32000;
+	bool result = false;
+
+	if (_type == REMOVE || _type == INVALID)
+		return false;
+
+	if (_sequences[_frameNumber] == 0 || _frameNumber >= checkFrame) {
+		result = true;
+
+		if (_frameNumber >= (checkFrame - 1)) {
+			_frameNumber = START_FRAME;
+		}  else {
+			// Determine next sequence to use
+			int seq = _sequences[_frameNumber + 1];
+
+			if (seq == 99) {
+				--_frameNumber;
+				screen._backBuffer.transBlitFrom(_imageFrame->_frame, _position);
+				screen._backBuffer2.transBlitFrom(_imageFrame->_frame, _position);
+				_type = INVALID;
+			} else {
+				setObjSequence(seq, false);
+			}
+		}
+	}
+
+	if (_allow && _frameNumber == 0) {
+		// canimation just ended
+		if (_type != NO_SHAPE && _type != REMOVE) {
+			_type = REMOVE;
+
+			if (!_countCAnimFrames) {
+				// Save details before shape is removed
+				_delta.x = _imageFrame->_frame.w;
+				_delta.y = _imageFrame->_frame.h;
+				_position = _imageFrame->_offset;
+
+				// Free the images
+				delete _images;
+			}
+		} else {
+			_type = INVALID;
+		}
+	}
+
+	return result;
 }
 
+/**
+ * Scans through the sequences array and finds the designated sequence.
+ * It then sets the frame number of the start of that sequence
+ */
 void Object::setObjSequence(int seq, bool wait) {
-	// TODO
+	Scene &scene = *_vm->_scene;
+	int checkFrame = _allow ? MAX_FRAME : 32000;
+
+	if (seq >= 128) {
+		// Loop the sequence until the count exceeded
+		seq -= 128;
+
+		++_seqCounter;
+		if (_seqCounter >= seq) {
+			// Go to next sequence
+			if (_seqStack) {
+				_frameNumber = _seqStack;
+				_seqStack = 0;
+				_seqCounter = _seqCounter2;
+				_seqCounter2 = 0;
+				if (_frameNumber >= checkFrame)
+					_frameNumber = START_FRAME;
+
+				return;
+			}
+
+			_frameNumber += 2;
+			if (_frameNumber >= checkFrame)
+				_frameNumber = 0;
+
+			_seqCounter = 0;
+			if (_sequences[_frameNumber] == 0)
+				seq = _sequences[_frameNumber + 1];
+			else
+				return;
+		} else {
+			// Find beginning of sequence
+			do {
+				--_frameNumber;
+			} while (_frameNumber > 0 && _sequences[_frameNumber] != 0);
+
+			if (_frameNumber != 0)
+				_frameNumber += 2;
+
+			return;
+		}
+	} else {
+		// Reset sequence counter
+		_seqCounter = 0;
+	}
+
+	int idx = 0;
+	int seqCc = 0;
+
+	while (seqCc < seq && idx < checkFrame) {
+		++idx;
+		if (_sequences[idx] == 0) {
+			++seqCc;
+			idx += 2;
+		}
+	}
+
+	if (idx >= checkFrame)
+		idx = 0;
+	_frameNumber = idx;
+
+	if (wait) {
+		seqCc = idx;
+		while (_sequences[idx] != 0)
+			++idx;
+
+		idx = idx - seqCc + 2;
+		for (; idx > 0; --idx)
+			scene.doBgAnim();
+	}
 }
 
 /**
 * Checks for codes
 * @param name		The name to check for codes
-* @param messages	If provided, any messages to be returned
+* @param messages	Provides a lookup list of messages that can be printed
 * @returns		0 if no codes are found, 1 if codes were found
 */
 int Object::checkNameForCodes(const Common::String &name, Common::StringArray *messages) {
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	bool printed = false;
+	char ch;
+	const char *p;
+
+	scene.toggleObject(name);
+
+	if (name.hasPrefix("*")) {
+		// A code was found
+		printed = true;
+		ch = toupper(name[1]);
+
+		switch (ch) {
+		case 'C':
+			talk.talkTo(name.c_str() + 2);
+			break;
+
+		case 'T':
+		case 'B':
+		case 'F':
+		case 'W':
+			// Nothing: action was already done before canimation
+			break;
+
+		case 'G':
+		case 'A': {
+			// G: Have object go somewhere
+			// A: Add onto existing co-ordinates
+			Common::String sx(name.c_str() + 2, name.c_str() + 5);
+			Common::String sy(name.c_str() + 6, name.c_str() + 9);
+			
+			if (ch == 'G')			
+				_position = Common::Point(atoi(sx.c_str()), atoi(sy.c_str()));
+			else
+				_position += Common::Point(atoi(sx.c_str()), atoi(sy.c_str()));
+			break;
+		}
+
+		default:
+			if (ch >= '0' && ch <= '9') {
+				scene._goToRoom = atoi(name.c_str() + 1);
+
+				if (scene._goToRoom < 97 && _vm->_map[scene._goToRoom].x) {
+					_vm->_over.x = _vm->_map[scene._goToRoom].x * 100 - 600;
+					_vm->_over.y = _vm->_map[scene._goToRoom].y * 100 + 900;
+				}
+
+				if ((p = strchr(name.c_str(), ',')) != nullptr) {
+					++p;
+
+					Common::String s(p, p + 3);
+					scene._hsavedPos.x = atoi(s.c_str());
+
+					s = Common::String(p + 3, p + 6);
+					scene._hsavedPos.y = atoi(s.c_str());
+
+					s = Common::String(p + 6, p + 9);
+					scene._hsavedFs = atoi(s.c_str());
+					if (scene._hsavedFs == 0)
+						scene._hsavedFs = 10;
+				} else if ((p = strchr(name.c_str(), '/')) != nullptr) {
+					scene._hsavedPos = Common::Point(1, 0);
+					scene._hsavedFs = 100 + atoi(p + 1);
+				}
+			} else {
+				scene._goToRoom = 100;
+			}
+
+			people[AL]._position = Common::Point(0, 0);
+			break;
+		}
+	} else if (name.hasPrefix("!")) {
+		// Message attached to canimation
+		int messageNum = atoi(name.c_str() + 1);
+		scene._infoFlag++;
+		scene.clearInfo();
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, INFO_BACKGROUND,
+			(*messages)[messageNum].c_str());
+		_vm->_menuCounter = 25;
+	} else if (name.hasPrefix("@")) {
+		// Message attached to canimation
+		scene._infoFlag++;
+		scene.clearInfo();
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, INFO_BACKGROUND,
+			"%s", name.c_str() + 1);
+		printed = true;
+		_vm->_menuCounter = 25;
+	}
 
-	// TODO
-	return 0;
+	return printed;
 }
 
+/**
+ * Handle setting any flags associated with the object
+ */
 void Object::setFlagsAndToggles() {
-	// TODO
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+
+	for (int useIdx = 0; useIdx < 4; ++useIdx) {
+		if (_use[useIdx]._useFlag) {
+			if (!_vm->readFlags(_use[useIdx]._useFlag))
+				_vm->setFlags(_use[useIdx]._useFlag);
+		}
+
+		if (_use[useIdx]._cAnimSpeed) {
+			if (_use[useIdx]._cAnimNum == 0)
+				// 0 is really a 10
+				scene.startCAnim(_use[useIdx]._cAnimNum - 1, _use[useIdx]._cAnimSpeed);
+		}
+
+		if (!talk._talkToAbort) {
+			for (int idx = 0; idx < 4; ++idx)
+				scene.toggleObject(_use[useIdx]._names[idx]);
+		}
+	}
+}
+
+/**
+ * Adjusts the sprite's position and animation sequence, advancing by 1 frame.
+ * If the end of the sequence is reached, the appropriate action is taken.
+ */
+void Object::adjustObject() {
+	if (_type == REMOVE)
+		return;
+
+	_position += _delta;
+
+	if (_position.y > LOWER_LIMIT)
+		_position.y = LOWER_LIMIT;
+
+	if (_type != NO_SHAPE) {
+		int frame = _frameNumber;
+		if (frame == -1)
+			frame = 0;
+
+		int imgNum = _sequences[frame];
+		if (imgNum > _maxFrames)
+			imgNum = 1;
+
+		_imageFrame = &(*_images)[imgNum - 1];
+	}
 }
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index d099718d5b..ee82faf99c 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -143,7 +143,7 @@ class Object {
 private:
 	static SherlockEngine *_vm;
 
-	bool checkEndOfSequence() const;
+	bool checkEndOfSequence();
 
 	void setObjSequence(int seq, bool wait);
 public:
@@ -190,7 +190,7 @@ public:
 	int _seqStack;					// Allows gosubs to return to calling frame
 	int _seqTo;						// Allows 1-5, 8-3 type sequences encoded in 2 bytes
 	uint _descOffset;					// Tells where description starts in DescText
-	int _seqcounter2;				// Counter of calling frame sequence
+	int _seqCounter2;				// Counter of calling frame sequence
 	uint _seqSize;					// Tells where description starts 
 	ActionType _aMove;
 	UseType _use[4];
@@ -204,6 +204,8 @@ public:
 	int checkNameForCodes(const Common::String &name, Common::StringArray *messages);
 
 	void setFlagsAndToggles();
+
+	void adjustObject();
 };
 
 struct CAnim {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 43d3422f1a..d2fbb3d8c5 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -56,6 +56,8 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_holmesOn = true;
 	_oldWalkSequence = -1;
 	_allowWalkAbort = false;
+	_portraitLoaded = false;
+	_clearingThePortrait = false;
 }
 
 People::~People() {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index d2d7e92512..7c218671c9 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -64,6 +64,9 @@ public:
 	Common::Point _walkDest;
 	Common::Stack<Common::Point> _walkTo;
 	bool _holmesOn;
+	bool _portraitLoaded;
+	Object _portrait;
+	bool _clearingThePortrait;
 public:
 	People(SherlockEngine *vm);
 	~People();
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index bb9c6c0bc2..1fe1901212 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -336,6 +336,27 @@ void ScalpelEngine::startScene() {
 	_chessResult = _scene->_goToRoom;
 }
 
+/**
+ * Takes care of clearing the mirror in scene 12, in case anything drew over it
+ */
+void ScalpelEngine::eraseMirror12() {
+	// TODO
+}
+
+/**
+ * Takes care of drawing Holme's reflection onto the mirror in scene 12
+ */
+void ScalpelEngine::doMirror12() {
+	// TODO
+}
+
+/**
+ * This clears the mirror  in scene 12 in case anything messed draw over it
+ */
+void ScalpelEngine::flushMirror12() {
+	// TODO
+}
+
 } // End of namespace Scalpel
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index b096599ee1..2d5deeb882 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -51,6 +51,10 @@ protected:
 public:
 	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~ScalpelEngine();
+
+	void eraseMirror12();
+	void doMirror12();
+	void flushMirror12();
 };
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 13315b065b..92a8757fd8 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -22,10 +22,42 @@
 
 #include "sherlock/scene.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/scalpel/scalpel.h"
 #include "sherlock/decompress.h"
 
 namespace Sherlock {
 
+// Main Menu control locations
+const int MENU_POINTS[12][4] = { 
+	{ 13, 153, 72, 165 },
+	{ 13, 169, 72, 181 },
+	{ 13, 185, 72, 197 },
+	{ 88, 153, 152, 165 },
+	{ 88, 169, 152, 181 },
+	{ 88, 185, 152, 197 },
+	{ 165, 153, 232, 165 },
+	{ 165, 169, 232, 181 },
+	{ 165, 185, 233, 197 },
+	{ 249, 153, 305, 165 },
+	{ 249, 169, 305, 181 },
+	{ 249, 185, 305, 197 } 
+};
+
+// Inventory control locations */
+const int INVENTORY_POINTS[8][3] = { 
+	{ 4, 50, 28 },
+	{ 52, 99, 76 },
+	{ 101, 140, 122 },
+	{ 142, 187, 165 },
+	{ 189, 219, 197 },
+	{ 221, 251, 233 },
+	{ 253, 283, 265 },
+	{ 285, 315, 293 } 
+};
+
+/*----------------------------------------------------------------*/
+
+
 void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
 	_numStructs = s.readUint16LE();
 	_numImages = s.readUint16LE();
@@ -89,7 +121,8 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_goToRoom = -1;
 	_changes = false;
 	_charPoint = _oldCharPoint = 0;
-	_windowOpen = _infoFlag = false;
+	_windowOpen = false;
+	_infoFlag = false;
 	_keyboardInput = 0;
 	_walkedInScene = false;
 	_ongoingCans = 0;
@@ -102,6 +135,10 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_menuMode = STD_MODE;
 	_invMode = INVMODE_0;
 	_restoreFlag = false;
+	_invLookFlag = false;
+	_lookHelp = false;
+	_animating = 0;
+	_doBgAnimDone = true;
 
 	_controlPanel = new ImageFile("controls.vgs");
 	_controls = nullptr; // new ImageFile("menu.all");
@@ -236,7 +273,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			_bgShapes[idx]._sequences = &_sequenceBuffer[_bgShapes[idx]._sequenceOffset];
 			_bgShapes[idx]._misc = 0;
 			_bgShapes[idx]._seqCounter = 0;
-			_bgShapes[idx]._seqcounter2 = 0;
+			_bgShapes[idx]._seqCounter2 = 0;
 			_bgShapes[idx]._seqStack = 0;
 			_bgShapes[idx]._frameNumber = -1;
 			_bgShapes[idx]._position = Common::Point(0, 0);
@@ -799,7 +836,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	Talk &talk = *_vm->_talk;
 	Common::Point tpPos, walkPos;
 	int tpDir, walkDir;
-	int tFrames;
+	int tFrames = 0;
 	int gotoCode = -1;
 
 	// Validation
@@ -996,8 +1033,52 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	return 1;
 }
 
+/**
+ * Print the description of an object
+ */
 void Scene::printObjDesc(const Common::String &str, bool firstTime) {
+	/* TODO
+	
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	int savedSelector;
+
+	if (str.hasPrefix("_")) {
+		_lookScriptFlag = true;
+		events.setCursor(MAGNIFY);
+		savedSelector = _selector;
+		talk.talkTo(str.c_str() + 1);
+		_lookScriptFlag = false;
+
+		if (talk._talkToAbort) {
+			events.setCursor(ARROW);
+			return;
+		}
+
+		// Check if looking at an inventory object
+		if (!_invLookFlag) {
+			// See if this look was called by a right button click or not
+			if (!_lookHelp) {
+				// If it wasn't a right button click, then we need depress 
+				// the look button before we close the window. So save a copy of the
+				// menu area, and draw the controls onto it
+				Surface tempSurface((*_controls)[0]._frame->w, (*_controls)[0]._frame->h);
+				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
+					Common::Rect(MENU_POINTS[0][0], MENU_POINTS[0][1],
+					MENU_POINTS[0][0] + tempSurface.w, MENU_POINTS[0][1] + tempSurface.h));
+				screen._backBuffer2.transBlitFrom((*_controls)[0]._frame,
+					Common::Point(MENU_POINTS[0][0], MENU_POINTS[0][1]));
+				
+				banishWindow(1);
+				events.setCursor(MAGNIFY);
+
+			}
+		}
+	}
+
 	// TODO
+	*/
 }
 
 /**
@@ -1047,9 +1128,270 @@ void Scene::doBgAnim() {
 	if (_restoreFlag) {
 		if (people[AL]._type == CHARACTER)
 			people[AL].checkSprite();
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
+				_bgShapes[idx].checkObject(_bgShapes[idx]);
+		}
+
+		if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
+			people._portrait.checkObject(people._portrait);
+
+		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+			if (_canimShapes[idx]._type != INVALID && _canimShapes[idx]._type != REMOVE)
+				_canimShapes[idx].checkObject(_bgShapes[0]);
+		}
+
+		if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
+			((Scalpel::ScalpelEngine *)_vm)->eraseMirror12();
+
+		// Restore the back buffer from the back buffer 2 in the changed area
+		Common::Rect bounds(people[AL]._oldPosition.x, people[AL]._oldPosition.y,
+			people[AL]._oldPosition.x + people[AL]._oldSize.x,
+			people[AL]._oldPosition.y + people[AL]._oldSize.y);
+		Common::Point pt(bounds.left, bounds.top);
+
+		if (people[AL]._type == CHARACTER)
+			screen.restoreBackground(bounds);
+		else if (people[AL]._type == REMOVE)
+			screen._backBuffer.blitFrom(screen._backBuffer2, pt, bounds);
+
+		for (uint idx = 0; _bgShapes.size(); ++idx) {
+			Object &o = _bgShapes[idx];
+			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
+				screen.restoreBackground(bounds);
+		}
+
+		if (people._portraitLoaded)
+			screen.restoreBackground(Common::Rect(
+				people._portrait._oldPosition.x, people._portrait._oldPosition.y,
+				people._portrait._oldPosition.x + people._portrait._oldSize.x,
+				people._portrait._oldPosition.y + people._portrait._oldSize.y
+			));
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &o = _bgShapes[idx];
+			if (o._type == NO_SHAPE && ((o._flags & 1) == 0)) {
+				// Restore screen area
+				screen._backBuffer.blitFrom(screen._backBuffer2, o._position,
+					Common::Rect(o._position.x, o._position.y,
+					o._position.x + o._noShapeSize.x, o._position.y + o._noShapeSize.y));
+
+				o._oldPosition = o._position;
+				o._oldSize = o._noShapeSize;
+			}
+		}
+
+		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+			Object &o = _canimShapes[idx];
+			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
+				screen.restoreBackground(Common::Rect(o._oldPosition.x, o._oldPosition.y,
+					o._oldPosition.x + o._oldSize.x, o._oldPosition.y + o._oldSize.y));
+		}
+	}
+
+	//
+	// Update the background objects and canimations
+	//
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE || o._type == NO_SHAPE)
+			o.adjustObject();
 	}
 
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if (_canimShapes[idx]._type != INVALID)
+			_canimShapes[idx].adjustObject();
+	}
+
+	if (people[AL]._type == CHARACTER && people._holmesOn)
+		people[AL].adjustSprite();
+
+	// Flag the bg shapes which need to be redrawn
+	checkBgShapes(people[AL]._imageFrame, 
+		Common::Point(people[AL]._position.x / 100, people[AL]._position.y / 100));
+
+	if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
+		((Scalpel::ScalpelEngine *)_vm)->doMirror12();
+
+	// Draw all active shapes which are behind the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+	}
+	
+	// Draw all canimations which are behind the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+		}
+	}
+
+	// Draw all active shapes which are HAPPEN and behind the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+	}
+
+	// Draw all canimations which are NORMAL and behind the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+		}
+	}
+
+	// Draw the person if not animating
+	if (people[AL]._type == CHARACTER && people.isHolmesActive()) {
+		// If Holmes is too far to the right, move him back so he's on-screen
+		int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[AL]._imageFrame->_frame.w;
+		int tempX = MIN(people[AL]._position.x / 100, xRight);
+
+		bool flipped = people[AL]._frameNumber == WALK_LEFT || people[AL]._frameNumber == STOP_LEFT ||
+			people[AL]._frameNumber == WALK_UPLEFT || people[AL]._frameNumber == STOP_UPLEFT ||
+			people[AL]._frameNumber == WALK_DOWNRIGHT || people[AL]._frameNumber == STOP_DOWNRIGHT;
+		screen._backBuffer.transBlitFrom(people[AL]._imageFrame->_frame,
+			Common::Point(tempX, people[AL]._position.y / 100 - people[AL]._imageFrame->_frame.h), flipped);
+	}
+
+	// Draw all static and active shapes are NORMAL and are in front of the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+	}
+
+	// Draw all static and active canimations that are NORMAL and are in front of the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_BEHIND) {
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+		}
+	}
+
+	// Draw all static and active shapes that are in front of the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+	}
+
+	// Draw any active portrait
+	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
+		screen._backBuffer.transBlitFrom(people._portrait._imageFrame->_frame,
+			people._portrait._position, people._portrait._flags & 2);
+
+	// Draw all static and active canimations that are in front of the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+		}
+	}
+
+	// Draw all NO_SHAPE shapes which have flag bit 0 clear
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == NO_SHAPE && (o._flags & 1) == 0)
+			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+	}
+
+	// Bring the newly built picture to the screen
+	if (_animating == 2) {
+		_animating = 0;
+		screen.slamRect(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	} else {
+		if (people[AL]._type != INVALID && ((_goToRoom == -1 || _ongoingCans == 0))) {
+			if (people[AL]._type == REMOVE) {
+				screen.slamRect(Common::Rect(
+					people[AL]._oldPosition.x, people[AL]._oldPosition.y,
+					people[AL]._oldPosition.x + people[AL]._oldSize.x,
+					people[AL]._oldPosition.y + people[AL]._oldSize.y
+				));
+			} else {
+				screen.flushImage(people[AL]._imageFrame,
+					Common::Point(people[AL]._position.x / 100, people[AL]._position.y / 100),
+					&people[AL]._oldPosition.x, &people[AL]._oldPosition.y,
+					&people[AL]._oldSize.x, &people[AL]._oldSize.y);
+			}
+		}
+
+		if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
+			((Scalpel::ScalpelEngine *)_vm)->flushMirror12();
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &o = _bgShapes[idx];
+			if ((o._type == ACTIVE_BG_SHAPE || o._type == REMOVE) && _goToRoom == -1) {
+				screen.flushImage(o._imageFrame, o._position,
+					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+			}
+		}
+
+		if (people._portraitLoaded) {
+			if (people._portrait._type == REMOVE)
+				screen.slamRect(Common::Rect(
+					people._portrait._position.x, people._portrait._position.y,
+					people._portrait._position.x + people._portrait._delta.x,
+					people._portrait._position.y + people._portrait._delta.y
+				));
+			else
+				screen.flushImage(people._portrait._imageFrame, people._portrait._position,
+					&people._portrait._oldPosition.x, &people._portrait._oldPosition.y,
+					&people._portrait._oldSize.x, &people._portrait._oldSize.y);
+				
+			if (people._portrait._type == REMOVE)
+				people._portrait._type = INVALID;
+		}
+
+		if (_goToRoom == -1) {
+			for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+				Object &o = _bgShapes[idx];
+				if (o._type == NO_SHAPE && (o._flags & 1) == 0) {
+					screen.slamArea(o._position.x, o._position.y, o._oldSize.x, o._oldSize.y);
+					screen.slamArea(o._oldPosition.x, o._oldPosition.y, o._oldSize.x, o._oldSize.y);
+				} else if (o._type == HIDE_SHAPE) {
+					screen.flushImage(o._imageFrame, o._position,
+						&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+				}
+			}
+		}
+
+		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
+			Object &o = _canimShapes[idx];
+			if (o._type == REMOVE) {
+				if (_goToRoom == -1)
+					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
+
+				_canimShapes.remove_at(idx);
+			} else if (o._type == ACTIVE_BG_SHAPE) {
+				screen.flushImage(o._imageFrame, o._position,
+					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+			}
+		}
+	}
+
+	_restoreFlag = true;
+
+	events.wait(1);
+	_doBgAnimDone = true;
+
+	// Check if the method was called for calling a portrait, and a talk was
+	// interrupting it. This talk file would not have been executed at the time, 
+	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
+	if (people._clearingThePortrait && _vm->_scriptMoreFlag == 3) {
+		// Reset the flags and call to talk
+		people._clearingThePortrait = _vm->_scriptMoreFlag = 0;
+		talk.talkTo(_vm->_scriptName);
+	}
+}
+
+void Scene::clearInfo() {
 	// TODO
 }
 
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index f48d45c34e..4b76739402 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -116,6 +116,10 @@ private:
 	Common::String _cAnimStr;
 	MenuMode _menuMode;
 	InvMode _invMode;
+	bool _lookScriptFlag;
+	int _selector;
+	bool _invLookFlag;
+	bool _lookHelp;
 
 	bool loadScene(const Common::String &filename);
 
@@ -125,15 +129,9 @@ private:
 
 	void transitionToScene();
 
-	int toggleObject(const Common::String &name);
-
 	void updateBackground();
 
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
-
-	int startCAnim(int cAnimNum, int playRate);
-
-	void doBgAnim();
 public:
 	int _currentScene;
 	int _goToRoom;
@@ -170,6 +168,8 @@ public:
 	int _hsavedFs;
 	Common::Array<Object> _canimShapes;
 	bool _restoreFlag;
+	int _animating;
+	bool _doBgAnimDone;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
@@ -183,6 +183,14 @@ public:
 	Exit *checkForExit(const Common::Rect &r);
 
 	void printObjDesc(const Common::String &str, bool firstTime);
+
+	int startCAnim(int cAnimNum, int playRate);
+
+	int toggleObject(const Common::String &name);
+
+	void doBgAnim();
+
+	void clearInfo();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index e6c11b8cf4..f8f1d56e67 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -231,4 +231,67 @@ void Screen::verticalTransition() {
 	}
 }
 
+/**
+ * Prints the text passed onto the back buffer at the given position and color.
+ * The string is then blitted to the screen
+ */
+void Screen::print(const Common::Point &pt, int fgColor, int bgColor, const char *format, ...) {
+	// TODO
+}
+
+/**
+ * Copies a section of the second back buffer into the main back buffer
+ */
+void Screen::restoreBackground(const Common::Rect &r) {
+	Common::Rect tempRect = r;
+	tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+
+	if (tempRect.isValidRect())
+		_backBuffer.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
+}
+
+/**
+ * Copies a given area to the screen
+ */
+void Screen::slamArea(int16 xp, int16 yp, int16 w, int16 h) {
+	slamRect(Common::Rect(xp, yp, xp + w, yp + h));
+}
+
+/**
+ * Copies a given area to the screen
+ */
+void Screen::slamRect(const Common::Rect &r) {
+	Common::Rect tempRect = r;
+	tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+	if (tempRect.isValidRect())
+		blitFrom(_backBuffer, Common::Point(tempRect.left, tempRect.top), tempRect);
+}
+
+/**
+ * Copy an image from the back buffer to the screen, taking care of both the
+ * new area covered by the shape as well as the old area, which must be restored
+ */
+void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
+		int16 *xp, int16 *yp, int16 *w, int16 *h) {
+	Common::Point imgPos = pt + frame->_offset;
+	Common::Rect newBounds(imgPos.x, imgPos.y, imgPos.x + frame->_frame.w, imgPos.y + frame->_frame.h);
+	Common::Rect oldBounds(*xp, *yp, *xp + *w, *yp + *h);
+
+	// See if the areas of the old and new overlap, and if so combine the areas
+	if (newBounds.intersects(oldBounds)) {
+		newBounds.extend(oldBounds);
+		slamRect(newBounds);
+	} else {
+		// The two areas are independent, so copy them both
+		slamRect(newBounds);
+		slamRect(oldBounds);
+	}
+
+	*xp = newBounds.left;
+	*yp = newBounds.top;
+	*w = newBounds.width();
+	*h = newBounds.height();
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 2c5e585475..87453ba36d 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -26,8 +26,8 @@
 #include "common/list.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
-
 #include "sherlock/graphics.h"
+#include "sherlock/resources.h"
 
 namespace Sherlock {
 
@@ -75,6 +75,16 @@ public:
 	void randomTransition();
 
 	void verticalTransition();
+
+	void print(const Common::Point &pt, int fgColor, int bgColor, const char *format, ...);
+
+	void restoreBackground(const Common::Rect &r);
+
+	void slamArea(int16 xp, int16 yp, int16 w, int16 h);
+	void slamRect(const Common::Rect &r);
+
+	void flushImage(ImageFrame *frame, const Common::Point &pt,
+		int16 *xp, int16 *yp, int16 *w, int16 *h);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 637660e001..330da6075b 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -45,7 +45,8 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_justLoaded = false;
 	_onChessboard = false;
 	_slowChess = false;
-	_animating = false;
+	_menuCounter = 0;
+	_scriptMoreFlag = 0;
 }
 
 SherlockEngine::~SherlockEngine() {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 1c95b10ff3..92aee9cdc3 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -98,7 +98,9 @@ public:
 	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _onChessboard;
 	bool _slowChess;
-	bool _animating;
+	int _menuCounter;
+	int _scriptMoreFlag;
+	Common::String _scriptName;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
-- 
cgit v1.2.3


From ec16861ec981eadbcef55454fb67b22502c6c65b Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 22 Mar 2015 08:14:18 +0100
Subject: ZVISION: Silence Cppcheck warning

---
 engines/zvision/scripting/actions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 21c97e766b..9a8b734e0c 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -1077,7 +1077,7 @@ ActionTtyText::ActionTtyText(ZVision *engine, int32 slotkey, const Common::Strin
 
 	char filename[64];
 	int32 x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-	sscanf(line.c_str(), "%d %d %d %d %64s %u", &x1, &y1, &x2, &y2, filename, &_delay);
+	sscanf(line.c_str(), "%d %d %d %d %63s %u", &x1, &y1, &x2, &y2, filename, &_delay);
 	_r = Common::Rect(x1, y1, x2, y2);
 	_filename = Common::String(filename);
 }
-- 
cgit v1.2.3


From d582c8492ce5ef300e24358c80bf0adadcfd11f0 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 22 Mar 2015 12:22:30 +0100
Subject: SCUMM: Fix argc check in Cmd_Script()

---
 engines/scumm/debugger.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 2b718b2cfe..0ebea94608 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -256,7 +256,7 @@ bool ScummDebugger::Cmd_Hide(int argc, const char **argv) {
 bool ScummDebugger::Cmd_Script(int argc, const char** argv) {
 	int scriptnum;
 
-	if (argc < 2) {
+	if (argc < 3) {
 		debugPrintf("Syntax: script <scriptnum> <command>\n");
 		return true;
 	}
-- 
cgit v1.2.3


From 3c77a521dc07a8c0954b11b26dda382817776b9e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 09:02:31 -0400
Subject: SHERLOCK: Implement main scene loop and more inventory code

---
 engines/sherlock/debugger.cpp        |  2 +-
 engines/sherlock/graphics.cpp        |  7 ++-
 engines/sherlock/graphics.h          |  1 +
 engines/sherlock/inventory.cpp       | 92 ++++++++++++++++++++++++++++++++++++
 engines/sherlock/inventory.h         | 24 +++++++++-
 engines/sherlock/objects.cpp         | 12 ++---
 engines/sherlock/people.cpp          | 15 ++++++
 engines/sherlock/people.h            |  2 +
 engines/sherlock/scalpel/scalpel.cpp | 31 ++++++------
 engines/sherlock/scalpel/scalpel.h   |  1 -
 engines/sherlock/scene.cpp           | 72 ++++++++++++++++++++++------
 engines/sherlock/scene.h             |  6 ++-
 engines/sherlock/sherlock.cpp        | 34 +++++++++++--
 engines/sherlock/sherlock.h          |  3 ++
 engines/sherlock/talk.cpp            |  8 ++++
 engines/sherlock/talk.h              |  4 +-
 16 files changed, 267 insertions(+), 47 deletions(-)

diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
index 1e0716c3d3..b8ac8bef6a 100644
--- a/engines/sherlock/debugger.cpp
+++ b/engines/sherlock/debugger.cpp
@@ -51,7 +51,7 @@ bool Debugger::cmd_scene(int argc, const char **argv) {
 		debugPrintf("Format: scene <room>\n");
 		return true;
 	} else {
-		_vm->_scene->_goToRoom = strToInt(argv[1]);
+		_vm->_scene->_goToScene = strToInt(argv[1]);
 		return false;
 	}
 }
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 8c096e3c72..63988a2f30 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -145,7 +145,12 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
  * Fill a given area of the surface with a given color
  */
 void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
-    Graphics::Surface::fillRect(Common::Rect(x1, y1, x2, y2), color);
+	fillRect(Common::Rect(x1, y1, x2, y2), color);
+}
+
+void Surface::fillRect(const Common::Rect &r, byte color) {
+    Graphics::Surface::fillRect(r, color);
+	addDirtyRect(r);
 }
 
 /**
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 0536c016bf..b33495a2b9 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -47,6 +47,7 @@ public:
 		bool flipped = false, int overrideColor = 0);
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
+	void fillRect(const Common::Rect &r, byte color);
 
 	Surface getSubArea(const Common::Rect &r);
 };
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 634e664f5a..cbb69f1041 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -21,7 +21,99 @@
  */
 
 #include "sherlock/inventory.h"
+#include "sherlock/sherlock.h"
 
 namespace Sherlock {
 
+Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(vm) {
+	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
+	_invGraphicsLoaded = false;
+	_invIndex = 0;
+	_holdings = 0;
+}
+
+Inventory::~Inventory() {
+	freeGraphics();
+}
+
+void Inventory::freeInventory() {
+	freeGraphics();
+
+	_names.clear();
+	_invGraphicsLoaded = false;
+}
+
+/**
+ * Free any loaded inventory graphics
+ */
+void Inventory::freeGraphics() {
+	for (uint idx = 0; idx < MAX_VISIBLE_INVENTORY; ++idx)
+		delete _invShapes[idx];
+	
+	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
+	_invGraphicsLoaded = false;
+}
+
+/** Load the list of names the inventory items correspond to.
+ */
+void Inventory::loadInv() {
+	// Exit if the inventory names are already loaded
+	if (_names.size() > 0)
+		return;
+
+	// Load the inventory names
+	Common::SeekableReadStream *stream = _vm->_res->load("invent.txt");
+	_names.clear();
+
+	while (stream->pos() < stream->size()) {
+		Common::String name;
+		char c;
+		while ((c = stream->readByte()) != 0)
+			name += c;
+
+		_names.push_back(name);
+	}
+	
+	delete stream;
+}
+
+/**
+ * Load the list of names of graphics for the inventory
+ */
+void Inventory::loadGraphics() {
+	if (_invGraphicsLoaded)
+		return;
+
+	// Default all inventory slots to empty
+	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
+
+	for (int idx = _invIndex; (idx < _holdings) && (idx - _invIndex) < 6; ++idx) {
+		// Get the name of the item to be dispalyed, figure out it's accompanying
+		// .VGS file with it's picture, and then load it
+		int invNum = findInv((*this)[idx]._name);
+		Common::String fName = Common::String::format("item%02d.vgs", invNum);
+
+		_invShapes[idx] = new ImageFile(fName);
+	}
+
+	_invGraphicsLoaded = true;
+}
+
+/**
+ * Searches through the list of names that correspond to the inventory items
+ * and returns the numer that matches the passed name
+ */
+int Inventory::findInv(const Common::String &name) {
+	int result = -1;
+
+	for (uint idx = 0; (idx < _holdings) && result == -1; ++idx) {
+		if (scumm_stricmp(name.c_str(), _names[idx].c_str()) == 0)
+			result = idx;
+	}
+
+	if (result == -1)
+		result = 1;
+	return result;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index dc56e93841..e561f0318a 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -25,9 +25,13 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/str-array.h"
+#include "sherlock/resources.h"
 
 namespace Sherlock {
 
+#define MAX_VISIBLE_INVENTORY 6
+
 struct InventoryItem {
 	int _requiredFlag;
 	Common::String _name;
@@ -37,10 +41,26 @@ struct InventoryItem {
 };
 
 class Inventory : public Common::Array<InventoryItem> {
+private:
+	SherlockEngine *_vm;
+public:
+	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
+	Common::StringArray _names;
+	bool _invGraphicsLoaded;
+	int _invIndex;
+	int _holdings;
+	void freeGraphics();
 public:
-	uint _holdings;
+	Inventory(SherlockEngine *vm);
+	~Inventory();
+
+	void freeInventory();
+
+	void loadInv();
+
+	void loadGraphics();
 
-	Inventory() : Common::Array<InventoryItem>(), _holdings(0) {}
+	int findInv(const Common::String &name);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 6b681b42e9..1643bef7b0 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -159,7 +159,7 @@ void Sprite::adjustSprite() {
 	setImageFrame();
 
 	// Check to see if character has entered an exit zone
-	if (!_walkCount && scene._walkedInScene && scene._goToRoom == -1) {
+	if (!_walkCount && scene._walkedInScene && scene._goToScene == -1) {
 		Common::Rect charRect(_position.x / 100 - 5, _position.y / 100 - 2,
 			_position.x / 100 + 5, _position.y / 100 + 2);
 		Exit *exit = scene.checkForExit(charRect);
@@ -819,11 +819,11 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 
 		default:
 			if (ch >= '0' && ch <= '9') {
-				scene._goToRoom = atoi(name.c_str() + 1);
+				scene._goToScene = atoi(name.c_str() + 1);
 
-				if (scene._goToRoom < 97 && _vm->_map[scene._goToRoom].x) {
-					_vm->_over.x = _vm->_map[scene._goToRoom].x * 100 - 600;
-					_vm->_over.y = _vm->_map[scene._goToRoom].y * 100 + 900;
+				if (scene._goToScene < 97 && _vm->_map[scene._goToScene].x) {
+					_vm->_over.x = _vm->_map[scene._goToScene].x * 100 - 600;
+					_vm->_over.y = _vm->_map[scene._goToScene].y * 100 + 900;
 				}
 
 				if ((p = strchr(name.c_str(), ',')) != nullptr) {
@@ -844,7 +844,7 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 					scene._hsavedFs = 100 + atoi(p + 1);
 				}
 			} else {
-				scene._goToRoom = 100;
+				scene._goToScene = 100;
 			}
 
 			people[AL]._position = Common::Point(0, 0);
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index d2fbb3d8c5..91689e296c 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -99,6 +99,21 @@ bool People::loadWalk() {
 	}
 }
 
+/**
+ * If the walk data has been loaded, then it will be freed
+ */
+bool People::freeWalk() {
+	if (_walkLoaded) {
+		delete _player._images;
+		_player._images = nullptr;
+
+		_walkLoaded = false;
+		return true;
+	} else {
+		return false;
+	}
+}
+
 /**
 * Set the variables for moving a character from one poisition to another
 * in a straight line - goAllTheWay must have been previously called to
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 7c218671c9..de84675e66 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -79,6 +79,8 @@ public:
 
 	bool loadWalk();
 
+	bool freeWalk();
+
 	void setWalking();
 
 	void gotoStand(Sprite &sprite);
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 1fe1901212..3ec971895a 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -43,7 +43,6 @@ ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameD
 		SherlockEngine(syst, gameDesc) {
 	_chess = nullptr;
 	_darts = nullptr;
-	_tempFadeStyle = 0;
 	_chessResult = 0;
 }
 
@@ -70,7 +69,7 @@ void ScalpelEngine::initialize() {
 		_map.push_back(Common::Point(MAP_X[idx], MAP_Y[idx]));
 
 	// Starting scene
-	_scene->_goToRoom = 4;
+	_scene->_goToScene = 4;
 }
 
 /**
@@ -181,7 +180,7 @@ bool ScalpelEngine::showOfficeCutscene() {
  * Starting a scene within the game
  */
 void ScalpelEngine::startScene() {
-	if (_scene->_goToRoom == 100 || _scene->_goToRoom == 98) {
+	if (_scene->_goToScene == 100 || _scene->_goToScene == 98) {
 		// Chessboard selection
 		if (_sound->_musicOn) {
 			if (_sound->loadSong(100)) {
@@ -190,7 +189,7 @@ void ScalpelEngine::startScene() {
 			}
 		}
 
-		_scene->_goToRoom = _chess->doChessBoard();
+		_scene->_goToScene = _chess->doChessBoard();
 
 		_sound->freeSong();
 		_scene->_hsavedPos = Common::Point(-1, -1);
@@ -203,17 +202,17 @@ void ScalpelEngine::startScene() {
 	// 53: Moorehead's death / subway train
 	// 55: Fade out and exit 
 	// 70: Brumwell suicide
-	switch (_scene->_goToRoom) {
+	switch (_scene->_goToScene) {
 	case 2:
 	case 52:
 	case 53:
 	case 70:
-		if (_sound->_musicOn && _sound->loadSong(_scene->_goToRoom)) {
+		if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene)) {
 			if (_sound->_music)
 				_sound->startSong();
 		}
 
-		switch (_scene->_goToRoom) {
+		switch (_scene->_goToScene) {
 		case 2:
 			// Blackwood's capture
 			_res->addToCache("final2.vda", "epilogue.lib");
@@ -269,7 +268,7 @@ void ScalpelEngine::startScene() {
 			_animation->playPrologue("SUBWAY3", 1, 0, false, 4);
 
 			// Set fading to direct fade temporary so the transition goes quickly.
-			_tempFadeStyle = _screen->_fadeStyle ? 257 : 256;
+			_scene->_tempFadeStyle = _screen->_fadeStyle ? 257 : 256;
 			_screen->_fadeStyle = false;
 			break;
 
@@ -282,28 +281,28 @@ void ScalpelEngine::startScene() {
 		}
 
 		// Except for the Moorehead Murder scene, fade to black first
-		if (_scene->_goToRoom != 53) {
+		if (_scene->_goToScene != 53) {
 			_events->wait(40);
 			_screen->fadeToBlack(3);
 		}
 
-		switch (_scene->_goToRoom) {
+		switch (_scene->_goToScene) {
 		case 52:
-			_scene->_goToRoom = 27;			// Go to the Lawyer's Office
+			_scene->_goToScene = 27;			// Go to the Lawyer's Office
 			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
 			_scene->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
 			_scene->_oldCharPoint = 27;
 			break;
 
 		case 53:
-			_scene->_goToRoom = 17;			// Go to St. Pancras Station
+			_scene->_goToScene = 17;			// Go to St. Pancras Station
 			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
 			_scene->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
 			_scene->_oldCharPoint = 17;
 			break;
 
 		default:
-			_scene->_goToRoom = 4;			// Back to Baker st.
+			_scene->_goToScene = 4;			// Back to Baker st.
 			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
 			_scene->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
 			_scene->_oldCharPoint = 4;
@@ -327,13 +326,13 @@ void ScalpelEngine::startScene() {
 	_events->loadCursors("rmouse.vgs");
 	_events->setCursor(ARROW);
 
-	if (_scene->_goToRoom == 99) {
+	if (_scene->_goToScene == 99) {
 		// Chess Board
 		_darts->playDarts();
-		_chessResult = _scene->_goToRoom = 19;	// Go back to the bar
+		_chessResult = _scene->_goToScene = 19;	// Go back to the bar
 	}
 
-	_chessResult = _scene->_goToRoom;
+	_chessResult = _scene->_goToScene;
 }
 
 /**
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 2d5deeb882..caf33052aa 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -35,7 +35,6 @@ class ScalpelEngine : public SherlockEngine {
 private:
 	Chess *_chess;
 	Darts *_darts;
-	int _tempFadeStyle;
 	int _chessResult;
 
 	bool showCityCutscene();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 92a8757fd8..e0b5dc1711 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -118,7 +118,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_stats[idx][0], &_stats[idx][9], false);
 	_currentScene = -1;
-	_goToRoom = -1;
+	_goToScene = -1;
 	_changes = false;
 	_charPoint = _oldCharPoint = 0;
 	_windowOpen = false;
@@ -139,6 +139,8 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_lookHelp = false;
 	_animating = 0;
 	_doBgAnimDone = true;
+	_oldLook = 0;
+	_tempFadeStyle = 0;
 
 	_controlPanel = new ImageFile("controls.vgs");
 	_controls = nullptr; // new ImageFile("menu.all");
@@ -156,7 +158,14 @@ Scene::~Scene() {
 void Scene::clear() {
 }
 
+/**
+ * Handles loading the scene specified by _goToScene
+ */
 void Scene::selectScene() {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+
 	// Reset fields
 	_windowOpen = _infoFlag = false;
 	_menuMode = STD_MODE;
@@ -165,12 +174,39 @@ void Scene::selectScene() {
 	_oldTemp = _temp = 0;
 
 	// Load the scene
-	Common::String sceneFile = Common::String::format("res%02d", _goToRoom);
-	_rrmName = Common::String::format("res%02d.rrm", _goToRoom);
-	_currentScene = _goToRoom;
-	_goToRoom = -1;
+	Common::String sceneFile = Common::String::format("res%02d", _goToScene);
+	_rrmName = Common::String::format("res%02d.rrm", _goToScene);
+	_currentScene = _goToScene;
+	_goToScene = -1;
 
 	loadScene(sceneFile);
+
+	// If the fade style was changed from running amovie, then reset it
+	if (_tempFadeStyle) {
+		screen._fadeStyle = _tempFadeStyle;
+		_tempFadeStyle = 0;
+	}
+
+	people._walkDest = Common::Point(people[AL]._position.x / 100,
+		people[AL]._position.y / 100);
+
+	_restoreFlag = true;
+	events.clearEvents();
+
+	// If there were any scripst waiting to be run, but were interrupt by a running
+	// canimation (probably the last scene's exit canim), clear the _scriptMoreFlag
+	if (_vm->_scriptMoreFlag == 3)
+		_vm->_scriptMoreFlag = 0;
+}
+
+/**
+ * Fres all the graphics and other dynamically allocated data for the scene
+ */
+void Scene::freeScene() {
+	_vm->_inventory->freeInventory();
+
+	_roomBounds.clear();
+	_canimShapes.clear();
 }
 
 /**
@@ -506,7 +542,7 @@ void Scene::checkSceneFlags(bool flag) {
 	}
 
 	// Check inventory
-	for (uint idx = 0; idx < _vm->_inventory->_holdings; ++idx) {
+	for (int idx = 0; idx < _vm->_inventory->_holdings; ++idx) {
 		InventoryItem &ii = (*_vm->_inventory)[idx];
 		if (ii._requiredFlag && !_vm->readFlags(ii._requiredFlag)) {
 			// Kill object: move it after the active holdings
@@ -1013,10 +1049,10 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	cObj.checkObject(_bgShapes[0]);
 
 	if (gotoCode > 0 && !talk._talkToAbort) {
-		_goToRoom = gotoCode;
+		_goToScene = gotoCode;
 
-		if (_goToRoom < 97 && _vm->_map[_goToRoom].x) {
-			_overPos = _vm->_map[_goToRoom];
+		if (_goToScene < 97 && _vm->_map[_goToScene].x) {
+			_overPos = _vm->_map[_goToScene];
 		}
 	}
 
@@ -1305,7 +1341,7 @@ void Scene::doBgAnim() {
 		_animating = 0;
 		screen.slamRect(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	} else {
-		if (people[AL]._type != INVALID && ((_goToRoom == -1 || _ongoingCans == 0))) {
+		if (people[AL]._type != INVALID && ((_goToScene == -1 || _ongoingCans == 0))) {
 			if (people[AL]._type == REMOVE) {
 				screen.slamRect(Common::Rect(
 					people[AL]._oldPosition.x, people[AL]._oldPosition.y,
@@ -1325,7 +1361,7 @@ void Scene::doBgAnim() {
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
-			if ((o._type == ACTIVE_BG_SHAPE || o._type == REMOVE) && _goToRoom == -1) {
+			if ((o._type == ACTIVE_BG_SHAPE || o._type == REMOVE) && _goToScene == -1) {
 				screen.flushImage(o._imageFrame, o._position,
 					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
 			}
@@ -1347,7 +1383,7 @@ void Scene::doBgAnim() {
 				people._portrait._type = INVALID;
 		}
 
-		if (_goToRoom == -1) {
+		if (_goToScene == -1) {
 			for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 				Object &o = _bgShapes[idx];
 				if (o._type == NO_SHAPE && (o._flags & 1) == 0) {
@@ -1363,7 +1399,7 @@ void Scene::doBgAnim() {
 		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
 			Object &o = _canimShapes[idx];
 			if (o._type == REMOVE) {
-				if (_goToRoom == -1)
+				if (_goToScene == -1)
 					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
 
 				_canimShapes.remove_at(idx);
@@ -1389,8 +1425,16 @@ void Scene::doBgAnim() {
 	}
 }
 
+/**
+ * Clears the info line of the screen
+ */
 void Scene::clearInfo() {
-	// TODO
+	if (_infoFlag) {
+		_vm->_screen->fillRect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 200, INFO_LINE + 9,
+			INFO_BLACK);
+		_infoFlag = false;
+		_oldLook = -1;
+	}
 }
 
 
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 4b76739402..25c97c097a 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -120,6 +120,7 @@ private:
 	int _selector;
 	bool _invLookFlag;
 	bool _lookHelp;
+	int _oldLook;
 
 	bool loadScene(const Common::String &filename);
 
@@ -134,7 +135,7 @@ private:
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
 public:
 	int _currentScene;
-	int _goToRoom;
+	int _goToScene;
 	bool _changes;
 	bool _stats[SCENES_COUNT][9];
 	bool _savedStats[SCENES_COUNT][9];
@@ -170,6 +171,7 @@ public:
 	bool _restoreFlag;
 	int _animating;
 	bool _doBgAnimDone;
+	int _tempFadeStyle;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
@@ -178,6 +180,8 @@ public:
 
 	void selectScene();
 
+	void freeScene();
+
 	void checkSceneFlags(bool mode);
 
 	Exit *checkForExit(const Common::Rect &r);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 330da6075b..e023bf9b16 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -75,7 +75,7 @@ void SherlockEngine::initialize() {
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
 	_events = new Events(this);
-	_inventory = new Inventory();
+	_inventory = new Inventory(this);
 	_journal = new Journal();
 	_people = new People(this);
 	_scene = new Scene(this);
@@ -102,14 +102,40 @@ Common::Error SherlockEngine::run() {
 		// Initialize and load the scene. 
 		_scene->selectScene();
 
-		// TODO: Implement game and remove this dummy loop
-		while (!shouldQuit())
-			_events->pollEventsAndWait();
+		// Scene handling loop
+		sceneLoop();
 	}
 
 	return Common::kNoError;
 }
 
+void SherlockEngine::sceneLoop() {
+	while (!shouldQuit() && _scene->_goToScene != -1) {
+		// See if a script needs to be completed from either a goto room code,
+		// or a script that was interrupted by another script
+		if (_scriptMoreFlag == 1 || _scriptMoreFlag == 3)
+			_talk->talkTo(_scriptName);
+		else
+			_scriptMoreFlag = 0;
+
+		// Handle any input from the keyboard or mouse
+		handleInput();
+
+		if (_scene->_hsavedPos.x == -1)
+			_scene->doBgAnim();
+	}
+
+	_scene->freeScene();
+	_talk->freeTalkVars();
+	_people->freeWalk();
+
+}
+
+void SherlockEngine::handleInput() {
+	// TODO
+}
+
+
 /**
  * Read the state of a global flag
  */
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 92aee9cdc3..11bea9bdcd 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -68,6 +68,9 @@ class Resource;
 
 class SherlockEngine : public Engine {
 private:
+	void sceneLoop();
+
+	void handleInput();
 protected:
 	virtual void initialize();
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 414f3b90a6..4c10b7b7ef 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -34,4 +34,12 @@ void Talk::talkTo(const Common::String &name) {
 	// TODO
 }
 
+/**
+ * Clear loaded talk data
+ */
+void Talk::freeTalkVars() {
+	_statements.clear();
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 55a4c0fd69..fc73994cc6 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -43,13 +43,15 @@ class Talk {
 private:
 	SherlockEngine *_vm;
 public:
-	Common::Array<TalkHistoryEntry> _history;
+	Common::Array<TalkHistoryEntry> _statements;
 	bool _talkToAbort;
 	int _talkCounter;
 public:
 	Talk(SherlockEngine *vm);
 
 	void talkTo(const Common::String &name);
+
+	void freeTalkVars();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From e444d989bb3470650020cb2c3f0fdb7b2fcab70a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 09:51:37 -0400
Subject: SHERLOCK: Implemented scene freeing code

---
 engines/sherlock/inventory.cpp |  2 +-
 engines/sherlock/objects.cpp   |  2 +-
 engines/sherlock/objects.h     |  4 ++--
 engines/sherlock/scene.cpp     | 42 ++++++++++++++++++++++++++++--------------
 engines/sherlock/scene.h       |  6 +++---
 engines/sherlock/sherlock.cpp  |  2 +-
 engines/sherlock/sherlock.h    |  1 +
 engines/sherlock/sound.cpp     |  4 ++++
 engines/sherlock/sound.h       |  1 +
 9 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index cbb69f1041..2a277a6331 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -106,7 +106,7 @@ void Inventory::loadGraphics() {
 int Inventory::findInv(const Common::String &name) {
 	int result = -1;
 
-	for (uint idx = 0; (idx < _holdings) && result == -1; ++idx) {
+	for (int idx = 0; (idx < _holdings) && result == -1; ++idx) {
 		if (scumm_stricmp(name.c_str(), _names[idx].c_str()) == 0)
 			result = idx;
 	}
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 1643bef7b0..bbe2c9d4d2 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -946,7 +946,7 @@ void CAnim::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-InvGraphicType::InvGraphicType() {
+SceneImage::SceneImage() {
 	_images = nullptr;
 	_maxFrames = 0;
 	_filesize = 0;
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index ee82faf99c..2ac2e16da0 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -223,12 +223,12 @@ struct CAnim {
 	void synchronize(Common::SeekableReadStream &s);
 };
 
-struct InvGraphicType {
+struct SceneImage {
 	ImageFile *_images;				// Object images
 	int _maxFrames;					// How many frames in object
 	int _filesize;					// File size
 
-	InvGraphicType();
+	SceneImage();
 } ;
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e0b5dc1711..18ccdd4050 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -149,13 +149,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 Scene::~Scene() {
 	delete _controlPanel;
 	delete _controls;
-	clear();
-}
-
-/**
- * Takes care of clearing any scene data
- */
-void Scene::clear() {
+	freeScene();
 }
 
 /**
@@ -203,10 +197,27 @@ void Scene::selectScene() {
  * Fres all the graphics and other dynamically allocated data for the scene
  */
 void Scene::freeScene() {
+	_vm->_talk->freeTalkVars();
 	_vm->_inventory->freeInventory();
+	_vm->_sound->freeSong();
+	_vm->_sound->freeLoadedSounds();
 
+	if (!_vm->_loadingSavedGame)
+		saveSceneStatus();
+	else
+		_vm->_loadingSavedGame = false;
+
+	_sequenceBuffer.clear();
+	_descText.clear();
+	_walkData.clear();
+	_cAnim.clear();
+	_bgShapes.clear();
 	_roomBounds.clear();
 	_canimShapes.clear();
+
+	for (uint idx = 0; idx < _images.size(); ++idx)
+		delete _images[idx]._images;
+	_images.clear();
 }
 
 /**
@@ -225,6 +236,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	Sound &sound = *_vm->_sound;
 	bool flag;
 
+	freeScene();
 	_walkedInScene = false;
 	_ongoingCans = 0;
 
@@ -232,7 +244,6 @@ bool Scene::loadScene(const Common::String &filename) {
 	_roomBounds.clear();
 	_roomBounds.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
-	clear();
 	_descText.clear();
 	_comments = "";
 	_bgShapes.clear();
@@ -287,17 +298,17 @@ bool Scene::loadScene(const Common::String &filename) {
 		if (_lzwMode)
 			delete infoStream;
 
-		// Set up inv list
-		_inv.resize(bgHeader._numImages + 1);
+		// Set up the list of images used by the scene
+		_images.resize(bgHeader._numImages + 1);
 		for (int idx = 0; idx < bgHeader._numImages; ++idx) {
-			_inv[idx + 1]._filesize = bgInfo[idx]._filesize;
-			_inv[idx + 1]._maxFrames = bgInfo[idx]._maxFrames;
+			_images[idx + 1]._filesize = bgInfo[idx]._filesize;
+			_images[idx + 1]._maxFrames = bgInfo[idx]._maxFrames;
 
 			// Read in the image data
 			Common::SeekableReadStream *imageStream = !_lzwMode ? rrmStream :
 				decompressLZ(*rrmStream, bgInfo[idx]._filesize);
 
-			_inv[idx + 1]._images = new ImageFile(*imageStream);
+			_images[idx + 1]._images = new ImageFile(*imageStream);
 
 			if (_lzwMode)
 				delete imageStream;
@@ -315,7 +326,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			_bgShapes[idx]._position = Common::Point(0, 0);
 			_bgShapes[idx]._oldSize = Common::Point(1, 1);
 
-			_bgShapes[idx]._images = _inv[_bgShapes[idx]._misc]._images;
+			_bgShapes[idx]._images = _images[_bgShapes[idx]._misc]._images;
 			_bgShapes[idx]._imageFrame = !_bgShapes[idx]._images ? (ImageFrame *)nullptr :
 				&(*_bgShapes[idx]._images)[0];
 		}
@@ -1437,5 +1448,8 @@ void Scene::clearInfo() {
 	}
 }
 
+void Scene::saveSceneStatus() {
+	// TODO
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 25c97c097a..3cdb20ac0f 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -133,6 +133,8 @@ private:
 	void updateBackground();
 
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
+
+	void saveSceneStatus();
 public:
 	int _currentScene;
 	int _goToScene;
@@ -159,7 +161,7 @@ public:
 	Common::Array<Object> _bgShapes;
 	Common::Array<CAnim> _cAnim;
 	Common::Array<byte> _sequenceBuffer;
-	Common::Array<InvGraphicType> _inv;
+	Common::Array<SceneImage> _images;
 	int _walkDirectory[MAX_ZONES][MAX_ZONES];
 	Common::Array<byte> _walkData;
 	Common::Array<Exit> _exits;
@@ -176,8 +178,6 @@ public:
 	Scene(SherlockEngine *vm);
 	~Scene();
 
-	void clear();
-
 	void selectScene();
 
 	void freeScene();
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index e023bf9b16..ad590e3ffd 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -43,6 +43,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_talk = nullptr;
 	_useEpilogue2 = false;
 	_justLoaded = false;
+	_loadingSavedGame = false;
 	_onChessboard = false;
 	_slowChess = false;
 	_menuCounter = 0;
@@ -126,7 +127,6 @@ void SherlockEngine::sceneLoop() {
 	}
 
 	_scene->freeScene();
-	_talk->freeTalkVars();
 	_people->freeWalk();
 
 }
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 11bea9bdcd..b84f6d7429 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -96,6 +96,7 @@ public:
 	Common::String _titleOverride;
 	bool _useEpilogue2;
 	bool _justLoaded;
+	bool _loadingSavedGame;
 	int _oldCharPoint;					// Old scene
 	Common::Point _over;				// Old map position
 	Common::Array<Common::Point> _map;	// Map locations for each scene
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index e8e433fa84..5e7df5607f 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -56,6 +56,10 @@ void Sound::playCachedSound(int index) {
 	// TODO
 }
 
+void Sound::freeLoadedSounds() {
+	// TODO
+}
+
 void Sound::clearCache() {
 	// TODO
 }
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 3f32f2724a..74e8db3611 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -55,6 +55,7 @@ public:
 	void cacheSound(const Common::String &name, int index);
 	void playLoadedSound(int bufNum, int waitMode);
 	void playCachedSound(int index);
+	void freeLoadedSounds();
 	void clearCache();
 	void stopSound();
 	int loadSong(int songNumber);
-- 
cgit v1.2.3


From 840bd862b734d54b18eb505b32ce030da10c934d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 10:48:28 -0400
Subject: SHERLOCK: Implement ImageFile nibble mode, fixes for scene data
 loading

---
 engines/sherlock/objects.cpp   | 11 +++++-----
 engines/sherlock/objects.h     |  2 +-
 engines/sherlock/resources.cpp | 13 +++++++----
 engines/sherlock/resources.h   |  2 +-
 engines/sherlock/scene.cpp     | 49 ++++++++++++++++++++----------------------
 engines/sherlock/scene.h       |  2 +-
 6 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index bbe2c9d4d2..7d86c45e15 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -408,12 +408,11 @@ void Object::setVm(SherlockEngine *vm) {
  * Load the object data from the passed stream
  */
 void Object::synchronize(Common::SeekableReadStream &s) {
-	char buffer[50];
-
+	char buffer[12];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
-	s.read(buffer, 41);
-	_description = Common::String(buffer);
+
+	s.read(_description, 41);
 
 	_examine.clear();
 	_sequences = nullptr;
@@ -421,8 +420,8 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_imageFrame = nullptr;
 
 	s.skip(4);
-	_sequenceOffset = s.readUint32LE();
-	s.seek(8, SEEK_CUR);
+	_sequenceOffset = s.readUint16LE();
+	s.seek(10, SEEK_CUR);
 
 	_walkCount = s.readByte();
 	_allow = s.readByte();
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 2ac2e16da0..2a52ec4d33 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -152,7 +152,7 @@ public:
 	static void setVm(SherlockEngine *vm);
 public:
 	Common::String _name;			// Name
-	Common::String _description;	// Description
+	char _description[41];			// Description lines
 	Common::String _examine;		// Examine in-depth description
 	int _sequenceOffset;
 	uint8 *_sequences;				// Holds animation sequences
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 4b087b59b5..3915a4b5d9 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -297,13 +297,13 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		ImageFrame frame;
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
-		frame._flags = stream.readByte();
+		frame._paletteBase = stream.readByte();
 		frame._offset.x = stream.readUint16LE();
 		frame._offset.y = stream.readByte();
         
 		frame._rleEncoded = !skipPalette && (frame._offset.x == 1);
 
-		if (frame._flags & 0xFF) {
+		if (frame._paletteBase) {
 			// Nibble packed frame data
 			frame._size = (frame._width * frame._height) / 2;
 		} else if (frame._rleEncoded) {
@@ -351,8 +351,13 @@ void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
 void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 	frame._frame.create(frame._width, frame._height, Graphics::PixelFormat::createFormatCLUT8());
 
-	if (frame._flags & 0xFF) {
-	    error("TODO: ImageFile::decompressFrame() 4-bits/pixel\n");
+	if (frame._paletteBase) {
+		// Nibble-packed
+		byte *pDest = (byte *)frame._frame.getPixels();
+		for (int idx = 0; idx < frame._size; ++idx, ++src) {
+			*pDest++ = *src & 0xF;
+			*pDest++ = (*src >> 4);
+		}
 	} else if (frame._rleEncoded) {
 		// RLE encoded
 	    byte *dst = (byte *)frame._frame.getPixels();
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index ab2eb82a1e..45fda565bc 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -91,7 +91,7 @@ public:
 struct ImageFrame {
 	uint32 _size;
 	uint16 _width, _height;
-	int _flags;
+	int _paletteBase;
 	bool _rleEncoded;
 	Common::Point _offset;
 	byte _rleMarker;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 18ccdd4050..578eba2c24 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -212,7 +212,7 @@ void Scene::freeScene() {
 	_walkData.clear();
 	_cAnim.clear();
 	_bgShapes.clear();
-	_roomBounds.clear();
+	_bounds.clear();
 	_canimShapes.clear();
 
 	for (uint idx = 0; idx < _images.size(); ++idx)
@@ -241,8 +241,8 @@ bool Scene::loadScene(const Common::String &filename) {
 	_ongoingCans = 0;
 
 	// Reset the list of walkable areas
-	_roomBounds.clear();
-	_roomBounds.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	_bounds.clear();
+	_bounds.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 	_descText.clear();
 	_comments = "";
@@ -281,7 +281,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			decompressLZ(*rrmStream, bgHeader._numImages * 569 + 
 				bgHeader._descSize + bgHeader._seqSize);
 
-		_bgShapes.resize(bgHeader._numStructs + 1);
+		_bgShapes.resize(bgHeader._numStructs);
 		for (int idx = 0; idx < bgHeader._numStructs; ++idx)
 			_bgShapes[idx].synchronize(*infoStream);
 
@@ -305,13 +305,13 @@ bool Scene::loadScene(const Common::String &filename) {
 			_images[idx + 1]._maxFrames = bgInfo[idx]._maxFrames;
 
 			// Read in the image data
-			Common::SeekableReadStream *imageStream = !_lzwMode ? rrmStream :
-				decompressLZ(*rrmStream, bgInfo[idx]._filesize);
+			Common::SeekableReadStream *imageStream = _lzwMode ?
+				decompressLZ(*rrmStream, bgInfo[idx]._filesize) :
+				rrmStream->readStream(bgInfo[idx]._filesize);
 
 			_images[idx + 1]._images = new ImageFile(*imageStream);
 
-			if (_lzwMode)
-				delete imageStream;
+			delete imageStream;
 		}
 
 		// Set up the bgShapes
@@ -331,44 +331,41 @@ bool Scene::loadScene(const Common::String &filename) {
 				&(*_bgShapes[idx]._images)[0];
 		}
 
-		// Set up end of list
-		_bgShapes[bgHeader._numStructs]._sequences = &_sequenceBuffer[0] + bgHeader._seqSize;
-		_bgShapes[bgHeader._numStructs]._examine = nullptr;
-
 		// Load in cAnim list
-		Common::SeekableReadStream *canimStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations);
+		Common::SeekableReadStream *canimStream = _lzwMode ?
+			decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
+			rrmStream->readStream(65 * bgHeader._numcAnimations);
 
 		_cAnim.resize(bgHeader._numcAnimations);
 		for (uint idx = 0; idx < _cAnim.size(); ++idx)
 			_cAnim[idx].synchronize(*canimStream);
 
-		if (_lzwMode)
-			delete canimStream;
+		delete canimStream;
 		
 		// Read in the room bounding areas
 		int size = rrmStream->readUint16LE();
 		Common::SeekableReadStream *boundsStream = !_lzwMode ? rrmStream :
 			decompressLZ(*rrmStream, size);
 
-		_roomBounds.resize(size / 10);
-		for (uint idx = 0; idx < _roomBounds.size(); ++idx) {
-			_roomBounds[idx].left = boundsStream->readSint16LE();
-			_roomBounds[idx].top = boundsStream->readSint16LE();
-			_roomBounds[idx].setWidth(boundsStream->readSint16LE());
-			_roomBounds[idx].setHeight(boundsStream->readSint16LE());
+		_bounds.resize(size / 10);
+		for (uint idx = 0; idx < _bounds.size(); ++idx) {
+			_bounds[idx].left = boundsStream->readSint16LE();
+			_bounds[idx].top = boundsStream->readSint16LE();
+			_bounds[idx].setWidth(boundsStream->readSint16LE());
+			_bounds[idx].setHeight(boundsStream->readSint16LE());
 			boundsStream->skip(2);	// Skip unused scene number field
 		}
 
 		if (_lzwMode)
 			delete boundsStream;
 
-		// Back at version byte, so skip over it
-		rrmStream->skip(1);
+		// Ensure we've reached the path version byte
+		if (rrmStream->readByte() != 254)
+			error("Invalid scene path data");
 
 		// Load the walk directory
-		for (int idx1 = 0; idx1 < MAX_ZONES; ++idx1) {
-			for (int idx2 = 0; idx2 < MAX_ZONES; ++idx2)
+		for (uint idx1 = 0; idx1 < _bounds.size(); ++idx1) {
+			for (uint idx2 = 0; idx2 < _bounds.size(); ++idx2)
 				_walkDirectory[idx1][idx2] = rrmStream->readSint16LE();
 		}
 
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 3cdb20ac0f..a6e4f51b99 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -157,7 +157,7 @@ public:
 	int _invGraphicItems;
 	Common::String _comments;
 	Common::Array<char> _descText;
-	Common::Array<Common::Rect> _roomBounds;
+	Common::Array<Common::Rect> _bounds;
 	Common::Array<Object> _bgShapes;
 	Common::Array<CAnim> _cAnim;
 	Common::Array<byte> _sequenceBuffer;
-- 
cgit v1.2.3


From 0f424da24b8d5c3399714d56c896e3a46983faac Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 15:44:11 -0400
Subject: SHERLOCK: First game scene is partially showing

---
 engines/sherlock/objects.h    |  3 +++
 engines/sherlock/scene.cpp    | 14 +++++++-------
 engines/sherlock/sherlock.cpp |  7 ++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 2a52ec4d33..9e43c087b8 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -206,6 +206,9 @@ public:
 	void setFlagsAndToggles();
 
 	void adjustObject();
+
+	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
+	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
 };
 
 struct CAnim {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 578eba2c24..5bad8338aa 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -316,6 +316,10 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		// Set up the bgShapes
 		for (int idx = 0; idx < bgHeader._numStructs; ++idx) {
+			_bgShapes[idx]._images = _images[_bgShapes[idx]._misc]._images;
+			_bgShapes[idx]._imageFrame = !_bgShapes[idx]._images ? (ImageFrame *)nullptr :
+				&(*_bgShapes[idx]._images)[0];
+
 			_bgShapes[idx]._examine = Common::String(&_descText[_bgShapes[idx]._descOffset]);
 			_bgShapes[idx]._sequences = &_sequenceBuffer[_bgShapes[idx]._sequenceOffset];
 			_bgShapes[idx]._misc = 0;
@@ -325,10 +329,6 @@ bool Scene::loadScene(const Common::String &filename) {
 			_bgShapes[idx]._frameNumber = -1;
 			_bgShapes[idx]._position = Common::Point(0, 0);
 			_bgShapes[idx]._oldSize = Common::Point(1, 1);
-
-			_bgShapes[idx]._images = _images[_bgShapes[idx]._misc]._images;
-			_bgShapes[idx]._imageFrame = !_bgShapes[idx]._images ? (ImageFrame *)nullptr :
-				&(*_bgShapes[idx]._images)[0];
 		}
 
 		// Load in cAnim list
@@ -799,8 +799,8 @@ void Scene::updateBackground() {
 	// Draw all static and active shapes that are FORWARD
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		_bgShapes[idx]._oldPosition = _bgShapes[idx]._position;
-		_bgShapes[idx]._oldSize = Common::Point(_bgShapes[idx]._imageFrame->_frame.w, 
-			_bgShapes[idx]._imageFrame->_frame.h);
+		_bgShapes[idx]._oldSize = Common::Point(_bgShapes[idx].frameWidth(),
+			_bgShapes[idx].frameHeight());
 
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == FORWARD)
@@ -837,7 +837,7 @@ void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
 		Object &obj = _bgShapes[idx];
 		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
 			if ((obj._flags & 5) == 1) {
-				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
+				obj._misc = (pt.y < (obj._position.y + obj.frameHeight() - 1)) ?
 					NORMAL_FORWARD : NORMAL_BEHIND;
 			} else if (!(obj._flags & 1)) {
 				obj._misc = BEHIND;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index ad590e3ffd..211c52ea87 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -54,14 +54,14 @@ SherlockEngine::~SherlockEngine() {
 	delete _animation;
 	delete _debugger;
 	delete _events;
-	delete _inventory;
 	delete _journal;
 	delete _people;
-	delete _res;
 	delete _scene;
 	delete _screen;
 	delete _sound;
 	delete _talk;
+	delete _inventory;
+	delete _res;
 }
 
 void SherlockEngine::initialize() {
@@ -111,7 +111,7 @@ Common::Error SherlockEngine::run() {
 }
 
 void SherlockEngine::sceneLoop() {
-	while (!shouldQuit() && _scene->_goToScene != -1) {
+	while (!shouldQuit() && _scene->_goToScene == -1) {
 		// See if a script needs to be completed from either a goto room code,
 		// or a script that was interrupted by another script
 		if (_scriptMoreFlag == 1 || _scriptMoreFlag == 3)
@@ -133,6 +133,7 @@ void SherlockEngine::sceneLoop() {
 
 void SherlockEngine::handleInput() {
 	// TODO
+	_events->pollEventsAndWait();
 }
 
 
-- 
cgit v1.2.3


From 61980291bd977b15158a00e9cb97b8887a3d11e9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 15:49:54 -0400
Subject: SHERLOCK: Disable intro for now

---
 engines/sherlock/sherlock.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 211c52ea87..5bb6500cf9 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -88,7 +88,8 @@ void SherlockEngine::initialize() {
 Common::Error SherlockEngine::run() {
 	initialize();
 
-	showOpening();
+	// Temporarily disabled for now
+//	showOpening();
 
 	while (!shouldQuit()) {
 		// Prepare for scene, and handle any game-specific scenes. This allows 
-- 
cgit v1.2.3


From 47fb0be0c77485741ca0352e2f2de663a49aede5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 17:30:06 -0400
Subject: SHERLOCK: Fix loading of player sprites

---
 engines/sherlock/resources.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 3915a4b5d9..e499b698c1 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -301,7 +301,7 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._offset.x = stream.readUint16LE();
 		frame._offset.y = stream.readByte();
         
-		frame._rleEncoded = !skipPalette && (frame._offset.x == 1);
+		frame._rleEncoded = !skipPalette && (frame._offset.x & 0xff) == 1;
 
 		if (frame._paletteBase) {
 			// Nibble packed frame data
-- 
cgit v1.2.3


From b3130796540a727822d429ab122258e8be3db463 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 17:54:16 -0400
Subject: SHERLOCK: Fix positioning of scene sprites

---
 engines/sherlock/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 5bad8338aa..2133da5056 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -327,7 +327,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			_bgShapes[idx]._seqCounter2 = 0;
 			_bgShapes[idx]._seqStack = 0;
 			_bgShapes[idx]._frameNumber = -1;
-			_bgShapes[idx]._position = Common::Point(0, 0);
+			_bgShapes[idx]._oldPosition = Common::Point(0, 0);
 			_bgShapes[idx]._oldSize = Common::Point(1, 1);
 		}
 
-- 
cgit v1.2.3


From 989d26897436103ff475b9987645b06265076bda Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Mar 2015 18:24:13 -0400
Subject: SHERLOCK: Fix placement of Sherlock

---
 engines/sherlock/objects.h | 3 +++
 engines/sherlock/scene.cpp | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 9e43c087b8..8099c6b74f 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -117,6 +117,9 @@ public:
 	void adjustSprite();
 
 	void checkSprite();
+
+	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
+	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
 };
 
 struct ActionType {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 2133da5056..9f549b4312 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -777,7 +777,8 @@ void Scene::updateBackground() {
 			player._sequenceNumber == WALK_DOWNRIGHT || player._sequenceNumber == STOP_DOWNRIGHT;
 
 		surface.transBlitFrom(player._imageFrame->_frame,
-			Common::Point(player._position.x / 100, player._position.y / 100), flipped);
+			Common::Point(player._position.x / 100, 
+				player._position.y / 100 - player.frameHeight()), flipped);
 	}
 
 	// Draw all static and active shapes that are NORMAL and are in front of the player
-- 
cgit v1.2.3


From 73085bf57034adc2dbf5994ce2c6930b416eee7d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 23 Mar 2015 20:34:34 -0400
Subject: SHERLOCK: Beginnings of UserInterface class

---
 engines/sherlock/animation.cpp      |   4 +-
 engines/sherlock/events.cpp         |  56 ++++---
 engines/sherlock/events.h           |  14 +-
 engines/sherlock/module.mk          |   3 +-
 engines/sherlock/objects.cpp        |  44 ++++--
 engines/sherlock/objects.h          |   3 +
 engines/sherlock/resources.cpp      |   2 +-
 engines/sherlock/scene.cpp          |  78 ++++-----
 engines/sherlock/scene.h            |  22 +--
 engines/sherlock/screen.h           |   4 +
 engines/sherlock/sherlock.cpp       |  15 +-
 engines/sherlock/sherlock.h         |   3 +-
 engines/sherlock/user_interface.cpp | 306 ++++++++++++++++++++++++++++++++++++
 engines/sherlock/user_interface.h   |  91 +++++++++++
 14 files changed, 534 insertions(+), 111 deletions(-)
 create mode 100644 engines/sherlock/user_interface.cpp
 create mode 100644 engines/sherlock/user_interface.h

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 9d32746de4..e1687b5238 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -151,14 +151,14 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 			events.wait(speed);
 		}
 
-		if (events.isKeyPressed()) {
+		if (events.kbHit()) {
 			Common::KeyState keyState = events.getKey();
 			if (keyState.keycode == Common::KEYCODE_ESCAPE ||
 				keyState.keycode == Common::KEYCODE_SPACE) {
 				skipped = true;
 				break;
 			}
-		} else if (events._mouseClicked) {
+		} else if (events._pressed) {
 			skipped = true;
 			break;
 		}
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 1a09f0600e..a6b3c899cb 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -36,8 +36,10 @@ Events::Events(SherlockEngine *vm) {
 	_cursorId = INVALID_CURSOR;
 	_frameCounter = 1;
 	_priorFrameTime = 0;
-	_mouseClicked = false;
 	_mouseButtons = 0;
+	_pressed = _released = false;
+	_rightPressed = _rightReleased = false;
+	_oldButtons = _oldRightButton = false;
 }
 
 Events::~Events() {
@@ -125,12 +127,16 @@ void Events::pollEvents() {
 		case Common::EVENT_KEYUP:
 			return;
 		case Common::EVENT_LBUTTONDOWN:
+			_mouseButtons |= 1;
+			return;
 		case Common::EVENT_RBUTTONDOWN:
-			_mouseClicked = true;
+			_mouseButtons |= 2;
 			return;
 		case Common::EVENT_LBUTTONUP:
+			_mouseButtons &= ~1;
+			return;
 		case Common::EVENT_RBUTTONUP:
-			_mouseClicked = false;
+			_mouseButtons &= ~2;
 			return;
 		case Common::EVENT_MOUSEMOVE:
 			_mousePos = event.mouse;
@@ -180,7 +186,9 @@ bool Events::checkForNextFrameCounter() {
  */
 void Events::clearEvents() {
 	_pendingKeys.clear();
-	_mouseClicked = false;
+	_pressed = _rightPressed = false;
+	_rightPressed = _rightReleased = false;
+	_oldButtons = _oldRightButton = false;
 }
 
 /**
@@ -197,7 +205,7 @@ bool Events::delay(uint32 time, bool interruptable) {
 		// For really short periods, simply delay by the desired amount
 		pollEvents();
 		g_system->delayMillis(time);
-		bool result = !(interruptable && (isKeyPressed() || _mouseClicked));
+		bool result = !(interruptable && (kbHit() || _pressed));
 
 		clearEvents();
 		return result;
@@ -210,7 +218,7 @@ bool Events::delay(uint32 time, bool interruptable) {
 		while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd) {
 			pollEventsAndWait();
 
-			if (interruptable && (isKeyPressed() || _mouseClicked)) {
+			if (interruptable && (kbHit() || _pressed)) {
 				clearEvents();
 				return false;
 			}
@@ -221,25 +229,33 @@ bool Events::delay(uint32 time, bool interruptable) {
 }
 
 /**
- * Wait for the next frame
+ * Sets the pressed and released button flags depending on the value passed
  */
-void Events::waitForNextFrame() {
-	_mouseClicked = false;
-	_mouseButtons = 0;
-
-	bool mouseClicked = false;
-	int mouseButtons = 0;
+void Events::setButtonState() {
+	_released = _rightReleased = false;
+	if (_mouseButtons & 1)
+		_pressed = _oldButtons = true;
+
+	if ((_mouseButtons & 1) == 0 && _oldButtons) {
+		_pressed = _oldButtons = false;
+		_released = true;
+	}
 
-	uint32 frameCtr = getFrameCounter();
-	while (!_vm->shouldQuit() && frameCtr == _frameCounter) {
-		pollEventsAndWait();
+	if (_mouseButtons & 2)
+		_rightPressed = _oldRightButton = true;
 
-		mouseClicked |= _mouseClicked;
-		mouseButtons |= _mouseButtons;
+	if ((_mouseButtons & 2) == 0 && _oldRightButton) {
+		_rightPressed = _oldRightButton = false;
+		_rightReleased = true;
 	}
+}
 
-	_mouseClicked = mouseClicked;
-	_mouseButtons = mouseButtons;
+/**
+ * Checks to see to see if a key or a mouse button is pressed.
+ */
+bool Events::checkInput() {
+	setButtonState();
+	return kbHit() || _pressed || _released || _rightPressed || _rightReleased;
 }
 
 } // End of namespace MADS
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index e939b5768f..1c5fbc5be4 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -44,12 +44,17 @@ private:
 	uint32 _priorFrameTime;
 	Common::Point _mousePos;
 	ImageFile *_cursorImages;
+	int _mouseButtons;
 
 	bool checkForNextFrameCounter();
 public:
 	CursorId _cursorId;
-	byte _mouseButtons;
-	bool _mouseClicked;
+	bool _pressed;
+	bool _released;
+	bool _rightPressed;
+	bool _rightReleased;
+	bool _oldButtons;
+	bool _oldRightButton;
 	Common::Stack<Common::KeyState> _pendingKeys;
 public:
 	Events(SherlockEngine *vm);
@@ -75,7 +80,7 @@ public:
 
 	uint32 getFrameCounter() const { return _frameCounter; }
 
-	bool isKeyPressed() const { return !_pendingKeys.empty(); }
+	bool kbHit() const { return !_pendingKeys.empty(); }
 
 	Common::KeyState getKey() { return _pendingKeys.pop(); }
 
@@ -85,8 +90,9 @@ public:
 
 	bool delay(uint32 time, bool interruptable = false);
 
-	void waitForNextFrame();
+	void setButtonState();
 
+	bool checkInput();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index aa8f495742..4101769a80 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -20,7 +20,8 @@ MODULE_OBJS = \
 	screen.o \
 	sherlock.o \
 	sound.o \
-	talk.o
+	talk.o \
+	user_interface.o
 
 # This module can be built as a plugin
 ifdef BUILD_PLUGINS
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 7d86c45e15..e0a24c5b7d 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -39,10 +39,6 @@ namespace Sherlock {
 #define CLEAR_DIST_X 5
 #define CLEAR_DIST_Y 0
 
-#define INFO_FOREGROUND 11
-#define INFO_BACKGROUND 1
-
-
 SherlockEngine *Sprite::_vm;
 
 /**
@@ -779,6 +775,7 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
 	bool printed = false;
 	char ch;
 	const char *p;
@@ -852,19 +849,19 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 	} else if (name.hasPrefix("!")) {
 		// Message attached to canimation
 		int messageNum = atoi(name.c_str() + 1);
-		scene._infoFlag++;
-		scene.clearInfo();
+		ui._infoFlag++;
+		ui.clearInfo();
 		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, INFO_BACKGROUND,
 			(*messages)[messageNum].c_str());
-		_vm->_menuCounter = 25;
+		ui._menuCounter = 25;
 	} else if (name.hasPrefix("@")) {
 		// Message attached to canimation
-		scene._infoFlag++;
-		scene.clearInfo();
+		ui._infoFlag++;
+		ui.clearInfo();
 		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, INFO_BACKGROUND,
 			"%s", name.c_str() + 1);
 		printed = true;
-		_vm->_menuCounter = 25;
+		ui._menuCounter = 25;
 	}
 
 	return printed;
@@ -922,6 +919,33 @@ void Object::adjustObject() {
 	}
 }
 
+/**
+ * Returns the current bounds for the sprite
+ */
+const Common::Rect Object::getNewBounds() const {
+	Common::Point pt = _position;
+	if (_imageFrame)
+		pt += _imageFrame->_offset;
+
+	return Common::Rect(pt.x, pt.y, pt.x + frameWidth(), pt.y + frameHeight());
+}
+
+/**
+ * Returns the bounds for a sprite without a shape
+ */
+const Common::Rect Object::getNoShapeBounds() const {
+	return Common::Rect(_position.x, _position.y,
+		_position.x + _noShapeSize.x, _position.y + _noShapeSize.y);
+}
+
+/**
+ * Returns the old bounsd for the sprite from the previous frame
+ */
+const Common::Rect Object::getOldBounds() const {
+	return Common::Rect(_oldPosition.x, _oldPosition.y,
+		_oldPosition.x + _oldSize.x, _oldPosition.y + _oldSize.y);
+}
+
 /*----------------------------------------------------------------*/
 
 void CAnim::synchronize(Common::SeekableReadStream &s) {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 8099c6b74f..4944681ab3 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -212,6 +212,9 @@ public:
 
 	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
 	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
+	const Common::Rect getNewBounds() const;
+	const Common::Rect getNoShapeBounds() const;
+	const Common::Rect getOldBounds() const;
 };
 
 struct CAnim {
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index e499b698c1..878747a63c 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -354,7 +354,7 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 	if (frame._paletteBase) {
 		// Nibble-packed
 		byte *pDest = (byte *)frame._frame.getPixels();
-		for (int idx = 0; idx < frame._size; ++idx, ++src) {
+		for (uint idx = 0; idx < frame._size; ++idx, ++src) {
 			*pDest++ = *src & 0xF;
 			*pDest++ = (*src >> 4);
 		}
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 9f549b4312..6e09693807 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -27,37 +27,6 @@
 
 namespace Sherlock {
 
-// Main Menu control locations
-const int MENU_POINTS[12][4] = { 
-	{ 13, 153, 72, 165 },
-	{ 13, 169, 72, 181 },
-	{ 13, 185, 72, 197 },
-	{ 88, 153, 152, 165 },
-	{ 88, 169, 152, 181 },
-	{ 88, 185, 152, 197 },
-	{ 165, 153, 232, 165 },
-	{ 165, 169, 232, 181 },
-	{ 165, 185, 233, 197 },
-	{ 249, 153, 305, 165 },
-	{ 249, 169, 305, 181 },
-	{ 249, 185, 305, 197 } 
-};
-
-// Inventory control locations */
-const int INVENTORY_POINTS[8][3] = { 
-	{ 4, 50, 28 },
-	{ 52, 99, 76 },
-	{ 101, 140, 122 },
-	{ 142, 187, 165 },
-	{ 189, 219, 197 },
-	{ 221, 251, 233 },
-	{ 253, 283, 265 },
-	{ 285, 315, 293 } 
-};
-
-/*----------------------------------------------------------------*/
-
-
 void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
 	_numStructs = s.readUint16LE();
 	_numImages = s.readUint16LE();
@@ -121,8 +90,6 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_goToScene = -1;
 	_changes = false;
 	_charPoint = _oldCharPoint = 0;
-	_windowOpen = false;
-	_infoFlag = false;
 	_keyboardInput = 0;
 	_walkedInScene = false;
 	_ongoingCans = 0;
@@ -132,23 +99,19 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_hsavedPos = Common::Point(-1, -1);
 	_hsavedFs = -1;
 	_cAnimFramePause = 0;
-	_menuMode = STD_MODE;
 	_invMode = INVMODE_0;
 	_restoreFlag = false;
 	_invLookFlag = false;
 	_lookHelp = false;
 	_animating = 0;
 	_doBgAnimDone = true;
-	_oldLook = 0;
 	_tempFadeStyle = 0;
 
 	_controlPanel = new ImageFile("controls.vgs");
-	_controls = nullptr; // new ImageFile("menu.all");
 }
 
 Scene::~Scene() {
 	delete _controlPanel;
-	delete _controls;
 	freeScene();
 }
 
@@ -159,10 +122,11 @@ void Scene::selectScene() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
+	UserInterface &ui = *_vm->_ui;
 
 	// Reset fields
-	_windowOpen = _infoFlag = false;
-	_menuMode = STD_MODE;
+	ui._windowOpen = ui._infoFlag = false;
+	ui._menuMode = STD_MODE;
 	_keyboardInput = 0;
 	_oldKey = _help = _oldHelp = 0;
 	_oldTemp = _temp = 0;
@@ -1135,6 +1099,7 @@ void Scene::doBgAnim() {
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
 	Surface surface = screen._backBuffer.getSubArea(Common::Rect(0, 0,
 		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	int cursorId = events.getCursor();
@@ -1151,7 +1116,7 @@ void Scene::doBgAnim() {
 	}
 
 	// Check for setting magnifying glass cursor
-	if (_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) {
+	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
 		if (_invMode == INVMODE_1) {
 			// Only show Magnifying glass cursor if it's not on the inventory command line
 			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
@@ -1434,20 +1399,33 @@ void Scene::doBgAnim() {
 	}
 }
 
+void Scene::saveSceneStatus() {
+	// TODO
+}
+
 /**
- * Clears the info line of the screen
+ * Attempts to find a background shape within the passed bounds. If found,
+ * it will return the shape number, or -1 on failure.
  */
-void Scene::clearInfo() {
-	if (_infoFlag) {
-		_vm->_screen->fillRect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 200, INFO_LINE + 9,
-			INFO_BLACK);
-		_infoFlag = false;
-		_oldLook = -1;
+int Scene::findBgShape(const Common::Rect &r) {
+	if (!_doBgAnimDone)
+		// New frame hasn't been drawn yet
+		return -1;
+
+	for (int idx = (int)_bgShapes.size() - 1; idx >= 0; --idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN
+			&& o._aType <= PERSON) {
+			if (r.intersects(o.getNewBounds()))
+				return idx;
+		} else if (o._type == NO_SHAPE) {
+			if (r.intersects(o.getNoShapeBounds()))
+				return idx;
+		}
 	}
-}
 
-void Scene::saveSceneStatus() {
-	// TODO
+	return -1;
 }
 
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index a6e4f51b99..785ed63106 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -37,22 +37,6 @@ namespace Sherlock {
 #define CONTROLS_Y  138
 #define CONTROLS_Y1 151
 
-enum MenuMode {
-	STD_MODE		=  0,
-	LOOK_MODE		=  1,
-	MOVE_MODE		=  2,
-	TALK_MODE		=  3,
-	PICKUP_MODE		=  4,
-	OPEN_MODE		=  5,
-	CLOSE_MODE		=  6,
-	INV_MODE		=  7,
-	USE_MODE		=  8,
-	GIVE_MODE		=  9,
-	JOURNAL_MODE	= 10,
-	FILES_MODE		= 11,
-	SETUP_MODE		= 12
-};
-
 enum InvMode {
 	INVMODE_0	= 0,
 	INVMODE_1	= 1,
@@ -114,13 +98,11 @@ private:
 	Common::String _rrmName;
 	int _cAnimFramePause;
 	Common::String _cAnimStr;
-	MenuMode _menuMode;
 	InvMode _invMode;
 	bool _lookScriptFlag;
 	int _selector;
 	bool _invLookFlag;
 	bool _lookHelp;
-	int _oldLook;
 
 	bool loadScene(const Common::String &filename);
 
@@ -144,9 +126,7 @@ public:
 	Common::Point _bigPos;
 	Common::Point _overPos;
 	int _charPoint, _oldCharPoint;
-	ImageFile *_controls;
 	ImageFile *_controlPanel;
-	bool _windowOpen, _infoFlag;
 	int _keyboardInput;
 	int _oldKey, _help, _oldHelp;
 	int _oldTemp, _temp;
@@ -195,6 +175,8 @@ public:
 	void doBgAnim();
 
 	void clearInfo();
+
+	int findBgShape(const Common::Rect &r);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 87453ba36d..419ae681c2 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -34,7 +34,11 @@ namespace Sherlock {
 #define PALETTE_SIZE 768
 #define PALETTE_COUNT 256
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
+
 #define INFO_BLACK 1
+#define INFO_FOREGROUND 11
+#define INFO_BACKGROUND 1
+
 
 class SherlockEngine;
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 5bb6500cf9..eea40f33a6 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -41,12 +41,12 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_screen = nullptr;
 	_sound = nullptr;
 	_talk = nullptr;
+	_ui = nullptr;
 	_useEpilogue2 = false;
 	_justLoaded = false;
 	_loadingSavedGame = false;
 	_onChessboard = false;
 	_slowChess = false;
-	_menuCounter = 0;
 	_scriptMoreFlag = 0;
 }
 
@@ -60,6 +60,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _screen;
 	delete _sound;
 	delete _talk;
+	delete _ui;
 	delete _inventory;
 	delete _res;
 }
@@ -83,6 +84,7 @@ void SherlockEngine::initialize() {
 	_screen = new Screen(this);
 	_sound = new Sound(this);
 	_talk = new Talk(this);
+	_ui = new UserInterface(this);
 }
 
 Common::Error SherlockEngine::run() {
@@ -132,9 +134,18 @@ void SherlockEngine::sceneLoop() {
 
 }
 
+/**
+ * Handle all player input
+ */
 void SherlockEngine::handleInput() {
-	// TODO
+	bool personFound;
+
 	_events->pollEventsAndWait();
+
+	// See if a key or mouse button is pressed
+	_events->setButtonState();
+
+	_ui->handleInput();
 }
 
 
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index b84f6d7429..392f55839e 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -42,6 +42,7 @@
 #include "sherlock/screen.h"
 #include "sherlock/sound.h"
 #include "sherlock/talk.h"
+#include "sherlock/user_interface.h"
 
 namespace Sherlock {
 
@@ -90,6 +91,7 @@ public:
 	Screen *_screen;
 	Sound *_sound;
 	Talk *_talk;
+	UserInterface *_ui;
 	Common::RandomSource _randomSource;
 	Common::Array<bool> _flags;
 	Common::String _soundOverride;
@@ -102,7 +104,6 @@ public:
 	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _onChessboard;
 	bool _slowChess;
-	int _menuCounter;
 	int _scriptMoreFlag;
 	Common::String _scriptName;
 public:
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
new file mode 100644
index 0000000000..d80aaecb54
--- /dev/null
+++ b/engines/sherlock/user_interface.cpp
@@ -0,0 +1,306 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/user_interface.h"
+#include "sherlock/sherlock.h"
+
+namespace Sherlock {
+
+// Main user interface menu control locations
+const int MENU_POINTS[12][4] = { 
+	{ 13, 153, 72, 165 },
+	{ 13, 169, 72, 181 },
+	{ 13, 185, 72, 197 },
+	{ 88, 153, 152, 165 },
+	{ 88, 169, 152, 181 },
+	{ 88, 185, 152, 197 },
+	{ 165, 153, 232, 165 },
+	{ 165, 169, 232, 181 },
+	{ 165, 185, 233, 197 },
+	{ 249, 153, 305, 165 },
+	{ 249, 169, 305, 181 },
+	{ 249, 185, 305, 197 } 
+};
+
+// Inventory control locations */
+const int INVENTORY_POINTS[8][3] = { 
+	{ 4, 50, 28 },
+	{ 52, 99, 76 },
+	{ 101, 140, 122 },
+	{ 142, 187, 165 },
+	{ 189, 219, 197 },
+	{ 221, 251, 233 },
+	{ 253, 283, 265 },
+	{ 285, 315, 293 } 
+};
+
+const char COMMANDS[13] = "LMTPOCIUGJFS";
+
+/*----------------------------------------------------------------*/
+
+UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
+	_bgFound = 0;
+	_oldBgFound = -1;
+	_keycode = Common::KEYCODE_INVALID;
+	_helpStyle = 0;
+	_menuCounter = 0;
+	_menuMode = STD_MODE;
+	_help = _oldHelp = 0;
+	_lookHelp = 0;
+	_key = _oldKey = 0;
+	_temp = _oldTemp = 0;
+	_invLookFlag = 0;
+	_windowOpen = false;
+	_oldLook = false;
+	_keyboardInput = false;
+
+	_controls = nullptr; // new ImageFile("menu.all");
+}
+
+UserInterface::~UserInterface() {
+	delete _controls;
+}
+
+void UserInterface::handleInput() {
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+
+	if (_menuCounter)
+		whileMenuCounter();
+
+	Common::Point pt = events.mousePos();
+	_bgFound = scene.findBgShape(Common::Rect(pt.x, pt.y, pt.x + 1, pt.y + 1));
+	_keycode = Common::KEYCODE_INVALID;
+
+	// Check kbd and set the mouse released flag if Enter or space is pressed.
+	// Otherwise, the pressed key is stored for later use
+	if (events.kbHit()) {
+		Common::KeyState keyState = events.getKey();
+
+		if (keyState.keycode == Common::KEYCODE_x && keyState.flags & Common::KBD_ALT) {
+			_vm->quitGame();
+			return;
+		} else if (keyState.keycode == Common::KEYCODE_SPACE ||
+				keyState.keycode == Common::KEYCODE_RETURN) {
+			events._pressed = events._oldButtons = 0;
+			_keycode = Common::KEYCODE_INVALID;
+		}
+	}
+
+	// Do button highlighting check
+	if (!_vm->_scriptMoreFlag) {	// Don't if scripts are running
+		if (((events._rightPressed || events._rightReleased) && _helpStyle) ||
+				(!_helpStyle && !_menuCounter)) {
+			// Handle any default commands if we're in STD_MODE
+			if (_menuMode == STD_MODE) {
+				if (pt.y < CONTROLS_Y &&
+					(events._rightPressed || (!_helpStyle && !events._released)) &&
+					(_bgFound != -1) && (_bgFound < 1000) &&
+					(scene._bgShapes[_bgFound]._defaultCommand ||
+					scene._bgShapes[_bgFound]._description[0])) {
+					// If there is no default command, so set it to Look
+					if (scene._bgShapes[_bgFound]._defaultCommand)
+						_help = scene._bgShapes[_bgFound]._defaultCommand - 1;
+					else
+						_help = 0;
+
+					// Reset 'help' if it is an invalid command
+					if (_help > 5)
+						_help = -1;
+				} else if (pt.y < CONTROLS_Y &&
+					((events._rightReleased && _helpStyle) || (events._released && !_helpStyle)) &&
+					(_bgFound != -1 && _bgFound < 1000) &&
+					(scene._bgShapes[_bgFound]._defaultCommand || 
+					scene._bgShapes[_bgFound]._description[0])) {
+					// If there is no default command, set it to Look
+					if (scene._bgShapes[_bgFound]._defaultCommand)
+						_menuMode = (MenuMode)scene._bgShapes[_bgFound]._defaultCommand;
+					else
+						_menuMode = LOOK_MODE;
+					events._released = true;
+					events._pressed = events._oldButtons = false;
+					_help = _oldHelp = -1;
+				
+					if (_menuMode == LOOK_MODE) {
+						// Set the flag to tell the game that this was a right-click
+						// call to look and should exit without the look button being pressed
+						_lookHelp = true;
+					}
+				} else {
+					_help = -1;
+				}
+
+				// Check if highlighting a different button than last time
+				if (_help != _oldHelp) {
+					// If another button was highlighted previously, restore it
+					if (_oldHelp != -1)
+						restoreButton(_oldHelp);
+
+					// If we're highlighting a new button, then draw it pressed
+					if (_help != -1)
+						depressButton(_help);
+
+					_help = _oldHelp;
+				}
+
+				if (_bgFound != _oldBgFound) {
+					_infoFlag = true;
+					clearInfo();
+
+					if (_help != -1 && (scene._bgShapes[_bgFound]._description[0] != 32 &&
+							scene._bgShapes[_bgFound]._description[0]))
+						screen.print(Common::Point(0, INFO_LINE + 1),
+						INFO_FOREGROUND, INFO_BACKGROUND, "%s",
+						scene._bgShapes[_bgFound]._description);
+				}
+			} else {
+				// We're not in STD_MODE
+				// If there isn't a window open, then revert back to STD_MODE
+				if (!_windowOpen && events._rightReleased) {
+					// Restore all buttons
+					for (int idx = 0; idx < 12; ++idx)
+						restoreButton(idx);
+
+					_menuMode = STD_MODE;
+					_key = _oldKey = -1;
+					_temp = _oldTemp = _lookHelp = _invLookFlag = 0;
+					events.clearEvents();
+				}
+			}
+		}
+	}
+
+	// TODO
+}
+
+/**
+ * Draws the image for a user interface button in the down/pressed state.
+ */
+void UserInterface::depressButton(int num) {
+	Screen &screen = *_vm->_screen;
+	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+
+	Graphics::Surface &s = (*_controls)[num]._frame;
+	screen._backBuffer.transBlitFrom(s, pt);
+	screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
+}
+
+/**
+ * Draws the image for the given user interface button in the up
+ * (not selected) position
+ */
+void UserInterface::restoreButton(int num) {
+	Screen &screen = *_vm->_screen;
+	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+
+	screen._backBuffer.blitFrom(screen._backBuffer2, pt,
+		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
+	screen._backBuffer.blitFrom(screen._backBuffer, pt,
+		Common::Rect(pt.x, pt.y, pt.x + (*_controls)[num]._frame.w,
+			(*_controls)[num]._frame.h));
+	
+	if (!_menuCounter) {
+		_infoFlag++;
+		clearInfo();
+	}
+}
+
+/**
+ * If he mouse button is pressed, then calls depressButton to draw the button
+ * as pressed; if not, it will show it as released with a call to "restoreButton".
+ */
+void UserInterface::pushButton(int num) {
+	Events &events = *_vm->_events;
+	_oldKey = -1;
+
+	if (!events._released) {
+		if (_oldHelp != -1)
+			restoreButton(_oldHelp);
+		if (_help != -1)
+			restoreButton(_help);
+
+		depressButton(num);
+		events.wait(6);
+	}
+
+	restoreButton(num);
+}
+
+/**
+ * By the time this method has been called, the graphics for the button change
+ * have already been drawn. This simply takes care of switching the mode around
+ * accordingly
+ */
+void UserInterface::toggleButton(int num) {
+	Screen &screen = *_vm->_screen;
+	
+	if (_menuMode != (num + 1)) {
+		_menuMode = (MenuMode)(num + 1);
+		_oldKey = COMMANDS[num];
+		_oldTemp = num;
+
+		if (_keyboardInput) {
+			if (_oldHelp != -1 && _oldHelp != num)
+				restoreButton(_oldHelp);
+			if (_help != -1 && _help != num)
+				restoreButton(_help);
+
+			_keyboardInput = false;
+
+			Graphics::Surface &s = (*_controls)[num]._frame;
+			Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+			screen._backBuffer.transBlitFrom(s, pt);
+			screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
+		}
+	} else {
+		_menuMode = STD_MODE;
+		_oldKey = -1;
+		restoreButton(num);
+	}
+}
+
+
+/**
+ * Clears the info line of the screen
+ */
+void UserInterface::clearInfo() {
+	if (_infoFlag) {
+		_vm->_screen->fillRect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 200, INFO_LINE + 9,
+			INFO_BLACK);
+		_infoFlag = false;
+		_oldLook = -1;
+	}
+}
+
+/**
+ * Handles counting down whilst checking for input, then clears the info line.
+ */
+void UserInterface::whileMenuCounter() {
+	if (!(--_menuCounter) || _vm->_events->checkInput()) {
+		_menuCounter = 0;
+		++_infoFlag;
+		clearInfo();
+	}
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
new file mode 100644
index 0000000000..4a98a5be89
--- /dev/null
+++ b/engines/sherlock/user_interface.h
@@ -0,0 +1,91 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_UI_H
+#define SHERLOCK_UI_H
+
+#include "common/scummsys.h"
+#include "common/events.h"
+#include "sherlock/resources.h"
+
+namespace Sherlock {
+
+enum MenuMode {
+	STD_MODE		=  0,
+	LOOK_MODE		=  1,
+	MOVE_MODE		=  2,
+	TALK_MODE		=  3,
+	PICKUP_MODE		=  4,
+	OPEN_MODE		=  5,
+	CLOSE_MODE		=  6,
+	INV_MODE		=  7,
+	USE_MODE		=  8,
+	GIVE_MODE		=  9,
+	JOURNAL_MODE	= 10,
+	FILES_MODE		= 11,
+	SETUP_MODE		= 12
+};
+
+class SherlockEngine;
+
+class UserInterface {
+private:
+	SherlockEngine *_vm;
+	int _bgFound;
+	int _oldBgFound;
+	Common::KeyCode _keycode;
+	int _helpStyle;
+	int _lookHelp;
+	int _help, _oldHelp;
+	int _key, _oldKey;
+	int _temp, _oldTemp;
+	int _invLookFlag;
+	ImageFile *_controls;
+	int _oldLook;
+	bool _keyboardInput;
+private:
+	void depressButton(int num);
+
+	void restoreButton(int num);
+
+	void pushButton(int num);
+
+	void toggleButton(int num);
+public:
+	MenuMode _menuMode;
+	int _menuCounter;
+	bool _infoFlag;
+	bool _windowOpen;
+public:
+	UserInterface(SherlockEngine *vm);
+	~UserInterface();
+
+	void handleInput();
+
+	void clearInfo();
+
+	void whileMenuCounter();
+};
+
+} // End of namespace Sherlock
+
+#endif
-- 
cgit v1.2.3


From 73de00b72f002c09c173226e85b0f96f35551d10 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 23 Mar 2015 21:52:20 -0400
Subject: SHERLOCK: Implemented UserInterface::handleInput

---
 engines/sherlock/people.cpp         |   4 +
 engines/sherlock/people.h           |   4 +-
 engines/sherlock/scene.cpp          |  22 +++++
 engines/sherlock/scene.h            |   2 +
 engines/sherlock/sherlock.cpp       |   2 -
 engines/sherlock/talk.cpp           |   4 +
 engines/sherlock/talk.h             |   2 +
 engines/sherlock/user_interface.cpp | 185 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/user_interface.h   |  16 ++++
 9 files changed, 237 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 91689e296c..8a8dcb5245 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -311,4 +311,8 @@ void People::walkToCoords(const Common::Point &destPos, int destDir) {
 	warning("TODO: walkToCoords");
 }
 
+void People::goAllTheWay() {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index de84675e66..8d1953ee20 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -59,7 +59,6 @@ private:
 	Sprite &_player;
 	bool _walkLoaded;
 	int _oldWalkSequence;
-	bool _allowWalkAbort;
 public:
 	Common::Point _walkDest;
 	Common::Stack<Common::Point> _walkTo;
@@ -67,6 +66,7 @@ public:
 	bool _portraitLoaded;
 	Object _portrait;
 	bool _clearingThePortrait;
+	bool _allowWalkAbort;
 public:
 	People(SherlockEngine *vm);
 	~People();
@@ -86,6 +86,8 @@ public:
 	void gotoStand(Sprite &sprite);
 
 	void walkToCoords(const Common::Point &destPos, int destDir);
+
+	void goAllTheWay();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 6e09693807..95e8355957 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1427,5 +1427,27 @@ int Scene::findBgShape(const Common::Rect &r) {
 	return -1;
 }
 
+/**
+ * Checks to see if the given position in the scene belongs to a given zone type.
+ * If it is, the zone is activated and used just like a TAKL zone or aFLAG_SET zone.
+ */
+int Scene::checkForZones(const Common::Point &pt, int zoneType) {
+	int matches = 0;
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if ((o._aType == zoneType && o._type != INVALID) && o._type != HIDDEN) {
+			Common::Rect r = o._type == NO_SHAPE ? o.getNoShapeBounds() : o.getNewBounds();
+
+			if (r.contains(pt)) {
+				++matches;
+				o.setFlagsAndToggles();
+				_vm->_talk->talkTo(o._use[0]._target);
+			}
+		}
+	}
+
+	return matches;
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 785ed63106..1a9fe7b02c 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -177,6 +177,8 @@ public:
 	void clearInfo();
 
 	int findBgShape(const Common::Rect &r);
+
+	int checkForZones(const Common::Point &pt, int zoneType);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index eea40f33a6..a9de32972f 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -138,8 +138,6 @@ void SherlockEngine::sceneLoop() {
  * Handle all player input
  */
 void SherlockEngine::handleInput() {
-	bool personFound;
-
 	_events->pollEventsAndWait();
 
 	// See if a key or mouse button is pressed
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 4c10b7b7ef..ff71d37a2f 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -34,6 +34,10 @@ void Talk::talkTo(const Common::String &name) {
 	// TODO
 }
 
+void Talk::talk(int objNum) {
+	// TODO
+}
+
 /**
  * Clear loaded talk data
  */
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index fc73994cc6..9359b77e87 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -51,6 +51,8 @@ public:
 
 	void talkTo(const Common::String &name);
 
+	void talk(int objNum);
+
 	void freeTalkVars();
 };
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index d80aaecb54..5ed5494c5e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -72,6 +72,8 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_windowOpen = false;
 	_oldLook = false;
 	_keyboardInput = false;
+	_invMode = 0;
+	_pause = false;
 
 	_controls = nullptr; // new ImageFile("menu.all");
 }
@@ -82,8 +84,10 @@ UserInterface::~UserInterface() {
 
 void UserInterface::handleInput() {
 	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
 
 	if (_menuCounter)
 		whileMenuCounter();
@@ -190,7 +194,146 @@ void UserInterface::handleInput() {
 		}
 	}
 
-	// TODO
+	// Reset the old bgshape number if the mouse button is released, so that
+	// it can e re-highlighted when we come back here
+	if ((events._rightReleased && _helpStyle) || (events._released && !_helpStyle))
+		_oldBgFound = -1;
+
+	// Do routines that should be done before input processing
+	switch (_menuMode) {
+	case LOOK_MODE:
+		if (!_windowOpen) {
+			if (events._released && _bgFound >= 0 && _bgFound < 1000) {
+				if (!scene._bgShapes[_bgFound]._examine.empty())
+					examine();
+			} else {
+				lookScreen(pt);
+			}
+		}
+		break;
+
+	case MOVE_MODE:
+	case OPEN_MODE:
+	case CLOSE_MODE:
+	case PICKUP_MODE:
+		lookScreen(pt);
+		break;
+
+	case TALK_MODE:
+		if (!_windowOpen) {
+			bool personFound;
+
+			if (_bgFound >= 1000) {
+				personFound = false;
+				if (!events._released)
+					lookScreen(pt);
+			} else {
+				personFound = scene._bgShapes[_bgFound]._aType == PERSON && _bgFound != -1;
+			}
+
+			if (events._released && personFound)
+				talk.talk(_bgFound);
+			else if (personFound)
+				lookScreen(pt);
+			else if (_bgFound < 1000)
+				clearInfo();
+		}
+		break;
+
+	case USE_MODE:
+	case GIVE_MODE:
+	case INV_MODE:
+		if (_invMode == 1 || _invMode == 2 || _invMode == 3) {
+			if (pt.y < CONTROLS_Y)
+				lookInv();
+			else
+				lookScreen(pt);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	//
+	// Do input processing
+	//
+	if (events._pressed || events._released || events._rightPressed || 
+			_keycode != Common::KEYCODE_INVALID || _pause) {
+		if (((events._released && (_helpStyle || _help == -1)) || (events._rightReleased && !_helpStyle)) &&
+				(pt.y <= CONTROLS_Y) && (_menuMode == STD_MODE)) {
+			// The mouse was clicked in the playing area with no action buttons down.
+			// Check if the mouse was clicked in a script zone. If it was,
+			// then execute the script. Otherwise, walk to the given position
+			if (scene.checkForZones(pt, SCRIPT_ZONE) != 0) {
+				// Mouse clicked in script zone
+				events._pressed = events._released = false;
+			} else {
+				people._walkDest = pt;
+				people._allowWalkAbort = false;
+				people.goAllTheWay();
+			}
+
+			if (_oldKey != -1) {
+				restoreButton(_oldTemp);
+				_oldKey = -1;
+			}
+		}
+
+		// Handle action depending on selected mode
+		switch (_menuMode) {
+		case LOOK_MODE:
+			if (_windowOpen)
+				doLookControl();
+			break;
+
+		case MOVE_MODE:
+			doMiscControl(ALLOW_MOVEMENT);
+			break;
+
+		case TALK_MODE:
+			if (_windowOpen)
+				doTalkControl();
+			break;
+
+		case OPEN_MODE:
+			doMiscControl(ALLOW_OPEN);
+			break;
+
+		case CLOSE_MODE:
+			doMiscControl(ALLOW_CLOSE);
+			break;
+
+		case PICKUP_MODE:
+			doPickControl();
+			break;
+
+		case USE_MODE:
+		case GIVE_MODE:
+		case INV_MODE:
+			doInvControl();
+			break;
+
+		case FILES_MODE:
+			doEnvControl();
+			break;
+
+		default:
+			break;
+		}
+
+		// As long as there isn't an open window, do main input processing.
+		// Windows are opened when in TALK, USE, INV, and GIVE modes
+		if ((!_windowOpen && !_menuCounter && pt.y > CONTROLS_Y) || 
+				_keycode != Common::KEYCODE_INVALID) {
+			if (events._pressed || events._released || _pause ||
+					_keycode != Common::KEYCODE_INVALID)
+				doMainControl();
+		}
+
+		if (pt.y < CONTROLS_Y && events._pressed && _oldTemp != (_menuMode - 1) && _oldKey != -1)
+			restoreButton(_oldTemp);
+	}
 }
 
 /**
@@ -303,4 +446,44 @@ void UserInterface::whileMenuCounter() {
 	}
 }
 
+void UserInterface::examine() {
+	// TODO
+}
+
+void UserInterface::lookScreen(const Common::Point &pt) {
+	// TODO
+}
+
+void UserInterface::lookInv() {
+	// TODO
+}
+
+void UserInterface::doEnvControl() {
+	// TODO
+}
+
+void UserInterface::doInvControl() {
+	// TODO
+}
+
+void UserInterface::doLookControl() {
+	// TODO
+}
+
+void UserInterface::doMainControl() {
+	// TODO
+}
+
+void UserInterface::doMiscControl(int allowed) {
+	// TODO
+}
+
+void UserInterface::doPickControl() {
+	// TODO
+}
+
+void UserInterface::doTalkControl() {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 4a98a5be89..d312ff919c 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -62,6 +62,8 @@ private:
 	ImageFile *_controls;
 	int _oldLook;
 	bool _keyboardInput;
+	int _invMode;
+	bool _pause;
 private:
 	void depressButton(int num);
 
@@ -70,6 +72,20 @@ private:
 	void pushButton(int num);
 
 	void toggleButton(int num);
+
+	void examine();
+
+	void lookScreen(const Common::Point &pt);
+
+	void lookInv();
+
+	void doEnvControl();
+	void doInvControl();
+	void doLookControl();
+	void doMainControl();
+	void doMiscControl(int allowed);
+	void doPickControl();
+	void doTalkControl();
 public:
 	MenuMode _menuMode;
 	int _menuCounter;
-- 
cgit v1.2.3


From d44a9e3f5a390837ce88b95d6afa2e7a5ee9e26e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 23 Mar 2015 22:27:07 -0400
Subject: SHERLOCK: Fix loading of user interface controls

---
 engines/sherlock/resources.cpp      | 10 ++++++----
 engines/sherlock/user_interface.cpp |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 878747a63c..1bedbe9b7b 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -300,7 +300,7 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._paletteBase = stream.readByte();
 		frame._offset.x = stream.readUint16LE();
 		frame._offset.y = stream.readByte();
-        
+
 		frame._rleEncoded = !skipPalette && (frame._offset.x & 0xff) == 1;
 
 		if (frame._paletteBase) {
@@ -332,16 +332,18 @@ void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
 	// Check for palette
 	int v1 = stream.readUint16LE() + 1;
 	int v2 = stream.readUint16LE() + 1;
+	stream.skip(1);		// Skip paletteBase byte
+	bool rleEncoded = stream.readByte() == 1;
 	int size = v1 * v2;
 	
-	if ((size - 12) == PALETTE_SIZE) {
+	if ((size - 12) == PALETTE_SIZE && !rleEncoded) {
 		// Found palette, so read it in
-		stream.seek(4 + 12, SEEK_CUR);
+		stream.seek(2 + 12, SEEK_CUR);
 		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
 			_palette[idx] = VGA_COLOR_TRANS(stream.readByte());
 	} else {
 		// Not a palette, so rewind to start of frame data for normal frame processing
-		stream.seek(-4, SEEK_CUR);
+		stream.seek(-6, SEEK_CUR);
 	}
 }
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 5ed5494c5e..1cd5b80980 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -75,13 +75,16 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_invMode = 0;
 	_pause = false;
 
-	_controls = nullptr; // new ImageFile("menu.all");
+	_controls = new ImageFile("menu.all");
 }
 
 UserInterface::~UserInterface() {
 	delete _controls;
 }
 
+/**
+ * Main input handler for the user interface
+ */
 void UserInterface::handleInput() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -355,12 +358,12 @@ void UserInterface::depressButton(int num) {
 void UserInterface::restoreButton(int num) {
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+	Graphics::Surface &frame = (*_controls)[num]._frame;
 
 	screen._backBuffer.blitFrom(screen._backBuffer2, pt,
 		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
 	screen._backBuffer.blitFrom(screen._backBuffer, pt,
-		Common::Rect(pt.x, pt.y, pt.x + (*_controls)[num]._frame.w,
-			(*_controls)[num]._frame.h));
+		Common::Rect(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h));
 	
 	if (!_menuCounter) {
 		_infoFlag++;
-- 
cgit v1.2.3


From f2ee94c0ab646d3efe93e0c782494f5888d7cc36 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 24 Mar 2015 08:35:08 -0400
Subject: SHERLOCK: Implement font drawing

---
 engines/sherlock/graphics.cpp       |   8 +++
 engines/sherlock/graphics.h         |   3 ++
 engines/sherlock/resources.cpp      |   5 +-
 engines/sherlock/screen.cpp         | 105 ++++++++++++++++++++++++++++++++----
 engines/sherlock/screen.h           |   9 ++++
 engines/sherlock/user_interface.cpp |   2 +-
 6 files changed, 118 insertions(+), 14 deletions(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 63988a2f30..1a0144bc4b 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -90,6 +90,14 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 	copyRectToSurface(src, pt.x, pt.y, srcBounds);
 }
 
+/**
+* Draws an image frame at a given position within this surface with transparency
+*/
+void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
+		bool flipped, int overrideColor) {
+	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
+}
+
 /**
 * Draws a surface at a given position within this surface with transparency
 */
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index b33495a2b9..c380d805b2 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -25,6 +25,7 @@
 
 #include "common/rect.h"
 #include "graphics/surface.h"
+#include "sherlock/resources.h"
 
 namespace Sherlock {
 
@@ -43,6 +44,8 @@ public:
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds);
+	void transBlitFrom(const ImageFrame &src, const Common::Point &pt,
+		bool flipped = false, int overrideColor = 0);
 	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		bool flipped = false, int overrideColor = 0);
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 1bedbe9b7b..0d66646286 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -298,10 +298,11 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
 		frame._paletteBase = stream.readByte();
-		frame._offset.x = stream.readUint16LE();
+		frame._rleEncoded = stream.readByte() == 1;
+		frame._offset.x = stream.readByte();
 		frame._offset.y = stream.readByte();
 
-		frame._rleEncoded = !skipPalette && (frame._offset.x & 0xff) == 1;
+		frame._rleEncoded = !skipPalette && frame._rleEncoded;
 
 		if (frame._paletteBase) {
 			// Nibble packed frame data
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index f8f1d56e67..b1ad280b39 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -23,6 +23,7 @@
 #include "sherlock/screen.h"
 #include "sherlock/sherlock.h"
 #include "common/system.h"
+#include "common/util.h"
 #include "graphics/palette.h"
 
 namespace Sherlock {
@@ -32,19 +33,29 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
 	_transitionSeed = 1;
 	_fadeStyle = false;
+	_font = nullptr;
+	_fontHeight = 0;
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
 	setFont(1);
 }
 
+Screen::~Screen() {
+	delete _font;
+}
+
 void Screen::setFont(int fontNumber) {
 	_fontNumber = fontNumber;
 	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber);
-	Common::SeekableReadStream *stream = _vm->_res->load(fname);
 
-	debug("TODO: Loading font %s, size - %d", fname.c_str(), stream->size());
+	// Discard any previous font and read in new one
+	delete _font;
+	_font = new ImageFile(fname);
 
-	delete stream;
+	// Iterate through the frames to find the tallest font character
+	_fontHeight = 0;
+	for (uint idx = 0; idx < _font->size(); ++idx)
+		_fontHeight = MAX((uint16)_fontHeight, (*_font)[idx]._frame.h);
 }
 
 void Screen::update() {
@@ -231,14 +242,6 @@ void Screen::verticalTransition() {
 	}
 }
 
-/**
- * Prints the text passed onto the back buffer at the given position and color.
- * The string is then blitted to the screen
- */
-void Screen::print(const Common::Point &pt, int fgColor, int bgColor, const char *format, ...) {
-	// TODO
-}
-
 /**
  * Copies a section of the second back buffer into the main back buffer
  */
@@ -294,4 +297,84 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
 	*h = newBounds.height();
 }
 
+/**
+ * Prints the text passed onto the back buffer at the given position and color.
+ * The string is then blitted to the screen
+ */
+void Screen::print(const Common::Point &pt, int fgColor, int bgColor, const char *format, ...) {
+	// Create the string to display
+	char buffer[100];
+	va_list args;
+
+	va_start(args, format);
+	vsprintf(buffer, format, args);
+	va_end(args);
+	Common::String str(buffer);
+
+	// Figure out area to draw text in
+	Common::Point pos = pt;
+	int width = stringWidth(str);
+	pos.y--;		// Font is always drawing one line higher
+	if (!pos.x)
+		// Center text horizontally
+		pos.x = (SHERLOCK_SCREEN_WIDTH - width) / 2;
+
+	Common::Rect textBounds(pos.x, pos.y, pos.x + width, pos.y + _fontHeight);
+	if (textBounds.right > SHERLOCK_SCREEN_WIDTH)
+		textBounds.moveTo(SHERLOCK_SCREEN_WIDTH - width, textBounds.top);
+	if (textBounds.bottom > SHERLOCK_SCREEN_HEIGHT)
+		textBounds.moveTo(textBounds.left, SHERLOCK_SCREEN_HEIGHT - _fontHeight);
+
+	// Write out the string at the given position
+	writeString(str, Common::Point(textBounds.left, textBounds.top), fgColor);
+
+	// Copy the affected area to the screen
+	slamRect(textBounds);
+}
+
+/**
+ * Returns the width of a string in pixels
+ */
+int Screen::stringWidth(const Common::String &str) {
+	int width = 0;
+
+	for (const char *c = str.c_str(); *c; ++c) 
+		width += charWidth(*c);
+
+	return width;
+}
+
+/**
+ * Returns the width of a character in pixels
+ */
+int Screen::charWidth(char c) {
+	if (c == ' ')
+		return 5;
+	else if (c > ' ' && c <= '~')
+		return (*_font)[c - 33]._frame.w + 1;
+	else
+		return 0;
+}
+
+/**
+ * Draws the given string into the back buffer using the images stored in _font
+ */
+void Screen::writeString(const Common::String &str, const Common::Point &pt, int color) {
+	Common::Point charPos = pt;
+
+	for (const char *c = str.c_str(); *c; ++c) {
+		if (*c == ' ')
+			charPos.x += 5;
+		else {
+			assert(*c > ' ' && *c <= '~');
+			ImageFrame &frame = (*_font)[*c - 33];
+			_backBuffer.transBlitFrom(frame, charPos, false, color);
+			charPos.x += frame._frame.w + 1;
+		}
+	}
+
+	addDirtyRect(Common::Rect(pt.x, pt.y, charPos.x, pt.y + _fontHeight));
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 419ae681c2..257eb916b9 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -48,10 +48,14 @@ private:
 	int _fontNumber;
 	Common::List<Common::Rect> _dirtyRects;
 	uint32 _transitionSeed;
+	ImageFile *_font;
+	int _fontHeight;
 
 	void mergeDirtyRects();
 
 	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
+
+	void writeString(const Common::String &str, const Common::Point &pt, int color);
 protected:
 	virtual void addDirtyRect(const Common::Rect &r);
 public:
@@ -61,6 +65,7 @@ public:
 	byte _sMap[PALETTE_SIZE];
 public:
 	Screen(SherlockEngine *vm);
+	~Screen();
 
 	void setFont(int fontNumber);
 
@@ -89,6 +94,10 @@ public:
 
 	void flushImage(ImageFrame *frame, const Common::Point &pt,
 		int16 *xp, int16 *yp, int16 *w, int16 *h);
+
+	int stringWidth(const Common::String &str);
+
+	int charWidth(char c);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 1cd5b80980..1f201c74b8 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -431,7 +431,7 @@ void UserInterface::toggleButton(int num) {
  */
 void UserInterface::clearInfo() {
 	if (_infoFlag) {
-		_vm->_screen->fillRect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 200, INFO_LINE + 9,
+		_vm->_screen->fillRect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 20, INFO_LINE + 9,
 			INFO_BLACK);
 		_infoFlag = false;
 		_oldLook = -1;
-- 
cgit v1.2.3


From 97e58fb0171af885019d997493db33fab9af0091 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 24 Mar 2015 20:14:13 -0400
Subject: SHERLOCK: Fix display of scene hotspots

---
 engines/sherlock/screen.cpp         | 11 ++++++++---
 engines/sherlock/screen.h           |  2 ++
 engines/sherlock/user_interface.cpp |  7 ++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index b1ad280b39..e0eab428a8 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -46,7 +46,7 @@ Screen::~Screen() {
 
 void Screen::setFont(int fontNumber) {
 	_fontNumber = fontNumber;
-	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber);
+	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber + 1);
 
 	// Discard any previous font and read in new one
 	delete _font;
@@ -372,9 +372,14 @@ void Screen::writeString(const Common::String &str, const Common::Point &pt, int
 			charPos.x += frame._frame.w + 1;
 		}
 	}
-
-	addDirtyRect(Common::Rect(pt.x, pt.y, charPos.x, pt.y + _fontHeight));
 }
 
+/**
+ * Fills an area on the back buffer, and then copies it to the screen
+ */
+void Screen::bar(const Common::Rect &r, int color) {
+	_backBuffer.fillRect(r, color);
+	slamRect(r);
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 257eb916b9..239067b1cc 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -98,6 +98,8 @@ public:
 	int stringWidth(const Common::String &str);
 
 	int charWidth(char c);
+
+	void bar(const Common::Rect &r, int color);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 1f201c74b8..661604e4bf 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -268,7 +268,8 @@ void UserInterface::handleInput() {
 			// The mouse was clicked in the playing area with no action buttons down.
 			// Check if the mouse was clicked in a script zone. If it was,
 			// then execute the script. Otherwise, walk to the given position
-			if (scene.checkForZones(pt, SCRIPT_ZONE) != 0) {
+			if (scene.checkForZones(pt, SCRIPT_ZONE) != 0 ||
+					scene.checkForZones(pt, NOWALK_ZONE) != 0) {
 				// Mouse clicked in script zone
 				events._pressed = events._released = false;
 			} else {
@@ -431,8 +432,8 @@ void UserInterface::toggleButton(int num) {
  */
 void UserInterface::clearInfo() {
 	if (_infoFlag) {
-		_vm->_screen->fillRect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 20, INFO_LINE + 9,
-			INFO_BLACK);
+		_vm->_screen->bar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 20, 
+			INFO_LINE + 9), INFO_BLACK);
 		_infoFlag = false;
 		_oldLook = -1;
 	}
-- 
cgit v1.2.3


From 03a969bd0f696f9a7fa0dc56c47c2b05d28a5a47 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 24 Mar 2015 22:24:45 -0400
Subject: SHERLOCK: Implementing walk code

---
 engines/sherlock/people.cpp         | 127 ++++++++++++++++++++++++++++++++++--
 engines/sherlock/people.h           |   1 +
 engines/sherlock/scene.cpp          |  56 ++++++++++++----
 engines/sherlock/scene.h            |   6 +-
 engines/sherlock/sherlock.cpp       |   3 +
 engines/sherlock/user_interface.cpp |   6 ++
 engines/sherlock/user_interface.h   |   2 +
 7 files changed, 185 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 8a8dcb5245..ca840bb5b1 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -58,6 +58,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_allowWalkAbort = false;
 	_portraitLoaded = false;
 	_clearingThePortrait = false;
+	_srcZone = _destZone = 0;
 }
 
 People::~People() {
@@ -143,7 +144,7 @@ void People::setWalking() {
 	// If the player is already close to the given destination that no
 	// walking is needed, move to the next straight line segment in the
 	// overall walking route, if there is one
-	for (;;) {
+	do {
 		// Since we want the player to be centered on the destination they
 		// clicked, but characters draw positions start at their left, move
 		// the destination half the character width to draw him centered
@@ -306,13 +307,131 @@ void People::gotoStand(Sprite &sprite) {
 	_allowWalkAbort = true;
 }
 
+/**
+ * Walk to the co-ordinates passed, and then face the given direction
+ */
 void People::walkToCoords(const Common::Point &destPos, int destDir) {
-	// TODO
-	warning("TODO: walkToCoords");
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+
+	CursorId oldCursor = events.getCursor();
+	events.setCursor(WAIT);
+
+	_walkDest = Common::Point(destPos.x / 100 + 10, destPos.y / 100);
+	_allowWalkAbort = true;
+	goAllTheWay();
+
+	// Keep calling doBgAnim until the walk is done
+	do {
+		events.pollEventsAndWait();
+		scene.doBgAnim();
+	} while (!_vm->shouldQuit() && _player._walkCount);
+
+	if (!talk._talkToAbort) {
+		// Put player exactly on destination position, and set direction
+		_player._position = destPos;
+		_player._sequenceNumber = destDir;
+		gotoStand(_player);
+
+		// Draw Holmes facing the new direction
+		scene.doBgAnim();
+
+		if (!talk._talkToAbort)
+			events.setCursor(oldCursor);
+	}
 }
 
+/**
+ * Called to set the character walking to the current cursor location.
+ * It uses the zones and the inter-zone points to determine a series
+ * of steps to walk to get to that position.
+ */
 void People::goAllTheWay() {
-	// TODO
+	Scene &scene = *_vm->_scene;
+	Common::Point srcPt(_player._position.x / 100 + _player.frameWidth() / 2, 
+		_player._position.y / 100);
+
+	// Get the zone the player is currently in
+	_srcZone = scene.whichZone(srcPt);
+	if (_srcZone == -1)
+		_srcZone = scene.closestZone(srcPt);
+
+	// Get the zone of the destination
+	_destZone = scene.whichZone(_walkDest);
+	if (_destZone == -1) {
+		_destZone = scene.closestZone(_walkDest);
+
+		// The destination isn't in a zone
+		if (_walkDest.x >= (SHERLOCK_SCREEN_WIDTH - 1))
+			_walkDest.x = SHERLOCK_SCREEN_WIDTH - 2;
+
+		// Trace a line between the centroid of the found closest zone to
+		// the destination, to find the point at which the zone will be left
+		const Common::Rect &destRect = scene._zones[_destZone];
+		const Common::Point destCenter((destRect.left + destRect.right) / 2,
+			(destRect.top + destRect.bottom) / 2);
+		const Common::Point delta = _walkDest - destCenter;
+		Common::Point pt(destCenter.x * 100, destCenter.y * 100);
+
+		// Move along the line until the zone is left
+		do {
+			pt += delta;
+		} while (destRect.contains(pt.x / 100, pt.y / 100));
+
+		// Set the new walk destination to the last point that was in the
+		// zone just before it was left
+		_walkDest = Common::Point((pt.x - delta.x * 2) / 100,
+			(pt.y - delta.y * 2) / 100);
+	}
+
+	// Only do a walk if both zones are acceptable
+	if (_srcZone == -2 || _destZone == -2)
+		return;
+
+	// If the start and dest zones are the same, walk directly to the dest point
+	if (_srcZone == _destZone) {
+		setWalking();
+	} else {
+		// Otherwise a path needs to be formed from the path information
+		int i = scene._walkDirectory[_srcZone][_destZone];
+
+		// See if we need to use a reverse path
+		if (i == -1)
+			i = scene._walkDirectory[_destZone][_srcZone];
+
+		int count = scene._walkData[i];
+		++i;
+
+		// See how many points there are between the src and dest zones
+		if (!count || count == 255) {
+			// There are none, so just walk to the new zone
+			setWalking();
+		} else {
+			// There are points, so set up a multi-step path between points
+			// to reach the given destination
+			_walkTo.clear();
+
+			if (scene._walkDirectory[_srcZone][_destZone] != -1) {
+				for (int idx = 0; idx < count; ++idx, i += 3) {
+					_walkTo.push(Common::Point(READ_LE_UINT16(&scene._walkData[i]),
+						scene._walkData[i + 2]));
+				}
+			} else {
+				for (int idx = 0; idx < count; ++idx)
+					_walkTo.push(Common::Point());
+
+				for (int idx = count - 1; idx >= 0; --idx, i += 3) {
+					_walkTo[idx].x = READ_LE_UINT16(&scene._walkData[i]);
+					_walkTo[idx].y = scene._walkData[i + 2];
+				}
+			}
+
+			// Start walking
+			_walkDest = _walkTo.top();
+			setWalking();
+		}
+	}
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 8d1953ee20..0393528095 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -59,6 +59,7 @@ private:
 	Sprite &_player;
 	bool _walkLoaded;
 	int _oldWalkSequence;
+	int _srcZone, _destZone;
 public:
 	Common::Point _walkDest;
 	Common::Stack<Common::Point> _walkTo;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 95e8355957..c5cba1b5cd 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -176,7 +176,7 @@ void Scene::freeScene() {
 	_walkData.clear();
 	_cAnim.clear();
 	_bgShapes.clear();
-	_bounds.clear();
+	_zones.clear();
 	_canimShapes.clear();
 
 	for (uint idx = 0; idx < _images.size(); ++idx)
@@ -205,8 +205,8 @@ bool Scene::loadScene(const Common::String &filename) {
 	_ongoingCans = 0;
 
 	// Reset the list of walkable areas
-	_bounds.clear();
-	_bounds.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	_zones.clear();
+	_zones.push_back(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 	_descText.clear();
 	_comments = "";
@@ -311,12 +311,12 @@ bool Scene::loadScene(const Common::String &filename) {
 		Common::SeekableReadStream *boundsStream = !_lzwMode ? rrmStream :
 			decompressLZ(*rrmStream, size);
 
-		_bounds.resize(size / 10);
-		for (uint idx = 0; idx < _bounds.size(); ++idx) {
-			_bounds[idx].left = boundsStream->readSint16LE();
-			_bounds[idx].top = boundsStream->readSint16LE();
-			_bounds[idx].setWidth(boundsStream->readSint16LE());
-			_bounds[idx].setHeight(boundsStream->readSint16LE());
+		_zones.resize(size / 10);
+		for (uint idx = 0; idx < _zones.size(); ++idx) {
+			_zones[idx].left = boundsStream->readSint16LE();
+			_zones[idx].top = boundsStream->readSint16LE();
+			_zones[idx].setWidth(boundsStream->readSint16LE());
+			_zones[idx].setHeight(boundsStream->readSint16LE());
 			boundsStream->skip(2);	// Skip unused scene number field
 		}
 
@@ -328,8 +328,8 @@ bool Scene::loadScene(const Common::String &filename) {
 			error("Invalid scene path data");
 
 		// Load the walk directory
-		for (uint idx1 = 0; idx1 < _bounds.size(); ++idx1) {
-			for (uint idx2 = 0; idx2 < _bounds.size(); ++idx2)
+		for (uint idx1 = 0; idx1 < _zones.size(); ++idx1) {
+			for (uint idx2 = 0; idx2 < _zones.size(); ++idx2)
 				_walkDirectory[idx1][idx2] = rrmStream->readSint16LE();
 		}
 
@@ -1450,4 +1450,38 @@ int Scene::checkForZones(const Common::Point &pt, int zoneType) {
 	return matches;
 }
 
+/**
+ * Check which zone the the given position is located in.
+ */
+int Scene::whichZone(const Common::Point &pt) {
+	for (uint idx = 0; idx < _zones.size(); ++idx) {
+		if (_zones[idx].contains(pt))
+			return idx;
+	}
+
+	return -1;
+}
+
+/**
+ * Returns the index of the closest zone to a given point.
+ */
+int Scene::closestZone(const Common::Point &pt) {
+	int dist = 1000;
+	int zone = -1;
+
+	for (uint idx = 0; idx < _zones.size(); ++idx) {
+		Common::Point zc((_zones[idx].left + _zones[idx].right) / 2,
+			(_zones[idx].top + _zones[idx].bottom) / 2);
+		int d = ABS(zc.x - pt.x) + ABS(zc.y - pt.y);
+
+		if (d < dist) {
+			// Found a closer zone
+			dist = d;
+			zone = idx;
+		}
+	}
+
+	return zone;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 1a9fe7b02c..1b3a730179 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -137,7 +137,7 @@ public:
 	int _invGraphicItems;
 	Common::String _comments;
 	Common::Array<char> _descText;
-	Common::Array<Common::Rect> _bounds;
+	Common::Array<Common::Rect> _zones;
 	Common::Array<Object> _bgShapes;
 	Common::Array<CAnim> _cAnim;
 	Common::Array<byte> _sequenceBuffer;
@@ -179,6 +179,10 @@ public:
 	int findBgShape(const Common::Rect &r);
 
 	int checkForZones(const Common::Point &pt, int zoneType);
+
+	int whichZone(const Common::Point &pt);
+
+	int closestZone(const Common::Point &pt);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a9de32972f..107dee5a41 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -100,6 +100,9 @@ Common::Error SherlockEngine::run() {
 		if (shouldQuit())
 			break;
 
+		// Reset UI flags
+		_ui->reset();
+
 		// Reset the active characters to initially just Sherlock
 		_people->reset();
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 661604e4bf..fc94cc5a5c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -82,6 +82,12 @@ UserInterface::~UserInterface() {
 	delete _controls;
 }
 
+void UserInterface::reset() {
+	_oldKey = -1;
+	_help = _oldHelp = -1;
+	_oldTemp = _temp = -1;
+}
+
 /**
  * Main input handler for the user interface
  */
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index d312ff919c..d2ef8942c3 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -95,6 +95,8 @@ public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
 
+	void reset();
+
 	void handleInput();
 
 	void clearInfo();
-- 
cgit v1.2.3


From fc7f8024beb4e3a0ee2b6def649ca1a3e91fa899 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Mar 2015 08:16:59 -0400
Subject: SHERLOCK: Fixes to scene loading

---
 engines/sherlock/objects.cpp |  8 ++++----
 engines/sherlock/scene.cpp   |  8 +++++++-
 engines/sherlock/screen.cpp  | 20 ++++++++++++--------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index e0a24c5b7d..cdd397f23c 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -381,10 +381,10 @@ void UseType::synchronize(Common::SeekableReadStream &s) {
 		_names[idx] = Common::String(buffer);
 	}
 
-	_useFlag = s.readUint16LE();
-	_dFlag[0] = s.readUint16LE();
-	_lFlag[0] = s.readUint16LE();
-	_lFlag[1] = s.readUint16LE();
+	_useFlag = s.readSint16LE();
+	_dFlag[0] = s.readSint16LE();
+	_lFlag[0] = s.readSint16LE();
+	_lFlag[1] = s.readSint16LE();
 
 	s.read(buffer, 12);
 	_target = Common::String(buffer);
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index c5cba1b5cd..1b7a1a9cd2 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -601,7 +601,13 @@ void Scene::transitionToScene() {
 	} else {
 		// It's canimation information
 		cAnimNum = _hsavedFs - 101;
+	}
+
+	// Reset positioning for next load
+	_hsavedPos = Common::Point(-1, -1);
+	_hsavedFs = -1;
 
+	if (cAnimNum != -1) {
 		// Prevent Holmes from being drawn
 		people[PLAYER]._position = Common::Point(0, 0);
 	}
@@ -1166,7 +1172,7 @@ void Scene::doBgAnim() {
 		else if (people[AL]._type == REMOVE)
 			screen._backBuffer.blitFrom(screen._backBuffer2, pt, bounds);
 
-		for (uint idx = 0; _bgShapes.size(); ++idx) {
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
 			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
 				screen.restoreBackground(bounds);
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index e0eab428a8..7c222f3e24 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -246,11 +246,13 @@ void Screen::verticalTransition() {
  * Copies a section of the second back buffer into the main back buffer
  */
 void Screen::restoreBackground(const Common::Rect &r) {
-	Common::Rect tempRect = r;
-	tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	if (r.width() > 0 && r.height() > 0) {
+		Common::Rect tempRect = r;
+		tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 
-	if (tempRect.isValidRect())
-		_backBuffer.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
+		if (tempRect.isValidRect())
+			_backBuffer.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
+	}
 }
 
 /**
@@ -264,11 +266,13 @@ void Screen::slamArea(int16 xp, int16 yp, int16 w, int16 h) {
  * Copies a given area to the screen
  */
 void Screen::slamRect(const Common::Rect &r) {
-	Common::Rect tempRect = r;
-	tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	if (r.width() && r.height() > 0) {
+		Common::Rect tempRect = r;
+		tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
-	if (tempRect.isValidRect())
-		blitFrom(_backBuffer, Common::Point(tempRect.left, tempRect.top), tempRect);
+		if (tempRect.isValidRect())
+			blitFrom(_backBuffer, Common::Point(tempRect.left, tempRect.top), tempRect);
+	}
 }
 
 /**
-- 
cgit v1.2.3


From b280d72ab8de6f6fe77d0957de1b651b9fdb264c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Mar 2015 22:23:53 -0400
Subject: SHERLOCK: Sprite positioning fixes

---
 engines/sherlock/objects.cpp        | 2 +-
 engines/sherlock/scene.cpp          | 5 ++++-
 engines/sherlock/screen.cpp         | 8 ++++++--
 engines/sherlock/user_interface.cpp | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index cdd397f23c..7e72eff1e9 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -613,7 +613,7 @@ void Object::checkObject(Object &o) {
 					if (pt.y > 128)
 						pt.y = (pt.y - 128) * -1;
 					else
-						pt.y;
+						pt.y--;
 
 					_delta = pt;
 					_frameNumber += 2;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 1b7a1a9cd2..b00e07a8a7 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1330,7 +1330,8 @@ void Scene::doBgAnim() {
 				));
 			} else {
 				screen.flushImage(people[AL]._imageFrame,
-					Common::Point(people[AL]._position.x / 100, people[AL]._position.y / 100),
+					Common::Point(people[AL]._position.x / 100, 
+						people[AL]._position.y / 100 - people[AL].frameHeight()),
 					&people[AL]._oldPosition.x, &people[AL]._oldPosition.y,
 					&people[AL]._oldSize.x, &people[AL]._oldSize.y);
 			}
@@ -1370,8 +1371,10 @@ void Scene::doBgAnim() {
 					screen.slamArea(o._position.x, o._position.y, o._oldSize.x, o._oldSize.y);
 					screen.slamArea(o._oldPosition.x, o._oldPosition.y, o._oldSize.x, o._oldSize.y);
 				} else if (o._type == HIDE_SHAPE) {
+					// Hiding shape, so flush it out and mark it as hidden
 					screen.flushImage(o._imageFrame, o._position,
 						&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+					o._type = HIDDEN;
 				}
 			}
 		}
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 7c222f3e24..098d43e827 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -287,8 +287,12 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
 
 	// See if the areas of the old and new overlap, and if so combine the areas
 	if (newBounds.intersects(oldBounds)) {
-		newBounds.extend(oldBounds);
-		slamRect(newBounds);
+		Common::Rect mergedBounds = newBounds;
+		mergedBounds.extend(oldBounds);
+		mergedBounds.right += 1;
+		mergedBounds.bottom += 1;
+
+		slamRect(mergedBounds);
 	} else {
 		// The two areas are independent, so copy them both
 		slamRect(newBounds);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index fc94cc5a5c..b0ac0b169b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -176,7 +176,7 @@ void UserInterface::handleInput() {
 					_help = _oldHelp;
 				}
 
-				if (_bgFound != _oldBgFound) {
+				if (_bgFound != _oldBgFound || _oldBgFound == -1) {
 					_infoFlag = true;
 					clearInfo();
 
@@ -438,8 +438,8 @@ void UserInterface::toggleButton(int num) {
  */
 void UserInterface::clearInfo() {
 	if (_infoFlag) {
-		_vm->_screen->bar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 20, 
-			INFO_LINE + 9), INFO_BLACK);
+		_vm->_screen->bar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19, 
+			INFO_LINE + 10), INFO_BLACK);
 		_infoFlag = false;
 		_oldLook = -1;
 	}
-- 
cgit v1.2.3


From 94d79c0ed36269fe1c7bbf08871329d166acc2f0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Mar 2015 22:41:42 -0400
Subject: SHERLOCK: Fix restoring background before drawing new sprites

---
 engines/sherlock/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index b00e07a8a7..0cb6d7721b 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1175,7 +1175,7 @@ void Scene::doBgAnim() {
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
 			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
-				screen.restoreBackground(bounds);
+				screen.restoreBackground(o.getOldBounds());
 		}
 
 		if (people._portraitLoaded)
-- 
cgit v1.2.3


From a8350c48e93143dd2d6344efce1b36c4e2eb34be Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Mar 2015 22:56:56 -0400
Subject: SHERLOCK: Fix display of hotspot tooltips

---
 engines/sherlock/user_interface.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index b0ac0b169b..bcf460a821 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -173,7 +173,7 @@ void UserInterface::handleInput() {
 					if (_help != -1)
 						depressButton(_help);
 
-					_help = _oldHelp;
+					_oldHelp = _help;
 				}
 
 				if (_bgFound != _oldBgFound || _oldBgFound == -1) {
@@ -185,6 +185,8 @@ void UserInterface::handleInput() {
 						screen.print(Common::Point(0, INFO_LINE + 1),
 						INFO_FOREGROUND, INFO_BACKGROUND, "%s",
 						scene._bgShapes[_bgFound]._description);
+
+					_oldBgFound = _bgFound;
 				}
 			} else {
 				// We're not in STD_MODE
-- 
cgit v1.2.3


From 0f52dcc561fbe05816452d2a20b3f09f6cd9e0fa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Mar 2015 23:07:56 -0400
Subject: SHERLOCK: Highlight default action button when highlighting hotspots

---
 engines/sherlock/user_interface.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index bcf460a821..df3ac9352c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -371,8 +371,7 @@ void UserInterface::restoreButton(int num) {
 
 	screen._backBuffer.blitFrom(screen._backBuffer2, pt,
 		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
-	screen._backBuffer.blitFrom(screen._backBuffer, pt,
-		Common::Rect(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h));
+	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);
 	
 	if (!_menuCounter) {
 		_infoFlag++;
-- 
cgit v1.2.3


From 5e45abcca4b76955cc0ebcfa54a1b9f9be12bfa0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 26 Mar 2015 21:40:24 -0400
Subject: SHERLOCK: Implemented printObjectDesc

---
 engines/sherlock/inventory.cpp      |   6 +-
 engines/sherlock/inventory.h        |   4 +-
 engines/sherlock/objects.cpp        |  10 +-
 engines/sherlock/objects.h          |   6 +-
 engines/sherlock/scene.cpp          |  53 +-------
 engines/sherlock/scene.h            |   6 +-
 engines/sherlock/screen.cpp         |  22 +++-
 engines/sherlock/screen.h           |  16 ++-
 engines/sherlock/user_interface.cpp | 252 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/user_interface.h   |  16 +++
 10 files changed, 316 insertions(+), 75 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 2a277a6331..e103213eb5 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -36,7 +36,7 @@ Inventory::~Inventory() {
 	freeGraphics();
 }
 
-void Inventory::freeInventory() {
+void Inventory::freeInv() {
 	freeGraphics();
 
 	_names.clear();
@@ -116,4 +116,8 @@ int Inventory::findInv(const Common::String &name) {
 	return result;
 }
 
+void Inventory::putInv(int slamit) {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index e561f0318a..01a325e382 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -54,13 +54,15 @@ public:
 	Inventory(SherlockEngine *vm);
 	~Inventory();
 
-	void freeInventory();
+	void freeInv();
 
 	void loadInv();
 
 	void loadGraphics();
 
 	int findInv(const Common::String &name);
+
+	void putInv(int slamit);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 7e72eff1e9..39a9cf8014 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -404,11 +404,11 @@ void Object::setVm(SherlockEngine *vm) {
  * Load the object data from the passed stream
  */
 void Object::synchronize(Common::SeekableReadStream &s) {
-	char buffer[12];
+	char buffer[41];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
-
-	s.read(_description, 41);
+	s.read(buffer, 41);
+	_description = Common::String(buffer);
 
 	_examine.clear();
 	_sequences = nullptr;
@@ -851,14 +851,14 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 		int messageNum = atoi(name.c_str() + 1);
 		ui._infoFlag++;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, INFO_BACKGROUND,
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
 			(*messages)[messageNum].c_str());
 		ui._menuCounter = 25;
 	} else if (name.hasPrefix("@")) {
 		// Message attached to canimation
 		ui._infoFlag++;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, INFO_BACKGROUND,
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
 			"%s", name.c_str() + 1);
 		printed = true;
 		ui._menuCounter = 25;
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 4944681ab3..26ad1d3900 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -123,8 +123,8 @@ public:
 };
 
 struct ActionType {
-	char _cAnimNum;
-	char _cAnimSpeed;				// if high bit set, play in reverse
+	int8 _cAnimNum;
+	uint8 _cAnimSpeed;				// if high bit set, play in reverse
 	Common::String _names[4];
 
 	void synchronize(Common::SeekableReadStream &s);
@@ -155,7 +155,7 @@ public:
 	static void setVm(SherlockEngine *vm);
 public:
 	Common::String _name;			// Name
-	char _description[41];			// Description lines
+	Common::String _description;	// Description lines
 	Common::String _examine;		// Examine in-depth description
 	int _sequenceOffset;
 	uint8 *_sequences;				// Holds animation sequences
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 0cb6d7721b..6442538794 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -162,7 +162,7 @@ void Scene::selectScene() {
  */
 void Scene::freeScene() {
 	_vm->_talk->freeTalkVars();
-	_vm->_inventory->freeInventory();
+	_vm->_inventory->freeInv();
 	_vm->_sound->freeSong();
 	_vm->_sound->freeLoadedSounds();
 
@@ -849,6 +849,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	People &people = *_vm->_people;
 	Resources &res = *_vm->_res;
 	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
 	Common::Point tpPos, walkPos;
 	int tpDir, walkDir;
 	int tFrames = 0;
@@ -993,7 +994,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 
 		while (--frames) {
 			if (frames == pauseFrame)
-				printObjDesc(_cAnimStr, true);
+				ui.printObjectDesc();
 
 			doBgAnim();
 
@@ -1048,54 +1049,6 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	return 1;
 }
 
-/**
- * Print the description of an object
- */
-void Scene::printObjDesc(const Common::String &str, bool firstTime) {
-	/* TODO
-	
-	Events &events = *_vm->_events;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-	int savedSelector;
-
-	if (str.hasPrefix("_")) {
-		_lookScriptFlag = true;
-		events.setCursor(MAGNIFY);
-		savedSelector = _selector;
-		talk.talkTo(str.c_str() + 1);
-		_lookScriptFlag = false;
-
-		if (talk._talkToAbort) {
-			events.setCursor(ARROW);
-			return;
-		}
-
-		// Check if looking at an inventory object
-		if (!_invLookFlag) {
-			// See if this look was called by a right button click or not
-			if (!_lookHelp) {
-				// If it wasn't a right button click, then we need depress 
-				// the look button before we close the window. So save a copy of the
-				// menu area, and draw the controls onto it
-				Surface tempSurface((*_controls)[0]._frame->w, (*_controls)[0]._frame->h);
-				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
-					Common::Rect(MENU_POINTS[0][0], MENU_POINTS[0][1],
-					MENU_POINTS[0][0] + tempSurface.w, MENU_POINTS[0][1] + tempSurface.h));
-				screen._backBuffer2.transBlitFrom((*_controls)[0]._frame,
-					Common::Point(MENU_POINTS[0][0], MENU_POINTS[0][1]));
-				
-				banishWindow(1);
-				events.setCursor(MAGNIFY);
-
-			}
-		}
-	}
-
-	// TODO
-	*/
-}
-
 /**
  * Animate all objects and people.
  */
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 1b3a730179..27313e34af 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -96,10 +96,7 @@ class Scene {
 private:
 	SherlockEngine *_vm;
 	Common::String _rrmName;
-	int _cAnimFramePause;
-	Common::String _cAnimStr;
 	InvMode _invMode;
-	bool _lookScriptFlag;
 	int _selector;
 	bool _invLookFlag;
 	bool _lookHelp;
@@ -154,6 +151,7 @@ public:
 	int _animating;
 	bool _doBgAnimDone;
 	int _tempFadeStyle;
+	int _cAnimFramePause;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
@@ -166,8 +164,6 @@ public:
 
 	Exit *checkForExit(const Common::Rect &r);
 
-	void printObjDesc(const Common::String &str, bool firstTime);
-
 	int startCAnim(int cAnimNum, int playRate);
 
 	int toggleObject(const Common::String &name);
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 098d43e827..646802094f 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -309,7 +309,7 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
  * Prints the text passed onto the back buffer at the given position and color.
  * The string is then blitted to the screen
  */
-void Screen::print(const Common::Point &pt, int fgColor, int bgColor, const char *format, ...) {
+void Screen::print(const Common::Point &pt, int color, const char *format, ...) {
 	// Create the string to display
 	char buffer[100];
 	va_list args;
@@ -334,12 +334,30 @@ void Screen::print(const Common::Point &pt, int fgColor, int bgColor, const char
 		textBounds.moveTo(textBounds.left, SHERLOCK_SCREEN_HEIGHT - _fontHeight);
 
 	// Write out the string at the given position
-	writeString(str, Common::Point(textBounds.left, textBounds.top), fgColor);
+	writeString(str, Common::Point(textBounds.left, textBounds.top), color);
 
 	// Copy the affected area to the screen
 	slamRect(textBounds);
 }
 
+/**
+ * Print a strings onto the back buffer without blitting it to the screen
+ */
+void Screen::gPrint(const Common::Point &pt, int color, const char *format, ...) {
+	// Create the string to display
+	char buffer[100];
+	va_list args;
+
+	va_start(args, format);
+	vsprintf(buffer, format, args);
+	va_end(args);
+	Common::String str(buffer);
+
+	// Print the text
+	writeString(str, pt, color);
+}
+
+
 /**
  * Returns the width of a string in pixels
  */
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 239067b1cc..45a50e7e85 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -35,10 +35,15 @@ namespace Sherlock {
 #define PALETTE_COUNT 256
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
 
-#define INFO_BLACK 1
-#define INFO_FOREGROUND 11
-#define INFO_BACKGROUND 1
-
+enum {
+	INFO_BLACK = 1,
+	INFO_FOREGROUND = 11,
+	INFO_BACKGROUND = 1,
+	BORDER_COLOR = 237,
+	INV_FOREGROUND = 14,
+	INV_BACKGROUND = 1,
+	COM_FOREGROUND = 15
+};
 
 class SherlockEngine;
 
@@ -85,7 +90,8 @@ public:
 
 	void verticalTransition();
 
-	void print(const Common::Point &pt, int fgColor, int bgColor, const char *format, ...);
+	void print(const Common::Point &pt, int color, const char *format, ...);
+	void gPrint(const Common::Point &pt, int color, const char *format, ...);
 
 	void restoreBackground(const Common::Rect &r);
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index df3ac9352c..b0388b4e29 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -54,6 +54,8 @@ const int INVENTORY_POINTS[8][3] = {
 };
 
 const char COMMANDS[13] = "LMTPOCIUGJFS";
+const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
+const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
 
 /*----------------------------------------------------------------*/
 
@@ -74,6 +76,11 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_keyboardInput = false;
 	_invMode = 0;
 	_pause = false;
+	_cNum = 0;
+	_selector = _oldSelector = -1;
+	_windowBounds = Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH - 1,
+		SHERLOCK_SCREEN_HEIGHT - 1);
+	_windowStyle = 0;
 
 	_controls = new ImageFile("menu.all");
 }
@@ -183,8 +190,7 @@ void UserInterface::handleInput() {
 					if (_help != -1 && (scene._bgShapes[_bgFound]._description[0] != 32 &&
 							scene._bgShapes[_bgFound]._description[0]))
 						screen.print(Common::Point(0, INFO_LINE + 1),
-						INFO_FOREGROUND, INFO_BACKGROUND, "%s",
-						scene._bgShapes[_bgFound]._description);
+						INFO_FOREGROUND, scene._bgShapes[_bgFound]._description.c_str());
 
 					_oldBgFound = _bgFound;
 				}
@@ -457,8 +463,53 @@ void UserInterface::whileMenuCounter() {
 	}
 }
 
+/**
+ * Creates a text window and uses it to display the in-depth description
+ * of the highlighted object
+ */
 void UserInterface::examine() {
-	// TODO
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+	Common::Point pt = events.mousePos();
+	int canimSpeed;
+
+	if (pt.y < (CONTROLS_Y + 9)) {
+		Object &obj = scene._bgShapes[_bgFound];
+		
+		if (obj._lookcAnim != 0) {
+			canimSpeed = ((obj._lookcAnim & 0xe0) >> 5) + 1;
+			scene._cAnimFramePause = obj._lookFrames;
+			_cAnimStr = obj._examine;
+			_cNum = (obj._lookcAnim & 0x1f) - 1;
+
+			scene.startCAnim(_cNum, canimSpeed);
+		} else if (obj._lookPosition.y != 0) {
+			// Need to walk to the object to be examined
+			people.walkToCoords(obj._lookPosition, obj._lookFacing);
+		}
+
+		if (talk._talkToAbort) {
+			_cAnimStr = obj._examine;
+			if (obj._lookFlag)
+				_vm->setFlags(obj._lookFlag);
+		}
+	} else {
+		// Looking at an inventory item
+		_cAnimStr = inv[_selector]._examine;
+		if (inv[_selector]._lookFlag)
+			_vm->setFlags(inv[_selector]._lookFlag);
+	}
+
+	if (!talk._talkToAbort) {
+		if (!scene._cAnimFramePause)
+			printObjectDesc(_cAnimStr, true);
+		else
+			// description was already printed in startCAnimation
+			scene._cAnimFramePause = 0;
+	}
 }
 
 void UserInterface::lookScreen(const Common::Point &pt) {
@@ -497,4 +548,199 @@ void UserInterface::doTalkControl() {
 	// TODO
 }
 
+
+/**
+* Print the description of an object
+*/
+void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	int savedSelector;
+
+	if (str.hasPrefix("_")) {
+		_lookScriptFlag = true;
+		events.setCursor(MAGNIFY);
+		savedSelector = _selector;
+		talk.talkTo(str.c_str() + 1);
+		_lookScriptFlag = false;
+
+		if (talk._talkToAbort) {
+			events.setCursor(ARROW);
+			return;
+		}
+
+		// Check if looking at an inventory object
+		if (!_invLookFlag) {
+			// See if this look was called by a right button click or not
+			if (!_lookHelp) {
+				// If it wasn't a right button click, then we need depress 
+				// the look button before we close the window. So save a copy of the
+				// menu area, and draw the controls onto it
+				Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h);
+				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
+
+				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
+					Common::Rect(pt.x, pt.y, pt.x + tempSurface.w, pt.y + tempSurface.h));
+				screen._backBuffer2.transBlitFrom((*_controls)[0]._frame, pt);
+
+				banishWindow(1);
+				events.setCursor(MAGNIFY);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+				_temp = _oldTemp = 0;
+				_menuMode = LOOK_MODE;
+				events.clearEvents();
+
+				screen._backBuffer2.blitFrom(tempSurface, pt);
+			} else {
+				events.setCursor(ARROW);
+				banishWindow(true);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = -1;
+				_temp = _oldTemp = 0;
+				_menuMode = STD_MODE;
+				_lookHelp = 0;
+				events.clearEvents();
+			}
+		} else {
+			// Looking at an inventory object
+			_selector = _oldSelector = savedSelector;
+
+			// Reload the inventory graphics and draw the inventory
+			inv.loadInv();
+			inv.putInv(2);
+			inv.freeInv();
+			banishWindow(1);
+
+			_windowBounds.top = CONTROLS_Y1;
+			_key = _oldKey = COMMANDS[INV_MODE - 1];
+			_temp = _oldTemp = 0;
+			events.clearEvents();
+
+			_invLookFlag = 0;
+			_menuMode = INV_MODE;
+			_windowOpen = true;
+		}
+
+		return;
+	}
+
+	if (firstTime) {
+		// Only draw the border on the first call
+		_infoFlag = true;
+		clearInfo();
+
+		screen.bar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+			CONTROLS_Y1 + 10), BORDER_COLOR);
+		screen.bar(Common::Rect(0, CONTROLS_Y + 10, 1, SHERLOCK_SCREEN_HEIGHT - 1),
+			BORDER_COLOR);
+		screen.bar(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 10, 
+			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen.bar(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	}
+
+	// Clear background
+	screen.bar(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2,
+		SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+
+	_windowBounds.top = CONTROLS_Y;
+	events.clearEvents();
+
+	bool endOfStr = false;
+	const char *msgP = str.c_str();
+	for (int lineNum = 0; lineNum < 5 && !endOfStr; ++lineNum) {
+		int width = 0;
+		const char *lineStartP = msgP;
+
+		// Determine how much can be displayed on the line
+		do {
+			width += screen.charWidth(*msgP++);
+		} while (width < 300 && *msgP);
+		
+		if (*msgP)
+			--msgP;
+		else
+			endOfStr = true;
+
+		// If the line needs to be wrapped, scan backwards to find
+		// the end of the previous word as a splitting point
+		if (width >= 300) {
+			while (*msgP != ' ')
+				--msgP;
+			endOfStr = false;
+		}
+
+		// Print out the line
+		Common::String line(lineStartP, msgP);
+		screen.gPrint(Common::Point(16, CONTROLS_Y + 12 + lineNum * 9),
+			INV_FOREGROUND, line.c_str());
+	}
+
+	// Handle display depending on whether all the message was shown
+	if (!endOfStr) {
+		makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
+			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2,
+			PRESS_KEY_FOR_MORE);
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
+			screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2, CONTROLS_Y),
+			COM_FOREGROUND, "P");
+		_descStr = msgP;
+	} else {
+		makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
+			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2,
+			PRESS_KEY_FOR_MORE);
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
+			screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, CONTROLS_Y),
+			COM_FOREGROUND, "P");
+		_descStr = "";
+	}
+
+	if (firstTime) {
+		if (!_windowStyle) {
+			screen.slamRect(Common::Rect(0, CONTROLS_Y,
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		}
+		else {
+			Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
+				(SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y) + 10);
+			Common::Rect r(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+
+			tempSurface.blitFrom(screen._backBuffer, Common::Point(0, CONTROLS_Y), r);
+			screen._backBuffer.blitFrom(screen._backBuffer2,
+				Common::Point(0, CONTROLS_Y), r);
+
+			summonWindow();
+		}
+
+		_selector = _oldSelector = -1;
+		_windowOpen = true;
+	} else {
+		screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT));
+	}
+}
+
+/**
+* Print the previously selected object's decription
+*/
+void UserInterface::printObjectDesc() {
+	printObjectDesc(_cAnimStr, true);
+}
+
+void UserInterface::banishWindow(bool flag) {
+	// TODO
+}
+
+void UserInterface::makeButton(const Common::Rect &bounds, int textX,
+		const Common::String &str) {
+	// TODO
+}
+
+void UserInterface::summonWindow() {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index d2ef8942c3..98f6cd21ea 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -64,6 +64,13 @@ private:
 	bool _keyboardInput;
 	int _invMode;
 	bool _pause;
+	int _cNum;
+	int _selector, _oldSelector;
+	Common::String _cAnimStr;
+	bool _lookScriptFlag;
+	Common::Rect _windowBounds;
+	Common::String _descStr;
+	int _windowStyle;
 private:
 	void depressButton(int num);
 
@@ -86,6 +93,12 @@ private:
 	void doMiscControl(int allowed);
 	void doPickControl();
 	void doTalkControl();
+
+	void banishWindow(bool flag);
+
+	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
+
+	void summonWindow();
 public:
 	MenuMode _menuMode;
 	int _menuCounter;
@@ -102,6 +115,9 @@ public:
 	void clearInfo();
 
 	void whileMenuCounter();
+
+	void printObjectDesc(const Common::String &str, bool firstTime);
+	void printObjectDesc();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 9f21575c564cb1aff07f0265a47af59ce31ec93e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 26 Mar 2015 23:10:10 -0400
Subject: SHERLOCK: Implemented banishWindow

---
 engines/sherlock/user_interface.cpp | 97 ++++++++++++++++++++++++++++++++++---
 engines/sherlock/user_interface.h   |  8 +--
 2 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index b0388b4e29..8e5cbb68ef 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -649,6 +649,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	_windowBounds.top = CONTROLS_Y;
 	events.clearEvents();
 
+	// Loop through displaying up to five lines
 	bool endOfStr = false;
 	const char *msgP = str.c_str();
 	for (int lineNum = 0; lineNum < 5 && !endOfStr; ++lineNum) {
@@ -712,7 +713,8 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 			screen._backBuffer.blitFrom(screen._backBuffer2,
 				Common::Point(0, CONTROLS_Y), r);
 
-			summonWindow();
+			// Display the window
+			summonWindow(tempSurface);
 		}
 
 		_selector = _oldSelector = -1;
@@ -730,17 +732,98 @@ void UserInterface::printObjectDesc() {
 	printObjectDesc(_cAnimStr, true);
 }
 
-void UserInterface::banishWindow(bool flag) {
-	// TODO
-}
-
 void UserInterface::makeButton(const Common::Rect &bounds, int textX,
 		const Common::String &str) {
 	// TODO
 }
 
-void UserInterface::summonWindow() {
-	// TODO
+/**
+ * Displays a passed window by gradually displaying it up vertically
+ */
+void UserInterface::summonWindow(const Surface &bgSurface) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+
+	if (_windowOpen)
+		// A window is already open, so can't open another one
+		return;
+
+	// Gradually slide up the display of the window
+	for (int idx = 1; idx <= (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
+		screen.blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
+			Common::Rect(0, 0, bgSurface.w, idx));
+		screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
+			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+		events.delay(10);
+	}
+
+	// Final display of the entire window
+	screen._backBuffer.blitFrom(bgSurface, Common::Point(0, CONTROLS_Y),
+		Common::Rect(0, 0, bgSurface.w, bgSurface.h));
+	screen.slamArea(0, CONTROLS_Y, bgSurface.w, bgSurface.h);
+
+	_windowOpen = true;
+}
+
+/**
+ * Close a currently open window
+ * @param flag	0 = slide old window down, 1 = slide old window up
+ */
+void UserInterface::banishWindow(bool flag) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+
+	if (_windowOpen) {
+		if (!flag || !_windowStyle) {
+			// Slide window up
+			// Only slide the window up if the window style allows it
+			if (_windowStyle) {
+				for (int idx = 2; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
+					byte *pSrc = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y);
+					Common::copy(pSrc, pSrc + (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y + idx)
+						* SHERLOCK_SCREEN_WIDTH, pSrc - SHERLOCK_SCREEN_WIDTH * 2);
+					screen._backBuffer.blitFrom(screen._backBuffer2,
+						Common::Point(0, CONTROLS_Y),
+						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_HEIGHT, CONTROLS_Y + idx));
+
+					screen.slamArea(0, CONTROLS_Y + idx - 2, SHERLOCK_SCREEN_WIDTH, 
+						SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y - idx + 2);
+					events.delay(10);
+				}
+
+				// Restore final two old lines
+				screen._backBuffer.blitFrom(screen._backBuffer2,
+					Common::Point(0, SHERLOCK_SCREEN_HEIGHT - 2),
+					Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 2,
+						SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - 2, SHERLOCK_SCREEN_WIDTH, 2);
+			} else {
+				// Restore old area to completely erase window
+				screen._backBuffer.blitFrom(screen._backBuffer2,
+					Common::Point(0, CONTROLS_Y),
+					Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+					SHERLOCK_SCREEN_HEIGHT));
+			}
+		} else {
+			for (int idx = SHERLOCK_SCREEN_HEIGHT - 1 - CONTROLS_Y1; idx >= 0; idx -= 2) {
+				byte *pSrc = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y1 + idx);
+				byte *pDest = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y1);
+
+				Common::copy(pSrc, pSrc + (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1 - idx)
+					* SHERLOCK_SCREEN_WIDTH, pDest);
+				screen.slamArea(0, CONTROLS_Y1 + idx, SHERLOCK_SCREEN_WIDTH,
+					SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1 - idx);
+				events.delay(10);
+			}
+		}
+
+		_infoFlag = false;
+		_windowOpen = false;
+	}
+
+	_menuMode = STD_MODE;
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 98f6cd21ea..291aa1e9d2 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/events.h"
+#include "sherlock/graphics.h"
 #include "sherlock/resources.h"
 
 namespace Sherlock {
@@ -94,11 +95,7 @@ private:
 	void doPickControl();
 	void doTalkControl();
 
-	void banishWindow(bool flag);
-
 	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
-
-	void summonWindow();
 public:
 	MenuMode _menuMode;
 	int _menuCounter;
@@ -118,6 +115,9 @@ public:
 
 	void printObjectDesc(const Common::String &str, bool firstTime);
 	void printObjectDesc();
+
+	void summonWindow(const Surface &bgSurface);
+	void banishWindow(bool flag);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 4fad808aad87bc15827eed180f395c04c260e447 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Mar 2015 08:36:04 -0400
Subject: SHERLOCK: Implemented doMainControl

---
 engines/sherlock/events.cpp         |   8 ++
 engines/sherlock/events.h           |   1 +
 engines/sherlock/inventory.cpp      |   4 +
 engines/sherlock/inventory.h        |   2 +
 engines/sherlock/user_interface.cpp | 191 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/user_interface.h   |   4 +
 6 files changed, 208 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index a6b3c899cb..5c94b7e1ff 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -191,6 +191,14 @@ void Events::clearEvents() {
 	_oldButtons = _oldRightButton = false;
 }
 
+/**
+ * Clear any pending keyboard inputs
+ */
+void Events::clearKeyboard() {
+	_pendingKeys.clear();
+}
+
+
 /**
  * Delay for a given number of game frames, where each frame is 1/60th of a second
  */
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 1c5fbc5be4..c3bdaf5a93 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -85,6 +85,7 @@ public:
 	Common::KeyState getKey() { return _pendingKeys.pop(); }
 
 	void clearEvents();
+	void clearKeyboard();
 
 	void wait(int numFrames);
 
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index e103213eb5..a05ec6f359 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -120,4 +120,8 @@ void Inventory::putInv(int slamit) {
 	// TODO
 }
 
+void Inventory::invent(int flag) {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 01a325e382..6d61378b99 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -63,6 +63,8 @@ public:
 	int findInv(const Common::String &name);
 
 	void putInv(int slamit);
+
+	void invent(int flag);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 8e5cbb68ef..2827e80b78 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -528,12 +528,188 @@ void UserInterface::doInvControl() {
 	// TODO
 }
 
+/**
+ * Handles waiting whilst an object's description window is open. 
+ */
 void UserInterface::doLookControl() {
-	// TODO
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+
+	_key = _oldKey = -1;	
+	_keyboardInput = _keycode != Common::KEYCODE_INVALID;
+
+	if (events._released || events._rightReleased || _keyboardInput) {
+		// Is an inventory object being looked at?
+		if (!_invLookFlag) {
+			// Is there any remaining text to display?
+			if (!_descStr.empty()) {
+				printObjectDesc(_descStr, false);
+			} else if (!_lookHelp) {
+				// Need to close the window and depress the Look button 
+				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
+				Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h);
+				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
+					Common::Rect(pt.x, pt.y, pt.x + (*_controls)[0]._frame.w,
+					pt.y + (*_controls)[1]._frame.h));
+
+				screen._backBuffer2.blitFrom((*_controls)[0]._frame, pt);
+				banishWindow(true);
+
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+				_temp = _oldTemp = 0;
+				_menuMode = LOOK_MODE;
+				events.clearEvents();
+
+				screen._backBuffer2.blitFrom(tempSurface, pt);
+			}
+		} else {
+			// Looking at an inventory object
+			// Backup the user interface
+			Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1);
+			tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
+				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+			inv.invent(128);
+			banishWindow(true);
+
+			// Restore the ui
+			screen._backBuffer2.blitFrom(tempSurface, Common::Point(0, CONTROLS_Y1));
+		}
+
+		_windowBounds.top = CONTROLS_Y1;
+		_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+		_temp = _oldTemp = 0;
+		events.clearEvents();
+		_invLookFlag = false;
+		_menuMode = INV_MODE;
+		_windowOpen = true;
+	}
 }
 
+/**
+ * Handles input until one of the user interface buttons/commands is selected
+ */
 void UserInterface::doMainControl() {
-	// TODO
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Common::Point pt = events.mousePos();
+
+	if ((events._pressed || events._released) && pt.y > CONTROLS_Y) {
+		events.clearKeyboard();
+		_key = -1;
+
+		// Check whether the mouse is in any of the command areas
+		for (_temp = 0; (_temp < 12) && (_key == -1); ++_temp) {
+			Common::Rect r(MENU_POINTS[_temp][0], MENU_POINTS[_temp][1],
+				MENU_POINTS[_temp][2], MENU_POINTS[_temp][3]);
+			if (r.contains(pt))
+				_key = COMMANDS[_temp];
+		}
+		--_temp;
+	} else if (_keycode != Common::KEYCODE_INVALID) {
+		// Keyboard control
+		_keyboardInput = true;
+
+		if (_keycode >= Common::KEYCODE_a && _keycode <= Common::KEYCODE_z) {
+			const char *c = strchr(COMMANDS, _keycode);
+			_temp = !c ? 12 : c - COMMANDS;
+		} else {
+			_temp = 12;
+		}
+
+		if (_temp == 12)
+			_key = -1;
+		
+		if (events._rightPressed) {
+			_temp = 12;
+			_key = -1;
+		}
+	} else if (!events._released) {
+		_key = -1;
+	}
+	
+	// Check if the button being pointed to has changed
+	if (_oldKey != _key && !_windowOpen) {
+		// Clear the info line
+		_infoFlag++;
+		clearInfo();
+
+		// If there was an old button selected, restore it
+		if (_oldKey != -1) {
+			_menuMode = STD_MODE;
+			restoreButton(_oldTemp);
+		}
+
+		// If a new button is being pointed to, highlight it
+		if (_key != -1 && _temp < 12 && !_keyboardInput)
+			depressButton(_temp);
+
+		// Save the new button selection
+		_oldKey = _key;
+		_oldTemp = _temp;
+	}
+
+	if (!events._pressed && !_windowOpen) {
+		switch (_key) {
+		case 'L':
+			toggleButton(0);
+			break;
+		case 'M':
+			toggleButton(1);
+			break;
+		case 'T':
+			toggleButton(2);
+			break;
+		case 'P':
+			toggleButton(3);
+			break;
+		case 'O':
+			toggleButton(4);
+			break;
+		case 'C':
+			toggleButton(5);
+			break;
+		case 'I':
+			pushButton(6);
+			_selector = _oldSelector = -1;
+			_menuMode = INV_MODE;
+			inv.invent(1);
+			break;
+		case 'U':
+			pushButton(7);
+			_selector = _oldSelector = -1;
+			_menuMode = USE_MODE;
+			inv.invent(2);
+			break;
+		case 'G':
+			pushButton(8);
+			_selector = _oldSelector = -1;
+			_menuMode = GIVE_MODE;
+			inv.invent(3);
+			break;
+		case 'J':
+			pushButton(9);
+			_menuMode = JOURNAL_MODE;
+			journalControl();
+			break;
+		case 'F':
+			pushButton(10);
+			_menuMode = FILES_MODE;
+			environment();
+			break;
+		case 'S':
+			pushButton(11);
+			_menuMode = SETUP_MODE;
+			doControls();
+			break;
+		default:
+			break;
+		}
+
+		_help = _oldHelp = _oldBgFound = -1;
+	}
 }
 
 void UserInterface::doMiscControl(int allowed) {
@@ -548,6 +724,17 @@ void UserInterface::doTalkControl() {
 	// TODO
 }
 
+void UserInterface::journalControl() {
+	// TODO
+}
+
+void UserInterface::environment() {
+	// TODO
+}
+
+void UserInterface::doControls() {
+	// TODO
+}
 
 /**
 * Print the description of an object
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 291aa1e9d2..582d6f87ce 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -94,6 +94,10 @@ private:
 	void doMiscControl(int allowed);
 	void doPickControl();
 	void doTalkControl();
+	void journalControl();
+
+	void environment();
+	void doControls();
 
 	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
 public:
-- 
cgit v1.2.3


From 56a854e2292f420a6ab03c65174f9fc0310bc2fa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Mar 2015 19:52:46 -0400
Subject: SHERLOCK: Fixes for examine dialog display

---
 engines/sherlock/events.cpp         |  2 +-
 engines/sherlock/scene.cpp          | 15 ++++++----
 engines/sherlock/scene.h            |  1 -
 engines/sherlock/screen.h           | 18 +++++++-----
 engines/sherlock/user_interface.cpp | 57 ++++++++++++++++++++++++++-----------
 engines/sherlock/user_interface.h   |  5 +++-
 6 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 5c94b7e1ff..fef22c9301 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -186,7 +186,7 @@ bool Events::checkForNextFrameCounter() {
  */
 void Events::clearEvents() {
 	_pendingKeys.clear();
-	_pressed = _rightPressed = false;
+	_pressed = _released = false;
 	_rightPressed = _rightReleased = false;
 	_oldButtons = _oldRightButton = false;
 }
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 6442538794..97f7350ea9 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -106,12 +106,9 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_animating = 0;
 	_doBgAnimDone = true;
 	_tempFadeStyle = 0;
-
-	_controlPanel = new ImageFile("controls.vgs");
 }
 
 Scene::~Scene() {
-	delete _controlPanel;
 	freeScene();
 }
 
@@ -198,6 +195,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
 	bool flag;
 
 	freeScene();
@@ -393,9 +391,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	}
 
 	// Clear user interface area and draw controls
-	screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
-	screen._backBuffer.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
-	screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	ui.drawInterface();
 
 	_changes = false;
 	checkSceneStatus();
@@ -1074,6 +1070,13 @@ void Scene::doBgAnim() {
 		events.setCursor((CursorId)cursorId);
 	}
 
+	if (ui._menuMode == LOOK_MODE) {
+		if (mousePos.y > CONTROLS_Y1)
+			events.setCursor(ARROW);
+		else if (mousePos.y < CONTROLS_Y)
+			events.setCursor(MAGNIFY);
+	}
+
 	// Check for setting magnifying glass cursor
 	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
 		if (_invMode == INVMODE_1) {
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 27313e34af..007f910b10 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -123,7 +123,6 @@ public:
 	Common::Point _bigPos;
 	Common::Point _overPos;
 	int _charPoint, _oldCharPoint;
-	ImageFile *_controlPanel;
 	int _keyboardInput;
 	int _oldKey, _help, _oldHelp;
 	int _oldTemp, _temp;
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 45a50e7e85..e8f45f7bba 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -36,13 +36,17 @@ namespace Sherlock {
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
 
 enum {
-	INFO_BLACK = 1,
-	INFO_FOREGROUND = 11,
-	INFO_BACKGROUND = 1,
-	BORDER_COLOR = 237,
-	INV_FOREGROUND = 14,
-	INV_BACKGROUND = 1,
-	COM_FOREGROUND = 15
+	INFO_BLACK		= 1,
+	INFO_FOREGROUND	= 11,
+	INFO_BACKGROUND	= 1,
+	BORDER_COLOR	= 237,
+	INV_FOREGROUND	= 14,
+	INV_BACKGROUND	= 1,
+	COMMAND_HIGHLIGHTED = 10,
+	COMMAND_FOREGROUND = 15,
+	BUTTON_TOP = 233,
+	BUTTON_MIDDLE	= 244,
+	BUTTON_BOTTOM	= 248
 };
 
 class SherlockEngine;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 2827e80b78..c15685d82b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -60,6 +60,8 @@ const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
+	_controls = new ImageFile("menu.all");
+	_controlPanel = new ImageFile("controls.vgs");
 	_bgFound = 0;
 	_oldBgFound = -1;
 	_keycode = Common::KEYCODE_INVALID;
@@ -81,12 +83,11 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_windowBounds = Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH - 1,
 		SHERLOCK_SCREEN_HEIGHT - 1);
 	_windowStyle = 0;
-
-	_controls = new ImageFile("menu.all");
 }
 
 UserInterface::~UserInterface() {
 	delete _controls;
+	delete _controlPanel;
 }
 
 void UserInterface::reset() {
@@ -95,6 +96,17 @@ void UserInterface::reset() {
 	_oldTemp = _temp = -1;
 }
 
+/**
+ * Draw the user interface onto the screen's back buffers
+ */
+void UserInterface::drawInterface() {
+	Screen &screen = *_vm->_screen;
+
+	screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
+	screen._backBuffer.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+}
+
 /**
  * Main input handler for the user interface
  */
@@ -137,7 +149,7 @@ void UserInterface::handleInput() {
 					(events._rightPressed || (!_helpStyle && !events._released)) &&
 					(_bgFound != -1) && (_bgFound < 1000) &&
 					(scene._bgShapes[_bgFound]._defaultCommand ||
-					scene._bgShapes[_bgFound]._description[0])) {
+					!scene._bgShapes[_bgFound]._description.empty())) {
 					// If there is no default command, so set it to Look
 					if (scene._bgShapes[_bgFound]._defaultCommand)
 						_help = scene._bgShapes[_bgFound]._defaultCommand - 1;
@@ -151,7 +163,7 @@ void UserInterface::handleInput() {
 					((events._rightReleased && _helpStyle) || (events._released && !_helpStyle)) &&
 					(_bgFound != -1 && _bgFound < 1000) &&
 					(scene._bgShapes[_bgFound]._defaultCommand || 
-					scene._bgShapes[_bgFound]._description[0])) {
+					!scene._bgShapes[_bgFound]._description.empty())) {
 					// If there is no default command, set it to Look
 					if (scene._bgShapes[_bgFound]._defaultCommand)
 						_menuMode = (MenuMode)scene._bgShapes[_bgFound]._defaultCommand;
@@ -491,7 +503,7 @@ void UserInterface::examine() {
 			people.walkToCoords(obj._lookPosition, obj._lookFacing);
 		}
 
-		if (talk._talkToAbort) {
+		if (!talk._talkToAbort) {
 			_cAnimStr = obj._examine;
 			if (obj._lookFlag)
 				_vm->setFlags(obj._lookFlag);
@@ -548,11 +560,6 @@ void UserInterface::doLookControl() {
 			} else if (!_lookHelp) {
 				// Need to close the window and depress the Look button 
 				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
-				Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h);
-				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
-					Common::Rect(pt.x, pt.y, pt.x + (*_controls)[0]._frame.w,
-					pt.y + (*_controls)[1]._frame.h));
-
 				screen._backBuffer2.blitFrom((*_controls)[0]._frame, pt);
 				banishWindow(true);
 
@@ -562,7 +569,8 @@ void UserInterface::doLookControl() {
 				_menuMode = LOOK_MODE;
 				events.clearEvents();
 
-				screen._backBuffer2.blitFrom(tempSurface, pt);
+				// Restore UI
+				drawInterface();
 			}
 		} else {
 			// Looking at an inventory object
@@ -865,6 +873,10 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		Common::String line(lineStartP, msgP);
 		screen.gPrint(Common::Point(16, CONTROLS_Y + 12 + lineNum * 9),
 			INV_FOREGROUND, line.c_str());
+
+		if (!endOfStr)
+			// Start next line at start of the nxet word after space
+			++msgP;
 	}
 
 	// Handle display depending on whether all the message was shown
@@ -874,7 +886,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 			PRESS_KEY_FOR_MORE);
 		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
 			screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2, CONTROLS_Y),
-			COM_FOREGROUND, "P");
+			COMMAND_FOREGROUND, "P");
 		_descStr = msgP;
 	} else {
 		makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
@@ -882,7 +894,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 			PRESS_KEY_FOR_MORE);
 		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
 			screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, CONTROLS_Y),
-			COM_FOREGROUND, "P");
+			COMMAND_FOREGROUND, "P");
 		_descStr = "";
 	}
 
@@ -913,15 +925,28 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 }
 
 /**
-* Print the previously selected object's decription
-*/
+ * Print the previously selected object's decription
+ */
 void UserInterface::printObjectDesc() {
 	printObjectDesc(_cAnimStr, true);
 }
 
+/**
+ * Draws a button for use in the inventory, talk, and examine dialogs.
+ */
 void UserInterface::makeButton(const Common::Rect &bounds, int textX,
 		const Common::String &str) {
-	// TODO
+	Screen &screen = *_vm->_screen;
+
+	screen.bar(Common::Rect(bounds.left, bounds.top, bounds.right, bounds.top + 1), BUTTON_TOP);
+	screen.bar(Common::Rect(bounds.left, bounds.top, bounds.left + 1, bounds.bottom), BUTTON_TOP);
+	screen.bar(Common::Rect(bounds.right - 1, bounds.top, bounds.right, bounds.bottom), BUTTON_BOTTOM);
+	screen.bar(Common::Rect(bounds.left + 1, bounds.bottom - 1, bounds.right, bounds.bottom), BUTTON_BOTTOM);
+	screen.bar(Common::Rect(bounds.left + 1, bounds.top + 1, bounds.right - 1, bounds.bottom - 1), BUTTON_MIDDLE);
+
+	screen.gPrint(Common::Point(textX, bounds.top), COMMAND_HIGHLIGHTED, "%c", str[0]);
+	screen.gPrint(Common::Point(textX + screen.charWidth(str[0]), bounds.top), 
+		COMMAND_FOREGROUND, "%s", str.c_str() + 1);
 }
 
 /**
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 582d6f87ce..f6e0435f48 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -51,6 +51,8 @@ class SherlockEngine;
 class UserInterface {
 private:
 	SherlockEngine *_vm;
+	ImageFile *_controlPanel;
+	ImageFile *_controls;
 	int _bgFound;
 	int _oldBgFound;
 	Common::KeyCode _keycode;
@@ -60,7 +62,6 @@ private:
 	int _key, _oldKey;
 	int _temp, _oldTemp;
 	int _invLookFlag;
-	ImageFile *_controls;
 	int _oldLook;
 	bool _keyboardInput;
 	int _invMode;
@@ -111,6 +112,8 @@ public:
 
 	void reset();
 
+	void drawInterface();
+
 	void handleInput();
 
 	void clearInfo();
-- 
cgit v1.2.3


From e122b752b7faf6a0307e74523771860367f7227e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Mar 2015 22:12:37 -0400
Subject: SHERLOCK: Fix scrolling examine window on-screen

---
 engines/sherlock/screen.cpp         |  2 +-
 engines/sherlock/screen.h           |  2 +-
 engines/sherlock/user_interface.cpp | 40 ++++++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 646802094f..def20612b7 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -403,7 +403,7 @@ void Screen::writeString(const Common::String &str, const Common::Point &pt, int
 /**
  * Fills an area on the back buffer, and then copies it to the screen
  */
-void Screen::bar(const Common::Rect &r, int color) {
+void Screen::vgaBar(const Common::Rect &r, int color) {
 	_backBuffer.fillRect(r, color);
 	slamRect(r);
 }
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index e8f45f7bba..acd122e0e9 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -109,7 +109,7 @@ public:
 
 	int charWidth(char c);
 
-	void bar(const Common::Rect &r, int color);
+	void vgaBar(const Common::Rect &r, int color);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index c15685d82b..6af698baa6 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -82,7 +82,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_selector = _oldSelector = -1;
 	_windowBounds = Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH - 1,
 		SHERLOCK_SCREEN_HEIGHT - 1);
-	_windowStyle = 0;
+	_windowStyle = 1;	// Sliding windows
 }
 
 UserInterface::~UserInterface() {
@@ -457,7 +457,7 @@ void UserInterface::toggleButton(int num) {
  */
 void UserInterface::clearInfo() {
 	if (_infoFlag) {
-		_vm->_screen->bar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19, 
+		_vm->_screen->vgaBar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19,
 			INFO_LINE + 10), INFO_BLACK);
 		_infoFlag = false;
 		_oldLook = -1;
@@ -822,23 +822,24 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		return;
 	}
 
+	Surface &bb = screen._backBuffer;
 	if (firstTime) {
 		// Only draw the border on the first call
 		_infoFlag = true;
 		clearInfo();
 
-		screen.bar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+		bb.fillRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
 			CONTROLS_Y1 + 10), BORDER_COLOR);
-		screen.bar(Common::Rect(0, CONTROLS_Y + 10, 1, SHERLOCK_SCREEN_HEIGHT - 1),
+		bb.fillRect(Common::Rect(0, CONTROLS_Y + 10, 1, SHERLOCK_SCREEN_HEIGHT - 1),
 			BORDER_COLOR);
-		screen.bar(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 10, 
+		bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 10,
 			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-		screen.bar(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH,
+		bb.fillRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH,
 			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
 	}
 
 	// Clear background
-	screen.bar(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2,
+	bb.fillRect(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2,
 		SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
 
 	_windowBounds.top = CONTROLS_Y;
@@ -904,15 +905,17 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 		}
 		else {
+			// Extract the window that's been drawn on the back buffer
 			Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
-				(SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y) + 10);
+				(SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y));
 			Common::Rect r(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+			tempSurface.blitFrom(screen._backBuffer, Common::Point(0, 0), r);
 
-			tempSurface.blitFrom(screen._backBuffer, Common::Point(0, CONTROLS_Y), r);
+			// Remove drawn window with original user interface
 			screen._backBuffer.blitFrom(screen._backBuffer2,
 				Common::Point(0, CONTROLS_Y), r);
 
-			// Display the window
+			// Display the window gradually on-screen
 			summonWindow(tempSurface);
 		}
 
@@ -938,11 +941,12 @@ void UserInterface::makeButton(const Common::Rect &bounds, int textX,
 		const Common::String &str) {
 	Screen &screen = *_vm->_screen;
 
-	screen.bar(Common::Rect(bounds.left, bounds.top, bounds.right, bounds.top + 1), BUTTON_TOP);
-	screen.bar(Common::Rect(bounds.left, bounds.top, bounds.left + 1, bounds.bottom), BUTTON_TOP);
-	screen.bar(Common::Rect(bounds.right - 1, bounds.top, bounds.right, bounds.bottom), BUTTON_BOTTOM);
-	screen.bar(Common::Rect(bounds.left + 1, bounds.bottom - 1, bounds.right, bounds.bottom), BUTTON_BOTTOM);
-	screen.bar(Common::Rect(bounds.left + 1, bounds.top + 1, bounds.right - 1, bounds.bottom - 1), BUTTON_MIDDLE);
+	Surface &bb = screen._backBuffer;
+	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.right, bounds.top + 1), BUTTON_TOP);
+	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.left + 1, bounds.bottom), BUTTON_TOP);
+	bb.fillRect(Common::Rect(bounds.right - 1, bounds.top, bounds.right, bounds.bottom), BUTTON_BOTTOM);
+	bb.fillRect(Common::Rect(bounds.left + 1, bounds.bottom - 1, bounds.right, bounds.bottom), BUTTON_BOTTOM);
+	bb.fillRect(Common::Rect(bounds.left + 1, bounds.top + 1, bounds.right - 1, bounds.bottom - 1), BUTTON_MIDDLE);
 
 	screen.gPrint(Common::Point(textX, bounds.top), COMMAND_HIGHLIGHTED, "%c", str[0]);
 	screen.gPrint(Common::Point(textX + screen.charWidth(str[0]), bounds.top), 
@@ -950,7 +954,7 @@ void UserInterface::makeButton(const Common::Rect &bounds, int textX,
 }
 
 /**
- * Displays a passed window by gradually displaying it up vertically
+ * Displays a passed window by gradually scrolling it vertically on-screen
  */
 void UserInterface::summonWindow(const Surface &bgSurface) {
 	Events &events = *_vm->_events;
@@ -961,8 +965,8 @@ void UserInterface::summonWindow(const Surface &bgSurface) {
 		return;
 
 	// Gradually slide up the display of the window
-	for (int idx = 1; idx <= (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
-		screen.blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
+	for (int idx = 1; idx <= bgSurface.h; idx += 2) {
+		screen._backBuffer.blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
 			Common::Rect(0, 0, bgSurface.w, idx));
 		screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
 			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-- 
cgit v1.2.3


From 5b1ad857b7cd0b6065c01e000dfadb80526a1729 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Mar 2015 23:04:49 -0400
Subject: SHERLOCK: Fix for sliding examine dialog off-screen

---
 engines/sherlock/user_interface.cpp | 45 ++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 6af698baa6..61d6c6a76e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -571,6 +571,14 @@ void UserInterface::doLookControl() {
 
 				// Restore UI
 				drawInterface();
+			} else {
+				events.setCursor(ARROW);
+				banishWindow(true);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = -1;
+				_temp = _oldTemp = 0;
+				_menuMode = STD_MODE;
+				events.clearEvents();
 			}
 		} else {
 			// Looking at an inventory object
@@ -984,24 +992,28 @@ void UserInterface::summonWindow(const Surface &bgSurface) {
 
 /**
  * Close a currently open window
- * @param flag	0 = slide old window down, 1 = slide old window up
+ * @param flag	0 = slide old window down, 1 = slide prior UI back up
  */
 void UserInterface::banishWindow(bool flag) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 
 	if (_windowOpen) {
-		if (!flag || !_windowStyle) {
-			// Slide window up
-			// Only slide the window up if the window style allows it
+		if (flag || !_windowStyle) {
+			// Slide window down
+			// Only slide the window if the window style allows it
 			if (_windowStyle) {
 				for (int idx = 2; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
-					byte *pSrc = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y);
-					Common::copy(pSrc, pSrc + (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y + idx)
-						* SHERLOCK_SCREEN_WIDTH, pSrc - SHERLOCK_SCREEN_WIDTH * 2);
+					// Shift the window down by 2 lines
+					byte *pSrc = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y + idx - 2);
+					byte *pSrcEnd = (byte *)screen._backBuffer.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - 2);
+					byte *pDest = (byte *)screen._backBuffer.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT);
+					Common::copy_backward(pSrc, pSrcEnd, pDest);
+
+					// Restore lines from the ui in the secondary back buffer
 					screen._backBuffer.blitFrom(screen._backBuffer2,
 						Common::Point(0, CONTROLS_Y),
-						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_HEIGHT, CONTROLS_Y + idx));
+						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + idx));
 
 					screen.slamArea(0, CONTROLS_Y + idx - 2, SHERLOCK_SCREEN_WIDTH, 
 						SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y - idx + 2);
@@ -1023,14 +1035,15 @@ void UserInterface::banishWindow(bool flag) {
 					SHERLOCK_SCREEN_HEIGHT));
 			}
 		} else {
-			for (int idx = SHERLOCK_SCREEN_HEIGHT - 1 - CONTROLS_Y1; idx >= 0; idx -= 2) {
-				byte *pSrc = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y1 + idx);
-				byte *pDest = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y1);
-
-				Common::copy(pSrc, pSrc + (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1 - idx)
-					* SHERLOCK_SCREEN_WIDTH, pDest);
-				screen.slamArea(0, CONTROLS_Y1 + idx, SHERLOCK_SCREEN_WIDTH,
-					SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1 - idx);
+			// Slide the original user interface up to cover the dialog
+			for (int idx = 1; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); idx += 2) {
+				byte *pSrc = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1);
+				byte *pSrcEnd = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1 + idx);
+				byte *pDest = (byte *)screen._backBuffer.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - idx);
+				Common::copy(pSrc, pSrcEnd, pDest);
+
+				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - idx, SHERLOCK_SCREEN_WIDTH,
+					SHERLOCK_SCREEN_HEIGHT);
 				events.delay(10);
 			}
 		}
-- 
cgit v1.2.3


From c047009ee10d8de67ee17088aad4ca131d907a8a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Mar 2015 23:10:36 -0400
Subject: SHERLOCK: Fix hotspots working again after examining an object

---
 engines/sherlock/user_interface.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 61d6c6a76e..54c1f8e0fc 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -580,7 +580,8 @@ void UserInterface::doLookControl() {
 				_menuMode = STD_MODE;
 				events.clearEvents();
 			}
-		} else {
+		}
+		else {
 			// Looking at an inventory object
 			// Backup the user interface
 			Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1);
@@ -592,15 +593,15 @@ void UserInterface::doLookControl() {
 
 			// Restore the ui
 			screen._backBuffer2.blitFrom(tempSurface, Common::Point(0, CONTROLS_Y1));
-		}
 
-		_windowBounds.top = CONTROLS_Y1;
-		_key = _oldKey = COMMANDS[LOOK_MODE - 1];
-		_temp = _oldTemp = 0;
-		events.clearEvents();
-		_invLookFlag = false;
-		_menuMode = INV_MODE;
-		_windowOpen = true;
+			_windowBounds.top = CONTROLS_Y1;
+			_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+			_temp = _oldTemp = 0;
+			events.clearEvents();
+			_invLookFlag = false;
+			_menuMode = INV_MODE;
+			_windowOpen = true;
+		}
 	}
 }
 
@@ -900,7 +901,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	} else {
 		makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
 			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2,
-			PRESS_KEY_FOR_MORE);
+			PRESS_KEY_TO_CONTINUE);
 		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
 			screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, CONTROLS_Y),
 			COMMAND_FOREGROUND, "P");
-- 
cgit v1.2.3


From 91df82c3e1599a658a7e4897bebf747e0e7fc189 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 27 Mar 2015 23:24:54 -0400
Subject: SHERLOCK: Fix mouse cursor hotspots

---
 engines/sherlock/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index fef22c9301..d147fe1f4c 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -67,7 +67,7 @@ void Events::setCursor(CursorId cursorId) {
 
 	// Set the cursor data
 	Graphics::Surface &s = (*_cursorImages)[cursorId];
-	CursorMan.replaceCursor(s.getPixels(), s.w, s.h, s.w / 2, s.h / 2, 0xff);
+	CursorMan.replaceCursor(s.getPixels(), s.w, s.h, 0, 0, 0xff);
 
 	showCursor();
 }
-- 
cgit v1.2.3


From ebda40038b72fd34673e2a6e8a29b4ec47d1ee54 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 28 Mar 2015 10:32:00 -0400
Subject: SHERLOCK: Add partial on-screen clipping to blitFrom

---
 engines/sherlock/graphics.cpp       | 71 +++++++++++++++++++++++++------------
 engines/sherlock/graphics.h         |  2 ++
 engines/sherlock/user_interface.cpp |  2 +-
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 1a0144bc4b..306ff23548 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -85,9 +85,15 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
  */
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds) {
-	addDirtyRect(Common::Rect(pt.x, pt.y, pt.x + srcBounds.width(),
-		pt.y + srcBounds.height()));
-	copyRectToSurface(src, pt.x, pt.y, srcBounds);
+	Common::Rect destRect(pt.x, pt.y, pt.x + srcBounds.width(),
+		pt.y + srcBounds.height());
+	Common::Rect srcRect = srcBounds;
+
+	if (clip(srcRect, destRect)) {
+		// Surface is at least partially or completely on-screen
+		addDirtyRect(destRect);
+		copyRectToSurface(src, destRect.left, destRect.top, srcRect);
+	}
 }
 
 /**
@@ -104,32 +110,18 @@ void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
-	Common::Point destPt = pt;
-
-	if (destPt.x < 0) {
-		drawRect.left += -destPt.x;
-		destPt.x = 0;
-	}
-	if (destPt.y < 0) {
-		drawRect.top += -destPt.y;
-		destPt.y = 0;
-	}
-	int right = destPt.x + src.w;
-	if (right > this->w) {
-		drawRect.right -= (right - this->w);
-	}
-	int bottom = destPt.y + src.h;
-	if (bottom > this->h) {
-		drawRect.bottom -= (bottom - this->h);
-	}
-
-	if (!drawRect.isValidRect())
+	Common::Rect destRect(pt.x, pt.y, pt.x + src.w, pt.y + src.h);
+	
+	// Clip the display area to on-screen
+	if (!clip(drawRect, destRect))
+		// It's completely off-screen
 		return;
 
 	if (flipped)
 		drawRect = Common::Rect(src.w - drawRect.right, src.h - drawRect.bottom,
 			src.w - drawRect.left, src.h - drawRect.top);
 
+	Common::Point destPt(destRect.left, destRect.top);
 	addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
 		destPt.y + drawRect.height()));
 
@@ -169,4 +161,37 @@ Surface Surface::getSubArea(const Common::Rect &r) {
 	return Surface(*this, r);
 }
 
+/**
+ * Clips the given source bounds so the passed destBounds will be entirely on-screen
+ */
+bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
+	if (destBounds.left >= this->w || destBounds.top >= this->h ||
+		destBounds.right <= 0 || destBounds.bottom <= 0)
+		return false;
+
+	// Clip the bounds if necessary to fit on-screen
+	if (destBounds.right > this->w) {
+		srcBounds.right -= destBounds.right - this->w;
+		destBounds.right = this->w;
+	}
+
+	if (destBounds.bottom > this->h) {
+		srcBounds.bottom -= destBounds.bottom - this->h;
+		destBounds.bottom = this->h;
+	}
+
+	if (destBounds.top < 0) {
+		srcBounds.top += -destBounds.top;
+		destBounds.top = 0;
+	}
+
+	if (destBounds.left < 0) {
+		srcBounds.left += -destBounds.left;
+		destBounds.left = 0;
+	}
+	
+	return true;
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index c380d805b2..b54dc1ec37 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -32,6 +32,8 @@ namespace Sherlock {
 class Surface : public Graphics::Surface {
 private:
 	bool _freePixels;
+
+	bool clip(Common::Rect &srcBounds, Common::Rect &destBounds);
 protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 54c1f8e0fc..61933cf9f3 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -257,7 +257,7 @@ void UserInterface::handleInput() {
 				if (!events._released)
 					lookScreen(pt);
 			} else {
-				personFound = scene._bgShapes[_bgFound]._aType == PERSON && _bgFound != -1;
+				personFound = _bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON;
 			}
 
 			if (events._released && personFound)
-- 
cgit v1.2.3


From 35df6bb7ed44f78548ff7ab6b63fccc4e5b1609f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 28 Mar 2015 16:28:48 -0400
Subject: SHERLOCK: Implemented doInvControl

---
 engines/sherlock/inventory.cpp      |  12 ++
 engines/sherlock/inventory.h        |   6 +
 engines/sherlock/user_interface.cpp | 241 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/user_interface.h   |   9 ++
 4 files changed, 267 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index a05ec6f359..75ee364123 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -124,4 +124,16 @@ void Inventory::invent(int flag) {
 	// TODO
 }
 
+void Inventory::invCommands(bool slamIt) {
+	// TODO
+}
+
+void Inventory::doInvLite(int index, byte color) {
+	// TODO
+}
+
+void Inventory::doInvJF() {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 6d61378b99..0fa8eb0824 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -65,6 +65,12 @@ public:
 	void putInv(int slamit);
 
 	void invent(int flag);
+
+	void invCommands(bool slamIt);
+
+	void doInvLite(int index, byte color);
+
+	void doInvJF();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 61933cf9f3..10b13cedbe 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -77,12 +77,14 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_oldLook = false;
 	_keyboardInput = false;
 	_invMode = 0;
+	_invIndex = 0;
 	_pause = false;
 	_cNum = 0;
 	_selector = _oldSelector = -1;
 	_windowBounds = Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH - 1,
 		SHERLOCK_SCREEN_HEIGHT - 1);
 	_windowStyle = 1;	// Sliding windows
+	_find = 0;
 }
 
 UserInterface::~UserInterface() {
@@ -451,6 +453,10 @@ void UserInterface::toggleButton(int num) {
 	}
 }
 
+void UserInterface::buttonPrint(const Common::Point &pt, int color, bool slamIt,
+		const Common::String &str) {
+	// TODO
+}
 
 /**
  * Clears the info line of the screen
@@ -536,8 +542,235 @@ void UserInterface::doEnvControl() {
 	// TODO
 }
 
+/**
+ * Handle input whilst the inventory is active
+ */
 void UserInterface::doInvControl() {
-	// TODO
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
+	int colors[8];
+	Common::Point mousePos = events.mousePos();
+
+	_key = _oldKey = -1;
+	_keyboardInput = false;
+
+	// Check whether any inventory slot is highlighted
+	int found = -1;
+	Common::fill(&colors[0], &colors[8], (int)COMMAND_FOREGROUND);
+	for (int idx = 0; idx < 8; ++idx) {
+		Common::Rect r(INVENTORY_POINTS[idx][0], CONTROLS_Y1,
+			INVENTORY_POINTS[idx][1], CONTROLS_Y1 + 10);
+		if (r.contains(mousePos)) {
+			found = idx;
+			break;
+		}
+	}
+
+	if (events._pressed || events._released) {
+		events.clearKeyboard();
+
+		if (found != -1)
+			// If a slot highlighted, set it's color
+			colors[found] = COMMAND_HIGHLIGHTED;
+		buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
+			colors[0], true, "Exit");
+
+		if (found >= 0 && found <= 3) {
+			buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
+			buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[1], true, "Use");
+			buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[1], true, "Give");
+			_invMode = found;
+			_selector = -1;
+		}
+
+		if (_invIndex) {
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
+				colors[4], "^^");
+			screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
+				colors[5], "^");
+		}
+
+		if ((inv._holdings - _invIndex) > 6) {
+			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
+				colors[6], "^^");
+			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
+				colors[7], "^");
+		}
+
+		bool flag = false;
+		if (_invMode == 1 || _invMode == 2 || _invMode == 3) {
+			Common::Rect r(15, CONTROLS_Y1 + 11, 314, SHERLOCK_SCREEN_HEIGHT - 2);
+			flag = (_selector < inv._holdings);
+		}
+
+		if (!flag && mousePos.y >(CONTROLS_Y1 + 11))
+			_selector = -1;
+	}
+
+	if (_keycode != Common::KEYCODE_INVALID) {
+		_key = toupper(_keycode);
+
+		if (_key == Common::KEYCODE_ESCAPE)
+			// Escape will also 'E'xit out of inventory display
+			_key = Common::KEYCODE_e;
+
+		if (_key == 'E' || _key == 'L' || _key == 'U' || _key == 'G'
+				|| _key == '-' || _key == '+') {
+			int temp = _invMode;
+
+			const char *chP = strchr(INVENTORY_COMMANDS, _key);
+			_invMode = !chP ? 8 : chP - INVENTORY_COMMANDS;
+			inv.invCommands(true);
+
+			_invMode = temp;
+			_keyboardInput = true;
+			if (_key == 'E')
+				_invMode = STD_MODE;
+			_selector = -1;
+		} else {
+			_selector = -1;
+		}
+	}
+
+	if (_selector != _oldSelector) {
+		if (_oldSelector != -1) {
+			// Un-highlight
+			if (_oldSelector >= _invIndex && _oldSelector < (_invIndex + 6))
+				inv.doInvLite(_oldSelector, BUTTON_MIDDLE);
+		}
+
+		if (_selector != -1)
+			inv.doInvLite(_selector, 235);
+
+		_oldSelector = _selector;
+	}
+
+	if (events._released || _keyboardInput) {
+		if ((!found && events._released) && _key == 'E') {
+			inv.freeInv();
+			_infoFlag = true;
+			clearInfo();
+			banishWindow(false);
+			_key = -1;
+			events.clearEvents();
+			events.setCursor(ARROW);
+		} else if ((found == 1 && events._released) || (_key == 'L')) {
+			_invMode = 1;
+		} else if ((found == 2 && events._released) || (_key == 'U')) {
+			_invMode = 2;
+		} else if ((found == 3 && events._released) || (_key == 'G')) {
+			_invMode = 3;
+		} else if (((found == 4 && events._released) || _key == ',') && _invIndex) {
+			if (_invIndex >= 6)
+				_invIndex -= 6;
+			else
+				_invIndex = 0;
+
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
+				COMMAND_HIGHLIGHTED, "^^");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(1);
+			inv.invCommands(true);
+		} else if (((found == 5 && events._released) || _key == '-') && _invIndex) {
+			--_invIndex;
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
+				COMMAND_HIGHLIGHTED, "^");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(1);
+			inv.invCommands(true);
+		} else if (((found == 6 && events._released) || _key == '+') && (inv._holdings - _invIndex) > 6) {
+			++_invIndex;
+			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
+				COMMAND_HIGHLIGHTED, "_");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(1);
+			inv.invCommands(true);
+		} else if (((found == 7 && events._released) || _key == '.') && (inv._holdings - _invIndex) > 6) {
+			_invIndex += 6;
+			if ((inv._holdings - 6) < _invIndex)
+				_invIndex = inv._holdings - 6;
+
+			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
+				COMMAND_HIGHLIGHTED, "_");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(1);
+			inv.invCommands(true);
+		} else {
+			// If something is being given, make sure it's to a person
+			if (_invMode == 3) {
+				if (_bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON)
+					_find = _bgFound;
+				else
+					_find = -1;
+			} else {
+				_find = _bgFound;
+			}
+
+			if ((mousePos.y < CONTROLS_Y1) && (_invMode == 1) && (_find >= 0) && (_find < 1000)) {
+				if (!scene._bgShapes[_find]._examine.empty() &&
+						scene._bgShapes[_find]._examine[0] >= ' ')
+					inv.doInvJF();
+			} else if (_selector != -1 || _find >= 0) {
+				// Selector is the inventory object that was clicked on, or selected.
+				// If it's -1, then no inventory item is highlighted yet. Otherwise,
+				// an object in the scene has been clicked.
+
+				if (_selector != -1 && _invMode == 1 && mousePos.y >(CONTROLS_Y1 + 11))
+					inv.doInvJF();
+
+				if (talk._talkToAbort)
+					return;
+
+				// Now check for the Use and Give actions. If inv_mode is 3, 
+				// that means GIVE is in effect, _selector is the object being
+				// given, and _find is the target.
+				// The same applies to USE, except if _selector is -1, then USE
+				// is being tried on an object in the scene without an inventory
+				// object being highlighted first.
+
+				if ((_invMode == 2 || (_selector != -1 && _invMode == 3)) && _find >= 0) {
+					events._pressed = events._released = false;
+					_infoFlag = true;
+					clearInfo();
+
+					int temp = _selector;	// Save the selector
+					_selector = -1;
+
+					inv.putInv(1);
+					_selector = temp;		// Restore it
+					temp = _invMode;
+					_invMode = -1;
+					inv.invCommands(true);
+
+					_infoFlag = true;
+					clearInfo();
+					banishWindow(false);
+					_key = -1;
+
+					inv.freeInv();
+
+					if (_selector >= 0)
+						// Use/Give inv object with scene object
+						checkUseAction(scene._bgShapes[_find]._use[0], inv[_selector]._name,
+							_muse, _find, temp - 2);
+					else
+						// Now inv object has been highlighted
+						checkUseAction(scene._bgShapes[_find]._use[0], "*SELF", _muse,
+							_find, temp - 2);
+						
+					_selector = _oldSelector = -1;
+				}
+			}
+		}
+	}
 }
 
 /**
@@ -1056,4 +1289,10 @@ void UserInterface::banishWindow(bool flag) {
 	_menuMode = STD_MODE;
 }
 
+void UserInterface::checkUseAction(UseType &use, const Common::String &invName,
+		const Common::String &msg, int objNum, int giveMode) {
+	// TODO
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index f6e0435f48..d94b2fadc5 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/events.h"
 #include "sherlock/graphics.h"
+#include "sherlock/objects.h"
 #include "sherlock/resources.h"
 
 namespace Sherlock {
@@ -65,6 +66,7 @@ private:
 	int _oldLook;
 	bool _keyboardInput;
 	int _invMode;
+	int _invIndex;
 	bool _pause;
 	int _cNum;
 	int _selector, _oldSelector;
@@ -73,6 +75,8 @@ private:
 	Common::Rect _windowBounds;
 	Common::String _descStr;
 	int _windowStyle;
+	int _find;
+	Common::String _muse;
 private:
 	void depressButton(int num);
 
@@ -82,6 +86,8 @@ private:
 
 	void toggleButton(int num);
 
+	void buttonPrint(const Common::Point &pt, int color, bool slamIt, const Common::String &str);
+
 	void examine();
 
 	void lookScreen(const Common::Point &pt);
@@ -101,6 +107,9 @@ private:
 	void doControls();
 
 	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
+
+	void checkUseAction(UseType &use, const Common::String &invName, const Common::String &msg,
+		int objNum, int giveMode);
 public:
 	MenuMode _menuMode;
 	int _menuCounter;
-- 
cgit v1.2.3


From 073b7e075ccac02ecab922e03781b3663c92af6c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 28 Mar 2015 17:36:46 -0400
Subject: SHERLOCK: Implemented lookScreen

---
 engines/sherlock/screen.h           |   3 +-
 engines/sherlock/user_interface.cpp | 139 +++++++++++++++++++++++++++++++++++-
 2 files changed, 139 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index acd122e0e9..3ac40263c0 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -46,7 +46,8 @@ enum {
 	COMMAND_FOREGROUND = 15,
 	BUTTON_TOP = 233,
 	BUTTON_MIDDLE	= 244,
-	BUTTON_BOTTOM	= 248
+	BUTTON_BOTTOM	= 248,
+	TALK_FOREGROUND = 12
 };
 
 class SherlockEngine;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 10b13cedbe..9710c3a74a 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -530,12 +530,147 @@ void UserInterface::examine() {
 	}
 }
 
+/**
+ * Print the name of an object in the scene
+ */
 void UserInterface::lookScreen(const Common::Point &pt) {
-	// TODO
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Common::Point mousePos = events.mousePos();
+	int temp;
+	Common::String tempStr;
+	int x, width, width1, width2 = 0;
+
+	// Don't display anything for right button command
+	if ((events._rightPressed || events._rightPressed) && !events._pressed)
+		return;
+
+	if (mousePos.y < CONTROLS_Y && (temp = _bgFound) != -1) {
+		if (temp != _oldLook) {
+			_infoFlag = true;
+			clearInfo();
+
+			if (temp < 1000)
+				tempStr = scene._bgShapes[temp]._description;
+			else
+				tempStr = scene._bgShapes[temp - 1000]._description;
+
+			_infoFlag = true;
+			clearInfo();
+
+			// Only print description if there is one
+			if (!tempStr.empty() && tempStr[0] != ' ') {
+				// If inventory is active and an item is selected for a Use or Give action
+				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
+						(_invMode == 2 || _invMode == 3)) {
+					width1 = screen.stringWidth(inv[_selector]._name);
+
+					if (_invMode == 2) {
+						// Using an object
+						x = width = screen.stringWidth("Use ");
+
+						if (temp < 1000 && scene._bgShapes[temp]._aType != PERSON)
+							// It's not a person, so make it lowercase
+							tempStr.setChar(tolower(tempStr[0]), 0);
+
+						x += screen.stringWidth(tempStr);
+
+						// If we're using an inventory object, add in the width
+						// of the object name and the " on "
+						if (_selector != -1) {
+							x += width1;
+							width2 = screen.stringWidth(" on ");
+							x += width2;
+						}
+
+						// If the line will be too long, keep cutting off characters
+						// until the string will fit
+						while (x > 280) {
+							x -= screen.charWidth(tempStr.lastChar());
+							tempStr.deleteLastChar();
+						}
+
+						int xStart = (SHERLOCK_SCREEN_HEIGHT - x) / 2;
+						screen.print(Common::Point(xStart, INFO_LINE + 1),
+							INFO_FOREGROUND, "Use ");
+
+						if (_selector != -1) {
+							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
+								TALK_FOREGROUND, inv[_selector]._name.c_str());
+							screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
+								INFO_FOREGROUND, " on ");
+							screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
+								INFO_FOREGROUND, tempStr.c_str());
+						} else {
+							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
+								INFO_FOREGROUND, tempStr.c_str());
+						}
+					} else if (temp >= 0 && temp < 1000 && _selector != -1 &&
+							scene._bgShapes[temp]._aType == PERSON) {
+						// Giving an object to a person
+						x = width = screen.stringWidth("Give ");
+						x += width1;
+						width2 = screen.stringWidth(" to ");
+						x += width2;
+						x += screen.stringWidth(tempStr);
+
+						// Ensure string will fit on-screen
+						while (x > 280) {
+							x -= screen.charWidth(tempStr.lastChar());
+							tempStr.deleteLastChar();
+						}
+
+						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
+						screen.print(Common::Point(xStart, INFO_LINE + 1), 
+							INFO_FOREGROUND, "Give ");
+						screen.print(Common::Point(xStart + width, INFO_LINE + 1), 
+							TALK_FOREGROUND, inv[_selector]._name.c_str());
+						screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1), 
+							INFO_FOREGROUND, " to ");
+						screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1), 
+							INFO_FOREGROUND, tempStr.c_str());
+					}
+				} else {
+					screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, tempStr.c_str());
+				}
+
+				_infoFlag = true;
+				_oldLook = temp;
+			}
+		}
+	} else {
+		clearInfo();
+	}
 }
 
+/**
+ * Gets the item in the inventory the mouse is on and display's it's description
+ */
 void UserInterface::lookInv() {
-	// TODO
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+	Common::Point mousePos = events.mousePos();
+
+	if (mousePos.x > 15 && mousePos.x < 314 && mousePos.y > (CONTROLS_Y1 + 11)
+			&& mousePos.y < (SHERLOCK_SCREEN_HEIGHT - 2)) {
+		int temp = (mousePos.x - 6) / 52 + _invIndex;
+		if (temp < inv._holdings) {
+			if (temp < inv._holdings) {
+				clearInfo();
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
+					inv[temp]._description.c_str());
+				_infoFlag = true;
+				_oldLook = temp;
+			}
+		} else {
+			clearInfo();
+		}
+	} else {
+		clearInfo();
+	}
 }
 
 void UserInterface::doEnvControl() {
-- 
cgit v1.2.3


From c28416f38ef77eef0858756d0b3265c44ad90216 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 28 Mar 2015 20:13:57 -0400
Subject: SHERLOCK: Change the screen _backBuffer to be a pointer

---
 engines/sherlock/inventory.cpp       | 19 +++++++++++++++++-
 engines/sherlock/inventory.h         |  1 +
 engines/sherlock/objects.cpp         |  2 +-
 engines/sherlock/scalpel/scalpel.cpp | 18 ++++++++---------
 engines/sherlock/scene.cpp           | 38 ++++++++++++++++++------------------
 engines/sherlock/screen.cpp          | 19 +++++++++---------
 engines/sherlock/screen.h            |  3 ++-
 engines/sherlock/user_interface.cpp  | 34 ++++++++++++++++----------------
 8 files changed, 77 insertions(+), 57 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 75ee364123..8eb7ecc1a1 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -30,6 +30,7 @@ Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(v
 	_invGraphicsLoaded = false;
 	_invIndex = 0;
 	_holdings = 0;
+	_oldFlag = 0;
 }
 
 Inventory::~Inventory() {
@@ -120,8 +121,24 @@ void Inventory::putInv(int slamit) {
 	// TODO
 }
 
+/**
+ * Put the game into inventory mode and open the interface window.
+ * The flag parameter specifies the mode:
+ * 0   = plain inventory mode
+ * 2   = use inventory mode
+ * 3   = give inventory mode
+ * 128 = Draw window in the back buffer, but don't display it 
+ */
 void Inventory::invent(int flag) {
-	// TODO
+	Screen &screen = *_vm->_screen;
+	_oldFlag = 7;
+	loadInv();
+
+	if (flag == 128) {
+		screen._backBuffer = &screen._backBuffer2;
+	}
+
+	
 }
 
 void Inventory::invCommands(bool slamIt) {
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 0fa8eb0824..1db91292a5 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -50,6 +50,7 @@ public:
 	int _invIndex;
 	int _holdings;
 	void freeGraphics();
+	int _oldFlag;
 public:
 	Inventory(SherlockEngine *vm);
 	~Inventory();
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 39a9cf8014..d5d24e72af 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -656,7 +656,7 @@ bool Object::checkEndOfSequence() {
 
 			if (seq == 99) {
 				--_frameNumber;
-				screen._backBuffer.transBlitFrom(_imageFrame->_frame, _position);
+				screen._backBuffer1.transBlitFrom(_imageFrame->_frame, _position);
 				screen._backBuffer2.transBlitFrom(_imageFrame->_frame, _position);
 				_type = INVALID;
 			} else {
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 3ec971895a..db59434f85 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -99,23 +99,23 @@ bool ScalpelEngine::showCityCutscene() {
 
 	if (finished) {
 		ImageFile titleImages("title2.vgs", true);
-		_screen->_backBuffer.blitFrom(*_screen);
+		_screen->_backBuffer1.blitFrom(*_screen);
 		_screen->_backBuffer2.blitFrom(*_screen);
 
 		// London, England
-		_screen->_backBuffer.transBlitFrom(titleImages[0], Common::Point(10, 11));
+		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(10, 11));
 		_screen->randomTransition();
 		finished = _events->delay(1000, true);
 
 		// November, 1888
 		if (finished) {
-			_screen->_backBuffer.transBlitFrom(titleImages[1], Common::Point(101, 102));
+			_screen->_backBuffer1.transBlitFrom(titleImages[1], Common::Point(101, 102));
 			_screen->randomTransition();
 			finished = _events->delay(5000, true);
 		}
 
 		// Transition out the title
-		_screen->_backBuffer.blitFrom(_screen->_backBuffer2);
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2);
 		_screen->randomTransition();
 	}
 
@@ -124,21 +124,21 @@ bool ScalpelEngine::showCityCutscene() {
 
 	if (finished) {
 		ImageFile titleImages("title.vgs", true);
-		_screen->_backBuffer.blitFrom(*_screen);
+		_screen->_backBuffer1.blitFrom(*_screen);
 		_screen->_backBuffer2.blitFrom(*_screen);
 		
 		// The Lost Files of
-		_screen->_backBuffer.transBlitFrom(titleImages[0], Common::Point(75, 6));
+		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(75, 6));
 		// Sherlock Holmes
-		_screen->_backBuffer.transBlitFrom(titleImages[1], Common::Point(34, 21));
+		_screen->_backBuffer1.transBlitFrom(titleImages[1], Common::Point(34, 21));
 		// copyright
-		_screen->_backBuffer.transBlitFrom(titleImages[2], Common::Point(4, 190));
+		_screen->_backBuffer1.transBlitFrom(titleImages[2], Common::Point(4, 190));
 
 		_screen->verticalTransition();
 		finished = _events->delay(4000, true);
 
 		if (finished) {
-			_screen->_backBuffer.blitFrom(_screen->_backBuffer2);
+			_screen->_backBuffer1.blitFrom(_screen->_backBuffer2);
 			_screen->randomTransition();
 			finished = _events->delay(2000);
 		}
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 97f7350ea9..c3afc4a0d4 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -378,13 +378,13 @@ bool Scene::loadScene(const Common::String &filename) {
 		Common::SeekableReadStream *bgStream = !_lzwMode ? rrmStream :
 			decompressLZ(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
 
-		bgStream->read(screen._backBuffer.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
+		bgStream->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
 
 		if (_lzwMode)
 			delete bgStream;
 
-		// Set the palette
-		screen._backBuffer2.blitFrom(screen._backBuffer);
+		// Backup the image and set the palette
+		screen._backBuffer2.blitFrom(screen._backBuffer1);
 		screen.setPalette(screen._cMap);
 
 		delete rrmStream;
@@ -658,7 +658,7 @@ void Scene::transitionToScene() {
 	if (screen._fadeStyle)
 		screen.randomTransition();
 	else
-		screen.blitFrom(screen._backBuffer);
+		screen.blitFrom(screen._backBuffer1);
 
 	if (cAnimNum != -1) {
 		CAnim &c = _cAnim[cAnimNum];
@@ -696,7 +696,7 @@ int Scene::toggleObject(const Common::String &name) {
 void Scene::updateBackground() {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
-	Surface surface = screen._backBuffer.getSubArea(
+	Surface surface = screen._backBuffer1.getSubArea(
 		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	Sprite &player = people[AL];
 
@@ -1055,7 +1055,7 @@ void Scene::doBgAnim() {
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
-	Surface surface = screen._backBuffer.getSubArea(Common::Rect(0, 0,
+	Surface surface = screen._backBuffer1.getSubArea(Common::Rect(0, 0,
 		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	int cursorId = events.getCursor();
 	Common::Point mousePos = events.mousePos();
@@ -1126,7 +1126,7 @@ void Scene::doBgAnim() {
 		if (people[AL]._type == CHARACTER)
 			screen.restoreBackground(bounds);
 		else if (people[AL]._type == REMOVE)
-			screen._backBuffer.blitFrom(screen._backBuffer2, pt, bounds);
+			screen._backBuffer1.blitFrom(screen._backBuffer2, pt, bounds);
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
@@ -1145,7 +1145,7 @@ void Scene::doBgAnim() {
 			Object &o = _bgShapes[idx];
 			if (o._type == NO_SHAPE && ((o._flags & 1) == 0)) {
 				// Restore screen area
-				screen._backBuffer.blitFrom(screen._backBuffer2, o._position,
+				screen._backBuffer1.blitFrom(screen._backBuffer2, o._position,
 					Common::Rect(o._position.x, o._position.y,
 					o._position.x + o._noShapeSize.x, o._position.y + o._noShapeSize.y));
 
@@ -1191,14 +1191,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 	}
 	
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1206,14 +1206,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 	}
 
 	// Draw all canimations which are NORMAL and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1226,7 +1226,7 @@ void Scene::doBgAnim() {
 		bool flipped = people[AL]._frameNumber == WALK_LEFT || people[AL]._frameNumber == STOP_LEFT ||
 			people[AL]._frameNumber == WALK_UPLEFT || people[AL]._frameNumber == STOP_UPLEFT ||
 			people[AL]._frameNumber == WALK_DOWNRIGHT || people[AL]._frameNumber == STOP_DOWNRIGHT;
-		screen._backBuffer.transBlitFrom(people[AL]._imageFrame->_frame,
+		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame,
 			Common::Point(tempX, people[AL]._position.y / 100 - people[AL]._imageFrame->_frame.h), flipped);
 	}
 
@@ -1234,14 +1234,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1249,19 +1249,19 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 	}
 
 	// Draw any active portrait
 	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-		screen._backBuffer.transBlitFrom(people._portrait._imageFrame->_frame,
+		screen._backBuffer1.transBlitFrom(people._portrait._imageFrame->_frame,
 			people._portrait._position, people._portrait._flags & 2);
 
 	// Draw all static and active canimations that are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1269,7 +1269,7 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == NO_SHAPE && (o._flags & 1) == 0)
-			screen._backBuffer.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
 	}
 
 	// Bring the newly built picture to the screen
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index def20612b7..f1562e2468 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -29,8 +29,9 @@
 namespace Sherlock {
 
 Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
-		_backBuffer(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
-		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT) {
+		_backBuffer1(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
+		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
+		_backBuffer(&_backBuffer1) {
 	_transitionSeed = 1;
 	_fadeStyle = false;
 	_font = nullptr;
@@ -201,7 +202,7 @@ void Screen::randomTransition() {
 		int offset = _transitionSeed & 65535;
 
 		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
-			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer.getPixels() + offset);
+			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset);
 	
 		if (idx != 0 && (idx % 100) == 0) {
 			// Ensure there's a full screen dirty rect for the next frame update
@@ -214,7 +215,7 @@ void Screen::randomTransition() {
 	}
 
 	// Make sure everything has been transferred
-	blitFrom(_backBuffer);
+	blitFrom(_backBuffer1);
 }
 
 /**
@@ -232,7 +233,7 @@ void Screen::verticalTransition() {
 				_vm->getRandomNumber(3) + 1;
 
 			if (temp) {
-				blitFrom(_backBuffer, Common::Point(xp, table[xp]),
+				blitFrom(_backBuffer1, Common::Point(xp, table[xp]),
 					Common::Rect(xp, table[xp], xp + 1, table[xp] + temp));
 				table[xp] += temp;
 			}
@@ -251,7 +252,7 @@ void Screen::restoreBackground(const Common::Rect &r) {
 		tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 
 		if (tempRect.isValidRect())
-			_backBuffer.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
+			_backBuffer1.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
 	}
 }
 
@@ -271,7 +272,7 @@ void Screen::slamRect(const Common::Rect &r) {
 		tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 		if (tempRect.isValidRect())
-			blitFrom(_backBuffer, Common::Point(tempRect.left, tempRect.top), tempRect);
+			blitFrom(*_backBuffer, Common::Point(tempRect.left, tempRect.top), tempRect);
 	}
 }
 
@@ -394,7 +395,7 @@ void Screen::writeString(const Common::String &str, const Common::Point &pt, int
 		else {
 			assert(*c > ' ' && *c <= '~');
 			ImageFrame &frame = (*_font)[*c - 33];
-			_backBuffer.transBlitFrom(frame, charPos, false, color);
+			_backBuffer->transBlitFrom(frame, charPos, false, color);
 			charPos.x += frame._frame.w + 1;
 		}
 	}
@@ -404,7 +405,7 @@ void Screen::writeString(const Common::String &str, const Common::Point &pt, int
  * Fills an area on the back buffer, and then copies it to the screen
  */
 void Screen::vgaBar(const Common::Rect &r, int color) {
-	_backBuffer.fillRect(r, color);
+	_backBuffer->fillRect(r, color);
 	slamRect(r);
 }
 
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 3ac40263c0..7d07cfa062 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -69,7 +69,8 @@ private:
 protected:
 	virtual void addDirtyRect(const Common::Rect &r);
 public:
-	Surface _backBuffer, _backBuffer2;
+	Surface _backBuffer1, _backBuffer2;
+	Surface *_backBuffer;
 	bool _fadeStyle;
 	byte _cMap[PALETTE_SIZE];
 	byte _sMap[PALETTE_SIZE];
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 9710c3a74a..dbc9108212 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -105,7 +105,7 @@ void UserInterface::drawInterface() {
 	Screen &screen = *_vm->_screen;
 
 	screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
-	screen._backBuffer.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	screen._backBuffer1.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
 	screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
 }
 
@@ -376,7 +376,7 @@ void UserInterface::depressButton(int num) {
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
 
 	Graphics::Surface &s = (*_controls)[num]._frame;
-	screen._backBuffer.transBlitFrom(s, pt);
+	screen._backBuffer1.transBlitFrom(s, pt);
 	screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
 }
 
@@ -389,7 +389,7 @@ void UserInterface::restoreButton(int num) {
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
 	Graphics::Surface &frame = (*_controls)[num]._frame;
 
-	screen._backBuffer.blitFrom(screen._backBuffer2, pt,
+	screen._backBuffer1.blitFrom(screen._backBuffer2, pt,
 		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
 	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);
 	
@@ -443,7 +443,7 @@ void UserInterface::toggleButton(int num) {
 
 			Graphics::Surface &s = (*_controls)[num]._frame;
 			Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
-			screen._backBuffer.transBlitFrom(s, pt);
+			screen._backBuffer1.transBlitFrom(s, pt);
 			screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
 		}
 	} else {
@@ -1199,7 +1199,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		return;
 	}
 
-	Surface &bb = screen._backBuffer;
+	Surface &bb = *screen._backBuffer;
 	if (firstTime) {
 		// Only draw the border on the first call
 		_infoFlag = true;
@@ -1286,10 +1286,10 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 			Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
 				(SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y));
 			Common::Rect r(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-			tempSurface.blitFrom(screen._backBuffer, Common::Point(0, 0), r);
+			tempSurface.blitFrom(screen._backBuffer1, Common::Point(0, 0), r);
 
 			// Remove drawn window with original user interface
-			screen._backBuffer.blitFrom(screen._backBuffer2,
+			screen._backBuffer1.blitFrom(screen._backBuffer2,
 				Common::Point(0, CONTROLS_Y), r);
 
 			// Display the window gradually on-screen
@@ -1318,7 +1318,7 @@ void UserInterface::makeButton(const Common::Rect &bounds, int textX,
 		const Common::String &str) {
 	Screen &screen = *_vm->_screen;
 
-	Surface &bb = screen._backBuffer;
+	Surface &bb = *screen._backBuffer;
 	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.right, bounds.top + 1), BUTTON_TOP);
 	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.left + 1, bounds.bottom), BUTTON_TOP);
 	bb.fillRect(Common::Rect(bounds.right - 1, bounds.top, bounds.right, bounds.bottom), BUTTON_BOTTOM);
@@ -1343,7 +1343,7 @@ void UserInterface::summonWindow(const Surface &bgSurface) {
 
 	// Gradually slide up the display of the window
 	for (int idx = 1; idx <= bgSurface.h; idx += 2) {
-		screen._backBuffer.blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
+		screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
 			Common::Rect(0, 0, bgSurface.w, idx));
 		screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
 			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
@@ -1352,7 +1352,7 @@ void UserInterface::summonWindow(const Surface &bgSurface) {
 	}
 
 	// Final display of the entire window
-	screen._backBuffer.blitFrom(bgSurface, Common::Point(0, CONTROLS_Y),
+	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, CONTROLS_Y),
 		Common::Rect(0, 0, bgSurface.w, bgSurface.h));
 	screen.slamArea(0, CONTROLS_Y, bgSurface.w, bgSurface.h);
 
@@ -1374,13 +1374,13 @@ void UserInterface::banishWindow(bool flag) {
 			if (_windowStyle) {
 				for (int idx = 2; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
 					// Shift the window down by 2 lines
-					byte *pSrc = (byte *)screen._backBuffer.getBasePtr(0, CONTROLS_Y + idx - 2);
-					byte *pSrcEnd = (byte *)screen._backBuffer.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - 2);
-					byte *pDest = (byte *)screen._backBuffer.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT);
+					byte *pSrc = (byte *)screen._backBuffer1.getBasePtr(0, CONTROLS_Y + idx - 2);
+					byte *pSrcEnd = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - 2);
+					byte *pDest = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT);
 					Common::copy_backward(pSrc, pSrcEnd, pDest);
 
 					// Restore lines from the ui in the secondary back buffer
-					screen._backBuffer.blitFrom(screen._backBuffer2,
+					screen._backBuffer1.blitFrom(screen._backBuffer2,
 						Common::Point(0, CONTROLS_Y),
 						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + idx));
 
@@ -1390,14 +1390,14 @@ void UserInterface::banishWindow(bool flag) {
 				}
 
 				// Restore final two old lines
-				screen._backBuffer.blitFrom(screen._backBuffer2,
+				screen._backBuffer1.blitFrom(screen._backBuffer2,
 					Common::Point(0, SHERLOCK_SCREEN_HEIGHT - 2),
 					Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 2,
 						SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - 2, SHERLOCK_SCREEN_WIDTH, 2);
 			} else {
 				// Restore old area to completely erase window
-				screen._backBuffer.blitFrom(screen._backBuffer2,
+				screen._backBuffer1.blitFrom(screen._backBuffer2,
 					Common::Point(0, CONTROLS_Y),
 					Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
@@ -1408,7 +1408,7 @@ void UserInterface::banishWindow(bool flag) {
 			for (int idx = 1; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); idx += 2) {
 				byte *pSrc = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1);
 				byte *pSrcEnd = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1 + idx);
-				byte *pDest = (byte *)screen._backBuffer.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - idx);
+				byte *pDest = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - idx);
 				Common::copy(pSrc, pSrcEnd, pDest);
 
 				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - idx, SHERLOCK_SCREEN_WIDTH,
-- 
cgit v1.2.3


From 7fec58a57d9c45f7b899f67042af57b54ca80252 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 28 Mar 2015 22:31:18 -0400
Subject: SHERLOCK: Beginnings of inventory display

---
 engines/sherlock/inventory.cpp      |  65 ++++++++++++++++++++-
 engines/sherlock/inventory.h        |   3 +-
 engines/sherlock/scene.h            |   2 -
 engines/sherlock/screen.cpp         |  18 ++++++
 engines/sherlock/screen.h           |   2 +
 engines/sherlock/user_interface.cpp | 109 +++++++++++++++++++-----------------
 engines/sherlock/user_interface.h   |  18 ++++--
 7 files changed, 156 insertions(+), 61 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 8eb7ecc1a1..c39bba4f5b 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -31,6 +31,7 @@ Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(v
 	_invIndex = 0;
 	_holdings = 0;
 	_oldFlag = 0;
+	_invFlag = 0;
 }
 
 Inventory::~Inventory() {
@@ -129,8 +130,11 @@ void Inventory::putInv(int slamit) {
  * 3   = give inventory mode
  * 128 = Draw window in the back buffer, but don't display it 
  */
-void Inventory::invent(int flag) {
+void Inventory::drawInventory(int flag) {
 	Screen &screen = *_vm->_screen;
+	UserInterface &ui = *_vm->_ui;
+	int tempFlag = flag;
+
 	_oldFlag = 7;
 	loadInv();
 
@@ -138,7 +142,64 @@ void Inventory::invent(int flag) {
 		screen._backBuffer = &screen._backBuffer2;
 	}
 
-	
+	// Draw the window background
+	Surface &bb = *screen._backBuffer;
+	bb.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 10), BORDER_COLOR);
+	bb.fillRect(Common::Rect(0, CONTROLS_Y1 + 10, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 10, 
+		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	bb.fillRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 2, SHERLOCK_SCREEN_WIDTH,
+		SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	bb.fillRect(Common::Rect(2, CONTROLS_Y1 + 10, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT - 2),
+		INV_BACKGROUND);
+
+	// Draw the buttons
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[0][0], CONTROLS_Y1, INVENTORY_POINTS[0][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[1][0], CONTROLS_Y1, INVENTORY_POINTS[1][1],
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[1][2] - screen.stringWidth("Look") / 2, "Look");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[2][0], CONTROLS_Y1, INVENTORY_POINTS[2][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[2][2] - screen.stringWidth("Use") / 2, "Use");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[3][0], CONTROLS_Y1, INVENTORY_POINTS[3][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[3][2] - screen.stringWidth("Give") / 2, "Give");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[4][0], CONTROLS_Y1, INVENTORY_POINTS[4][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[4][2], "^^");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[5][0], CONTROLS_Y1, INVENTORY_POINTS[5][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[5][2], "^");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[6][0], CONTROLS_Y1, INVENTORY_POINTS[6][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[6][2], "_");
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[7][0], CONTROLS_Y1, INVENTORY_POINTS[7][1], 
+		CONTROLS_Y1 + 9), INVENTORY_POINTS[7][2], "__");
+
+	if (tempFlag == 128)
+		flag = 1;
+	ui._invMode = flag;
+
+	if (flag) {
+		ui._oldKey = INVENTORY_COMMANDS[flag];
+		_oldFlag = flag;
+	} else {
+		ui._oldKey = -1;
+		_invFlag = 6;
+	}
+
+	invCommands(0);
+	putInv(0);
+
+	if (tempFlag != 128) {
+		if (!ui._windowStyle) {
+			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		} else {
+			ui.summonWindow(false, CONTROLS_Y1);
+		}
+
+		ui._windowOpen = true;
+	} else {
+		// Reset the screen back buffer to the first buffer now that drawing is done
+		screen._backBuffer = &screen._backBuffer1;
+	}
+
+	ui._oldUse = -1;
 }
 
 void Inventory::invCommands(bool slamIt) {
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 1db91292a5..7785250e8c 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -51,6 +51,7 @@ public:
 	int _holdings;
 	void freeGraphics();
 	int _oldFlag;
+	int _invFlag;
 public:
 	Inventory(SherlockEngine *vm);
 	~Inventory();
@@ -65,7 +66,7 @@ public:
 
 	void putInv(int slamit);
 
-	void invent(int flag);
+	void drawInventory(int flag);
 
 	void invCommands(bool slamIt);
 
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 007f910b10..d89a47e560 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -34,8 +34,6 @@ namespace Sherlock {
 #define SCENES_COUNT 63
 #define MAX_ZONES    40
 #define INFO_LINE   140
-#define CONTROLS_Y  138
-#define CONTROLS_Y1 151
 
 enum InvMode {
 	INVMODE_0	= 0,
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index f1562e2468..16d590c0f4 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -409,4 +409,22 @@ void Screen::vgaBar(const Common::Rect &r, int color) {
 	slamRect(r);
 }
 
+/**
+ * Draws a button for use in the inventory, talk, and examine dialogs.
+ */
+void Screen::makeButton(const Common::Rect &bounds, int textX,
+		const Common::String &str) {
+
+	Surface &bb = *_backBuffer;
+	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.right, bounds.top + 1), BUTTON_TOP);
+	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.left + 1, bounds.bottom), BUTTON_TOP);
+	bb.fillRect(Common::Rect(bounds.right - 1, bounds.top, bounds.right, bounds.bottom), BUTTON_BOTTOM);
+	bb.fillRect(Common::Rect(bounds.left + 1, bounds.bottom - 1, bounds.right, bounds.bottom), BUTTON_BOTTOM);
+	bb.fillRect(Common::Rect(bounds.left + 1, bounds.top + 1, bounds.right - 1, bounds.bottom - 1), BUTTON_MIDDLE);
+
+	gPrint(Common::Point(textX, bounds.top), COMMAND_HIGHLIGHTED, "%c", str[0]);
+	gPrint(Common::Point(textX + charWidth(str[0]), bounds.top), 
+		COMMAND_FOREGROUND, "%s", str.c_str() + 1);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 7d07cfa062..f33bbfceab 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -112,6 +112,8 @@ public:
 	int charWidth(char c);
 
 	void vgaBar(const Common::Rect &r, int color);
+
+	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index dbc9108212..a993965429 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -54,6 +54,7 @@ const int INVENTORY_POINTS[8][3] = {
 };
 
 const char COMMANDS[13] = "LMTPOCIUGJFS";
+const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
 const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
 const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
 
@@ -85,6 +86,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 		SHERLOCK_SCREEN_HEIGHT - 1);
 	_windowStyle = 1;	// Sliding windows
 	_find = 0;
+	_oldUse = 0;
 }
 
 UserInterface::~UserInterface() {
@@ -686,7 +688,6 @@ void UserInterface::doInvControl() {
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
 	int colors[8];
 	Common::Point mousePos = events.mousePos();
 
@@ -956,7 +957,7 @@ void UserInterface::doLookControl() {
 			tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
 				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
-			inv.invent(128);
+			inv.drawInventory(128);
 			banishWindow(true);
 
 			// Restore the ui
@@ -1060,19 +1061,19 @@ void UserInterface::doMainControl() {
 			pushButton(6);
 			_selector = _oldSelector = -1;
 			_menuMode = INV_MODE;
-			inv.invent(1);
+			inv.drawInventory(1);
 			break;
 		case 'U':
 			pushButton(7);
 			_selector = _oldSelector = -1;
 			_menuMode = USE_MODE;
-			inv.invent(2);
+			inv.drawInventory(2);
 			break;
 		case 'G':
 			pushButton(8);
 			_selector = _oldSelector = -1;
 			_menuMode = GIVE_MODE;
-			inv.invent(3);
+			inv.drawInventory(3);
 			break;
 		case 'J':
 			pushButton(9);
@@ -1259,7 +1260,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 
 	// Handle display depending on whether all the message was shown
 	if (!endOfStr) {
-		makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
+		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
 			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2,
 			PRESS_KEY_FOR_MORE);
 		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
@@ -1267,7 +1268,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 			COMMAND_FOREGROUND, "P");
 		_descStr = msgP;
 	} else {
-		makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
+		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
 			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2,
 			PRESS_KEY_TO_CONTINUE);
 		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
@@ -1280,20 +1281,9 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		if (!_windowStyle) {
 			screen.slamRect(Common::Rect(0, CONTROLS_Y,
 				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-		}
-		else {
-			// Extract the window that's been drawn on the back buffer
-			Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
-				(SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y));
-			Common::Rect r(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-			tempSurface.blitFrom(screen._backBuffer1, Common::Point(0, 0), r);
-
-			// Remove drawn window with original user interface
-			screen._backBuffer1.blitFrom(screen._backBuffer2,
-				Common::Point(0, CONTROLS_Y), r);
-
-			// Display the window gradually on-screen
-			summonWindow(tempSurface);
+		} else {
+			// Display the window
+			summonWindow();
 		}
 
 		_selector = _oldSelector = -1;
@@ -1311,29 +1301,10 @@ void UserInterface::printObjectDesc() {
 	printObjectDesc(_cAnimStr, true);
 }
 
-/**
- * Draws a button for use in the inventory, talk, and examine dialogs.
- */
-void UserInterface::makeButton(const Common::Rect &bounds, int textX,
-		const Common::String &str) {
-	Screen &screen = *_vm->_screen;
-
-	Surface &bb = *screen._backBuffer;
-	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.right, bounds.top + 1), BUTTON_TOP);
-	bb.fillRect(Common::Rect(bounds.left, bounds.top, bounds.left + 1, bounds.bottom), BUTTON_TOP);
-	bb.fillRect(Common::Rect(bounds.right - 1, bounds.top, bounds.right, bounds.bottom), BUTTON_BOTTOM);
-	bb.fillRect(Common::Rect(bounds.left + 1, bounds.bottom - 1, bounds.right, bounds.bottom), BUTTON_BOTTOM);
-	bb.fillRect(Common::Rect(bounds.left + 1, bounds.top + 1, bounds.right - 1, bounds.bottom - 1), BUTTON_MIDDLE);
-
-	screen.gPrint(Common::Point(textX, bounds.top), COMMAND_HIGHLIGHTED, "%c", str[0]);
-	screen.gPrint(Common::Point(textX + screen.charWidth(str[0]), bounds.top), 
-		COMMAND_FOREGROUND, "%s", str.c_str() + 1);
-}
-
 /**
  * Displays a passed window by gradually scrolling it vertically on-screen
  */
-void UserInterface::summonWindow(const Surface &bgSurface) {
+void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 
@@ -1341,34 +1312,68 @@ void UserInterface::summonWindow(const Surface &bgSurface) {
 		// A window is already open, so can't open another one
 		return;
 
-	// Gradually slide up the display of the window
-	for (int idx = 1; idx <= bgSurface.h; idx += 2) {
-		screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
-			Common::Rect(0, 0, bgSurface.w, idx));
-		screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
-			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	if (slideUp) {
+		// Gradually slide up the display of the window
+		for (int idx = 1; idx <= bgSurface.h; idx += 2) {
+			screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
+				Common::Rect(0, 0, bgSurface.w, idx));
+			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
-		events.delay(10);
+			events.delay(10);
+		}
+	} else {
+		// Gradually slide down the display of the window
+		for (int idx = 1; idx <= bgSurface.h; idx += 2) {
+			screen._backBuffer->blitFrom(bgSurface, 
+				Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h),
+				Common::Rect(0, bgSurface.h - idx, bgSurface.w, bgSurface.h));
+			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h,
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - bgSurface.h + idx));
+
+			events.delay(10);
+		}
 	}
 
 	// Final display of the entire window
-	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, CONTROLS_Y),
+	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, 
+		SHERLOCK_SCREEN_HEIGHT - bgSurface.h),
 		Common::Rect(0, 0, bgSurface.w, bgSurface.h));
-	screen.slamArea(0, CONTROLS_Y, bgSurface.w, bgSurface.h);
+	screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h, bgSurface.w, bgSurface.h);
 
 	_windowOpen = true;
 }
 
+/**
+ * Slide the window stored in the back buffer onto the screen
+ */
+void UserInterface::summonWindow(bool slideUp, int height) {
+	Screen &screen = *_vm->_screen;
+
+	// Extract the window that's been drawn on the back buffer
+	Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
+		(SHERLOCK_SCREEN_HEIGHT - height));
+	Common::Rect r(0, height, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	tempSurface.blitFrom(screen._backBuffer1, Common::Point(0, 0), r);
+
+	// Remove drawn window with original user interface
+	screen._backBuffer1.blitFrom(screen._backBuffer2,
+		Common::Point(0, height), r);
+
+	// Display the window gradually on-screen
+	summonWindow(tempSurface, slideUp);
+}
+
 /**
  * Close a currently open window
  * @param flag	0 = slide old window down, 1 = slide prior UI back up
  */
-void UserInterface::banishWindow(bool flag) {
+void UserInterface::banishWindow(bool slideUp) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 
 	if (_windowOpen) {
-		if (flag || !_windowStyle) {
+		if (slideUp || !_windowStyle) {
 			// Slide window down
 			// Only slide the window if the window style allows it
 			if (_windowStyle) {
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index d94b2fadc5..87fd4a5e99 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -31,6 +31,9 @@
 
 namespace Sherlock {
 
+#define CONTROLS_Y  138
+#define CONTROLS_Y1 151
+
 enum MenuMode {
 	STD_MODE		=  0,
 	LOOK_MODE		=  1,
@@ -47,9 +50,16 @@ enum MenuMode {
 	SETUP_MODE		= 12
 };
 
+extern const int MENU_POINTS[12][4];
+
+extern const int INVENTORY_POINTS[8][3];
+extern const char INVENTORY_COMMANDS[9];
+
 class SherlockEngine;
+class Inventory;
 
 class UserInterface {
+	friend class Inventory;
 private:
 	SherlockEngine *_vm;
 	ImageFile *_controlPanel;
@@ -77,6 +87,7 @@ private:
 	int _windowStyle;
 	int _find;
 	Common::String _muse;
+	int _oldUse;
 private:
 	void depressButton(int num);
 
@@ -106,8 +117,6 @@ private:
 	void environment();
 	void doControls();
 
-	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
-
 	void checkUseAction(UseType &use, const Common::String &invName, const Common::String &msg,
 		int objNum, int giveMode);
 public:
@@ -132,8 +141,9 @@ public:
 	void printObjectDesc(const Common::String &str, bool firstTime);
 	void printObjectDesc();
 
-	void summonWindow(const Surface &bgSurface);
-	void banishWindow(bool flag);
+	void summonWindow(const Surface &bgSurface, bool slideUp = true);
+	void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
+	void banishWindow(bool slideUp = true);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 3149ce0204f658e7420f16a151710f43052506f2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 29 Mar 2015 09:52:23 -0400
Subject: SHERLOCK: Added inventory list and display images in inventory mode

---
 engines/sherlock/inventory.cpp       | 149 ++++++++++++++++++++++++++++++++---
 engines/sherlock/inventory.h         |   6 +-
 engines/sherlock/scalpel/scalpel.cpp |  25 ++++++
 engines/sherlock/scalpel/scalpel.h   |   2 +
 engines/sherlock/screen.cpp          |  47 ++++++++++-
 engines/sherlock/screen.h            |  12 ++-
 engines/sherlock/user_interface.cpp  |  86 ++++++++++----------
 engines/sherlock/user_interface.h    |   4 -
 8 files changed, 262 insertions(+), 69 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index c39bba4f5b..a7691fc866 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -25,6 +25,14 @@
 
 namespace Sherlock {
 
+InventoryItem::InventoryItem(int requiredFlag, const Common::String &name,
+		const Common::String &description, const Common::String &examine) : 
+		_requiredFlag(requiredFlag), _name(name), _description(description), 
+		_examine(examine), _lookFlag(0) {
+}
+
+/*----------------------------------------------------------------*/
+
 Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(vm) {
 	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
 	_invGraphicsLoaded = false;
@@ -32,6 +40,7 @@ Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(v
 	_holdings = 0;
 	_oldFlag = 0;
 	_invFlag = 0;
+	_invMode = 0;
 }
 
 Inventory::~Inventory() {
@@ -77,6 +86,8 @@ void Inventory::loadInv() {
 	}
 	
 	delete stream;
+
+	loadGraphics();
 }
 
 /**
@@ -89,11 +100,11 @@ void Inventory::loadGraphics() {
 	// Default all inventory slots to empty
 	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
 
-	for (int idx = _invIndex; (idx < _holdings) && (idx - _invIndex) < 6; ++idx) {
+	for (int idx = _invIndex; (idx < _holdings) && (idx - _invIndex) < MAX_VISIBLE_INVENTORY; ++idx) {
 		// Get the name of the item to be dispalyed, figure out it's accompanying
 		// .VGS file with it's picture, and then load it
 		int invNum = findInv((*this)[idx]._name);
-		Common::String fName = Common::String::format("item%02d.vgs", invNum);
+		Common::String fName = Common::String::format("item%02d.vgs", invNum + 1);
 
 		_invShapes[idx] = new ImageFile(fName);
 	}
@@ -106,20 +117,73 @@ void Inventory::loadGraphics() {
  * and returns the numer that matches the passed name
  */
 int Inventory::findInv(const Common::String &name) {
-	int result = -1;
-
-	for (int idx = 0; (idx < _holdings) && result == -1; ++idx) {
+	for (int idx = 0; idx < size(); ++idx) {
 		if (scumm_stricmp(name.c_str(), _names[idx].c_str()) == 0)
-			result = idx;
+			return idx;
 	}
 
-	if (result == -1)
-		result = 1;
-	return result;
+	return 1;
 }
 
-void Inventory::putInv(int slamit) {
-	// TODO
+/**
+ * Display the character's inventory. The slamIt parameter specifies:
+ * 0 = Draw it on the back buffer, and don't display it
+ * 1 = Draw it on the back buffer, and then display it
+ * 2 = Draw it on the secondary back buffer, and don't display it
+ */
+void Inventory::putInv(int slamIt) {
+	Screen &screen = *_vm->_screen;
+	UserInterface &ui = *_vm->_ui;
+
+	// If an inventory item has disappeared (due to using it or giving it),
+	// a blank space slot may haave appeared. If so, adjust the inventory
+	if (_invIndex > 0 && _invIndex > (_holdings - 6)) {
+		--_invIndex;
+		freeGraphics();
+		loadGraphics();
+	}
+
+	if (slamIt != 2) {
+		screen.makePanel(Common::Rect(6, 163, 54, 197));
+		screen.makePanel(Common::Rect(58, 163, 106, 197));
+		screen.makePanel(Common::Rect(110, 163, 158, 197));
+		screen.makePanel(Common::Rect(162, 163, 210, 197));
+		screen.makePanel(Common::Rect(214, 163, 262, 197));
+		screen.makePanel(Common::Rect(266, 163, 314, 197));
+	}
+
+	// Iterate through displaying up to 6 objects at a time
+	for (int idx = _invIndex; idx < _holdings && (idx - _invIndex) < MAX_VISIBLE_INVENTORY; ++idx) {
+		int itemNum = idx - _invIndex;
+		Surface &bb = slamIt == 2 ? screen._backBuffer2 : screen._backBuffer1;
+		Common::Rect r(8 + itemNum * 52, 165, 51 + itemNum * 52, 194);
+
+		// Draw the background
+		if (idx == ui._selector) {
+			bb.fillRect(r, 235);
+		} else if (slamIt == 2) {
+			bb.fillRect(r, BUTTON_MIDDLE);
+		}
+
+		// Draw the item image
+		Graphics::Surface &img = (*_invShapes[itemNum])[0]._frame;
+		bb.transBlitFrom(img, Common::Point(6 + itemNum * 52 + ((47 - img.w) / 2), 
+			163 + ((33 - img.h) / 2)));
+	}
+
+	if (slamIt == 1)
+		screen.slamArea(6, 163, 308, 34);
+
+	if (slamIt != 2)
+		ui.clearInfo();
+
+	if (slamIt == 0) {
+		invCommands(0);
+	} else if (slamIt == 2) {
+		screen._backBuffer = &screen._backBuffer2;
+		invCommands(0);
+		screen._backBuffer = &screen._backBuffer1;
+	}
 }
 
 /**
@@ -173,7 +237,7 @@ void Inventory::drawInventory(int flag) {
 
 	if (tempFlag == 128)
 		flag = 1;
-	ui._invMode = flag;
+	_invMode = flag;
 
 	if (flag) {
 		ui._oldKey = INVENTORY_COMMANDS[flag];
@@ -202,8 +266,67 @@ void Inventory::drawInventory(int flag) {
 	ui._oldUse = -1;
 }
 
+/**
+ * Prints the line of inventory commands at the top of an inventory window with
+ * the correct highlighting
+ */
 void Inventory::invCommands(bool slamIt) {
-	// TODO
+	Screen &screen = *_vm->_screen;
+	UserInterface &ui = *_vm->_ui;
+
+	if (slamIt) {
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), 
+			_invMode == 0 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
+			true, "Exit");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), 
+			_invMode == 1 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
+			true, "Look");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), 
+			_invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			true, "Use");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), 
+			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			true, "Give");
+		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), 
+			_invMode == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"^^");
+		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1), 
+			_invMode == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"^");
+		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), 
+			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"_");
+		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), 
+			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"__");
+		if (_invMode != 1)
+			ui.clearInfo();
+	} else {
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), 
+			_invMode == 0 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			false, "Exit");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), 
+			_invMode == 1 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			false, "Look");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), 
+			_invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			false, "Use");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), 
+			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			false, "Give");
+		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1), 
+			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"^^");
+		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1),
+			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"^");
+		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1), 
+			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"_");
+		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1), 
+			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
+			"__");
+	}
 }
 
 void Inventory::doInvLite(int index, byte color) {
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 7785250e8c..e9a4ba5548 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -38,6 +38,9 @@ struct InventoryItem {
 	Common::String _description;;
 	Common::String _examine;
 	int _lookFlag;
+
+	InventoryItem(int requiredFlag, const Common::String &name,
+		const Common::String &description, const Common::String &examine);
 };
 
 class Inventory : public Common::Array<InventoryItem> {
@@ -47,6 +50,7 @@ public:
 	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
 	Common::StringArray _names;
 	bool _invGraphicsLoaded;
+	int _invMode;
 	int _invIndex;
 	int _holdings;
 	void freeGraphics();
@@ -64,7 +68,7 @@ public:
 
 	int findInv(const Common::String &name);
 
-	void putInv(int slamit);
+	void putInv(int slamIt);
 
 	void drawInventory(int flag);
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index db59434f85..d226c2e82a 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -68,6 +68,9 @@ void ScalpelEngine::initialize() {
 	for (int idx = 0; idx < NUM_PLACES; ++idx)
 		_map.push_back(Common::Point(MAP_X[idx], MAP_Y[idx]));
 
+	// Load the inventory
+	loadInventory();
+
 	// Starting scene
 	_scene->_goToScene = 4;
 }
@@ -176,6 +179,28 @@ bool ScalpelEngine::showOfficeCutscene() {
 	return true;
 }
 
+void ScalpelEngine::loadInventory() {
+	Inventory &inv = *_inventory;
+
+	// Initial inventory
+	inv._holdings = 2;
+	inv.push_back(InventoryItem(0, "Message", "A message requesting help", "_ITEM03A"));
+	inv.push_back(InventoryItem(0, "Holmes Card", "A number of business cards", "_ITEM07A"));
+	
+	// Potential items
+	inv.push_back(InventoryItem(95, "Tickets", "Opera Tickets", "_ITEM10A"));
+	inv.push_back(InventoryItem(138, "Cuff Link", "Cuff Link", "_ITEM04A"));
+	inv.push_back(InventoryItem(138, "Wire Hook", "Wire Hook", "_ITEM06A"));
+	inv.push_back(InventoryItem(150, "Note", "Note", "_ITEM13A"));
+	inv.push_back(InventoryItem(481, "Open Watch", "An open pocket watch", "_ITEM62A"));
+	inv.push_back(InventoryItem(481, "Paper", "A piece of paper with numbers on it", "_ITEM44A"));
+	inv.push_back(InventoryItem(532, "Letter", "A letter folded many times", "_ITEM68A"));
+	inv.push_back(InventoryItem(544, "Tarot", "Tarot Cards", "_ITEM71A"));
+	inv.push_back(InventoryItem(544, "Ornate Key", "An ornate key", "_ITEM70A"));
+	inv.push_back(InventoryItem(586, "Pawn ticket", "A pawn ticket", "_ITEM16A"));
+};
+
+
 /**
  * Starting a scene within the game
  */
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index caf33052aa..34d017e757 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -41,6 +41,8 @@ private:
 	bool showAlleyCutscene();
 	bool showStreetCutscene();
 	bool showOfficeCutscene();
+
+	void loadInventory();
 protected:
 	virtual void initialize();
 
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 16d590c0f4..a3705b54da 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -310,7 +310,7 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
  * Prints the text passed onto the back buffer at the given position and color.
  * The string is then blitted to the screen
  */
-void Screen::print(const Common::Point &pt, int color, const char *format, ...) {
+void Screen::print(const Common::Point &pt, byte color, const char *format, ...) {
 	// Create the string to display
 	char buffer[100];
 	va_list args;
@@ -344,7 +344,7 @@ void Screen::print(const Common::Point &pt, int color, const char *format, ...)
 /**
  * Print a strings onto the back buffer without blitting it to the screen
  */
-void Screen::gPrint(const Common::Point &pt, int color, const char *format, ...) {
+void Screen::gPrint(const Common::Point &pt, byte color, const char *format, ...) {
 	// Create the string to display
 	char buffer[100];
 	va_list args;
@@ -386,7 +386,7 @@ int Screen::charWidth(char c) {
 /**
  * Draws the given string into the back buffer using the images stored in _font
  */
-void Screen::writeString(const Common::String &str, const Common::Point &pt, int color) {
+void Screen::writeString(const Common::String &str, const Common::Point &pt, byte color) {
 	Common::Point charPos = pt;
 
 	for (const char *c = str.c_str(); *c; ++c) {
@@ -427,4 +427,45 @@ void Screen::makeButton(const Common::Rect &bounds, int textX,
 		COMMAND_FOREGROUND, "%s", str.c_str() + 1);
 }
 
+/**
+ * Prints an interface command with the first letter highlighted to indicate
+ * what keyboard shortcut is associated with it
+ */
+void Screen::buttonPrint(const Common::Point &pt, byte color, bool slamIt,
+		const Common::String &str) {
+	int xStart = pt.x - stringWidth(str) / 2;
+
+	if (color == COMMAND_FOREGROUND) {
+		// First character needs to be highlighted
+		if (slamIt) {
+			print(Common::Point(xStart, pt.y + 1), COMMAND_HIGHLIGHTED, "%c", str[0]);
+			print(Common::Point(xStart + charWidth(str[0]), pt.y + 1),
+				color, "%s", str.c_str() + 1);
+		} else {
+			print(Common::Point(xStart, pt.y), COMMAND_HIGHLIGHTED, "%c", str[0]);
+			print(Common::Point(xStart + charWidth(str[0]), pt.y),
+				color, "%s", str.c_str() + 1);
+		}
+	} else {
+		print(Common::Point(xStart, slamIt ? pt.y + 1 : pt.y), COMMAND_HIGHLIGHTED,
+			"%s", str.c_str());
+	}
+}
+
+/**
+ * Draw a panel in th eback buffer with a raised area effect around the edges
+ */
+void Screen::makePanel(const Common::Rect &r) {
+	_backBuffer->fillRect(r, BUTTON_MIDDLE);
+	_backBuffer->hLine(r.left, r.top, r.right - 2, BUTTON_TOP);
+	_backBuffer->hLine(r.left + 1, r.top + 1, r.right - 3, BUTTON_TOP);
+	_backBuffer->vLine(r.left, r.top, r.bottom - 1, BUTTON_TOP);
+	_backBuffer->vLine(r.left + 1, r.top + 1, r.bottom - 2, BUTTON_TOP);
+	
+	_backBuffer->vLine(r.right - 1, r.top, r.bottom - 1, BUTTON_BOTTOM);
+	_backBuffer->vLine(r.right - 2, r.top + 1, r.bottom - 2, BUTTON_BOTTOM);
+	_backBuffer->hLine(r.left, r.bottom - 1, r.right - 1, BUTTON_BOTTOM);
+	_backBuffer->hLine(r.left + 1, r.bottom - 2, r.right - 1, BUTTON_BOTTOM);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index f33bbfceab..5047d40216 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -44,6 +44,8 @@ enum {
 	INV_BACKGROUND	= 1,
 	COMMAND_HIGHLIGHTED = 10,
 	COMMAND_FOREGROUND = 15,
+	COMMAND_BACKGROUND = 4,
+	COMMAND_NULL = 248,
 	BUTTON_TOP = 233,
 	BUTTON_MIDDLE	= 244,
 	BUTTON_BOTTOM	= 248,
@@ -65,7 +67,7 @@ private:
 
 	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
 
-	void writeString(const Common::String &str, const Common::Point &pt, int color);
+	void writeString(const Common::String &str, const Common::Point &pt, byte color);
 protected:
 	virtual void addDirtyRect(const Common::Rect &r);
 public:
@@ -96,8 +98,8 @@ public:
 
 	void verticalTransition();
 
-	void print(const Common::Point &pt, int color, const char *format, ...);
-	void gPrint(const Common::Point &pt, int color, const char *format, ...);
+	void print(const Common::Point &pt, byte color, const char *format, ...);
+	void gPrint(const Common::Point &pt, byte color, const char *format, ...);
 
 	void restoreBackground(const Common::Rect &r);
 
@@ -114,6 +116,10 @@ public:
 	void vgaBar(const Common::Rect &r, int color);
 
 	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
+
+	void buttonPrint(const Common::Point &pt, byte color, bool slamIt, const Common::String &str);
+
+	void makePanel(const Common::Rect &r);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index a993965429..5e8b3287f0 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -77,8 +77,6 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_windowOpen = false;
 	_oldLook = false;
 	_keyboardInput = false;
-	_invMode = 0;
-	_invIndex = 0;
 	_pause = false;
 	_cNum = 0;
 	_selector = _oldSelector = -1;
@@ -116,6 +114,7 @@ void UserInterface::drawInterface() {
  */
 void UserInterface::handleInput() {
 	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -276,7 +275,7 @@ void UserInterface::handleInput() {
 	case USE_MODE:
 	case GIVE_MODE:
 	case INV_MODE:
-		if (_invMode == 1 || _invMode == 2 || _invMode == 3) {
+		if (inv._invMode == 1 || inv._invMode == 2 || inv._invMode == 3) {
 			if (pt.y < CONTROLS_Y)
 				lookInv();
 			else
@@ -455,11 +454,6 @@ void UserInterface::toggleButton(int num) {
 	}
 }
 
-void UserInterface::buttonPrint(const Common::Point &pt, int color, bool slamIt,
-		const Common::String &str) {
-	// TODO
-}
-
 /**
  * Clears the info line of the screen
  */
@@ -566,10 +560,10 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 			if (!tempStr.empty() && tempStr[0] != ' ') {
 				// If inventory is active and an item is selected for a Use or Give action
 				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
-						(_invMode == 2 || _invMode == 3)) {
+						(inv._invMode == 2 || inv._invMode == 3)) {
 					width1 = screen.stringWidth(inv[_selector]._name);
 
-					if (_invMode == 2) {
+					if (inv._invMode == 2) {
 						// Using an object
 						x = width = screen.stringWidth("Use ");
 
@@ -658,7 +652,7 @@ void UserInterface::lookInv() {
 
 	if (mousePos.x > 15 && mousePos.x < 314 && mousePos.y > (CONTROLS_Y1 + 11)
 			&& mousePos.y < (SHERLOCK_SCREEN_HEIGHT - 2)) {
-		int temp = (mousePos.x - 6) / 52 + _invIndex;
+		int temp = (mousePos.x - 6) / 52 + inv._invIndex;
 		if (temp < inv._holdings) {
 			if (temp < inv._holdings) {
 				clearInfo();
@@ -712,25 +706,25 @@ void UserInterface::doInvControl() {
 		if (found != -1)
 			// If a slot highlighted, set it's color
 			colors[found] = COMMAND_HIGHLIGHTED;
-		buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
 			colors[0], true, "Exit");
 
 		if (found >= 0 && found <= 3) {
-			buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
-			buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[1], true, "Use");
-			buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[1], true, "Give");
-			_invMode = found;
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[1], true, "Use");
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[1], true, "Give");
+			inv._invMode = found;
 			_selector = -1;
 		}
 
-		if (_invIndex) {
+		if (inv._invIndex) {
 			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 				colors[4], "^^");
 			screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
 				colors[5], "^");
 		}
 
-		if ((inv._holdings - _invIndex) > 6) {
+		if ((inv._holdings - inv._invIndex) > 6) {
 			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
 				colors[6], "^^");
 			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
@@ -738,7 +732,7 @@ void UserInterface::doInvControl() {
 		}
 
 		bool flag = false;
-		if (_invMode == 1 || _invMode == 2 || _invMode == 3) {
+		if (inv._invMode == 1 || inv._invMode == 2 || inv._invMode == 3) {
 			Common::Rect r(15, CONTROLS_Y1 + 11, 314, SHERLOCK_SCREEN_HEIGHT - 2);
 			flag = (_selector < inv._holdings);
 		}
@@ -756,16 +750,16 @@ void UserInterface::doInvControl() {
 
 		if (_key == 'E' || _key == 'L' || _key == 'U' || _key == 'G'
 				|| _key == '-' || _key == '+') {
-			int temp = _invMode;
+			int temp = inv._invMode;
 
 			const char *chP = strchr(INVENTORY_COMMANDS, _key);
-			_invMode = !chP ? 8 : chP - INVENTORY_COMMANDS;
+			inv._invMode = !chP ? 8 : chP - INVENTORY_COMMANDS;
 			inv.invCommands(true);
 
-			_invMode = temp;
+			inv._invMode = temp;
 			_keyboardInput = true;
 			if (_key == 'E')
-				_invMode = STD_MODE;
+				inv._invMode = STD_MODE;
 			_selector = -1;
 		} else {
 			_selector = -1;
@@ -775,7 +769,7 @@ void UserInterface::doInvControl() {
 	if (_selector != _oldSelector) {
 		if (_oldSelector != -1) {
 			// Un-highlight
-			if (_oldSelector >= _invIndex && _oldSelector < (_invIndex + 6))
+			if (_oldSelector >= inv._invIndex && _oldSelector < (inv._invIndex + 6))
 				inv.doInvLite(_oldSelector, BUTTON_MIDDLE);
 		}
 
@@ -795,16 +789,16 @@ void UserInterface::doInvControl() {
 			events.clearEvents();
 			events.setCursor(ARROW);
 		} else if ((found == 1 && events._released) || (_key == 'L')) {
-			_invMode = 1;
+			inv._invMode = 1;
 		} else if ((found == 2 && events._released) || (_key == 'U')) {
-			_invMode = 2;
+			inv._invMode = 2;
 		} else if ((found == 3 && events._released) || (_key == 'G')) {
-			_invMode = 3;
-		} else if (((found == 4 && events._released) || _key == ',') && _invIndex) {
-			if (_invIndex >= 6)
-				_invIndex -= 6;
+			inv._invMode = 3;
+		} else if (((found == 4 && events._released) || _key == ',') && inv._invIndex) {
+			if (inv._invIndex >= 6)
+				inv._invIndex -= 6;
 			else
-				_invIndex = 0;
+				inv._invIndex = 0;
 
 			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 				COMMAND_HIGHLIGHTED, "^^");
@@ -812,26 +806,28 @@ void UserInterface::doInvControl() {
 			inv.loadGraphics();
 			inv.putInv(1);
 			inv.invCommands(true);
-		} else if (((found == 5 && events._released) || _key == '-') && _invIndex) {
-			--_invIndex;
+		} else if (((found == 5 && events._released) || _key == '-') && inv._invIndex) {
+			--inv._invIndex;
 			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 				COMMAND_HIGHLIGHTED, "^");
 			inv.freeGraphics();
 			inv.loadGraphics();
 			inv.putInv(1);
 			inv.invCommands(true);
-		} else if (((found == 6 && events._released) || _key == '+') && (inv._holdings - _invIndex) > 6) {
-			++_invIndex;
+		} else if (((found == 6 && events._released) || _key == '+') && 
+				(inv._holdings - inv._invIndex) > 6) {
+			++inv._invIndex;
 			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
 				COMMAND_HIGHLIGHTED, "_");
 			inv.freeGraphics();
 			inv.loadGraphics();
 			inv.putInv(1);
 			inv.invCommands(true);
-		} else if (((found == 7 && events._released) || _key == '.') && (inv._holdings - _invIndex) > 6) {
-			_invIndex += 6;
-			if ((inv._holdings - 6) < _invIndex)
-				_invIndex = inv._holdings - 6;
+		} else if (((found == 7 && events._released) || _key == '.') && 
+				(inv._holdings - inv._invIndex) > 6) {
+			inv._invIndex += 6;
+			if ((inv._holdings - 6) < inv._invIndex)
+				inv._invIndex = inv._holdings - 6;
 
 			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
 				COMMAND_HIGHLIGHTED, "_");
@@ -841,7 +837,7 @@ void UserInterface::doInvControl() {
 			inv.invCommands(true);
 		} else {
 			// If something is being given, make sure it's to a person
-			if (_invMode == 3) {
+			if (inv._invMode == 3) {
 				if (_bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON)
 					_find = _bgFound;
 				else
@@ -850,7 +846,7 @@ void UserInterface::doInvControl() {
 				_find = _bgFound;
 			}
 
-			if ((mousePos.y < CONTROLS_Y1) && (_invMode == 1) && (_find >= 0) && (_find < 1000)) {
+			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == 1) && (_find >= 0) && (_find < 1000)) {
 				if (!scene._bgShapes[_find]._examine.empty() &&
 						scene._bgShapes[_find]._examine[0] >= ' ')
 					inv.doInvJF();
@@ -859,7 +855,7 @@ void UserInterface::doInvControl() {
 				// If it's -1, then no inventory item is highlighted yet. Otherwise,
 				// an object in the scene has been clicked.
 
-				if (_selector != -1 && _invMode == 1 && mousePos.y >(CONTROLS_Y1 + 11))
+				if (_selector != -1 && inv._invMode == 1 && mousePos.y >(CONTROLS_Y1 + 11))
 					inv.doInvJF();
 
 				if (talk._talkToAbort)
@@ -872,7 +868,7 @@ void UserInterface::doInvControl() {
 				// is being tried on an object in the scene without an inventory
 				// object being highlighted first.
 
-				if ((_invMode == 2 || (_selector != -1 && _invMode == 3)) && _find >= 0) {
+				if ((inv._invMode == 2 || (_selector != -1 && inv._invMode == 3)) && _find >= 0) {
 					events._pressed = events._released = false;
 					_infoFlag = true;
 					clearInfo();
@@ -882,8 +878,8 @@ void UserInterface::doInvControl() {
 
 					inv.putInv(1);
 					_selector = temp;		// Restore it
-					temp = _invMode;
-					_invMode = -1;
+					temp = inv._invMode;
+					inv._invMode = -1;
 					inv.invCommands(true);
 
 					_infoFlag = true;
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 87fd4a5e99..14462d6a34 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -75,8 +75,6 @@ private:
 	int _invLookFlag;
 	int _oldLook;
 	bool _keyboardInput;
-	int _invMode;
-	int _invIndex;
 	bool _pause;
 	int _cNum;
 	int _selector, _oldSelector;
@@ -97,8 +95,6 @@ private:
 
 	void toggleButton(int num);
 
-	void buttonPrint(const Common::Point &pt, int color, bool slamIt, const Common::String &str);
-
 	void examine();
 
 	void lookScreen(const Common::Point &pt);
-- 
cgit v1.2.3


From fb0f95172a0395cc6d86f26fea5de2c6a780999a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 29 Mar 2015 16:21:49 -0400
Subject: MADS: Don't hide sprites bewteen resources in an animation sequence

---
 engines/mads/menu_views.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 5a0c7ee92e..319f5b0f87 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -544,6 +544,7 @@ void AnimationView::doFrame() {
 			scriptDone();
 		} else {
 			scene._frameStartTime = 0;
+			scene._spriteSlots.clear();
 			loadNextResource();
 		}
 	} else if (_currentAnimation->getCurrentFrame() == 1) {
@@ -559,6 +560,10 @@ void AnimationView::doFrame() {
 		++scene._frameStartTime;
 		_currentAnimation->update();
 		_redrawFlag = true;
+
+		if (_currentAnimation->freeFlag())
+			// We don't want the sprites removed after the last animation frame
+			scene._spriteSlots.clear();
 	}
 }
 
-- 
cgit v1.2.3


From 478fae2a6ea6d1c896cd9d5454b170889fc8447a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 29 Mar 2015 22:12:27 -0400
Subject: MADS: Set testing flags for Rex Nebular

---
 engines/mads/detection_tables.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 0a8e98bb31..faf73996ac 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -55,7 +55,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			ADGF_TESTING,
 			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
@@ -73,7 +73,7 @@ static const MADSGameDescription gameDescriptions[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			ADGF_TESTING,
 			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
 		},
 		GType_RexNebular,
-- 
cgit v1.2.3


From 943d0a702fe468f14fb40f73ef68588705488037 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 30 Mar 2015 21:07:01 -0400
Subject: SHERLOCK: Beginnings of talk loading, added skeleton Scripts class

---
 engines/sherlock/inventory.cpp      |  42 ++++--
 engines/sherlock/inventory.h        |  15 +-
 engines/sherlock/module.mk          |   1 +
 engines/sherlock/people.h           |  13 +-
 engines/sherlock/scene.cpp          |  16 +-
 engines/sherlock/scene.h            |  11 +-
 engines/sherlock/screen.cpp         |  11 ++
 engines/sherlock/screen.h           |   4 +
 engines/sherlock/scripts.cpp        |  35 +++++
 engines/sherlock/scripts.h          |  48 ++++++
 engines/sherlock/sherlock.cpp       |  14 +-
 engines/sherlock/sherlock.h         |   6 +-
 engines/sherlock/talk.cpp           | 291 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/talk.h             |  43 +++++-
 engines/sherlock/user_interface.cpp |  58 ++++---
 engines/sherlock/user_interface.h   |  11 +-
 16 files changed, 542 insertions(+), 77 deletions(-)
 create mode 100644 engines/sherlock/scripts.cpp
 create mode 100644 engines/sherlock/scripts.h

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index a7691fc866..ac37e7c587 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -40,7 +40,7 @@ Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(v
 	_holdings = 0;
 	_oldFlag = 0;
 	_invFlag = 0;
-	_invMode = 0;
+	_invMode = INVMODE_EXIT;
 }
 
 Inventory::~Inventory() {
@@ -117,7 +117,7 @@ void Inventory::loadGraphics() {
  * and returns the numer that matches the passed name
  */
 int Inventory::findInv(const Common::String &name) {
-	for (int idx = 0; idx < size(); ++idx) {
+	for (int idx = 0; idx < (int)size(); ++idx) {
 		if (scumm_stricmp(name.c_str(), _names[idx].c_str()) == 0)
 			return idx;
 	}
@@ -219,25 +219,25 @@ void Inventory::drawInventory(int flag) {
 
 	// Draw the buttons
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[0][0], CONTROLS_Y1, INVENTORY_POINTS[0][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[1][0], CONTROLS_Y1, INVENTORY_POINTS[1][1],
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[1][2] - screen.stringWidth("Look") / 2, "Look");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[1][2] - screen.stringWidth("Look") / 2, "Look");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[2][0], CONTROLS_Y1, INVENTORY_POINTS[2][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[2][2] - screen.stringWidth("Use") / 2, "Use");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[2][2] - screen.stringWidth("Use") / 2, "Use");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[3][0], CONTROLS_Y1, INVENTORY_POINTS[3][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[3][2] - screen.stringWidth("Give") / 2, "Give");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[3][2] - screen.stringWidth("Give") / 2, "Give");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[4][0], CONTROLS_Y1, INVENTORY_POINTS[4][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[4][2], "^^");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[4][2], "^^");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[5][0], CONTROLS_Y1, INVENTORY_POINTS[5][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[5][2], "^");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[5][2], "^");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[6][0], CONTROLS_Y1, INVENTORY_POINTS[6][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[6][2], "_");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[6][2], "_");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[7][0], CONTROLS_Y1, INVENTORY_POINTS[7][1], 
-		CONTROLS_Y1 + 9), INVENTORY_POINTS[7][2], "__");
+		CONTROLS_Y1 + 10), INVENTORY_POINTS[7][2], "__");
 
 	if (tempFlag == 128)
 		flag = 1;
-	_invMode = flag;
+	_invMode = (InvMode)flag;
 
 	if (flag) {
 		ui._oldKey = INVENTORY_COMMANDS[flag];
@@ -334,7 +334,25 @@ void Inventory::doInvLite(int index, byte color) {
 }
 
 void Inventory::doInvJF() {
-	// TODO
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
+
+	ui._invLookFlag = true;
+	freeInv();
+
+	ui._infoFlag = true;
+	ui.clearInfo();
+
+	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(0, CONTROLS_Y),
+		Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	ui.examine();
+
+	if (!talk._talkToAbort) {
+		screen._backBuffer2.blitFrom((*ui._controlPanel)[0]._frame,
+			Common::Point(0, CONTROLS_Y));
+		loadInv();
+	}
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index e9a4ba5548..3c01dc38da 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -32,6 +32,19 @@ namespace Sherlock {
 
 #define MAX_VISIBLE_INVENTORY 6
 
+enum InvMode {
+	INVMODE_EXIT = 0,
+	INVMODE_LOOK = 1,
+	INVMODE_USE = 2,
+	INVMODE_GIVE = 3,
+	INVMODE_FIRST = 4,
+	INVMODE_PREVIOUS = 5,
+	INVMODE_NEXT = 6,
+	INVMODE_LAST = 7,
+	INVMODE_INVALID = 8,
+	INVMODE_USE55 = 255
+};
+
 struct InventoryItem {
 	int _requiredFlag;
 	Common::String _name;
@@ -50,7 +63,7 @@ public:
 	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
 	Common::StringArray _names;
 	bool _invGraphicsLoaded;
-	int _invMode;
+	InvMode _invMode;
 	int _invIndex;
 	int _holdings;
 	void freeGraphics();
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 4101769a80..a01f9f0f71 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -18,6 +18,7 @@ MODULE_OBJS = \
 	resources.o \
 	scene.o \
 	screen.o \
+	scripts.o \
 	sherlock.o \
 	sound.o \
 	talk.o \
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 0393528095..6b5c59b1bd 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -52,17 +52,24 @@ enum {
 
 class SherlockEngine;
 
+class Person: public Sprite {
+public:
+	Person() : Sprite() {}
+
+	Common::String _portrait;
+};
+
 class People {
 private:
 	SherlockEngine *_vm;
-	Sprite _data[MAX_PEOPLE];
-	Sprite &_player;
+	Person _data[MAX_PEOPLE];
 	bool _walkLoaded;
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
 public:
 	Common::Point _walkDest;
 	Common::Stack<Common::Point> _walkTo;
+	Person &_player;
 	bool _holmesOn;
 	bool _portraitLoaded;
 	Object _portrait;
@@ -72,7 +79,7 @@ public:
 	People(SherlockEngine *vm);
 	~People();
 
-	Sprite &operator[](PeopleId id) { return _data[id]; }
+	Person &operator[](PeopleId id) { return _data[id]; }
 
 	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index c3afc4a0d4..7c66a1dc62 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -99,7 +99,6 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_hsavedPos = Common::Point(-1, -1);
 	_hsavedFs = -1;
 	_cAnimFramePause = 0;
-	_invMode = INVMODE_0;
 	_restoreFlag = false;
 	_invLookFlag = false;
 	_lookHelp = false;
@@ -119,6 +118,7 @@ void Scene::selectScene() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
+	Scripts &scripts = *_vm->_scripts;
 	UserInterface &ui = *_vm->_ui;
 
 	// Reset fields
@@ -150,8 +150,8 @@ void Scene::selectScene() {
 
 	// If there were any scripst waiting to be run, but were interrupt by a running
 	// canimation (probably the last scene's exit canim), clear the _scriptMoreFlag
-	if (_vm->_scriptMoreFlag == 3)
-		_vm->_scriptMoreFlag = 0;
+	if (scripts._scriptMoreFlag == 3)
+		scripts._scriptMoreFlag = 0;
 }
 
 /**
@@ -1050,8 +1050,10 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
  */
 void Scene::doBgAnim() {
 	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
+	Scripts &scripts = *_vm->_scripts;
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
@@ -1079,7 +1081,7 @@ void Scene::doBgAnim() {
 
 	// Check for setting magnifying glass cursor
 	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
-		if (_invMode == INVMODE_1) {
+		if (inv._invMode == INVMODE_LOOK) {
 			// Only show Magnifying glass cursor if it's not on the inventory command line
 			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
 				events.setCursor(MAGNIFY);
@@ -1357,10 +1359,10 @@ void Scene::doBgAnim() {
 	// Check if the method was called for calling a portrait, and a talk was
 	// interrupting it. This talk file would not have been executed at the time, 
 	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
-	if (people._clearingThePortrait && _vm->_scriptMoreFlag == 3) {
+	if (people._clearingThePortrait && scripts._scriptMoreFlag == 3) {
 		// Reset the flags and call to talk
-		people._clearingThePortrait = _vm->_scriptMoreFlag = 0;
-		talk.talkTo(_vm->_scriptName);
+		people._clearingThePortrait = scripts._scriptMoreFlag = 0;
+		talk.talkTo(scripts._scriptName);
 	}
 }
 
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index d89a47e560..cd64073621 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -35,14 +35,6 @@ namespace Sherlock {
 #define MAX_ZONES    40
 #define INFO_LINE   140
 
-enum InvMode {
-	INVMODE_0	= 0,
-	INVMODE_1	= 1,
-	INVMODE_2	= 2,
-	INVMODE_3	= 3,
-	INVMODE_255 = 255
-};
-
 class SherlockEngine;
 
 struct BgFileHeader {
@@ -94,9 +86,7 @@ class Scene {
 private:
 	SherlockEngine *_vm;
 	Common::String _rrmName;
-	InvMode _invMode;
 	int _selector;
-	bool _invLookFlag;
 	bool _lookHelp;
 
 	bool loadScene(const Common::String &filename);
@@ -149,6 +139,7 @@ public:
 	bool _doBgAnimDone;
 	int _tempFadeStyle;
 	int _cAnimFramePause;
+	bool _invLookFlag;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index a3705b54da..0eeddf2a5f 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -468,4 +468,15 @@ void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->hLine(r.left + 1, r.bottom - 2, r.right - 1, BUTTON_BOTTOM);
 }
 
+void Screen::setDisplayBounds(const Common::Rect &r) {
+	// TODO: See if needed
+}
+void Screen::resetDisplayBounds() {
+	setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+}
+
+Common::Rect Screen::getDisplayBounds() {
+	return Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 5047d40216..597c47c83a 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -120,6 +120,10 @@ public:
 	void buttonPrint(const Common::Point &pt, byte color, bool slamIt, const Common::String &str);
 
 	void makePanel(const Common::Rect &r);
+
+	void setDisplayBounds(const Common::Rect &r);
+	void resetDisplayBounds();
+	Common::Rect getDisplayBounds();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scripts.cpp b/engines/sherlock/scripts.cpp
new file mode 100644
index 0000000000..ace957bd76
--- /dev/null
+++ b/engines/sherlock/scripts.cpp
@@ -0,0 +1,35 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scripts.h"
+#include "sherlock/sherlock.h"
+
+namespace Sherlock {
+
+Scripts::Scripts(SherlockEngine *vm): _vm(vm) {
+	_scriptMoreFlag = 0;
+	_scriptSaveIndex = 0;
+	_scriptSelect = 0;
+	_abortFlag = false;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/scripts.h b/engines/sherlock/scripts.h
new file mode 100644
index 0000000000..eede1ca103
--- /dev/null
+++ b/engines/sherlock/scripts.h
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCRIPTS_H
+#define SHERLOCK_SCRIPTS_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+class Scripts {
+private:
+	SherlockEngine *_vm;
+public:
+	int _scriptMoreFlag;
+	Common::String _scriptName;
+	int _scriptSaveIndex;
+	int _scriptSelect;
+	bool _abortFlag;
+public:
+	Scripts(SherlockEngine *vm);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 107dee5a41..04a9ed54d5 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -39,6 +39,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_res = nullptr;
 	_scene = nullptr;
 	_screen = nullptr;
+	_scripts = nullptr;
 	_sound = nullptr;
 	_talk = nullptr;
 	_ui = nullptr;
@@ -47,7 +48,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_loadingSavedGame = false;
 	_onChessboard = false;
 	_slowChess = false;
-	_scriptMoreFlag = 0;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -58,6 +58,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _people;
 	delete _scene;
 	delete _screen;
+	delete _scripts;
 	delete _sound;
 	delete _talk;
 	delete _ui;
@@ -82,6 +83,7 @@ void SherlockEngine::initialize() {
 	_people = new People(this);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
+	_scripts = new Scripts(this);
 	_sound = new Sound(this);
 	_talk = new Talk(this);
 	_ui = new UserInterface(this);
@@ -120,10 +122,10 @@ void SherlockEngine::sceneLoop() {
 	while (!shouldQuit() && _scene->_goToScene == -1) {
 		// See if a script needs to be completed from either a goto room code,
 		// or a script that was interrupted by another script
-		if (_scriptMoreFlag == 1 || _scriptMoreFlag == 3)
-			_talk->talkTo(_scriptName);
+		if (_scripts->_scriptMoreFlag == 1 || _scripts->_scriptMoreFlag == 3)
+			_talk->talkTo(_scripts->_scriptName);
 		else
-			_scriptMoreFlag = 0;
+			_scripts->_scriptMoreFlag = 0;
 
 		// Handle any input from the keyboard or mouse
 		handleInput();
@@ -171,4 +173,8 @@ void SherlockEngine::setFlags(int flagNum) {
 	_scene->checkSceneFlags(true);
 }
 
+void SherlockEngine::freeSaveGameList() {
+	// TODO
+}
+
 } // End of namespace Comet
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 392f55839e..7b562e0a23 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -40,6 +40,7 @@
 #include "sherlock/resources.h"
 #include "sherlock/scene.h"
 #include "sherlock/screen.h"
+#include "sherlock/scripts.h"
 #include "sherlock/sound.h"
 #include "sherlock/talk.h"
 #include "sherlock/user_interface.h"
@@ -89,6 +90,7 @@ public:
 	Resources *_res;
 	Scene *_scene;
 	Screen *_screen;
+	Scripts *_scripts;
 	Sound *_sound;
 	Talk *_talk;
 	UserInterface *_ui;
@@ -104,8 +106,6 @@ public:
 	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _onChessboard;
 	bool _slowChess;
-	int _scriptMoreFlag;
-	Common::String _scriptName;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
@@ -125,6 +125,8 @@ public:
 	bool readFlags(int flagNum);
 
 	void setFlags(int flagNum);
+
+	void freeSaveGameList();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ff71d37a2f..d67013b60e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -25,13 +25,238 @@
 
 namespace Sherlock {
 
+/**
+ * Load the data for a single statement within a talk file
+ */
+void Statement::synchronize(Common::SeekableReadStream &s, bool voices) {
+	int length;
+
+	length = s.readUint16LE();
+	for (int idx = 0; idx < length; ++idx)
+		_statement += (char)s.readByte();
+
+	length = s.readUint16LE();
+	for (int idx = 0; idx < length; ++idx)
+		_reply += (char)s.readByte();
+
+	// If we don't have digital sound, we'll need to strip out voice commands from reply
+	if (!voices) {
+		// Scan for a 140 byte, which indicates playing a sound
+		for (uint idx = 0; idx < _reply.size(); ++idx) {
+			if (_reply[idx] == 140) {
+				// Replace instruction character with a space, and delete the
+				// rest of the name following it
+				_reply = Common::String(_reply.c_str(), _reply.c_str() + idx) + " " +
+					Common::String(_reply.c_str() + 9);
+			}
+		}
+
+		// Ensure the last character of the reply is not a space from the prior
+		// conversion loop, to avoid any issues with the space ever causing a page
+		// wrap, and ending up displaying another empty page
+		while (_reply.lastChar() == ' ')
+			_reply.deleteLastChar();
+	}
+
+	length = s.readUint16LE();
+	for (int idx = 0; idx < length; ++idx)
+		_linkFile += (char)s.readByte();
+
+	length = s.readUint16LE();
+	for (int idx = 0; idx < length; ++idx)
+		_voiceFile += (char)s.readByte();
+
+	_required.resize(s.readByte());
+	_modified.resize(s.readByte());
+
+	// Read in flag required/modified data
+	for (uint idx = 0; idx < _required.size(); ++idx)
+		_required[idx] = s.readUint16LE();
+	for (uint idx = 0; idx < _modified.size(); ++idx)
+		_modified[idx] = s.readUint16LE();
+
+	_portraitSide = s.readByte();
+	_quotient = s.readUint16LE();
+}
+
+/*----------------------------------------------------------------*/
+
 Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkCounter = 0;
 	_talkToAbort = false;
+	_saveSeqNum = 0;
+	_speaker = 0;
+	_talkIndex = 0;
+	_talkTo = 0;
 }
 
-void Talk::talkTo(const Common::String &name) {
-	// TODO
+/**
+ * Called when either an NPC initiates a conversation or for inventory item
+ * descriptions. It opens up a description window similar to how 'talk' does,
+ * but shows a 'reply' directly instead of waiting for a statement option.
+ */
+void Talk::talkTo(const Common::String &filename) {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Scripts &scripts = *_vm->_scripts;
+	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
+	Common::Rect savedBounds = screen.getDisplayBounds();
+
+	if (filename.empty())
+		// No filename passed, so exit
+		return;
+
+	// If there any canimations currently running, or a portrait is being cleared,
+	// save the filename for later executing when the canimation is done
+	if (scene._ongoingCans || people._clearingThePortrait) {
+		// Make sure we're not in the middle of a script
+		if (!scripts._scriptMoreFlag) {
+			scripts._scriptName = filename;
+			scripts._scriptSaveIndex = 0;
+
+			// Flag the selection, since we don't yet know which statement yet
+			scripts._scriptSelect = 100;
+			scripts._scriptMoreFlag = 3;
+		}
+
+		return;
+	}
+
+	// Save the ui mode temporarily and switch to talk mode
+	int savedMode = ui._menuMode;
+	ui._menuMode = TALK_MODE;
+
+	// Turn on the Exit option
+	ui._endKeyActive = true;
+
+	if (people[AL]._walkCount || people._walkTo.size() > 0) {
+		// Only interrupt if an action if trying to do an action, and not just
+		// if the player is walking around the scene
+		if (people._allowWalkAbort)
+			scripts._abortFlag = true;
+
+		people.gotoStand(people._player);
+	}
+
+	if (talk._talkToAbort)
+		return;
+
+	talk.freeTalkVars();
+
+	// If any sequences have changed in the prior talk file, restore them
+	if (_savedSequences.size() > 0) {
+		for (uint idx = 0; idx < _savedSequences.size(); ++idx) {
+			SavedSequence &ss = _savedSequences[idx];
+			for (uint idx2 = 0; idx2 < _savedSequences.size(); ++idx2)
+				scene._bgShapes[ss._objNum]._sequences[idx2] = ss._sequences[idx2];
+		
+			// Reset the object's frame to the beginning of the sequence
+			scene._bgShapes[ss._objNum]._frameNumber = 0;
+		}
+	}
+
+	while (_sequenceStack.empty())
+		pullSequence();
+
+	// Restore any pressed button
+	if (!ui._windowOpen && savedMode != STD_MODE)
+		ui.restoreButton(savedMode - 1);
+
+	// Clear the ui counter so that anything displayed on the info line
+	// before the window was opened isn't cleared
+	ui._menuCounter = 0;
+
+	// Close any previous window before starting the talk
+	if (ui._windowOpen) {
+		switch (savedMode) {
+		case LOOK_MODE:
+			events.setCursor(ARROW);
+
+			if (ui._invLookFlag) {
+				screen.resetDisplayBounds();
+				ui.drawInterface(2);
+			}
+
+			ui.banishWindow();
+			ui._windowBounds.top = CONTROLS_Y1;
+			ui._temp = ui._oldTemp = ui._lookHelp = 0;
+			ui._menuMode = STD_MODE;
+			events._pressed = events._released = events._oldButtons = 0;
+			ui._invLookFlag = false;
+			break;
+
+		case TALK_MODE:
+			if (_speaker < 128)
+				clearTalking();
+			if (_talkCounter)
+				return;
+
+			// If we were in inventory mode looking at an object, restore the
+			// back buffers before closing the window, so we get the ui restored
+			// rather than the inventory again
+			if (ui._invLookFlag) {
+				screen.resetDisplayBounds();
+				ui.drawInterface(2);
+				ui._invLookFlag = ui._lookScriptFlag = false;
+			}
+
+			ui.banishWindow();
+			ui._windowBounds.top = CONTROLS_Y1;
+			scripts._abortFlag = true;
+			break;
+
+		case INV_MODE:
+		case USE_MODE:
+		case GIVE_MODE:
+			inv.freeInv();
+			if (ui._invLookFlag) {
+				screen.resetDisplayBounds();
+				ui.drawInterface(2);
+				ui._invLookFlag = ui._lookScriptFlag = false;
+			}
+
+			ui._infoFlag = true;
+			ui.clearInfo();
+			ui.banishWindow(false);
+			ui._key = -1;
+			break;
+
+		case FILES_MODE:
+			ui.banishWindow(true);
+			ui._windowBounds.top = CONTROLS_Y1;
+			scripts._abortFlag = true;
+			break;
+
+		case SETUP_MODE:
+			ui.banishWindow(true);
+			ui._windowBounds.top = CONTROLS_Y1;
+			ui._temp = ui._oldTemp = ui._lookHelp = ui._invLookFlag = false;
+			ui._menuMode = STD_MODE;
+			events._pressed = events._released = events._oldButtons = 0;
+			scripts._abortFlag = true;
+			break;
+		}
+	}
+
+	screen.resetDisplayBounds();
+	events._pressed = events._released = false;
+	loadTalkFile(filename);
+	ui._selector = ui._oldSelector = ui._key = ui._oldKey = -1;
+
+	// Find the first statement that has the correct flags
+	int select = -1;
+	for (uint idx = 0; idx < _statements.size() && select == -1; ++idx) {
+		/*
+		if (!_talkMap[idx])
+			select = _talkIndex = idx;
+		*/
+	}
+
+	// TODOa
 }
 
 void Talk::talk(int objNum) {
@@ -45,5 +270,67 @@ void Talk::freeTalkVars() {
 	_statements.clear();
 }
 
+void Talk::pullSequence() {
+	// TODO
+}
+
+/**
+ * Opens the talk file 'talk.tlk' and searches the index for the specified
+ * conversation. If found, the data for that conversation is loaded
+ */
+void Talk::loadTalkFile(const Common::String &filename) {
+	People &people = *_vm->_people;
+	Resources &res = *_vm->_res;
+	Sound &sound = *_vm->_sound;
+
+	// Check for an existing person being talked to
+	_talkTo = -1;
+	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+		if (scumm_strnicmp(filename.c_str(), people[(PeopleId)idx]._portrait.c_str(), 4)) {
+			_talkTo = idx;
+			break;
+		}
+	}
+
+	const char *chP = strchr(filename.c_str(), '.');
+	Common::String talkFile = !chP ? filename + ".tlk" :
+		Common::String(filename.c_str(), chP) + ".tlk";
+
+	// Open the talk file for reading
+	Common::SeekableReadStream *talkStream = res.load(talkFile);
+	talkStream->skip(2);	// Skip talk file version num
+
+	_statements.resize(talkStream->readByte());
+	for (uint idx = 0; idx < _statements.size(); ++idx)
+		_statements[idx].synchronize(*talkStream, sound._voicesOn);
+	
+	delete talkStream;
+	setTalkMap();
+}
+
+void Talk::clearTalking() {
+	// TODO
+}
+
+/**
+ * Form a translate table from the loaded statements from a talk file
+ */
+void Talk::setTalkMap() {
+	int statementNum = 0;
+
+	for (uint sIdx = 0; sIdx < _statements.size(); ++sIdx) {
+		Statement &statement = _statements[sIdx];
+
+		// Set up talk map entry for the statement
+		bool valid = true;
+		for (uint idx = 0; idx < statement._required.size(); ++idx) {
+			if (!_vm->readFlags(statement._required[idx]))
+				valid = false;
+		}
+
+		statement._talkMap = valid ? statementNum++ : -1;
+	}
+}
+
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 9359b77e87..6ef4a04b6a 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -25,31 +25,58 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/stream.h"
+#include "common/stack.h"
 
 namespace Sherlock {
 
-struct TalkHistoryEntry {
-private:
-	int _data[2];
-public:
-	TalkHistoryEntry() { _data[0] = _data[1] = 0; }
+struct SavedSequence {
+	int _objNum;
+	Common::Array<byte> _sequences;
+};
 
-	int &operator[](int idx) { return _data[idx]; }
+struct Statement {
+	Common::String _statement;
+	Common::String _reply;
+	Common::String _linkFile;
+	Common::String _voiceFile;
+	Common::Array<int> _required;
+	Common::Array<int> _modified;
+	int _portraitSide;
+	int _quotient;
+	int _talkMap;
+
+	void synchronize(Common::SeekableReadStream &s, bool voices);
 };
 
 class SherlockEngine;
 
 class Talk {
+
 private:
 	SherlockEngine *_vm;
+	int _saveSeqNum;
+	Common::Array<SavedSequence> _savedSequences;
+	Common::Stack<int> _sequenceStack;
+	Common::Array<Statement> _statements;
+	int _speaker;
+	int _talkIndex;
+	int _talkTo;
+
+	void pullSequence();
+
+	void loadTalkFile(const Common::String &filename);
+
+	void clearTalking();
+
+	void setTalkMap();
 public:
-	Common::Array<TalkHistoryEntry> _statements;
 	bool _talkToAbort;
 	int _talkCounter;
 public:
 	Talk(SherlockEngine *vm);
 
-	void talkTo(const Common::String &name);
+	void talkTo(const Common::String &filename);
 
 	void talk(int objNum);
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 5e8b3287f0..9fe8a0979f 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -43,14 +43,14 @@ const int MENU_POINTS[12][4] = {
 
 // Inventory control locations */
 const int INVENTORY_POINTS[8][3] = { 
-	{ 4, 50, 28 },
-	{ 52, 99, 76 },
-	{ 101, 140, 122 },
-	{ 142, 187, 165 },
-	{ 189, 219, 197 },
-	{ 221, 251, 233 },
-	{ 253, 283, 265 },
-	{ 285, 315, 293 } 
+	{ 4, 50, 29 },
+	{ 52, 99, 77 },
+	{ 101, 140, 123 },
+	{ 142, 187, 166 },
+	{ 189, 219, 198 },
+	{ 221, 251, 234 },
+	{ 253, 283, 266 },
+	{ 285, 315, 294 } 
 };
 
 const char COMMANDS[13] = "LMTPOCIUGJFS";
@@ -85,6 +85,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_windowStyle = 1;	// Sliding windows
 	_find = 0;
 	_oldUse = 0;
+	_endKeyActive = true;
 }
 
 UserInterface::~UserInterface() {
@@ -101,12 +102,15 @@ void UserInterface::reset() {
 /**
  * Draw the user interface onto the screen's back buffers
  */
-void UserInterface::drawInterface() {
+void UserInterface::drawInterface(int bufferNum) {
 	Screen &screen = *_vm->_screen;
 
-	screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
-	screen._backBuffer1.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
-	screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	if (bufferNum & 1)
+		screen._backBuffer1.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	if (bufferNum & 2)
+		screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	if (bufferNum == 3)
+		screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
 }
 
 /**
@@ -118,6 +122,7 @@ void UserInterface::handleInput() {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
+	Scripts &scripts = *_vm->_scripts;
 	Talk &talk = *_vm->_talk;
 
 	if (_menuCounter)
@@ -143,7 +148,7 @@ void UserInterface::handleInput() {
 	}
 
 	// Do button highlighting check
-	if (!_vm->_scriptMoreFlag) {	// Don't if scripts are running
+	if (!scripts._scriptMoreFlag) {	// Don't if scripts are running
 		if (((events._rightPressed || events._rightReleased) && _helpStyle) ||
 				(!_helpStyle && !_menuCounter)) {
 			// Handle any default commands if we're in STD_MODE
@@ -276,7 +281,7 @@ void UserInterface::handleInput() {
 	case GIVE_MODE:
 	case INV_MODE:
 		if (inv._invMode == 1 || inv._invMode == 2 || inv._invMode == 3) {
-			if (pt.y < CONTROLS_Y)
+			if (pt.y > CONTROLS_Y)
 				lookInv();
 			else
 				lookScreen(pt);
@@ -713,7 +718,7 @@ void UserInterface::doInvControl() {
 			screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
 			screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[1], true, "Use");
 			screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[1], true, "Give");
-			inv._invMode = found;
+			inv._invMode = (InvMode)found;
 			_selector = -1;
 		}
 
@@ -734,7 +739,11 @@ void UserInterface::doInvControl() {
 		bool flag = false;
 		if (inv._invMode == 1 || inv._invMode == 2 || inv._invMode == 3) {
 			Common::Rect r(15, CONTROLS_Y1 + 11, 314, SHERLOCK_SCREEN_HEIGHT - 2);
-			flag = (_selector < inv._holdings);
+			if (r.contains(mousePos)) {
+				_selector = (mousePos.x - 6) / 52 + inv._invIndex;
+				if (_selector < inv._holdings)
+					flag = true;
+			}
 		}
 
 		if (!flag && mousePos.y >(CONTROLS_Y1 + 11))
@@ -753,13 +762,13 @@ void UserInterface::doInvControl() {
 			int temp = inv._invMode;
 
 			const char *chP = strchr(INVENTORY_COMMANDS, _key);
-			inv._invMode = !chP ? 8 : chP - INVENTORY_COMMANDS;
+			inv._invMode = !chP ? INVMODE_INVALID : (InvMode)(chP - INVENTORY_COMMANDS);
 			inv.invCommands(true);
 
-			inv._invMode = temp;
+			inv._invMode = (InvMode)temp;
 			_keyboardInput = true;
 			if (_key == 'E')
-				inv._invMode = STD_MODE;
+				inv._invMode = INVMODE_EXIT;
 			_selector = -1;
 		} else {
 			_selector = -1;
@@ -789,11 +798,11 @@ void UserInterface::doInvControl() {
 			events.clearEvents();
 			events.setCursor(ARROW);
 		} else if ((found == 1 && events._released) || (_key == 'L')) {
-			inv._invMode = 1;
+			inv._invMode = INVMODE_LOOK;
 		} else if ((found == 2 && events._released) || (_key == 'U')) {
-			inv._invMode = 2;
+			inv._invMode = INVMODE_USE;
 		} else if ((found == 3 && events._released) || (_key == 'G')) {
-			inv._invMode = 3;
+			inv._invMode = INVMODE_GIVE;
 		} else if (((found == 4 && events._released) || _key == ',') && inv._invIndex) {
 			if (inv._invIndex >= 6)
 				inv._invIndex -= 6;
@@ -855,7 +864,8 @@ void UserInterface::doInvControl() {
 				// If it's -1, then no inventory item is highlighted yet. Otherwise,
 				// an object in the scene has been clicked.
 
-				if (_selector != -1 && inv._invMode == 1 && mousePos.y >(CONTROLS_Y1 + 11))
+				if (_selector != -1 && inv._invMode == INVMODE_LOOK 
+						&& mousePos.y >(CONTROLS_Y1 + 11))
 					inv.doInvJF();
 
 				if (talk._talkToAbort)
@@ -879,7 +889,7 @@ void UserInterface::doInvControl() {
 					inv.putInv(1);
 					_selector = temp;		// Restore it
 					temp = inv._invMode;
-					inv._invMode = -1;
+					inv._invMode = INVMODE_USE55;
 					inv.invCommands(true);
 
 					_infoFlag = true;
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 14462d6a34..157900f0aa 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -57,9 +57,11 @@ extern const char INVENTORY_COMMANDS[9];
 
 class SherlockEngine;
 class Inventory;
+class Talk;
 
 class UserInterface {
 	friend class Inventory;
+	friend class Talk;
 private:
 	SherlockEngine *_vm;
 	ImageFile *_controlPanel;
@@ -72,7 +74,6 @@ private:
 	int _help, _oldHelp;
 	int _key, _oldKey;
 	int _temp, _oldTemp;
-	int _invLookFlag;
 	int _oldLook;
 	bool _keyboardInput;
 	bool _pause;
@@ -89,8 +90,6 @@ private:
 private:
 	void depressButton(int num);
 
-	void restoreButton(int num);
-
 	void pushButton(int num);
 
 	void toggleButton(int num);
@@ -120,13 +119,15 @@ public:
 	int _menuCounter;
 	bool _infoFlag;
 	bool _windowOpen;
+	bool _endKeyActive;
+	int _invLookFlag;
 public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
 
 	void reset();
 
-	void drawInterface();
+	void drawInterface(int bufferNum = 3);
 
 	void handleInput();
 
@@ -140,6 +141,8 @@ public:
 	void summonWindow(const Surface &bgSurface, bool slideUp = true);
 	void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
 	void banishWindow(bool slideUp = true);
+
+	void restoreButton(int num);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From cf4226be45ddea933ef17722eac0f5ccadc7357b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 07:55:54 -0400
Subject: SHERLOCK: Implemented talkTo

---
 engines/sherlock/journal.cpp        |   4 +
 engines/sherlock/journal.h          |   2 +
 engines/sherlock/scripts.cpp        |  26 +++-
 engines/sherlock/scripts.h          |  20 ++-
 engines/sherlock/talk.cpp           | 241 +++++++++++++++++++++++++++++++-----
 engines/sherlock/talk.h             |  19 ++-
 engines/sherlock/user_interface.cpp |  10 ++
 engines/sherlock/user_interface.h   |   2 +
 8 files changed, 290 insertions(+), 34 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index ad7df48943..34423d2480 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -37,4 +37,8 @@ Journal::Journal() {
 	_page = 0;
 }
 
+void Journal::record(int converseNum, int statementNum) {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 64158ff123..87e5a4f8f2 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -39,6 +39,8 @@ public:
 	int _page;
 public:
 	Journal();
+
+	void record(int converseNum, int statementNum);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scripts.cpp b/engines/sherlock/scripts.cpp
index ace957bd76..1da72c976b 100644
--- a/engines/sherlock/scripts.cpp
+++ b/engines/sherlock/scripts.cpp
@@ -29,7 +29,31 @@ Scripts::Scripts(SherlockEngine *vm): _vm(vm) {
 	_scriptMoreFlag = 0;
 	_scriptSaveIndex = 0;
 	_scriptSelect = 0;
-	_abortFlag = false;
 }
 
+void Scripts::doScript(const Common::String &str) {
+	// TODO
+}
+
+void Scripts::pullSeq() {
+	// TODO
+}
+
+void Scripts::pushSeq(int speak) {
+	// TODO
+}
+
+void Scripts::setStillSeq(int speak) {
+	// TODO
+}
+
+void Scripts::popStack() {
+	ScriptEntry script = _scriptStack.pop();
+	_scriptName = script._name;
+	_scriptSaveIndex = script._index;
+	_scriptSelect = script._select;
+	_scriptMoreFlag = true;
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scripts.h b/engines/sherlock/scripts.h
index eede1ca103..6c23e72fe4 100644
--- a/engines/sherlock/scripts.h
+++ b/engines/sherlock/scripts.h
@@ -24,23 +24,39 @@
 #define SHERLOCK_SCRIPTS_H
 
 #include "common/scummsys.h"
-#include "common/array.h"
+#include "common/stack.h"
 
 namespace Sherlock {
 
 class SherlockEngine;
 
+struct ScriptEntry {
+	Common::String _name;
+	int _index;
+	int _select;
+};
+
 class Scripts {
 private:
 	SherlockEngine *_vm;
 public:
+	Common::Stack<ScriptEntry> _scriptStack;
 	int _scriptMoreFlag;
 	Common::String _scriptName;
 	int _scriptSaveIndex;
 	int _scriptSelect;
-	bool _abortFlag;
 public:
 	Scripts(SherlockEngine *vm);
+
+	void doScript(const Common::String &str);
+
+	void pullSeq();
+
+	void pushSeq(int speak);
+
+	void setStillSeq(int speak);
+
+	void popStack();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index d67013b60e..e3c5ebc5e0 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -25,10 +25,14 @@
 
 namespace Sherlock {
 
+#define SFX_COMMAND 140
+
+/*----------------------------------------------------------------*/
+
 /**
  * Load the data for a single statement within a talk file
  */
-void Statement::synchronize(Common::SeekableReadStream &s, bool voices) {
+void Statement::synchronize(Common::SeekableReadStream &s) {
 	int length;
 
 	length = s.readUint16LE();
@@ -39,25 +43,6 @@ void Statement::synchronize(Common::SeekableReadStream &s, bool voices) {
 	for (int idx = 0; idx < length; ++idx)
 		_reply += (char)s.readByte();
 
-	// If we don't have digital sound, we'll need to strip out voice commands from reply
-	if (!voices) {
-		// Scan for a 140 byte, which indicates playing a sound
-		for (uint idx = 0; idx < _reply.size(); ++idx) {
-			if (_reply[idx] == 140) {
-				// Replace instruction character with a space, and delete the
-				// rest of the name following it
-				_reply = Common::String(_reply.c_str(), _reply.c_str() + idx) + " " +
-					Common::String(_reply.c_str() + 9);
-			}
-		}
-
-		// Ensure the last character of the reply is not a space from the prior
-		// conversion loop, to avoid any issues with the space ever causing a page
-		// wrap, and ending up displaying another empty page
-		while (_reply.lastChar() == ' ')
-			_reply.deleteLastChar();
-	}
-
 	length = s.readUint16LE();
 	for (int idx = 0; idx < length; ++idx)
 		_linkFile += (char)s.readByte();
@@ -81,6 +66,12 @@ void Statement::synchronize(Common::SeekableReadStream &s, bool voices) {
 
 /*----------------------------------------------------------------*/
 
+TalkHistoryEntry::TalkHistoryEntry() {
+	Common::fill(&_data[0], &_data[16], false);
+}
+
+/*----------------------------------------------------------------*/
+
 Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkCounter = 0;
 	_talkToAbort = false;
@@ -88,6 +79,10 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_speaker = 0;
 	_talkIndex = 0;
 	_talkTo = 0;
+	_scriptSelect = 0;
+	_converseNum = -1;
+	_talkStealth = 0;
+	_talkToFlag = -1;
 }
 
 /**
@@ -98,6 +93,7 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 void Talk::talkTo(const Common::String &filename) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
+	Journal &journal = *_vm->_journal;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -105,6 +101,7 @@ void Talk::talkTo(const Common::String &filename) {
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
 	Common::Rect savedBounds = screen.getDisplayBounds();
+	bool abortFlag = false;
 
 	if (filename.empty())
 		// No filename passed, so exit
@@ -137,7 +134,7 @@ void Talk::talkTo(const Common::String &filename) {
 		// Only interrupt if an action if trying to do an action, and not just
 		// if the player is walking around the scene
 		if (people._allowWalkAbort)
-			scripts._abortFlag = true;
+			abortFlag = true;
 
 		people.gotoStand(people._player);
 	}
@@ -206,7 +203,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 			ui.banishWindow();
 			ui._windowBounds.top = CONTROLS_Y1;
-			scripts._abortFlag = true;
+			abortFlag = true;
 			break;
 
 		case INV_MODE:
@@ -228,7 +225,7 @@ void Talk::talkTo(const Common::String &filename) {
 		case FILES_MODE:
 			ui.banishWindow(true);
 			ui._windowBounds.top = CONTROLS_Y1;
-			scripts._abortFlag = true;
+			abortFlag = true;
 			break;
 
 		case SETUP_MODE:
@@ -237,7 +234,7 @@ void Talk::talkTo(const Common::String &filename) {
 			ui._temp = ui._oldTemp = ui._lookHelp = ui._invLookFlag = false;
 			ui._menuMode = STD_MODE;
 			events._pressed = events._released = events._oldButtons = 0;
-			scripts._abortFlag = true;
+			abortFlag = true;
 			break;
 		}
 	}
@@ -250,13 +247,161 @@ void Talk::talkTo(const Common::String &filename) {
 	// Find the first statement that has the correct flags
 	int select = -1;
 	for (uint idx = 0; idx < _statements.size() && select == -1; ++idx) {
-		/*
-		if (!_talkMap[idx])
+		if (_statements[idx]._talkMap == 0)
 			select = _talkIndex = idx;
-		*/
 	}
 
-	// TODOa
+	if (scripts._scriptMoreFlag && _scriptSelect != 0)
+		select = _scriptSelect;
+
+	if (select == -1)
+		error("Couldn't find statement to display");
+
+	// Add the statement into the journal and talk history
+	if (_talkTo != -1 && !_talkHistory[_converseNum][select])
+		journal.record(_converseNum | 2048, select);
+	_talkHistory[_converseNum][select] = true;
+
+	// Check if the talk file is meant to be a non-seen comment
+	if (filename[7] != '*') {
+		// Should we start in stealth mode?
+		if (_statements[select]._statement.hasPrefix("^")) {
+			_talkStealth = 2;
+		} else {
+			// Not in stealth mode, so bring up the ui window
+			_talkStealth = 0;
+			++_talkToFlag;
+			events.setCursor(WAIT);
+
+			ui._windowBounds.top = CONTROLS_Y;
+			ui._infoFlag = true;
+			ui.clearInfo();
+		}
+
+		// Handle replies until there's no further linked file, 
+		// or the link file isn't a reply first cnversation
+		for (;;) {
+			_sequenceStack.clear();
+			_scriptSelect = select;
+			_speaker = _talkTo;
+
+			Statement &statement = _statements[select];
+			scripts.doScript(_statements[select]._reply);
+
+			if (_talkToAbort)
+				return;
+
+			if (!_talkStealth)
+				ui.clearWindow();
+
+			if (statement._modified.size() > 0) {
+				for (uint idx = 0; idx < statement._modified.size(); ++idx)
+					_vm->setFlags(statement._modified[idx]);
+
+				setTalkMap();
+			}
+			
+			// Check for a linked file
+			if (!statement._linkFile.empty() && !scripts._scriptMoreFlag) {
+				freeTalkVars();
+				loadTalkFile(statement._linkFile);
+
+				// Scan for the first valid statement in the newly loaded file
+				select = -1;
+				for (uint idx = 0; idx < _statements.size(); ++idx) {
+					if (_statements[idx]._talkMap == 0) {
+						select = idx;
+						break;
+					}
+				}
+
+				if (_talkToFlag == 1)
+					scripts.pullSeq();
+
+				// Set the stealth mode for the new talk file
+				Statement &newStatement = _statements[select];
+				_talkStealth = newStatement._statement.hasPrefix("^") ? 2 : 0;
+
+				// If the new conversion is a reply first, then we don't need
+				// to display any choices, since the reply needs to be shown
+				if (!newStatement._statement.hasPrefix("*") &&
+						!newStatement._statement.hasPrefix("^")) {
+					_sequenceStack.clear();
+					scripts.pushSeq(_talkTo);
+					scripts.setStillSeq(_talkTo);
+					_talkIndex = select;
+					ui._selector = ui._oldSelector = -1;
+
+					if (!ui._windowOpen) {
+						// Draw the talk interface on the back buffer
+						drawInterface();
+						displayTalk(false);
+					} else {
+						displayTalk(true);
+					}
+
+					byte color = ui._endKeyActive ? COMMAND_FOREGROUND : COMMAND_NULL;
+
+					// If the window is alraedy open, simply draw. Otherwise, do it
+					// to the back buffer and then summon the window
+					if (ui._windowOpen) {
+						screen.buttonPrint(Common::Point(119, CONTROLS_Y), color, true, "Exit");
+					} else {
+						screen.buttonPrint(Common::Point(119, CONTROLS_Y), color, false, "Exit");
+					
+						if (!ui._windowStyle) {
+							screen.slamRect(Common::Rect(0, CONTROLS_Y,
+								SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+						} else {
+							ui.summonWindow();
+						}
+
+						ui._windowOpen = true;
+					}
+
+					// Break out of loop now that we're waiting for player input
+					events.setCursor(ARROW);
+					break;
+				} else {
+					// Add the statement into the journal and talk history
+					if (_talkTo != -1 && !_talkHistory[_converseNum][select])
+						journal.record(_converseNum | 2048, select);
+					_talkHistory[_converseNum][select] = true;
+
+				}
+
+				ui._key = ui._oldKey = COMMANDS[TALK_MODE - 1];
+				ui._temp = ui._oldTemp = 0;
+				ui._menuMode = TALK_MODE;
+				_talkToFlag = 2;
+			} else {
+				freeTalkVars();
+
+				if (!ui._lookScriptFlag) {
+					ui.banishWindow();
+					ui._windowBounds.top = CONTROLS_Y1;
+					ui._menuMode = STD_MODE;
+				}
+
+				break;
+			}
+		}
+	}
+
+	_talkStealth = 0;
+	events._pressed = events._released = events._oldButtons = 0;
+	events.clearKeyboard();
+
+	screen.setDisplayBounds(savedBounds);
+	_talkToAbort = abortFlag;
+
+	// If a script was added to the script stack, restore state so that the
+	// previous script can continue
+	if (!scripts._scriptStack.empty()) {
+		scripts.popStack();
+	}
+
+	events.setCursor(ARROW);
 }
 
 void Talk::talk(int objNum) {
@@ -302,9 +447,12 @@ void Talk::loadTalkFile(const Common::String &filename) {
 
 	_statements.resize(talkStream->readByte());
 	for (uint idx = 0; idx < _statements.size(); ++idx)
-		_statements[idx].synchronize(*talkStream, sound._voicesOn);
+		_statements[idx].synchronize(*talkStream);
 	
 	delete talkStream;
+
+	if (!sound._voicesOn)
+		stripVoiceCommands();
 	setTalkMap();
 }
 
@@ -313,7 +461,33 @@ void Talk::clearTalking() {
 }
 
 /**
- * Form a translate table from the loaded statements from a talk file
+ * Remove any voice commands from a loaded statement list
+ */
+void Talk::stripVoiceCommands() {
+	for (uint sIdx = 0; sIdx < _statements.size(); ++sIdx) {
+		Statement &statement = _statements[sIdx];
+
+		// Scan for an sound effect byte, which indicates to play a sound
+		for (uint idx = 0; idx < statement._reply.size(); ++idx) {
+			if (statement._reply[idx] == SFX_COMMAND) {
+				// Replace instruction character with a space, and delete the
+				// rest of the name following it
+				statement._reply = Common::String(statement._reply.c_str(), 
+					statement._reply.c_str() + idx) + " " +
+					Common::String(statement._reply.c_str() + 9);
+			}
+		}
+
+		// Ensure the last character of the reply is not a space from the prior
+		// conversion loop, to avoid any issues with the space ever causing a page
+		// wrap, and ending up displaying another empty page
+		while (statement._reply.lastChar() == ' ')
+			statement._reply.deleteLastChar();
+	}
+}
+
+/**
+ * Form a table of the display indexes for statements
  */
 void Talk::setTalkMap() {
 	int statementNum = 0;
@@ -332,5 +506,12 @@ void Talk::setTalkMap() {
 	}
 }
 
+void Talk::drawInterface() {
+	// TODO
+}
+
+void Talk::displayTalk(bool slamIt) {
+	// TODO
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 6ef4a04b6a..6557f6eed6 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -46,7 +46,14 @@ struct Statement {
 	int _quotient;
 	int _talkMap;
 
-	void synchronize(Common::SeekableReadStream &s, bool voices);
+	void synchronize(Common::SeekableReadStream &s);
+};
+
+struct TalkHistoryEntry {
+	bool _data[16];
+
+	TalkHistoryEntry();
+	bool &operator[](int index) { return _data[index]; }
 };
 
 class SherlockEngine;
@@ -59,9 +66,14 @@ private:
 	Common::Array<SavedSequence> _savedSequences;
 	Common::Stack<int> _sequenceStack;
 	Common::Array<Statement> _statements;
+	TalkHistoryEntry _talkHistory[500];
 	int _speaker;
 	int _talkIndex;
 	int _talkTo;
+	int _scriptSelect;
+	int _converseNum;
+	int _talkStealth;
+	int _talkToFlag;
 
 	void pullSequence();
 
@@ -69,7 +81,10 @@ private:
 
 	void clearTalking();
 
+	void stripVoiceCommands();
 	void setTalkMap();
+
+	void displayTalk(bool slamIt);
 public:
 	bool _talkToAbort;
 	int _talkCounter;
@@ -81,6 +96,8 @@ public:
 	void talk(int objNum);
 
 	void freeTalkVars();
+
+	void drawInterface();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 9fe8a0979f..74142ab80e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -471,6 +471,16 @@ void UserInterface::clearInfo() {
 	}
 }
 
+/**
+ * Clear any active text window
+ */
+void UserInterface::clearWindow() {
+	if (_windowOpen) {
+		_vm->_screen->vgaBar(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+	}
+}
+
 /**
  * Handles counting down whilst checking for input, then clears the info line.
  */
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 157900f0aa..1259bed31b 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -50,6 +50,7 @@ enum MenuMode {
 	SETUP_MODE		= 12
 };
 
+extern const char COMMANDS[13];
 extern const int MENU_POINTS[12][4];
 
 extern const int INVENTORY_POINTS[8][3];
@@ -132,6 +133,7 @@ public:
 	void handleInput();
 
 	void clearInfo();
+	void clearWindow();
 
 	void whileMenuCounter();
 
-- 
cgit v1.2.3


From 0b873d74e0a607ddf460c91fc6e18d04c7fb7b8c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 08:28:51 -0400
Subject: SHERLOCK: Implemented displayTalk

---
 engines/sherlock/screen.h |  3 +-
 engines/sherlock/talk.cpp | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/talk.h   |  8 +++-
 3 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 597c47c83a..edc0136471 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -49,7 +49,8 @@ enum {
 	BUTTON_TOP = 233,
 	BUTTON_MIDDLE	= 244,
 	BUTTON_BOTTOM	= 248,
-	TALK_FOREGROUND = 12
+	TALK_FOREGROUND = 12,
+	TALK_NULL		= 16
 };
 
 class SherlockEngine;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index e3c5ebc5e0..e915169903 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/talk.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/screen.h"
 
 namespace Sherlock {
 
@@ -83,6 +84,7 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_converseNum = -1;
 	_talkStealth = 0;
 	_talkToFlag = -1;
+	_moreTalkDown = _moreTalkUp = false;
 }
 
 /**
@@ -405,6 +407,7 @@ void Talk::talkTo(const Common::String &filename) {
 }
 
 void Talk::talk(int objNum) {
+
 	// TODO
 }
 
@@ -510,8 +513,98 @@ void Talk::drawInterface() {
 	// TODO
 }
 
-void Talk::displayTalk(bool slamIt) {
+/**
+ * Display a list of statements in a window at the bottom of the scren that the 
+ * player can select from.
+ */
+bool Talk::displayTalk(bool slamIt) {
+	Screen &screen = *_vm->_screen;
+	int yp = CONTROLS_Y + 14;
+	int lineY = -1;
+	_moreTalkDown = _moreTalkUp = false;
+	
+	for (uint idx = 0; idx < _statements.size(); ++idx) {
+		_statements[idx]._talkPos.top = _statements[idx]._talkPos.bottom = -1;
+	}
+
+	if (_talkIndex) {
+		for (uint idx = 0; idx < _statements.size(); ++idx) {
+			if (_statements[idx]._talkMap != -1)
+				_moreTalkUp = true;
+		}
+	}
+
+	// Display the up arrow if the first option is scrolled off-screen
+	if (_moreTalkUp) {
+		if (slamIt) {
+			screen.print(Common::Point(5, CONTROLS_Y + 13), INV_FOREGROUND, "~");
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_FOREGROUND, true, "Up");
+		} else {
+			screen.gPrint(Common::Point(5, CONTROLS_Y + 12), INV_FOREGROUND, "~");
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_FOREGROUND, false, "Up");
+		}
+	} else {
+		if (slamIt) {
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, true, "Up");
+			screen.vgaBar(Common::Rect(5, CONTROLS_Y + 11, 15, CONTROLS_Y + 22), INV_BACKGROUND);
+		} else {
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
+			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, 
+				15, CONTROLS_Y + 22), INV_BACKGROUND);
+		}
+	}
+
+	// Loop through the statements
+	bool done = false;
+	for (uint idx = _talkIndex; idx < _statements.size() && !done; ++idx) {
+		Statement &statement = _statements[idx];
+
+		if (statement._talkMap != -1) {
+			bool flag = _talkHistory[_converseNum][idx];
+			lineY = talkLine(idx, statement._talkMap, flag ? TALK_NULL : INV_FOREGROUND, 
+				yp, slamIt);
+		
+			if (lineY != -1) {
+				statement._talkPos.top = yp;
+				yp = lineY;
+				statement._talkPos.bottom = yp;
+
+				if (yp == SHERLOCK_SCREEN_HEIGHT)
+					done = true;
+			} else {
+				done = true;
+			}
+		}
+	}
+
+	// Display the down arrow if there are more statements available
+	if (lineY == -1 || lineY == SHERLOCK_SCREEN_HEIGHT) {
+		_moreTalkDown = true;
+
+		if (slamIt) {
+			screen.print(Common::Point(5, 190), INV_FOREGROUND, "|");
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, true, "Down");
+		} else {
+			screen.gPrint(Common::Point(5, 189), INV_FOREGROUND, "|");
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, false, "Down");
+		}
+	} else {
+		if (slamIt) {
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, true, "Down");
+			screen.vgaBar(Common::Rect(5, 189, 16, 199), INV_BACKGROUND);
+		} else {
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, false, "Down");
+			screen._backBuffer1.fillRect(Common::Rect(5, 189, 16, 199), INV_BACKGROUND);
+		}
+	}
+
+	return done;
+}
+
+int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt) {
 	// TODO
+	return 0;
 }
 
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 6557f6eed6..d44419f9a9 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/rect.h"
 #include "common/stream.h"
 #include "common/stack.h"
 
@@ -45,6 +46,7 @@ struct Statement {
 	int _portraitSide;
 	int _quotient;
 	int _talkMap;
+	Common::Rect _talkPos;
 
 	void synchronize(Common::SeekableReadStream &s);
 };
@@ -59,7 +61,6 @@ struct TalkHistoryEntry {
 class SherlockEngine;
 
 class Talk {
-
 private:
 	SherlockEngine *_vm;
 	int _saveSeqNum;
@@ -74,6 +75,7 @@ private:
 	int _converseNum;
 	int _talkStealth;
 	int _talkToFlag;
+	bool _moreTalkUp, _moreTalkDown;
 
 	void pullSequence();
 
@@ -84,7 +86,9 @@ private:
 	void stripVoiceCommands();
 	void setTalkMap();
 
-	void displayTalk(bool slamIt);
+	bool displayTalk(bool slamIt);
+
+	int talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt);
 public:
 	bool _talkToAbort;
 	int _talkCounter;
-- 
cgit v1.2.3


From 87521eb504ddb8f05c6b61cfdaf3c757f5adce64 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 20:16:34 -0400
Subject: SHERLOCK: Implemented talkLine

---
 engines/sherlock/talk.cpp | 91 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index e915169903..a84ce7cd70 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -601,10 +601,95 @@ bool Talk::displayTalk(bool slamIt) {
 	return done;
 }
 
+/**
+ * Prints a single conversation option in the interface window
+ */
 int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt) {
-	// TODO
-	return 0;
-}
+	Screen &screen = *_vm->_screen;
+	int idx = lineNum;
+	Common::String msg, number;
+	bool numberFlag = false;
+
+	// Get the statement to display as well as optional number prefix
+	if (idx < 128) {
+		number = Common::String::format("%d.", stateNum + 1);
+		numberFlag = true;
+	} else {
+		idx -= 128;
+	}
+	msg = _statements[idx]._statement;
+
+	// Handle potentially multiple lines needed to display entire statement
+	const char *lineStartP = msg.c_str();
+	int maxWidth = 298 - numberFlag ? 18 : 0;
+	for (;;) {
+		// Get as much of the statement as possible will fit on the
+		Common::String sLine;
+		const char *lineEndP = lineStartP;
+		int width = 0;
+		do {
+			width += screen.charWidth(*lineEndP);
+		} while (*++lineEndP && width < maxWidth);
+
+		// Check if we need to wrap the line
+		if (width >= maxWidth) {
+			// Work backwards to the prior word's end
+			while (*--lineEndP != ' ')
+				;
+
+			sLine = Common::String(lineStartP, lineEndP++);
+		} else {
+			// Can display remainder of the statement on the current line
+			sLine = Common::String(lineStartP);
+		}
+
+
+		if (lineY <= (SHERLOCK_SCREEN_HEIGHT - 10)) {
+			// Need to directly display on-screen?
+			if (slamIt) {
+				// See if a numer prefix is needed or not
+				if (numberFlag) {
+					// Are we drawing the first line?
+					if (lineStartP == msg.c_str()) {
+						// We are, so print the number and then the text
+						screen.print(Common::Point(16, lineY), color, number.c_str());
+					}
+
+					// Draw the line with an indent
+					screen.print(Common::Point(30, lineY), color, sLine.c_str());
+				} else {
+					screen.print(Common::Point(16, lineY), color, sLine.c_str());
+				}
+			} else {
+				if (numberFlag) {
+					if (lineStartP == msg.c_str()) {
+						screen.gPrint(Common::Point(16, lineY - 1), color, number.c_str());
+					}
+
+					screen.gPrint(Common::Point(30, lineY - 1), color, sLine.c_str());
+				} else {
+					screen.gPrint(Common::Point(16, lineY - 1), color, sLine.c_str());
+				}
+			}
 
+			// Move to next line, if any
+			lineY += 9;
+			lineStartP = lineEndP;
+			
+			if (!*lineEndP)
+				break;
+		} else {
+			// We're close to the bottom of the screen, so stop display
+			lineY = -1;
+			break;
+		}
+	}
+
+	if (lineY == -1 && lineStartP != msg.c_str())
+		lineY = SHERLOCK_SCREEN_HEIGHT;
+
+	// Return the Y position of the next line to follow this one
+	return lineY;
+}
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 54ecf6cda88f6a32b0e12f9fdb2698c540d76bd4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 20:37:59 -0400
Subject: SHERLOCK: Implemented talk method

---
 engines/sherlock/talk.cpp | 97 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a84ce7cd70..e5d6cea64a 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -406,9 +406,104 @@ void Talk::talkTo(const Common::String &filename) {
 	events.setCursor(ARROW);
 }
 
+/**
+ * Main method for handling conversations when a character to talk to has been
+ * selected. It will make Holmes walk to the person to talk to, draws the 
+ * interface window for the conversation and passes on control to give the
+ * player a list of options to make a selection from
+ */
 void Talk::talk(int objNum) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Scripts &scripts = *_vm->_scripts;
+	UserInterface &ui = *_vm->_ui;
+	Object &obj = scene._bgShapes[objNum];
 
-	// TODO
+	ui._windowBounds.top = CONTROLS_Y;
+	ui._infoFlag = true;
+	_speaker = 128;
+	loadTalkFile(scene._bgShapes[objNum]._name);
+
+	// Find the first statement with the correct flags
+	int select = -1;
+	for (uint idx = 0; idx < _statements.size(); ++idx) {
+		if (_statements[idx]._talkMap == 0) {
+			select = idx;
+			break;
+		}
+	}
+	if (select == -1)
+		error("No entry matched all required flags");
+
+	// See if the statement is a stealth mode reply
+	Statement &statement = _statements[select];
+	if (statement._statement.hasPrefix("^")) {
+		_sequenceStack.clear();
+
+		// Start talk in stealth mode
+		_talkStealth = 2;
+
+		talkTo(obj._name);
+	} else if (statement._statement.hasPrefix("*")) {
+		// Character being spoken to will speak first
+		_sequenceStack.clear();
+		scripts.pushSeq(_talkTo);
+		scripts.setStillSeq(_talkTo);
+
+		events.setCursor(WAIT);
+		if (obj._lookPosition.y != 0)
+			// Need to walk to character first
+			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100), 
+				obj._lookFacing);
+		events.setCursor(ARROW);
+
+		if (_talkToAbort)
+			talkTo(obj._name);
+	} else {
+		// Holmes will be speaking first
+		_sequenceStack.clear();
+		scripts.pushSeq(_talkTo);
+		scripts.setStillSeq(_talkTo);
+
+		_talkToFlag = false;
+		events.setCursor(WAIT);
+		if (obj._lookPosition.y != 0)
+			// Walk over to person to talk to
+			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100),
+			obj._lookFacing);
+		events.setCursor(ARROW);
+
+		if (!_talkToAbort) {
+			// See if walking over triggered a conversation
+			if (_talkToFlag) {
+				if (_talkToFlag == 1) {
+					events.setCursor(ARROW);
+					// _sequenceStack._count = 1;
+					scripts.pullSeq();
+				}
+			} else {
+				drawInterface();
+
+				events._pressed = events._released = false;
+				_talkIndex = select;
+				displayTalk(false);
+				ui._selector = ui._oldSelector = -1;
+
+				if (!ui._windowStyle) {
+					screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+						SHERLOCK_SCREEN_HEIGHT));
+				} else {
+					ui.summonWindow();
+				}
+
+				ui._windowOpen = true;
+			}
+
+			_talkToFlag = -1;
+		}
+	}
 }
 
 /**
-- 
cgit v1.2.3


From 8fa8b14762ce655d0d99782864be927d3c946cba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 21:30:22 -0400
Subject: SHERLOCK: Implement clearTalking and Talk::drawInterface

---
 engines/sherlock/people.cpp       | 36 ++++++++++++++++++++++++++++++++++++
 engines/sherlock/people.h         |  4 ++++
 engines/sherlock/talk.cpp         | 35 +++++++++++++++++++++++++++++------
 engines/sherlock/talk.h           |  2 --
 engines/sherlock/user_interface.h |  2 ++
 5 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index ca840bb5b1..8d4fa68117 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -57,13 +57,16 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_oldWalkSequence = -1;
 	_allowWalkAbort = false;
 	_portraitLoaded = false;
+	_portraitsOn = false;
 	_clearingThePortrait = false;
 	_srcZone = _destZone = 0;
+	_talkPics = nullptr;
 }
 
 People::~People() {
 	if (_walkLoaded)
 		delete _data[PLAYER]._images;
+	delete _talkPics;
 }
 
 void People::reset() {
@@ -434,4 +437,37 @@ void People::goAllTheWay() {
 	}
 }
 
+/**
+ * Turn off any currently active portraits, and removes them from being drawn
+ */
+void People::clearTalking() {
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	if (_portraitsOn) {
+		Common::Point pt = _portrait._position;
+		int width, height;
+		_portrait._imageFrame = _talkPics ? &(*_talkPics)[0] : (ImageFrame *)nullptr;
+
+		// Flag portrait for removal, and save the size of the frame to use erasing it
+		_portrait._type = REMOVE;
+		_portrait._delta.x = width = _portrait.frameWidth();
+		_portrait._delta.y = height = _portrait.frameHeight();
+
+		delete _talkPics;
+		_talkPics = nullptr;
+
+		// Flag to let the talk code know not to interrupt on the next doBgAnim
+		_clearingThePortrait = true;
+		scene.doBgAnim();
+		_clearingThePortrait = false;
+
+		screen.slamArea(pt.x, pt.y, width, height);
+
+		if (!talk._talkToAbort)
+			_portraitLoaded = false;
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 6b5c59b1bd..1c67ff8996 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -66,12 +66,14 @@ private:
 	bool _walkLoaded;
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
+	ImageFile *_talkPics;
 public:
 	Common::Point _walkDest;
 	Common::Stack<Common::Point> _walkTo;
 	Person &_player;
 	bool _holmesOn;
 	bool _portraitLoaded;
+	bool _portraitsOn;
 	Object _portrait;
 	bool _clearingThePortrait;
 	bool _allowWalkAbort;
@@ -96,6 +98,8 @@ public:
 	void walkToCoords(const Common::Point &destPos, int destDir);
 
 	void goAllTheWay();
+
+	void clearTalking();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index e5d6cea64a..79f9167506 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -190,7 +190,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 		case TALK_MODE:
 			if (_speaker < 128)
-				clearTalking();
+				people.clearTalking();
 			if (_talkCounter)
 				return;
 
@@ -554,10 +554,6 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	setTalkMap();
 }
 
-void Talk::clearTalking() {
-	// TODO
-}
-
 /**
  * Remove any voice commands from a loaded statement list
  */
@@ -604,8 +600,35 @@ void Talk::setTalkMap() {
 	}
 }
 
+/**
+ * Draws the interface for conversation display
+ */
 void Talk::drawInterface() {
-	// TODO
+	Screen &screen = *_vm->_screen;
+	Surface &bb = *screen._backBuffer;
+
+	bb.fillRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 10), BORDER_COLOR);
+	bb.fillRect(Common::Rect(0, CONTROLS_Y + 10, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 10,
+		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	bb.fillRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH - 2,
+		SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	bb.fillRect(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2,
+		SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+
+	if (_talkTo != -1) {
+		screen.makeButton(Common::Rect(99, CONTROLS_Y, 139, CONTROLS_Y + 10),
+			119 - screen.stringWidth("Exit") / 2, "Exit");
+		screen.makeButton(Common::Rect(140, CONTROLS_Y, 180, CONTROLS_Y + 10),
+			159 - screen.stringWidth("Up"), "Up");
+		screen.makeButton(Common::Rect(181, CONTROLS_Y, 221, CONTROLS_Y + 10),
+			200 - screen.stringWidth("Down") / 2, "Down");
+	} else {
+		int strWidth = screen.stringWidth(PRESS_KEY_TO_CONTINUE);
+		screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
+			160 - strWidth, PRESS_KEY_TO_CONTINUE);
+		screen.gPrint(Common::Point(160 - strWidth / 2, CONTROLS_Y), COMMAND_FOREGROUND, false, "P");
+	}
 }
 
 /**
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index d44419f9a9..dbcdf742b8 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -81,8 +81,6 @@ private:
 
 	void loadTalkFile(const Common::String &filename);
 
-	void clearTalking();
-
 	void stripVoiceCommands();
 	void setTalkMap();
 
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 1259bed31b..f80fe48b2d 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -55,6 +55,8 @@ extern const int MENU_POINTS[12][4];
 
 extern const int INVENTORY_POINTS[8][3];
 extern const char INVENTORY_COMMANDS[9];
+extern const char *const PRESS_KEY_FOR_MORE;
+extern const char *const PRESS_KEY_TO_CONTINUE;
 
 class SherlockEngine;
 class Inventory;
-- 
cgit v1.2.3


From 1199cf724c7507fb54a52eea842ac2bcc6864736 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 22:42:57 -0400
Subject: SHERLOCK: Loading for TALK_SEQUENCES and STILL_SEQUENCES Scalpel
 arrays

---
 engines/sherlock/people.cpp          |   5 ++
 engines/sherlock/people.h            |   2 +
 engines/sherlock/scalpel/scalpel.cpp | 145 +++++++++++++++++++++++++++++++++++
 engines/sherlock/scripts.cpp         |  12 ---
 engines/sherlock/scripts.h           |   6 --
 engines/sherlock/talk.cpp            | 100 +++++++++++++++++++-----
 engines/sherlock/talk.h              |  27 ++++++-
 7 files changed, 257 insertions(+), 40 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 8d4fa68117..3da35f2fec 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -470,4 +470,9 @@ void People::clearTalking() {
 	}
 }
 
+int People::findSpeaker(int speaker) {
+	// TODO
+	return -1;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 1c67ff8996..aa54c67567 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -100,6 +100,8 @@ public:
 	void goAllTheWay();
 
 	void clearTalking();
+
+	int findSpeaker(int speaker);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index d226c2e82a..0432dc2278 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -39,6 +39,148 @@ const int MAP_Y[NUM_PLACES] = {
 	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0 
 };
 
+#define MAX_PEOPLE 66
+
+const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
+	{ 1, 0, 0 },	// Sherlock Holmes
+	{ 6, 0, 0 },	// Dr. Watson
+	{ 4, 0, 0 },	// Inspector Lestrade
+	{ 2, 0, 0 },	// Constable #1
+	{ 2, 0, 0 },	// Constable #2
+	{ 2, 0, 0 },	// Sheila Parker
+	{ 3, 0, 0 },	// Henry Carruthers
+	{ 9, 0, 0 },	// Lesly (flower girl)
+	{ 13, 0, 0 },	// Usher #1
+	{ 2, 0, 0 },	// Usher #2
+	{ 4, 0, 0 },	// Fredrick Epstein
+	{ 9, 0, 0 },	// Mrs.Worthington
+	{ 2, 0, 0 },	// Coach
+	{ 8, 0, 0 },	// Player
+	{ 13, 0, 0 },	// Waterboy
+	{ 6, 0, 0 },	// James Sanders
+	{ 1, 0, 0 },	// Belle (perfumerie)
+	{ 20, 0, 0 },	// Cleaning Girl (perfumerie)
+	{ 17, 0, 0 },	// Epstien in the Opera Balcony
+	{ 3, 0, 0 },	// Wiggins
+	{ 2, 0, 0 },	// Paul (Brumwell/Carroway)
+	{ 1, 0, 0 },	// Bartender
+	{ 1, 0, 0 },	// Dirty Drunk
+	{ 1, 0, 0 },	// Shouting Drunk
+	{ 1, 0, 0 },	// Staggering Drunk
+	{ 1, 0, 0 },	// Bouncer
+	{ 6, 0, 0 },	// James Sanders - At Home
+	{ 6, 0, 0 },	// The Coroner
+	{ 1, 0, 0 },	// The Equestrian Shop Keeper
+	{ 1, 0, 0 },	// George Blackwood
+	{ 7, 0, 0 },	// Lars
+	{ 1, 0, 0 },	// Sheila Parker
+	{ 8, 0, 0 },	// Chemist
+	{ 6, 0, 0 },	// Inspector Gregson
+	{ 1, 0, 0 },	// Lawyer
+	{ 1, 0, 0 },	// Mycroft
+	{ 7, 0, 0 },	// Old Sherman
+	{ 1, 0, 0 },	// Stock Boy in Chemist Shop
+	{ 1, 0, 0 },	// Barman
+	{ 1, 0, 0 },	// Dandy Player
+	{ 1, 0, 0 },	// Rough-looking Player
+	{ 1, 0, 0 },	// Spectator
+	{ 1, 0, 0 },	// Robert Hunt
+	{ 3, 0, 0 },	// Violet Secretary
+	{ 1, 0, 0 },	// Pettigrew
+	{ 8, 0, 0 },	// Augie (apple seller)
+	{ 16, 0, 0 },	// Anna Carroway
+	{ 1, 0, 0 },	// Guard
+	{ 8, 0, 0 },	// Antonio Caruso
+	{ 1, 0, 0 },	// Toby the Dog
+	{ 13, 0, 0 },	// Simon Kingsley
+	{ 2, 0, 0 },	// Alfred Tobacco Clerk
+	{ 1, 0, 0 },	// Lady Brumwell
+	{ 1, 0, 0 },	// Madame Rosa
+	{ 1, 0, 0 },	// Lady Brumwell
+	{ 1, 0, 0 },	// Joseph Moorehead
+	{ 5, 0, 0 },	// Mrs. Beale
+	{ 1, 0, 0 },	// Felix the Lion
+	{ 1, 0, 0 },	// Hollingston
+	{ 1, 0, 0 },	// Constable Callaghan
+	{ 2, 0, 0 },	// Sergeant Jeremy Duncan
+	{ 1, 0, 0 },	// Lord Brumwell
+	{ 1, 0, 0 },	// Nigel Jameson
+	{ 1, 0, 0 },	// Jonas (newspaper seller)
+	{ 1, 0, 0 },	// Constable Dugan
+	{ 4, 0, 0 }		// Inspector Lestrade (Yard)
+};
+
+byte TALK_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
+	{ 1, 0, 0 },					// Sherlock Holmes
+	{ 5, 5, 6, 7, 8, 7, 8, 6, 0, 0 },	// Dr. Watson
+	{ 2, 0, 0 },					// Inspector Lestrade
+	{ 1, 0, 0 },					// Constable #1
+	{ 1, 0, 0 },					// Constable #2
+	{ 2, 3, 0, 0 },					// Sheila Parker
+	{ 3, 0, 0 },					// Henry Carruthers
+	{ 1, 2, 3, 2, 1, 2, 3, 0, 0 },	// Lesly (flower girl)
+	{ 13, 14, 0, 0 },				// Usher #1
+	{ 2, 0, 0 },					// Usher #2
+	{ 1, 2, 3, 4, 3, 4, 3, 2, 0, 0 },	// Fredrick Epstein
+	{ 8, 0, 0 },						// Mrs.Worthington
+	{ 1, 2, 3, 4, 5, 4, 3, 2, 0, 0 },	// Coach
+	{ 7, 8, 0, 0 },						// Player
+	{ 12, 13, 0, 0 },					// Waterboy
+	{ 3, 4, 0, 0 },						// James Sanders
+	{ 4, 5, 0, 0 },						// Belle (perfumerie)
+	{ 14, 15, 16, 17, 18, 19, 20, 20, 20, 0, 0 },	// Cleaning Girl (perfumerie)
+	{ 16, 17, 18, 18, 18, 17, 17, 0, 0 },	// Epstien in the Opera Balcony
+	{ 2, 3, 0, 0 },					// Wiggins
+	{ 1, 2, 0, 0 },					// Paul (Brumwell/Carroway)
+	{ 1, 0, 0 },					// Bartender
+	{ 1, 0, 0 },					// Dirty Drunk
+	{ 1, 0, 0 },					// Shouting Drunk
+	{ 1, 0, 0 },					// Staggering Drunk
+	{ 1, 0, 0 },					// Bouncer
+	{ 5, 6, 0, 0 },					// James Sanders - At Home
+	{ 4, 5, 0, 0 },					// The Coroner
+	{ 1, 0, 0 },					// The Equestrian Shop Keeper
+	{ 1, 0, 0 },					// George Blackwood
+	{ 5, 6, 0, 0 },					// Lars
+	{ 1, 0, 0 },					// Sheila Parker
+	{ 8, 9, 0, 0 },					// Chemist
+	{ 5, 6, 0, 0 },					// Inspector Gregson
+	{ 1, 0, 0 },					// Lawyer
+	{ 1, 0, 0 },					// Mycroft
+	{ 7, 8, 0, 0 },					// Old Sherman
+	{ 1, 0, 0 },					// Stock Boy in Chemist Shop
+	{ 1, 0, 0 },					// Barman
+	{ 1, 0, 0 },					// Dandy Player
+	{ 1, 0, 0 },					// Rough-looking Player
+	{ 1, 0, 0 },					// Spectator
+	{ 1, 0, 0 },					// Robert Hunt
+	{ 3, 4, 0, 0 },					// Violet Secretary
+	{ 1, 0, 0 },					// Pettigrew
+	{ 14, 15, 0, 0 },				// Augie (apple seller)
+	{ 3, 4, 5, 6, 0, 0 },			// Anna Carroway
+	{ 4, 5, 6, 0, 0 },				// Guard
+	{ 7, 8, 0, 0 },					// Antonio Caruso
+	{ 1, 0, 0 },					// Toby the Dog
+	{ 13, 14, 0, 0 },				// Simon Kingsley
+	{ 2, 3, 0, 0 },					// Alfred Tobacco Clerk
+	{ 3, 4, 0, 0 },					// Lady Brumwell
+	{ 1, 30, 0, 0 },				// Madame Rosa
+	{ 3, 4, 0, 0 },					// Lady Brumwell
+	{ 1, 0, 0 },					// Joseph Moorehead
+	{ 14, 15, 16, 17, 18, 19, 20, 0, 0 },	// Mrs. Beale
+	{ 1, 0, 0 },					// Felix the Lion
+	{ 1, 0, 0 },					// Hollingston
+	{ 1, 0, 0 },					// Constable Callaghan
+	{ 1, 1, 2, 2, 0, 0 },			// Sergeant Jeremy Duncan
+	{ 9, 10, 0, 0 },				// Lord Brumwell
+	{ 1, 2, 0, 138, 3, 4, 0, 138, 0, 0 },	// Nigel Jameson
+	{ 1, 8, 0, 0 },					// Jonas (newspaper seller)
+	{ 1, 0, 0 },					// Constable Dugan
+	{ 2, 0, 0 }						// Inspector Lestrade (Yard)
+};
+
+/*----------------------------------------------------------------*/
+
 ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {
 	_chess = nullptr;
@@ -71,6 +213,9 @@ void ScalpelEngine::initialize() {
 	// Load the inventory
 	loadInventory();
 
+	// Set up constants used by the talk system
+	_talk->setSequences(&TALK_SEQUENCES[0][0], &STILL_SEQUENCES[0][0], MAX_PEOPLE);
+
 	// Starting scene
 	_scene->_goToScene = 4;
 }
diff --git a/engines/sherlock/scripts.cpp b/engines/sherlock/scripts.cpp
index 1da72c976b..d337030bae 100644
--- a/engines/sherlock/scripts.cpp
+++ b/engines/sherlock/scripts.cpp
@@ -35,18 +35,6 @@ void Scripts::doScript(const Common::String &str) {
 	// TODO
 }
 
-void Scripts::pullSeq() {
-	// TODO
-}
-
-void Scripts::pushSeq(int speak) {
-	// TODO
-}
-
-void Scripts::setStillSeq(int speak) {
-	// TODO
-}
-
 void Scripts::popStack() {
 	ScriptEntry script = _scriptStack.pop();
 	_scriptName = script._name;
diff --git a/engines/sherlock/scripts.h b/engines/sherlock/scripts.h
index 6c23e72fe4..6765687bcf 100644
--- a/engines/sherlock/scripts.h
+++ b/engines/sherlock/scripts.h
@@ -50,12 +50,6 @@ public:
 
 	void doScript(const Common::String &str);
 
-	void pullSeq();
-
-	void pushSeq(int speak);
-
-	void setStillSeq(int speak);
-
 	void popStack();
 };
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 79f9167506..26c2e523f3 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -73,6 +73,16 @@ TalkHistoryEntry::TalkHistoryEntry() {
 
 /*----------------------------------------------------------------*/
 
+TalkSequences::TalkSequences(const byte *data) {
+	Common::copy(data, data + MAX_TALK_SEQUENCES, _data);
+}
+
+void TalkSequences::clear() {
+	Common::fill(&_data[0], &_data[MAX_TALK_SEQUENCES], 0); 
+}
+
+/*----------------------------------------------------------------*/
+
 Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkCounter = 0;
 	_talkToAbort = false;
@@ -87,6 +97,15 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_moreTalkDown = _moreTalkUp = false;
 }
 
+void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, int maxPeople) {
+	for (int idx = 0; idx < maxPeople; ++idx) {
+		STILL_SEQUENCES.push_back(TalkSequences(stillSequences));
+		TALK_SEQUENCES.push_back(TalkSequences(talkSequences));
+		stillSequences += MAX_TALK_SEQUENCES;
+		talkSequences += MAX_TALK_SEQUENCES;
+	}
+}
+
 /**
  * Called when either an NPC initiates a conversation or for inventory item
  * descriptions. It opens up a description window similar to how 'talk' does,
@@ -158,7 +177,7 @@ void Talk::talkTo(const Common::String &filename) {
 		}
 	}
 
-	while (_sequenceStack.empty())
+	while (!_sequenceStack.empty())
 		pullSequence();
 
 	// Restore any pressed button
@@ -283,7 +302,7 @@ void Talk::talkTo(const Common::String &filename) {
 		// Handle replies until there's no further linked file, 
 		// or the link file isn't a reply first cnversation
 		for (;;) {
-			_sequenceStack.clear();
+			clearSequences();
 			_scriptSelect = select;
 			_speaker = _talkTo;
 
@@ -318,7 +337,7 @@ void Talk::talkTo(const Common::String &filename) {
 				}
 
 				if (_talkToFlag == 1)
-					scripts.pullSeq();
+					pullSequence();
 
 				// Set the stealth mode for the new talk file
 				Statement &newStatement = _statements[select];
@@ -328,9 +347,9 @@ void Talk::talkTo(const Common::String &filename) {
 				// to display any choices, since the reply needs to be shown
 				if (!newStatement._statement.hasPrefix("*") &&
 						!newStatement._statement.hasPrefix("^")) {
-					_sequenceStack.clear();
-					scripts.pushSeq(_talkTo);
-					scripts.setStillSeq(_talkTo);
+					clearSequences();
+					pushSequence(_talkTo);
+					setStillSeq(_talkTo);
 					_talkIndex = select;
 					ui._selector = ui._oldSelector = -1;
 
@@ -417,7 +436,6 @@ void Talk::talk(int objNum) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	Scripts &scripts = *_vm->_scripts;
 	UserInterface &ui = *_vm->_ui;
 	Object &obj = scene._bgShapes[objNum];
 
@@ -440,7 +458,7 @@ void Talk::talk(int objNum) {
 	// See if the statement is a stealth mode reply
 	Statement &statement = _statements[select];
 	if (statement._statement.hasPrefix("^")) {
-		_sequenceStack.clear();
+		clearSequences();
 
 		// Start talk in stealth mode
 		_talkStealth = 2;
@@ -448,9 +466,9 @@ void Talk::talk(int objNum) {
 		talkTo(obj._name);
 	} else if (statement._statement.hasPrefix("*")) {
 		// Character being spoken to will speak first
-		_sequenceStack.clear();
-		scripts.pushSeq(_talkTo);
-		scripts.setStillSeq(_talkTo);
+		clearSequences();
+		pushSequence(_talkTo);
+		setStillSeq(_talkTo);
 
 		events.setCursor(WAIT);
 		if (obj._lookPosition.y != 0)
@@ -463,9 +481,9 @@ void Talk::talk(int objNum) {
 			talkTo(obj._name);
 	} else {
 		// Holmes will be speaking first
-		_sequenceStack.clear();
-		scripts.pushSeq(_talkTo);
-		scripts.setStillSeq(_talkTo);
+		clearSequences();
+		pushSequence(_talkTo);
+		setStillSeq(_talkTo);
 
 		_talkToFlag = false;
 		events.setCursor(WAIT);
@@ -481,7 +499,7 @@ void Talk::talk(int objNum) {
 				if (_talkToFlag == 1) {
 					events.setCursor(ARROW);
 					// _sequenceStack._count = 1;
-					scripts.pullSeq();
+					pullSequence();
 				}
 			} else {
 				drawInterface();
@@ -513,10 +531,6 @@ void Talk::freeTalkVars() {
 	_statements.clear();
 }
 
-void Talk::pullSequence() {
-	// TODO
-}
-
 /**
  * Opens the talk file 'talk.tlk' and searches the index for the specified
  * conversation. If found, the data for that conversation is loaded
@@ -810,4 +824,52 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
 	return lineY;
 }
 
+/**
+ * Clears the stack of pending object sequences associated with speakers in the scene
+ */
+void Talk::clearSequences() {
+	_sequenceStack.clear();
+}
+
+void Talk::pullSequence() {
+	// TODO
+}
+
+void Talk::pushSequence(int speak) {
+	// TODO
+}
+
+/**
+ * Change the sequence of a background object corresponding to a given speaker.
+ * The new sequence will display the character as "listening"
+ */
+void Talk::setStillSeq(int speak) {
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+
+	// Don't bother doing anything if no specific speaker is specified
+	if (speak == -1)
+		return;
+
+	if (speak) {
+		int objNum = people.findSpeaker(speak);
+		if (objNum != -1) {
+			Object &obj = scene._bgShapes[objNum];
+			
+			if (obj._seqSize < MAX_TALK_SEQUENCES) {
+				warning("Tried to copy too many still frames");
+			} else {
+				for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) {
+					obj._sequences[idx] = STILL_SEQUENCES[speak][idx];
+					if (idx > 0 && !TALK_SEQUENCES[speak][idx] && !TALK_SEQUENCES[speak][idx - 1])
+						break;
+				}
+
+				obj._frameNumber = 0;
+				obj._seqTo = 0;
+			}
+		}
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index dbcdf742b8..3b02f92bc6 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -31,6 +31,8 @@
 
 namespace Sherlock {
 
+#define MAX_TALK_SEQUENCES 11
+
 struct SavedSequence {
 	int _objNum;
 	Common::Array<byte> _sequences;
@@ -58,15 +60,28 @@ struct TalkHistoryEntry {
 	bool &operator[](int index) { return _data[index]; }
 };
 
+struct TalkSequences {
+	byte _data[MAX_TALK_SEQUENCES];
+
+	TalkSequences() { clear(); }
+	TalkSequences(const byte *data);
+
+	byte &operator[](int idx) { return _data[idx]; }
+	void clear();
+};
+
 class SherlockEngine;
 
 class Talk {
+private:
+	Common::Array<TalkSequences> STILL_SEQUENCES;
+	Common::Array<TalkSequences> TALK_SEQUENCES;
 private:
 	SherlockEngine *_vm;
 	int _saveSeqNum;
 	Common::Array<SavedSequence> _savedSequences;
-	Common::Stack<int> _sequenceStack;
 	Common::Array<Statement> _statements;
+	Common::Stack<int> _sequenceStack;
 	TalkHistoryEntry _talkHistory[500];
 	int _speaker;
 	int _talkIndex;
@@ -77,8 +92,6 @@ private:
 	int _talkToFlag;
 	bool _moreTalkUp, _moreTalkDown;
 
-	void pullSequence();
-
 	void loadTalkFile(const Common::String &filename);
 
 	void stripVoiceCommands();
@@ -92,6 +105,8 @@ public:
 	int _talkCounter;
 public:
 	Talk(SherlockEngine *vm);
+	void setSequences(const byte *talkSequences, const byte *stillSequences,
+		int maxPeople);
 
 	void talkTo(const Common::String &filename);
 
@@ -100,6 +115,12 @@ public:
 	void freeTalkVars();
 
 	void drawInterface();
+
+	void setStillSeq(int speak);
+	void clearSequences();
+	void pullSequence();
+	void pushSequence(int speak);
+	bool isSequencesEmpty() const { return _sequenceStack.empty(); }
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 283c6074ad77c0c18c9d1550d7ac7c2443072aec Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Mar 2015 23:21:04 -0400
Subject: SHERLOCK: Implement pushSequence and pullSequence

---
 engines/sherlock/talk.cpp | 66 ++++++++++++++++++++++++++++++++++++++++-------
 engines/sherlock/talk.h   | 11 +++++---
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 26c2e523f3..6596431b8b 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -831,37 +831,83 @@ void Talk::clearSequences() {
 	_sequenceStack.clear();
 }
 
+/**
+ * Pulls a background object sequence from the sequence stack and restore's the
+ * object's sequence
+ */
 void Talk::pullSequence() {
-	// TODO
+	Scene &scene = *_vm->_scene;
+
+	SequenceEntry seq = _sequenceStack.pop();
+	if (seq._objNum != -1) {
+		Object &obj = scene._bgShapes[seq._objNum];
+
+		if (obj._seqSize < MAX_TALK_SEQUENCES) {
+			warning("Tried to restore too few frames");
+		} else {
+			for (int idx = 0; idx < MAX_TALK_SEQUENCES; ++idx)
+				obj._sequences[idx] = seq._sequences[idx];
+
+			obj._frameNumber = seq._frameNumber;
+			obj._seqTo = seq._seqTo;
+		}
+	}
 }
 
-void Talk::pushSequence(int speak) {
-	// TODO
+/**
+ * Push the sequence of a background object that's an NPC that needs to be
+ * saved onto the sequence stack.
+ */
+void Talk::pushSequence(int speaker) {
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+
+	// Only proceed if a speaker is specified
+	if (speaker == -1)
+		return;
+
+	SequenceEntry seqEntry;
+	if (!speaker) {
+		seqEntry._objNum = -1;
+	} else {
+		seqEntry._objNum = people.findSpeaker(speaker);
+
+		Object &obj = scene._bgShapes[seqEntry._objNum];
+		for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx)
+			seqEntry._sequences.push_back(obj._sequences[idx]);
+
+		seqEntry._frameNumber = obj._frameNumber;
+		seqEntry._seqTo = obj._seqTo;
+	}
+	
+	_sequenceStack.push(seqEntry);
+	if (_sequenceStack.size() >= 5)
+		error("sequence stack overflow");
 }
 
 /**
  * Change the sequence of a background object corresponding to a given speaker.
  * The new sequence will display the character as "listening"
  */
-void Talk::setStillSeq(int speak) {
+void Talk::setStillSeq(int speaker) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 
 	// Don't bother doing anything if no specific speaker is specified
-	if (speak == -1)
+	if (speaker == -1)
 		return;
 
-	if (speak) {
-		int objNum = people.findSpeaker(speak);
+	if (speaker) {
+		int objNum = people.findSpeaker(speaker);
 		if (objNum != -1) {
 			Object &obj = scene._bgShapes[objNum];
 			
 			if (obj._seqSize < MAX_TALK_SEQUENCES) {
-				warning("Tried to copy too many still frames");
+				warning("Tried to copy too few still frames");
 			} else {
 				for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) {
-					obj._sequences[idx] = STILL_SEQUENCES[speak][idx];
-					if (idx > 0 && !TALK_SEQUENCES[speak][idx] && !TALK_SEQUENCES[speak][idx - 1])
+					obj._sequences[idx] = STILL_SEQUENCES[speaker][idx];
+					if (idx > 0 && !TALK_SEQUENCES[speaker][idx] && !TALK_SEQUENCES[speaker][idx - 1])
 						break;
 				}
 
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 3b02f92bc6..0cd0a8c638 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -38,6 +38,11 @@ struct SavedSequence {
 	Common::Array<byte> _sequences;
 };
 
+struct SequenceEntry : public SavedSequence {
+	int _frameNumber;
+	int _seqTo;
+};
+
 struct Statement {
 	Common::String _statement;
 	Common::String _reply;
@@ -80,8 +85,8 @@ private:
 	SherlockEngine *_vm;
 	int _saveSeqNum;
 	Common::Array<SavedSequence> _savedSequences;
+	Common::Stack<SequenceEntry> _sequenceStack;
 	Common::Array<Statement> _statements;
-	Common::Stack<int> _sequenceStack;
 	TalkHistoryEntry _talkHistory[500];
 	int _speaker;
 	int _talkIndex;
@@ -116,10 +121,10 @@ public:
 
 	void drawInterface();
 
-	void setStillSeq(int speak);
+	void setStillSeq(int speaker);
 	void clearSequences();
 	void pullSequence();
-	void pushSequence(int speak);
+	void pushSequence(int speaker);
 	bool isSequencesEmpty() const { return _sequenceStack.empty(); }
 };
 
-- 
cgit v1.2.3


From c13c02b079d0881b4d1cd205364d043920bab9a5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 1 Apr 2015 23:12:49 -0400
Subject: SHERLOCK: Implemented loadJournalFile

---
 engines/sherlock/journal.cpp  | 379 +++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/journal.h    |  30 +++-
 engines/sherlock/people.h     |   1 +
 engines/sherlock/sherlock.cpp |   2 +-
 engines/sherlock/talk.h       |   8 +-
 5 files changed, 412 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 34423d2480..a9eb86bf07 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -21,10 +21,11 @@
  */
 
 #include "sherlock/journal.h"
+#include "sherlock/sherlock.h"
 
 namespace Sherlock {
 
-Journal::Journal() {
+Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	// Allow up to 1000 statements
 	_data.resize(1000);
 
@@ -35,10 +36,386 @@ Journal::Journal() {
 	_sub = 0;
 	_up = _down = 0;
 	_page = 0;
+	_converseNum = -1;
+
+	// Load the journal directory and location names
+	loadJournalLocations();
 }
 
+/**
+ * Records statements that are said, in the order which they are said. The player
+ * can then read the journal to review them
+ */
 void Journal::record(int converseNum, int statementNum) {
+	int saveIndex = _index;
+	int saveSub = _sub;
+
+	// Record the entry into the list
+	_data.push_back(JournalEntry(converseNum, statementNum));
+
+	bool newLines = loadJournalFile(true);
+
 	// TODO
 }
 
+void Journal::loadJournalLocations() {
+	Resources &res = *_vm->_res;
+	char c;
+
+	_directory.clear();
+
+	Common::SeekableReadStream *dir = res.load("talk.lib");
+	dir->skip(4);		// Skip header
+	
+	// Get the numer of entries
+	_directory.resize(dir->readUint16LE());
+
+	// Read in each entry
+	for (uint idx = 0; idx < _directory.size(); ++idx) {
+		Common::String line;
+		while ((c = dir->readByte()) != 0)
+			line += c;
+
+		_directory.push_back(line);
+	}
+
+	delete dir;
+
+	// Load in the locations stored in journal.txt
+	Common::SeekableReadStream *loc = res.load("journal.txt");
+
+	_locations.clear();
+	while (loc->pos() < loc->size()) {
+		Common::String line;
+		while ((c = loc->readByte()) != '\0')
+			line += c;
+
+		_locations.push_back(line);
+	}
+
+	delete loc;
+}
+
+/**
+ * Loads the description for the current display index in the journal, and then
+ * word wraps the result to prepare it for being displayed
+ */
+bool Journal::loadJournalFile(bool alreadyLoaded) {
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	JournalEntry &journalEntry = _data[_index];
+	Statement &statement = talk[journalEntry._statementNum];
+
+	Common::String dirFilename = _directory[journalEntry._converseNum];
+	bool replyOnly = journalEntry._replyOnly;
+	Common::String locStr(dirFilename.c_str(), dirFilename.c_str() + 4);
+	int newLocation = atoi(locStr.c_str());
+
+	// If not flagged as alrady loaded, load the conversation into script variables
+	if (!alreadyLoaded) {
+		// See if the file to be used is already loaded
+		if (journalEntry._converseNum != _converseNum) {
+			// Nope. Free any previously loaded talk
+			talk.freeTalkVars();
+
+			// Find the person being talked to
+			talk._talkTo = -1;
+			for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+				Common::String portrait = people[idx]._portrait;
+				Common::String numStr(portrait.c_str(), portrait.c_str() + 4);
+
+				if (locStr == numStr) {
+					talk._talkTo = idx;
+					break;
+				}
+			}
+
+			// Load the talk file
+			talk.loadTalkFile(dirFilename);
+		}
+	}
+
+	if (talk[0]._statement.hasPrefix("*") || talk[0]._statement.hasPrefix("^"))
+		replyOnly = true;
+
+	// If this isn't the first journal entry, see if the previous journal entry
+	// was in the same scene to see if we need to include the scene header
+	int oldLocation = -1;
+	if (_index != 0) {
+		// Get the scene number of the prior journal entry
+		Common::String priorEntry = _directory[_data[_index - 1]._converseNum];
+		oldLocation = atoi(Common::String(priorEntry.c_str() + 4, priorEntry.c_str() + 6).c_str());
+	}
+
+	// Start building journal string
+	Common::String journalString;
+
+	if (newLocation != oldLocation) {
+		// Add in scene title
+		journalString = "@" + _locations[newLocation - 1] + ":";
+
+		// See if title can fit into a single line, or requires splitting on 2 lines
+		int width = screen.stringWidth(journalString.c_str() + 1);
+		if (width > 230) {
+			// Scan backwards from end of title to find a space between a word
+			// where the width is less than the maximum allowed for the line
+			const char *lineP = journalString.c_str() + journalString.size() - 1;
+			while (width > 230 || *lineP != ' ')
+				width -= screen.charWidth(*lineP--);
+			
+			// Split the header into two lines, and add a '@' prefix 
+			// to the second line as well
+			journalString = Common::String(journalString.c_str(), lineP) + "\n@" +
+				Common::String(lineP + 1);
+		}
+
+		// Add a newline at the end of the title
+		journalString += '\n';
+	}
+
+	// If Holmes has something to say first, then take care of it
+	if (!replyOnly) {
+		// Handle the grammar
+		journalString += "Holmes ";
+		if (talk[journalEntry._statementNum]._statement.hasSuffix("?"))
+			journalString += "asked ";
+		else
+			journalString += "said to ";
+	
+		switch (talk._talkTo) {
+		case 1:
+			journalString += "me";
+			break;
+		case 2:
+			journalString += "the Inspector";
+			break;
+		default:
+			journalString += inv._names[talk._talkTo];
+			break;
+		}
+		journalString += ", \"";
+
+		// Add the statement
+		journalString += statement._statement;
+	}
+
+	// Handle including the reply
+	bool startOfReply = true;
+	bool ctrlSpace = false;
+	bool commentFlag = false;
+	bool commentJustPrinted = false;
+	const char *replyP = statement._reply.c_str();
+
+	while (*replyP) {
+		char c = *replyP;
+
+		// Is it a control character?
+		if (c < 128) {
+			// Nope. Set flag for allowing control coes to insert spaces
+			ctrlSpace = true;
+
+			// Check for embedded comments
+			if (c == '{' || c == '}') {
+				// Comment characters. If we're starting a comment and there's
+				// already text displayed, add a closing quote
+				if (c == '{' && !startOfReply && !commentJustPrinted)
+					journalString += '"';
+
+				// If a reply isn't just being started, and we didn't just end
+				// a comment (which would have added a line), add a carriage return
+				if (!startOfReply && ((!commentJustPrinted && c == '{') || c == '}'))
+					journalString += '"';
+			
+				// Handle setting or clearing comment state
+				if (c == '{') {
+					commentFlag = true;
+					commentJustPrinted = false;
+				} else {
+					commentFlag = false;
+					commentJustPrinted = true;
+				}
+			} else {
+				if (startOfReply) {
+					if (!replyOnly) {
+						journalString += "\"\n";
+
+						if (talk._talkTo == 1)
+							journalString += "I replied, \"";
+						else
+							journalString += "The reply was, \"";
+					} else {
+						if (talk._talkTo == 1)
+							journalString += "I";
+						else if (talk._talkTo == 2)
+							journalString += "The Inspector";
+						else
+							journalString += inv._names[talk._talkTo];
+
+						const char *strP = replyP + 1;
+						char v;
+						do {
+							v = *strP++;						
+						} while (v && v < 128 && v != '.' && v != '!' && v != '?');
+
+						if (v == '?')
+							journalString += " asked, \"";
+						else
+							journalString += " said, \"";
+					}
+
+					startOfReply = false;
+				}
+
+				// Copy text from the place until either the reply ends, a comment
+				// {} block is started, or a control character is encountered
+				do {
+					journalString += *replyP++;
+				} while (*replyP && *replyP < 128 && *replyP != '{' && *replyP != '}');
+
+				// Move pointer back, since the outer for loop will increment it again
+				--replyP;
+				commentJustPrinted = false;
+			}
+		} else if (c == 128) {
+			if (!startOfReply) {
+				if (!commentFlag && !commentJustPrinted)
+					journalString += "\"\n";
+
+				journalString += "Then ";
+				commentFlag = false;
+			} else if (!replyOnly) {
+				journalString += "\"\n";
+			}
+
+			startOfReply = false;
+			c = *++replyP;
+
+			if ((c - 1) == 0)
+				journalString += "Holmes";
+			else if ((c - 1) == 1)
+				journalString += "I";
+			else if ((c - 1) == 2)
+				journalString += "the Inspector";
+			else
+				journalString += inv._names[c - 1];
+
+			const char *strP = replyP + 1;
+			char v;
+			do {
+				v = *strP++;
+			} while (v && v < 128 && v != '.' && v != '!' && v != '?');
+
+			if (v == '?')
+				journalString += " asked, \"";
+			else
+				journalString += " said, \"";
+		} else {
+			// Control code, so move past it and any parameters
+			++replyP;
+			switch (c) {
+			case 129:		// Run canim
+			case 130:		// Assign side
+			case 131:		// Pause with control
+			case 136:		// Pause without control
+			case 157:		// Walk to canimation
+				// These commands don't have any param
+				break;
+
+			case 134:		// Change sequence
+				replyP += (replyP[0] & 127) + replyP[2] + 1;
+				break;
+
+			case 135:       // Walk to co-ords
+			case 154:		// Move mouse
+				replyP += 3; 
+				break;
+
+			case 139:		// Set flag
+			case 143:		// If statement 
+				++replyP;
+				break;
+
+			case 140:		// Play voice file
+			case 150:		// Play prologue
+			case 153:		// Call talk file 
+				replyP += 7;
+				break;
+
+			case 141:		// Toggle object
+			case 151:		// Put item in inventory
+			case 152:		// Set object
+			case 155:		// Info line
+			case 158:		// Delete item from inventory
+				replyP += *replyP & 127;
+				break;
+
+			case 149:		// Goto scene
+				replyP += 4;
+				break;
+
+			case 161:		// End of line
+				journalString += "\n";
+				break;
+
+			default:
+				break;
+			}
+
+			// Put a space in the output for a control character, unless it's
+			// immediately coming after another control character
+			if (ctrlSpace && c != 130 && c != 161 && !commentJustPrinted) {
+				journalString += " ";
+				ctrlSpace = false;
+			}
+		}
+	}
+
+	if (!startOfReply && !commentJustPrinted)
+		journalString += '"';
+
+	// Finally finished building the journal text. Need to process the text to
+	// word wrap it to fit on-screen. The resulting lines are stored in the
+	// _entries array
+	_entries.clear();
+
+	while (!journalString.empty()) {
+		const char *startP = journalString.c_str();
+
+		// If the first character is a '@' flagging a title line, then move
+		// past it, so the @ won't be included in the line width calculation
+		if (*startP == '@')
+			++startP;
+	
+		// Build up chacters until a full line is found
+		int width = 0;
+		const char *endP = startP;
+		while (width < 230 && *endP && *endP != '\n' && (endP - startP) < 79)
+			width += screen.charWidth(*endP++);
+		
+		// If word wrapping, move back to end of prior word
+		if (width >= 230 || (endP - startP) >= 79) {
+			while (*--endP != ' ')
+				;
+		}
+
+		// Add in the line
+		_entries.push_back(Common::String(startP, endP));
+
+		// Strip line off from string being processed
+		journalString = *endP ? Common::String(endP + 1) : "";
+	}
+
+	// Add a blank line at the end of the text as long as text was present
+	if (!startOfReply) {
+		_entries.push_back("");
+	} else {
+		_entries.clear();
+	}
+
+	return _entries.size();
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 87e5a4f8f2..af8d683619 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -25,20 +25,44 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/str-array.h"
+#include "common/stream.h"
 
 namespace Sherlock {
 
+struct JournalEntry {
+	int _converseNum;
+	bool _replyOnly;
+	int _statementNum;
+
+	JournalEntry() : _converseNum(0), _replyOnly(false), _statementNum(0) {}
+	JournalEntry(int converseNum, int statementNum, bool replyOnly = false) :
+		_converseNum(converseNum), _statementNum(statementNum), _replyOnly(replyOnly) {}
+};
+
+class SherlockEngine;
+
 class Journal {
-public:
-	Common::Array<int> _data;
+private:
+	SherlockEngine *_vm;
+	Common::Array<JournalEntry> _data;
+	Common::StringArray _directory;
+	Common::StringArray _locations;
+	Common::StringArray _entries;
 	int _count;
 	int _maxPage;
 	int _index;
 	int _sub;
 	int _up, _down;
 	int _page;
+	int _converseNum;
+
+	void loadJournalLocations();
+
+	bool loadJournalFile(bool alreadyLoaded);
+public:
 public:
-	Journal();
+	Journal(SherlockEngine *vm);
 
 	void record(int converseNum, int statementNum);
 };
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index aa54c67567..a1fad019c8 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -82,6 +82,7 @@ public:
 	~People();
 
 	Person &operator[](PeopleId id) { return _data[id]; }
+	Person &operator[](int idx) { return _data[idx]; }
 
 	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 04a9ed54d5..20a805594e 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -79,7 +79,7 @@ void SherlockEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new Events(this);
 	_inventory = new Inventory(this);
-	_journal = new Journal();
+	_journal = new Journal(this);
 	_people = new People(this);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 0cd0a8c638..48cdd2b5b2 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -90,15 +90,12 @@ private:
 	TalkHistoryEntry _talkHistory[500];
 	int _speaker;
 	int _talkIndex;
-	int _talkTo;
 	int _scriptSelect;
 	int _converseNum;
 	int _talkStealth;
 	int _talkToFlag;
 	bool _moreTalkUp, _moreTalkDown;
 
-	void loadTalkFile(const Common::String &filename);
-
 	void stripVoiceCommands();
 	void setTalkMap();
 
@@ -108,11 +105,14 @@ private:
 public:
 	bool _talkToAbort;
 	int _talkCounter;
+	int _talkTo;
 public:
 	Talk(SherlockEngine *vm);
 	void setSequences(const byte *talkSequences, const byte *stillSequences,
 		int maxPeople);
 
+	Statement &operator[](int idx) { return _statements[idx]; }
+
 	void talkTo(const Common::String &filename);
 
 	void talk(int objNum);
@@ -121,6 +121,8 @@ public:
 
 	void drawInterface();
 
+	void loadTalkFile(const Common::String &filename);
+
 	void setStillSeq(int speaker);
 	void clearSequences();
 	void pullSequence();
-- 
cgit v1.2.3


From 86022c065c1bf7aa67549de602cd6e8933477d74 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 1 Apr 2015 23:19:00 -0400
Subject: SHERLOCK: Implemented Journal::record

---
 engines/sherlock/journal.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index a9eb86bf07..dcddddbbbd 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -52,10 +52,23 @@ void Journal::record(int converseNum, int statementNum) {
 
 	// Record the entry into the list
 	_data.push_back(JournalEntry(converseNum, statementNum));
+	_index = _data.size() - 1;
 
-	bool newLines = loadJournalFile(true);
+	// Load the text for the new entry to get the number of lines it will have
+	int newLines = loadJournalFile(true);
 
-	// TODO
+	// Restore old state
+	_index = saveIndex;
+	_sub = saveSub;
+
+	// If new lines were added to the ournal, update the total number of lines
+	// the journal continues
+	if (newLines) {
+		_maxPage += newLines;
+	} else {
+		// No lines in entry, so remove the new entry from the journal
+		_data.remove_at(_data.size() - 1);
+	}
 }
 
 void Journal::loadJournalLocations() {
-- 
cgit v1.2.3


From 2c36889ec5312b15a7deba8a19003d9500425cb3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 2 Apr 2015 08:11:36 -0400
Subject: SHERLOCK: Rename journal fields for clarity

---
 engines/sherlock/journal.cpp | 24 ++++++++++++------------
 engines/sherlock/journal.h   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index dcddddbbbd..04165cd827 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -27,7 +27,7 @@ namespace Sherlock {
 
 Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	// Allow up to 1000 statements
-	_data.resize(1000);
+	_journal.resize(1000);
 
 	// Initialize fields
 	_count = 0;
@@ -51,8 +51,8 @@ void Journal::record(int converseNum, int statementNum) {
 	int saveSub = _sub;
 
 	// Record the entry into the list
-	_data.push_back(JournalEntry(converseNum, statementNum));
-	_index = _data.size() - 1;
+	_journal.push_back(JournalEntry(converseNum, statementNum));
+	_index = _journal.size() - 1;
 
 	// Load the text for the new entry to get the number of lines it will have
 	int newLines = loadJournalFile(true);
@@ -67,7 +67,7 @@ void Journal::record(int converseNum, int statementNum) {
 		_maxPage += newLines;
 	} else {
 		// No lines in entry, so remove the new entry from the journal
-		_data.remove_at(_data.size() - 1);
+		_journal.remove_at(_journal.size() - 1);
 	}
 }
 
@@ -118,7 +118,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	JournalEntry &journalEntry = _data[_index];
+	JournalEntry &journalEntry = _journal[_index];
 	Statement &statement = talk[journalEntry._statementNum];
 
 	Common::String dirFilename = _directory[journalEntry._converseNum];
@@ -158,7 +158,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 	int oldLocation = -1;
 	if (_index != 0) {
 		// Get the scene number of the prior journal entry
-		Common::String priorEntry = _directory[_data[_index - 1]._converseNum];
+		Common::String priorEntry = _directory[_journal[_index - 1]._converseNum];
 		oldLocation = atoi(Common::String(priorEntry.c_str() + 4, priorEntry.c_str() + 6).c_str());
 	}
 
@@ -390,8 +390,8 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 
 	// Finally finished building the journal text. Need to process the text to
 	// word wrap it to fit on-screen. The resulting lines are stored in the
-	// _entries array
-	_entries.clear();
+	// _lines array
+	_lines.clear();
 
 	while (!journalString.empty()) {
 		const char *startP = journalString.c_str();
@@ -414,7 +414,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 		}
 
 		// Add in the line
-		_entries.push_back(Common::String(startP, endP));
+		_lines.push_back(Common::String(startP, endP));
 
 		// Strip line off from string being processed
 		journalString = *endP ? Common::String(endP + 1) : "";
@@ -422,12 +422,12 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 
 	// Add a blank line at the end of the text as long as text was present
 	if (!startOfReply) {
-		_entries.push_back("");
+		_lines.push_back("");
 	} else {
-		_entries.clear();
+		_lines.clear();
 	}
 
-	return _entries.size();
+	return _lines.size();
 }
 
 
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index af8d683619..4add81d508 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -45,10 +45,10 @@ class SherlockEngine;
 class Journal {
 private:
 	SherlockEngine *_vm;
-	Common::Array<JournalEntry> _data;
+	Common::Array<JournalEntry> _journal;
 	Common::StringArray _directory;
 	Common::StringArray _locations;
-	Common::StringArray _entries;
+	Common::StringArray _lines;
 	int _count;
 	int _maxPage;
 	int _index;
-- 
cgit v1.2.3


From 8ee021434236b454faf52995fb102322f2e7bd8f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 2 Apr 2015 08:44:07 -0400
Subject: SHERLOCK: Implemented Inventory::highlight

---
 engines/sherlock/inventory.cpp      | 15 +++++++++++++--
 engines/sherlock/inventory.h        |  2 +-
 engines/sherlock/user_interface.cpp |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index ac37e7c587..f7706c9d64 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -329,8 +329,19 @@ void Inventory::invCommands(bool slamIt) {
 	}
 }
 
-void Inventory::doInvLite(int index, byte color) {
-	// TODO
+/**
+ * Set the highlighting color of a given inventory item
+ */
+void Inventory::highlight(int index, byte color) {
+	Screen &screen = *_vm->_screen;
+	Surface &bb = *screen._backBuffer;
+	int slot = index - _invIndex;
+	Graphics::Surface &img = (*_invShapes[slot])[0]._frame;
+
+	bb.fillRect(Common::Rect(8 + slot * 52, 165, (slot + 1) * 52, 194), color);
+	bb.transBlitFrom(img, Common::Point(6 + slot * 52 + ((47 - img.w) / 2),
+		163 + ((33 - img.h) / 2)));
+	screen.slamArea(8 + slot * 52, 165, 44, 30);
 }
 
 void Inventory::doInvJF() {
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 3c01dc38da..55abc4c960 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -87,7 +87,7 @@ public:
 
 	void invCommands(bool slamIt);
 
-	void doInvLite(int index, byte color);
+	void highlight(int index, byte color);
 
 	void doInvJF();
 };
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 74142ab80e..6f60049e31 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -789,11 +789,11 @@ void UserInterface::doInvControl() {
 		if (_oldSelector != -1) {
 			// Un-highlight
 			if (_oldSelector >= inv._invIndex && _oldSelector < (inv._invIndex + 6))
-				inv.doInvLite(_oldSelector, BUTTON_MIDDLE);
+				inv.highlight(_oldSelector, BUTTON_MIDDLE);
 		}
 
 		if (_selector != -1)
-			inv.doInvLite(_selector, 235);
+			inv.highlight(_selector, 235);
 
 		_oldSelector = _selector;
 	}
-- 
cgit v1.2.3


From 9c24ae75909088742aae7b303f80de43cb31a7a6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 2 Apr 2015 18:30:16 -0400
Subject: SHERLOCK: Implemented Journal::drawInterface

---
 engines/sherlock/journal.cpp        | 81 +++++++++++++++++++++++++++++++++++++
 engines/sherlock/journal.h          |  6 +++
 engines/sherlock/user_interface.cpp |  4 ++
 3 files changed, 91 insertions(+)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 04165cd827..94c6cf69e7 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -25,6 +25,23 @@
 
 namespace Sherlock {
 
+#define JOURNAL_BUTTONS_Y 178
+
+// Positioning of buttons in the journal view
+const int JOURNAL_POINTS[9][3] = { 
+	{ 6, 68, 37 },
+	{ 69, 131, 100 },
+	{ 132, 192, 162 },
+	{ 193, 250, 221 },
+	{ 251, 313, 281 },
+	{ 6, 82, 44 },
+	{ 83, 159, 121 },
+	{ 160, 236, 198 },
+	{ 237, 313, 275 } 
+};
+
+/*----------------------------------------------------------------*/
+
 Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	// Allow up to 1000 statements
 	_journal.resize(1000);
@@ -430,5 +447,69 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 	return _lines.size();
 }
 
+void Journal::drawInterface() {
+	Resources &res = *_vm->_res;
+	Screen &screen = *_vm->_screen;
+	byte palette[PALETTE_SIZE];
+
+	// Load in the journal background
+	Common::SeekableReadStream *bg = res.load("journal.lbv");
+	bg->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT);
+	bg->read(palette, PALETTE_SIZE);
+	delete bg;
+
+	// Set the palette and print the title
+	screen.setPalette(palette);
+	screen.gPrint(Common::Point(111, 18), BUTTON_BOTTOM, "Watson's Journal");
+	screen.gPrint(Common::Point(110, 17), INV_FOREGROUND, "Watson's Journal");
+
+	// Draw the buttons
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[0][0], JOURNAL_BUTTONS_Y, 
+		JOURNAL_POINTS[0][1], JOURNAL_BUTTONS_Y + 10), 
+		JOURNAL_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[1][0], JOURNAL_BUTTONS_Y, 
+		JOURNAL_POINTS[1][1], JOURNAL_BUTTONS_Y + 10), 
+		JOURNAL_POINTS[1][2] - screen.stringWidth("Back 10") / 2, "Back 10");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[2][0], JOURNAL_BUTTONS_Y, 
+		JOURNAL_POINTS[2][1], JOURNAL_BUTTONS_Y + 10), 
+		JOURNAL_POINTS[2][2] - screen.stringWidth("Up") / 2, "Up");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[3][0], JOURNAL_BUTTONS_Y, 
+		JOURNAL_POINTS[3][1], JOURNAL_BUTTONS_Y + 10), 
+		JOURNAL_POINTS[3][2] - screen.stringWidth("Down") / 2, "Down");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[4][0], JOURNAL_BUTTONS_Y, 
+		JOURNAL_POINTS[4][1], JOURNAL_BUTTONS_Y + 10),
+		JOURNAL_POINTS[4][2] - screen.stringWidth("Ahead 10") / 2, "Ahead 10");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[5][0], JOURNAL_BUTTONS_Y + 11, 
+		JOURNAL_POINTS[5][1], JOURNAL_BUTTONS_Y + 21),
+		JOURNAL_POINTS[5][2] - screen.stringWidth("Search") / 2, "Search");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[6][0], JOURNAL_BUTTONS_Y + 11, 
+		JOURNAL_POINTS[6][1], JOURNAL_BUTTONS_Y + 21),
+		JOURNAL_POINTS[6][2] - screen.stringWidth("First Page") / 2, "First Page");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[7][0], JOURNAL_BUTTONS_Y + 11, 
+		JOURNAL_POINTS[7][1], JOURNAL_BUTTONS_Y + 21),
+		JOURNAL_POINTS[7][2] - screen.stringWidth("Last Page") / 2, "Last Page");
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[8][0], JOURNAL_BUTTONS_Y + 11, 
+		JOURNAL_POINTS[8][1], JOURNAL_BUTTONS_Y + 21),
+		JOURNAL_POINTS[8][2] - screen.stringWidth("Print Text") / 2, "Print Text");
+
+	if (_journal.size() == 0) {
+		_up = _down = 0;
+	} else {
+		doJournal(0, 0);
+	}
+
+	doArrows();
+		
+	// Show the entire screen
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+}
+
+void Journal::doArrows() {
+	// TODO
+}
+
+void Journal::doJournal(int direction, int howFar) {
+	// TODO
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 4add81d508..34d99af0ec 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -60,11 +60,17 @@ private:
 	void loadJournalLocations();
 
 	bool loadJournalFile(bool alreadyLoaded);
+
+	void doArrows();
+
+	void doJournal(int direction, int howFar);
 public:
 public:
 	Journal(SherlockEngine *vm);
 
 	void record(int converseNum, int statementNum);
+
+	void drawInterface();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 6f60049e31..01b08ffd71 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1127,6 +1127,10 @@ void UserInterface::doTalkControl() {
 }
 
 void UserInterface::journalControl() {
+	Journal &journal = *_vm->_journal;
+	
+	journal.drawInterface();
+
 	// TODO
 }
 
-- 
cgit v1.2.3


From 91774a0aebb0b37010627e448a1ac18169cec07f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 2 Apr 2015 19:19:36 -0400
Subject: SHERLOCK: Implemented Journal::doButtons

---
 engines/sherlock/journal.cpp | 24 ++++++++++++++++++++++--
 engines/sherlock/journal.h   |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 94c6cf69e7..b45d772716 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -51,7 +51,7 @@ Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	_maxPage = 0;
 	_index = 0;
 	_sub = 0;
-	_up = _down = 0;
+	_up = _down = false;
 	_page = 0;
 	_converseNum = -1;
 
@@ -504,8 +504,28 @@ void Journal::drawInterface() {
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
+/**
+ * Display the arrows that can be used to scroll up and down pages
+ */
 void Journal::doArrows() {
-	// TODO
+	Screen &screen = *_vm->_screen;
+	byte color;
+
+	color = (_page > 1) ? COMMAND_FOREGROUND : COMMAND_NULL;
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), color, false, "Back 10");
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[2][2], JOURNAL_BUTTONS_Y), color, false, "Up");
+
+	color = _down ? COMMAND_FOREGROUND : COMMAND_NULL;
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[3][2], JOURNAL_BUTTONS_Y), color, false, "Down");
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[4][2], JOURNAL_BUTTONS_Y), color, false, "Ahead 10");
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[7][2], JOURNAL_BUTTONS_Y + 11), color, false, "Last Page");
+
+	color = _journal.size() > 0 ? COMMAND_FOREGROUND : COMMAND_NULL;
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), color, false, "Search");
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), color, false, "Print Text");
+
+	color = _page > 1 ? COMMAND_FOREGROUND : COMMAND_NULL;
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[6][2], JOURNAL_BUTTONS_Y + 11), color, false, "First Page");
 }
 
 void Journal::doJournal(int direction, int howFar) {
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 34d99af0ec..8ad19dc0e5 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -53,7 +53,7 @@ private:
 	int _maxPage;
 	int _index;
 	int _sub;
-	int _up, _down;
+	bool _up, _down;
 	int _page;
 	int _converseNum;
 
-- 
cgit v1.2.3


From 2b1bc8dc3cbcd6c85ee8ba5734154c8e72a38645 Mon Sep 17 00:00:00 2001
From: unknown
Date: Fri, 3 Apr 2015 21:01:06 -0500
Subject: TONY: Add detection for Italian PC Magazine version

---
 engines/tony/detection_tables.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/engines/tony/detection_tables.h b/engines/tony/detection_tables.h
index 28dcaac752..e4a064157b 100644
--- a/engines/tony/detection_tables.h
+++ b/engines/tony/detection_tables.h
@@ -127,6 +127,22 @@ static const TonyGameDescription gameDescriptions[] = {
 		},
 	},
 
+	{
+		// Tony Tough Italian (PC Action magazine)
+		{
+			"tony",
+			0,
+			{
+				{ "data1.cab", 0, "42344827407b974af11d60fadbd021b4", 3811 },
+				AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+	},
+
 	{
 		// Tony Tough Italian provided by Giovanni Bajo
 		{
-- 
cgit v1.2.3


From 402846aea5e08d774521caaa9bd29531c738a100 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 4 Apr 2015 08:54:19 -0500
Subject: SHERLOCK: Implemented doJournal

---
 engines/sherlock/journal.cpp | 259 ++++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/journal.h   |   5 +-
 engines/sherlock/screen.h    |   3 +-
 3 files changed, 263 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index b45d772716..140b766dca 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -26,6 +26,7 @@
 namespace Sherlock {
 
 #define JOURNAL_BUTTONS_Y 178
+#define LINES_PER_PAGE 11
 
 // Positioning of buttons in the journal view
 const int JOURNAL_POINTS[9][3] = { 
@@ -528,8 +529,262 @@ void Journal::doArrows() {
 	screen.buttonPrint(Common::Point(JOURNAL_POINTS[6][2], JOURNAL_BUTTONS_Y + 11), color, false, "First Page");
 }
 
-void Journal::doJournal(int direction, int howFar) {
-	// TODO
+/**
+ * Displays a page of the journal at the current index
+ */
+bool Journal::doJournal(int direction, int howFar) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	int yp = 37;
+	int startPage = _page;
+	bool endJournal = false;
+	bool firstOccurance = false;
+	bool searchSuccessful = false;
+	bool endFlag = false;
+	int lineNum = 0;
+	int maxLines;
+	int savedIndex;
+	int savedSub;
+	int temp;
+	bool inc;
+	const char *matchP;
+	int width;
+
+	_converseNum = -1;
+	_down = true;
+
+	do {
+		// Get the number of lines for the current journal entry
+		maxLines = loadJournalFile(false);
+		if (!maxLines) {
+			// Entry has no text, so it must be a stealth eny. Move onto further journal entries
+			// until an entry with text is found
+			if (++_index == (int)_journal.size()) {
+				endJournal = true;
+			} else {
+				_sub = 0;
+				maxLines = loadJournalFile(false);
+			}
+		}
+	} while (!endJournal && !maxLines);
+
+	// Check if there no further pages with text until the end of the journal
+	if (endJournal) {
+		// If moving forward or backwards, clear the page before printing
+		if (direction)
+			clearPage();
+
+		screen.gPrint(Common::Point(235, 21), PEN_COLOR, "Page %d", _page);
+		return false;
+	}
+
+	// If the journal page is being changed, set the wait cursor
+	if (direction)
+		events.setCursor(WAIT);
+
+	switch (direction) {
+	case 1:
+	case 4:
+		// Move backwards howFar number of lines unless either the start of the journal is reached,
+		// or a searched for keyword is found
+		do {
+			// Animate the glass mouse cursor
+			int cursorNum = (int)events.getCursor() + 1;
+			if (cursorNum > (WAIT + 2))
+				cursorNum = WAIT;
+			events.setCursor((CursorId)cursorNum);
+
+			// Move backwards through the journal file a line at a time
+			if (--_sub < 0) {
+				do {
+					if (--_index < 0) {
+						_index = 0;
+						_sub = 0;
+						endJournal = true;
+					}
+					else {
+						maxLines = loadJournalFile(false);
+						_sub = maxLines - 1;
+					}
+				} while (!endJournal && !maxLines);
+			}
+
+			// If it's search mode, check each line for the given keyword
+			if (direction >= 3 && maxLines && !endJournal && !searchSuccessful) {
+				Common::String line = _lines[_sub];
+				line.toUppercase();
+				if (strstr(line.c_str(), _find.c_str()) != nullptr) {
+					// Found a match. Reset howFar so that the start of page that the match
+					// was found on will be displayed
+					searchSuccessful = true;
+					howFar = ((lineNum / LINES_PER_PAGE) + 1) * LINES_PER_PAGE;
+				}
+			}
+
+			++lineNum;
+		} while (lineNum < howFar && !endJournal);
+
+		if (!_index && !_sub)
+			_page = 1;
+		else
+			_page -= howFar / LINES_PER_PAGE;
+		break;
+
+	case 2:
+	case 3:
+		// Move howFar lines ahead unless the end of the journal is reached, 
+		// or a searched for keyword is found
+		for (temp = 0; (temp < (howFar / LINES_PER_PAGE)) && !endJournal && !searchSuccessful; ++temp) {
+			// Handle animating mouse cursor
+			int cursorNum = (int)events.getCursor() + 1;
+			if (cursorNum >(WAIT + 2))
+				cursorNum = WAIT;
+			events.setCursor((CursorId)cursorNum);
+
+			lineNum = 0;
+			savedIndex = _index;
+			savedSub = _sub;
+
+			// Move a single page ahead
+			do {
+				// If in search mode, check for keyword
+				if (direction >= 3 && _page != startPage) {
+					Common::String line = _lines[_sub];
+					line.toUppercase();
+					if (strstr(line.c_str(), _find.c_str()) != nullptr)
+						searchSuccessful = true;
+				}
+
+				// Move forwards a line at a time, unless search word was found
+				if (!searchSuccessful) {
+					if (++_sub == maxLines) {
+						// Reached end of page
+						do {
+							if (++_index == (int)_lines.size()) {
+								_index = savedIndex;
+								_sub = savedSub;
+								maxLines = loadJournalFile(false);
+								endJournal = true;
+							} else {
+								_sub = 0;
+								maxLines = loadJournalFile(false);
+							}
+						} while (!endJournal && !maxLines);						
+					}
+
+					++lineNum;
+				}
+			} while ((lineNum < LINES_PER_PAGE) && !endJournal && !searchSuccessful);
+
+			if (!endJournal && !searchSuccessful)
+				// Move to next page
+				++_page;
+
+			if (searchSuccessful) {
+				// Search found, so show top of the page it was found on
+				_index = savedIndex;
+				_sub = savedSub;
+				maxLines = loadJournalFile(false);
+			}
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	if (direction) {
+		events.setCursor(ARROW);
+		clearPage();
+	}
+
+	screen.gPrint(Common::Point(235, 21), PEN_COLOR, "Page %d", _page);
+
+	temp = _sub;
+	savedIndex = _index;
+	lineNum = 0;
+
+	do {
+		inc = true;
+
+		// If there wasn't any line to print at the top of the page, we won't need to
+		// increment the y position
+		if (_lines[temp].empty() && yp == 37)
+			inc = false;
+
+		// If there's a searched for keyword in the line, it will need to be highlighted
+		if (searchSuccessful && firstOccurance) {
+			// Check if line has the keyword
+			Common::String line = _lines[temp];
+			line.toUppercase();
+			if ((matchP = strstr(line.c_str(), _find.c_str())) != nullptr) {
+				matchP = _lines[temp].c_str() + (matchP - line.c_str());
+				firstOccurance = false;
+
+				// Print out the start of the line before the matching keyword
+				Common::String lineStart(_lines[temp].c_str(), matchP);
+				if (lineStart.hasPrefix("@")) {
+					width = screen.stringWidth(lineStart.c_str() + 1);
+					screen.gPrint(Common::Point(53, yp), 15, "%s", lineStart.c_str() + 1);
+				} else {
+					width = screen.stringWidth(lineStart.c_str());
+					screen.gPrint(Common::Point(53, yp), PEN_COLOR, lineStart.c_str());
+				}
+
+				// Print out the found keyword
+				Common::String lineMatch(matchP, matchP + _find.size());
+				screen.gPrint(Common::Point(53 + width, yp), INV_FOREGROUND, lineMatch.c_str());
+				width += screen.stringWidth(lineMatch.c_str());
+
+				// Print remainder of line
+				screen.gPrint(Common::Point(53 + width, yp), PEN_COLOR, matchP + _find.size());
+			} else if (_lines[temp].hasPrefix("@")) {
+				screen.gPrint(Common::Point(53, yp), 15, _lines[temp].c_str() + 1);
+			} else {
+				screen.gPrint(Common::Point(53, yp), PEN_COLOR, _lines[temp].c_str());
+			}
+		} else {
+			if (_lines[temp].hasPrefix("@")) {
+				screen.gPrint(Common::Point(53, yp), 15, _lines[temp].c_str() + 1);
+			} else {
+				screen.gPrint(Common::Point(53, yp), PEN_COLOR, _lines[temp].c_str());
+			}
+		}
+
+		if (++temp == maxLines) {
+			// Move to next page
+			do {
+				if (_index < (_journal.size() - 1) && lineNum < (LINES_PER_PAGE - 1)) {
+					++_index;
+					maxLines = loadJournalFile(false);
+					temp = 0;
+				} else {
+					if (_index == (_journal.size() - 1))
+						_down = false;
+					endFlag = true;
+				}
+			} while (!endFlag && !maxLines);
+		}
+
+		if (inc) {
+			// Move to next line
+			++lineNum;
+			yp += 13;
+		}
+	} while (lineNum < LINES_PER_PAGE && !endFlag);
+
+	_index = savedIndex;
+	_up = _index || _sub;
+
+	return direction >= 3 && searchSuccessful;
+}
+
+/**
+ * Clears the journal page
+ */
+void Journal::clearPage() {
+	// Clear the journal page by redrawing it from scratch
+	drawInterface();
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 8ad19dc0e5..25f70b0e29 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -56,6 +56,7 @@ private:
 	bool _up, _down;
 	int _page;
 	int _converseNum;
+	Common::String _find;
 
 	void loadJournalLocations();
 
@@ -63,7 +64,9 @@ private:
 
 	void doArrows();
 
-	void doJournal(int direction, int howFar);
+	bool doJournal(int direction, int howFar);
+
+	void clearPage();
 public:
 public:
 	Journal(SherlockEngine *vm);
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index edc0136471..4e37a7787c 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -50,7 +50,8 @@ enum {
 	BUTTON_MIDDLE	= 244,
 	BUTTON_BOTTOM	= 248,
 	TALK_FOREGROUND = 12,
-	TALK_NULL		= 16
+	TALK_NULL		= 16,
+	PEN_COLOR		= 250
 };
 
 class SherlockEngine;
-- 
cgit v1.2.3


From 005438570492b88a152a7a11e6d4df45687ba0bd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 4 Apr 2015 17:09:59 -0500
Subject: SHERLOCK: Implement journal event handling

---
 engines/sherlock/journal.cpp        | 392 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/journal.h          |   5 +-
 engines/sherlock/scene.h            |   4 +-
 engines/sherlock/user_interface.cpp |  43 +++-
 4 files changed, 438 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 140b766dca..b05cc03372 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -41,6 +41,12 @@ const int JOURNAL_POINTS[9][3] = {
 	{ 237, 313, 275 } 
 };
 
+const int SEARCH_POINTS[3][3] = {
+	{ 51, 123, 86 },
+	{ 124, 196, 159 },
+	{ 197, 269, 232 }
+};
+
 /*----------------------------------------------------------------*/
 
 Journal::Journal(SherlockEngine *vm): _vm(vm) {
@@ -754,12 +760,12 @@ bool Journal::doJournal(int direction, int howFar) {
 		if (++temp == maxLines) {
 			// Move to next page
 			do {
-				if (_index < (_journal.size() - 1) && lineNum < (LINES_PER_PAGE - 1)) {
+				if (_index < ((int)_journal.size() - 1) && lineNum < (LINES_PER_PAGE - 1)) {
 					++_index;
 					maxLines = loadJournalFile(false);
 					temp = 0;
 				} else {
-					if (_index == (_journal.size() - 1))
+					if (_index == ((int)_journal.size() - 1))
 						_down = false;
 					endFlag = true;
 				}
@@ -787,4 +793,386 @@ void Journal::clearPage() {
 	drawInterface();
 }
 
+/**
+ * Handle events whilst the journal is being displayed
+ */
+bool Journal::handleEvents(int key) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	bool doneFlag = false;
+	Common::Point pt = events.mousePos();
+	byte color;
+	enum Button {
+		BTN_NONE, BTN_EXIT, BTN_BACK10, BTN_UP, BTN_DOWN, BTN_AHEAD110, BTN_SEARCH,
+		BTN_FIRST_PAGE, BTN_LAST_PAGE, BTN_PRINT_TEXT
+	};
+	Button found = BTN_NONE;
+
+	if (events._pressed || events._released) {
+		// Exit button
+		if (pt.x > JOURNAL_POINTS[0][0] && pt.x < JOURNAL_POINTS[0][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+				pt.y < (JOURNAL_BUTTONS_Y + 10)) {
+			found = BTN_EXIT;
+			color = COMMAND_HIGHLIGHTED;
+		} else {
+			color = COMMAND_FOREGROUND;
+		}
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), color, true, "Exit");
+
+		// Back 10 button
+		if (pt.x > JOURNAL_POINTS[1][0] && pt.x < JOURNAL_POINTS[1][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+				pt.y < (JOURNAL_BUTTONS_Y + 10) && _page > 1) {
+			found = BTN_BACK10;
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Back 10");
+		} else if (_page > 1) {
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Back 10");
+		}
+
+		// Up button
+		if (pt.x > JOURNAL_POINTS[2][0] && pt.x < JOURNAL_POINTS[2][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+				pt.y < (JOURNAL_BUTTONS_Y + 10) && _up) {
+			found = BTN_UP;
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[2][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Up");
+		} else if (_up) {
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[2][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Up");
+		}
+
+		// Down button
+		if (pt.x > JOURNAL_POINTS[3][0] && pt.x < JOURNAL_POINTS[3][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+				pt.y < (JOURNAL_BUTTONS_Y + 10) && _down) {
+			found = BTN_DOWN;
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[3][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Down");
+		} else if (_down) {
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[3][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Down");
+		}
+
+		// Ahead 10 button
+		if (pt.x > JOURNAL_POINTS[4][0] && pt.x < JOURNAL_POINTS[4][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+				pt.y < (JOURNAL_BUTTONS_Y + 10) && _down) {
+			found = BTN_AHEAD110;
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[4][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Ahead 10");
+		} else if (_down) {
+			screen.buttonPrint(Common::Point(JOURNAL_POINTS[4][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Ahead 10");
+		}
+
+		// Search button
+		if (pt.x > JOURNAL_POINTS[5][0] && pt.x < JOURNAL_POINTS[5][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+				pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty()) {
+			found = BTN_SEARCH;
+			color = COMMAND_HIGHLIGHTED;
+		} else if (_journal.empty()) {
+			color = COMMAND_NULL;
+		} else {
+			color = COMMAND_FOREGROUND;
+		}
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), color, true, "Search");
+
+		// First Page button
+		if (pt.x > JOURNAL_POINTS[6][0] && pt.x < JOURNAL_POINTS[6][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+				pt.y < (JOURNAL_BUTTONS_Y + 20) && _up) {
+			found = BTN_FIRST_PAGE;
+			color = COMMAND_HIGHLIGHTED;
+		} else if (_up) {
+			color = COMMAND_FOREGROUND;
+		} else {
+			color = COMMAND_NULL;
+		}
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[6][2], JOURNAL_BUTTONS_Y + 11), color, true, "First Page");
+
+		// Last Page button
+		if (pt.x > JOURNAL_POINTS[7][0] && pt.x < JOURNAL_POINTS[7][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+				pt.y < (JOURNAL_BUTTONS_Y + 20) && _down) {
+			found = BTN_LAST_PAGE;
+			color = COMMAND_HIGHLIGHTED;
+		} else if (_down) {
+			color = COMMAND_FOREGROUND;
+		} else {
+			color = COMMAND_NULL;
+		}
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[7][2], JOURNAL_BUTTONS_Y + 11), color, true, "Last Page");
+
+
+		// Print Text button
+		if (pt.x > JOURNAL_POINTS[8][0] && pt.x < JOURNAL_POINTS[8][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+				pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty()) {
+			found = BTN_PRINT_TEXT;
+			color = COMMAND_HIGHLIGHTED;
+		} else if (_journal.empty()) {
+			color = COMMAND_NULL;
+		} else {
+			color = COMMAND_FOREGROUND;
+		}
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), color, true, "Print Text");
+	}
+
+	if (found == BTN_EXIT && events._released)
+		// Exit button pressed
+		doneFlag = true;
+
+	if (((found == BTN_BACK10 && events._released) || key == 'B') && (_page > 1)) {
+		// Scrolll up 10 pages
+		if (_page < 11)
+			doJournal(1, (_page - 1) * LINES_PER_PAGE);
+		else
+			doJournal(1, 10 * LINES_PER_PAGE);
+	
+		doArrows();
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	if (((found == BTN_UP && events._released) || key =='U') && _up) {
+		// Scroll up
+		doJournal(1, LINES_PER_PAGE);
+		doArrows();
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	if (((found == BTN_DOWN && events._released) || key =='D') && _down) {
+		// Scroll down
+		doJournal(2, LINES_PER_PAGE);
+		doArrows();
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	if (((found == BTN_AHEAD110 && events._released) || key == 'A') && _down) {
+		// Scroll down 10 pages
+		if ((_page + 10) > _maxPage)
+			doJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
+		else
+			doJournal(2, 10 * LINES_PER_PAGE);
+
+		doArrows();
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	if (((found == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
+		bool notFound = false;
+	
+		int dir;
+
+		do {
+			if ((dir = getFindName(notFound)) != 0) {
+				int savedIndex = _index;
+				int savedSub = _sub;
+				int savedPage = _page;
+
+				if (doJournal(dir + 2, 1000 * LINES_PER_PAGE) == 0) {
+					_index = savedIndex;
+					_sub = savedSub;
+					_page = savedPage;
+
+					clearPage();
+					doJournal(0, 0);
+					notFound = true;
+				} else {
+					doneFlag = true;
+				}
+
+				doArrows();
+				screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+			} else {
+				doneFlag = true;
+			}
+		} while (!doneFlag);
+		doneFlag = false;
+	}
+
+	if (((found == BTN_FIRST_PAGE && events._released) || key == 'F') && _up) {
+		// First page
+		_index = _sub = 0;
+		_up = _down = false;
+		_page = 1;
+
+		clearPage();
+		doJournal(0, 0);
+		doArrows();
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	if (((found == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
+		// Last page
+		if ((_page + 10) > _maxPage)
+			doJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
+		else
+			doJournal(2, 1000 * LINES_PER_PAGE);
+
+		doArrows();
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	events.wait(2);
+
+	return doneFlag;
+}
+
+/**
+ * Show the search submenu
+ */
+int Journal::getFindName(bool printError) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	int xp;
+	int yp = 174;
+	bool flag = false;
+	Common::String name;
+	enum Button { BTN_NONE, BTN_EXIT, BTN_BACKWARD, BTN_FORWARD };
+	Button found = BTN_NONE;
+	int done = 0;
+	byte color;
+
+	// Draw search panel
+	screen.makePanel(Common::Rect(6, 171, 313, 199));
+	screen.makeButton(Common::Rect(SEARCH_POINTS[0][0], yp, SEARCH_POINTS[0][1], yp + 10),
+		SEARCH_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
+	screen.makeButton(Common::Rect(SEARCH_POINTS[1][0], yp, SEARCH_POINTS[1][1], yp + 10),
+		SEARCH_POINTS[1][2] - screen.stringWidth("Backward") / 2, "Backward");
+	screen.makeButton(Common::Rect(SEARCH_POINTS[2][0], yp, SEARCH_POINTS[2][1], yp + 10),
+		SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, "Forward");
+
+	screen.gPrint(Common::Point(SEARCH_POINTS[0][2] - screen.stringWidth("Exit") / 2, yp), COMMAND_FOREGROUND, "E");
+	screen.gPrint(Common::Point(SEARCH_POINTS[1][2] - screen.stringWidth("Backward") / 2, yp), COMMAND_FOREGROUND, "B");
+	screen.gPrint(Common::Point(SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, yp), COMMAND_FOREGROUND, "F");
+
+	screen.fillRect(Common::Rect(12, 185, 307, 186), BUTTON_BOTTOM);
+	screen.vLine(12, 185, 195, BUTTON_BOTTOM);
+	screen.hLine(13, 195, 306, BUTTON_TOP);
+	screen.hLine(306, 186, 195, BUTTON_TOP);
+
+	if (printError) {
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - screen.stringWidth("Text Not Found !")) / 2, 185),
+			INV_FOREGROUND, "Text Not Found !");
+	} else if (!_find.empty()) {
+		// There's already a search term, display it already
+		screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, _find.c_str());
+		name = _find;
+	}
+
+	screen.slamArea(6, 171, 307, 28);
+
+	if (printError) {
+		// Give time for user to see the message
+		for (int idx = 0; idx < 40 && !_vm->shouldQuit() && !events.kbHit() && !events._released; ++idx) {
+			events.pollEvents();
+			events.setButtonState();
+
+			events.wait(2);
+		}
+
+		events.clearKeyboard();
+		screen.fillRect(Common::Rect(13, 186, 306, 195), BUTTON_MIDDLE);
+
+		if (!_find.empty()) {
+			screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, _find.c_str());
+			name = _find;
+		}
+
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	}
+
+	xp = 15 + screen.stringWidth(name);
+	yp = 186;
+	
+	do {
+		events._released = false;
+		found = BTN_NONE;
+
+		while (!_vm->shouldQuit() && !events.kbHit() && !events._released) {
+			found = BTN_NONE;
+			if (talk._talkToAbort)
+				return 0;
+
+			// Check if key or mouse button press has occurred
+			events.setButtonState();
+			Common::Point pt = events.mousePos();
+
+			flag = !flag;
+			screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), flag ? INV_FOREGROUND : BUTTON_MIDDLE);
+
+			if (events._pressed || events._released) {
+				if (pt.x > SEARCH_POINTS[0][0] && pt.x < SEARCH_POINTS[0][1] && pt.y > 174 && pt.y < 183) {
+					found = BTN_EXIT;
+					color = COMMAND_HIGHLIGHTED;
+				} else {
+					color = COMMAND_FOREGROUND;
+				}
+				screen.print(Common::Point(SEARCH_POINTS[0][2] - screen.stringWidth("Exit") / 2, 175), color, "Exit");
+
+				if (pt.x > SEARCH_POINTS[1][0] && pt.x < SEARCH_POINTS[1][1] && pt.y > 174 && pt.y < 183) {
+					found = BTN_BACKWARD;
+					color = COMMAND_HIGHLIGHTED;
+				} else {
+					color = COMMAND_FOREGROUND;
+				}
+				screen.print(Common::Point(SEARCH_POINTS[1][2] - screen.stringWidth("Backward") / 2, 175), color, "Backward");
+
+				if (pt.x > SEARCH_POINTS[2][0] && pt.x < SEARCH_POINTS[2][1] && pt.y > 174 && pt.y < 183) {
+					found = BTN_FORWARD;
+					color = COMMAND_HIGHLIGHTED;
+				} else {
+					color = COMMAND_FOREGROUND;
+				}
+				screen.print(Common::Point(SEARCH_POINTS[1][2] - screen.stringWidth("Forward") / 2, 175), color, "Forward");
+			}
+
+			events.wait(2);
+		}
+
+		if (events.kbHit()) {
+			Common::KeyState keyState = events.getKey();
+
+			if (keyState.keycode == Common::KEYCODE_BACKSPACE && name.c_str() > 0) {
+				screen.vgaBar(Common::Rect(xp - screen.charWidth(name.lastChar()), yp, xp + 8, yp + 9), BUTTON_MIDDLE);
+				xp -= screen.charWidth(name.lastChar());
+				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), INV_FOREGROUND);
+				name.deleteLastChar();
+			}
+
+			if (keyState.keycode == Common::KEYCODE_RETURN)
+				done = 1;
+
+			if (keyState.keycode == Common::KEYCODE_ESCAPE) {
+				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
+				done = -1;
+			}
+
+			if (keyState.keycode >= Common::KEYCODE_SPACE && keyState.keycode <= Common::KEYCODE_z
+					&& keyState.keycode != Common::KEYCODE_AT && name.size() < 50 
+					&& (xp + screen.charWidth(keyState.keycode)) < 296) {
+				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
+				screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", (char)keyState.keycode);
+				xp += screen.charWidth((char)keyState.keycode);
+				name += (char)keyState.keycode;
+			}
+		}
+
+		if (events._released) {
+			switch (found) {
+			case BTN_EXIT:
+				done = -1; break;
+			case BTN_BACKWARD:
+				done = 2; break;
+			case BTN_FORWARD:
+				done = 1; break;
+			default:
+				break;
+			}
+		}
+	} while (!done);
+
+	if (done != -1) {
+		_find = name;
+	} else {
+		done = 0;
+	}
+
+	// Redisplay the journal screen
+	clearPage();
+	doJournal(0, 0);
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+
+	return done;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 25f70b0e29..a5fe1e8d94 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -67,13 +67,16 @@ private:
 	bool doJournal(int direction, int howFar);
 
 	void clearPage();
-public:
+
+	int getFindName(bool printError);
 public:
 	Journal(SherlockEngine *vm);
 
 	void record(int converseNum, int statementNum);
 
 	void drawInterface();
+
+	bool handleEvents(int key);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index cd64073621..3549325e8e 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -97,8 +97,6 @@ private:
 
 	void transitionToScene();
 
-	void updateBackground();
-
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
 
 	void saveSceneStatus();
@@ -167,6 +165,8 @@ public:
 	int whichZone(const Common::Point &pt);
 
 	int closestZone(const Common::Point &pt);
+
+	void updateBackground();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 01b08ffd71..289bff814f 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1127,10 +1127,51 @@ void UserInterface::doTalkControl() {
 }
 
 void UserInterface::journalControl() {
+	Events &events = *_vm->_events;
 	Journal &journal = *_vm->_journal;
-	
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	int found;
+	bool doneFlag = false;
+
+	// Draw the journal screen
 	journal.drawInterface();
 
+	// Handle journal events
+	do {
+		found = _key = -1;
+		events.setButtonState();
+		
+		// Handle keypresses
+		if (events.kbHit()) {
+			Common::KeyState keyState = events.getKey();
+			if (keyState.keycode == Common::KEYCODE_x && (keyState.flags & Common::KBD_ALT)) {
+				_vm->quitGame();
+				return;
+			} else if (keyState.keycode == Common::KEYCODE_e || keyState.keycode == Common::KEYCODE_ESCAPE) {
+				doneFlag = true;
+			} else {
+				_key = toupper(keyState.keycode);
+			}
+		}
+
+		if (!doneFlag)
+			doneFlag = journal.handleEvents(_key);
+	} while (!_vm->shouldQuit() && !doneFlag);
+
+	// Finish up
+	_infoFlag = _keyboardInput = false;
+	_keycode = Common::KEYCODE_INVALID;
+	_windowOpen = false;
+	_windowBounds.top = CONTROLS_Y1;
+	_key = -1;
+
+	// Reset the palette
+	screen.setPalette(screen._cMap);
+
+	screen._backBuffer1.blitFrom(screen._backBuffer2);
+	scene.updateBackground();
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	// TODO
 }
 
-- 
cgit v1.2.3


From f238e7563ae62dd5d067432b2cc87b8c154aa40b Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 4 Apr 2015 17:59:33 -0500
Subject: TONY: Revert Italian detection entry

---
 engines/tony/detection_tables.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/engines/tony/detection_tables.h b/engines/tony/detection_tables.h
index e4a064157b..28dcaac752 100644
--- a/engines/tony/detection_tables.h
+++ b/engines/tony/detection_tables.h
@@ -127,22 +127,6 @@ static const TonyGameDescription gameDescriptions[] = {
 		},
 	},
 
-	{
-		// Tony Tough Italian (PC Action magazine)
-		{
-			"tony",
-			0,
-			{
-				{ "data1.cab", 0, "42344827407b974af11d60fadbd021b4", 3811 },
-				AD_LISTEND
-			},
-			Common::IT_ITA,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
-		},
-	},
-
 	{
 		// Tony Tough Italian provided by Giovanni Bajo
 		{
-- 
cgit v1.2.3


From a44ab1facc9c1ed8bc1f1ff38876c65f2624a406 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 4 Apr 2015 21:08:15 -0500
Subject: MADS: Fix incorrect depth handling after picking up rebreather

---
 engines/mads/nebular/nebular_scenes1.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 0c5888b6ec..047dc1f498 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -1462,7 +1462,6 @@ void Scene103::actions() {
 	} else if (_action.isAction(VERB_TAKE, NOUN_REBREATHER, 0) && _game._objects.isInRoom(OBJ_REBREATHER)) {
 		switch (_vm->_game->_trigger) {
 		case 0:
-			_scene->changeVariant(1);
 			_globals._sequenceIndexes[12] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[12], false, 3, 2);
 			_scene->_sequences.setMsgLayout(_globals._sequenceIndexes[12]);
 			_scene->_sequences.addSubEntry(_globals._sequenceIndexes[12], SEQUENCE_TRIGGER_SPRITE, 6, 1);
-- 
cgit v1.2.3


From 355fa444caadfc951ba289bf23fc275f949bf36e Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 4 Apr 2015 21:40:21 -0500
Subject: MADS: Fix throwing burger in the different difficulty modes

---
 engines/mads/nebular/nebular_scenes1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 047dc1f498..0a62e375d7 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -2637,7 +2637,7 @@ void Scene109::actions() {
 							break;
 
 						case OBJ_BURGER:
-							_hoovicDifficultFl = (_game._difficulty == DIFFICULTY_EASY);
+							_hoovicDifficultFl = (_game._difficulty == DIFFICULTY_HARD);
 							_globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('H', (_hoovicDifficultFl ? 3 : 1)));
 							break;
 						}
-- 
cgit v1.2.3


From ae61f8ba04aca3cbd84c4dd27f9302744246f109 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 4 Apr 2015 22:03:06 -0500
Subject: MADS: Fix wait cursor when leaving crashed ship for the first time

---
 engines/mads/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index 767f998d81..52569af375 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -84,8 +84,8 @@ void EventsManager::waitCursor() {
 	CursorType cursorId = (CursorType)MIN(_cursorSprites->getCount(), (int)CURSOR_WAIT);
 	_newCursorId = cursorId;
 	if (_cursorId != _newCursorId) {
-		changeCursor();
 		_cursorId = _newCursorId;
+		changeCursor();
 	}
 }
 
-- 
cgit v1.2.3


From d6945864ea450cdaa20e5120771e3c497e5515ee Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 4 Apr 2015 22:39:56 -0500
Subject: MADS: Keep Rex's speech on-screen longer when exitting crashed ship

---
 engines/mads/messages.cpp                | 8 +++++---
 engines/mads/nebular/nebular_scenes1.cpp | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index 4b105630d6..304c79aa46 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -91,7 +91,7 @@ int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 	rec._position = pt;
 	rec._textDisplayIndex = -1;
 	rec._timeout = timeout;
-	rec._frameTimer = _vm->_game->_priorFrameTimer;
+	rec._frameTimer = scene._frameStartTime;
 	rec._trigger = endTrigger;
 	rec._abortMode = _vm->_game->_triggerSetupMode;
 
@@ -162,8 +162,10 @@ void KernelMessages::update() {
 	uint32 currentTimer = _vm->_game->_scene._frameStartTime;
 
 	for (uint i = 0; i < _entries.size() && !_vm->_game->_trigger; ++i) {
-		KernelMessage &msg = _entries[i];
+		if (_vm->_game->_trigger)
+			break;
 
+		KernelMessage &msg = _entries[i];
 		if (((msg._flags & KMSG_ACTIVE) != 0) && (currentTimer >= msg._frameTimer))
 			processText(i);
 	}
@@ -172,7 +174,7 @@ void KernelMessages::update() {
 void KernelMessages::processText(int msgIndex) {
 	Scene &scene = _vm->_game->_scene;
 	KernelMessage &msg = _entries[msgIndex];
-	uint32 currentTimer = _vm->_game->_priorFrameTimer;
+	uint32 currentTimer = scene._frameStartTime;
 	bool flag = false;
 
 	if ((msg._flags & KMSG_EXPIRE) != 0) {
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 0a62e375d7..bcc4fb43d5 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -2112,9 +2112,9 @@ void Scene106::step() {
 		}
 
 		if (msgId >= 0) {
-			int nextAbortVal = _game._trigger + 1;
+			int nextTrigger = _game._trigger + 1;
 			_scene->_kernelMessages.add(Common::Point(15, _positionY), 0x1110, 0, 0, 360, _game.getQuote(msgId));
-			_scene->_sequences.addTimer(150, nextAbortVal);
+			_scene->_sequences.addTimer(150, nextTrigger);
 			_positionY += 14;
 		}
 	}
-- 
cgit v1.2.3


From cb91e1518a3ba88e378d4e90cbe0d8e99ba4e639 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 4 Apr 2015 22:59:43 -0500
Subject: MADS: Have Rex swim to correct spot when throwing burger or fish

---
 engines/mads/nebular/nebular_scenes1.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index bcc4fb43d5..c9eda08859 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -2589,8 +2589,8 @@ void Scene109::preActions() {
 		_game._player._walkOffScreenSceneId = 108;
 
 	if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE) || _action.isAction(VERB_PUT))
-	&& (_action.isObject(NOUN_SMALL_HOLE) || _action.isObject(NOUN_TUNNEL))
-	&& (_action.isObject(NOUN_DEAD_FISH) || _action.isObject(NOUN_STUFFED_FISH) || _action.isObject(NOUN_BURGER))) {
+			&& (_action.isTarget(NOUN_SMALL_HOLE) || _action.isTarget(NOUN_TUNNEL))
+			&& (_action.isObject(NOUN_DEAD_FISH) || _action.isObject(NOUN_STUFFED_FISH) || _action.isObject(NOUN_BURGER))) {
 		int idx = _game._objects.getIdFromDesc(_action._activeAction._objectNameId);
 		if ((idx >= 0) && _game._objects.isInInventory(idx)) {
 			_game._player._prepareWalkPos = Common::Point(106, 38);
-- 
cgit v1.2.3


From b0c76b3a17a08abed2d35d301cbd69f9bc8efa52 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sun, 5 Apr 2015 07:50:13 -0500
Subject: TONY: Fix disabled ui after capturing guard on Ferris Wheel

---
 engines/tony/mpal/mpal.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index c813b354b0..89cc28130d 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -709,6 +709,10 @@ void ActionThread(CORO_PARAM, const void *param) {
 		CORO_SLEEP(1);
 	}
 
+	// WORKAROUND: User interface sometimes remaining disabled after capturing guard on Ferris wheel
+	if (_ctx->item->_nObj == 3601 && _ctx->item->_dwRes == 9)
+		g_vm->getEngine()->enableInput();
+
 	globalDestroy(_ctx->item);
 	_ctx->item = NULL;
 
-- 
cgit v1.2.3


From d17dea4afd76cba7280e3ffafd1e78a09430e983 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Apr 2015 14:49:02 -0500
Subject: SHERLOCK: Fix journal initalization and initial calls

---
 engines/sherlock/journal.cpp | 36 ++++++++++++++++--------------------
 engines/sherlock/journal.h   |  4 ++--
 engines/sherlock/objects.cpp | 14 +++++++-------
 engines/sherlock/talk.cpp    | 15 ++++++++++-----
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index b05cc03372..2811c463a2 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -50,9 +50,6 @@ const int SEARCH_POINTS[3][3] = {
 /*----------------------------------------------------------------*/
 
 Journal::Journal(SherlockEngine *vm): _vm(vm) {
-	// Allow up to 1000 statements
-	_journal.resize(1000);
-
 	// Initialize fields
 	_count = 0;
 	_maxPage = 0;
@@ -70,12 +67,12 @@ Journal::Journal(SherlockEngine *vm): _vm(vm) {
  * Records statements that are said, in the order which they are said. The player
  * can then read the journal to review them
  */
-void Journal::record(int converseNum, int statementNum) {
+void Journal::record(int converseNum, int statementNum, bool replyOnly) {
 	int saveIndex = _index;
 	int saveSub = _sub;
 
 	// Record the entry into the list
-	_journal.push_back(JournalEntry(converseNum, statementNum));
+	_journal.push_back(JournalEntry(converseNum, statementNum, replyOnly));
 	_index = _journal.size() - 1;
 
 	// Load the text for the new entry to get the number of lines it will have
@@ -108,12 +105,12 @@ void Journal::loadJournalLocations() {
 	_directory.resize(dir->readUint16LE());
 
 	// Read in each entry
+	char buffer[17];
 	for (uint idx = 0; idx < _directory.size(); ++idx) {
-		Common::String line;
-		while ((c = dir->readByte()) != 0)
-			line += c;
+		dir->read(buffer, 17);
+		buffer[16] = '\0';
 
-		_directory.push_back(line);
+		_directory[idx] = Common::String(buffer);
 	}
 
 	delete dir;
@@ -124,7 +121,7 @@ void Journal::loadJournalLocations() {
 	_locations.clear();
 	while (loc->pos() < loc->size()) {
 		Common::String line;
-		while ((c = loc->readByte()) != '\0')
+		while ((c = loc->readByte()) != 0)
 			line += c;
 
 		_locations.push_back(line);
@@ -137,7 +134,7 @@ void Journal::loadJournalLocations() {
  * Loads the description for the current display index in the journal, and then
  * word wraps the result to prepare it for being displayed
  */
-bool Journal::loadJournalFile(bool alreadyLoaded) {
+int Journal::loadJournalFile(bool alreadyLoaded) {
 	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
@@ -147,7 +144,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 
 	Common::String dirFilename = _directory[journalEntry._converseNum];
 	bool replyOnly = journalEntry._replyOnly;
-	Common::String locStr(dirFilename.c_str(), dirFilename.c_str() + 4);
+	Common::String locStr(dirFilename.c_str() + 4, dirFilename.c_str() + 6);
 	int newLocation = atoi(locStr.c_str());
 
 	// If not flagged as alrady loaded, load the conversation into script variables
@@ -246,7 +243,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 	const char *replyP = statement._reply.c_str();
 
 	while (*replyP) {
-		char c = *replyP;
+		char c = *replyP++;
 
 		// Is it a control character?
 		if (c < 128) {
@@ -264,7 +261,8 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 				// a comment (which would have added a line), add a carriage return
 				if (!startOfReply && ((!commentJustPrinted && c == '{') || c == '}'))
 					journalString += '"';
-			
+				startOfReply = false;
+
 				// Handle setting or clearing comment state
 				if (c == '{') {
 					commentFlag = true;
@@ -290,7 +288,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 						else
 							journalString += inv._names[talk._talkTo];
 
-						const char *strP = replyP + 1;
+						const char *strP = replyP;
 						char v;
 						do {
 							v = *strP++;						
@@ -307,12 +305,11 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 
 				// Copy text from the place until either the reply ends, a comment
 				// {} block is started, or a control character is encountered
+				journalString += c;
 				do {
 					journalString += *replyP++;
 				} while (*replyP && *replyP < 128 && *replyP != '{' && *replyP != '}');
 
-				// Move pointer back, since the outer for loop will increment it again
-				--replyP;
 				commentJustPrinted = false;
 			}
 		} else if (c == 128) {
@@ -327,7 +324,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 			}
 
 			startOfReply = false;
-			c = *++replyP;
+			c = *replyP++;
 
 			if ((c - 1) == 0)
 				journalString += "Holmes";
@@ -338,7 +335,7 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 			else
 				journalString += inv._names[c - 1];
 
-			const char *strP = replyP + 1;
+			const char *strP = replyP;
 			char v;
 			do {
 				v = *strP++;
@@ -350,7 +347,6 @@ bool Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += " said, \"";
 		} else {
 			// Control code, so move past it and any parameters
-			++replyP;
 			switch (c) {
 			case 129:		// Run canim
 			case 130:		// Assign side
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index a5fe1e8d94..894065759b 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -60,7 +60,7 @@ private:
 
 	void loadJournalLocations();
 
-	bool loadJournalFile(bool alreadyLoaded);
+	int loadJournalFile(bool alreadyLoaded);
 
 	void doArrows();
 
@@ -72,7 +72,7 @@ private:
 public:
 	Journal(SherlockEngine *vm);
 
-	void record(int converseNum, int statementNum);
+	void record(int converseNum, int statementNum, bool replyOnly = false);
 
 	void drawInterface();
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index d5d24e72af..e4730ef207 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -191,15 +191,15 @@ void Sprite::checkSprite() {
 		for (uint idx = 0; idx < scene._bgShapes.size() && !talk._talkToAbort; ++idx) {
 			Object &obj = scene._bgShapes[idx];
 
-			if (obj._aType > PERSON && _type != INVALID && _type != HIDDEN) {
-				if (_type == NO_SHAPE) {
-					objBounds = Common::Rect(_position.x, _position.y,
-						_position.x + _noShapeSize.x, _position.y + _noShapeSize.y);
+			if (obj._aType > PERSON && obj._type != INVALID && obj._type != HIDDEN) {
+				if (obj._type == NO_SHAPE) {
+					objBounds = Common::Rect(obj._position.x, obj._position.y,
+						obj._position.x + obj._noShapeSize.x, obj._position.y + obj._noShapeSize.y);
 				} else {
-					int xp = _position.x + _imageFrame->_offset.x;
-					int yp = _position.y + _imageFrame->_offset.y;
+					int xp = obj._position.x + obj._imageFrame->_offset.x;
+					int yp = obj._position.y + obj._imageFrame->_offset.y;
 					objBounds = Common::Rect(xp, yp,
-						xp + _imageFrame->_frame.w, yp + _imageFrame->_frame.h);
+						xp + obj._imageFrame->_frame.w, yp + obj._imageFrame->_frame.h);
 				}
 			}
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 6596431b8b..d284ace8b8 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -37,20 +37,24 @@ void Statement::synchronize(Common::SeekableReadStream &s) {
 	int length;
 
 	length = s.readUint16LE();
-	for (int idx = 0; idx < length; ++idx)
+	for (int idx = 0; idx < length - 1; ++idx)
 		_statement += (char)s.readByte();
+	s.readByte();	// Null ending
 
 	length = s.readUint16LE();
-	for (int idx = 0; idx < length; ++idx)
+	for (int idx = 0; idx < length - 1; ++idx)
 		_reply += (char)s.readByte();
+	s.readByte();	// Null ending
 
 	length = s.readUint16LE();
-	for (int idx = 0; idx < length; ++idx)
+	for (int idx = 0; idx < length - 1; ++idx)
 		_linkFile += (char)s.readByte();
+	s.readByte();	// Null ending
 
 	length = s.readUint16LE();
-	for (int idx = 0; idx < length; ++idx)
+	for (int idx = 0; idx < length - 1; ++idx)
 		_voiceFile += (char)s.readByte();
+	s.readByte();	// Null ending
 
 	_required.resize(s.readByte());
 	_modified.resize(s.readByte());
@@ -280,7 +284,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 	// Add the statement into the journal and talk history
 	if (_talkTo != -1 && !_talkHistory[_converseNum][select])
-		journal.record(_converseNum | 2048, select);
+		journal.record(_converseNum, select, true);
 	_talkHistory[_converseNum][select] = true;
 
 	// Check if the talk file is meant to be a non-seen comment
@@ -555,6 +559,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 
 	// Open the talk file for reading
 	Common::SeekableReadStream *talkStream = res.load(talkFile);
+	_converseNum = res.resourceIndex();
 	talkStream->skip(2);	// Skip talk file version num
 
 	_statements.resize(talkStream->readByte());
-- 
cgit v1.2.3


From d9168c8fae304c0984b59d142dfc66e04b9fab36 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Apr 2015 15:28:10 -0500
Subject: MADS: Fix placement of blowgun in easy mode

---
 engines/mads/game.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index b601a12c82..72d7988c05 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -115,8 +115,6 @@ void Game::run() {
 	_statusFlag = true;
 
 	while (!_vm->shouldQuit()) {
-		initializeGlobals();
-
 		if (_loadGameSlot == -1) {
 			startGame();
 		}
-- 
cgit v1.2.3


From 5c7cc826f082a10fef1cd44766f2226bb66b9b2f Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 5 Apr 2015 20:29:07 +0100
Subject: AUDIO: Skip ID3 tag at start of mp3 files

This fixes bug #6834 MP3: ScummVM doesn't skip ID3 tag at
beginning of file.
---
 audio/decoders/mp3.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/audio/decoders/mp3.cpp b/audio/decoders/mp3.cpp
index c1b3faaeb1..feb531f5ae 100644
--- a/audio/decoders/mp3.cpp
+++ b/audio/decoders/mp3.cpp
@@ -246,6 +246,23 @@ void MP3Stream::initStream() {
 	_inStream->seek(0, SEEK_SET);
 	_curTime = mad_timer_zero;
 	_posInFrame = 0;
+	
+	// Skip ID3 TAG if any
+	// ID3v1 (beginning with with 'TAG') is located at the end of files. So we can ignore those.
+	// ID3v2 can be located at the start of files and begins with a 10 bytes header, the first 3 bytes being 'ID3'.
+	// The tag size is coded on the last 4 bytes of the 10 bytes header as a 32 bit synchsafe integer.
+	// See http://id3.org/id3v2.4.0-structure for details.
+	char data[10];
+	_inStream->read(data, 10);
+	if (data[0] == 'I' && data[1] == 'D' && data[2] == '3') {
+		uint32 size = data[9] + 128 * (data[8] + 128 * (data[7] + 128 * data[6]));
+		// This size does not include an optional 10 bytes footer. Check if it is present.
+		if (data[5] & 0x10)
+			size += 10;
+		debug("Skipping ID3 TAG (%d bytes)", size + 10);
+		_inStream->seek(size, SEEK_CUR);
+	} else
+		_inStream->seek(0, SEEK_SET);
 
 	// Update state
 	_state = MP3_STATE_READY;
-- 
cgit v1.2.3


From 661542b8c62a618f5d4b8265c8f9fb4d7e58a3a7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 6 Apr 2015 03:12:15 +0300
Subject: MADS: Implement copy protection screen for Rex

---
 engines/mads/nebular/dialogs_nebular.cpp | 44 +++++++++++++++++++----
 engines/mads/nebular/dialogs_nebular.h   |  3 ++
 engines/mads/nebular/game_nebular.cpp    | 62 +++++++++++++++++---------------
 engines/mads/nebular/nebular_scenes8.cpp |  2 +-
 4 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 4ba5366a60..9388aa2aa5 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -417,7 +417,7 @@ TextDialog(vm, FONT_INTERFACE, Common::Point(-1, -1), 32) {
 		_hogEntry._pageNum, _hogEntry._lineNum, _hogEntry._wordNum);
 	wordWrap(line);
 
-	wordWrap("and type it on the line below (we',27h,'ve even given you");
+	wordWrap("and type it on the line below (we've even given you");
 	wordWrap("first letter as a hint).  As soon as you do that, we can get");
 	wordWrap("right into this really COOL adventure game!\n");
 	wordWrap("\n");
@@ -428,17 +428,47 @@ TextDialog(vm, FONT_INTERFACE, Common::Point(-1, -1), 32) {
 
 void CopyProtectionDialog::show() {
 	draw();
-	_vm->_events->showCursor();
 
-	// TODO: Replace with text input
-	while (!_vm->shouldQuit() && !_vm->_events->isKeyPressed() &&
-		!_vm->_events->_mouseClicked) {
-		_vm->_events->delay(1);
+	Common::KeyState curKey;
+	Common::Rect inputArea(110, 165, 210, 175);
+	MSurface *origInput = new MSurface(inputArea.width(), inputArea.height());
+	_vm->_screen.frameRect(inputArea, TEXTDIALOG_BLACK);
+	_vm->_screen.copyTo(origInput, inputArea, Common::Point(0, 0));
+	_font->setColors(TEXTDIALOG_FE, TEXTDIALOG_FE, TEXTDIALOG_FE, TEXTDIALOG_FE);
+	_vm->_screen.copyRectToScreen(inputArea);
+	_vm->_screen.updateScreen();
+
+	while (!_vm->shouldQuit()) {
+		while (!_vm->_events->isKeyPressed()) {
+			_vm->_events->delay(1);
+		}
+
+		curKey = _vm->_events->getKey();
+		
+		if (curKey.keycode == Common::KEYCODE_RETURN || curKey.keycode == Common::KEYCODE_KP_ENTER)
+			break;
+		else if (curKey.keycode == Common::KEYCODE_BACKSPACE)
+			_textInput.deleteLastChar();
+		else if (_textInput.size() < 14)
+			_textInput += curKey.ascii;
+
+		_vm->_events->_pendingKeys.clear();
+
+		_vm->_screen.copyFrom(origInput, Common::Rect(0, 0, inputArea.width(), inputArea.height()), Common::Point(inputArea.left, inputArea.top));
+		_font->writeString(&_vm->_screen, _textInput,
+			Common::Point(inputArea.left + 2, inputArea.top + 1), 1);
+		_vm->_screen.copyRectToScreen(inputArea);
+		_vm->_screen.updateScreen();
 	}
 
-	_vm->_events->_pendingKeys.clear();
+	delete origInput;
 }
 
+bool CopyProtectionDialog::isCorrectAnswer() {
+	return _hogEntry._word == _textInput;
+}
+
+
 bool CopyProtectionDialog::getHogAnusEntry(HOGANUS &entry) {
 	File f;
 	f.open("*HOGANUS.DAT");
diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h
index 5dbe4da6f0..0f086f6ec1 100644
--- a/engines/mads/nebular/dialogs_nebular.h
+++ b/engines/mads/nebular/dialogs_nebular.h
@@ -69,6 +69,7 @@ struct HOGANUS {
 class CopyProtectionDialog : public TextDialog {
 private:
 	HOGANUS _hogEntry;
+	Common::String _textInput;
 
 	/**
 	 * Get a random copy protection entry from the HOGANUS resource
@@ -84,6 +85,8 @@ public:
 	 * Show the dialog
 	 */
 	virtual void show();
+
+	bool isCorrectAnswer();
 };
 
 class PictureDialog : public TextDialog {
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index cde998e66a..ec7c6678e8 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -45,19 +45,25 @@ GameNebular::GameNebular(MADSEngine *vm)
 }
 
 ProtectionResult GameNebular::checkCopyProtection() {
-	/*
-	// DEBUG: Flag copy protection failure
-	_globals[kCopyProtectFailed] = -1;
+	//if (!ConfMan.getBool("copy_protection"))
+	//	return PROTECTION_SUCCEED;
 
-	if (!ConfMan.getBool("copy_protection"))
-	return true;
+	CopyProtectionDialog *dlg;
+	bool correctAnswer;
 
-	* DEBUG: Disabled for now
-	CopyProtectionDialog *dlg = new CopyProtectionDialog(_vm, false);
+	dlg = new CopyProtectionDialog(_vm, false);
 	dlg->show();
+	correctAnswer = dlg->isCorrectAnswer();
 	delete dlg;
-	*/
-	return PROTECTION_SUCCEED;
+
+	if (!correctAnswer) {
+		dlg = new CopyProtectionDialog(_vm, true);
+		dlg->show();
+		correctAnswer = dlg->isCorrectAnswer();
+		delete dlg;
+	}
+
+	return correctAnswer ? PROTECTION_SUCCEED : PROTECTION_FAIL;
 }
 
 void GameNebular::startGame() {
@@ -91,26 +97,6 @@ void GameNebular::startGame() {
 		checkShowDialog();
 		_winStatus = 0;
 
-		/*
-		// Check copy protection
-		ProtectionResult protectionResult = checkCopyProtection();
-		switch (protectionResult) {
-		case PROTECTION_FAIL:
-		// Copy protection failed
-		_scene._nextSceneId = 804;
-		initializeGlobals();
-		_globals[kCopyProtectFailed] = true;
-		return;
-		case PROTECTION_ESCAPE:
-		// User escaped out of copy protection dialog
-		_vm->quitGame();
-		return;
-		default:
-		// Copy protection check succeeded
-		break;
-		}
-		*/
-
 		_sectionNumber = 1;
 		initSection(_sectionNumber);
 		_vm->_events->setCursor(CURSOR_ARROW);
@@ -128,6 +114,24 @@ void GameNebular::startGame() {
 	_scene._nextSceneId = 101;
 
 	initializeGlobals();
+
+	// Check copy protection
+	ProtectionResult protectionResult = checkCopyProtection();
+
+	switch (protectionResult) {
+	case PROTECTION_FAIL:
+		// Copy protection failed
+		_scene._nextSceneId = 804;
+		_globals[kCopyProtectFailed] = true;
+		return;
+	case PROTECTION_ESCAPE:
+		// User escaped out of copy protection dialog
+		_vm->quitGame();
+		return;
+	default:
+		// Copy protection check succeeded
+		break;
+	}
 }
 
 void GameNebular::initializeGlobals() {
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 8ce559b82b..5f8417cee1 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -957,7 +957,7 @@ void Scene804::step() {
 				_globals[kInSpace] = false;
 				_globals[kBeamIsUp] = true;
 
-				assert(!_globals[kCopyProtectFailed]);
+				//assert(!_globals[kCopyProtectFailed]);
 				_game._winStatus = 4;
 				return;
 			}
-- 
cgit v1.2.3


From 900471834987c32b23b3162e2d2f40bbcc2b593d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Apr 2015 21:35:22 -0500
Subject: SHERLOCK: Fix display of journal

---
 engines/sherlock/journal.cpp | 12 ++++++++----
 engines/sherlock/screen.cpp  | 13 +++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 2811c463a2..f9c2c54289 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -56,7 +56,7 @@ Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	_index = 0;
 	_sub = 0;
 	_up = _down = false;
-	_page = 0;
+	_page = 1;
 	_converseNum = -1;
 
 	// Load the journal directory and location names
@@ -140,7 +140,6 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	JournalEntry &journalEntry = _journal[_index];
-	Statement &statement = talk[journalEntry._statementNum];
 
 	Common::String dirFilename = _directory[journalEntry._converseNum];
 	bool replyOnly = journalEntry._replyOnly;
@@ -184,6 +183,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	}
 
 	// Start building journal string
+	Statement &statement = talk[journalEntry._statementNum];
 	Common::String journalString;
 
 	if (newLocation != oldLocation) {
@@ -260,7 +260,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				// If a reply isn't just being started, and we didn't just end
 				// a comment (which would have added a line), add a carriage return
 				if (!startOfReply && ((!commentJustPrinted && c == '{') || c == '}'))
-					journalString += '"';
+					journalString += '\n';
 				startOfReply = false;
 
 				// Handle setting or clearing comment state
@@ -434,7 +434,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 		}
 
 		// Add in the line
-		_lines.push_back(Common::String(startP, endP));
+		_lines.push_back(Common::String(journalString.c_str(), endP));
 
 		// Strip line off from string being processed
 		journalString = *endP ? Common::String(endP + 1) : "";
@@ -461,6 +461,10 @@ void Journal::drawInterface() {
 	bg->read(palette, PALETTE_SIZE);
 	delete bg;
 
+	// Translate the palette for display
+	for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+		palette[idx] = VGA_COLOR_TRANS(palette[idx]);
+
 	// Set the palette and print the title
 	screen.setPalette(palette);
 	screen.gPrint(Common::Point(111, 18), BUTTON_BOTTOM, "Watson's Journal");
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 0eeddf2a5f..a30108118c 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -440,15 +440,16 @@ void Screen::buttonPrint(const Common::Point &pt, byte color, bool slamIt,
 		if (slamIt) {
 			print(Common::Point(xStart, pt.y + 1), COMMAND_HIGHLIGHTED, "%c", str[0]);
 			print(Common::Point(xStart + charWidth(str[0]), pt.y + 1),
-				color, "%s", str.c_str() + 1);
+				COMMAND_FOREGROUND, str.c_str() + 1);
 		} else {
-			print(Common::Point(xStart, pt.y), COMMAND_HIGHLIGHTED, "%c", str[0]);
-			print(Common::Point(xStart + charWidth(str[0]), pt.y),
-				color, "%s", str.c_str() + 1);
+			gPrint(Common::Point(xStart, pt.y), COMMAND_HIGHLIGHTED, "%c", str[0]);
+			gPrint(Common::Point(xStart + charWidth(str[0]), pt.y),
+				COMMAND_FOREGROUND, str.c_str() + 1);
 		}
+	} else if (slamIt) {
+		print(Common::Point(xStart, pt.y + 1), color, str.c_str());
 	} else {
-		print(Common::Point(xStart, slamIt ? pt.y + 1 : pt.y), COMMAND_HIGHLIGHTED,
-			"%s", str.c_str());
+		gPrint(Common::Point(xStart, pt.y), color, str.c_str());
 	}
 }
 
-- 
cgit v1.2.3


From 3ef78ed7e1fccaf6f31f4e317196cace6af577a2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Apr 2015 22:15:46 -0500
Subject: SHERLOCK: Fix button text for inventory display

---
 engines/sherlock/inventory.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index f7706c9d64..e58c4ddac6 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -314,16 +314,16 @@ void Inventory::invCommands(bool slamIt) {
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), 
 			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Give");
-		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1), 
+		screen.gPrint(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^^");
-		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1),
+		screen.gPrint(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^");
-		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1), 
+		screen.gPrint(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1),
 			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"_");
-		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1), 
+		screen.gPrint(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1),
 			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"__");
 	}
-- 
cgit v1.2.3


From f3251b5bb65bbd4ecee7a0700e1f876987cc7644 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 6 Apr 2015 08:29:46 +0200
Subject: MADS: Allow quitting in Rex's copy protection dialog

---
 engines/mads/nebular/dialogs_nebular.cpp | 5 ++++-
 engines/mads/nebular/game_nebular.cpp    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 9388aa2aa5..731e7e960d 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -439,10 +439,13 @@ void CopyProtectionDialog::show() {
 	_vm->_screen.updateScreen();
 
 	while (!_vm->shouldQuit()) {
-		while (!_vm->_events->isKeyPressed()) {
+		while (!_vm->shouldQuit() && !_vm->_events->isKeyPressed()) {
 			_vm->_events->delay(1);
 		}
 
+		if (_vm->shouldQuit())
+			break;
+
 		curKey = _vm->_events->getKey();
 		
 		if (curKey.keycode == Common::KEYCODE_RETURN || curKey.keycode == Common::KEYCODE_KP_ENTER)
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index ec7c6678e8..c96f1c6df9 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -56,7 +56,7 @@ ProtectionResult GameNebular::checkCopyProtection() {
 	correctAnswer = dlg->isCorrectAnswer();
 	delete dlg;
 
-	if (!correctAnswer) {
+	if (!correctAnswer && !_vm->shouldQuit()) {
 		dlg = new CopyProtectionDialog(_vm, true);
 		dlg->show();
 		correctAnswer = dlg->isCorrectAnswer();
-- 
cgit v1.2.3


From c8ac76b22bfd676bb72a850a141730022d6d476c Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 6 Apr 2015 10:42:16 +0200
Subject: MADS: Show first character of the Rex Nebular copy protection word

---
 engines/mads/nebular/dialogs_nebular.cpp | 35 +++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 731e7e960d..10715797ed 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -438,24 +438,31 @@ void CopyProtectionDialog::show() {
 	_vm->_screen.copyRectToScreen(inputArea);
 	_vm->_screen.updateScreen();
 
+	bool firstTime = true;
+
 	while (!_vm->shouldQuit()) {
-		while (!_vm->shouldQuit() && !_vm->_events->isKeyPressed()) {
-			_vm->_events->delay(1);
-		}
+		if (!firstTime) {
+			while (!_vm->shouldQuit() && !_vm->_events->isKeyPressed()) {
+				_vm->_events->delay(1);
+			}
 
-		if (_vm->shouldQuit())
-			break;
+			if (_vm->shouldQuit())
+				break;
 
-		curKey = _vm->_events->getKey();
-		
-		if (curKey.keycode == Common::KEYCODE_RETURN || curKey.keycode == Common::KEYCODE_KP_ENTER)
-			break;
-		else if (curKey.keycode == Common::KEYCODE_BACKSPACE)
-			_textInput.deleteLastChar();
-		else if (_textInput.size() < 14)
-			_textInput += curKey.ascii;
+			curKey = _vm->_events->getKey();
+
+			if (curKey.keycode == Common::KEYCODE_RETURN || curKey.keycode == Common::KEYCODE_KP_ENTER)
+				break;
+			else if (curKey.keycode == Common::KEYCODE_BACKSPACE)
+				_textInput.deleteLastChar();
+			else if (_textInput.size() < 14)
+				_textInput += curKey.ascii;
 
-		_vm->_events->_pendingKeys.clear();
+			_vm->_events->_pendingKeys.clear();
+		} else {
+			firstTime = false;
+			_textInput = _hogEntry._word[0];
+		}
 
 		_vm->_screen.copyFrom(origInput, Common::Rect(0, 0, inputArea.width(), inputArea.height()), Common::Point(inputArea.left, inputArea.top));
 		_font->writeString(&_vm->_screen, _textInput,
-- 
cgit v1.2.3


From 07c7f5e31a1f1952ebe583a138352e13e45e0c66 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 7 Apr 2015 20:09:00 -0500
Subject: MADS: Fix crash leaving scene after shooting monkey

---
 engines/mads/sprites.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 67d5e20fe5..bc36b5575a 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -399,7 +399,7 @@ void SpriteSets::remove(int idx) {
 	if (idx == SPRITE_SLOTS_MAX_SIZE) {
 		delete _uiSprites;
 		_uiSprites = nullptr;
-	} else if (idx >= 0) {
+	} else if (idx >= 0 && idx < (int)size()) {
 		delete (*this)[idx];
 
 		if (idx < ((int)size() - 1)) {
-- 
cgit v1.2.3


From 49fd689c07be266cf0ad40d3510ac875ac81174c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 8 Apr 2015 22:55:33 +0200
Subject: SHERLOCK: Implement showAlleyCutscene

---
 engines/sherlock/scalpel/scalpel.cpp | 38 ++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0432dc2278..954ea12aec 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -310,8 +310,42 @@ bool ScalpelEngine::showCityCutscene() {
 }
 
 bool ScalpelEngine::showAlleyCutscene() {
-	// TODO
-	return true;
+	byte palette[PALETTE_SIZE];
+	_sound->playMusic("prolog2.mus");
+
+	_titleOverride = "TITLE.LIB";
+	_soundOverride = "TITLE.SND";
+
+	bool finished = _animation->playPrologue("27PRO1", 1, 3, true, 2);
+	if (finished)
+		_animation->playPrologue("27PRO2", 1, 0, false, 2);
+
+	if (finished) {
+		ImageFile screamImages("SCREAM.LBV", false);
+		_screen->_backBuffer1.transBlitFrom(screamImages[0], Common::Point(0, 0));
+		_screen->_backBuffer2.blitFrom(_screen->_backBuffer1);
+		finished = _events->delay(6000);
+	}
+
+	if (finished)
+		_animation->playPrologue("27PRO3", 1, 0, true, 2);
+
+	if(finished) {
+		_screen->getPalette(palette);
+		_screen->fadeToBlack(2);
+	}
+
+	if(finished) {
+		ImageFile titleImages("title3.vgs", true);
+		// "Early the following morning on Baker Street..."
+		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(35, 51), false, 0);
+		_screen->fadeIn(palette, 3);
+		finished = _events->delay(1000);
+	}
+
+	_titleOverride = "";
+	_soundOverride = "";
+	return finished;
 }
 
 bool ScalpelEngine::showStreetCutscene() {
-- 
cgit v1.2.3


From 83acea8c0d635d09454827118db3c47d6238d209 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 8 Apr 2015 22:53:37 +0100
Subject: README: Update compiling instruction for OS X

---
 README | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 3e2cacc05b..56b0a8423c 100644
--- a/README
+++ b/README
@@ -2456,9 +2456,11 @@ debug messages (see http://www.sysinternals.com/ntw2k/freeware/debugview.shtml).
     * Type "./configure" in the ScummVM directory.
     * You can now type 'make' to create a command line binary.
     * To get a version you can run from Finder, type 'make bundle' which
-      will create ScummVM.app (this only works out of the box if you
-      installed SDL into /sw (as happens if you are using Fink). If you
-      have installed SDL in another way, you will have to edit ports.mk).
+      will create ScummVM.app (this tries to detect where the static libraries
+      are installed, which should work in most cases, but if it doesn't you
+      will need to specify this path with --with-staticlib-prefix= when calling
+      configure - for example "./configure --with-staticlib-prefix=/Users/foo"
+      if the libraries are in /Users/foo/lib).
     * For more information refer to:
       http://wiki.scummvm.org/index.php/Compiling_ScummVM/MacOS_X_Crosscompiling
 
-- 
cgit v1.2.3


From d45d1672137843d028c4ddf63ccf9b62d5d72976 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 9 Apr 2015 00:12:18 +0200
Subject: SHERLOCK: Fix regression in image loading

---
 engines/sherlock/resources.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 0d66646286..262832c3c3 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -298,8 +298,8 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
 		frame._paletteBase = stream.readByte();
-		frame._rleEncoded = stream.readByte() == 1;
-		frame._offset.x = stream.readByte();
+		frame._offset.x = stream.readUint16LE();
+		frame._rleEncoded = ((frame._offset.x & 0xFF) == 1);
 		frame._offset.y = stream.readByte();
 
 		frame._rleEncoded = !skipPalette && frame._rleEncoded;
-- 
cgit v1.2.3


From 47afe424c194d5d4fd1797948b53f999473fe922 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 8 Apr 2015 21:28:24 -0500
Subject: MADS: Don't show protection dialog when exiting directly from main
 menu

---
 engines/mads/nebular/game_nebular.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index c96f1c6df9..e9a3d0b716 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -107,6 +107,9 @@ void GameNebular::startGame() {
 		_vm->_dialogs->showDialog();
 	} while (!_vm->shouldQuit() && _vm->_dialogs->_pendingDialog != DIALOG_NONE);
 
+	if (_vm->shouldQuit())
+		return;
+
 	_priorSectionNumber = 0;
 	_priorSectionNumber = -1;
 	_scene._priorSceneId = 0;
-- 
cgit v1.2.3


From ec999f1cb74dff8c42c69898bb6cbc3823b169dd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 9 Apr 2015 13:44:39 +0300
Subject: MADS: Plug some memory leaks

Surfaces should be freed (to free their inner allocated surface
buffers) before being deleted
---
 engines/mads/game.cpp                    | 1 +
 engines/mads/nebular/dialogs_nebular.cpp | 4 +++-
 engines/mads/scene_data.cpp              | 2 ++
 engines/mads/sprites.cpp                 | 4 +++-
 engines/mads/user_interface.cpp          | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 72d7988c05..3d1c194612 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -100,6 +100,7 @@ Game::~Game() {
 	}
 
 	delete _saveFile;
+	_surface->free();
 	delete _surface;
 	delete _sectionHandler;
 }
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 10715797ed..5b9942db07 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -430,7 +430,7 @@ void CopyProtectionDialog::show() {
 	draw();
 
 	Common::KeyState curKey;
-	Common::Rect inputArea(110, 165, 210, 175);
+	const Common::Rect inputArea(110, 165, 210, 175);
 	MSurface *origInput = new MSurface(inputArea.width(), inputArea.height());
 	_vm->_screen.frameRect(inputArea, TEXTDIALOG_BLACK);
 	_vm->_screen.copyTo(origInput, inputArea, Common::Point(0, 0));
@@ -471,6 +471,7 @@ void CopyProtectionDialog::show() {
 		_vm->_screen.updateScreen();
 	}
 
+	origInput->free();
 	delete origInput;
 }
 
@@ -592,6 +593,7 @@ void PictureDialog::save() {
 void PictureDialog::restore() {
 	if (_savedSurface) {
 		_savedSurface->copyTo(&_vm->_screen);
+		_savedSurface->free();
 		delete _savedSurface;
 		_savedSurface = nullptr;
 
diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index d0e96be1d7..e594406447 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -451,6 +451,8 @@ void SceneInfo::loadMadsV2Background(int sceneId, const Common::String &resName,
 
 		fab.decompress(compressedTileData, compressedTileDataSize, (byte*)newTile->getPixels(), tileWidth * tileHeight);
 		tileSet.push_back(TileSetList::value_type(newTile));
+		newTile->free();
+		delete newTile;
 		delete[] compressedTileData;
 	}
 
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index bc36b5575a..f15d6456d3 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -347,8 +347,10 @@ void SpriteSlots::drawSprites(MSurface *s) {
 				spr->copyTo(s, Common::Point(xp, yp), sprite->getTransparencyIndex());
 
 				// Free sprite if it was a flipped one
-				if (flipped)
+				if (flipped) {
+					spr->free();
 					delete spr;
+				}
 			}
 		}
 	}
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 93a555d9c7..1e5a1d80d2 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -164,6 +164,7 @@ void UISlots::draw(bool updateFlag, bool delFlag) {
 						MSurface *spr = sprite->flipHorizontal();
 						userInterface.mergeFrom(spr, spr->getBounds(), slot._position,
 							sprite->getTransparencyIndex());
+						spr->free();
 						delete spr;
 					} else {
 						userInterface.mergeFrom(sprite, sprite->getBounds(), slot._position,
-- 
cgit v1.2.3


From ec03857d7dd7614675b41cfc412be20b733b469a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 9 Apr 2015 14:08:48 +0300
Subject: MADS: Fix a regression in V2 games

---
 engines/mads/scene_data.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index e594406447..e48bcd8c6f 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -451,8 +451,6 @@ void SceneInfo::loadMadsV2Background(int sceneId, const Common::String &resName,
 
 		fab.decompress(compressedTileData, compressedTileDataSize, (byte*)newTile->getPixels(), tileWidth * tileHeight);
 		tileSet.push_back(TileSetList::value_type(newTile));
-		newTile->free();
-		delete newTile;
 		delete[] compressedTileData;
 	}
 
@@ -471,6 +469,7 @@ void SceneInfo::loadMadsV2Background(int sceneId, const Common::String &resName,
 			for (int i = 0; i < tileIndex; i++)
 				++tile;
 			((*tile).get())->copyTo(&bgSurface, Common::Point(x * tileWidth, y * tileHeight));
+			((*tile).get())->free();
 		}
 	}
 	tileSet.clear();
-- 
cgit v1.2.3


From 96e04ab797253bbe853f172ea1d734ebe812d419 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 10 Apr 2015 23:35:26 -0500
Subject: SHERLOCK: Implemented doScript and support methods

---
 engines/sherlock/animation.cpp      |   2 +-
 engines/sherlock/events.cpp         |   8 +
 engines/sherlock/events.h           |   2 +
 engines/sherlock/inventory.cpp      | 112 +++++
 engines/sherlock/inventory.h        |   9 +
 engines/sherlock/people.cpp         |   2 +
 engines/sherlock/people.h           |   2 +
 engines/sherlock/scene.cpp          |  16 +-
 engines/sherlock/scripts.cpp        |  11 +-
 engines/sherlock/scripts.h          |   6 +-
 engines/sherlock/sherlock.cpp       |   6 +-
 engines/sherlock/sound.cpp          |   7 +-
 engines/sherlock/sound.h            |   4 +-
 engines/sherlock/talk.cpp           | 833 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/talk.h             |  31 +-
 engines/sherlock/user_interface.cpp |  10 +-
 16 files changed, 1002 insertions(+), 59 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index e1687b5238..4674151ec7 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -144,7 +144,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 					Common::String::format("%s%01d", baseName.c_str(), soundNumber) :
 					Common::String::format("%s%02d", baseName.c_str(), soundNumber);
 
-				if (sound._voicesOn)
+				if (sound._voices)
 					sound.playSound(fname);
 			}
 
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index d147fe1f4c..67d09e52b2 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -100,6 +100,14 @@ bool Events::isCursorVisible() const {
 	return CursorMan.isVisible();
 }
 
+/**
+ * Move the mouse
+ */
+void Events::moveMouse(const Common::Point &pt) {
+	g_system->warpMouse(pt.x, pt.y);
+}
+
+
 /**
  * Check for any pending events
  */
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index c3bdaf5a93..71f7623002 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -72,6 +72,8 @@ public:
 
 	bool isCursorVisible() const;
 
+	void moveMouse(const Common::Point &pt);
+
 	void pollEvents();
 
 	void pollEventsAndWait();
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index e58c4ddac6..0ea85f32fc 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -366,4 +366,116 @@ void Inventory::doInvJF() {
 	}
 }
 
+/**
+ * Adds a shape from the scene to the player's inventory
+ */
+int Inventory::putNameInInventory(const Common::String &name) {
+	Scene &scene = *_vm->_scene;
+	int matches = 0;
+
+	for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
+		Object &o = scene._bgShapes[idx];
+		if (scumm_stricmp(name.c_str(), o._name.c_str()) == 0 && o._type != INVALID) {
+			putItemInInventory(o);
+			++matches;
+		}
+	}
+
+	return matches;
+}
+
+/**
+ * Moves a specified item into the player's inventory If the item has a *PICKUP* use action,
+ * then the item in the use action are added to the inventory.
+ */
+int Inventory::putItemInInventory(Object &obj) {
+	Scene &scene = *_vm->_scene;
+	int matches = 0;
+	bool pickupFound = false;
+
+	if (obj._pickupFlag)
+		_vm->setFlags(obj._pickupFlag);
+
+	for (int useNum = 0; useNum < 4; ++useNum) {
+		if (scumm_stricmp(obj._use[useNum]._target.c_str(), "*PICKUP*") == 0) {
+			pickupFound = true;
+
+			for (int namesNum = 0; namesNum < 4; ++namesNum) {
+				for (uint bgNum = 0; bgNum < scene._bgShapes.size(); ++bgNum) {
+					Object &bgObj = scene._bgShapes[bgNum];
+					if (scumm_stricmp(obj._use[useNum]._names[namesNum].c_str(), bgObj._name.c_str()) == 0) {
+						copyToInventory(bgObj);
+						if (bgObj._pickupFlag)
+							_vm->setFlags(bgObj._pickupFlag);
+
+						if (bgObj._type == ACTIVE_BG_SHAPE || bgObj._type == NO_SHAPE || bgObj._type == HIDE_SHAPE) {
+							if (bgObj._imageFrame == nullptr || bgObj._frameNumber < 0)
+								// No shape to erase, so flag as hidden
+								bgObj._type = INVALID;
+							else
+								bgObj._type = REMOVE;
+						} else if (bgObj._type == HIDDEN) {
+							bgObj._type = INVALID;
+						}
+
+						++matches;
+					}
+				}
+			}
+		}
+	}
+
+	if (!pickupFound) {
+		// No pickup item found, so add the passed item
+		copyToInventory(obj);
+		matches = 0;
+	}
+
+	if (matches == 0) {
+		if (!pickupFound)
+			matches = 1;
+
+		if (obj._type == ACTIVE_BG_SHAPE || obj._type == NO_SHAPE || obj._type == HIDE_SHAPE) {
+			if (obj._imageFrame == nullptr || obj._frameNumber < 0)
+				// No shape to erase, so flag as hidden
+				obj._type = INVALID;
+			else
+				obj._type = REMOVE;
+		} else if (obj._type == HIDDEN) {
+			obj._type = INVALID;
+		}
+	}
+
+	return matches;
+}
+
+/**
+ * Copy the passed object into the inventory
+ */
+void Inventory::copyToInventory(Object &obj) {
+	// TODO
+}
+
+/**
+ * Deletes a specified item from the player's inventory
+ */
+int Inventory::deleteItemFromInventory(const Common::String &name) {
+	int invNum = -1;
+
+	for (int idx = 0; idx < (int)size() && invNum == -1; ++idx) {
+		if (scumm_stricmp(name.c_str(), (*this)[idx]._name.c_str()) == 0)
+			invNum = idx;
+	}
+
+	if (invNum == -1)
+		// Item not present
+		return 0;
+
+	// Item found, so delete it
+	remove_at(invNum);
+	--_holdings;
+
+	return 1;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 55abc4c960..722692a3b2 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/str-array.h"
+#include "sherlock/objects.h"
 #include "sherlock/resources.h"
 
 namespace Sherlock {
@@ -59,6 +60,10 @@ struct InventoryItem {
 class Inventory : public Common::Array<InventoryItem> {
 private:
 	SherlockEngine *_vm;
+
+	int putItemInInventory(Object &obj);
+
+	void copyToInventory(Object &obj);
 public:
 	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
 	Common::StringArray _names;
@@ -90,6 +95,10 @@ public:
 	void highlight(int index, byte color);
 
 	void doInvJF();
+
+	int putNameInInventory(const Common::String &name);
+
+	int deleteItemFromInventory(const Common::String &name);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 3da35f2fec..9319fbb79d 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -61,6 +61,8 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_clearingThePortrait = false;
 	_srcZone = _destZone = 0;
 	_talkPics = nullptr;
+	_portraitSide = 0;
+	_speakerFlip = false;
 }
 
 People::~People() {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index a1fad019c8..1a846dded1 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -77,6 +77,8 @@ public:
 	Object _portrait;
 	bool _clearingThePortrait;
 	bool _allowWalkAbort;
+	int _portraitSide;
+	bool _speakerFlip;
 public:
 	People(SherlockEngine *vm);
 	~People();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 7c66a1dc62..3d5f566164 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -89,7 +89,8 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_currentScene = -1;
 	_goToScene = -1;
 	_changes = false;
-	_charPoint = _oldCharPoint = 0;
+	_charPoint = 0;
+	_oldCharPoint = 39;
 	_keyboardInput = 0;
 	_walkedInScene = false;
 	_ongoingCans = 0;
@@ -118,7 +119,7 @@ void Scene::selectScene() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
-	Scripts &scripts = *_vm->_scripts;
+	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
 
 	// Reset fields
@@ -150,8 +151,8 @@ void Scene::selectScene() {
 
 	// If there were any scripst waiting to be run, but were interrupt by a running
 	// canimation (probably the last scene's exit canim), clear the _scriptMoreFlag
-	if (scripts._scriptMoreFlag == 3)
-		scripts._scriptMoreFlag = 0;
+	if (talk._scriptMoreFlag == 3)
+		talk._scriptMoreFlag = 0;
 }
 
 /**
@@ -1053,7 +1054,6 @@ void Scene::doBgAnim() {
 	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
-	Scripts &scripts = *_vm->_scripts;
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
@@ -1359,10 +1359,10 @@ void Scene::doBgAnim() {
 	// Check if the method was called for calling a portrait, and a talk was
 	// interrupting it. This talk file would not have been executed at the time, 
 	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
-	if (people._clearingThePortrait && scripts._scriptMoreFlag == 3) {
+	if (people._clearingThePortrait && talk._scriptMoreFlag == 3) {
 		// Reset the flags and call to talk
-		people._clearingThePortrait = scripts._scriptMoreFlag = 0;
-		talk.talkTo(scripts._scriptName);
+		people._clearingThePortrait = talk._scriptMoreFlag = 0;
+		talk.talkTo(talk._scriptName);
 	}
 }
 
diff --git a/engines/sherlock/scripts.cpp b/engines/sherlock/scripts.cpp
index d337030bae..02dcfa6f0b 100644
--- a/engines/sherlock/scripts.cpp
+++ b/engines/sherlock/scripts.cpp
@@ -26,21 +26,16 @@
 namespace Sherlock {
 
 Scripts::Scripts(SherlockEngine *vm): _vm(vm) {
-	_scriptMoreFlag = 0;
-	_scriptSaveIndex = 0;
-	_scriptSelect = 0;
-}
 
-void Scripts::doScript(const Common::String &str) {
-	// TODO
 }
 
 void Scripts::popStack() {
+	/*
 	ScriptEntry script = _scriptStack.pop();
 	_scriptName = script._name;
-	_scriptSaveIndex = script._index;
+//	_scriptSaveIndex = script._index;
 	_scriptSelect = script._select;
-	_scriptMoreFlag = true;
+	*/
 }
 
 
diff --git a/engines/sherlock/scripts.h b/engines/sherlock/scripts.h
index 6765687bcf..beea726c8d 100644
--- a/engines/sherlock/scripts.h
+++ b/engines/sherlock/scripts.h
@@ -40,11 +40,7 @@ class Scripts {
 private:
 	SherlockEngine *_vm;
 public:
-	Common::Stack<ScriptEntry> _scriptStack;
-	int _scriptMoreFlag;
-	Common::String _scriptName;
-	int _scriptSaveIndex;
-	int _scriptSelect;
+
 public:
 	Scripts(SherlockEngine *vm);
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 20a805594e..2a1b456b76 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -122,10 +122,10 @@ void SherlockEngine::sceneLoop() {
 	while (!shouldQuit() && _scene->_goToScene == -1) {
 		// See if a script needs to be completed from either a goto room code,
 		// or a script that was interrupted by another script
-		if (_scripts->_scriptMoreFlag == 1 || _scripts->_scriptMoreFlag == 3)
-			_talk->talkTo(_scripts->_scriptName);
+		if (_talk->_scriptMoreFlag == 1 || _talk->_scriptMoreFlag == 3)
+			_talk->talkTo(_talk->_scriptName);
 		else
-			_scripts->_scriptMoreFlag = 0;
+			_talk->_scriptMoreFlag = 0;
 
 		// Handle any input from the keyboard or mouse
 		handleInput();
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 5e7df5607f..771d5db9d5 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -27,7 +27,8 @@ namespace Sherlock {
 Sound::Sound(SherlockEngine *vm): _vm(vm) {
 	_soundOn = true;
 	_musicOn = true;
-	_voicesOn = true;
+	_speechOn = true;
+	_voices = 0;
 	_playingEpilogue = false;
 	_music = false;
 	_digitized = false;
@@ -89,5 +90,9 @@ void Sound::freeSong() {
 	// TODO
 }
 
+void Sound::stopSndFuncPtr(int v1, int v2) {
+	// TODO
+}
+
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 74e8db3611..22d5a5c221 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -40,7 +40,8 @@ private:
 public:
 	bool _soundOn;
 	bool _musicOn;
-	bool _voicesOn;
+	bool _speechOn;
+	int _voices;
 	bool _playingEpilogue;
 	bool _music;
 	bool _digitized;
@@ -64,6 +65,7 @@ public:
 	
 	void playMusic(const Common::String &name);
 	void stopMusic();
+	void stopSndFuncPtr(int v1, int v2);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index d284ace8b8..193c0f9a19 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -26,7 +26,42 @@
 
 namespace Sherlock {
 
-#define SFX_COMMAND 140
+enum {
+	SWITCH_SPEAKER				= 128,
+	RUN_CANIMATION				= 129,
+	ASSIGN_PORTRAIT_LOCATION	= 130,
+	PAUSE						= 131,
+	REMOVE_PORTRAIT				= 132,
+	CLEAR_WINDOW				= 133,
+	ADJUST_OBJ_SEQUENCE			= 134,
+	WALK_TO_COORDS				= 135,
+	PAUSE_WITHOUT_CONTROL		= 136,
+	BANISH_WINDOW				= 137,
+	SUMMON_WINDOW				= 138,
+	SET_FLAG					= 139,
+	SFX_COMMAND					= 140,
+	TOGGLE_OBJECT				= 141,
+	STEALTH_MODE_ACTIVE			= 142,
+	IF_STATEMENT				= 143,
+	ELSE_STATEMENT				= 144,
+	END_IF_STATEMENT			= 145,
+	STEALTH_MODE_DEACTIVATE		= 146,
+	TURN_HOLMES_OFF				= 147,
+	TURN_HOLMES_ON				= 148,
+	GOTO_SCENE					= 149,
+	PLAY_PROLOGUE				= 150,
+	ADD_ITEM_TO_INVENTORY		= 151,
+	SET_OBJECT					= 152,
+	CALL_TALK_FILE				= 153,
+	MOVE_MOUSE					= 154,
+	DISPLAY_INFO_LINE			= 155,
+	CLEAR_INFO_LINE				= 156,
+	WALK_TO_CANIMATION			= 157,
+	REMOVE_ITEM_FROM_INVENTORY	= 158,
+	ENABLE_END_KEY				= 159,
+	DISABLE_END_KEY				= 160,
+	COMMAND_161					= 161
+};
 
 /*----------------------------------------------------------------*/
 
@@ -99,6 +134,9 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkStealth = 0;
 	_talkToFlag = -1;
 	_moreTalkDown = _moreTalkUp = false;
+	_scriptMoreFlag = 1;
+	_scriptSaveIndex = -1;
+	_scriptCurrentIndex = -1;
 }
 
 void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, int maxPeople) {
@@ -136,13 +174,13 @@ void Talk::talkTo(const Common::String &filename) {
 	// save the filename for later executing when the canimation is done
 	if (scene._ongoingCans || people._clearingThePortrait) {
 		// Make sure we're not in the middle of a script
-		if (!scripts._scriptMoreFlag) {
-			scripts._scriptName = filename;
-			scripts._scriptSaveIndex = 0;
+		if (!_scriptMoreFlag) {
+			_scriptName = filename;
+			_scriptSaveIndex = 0;
 
 			// Flag the selection, since we don't yet know which statement yet
-			scripts._scriptSelect = 100;
-			scripts._scriptMoreFlag = 3;
+			_scriptSelect = 100;
+			_scriptMoreFlag = 3;
 		}
 
 		return;
@@ -172,7 +210,7 @@ void Talk::talkTo(const Common::String &filename) {
 	// If any sequences have changed in the prior talk file, restore them
 	if (_savedSequences.size() > 0) {
 		for (uint idx = 0; idx < _savedSequences.size(); ++idx) {
-			SavedSequence &ss = _savedSequences[idx];
+			SequenceEntry &ss = _savedSequences[idx];
 			for (uint idx2 = 0; idx2 < _savedSequences.size(); ++idx2)
 				scene._bgShapes[ss._objNum]._sequences[idx2] = ss._sequences[idx2];
 		
@@ -181,7 +219,7 @@ void Talk::talkTo(const Common::String &filename) {
 		}
 	}
 
-	while (!_sequenceStack.empty())
+	while (!_scriptStack.empty())
 		pullSequence();
 
 	// Restore any pressed button
@@ -276,7 +314,7 @@ void Talk::talkTo(const Common::String &filename) {
 			select = _talkIndex = idx;
 	}
 
-	if (scripts._scriptMoreFlag && _scriptSelect != 0)
+	if (_scriptMoreFlag && _scriptSelect != 0)
 		select = _scriptSelect;
 
 	if (select == -1)
@@ -288,7 +326,7 @@ void Talk::talkTo(const Common::String &filename) {
 	_talkHistory[_converseNum][select] = true;
 
 	// Check if the talk file is meant to be a non-seen comment
-	if (filename[7] != '*') {
+	if (filename.size() < 8 || filename[7] != '*') {
 		// Should we start in stealth mode?
 		if (_statements[select]._statement.hasPrefix("^")) {
 			_talkStealth = 2;
@@ -305,13 +343,13 @@ void Talk::talkTo(const Common::String &filename) {
 
 		// Handle replies until there's no further linked file, 
 		// or the link file isn't a reply first cnversation
-		for (;;) {
+		while (!_vm->shouldQuit()) {
 			clearSequences();
 			_scriptSelect = select;
 			_speaker = _talkTo;
 
 			Statement &statement = _statements[select];
-			scripts.doScript(_statements[select]._reply);
+			doScript(_statements[select]._reply);
 
 			if (_talkToAbort)
 				return;
@@ -327,7 +365,7 @@ void Talk::talkTo(const Common::String &filename) {
 			}
 			
 			// Check for a linked file
-			if (!statement._linkFile.empty() && !scripts._scriptMoreFlag) {
+			if (!statement._linkFile.empty() && !_scriptMoreFlag) {
 				freeTalkVars();
 				loadTalkFile(statement._linkFile);
 
@@ -422,7 +460,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 	// If a script was added to the script stack, restore state so that the
 	// previous script can continue
-	if (!scripts._scriptStack.empty()) {
+	if (!_scriptStack.empty()) {
 		scripts.popStack();
 	}
 
@@ -547,7 +585,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	// Check for an existing person being talked to
 	_talkTo = -1;
 	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
-		if (scumm_strnicmp(filename.c_str(), people[(PeopleId)idx]._portrait.c_str(), 4)) {
+		if (!scumm_strnicmp(filename.c_str(), people[(PeopleId)idx]._portrait.c_str(), 4)) {
 			_talkTo = idx;
 			break;
 		}
@@ -568,7 +606,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	
 	delete talkStream;
 
-	if (!sound._voicesOn)
+	if (!sound._voices)
 		stripVoiceCommands();
 	setTalkMap();
 }
@@ -833,7 +871,7 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
  * Clears the stack of pending object sequences associated with speakers in the scene
  */
 void Talk::clearSequences() {
-	_sequenceStack.clear();
+	_scriptStack.clear();
 }
 
 /**
@@ -843,7 +881,7 @@ void Talk::clearSequences() {
 void Talk::pullSequence() {
 	Scene &scene = *_vm->_scene;
 
-	SequenceEntry seq = _sequenceStack.pop();
+	SequenceEntry seq = _scriptStack.pop();
 	if (seq._objNum != -1) {
 		Object &obj = scene._bgShapes[seq._objNum];
 
@@ -871,7 +909,7 @@ void Talk::pushSequence(int speaker) {
 	if (speaker == -1)
 		return;
 
-	SequenceEntry seqEntry;
+	ScriptStackEntry seqEntry;
 	if (!speaker) {
 		seqEntry._objNum = -1;
 	} else {
@@ -885,9 +923,13 @@ void Talk::pushSequence(int speaker) {
 		seqEntry._seqTo = obj._seqTo;
 	}
 	
-	_sequenceStack.push(seqEntry);
-	if (_sequenceStack.size() >= 5)
-		error("sequence stack overflow");
+	_scriptStack.push(seqEntry);
+	if (_scriptStack.size() >= 5)
+		error("script stack overflow");
+}
+
+void Talk::setSequence(int speaker) {
+	// TODO
 }
 
 /**
@@ -923,4 +965,751 @@ void Talk::setStillSeq(int speaker) {
 	}
 }
 
+/**
+ * Parses a reply for control codes and display text. The found text is printed within
+ * the text window, handles delays, animations, and animating portraits.
+ */
+void Talk::doScript(const Common::String &script) {
+	Animation &anim = *_vm->_animation;
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	int wait = 0;
+	bool pauseFlag = false;
+	bool endStr = false;
+	int yp = CONTROLS_Y + 12;
+	int charCount = 0;
+	int line = 0;
+	bool noTextYet = true;
+	bool openTalkWindow = false;
+	int obj;
+	int seqCount;
+
+	_saveSeqNum = 0;
+
+	const char *str = script.c_str();
+	if (_scriptMoreFlag) {
+		_scriptMoreFlag = 0;
+		str = script.c_str() + _scriptSaveIndex;
+	}
+
+	// Check if the script begins with a Stealh Mode Active command
+	if (str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
+		_talkStealth = 2;
+		_speaker |= 128;
+	} else {
+		pushSequence(_speaker);
+		ui.clearWindow();
+
+		// Need to switch speakers?
+		if (str[0] == SWITCH_SPEAKER) {
+			_speaker = str[1] - 1;
+			str += 2;
+			pullSequence();
+			pushSequence(_speaker);
+			setSequence(_speaker);
+		}
+		else {
+			setSequence(_speaker);
+		}
+
+		// Assign portrait location?
+		if (str[0] == ASSIGN_PORTRAIT_LOCATION) {
+			switch (str[1] & 15) {
+			case 1:
+				people._portraitSide = 20;
+				break;
+			case 2:
+				people._portraitSide = 220;
+				break;
+			case 3:
+				people._portraitSide = 120;
+				break;
+			default:
+				break;
+
+			}
+
+			if (str[1] > 15)
+				people._speakerFlip = true;
+			str += 2;
+		}
+
+		// Remove portrait?
+		if (str[0] == REMOVE_PORTRAIT) {
+			_speaker = 255;
+		}
+		else {
+			// Nope, so set the first speaker
+			setTalking(_speaker);
+		}
+	}
+
+	do {
+		Common::String tempString;
+		wait = 0;
+
+		if (!str[0]) {
+			endStr = true;
+		} else if (str[0] == '{') {
+			// Start of comment, so skip over it
+			while (*str++ != '}')
+				;
+		} else if (str[0] >= 128) {
+			// Handle control code
+			switch (str[0]) {
+			case SWITCH_SPEAKER:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+
+				if (!(_speaker & 128))
+					clearTalking();
+				if (_talkToAbort)
+					return;
+
+				ui.clearWindow();
+				yp = CONTROLS_Y + 12;
+				charCount = line = 0;
+
+				_speaker = *++str - 1;
+				setTalking(_speaker);
+				pullSequence();
+				pushSequence(_speaker);
+				setSequence(_speaker);
+				break;
+
+			case RUN_CANIMATION:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+				scene.startCAnim((str[0] - 1) & 127, 1 + (str[0] & 128));
+				if (_talkToAbort)
+					return;
+
+				// Check if next character is changing side or changing portrait
+				if (charCount && (str[1] == SWITCH_SPEAKER || str[1] == ASSIGN_PORTRAIT_LOCATION))
+					wait = 1;
+				break;
+
+			case ASSIGN_PORTRAIT_LOCATION:
+				++str;
+				switch (str[0] & 15) {
+				case 1:
+					people._portraitSide = 20;
+					break;
+				case 2:
+					people._portraitSide = 220;
+					break;
+				case 3:
+					people._portraitSide = 120;
+					break;
+				default:
+					break;
+				}
+
+				if (str[0] > 15)
+					people._speakerFlip = true;
+				break;
+
+			case PAUSE:
+				// Pause
+				charCount = *++str;
+				wait = pauseFlag = true;
+				break;
+
+			case REMOVE_PORTRAIT:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+
+				if (_speaker < 128)
+					clearTalking();
+				pullSequence();
+				if (_talkToAbort)
+					return;
+
+				_speaker |= 128;
+				break;
+
+			case CLEAR_WINDOW:
+				ui.clearWindow();
+				yp = CONTROLS_Y + 12;
+				charCount = line = 0;
+				break;
+
+			case ADJUST_OBJ_SEQUENCE:
+				// Get the name of the object to adjust
+				++str;
+				for (int idx = 0; idx < (str[0] & 127); ++idx)
+					tempString += str[idx + 2];
+
+				// Scan for object
+				obj = -1;
+				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
+					if (scumm_stricmp(tempString.c_str(), scene._bgShapes[idx]._name.c_str()) == 0)
+						obj = idx;
+				}
+				if (obj == -1)
+					error("Could not find object %s to change", tempString.c_str());
+
+				// Should the script be overwritten?
+				if (str[0] > 128) {
+					// Save the current sequence
+					_savedSequences.push(SequenceEntry());
+					SequenceEntry &seqEntry = _savedSequences.top();
+					seqEntry._objNum = obj;
+					seqEntry._seqTo = scene._bgShapes[obj]._seqTo;
+					for (uint idx = 0; idx < scene._bgShapes[obj]._seqSize; ++idx)
+						seqEntry._sequences.push_back(scene._bgShapes[obj]._sequences[idx]);
+				}
+
+				// Get number of bytes to change
+				seqCount = str[1];
+				str += (str[0] & 127) + 2;
+
+				// Copy in the new sequence
+				for (int idx = 0; idx < seqCount; ++idx, ++str)
+					scene._bgShapes[obj]._sequences[idx] = str[0] - 1;
+
+				// Reset object back to beginning of new sequence
+				scene._bgShapes[obj]._frameNumber = 0;
+				continue;
+
+			case WALK_TO_COORDS:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+
+				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100, str[2] * 100), str[3] - 1);
+				if (_talkToAbort)
+					return;
+
+				str += 3;
+				break;
+
+			case PAUSE_WITHOUT_CONTROL:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+
+				for (int idx = 0; idx < (str[0] - 1); ++idx) {
+					scene.doBgAnim();
+					if (_talkToAbort)
+						return;
+
+					// Check for button press
+					events.pollEvents();
+					events.setButtonState();
+				}
+				break;
+
+			case BANISH_WINDOW:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+
+				if (!(_speaker & 128))
+					clearTalking();
+				pullSequence();
+
+				if (_talkToAbort)
+					return;
+
+				_speaker |= 128;
+				ui.banishWindow();
+				ui._menuMode = TALK_MODE;
+				noTextYet = true;
+				break;
+
+			case SUMMON_WINDOW:
+				drawInterface();
+				events._pressed = events._released = false;
+				events.clearKeyboard();
+				noTextYet = false;
+
+				if (_speaker != -1) {
+					screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, false, "Exit");
+					screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
+					screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, false, "Down");
+				}
+				break;
+
+			case SET_FLAG: {
+				++str;
+				int flag1 = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
+				int flag = (flag1 & 0x7fff) * (flag1 >= 0x8000 ? -1 : 1);
+				_vm->setFlags(flag);
+				++str;
+				break;
+			}
+				
+			case SFX_COMMAND:
+				++str;
+				if (sound._voices) {
+					for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+						tempString += str[idx];
+					sound.playSound(tempString);
+
+					// Set voices to wait for more
+					sound._voices = 2;
+					sound._speechOn = (*sound._soundIsOn);
+				}
+
+				wait = 1;
+				str += 7;
+				break;
+
+			case TOGGLE_OBJECT:
+				for (int idx = 0; idx < str[0]; ++idx)
+					tempString += str[idx + 1];
+
+				scene.toggleObject(tempString);
+				str += str[0];
+				break;
+
+			case STEALTH_MODE_ACTIVE:
+				_talkStealth = 2;
+				break;
+
+			case IF_STATEMENT: {
+				++str;
+				int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
+				++str;
+				wait = 0;
+				
+				bool result = flag < 0x8000;
+				if (_vm->readFlags(flag & 0x7fff) != result) {
+					do {
+						++str;
+					} while (str[0] && str[0] != ELSE_STATEMENT && str[0] != END_IF_STATEMENT);
+
+					if (!str[0])
+						endStr = true;
+				}
+				break;
+			}
+
+			case ELSE_STATEMENT:
+				// If this is encountered here, it means that a preceeding IF statement was found,
+				// and evaluated to true. Now all the statements for the true block are finished,
+				// so skip over the block of code that would have executed if the result was false
+				wait = 0;
+				do {
+					++str;
+				} while (str[0] && str[0] != END_IF_STATEMENT);
+				break;
+
+			case STEALTH_MODE_DEACTIVATE:
+				_talkStealth = 0;
+				events.clearKeyboard();
+				break;
+
+			case TURN_HOLMES_OFF:
+				people._holmesOn = false;
+				break;
+
+			case TURN_HOLMES_ON:
+				people._holmesOn = true;
+				break;
+
+			case GOTO_SCENE:
+				scene._goToScene = str[1] - 1;
+
+				if (scene._goToScene != 100) {
+					// Not going to the map overview
+					scene._oldCharPoint = scene._goToScene;
+					scene._overPos.x = _vm->_map[scene._goToScene].x * 100 - 600;
+					scene._overPos.y = _vm->_map[scene._goToScene].y * 100 + 900;
+
+					// Run a canimation?
+					if (str[2] > 100) {
+						scene._hsavedFs = str[2];
+						scene._hsavedPos = Common::Point(160, 100);
+					}
+				}
+				str += 6;
+
+				_scriptMoreFlag = (scene._goToScene == 100) ? 2 : 1;
+				_scriptSaveIndex = str - script.c_str();
+				endStr = true;
+				wait = 0;
+				break;
+
+			case PLAY_PROLOGUE:
+				++str;
+				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+					tempString += str[idx];
+
+				anim.playPrologue(tempString, 1, 3, true, 4);
+				break;
+
+			case ADD_ITEM_TO_INVENTORY:
+				++str;
+				for (int idx = 0; idx < str[0]; ++idx)
+					tempString += str[idx];
+				str += str[0];
+
+				inv.putNameInInventory(tempString);
+				break;
+
+			case SET_OBJECT: {
+				++str;
+				for (int idx = 0; idx < (str[0] & 127); ++idx)
+					tempString += str[idx + 1];
+				str += str[0];
+
+				// Set comparison state according to if we want to hide or unhide
+				bool state = (str[0] >= 128);
+
+				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
+					Object &obj = scene._bgShapes[idx];
+					if (scumm_stricmp(tempString.c_str(), obj._name.c_str()) == 0) {
+						// Only toggle the object if it's not in the desired state already
+						if ((obj._type == HIDDEN && state) || (obj._type != HIDDEN && !state))
+							obj.toggleHidden();
+					}
+				}
+				break;
+			}
+
+			case CALL_TALK_FILE:
+				++str;
+				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+					tempString += str[idx];
+				str += 8;
+
+				_scriptCurrentIndex = str - script.c_str();
+
+				// Save the current script position and new talk file
+				if (_scriptStack.size() < 10) {
+					ScriptStackEntry rec;
+					rec._name = _scriptName;
+					rec._currentIndex = _scriptCurrentIndex;
+					rec._select = _scriptSelect;
+				} else {
+					error("Script stack overflow");
+				}
+
+				_scriptMoreFlag = true;
+				endStr = true;
+				wait = 0;
+				break;
+
+			case MOVE_MOUSE:
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = str - script.c_str();
+				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
+				if (_talkToAbort)
+					return;
+				str += 3;
+				break;
+
+			case DISPLAY_INFO_LINE:
+				++str;
+				for (int idx = 0; idx < str[0]; ++idx)
+					tempString += str[idx + 1];
+				str += str[0];
+
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, tempString.c_str());
+				break;
+
+			case CLEAR_INFO_LINE:
+				ui._infoFlag = true;
+				ui.clearInfo();
+				break;
+
+			case WALK_TO_CANIMATION: {
+				++str;
+				int animIndex = str[0] - 1;
+
+				// Save the current point in the script, since it might be intterupted by
+				// doing bg anims in the next call, so we need to know where to return to
+				_scriptCurrentIndex = (str + 1) - script.c_str();
+				if (_talkToAbort)
+					return;
+				break;
+			}
+
+			case REMOVE_ITEM_FROM_INVENTORY:
+				++str;
+				for (int idx = 0; idx < str[0]; ++idx)
+					tempString += str[idx + 1];
+				str += str[0];
+
+				inv.deleteItemFromInventory(tempString);
+				break;
+
+			case ENABLE_END_KEY:
+				ui._endKeyActive = true;
+				break;
+
+			case DISABLE_END_KEY:
+				ui._endKeyActive = false;
+				break;
+
+			default:
+				break;
+			}
+
+			++str;
+		} else {
+			// If the window isn't yet open, draw the window before printing starts
+			if (!ui._windowOpen && noTextYet) {
+				noTextYet = false;
+				drawInterface();
+
+				if (_talkTo != -1) {
+					screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, false, "Exit");
+					screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
+					screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, false, "Down");
+				}
+			}
+
+			// If it's the first line, display the speaker
+			if (!line && _speaker >= 0 && _speaker < MAX_PEOPLE) {
+				// If the window is open, display the name directly on-screen.
+				// Otherwise, simply draw it on the back buffer
+				if (ui._windowOpen) {
+					screen.print(Common::Point(16, yp), TALK_FOREGROUND, inv._names[_speaker & 127].c_str());
+				} else {
+					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, inv._names[_speaker & 127].c_str());
+					openTalkWindow = true;
+				}
+
+				yp += 9;
+			}
+
+			// Find amound of text that will fit on the line
+			int width = 0, idx = 0;
+			do {
+				width += screen.charWidth(str[idx]);
+			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < 128);
+
+			if (str[idx] || width >= 298) {
+				if (str[idx] < 128 && str[idx] != '{') {
+					--idx;
+					--charCount;
+				}
+			} else {
+				endStr = true;
+			}
+
+			// If word wrap is needed, find the start of the current word
+			if (width >= 298) {
+				while (str[idx] != ' ') {
+					--idx;
+					--charCount;
+				}
+			}
+
+			// Print the line
+			Common::String lineStr(str, str + idx);
+
+			// If the speaker indicates a description file, print it in yellow
+			if (_speaker != -1) {
+				if (ui._windowOpen) {
+					screen.print(Common::Point(16, yp), INV_FOREGROUND, lineStr.c_str());
+				} else {
+					screen.gPrint(Common::Point(16, yp - 1), INV_FOREGROUND, lineStr.c_str());
+				}
+			} else {
+				if (ui._windowOpen) {
+					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, lineStr.c_str());
+				}
+				else {
+					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, lineStr.c_str());
+				}
+			}
+
+			// Move to end of displayed line
+			str += idx;
+
+			// If line wrap occurred, then move to after the separating space between the words
+			if (str[0] < 128 && str[0] != '{')
+				++str;
+
+			yp += 9;
+			++line;
+
+			// Certain different conditions require a wait
+			if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
+					(line == 5 && str[0] != PAUSE && _speaker != -1) ||
+					endStr) {
+				wait = 1;
+			}
+
+			switch (str[0]) {
+			case SWITCH_SPEAKER:
+			case ASSIGN_PORTRAIT_LOCATION:
+			case BANISH_WINDOW:
+			case IF_STATEMENT:
+			case ELSE_STATEMENT:
+			case END_IF_STATEMENT:
+			case GOTO_SCENE:
+			case CALL_TALK_FILE:
+				wait = 1;
+				break;
+			default:
+				break;
+			}
+		}
+
+		// Open window if it wasn't already open, and text has already been printed
+		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= 128 && str[0] != COMMAND_161)) {
+			if (!ui._windowStyle) {
+				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+			} else {
+				ui.summonWindow();
+			}
+
+			ui._windowOpen = true;
+			openTalkWindow = false;
+		}
+
+		if (wait) {
+			// Save the current point in the script, since it might be intterupted by
+			// doing bg anims in the next call, so we need to know where to return to
+			_scriptCurrentIndex = str - script.c_str();
+
+			// Handling pausing
+			if (!pauseFlag && charCount < 160)
+				charCount = 160;
+
+			wait = waitForMore(charCount);
+			if (wait == -1)
+				endStr = true;
+
+			// If a key was pressed to finish the window, see if further voice files should be skipped
+			if (wait >= 0 && wait < 254) {
+				if (str[0] == SFX_COMMAND)
+					str += 9;
+			}
+
+			// Clear the window unless the wait was due to a PAUSE command
+			if (!pauseFlag && wait != -1 && str[0] != SFX_COMMAND) {
+				if (!_talkStealth)
+					ui.clearWindow();
+				yp = CONTROLS_Y + 12;
+				charCount = line = 0;
+			}
+
+			pauseFlag = false;
+		}
+	} while (!_vm->shouldQuit() && !endStr);
+
+	if (wait != -1) {
+		for (int ssIndex = 0; ssIndex < (int)_savedSequences.size(); ++ssIndex) {
+			SequenceEntry &seq = _savedSequences[ssIndex];
+			Object &obj = scene._bgShapes[seq._objNum];
+
+			for (uint idx = 0; idx < seq._sequences.size(); ++idx)
+				obj._sequences[idx] = seq._sequences[idx];
+			obj._frameNumber = seq._frameNumber;
+			obj._seqTo = seq._seqTo;
+		}
+
+		pullSequence();
+		if (_speaker < 128)
+			clearTalking();
+	}
+}
+
+void Talk::clearTalking() {
+	// TODO
+}
+
+void Talk::setTalking(int speaker) {
+	// TODO
+}
+
+/**
+ * When the talk window has been displayed, waits a period of time proportional to
+ * the amount of text that's been displayed
+ */
+int Talk::waitForMore(int delay) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	CursorId oldCursor = events.getCursor();
+	int key2 = 254;
+
+	// Unless we're in stealth mode, show the appropriate cursor
+	if (!_talkStealth) {
+		events.setCursor(ui._lookScriptFlag ? MAGNIFY : ARROW);
+	}
+
+	do {
+		if (sound._speechOn && !*sound._soundIsOn)
+			people._portrait._frameNumber = -1;
+
+		scene.doBgAnim();
+
+		// If talkTo call was done via doBgAnim, abort out of talk quietly
+		if (_talkToAbort) {
+			key2 = -1;
+			events._released = true;
+		} else {
+			// See if there's been a button press
+			events.setButtonState();
+
+			if (events.kbHit()) {
+				Common::KeyState keyState = events.getKey();
+				if (keyState.keycode >= 32 && keyState.keycode < 128)
+					key2 = keyState.keycode;
+			}
+
+			if (_talkStealth) {
+				key2 = 254;
+				events._released = false;
+			}
+		}
+
+		// Count down the delay
+		if ((delay > 0 && !ui._invLookFlag && !ui._lookScriptFlag) || _talkStealth)
+			--delay;
+
+		// If there are voices playing, reset delay so that they keep playing
+		if (sound._voices == 2 && *sound._soundIsOn)
+			delay = 0;
+	} while (!_vm->shouldQuit() && key2 == 254 && (delay || (sound._voices == 2 && *sound._soundIsOn))
+		&& !events._released && !events._rightReleased);
+
+	// If voices was set 2 to indicate a voice file was place, then reset it back to 1
+	if (sound._voices == 2)
+		sound._voices = 1;
+
+	if (delay > 0 && sound._diskSoundPlaying)
+		sound.stopSndFuncPtr(0, 0);
+
+	// Adjust _talkStealth mode:
+	// mode 1 - It was by a pause without stealth being on before the pause, so reset back to 0
+	// mode 3 - It was set by a pause with stealth being on before the pause, to set it to active
+	// mode 0/2 (Inactive/active) No change
+	switch (_talkStealth) {
+	case 1:
+		_talkStealth = 0;
+		break;
+	case 2:
+		_talkStealth = 2;
+		break;
+	default:
+		break;
+	}
+
+	sound._speechOn = false;
+	events.setCursor(_talkToAbort ? ARROW : oldCursor);
+	events._pressed = events._released = false;
+
+	return key2;
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 48cdd2b5b2..1b679a47bd 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -33,16 +33,19 @@ namespace Sherlock {
 
 #define MAX_TALK_SEQUENCES 11
 
-struct SavedSequence {
+struct SequenceEntry {
 	int _objNum;
 	Common::Array<byte> _sequences;
-};
-
-struct SequenceEntry : public SavedSequence {
 	int _frameNumber;
 	int _seqTo;
 };
 
+struct ScriptStackEntry : public SequenceEntry {
+	Common::String _name;
+	int _currentIndex;
+	int _select;
+};
+
 struct Statement {
 	Common::String _statement;
 	Common::String _reply;
@@ -84,8 +87,8 @@ private:
 private:
 	SherlockEngine *_vm;
 	int _saveSeqNum;
-	Common::Array<SavedSequence> _savedSequences;
-	Common::Stack<SequenceEntry> _sequenceStack;
+	Common::Stack<SequenceEntry> _savedSequences;
+	Common::Stack<ScriptStackEntry> _scriptStack;
 	Common::Array<Statement> _statements;
 	TalkHistoryEntry _talkHistory[500];
 	int _speaker;
@@ -95,17 +98,28 @@ private:
 	int _talkStealth;
 	int _talkToFlag;
 	bool _moreTalkUp, _moreTalkDown;
-
+	int _scriptSaveIndex;
+	int _scriptCurrentIndex;
+private:
 	void stripVoiceCommands();
 	void setTalkMap();
 
 	bool displayTalk(bool slamIt);
 
 	int talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt);
+
+	void doScript(const Common::String &script);
+
+	void clearTalking();
+	void setTalking(int speaker);
+
+	int waitForMore(int delay);
 public:
 	bool _talkToAbort;
 	int _talkCounter;
 	int _talkTo;
+	int _scriptMoreFlag;
+	Common::String _scriptName;
 public:
 	Talk(SherlockEngine *vm);
 	void setSequences(const byte *talkSequences, const byte *stillSequences,
@@ -127,7 +141,8 @@ public:
 	void clearSequences();
 	void pullSequence();
 	void pushSequence(int speaker);
-	bool isSequencesEmpty() const { return _sequenceStack.empty(); }
+	void setSequence(int speaker);
+	bool isSequencesEmpty() const { return _scriptStack.empty(); }
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 289bff814f..88265f6a19 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -122,7 +122,6 @@ void UserInterface::handleInput() {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	Scripts &scripts = *_vm->_scripts;
 	Talk &talk = *_vm->_talk;
 
 	if (_menuCounter)
@@ -148,7 +147,7 @@ void UserInterface::handleInput() {
 	}
 
 	// Do button highlighting check
-	if (!scripts._scriptMoreFlag) {	// Don't if scripts are running
+	if (!talk._scriptMoreFlag) {	// Don't if scripts are running
 		if (((events._rightPressed || events._rightReleased) && _helpStyle) ||
 				(!_helpStyle && !_menuCounter)) {
 			// Handle any default commands if we're in STD_MODE
@@ -532,6 +531,13 @@ void UserInterface::examine() {
 			_vm->setFlags(inv[_selector]._lookFlag);
 	}
 
+	if (_invLookFlag) {
+		// Dont close the inventory window when starting an examine display, since it's
+		// window will slide up to replace the inventory display
+		_windowOpen = false;
+		_menuMode = LOOK_MODE;
+	}
+
 	if (!talk._talkToAbort) {
 		if (!scene._cAnimFramePause)
 			printObjectDesc(_cAnimStr, true);
-- 
cgit v1.2.3


From f6d7c5e176a08c32702cdfb80ec8a626c25ead67 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 23 Jun 2013 19:35:47 -0400
Subject: IMAGE: Add functions to allow for videos to be dithered

---
 image/codecs/codec.h    | 14 ++++++++++++++
 video/video_decoder.cpp | 20 ++++++++++++++++++++
 video/video_decoder.h   | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/image/codecs/codec.h b/image/codecs/codec.h
index d87758e65e..3a2da9ff1e 100644
--- a/image/codecs/codec.h
+++ b/image/codecs/codec.h
@@ -86,6 +86,20 @@ public:
 	 * Does the codec have a dirty palette?
 	 */
 	virtual bool hasDirtyPalette() const { return false; }
+
+	/**
+	 * Can the codec dither down to 8bpp?
+	 *
+	 * @note This should only be used for VFW codecs
+	 */
+	virtual bool canDither() const { return false; }
+
+	/**
+	 * Activate dithering mode with a palette
+	 *
+	 * @note This should only be used for VFW codecs
+	 */
+	virtual void setDither(const byte *palette) {}
 };
 
 /**
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index a4bc5b81a2..217b4c8456 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -47,6 +47,7 @@ VideoDecoder::VideoDecoder() {
 	_endTimeSet = false;
 	_nextVideoTrack = 0;
 	_mainAudioTrack = 0;
+	_canSetDither = true;
 
 	// Find the best format for output
 	_defaultHighColorFormat = g_system->getScreenFormat();
@@ -77,6 +78,7 @@ void VideoDecoder::close() {
 	_endTimeSet = false;
 	_nextVideoTrack = 0;
 	_mainAudioTrack = 0;
+	_canSetDither = true;
 }
 
 bool VideoDecoder::loadFile(const Common::String &filename) {
@@ -171,6 +173,7 @@ Graphics::PixelFormat VideoDecoder::getPixelFormat() const {
 
 const Graphics::Surface *VideoDecoder::decodeNextFrame() {
 	_needsUpdate = false;
+	_canSetDither = false;
 
 	readNextPacket();
 
@@ -488,6 +491,23 @@ bool VideoDecoder::seekIntern(const Audio::Timestamp &time) {
 	return true;
 }
 
+bool VideoDecoder::setDitheringPalette(const byte *palette) {
+	// If a frame was already decoded, we can't set it now.
+	if (!_canSetDither)
+		return false;
+
+	bool result = false;
+
+	for (TrackList::iterator it = _tracks.begin(); it != _tracks.end(); it++) {
+		if ((*it)->getTrackType() == Track::kTrackTypeVideo && ((VideoTrack *)*it)->canDither()) {
+			((VideoTrack *)*it)->setDither(palette);
+			result = true;
+		}
+	}
+
+	return result;
+}
+
 VideoDecoder::Track::Track() {
 	_paused = false;
 }
diff --git a/video/video_decoder.h b/video/video_decoder.h
index c3879e9144..eca15e7265 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -377,6 +377,25 @@ public:
 	 */
 	bool setReverse(bool reverse);
 
+	/**
+	 * Tell the video to dither to a palette.
+	 *
+	 * By default, VideoDecoder will return surfaces in native, or in the case
+	 * of YUV-based videos, the format set by setDefaultHighColorFormat().
+	 * For video formats or codecs that support it, this will start outputting
+	 * its surfaces in 8bpp with this palette.
+	 *
+	 * This should be called after loadStream(), but before a decodeNextFrame()
+	 * call. This is enforced.
+	 *
+	 * The palette will be copied, so you do not need to worry about the pointer
+	 * going out-of-scope.
+	 *
+	 * @param palette The palette to use for dithering
+	 * @return true on success, false otherwise
+	 */
+	bool setDitheringPalette(const byte *palette);
+
 	/////////////////////////////////////////
 	// Audio Control
 	/////////////////////////////////////////
@@ -604,6 +623,16 @@ protected:
 		 * Is the video track set to play in reverse?
 		 */
 		virtual bool isReversed() const { return false; }
+
+		/**
+		 * Can the video track dither?
+		 */
+		virtual bool canDither() const { return false; }
+
+		/**
+		 * Activate dithering mode with a palette
+		 */
+		virtual void setDither(const byte *palette) {}
 	};
 
 	/**
@@ -901,6 +930,9 @@ private:
 	mutable bool _dirtyPalette;
 	const byte *_palette;
 
+	// Enforcement of not being able to set dither
+	bool _canSetDither;
+
 	// Default PixelFormat settings
 	Graphics::PixelFormat _defaultHighColorFormat;
 
-- 
cgit v1.2.3


From cfc64157a093bd369432169d069effc9e622ba21 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 23 Jun 2013 19:36:27 -0400
Subject: VIDEO: Allow AVI tracks to be dithered via the Codec

Video for Windows made the Codec do the dithering work
---
 video/avi_decoder.cpp | 24 ++++++++++++++++++++++++
 video/avi_decoder.h   |  7 +++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 7119c72f07..72892534fb 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -815,6 +815,30 @@ void AVIDecoder::AVIVideoTrack::forceTrackEnd() {
 	_curFrame = _frameCount - 1;
 }
 
+const byte *AVIDecoder::AVIVideoTrack::getPalette() const {
+	if (_videoCodec && _videoCodec->containsPalette())
+		return _videoCodec->getPalette();
+
+	_dirtyPalette = false;
+	return _palette;
+}
+
+bool AVIDecoder::AVIVideoTrack::hasDirtyPalette() const {
+	if (_videoCodec && _videoCodec->containsPalette())
+		return _videoCodec->hasDirtyPalette();
+
+	return _dirtyPalette;
+}
+
+bool AVIDecoder::AVIVideoTrack::canDither() const {
+	return _videoCodec && _videoCodec->canDither();
+}
+
+void AVIDecoder::AVIVideoTrack::setDither(const byte *palette) {
+	assert(_videoCodec);
+	_videoCodec->setDither(palette);
+}
+
 AVIDecoder::AVIAudioTrack::AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType)
 		: _audsHeader(streamHeader), _wvInfo(waveFormat), _soundType(soundType), _curChunk(0) {
 	_audStream = createAudioStream();
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 8941ff4e75..6c1ce1a4b9 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -179,11 +179,14 @@ protected:
 		int getCurFrame() const { return _curFrame; }
 		int getFrameCount() const { return _frameCount; }
 		const Graphics::Surface *decodeNextFrame() { return _lastFrame; }
-		const byte *getPalette() const { _dirtyPalette = false; return _palette; }
-		bool hasDirtyPalette() const { return _dirtyPalette; }
+
+		const byte *getPalette() const;
+		bool hasDirtyPalette() const;
 		void setCurFrame(int frame) { _curFrame = frame; }
 		void loadPaletteFromChunk(Common::SeekableReadStream *chunk);
 		void useInitialPalette();
+		bool canDither() const;
+		void setDither(const byte *palette);
 
 		bool isTruemotion1() const;
 		void forceDimensions(uint16 width, uint16 height);
-- 
cgit v1.2.3


From ad32fb58326657b05731681b1a8945978928ef55 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 23 Jun 2013 19:38:22 -0400
Subject: IMAGE: Add support for Cinepak VFW dithering

---
 image/codecs/cinepak.cpp      | 242 ++++++++++++-
 image/codecs/cinepak.h        |  18 +
 image/codecs/cinepak_tables.h | 780 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1035 insertions(+), 5 deletions(-)
 create mode 100644 image/codecs/cinepak_tables.h

diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index 8464aa3889..9760b5b2a4 100644
--- a/image/codecs/cinepak.cpp
+++ b/image/codecs/cinepak.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "image/codecs/cinepak.h"
+#include "image/codecs/cinepak_tables.h"
 
 #include "common/debug.h"
 #include "common/stream.h"
@@ -47,10 +48,12 @@ namespace Image {
 	} else \
 		*((byte *)_curFrame.surface->getPixels() + offset) = lum
 
-CinepakDecoder::CinepakDecoder(int bitsPerPixel) : Codec() {
-	_curFrame.surface = NULL;
-	_curFrame.strips = NULL;
+CinepakDecoder::CinepakDecoder(int bitsPerPixel) : Codec(), _bitsPerPixel(bitsPerPixel) {
+	_curFrame.surface = 0;
+	_curFrame.strips = 0;
 	_y = 0;
+	_colorMap = 0;
+	_ditherPalette = 0;
 
 	if (bitsPerPixel == 8) {
 		_pixelFormat = Graphics::PixelFormat::createFormatCLUT8();
@@ -86,6 +89,9 @@ CinepakDecoder::~CinepakDecoder() {
 
 	delete[] _curFrame.strips;
 	delete[] _clipTableBuf;
+
+	delete[] _colorMap;
+	delete[] _ditherPalette;
 }
 
 const Graphics::Surface *CinepakDecoder::decodeFrame(Common::SeekableReadStream &stream) {
@@ -96,7 +102,7 @@ const Graphics::Surface *CinepakDecoder::decodeFrame(Common::SeekableReadStream
 	_curFrame.height = stream.readUint16BE();
 	_curFrame.stripCount = stream.readUint16BE();
 
-	if (_curFrame.strips == NULL)
+	if (!_curFrame.strips)
 		_curFrame.strips = new CinepakStrip[_curFrame.stripCount];
 
 	debug(4, "Cinepak Frame: Width = %d, Height = %d, Strip Count = %d", _curFrame.width, _curFrame.height, _curFrame.stripCount);
@@ -166,7 +172,10 @@ const Graphics::Surface *CinepakDecoder::decodeFrame(Common::SeekableReadStream
 			case 0x30:
 			case 0x31:
 			case 0x32:
-				decodeVectors(stream, i, chunkID, chunkSize);
+				if (_ditherPalette)
+					ditherVectors(stream, i, chunkID, chunkSize);
+				else
+					decodeVectors(stream, i, chunkID, chunkSize);
 				break;
 			default:
 				warning("Unknown Cinepak chunk ID %02x", chunkID);
@@ -311,4 +320,227 @@ void CinepakDecoder::decodeVectors(Common::SeekableReadStream &stream, uint16 st
 	}
 }
 
+bool CinepakDecoder::canDither() const {
+	return _bitsPerPixel == 24;
+}
+
+void CinepakDecoder::setDither(const byte *palette) {
+	assert(canDither());
+
+	delete[] _colorMap;
+	delete[] _ditherPalette;
+
+	_ditherPalette = new byte[256 * 3];
+	memcpy(_ditherPalette, palette, 256 * 3);
+
+	_dirtyPalette = true;
+	_pixelFormat = Graphics::PixelFormat::createFormatCLUT8();
+	_colorMap = new byte[221];
+
+	for (int i = 0; i < 221; i++)
+		_colorMap[i] = findNearestRGB(i);
+}
+
+byte CinepakDecoder::findNearestRGB(int index) const {
+	int r = s_defaultPalette[index * 3];
+	int g = s_defaultPalette[index * 3 + 1];
+	int b = s_defaultPalette[index * 3 + 2];
+
+	byte result = 0;
+	int diff = 0x7FFFFFFF;
+
+	for (int i = 0; i < 256; i++) {
+		int bDiff = b - (int)_ditherPalette[i * 3 + 2];
+		int curDiffB = diff - (bDiff * bDiff);
+
+		if (curDiffB > 0) {
+			int gDiff = g - (int)_ditherPalette[i * 3 + 1];
+			int curDiffG = curDiffB - (gDiff * gDiff);
+
+			if (curDiffG > 0) {
+				int rDiff = r - (int)_ditherPalette[i * 3];
+				int curDiffR = curDiffG - (rDiff * rDiff);
+
+				if (curDiffR > 0) {
+					diff -= curDiffR;
+					result = i;
+
+					if (diff == 0)
+						break;
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
+void CinepakDecoder::ditherVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
+	uint32 flag = 0, mask = 0;
+	byte *iy[4];
+	int32 startPos = stream.pos();
+
+	for (uint16 y = _curFrame.strips[strip].rect.top; y < _curFrame.strips[strip].rect.bottom; y += 4) {
+		iy[0] = (byte *)_curFrame.surface->getPixels() + _curFrame.strips[strip].rect.left + y * _curFrame.width;
+		iy[1] = iy[0] + _curFrame.width;
+		iy[2] = iy[1] + _curFrame.width;
+		iy[3] = iy[2] + _curFrame.width;
+
+		for (uint16 x = _curFrame.strips[strip].rect.left; x < _curFrame.strips[strip].rect.right; x += 4) {
+			if ((chunkID & 0x01) && !(mask >>= 1)) {
+				if ((stream.pos() - startPos + 4) > (int32)chunkSize)
+					return;
+
+				flag  = stream.readUint32BE();
+				mask  = 0x80000000;
+			}
+
+			if (!(chunkID & 0x01) || (flag & mask)) {
+				if (!(chunkID & 0x02) && !(mask >>= 1)) {
+					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
+						return;
+
+					flag  = stream.readUint32BE();
+					mask  = 0x80000000;
+				}
+
+				byte blockBuffer[16];
+
+				if ((chunkID & 0x02) || (~flag & mask)) {
+					if ((stream.pos() - startPos + 1) > (int32)chunkSize)
+						return;
+
+					ditherCodebookSmooth(_curFrame.strips[strip].v1_codebook[stream.readByte()], blockBuffer);
+					iy[0][0] = blockBuffer[0];
+					iy[0][1] = blockBuffer[1];
+					iy[0][2] = blockBuffer[2];
+					iy[0][3] = blockBuffer[3];
+					iy[1][0] = blockBuffer[4];
+					iy[1][1] = blockBuffer[5];
+					iy[1][2] = blockBuffer[6];
+					iy[1][3] = blockBuffer[7];
+					iy[2][0] = blockBuffer[8];
+					iy[2][1] = blockBuffer[9];
+					iy[2][2] = blockBuffer[10];
+					iy[2][3] = blockBuffer[11];
+					iy[3][0] = blockBuffer[12];
+					iy[3][1] = blockBuffer[13];
+					iy[3][2] = blockBuffer[14];
+					iy[3][3] = blockBuffer[15];
+				} else if (flag & mask) {
+					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
+						return;
+
+					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
+					iy[0][0] = blockBuffer[0];
+					iy[0][1] = blockBuffer[1];
+					iy[1][0] = blockBuffer[4];
+					iy[1][1] = blockBuffer[5];
+
+					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
+					iy[0][2] = blockBuffer[2];
+					iy[0][3] = blockBuffer[3];
+					iy[1][2] = blockBuffer[6];
+					iy[1][3] = blockBuffer[7];
+
+					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
+					iy[2][0] = blockBuffer[8];
+					iy[2][1] = blockBuffer[9];
+					iy[3][0] = blockBuffer[12];
+					iy[3][1] = blockBuffer[13];
+
+					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
+					iy[2][2] = blockBuffer[10];
+					iy[2][3] = blockBuffer[11];
+					iy[3][2] = blockBuffer[14];
+					iy[3][3] = blockBuffer[15];
+				}
+			}
+
+			for (byte i = 0; i < 4; i++)
+				iy[i] += 4;
+		}
+	}
+}
+
+void CinepakDecoder::ditherCodebookDetail(const CinepakCodebook &codebook, byte *dst) const {
+	int uLookup = (byte)codebook.u * 2;
+	int vLookup = (byte)codebook.v * 2;
+	uint32 uv1 = s_uLookup[uLookup] | s_vLookup[vLookup];
+	uint32 uv2 = s_uLookup[uLookup + 1] | s_vLookup[vLookup + 1];
+
+	int yLookup1 = codebook.y[0] * 2;
+	int yLookup2 = codebook.y[1] * 2;
+	int yLookup3 = codebook.y[2] * 2;
+	int yLookup4 = codebook.y[3] * 2;
+
+	uint32 pixelGroup1 = uv2 | s_yLookup[yLookup1 + 1];
+	uint32 pixelGroup2 = uv2 | s_yLookup[yLookup2 + 1];
+	uint32 pixelGroup3 = uv1 | s_yLookup[yLookup3];
+	uint32 pixelGroup4 = uv1 | s_yLookup[yLookup4];
+	uint32 pixelGroup5 = uv1 | s_yLookup[yLookup1];
+	uint32 pixelGroup6 = uv1 | s_yLookup[yLookup2];
+	uint32 pixelGroup7 = uv2 | s_yLookup[yLookup3 + 1];
+	uint32 pixelGroup8 = uv2 | s_yLookup[yLookup4 + 1];
+
+	dst[0] = getRGBLookupEntry(pixelGroup1 & 0xFFFF);
+	dst[1] = getRGBLookupEntry(pixelGroup2 >> 16);
+	dst[2] = getRGBLookupEntry(pixelGroup5 & 0xFFFF);
+	dst[3] = getRGBLookupEntry(pixelGroup6 >> 16);
+	dst[4] = getRGBLookupEntry(pixelGroup3 & 0xFFFF);
+	dst[5] = getRGBLookupEntry(pixelGroup4 >> 16);
+	dst[6] = getRGBLookupEntry(pixelGroup7 & 0xFFFF);
+	dst[7] = getRGBLookupEntry(pixelGroup8 >> 16);
+	dst[8] = getRGBLookupEntry(pixelGroup1 >> 16);
+	dst[9] = getRGBLookupEntry(pixelGroup6 & 0xFFFF);
+	dst[10] = getRGBLookupEntry(pixelGroup5 >> 16);
+	dst[11] = getRGBLookupEntry(pixelGroup2 & 0xFFFF);
+	dst[12] = getRGBLookupEntry(pixelGroup3 >> 16);
+	dst[13] = getRGBLookupEntry(pixelGroup8 & 0xFFFF);
+	dst[14] = getRGBLookupEntry(pixelGroup7 >> 16);
+	dst[15] = getRGBLookupEntry(pixelGroup4 & 0xFFFF);
+}
+
+void CinepakDecoder::ditherCodebookSmooth(const CinepakCodebook &codebook, byte *dst) const {
+	int uLookup = (byte)codebook.u * 2;
+	int vLookup = (byte)codebook.v * 2;
+	uint32 uv1 = s_uLookup[uLookup] | s_vLookup[vLookup];
+	uint32 uv2 = s_uLookup[uLookup + 1] | s_vLookup[vLookup + 1];
+
+	int yLookup1 = codebook.y[0] * 2;
+	int yLookup2 = codebook.y[1] * 2;
+	int yLookup3 = codebook.y[2] * 2;
+	int yLookup4 = codebook.y[3] * 2;
+
+	uint32 pixelGroup1 = uv2 | s_yLookup[yLookup1 + 1];
+	uint32 pixelGroup2 = uv1 | s_yLookup[yLookup2];
+	uint32 pixelGroup3 = uv1 | s_yLookup[yLookup1];
+	uint32 pixelGroup4 = uv2 | s_yLookup[yLookup2 + 1];
+	uint32 pixelGroup5 = uv2 | s_yLookup[yLookup3 + 1];
+	uint32 pixelGroup6 = uv1 | s_yLookup[yLookup3];
+	uint32 pixelGroup7 = uv1 | s_yLookup[yLookup4];
+	uint32 pixelGroup8 = uv2 | s_yLookup[yLookup4 + 1];
+
+	dst[0] = getRGBLookupEntry(pixelGroup1 & 0xFFFF);
+	dst[1] = getRGBLookupEntry(pixelGroup1 >> 16);
+	dst[2] = getRGBLookupEntry(pixelGroup2 & 0xFFFF);
+	dst[3] = getRGBLookupEntry(pixelGroup2 >> 16);
+	dst[4] = getRGBLookupEntry(pixelGroup3 & 0xFFFF);
+	dst[5] = getRGBLookupEntry(pixelGroup3 >> 16);
+	dst[6] = getRGBLookupEntry(pixelGroup4 & 0xFFFF);
+	dst[7] = getRGBLookupEntry(pixelGroup4 >> 16);
+	dst[8] = getRGBLookupEntry(pixelGroup5 >> 16);
+	dst[9] = getRGBLookupEntry(pixelGroup6 & 0xFFFF);
+	dst[10] = getRGBLookupEntry(pixelGroup7 >> 16);
+	dst[11] = getRGBLookupEntry(pixelGroup8 & 0xFFFF);
+	dst[12] = getRGBLookupEntry(pixelGroup6 >> 16);
+	dst[13] = getRGBLookupEntry(pixelGroup5 & 0xFFFF);
+	dst[14] = getRGBLookupEntry(pixelGroup8 >> 16);
+	dst[15] = getRGBLookupEntry(pixelGroup7 & 0xFFFF);
+}
+
+byte CinepakDecoder::getRGBLookupEntry(uint16 index) const {
+	return _colorMap[s_defaultPaletteLookup[CLIP<int>(index, 0, 1024)]];
+}
+
 } // End of namespace Image
diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index e9cd437730..ce8451bf9a 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -72,14 +72,32 @@ public:
 	const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);
 	Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; }
 
+	bool containsPalette() const { return _ditherPalette != 0; }
+	const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; }
+	bool hasDirtyPalette() const { return _dirtyPalette; }
+	bool canDither() const;
+	void setDither(const byte *palette);
+
 private:
 	CinepakFrame _curFrame;
 	int32 _y;
+	int _bitsPerPixel;
 	Graphics::PixelFormat _pixelFormat;
 	byte *_clipTable, *_clipTableBuf;
 
+	byte *_ditherPalette;
+	bool _dirtyPalette;
+	byte *_rgbLookup;
+	byte *_colorMap;
+
 	void loadCodebook(Common::SeekableReadStream &stream, uint16 strip, byte codebookType, byte chunkID, uint32 chunkSize);
 	void decodeVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize);
+
+	byte findNearestRGB(int index) const;
+	void ditherVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize);
+	void ditherCodebookDetail(const CinepakCodebook &codebook, byte *dst) const;
+	void ditherCodebookSmooth(const CinepakCodebook &codebook, byte *dst) const;
+	byte getRGBLookupEntry(uint16 index) const;
 };
 
 } // End of namespace Image
diff --git a/image/codecs/cinepak_tables.h b/image/codecs/cinepak_tables.h
new file mode 100644
index 0000000000..03131cec22
--- /dev/null
+++ b/image/codecs/cinepak_tables.h
@@ -0,0 +1,780 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef IMAGE_CODECS_CINEPAK_TABLES_H
+#define IMAGE_CODECS_CINEPAK_TABLES_H
+
+#include "common/scummsys.h"
+
+namespace Image {
+
+static const byte s_defaultPaletteLookup[1024] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02,
+	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02,
+	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02,
+	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02,
+	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02,
+	0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
+	0x04, 0x04, 0x04, 0x05, 0x06, 0x07, 0x07, 0x07,
+	0x04, 0x04, 0x04, 0x05, 0x06, 0x07, 0x07, 0x07,
+	0x04, 0x04, 0x04, 0x05, 0x06, 0x07, 0x07, 0x07,
+	0x04, 0x04, 0x04, 0x05, 0x06, 0x07, 0x07, 0x07,
+	0x08, 0x08, 0x08, 0x09, 0x0A, 0x07, 0x07, 0x07,
+	0x0B, 0x0B, 0x0B, 0x0C, 0x0D, 0x0D, 0x0D, 0x07,
+	0x0E, 0x0E, 0x0E, 0x0F, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x0D, 0x0D,
+	0x12, 0x12, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16,
+	0x12, 0x12, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16,
+	0x12, 0x12, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16,
+	0x12, 0x12, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16,
+	0x17, 0x17, 0x17, 0x18, 0x19, 0x1A, 0x16, 0x16,
+	0x1B, 0x1B, 0x1B, 0x1C, 0x1D, 0x1E, 0x1E, 0x1E,
+	0x1F, 0x1F, 0x1F, 0x20, 0x21, 0x1E, 0x1E, 0x1E,
+	0x22, 0x22, 0x22, 0x23, 0x24, 0x24, 0x24, 0x1E,
+	0x25, 0x25, 0x25, 0x26, 0x27, 0x28, 0x29, 0x29,
+	0x25, 0x25, 0x25, 0x26, 0x27, 0x28, 0x29, 0x29,
+	0x25, 0x25, 0x25, 0x26, 0x27, 0x28, 0x29, 0x29,
+	0x25, 0x25, 0x25, 0x26, 0x27, 0x28, 0x29, 0x29,
+	0x2A, 0x2A, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2E,
+	0x2F, 0x2F, 0x2F, 0x30, 0x31, 0x32, 0x2E, 0x2E,
+	0x33, 0x33, 0x33, 0x34, 0x35, 0x36, 0x36, 0x36,
+	0x33, 0x33, 0x33, 0x34, 0x35, 0x36, 0x36, 0x36,
+	0x37, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B,
+	0x37, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B,
+	0x37, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B,
+	0x3C, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x40, 0x40,
+	0x41, 0x41, 0x42, 0x43, 0x44, 0x45, 0x45, 0x45,
+	0x46, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4A, 0x4A,
+	0x4B, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x4F, 0x4F,
+	0x4B, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x4F, 0x4F,
+	0x50, 0x50, 0x51, 0x52, 0x53, 0x54, 0x54, 0x54,
+	0x50, 0x50, 0x51, 0x52, 0x53, 0x54, 0x54, 0x54,
+	0x50, 0x50, 0x51, 0x52, 0x53, 0x54, 0x54, 0x54,
+	0x55, 0x55, 0x56, 0x57, 0x58, 0x59, 0x59, 0x59,
+	0x5A, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5E, 0x5E,
+	0x5F, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x63, 0x63,
+	0x64, 0x64, 0x65, 0x66, 0x67, 0x68, 0x68, 0x68,
+	0x64, 0x64, 0x65, 0x66, 0x67, 0x68, 0x68, 0x68,
+	0x69, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6D, 0x6D,
+	0x69, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6D, 0x6D,
+	0x69, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6D, 0x6D,
+	0x6E, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x72, 0x72,
+	0x73, 0x73, 0x74, 0x75, 0x76, 0x77, 0x77, 0x77,
+	0x78, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7C, 0x7C,
+	0x7D, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x81, 0x81,
+	0x7D, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x81, 0x81,
+	0x82, 0x82, 0x83, 0x84, 0x85, 0x86, 0x86, 0x86,
+	0x82, 0x82, 0x83, 0x84, 0x85, 0x86, 0x86, 0x86,
+	0x87, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8B, 0x8B,
+	0x8C, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x90, 0x90,
+	0x91, 0x91, 0x92, 0x93, 0x94, 0x95, 0x95, 0x95,
+	0x96, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9A, 0x9A,
+	0x96, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9A, 0x9A,
+	0x96, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9A, 0x9A,
+	0x9B, 0x9B, 0x9B, 0x9C, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9E, 0x9B, 0x9B, 0x9C, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9E, 0x9E, 0x9F, 0xA0, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA2, 0xA2, 0xA3, 0xA4, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA6, 0xA6, 0xA7, 0xA8, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xAA, 0xAA, 0xAB, 0xAC, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAA, 0xAA, 0xAB, 0xAC, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAA, 0xAA, 0xAB, 0xAC, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAE, 0xAE, 0xAE, 0xAF, 0xB0, 0xB0, 0xB0, 0xB0,
+	0xAE, 0xAE, 0xAE, 0xAF, 0xB0, 0xB0, 0xB0, 0xB0,
+	0xB4, 0xB1, 0xB1, 0xB2, 0xB3, 0xB3, 0xB3, 0xB3,
+	0xB4, 0xB4, 0xB5, 0xB6, 0xB7, 0xB7, 0xB7, 0xB7,
+	0xB8, 0xB8, 0xB9, 0xBA, 0xBB, 0xBB, 0xBB, 0xBB,
+	0xBC, 0xBC, 0xBD, 0xBE, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBC, 0xBC, 0xBD, 0xBE, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBC, 0xBC, 0xBD, 0xBE, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xC2, 0xC0, 0xC0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1,
+	0xC2, 0xC2, 0xC0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1,
+	0xC2, 0xC2, 0xC2, 0xC3, 0xC4, 0xC4, 0xC4, 0xC4,
+	0xC8, 0xC5, 0xC5, 0xC6, 0xC7, 0xC7, 0xC7, 0xC7,
+	0xC8, 0xC8, 0xC9, 0xCA, 0xCB, 0xCB, 0xCB, 0xCB,
+	0xCC, 0xCC, 0xCD, 0xCE, 0xCF, 0xCF, 0xCF, 0xCF,
+	0xCC, 0xCC, 0xCD, 0xCE, 0xCF, 0xCF, 0xCF, 0xCF,
+	0xCC, 0xCC, 0xCD, 0xCE, 0xCF, 0xCF, 0xCF, 0xCF,
+	0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0,
+	0xD2, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0,
+	0xD2, 0xD2, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1,
+	0xD2, 0xD2, 0xD2, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3,
+	0xD4, 0xD4, 0xD4, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+	0xD4, 0xD4, 0xD4, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+	0xD4, 0xD4, 0xD4, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+	0xD4, 0xD4, 0xD4, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+	0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6,
+	0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6,
+	0xD8, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6,
+	0xD8, 0xD8, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7,
+	0xD8, 0xD8, 0xD8, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+	0xD8, 0xD8, 0xD8, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+	0xD8, 0xD8, 0xD8, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+	0xD8, 0xD8, 0xD8, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9,
+	0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+	0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+	0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+	0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA,
+	0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+	0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+	0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+	0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC
+};
+
+static const byte s_defaultPalette[221 * 3] = {
+	0x02, 0x02, 0x02,
+	0x19, 0x19, 0x19,
+	0x47, 0x02, 0x19,
+	0x19, 0x0D, 0x47,
+	0x00, 0x51, 0x00,
+	0x2E, 0x3A, 0x00,
+	0x5C, 0x23, 0x00,
+	0x8F, 0x0A, 0x00,
+	0x00, 0x45, 0x2E,
+	0x2E, 0x2E, 0x2E,
+	0x5C, 0x17, 0x2E,
+	0x00, 0x3A, 0x5C,
+	0x2E, 0x23, 0x5C,
+	0x5C, 0x0C, 0x5C,
+	0x00, 0x2C, 0x95,
+	0x2E, 0x15, 0x95,
+	0x00, 0x1A, 0xDC,
+	0x2E, 0x03, 0xDC,
+	0x15, 0x66, 0x15,
+	0x43, 0x4F, 0x15,
+	0x71, 0x38, 0x15,
+	0xA4, 0x1E, 0x15,
+	0xDB, 0x02, 0x15,
+	0x15, 0x5A, 0x43,
+	0x43, 0x43, 0x43,
+	0x71, 0x2C, 0x43,
+	0xA4, 0x13, 0x43,
+	0x15, 0x4F, 0x71,
+	0x43, 0x38, 0x71,
+	0x71, 0x21, 0x71,
+	0xA4, 0x07, 0x71,
+	0x15, 0x40, 0xAA,
+	0x43, 0x29, 0xAA,
+	0x71, 0x12, 0xAA,
+	0x15, 0x2F, 0xF1,
+	0x43, 0x18, 0xF1,
+	0x71, 0x01, 0xF1,
+	0x29, 0x79, 0x29,
+	0x57, 0x62, 0x29,
+	0x85, 0x4B, 0x29,
+	0xB7, 0x32, 0x29,
+	0xEF, 0x16, 0x29,
+	0x29, 0x6E, 0x57,
+	0x57, 0x57, 0x57,
+	0x85, 0x40, 0x57,
+	0xB7, 0x27, 0x57,
+	0xEF, 0x0B, 0x57,
+	0x29, 0x62, 0x85,
+	0x57, 0x4B, 0x85,
+	0x85, 0x34, 0x85,
+	0xB7, 0x1B, 0x85,
+	0x29, 0x54, 0xBE,
+	0x57, 0x3D, 0xBE,
+	0x85, 0x26, 0xBE,
+	0xB7, 0x0D, 0xBE,
+	0x03, 0xB5, 0x09,
+	0x3C, 0x99, 0x09,
+	0x6A, 0x82, 0x09,
+	0x98, 0x6B, 0x09,
+	0xCA, 0x51, 0x09,
+	0x03, 0xA9, 0x3C,
+	0x3C, 0x8C, 0x3C,
+	0x6A, 0x75, 0x3C,
+	0x98, 0x5E, 0x3C,
+	0xCA, 0x45, 0x3C,
+	0x03, 0x9D, 0x6A,
+	0x3C, 0x81, 0x6A,
+	0x6A, 0x6A, 0x6A,
+	0x98, 0x53, 0x6A,
+	0xCA, 0x39, 0x6A,
+	0x03, 0x92, 0x98,
+	0x3C, 0x75, 0x98,
+	0x6A, 0x5E, 0x98,
+	0x98, 0x47, 0x98,
+	0xCA, 0x2E, 0x98,
+	0x03, 0x83, 0xD1,
+	0x3C, 0x67, 0xD1,
+	0x6A, 0x50, 0xD1,
+	0x98, 0x39, 0xD1,
+	0xCA, 0x20, 0xD1,
+	0x14, 0xC7, 0x1B,
+	0x4D, 0xAB, 0x1B,
+	0x7B, 0x94, 0x1B,
+	0xA9, 0x7D, 0x1B,
+	0xDC, 0x63, 0x1B,
+	0x14, 0xBA, 0x4D,
+	0x4D, 0x9E, 0x4D,
+	0x7B, 0x87, 0x4D,
+	0xA9, 0x70, 0x4D,
+	0xDC, 0x57, 0x4D,
+	0x14, 0xAF, 0x7B,
+	0x4D, 0x92, 0x7B,
+	0x7B, 0x7B, 0x7B,
+	0xA9, 0x64, 0x7B,
+	0xDC, 0x4B, 0x7B,
+	0x14, 0xA3, 0xA9,
+	0x4D, 0x87, 0xA9,
+	0x7B, 0x70, 0xA9,
+	0xA9, 0x59, 0xA9,
+	0xDC, 0x40, 0xA9,
+	0x14, 0x95, 0xE2,
+	0x4D, 0x79, 0xE2,
+	0x7B, 0x62, 0xE2,
+	0xA9, 0x4B, 0xE2,
+	0xDC, 0x31, 0xE2,
+	0x25, 0xD8, 0x2C,
+	0x5E, 0xBB, 0x2C,
+	0x8C, 0xA4, 0x2C,
+	0xBA, 0x8D, 0x2C,
+	0xED, 0x74, 0x2C,
+	0x25, 0xCB, 0x5E,
+	0x5E, 0xAF, 0x5E,
+	0x8C, 0x98, 0x5E,
+	0xBA, 0x81, 0x5E,
+	0xED, 0x67, 0x5E,
+	0x25, 0xC0, 0x8C,
+	0x5E, 0xA3, 0x8C,
+	0x8C, 0x8C, 0x8C,
+	0xBA, 0x75, 0x8C,
+	0xED, 0x5C, 0x8C,
+	0x25, 0xB4, 0xBA,
+	0x5E, 0x98, 0xBA,
+	0x8C, 0x81, 0xBA,
+	0xBA, 0x6A, 0xBA,
+	0xED, 0x50, 0xBA,
+	0x25, 0xA6, 0xF3,
+	0x5E, 0x8A, 0xF3,
+	0x8C, 0x73, 0xF3,
+	0xBA, 0x5C, 0xF3,
+	0xED, 0x42, 0xF3,
+	0x35, 0xF6, 0x04,
+	0x6E, 0xD9, 0x04,
+	0x9C, 0xC2, 0x04,
+	0xCA, 0xAB, 0x04,
+	0xFD, 0x92, 0x04,
+	0x35, 0xE8, 0x3C,
+	0x6E, 0xCB, 0x3C,
+	0x9C, 0xB4, 0x3C,
+	0xCA, 0x9D, 0x3C,
+	0xFD, 0x84, 0x3C,
+	0x35, 0xDB, 0x6E,
+	0x6E, 0xBF, 0x6E,
+	0x9C, 0xA8, 0x6E,
+	0xCA, 0x91, 0x6E,
+	0xFD, 0x78, 0x6E,
+	0x35, 0xD0, 0x9C,
+	0x6E, 0xB3, 0x9C,
+	0x9C, 0x9C, 0x9C,
+	0xCA, 0x85, 0x9C,
+	0xFD, 0x6C, 0x9C,
+	0x35, 0xC4, 0xCA,
+	0x6E, 0xA8, 0xCA,
+	0x9C, 0x91, 0xCA,
+	0xCA, 0x7A, 0xCA,
+	0xFD, 0x61, 0xCA,
+	0x7E, 0xE9, 0x13,
+	0xAC, 0xD2, 0x13,
+	0xDA, 0xBB, 0x13,
+	0x45, 0xF7, 0x4B,
+	0x7E, 0xDB, 0x4B,
+	0xAC, 0xC4, 0x4B,
+	0xDA, 0xAD, 0x4B,
+	0x45, 0xEB, 0x7E,
+	0x7E, 0xCE, 0x7E,
+	0xAC, 0xB7, 0x7E,
+	0xDA, 0xA0, 0x7E,
+	0x45, 0xDF, 0xAC,
+	0x7E, 0xC3, 0xAC,
+	0xAC, 0xAC, 0xAC,
+	0xDA, 0x95, 0xAC,
+	0x45, 0xD4, 0xDA,
+	0x7E, 0xB7, 0xDA,
+	0xAC, 0xA0, 0xDA,
+	0xDA, 0x89, 0xDA,
+	0x8C, 0xF7, 0x22,
+	0xBA, 0xE0, 0x22,
+	0xE8, 0xC9, 0x22,
+	0x8C, 0xE9, 0x59,
+	0xBA, 0xD2, 0x59,
+	0xE8, 0xBB, 0x59,
+	0x53, 0xF9, 0x8C,
+	0x8C, 0xDD, 0x8C,
+	0xBA, 0xC6, 0x8C,
+	0xE8, 0xAF, 0x8C,
+	0x53, 0xEE, 0xBA,
+	0x8C, 0xD1, 0xBA,
+	0xBA, 0xBA, 0xBA,
+	0xE8, 0xA3, 0xBA,
+	0x53, 0xE2, 0xE8,
+	0x8C, 0xC6, 0xE8,
+	0xBA, 0xAF, 0xE8,
+	0xE8, 0x98, 0xE8,
+	0xC8, 0xEE, 0x30,
+	0xF6, 0xD7, 0x30,
+	0x9A, 0xF7, 0x67,
+	0xC8, 0xE0, 0x67,
+	0xF6, 0xC9, 0x67,
+	0x9A, 0xEA, 0x9A,
+	0xC8, 0xD3, 0x9A,
+	0xF6, 0xBC, 0x9A,
+	0x61, 0xFB, 0xC8,
+	0x9A, 0xDF, 0xC8,
+	0xC8, 0xC8, 0xC8,
+	0xF6, 0xB1, 0xC8,
+	0x61, 0xF0, 0xF6,
+	0x9A, 0xD3, 0xF6,
+	0xC8, 0xBC, 0xF6,
+	0xF6, 0xA5, 0xF6,
+	0xD5, 0xFB, 0x3D,
+	0xD5, 0xED, 0x74,
+	0xA7, 0xF7, 0xA7,
+	0xD5, 0xE0, 0xA7,
+	0xA7, 0xEC, 0xD5,
+	0xD5, 0xD5, 0xD5,
+	0xE1, 0xFA, 0x81,
+	0xE1, 0xED, 0xB3,
+	0xB3, 0xF8, 0xE1,
+	0xE1, 0xE1, 0xE1,
+	0xED, 0xF9, 0xBF,
+	0xED, 0xED, 0xED,
+	0xF8, 0xF8, 0xF8
+};
+
+static const uint32 s_yLookup[512] = {
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000040, 0x00000000, 0x00000040, 0x00000000,
+	0x00000040, 0x00000000, 0x00000040, 0x00000000,
+	0x00000040, 0x00000000, 0x00000040, 0x00000040,
+	0x00000040, 0x00000040, 0x00000040, 0x00000040,
+	0x00000040, 0x00000040, 0x00400040, 0x00000040,
+	0x00400040, 0x00000040, 0x00400040, 0x00000040,
+	0x00400040, 0x00000040, 0x00400040, 0x00000040,
+	0x00400040, 0x00400040, 0x00400040, 0x00400040,
+	0x00400040, 0x00400040, 0x00400040, 0x00400040,
+	0x00400040, 0x00400040, 0x00400040, 0x00400040,
+	0x00400040, 0x00400040, 0x00400040, 0x00400040,
+	0x00400040, 0x00400040, 0x00400080, 0x00400040,
+	0x00400080, 0x00400040, 0x00400080, 0x00400040,
+	0x00400080, 0x00400040, 0x00400080, 0x00400080,
+	0x00400080, 0x00400080, 0x00400080, 0x00400080,
+	0x00400080, 0x00400080, 0x00400080, 0x00400080,
+	0x00800080, 0x00400080, 0x00800080, 0x00400080,
+	0x00800080, 0x00400080, 0x00800080, 0x00400080,
+	0x00800080, 0x00800080, 0x00800080, 0x00800080,
+	0x00800080, 0x00800080, 0x00800080, 0x00800080,
+	0x00800080, 0x00800080, 0x00800080, 0x00800080,
+	0x00800080, 0x00800080, 0x00800080, 0x00800080,
+	0x00800080, 0x00800080, 0x008000C0, 0x00800080,
+	0x008000C0, 0x00800080, 0x008000C0, 0x00800080,
+	0x008000C0, 0x00800080, 0x008000C0, 0x008000C0,
+	0x008000C0, 0x008000C0, 0x008000C0, 0x008000C0,
+	0x008000C0, 0x008000C0, 0x00C000C0, 0x008000C0,
+	0x00C000C0, 0x008000C0, 0x00C000C0, 0x008000C0,
+	0x00C000C0, 0x008000C0, 0x00C000C0, 0x00C000C0,
+	0x00C000C0, 0x00C000C0, 0x00C000C0, 0x00C000C0,
+	0x00C000C0, 0x00C000C0, 0x00C000C0, 0x00C000C0,
+	0x00C000C0, 0x00C000C0, 0x00C000C0, 0x00C000C0,
+	0x00C000C0, 0x00C000C0, 0x00C00100, 0x00C000C0,
+	0x00C00100, 0x00C000C0, 0x00C00100, 0x00C000C0,
+	0x00C00100, 0x00C000C0, 0x00C00100, 0x00C00100,
+	0x00C00100, 0x00C00100, 0x00C00100, 0x00C00100,
+	0x00C00100, 0x00C00100, 0x01000100, 0x00C00100,
+	0x01000100, 0x00C00100, 0x01000100, 0x00C00100,
+	0x01000100, 0x00C00100, 0x01000100, 0x01000100,
+	0x01000100, 0x01000100, 0x01000100, 0x01000100,
+	0x01000100, 0x01000100, 0x01000100, 0x01000100,
+	0x01000100, 0x01000100, 0x01000100, 0x01000100,
+	0x01000100, 0x01000100, 0x01000140, 0x01000100,
+	0x01000140, 0x01000100, 0x01000140, 0x01000100,
+	0x01000140, 0x01000140, 0x01000140, 0x01000140,
+	0x01000140, 0x01000140, 0x01000140, 0x01000140,
+	0x01400140, 0x01000140, 0x01400140, 0x01000140,
+	0x01400140, 0x01000140, 0x01400140, 0x01000140,
+	0x01400140, 0x01400140, 0x01400140, 0x01400140,
+	0x01400140, 0x01400140, 0x01400140, 0x01400140,
+	0x01400140, 0x01400140, 0x01400140, 0x01400140,
+	0x01400140, 0x01400140, 0x01400180, 0x01400140,
+	0x01400180, 0x01400140, 0x01400180, 0x01400140,
+	0x01400180, 0x01400140, 0x01400180, 0x01400180,
+	0x01400180, 0x01400180, 0x01400180, 0x01400180,
+	0x01800180, 0x01400180, 0x01800180, 0x01400180,
+	0x01800180, 0x01400180, 0x01800180, 0x01400180,
+	0x01800180, 0x01800180, 0x01800180, 0x01800180,
+	0x01800180, 0x01800180, 0x01800180, 0x01800180,
+	0x01800180, 0x01800180, 0x01800180, 0x01800180,
+	0x01800180, 0x01800180, 0x018001C0, 0x01800180,
+	0x018001C0, 0x01800180, 0x018001C0, 0x01800180,
+	0x018001C0, 0x018001C0, 0x018001C0, 0x018001C0,
+	0x018001C0, 0x018001C0, 0x018001C0, 0x018001C0,
+	0x01C001C0, 0x018001C0, 0x01C001C0, 0x018001C0,
+	0x01C001C0, 0x018001C0, 0x01C001C0, 0x01C001C0,
+	0x01C001C0, 0x01C001C0, 0x01C001C0, 0x01C001C0,
+	0x01C001C0, 0x01C001C0, 0x01C001C0, 0x01C001C0,
+	0x01C001C0, 0x01C001C0, 0x01C00200, 0x01C001C0,
+	0x01C00200, 0x01C001C0, 0x01C00200, 0x01C001C0,
+	0x01C00200, 0x01C001C0, 0x01C00200, 0x01C00200,
+	0x01C00200, 0x01C00200, 0x01C00200, 0x01C00200,
+	0x02000200, 0x01C00200, 0x02000200, 0x01C00200,
+	0x02000200, 0x01C00200, 0x02000200, 0x02000200,
+	0x02000200, 0x02000200, 0x02000200, 0x02000200,
+	0x02000200, 0x02000200, 0x02000200, 0x02000200,
+	0x02000200, 0x02000200, 0x02000240, 0x02000200,
+	0x02000240, 0x02000200, 0x02000240, 0x02000200,
+	0x02000240, 0x02000240, 0x02000240, 0x02000240,
+	0x02000240, 0x02000240, 0x02400240, 0x02000240,
+	0x02400240, 0x02000240, 0x02400240, 0x02000240,
+	0x02400240, 0x02000240, 0x02400240, 0x02400240,
+	0x02400240, 0x02400240, 0x02400240, 0x02400240,
+	0x02400240, 0x02400240, 0x02400240, 0x02400240,
+	0x02400280, 0x02400240, 0x02400280, 0x02400240,
+	0x02400280, 0x02400240, 0x02400280, 0x02400280,
+	0x02400280, 0x02400280, 0x02400280, 0x02400280,
+	0x02800280, 0x02400280, 0x02800280, 0x02400280,
+	0x02800280, 0x02400280, 0x02800280, 0x02800280,
+	0x02800280, 0x02800280, 0x02800280, 0x02800280,
+	0x02800280, 0x02800280, 0x02800280, 0x02800280,
+	0x02800280, 0x02800280, 0x028002C0, 0x02800280,
+	0x028002C0, 0x02800280, 0x028002C0, 0x02800280,
+	0x028002C0, 0x028002C0, 0x028002C0, 0x028002C0,
+	0x02C002C0, 0x028002C0, 0x02C002C0, 0x028002C0,
+	0x02C002C0, 0x028002C0, 0x02C002C0, 0x02C002C0,
+	0x02C002C0, 0x02C002C0, 0x02C002C0, 0x02C002C0,
+	0x02C002C0, 0x02C002C0, 0x02C002C0, 0x02C002C0,
+	0x02C00300, 0x02C002C0, 0x02C00300, 0x02C002C0,
+	0x02C00300, 0x02C002C0, 0x02C00300, 0x02C00300,
+	0x02C00300, 0x02C00300, 0x02C00300, 0x02C00300,
+	0x03000300, 0x02C00300, 0x03000300, 0x02C00300,
+	0x03000300, 0x03000300, 0x03000300, 0x03000300,
+	0x03000300, 0x03000300, 0x03000300, 0x03000300,
+	0x03000300, 0x03000300, 0x03000340, 0x03000300,
+	0x03000340, 0x03000300, 0x03000340, 0x03000300,
+	0x03000340, 0x03000340, 0x03000340, 0x03000340,
+	0x03400340, 0x03000340, 0x03400340, 0x03000340,
+	0x03400340, 0x03000340, 0x03400340, 0x03400340,
+	0x03400340, 0x03400340, 0x03400340, 0x03400340,
+	0x03400340, 0x03400340, 0x03400340, 0x03400340,
+	0x03400380, 0x03400340, 0x03400380, 0x03400340,
+	0x03400380, 0x03400380, 0x03400380, 0x03400380,
+	0x03800380, 0x03400380, 0x03800380, 0x03400380,
+	0x03800380, 0x03400380, 0x03800380, 0x03800380,
+	0x03800380, 0x03800380, 0x03800380, 0x03800380,
+	0x03800380, 0x03800380, 0x038003C0, 0x03800380,
+	0x038003C0, 0x03800380, 0x038003C0, 0x03800380,
+	0x038003C0, 0x038003C0, 0x038003C0, 0x038003C0,
+	0x03C003C0, 0x038003C0, 0x03C003C0, 0x038003C0,
+	0x03C003C0, 0x03C003C0, 0x03C003C0, 0x03C003C0,
+	0x03C003C0, 0x03C003C0, 0x03C003C0, 0x03C003C0,
+	0x03C003C0, 0x03C003C0, 0x03C003C0, 0x03C003C0,
+	0x03C003C0, 0x03C003C0, 0x03C003C0, 0x03C003C0,
+	0x03C003C0, 0x03C003C0, 0x03C003C0, 0x03C003C0
+};
+
+static const uint32 s_uLookup[512] = {
+	0x00200020, 0x00200020, 0x00200020, 0x00200020,
+	0x00200020, 0x00200020, 0x00200020, 0x00200020,
+	0x00200020, 0x00200020, 0x00280020, 0x00200020,
+	0x00280020, 0x00200020, 0x00280020, 0x00200020,
+	0x00280020, 0x00200020, 0x00280020, 0x00280020,
+	0x00280020, 0x00280020, 0x00280020, 0x00280020,
+	0x00280020, 0x00280020, 0x00280020, 0x00280020,
+	0x00280020, 0x00280028, 0x00280020, 0x00280028,
+	0x00280020, 0x00280028, 0x00280020, 0x00280028,
+	0x00280028, 0x00280028, 0x00280028, 0x00280028,
+	0x00280028, 0x00280028, 0x00280028, 0x00280028,
+	0x00280028, 0x00280028, 0x00280028, 0x00280028,
+	0x00280028, 0x00280028, 0x00280028, 0x00280028,
+	0x00280028, 0x00280028, 0x00280028, 0x00280028,
+	0x00280028, 0x00280028, 0x00300028, 0x00280028,
+	0x00300028, 0x00280028, 0x00300028, 0x00280028,
+	0x00300028, 0x00280028, 0x00300028, 0x00280028,
+	0x00300028, 0x00300028, 0x00300028, 0x00300028,
+	0x00300028, 0x00300028, 0x00300028, 0x00300028,
+	0x00300028, 0x00300028, 0x00300028, 0x00300028,
+	0x00300028, 0x00300030, 0x00300028, 0x00300030,
+	0x00300028, 0x00300030, 0x00300028, 0x00300030,
+	0x00300028, 0x00300030, 0x00300028, 0x00300030,
+	0x00300030, 0x00300030, 0x00300030, 0x00300030,
+	0x00300030, 0x00300030, 0x00300030, 0x00300030,
+	0x00300030, 0x00300030, 0x00300030, 0x00300030,
+	0x00300030, 0x00300030, 0x00300030, 0x00300030,
+	0x00300030, 0x00300030, 0x00300030, 0x00300030,
+	0x00300030, 0x00300030, 0x00300030, 0x00300030,
+	0x00300030, 0x00300030, 0x00380030, 0x00300030,
+	0x00380030, 0x00300030, 0x00380030, 0x00300030,
+	0x00380030, 0x00300030, 0x00380030, 0x00300030,
+	0x00380030, 0x00300030, 0x00380030, 0x00300030,
+	0x00380030, 0x00380030, 0x00380030, 0x00380030,
+	0x00380030, 0x00380030, 0x00380030, 0x00380030,
+	0x00380030, 0x00380030, 0x00380030, 0x00380030,
+	0x00380030, 0x00380030, 0x00380030, 0x00380038,
+	0x00380030, 0x00380038, 0x00380030, 0x00380038,
+	0x00380030, 0x00380038, 0x00380030, 0x00380038,
+	0x00380030, 0x00380038, 0x00380030, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00380038, 0x00380038, 0x00380038, 0x00380038,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00080000, 0x00000000,
+	0x00080000, 0x00000000, 0x00080000, 0x00000000,
+	0x00080000, 0x00000000, 0x00080000, 0x00000000,
+	0x00080000, 0x00000000, 0x00080000, 0x00000000,
+	0x00080000, 0x00080000, 0x00080000, 0x00080000,
+	0x00080000, 0x00080000, 0x00080000, 0x00080000,
+	0x00080000, 0x00080000, 0x00080000, 0x00080000,
+	0x00080000, 0x00080008, 0x00080000, 0x00080008,
+	0x00080000, 0x00080008, 0x00080000, 0x00080008,
+	0x00080000, 0x00080008, 0x00080000, 0x00080008,
+	0x00080008, 0x00080008, 0x00080008, 0x00080008,
+	0x00080008, 0x00080008, 0x00080008, 0x00080008,
+	0x00080008, 0x00080008, 0x00080008, 0x00080008,
+	0x00080008, 0x00080008, 0x00080008, 0x00080008,
+	0x00080008, 0x00080008, 0x00080008, 0x00080008,
+	0x00080008, 0x00080008, 0x00100008, 0x00080008,
+	0x00100008, 0x00080008, 0x00100008, 0x00080008,
+	0x00100008, 0x00080008, 0x00100008, 0x00080008,
+	0x00100008, 0x00080008, 0x00100008, 0x00100008,
+	0x00100008, 0x00100008, 0x00100008, 0x00100008,
+	0x00100008, 0x00100008, 0x00100008, 0x00100008,
+	0x00100008, 0x00100008, 0x00100008, 0x00100010,
+	0x00100008, 0x00100010, 0x00100008, 0x00100010,
+	0x00100008, 0x00100010, 0x00100008, 0x00100010,
+	0x00100010, 0x00100010, 0x00100010, 0x00100010,
+	0x00100010, 0x00100010, 0x00100010, 0x00100010,
+	0x00100010, 0x00100010, 0x00100010, 0x00100010,
+	0x00100010, 0x00100010, 0x00100010, 0x00100010,
+	0x00100010, 0x00100010, 0x00100010, 0x00100010,
+	0x00100010, 0x00100010, 0x00180010, 0x00100010,
+	0x00180010, 0x00100010, 0x00180010, 0x00100010,
+	0x00180010, 0x00100010, 0x00180010, 0x00100010,
+	0x00180010, 0x00180010, 0x00180010, 0x00180010,
+	0x00180010, 0x00180010, 0x00180010, 0x00180010,
+	0x00180010, 0x00180010, 0x00180010, 0x00180018,
+	0x00180010, 0x00180018, 0x00180010, 0x00180018,
+	0x00180010, 0x00180018, 0x00180010, 0x00180018,
+	0x00180018, 0x00180018, 0x00180018, 0x00180018,
+	0x00180018, 0x00180018, 0x00180018, 0x00180018,
+	0x00180018, 0x00180018, 0x00180018, 0x00180018,
+	0x00180018, 0x00180018, 0x00180018, 0x00180018,
+	0x00180018, 0x00180018, 0x00180018, 0x00180018,
+	0x00200018, 0x00180018, 0x00200018, 0x00180018,
+	0x00200018, 0x00180018, 0x00200018, 0x00180018,
+	0x00200018, 0x00200018, 0x00200018, 0x00200018,
+	0x00200018, 0x00200018, 0x00200018, 0x00200018,
+	0x00200018, 0x00200018, 0x00200018, 0x00200020,
+	0x00200018, 0x00200020, 0x00200018, 0x00200020,
+	0x00200018, 0x00200020, 0x00200020, 0x00200020,
+	0x00200020, 0x00200020, 0x00200020, 0x00200020,
+	0x00200020, 0x00200020, 0x00200020, 0x00200020
+};
+
+static const uint32 s_vLookup[512] = {
+	0x00030003, 0x00030003, 0x00030003, 0x00030003,
+	0x00030003, 0x00030003, 0x00030003, 0x00030003,
+	0x00030003, 0x00030003, 0x00030003, 0x00030004,
+	0x00030003, 0x00030004, 0x00030003, 0x00030004,
+	0x00030003, 0x00030004, 0x00030004, 0x00030004,
+	0x00030004, 0x00030004, 0x00030004, 0x00030004,
+	0x00030004, 0x00030004, 0x00030004, 0x00030004,
+	0x00030004, 0x00040004, 0x00030004, 0x00040004,
+	0x00030004, 0x00040004, 0x00030004, 0x00040004,
+	0x00040004, 0x00040004, 0x00040004, 0x00040004,
+	0x00040004, 0x00040004, 0x00040004, 0x00040004,
+	0x00040004, 0x00040004, 0x00040004, 0x00040004,
+	0x00040004, 0x00040004, 0x00040004, 0x00040004,
+	0x00040004, 0x00040004, 0x00040004, 0x00040004,
+	0x00040004, 0x00040005, 0x00040004, 0x00040005,
+	0x00040004, 0x00040005, 0x00040004, 0x00040005,
+	0x00040004, 0x00040005, 0x00040005, 0x00040005,
+	0x00040005, 0x00040005, 0x00040005, 0x00040005,
+	0x00040005, 0x00040005, 0x00040005, 0x00040005,
+	0x00040005, 0x00050005, 0x00040005, 0x00050005,
+	0x00040005, 0x00050005, 0x00040005, 0x00050005,
+	0x00040005, 0x00050005, 0x00050005, 0x00050005,
+	0x00050005, 0x00050005, 0x00050005, 0x00050005,
+	0x00050005, 0x00050005, 0x00050005, 0x00050005,
+	0x00050005, 0x00050005, 0x00050005, 0x00050005,
+	0x00050005, 0x00050005, 0x00050005, 0x00050005,
+	0x00050005, 0x00050005, 0x00050005, 0x00050005,
+	0x00050005, 0x00050006, 0x00050005, 0x00050006,
+	0x00050005, 0x00050006, 0x00050005, 0x00050006,
+	0x00050005, 0x00050006, 0x00050006, 0x00050006,
+	0x00050006, 0x00050006, 0x00050006, 0x00050006,
+	0x00050006, 0x00050006, 0x00050006, 0x00050006,
+	0x00050006, 0x00050006, 0x00050006, 0x00060006,
+	0x00050006, 0x00060006, 0x00050006, 0x00060006,
+	0x00050006, 0x00060006, 0x00050006, 0x00060006,
+	0x00050006, 0x00060006, 0x00060006, 0x00060006,
+	0x00060006, 0x00060006, 0x00060006, 0x00060006,
+	0x00060006, 0x00060006, 0x00060006, 0x00060006,
+	0x00060006, 0x00060006, 0x00060006, 0x00060006,
+	0x00060006, 0x00060006, 0x00060006, 0x00060006,
+	0x00060006, 0x00060006, 0x00060006, 0x00060006,
+	0x00060006, 0x00060007, 0x00060006, 0x00060007,
+	0x00060006, 0x00060007, 0x00060006, 0x00060007,
+	0x00060006, 0x00060007, 0x00060006, 0x00060007,
+	0x00060007, 0x00060007, 0x00060007, 0x00060007,
+	0x00060007, 0x00060007, 0x00060007, 0x00060007,
+	0x00060007, 0x00060007, 0x00060007, 0x00060007,
+	0x00060007, 0x00070007, 0x00060007, 0x00070007,
+	0x00060007, 0x00070007, 0x00060007, 0x00070007,
+	0x00060007, 0x00070007, 0x00060007, 0x00070007,
+	0x00060007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00070007, 0x00070007, 0x00070007, 0x00070007,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000001, 0x00000000, 0x00000001,
+	0x00000000, 0x00000001, 0x00000000, 0x00000001,
+	0x00000000, 0x00000001, 0x00000000, 0x00000001,
+	0x00000000, 0x00000001, 0x00000001, 0x00000001,
+	0x00000001, 0x00000001, 0x00000001, 0x00000001,
+	0x00000001, 0x00000001, 0x00000001, 0x00000001,
+	0x00000001, 0x00000001, 0x00000001, 0x00000001,
+	0x00000001, 0x00010001, 0x00000001, 0x00010001,
+	0x00000001, 0x00010001, 0x00000001, 0x00010001,
+	0x00000001, 0x00010001, 0x00000001, 0x00010001,
+	0x00000001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010001, 0x00010001, 0x00010001,
+	0x00010001, 0x00010002, 0x00010001, 0x00010002,
+	0x00010001, 0x00010002, 0x00010001, 0x00010002,
+	0x00010001, 0x00010002, 0x00010001, 0x00010002,
+	0x00010002, 0x00010002, 0x00010002, 0x00010002,
+	0x00010002, 0x00010002, 0x00010002, 0x00010002,
+	0x00010002, 0x00010002, 0x00010002, 0x00010002,
+	0x00010002, 0x00020002, 0x00010002, 0x00020002,
+	0x00010002, 0x00020002, 0x00010002, 0x00020002,
+	0x00010002, 0x00020002, 0x00020002, 0x00020002,
+	0x00020002, 0x00020002, 0x00020002, 0x00020002,
+	0x00020002, 0x00020002, 0x00020002, 0x00020002,
+	0x00020002, 0x00020002, 0x00020002, 0x00020002,
+	0x00020002, 0x00020002, 0x00020002, 0x00020002,
+	0x00020002, 0x00020002, 0x00020002, 0x00020002,
+	0x00020002, 0x00020003, 0x00020002, 0x00020003,
+	0x00020002, 0x00020003, 0x00020002, 0x00020003,
+	0x00020003, 0x00020003, 0x00020003, 0x00020003,
+	0x00020003, 0x00020003, 0x00020003, 0x00020003,
+	0x00020003, 0x00020003, 0x00020003, 0x00030003,
+	0x00020003, 0x00030003, 0x00020003, 0x00030003,
+	0x00020003, 0x00030003, 0x00030003, 0x00030003,
+	0x00030003, 0x00030003, 0x00030003, 0x00030003,
+	0x00030003, 0x00030003, 0x00030003, 0x00030003
+};
+
+} // End of namespace Image
+
+#endif
-- 
cgit v1.2.3


From f342d63431fc0784adc08648f17a6bbad934743f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 18 Aug 2014 18:31:38 -0400
Subject: IMAGE: Allow for choosing dither type

---
 image/codecs/cinepak.cpp |  8 ++++----
 image/codecs/cinepak.h   |  4 ++--
 image/codecs/codec.h     | 19 +++++++++++++------
 video/avi_decoder.cpp    |  4 ++--
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index 9760b5b2a4..de5198812b 100644
--- a/image/codecs/cinepak.cpp
+++ b/image/codecs/cinepak.cpp
@@ -320,12 +320,12 @@ void CinepakDecoder::decodeVectors(Common::SeekableReadStream &stream, uint16 st
 	}
 }
 
-bool CinepakDecoder::canDither() const {
-	return _bitsPerPixel == 24;
+bool CinepakDecoder::canDither(DitherType type) const {
+	return type == kDitherTypeVFW && _bitsPerPixel == 24;
 }
 
-void CinepakDecoder::setDither(const byte *palette) {
-	assert(canDither());
+void CinepakDecoder::setDither(DitherType type, const byte *palette) {
+	assert(canDither(type));
 
 	delete[] _colorMap;
 	delete[] _ditherPalette;
diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index ce8451bf9a..ccdad0877c 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -75,8 +75,8 @@ public:
 	bool containsPalette() const { return _ditherPalette != 0; }
 	const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; }
 	bool hasDirtyPalette() const { return _dirtyPalette; }
-	bool canDither() const;
-	void setDither(const byte *palette);
+	bool canDither(DitherType type) const;
+	void setDither(DitherType type, const byte *palette);
 
 private:
 	CinepakFrame _curFrame;
diff --git a/image/codecs/codec.h b/image/codecs/codec.h
index 3a2da9ff1e..9abbb3d183 100644
--- a/image/codecs/codec.h
+++ b/image/codecs/codec.h
@@ -58,6 +58,17 @@ public:
 	Codec() {}
 	virtual ~Codec() {}
 
+	/**
+	 * A type of dithering.
+	 */
+	enum DitherType {
+		/** Video for Windows dithering */
+		kDitherTypeVFW,
+
+		/** QuickTime dithering */
+		kDitherTypeQT
+	};
+
 	/**
 	 * Decode the frame for the given data and return a pointer to a surface
 	 * containing the decoded frame.
@@ -89,17 +100,13 @@ public:
 
 	/**
 	 * Can the codec dither down to 8bpp?
-	 *
-	 * @note This should only be used for VFW codecs
 	 */
-	virtual bool canDither() const { return false; }
+	virtual bool canDither(DitherType type) const { return false; }
 
 	/**
 	 * Activate dithering mode with a palette
-	 *
-	 * @note This should only be used for VFW codecs
 	 */
-	virtual void setDither(const byte *palette) {}
+	virtual void setDither(DitherType type, const byte *palette) {}
 };
 
 /**
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 72892534fb..700975d9a2 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -831,12 +831,12 @@ bool AVIDecoder::AVIVideoTrack::hasDirtyPalette() const {
 }
 
 bool AVIDecoder::AVIVideoTrack::canDither() const {
-	return _videoCodec && _videoCodec->canDither();
+	return _videoCodec && _videoCodec->canDither(Image::Codec::kDitherTypeVFW);
 }
 
 void AVIDecoder::AVIVideoTrack::setDither(const byte *palette) {
 	assert(_videoCodec);
-	_videoCodec->setDither(palette);
+	_videoCodec->setDither(Image::Codec::kDitherTypeVFW, palette);
 }
 
 AVIDecoder::AVIAudioTrack::AVIAudioTrack(const AVIStreamHeader &streamHeader, const PCMWaveFormat &waveFormat, Audio::Mixer::SoundType soundType)
-- 
cgit v1.2.3


From e5048ecffed49eb0ddb6b69488cfeebbc3820d8f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 23 Aug 2014 09:49:35 -0400
Subject: IMAGE: Rewrite a bunch of Cinepak using templates

---
 image/codecs/cinepak.cpp | 555 +++++++++++++++++++++++++----------------------
 image/codecs/cinepak.h   |   3 -
 2 files changed, 291 insertions(+), 267 deletions(-)

diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index de5198812b..f43c952c2c 100644
--- a/image/codecs/cinepak.cpp
+++ b/image/codecs/cinepak.cpp
@@ -35,18 +35,290 @@
 
 namespace Image {
 
-#define PUT_PIXEL(offset, lum, u, v) \
-	if (_pixelFormat.bytesPerPixel != 1) { \
-		byte r = _clipTable[lum + (v << 1)]; \
-		byte g = _clipTable[lum - (u >> 1) - v]; \
-		byte b = _clipTable[lum + (u << 1)]; \
-		\
-		if (_pixelFormat.bytesPerPixel == 2) \
-			*((uint16 *)_curFrame.surface->getPixels() + offset) = _pixelFormat.RGBToColor(r, g, b); \
-		else \
-			*((uint32 *)_curFrame.surface->getPixels() + offset) = _pixelFormat.RGBToColor(r, g, b); \
-	} else \
-		*((byte *)_curFrame.surface->getPixels() + offset) = lum
+namespace {
+
+inline void convertYUVToRGB(const byte *clipTable, byte y, int8 u, int8 v, byte &r, byte &g, byte &b) {
+	r = clipTable[y + (v << 1)];
+	g = clipTable[y - (u >> 1) - v];
+	b = clipTable[y + (u << 1)];
+}
+
+inline uint32 convertYUVToColor(const byte *clipTable, const Graphics::PixelFormat &format, byte y, byte u, byte v) {
+	byte r, g, b;
+	convertYUVToRGB(clipTable, y, u, v, r, g, b);
+	return format.RGBToColor(r, g, b);
+}
+
+inline uint16 createDitherTableIndex(const byte *clipTable, byte y, int8 u, int8 v) {
+	byte r, g, b;
+	convertYUVToRGB(clipTable, y, u, v, r, g, b);
+	return ((r & 0xF8) << 6) |
+	       ((g & 0xF8) << 1) |
+	       ((b & 0xF0) >> 4);
+}
+
+/**
+ * Put a raw pixel to the destination surface
+ */
+template<typename PixelInt>
+inline void putPixelRaw(PixelInt *dst, const byte *clipTable, const Graphics::PixelFormat &format, byte y, byte u, byte v) {
+	*dst = convertYUVToColor(clipTable, format, y, u, v);
+}
+
+/**
+ * Specialized putPixelRaw for palettized 8bpp output
+ */
+template<>
+inline void putPixelRaw(byte *dst, const byte *clipTable, const Graphics::PixelFormat &format, byte y, byte u, byte v) {
+	*dst = y;
+}
+
+/**
+ * The default codebook converter: raw output.
+ */
+struct CodebookConverterRaw {
+	template<typename PixelInt>
+	static inline void decodeBlock1(byte codebookIndex, const CinepakStrip &strip, PixelInt *(&rows)[4], const byte *clipTable, const byte *colorMap, const Graphics::PixelFormat &format) {
+		const CinepakCodebook &codebook = strip.v1_codebook[codebookIndex];
+		putPixelRaw(rows[0] + 0, clipTable, format, codebook.y[0], codebook.u, codebook.v);
+		putPixelRaw(rows[0] + 1, clipTable, format, codebook.y[0], codebook.u, codebook.v);
+		putPixelRaw(rows[1] + 0, clipTable, format, codebook.y[0], codebook.u, codebook.v);
+		putPixelRaw(rows[1] + 1, clipTable, format, codebook.y[0], codebook.u, codebook.v);
+
+		putPixelRaw(rows[0] + 2, clipTable, format, codebook.y[1], codebook.u, codebook.v);
+		putPixelRaw(rows[0] + 3, clipTable, format, codebook.y[1], codebook.u, codebook.v);
+		putPixelRaw(rows[1] + 2, clipTable, format, codebook.y[1], codebook.u, codebook.v);
+		putPixelRaw(rows[1] + 3, clipTable, format, codebook.y[1], codebook.u, codebook.v);
+
+		putPixelRaw(rows[2] + 0, clipTable, format, codebook.y[2], codebook.u, codebook.v);
+		putPixelRaw(rows[2] + 1, clipTable, format, codebook.y[2], codebook.u, codebook.v);
+		putPixelRaw(rows[3] + 0, clipTable, format, codebook.y[2], codebook.u, codebook.v);
+		putPixelRaw(rows[3] + 1, clipTable, format, codebook.y[2], codebook.u, codebook.v);
+
+		putPixelRaw(rows[2] + 2, clipTable, format, codebook.y[3], codebook.u, codebook.v);
+		putPixelRaw(rows[2] + 3, clipTable, format, codebook.y[3], codebook.u, codebook.v);
+		putPixelRaw(rows[3] + 2, clipTable, format, codebook.y[3], codebook.u, codebook.v);
+		putPixelRaw(rows[3] + 3, clipTable, format, codebook.y[3], codebook.u, codebook.v);
+	}
+
+	template<typename PixelInt>
+	static inline void decodeBlock4(const byte (&codebookIndex)[4], const CinepakStrip &strip, PixelInt *(&rows)[4], const byte *clipTable, const byte *colorMap, const Graphics::PixelFormat &format) {
+		const CinepakCodebook &codebook1 = strip.v4_codebook[codebookIndex[0]];
+		putPixelRaw(rows[0] + 0, clipTable, format, codebook1.y[0], codebook1.u, codebook1.v);
+		putPixelRaw(rows[0] + 1, clipTable, format, codebook1.y[1], codebook1.u, codebook1.v);
+		putPixelRaw(rows[1] + 0, clipTable, format, codebook1.y[2], codebook1.u, codebook1.v);
+		putPixelRaw(rows[1] + 1, clipTable, format, codebook1.y[3], codebook1.u, codebook1.v);
+
+		const CinepakCodebook &codebook2 = strip.v4_codebook[codebookIndex[1]];
+		putPixelRaw(rows[0] + 2, clipTable, format, codebook2.y[0], codebook2.u, codebook2.v);
+		putPixelRaw(rows[0] + 3, clipTable, format, codebook2.y[1], codebook2.u, codebook2.v);
+		putPixelRaw(rows[1] + 2, clipTable, format, codebook2.y[2], codebook2.u, codebook2.v);
+		putPixelRaw(rows[1] + 3, clipTable, format, codebook2.y[3], codebook2.u, codebook2.v);
+
+		const CinepakCodebook &codebook3 = strip.v4_codebook[codebookIndex[2]];
+		putPixelRaw(rows[2] + 0, clipTable, format, codebook3.y[0], codebook3.u, codebook3.v);
+		putPixelRaw(rows[2] + 1, clipTable, format, codebook3.y[1], codebook3.u, codebook3.v);
+		putPixelRaw(rows[3] + 0, clipTable, format, codebook3.y[2], codebook3.u, codebook3.v);
+		putPixelRaw(rows[3] + 1, clipTable, format, codebook3.y[3], codebook3.u, codebook3.v);
+
+		const CinepakCodebook &codebook4 = strip.v4_codebook[codebookIndex[3]];
+		putPixelRaw(rows[2] + 2, clipTable, format, codebook4.y[0], codebook4.u, codebook4.v);
+		putPixelRaw(rows[2] + 3, clipTable, format, codebook4.y[1], codebook4.u, codebook4.v);
+		putPixelRaw(rows[3] + 2, clipTable, format, codebook4.y[2], codebook4.u, codebook4.v);
+		putPixelRaw(rows[3] + 3, clipTable, format, codebook4.y[3], codebook4.u, codebook4.v);
+	}
+};
+
+/**
+ * Codebook converter that dithers in VFW-style
+ */
+struct CodebookConverterDitherVFW {
+	static inline void decodeBlock1(byte codebookIndex, const CinepakStrip &strip, byte *(&rows)[4], const byte *clipTable, const byte *colorMap, const Graphics::PixelFormat &format) {
+		const CinepakCodebook &codebook = strip.v1_codebook[codebookIndex];
+		byte blockBuffer[16];
+		ditherCodebookSmooth(codebook, blockBuffer, colorMap);
+		rows[0][0] = blockBuffer[0];
+		rows[0][1] = blockBuffer[1];
+		rows[0][2] = blockBuffer[2];
+		rows[0][3] = blockBuffer[3];
+		rows[1][0] = blockBuffer[4];
+		rows[1][1] = blockBuffer[5];
+		rows[1][2] = blockBuffer[6];
+		rows[1][3] = blockBuffer[7];
+		rows[2][0] = blockBuffer[8];
+		rows[2][1] = blockBuffer[9];
+		rows[2][2] = blockBuffer[10];
+		rows[2][3] = blockBuffer[11];
+		rows[3][0] = blockBuffer[12];
+		rows[3][1] = blockBuffer[13];
+		rows[3][2] = blockBuffer[14];
+		rows[3][3] = blockBuffer[15];
+	}
+
+	static inline void decodeBlock4(const byte (&codebookIndex)[4], const CinepakStrip &strip, byte *(&rows)[4], const byte *clipTable, const byte *colorMap, const Graphics::PixelFormat &format) {
+		byte blockBuffer[16];
+		ditherCodebookDetail(strip.v4_codebook[codebookIndex[0]], blockBuffer, colorMap);
+		rows[0][0] = blockBuffer[0];
+		rows[0][1] = blockBuffer[1];
+		rows[1][0] = blockBuffer[4];
+		rows[1][1] = blockBuffer[5];
+
+		ditherCodebookDetail(strip.v4_codebook[codebookIndex[1]], blockBuffer, colorMap);
+		rows[0][2] = blockBuffer[2];
+		rows[0][3] = blockBuffer[3];
+		rows[1][2] = blockBuffer[6];
+		rows[1][3] = blockBuffer[7];
+
+		ditherCodebookDetail(strip.v4_codebook[codebookIndex[2]], blockBuffer, colorMap);
+		rows[2][0] = blockBuffer[8];
+		rows[2][1] = blockBuffer[9];
+		rows[3][0] = blockBuffer[12];
+		rows[3][1] = blockBuffer[13];
+
+		ditherCodebookDetail(strip.v4_codebook[codebookIndex[3]], blockBuffer, colorMap);
+		rows[2][2] = blockBuffer[10];
+		rows[2][3] = blockBuffer[11];
+		rows[3][2] = blockBuffer[14];
+		rows[3][3] = blockBuffer[15];
+	}
+
+private:
+	static inline void ditherCodebookDetail(const CinepakCodebook &codebook, byte *dst, const byte *colorMap) {
+		int uLookup = (byte)codebook.u * 2;
+		int vLookup = (byte)codebook.v * 2;
+		uint32 uv1 = s_uLookup[uLookup] | s_vLookup[vLookup];
+		uint32 uv2 = s_uLookup[uLookup + 1] | s_vLookup[vLookup + 1];
+
+		int yLookup1 = codebook.y[0] * 2;
+		int yLookup2 = codebook.y[1] * 2;
+		int yLookup3 = codebook.y[2] * 2;
+		int yLookup4 = codebook.y[3] * 2;
+
+		uint32 pixelGroup1 = uv2 | s_yLookup[yLookup1 + 1];
+		uint32 pixelGroup2 = uv2 | s_yLookup[yLookup2 + 1];
+		uint32 pixelGroup3 = uv1 | s_yLookup[yLookup3];
+		uint32 pixelGroup4 = uv1 | s_yLookup[yLookup4];
+		uint32 pixelGroup5 = uv1 | s_yLookup[yLookup1];
+		uint32 pixelGroup6 = uv1 | s_yLookup[yLookup2];
+		uint32 pixelGroup7 = uv2 | s_yLookup[yLookup3 + 1];
+		uint32 pixelGroup8 = uv2 | s_yLookup[yLookup4 + 1];
+
+		dst[0] = getRGBLookupEntry(colorMap, pixelGroup1 & 0xFFFF);
+		dst[1] = getRGBLookupEntry(colorMap, pixelGroup2 >> 16);
+		dst[2] = getRGBLookupEntry(colorMap, pixelGroup5 & 0xFFFF);
+		dst[3] = getRGBLookupEntry(colorMap, pixelGroup6 >> 16);
+		dst[4] = getRGBLookupEntry(colorMap, pixelGroup3 & 0xFFFF);
+		dst[5] = getRGBLookupEntry(colorMap, pixelGroup4 >> 16);
+		dst[6] = getRGBLookupEntry(colorMap, pixelGroup7 & 0xFFFF);
+		dst[7] = getRGBLookupEntry(colorMap, pixelGroup8 >> 16);
+		dst[8] = getRGBLookupEntry(colorMap, pixelGroup1 >> 16);
+		dst[9] = getRGBLookupEntry(colorMap, pixelGroup6 & 0xFFFF);
+		dst[10] = getRGBLookupEntry(colorMap, pixelGroup5 >> 16);
+		dst[11] = getRGBLookupEntry(colorMap, pixelGroup2 & 0xFFFF);
+		dst[12] = getRGBLookupEntry(colorMap, pixelGroup3 >> 16);
+		dst[13] = getRGBLookupEntry(colorMap, pixelGroup8 & 0xFFFF);
+		dst[14] = getRGBLookupEntry(colorMap, pixelGroup7 >> 16);
+		dst[15] = getRGBLookupEntry(colorMap, pixelGroup4 & 0xFFFF);
+	}
+
+	static inline void ditherCodebookSmooth(const CinepakCodebook &codebook, byte *dst, const byte *colorMap) {
+		int uLookup = (byte)codebook.u * 2;
+		int vLookup = (byte)codebook.v * 2;
+		uint32 uv1 = s_uLookup[uLookup] | s_vLookup[vLookup];
+		uint32 uv2 = s_uLookup[uLookup + 1] | s_vLookup[vLookup + 1];
+
+		int yLookup1 = codebook.y[0] * 2;
+		int yLookup2 = codebook.y[1] * 2;
+		int yLookup3 = codebook.y[2] * 2;
+		int yLookup4 = codebook.y[3] * 2;
+
+		uint32 pixelGroup1 = uv2 | s_yLookup[yLookup1 + 1];
+		uint32 pixelGroup2 = uv1 | s_yLookup[yLookup2];
+		uint32 pixelGroup3 = uv1 | s_yLookup[yLookup1];
+		uint32 pixelGroup4 = uv2 | s_yLookup[yLookup2 + 1];
+		uint32 pixelGroup5 = uv2 | s_yLookup[yLookup3 + 1];
+		uint32 pixelGroup6 = uv1 | s_yLookup[yLookup3];
+		uint32 pixelGroup7 = uv1 | s_yLookup[yLookup4];
+		uint32 pixelGroup8 = uv2 | s_yLookup[yLookup4 + 1];
+
+		dst[0] = getRGBLookupEntry(colorMap, pixelGroup1 & 0xFFFF);
+		dst[1] = getRGBLookupEntry(colorMap, pixelGroup1 >> 16);
+		dst[2] = getRGBLookupEntry(colorMap, pixelGroup2 & 0xFFFF);
+		dst[3] = getRGBLookupEntry(colorMap, pixelGroup2 >> 16);
+		dst[4] = getRGBLookupEntry(colorMap, pixelGroup3 & 0xFFFF);
+		dst[5] = getRGBLookupEntry(colorMap, pixelGroup3 >> 16);
+		dst[6] = getRGBLookupEntry(colorMap, pixelGroup4 & 0xFFFF);
+		dst[7] = getRGBLookupEntry(colorMap, pixelGroup4 >> 16);
+		dst[8] = getRGBLookupEntry(colorMap, pixelGroup5 >> 16);
+		dst[9] = getRGBLookupEntry(colorMap, pixelGroup6 & 0xFFFF);
+		dst[10] = getRGBLookupEntry(colorMap, pixelGroup7 >> 16);
+		dst[11] = getRGBLookupEntry(colorMap, pixelGroup8 & 0xFFFF);
+		dst[12] = getRGBLookupEntry(colorMap, pixelGroup6 >> 16);
+		dst[13] = getRGBLookupEntry(colorMap, pixelGroup5 & 0xFFFF);
+		dst[14] = getRGBLookupEntry(colorMap, pixelGroup8 >> 16);
+		dst[15] = getRGBLookupEntry(colorMap, pixelGroup7 & 0xFFFF);
+	}
+
+	static inline byte getRGBLookupEntry(const byte *colorMap, uint16 index) {
+		return colorMap[s_defaultPaletteLookup[CLIP<int>(index, 0, 1024)]];
+	}
+};
+
+template<typename PixelInt, typename CodebookConverter>
+void decodeVectorsTmpl(CinepakFrame &frame, const byte *clipTable, const byte *colorMap, Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
+	uint32 flag = 0, mask = 0;
+	PixelInt *iy[4];
+	int32 startPos = stream.pos();
+
+	for (uint16 y = frame.strips[strip].rect.top; y < frame.strips[strip].rect.bottom; y += 4) {
+		iy[0] = (PixelInt *)frame.surface->getBasePtr(frame.strips[strip].rect.left, + y);
+		iy[1] = iy[0] + frame.width;
+		iy[2] = iy[1] + frame.width;
+		iy[3] = iy[2] + frame.width;
+
+		for (uint16 x = frame.strips[strip].rect.left; x < frame.strips[strip].rect.right; x += 4) {
+			if ((chunkID & 0x01) && !(mask >>= 1)) {
+				if ((stream.pos() - startPos + 4) > (int32)chunkSize)
+					return;
+
+				flag  = stream.readUint32BE();
+				mask  = 0x80000000;
+			}
+
+			if (!(chunkID & 0x01) || (flag & mask)) {
+				if (!(chunkID & 0x02) && !(mask >>= 1)) {
+					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
+						return;
+
+					flag  = stream.readUint32BE();
+					mask  = 0x80000000;
+				}
+
+				if ((chunkID & 0x02) || (~flag & mask)) {
+					if ((stream.pos() - startPos + 1) > (int32)chunkSize)
+						return;
+
+					// Get the codebook
+					byte codebook = stream.readByte();
+					CodebookConverter::decodeBlock1(codebook, frame.strips[strip], iy, clipTable, colorMap, frame.surface->format);
+				} else if (flag & mask) {
+					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
+						return;
+
+					byte codebook[4];
+					for (byte i = 0; i < 4; i++)
+						codebook[i] = stream.readByte();
+					CodebookConverter::decodeBlock4(codebook, frame.strips[strip], iy, clipTable, colorMap, frame.surface->format);
+				}
+			}
+
+			for (byte i = 0; i < 4; i++)
+				iy[i] += 4;
+		}
+	}
+}
+
+} // End of anonymous namespace
 
 CinepakDecoder::CinepakDecoder(int bitsPerPixel) : Codec(), _bitsPerPixel(bitsPerPixel) {
 	_curFrame.surface = 0;
@@ -230,93 +502,12 @@ void CinepakDecoder::loadCodebook(Common::SeekableReadStream &stream, uint16 str
 }
 
 void CinepakDecoder::decodeVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
-	uint32 flag = 0, mask = 0;
-	uint32 iy[4];
-	int32 startPos = stream.pos();
-
-	for (uint16 y = _curFrame.strips[strip].rect.top; y < _curFrame.strips[strip].rect.bottom; y += 4) {
-		iy[0] = _curFrame.strips[strip].rect.left + y * _curFrame.width;
-		iy[1] = iy[0] + _curFrame.width;
-		iy[2] = iy[1] + _curFrame.width;
-		iy[3] = iy[2] + _curFrame.width;
-
-		for (uint16 x = _curFrame.strips[strip].rect.left; x < _curFrame.strips[strip].rect.right; x += 4) {
-			if ((chunkID & 0x01) && !(mask >>= 1)) {
-				if ((stream.pos() - startPos + 4) > (int32)chunkSize)
-					return;
-
-				flag  = stream.readUint32BE();
-				mask  = 0x80000000;
-			}
-
-			if (!(chunkID & 0x01) || (flag & mask)) {
-				if (!(chunkID & 0x02) && !(mask >>= 1)) {
-					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
-						return;
-
-					flag  = stream.readUint32BE();
-					mask  = 0x80000000;
-				}
-
-				if ((chunkID & 0x02) || (~flag & mask)) {
-					if ((stream.pos() - startPos + 1) > (int32)chunkSize)
-						return;
-
-					// Get the codebook
-					CinepakCodebook codebook = _curFrame.strips[strip].v1_codebook[stream.readByte()];
-
-					PUT_PIXEL(iy[0] + 0, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[0] + 1, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 0, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 1, codebook.y[0], codebook.u, codebook.v);
-
-					PUT_PIXEL(iy[0] + 2, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[0] + 3, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 2, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 3, codebook.y[1], codebook.u, codebook.v);
-
-					PUT_PIXEL(iy[2] + 0, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[2] + 1, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 0, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 1, codebook.y[2], codebook.u, codebook.v);
-
-					PUT_PIXEL(iy[2] + 2, codebook.y[3], codebook.u, codebook.v);
-					PUT_PIXEL(iy[2] + 3, codebook.y[3], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 2, codebook.y[3], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 3, codebook.y[3], codebook.u, codebook.v);
-				} else if (flag & mask) {
-					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
-						return;
-
-					CinepakCodebook codebook = _curFrame.strips[strip].v4_codebook[stream.readByte()];
-					PUT_PIXEL(iy[0] + 0, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[0] + 1, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 0, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 1, codebook.y[3], codebook.u, codebook.v);
-
-					codebook = _curFrame.strips[strip].v4_codebook[stream.readByte()];
-					PUT_PIXEL(iy[0] + 2, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[0] + 3, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 2, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[1] + 3, codebook.y[3], codebook.u, codebook.v);
-
-					codebook = _curFrame.strips[strip].v4_codebook[stream.readByte()];
-					PUT_PIXEL(iy[2] + 0, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[2] + 1, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 0, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 1, codebook.y[3], codebook.u, codebook.v);
-
-					codebook = _curFrame.strips[strip].v4_codebook[stream.readByte()];
-					PUT_PIXEL(iy[2] + 2, codebook.y[0], codebook.u, codebook.v);
-					PUT_PIXEL(iy[2] + 3, codebook.y[1], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 2, codebook.y[2], codebook.u, codebook.v);
-					PUT_PIXEL(iy[3] + 3, codebook.y[3], codebook.u, codebook.v);
-				}
-			}
-
-			for (byte i = 0; i < 4; i++)
-				iy[i] += 4;
-		}
+	if (_curFrame.surface->format.bytesPerPixel == 1) {
+		decodeVectorsTmpl<byte, CodebookConverterRaw>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
+	} else if (_curFrame.surface->format.bytesPerPixel == 2) {
+		decodeVectorsTmpl<uint16, CodebookConverterRaw>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
+	} else if (_curFrame.surface->format.bytesPerPixel == 4) {
+		decodeVectorsTmpl<uint32, CodebookConverterRaw>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
 	}
 }
 
@@ -376,171 +567,7 @@ byte CinepakDecoder::findNearestRGB(int index) const {
 }
 
 void CinepakDecoder::ditherVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
-	uint32 flag = 0, mask = 0;
-	byte *iy[4];
-	int32 startPos = stream.pos();
-
-	for (uint16 y = _curFrame.strips[strip].rect.top; y < _curFrame.strips[strip].rect.bottom; y += 4) {
-		iy[0] = (byte *)_curFrame.surface->getPixels() + _curFrame.strips[strip].rect.left + y * _curFrame.width;
-		iy[1] = iy[0] + _curFrame.width;
-		iy[2] = iy[1] + _curFrame.width;
-		iy[3] = iy[2] + _curFrame.width;
-
-		for (uint16 x = _curFrame.strips[strip].rect.left; x < _curFrame.strips[strip].rect.right; x += 4) {
-			if ((chunkID & 0x01) && !(mask >>= 1)) {
-				if ((stream.pos() - startPos + 4) > (int32)chunkSize)
-					return;
-
-				flag  = stream.readUint32BE();
-				mask  = 0x80000000;
-			}
-
-			if (!(chunkID & 0x01) || (flag & mask)) {
-				if (!(chunkID & 0x02) && !(mask >>= 1)) {
-					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
-						return;
-
-					flag  = stream.readUint32BE();
-					mask  = 0x80000000;
-				}
-
-				byte blockBuffer[16];
-
-				if ((chunkID & 0x02) || (~flag & mask)) {
-					if ((stream.pos() - startPos + 1) > (int32)chunkSize)
-						return;
-
-					ditherCodebookSmooth(_curFrame.strips[strip].v1_codebook[stream.readByte()], blockBuffer);
-					iy[0][0] = blockBuffer[0];
-					iy[0][1] = blockBuffer[1];
-					iy[0][2] = blockBuffer[2];
-					iy[0][3] = blockBuffer[3];
-					iy[1][0] = blockBuffer[4];
-					iy[1][1] = blockBuffer[5];
-					iy[1][2] = blockBuffer[6];
-					iy[1][3] = blockBuffer[7];
-					iy[2][0] = blockBuffer[8];
-					iy[2][1] = blockBuffer[9];
-					iy[2][2] = blockBuffer[10];
-					iy[2][3] = blockBuffer[11];
-					iy[3][0] = blockBuffer[12];
-					iy[3][1] = blockBuffer[13];
-					iy[3][2] = blockBuffer[14];
-					iy[3][3] = blockBuffer[15];
-				} else if (flag & mask) {
-					if ((stream.pos() - startPos + 4) > (int32)chunkSize)
-						return;
-
-					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
-					iy[0][0] = blockBuffer[0];
-					iy[0][1] = blockBuffer[1];
-					iy[1][0] = blockBuffer[4];
-					iy[1][1] = blockBuffer[5];
-
-					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
-					iy[0][2] = blockBuffer[2];
-					iy[0][3] = blockBuffer[3];
-					iy[1][2] = blockBuffer[6];
-					iy[1][3] = blockBuffer[7];
-
-					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
-					iy[2][0] = blockBuffer[8];
-					iy[2][1] = blockBuffer[9];
-					iy[3][0] = blockBuffer[12];
-					iy[3][1] = blockBuffer[13];
-
-					ditherCodebookDetail(_curFrame.strips[strip].v4_codebook[stream.readByte()], blockBuffer);
-					iy[2][2] = blockBuffer[10];
-					iy[2][3] = blockBuffer[11];
-					iy[3][2] = blockBuffer[14];
-					iy[3][3] = blockBuffer[15];
-				}
-			}
-
-			for (byte i = 0; i < 4; i++)
-				iy[i] += 4;
-		}
-	}
-}
-
-void CinepakDecoder::ditherCodebookDetail(const CinepakCodebook &codebook, byte *dst) const {
-	int uLookup = (byte)codebook.u * 2;
-	int vLookup = (byte)codebook.v * 2;
-	uint32 uv1 = s_uLookup[uLookup] | s_vLookup[vLookup];
-	uint32 uv2 = s_uLookup[uLookup + 1] | s_vLookup[vLookup + 1];
-
-	int yLookup1 = codebook.y[0] * 2;
-	int yLookup2 = codebook.y[1] * 2;
-	int yLookup3 = codebook.y[2] * 2;
-	int yLookup4 = codebook.y[3] * 2;
-
-	uint32 pixelGroup1 = uv2 | s_yLookup[yLookup1 + 1];
-	uint32 pixelGroup2 = uv2 | s_yLookup[yLookup2 + 1];
-	uint32 pixelGroup3 = uv1 | s_yLookup[yLookup3];
-	uint32 pixelGroup4 = uv1 | s_yLookup[yLookup4];
-	uint32 pixelGroup5 = uv1 | s_yLookup[yLookup1];
-	uint32 pixelGroup6 = uv1 | s_yLookup[yLookup2];
-	uint32 pixelGroup7 = uv2 | s_yLookup[yLookup3 + 1];
-	uint32 pixelGroup8 = uv2 | s_yLookup[yLookup4 + 1];
-
-	dst[0] = getRGBLookupEntry(pixelGroup1 & 0xFFFF);
-	dst[1] = getRGBLookupEntry(pixelGroup2 >> 16);
-	dst[2] = getRGBLookupEntry(pixelGroup5 & 0xFFFF);
-	dst[3] = getRGBLookupEntry(pixelGroup6 >> 16);
-	dst[4] = getRGBLookupEntry(pixelGroup3 & 0xFFFF);
-	dst[5] = getRGBLookupEntry(pixelGroup4 >> 16);
-	dst[6] = getRGBLookupEntry(pixelGroup7 & 0xFFFF);
-	dst[7] = getRGBLookupEntry(pixelGroup8 >> 16);
-	dst[8] = getRGBLookupEntry(pixelGroup1 >> 16);
-	dst[9] = getRGBLookupEntry(pixelGroup6 & 0xFFFF);
-	dst[10] = getRGBLookupEntry(pixelGroup5 >> 16);
-	dst[11] = getRGBLookupEntry(pixelGroup2 & 0xFFFF);
-	dst[12] = getRGBLookupEntry(pixelGroup3 >> 16);
-	dst[13] = getRGBLookupEntry(pixelGroup8 & 0xFFFF);
-	dst[14] = getRGBLookupEntry(pixelGroup7 >> 16);
-	dst[15] = getRGBLookupEntry(pixelGroup4 & 0xFFFF);
-}
-
-void CinepakDecoder::ditherCodebookSmooth(const CinepakCodebook &codebook, byte *dst) const {
-	int uLookup = (byte)codebook.u * 2;
-	int vLookup = (byte)codebook.v * 2;
-	uint32 uv1 = s_uLookup[uLookup] | s_vLookup[vLookup];
-	uint32 uv2 = s_uLookup[uLookup + 1] | s_vLookup[vLookup + 1];
-
-	int yLookup1 = codebook.y[0] * 2;
-	int yLookup2 = codebook.y[1] * 2;
-	int yLookup3 = codebook.y[2] * 2;
-	int yLookup4 = codebook.y[3] * 2;
-
-	uint32 pixelGroup1 = uv2 | s_yLookup[yLookup1 + 1];
-	uint32 pixelGroup2 = uv1 | s_yLookup[yLookup2];
-	uint32 pixelGroup3 = uv1 | s_yLookup[yLookup1];
-	uint32 pixelGroup4 = uv2 | s_yLookup[yLookup2 + 1];
-	uint32 pixelGroup5 = uv2 | s_yLookup[yLookup3 + 1];
-	uint32 pixelGroup6 = uv1 | s_yLookup[yLookup3];
-	uint32 pixelGroup7 = uv1 | s_yLookup[yLookup4];
-	uint32 pixelGroup8 = uv2 | s_yLookup[yLookup4 + 1];
-
-	dst[0] = getRGBLookupEntry(pixelGroup1 & 0xFFFF);
-	dst[1] = getRGBLookupEntry(pixelGroup1 >> 16);
-	dst[2] = getRGBLookupEntry(pixelGroup2 & 0xFFFF);
-	dst[3] = getRGBLookupEntry(pixelGroup2 >> 16);
-	dst[4] = getRGBLookupEntry(pixelGroup3 & 0xFFFF);
-	dst[5] = getRGBLookupEntry(pixelGroup3 >> 16);
-	dst[6] = getRGBLookupEntry(pixelGroup4 & 0xFFFF);
-	dst[7] = getRGBLookupEntry(pixelGroup4 >> 16);
-	dst[8] = getRGBLookupEntry(pixelGroup5 >> 16);
-	dst[9] = getRGBLookupEntry(pixelGroup6 & 0xFFFF);
-	dst[10] = getRGBLookupEntry(pixelGroup7 >> 16);
-	dst[11] = getRGBLookupEntry(pixelGroup8 & 0xFFFF);
-	dst[12] = getRGBLookupEntry(pixelGroup6 >> 16);
-	dst[13] = getRGBLookupEntry(pixelGroup5 & 0xFFFF);
-	dst[14] = getRGBLookupEntry(pixelGroup8 >> 16);
-	dst[15] = getRGBLookupEntry(pixelGroup7 & 0xFFFF);
-}
-
-byte CinepakDecoder::getRGBLookupEntry(uint16 index) const {
-	return _colorMap[s_defaultPaletteLookup[CLIP<int>(index, 0, 1024)]];
+	decodeVectorsTmpl<byte, CodebookConverterDitherVFW>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
 }
 
 } // End of namespace Image
diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index ccdad0877c..02c09b6ddb 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -95,9 +95,6 @@ private:
 
 	byte findNearestRGB(int index) const;
 	void ditherVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize);
-	void ditherCodebookDetail(const CinepakCodebook &codebook, byte *dst) const;
-	void ditherCodebookSmooth(const CinepakCodebook &codebook, byte *dst) const;
-	byte getRGBLookupEntry(uint16 index) const;
 };
 
 } // End of namespace Image
-- 
cgit v1.2.3


From 0ceb383cd3f24bde6e9855f3b86f161eae3fb14b Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 5 Sep 2014 00:27:22 -0400
Subject: IMAGE: Add a function for generating QuickTime dither tables

Much thanks to fuzzie for her assistance.
---
 image/codecs/codec.cpp | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
 image/codecs/codec.h   |   6 ++
 2 files changed, 154 insertions(+)

diff --git a/image/codecs/codec.cpp b/image/codecs/codec.cpp
index 6b0c7ebcfb..398e9c562c 100644
--- a/image/codecs/codec.cpp
+++ b/image/codecs/codec.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/list.h"
 #include "common/scummsys.h"
 
 #include "image/codecs/codec.h"
@@ -44,6 +45,153 @@
 
 namespace Image {
 
+namespace {
+
+/**
+ * Add a color to the QuickTime dither table check queue if it hasn't already been found.
+ */
+inline void addColorToQueue(uint16 color, uint16 index, byte *checkBuffer, Common::List<uint16> &checkQueue) {
+	if ((READ_UINT16(checkBuffer + color * 2) & 0xFF) == 0) {
+		// Previously unfound color
+		WRITE_UINT16(checkBuffer + color * 2, index);
+		checkQueue.push_back(color);
+	}
+}
+
+inline byte adjustColorRange(byte currentColor, byte correctColor, byte palColor) {
+	return CLIP<int>(currentColor - palColor + correctColor, 0, 255);
+}
+
+inline uint16 makeQuickTimeDitherColor(byte r, byte g, byte b) {
+	// RGB554
+	return ((r & 0xF8) << 6) | ((g & 0xF8) << 1) | (b >> 4);
+}
+
+} // End of anonymous namespace
+
+byte *Codec::createQuickTimeDitherTable(const byte *palette, uint colorCount) {
+	byte *buf = new byte[0x10000];
+	memset(buf, 0, 0x10000);
+
+	Common::List<uint16> checkQueue;
+
+	bool foundBlack = false;
+	bool foundWhite = false;
+
+	const byte *palPtr = palette;
+
+	// See what colors we have, and add them to the queue to check
+	for (uint i = 0; i < colorCount; i++) {
+		byte r = *palPtr++;
+		byte g = *palPtr++;
+		byte b = *palPtr++;
+		uint16 n = (i << 8) | 1;
+		uint16 col = makeQuickTimeDitherColor(r, g, b);
+
+		if (col == 0) {
+			// Special case for close-to-black
+			// The original did more here, but it effectively discarded the value
+			// due to a poor if-check (whole 16-bit value instead of lower 8-bits).
+			WRITE_UINT16(buf, n);
+			foundBlack = true;
+		} else if (col == 0x3FFF) {
+			// Special case for close-to-white
+			// The original did more here, but it effectively discarded the value
+			// due to a poor if-check (whole 16-bit value instead of lower 8-bits).
+			WRITE_UINT16(buf + 0x7FFE, n);
+			foundWhite = true;
+		} else {
+			// Previously unfound color
+			addColorToQueue(col, n, buf, checkQueue);
+		}
+	}
+
+	// More special handling for white
+	if (foundWhite)
+		checkQueue.push_front(0x3FFF);
+
+	// More special handling for black
+	if (foundBlack)
+		checkQueue.push_front(0);
+
+	// Go through the list of colors we have and match up similar colors
+	// to fill in the table as best as we can.
+	while (!checkQueue.empty()) {
+		uint16 col = checkQueue.front();
+		checkQueue.pop_front();
+		uint16 index = READ_UINT16(buf + col * 2);
+
+		uint32 x = col << 4;
+		if ((x & 0xFF) < 0xF0)
+			addColorToQueue((x + 0x10) >> 4, index, buf, checkQueue);
+		if ((x & 0xFF) >= 0x10)
+			addColorToQueue((x - 0x10) >> 4, index, buf, checkQueue);
+
+		uint32 y = col << 7;
+		if ((y & 0xFF00) < 0xF800)
+			addColorToQueue((y + 0x800) >> 7, index, buf, checkQueue);
+		if ((y & 0xFF00) >= 0x800)
+			addColorToQueue((y - 0x800) >> 7, index, buf, checkQueue);
+
+		uint32 z = col << 2;
+		if ((z & 0xFF00) < 0xF800)
+			addColorToQueue((z + 0x800) >> 2, index, buf, checkQueue);
+		if ((z & 0xFF00) >= 0x800)
+			addColorToQueue((z - 0x800) >> 2, index, buf, checkQueue);
+	}
+
+	// Contract the table back to just palette entries
+	for (int i = 0; i < 0x4000; i++)
+		buf[i] = READ_UINT16(buf + i * 2) >> 8;
+
+	// Now go through and distribute the error to three more pixels
+	byte *bufPtr = buf;
+	for (uint realR = 0; realR < 0x100; realR += 8) {
+		for (uint realG = 0; realG < 0x100; realG += 8) {
+			for (uint realB = 0; realB < 0x100; realB += 16) {
+				byte palIndex = *bufPtr;
+				byte r = realR;
+				byte g = realG;
+				byte b = realB;
+
+				byte palR = palette[palIndex * 3] & 0xF8;
+				byte palG = palette[palIndex * 3 + 1] & 0xF8;
+				byte palB = palette[palIndex * 3 + 2] & 0xF0;
+
+				r = adjustColorRange(r, realR, palR);
+				g = adjustColorRange(g, realG, palG);
+				b = adjustColorRange(b, realB, palB);
+				palIndex = buf[makeQuickTimeDitherColor(r, g, b)];
+				bufPtr[0x4000] = palIndex;
+
+				palR = palette[palIndex * 3] & 0xF8;
+				palG = palette[palIndex * 3 + 1] & 0xF8;
+				palB = palette[palIndex * 3 + 2] & 0xF0;
+
+				r = adjustColorRange(r, realR, palR);
+				g = adjustColorRange(g, realG, palG);
+				b = adjustColorRange(b, realB, palB);
+				palIndex = buf[makeQuickTimeDitherColor(r, g, b)];
+				bufPtr[0x8000] = palIndex;
+
+				palR = palette[palIndex * 3] & 0xF8;
+				palG = palette[palIndex * 3 + 1] & 0xF8;
+				palB = palette[palIndex * 3 + 2] & 0xF0;
+
+				r = adjustColorRange(r, realR, palR);
+				g = adjustColorRange(g, realG, palG);
+				b = adjustColorRange(b, realB, palB);
+				palIndex = buf[makeQuickTimeDitherColor(r, g, b)];
+				bufPtr[0xC000] = palIndex;
+
+				bufPtr++;
+			}
+		}
+	}
+
+	return buf;
+}
+
 Codec *createBitmapCodec(uint32 tag, int width, int height, int bitsPerPixel) {
 	switch (tag) {
 	case SWAP_CONSTANT_32(0):
diff --git a/image/codecs/codec.h b/image/codecs/codec.h
index 9abbb3d183..ad7e43783c 100644
--- a/image/codecs/codec.h
+++ b/image/codecs/codec.h
@@ -107,6 +107,12 @@ public:
 	 * Activate dithering mode with a palette
 	 */
 	virtual void setDither(DitherType type, const byte *palette) {}
+
+protected:
+	/**
+	 * Create a dither table, as used by QuickTime codecs.
+	 */
+	static byte *createQuickTimeDitherTable(const byte *palette, uint colorCount);
 };
 
 /**
-- 
cgit v1.2.3


From c402d9a9594e5a2b38f834578b010d5cf9bb771e Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 5 Sep 2014 00:29:42 -0400
Subject: IMAGE: Add an unknown dither type

---
 image/codecs/codec.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/image/codecs/codec.h b/image/codecs/codec.h
index ad7e43783c..8845754d52 100644
--- a/image/codecs/codec.h
+++ b/image/codecs/codec.h
@@ -62,6 +62,9 @@ public:
 	 * A type of dithering.
 	 */
 	enum DitherType {
+		/** Unknown */
+		kDitherTypeUnknown,
+
 		/** Video for Windows dithering */
 		kDitherTypeVFW,
 
-- 
cgit v1.2.3


From 1271fbde8f30fdf2d0664bb1e3382928380f9aa9 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 5 Sep 2014 00:30:05 -0400
Subject: IMAGE: Add support for QuickTime dithered Cinepak

---
 image/codecs/cinepak.cpp | 124 +++++++++++++++++++++++++++++++++++++++++++----
 image/codecs/cinepak.h   |   3 ++
 2 files changed, 118 insertions(+), 9 deletions(-)

diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index f43c952c2c..32f6be2cd5 100644
--- a/image/codecs/cinepak.cpp
+++ b/image/codecs/cinepak.cpp
@@ -264,6 +264,37 @@ private:
 	}
 };
 
+/**
+ * Codebook converter that dithers in QT-style
+ */
+struct CodebookConverterDitherQT {
+	static inline void decodeBlock1(byte codebookIndex, const CinepakStrip &strip, byte *(&rows)[4], const byte *clipTable, const byte *colorMap, const Graphics::PixelFormat &format) {
+		const byte *colorPtr = strip.v1_dither + (codebookIndex << 2);
+		WRITE_UINT32(rows[0], READ_UINT32(colorPtr));
+		WRITE_UINT32(rows[1], READ_UINT32(colorPtr + 1024));
+		WRITE_UINT32(rows[2], READ_UINT32(colorPtr + 2048));
+		WRITE_UINT32(rows[3], READ_UINT32(colorPtr + 3072));
+	}
+
+	static inline void decodeBlock4(const byte (&codebookIndex)[4], const CinepakStrip &strip, byte *(&rows)[4], const byte *clipTable, const byte *colorMap, const Graphics::PixelFormat &format) {
+		const byte *colorPtr = strip.v4_dither + (codebookIndex[0] << 2);
+		WRITE_UINT16(rows[0] + 0, READ_UINT16(colorPtr + 0));
+		WRITE_UINT16(rows[1] + 0, READ_UINT16(colorPtr + 2));
+
+		colorPtr = strip.v4_dither + (codebookIndex[1] << 2);
+		WRITE_UINT16(rows[0] + 2, READ_UINT16(colorPtr + 1024));
+		WRITE_UINT16(rows[1] + 2, READ_UINT16(colorPtr + 1026));
+
+		colorPtr = strip.v4_dither + (codebookIndex[2] << 2);
+		WRITE_UINT16(rows[2] + 0, READ_UINT16(colorPtr + 2048));
+		WRITE_UINT16(rows[3] + 0, READ_UINT16(colorPtr + 2050));
+
+		colorPtr = strip.v4_dither + (codebookIndex[3] << 2);
+		WRITE_UINT16(rows[2] + 2, READ_UINT16(colorPtr + 3072));
+		WRITE_UINT16(rows[3] + 2, READ_UINT16(colorPtr + 3074));
+	}
+};
+
 template<typename PixelInt, typename CodebookConverter>
 void decodeVectorsTmpl(CinepakFrame &frame, const byte *clipTable, const byte *colorMap, Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
 	uint32 flag = 0, mask = 0;
@@ -306,8 +337,7 @@ void decodeVectorsTmpl(CinepakFrame &frame, const byte *clipTable, const byte *c
 						return;
 
 					byte codebook[4];
-					for (byte i = 0; i < 4; i++)
-						codebook[i] = stream.readByte();
+					stream.read(codebook, 4);
 					CodebookConverter::decodeBlock4(codebook, frame.strips[strip], iy, clipTable, colorMap, frame.surface->format);
 				}
 			}
@@ -326,6 +356,7 @@ CinepakDecoder::CinepakDecoder(int bitsPerPixel) : Codec(), _bitsPerPixel(bitsPe
 	_y = 0;
 	_colorMap = 0;
 	_ditherPalette = 0;
+	_ditherType = kDitherTypeUnknown;
 
 	if (bitsPerPixel == 8) {
 		_pixelFormat = Graphics::PixelFormat::createFormatCLUT8();
@@ -398,9 +429,12 @@ const Graphics::Surface *CinepakDecoder::decodeFrame(Common::SeekableReadStream
 
 	for (uint16 i = 0; i < _curFrame.stripCount; i++) {
 		if (i > 0 && !(_curFrame.flags & 1)) { // Use codebooks from last strip
+
 			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);
 			}
 		}
 
@@ -484,8 +518,7 @@ void CinepakDecoder::loadCodebook(Common::SeekableReadStream &stream, uint16 str
 			if ((stream.pos() - startPos + n) > (int32)chunkSize)
 				break;
 
-			for (byte j = 0; j < 4; j++)
-				codebook[i].y[j] = stream.readByte();
+			stream.read(codebook[i].y, 4);
 
 			if (n == 6) {
 				codebook[i].u = stream.readSByte();
@@ -497,10 +530,72 @@ void CinepakDecoder::loadCodebook(Common::SeekableReadStream &stream, uint16 str
 				codebook[i].u = 0;
 				codebook[i].v = 0;
 			}
+
+			// Dither the codebook if we're dithering for QuickTime
+			if (_ditherType == kDitherTypeQT)
+				ditherCodebookQT(strip, codebookType, i);
 		}
 	}
 }
 
+void CinepakDecoder::ditherCodebookQT(uint16 strip, byte codebookType, uint16 codebookIndex) {
+	if (codebookType == 1) {
+		const CinepakCodebook &codebook = _curFrame.strips[strip].v1_codebook[codebookIndex];
+		byte *output = _curFrame.strips[strip].v1_dither + (codebookIndex << 2);
+
+		byte *ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[0], codebook.u, codebook.v);
+		output[0x000] = ditherEntry[0x0000];
+		output[0x001] = ditherEntry[0x4000];
+		output[0x400] = ditherEntry[0xC000];
+		output[0x401] = ditherEntry[0x0000];
+
+		ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[1], codebook.u, codebook.v);
+		output[0x002] = ditherEntry[0x8000];
+		output[0x003] = ditherEntry[0xC000];
+		output[0x402] = ditherEntry[0x4000];
+		output[0x403] = ditherEntry[0x8000];
+
+		ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[2], codebook.u, codebook.v);
+		output[0x800] = ditherEntry[0x4000];
+		output[0x801] = ditherEntry[0x8000];
+		output[0xC00] = ditherEntry[0x8000];
+		output[0xC01] = ditherEntry[0xC000];
+
+		ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[3], codebook.u, codebook.v);
+		output[0x802] = ditherEntry[0xC000];
+		output[0x803] = ditherEntry[0x0000];
+		output[0xC02] = ditherEntry[0x0000];
+		output[0xC03] = ditherEntry[0x4000];
+	} else {
+		const CinepakCodebook &codebook = _curFrame.strips[strip].v4_codebook[codebookIndex];
+		byte *output = _curFrame.strips[strip].v4_dither + (codebookIndex << 2);
+
+		byte *ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[0], codebook.u, codebook.v);
+		output[0x000] = ditherEntry[0x0000];
+		output[0x400] = ditherEntry[0x8000];
+		output[0x800] = ditherEntry[0x4000];
+		output[0xC00] = ditherEntry[0xC000];
+
+		ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[1], codebook.u, codebook.v);
+		output[0x001] = ditherEntry[0x4000];
+		output[0x401] = ditherEntry[0xC000];
+		output[0x801] = ditherEntry[0x8000];
+		output[0xC01] = ditherEntry[0x0000];
+
+		ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[2], codebook.u, codebook.v);
+		output[0x002] = ditherEntry[0xC000];
+		output[0x402] = ditherEntry[0x4000];
+		output[0x802] = ditherEntry[0x8000];
+		output[0xC02] = ditherEntry[0x0000];
+
+		ditherEntry = _colorMap + createDitherTableIndex(_clipTable, codebook.y[3], codebook.u, codebook.v);
+		output[0x003] = ditherEntry[0x0000];
+		output[0x403] = ditherEntry[0x8000];
+		output[0x803] = ditherEntry[0xC000];
+		output[0xC03] = ditherEntry[0x4000];
+	}
+}
+
 void CinepakDecoder::decodeVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
 	if (_curFrame.surface->format.bytesPerPixel == 1) {
 		decodeVectorsTmpl<byte, CodebookConverterRaw>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
@@ -512,7 +607,7 @@ void CinepakDecoder::decodeVectors(Common::SeekableReadStream &stream, uint16 st
 }
 
 bool CinepakDecoder::canDither(DitherType type) const {
-	return type == kDitherTypeVFW && _bitsPerPixel == 24;
+	return (type == kDitherTypeVFW || type == kDitherTypeQT) && _bitsPerPixel == 24;
 }
 
 void CinepakDecoder::setDither(DitherType type, const byte *palette) {
@@ -526,10 +621,18 @@ void CinepakDecoder::setDither(DitherType type, const byte *palette) {
 
 	_dirtyPalette = true;
 	_pixelFormat = Graphics::PixelFormat::createFormatCLUT8();
-	_colorMap = new byte[221];
+	_ditherType = type;
+
+	if (type == kDitherTypeVFW) {
+		_colorMap = new byte[221];
 
-	for (int i = 0; i < 221; i++)
-		_colorMap[i] = findNearestRGB(i);
+		for (int i = 0; i < 221; i++)
+			_colorMap[i] = findNearestRGB(i);
+	} else {
+		// Generate QuickTime dither table
+		// 4 blocks of 0x4000 bytes (RGB554 lookup)
+		_colorMap = createQuickTimeDitherTable(palette, 256);
+	}
 }
 
 byte CinepakDecoder::findNearestRGB(int index) const {
@@ -567,7 +670,10 @@ byte CinepakDecoder::findNearestRGB(int index) const {
 }
 
 void CinepakDecoder::ditherVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize) {
-	decodeVectorsTmpl<byte, CodebookConverterDitherVFW>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
+	if (_ditherType == kDitherTypeVFW)
+		decodeVectorsTmpl<byte, CodebookConverterDitherVFW>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
+	else
+		decodeVectorsTmpl<byte, CodebookConverterDitherQT>(_curFrame, _clipTable, _colorMap, stream, strip, chunkID, chunkSize);
 }
 
 } // End of namespace Image
diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index 02c09b6ddb..dc8172ea0f 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -46,6 +46,7 @@ struct CinepakStrip {
 	uint16 length;
 	Common::Rect rect;
 	CinepakCodebook v1_codebook[256], v4_codebook[256];
+	byte v1_dither[256 * 4 * 4 * 4], v4_dither[256 * 4 * 4 * 4];
 };
 
 struct CinepakFrame {
@@ -89,12 +90,14 @@ private:
 	bool _dirtyPalette;
 	byte *_rgbLookup;
 	byte *_colorMap;
+	DitherType _ditherType;
 
 	void loadCodebook(Common::SeekableReadStream &stream, uint16 strip, byte codebookType, byte chunkID, uint32 chunkSize);
 	void decodeVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize);
 
 	byte findNearestRGB(int index) const;
 	void ditherVectors(Common::SeekableReadStream &stream, uint16 strip, byte chunkID, uint32 chunkSize);
+	void ditherCodebookQT(uint16 strip, byte codebookType, uint16 codebookIndex);
 };
 
 } // End of namespace Image
-- 
cgit v1.2.3


From b170b0882237a4c8b8119d2875bf2e05c03168e5 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 5 Sep 2014 21:03:52 -0400
Subject: VIDEO: Add support for dithering in QuickTime videos

---
 video/qt_decoder.cpp | 23 +++++++++++++++++++++++
 video/qt_decoder.h   |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 9b77ef70c1..cab7372a6d 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -751,4 +751,27 @@ bool QuickTimeDecoder::VideoTrackHandler::endOfCurEdit() const {
 	return getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration();
 }
 
+bool QuickTimeDecoder::VideoTrackHandler::canDither() const {
+	for (uint i = 0; i < _parent->sampleDescs.size(); i++) {
+		VideoSampleDesc *desc = (VideoSampleDesc *)_parent->sampleDescs[i];
+
+		if (!desc || !desc->_videoCodec)
+			return false;
+
+		if (!desc->_videoCodec->canDither(Image::Codec::kDitherTypeQT))
+			return false;
+	}
+
+	return true;
+}
+
+void QuickTimeDecoder::VideoTrackHandler::setDither(const byte *palette) {
+	assert(canDither());
+
+	for (uint i = 0; i < _parent->sampleDescs.size(); i++) {
+		VideoSampleDesc *desc = (VideoSampleDesc *)_parent->sampleDescs[i];
+		desc->_videoCodec->setDither(Image::Codec::kDitherTypeQT, palette);
+	}
+}
+
 } // End of namespace Video
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 99ac9ff5f7..99980a303d 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -140,6 +140,8 @@ private:
 		bool hasDirtyPalette() const { return _curPalette; }
 		bool setReverse(bool reverse);
 		bool isReversed() const { return _reversed; }
+		bool canDither() const;
+		void setDither(const byte *palette);
 
 		Common::Rational getScaledWidth() const;
 		Common::Rational getScaledHeight() const;
-- 
cgit v1.2.3


From 7f12db95c6c7689f7f7f8905aaf122db6de13e4f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 30 Dec 2014 15:49:27 -0500
Subject: IMAGE: Implement QuickTime dithering in rpza

---
 image/codecs/rpza.cpp | 270 ++++++++++++++++++++++++++++++++++++++++----------
 image/codecs/rpza.h   |  14 ++-
 2 files changed, 230 insertions(+), 54 deletions(-)

diff --git a/image/codecs/rpza.cpp b/image/codecs/rpza.cpp
index 5aeee7c90b..8d648e1cc1 100644
--- a/image/codecs/rpza.cpp
+++ b/image/codecs/rpza.cpp
@@ -32,43 +32,185 @@
 namespace Image {
 
 RPZADecoder::RPZADecoder(uint16 width, uint16 height) : Codec() {
-	// We need to increase the surface size to a multiple of 4
-	uint16 wMod = width % 4;
-	if (wMod != 0)
-		width += 4 - wMod;
-
-	_surface = new Graphics::Surface();
-	_surface->create(width, height, getPixelFormat());
+	_format = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
+	_ditherPalette = 0;
+	_dirtyPalette = false;
+	_colorMap = 0;
+	_width = width;
+	_height = height;
+	_blockWidth = (width + 3) / 4;
+	_blockHeight = (height + 3) / 4;
+	_surface = 0;
 }
 
 RPZADecoder::~RPZADecoder() {
-	_surface->free();
-	delete _surface;
+	if (_surface) {
+		_surface->free();
+		delete _surface;
+	}
+
+	delete[] _ditherPalette;
 }
 
 #define ADVANCE_BLOCK() \
-	pixelPtr += 4; \
-	if (pixelPtr >= _surface->w) { \
-		pixelPtr = 0; \
-		rowPtr += _surface->w * 4; \
+	blockPtr += 4; \
+	if (blockPtr >= endPtr) { \
+		blockPtr += pitch * 3; \
+		endPtr = blockPtr + pitch; \
 	} \
 	totalBlocks--; \
 	if (totalBlocks < 0) \
 		error("rpza block counter just went negative (this should not happen)") \
 
-#define PUT_PIXEL(color) \
-	if ((int32)blockPtr < _surface->w * _surface->h) \
-		WRITE_UINT16((uint16 *)_surface->getPixels() + blockPtr, color); \
-	blockPtr++
+struct BlockDecoderRaw {
+	static inline void drawFillBlock(uint16 *blockPtr, uint16 pitch, uint16 color, const byte *colorMap) {
+		blockPtr[0] = color;
+		blockPtr[1] = color;
+		blockPtr[2] = color;
+		blockPtr[3] = color;
+		blockPtr += pitch;
+		blockPtr[0] = color;
+		blockPtr[1] = color;
+		blockPtr[2] = color;
+		blockPtr[3] = color;
+		blockPtr += pitch;
+		blockPtr[0] = color;
+		blockPtr[1] = color;
+		blockPtr[2] = color;
+		blockPtr[3] = color;
+		blockPtr += pitch;
+		blockPtr[0] = color;
+		blockPtr[1] = color;
+		blockPtr[2] = color;
+		blockPtr[3] = color;
+	}
 
-const Graphics::Surface *RPZADecoder::decodeFrame(Common::SeekableReadStream &stream) {
+	static inline void drawRawBlock(uint16 *blockPtr, uint16 pitch, const uint16 (&colors)[16], const byte *colorMap) {
+		blockPtr[0] = colors[0];
+		blockPtr[1] = colors[1];
+		blockPtr[2] = colors[2];
+		blockPtr[3] = colors[3];
+		blockPtr += pitch;
+		blockPtr[0] = colors[4];
+		blockPtr[1] = colors[5];
+		blockPtr[2] = colors[6];
+		blockPtr[3] = colors[7];
+		blockPtr += pitch;
+		blockPtr[0] = colors[8];
+		blockPtr[1] = colors[9];
+		blockPtr[2] = colors[10];
+		blockPtr[3] = colors[11];
+		blockPtr += pitch;
+		blockPtr[0] = colors[12];
+		blockPtr[1] = colors[13];
+		blockPtr[2] = colors[14];
+		blockPtr[3] = colors[15];
+	}
+
+	static inline void drawBlendBlock(uint16 *blockPtr, uint16 pitch, const uint16 (&colors)[4], const byte (&indexes)[4], const byte *colorMap) {
+		blockPtr[0] = colors[(indexes[0] >> 6) & 0x03];
+		blockPtr[1] = colors[(indexes[0] >> 4) & 0x03];
+		blockPtr[2] = colors[(indexes[0] >> 2) & 0x03];
+		blockPtr[3] = colors[(indexes[0] >> 0) & 0x03];
+		blockPtr += pitch;
+		blockPtr[0] = colors[(indexes[1] >> 6) & 0x03];
+		blockPtr[1] = colors[(indexes[1] >> 4) & 0x03];
+		blockPtr[2] = colors[(indexes[1] >> 2) & 0x03];
+		blockPtr[3] = colors[(indexes[1] >> 0) & 0x03];
+		blockPtr += pitch;
+		blockPtr[0] = colors[(indexes[2] >> 6) & 0x03];
+		blockPtr[1] = colors[(indexes[2] >> 4) & 0x03];
+		blockPtr[2] = colors[(indexes[2] >> 2) & 0x03];
+		blockPtr[3] = colors[(indexes[2] >> 0) & 0x03];
+		blockPtr += pitch;
+		blockPtr[0] = colors[(indexes[3] >> 6) & 0x03];
+		blockPtr[1] = colors[(indexes[3] >> 4) & 0x03];
+		blockPtr[2] = colors[(indexes[3] >> 2) & 0x03];
+		blockPtr[3] = colors[(indexes[3] >> 0) & 0x03];
+	}
+};
+
+struct BlockDecoderDither {
+	static inline void drawFillBlock(byte *blockPtr, uint16 pitch, uint16 color, const byte *colorMap) {
+		const byte *mapOffset = colorMap + (color >> 1);
+		byte pixel1 = mapOffset[0x0000];
+		byte pixel2 = mapOffset[0x4000];
+		byte pixel3 = mapOffset[0x8000];
+		byte pixel4 = mapOffset[0xC000];
+
+		blockPtr[0] = pixel1;
+		blockPtr[1] = pixel2;
+		blockPtr[2] = pixel3;
+		blockPtr[3] = pixel4;
+		blockPtr += pitch;
+		blockPtr[0] = pixel4;
+		blockPtr[1] = pixel1;
+		blockPtr[2] = pixel2;
+		blockPtr[3] = pixel3;
+		blockPtr += pitch;
+		blockPtr[0] = pixel2;
+		blockPtr[1] = pixel3;
+		blockPtr[2] = pixel4;
+		blockPtr[3] = pixel1;
+		blockPtr += pitch;
+		blockPtr[0] = pixel3;
+		blockPtr[1] = pixel4;
+		blockPtr[2] = pixel1;
+		blockPtr[3] = pixel2;
+	}
+
+	static inline void drawRawBlock(byte *blockPtr, uint16 pitch, const uint16 (&colors)[16], const byte *colorMap) {
+		blockPtr[0] = colorMap[(colors[0] >> 1) + 0x0000];
+		blockPtr[1] = colorMap[(colors[1] >> 1) + 0x4000];
+		blockPtr[2] = colorMap[(colors[2] >> 1) + 0x8000];
+		blockPtr[3] = colorMap[(colors[3] >> 1) + 0xC000];
+		blockPtr += pitch;
+		blockPtr[0] = colorMap[(colors[4] >> 1) + 0xC000];
+		blockPtr[1] = colorMap[(colors[5] >> 1) + 0x0000];
+		blockPtr[2] = colorMap[(colors[6] >> 1) + 0x4000];
+		blockPtr[3] = colorMap[(colors[7] >> 1) + 0x8000];
+		blockPtr += pitch;
+		blockPtr[0] = colorMap[(colors[8] >> 1) + 0x4000];
+		blockPtr[1] = colorMap[(colors[9] >> 1) + 0x8000];
+		blockPtr[2] = colorMap[(colors[10] >> 1) + 0xC000];
+		blockPtr[3] = colorMap[(colors[11] >> 1) + 0x0000];
+		blockPtr += pitch;
+		blockPtr[0] = colorMap[(colors[12] >> 1) + 0x8000];
+		blockPtr[1] = colorMap[(colors[13] >> 1) + 0xC000];
+		blockPtr[2] = colorMap[(colors[14] >> 1) + 0x0000];
+		blockPtr[3] = colorMap[(colors[15] >> 1) + 0x4000];
+	}
+
+	static inline void drawBlendBlock(byte *blockPtr, uint16 pitch, const uint16 (&colors)[4], const byte (&indexes)[4], const byte *colorMap) {
+		blockPtr[0] = colorMap[(colors[(indexes[0] >> 6) & 0x03] >> 1) + 0x0000];
+		blockPtr[1] = colorMap[(colors[(indexes[0] >> 4) & 0x03] >> 1) + 0x4000];
+		blockPtr[2] = colorMap[(colors[(indexes[0] >> 2) & 0x03] >> 1) + 0x8000];
+		blockPtr[3] = colorMap[(colors[(indexes[0] >> 0) & 0x03] >> 1) + 0xC000];
+		blockPtr += pitch;
+		blockPtr[0] = colorMap[(colors[(indexes[1] >> 6) & 0x03] >> 1) + 0xC000];
+		blockPtr[1] = colorMap[(colors[(indexes[1] >> 4) & 0x03] >> 1) + 0x0000];
+		blockPtr[2] = colorMap[(colors[(indexes[1] >> 2) & 0x03] >> 1) + 0x4000];
+		blockPtr[3] = colorMap[(colors[(indexes[1] >> 0) & 0x03] >> 1) + 0x8000];
+		blockPtr += pitch;
+		blockPtr[0] = colorMap[(colors[(indexes[2] >> 6) & 0x03] >> 1) + 0x4000];
+		blockPtr[1] = colorMap[(colors[(indexes[2] >> 4) & 0x03] >> 1) + 0x8000];
+		blockPtr[2] = colorMap[(colors[(indexes[2] >> 2) & 0x03] >> 1) + 0xC000];
+		blockPtr[3] = colorMap[(colors[(indexes[2] >> 0) & 0x03] >> 1) + 0x0000];
+		blockPtr += pitch;
+		blockPtr[0] = colorMap[(colors[(indexes[3] >> 6) & 0x03] >> 1) + 0x8000];
+		blockPtr[1] = colorMap[(colors[(indexes[3] >> 4) & 0x03] >> 1) + 0xC000];
+		blockPtr[2] = colorMap[(colors[(indexes[3] >> 2) & 0x03] >> 1) + 0x0000];
+		blockPtr[3] = colorMap[(colors[(indexes[3] >> 0) & 0x03] >> 1) + 0x4000];
+	}
+};
+
+template<typename PixelInt, typename BlockDecoder>
+static inline void decodeFrameTmpl(Common::SeekableReadStream &stream, PixelInt *ptr, uint16 pitch, uint16 blockWidth, uint16 blockHeight, const byte *colorMap) {
 	uint16 colorA = 0, colorB = 0;
 	uint16 color4[4];
 
-	uint32 rowPtr = 0;
-	uint32 pixelPtr = 0;
-	uint32 blockPtr = 0;
-	uint32 rowInc = _surface->w - 4;
+	PixelInt *blockPtr = ptr;
+	PixelInt *endPtr = ptr + pitch;
 	uint16 ta;
 	uint16 tb;
 
@@ -88,7 +230,7 @@ const Graphics::Surface *RPZADecoder::decodeFrame(Common::SeekableReadStream &st
 	}
 
 	// Number of 4x4 blocks in frame
-	int32 totalBlocks = ((_surface->w + 3) / 4) * ((_surface->h + 3) / 4);
+	int32 totalBlocks = blockWidth * blockHeight;
 
 	// Process chunk data
 	while ((uint32)stream.pos() < chunkSize) {
@@ -117,14 +259,9 @@ const Graphics::Surface *RPZADecoder::decodeFrame(Common::SeekableReadStream &st
 			break;
 		case 0xa0: // Fill blocks with one color
 			colorA = stream.readUint16BE();
+
 			while (numBlocks--) {
-				blockPtr = rowPtr + pixelPtr;
-				for (byte pixel_y = 0; pixel_y < 4; pixel_y++) {
-					for (byte pixel_x = 0; pixel_x < 4; pixel_x++) {
-						PUT_PIXEL(colorA);
-					}
-					blockPtr += rowInc;
-				}
+				BlockDecoder::drawFillBlock(blockPtr, pitch, colorA, colorMap);
 				ADVANCE_BLOCK();
 			}
 			break;
@@ -136,10 +273,10 @@ const Graphics::Surface *RPZADecoder::decodeFrame(Common::SeekableReadStream &st
 			colorB = stream.readUint16BE();
 
 			// Sort out the colors
-			color4[0] = colorB;
+			color4[0] = colorB & 0x7FFF;
 			color4[1] = 0;
 			color4[2] = 0;
-			color4[3] = colorA;
+			color4[3] = colorA & 0x7FFF;
 
 			// Red components
 			ta = (colorA >> 10) & 0x1F;
@@ -160,42 +297,69 @@ const Graphics::Surface *RPZADecoder::decodeFrame(Common::SeekableReadStream &st
 			color4[2] |= ((21 * ta + 11 * tb) >> 5);
 
 			while (numBlocks--) {
-				blockPtr = rowPtr + pixelPtr;
-				for (byte pixel_y = 0; pixel_y < 4; pixel_y++) {
-					byte index = stream.readByte();
-					for (byte pixel_x = 0; pixel_x < 4; pixel_x++) {
-						byte idx = (index >> (2 * (3 - pixel_x))) & 0x03;
-						PUT_PIXEL(color4[idx]);
-					}
-					blockPtr += rowInc;
-				}
+				byte indexes[4];
+				stream.read(indexes, 4);
+
+				BlockDecoder::drawBlendBlock(blockPtr, pitch, color4, indexes, colorMap);
 				ADVANCE_BLOCK();
 			}
 			break;
 
 		// Fill block with 16 colors
-		case 0x00:
-			blockPtr = rowPtr + pixelPtr;
-			for (byte pixel_y = 0; pixel_y < 4; pixel_y++) {
-				for (byte pixel_x = 0; pixel_x < 4; pixel_x++) {
-					// We already have color of upper left pixel
-					if (pixel_y != 0 || pixel_x != 0)
-						colorA = stream.readUint16BE();
-
-					PUT_PIXEL(colorA);
-				}
-				blockPtr += rowInc;
-			}
+		case 0x00: {
+			uint16 colors[16];
+			colors[0] = colorA;
+
+			for (int i = 0; i < 15; i++)
+				colors[i + 1] = stream.readUint16BE();
+
+			BlockDecoder::drawRawBlock(blockPtr, pitch, colors, colorMap);
 			ADVANCE_BLOCK();
 			break;
+		}
 
 		// Unknown opcode
 		default:
 			error("Unknown opcode %02x in rpza chunk", opcode);
 		}
 	}
+}
+
+const Graphics::Surface *RPZADecoder::decodeFrame(Common::SeekableReadStream &stream) {
+	if (!_surface) {
+		_surface = new Graphics::Surface();
+
+		// Allocate enough space in the surface for the blocks
+		_surface->create(_blockWidth * 4, _blockHeight * 4, getPixelFormat());
+
+		// Adjust width/height to be the right ones
+		_surface->w = _width;
+		_surface->h = _height;
+	}
+
+	if (_colorMap)
+		decodeFrameTmpl<byte, BlockDecoderDither>(stream, (byte *)_surface->getPixels(), _surface->pitch, _blockWidth, _blockHeight, _colorMap);
+	else
+		decodeFrameTmpl<uint16, BlockDecoderRaw>(stream, (uint16 *)_surface->getPixels(), _surface->pitch / 2, _blockWidth, _blockHeight, _colorMap);
 
 	return _surface;
 }
 
+bool RPZADecoder::canDither(DitherType type) const {
+	return type == kDitherTypeQT;
+}
+
+void RPZADecoder::setDither(DitherType type, const byte *palette) {
+	assert(canDither(type));
+
+	_ditherPalette = new byte[256 * 3];
+	memcpy(_ditherPalette, palette, 256 * 3);
+
+	_dirtyPalette = true;
+	_format = Graphics::PixelFormat::createFormatCLUT8();
+
+	delete[] _colorMap;
+	_colorMap = createQuickTimeDitherTable(palette, 256);
+}
+
 } // End of namespace Image
diff --git a/image/codecs/rpza.h b/image/codecs/rpza.h
index d1dbbdb676..d62b385330 100644
--- a/image/codecs/rpza.h
+++ b/image/codecs/rpza.h
@@ -39,10 +39,22 @@ public:
 	~RPZADecoder();
 
 	const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);
-	Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); }
+	Graphics::PixelFormat getPixelFormat() const { return _format; }
+
+	bool containsPalette() const { return _ditherPalette != 0; }
+	const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; }
+	bool hasDirtyPalette() const { return _dirtyPalette; }
+	bool canDither(DitherType type) const;
+	void setDither(DitherType type, const byte *palette);
 
 private:
+	Graphics::PixelFormat _format;
 	Graphics::Surface *_surface;
+	byte *_ditherPalette;
+	bool _dirtyPalette;
+	byte *_colorMap;
+	uint16 _width, _height;
+	uint16 _blockWidth, _blockHeight;
 };
 
 } // End of namespace Image
-- 
cgit v1.2.3


From 94b317b0cd979bd924da14d8e3925c6c324692e6 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 15 Mar 2015 19:35:13 -0400
Subject: IMAGE: Implement QTRLE dithering

---
 image/codecs/qtrle.cpp | 164 +++++++++++++++++++++++++++++++++++++++++--------
 image/codecs/qtrle.h   |  15 ++++-
 2 files changed, 153 insertions(+), 26 deletions(-)

diff --git a/image/codecs/qtrle.cpp b/image/codecs/qtrle.cpp
index 94744efa5a..8a83cfa2bd 100644
--- a/image/codecs/qtrle.cpp
+++ b/image/codecs/qtrle.cpp
@@ -37,27 +37,45 @@ namespace Image {
 
 QTRLEDecoder::QTRLEDecoder(uint16 width, uint16 height, byte bitsPerPixel) : Codec() {
 	_bitsPerPixel = bitsPerPixel;
+	_ditherPalette = 0;
+	_width = width;
+	_height = height;
+	_surface = 0;
+	_dirtyPalette = false;
+	_colorMap = 0;
 
 	// We need to ensure the width is a multiple of 4
+	_paddedWidth = width;
 	uint16 wMod = width % 4;
 	if (wMod != 0)
-		width += 4 - wMod;
+		_paddedWidth += 4 - wMod;
+}
 
-	_surface = new Graphics::Surface();
-	_surface->create(width, height, getPixelFormat());
+QTRLEDecoder::~QTRLEDecoder() {
+	if (_surface) {
+		_surface->free();
+		delete _surface;
+	}
+
+	delete[] _colorMap;
+	delete[] _ditherPalette;
 }
 
 #define CHECK_STREAM_PTR(n) \
-  if ((stream.pos() + n) > stream.size()) { \
-    warning("QTRLE Problem: stream out of bounds (%d > %d)", stream.pos() + n, stream.size()); \
-    return; \
-  }
+	do { \
+		if ((stream.pos() + n) > stream.size()) { \
+			warning("QTRLE Problem: stream out of bounds (%d > %d)", stream.pos() + n, stream.size()); \
+			return; \
+		} \
+	} while (0)
 
 #define CHECK_PIXEL_PTR(n) \
-  if ((int32)pixelPtr + n > _surface->w * _surface->h) { \
-    warning("QTRLE Problem: pixel ptr = %d, pixel limit = %d", pixelPtr + n, _surface->w * _surface->h); \
-    return; \
-  } \
+	do { \
+		if ((int32)pixelPtr + n > (int)_paddedWidth * _surface->h) { \
+			warning("QTRLE Problem: pixel ptr = %d, pixel limit = %d", pixelPtr + n, _paddedWidth * _surface->h); \
+			return; \
+		} \
+	} while (0)
 
 void QTRLEDecoder::decode1(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange) {
 	uint32 pixelPtr = 0;
@@ -73,7 +91,7 @@ void QTRLEDecoder::decode1(Common::SeekableReadStream &stream, uint32 rowPtr, ui
 
 		if (skip & 0x80) {
 			linesToChange--;
-			rowPtr += _surface->w;
+			rowPtr += _paddedWidth;
 			pixelPtr = rowPtr + 2 * (skip & 0x7f);
 		} else
 			pixelPtr += 2 * skip;
@@ -159,7 +177,7 @@ void QTRLEDecoder::decode2_4(Common::SeekableReadStream &stream, uint32 rowPtr,
 			}
 		}
 
-		rowPtr += _surface->w;
+		rowPtr += _paddedWidth;
 	}
 }
 
@@ -204,7 +222,7 @@ void QTRLEDecoder::decode8(Common::SeekableReadStream &stream, uint32 rowPtr, ui
 			}
 		}
 
-		rowPtr += _surface->w;
+		rowPtr += _paddedWidth;
 	}
 }
 
@@ -242,7 +260,7 @@ void QTRLEDecoder::decode16(Common::SeekableReadStream &stream, uint32 rowPtr, u
 			}
 		}
 
-		rowPtr += _surface->w;
+		rowPtr += _paddedWidth;
 	}
 }
 
@@ -288,7 +306,72 @@ void QTRLEDecoder::decode24(Common::SeekableReadStream &stream, uint32 rowPtr, u
 			}
 		}
 
-		rowPtr += _surface->w;
+		rowPtr += _paddedWidth;
+	}
+}
+
+namespace {
+
+inline uint16 readDitherColor24(Common::ReadStream &stream) {
+	uint16 color = (stream.readByte() & 0xF8) << 6;
+	color |= (stream.readByte() & 0xF8) << 1;
+	color |= stream.readByte() >> 4;
+	return color;
+}
+
+} // End of anonymous namespace
+
+void QTRLEDecoder::dither24(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange) {
+	uint32 pixelPtr = 0;
+	byte *output = (byte *)_surface->getPixels();
+
+	static const uint16 colorTableOffsets[] = { 0x0000, 0xC000, 0x4000, 0x8000 };
+
+	// clone2727 thinks this should be startLine & 3, but the original definitely
+	// isn't doing this. Unless startLine & 3 is always 0? Kinda defeats the
+	// purpose of the compression then.
+	byte curColorTableOffset = 0;
+
+	while (linesToChange--) {
+		CHECK_STREAM_PTR(2);
+
+		byte rowOffset = stream.readByte() - 1;
+		pixelPtr = rowPtr + rowOffset;
+		uint16 colorTableOffset = colorTableOffsets[curColorTableOffset] + (rowOffset << 14);
+
+		for (int8 rleCode = stream.readSByte(); rleCode != -1; rleCode = stream.readSByte()) {
+			if (rleCode == 0) {
+				// there's another skip code in the stream
+				CHECK_STREAM_PTR(1);
+				pixelPtr += stream.readByte() - 1;
+			} else if (rleCode < 0) {
+				// decode the run length code
+				rleCode = -rleCode;
+
+				CHECK_STREAM_PTR(3);
+				CHECK_PIXEL_PTR(rleCode);
+
+				uint16 color = readDitherColor24(stream);
+
+				while (rleCode--) {
+					output[pixelPtr++] = _colorMap[colorTableOffset + color];
+					colorTableOffset += 0x4000;
+				}
+			} else {
+				CHECK_STREAM_PTR(rleCode * 3);
+				CHECK_PIXEL_PTR(rleCode);
+
+				// copy pixels directly to output
+				while (rleCode--) {
+					uint16 color = readDitherColor24(stream);
+					output[pixelPtr++] = _colorMap[colorTableOffset + color];
+					colorTableOffset += 0x4000;
+				}
+			}
+		}
+
+		rowPtr += _paddedWidth;
+		curColorTableOffset = (curColorTableOffset + 1) & 3;
 	}
 }
 
@@ -336,13 +419,16 @@ void QTRLEDecoder::decode32(Common::SeekableReadStream &stream, uint32 rowPtr, u
 			}
 		}
 
-		rowPtr += _surface->w;
+		rowPtr += _paddedWidth;
 	}
 }
 
 const Graphics::Surface *QTRLEDecoder::decodeFrame(Common::SeekableReadStream &stream) {
+	if (!_surface)
+		createSurface();
+
 	uint16 startLine = 0;
-	uint16 height = _surface->h;
+	uint16 height = _height;
 
 	// check if this frame is even supposed to change
 	if (stream.size() < 8)
@@ -365,7 +451,7 @@ const Graphics::Surface *QTRLEDecoder::decodeFrame(Common::SeekableReadStream &s
 		stream.readUint16BE(); // Unknown
 	}
 
-	uint32 rowPtr = _surface->w * startLine;
+	uint32 rowPtr = _paddedWidth * startLine;
 
 	switch (_bitsPerPixel) {
 	case 1:
@@ -388,7 +474,10 @@ const Graphics::Surface *QTRLEDecoder::decodeFrame(Common::SeekableReadStream &s
 		decode16(stream, rowPtr, height);
 		break;
 	case 24:
-		decode24(stream, rowPtr, height);
+		if (_ditherPalette)
+			dither24(stream, rowPtr, height);
+		else
+			decode24(stream, rowPtr, height);
 		break;
 	case 32:
 		decode32(stream, rowPtr, height);
@@ -400,12 +489,10 @@ const Graphics::Surface *QTRLEDecoder::decodeFrame(Common::SeekableReadStream &s
 	return _surface;
 }
 
-QTRLEDecoder::~QTRLEDecoder() {
-	_surface->free();
-	delete _surface;
-}
-
 Graphics::PixelFormat QTRLEDecoder::getPixelFormat() const {
+	if (_ditherPalette)
+		return Graphics::PixelFormat::createFormatCLUT8();
+
 	switch (_bitsPerPixel) {
 	case 1:
 	case 33:
@@ -428,4 +515,31 @@ Graphics::PixelFormat QTRLEDecoder::getPixelFormat() const {
 	return Graphics::PixelFormat();
 }
 
+bool QTRLEDecoder::canDither(DitherType type) const {
+	// Only 24-bit dithering is implemented at the moment
+	return type == kDitherTypeQT && _bitsPerPixel == 24;
+}
+
+void QTRLEDecoder::setDither(DitherType type, const byte *palette) {
+	assert(canDither(type));
+
+	_ditherPalette = new byte[256 * 3];
+	memcpy(_ditherPalette, palette, 256 * 3);
+	_dirtyPalette = true;
+
+	delete[] _colorMap;
+	_colorMap = createQuickTimeDitherTable(palette, 256);
+}
+
+void QTRLEDecoder::createSurface() {
+	if (_surface) {
+		_surface->free();
+		delete _surface;
+	}	
+
+	_surface = new Graphics::Surface();
+	_surface->create(_paddedWidth, _height, getPixelFormat());
+	_surface->w = _width;
+}
+
 } // End of namespace Image
diff --git a/image/codecs/qtrle.h b/image/codecs/qtrle.h
index b44a46c3e2..e345fbeedf 100644
--- a/image/codecs/qtrle.h
+++ b/image/codecs/qtrle.h
@@ -41,16 +41,29 @@ public:
 	const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);
 	Graphics::PixelFormat getPixelFormat() const;
 
+	bool containsPalette() const { return _ditherPalette != 0; }
+	const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; }
+	bool hasDirtyPalette() const { return _dirtyPalette; }
+	bool canDither(DitherType type) const;
+	void setDither(DitherType type, const byte *palette);
+
 private:
 	byte _bitsPerPixel;
-
 	Graphics::Surface *_surface;
+	uint16 _width, _height;
+	uint32 _paddedWidth;
+	byte *_ditherPalette;
+	bool _dirtyPalette;
+	byte *_colorMap;
+
+	void createSurface();
 
 	void decode1(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange);
 	void decode2_4(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange, byte bpp);
 	void decode8(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange);
 	void decode16(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange);
 	void decode24(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange);
+	void dither24(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange);
 	void decode32(Common::SeekableReadStream &stream, uint32 rowPtr, uint32 linesToChange);
 };
 
-- 
cgit v1.2.3


From a5992a08a02d86e33eb9c30dc8c6dd6fcb0bdf77 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 22 Aug 2013 20:37:16 -0400
Subject: MOHAWK: Run Myst in 8bpp

---
 engines/mohawk/cursors.cpp          |   6 +-
 engines/mohawk/myst.cpp             |  12 ++-
 engines/mohawk/myst_graphics.cpp    | 165 +++++++++++++++++++++++++-----------
 engines/mohawk/myst_graphics.h      |  27 +++---
 engines/mohawk/myst_stacks/myst.cpp |  20 +++--
 engines/mohawk/video.cpp            |  46 +++++++++-
 engines/mohawk/video.h              |   4 +
 7 files changed, 205 insertions(+), 75 deletions(-)

diff --git a/engines/mohawk/cursors.cpp b/engines/mohawk/cursors.cpp
index f1baac02e2..4b66829e6a 100644
--- a/engines/mohawk/cursors.cpp
+++ b/engines/mohawk/cursors.cpp
@@ -122,7 +122,11 @@ void MystCursorManager::setCursor(uint16 id) {
 	// Myst ME stores some cursors as 24bpp images instead of 8bpp
 	if (surface->format.bytesPerPixel == 1) {
 		CursorMan.replaceCursor(surface->getPixels(), surface->w, surface->h, hotspotX, hotspotY, 0);
-		CursorMan.replaceCursorPalette(mhkSurface->getPalette(), 0, 256);
+
+		// We're using the screen palette for the original game, but we need
+		// to use this for any 8bpp cursor in ME.
+		if (_vm->getFeatures() & GF_ME)
+			CursorMan.replaceCursorPalette(mhkSurface->getPalette(), 0, 256);
 	} else {
 		Graphics::PixelFormat pixelFormat = g_system->getScreenFormat();
 		CursorMan.replaceCursor(surface->getPixels(), surface->w, surface->h, hotspotX, hotspotY, pixelFormat.RGBToColor(255, 255, 255), false, &pixelFormat);
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 7634e8d88a..b6a6c27329 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -413,7 +413,12 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS
 
 	// Fill screen with black and empty cursor
 	_cursor->setCursor(0);
-	_system->fillScreen(_system->getScreenFormat().RGBToColor(0, 0, 0));
+
+	if (getFeatures() & GF_ME)
+		_system->fillScreen(_system->getScreenFormat().RGBToColor(0, 0, 0));
+	else
+		_gfx->clearScreenPalette();
+
 	_system->updateScreen();
 
 	_sound->stopSound();
@@ -495,9 +500,10 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS
 	_cache.clear();
 	_gfx->clearCache();
 
-	// Play Flyby Entry Movie on Masterpiece Edition.
-	const char *flyby = 0;
 	if (getFeatures() & GF_ME) {
+		// Play Flyby Entry Movie on Masterpiece Edition.
+		const char *flyby = 0;
+
 		switch (_curStack) {
 		case kSeleniticStack:
 			flyby = "selenitic flyby";
diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index 9ea9f15444..49f97cca63 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -28,6 +28,7 @@
 #include "common/system.h"
 #include "common/textconsole.h"
 #include "engines/util.h"
+#include "graphics/palette.h"
 #include "image/pict.h"
 
 namespace Mohawk {
@@ -37,16 +38,20 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 
 	_viewport = Common::Rect(544, 332);
 
-	// The original version of Myst could run in 8bpp color too.
-	// However, it dithered videos to 8bpp and they looked considerably
-	// worse (than they already did :P). So we're not even going to
-	// support 8bpp mode in Myst (Myst ME required >8bpp anyway).
-	initGraphics(_viewport.width(), _viewport.height(), true, NULL); // What an odd screen size!
+	if (_vm->getFeatures() & GF_ME) {
+		// High color
+		initGraphics(_viewport.width(), _viewport.height(), true, NULL);
 
-	_pixelFormat = _vm->_system->getScreenFormat();
+		if (_vm->_system->getScreenFormat().bytesPerPixel == 1)
+			error("Myst ME requires greater than 256 colors to run");
+	} else {
+		// Paletted
+		initGraphics(_viewport.width(), _viewport.height(), true);
+		setBasePalette();
+		setPaletteToScreen();
+	}
 
-	if (_pixelFormat.bytesPerPixel == 1)
-		error("Myst requires greater than 256 colors to run");
+	_pixelFormat = _vm->_system->getScreenFormat();
 
 	// Initialize our buffer
 	_backBuffer = new Graphics::Surface();
@@ -101,7 +106,9 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) {
 		mhkSurface = new MohawkSurface(pict.getSurface()->convertTo(_pixelFormat));
 	} else {
 		mhkSurface = _bmpDecoder->decodeImage(dataStream);
-		mhkSurface->convertToTrueColor();
+
+		if (_vm->getFeatures() & GF_ME)
+			mhkSurface->convertToTrueColor();
 	}
 
 	assert(mhkSurface);
@@ -151,7 +158,8 @@ void MystGraphics::copyImageSectionToScreen(uint16 image, Common::Rect src, Comm
 }
 
 void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest) {
-	Graphics::Surface *surface = findImage(image)->getSurface();
+	MohawkSurface *mhkSurface = findImage(image);
+	Graphics::Surface *surface = mhkSurface->getSurface();
 
 	// Make sure the image is bottom aligned in the dest rect
 	dest.top = dest.bottom - MIN<int>(surface->h, dest.height());
@@ -190,6 +198,13 @@ void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src,
 
 	for (uint16 i = 0; i < height; i++)
 		memcpy(_backBuffer->getBasePtr(dest.left, i + dest.top), surface->getBasePtr(src.left, top + i), width * surface->format.bytesPerPixel);
+
+	if (!(_vm->getFeatures() & GF_ME)) {
+		// Make sure the palette is set
+		assert(mhkSurface->getPalette());
+		memcpy(_palette + 10 * 3, mhkSurface->getPalette() + 10 * 3, (256 - 10 * 2) * 3);
+		setPaletteToScreen();
+	}
 }
 
 void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) {
@@ -419,12 +434,16 @@ void MystGraphics::transitionDissolve(Common::Rect rect, uint step) {
 
 		for (uint16 x = rect.left; x < rect.right; x++) {
 			if (linePattern[x % 4]) {
-				if (_pixelFormat.bytesPerPixel == 2) {
-					uint16 *dst = (uint16 *)screen->getBasePtr(x, y);
-					*dst = *(const uint16 *)_backBuffer->getBasePtr(x, y);
-				} else {
-					uint32 *dst = (uint32 *)screen->getBasePtr(x, y);
-					*dst = *(const uint32 *)_backBuffer->getBasePtr(x, y);
+				switch (_pixelFormat.bytesPerPixel) {
+				case 1:
+					*((byte *)screen->getBasePtr(x, y)) = *((const byte *)_backBuffer->getBasePtr(x, y));
+					break;
+				case 2:
+					*((uint16 *)screen->getBasePtr(x, y)) = *((const uint16 *)_backBuffer->getBasePtr(x, y));
+					break;
+				case 4:
+					*((uint32 *)screen->getBasePtr(x, y)) = *((const uint32 *)_backBuffer->getBasePtr(x, y));
+					break;
 				}
 			}
 		}
@@ -588,11 +607,11 @@ void MystGraphics::drawRect(Common::Rect rect, RectState state) {
 	Graphics::Surface *screen = _vm->_system->lockScreen();
 
 	if (state == kRectEnabled)
-		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0));
+		screen->frameRect(rect, (_vm->getFeatures() & GF_ME) ? _pixelFormat.RGBToColor(0, 255, 0) : 250);
 	else if (state == kRectUnreachable)
-		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 0, 255));
+		screen->frameRect(rect, (_vm->getFeatures() & GF_ME) ? _pixelFormat.RGBToColor(0, 0, 255) : 252);
 	else
-		screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0));
+		screen->frameRect(rect, (_vm->getFeatures() & GF_ME) ? _pixelFormat.RGBToColor(255, 0, 0) : 249);
 
 	_vm->_system->unlockScreen();
 }
@@ -629,50 +648,94 @@ void MystGraphics::simulatePreviousDrawDelay(const Common::Rect &dest) {
 	_nextAllowedDrawTime = time + _constantDrawDelay + dest.height() * dest.width() / _proportionalDrawDelay;
 }
 
-void MystGraphics::copyBackBufferToScreenWithSaturation(int16 saturation) {
-	Graphics::Surface *screen = _vm->_system->lockScreen();
+void MystGraphics::fadeToBlack() {
+	// This is only for the demo
+	assert(!(_vm->getFeatures() & GF_ME));
 
-	for (uint16 y = 0; y < _viewport.height(); y++)
-		for (uint16 x = 0; x < _viewport.width(); x++) {
-			uint32 color;
-			uint8 r, g, b;
+	// Linear fade in 64 steps
+	for (int i = 63; i >= 0; i--) {
+		byte palette[256 * 3];
+		byte *src = _palette;
+		byte *dst = palette;
 
-			if (_pixelFormat.bytesPerPixel == 2)
-				color = *(const uint16 *)_backBuffer->getBasePtr(x, y);
-			else
-				color = *(const uint32 *)_backBuffer->getBasePtr(x, y);
+		for (uint j = 0; j < sizeof(palette); j++)
+			*dst++ = *src++ * i / 64;
 
-			_pixelFormat.colorToRGB(color, r, g, b);
+		_vm->_system->getPaletteManager()->setPalette(palette, 0, 256);
+		_vm->_system->updateScreen();
+	}
+}
 
-			r = CLIP<int16>((int16)r - saturation, 0, 255);
-			g = CLIP<int16>((int16)g - saturation, 0, 255);
-			b = CLIP<int16>((int16)b - saturation, 0, 255);
+void MystGraphics::fadeFromBlack() {
+	// This is only for the demo
+	assert(!(_vm->getFeatures() & GF_ME));
 
-			color = _pixelFormat.RGBToColor(r, g, b);
+	copyBackBufferToScreen(_viewport);
 
-			if (_pixelFormat.bytesPerPixel == 2) {
-				uint16 *dst = (uint16 *)screen->getBasePtr(x, y);
-				*dst = color;
-			} else {
-				uint32 *dst = (uint32 *)screen->getBasePtr(x, y);
-				*dst = color;
-			}
-		}
+	// Linear fade in 64 steps
+	for (int i = 0; i < 64; i++) {
+		byte palette[256 * 3];
+		byte *src = _palette;
+		byte *dst = palette;
 
-	_vm->_system->unlockScreen();
+		for (uint j = 0; j < sizeof(palette); j++)
+			*dst++ = *src++ * i / 64;
+
+		_vm->_system->getPaletteManager()->setPalette(palette, 0, 256);
+		_vm->_system->updateScreen();
+	}
+
+	// Set the full palette
+	_vm->_system->getPaletteManager()->setPalette(_palette, 0, 256);
 	_vm->_system->updateScreen();
 }
 
-void MystGraphics::fadeToBlack() {
-	for (int16 i = 0; i < 256; i += 32) {
-		copyBackBufferToScreenWithSaturation(i);
-	}
+void MystGraphics::clearScreenPalette() {
+	// Set the palette to all black
+	byte palette[256 * 3];
+	memset(palette, 0, sizeof(palette));
+	_vm->_system->getPaletteManager()->setPalette(palette, 0, 256);
 }
 
-void MystGraphics::fadeFromBlack() {
-	for (int16 i = 256; i >= 0; i -= 32) {
-		copyBackBufferToScreenWithSaturation(i);
-	}
+void MystGraphics::setBasePalette() {
+	// Entries [0, 9] of the palette
+	static const byte lowPalette[] = {
+		0xFF, 0xFF, 0xFF,
+		0x80, 0x00, 0x00,
+		0x00, 0x80, 0x00,
+		0x80, 0x80, 0x00,
+		0x00, 0x00, 0x80,
+		0x80, 0x00, 0x80,
+		0x00, 0x80, 0x80,
+		0xC0, 0xC0, 0xC0,
+		0xC0, 0xDC, 0xC0,
+		0xA6, 0xCA, 0xF0
+	};
+
+	// Entries [246, 255] of the palette
+	static const byte highPalette[] = {
+		0xFF, 0xFB, 0xF0,
+		0xA0, 0xA0, 0xA4,
+		0x80, 0x80, 0x80,
+		0xFF, 0x00, 0x00,
+		0x00, 0xFF, 0x00,
+		0xFF, 0xFF, 0x00,
+		0x00, 0x00, 0xFF,
+		0xFF, 0x00, 0xFF,
+		0x00, 0xFF, 0xFF,
+		0x00, 0x00, 0x00
+	};
+
+	// Note that 0 and 255 are different from normal Windows.
+	// Myst seems to hack that to white, resp. black (probably for Mac compat).
+
+	memcpy(_palette, lowPalette, sizeof(lowPalette));
+	memset(_palette + sizeof(lowPalette), 0, sizeof(_palette) - sizeof(lowPalette) - sizeof(highPalette));
+	memcpy(_palette + sizeof(_palette) - sizeof(highPalette), highPalette, sizeof(highPalette));
+}
+
+void MystGraphics::setPaletteToScreen() {
+	_vm->_system->getPaletteManager()->setPalette(_palette, 0, 256);
 }
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_graphics.h b/engines/mohawk/myst_graphics.h
index 1f70320bf6..6281c94cc8 100644
--- a/engines/mohawk/myst_graphics.h
+++ b/engines/mohawk/myst_graphics.h
@@ -40,7 +40,7 @@ enum RectState {
 
 class MystGraphics : public GraphicsManager {
 public:
-	MystGraphics(MohawkEngine_Myst*);
+	MystGraphics(MohawkEngine_Myst *vm);
 	~MystGraphics();
 
 	void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest);
@@ -55,18 +55,15 @@ public:
 	void fadeToBlack();
 	void fadeFromBlack();
 
+	void clearScreenPalette();
+	void setBasePalette();
+	void setPaletteToScreen();
+	const byte *getPalette() const { return _palette; }
+
 protected:
 	MohawkSurface *decodeImage(uint16 id);
 	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
-	void simulatePreviousDrawDelay(const Common::Rect &dest);
-	void copyBackBufferToScreenWithSaturation(int16 saturation);
-	void transitionDissolve(Common::Rect rect, uint step);
-	void transitionSlideToLeft(Common::Rect rect, uint16 steps, uint16 delay);
-	void transitionSlideToRight(Common::Rect rect, uint16 steps, uint16 delay);
-	void transitionSlideToTop(Common::Rect rect, uint16 steps, uint16 delay);
-	void transitionSlideToBottom(Common::Rect rect, uint16 steps, uint16 delay);
-	void transitionPartialToRight(Common::Rect rect, uint32 width, uint32 steps);
-	void transitionPartialToLeft(Common::Rect rect, uint32 width, uint32 steps);
+
 private:
 	MohawkEngine_Myst *_vm;
 	MystBitmap *_bmpDecoder;
@@ -74,11 +71,21 @@ private:
 	Graphics::Surface *_backBuffer;
 	Graphics::PixelFormat _pixelFormat;
 	Common::Rect _viewport;
+	byte _palette[256 * 3];
 
 	int _enableDrawingTimeSimulation;
 	uint32 _nextAllowedDrawTime;
 	static const uint _constantDrawDelay = 10; // ms
 	static const uint _proportionalDrawDelay = 500; // pixels per ms
+
+	void simulatePreviousDrawDelay(const Common::Rect &dest);
+	void transitionDissolve(Common::Rect rect, uint step);
+	void transitionSlideToLeft(Common::Rect rect, uint16 steps, uint16 delay);
+	void transitionSlideToRight(Common::Rect rect, uint16 steps, uint16 delay);
+	void transitionSlideToTop(Common::Rect rect, uint16 steps, uint16 delay);
+	void transitionSlideToBottom(Common::Rect rect, uint16 steps, uint16 delay);
+	void transitionPartialToRight(Common::Rect rect, uint32 width, uint32 steps);
+	void transitionPartialToLeft(Common::Rect rect, uint32 width, uint32 steps);
 };
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index c500df5ad3..ca6e7c0ee5 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -3201,13 +3201,21 @@ Common::Point Myst::towerRotationMapComputeCoords(const Common::Point &center, u
 }
 
 void Myst::towerRotationMapDrawLine(const Common::Point &center, const Common::Point &end) {
-	Graphics::PixelFormat pf = _vm->_system->getScreenFormat();
-	uint32 color = 0;
+	uint32 color;
 
-	if (!_towerRotationOverSpot)
-		color = pf.RGBToColor(0xFF, 0xFF, 0xFF); // White
-	else
-		color = pf.RGBToColor(0xFF, 0, 0); // Red
+	if (_vm->getFeatures() & GF_ME) {
+		Graphics::PixelFormat pf = _vm->_system->getScreenFormat();
+
+		if (!_towerRotationOverSpot)
+			color = pf.RGBToColor(0xFF, 0xFF, 0xFF); // White
+		else
+			color = pf.RGBToColor(0xFF, 0, 0); // Red
+	} else {
+		if (!_towerRotationOverSpot)
+			color = 0x00; // White
+		else
+			color = 0xF9; // Red
+	}
 
 	const Common::Rect rect = Common::Rect(106, 42, 459, 273);
 
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index cebb72e24f..ca38f22b7a 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -53,6 +53,8 @@ bool VideoEntry::endOfVideo() {
 }
 
 VideoManager::VideoManager(MohawkEngine* vm) : _vm(vm) {
+	// Set dithering enabled, if required
+	_enableDither = _vm->getGameType() == GType_MYST && !(_vm->getFeatures() & GF_ME);
 }
 
 VideoManager::~VideoManager() {
@@ -230,16 +232,23 @@ bool VideoManager::updateMovies() {
 				Graphics::PixelFormat pixelFormat = _vm->_system->getScreenFormat();
 
 				if (frame->format != pixelFormat) {
-					// We don't support downconverting to 8bpp
-					if (pixelFormat.bytesPerPixel == 1)
-						error("Cannot convert high color video frame to 8bpp");
+					// We don't support downconverting to 8bpp without having
+					// support in the codec. Set _enableDither if shows up.
+					if (pixelFormat.bytesPerPixel == 1) {
+						warning("Cannot convert high color video frame to 8bpp");
+						delete _videoStreams[i].video;
+						_videoStreams[i].clear();
+						continue;
+					}
 
 					// Convert to the current screen format
 					convertedFrame = frame->convertTo(pixelFormat, _videoStreams[i]->getPalette());
 					frame = convertedFrame;
 				} else if (pixelFormat.bytesPerPixel == 1 && _videoStreams[i]->hasDirtyPalette()) {
 					// Set the palette when running in 8bpp mode only
-					_vm->_system->getPaletteManager()->setPalette(_videoStreams[i]->getPalette(), 0, 256);
+					// Don't do this for Myst, which has its own per-stack handling
+					if (_vm->getGameType() != GType_MYST)
+						_vm->_system->getPaletteManager()->setPalette(_videoStreams[i]->getPalette(), 0, 256);
 				}
 
 				// Clip the width/height to make sure we stay on the screen (Myst does this a few times)
@@ -394,6 +403,9 @@ VideoHandle VideoManager::createVideoHandle(uint16 id, uint16 x, uint16 y, bool
 	entry.loop = loop;
 	entry.enabled = true;
 
+	// Enable dither if necessary
+	checkEnableDither(entry);
+
 	entry->start();
 
 	// Search for any deleted videos so we can take a formerly used slot
@@ -431,6 +443,10 @@ VideoHandle VideoManager::createVideoHandle(const Common::String &filename, uint
 	}
 
 	entry->loadStream(file);
+
+	// Enable dither if necessary
+	checkEnableDither(entry);
+
 	entry->setVolume(volume);
 	entry->start();
 
@@ -551,4 +567,26 @@ void VideoManager::pauseMovie(VideoHandle handle, bool pause) {
 	_videoStreams[handle]->pauseVideo(pause);
 }
 
+void VideoManager::checkEnableDither(VideoEntry &entry) {
+	// If we're not dithering, bail out
+	if (!_enableDither)
+		return;
+
+	// Ignore any video which is already 8bpp
+	if (entry->getPixelFormat().bytesPerPixel == 1)
+		return;
+
+	// Set the palette
+	byte palette[256 * 3];
+	g_system->getPaletteManager()->grabPalette(palette, 0, 256);
+	entry->setDitheringPalette(palette);
+
+	if (entry->getPixelFormat().bytesPerPixel != 1) {
+		if (entry.filename.empty())
+			error("Failed to set dither for video %d", entry.id);
+		else
+			error("Failed to set dither for video %s", entry.filename.c_str());
+	}
+}
+
 } // End of namespace Mohawk
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 43181e3e6c..deb09afe6b 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -124,6 +124,10 @@ private:
 
 	VideoHandle createVideoHandle(uint16 id, uint16 x, uint16 y, bool loop, uint16 volume = 0xff);
 	VideoHandle createVideoHandle(const Common::String &filename, uint16 x, uint16 y, bool loop, byte volume = 0xff);
+
+	// Dithering control
+	bool _enableDither;
+	void checkEnableDither(VideoEntry &entry);
 };
 
 } // End of namespace Mohawk
-- 
cgit v1.2.3


From 3323af355dd081428c114c4b15b4abc7307115c0 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 11 Apr 2015 15:31:20 -0400
Subject: MOHAWK: Allow Myst to compile without RGB colors

---
 engines/mohawk/configure.engine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mohawk/configure.engine b/engines/mohawk/configure.engine
index fa9d15cffc..47402c4560 100644
--- a/engines/mohawk/configure.engine
+++ b/engines/mohawk/configure.engine
@@ -3,4 +3,4 @@
 add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books"
 add_engine cstime "Where in Time is Carmen Sandiego?" no
 add_engine riven "Riven: The Sequel to Myst" no "" "" "16bit"
-add_engine myst "Myst" no "" "" "16bit"
+add_engine myst "Myst" no
-- 
cgit v1.2.3


From dd63cef93efce72b300c99a6a8b9415a111c2b82 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 11 Apr 2015 15:38:31 -0500
Subject: MADS: Fix memory leak in Dialog class

---
 engines/mads/dialogs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 158d9693ad..7f0b02bc65 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -43,6 +43,7 @@ Dialog::Dialog(MADSEngine *vm)
 }
 
 Dialog::~Dialog() {
+	delete _savedSurface;
 }
 
 void Dialog::save() {
-- 
cgit v1.2.3


From 797506eff79126e60ec97e8377b5a6d632769564 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 11 Apr 2015 16:05:50 -0400
Subject: SWORD25: Use fabs for absolute value of doubles

---
 engines/sword25/util/double_serialization.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sword25/util/double_serialization.cpp b/engines/sword25/util/double_serialization.cpp
index 73da296e40..13fa42b6be 100644
--- a/engines/sword25/util/double_serialization.cpp
+++ b/engines/sword25/util/double_serialization.cpp
@@ -33,7 +33,7 @@ SerializedDouble encodeDouble(double value) {
 	double significand = frexp(value, &exponent);
 
 	// Shift the the first part of the significand into the integer range
-	double shiftedsignificandPart = ldexp(abs(significand), 32);
+	double shiftedsignificandPart = ldexp(fabs(significand), 32);
 	uint32 significandOne = uint32(floor(shiftedsignificandPart));
 
 	// Shift the remainder of the significand into the integer range
-- 
cgit v1.2.3


From 75acef75661cc4554ad0bf114d62bf553afae7ab Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 11 Apr 2015 16:07:22 -0400
Subject: GRAPHICS: Force a cast to int to avoid gcc warnings

---
 graphics/fonts/ttf.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index 7373a965c8..dc7335f1c2 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -474,11 +474,11 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const {
 
 	switch (bitmap.pixel_mode) {
 	case FT_PIXEL_MODE_MONO:
-		for (uint y = 0; y < bitmap.rows; ++y) {
+		for (int y = 0; y < (int)bitmap.rows; ++y) {
 			const uint8 *curSrc = src;
 			uint8 mask = 0;
 
-			for (uint x = 0; x < bitmap.width; ++x) {
+			for (int x = 0; x < (int)bitmap.width; ++x) {
 				if ((x % 8) == 0)
 					mask = *curSrc++;
 
@@ -494,7 +494,7 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const {
 		break;
 
 	case FT_PIXEL_MODE_GRAY:
-		for (uint y = 0; y < bitmap.rows; ++y) {
+		for (int y = 0; y < (int)bitmap.rows; ++y) {
 			memcpy(dst, src, bitmap.width);
 			dst += glyph.image.pitch;
 			src += srcPitch;
-- 
cgit v1.2.3


From ddf170de4a33fac4cac3093bf6dd97d253216092 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 11 Apr 2015 16:11:21 -0400
Subject: ZVISION: Silence gcc warnings

---
 engines/zvision/graphics/effects/fog.cpp           |  6 ++---
 engines/zvision/graphics/effects/wave.cpp          |  2 +-
 engines/zvision/graphics/render_manager.cpp        |  4 ++--
 .../zvision/scripting/effects/distort_effect.cpp   |  2 +-
 engines/zvision/scripting/effects/music_effect.cpp |  2 +-
 engines/zvision/scripting/menu.cpp                 | 26 +++++++++++-----------
 engines/zvision/text/truetype_font.cpp             |  8 +++----
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/engines/zvision/graphics/effects/fog.cpp b/engines/zvision/graphics/effects/fog.cpp
index 32a01915d3..7b65f60f24 100644
--- a/engines/zvision/graphics/effects/fog.cpp
+++ b/engines/zvision/graphics/effects/fog.cpp
@@ -142,9 +142,9 @@ void FogFx::update() {
 
 		for (uint8 i = 0; i < 31; i++) {
 			float perc = (float)i / 31.0;
-			uint8 cr = (float)_r * perc;
-			uint8 cg = (float)_g * perc;
-			uint8 cb = (float)_b * perc;
+			uint8 cr = (uint8)((float)_r * perc);
+			uint8 cg = (uint8)((float)_g * perc);
+			uint8 cb = (uint8)((float)_b * perc);
 			_colorMap[i] = _engine->_resourcePixelFormat.RGBToColor(cr << 3, cg << 3, cb << 3);
 		}
 	}
diff --git a/engines/zvision/graphics/effects/wave.cpp b/engines/zvision/graphics/effects/wave.cpp
index cec631611b..d2887b3112 100644
--- a/engines/zvision/graphics/effects/wave.cpp
+++ b/engines/zvision/graphics/effects/wave.cpp
@@ -54,7 +54,7 @@ WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, in
 				int16 dx = (x - quarterWidth);
 				int16 dy = (y - quarterHeight);
 
-				_ampls[i][x + y * _halfWidth] = ampl * sin(sqrt(dx * dx / (float)centerX + dy * dy / (float)centerY) / (-waveln * 3.1415926) + phase);
+				_ampls[i][x + y * _halfWidth] = (int8)(ampl * sin(sqrt(dx * dx / (float)centerX + dy * dy / (float)centerY) / (-waveln * 3.1415926) + phase));
 			}
 		phase += spd;
 	}
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 3772d5909e..ce0a02a1ad 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -1108,7 +1108,7 @@ void RenderManager::updateRotation() {
 			int16 newPosition = startPosition + _velocity;
 
 			int16 screenHeight = getBkgSize().y;
-			int16 tiltGap = _renderTable.getTiltGap();
+			int16 tiltGap = (int16)_renderTable.getTiltGap();
 
 			if (newPosition >= (screenHeight - tiltGap))
 				newPosition = screenHeight - tiltGap;
@@ -1143,7 +1143,7 @@ void RenderManager::checkBorders() {
 		int16 newPosition = startPosition;
 
 		int16 screenHeight = getBkgSize().y;
-		int16 tiltGap = _renderTable.getTiltGap();
+		int16 tiltGap = (int16)_renderTable.getTiltGap();
 
 		if (newPosition >= (screenHeight - tiltGap))
 			newPosition = screenHeight - tiltGap;
diff --git a/engines/zvision/scripting/effects/distort_effect.cpp b/engines/zvision/scripting/effects/distort_effect.cpp
index 78c4a1b9a8..113b5d048d 100644
--- a/engines/zvision/scripting/effects/distort_effect.cpp
+++ b/engines/zvision/scripting/effects/distort_effect.cpp
@@ -52,7 +52,7 @@ DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAn
 	_diffLinScale = endLineScale - startLineScale;
 
 	_frmSpeed = (float)speed / 15.0;
-	_frames = ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed);
+	_frames = (int)ceil((5.0 - _frmSpeed * 2.0) / _frmSpeed);
 	if (_frames <= 0)
 		_frames = 1;
 
diff --git a/engines/zvision/scripting/effects/music_effect.cpp b/engines/zvision/scripting/effects/music_effect.cpp
index ad3c0f6d22..e3fdc96dba 100644
--- a/engines/zvision/scripting/effects/music_effect.cpp
+++ b/engines/zvision/scripting/effects/music_effect.cpp
@@ -140,7 +140,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
 			if (_crossfadeTime > 0) {
 				if ((int32)deltaTimeInMillis > _crossfadeTime)
 					deltaTimeInMillis = _crossfadeTime;
-				_newvol += floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis;
+				_newvol += (int)(floor(((float)(_crossfadeTarget - _newvol) / (float)_crossfadeTime)) * (float)deltaTimeInMillis);
 				_crossfadeTime -= deltaTimeInMillis;
 			} else {
 				_crossfade = false;
diff --git a/engines/zvision/scripting/menu.cpp b/engines/zvision/scripting/menu.cpp
index 16aa57e3ae..e7775cbe3f 100644
--- a/engines/zvision/scripting/menu.cpp
+++ b/engines/zvision/scripting/menu.cpp
@@ -50,9 +50,9 @@ MenuZGI::MenuZGI(ZVision *engine) :
 	scrolled[0] = false;
 	scrolled[1] = false;
 	scrolled[2] = false;
-	scrollPos[0] = 0.0;
-	scrollPos[1] = 0.0;
-	scrollPos[2] = 0.0;
+	scrollPos[0] = 0;
+	scrollPos[1] = 0;
+	scrollPos[2] = 0;
 	mouseOnItem = -1;
 	redraw = false;
 	clean = false;
@@ -361,11 +361,11 @@ void MenuZGI::process(uint32 deltatime) {
 				if (scrl == 0)
 					scrl = 1.0;
 
-				scrollPos [kMenuItem] += scrl;
+				scrollPos[kMenuItem] += (int)scrl;
 
 				if (scrollPos[kMenuItem] >= 0) {
 					scrolled[kMenuItem] = true;
-					scrollPos [kMenuItem] = 0;
+					scrollPos[kMenuItem] = 0;
 				}
 			}
 		if (redraw) {
@@ -430,11 +430,11 @@ void MenuZGI::process(uint32 deltatime) {
 				if (scrl == 0)
 					scrl = 1.0;
 
-				scrollPos [kMenuMagic] += scrl;
+				scrollPos[kMenuMagic] += (int)scrl;
 
 				if (scrollPos[kMenuMagic] >= 600) {
 					scrolled[kMenuMagic] = true;
-					scrollPos [kMenuMagic] = 600;
+					scrollPos[kMenuMagic] = 600;
 				}
 			}
 		if (redraw) {
@@ -495,11 +495,11 @@ void MenuZGI::process(uint32 deltatime) {
 			if (scrl == 0)
 				scrl = 1.0;
 
-			scrollPos [kMenuMain] += scrl;
+			scrollPos[kMenuMain] += (int)scrl;
 
 			if (scrollPos[kMenuMain] >= 0) {
 				scrolled[kMenuMain] = true;
-				scrollPos [kMenuMain] = 0;
+				scrollPos[kMenuMain] = 0;
 			}
 		}
 		if (redraw) {
@@ -553,7 +553,7 @@ MenuNemesis::MenuNemesis(ZVision *engine) :
 	MenuHandler(engine) {
 	inmenu = false;
 	scrolled = false;
-	scrollPos = 0.0;
+	scrollPos = 0;
 	mouseOnItem = -1;
 	redraw = false;
 	delay = 0;
@@ -696,7 +696,7 @@ void MenuNemesis::process(uint32 deltatime) {
 			if (scrl == 0)
 				scrl = 1.0;
 
-			scrollPos += scrl;
+			scrollPos += (int)scrl;
 			redraw = true;
 		}
 
@@ -743,10 +743,10 @@ void MenuNemesis::process(uint32 deltatime) {
 			if (scrl == 0)
 				scrl = 1.0;
 
-			Common::Rect cl(64, 32 + scrollPos - scrl, 64 + 512, 32 + scrollPos + 1);
+			Common::Rect cl(64, (int16)(32 + scrollPos - scrl), 64 + 512, 32 + scrollPos + 1);
 			_engine->getRenderManager()->clearMenuSurface(cl);
 
-			scrollPos -= scrl;
+			scrollPos -= (int)scrl;
 			redraw = true;
 		} else
 			scrollPos = -32;
diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 7ad8d6db61..acb053ea8d 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -199,12 +199,12 @@ void StyledTTFont::drawChar(Graphics::Surface *dst, byte chr, int x, int y, uint
 	if (_font) {
 		_font->drawChar(dst, chr, x, y, color);
 		if (_style & TTF_STYLE_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 pos = (int16)floor(_font->getFontHeight() * 0.87);
 			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
 			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
 		}
 		if (_style & TTF_STYLE_STRIKETHROUGH) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 pos = (int16)floor(_font->getFontHeight() * 0.60);
 			int thk = MAX((int)(_font->getFontHeight() * 0.05), 1);
 			dst->fillRect(Common::Rect(x, y + pos, x + _font->getCharWidth(chr), y + pos + thk), color);
 		}
@@ -216,7 +216,7 @@ void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str,
 		Common::U32String u32str = convertUtf8ToUtf32(str);
 		_font->drawString(dst, u32str, x, y, w, color, align);
 		if (_style & TTF_STYLE_UNDERLINE) {
-			int16 pos = floor(_font->getFontHeight() * 0.87);
+			int16 pos = (int16)floor(_font->getFontHeight() * 0.87);
 			int16 wd = MIN(_font->getStringWidth(u32str), w);
 			int16 stX = x;
 			if (align == Graphics::kTextAlignCenter)
@@ -229,7 +229,7 @@ void StyledTTFont::drawString(Graphics::Surface *dst, const Common::String &str,
 			dst->fillRect(Common::Rect(stX, y + pos, stX + wd, y + pos + thk), color);
 		}
 		if (_style & TTF_STYLE_STRIKETHROUGH) {
-			int16 pos = floor(_font->getFontHeight() * 0.60);
+			int16 pos = (int16)floor(_font->getFontHeight() * 0.60);
 			int16 wd = MIN(_font->getStringWidth(u32str), w);
 			int16 stX = x;
 			if (align == Graphics::kTextAlignCenter)
-- 
cgit v1.2.3


From 0d4d8e878cfba4ea9c32dc46e4923886df95395c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 11 Apr 2015 16:52:19 -0500
Subject: SHERLOCK: Implemented stubbed talk and inventory methods

---
 engines/sherlock/inventory.cpp |  10 +-
 engines/sherlock/inventory.h   |   1 +
 engines/sherlock/people.cpp    | 223 ++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/people.h      |  10 +-
 engines/sherlock/talk.cpp      |  59 +++++++----
 engines/sherlock/talk.h        |   3 -
 6 files changed, 276 insertions(+), 30 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 0ea85f32fc..9eedac7c6a 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -453,7 +453,15 @@ int Inventory::putItemInInventory(Object &obj) {
  * Copy the passed object into the inventory
  */
 void Inventory::copyToInventory(Object &obj) {
-	// TODO
+	InventoryItem invItem;
+	invItem._name = obj._name;
+	invItem._description = obj._description;
+	invItem._examine = obj._examine;
+	invItem._lookFlag = obj._lookFlag;
+	invItem._requiredFlag = obj._requiredFlag;
+
+	insert_at(_holdings, invItem);
+	++_holdings;
 }
 
 /**
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 722692a3b2..436d2bc18d 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -53,6 +53,7 @@ struct InventoryItem {
 	Common::String _examine;
 	int _lookFlag;
 
+	InventoryItem() : _requiredFlag(0), _lookFlag(0) {}
 	InventoryItem(int requiredFlag, const Common::String &name,
 		const Common::String &description, const Common::String &examine);
 };
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 9319fbb79d..5c7f9ef506 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -50,6 +50,145 @@ static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 	{ 52, 1, 2, 3, 4, 0 }				// Goto Stand Down Left
 };
 
+const char PORTRAITS[MAX_PEOPLE][5] = {
+	{ "HOLM" },			// Sherlock Holmes
+	{ "WATS" },			// Dr. Watson
+	{ "LEST" },			// Inspector Lestrade
+	{ "CON1" },			// Constable O'Brien
+	{ "CON2" },			// Constable Lewis
+	{ "SHEI" },			// Sheila Parker
+	{ "HENR" },			// Henry Carruthers
+	{ "LESL" },			// Lesley (flower girl)
+	{ "USH1" },			// Usher #1
+	{ "USH2" },			// Usher #2
+	{ "FRED" },			// Fredrick Epstein
+	{ "WORT" },			// Mrs. Worthington
+	{ "COAC" },			// Coach
+	{ "PLAY" },			// Player
+	{ "WBOY" },			// Tim (Waterboy)
+	{ "JAME" },			// James Sanders
+	{ "BELL" },			// Belle (perfumerie)
+	{ "GIRL" },			// Cleaning Girl (perfumerie)
+	{ "EPST" },			// Epstien in the Opera Balcony
+	{ "WIGG" },			// Wiggins
+	{ "PAUL" },			// Paul (Brumwell / Carroway)
+	{ "BART" },			// Bartender
+	{ "DIRT" },			// Dirty Drunk
+	{ "SHOU" },			// Shouting Drunk
+	{ "STAG" },			// Staggering Drunk
+	{ "BOUN" },			// Bouncer
+	{ "SAND" },			// James Sanders - At Home
+	{ "CORO" },			// The Coroner
+	{ "EQUE" },			// The Equestrian Shop Keeper
+	{ "GEOR" },			// George Blackwood
+	{ "LARS" },			// Lars
+	{ "PARK" },			// Sheila Parker (happy)
+	{ "CHEM" },			// Chemist
+	{ "GREG" },			// Inspector Gregson
+	{ "LAWY" },			// Jacob Farthington Lawyer
+	{ "MYCR" },			// Mycroft
+	{ "SHER" },			// Old Sherman
+	{ "CHMB" },			// Richard Chemist Stock boy
+	{ "BARM" },			// Barman
+	{ "DAND" },			// Dandy Player
+	{ "ROUG" },			// Rough-looking Player
+	{ "SPEC" },			// Spectator
+	{ "HUNT" },			// Robert Hunt
+	{ "VIOL" },			// Violet Secretary
+	{ "PETT" },			// Pettigrew
+	{ "APPL" },			// Augie (apple seller)
+	{ "ANNA" },			// Anna Carroway
+	{ "GUAR" },			// Guard
+	{ "ANTO" },			// Antonio Caruso
+	{ "TOBY" },			// Toby the Dog
+	{ "KING" },			// Simon Kingsley
+	{ "ALFR" },			// Alfred Tobacco Clerk
+	{ "LADY" },			// Lady Brumwell
+	{ "ROSA" },			// Madame Rosa
+	{ "LADB" },			// Lady Brumwell
+	{ "MOOR" },			// Joseph Moorehead
+	{ "BEAL" },			// Mrs. Beale
+	{ "LION" },			// Felix the Lion
+	{ "HOLL" },			// Hollingston
+	{ "CALL" },			// Constable Callaghan
+	{ "JERE" },			// Sergeant Jeremy Duncan
+	{ "LORD" },			// Lord Brumwell
+	{ "NIGE" },			// Nigel Jameson
+	{ "JONA" },			// Jonas (newspaper seller)
+	{ "DUGA" },			// Constable Dugan
+	{ "INSP" }			// Inspector Lestrade (Scotland Yard) 
+};
+
+const char  *const NAMES[MAX_PEOPLE] = {
+	"Sherlock Holmes",
+	"Dr. Watson",
+	"Inspector Lestrade",
+	"Constable O'Brien",
+	"Constable Lewis",
+	"Sheila Parker",
+	"Henry Carruthers",
+	"Lesley",
+	"An Usher",
+	"An Usher",
+	"Fredrick Epstein",
+	"Mrs. Worthington",
+	"The Coach",
+	"A Player",
+	"Tim",
+	"James Sanders",
+	"Belle",
+	"Cleaning Girl",
+	"Fredrick Epstein",
+	"Wiggins",
+	"Paul",
+	"The Bartender",
+	"A Dirty Drunk",
+	"A Shouting Drunk",
+	"A Staggering Drunk",
+	"The Bouncer",
+	"James Sanders",
+	"The Coroner",
+	"Reginald Snipes",
+	"George Blackwood",
+	"Lars",
+	"Sheila Parker",
+	"The Chemist",
+	"Inspector Gregson",
+	"Jacob Farthington",
+	"Mycroft",
+	"Old Sherman",
+	"Richard",
+	"The Barman",
+	"A Dandy Player",
+	"A Rough-looking Player",
+	"A Spectator",
+	"Robert Hunt",
+	"Violet",
+	"Pettigrew",
+	"Augie",
+	"Anna Carroway",
+	"A Guard",
+	"Antonio Caruso",
+	"Toby the Dog",
+	"Simon Kingsley",
+	"Alfred",
+	"Lady Brumwell",
+	"Madame Rosa",
+	"Lady Brumwell",
+	"Joseph Moorehead",
+	"Mrs. Beale",
+	"Felix",
+	"Hollingston",
+	"Constable Callaghan",
+	"Sergeant Duncan",
+	"Lord Brumwell",
+	"Nigel Jaimeson",
+	"Jonas",
+	"Constable Dugan",
+	"Inspector Lestrade"
+};
+
+/*----------------------------------------------------------------*/
 
 People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_walkLoaded = false;
@@ -63,6 +202,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_talkPics = nullptr;
 	_portraitSide = 0;
 	_speakerFlip = false;
+	_holmesFlip = false;
 }
 
 People::~People() {
@@ -439,6 +579,27 @@ void People::goAllTheWay() {
 	}
 }
 
+/**
+ * Finds the scene background object corresponding to a specified speaker
+ */
+int People::findSpeaker(int speaker) {
+	Scene &scene = *_vm->_scene;
+
+	for (int idx = 0; idx < (int)scene._bgShapes.size(); ++idx) {
+		Object &obj = scene._bgShapes[idx];
+
+		if (obj._type == ACTIVE_BG_SHAPE) {
+			Common::String name(obj._name.c_str(), obj._name.c_str() + 4);
+
+			if (scumm_stricmp(PORTRAITS[speaker], name.c_str()) == 0
+				&& obj._name[4] >= '0' && obj._name[4] <= '9')
+				return idx - 1;
+		}
+	}
+
+	return -1;
+}
+
 /**
  * Turn off any currently active portraits, and removes them from being drawn
  */
@@ -472,9 +633,65 @@ void People::clearTalking() {
 	}
 }
 
-int People::findSpeaker(int speaker) {
-	// TODO
-	return -1;
+/**
+ * Setup the data for an animating speaker portrait at the top of the screen
+ */
+void People::setTalking(int speaker) {
+	Resources &res = *_vm->_res;
+
+	// If no speaker is specified, then we can exit immediately
+	if (speaker == -1)
+		return;
+
+	if (_portraitsOn) {
+		delete _talkPics;
+		_talkPics = new ImageFile("portrait.lib");
+
+		// Load portrait sequences
+		Common::SeekableReadStream *stream = res.load("sequence.txt");
+		stream->seek(speaker * MAX_FRAME);
+
+		int idx = 0;
+		do {
+			_portrait._sequences[idx] = stream->readByte();
+			++idx;
+		} while (idx < 2 || _portrait._sequences[idx - 2] || _portrait._sequences[idx - 1]);
+
+		delete stream;
+
+		_portrait._maxFrames = idx;
+		_portrait._frameNumber = 0;
+		_portrait._sequenceNumber = 0;
+		_portrait._images = _talkPics;
+		_portrait._imageFrame = &(*_talkPics)[0];
+		_portrait._position = Common::Point(_portraitSide, 10);
+		_portrait._delta = Common::Point(0, 0);
+		_portrait._oldPosition = Common::Point(0, 0);
+		_portrait._goto = Common::Point(0, 0);
+		_portrait._flags = 5;
+		_portrait._status = 0;
+		_portrait._misc = 0;
+		_portrait._allow = 0;
+		_portrait._type = ACTIVE_BG_SHAPE;
+		_portrait._name = " ";
+		_portrait._description = " ";
+		_portrait._examine = " ";
+		_portrait._walkCount = 0;
+
+		if (_holmesFlip || _speakerFlip) {
+			_portrait._flags |= 2;
+
+			_holmesFlip = false;
+			_speakerFlip = false;
+		}
+
+		if (_portraitSide == 20)
+			_portraitSide = 220;
+		else
+			_portraitSide = 20;
+
+		_portraitLoaded = true;
+	}
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 1a846dded1..bec078d11e 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -34,7 +34,7 @@ enum PeopleId {
 	PLAYER	= 0,
 	AL		= 0,
 	PEG		= 1,
-	MAX_PEOPLE = 2
+	MAX_PEOPLE = 66
 };
 
 // Animation sequence identifiers for characters
@@ -66,8 +66,8 @@ private:
 	bool _walkLoaded;
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
-	ImageFile *_talkPics;
 public:
+	ImageFile *_talkPics;
 	Common::Point _walkDest;
 	Common::Stack<Common::Point> _walkTo;
 	Person &_player;
@@ -79,6 +79,7 @@ public:
 	bool _allowWalkAbort;
 	int _portraitSide;
 	bool _speakerFlip;
+	bool _holmesFlip;
 public:
 	People(SherlockEngine *vm);
 	~People();
@@ -102,9 +103,10 @@ public:
 
 	void goAllTheWay();
 
-	void clearTalking();
-
 	int findSpeaker(int speaker);
+
+	void clearTalking();
+	void setTalking(int speaker);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 193c0f9a19..c97f2a0646 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -161,7 +161,6 @@ void Talk::talkTo(const Common::String &filename) {
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Scripts &scripts = *_vm->_scripts;
-	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
 	Common::Rect savedBounds = screen.getDisplayBounds();
 	bool abortFlag = false;
@@ -202,10 +201,10 @@ void Talk::talkTo(const Common::String &filename) {
 		people.gotoStand(people._player);
 	}
 
-	if (talk._talkToAbort)
+	if (_talkToAbort)
 		return;
 
-	talk.freeTalkVars();
+	freeTalkVars();
 
 	// If any sequences have changed in the prior talk file, restore them
 	if (_savedSequences.size() > 0) {
@@ -928,8 +927,36 @@ void Talk::pushSequence(int speaker) {
 		error("script stack overflow");
 }
 
+/**
+ * Change the sequence of the scene background object associated with the current speaker.
+ */
 void Talk::setSequence(int speaker) {
-	// TODO
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	
+	// If no speaker is specified, then nothing needs to be done
+	if (speaker != -1)
+		return;
+
+	if (speaker) {
+		int objNum = people.findSpeaker(speaker);
+		if (objNum != -1) {
+			Object &obj = scene._bgShapes[objNum];
+
+			if (obj._seqSize < MAX_TALK_SEQUENCES) {
+				warning("Tried to copy too many talk frames");
+			} else {
+				for (int idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) {
+					obj._sequences[idx] = TALK_SEQUENCES[speaker][idx];
+					if (idx > 0 && !TALK_SEQUENCES[speaker][idx] && !TALK_SEQUENCES[speaker][idx - 1])
+						return;
+
+					obj._frameNumber = 0;
+					obj._sequenceNumber = 0;
+				}
+			}
+		}
+	}
 }
 
 /**
@@ -1045,7 +1072,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 		else {
 			// Nope, so set the first speaker
-			setTalking(_speaker);
+			people.setTalking(_speaker);
 		}
 	}
 
@@ -1068,7 +1095,7 @@ void Talk::doScript(const Common::String &script) {
 				_scriptCurrentIndex = str - script.c_str();
 
 				if (!(_speaker & 128))
-					clearTalking();
+					people.clearTalking();
 				if (_talkToAbort)
 					return;
 
@@ -1077,7 +1104,7 @@ void Talk::doScript(const Common::String &script) {
 				charCount = line = 0;
 
 				_speaker = *++str - 1;
-				setTalking(_speaker);
+				people.setTalking(_speaker);
 				pullSequence();
 				pushSequence(_speaker);
 				setSequence(_speaker);
@@ -1128,7 +1155,7 @@ void Talk::doScript(const Common::String &script) {
 				_scriptCurrentIndex = str - script.c_str();
 
 				if (_speaker < 128)
-					clearTalking();
+					people.clearTalking();
 				pullSequence();
 				if (_talkToAbort)
 					return;
@@ -1214,7 +1241,7 @@ void Talk::doScript(const Common::String &script) {
 				_scriptCurrentIndex = str - script.c_str();
 
 				if (!(_speaker & 128))
-					clearTalking();
+					people.clearTalking();
 				pullSequence();
 
 				if (_talkToAbort)
@@ -1426,11 +1453,13 @@ void Talk::doScript(const Common::String &script) {
 
 			case WALK_TO_CANIMATION: {
 				++str;
-				int animIndex = str[0] - 1;
+				CAnim &anim = scene._cAnim[str[0] - 1];
 
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				_scriptCurrentIndex = (str + 1) - script.c_str();
+
+				people.walkToCoords(anim._goto, anim._gotoDir);
 				if (_talkToAbort)
 					return;
 				break;
@@ -1616,18 +1645,10 @@ void Talk::doScript(const Common::String &script) {
 
 		pullSequence();
 		if (_speaker < 128)
-			clearTalking();
+			people.clearTalking();
 	}
 }
 
-void Talk::clearTalking() {
-	// TODO
-}
-
-void Talk::setTalking(int speaker) {
-	// TODO
-}
-
 /**
  * When the talk window has been displayed, waits a period of time proportional to
  * the amount of text that's been displayed
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 1b679a47bd..1a7dd587da 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -110,9 +110,6 @@ private:
 
 	void doScript(const Common::String &script);
 
-	void clearTalking();
-	void setTalking(int speaker);
-
 	int waitForMore(int delay);
 public:
 	bool _talkToAbort;
-- 
cgit v1.2.3


From 0f0321eb43fa321319805db8264601d0f2646282 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 11 Apr 2015 17:50:07 -0500
Subject: SHERLOCK: Fix startup initialization

---
 engines/sherlock/talk.cpp           | 9 +++++++--
 engines/sherlock/user_interface.cpp | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index c97f2a0646..ec3f67bd84 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -134,7 +134,7 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkStealth = 0;
 	_talkToFlag = -1;
 	_moreTalkDown = _moreTalkUp = false;
-	_scriptMoreFlag = 1;
+	_scriptMoreFlag = false;
 	_scriptSaveIndex = -1;
 	_scriptCurrentIndex = -1;
 }
@@ -683,7 +683,7 @@ void Talk::drawInterface() {
 		int strWidth = screen.stringWidth(PRESS_KEY_TO_CONTINUE);
 		screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
 			160 - strWidth, PRESS_KEY_TO_CONTINUE);
-		screen.gPrint(Common::Point(160 - strWidth / 2, CONTROLS_Y), COMMAND_FOREGROUND, false, "P");
+		screen.gPrint(Common::Point(160 - strWidth / 2, CONTROLS_Y), COMMAND_FOREGROUND, "P");
 	}
 }
 
@@ -880,6 +880,9 @@ void Talk::clearSequences() {
 void Talk::pullSequence() {
 	Scene &scene = *_vm->_scene;
 
+	if (_scriptStack.empty())
+		return;
+
 	SequenceEntry seq = _scriptStack.pop();
 	if (seq._objNum != -1) {
 		Object &obj = scene._bgShapes[seq._objNum];
@@ -1518,6 +1521,8 @@ void Talk::doScript(const Common::String &script) {
 			int width = 0, idx = 0;
 			do {
 				width += screen.charWidth(str[idx]);
+				++idx;
+				++charCount;
 			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < 128);
 
 			if (str[idx] || width >= 298) {
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 88265f6a19..2b808a085a 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -86,6 +86,8 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_find = 0;
 	_oldUse = 0;
 	_endKeyActive = true;
+	_lookScriptFlag = false;
+	_infoFlag = false;
 }
 
 UserInterface::~UserInterface() {
-- 
cgit v1.2.3


From 461d5c64f27c2cf86890a9ba8d7df8a63f6278e7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 11 Apr 2015 23:42:11 -0500
Subject: SHERLOCK: Fixes for opening door

---
 engines/sherlock/objects.cpp        |  40 ++++++--
 engines/sherlock/objects.h          |   8 +-
 engines/sherlock/people.h           |  15 ++-
 engines/sherlock/scene.cpp          |  15 ++-
 engines/sherlock/talk.cpp           |   2 +-
 engines/sherlock/user_interface.cpp | 197 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/user_interface.h   |   1 +
 7 files changed, 254 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index e4730ef207..dc57322bd4 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -248,7 +248,7 @@ void Sprite::checkSprite() {
 
 					case TALK:
 					case TALK_EVERY:
-						_type = HIDDEN;
+						obj._type = HIDDEN;
 						obj.setFlagsAndToggles();
 						talk.talkTo(obj._use[0]._target);
 						break;
@@ -400,6 +400,36 @@ void Object::setVm(SherlockEngine *vm) {
 	_countCAnimFrames = false;
 }
 
+Object::Object() {
+	_sequenceOffset = 0;
+	_sequences = nullptr;
+	_images = nullptr;
+	_imageFrame = nullptr;
+	_walkCount = 0;
+	_allow = 0;
+	_frameNumber = 0;
+	_sequenceNumber = 0;
+	_type = INVALID;
+	_pickup = 0;
+	_defaultCommand = 0;
+	_lookFlag = 0;
+	_pickupFlag = 0;
+	_requiredFlag = 0;
+	_status = 0;
+	_misc = 0;
+	_maxFrames = 0;
+	_flags = 0;
+	_lookFrames = 0;
+	_seqCounter = 0;
+	_lookFacing = 0;
+	_lookcAnim = 0;
+	_seqStack = 0;
+	_seqTo = 0;
+	_descOffset = 0;
+	_seqCounter2 = 0;
+	_seqSize = 0;
+}
+
 /**
  * Load the object data from the passed stream
  */
@@ -770,7 +800,7 @@ void Object::setObjSequence(int seq, bool wait) {
 * @param messages	Provides a lookup list of messages that can be printed
 * @returns		0 if no codes are found, 1 if codes were found
 */
-int Object::checkNameForCodes(const Common::String &name, Common::StringArray *messages) {
+int Object::checkNameForCodes(const Common::String &name, const char *const messages[]) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -851,15 +881,13 @@ int Object::checkNameForCodes(const Common::String &name, Common::StringArray *m
 		int messageNum = atoi(name.c_str() + 1);
 		ui._infoFlag++;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
-			(*messages)[messageNum].c_str());
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[messageNum]);
 		ui._menuCounter = 25;
 	} else if (name.hasPrefix("@")) {
 		// Message attached to canimation
 		ui._infoFlag++;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
-			"%s", name.c_str() + 1);
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, name.c_str() + 1);
 		printed = true;
 		ui._menuCounter = 25;
 	}
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 26ad1d3900..2c642b5a58 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -34,7 +34,7 @@ namespace Sherlock {
 class SherlockEngine;
 
 enum ObjectAllow {
-	ALLOW_MOVEMENT = 1, ALLOW_OPEN = 2, ALLOW_CLOSE = 4
+	ALLOW_MOVE = 1, ALLOW_OPEN = 2, ALLOW_CLOSE = 4
 };
 
 enum SpriteType {
@@ -122,6 +122,8 @@ public:
 	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
 };
 
+enum { REVERSE_DIRECTION = 0x80 };
+
 struct ActionType {
 	int8 _cAnimNum;
 	uint8 _cAnimSpeed;				// if high bit set, play in reverse
@@ -198,13 +200,15 @@ public:
 	ActionType _aMove;
 	UseType _use[4];
 
+	Object();
+
 	void synchronize(Common::SeekableReadStream &s);
 
 	void toggleHidden();
 
 	void checkObject(Object &o);
 
-	int checkNameForCodes(const Common::String &name, Common::StringArray *messages);
+	int checkNameForCodes(const Common::String &name, const char *const messages[]);
 
 	void setFlagsAndToggles();
 
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index bec078d11e..ba870d041d 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -34,7 +34,8 @@ enum PeopleId {
 	PLAYER	= 0,
 	AL		= 0,
 	PEG		= 1,
-	MAX_PEOPLE = 66
+	NUM_OF_PEOPLE = 2,		// Holmes and Watson
+	MAX_PEOPLE = 66			// Total of all NPCs
 };
 
 // Animation sequence identifiers for characters
@@ -62,7 +63,7 @@ public:
 class People {
 private:
 	SherlockEngine *_vm;
-	Person _data[MAX_PEOPLE];
+	Person _data[NUM_OF_PEOPLE];
 	bool _walkLoaded;
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
@@ -84,8 +85,14 @@ public:
 	People(SherlockEngine *vm);
 	~People();
 
-	Person &operator[](PeopleId id) { return _data[id]; }
-	Person &operator[](int idx) { return _data[idx]; }
+	Person &operator[](PeopleId id) { 
+		assert(id < NUM_OF_PEOPLE);
+		return _data[id]; 
+	}
+	Person &operator[](int idx) { 
+		assert(idx < NUM_OF_PEOPLE);
+		return _data[idx]; 
+	}
 
 	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 3d5f566164..1cad2506e5 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -314,8 +314,8 @@ bool Scene::loadScene(const Common::String &filename) {
 		for (uint idx = 0; idx < _zones.size(); ++idx) {
 			_zones[idx].left = boundsStream->readSint16LE();
 			_zones[idx].top = boundsStream->readSint16LE();
-			_zones[idx].setWidth(boundsStream->readSint16LE());
-			_zones[idx].setHeight(boundsStream->readSint16LE());
+			_zones[idx].setWidth(boundsStream->readSint16LE() + 1);
+			_zones[idx].setHeight(boundsStream->readSint16LE() + 1);
 			boundsStream->skip(2);	// Skip unused scene number field
 		}
 
@@ -925,20 +925,18 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 			rrmStream->seek(rrmStream->readUint32LE());
 
 			// Load the canimation into the cache
-			Common::SeekableReadStream *imgStream = !_lzwMode ? rrmStream :
+			Common::SeekableReadStream *imgStream = !_lzwMode ? rrmStream->readStream(cAnim._size) : 
 				decompressLZ(*rrmStream, cAnim._size);
 			res.addToCache(fname, *imgStream);
 
-			if (_lzwMode)
-				delete imgStream;
-
+			delete imgStream;
 			delete rrmStream;
 		}
 
 		// Now load the resource as an image
-		cObj._maxFrames = cObj._images->size();
 		cObj._images = new ImageFile(fname);
 		cObj._imageFrame = &(*cObj._images)[0];
+		cObj._maxFrames = cObj._images->size();
 
 		int frames = 0;
 		if (playRate < 0) {
@@ -946,8 +944,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 			// Count number of frames
 			while (cObj._sequences[frames] && frames < MAX_FRAME)
 				++frames;
-		}
-		else {
+		} else {
 			// Forward direction
 			Object::_countCAnimFrames = true;
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ec3f67bd84..281b6b4672 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -583,7 +583,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 
 	// Check for an existing person being talked to
 	_talkTo = -1;
-	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+	for (int idx = 0; idx < NUM_OF_PEOPLE; ++idx) {
 		if (!scumm_strnicmp(filename.c_str(), people[(PeopleId)idx]._portrait.c_str(), 4)) {
 			_talkTo = idx;
 			break;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 2b808a085a..ebbe00ffbc 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -58,6 +58,25 @@ const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
 const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
 const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
 
+const char *const MOPEN[] = { 
+	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "." 
+};
+const char *const MCLOSE[] = { 
+	"This cannot be closed", "It is already closed", "The safe door is in the way" 
+};
+const char *const MMOVE[] = { 
+	"This cannot be moved", "It is bolted to the floor", "It is too heavy", "The other crate is in the way"
+};
+const char *const MPICK[] = {
+	"Nothing of interest here", "It is bolted down", "It is too big to carry", "It is too heavy",
+	"I think a girl would be more your type", "Those flowers belong to Penny", "She's far too young for you!", 
+	"I think a girl would be more your type!", "Government property for official use only" 
+};
+const char *const MUSE[] = { 
+	"You can't do that", "It had no effect", "You can't reach it", "OK, the door looks bigger! Happy?", 
+	"Doors don't smoke" 
+};
+
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
@@ -327,7 +346,7 @@ void UserInterface::handleInput() {
 			break;
 
 		case MOVE_MODE:
-			doMiscControl(ALLOW_MOVEMENT);
+			doMiscControl(ALLOW_MOVE);
 			break;
 
 		case TALK_MODE:
@@ -1122,8 +1141,56 @@ void UserInterface::doMainControl() {
 	}
 }
 
+/**
+ * Handles the input for the MOVE, OPEN, and CLOSE commands
+ */
 void UserInterface::doMiscControl(int allowed) {
-	// TODO
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+
+	if (events._released) {
+		_temp = _bgFound;
+		if (_bgFound != -1) {
+			// Only allow pointing to objects, not people
+			if (_bgFound < 1000) {
+				events.clearEvents();
+				Object &obj = scene._bgShapes[_bgFound];
+
+				switch (allowed) {
+				case ALLOW_OPEN:
+					checkAction(obj._aOpen, MOPEN, _temp);
+					if (_menuMode && !talk._talkToAbort) {
+						_menuMode = STD_MODE;
+						restoreButton(OPEN_MODE - 1);
+						_key = _oldKey = -1;
+					}
+					break;
+
+				case ALLOW_CLOSE:
+					checkAction(obj._aClose, MCLOSE, _temp);
+					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
+						_menuMode = STD_MODE;
+						restoreButton(CLOSE_MODE - 1);
+						_key = _oldKey = -1;
+					}
+					break;
+
+				case ALLOW_MOVE:
+					checkAction(obj._aMove, MMOVE, _temp);
+					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
+						_menuMode = STD_MODE;
+						restoreButton(MOVE_MODE - 1);
+						_key = _oldKey = -1;
+					}
+					break;
+
+				default:
+					break;
+				}
+			}
+		}
+	}
 }
 
 void UserInterface::doPickControl() {
@@ -1503,5 +1570,131 @@ void UserInterface::checkUseAction(UseType &use, const Common::String &invName,
 	// TODO
 }
 
+/**
+ * Called for OPEN, CLOSE, and MOVE actions are being done
+ */
+void UserInterface::checkAction(ActionType &action, const char *const messages[], int objNum) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	bool printed = false;
+	bool doCAnim = true;
+	int cAnimNum;
+	Common::Point pt(-1, -1);
+	int dir = -1;
+
+	if (objNum >= 1000)
+		// Ignore actions done on characters
+		return;
+	Object &obj = scene._bgShapes[objNum];
+
+	if (action._cAnimNum == 0)
+		// Really a 10
+		cAnimNum = 9;
+	else
+		cAnimNum = action._cAnimNum - 1;
+	CAnim &anim = scene._cAnim[cAnimNum];
+
+	if (action._cAnimNum != 99) {
+		if (action._cAnimSpeed & REVERSE_DIRECTION) {
+			pt = anim._teleportPos;
+			dir = anim._teleportDir;
+		} else {
+			pt = anim._goto;
+			dir = anim._gotoDir;
+		}
+	}
+
+	if (action._cAnimSpeed) {
+		// Has a value, so do action
+		// Show wait cursor whilst walking to object and doing action
+		events.setCursor(WAIT);
+
+		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+			if (action._names[nameIdx].hasPrefix("*") && toupper(action._names[nameIdx][1]) == 'W') {
+				if (obj.checkNameForCodes(Common::String(action._names[nameIdx].c_str() + 2), messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+		}
+
+		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+			if (action._names[nameIdx].hasPrefix("*")) {
+				char ch = toupper(action._names[nameIdx][1]);
+
+				if (ch == 'T' || ch == 'B') {
+					printed = true;
+					if (pt.x != -1)
+						// Holmes needs to walk to object before the action is done
+						people.walkToCoords(pt, dir);
+
+					if (!talk._talkToAbort) {
+						// Ensure Holmes is on the exact intended location
+						people[AL]._position = pt;
+						people[AL]._sequenceNumber = dir;
+						people.gotoStand(people[AL]);
+
+						talk.talkTo(action._names[nameIdx] + 2);
+						if (ch == 'T')
+							doCAnim = false;
+					}
+				}
+			}
+		}
+
+		if (doCAnim && !talk._talkToAbort) {
+			if (pt.x != -1)
+				// Holmes needs to walk to object before the action is done
+				people.walkToCoords(pt, dir);
+		}
+
+		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+			if (action._names[nameIdx].hasPrefix("*") && toupper(action._names[nameIdx][1]) == 'F') {
+				if (obj.checkNameForCodes(action._names[nameIdx].c_str() + 2, messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+		}
+
+		if (doCAnim && !talk._talkToAbort && action._cAnimNum != 99)
+			scene.startCAnim(cAnimNum, action._cAnimSpeed);
+
+		if (!talk._talkToAbort) {
+			for (int nameIdx = 0; nameIdx < 4 && !talk._talkToAbort; ++nameIdx) {
+				if (obj.checkNameForCodes(action._names[nameIdx], messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+
+			// Unless we're leaving the scene, print a "Done" message unless the printed flag has been set
+			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
+				_infoFlag = true;
+				clearInfo();
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[action._cAnimNum]);
+
+				// Set how long to show the message
+				_menuCounter = 30;	
+			}
+		}
+	} else {
+		// Invalid action, to print error message
+		_infoFlag = true;
+		clearInfo();
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[action._cAnimNum]);
+		_infoFlag = true;
+
+		// Set how long to show the message
+		_menuCounter = 30;
+	}
+
+	// Reset cursor back to arrow
+	events.setCursor(ARROW);
+}
+
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index f80fe48b2d..9b104465cf 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -117,6 +117,7 @@ private:
 
 	void checkUseAction(UseType &use, const Common::String &invName, const Common::String &msg,
 		int objNum, int giveMode);
+	void checkAction(ActionType &action, const char *const messages[], int objNum);
 public:
 	MenuMode _menuMode;
 	int _menuCounter;
-- 
cgit v1.2.3


From 454b6a2bbe38a4540769ad5cf51290b7a19524e4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 12 Apr 2015 11:06:25 -0500
Subject: SHERLOCK: Implemented pick up code

---
 engines/sherlock/inventory.h        |  3 +-
 engines/sherlock/objects.cpp        | 91 +++++++++++++++++++++++++++++++++++++
 engines/sherlock/objects.h          |  2 +
 engines/sherlock/user_interface.cpp | 27 ++++++++++-
 engines/sherlock/user_interface.h   |  1 +
 5 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 436d2bc18d..4e426beaf4 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -62,8 +62,6 @@ class Inventory : public Common::Array<InventoryItem> {
 private:
 	SherlockEngine *_vm;
 
-	int putItemInInventory(Object &obj);
-
 	void copyToInventory(Object &obj);
 public:
 	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
@@ -98,6 +96,7 @@ public:
 	void doInvJF();
 
 	int putNameInInventory(const Common::String &name);
+	int putItemInInventory(Object &obj);
 
 	int deleteItemFromInventory(const Common::String &name);
 };
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index dc57322bd4..cab35f9634 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -947,6 +947,97 @@ void Object::adjustObject() {
 	}
 }
 
+/**
+ * Handles trying to pick up an object. If allowed, plays an y necessary animation for picking
+ * up the item, and then adds it to the player's inventory
+ */
+int Object::pickUpObject(const char *const messages[]) {
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
+	int pickup = _pickup & 0x7f;
+	bool printed = false;
+	bool takeFlag = true;
+	int numObjects = 0;
+	int message;
+
+	if (pickup == 99) {
+		for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
+			if (checkNameForCodes(_use[0]._names[idx], nullptr)) {
+				if (!talk._talkToAbort)
+					printed = true;
+			}
+		}
+
+		return 0;
+	}
+
+	if (!pickup || (pickup > 50 && pickup <= 80)) {
+		int message = _pickup;
+		if (message > 50)
+			message -= 50;
+
+		++ui._infoFlag;
+		ui.clearInfo();
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_LINE, messages[message]);
+		ui._menuCounter = 30;
+	} else {
+		// Pick it up
+		if ((_pickup & 0x80) == 0) {
+			// Play an animation
+			if (pickup > 80) {
+				takeFlag = false;		// Don't pick it up
+				scene.startCAnim(pickup - 81, 1);
+				if (_pickupFlag)
+					_vm->setFlags(_pickupFlag);
+			} else {
+				scene.startCAnim(pickup - 1, 1);
+				if (!talk._talkToAbort) {
+					// Erase the shape
+					_type = _type == NO_SHAPE ? INVALID : REMOVE;
+				}
+			}
+
+			if (talk._talkToAbort)
+				return 0;
+		} else {
+			// Play generic pickup sequence
+			// Original moved cursor position here
+			people.goAllTheWay();
+			ui._menuCounter = 25;
+			ui._temp1 = 1;
+		}
+
+		for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
+			if (checkNameForCodes(_use[0]._names[idx], nullptr)) {
+				if (!talk._talkToAbort)
+					printed = true;
+			}
+		}
+		if (talk._talkToAbort)
+			return 0;
+
+		// Add the item to the player's inventory
+		if (takeFlag)
+			numObjects = inv.putItemInInventory(*this);
+
+		if (!printed) {
+			ui._infoFlag++;
+			ui.clearInfo();
+			
+			Common::String itemName = _description;
+			itemName.setChar(tolower(itemName[0]), 0);
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Picked up %s", itemName.c_str());
+			ui._menuCounter = 25;
+		}
+	}
+
+	return numObjects;
+}
+
 /**
  * Returns the current bounds for the sprite
  */
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 2c642b5a58..534ed66643 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -214,6 +214,8 @@ public:
 
 	void adjustObject();
 
+	int pickUpObject(const char *const messages[]);
+
 	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
 	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
 	const Common::Rect getNewBounds() const;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ebbe00ffbc..9104c761a0 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -92,6 +92,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_lookHelp = 0;
 	_key = _oldKey = 0;
 	_temp = _oldTemp = 0;
+	_temp1 = 0;
 	_invLookFlag = 0;
 	_windowOpen = false;
 	_oldLook = false;
@@ -711,6 +712,9 @@ void UserInterface::lookInv() {
 	}
 }
 
+/**
+ * Handles input when the file list window is being displayed
+ */
 void UserInterface::doEnvControl() {
 	// TODO
 }
@@ -1193,8 +1197,29 @@ void UserInterface::doMiscControl(int allowed) {
 	}
 }
 
+/**
+ * Handles input for picking up items
+ */
 void UserInterface::doPickControl() {
-	// TODO
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+
+	if (events._released) {
+		if ((_temp = _bgFound) != -1) {
+			events.clearEvents();
+
+			// Don't allow characters to be picked up
+			if (_bgFound < 1000) {
+				scene._bgShapes[_bgFound].pickUpObject(MPICK);
+
+				if (_menuMode != TALK_MODE) {
+					_key = _oldKey = -1;
+					_menuMode = STD_MODE;
+					restoreButton(PICKUP_MODE - 1);
+				}
+			}
+		}
+	}
 }
 
 void UserInterface::doTalkControl() {
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 9b104465cf..c4a07abc76 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -125,6 +125,7 @@ public:
 	bool _windowOpen;
 	bool _endKeyActive;
 	int _invLookFlag;
+	int _temp1;
 public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
-- 
cgit v1.2.3


From c9890cbacc7bf6a1216cadf6eddc04832f0ebbe4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 12 Apr 2015 17:55:55 -0500
Subject: SHERLOCK: Implementing event handling for talk display

---
 engines/sherlock/people.cpp         |   1 +
 engines/sherlock/people.h           |   1 +
 engines/sherlock/talk.h             |   4 +-
 engines/sherlock/user_interface.cpp | 254 +++++++++++++++++++++++++++++++++++-
 4 files changed, 258 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 5c7f9ef506..e6a4eeed0f 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -203,6 +203,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_portraitSide = 0;
 	_speakerFlip = false;
 	_holmesFlip = false;
+	_homesQuotient = 0;
 }
 
 People::~People() {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index ba870d041d..601fe6006b 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -81,6 +81,7 @@ public:
 	int _portraitSide;
 	bool _speakerFlip;
 	bool _holmesFlip;
+	int _homesQuotient;
 public:
 	People(SherlockEngine *vm);
 	~People();
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 1a7dd587da..c4b5fe46d2 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -79,8 +79,10 @@ struct TalkSequences {
 };
 
 class SherlockEngine;
+class UserInterface;
 
 class Talk {
+	friend class UserInterface;
 private:
 	Common::Array<TalkSequences> STILL_SEQUENCES;
 	Common::Array<TalkSequences> TALK_SEQUENCES;
@@ -97,7 +99,6 @@ private:
 	int _converseNum;
 	int _talkStealth;
 	int _talkToFlag;
-	bool _moreTalkUp, _moreTalkDown;
 	int _scriptSaveIndex;
 	int _scriptCurrentIndex;
 private:
@@ -117,6 +118,7 @@ public:
 	int _talkTo;
 	int _scriptMoreFlag;
 	Common::String _scriptName;
+	bool _moreTalkUp, _moreTalkDown;
 public:
 	Talk(SherlockEngine *vm);
 	void setSequences(const byte *talkSequences, const byte *stillSequences,
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 9104c761a0..70f284c359 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1222,8 +1222,260 @@ void UserInterface::doPickControl() {
 	}
 }
 
+/**
+ * Handles input when in talk mode. It highlights the buttons and available statements,
+ * and handles allowing the user to click on them
+ */
 void UserInterface::doTalkControl() {
-	// TODO
+	Events &events = *_vm->_events;
+	Journal &journal = *_vm->_journal;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
+	Common::Point mousePos = events.mousePos();
+	int select;
+
+	_key = _oldKey = -1;
+	_keyboardInput = false;
+
+	if (events._pressed || events._released) {
+		events.clearKeyboard();
+
+		// Handle button printing
+		if (mousePos.x > 99 && mousePos.x < 138 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && !_endKeyActive)
+			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Exit");
+		else if (_endKeyActive)
+			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
+		
+		if (mousePos.x > 140 && mousePos.x < 170 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkUp)
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Up");
+		else if (talk._moreTalkUp)
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_FOREGROUND, true, "Up");
+
+		if (mousePos.x > 181&& mousePos.x < 220 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkDown)
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Down");
+		else if (talk._moreTalkDown)
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, true, "Down");
+
+		bool found = false;
+		for (_selector = talk._talkIndex; _selector < (int)talk._statements.size() && !found; ++_selector) {
+			if (mousePos.y > talk._statements[_selector]._talkPos.top &&
+					mousePos.y < talk._statements[_selector]._talkPos.bottom)
+				found = true;
+		}
+		--_selector;
+		if (!found)
+			_selector = -1;
+	}
+
+	if (_keycode != Common::KEYCODE_INVALID) {
+		_key = toupper(_keycode);
+		if (_key == Common::KEYCODE_ESCAPE)
+			_key = 'E';
+
+		// Check for number press indicating reply line
+		if (_key >= '1' && _key <= ('1' + (int)talk._statements.size() - 1)) {
+			for (uint idx = 0; idx < talk._statements.size(); ++idx) {
+				if (talk._statements[idx]._talkMap == (_key - '1')) {
+					// Found the given statement
+					_selector = idx;
+					_key = -1;
+					_keyboardInput = true;
+					break;
+				}
+			}
+		} else if (_key == 'E' || _key == 'U' || _key == 'D') {
+			_keyboardInput = true;
+		} else {
+			_selector = -1;
+		}
+	}
+
+	if (_selector != _oldSelector) {
+		// Remove highlighting from previous line, if any
+		if (_oldSelector != -1) {
+			if (!((talk._talkHistory[talk._converseNum][_oldSelector] >> (_oldSelector & 7)) & 1))
+				talk.talkLine(_oldSelector, talk._statements[_oldSelector]._talkMap, INV_FOREGROUND,
+					talk._statements[_oldSelector]._talkPos.top, true);
+			else
+				talk.talkLine(_oldSelector, talk._statements[_oldSelector]._talkMap, TALK_NULL,
+					talk._statements[_oldSelector]._talkPos.top, true);
+		}
+
+		// Add highlighting to new line, if any
+		if (_selector != -1)
+			talk.talkLine(_selector, talk._statements[_selector]._talkMap, TALK_FOREGROUND,
+				talk._statements[_selector]._talkPos.top, true);
+	}
+
+	if (events._released || _keyboardInput) {
+		if (_endKeyActive && ((mousePos.x > 99 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10)
+				&& talk._moreTalkUp && events._released) || _key == 'E')) {
+			talk.freeTalkVars();
+			talk.pullSequence();
+			banishWindow();
+			_windowBounds.top = CONTROLS_Y1;
+		} else if ((mousePos.x > 140 && mousePos.x < 179 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10)
+				&& talk._moreTalkUp && events._released) || (talk._moreTalkUp && _key == 'U')) { 
+			while (talk._statements[--talk._talkIndex]._talkMap == -1)
+				;
+			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+				SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+			talk.displayTalk(false);
+
+			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
+		} else if ((mousePos.x > 181 && mousePos.x < 220 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10)
+				&& talk._moreTalkDown && events._released) || (talk._moreTalkDown && _key == 'D')) { 
+			do {
+				++talk._talkIndex;
+			} while (talk._talkIndex < (int)talk._statements.size() && talk._statements[talk._talkIndex]._talkMap == -1);
+
+			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+				SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+			talk.displayTalk(false);
+
+			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
+		} else if (_selector != -1) {
+			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, true, "Exit");
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, true, "Up");
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, true, "Down");
+
+			// If the reply is new, add it to the journal
+			if (!talk._talkHistory[talk._converseNum][_selector]) {
+				journal.record(talk._converseNum, _selector);
+
+				// Add any Holmes point to Holmes' total, if any
+				if (talk._statements[_selector]._quotient)
+					people._homesQuotient += talk._statements[_selector]._quotient;
+			}
+
+			// Flag the response as having been used
+			talk._talkHistory[talk._converseNum][_selector] = true;
+		
+			clearWindow();
+			screen.print(Common::Point(16, CONTROLS_Y + 12), TALK_FOREGROUND, "Sherlock Holmes");
+			talk.talkLine(_selector + 128, talk._statements[_selector]._talkMap, COMMAND_FOREGROUND, CONTROLS_Y + 21, true);
+
+			switch (talk._statements[_selector]._portraitSide & 3) {
+			case 0:
+			case 1:
+				people._portraitSide = 20;
+				break;
+			case 2:
+				people._portraitSide = 220;
+				break;
+			case 3:
+				people._portraitSide = 120;
+				break;
+			}
+
+			// Check for flipping Holmes
+			if (talk._statements[_selector]._portraitSide & REVERSE_DIRECTION)
+				people._holmesFlip = true;
+
+			talk._speaker = 0;
+			people.setTalking(0);
+
+			if (!talk._statements[_selector]._voiceFile.empty() && sound._voices) {
+				sound.playSound(talk._statements[_selector]._voiceFile);
+
+				// Set voices as an indicator for waiting
+				sound._voices = 2;
+				sound._speechOn = *sound._soundIsOn;
+			} else {
+				sound._speechOn = false;
+			}
+
+			// Set the _scriptCurrentIndex so if the statement is irrupted, the entire
+			// reply will be shown when it's restarted
+			talk._scriptCurrentIndex = 0;
+			talk.waitForMore(talk._statements[_selector]._statement.size());
+			if (talk._talkToAbort)
+				return;
+
+			people.clearTalking();
+			if (talk._talkToAbort)
+				return;
+
+			while (!_vm->shouldQuit()) {
+				talk._scriptSelect = _selector;
+				talk._speaker = talk._talkTo;
+				talk.doScript(talk._statements[_selector]._reply);
+
+				if (!talk._talkToAbort) {
+					if (!talk._talkStealth)
+						clearWindow();
+
+					if (!talk._statements[_selector]._modified.empty()) {
+						for (uint idx = 0; idx < talk._statements[_selector]._modified.size(); ++idx) {
+							_vm->setFlags(talk._statements[_selector]._modified[idx]);
+						}
+
+						talk.setTalkMap();
+					}
+
+					// Check for another linked talk file
+					Common::String linkFilename = talk._statements[_selector]._linkFile;
+					if (!linkFilename.empty() && !talk._scriptMoreFlag) {
+						talk.freeTalkVars();
+						talk.loadTalkFile(linkFilename);
+
+						// Find the first new statement
+						select = _selector = _oldSelector = -1;
+						for (uint idx = 0; idx < talk._statements.size() && select == -1; ++idx) {
+							if (!talk._statements[idx]._talkMap)
+								select = talk._talkIndex = idx;
+						}
+
+						// See if the new statement is a stealth reply
+						talk._talkStealth = talk._statements[select]._statement.hasPrefix("^") ? 2 : 0;
+
+						// Is the new talk file a standard file, reply first file, or a stealth file
+						if (!talk._statements[select]._statement.hasPrefix("*") &&
+								!talk._statements[select]._statement.hasPrefix("^")) {
+							// Not a reply first file, so display the new selections
+							if (_endKeyActive)
+								screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
+							else
+								screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, true, "Exit");
+
+							talk.displayTalk(true);
+							events.setCursor(ARROW);
+							break;
+						} else {
+							_selector = select;
+
+							if (!talk._talkHistory[talk._converseNum][_selector])
+								journal.record(talk._converseNum, _selector);
+
+							talk._talkHistory[talk._converseNum][_selector] = true;
+						}
+					} else {
+						talk.freeTalkVars();
+						talk.pullSequence();
+						banishWindow();
+						_windowBounds.top = CONTROLS_Y1;
+						break;
+					}
+				} else {
+					break;
+				}
+			}
+
+			events._pressed = events._released = false;
+			events._oldButtons = 0;
+			talk._talkStealth = 0;
+
+			// If a script was pushed onto the script stack, restore it
+			if (!talk._scriptStack.empty()) {
+				SequenceEntry seqEntry = talk._scriptStack.pop();
+//				talk._scriptName = seqEntry.
+				// TODO
+			}
+		}
+	}
 }
 
 void UserInterface::journalControl() {
-- 
cgit v1.2.3


From e8e095aa2ad7f3914b3b8dd4826c2d13e35b1163 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 12 Apr 2015 19:11:34 -0500
Subject: SHERLOCK: Fix mixups with sequence stack and script stack

---
 engines/sherlock/talk.cpp           | 6 +++---
 engines/sherlock/talk.h             | 3 ++-
 engines/sherlock/user_interface.cpp | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 281b6b4672..a40d3ace2d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -883,7 +883,7 @@ void Talk::pullSequence() {
 	if (_scriptStack.empty())
 		return;
 
-	SequenceEntry seq = _scriptStack.pop();
+	SequenceEntry seq = _sequenceStack.pop();
 	if (seq._objNum != -1) {
 		Object &obj = scene._bgShapes[seq._objNum];
 
@@ -911,7 +911,7 @@ void Talk::pushSequence(int speaker) {
 	if (speaker == -1)
 		return;
 
-	ScriptStackEntry seqEntry;
+	SequenceEntry seqEntry;
 	if (!speaker) {
 		seqEntry._objNum = -1;
 	} else {
@@ -925,7 +925,7 @@ void Talk::pushSequence(int speaker) {
 		seqEntry._seqTo = obj._seqTo;
 	}
 	
-	_scriptStack.push(seqEntry);
+	_sequenceStack.push(seqEntry);
 	if (_scriptStack.size() >= 5)
 		error("script stack overflow");
 }
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index c4b5fe46d2..bf4f12675c 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -40,7 +40,7 @@ struct SequenceEntry {
 	int _seqTo;
 };
 
-struct ScriptStackEntry : public SequenceEntry {
+struct ScriptStackEntry {
 	Common::String _name;
 	int _currentIndex;
 	int _select;
@@ -90,6 +90,7 @@ private:
 	SherlockEngine *_vm;
 	int _saveSeqNum;
 	Common::Stack<SequenceEntry> _savedSequences;
+	Common::Stack<SequenceEntry> _sequenceStack;
 	Common::Stack<ScriptStackEntry> _scriptStack;
 	Common::Array<Statement> _statements;
 	TalkHistoryEntry _talkHistory[500];
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 70f284c359..e20813822e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1233,7 +1233,6 @@ void UserInterface::doTalkControl() {
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
-	UserInterface &ui = *_vm->_ui;
 	Common::Point mousePos = events.mousePos();
 	int select;
 
@@ -1470,9 +1469,10 @@ void UserInterface::doTalkControl() {
 
 			// If a script was pushed onto the script stack, restore it
 			if (!talk._scriptStack.empty()) {
-				SequenceEntry seqEntry = talk._scriptStack.pop();
-//				talk._scriptName = seqEntry.
-				// TODO
+				ScriptStackEntry stackEntry = talk._scriptStack.pop();
+				talk._scriptName = stackEntry._name;
+				talk._scriptSaveIndex = stackEntry._currentIndex;
+				talk._scriptSelect = stackEntry._select;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 383c0bf3fa094ca3ea2935220ac9e5746ccf8a3d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 12 Apr 2015 20:11:47 -0400
Subject: IMAGE: Make the createQuickTimeDitherTable function public

Needed for access by QuickTime directly
---
 image/codecs/codec.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/image/codecs/codec.h b/image/codecs/codec.h
index 8845754d52..5c072132d3 100644
--- a/image/codecs/codec.h
+++ b/image/codecs/codec.h
@@ -111,7 +111,6 @@ public:
 	 */
 	virtual void setDither(DitherType type, const byte *palette) {}
 
-protected:
 	/**
 	 * Create a dither table, as used by QuickTime codecs.
 	 */
-- 
cgit v1.2.3


From 49885d686edd522442b035986a4994c20fcc6cb2 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 12 Apr 2015 20:12:38 -0400
Subject: VIDEO: Implement fallback dithering for QuickTime videos

Used for any codec without direct dithering support
---
 video/qt_decoder.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++--
 video/qt_decoder.h   |   8 +++-
 2 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index cab7372a6d..324bf65294 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -292,6 +292,9 @@ QuickTimeDecoder::VideoTrackHandler::VideoTrackHandler(QuickTimeDecoder *decoder
 	_curPalette = 0;
 	_dirtyPalette = false;
 	_reversed = false;
+	_forcedDitherPalette = 0;
+	_ditherTable = 0;
+	_ditherFrame = 0;
 }
 
 QuickTimeDecoder::VideoTrackHandler::~VideoTrackHandler() {
@@ -299,6 +302,14 @@ QuickTimeDecoder::VideoTrackHandler::~VideoTrackHandler() {
 		_scaledSurface->free();
 		delete _scaledSurface;
 	}
+
+	delete[] _forcedDitherPalette;
+	delete[] _ditherTable;
+
+	if (_ditherFrame) {
+		_ditherFrame->free();
+		delete _ditherFrame;
+	}
 }
 
 bool QuickTimeDecoder::VideoTrackHandler::endOfTrack() const {
@@ -382,6 +393,9 @@ uint16 QuickTimeDecoder::VideoTrackHandler::getHeight() const {
 }
 
 Graphics::PixelFormat QuickTimeDecoder::VideoTrackHandler::getPixelFormat() const {
+	if (_forcedDitherPalette)
+		return Graphics::PixelFormat::createFormatCLUT8();
+
 	return ((VideoSampleDesc *)_parent->sampleDescs[0])->_videoCodec->getPixelFormat();
 }
 
@@ -463,6 +477,10 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame()
 		}
 	}
 
+	// Handle forced dithering
+	if (frame && _forcedDitherPalette)
+		frame = forceDither(*frame);
+
 	if (frame && (_parent->scaleFactorX != 1 || _parent->scaleFactorY != 1)) {
 		if (!_scaledSurface) {
 			_scaledSurface = new Graphics::Surface();
@@ -476,6 +494,11 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame()
 	return frame;
 }
 
+const byte *QuickTimeDecoder::VideoTrackHandler::getPalette() const {
+	_dirtyPalette = false;
+	return _forcedDitherPalette ? _forcedDitherPalette : _curPalette;
+}
+
 bool QuickTimeDecoder::VideoTrackHandler::setReverse(bool reverse) {
 	_reversed = reverse;
 
@@ -757,9 +780,6 @@ bool QuickTimeDecoder::VideoTrackHandler::canDither() const {
 
 		if (!desc || !desc->_videoCodec)
 			return false;
-
-		if (!desc->_videoCodec->canDither(Image::Codec::kDitherTypeQT))
-			return false;
 	}
 
 	return true;
@@ -770,8 +790,85 @@ void QuickTimeDecoder::VideoTrackHandler::setDither(const byte *palette) {
 
 	for (uint i = 0; i < _parent->sampleDescs.size(); i++) {
 		VideoSampleDesc *desc = (VideoSampleDesc *)_parent->sampleDescs[i];
-		desc->_videoCodec->setDither(Image::Codec::kDitherTypeQT, palette);
+
+		if (desc->_videoCodec->canDither(Image::Codec::kDitherTypeQT)) {
+			// Codec dither
+			desc->_videoCodec->setDither(Image::Codec::kDitherTypeQT, palette);
+		} else {
+			// Forced dither
+			_forcedDitherPalette = new byte[256 * 3];
+			memcpy(_forcedDitherPalette, palette, 256 * 3);
+			_ditherTable = Image::Codec::createQuickTimeDitherTable(_forcedDitherPalette, 256);
+			_dirtyPalette = true;
+		}
+	}
+}
+
+namespace {
+
+// Return a pixel in RGB554
+uint16 makeDitherColor(byte r, byte g, byte b) {
+	return ((r & 0xF8) << 6) | ((g & 0xF8) << 1) | (b >> 4);
+}
+
+// Default template to convert a dither color
+template<typename PixelInt>
+inline uint16 readDitherColor(PixelInt srcColor, const Graphics::PixelFormat& format, const byte *palette) {
+	byte r, g, b;
+	format.colorToRGB(srcColor, r, g, b);
+	return makeDitherColor(r, g, b);
+}
+
+// Specialized version for 8bpp
+template<>
+inline uint16 readDitherColor(byte srcColor, const Graphics::PixelFormat& format, const byte *palette) {
+	return makeDitherColor(palette[srcColor * 3], palette[srcColor * 3 + 1], palette[srcColor * 3 + 2]);
+}
+
+template<typename PixelInt>
+void ditherFrame(const Graphics::Surface &src, Graphics::Surface &dst, const byte *ditherTable, const byte *palette = 0) {
+	static const uint16 colorTableOffsets[] = { 0x0000, 0xC000, 0x4000, 0x8000 };
+
+	for (int y = 0; y < dst.h; y++) {
+		const PixelInt *srcPtr = (const PixelInt *)src.getBasePtr(0, y);
+		byte *dstPtr = (byte *)dst.getBasePtr(0, y);
+		uint16 colorTableOffset = colorTableOffsets[y & 3];
+
+		for (int x = 0; x < dst.w; x++) {
+			uint16 color = readDitherColor(*srcPtr++, src.format, palette);
+			*dstPtr++ = ditherTable[colorTableOffset + color];
+			colorTableOffset += 0x4000;
+		}
 	}
 }
 
+} // End of anonymous namespace
+
+const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::forceDither(const Graphics::Surface &frame) {
+	if (frame.format.bytesPerPixel == 1) {
+		// This should always be true, but this is for sanity
+		if (!_curPalette)
+			return &frame;
+
+		// If the palettes match, bail out
+		if (memcmp(_forcedDitherPalette, _curPalette, 256 * 3) == 0)
+			return &frame;
+	}
+
+	// Need to create a new one
+	if (!_ditherFrame) {
+		_ditherFrame = new Graphics::Surface();
+		_ditherFrame->create(frame.w, frame.h, Graphics::PixelFormat::createFormatCLUT8());
+	}
+
+	if (frame.format.bytesPerPixel == 1)
+		ditherFrame<byte>(frame, *_ditherFrame, _ditherTable, _curPalette);
+	else if (frame.format.bytesPerPixel == 2)
+		ditherFrame<uint16>(frame, *_ditherFrame, _ditherTable);
+	else if (frame.format.bytesPerPixel == 4)
+		ditherFrame<uint32>(frame, *_ditherFrame, _ditherTable);
+
+	return _ditherFrame;
+}
+
 } // End of namespace Video
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 99980a303d..5a6c5eebec 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -136,7 +136,7 @@ private:
 		int getFrameCount() const;
 		uint32 getNextFrameStartTime() const;
 		const Graphics::Surface *decodeNextFrame();
-		const byte *getPalette() const { _dirtyPalette = false; return _curPalette; }
+		const byte *getPalette() const;
 		bool hasDirtyPalette() const { return _curPalette; }
 		bool setReverse(bool reverse);
 		bool isReversed() const { return _reversed; }
@@ -158,6 +158,12 @@ private:
 		mutable bool _dirtyPalette;
 		bool _reversed;
 
+		// Forced dithering of frames
+		byte *_forcedDitherPalette;
+		byte *_ditherTable;
+		Graphics::Surface *_ditherFrame;
+		const Graphics::Surface *forceDither(const Graphics::Surface &frame);
+
 		Common::SeekableReadStream *getNextFramePacket(uint32 &descId);
 		uint32 getFrameDuration();
 		uint32 findKeyFrame(uint32 frame) const;
-- 
cgit v1.2.3


From d521ece7cb46ade23cdb2d342a0537716dd11400 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 12 Apr 2015 20:13:47 -0400
Subject: MOHAWK: Set dithering on any original Myst video

Fixes display of the library "swirl" video
---
 engines/mohawk/video.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index ca38f22b7a..3f27e4a1a4 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -572,10 +572,6 @@ void VideoManager::checkEnableDither(VideoEntry &entry) {
 	if (!_enableDither)
 		return;
 
-	// Ignore any video which is already 8bpp
-	if (entry->getPixelFormat().bytesPerPixel == 1)
-		return;
-
 	// Set the palette
 	byte palette[256 * 3];
 	g_system->getPaletteManager()->grabPalette(palette, 0, 256);
-- 
cgit v1.2.3


From cf878316ea66e75b715f8467ff82594fa3a32604 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 12 Apr 2015 23:20:22 -0500
Subject: SHERLOCK: Implement settings window code

---
 engines/sherlock/screen.h           |   2 +
 engines/sherlock/sherlock.cpp       |   5 +
 engines/sherlock/sherlock.h         |   4 +
 engines/sherlock/user_interface.cpp | 317 +++++++++++++++++++++++++++++++++++-
 engines/sherlock/user_interface.h   |  13 ++
 5 files changed, 340 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 4e37a7787c..2cfd7c8a88 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -126,6 +126,8 @@ public:
 	void setDisplayBounds(const Common::Rect &r);
 	void resetDisplayBounds();
 	Common::Rect getDisplayBounds();
+
+	int fontNumber() const { return _fontNumber; }
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 2a1b456b76..72c072b640 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -48,6 +48,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_loadingSavedGame = false;
 	_onChessboard = false;
 	_slowChess = false;
+	_keyPadSpeed = 0;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -177,4 +178,8 @@ void SherlockEngine::freeSaveGameList() {
 	// TODO
 }
 
+void SherlockEngine::saveConfig() {
+	// TODO
+}
+
 } // End of namespace Comet
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 7b562e0a23..ef10cd2d47 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -106,6 +106,8 @@ public:
 	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _onChessboard;
 	bool _slowChess;
+	bool _joystick;
+	int _keyPadSpeed;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
@@ -127,6 +129,8 @@ public:
 	void setFlags(int flagNum);
 
 	void freeSaveGameList();
+
+	void saveConfig();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index e20813822e..651844fd66 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -53,6 +53,23 @@ const int INVENTORY_POINTS[8][3] = {
 	{ 285, 315, 294 } 
 };
 
+const int SETUP_POINTS[12][4]  = { 
+	{ 4, 154, 101, 53 },		// Exit
+	{ 4, 165, 101, 53 },		// Music Toggle
+	{ 219, 165, 316, 268 },		// Voice Toggle
+	{ 103, 165, 217, 160 },		// Sound Effects Toggle
+	{ 219, 154, 316, 268 },		// Help Button Left/Right
+	{ 103, 154, 217, 160 },		// New Font Style
+	{ 4, 187, 101, 53 },		// Joystick Toggle
+	{ 103, 187, 217, 160 },		// Calibrate Joystick
+	{ 219, 176, 316, 268 },		// Fade Style
+	{ 103, 176, 217, 160 },		// Window Open Style
+	{ 4, 176, 101, 53 }, 		// Portraits Toggle
+	{ 219, 187, 316, 268 }		// Key Pad Accel. Toggle
+};
+
+
+
 const char COMMANDS[13] = "LMTPOCIUGJFS";
 const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
 const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
@@ -77,6 +94,162 @@ const char *const MUSE[] = {
 	"Doors don't smoke" 
 };
 
+const char *const SETUP_STRS0[2] = { "off", "on" };
+const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
+const char *const SETUP_STRS2[2] = { "Left", "Right" };
+const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
+const char *const SETUP_STRS4[2] = { "Slow", "Fast" };
+const char *const SETUP_STRS5[2] = { "Left", "Right" };
+const char *const SETUP_NAMES[12] = {
+	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
+};
+
+/*----------------------------------------------------------------*/
+
+/**
+ * Draws the interface for the settings window
+ */
+void Settings::drawInteface(bool flag) {
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	Common::String tempStr;
+
+	if (!flag) {
+		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 1), BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1 + 1, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen._backBuffer1.hLine(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH - 1, BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH - 2,
+			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+	}
+
+	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
+		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
+
+	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10), 
+		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10), 
+		SETUP_POINTS[2][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10), 
+		SETUP_POINTS[3][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Auto Help %s", SETUP_STRS5[ui._helpStyle]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10), 
+		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), 
+		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
+	tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick ? 1 : 0]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), 
+		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), 
+		SETUP_POINTS[7][3] - screen.stringWidth("Calibrate Joystick") / 2, "Calibrate Joystick");
+
+	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
+	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10), 
+		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	
+	tempStr = Common::String::format("Windows %s", ui._windowStyle ? "Slide" : "Appear");
+	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10), 
+		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
+		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
+
+	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
+		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	// Show the window immediately, or slide it on-screen 
+	if (!flag) {
+		if (!ui._windowStyle) {
+			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		} else {
+			ui.summonWindow(true, CONTROLS_Y1);
+		}
+
+		ui._windowOpen = true;
+	} else {
+		screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	}
+}
+
+int Settings::drawButtons(const Common::Point &pt, int key) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	int found = -1;
+	byte color;
+	Common::String tempStr;
+
+	for (int idx = 0; idx < 12; ++idx) {
+		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
+				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released)) 
+				|| (key == SETUP_NAMES[idx][0])) {
+			found = idx;
+			color = COMMAND_HIGHLIGHTED;
+		} else {
+			color = COMMAND_FOREGROUND;
+		}
+
+		// Print the button text
+		switch (idx) {
+		case 1: 
+			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 2: 
+			tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 3: 
+			tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 4: 
+			tempStr = Common::String::format("Auto Help %s", SETUP_STRS2[ui._helpStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 6: 
+			tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 8: 
+			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 9: 
+			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._windowStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 10: 
+			tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 11: 
+			tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		default: 
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
+			break;
+		}
+	}
+
+	return found;
+}
+
+
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
@@ -1531,8 +1704,150 @@ void UserInterface::environment() {
 	// TODO
 }
 
+/**
+ * Handles input when the settings window is being shown
+ */
 void UserInterface::doControls() {
-	// TODO
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
+	int found;
+	byte color;
+	bool updateConfig = false;
+
+	Settings settings(_vm);
+	settings.drawInteface(false);
+
+	do {
+		if (_menuCounter)
+			whileMenuCounter();
+
+		found = -1;
+		_key = -1;
+
+		scene.doBgAnim();
+		if (talk._talkToAbort)
+			return;
+
+		events.setButtonState();
+		Common::Point pt = events.mousePos();
+
+		if (events._pressed || events._released || events.kbHit()) {
+			clearInfo();
+			_key = -1;
+
+			if (events.kbHit()) {
+				Common::KeyState keyState = events.getKey();
+				_key = toupper(keyState.keycode);
+
+				if (_key == Common::KEYCODE_RETURN || _key == Common::KEYCODE_SPACE) {
+					events._pressed = false;
+					events._oldButtons = 0;
+					_keycode = Common::KEYCODE_INVALID;
+					events._released = true;
+				}
+			}
+
+			// Handle highlighting button under mouse
+			found = settings.drawButtons(pt, _key);
+		}
+
+		if ((found == 0 && events._released) || (_key == 'E' || _key == Common::KEYCODE_ESCAPE))
+			// Exit
+			break;
+
+		if ((found == 1 && events._released) || _key == 'M') {
+			// Toggle music
+			if (sound._music) {
+				sound.stopSound();
+				sound._music = false;
+			} else {
+				sound._music = true;
+				sound.startSong();
+			}
+
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 2 && events._released) || _key == 'V') {
+			sound._voices = !sound._voices;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 3 && events._released) || _key == 'S') {
+			// Toggle sound effects
+			sound._digitized = !sound._digitized;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 4 && events._released) || _key == 'A') {
+			// Help button style
+			ui._helpStyle ^= 1;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 5 && events._released) || _key == 'N') {
+			// New font style
+			screen.setFont((screen.fontNumber() + 1) & 3);
+		}
+
+		if ((found == 6 && events._released) || _key == 'J') {
+			// Toggle joystick
+			_vm->_joystick = !_vm->_joystick;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 7 && events._released) || _key == 'C') {
+			// Calibrate joystick - No implementation in ScummVM
+		}
+
+		if ((found == 8 && events._released) || _key == 'F') {
+			// Toggle fade style
+			screen._fadeStyle = !screen._fadeStyle;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 9 && events._released) || _key == 'W') {
+			// Window style
+			ui._windowStyle ^= 1;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 10 && events._released) || _key == 'P') {
+			// Toggle portraits being shown
+			people._portraitsOn = !people._portraitsOn;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 11 && events._released) || _key == 'K') {
+			// Toggle keypad acceleration speed
+			_vm->_keyPadSpeed ^= 1;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+	} while (!_vm->shouldQuit());
+
+	banishWindow();
+	
+	if (updateConfig)
+		_vm->saveConfig();
+	
+	_keycode = Common::KEYCODE_INVALID;
+	_keyboardInput = false;
+	_windowBounds.top = CONTROLS_Y1;
+	_key = -1;
 }
 
 /**
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index c4a07abc76..eaa8a3654b 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -61,9 +61,22 @@ extern const char *const PRESS_KEY_TO_CONTINUE;
 class SherlockEngine;
 class Inventory;
 class Talk;
+class UserInterface;
+
+class Settings {
+private:
+	SherlockEngine *_vm;
+public:
+	Settings(SherlockEngine *vm) : _vm() {}
+
+	void drawInteface(bool flag);
+
+	int drawButtons(const Common::Point &pt, int key);
+};
 
 class UserInterface {
 	friend class Inventory;
+	friend class Settings;
 	friend class Talk;
 private:
 	SherlockEngine *_vm;
-- 
cgit v1.2.3


From 537f33d9cf60fffdd473ae3cd32e2abffc9cb24f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 13 Apr 2015 18:08:20 +0200
Subject: SCI: script patch for qfg3 hero export bug #6807

---
 engines/sci/engine/script_patches.cpp | 64 +++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 711078d29c..6d5b49f441 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2344,12 +2344,76 @@ static const uint16 qfg3PatchWooDialogAlt[] = {
 	PATCH_END
 };
 
+// When exporting characters at the end of Quest for Glory 3, the underlying
+//  code has issues with values, that are above 9999.
+//  For further study: https://github.com/Blazingstix/QFGImporter/blob/master/QFGImporter/QFGImporter/QFG3.txt
+//
+// If a value is above 9999, parts or even the whole character file will get corrupted.
+//
+// We are fixing the code because of that. We are patching code, that is calculating the checksum
+//  and add extra code to lower such values to 9999.
+//
+// Applies to at least: English, French, German, Italian, Spanish floppy
+// Responsible method: saveHero::changeState
+// Fixes bug #6807
+static const uint16 qfg3SignatureExportChar[] = {
+	0x35, SIG_ADDTOOFFSET(+1),          // ldi  00 / ldi 01 (2 loops, we patch both)
+	0xa5, 0x00,                         // sat  temp[0] [contains index to data]
+	0x8d, 0x00,                         // lst  temp[0]
+	SIG_MAGICDWORD,
+	0x35, 0x2c,                         // ldi  2c
+	0x22,                               // lt?  [index above or equal 2Ch (44d)?
+	0x31, 0x23,                         // bnt  [exit loop]
+	// from this point it's actually useless code, maybe a sci compiler bug
+	0x8d, 0x00,                         // lst  temp[0]
+	0x35, 0x01,                         // ldi  01
+	0x02,                               // add
+	0x9b, 0x00,                         // lsli local[0] ---------- load local[0 + ACC] onto stack
+	0x8d, 0x00,                         // lst  temp[0]
+	0x35, 0x01,                         // ldi  01
+	0x02,                               // add
+	0xb3, 0x00,                         // sali local[0] ---------- save stack to local[0 + ACC]
+	// end of useless code
+	0x8b, SIG_ADDTOOFFSET(+1),          // lsl  local[36h/37h] ---- load local[36h/37h] onto stack
+	0x8d, 0x00,                         // lst  temp[0]
+	0x35, 0x01,                         // ldi  01
+	0x02,                               // add
+	0x93, 0x00,                         // lali local[0] ---------- load local[0 + ACC] into ACC
+	0x02,                               // add -------------------- add ACC + stack and put into ACC
+	0xa3, SIG_ADDTOOFFSET(+1),          // sal  local[36h/37h] ---- save ACC to local[36h/37h]
+	0x8d, 0x00,                         // lst temp[0] ------------ temp[0] to stack
+	0x35, 0x02,                         // ldi 02
+	0x02,                               // add -------------------- add 2 to stack
+	0xa5, 0x00,                         // sat temp[0] ------------ save ACC to temp[0]
+	0x33, 0xd6,                         // jmp [loop]
+	SIG_END
+};
+
+static const uint16 qfg3PatchExportChar[] = {
+	PATCH_ADDTOOFFSET(+11),
+	0x85, 0x00,                         // lat  temp[0]
+	0x9b, 0x01,                         // lsli local[0] + 1 ------ load local[ ACC + 1] onto stack
+	0x3c,                               // dup
+	0x34, PATCH_UINT16(0x2710),         // ldi  2710h (10000d)
+	0x2c,                               // ult? ------------------- is value smaller than 10000?
+	0x2f, 0x0a,                         // bt   [jump over]
+	0x3a,                               // toss
+	0x38, PATCH_UINT16(0x270f),         // pushi 270fh (9999d)
+	0x3c,                               // dup
+	0x85, 0x00,                         // lat  temp[0]
+	0xba, PATCH_UINT16(0x0001),         // ssli local[0] + 1 ------ save stack to local[ ACC + 1] (UINT16 to waste 1 byte)
+	// jump offset
+	0x83, PATCH_GETORIGINALBYTE(+26),   // lal  local[37h/36h] ---- load local[37h/36h] into ACC
+	0x02,                               // add -------------------- add local[37h/36h] + data value
+	PATCH_END
+};
 
 //          script, description,                                      signature                  patch
 static const SciScriptPatcherEntry qfg3Signatures[] = {
 	{  true,   944, "import dialog continuous calls",              1, qfg3SignatureImportDialog, qfg3PatchImportDialog },
 	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialog,    qfg3PatchWooDialog },
 	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialogAlt, qfg3PatchWooDialogAlt },
+	{  true,    52, "export character save bug",                   2, qfg3SignatureExportChar,   qfg3PatchExportChar },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 3483799959926d130bcabc1da7e424501a6ef173 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 13 Apr 2015 18:26:12 +0200
Subject: SCI: add french qfg3 export filename for fix

Sierra translator translated the filename
---
 engines/sci/engine/kgraphics.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index ee2249bd9d..7d24dd861f 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -955,8 +955,9 @@ reg_t kDrawControl(EngineState *s, int argc, reg_t *argv) {
 		reg_t textReference = readSelector(s->_segMan, controlObject, SELECTOR(text));
 		if (!textReference.isNull()) {
 			Common::String text = s->_segMan->getString(textReference);
-			if ((text == "a:hq1_hero.sav") || (text == "a:glory1.sav") || (text == "a:glory2.sav") || (text == "a:glory3.sav")) {
+			if ((text == "a:hq1_hero.sav") || (text == "a:glory1.sav") || (text == "a:glory2.sav") || (text == "a:glory3.sav") || (text == "a:gloire3.sauv")) {
 				// Remove "a:" from hero quest / quest for glory export default filenames
+				// The french version of Quest For Glory 3 uses "gloire3.sauv". It seems a translator translated the filename.
 				text.deleteChar(0);
 				text.deleteChar(0);
 				s->_segMan->strcpy(textReference, text.c_str());
-- 
cgit v1.2.3


From 3be28b495dbedc3a94b366edd6178cbf0941cc77 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 13 Apr 2015 20:10:35 -0500
Subject: SHERLOCK: Implemented checkUseAction

---
 engines/sherlock/user_interface.cpp | 105 +++++++++++++++++++++++++++++++++---
 engines/sherlock/user_interface.h   |   3 +-
 2 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 651844fd66..dc87cf130c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1115,12 +1115,10 @@ void UserInterface::doInvControl() {
 
 					if (_selector >= 0)
 						// Use/Give inv object with scene object
-						checkUseAction(scene._bgShapes[_find]._use[0], inv[_selector]._name,
-							_muse, _find, temp - 2);
+						checkUseAction(&scene._bgShapes[_find]._use[0], inv[_selector]._name, MUSE, _find, temp - 2);
 					else
 						// Now inv object has been highlighted
-						checkUseAction(scene._bgShapes[_find]._use[0], "*SELF", _muse,
-							_find, temp - 2);
+						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF", MUSE, _find, temp - 2);
 						
 					_selector = _oldSelector = -1;
 				}
@@ -1716,7 +1714,6 @@ void UserInterface::doControls() {
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
 	int found;
-	byte color;
 	bool updateConfig = false;
 
 	Settings settings(_vm);
@@ -2157,9 +2154,101 @@ void UserInterface::banishWindow(bool slideUp) {
 	_menuMode = STD_MODE;
 }
 
-void UserInterface::checkUseAction(UseType &use, const Common::String &invName,
-		const Common::String &msg, int objNum, int giveMode) {
-	// TODO
+/**
+ * Checks to see whether a USE action is valid on the given object
+ */
+void UserInterface::checkUseAction(const UseType *use, const Common::String &invName,
+		const char *const messages[], int objNum, int giveMode) {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	bool printed = messages == nullptr;
+
+	if (objNum >= 1000) {
+		// Holmes was specified, so do nothing
+		_infoFlag = true;
+		clearInfo();
+		_infoFlag = true;
+		
+		// Display error message
+		_menuCounter = 30;
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that to yourself.");
+		return;
+	}
+
+	// Scan for target item
+	int targetNum = -1;
+	if (giveMode) {
+		for (int idx = 0; idx < 4 && targetNum == -1; ++idx) {
+			if ((scumm_stricmp(use[idx]._target.c_str(), "*GIVE*") == 0 || scumm_stricmp(use[idx]._target.c_str(), "*GIVEP*") == 0)
+					&& scumm_stricmp(use[idx]._names[0].c_str(), invName.c_str()) == 0) {
+				// Found a match
+				targetNum = idx;
+				if (scumm_stricmp(use[idx]._target.c_str(), "*GIVE*") == 0)
+					inv.deleteItemFromInventory(invName);
+			}
+		}
+	} else {
+		for (int idx = 0; idx < 4 && targetNum == -1; ++idx) {
+			if (scumm_stricmp(use[idx]._target.c_str(), invName.c_str()) == 0)
+				targetNum = idx;
+		}
+	}
+
+	if (targetNum != -1) {
+		// Found a target, so do the action
+		const UseType &action = use[targetNum];
+		int messageNum = action._cAnimNum;
+		
+		events.setCursor(WAIT);
+
+		if (action._useFlag)
+			_vm->setFlags(action._useFlag);
+
+		if (action._cAnimNum != 99) {
+			if (action._cAnimNum == 0)
+				scene.startCAnim(9, action._cAnimSpeed);
+			else
+				scene.startCAnim(action._cAnimNum - 1, action._cAnimSpeed);
+		}
+
+		if (!talk._talkToAbort) {
+			Object &obj = scene._bgShapes[objNum];
+			for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
+				if (obj.checkNameForCodes(action._names[idx], messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+
+			// Print "Done..." as an ending, unless flagged for leaving scene or otherwise flagged
+			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
+				_infoFlag++;
+				clearInfo();
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
+				_menuCounter = 25;
+			}
+		}
+	} else {
+		// Couldn't find target, so print error
+		_infoFlag = true;
+		clearInfo();
+
+		if (giveMode) {
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "No, thank you.");
+		} else if (messages == nullptr) {
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that.");
+		} else {
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[0]);
+		}
+
+		_infoFlag = true;
+		_menuCounter = 30;
+	}
+
+	events.setCursor(ARROW);
 }
 
 /**
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index eaa8a3654b..23aca4e536 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -101,7 +101,6 @@ private:
 	Common::String _descStr;
 	int _windowStyle;
 	int _find;
-	Common::String _muse;
 	int _oldUse;
 private:
 	void depressButton(int num);
@@ -128,7 +127,7 @@ private:
 	void environment();
 	void doControls();
 
-	void checkUseAction(UseType &use, const Common::String &invName, const Common::String &msg,
+	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
 		int objNum, int giveMode);
 	void checkAction(ActionType &action, const char *const messages[], int objNum);
 public:
-- 
cgit v1.2.3


From 38b6aa70a82fb05ee7e1581a239e054a9d304827 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 13 Apr 2015 22:55:07 -0500
Subject: SHERLOCK: Fixes for talk setup and portrait loading

---
 engines/sherlock/objects.cpp        |  1 -
 engines/sherlock/people.cpp         |  8 ++++++--
 engines/sherlock/people.h           |  3 +++
 engines/sherlock/sound.cpp          |  6 +++---
 engines/sherlock/talk.cpp           | 35 ++++++++++++++++++-----------------
 engines/sherlock/user_interface.cpp |  3 +--
 6 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index cab35f9634..4cf26a3ad7 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -962,7 +962,6 @@ int Object::pickUpObject(const char *const messages[]) {
 	bool printed = false;
 	bool takeFlag = true;
 	int numObjects = 0;
-	int message;
 
 	if (pickup == 99) {
 		for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index e6a4eeed0f..5dd50e7e94 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -196,7 +196,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_oldWalkSequence = -1;
 	_allowWalkAbort = false;
 	_portraitLoaded = false;
-	_portraitsOn = false;
+	_portraitsOn = true;
 	_clearingThePortrait = false;
 	_srcZone = _destZone = 0;
 	_talkPics = nullptr;
@@ -204,12 +204,15 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_speakerFlip = false;
 	_holmesFlip = false;
 	_homesQuotient = 0;
+
+	_portrait._sequences = new byte[32];
 }
 
 People::~People() {
 	if (_walkLoaded)
 		delete _data[PLAYER]._images;
 	delete _talkPics;
+	delete[] _portrait._sequences;
 }
 
 void People::reset() {
@@ -646,7 +649,8 @@ void People::setTalking(int speaker) {
 
 	if (_portraitsOn) {
 		delete _talkPics;
-		_talkPics = new ImageFile("portrait.lib");
+		Common::String filename = Common::String::format("%s.vgs", PORTRAITS[speaker]);
+		_talkPics = new ImageFile(filename);
 
 		// Load portrait sequences
 		Common::SeekableReadStream *stream = res.load("sequence.txt");
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 601fe6006b..593b516ee6 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -51,6 +51,9 @@ enum {
 	MAP_DOWN = 5, MAP_DOWNLEFT = 6, MAP_LEFT = 2, MAP_UPLEFT = 8
 };
 
+extern const char  *const NAMES[MAX_PEOPLE];
+extern const char PORTRAITS[MAX_PEOPLE][5];
+
 class SherlockEngine;
 
 class Person: public Sprite {
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 771d5db9d5..c3e50a8be2 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -25,9 +25,9 @@
 namespace Sherlock {
 
 Sound::Sound(SherlockEngine *vm): _vm(vm) {
-	_soundOn = true;
-	_musicOn = true;
-	_speechOn = true;
+	_soundOn = false;
+	_musicOn = false;
+	_speechOn = false;
 	_voices = 0;
 	_playingEpilogue = false;
 	_music = false;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a40d3ace2d..279e6de69a 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -96,9 +96,9 @@ void Statement::synchronize(Common::SeekableReadStream &s) {
 
 	// Read in flag required/modified data
 	for (uint idx = 0; idx < _required.size(); ++idx)
-		_required[idx] = s.readUint16LE();
+		_required[idx] = s.readSint16LE();
 	for (uint idx = 0; idx < _modified.size(); ++idx)
-		_modified[idx] = s.readUint16LE();
+		_modified[idx] = s.readSint16LE();
 
 	_portraitSide = s.readByte();
 	_quotient = s.readUint16LE();
@@ -583,8 +583,8 @@ void Talk::loadTalkFile(const Common::String &filename) {
 
 	// Check for an existing person being talked to
 	_talkTo = -1;
-	for (int idx = 0; idx < NUM_OF_PEOPLE; ++idx) {
-		if (!scumm_strnicmp(filename.c_str(), people[(PeopleId)idx]._portrait.c_str(), 4)) {
+	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+		if (!scumm_strnicmp(filename.c_str(), PORTRAITS[idx], 4)) {
 			_talkTo = idx;
 			break;
 		}
@@ -1036,7 +1036,7 @@ void Talk::doScript(const Common::String &script) {
 		ui.clearWindow();
 
 		// Need to switch speakers?
-		if (str[0] == SWITCH_SPEAKER) {
+		if ((byte)str[0] == SWITCH_SPEAKER) {
 			_speaker = str[1] - 1;
 			str += 2;
 			pullSequence();
@@ -1048,7 +1048,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Assign portrait location?
-		if (str[0] == ASSIGN_PORTRAIT_LOCATION) {
+		if ((byte)str[0] == ASSIGN_PORTRAIT_LOCATION) {
 			switch (str[1] & 15) {
 			case 1:
 				people._portraitSide = 20;
@@ -1083,15 +1083,16 @@ void Talk::doScript(const Common::String &script) {
 		Common::String tempString;
 		wait = 0;
 
-		if (!str[0]) {
+		byte c = (byte)str[0];
+		if (!c) {
 			endStr = true;
-		} else if (str[0] == '{') {
+		} else if (c == '{') {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (str[0] >= 128) {
+		} else if (c >= 128) {
 			// Handle control code
-			switch (str[0]) {
+			switch (c) {
 			case SWITCH_SPEAKER:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
@@ -1157,7 +1158,7 @@ void Talk::doScript(const Common::String &script) {
 				// doing bg anims in the next call, so we need to know where to return to
 				_scriptCurrentIndex = str - script.c_str();
 
-				if (_speaker < 128)
+				if (_speaker >= 0 && _speaker < 128)
 					people.clearTalking();
 				pullSequence();
 				if (_talkToAbort)
@@ -1508,9 +1509,9 @@ void Talk::doScript(const Common::String &script) {
 				// If the window is open, display the name directly on-screen.
 				// Otherwise, simply draw it on the back buffer
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), TALK_FOREGROUND, inv._names[_speaker & 127].c_str());
+					screen.print(Common::Point(16, yp), TALK_FOREGROUND, NAMES[_speaker & 127]);
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, inv._names[_speaker & 127].c_str());
+					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, NAMES[_speaker & 127]);
 					openTalkWindow = true;
 				}
 
@@ -1523,10 +1524,10 @@ void Talk::doScript(const Common::String &script) {
 				width += screen.charWidth(str[idx]);
 				++idx;
 				++charCount;
-			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < 128);
+			} while (width < 298 && str[idx] && str[idx] != '{' && (byte)str[idx] < 128);
 
 			if (str[idx] || width >= 298) {
-				if (str[idx] < 128 && str[idx] != '{') {
+				if ((byte)str[idx] < 128 && str[idx] != '{') {
 					--idx;
 					--charCount;
 				}
@@ -1565,7 +1566,7 @@ void Talk::doScript(const Common::String &script) {
 			str += idx;
 
 			// If line wrap occurred, then move to after the separating space between the words
-			if (str[0] < 128 && str[0] != '{')
+			if ((byte)str[0] < 128 && str[0] != '{')
 				++str;
 
 			yp += 9;
@@ -1578,7 +1579,7 @@ void Talk::doScript(const Common::String &script) {
 				wait = 1;
 			}
 
-			switch (str[0]) {
+			switch ((byte)str[0]) {
 			case SWITCH_SPEAKER:
 			case ASSIGN_PORTRAIT_LOCATION:
 			case BANISH_WINDOW:
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index dc87cf130c..43ae76f94b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2200,7 +2200,6 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 	if (targetNum != -1) {
 		// Found a target, so do the action
 		const UseType &action = use[targetNum];
-		int messageNum = action._cAnimNum;
 		
 		events.setCursor(WAIT);
 
@@ -2318,7 +2317,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 						people[AL]._sequenceNumber = dir;
 						people.gotoStand(people[AL]);
 
-						talk.talkTo(action._names[nameIdx] + 2);
+						talk.talkTo(action._names[nameIdx].c_str() + 2);
 						if (ch == 'T')
 							doCAnim = false;
 					}
-- 
cgit v1.2.3


From 97d3df3c9e7faa4b9925765c4612d341848cf08c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 13 Apr 2015 23:37:39 -0500
Subject: SHERLOCK: Fix for animating chracter portraits when talking

---
 engines/sherlock/scene.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 1cad2506e5..8a6681b5e0 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1171,6 +1171,9 @@ void Scene::doBgAnim() {
 			o.adjustObject();
 	}
 
+	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
+		people._portrait.adjustObject();
+
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type != INVALID)
 			_canimShapes[idx].adjustObject();
-- 
cgit v1.2.3


From fb32222177a89c7a6701fa359131cb06ff15cbda Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 14 Apr 2015 14:59:55 +0200
Subject: SCI: add workaround for Hoyle 4 Euchre (bug 6602)

---
 engines/sci/engine/workarounds.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index ed45e294a2..998d7cc041 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -96,6 +96,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2",   0x1d4d,    0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
 	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",       -1,    4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
 	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",            -1,  504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
+	{ GID_HOYLE4,        800,   870,  0,     "EuchreStrategy", "thinkLead",      -1,    0, { WORKAROUND_FAKE,   0 } }, // while playing Euchre, happens at least on 2nd or 3rd turn - bug #6602
 	{ GID_HOYLE4,         -1,   937,  0,            "IconBar", "dispatchEvent",  -1,  408, { WORKAROUND_FAKE,   0 } }, // pressing ENTER on scoreboard while mouse is not on OK button, may not happen all the time - bug #6603
 	{ GID_ISLANDBRAIN,   100,   937,  0,            "IconBar", "dispatchEvent",  -1,   58, { WORKAROUND_FAKE,   0 } }, // when using ENTER at the startup menu - bug #5241
 	{ GID_ISLANDBRAIN,   140,   140,  0,              "piece", "init",           -1,    3, { WORKAROUND_FAKE,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
-- 
cgit v1.2.3


From c58325b519371064348b747c957a89d009ac12ba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Apr 2015 19:53:03 -0500
Subject: SHERLOCK: Fix scene transition

---
 engines/sherlock/objects.cpp | 28 ++++++++++++++--------------
 engines/sherlock/scene.cpp   | 10 +++++++---
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 4cf26a3ad7..ca1bdfb2c5 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -693,24 +693,24 @@ bool Object::checkEndOfSequence() {
 				setObjSequence(seq, false);
 			}
 		}
-	}
 
-	if (_allow && _frameNumber == 0) {
-		// canimation just ended
-		if (_type != NO_SHAPE && _type != REMOVE) {
-			_type = REMOVE;
+		if (_allow && _frameNumber == 0) {
+			// canimation just ended
+			if (_type != NO_SHAPE && _type != REMOVE) {
+				_type = REMOVE;
 
-			if (!_countCAnimFrames) {
-				// Save details before shape is removed
-				_delta.x = _imageFrame->_frame.w;
-				_delta.y = _imageFrame->_frame.h;
-				_position = _imageFrame->_offset;
+				if (!_countCAnimFrames) {
+					// Save details before shape is removed
+					_delta.x = _imageFrame->_frame.w;
+					_delta.y = _imageFrame->_frame.h;
+					_position = _imageFrame->_offset;
 
-				// Free the images
-				delete _images;
+					// Free the images
+					delete _images;
+				}
+			} else {
+				_type = INVALID;
 			}
-		} else {
-			_type = INVALID;
 		}
 	}
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 8a6681b5e0..1ce2183af1 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -663,13 +663,13 @@ void Scene::transitionToScene() {
 
 	if (cAnimNum != -1) {
 		CAnim &c = _cAnim[cAnimNum];
-		Common::Point pt = c._position;
+		Common::Point pt = c._goto;
 
-		c._position = Common::Point(-1, -1);
+		c._goto = Common::Point(-1, -1);
 		people[AL]._position = Common::Point(0, 0);
 
 		startCAnim(cAnimNum, 1);
-		c._position = pt;
+		c._goto = pt;
 	}
 }
 
@@ -875,7 +875,9 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		tpDir = cAnim._teleportDir;
 	}
 
+	CursorId oldCursor = events.getCursor();
 	events.setCursor(WAIT);
+
 	_canimShapes.push_back(Object());
 	Object &cObj = _canimShapes[_canimShapes.size() - 1];
 
@@ -1040,6 +1042,8 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		people.gotoStand(people[AL]);
 	}
 
+	events.setCursor(oldCursor);
+
 	return 1;
 }
 
-- 
cgit v1.2.3


From f4af9fdbfd4531fd59c9f51785d573f6a128639e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Apr 2015 20:14:09 -0500
Subject: SHERLOCK: Fix word-wrap of talk options

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 279e6de69a..49e0677b80 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -795,7 +795,7 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
 
 	// Handle potentially multiple lines needed to display entire statement
 	const char *lineStartP = msg.c_str();
-	int maxWidth = 298 - numberFlag ? 18 : 0;
+	int maxWidth = 298 - (numberFlag ? 18 : 0);
 	for (;;) {
 		// Get as much of the statement as possible will fit on the
 		Common::String sLine;
-- 
cgit v1.2.3


From b14debc20769c7c6e8b0d5fb1d189e319e5ad6e4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Apr 2015 20:30:02 -0500
Subject: SHERLOCK: Fix talking to Watson when he's sitting down

---
 engines/sherlock/talk.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 49e0677b80..73bf9b5fb3 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -591,8 +591,8 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	}
 
 	const char *chP = strchr(filename.c_str(), '.');
-	Common::String talkFile = !chP ? filename + ".tlk" :
-		Common::String(filename.c_str(), chP) + ".tlk";
+	Common::String talkFile = chP ? Common::String(filename.c_str(), chP) + ".tlk" :
+		Common::String(filename.c_str(), filename.c_str() + 7) + ".tlk";
 
 	// Open the talk file for reading
 	Common::SeekableReadStream *talkStream = res.load(talkFile);
-- 
cgit v1.2.3


From 460a84e68f4a633b52a8654f93cdd81a2f3521e4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Apr 2015 21:24:24 -0500
Subject: SHERLOCK: Fix stopping Watson from moving when talking to him

---
 engines/sherlock/people.cpp | 2 +-
 engines/sherlock/talk.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 5dd50e7e94..cc26339bde 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -597,7 +597,7 @@ int People::findSpeaker(int speaker) {
 
 			if (scumm_stricmp(PORTRAITS[speaker], name.c_str()) == 0
 				&& obj._name[4] >= '0' && obj._name[4] <= '9')
-				return idx - 1;
+				return idx;
 		}
 	}
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 73bf9b5fb3..ef64edd66b 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -880,7 +880,7 @@ void Talk::clearSequences() {
 void Talk::pullSequence() {
 	Scene &scene = *_vm->_scene;
 
-	if (_scriptStack.empty())
+	if (_sequenceStack.empty())
 		return;
 
 	SequenceEntry seq = _sequenceStack.pop();
-- 
cgit v1.2.3


From 5b97d581f655eed747a33a69ff7cb5bfe79763fd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Apr 2015 22:41:18 -0500
Subject: SHERLOCK: Fix horizontal flipping of Holmes when walking left

---
 engines/sherlock/scene.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 1ce2183af1..46ddbc425f 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1229,9 +1229,9 @@ void Scene::doBgAnim() {
 		int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[AL]._imageFrame->_frame.w;
 		int tempX = MIN(people[AL]._position.x / 100, xRight);
 
-		bool flipped = people[AL]._frameNumber == WALK_LEFT || people[AL]._frameNumber == STOP_LEFT ||
-			people[AL]._frameNumber == WALK_UPLEFT || people[AL]._frameNumber == STOP_UPLEFT ||
-			people[AL]._frameNumber == WALK_DOWNRIGHT || people[AL]._frameNumber == STOP_DOWNRIGHT;
+		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT ||
+			people[AL]._sequenceNumber == WALK_UPLEFT || people[AL]._sequenceNumber == STOP_UPLEFT ||
+			people[AL]._sequenceNumber == WALK_DOWNRIGHT || people[AL]._sequenceNumber == STOP_DOWNRIGHT;
 		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame,
 			Common::Point(tempX, people[AL]._position.y / 100 - people[AL]._imageFrame->_frame.h), flipped);
 	}
-- 
cgit v1.2.3


From a830d7732537a913aa29ae4a4bc10e80e79dbc82 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 15 Apr 2015 07:49:10 -0500
Subject: SHERLOCK: Refactored out Scripts class

---
 engines/sherlock/module.mk    |  1 -
 engines/sherlock/scripts.cpp  | 42 ---------------------------------
 engines/sherlock/scripts.h    | 54 -------------------------------------------
 engines/sherlock/sherlock.cpp |  3 ---
 engines/sherlock/sherlock.h   |  2 --
 engines/sherlock/talk.cpp     | 14 +++++++----
 engines/sherlock/talk.h       |  2 ++
 7 files changed, 12 insertions(+), 106 deletions(-)
 delete mode 100644 engines/sherlock/scripts.cpp
 delete mode 100644 engines/sherlock/scripts.h

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index a01f9f0f71..4101769a80 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -18,7 +18,6 @@ MODULE_OBJS = \
 	resources.o \
 	scene.o \
 	screen.o \
-	scripts.o \
 	sherlock.o \
 	sound.o \
 	talk.o \
diff --git a/engines/sherlock/scripts.cpp b/engines/sherlock/scripts.cpp
deleted file mode 100644
index 02dcfa6f0b..0000000000
--- a/engines/sherlock/scripts.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/scripts.h"
-#include "sherlock/sherlock.h"
-
-namespace Sherlock {
-
-Scripts::Scripts(SherlockEngine *vm): _vm(vm) {
-
-}
-
-void Scripts::popStack() {
-	/*
-	ScriptEntry script = _scriptStack.pop();
-	_scriptName = script._name;
-//	_scriptSaveIndex = script._index;
-	_scriptSelect = script._select;
-	*/
-}
-
-
-} // End of namespace Sherlock
diff --git a/engines/sherlock/scripts.h b/engines/sherlock/scripts.h
deleted file mode 100644
index beea726c8d..0000000000
--- a/engines/sherlock/scripts.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_SCRIPTS_H
-#define SHERLOCK_SCRIPTS_H
-
-#include "common/scummsys.h"
-#include "common/stack.h"
-
-namespace Sherlock {
-
-class SherlockEngine;
-
-struct ScriptEntry {
-	Common::String _name;
-	int _index;
-	int _select;
-};
-
-class Scripts {
-private:
-	SherlockEngine *_vm;
-public:
-
-public:
-	Scripts(SherlockEngine *vm);
-
-	void doScript(const Common::String &str);
-
-	void popStack();
-};
-
-} // End of namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 72c072b640..c65a70a20f 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -39,7 +39,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_res = nullptr;
 	_scene = nullptr;
 	_screen = nullptr;
-	_scripts = nullptr;
 	_sound = nullptr;
 	_talk = nullptr;
 	_ui = nullptr;
@@ -59,7 +58,6 @@ SherlockEngine::~SherlockEngine() {
 	delete _people;
 	delete _scene;
 	delete _screen;
-	delete _scripts;
 	delete _sound;
 	delete _talk;
 	delete _ui;
@@ -84,7 +82,6 @@ void SherlockEngine::initialize() {
 	_people = new People(this);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
-	_scripts = new Scripts(this);
 	_sound = new Sound(this);
 	_talk = new Talk(this);
 	_ui = new UserInterface(this);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index ef10cd2d47..ec8e0c3148 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -40,7 +40,6 @@
 #include "sherlock/resources.h"
 #include "sherlock/scene.h"
 #include "sherlock/screen.h"
-#include "sherlock/scripts.h"
 #include "sherlock/sound.h"
 #include "sherlock/talk.h"
 #include "sherlock/user_interface.h"
@@ -90,7 +89,6 @@ public:
 	Resources *_res;
 	Scene *_scene;
 	Screen *_screen;
-	Scripts *_scripts;
 	Sound *_sound;
 	Talk *_talk;
 	UserInterface *_ui;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ef64edd66b..ee1e6201d2 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -160,7 +160,6 @@ void Talk::talkTo(const Common::String &filename) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	Scripts &scripts = *_vm->_scripts;
 	UserInterface &ui = *_vm->_ui;
 	Common::Rect savedBounds = screen.getDisplayBounds();
 	bool abortFlag = false;
@@ -459,9 +458,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 	// If a script was added to the script stack, restore state so that the
 	// previous script can continue
-	if (!_scriptStack.empty()) {
-		scripts.popStack();
-	}
+	popStack();
 
 	events.setCursor(ARROW);
 }
@@ -1738,5 +1735,14 @@ int Talk::waitForMore(int delay) {
 	return key2;
 }
 
+void Talk::popStack() {
+	if (!_scriptStack.empty()) {
+		ScriptStackEntry scriptEntry = _scriptStack.pop();
+		_scriptName = scriptEntry._name;
+		_scriptSaveIndex = scriptEntry._currentIndex;
+		_scriptSelect = scriptEntry._select;
+		_scriptMoreFlag = true;
+	}
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index bf4f12675c..4a33f2f557 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -143,6 +143,8 @@ public:
 	void pushSequence(int speaker);
 	void setSequence(int speaker);
 	bool isSequencesEmpty() const { return _scriptStack.empty(); }
+
+	void popStack();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 17bf9e7f547d1893fbafb77dcc6703b21eca52c6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 15 Apr 2015 08:22:40 -0500
Subject: SHERLOCK: Refactored Chess class to be Map class

---
 engines/sherlock/map.cpp             | 46 +++++++++++++++++++++++++++++++
 engines/sherlock/map.h               | 52 ++++++++++++++++++++++++++++++++++++
 engines/sherlock/module.mk           |  2 +-
 engines/sherlock/objects.cpp         |  7 ++---
 engines/sherlock/people.cpp          |  5 ++--
 engines/sherlock/scalpel/chess.cpp   | 37 -------------------------
 engines/sherlock/scalpel/chess.h     | 45 -------------------------------
 engines/sherlock/scalpel/scalpel.cpp | 14 ++++------
 engines/sherlock/scalpel/scalpel.h   |  4 +--
 engines/sherlock/scene.cpp           | 10 ++++---
 engines/sherlock/sherlock.cpp        |  3 +++
 engines/sherlock/sherlock.h          |  3 ++-
 engines/sherlock/talk.cpp            |  6 ++---
 13 files changed, 126 insertions(+), 108 deletions(-)
 create mode 100644 engines/sherlock/map.cpp
 create mode 100644 engines/sherlock/map.h
 delete mode 100644 engines/sherlock/scalpel/chess.cpp
 delete mode 100644 engines/sherlock/scalpel/chess.h

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
new file mode 100644
index 0000000000..8257c16a38
--- /dev/null
+++ b/engines/sherlock/map.cpp
@@ -0,0 +1,46 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/map.h"
+
+namespace Sherlock {
+
+Map::Map(SherlockEngine *vm): _vm(vm) {
+}
+
+/**
+ * Loads the list of points for locations on the map for each scene
+ */
+void Map::loadPoints(int count, const int *xList, const int *yList) {
+	for (int idx = 0; idx < count; ++idx, ++xList, ++yList) {
+		_points.push_back(Common::Point(*xList, *yList));
+	}
+}
+
+/**
+ * Show the map
+ */
+int Map::show() {
+	return 0;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
new file mode 100644
index 0000000000..88f2b75805
--- /dev/null
+++ b/engines/sherlock/map.h
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_MAP_H
+#define SHERLOCK_MAP_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "common/str.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+class Map {
+private:
+	SherlockEngine *_vm;
+	Common::Array<Common::Point> _points;	// Map locations for each scene
+public:
+public:
+	Map(SherlockEngine *vm);
+
+	const Common::Point &operator[](int idx) { return _points[idx]; }
+
+	void loadPoints(int count, const int *xList, const int *yList);
+
+	int show();
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 4101769a80..171f704a1e 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -1,7 +1,6 @@
 MODULE := engines/sherlock
 
 MODULE_OBJS = \
-	scalpel/chess.o \
 	scalpel/darts.o \
 	scalpel/scalpel.o \
 	tattoo/tattoo.o \
@@ -13,6 +12,7 @@ MODULE_OBJS = \
 	graphics.o \
 	inventory.o \
 	journal.o \
+	map.o \
 	objects.o \
 	people.o \
 	resources.o \
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index ca1bdfb2c5..82daa90a38 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -801,6 +801,7 @@ void Object::setObjSequence(int seq, bool wait) {
 * @returns		0 if no codes are found, 1 if codes were found
 */
 int Object::checkNameForCodes(const Common::String &name, const char *const messages[]) {
+	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -847,9 +848,9 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 			if (ch >= '0' && ch <= '9') {
 				scene._goToScene = atoi(name.c_str() + 1);
 
-				if (scene._goToScene < 97 && _vm->_map[scene._goToScene].x) {
-					_vm->_over.x = _vm->_map[scene._goToScene].x * 100 - 600;
-					_vm->_over.y = _vm->_map[scene._goToScene].y * 100 + 900;
+				if (scene._goToScene < 97 && map[scene._goToScene].x) {
+					_vm->_over.x = map[scene._goToScene].x * 100 - 600;
+					_vm->_over.y = map[scene._goToScene].y * 100 + 900;
 				}
 
 				if ((p = strchr(name.c_str(), ',')) != nullptr) {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index cc26339bde..d22c08f625 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -415,6 +415,7 @@ void People::setWalking() {
  * is being displayed, then the chraracter will always face down.
  */
 void People::gotoStand(Sprite &sprite) {
+	Map &map = *_vm->_map;
 	Scene &scene = *_vm->_scene;
 	_walkTo.clear();
 	sprite._walkCount = 0;
@@ -448,8 +449,8 @@ void People::gotoStand(Sprite &sprite) {
 
 	if (_vm->_onChessboard) {
 		sprite._sequenceNumber = 0;
-		_data[AL]._position.x = (_vm->_map[scene._charPoint].x -  6) * 100;
-		_data[AL]._position.y = (_vm->_map[scene._charPoint].x + 10) * 100;
+		_data[AL]._position.x = (map[scene._charPoint].x -  6) * 100;
+		_data[AL]._position.y = (map[scene._charPoint].x + 10) * 100;
 	}
 
 	_oldWalkSequence = -1;
diff --git a/engines/sherlock/scalpel/chess.cpp b/engines/sherlock/scalpel/chess.cpp
deleted file mode 100644
index 95c662dd01..0000000000
--- a/engines/sherlock/scalpel/chess.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/scalpel/chess.h"
-#include "sherlock/scalpel/scalpel.h"
-
-namespace Sherlock {
-
-namespace Scalpel {
-
-int Chess::doChessBoard() {
-	// TODO
-	return 0;
-}
-
-} // End of namespace Scalpel
-
-} // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/chess.h b/engines/sherlock/scalpel/chess.h
deleted file mode 100644
index 70607472c2..0000000000
--- a/engines/sherlock/scalpel/chess.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_CHESS_H
-#define SHERLOCK_CHESS_H
-
-namespace Sherlock {
-
-namespace Scalpel {
-
-class ScalpelEngine;
-
-class Chess {
-private:
-	ScalpelEngine *_vm;
-public:
-	Chess(ScalpelEngine *vm) : _vm(vm) {}
-
-	int doChessBoard();
-};
-
-} // End of namespace Scalpel
-
-} // End of namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 954ea12aec..0742d05366 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -183,13 +183,11 @@ byte TALK_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 
 ScalpelEngine::ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {
-	_chess = nullptr;
 	_darts = nullptr;
-	_chessResult = 0;
+	_mapResult = 0;
 }
 
 ScalpelEngine::~ScalpelEngine() {
-	delete _chess;
 	delete _darts;
 }
 
@@ -199,7 +197,6 @@ ScalpelEngine::~ScalpelEngine() {
 void ScalpelEngine::initialize() {
 	SherlockEngine::initialize();
 
-	_chess = new Chess(this);
 	_darts = new Darts(this);
 
 	_flags.resize(100 * 8);
@@ -207,8 +204,7 @@ void ScalpelEngine::initialize() {
 	_flags[39] = true;		// Turn on Baker Street
 
 	// Load the map co-ordinates for each scene
-	for (int idx = 0; idx < NUM_PLACES; ++idx)
-		_map.push_back(Common::Point(MAP_X[idx], MAP_Y[idx]));
+	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0]);
 
 	// Load the inventory
 	loadInventory();
@@ -393,7 +389,7 @@ void ScalpelEngine::startScene() {
 			}
 		}
 
-		_scene->_goToScene = _chess->doChessBoard();
+		_scene->_goToScene = _map->show();
 
 		_sound->freeSong();
 		_scene->_hsavedPos = Common::Point(-1, -1);
@@ -533,10 +529,10 @@ void ScalpelEngine::startScene() {
 	if (_scene->_goToScene == 99) {
 		// Chess Board
 		_darts->playDarts();
-		_chessResult = _scene->_goToScene = 19;	// Go back to the bar
+		_mapResult = _scene->_goToScene = 19;	// Go back to the bar
 	}
 
-	_chessResult = _scene->_goToScene;
+	_mapResult = _scene->_goToScene;
 }
 
 /**
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 34d017e757..aa00acab84 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -24,7 +24,6 @@
 #define SHERLOCK_SCALPEL_H
 
 #include "sherlock/sherlock.h"
-#include "sherlock/scalpel/chess.h"
 #include "sherlock/scalpel/darts.h"
 
 namespace Sherlock {
@@ -33,9 +32,8 @@ namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
 private:
-	Chess *_chess;
 	Darts *_darts;
-	int _chessResult;
+	int _mapResult;
 
 	bool showCityCutscene();
 	bool showAlleyCutscene();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 46ddbc425f..575523bc45 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -193,6 +193,7 @@ void Scene::freeScene() {
  */
 bool Scene::loadScene(const Common::String &filename) {
 	Events &events = *_vm->_events;
+	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
@@ -437,8 +438,8 @@ bool Scene::loadScene(const Common::String &filename) {
 
 	// Reset the position on the overland map
 	_vm->_oldCharPoint = _currentScene;
-	_vm->_over.x = _vm->_map[_currentScene].x * 100 - 600;
-	_vm->_over.y = _vm->_map[_currentScene].y * 100 + 900;
+	_vm->_over.x = map[_currentScene].x * 100 - 600;
+	_vm->_over.y = map[_currentScene].y * 100 + 900;
 
 	events.clearEvents();
 	return flag;
@@ -843,6 +844,7 @@ void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
  */
 int Scene::startCAnim(int cAnimNum, int playRate) {
 	Events &events = *_vm->_events;
+	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Resources &res = *_vm->_res;
 	Talk &talk = *_vm->_talk;
@@ -1027,8 +1029,8 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	if (gotoCode > 0 && !talk._talkToAbort) {
 		_goToScene = gotoCode;
 
-		if (_goToScene < 97 && _vm->_map[_goToScene].x) {
-			_overPos = _vm->_map[_goToScene];
+		if (_goToScene < 97 && map[_goToScene].x) {
+			_overPos = map[_goToScene];
 		}
 	}
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index c65a70a20f..632e388642 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -35,6 +35,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_events = nullptr;
 	_inventory = nullptr;
 	_journal = nullptr;
+	_map = nullptr;
 	_people = nullptr;
 	_res = nullptr;
 	_scene = nullptr;
@@ -55,6 +56,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _debugger;
 	delete _events;
 	delete _journal;
+	delete _map;
 	delete _people;
 	delete _scene;
 	delete _screen;
@@ -78,6 +80,7 @@ void SherlockEngine::initialize() {
 	_debugger = new Debugger(this);
 	_events = new Events(this);
 	_inventory = new Inventory(this);
+	_map = new Map(this);
 	_journal = new Journal(this);
 	_people = new People(this);
 	_scene = new Scene(this);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index ec8e0c3148..42e2cf8b38 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -36,6 +36,7 @@
 #include "sherlock/events.h"
 #include "sherlock/inventory.h"
 #include "sherlock/journal.h"
+#include "sherlock/map.h"
 #include "sherlock/people.h"
 #include "sherlock/resources.h"
 #include "sherlock/scene.h"
@@ -85,6 +86,7 @@ public:
 	Events *_events;
 	Inventory *_inventory;
 	Journal *_journal;
+	Map *_map;
 	People *_people;
 	Resources *_res;
 	Scene *_scene;
@@ -101,7 +103,6 @@ public:
 	bool _loadingSavedGame;
 	int _oldCharPoint;					// Old scene
 	Common::Point _over;				// Old map position
-	Common::Array<Common::Point> _map;	// Map locations for each scene
 	bool _onChessboard;
 	bool _slowChess;
 	bool _joystick;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ee1e6201d2..158cae38a9 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -574,7 +574,6 @@ void Talk::freeTalkVars() {
  * conversation. If found, the data for that conversation is loaded
  */
 void Talk::loadTalkFile(const Common::String &filename) {
-	People &people = *_vm->_people;
 	Resources &res = *_vm->_res;
 	Sound &sound = *_vm->_sound;
 
@@ -1000,6 +999,7 @@ void Talk::doScript(const Common::String &script) {
 	Animation &anim = *_vm->_animation;
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
+	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -1351,8 +1351,8 @@ void Talk::doScript(const Common::String &script) {
 				if (scene._goToScene != 100) {
 					// Not going to the map overview
 					scene._oldCharPoint = scene._goToScene;
-					scene._overPos.x = _vm->_map[scene._goToScene].x * 100 - 600;
-					scene._overPos.y = _vm->_map[scene._goToScene].y * 100 + 900;
+					scene._overPos.x = map[scene._goToScene].x * 100 - 600;
+					scene._overPos.y = map[scene._goToScene].y * 100 + 900;
 
 					// Run a canimation?
 					if (str[2] > 100) {
-- 
cgit v1.2.3


From cb8e40c116ba23293cbf5f30b45da7c24892753c Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 16 Apr 2015 01:26:23 +0200
Subject: SCI: QFG3 fix priority of chief in hut bug #5173

this is a script issue and also happens
in Sierra's SCI. Gets solved by script patch.
---
 engines/sci/engine/script.cpp         |  6 +++---
 engines/sci/engine/script_patches.cpp | 36 +++++++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 2fe1aba975..88becc82cc 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -136,9 +136,6 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 	assert(_bufSize >= script->size);
 	memcpy(_buf, script->data, script->size);
 
-	// Check scripts for matching signatures and patch those, if found
-	scriptPatcher->processScript(_nr, _buf, script->size);
-
 	if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
 		Resource *heap = resMan->findResource(ResourceId(kResourceTypeHeap, _nr), 0);
 		assert(heap != 0);
@@ -149,6 +146,9 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 		memcpy(_heapStart, heap->data, heap->size);
 	}
 
+	// Check scripts (+ possibly SCI 1.1 heap) for matching signatures and patch those, if found
+	scriptPatcher->processScript(_nr, _buf, _bufSize);
+
 	if (getSciVersion() <= SCI_VERSION_1_LATE) {
 		_exportTable = (const uint16 *)findBlockSCI0(SCI_OBJ_EXPORTS);
 		if (_exportTable) {
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 6d5b49f441..48b1292d1b 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2408,12 +2408,40 @@ static const uint16 qfg3PatchExportChar[] = {
 	PATCH_END
 };
 
+// The chief in his hut (room 640) is not drawn using the correct priority,
+//  which results in a graphical glitch. This is a game bug and also happens
+//  in Sierra's SCI. We adjust priority accordingly to fix it.
+//
+// Applies to at least: English, French, German, Italian, Spanish floppy
+// Responsible method: heap in script 640
+// Fixes bug #5173
+static const uint16 qfg3SignatureChiefPriority[] = {
+	SIG_MAGICDWORD,
+	SIG_UINT16(0x0002),                 // yStep     0x0002
+	SIG_UINT16(0x0281),                 // view      0x0281
+	SIG_UINT16(0x0000),                 // loop      0x0000
+	SIG_UINT16(0x0000),                 // cel       0x0000
+	SIG_UINT16(0x0000),                 // priority  0x0000
+	SIG_UINT16(0x0000),                 // underbits 0x0000
+	SIG_UINT16(0x1000),                 // signal    0x1000
+	SIG_END
+};
+
+static const uint16 qfg3PatchChiefPriority[] = {
+	PATCH_ADDTOOFFSET(+8),
+	PATCH_UINT16(0x000A),               // new priority 0x000A (10d)
+	PATCH_ADDTOOFFSET(+2),
+	PATCH_UINT16(0x1010),               // signal       0x1010 (set fixed priority flag)
+	PATCH_END
+};
+
 //          script, description,                                      signature                  patch
 static const SciScriptPatcherEntry qfg3Signatures[] = {
-	{  true,   944, "import dialog continuous calls",              1, qfg3SignatureImportDialog, qfg3PatchImportDialog },
-	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialog,    qfg3PatchWooDialog },
-	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialogAlt, qfg3PatchWooDialogAlt },
-	{  true,    52, "export character save bug",                   2, qfg3SignatureExportChar,   qfg3PatchExportChar },
+	{  true,   944, "import dialog continuous calls",              1, qfg3SignatureImportDialog,  qfg3PatchImportDialog },
+	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialog,     qfg3PatchWooDialog },
+	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialogAlt,  qfg3PatchWooDialogAlt },
+	{  true,    52, "export character save bug",                   2, qfg3SignatureExportChar,    qfg3PatchExportChar },
+	{  true,   640, "chief in hut priority fix",                   1, qfg3SignatureChiefPriority, qfg3PatchChiefPriority },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 6a1eee88cfbc0f362bb4a2c058ece310e966ca84 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Thu, 16 Apr 2015 14:36:34 +1000
Subject: SCUMM: Add file prefixes used by Italian versions of several HE
 games.

---
 engines/scumm/detection_tables.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 6eab5c752f..d42a7251d9 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -812,6 +812,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama3", "PyjamaHG", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "pajama3", "PyjamaSKS", kGenHEPC, Common::DE_DEU, UNK, 0 },
 	{ "pajama3", "PyjamaSKS", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },
+	{ "pajama3", "SamLDM", kGenHEPC, Common::IT_ITA, Common::kPlatformWindows, 0 },
 	{ "pajama3", "UKPajamaEAT", kGenHEPC, Common::RU_RUS, UNK, 0 },
 
 	{ "puttcircus", "puttcircus", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -830,6 +831,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "puttrace", "500demo", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "puttrace", "course", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "puttrace", "CourseDemo", kGenHEPC, Common::FR_FRA, UNK, 0 },
+	{ "puttrace", "GasGasEG", kGenHEPC, Common::IT_ITA, Common::kPlatformWindows, 0 },
 	{ "puttrace", "racedemo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "puttrace", "RaceDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "puttrace", "Rennen", kGenHEPC, Common::DE_DEU, UNK, 0 },
@@ -926,6 +928,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "spyfox2", "Sf2demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "spyfox2", "Spy Fox 2", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "spyfox2", "Spy Fox 2 - Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
+	{ "spyfox2", "SPyFoxMCR", kGenHEPC, Common::IT_ITA, Common::kPlatformWindows, 0 },
 	{ "spyfox2", "SpyFoxOR", kGenHEPC, Common::DE_DEU, UNK, 0 },
 	{ "spyfox2", "SpyFoxOR", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },
 	{ "spyfox2", "SPYFoxORE", kGenHEPC, Common::FR_FRA, UNK, 0 },
-- 
cgit v1.2.3


From da19822e373bf134049b6b415f2f19bf2e1e343b Mon Sep 17 00:00:00 2001
From: Kirben
Date: Thu, 16 Apr 2015 14:46:40 +1000
Subject: SCUMM: Add md5 checksums for Italian versions of several HE games.

---
 devtools/scumm-md5.txt    | 3 +++
 engines/scumm/scumm-md5.h | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 62925e98fa..7a1a22b600 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -682,6 +682,7 @@ pajama2	Pajama Sam 2: Thunder and Lightning Aren't so Frightening
 pajama3	Pajama Sam 3: You Are What You Eat From Your Head to Your Feet
 	f7711f9264d4d43c2a1518ec7c10a607	79382	us	All	-	-	-	Kirben
 	2e8a1f76ea33bc5e04347646feee173d	-1	de	All	-	-	-	Joachim Eberhard
+	83e7a9205567dceb456ee35eeaf26ffa	-1	it	All	-	-	-	Saleck
 	aefa244ea034b7cd2041f0a44be7d9ba	-1	en	Mac	-	-	-	pix_climber
 	06c3cf4f31daad8b1cd93153491db9e6	79382	nl	All	-	-	-	daniel9
 	7410a8ba9795020cd42f171c4320659e	-1	fr	Windows	-	-	-	gist974
@@ -724,6 +725,7 @@ socks	Pajama Sam's Sock Works
 
 puttrace	Putt-Putt Enters the Race
 	981e1e1891f2be7e25a01f50ae55a5af	-1	us	All	HE 98	-	-	Kirben
+	05d3143827ab4f5d2521a1a47dab8ff2	-1	it	All	HE 98	-	-	Saleck
 	1ed22f601f8b3695804a6583cc3083f1	-1	nl	All	HE 98.5	-	-	daniel9
 	33e989f85da700e2014d00f345cab3d7	-1	fr	Windows	HE 98.5	-	-	gist974
 	b47be81e39a9710f6f595f7b527b60f8	-1	gb	Windows	HE 99	-	-	Reckless
@@ -887,6 +889,7 @@ spyfox2	SPY Fox 2: Some Assembly Required
 	f79e60c17cca601e411f1f75e8ee9b5a	51286	All	All	-	-	-	Kirben
 	90e2f0af4f779629695c6394a65bb702	-1	fr	All	-	-	-	gist974, ThierryFR
 	bc4700bc0e12879f6d25d14d6be6cfdd	-1	de	All	-	-	-	Joachim Eberhard
+	3785fd25f7e02b5782bfc5072d8f77c8	-1	it	All	-	-	-	Saleck
 	cea91e3dd47f2518ea418e41611aa77f	-1	ru	All	-	-	-	sev
 	9fd66fb3b04703bd50da4356e4202558	51295	en	Mac	-	-	-	pix_climber
 	71fe97c3108678cf604f14abe342341b	51286	nl	All	-	-	-	adutchguy
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 5be18fb990..bc3548c150 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Sun Dec  7 23:09:10 2014
+  This file was generated by the md5table tool on Thu Apr 16 04:45:24 2015
   DO NOT EDIT MANUALLY!
  */
 
@@ -27,6 +27,7 @@ static const MD5Table md5table[] = {
 	{ "0557df19f046a84c2fdc63507c6616cb", "farm", "HE 72", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
 	{ "055ffe4f47753e47594ac67823220c54", "puttrace", "HE 99", "", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "057c9b456dedcc4d71b991a3072a20b3", "monkey", "SEGA", "", 9465, Common::JA_JPN, Common::kPlatformSegaCD },
+	{ "05d3143827ab4f5d2521a1a47dab8ff2", "puttrace", "HE 98", "", -1, Common::IT_ITA, Common::kPlatformUnknown },
 	{ "06b187468113f9ae5a400b148a847fac", "atlantis", "Floppy", "Floppy", 12075, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "06c3cf4f31daad8b1cd93153491db9e6", "pajama3", "", "", 79382, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "07433205acdca3bc553d0e731588b35f", "airport", "", "", -1, Common::EN_ANY, Common::kPlatformWindows },
@@ -164,6 +165,7 @@ static const MD5Table md5table[] = {
 	{ "3686cf8f89e102ececf4366e1d2c8126", "monkey2", "", "", 11135, Common::EN_ANY, Common::kPlatformDOS },
 	{ "36a6750e03fb505fc19fc2bf3e4dbe91", "pajama2", "", "Demo", 58749, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "3769b56c9a22f5521d74525ee459f88d", "puttrace", "HE 99", "Demo", 13108, Common::DE_DEU, Common::kPlatformWindows },
+	{ "3785fd25f7e02b5782bfc5072d8f77c8", "spyfox2", "", "", -1, Common::IT_ITA, Common::kPlatformUnknown },
 	{ "37aed3f91c1ef959e0bd265f9b13781f", "pajama", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "37f56ceb13e401a7ac7d9e6b37fecaf7", "loom", "EGA", "EGA", 5748, Common::EN_ANY, Common::kPlatformDOS },
 	{ "37ff1b308999c4cca7319edfcc1280a0", "puttputt", "HE 70", "Demo", 8269, Common::EN_ANY, Common::kPlatformWindows },
@@ -376,6 +378,7 @@ static const MD5Table md5table[] = {
 	{ "8368f552b1e3eba559f8d559bcc4cadb", "freddi3", "", "", -1, Common::UNK_LANG, Common::kPlatformUnknown },
 	{ "839a658f7d22de00787ebc945348cdb6", "dog", "", "", 19681, Common::DE_DEU, Common::kPlatformWindows },
 	{ "83cedbe26aa8b58988e984e3d34cac8e", "freddi3", "HE 99", "", -1, Common::DE_DEU, Common::kPlatformUnknown },
+	{ "83e7a9205567dceb456ee35eeaf26ffa", "pajama3", "", "", -1, Common::IT_ITA, Common::kPlatformUnknown },
 	{ "84e3c23a49ded8a6f9197735c8eb3de7", "PuttTime", "HE 85", "", -1, Common::DE_DEU, Common::kPlatformWindows },
 	{ "8539c0ff89868e55a08e652ac44daaae", "water", "HE 98.5", "", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "861e59ed72a1cd0e6d454f7ee7e2bf3d", "comi", "", "", -1, Common::RU_RUS, Common::kPlatformWindows },
-- 
cgit v1.2.3


From 9ba234c0e09c4fc034ddd82f82483e10e2470dec Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 16 Apr 2015 17:32:11 -0500
Subject: SHERLOCK: Implemented Map::show method

---
 engines/sherlock/events.cpp |  10 +-
 engines/sherlock/events.h   |   1 +
 engines/sherlock/map.cpp    | 271 +++++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/map.h      |  32 +++++-
 4 files changed, 309 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 67d09e52b2..79fe1b58d4 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -67,9 +67,15 @@ void Events::setCursor(CursorId cursorId) {
 
 	// Set the cursor data
 	Graphics::Surface &s = (*_cursorImages)[cursorId];
-	CursorMan.replaceCursor(s.getPixels(), s.w, s.h, 0, 0, 0xff);
 
-	showCursor();
+	setCursor(s);
+}
+
+/**
+ * Set the cursor to show from a passed frame
+ */
+void Events::setCursor(const Graphics::Surface &src) {
+	CursorMan.replaceCursor(src.getPixels(), src.w, src.h, 0, 0, 0xff);
 }
 
 /**
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 71f7623002..ccf6eb1c59 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -63,6 +63,7 @@ public:
 	void loadCursors(const Common::String &filename);
 
 	void setCursor(CursorId cursorId);
+	void setCursor(const Graphics::Surface &src);
 
 	void showCursor();
 
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 8257c16a38..aae8d683c0 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -21,10 +21,20 @@
  */
 
 #include "sherlock/map.h"
+#include "sherlock/sherlock.h"
 
 namespace Sherlock {
 
-Map::Map(SherlockEngine *vm): _vm(vm) {
+Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
+	_shapes = nullptr;
+	_iconShapes = nullptr;
+	_point = 0;
+	_placesShown = false;
+	_charPoint = -1;
+	for (int idx = 0; idx < 3; ++idx)
+		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
+
+	loadData();
 }
 
 /**
@@ -36,11 +46,268 @@ void Map::loadPoints(int count, const int *xList, const int *yList) {
 	}
 }
 
+/**
+ * Load data  needed for the map
+ */
+void Map::loadData() {
+	// Load the list of location names
+	Common::SeekableReadStream *txtStream = _vm->_res->load("chess.txt");
+	char c;
+
+	while (txtStream->pos() < txtStream->size()) {
+		Common::String line;
+		while ((c = txtStream->readByte()) != '\0')
+			line += c;
+
+		_locationNames.push_back(line);
+	}
+
+	delete txtStream;
+
+	// Load the path data
+	Common::SeekableReadStream *pathStream = _vm->_res->load("chess.pth");
+
+	_paths.resize(31);
+	for (uint idx = 0; idx < _paths.size(); ++idx) {
+		_paths[idx].resize(_paths.size());
+
+		for (uint idx2 = 0; idx2 < _paths.size(); ++idx2)
+			_paths[idx][idx2] = pathStream->readSint16LE();
+	}
+
+	// Load in the path point information
+	_pathPoints.resize(416);
+	for (uint idx = 0; idx < _pathPoints.size(); ++idx)
+		_pathPoints[idx] = pathStream->readSint16LE();
+
+	delete pathStream;
+}
+
 /**
  * Show the map
  */
 int Map::show() {
-	return 0;
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Common::Point lDrawn(-1, -1);
+	bool changed = false, exitFlag = false;
+	bool drawMap = true;
+
+	// Set font and custom cursor for the map
+	int oldFont = screen.fontNumber();
+	screen.setFont(0);
+
+	ImageFile mapCursors("omouse.vgs");
+	events.setCursor(mapCursors[0]);
+
+	// Load the entire map
+	ImageFile bigMap("bigmap.vgs");
+
+	// Load need sprites
+	setupSprites();
+
+	screen._backBuffer1.blitFrom(bigMap[1], Common::Point(-_bigPos.x, -_bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[2], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[4], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+
+	_point = -1;
+	people[AL]._position = _lDrawnPos = _overPos;
+
+	// Show place icons
+	showPlaces();
+	saveTopLine();
+	_placesShown = true;
+
+	// Keep looping until either a location is picked, or the game is ended
+	while (!_vm->shouldQuit() && !exitFlag) {
+		events.pollEventsAndWait();
+		events.setButtonState();
+
+		// Keyboard handling
+		if (events.kbHit()) {
+			Common::KeyState keyState = events.getKey();
+
+			if (keyState.keycode == Common::KEYCODE_RETURN || keyState.keycode == Common::KEYCODE_SPACE) {
+				// Both space and enter simulate a mouse release
+				events._pressed = false;
+				events._released = true;
+				events._oldButtons = 0;
+			}
+		}
+
+		// Ignore scrolling attempts until the screen is drawn
+		if (!drawMap) {
+			Common::Point pt = events.mousePos();
+			
+			// Check for vertical map scrolling
+			if ((pt.y > (SHERLOCK_SCREEN_HEIGHT - 10) && _bigPos.y < 200) || (pt.y < 10 && _bigPos.y > 0)) {
+				if (pt.y > (SHERLOCK_SCREEN_HEIGHT - 10))
+					_bigPos.y += 10;
+				else
+					_bigPos.y -= 10;
+
+				changed = true;
+			}
+
+			// Check for horizontal map scrolling
+			if ((pt.x > (SHERLOCK_SCREEN_WIDTH - 10) && _bigPos.x < 315) || (pt.x < 10 && _bigPos.x > 0)) {
+				if (pt.x > (SHERLOCK_SCREEN_WIDTH - 10))
+					_bigPos.x += 15;
+				else
+					_bigPos.x -= 15;
+
+				changed = true;
+			}
+		}
+
+		if (changed) {
+			// Map has scrolled, so redraw new map view
+			changed = false;
+
+			screen._backBuffer1.blitFrom(bigMap[1], Common::Point(-_bigPos.x, -_bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[2], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[4], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+
+			showPlaces();
+			_placesShown = false;
+
+			saveTopLine();
+			_savedPos.x = -1;
+			updateMap(true);
+		} else if (!drawMap) {
+			if (!_placesShown) {
+				showPlaces();
+				_placesShown = true;
+			}
+
+			updateMap(false);
+		}
+
+		if ((events._released || events._rightReleased) && _point != -1) {
+			if (people[AL]._walkCount == 0) {
+				_charPoint = _point;
+				walkTheStreets();
+
+				events.setCursor(mapCursors[1]);
+			}
+		}
+
+		// Check if a scene has beeen selected and we've finished "moving" to it
+		if (people[AL]._walkCount == 0) {
+			if (_charPoint >= 1 && _charPoint < (int)_points.size())
+				exitFlag = true;
+		}
+
+		if (drawMap) {
+			drawMap = false;
+
+			if (screen._fadeStyle)
+				screen.randomTransition();
+			else
+				screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+		}
+
+		// Wait for a frame
+		events.wait(1);
+	}
+
+	freeSprites();
+	_overPos = people[AL]._position;
+
+	// Reset font and cursor
+	screen.setFont(oldFont);
+	events.setCursor(ARROW);
+
+	return _charPoint;
+}
+
+/**
+ * Load and initialize all the sprites that are needed for the map display
+ */
+void Map::setupSprites() {
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	typedef byte Sequences[16][MAX_FRAME];
+	_savedPos.x = -1;
+
+	_shapes = new ImageFile("mapicon.vgs");
+	_iconShapes = new ImageFile("overicon.vgs");
+
+	Person &p = people[AL];
+	p._description = " ";
+	p._type = CHARACTER;
+	p._position = Common::Point(12400, 5000);
+	p._sequenceNumber = 0;
+	p._sequences = (Sequences *)&_sequences;
+	p._images = _shapes;
+	p._imageFrame = nullptr;
+	p._frameNumber = 0;
+	p._delta = Common::Point(0, 0);
+	p._oldSize = Common::Point(0, 0);
+	p._oldSize = Common::Point(0, 0);
+	p._misc = 0;
+	p._walkCount = 0;
+	p._allow = 0;
+	p._noShapeSize = Common::Point(0, 0);
+	p._goto = Common::Point(28000, 15000);
+	p._status = 0;
+	p.setImageFrame();
+
+	scene._bgShapes.clear();
+}
+
+/**
+ * Free the sprites and data used by the map
+ */
+void Map::freeSprites() {
+	delete _shapes;
+	delete _iconShapes;
+}
+
+/**
+ * Draws an icon for every place that's currently known
+ */
+void Map::showPlaces() {
+	Screen &screen = *_vm->_screen;
+
+	for (uint idx = 0; idx < _points.size(); ++idx) {
+		const Common::Point &pt = _points[idx];
+
+		if (pt.x != 0 && pt.y != 0) {
+			if (pt.x >= _bigPos.x && (pt.x - _bigPos.x) < SHERLOCK_SCREEN_WIDTH
+					&& pt.y >= _bigPos.y && (pt.y - _bigPos.y) < SHERLOCK_SCREEN_HEIGHT) {
+				if (_vm->readFlags(idx)) {
+					screen._backBuffer1.transBlitFrom((*_iconShapes)[idx], 
+						Common::Point(pt.x - _bigPos.x - 6, pt.y - _bigPos.y - 12));
+				}
+			}
+		}
+	}
+}
+
+/**
+ * Makes a copy of the top rows of the screen that are used to display location names
+ */
+void Map::saveTopLine() {
+	_topLine.blitFrom(_vm->_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, 12));
+}
+
+/**
+ * Update all on-screen sprites to account for any scrolling of the map
+ */
+void Map::updateMap(bool flushScreen) {
+	// TODO
+}
+
+/**
+ * Handle moving icon for player from their previous location on the map to a destination location
+ */
+void Map::walkTheStreets() {
+	// TODO
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 88f2b75805..32051d60b7 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -27,6 +27,9 @@
 #include "common/array.h"
 #include "common/rect.h"
 #include "common/str.h"
+#include "common/str-array.h"
+#include "sherlock/graphics.h"
+#include "sherlock/objects.h"
 
 namespace Sherlock {
 
@@ -36,7 +39,34 @@ class Map {
 private:
 	SherlockEngine *_vm;
 	Common::Array<Common::Point> _points;	// Map locations for each scene
-public:
+	Common::StringArray _locationNames;
+	Common::Array< Common::Array<int> > _paths;
+	Common::Array<int> _pathPoints;
+	Common::Point _savedPos;
+	Common::Point _savedSize;
+	Surface _topLine;
+	ImageFile *_shapes;
+	ImageFile *_iconShapes;
+	byte _sequences[3][MAX_FRAME];
+	Common::Point _bigPos;
+	Common::Point _overPos;
+	Common::Point _lDrawnPos;
+	int _point;
+	bool _placesShown;
+	int _charPoint;
+private:
+	void loadData();
+
+	void setupSprites();
+	void freeSprites();
+
+	void showPlaces();
+
+	void saveTopLine();
+
+	void updateMap(bool flushScreen);
+
+	void walkTheStreets();
 public:
 	Map(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 19142ef58a3e632b31a87a99b817e261f47c1bc4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 17 Apr 2015 00:07:31 -0500
Subject: SHERLOCK: Implement map icon drawing/restoring

---
 engines/sherlock/graphics.cpp |  13 ++++-
 engines/sherlock/graphics.h   |   2 +
 engines/sherlock/map.cpp      | 116 ++++++++++++++++++++++++++++++++++++++----
 engines/sherlock/map.h        |   7 +++
 4 files changed, 126 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 306ff23548..6e986c839b 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -28,7 +28,7 @@
 namespace Sherlock {
 
 Surface::Surface(uint16 width, uint16 height): _freePixels(true) {
-	create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+	create(width, height);
 }
 
 Surface::Surface(Surface &src, const Common::Rect &r) : _freePixels(false) {
@@ -39,12 +39,23 @@ Surface::Surface(Surface &src, const Common::Rect &r) : _freePixels(false) {
 	format = Graphics::PixelFormat::createFormatCLUT8();
 }
 
+Surface::Surface() : _freePixels(false) {
+}
 
 Surface::~Surface() {
 	if (_freePixels)
 		free();
 }
 
+void Surface::create(uint16 width, uint16 height) {
+	if (_freePixels)
+		free();
+
+	Graphics::Surface::create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+	_freePixels = true;
+}
+
+
 /**
  * Copy a surface into this one
  */
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index b54dc1ec37..85f3ba8c40 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -40,8 +40,10 @@ protected:
 	Surface(Surface &src, const Common::Rect &r);
 public:
     Surface(uint16 width, uint16 height);
+	Surface();
 	~Surface();
 
+	void create(uint16 width, uint16 height);
 	void blitFrom(const Graphics::Surface &src);
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index aae8d683c0..fa3bf99cab 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -26,11 +26,14 @@
 namespace Sherlock {
 
 Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
+	_mapCursors = nullptr;
 	_shapes = nullptr;
 	_iconShapes = nullptr;
 	_point = 0;
 	_placesShown = false;
 	_charPoint = -1;
+	_cursorIndex = -1;
+	_drawMap = false;
 	for (int idx = 0; idx < 3; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
 
@@ -89,19 +92,14 @@ void Map::loadData() {
 int Map::show() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Common::Point lDrawn(-1, -1);
 	bool changed = false, exitFlag = false;
-	bool drawMap = true;
 
 	// Set font and custom cursor for the map
 	int oldFont = screen.fontNumber();
 	screen.setFont(0);
 
-	ImageFile mapCursors("omouse.vgs");
-	events.setCursor(mapCursors[0]);
-
 	// Load the entire map
 	ImageFile bigMap("bigmap.vgs");
 
@@ -113,6 +111,7 @@ int Map::show() {
 	screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
 	screen._backBuffer1.blitFrom(bigMap[4], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
 
+	_drawMap = true;
 	_point = -1;
 	people[AL]._position = _lDrawnPos = _overPos;
 
@@ -139,7 +138,7 @@ int Map::show() {
 		}
 
 		// Ignore scrolling attempts until the screen is drawn
-		if (!drawMap) {
+		if (!_drawMap) {
 			Common::Point pt = events.mousePos();
 			
 			// Check for vertical map scrolling
@@ -178,7 +177,7 @@ int Map::show() {
 			saveTopLine();
 			_savedPos.x = -1;
 			updateMap(true);
-		} else if (!drawMap) {
+		} else if (!_drawMap) {
 			if (!_placesShown) {
 				showPlaces();
 				_placesShown = true;
@@ -192,7 +191,8 @@ int Map::show() {
 				_charPoint = _point;
 				walkTheStreets();
 
-				events.setCursor(mapCursors[1]);
+				_cursorIndex = 1;
+				events.setCursor((*_mapCursors)[_cursorIndex]);
 			}
 		}
 
@@ -202,8 +202,8 @@ int Map::show() {
 				exitFlag = true;
 		}
 
-		if (drawMap) {
-			drawMap = false;
+		if (_drawMap) {
+			_drawMap = false;
 
 			if (screen._fadeStyle)
 				screen.randomTransition();
@@ -229,11 +229,16 @@ int Map::show() {
  * Load and initialize all the sprites that are needed for the map display
  */
 void Map::setupSprites() {
+	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	typedef byte Sequences[16][MAX_FRAME];
 	_savedPos.x = -1;
 
+	_mapCursors = new ImageFile("omouse.vgs");
+	_cursorIndex = 0;
+	events.setCursor((*_mapCursors)[_cursorIndex]);
+
 	_shapes = new ImageFile("mapicon.vgs");
 	_iconShapes = new ImageFile("overicon.vgs");
 
@@ -264,6 +269,7 @@ void Map::setupSprites() {
  * Free the sprites and data used by the map
  */
 void Map::freeSprites() {
+	delete _mapCursors;
 	delete _shapes;
 	delete _iconShapes;
 }
@@ -300,7 +306,49 @@ void Map::saveTopLine() {
  * Update all on-screen sprites to account for any scrolling of the map
  */
 void Map::updateMap(bool flushScreen) {
-	// TODO
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Common::Point osPos = _savedPos;
+	Common::Point osSize = _savedSize;
+	Common::Point hPos;
+
+	if (_cursorIndex >= 1) {
+		if (++_cursorIndex > (1 + 8))
+			_cursorIndex = 1;
+
+		events.setCursor((*_mapCursors)[_cursorIndex]);
+	}
+
+	if (!_drawMap && !flushScreen)
+		restoreIcon();
+	else
+		_savedPos.x = -1;
+
+	people[AL].adjustSprite();
+
+	_lDrawnPos.x = hPos.x = people[AL]._position.x / 100 - _bigPos.x;
+	_lDrawnPos.y = hPos.y = people[AL]._position.y / 100 - people[AL].frameHeight() - _bigPos.y;
+
+	// Draw the person icon
+	saveIcon(people[AL]._imageFrame, hPos);
+	if (people[AL]._sequenceNumber == MAP_DOWNLEFT || people[AL]._sequenceNumber == MAP_LEFT
+			|| people[AL]._sequenceNumber == MAP_UPLEFT)
+		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, hPos, true);
+	else
+		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, hPos, false);
+
+	if (flushScreen) {
+		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	} else if (!_drawMap) {
+		if (hPos.x > 0 && hPos.y >= 0 && hPos.x < SHERLOCK_SCREEN_WIDTH && hPos.y < SHERLOCK_SCREEN_HEIGHT)
+			screen.flushImage(people[AL]._imageFrame, Common::Point(people[AL]._position.x / 100 - _bigPos.x,
+			people[AL]._position.y / 100 - people[AL].frameHeight() - _bigPos.y),
+			&people[AL]._oldPosition.x, &people[AL]._oldPosition.y, &people[AL]._oldSize.x, &people[AL]._oldSize.y);
+
+		if (osPos.x != -1)
+			screen.slamArea(osPos.x, osPos.y, osSize.x, osSize.y);
+	}
 }
 
 /**
@@ -310,4 +358,50 @@ void Map::walkTheStreets() {
 	// TODO
 }
 
+/**
+ * Save the area under the player's icon
+ */
+void Map::saveIcon(ImageFrame *src, const Common::Point &pt) {
+	Screen &screen = *_vm->_screen;
+	Common::Point size(src->_width, src->_height);
+	Common::Point pos = pt;
+
+	if (pos.x < 0) {
+		size.x += pos.x;
+		pos.x = 0;
+	}
+	
+	if (pos.y < 0) {
+		size.y += pos.y;
+		pos.y = 0;
+	}
+
+	if ((pos.x + size.x) > SHERLOCK_SCREEN_WIDTH)
+		size.x -= (pos.x + size.x) - SHERLOCK_SCREEN_WIDTH;
+
+	if ((pos.y + size.y) > SHERLOCK_SCREEN_HEIGHT)
+		size.y -= (pos.y + size.y) - SHERLOCK_SCREEN_HEIGHT;
+
+	if (size.x < 1 || size.y < 1 || pos.x >= SHERLOCK_SCREEN_WIDTH || pos.y >= SHERLOCK_SCREEN_HEIGHT || _drawMap) {
+		// Flag as the area not needing to be saved
+		_savedPos.x = -1;
+		return;
+	}
+
+	_iconSave.create(size.x, size.y);
+	_iconSave.blitFrom(screen._backBuffer1, Common::Point(0, 0),
+		Common::Rect(pos.x, pos.y, pos.x + size.x, pos.y + size.y));
+}
+
+/**
+ * Restore the area under the player's icon
+ */
+void Map::restoreIcon() {
+	Screen &screen = *_vm->_screen;
+
+	if (_savedPos.x >= 0 && _savedPos.y >= 0 && _savedPos.x <= SHERLOCK_SCREEN_WIDTH
+			&& _savedPos.y < SHERLOCK_SCREEN_HEIGHT)
+		screen._backBuffer1.blitFrom(_iconSave, _savedPos);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 32051d60b7..653d8c0084 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -45,6 +45,7 @@ private:
 	Common::Point _savedPos;
 	Common::Point _savedSize;
 	Surface _topLine;
+	ImageFile *_mapCursors;
 	ImageFile *_shapes;
 	ImageFile *_iconShapes;
 	byte _sequences[3][MAX_FRAME];
@@ -54,6 +55,9 @@ private:
 	int _point;
 	bool _placesShown;
 	int _charPoint;
+	int _cursorIndex;
+	bool _drawMap;
+	Surface _iconSave;
 private:
 	void loadData();
 
@@ -67,6 +71,9 @@ private:
 	void updateMap(bool flushScreen);
 
 	void walkTheStreets();
+
+	void saveIcon(ImageFrame *src, const Common::Point &pt);
+	void restoreIcon();
 public:
 	Map(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 64009f9384a376c79717c86713ddfb0e88366084 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 17 Apr 2015 21:19:36 +0200
Subject: SCI: add kq6 Sneak Peaks CD demo bug #6824

---
 engines/sci/detection_tables.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 32d1a58765..312069025b 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1552,6 +1552,17 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// King's Quest 6 - English DOS Playable CD "Sneak Peaks" Demo (first island fully playable)
+	//  (supplied by KQ5 G5 in bug report #6824)
+	// Executable scanning reports "1.cfs.158 Not a release version", VERSION file reports "1.000.000"
+	// SCI interpreter version ???
+	{"kq6", "Demo/CD", {
+		{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8345598},
+		{"resource.map", 0, "eb9e177281b7cde188dc0d83194cd365", 8960},
+		{"resource.msg", 0, "3cf5de44de36191f109d425b8450efc8", 259510},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD | ADGF_DEMO, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
 	// King's Quest 6 - English DOS Floppy
 	// SCI interpreter version 1.001.054
 	{"kq6", "", {
-- 
cgit v1.2.3


From 882b1c218fedf5ea45d81524f405df1178080e7a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 17 Apr 2015 23:40:12 +0200
Subject: SCI: patch qfg2 import bug for 1.102 and below

this patches the known character type import bug
(which made all imported characters a fighter)
---
 engines/sci/engine/script_patches.cpp | 52 +++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 48b1292d1b..44ceb15f63 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2245,9 +2245,57 @@ static const uint16 qfg2PatchImportDialog[] = {
 	PATCH_END
 };
 
-//          script, description,                                      signature                  patch
+// Quest For Glory 2 character import doesn't properly set the character type
+//  in versions 1.102 and below, which makes all importerted characters a fighter.
+//
+// Sierra released an official patch. However the fix is really easy to
+//  implement on our side, so we also patch the flaw in here in case we find it.
+//
+// The version released on GOG is 1.102 without this patch applied, so us
+//  patching it is quite useful.
+//
+// Applies to at least: English Floppy
+// Responsible method: importHero::changeState
+// Fixes bug: inside versions 1.102 and below
+static const uint16 qfg2SignatureImportCharType[] = {
+	0x35, 0x04,                         // ldi 04
+	0x90, SIG_UINT16(0x023b),           // lagi global[23Bh]
+	0x02,                               // add
+	0x36,                               // push
+	0x35, 0x04,                         // ldi 04
+	0x08,                               // div
+	0x36,                               // push
+	0x35, 0x0d,                         // ldi 0D
+	0xb0, SIG_UINT16(0x023b),           // sagi global[023Bh]
+	0x8b, 0x1f,                         // lsl local[1Fh]
+	0x35, 0x05,                         // ldi 05
+	SIG_MAGICDWORD,
+	0xb0, SIG_UINT16(0x0150),           // sagi global[0150h]
+	0x8b, 0x02,                         // lsl local[02h]
+	SIG_END
+};
+
+static const uint16 qfg2PatchImportCharType[] = {
+	0x80, PATCH_UINT16(0x023f),         // lag global[23Fh] <-- patched to save 2 bytes
+	0x02,                               // add
+	0x36,                               // push
+	0x35, 0x04,                         // ldi 04
+	0x08,                               // div
+	0x36,                               // push
+	0xa8, SIG_UINT16(0x0248),           // ssg global[0248h] <-- patched to save 2 bytes
+	0x8b, 0x1f,                         // lsl local[1Fh]
+	0xa8, SIG_UINT16(0x0155),           // ssg global[0155h] <-- patched to save 2 bytes
+	// new code, directly from the official sierra patch file
+	0x83, 0x01,                         // lal local[01h]
+	0xa1, 0xbb,                         // sag global[BBh]
+	0xa1, 0x73,                         // sag global[73h]
+	PATCH_END
+};
+
+//          script, description,                                      signature                    patch
 static const SciScriptPatcherEntry qfg2Signatures[] = {
-	{  true,   944, "import dialog continuous calls",              1, qfg2SignatureImportDialog, qfg2PatchImportDialog },
+	{  true,   805, "import character type fix",                   1, qfg2SignatureImportCharType, qfg2PatchImportCharType },
+	{  true,   944, "import dialog continuous calls",              1, qfg2SignatureImportDialog,   qfg2PatchImportDialog },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From e75367ab3bfa75d1e08b107511f468086f8c3112 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 17 Apr 2015 23:48:18 +0200
Subject: SCI: sort qfg import files alphabetically

---
 engines/sci/engine/file.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/sci/engine/file.cpp b/engines/sci/engine/file.cpp
index 2ba7d15ac0..623caec856 100644
--- a/engines/sci/engine/file.cpp
+++ b/engines/sci/engine/file.cpp
@@ -252,6 +252,9 @@ void DirSeeker::addAsVirtualFiles(Common::String title, Common::String fileMask)
 	Common::SaveFileManager *saveFileMan = g_sci->getSaveFileManager();
 	Common::StringArray foundFiles = saveFileMan->listSavefiles(fileMask);
 	if (!foundFiles.empty()) {
+		// Sort all filenames alphabetically
+		Common::sort(foundFiles.begin(), foundFiles.end());
+
 		_files.push_back(title);
 		_virtualFiles.push_back("");
 		Common::StringArray::iterator it;
-- 
cgit v1.2.3


From 8e3f537019647874e12c9c4a1a90a2e004479102 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 09:28:18 +0200
Subject: SCI: QfG3 fix importing QfG1 character files

character type was always imported as fighter
was never fixed by Sierra
---
 engines/sci/engine/script_patches.cpp | 36 ++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 44ceb15f63..b704a1c4b3 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2456,6 +2456,31 @@ static const uint16 qfg3PatchExportChar[] = {
 	PATCH_END
 };
 
+// Quest for Glory 3 doesn't properly import the character type of Quest for Glory 1 character files.
+//  This issue was never addressed. It's caused by Sierra reading data directly from the local
+//  area, which is only set by Quest For Glory 2 import data, instead of reading the properly set global variable.
+//
+// We fix it, by also directly setting the local variable.
+//
+// Applies to at least: English, French, German, Italian, Spanish floppy
+// Responsible method: importHero::changeState(4)
+static const uint16 qfg3SignatureImportQfG1Char[] = {
+	SIG_MAGICDWORD,
+	0x82, SIG_UINT16(0x0238),           // lal local[0x0238]
+	0xa0, SIG_UINT16(0x016a),           // sag global[0x016a]
+	0xa1, 0x7d,                         // sag global[0x7d]
+	0x35, 0x01,                         // ldi 01
+	0x99, 0xfb,                         // lsgi global[0xfb]
+	SIG_END
+};
+
+static const uint16 qfg3PatchImportQfG1Char[] = {
+	PATCH_ADDTOOFFSET(+8),
+	0xa3, 0x01,                         // sal 01           -> also set local[01]
+	0x89, 0xfc,                         // lsg global[0xFD] -> save 2 bytes
+	PATCH_END
+};
+
 // The chief in his hut (room 640) is not drawn using the correct priority,
 //  which results in a graphical glitch. This is a game bug and also happens
 //  in Sierra's SCI. We adjust priority accordingly to fix it.
@@ -2483,12 +2508,13 @@ static const uint16 qfg3PatchChiefPriority[] = {
 	PATCH_END
 };
 
-//          script, description,                                      signature                  patch
+//          script, description,                                      signature                    patch
 static const SciScriptPatcherEntry qfg3Signatures[] = {
-	{  true,   944, "import dialog continuous calls",              1, qfg3SignatureImportDialog,  qfg3PatchImportDialog },
-	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialog,     qfg3PatchWooDialog },
-	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialogAlt,  qfg3PatchWooDialogAlt },
-	{  true,    52, "export character save bug",                   2, qfg3SignatureExportChar,    qfg3PatchExportChar },
+	{  true,   944, "import dialog continuous calls",              1, qfg3SignatureImportDialog,   qfg3PatchImportDialog },
+	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialog,      qfg3PatchWooDialog },
+	{  true,   440, "dialog crash when asking about Woo",          1, qfg3SignatureWooDialogAlt,   qfg3PatchWooDialogAlt },
+	{  true,    52, "export character save bug",                   2, qfg3SignatureExportChar,     qfg3PatchExportChar },
+	{  true,    54, "import character from QfG1 bug",              1, qfg3SignatureImportQfG1Char, qfg3PatchImportQfG1Char },
 	{  true,   640, "chief in hut priority fix",                   1, qfg3SignatureChiefPriority, qfg3PatchChiefPriority },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
-- 
cgit v1.2.3


From e24c8f1e877ca6b1c399e310ac0d3c2fd7ae4043 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 12:10:26 +0200
Subject: SCI: add uninitialized read workaround qfg3 rm140

for French, German, Italian and Spanish versions
---
 engines/sci/engine/workarounds.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 998d7cc041..bfc6cbb64a 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -162,6 +162,10 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_QFG2,           -1,   700,  0,                 NULL, "showSign",       -1,   10, { WORKAROUND_FAKE,   0 } }, // Occurs sometimes when reading a sign in Raseir, Shapeir et al - bugs #5627, #5635
 	{ GID_QFG3,          510,   510,  0,         "awardPrize", "changeState",    -1,    0, { WORKAROUND_FAKE,   1 } }, // Simbani warrior challenge, after throwing the spears and retrieving the ring - bug #5277. Must be non-zero, otherwise the prize is awarded twice - bug #6160
 	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x1008,    0, { WORKAROUND_FAKE,   0 } }, // when importing a character and selecting the previous profession - bug #5163
+	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x11e4,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the French version
+	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x10f2,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the German version
+	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x11e3,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the Italian version
+	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x123d,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the Spanish version
 	{ GID_QFG3,          330,   330, -1,             "Teller", "doChild",        -1,   -1, { WORKAROUND_FAKE,   0 } }, // when talking to King Rajah about "Rajah" (bug #5033, temp 1) or "Tarna" (temp 0), or when clicking on yourself and saying "Greet" (bug #5148, temp 1)
 	{ GID_QFG3,          700,   700, -1,      "monsterIsDead", "changeState",    -1,    0, { WORKAROUND_FAKE,   0 } }, // in the jungle, after winning any fight, bug #5169
 	{ GID_QFG3,          470,   470, -1,              "rm470", "notify",         -1,    0, { WORKAROUND_FAKE,   0 } }, // closing the character screen in the Simbani village in the room with the bridge, bug #5165
-- 
cgit v1.2.3


From c78cf88766849402f4de40fa972bce06dfdcb0d9 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 13:28:35 +0200
Subject: SCI: sq4 russian: added all workarounds manually

and removed generic workaround, which ignores all
objectnames.
---
 engines/sci/engine/workarounds.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index bfc6cbb64a..c6bd9aedc9 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -192,8 +192,11 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_SQ4,            -1,   398,  0,            "showBox", "changeState",    -1,    0, { WORKAROUND_FAKE,   0 } }, // CD: called when rummaging in Software Excess bargain bin
 	{ GID_SQ4,            -1,   928, -1,           "Narrator", "startText",      -1, 1000, { WORKAROUND_FAKE,   1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously
 	{ GID_SQ4,            -1,   708, -1,            "exitBut", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1,                   "", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button... in Russian version - bug #5573
 	{ GID_SQ4,            -1,   708, -1,            "prevBut", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1, "\xA8\xE6\xE3 \xAD\xA0\xA7\xA0\xA4.", "doVerb", -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button... in Russian version - bug #5573
 	{ GID_SQ4,            -1,   708, -1,            "nextBut", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1,                  ".", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button... in Russian version - bug #5573
 	{ GID_SQ5,           201,   201,  0,        "buttonPanel", "doVerb",         -1,    0, { WORKAROUND_FAKE,   1 } }, // when looking at the orange or red button - bug #5112
 	{ GID_SQ6,            -1,     0,  0,                "SQ6", "init",           -1,    2, { WORKAROUND_FAKE,   0 } }, // Demo and full version: called when the game starts (demo: room 0, full: room 100)
 	{ GID_SQ6,            -1, 64950, -1,            "Feature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // called when pressing "Start game" in the main menu, when entering the Orion's Belt bar (room 300), and perhaps other places
@@ -277,6 +280,7 @@ const SciWorkaroundEntry kDisposeScript_workarounds[] = {
 	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
 	{ GID_SQ4,           150,   151,  0,        "fightScript", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object
 	{ GID_SQ4,           150,   152,  0,       "driveCloseUp", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object
+	{ GID_SQ4,           150,   152,  0,                   "", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -301,7 +305,7 @@ const SciWorkaroundEntry kGetAngle_workarounds[] = {
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kFindKey_workarounds[] = {
 	{ GID_ECOQUEST2,     100,   999,  0,            "myList", "contains",        -1,    0, { WORKAROUND_FAKE, 0 } }, // When Noah Greene gives Adam the Ecorder, and just before the game gives a demonstration, a null reference to a list is passed - bug #4987
-	{    GID_HOYLE4,     300,   999,  0,             "Piles", "contains",        -1,    0, { WORKAROUND_FAKE, 0 } }, // When passing the three cards in Hearts, a null reference to a list is passed - bug #5664
+	{ GID_HOYLE4,        300,   999,  0,             "Piles", "contains",        -1,    0, { WORKAROUND_FAKE, 0 } }, // When passing the three cards in Hearts, a null reference to a list is passed - bug #5664
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -346,12 +350,17 @@ const SciWorkaroundEntry kGraphFillBoxAny_workarounds[] = {
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kGraphRedrawBox_workarounds[] = {
 	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           405,   405,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
 	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
 	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
 	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           410,   410,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
 	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           411,   411,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
 	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0xb2,    0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479
 	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0x16,    0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the German version - bug #5527
+	{ GID_SQ4,           150,   150,  0,                   "", "changeState",  0x16,    0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
 	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
 	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
 	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
@@ -508,12 +517,6 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 				bool objectNameMatches = (workaround->objectName == NULL) ||
 										 (workaround->objectName == g_sci->getSciLanguageString(searchObjectName, K_LANG_ENGLISH));
 
-				// Special case: in the fanmade Russian translation of SQ4, all
-				// of the object names have been deleted or renamed to Russian,
-				// thus we disable checking of the object name. Fixes bug #5573.
-				if (g_sci->getLanguage() == Common::RU_RUS && g_sci->getGameId() == GID_SQ4)
-					objectNameMatches = true;
-
 				if (workaround->gameId == gameId
 						&& ((workaround->scriptNr == -1) || (workaround->scriptNr == curScriptNr))
 						&& ((workaround->roomNr == -1) || (workaround->roomNr == curRoomNumber))
-- 
cgit v1.2.3


From 38444d6024870d31656c911b2af1512a1cd6281a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 22:18:57 +0200
Subject: SCI: add signatures for workaround local-calls

instead of using hardcoded offsets, we can now
use regular script patcher signatures.

only 1 qfg3 workaround has been migrated,
 the others will follow.
---
 engines/sci/engine/script_patches.cpp | 190 +++++-----
 engines/sci/engine/script_patches.h   |   9 +-
 engines/sci/engine/workarounds.cpp    | 689 ++++++++++++++++++----------------
 engines/sci/engine/workarounds.h      |   1 +
 4 files changed, 475 insertions(+), 414 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index b704a1c4b3..e88aa98f42 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2924,6 +2924,7 @@ ScriptPatcher::ScriptPatcher() {
 		_selectorIdTable[selectorNr] = -1;
 
 	_runtimeTable = NULL;
+	_isMacSci11 = false;
 }
 
 ScriptPatcher::~ScriptPatcher() {
@@ -2932,7 +2933,7 @@ ScriptPatcher::~ScriptPatcher() {
 }
 
 // will actually patch previously found signature area
-void ScriptPatcher::applyPatch(const SciScriptPatcherEntry *patchEntry, byte *scriptData, const uint32 scriptSize, int32 signatureOffset, const bool isMacSci11) {
+void ScriptPatcher::applyPatch(const SciScriptPatcherEntry *patchEntry, byte *scriptData, const uint32 scriptSize, int32 signatureOffset) {
 	const uint16 *patchData = patchEntry->patchData;
 	byte orgData[PATCH_VALUELIMIT];
 	int32 offset = signatureOffset;
@@ -2996,7 +2997,7 @@ void ScriptPatcher::applyPatch(const SciScriptPatcherEntry *patchEntry, byte *sc
 			default:
 				byte1 = 0; byte2 = 0;
 			}
-			if (!isMacSci11) {
+			if (!_isMacSci11) {
 				scriptData[offset++] = byte1;
 				scriptData[offset++] = byte2;
 			} else {
@@ -3023,8 +3024,94 @@ void ScriptPatcher::applyPatch(const SciScriptPatcherEntry *patchEntry, byte *sc
 	}
 }
 
+bool ScriptPatcher::verifySignature(uint32 byteOffset, const uint16 *signatureData, const char *signatureDescription, const byte *scriptData, const uint32 scriptSize) {
+	uint16 sigSelector = 0;
+
+	uint16 sigWord = *signatureData;
+	while (sigWord != SIG_END) {
+		uint16 sigCommand = sigWord & SIG_COMMANDMASK;
+		uint16 sigValue = sigWord & SIG_VALUEMASK;
+		switch (sigCommand) {
+		case SIG_CODE_ADDTOOFFSET: {
+			// add value to offset
+			byteOffset += sigValue;
+			break;
+		}
+		case SIG_CODE_UINT16:
+		case SIG_CODE_SELECTOR16: {
+			if ((byteOffset + 1) < scriptSize) {
+				byte byte1;
+				byte byte2;
+
+				switch (sigCommand) {
+				case SIG_CODE_UINT16: {
+					byte1 = sigValue & SIG_BYTEMASK;
+					signatureData++; sigWord = *signatureData;
+					if (sigWord & SIG_COMMANDMASK)
+						error("Script-Patcher: signature inconsistent\nFaulty signature: '%s'", signatureDescription);
+					byte2 = sigWord & SIG_BYTEMASK;
+					break;
+				}
+				case SIG_CODE_SELECTOR16: {
+					sigSelector = _selectorIdTable[sigValue];
+					byte1 = sigSelector & 0xFF;
+					byte2 = sigSelector >> 8;
+					break;
+				}
+				default:
+					byte1 = 0; byte2 = 0;
+				}
+				if (!_isMacSci11) {
+					if ((scriptData[byteOffset] != byte1) || (scriptData[byteOffset + 1] != byte2))
+						sigWord = SIG_MISMATCH;
+				} else {
+					// SCI1.1+ on macintosh had uint16s in script in BE-order
+					if ((scriptData[byteOffset] != byte2) || (scriptData[byteOffset + 1] != byte1))
+						sigWord = SIG_MISMATCH;
+				}
+				byteOffset += 2;
+			} else {
+				sigWord = SIG_MISMATCH;
+			}
+			break;
+		}
+		case SIG_CODE_SELECTOR8: {
+			if (byteOffset < scriptSize) {
+				sigSelector = _selectorIdTable[sigValue];
+				if (sigSelector & 0xFF00)
+					error("Script-Patcher: 8 bit selector required, game uses 16 bit selector\nFaulty signature: '%s'", signatureDescription);
+				if (scriptData[byteOffset] != (sigSelector & 0xFF))
+					sigWord = SIG_MISMATCH;
+				byteOffset++;
+			} else {
+				sigWord = SIG_MISMATCH; // out of bounds
+			}
+			break;
+		}
+		case SIG_CODE_BYTE:
+			if (byteOffset < scriptSize) {
+				if (scriptData[byteOffset] != sigWord)
+					sigWord = SIG_MISMATCH;
+				byteOffset++;
+			} else {
+				sigWord = SIG_MISMATCH; // out of bounds
+			}
+		}
+
+		if (sigWord == SIG_MISMATCH)
+			break;
+
+		signatureData++;
+		sigWord = *signatureData;
+	}
+
+	if (sigWord == SIG_END) // signature fully matched?
+		return true;
+	return false;
+}
+
 // will return -1 if no match was found, otherwise an offset to the start of the signature match
-int32 ScriptPatcher::findSignature(const SciScriptPatcherEntry *patchEntry, SciScriptPatcherRuntimeEntry *runtimeEntry, const byte *scriptData, const uint32 scriptSize, const bool isMacSci11) {
+int32 ScriptPatcher::findSignature(const SciScriptPatcherEntry *patchEntry, SciScriptPatcherRuntimeEntry *runtimeEntry, const byte *scriptData, const uint32 scriptSize) {
 	if (scriptSize < 4) // we need to find a DWORD, so less than 4 bytes is not okay
 		return -1;
 
@@ -3036,89 +3123,8 @@ int32 ScriptPatcher::findSignature(const SciScriptPatcherEntry *patchEntry, SciS
 		if (magicDWord == READ_UINT32(scriptData + DWordOffset)) {
 			// magic DWORD found, check if actual signature matches
 			uint32 offset = DWordOffset + runtimeEntry->magicOffset;
-			uint32 byteOffset = offset;
-			const uint16 *signatureData = patchEntry->signatureData;
-			uint16 sigSelector = 0;
-
-			uint16 sigWord = *signatureData;
-			while (sigWord != SIG_END) {
-				uint16 sigCommand = sigWord & SIG_COMMANDMASK;
-				uint16 sigValue = sigWord & SIG_VALUEMASK;
-				switch (sigCommand) {
-				case SIG_CODE_ADDTOOFFSET: {
-					// add value to offset
-					byteOffset += sigValue;
-					break;
-				}
-				case SIG_CODE_UINT16:
-				case SIG_CODE_SELECTOR16: {
-					if ((byteOffset + 1) < scriptSize) {
-						byte byte1;
-						byte byte2;
-
-						switch (sigCommand) {
-						case SIG_CODE_UINT16: {
-							byte1 = sigValue & SIG_BYTEMASK;
-							signatureData++; sigWord = *signatureData;
-							if (sigWord & SIG_COMMANDMASK)
-								error("Script-Patcher: signature inconsistent\nFaulty patch: '%s'", patchEntry->description);
-							byte2 = sigWord & SIG_BYTEMASK;
-							break;
-						}
-						case SIG_CODE_SELECTOR16: {
-							sigSelector = _selectorIdTable[sigValue];
-							byte1 = sigSelector & 0xFF;
-							byte2 = sigSelector >> 8;
-							break;
-						}
-						default:
-							byte1 = 0; byte2 = 0;
-						}
-						if (!isMacSci11) {
-							if ((scriptData[byteOffset] != byte1) || (scriptData[byteOffset + 1] != byte2))
-								sigWord = SIG_MISMATCH;
-						} else {
-							// SCI1.1+ on macintosh had uint16s in script in BE-order
-							if ((scriptData[byteOffset] != byte2) || (scriptData[byteOffset + 1] != byte1))
-								sigWord = SIG_MISMATCH;
-						}
-						byteOffset += 2;
-					} else {
-						sigWord = SIG_MISMATCH;
-					}
-					break;
-				}
-				case SIG_CODE_SELECTOR8: {
-					if (byteOffset < scriptSize) {
-						sigSelector = _selectorIdTable[sigValue];
-						if (sigSelector & 0xFF00)
-							error("Script-Patcher: 8 bit selector required, game uses 16 bit selector\nFaulty patch: '%s'", patchEntry->description);
-						if (scriptData[byteOffset] != (sigSelector & 0xFF))
-							sigWord = SIG_MISMATCH;
-						byteOffset++;
-					} else {
-						sigWord = SIG_MISMATCH; // out of bounds
-					}
-					break;
-				}
-				case SIG_CODE_BYTE:
-					if (byteOffset < scriptSize) {
-						if (scriptData[byteOffset] != sigWord)
-							sigWord = SIG_MISMATCH;
-						byteOffset++;
-					} else {
-						sigWord = SIG_MISMATCH; // out of bounds
-					}
-				}
-
-				if (sigWord == SIG_MISMATCH)
-					break;
-
-				signatureData++;
-				sigWord = *signatureData;
-			}
 
-			if (sigWord == SIG_END) // signature fully matched?
+			if (verifySignature(offset, patchEntry->signatureData, patchEntry->description, scriptData, scriptSize))
 				return offset;
 		}
 		DWordOffset++;
@@ -3129,7 +3135,7 @@ int32 ScriptPatcher::findSignature(const SciScriptPatcherEntry *patchEntry, SciS
 
 // This method calculates the magic DWORD for each entry in the signature table
 //  and it also initializes the selector table for selectors used in the signatures/patches of the current game
-void ScriptPatcher::initSignature(const SciScriptPatcherEntry *patchTable, bool isMacSci11) {
+void ScriptPatcher::initSignature(const SciScriptPatcherEntry *patchTable) {
 	const SciScriptPatcherEntry *curEntry = patchTable;
 	SciScriptPatcherRuntimeEntry *curRuntimeEntry;
 	Selector curSelector = -1;
@@ -3197,7 +3203,7 @@ void ScriptPatcher::initSignature(const SciScriptPatcherEntry *patchTable, bool
 						curData++; curWord = *curData;
 						if (curWord & SIG_COMMANDMASK)
 							error("Script-Patcher: signature entry inconsistent\nFaulty patch: '%s'", curEntry->description);
-						if (!isMacSci11) {
+						if (!_isMacSci11) {
 							byte1 = curValue;
 							byte2 = curWord & SIG_BYTEMASK;
 						} else {
@@ -3212,7 +3218,7 @@ void ScriptPatcher::initSignature(const SciScriptPatcherEntry *patchTable, bool
 							curSelector = g_sci->getKernel()->findSelector(selectorNameTable[curValue]);
 							_selectorIdTable[curValue] = curSelector;
 						}
-						if (!isMacSci11) {
+						if (!_isMacSci11) {
 							byte1 = curSelector & 0x00FF;
 							byte2 = curSelector >> 8;
 						} else {
@@ -3374,7 +3380,7 @@ void ScriptPatcher::processScript(uint16 scriptNr, byte *scriptData, const uint3
 	}
 
 	if (signatureTable) {
-		bool isMacSci11 = (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1);
+		_isMacSci11 = (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1);
 
 		if (!_runtimeTable) {
 			// Abort, in case selectors are not yet initialized (happens for games w/o selector-dictionary)
@@ -3382,7 +3388,7 @@ void ScriptPatcher::processScript(uint16 scriptNr, byte *scriptData, const uint3
 				return;
 
 			// signature table needs to get initialized (Magic DWORD set, selector table set)
-			initSignature(signatureTable, isMacSci11);
+			initSignature(signatureTable);
 
 			// Do additional game-specific initialization
 			switch (gameId) {
@@ -3417,11 +3423,11 @@ void ScriptPatcher::processScript(uint16 scriptNr, byte *scriptData, const uint3
 				int32 foundOffset = 0;
 				int16 applyCount = curEntry->applyCount;
 				do {
-					foundOffset = findSignature(curEntry, curRuntimeEntry, scriptData, scriptSize, isMacSci11);
+					foundOffset = findSignature(curEntry, curRuntimeEntry, scriptData, scriptSize);
 					if (foundOffset != -1) {
 						// found, so apply the patch
 						debugC(kDebugLevelScriptPatcher, "Script-Patcher: '%s' on script %d offset %d", curEntry->description, scriptNr, foundOffset);
-						applyPatch(curEntry, scriptData, scriptSize, foundOffset, isMacSci11);
+						applyPatch(curEntry, scriptData, scriptSize, foundOffset);
 					}
 					applyCount--;
 				} while ((foundOffset != -1) && (applyCount));
diff --git a/engines/sci/engine/script_patches.h b/engines/sci/engine/script_patches.h
index 7023ef327e..d15fce321b 100644
--- a/engines/sci/engine/script_patches.h
+++ b/engines/sci/engine/script_patches.h
@@ -74,7 +74,6 @@ struct SciScriptPatcherEntry {
 	const uint16 *patchData;
 };
 
-//#define SCI_SIGNATUREENTRY_TERMINATOR { false, 0, NULL, 0, 0, 0, NULL, NULL }
 #define SCI_SIGNATUREENTRY_TERMINATOR { false, 0, NULL, 0, NULL, NULL }
 
 struct SciScriptPatcherRuntimeEntry {
@@ -92,15 +91,17 @@ public:
 	~ScriptPatcher();
 
 	void processScript(uint16 scriptNr, byte *scriptData, const uint32 scriptSize);
+	bool verifySignature(uint32 byteOffset, const uint16 *signatureData, const char *signatureDescription, const byte *scriptData, const uint32 scriptSize);
 
 private:
-	void initSignature(const SciScriptPatcherEntry *patchTable, bool isMacSci11);
+	void initSignature(const SciScriptPatcherEntry *patchTable);
 	void enablePatch(const SciScriptPatcherEntry *patchTable, const char *searchDescription);
-	int32 findSignature(const SciScriptPatcherEntry *patchEntry, SciScriptPatcherRuntimeEntry *runtimeEntry, const byte *scriptData, const uint32 scriptSize, bool isMacSci11);
-	void applyPatch(const SciScriptPatcherEntry *patchEntry, byte *scriptData, const uint32 scriptSize, int32 signatureOffset, bool isMacSci11);
+	int32 findSignature(const SciScriptPatcherEntry *patchEntry, SciScriptPatcherRuntimeEntry *runtimeEntry, const byte *scriptData, const uint32 scriptSize);
+	void applyPatch(const SciScriptPatcherEntry *patchEntry, byte *scriptData, const uint32 scriptSize, int32 signatureOffset);
 
 	Selector *_selectorIdTable;
 	SciScriptPatcherRuntimeEntry *_runtimeTable;
+	bool _isMacSci11;
 };
 
 } // End of namespace Sci
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index c6bd9aedc9..9ae6537000 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -24,441 +24,455 @@
 #include "sci/engine/object.h"
 #include "sci/engine/state.h"
 #include "sci/engine/vm.h"
+#include "sci/engine/script_patches.h"
 #include "sci/engine/workarounds.h"
 
-#define SCI_WORKAROUNDENTRY_TERMINATOR { (SciGameId)0, -1, -1, 0, NULL, NULL, -1, 0, { WORKAROUND_NONE, 0 } }
+#define SCI_WORKAROUNDENTRY_TERMINATOR { (SciGameId)0, -1, -1, 0, NULL, NULL, -1, NULL, 0, { WORKAROUND_NONE, 0 } }
 
 namespace Sci {
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,             workaround
+// Attention:
+//  To identify local-call-subroutines code signatures are used.
+//   Offsets change a lot between different versions of games, especially between different language releases.
+//   That's why it isn't good to hardcode the offsets of those subroutines.
+//
+//  Those signatures are just like the script patcher signatures (for further study: engine\script_patches.cpp)
+//   However you may NOT use command SIG_SELECTOR8 nor SIG_SELECTOR16 atm. Proper support for those may be added later.
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,             workaround
 const SciWorkaroundEntry arithmeticWorkarounds[] = {
-	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState", 0x20d,    0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
-	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",      0xcc6,    0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939
-	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",      0xce0,    0, { WORKAROUND_FAKE,   0 } }, // Same as above, for the Spanish version - bug #5750
-	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",      -1,    0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
-	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",           -1,    0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
-	{ GID_HOYLE4,         700,   -1,  1,               "Code", "doit",           -1,    0, { WORKAROUND_FAKE,   1 } }, // op_add: while bidding in Bridge, an object ("Bid") is added to an object in another segment ("hand3")
-	{ GID_ICEMAN,         199,  977,  0,            "Grooper", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // op_add: While dancing with the girl
-	{ GID_MOTHERGOOSE256,  -1,  999,  0,              "Event", "new",            -1,    0, { WORKAROUND_FAKE,   0 } }, // op_and: constantly during the game (SCI1 version)
-	{ GID_MOTHERGOOSE256,  -1,    4,  0,              "rm004", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // op_or: when going north and reaching the castle (rooms 4 and 37) - bug #5101
-	{ GID_MOTHERGOOSEHIRES,90,   90,  0,      "newGameButton", "select",         -1,    0, { WORKAROUND_FAKE,   0 } }, // op_ge: MUMG Deluxe, when selecting "New Game" in the main menu. It tries to compare an integer with a list. Needs to return false for the game to continue.
-	{ GID_PHANTASMAGORIA, 902,    0,  0,                   "", "export 7",       -1,    0, { WORKAROUND_FAKE,   0 } }, // op_shr: when starting a chapter in Phantasmagoria
-	{ GID_QFG1VGA,        301,  928,  0,              "Blink", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // op_div: when entering the inn, gets called with 1 parameter, but 2nd parameter is used for div which happens to be an object
-	{ GID_QFG2,           200,  200,  0,              "astro", "messages",       -1,    0, { WORKAROUND_FAKE,   0 } }, // op_lsi: when getting asked for your name by the astrologer - bug #5152
-	{ GID_QFG3,           780,  999,  0,                   "", "export 6",       -1,    0, { WORKAROUND_FAKE,   0 } }, // op_add: trying to talk to yourself at the top of the giant tree - bug #6692
-	{ GID_QFG4,           710,64941,  0,          "RandCycle", "doit",           -1,    0, { WORKAROUND_FAKE,   1 } }, // op_gt: when the tentacle appears in the third room of the caves
-	SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,  workaround
+	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState", 0x20d,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
+	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",      0xcc6,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939
+	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",      0xce0,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // Same as above, for the Spanish version - bug #5750
+	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",      -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
+	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
+	{ GID_HOYLE4,         700,   -1,  1,               "Code", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_add: while bidding in Bridge, an object ("Bid") is added to an object in another segment ("hand3")
+	{ GID_ICEMAN,         199,  977,  0,            "Grooper", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: While dancing with the girl
+	{ GID_MOTHERGOOSE256,  -1,  999,  0,              "Event", "new",            -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_and: constantly during the game (SCI1 version)
+	{ GID_MOTHERGOOSE256,  -1,    4,  0,              "rm004", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when going north and reaching the castle (rooms 4 and 37) - bug #5101
+	{ GID_MOTHERGOOSEHIRES,90,   90,  0,      "newGameButton", "select",         -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_ge: MUMG Deluxe, when selecting "New Game" in the main menu. It tries to compare an integer with a list. Needs to return false for the game to continue.
+	{ GID_PHANTASMAGORIA, 902,    0,  0,                   "", "export 7",       -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_shr: when starting a chapter in Phantasmagoria
+	{ GID_QFG1VGA,        301,  928,  0,              "Blink", "init",           -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_div: when entering the inn, gets called with 1 parameter, but 2nd parameter is used for div which happens to be an object
+	{ GID_QFG2,           200,  200,  0,              "astro", "messages",       -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lsi: when getting asked for your name by the astrologer - bug #5152
+	{ GID_QFG3,           780,  999,  0,                   "", "export 6",       -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: trying to talk to yourself at the top of the giant tree - bug #6692
+	{ GID_QFG4,           710,64941,  0,          "RandCycle", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when the tentacle appears in the third room of the caves
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+// QfG3: rm140::init subcall
+static const uint16 sig_uninitread_qfg3_1[] = {
+	0x3f, 0x01,                      // link 01
+	0x89, 0x7d,                      // lsg global[7Dh]
+	0x35, 0x03,                      // ldi 03
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,           callSig, index,  workaround
 const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
-	{ GID_CAMELOT,        40,    40,  0,               "Rm40", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // when looking at the ground at the pool of Siloam - bug #6401
-	{ GID_CASTLEBRAIN,   280,   280,  0,         "programmer", "dispatchEvent",  -1,    0, { WORKAROUND_FAKE, 0xf } }, // pressing 'q' on the computer screen in the robot room, and closing the help dialog that pops up (bug #5143). Moves the cursor to the view with the ID returned (in this case, the robot hand)
-	{ GID_CNICK_KQ,       -1,     0,  1,          "Character", "say",            -1,   -1, { WORKAROUND_FAKE,   0 } }, // checkers/backgammon, like in hoyle 3 - temps 504 and 505 - bug #6255
-	{ GID_CNICK_KQ,       -1,   700,  0,           "gcWindow", "open",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when entering the control menu, like in hoyle 3
-	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname520>",    -1,    5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled - bug #6426 (same as the theDoubleCube::make workaround for Hoyle 3)
-	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname519>",    -1,    9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled (same as the theDoubleCube::accept workaround for Hoyle 3)
-	{ GID_CNICK_LAURABOW, -1,     0,  1,          "Character", "say",            -1,   -1, { WORKAROUND_FAKE,   0 } }, // Yatch, like in hoyle 3 - temps 504 and 505 - bug #6424
-	{ GID_CNICK_LAURABOW, -1,   700,  0,                 NULL, "open",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu - bug #6423 (same as the gcWindow workaround for Hoyle 3)
-	{ GID_CNICK_LAURABOW,100,   100,  0,                 NULL, "<noname144>",    -1,    1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #6429 (same as the dominoHand2 workaround for Hoyle 3)
-	{ GID_CNICK_LAURABOW,100,   110,  0,                 NULL, "doit",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
-	{ GID_CNICK_LONGBOW,   0,     0,  0,          "RH Budget", "init",           -1,    1, { WORKAROUND_FAKE,   0 } }, // when starting the game
-	{ GID_ECOQUEST,       -1,    -1,  0,                 NULL, "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // almost clicking anywhere triggers this in almost all rooms
-	{ GID_FANMADE,       516,   979,  0,                   "", "export 0",       -1,   20, { WORKAROUND_FAKE,   0 } }, // Happens in Grotesteing after the logos
-	{ GID_FANMADE,       528,   990,  0,            "GDialog", "doit",           -1,    4, { WORKAROUND_FAKE,   0 } }, // Happens in Cascade Quest when closing the glossary - bug #5116
-	{ GID_FANMADE,       488,     1,  0,         "RoomScript", "doit",       0x1f17,    1, { WORKAROUND_FAKE,   0 } }, // Happens in Ocean Battle while playing - bug #5335
-	{ GID_FREDDYPHARKAS,  -1,    24,  0,              "gcWin", "open",           -1,    5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_FREDDYPHARKAS,  -1,    31,  0,            "quitWin", "open",           -1,    5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_FREDDYPHARKAS, 540,   540,  0,          "WaverCode", "init",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // Gun pratice mini-game - bug #5232
-	{ GID_GK1,            -1, 64950, -1,            "Feature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // sometimes when walk-clicking
-	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,    3, { WORKAROUND_FAKE,   0 } }, // called when the game starts
-	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,    4, { WORKAROUND_FAKE,   0 } }, // called during the game
-	{ GID_HOYLE1,          4,   104,  0,   "GinRummyCardList", "calcRuns",       -1,    4, { WORKAROUND_FAKE,   0 } }, // Gin Rummy / right when the game starts
-	{ GID_HOYLE1,          5,   204,  0,            "tableau", "checkRuns",      -1,    2, { WORKAROUND_FAKE,   0 } }, // Cribbage / during the game
-	{ GID_HOYLE1,          3,    16,  0,                   "", "export 0",    0x37c,    3, { WORKAROUND_FAKE,   0 } }, // Hearts / during the game - bug #5299
-	{ GID_HOYLE1,         -1,   997,  0,            "MenuBar", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // When changing game speed settings - bug #5512
-	{ GID_HOYLE3,         -1,     0,  1,          "Character", "say",            -1,   -1, { WORKAROUND_FAKE,   0 } }, // when starting checkers or dominoes, first time a character says something - temps 504 and 505
-	{ GID_HOYLE3,         -1,   700,  0,           "gcWindow", "open",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu
-	{ GID_HOYLE3,        100,   100,  0,        "dominoHand2", "cue",            -1,    1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #5042
-	{ GID_HOYLE3,        100,   110,  0,           "OKButton", "doit",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
-	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "make",           -1,    5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled
-	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "accept",         -1,    9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled
-	{ GID_HOYLE4,         -1,     0,  0,                 NULL, "open",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when selecting "Control" from the menu (temp vars 0-3) - bug #5132
-	{ GID_HOYLE4,        910,    18,  0,                 NULL, "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // during tutorial - bug #5213
-	{ GID_HOYLE4,        910,   910,  0,                 NULL, "setup",          -1,    3, { WORKAROUND_FAKE,   0 } }, // when selecting "Tutorial" from the main menu - bug #5132
-	{ GID_HOYLE4,        700,   700,  1,         "BridgeHand", "calcQTS",        -1,    3, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always)
-	{ GID_HOYLE4,        700,   710,  1, "BridgeStrategyPlay", "checkSplitTops", -1,   10, { WORKAROUND_FAKE,   0 } }, // while playing bridge, objects LeadReturn_Trump, SecondSeat_Trump, ThirdSeat_Trump and others - bug #5794
-	{ GID_HOYLE4,        700,    -1,  1,      "BridgeDefense", "think",          -1,   -1, { WORKAROUND_FAKE,   0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
-	{ GID_HOYLE4,        700,   730,  1,      "BridgeDefense", "beatTheirBest",  -1,    3, { WORKAROUND_FAKE,   0 } }, // rarely while playing bridge
-	{ GID_HOYLE4,        700,    -1,  1,               "Code", "doit",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
-	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,    0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
-	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,    1, { WORKAROUND_FAKE,   1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
-	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2",   0x1d4d,    0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
-	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",       -1,    4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
-	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",            -1,  504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
-	{ GID_HOYLE4,        800,   870,  0,     "EuchreStrategy", "thinkLead",      -1,    0, { WORKAROUND_FAKE,   0 } }, // while playing Euchre, happens at least on 2nd or 3rd turn - bug #6602
-	{ GID_HOYLE4,         -1,   937,  0,            "IconBar", "dispatchEvent",  -1,  408, { WORKAROUND_FAKE,   0 } }, // pressing ENTER on scoreboard while mouse is not on OK button, may not happen all the time - bug #6603
-	{ GID_ISLANDBRAIN,   100,   937,  0,            "IconBar", "dispatchEvent",  -1,   58, { WORKAROUND_FAKE,   0 } }, // when using ENTER at the startup menu - bug #5241
-	{ GID_ISLANDBRAIN,   140,   140,  0,              "piece", "init",           -1,    3, { WORKAROUND_FAKE,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
-	{ GID_ISLANDBRAIN,   200,   268,  0,          "anElement", "select",         -1,    0, { WORKAROUND_FAKE,   0 } }, // elements puzzle, gets used before super TextIcon
-	{ GID_JONES,           1,   232,  0,        "weekendText", "draw",        0x3d3,    0, { WORKAROUND_FAKE,   0 } }, // jones/cd only - gets called during the game
-	{ GID_JONES,           1,   255,  0,                   "", "export 0",       -1,   -1, { WORKAROUND_FAKE,   0 } }, // jones/cd only - called when a game ends, temps 13 and 14
-	{ GID_JONES,         764,   255,  0,                   "", "export 0",       -1,   -1, { WORKAROUND_FAKE,   0 } }, // jones/ega&vga only - called when the game starts, temps 13 and 14
-	//{ GID_KQ5,            -1,     0,  0,                   "", "export 29",      -1,    3, { WORKAROUND_FAKE,   0xf } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #4961
+	{ GID_CAMELOT,        40,    40,  0,               "Rm40", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when looking at the ground at the pool of Siloam - bug #6401
+	{ GID_CASTLEBRAIN,   280,   280,  0,         "programmer", "dispatchEvent",  -1,              NULL,     0, { WORKAROUND_FAKE, 0xf } }, // pressing 'q' on the computer screen in the robot room, and closing the help dialog that pops up (bug #5143). Moves the cursor to the view with the ID returned (in this case, the robot hand)
+	{ GID_CNICK_KQ,       -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // checkers/backgammon, like in hoyle 3 - temps 504 and 505 - bug #6255
+	{ GID_CNICK_KQ,       -1,   700,  0,           "gcWindow", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering the control menu, like in hoyle 3
+	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname520>",    -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled - bug #6426 (same as the theDoubleCube::make workaround for Hoyle 3)
+	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname519>",    -1,              NULL,     9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled (same as the theDoubleCube::accept workaround for Hoyle 3)
+	{ GID_CNICK_LAURABOW, -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Yatch, like in hoyle 3 - temps 504 and 505 - bug #6424
+	{ GID_CNICK_LAURABOW, -1,   700,  0,                 NULL, "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu - bug #6423 (same as the gcWindow workaround for Hoyle 3)
+	{ GID_CNICK_LAURABOW,100,   100,  0,                 NULL, "<noname144>",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #6429 (same as the dominoHand2 workaround for Hoyle 3)
+	{ GID_CNICK_LAURABOW,100,   110,  0,                 NULL, "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
+	{ GID_CNICK_LONGBOW,   0,     0,  0,          "RH Budget", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when starting the game
+	{ GID_ECOQUEST,       -1,    -1,  0,                 NULL, "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // almost clicking anywhere triggers this in almost all rooms
+	{ GID_FANMADE,       516,   979,  0,                   "", "export 0",       -1,              NULL,    20, { WORKAROUND_FAKE,   0 } }, // Happens in Grotesteing after the logos
+	{ GID_FANMADE,       528,   990,  0,            "GDialog", "doit",           -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // Happens in Cascade Quest when closing the glossary - bug #5116
+	{ GID_FANMADE,       488,     1,  0,         "RoomScript", "doit",       0x1f17,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // Happens in Ocean Battle while playing - bug #5335
+	{ GID_FREDDYPHARKAS,  -1,    24,  0,              "gcWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
+	{ GID_FREDDYPHARKAS,  -1,    31,  0,            "quitWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
+	{ GID_FREDDYPHARKAS, 540,   540,  0,          "WaverCode", "init",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Gun pratice mini-game - bug #5232
+	{ GID_GK1,            -1, 64950, -1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // sometimes when walk-clicking
+	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // called when the game starts
+	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // called during the game
+	{ GID_HOYLE1,          4,   104,  0,   "GinRummyCardList", "calcRuns",       -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // Gin Rummy / right when the game starts
+	{ GID_HOYLE1,          5,   204,  0,            "tableau", "checkRuns",      -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Cribbage / during the game
+	{ GID_HOYLE1,          3,    16,  0,                   "", "export 0",    0x37c,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // Hearts / during the game - bug #5299
+	{ GID_HOYLE1,         -1,   997,  0,            "MenuBar", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When changing game speed settings - bug #5512
+	{ GID_HOYLE3,         -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when starting checkers or dominoes, first time a character says something - temps 504 and 505
+	{ GID_HOYLE3,         -1,   700,  0,           "gcWindow", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu
+	{ GID_HOYLE3,        100,   100,  0,        "dominoHand2", "cue",            -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #5042
+	{ GID_HOYLE3,        100,   110,  0,           "OKButton", "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
+	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "make",           -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled
+	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "accept",         -1,              NULL,     9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled
+	{ GID_HOYLE4,         -1,     0,  0,                 NULL, "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when selecting "Control" from the menu (temp vars 0-3) - bug #5132
+	{ GID_HOYLE4,        910,    18,  0,                 NULL, "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // during tutorial - bug #5213
+	{ GID_HOYLE4,        910,   910,  0,                 NULL, "setup",          -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // when selecting "Tutorial" from the main menu - bug #5132
+	{ GID_HOYLE4,        700,   700,  1,         "BridgeHand", "calcQTS",        -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always)
+	{ GID_HOYLE4,        700,   710,  1, "BridgeStrategyPlay", "checkSplitTops", -1,              NULL,    10, { WORKAROUND_FAKE,   0 } }, // while playing bridge, objects LeadReturn_Trump, SecondSeat_Trump, ThirdSeat_Trump and others - bug #5794
+	{ GID_HOYLE4,        700,    -1,  1,      "BridgeDefense", "think",          -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
+	{ GID_HOYLE4,        700,   730,  1,      "BridgeDefense", "beatTheirBest",  -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // rarely while playing bridge
+	{ GID_HOYLE4,        700,    -1,  1,               "Code", "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
+	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,              NULL,     0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
+	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,              NULL,     1, { WORKAROUND_FAKE,   1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
+	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2",   0x1d4d,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
+	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",       -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
+	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",            -1,              NULL,   504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
+	{ GID_HOYLE4,        800,   870,  0,     "EuchreStrategy", "thinkLead",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // while playing Euchre, happens at least on 2nd or 3rd turn - bug #6602
+	{ GID_HOYLE4,         -1,   937,  0,            "IconBar", "dispatchEvent",  -1,              NULL,   408, { WORKAROUND_FAKE,   0 } }, // pressing ENTER on scoreboard while mouse is not on OK button, may not happen all the time - bug #6603
+	{ GID_ISLANDBRAIN,   100,   937,  0,            "IconBar", "dispatchEvent",  -1,              NULL,    58, { WORKAROUND_FAKE,   0 } }, // when using ENTER at the startup menu - bug #5241
+	{ GID_ISLANDBRAIN,   140,   140,  0,              "piece", "init",           -1,              NULL,     3, { WORKAROUND_FAKE,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
+	{ GID_ISLANDBRAIN,   200,   268,  0,          "anElement", "select",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // elements puzzle, gets used before super TextIcon
+	{ GID_JONES,           1,   232,  0,        "weekendText", "draw",        0x3d3,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // jones/cd only - gets called during the game
+	{ GID_JONES,           1,   255,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/cd only - called when a game ends, temps 13 and 14
+	{ GID_JONES,         764,   255,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/ega&vga only - called when the game starts, temps 13 and 14
+	//{ GID_KQ5,            -1,     0,  0,                   "", "export 29",      -1,              NULL,     3, { WORKAROUND_FAKE,   0xf } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #4961
 	// ^^ shouldn't be needed anymore, we got a script patch instead (kq5PatchCdHarpyVolume)
-	{ GID_KQ5,            25,    25,  0,              "rm025", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // inside witch forest, when going to the room where the walking rock is
-	{ GID_KQ5,            55,    55,  0,         "helpScript", "doit",           -1,    0, { WORKAROUND_FAKE,   0 } }, // when giving the tambourine to the monster in the labyrinth (only happens at one of the locations) - bug #5198
-	{ GID_KQ5,            -1,   755,  0,              "gcWin", "open",           -1,   -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu in the FM-Towns version
-	{ GID_KQ6,            -1,    30,  0,               "rats", "changeState",    -1,   -1, { WORKAROUND_FAKE,   0 } }, // rats in the catacombs (temps 1 - 5) - bugs #4958, #4998, #5017
-	{ GID_KQ6,           210,   210,  0,              "rm210", "scriptCheck",    -1,    0, { WORKAROUND_FAKE,   1 } }, // using inventory in that room - bug #4953
-	{ GID_KQ6,           500,   500,  0,              "rm500", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // going to island of the beast
-	{ GID_KQ6,           520,   520,  0,              "rm520", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // going to boiling water trap on beast isle
-	{ GID_KQ6,            -1,   903,  0,         "controlWin", "open",           -1,    4, { WORKAROUND_FAKE,   0 } }, // when opening the controls window (save, load etc)
-	{ GID_KQ6,            -1,   907,  0,             "tomato", "doVerb",         -1,    2, { WORKAROUND_FAKE,   0 } }, // when looking at the rotten tomato in the inventory - bug #5331
-	{ GID_KQ6,            -1,   928,  0,                 NULL, "startText",      -1,    0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
-	{ GID_KQ7,            -1, 64996,  0,               "User", "handleEvent",    -1,    1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
-	{ GID_LAURABOW,       37,     0,  0,                "CB1", "doit",           -1,    1, { WORKAROUND_FAKE,   0 } }, // when going up the stairs - bug #5084
-	{ GID_LAURABOW,       -1,   967,  0,             "myIcon", "cycle",          -1,    1, { WORKAROUND_FAKE,   0 } }, // having any portrait conversation coming up - initial bug #4971
-	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "open",           -1,    5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_LAURABOW2,      -1,    21,  0,      "dropCluesCode", "doit",           -1,    1, { WORKAROUND_FAKE, 0x7fff } }, // when asking some questions (e.g. the reporter about the burglary, or the policeman about Ziggy). Must be big, as the game scripts perform lt on it and start deleting journal entries - bugs #4979, #5026
-	{ GID_LAURABOW2,      -1,    90,  1,        "MuseumActor", "init",           -1,    6, { WORKAROUND_FAKE,   0 } }, // Random actors in museum - bug #5197
-	{ GID_LAURABOW2,     240,   240,  0,     "sSteveAnimates", "changeState",    -1,    0, { WORKAROUND_FAKE,   0 } }, // Steve Dorian's idle animation at the docks - bug #5028
-	{ GID_LAURABOW2,      -1,   928,  0,                 NULL, "startText",      -1,    0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
-	{ GID_LONGBOW,        -1,     0,  0,            "Longbow", "restart",        -1,    0, { WORKAROUND_FAKE,   0 } }, // When canceling a restart game - bug #5244
-	{ GID_LONGBOW,        -1,   213,  0,              "clear", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // When giving an answer using the druid hand sign code in any room
-	{ GID_LONGBOW,        -1,   213,  0,             "letter", "handleEvent",  0xa8,    1, { WORKAROUND_FAKE,   0 } }, // When using the druid hand sign code in any room - bug #5035
-	{ GID_LSL1,          250,   250,  0,           "increase", "handleEvent",    -1,    2, { WORKAROUND_FAKE,   0 } }, // casino, playing game, increasing bet
-	{ GID_LSL1,          720,   720,  0,              "rm720", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // age check room
-	{ GID_LSL2,           38,    38,  0,        "cloudScript", "changeState",    -1,    1, { WORKAROUND_FAKE,   0 } }, // entering the room in the middle deck of the ship - bug #5034
-	{ GID_LSL3,          340,   340,  0,        "ComicScript", "changeState",    -1,   -1, { WORKAROUND_FAKE,   0 } }, // right after entering the 3 ethnic groups inside comedy club (temps 200, 201, 202, 203)
-	{ GID_LSL3,           -1,   997,  0,         "TheMenuBar", "handleEvent",    -1,    1, { WORKAROUND_FAKE, 0xf } }, // when setting volume the first time, this temp is used to set volume on entry (normally it would have been initialized to 's')
-	{ GID_LSL6,          820,    82,  0,                   "", "export 0",       -1,   -1, { WORKAROUND_FAKE,   0 } }, // when touching the electric fence - bug #5103
-	{ GID_LSL6,           -1,    85,  0,          "washcloth", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // washcloth in inventory
-	{ GID_LSL6,           -1,   928, -1,           "Narrator", "startText",      -1,    0, { WORKAROUND_FAKE,   0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class
-	{ GID_LSL6HIRES,       0,    85,  0,             "LL6Inv", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // on startup
-	{ GID_LSL6HIRES,      -1, 64950,  1,            "Feature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // at least when entering swimming pool area
-	{ GID_LSL6HIRES,      -1, 64964,  0,              "DPath", "init",           -1,    1, { WORKAROUND_FAKE,   0 } }, // during the game
-	{ GID_MOTHERGOOSE256, -1,     0,  0,                 "MG", "doit",           -1,    5, { WORKAROUND_FAKE,   0 } }, // SCI1.1: When moving the cursor all the way to the left during the game - bug #5224
-	{ GID_MOTHERGOOSE256, -1,   992,  0,             "AIPath", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // Happens in the demo and full version. In the demo, it happens when walking two screens from mother goose's house to the north. In the full version, it happens in rooms 7 and 23 - bug #5269
-	{ GID_MOTHERGOOSE256, 90,    90,  0,        "introScript", "changeState",    -1,   65, { WORKAROUND_FAKE,   0 } }, // SCI1(CD): At the very end, after the game is completed and restarted - bug #5626
-	{ GID_MOTHERGOOSE256, 94,    94,  0,            "sunrise", "changeState",    -1,  367, { WORKAROUND_FAKE,   0 } }, // At the very end, after the game is completed - bug #5294
-	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,            "Feature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // right when clicking on a child at the start and probably also later
-	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,               "View", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // see above
-	{ GID_PEPPER,         -1,   894,  0,            "Package", "doVerb",         -1,    3, { WORKAROUND_FAKE,   0 } }, // using the hand on the book in the inventory - bug #5154
-	{ GID_PEPPER,        150,   928,  0,           "Narrator", "startText",      -1,    0, { WORKAROUND_FAKE,   0 } }, // happens during the non-interactive demo of Pepper
-	{ GID_PQ4,            -1,    25,  0,         "iconToggle", "select",         -1,    1, { WORKAROUND_FAKE,   0 } }, // when toggling the icon bar to auto-hide or not
-	{ GID_PQSWAT,         -1, 64950,  0,               "View", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // Using the menu in the beginning
-	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",        0xbd0,    0, { WORKAROUND_FAKE,   0 } }, // hq1: going to the brigands hideout
-	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",        0xbe4,    0, { WORKAROUND_FAKE,   0 } }, // qfg1: going to the brigands hideout
-	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",    -1,   -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
-	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xcee,    0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
-	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xce7,    0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to room 92
-	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",           -1,    1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
-	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",             -1,    0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
-	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",           -1,  364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
-	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",0x2d22,   -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
-	{ GID_QFG2,          260,   260,  0,            "jabbarS", "changeState",0x2d22,   -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Jabbar is about to enter the house (where you have to hide in the wardrobe), bug #5164, temps 1 and 2
-	{ GID_QFG2,          500,   500,  0,   "lightNextCandleS", "changeState",    -1,   -1, { WORKAROUND_FAKE,   0 } }, // Inside the last room, while Ad Avis performs the ritual to summon the genie - bug #5566
-	{ GID_QFG2,           -1,   700,  0,                 NULL, "showSign",       -1,   10, { WORKAROUND_FAKE,   0 } }, // Occurs sometimes when reading a sign in Raseir, Shapeir et al - bugs #5627, #5635
-	{ GID_QFG3,          510,   510,  0,         "awardPrize", "changeState",    -1,    0, { WORKAROUND_FAKE,   1 } }, // Simbani warrior challenge, after throwing the spears and retrieving the ring - bug #5277. Must be non-zero, otherwise the prize is awarded twice - bug #6160
-	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x1008,    0, { WORKAROUND_FAKE,   0 } }, // when importing a character and selecting the previous profession - bug #5163
-	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x11e4,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the French version
-	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x10f2,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the German version
-	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x11e3,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the Italian version
-	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       0x123d,    0, { WORKAROUND_FAKE,   0 } }, // when importing ... in the Spanish version
-	{ GID_QFG3,          330,   330, -1,             "Teller", "doChild",        -1,   -1, { WORKAROUND_FAKE,   0 } }, // when talking to King Rajah about "Rajah" (bug #5033, temp 1) or "Tarna" (temp 0), or when clicking on yourself and saying "Greet" (bug #5148, temp 1)
-	{ GID_QFG3,          700,   700, -1,      "monsterIsDead", "changeState",    -1,    0, { WORKAROUND_FAKE,   0 } }, // in the jungle, after winning any fight, bug #5169
-	{ GID_QFG3,          470,   470, -1,              "rm470", "notify",         -1,    0, { WORKAROUND_FAKE,   0 } }, // closing the character screen in the Simbani village in the room with the bridge, bug #5165
-	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",    -1,    0, { WORKAROUND_FAKE,   0 } }, // when finishing awari game, bug #5167
-	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState", 0xf53,    4, { WORKAROUND_FAKE,   0 } }, // also when finishing awari game
-	{ GID_QFG3,          851,    32, -1,            "ProjObj", "doit",           -1,    1, { WORKAROUND_FAKE,   0 } }, // near the end, when throwing the spear of death, bug #5282
-	{ GID_QFG4,           -1,    15, -1,     "charInitScreen", "dispatchEvent",  -1,    5, { WORKAROUND_FAKE,   0 } }, // floppy version, when viewing the character screen
-	{ GID_QFG4,           -1, 64917, -1,       "controlPlane", "setBitmap",      -1,    3, { WORKAROUND_FAKE,   0 } }, // floppy version, when entering the game menu
-	{ GID_QFG4,           -1, 64917, -1,              "Plane", "setBitmap",      -1,    3, { WORKAROUND_FAKE,   0 } }, // floppy version, happens sometimes in fight scenes
-	{ GID_QFG4,          520, 64950,  0,             "fLake2", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // CD version, at the lake, when meeting the Rusalka and attempting to leave
-	{ GID_QFG4,          800, 64950,  0,               "View", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // CD version, in the room with the spider pillar, when climbing on the pillar
-	{ GID_RAMA,           12, 64950, -1,   "InterfaceFeature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
-	{ GID_RAMA,           12, 64950, -1,      "hiliteOptText", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
-	{ GID_RAMA,           12, 64950, -1,               "View", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
-	{ GID_SHIVERS,        -1,   952,  0,       "SoundManager", "stop",           -1,    2, { WORKAROUND_FAKE,   0 } }, // Just after Sierra logo
-	{ GID_SHIVERS,        -1, 64950,  0,            "Feature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // When clicking on the locked door at the beginning
-	{ GID_SHIVERS,        -1, 64950,  0,               "View", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // When clicking on the gargoyle eye at the beginning
-	{ GID_SHIVERS,     20311, 64964,  0,              "DPath", "init",           -1,    1, { WORKAROUND_FAKE,   0 } }, // Just after door puzzle is solved and the metal balls start to roll
-	{ GID_SHIVERS,     29260, 29260,  0,             "spMars", "handleEvent",    -1,    4, { WORKAROUND_FAKE,   0 } }, // When clicking mars after seeing fortune to align earth etc...
-	{ GID_SHIVERS,     29260, 29260,  0,            "spVenus", "handleEvent",    -1,    4, { WORKAROUND_FAKE,   0 } }, // When clicking venus after seeing fortune to align earth etc...
-	{ GID_SQ1,           103,   103,  0,               "hand", "internalEvent",  -1,   -1, { WORKAROUND_FAKE,   0 } }, // Spanish (and maybe early versions?) only: when moving cursor over input pad, temps 1 and 2
-	{ GID_SQ1,            -1,   703,  0,                   "", "export 1",       -1,    0, { WORKAROUND_FAKE,   0 } }, // sub that's called from several objects while on sarien battle cruiser
-	{ GID_SQ1,            -1,   703,  0,         "firePulsar", "changeState", 0x18a,    0, { WORKAROUND_FAKE,   0 } }, // export 1, but called locally (when shooting at aliens)
-	{ GID_SQ4,            -1,   398,  0,            "showBox", "changeState",    -1,    0, { WORKAROUND_FAKE,   0 } }, // CD: called when rummaging in Software Excess bargain bin
-	{ GID_SQ4,            -1,   928, -1,           "Narrator", "startText",      -1, 1000, { WORKAROUND_FAKE,   1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously
-	{ GID_SQ4,            -1,   708, -1,            "exitBut", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button in the sq4 hintbook - bug #6447
-	{ GID_SQ4,            -1,   708, -1,                   "", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button... in Russian version - bug #5573
-	{ GID_SQ4,            -1,   708, -1,            "prevBut", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button in the sq4 hintbook - bug #6447
-	{ GID_SQ4,            -1,   708, -1, "\xA8\xE6\xE3 \xAD\xA0\xA7\xA0\xA4.", "doVerb", -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button... in Russian version - bug #5573
-	{ GID_SQ4,            -1,   708, -1,            "nextBut", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button in the sq4 hintbook - bug #6447
-	{ GID_SQ4,            -1,   708, -1,                  ".", "doVerb",         -1,    0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button... in Russian version - bug #5573
-	{ GID_SQ5,           201,   201,  0,        "buttonPanel", "doVerb",         -1,    0, { WORKAROUND_FAKE,   1 } }, // when looking at the orange or red button - bug #5112
-	{ GID_SQ6,            -1,     0,  0,                "SQ6", "init",           -1,    2, { WORKAROUND_FAKE,   0 } }, // Demo and full version: called when the game starts (demo: room 0, full: room 100)
-	{ GID_SQ6,            -1, 64950, -1,            "Feature", "handleEvent",    -1,    0, { WORKAROUND_FAKE,   0 } }, // called when pressing "Start game" in the main menu, when entering the Orion's Belt bar (room 300), and perhaps other places
-	{ GID_SQ6,            -1, 64964,  0,              "DPath", "init",           -1,    1, { WORKAROUND_FAKE,   0 } }, // during the game
-	{ GID_TORIN,          -1, 64017,  0,             "oFlags", "clear",          -1,    0, { WORKAROUND_FAKE,   0 } }, // entering Torin's home in the French version
-	SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+	{ GID_KQ5,            25,    25,  0,              "rm025", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // inside witch forest, when going to the room where the walking rock is
+	{ GID_KQ5,            55,    55,  0,         "helpScript", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when giving the tambourine to the monster in the labyrinth (only happens at one of the locations) - bug #5198
+	{ GID_KQ5,            -1,   755,  0,              "gcWin", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu in the FM-Towns version
+	{ GID_KQ6,            -1,    30,  0,               "rats", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // rats in the catacombs (temps 1 - 5) - bugs #4958, #4998, #5017
+	{ GID_KQ6,           210,   210,  0,              "rm210", "scriptCheck",    -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // using inventory in that room - bug #4953
+	{ GID_KQ6,           500,   500,  0,              "rm500", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // going to island of the beast
+	{ GID_KQ6,           520,   520,  0,              "rm520", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // going to boiling water trap on beast isle
+	{ GID_KQ6,            -1,   903,  0,         "controlWin", "open",           -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // when opening the controls window (save, load etc)
+	{ GID_KQ6,            -1,   907,  0,             "tomato", "doVerb",         -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // when looking at the rotten tomato in the inventory - bug #5331
+	{ GID_KQ6,            -1,   928,  0,                 NULL, "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
+	{ GID_KQ7,            -1, 64996,  0,               "User", "handleEvent",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
+	{ GID_LAURABOW,       37,     0,  0,                "CB1", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when going up the stairs - bug #5084
+	{ GID_LAURABOW,       -1,   967,  0,             "myIcon", "cycle",          -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // having any portrait conversation coming up - initial bug #4971
+	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
+	{ GID_LAURABOW2,      -1,    21,  0,      "dropCluesCode", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE, 0x7fff } }, // when asking some questions (e.g. the reporter about the burglary, or the policeman about Ziggy). Must be big, as the game scripts perform lt on it and start deleting journal entries - bugs #4979, #5026
+	{ GID_LAURABOW2,      -1,    90,  1,        "MuseumActor", "init",           -1,              NULL,     6, { WORKAROUND_FAKE,   0 } }, // Random actors in museum - bug #5197
+	{ GID_LAURABOW2,     240,   240,  0,     "sSteveAnimates", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Steve Dorian's idle animation at the docks - bug #5028
+	{ GID_LAURABOW2,      -1,   928,  0,                 NULL, "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
+	{ GID_LONGBOW,        -1,     0,  0,            "Longbow", "restart",        -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When canceling a restart game - bug #5244
+	{ GID_LONGBOW,        -1,   213,  0,              "clear", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When giving an answer using the druid hand sign code in any room
+	{ GID_LONGBOW,        -1,   213,  0,             "letter", "handleEvent",  0xa8,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // When using the druid hand sign code in any room - bug #5035
+	{ GID_LSL1,          250,   250,  0,           "increase", "handleEvent",    -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // casino, playing game, increasing bet
+	{ GID_LSL1,          720,   720,  0,              "rm720", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // age check room
+	{ GID_LSL2,           38,    38,  0,        "cloudScript", "changeState",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // entering the room in the middle deck of the ship - bug #5034
+	{ GID_LSL3,          340,   340,  0,        "ComicScript", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // right after entering the 3 ethnic groups inside comedy club (temps 200, 201, 202, 203)
+	{ GID_LSL3,           -1,   997,  0,         "TheMenuBar", "handleEvent",    -1,              NULL,     1, { WORKAROUND_FAKE, 0xf } }, // when setting volume the first time, this temp is used to set volume on entry (normally it would have been initialized to 's')
+	{ GID_LSL6,          820,    82,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when touching the electric fence - bug #5103
+	{ GID_LSL6,           -1,    85,  0,          "washcloth", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // washcloth in inventory
+	{ GID_LSL6,           -1,   928, -1,           "Narrator", "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class
+	{ GID_LSL6HIRES,       0,    85,  0,             "LL6Inv", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // on startup
+	{ GID_LSL6HIRES,      -1, 64950,  1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // at least when entering swimming pool area
+	{ GID_LSL6HIRES,      -1, 64964,  0,              "DPath", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
+	{ GID_MOTHERGOOSE256, -1,     0,  0,                 "MG", "doit",           -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // SCI1.1: When moving the cursor all the way to the left during the game - bug #5224
+	{ GID_MOTHERGOOSE256, -1,   992,  0,             "AIPath", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Happens in the demo and full version. In the demo, it happens when walking two screens from mother goose's house to the north. In the full version, it happens in rooms 7 and 23 - bug #5269
+	{ GID_MOTHERGOOSE256, 90,    90,  0,        "introScript", "changeState",    -1,              NULL,    65, { WORKAROUND_FAKE,   0 } }, // SCI1(CD): At the very end, after the game is completed and restarted - bug #5626
+	{ GID_MOTHERGOOSE256, 94,    94,  0,            "sunrise", "changeState",    -1,              NULL,   367, { WORKAROUND_FAKE,   0 } }, // At the very end, after the game is completed - bug #5294
+	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // right when clicking on a child at the start and probably also later
+	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // see above
+	{ GID_PEPPER,         -1,   894,  0,            "Package", "doVerb",         -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // using the hand on the book in the inventory - bug #5154
+	{ GID_PEPPER,        150,   928,  0,           "Narrator", "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // happens during the non-interactive demo of Pepper
+	{ GID_PQ4,            -1,    25,  0,         "iconToggle", "select",         -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when toggling the icon bar to auto-hide or not
+	{ GID_PQSWAT,         -1, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Using the menu in the beginning
+	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",        0xbd0,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // hq1: going to the brigands hideout
+	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",        0xbe4,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1: going to the brigands hideout
+	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
+	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xcee,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
+	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xce7,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to room 92
+	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
+	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",             -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
+	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",           -1,              NULL,   364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
+	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",0x2d22,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
+	{ GID_QFG2,          260,   260,  0,            "jabbarS", "changeState",0x2d22,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Jabbar is about to enter the house (where you have to hide in the wardrobe), bug #5164, temps 1 and 2
+	{ GID_QFG2,          500,   500,  0,   "lightNextCandleS", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Inside the last room, while Ad Avis performs the ritual to summon the genie - bug #5566
+	{ GID_QFG2,           -1,   700,  0,                 NULL, "showSign",       -1,              NULL,    10, { WORKAROUND_FAKE,   0 } }, // Occurs sometimes when reading a sign in Raseir, Shapeir et al - bugs #5627, #5635
+	{ GID_QFG3,          510,   510,  0,         "awardPrize", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // Simbani warrior challenge, after throwing the spears and retrieving the ring - bug #5277. Must be non-zero, otherwise the prize is awarded twice - bug #6160
+	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       -1, sig_uninitread_qfg3_1,     0, { WORKAROUND_FAKE,   0 } }, // when importing a character and selecting the previous profession - bug #5163
+	{ GID_QFG3,          330,   330, -1,             "Teller", "doChild",        -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when talking to King Rajah about "Rajah" (bug #5033, temp 1) or "Tarna" (temp 0), or when clicking on yourself and saying "Greet" (bug #5148, temp 1)
+	{ GID_QFG3,          700,   700, -1,      "monsterIsDead", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // in the jungle, after winning any fight, bug #5169
+	{ GID_QFG3,          470,   470, -1,              "rm470", "notify",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // closing the character screen in the Simbani village in the room with the bridge, bug #5165
+	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when finishing awari game, bug #5167
+	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState", 0xf53,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // also when finishing awari game
+	{ GID_QFG3,          851,    32, -1,            "ProjObj", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // near the end, when throwing the spear of death, bug #5282
+	{ GID_QFG4,           -1,    15, -1,     "charInitScreen", "dispatchEvent",  -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // floppy version, when viewing the character screen
+	{ GID_QFG4,           -1, 64917, -1,       "controlPlane", "setBitmap",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, when entering the game menu
+	{ GID_QFG4,           -1, 64917, -1,              "Plane", "setBitmap",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, happens sometimes in fight scenes
+	{ GID_QFG4,          520, 64950,  0,             "fLake2", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD version, at the lake, when meeting the Rusalka and attempting to leave
+	{ GID_QFG4,          800, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD version, in the room with the spider pillar, when climbing on the pillar
+	{ GID_RAMA,           12, 64950, -1,   "InterfaceFeature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
+	{ GID_RAMA,           12, 64950, -1,      "hiliteOptText", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
+	{ GID_RAMA,           12, 64950, -1,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
+	{ GID_SHIVERS,        -1,   952,  0,       "SoundManager", "stop",           -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Just after Sierra logo
+	{ GID_SHIVERS,        -1, 64950,  0,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When clicking on the locked door at the beginning
+	{ GID_SHIVERS,        -1, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When clicking on the gargoyle eye at the beginning
+	{ GID_SHIVERS,     20311, 64964,  0,              "DPath", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // Just after door puzzle is solved and the metal balls start to roll
+	{ GID_SHIVERS,     29260, 29260,  0,             "spMars", "handleEvent",    -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking mars after seeing fortune to align earth etc...
+	{ GID_SHIVERS,     29260, 29260,  0,            "spVenus", "handleEvent",    -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking venus after seeing fortune to align earth etc...
+	{ GID_SQ1,           103,   103,  0,               "hand", "internalEvent",  -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Spanish (and maybe early versions?) only: when moving cursor over input pad, temps 1 and 2
+	{ GID_SQ1,            -1,   703,  0,                   "", "export 1",       -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // sub that's called from several objects while on sarien battle cruiser
+	{ GID_SQ1,            -1,   703,  0,         "firePulsar", "changeState", 0x18a,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // export 1, but called locally (when shooting at aliens)
+	{ GID_SQ4,            -1,   398,  0,            "showBox", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD: called when rummaging in Software Excess bargain bin
+	{ GID_SQ4,            -1,   928, -1,           "Narrator", "startText",      -1,              NULL,  1000, { WORKAROUND_FAKE,   1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously
+	{ GID_SQ4,            -1,   708, -1,            "exitBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1,                   "", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button... in Russian version - bug #5573
+	{ GID_SQ4,            -1,   708, -1,            "prevBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1, "\xA8\xE6\xE3 \xAD\xA0\xA7\xA0\xA4.", "doVerb", -1,      NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button... in Russian version - bug #5573
+	{ GID_SQ4,            -1,   708, -1,            "nextBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1,                  ".", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button... in Russian version - bug #5573
+	{ GID_SQ5,           201,   201,  0,        "buttonPanel", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // when looking at the orange or red button - bug #5112
+	{ GID_SQ6,            -1,     0,  0,                "SQ6", "init",           -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Demo and full version: called when the game starts (demo: room 0, full: room 100)
+	{ GID_SQ6,            -1, 64950, -1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // called when pressing "Start game" in the main menu, when entering the Orion's Belt bar (room 300), and perhaps other places
+	{ GID_SQ6,            -1, 64964,  0,              "DPath", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
+	{ GID_TORIN,          -1, 64017,  0,             "oFlags", "clear",          -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // entering Torin's home in the French version
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kAbs_workarounds[] = {
-	{ GID_HOYLE1,          1,     1,  0,              "room1", "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // crazy eights - called with objects instead of integers
-	{ GID_HOYLE1,          2,     2,  0,              "room2", "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // old maid - called with objects instead of integers
-	{ GID_HOYLE1,          3,     3,  0,              "room3", "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // hearts - called with objects instead of integers
-	{ GID_QFG1VGA,        -1,    -1,  0,                 NULL, "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch
-	{ GID_QFG3   ,        -1,    -1,  0,                 NULL, "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch - bugs #6042, #6043
+	{ GID_HOYLE1,          1,     1,  0,              "room1", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // crazy eights - called with objects instead of integers
+	{ GID_HOYLE1,          2,     2,  0,              "room2", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // old maid - called with objects instead of integers
+	{ GID_HOYLE1,          3,     3,  0,              "room3", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // hearts - called with objects instead of integers
+	{ GID_QFG1VGA,        -1,    -1,  0,                 NULL, "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch
+	{ GID_QFG3   ,        -1,    -1,  0,                 NULL, "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch - bugs #6042, #6043
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kCelHigh_workarounds[] = {
-	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
-	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
-	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
-	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
+	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
+	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
+	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
+	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kCelWide_workarounds[] = {
-	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
-	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
-	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
-	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
+	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
+	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
+	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
+	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDeleteKey_workarounds[] = {
-	{    GID_HOYLE4,     300,   999,  0,     "handleEventList", "delete",        -1,    0, { WORKAROUND_IGNORE, 0 } }, // restarting hearts, while tray is shown - bug #6604
-	{    GID_HOYLE4,     500,   999,  0,     "handleEventList", "delete",        -1,    0, { WORKAROUND_IGNORE, 0 } }, // restarting cribbage, while tray is shown - bug #6604
-	{    GID_HOYLE4,     975,   999,  0,     "handleEventList", "delete",        -1,    0, { WORKAROUND_IGNORE, 0 } }, // going back to gamelist from hearts/cribbage, while tray is shown - bug #6604
+	{    GID_HOYLE4,     300,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting hearts, while tray is shown - bug #6604
+	{    GID_HOYLE4,     500,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting cribbage, while tray is shown - bug #6604
+	{    GID_HOYLE4,     975,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // going back to gamelist from hearts/cribbage, while tray is shown - bug #6604
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDeviceInfo_workarounds[] = {
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xd1c,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Cascade Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe55,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Demo Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe57,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (I Want My C64 Back)
-	{ GID_FANMADE,        -1,   994,  0,              "Black", "save",          0xa,    0, { WORKAROUND_IGNORE,    0 } }, // In fanmade games, this is called with one parameter for CurDevice (Black Cauldron Remake)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe5c,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Most of them)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xd1c,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Cascade Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe55,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Demo Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe57,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (I Want My C64 Back)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe5c,    0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Most of them)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xd1c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Cascade Quest)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe55,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Demo Quest)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe57,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (I Want My C64 Back)
+	{ GID_FANMADE,        -1,   994,  0,              "Black", "save",          0xa,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // In fanmade games, this is called with one parameter for CurDevice (Black Cauldron Remake)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe5c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Most of them)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xd1c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Cascade Quest)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe55,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Demo Quest)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe57,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (I Want My C64 Back)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe5c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Most of them)
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDisplay_workarounds[] = {
-	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,    0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
-	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",    0x4ae,    0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id
-	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",    0x4c1,    0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id (another pq2 version, bug #5223)
-	{ GID_QFG1,           11,    11,  0,             "battle", "<noname90>",     -1,    0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
-	{ GID_SQ4,           397,     0,  0,                   "", "export 12",      -1,    0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
-	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         0x84,    0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
-	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",    -1,    0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
+	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
+	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",    0x4ae,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id
+	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",    0x4c1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id (another pq2 version, bug #5223)
+	{ GID_QFG1,           11,    11,  0,             "battle", "<noname90>",     -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
+	{ GID_SQ4,           397,     0,  0,                   "", "export 12",      -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
+	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         0x84,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
+	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDirLoop_workarounds[] = {
-	{ GID_KQ4,             4,   992,  0,              "Avoid", "doit",           -1,    0, { WORKAROUND_IGNORE,    0 } }, // when the ogre catches you in front of his house, second parameter points to the same object as the first parameter, instead of being an integer (the angle) - bug #5217
+	{ GID_KQ4,             4,   992,  0,              "Avoid", "doit",           -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when the ogre catches you in front of his house, second parameter points to the same object as the first parameter, instead of being an integer (the angle) - bug #5217
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDisposeScript_workarounds[] = {
-	{ GID_LAURABOW,      777,   777,  0,             "myStab", "changeState",    -1,    0, { WORKAROUND_IGNORE,    0 } }, // DEMO: after the will is signed, parameter 0 is an object - bug #4967
-	{ GID_LSL2,           -1,    54,  0,               "rm54", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // Amiga: room 55, script tries to kDisposeScript an object (does not happen for DOS) - bug #6818
-	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
-	{ GID_SQ4,           150,   151,  0,        "fightScript", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object
-	{ GID_SQ4,           150,   152,  0,       "driveCloseUp", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object
-	{ GID_SQ4,           150,   152,  0,                   "", "dispose",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
+	{ GID_LAURABOW,      777,   777,  0,             "myStab", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: after the will is signed, parameter 0 is an object - bug #4967
+	{ GID_LSL2,           -1,    54,  0,               "rm54", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // Amiga: room 55, script tries to kDisposeScript an object (does not happen for DOS) - bug #6818
+	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
+	{ GID_SQ4,           150,   151,  0,        "fightScript", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object
+	{ GID_SQ4,           150,   152,  0,       "driveCloseUp", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object
+	{ GID_SQ4,           150,   152,  0,                   "", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDoSoundFade_workarounds[] = {
-	{ GID_KQ5,           213,   989,  0,       "globalSound3", "fade",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when bandits leave the secret temple, parameter 4 is an object - bug #5078
-	{ GID_KQ6,           105,   989,  0,        "globalSound", "fade",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // floppy: during intro, parameter 4 is an object
-	{ GID_KQ6,           460,   989,  0,       "globalSound2", "fade",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // after pulling the black widow's web on the isle of wonder, parameter 4 is an object - bug #4954
-	{ GID_QFG4,           -1, 64989,  0,           "longSong", "fade",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // CD version: many places, parameter 4 is an object (longSong)
-	{ GID_SQ5,           800,   989,  0,          "sq5Music1", "fade",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when cutting the wrong part of Goliath with the laser - bug #6341
+	{ GID_KQ5,           213,   989,  0,       "globalSound3", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when bandits leave the secret temple, parameter 4 is an object - bug #5078
+	{ GID_KQ6,           105,   989,  0,        "globalSound", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // floppy: during intro, parameter 4 is an object
+	{ GID_KQ6,           460,   989,  0,       "globalSound2", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // after pulling the black widow's web on the isle of wonder, parameter 4 is an object - bug #4954
+	{ GID_QFG4,           -1, 64989,  0,           "longSong", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD version: many places, parameter 4 is an object (longSong)
+	{ GID_SQ5,           800,   989,  0,          "sq5Music1", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when cutting the wrong part of Goliath with the laser - bug #6341
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGetAngle_workarounds[] = {
-	{ GID_FANMADE,       516,   992,  0,             "Motion", "init",           -1,    0, { WORKAROUND_FAKE,      0 } }, // The Legend of the Lost Jewel Demo (fan made): called with third/fourth parameters as objects
-	{ GID_KQ6,            -1,   752,  0,        "throwDazzle", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // room 740/790 after the Genie is exposed in the Palace (short and long ending), it starts shooting lightning bolts around. An extra 5th parameter is passed - bug #4959 & #5203
-	{ GID_SQ1,            -1,   927,  0,           "PAvoider", "doit",           -1,    0, { WORKAROUND_FAKE,      0 } }, // all rooms in Ulence Flats after getting the Pilot Droid: called with a single parameter when the droid is in Roger's path - bug #6016
+	{ GID_FANMADE,       516,   992,  0,             "Motion", "init",           -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // The Legend of the Lost Jewel Demo (fan made): called with third/fourth parameters as objects
+	{ GID_KQ6,            -1,   752,  0,        "throwDazzle", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // room 740/790 after the Genie is exposed in the Palace (short and long ending), it starts shooting lightning bolts around. An extra 5th parameter is passed - bug #4959 & #5203
+	{ GID_SQ1,            -1,   927,  0,           "PAvoider", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // all rooms in Ulence Flats after getting the Pilot Droid: called with a single parameter when the droid is in Roger's path - bug #6016
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kFindKey_workarounds[] = {
-	{ GID_ECOQUEST2,     100,   999,  0,            "myList", "contains",        -1,    0, { WORKAROUND_FAKE, 0 } }, // When Noah Greene gives Adam the Ecorder, and just before the game gives a demonstration, a null reference to a list is passed - bug #4987
-	{ GID_HOYLE4,        300,   999,  0,             "Piles", "contains",        -1,    0, { WORKAROUND_FAKE, 0 } }, // When passing the three cards in Hearts, a null reference to a list is passed - bug #5664
+	{ GID_ECOQUEST2,     100,   999,  0,            "myList", "contains",        -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // When Noah Greene gives Adam the Ecorder, and just before the game gives a demonstration, a null reference to a list is passed - bug #4987
+	{ GID_HOYLE4,        300,   999,  0,             "Piles", "contains",        -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // When passing the three cards in Hearts, a null reference to a list is passed - bug #5664
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphDrawLine_workarounds[] = {
-	{ GID_ISLANDBRAIN,   300,   300,  0,         "dudeViewer", "show",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when looking at the gene explanation chart, gets called with 1 extra parameter
-	{ GID_SQ1,            43,    43,  0,        "someoneDied", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when ordering beer, gets called with 1 extra parameter
-	{ GID_SQ1,            71,    71,  0,       "destroyXenon", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // during the Xenon destruction cutscene (which results in death), gets called with 1 extra parameter - bug #5176
-	{ GID_SQ1,            53,    53,  0,           "blastEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when Roger is found and zapped by the cleaning robot, gets called with 1 extra parameter - bug #5177
+	{ GID_ISLANDBRAIN,   300,   300,  0,         "dudeViewer", "show",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when looking at the gene explanation chart, gets called with 1 extra parameter
+	{ GID_SQ1,            43,    43,  0,        "someoneDied", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when ordering beer, gets called with 1 extra parameter
+	{ GID_SQ1,            71,    71,  0,       "destroyXenon", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // during the Xenon destruction cutscene (which results in death), gets called with 1 extra parameter - bug #5176
+	{ GID_SQ1,            53,    53,  0,           "blastEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when Roger is found and zapped by the cleaning robot, gets called with 1 extra parameter - bug #5177
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphSaveBox_workarounds[] = {
-	{ GID_CASTLEBRAIN,   420,   427,  0,          "alienIcon", "select",         -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when selecting a card during the alien card game, gets called with 1 extra parameter
-	{ GID_ISLANDBRAIN,   290,   291,  0,         "upElevator", "changeState",0x201f,    0, { WORKAROUND_STILLCALL, 0 } }, // when testing in the elevator puzzle, gets called with 1 argument less - 15 is on stack - bug #4943
-	{ GID_ISLANDBRAIN,   290,   291,  0,       "downElevator", "changeState",0x201f,    0, { WORKAROUND_STILLCALL, 0 } }, // see above
-	{ GID_ISLANDBRAIN,   290,   291,  0,    "correctElevator", "changeState",0x201f,    0, { WORKAROUND_STILLCALL, 0 } }, // see above (when testing the correct solution)
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_CASTLEBRAIN,   420,   427,  0,          "alienIcon", "select",         -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when selecting a card during the alien card game, gets called with 1 extra parameter
+	{ GID_ISLANDBRAIN,   290,   291,  0,         "upElevator", "changeState",0x201f,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when testing in the elevator puzzle, gets called with 1 argument less - 15 is on stack - bug #4943
+	{ GID_ISLANDBRAIN,   290,   291,  0,       "downElevator", "changeState",0x201f,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // see above
+	{ GID_ISLANDBRAIN,   290,   291,  0,    "correctElevator", "changeState",0x201f,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // see above (when testing the correct solution)
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphRestoreBox_workarounds[] = {
-	{ GID_LSL6,           -1,    86,  0,             "LL6Inv", "hide",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // happens during the game, gets called with 1 extra parameter
+	{ GID_LSL6,           -1,    86,  0,             "LL6Inv", "hide",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // happens during the game, gets called with 1 extra parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphFillBoxForeground_workarounds[] = {
-	{ GID_LSL6,           -1,     0,  0,               "LSL6", "hideControls",   -1,    0, { WORKAROUND_STILLCALL, 0 } }, // happens when giving the bungee key to merrily (room 240) and at least in room 650 too - gets called with additional 5th parameter
+	{ GID_LSL6,           -1,     0,  0,               "LSL6", "hideControls",   -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // happens when giving the bungee key to merrily (room 240) and at least in room 650 too - gets called with additional 5th parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphFillBoxAny_workarounds[] = {
-	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
-	{ GID_SQ4,            -1,   818,  0,     "iconTextSwitch", "show",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // CD: game menu "text/speech" display - parameter 5 is missing, but the right color number is on the stack
+	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
+	{ GID_SQ4,            -1,   818,  0,     "iconTextSwitch", "show",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD: game menu "text/speech" display - parameter 5 is missing, but the right color number is on the stack
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphRedrawBox_workarounds[] = {
-	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           405,   405,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
-	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           410,   410,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           411,   411,  0,                   "", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0xb2,    0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479
-	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0x16,    0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the German version - bug #5527
-	{ GID_SQ4,           150,   150,  0,                   "", "changeState",  0x16,    0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
-	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
-	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
-	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
-	{ GID_KQ5,            -1,   995,  0,                   "",    "export 0",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when opening the gem pouch, accidental additional parameter specified - bug #5138
-	{ GID_KQ5,            -1,   403,  0,          "KQ5Window",     "dispose",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the FM Towns version when closing any dialog box, accidental additional parameter specified
-	SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           405,   405,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
+	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           410,   410,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           411,   411,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0xb2,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479
+	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0x16,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the German version - bug #5527
+	{ GID_SQ4,           150,   150,  0,                   "", "changeState",  0x16,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
+	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
+	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
+	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
+	{ GID_KQ5,            -1,   995,  0,                   "",    "export 0",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when opening the gem pouch, accidental additional parameter specified - bug #5138
+	{ GID_KQ5,            -1,   403,  0,          "KQ5Window",     "dispose",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the FM Towns version when closing any dialog box, accidental additional parameter specified
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kGraphUpdateBox_workarounds[] = {
-	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "addPt",          -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "dispose",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters
+	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "addPt",          -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "dispose",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kIsObject_workarounds[] = {
-	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",  -1,    0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error") - bug #4950
-	{ GID_ISLANDBRAIN,   -1,   999,  0,                "List", "eachElementDo",  -1,    0, { WORKAROUND_FAKE, 0 } }, // when going to the game options, choosing "Info" and selecting anything from the list, gets called with an invalid parameter (type "error") - bug #4989
-	{ GID_QFG3,          -1,   999,  0,                "List", "eachElementDo",  -1,    0, { WORKAROUND_FAKE, 0 } }, // when asking for something, gets called with type error parameter
+	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",  -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error") - bug #4950
+	{ GID_ISLANDBRAIN,   -1,   999,  0,                "List", "eachElementDo",  -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // when going to the game options, choosing "Info" and selecting anything from the list, gets called with an invalid parameter (type "error") - bug #4989
+	{ GID_QFG3,          -1,   999,  0,                "List", "eachElementDo",  -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // when asking for something, gets called with type error parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kMemory_workarounds[] = {
-	{ GID_LAURABOW2,      -1,   999,  0,                   "", "export 6",       -1,    0, { WORKAROUND_FAKE,    0 } }, // during the intro, when exiting the train (room 160), talking to Mr. Augustini, etc. - bug #4944
-	{ GID_SQ1,            -1,   999,  0,                   "", "export 6",       -1,    0, { WORKAROUND_FAKE,    0 } }, // during walking Roger around Ulence Flats - bug #6017
+	{ GID_LAURABOW2,      -1,   999,  0,                   "", "export 6",       -1,    NULL,     0, { WORKAROUND_FAKE,    0 } }, // during the intro, when exiting the train (room 160), talking to Mr. Augustini, etc. - bug #4944
+	{ GID_SQ1,            -1,   999,  0,                   "", "export 6",       -1,    NULL,     0, { WORKAROUND_FAKE,    0 } }, // during walking Roger around Ulence Flats - bug #6017
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kMoveCursor_workarounds[] = {
-	{ GID_KQ5,            -1,   937,  0,            "IconBar", "handleEvent",    -1,    0, { WORKAROUND_IGNORE,  0 } }, // when pressing escape to open the menu, gets called with one parameter instead of 2 - bug #5575
+	{ GID_KQ5,            -1,   937,  0,            "IconBar", "handleEvent",    -1,    NULL,     0, { WORKAROUND_IGNORE,  0 } }, // when pressing escape to open the menu, gets called with one parameter instead of 2 - bug #5575
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kNewWindow_workarounds[] = {
-	{ GID_ECOQUEST,       -1,   981,  0,          "SysWindow", "open",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // EcoQuest 1 demo uses an in-between interpreter from SCI1 to SCI1.1. It's SCI1.1, but uses the SCI1 semantics for this call - bug #4976
+	{ GID_ECOQUEST,       -1,   981,  0,          "SysWindow", "open",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // EcoQuest 1 demo uses an in-between interpreter from SCI1 to SCI1.1. It's SCI1.1, but uses the SCI1 semantics for this call - bug #4976
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kReadNumber_workarounds[] = {
-	{ GID_CNICK_LAURABOW,100,   101,  0,          "dominoes.opt", "doit",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
-	{ GID_HOYLE3,        100,   101,  0,          "dominoes.opt", "doit",        -1,    0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
+	{ GID_CNICK_LAURABOW,100,   101,  0,          "dominoes.opt", "doit",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
+	{ GID_HOYLE3,        100,   101,  0,          "dominoes.opt", "doit",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kPaletteUnsetFlag_workarounds[] = {
-	{ GID_QFG4,          100,   100,  0,            "doMovie", "changeState",    -1,    0, { WORKAROUND_IGNORE,    0 } }, // after the Sierra logo, no flags are passed, thus the call is meaningless - bug #4947
+	{ GID_QFG4,          100,   100,  0,            "doMovie", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // after the Sierra logo, no flags are passed, thus the call is meaningless - bug #4947
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kSetCursor_workarounds[] = {
-	{ GID_KQ5,            -1,   768,  0,           "KQCursor", "init",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // CD: gets called with 4 additional "900d" parameters
+	{ GID_KQ5,            -1,   768,  0,           "KQCursor", "init",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD: gets called with 4 additional "900d" parameters
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kSetPort_workarounds[] = {
-	{ GID_LSL6,          740,   740,  0,              "rm740", "drawPic",        -1,    0, { WORKAROUND_IGNORE,    0 } }, // ending scene, is called with additional 3 (!) parameters
-	{ GID_QFG3,          830,   830,  0,        "portalOpens", "changeState",    -1,    0, { WORKAROUND_IGNORE,    0 } }, // when the portal appears during the end, gets called with 4 parameters - bug #5174
+	{ GID_LSL6,          740,   740,  0,              "rm740", "drawPic",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // ending scene, is called with additional 3 (!) parameters
+	{ GID_QFG3,          830,   830,  0,        "portalOpens", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when the portal appears during the end, gets called with 4 parameters - bug #5174
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kStrAt_workarounds[] = {
-	{ GID_CASTLEBRAIN,   220,   220,  0,         "robotJokes", "animateOnce",    -1,    0, { WORKAROUND_FAKE,      0 } }, // when trying to view the terminal at the end of the maze without having collected any robot jokes - bug #5127
-	{ GID_ISLANDBRAIN,   300,   310,  0,         "childBreed", "changeState",0x1c7c,    0, { WORKAROUND_FAKE,      0 } }, // when clicking Breed to get the second-generation cyborg hybrid (Standard difficulty), the two parameters are swapped - bug #5088
+	{ GID_CASTLEBRAIN,   220,   220,  0,         "robotJokes", "animateOnce",    -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // when trying to view the terminal at the end of the maze without having collected any robot jokes - bug #5127
+	{ GID_ISLANDBRAIN,   300,   310,  0,         "childBreed", "changeState",0x1c7c,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // when clicking Breed to get the second-generation cyborg hybrid (Standard difficulty), the two parameters are swapped - bug #5088
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kStrCpy_workarounds[] = {
-	{ GID_MOTHERGOOSE,   23,   23,  0,          "talkScript", "changeState",    -1,    0, { WORKAROUND_FAKE,      0 } }, // when talking to the girl in scene 23, there's no destination parameter (script bug - wrong instruction order). The original source is used directly afterwards in kDisplay, to show the girl's text - bug #6485
+	{ GID_MOTHERGOOSE,    23,    23,  0,          "talkScript", "changeState",   -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // when talking to the girl in scene 23, there's no destination parameter (script bug - wrong instruction order). The original source is used directly afterwards in kDisplay, to show the girl's text - bug #6485
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kStrLen_workarounds[] = {
-	{ GID_QFG2,          210,     2,  0,                   "", "export 21",   0xdeb,    0, { WORKAROUND_FAKE,      0 } }, // When saying something incorrect at the WIT, an integer is passed instead of a reference - bug #5489
+	{ GID_QFG2,          210,     2,  0,                   "", "export 21",   0xdeb,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // When saying something incorrect at the WIT, an integer is passed instead of a reference - bug #5489
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kUnLoad_workarounds[] = {
-	{ GID_ECOQUEST,      380,    61,  0,              "gotIt", "changeState",    -1,    0, { WORKAROUND_IGNORE, 0 } }, // CD version: after talking to the dolphin the first time, a 3rd parameter is passed by accident
-	{ GID_ECOQUEST,      380,    69,  0,   "lookAtBlackBoard", "changeState",    -1,    0, { WORKAROUND_IGNORE, 0 } }, // German version, when closing the blackboard closeup in the dolphin room, a 3rd parameter is passed by accident - bug #5483
-	{ GID_LAURABOW2,      -1,    -1,  0,           "sCartoon", "changeState",    -1,    0, { WORKAROUND_IGNORE, 0 } }, // DEMO: during the intro, a 3rd parameter is passed by accident - bug #4966
-	{ GID_LSL6,          130,   130,  0,    "recruitLarryScr", "changeState",    -1,    0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
-	{ GID_LSL6,          740,   740,  0,        "showCartoon", "changeState",    -1,    0, { WORKAROUND_IGNORE, 0 } }, // during ending, 4 additional parameters are passed by accident
-	{ GID_LSL6HIRES,     130,   130,  0,    "recruitLarryScr", "changeState",    -1,    0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
-	{ GID_SQ1,            43,   303,  0,            "slotGuy", "dispose",        -1,    0, { WORKAROUND_IGNORE, 0 } }, // when leaving ulence flats bar, parameter 1 is not passed - script error
-	{ GID_QFG4,           -1,   110,  0,            "dreamer", "dispose",        -1,    0, { WORKAROUND_IGNORE, 0 } }, // during the dream sequence, a 3rd parameter is passed by accident
+	{ GID_ECOQUEST,      380,    61,  0,              "gotIt", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // CD version: after talking to the dolphin the first time, a 3rd parameter is passed by accident
+	{ GID_ECOQUEST,      380,    69,  0,   "lookAtBlackBoard", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // German version, when closing the blackboard closeup in the dolphin room, a 3rd parameter is passed by accident - bug #5483
+	{ GID_LAURABOW2,      -1,    -1,  0,           "sCartoon", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // DEMO: during the intro, a 3rd parameter is passed by accident - bug #4966
+	{ GID_LSL6,          130,   130,  0,    "recruitLarryScr", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
+	{ GID_LSL6,          740,   740,  0,        "showCartoon", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during ending, 4 additional parameters are passed by accident
+	{ GID_LSL6HIRES,     130,   130,  0,    "recruitLarryScr", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
+	{ GID_SQ1,            43,   303,  0,            "slotGuy", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // when leaving ulence flats bar, parameter 1 is not passed - script error
+	{ GID_QFG4,           -1,   110,  0,            "dreamer", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during the dream sequence, a 3rd parameter is passed by accident
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -476,8 +490,9 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 	ExecStack *lastCall = state->xs;
 	const Script *localScript = state->_segMan->getScriptIfLoaded(lastCall->local_segment);
 	int curScriptNr = localScript->getScriptNumber();
+	int curLocalCallOffset = lastCall->debugLocalCallOffset;
 
-	if (lastCall->debugLocalCallOffset != -1) {
+	if (curLocalCallOffset != -1) {
 		// if lastcall was actually a local call search back for a real call
 		Common::List<ExecStack>::const_iterator callIterator = state->_executionStack.end();
 		while (callIterator != state->_executionStack.begin()) {
@@ -509,13 +524,18 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 		// Search if there is a workaround for this one
 		const SciWorkaroundEntry *workaround;
 		int16 inheritanceLevel = 0;
-		Common::String searchObjectName = curObjectName;
+		Common::String searchObjectName = g_sci->getSciLanguageString(curObjectName, K_LANG_ENGLISH);
 		reg_t searchObject = lastCall->sendp;
+		const byte *curScriptPtr = NULL;
+		uint32 curScriptSize = 0;
+
 		do {
 			workaround = workaroundList;
 			while (workaround->methodName) {
 				bool objectNameMatches = (workaround->objectName == NULL) ||
-										 (workaround->objectName == g_sci->getSciLanguageString(searchObjectName, K_LANG_ENGLISH));
+										 (workaround->objectName == searchObjectName);
+				bool localCallMatches = (workaround->localCallOffset == curLocalCallOffset) ||
+										 (workaround->localCallSignature); // soon to be obsolete
 
 				if (workaround->gameId == gameId
 						&& ((workaround->scriptNr == -1) || (workaround->scriptNr == curScriptNr))
@@ -523,10 +543,43 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 						&& ((workaround->inheritanceLevel == -1) || (workaround->inheritanceLevel == inheritanceLevel))
 						&& objectNameMatches
 						&& workaround->methodName == g_sci->getSciLanguageString(curMethodName, K_LANG_ENGLISH)
-						&& workaround->localCallOffset == lastCall->debugLocalCallOffset
+						&& localCallMatches // soon to be obsolete
 						&& ((workaround->index == -1) || (workaround->index == index))) {
 					// Workaround found
-					return workaround->newValue;
+					if ((workaround->localCallSignature) || (curLocalCallOffset != -1)) {
+						// local call signature found and/or subcall was made
+						if ((workaround->localCallSignature) && (lastCall->debugLocalCallOffset)) {
+							// local call signature found and subcall was made -> check signature accordingly
+							if (!curScriptPtr) {
+								// get script data
+								int segmentId = g_sci->getEngineState()->_segMan->getScriptSegment(curScriptNr);
+								SegmentObj *segmentObj = NULL;
+								if (segmentId) {
+									segmentObj = g_sci->getEngineState()->_segMan->getScriptIfLoaded(segmentId);
+								}
+								if (!segmentObj) {
+									workaround++;
+									continue;
+								}
+								Script *scriptObj = (Script *)segmentObj;
+								curScriptPtr = scriptObj->getBuf();
+								curScriptSize = scriptObj->getScriptSize();
+							}
+
+							// now actually check for signature match
+							if (g_sci->getScriptPatcher()->verifySignature(curLocalCallOffset, workaround->localCallSignature, "workaround signature", curScriptPtr, curScriptSize)) {
+								return workaround->newValue;
+							}
+
+						} else {
+							// mismatch, so workaround doesn't match
+							workaround++;
+							continue;
+						}
+					} else {
+						// no localcalls involved -> workaround matches
+						return workaround->newValue;
+					}
 				}
 				workaround++;
 			}
diff --git a/engines/sci/engine/workarounds.h b/engines/sci/engine/workarounds.h
index 9cad618481..25dd2bbc8a 100644
--- a/engines/sci/engine/workarounds.h
+++ b/engines/sci/engine/workarounds.h
@@ -61,6 +61,7 @@ struct SciWorkaroundEntry {
 	const char *objectName;
 	const char *methodName;
 	int localCallOffset;
+	const uint16 *localCallSignature;
 	int index;
 	SciWorkaroundSolution newValue;
 };
-- 
cgit v1.2.3


From 4efaab40150386004d33d3c3c15e263027168865 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 22:57:51 +0200
Subject: SCI: workaround sig Island Of Dr. Brain migrated

---
 engines/sci/engine/workarounds.cpp | 47 ++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 9ae6537000..cc77fba8ec 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -59,7 +59,10 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-// QfG3: rm140::init subcall
+//                Game: Quest for Glory 3
+//      Calling method: rm140::init
+//   Subroutine offset: English 0x1008 (script 140)
+// Applies to at least: English, French, German, Italian, Spanish PC floppy
 static const uint16 sig_uninitread_qfg3_1[] = {
 	0x3f, 0x01,                      // link 01
 	0x89, 0x7d,                      // lsg global[7Dh]
@@ -331,13 +334,25 @@ const SciWorkaroundEntry kGraphDrawLine_workarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//                Game: Island of Dr. Brain
+//      Calling method: upElevator::changeState, downElevator::changeState, correctElevator::changeState
+//   Subroutine offset: 0x201f (script 291)
+// Applies to at least: English PC floppy
+static const uint16 sig_kGraphSaveBox_ibrain_1[] = {
+	0x3f, 0x01,                      // link 01
+	0x87, 0x01,                      // lap param[1]
+	0x30, SIG_UINT16(0x0043),        // bnt [...]
+	0x76,                            // push0
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,                callSig, index,                workaround
 const SciWorkaroundEntry kGraphSaveBox_workarounds[] = {
-	{ GID_CASTLEBRAIN,   420,   427,  0,          "alienIcon", "select",         -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when selecting a card during the alien card game, gets called with 1 extra parameter
-	{ GID_ISLANDBRAIN,   290,   291,  0,         "upElevator", "changeState",0x201f,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when testing in the elevator puzzle, gets called with 1 argument less - 15 is on stack - bug #4943
-	{ GID_ISLANDBRAIN,   290,   291,  0,       "downElevator", "changeState",0x201f,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // see above
-	{ GID_ISLANDBRAIN,   290,   291,  0,    "correctElevator", "changeState",0x201f,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // see above (when testing the correct solution)
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_CASTLEBRAIN,   420,   427,  0,          "alienIcon", "select",         -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when selecting a card during the alien card game, gets called with 1 extra parameter
+	{ GID_ISLANDBRAIN,   290,   291,  0,         "upElevator", "changeState",-1, sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // when testing in the elevator puzzle, gets called with 1 argument less - 15 is on stack - bug #4943
+	{ GID_ISLANDBRAIN,   290,   291,  0,       "downElevator", "changeState",-1, sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // see above
+	{ GID_ISLANDBRAIN,   290,   291,  0,    "correctElevator", "changeState",-1, sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // see above (when testing the correct solution)
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -444,10 +459,22 @@ const SciWorkaroundEntry kSetPort_workarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//                Game: Island of Dr. Brain
+//      Calling method: childBreed::changeState
+//   Subroutine offset: 0x1c7c (script 310)
+// Applies to at least: English PC floppy
+static const uint16 sig_kStrAt_ibrain_1[] = {
+	0x3f, 0x16,                      // link 16
+	0x78,                            // push1
+	0x8f, 0x01,                      // lsp param[1]
+	0x43,                            // callk StrLen
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,         callSig, index,                workaround
 const SciWorkaroundEntry kStrAt_workarounds[] = {
-	{ GID_CASTLEBRAIN,   220,   220,  0,         "robotJokes", "animateOnce",    -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // when trying to view the terminal at the end of the maze without having collected any robot jokes - bug #5127
-	{ GID_ISLANDBRAIN,   300,   310,  0,         "childBreed", "changeState",0x1c7c,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // when clicking Breed to get the second-generation cyborg hybrid (Standard difficulty), the two parameters are swapped - bug #5088
+	{ GID_CASTLEBRAIN,   220,   220,  0,         "robotJokes", "animateOnce",    -1,            NULL,     0, { WORKAROUND_FAKE,      0 } }, // when trying to view the terminal at the end of the maze without having collected any robot jokes - bug #5127
+	{ GID_ISLANDBRAIN,   300,   310,  0,         "childBreed", "changeState",-1, sig_kStrAt_ibrain_1,     0, { WORKAROUND_FAKE,      0 } }, // when clicking Breed to get the second-generation cyborg hybrid (Standard difficulty), the two parameters are swapped - bug #5088
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 83c6e1543e556ac6f5f91a38508575747b70fcad Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 23:13:11 +0200
Subject: SCI: add debug level for workarounds

It's called "Workarounds"
---
 engines/sci/engine/workarounds.cpp | 7 ++++++-
 engines/sci/sci.cpp                | 1 +
 engines/sci/sci.h                  | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index cc77fba8ec..4999664d7a 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -555,6 +555,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 		reg_t searchObject = lastCall->sendp;
 		const byte *curScriptPtr = NULL;
 		uint32 curScriptSize = 0;
+		bool matched = false;
 
 		do {
 			workaround = workaroundList;
@@ -595,7 +596,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 
 							// now actually check for signature match
 							if (g_sci->getScriptPatcher()->verifySignature(curLocalCallOffset, workaround->localCallSignature, "workaround signature", curScriptPtr, curScriptSize)) {
-								return workaround->newValue;
+								matched = true;
 							}
 
 						} else {
@@ -605,6 +606,10 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 						}
 					} else {
 						// no localcalls involved -> workaround matches
+						matched = true;
+					}
+					if (matched) {
+						debugC(kDebugLevelWorkarounds, "Workaround: '%s:%s' in script %d", workaround->objectName, workaround->methodName, curScriptNr);
 						return workaround->newValue;
 					}
 				}
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 60a1271b89..d07ab435ff 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -114,6 +114,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam
 	DebugMan.addDebugChannel(kDebugLevelVM, "VM", "VM debugging");
 	DebugMan.addDebugChannel(kDebugLevelScripts, "Scripts", "Notifies when scripts are unloaded");
 	DebugMan.addDebugChannel(kDebugLevelScriptPatcher, "ScriptPatcher", "Notifies when scripts are patched");
+	DebugMan.addDebugChannel(kDebugLevelWorkarounds, "Workarounds", "Notifies when workarounds are triggered");
 	DebugMan.addDebugChannel(kDebugLevelGC, "GC", "Garbage Collector debugging");
 	DebugMan.addDebugChannel(kDebugLevelResMan, "ResMan", "Resource manager debugging");
 	DebugMan.addDebugChannel(kDebugLevelOnStartup, "OnStartup", "Enter debugger at start of game");
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 4928fd1b4e..c6813aa07c 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -105,7 +105,8 @@ enum kDebugLevels {
 	kDebugLevelResMan        = 1 << 19,
 	kDebugLevelOnStartup     = 1 << 20,
 	kDebugLevelDebugMode     = 1 << 21,
-	kDebugLevelScriptPatcher = 1 << 22
+	kDebugLevelScriptPatcher = 1 << 22,
+	kDebugLevelWorkarounds   = 1 << 23
 };
 
 enum SciGameId {
-- 
cgit v1.2.3


From d6000c927b7a0d29a1eaca70df81e1ae7b07e99f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 23:40:00 +0200
Subject: SCI: workaround sig Quest for Glory 2 migrated

---
 engines/sci/engine/workarounds.cpp | 39 +++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 4999664d7a..27b9697230 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -59,6 +59,19 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Quest for Glory 2
+//      Calling method: abdulS::changeState, jabbarS::changeState
+//   Subroutine offset: English 0x2d22 (script 260)
+// Applies to at least: English PC floppy
+static const uint16 sig_uninitread_qfg2_1[] = {
+	0x3f, 0x03,                      // link 03
+	0x39, 0x3b,                      // pushi 3Bh
+	0x76,                            // push0
+	0x81, 0x00,                      // lag global[0]
+	0x4a, 0x04,                      // send 04
+	SIG_END
+};
+
 //                Game: Quest for Glory 3
 //      Calling method: rm140::init
 //   Subroutine offset: English 0x1008 (script 140)
@@ -176,8 +189,8 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
 	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",             -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
 	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",           -1,              NULL,   364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
-	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",0x2d22,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
-	{ GID_QFG2,          260,   260,  0,            "jabbarS", "changeState",0x2d22,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Jabbar is about to enter the house (where you have to hide in the wardrobe), bug #5164, temps 1 and 2
+	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",-1, sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
+	{ GID_QFG2,          260,   260,  0,            "jabbarS", "changeState",-1, sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Jabbar is about to enter the house (where you have to hide in the wardrobe), bug #5164, temps 1 and 2
 	{ GID_QFG2,          500,   500,  0,   "lightNextCandleS", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Inside the last room, while Ad Avis performs the ritual to summon the genie - bug #5566
 	{ GID_QFG2,           -1,   700,  0,                 NULL, "showSign",       -1,              NULL,    10, { WORKAROUND_FAKE,   0 } }, // Occurs sometimes when reading a sign in Raseir, Shapeir et al - bugs #5627, #5635
 	{ GID_QFG3,          510,   510,  0,         "awardPrize", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // Simbani warrior challenge, after throwing the spears and retrieving the ring - bug #5277. Must be non-zero, otherwise the prize is awarded twice - bug #6160
@@ -251,9 +264,9 @@ const SciWorkaroundEntry kCelWide_workarounds[] = {
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDeleteKey_workarounds[] = {
-	{    GID_HOYLE4,     300,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting hearts, while tray is shown - bug #6604
-	{    GID_HOYLE4,     500,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting cribbage, while tray is shown - bug #6604
-	{    GID_HOYLE4,     975,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // going back to gamelist from hearts/cribbage, while tray is shown - bug #6604
+	{ GID_HOYLE4,        300,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting hearts, while tray is shown - bug #6604
+	{ GID_HOYLE4,        500,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting cribbage, while tray is shown - bug #6604
+	{ GID_HOYLE4,        975,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // going back to gamelist from hearts/cribbage, while tray is shown - bug #6604
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -484,9 +497,21 @@ const SciWorkaroundEntry kStrCpy_workarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//                Game: Quest for Glory 2
+//      Calling method: export 21 of script 2
+//   Subroutine offset: English 0x0deb (script 2)
+// Applies to at least: English PC floppy
+static const uint16 sig_kStrLen_qfg2_1[] = {
+	0x3f, 0x04,                      // link 04
+	0x78,                            // push1
+	0x8f, 0x02,                      // lsp param[2]
+	0x43,                            // callk StrLen
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,       callSig, index,                workaround
 const SciWorkaroundEntry kStrLen_workarounds[] = {
-	{ GID_QFG2,          210,     2,  0,                   "", "export 21",   0xdeb,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // When saying something incorrect at the WIT, an integer is passed instead of a reference - bug #5489
+	{ GID_QFG2,          210,     2,  0,                   "", "export 21", -1, sig_kStrLen_qfg2_1,     0, { WORKAROUND_FAKE,      0 } }, // When saying something incorrect at the WIT, an integer is passed instead of a reference - bug #5489
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From cf9fa4bd4012208208addb7b9705d41acbc93382 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 18 Apr 2015 23:57:48 +0200
Subject: SCI: workaround sig Quest for Glory 1 EGA migrated

---
 engines/sci/engine/workarounds.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 27b9697230..e368d124ed 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -59,6 +59,21 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Quest for Glory 1 / Hero's Quest 1
+//      Calling method: Encounter::init
+//   Subroutine offset: English Hero's Quest 0x0bd0, English Quest for Glory 1 0x0be4 (script 210)
+// Applies to at least: English PC floppy (Hero's Quest, Quest For Glory 1), Japanese PC-9801 floppy
+static const uint16 sig_uninitread_qfg1_1[] = {
+	0x3f, 0x02,                      // link 02
+	0x87, 0x00,                      // lap param[0]
+	0x30, SIG_UINT16(0x000c),        // bnt [...]
+	0x87, 0x01,                      // lap param[1]
+	0x30, SIG_UINT16(0x0007),        // bnt [...]
+	0x87, 0x01,                      // lap param[1]
+	0xa5, 0x01,                      // sat temp[1]
+	SIG_END
+};
+
 //                Game: Quest for Glory 2
 //      Calling method: abdulS::changeState, jabbarS::changeState
 //   Subroutine offset: English 0x2d22 (script 260)
@@ -181,8 +196,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_PEPPER,        150,   928,  0,           "Narrator", "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // happens during the non-interactive demo of Pepper
 	{ GID_PQ4,            -1,    25,  0,         "iconToggle", "select",         -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when toggling the icon bar to auto-hide or not
 	{ GID_PQSWAT,         -1, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Using the menu in the beginning
-	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",        0xbd0,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // hq1: going to the brigands hideout
-	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",        0xbe4,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1: going to the brigands hideout
+	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",       -1, sig_uninitread_qfg1_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1/hq1: going to the brigands hideout
 	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
 	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xcee,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
 	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xce7,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to room 92
-- 
cgit v1.2.3


From 4122cdc1305d293a700714ea13fce0eda6f6c5ee Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 11:32:52 +0200
Subject: SCI: workaround sig Eco Quest 2 migrated

---
 engines/sci/engine/workarounds.cpp | 47 ++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index e368d124ed..2fc05ab76b 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -39,23 +39,36 @@ namespace Sci {
 //  Those signatures are just like the script patcher signatures (for further study: engine\script_patches.cpp)
 //   However you may NOT use command SIG_SELECTOR8 nor SIG_SELECTOR16 atm. Proper support for those may be added later.
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,             workaround
+//                Game: Eco Quest 2
+//      Calling method: Rain::points
+//   Subroutine offset: English 0x0cc6, Spanish 0x0ce0 (script 0)
+// Applies to at least: English PC floppy, Spanish PC floppy
+static const uint16 sig_arithmetic_ecoq2_1[] = {
+	0x8f, 0x01,                      // lsp param[1]
+	0x35, 0x10,                      // ldi 10h
+	0x08,                            // div
+	0x99, 0x6e,                      // lsgi global[6Eh]
+	0x38, SIG_UINT16(0x8000),        // pushi 8000h
+	0x8f, 0x01,                      // lsp param[1]
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,         callSig, index,             workaround
 const SciWorkaroundEntry arithmeticWorkarounds[] = {
-	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState", 0x20d,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
-	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",      0xcc6,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939
-	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",      0xce0,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // Same as above, for the Spanish version - bug #5750
-	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",      -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
-	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
-	{ GID_HOYLE4,         700,   -1,  1,               "Code", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_add: while bidding in Bridge, an object ("Bid") is added to an object in another segment ("hand3")
-	{ GID_ICEMAN,         199,  977,  0,            "Grooper", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: While dancing with the girl
-	{ GID_MOTHERGOOSE256,  -1,  999,  0,              "Event", "new",            -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_and: constantly during the game (SCI1 version)
-	{ GID_MOTHERGOOSE256,  -1,    4,  0,              "rm004", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when going north and reaching the castle (rooms 4 and 37) - bug #5101
-	{ GID_MOTHERGOOSEHIRES,90,   90,  0,      "newGameButton", "select",         -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_ge: MUMG Deluxe, when selecting "New Game" in the main menu. It tries to compare an integer with a list. Needs to return false for the game to continue.
-	{ GID_PHANTASMAGORIA, 902,    0,  0,                   "", "export 7",       -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_shr: when starting a chapter in Phantasmagoria
-	{ GID_QFG1VGA,        301,  928,  0,              "Blink", "init",           -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_div: when entering the inn, gets called with 1 parameter, but 2nd parameter is used for div which happens to be an object
-	{ GID_QFG2,           200,  200,  0,              "astro", "messages",       -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lsi: when getting asked for your name by the astrologer - bug #5152
-	{ GID_QFG3,           780,  999,  0,                   "", "export 6",       -1,    NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: trying to talk to yourself at the top of the giant tree - bug #6692
-	{ GID_QFG4,           710,64941,  0,          "RandCycle", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when the tentacle appears in the third room of the caves
+	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState", 0x20d,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
+	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",  -1, sig_arithmetic_ecoq2_1,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939, Spanish version - bug #5750
+	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",      -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
+	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
+	{ GID_HOYLE4,         700,   -1,  1,               "Code", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_add: while bidding in Bridge, an object ("Bid") is added to an object in another segment ("hand3")
+	{ GID_ICEMAN,         199,  977,  0,            "Grooper", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: While dancing with the girl
+	{ GID_MOTHERGOOSE256,  -1,  999,  0,              "Event", "new",            -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_and: constantly during the game (SCI1 version)
+	{ GID_MOTHERGOOSE256,  -1,    4,  0,              "rm004", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when going north and reaching the castle (rooms 4 and 37) - bug #5101
+	{ GID_MOTHERGOOSEHIRES,90,   90,  0,      "newGameButton", "select",         -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_ge: MUMG Deluxe, when selecting "New Game" in the main menu. It tries to compare an integer with a list. Needs to return false for the game to continue.
+	{ GID_PHANTASMAGORIA, 902,    0,  0,                   "", "export 7",       -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_shr: when starting a chapter in Phantasmagoria
+	{ GID_QFG1VGA,        301,  928,  0,              "Blink", "init",           -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_div: when entering the inn, gets called with 1 parameter, but 2nd parameter is used for div which happens to be an object
+	{ GID_QFG2,           200,  200,  0,              "astro", "messages",       -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lsi: when getting asked for your name by the astrologer - bug #5152
+	{ GID_QFG3,           780,  999,  0,                   "", "export 6",       -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: trying to talk to yourself at the top of the giant tree - bug #6692
+	{ GID_QFG4,           710,64941,  0,          "RandCycle", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when the tentacle appears in the third room of the caves
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -648,7 +661,7 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 						matched = true;
 					}
 					if (matched) {
-						debugC(kDebugLevelWorkarounds, "Workaround: '%s:%s' in script %d", workaround->objectName, workaround->methodName, curScriptNr);
+						debugC(kDebugLevelWorkarounds, "Workaround: '%s:%s' in script %d, localcall %x", workaround->objectName, workaround->methodName, curScriptNr, curLocalCallOffset);
 						return workaround->newValue;
 					}
 				}
-- 
cgit v1.2.3


From bbf9c83ebf8ab6f27519a0d1cb4d4c747a16e985 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 11:50:01 +0200
Subject: SCI: workaround sig eco quest 2 update

sig also works on french version + sig extended
---
 engines/sci/engine/workarounds.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 2fc05ab76b..cafca0a2db 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -41,8 +41,8 @@ namespace Sci {
 
 //                Game: Eco Quest 2
 //      Calling method: Rain::points
-//   Subroutine offset: English 0x0cc6, Spanish 0x0ce0 (script 0)
-// Applies to at least: English PC floppy, Spanish PC floppy
+//   Subroutine offset: English 0x0cc6, French/Spanish 0x0ce0 (script 0)
+// Applies to at least: English/French/Spanish PC floppy
 static const uint16 sig_arithmetic_ecoq2_1[] = {
 	0x8f, 0x01,                      // lsp param[1]
 	0x35, 0x10,                      // ldi 10h
@@ -50,6 +50,11 @@ static const uint16 sig_arithmetic_ecoq2_1[] = {
 	0x99, 0x6e,                      // lsgi global[6Eh]
 	0x38, SIG_UINT16(0x8000),        // pushi 8000h
 	0x8f, 0x01,                      // lsp param[1]
+	0x35, 0x10,                      // ldi 10h
+	0x0a,                            // mod
+	0x0c,                            // shr
+	0x14,                            // or
+	0x36,                            // push
 	SIG_END
 };
 
-- 
cgit v1.2.3


From 629f6a4208828e27e808155af24037b720e268b3 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 13:09:10 +0200
Subject: SCI: workaround sig Quest for Glory 1 VGA migrated

---
 engines/sci/engine/workarounds.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index cafca0a2db..52ddb2912a 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -92,6 +92,22 @@ static const uint16 sig_uninitread_qfg1_1[] = {
 	SIG_END
 };
 
+//                Game: Quest for Glory 1 VGA
+//      Calling method: Encounter::init
+//   Subroutine offset: English w/o patch 0x0cee, w/ patch 0x0ce7 (script 210)
+// Applies to at least: English PC floppy
+static const uint16 sig_uninitread_qfg1vga_1[] = {
+	0x3f, 0x02,                      // link 02
+	0x87, 0x00,                      // lap param[0]
+	0x31, 0x0b,                      // bnt [...]
+	0x87, 0x01,                      // lap param[1]
+	0x31, 0x07,                      // bnt [...]
+	0x87, 0x01,                      // lap param[1]
+	0xa5, 0x01,                      // sat temp[1]
+	// following jump is different for patched and unpatched game
+	SIG_END
+};
+
 //                Game: Quest for Glory 2
 //      Calling method: abdulS::changeState, jabbarS::changeState
 //   Subroutine offset: English 0x2d22 (script 260)
@@ -216,8 +232,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_PQSWAT,         -1, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Using the menu in the beginning
 	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",       -1, sig_uninitread_qfg1_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1/hq1: going to the brigands hideout
 	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
-	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xcee,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
-	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        0xce7,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to room 92
+	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init", -1,    sig_uninitread_qfg1vga_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
 	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
 	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",             -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
 	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",           -1,              NULL,   364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
-- 
cgit v1.2.3


From 270fbf2d6a706f526d765890f48d42db98e43969 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 13:40:01 +0200
Subject: SCI: workaround sig Quest for Glory 3 migrated

---
 engines/sci/engine/workarounds.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 52ddb2912a..5a03b35171 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -132,6 +132,21 @@ static const uint16 sig_uninitread_qfg3_1[] = {
 	SIG_END
 };
 
+//                Game: Quest for Glory 3
+//      Calling method: computersMove::changeState
+//   Subroutine offset: English/etc. 0x0f53 (script 490)
+// Applies to at least: English, French, German, Italian, Spanish PC floppy
+static const uint16 sig_uninitread_qfg3_2[] = {
+	0x3f, 0x1d,                      // link 1Dh
+	0x35, 0x01,                      // ldi 01
+	0xa5, 0x18,                      // sat temp[18h]
+	0x35, 0xce,                      // ldi CEh
+	0xa5, 0x19,                      // sat temp[19h]
+	0x35, 0x00,                      // ldi 00
+	0xa5, 0x00,                      // sat temp[0]
+	SIG_END
+};
+
 //    gameID,           room,script,lvl,          object-name, method-name,    call,           callSig, index,  workaround
 const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_CAMELOT,        40,    40,  0,               "Rm40", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when looking at the ground at the pool of Siloam - bug #6401
@@ -246,7 +261,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_QFG3,          700,   700, -1,      "monsterIsDead", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // in the jungle, after winning any fight, bug #5169
 	{ GID_QFG3,          470,   470, -1,              "rm470", "notify",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // closing the character screen in the Simbani village in the room with the bridge, bug #5165
 	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when finishing awari game, bug #5167
-	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState", 0xf53,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // also when finishing awari game
+	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",-1, sig_uninitread_qfg3_2,     4, { WORKAROUND_FAKE,   0 } }, // also when finishing awari game
 	{ GID_QFG3,          851,    32, -1,            "ProjObj", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // near the end, when throwing the spear of death, bug #5282
 	{ GID_QFG4,           -1,    15, -1,     "charInitScreen", "dispatchEvent",  -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // floppy version, when viewing the character screen
 	{ GID_QFG4,           -1, 64917, -1,       "controlPlane", "setBitmap",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, when entering the game menu
-- 
cgit v1.2.3


From 062c535d1b0afbad79b6191468d7d70f68fe9443 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 15:49:43 +0200
Subject: SCI: workaround sig pq2/demo:lb+hq1 migrated

- also kDisplay cleanup, removed dummy opcodes
- workarounds should be used instead
- fixed hq1 workaround entry, it seems we are able
   to read vocabulary now
---
 engines/sci/engine/workarounds.cpp | 35 ++++++++++++++++++++++++++++-------
 engines/sci/graphics/paint16.cpp   | 19 -------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 5a03b35171..ebf587183c 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -346,15 +346,36 @@ const SciWorkaroundEntry kDeviceInfo_workarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Police Quest 2
+//      Calling method: rm23Script::elements
+//   Subroutine offset: English 1.001.000: 0x04ae, English 1.002.011: 0x04ca, Japanese: 0x04eb (script 23)
+// Applies to at least: English PC floppy, Japanese PC-9801
+static const uint16 sig_kDisplay_pq2_1[] = {
+	0x35, 0x00,                      // ldi 00
+	0xa3, 0x09,                      // sal local[9]
+	0x35, 0x01,                      // ldi 01
+	0xa3, 0x0a,                      // sal local[0Ah]
+	0x38, SIG_ADDTOOFFSET(+2),       // pushi selector[drawPic] TODO: implement selectors
+	0x7a,                            // push2
+	0x39, 0x5a,                      // pushi 5Ah
+	0x7a,                            // push2
+	0x81, 0x02,                      // lag global[2]
+	0x4a, 0x08,                      // send 08
+	SIG_END
+};
+
 //    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDisplay_workarounds[] = {
-	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
-	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",    0x4ae,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id
-	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",    0x4c1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id (another pq2 version, bug #5223)
-	{ GID_QFG1,           11,    11,  0,             "battle", "<noname90>",     -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
-	{ GID_SQ4,           397,     0,  0,                   "", "export 12",      -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
-	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         0x84,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
-	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
+	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
+	{ GID_LONGBOW,        95,    95,  0,          "countDown", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during title screen "Robin Hood! Your bow is needed"
+	{ GID_LONGBOW,       220,   220,  0,             "moveOn", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during second room "Outwit and outfight..."
+	{ GID_LONGBOW,       210,   210,  0,               "mama", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during third room "Fall under the spell..."
+	{ GID_LONGBOW,       320,   320,  0,              "flyin", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during fourth room "Conspiracies, love..."
+	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements", -1, sig_kDisplay_pq2_1,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id - bug #5223
+	{ GID_QFG1,           11,    11,  0,             "battle", "init",           -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
+	{ GID_SQ4,           397,     0,  0,                   "", "export 12",      -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
+	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         0x84,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
+	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index f80703e14d..6004e9ce7a 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -471,9 +471,6 @@ void GfxPaint16::kernelGraphRedrawBox(Common::Rect rect) {
 #define SCI_DISPLAY_WIDTH				106
 #define SCI_DISPLAY_SAVEUNDER			107
 #define SCI_DISPLAY_RESTOREUNDER		108
-#define SCI_DISPLAY_DUMMY1				114
-#define SCI_DISPLAY_DUMMY2				115
-#define SCI_DISPLAY_DUMMY3				117
 #define SCI_DISPLAY_DONTSHOWBITS		121
 
 reg_t GfxPaint16::kernelDisplay(const char *text, uint16 languageSplitter, int argc, reg_t *argv) {
@@ -543,22 +540,6 @@ reg_t GfxPaint16::kernelDisplay(const char *text, uint16 languageSplitter, int a
 			bRedraw = 0;
 			break;
 
-		// The following three dummy calls are not supported by the Sierra SCI
-		// interpreter, but are erroneously called in some game scripts.
-		case SCI_DISPLAY_DUMMY1:	// Longbow demo (all rooms) and QFG1 EGA demo (room 11)
-		case SCI_DISPLAY_DUMMY2:	// Longbow demo (all rooms)
-		case SCI_DISPLAY_DUMMY3:	// QFG1 EGA demo (room 11) and PQ2 (room 23)
-			if (!(g_sci->getGameId() == GID_LONGBOW && g_sci->isDemo()) &&
-				!(g_sci->getGameId() == GID_QFG1    && g_sci->isDemo()) &&
-				!(g_sci->getGameId() == GID_PQ2))
-				error("Unknown kDisplay argument %d", displayArg.getOffset());
-
-			if (displayArg.getOffset() == SCI_DISPLAY_DUMMY2) {
-				if (!argc)
-					error("No parameter left for kDisplay(115)");
-				argc--; argv++;
-			}
-			break;
 		default:
 			SciTrackOriginReply originReply;
 			SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kDisplay_workarounds, &originReply);
-- 
cgit v1.2.3


From 76fa1a0c6fa38339e28450581bf8562bb4840d40 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 16:18:44 +0200
Subject: SCI: workaround sig Conquests of Longbow migrated

---
 engines/sci/engine/workarounds.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index ebf587183c..b591ea2b79 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -77,6 +77,18 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Conquests of the Longbow
+//      Calling method: letter::handleEvent
+//   Subroutine offset: English 0x00a8 (script 213)
+// Applies to at least: English PC floppy, English Amiga floppy
+static const uint16 sig_uninitread_longbow_1[] = {
+	0x3f, 0x02,                      // link 02
+	0x35, 0x00,                      // ldi 00
+	0xa5, 0x00,                      // sat temp[0]
+	0x8d, 0x00,                      // lst temp[0]
+	SIG_END
+};
+
 //                Game: Quest for Glory 1 / Hero's Quest 1
 //      Calling method: Encounter::init
 //   Subroutine offset: English Hero's Quest 0x0bd0, English Quest for Glory 1 0x0be4 (script 210)
@@ -223,7 +235,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_LAURABOW2,      -1,   928,  0,                 NULL, "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
 	{ GID_LONGBOW,        -1,     0,  0,            "Longbow", "restart",        -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When canceling a restart game - bug #5244
 	{ GID_LONGBOW,        -1,   213,  0,              "clear", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When giving an answer using the druid hand sign code in any room
-	{ GID_LONGBOW,        -1,   213,  0,             "letter", "handleEvent",  0xa8,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // When using the druid hand sign code in any room - bug #5035
+	{ GID_LONGBOW,        -1,   213,  0,             "letter", "handleEvent",-1,sig_uninitread_longbow_1,   1, { WORKAROUND_FAKE,   0 } }, // When using the druid hand sign code in any room - bug #5035
 	{ GID_LSL1,          250,   250,  0,           "increase", "handleEvent",    -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // casino, playing game, increasing bet
 	{ GID_LSL1,          720,   720,  0,              "rm720", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // age check room
 	{ GID_LSL2,           38,    38,  0,        "cloudScript", "changeState",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // entering the room in the middle deck of the ship - bug #5034
-- 
cgit v1.2.3


From b8838d9bffa3cb4ff2a8ded41311dbae6cfde968 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 17:24:27 +0200
Subject: SCI: workaround sig Conquests of Camelot migrated

---
 engines/sci/engine/workarounds.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index b591ea2b79..9fb40c54a4 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -39,6 +39,20 @@ namespace Sci {
 //  Those signatures are just like the script patcher signatures (for further study: engine\script_patches.cpp)
 //   However you may NOT use command SIG_SELECTOR8 nor SIG_SELECTOR16 atm. Proper support for those may be added later.
 
+//                Game: Conquests of Camelot
+//      Calling method: endingCartoon2::changeState
+//   Subroutine offset: English 0x020d (script 92)
+// Applies to at least: English PC floppy
+static const uint16 sig_arithmetic_camelot_1[] = {
+	0x83, 0x32,                      // lal local[32h]
+	0x30, SIG_UINT16(0x001d),        // bnt [...]
+	0x7a,                            // push2
+	0x39, 0x08,                      // pushi 08
+	0x36,                            // push
+	0x43,                            // callk Graph
+	SIG_END
+};
+
 //                Game: Eco Quest 2
 //      Calling method: Rain::points
 //   Subroutine offset: English 0x0cc6, French/Spanish 0x0ce0 (script 0)
@@ -60,7 +74,7 @@ static const uint16 sig_arithmetic_ecoq2_1[] = {
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,         callSig, index,             workaround
 const SciWorkaroundEntry arithmeticWorkarounds[] = {
-	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState", 0x20d,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
+	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState",-1,sig_arithmetic_camelot_1, 0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
 	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",  -1, sig_arithmetic_ecoq2_1,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939, Spanish version - bug #5750
 	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",      -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
 	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
@@ -79,7 +93,7 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 
 //                Game: Conquests of the Longbow
 //      Calling method: letter::handleEvent
-//   Subroutine offset: English 0x00a8 (script 213)
+//   Subroutine offset: English PC/Amiga 0x00a8 (script 213)
 // Applies to at least: English PC floppy, English Amiga floppy
 static const uint16 sig_uninitread_longbow_1[] = {
 	0x3f, 0x02,                      // link 02
-- 
cgit v1.2.3


From 8f5d65d0f11289bd4b2595ea4ad08b5d2344b133 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 18:28:54 +0200
Subject: SCI: workaround sig Space Quest 4 migrated

---
 engines/sci/engine/workarounds.cpp | 62 ++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 9fb40c54a4..e7b9429bbe 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -390,6 +390,19 @@ static const uint16 sig_kDisplay_pq2_1[] = {
 	SIG_END
 };
 
+//                Game: Space Quest 4
+//      Calling method: doCatalog::mode
+//   Subroutine offset: English PC CD: 0x0084 (script 391)
+// Applies to at least: English PC CD
+static const uint16 sig_kDisplay_sq4_1[] = {
+	0x38, SIG_UINT16(0x0187),        // pushi 0187h (drawPic)
+	0x78,                            // push1
+	0x38, SIG_UINT16(0x0189),        // pushi 0189h (reflectPosn)
+	0x81, 0x02,                      // lag global[2]
+	0x4a, 0x06,                      // send 06
+	SIG_END
+};
+
 //    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
 const SciWorkaroundEntry kDisplay_workarounds[] = {
 	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
@@ -400,7 +413,7 @@ const SciWorkaroundEntry kDisplay_workarounds[] = {
 	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements", -1, sig_kDisplay_pq2_1,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id - bug #5223
 	{ GID_QFG1,           11,    11,  0,             "battle", "init",           -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
 	{ GID_SQ4,           397,     0,  0,                   "", "export 12",      -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
-	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         0x84,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
+	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode", -1,     sig_kDisplay_sq4_1,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
 	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
@@ -497,25 +510,36 @@ const SciWorkaroundEntry kGraphFillBoxAny_workarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//                Game: Space Quest 4
+//      Calling method: laserScript::changeState
+//   Subroutine offset: English/German/French/Russian PC floppy, Japanese PC-9801: 0x0016, English PC CD: 0x00b2 (script 150)
+// Applies to at least: English/German/French/Russian PC floppy, English PC CD, Japanese PC-9801
+static const uint16 sig_kGraphRedrawBox_sq4_1[] = {
+	0x3f, 0x07,                      // link 07
+	0x39, SIG_ADDTOOFFSET(+1),       // pushi 2Ah for PC floppy, pushi 27h for PC CD
+	0x76,                            // push0
+	0x72,                            // lofsa laserSound
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,    call,                callSig, index,                workaround
 const SciWorkaroundEntry kGraphRedrawBox_workarounds[] = {
-	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           405,   405,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
-	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           410,   410,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           411,   411,  0,                   "", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0xb2,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479
-	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState",  0x16,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the German version - bug #5527
-	{ GID_SQ4,           150,   150,  0,                   "", "changeState",  0x16,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
-	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
-	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
-	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
-	{ GID_KQ5,            -1,   995,  0,                   "",    "export 0",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when opening the gem pouch, accidental additional parameter specified - bug #5138
-	{ GID_KQ5,            -1,   403,  0,          "KQ5Window",     "dispose",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the FM Towns version when closing any dialog box, accidental additional parameter specified
+	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           405,   405,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
+	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           410,   410,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           411,   411,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState", -1, sig_kGraphRedrawBox_sq4_1,     0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479, German - bug #5527
+	{ GID_SQ4,           150,   150,  0,                   "", "changeState", -1, sig_kGraphRedrawBox_sq4_1,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
+	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
+	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
+	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
+	{ GID_KQ5,            -1,   995,  0,                   "",    "export 0",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when opening the gem pouch, accidental additional parameter specified - bug #5138
+	{ GID_KQ5,            -1,   403,  0,          "KQ5Window",     "dispose",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the FM Towns version when closing any dialog box, accidental additional parameter specified
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 9e887fe184e2b9b3806ca54833ed8f66a5ef2b78 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 19:08:16 +0200
Subject: SCI: workaround sig for fanmade games kDeviceInfo

---
 engines/sci/engine/workarounds.cpp | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index e7b9429bbe..85de92992a 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -358,17 +358,34 @@ const SciWorkaroundEntry kDeleteKey_workarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//                Game: Fan-Made games (SCI Studio)
+//      Calling method: Game::save, Game::restore
+//   Subroutine offset: Al Pond 2:          0x0e5c (ldi 0001)
+//                      Black Cauldron:     0x000a (ldi 01)
+//                      Cascade Quest:      0x0d1c (ldi 0001)
+//                      Demo Quest:         0x0e55 (ldi 0001)
+//                      I want my C64 back: 0x0e57 (ldi 0001)
+// Applies to at least: games listed above
+static const uint16 sig_kDeviceInfo_Fanmade_1[] = {
+	0x3f, 0x79,                      // link 79h
+	0x34, SIG_UINT16(0x0001),        // ldi 0001
+	0xa5, 0x00,                      // sat temp[0]
+	SIG_END
+};
+static const uint16 sig_kDeviceInfo_Fanmade_2[] = {
+	0x3f, 0x79,                      // link 79h
+	0x35, 0x01,                      // ldi 01
+	0xa5, 0x00,                      // sat temp[0]
+	SIG_END
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name, call,                   callSig, index,   workaround
 const SciWorkaroundEntry kDeviceInfo_workarounds[] = {
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xd1c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Cascade Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe55,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Demo Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe57,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (I Want My C64 Back)
-	{ GID_FANMADE,        -1,   994,  0,              "Black", "save",          0xa,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // In fanmade games, this is called with one parameter for CurDevice (Black Cauldron Remake)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        0xe5c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Most of them)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xd1c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Cascade Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe55,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Demo Quest)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe57,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (I Want My C64 Back)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     0xe5c,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games, this is called with one parameter for CurDevice (Most of them)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        -1, sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 01 variant
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        -1, sig_kDeviceInfo_Fanmade_2,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 0001 variant
+	{ GID_FANMADE,        -1,   994,  0,              "Black", "save",        -1, sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_IGNORE,    0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice (Black Cauldron Remake)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     -1, sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 01 variant
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     -1, sig_kDeviceInfo_Fanmade_2,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 0001 variant
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From d70e4ee3f18aefca0424921e53a785a57225403e Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 19:24:21 +0200
Subject: SCI: workaround sig Space Quest 1 migrated

---
 engines/sci/engine/workarounds.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 85de92992a..99bf1de7f9 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -173,6 +173,19 @@ static const uint16 sig_uninitread_qfg3_2[] = {
 	SIG_END
 };
 
+//                Game: Space Quest 1
+//      Calling method: firePulsar::changeState
+//   Subroutine offset: English 0x018a (script 703)
+// Applies to at least: English PC floppy, English Amiga floppy
+static const uint16 sig_uninitread_sq1_1[] = {
+	0x3f, 0x01,                      // link 01
+	0x38, SIG_ADDTOOFFSET(+2),       // pushi 0242 (selector egoStatus)
+	0x76,                            // push0
+	0x72, SIG_ADDTOOFFSET(+2),       // lofsa DeltaurRegion
+	0x4a, 0x04,                      // send 04
+	SIG_END
+};
+
 //    gameID,           room,script,lvl,          object-name, method-name,    call,           callSig, index,  workaround
 const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_CAMELOT,        40,    40,  0,               "Rm40", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when looking at the ground at the pool of Siloam - bug #6401
@@ -305,7 +318,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_SHIVERS,     29260, 29260,  0,            "spVenus", "handleEvent",    -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking venus after seeing fortune to align earth etc...
 	{ GID_SQ1,           103,   103,  0,               "hand", "internalEvent",  -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Spanish (and maybe early versions?) only: when moving cursor over input pad, temps 1 and 2
 	{ GID_SQ1,            -1,   703,  0,                   "", "export 1",       -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // sub that's called from several objects while on sarien battle cruiser
-	{ GID_SQ1,            -1,   703,  0,         "firePulsar", "changeState", 0x18a,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // export 1, but called locally (when shooting at aliens)
+	{ GID_SQ1,            -1,   703,  0,         "firePulsar", "changeState",-1,  sig_uninitread_sq1_1,     0, { WORKAROUND_FAKE,   0 } }, // export 1, but called locally (when shooting at aliens)
 	{ GID_SQ4,            -1,   398,  0,            "showBox", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD: called when rummaging in Software Excess bargain bin
 	{ GID_SQ4,            -1,   928, -1,           "Narrator", "startText",      -1,              NULL,  1000, { WORKAROUND_FAKE,   1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously
 	{ GID_SQ4,            -1,   708, -1,            "exitBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button in the sq4 hintbook - bug #6447
-- 
cgit v1.2.3


From 9376b9db88af68770fba86bbd21c310014fc97e4 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 19:44:10 +0200
Subject: SCI: workaround sig Hoyle 4 migrated

---
 engines/sci/engine/workarounds.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 99bf1de7f9..e27396469d 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -91,6 +91,17 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Hoyle 4
+//      Calling method: export 2
+//   Subroutine offset: 0x1d4d (script 300)
+// Applies to at least: English PC floppy
+static const uint16 sig_uninitread_hoyle4_1[] = {
+	0x3f, 0x01,                      // link 01
+	0x39, 0x40,                      // pushi 40h
+	0x78,                            // push1
+	SIG_END
+};
+
 //                Game: Conquests of the Longbow
 //      Calling method: letter::handleEvent
 //   Subroutine offset: English PC/Amiga 0x00a8 (script 213)
@@ -229,7 +240,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_HOYLE4,        700,    -1,  1,               "Code", "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
 	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,              NULL,     0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
 	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,              NULL,     1, { WORKAROUND_FAKE,   1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
-	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2",   0x1d4d,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
+	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2", -1, sig_uninitread_hoyle4_1,     0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
 	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",       -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
 	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",            -1,              NULL,   504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
 	{ GID_HOYLE4,        800,   870,  0,     "EuchreStrategy", "thinkLead",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // while playing Euchre, happens at least on 2nd or 3rd turn - bug #6602
-- 
cgit v1.2.3


From 2043103232706772b19196d49efb48fbe5c3808d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 19:53:29 +0200
Subject: SCI: workaround sig Hoyle 1 migrated

---
 engines/sci/engine/workarounds.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index e27396469d..3c07d94def 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -91,6 +91,18 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Hoyle 1
+//      Calling method: export 0
+//   Subroutine offset: 0x037c (script 16)
+// Applies to at least: English PC floppy
+static const uint16 sig_uninitread_hoyle1_1[] = {
+	0x3f, 0x05,                      // link 05
+	0x78,                            // push1
+	0x76,                            // push0
+	0x40,                            // call [...]
+	SIG_END
+};
+
 //                Game: Hoyle 4
 //      Calling method: export 2
 //   Subroutine offset: 0x1d4d (script 300)
@@ -222,7 +234,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // called during the game
 	{ GID_HOYLE1,          4,   104,  0,   "GinRummyCardList", "calcRuns",       -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // Gin Rummy / right when the game starts
 	{ GID_HOYLE1,          5,   204,  0,            "tableau", "checkRuns",      -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Cribbage / during the game
-	{ GID_HOYLE1,          3,    16,  0,                   "", "export 0",    0x37c,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // Hearts / during the game - bug #5299
+	{ GID_HOYLE1,          3,    16,  0,                   "", "export 0", -1, sig_uninitread_hoyle1_1,     3, { WORKAROUND_FAKE,   0 } }, // Hearts / during the game - bug #5299
 	{ GID_HOYLE1,         -1,   997,  0,            "MenuBar", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When changing game speed settings - bug #5512
 	{ GID_HOYLE3,         -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when starting checkers or dominoes, first time a character says something - temps 504 and 505
 	{ GID_HOYLE3,         -1,   700,  0,           "gcWindow", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu
-- 
cgit v1.2.3


From 4a9f2fb1c4711f86fd1c5aa11fb8e8e1eb8974c4 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 20:05:16 +0200
Subject: SCI: workaround sig Jones in the fast lane migrated

---
 engines/sci/engine/workarounds.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 3c07d94def..36218051e7 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -114,6 +114,18 @@ static const uint16 sig_uninitread_hoyle4_1[] = {
 	SIG_END
 };
 
+//                Game: Jones in the fast lane
+//      Calling method: weekendText::draw
+//   Subroutine offset: 0x03d3 (script 232)
+// Applies to at least: English PC CD
+static const uint16 sig_uninitread_jones_1[] = {
+	0x3f, 0x02,                      // link 02
+	0x8d, 0x00,                      // lst temp[0]
+	0x35, 0x01,                      // ldi 01
+	0x22,                            // lt?
+	SIG_END
+};
+
 //                Game: Conquests of the Longbow
 //      Calling method: letter::handleEvent
 //   Subroutine offset: English PC/Amiga 0x00a8 (script 213)
@@ -260,7 +272,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_ISLANDBRAIN,   100,   937,  0,            "IconBar", "dispatchEvent",  -1,              NULL,    58, { WORKAROUND_FAKE,   0 } }, // when using ENTER at the startup menu - bug #5241
 	{ GID_ISLANDBRAIN,   140,   140,  0,              "piece", "init",           -1,              NULL,     3, { WORKAROUND_FAKE,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
 	{ GID_ISLANDBRAIN,   200,   268,  0,          "anElement", "select",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // elements puzzle, gets used before super TextIcon
-	{ GID_JONES,           1,   232,  0,        "weekendText", "draw",        0x3d3,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // jones/cd only - gets called during the game
+	{ GID_JONES,           1,   232,  0,        "weekendText", "draw", -1,      sig_uninitread_jones_1,     0, { WORKAROUND_FAKE,   0 } }, // jones/cd only - gets called during the game
 	{ GID_JONES,           1,   255,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/cd only - called when a game ends, temps 13 and 14
 	{ GID_JONES,         764,   255,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/ega&vga only - called when the game starts, temps 13 and 14
 	//{ GID_KQ5,            -1,     0,  0,                   "", "export 29",      -1,              NULL,     3, { WORKAROUND_FAKE,   0xf } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #4961
-- 
cgit v1.2.3


From 34260a2cdd1f8a7509460df5bdf0a88b8e711840 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 20:25:12 +0200
Subject: SCI: workaround sig fanmade Ocean Battle migrated

---
 engines/sci/engine/workarounds.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 36218051e7..b6cd33dd1c 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -91,6 +91,16 @@ const SciWorkaroundEntry arithmeticWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//                Game: Fan-Made "Ocean Battle"
+//      Calling method: RoomScript::doit
+//   Subroutine offset: 0x1f17
+// Applies to at least: Ocean Battle
+static const uint16 sig_uninitread_fanmade_1[] = {
+	0x3f, 0x04,                      // link 04
+	0x88, SIG_UINT16(0x023b),        // lsg global[23Bh]
+	SIG_END
+};
+
 //                Game: Hoyle 1
 //      Calling method: export 0
 //   Subroutine offset: 0x037c (script 16)
@@ -237,7 +247,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_ECOQUEST,       -1,    -1,  0,                 NULL, "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // almost clicking anywhere triggers this in almost all rooms
 	{ GID_FANMADE,       516,   979,  0,                   "", "export 0",       -1,              NULL,    20, { WORKAROUND_FAKE,   0 } }, // Happens in Grotesteing after the logos
 	{ GID_FANMADE,       528,   990,  0,            "GDialog", "doit",           -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // Happens in Cascade Quest when closing the glossary - bug #5116
-	{ GID_FANMADE,       488,     1,  0,         "RoomScript", "doit",       0x1f17,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // Happens in Ocean Battle while playing - bug #5335
+	{ GID_FANMADE,       488,     1,  0,         "RoomScript", "doit", -1,    sig_uninitread_fanmade_1,     1, { WORKAROUND_FAKE,   0 } }, // Happens in Ocean Battle while playing - bug #5335
 	{ GID_FREDDYPHARKAS,  -1,    24,  0,              "gcWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
 	{ GID_FREDDYPHARKAS,  -1,    31,  0,            "quitWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
 	{ GID_FREDDYPHARKAS, 540,   540,  0,          "WaverCode", "init",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Gun pratice mini-game - bug #5232
-- 
cgit v1.2.3


From d8c732c2a1f16ddf4f189f856b0bdd0f9ad149c3 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 20:46:07 +0200
Subject: SCI: workaround sig cleanup

old and now obsolete localCallOffset removed
---
 engines/sci/engine/workarounds.cpp | 607 ++++++++++++++++++-------------------
 engines/sci/engine/workarounds.h   |   1 -
 2 files changed, 302 insertions(+), 306 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index b6cd33dd1c..71ba7d05a4 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -27,7 +27,7 @@
 #include "sci/engine/script_patches.h"
 #include "sci/engine/workarounds.h"
 
-#define SCI_WORKAROUNDENTRY_TERMINATOR { (SciGameId)0, -1, -1, 0, NULL, NULL, -1, NULL, 0, { WORKAROUND_NONE, 0 } }
+#define SCI_WORKAROUNDENTRY_TERMINATOR { (SciGameId)0, -1, -1, 0, NULL, NULL, NULL, 0, { WORKAROUND_NONE, 0 } }
 
 namespace Sci {
 
@@ -72,22 +72,22 @@ static const uint16 sig_arithmetic_ecoq2_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,         callSig, index,             workaround
+//    gameID,           room,script,lvl,          object-name, method-name,       local-call-signature, index,             workaround
 const SciWorkaroundEntry arithmeticWorkarounds[] = {
-	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState",-1,sig_arithmetic_camelot_1, 0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
-	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",  -1, sig_arithmetic_ecoq2_1,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939, Spanish version - bug #5750
-	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",      -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
-	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
-	{ GID_HOYLE4,         700,   -1,  1,               "Code", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_add: while bidding in Bridge, an object ("Bid") is added to an object in another segment ("hand3")
-	{ GID_ICEMAN,         199,  977,  0,            "Grooper", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: While dancing with the girl
-	{ GID_MOTHERGOOSE256,  -1,  999,  0,              "Event", "new",            -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_and: constantly during the game (SCI1 version)
-	{ GID_MOTHERGOOSE256,  -1,    4,  0,              "rm004", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when going north and reaching the castle (rooms 4 and 37) - bug #5101
-	{ GID_MOTHERGOOSEHIRES,90,   90,  0,      "newGameButton", "select",         -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_ge: MUMG Deluxe, when selecting "New Game" in the main menu. It tries to compare an integer with a list. Needs to return false for the game to continue.
-	{ GID_PHANTASMAGORIA, 902,    0,  0,                   "", "export 7",       -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_shr: when starting a chapter in Phantasmagoria
-	{ GID_QFG1VGA,        301,  928,  0,              "Blink", "init",           -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_div: when entering the inn, gets called with 1 parameter, but 2nd parameter is used for div which happens to be an object
-	{ GID_QFG2,           200,  200,  0,              "astro", "messages",       -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lsi: when getting asked for your name by the astrologer - bug #5152
-	{ GID_QFG3,           780,  999,  0,                   "", "export 6",       -1,            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: trying to talk to yourself at the top of the giant tree - bug #6692
-	{ GID_QFG4,           710,64941,  0,          "RandCycle", "doit",           -1,            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when the tentacle appears in the third room of the caves
+	{ GID_CAMELOT,         92,   92,  0,     "endingCartoon2", "changeState", sig_arithmetic_camelot_1,     0, { WORKAROUND_FAKE,   0 } }, // op_lai: during the ending, sub gets called with no parameters, uses parameter 1 which is theGrail in this case - bug #5237
+	{ GID_ECOQUEST2,      100,    0,  0,               "Rain", "points",        sig_arithmetic_ecoq2_1,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when giving the papers to the customs officer, gets called against a pointer instead of a number - bug #4939, Spanish version - bug #5750
+	{ GID_FANMADE,        516,  983,  0,             "Wander", "setTarget",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_mul: The Legend of the Lost Jewel Demo (fan made): called with object as second parameter when attacked by insects - bug #5124
+	{ GID_GK1,            800,64992,  0,                "Fwd", "doit",                            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when Mosely finds Gabriel and Grace near the end of the game, compares the Grooper object with 7
+	{ GID_HOYLE4,         700,   -1,  1,               "Code", "doit",                            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_add: while bidding in Bridge, an object ("Bid") is added to an object in another segment ("hand3")
+	{ GID_ICEMAN,         199,  977,  0,            "Grooper", "doit",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: While dancing with the girl
+	{ GID_MOTHERGOOSE256,  -1,  999,  0,              "Event", "new",                             NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_and: constantly during the game (SCI1 version)
+	{ GID_MOTHERGOOSE256,  -1,    4,  0,              "rm004", "doit",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_or: when going north and reaching the castle (rooms 4 and 37) - bug #5101
+	{ GID_MOTHERGOOSEHIRES,90,   90,  0,      "newGameButton", "select",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_ge: MUMG Deluxe, when selecting "New Game" in the main menu. It tries to compare an integer with a list. Needs to return false for the game to continue.
+	{ GID_PHANTASMAGORIA, 902,    0,  0,                   "", "export 7",                        NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_shr: when starting a chapter in Phantasmagoria
+	{ GID_QFG1VGA,        301,  928,  0,              "Blink", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_div: when entering the inn, gets called with 1 parameter, but 2nd parameter is used for div which happens to be an object
+	{ GID_QFG2,           200,  200,  0,              "astro", "messages",                        NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_lsi: when getting asked for your name by the astrologer - bug #5152
+	{ GID_QFG3,           780,  999,  0,                   "", "export 6",                        NULL,     0, { WORKAROUND_FAKE,   0 } }, // op_add: trying to talk to yourself at the top of the giant tree - bug #6692
+	{ GID_QFG4,           710,64941,  0,          "RandCycle", "doit",                            NULL,     0, { WORKAROUND_FAKE,   1 } }, // op_gt: when the tentacle appears in the third room of the caves
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -231,188 +231,188 @@ static const uint16 sig_uninitread_sq1_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,           callSig, index,  workaround
+//    gameID,           room,script,lvl,          object-name, method-name,       local-call-signature, index,  workaround
 const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
-	{ GID_CAMELOT,        40,    40,  0,               "Rm40", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when looking at the ground at the pool of Siloam - bug #6401
-	{ GID_CASTLEBRAIN,   280,   280,  0,         "programmer", "dispatchEvent",  -1,              NULL,     0, { WORKAROUND_FAKE, 0xf } }, // pressing 'q' on the computer screen in the robot room, and closing the help dialog that pops up (bug #5143). Moves the cursor to the view with the ID returned (in this case, the robot hand)
-	{ GID_CNICK_KQ,       -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // checkers/backgammon, like in hoyle 3 - temps 504 and 505 - bug #6255
-	{ GID_CNICK_KQ,       -1,   700,  0,           "gcWindow", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering the control menu, like in hoyle 3
-	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname520>",    -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled - bug #6426 (same as the theDoubleCube::make workaround for Hoyle 3)
-	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname519>",    -1,              NULL,     9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled (same as the theDoubleCube::accept workaround for Hoyle 3)
-	{ GID_CNICK_LAURABOW, -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Yatch, like in hoyle 3 - temps 504 and 505 - bug #6424
-	{ GID_CNICK_LAURABOW, -1,   700,  0,                 NULL, "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu - bug #6423 (same as the gcWindow workaround for Hoyle 3)
-	{ GID_CNICK_LAURABOW,100,   100,  0,                 NULL, "<noname144>",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #6429 (same as the dominoHand2 workaround for Hoyle 3)
-	{ GID_CNICK_LAURABOW,100,   110,  0,                 NULL, "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
-	{ GID_CNICK_LONGBOW,   0,     0,  0,          "RH Budget", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when starting the game
-	{ GID_ECOQUEST,       -1,    -1,  0,                 NULL, "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // almost clicking anywhere triggers this in almost all rooms
-	{ GID_FANMADE,       516,   979,  0,                   "", "export 0",       -1,              NULL,    20, { WORKAROUND_FAKE,   0 } }, // Happens in Grotesteing after the logos
-	{ GID_FANMADE,       528,   990,  0,            "GDialog", "doit",           -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // Happens in Cascade Quest when closing the glossary - bug #5116
-	{ GID_FANMADE,       488,     1,  0,         "RoomScript", "doit", -1,    sig_uninitread_fanmade_1,     1, { WORKAROUND_FAKE,   0 } }, // Happens in Ocean Battle while playing - bug #5335
-	{ GID_FREDDYPHARKAS,  -1,    24,  0,              "gcWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_FREDDYPHARKAS,  -1,    31,  0,            "quitWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_FREDDYPHARKAS, 540,   540,  0,          "WaverCode", "init",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Gun pratice mini-game - bug #5232
-	{ GID_GK1,            -1, 64950, -1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // sometimes when walk-clicking
-	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // called when the game starts
-	{ GID_GK2,            -1,    11,  0,                   "", "export 10",      -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // called during the game
-	{ GID_HOYLE1,          4,   104,  0,   "GinRummyCardList", "calcRuns",       -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // Gin Rummy / right when the game starts
-	{ GID_HOYLE1,          5,   204,  0,            "tableau", "checkRuns",      -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Cribbage / during the game
-	{ GID_HOYLE1,          3,    16,  0,                   "", "export 0", -1, sig_uninitread_hoyle1_1,     3, { WORKAROUND_FAKE,   0 } }, // Hearts / during the game - bug #5299
-	{ GID_HOYLE1,         -1,   997,  0,            "MenuBar", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When changing game speed settings - bug #5512
-	{ GID_HOYLE3,         -1,     0,  1,          "Character", "say",            -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when starting checkers or dominoes, first time a character says something - temps 504 and 505
-	{ GID_HOYLE3,         -1,   700,  0,           "gcWindow", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu
-	{ GID_HOYLE3,        100,   100,  0,        "dominoHand2", "cue",            -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #5042
-	{ GID_HOYLE3,        100,   110,  0,           "OKButton", "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
-	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "make",           -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled
-	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "accept",         -1,              NULL,     9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled
-	{ GID_HOYLE4,         -1,     0,  0,                 NULL, "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when selecting "Control" from the menu (temp vars 0-3) - bug #5132
-	{ GID_HOYLE4,        910,    18,  0,                 NULL, "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // during tutorial - bug #5213
-	{ GID_HOYLE4,        910,   910,  0,                 NULL, "setup",          -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // when selecting "Tutorial" from the main menu - bug #5132
-	{ GID_HOYLE4,        700,   700,  1,         "BridgeHand", "calcQTS",        -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always)
-	{ GID_HOYLE4,        700,   710,  1, "BridgeStrategyPlay", "checkSplitTops", -1,              NULL,    10, { WORKAROUND_FAKE,   0 } }, // while playing bridge, objects LeadReturn_Trump, SecondSeat_Trump, ThirdSeat_Trump and others - bug #5794
-	{ GID_HOYLE4,        700,    -1,  1,      "BridgeDefense", "think",          -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
-	{ GID_HOYLE4,        700,   730,  1,      "BridgeDefense", "beatTheirBest",  -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // rarely while playing bridge
-	{ GID_HOYLE4,        700,    -1,  1,               "Code", "doit",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
-	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,              NULL,     0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
-	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",        -1,              NULL,     1, { WORKAROUND_FAKE,   1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
-	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2", -1, sig_uninitread_hoyle4_1,     0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
-	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",       -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
-	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",            -1,              NULL,   504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
-	{ GID_HOYLE4,        800,   870,  0,     "EuchreStrategy", "thinkLead",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // while playing Euchre, happens at least on 2nd or 3rd turn - bug #6602
-	{ GID_HOYLE4,         -1,   937,  0,            "IconBar", "dispatchEvent",  -1,              NULL,   408, { WORKAROUND_FAKE,   0 } }, // pressing ENTER on scoreboard while mouse is not on OK button, may not happen all the time - bug #6603
-	{ GID_ISLANDBRAIN,   100,   937,  0,            "IconBar", "dispatchEvent",  -1,              NULL,    58, { WORKAROUND_FAKE,   0 } }, // when using ENTER at the startup menu - bug #5241
-	{ GID_ISLANDBRAIN,   140,   140,  0,              "piece", "init",           -1,              NULL,     3, { WORKAROUND_FAKE,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
-	{ GID_ISLANDBRAIN,   200,   268,  0,          "anElement", "select",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // elements puzzle, gets used before super TextIcon
-	{ GID_JONES,           1,   232,  0,        "weekendText", "draw", -1,      sig_uninitread_jones_1,     0, { WORKAROUND_FAKE,   0 } }, // jones/cd only - gets called during the game
-	{ GID_JONES,           1,   255,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/cd only - called when a game ends, temps 13 and 14
-	{ GID_JONES,         764,   255,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/ega&vga only - called when the game starts, temps 13 and 14
-	//{ GID_KQ5,            -1,     0,  0,                   "", "export 29",      -1,              NULL,     3, { WORKAROUND_FAKE,   0xf } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #4961
+	{ GID_CAMELOT,        40,    40,  0,               "Rm40", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // when looking at the ground at the pool of Siloam - bug #6401
+	{ GID_CASTLEBRAIN,   280,   280,  0,         "programmer", "dispatchEvent",                   NULL,     0, { WORKAROUND_FAKE, 0xf } }, // pressing 'q' on the computer screen in the robot room, and closing the help dialog that pops up (bug #5143). Moves the cursor to the view with the ID returned (in this case, the robot hand)
+	{ GID_CNICK_KQ,       -1,     0,  1,          "Character", "say",                             NULL,    -1, { WORKAROUND_FAKE,   0 } }, // checkers/backgammon, like in hoyle 3 - temps 504 and 505 - bug #6255
+	{ GID_CNICK_KQ,       -1,   700,  0,           "gcWindow", "open",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering the control menu, like in hoyle 3
+	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname520>",                     NULL,     5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled - bug #6426 (same as the theDoubleCube::make workaround for Hoyle 3)
+	{ GID_CNICK_KQ,      300,   303,  0,      "theDoubleCube", "<noname519>",                     NULL,     9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled (same as the theDoubleCube::accept workaround for Hoyle 3)
+	{ GID_CNICK_LAURABOW, -1,     0,  1,          "Character", "say",                             NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Yatch, like in hoyle 3 - temps 504 and 505 - bug #6424
+	{ GID_CNICK_LAURABOW, -1,   700,  0,                 NULL, "open",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu - bug #6423 (same as the gcWindow workaround for Hoyle 3)
+	{ GID_CNICK_LAURABOW,100,   100,  0,                 NULL, "<noname144>",                     NULL,     1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #6429 (same as the dominoHand2 workaround for Hoyle 3)
+	{ GID_CNICK_LAURABOW,100,   110,  0,                 NULL, "doit",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
+	{ GID_CNICK_LONGBOW,   0,     0,  0,          "RH Budget", "init",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // when starting the game
+	{ GID_ECOQUEST,       -1,    -1,  0,                 NULL, "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // almost clicking anywhere triggers this in almost all rooms
+	{ GID_FANMADE,       516,   979,  0,                   "", "export 0",                        NULL,    20, { WORKAROUND_FAKE,   0 } }, // Happens in Grotesteing after the logos
+	{ GID_FANMADE,       528,   990,  0,            "GDialog", "doit",                            NULL,     4, { WORKAROUND_FAKE,   0 } }, // Happens in Cascade Quest when closing the glossary - bug #5116
+	{ GID_FANMADE,       488,     1,  0,         "RoomScript", "doit",        sig_uninitread_fanmade_1,     1, { WORKAROUND_FAKE,   0 } }, // Happens in Ocean Battle while playing - bug #5335
+	{ GID_FREDDYPHARKAS,  -1,    24,  0,              "gcWin", "open",                            NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
+	{ GID_FREDDYPHARKAS,  -1,    31,  0,            "quitWin", "open",                            NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
+	{ GID_FREDDYPHARKAS, 540,   540,  0,          "WaverCode", "init",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Gun pratice mini-game - bug #5232
+	{ GID_GK1,            -1, 64950, -1,            "Feature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // sometimes when walk-clicking
+	{ GID_GK2,            -1,    11,  0,                   "", "export 10",                       NULL,     3, { WORKAROUND_FAKE,   0 } }, // called when the game starts
+	{ GID_GK2,            -1,    11,  0,                   "", "export 10",                       NULL,     4, { WORKAROUND_FAKE,   0 } }, // called during the game
+	{ GID_HOYLE1,          4,   104,  0,   "GinRummyCardList", "calcRuns",                        NULL,     4, { WORKAROUND_FAKE,   0 } }, // Gin Rummy / right when the game starts
+	{ GID_HOYLE1,          5,   204,  0,            "tableau", "checkRuns",                       NULL,     2, { WORKAROUND_FAKE,   0 } }, // Cribbage / during the game
+	{ GID_HOYLE1,          3,    16,  0,                   "", "export 0",     sig_uninitread_hoyle1_1,     3, { WORKAROUND_FAKE,   0 } }, // Hearts / during the game - bug #5299
+	{ GID_HOYLE1,         -1,   997,  0,            "MenuBar", "doit",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // When changing game speed settings - bug #5512
+	{ GID_HOYLE3,         -1,     0,  1,          "Character", "say",                             NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when starting checkers or dominoes, first time a character says something - temps 504 and 505
+	{ GID_HOYLE3,         -1,   700,  0,           "gcWindow", "open",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu
+	{ GID_HOYLE3,        100,   100,  0,        "dominoHand2", "cue",                             NULL,     1, { WORKAROUND_FAKE,   0 } }, // while playing domino - bug #5042
+	{ GID_HOYLE3,        100,   110,  0,           "OKButton", "doit",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when changing the "Dominoes per hand" setting - bug #6430
+	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "make",                            NULL,     5, { WORKAROUND_FAKE,   0 } }, // while playing backgammon with doubling enabled
+	{ GID_HOYLE3,        300,   303,  0,      "theDoubleCube", "accept",                          NULL,     9, { WORKAROUND_FAKE,   0 } }, // when accepting a double, while playing backgammon with doubling enabled
+	{ GID_HOYLE4,         -1,     0,  0,                 NULL, "open",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when selecting "Control" from the menu (temp vars 0-3) - bug #5132
+	{ GID_HOYLE4,        910,    18,  0,                 NULL, "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // during tutorial - bug #5213
+	{ GID_HOYLE4,        910,   910,  0,                 NULL, "setup",                           NULL,     3, { WORKAROUND_FAKE,   0 } }, // when selecting "Tutorial" from the main menu - bug #5132
+	{ GID_HOYLE4,        700,   700,  1,         "BridgeHand", "calcQTS",                         NULL,     3, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always)
+	{ GID_HOYLE4,        700,   710,  1, "BridgeStrategyPlay", "checkSplitTops",                  NULL,    10, { WORKAROUND_FAKE,   0 } }, // while playing bridge, objects LeadReturn_Trump, SecondSeat_Trump, ThirdSeat_Trump and others - bug #5794
+	{ GID_HOYLE4,        700,    -1,  1,      "BridgeDefense", "think",                           NULL,    -1, { WORKAROUND_FAKE,   0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
+	{ GID_HOYLE4,        700,   730,  1,      "BridgeDefense", "beatTheirBest",                   NULL,     3, { WORKAROUND_FAKE,   0 } }, // rarely while playing bridge
+	{ GID_HOYLE4,        700,    -1,  1,               "Code", "doit",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
+	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",                         NULL,     0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
+	{ GID_HOYLE4,        700,   921,  0,              "Print", "addEdit",                         NULL,     1, { WORKAROUND_FAKE,   1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
+	{ GID_HOYLE4,        300,   300,  0,                   "", "export 2",     sig_uninitread_hoyle4_1,     0, { WORKAROUND_FAKE,   0 } }, // after passing around cards in hearts
+	{ GID_HOYLE4,        400,   400,  1,            "GinHand", "calcRuns",                        NULL,     4, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
+	{ GID_HOYLE4,        500,    17,  1,          "Character", "say",                             NULL,   504, { WORKAROUND_FAKE,   0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
+	{ GID_HOYLE4,        800,   870,  0,     "EuchreStrategy", "thinkLead",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // while playing Euchre, happens at least on 2nd or 3rd turn - bug #6602
+	{ GID_HOYLE4,         -1,   937,  0,            "IconBar", "dispatchEvent",                   NULL,   408, { WORKAROUND_FAKE,   0 } }, // pressing ENTER on scoreboard while mouse is not on OK button, may not happen all the time - bug #6603
+	{ GID_ISLANDBRAIN,   100,   937,  0,            "IconBar", "dispatchEvent",                   NULL,    58, { WORKAROUND_FAKE,   0 } }, // when using ENTER at the startup menu - bug #5241
+	{ GID_ISLANDBRAIN,   140,   140,  0,              "piece", "init",                            NULL,     3, { WORKAROUND_FAKE,   1 } }, // first puzzle right at the start, some initialization variable. bnt is done on it, and it should be non-0
+	{ GID_ISLANDBRAIN,   200,   268,  0,          "anElement", "select",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // elements puzzle, gets used before super TextIcon
+	{ GID_JONES,           1,   232,  0,        "weekendText", "draw",          sig_uninitread_jones_1,     0, { WORKAROUND_FAKE,   0 } }, // jones/cd only - gets called during the game
+	{ GID_JONES,           1,   255,  0,                   "", "export 0",                        NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/cd only - called when a game ends, temps 13 and 14
+	{ GID_JONES,         764,   255,  0,                   "", "export 0",                        NULL,    -1, { WORKAROUND_FAKE,   0 } }, // jones/ega&vga only - called when the game starts, temps 13 and 14
+	//{ GID_KQ5,            -1,     0,  0,                   "", "export 29",                       NULL,     3, { WORKAROUND_FAKE,   0xf } }, // called when playing harp for the harpies or when aborting dialog in toy shop, is used for kDoAudio - bug #4961
 	// ^^ shouldn't be needed anymore, we got a script patch instead (kq5PatchCdHarpyVolume)
-	{ GID_KQ5,            25,    25,  0,              "rm025", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // inside witch forest, when going to the room where the walking rock is
-	{ GID_KQ5,            55,    55,  0,         "helpScript", "doit",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when giving the tambourine to the monster in the labyrinth (only happens at one of the locations) - bug #5198
-	{ GID_KQ5,            -1,   755,  0,              "gcWin", "open",           -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu in the FM-Towns version
-	{ GID_KQ6,            -1,    30,  0,               "rats", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // rats in the catacombs (temps 1 - 5) - bugs #4958, #4998, #5017
-	{ GID_KQ6,           210,   210,  0,              "rm210", "scriptCheck",    -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // using inventory in that room - bug #4953
-	{ GID_KQ6,           500,   500,  0,              "rm500", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // going to island of the beast
-	{ GID_KQ6,           520,   520,  0,              "rm520", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // going to boiling water trap on beast isle
-	{ GID_KQ6,            -1,   903,  0,         "controlWin", "open",           -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // when opening the controls window (save, load etc)
-	{ GID_KQ6,            -1,   907,  0,             "tomato", "doVerb",         -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // when looking at the rotten tomato in the inventory - bug #5331
-	{ GID_KQ6,            -1,   928,  0,                 NULL, "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
-	{ GID_KQ7,            -1, 64996,  0,               "User", "handleEvent",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
-	{ GID_LAURABOW,       37,     0,  0,                "CB1", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when going up the stairs - bug #5084
-	{ GID_LAURABOW,       -1,   967,  0,             "myIcon", "cycle",          -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // having any portrait conversation coming up - initial bug #4971
-	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "open",           -1,              NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
-	{ GID_LAURABOW2,      -1,    21,  0,      "dropCluesCode", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE, 0x7fff } }, // when asking some questions (e.g. the reporter about the burglary, or the policeman about Ziggy). Must be big, as the game scripts perform lt on it and start deleting journal entries - bugs #4979, #5026
-	{ GID_LAURABOW2,      -1,    90,  1,        "MuseumActor", "init",           -1,              NULL,     6, { WORKAROUND_FAKE,   0 } }, // Random actors in museum - bug #5197
-	{ GID_LAURABOW2,     240,   240,  0,     "sSteveAnimates", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Steve Dorian's idle animation at the docks - bug #5028
-	{ GID_LAURABOW2,      -1,   928,  0,                 NULL, "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
-	{ GID_LONGBOW,        -1,     0,  0,            "Longbow", "restart",        -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When canceling a restart game - bug #5244
-	{ GID_LONGBOW,        -1,   213,  0,              "clear", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When giving an answer using the druid hand sign code in any room
-	{ GID_LONGBOW,        -1,   213,  0,             "letter", "handleEvent",-1,sig_uninitread_longbow_1,   1, { WORKAROUND_FAKE,   0 } }, // When using the druid hand sign code in any room - bug #5035
-	{ GID_LSL1,          250,   250,  0,           "increase", "handleEvent",    -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // casino, playing game, increasing bet
-	{ GID_LSL1,          720,   720,  0,              "rm720", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // age check room
-	{ GID_LSL2,           38,    38,  0,        "cloudScript", "changeState",    -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // entering the room in the middle deck of the ship - bug #5034
-	{ GID_LSL3,          340,   340,  0,        "ComicScript", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // right after entering the 3 ethnic groups inside comedy club (temps 200, 201, 202, 203)
-	{ GID_LSL3,           -1,   997,  0,         "TheMenuBar", "handleEvent",    -1,              NULL,     1, { WORKAROUND_FAKE, 0xf } }, // when setting volume the first time, this temp is used to set volume on entry (normally it would have been initialized to 's')
-	{ GID_LSL6,          820,    82,  0,                   "", "export 0",       -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when touching the electric fence - bug #5103
-	{ GID_LSL6,           -1,    85,  0,          "washcloth", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // washcloth in inventory
-	{ GID_LSL6,           -1,   928, -1,           "Narrator", "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class
-	{ GID_LSL6HIRES,       0,    85,  0,             "LL6Inv", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // on startup
-	{ GID_LSL6HIRES,      -1, 64950,  1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // at least when entering swimming pool area
-	{ GID_LSL6HIRES,      -1, 64964,  0,              "DPath", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
-	{ GID_MOTHERGOOSE256, -1,     0,  0,                 "MG", "doit",           -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // SCI1.1: When moving the cursor all the way to the left during the game - bug #5224
-	{ GID_MOTHERGOOSE256, -1,   992,  0,             "AIPath", "init",           -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Happens in the demo and full version. In the demo, it happens when walking two screens from mother goose's house to the north. In the full version, it happens in rooms 7 and 23 - bug #5269
-	{ GID_MOTHERGOOSE256, 90,    90,  0,        "introScript", "changeState",    -1,              NULL,    65, { WORKAROUND_FAKE,   0 } }, // SCI1(CD): At the very end, after the game is completed and restarted - bug #5626
-	{ GID_MOTHERGOOSE256, 94,    94,  0,            "sunrise", "changeState",    -1,              NULL,   367, { WORKAROUND_FAKE,   0 } }, // At the very end, after the game is completed - bug #5294
-	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // right when clicking on a child at the start and probably also later
-	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // see above
-	{ GID_PEPPER,         -1,   894,  0,            "Package", "doVerb",         -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // using the hand on the book in the inventory - bug #5154
-	{ GID_PEPPER,        150,   928,  0,           "Narrator", "startText",      -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // happens during the non-interactive demo of Pepper
-	{ GID_PQ4,            -1,    25,  0,         "iconToggle", "select",         -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // when toggling the icon bar to auto-hide or not
-	{ GID_PQSWAT,         -1, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Using the menu in the beginning
-	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",       -1, sig_uninitread_qfg1_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1/hq1: going to the brigands hideout
-	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
-	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init", -1,    sig_uninitread_qfg1vga_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
-	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
-	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",             -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
-	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",           -1,              NULL,   364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
-	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",-1, sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
-	{ GID_QFG2,          260,   260,  0,            "jabbarS", "changeState",-1, sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Jabbar is about to enter the house (where you have to hide in the wardrobe), bug #5164, temps 1 and 2
-	{ GID_QFG2,          500,   500,  0,   "lightNextCandleS", "changeState",    -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Inside the last room, while Ad Avis performs the ritual to summon the genie - bug #5566
-	{ GID_QFG2,           -1,   700,  0,                 NULL, "showSign",       -1,              NULL,    10, { WORKAROUND_FAKE,   0 } }, // Occurs sometimes when reading a sign in Raseir, Shapeir et al - bugs #5627, #5635
-	{ GID_QFG3,          510,   510,  0,         "awardPrize", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // Simbani warrior challenge, after throwing the spears and retrieving the ring - bug #5277. Must be non-zero, otherwise the prize is awarded twice - bug #6160
-	{ GID_QFG3,          140,   140,  0,              "rm140", "init",       -1, sig_uninitread_qfg3_1,     0, { WORKAROUND_FAKE,   0 } }, // when importing a character and selecting the previous profession - bug #5163
-	{ GID_QFG3,          330,   330, -1,             "Teller", "doChild",        -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when talking to King Rajah about "Rajah" (bug #5033, temp 1) or "Tarna" (temp 0), or when clicking on yourself and saying "Greet" (bug #5148, temp 1)
-	{ GID_QFG3,          700,   700, -1,      "monsterIsDead", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // in the jungle, after winning any fight, bug #5169
-	{ GID_QFG3,          470,   470, -1,              "rm470", "notify",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // closing the character screen in the Simbani village in the room with the bridge, bug #5165
-	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when finishing awari game, bug #5167
-	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",-1, sig_uninitread_qfg3_2,     4, { WORKAROUND_FAKE,   0 } }, // also when finishing awari game
-	{ GID_QFG3,          851,    32, -1,            "ProjObj", "doit",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // near the end, when throwing the spear of death, bug #5282
-	{ GID_QFG4,           -1,    15, -1,     "charInitScreen", "dispatchEvent",  -1,              NULL,     5, { WORKAROUND_FAKE,   0 } }, // floppy version, when viewing the character screen
-	{ GID_QFG4,           -1, 64917, -1,       "controlPlane", "setBitmap",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, when entering the game menu
-	{ GID_QFG4,           -1, 64917, -1,              "Plane", "setBitmap",      -1,              NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, happens sometimes in fight scenes
-	{ GID_QFG4,          520, 64950,  0,             "fLake2", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD version, at the lake, when meeting the Rusalka and attempting to leave
-	{ GID_QFG4,          800, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD version, in the room with the spider pillar, when climbing on the pillar
-	{ GID_RAMA,           12, 64950, -1,   "InterfaceFeature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
-	{ GID_RAMA,           12, 64950, -1,      "hiliteOptText", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
-	{ GID_RAMA,           12, 64950, -1,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
-	{ GID_SHIVERS,        -1,   952,  0,       "SoundManager", "stop",           -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Just after Sierra logo
-	{ GID_SHIVERS,        -1, 64950,  0,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When clicking on the locked door at the beginning
-	{ GID_SHIVERS,        -1, 64950,  0,               "View", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // When clicking on the gargoyle eye at the beginning
-	{ GID_SHIVERS,     20311, 64964,  0,              "DPath", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // Just after door puzzle is solved and the metal balls start to roll
-	{ GID_SHIVERS,     29260, 29260,  0,             "spMars", "handleEvent",    -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking mars after seeing fortune to align earth etc...
-	{ GID_SHIVERS,     29260, 29260,  0,            "spVenus", "handleEvent",    -1,              NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking venus after seeing fortune to align earth etc...
-	{ GID_SQ1,           103,   103,  0,               "hand", "internalEvent",  -1,              NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Spanish (and maybe early versions?) only: when moving cursor over input pad, temps 1 and 2
-	{ GID_SQ1,            -1,   703,  0,                   "", "export 1",       -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // sub that's called from several objects while on sarien battle cruiser
-	{ GID_SQ1,            -1,   703,  0,         "firePulsar", "changeState",-1,  sig_uninitread_sq1_1,     0, { WORKAROUND_FAKE,   0 } }, // export 1, but called locally (when shooting at aliens)
-	{ GID_SQ4,            -1,   398,  0,            "showBox", "changeState",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD: called when rummaging in Software Excess bargain bin
-	{ GID_SQ4,            -1,   928, -1,           "Narrator", "startText",      -1,              NULL,  1000, { WORKAROUND_FAKE,   1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously
-	{ GID_SQ4,            -1,   708, -1,            "exitBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button in the sq4 hintbook - bug #6447
-	{ GID_SQ4,            -1,   708, -1,                   "", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button... in Russian version - bug #5573
-	{ GID_SQ4,            -1,   708, -1,            "prevBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button in the sq4 hintbook - bug #6447
-	{ GID_SQ4,            -1,   708, -1, "\xA8\xE6\xE3 \xAD\xA0\xA7\xA0\xA4.", "doVerb", -1,      NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button... in Russian version - bug #5573
-	{ GID_SQ4,            -1,   708, -1,            "nextBut", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button in the sq4 hintbook - bug #6447
-	{ GID_SQ4,            -1,   708, -1,                  ".", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button... in Russian version - bug #5573
-	{ GID_SQ5,           201,   201,  0,        "buttonPanel", "doVerb",         -1,              NULL,     0, { WORKAROUND_FAKE,   1 } }, // when looking at the orange or red button - bug #5112
-	{ GID_SQ6,            -1,     0,  0,                "SQ6", "init",           -1,              NULL,     2, { WORKAROUND_FAKE,   0 } }, // Demo and full version: called when the game starts (demo: room 0, full: room 100)
-	{ GID_SQ6,            -1, 64950, -1,            "Feature", "handleEvent",    -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // called when pressing "Start game" in the main menu, when entering the Orion's Belt bar (room 300), and perhaps other places
-	{ GID_SQ6,            -1, 64964,  0,              "DPath", "init",           -1,              NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
-	{ GID_TORIN,          -1, 64017,  0,             "oFlags", "clear",          -1,              NULL,     0, { WORKAROUND_FAKE,   0 } }, // entering Torin's home in the French version
-	SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+	{ GID_KQ5,            25,    25,  0,              "rm025", "doit",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // inside witch forest, when going to the room where the walking rock is
+	{ GID_KQ5,            55,    55,  0,         "helpScript", "doit",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // when giving the tambourine to the monster in the labyrinth (only happens at one of the locations) - bug #5198
+	{ GID_KQ5,            -1,   755,  0,              "gcWin", "open",                            NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when entering control menu in the FM-Towns version
+	{ GID_KQ6,            -1,    30,  0,               "rats", "changeState",                     NULL,    -1, { WORKAROUND_FAKE,   0 } }, // rats in the catacombs (temps 1 - 5) - bugs #4958, #4998, #5017
+	{ GID_KQ6,           210,   210,  0,              "rm210", "scriptCheck",                     NULL,     0, { WORKAROUND_FAKE,   1 } }, // using inventory in that room - bug #4953
+	{ GID_KQ6,           500,   500,  0,              "rm500", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // going to island of the beast
+	{ GID_KQ6,           520,   520,  0,              "rm520", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // going to boiling water trap on beast isle
+	{ GID_KQ6,            -1,   903,  0,         "controlWin", "open",                            NULL,     4, { WORKAROUND_FAKE,   0 } }, // when opening the controls window (save, load etc)
+	{ GID_KQ6,            -1,   907,  0,             "tomato", "doVerb",                          NULL,     2, { WORKAROUND_FAKE,   0 } }, // when looking at the rotten tomato in the inventory - bug #5331
+	{ GID_KQ6,            -1,   928,  0,                 NULL, "startText",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
+	{ GID_KQ7,            -1, 64996,  0,               "User", "handleEvent",                     NULL,     1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
+	{ GID_LAURABOW,       37,     0,  0,                "CB1", "doit",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // when going up the stairs - bug #5084
+	{ GID_LAURABOW,       -1,   967,  0,             "myIcon", "cycle",                           NULL,     1, { WORKAROUND_FAKE,   0 } }, // having any portrait conversation coming up - initial bug #4971
+	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "open",                            NULL,     5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu
+	{ GID_LAURABOW2,      -1,    21,  0,      "dropCluesCode", "doit",                            NULL,     1, { WORKAROUND_FAKE, 0x7fff } }, // when asking some questions (e.g. the reporter about the burglary, or the policeman about Ziggy). Must be big, as the game scripts perform lt on it and start deleting journal entries - bugs #4979, #5026
+	{ GID_LAURABOW2,      -1,    90,  1,        "MuseumActor", "init",                            NULL,     6, { WORKAROUND_FAKE,   0 } }, // Random actors in museum - bug #5197
+	{ GID_LAURABOW2,     240,   240,  0,     "sSteveAnimates", "changeState",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // Steve Dorian's idle animation at the docks - bug #5028
+	{ GID_LAURABOW2,      -1,   928,  0,                 NULL, "startText",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // gets caused by Text+Audio support (see script patcher)
+	{ GID_LONGBOW,        -1,     0,  0,            "Longbow", "restart",                         NULL,     0, { WORKAROUND_FAKE,   0 } }, // When canceling a restart game - bug #5244
+	{ GID_LONGBOW,        -1,   213,  0,              "clear", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // When giving an answer using the druid hand sign code in any room
+	{ GID_LONGBOW,        -1,   213,  0,             "letter", "handleEvent", sig_uninitread_longbow_1,   1, { WORKAROUND_FAKE,   0 } }, // When using the druid hand sign code in any room - bug #5035
+	{ GID_LSL1,          250,   250,  0,           "increase", "handleEvent",                     NULL,     2, { WORKAROUND_FAKE,   0 } }, // casino, playing game, increasing bet
+	{ GID_LSL1,          720,   720,  0,              "rm720", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // age check room
+	{ GID_LSL2,           38,    38,  0,        "cloudScript", "changeState",                     NULL,     1, { WORKAROUND_FAKE,   0 } }, // entering the room in the middle deck of the ship - bug #5034
+	{ GID_LSL3,          340,   340,  0,        "ComicScript", "changeState",                     NULL,    -1, { WORKAROUND_FAKE,   0 } }, // right after entering the 3 ethnic groups inside comedy club (temps 200, 201, 202, 203)
+	{ GID_LSL3,           -1,   997,  0,         "TheMenuBar", "handleEvent",                     NULL,     1, { WORKAROUND_FAKE, 0xf } }, // when setting volume the first time, this temp is used to set volume on entry (normally it would have been initialized to 's')
+	{ GID_LSL6,          820,    82,  0,                   "", "export 0",                        NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when touching the electric fence - bug #5103
+	{ GID_LSL6,           -1,    85,  0,          "washcloth", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // washcloth in inventory
+	{ GID_LSL6,           -1,   928, -1,           "Narrator", "startText",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class
+	{ GID_LSL6HIRES,       0,    85,  0,             "LL6Inv", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // on startup
+	{ GID_LSL6HIRES,      -1, 64950,  1,            "Feature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // at least when entering swimming pool area
+	{ GID_LSL6HIRES,      -1, 64964,  0,              "DPath", "init",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
+	{ GID_MOTHERGOOSE256, -1,     0,  0,                 "MG", "doit",                            NULL,     5, { WORKAROUND_FAKE,   0 } }, // SCI1.1: When moving the cursor all the way to the left during the game - bug #5224
+	{ GID_MOTHERGOOSE256, -1,   992,  0,             "AIPath", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // Happens in the demo and full version. In the demo, it happens when walking two screens from mother goose's house to the north. In the full version, it happens in rooms 7 and 23 - bug #5269
+	{ GID_MOTHERGOOSE256, 90,    90,  0,        "introScript", "changeState",                     NULL,    65, { WORKAROUND_FAKE,   0 } }, // SCI1(CD): At the very end, after the game is completed and restarted - bug #5626
+	{ GID_MOTHERGOOSE256, 94,    94,  0,            "sunrise", "changeState",                     NULL,   367, { WORKAROUND_FAKE,   0 } }, // At the very end, after the game is completed - bug #5294
+	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,            "Feature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // right when clicking on a child at the start and probably also later
+	{ GID_MOTHERGOOSEHIRES,-1,64950,  1,               "View", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // see above
+	{ GID_PEPPER,         -1,   894,  0,            "Package", "doVerb",                          NULL,     3, { WORKAROUND_FAKE,   0 } }, // using the hand on the book in the inventory - bug #5154
+	{ GID_PEPPER,        150,   928,  0,           "Narrator", "startText",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // happens during the non-interactive demo of Pepper
+	{ GID_PQ4,            -1,    25,  0,         "iconToggle", "select",                          NULL,     1, { WORKAROUND_FAKE,   0 } }, // when toggling the icon bar to auto-hide or not
+	{ GID_PQSWAT,         -1, 64950,  0,               "View", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // Using the menu in the beginning
+	{ GID_QFG1,           -1,   210,  0,          "Encounter", "init",           sig_uninitread_qfg1_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1/hq1: going to the brigands hideout
+	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",                     NULL,    -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
+	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        sig_uninitread_qfg1vga_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
+	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
+	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",                              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
+	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",                            NULL,   364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
+	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",    sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
+	{ GID_QFG2,          260,   260,  0,            "jabbarS", "changeState",    sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Jabbar is about to enter the house (where you have to hide in the wardrobe), bug #5164, temps 1 and 2
+	{ GID_QFG2,          500,   500,  0,   "lightNextCandleS", "changeState",                     NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Inside the last room, while Ad Avis performs the ritual to summon the genie - bug #5566
+	{ GID_QFG2,           -1,   700,  0,                 NULL, "showSign",                        NULL,    10, { WORKAROUND_FAKE,   0 } }, // Occurs sometimes when reading a sign in Raseir, Shapeir et al - bugs #5627, #5635
+	{ GID_QFG3,          510,   510,  0,         "awardPrize", "changeState",                     NULL,     0, { WORKAROUND_FAKE,   1 } }, // Simbani warrior challenge, after throwing the spears and retrieving the ring - bug #5277. Must be non-zero, otherwise the prize is awarded twice - bug #6160
+	{ GID_QFG3,          140,   140,  0,              "rm140", "init",           sig_uninitread_qfg3_1,     0, { WORKAROUND_FAKE,   0 } }, // when importing a character and selecting the previous profession - bug #5163
+	{ GID_QFG3,          330,   330, -1,             "Teller", "doChild",                         NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when talking to King Rajah about "Rajah" (bug #5033, temp 1) or "Tarna" (temp 0), or when clicking on yourself and saying "Greet" (bug #5148, temp 1)
+	{ GID_QFG3,          700,   700, -1,      "monsterIsDead", "changeState",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // in the jungle, after winning any fight, bug #5169
+	{ GID_QFG3,          470,   470, -1,              "rm470", "notify",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // closing the character screen in the Simbani village in the room with the bridge, bug #5165
+	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // when finishing awari game, bug #5167
+	{ GID_QFG3,          490,   490, -1,      "computersMove", "changeState",    sig_uninitread_qfg3_2,     4, { WORKAROUND_FAKE,   0 } }, // also when finishing awari game
+	{ GID_QFG3,          851,    32, -1,            "ProjObj", "doit",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // near the end, when throwing the spear of death, bug #5282
+	{ GID_QFG4,           -1,    15, -1,     "charInitScreen", "dispatchEvent",                   NULL,     5, { WORKAROUND_FAKE,   0 } }, // floppy version, when viewing the character screen
+	{ GID_QFG4,           -1, 64917, -1,       "controlPlane", "setBitmap",                       NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, when entering the game menu
+	{ GID_QFG4,           -1, 64917, -1,              "Plane", "setBitmap",                       NULL,     3, { WORKAROUND_FAKE,   0 } }, // floppy version, happens sometimes in fight scenes
+	{ GID_QFG4,          520, 64950,  0,             "fLake2", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD version, at the lake, when meeting the Rusalka and attempting to leave
+	{ GID_QFG4,          800, 64950,  0,               "View", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD version, in the room with the spider pillar, when climbing on the pillar
+	{ GID_RAMA,           12, 64950, -1,   "InterfaceFeature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
+	{ GID_RAMA,           12, 64950, -1,      "hiliteOptText", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
+	{ GID_RAMA,           12, 64950, -1,               "View", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // Demo, right when it starts
+	{ GID_SHIVERS,        -1,   952,  0,       "SoundManager", "stop",                            NULL,     2, { WORKAROUND_FAKE,   0 } }, // Just after Sierra logo
+	{ GID_SHIVERS,        -1, 64950,  0,            "Feature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // When clicking on the locked door at the beginning
+	{ GID_SHIVERS,        -1, 64950,  0,               "View", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // When clicking on the gargoyle eye at the beginning
+	{ GID_SHIVERS,     20311, 64964,  0,              "DPath", "init",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // Just after door puzzle is solved and the metal balls start to roll
+	{ GID_SHIVERS,     29260, 29260,  0,             "spMars", "handleEvent",                     NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking mars after seeing fortune to align earth etc...
+	{ GID_SHIVERS,     29260, 29260,  0,            "spVenus", "handleEvent",                     NULL,     4, { WORKAROUND_FAKE,   0 } }, // When clicking venus after seeing fortune to align earth etc...
+	{ GID_SQ1,           103,   103,  0,               "hand", "internalEvent",                   NULL,    -1, { WORKAROUND_FAKE,   0 } }, // Spanish (and maybe early versions?) only: when moving cursor over input pad, temps 1 and 2
+	{ GID_SQ1,            -1,   703,  0,                   "", "export 1",                        NULL,     0, { WORKAROUND_FAKE,   0 } }, // sub that's called from several objects while on sarien battle cruiser
+	{ GID_SQ1,            -1,   703,  0,         "firePulsar", "changeState",     sig_uninitread_sq1_1,     0, { WORKAROUND_FAKE,   0 } }, // export 1, but called locally (when shooting at aliens)
+	{ GID_SQ4,            -1,   398,  0,            "showBox", "changeState",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // CD: called when rummaging in Software Excess bargain bin
+	{ GID_SQ4,            -1,   928, -1,           "Narrator", "startText",                       NULL,  1000, { WORKAROUND_FAKE,   1 } }, // CD: happens in the options dialog and in-game when speech and subtitles are used simultaneously
+	{ GID_SQ4,            -1,   708, -1,            "exitBut", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1,                   "", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "close" button... in Russian version - bug #5573
+	{ GID_SQ4,            -1,   708, -1,            "prevBut", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1, "\xA8\xE6\xE3 \xAD\xA0\xA7\xA0\xA4.", "doVerb",          NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "previous" button... in Russian version - bug #5573
+	{ GID_SQ4,            -1,   708, -1,            "nextBut", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button in the sq4 hintbook - bug #6447
+	{ GID_SQ4,            -1,   708, -1,                  ".", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // Floppy: happens, when looking at the "next" button... in Russian version - bug #5573
+	{ GID_SQ5,           201,   201,  0,        "buttonPanel", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   1 } }, // when looking at the orange or red button - bug #5112
+	{ GID_SQ6,            -1,     0,  0,                "SQ6", "init",                            NULL,     2, { WORKAROUND_FAKE,   0 } }, // Demo and full version: called when the game starts (demo: room 0, full: room 100)
+	{ GID_SQ6,            -1, 64950, -1,            "Feature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // called when pressing "Start game" in the main menu, when entering the Orion's Belt bar (room 300), and perhaps other places
+	{ GID_SQ6,            -1, 64964,  0,              "DPath", "init",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
+	{ GID_TORIN,          -1, 64017,  0,             "oFlags", "clear",                           NULL,     0, { WORKAROUND_FAKE,   0 } }, // entering Torin's home in the French version
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kAbs_workarounds[] = {
-	{ GID_HOYLE1,          1,     1,  0,              "room1", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // crazy eights - called with objects instead of integers
-	{ GID_HOYLE1,          2,     2,  0,              "room2", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // old maid - called with objects instead of integers
-	{ GID_HOYLE1,          3,     3,  0,              "room3", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // hearts - called with objects instead of integers
-	{ GID_QFG1VGA,        -1,    -1,  0,                 NULL, "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch
-	{ GID_QFG3   ,        -1,    -1,  0,                 NULL, "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch - bugs #6042, #6043
+	{ GID_HOYLE1,          1,     1,  0,              "room1", "doit",                      NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // crazy eights - called with objects instead of integers
+	{ GID_HOYLE1,          2,     2,  0,              "room2", "doit",                      NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // old maid - called with objects instead of integers
+	{ GID_HOYLE1,          3,     3,  0,              "room3", "doit",                      NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // hearts - called with objects instead of integers
+	{ GID_QFG1VGA,        -1,    -1,  0,                 NULL, "doit",                      NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch
+	{ GID_QFG3   ,        -1,    -1,  0,                 NULL, "doit",                      NULL,     0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch - bugs #6042, #6043
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kCelHigh_workarounds[] = {
-	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
-	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
-	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
-	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
+	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
+	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
+	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
+	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kCelWide_workarounds[] = {
-	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
-	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
-	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
-	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
+	{ GID_KQ5,            -1,   255,  0,          "deathIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when getting beaten up in the inn and probably more, called with 2nd parameter as object - bug #5049
+	{ GID_PQ2,            -1,   255,  0,              "DIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when showing picture within windows, called with 2nd/3rd parameters as objects
+	{ GID_SQ1,             1,   255,  0,              "DIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // DEMO: Called with 2nd/3rd parameters as objects when clicking on the menu - bug #5012
+	{ GID_FANMADE,        -1,   979,  0,              "DIcon", "setSize",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // In The Gem Scenario and perhaps other fanmade games, this is called with 2nd/3rd parameters as objects - bug #5144
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kDeleteKey_workarounds[] = {
-	{ GID_HOYLE4,        300,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting hearts, while tray is shown - bug #6604
-	{ GID_HOYLE4,        500,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting cribbage, while tray is shown - bug #6604
-	{ GID_HOYLE4,        975,   999,  0,     "handleEventList", "delete",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // going back to gamelist from hearts/cribbage, while tray is shown - bug #6604
+	{ GID_HOYLE4,        300,   999,  0,     "handleEventList", "delete",                   NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting hearts, while tray is shown - bug #6604
+	{ GID_HOYLE4,        500,   999,  0,     "handleEventList", "delete",                   NULL,     0, { WORKAROUND_IGNORE, 0 } }, // restarting cribbage, while tray is shown - bug #6604
+	{ GID_HOYLE4,        975,   999,  0,     "handleEventList", "delete",                   NULL,     0, { WORKAROUND_IGNORE, 0 } }, // going back to gamelist from hearts/cribbage, while tray is shown - bug #6604
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -437,13 +437,13 @@ static const uint16 sig_kDeviceInfo_Fanmade_2[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name, call,                   callSig, index,   workaround
+//    gameID,           room,script,lvl,          object-name, method-name,      local-call-signature, index,   workaround
 const SciWorkaroundEntry kDeviceInfo_workarounds[] = {
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        -1, sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 01 variant
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",        -1, sig_kDeviceInfo_Fanmade_2,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 0001 variant
-	{ GID_FANMADE,        -1,   994,  0,              "Black", "save",        -1, sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_IGNORE,    0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice (Black Cauldron Remake)
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     -1, sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 01 variant
-	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",     -1, sig_kDeviceInfo_Fanmade_2,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 0001 variant
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",      sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 01 variant
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "save",      sig_kDeviceInfo_Fanmade_2,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 0001 variant
+	{ GID_FANMADE,        -1,   994,  0,              "Black", "save",      sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_IGNORE,    0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice (Black Cauldron Remake)
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",   sig_kDeviceInfo_Fanmade_1,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 01 variant
+	{ GID_FANMADE,        -1,   994,  1,               "Game", "restore",   sig_kDeviceInfo_Fanmade_2,     0, { WORKAROUND_STILLCALL, 0 } }, // In fanmade games (SCI Studio), this is called with one parameter for CurDevice LDI 0001 variant
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -478,69 +478,69 @@ static const uint16 sig_kDisplay_sq4_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kDisplay_workarounds[] = {
-	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
-	{ GID_LONGBOW,        95,    95,  0,          "countDown", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during title screen "Robin Hood! Your bow is needed"
-	{ GID_LONGBOW,       220,   220,  0,             "moveOn", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during second room "Outwit and outfight..."
-	{ GID_LONGBOW,       210,   210,  0,               "mama", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during third room "Fall under the spell..."
-	{ GID_LONGBOW,       320,   320,  0,              "flyin", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during fourth room "Conspiracies, love..."
-	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements", -1, sig_kDisplay_pq2_1,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id - bug #5223
-	{ GID_QFG1,           11,    11,  0,             "battle", "init",           -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
-	{ GID_SQ4,           397,     0,  0,                   "", "export 12",      -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
-	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode", -1,     sig_kDisplay_sq4_1,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
-	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",    -1,         NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
+	{ GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",                       NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
+	{ GID_LONGBOW,        95,    95,  0,          "countDown", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during title screen "Robin Hood! Your bow is needed"
+	{ GID_LONGBOW,       220,   220,  0,             "moveOn", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during second room "Outwit and outfight..."
+	{ GID_LONGBOW,       210,   210,  0,               "mama", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during third room "Fall under the spell..."
+	{ GID_LONGBOW,       320,   320,  0,              "flyin", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: during fourth room "Conspiracies, love..."
+	{ GID_PQ2,            23,    23,  0,         "rm23Script", "elements",     sig_kDisplay_pq2_1,     0, { WORKAROUND_IGNORE,    0 } }, // when looking at the 2nd page of pate's file - 0x75 as id - bug #5223
+	{ GID_QFG1,           11,    11,  0,             "battle", "init",                       NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: When entering battle, 0x75 as id
+	{ GID_SQ4,           397,     0,  0,                   "", "export 12",                  NULL,     0, { WORKAROUND_IGNORE,    0 } }, // FLOPPY: when going into the computer store - bug #5227
+	{ GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         sig_kDisplay_sq4_1,     0, { WORKAROUND_IGNORE,    0 } }, // CD: clicking on catalog in roboter sale - a parameter is an object
+	{ GID_SQ4,           391,   391,  0,         "choosePlug", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // CD: ordering connector in roboter sale - a parameter is an object
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kDirLoop_workarounds[] = {
-	{ GID_KQ4,             4,   992,  0,              "Avoid", "doit",           -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when the ogre catches you in front of his house, second parameter points to the same object as the first parameter, instead of being an integer (the angle) - bug #5217
+	{ GID_KQ4,             4,   992,  0,              "Avoid", "doit",                      NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when the ogre catches you in front of his house, second parameter points to the same object as the first parameter, instead of being an integer (the angle) - bug #5217
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kDisposeScript_workarounds[] = {
-	{ GID_LAURABOW,      777,   777,  0,             "myStab", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: after the will is signed, parameter 0 is an object - bug #4967
-	{ GID_LSL2,           -1,    54,  0,               "rm54", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // Amiga: room 55, script tries to kDisposeScript an object (does not happen for DOS) - bug #6818
-	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
-	{ GID_SQ4,           150,   151,  0,        "fightScript", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object
-	{ GID_SQ4,           150,   152,  0,       "driveCloseUp", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object
-	{ GID_SQ4,           150,   152,  0,                   "", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
+	{ GID_LAURABOW,      777,   777,  0,             "myStab", "changeState",               NULL,     0, { WORKAROUND_IGNORE,    0 } }, // DEMO: after the will is signed, parameter 0 is an object - bug #4967
+	{ GID_LSL2,           -1,    54,  0,               "rm54", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // Amiga: room 55, script tries to kDisposeScript an object (does not happen for DOS) - bug #6818
+	{ GID_QFG1,           -1,    64,  0,               "rm64", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when leaving graveyard, parameter 0 is an object
+	{ GID_SQ4,           150,   151,  0,        "fightScript", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // during fight with Vohaul, parameter 0 is an object
+	{ GID_SQ4,           150,   152,  0,       "driveCloseUp", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download", parameter 0 is an object
+	{ GID_SQ4,           150,   152,  0,                   "", "dispose",                   NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when choosing "beam download"... in Russian version - bug #5573
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kDoSoundFade_workarounds[] = {
-	{ GID_KQ5,           213,   989,  0,       "globalSound3", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when bandits leave the secret temple, parameter 4 is an object - bug #5078
-	{ GID_KQ6,           105,   989,  0,        "globalSound", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // floppy: during intro, parameter 4 is an object
-	{ GID_KQ6,           460,   989,  0,       "globalSound2", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // after pulling the black widow's web on the isle of wonder, parameter 4 is an object - bug #4954
-	{ GID_QFG4,           -1, 64989,  0,           "longSong", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD version: many places, parameter 4 is an object (longSong)
-	{ GID_SQ5,           800,   989,  0,          "sq5Music1", "fade",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when cutting the wrong part of Goliath with the laser - bug #6341
+	{ GID_KQ5,           213,   989,  0,       "globalSound3", "fade",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // english floppy: when bandits leave the secret temple, parameter 4 is an object - bug #5078
+	{ GID_KQ6,           105,   989,  0,        "globalSound", "fade",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // floppy: during intro, parameter 4 is an object
+	{ GID_KQ6,           460,   989,  0,       "globalSound2", "fade",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // after pulling the black widow's web on the isle of wonder, parameter 4 is an object - bug #4954
+	{ GID_QFG4,           -1, 64989,  0,           "longSong", "fade",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD version: many places, parameter 4 is an object (longSong)
+	{ GID_SQ5,           800,   989,  0,          "sq5Music1", "fade",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when cutting the wrong part of Goliath with the laser - bug #6341
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kGetAngle_workarounds[] = {
-	{ GID_FANMADE,       516,   992,  0,             "Motion", "init",           -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // The Legend of the Lost Jewel Demo (fan made): called with third/fourth parameters as objects
-	{ GID_KQ6,            -1,   752,  0,        "throwDazzle", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // room 740/790 after the Genie is exposed in the Palace (short and long ending), it starts shooting lightning bolts around. An extra 5th parameter is passed - bug #4959 & #5203
-	{ GID_SQ1,            -1,   927,  0,           "PAvoider", "doit",           -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // all rooms in Ulence Flats after getting the Pilot Droid: called with a single parameter when the droid is in Roger's path - bug #6016
+	{ GID_FANMADE,       516,   992,  0,             "Motion", "init",                      NULL,     0, { WORKAROUND_FAKE,      0 } }, // The Legend of the Lost Jewel Demo (fan made): called with third/fourth parameters as objects
+	{ GID_KQ6,            -1,   752,  0,        "throwDazzle", "changeState",               NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // room 740/790 after the Genie is exposed in the Palace (short and long ending), it starts shooting lightning bolts around. An extra 5th parameter is passed - bug #4959 & #5203
+	{ GID_SQ1,            -1,   927,  0,           "PAvoider", "doit",                      NULL,     0, { WORKAROUND_FAKE,      0 } }, // all rooms in Ulence Flats after getting the Pilot Droid: called with a single parameter when the droid is in Roger's path - bug #6016
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kFindKey_workarounds[] = {
-	{ GID_ECOQUEST2,     100,   999,  0,            "myList", "contains",        -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // When Noah Greene gives Adam the Ecorder, and just before the game gives a demonstration, a null reference to a list is passed - bug #4987
-	{ GID_HOYLE4,        300,   999,  0,             "Piles", "contains",        -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // When passing the three cards in Hearts, a null reference to a list is passed - bug #5664
+	{ GID_ECOQUEST2,     100,   999,  0,            "myList", "contains",                   NULL,     0, { WORKAROUND_FAKE, 0 } }, // When Noah Greene gives Adam the Ecorder, and just before the game gives a demonstration, a null reference to a list is passed - bug #4987
+	{ GID_HOYLE4,        300,   999,  0,             "Piles", "contains",                   NULL,     0, { WORKAROUND_FAKE, 0 } }, // When passing the three cards in Hearts, a null reference to a list is passed - bug #5664
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphDrawLine_workarounds[] = {
-	{ GID_ISLANDBRAIN,   300,   300,  0,         "dudeViewer", "show",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when looking at the gene explanation chart, gets called with 1 extra parameter
-	{ GID_SQ1,            43,    43,  0,        "someoneDied", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when ordering beer, gets called with 1 extra parameter
-	{ GID_SQ1,            71,    71,  0,       "destroyXenon", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // during the Xenon destruction cutscene (which results in death), gets called with 1 extra parameter - bug #5176
-	{ GID_SQ1,            53,    53,  0,           "blastEgo", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when Roger is found and zapped by the cleaning robot, gets called with 1 extra parameter - bug #5177
+	{ GID_ISLANDBRAIN,   300,   300,  0,         "dudeViewer", "show",                       NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when looking at the gene explanation chart, gets called with 1 extra parameter
+	{ GID_SQ1,            43,    43,  0,        "someoneDied", "changeState",                NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when ordering beer, gets called with 1 extra parameter
+	{ GID_SQ1,            71,    71,  0,       "destroyXenon", "changeState",                NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // during the Xenon destruction cutscene (which results in death), gets called with 1 extra parameter - bug #5176
+	{ GID_SQ1,            53,    53,  0,           "blastEgo", "changeState",                NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when Roger is found and zapped by the cleaning robot, gets called with 1 extra parameter - bug #5177
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -556,32 +556,32 @@ static const uint16 sig_kGraphSaveBox_ibrain_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,                callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,         local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphSaveBox_workarounds[] = {
-	{ GID_CASTLEBRAIN,   420,   427,  0,          "alienIcon", "select",         -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when selecting a card during the alien card game, gets called with 1 extra parameter
-	{ GID_ISLANDBRAIN,   290,   291,  0,         "upElevator", "changeState",-1, sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // when testing in the elevator puzzle, gets called with 1 argument less - 15 is on stack - bug #4943
-	{ GID_ISLANDBRAIN,   290,   291,  0,       "downElevator", "changeState",-1, sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // see above
-	{ GID_ISLANDBRAIN,   290,   291,  0,    "correctElevator", "changeState",-1, sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // see above (when testing the correct solution)
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_CASTLEBRAIN,   420,   427,  0,          "alienIcon", "select",                            NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when selecting a card during the alien card game, gets called with 1 extra parameter
+	{ GID_ISLANDBRAIN,   290,   291,  0,         "upElevator", "changeState", sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // when testing in the elevator puzzle, gets called with 1 argument less - 15 is on stack - bug #4943
+	{ GID_ISLANDBRAIN,   290,   291,  0,       "downElevator", "changeState", sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // see above
+	{ GID_ISLANDBRAIN,   290,   291,  0,    "correctElevator", "changeState", sig_kGraphSaveBox_ibrain_1,     0, { WORKAROUND_STILLCALL, 0 } }, // see above (when testing the correct solution)
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",                            NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphRestoreBox_workarounds[] = {
-	{ GID_LSL6,           -1,    86,  0,             "LL6Inv", "hide",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // happens during the game, gets called with 1 extra parameter
+	{ GID_LSL6,           -1,    86,  0,             "LL6Inv", "hide",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // happens during the game, gets called with 1 extra parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,   local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphFillBoxForeground_workarounds[] = {
-	{ GID_LSL6,           -1,     0,  0,               "LSL6", "hideControls",   -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // happens when giving the bungee key to merrily (room 240) and at least in room 650 too - gets called with additional 5th parameter
+	{ GID_LSL6,           -1,     0,  0,               "LSL6", "hideControls",                NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // happens when giving the bungee key to merrily (room 240) and at least in room 650 too - gets called with additional 5th parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphFillBoxAny_workarounds[] = {
-	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
-	{ GID_SQ4,            -1,   818,  0,     "iconTextSwitch", "show",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD: game menu "text/speech" display - parameter 5 is missing, but the right color number is on the stack
+	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",                NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
+	{ GID_SQ4,            -1,   818,  0,     "iconTextSwitch", "show",                       NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD: game menu "text/speech" display - parameter 5 is missing, but the right color number is on the stack
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -597,86 +597,86 @@ static const uint16 sig_kGraphRedrawBox_sq4_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,                callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,        local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphRedrawBox_workarounds[] = {
-	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           405,   405,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
-	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           410,   410,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           411,   411,  0,                   "", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
-	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState", -1, sig_kGraphRedrawBox_sq4_1,     0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479, German - bug #5527
-	{ GID_SQ4,           150,   150,  0,                   "", "changeState", -1, sig_kGraphRedrawBox_sq4_1,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
-	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
-	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
-	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
-	{ GID_KQ5,            -1,   995,  0,                   "",    "export 0",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when opening the gem pouch, accidental additional parameter specified - bug #5138
-	{ GID_KQ5,            -1,   403,  0,          "KQ5Window",     "dispose",    -1,                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the FM Towns version when closing any dialog box, accidental additional parameter specified
-	SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           405,   405,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           406,   406,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
+	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           410,   410,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,           411,   411,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
+	{ GID_SQ4,           150,   150,  0,        "laserScript", "changeState", sig_kGraphRedrawBox_sq4_1,     0, { WORKAROUND_STILLCALL, 0 } }, // when visiting the pedestral where Roger Jr. is trapped, before trashing the brain icon in the programming chapter, accidental additional parameter specified - bug #5479, German - bug #5527
+	{ GID_SQ4,           150,   150,  0,                   "", "changeState", sig_kGraphRedrawBox_sq4_1,     0, { WORKAROUND_STILLCALL, 0 } }, // same as above, for the Russian version - bug #5573
+	{ GID_SQ4,            -1,   704,  0,           "shootEgo", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When shot by Droid in Super Computer Maze (Rooms 500, 505, 510...) - accidental additional parameter specified
+	{ GID_KQ5,            -1,   981,  0,           "myWindow",     "dispose",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing any dialog box, accidental additional parameter specified - bug #5031
+	{ GID_KQ5,            -1,   995,  0,               "invW",        "doit",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when closing the inventory window, accidental additional parameter specified
+	{ GID_KQ5,            -1,   995,  0,                   "",    "export 0",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the floppy version, when opening the gem pouch, accidental additional parameter specified - bug #5138
+	{ GID_KQ5,            -1,   403,  0,          "KQ5Window",     "dispose",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // Happens in the FM Towns version when closing any dialog box, accidental additional parameter specified
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kGraphUpdateBox_workarounds[] = {
-	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",    -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "addPt",          -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",         -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
-	{ GID_PQ3,           202,   202,  0,            "MapEdit", "dispose",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters
+	{ GID_ECOQUEST2,     100,   333,  0,        "showEcorder", "changeState",                NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "addPt",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "movePt",                     NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #5099
+	{ GID_PQ3,           202,   202,  0,            "MapEdit", "dispose",                    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,    local-call-signature, index,                workaround
 const SciWorkaroundEntry kIsObject_workarounds[] = {
-	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",  -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error") - bug #4950
-	{ GID_ISLANDBRAIN,   -1,   999,  0,                "List", "eachElementDo",  -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // when going to the game options, choosing "Info" and selecting anything from the list, gets called with an invalid parameter (type "error") - bug #4989
-	{ GID_QFG3,          -1,   999,  0,                "List", "eachElementDo",  -1,    NULL,     0, { WORKAROUND_FAKE, 0 } }, // when asking for something, gets called with type error parameter
+	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",         NULL,     0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error") - bug #4950
+	{ GID_ISLANDBRAIN,   -1,   999,  0,                "List", "eachElementDo",         NULL,     0, { WORKAROUND_FAKE, 0 } }, // when going to the game options, choosing "Info" and selecting anything from the list, gets called with an invalid parameter (type "error") - bug #4989
+	{ GID_QFG3,          -1,   999,  0,                "List", "eachElementDo",         NULL,     0, { WORKAROUND_FAKE, 0 } }, // when asking for something, gets called with type error parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kMemory_workarounds[] = {
-	{ GID_LAURABOW2,      -1,   999,  0,                   "", "export 6",       -1,    NULL,     0, { WORKAROUND_FAKE,    0 } }, // during the intro, when exiting the train (room 160), talking to Mr. Augustini, etc. - bug #4944
-	{ GID_SQ1,            -1,   999,  0,                   "", "export 6",       -1,    NULL,     0, { WORKAROUND_FAKE,    0 } }, // during walking Roger around Ulence Flats - bug #6017
+	{ GID_LAURABOW2,      -1,   999,  0,                   "", "export 6",                  NULL,     0, { WORKAROUND_FAKE,    0 } }, // during the intro, when exiting the train (room 160), talking to Mr. Augustini, etc. - bug #4944
+	{ GID_SQ1,            -1,   999,  0,                   "", "export 6",                  NULL,     0, { WORKAROUND_FAKE,    0 } }, // during walking Roger around Ulence Flats - bug #6017
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kMoveCursor_workarounds[] = {
-	{ GID_KQ5,            -1,   937,  0,            "IconBar", "handleEvent",    -1,    NULL,     0, { WORKAROUND_IGNORE,  0 } }, // when pressing escape to open the menu, gets called with one parameter instead of 2 - bug #5575
+	{ GID_KQ5,            -1,   937,  0,            "IconBar", "handleEvent",                NULL,     0, { WORKAROUND_IGNORE,  0 } }, // when pressing escape to open the menu, gets called with one parameter instead of 2 - bug #5575
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kNewWindow_workarounds[] = {
-	{ GID_ECOQUEST,       -1,   981,  0,          "SysWindow", "open",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // EcoQuest 1 demo uses an in-between interpreter from SCI1 to SCI1.1. It's SCI1.1, but uses the SCI1 semantics for this call - bug #4976
+	{ GID_ECOQUEST,       -1,   981,  0,          "SysWindow", "open",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // EcoQuest 1 demo uses an in-between interpreter from SCI1 to SCI1.1. It's SCI1.1, but uses the SCI1 semantics for this call - bug #4976
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kReadNumber_workarounds[] = {
-	{ GID_CNICK_LAURABOW,100,   101,  0,          "dominoes.opt", "doit",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
-	{ GID_HOYLE3,        100,   101,  0,          "dominoes.opt", "doit",        -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
+	{ GID_CNICK_LAURABOW,100,   101,  0,          "dominoes.opt", "doit",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
+	{ GID_HOYLE3,        100,   101,  0,          "dominoes.opt", "doit",                   NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // When dominoes.opt is present, the game scripts call kReadNumber with an extra integer parameter - bug #6425
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kPaletteUnsetFlag_workarounds[] = {
-	{ GID_QFG4,          100,   100,  0,            "doMovie", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // after the Sierra logo, no flags are passed, thus the call is meaningless - bug #4947
+	{ GID_QFG4,          100,   100,  0,            "doMovie", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // after the Sierra logo, no flags are passed, thus the call is meaningless - bug #4947
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kSetCursor_workarounds[] = {
-	{ GID_KQ5,            -1,   768,  0,           "KQCursor", "init",           -1,    NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD: gets called with 4 additional "900d" parameters
+	{ GID_KQ5,            -1,   768,  0,           "KQCursor", "init",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // CD: gets called with 4 additional "900d" parameters
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kSetPort_workarounds[] = {
-	{ GID_LSL6,          740,   740,  0,              "rm740", "drawPic",        -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // ending scene, is called with additional 3 (!) parameters
-	{ GID_QFG3,          830,   830,  0,        "portalOpens", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when the portal appears during the end, gets called with 4 parameters - bug #5174
+	{ GID_LSL6,          740,   740,  0,              "rm740", "drawPic",                    NULL,     0, { WORKAROUND_IGNORE,    0 } }, // ending scene, is called with additional 3 (!) parameters
+	{ GID_QFG3,          830,   830,  0,        "portalOpens", "changeState",                NULL,     0, { WORKAROUND_IGNORE,    0 } }, // when the portal appears during the end, gets called with 4 parameters - bug #5174
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -692,16 +692,16 @@ static const uint16 sig_kStrAt_ibrain_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,         callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kStrAt_workarounds[] = {
-	{ GID_CASTLEBRAIN,   220,   220,  0,         "robotJokes", "animateOnce",    -1,            NULL,     0, { WORKAROUND_FAKE,      0 } }, // when trying to view the terminal at the end of the maze without having collected any robot jokes - bug #5127
-	{ GID_ISLANDBRAIN,   300,   310,  0,         "childBreed", "changeState",-1, sig_kStrAt_ibrain_1,     0, { WORKAROUND_FAKE,      0 } }, // when clicking Breed to get the second-generation cyborg hybrid (Standard difficulty), the two parameters are swapped - bug #5088
+	{ GID_CASTLEBRAIN,   220,   220,  0,         "robotJokes", "animateOnce",                NULL,     0, { WORKAROUND_FAKE,      0 } }, // when trying to view the terminal at the end of the maze without having collected any robot jokes - bug #5127
+	{ GID_ISLANDBRAIN,   300,   310,  0,         "childBreed", "changeState", sig_kStrAt_ibrain_1,     0, { WORKAROUND_FAKE,      0 } }, // when clicking Breed to get the second-generation cyborg hybrid (Standard difficulty), the two parameters are swapped - bug #5088
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,   local-call-signature, index,                workaround
 const SciWorkaroundEntry kStrCpy_workarounds[] = {
-	{ GID_MOTHERGOOSE,    23,    23,  0,          "talkScript", "changeState",   -1,    NULL,     0, { WORKAROUND_FAKE,      0 } }, // when talking to the girl in scene 23, there's no destination parameter (script bug - wrong instruction order). The original source is used directly afterwards in kDisplay, to show the girl's text - bug #6485
+	{ GID_MOTHERGOOSE,    23,    23,  0,          "talkScript", "changeState",                NULL,     0, { WORKAROUND_FAKE,      0 } }, // when talking to the girl in scene 23, there's no destination parameter (script bug - wrong instruction order). The original source is used directly afterwards in kDisplay, to show the girl's text - bug #6485
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -717,22 +717,22 @@ static const uint16 sig_kStrLen_qfg2_1[] = {
 	SIG_END
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call,       callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name, local-call-signature, index,                workaround
 const SciWorkaroundEntry kStrLen_workarounds[] = {
-	{ GID_QFG2,          210,     2,  0,                   "", "export 21", -1, sig_kStrLen_qfg2_1,     0, { WORKAROUND_FAKE,      0 } }, // When saying something incorrect at the WIT, an integer is passed instead of a reference - bug #5489
+	{ GID_QFG2,          210,     2,  0,                   "", "export 21",   sig_kStrLen_qfg2_1,     0, { WORKAROUND_FAKE,      0 } }, // When saying something incorrect at the WIT, an integer is passed instead of a reference - bug #5489
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-//    gameID,           room,script,lvl,          object-name, method-name,    call, callSig, index,                workaround
+//    gameID,           room,script,lvl,          object-name, method-name,  local-call-signature, index,                workaround
 const SciWorkaroundEntry kUnLoad_workarounds[] = {
-	{ GID_ECOQUEST,      380,    61,  0,              "gotIt", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // CD version: after talking to the dolphin the first time, a 3rd parameter is passed by accident
-	{ GID_ECOQUEST,      380,    69,  0,   "lookAtBlackBoard", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // German version, when closing the blackboard closeup in the dolphin room, a 3rd parameter is passed by accident - bug #5483
-	{ GID_LAURABOW2,      -1,    -1,  0,           "sCartoon", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // DEMO: during the intro, a 3rd parameter is passed by accident - bug #4966
-	{ GID_LSL6,          130,   130,  0,    "recruitLarryScr", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
-	{ GID_LSL6,          740,   740,  0,        "showCartoon", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during ending, 4 additional parameters are passed by accident
-	{ GID_LSL6HIRES,     130,   130,  0,    "recruitLarryScr", "changeState",    -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
-	{ GID_SQ1,            43,   303,  0,            "slotGuy", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // when leaving ulence flats bar, parameter 1 is not passed - script error
-	{ GID_QFG4,           -1,   110,  0,            "dreamer", "dispose",        -1,    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during the dream sequence, a 3rd parameter is passed by accident
+	{ GID_ECOQUEST,      380,    61,  0,              "gotIt", "changeState",                NULL,     0, { WORKAROUND_IGNORE, 0 } }, // CD version: after talking to the dolphin the first time, a 3rd parameter is passed by accident
+	{ GID_ECOQUEST,      380,    69,  0,   "lookAtBlackBoard", "changeState",                NULL,     0, { WORKAROUND_IGNORE, 0 } }, // German version, when closing the blackboard closeup in the dolphin room, a 3rd parameter is passed by accident - bug #5483
+	{ GID_LAURABOW2,      -1,    -1,  0,           "sCartoon", "changeState",                NULL,     0, { WORKAROUND_IGNORE, 0 } }, // DEMO: during the intro, a 3rd parameter is passed by accident - bug #4966
+	{ GID_LSL6,          130,   130,  0,    "recruitLarryScr", "changeState",                NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
+	{ GID_LSL6,          740,   740,  0,        "showCartoon", "changeState",                NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during ending, 4 additional parameters are passed by accident
+	{ GID_LSL6HIRES,     130,   130,  0,    "recruitLarryScr", "changeState",                NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during intro, a 3rd parameter is passed by accident
+	{ GID_SQ1,            43,   303,  0,            "slotGuy", "dispose",                    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // when leaving ulence flats bar, parameter 1 is not passed - script error
+	{ GID_QFG4,           -1,   110,  0,            "dreamer", "dispose",                    NULL,     0, { WORKAROUND_IGNORE, 0 } }, // during the dream sequence, a 3rd parameter is passed by accident
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
@@ -795,8 +795,6 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 			while (workaround->methodName) {
 				bool objectNameMatches = (workaround->objectName == NULL) ||
 										 (workaround->objectName == searchObjectName);
-				bool localCallMatches = (workaround->localCallOffset == curLocalCallOffset) ||
-										 (workaround->localCallSignature); // soon to be obsolete
 
 				if (workaround->gameId == gameId
 						&& ((workaround->scriptNr == -1) || (workaround->scriptNr == curScriptNr))
@@ -804,7 +802,6 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 						&& ((workaround->inheritanceLevel == -1) || (workaround->inheritanceLevel == inheritanceLevel))
 						&& objectNameMatches
 						&& workaround->methodName == g_sci->getSciLanguageString(curMethodName, K_LANG_ENGLISH)
-						&& localCallMatches // soon to be obsolete
 						&& ((workaround->index == -1) || (workaround->index == index))) {
 					// Workaround found
 					if ((workaround->localCallSignature) || (curLocalCallOffset != -1)) {
diff --git a/engines/sci/engine/workarounds.h b/engines/sci/engine/workarounds.h
index 25dd2bbc8a..46059a175c 100644
--- a/engines/sci/engine/workarounds.h
+++ b/engines/sci/engine/workarounds.h
@@ -60,7 +60,6 @@ struct SciWorkaroundEntry {
 	int16 inheritanceLevel;
 	const char *objectName;
 	const char *methodName;
-	int localCallOffset;
 	const uint16 *localCallSignature;
 	int index;
 	SciWorkaroundSolution newValue;
-- 
cgit v1.2.3


From 6777785cdf5dee85fff62e08ec43ce963bb71b41 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 19 Apr 2015 20:48:23 +0200
Subject: SCI: workaround sig cleanup 2

---
 engines/sci/engine/workarounds.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 71ba7d05a4..b33457606e 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -629,9 +629,9 @@ const SciWorkaroundEntry kGraphUpdateBox_workarounds[] = {
 
 //    gameID,           room,script,lvl,          object-name, method-name,    local-call-signature, index,                workaround
 const SciWorkaroundEntry kIsObject_workarounds[] = {
-	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",         NULL,     0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error") - bug #4950
-	{ GID_ISLANDBRAIN,   -1,   999,  0,                "List", "eachElementDo",         NULL,     0, { WORKAROUND_FAKE, 0 } }, // when going to the game options, choosing "Info" and selecting anything from the list, gets called with an invalid parameter (type "error") - bug #4989
-	{ GID_QFG3,          -1,   999,  0,                "List", "eachElementDo",         NULL,     0, { WORKAROUND_FAKE, 0 } }, // when asking for something, gets called with type error parameter
+	{ GID_GK1,           50,   999,  0,                "List", "eachElementDo",                NULL,     0, { WORKAROUND_FAKE, 0 } }, // GK1 demo, when asking Grace for messages it gets called with an invalid parameter (type "error") - bug #4950
+	{ GID_ISLANDBRAIN,   -1,   999,  0,                "List", "eachElementDo",                NULL,     0, { WORKAROUND_FAKE, 0 } }, // when going to the game options, choosing "Info" and selecting anything from the list, gets called with an invalid parameter (type "error") - bug #4989
+	{ GID_QFG3,          -1,   999,  0,                "List", "eachElementDo",                NULL,     0, { WORKAROUND_FAKE, 0 } }, // when asking for something, gets called with type error parameter
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From bfb86a99db6358043a4c16371c5a927411b4e8cb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 20 Apr 2015 01:07:54 -0500
Subject: SHERLOCK: Map path walking, beginnings of darts game

---
 engines/sherlock/map.cpp             |  74 ++++++-
 engines/sherlock/map.h               |  19 +-
 engines/sherlock/scalpel/darts.cpp   | 385 +++++++++++++++++++++++++++++++++++
 engines/sherlock/scalpel/darts.h     |  33 ++-
 engines/sherlock/scalpel/scalpel.cpp |   8 +-
 5 files changed, 504 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index fa3bf99cab..6fd169f43a 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -31,7 +31,7 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_iconShapes = nullptr;
 	_point = 0;
 	_placesShown = false;
-	_charPoint = -1;
+	_charPoint = _oldCharPoint = -1;
 	_cursorIndex = -1;
 	_drawMap = false;
 	for (int idx = 0; idx < 3; ++idx)
@@ -43,9 +43,9 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 /**
  * Loads the list of points for locations on the map for each scene
  */
-void Map::loadPoints(int count, const int *xList, const int *yList) {
-	for (int idx = 0; idx < count; ++idx, ++xList, ++yList) {
-		_points.push_back(Common::Point(*xList, *yList));
+void Map::loadPoints(int count, const int *xList, const int *yList, const int *transList) {
+	for (int idx = 0; idx < count; ++idx, ++xList, ++yList, ++transList) {
+		_points.push_back(MapEntry(*xList, *yList, *transList));
 	}
 }
 
@@ -79,9 +79,11 @@ void Map::loadData() {
 	}
 
 	// Load in the path point information
-	_pathPoints.resize(416);
-	for (uint idx = 0; idx < _pathPoints.size(); ++idx)
-		_pathPoints[idx] = pathStream->readSint16LE();
+	_pathPoints.resize(208);
+	for (uint idx = 0; idx < _pathPoints.size(); ++idx) {
+		_pathPoints[idx].x = pathStream->readSint16LE();
+		_pathPoints[idx].y = pathStream->readSint16LE();
+	}
 
 	delete pathStream;
 }
@@ -302,6 +304,14 @@ void Map::saveTopLine() {
 	_topLine.blitFrom(_vm->_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, 12));
 }
 
+/**
+ * Erases anything shown in the top line by restoring the previously saved original map background
+ */
+void Map::eraseTopLine() {
+	Screen &screen = *_vm->_screen;
+	screen.blitFrom(_topLine, Common::Point(0, 0));
+}
+
 /**
  * Update all on-screen sprites to account for any scrolling of the map
  */
@@ -355,7 +365,55 @@ void Map::updateMap(bool flushScreen) {
  * Handle moving icon for player from their previous location on the map to a destination location
  */
 void Map::walkTheStreets() {
-	// TODO
+	People &people = *_vm->_people;
+	bool reversePath = false;
+	Common::Array<Common::Point> tempPath;
+
+	// Get indexes into the path lists for the start and destination scenes
+	int start = _points[_oldCharPoint]._translate;
+	int dest = _points[_charPoint]._translate;
+
+	// Get pointer to start of path
+	const int *ptr = &_paths[start][dest];
+
+	// Check for any intermediate points between the two locations
+	if (*ptr || _charPoint > 50 || _oldCharPoint > 50) {
+		people[AL]._sequenceNumber = -1;
+
+		if (_charPoint == 51 || _oldCharPoint == 51) {
+			people.setWalking();
+		} else {
+			// Check for moving the path backwards or forwards
+			if (*ptr == 255) {
+				reversePath = true;
+				SWAP(start, dest);
+				ptr = &_paths[start][dest];
+			}
+
+			do {
+				int idx = *ptr++;
+				tempPath.push_back(_pathPoints[idx - 1] + Common::Point(4, 4));
+			} while (*ptr != 254);
+
+			// Load up the path to use
+			people._walkTo.clear();
+
+			if (!reversePath) {
+				people._walkTo = tempPath;
+				people._walkDest = tempPath[0];
+			} else {
+				for (int idx = 0; idx < ((int)tempPath.size() - 1); ++idx)
+					people._walkTo.push(tempPath[idx]);
+				people._walkDest = tempPath[tempPath.size() - 1];
+			}
+
+			people._walkDest.x += 12;
+			people._walkDest.y += 6;
+			people.setWalking();
+		}
+	} else {
+		people[AL]._walkCount = 0;
+	}
 }
 
 /**
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 653d8c0084..f324160bce 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -35,13 +35,21 @@ namespace Sherlock {
 
 class SherlockEngine;
 
+struct MapEntry : Common::Point {
+	int _translate;
+
+	MapEntry() : Common::Point(), _translate(-1) {}
+
+	MapEntry(int x, int y, int translate) : Common::Point(x, y), _translate(translate) {}
+};
+
 class Map {
 private:
 	SherlockEngine *_vm;
-	Common::Array<Common::Point> _points;	// Map locations for each scene
+	Common::Array<MapEntry> _points;	// Map locations for each scene
 	Common::StringArray _locationNames;
 	Common::Array< Common::Array<int> > _paths;
-	Common::Array<int> _pathPoints;
+	Common::Array<Common::Point> _pathPoints;
 	Common::Point _savedPos;
 	Common::Point _savedSize;
 	Surface _topLine;
@@ -54,7 +62,7 @@ private:
 	Common::Point _lDrawnPos;
 	int _point;
 	bool _placesShown;
-	int _charPoint;
+	int _charPoint, _oldCharPoint;
 	int _cursorIndex;
 	bool _drawMap;
 	Surface _iconSave;
@@ -67,6 +75,7 @@ private:
 	void showPlaces();
 
 	void saveTopLine();
+	void eraseTopLine();
 
 	void updateMap(bool flushScreen);
 
@@ -77,9 +86,9 @@ private:
 public:
 	Map(SherlockEngine *vm);
 
-	const Common::Point &operator[](int idx) { return _points[idx]; }
+	const MapEntry &operator[](int idx) { return _points[idx]; }
 
-	void loadPoints(int count, const int *xList, const int *yList);
+	void loadPoints(int count, const int *xList, const int *yList, const int *transList);
 
 	int show();
 };
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 857ac63f8c..c975cb1086 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -27,10 +27,395 @@ namespace Sherlock {
 
 namespace Scalpel {
 
+enum {
+	STATUS_INFO_X = 218,
+	STATUS_INFO_Y = 53,
+	DART_INFO_X = 218,
+	DART_INFO_Y = 103,
+	DARTBARHX = 35,
+	DARTHORIZY = 190,
+	DARTBARVX = 1,
+	DARTHEIGHTY = 25,
+	DARTBARSIZE = 150,
+	DART_BAR_FORE = 8
+};
+
+enum {
+	DART_COL_FORE = 5,
+	PLAYER_COLOR = 11
+};
+
+const char *const OPPONENT_NAMES[5] = { 
+	"Skipper", "Willy", "Micky", "Tom", "Bartender" 
+};
+
+/*----------------------------------------------------------------*/
+
+Darts::Darts(ScalpelEngine *vm) : _vm(vm) {
+	_dartImages = nullptr;
+	_level = 0;
+	_computerPlayer = 1;
+	_playerDartMode = false;
+	_dartScore1 = _dartScore2 = 0;
+	_roundNumber = 0;
+	_playerDartMode = false;
+	_roundScore = 0;
+	_oldDartButtons = 0;
+}
+
+/**
+ * Main method for playing darts game
+ */
 void Darts::playDarts() {
+	Screen &screen = *_vm->_screen;
+	int score, roundStartScore;
+	int playerNumber = 0;
+	int lastDart;
+
+	// Change the font
+	int oldFont = screen.fontNumber();
+	screen.setFont(4);
+
+	loadDarts();
+	initDarts();
+
+	do {
+		roundStartScore = score = playerNumber == 0 ? _dartScore1 : _dartScore2;
+		
+		// Show player details
+		showNames(playerNumber);
+		showStatus(playerNumber);
+		_roundScore = 0;
+
+		for (int idx = 0; idx < 3; ++idx) {
+			// Throw a single dart
+			if (_computerPlayer == 1)
+				lastDart = throwDart(idx + 1, playerNumber * 2);
+			else if (_computerPlayer == 2)
+				lastDart = throwDart(idx + 1, playerNumber + 1);
+			else
+				lastDart = throwDart(idx + 1, 0);
+
+			score -= lastDart;
+			_roundScore += lastDart;
+
+
+		}
+
+		// todo
+	} while (!_vm->shouldQuit());
+
 	// TODO
 }
 
+/**
+ * Load the graphics needed for the dart game
+ */
+void Darts::loadDarts() {
+	Screen &screen = *_vm->_screen;
+
+	_dartImages = new ImageFile("darts.vgs");
+	screen._backBuffer1.blitFrom((*_dartImages)[1], Common::Point(0, 0));
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+}
+
+/**
+ * Initializes the variables needed for the dart game
+ */
+void Darts::initDarts() {
+	_dartScore1 = _dartScore2 = 301;
+	_roundNumber = 1;
+
+	if (_level == 9) {
+		// No computer players
+		_computerPlayer = 0;
+		_level = 0;
+	} else if (_level == 8) {
+		_level = _vm->getRandomNumber(3);
+		_computerPlayer = 2;
+	} else {
+		// Check flags for opponents
+		for (int idx = 0; idx < 4; ++idx) {
+			if (_vm->readFlags(314 + idx))
+				_level = idx;
+		}
+	}
+
+	_opponent = OPPONENT_NAMES[_level];
+}
+
+/**
+ * Show the player names
+ */
+void Darts::showNames(int playerNum) {
+	Screen &screen = *_vm->_screen;
+	byte color = playerNum == 0 ? PLAYER_COLOR : DART_COL_FORE;
+
+	// Print Holmes first
+	if (playerNum == 0)
+		screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y), PLAYER_COLOR + 3, "Holmes");
+	else
+		screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y), color, "Holmes");
+
+	screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10,
+		STATUS_INFO_X + 31, STATUS_INFO_Y + 12), color);
+	screen.slamArea(STATUS_INFO_X, STATUS_INFO_Y + 10, 31, 12);
+
+	// Second player
+	color = playerNum == 1 ? PLAYER_COLOR : DART_COL_FORE;
+
+	if (playerNum != 0)
+		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y + 10), PLAYER_COLOR + 3,
+			_opponent.c_str());
+	else
+		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y + 10), color,
+			_opponent.c_str());
+
+	screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X + 50, STATUS_INFO_Y + 10,
+		STATUS_INFO_Y + 81, STATUS_INFO_Y + 12), color);
+	screen.slamArea(STATUS_INFO_X + 50, STATUS_INFO_Y + 10, 81, 12);
+
+	// Make a copy of the back buffer to the secondary one
+	screen._backBuffer2.blitFrom(screen._backBuffer1);
+}
+
+/**
+ * Show the player score and game status
+ */
+void Darts::showStatus(int playerNum) {
+	Screen &screen = *_vm->_screen;
+	byte color;
+
+	screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 10),
+		Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, SHERLOCK_SCREEN_WIDTH, STATUS_INFO_Y + 38));
+
+	color = (playerNum == 0) ? PLAYER_COLOR : DART_COL_FORE;
+	screen.print(Common::Point(STATUS_INFO_X + 6, STATUS_INFO_Y + 13), color, "%d", _dartScore1);
+
+	color = (playerNum == 1) ? PLAYER_COLOR : DART_COL_FORE;
+	screen.print(Common::Point(STATUS_INFO_X + 56, STATUS_INFO_Y + 13), color, "%d", _dartScore2);
+	screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 25), PLAYER_COLOR, "Round: %d", _roundNumber);
+	screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 35), PLAYER_COLOR, "Turn Total: %d", _roundScore);
+	screen.slamRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, SHERLOCK_SCREEN_WIDTH, STATUS_INFO_Y + 48));
+}
+
+/**
+ * Throws a single dart.
+ * @param dartNum	Dart number
+ * @param computer	0 = Player, 1 = 1st player computer, 2 = 2nd player computer
+ * @returns			Score for what dart hit
+ */
+int Darts::throwDart(int dartNum, int computer) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	Common::Point targetNum;
+	int width, height;
+
+	events.clearKeyboard();
+	
+	erasePowerBars();
+	screen.print(Common::Point(DART_INFO_X, DART_INFO_Y), DART_COL_FORE, "Dart # %d", dartNum);
+
+	if (!computer) {
+		screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 10), DART_COL_FORE, "Hit a key");
+		screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 18), DART_COL_FORE, "to start");
+	}
+
+	if (!computer) {
+		while (!_vm->shouldQuit() && !dartHit())
+			;
+	} else {
+		events.delay(10);
+	}
+
+	screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(DART_INFO_X, DART_INFO_Y - 1),
+		Common::Rect(DART_INFO_X, DART_INFO_Y - 1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	screen.slamRect(Common::Rect(DART_INFO_X, DART_INFO_Y - 1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+	// If it's a computer player, choose a dart destination
+	if (computer)
+		targetNum = getComputerDartDest(computer - 1);
+	
+	width = doPowerBar(Common::Point(DARTBARHX, DARTHORIZY), DART_BAR_FORE, targetNum.x, 0);
+	height = 101 - doPowerBar(Common::Point(DARTBARVX, DARTHEIGHTY), DART_BAR_FORE, targetNum.y, 0);
+	
+	// For human players, slight y adjustment
+	if (computer == 0)
+		height = 2;
+
+	// Copy the bars to the secondary back buffer
+	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(DARTBARHX - 1, DARTHORIZY - 1),
+		Common::Rect(DARTBARHX - 1, DARTHORIZY - 1, DARTBARHX + DARTBARSIZE + 3, DARTHORIZY + 10));
+	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(DARTBARVX - 1, DARTHEIGHTY - 1),
+		Common::Rect(DARTBARVX - 1, DARTHEIGHTY - 1, DARTBARVX + 11, DARTHEIGHTY + DARTBARSIZE + 3));
+
+	// Convert to relative range from -49 to 150
+	height -= 50;
+	width -= 50;
+
+	Common::Point dartPos(111 + width * 2, 99 + height * 2);
+	drawDartThrow(dartPos);
+
+	return dartScore(dartPos);
+}
+
+/**
+ * Draw a dart moving towards the board
+ */
+void Darts::drawDartThrow(const Common::Point &pt) {
+	// TODO
+}
+
+/**
+ * Erases the power bars
+ */
+void Darts::erasePowerBars() {
+	Screen &screen = *_vm->_screen;
+
+	screen._backBuffer1.fillRect(Common::Rect(DARTBARHX, DARTHORIZY, DARTBARHX + DARTBARSIZE, DARTHORIZY + 10), 0);
+	screen._backBuffer1.fillRect(Common::Rect(DARTBARVX, DARTHEIGHTY, DARTBARVX + 10, DARTHEIGHTY + DARTBARSIZE), 0);
+	screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(DARTBARHX - 1, DARTHORIZY - 1));
+	screen._backBuffer1.transBlitFrom((*_dartImages)[4], Common::Point(DARTBARVX - 1, DARTHEIGHTY - 1));
+	screen.slamArea(DARTBARHX - 1, DARTHORIZY - 1, DARTBARSIZE + 3, 11);
+	screen.slamArea(DARTBARVX - 1, DARTHEIGHTY - 1, 11, DARTBARSIZE + 3);
+}
+
+/**
+ * Show a gradually incrementing incrementing power that bar. If goToPower is provided, it will
+ * increment to that power level ignoring all keyboard input (ie. for computer throws).
+ * Otherwise, it will increment until either a key/mouse button is pressed, or it reaches the end
+ */
+int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, int orientation) {
+	// TODO
+	return 0;
+}
+
+/**
+ * Returns true if a mouse button or key is pressed.
+ */
+bool Darts::dartHit() {
+	Events &events = *_vm->_events;
+
+	if (events.kbHit()) {
+		events.clearKeyboard();
+		return true;
+	}
+	
+	events.setButtonState();
+	return events._pressed && !_oldDartButtons;
+}
+
+/**
+ * Return the score of the given location on the dart-board
+ */
+int Darts::dartScore(const Common::Point &pt) {
+	// TODO
+	return 0;
+}
+
+/**
+ * Calculates where a computer player is trying to throw their dart, and choose the actual 
+ * point that was hit with some margin of error
+ */
+Common::Point Darts::getComputerDartDest(int playerNum) {
+	Common::Point target;
+	int aim;
+	int score = playerNum == 0 ? _dartScore1 : _dartScore2;
+
+	if (score > 50) {
+		// Aim for the bullseye
+		target.x = target.y = 76;
+
+		if (_level <= 1 &&  _vm->getRandomNumber(1) == 1) {
+			// Introduce margin of error
+			target.x += _vm->getRandomNumber(21) - 10;
+			target.y += _vm->getRandomNumber(21) - 10;
+		}
+	} else {
+		aim = score;
+
+		bool done;
+		Common::Point pt;
+		do {
+			done = findNumberOnBoard(aim, pt);
+			--aim;
+		} while (!done);
+
+		target.x = 75 + ((target.x - 75) * 20 / 27);
+		target.y = 75 + ((target.y - 75) * 2 / 3);
+	}
+
+	// Pick a level of accuracy. The higher the level, the more accurate their throw will be
+	int accuracy = _vm->getRandomNumber(10) + _level * 2;
+
+	if (accuracy <= 2) {
+		target.x += _vm->getRandomNumber(71) - 35;
+		target.y += _vm->getRandomNumber(71) - 35;
+	} else if (accuracy <= 4) {
+		target.x += _vm->getRandomNumber(51) - 25;
+		target.y += _vm->getRandomNumber(51) - 25;
+	} else if (accuracy <= 6) {
+		target.x += _vm->getRandomNumber(31) - 15;
+		target.y += _vm->getRandomNumber(31) - 15;
+	} else if (accuracy <= 8) {
+		target.x += _vm->getRandomNumber(21) - 10;
+		target.y += _vm->getRandomNumber(21) - 10;
+	} else if (accuracy <= 10) {
+		target.x += _vm->getRandomNumber(11) - 5;
+		target.y += _vm->getRandomNumber(11) - 5;
+	}
+
+	if (target.x < 1)
+		target.x = 1;
+	if (target.y < 1)
+		target.y = 1;
+
+	return target;
+}
+
+/**
+ * Returns the center position for the area of the dartboard with a given number
+ */
+bool Darts::findNumberOnBoard(int aim, Common::Point &pt) {
+	ImageFrame &board = (*_dartImages)[2];
+
+	// Scan board image for the special "center" pixels
+	bool done = false;
+	for (int yp = 0; yp < 132 && !done; ++yp) {
+		const byte *srcP = (const byte *)board._frame.getBasePtr(0, yp);
+		for (int xp = 0; xp < 147 && !done; ++xp, ++srcP) {
+			int score = *srcP;
+
+			// Check for match
+			if (score == aim) {
+				done = true;
+
+				// Aim at non-double/triple numbers where possible
+				if (aim < 21) {
+					pt.x = xp + 5;
+					pt.y = yp + 5;
+
+					score = *(const byte *)board._frame.getBasePtr(xp + 10, yp + 10);
+					if (score != aim)
+						// Not aiming at non-double/triple number yet
+						done = false;
+				} else {
+					// Aiming at a double or triple
+					pt.x = xp + 3;
+					pt.y = yp + 3;
+				}
+			}
+		}
+	}
+
+	if (aim == 3)
+		pt.x += 15;
+	pt.y = 132 - pt.y;
+
+	return done;
+}
+
+
 } // End of namespace Scalpel
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
index 22164156c9..2fbdc3d7e2 100644
--- a/engines/sherlock/scalpel/darts.h
+++ b/engines/sherlock/scalpel/darts.h
@@ -23,6 +23,8 @@
 #ifndef SHERLOCK_DARTS_H
 #define SHERLOCK_DARTS_H
 
+#include "sherlock/resources.h"
+
 namespace Sherlock {
 
 namespace Scalpel {
@@ -32,8 +34,37 @@ class ScalpelEngine;
 class Darts {
 private:
 	ScalpelEngine *_vm;
+	ImageFile *_dartImages;
+	int _dartScore1, _dartScore2;
+	int _roundNumber;
+	int _level;
+	int _computerPlayer;
+	Common::String _opponent;
+	bool _playerDartMode;
+	int _roundScore;
+	int _oldDartButtons;
+
+	void loadDarts();
+	void initDarts();
+
+	void showNames(int playerNum);
+	void showStatus(int playerNum);
+
+	int throwDart(int dartNum, int computer);
+	void drawDartThrow(const Common::Point &pt);
+
+	void erasePowerBars();
+	int doPowerBar(const Common::Point &pt, byte color, int goToPower, int orientation);
+
+	bool dartHit();
+	int dartScore(const Common::Point &pt);
+
+	Common::Point getComputerDartDest(int playerNum);
+
+	bool findNumberOnBoard(int aim, Common::Point &pt);
+
 public:
-	Darts(ScalpelEngine *vm) : _vm(vm) {}
+	Darts(ScalpelEngine *vm);
 
 	void playDarts();
 };
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0742d05366..eba6626c53 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -39,6 +39,12 @@ const int MAP_Y[NUM_PLACES] = {
 	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0 
 };
 
+int MAP_TRANSLATE[NUM_PLACES] = { 
+	0, 0, 0, 1, 0, 2, 0, 3, 4, 0, 4, 6, 0, 0, 0, 8, 9, 10, 11, 0, 12, 13, 14, 7,
+	15, 16, 17, 18, 19, 0, 20, 21, 22, 23, 0, 24, 0, 25, 0, 26, 0, 0, 0, 27,
+	28, 0, 29, 0, 0, 30, 0 
+};
+
 #define MAX_PEOPLE 66
 
 const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
@@ -204,7 +210,7 @@ void ScalpelEngine::initialize() {
 	_flags[39] = true;		// Turn on Baker Street
 
 	// Load the map co-ordinates for each scene
-	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0]);
+	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
 
 	// Load the inventory
 	loadInventory();
-- 
cgit v1.2.3


From 0aa512da126b08c4bef5035d85db0ee68bc23b43 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 20 Apr 2015 12:10:47 -0500
Subject: MAEMO: Fix compilation.

Related to 71cc9e41e8e61e560ed5cb8e1fe1d0c539f001be
---
 backends/graphics/maemosdl/maemosdl-graphics.cpp | 2 --
 backends/platform/maemo/maemo.cpp                | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/backends/graphics/maemosdl/maemosdl-graphics.cpp b/backends/graphics/maemosdl/maemosdl-graphics.cpp
index 478d022aa0..d954333537 100644
--- a/backends/graphics/maemosdl/maemosdl-graphics.cpp
+++ b/backends/graphics/maemosdl/maemosdl-graphics.cpp
@@ -21,8 +21,6 @@
  */
 #if defined(MAEMO)
 
-#include "SDL_syswm.h"
-
 #include "common/scummsys.h"
 
 #include "backends/platform/maemo/maemo.h"
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 5e1ecfe335..5fdcddac43 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -35,10 +35,6 @@
 #include "common/textconsole.h"
 #include "common/translation.h"
 
-
-#include <SDL/SDL_syswm.h>
-#include <X11/Xutil.h>
-
 namespace Maemo {
 
 OSystem_SDL_Maemo::OSystem_SDL_Maemo()
-- 
cgit v1.2.3


From 6a1b12b797c51bdc51c71db67e2df4e8de6281e0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 20 Apr 2015 23:47:34 +0200
Subject: SHERLOCK: Add some more code for the intro

---
 engines/sherlock/scalpel/scalpel.cpp | 92 ++++++++++++++++++++++++++++++++----
 engines/sherlock/scalpel/scalpel.h   |  1 +
 engines/sherlock/sound.cpp           |  3 +-
 engines/sherlock/sound.h             |  2 +-
 4 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index eba6626c53..4e49a6b4d3 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -249,8 +249,8 @@ bool ScalpelEngine::showCityCutscene() {
 
 	if (finished) {
 		ImageFile titleImages("title2.vgs", true);
-		_screen->_backBuffer1.blitFrom(*_screen);
-		_screen->_backBuffer2.blitFrom(*_screen);
+		_screen->_backBuffer1.copyFrom(*_screen);
+		_screen->_backBuffer2.copyFrom(*_screen);
 
 		// London, England
 		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(10, 11));
@@ -274,8 +274,8 @@ bool ScalpelEngine::showCityCutscene() {
 
 	if (finished) {
 		ImageFile titleImages("title.vgs", true);
-		_screen->_backBuffer1.blitFrom(*_screen);
-		_screen->_backBuffer2.blitFrom(*_screen);
+		_screen->_backBuffer1.copyFrom(*_screen);
+		_screen->_backBuffer2.copyFrom(*_screen);
 		
 		// The Lost Files of
 		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(75, 6));
@@ -320,7 +320,7 @@ bool ScalpelEngine::showAlleyCutscene() {
 
 	bool finished = _animation->playPrologue("27PRO1", 1, 3, true, 2);
 	if (finished)
-		_animation->playPrologue("27PRO2", 1, 0, false, 2);
+		finished = _animation->playPrologue("27PRO2", 1, 0, false, 2);
 
 	if (finished) {
 		ImageFile screamImages("SCREAM.LBV", false);
@@ -330,7 +330,7 @@ bool ScalpelEngine::showAlleyCutscene() {
 	}
 
 	if (finished)
-		_animation->playPrologue("27PRO3", 1, 0, true, 2);
+		finished = _animation->playPrologue("27PRO3", 1, 0, true, 2);
 
 	if(finished) {
 		_screen->getPalette(palette);
@@ -351,13 +351,87 @@ bool ScalpelEngine::showAlleyCutscene() {
 }
 
 bool ScalpelEngine::showStreetCutscene() {
-	// TODO
+	_titleOverride = "TITLE.LIB";
+	_soundOverride = "TITLE.SND";
+
+	_sound->playMusic("PROLOG3.MUS");
+
+	bool finished = _animation->playPrologue("14KICK", 1, 3, true, 2);
+
+	if (finished)
+		finished = _animation->playPrologue("14NOTE", 1, 0, false, 2);
+
+	_titleOverride = "";
+	_soundOverride = "";
+	return finished;
+}
+
+bool ScalpelEngine::scrollCredits() {
+	_titleOverride = "TITLE.LIB";
+	ImageFile creditsImages("credits.vgs", true);
+
+	_screen->_backBuffer1.copyFrom(*_screen->_backBuffer);
+
+	for(int i = 0; i < 600 && !_events->kbHit(); i++) {
+		_screen->_backBuffer1.copyFrom(*_screen->_backBuffer);
+		if (i < 200)
+			_screen->transBlitFrom(creditsImages[0], Common::Point(10, -i), false, 0); 
+		if (i > 0 && i < 400)
+			_screen->transBlitFrom(creditsImages[1], Common::Point(10, 200 - i), false, 0);
+		if (i > 200)
+			_screen->transBlitFrom(creditsImages[2], Common::Point(10, 400 - i), false, 0);
+
+		warning("TODO: Use VideoBlockMove");
+//		videoblockmove(SCREEN, BACKBUFFER, 0, 0, 320, 10);
+//		videoblockmove(SCREEN, BACKBUFFER, 0, 190, 320, 10);
+
+		_events->delay(100);
+	}
+
+	_titleOverride = "";
 	return true;
 }
 
 bool ScalpelEngine::showOfficeCutscene() {
-	// TODO
-	return true;
+	_sound->playMusic("PROLOG4.MUS");
+	_titleOverride = "TITLE2.LIB";
+	_soundOverride = "TITLE.SND";
+
+	bool finished = _animation->playPrologue("COFF1", 1, 3, true, 3);
+	if (finished)
+		finished = _animation->playPrologue("COFF2", 1, 0, false, 3);
+	if (finished) {
+		warning("TODO: ShowLBV(""NOTE.LBV"");");
+		if (_sound->_voices) {
+			finished = _sound->playSound("NOTE1", WAIT_KBD_OR_FINISH);
+			if (finished)
+				finished = _sound->playSound("NOTE2", WAIT_KBD_OR_FINISH);
+			if (finished)
+				finished = _sound->playSound("NOTE3", WAIT_KBD_OR_FINISH);
+			if (finished)
+				finished = _sound->playSound("NOTE4", WAIT_KBD_OR_FINISH);
+		} else
+			finished = _events->delay(19000);
+
+		_events->clearEvents();
+		finished = _events->delay(500);
+	}
+
+	if (finished)
+		finished = _animation->playPrologue("COFF3", 1, 0, true, 3);
+
+	if (finished)
+		finished = _animation->playPrologue("COFF4", 1, 0, false, 3);
+
+	if (finished)
+		finished = scrollCredits();
+
+	if (finished)
+		_screen->fadeToBlack(3);
+
+	_titleOverride = "";
+	_soundOverride = "";
+	return finished;
 }
 
 void ScalpelEngine::loadInventory() {
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index aa00acab84..194bf5413e 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -39,6 +39,7 @@ private:
 	bool showAlleyCutscene();
 	bool showStreetCutscene();
 	bool showOfficeCutscene();
+	bool scrollCredits();
 
 	void loadInventory();
 protected:
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index c3e50a8be2..600618b570 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -41,8 +41,9 @@ void Sound::loadSound(const Common::String &name, int priority) {
 	// TODO
 }
 
-void Sound::playSound(const Common::String &name, WaitType waitType) {
+bool Sound::playSound(const Common::String &name, WaitType waitType) {
 	// TODO
+	return true;
 }
 
 void Sound::cacheSound(const Common::String &name, int index) {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 22d5a5c221..6adc22c01c 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -52,7 +52,7 @@ public:
 	Sound(SherlockEngine *vm);
 
 	void loadSound(const Common::String &name, int priority);
-	void playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
+	bool playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
 	void cacheSound(const Common::String &name, int index);
 	void playLoadedSound(int bufNum, int waitMode);
 	void playCachedSound(int index);
-- 
cgit v1.2.3


From 7e1e0ed3ac7ca8b3233503476162c1ca1e79e0a8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 21 Apr 2015 01:12:16 -0500
Subject: SHERLOCK: More darts game logic

---
 engines/sherlock/scalpel/darts.cpp | 203 ++++++++++++++++++++++++++++++++++---
 engines/sherlock/scalpel/darts.h   |   6 +-
 engines/sherlock/sound.cpp         |   3 +
 engines/sherlock/sound.h           |   1 +
 4 files changed, 197 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index c975cb1086..c3f2c478d7 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -67,6 +67,7 @@ Darts::Darts(ScalpelEngine *vm) : _vm(vm) {
  * Main method for playing darts game
  */
 void Darts::playDarts() {
+	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	int score, roundStartScore;
 	int playerNumber = 0;
@@ -79,6 +80,7 @@ void Darts::playDarts() {
 	loadDarts();
 	initDarts();
 
+	bool done = false;
 	do {
 		roundStartScore = score = playerNumber == 0 ? _dartScore1 : _dartScore2;
 		
@@ -99,13 +101,81 @@ void Darts::playDarts() {
 			score -= lastDart;
 			_roundScore += lastDart;
 
+			screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(DART_INFO_X, DART_INFO_Y - 1),
+				Common::Rect(DART_INFO_X, DART_INFO_Y - 1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+			screen.print(Common::Point(DART_INFO_X, DART_INFO_Y), DART_COL_FORE, "Dart # %d", idx + 1);
+			screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 10), DART_COL_FORE, "Scored %d points", lastDart);
+
+			if (score != 0 && playerNumber == 0)
+				screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 30), DART_COL_FORE, "Press a key");
+
+			if (score == 0) {
+				// Some-one has won
+				screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 20), PLAYER_COLOR, "GAME OVER!");
+
+				if (playerNumber == 0) {
+					screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 30), PLAYER_COLOR, "Holmes Wins!");
+					if (_level < 4)
+						setFlagsForDarts(318 + _level);
+				} else {
+					screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 30), PLAYER_COLOR, "%s Wins!", _opponent.c_str());
+				}
+
+				screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 4), DART_COL_FORE, "Press a key");
+
+				idx = 10;
+				done = true;
+			} else if (score < 0) {
+				screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 20), PLAYER_COLOR, "BUSTED!");
+
+				idx = 10;
+				score = roundStartScore;
+			}
+
+			if (playerNumber == 0)
+				_dartScore1 = score;
+			else
+				_dartScore2 = score;
+
+			showStatus(playerNumber);
+			events.clearKeyboard();
 
+			if ((playerNumber == 0 && _computerPlayer == 1) || _computerPlayer == 0 || done) {
+				int dartKey;
+				while (!(dartKey = dartHit()) && !_vm->shouldQuit())
+					events.delay(10);
+
+				if (dartKey == Common::KEYCODE_ESCAPE) {
+					idx = 10;
+					done = true;
+				}
+			} else {
+				events.wait(20);
+			}
+
+			screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(DART_INFO_X, DART_INFO_Y - 1),
+				Common::Rect(DART_INFO_X, DART_INFO_Y - 1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+			screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 		}
 
-		// todo
-	} while (!_vm->shouldQuit());
+		playerNumber ^= 1;
+		if (!playerNumber)
+			++_roundNumber;
+
+		done |= _vm->shouldQuit();
 
-	// TODO
+		if (!done) {
+			screen._backBuffer2.blitFrom((*_dartImages)[1], Common::Point(0, 0));
+			screen._backBuffer1.blitFrom(screen._backBuffer2);
+			screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+		}
+	} while (!done);
+
+	closeDarts();
+	screen.fadeToBlack();
+
+	// Restore font
+	screen.setFont(oldFont);
 }
 
 /**
@@ -144,6 +214,14 @@ void Darts::initDarts() {
 	_opponent = OPPONENT_NAMES[_level];
 }
 
+/**
+ * Frees the images used by the dart game
+ */
+void Darts::closeDarts() {
+	delete _dartImages;
+	_dartImages = nullptr;
+}
+
 /**
  * Show the player names
  */
@@ -236,8 +314,8 @@ int Darts::throwDart(int dartNum, int computer) {
 	if (computer)
 		targetNum = getComputerDartDest(computer - 1);
 	
-	width = doPowerBar(Common::Point(DARTBARHX, DARTHORIZY), DART_BAR_FORE, targetNum.x, 0);
-	height = 101 - doPowerBar(Common::Point(DARTBARVX, DARTHEIGHTY), DART_BAR_FORE, targetNum.y, 0);
+	width = doPowerBar(Common::Point(DARTBARHX, DARTHORIZY), DART_BAR_FORE, targetNum.x, false);
+	height = 101 - doPowerBar(Common::Point(DARTBARVX, DARTHEIGHTY), DART_BAR_FORE, targetNum.y, true);
 	
 	// For human players, slight y adjustment
 	if (computer == 0)
@@ -263,7 +341,43 @@ int Darts::throwDart(int dartNum, int computer) {
  * Draw a dart moving towards the board
  */
 void Darts::drawDartThrow(const Common::Point &pt) {
-	// TODO
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	Common::Point pos(pt.x, pt.y + 2);
+	Common::Rect oldDrawBounds;
+	int delta = 9;
+
+	for (int idx = 5; idx < 24; ++idx) {
+		Graphics::Surface &frame = (*_dartImages)[idx]._frame;
+
+		// Adjust draw position for animating dart
+		if (idx < 14)
+			pos.y -= delta--;
+		else if (idx == 14)
+			delta = 1;
+		else
+			pos.y += delta++;
+
+		// Draw the dart
+		Common::Point drawPos(pos.x - frame.w / 2, pos.y - frame.h);
+		screen._backBuffer1.transBlitFrom(frame, drawPos);
+		screen.slamArea(drawPos.x, drawPos.y, frame.w, frame.h);
+
+		// Handle erasing old dart
+		if (!oldDrawBounds.isEmpty())
+			screen.slamRect(oldDrawBounds);
+
+		oldDrawBounds = Common::Rect(drawPos.x, drawPos.y, drawPos.x + frame.w, drawPos.y + frame.h);
+		if (idx != 23)
+			screen._backBuffer1.blitFrom(screen._backBuffer2, drawPos, oldDrawBounds);
+
+		events.wait(2);
+	}
+
+	// Draw dart in final "stuck to board" form
+	screen._backBuffer1.transBlitFrom((*_dartImages)[23], Common::Point(oldDrawBounds.left, oldDrawBounds.top));
+	screen._backBuffer2.transBlitFrom((*_dartImages)[23], Common::Point(oldDrawBounds.left, oldDrawBounds.top));
+	screen.slamRect(oldDrawBounds);
 }
 
 /**
@@ -285,32 +399,86 @@ void Darts::erasePowerBars() {
  * increment to that power level ignoring all keyboard input (ie. for computer throws).
  * Otherwise, it will increment until either a key/mouse button is pressed, or it reaches the end
  */
-int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, int orientation) {
-	// TODO
-	return 0;
+int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool isVertical) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	bool done;
+	int idx = 0;
+
+	events.clearEvents();
+	if (sound._musicOn)
+		sound.waitTimerRoland(10);
+	else
+		events.delay(100);
+
+	// Display loop
+	do {
+		done = _vm->shouldQuit() || idx >= DARTBARSIZE;
+
+		if (idx == (goToPower - 1))
+			// Reached target power for a computer player
+			done = true;
+		else if (goToPower == 0) {
+			// Check for pres 
+			if (dartHit())
+				done = true;
+		}
+
+		if (isVertical) {
+			screen._backBuffer1.hLine(pt.x, pt.y + DARTBARSIZE - 1 - idx, pt.x + 8, color);
+			screen._backBuffer1.transBlitFrom((*_dartImages)[4], Common::Point(pt.x - 1, pt.y - 1));
+			screen.slamArea(pt.x, pt.y + DARTBARSIZE - 1 - idx, 8, 2);
+		} else {
+			screen._backBuffer1.vLine(pt.x + idx, pt.y, pt.y + 8, color);
+			screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(pt.x - 1, pt.y - 1));
+			screen.slamArea(pt.x + idx, pt.y, 1, 8);
+		}
+
+		if (sound._musicOn) {
+			if (!(idx % 3))
+				sound.waitTimerRoland(1);
+		} else {
+			if (!(idx % 8))
+				events.wait(1);
+		}
+
+		++idx;
+	} while (!done);
+
+	return MIN(idx * 100 / DARTBARSIZE, 100);
 }
 
 /**
  * Returns true if a mouse button or key is pressed.
  */
-bool Darts::dartHit() {
+int Darts::dartHit() {
 	Events &events = *_vm->_events;
 
 	if (events.kbHit()) {
+		Common::KeyState keyState = events.getKey();
+
 		events.clearKeyboard();
-		return true;
+		return keyState.keycode;
 	}
 	
 	events.setButtonState();
-	return events._pressed && !_oldDartButtons;
+	return events._pressed && !_oldDartButtons ? 1 : 0;
 }
 
 /**
  * Return the score of the given location on the dart-board
  */
 int Darts::dartScore(const Common::Point &pt) {
-	// TODO
-	return 0;
+	Common::Point pos(pt.x - 37, pt.y - 33);
+
+	if (pos.x < 0 || pos.y < 0 || pos.x >= 147 || pt.y >= 132)
+		// Not on the board
+		return 0;
+
+	// On board, so get the score from the pixel at that position
+	int score = *(const byte *)(*_dartImages)[2]._frame.getBasePtr(pos.x, pos.y);
+	return score;
 }
 
 /**
@@ -415,6 +583,13 @@ bool Darts::findNumberOnBoard(int aim, Common::Point &pt) {
 	return done;
 }
 
+/**
+ * Set a global flag to 0 or 1 depending on whether the passed flag is negative or positive.
+ * @remarks		We don't use the global setFlags method because we don't want to check scene flags
+ */
+void Darts::setFlagsForDarts(int flagNum) {
+	_vm->_flags[ABS(flagNum)] = flagNum >= 0;
+}
 
 } // End of namespace Scalpel
 
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
index 2fbdc3d7e2..a6c8cdba6d 100644
--- a/engines/sherlock/scalpel/darts.h
+++ b/engines/sherlock/scalpel/darts.h
@@ -46,6 +46,7 @@ private:
 
 	void loadDarts();
 	void initDarts();
+	void closeDarts();
 
 	void showNames(int playerNum);
 	void showStatus(int playerNum);
@@ -54,15 +55,16 @@ private:
 	void drawDartThrow(const Common::Point &pt);
 
 	void erasePowerBars();
-	int doPowerBar(const Common::Point &pt, byte color, int goToPower, int orientation);
+	int doPowerBar(const Common::Point &pt, byte color, int goToPower, bool isVertical);
 
-	bool dartHit();
+	int dartHit();
 	int dartScore(const Common::Point &pt);
 
 	Common::Point getComputerDartDest(int playerNum);
 
 	bool findNumberOnBoard(int aim, Common::Point &pt);
 
+	void setFlagsForDarts(int flagNum);
 public:
 	Darts(ScalpelEngine *vm);
 
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 600618b570..1a6472a9e9 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -95,5 +95,8 @@ void Sound::stopSndFuncPtr(int v1, int v2) {
 	// TODO
 }
 
+void Sound::waitTimerRoland(uint time) {
+	// TODO
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 6adc22c01c..28de692109 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -66,6 +66,7 @@ public:
 	void playMusic(const Common::String &name);
 	void stopMusic();
 	void stopSndFuncPtr(int v1, int v2);
+	void waitTimerRoland(uint time);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 6d2bde38ec883f00b9e4254f869e6349b21e0d28 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 21 Apr 2015 01:26:47 -0500
Subject: SHERLOCK: Fix display of cursor

---
 engines/sherlock/events.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 79fe1b58d4..1a827eda3b 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -76,6 +76,7 @@ void Events::setCursor(CursorId cursorId) {
  */
 void Events::setCursor(const Graphics::Surface &src) {
 	CursorMan.replaceCursor(src.getPixels(), src.w, src.h, 0, 0, 0xff);
+	showCursor();
 }
 
 /**
-- 
cgit v1.2.3


From a81686b0e1108fc5e9cac79e8e5890ad8c0f8c23 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 21 Apr 2015 02:06:24 -0500
Subject: SHERLOCK: Fix Setup dialog button handling

---
 engines/sherlock/sherlock.h         |  1 -
 engines/sherlock/user_interface.cpp | 18 +++++++++++-------
 engines/sherlock/user_interface.h   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 42e2cf8b38..67c7a2864d 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -105,7 +105,6 @@ public:
 	Common::Point _over;				// Old map position
 	bool _onChessboard;
 	bool _slowChess;
-	bool _joystick;
 	int _keyPadSpeed;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 43ae76f94b..3ab705e26c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -146,7 +146,8 @@ void Settings::drawInteface(bool flag) {
 		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
 	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), 
 		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
-	tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick ? 1 : 0]);
+
+	tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]);
 	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), 
 		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
 	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), 
@@ -221,7 +222,7 @@ int Settings::drawButtons(const Common::Point &pt, int key) {
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 6: 
-			tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick]);
+			tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 8: 
@@ -1793,16 +1794,19 @@ void UserInterface::doControls() {
 
 		if ((found == 5 && events._released) || _key == 'N') {
 			// New font style
-			screen.setFont((screen.fontNumber() + 1) & 3);
-		}
+			int fontNum = screen.fontNumber() + 1;
+			if (fontNum == 3)
+				fontNum = 0;
 
-		if ((found == 6 && events._released) || _key == 'J') {
-			// Toggle joystick
-			_vm->_joystick = !_vm->_joystick;
+			screen.setFont(fontNum);
 			updateConfig = true;
 			settings.drawInteface(true);
 		}
 
+		if ((found == 6 && events._released) || _key == 'J') {
+			// Toggle joystick - not implemented under ScummVM
+		}
+
 		if ((found == 7 && events._released) || _key == 'C') {
 			// Calibrate joystick - No implementation in ScummVM
 		}
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 23aca4e536..211287c372 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -67,7 +67,7 @@ class Settings {
 private:
 	SherlockEngine *_vm;
 public:
-	Settings(SherlockEngine *vm) : _vm() {}
+	Settings(SherlockEngine *vm) : _vm(vm) {}
 
 	void drawInteface(bool flag);
 
-- 
cgit v1.2.3


From 6fe65dc719f69c3a3cd3a90426e148972716037f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 21 Apr 2015 03:48:21 -0500
Subject: SHERLOCK: Beginnins of SaveManager class

---
 engines/sherlock/detection.cpp |   8 +-
 engines/sherlock/module.mk     |   1 +
 engines/sherlock/saveload.cpp  | 183 +++++++++++++++++++++++++++++++++++++++++
 engines/sherlock/saveload.h    |  74 +++++++++++++++++
 4 files changed, 261 insertions(+), 5 deletions(-)
 create mode 100644 engines/sherlock/saveload.cpp
 create mode 100644 engines/sherlock/saveload.h

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index f207bb69d9..7d9db96e77 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -21,14 +21,13 @@
  */
 
 #include "sherlock/sherlock.h"
+#include "sherlock/saveload.h"
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/tattoo/tattoo.h"
 #include "engines/advancedDetector.h"
 
 namespace Sherlock {
 
-#define MAX_SAVES 99
-
 struct SherlockGameDescription {
 	ADGameDescription desc;
 
@@ -102,12 +101,11 @@ bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
 }
 
 SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
-	SaveStateList saveList;
-	return saveList;
+	return Sherlock::SaveManager(nullptr, "").getSavegameList(target);
 }
 
 int SherlockMetaEngine::getMaximumSaveSlot() const {
-	return MAX_SAVES;
+	return NUM_SAVEGAME_SLOTS;
 }
 
 void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 171f704a1e..44ba63f1e2 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -16,6 +16,7 @@ MODULE_OBJS = \
 	objects.o \
 	people.o \
 	resources.o \
+	saveload.o \
 	scene.o \
 	screen.o \
 	sherlock.o \
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
new file mode 100644
index 0000000000..54995e056a
--- /dev/null
+++ b/engines/sherlock/saveload.cpp
@@ -0,0 +1,183 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/saveload.h"
+#include "sherlock/graphics.h"
+#include "sherlock/sherlock.h"
+#include "common/system.h"
+#include "graphics/scaler.h"
+#include "graphics/thumbnail.h"
+
+namespace Sherlock {
+
+SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) : 
+		_vm(vm), _target(target) {
+	_saveThumb = nullptr;
+}
+
+SaveManager::~SaveManager() {
+	if (_saveThumb) {
+		_saveThumb->free();
+		delete _saveThumb;
+	}
+}
+
+/**
+ * Shows the in-game dialog interface for loading and saving games
+ */
+void SaveManager::show() {
+	createSavegameList();
+
+	// TODO
+}
+
+/**
+ * Build up a savegame list, with empty slots given an explicit Empty message
+ */
+void SaveManager::createSavegameList() {
+	_savegames.clear();
+	for (int idx = 0; idx < NUM_SAVEGAME_SLOTS; ++idx)
+		_savegames.push_back("-EMPTY");
+
+	SaveStateList saveList = getSavegameList(_target);
+	for (uint idx = 0; idx < saveList.size(); ++idx)
+		_savegames[saveList[idx].getSaveSlot()] = saveList[idx].getDescription();
+}
+
+/**
+ * Load a list of savegames
+ */
+SaveStateList SaveManager::getSavegameList(const Common::String &target) {
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::StringArray filenames;
+	Common::String saveDesc;
+	Common::String pattern = Common::String::format("%s.0??", target.c_str());
+	SherlockSavegameHeader header;
+
+	filenames = saveFileMan->listSavefiles(pattern);
+	sort(filenames.begin(), filenames.end());   // Sort to get the files in numerical order
+
+	SaveStateList saveList;
+	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+		const char *ext = strrchr(file->c_str(), '.');
+		int slot = ext ? atoi(ext + 1) : -1;
+
+		if (slot >= 0 && slot < NUM_SAVEGAME_SLOTS) {
+			Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file);
+
+			if (in) {
+				readSavegameHeader(in, header);
+				saveList.push_back(SaveStateDescriptor(slot, header._saveName));
+
+				header._thumbnail->free();
+				delete header._thumbnail;
+				delete in;
+			}
+		}
+	}
+
+	return saveList;
+}
+
+const char *const SAVEGAME_STR = "SHLK";
+#define SAVEGAME_STR_SIZE 4
+
+bool SaveManager::readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header) {
+	char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
+	header._thumbnail = nullptr;
+
+	// Validate the header Id
+	in->read(saveIdentBuffer, SAVEGAME_STR_SIZE + 1);
+	if (strncmp(saveIdentBuffer, SAVEGAME_STR, SAVEGAME_STR_SIZE))
+		return false;
+
+	header._version = in->readByte();
+	if (header._version > SHERLOCK_SAVEGAME_VERSION)
+		return false;
+
+	// Read in the string
+	header._saveName.clear();
+	char ch;
+	while ((ch = (char)in->readByte()) != '\0') header._saveName += ch;
+
+	// Get the thumbnail
+	header._thumbnail = Graphics::loadThumbnail(*in);
+	if (!header._thumbnail)
+		return false;
+
+	// Read in save date/time
+	header._year = in->readSint16LE();
+	header._month = in->readSint16LE();
+	header._day = in->readSint16LE();
+	header._hour = in->readSint16LE();
+	header._minute = in->readSint16LE();
+	header._totalFrames = in->readUint32LE();
+
+	return true;
+}
+
+void SaveManager::writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegameHeader &header) {
+	// Write out a savegame header
+	out->write(SAVEGAME_STR, SAVEGAME_STR_SIZE + 1);
+
+	out->writeByte(SHERLOCK_SAVEGAME_VERSION);
+
+	// Write savegame name
+	out->write(header._saveName.c_str(), header._saveName.size());
+	out->writeByte('\0');
+
+	// Handle the thumbnail. If there's already one set by the game, create one
+	if (!_saveThumb)
+		createThumbnail();
+	Graphics::saveThumbnail(*out, *_saveThumb);
+
+	_saveThumb->free();
+	delete _saveThumb;
+	_saveThumb = nullptr;
+
+	// Write out the save date/time
+	TimeDate td;
+	g_system->getTimeAndDate(td);
+	out->writeSint16LE(td.tm_year + 1900);
+	out->writeSint16LE(td.tm_mon + 1);
+	out->writeSint16LE(td.tm_mday);
+	out->writeSint16LE(td.tm_hour);
+	out->writeSint16LE(td.tm_min);
+	out->writeUint32LE(_vm->_events->getFrameCounter());
+}
+
+/**
+ * Creates a thumbnail for the current on-screen contents
+ */
+void SaveManager::createThumbnail() {
+	if (_saveThumb) {
+		_saveThumb->free();
+		delete _saveThumb;
+	}
+
+	uint8 thumbPalette[PALETTE_SIZE];
+	_vm->_screen->getPalette(thumbPalette);
+	_saveThumb = new Graphics::Surface();
+	::createThumbnail(_saveThumb, (const byte *)_vm->_screen->getPixels(), SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, thumbPalette);
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
new file mode 100644
index 0000000000..a0f1da4041
--- /dev/null
+++ b/engines/sherlock/saveload.h
@@ -0,0 +1,74 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SAVELOAD_H
+#define SHERLOCK_SAVELOAD_H
+
+#include "common/scummsys.h"
+#include "common/savefile.h"
+#include "common/str-array.h"
+#include "engines/savestate.h"
+#include "graphics/surface.h"
+
+namespace Sherlock {
+
+#define NUM_SAVEGAME_SLOTS 99
+#define SHERLOCK_SAVEGAME_VERSION 1
+
+struct SherlockSavegameHeader {
+	uint8 _version;
+	Common::String _saveName;
+	Graphics::Surface *_thumbnail;
+	int _year, _month, _day;
+	int _hour, _minute;
+	int _totalFrames;
+};
+
+class SherlockEngine;
+
+class SaveManager {
+private:
+	SherlockEngine *_vm;
+	Common::String _target;
+	Common::StringArray _savegames;
+	Graphics::Surface *_saveThumb;
+
+	void createSavegameList();
+public:
+	SaveManager(SherlockEngine *vm, const Common::String &target);
+	~SaveManager();
+
+	void show();
+
+	void createThumbnail();
+
+	static SaveStateList getSavegameList(const Common::String &target);
+
+	void writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegameHeader &header);
+
+	static bool readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header);
+
+};
+
+} // End of namespace Sherlock
+
+#endif
-- 
cgit v1.2.3


From 09014d5b96b625f7691bbda3ded24dfa386863d5 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 21 Apr 2015 14:42:55 +0200
Subject: SCI: fix bug in new workaround sig code

---
 engines/sci/engine/workarounds.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index b33457606e..c5d85b8c5b 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -804,9 +804,9 @@ SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroun
 						&& workaround->methodName == g_sci->getSciLanguageString(curMethodName, K_LANG_ENGLISH)
 						&& ((workaround->index == -1) || (workaround->index == index))) {
 					// Workaround found
-					if ((workaround->localCallSignature) || (curLocalCallOffset != -1)) {
+					if ((workaround->localCallSignature) || (curLocalCallOffset >= 0)) {
 						// local call signature found and/or subcall was made
-						if ((workaround->localCallSignature) && (lastCall->debugLocalCallOffset)) {
+						if ((workaround->localCallSignature) && (curLocalCallOffset >= 0)) {
 							// local call signature found and subcall was made -> check signature accordingly
 							if (!curScriptPtr) {
 								// get script data
-- 
cgit v1.2.3


From cfcaba92841d17a265e028d95ff61b289beccbca Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 21 Apr 2015 14:55:05 +0200
Subject: SCI: kDoBresen adjustments for SCI<=1_EGA, thx wjp

---
 engines/sci/engine/kmovement.cpp | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 51d49eea9f..9b83dbc52d 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -305,12 +305,23 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) {
 		for (uint i = 0; i < clientVarNum; ++i)
 			clientBackup[i] = clientObject->getVariable(i);
 
-		if (mover_xAxis) {
-			if (ABS(mover_x - client_x) < ABS(mover_dx))
-				completed = true;
+		if ((getSciVersion() <= SCI_VERSION_1_EGA_ONLY)) {
+			if (mover_xAxis) {
+				if (ABS(mover_x - client_x) < ABS(mover_dx))
+					completed = true;
+			} else {
+				if (ABS(mover_y - client_y) < ABS(mover_dy))
+					completed = true;
+			}
 		} else {
-			if (ABS(mover_y - client_y) < ABS(mover_dy))
-				completed = true;
+			// SCI1EARLY+ code
+			if (mover_xAxis) {
+				if (ABS(mover_x - client_x) <= ABS(mover_dx))
+					completed = true;
+			} else {
+				if (ABS(mover_y - client_y) <= ABS(mover_dy))
+					completed = true;
+			}
 		}
 		if (completed) {
 			client_x = mover_x;
@@ -336,10 +347,10 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) {
 		bool collision = false;
 		reg_t cantBeHere = NULL_REG;
 
+		// adding this here for hoyle 3 to get happy. CantBeHere is a dummy in hoyle 3 and acc is != 0 so we would
+		//  get a collision otherwise. Resetting the result was always done in SSCI
+		s->r_acc = NULL_REG;
 		if (SELECTOR(cantBeHere) != -1) {
-			// adding this here for hoyle 3 to get happy. CantBeHere is a dummy in hoyle 3 and acc is != 0 so we would
-			//  get a collision otherwise
-			s->r_acc = NULL_REG;
 			invokeSelector(s, client, SELECTOR(cantBeHere), argc, argv);
 			if (!s->r_acc.isNull())
 				collision = true;
-- 
cgit v1.2.3


From 31860163709b12a38856fc017a217eb5e32610a7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 21 Apr 2015 18:25:06 -0500
Subject: SHERLOCK: Implemented save game dialog event handling

---
 engines/sherlock/detection.cpp      |  23 ++-
 engines/sherlock/saveload.cpp       | 185 +++++++++++++++++++-
 engines/sherlock/saveload.h         |  23 ++-
 engines/sherlock/sherlock.cpp       |   3 +
 engines/sherlock/sherlock.h         |   2 +
 engines/sherlock/user_interface.cpp | 325 ++++++++++++++++++++++++++++++++++--
 engines/sherlock/user_interface.h   |   3 +-
 7 files changed, 540 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 7d9db96e77..bb66cee7df 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -24,6 +24,7 @@
 #include "sherlock/saveload.h"
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/tattoo/tattoo.h"
+#include "common/system.h"
 #include "engines/advancedDetector.h"
 
 namespace Sherlock {
@@ -105,13 +106,33 @@ SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
 }
 
 int SherlockMetaEngine::getMaximumSaveSlot() const {
-	return NUM_SAVEGAME_SLOTS;
+	return MAX_SAVEGAME_SLOTS;
 }
 
 void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {
+	Common::String filename = Common::String::format("%s.%03d", target, slot);
+	g_system->getSavefileManager()->removeSavefile(filename);
 }
 
 SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+	Common::String filename = Common::String::format("%s.%03d", target, slot);
+	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(filename);
+
+	if (f) {
+		Sherlock::SherlockSavegameHeader header;
+		Sherlock::SaveManager::readSavegameHeader(f, header);
+		delete f;
+
+		// Create the return descriptor
+		SaveStateDescriptor desc(slot, header._saveName);
+		desc.setThumbnail(header._thumbnail);
+		desc.setSaveDate(header._year, header._month, header._day);
+		desc.setSaveTime(header._hour, header._minute);
+		desc.setPlayTime(header._totalFrames * GAME_FRAME_TIME);
+
+		return desc;
+	}
+
 	return SaveStateDescriptor();
 }
 
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 54995e056a..78c86c836e 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -29,9 +29,21 @@
 
 namespace Sherlock {
 
+const int ENV_POINTS[6][3] = {
+	{ 41, 80, 61 },		// Exit
+	{ 81, 120, 101 },	// Load
+	{ 121, 160, 141 },	// Save
+	{ 161, 200, 181 },	// Up
+	{ 201, 240, 221 },	// Down
+	{ 241, 280, 261 }	// Quit
+};
+
+/*----------------------------------------------------------------*/
+
 SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) : 
 		_vm(vm), _target(target) {
 	_saveThumb = nullptr;
+	_envMode = SAVEMODE_NONE;
 }
 
 SaveManager::~SaveManager() {
@@ -44,23 +56,80 @@ SaveManager::~SaveManager() {
 /**
  * Shows the in-game dialog interface for loading and saving games
  */
-void SaveManager::show() {
+void SaveManager::drawInterface() {
+	Screen &screen = *_vm->_screen;
+	UserInterface &ui = *_vm->_ui;
+
+	// Create a list of savegame slots
 	createSavegameList();
 
-	// TODO
+	screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
+	screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y + 10, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	screen._backBuffer1.fillRect(Common::Rect(318, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	screen._backBuffer1.fillRect(Common::Rect(0, 199, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+
+	screen.makeButton(Common::Rect(ENV_POINTS[0][0], CONTROLS_Y, ENV_POINTS[0][1], CONTROLS_Y + 10), 
+		ENV_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
+	screen.makeButton(Common::Rect(ENV_POINTS[1][0], CONTROLS_Y, ENV_POINTS[1][1], CONTROLS_Y + 10),
+		ENV_POINTS[1][2] - screen.stringWidth("Load") / 2, "Load");
+	screen.makeButton(Common::Rect(ENV_POINTS[2][0], CONTROLS_Y, ENV_POINTS[2][1], CONTROLS_Y + 10),
+		ENV_POINTS[2][2] - screen.stringWidth("Save") / 2, "Save");
+	screen.makeButton(Common::Rect(ENV_POINTS[3][0], CONTROLS_Y, ENV_POINTS[3][1], CONTROLS_Y + 10),
+		ENV_POINTS[3][2] - screen.stringWidth("Up") / 2, "Up");
+	screen.makeButton(Common::Rect(ENV_POINTS[4][0], CONTROLS_Y, ENV_POINTS[4][1], CONTROLS_Y + 10),
+		ENV_POINTS[4][2] - screen.stringWidth("Down") / 2, "Down");
+	screen.makeButton(Common::Rect(ENV_POINTS[5][0], CONTROLS_Y, ENV_POINTS[5][1], CONTROLS_Y + 10),
+		ENV_POINTS[5][2] - screen.stringWidth("Quit") / 2, "Quit");
+
+	if (!_savegameIndex)
+		screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), COMMAND_NULL, 0, "Up");
+
+	if (_savegameIndex == MAX_SAVEGAME_SLOTS - 5)
+		screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), COMMAND_NULL, 0, "Down");
+
+	for (int idx = _savegameIndex; idx < _savegameIndex + 5; ++idx)
+	{
+		screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
+			INV_FOREGROUND, "%d.", idx + 1);
+		screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
+			INV_FOREGROUND, "%s", _savegames[idx]);
+	}
+
+	if (!ui._windowStyle) {
+		screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	} else {
+		ui.summonWindow();
+	}
+
+	_envMode = SAVEMODE_NONE;
 }
 
 /**
  * Build up a savegame list, with empty slots given an explicit Empty message
  */
 void SaveManager::createSavegameList() {
+	Screen &screen = *_vm->_screen;
+
 	_savegames.clear();
-	for (int idx = 0; idx < NUM_SAVEGAME_SLOTS; ++idx)
+	for (int idx = 0; idx < MAX_SAVEGAME_SLOTS; ++idx)
 		_savegames.push_back("-EMPTY");
 
 	SaveStateList saveList = getSavegameList(_target);
 	for (uint idx = 0; idx < saveList.size(); ++idx)
 		_savegames[saveList[idx].getSaveSlot()] = saveList[idx].getDescription();
+
+	// Ensure the names will fit on the screen
+	for (uint idx = 0; idx < _savegames.size(); ++idx) {
+		int width = screen.stringWidth(_savegames[idx]) + 24;
+		if (width > 308) {
+			// It won't fit in, so remove characters until it does
+			do {
+				width -= screen.charWidth(_savegames[idx].lastChar());
+				_savegames[idx].deleteLastChar();
+			} while (width > 300);
+		}
+	}
 }
 
 /**
@@ -81,7 +150,7 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 		const char *ext = strrchr(file->c_str(), '.');
 		int slot = ext ? atoi(ext + 1) : -1;
 
-		if (slot >= 0 && slot < NUM_SAVEGAME_SLOTS) {
+		if (slot >= 0 && slot < MAX_SAVEGAME_SLOTS) {
 			Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file);
 
 			if (in) {
@@ -101,6 +170,9 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 const char *const SAVEGAME_STR = "SHLK";
 #define SAVEGAME_STR_SIZE 4
 
+/**
+ * Read in the header information for a savegame
+ */
 bool SaveManager::readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header) {
 	char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
 	header._thumbnail = nullptr;
@@ -135,6 +207,9 @@ bool SaveManager::readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHea
 	return true;
 }
 
+/**
+ * Write out the header information for a savegame
+ */
 void SaveManager::writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegameHeader &header) {
 	// Write out a savegame header
 	out->write(SAVEGAME_STR, SAVEGAME_STR_SIZE + 1);
@@ -180,4 +255,106 @@ void SaveManager::createThumbnail() {
 	::createThumbnail(_saveThumb, (const byte *)_vm->_screen->getPixels(), SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, thumbPalette);
 }
 
+/**
+ * Return the index of the button the mouse is over, if any
+ */
+int SaveManager::getHighlightedButton() const {
+	Common::Point pt = _vm->_events->mousePos();
+
+	for (int idx = 0; idx < 6; ++idx) {
+		if (pt.x > ENV_POINTS[idx][0] && pt.x < ENV_POINTS[idx][1] && pt.y > CONTROLS_Y
+				&& pt.y < (CONTROLS_Y + 10))
+			return idx;
+	}
+
+	return -1;
+}
+
+/**
+ * Handle highlighting buttons
+ */
+void SaveManager::highlightButtons(int btnIndex) {
+	Screen &screen = *_vm->_screen;
+	byte color = (btnIndex == 0) ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND;
+
+	screen.buttonPrint(Common::Point(ENV_POINTS[0][2], CONTROLS_Y), color, 1, "Exit");
+
+	if ((btnIndex == 1) || ((_envMode == 1) && (btnIndex != 2)))
+		screen.buttonPrint(Common::Point(ENV_POINTS[1][2], CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Load");
+	else
+		screen.buttonPrint(Common::Point(ENV_POINTS[1][2], CONTROLS_Y), COMMAND_FOREGROUND, true, "Load");
+
+	if ((btnIndex == 2) || ((_envMode == 2) && (btnIndex != 1)))
+		screen.buttonPrint(Common::Point(ENV_POINTS[2][2], CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Save");
+	else
+		screen.buttonPrint(Common::Point(ENV_POINTS[2][2], CONTROLS_Y), COMMAND_FOREGROUND, true, "Save");
+
+	if (btnIndex == 3 && _savegameIndex)
+		screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Up");
+	else
+		if (_savegameIndex)
+			screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), COMMAND_FOREGROUND, true, "Up");
+
+	if ((btnIndex == 4) && (_savegameIndex < MAX_SAVEGAME_SLOTS - 5))
+		screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Down");
+	else if (_savegameIndex < (MAX_SAVEGAME_SLOTS - 5))
+		screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), COMMAND_FOREGROUND, true, "Down");
+
+	color = (btnIndex == 5) ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND;
+	screen.buttonPrint(Common::Point(ENV_POINTS[5][2], CONTROLS_Y), color, 1, "Quit");
+}
+
+/**
+ * Load the game in the specified slot
+ */
+void SaveManager::loadGame(int slot) {
+	// TODO
+}
+
+/**
+ * Save the game in the specified slot with the given name
+ */
+void SaveManager::saveGame(int slot, const Common::String &name) {
+	// TODO
+}
+
+/**
+ * Make sure that the selected savegame is on-screen
+ */
+bool SaveManager::checkGameOnScreen(int slot) {
+	Screen &screen = *_vm->_screen;
+
+	// Check if it's already on-screen
+	if (slot != -1 && (slot < _savegameIndex || slot >= (_savegameIndex + 5))) {
+		_savegameIndex = slot;
+
+		screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+			SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+
+		for (int idx = _savegameIndex; idx < (_savegameIndex + 5); ++idx) {
+			screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
+				INV_FOREGROUND, "%d.", idx + 1);
+			screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
+				INV_FOREGROUND, "%s", _savegames[idx].c_str());
+		}
+		
+		screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, 318, SHERLOCK_SCREEN_HEIGHT));
+
+		byte color = !_savegameIndex ? COMMAND_NULL : COMMAND_FOREGROUND;
+		screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, 1, "Up");
+
+		color = (_savegameIndex == (MAX_SAVEGAME_SLOTS - 5)) ? COMMAND_NULL : COMMAND_FOREGROUND;
+		screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, 1, "Down");
+
+		return true;
+	}
+
+	return false;
+}
+
+bool SaveManager::getFilename(int slot) {
+	// TODO
+	return false;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index a0f1da4041..20ce4e6067 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -31,9 +31,13 @@
 
 namespace Sherlock {
 
-#define NUM_SAVEGAME_SLOTS 99
+#define MAX_SAVEGAME_SLOTS 99
 #define SHERLOCK_SAVEGAME_VERSION 1
 
+enum SaveMode { SAVEMODE_NONE = 0, SAVEMODE_LOAD = 1, SAVEMODE_SAVE = 2 };
+
+extern const int ENV_POINTS[6][3];
+
 struct SherlockSavegameHeader {
 	uint8 _version;
 	Common::String _saveName;
@@ -49,15 +53,18 @@ class SaveManager {
 private:
 	SherlockEngine *_vm;
 	Common::String _target;
-	Common::StringArray _savegames;
 	Graphics::Surface *_saveThumb;
 
 	void createSavegameList();
+public:
+	Common::StringArray _savegames;
+	int _savegameIndex;
+	SaveMode _envMode;
 public:
 	SaveManager(SherlockEngine *vm, const Common::String &target);
 	~SaveManager();
 
-	void show();
+	void drawInterface();
 
 	void createThumbnail();
 
@@ -67,6 +74,16 @@ public:
 
 	static bool readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header);
 
+	int getHighlightedButton() const;
+
+	void highlightButtons(int btnIndex);
+
+	void loadGame(int slot);
+	void saveGame(int slot, const Common::String &name);
+
+	bool checkGameOnScreen(int slot);
+
+	bool getFilename(int slot);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 632e388642..d0744c4775 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -38,6 +38,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_map = nullptr;
 	_people = nullptr;
 	_res = nullptr;
+	_saves = nullptr;
 	_scene = nullptr;
 	_screen = nullptr;
 	_sound = nullptr;
@@ -58,6 +59,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _journal;
 	delete _map;
 	delete _people;
+	delete _saves;
 	delete _scene;
 	delete _screen;
 	delete _sound;
@@ -83,6 +85,7 @@ void SherlockEngine::initialize() {
 	_map = new Map(this);
 	_journal = new Journal(this);
 	_people = new People(this);
+	_saves = new SaveManager(this, _targetName);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
 	_sound = new Sound(this);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 67c7a2864d..20afb6f0e3 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -39,6 +39,7 @@
 #include "sherlock/map.h"
 #include "sherlock/people.h"
 #include "sherlock/resources.h"
+#include "sherlock/saveload.h"
 #include "sherlock/scene.h"
 #include "sherlock/screen.h"
 #include "sherlock/sound.h"
@@ -89,6 +90,7 @@ public:
 	Map *_map;
 	People *_people;
 	Resources *_res;
+	SaveManager *_saves;
 	Scene *_scene;
 	Screen *_screen;
 	Sound *_sound;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 3ab705e26c..c8cd300b5e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -65,15 +65,15 @@ const int SETUP_POINTS[12][4]  = {
 	{ 219, 176, 316, 268 },		// Fade Style
 	{ 103, 176, 217, 160 },		// Window Open Style
 	{ 4, 176, 101, 53 }, 		// Portraits Toggle
-	{ 219, 187, 316, 268 }		// Key Pad Accel. Toggle
+	{ 219, 187, 316, 268 }		// _key Pad Accel. Toggle
 };
 
 
 
 const char COMMANDS[13] = "LMTPOCIUGJFS";
 const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
-const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
-const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
+const char *const PRESS_KEY_FOR_MORE = "Press any _key for More.";
+const char *const PRESS_KEY_TO_CONTINUE = "Press any _key to Continue.";
 
 const char *const MOPEN[] = { 
 	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "." 
@@ -164,7 +164,7 @@ void Settings::drawInteface(bool flag) {
 	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
 	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
 		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
+	tempStr = Common::String::format("_key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
 
 	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
 		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
@@ -183,7 +183,7 @@ void Settings::drawInteface(bool flag) {
 	}
 }
 
-int Settings::drawButtons(const Common::Point &pt, int key) {
+int Settings::drawButtons(const Common::Point &pt, int _key) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
@@ -196,7 +196,7 @@ int Settings::drawButtons(const Common::Point &pt, int key) {
 	for (int idx = 0; idx < 12; ++idx) {
 		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
 				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released)) 
-				|| (key == SETUP_NAMES[idx][0])) {
+				|| (_key == SETUP_NAMES[idx][0])) {
 			found = idx;
 			color = COMMAND_HIGHLIGHTED;
 		} else {
@@ -238,7 +238,7 @@ int Settings::drawButtons(const Common::Point &pt, int key) {
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 11: 
-			tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
+			tempStr = Common::String::format("_key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		default: 
@@ -328,7 +328,7 @@ void UserInterface::handleInput() {
 	_keycode = Common::KEYCODE_INVALID;
 
 	// Check kbd and set the mouse released flag if Enter or space is pressed.
-	// Otherwise, the pressed key is stored for later use
+	// Otherwise, the pressed _key is stored for later use
 	if (events.kbHit()) {
 		Common::KeyState keyState = events.getKey();
 
@@ -890,7 +890,304 @@ void UserInterface::lookInv() {
  * Handles input when the file list window is being displayed
  */
 void UserInterface::doEnvControl() {
-	// TODO
+	Events &events = *_vm->_events;
+	SaveManager &saves = *_vm->_saves;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	Common::Point mousePos = events.mousePos();
+	static const char ENV_COMMANDS[7] = "ELSUDQ";
+	byte color;
+
+	_key = _oldKey = -1;
+	_keyboardInput = false;
+	int found = saves.getHighlightedButton();
+
+	if (events._pressed || events._released)
+	{
+		events.clearKeyboard();
+
+		// Check for a filename entry being highlighted
+		int found1 = 0;
+		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10))
+		{
+			for (_selector = 0; (_selector < 5) && !found1; ++_selector)
+				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
+					found1 = 1;
+
+			if (_selector + saves._savegameIndex - 1 < MAX_SAVEGAME_SLOTS + (saves._envMode != 1))
+				_selector = _selector + saves._savegameIndex - 1;
+			else
+				_selector = -1;
+
+			if (!found1)
+				_selector = -1;
+		}
+
+		// Handle selecting buttons, if any
+		saves.highlightButtons(found);
+
+		if (found == 0 || found == 5)
+			saves._envMode = SAVEMODE_NONE;
+	}
+
+	if (_keycode) {
+		_key = toupper(_keycode);
+
+		// Escape _key will close the dialog
+		if (_key == Common::KEYCODE_ESCAPE)
+			_key = 'E';
+
+		if (_key == 'E' || _key == 'L' || _key == 'S' || _key == 'U' || _key == 'D' || _key == 'Q') {
+			const char *chP = strchr(ENV_COMMANDS, _key);
+			int btnIndex = !chP ? -1 : chP - ENV_COMMANDS;
+			saves.highlightButtons(btnIndex);
+			_keyboardInput = true;
+
+			if (_key == 'E' || _key == 'Q') {
+				saves._envMode = SAVEMODE_NONE;
+			} else if (_key >= '1' && _key <= '9') {
+				_keyboardInput = true;
+				_selector = _key - '1';
+				if (_selector >= MAX_SAVEGAME_SLOTS + (saves._envMode == 1 ? 0 : 1))
+					_selector = -1;
+
+				if (saves.checkGameOnScreen(_selector))
+					_oldSelector = _selector;
+			} else {
+				_selector = -1;
+			}
+		}
+	}
+
+	if (_selector != _oldSelector)  {
+		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + 5)) {
+			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
+				INV_FOREGROUND, 0, "%d.", _oldSelector + 1);
+			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
+				INV_FOREGROUND, 0, "%s", saves._savegames[_oldSelector]);
+		}
+
+		if (_selector != -1) {
+			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10), 
+				TALK_FOREGROUND, 0, "%d.", _selector + 1);
+			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10), 
+				TALK_FOREGROUND, 0, "%s", saves._savegames[_selector]);
+		}
+
+		_oldSelector = _selector;
+	}
+
+	if (events._released || _keyboardInput) {
+		if ((found == 0 && events._released) || _key == 'E') {
+			banishWindow();
+			_windowBounds.top = CONTROLS_Y1;
+			
+			events._pressed = events._released = _keyboardInput = false;
+			_keycode = Common::KEYCODE_INVALID;
+		} else if ((found == 1 && events._released) || _key == 'L') {
+			saves._envMode = SAVEMODE_LOAD;
+			if (_selector != -1) {
+				saves.loadGame(_selector + 1);
+			}
+		} else if ((found == 2 && events._released) || _key == 'S') {
+			saves._envMode = SAVEMODE_SAVE;
+			if (_selector != -1) {
+				if (saves.checkGameOnScreen(_selector))
+					_oldSelector = _selector;
+
+				if (saves.getFilename(_selector)) {
+					saves.saveGame(_selector + 1, saves._savegames[_selector]);
+
+					banishWindow(1);
+					_windowBounds.top = CONTROLS_Y1;
+					_key = _oldKey = -1;
+					_keycode = Common::KEYCODE_INVALID;
+					_keyboardInput = false;
+				} else {
+					if (!talk._talkToAbort) {
+						screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 
+							SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
+						screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND, 
+							"%d.", _selector + 1);
+						screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND, 
+							"%s", saves._savegames[_selector]);
+						
+						screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
+						_selector = _oldSelector = -1;
+					}
+				}
+			}
+		} else if (((found == 3 && events._released) || _key == 'U') && saves._savegameIndex) {
+			bool moreKeys;
+			do {
+				saves._savegameIndex--;
+				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+
+				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + 5); ++idx) {
+					color = INV_FOREGROUND;
+					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + 5))
+						color = TALK_FOREGROUND;
+
+					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%d.", idx + 1);
+					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%s", saves._savegames[idx]);
+				}
+
+				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
+
+				color = !saves._savegameIndex ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
+				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - 5) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
+
+				// Check for there are more pending U keys pressed
+				moreKeys = false;
+				if (events.kbHit()) {
+					Common::KeyState keyState = events.getKey();
+
+					_key = toupper(keyState.keycode);
+					moreKeys = _key == 'U';
+				}
+			} while ((saves._savegameIndex) && moreKeys);
+		} else if (((found == 4 && events._released) || _key == 'D') && saves._savegameIndex < (MAX_SAVEGAME_SLOTS - 5)) {
+			bool moreKeys;
+			do {
+				saves._savegameIndex++;
+				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, 
+					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+
+				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + 5); ++idx) {
+					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + 5))
+						color = TALK_FOREGROUND;
+					else
+						color = INV_FOREGROUND;
+
+					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
+						"%d.", idx + 1);
+					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, 
+						"%s", saves._savegames[idx]);
+				}
+				
+				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
+
+				color = (!saves._savegameIndex) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
+
+				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - 5) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
+
+				// Check for there are more pending D keys pressed
+				moreKeys = false;
+				if (events.kbHit()) {
+					Common::KeyState keyState;
+					_key = toupper(keyState.keycode);
+
+					moreKeys = _key == 'D';
+				}
+			} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - 5) && moreKeys);
+		} else if ((found == 5 && events._released) || _key == 'Q') {
+			clearWindow();
+			screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
+			screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
+
+			screen.makeButton(Common::Rect(112, CONTROLS_Y, 150, CONTROLS_Y + 10), 136 - screen.stringWidth("Yes") / 2, "Yes");
+			screen.makeButton(Common::Rect(161, CONTROLS_Y, 209, CONTROLS_Y + 10), 184 - screen.stringWidth("No") / 2, "No");
+			screen.slamArea(112, CONTROLS_Y, 97, 10);
+
+			do {
+				scene.doBgAnim();
+
+				if (talk._talkToAbort)
+					return;
+
+				events.pollEventsAndWait();
+				events.setButtonState();
+				if (events.kbHit()) {
+					Common::KeyState keyState = events.getKey();
+					_key = toupper(keyState.keycode);
+
+					if (_key == 'X' && (keyState.flags & Common::KBD_ALT) != 0) {
+						_vm->quitGame();
+						events.pollEvents();
+						return;
+					}
+
+					if (_key == Common::KEYCODE_ESCAPE)
+						_key = 'N';
+
+					if (_key == Common::KEYCODE_RETURN || _key == Common::KEYCODE_SPACE) {
+						events._pressed = false;
+						events._released = true;
+						events._oldButtons = 0;
+						_keycode = Common::KEYCODE_INVALID;
+					}
+				}
+
+				if (events._pressed || events._released) {
+					if (mousePos.x > 112 && mousePos.x < 159 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9))
+						color = COMMAND_HIGHLIGHTED;
+					else
+						color = COMMAND_FOREGROUND;
+					screen.buttonPrint(Common::Point(136, CONTROLS_Y), color, true, "Yes");
+
+					if (mousePos.x > 161 && mousePos.x < 208 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9))
+						color = COMMAND_HIGHLIGHTED;
+					else
+						color = COMMAND_FOREGROUND;
+					screen.buttonPrint(Common::Point(184, CONTROLS_Y), color, true, "No");
+				}
+
+				if (mousePos.x > 112 && mousePos.x < 159 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9) && events._released)
+					_key = 'Y';
+
+				if (mousePos.x > 161 && mousePos.x < 208 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9) && events._released)
+					_key = 'N';
+			} while (!_vm->shouldQuit() && _key != 'Y' && _key != 'N');
+
+			if (_key == 'Y') {
+				_vm->quitGame();
+				events.pollEvents();
+				return;
+			} else {
+				screen.buttonPrint(Common::Point(184, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "No");
+				banishWindow(1);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = -1;
+			}
+		} else {
+			if (_selector != -1) {
+				// Are we already in Load mode?
+				if (saves._envMode == SAVEMODE_LOAD) {
+					saves.loadGame(_selector + 1);
+				} else if (saves._envMode == SAVEMODE_SAVE || _selector == MAX_SAVEGAME_SLOTS) {
+					// We're alreaady in save mode, or pointed to an empty save slot
+					if (saves.checkGameOnScreen(_selector))
+						_oldSelector = _selector;
+
+					if (saves.getFilename(_selector)) {
+						saves.saveGame(_selector + 1, saves._savegames[_selector]);
+						banishWindow();
+						_windowBounds.top = CONTROLS_Y1;
+						_key = _oldKey = -1;
+						_keycode = Common::KEYCODE_INVALID;
+						_keyboardInput = false;
+					} else {
+						if (!talk._talkToAbort) {
+							screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 
+								317, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
+							screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), 
+								INV_FOREGROUND, 0, "%d.", _selector + 1);
+							screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), 
+								INV_FOREGROUND, 0, "%s", saves._savegames[_selector]);
+							screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
+							_selector = _oldSelector = -1;
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 /**
@@ -1199,6 +1496,7 @@ void UserInterface::doLookControl() {
 void UserInterface::doMainControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
+	SaveManager &saves = *_vm->_saves;
 	Common::Point pt = events.mousePos();
 
 	if ((events._pressed || events._released) && pt.y > CONTROLS_Y) {
@@ -1302,7 +1600,10 @@ void UserInterface::doMainControl() {
 		case 'F':
 			pushButton(10);
 			_menuMode = FILES_MODE;
-			environment();
+			saves.drawInterface();
+			
+			_selector = _oldSelector = -1;
+			_windowOpen = true;
 			break;
 		case 'S':
 			pushButton(11);
@@ -1699,10 +2000,6 @@ void UserInterface::journalControl() {
 	// TODO
 }
 
-void UserInterface::environment() {
-	// TODO
-}
-
 /**
  * Handles input when the settings window is being shown
  */
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 211287c372..12470357e5 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -99,7 +99,6 @@ private:
 	bool _lookScriptFlag;
 	Common::Rect _windowBounds;
 	Common::String _descStr;
-	int _windowStyle;
 	int _find;
 	int _oldUse;
 private:
@@ -124,7 +123,6 @@ private:
 	void doTalkControl();
 	void journalControl();
 
-	void environment();
 	void doControls();
 
 	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
@@ -138,6 +136,7 @@ public:
 	bool _endKeyActive;
 	int _invLookFlag;
 	int _temp1;
+	int _windowStyle;
 public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
-- 
cgit v1.2.3


From 0984405a0dbe718522117507d7c75dc619c586a8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 21 Apr 2015 22:51:03 -0500
Subject: SHERLOCK: Implement savegame synchronization

---
 engines/sherlock/inventory.cpp      | 20 +++++++++++
 engines/sherlock/inventory.h        |  3 ++
 engines/sherlock/journal.cpp        | 31 ++++++++++++++++
 engines/sherlock/journal.h          |  5 +++
 engines/sherlock/people.cpp         | 13 ++++++-
 engines/sherlock/people.h           |  5 ++-
 engines/sherlock/saveload.cpp       | 71 +++++++++++++++++++++++++++++++++++--
 engines/sherlock/saveload.h         |  6 ++++
 engines/sherlock/scene.cpp          | 61 +++++++++++++++++++------------
 engines/sherlock/scene.h            |  5 ++-
 engines/sherlock/screen.cpp         | 10 ++++++
 engines/sherlock/screen.h           |  3 ++
 engines/sherlock/sherlock.cpp       | 10 +++++-
 engines/sherlock/sherlock.h         |  3 +-
 engines/sherlock/talk.cpp           | 12 +++++++
 engines/sherlock/talk.h             |  6 +++-
 engines/sherlock/user_interface.cpp |  2 +-
 17 files changed, 234 insertions(+), 32 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 9eedac7c6a..3ba6f9d2bd 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -486,4 +486,24 @@ int Inventory::deleteItemFromInventory(const Common::String &name) {
 	return 1;
 }
 
+/**
+ * Synchronize the data for a savegame
+ */
+void Inventory::synchronize(Common::Serializer &s) {
+	s.syncAsSint16LE(_holdings);
+
+	uint count = size();
+	s.syncAsUint16LE(count);
+	if (s.isLoading()) {
+		resize(count);
+
+		// Reset inventory back to start
+		_invIndex = 0;
+	}
+
+	for (uint idx = 0; idx < size(); ++idx) {
+		// TODO
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 4e426beaf4..bccdc9336e 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/serializer.h"
 #include "common/str-array.h"
 #include "sherlock/objects.h"
 #include "sherlock/resources.h"
@@ -99,6 +100,8 @@ public:
 	int putItemInInventory(Object &obj);
 
 	int deleteItemFromInventory(const Common::String &name);
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index f9c2c54289..15d3a07c75 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1175,4 +1175,35 @@ int Journal::getFindName(bool printError) {
 	return done;
 }
 
+/**
+ * Reset viewing position to the start of the journal
+ */
+void Journal::resetPosition() {
+	_index = _sub = _up = _down = 0;
+	_page = 1;
+}
+
+/**
+ * Synchronize the data for a savegame
+ */
+void Journal::synchronize(Common::Serializer &s) {
+	s.syncAsSint16LE(_count);
+	s.syncAsSint16LE(_index);
+	s.syncAsSint16LE(_sub);
+	s.syncAsSint16LE(_page);
+	s.syncAsSint16LE(_maxPage);
+
+	int journalCount = _journal.size();
+	if (s.isLoading())
+		_journal.resize(journalCount);
+
+	for (uint idx = 0; idx < _journal.size(); ++idx) {
+		JournalEntry &je = _journal[idx];
+
+		s.syncAsSint16LE(je._converseNum);
+		s.syncAsByte(je._replyOnly);
+		s.syncAsSint16LE(je._statementNum);
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 894065759b..9db4b28665 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/serializer.h"
 #include "common/str-array.h"
 #include "common/stream.h"
 
@@ -77,6 +78,10 @@ public:
 	void drawInterface();
 
 	bool handleEvents(int key);
+
+	void resetPosition();
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index d22c08f625..86c560a1d9 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -203,7 +203,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_portraitSide = 0;
 	_speakerFlip = false;
 	_holmesFlip = false;
-	_homesQuotient = 0;
+	_holmesQuotient = 0;
 
 	_portrait._sequences = new byte[32];
 }
@@ -700,4 +700,15 @@ void People::setTalking(int speaker) {
 	}
 }
 
+/**
+ * Synchronize the data for a savegame
+ */
+void People::synchronize(Common::Serializer &s) {
+	s.syncAsByte(_holmesOn);
+	s.syncAsSint16LE(_data[AL]._position.x);
+	s.syncAsSint16LE(_data[AL]._position.y);
+	s.syncAsSint16LE(_data[AL]._sequenceNumber);
+	s.syncAsSint16LE(_holmesQuotient);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 593b516ee6..94f1d05c0d 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -24,6 +24,7 @@
 #define SHERLOCK_PEOPLE_H
 
 #include "common/scummsys.h"
+#include "common/serializer.h"
 #include "common/stack.h"
 #include "sherlock/objects.h"
 
@@ -84,7 +85,7 @@ public:
 	int _portraitSide;
 	bool _speakerFlip;
 	bool _holmesFlip;
-	int _homesQuotient;
+	int _holmesQuotient;
 public:
 	People(SherlockEngine *vm);
 	~People();
@@ -118,6 +119,8 @@ public:
 
 	void clearTalking();
 	void setTalking(int speaker);
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 78c86c836e..0cdf1d228f 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -44,6 +44,7 @@ SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) :
 		_vm(vm), _target(target) {
 	_saveThumb = nullptr;
 	_envMode = SAVEMODE_NONE;
+	_justLoaded = false;
 }
 
 SaveManager::~SaveManager() {
@@ -308,14 +309,80 @@ void SaveManager::highlightButtons(int btnIndex) {
  * Load the game in the specified slot
  */
 void SaveManager::loadGame(int slot) {
-	// TODO
+	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
+		generateSaveName(slot));
+	Common::Serializer s(saveFile, nullptr);
+
+	// Load the savaegame header
+	SherlockSavegameHeader header;
+	if (!readSavegameHeader(saveFile, header))
+		error("Invalid savegame");
+
+	if (header._thumbnail) {
+		header._thumbnail->free();
+		delete header._thumbnail;
+	}
+
+	// Synchronize the savegame data
+	synchronize(s);
+
+	delete saveFile;
 }
 
 /**
  * Save the game in the specified slot with the given name
  */
 void SaveManager::saveGame(int slot, const Common::String &name) {
-	// TODO
+	Common::OutSaveFile *out = g_system->getSavefileManager()->openForSaving(
+		generateSaveName(slot));
+
+	SherlockSavegameHeader header;
+	header._saveName = name;
+	writeSavegameHeader(out, header);
+
+	Common::Serializer s(nullptr, out);
+	synchronize(s);
+
+	out->finalize();
+	delete out;
+}
+
+/**
+ * Support method that generates a savegame name
+ * @param slot		Slot number
+ */
+Common::String SaveManager::generateSaveName(int slot) {
+	return Common::String::format("%s.%03d", _target.c_str(), slot);
+}
+
+/**
+ * Synchronize the data for a savegame
+ */
+void SaveManager::synchronize(Common::Serializer &s) {
+	Journal &journal = *_vm->_journal;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	int oldFont = screen.fontNumber();
+
+	journal.synchronize(s);
+	people.synchronize(s);
+	scene.synchronize(s);
+	screen.synchronize(s);
+	talk.synchronize(s);
+	_vm->synchronize(s);
+
+	if (screen.fontNumber() != oldFont)
+		journal.resetPosition();
+	/*
+	char room_flags[MAX_ROOMS * 9];
+
+		*/
+
+	_vm->_loadingSavedGame = true;
+	_justLoaded = true;
 }
 
 /**
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index 20ce4e6067..0dad6256ca 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/savefile.h"
+#include "common/serializer.h"
 #include "common/str-array.h"
 #include "engines/savestate.h"
 #include "graphics/surface.h"
@@ -56,10 +57,15 @@ private:
 	Graphics::Surface *_saveThumb;
 
 	void createSavegameList();
+
+	Common::String generateSaveName(int slot);
+
+	void synchronize(Common::Serializer &s);
 public:
 	Common::StringArray _savegames;
 	int _savegameIndex;
 	SaveMode _envMode;
+	bool _justLoaded;
 public:
 	SaveManager(SherlockEngine *vm, const Common::String &target);
 	~SaveManager();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 575523bc45..4671dbdade 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -85,7 +85,7 @@ void SceneSound::synchronize(Common::SeekableReadStream &s) {
 
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
-		Common::fill(&_stats[idx][0], &_stats[idx][9], false);
+		Common::fill(&_sceneStats[idx][0], &_sceneStats[idx][65], false);
 	_currentScene = -1;
 	_goToScene = -1;
 	_changes = false;
@@ -195,6 +195,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	Events &events = *_vm->_events;
 	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
+	SaveManager &saves = *_vm->_saves;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	UserInterface &ui = *_vm->_ui;
@@ -398,7 +399,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	_changes = false;
 	checkSceneStatus();
 
-	if (!_vm->_justLoaded) {
+	if (!saves._justLoaded) {
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			if (_bgShapes[idx]._type == HIDDEN && _bgShapes[idx]._aType == TALK_EVERY)
 				_bgShapes[idx].toggleHidden();
@@ -450,30 +451,25 @@ bool Scene::loadScene(const Common::String &filename) {
  * opening or moving them
  */
 void Scene::checkSceneStatus() {
-	if (_stats[_currentScene][8]) {
-		for (int idx = 0; idx < 8; ++idx) {
-			int val = _stats[_currentScene][idx];
+	if (_sceneStats[_currentScene][65]) {
+		for (uint idx = 0; idx < 64; ++idx) {
+			int val = _sceneStats[_currentScene][idx];
 
-			for (int bit = 0; bit < 8; ++bit) {
-				uint objNumber = idx * 8 + bit;
-				if (objNumber < _bgShapes.size()) {
-					Object &obj = _bgShapes[objNumber];
+			if (idx < _bgShapes.size()) {
+				Object &obj = _bgShapes[idx];
 
-					if (val & 1) {
-						// No shape to erase, so flag as hidden
-						obj._type = HIDDEN;
-					} else if (obj._images == nullptr || obj._images->size() == 0) {
-						// No shape
-						obj._type = NO_SHAPE;
-					} else {
-						obj._type = ACTIVE_BG_SHAPE;
-					}
+				if (val & 1) {
+					// No shape to erase, so flag as hidden
+					obj._type = HIDDEN;
+				} else if (obj._images == nullptr || obj._images->size() == 0) {
+					// No shape
+					obj._type = NO_SHAPE;
 				} else {
-					// Finished checks
-					return;
+					obj._type = ACTIVE_BG_SHAPE;
 				}
-
-				val >>= 1;
+			} else {
+				// Finished checks
+				return;
 			}
 		}
 	}
@@ -560,6 +556,7 @@ void Scene::checkInventory() {
  */
 void Scene::transitionToScene() {
 	People &people = *_vm->_people;
+	SaveManager &saves = *_vm->_saves;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 
@@ -583,7 +580,7 @@ void Scene::transitionToScene() {
 		// Exit information exists, translate it to real sequence info
 		// Note: If a savegame was just loaded, then the data is already correct.
 		// Otherwise, this is a linked scene or entrance info, and must be translated
-		if (_hsavedFs < 8 && !_vm->_justLoaded) {
+		if (_hsavedFs < 8 && !saves._justLoaded) {
 			_hsavedFs = FS_TRANS[_hsavedFs];
 			_hsavedPos.x *= 100;
 			_hsavedPos.y *= 100;
@@ -1457,4 +1454,22 @@ int Scene::closestZone(const Common::Point &pt) {
 	return zone;
 }
 
+/**
+ * Synchronize the data for a savegame
+ */
+void Scene::synchronize(Common::Serializer &s) {
+	s.syncAsSint16LE(_bigPos.x);
+	s.syncAsSint16LE(_bigPos.y);
+	s.syncAsSint16LE(_overPos.x);
+	s.syncAsSint16LE(_overPos.y);
+	s.syncAsSint16LE(_oldCharPoint);
+	s.syncAsSint16LE(_goToScene);
+
+	for (int sceneNum = 0; sceneNum < SCENES_COUNT; ++sceneNum) {
+		for (int flag = 0; flag < 65; ++flag) {
+			s.syncAsByte(_sceneStats[sceneNum][flag]);
+		}
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 3549325e8e..cc01fa92ab 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/serializer.h"
 #include "sherlock/objects.h"
 #include "sherlock/resources.h"
 
@@ -104,7 +105,7 @@ public:
 	int _currentScene;
 	int _goToScene;
 	bool _changes;
-	bool _stats[SCENES_COUNT][9];
+	bool _sceneStats[SCENES_COUNT][65];
 	bool _savedStats[SCENES_COUNT][9];
 	Common::Point _bigPos;
 	Common::Point _overPos;
@@ -167,6 +168,8 @@ public:
 	int closestZone(const Common::Point &pt);
 
 	void updateBackground();
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index a30108118c..3c9a10e4a1 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -480,4 +480,14 @@ Common::Rect Screen::getDisplayBounds() {
 	return Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
+/**
+ * Synchronize the data for a savegame
+ */
+void Screen::synchronize(Common::Serializer &s) {
+	int fontNumber = _fontNumber;
+	s.syncAsByte(fontNumber);
+	if (s.isLoading())
+		setFont(fontNumber);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 2cfd7c8a88..a8bdc53b5a 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -25,6 +25,7 @@
 
 #include "common/list.h"
 #include "common/rect.h"
+#include "common/serializer.h"
 #include "graphics/surface.h"
 #include "sherlock/graphics.h"
 #include "sherlock/resources.h"
@@ -128,6 +129,8 @@ public:
 	Common::Rect getDisplayBounds();
 
 	int fontNumber() const { return _fontNumber; }
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index d0744c4775..bc7b545719 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -45,7 +45,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_talk = nullptr;
 	_ui = nullptr;
 	_useEpilogue2 = false;
-	_justLoaded = false;
 	_loadingSavedGame = false;
 	_onChessboard = false;
 	_slowChess = false;
@@ -185,4 +184,13 @@ void SherlockEngine::saveConfig() {
 	// TODO
 }
 
+
+/**
+ * Synchronize the data for a savegame
+ */
+void SherlockEngine::synchronize(Common::Serializer &s) {
+	for (uint idx = 0; idx < _flags.size(); ++idx)
+		s.syncAsByte(_flags[idx]);
+}
+
 } // End of namespace Comet
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 20afb6f0e3..48850fff06 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -101,7 +101,6 @@ public:
 	Common::String _soundOverride;
 	Common::String _titleOverride;
 	bool _useEpilogue2;
-	bool _justLoaded;
 	bool _loadingSavedGame;
 	int _oldCharPoint;					// Old scene
 	Common::Point _over;				// Old map position
@@ -131,6 +130,8 @@ public:
 	void freeSaveGameList();
 
 	void saveConfig();
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 158cae38a9..6740e89efc 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1745,4 +1745,16 @@ void Talk::popStack() {
 	}
 }
 
+/**
+ * Synchronize the data for a savegame
+ */
+void Talk::synchronize(Common::Serializer &s) {
+	for (int idx = 0; idx < MAX_TALK_FILES; ++idx) {
+		TalkHistoryEntry &he = _talkHistory[idx];
+		
+		for (int flag = 0; flag < 16; ++flag)
+			s.syncAsByte(he._data[flag]);
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 4a33f2f557..620a986454 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -26,12 +26,14 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/serializer.h"
 #include "common/stream.h"
 #include "common/stack.h"
 
 namespace Sherlock {
 
 #define MAX_TALK_SEQUENCES 11
+#define MAX_TALK_FILES 500
 
 struct SequenceEntry {
 	int _objNum;
@@ -93,7 +95,7 @@ private:
 	Common::Stack<SequenceEntry> _sequenceStack;
 	Common::Stack<ScriptStackEntry> _scriptStack;
 	Common::Array<Statement> _statements;
-	TalkHistoryEntry _talkHistory[500];
+	TalkHistoryEntry _talkHistory[MAX_TALK_FILES];
 	int _speaker;
 	int _talkIndex;
 	int _scriptSelect;
@@ -145,6 +147,8 @@ public:
 	bool isSequencesEmpty() const { return _scriptStack.empty(); }
 
 	void popStack();
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index c8cd300b5e..f7f387e9ad 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1820,7 +1820,7 @@ void UserInterface::doTalkControl() {
 
 				// Add any Holmes point to Holmes' total, if any
 				if (talk._statements[_selector]._quotient)
-					people._homesQuotient += talk._statements[_selector]._quotient;
+					people._holmesQuotient += talk._statements[_selector]._quotient;
 			}
 
 			// Flag the response as having been used
-- 
cgit v1.2.3


From e08520cca94f33cb69ee8058cb08e400e5443016 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 02:32:25 -0500
Subject: SHERLOCK: Fix Files saves listing and save name entry

---
 engines/sherlock/saveload.cpp       | 96 +++++++++++++++++++++++++++++++++++--
 engines/sherlock/user_interface.cpp | 17 ++++---
 2 files changed, 102 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 0cdf1d228f..57a4a65b21 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -45,6 +45,7 @@ SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) :
 	_saveThumb = nullptr;
 	_envMode = SAVEMODE_NONE;
 	_justLoaded = false;
+	_savegameIndex = 0;
 }
 
 SaveManager::~SaveManager() {
@@ -94,7 +95,7 @@ void SaveManager::drawInterface() {
 		screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
 			INV_FOREGROUND, "%d.", idx + 1);
 		screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
-			INV_FOREGROUND, "%s", _savegames[idx]);
+			INV_FOREGROUND, "%s", _savegames[idx].c_str());
 	}
 
 	if (!ui._windowStyle) {
@@ -114,7 +115,7 @@ void SaveManager::createSavegameList() {
 
 	_savegames.clear();
 	for (int idx = 0; idx < MAX_SAVEGAME_SLOTS; ++idx)
-		_savegames.push_back("-EMPTY");
+		_savegames.push_back("-EMPTY-");
 
 	SaveStateList saveList = getSavegameList(_target);
 	for (uint idx = 0; idx < saveList.size(); ++idx)
@@ -420,8 +421,95 @@ bool SaveManager::checkGameOnScreen(int slot) {
 }
 
 bool SaveManager::getFilename(int slot) {
-	// TODO
-	return false;
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	int xp, yp;
+	bool flag = false;
+	
+	screen.buttonPrint(Common::Point(ENV_POINTS[0][2], CONTROLS_Y), COMMAND_NULL, true, "Exit");
+	screen.buttonPrint(Common::Point(ENV_POINTS[1][2], CONTROLS_Y), COMMAND_NULL, true, "Load");
+	screen.buttonPrint(Common::Point(ENV_POINTS[2][2], CONTROLS_Y), COMMAND_NULL, true, "Save");
+	screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), COMMAND_NULL, true, "Up");
+	screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), COMMAND_NULL, true, "Down");
+	screen.buttonPrint(Common::Point(ENV_POINTS[5][2], CONTROLS_Y), COMMAND_NULL, true, "Quit");
+
+	Common::String saveName = _savegames[slot];
+	if (scumm_stricmp(saveName.c_str(), "-EMPTY-") == 0) {
+		// It's an empty slot, so start off with an empty save name
+		saveName = "";
+
+		yp = CONTROLS_Y + 12 + (slot - _savegameIndex) * 10;
+		screen.vgaBar(Common::Rect(24, yp, 85, yp + 9), INV_BACKGROUND);
+	}
+
+	screen.print(Common::Point(6, CONTROLS_Y + 12 + (slot - _savegameIndex) * 10), TALK_FOREGROUND, "%d.", slot + 1);
+	screen.print(Common::Point(24, CONTROLS_Y + 12 + (slot - _savegameIndex) * 10), TALK_FOREGROUND, "%s", saveName.c_str());
+	xp = 24 + screen.stringWidth(saveName);
+	yp = CONTROLS_Y + 12 + (slot - _savegameIndex) * 10;
+
+	int done = 0;
+	do {
+		while (!_vm->shouldQuit() && !events.kbHit()) {
+			scene.doBgAnim();
+
+			if (talk._talkToAbort)
+				return false;
+
+			// Allow event processing
+			events.pollEventsAndWait();
+			events.setButtonState();
+
+			flag = !flag;
+			if (flag)
+				screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
+			else
+				screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
+		}
+		if (_vm->shouldQuit())
+			return false;
+
+		// Get the next keypress
+		Common::KeyState keyState = events.getKey();
+
+		if (keyState.keycode == Common::KEYCODE_BACKSPACE && saveName.size() > 0) {
+			// Delete character of save name
+			screen.vgaBar(Common::Rect(xp - screen.charWidth(saveName.lastChar()), yp - 1, 
+				xp + 8, yp + 9), INV_BACKGROUND);
+			xp -= screen.charWidth(saveName.lastChar());
+			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
+			saveName.deleteLastChar();
+		}
+
+		if (keyState.keycode == Common::KEYCODE_RETURN)
+			done = 1;
+
+		if (keyState.keycode == Common::KEYCODE_ESCAPE) {
+			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
+			done = -1;
+		}
+
+		if (keyState.keycode >= ' ' && keyState.keycode <= 'z' && saveName.size() < 50
+				&& (xp + screen.charWidth(keyState.keycode)) < 308) {
+			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
+			screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", (char)keyState.keycode);
+			xp += screen.charWidth((char)keyState.keycode);
+			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
+			saveName += (char)keyState.keycode;
+		}
+	} while (!done);
+
+	if (done == 1) {
+		// Enter key perssed
+		_savegames[slot] = saveName;
+	} else {
+		done = 0;
+		_envMode = SAVEMODE_NONE;
+		highlightButtons(-1);
+	}
+
+	return done == 1;
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index f7f387e9ad..f95277df91 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -331,13 +331,16 @@ void UserInterface::handleInput() {
 	// Otherwise, the pressed _key is stored for later use
 	if (events.kbHit()) {
 		Common::KeyState keyState = events.getKey();
+		_keycode = keyState.keycode;
 
 		if (keyState.keycode == Common::KEYCODE_x && keyState.flags & Common::KBD_ALT) {
 			_vm->quitGame();
+			events.pollEvents();
 			return;
 		} else if (keyState.keycode == Common::KEYCODE_SPACE ||
 				keyState.keycode == Common::KEYCODE_RETURN) {
-			events._pressed = events._oldButtons = 0;
+			events._pressed = false;
+			events._oldButtons = 0;
 			_keycode = Common::KEYCODE_INVALID;
 		}
 	}
@@ -963,16 +966,16 @@ void UserInterface::doEnvControl() {
 	if (_selector != _oldSelector)  {
 		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + 5)) {
 			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
-				INV_FOREGROUND, 0, "%d.", _oldSelector + 1);
+				INV_FOREGROUND, "%d.", _oldSelector + 1);
 			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
-				INV_FOREGROUND, 0, "%s", saves._savegames[_oldSelector]);
+				INV_FOREGROUND, "%s", saves._savegames[_oldSelector]);
 		}
 
 		if (_selector != -1) {
 			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10), 
-				TALK_FOREGROUND, 0, "%d.", _selector + 1);
+				TALK_FOREGROUND, "%d.", _selector + 1);
 			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10), 
-				TALK_FOREGROUND, 0, "%s", saves._savegames[_selector]);
+				TALK_FOREGROUND, "%s", saves._savegames[_selector].c_str());
 		}
 
 		_oldSelector = _selector;
@@ -1031,7 +1034,7 @@ void UserInterface::doEnvControl() {
 						color = TALK_FOREGROUND;
 
 					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%d.", idx + 1);
-					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%s", saves._savegames[idx]);
+					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%s", saves._savegames[idx].c_str());
 				}
 
 				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
@@ -1066,7 +1069,7 @@ void UserInterface::doEnvControl() {
 					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
 						"%d.", idx + 1);
 					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, 
-						"%s", saves._savegames[idx]);
+						"%s", saves._savegames[idx].c_str());
 				}
 				
 				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
-- 
cgit v1.2.3


From 27938653a5cd05856da88142f52de44f30e26eef Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 04:44:55 -0500
Subject: SHERLOCK: Further fixes for entering savegame names

---
 engines/sherlock/events.cpp         | 12 ++++++++++++
 engines/sherlock/events.h           |  2 +-
 engines/sherlock/saveload.cpp       | 18 +++++++++++++-----
 engines/sherlock/user_interface.cpp | 10 +++++-----
 engines/sherlock/user_interface.h   |  2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 1a827eda3b..f7b473ff7a 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -196,6 +196,18 @@ bool Events::checkForNextFrameCounter() {
 	return false;
 }
 
+/**
+ * Get a pending keypress
+ */
+Common::KeyState Events::getKey() { 
+	Common::KeyState keyState = _pendingKeys.pop();
+	if ((keyState.flags & Common::KBD_SHIFT) != 0)
+		keyState.ascii = toupper(keyState.ascii);
+
+	return keyState;
+}
+
+
 /**
  * Clear any current keypress or mouse click
  */
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index ccf6eb1c59..015c39580d 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -85,7 +85,7 @@ public:
 
 	bool kbHit() const { return !_pendingKeys.empty(); }
 
-	Common::KeyState getKey() { return _pendingKeys.pop(); }
+	Common::KeyState getKey();
 
 	void clearEvents();
 	void clearKeyboard();
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 57a4a65b21..cd7627a768 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -118,8 +118,11 @@ void SaveManager::createSavegameList() {
 		_savegames.push_back("-EMPTY-");
 
 	SaveStateList saveList = getSavegameList(_target);
-	for (uint idx = 0; idx < saveList.size(); ++idx)
-		_savegames[saveList[idx].getSaveSlot()] = saveList[idx].getDescription();
+	for (uint idx = 0; idx < saveList.size(); ++idx) {
+		int slot = saveList[idx].getSaveSlot() - 1;
+		if (slot >= 0 && slot < MAX_SAVEGAME_SLOTS)
+			_savegames[slot] = saveList[idx].getDescription();
+	}
 
 	// Ensure the names will fit on the screen
 	for (uint idx = 0; idx < _savegames.size(); ++idx) {
@@ -312,6 +315,9 @@ void SaveManager::highlightButtons(int btnIndex) {
 void SaveManager::loadGame(int slot) {
 	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
 		generateSaveName(slot));
+	if (!saveFile)
+		return;
+	
 	Common::Serializer s(saveFile, nullptr);
 
 	// Load the savaegame header
@@ -492,11 +498,13 @@ bool SaveManager::getFilename(int slot) {
 
 		if (keyState.keycode >= ' ' && keyState.keycode <= 'z' && saveName.size() < 50
 				&& (xp + screen.charWidth(keyState.keycode)) < 308) {
+			char c = (char)keyState.ascii;
+
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
-			screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", (char)keyState.keycode);
-			xp += screen.charWidth((char)keyState.keycode);
+			screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", c);
+			xp += screen.charWidth(c);
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
-			saveName += (char)keyState.keycode;
+			saveName += c;
 		}
 	} while (!done);
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index f95277df91..cb10606562 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -331,7 +331,7 @@ void UserInterface::handleInput() {
 	// Otherwise, the pressed _key is stored for later use
 	if (events.kbHit()) {
 		Common::KeyState keyState = events.getKey();
-		_keycode = keyState.keycode;
+		_keycode = keyState.ascii;
 
 		if (keyState.keycode == Common::KEYCODE_x && keyState.flags & Common::KBD_ALT) {
 			_vm->quitGame();
@@ -968,7 +968,7 @@ void UserInterface::doEnvControl() {
 			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
 				INV_FOREGROUND, "%d.", _oldSelector + 1);
 			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
-				INV_FOREGROUND, "%s", saves._savegames[_oldSelector]);
+				INV_FOREGROUND, "%s", saves._savegames[_oldSelector].c_str());
 		}
 
 		if (_selector != -1) {
@@ -1014,7 +1014,7 @@ void UserInterface::doEnvControl() {
 						screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND, 
 							"%d.", _selector + 1);
 						screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND, 
-							"%s", saves._savegames[_selector]);
+							"%s", saves._savegames[_selector].c_str());
 						
 						screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
 						_selector = _oldSelector = -1;
@@ -1180,9 +1180,9 @@ void UserInterface::doEnvControl() {
 							screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 
 								317, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
 							screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), 
-								INV_FOREGROUND, 0, "%d.", _selector + 1);
+								INV_FOREGROUND, "%d.", _selector + 1);
 							screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), 
-								INV_FOREGROUND, 0, "%s", saves._savegames[_selector]);
+								INV_FOREGROUND, "%s", saves._savegames[_selector].c_str());
 							screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
 							_selector = _oldSelector = -1;
 						}
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 12470357e5..99612b218b 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -84,7 +84,7 @@ private:
 	ImageFile *_controls;
 	int _bgFound;
 	int _oldBgFound;
-	Common::KeyCode _keycode;
+	int _keycode;
 	int _helpStyle;
 	int _lookHelp;
 	int _help, _oldHelp;
-- 
cgit v1.2.3


From 0fc29972804c12ad9b051574a6e0588ff2b065ee Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 05:06:13 -0500
Subject: SHERLOCK: Fixes for saving and restoring games

---
 engines/sherlock/events.cpp | 1 +
 engines/sherlock/scene.cpp  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index f7b473ff7a..f83219d7d2 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -54,6 +54,7 @@ void Events::loadCursors(const Common::String &filename) {
 	delete _cursorImages;
 
 	_cursorImages = new ImageFile(filename);
+	_cursorId = INVALID_CURSOR;
 }
 
 /**
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 4671dbdade..316b8739b1 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1463,7 +1463,11 @@ void Scene::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_overPos.x);
 	s.syncAsSint16LE(_overPos.y);
 	s.syncAsSint16LE(_oldCharPoint);
-	s.syncAsSint16LE(_goToScene);
+
+	if (s.isSaving())
+		s.syncAsSint16LE(_currentScene);
+	else
+		s.syncAsSint16LE(_goToScene);
 
 	for (int sceneNum = 0; sceneNum < SCENES_COUNT; ++sceneNum) {
 		for (int flag = 0; flag < 65; ++flag) {
-- 
cgit v1.2.3


From 8b0e8cd505eebf199aa9888ce65012f1574b1233 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 06:25:04 -0500
Subject: SHERLOCK: Hook up savegames to launcher

---
 engines/sherlock/detection.cpp | 13 +++++++++----
 engines/sherlock/journal.cpp   |  1 +
 engines/sherlock/saveload.cpp  |  4 ++--
 engines/sherlock/saveload.h    |  4 ++--
 engines/sherlock/sherlock.cpp  | 18 ++++++++++++++++--
 engines/sherlock/sherlock.h    |  1 +
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index bb66cee7df..5d217bd1c5 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -98,7 +98,12 @@ bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
 }
 
 bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
-	return false;
+	return
+		(f == kSupportsListSaves) ||
+		(f == kSupportsLoadingDuringStartup) ||
+		(f == kSupportsDeleteSave) ||
+		(f == kSavesSupportMetaInfo) ||
+		(f == kSavesSupportThumbnail);
 }
 
 SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
@@ -109,13 +114,13 @@ int SherlockMetaEngine::getMaximumSaveSlot() const {
 	return MAX_SAVEGAME_SLOTS;
 }
 
-void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {
-	Common::String filename = Common::String::format("%s.%03d", target, slot);
+void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {	
+	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	g_system->getSavefileManager()->removeSavefile(filename);
 }
 
 SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
-	Common::String filename = Common::String::format("%s.%03d", target, slot);
+	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(filename);
 
 	if (f) {
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 15d3a07c75..18edec8c73 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1194,6 +1194,7 @@ void Journal::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_maxPage);
 
 	int journalCount = _journal.size();
+	s.syncAsUint16LE(journalCount);
 	if (s.isLoading())
 		_journal.resize(journalCount);
 
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index cd7627a768..207eff1ab4 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -318,8 +318,6 @@ void SaveManager::loadGame(int slot) {
 	if (!saveFile)
 		return;
 	
-	Common::Serializer s(saveFile, nullptr);
-
 	// Load the savaegame header
 	SherlockSavegameHeader header;
 	if (!readSavegameHeader(saveFile, header))
@@ -331,6 +329,7 @@ void SaveManager::loadGame(int slot) {
 	}
 
 	// Synchronize the savegame data
+	Common::Serializer s(saveFile, nullptr);
 	synchronize(s);
 
 	delete saveFile;
@@ -347,6 +346,7 @@ void SaveManager::saveGame(int slot, const Common::String &name) {
 	header._saveName = name;
 	writeSavegameHeader(out, header);
 
+	// Synchronize the savegame data
 	Common::Serializer s(nullptr, out);
 	synchronize(s);
 
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index 0dad6256ca..0865fd3856 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -58,8 +58,6 @@ private:
 
 	void createSavegameList();
 
-	Common::String generateSaveName(int slot);
-
 	void synchronize(Common::Serializer &s);
 public:
 	Common::StringArray _savegames;
@@ -76,6 +74,8 @@ public:
 
 	static SaveStateList getSavegameList(const Common::String &target);
 
+	Common::String generateSaveName(int slot);
+
 	void writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegameHeader &header);
 
 	static bool readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index bc7b545719..cd5d48033a 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -23,6 +23,7 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/graphics.h"
 #include "common/scummsys.h"
+#include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "engines/util.h"
 
@@ -49,6 +50,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_onChessboard = false;
 	_slowChess = false;
 	_keyPadSpeed = 0;
+	_loadGameSlot = -1;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -95,8 +97,20 @@ void SherlockEngine::initialize() {
 Common::Error SherlockEngine::run() {
 	initialize();
 
-	// Temporarily disabled for now
-//	showOpening();
+	// If requested, load a savegame instead of showing the intro
+	if (ConfMan.hasKey("save_slot")) {
+		int saveSlot = ConfMan.getInt("save_slot");
+		if (saveSlot >= 1 && saveSlot <= MAX_SAVEGAME_SLOTS)
+			_loadGameSlot = saveSlot;
+	}
+
+	if (_loadGameSlot != -1) {
+		_saves->loadGame(_loadGameSlot);
+		_loadGameSlot = -1;
+	} else {
+		// Temporarily disabled for now
+		//	showOpening();
+	}
 
 	while (!shouldQuit()) {
 		// Prepare for scene, and handle any game-specific scenes. This allows 
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 48850fff06..09e969884c 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -107,6 +107,7 @@ public:
 	bool _onChessboard;
 	bool _slowChess;
 	int _keyPadSpeed;
+	int _loadGameSlot;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
-- 
cgit v1.2.3


From acf0b01ad80acb54992a36c0123f3c951e2200e3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 07:08:01 -0500
Subject: SHERLOCK: Hook up saving and loading via GMM

---
 engines/sherlock/detection.cpp |  7 +++++++
 engines/sherlock/saveload.cpp  |  4 ----
 engines/sherlock/sherlock.cpp  | 43 ++++++++++++++++++++++++++++++++++++------
 engines/sherlock/sherlock.h    | 10 ++++++++--
 4 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 5d217bd1c5..c4d1c65fd5 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -106,6 +106,13 @@ bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesSupportThumbnail);
 }
 
+bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
+	return
+		(f == kSupportsRTL) ||
+		(f == kSupportsLoadingDuringRuntime) ||
+		(f == kSupportsSavingDuringRuntime);
+}
+
 SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
 	return Sherlock::SaveManager(nullptr, "").getSavegameList(target);
 }
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 207eff1ab4..7610c42d8c 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -383,10 +383,6 @@ void SaveManager::synchronize(Common::Serializer &s) {
 
 	if (screen.fontNumber() != oldFont)
 		journal.resetPosition();
-	/*
-	char room_flags[MAX_ROOMS * 9];
-
-		*/
 
 	_vm->_loadingSavedGame = true;
 	_justLoaded = true;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index cd5d48033a..518a7aa86b 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -51,6 +51,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_slowChess = false;
 	_keyPadSpeed = 0;
 	_loadGameSlot = -1;
+	_canLoadSave = false;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -147,8 +148,11 @@ void SherlockEngine::sceneLoop() {
 		// Handle any input from the keyboard or mouse
 		handleInput();
 
-		if (_scene->_hsavedPos.x == -1)
+		if (_scene->_hsavedPos.x == -1) {
+			_canLoadSave = true;
 			_scene->doBgAnim();
+			_canLoadSave = false;
+		}
 	}
 
 	_scene->freeScene();
@@ -160,7 +164,9 @@ void SherlockEngine::sceneLoop() {
  * Handle all player input
  */
 void SherlockEngine::handleInput() {
+	_canLoadSave = true;
 	_events->pollEventsAndWait();
+	_canLoadSave = false;
 
 	// See if a key or mouse button is pressed
 	_events->setButtonState();
@@ -190,15 +196,10 @@ void SherlockEngine::setFlags(int flagNum) {
 	_scene->checkSceneFlags(true);
 }
 
-void SherlockEngine::freeSaveGameList() {
-	// TODO
-}
-
 void SherlockEngine::saveConfig() {
 	// TODO
 }
 
-
 /**
  * Synchronize the data for a savegame
  */
@@ -207,4 +208,34 @@ void SherlockEngine::synchronize(Common::Serializer &s) {
 		s.syncAsByte(_flags[idx]);
 }
 
+/**
+ * Returns true if a savegame can be loaded
+ */
+bool SherlockEngine::canLoadGameStateCurrently() {
+	return _canLoadSave;
+}
+
+/**
+ * Returns true if the game can be saved
+ */
+bool SherlockEngine::canSaveGameStateCurrently() {
+	return _canLoadSave;
+}
+
+/**
+ * Called by the GMM to load a savegame
+ */
+Common::Error SherlockEngine::loadGameState(int slot) {
+	_saves->loadGame(slot);
+	return Common::kNoError;
+}
+
+/**
+ * Called by the GMM to save the game
+ */
+Common::Error SherlockEngine::saveGameState(int slot, const Common::String &desc) {
+	_saves->saveGame(slot, desc);
+	return Common::kNoError;
+}
+
 } // End of namespace Comet
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 09e969884c..916c9cd253 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -80,6 +80,8 @@ protected:
 	virtual void showOpening() = 0;
 
 	virtual void startScene() {}
+
+	virtual bool hasFeature(EngineFeature f) const;
 public:
 	const SherlockGameDescription *_gameDescription;
 	Animation *_animation;
@@ -108,12 +110,18 @@ public:
 	bool _slowChess;
 	int _keyPadSpeed;
 	int _loadGameSlot;
+	bool _canLoadSave;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
 
 	virtual Common::Error run();
 
+	virtual bool canLoadGameStateCurrently();
+	virtual bool canSaveGameStateCurrently();
+	virtual Common::Error loadGameState(int slot);
+	virtual Common::Error saveGameState(int slot, const Common::String &desc);
+
 	int getGameType() const;
 	uint32 getGameID() const;
 	uint32 getGameFeatures() const;
@@ -128,8 +136,6 @@ public:
 
 	void setFlags(int flagNum);
 
-	void freeSaveGameList();
-
 	void saveConfig();
 
 	void synchronize(Common::Serializer &s);
-- 
cgit v1.2.3


From 4f04f90a97965e278f5cbda6fbbd36fa493655cb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 07:14:49 -0500
Subject: SHERLOCK: Fix thumbnails for savegames made via in-game files dialog

---
 engines/sherlock/user_interface.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index cb10606562..a3631c577d 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1603,6 +1603,12 @@ void UserInterface::doMainControl() {
 		case 'F':
 			pushButton(10);
 			_menuMode = FILES_MODE;
+
+			// Create a thumbnail of the current screen before the files dialog is shown, in case
+			// the user saves the game
+			saves.createThumbnail();
+
+			// Display the dialog
 			saves.drawInterface();
 			
 			_selector = _oldSelector = -1;
-- 
cgit v1.2.3


From 214cd61afd6ab60f749263a54127dfbd629147dd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 17:23:14 -0500
Subject: SHERLOCK: Fixes for multi-point walking routes

---
 engines/sherlock/map.cpp     |  6 ++++--
 engines/sherlock/objects.cpp |  2 +-
 engines/sherlock/people.cpp  | 18 +++++++++---------
 engines/sherlock/people.h    |  4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 6fd169f43a..6fff48a1d3 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -399,8 +399,10 @@ void Map::walkTheStreets() {
 			people._walkTo.clear();
 
 			if (!reversePath) {
-				people._walkTo = tempPath;
-				people._walkDest = tempPath[0];
+				for (int idx = 0; idx < (int)tempPath.size(); ++idx)
+					people._walkTo.push(tempPath[idx]);
+
+				people._walkDest = tempPath.front();
 			} else {
 				for (int idx = 0; idx < ((int)tempPath.size() - 1); ++idx)
 					people._walkTo.push(tempPath[idx]);
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 82daa90a38..ec8bb4f551 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -291,7 +291,7 @@ void Sprite::checkSprite() {
 						break;
 
 					case WALK_AROUND:
-						if (objBounds.contains(people._walkTo.top())) {
+						if (objBounds.contains(people._walkTo.front())) {
 							// Reached zone
 							people.gotoStand(*this);
 						} else {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 86c560a1d9..0212be69b2 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -554,7 +554,7 @@ void People::goAllTheWay() {
 		++i;
 
 		// See how many points there are between the src and dest zones
-		if (!count || count == 255) {
+		if (!count || count == -1) {
 			// There are none, so just walk to the new zone
 			setWalking();
 		} else {
@@ -563,22 +563,22 @@ void People::goAllTheWay() {
 			_walkTo.clear();
 
 			if (scene._walkDirectory[_srcZone][_destZone] != -1) {
-				for (int idx = 0; idx < count; ++idx, i += 3) {
+				i += 3 * (count - 1);
+				for (int idx = 0; idx < count; ++idx, i -= 3) {
 					_walkTo.push(Common::Point(READ_LE_UINT16(&scene._walkData[i]),
 						scene._walkData[i + 2]));
 				}
 			} else {
-				for (int idx = 0; idx < count; ++idx)
-					_walkTo.push(Common::Point());
-
-				for (int idx = count - 1; idx >= 0; --idx, i += 3) {
-					_walkTo[idx].x = READ_LE_UINT16(&scene._walkData[i]);
-					_walkTo[idx].y = scene._walkData[i + 2];
+				for (int idx = 0; idx < count; ++idx, i += 3) {
+					_walkTo.push(Common::Point(READ_LE_UINT16(&scene._walkData[i]), scene._walkData[i + 2]));
 				}
 			}
 
+			// Final position
+			_walkTo.push(_walkDest);
+
 			// Start walking
-			_walkDest = _walkTo.top();
+			_walkDest = _walkTo.pop();
 			setWalking();
 		}
 	}
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 94f1d05c0d..8a7476a33a 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/serializer.h"
-#include "common/stack.h"
+#include "common/queue.h"
 #include "sherlock/objects.h"
 
 namespace Sherlock {
@@ -74,7 +74,7 @@ private:
 public:
 	ImageFile *_talkPics;
 	Common::Point _walkDest;
-	Common::Stack<Common::Point> _walkTo;
+	Common::Queue<Common::Point> _walkTo;
 	Person &_player;
 	bool _holmesOn;
 	bool _portraitLoaded;
-- 
cgit v1.2.3


From 0a4b722b5d348ba38ab4161cac06597506cbe6cf Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 17:36:50 -0500
Subject: SHERLOCK: Fix leaving scenes via exit zones

---
 engines/sherlock/objects.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index ec8bb4f551..a1ead2c437 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -161,11 +161,15 @@ void Sprite::adjustSprite() {
 		Exit *exit = scene.checkForExit(charRect);
 
 		if (exit) {
-			scene._hsavedPos = exit->_people;
-			scene._hsavedFs = exit->_peopleDir;
+			scene._goToScene = exit->_scene;
 
-			if (scene._hsavedFs > 100 && scene._hsavedPos.x < 1)
-				scene._hsavedPos.x = 100;
+			if (exit->_people.x != 0) {
+				scene._hsavedPos = exit->_people;
+				scene._hsavedFs = exit->_peopleDir;
+
+				if (scene._hsavedFs > 100 && scene._hsavedPos.x < 1)
+					scene._hsavedPos.x = 100;
+			}
 		}		
 	}
 }
-- 
cgit v1.2.3


From afbc333696c11a5a10bd6aa1061eded92836c751 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 18:41:40 -0500
Subject: SHERLOCK: Fix display of overhead map

---
 engines/sherlock/map.cpp             | 33 +++++++++++++++++++++------------
 engines/sherlock/map.h               |  3 ++-
 engines/sherlock/scalpel/scalpel.cpp | 11 +++++++++--
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 6fff48a1d3..e07dedf7dd 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -34,7 +34,7 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_charPoint = _oldCharPoint = -1;
 	_cursorIndex = -1;
 	_drawMap = false;
-	for (int idx = 0; idx < 3; ++idx)
+	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
 
 	loadData();
@@ -49,6 +49,15 @@ void Map::loadPoints(int count, const int *xList, const int *yList, const int *t
 	}
 }
 
+/**
+ * Load the sequence data for player icon animations
+ */
+void Map::loadSequences(int count, const byte *seq) {
+	for (int idx = 0; idx < count; ++idx, seq += MAX_FRAME)
+		Common::copy(seq, seq + MAX_FRAME, &_sequences[idx][0]);
+}
+
+
 /**
  * Load data  needed for the map
  */
@@ -108,10 +117,10 @@ int Map::show() {
 	// Load need sprites
 	setupSprites();
 
-	screen._backBuffer1.blitFrom(bigMap[1], Common::Point(-_bigPos.x, -_bigPos.y));
-	screen._backBuffer1.blitFrom(bigMap[2], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
-	screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
-	screen._backBuffer1.blitFrom(bigMap[4], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[0], Common::Point(-_bigPos.x, -_bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[1], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[2], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
+	screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
 
 	_drawMap = true;
 	_point = -1;
@@ -168,10 +177,10 @@ int Map::show() {
 			// Map has scrolled, so redraw new map view
 			changed = false;
 
-			screen._backBuffer1.blitFrom(bigMap[1], Common::Point(-_bigPos.x, -_bigPos.y));
-			screen._backBuffer1.blitFrom(bigMap[2], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
-			screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
-			screen._backBuffer1.blitFrom(bigMap[4], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[0], Common::Point(-_bigPos.x, -_bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[1], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[2], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y));
+			screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
 
 			showPlaces();
 			_placesShown = false;
@@ -249,7 +258,7 @@ void Map::setupSprites() {
 	p._type = CHARACTER;
 	p._position = Common::Point(12400, 5000);
 	p._sequenceNumber = 0;
-	p._sequences = (Sequences *)&_sequences;
+	p._sequences = &_sequences;
 	p._images = _shapes;
 	p._imageFrame = nullptr;
 	p._frameNumber = 0;
@@ -283,13 +292,13 @@ void Map::showPlaces() {
 	Screen &screen = *_vm->_screen;
 
 	for (uint idx = 0; idx < _points.size(); ++idx) {
-		const Common::Point &pt = _points[idx];
+		const MapEntry &pt = _points[idx];
 
 		if (pt.x != 0 && pt.y != 0) {
 			if (pt.x >= _bigPos.x && (pt.x - _bigPos.x) < SHERLOCK_SCREEN_WIDTH
 					&& pt.y >= _bigPos.y && (pt.y - _bigPos.y) < SHERLOCK_SCREEN_HEIGHT) {
 				if (_vm->readFlags(idx)) {
-					screen._backBuffer1.transBlitFrom((*_iconShapes)[idx], 
+					screen._backBuffer1.transBlitFrom((*_iconShapes)[pt._translate], 
 						Common::Point(pt.x - _bigPos.x - 6, pt.y - _bigPos.y - 12));
 				}
 			}
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index f324160bce..5b63fe768c 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -56,7 +56,7 @@ private:
 	ImageFile *_mapCursors;
 	ImageFile *_shapes;
 	ImageFile *_iconShapes;
-	byte _sequences[3][MAX_FRAME];
+	byte _sequences[MAX_HOLMES_SEQUENCE][MAX_FRAME];
 	Common::Point _bigPos;
 	Common::Point _overPos;
 	Common::Point _lDrawnPos;
@@ -89,6 +89,7 @@ public:
 	const MapEntry &operator[](int idx) { return _points[idx]; }
 
 	void loadPoints(int count, const int *xList, const int *yList, const int *transList);
+	void loadSequences(int count, const byte *seq);
 
 	int show();
 };
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 4e49a6b4d3..2ca9f80c42 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -39,12 +39,18 @@ const int MAP_Y[NUM_PLACES] = {
 	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0 
 };
 
-int MAP_TRANSLATE[NUM_PLACES] = { 
+const int MAP_TRANSLATE[NUM_PLACES] = {
 	0, 0, 0, 1, 0, 2, 0, 3, 4, 0, 4, 6, 0, 0, 0, 8, 9, 10, 11, 0, 12, 13, 14, 7,
 	15, 16, 17, 18, 19, 0, 20, 21, 22, 23, 0, 24, 0, 25, 0, 26, 0, 0, 0, 27,
 	28, 0, 29, 0, 0, 30, 0 
 };
 
+const byte MAP_SEQUENCES[3][MAX_FRAME] = {
+	{ 1, 1, 2, 3, 4, 0 },     // Overview Still
+	{ 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 },
+	{ 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 }
+};
+
 #define MAX_PEOPLE 66
 
 const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
@@ -209,8 +215,9 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
-	// Load the map co-ordinates for each scene
+	// Load the map co-ordinates for each scene and sequence data
 	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
+	_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
 
 	// Load the inventory
 	loadInventory();
-- 
cgit v1.2.3


From 1ae176f3eb2e392d400095d734895728f0a5eabc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 19:44:57 -0500
Subject: SHERLOCK: Fix display of location names on overhead map

---
 engines/sherlock/map.cpp | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
 engines/sherlock/map.h   |  3 ++
 2 files changed, 77 insertions(+)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index e07dedf7dd..b89b4b29fa 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -113,6 +113,7 @@ int Map::show() {
 
 	// Load the entire map
 	ImageFile bigMap("bigmap.vgs");
+	screen.setPalette(bigMap._palette);
 
 	// Load need sprites
 	setupSprites();
@@ -194,6 +195,10 @@ int Map::show() {
 				_placesShown = true;
 			}
 
+			if (_cursorIndex == 0) {
+				Common::Point pt = events.mousePos();
+				highlightIcon(Common::Point(pt.x - 4 + _bigPos.x, pt.y + _bigPos.y));
+			}
 			updateMap(false);
 		}
 
@@ -321,6 +326,34 @@ void Map::eraseTopLine() {
 	screen.blitFrom(_topLine, Common::Point(0, 0));
 }
 
+/**
+ * Prints the name of the specified icon
+ */
+void Map::showPlaceName(int idx, bool highlighted) {
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+
+	Common::String name = _locationNames[idx];
+	int width = screen.stringWidth(name);
+
+	if (!_cursorIndex) {
+		saveIcon(people[AL]._imageFrame, _lDrawnPos);
+		
+		bool flipped = people[AL]._sequenceNumber == MAP_DOWNLEFT || people[AL]._sequenceNumber == MAP_LEFT
+			|| people[AL]._sequenceNumber == MAP_UPLEFT;
+		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, _lDrawnPos, flipped);
+	}
+
+	if (highlighted) {
+		int xp = (SHERLOCK_SCREEN_WIDTH - screen.stringWidth(name)) / 2;
+		screen.gPrint(Common::Point(xp + 2, 2), 0, name.c_str());
+		screen.gPrint(Common::Point(xp + 1, 1), 0, name.c_str());
+		screen.gPrint(Common::Point(xp, 0), 12, name.c_str());
+
+		screen.slamArea(xp, 0, screen.stringWidth(name) + 2, 15);
+	}
+}
+
 /**
  * Update all on-screen sprites to account for any scrolling of the map
  */
@@ -473,4 +506,45 @@ void Map::restoreIcon() {
 		screen._backBuffer1.blitFrom(_iconSave, _savedPos);
 }
 
+/**
+ * Handles highlighting map icons, showing their names
+ */
+void Map::highlightIcon(const Common::Point &pt) {
+	int oldPoint = _point;
+
+	// Iterate through the icon list
+	bool done = false;
+	for (uint idx = 0; idx < _points.size(); ++idx) {
+		const MapEntry &entry = _points[idx];
+
+		// Check whether the mouse is over a given icon
+		if (entry.x != 0 && entry.y != 0) {
+			if (Common::Rect(entry.x - 8, entry.y - 8, entry.x + 9, entry.y + 9).contains(pt)) {
+				done = true;
+
+				if (_point != idx && _vm->readFlags(idx)) {
+					// Changed to a new valid (visible) location
+					eraseTopLine();
+					showPlaceName(idx, true);
+					_point = idx;
+				}
+			}
+		}
+	}
+
+	if (!done) {
+		// No icon was highlighted
+		if (_point != -1) {
+			// No longer highlighting previously highlighted icon, so erase it
+			showPlaceName(_point, false);
+			eraseTopLine();
+		}
+
+		_point = -1;
+	} else if (oldPoint != -1 && oldPoint != _point) {
+		showPlaceName(oldPoint, false);
+		eraseTopLine();
+	}
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 5b63fe768c..752137e0ba 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -76,6 +76,7 @@ private:
 
 	void saveTopLine();
 	void eraseTopLine();
+	void showPlaceName(int idx, bool highlighted);
 
 	void updateMap(bool flushScreen);
 
@@ -83,6 +84,8 @@ private:
 
 	void saveIcon(ImageFrame *src, const Common::Point &pt);
 	void restoreIcon();
+
+	void highlightIcon(const Common::Point &pt);
 public:
 	Map(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 02e604ce8c2b0a4f136a6d0815b55046c58ad92d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 19:59:27 -0500
Subject: SHERLOCK: Fix display of Holmes' icon on overhead map

---
 engines/sherlock/map.cpp      | 25 +++++++++++++++----------
 engines/sherlock/map.h        |  3 ++-
 engines/sherlock/objects.cpp  |  7 ++++---
 engines/sherlock/people.cpp   | 13 +++++++------
 engines/sherlock/sherlock.cpp |  1 -
 engines/sherlock/sherlock.h   |  1 -
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index b89b4b29fa..5173e0296e 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -26,14 +26,15 @@
 namespace Sherlock {
 
 Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
+	_active = false;
 	_mapCursors = nullptr;
 	_shapes = nullptr;
 	_iconShapes = nullptr;
 	_point = 0;
 	_placesShown = false;
-	_charPoint = _oldCharPoint = -1;
 	_cursorIndex = -1;
 	_drawMap = false;
+	_overPos = Common::Point(13000, 12600);
 	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
 
@@ -103,9 +104,11 @@ void Map::loadData() {
 int Map::show() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Common::Point lDrawn(-1, -1);
 	bool changed = false, exitFlag = false;
+	_active = true;
 
 	// Set font and custom cursor for the map
 	int oldFont = screen.fontNumber();
@@ -204,7 +207,7 @@ int Map::show() {
 
 		if ((events._released || events._rightReleased) && _point != -1) {
 			if (people[AL]._walkCount == 0) {
-				_charPoint = _point;
+				scene._charPoint = _point;
 				walkTheStreets();
 
 				_cursorIndex = 1;
@@ -214,7 +217,7 @@ int Map::show() {
 
 		// Check if a scene has beeen selected and we've finished "moving" to it
 		if (people[AL]._walkCount == 0) {
-			if (_charPoint >= 1 && _charPoint < (int)_points.size())
+			if (scene._charPoint >= 1 && scene._charPoint < (int)_points.size())
 				exitFlag = true;
 		}
 
@@ -238,7 +241,8 @@ int Map::show() {
 	screen.setFont(oldFont);
 	events.setCursor(ARROW);
 
-	return _charPoint;
+	_active = false;
+	return scene._charPoint;
 }
 
 /**
@@ -350,7 +354,7 @@ void Map::showPlaceName(int idx, bool highlighted) {
 		screen.gPrint(Common::Point(xp + 1, 1), 0, name.c_str());
 		screen.gPrint(Common::Point(xp, 0), 12, name.c_str());
 
-		screen.slamArea(xp, 0, screen.stringWidth(name) + 2, 15);
+		screen.slamArea(xp, 0, width + 2, 15);
 	}
 }
 
@@ -408,21 +412,22 @@ void Map::updateMap(bool flushScreen) {
  */
 void Map::walkTheStreets() {
 	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
 	bool reversePath = false;
 	Common::Array<Common::Point> tempPath;
 
 	// Get indexes into the path lists for the start and destination scenes
-	int start = _points[_oldCharPoint]._translate;
-	int dest = _points[_charPoint]._translate;
+	int start = _points[scene._oldCharPoint]._translate;
+	int dest = _points[scene._charPoint]._translate;
 
 	// Get pointer to start of path
 	const int *ptr = &_paths[start][dest];
 
 	// Check for any intermediate points between the two locations
-	if (*ptr || _charPoint > 50 || _oldCharPoint > 50) {
+	if (*ptr || scene._charPoint > 50 || scene._oldCharPoint > 50) {
 		people[AL]._sequenceNumber = -1;
 
-		if (_charPoint == 51 || _oldCharPoint == 51) {
+		if (scene._charPoint == 51 || scene._oldCharPoint == 51) {
 			people.setWalking();
 		} else {
 			// Check for moving the path backwards or forwards
@@ -514,7 +519,7 @@ void Map::highlightIcon(const Common::Point &pt) {
 
 	// Iterate through the icon list
 	bool done = false;
-	for (uint idx = 0; idx < _points.size(); ++idx) {
+	for (int idx = 0; idx < (int)_points.size(); ++idx) {
 		const MapEntry &entry = _points[idx];
 
 		// Check whether the mouse is over a given icon
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 752137e0ba..da55a5e383 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -62,7 +62,6 @@ private:
 	Common::Point _lDrawnPos;
 	int _point;
 	bool _placesShown;
-	int _charPoint, _oldCharPoint;
 	int _cursorIndex;
 	bool _drawMap;
 	Surface _iconSave;
@@ -86,6 +85,8 @@ private:
 	void restoreIcon();
 
 	void highlightIcon(const Common::Point &pt);
+public:
+	bool _active;
 public:
 	Map(SherlockEngine *vm);
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a1ead2c437..e5c6f847fb 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -81,6 +81,7 @@ void Sprite::setImageFrame() {
  * This adjusts the sprites position, as well as it's animation sequence:
  */
 void Sprite::adjustSprite() {
+	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
@@ -105,7 +106,7 @@ void Sprite::adjustSprite() {
 		}
 	}
 
-	if (_type == CHARACTER && !_vm->_onChessboard) {
+	if (_type == CHARACTER && !map._active) {
 		if ((_position.y / 100) > LOWER_LIMIT) {
 			_position.y = LOWER_LIMIT * 100;
 			people.gotoStand(*this);
@@ -120,12 +121,12 @@ void Sprite::adjustSprite() {
 			_position.x = LEFT_LIMIT * 100;
 			people.gotoStand(*this);
 		}
-	} else if (!_vm->_onChessboard) {
+	} else if (!map._active) {
 		_position.y = CLIP((int)_position.y, UPPER_LIMIT, LOWER_LIMIT);
 		_position.x = CLIP((int)_position.x, LEFT_LIMIT, RIGHT_LIMIT);
 	}
 
-	if (!_vm->_onChessboard || (_vm->_slowChess = !_vm->_slowChess))
+	if (!map._active || (_vm->_slowChess = !_vm->_slowChess))
 		++_frameNumber;
 
 	if ((*_sequences)[_sequenceNumber][_frameNumber] == 0) {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 0212be69b2..d247109a28 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -270,6 +270,7 @@ bool People::freeWalk() {
 * check for any obstacles in the path.
 */
 void People::setWalking() {
+	Map &map = *_vm->_map;
 	Scene &scene = *_vm->_scene;
 	int oldDirection, oldFrame;
 	Common::Point speed, delta;
@@ -284,7 +285,7 @@ void People::setWalking() {
 	oldFrame = _player._frameNumber;
 
 	// Set speed to use horizontal and vertical movement
-	if (_vm->_onChessboard) {
+	if (map._active) {
 		speed = Common::Point(MWALK_SPEED, MWALK_SPEED);
 	} else {
 		speed = Common::Point(XWALK_SPEED, YWALK_SPEED);
@@ -321,10 +322,10 @@ void People::setWalking() {
 			// Set the initial frame sequence for the left and right, as well
 			// as settting the delta x depending on direction
 			if (_walkDest.x < (_player._position.x / 100)) {
-				_player._sequenceNumber = _vm->_onChessboard ? MAP_LEFT : WALK_LEFT;
+				_player._sequenceNumber = map._active ? MAP_LEFT : WALK_LEFT;
 				_player._delta.x = speed.x * -100;
 			} else {
-				_player._sequenceNumber = _vm->_onChessboard ? MAP_RIGHT : WALK_RIGHT;
+				_player._sequenceNumber = map._active ? MAP_RIGHT : WALK_RIGHT;
 				_player._delta.x = speed.x * 100;
 			}
 
@@ -348,7 +349,7 @@ void People::setWalking() {
 
 			// See if the sequence needs to be changed for diagonal walking
 			if (_player._delta.y > 150) {
-				if (!_vm->_onChessboard) {
+				if (!map._active) {
 					switch (_player._sequenceNumber) {
 					case WALK_LEFT:
 						_player._sequenceNumber = WALK_DOWNLEFT;
@@ -359,7 +360,7 @@ void People::setWalking() {
 					}
 				}
 			} else if (_player._delta.y < -150) {
-				if (!_vm->_onChessboard) {
+				if (!map._active) {
 					switch (_player._sequenceNumber) {
 					case WALK_LEFT:
 						_player._sequenceNumber = WALK_UPLEFT;
@@ -447,7 +448,7 @@ void People::gotoStand(Sprite &sprite) {
 	if (_oldWalkSequence != -1 || sprite._sequenceNumber == STOP_UP)
 		sprite._frameNumber = 0;
 
-	if (_vm->_onChessboard) {
+	if (map._active) {
 		sprite._sequenceNumber = 0;
 		_data[AL]._position.x = (map[scene._charPoint].x -  6) * 100;
 		_data[AL]._position.y = (map[scene._charPoint].x + 10) * 100;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 518a7aa86b..d880257406 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -47,7 +47,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_ui = nullptr;
 	_useEpilogue2 = false;
 	_loadingSavedGame = false;
-	_onChessboard = false;
 	_slowChess = false;
 	_keyPadSpeed = 0;
 	_loadGameSlot = -1;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 916c9cd253..ce126c0dcc 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -106,7 +106,6 @@ public:
 	bool _loadingSavedGame;
 	int _oldCharPoint;					// Old scene
 	Common::Point _over;				// Old map position
-	bool _onChessboard;
 	bool _slowChess;
 	int _keyPadSpeed;
 	int _loadGameSlot;
-- 
cgit v1.2.3


From e24ae07a90ccd0139112d5c086d49173834fa4a1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Apr 2015 21:11:26 -0500
Subject: SHERLOCK: Fix map path loading

---
 engines/sherlock/map.cpp     | 60 +++++++++++++++++++++++++++++++++-----------
 engines/sherlock/map.h       | 12 ++++++++-
 engines/sherlock/objects.cpp |  2 +-
 3 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 5173e0296e..0864997dff 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -25,6 +25,33 @@
 
 namespace Sherlock {
 
+/**
+ * Load the data for the paths between locations on the map
+ */
+void MapPaths::load(int numLocations, Common::SeekableReadStream &s) {
+	_numLocations = numLocations;
+	_paths.resize(_numLocations * _numLocations);
+
+	for (int idx = 0; idx < (numLocations * numLocations); ++idx) {
+		Common::Array<byte> &path = _paths[idx];
+		int v;
+
+		do {
+			v = s.readByte();
+			path.push_back(v);
+		} while (v && v < 254);
+	}
+}
+
+/**
+ * Get the path between two locations on the map
+ */
+const byte *MapPaths::getPath(int srcLocation, int destLocation) {
+	return &_paths[srcLocation * _numLocations + destLocation][0];
+}
+
+/*----------------------------------------------------------------*/
+
 Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_active = false;
 	_mapCursors = nullptr;
@@ -80,15 +107,10 @@ void Map::loadData() {
 	// Load the path data
 	Common::SeekableReadStream *pathStream = _vm->_res->load("chess.pth");
 
-	_paths.resize(31);
-	for (uint idx = 0; idx < _paths.size(); ++idx) {
-		_paths[idx].resize(_paths.size());
+	// Get routes between different locations on the map
+	_paths.load(31, *pathStream);
 
-		for (uint idx2 = 0; idx2 < _paths.size(); ++idx2)
-			_paths[idx][idx2] = pathStream->readSint16LE();
-	}
-
-	// Load in the path point information
+	// Load in the co-ordinates that the paths refer to
 	_pathPoints.resize(208);
 	for (uint idx = 0; idx < _pathPoints.size(); ++idx) {
 		_pathPoints[idx].x = pathStream->readSint16LE();
@@ -207,9 +229,13 @@ int Map::show() {
 
 		if ((events._released || events._rightReleased) && _point != -1) {
 			if (people[AL]._walkCount == 0) {
+				people._walkDest = _points[_point] + Common::Point(4, 9);
 				scene._charPoint = _point;
+
+				// Start walking to selected location
 				walkTheStreets();
 
+				// Show wait cursor
 				_cursorIndex = 1;
 				events.setCursor((*_mapCursors)[_cursorIndex]);
 			}
@@ -373,7 +399,7 @@ void Map::updateMap(bool flushScreen) {
 		if (++_cursorIndex > (1 + 8))
 			_cursorIndex = 1;
 
-		events.setCursor((*_mapCursors)[_cursorIndex]);
+		events.setCursor((*_mapCursors)[(_cursorIndex + 1) / 2]);
 	}
 
 	if (!_drawMap && !flushScreen)
@@ -421,26 +447,30 @@ void Map::walkTheStreets() {
 	int dest = _points[scene._charPoint]._translate;
 
 	// Get pointer to start of path
-	const int *ptr = &_paths[start][dest];
+	const byte *path = _paths.getPath(start, dest);
+
+	// Add in destination position
+	people._walkTo.clear();
+	people._walkTo.push(people._walkDest);
 
 	// Check for any intermediate points between the two locations
-	if (*ptr || scene._charPoint > 50 || scene._oldCharPoint > 50) {
+	if (path[0] || scene._charPoint > 50 || scene._oldCharPoint > 50) {
 		people[AL]._sequenceNumber = -1;
 
 		if (scene._charPoint == 51 || scene._oldCharPoint == 51) {
 			people.setWalking();
 		} else {
 			// Check for moving the path backwards or forwards
-			if (*ptr == 255) {
+			if (path[0] == 255) {
 				reversePath = true;
 				SWAP(start, dest);
-				ptr = &_paths[start][dest];
+				path = _paths.getPath(start, dest);
 			}
 
 			do {
-				int idx = *ptr++;
+				int idx = *path++;
 				tempPath.push_back(_pathPoints[idx - 1] + Common::Point(4, 4));
-			} while (*ptr != 254);
+			} while (*path != 254);
 
 			// Load up the path to use
 			people._walkTo.clear();
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index da55a5e383..a91e7ae968 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -43,12 +43,22 @@ struct MapEntry : Common::Point {
 	MapEntry(int x, int y, int translate) : Common::Point(x, y), _translate(translate) {}
 };
 
+class MapPaths {
+private:
+	int _numLocations;
+	Common::Array< Common::Array<byte> > _paths;
+public:
+	void load(int numLocations, Common::SeekableReadStream &s);
+
+	const byte *getPath(int srcLocation, int destLocation);
+};
+
 class Map {
 private:
 	SherlockEngine *_vm;
 	Common::Array<MapEntry> _points;	// Map locations for each scene
 	Common::StringArray _locationNames;
-	Common::Array< Common::Array<int> > _paths;
+	MapPaths _paths;
 	Common::Array<Common::Point> _pathPoints;
 	Common::Point _savedPos;
 	Common::Point _savedSize;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index e5c6f847fb..262006b3b1 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -474,7 +474,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_defaultCommand = s.readByte();
 	_lookFlag = s.readUint16LE();
 	_pickupFlag = s.readUint16LE();
-	_requiredFlag = s.readUint16LE();
+	_requiredFlag = s.readSint16LE();
 	_noShapeSize.x = s.readUint16LE();
 	_noShapeSize.y = s.readUint16LE();
 	_status = s.readUint16LE();
-- 
cgit v1.2.3


From 179ef7adb2c7dd0eb790a58748ad374ce92b898d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 23 Apr 2015 18:54:07 +0200
Subject: SCI: fix Camelot save on map screen bug #6744

don't put restored script windows into
_windowList[]
---
 engines/sci/engine/savegame.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 61f8058e45..d146cba204 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -772,10 +772,17 @@ void GfxPorts::saveLoadWithSerializer(Common::Serializer &s) {
 				if (window->counterTillFree) {
 					_freeCounter++;
 				} else {
-					if (window->wndStyle & SCI_WINDOWMGR_STYLE_TOPMOST)
-						_windowList.push_front(window);
-					else
-						_windowList.push_back(window);
+					// we don't put the saved script windows into _windowList[], so that they aren't used
+					//  by kernel functions. This is important and would cause issues otherwise.
+					//  see Conquests of Camelot - bug #6744 - when saving on the map screen (room 103),
+					//                                restoring would result in a black window in place
+					//                                where the area name was displayed before
+					//                                In Sierra's SCI the behaviour is identical to us
+					//                                 Sierra's SCI won't show those windows after restoring
+					// If this should cause issues in another game, we would have to add a flag to simply
+					//  avoid any drawing operations for such windows
+					// We still have to restore script windows, because for example Conquests of Camelot
+					//  will immediately delete windows, that were created before saving the game.
 				}
 
 				windowCount--;
-- 
cgit v1.2.3


From ecaa4c26c953524bdf34fa55cfdf6c55af129bc4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 00:53:19 -0500
Subject: SHERLOCK: Fix pathfinding for movement on map screen

---
 engines/sherlock/map.cpp    | 20 +++++++++-----------
 engines/sherlock/people.cpp |  4 +++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 0864997dff..6e9982eb62 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -263,9 +263,8 @@ int Map::show() {
 	freeSprites();
 	_overPos = people[AL]._position;
 
-	// Reset font and cursor
+	// Reset font
 	screen.setFont(oldFont);
-	events.setCursor(ARROW);
 
 	_active = false;
 	return scene._charPoint;
@@ -451,7 +450,7 @@ void Map::walkTheStreets() {
 
 	// Add in destination position
 	people._walkTo.clear();
-	people._walkTo.push(people._walkDest);
+	Common::Point destPos = people._walkDest;
 
 	// Check for any intermediate points between the two locations
 	if (path[0] || scene._charPoint > 50 || scene._oldCharPoint > 50) {
@@ -475,24 +474,23 @@ void Map::walkTheStreets() {
 			// Load up the path to use
 			people._walkTo.clear();
 
-			if (!reversePath) {
-				for (int idx = 0; idx < (int)tempPath.size(); ++idx)
+			if (reversePath) {
+				for (int idx = (int)tempPath.size() - 1; idx >= 0; --idx)
 					people._walkTo.push(tempPath[idx]);
-
-				people._walkDest = tempPath.front();
 			} else {
-				for (int idx = 0; idx < ((int)tempPath.size() - 1); ++idx)
+				for (int idx = 0; idx < (int)tempPath.size(); ++idx)
 					people._walkTo.push(tempPath[idx]);
-				people._walkDest = tempPath[tempPath.size() - 1];
 			}
 
-			people._walkDest.x += 12;
-			people._walkDest.y += 6;
+			people._walkDest = people._walkTo.pop() + Common::Point(12, 6);
 			people.setWalking();
 		}
 	} else {
 		people[AL]._walkCount = 0;
 	}
+
+	// Store the final destination icon position
+	people._walkTo.push(destPos);
 }
 
 /**
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index d247109a28..e126757231 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -389,7 +389,9 @@ void People::setWalking() {
 			// Set the delta x
 			_player._delta.x = (delta.x * 100) / (delta.y / speed.y);
 			if (_walkDest.x < (_player._position.x / 100))
-				_player._delta.x = -_player._delta.x;
+				_player._delta.x = -_player._delta.x;;
+
+			_player._walkCount = delta.y / speed.y;
 		}
 	}
 
-- 
cgit v1.2.3


From a5edfcc3f5e59a8bb68b6bcbc8d7b6ce72ec633a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 01:35:51 -0500
Subject: SHERLOCK: Fix restoring background as player icon moves on map

---
 engines/sherlock/map.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 6e9982eb62..c3a5ba7b17 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -286,7 +286,7 @@ void Map::setupSprites() {
 
 	_shapes = new ImageFile("mapicon.vgs");
 	_iconShapes = new ImageFile("overicon.vgs");
-
+	_iconSave.create((*_shapes)[4]._width, (*_shapes)[4]._height);
 	Person &p = people[AL];
 	p._description = " ";
 	p._type = CHARACTER;
@@ -317,6 +317,7 @@ void Map::freeSprites() {
 	delete _mapCursors;
 	delete _shapes;
 	delete _iconShapes;
+	_iconSave.free();
 }
 
 /**
@@ -523,9 +524,11 @@ void Map::saveIcon(ImageFrame *src, const Common::Point &pt) {
 		return;
 	}
 
-	_iconSave.create(size.x, size.y);
+	assert(size.x <= _iconSave.w && size.y <= _iconSave.h);
 	_iconSave.blitFrom(screen._backBuffer1, Common::Point(0, 0),
 		Common::Rect(pos.x, pos.y, pos.x + size.x, pos.y + size.y));
+	_savedPos = pos;
+	_savedSize = size;
 }
 
 /**
@@ -536,7 +539,7 @@ void Map::restoreIcon() {
 
 	if (_savedPos.x >= 0 && _savedPos.y >= 0 && _savedPos.x <= SHERLOCK_SCREEN_WIDTH
 			&& _savedPos.y < SHERLOCK_SCREEN_HEIGHT)
-		screen._backBuffer1.blitFrom(_iconSave, _savedPos);
+		screen._backBuffer1.blitFrom(_iconSave, _savedPos, Common::Rect(0, 0, _savedSize.x, _savedSize.y));
 }
 
 /**
-- 
cgit v1.2.3


From e2b233e0bb62e14fcf454cda74966dd5df071654 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 01:47:25 -0500
Subject: SHERLOCK: Fix button display in talk dialog

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 6740e89efc..3eeb0f0af5 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -672,7 +672,7 @@ void Talk::drawInterface() {
 		screen.makeButton(Common::Rect(99, CONTROLS_Y, 139, CONTROLS_Y + 10),
 			119 - screen.stringWidth("Exit") / 2, "Exit");
 		screen.makeButton(Common::Rect(140, CONTROLS_Y, 180, CONTROLS_Y + 10),
-			159 - screen.stringWidth("Up"), "Up");
+			159 - screen.stringWidth("Up") / 2, "Up");
 		screen.makeButton(Common::Rect(181, CONTROLS_Y, 221, CONTROLS_Y + 10),
 			200 - screen.stringWidth("Down") / 2, "Down");
 	} else {
-- 
cgit v1.2.3


From 572ad464901eedfd20ab5a35149e669f4bcac64a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 02:17:59 -0500
Subject: SHERLOCK: Fix talk sequences being incorrectly started

---
 engines/sherlock/objects.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 262006b3b1..888c34fa04 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -195,17 +195,17 @@ void Sprite::checkSprite() {
 
 		for (uint idx = 0; idx < scene._bgShapes.size() && !talk._talkToAbort; ++idx) {
 			Object &obj = scene._bgShapes[idx];
+			if (obj._aType <= PERSON || obj._type == INVALID || obj._type == HIDDEN)
+				continue;
 
-			if (obj._aType > PERSON && obj._type != INVALID && obj._type != HIDDEN) {
-				if (obj._type == NO_SHAPE) {
-					objBounds = Common::Rect(obj._position.x, obj._position.y,
-						obj._position.x + obj._noShapeSize.x, obj._position.y + obj._noShapeSize.y);
-				} else {
-					int xp = obj._position.x + obj._imageFrame->_offset.x;
-					int yp = obj._position.y + obj._imageFrame->_offset.y;
-					objBounds = Common::Rect(xp, yp,
-						xp + obj._imageFrame->_frame.w, yp + obj._imageFrame->_frame.h);
-				}
+			if (obj._type == NO_SHAPE) {
+				objBounds = Common::Rect(obj._position.x, obj._position.y,
+					obj._position.x + obj._noShapeSize.x, obj._position.y + obj._noShapeSize.y);
+			} else {
+				int xp = obj._position.x + obj._imageFrame->_offset.x;
+				int yp = obj._position.y + obj._imageFrame->_offset.y;
+				objBounds = Common::Rect(xp, yp,
+					xp + obj._imageFrame->_frame.w, yp + obj._imageFrame->_frame.h);
 			}
 
 			if (objBounds.contains(pt)) {
-- 
cgit v1.2.3


From 79a3db42e1d9809facdd551f71744656073c1eb9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 02:29:18 -0500
Subject: SHERLOCK: Fix 'Press any key' interface messages

---
 engines/sherlock/user_interface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index a3631c577d..690eba2c84 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -72,8 +72,8 @@ const int SETUP_POINTS[12][4]  = {
 
 const char COMMANDS[13] = "LMTPOCIUGJFS";
 const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
-const char *const PRESS_KEY_FOR_MORE = "Press any _key for More.";
-const char *const PRESS_KEY_TO_CONTINUE = "Press any _key to Continue.";
+const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
+const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
 
 const char *const MOPEN[] = { 
 	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "." 
-- 
cgit v1.2.3


From ecd50997ddaaf4c8ac648ecdb8bea1177f128610 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 04:00:46 -0500
Subject: SHERLOCK: Fix Sherlock disappearing when walking to examine objects

---
 engines/sherlock/user_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 690eba2c84..903b1e6002 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -715,7 +715,7 @@ void UserInterface::examine() {
 			scene.startCAnim(_cNum, canimSpeed);
 		} else if (obj._lookPosition.y != 0) {
 			// Need to walk to the object to be examined
-			people.walkToCoords(obj._lookPosition, obj._lookFacing);
+			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100), obj._lookFacing);
 		}
 
 		if (!talk._talkToAbort) {
-- 
cgit v1.2.3


From 51eb601f8393876a4ff847a5f4ff9068acd66fc8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 05:12:30 -0500
Subject: SHERLOCK: Fix loading/handling of sprite offsets

---
 engines/sherlock/objects.cpp   |  4 ++--
 engines/sherlock/resources.cpp |  4 ++--
 engines/sherlock/scene.cpp     | 53 +++++++++++++++++++-----------------------
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 888c34fa04..9e92b95532 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -691,8 +691,8 @@ bool Object::checkEndOfSequence() {
 
 			if (seq == 99) {
 				--_frameNumber;
-				screen._backBuffer1.transBlitFrom(_imageFrame->_frame, _position);
-				screen._backBuffer2.transBlitFrom(_imageFrame->_frame, _position);
+				screen._backBuffer1.transBlitFrom(*_imageFrame, _position);
+				screen._backBuffer2.transBlitFrom(*_imageFrame, _position);
 				_type = INVALID;
 			} else {
 				setObjSequence(seq, false);
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 262832c3c3..0d66646286 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -298,8 +298,8 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
 		frame._paletteBase = stream.readByte();
-		frame._offset.x = stream.readUint16LE();
-		frame._rleEncoded = ((frame._offset.x & 0xFF) == 1);
+		frame._rleEncoded = stream.readByte() == 1;
+		frame._offset.x = stream.readByte();
 		frame._offset.y = stream.readByte();
 
 		frame._rleEncoded = !skipPalette && frame._rleEncoded;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 316b8739b1..e5d9fc611f 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -710,29 +710,27 @@ void Scene::updateBackground() {
 	// Draw all active shapes which are behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == BEHIND)
-			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
-				_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == BEHIND)
-			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
+			surface.transBlitFrom(*_canimShapes[idx]._imageFrame,
 				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
 	}
 
 	// Draw all active shapes which are normal and behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == NORMAL_BEHIND)
-			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
-			_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all canimations which are normal and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == NORMAL_BEHIND)
-			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
-			_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+				_canimShapes[idx]._flags & 2);
 	}
 
 	// Draw the player if he's active
@@ -741,25 +739,23 @@ void Scene::updateBackground() {
 			player._sequenceNumber == WALK_UPLEFT || player._sequenceNumber == STOP_UPLEFT ||
 			player._sequenceNumber == WALK_DOWNRIGHT || player._sequenceNumber == STOP_DOWNRIGHT;
 
-		surface.transBlitFrom(player._imageFrame->_frame,
-			Common::Point(player._position.x / 100, 
-				player._position.y / 100 - player.frameHeight()), flipped);
+		surface.transBlitFrom(*player._imageFrame, Common::Point(player._position.x / 100, 
+			player._position.y / 100 - player.frameHeight()), flipped);
 	}
 
 	// Draw all static and active shapes that are NORMAL and are in front of the player
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == NORMAL_FORWARD)
-			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
-				_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the player
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_canimShapes[idx]._misc == NORMAL_FORWARD)
-			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
-				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+				_canimShapes[idx]._flags & 2);
 	}
 
 	// Draw all static and active shapes that are FORWARD
@@ -770,16 +766,15 @@ void Scene::updateBackground() {
 
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == FORWARD)
-			surface.transBlitFrom(_bgShapes[idx]._imageFrame->_frame,
-				_bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all static and active canimations that are forward
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 			_canimShapes[idx]._misc == FORWARD)
-			surface.transBlitFrom(_canimShapes[idx]._imageFrame->_frame,
-				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+			surface.transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+				_canimShapes[idx]._flags & 2);
 	}
 }
 
@@ -1196,14 +1191,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 	
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1211,14 +1206,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Draw all canimations which are NORMAL and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1231,7 +1226,7 @@ void Scene::doBgAnim() {
 		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT ||
 			people[AL]._sequenceNumber == WALK_UPLEFT || people[AL]._sequenceNumber == STOP_UPLEFT ||
 			people[AL]._sequenceNumber == WALK_DOWNRIGHT || people[AL]._sequenceNumber == STOP_DOWNRIGHT;
-		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame,
+		screen._backBuffer1.transBlitFrom(*people[AL]._imageFrame,
 			Common::Point(tempX, people[AL]._position.y / 100 - people[AL]._imageFrame->_frame.h), flipped);
 	}
 
@@ -1239,14 +1234,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1254,19 +1249,19 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Draw any active portrait
 	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-		screen._backBuffer1.transBlitFrom(people._portrait._imageFrame->_frame,
+		screen._backBuffer1.transBlitFrom(*people._portrait._imageFrame,
 			people._portrait._position, people._portrait._flags & 2);
 
 	// Draw all static and active canimations that are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1274,7 +1269,7 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == NO_SHAPE && (o._flags & 1) == 0)
-			screen._backBuffer1.transBlitFrom(o._imageFrame->_frame, o._position, o._flags & 2);
+			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Bring the newly built picture to the screen
-- 
cgit v1.2.3


From 817217c225475e5908bd3e7f3cfe1076df10ac8d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 24 Apr 2015 18:25:58 +0200
Subject: SCI: qfg1vga script patch 4 stag dagger bug #6135

fixes animation issue when throwing a dagger at
white stag in room 77
---
 engines/sci/engine/script_patches.cpp | 82 ++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index e88aa98f42..03bf4387b7 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -94,6 +94,7 @@ static const char *const selectorNameTable[] = {
 	"deskSarg",     // Gabriel Knight
 	"localize",     // Freddy Pharkas
 	"put",          // Police Quest 1 VGA
+	"say",          // Quest For Glory 1 VGA
 	"solvePuzzle",  // Quest For Glory 3
 	"timesShownID", // Space Quest 1 VGA
 	"startText",    // King's Quest 6 CD / Laura Bow 2 CD for audio+text support
@@ -119,6 +120,7 @@ enum ScriptPatcherSelectors {
 	SELECTOR_deskSarg,
 	SELECTOR_localize,
 	SELECTOR_put,
+	SELECTOR_say,
 	SELECTOR_solvePuzzle,
 	SELECTOR_timesShownID,
 	SELECTOR_startText,
@@ -2116,7 +2118,7 @@ static const uint16 qfg1vgaSignatureCheetaurDescription[] = {
 	0x34, SIG_UINT16(0x01b8),           // ldi 01b8
 	0x1a,                               // eq?
 	0x31, 0x16,                         // bnt 16
-	0x38, SIG_UINT16(0x0127),           // pushi 0127
+	0x38, SIG_SELECTOR16(say),          // pushi 0127h (selector "say")
 	0x39, 0x06,                         // pushi 06
 	0x39, 0x03,                         // pushi 03
 	0x78,                               // push1
@@ -2199,17 +2201,87 @@ static const uint16 qfg1vgaPatchHealerHutNoDelay[] = {
 	PATCH_END
 };
 
+// When following the white stag, you can actually enter the 2nd room from the mushroom/fairy location,
+//  which results in ego entering from the top. When you then throw a dagger at the stag, one animation
+//  frame will stay on screen, because of a script bug.
+//
+// Applies to at least: English floppy, Mac floppy
+// Responsible method: stagHurt::changeState
+// Fixes bug #6135
+static const uint16 qfg1vgaSignatureWhiteStagDagger[] = {
+	0x87, 0x01,                         // lap param[1]
+	0x65, 0x14,                         // aTop state
+	0x36,                               // push
+	0x3c,                               // dup
+	0x35, 0x00,                         // ldi 0
+	0x1a,                               // eq?
+	0x31, 0x16,                         // bnt [next parameter check]
+	0x76,                               // push0
+	0x45, 0x02, 0x00,                   // callb export 2 from script 0, 0
+	SIG_MAGICDWORD,
+	0x38, SIG_SELECTOR16(say),          // pushi 0127h (selector "say")
+	0x39, 0x05,                         // pushi 05
+	0x39, 0x03,                         // pushi 03
+	0x39, 0x51,                         // pushi 51h
+	0x76,                               // push0
+	0x76,                               // push0
+	0x7c,                               // pushSelf
+	0x81, 0x5b,                         // lag global[5Bh] -> qg1Messager
+	0x4a, 0x0e,                         // send 0Eh -> qg1Messager::say(3, 51h, 0, 0, stagHurt)
+	0x33, 0x12,                         // jmp -> [ret]
+	0x3c,                               // dup
+	0x35, 0x01,                         // ldi 1
+	0x1a,                               // eq?
+	0x31, 0x0c,                         // bnt [ret]
+	0x38,                               // pushi...
+	SIG_ADDTOOFFSET(+11),
+	0x3a,                               // toss
+	0x48,                               // ret
+	SIG_END
+};
+
+static const uint16 qfg1vgaPatchWhiteStagDagger[] = {
+	PATCH_ADDTOOFFSET(+4),
+	0x2f, 0x05,                         // bt [next check] (state != 0)
+	// state = 0 code
+	0x35, 0x01,                         // ldi 1
+	0x65, 0x1a,                         // aTop cycles
+	0x48,                               // ret
+	0x36,                               // push
+	0x35, 0x01,                         // ldi 1
+	0x1a,                               // eq?
+	0x31, 0x16,                         // bnt [state = 2 code]
+	// state = 1 code
+	0x76,                               // push0
+	0x45, 0x02, 0x00,                   // callb export 2 from script 0, 0
+	0x38, PATCH_SELECTOR16(say),        // pushi 0127h (selector "say")
+	0x39, 0x05,                         // pushi 05
+	0x39, 0x03,                         // pushi 03
+	0x39, 0x51,                         // pushi 51h
+	0x76,                               // push0
+	0x76,                               // push0
+	0x7c,                               // pushSelf
+	0x81, 0x5b,                         // lag global[5Bh] -> qg1Messager
+	0x4a, 0x0e,                         // send 0Eh -> qg1Messager::say(3, 51h, 0, 0, stagHurt)
+	0x48,                               // ret
+	// state = 2 code
+	PATCH_ADDTOOFFSET(+13),
+	0x48,                               // ret (remove toss)
+	PATCH_END
+};
+
 //          script, description,                                      signature                            patch
 static const SciScriptPatcherEntry qfg1vgaSignatures[] = {
+	{  true,    41, "moving to castle gate",                       1, qfg1vgaSignatureMoveToCastleGate,    qfg1vgaPatchMoveToCastleGate },
 	{  true,    55, "healer's hut, no delay for buy/steal",        1, qfg1vgaSignatureHealerHutNoDelay,    qfg1vgaPatchHealerHutNoDelay },
+	{  true,    77, "white stag dagger throw animation glitch",    1, qfg1vgaSignatureWhiteStagDagger,     qfg1vgaPatchWhiteStagDagger },
+	{  true,    96, "funny room script bug fixed",                 1, qfg1vgaSignatureFunnyRoomFix,        qfg1vgaPatchFunnyRoomFix },
+	{  true,   210, "cheetaur description fixed",                  1, qfg1vgaSignatureCheetaurDescription, qfg1vgaPatchCheetaurDescription },
 	{  true,   215, "fight event issue",                           1, qfg1vgaSignatureFightEvents,         qfg1vgaPatchFightEvents },
 	{  true,   216, "weapon master event issue",                   1, qfg1vgaSignatureFightEvents,         qfg1vgaPatchFightEvents },
+	{  true,   331, "moving to crusher",                           1, qfg1vgaSignatureMoveToCrusher,       qfg1vgaPatchMoveToCrusher },
 	{  true,   814, "window text temp space",                      1, qfg1vgaSignatureTempSpace,           qfg1vgaPatchTempSpace },
 	{  true,   814, "dialog header offset",                        3, qfg1vgaSignatureDialogHeader,        qfg1vgaPatchDialogHeader },
-	{  true,   331, "moving to crusher",                           1, qfg1vgaSignatureMoveToCrusher,       qfg1vgaPatchMoveToCrusher },
-	{  true,    41, "moving to castle gate",                       1, qfg1vgaSignatureMoveToCastleGate,    qfg1vgaPatchMoveToCastleGate },
-	{  true,   210, "cheetaur description fixed",                  1, qfg1vgaSignatureCheetaurDescription, qfg1vgaPatchCheetaurDescription },
-	{  true,    96, "funny room script bug fixed",                 1, qfg1vgaSignatureFunnyRoomFix,        qfg1vgaPatchFunnyRoomFix },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 5e1588e5cc9030c611609df23941609c68df4b65 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 17:25:37 -0500
Subject: SHERLOCK: Fix display of look description dialogs

---
 engines/sherlock/talk.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 3eeb0f0af5..0ac1bbd6aa 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -678,7 +678,7 @@ void Talk::drawInterface() {
 	} else {
 		int strWidth = screen.stringWidth(PRESS_KEY_TO_CONTINUE);
 		screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
-			160 - strWidth, PRESS_KEY_TO_CONTINUE);
+			160 - strWidth / 2, PRESS_KEY_TO_CONTINUE);
 		screen.gPrint(Common::Point(160 - strWidth / 2, CONTROLS_Y), COMMAND_FOREGROUND, "P");
 	}
 }
@@ -913,12 +913,14 @@ void Talk::pushSequence(int speaker) {
 	} else {
 		seqEntry._objNum = people.findSpeaker(speaker);
 
-		Object &obj = scene._bgShapes[seqEntry._objNum];
-		for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx)
-			seqEntry._sequences.push_back(obj._sequences[idx]);
+		if (seqEntry._objNum != -1) {
+			Object &obj = scene._bgShapes[seqEntry._objNum];
+			for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx)
+				seqEntry._sequences.push_back(obj._sequences[idx]);
 
-		seqEntry._frameNumber = obj._frameNumber;
-		seqEntry._seqTo = obj._seqTo;
+			seqEntry._frameNumber = obj._frameNumber;
+			seqEntry._seqTo = obj._seqTo;
+		}
 	}
 	
 	_sequenceStack.push(seqEntry);
@@ -1549,13 +1551,14 @@ void Talk::doScript(const Common::String &script) {
 					screen.print(Common::Point(16, yp), INV_FOREGROUND, lineStr.c_str());
 				} else {
 					screen.gPrint(Common::Point(16, yp - 1), INV_FOREGROUND, lineStr.c_str());
+					openTalkWindow = true;
 				}
 			} else {
 				if (ui._windowOpen) {
 					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, lineStr.c_str());
-				}
-				else {
+				} else {
 					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, lineStr.c_str());
+					openTalkWindow = true;
 				}
 			}
 
-- 
cgit v1.2.3


From 6eb51c3d50e5134c4054f9652624fe61d772b004 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 17:27:23 -0500
Subject: SHERLOCK: Formatting fixes

---
 engines/sherlock/objects.cpp        | 4 ++--
 engines/sherlock/talk.cpp           | 6 ++----
 engines/sherlock/user_interface.cpp | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 9e92b95532..78b6cda2d3 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -309,10 +309,10 @@ void Sprite::checkSprite() {
 								if (_delta.x > 0)
 									// Go to right side
 									walkPos.x = objBounds.right + CLEAR_DIST_X;
-								else if (_delta.x < 0)
+								else if (_delta.x < 0) {
 									// Go to left side
 									walkPos.x = objBounds.left - CLEAR_DIST_X;
-								else {
+								} else {
 									// Going straight up or down. So choose best side
 									if (spritePt.x >= (objBounds.left + objBounds.width() / 2))
 										walkPos.x = objBounds.right + CLEAR_DIST_X;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 0ac1bbd6aa..9be2b035d4 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1041,8 +1041,7 @@ void Talk::doScript(const Common::String &script) {
 			pullSequence();
 			pushSequence(_speaker);
 			setSequence(_speaker);
-		}
-		else {
+		} else {
 			setSequence(_speaker);
 		}
 
@@ -1071,8 +1070,7 @@ void Talk::doScript(const Common::String &script) {
 		// Remove portrait?
 		if (str[0] == REMOVE_PORTRAIT) {
 			_speaker = 255;
-		}
-		else {
+		} else {
 			// Nope, so set the first speaker
 			people.setTalking(_speaker);
 		}
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 903b1e6002..a2a356127c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1468,8 +1468,7 @@ void UserInterface::doLookControl() {
 				_menuMode = STD_MODE;
 				events.clearEvents();
 			}
-		}
-		else {
+		} else {
 			// Looking at an inventory object
 			// Backup the user interface
 			Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1);
-- 
cgit v1.2.3


From 930600c85740012db40a11eb06b02b0c78356529 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 17:47:58 -0500
Subject: SHERLOCK: Implement saving scene status when saving game or leaving
 scene

---
 engines/sherlock/scene.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e5d9fc611f..3ecc7be422 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -451,7 +451,7 @@ bool Scene::loadScene(const Common::String &filename) {
  * opening or moving them
  */
 void Scene::checkSceneStatus() {
-	if (_sceneStats[_currentScene][65]) {
+	if (_sceneStats[_currentScene][64]) {
 		for (uint idx = 0; idx < 64; ++idx) {
 			int val = _sceneStats[_currentScene][idx];
 
@@ -475,6 +475,23 @@ void Scene::checkSceneStatus() {
 	}
 }
 
+/**
+ * Restores objects to the correct status. This ensures that things like being opened or moved
+ * will remain the same on future visits to the scene
+ */
+void Scene::saveSceneStatus() {
+	// Flag any objects for the scene that have been altered
+	int count = MIN((int)_bgShapes.size(), 64);
+	for (int idx = 0; idx < count; ++idx) {
+		Object &obj = _bgShapes[idx];
+		_sceneStats[_currentScene][idx] = obj._type == HIDDEN || obj._type == REMOVE
+			|| obj._type == HIDE_SHAPE || obj._type == INVALID;
+	}
+
+	// Flag scene as having been visited
+	_sceneStats[_currentScene][64] = true;
+}
+
 /**
  * Check the scene's objects against the game flags. If false is passed,
  * it means the scene has just been loaded. A value of true means that the scene
@@ -1364,10 +1381,6 @@ void Scene::doBgAnim() {
 	}
 }
 
-void Scene::saveSceneStatus() {
-	// TODO
-}
-
 /**
  * Attempts to find a background shape within the passed bounds. If found,
  * it will return the shape number, or -1 on failure.
@@ -1453,6 +1466,9 @@ int Scene::closestZone(const Common::Point &pt) {
  * Synchronize the data for a savegame
  */
 void Scene::synchronize(Common::Serializer &s) {
+	if (s.isSaving())
+		saveSceneStatus();
+
 	s.syncAsSint16LE(_bigPos.x);
 	s.syncAsSint16LE(_bigPos.y);
 	s.syncAsSint16LE(_overPos.x);
-- 
cgit v1.2.3


From 3cf1afb459e29747461e21ba7db971a9c72fc9ff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 20:26:33 -0500
Subject: SHERLOCK: Fix minor gfx glitch when sliding up closing dialogs

---
 engines/sherlock/user_interface.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index a2a356127c..12af04d608 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1304,7 +1304,7 @@ void UserInterface::doInvControl() {
 	}
 
 	if (events._released || _keyboardInput) {
-		if ((!found && events._released) && _key == 'E') {
+		if ((found == 0 && events._released) || _key == 'E') {
 			inv.freeInv();
 			_infoFlag = true;
 			clearInfo();
@@ -2454,6 +2454,11 @@ void UserInterface::banishWindow(bool slideUp) {
 					SHERLOCK_SCREEN_HEIGHT);
 				events.delay(10);
 			}
+
+			// Show entire final area
+			screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(0, CONTROLS_Y1),
+				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 		}
 
 		_infoFlag = false;
-- 
cgit v1.2.3


From 55404f01d60fb4bb454ceb8e9289debbadda8470 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 20:59:30 -0500
Subject: SHERLOCK: Fix talk dialog buttons

---
 engines/sherlock/talk.cpp           |  8 ++++----
 engines/sherlock/user_interface.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 9be2b035d4..2ad70dabed 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -698,13 +698,13 @@ bool Talk::displayTalk(bool slamIt) {
 	}
 
 	if (_talkIndex) {
-		for (uint idx = 0; idx < _statements.size(); ++idx) {
+		for (int idx = 0; idx < _talkIndex && !_moreTalkUp; ++idx) {
 			if (_statements[idx]._talkMap != -1)
 				_moreTalkUp = true;
 		}
 	}
 
-	// Display the up arrow if the first option is scrolled off-screen
+	// Display the up arrow and enable Up button if the first option is scrolled off-screen
 	if (_moreTalkUp) {
 		if (slamIt) {
 			screen.print(Common::Point(5, CONTROLS_Y + 13), INV_FOREGROUND, "~");
@@ -747,7 +747,7 @@ bool Talk::displayTalk(bool slamIt) {
 		}
 	}
 
-	// Display the down arrow if there are more statements available
+	// Display the down arrow and enable down button if there are more statements available down off-screen
 	if (lineY == -1 || lineY == SHERLOCK_SCREEN_HEIGHT) {
 		_moreTalkDown = true;
 
@@ -763,7 +763,7 @@ bool Talk::displayTalk(bool slamIt) {
 			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, true, "Down");
 			screen.vgaBar(Common::Rect(5, 189, 16, 199), INV_BACKGROUND);
 		} else {
-			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, false, "Down");
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, false, "Down");
 			screen._backBuffer1.fillRect(Common::Rect(5, 189, 16, 199), INV_BACKGROUND);
 		}
 	}
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 12af04d608..176b1bc42b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1791,14 +1791,14 @@ void UserInterface::doTalkControl() {
 	}
 
 	if (events._released || _keyboardInput) {
-		if (_endKeyActive && ((mousePos.x > 99 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10)
-				&& talk._moreTalkUp && events._released) || _key == 'E')) {
+		if (((Common::Rect(99, CONTROLS_Y, 138, CONTROLS_Y + 10).contains(mousePos) && events._released) 
+				|| _key == 'E') && _endKeyActive) {
 			talk.freeTalkVars();
 			talk.pullSequence();
 			banishWindow();
 			_windowBounds.top = CONTROLS_Y1;
-		} else if ((mousePos.x > 140 && mousePos.x < 179 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10)
-				&& talk._moreTalkUp && events._released) || (talk._moreTalkUp && _key == 'U')) { 
+		} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released) 
+				|| _key == 'U') && talk._moreTalkUp) {
 			while (talk._statements[--talk._talkIndex]._talkMap == -1)
 				;
 			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
@@ -1806,8 +1806,8 @@ void UserInterface::doTalkControl() {
 			talk.displayTalk(false);
 
 			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
-		} else if ((mousePos.x > 181 && mousePos.x < 220 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10)
-				&& talk._moreTalkDown && events._released) || (talk._moreTalkDown && _key == 'D')) { 
+		} else if (((Common::Rect(181, CONTROLS_Y, 220, CONTROLS_Y + 10).contains(mousePos) && events._released)
+				|| _key == 'D') && talk._moreTalkDown) {
 			do {
 				++talk._talkIndex;
 			} while (talk._talkIndex < (int)talk._statements.size() && talk._statements[talk._talkIndex]._talkMap == -1);
-- 
cgit v1.2.3


From 8fa2d48f1f00b4be5e04c305db2a5340e4480d89 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 21:12:05 -0500
Subject: SHERLOCK: Fix crash when entering backstage area

---
 engines/sherlock/journal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 18edec8c73..bb1fc9a883 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -286,7 +286,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 						else if (talk._talkTo == 2)
 							journalString += "The Inspector";
 						else
-							journalString += inv._names[talk._talkTo];
+							journalString += NAMES[talk._talkTo];
 
 						const char *strP = replyP;
 						char v;
-- 
cgit v1.2.3


From c92b3b5c71666797eb6d26008ebbfd88d69573c3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Apr 2015 22:12:15 -0500
Subject: SHERLOCK: Fix paging in the journal

---
 engines/sherlock/journal.cpp | 66 +++++++++++++++++++++++---------------------
 engines/sherlock/journal.h   |  4 +--
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index bb1fc9a883..e3d4e1b7a3 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -136,7 +136,6 @@ void Journal::loadJournalLocations() {
  */
 int Journal::loadJournalFile(bool alreadyLoaded) {
 	Inventory &inv = *_vm->_inventory;
-	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	JournalEntry &journalEntry = _journal[_index];
@@ -156,7 +155,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			// Find the person being talked to
 			talk._talkTo = -1;
 			for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
-				Common::String portrait = people[idx]._portrait;
+				Common::String portrait = PORTRAITS[idx];
 				Common::String numStr(portrait.c_str(), portrait.c_str() + 4);
 
 				if (locStr == numStr) {
@@ -243,7 +242,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	const char *replyP = statement._reply.c_str();
 
 	while (*replyP) {
-		char c = *replyP++;
+		byte c = *replyP++;
 
 		// Is it a control character?
 		if (c < 128) {
@@ -288,7 +287,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 						else
 							journalString += NAMES[talk._talkTo];
 
-						const char *strP = replyP;
+						const char *strP = replyP + 1;
 						char v;
 						do {
 							v = *strP++;						
@@ -354,6 +353,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			case 136:		// Pause without control
 			case 157:		// Walk to canimation
 				// These commands don't have any param
+				++replyP;
 				break;
 
 			case 134:		// Change sequence
@@ -450,7 +450,10 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	return _lines.size();
 }
 
-void Journal::drawInterface() {
+/**
+ * Draw the journal frame
+ */
+void Journal::drawJournal() {
 	Resources &res = *_vm->_res;
 	Screen &screen = *_vm->_screen;
 	byte palette[PALETTE_SIZE];
@@ -471,33 +474,42 @@ void Journal::drawInterface() {
 	screen.gPrint(Common::Point(110, 17), INV_FOREGROUND, "Watson's Journal");
 
 	// Draw the buttons
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[0][0], JOURNAL_BUTTONS_Y, 
-		JOURNAL_POINTS[0][1], JOURNAL_BUTTONS_Y + 10), 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[0][0], JOURNAL_BUTTONS_Y,
+		JOURNAL_POINTS[0][1], JOURNAL_BUTTONS_Y + 10),
 		JOURNAL_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[1][0], JOURNAL_BUTTONS_Y, 
-		JOURNAL_POINTS[1][1], JOURNAL_BUTTONS_Y + 10), 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[1][0], JOURNAL_BUTTONS_Y,
+		JOURNAL_POINTS[1][1], JOURNAL_BUTTONS_Y + 10),
 		JOURNAL_POINTS[1][2] - screen.stringWidth("Back 10") / 2, "Back 10");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[2][0], JOURNAL_BUTTONS_Y, 
-		JOURNAL_POINTS[2][1], JOURNAL_BUTTONS_Y + 10), 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[2][0], JOURNAL_BUTTONS_Y,
+		JOURNAL_POINTS[2][1], JOURNAL_BUTTONS_Y + 10),
 		JOURNAL_POINTS[2][2] - screen.stringWidth("Up") / 2, "Up");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[3][0], JOURNAL_BUTTONS_Y, 
-		JOURNAL_POINTS[3][1], JOURNAL_BUTTONS_Y + 10), 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[3][0], JOURNAL_BUTTONS_Y,
+		JOURNAL_POINTS[3][1], JOURNAL_BUTTONS_Y + 10),
 		JOURNAL_POINTS[3][2] - screen.stringWidth("Down") / 2, "Down");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[4][0], JOURNAL_BUTTONS_Y, 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[4][0], JOURNAL_BUTTONS_Y,
 		JOURNAL_POINTS[4][1], JOURNAL_BUTTONS_Y + 10),
 		JOURNAL_POINTS[4][2] - screen.stringWidth("Ahead 10") / 2, "Ahead 10");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[5][0], JOURNAL_BUTTONS_Y + 11, 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[5][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[5][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[5][2] - screen.stringWidth("Search") / 2, "Search");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[6][0], JOURNAL_BUTTONS_Y + 11, 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[6][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[6][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[6][2] - screen.stringWidth("First Page") / 2, "First Page");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[7][0], JOURNAL_BUTTONS_Y + 11, 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[7][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[7][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[7][2] - screen.stringWidth("Last Page") / 2, "Last Page");
-	screen.makeButton(Common::Rect(JOURNAL_POINTS[8][0], JOURNAL_BUTTONS_Y + 11, 
+	screen.makeButton(Common::Rect(JOURNAL_POINTS[8][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[8][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[8][2] - screen.stringWidth("Print Text") / 2, "Print Text");
+}
+
+/**
+ * Display the journal
+ */
+void Journal::drawInterface() {
+	Screen &screen = *_vm->_screen;
+
+	drawJournal();
 
 	if (_journal.size() == 0) {
 		_up = _down = 0;
@@ -578,7 +590,7 @@ bool Journal::doJournal(int direction, int howFar) {
 	if (endJournal) {
 		// If moving forward or backwards, clear the page before printing
 		if (direction)
-			clearPage();
+			drawJournal();
 
 		screen.gPrint(Common::Point(235, 21), PEN_COLOR, "Page %d", _page);
 		return false;
@@ -701,7 +713,7 @@ bool Journal::doJournal(int direction, int howFar) {
 
 	if (direction) {
 		events.setCursor(ARROW);
-		clearPage();
+		drawJournal();
 	}
 
 	screen.gPrint(Common::Point(235, 21), PEN_COLOR, "Page %d", _page);
@@ -785,14 +797,6 @@ bool Journal::doJournal(int direction, int howFar) {
 	return direction >= 3 && searchSuccessful;
 }
 
-/**
- * Clears the journal page
- */
-void Journal::clearPage() {
-	// Clear the journal page by redrawing it from scratch
-	drawInterface();
-}
-
 /**
  * Handle events whilst the journal is being displayed
  */
@@ -962,7 +966,7 @@ bool Journal::handleEvents(int key) {
 					_sub = savedSub;
 					_page = savedPage;
 
-					clearPage();
+					drawJournal();
 					doJournal(0, 0);
 					notFound = true;
 				} else {
@@ -984,7 +988,7 @@ bool Journal::handleEvents(int key) {
 		_up = _down = false;
 		_page = 1;
 
-		clearPage();
+		drawJournal();
 		doJournal(0, 0);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
@@ -1168,7 +1172,7 @@ int Journal::getFindName(bool printError) {
 	}
 
 	// Redisplay the journal screen
-	clearPage();
+	drawJournal();
 	doJournal(0, 0);
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 9db4b28665..a67e0e51e2 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -67,9 +67,9 @@ private:
 
 	bool doJournal(int direction, int howFar);
 
-	void clearPage();
-
 	int getFindName(bool printError);
+
+	void drawJournal();
 public:
 	Journal(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From baeca76b028ff846ce14bad4575984324fd4c999 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 03:05:51 -0500
Subject: SHERLOCK: Fix crash displaying journal contents for Lestrade

---
 engines/sherlock/journal.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index e3d4e1b7a3..1891419acf 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -248,6 +248,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 		if (c < 128) {
 			// Nope. Set flag for allowing control coes to insert spaces
 			ctrlSpace = true;
+			assert(c >= ' ');
 
 			// Check for embedded comments
 			if (c == '{' || c == '}') {
@@ -307,7 +308,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += c;
 				do {
 					journalString += *replyP++;
-				} while (*replyP && *replyP < 128 && *replyP != '{' && *replyP != '}');
+				} while (*replyP && (byte)*replyP < 128 && *replyP != '{' && *replyP != '}');
 
 				commentJustPrinted = false;
 			}
@@ -323,16 +324,16 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			}
 
 			startOfReply = false;
-			c = *replyP++;
+			c = *replyP++ - 1;
 
-			if ((c - 1) == 0)
+			if (c == 0)
 				journalString += "Holmes";
-			else if ((c - 1) == 1)
+			else if (c == 1)
 				journalString += "I";
-			else if ((c - 1) == 2)
+			else if (c == 2)
 				journalString += "the Inspector";
 			else
-				journalString += inv._names[c - 1];
+				journalString += NAMES[c];
 
 			const char *strP = replyP;
 			char v;
@@ -352,7 +353,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			case 131:		// Pause with control
 			case 136:		// Pause without control
 			case 157:		// Walk to canimation
-				// These commands don't have any param
+				// These commands have a single parameter
 				++replyP;
 				break;
 
@@ -821,7 +822,7 @@ bool Journal::handleEvents(int key) {
 		} else {
 			color = COMMAND_FOREGROUND;
 		}
-		screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), color, true, "Exit");
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[0][2], JOURNAL_BUTTONS_Y), color, true, "Exit");
 
 		// Back 10 button
 		if (pt.x > JOURNAL_POINTS[1][0] && pt.x < JOURNAL_POINTS[1][1] && pt.y >= JOURNAL_BUTTONS_Y &&
-- 
cgit v1.2.3


From c6286ec4bd88a4c8a5dc0b5934f8c3241ab2d237 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 03:14:35 -0500
Subject: SHERLOCK: Journal paging fix

---
 engines/sherlock/journal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 1891419acf..91148a2694 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -679,7 +679,7 @@ bool Journal::doJournal(int direction, int howFar) {
 					if (++_sub == maxLines) {
 						// Reached end of page
 						do {
-							if (++_index == (int)_lines.size()) {
+							if (++_index == _count) {
 								_index = savedIndex;
 								_sub = savedSub;
 								maxLines = loadJournalFile(false);
-- 
cgit v1.2.3


From eb91c01cf160984f52edf5ba1da3f5db1e2a6519 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 03:19:08 -0500
Subject: SHERLOCK: Fix paging to end of journal

---
 engines/sherlock/journal.cpp | 4 +---
 engines/sherlock/journal.h   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 91148a2694..46114cd746 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -51,7 +51,6 @@ const int SEARCH_POINTS[3][3] = {
 
 Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	// Initialize fields
-	_count = 0;
 	_maxPage = 0;
 	_index = 0;
 	_sub = 0;
@@ -679,7 +678,7 @@ bool Journal::doJournal(int direction, int howFar) {
 					if (++_sub == maxLines) {
 						// Reached end of page
 						do {
-							if (++_index == _count) {
+							if (++_index == (int)_journal.size()) {
 								_index = savedIndex;
 								_sub = savedSub;
 								maxLines = loadJournalFile(false);
@@ -1192,7 +1191,6 @@ void Journal::resetPosition() {
  * Synchronize the data for a savegame
  */
 void Journal::synchronize(Common::Serializer &s) {
-	s.syncAsSint16LE(_count);
 	s.syncAsSint16LE(_index);
 	s.syncAsSint16LE(_sub);
 	s.syncAsSint16LE(_page);
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index a67e0e51e2..2ef0f94492 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -50,7 +50,6 @@ private:
 	Common::StringArray _directory;
 	Common::StringArray _locations;
 	Common::StringArray _lines;
-	int _count;
 	int _maxPage;
 	int _index;
 	int _sub;
-- 
cgit v1.2.3


From 2379824e32fd0cb49e3f2b6c997cb6070f0b0393 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 04:42:15 -0500
Subject: SHERLOCK: Fix saving and display of inventory items

---
 engines/sherlock/inventory.cpp | 19 +++++++++++++++++--
 engines/sherlock/inventory.h   |  4 +++-
 engines/sherlock/journal.cpp   |  3 +--
 engines/sherlock/saveload.cpp  |  2 ++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 3ba6f9d2bd..808429f643 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -31,6 +31,17 @@ InventoryItem::InventoryItem(int requiredFlag, const Common::String &name,
 		_examine(examine), _lookFlag(0) {
 }
 
+/**
+ * Synchronize the data for an inventory item
+ */
+void InventoryItem::synchronize(Common::Serializer &s) {
+	s.syncAsSint16LE(_requiredFlag);
+	s.syncAsSint16LE(_lookFlag);
+	s.syncString(_name);
+	s.syncString(_description);
+	s.syncString(_examine);
+}
+
 /*----------------------------------------------------------------*/
 
 Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(vm) {
@@ -47,6 +58,9 @@ Inventory::~Inventory() {
 	freeGraphics();
 }
 
+/**
+ * Free inventory data
+ */
 void Inventory::freeInv() {
 	freeGraphics();
 
@@ -117,7 +131,7 @@ void Inventory::loadGraphics() {
  * and returns the numer that matches the passed name
  */
 int Inventory::findInv(const Common::String &name) {
-	for (int idx = 0; idx < (int)size(); ++idx) {
+	for (int idx = 0; idx < (int)_names.size(); ++idx) {
 		if (scumm_stricmp(name.c_str(), _names[idx].c_str()) == 0)
 			return idx;
 	}
@@ -502,7 +516,8 @@ void Inventory::synchronize(Common::Serializer &s) {
 	}
 
 	for (uint idx = 0; idx < size(); ++idx) {
-		// TODO
+		(*this)[idx].synchronize(s);
+
 	}
 }
 
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index bccdc9336e..0dafdddde9 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -57,16 +57,18 @@ struct InventoryItem {
 	InventoryItem() : _requiredFlag(0), _lookFlag(0) {}
 	InventoryItem(int requiredFlag, const Common::String &name,
 		const Common::String &description, const Common::String &examine);
+
+	void synchronize(Common::Serializer &s);
 };
 
 class Inventory : public Common::Array<InventoryItem> {
 private:
 	SherlockEngine *_vm;
+	Common::StringArray _names;
 
 	void copyToInventory(Object &obj);
 public:
 	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
-	Common::StringArray _names;
 	bool _invGraphicsLoaded;
 	InvMode _invMode;
 	int _invIndex;
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 46114cd746..ffda25a533 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -134,7 +134,6 @@ void Journal::loadJournalLocations() {
  * word wraps the result to prepare it for being displayed
  */
 int Journal::loadJournalFile(bool alreadyLoaded) {
-	Inventory &inv = *_vm->_inventory;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	JournalEntry &journalEntry = _journal[_index];
@@ -224,7 +223,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			journalString += "the Inspector";
 			break;
 		default:
-			journalString += inv._names[talk._talkTo];
+			journalString += NAMES[talk._talkTo];
 			break;
 		}
 		journalString += ", \"";
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 7610c42d8c..a694e21b28 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -366,6 +366,7 @@ Common::String SaveManager::generateSaveName(int slot) {
  * Synchronize the data for a savegame
  */
 void SaveManager::synchronize(Common::Serializer &s) {
+	Inventory &inv = *_vm->_inventory;
 	Journal &journal = *_vm->_journal;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
@@ -374,6 +375,7 @@ void SaveManager::synchronize(Common::Serializer &s) {
 
 	int oldFont = screen.fontNumber();
 
+	inv.synchronize(s);
 	journal.synchronize(s);
 	people.synchronize(s);
 	scene.synchronize(s);
-- 
cgit v1.2.3


From b8e12bbd88dba43cd397aca151eddb47d2ce761a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 05:11:07 -0500
Subject: SHERLOCK: Fix setting scene flags when leaving a scene

---
 engines/sherlock/scene.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 3ecc7be422..3f551ef5ba 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -129,6 +129,9 @@ void Scene::selectScene() {
 	_oldKey = _help = _oldHelp = 0;
 	_oldTemp = _temp = 0;
 
+	// Free any previous scene
+	freeScene();
+
 	// Load the scene
 	Common::String sceneFile = Common::String::format("res%02d", _goToScene);
 	_rrmName = Common::String::format("res%02d.rrm", _goToScene);
@@ -201,7 +204,6 @@ bool Scene::loadScene(const Common::String &filename) {
 	UserInterface &ui = *_vm->_ui;
 	bool flag;
 
-	freeScene();
 	_walkedInScene = false;
 	_ongoingCans = 0;
 
@@ -453,12 +455,12 @@ bool Scene::loadScene(const Common::String &filename) {
 void Scene::checkSceneStatus() {
 	if (_sceneStats[_currentScene][64]) {
 		for (uint idx = 0; idx < 64; ++idx) {
-			int val = _sceneStats[_currentScene][idx];
+			bool flag = _sceneStats[_currentScene][idx];
 
 			if (idx < _bgShapes.size()) {
 				Object &obj = _bgShapes[idx];
 
-				if (val & 1) {
+				if (flag) {
 					// No shape to erase, so flag as hidden
 					obj._type = HIDDEN;
 				} else if (obj._images == nullptr || obj._images->size() == 0) {
-- 
cgit v1.2.3


From 35368ce8a81cba7a2921a4e14036fa21290f663c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 05:52:04 -0500
Subject: SHERLOCK: Fixes and cleanup for checkObject

---
 engines/sherlock/objects.cpp |  8 ++++----
 engines/sherlock/objects.h   |  2 +-
 engines/sherlock/scene.cpp   | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 78b6cda2d3..6231c9abc7 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -544,7 +544,7 @@ void Object::toggleHidden() {
 /**
  * Check the state of the object
  */
-void Object::checkObject(Object &o) {
+void Object::checkObject() {
 	Scene &scene = *_vm->_scene;
 	Sound &sound = *_vm->_sound;
 	int checkFrame = _allow ? MAX_FRAME : 32000;
@@ -559,9 +559,9 @@ void Object::checkObject(Object &o) {
 		} else {
 			// Continue doing sequence
 			if (*ptr > _seqTo)
-				*ptr--;
+				*ptr -= 1;
 			else
-				*ptr++;
+				*ptr += 1;
 
 			return;
 		}
@@ -654,7 +654,7 @@ void Object::checkObject(Object &o) {
 					_frameNumber += 2;
 				} else if (v < 4) {
 					for (int idx = 0; idx < 4; ++idx) {
-						o.checkNameForCodes(_use[v]._names[idx], nullptr);
+						checkNameForCodes(_use[v]._names[idx], nullptr);
 					}
 
 					if (_use[v]._useFlag)
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 534ed66643..2b2472fbbf 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -206,7 +206,7 @@ public:
 
 	void toggleHidden();
 
-	void checkObject(Object &o);
+	void checkObject();
 
 	int checkNameForCodes(const Common::String &name, const char *const messages[]);
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 3f551ef5ba..16bb8daecf 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -964,7 +964,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 			Object::_countCAnimFrames = true;
 
 			while (cObj._type == ACTIVE_BG_SHAPE) {
-				cObj.checkObject(_bgShapes[0]);
+				cObj.checkObject();
 				++frames;
 
 				if (frames >= 1000)
@@ -1035,7 +1035,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		gotoCode = cObj._sequences[cObj._frameNumber + 3];
 
 	// Set canim to REMOVE type and free memory
-	cObj.checkObject(_bgShapes[0]);
+	cObj.checkObject();
 
 	if (gotoCode > 0 && !talk._talkToAbort) {
 		_goToScene = gotoCode;
@@ -1119,15 +1119,15 @@ void Scene::doBgAnim() {
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
-				_bgShapes[idx].checkObject(_bgShapes[idx]);
+				_bgShapes[idx].checkObject();
 		}
 
 		if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-			people._portrait.checkObject(people._portrait);
+			people._portrait.checkObject();
 
 		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 			if (_canimShapes[idx]._type != INVALID && _canimShapes[idx]._type != REMOVE)
-				_canimShapes[idx].checkObject(_bgShapes[0]);
+				_canimShapes[idx].checkObject();
 		}
 
 		if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
-- 
cgit v1.2.3


From f4ce7851f849f37851831c3888337feb532425ca Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 25 Apr 2015 20:06:59 +0200
Subject: SCI: script patch for sq4cd, walk in bug #5468

walk right up in the first room, only for SQ4 CD
---
 engines/sci/engine/script_patches.cpp | 44 ++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 03bf4387b7..b4844e3e7e 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2647,6 +2647,47 @@ static const uint16 sq4FloppyPatchThrowStuffAtSequelPoliceBug[] = {
 	PATCH_END
 };
 
+// Right at the start of Space Quest 4 CD, when walking up in the first room, ego will
+//  immediately walk down just after entering the upper room.
+//
+// This is caused by the scripts setting ego's vertical coordinate to 189 (BDh), which is the
+//  trigger in rooms to walk to the room below it. Sometimes this isn't triggered, because
+//  the scripts also initiate a motion to vertical coordinate 188 (BCh). When you lower the game's speed,
+//  this bug normally always triggers. And it triggers of course also in the original interpreter.
+//
+// It doesn't happen in PC floppy, because nsRect is not the same as in CD.
+//
+// We fix it by setting ego's vertical coordinate to 188 and we also initiate a motion to 187.
+//
+// Applies to at least: English PC CD
+// Responsible method: rm045::doit
+// Fixes bug: #5468
+static const uint16 sq4CdSignatureWalkInFromBelowRoom45[] = {
+	0x76,                               // push0
+	SIG_MAGICDWORD,
+	0x78,                               // push1
+	0x38, SIG_UINT16(0x00bd),           // pushi 00BDh
+	0x38, SIG_ADDTOOFFSET(+2),          // pushi [setMotion selector]
+	0x39, 0x03,                         // pushi 3
+	0x51, SIG_ADDTOOFFSET(+1),          // class [MoveTo]
+	0x36,                               // push
+	0x78,                               // push1
+	0x76,                               // push0
+	0x81, 0x00,                         // lag global[0]
+	0x4a, 0x04,                         // send 04 -> get ego::x
+	0x36,                               // push
+	0x38, SIG_UINT16(0x00bc),           // pushi 00BCh
+	SIG_END
+};
+
+static const uint16 sq4CdPatchWalkInFromBelowRoom45[] = {
+	PATCH_ADDTOOFFSET(+2),
+	0x38, PATCH_UINT16(0x00bc),        // pushi 00BCh
+	PATCH_ADDTOOFFSET(+15),
+	0x38, PATCH_UINT16(0x00bb),        // pushi 00BBh
+	PATCH_END
+};
+
 // The scripts in SQ4CD support simultaneous playing of speech and subtitles,
 // but this was not available as an option. The following two patches enable
 // this functionality in the game's GUI options dialog.
@@ -2741,8 +2782,9 @@ static const uint16 sq4CdPatchTextOptions[] = {
 static const SciScriptPatcherEntry sq4Signatures[] = {
 	{  true,   298, "Floppy: endless flight",                      1, sq4FloppySignatureEndlessFlight,               sq4FloppyPatchEndlessFlight },
 	{  true,   700, "Floppy: throw stuff at sequel police bug",    1, sq4FloppySignatureThrowStuffAtSequelPoliceBug, sq4FloppyPatchThrowStuffAtSequelPoliceBug },
-	{  true,   818, "CD: Speech and subtitles option",             1, sq4CdSignatureTextOptions,                     sq4CdPatchTextOptions },
+	{  true,    45, "CD: walk in from below for room 45 fix",      1, sq4CdSignatureWalkInFromBelowRoom45,           sq4CdPatchWalkInFromBelowRoom45 },
 	{  true,     0, "CD: Babble icon speech and subtitles fix",    1, sq4CdSignatureBabbleIcon,                      sq4CdPatchBabbleIcon },
+	{  true,   818, "CD: Speech and subtitles option",             1, sq4CdSignatureTextOptions,                     sq4CdPatchTextOptions },
 	{  true,   818, "CD: Speech and subtitles option button",      1, sq4CdSignatureTextOptionsButton,               sq4CdPatchTextOptionsButton },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
-- 
cgit v1.2.3


From 53f9dac75ef0c0c22c513068eaccf8c96457a438 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 25 Apr 2015 22:42:20 +0200
Subject: SCI: script patch qfg2 saurus freeze - bug #5156

getting back on saurus in the desert by typing
command "ride" freezes the game. This patch
fixes the issue.

Attention: difficult bug to fix, may cause issues
---
 engines/sci/engine/script_patches.cpp | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index b4844e3e7e..173641f7ee 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -95,6 +95,7 @@ static const char *const selectorNameTable[] = {
 	"localize",     // Freddy Pharkas
 	"put",          // Police Quest 1 VGA
 	"say",          // Quest For Glory 1 VGA
+	"contains",     // Quest For Glory 2
 	"solvePuzzle",  // Quest For Glory 3
 	"timesShownID", // Space Quest 1 VGA
 	"startText",    // King's Quest 6 CD / Laura Bow 2 CD for audio+text support
@@ -121,6 +122,7 @@ enum ScriptPatcherSelectors {
 	SELECTOR_localize,
 	SELECTOR_put,
 	SELECTOR_say,
+	SELECTOR_contains,
 	SELECTOR_solvePuzzle,
 	SELECTOR_timesShownID,
 	SELECTOR_startText,
@@ -2286,6 +2288,47 @@ static const SciScriptPatcherEntry qfg1vgaSignatures[] = {
 };
 
 // ===========================================================================
+
+// This is a very complicated bug.
+// When the player encounters an enemy in the desert while riding a saurus and later
+//  tries to get back on it by entering "ride", the game will not give control back
+//  to the player.
+//
+// This is caused by script mountSaurus getting triggered twice.
+//  Once by entering the command "ride" and then a second time by a proximity check.
+//
+// Both are calling mountSaurus::init() in script 20, this one disables controls
+//  then mountSaurus::changeState() from script 660 is triggered
+//  mountSaurus::changeState(5) finally calls mountSaurus::dispose(), which is also in script 20
+//  which finally re-enables controls
+//
+// A fix is difficult to implement. The code in script 20 is generic and used by multiple objects
+//  That's why I have decided to change the responsible globals (66h and A1h) during mountSaurus::changeState(5)
+//
+// This fix could cause issues in case there is a cutscene, that contains ego getting on a saurus and
+//  requires controls not getting re-enabled after getting back up on the saurus.
+//
+// Applies to at least: English PC Floppy, English Amiga Floppy
+// Responsible method: mountSaurus::changeState(), mountSaurus::init(), mountSaurus::dispose()
+// Fixes bug: #5156
+static const uint16 qfg2SignatureSaurusFreeze[] = {
+	0x3c,                               // dup
+	0x35, 0x05,                         // ldi 5
+	SIG_MAGICDWORD,
+	0x1a,                               // eq?
+	0x30, SIG_UINT16(0x004e),           // bnt [ret]
+	0x39, SIG_SELECTOR8(contains),      // pushi [selector contains]
+	0x78,                               // push1
+	SIG_END
+};
+
+static const uint16 qfg2PatchSaurusFreeze[] = {
+	0x35, 0x01,                         // ldi 1
+	0xa1, 0x66,                         // sag 66h
+	0xa0, SIG_UINT16(0x00a1),           // sag 00A1h
+	PATCH_END
+};
+
 // Script 944 in QFG2 contains the FileSelector system class, used in the
 // character import screen. This gets incorrectly called constantly, whenever
 // the user clicks on a button in order to refresh the file list. This was
@@ -2366,6 +2409,7 @@ static const uint16 qfg2PatchImportCharType[] = {
 
 //          script, description,                                      signature                    patch
 static const SciScriptPatcherEntry qfg2Signatures[] = {
+	{  true,   660, "getting back on saurus freeze fix",           1, qfg2SignatureSaurusFreeze,   qfg2PatchSaurusFreeze },
 	{  true,   805, "import character type fix",                   1, qfg2SignatureImportCharType, qfg2PatchImportCharType },
 	{  true,   944, "import dialog continuous calls",              1, qfg2SignatureImportDialog,   qfg2PatchImportDialog },
 	SCI_SIGNATUREENTRY_TERMINATOR
-- 
cgit v1.2.3


From 4c03e4b699916a9b9fe71afffaf41c283045216e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 26 Apr 2015 00:43:53 +0200
Subject: SCI: Stop processing in kGetEvent after loading

getSciEvent can trigger the main ScummVM menu, which can trigger loading
a game, which will invalidate the game state that kGetEvent is operating
on.

Other kernel functions may still have the same problem, and a better
solution may be necessary.
---
 engines/sci/engine/kevent.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index cb81da2279..dfa29bd047 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -74,6 +74,11 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
 
 	curEvent = g_sci->getEventManager()->getSciEvent(mask);
 
+	// Aborted during getSciEvent (e.g., due to loading a game from the
+	// ScummVM menu), so return immediately
+	if (s->abortScriptProcessing)
+		return NULL_REG;
+
 	// For a real event we use its associated mouse position
 	mousePos = curEvent.mousePos;
 #ifdef ENABLE_SCI32
-- 
cgit v1.2.3


From 21b138add24e9b95e70adb267c35268de0f828d1 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 26 Apr 2015 00:50:00 +0200
Subject: Revert "SCI: Hopefully fix bug #3565505 - "SCI : crash when loading a
 savegame""

This reverts commit 76ff4c700166d69b416dae324ee616ab57265c34.

It was intended to fix bug #6136, but only worked around the actual
problem in some cases. See 4c03e4b699916a9b9fe71afffaf41c283045216e.
---
 engines/sci/detection.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 85ff1c0062..e572e8ec7f 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -834,16 +834,12 @@ Common::Error SciEngine::saveGameState(int slot, const Common::String &desc) {
 	return Common::kNoError;
 }
 
-// Before enabling the load option in the ScummVM menu, the main game loop must
-// have run at least once. When the game loop runs, kGameIsRestarting is invoked,
-// thus the speed throttler is initialized. Hopefully fixes bug #3565505.
-
 bool SciEngine::canLoadGameStateCurrently() {
-	return !_gamestate->executionStackBase && (_gamestate->_throttleLastTime > 0 || _gamestate->_throttleTrigger);
+	return !_gamestate->executionStackBase;
 }
 
 bool SciEngine::canSaveGameStateCurrently() {
-	return !_gamestate->executionStackBase && (_gamestate->_throttleLastTime > 0 || _gamestate->_throttleTrigger);
+	return !_gamestate->executionStackBase;
 }
 
 } // End of namespace Sci
-- 
cgit v1.2.3


From 95f25329379482555c6b1e3181fc737b80f53b40 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 18:37:45 -0500
Subject: SHERLOCK: Disable joystick buttons in Setup dialog, since it isn't
 supported

---
 engines/sherlock/user_interface.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 176b1bc42b..53151ece55 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -147,11 +147,16 @@ void Settings::drawInteface(bool flag) {
 	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), 
 		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
 
-	tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]);
+	// WORKAROUND: We don't support the joystick in ScummVM, so draw the next two buttons as disabled
+	tempStr = "Joystick Off";
 	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), 
 		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[6][3], SETUP_POINTS[6][1]), COMMAND_NULL, false, tempStr);
+
+	tempStr = "Calibrate Joystick";
 	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), 
-		SETUP_POINTS[7][3] - screen.stringWidth("Calibrate Joystick") / 2, "Calibrate Joystick");
+		SETUP_POINTS[7][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[7][3], SETUP_POINTS[7][1]), COMMAND_NULL, false, tempStr);
 
 	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
 	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10), 
@@ -164,7 +169,7 @@ void Settings::drawInteface(bool flag) {
 	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
 	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
 		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	tempStr = Common::String::format("_key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
+	tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
 
 	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
 		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
@@ -222,8 +227,12 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 6: 
-			tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			tempStr = "Joystick Off";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
+			break;
+		case 7:
+			tempStr = "Calibrate Joystick";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
 			break;
 		case 8: 
 			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
@@ -238,7 +247,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 11: 
-			tempStr = Common::String::format("_key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
+			tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		default: 
-- 
cgit v1.2.3


From 1e4c6abfa3ed3df2bd33f774eddfd5e1a389b9fc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 21:53:50 -0500
Subject: SHERLOCK: Fix checkSceneFlags incorrectly restoring hidden objects

---
 engines/sherlock/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 16bb8daecf..60e7b6d369 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -516,7 +516,7 @@ void Scene::checkSceneFlags(bool flag) {
 						// Flag it as needing to be hidden after first erasing it
 						o._type = mode;
 				}
-			} else if (_bgShapes[idx]._requiredFlag) {
+			} else if (_bgShapes[idx]._requiredFlag > 0) {
 				// Restore object
 				if (o._images == nullptr || o._images->size() == 0)
 					o._type = NO_SHAPE;
-- 
cgit v1.2.3


From a95170d243df415e58b93e46bf9e23b068729954 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 25 Apr 2015 23:44:50 -0500
Subject: SHERLOCK: Fix Watson not appearing in backstage scene

---
 engines/sherlock/scene.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 60e7b6d369..ea7d517301 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -438,6 +438,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 	// Player has not yet walked in this scene
 	_walkedInScene = false;
+	saves._justLoaded = false;
 
 	// Reset the position on the overland map
 	_vm->_oldCharPoint = _currentScene;
-- 
cgit v1.2.3


From 15a4a942bb6ed708b2ea15bcbb33da66cae292ac Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 00:38:19 -0500
Subject: SHERLOCK: Fix RUN_CANIMATION talk opcode

---
 engines/sherlock/talk.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 2ad70dabed..4e7e4de2d0 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1114,7 +1114,8 @@ void Talk::doScript(const Common::String &script) {
 			case RUN_CANIMATION:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - script.c_str();
+				++str;
+				_scriptCurrentIndex = (str + 1) - script.c_str();
 				scene.startCAnim((str[0] - 1) & 127, 1 + (str[0] & 128));
 				if (_talkToAbort)
 					return;
-- 
cgit v1.2.3


From 841a8df09943d77601d1b44c63a2b0c5a531e468 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 02:08:43 -0500
Subject: SHERLOCK: Fix Sherlock disappearing when giving sedative

---
 engines/sherlock/objects.cpp | 3 +++
 engines/sherlock/scene.cpp   | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 6231c9abc7..e66f2a68bd 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -424,6 +424,9 @@ Object::Object() {
 	_misc = 0;
 	_maxFrames = 0;
 	_flags = 0;
+	_aOpen._cAnimNum = 0;
+	_aOpen._cAnimSpeed = 0;
+	_aType = OBJECT;
 	_lookFrames = 0;
 	_seqCounter = 0;
 	_lookFacing = 0;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index ea7d517301..d9161e25c0 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -892,9 +892,6 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	CursorId oldCursor = events.getCursor();
 	events.setCursor(WAIT);
 
-	_canimShapes.push_back(Object());
-	Object &cObj = _canimShapes[_canimShapes.size() - 1];
-
 	if (walkPos.x != -1) {
 		// Holmes must walk to the walk point before the cAnimation is started
 		if (people[AL]._position != walkPos)
@@ -904,6 +901,10 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	if (talk._talkToAbort)
 		return 1;
 
+	// Add new anim shape entry for displaying the animationo
+	_canimShapes.push_back(Object());
+	Object &cObj = _canimShapes[_canimShapes.size() - 1];
+
 	// Copy the canimation into the bgShapes type canimation structure so it can be played
 	cObj._allow = cAnimNum + 1;				// Keep track of the parent structure
 	cObj._name = _cAnim[cAnimNum]._name;	// Copy name
@@ -1304,6 +1305,7 @@ void Scene::doBgAnim() {
 					people[AL]._oldPosition.x + people[AL]._oldSize.x,
 					people[AL]._oldPosition.y + people[AL]._oldSize.y
 				));
+				people[AL]._type = INVALID;
 			} else {
 				screen.flushImage(people[AL]._imageFrame,
 					Common::Point(people[AL]._position.x / 100, 
-- 
cgit v1.2.3


From bfba28c33591afe8ce2f7f42de49935029bb4d62 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 26 Apr 2015 09:08:46 +0200
Subject: SCI: implement delayed restore via ScummVM menu

will delay restoring a saved game until the next
 kGetEvent or kWait
also implement aborting playback for kPortrait
 and kShowMovie
---
 engines/sci/detection.cpp         |  4 ++++
 engines/sci/engine/kevent.cpp     | 14 ++++++++------
 engines/sci/engine/kgraphics.cpp  |  7 +++++++
 engines/sci/engine/kvideo.cpp     |  2 ++
 engines/sci/engine/savegame.cpp   | 17 +++++++++++++++++
 engines/sci/engine/savegame.h     |  4 +++-
 engines/sci/engine/state.cpp      |  4 ++++
 engines/sci/engine/state.h        |  4 ++++
 engines/sci/graphics/portrait.cpp |  3 ++-
 9 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index e572e8ec7f..604aa476a2 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -791,6 +791,10 @@ void SciMetaEngine::removeSaveState(const char *target, int slot) const {
 }
 
 Common::Error SciEngine::loadGameState(int slot) {
+	_gamestate->_delayedRestoreGameId = slot;
+	_gamestate->_delayedRestoreGame = true;
+	return Common::kNoError;
+	
 	Common::String fileName = Common::String::format("%s.%03d", _targetName.c_str(), slot);
 	Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager();
 	Common::SeekableReadStream *in = saveFileMan->openForLoading(fileName);
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index dfa29bd047..8e16e0a07a 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -24,9 +24,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/features.h"
-#include "sci/engine/state.h"
-#include "sci/engine/selector.h"
 #include "sci/engine/kernel.h"
+#include "sci/engine/savegame.h"
+#include "sci/engine/selector.h"
+#include "sci/engine/state.h"
 #include "sci/console.h"
 #include "sci/debug.h"	// for g_debug_simulated_key
 #include "sci/event.h"
@@ -71,13 +72,14 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
 		g_debug_simulated_key = 0;
 		return make_reg(0, 1);
 	}
-
+	
 	curEvent = g_sci->getEventManager()->getSciEvent(mask);
 
-	// Aborted during getSciEvent (e.g., due to loading a game from the
-	// ScummVM menu), so return immediately
-	if (s->abortScriptProcessing)
+	if (s->_delayedRestoreGame) {
+		// delayed restore game from ScummVM menu got triggered
+		gamestate_delayedrestore(s);
 		return NULL_REG;
+	}
 
 	// For a real event we use its associated mouse position
 	mousePos = curEvent.mousePos;
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 7d24dd861f..8b790e6a58 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -32,6 +32,7 @@
 #include "sci/event.h"
 #include "sci/resource.h"
 #include "sci/engine/features.h"
+#include "sci/engine/savegame.h"
 #include "sci/engine/state.h"
 #include "sci/engine/selector.h"
 #include "sci/engine/kernel.h"
@@ -400,6 +401,12 @@ reg_t kWait(EngineState *s, int argc, reg_t *argv) {
 
 	s->wait(sleep_time);
 
+	if (s->_delayedRestoreGame) {
+		// delayed restore game from ScummVM menu got triggered
+		gamestate_delayedrestore(s);
+		return NULL_REG;
+	}
+
 	return s->r_acc;
 }
 
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index 319469cb08..f925111fc9 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -123,6 +123,8 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) {
 			if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP)
 				skipVideo = true;
 		}
+		if (g_sci->getEngineState()->_delayedRestoreGame)
+			skipVideo = true;
 
 		g_system->delayMillis(10);
 	}
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index d146cba204..d89170ab22 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/savefile.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/func.h"
@@ -872,6 +873,22 @@ bool gamestate_save(EngineState *s, Common::WriteStream *fh, const Common::Strin
 
 extern void showScummVMDialog(const Common::String &message);
 
+void gamestate_delayedrestore(EngineState *s) {
+	Common::String fileName = g_sci->getSavegameName(s->_delayedRestoreGameId);
+	Common::SeekableReadStream *in = g_sci->getSaveFileManager()->openForLoading(fileName);
+
+	if (in) {
+		// found a savegame file
+		gamestate_restore(s, in);
+		delete in;
+		if (s->r_acc != make_reg(0, 1)) {
+			return;
+		}
+	}
+
+	error("Restoring gamestate '%s' failed", fileName.c_str());
+}
+
 void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	SavegameMetadata meta;
 
diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h
index 7f482ed0a1..5512b90fa8 100644
--- a/engines/sci/engine/savegame.h
+++ b/engines/sci/engine/savegame.h
@@ -74,7 +74,6 @@ struct SavegameMetadata {
 	uint16 script0Size;
 };
 
-
 /**
  * Saves a game state to the hard disk in a portable way.
  * @param s			The state to save
@@ -84,6 +83,9 @@ struct SavegameMetadata {
  */
 bool gamestate_save(EngineState *s, Common::WriteStream *save, const Common::String &savename, const Common::String &version);
 
+// does a delayed saved game restore, used by ScummVM game menu - see detection.cpp / SciEngine::loadGameState()
+void gamestate_delayedrestore(EngineState *s);
+
 /**
  * Restores a game state from a directory.
  * @param s			An older state from the same game
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 527c8f0ae0..417d98e2e2 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -92,6 +92,10 @@ void EngineState::reset(bool isRestoring) {
 		abortScriptProcessing = kAbortNone;
 	}
 
+	// reset delayed restore game functionality
+	_delayedRestoreGame = false;
+	_delayedRestoreGameId = 0;
+
 	executionStackBase = 0;
 	_executionStackPosChanged = false;
 	stack_base = 0;
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index ecc8cb7dfe..e7499e66c9 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -131,6 +131,10 @@ public:
 	VirtualIndexFile *_virtualIndexFile;
 #endif
 
+	// see detection.cpp / SciEngine::loadGameState()
+	bool _delayedRestoreGame;  // boolean, that triggers delayed restore (triggered by ScummVM menu)
+	int _delayedRestoreGameId; // the saved game id, that it supposed to get restored (triggered by ScummVM menu)
+
 	uint _chosenQfGImportItem; // Remembers the item selected in QfG import rooms
 
 	bool _cursorWorkaroundActive; // Refer to GfxCursor::setPosition()
diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 3311f47022..cb425f3be9 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -317,7 +317,8 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
 				curEvent = _event->getSciEvent(SCI_EVENT_ANY);
 				if (curEvent.type == SCI_EVENT_MOUSE_PRESS ||
 					(curEvent.type == SCI_EVENT_KEYBOARD && curEvent.data == SCI_KEY_ESC) ||
-					g_sci->getEngineState()->abortScriptProcessing == kAbortQuitGame)
+					g_sci->getEngineState()->abortScriptProcessing == kAbortQuitGame ||
+					g_sci->getEngineState()->_delayedRestoreGame)
 					userAbort = true;
 				curPosition = _audio->getAudioPosition();
 			} while ((curPosition != -1) && (curPosition < timerPosition) && (!userAbort));
-- 
cgit v1.2.3


From 5a7dbc3666b29a4bde5673fe20a85e68d02b6c56 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 26 Apr 2015 09:10:25 +0200
Subject: SCI: remove unused code in SciEngine::loadGameState()

---
 engines/sci/detection.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 604aa476a2..9a41127f6d 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -794,23 +794,6 @@ Common::Error SciEngine::loadGameState(int slot) {
 	_gamestate->_delayedRestoreGameId = slot;
 	_gamestate->_delayedRestoreGame = true;
 	return Common::kNoError;
-	
-	Common::String fileName = Common::String::format("%s.%03d", _targetName.c_str(), slot);
-	Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager();
-	Common::SeekableReadStream *in = saveFileMan->openForLoading(fileName);
-
-	if (in) {
-		// found a savegame file
-		gamestate_restore(_gamestate, in);
-		delete in;
-	}
-
-	if (_gamestate->r_acc != make_reg(0, 1)) {
-		return Common::kNoError;
-	} else {
-		warning("Restoring gamestate '%s' failed", fileName.c_str());
-		return Common::kUnknownError;
-	}
 }
 
 Common::Error SciEngine::saveGameState(int slot, const Common::String &desc) {
-- 
cgit v1.2.3


From 6a13dad7ef844ffd5e5174b337cf7e4ad272c80b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 03:07:13 -0500
Subject: SHERLOCK: Fix TOGGLE_OBJECT talk opcode

---
 engines/sherlock/talk.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 4e7e4de2d0..d81f98cac7 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1294,6 +1294,7 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case TOGGLE_OBJECT:
+				++str;
 				for (int idx = 0; idx < str[0]; ++idx)
 					tempString += str[idx + 1];
 
-- 
cgit v1.2.3


From d7a8d701641600b896622f8b7abb728c4b4cc266 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 03:20:01 -0500
Subject: SHERLOCK: Fix missing increments from various talk opcodes

---
 engines/sherlock/talk.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index d81f98cac7..b45139db4e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1212,6 +1212,7 @@ void Talk::doScript(const Common::String &script) {
 			case WALK_TO_COORDS:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
+				++str;
 				_scriptCurrentIndex = str - script.c_str();
 
 				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100, str[2] * 100), str[3] - 1);
@@ -1224,6 +1225,7 @@ void Talk::doScript(const Common::String &script) {
 			case PAUSE_WITHOUT_CONTROL:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
+				++str;
 				_scriptCurrentIndex = str - script.c_str();
 
 				for (int idx = 0; idx < (str[0] - 1); ++idx) {
@@ -1433,6 +1435,7 @@ void Talk::doScript(const Common::String &script) {
 			case MOVE_MOUSE:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
+				++str;
 				_scriptCurrentIndex = str - script.c_str();
 				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
 				if (_talkToAbort)
-- 
cgit v1.2.3


From 9044dd49dc2debd1c7d1fa4ea991320a1072235e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 03:45:28 -0500
Subject: SHERLOCK: Fix closing closet in Backstage scene

---
 engines/sherlock/objects.cpp        | 4 ++++
 engines/sherlock/objects.h          | 4 ++--
 engines/sherlock/user_interface.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index e66f2a68bd..8c8d90579c 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -366,6 +366,8 @@ void ActionType::synchronize(Common::SeekableReadStream &s) {
 	
 	_cAnimNum = s.readByte();
 	_cAnimSpeed = s.readByte();
+	if (_cAnimSpeed & 0x80)
+		_cAnimSpeed = -(_cAnimSpeed & 0x7f);
 
 	for (int idx = 0; idx < 4; ++idx) {
 		s.read(buffer, 12);
@@ -380,6 +382,8 @@ void UseType::synchronize(Common::SeekableReadStream &s) {
 
 	_cAnimNum = s.readByte();
 	_cAnimSpeed = s.readByte();
+	if (_cAnimSpeed & 0x80)
+		_cAnimSpeed = -(_cAnimSpeed & 0x7f);
 
 	for (int idx = 0; idx < 4; ++idx) {
 		s.read(buffer, 12);
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 2b2472fbbf..80b0b9d9f3 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -125,8 +125,8 @@ public:
 enum { REVERSE_DIRECTION = 0x80 };
 
 struct ActionType {
-	int8 _cAnimNum;
-	uint8 _cAnimSpeed;				// if high bit set, play in reverse
+	int _cAnimNum;
+	int _cAnimSpeed;				// if high bit set, play in reverse
 	Common::String _names[4];
 
 	void synchronize(Common::SeekableReadStream &s);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 53151ece55..c623896c85 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2678,7 +2678,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
 				_infoFlag = true;
 				clearInfo();
-				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[action._cAnimNum]);
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
 
 				// Set how long to show the message
 				_menuCounter = 30;	
-- 
cgit v1.2.3


From 0c68c0a53ac2ffb5837ca2eada00af7f371bc7c9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 04:33:24 -0500
Subject: SHERLOCK: Fix inventory display when player has more than 6 items

---
 engines/sherlock/inventory.cpp      |  6 +++---
 engines/sherlock/user_interface.cpp | 31 ++++++++++++-------------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 808429f643..798531ea14 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -120,7 +120,7 @@ void Inventory::loadGraphics() {
 		int invNum = findInv((*this)[idx]._name);
 		Common::String fName = Common::String::format("item%02d.vgs", invNum + 1);
 
-		_invShapes[idx] = new ImageFile(fName);
+		_invShapes[idx - _invIndex] = new ImageFile(fName);
 	}
 
 	_invGraphicsLoaded = true;
@@ -302,10 +302,10 @@ void Inventory::invCommands(bool slamIt) {
 			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Give");
 		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), 
-			_invMode == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
+			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^^");
 		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1), 
-			_invMode == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
+			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^");
 		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), 
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index c623896c85..7a581ca63b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1247,17 +1247,13 @@ void UserInterface::doInvControl() {
 		}
 
 		if (inv._invIndex) {
-			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
-				colors[4], "^^");
-			screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
-				colors[5], "^");
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), colors[4], "^^");
+			screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1), colors[5], "^");
 		}
 
 		if ((inv._holdings - inv._invIndex) > 6) {
-			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
-				colors[6], "^^");
-			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
-				colors[7], "^");
+			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), colors[6], "_");
+			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), colors[7], "__");
 		}
 
 		bool flag = false;
@@ -1339,31 +1335,28 @@ void UserInterface::doInvControl() {
 			inv.loadGraphics();
 			inv.putInv(1);
 			inv.invCommands(true);
-		} else if (((found == 5 && events._released) || _key == '-') && inv._invIndex) {
+		} else if (((found == 5 && events._released) || _key == Common::KEYCODE_MINUS
+				|| _key == Common::KEYCODE_KP_MINUS) && inv._invIndex > 0) {
 			--inv._invIndex;
-			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
-				COMMAND_HIGHLIGHTED, "^");
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "^");
 			inv.freeGraphics();
 			inv.loadGraphics();
 			inv.putInv(1);
 			inv.invCommands(true);
-		} else if (((found == 6 && events._released) || _key == '+') && 
-				(inv._holdings - inv._invIndex) > 6) {
+		} else if (((found == 6 && events._released) || _key == Common::KEYCODE_PLUS
+				|| _key == Common::KEYCODE_KP_PLUS) &&  (inv._holdings - inv._invIndex) > 6) {
 			++inv._invIndex;
-			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
-				COMMAND_HIGHLIGHTED, "_");
+			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
 			inv.freeGraphics();
 			inv.loadGraphics();
 			inv.putInv(1);
 			inv.invCommands(true);
-		} else if (((found == 7 && events._released) || _key == '.') && 
-				(inv._holdings - inv._invIndex) > 6) {
+		} else if (((found == 7 && events._released) || _key == '.') && (inv._holdings - inv._invIndex) > 6) {
 			inv._invIndex += 6;
 			if ((inv._holdings - 6) < inv._invIndex)
 				inv._invIndex = inv._holdings - 6;
 
-			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
-				COMMAND_HIGHLIGHTED, "_");
+			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
 			inv.freeGraphics();
 			inv.loadGraphics();
 			inv.putInv(1);
-- 
cgit v1.2.3


From 250b3c1a30acba5770f214edaf14bc288065acd9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 04:52:31 -0500
Subject: SHERLOCK: Fix handling of talk opcodes in journal loading

---
 engines/sherlock/journal.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index ffda25a533..255662f71c 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -356,23 +356,23 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				break;
 
 			case 134:		// Change sequence
-				replyP += (replyP[0] & 127) + replyP[2] + 1;
+				replyP += (replyP[0] & 127) + replyP[2] + 2;
 				break;
 
 			case 135:       // Walk to co-ords
 			case 154:		// Move mouse
-				replyP += 3; 
+				replyP += 4; 
 				break;
 
 			case 139:		// Set flag
 			case 143:		// If statement 
-				++replyP;
+				replyP += 2;
 				break;
 
 			case 140:		// Play voice file
 			case 150:		// Play prologue
 			case 153:		// Call talk file 
-				replyP += 7;
+				replyP += 8;
 				break;
 
 			case 141:		// Toggle object
@@ -380,11 +380,11 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			case 152:		// Set object
 			case 155:		// Info line
 			case 158:		// Delete item from inventory
-				replyP += *replyP & 127;
+				replyP += (*replyP & 127) + 1;
 				break;
 
 			case 149:		// Goto scene
-				replyP += 4;
+				replyP += 5;
 				break;
 
 			case 161:		// End of line
-- 
cgit v1.2.3


From fd8cab4ffd38574fd255bd8f6335238ceb19bba8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 06:22:25 -0500
Subject: SHERLOCK: Fix casting of data in talk opcode handling

---
 engines/sherlock/talk.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b45139db4e..fafd9ce201 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1027,7 +1027,7 @@ void Talk::doScript(const Common::String &script) {
 	}
 
 	// Check if the script begins with a Stealh Mode Active command
-	if (str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
+	if ((byte)str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
 		_talkStealth = 2;
 		_speaker |= 128;
 	} else {
@@ -1068,7 +1068,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Remove portrait?
-		if (str[0] == REMOVE_PORTRAIT) {
+		if ((byte)str[0] == REMOVE_PORTRAIT) {
 			_speaker = 255;
 		} else {
 			// Nope, so set the first speaker
@@ -1116,12 +1116,12 @@ void Talk::doScript(const Common::String &script) {
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
 				_scriptCurrentIndex = (str + 1) - script.c_str();
-				scene.startCAnim((str[0] - 1) & 127, 1 + (str[0] & 128));
+				scene.startCAnim(((byte)str[0] - 1) & 127, 1 + ((byte)str[0] & 128));
 				if (_talkToAbort)
 					return;
 
 				// Check if next character is changing side or changing portrait
-				if (charCount && (str[1] == SWITCH_SPEAKER || str[1] == ASSIGN_PORTRAIT_LOCATION))
+				if (charCount && ((byte)str[1] == SWITCH_SPEAKER || (byte)str[1] == ASSIGN_PORTRAIT_LOCATION))
 					wait = 1;
 				break;
 
@@ -1215,7 +1215,8 @@ void Talk::doScript(const Common::String &script) {
 				++str;
 				_scriptCurrentIndex = str - script.c_str();
 
-				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100, str[2] * 100), str[3] - 1);
+				people.walkToCoords(Common::Point((((byte)str[0] - 1) * 256 + (byte)str[1] - 1) * 100, 
+					(byte)str[2] * 100), str[3] - 1);
 				if (_talkToAbort)
 					return;
 
@@ -1272,7 +1273,7 @@ void Talk::doScript(const Common::String &script) {
 
 			case SET_FLAG: {
 				++str;
-				int flag1 = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
+				int flag1 = ((byte)str[0] - 1) * 256 + (byte)str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				int flag = (flag1 & 0x7fff) * (flag1 >= 0x8000 ? -1 : 1);
 				_vm->setFlags(flag);
 				++str;
@@ -1310,7 +1311,7 @@ void Talk::doScript(const Common::String &script) {
 
 			case IF_STATEMENT: {
 				++str;
-				int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
+				int flag = ((byte)str[0] - 1) * 256 + (byte)str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				++str;
 				wait = 0;
 				
@@ -1396,7 +1397,7 @@ void Talk::doScript(const Common::String &script) {
 				str += str[0];
 
 				// Set comparison state according to if we want to hide or unhide
-				bool state = (str[0] >= 128);
+				bool state = ((byte)str[0] >= 128);
 
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
 					Object &obj = scene._bgShapes[idx];
@@ -1437,7 +1438,7 @@ void Talk::doScript(const Common::String &script) {
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
 				_scriptCurrentIndex = str - script.c_str();
-				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
+				events.moveMouse(Common::Point(((byte)str[0] - 1) * 256 + (byte)str[1] - 1, str[2]));
 				if (_talkToAbort)
 					return;
 				str += 3;
@@ -1599,7 +1600,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= 128 && str[0] != COMMAND_161)) {
+		if ((openTalkWindow && wait) || (openTalkWindow && (byte)str[0] >= 128 && (byte)str[0] != COMMAND_161)) {
 			if (!ui._windowStyle) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
@@ -1625,12 +1626,12 @@ void Talk::doScript(const Common::String &script) {
 
 			// If a key was pressed to finish the window, see if further voice files should be skipped
 			if (wait >= 0 && wait < 254) {
-				if (str[0] == SFX_COMMAND)
+				if ((byte)str[0] == SFX_COMMAND)
 					str += 9;
 			}
 
 			// Clear the window unless the wait was due to a PAUSE command
-			if (!pauseFlag && wait != -1 && str[0] != SFX_COMMAND) {
+			if (!pauseFlag && wait != -1 && (byte)str[0] != SFX_COMMAND) {
 				if (!_talkStealth)
 					ui.clearWindow();
 				yp = CONTROLS_Y + 12;
-- 
cgit v1.2.3


From 5f53b9255eb2799906c324ff0e2ad096092a5dec Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 26 Apr 2015 15:29:02 +0200
Subject: SCI: restore: reset ports before loading memory

otherwise we could free hunk space of the
loaded saved game
---
 engines/sci/engine/savegame.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index d89170ab22..e0c2833572 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -728,9 +728,7 @@ void GfxPalette::saveLoadWithSerializer(Common::Serializer &s) {
 }
 
 void GfxPorts::saveLoadWithSerializer(Common::Serializer &s) {
-	if (s.isLoading())
-		reset();	// remove all script generated windows
-
+	// reset() is called directly way earlier in gamestate_restore()
 	if (s.getVersion() >= 27) {
 		uint windowCount = 0;
 		uint id = PORTS_FIRSTSCRIPTWINDOWID;
@@ -925,6 +923,13 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	// We don't need the thumbnail here, so just read it and discard it
 	Graphics::skipThumbnail(*fh);
 
+	// reset ports as one of the first things we do, because that may free() some hunk memory
+	//  and we don't want to do that after we read in the saved game hunk memory
+	if (ser.isLoading()) {
+		if (g_sci->_gfxPorts)
+			g_sci->_gfxPorts->reset();
+	}
+
 	s->reset(true);
 	s->saveLoadWithSerializer(ser);	// FIXME: Error handling?
 
-- 
cgit v1.2.3


From 031b9b8ced1007545099e0e6285ea4bbe1d3e97f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 26 Apr 2015 15:50:12 +0200
Subject: SCI: restore: clear screen when restoring

primarily to clear kPortrait graphics in kq6
when restoring during portrait animation
---
 engines/sci/engine/savegame.cpp |  7 ++++++-
 engines/sci/graphics/screen.cpp | 12 ++++++++++++
 engines/sci/graphics/screen.h   |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index e0c2833572..3d934410c3 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -41,6 +41,7 @@
 #include "sci/graphics/helpers.h"
 #include "sci/graphics/palette.h"
 #include "sci/graphics/ports.h"
+#include "sci/graphics/screen.h"
 #include "sci/parser/vocabulary.h"
 #include "sci/sound/audio.h"
 #include "sci/sound/music.h"
@@ -923,11 +924,15 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	// We don't need the thumbnail here, so just read it and discard it
 	Graphics::skipThumbnail(*fh);
 
-	// reset ports as one of the first things we do, because that may free() some hunk memory
+	// reset ports is one of the first things we do, because that may free() some hunk memory
 	//  and we don't want to do that after we read in the saved game hunk memory
 	if (ser.isLoading()) {
+		// reset ports
 		if (g_sci->_gfxPorts)
 			g_sci->_gfxPorts->reset();
+		// clear screen
+		if (g_sci->_gfxScreen)
+			g_sci->_gfxScreen->clear();
 	}
 
 	s->reset(true);
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 5a3b30f7ef..dfcb5dbc14 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -251,6 +251,18 @@ GfxScreen::~GfxScreen() {
 	free(_displayScreen);
 }
 
+// should not used regulary, only meant for restore game
+void GfxScreen::clear() {
+	// reset all screen data
+	memset(_visualScreen, 0, _pixels);
+	memset(_priorityScreen, 0, _pixels);
+	memset(_controlScreen, 0, _pixels);
+	memset(_displayScreen, 0, _displayPixels);
+	memset(&_ditheredPicColors, 0, sizeof(_ditheredPicColors));
+	_fontIsUpscaled = false;
+	copyToScreen();
+}
+
 void GfxScreen::copyToScreen() {
 	g_system->copyRectToScreen(_activeScreen, _displayWidth, 0, 0, _displayWidth, _displayHeight);
 }
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 766e32614a..587d2ef3bc 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -76,6 +76,7 @@ public:
 	byte getColorWhite() { return _colorWhite; }
 	byte getColorDefaultVectorData() { return _colorDefaultVectorData; }
 
+	void clear();
 	void copyToScreen();
 	void copyFromScreen(byte *buffer);
 	void kernelSyncWithFramebuffer();
-- 
cgit v1.2.3


From 0ca3fd645406a44f272ccc77abbc143523918701 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 16:38:34 -0500
Subject: SHERLOCK: Fix SET_FLAG talk opcode

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index fafd9ce201..c605f9a7e9 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1274,7 +1274,7 @@ void Talk::doScript(const Common::String &script) {
 			case SET_FLAG: {
 				++str;
 				int flag1 = ((byte)str[0] - 1) * 256 + (byte)str[1] - 1 - (str[1] == 1 ? 1 : 0);
-				int flag = (flag1 & 0x7fff) * (flag1 >= 0x8000 ? -1 : 1);
+				int flag = (flag1 & 0x3fff) * (flag1 >= 0x4000 ? -1 : 1);
 				_vm->setFlags(flag);
 				++str;
 				break;
-- 
cgit v1.2.3


From 488ac579d7cd037dfe5c71cf20a878cf5ecdfe18 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 17:26:22 -0500
Subject: SHERLOCK: Fix checking single character star action names

---
 engines/sherlock/objects.cpp        | 2 +-
 engines/sherlock/user_interface.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 8c8d90579c..49f64c85b0 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -828,7 +828,7 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 	if (name.hasPrefix("*")) {
 		// A code was found
 		printed = true;
-		ch = toupper(name[1]);
+		ch = (name == "*") ? 0 : toupper(name[1]);
 
 		switch (ch) {
 		case 'C':
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 7a581ca63b..ed3debe2fc 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2609,7 +2609,8 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		events.setCursor(WAIT);
 
 		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*") && toupper(action._names[nameIdx][1]) == 'W') {
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2 
+					&& toupper(action._names[nameIdx][1]) == 'W') {
 				if (obj.checkNameForCodes(Common::String(action._names[nameIdx].c_str() + 2), messages)) {
 					if (!talk._talkToAbort)
 						printed = true;
@@ -2618,7 +2619,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		}
 
 		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*")) {
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2) {
 				char ch = toupper(action._names[nameIdx][1]);
 
 				if (ch == 'T' || ch == 'B') {
@@ -2648,7 +2649,8 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		}
 
 		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*") && toupper(action._names[nameIdx][1]) == 'F') {
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
+					&& toupper(action._names[nameIdx][1]) == 'F') {
 				if (obj.checkNameForCodes(action._names[nameIdx].c_str() + 2, messages)) {
 					if (!talk._talkToAbort)
 						printed = true;
-- 
cgit v1.2.3


From f3bd61607017fe0ef0f5143e6ad8dbdb4743b246 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 18:07:52 -0500
Subject: SHERLOCK: Fix character positioning after loading savegames

---
 engines/sherlock/objects.cpp         | 22 +++++++++++-----------
 engines/sherlock/people.cpp          | 13 ++++++++++---
 engines/sherlock/people.h            |  2 ++
 engines/sherlock/scalpel/scalpel.cpp |  4 ++--
 engines/sherlock/scene.cpp           | 34 +++++++++++++++++-----------------
 engines/sherlock/scene.h             |  2 --
 engines/sherlock/sherlock.cpp        |  2 +-
 engines/sherlock/talk.cpp            |  4 ++--
 8 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 49f64c85b0..7341fc3b30 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -165,11 +165,11 @@ void Sprite::adjustSprite() {
 			scene._goToScene = exit->_scene;
 
 			if (exit->_people.x != 0) {
-				scene._hsavedPos = exit->_people;
-				scene._hsavedFs = exit->_peopleDir;
+				people._hSavedPos = exit->_people;
+				people._hSavedFacing = exit->_peopleDir;
 
-				if (scene._hsavedFs > 100 && scene._hsavedPos.x < 1)
-					scene._hsavedPos.x = 100;
+				if (people._hSavedFacing > 100 && people._hSavedPos.x < 1)
+					people._hSavedPos.x = 100;
 			}
 		}		
 	}
@@ -869,18 +869,18 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 					++p;
 
 					Common::String s(p, p + 3);
-					scene._hsavedPos.x = atoi(s.c_str());
+					people._hSavedPos.x = atoi(s.c_str());
 
 					s = Common::String(p + 3, p + 6);
-					scene._hsavedPos.y = atoi(s.c_str());
+					people._hSavedPos.y = atoi(s.c_str());
 
 					s = Common::String(p + 6, p + 9);
-					scene._hsavedFs = atoi(s.c_str());
-					if (scene._hsavedFs == 0)
-						scene._hsavedFs = 10;
+					people._hSavedFacing = atoi(s.c_str());
+					if (people._hSavedFacing == 0)
+						people._hSavedFacing = 10;
 				} else if ((p = strchr(name.c_str(), '/')) != nullptr) {
-					scene._hsavedPos = Common::Point(1, 0);
-					scene._hsavedFs = 100 + atoi(p + 1);
+					people._hSavedPos = Common::Point(1, 0);
+					people._hSavedFacing = 100 + atoi(p + 1);
 				}
 			} else {
 				scene._goToScene = 100;
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index e126757231..43e1fa046b 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -204,6 +204,8 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_speakerFlip = false;
 	_holmesFlip = false;
 	_holmesQuotient = 0;
+	_hSavedPos = Common::Point(-1, -1);
+	_hSavedFacing = -1;
 
 	_portrait._sequences = new byte[32];
 }
@@ -708,10 +710,15 @@ void People::setTalking(int speaker) {
  */
 void People::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_holmesOn);
-	s.syncAsSint16LE(_data[AL]._position.x);
-	s.syncAsSint16LE(_data[AL]._position.y);
-	s.syncAsSint16LE(_data[AL]._sequenceNumber);
+	s.syncAsSint16LE(_player._position.x);
+	s.syncAsSint16LE(_player._position.y);
+	s.syncAsSint16LE(_player._sequenceNumber);
 	s.syncAsSint16LE(_holmesQuotient);
+
+	if (s.isLoading()) {
+		_hSavedPos = _player._position;
+		_hSavedFacing = _player._sequenceNumber;
+	}
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 8a7476a33a..f1ed3496a1 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -74,6 +74,8 @@ private:
 public:
 	ImageFile *_talkPics;
 	Common::Point _walkDest;
+	Common::Point _hSavedPos;
+	int _hSavedFacing;
 	Common::Queue<Common::Point> _walkTo;
 	Person &_player;
 	bool _holmesOn;
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 2ca9f80c42..65ca61b09f 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -479,8 +479,8 @@ void ScalpelEngine::startScene() {
 		_scene->_goToScene = _map->show();
 
 		_sound->freeSong();
-		_scene->_hsavedPos = Common::Point(-1, -1);
-		_scene->_hsavedFs = -1;
+		_people->_hSavedPos = Common::Point(-1, -1);
+		_people->_hSavedFacing = -1;
 	}
 
 	// Some rooms are prologue cutscenes, rather than normal game scenes. These are:
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index d9161e25c0..2d0f6fd751 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -97,8 +97,6 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_version = 0;
 	_lzwMode = false;
 	_invGraphicItems = 0;
-	_hsavedPos = Common::Point(-1, -1);
-	_hsavedFs = -1;
 	_cAnimFramePause = 0;
 	_restoreFlag = false;
 	_invLookFlag = false;
@@ -579,48 +577,50 @@ void Scene::transitionToScene() {
 	SaveManager &saves = *_vm->_saves;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
+	Common::Point &hSavedPos = people._hSavedPos;
+	int &hSavedFacing = people._hSavedFacing;
 
 	const int FS_TRANS[8] = {
 		STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN,
 		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT
 	};
 
-	if (_hsavedPos.x < 1) {
+	if (hSavedPos.x < 1) {
 		// No exit information from last scene-check entrance info
 		if (_entrance._startPosition.x < 1) {
 			// No entrance info either, so use defaults
-			_hsavedPos = Common::Point(16000, 10000);
-			_hsavedFs = 4;
+			hSavedPos = Common::Point(16000, 10000);
+			hSavedFacing = 4;
 		} else {
 			// setup entrance info
-			_hsavedPos = _entrance._startPosition;
-			_hsavedFs = _entrance._startDir;
+			hSavedPos = _entrance._startPosition;
+			hSavedFacing = _entrance._startDir;
 		}
 	} else {
 		// Exit information exists, translate it to real sequence info
 		// Note: If a savegame was just loaded, then the data is already correct.
 		// Otherwise, this is a linked scene or entrance info, and must be translated
-		if (_hsavedFs < 8 && !saves._justLoaded) {
-			_hsavedFs = FS_TRANS[_hsavedFs];
-			_hsavedPos.x *= 100;
-			_hsavedPos.y *= 100;
+		if (hSavedFacing < 8 && !saves._justLoaded) {
+			hSavedFacing = FS_TRANS[hSavedFacing];
+			hSavedPos.x *= 100;
+			hSavedPos.y *= 100;
 		}
 	}
 
 	int cAnimNum = -1;
 
-	if (_hsavedFs < 101) {
+	if (hSavedFacing < 101) {
 		// Standard info, so set it
-		people[PLAYER]._position = _hsavedPos;
-		people[PLAYER]._sequenceNumber = _hsavedFs;
+		people[PLAYER]._position = hSavedPos;
+		people[PLAYER]._sequenceNumber = hSavedFacing;
 	} else {
 		// It's canimation information
-		cAnimNum = _hsavedFs - 101;
+		cAnimNum = hSavedFacing - 101;
 	}
 
 	// Reset positioning for next load
-	_hsavedPos = Common::Point(-1, -1);
-	_hsavedFs = -1;
+	hSavedPos = Common::Point(-1, -1);
+	hSavedFacing = -1;
 
 	if (cAnimNum != -1) {
 		// Prevent Holmes from being drawn
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index cc01fa92ab..892163a2f6 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -130,8 +130,6 @@ public:
 	Common::Array<Exit> _exits;
 	SceneEntry _entrance;
 	Common::Array<SceneSound> _sounds;
-	Common::Point _hsavedPos;
-	int _hsavedFs;
 	Common::Array<Object> _canimShapes;
 	bool _restoreFlag;
 	int _animating;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index d880257406..406b796fc9 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -147,7 +147,7 @@ void SherlockEngine::sceneLoop() {
 		// Handle any input from the keyboard or mouse
 		handleInput();
 
-		if (_scene->_hsavedPos.x == -1) {
+		if (_people->_hSavedPos.x == -1) {
 			_canLoadSave = true;
 			_scene->doBgAnim();
 			_canLoadSave = false;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index c605f9a7e9..0793552846 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1361,8 +1361,8 @@ void Talk::doScript(const Common::String &script) {
 
 					// Run a canimation?
 					if (str[2] > 100) {
-						scene._hsavedFs = str[2];
-						scene._hsavedPos = Common::Point(160, 100);
+						people._hSavedFacing = (byte)str[2];
+						people._hSavedPos = Common::Point(160, 100);
 					}
 				}
 				str += 6;
-- 
cgit v1.2.3


From 65eb390ead25c54b1e3c547f3e189a7ccb73becb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 18:29:20 -0500
Subject: SHERLOCK: Cleanup and moving of map variables into Map class

---
 engines/sherlock/map.cpp             | 29 +++++++++++++++++++++--------
 engines/sherlock/map.h               |  8 ++++++--
 engines/sherlock/objects.cpp         |  4 ++--
 engines/sherlock/people.cpp          |  5 ++---
 engines/sherlock/saveload.cpp        |  2 ++
 engines/sherlock/scalpel/scalpel.cpp | 18 +++++++++---------
 engines/sherlock/scene.cpp           | 18 +++++-------------
 engines/sherlock/scene.h             |  3 ---
 engines/sherlock/sherlock.h          |  2 --
 engines/sherlock/talk.cpp            |  6 +++---
 10 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index c3a5ba7b17..5865f34fa0 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -62,6 +62,9 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_cursorIndex = -1;
 	_drawMap = false;
 	_overPos = Common::Point(13000, 12600);
+	_charPoint = 0;
+	_oldCharPoint = 39;
+
 	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
 
@@ -126,7 +129,6 @@ void Map::loadData() {
 int Map::show() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Common::Point lDrawn(-1, -1);
 	bool changed = false, exitFlag = false;
@@ -230,7 +232,7 @@ int Map::show() {
 		if ((events._released || events._rightReleased) && _point != -1) {
 			if (people[AL]._walkCount == 0) {
 				people._walkDest = _points[_point] + Common::Point(4, 9);
-				scene._charPoint = _point;
+				_charPoint = _point;
 
 				// Start walking to selected location
 				walkTheStreets();
@@ -243,7 +245,7 @@ int Map::show() {
 
 		// Check if a scene has beeen selected and we've finished "moving" to it
 		if (people[AL]._walkCount == 0) {
-			if (scene._charPoint >= 1 && scene._charPoint < (int)_points.size())
+			if (_charPoint >= 1 && _charPoint < (int)_points.size())
 				exitFlag = true;
 		}
 
@@ -267,7 +269,7 @@ int Map::show() {
 	screen.setFont(oldFont);
 
 	_active = false;
-	return scene._charPoint;
+	return _charPoint;
 }
 
 /**
@@ -443,8 +445,8 @@ void Map::walkTheStreets() {
 	Common::Array<Common::Point> tempPath;
 
 	// Get indexes into the path lists for the start and destination scenes
-	int start = _points[scene._oldCharPoint]._translate;
-	int dest = _points[scene._charPoint]._translate;
+	int start = _points[_oldCharPoint]._translate;
+	int dest = _points[_charPoint]._translate;
 
 	// Get pointer to start of path
 	const byte *path = _paths.getPath(start, dest);
@@ -454,10 +456,10 @@ void Map::walkTheStreets() {
 	Common::Point destPos = people._walkDest;
 
 	// Check for any intermediate points between the two locations
-	if (path[0] || scene._charPoint > 50 || scene._oldCharPoint > 50) {
+	if (path[0] || _charPoint > 50 || _oldCharPoint > 50) {
 		people[AL]._sequenceNumber = -1;
 
-		if (scene._charPoint == 51 || scene._oldCharPoint == 51) {
+		if (_charPoint == 51 || _oldCharPoint == 51) {
 			people.setWalking();
 		} else {
 			// Check for moving the path backwards or forwards
@@ -583,4 +585,15 @@ void Map::highlightIcon(const Common::Point &pt) {
 	}
 }
 
+/**
+* Synchronize the data for a savegame
+*/
+void Map::synchronize(Common::Serializer &s) {
+	s.syncAsSint16LE(_bigPos.x);
+	s.syncAsSint16LE(_bigPos.y);
+	s.syncAsSint16LE(_overPos.x);
+	s.syncAsSint16LE(_overPos.y);
+	s.syncAsSint16LE(_oldCharPoint);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index a91e7ae968..564ae73691 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -26,6 +26,7 @@
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/serializer.h"
 #include "common/str.h"
 #include "common/str-array.h"
 #include "sherlock/graphics.h"
@@ -67,8 +68,6 @@ private:
 	ImageFile *_shapes;
 	ImageFile *_iconShapes;
 	byte _sequences[MAX_HOLMES_SEQUENCE][MAX_FRAME];
-	Common::Point _bigPos;
-	Common::Point _overPos;
 	Common::Point _lDrawnPos;
 	int _point;
 	bool _placesShown;
@@ -97,6 +96,9 @@ private:
 	void highlightIcon(const Common::Point &pt);
 public:
 	bool _active;
+	Common::Point _overPos;
+	Common::Point _bigPos;
+	int _charPoint, _oldCharPoint;
 public:
 	Map(SherlockEngine *vm);
 
@@ -106,6 +108,8 @@ public:
 	void loadSequences(int count, const byte *seq);
 
 	int show();
+
+	void synchronize(Common::Serializer &s);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 7341fc3b30..62a1a35f4a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -861,8 +861,8 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 				scene._goToScene = atoi(name.c_str() + 1);
 
 				if (scene._goToScene < 97 && map[scene._goToScene].x) {
-					_vm->_over.x = map[scene._goToScene].x * 100 - 600;
-					_vm->_over.y = map[scene._goToScene].y * 100 + 900;
+					map._overPos.x = map[scene._goToScene].x * 100 - 600;
+					map._overPos.y = map[scene._goToScene].y * 100 + 900;
 				}
 
 				if ((p = strchr(name.c_str(), ',')) != nullptr) {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 43e1fa046b..2eff1a0973 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -421,7 +421,6 @@ void People::setWalking() {
  */
 void People::gotoStand(Sprite &sprite) {
 	Map &map = *_vm->_map;
-	Scene &scene = *_vm->_scene;
 	_walkTo.clear();
 	sprite._walkCount = 0;
 
@@ -454,8 +453,8 @@ void People::gotoStand(Sprite &sprite) {
 
 	if (map._active) {
 		sprite._sequenceNumber = 0;
-		_data[AL]._position.x = (map[scene._charPoint].x -  6) * 100;
-		_data[AL]._position.y = (map[scene._charPoint].x + 10) * 100;
+		_player._position.x = (map[map._charPoint].x -  6) * 100;
+		_player._position.y = (map[map._charPoint].x + 10) * 100;
 	}
 
 	_oldWalkSequence = -1;
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index a694e21b28..86a4e8417a 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -368,6 +368,7 @@ Common::String SaveManager::generateSaveName(int slot) {
 void SaveManager::synchronize(Common::Serializer &s) {
 	Inventory &inv = *_vm->_inventory;
 	Journal &journal = *_vm->_journal;
+	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -378,6 +379,7 @@ void SaveManager::synchronize(Common::Serializer &s) {
 	inv.synchronize(s);
 	journal.synchronize(s);
 	people.synchronize(s);
+	map.synchronize(s);
 	scene.synchronize(s);
 	screen.synchronize(s);
 	talk.synchronize(s);
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 65ca61b09f..89e042d382 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -576,23 +576,23 @@ void ScalpelEngine::startScene() {
 		switch (_scene->_goToScene) {
 		case 52:
 			_scene->_goToScene = 27;			// Go to the Lawyer's Office
-			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
-			_scene->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
-			_scene->_oldCharPoint = 27;
+			_map->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_map->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
+			_map->_oldCharPoint = 27;
 			break;
 
 		case 53:
 			_scene->_goToScene = 17;			// Go to St. Pancras Station
-			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
-			_scene->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
-			_scene->_oldCharPoint = 17;
+			_map->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_map->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
+			_map->_oldCharPoint = 17;
 			break;
 
 		default:
 			_scene->_goToScene = 4;			// Back to Baker st.
-			_scene->_bigPos = Common::Point(0, 0);	// Overland scroll position
-			_scene->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
-			_scene->_oldCharPoint = 4;
+			_map->_bigPos = Common::Point(0, 0);	// Overland scroll position
+			_map->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
+			_map->_oldCharPoint = 4;
 			break;
 		}
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 2d0f6fd751..7c31788a2f 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -89,8 +89,6 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_currentScene = -1;
 	_goToScene = -1;
 	_changes = false;
-	_charPoint = 0;
-	_oldCharPoint = 39;
 	_keyboardInput = 0;
 	_walkedInScene = false;
 	_ongoingCans = 0;
@@ -438,10 +436,10 @@ bool Scene::loadScene(const Common::String &filename) {
 	_walkedInScene = false;
 	saves._justLoaded = false;
 
-	// Reset the position on the overland map
-	_vm->_oldCharPoint = _currentScene;
-	_vm->_over.x = map[_currentScene].x * 100 - 600;
-	_vm->_over.y = map[_currentScene].y * 100 + 900;
+	// Reset the previous map location and position on overhead map
+	map._oldCharPoint = _currentScene;
+	map._overPos.x = map[_currentScene].x * 100 - 600;
+	map._overPos.y = map[_currentScene].y * 100 + 900;
 
 	events.clearEvents();
 	return flag;
@@ -1043,7 +1041,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		_goToScene = gotoCode;
 
 		if (_goToScene < 97 && map[_goToScene].x) {
-			_overPos = map[_goToScene];
+			map._overPos = map[_goToScene];
 		}
 	}
 
@@ -1474,12 +1472,6 @@ void Scene::synchronize(Common::Serializer &s) {
 	if (s.isSaving())
 		saveSceneStatus();
 
-	s.syncAsSint16LE(_bigPos.x);
-	s.syncAsSint16LE(_bigPos.y);
-	s.syncAsSint16LE(_overPos.x);
-	s.syncAsSint16LE(_overPos.y);
-	s.syncAsSint16LE(_oldCharPoint);
-
 	if (s.isSaving())
 		s.syncAsSint16LE(_currentScene);
 	else
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 892163a2f6..159f281bdf 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -107,9 +107,6 @@ public:
 	bool _changes;
 	bool _sceneStats[SCENES_COUNT][65];
 	bool _savedStats[SCENES_COUNT][9];
-	Common::Point _bigPos;
-	Common::Point _overPos;
-	int _charPoint, _oldCharPoint;
 	int _keyboardInput;
 	int _oldKey, _help, _oldHelp;
 	int _oldTemp, _temp;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index ce126c0dcc..921559183d 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -104,8 +104,6 @@ public:
 	Common::String _titleOverride;
 	bool _useEpilogue2;
 	bool _loadingSavedGame;
-	int _oldCharPoint;					// Old scene
-	Common::Point _over;				// Old map position
 	bool _slowChess;
 	int _keyPadSpeed;
 	int _loadGameSlot;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 0793552846..94779ae760 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1355,9 +1355,9 @@ void Talk::doScript(const Common::String &script) {
 
 				if (scene._goToScene != 100) {
 					// Not going to the map overview
-					scene._oldCharPoint = scene._goToScene;
-					scene._overPos.x = map[scene._goToScene].x * 100 - 600;
-					scene._overPos.y = map[scene._goToScene].y * 100 + 900;
+					map._oldCharPoint = scene._goToScene;
+					map._overPos.x = map[scene._goToScene].x * 100 - 600;
+					map._overPos.y = map[scene._goToScene].y * 100 + 900;
 
 					// Run a canimation?
 					if (str[2] > 100) {
-- 
cgit v1.2.3


From d51173cd114e3dacabf7bfa6053f484512ad3514 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 20:09:59 -0500
Subject: SHERLOCK: Fix map not displaying second time it's called

---
 engines/sherlock/map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 5865f34fa0..b0cf246e52 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -88,7 +88,6 @@ void Map::loadSequences(int count, const byte *seq) {
 		Common::copy(seq, seq + MAX_FRAME, &_sequences[idx][0]);
 }
 
-
 /**
  * Load data  needed for the map
  */
@@ -151,6 +150,7 @@ int Map::show() {
 	screen._backBuffer1.blitFrom(bigMap[3], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y));
 
 	_drawMap = true;
+	_charPoint = -1;
 	_point = -1;
 	people[AL]._position = _lDrawnPos = _overPos;
 
-- 
cgit v1.2.3


From 8ec6e58f67e9dd6d0f7243d284497524280f7532 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 20:28:49 -0500
Subject: SHERLOCK: Fix color for picking up messages

---
 engines/sherlock/objects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 62a1a35f4a..f662d00aed 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -994,7 +994,7 @@ int Object::pickUpObject(const char *const messages[]) {
 
 		++ui._infoFlag;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_LINE, messages[message]);
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[message]);
 		ui._menuCounter = 30;
 	} else {
 		// Pick it up
-- 
cgit v1.2.3


From 3d483400698526a79fe31ac440bb2c410889f85f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 21:15:33 -0500
Subject: SHERLOCK: Fix using items from inventory dialog

---
 engines/sherlock/user_interface.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ed3debe2fc..97f6cfd63a 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -766,7 +766,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 	Common::Point mousePos = events.mousePos();
 	int temp;
 	Common::String tempStr;
-	int x, width, width1, width2 = 0;
+	int x, width;
 
 	// Don't display anything for right button command
 	if ((events._rightPressed || events._rightPressed) && !events._pressed)
@@ -790,7 +790,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 				// If inventory is active and an item is selected for a Use or Give action
 				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
 						(inv._invMode == 2 || inv._invMode == 3)) {
-					width1 = screen.stringWidth(inv[_selector]._name);
+					int width1 = 0, width2 = 0;
 
 					if (inv._invMode == 2) {
 						// Using an object
@@ -805,6 +805,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 						// If we're using an inventory object, add in the width
 						// of the object name and the " on "
 						if (_selector != -1) {
+							width1 = screen.stringWidth(inv[_selector]._name);
 							x += width1;
 							width2 = screen.stringWidth(" on ");
 							x += width2;
@@ -835,6 +836,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 					} else if (temp >= 0 && temp < 1000 && _selector != -1 &&
 							scene._bgShapes[temp]._aType == PERSON) {
 						// Giving an object to a person
+						width1 = screen.stringWidth(inv[_selector]._name);
 						x = width = screen.stringWidth("Give ");
 						x += width1;
 						width2 = screen.stringWidth(" to ");
@@ -1235,13 +1237,12 @@ void UserInterface::doInvControl() {
 		if (found != -1)
 			// If a slot highlighted, set it's color
 			colors[found] = COMMAND_HIGHLIGHTED;
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
-			colors[0], true, "Exit");
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), colors[0], true, "Exit");
 
 		if (found >= 0 && found <= 3) {
 			screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
-			screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[1], true, "Use");
-			screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[1], true, "Give");
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[2], true, "Use");
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[3], true, "Give");
 			inv._invMode = (InvMode)found;
 			_selector = -1;
 		}
-- 
cgit v1.2.3


From 3a8aa6956812d8e69c6b5e1021ba5c05e3fe0b0b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Apr 2015 23:31:29 -0500
Subject: SHERLOCK: Fixes for using flower on lab table

---
 engines/sherlock/scene.cpp          | 4 ++++
 engines/sherlock/talk.cpp           | 3 ++-
 engines/sherlock/user_interface.cpp | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 7c31788a2f..7b885a2cb9 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -953,6 +953,8 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		cObj._imageFrame = &(*cObj._images)[0];
 		cObj._maxFrames = cObj._images->size();
 
+		++_ongoingCans;
+
 		int frames = 0;
 		if (playRate < 0) {
 			// Reverse direction
@@ -1362,6 +1364,8 @@ void Scene::doBgAnim() {
 					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
 
 				_canimShapes.remove_at(idx);
+				if (_ongoingCans > 0)
+					--_ongoingCans;
 			} else if (o._type == ACTIVE_BG_SHAPE) {
 				screen.flushImage(o._imageFrame, o._position,
 					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 94779ae760..ea2cb16252 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -312,7 +312,8 @@ void Talk::talkTo(const Common::String &filename) {
 			select = _talkIndex = idx;
 	}
 
-	if (_scriptMoreFlag && _scriptSelect != 0)
+	// If there's a pending automatic selection to be made, then use it
+	if (_scriptMoreFlag && _scriptSelect != 100)
 		select = _scriptSelect;
 
 	if (select == -1)
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 97f6cfd63a..e4d7255774 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -818,7 +818,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 							tempStr.deleteLastChar();
 						}
 
-						int xStart = (SHERLOCK_SCREEN_HEIGHT - x) / 2;
+						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
 						screen.print(Common::Point(xStart, INFO_LINE + 1),
 							INFO_FOREGROUND, "Use ");
 
-- 
cgit v1.2.3


From 80fba27cb372c052a912e23595fcd201fd688acf Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 27 Apr 2015 02:18:57 -0500
Subject: SHERLOCK: Fix analysing flower on lab table

---
 engines/sherlock/scene.cpp | 3 +++
 engines/sherlock/talk.cpp  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 7b885a2cb9..f6fe8c8671 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1014,6 +1014,9 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 			while (--temp > 0) {
 				cObj._frameNumber--;
 				doBgAnim();
+
+				if (_vm->shouldQuit())
+					return 0;
 			}
 
 			cObj._frameNumber += dir;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ea2cb16252..427be09cc3 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1117,7 +1117,7 @@ void Talk::doScript(const Common::String &script) {
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
 				_scriptCurrentIndex = (str + 1) - script.c_str();
-				scene.startCAnim(((byte)str[0] - 1) & 127, 1 + ((byte)str[0] & 128));
+				scene.startCAnim(((byte)str[0] - 1) & 127, ((byte)str[0] & 128) ? -1 : 1);
 				if (_talkToAbort)
 					return;
 
-- 
cgit v1.2.3


From a2e1f4cb76a6629f53a7f03c8b9bc2efa5f701e6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 27 Apr 2015 02:29:34 -0500
Subject: SHERLOCK: Fix using items within the scene

---
 engines/sherlock/user_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index e4d7255774..b12094638c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1422,7 +1422,7 @@ void UserInterface::doInvControl() {
 						checkUseAction(&scene._bgShapes[_find]._use[0], inv[_selector]._name, MUSE, _find, temp - 2);
 					else
 						// Now inv object has been highlighted
-						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF", MUSE, _find, temp - 2);
+						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF*", MUSE, _find, temp - 2);
 						
 					_selector = _oldSelector = -1;
 				}
-- 
cgit v1.2.3


From f7f405eadb355089b17bb7d146b0e06da04f27e2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 27 Apr 2015 04:40:19 -0500
Subject: SHERLOCK: Further fixes for analysing flower on lab table

---
 engines/sherlock/talk.cpp | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 427be09cc3..29bfff8674 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -134,7 +134,7 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkStealth = 0;
 	_talkToFlag = -1;
 	_moreTalkDown = _moreTalkUp = false;
-	_scriptMoreFlag = false;
+	_scriptMoreFlag = 0;
 	_scriptSaveIndex = -1;
 	_scriptCurrentIndex = -1;
 }
@@ -217,7 +217,7 @@ void Talk::talkTo(const Common::String &filename) {
 		}
 	}
 
-	while (!_scriptStack.empty())
+	while (!_sequenceStack.empty())
 		pullSequence();
 
 	// Restore any pressed button
@@ -578,6 +578,9 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	Resources &res = *_vm->_res;
 	Sound &sound = *_vm->_sound;
 
+	// Save a copy of the talk filename
+	_scriptName = filename;
+
 	// Check for an existing person being talked to
 	_talkTo = -1;
 	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
@@ -867,7 +870,7 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
  * Clears the stack of pending object sequences associated with speakers in the scene
  */
 void Talk::clearSequences() {
-	_scriptStack.clear();
+	_sequenceStack.clear();
 }
 
 /**
@@ -1385,7 +1388,7 @@ void Talk::doScript(const Common::String &script) {
 			case ADD_ITEM_TO_INVENTORY:
 				++str;
 				for (int idx = 0; idx < str[0]; ++idx)
-					tempString += str[idx];
+					tempString += str[idx + 1];
 				str += str[0];
 
 				inv.putNameInInventory(tempString);
@@ -1420,16 +1423,24 @@ void Talk::doScript(const Common::String &script) {
 				_scriptCurrentIndex = str - script.c_str();
 
 				// Save the current script position and new talk file
-				if (_scriptStack.size() < 10) {
-					ScriptStackEntry rec;
-					rec._name = _scriptName;
-					rec._currentIndex = _scriptCurrentIndex;
-					rec._select = _scriptSelect;
+				if (_scriptStack.size() < 9) {
+					ScriptStackEntry rec1;
+					rec1._name = _scriptName;
+					rec1._currentIndex = _scriptCurrentIndex;
+					rec1._select = _scriptSelect;
+					_scriptStack.push(rec1);
+
+					// Push the new talk file onto the stack
+					ScriptStackEntry rec2;
+					rec2._name = tempString;
+					rec2._currentIndex = 0;
+					rec2._select = 100;
+					_scriptStack.push(rec2);
 				} else {
 					error("Script stack overflow");
 				}
 
-				_scriptMoreFlag = true;
+				_scriptMoreFlag = 1;
 				endStr = true;
 				wait = 0;
 				break;
@@ -1655,7 +1666,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		pullSequence();
-		if (_speaker < 128)
+		if (_speaker >= 0 && _speaker < 128)
 			people.clearTalking();
 	}
 }
@@ -1749,7 +1760,7 @@ void Talk::popStack() {
 		_scriptName = scriptEntry._name;
 		_scriptSaveIndex = scriptEntry._currentIndex;
 		_scriptSelect = scriptEntry._select;
-		_scriptMoreFlag = true;
+		_scriptMoreFlag = 1;
 	}
 }
 
-- 
cgit v1.2.3


From 7be410621e9fbc61ff4ec715044afaa79aa54717 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 27 Apr 2015 04:51:16 -0500
Subject: SHERLOCK: Fixes for giving flower to Wiggins

---
 engines/sherlock/talk.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 29bfff8674..ed09ddde9c 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -365,8 +365,9 @@ void Talk::talkTo(const Common::String &filename) {
 			
 			// Check for a linked file
 			if (!statement._linkFile.empty() && !_scriptMoreFlag) {
+				Common::String linkFilename = statement._linkFile;
 				freeTalkVars();
-				loadTalkFile(statement._linkFile);
+				loadTalkFile(linkFilename);
 
 				// Scan for the first valid statement in the newly loaded file
 				select = -1;
@@ -427,7 +428,7 @@ void Talk::talkTo(const Common::String &filename) {
 				} else {
 					// Add the statement into the journal and talk history
 					if (_talkTo != -1 && !_talkHistory[_converseNum][select])
-						journal.record(_converseNum | 2048, select);
+						journal.record(_converseNum, select, true);
 					_talkHistory[_converseNum][select] = true;
 
 				}
-- 
cgit v1.2.3


From 139bdec3ba3811e1dec00527caaba0d5c3fedcaa Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 27 Apr 2015 18:21:41 +0200
Subject: SCI: immediate restore now uses delayed restore

instead of the old hackish method
---
 engines/sci/sci.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index d07ab435ff..668ad053cc 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -282,25 +282,13 @@ Common::Error SciEngine::run() {
 	// Check whether loading a savestate was requested
 	int directSaveSlotLoading = ConfMan.getInt("save_slot");
 	if (directSaveSlotLoading >= 0) {
-		// call GameObject::play (like normally)
-		initStackBaseWithSelector(SELECTOR(play));
-		// We set this, so that the game automatically quit right after init
-		_gamestate->variables[VAR_GLOBAL][4] = TRUE_REG;
+		_gamestate->_delayedRestoreGame = true;
+		_gamestate->_delayedRestoreGameId = directSaveSlotLoading;
 
 		// Jones only initializes its menus when restarting/restoring, thus set
 		// the gameIsRestarting flag here before initializing. Fixes bug #6536.
 		if (g_sci->getGameId() == GID_JONES)
 			_gamestate->gameIsRestarting = GAMEISRESTARTING_RESTORE;
-
-		_gamestate->_executionStackPosChanged = false;
-		run_vm(_gamestate);
-
-		// As soon as we get control again, actually restore the game
-		reg_t restoreArgv[2] = { NULL_REG, make_reg(0, directSaveSlotLoading) };	// special call (argv[0] is NULL)
-		kRestoreGame(_gamestate, 2, restoreArgv);
-
-		// this indirectly calls GameObject::init, which will setup menu, text font/color codes etc.
-		//  without this games would be pretty badly broken
 	}
 
 	// Show any special warnings for buggy scripts with severe game bugs,
-- 
cgit v1.2.3


From 02dd8cffcc9e649c1cfc5bbcb5d2517c63f6f321 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 27 Apr 2015 20:50:37 +0200
Subject: SCI: move SCI32 plane clear to gamestate_restore()

---
 engines/sci/engine/savegame.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 3d934410c3..8fca7eabca 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -134,13 +134,6 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 
 		// Reset _scriptSegMap, to be restored below
 		_scriptSegMap.clear();
-
-#ifdef ENABLE_SCI32
-		// Clear any planes/screen items currently showing so they
-		// don't show up after the load.
-		if (getSciVersion() >= SCI_VERSION_2)
-			g_sci->_gfxFrameout->clear();
-#endif
 	}
 
 	s.skip(4, VER(14), VER(18));		// OBSOLETE: Used to be _exportsAreWide
@@ -926,14 +919,17 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 
 	// reset ports is one of the first things we do, because that may free() some hunk memory
 	//  and we don't want to do that after we read in the saved game hunk memory
-	if (ser.isLoading()) {
-		// reset ports
-		if (g_sci->_gfxPorts)
-			g_sci->_gfxPorts->reset();
-		// clear screen
-		if (g_sci->_gfxScreen)
-			g_sci->_gfxScreen->clear();
-	}
+	if (g_sci->_gfxPorts)
+		g_sci->_gfxPorts->reset();
+	// clear screen
+	if (g_sci->_gfxScreen)
+		g_sci->_gfxScreen->clear();
+#ifdef ENABLE_SCI32
+	// Also clear any SCI32 planes/screen items currently showing so they
+	// don't show up after the load.
+	if (getSciVersion() >= SCI_VERSION_2)
+		g_sci->_gfxFrameout->clear();
+#endif
 
 	s->reset(true);
 	s->saveLoadWithSerializer(ser);	// FIXME: Error handling?
-- 
cgit v1.2.3


From 2fb49bd7593406bb88799f04ebc058acbb510cb2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 29 Apr 2015 00:43:06 +0300
Subject: NEWS: Mention support for Rex Nebular, as well as the fixes to SCI

---
 NEWS | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 45b0afd2d7..a7e7d20ded 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 
 1.8.0 (????-??-??)
  New Games:
+   - Added support for Rex Nebular and the Cosmic Gender Bender.
    - Added support for Sfinx.
    - Added support for Zork Nemesis: The Forbidden Lands.
    - Added support for Zork: Grand Inquisitor.
@@ -17,7 +18,12 @@ For a more comprehensive changelog of the latest experimental code, see:
      head scene (bug #6728). It may have been happening in other scenes as
      well.
 
-SCUMM:
+ SCI:
+   - Handling of music priority has been greatly improved.
+   - A lot of fixes for original game script bugs, which are too numerous to
+     mention here.
+
+ SCUMM:
    - It is now possible to play Maniac Mansion from within Day of the
      Tentacle, with a few caveats. See README for details.
 
-- 
cgit v1.2.3


From 34a7ec7cdfe6b2eae699968afa28f2f75ee3126c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 28 Apr 2015 21:35:20 -1000
Subject: SHERLOCK: Fix icon disappearing when moving to Covent Gradens on map

Co-ordinates in Sherlock are frequently multiplied by 100.
Thus, on the overland map, the values can go up to 64000, which overflows
the signed 16-bit values allowed by the standard Common::Point class
---
 engines/sherlock/map.h       |  6 +++---
 engines/sherlock/objects.cpp |  2 +-
 engines/sherlock/objects.h   | 23 +++++++++++++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 564ae73691..435ca8d5d7 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -68,7 +68,7 @@ private:
 	ImageFile *_shapes;
 	ImageFile *_iconShapes;
 	byte _sequences[MAX_HOLMES_SEQUENCE][MAX_FRAME];
-	Common::Point _lDrawnPos;
+	Point32 _lDrawnPos;
 	int _point;
 	bool _placesShown;
 	int _cursorIndex;
@@ -96,8 +96,8 @@ private:
 	void highlightIcon(const Common::Point &pt);
 public:
 	bool _active;
-	Common::Point _overPos;
-	Common::Point _bigPos;
+	Point32 _overPos;
+	Point32 _bigPos;
 	int _charPoint, _oldCharPoint;
 public:
 	Map(SherlockEngine *vm);
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index f662d00aed..d9cc38e55f 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -184,7 +184,7 @@ void Sprite::checkSprite() {
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	Common::Point pt;
+	Point32 pt;
 	Common::Rect objBounds;
 	Common::Point spritePt(_position.x / 100, _position.y / 100);
 
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 80b0b9d9f3..e2b53ec541 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -79,6 +79,25 @@ enum {
 #define FLIP_CODE (64 + 128)
 #define SOUND_CODE (34 + 128)
 
+class Point32 {
+public:
+	int x;
+	int y;
+
+	Point32() : x(0), y(0) {}
+	Point32(int x1, int y1) : x(x1), y(y1) {}
+	Point32(const Common::Point &pt) : x(pt.x), y(pt.y) {}
+
+	bool operator==(const Point32 &p) const { return x == p.x && y == p.y; }
+	bool operator!=(const Point32 &p) const { return x != p.x || y != p.y; }
+	Point32 operator+(const Point32 &delta) const { return Point32(x + delta.x, y + delta.y); }
+	Point32 operator-(const Point32 &delta) const { return Point32(x - delta.x, y - delta.y); }
+	operator Common::Point() { return Common::Point(x, y); }
+
+	void operator+=(const Point32 &delta) { x += delta.x; y += delta.y; }
+	void operator-=(const Point32 &delta) { x -= delta.x; y -= delta.y; }
+};
+
 class Sprite {
 private:
 	static SherlockEngine *_vm;
@@ -95,8 +114,8 @@ public:
 	int _allow;							// Allowed menu commands - ObjectAllow
 	int _frameNumber;					// Frame number in rame sequence to draw
 	int _sequenceNumber;				// Sequence being used
-	Common::Point _position;			// Current position
-	Common::Point _delta;				// Momvement delta
+	Point32 _position;					// Current position
+	Point32 _delta;						// Momvement delta
 	Common::Point _oldPosition;			// Old position
 	Common::Point _oldSize;				// Image's old size
 	Common::Point _goto;				// Walk destination
-- 
cgit v1.2.3


From 4b53d6a54b121e20d6bd4bfb6f1851b120817101 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 18:02:08 -1000
Subject: SHERLOCK: Fixes for darts minigame

---
 engines/sherlock/events.cpp          |  1 +
 engines/sherlock/scalpel/darts.cpp   | 76 +++++++++++++++++++++---------------
 engines/sherlock/scalpel/darts.h     |  4 +-
 engines/sherlock/scalpel/scalpel.cpp |  2 +-
 4 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index f83219d7d2..f7cbdd301e 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -214,6 +214,7 @@ Common::KeyState Events::getKey() {
  */
 void Events::clearEvents() {
 	_pendingKeys.clear();
+	_mouseButtons = 0;
 	_pressed = _released = false;
 	_rightPressed = _rightReleased = false;
 	_oldButtons = _oldRightButton = false;
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index c3f2c478d7..0f3c36420e 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -60,7 +60,7 @@ Darts::Darts(ScalpelEngine *vm) : _vm(vm) {
 	_roundNumber = 0;
 	_playerDartMode = false;
 	_roundScore = 0;
-	_oldDartButtons = 0;
+	_oldDartButtons = false;
 }
 
 /**
@@ -75,7 +75,7 @@ void Darts::playDarts() {
 
 	// Change the font
 	int oldFont = screen.fontNumber();
-	screen.setFont(4);
+	screen.setFont(2);
 
 	loadDarts();
 	initDarts();
@@ -89,6 +89,9 @@ void Darts::playDarts() {
 		showStatus(playerNumber);
 		_roundScore = 0;
 
+		if (_vm->shouldQuit())
+			return;
+
 		for (int idx = 0; idx < 3; ++idx) {
 			// Throw a single dart
 			if (_computerPlayer == 1)
@@ -165,7 +168,7 @@ void Darts::playDarts() {
 		done |= _vm->shouldQuit();
 
 		if (!done) {
-			screen._backBuffer2.blitFrom((*_dartImages)[1], Common::Point(0, 0));
+			screen._backBuffer2.blitFrom((*_dartImages)[0], Common::Point(0, 0));
 			screen._backBuffer1.blitFrom(screen._backBuffer2);
 			screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 		}
@@ -185,7 +188,9 @@ void Darts::loadDarts() {
 	Screen &screen = *_vm->_screen;
 
 	_dartImages = new ImageFile("darts.vgs");
-	screen._backBuffer1.blitFrom((*_dartImages)[1], Common::Point(0, 0));
+	screen.setPalette(_dartImages->_palette);
+
+	screen._backBuffer1.blitFrom((*_dartImages)[0], Common::Point(0, 0));
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
@@ -223,7 +228,7 @@ void Darts::closeDarts() {
 }
 
 /**
- * Show the player names
+ * Show the names of the people playing, Holmes and his opponent
  */
 void Darts::showNames(int playerNum) {
 	Screen &screen = *_vm->_screen;
@@ -243,14 +248,14 @@ void Darts::showNames(int playerNum) {
 	color = playerNum == 1 ? PLAYER_COLOR : DART_COL_FORE;
 
 	if (playerNum != 0)
-		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y + 10), PLAYER_COLOR + 3,
+		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y), PLAYER_COLOR + 3,
 			_opponent.c_str());
 	else
-		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y + 10), color,
+		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y), color,
 			_opponent.c_str());
 
 	screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X + 50, STATUS_INFO_Y + 10,
-		STATUS_INFO_Y + 81, STATUS_INFO_Y + 12), color);
+		STATUS_INFO_X + 81, STATUS_INFO_Y + 12), color);
 	screen.slamArea(STATUS_INFO_X + 50, STATUS_INFO_Y + 10, 81, 12);
 
 	// Make a copy of the back buffer to the secondary one
@@ -264,8 +269,9 @@ void Darts::showStatus(int playerNum) {
 	Screen &screen = *_vm->_screen;
 	byte color;
 
+	// Copy scoring screen from secondary back buffer. This will erase any previously displayed status/score info
 	screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 10),
-		Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, SHERLOCK_SCREEN_WIDTH, STATUS_INFO_Y + 38));
+		Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, SHERLOCK_SCREEN_WIDTH, STATUS_INFO_Y + 48));
 
 	color = (playerNum == 0) ? PLAYER_COLOR : DART_COL_FORE;
 	screen.print(Common::Point(STATUS_INFO_X + 6, STATUS_INFO_Y + 13), color, "%d", _dartScore1);
@@ -306,6 +312,9 @@ int Darts::throwDart(int dartNum, int computer) {
 		events.delay(10);
 	}
 
+	if (_vm->shouldQuit())
+		return 0;
+
 	screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(DART_INFO_X, DART_INFO_Y - 1),
 		Common::Rect(DART_INFO_X, DART_INFO_Y - 1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 	screen.slamRect(Common::Rect(DART_INFO_X, DART_INFO_Y - 1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
@@ -319,15 +328,16 @@ int Darts::throwDart(int dartNum, int computer) {
 	
 	// For human players, slight y adjustment
 	if (computer == 0)
-		height = 2;
+		height += 2;
 
-	// Copy the bars to the secondary back buffer
+	// Copy the bars to the secondary back buffer so that they remain fixed at their selected values
+	// whilst the dart is being animated at being thrown at the board
 	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(DARTBARHX - 1, DARTHORIZY - 1),
 		Common::Rect(DARTBARHX - 1, DARTHORIZY - 1, DARTBARHX + DARTBARSIZE + 3, DARTHORIZY + 10));
 	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(DARTBARVX - 1, DARTHEIGHTY - 1),
 		Common::Rect(DARTBARVX - 1, DARTHEIGHTY - 1, DARTBARVX + 11, DARTHEIGHTY + DARTBARSIZE + 3));
 
-	// Convert to relative range from -49 to 150
+	// Convert height and width to relative range of -50 to 50, where 0,0 is the exact centre of the board
 	height -= 50;
 	width -= 50;
 
@@ -347,13 +357,13 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 	Common::Rect oldDrawBounds;
 	int delta = 9;
 
-	for (int idx = 5; idx < 24; ++idx) {
+	for (int idx = 4; idx < 23; ++idx) {
 		Graphics::Surface &frame = (*_dartImages)[idx]._frame;
 
 		// Adjust draw position for animating dart
-		if (idx < 14)
+		if (idx < 13)
 			pos.y -= delta--;
-		else if (idx == 14)
+		else if (idx == 13)
 			delta = 1;
 		else
 			pos.y += delta++;
@@ -363,20 +373,19 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 		screen._backBuffer1.transBlitFrom(frame, drawPos);
 		screen.slamArea(drawPos.x, drawPos.y, frame.w, frame.h);
 
-		// Handle erasing old dart
+		// Handle erasing old dart strs
 		if (!oldDrawBounds.isEmpty())
 			screen.slamRect(oldDrawBounds);
 
 		oldDrawBounds = Common::Rect(drawPos.x, drawPos.y, drawPos.x + frame.w, drawPos.y + frame.h);
-		if (idx != 23)
-			screen._backBuffer1.blitFrom(screen._backBuffer2, drawPos, oldDrawBounds);
+		screen._backBuffer1.blitFrom(screen._backBuffer2, drawPos, oldDrawBounds);
 
 		events.wait(2);
 	}
 
 	// Draw dart in final "stuck to board" form
-	screen._backBuffer1.transBlitFrom((*_dartImages)[23], Common::Point(oldDrawBounds.left, oldDrawBounds.top));
-	screen._backBuffer2.transBlitFrom((*_dartImages)[23], Common::Point(oldDrawBounds.left, oldDrawBounds.top));
+	screen._backBuffer1.transBlitFrom((*_dartImages)[22], Common::Point(oldDrawBounds.left, oldDrawBounds.top));
+	screen._backBuffer2.transBlitFrom((*_dartImages)[22], Common::Point(oldDrawBounds.left, oldDrawBounds.top));
 	screen.slamRect(oldDrawBounds);
 }
 
@@ -388,8 +397,8 @@ void Darts::erasePowerBars() {
 
 	screen._backBuffer1.fillRect(Common::Rect(DARTBARHX, DARTHORIZY, DARTBARHX + DARTBARSIZE, DARTHORIZY + 10), 0);
 	screen._backBuffer1.fillRect(Common::Rect(DARTBARVX, DARTHEIGHTY, DARTBARVX + 10, DARTHEIGHTY + DARTBARSIZE), 0);
-	screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(DARTBARHX - 1, DARTHORIZY - 1));
-	screen._backBuffer1.transBlitFrom((*_dartImages)[4], Common::Point(DARTBARVX - 1, DARTHEIGHTY - 1));
+	screen._backBuffer1.transBlitFrom((*_dartImages)[2], Common::Point(DARTBARHX - 1, DARTHORIZY - 1));
+	screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(DARTBARVX - 1, DARTHEIGHTY - 1));
 	screen.slamArea(DARTBARHX - 1, DARTHORIZY - 1, DARTBARSIZE + 3, 11);
 	screen.slamArea(DARTBARVX - 1, DARTHEIGHTY - 1, 11, DARTBARSIZE + 3);
 }
@@ -427,11 +436,11 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 
 		if (isVertical) {
 			screen._backBuffer1.hLine(pt.x, pt.y + DARTBARSIZE - 1 - idx, pt.x + 8, color);
-			screen._backBuffer1.transBlitFrom((*_dartImages)[4], Common::Point(pt.x - 1, pt.y - 1));
+			screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(pt.x - 1, pt.y - 1));
 			screen.slamArea(pt.x, pt.y + DARTBARSIZE - 1 - idx, 8, 2);
 		} else {
 			screen._backBuffer1.vLine(pt.x + idx, pt.y, pt.y + 8, color);
-			screen._backBuffer1.transBlitFrom((*_dartImages)[3], Common::Point(pt.x - 1, pt.y - 1));
+			screen._backBuffer1.transBlitFrom((*_dartImages)[2], Common::Point(pt.x - 1, pt.y - 1));
 			screen.slamArea(pt.x + idx, pt.y, 1, 8);
 		}
 
@@ -452,18 +461,23 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 /**
  * Returns true if a mouse button or key is pressed.
  */
-int Darts::dartHit() {
+bool Darts::dartHit() {
 	Events &events = *_vm->_events;
 
-	if (events.kbHit()) {
-		Common::KeyState keyState = events.getKey();
+	// Process pending events
+	events.pollEventsAndWait();
 
+	if (events.kbHit()) {
+		// Key was pressed, so discard it and return true
 		events.clearKeyboard();
-		return keyState.keycode;
+		return true;
 	}
 	
+	_oldDartButtons = events._pressed;
 	events.setButtonState();
-	return events._pressed && !_oldDartButtons ? 1 : 0;
+
+	// Only return true if the mouse button is newly pressed
+	return (events._pressed && !_oldDartButtons) ? 1 : 0;
 }
 
 /**
@@ -477,7 +491,7 @@ int Darts::dartScore(const Common::Point &pt) {
 		return 0;
 
 	// On board, so get the score from the pixel at that position
-	int score = *(const byte *)(*_dartImages)[2]._frame.getBasePtr(pos.x, pos.y);
+	int score = *(const byte *)(*_dartImages)[1]._frame.getBasePtr(pos.x, pos.y);
 	return score;
 }
 
@@ -545,7 +559,7 @@ Common::Point Darts::getComputerDartDest(int playerNum) {
  * Returns the center position for the area of the dartboard with a given number
  */
 bool Darts::findNumberOnBoard(int aim, Common::Point &pt) {
-	ImageFrame &board = (*_dartImages)[2];
+	ImageFrame &board = (*_dartImages)[1];
 
 	// Scan board image for the special "center" pixels
 	bool done = false;
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
index a6c8cdba6d..50be572067 100644
--- a/engines/sherlock/scalpel/darts.h
+++ b/engines/sherlock/scalpel/darts.h
@@ -42,7 +42,7 @@ private:
 	Common::String _opponent;
 	bool _playerDartMode;
 	int _roundScore;
-	int _oldDartButtons;
+	bool _oldDartButtons;
 
 	void loadDarts();
 	void initDarts();
@@ -57,7 +57,7 @@ private:
 	void erasePowerBars();
 	int doPowerBar(const Common::Point &pt, byte color, int goToPower, bool isVertical);
 
-	int dartHit();
+	bool dartHit();
 	int dartScore(const Common::Point &pt);
 
 	Common::Point getComputerDartDest(int playerNum);
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 89e042d382..627a8b7b7f 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -614,7 +614,7 @@ void ScalpelEngine::startScene() {
 	_events->setCursor(ARROW);
 
 	if (_scene->_goToScene == 99) {
-		// Chess Board
+		// Darts Board minigame
 		_darts->playDarts();
 		_mapResult = _scene->_goToScene = 19;	// Go back to the bar
 	}
-- 
cgit v1.2.3


From 0ef0b4570a861d117c27b5f72af991506814820c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 18:11:35 -1000
Subject: SHERLOCK: Minor bugfix and cleanup for dartScore

---
 engines/sherlock/scalpel/darts.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 0f3c36420e..476a3071c5 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -485,13 +485,14 @@ bool Darts::dartHit() {
  */
 int Darts::dartScore(const Common::Point &pt) {
 	Common::Point pos(pt.x - 37, pt.y - 33);
+	Graphics::Surface &scoreImg = (*_dartImages)[1]._frame;
 
-	if (pos.x < 0 || pos.y < 0 || pos.x >= 147 || pt.y >= 132)
+	if (pos.x < 0 || pos.y < 0 || pos.x >= scoreImg.w || pos.y >= scoreImg.h)
 		// Not on the board
 		return 0;
 
 	// On board, so get the score from the pixel at that position
-	int score = *(const byte *)(*_dartImages)[1]._frame.getBasePtr(pos.x, pos.y);
+	int score = *(const byte *)scoreImg.getBasePtr(pos.x, pos.y);
 	return score;
 }
 
-- 
cgit v1.2.3


From e3881ccbb90cb7e650ba1e7d47e6c7dfe5133fdd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 21:12:56 -1000
Subject: SHERLOCK: Fix display of place names on overhead map

---
 engines/sherlock/map.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index b0cf246e52..a807d52f91 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -355,7 +355,8 @@ void Map::saveTopLine() {
  */
 void Map::eraseTopLine() {
 	Screen &screen = *_vm->_screen;
-	screen.blitFrom(_topLine, Common::Point(0, 0));
+	screen._backBuffer1.blitFrom(_topLine, Common::Point(0, 0));
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, _topLine.h);
 }
 
 /**
-- 
cgit v1.2.3


From ef4ec4cde3ec15d7370ef739e4fa6d863e7ccee5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 21:24:34 -1000
Subject: SHERLOCK: Fix moving crates in Tabacco Shop

---
 engines/sherlock/user_interface.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index b12094638c..b0b0d15b5c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2592,16 +2592,22 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		cAnimNum = 9;
 	else
 		cAnimNum = action._cAnimNum - 1;
-	CAnim &anim = scene._cAnim[cAnimNum];
-
+	
 	if (action._cAnimNum != 99) {
-		if (action._cAnimSpeed & REVERSE_DIRECTION) {
-			pt = anim._teleportPos;
-			dir = anim._teleportDir;
-		} else {
-			pt = anim._goto;
-			dir = anim._gotoDir;
+		CAnim &anim = scene._cAnim[cAnimNum];
+
+		if (action._cAnimNum != 99) {
+			if (action._cAnimSpeed & REVERSE_DIRECTION) {
+				pt = anim._teleportPos;
+				dir = anim._teleportDir;
+			} else {
+				pt = anim._goto;
+				dir = anim._gotoDir;
+			}
 		}
+	} else {
+		pt = Common::Point(-1, -1);
+		dir = -1;
 	}
 
 	if (action._cAnimSpeed) {
-- 
cgit v1.2.3


From f34b9a59b52460cae64d526cf9d9eccba922e376 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 21:38:06 -1000
Subject: SHERLOCK: Fix Sherlock gliding when walking vertically

---
 engines/sherlock/people.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 2eff1a0973..ed6e0607bd 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -386,7 +386,9 @@ void People::setWalking() {
 
 			// If we're on the overhead map, set the sequence so we keep moving
 			// in the same direction
-			_player._sequenceNumber = (oldDirection == -1) ? MAP_RIGHT : oldDirection;
+			if (map._active) {
+				_player._sequenceNumber = (oldDirection == -1) ? MAP_RIGHT : oldDirection;
+			}
 
 			// Set the delta x
 			_player._delta.x = (delta.x * 100) / (delta.y / speed.y);
-- 
cgit v1.2.3


From aba28c4737d8534d160ed0ada17c6c109c0e7b4c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 21:41:49 -1000
Subject: SHERLOCK: Move _slowChess to Map _frameChangeFlag

---
 engines/sherlock/map.cpp      | 1 +
 engines/sherlock/map.h        | 1 +
 engines/sherlock/objects.cpp  | 2 +-
 engines/sherlock/sherlock.cpp | 1 -
 engines/sherlock/sherlock.h   | 1 -
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index a807d52f91..5ff27a9709 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -64,6 +64,7 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_overPos = Common::Point(13000, 12600);
 	_charPoint = 0;
 	_oldCharPoint = 39;
+	_frameChangeFlag = false;
 
 	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 435ca8d5d7..e4c6655db9 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -99,6 +99,7 @@ public:
 	Point32 _overPos;
 	Point32 _bigPos;
 	int _charPoint, _oldCharPoint;
+	bool _frameChangeFlag;
 public:
 	Map(SherlockEngine *vm);
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index d9cc38e55f..04c7599b6d 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -126,7 +126,7 @@ void Sprite::adjustSprite() {
 		_position.x = CLIP((int)_position.x, LEFT_LIMIT, RIGHT_LIMIT);
 	}
 
-	if (!map._active || (_vm->_slowChess = !_vm->_slowChess))
+	if (!map._active || (map._frameChangeFlag = !map._frameChangeFlag))
 		++_frameNumber;
 
 	if ((*_sequences)[_sequenceNumber][_frameNumber] == 0) {
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 406b796fc9..a8d3d9a535 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -47,7 +47,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_ui = nullptr;
 	_useEpilogue2 = false;
 	_loadingSavedGame = false;
-	_slowChess = false;
 	_keyPadSpeed = 0;
 	_loadGameSlot = -1;
 	_canLoadSave = false;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 921559183d..3f0779421c 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -104,7 +104,6 @@ public:
 	Common::String _titleOverride;
 	bool _useEpilogue2;
 	bool _loadingSavedGame;
-	bool _slowChess;
 	int _keyPadSpeed;
 	int _loadGameSlot;
 	bool _canLoadSave;
-- 
cgit v1.2.3


From 21d17357540d3a45522684467d2259dca7cf20db Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 22:12:59 -1000
Subject: SHERLOCK: Fix script byte casting in journal loading

---
 engines/sherlock/journal.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 255662f71c..b9669d209e 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -240,7 +240,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	const char *replyP = statement._reply.c_str();
 
 	while (*replyP) {
-		byte c = *replyP++;
+		byte c = (byte)*replyP++;
 
 		// Is it a control character?
 		if (c < 128) {
@@ -289,7 +289,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 						const char *strP = replyP + 1;
 						char v;
 						do {
-							v = *strP++;						
+							v = (byte)*strP++;
 						} while (v && v < 128 && v != '.' && v != '!' && v != '?');
 
 						if (v == '?')
@@ -334,9 +334,9 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += NAMES[c];
 
 			const char *strP = replyP;
-			char v;
+			byte v;
 			do {
-				v = *strP++;
+				v = (byte)*strP++;
 			} while (v && v < 128 && v != '.' && v != '!' && v != '?');
 
 			if (v == '?')
@@ -356,7 +356,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				break;
 
 			case 134:		// Change sequence
-				replyP += (replyP[0] & 127) + replyP[2] + 2;
+				replyP += ((byte)replyP[0] & 127) + (byte)replyP[2] + 2;
 				break;
 
 			case 135:       // Walk to co-ords
@@ -380,7 +380,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			case 152:		// Set object
 			case 155:		// Info line
 			case 158:		// Delete item from inventory
-				replyP += (*replyP & 127) + 1;
+				replyP += ((byte)*replyP & 127) + 1;
 				break;
 
 			case 149:		// Goto scene
-- 
cgit v1.2.3


From 6d32c570d0f4ac956059a450581d46ce0d75ad97 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 22:56:07 -1000
Subject: SHERLOCK: Fix journal loading change sequence opcode

---
 engines/sherlock/journal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index b9669d209e..c30b4683d9 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -356,7 +356,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				break;
 
 			case 134:		// Change sequence
-				replyP += ((byte)replyP[0] & 127) + (byte)replyP[2] + 2;
+				replyP += ((byte)replyP[0] & 127) + (byte)replyP[1] + 2;
 				break;
 
 			case 135:       // Walk to co-ords
-- 
cgit v1.2.3


From 7ca3b75805eb404ad7f5ae01ba3000593e8eaf36 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Apr 2015 23:17:51 -1000
Subject: SHERLOCK: Fix clicking in script zones starting the script

---
 engines/sherlock/objects.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 04c7599b6d..f353844774 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -924,6 +924,8 @@ void Object::setFlagsAndToggles() {
 		if (_use[useIdx]._cAnimSpeed) {
 			if (_use[useIdx]._cAnimNum == 0)
 				// 0 is really a 10
+				scene.startCAnim(9, _use[useIdx]._cAnimSpeed);
+			else
 				scene.startCAnim(_use[useIdx]._cAnimNum - 1, _use[useIdx]._cAnimSpeed);
 		}
 
-- 
cgit v1.2.3


From 56f43eff10a038a67954cd4ccc6990bb70fa6740 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 10:24:18 -1000
Subject: SHERLOCK: Fix loading scenes with initially hidden objects

---
 engines/sherlock/scene.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index f6fe8c8671..1d00e9d23d 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -414,6 +414,9 @@ bool Scene::loadScene(const Common::String &filename) {
 			if (_bgShapes[idx]._type != HIDDEN && (_bgShapes[idx]._flags & 0x40) &&
 					_bgShapes[idx]._type != INVALID)
 				_bgShapes[idx].toggleHidden();
+			if (_bgShapes[idx]._type == HIDE_SHAPE)
+				// Hiding isn't needed, since objects aren't drawn yet
+				_bgShapes[idx]._type = HIDDEN;
 		}
 	}
 
-- 
cgit v1.2.3


From 00fd812028c6aaa9b2ec05963a66a23dabbd33ba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 11:23:31 -1000
Subject: SHERLOCK: Properly restrict scene drawing to scene area

---
 engines/sherlock/graphics.cpp |  8 -------
 engines/sherlock/graphics.h   |  2 --
 engines/sherlock/map.cpp      |  1 -
 engines/sherlock/scene.cpp    | 53 ++++++++++++++++++++++---------------------
 engines/sherlock/screen.cpp   | 26 ++++++++++++++++++---
 engines/sherlock/screen.h     |  1 +
 6 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 6e986c839b..6fd046e458 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -164,14 +164,6 @@ void Surface::fillRect(const Common::Rect &r, byte color) {
 	addDirtyRect(r);
 }
 
-/**
- * Return a sub-area of the surface as a new surface object. The surfaces
- * are shared in common, so changes in the sub-surface affects the original.
- */
-Surface Surface::getSubArea(const Common::Rect &r) {
-	return Surface(*this, r);
-}
-
 /**
  * Clips the given source bounds so the passed destBounds will be entirely on-screen
  */
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 85f3ba8c40..80b692130c 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -55,8 +55,6 @@ public:
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
 	void fillRect(const Common::Rect &r, byte color);
-
-	Surface getSubArea(const Common::Rect &r);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 5ff27a9709..f572e3771a 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -442,7 +442,6 @@ void Map::updateMap(bool flushScreen) {
  */
 void Map::walkTheStreets() {
 	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
 	bool reversePath = false;
 	Common::Array<Common::Point> tempPath;
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 1d00e9d23d..50e62b7ba5 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -716,10 +716,11 @@ int Scene::toggleObject(const Common::String &name) {
 void Scene::updateBackground() {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
-	Surface surface = screen._backBuffer1.getSubArea(
-		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	Sprite &player = people[AL];
 
+	// Restrict drawing window
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+
 	// Update Holmes if he's turned on
 	if (people._holmesOn)
 		player.adjustSprite();
@@ -731,26 +732,26 @@ void Scene::updateBackground() {
 	// Draw all active shapes which are behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == BEHIND)
-			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == BEHIND)
-			surface.transBlitFrom(*_canimShapes[idx]._imageFrame,
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame,
 				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
 	}
 
 	// Draw all active shapes which are normal and behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == NORMAL_BEHIND)
-			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all canimations which are normal and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == NORMAL_BEHIND)
-			surface.transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
 				_canimShapes[idx]._flags & 2);
 	}
 
@@ -760,7 +761,7 @@ void Scene::updateBackground() {
 			player._sequenceNumber == WALK_UPLEFT || player._sequenceNumber == STOP_UPLEFT ||
 			player._sequenceNumber == WALK_DOWNRIGHT || player._sequenceNumber == STOP_DOWNRIGHT;
 
-		surface.transBlitFrom(*player._imageFrame, Common::Point(player._position.x / 100, 
+		screen._backBuffer->transBlitFrom(*player._imageFrame, Common::Point(player._position.x / 100, 
 			player._position.y / 100 - player.frameHeight()), flipped);
 	}
 
@@ -768,14 +769,14 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == NORMAL_FORWARD)
-			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the player
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_canimShapes[idx]._misc == NORMAL_FORWARD)
-			surface.transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
 				_canimShapes[idx]._flags & 2);
 	}
 
@@ -787,14 +788,14 @@ void Scene::updateBackground() {
 
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == FORWARD)
-			surface.transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
 	}
 
 	// Draw all static and active canimations that are forward
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 			_canimShapes[idx]._misc == FORWARD)
-			surface.transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
 				_canimShapes[idx]._flags & 2);
 	}
 }
@@ -1079,8 +1080,8 @@ void Scene::doBgAnim() {
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
-	Surface surface = screen._backBuffer1.getSubArea(Common::Rect(0, 0,
-		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	int cursorId = events.getCursor();
 	Common::Point mousePos = events.mousePos();
 
@@ -1150,7 +1151,7 @@ void Scene::doBgAnim() {
 		if (people[AL]._type == CHARACTER)
 			screen.restoreBackground(bounds);
 		else if (people[AL]._type == REMOVE)
-			screen._backBuffer1.blitFrom(screen._backBuffer2, pt, bounds);
+			screen._backBuffer->blitFrom(screen._backBuffer2, pt, bounds);
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
@@ -1169,7 +1170,7 @@ void Scene::doBgAnim() {
 			Object &o = _bgShapes[idx];
 			if (o._type == NO_SHAPE && ((o._flags & 1) == 0)) {
 				// Restore screen area
-				screen._backBuffer1.blitFrom(screen._backBuffer2, o._position,
+				screen._backBuffer->blitFrom(screen._backBuffer2, o._position,
 					Common::Rect(o._position.x, o._position.y,
 					o._position.x + o._noShapeSize.x, o._position.y + o._noShapeSize.y));
 
@@ -1218,14 +1219,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 	
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1233,14 +1234,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Draw all canimations which are NORMAL and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1253,7 +1254,7 @@ void Scene::doBgAnim() {
 		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT ||
 			people[AL]._sequenceNumber == WALK_UPLEFT || people[AL]._sequenceNumber == STOP_UPLEFT ||
 			people[AL]._sequenceNumber == WALK_DOWNRIGHT || people[AL]._sequenceNumber == STOP_DOWNRIGHT;
-		screen._backBuffer1.transBlitFrom(*people[AL]._imageFrame,
+		screen._backBuffer->transBlitFrom(*people[AL]._imageFrame,
 			Common::Point(tempX, people[AL]._position.y / 100 - people[AL]._imageFrame->_frame.h), flipped);
 	}
 
@@ -1261,14 +1262,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1276,19 +1277,19 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Draw any active portrait
 	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-		screen._backBuffer1.transBlitFrom(*people._portrait._imageFrame,
+		screen._backBuffer->transBlitFrom(*people._portrait._imageFrame,
 			people._portrait._position, people._portrait._flags & 2);
 
 	// Draw all static and active canimations that are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
 
@@ -1296,7 +1297,7 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == NO_SHAPE && (o._flags & 1) == 0)
-			screen._backBuffer1.transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
 
 	// Bring the newly built picture to the screen
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 3c9a10e4a1..66590c3ada 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -39,6 +39,10 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
 	setFont(1);
+
+	// Set dummy surface used for restricted scene drawing
+	_sceneSurface.format = Graphics::PixelFormat::createFormatCLUT8();
+	_sceneSurface.pitch = SHERLOCK_SCREEN_WIDTH;
 }
 
 Screen::~Screen() {
@@ -469,15 +473,31 @@ void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->hLine(r.left + 1, r.bottom - 2, r.right - 1, BUTTON_BOTTOM);
 }
 
+/**
+ * Sets the active back buffer pointer to a restricted sub-area of the first back buffer
+ */
 void Screen::setDisplayBounds(const Common::Rect &r) {
-	// TODO: See if needed
+	assert(r.left == 0 && r.top == 0);
+	_sceneSurface.setPixels(_backBuffer1.getPixels());
+	_sceneSurface.w = r.width();
+	_sceneSurface.h = r.height();
+
+	_backBuffer = &_sceneSurface;
 }
+
+/**
+ * Resets the active buffer pointer to point back to the full first back buffer
+ */
 void Screen::resetDisplayBounds() {
-	setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	_backBuffer = &_backBuffer1;
 }
 
+/**
+ * Return the size of the current display window
+ */
 Common::Rect Screen::getDisplayBounds() {
-	return Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	return (_backBuffer == &_sceneSurface) ? Common::Rect(0, 0, _sceneSurface.w, _sceneSurface.h) :
+		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
 /**
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index a8bdc53b5a..bbfba1c575 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -65,6 +65,7 @@ private:
 	uint32 _transitionSeed;
 	ImageFile *_font;
 	int _fontHeight;
+	Surface _sceneSurface;
 
 	void mergeDirtyRects();
 
-- 
cgit v1.2.3


From 50da2a2dd8ff6be1f634bd6d9f2b8d54bf059b9d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 12:21:11 -1000
Subject: SHERLOCK: Fix display of item descriptions

---
 engines/sherlock/scene.cpp | 4 ++++
 engines/sherlock/talk.cpp  | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 50e62b7ba5..487688f3a5 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -798,6 +798,8 @@ void Scene::updateBackground() {
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
 				_canimShapes[idx]._flags & 2);
 	}
+
+	screen.resetDisplayBounds();
 }
 
 Exit *Scene::checkForExit(const Common::Rect &r) {
@@ -1082,6 +1084,7 @@ void Scene::doBgAnim() {
 	UserInterface &ui = *_vm->_ui;
 
 	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+
 	int cursorId = events.getCursor();
 	Common::Point mousePos = events.mousePos();
 
@@ -1384,6 +1387,7 @@ void Scene::doBgAnim() {
 
 	events.wait(1);
 	_doBgAnimDone = true;
+	screen.resetDisplayBounds();
 
 	// Check if the method was called for calling a portrait, and a talk was
 	// interrupting it. This talk file would not have been executed at the time, 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ed09ddde9c..b4dde2e6b0 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -455,7 +455,11 @@ void Talk::talkTo(const Common::String &filename) {
 	events._pressed = events._released = events._oldButtons = 0;
 	events.clearKeyboard();
 
-	screen.setDisplayBounds(savedBounds);
+	if (savedBounds.bottom == SHERLOCK_SCREEN_HEIGHT)
+		screen.resetDisplayBounds();
+	else
+		screen.setDisplayBounds(savedBounds);
+
 	_talkToAbort = abortFlag;
 
 	// If a script was added to the script stack, restore state so that the
-- 
cgit v1.2.3


From 329f6d744cf1aa002f013be0e5b0af62873598e2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 12:51:46 -1000
Subject: SHERLOCK: Fix DISPLAY_INFO_LINE talk opcode

---
 engines/sherlock/talk.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b4dde2e6b0..7686df2944 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1468,6 +1468,7 @@ void Talk::doScript(const Common::String &script) {
 				str += str[0];
 
 				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, tempString.c_str());
+				ui._menuCounter = 30;
 				break;
 
 			case CLEAR_INFO_LINE:
-- 
cgit v1.2.3


From d57cb94752c8c833c06bc1ef531f53587ab1df55 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 15:01:15 -1000
Subject: SHERLOCK: Fix picking up pail at docks

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 7686df2944..5a36303b21 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1403,7 +1403,7 @@ void Talk::doScript(const Common::String &script) {
 				++str;
 				for (int idx = 0; idx < (str[0] & 127); ++idx)
 					tempString += str[idx + 1];
-				str += str[0];
+				str += str[0] & 127;
 
 				// Set comparison state according to if we want to hide or unhide
 				bool state = ((byte)str[0] >= 128);
-- 
cgit v1.2.3


From c4008703d1c20afac1ce60a37fc85b9cd2bba0f8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 15:04:08 -1000
Subject: SHERLOCK: More descriptive comment for talkTo

---
 engines/sherlock/talk.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 5a36303b21..de99fe0e88 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -149,9 +149,12 @@ void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, i
 }
 
 /**
- * Called when either an NPC initiates a conversation or for inventory item
- * descriptions. It opens up a description window similar to how 'talk' does,
- * but shows a 'reply' directly instead of waiting for a statement option.
+ * Called whenever a conversation or item script needs to be run. For standard conversations,
+ * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly 
+ * instead of waiting for a statement option. 
+ * @remarks		It seems that at some point, all item scripts were set up to use this as well.
+ *	In their case, the conversation display is simply suppressed, and control is passed on to 
+ *	doScript to implement whatever action is required.
  */
 void Talk::talkTo(const Common::String &filename) {
 	Events &events = *_vm->_events;
-- 
cgit v1.2.3


From 862d63c2a6c8b55bd472809508ba119ca41397dd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 15:20:48 -1000
Subject: SHERLOCK: Partial fix for Blackwell capture cutscene

---
 engines/sherlock/animation.cpp       | 4 ++--
 engines/sherlock/scalpel/scalpel.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 4674151ec7..810c0ecc34 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -90,7 +90,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 	else if (_vm->_useEpilogue2)
 		stream = _vm->_res->load(vdxName, "epilog2.lib");
 	else
-		stream = _vm->_res->load(vdxName, "epilogoue.lib");
+		stream = _vm->_res->load(vdxName, "epilogue.lib");
 
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
@@ -127,7 +127,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 			}
 
 			// Draw the sprite
-			screen.transBlitFrom(images[imageFrame]._frame, pt);
+			screen.transBlitFrom(images[imageFrame], pt);
 		} else {
 			// No sprite to show for this animation frame
 			if (fade == 255) {
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 627a8b7b7f..488a4de772 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -505,7 +505,7 @@ void ScalpelEngine::startScene() {
 			_res->addToCache("final2.vda", "epilogue.lib");
 			_res->addToCache("final2.vdx", "epilogue.lib");
 			_animation->playPrologue("final1", 1, 3, true, 4);
-			_animation->playPrologue("final22", 1, 0, false, 4);
+			_animation->playPrologue("final2", 1, 0, false, 4);
 			break;
 
 		case 52:
-- 
cgit v1.2.3


From e25fbfa8e4a2e6ca2ef187630479151107f8ff19 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 15:38:13 -1000
Subject: SHERLOCK: Fix initial entry conversation with coroner at morgue

---
 engines/sherlock/objects.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index f353844774..3dc50e61b1 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -200,12 +200,12 @@ void Sprite::checkSprite() {
 
 			if (obj._type == NO_SHAPE) {
 				objBounds = Common::Rect(obj._position.x, obj._position.y,
-					obj._position.x + obj._noShapeSize.x, obj._position.y + obj._noShapeSize.y);
+					obj._position.x + obj._noShapeSize.x + 1, obj._position.y + obj._noShapeSize.y + 1);
 			} else {
 				int xp = obj._position.x + obj._imageFrame->_offset.x;
 				int yp = obj._position.y + obj._imageFrame->_offset.y;
 				objBounds = Common::Rect(xp, yp,
-					xp + obj._imageFrame->_frame.w, yp + obj._imageFrame->_frame.h);
+					xp + obj._imageFrame->_frame.w + 1, yp + obj._imageFrame->_frame.h + 1);
 			}
 
 			if (objBounds.contains(pt)) {
-- 
cgit v1.2.3


From 8e4ccdbd2c5ea543d648ef46300837c3c43ee705 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 15:46:30 -1000
Subject: SHERLOCK: Fix trying to move items that can't be

---
 engines/sherlock/user_interface.cpp | 59 +++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index b0b0d15b5c..30d79aa1c9 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2585,32 +2585,42 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 	if (objNum >= 1000)
 		// Ignore actions done on characters
 		return;
-	Object &obj = scene._bgShapes[objNum];
 
-	if (action._cAnimNum == 0)
-		// Really a 10
-		cAnimNum = 9;
-	else
-		cAnimNum = action._cAnimNum - 1;
-	
-	if (action._cAnimNum != 99) {
-		CAnim &anim = scene._cAnim[cAnimNum];
+	if (!action._cAnimSpeed) {
+		// Invalid action, to print error message
+		_infoFlag = true;
+		clearInfo();
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[action._cAnimNum]);
+		_infoFlag = true;
+
+		// Set how long to show the message
+		_menuCounter = 30;
+	} else {
+		Object &obj = scene._bgShapes[objNum];
 
+		if (action._cAnimNum == 0)
+			// Really a 10
+			cAnimNum = 9;
+		else
+			cAnimNum = action._cAnimNum - 1;
+	
 		if (action._cAnimNum != 99) {
-			if (action._cAnimSpeed & REVERSE_DIRECTION) {
-				pt = anim._teleportPos;
-				dir = anim._teleportDir;
-			} else {
-				pt = anim._goto;
-				dir = anim._gotoDir;
+			CAnim &anim = scene._cAnim[cAnimNum];
+
+			if (action._cAnimNum != 99) {
+				if (action._cAnimSpeed & REVERSE_DIRECTION) {
+					pt = anim._teleportPos;
+					dir = anim._teleportDir;
+				} else {
+					pt = anim._goto;
+					dir = anim._gotoDir;
+				}
 			}
+		} else {
+			pt = Common::Point(-1, -1);
+			dir = -1;
 		}
-	} else {
-		pt = Common::Point(-1, -1);
-		dir = -1;
-	}
 
-	if (action._cAnimSpeed) {
 		// Has a value, so do action
 		// Show wait cursor whilst walking to object and doing action
 		events.setCursor(WAIT);
@@ -2686,15 +2696,6 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 				_menuCounter = 30;	
 			}
 		}
-	} else {
-		// Invalid action, to print error message
-		_infoFlag = true;
-		clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[action._cAnimNum]);
-		_infoFlag = true;
-
-		// Set how long to show the message
-		_menuCounter = 30;
 	}
 
 	// Reset cursor back to arrow
-- 
cgit v1.2.3


From e37cf9c4d0d33c0b0ba9eb7bb842b49205baac4b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 16:00:08 -1000
Subject: SHERLOCK: Fix talking to Gregson at morgue

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index de99fe0e88..3320beb30c 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -524,7 +524,7 @@ void Talk::talk(int objNum) {
 				obj._lookFacing);
 		events.setCursor(ARROW);
 
-		if (_talkToAbort)
+		if (!_talkToAbort)
 			talkTo(obj._name);
 	} else {
 		// Holmes will be speaking first
-- 
cgit v1.2.3


From e332565119b7efe85ba91fd601f994997912481f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 16:59:36 -1000
Subject: SHERLOCK: Fix Gregson disappearing at Morgue

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 3320beb30c..eb5c763106 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1406,10 +1406,10 @@ void Talk::doScript(const Common::String &script) {
 				++str;
 				for (int idx = 0; idx < (str[0] & 127); ++idx)
 					tempString += str[idx + 1];
-				str += str[0] & 127;
 
 				// Set comparison state according to if we want to hide or unhide
 				bool state = ((byte)str[0] >= 128);
+				str += str[0] & 127;
 
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
 					Object &obj = scene._bgShapes[idx];
-- 
cgit v1.2.3


From 2bc1d2badc79ba2d49ebc225731d602938f7d49e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 17:55:58 -1000
Subject: SHERLOCK: Fix showing corpse portraits in Morgue

---
 engines/sherlock/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 487688f3a5..3cc84936b0 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1271,7 +1271,7 @@ void Scene::doBgAnim() {
 	// Draw all static and active canimations that are NORMAL and are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
-		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_BEHIND) {
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD) {
 			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 		}
 	}
-- 
cgit v1.2.3


From d811e4a9ff48426b01f199db8f24b00e679592d5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 20:44:19 -1000
Subject: SHERLOCK: Fix color of talk response text

---
 engines/sherlock/talk.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index eb5c763106..2c59876e84 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1573,9 +1573,9 @@ void Talk::doScript(const Common::String &script) {
 			// If the speaker indicates a description file, print it in yellow
 			if (_speaker != -1) {
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), INV_FOREGROUND, lineStr.c_str());
+					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, lineStr.c_str());
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), INV_FOREGROUND, lineStr.c_str());
+					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, lineStr.c_str());
 					openTalkWindow = true;
 				}
 			} else {
-- 
cgit v1.2.3


From 821040deaaa4dabf160795e96cb223ba192a87d3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 21:00:48 -1000
Subject: SHERLOCK: Fix blank talk windows sometimes remaining open

---
 engines/sherlock/talk.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 2c59876e84..ed8092c03e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1159,7 +1159,7 @@ void Talk::doScript(const Common::String &script) {
 
 			case PAUSE:
 				// Pause
-				charCount = *++str;
+				charCount = (byte)*++str;
 				wait = pauseFlag = true;
 				break;
 
@@ -1598,8 +1598,8 @@ void Talk::doScript(const Common::String &script) {
 			++line;
 
 			// Certain different conditions require a wait
-			if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
-					(line == 5 && str[0] != PAUSE && _speaker != -1) ||
+			if ((line == 4 && (byte)str[0] != SFX_COMMAND && (byte)str[0] != PAUSE && _speaker != -1) ||
+					(line == 5 && (byte)str[0] != PAUSE && _speaker != -1) ||
 					endStr) {
 				wait = 1;
 			}
-- 
cgit v1.2.3


From 56f8d54e5133ecdc6e6cceda27202bf6ba7e26fd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 21:07:33 -1000
Subject: SHERLOCK: Use script opcode constants in journal loading

---
 engines/sherlock/journal.cpp | 40 ++++++++++++++++++++--------------------
 engines/sherlock/talk.cpp    | 41 +----------------------------------------
 engines/sherlock/talk.h      | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index c30b4683d9..be76756bdd 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -346,48 +346,48 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 		} else {
 			// Control code, so move past it and any parameters
 			switch (c) {
-			case 129:		// Run canim
-			case 130:		// Assign side
-			case 131:		// Pause with control
-			case 136:		// Pause without control
-			case 157:		// Walk to canimation
+			case RUN_CANIMATION:
+			case ASSIGN_PORTRAIT_LOCATION:
+			case PAUSE:
+			case PAUSE_WITHOUT_CONTROL:
+			case WALK_TO_CANIMATION:
 				// These commands have a single parameter
 				++replyP;
 				break;
 
-			case 134:		// Change sequence
+			case ADJUST_OBJ_SEQUENCE:
 				replyP += ((byte)replyP[0] & 127) + (byte)replyP[1] + 2;
 				break;
 
-			case 135:       // Walk to co-ords
-			case 154:		// Move mouse
+			case WALK_TO_COORDS:
+			case MOVE_MOUSE:
 				replyP += 4; 
 				break;
 
-			case 139:		// Set flag
-			case 143:		// If statement 
+			case SET_FLAG:
+			case IF_STATEMENT:
 				replyP += 2;
 				break;
 
-			case 140:		// Play voice file
-			case 150:		// Play prologue
-			case 153:		// Call talk file 
+			case SFX_COMMAND:
+			case PLAY_PROLOGUE:
+			case CALL_TALK_FILE:
 				replyP += 8;
 				break;
 
-			case 141:		// Toggle object
-			case 151:		// Put item in inventory
-			case 152:		// Set object
-			case 155:		// Info line
-			case 158:		// Delete item from inventory
+			case TOGGLE_OBJECT:
+			case ADD_ITEM_TO_INVENTORY:
+			case SET_OBJECT:
+			case DISPLAY_INFO_LINE:
+			case REMOVE_ITEM_FROM_INVENTORY:
 				replyP += ((byte)*replyP & 127) + 1;
 				break;
 
-			case 149:		// Goto scene
+			case GOTO_SCENE:
 				replyP += 5;
 				break;
 
-			case 161:		// End of line
+			case CARRIAGE_RETURN:
 				journalString += "\n";
 				break;
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ed8092c03e..fb16995d2b 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -26,45 +26,6 @@
 
 namespace Sherlock {
 
-enum {
-	SWITCH_SPEAKER				= 128,
-	RUN_CANIMATION				= 129,
-	ASSIGN_PORTRAIT_LOCATION	= 130,
-	PAUSE						= 131,
-	REMOVE_PORTRAIT				= 132,
-	CLEAR_WINDOW				= 133,
-	ADJUST_OBJ_SEQUENCE			= 134,
-	WALK_TO_COORDS				= 135,
-	PAUSE_WITHOUT_CONTROL		= 136,
-	BANISH_WINDOW				= 137,
-	SUMMON_WINDOW				= 138,
-	SET_FLAG					= 139,
-	SFX_COMMAND					= 140,
-	TOGGLE_OBJECT				= 141,
-	STEALTH_MODE_ACTIVE			= 142,
-	IF_STATEMENT				= 143,
-	ELSE_STATEMENT				= 144,
-	END_IF_STATEMENT			= 145,
-	STEALTH_MODE_DEACTIVATE		= 146,
-	TURN_HOLMES_OFF				= 147,
-	TURN_HOLMES_ON				= 148,
-	GOTO_SCENE					= 149,
-	PLAY_PROLOGUE				= 150,
-	ADD_ITEM_TO_INVENTORY		= 151,
-	SET_OBJECT					= 152,
-	CALL_TALK_FILE				= 153,
-	MOVE_MOUSE					= 154,
-	DISPLAY_INFO_LINE			= 155,
-	CLEAR_INFO_LINE				= 156,
-	WALK_TO_CANIMATION			= 157,
-	REMOVE_ITEM_FROM_INVENTORY	= 158,
-	ENABLE_END_KEY				= 159,
-	DISABLE_END_KEY				= 160,
-	COMMAND_161					= 161
-};
-
-/*----------------------------------------------------------------*/
-
 /**
  * Load the data for a single statement within a talk file
  */
@@ -1621,7 +1582,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-		if ((openTalkWindow && wait) || (openTalkWindow && (byte)str[0] >= 128 && (byte)str[0] != COMMAND_161)) {
+		if ((openTalkWindow && wait) || (openTalkWindow && (byte)str[0] >= 128 && (byte)str[0] != CARRIAGE_RETURN)) {
 			if (!ui._windowStyle) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 620a986454..d545d31351 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -35,6 +35,43 @@ namespace Sherlock {
 #define MAX_TALK_SEQUENCES 11
 #define MAX_TALK_FILES 500
 
+enum {
+	SWITCH_SPEAKER				= 128,
+	RUN_CANIMATION				= 129,
+	ASSIGN_PORTRAIT_LOCATION	= 130,
+	PAUSE						= 131,
+	REMOVE_PORTRAIT				= 132,
+	CLEAR_WINDOW				= 133,
+	ADJUST_OBJ_SEQUENCE			= 134,
+	WALK_TO_COORDS				= 135,
+	PAUSE_WITHOUT_CONTROL		= 136,
+	BANISH_WINDOW				= 137,
+	SUMMON_WINDOW				= 138,
+	SET_FLAG					= 139,
+	SFX_COMMAND					= 140,
+	TOGGLE_OBJECT				= 141,
+	STEALTH_MODE_ACTIVE			= 142,
+	IF_STATEMENT				= 143,
+	ELSE_STATEMENT				= 144,
+	END_IF_STATEMENT			= 145,
+	STEALTH_MODE_DEACTIVATE		= 146,
+	TURN_HOLMES_OFF				= 147,
+	TURN_HOLMES_ON				= 148,
+	GOTO_SCENE					= 149,
+	PLAY_PROLOGUE				= 150,
+	ADD_ITEM_TO_INVENTORY		= 151,
+	SET_OBJECT					= 152,
+	CALL_TALK_FILE				= 153,
+	MOVE_MOUSE					= 154,
+	DISPLAY_INFO_LINE			= 155,
+	CLEAR_INFO_LINE				= 156,
+	WALK_TO_CANIMATION			= 157,
+	REMOVE_ITEM_FROM_INVENTORY	= 158,
+	ENABLE_END_KEY				= 159,
+	DISABLE_END_KEY				= 160,
+	CARRIAGE_RETURN				= 161
+};
+
 struct SequenceEntry {
 	int _objNum;
 	Common::Array<byte> _sequences;
-- 
cgit v1.2.3


From 9117083e0ab8f329a93bcae647d9da78ec212738 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 21:21:59 -1000
Subject: SHERLOCK: Fix crash in Equestrian shop

---
 engines/sherlock/user_interface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 30d79aa1c9..e7e7981966 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -414,8 +414,8 @@ void UserInterface::handleInput() {
 					_infoFlag = true;
 					clearInfo();
 
-					if (_help != -1 && (scene._bgShapes[_bgFound]._description[0] != 32 &&
-							scene._bgShapes[_bgFound]._description[0]))
+					if (_help != -1 && !scene._bgShapes[_bgFound]._description.empty()
+							&& scene._bgShapes[_bgFound]._description[0] != ' ')
 						screen.print(Common::Point(0, INFO_LINE + 1),
 						INFO_FOREGROUND, scene._bgShapes[_bgFound]._description.c_str());
 
-- 
cgit v1.2.3


From d32eb9a70f5c44b16d1262f5d0d62a09d8e893d3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 21:31:18 -1000
Subject: SHERLOCK: Simplify all the castings of char to byte in Talk and
 Journal

---
 engines/sherlock/journal.cpp | 18 +++++-----
 engines/sherlock/talk.cpp    | 78 +++++++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index be76756bdd..67cff15218 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -237,10 +237,10 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	bool ctrlSpace = false;
 	bool commentFlag = false;
 	bool commentJustPrinted = false;
-	const char *replyP = statement._reply.c_str();
+	const byte *replyP = (const byte *)statement._reply.c_str();
 
 	while (*replyP) {
-		byte c = (byte)*replyP++;
+		byte c = *replyP++;
 
 		// Is it a control character?
 		if (c < 128) {
@@ -286,10 +286,10 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 						else
 							journalString += NAMES[talk._talkTo];
 
-						const char *strP = replyP + 1;
+						const byte *strP = replyP + 1;
 						char v;
 						do {
-							v = (byte)*strP++;
+							v = *strP++;
 						} while (v && v < 128 && v != '.' && v != '!' && v != '?');
 
 						if (v == '?')
@@ -306,7 +306,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += c;
 				do {
 					journalString += *replyP++;
-				} while (*replyP && (byte)*replyP < 128 && *replyP != '{' && *replyP != '}');
+				} while (*replyP && *replyP < 128 && *replyP != '{' && *replyP != '}');
 
 				commentJustPrinted = false;
 			}
@@ -333,10 +333,10 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			else
 				journalString += NAMES[c];
 
-			const char *strP = replyP;
+			const byte *strP = replyP;
 			byte v;
 			do {
-				v = (byte)*strP++;
+				v = *strP++;
 			} while (v && v < 128 && v != '.' && v != '!' && v != '?');
 
 			if (v == '?')
@@ -356,7 +356,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 				break;
 
 			case ADJUST_OBJ_SEQUENCE:
-				replyP += ((byte)replyP[0] & 127) + (byte)replyP[1] + 2;
+				replyP += (replyP[0] & 127) + replyP[1] + 2;
 				break;
 
 			case WALK_TO_COORDS:
@@ -380,7 +380,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			case SET_OBJECT:
 			case DISPLAY_INFO_LINE:
 			case REMOVE_ITEM_FROM_INVENTORY:
-				replyP += ((byte)*replyP & 127) + 1;
+				replyP += (*replyP & 127) + 1;
 				break;
 
 			case GOTO_SCENE:
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index fb16995d2b..9e75f4ecc8 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -993,14 +993,16 @@ void Talk::doScript(const Common::String &script) {
 
 	_saveSeqNum = 0;
 
-	const char *str = script.c_str();
+	const byte *scriptStart = (const byte *)script.c_str();
+	const byte *str = scriptStart;
+
 	if (_scriptMoreFlag) {
 		_scriptMoreFlag = 0;
-		str = script.c_str() + _scriptSaveIndex;
+		str = scriptStart + _scriptSaveIndex;
 	}
 
 	// Check if the script begins with a Stealh Mode Active command
-	if ((byte)str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
+	if (str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
 		_talkStealth = 2;
 		_speaker |= 128;
 	} else {
@@ -1008,7 +1010,7 @@ void Talk::doScript(const Common::String &script) {
 		ui.clearWindow();
 
 		// Need to switch speakers?
-		if ((byte)str[0] == SWITCH_SPEAKER) {
+		if (str[0] == SWITCH_SPEAKER) {
 			_speaker = str[1] - 1;
 			str += 2;
 			pullSequence();
@@ -1019,7 +1021,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Assign portrait location?
-		if ((byte)str[0] == ASSIGN_PORTRAIT_LOCATION) {
+		if (str[0] == ASSIGN_PORTRAIT_LOCATION) {
 			switch (str[1] & 15) {
 			case 1:
 				people._portraitSide = 20;
@@ -1041,7 +1043,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Remove portrait?
-		if ((byte)str[0] == REMOVE_PORTRAIT) {
+		if (str[0] == REMOVE_PORTRAIT) {
 			_speaker = 255;
 		} else {
 			// Nope, so set the first speaker
@@ -1053,7 +1055,7 @@ void Talk::doScript(const Common::String &script) {
 		Common::String tempString;
 		wait = 0;
 
-		byte c = (byte)str[0];
+		byte c = str[0];
 		if (!c) {
 			endStr = true;
 		} else if (c == '{') {
@@ -1066,7 +1068,7 @@ void Talk::doScript(const Common::String &script) {
 			case SWITCH_SPEAKER:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - script.c_str();
+				_scriptCurrentIndex = str - scriptStart;
 
 				if (!(_speaker & 128))
 					people.clearTalking();
@@ -1088,13 +1090,13 @@ void Talk::doScript(const Common::String &script) {
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = (str + 1) - script.c_str();
-				scene.startCAnim(((byte)str[0] - 1) & 127, ((byte)str[0] & 128) ? -1 : 1);
+				_scriptCurrentIndex = (str + 1) - scriptStart;
+				scene.startCAnim((str[0] - 1) & 127, (str[0] & 128) ? -1 : 1);
 				if (_talkToAbort)
 					return;
 
 				// Check if next character is changing side or changing portrait
-				if (charCount && ((byte)str[1] == SWITCH_SPEAKER || (byte)str[1] == ASSIGN_PORTRAIT_LOCATION))
+				if (charCount && (str[1] == SWITCH_SPEAKER || str[1] == ASSIGN_PORTRAIT_LOCATION))
 					wait = 1;
 				break;
 
@@ -1120,14 +1122,14 @@ void Talk::doScript(const Common::String &script) {
 
 			case PAUSE:
 				// Pause
-				charCount = (byte)*++str;
+				charCount = *++str;
 				wait = pauseFlag = true;
 				break;
 
 			case REMOVE_PORTRAIT:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - script.c_str();
+				_scriptCurrentIndex = str - scriptStart;
 
 				if (_speaker >= 0 && _speaker < 128)
 					people.clearTalking();
@@ -1186,10 +1188,10 @@ void Talk::doScript(const Common::String &script) {
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = str - script.c_str();
+				_scriptCurrentIndex = str - scriptStart;
 
-				people.walkToCoords(Common::Point((((byte)str[0] - 1) * 256 + (byte)str[1] - 1) * 100, 
-					(byte)str[2] * 100), str[3] - 1);
+				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100, 
+					str[2] * 100), str[3] - 1);
 				if (_talkToAbort)
 					return;
 
@@ -1200,7 +1202,7 @@ void Talk::doScript(const Common::String &script) {
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = str - script.c_str();
+				_scriptCurrentIndex = str - scriptStart;
 
 				for (int idx = 0; idx < (str[0] - 1); ++idx) {
 					scene.doBgAnim();
@@ -1216,7 +1218,7 @@ void Talk::doScript(const Common::String &script) {
 			case BANISH_WINDOW:
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - script.c_str();
+				_scriptCurrentIndex = str - scriptStart;
 
 				if (!(_speaker & 128))
 					people.clearTalking();
@@ -1246,7 +1248,7 @@ void Talk::doScript(const Common::String &script) {
 
 			case SET_FLAG: {
 				++str;
-				int flag1 = ((byte)str[0] - 1) * 256 + (byte)str[1] - 1 - (str[1] == 1 ? 1 : 0);
+				int flag1 = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				int flag = (flag1 & 0x3fff) * (flag1 >= 0x4000 ? -1 : 1);
 				_vm->setFlags(flag);
 				++str;
@@ -1284,7 +1286,7 @@ void Talk::doScript(const Common::String &script) {
 
 			case IF_STATEMENT: {
 				++str;
-				int flag = ((byte)str[0] - 1) * 256 + (byte)str[1] - 1 - (str[1] == 1 ? 1 : 0);
+				int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				++str;
 				wait = 0;
 				
@@ -1334,14 +1336,14 @@ void Talk::doScript(const Common::String &script) {
 
 					// Run a canimation?
 					if (str[2] > 100) {
-						people._hSavedFacing = (byte)str[2];
+						people._hSavedFacing = str[2];
 						people._hSavedPos = Common::Point(160, 100);
 					}
 				}
 				str += 6;
 
 				_scriptMoreFlag = (scene._goToScene == 100) ? 2 : 1;
-				_scriptSaveIndex = str - script.c_str();
+				_scriptSaveIndex = str - scriptStart;
 				endStr = true;
 				wait = 0;
 				break;
@@ -1369,7 +1371,7 @@ void Talk::doScript(const Common::String &script) {
 					tempString += str[idx + 1];
 
 				// Set comparison state according to if we want to hide or unhide
-				bool state = ((byte)str[0] >= 128);
+				bool state = (str[0] >= 128);
 				str += str[0] & 127;
 
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
@@ -1389,7 +1391,7 @@ void Talk::doScript(const Common::String &script) {
 					tempString += str[idx];
 				str += 8;
 
-				_scriptCurrentIndex = str - script.c_str();
+				_scriptCurrentIndex = str - scriptStart;
 
 				// Save the current script position and new talk file
 				if (_scriptStack.size() < 9) {
@@ -1418,8 +1420,8 @@ void Talk::doScript(const Common::String &script) {
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = str - script.c_str();
-				events.moveMouse(Common::Point(((byte)str[0] - 1) * 256 + (byte)str[1] - 1, str[2]));
+				_scriptCurrentIndex = str - scriptStart;
+				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
 				if (_talkToAbort)
 					return;
 				str += 3;
@@ -1446,7 +1448,7 @@ void Talk::doScript(const Common::String &script) {
 
 				// Save the current point in the script, since it might be intterupted by
 				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = (str + 1) - script.c_str();
+				_scriptCurrentIndex = (str + 1) - scriptStart;
 
 				people.walkToCoords(anim._goto, anim._gotoDir);
 				if (_talkToAbort)
@@ -1509,10 +1511,10 @@ void Talk::doScript(const Common::String &script) {
 				width += screen.charWidth(str[idx]);
 				++idx;
 				++charCount;
-			} while (width < 298 && str[idx] && str[idx] != '{' && (byte)str[idx] < 128);
+			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < 128);
 
 			if (str[idx] || width >= 298) {
-				if ((byte)str[idx] < 128 && str[idx] != '{') {
+				if (str[idx] < 128 && str[idx] != '{') {
 					--idx;
 					--charCount;
 				}
@@ -1529,7 +1531,7 @@ void Talk::doScript(const Common::String &script) {
 			}
 
 			// Print the line
-			Common::String lineStr(str, str + idx);
+			Common::String lineStr((const char *)str, (const char *)str + idx);
 
 			// If the speaker indicates a description file, print it in yellow
 			if (_speaker != -1) {
@@ -1552,20 +1554,20 @@ void Talk::doScript(const Common::String &script) {
 			str += idx;
 
 			// If line wrap occurred, then move to after the separating space between the words
-			if ((byte)str[0] < 128 && str[0] != '{')
+			if (str[0] < 128 && str[0] != '{')
 				++str;
 
 			yp += 9;
 			++line;
 
 			// Certain different conditions require a wait
-			if ((line == 4 && (byte)str[0] != SFX_COMMAND && (byte)str[0] != PAUSE && _speaker != -1) ||
-					(line == 5 && (byte)str[0] != PAUSE && _speaker != -1) ||
+			if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
+					(line == 5 && str[0] != PAUSE && _speaker != -1) ||
 					endStr) {
 				wait = 1;
 			}
 
-			switch ((byte)str[0]) {
+			switch (str[0]) {
 			case SWITCH_SPEAKER:
 			case ASSIGN_PORTRAIT_LOCATION:
 			case BANISH_WINDOW:
@@ -1582,7 +1584,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-		if ((openTalkWindow && wait) || (openTalkWindow && (byte)str[0] >= 128 && (byte)str[0] != CARRIAGE_RETURN)) {
+		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= 128 && str[0] != CARRIAGE_RETURN)) {
 			if (!ui._windowStyle) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
@@ -1596,7 +1598,7 @@ void Talk::doScript(const Common::String &script) {
 		if (wait) {
 			// Save the current point in the script, since it might be intterupted by
 			// doing bg anims in the next call, so we need to know where to return to
-			_scriptCurrentIndex = str - script.c_str();
+			_scriptCurrentIndex = str - scriptStart;
 
 			// Handling pausing
 			if (!pauseFlag && charCount < 160)
@@ -1608,12 +1610,12 @@ void Talk::doScript(const Common::String &script) {
 
 			// If a key was pressed to finish the window, see if further voice files should be skipped
 			if (wait >= 0 && wait < 254) {
-				if ((byte)str[0] == SFX_COMMAND)
+				if (str[0] == SFX_COMMAND)
 					str += 9;
 			}
 
 			// Clear the window unless the wait was due to a PAUSE command
-			if (!pauseFlag && wait != -1 && (byte)str[0] != SFX_COMMAND) {
+			if (!pauseFlag && wait != -1 && str[0] != SFX_COMMAND) {
 				if (!_talkStealth)
 					ui.clearWindow();
 				yp = CONTROLS_Y + 12;
-- 
cgit v1.2.3


From 9d99f1ebe726785beb0b3053b3cdc60a0fd64894 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 21:46:12 -1000
Subject: SHERLOCK: Fix looking at items with multiple pages of description

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 9e75f4ecc8..da72125f72 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1562,7 +1562,7 @@ void Talk::doScript(const Common::String &script) {
 
 			// Certain different conditions require a wait
 			if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
-					(line == 5 && str[0] != PAUSE && _speaker != -1) ||
+					(line == 5 && str[0] != PAUSE && _speaker == -1) ||
 					endStr) {
 				wait = 1;
 			}
-- 
cgit v1.2.3


From 24a36d610685b2024e864138224cc61e09f4ae16 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 22:11:29 -1000
Subject: SHERLOCK: Fix crash loading scene 42, which didn't have any
 canimations

---
 engines/sherlock/scene.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 3cc84936b0..ec7831820a 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -295,16 +295,19 @@ bool Scene::loadScene(const Common::String &filename) {
 		}
 
 		// Load in cAnim list
-		Common::SeekableReadStream *canimStream = _lzwMode ?
-			decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
-			rrmStream->readStream(65 * bgHeader._numcAnimations);
+		_cAnim.clear();
+		if (bgHeader._numcAnimations) {
+			Common::SeekableReadStream *canimStream = _lzwMode ?
+				decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
+				rrmStream->readStream(65 * bgHeader._numcAnimations);
 
-		_cAnim.resize(bgHeader._numcAnimations);
-		for (uint idx = 0; idx < _cAnim.size(); ++idx)
-			_cAnim[idx].synchronize(*canimStream);
+			_cAnim.resize(bgHeader._numcAnimations);
+			for (uint idx = 0; idx < _cAnim.size(); ++idx)
+				_cAnim[idx].synchronize(*canimStream);
+
+			delete canimStream;
+		}
 
-		delete canimStream;
-		
 		// Read in the room bounding areas
 		int size = rrmStream->readUint16LE();
 		Common::SeekableReadStream *boundsStream = !_lzwMode ? rrmStream :
-- 
cgit v1.2.3


From ac642fdfb3689612f6efb263cc89419c55f019fa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 30 Apr 2015 23:16:03 -1000
Subject: SHERLOCK: Implement custom mirror logic for scene 12

---
 engines/sherlock/scalpel/scalpel.cpp | 85 ++++++++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 488a4de772..69bafa8d67 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -626,21 +626,100 @@ void ScalpelEngine::startScene() {
  * Takes care of clearing the mirror in scene 12, in case anything drew over it
  */
 void ScalpelEngine::eraseMirror12() {
-	// TODO
+	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
+
+	// If player is in range of the mirror, then restore background from the secondary back buffer
+	if (Common::Rect(70, 100, 200, 200).contains(pt)) {
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(137, 18),
+			Common::Rect(137, 18, 184, 74));
+	}
 }
 
 /**
  * Takes care of drawing Holme's reflection onto the mirror in scene 12
  */
 void ScalpelEngine::doMirror12() {
-	// TODO
+	People &people = *_people;
+	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
+	int frameNum = (*people[AL]._sequences)[people[AL]._sequenceNumber][people[AL]._frameNumber] + 
+		(*people[AL]._sequences)[people[AL]._sequenceNumber][0] - 2;
+
+	switch ((*_people)[AL]._sequenceNumber) {
+	case WALK_DOWN:
+		frameNum -= 7;
+		break;
+	case WALK_UP:
+		frameNum += 7;
+		break;
+	case WALK_DOWNRIGHT:
+		frameNum += 7;
+		break;
+	case WALK_UPRIGHT:
+		frameNum -= 7;
+		break;
+	case WALK_DOWNLEFT:
+		frameNum += 7;
+		break;
+	case WALK_UPLEFT:
+		frameNum -= 7;
+		break;
+	case STOP_DOWN:
+		frameNum -= 10;
+		break;
+	case STOP_UP:
+		frameNum += 11;
+		break;
+	case STOP_DOWNRIGHT:
+		frameNum -= 15;
+		break;
+	case STOP_DOWNLEFT:
+		frameNum -= 15;
+		break;
+	case STOP_UPRIGHT:
+	case STOP_UPLEFT:
+		frameNum += 15;
+		if (frameNum == 55)
+			frameNum = 54;
+		break;
+	default:
+		break;
+	}
+
+	if (Common::Rect(80, 100, 145, 138).contains(pt)) {
+		// Get the frame of Sherlock to draw
+		ImageFrame &imageFrame = (*people[AL]._images)[frameNum];
+
+		// Draw the mirror image of Holmes
+		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT
+			|| people[AL]._sequenceNumber == WALK_UPRIGHT || people[AL]._sequenceNumber == STOP_UPRIGHT
+			|| people[AL]._sequenceNumber == WALK_DOWNLEFT || people[AL]._sequenceNumber == STOP_DOWNLEFT;
+		_screen->transBlitFrom(imageFrame, pt + Common::Point(38, imageFrame._frame.h - 25), flipped);
+
+		// Redraw the mirror borders to prevent the drawn image of Holmes from appearing outside of the mirror
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(114, 18), 
+			Common::Rect(114, 18, 137, 114));
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(137, 70), 
+			Common::Rect(137, 70, 142, 114));
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(142, 71), 
+			Common::Rect(142, 71, 159, 114));
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(159, 72), 
+			Common::Rect(159, 72, 170, 116));
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(170, 73), 
+			Common::Rect(170, 73, 184, 114));
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(184, 18), 
+			Common::Rect(184, 18, 212, 114));
+	}
 }
 
 /**
  * This clears the mirror  in scene 12 in case anything messed draw over it
  */
 void ScalpelEngine::flushMirror12() {
-	// TODO
+	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
+
+	// If player is in range of the mirror, then draw the entire mirror area to the screen
+	if (Common::Rect(70, 100, 200, 200).contains(pt))
+		_screen->slamArea(137, 18, 47, 56);
 }
 
 } // End of namespace Scalpel
-- 
cgit v1.2.3


From ffd65cfd36841f6e117d800043d1cf695951f8a9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 09:57:19 -1000
Subject: SHERLOCK: Fix animation for retrieving pocket watch

---
 engines/sherlock/objects.cpp | 2 ++
 engines/sherlock/scene.cpp   | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 3dc50e61b1..3cec0d800a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -719,6 +719,8 @@ bool Object::checkEndOfSequence() {
 
 					// Free the images
 					delete _images;
+					_images = nullptr;
+					_imageFrame = nullptr;
 				}
 			} else {
 				_type = INVALID;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index ec7831820a..a9763a7fc5 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1050,6 +1050,12 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 
 	// Set canim to REMOVE type and free memory
 	cObj.checkObject();
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if (&_canimShapes[idx] == &cObj) {
+			_canimShapes.remove_at(idx);
+			break;
+		}
+	}
 
 	if (gotoCode > 0 && !talk._talkToAbort) {
 		_goToScene = gotoCode;
@@ -1376,7 +1382,7 @@ void Scene::doBgAnim() {
 				if (_goToScene == -1)
 					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
 
-				_canimShapes.remove_at(idx);
+				_canimShapes[idx]._type = INVALID;
 				if (_ongoingCans > 0)
 					--_ongoingCans;
 			} else if (o._type == ACTIVE_BG_SHAPE) {
-- 
cgit v1.2.3


From b8372695ebc3b266f9fbe074dbbdd8e3015ce547 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 10:08:14 -1000
Subject: SHERLOCK: Refactored out _ongoingCans field

---
 engines/sherlock/scene.cpp | 8 +-------
 engines/sherlock/scene.h   | 1 -
 engines/sherlock/talk.cpp  | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index a9763a7fc5..55cdde2f56 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -91,7 +91,6 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_changes = false;
 	_keyboardInput = 0;
 	_walkedInScene = false;
-	_ongoingCans = 0;
 	_version = 0;
 	_lzwMode = false;
 	_invGraphicItems = 0;
@@ -201,7 +200,6 @@ bool Scene::loadScene(const Common::String &filename) {
 	bool flag;
 
 	_walkedInScene = false;
-	_ongoingCans = 0;
 
 	// Reset the list of walkable areas
 	_zones.clear();
@@ -962,8 +960,6 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 		cObj._imageFrame = &(*cObj._images)[0];
 		cObj._maxFrames = cObj._images->size();
 
-		++_ongoingCans;
-
 		int frames = 0;
 		if (playRate < 0) {
 			// Reverse direction
@@ -1317,7 +1313,7 @@ void Scene::doBgAnim() {
 		_animating = 0;
 		screen.slamRect(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	} else {
-		if (people[AL]._type != INVALID && ((_goToScene == -1 || _ongoingCans == 0))) {
+		if (people[AL]._type != INVALID && ((_goToScene == -1 || _canimShapes.size() == 0))) {
 			if (people[AL]._type == REMOVE) {
 				screen.slamRect(Common::Rect(
 					people[AL]._oldPosition.x, people[AL]._oldPosition.y,
@@ -1383,8 +1379,6 @@ void Scene::doBgAnim() {
 					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
 
 				_canimShapes[idx]._type = INVALID;
-				if (_ongoingCans > 0)
-					--_ongoingCans;
 			} else if (o._type == ACTIVE_BG_SHAPE) {
 				screen.flushImage(o._imageFrame, o._position,
 					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 159f281bdf..4fb7ac228a 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -111,7 +111,6 @@ public:
 	int _oldKey, _help, _oldHelp;
 	int _oldTemp, _temp;
 	bool _walkedInScene;
-	int _ongoingCans;
 	int _version;
 	bool _lzwMode;
 	int _invGraphicItems;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index da72125f72..a848e11392 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -134,7 +134,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 	// If there any canimations currently running, or a portrait is being cleared,
 	// save the filename for later executing when the canimation is done
-	if (scene._ongoingCans || people._clearingThePortrait) {
+	if (scene._canimShapes.size() > 0 || people._clearingThePortrait) {
 		// Make sure we're not in the middle of a script
 		if (!_scriptMoreFlag) {
 			_scriptName = filename;
-- 
cgit v1.2.3


From 3f5c159068fdee253883e300cae524282db5b167 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 10:24:53 -1000
Subject: SHERLOCK: Fix opening pocketwatch

---
 engines/sherlock/scene.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 55cdde2f56..cd913f8515 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -527,7 +527,7 @@ void Scene::checkSceneFlags(bool flag) {
 		}
 	}
 
-	// Check inventory
+	// Check inventory for items to remove based on flag changes
 	for (int idx = 0; idx < _vm->_inventory->_holdings; ++idx) {
 		InventoryItem &ii = (*_vm->_inventory)[idx];
 		if (ii._requiredFlag && !_vm->readFlags(ii._requiredFlag)) {
@@ -536,10 +536,10 @@ void Scene::checkSceneFlags(bool flag) {
 			_vm->_inventory->insert_at(_vm->_inventory->_holdings, tempItem);
 			_vm->_inventory->remove_at(idx);
 			_vm->_inventory->_holdings--;
-			break;
 		}
 	}
 
+	// Check inactive inventory items for ones to reactivate based on flag changes
 	for (uint idx = _vm->_inventory->_holdings; idx < _vm->_inventory->size(); ++idx) {
 		InventoryItem &ii = (*_vm->_inventory)[idx];
 		if (ii._requiredFlag && _vm->readFlags(ii._requiredFlag)) {
@@ -548,7 +548,6 @@ void Scene::checkSceneFlags(bool flag) {
 			_vm->_inventory->remove_at(idx);
 			_vm->_inventory->insert_at(_vm->_inventory->_holdings, tempItem);
 			_vm->_inventory->_holdings++;
-			break;
 		}
 	}
 }
-- 
cgit v1.2.3


From edec4abfe5cace1b5a0761adc33bf8e526561f27 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 11:48:41 -1000
Subject: SHERLOCK: Fix mirror display in scene 12

---
 engines/sherlock/scalpel/scalpel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 69bafa8d67..d36f761239 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -693,7 +693,7 @@ void ScalpelEngine::doMirror12() {
 		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT
 			|| people[AL]._sequenceNumber == WALK_UPRIGHT || people[AL]._sequenceNumber == STOP_UPRIGHT
 			|| people[AL]._sequenceNumber == WALK_DOWNLEFT || people[AL]._sequenceNumber == STOP_DOWNLEFT;
-		_screen->transBlitFrom(imageFrame, pt + Common::Point(38, imageFrame._frame.h - 25), flipped);
+		_screen->_backBuffer1.transBlitFrom(imageFrame, pt + Common::Point(38, -imageFrame._frame.h - 25), flipped);
 
 		// Redraw the mirror borders to prevent the drawn image of Holmes from appearing outside of the mirror
 		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(114, 18), 
-- 
cgit v1.2.3


From da75ee1f8b233cbfacfd1f18a1be970edbc0b0f2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 12:29:40 -1000
Subject: SHERLOCK: Fix display of animation cutscenes

---
 engines/sherlock/animation.cpp |  9 +++++----
 engines/sherlock/resources.cpp | 20 ++++++++++++++------
 engines/sherlock/resources.h   |  4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 810c0ecc34..e70bc84ff8 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -94,7 +94,7 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
-	ImageFile images(vdaName, true);
+	ImageFile images(vdaName, true, true);
 	
 	events.wait(minDelay);
 	if (fade != 0 && fade != 255)
@@ -119,15 +119,16 @@ bool Animation::playPrologue(const Common::String &filename, int minDelay, int f
 		} else if (imageFrame != -1) {
 			// Read position from either animation stream or the sprite frame itself
 			if (imageFrame < 0) {
-				imageFrame += 32769;
+				imageFrame += 32768;
 				pt.x = stream->readUint16LE();
 				pt.y = stream->readUint16LE();
 			} else {
 				pt = images[imageFrame]._offset;
 			}
 
-			// Draw the sprite
-			screen.transBlitFrom(images[imageFrame], pt);
+			// Draw the sprite. Note that we explicitly use the raw frame below, rather than the ImageFrame,
+			// since we don't want the offsets in the image file to be used, just the explicit position we specify
+			screen.transBlitFrom(images[imageFrame]._frame, pt);
 		} else {
 			// No sprite to show for this animation frame
 			if (fade == 255) {
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 0d66646286..788cacf82a 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -268,18 +268,18 @@ void ImageFile::setVm(SherlockEngine *vm) {
 	_vm = vm;
 }
 
-ImageFile::ImageFile(const Common::String &name, bool skipPal) {
+ImageFile::ImageFile(const Common::String &name, bool skipPal, bool animImages) {
 	Common::SeekableReadStream *stream = _vm->_res->load(name);
 	
 	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
-	load(*stream, skipPal);
+	load(*stream, skipPal, animImages);
 	
 	delete stream;
 }
 
 ImageFile::ImageFile(Common::SeekableReadStream &stream, bool skipPal) {
 	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
-	load(stream, skipPal);
+	load(stream, skipPal, false);
 }
 
 ImageFile::~ImageFile() {
@@ -290,7 +290,7 @@ ImageFile::~ImageFile() {
 /**
  * Load the data of the sprite
  */
-void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
+void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool animImages) {
 	loadPalette(stream);
 
     while (stream.pos() < stream.size()) {
@@ -298,8 +298,16 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette) {
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
 		frame._paletteBase = stream.readByte();
-		frame._rleEncoded = stream.readByte() == 1;
-		frame._offset.x = stream.readByte();
+
+		if (animImages) {
+			// Animation cutscene image files use a 16-bit x offset
+			frame._offset.x = stream.readUint16LE();
+			frame._rleEncoded = (frame._offset.x & 0xff) == 1;
+		} else {
+			// Standard image files have a separate byte for the RLE flag, and an 8-bit X offset
+			frame._rleEncoded = stream.readByte() == 1;
+			frame._offset.x = stream.readByte();
+		}
 		frame._offset.y = stream.readByte();
 
 		frame._rleEncoded = !skipPalette && frame._rleEncoded;
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 45fda565bc..b173884322 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -104,13 +104,13 @@ class ImageFile : public Common::Array<ImageFrame> {
 private:
 	static SherlockEngine *_vm;
 
-	void load(Common::SeekableReadStream &stream, bool skipPalette);
+	void load(Common::SeekableReadStream &stream, bool skipPalette, bool animImages);
 	void loadPalette(Common::SeekableReadStream &stream);
 	void decompressFrame(ImageFrame  &frame, const byte *src);
 public:
 	byte _palette[256 * 3];
 public:
-	ImageFile(const Common::String &name, bool skipPal = false);
+	ImageFile(const Common::String &name, bool skipPal = false, bool animImages = false);
 	ImageFile(Common::SeekableReadStream &stream, bool skipPal = false);
 	~ImageFile();
 	static void setVm(SherlockEngine *vm);
-- 
cgit v1.2.3


From 093d7877e6656132ed136fb37559a4daf82cd985 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 14:22:21 -1000
Subject: SHERLOCK: Fix conversation with Lord Brumwell

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a848e11392..7464e4d341 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -909,7 +909,7 @@ void Talk::setSequence(int speaker) {
 	Scene &scene = *_vm->_scene;
 	
 	// If no speaker is specified, then nothing needs to be done
-	if (speaker != -1)
+	if (speaker == -1)
 		return;
 
 	if (speaker) {
-- 
cgit v1.2.3


From a4662b4699286a948644a8018d343f96e28ee019 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 14:22:35 -1000
Subject: SHERLOCK: Fix getting Tarot cards

---
 engines/sherlock/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index cd913f8515..497a8d551c 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -559,7 +559,7 @@ void Scene::checkSceneFlags(bool flag) {
  */
 void Scene::checkInventory() {
 	for (uint shapeIdx = 0; shapeIdx < _bgShapes.size(); ++shapeIdx) {
-		for (uint invIdx = 0; invIdx < _vm->_inventory->size(); ++invIdx) {
+		for (uint invIdx = 0; invIdx < _vm->_inventory->_holdings; ++invIdx) {
 			if (scumm_stricmp(_bgShapes[shapeIdx]._name.c_str(),
 				(*_vm->_inventory)[invIdx]._name.c_str()) == 0) {
 				_bgShapes[shapeIdx]._type = INVALID;
-- 
cgit v1.2.3


From 5b8fb0cf9097d3d288a3afe0615b6dffbaef3ea0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 14:54:28 -1000
Subject: SHERLOCK: Fix crash unlocking desk drawer in Palmist

---
 engines/sherlock/objects.cpp | 7 +++++++
 engines/sherlock/objects.h   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 3cec0d800a..ff8f6393db 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -377,6 +377,13 @@ void ActionType::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
+UseType::UseType() {
+	_cAnimNum = _cAnimSpeed = 0;
+	_useFlag = 0;
+	_dFlag[0] = 0;
+	_lFlag[0] = _lFlag[1] = 0;
+}
+
 void UseType::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
 
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index e2b53ec541..10b491e5d7 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -160,6 +160,7 @@ struct UseType {
 	int _lFlag[2];
 	Common::String _target;
 
+	UseType();
 	void synchronize(Common::SeekableReadStream &s);
 };
 
-- 
cgit v1.2.3


From 8671d29627821292dee5e950fdd17454ca289ee7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 15:58:47 -1000
Subject: SHERLOCK: Re-enabled intro credits

---
 engines/sherlock/sherlock.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a8d3d9a535..49230f22de 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -107,8 +107,7 @@ Common::Error SherlockEngine::run() {
 		_saves->loadGame(_loadGameSlot);
 		_loadGameSlot = -1;
 	} else {
-		// Temporarily disabled for now
-		//	showOpening();
+		showOpening();
 	}
 
 	while (!shouldQuit()) {
-- 
cgit v1.2.3


From 9fd73d0b9a689166aed05fc36f39307ac016bcb9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 15:59:36 -1000
Subject: SHERLOCK: Implemented showLBV and fixes for credits display

---
 engines/sherlock/scalpel/scalpel.cpp | 63 +++++++++++++++++++++++++-----------
 engines/sherlock/scalpel/scalpel.h   |  2 ++
 engines/sherlock/screen.cpp          |  1 +
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index d36f761239..c0910c52a1 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -330,9 +330,7 @@ bool ScalpelEngine::showAlleyCutscene() {
 		finished = _animation->playPrologue("27PRO2", 1, 0, false, 2);
 
 	if (finished) {
-		ImageFile screamImages("SCREAM.LBV", false);
-		_screen->_backBuffer1.transBlitFrom(screamImages[0], Common::Point(0, 0));
-		_screen->_backBuffer2.blitFrom(_screen->_backBuffer1);
+		showLBV("scream.lbv");
 		finished = _events->delay(6000);
 	}
 
@@ -373,29 +371,40 @@ bool ScalpelEngine::showStreetCutscene() {
 	return finished;
 }
 
+/**
+ * Show the game credits
+ */
 bool ScalpelEngine::scrollCredits() {
+	// Load the images for displaying credit text
 	_titleOverride = "TITLE.LIB";
 	ImageFile creditsImages("credits.vgs", true);
+	_screen->setPalette(creditsImages._palette);
+	_titleOverride = "";
 
-	_screen->_backBuffer1.copyFrom(*_screen->_backBuffer);
+	// Save a copy of the screen background for use in drawing each credit frame
+	_screen->_backBuffer1.blitFrom(*_screen);
 
-	for(int i = 0; i < 600 && !_events->kbHit(); i++) {
-		_screen->_backBuffer1.copyFrom(*_screen->_backBuffer);
-		if (i < 200)
-			_screen->transBlitFrom(creditsImages[0], Common::Point(10, -i), false, 0); 
-		if (i > 0 && i < 400)
-			_screen->transBlitFrom(creditsImages[1], Common::Point(10, 200 - i), false, 0);
-		if (i > 200)
-			_screen->transBlitFrom(creditsImages[2], Common::Point(10, 400 - i), false, 0);
+	// Loop for showing the credits
+	for(int idx = 0; idx < 600 && !_events->kbHit() && !shouldQuit(); ++idx) {
+		// Copy the entire screen background before writing text
+		_screen->blitFrom(_screen->_backBuffer1);
 
-		warning("TODO: Use VideoBlockMove");
-//		videoblockmove(SCREEN, BACKBUFFER, 0, 0, 320, 10);
-//		videoblockmove(SCREEN, BACKBUFFER, 0, 190, 320, 10);
+		// Write the text appropriate for the next frame
+		if (idx < 200)
+			_screen->transBlitFrom(creditsImages[0], Common::Point(10, -idx), false, 0); 
+		if (idx > 0 && idx < 400)
+			_screen->transBlitFrom(creditsImages[1], Common::Point(10, 200 - idx), false, 0);
+		if (idx > 200)
+			_screen->transBlitFrom(creditsImages[2], Common::Point(10, 400 - idx), false, 0);
+
+		// Don't show credit text on the top and bottom ten rows of the screen
+		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, 10));
+		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - 10),
+			Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 10, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 		_events->delay(100);
 	}
 
-	_titleOverride = "";
 	return true;
 }
 
@@ -408,7 +417,8 @@ bool ScalpelEngine::showOfficeCutscene() {
 	if (finished)
 		finished = _animation->playPrologue("COFF2", 1, 0, false, 3);
 	if (finished) {
-		warning("TODO: ShowLBV(""NOTE.LBV"");");
+		showLBV("note.lbv");
+
 		if (_sound->_voices) {
 			finished = _sound->playSound("NOTE1", WAIT_KBD_OR_FINISH);
 			if (finished)
@@ -441,6 +451,11 @@ bool ScalpelEngine::showOfficeCutscene() {
 	return finished;
 }
 
+/**
+ * Load the default inventory for the game, which includes both the initial active inventory,
+ * as well as special pending inventory items which can appear automatically in the player's
+ * inventory once given required flags are set
+ */
 void ScalpelEngine::loadInventory() {
 	Inventory &inv = *_inventory;
 
@@ -449,7 +464,7 @@ void ScalpelEngine::loadInventory() {
 	inv.push_back(InventoryItem(0, "Message", "A message requesting help", "_ITEM03A"));
 	inv.push_back(InventoryItem(0, "Holmes Card", "A number of business cards", "_ITEM07A"));
 	
-	// Potential items
+	// Hidden items
 	inv.push_back(InventoryItem(95, "Tickets", "Opera Tickets", "_ITEM10A"));
 	inv.push_back(InventoryItem(138, "Cuff Link", "Cuff Link", "_ITEM04A"));
 	inv.push_back(InventoryItem(138, "Wire Hook", "Wire Hook", "_ITEM06A"));
@@ -462,6 +477,18 @@ void ScalpelEngine::loadInventory() {
 	inv.push_back(InventoryItem(586, "Pawn ticket", "A pawn ticket", "_ITEM16A"));
 };
 
+/**
+ * Transition to show an image
+ */
+void ScalpelEngine::showLBV(const Common::String &filename) {
+	Common::SeekableReadStream *stream = _res->load(filename, "title.lib");
+	ImageFile images(*stream);
+	delete stream;
+
+	_screen->setPalette(images._palette);
+	_screen->_backBuffer1.blitFrom(images[0]._frame);
+	_screen->verticalTransition();
+}
 
 /**
  * Starting a scene within the game
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 194bf5413e..2ba47a49e1 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -42,6 +42,8 @@ private:
 	bool scrollCredits();
 
 	void loadInventory();
+
+	void showLBV(const Common::String &filename);
 protected:
 	virtual void initialize();
 
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 66590c3ada..01d3b9155a 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -35,6 +35,7 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 	_transitionSeed = 1;
 	_fadeStyle = false;
 	_font = nullptr;
+	_backBuffer = nullptr;
 	_fontHeight = 0;
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
-- 
cgit v1.2.3


From cce0b5583160f1ea2aee2b294527e036165a84f1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 16:06:45 -1000
Subject: SHERLOCK: Extra comments for methods in ScalpelEngine

---
 engines/sherlock/scalpel/scalpel.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index c0910c52a1..5274cbbec4 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -246,6 +246,9 @@ void ScalpelEngine::showOpening() {
 	_sound->stopMusic();
 }
 
+/**
+ * Show the starting city cutscene which shows the game title
+ */
 bool ScalpelEngine::showCityCutscene() {
 	byte palette[PALETTE_SIZE];
 	
@@ -318,6 +321,9 @@ bool ScalpelEngine::showCityCutscene() {
 	return finished;
 }
 
+/**
+ * Show the back alley where the initial murder takes place
+ */
 bool ScalpelEngine::showAlleyCutscene() {
 	byte palette[PALETTE_SIZE];
 	_sound->playMusic("prolog2.mus");
@@ -355,6 +361,9 @@ bool ScalpelEngine::showAlleyCutscene() {
 	return finished;
 }
 
+/**
+ * Show the Baker Street outside cutscene
+ */
 bool ScalpelEngine::showStreetCutscene() {
 	_titleOverride = "TITLE.LIB";
 	_soundOverride = "TITLE.SND";
@@ -408,6 +417,9 @@ bool ScalpelEngine::scrollCredits() {
 	return true;
 }
 
+/**
+ * Show Holmes and Watson at the breakfast table, lestrade's note, and then the scrolling credits
+ */
 bool ScalpelEngine::showOfficeCutscene() {
 	_sound->playMusic("PROLOG4.MUS");
 	_titleOverride = "TITLE2.LIB";
-- 
cgit v1.2.3


From 1e2ed9e3bc98ad7b0295df8484710a8223bfd01d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 16:32:09 -1000
Subject: SHERLOCK: Further fixes for credits display

---
 engines/sherlock/scalpel/scalpel.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 5274cbbec4..a90408fe11 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -385,10 +385,10 @@ bool ScalpelEngine::showStreetCutscene() {
  */
 bool ScalpelEngine::scrollCredits() {
 	// Load the images for displaying credit text
-	_titleOverride = "TITLE.LIB";
-	ImageFile creditsImages("credits.vgs", true);
+	Common::SeekableReadStream *stream = _res->load("credits.vgs", "title.lib");
+	ImageFile creditsImages(*stream);
 	_screen->setPalette(creditsImages._palette);
-	_titleOverride = "";
+	delete stream;
 
 	// Save a copy of the screen background for use in drawing each credit frame
 	_screen->_backBuffer1.blitFrom(*_screen);
@@ -399,12 +399,10 @@ bool ScalpelEngine::scrollCredits() {
 		_screen->blitFrom(_screen->_backBuffer1);
 
 		// Write the text appropriate for the next frame
-		if (idx < 200)
-			_screen->transBlitFrom(creditsImages[0], Common::Point(10, -idx), false, 0); 
-		if (idx > 0 && idx < 400)
-			_screen->transBlitFrom(creditsImages[1], Common::Point(10, 200 - idx), false, 0);
+		if (idx < 400)
+			_screen->transBlitFrom(creditsImages[0], Common::Point(10, 200 - idx), false, 0);
 		if (idx > 200)
-			_screen->transBlitFrom(creditsImages[2], Common::Point(10, 400 - idx), false, 0);
+			_screen->transBlitFrom(creditsImages[1], Common::Point(10, 400 - idx), false, 0);
 
 		// Don't show credit text on the top and bottom ten rows of the screen
 		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, 10));
-- 
cgit v1.2.3


From 42a99354f9d0c4719e955008f57bf433fdbeabb3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 16:53:22 -1000
Subject: SHERLOCK: Rename playPrologue to play

---
 engines/sherlock/animation.cpp       |  2 +-
 engines/sherlock/animation.h         |  2 +-
 engines/sherlock/scalpel/scalpel.cpp | 46 ++++++++++++++++++------------------
 engines/sherlock/talk.cpp            |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index e70bc84ff8..1d84a30c0f 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -64,7 +64,7 @@ static const int NO_FRAMES = FRAMES_END;
 Animation::Animation(SherlockEngine *vm): _vm(vm) {
 }
 
-bool Animation::playPrologue(const Common::String &filename, int minDelay, int fade, 
+bool Animation::play(const Common::String &filename, int minDelay, int fade, 
 		bool setPalette, int speed) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index da4c5baad7..3d87cb0a91 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -39,7 +39,7 @@ public:
 public:
 	Animation(SherlockEngine *vm);
 
-	bool playPrologue(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
+	bool play(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index a90408fe11..3fe094bcf4 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -255,7 +255,7 @@ bool ScalpelEngine::showCityCutscene() {
 	_sound->playMusic("prolog1.mus");
 	_titleOverride = "title.lib";
 	_soundOverride = "title.snd";
-	bool finished = _animation->playPrologue("26open1", 1, 255, true, 2);
+	bool finished = _animation->play("26open1", 1, 255, true, 2);
 
 	if (finished) {
 		ImageFile titleImages("title2.vgs", true);
@@ -280,7 +280,7 @@ bool ScalpelEngine::showCityCutscene() {
 	}
 
 	if (finished)
-		finished = _animation->playPrologue("26open2", 1, 0, false, 2);
+		finished = _animation->play("26open2", 1, 0, false, 2);
 
 	if (finished) {
 		ImageFile titleImages("title.vgs", true);
@@ -331,9 +331,9 @@ bool ScalpelEngine::showAlleyCutscene() {
 	_titleOverride = "TITLE.LIB";
 	_soundOverride = "TITLE.SND";
 
-	bool finished = _animation->playPrologue("27PRO1", 1, 3, true, 2);
+	bool finished = _animation->play("27PRO1", 1, 3, true, 2);
 	if (finished)
-		finished = _animation->playPrologue("27PRO2", 1, 0, false, 2);
+		finished = _animation->play("27PRO2", 1, 0, false, 2);
 
 	if (finished) {
 		showLBV("scream.lbv");
@@ -341,7 +341,7 @@ bool ScalpelEngine::showAlleyCutscene() {
 	}
 
 	if (finished)
-		finished = _animation->playPrologue("27PRO3", 1, 0, true, 2);
+		finished = _animation->play("27PRO3", 1, 0, true, 2);
 
 	if(finished) {
 		_screen->getPalette(palette);
@@ -370,10 +370,10 @@ bool ScalpelEngine::showStreetCutscene() {
 
 	_sound->playMusic("PROLOG3.MUS");
 
-	bool finished = _animation->playPrologue("14KICK", 1, 3, true, 2);
+	bool finished = _animation->play("14KICK", 1, 3, true, 2);
 
 	if (finished)
-		finished = _animation->playPrologue("14NOTE", 1, 0, false, 2);
+		finished = _animation->play("14NOTE", 1, 0, false, 2);
 
 	_titleOverride = "";
 	_soundOverride = "";
@@ -423,9 +423,9 @@ bool ScalpelEngine::showOfficeCutscene() {
 	_titleOverride = "TITLE2.LIB";
 	_soundOverride = "TITLE.SND";
 
-	bool finished = _animation->playPrologue("COFF1", 1, 3, true, 3);
+	bool finished = _animation->play("COFF1", 1, 3, true, 3);
 	if (finished)
-		finished = _animation->playPrologue("COFF2", 1, 0, false, 3);
+		finished = _animation->play("COFF2", 1, 0, false, 3);
 	if (finished) {
 		showLBV("note.lbv");
 
@@ -445,10 +445,10 @@ bool ScalpelEngine::showOfficeCutscene() {
 	}
 
 	if (finished)
-		finished = _animation->playPrologue("COFF3", 1, 0, true, 3);
+		finished = _animation->play("COFF3", 1, 0, true, 3);
 
 	if (finished)
-		finished = _animation->playPrologue("COFF4", 1, 0, false, 3);
+		finished = _animation->play("COFF4", 1, 0, false, 3);
 
 	if (finished)
 		finished = scrollCredits();
@@ -541,8 +541,8 @@ void ScalpelEngine::startScene() {
 			// Blackwood's capture
 			_res->addToCache("final2.vda", "epilogue.lib");
 			_res->addToCache("final2.vdx", "epilogue.lib");
-			_animation->playPrologue("final1", 1, 3, true, 4);
-			_animation->playPrologue("final2", 1, 0, false, 4);
+			_animation->play("final1", 1, 3, true, 4);
+			_animation->play("final2", 1, 0, false, 4);
 			break;
 
 		case 52:
@@ -558,8 +558,8 @@ void ScalpelEngine::startScene() {
 			_res->addToCache("finale4.vda", "EPILOG2.lib");
 			_res->addToCache("finale4.vdx", "EPILOG2.lib");
 
-			_animation->playPrologue("finalr1", 1, 3, true, 4);
-			_animation->playPrologue("finalr2", 1, 0, false, 4);
+			_animation->play("finalr1", 1, 3, true, 4);
+			_animation->play("finalr2", 1, 0, false, 4);
 
 			if (!_res->isInCache("finale2.vda")) {
 				// Finale file isn't cached
@@ -571,12 +571,12 @@ void ScalpelEngine::startScene() {
 				_res->addToCache("finale4.vdx", "EPILOG2.lib");
 			}
 
-			_animation->playPrologue("finale1", 1, 0, false, 4);
-			_animation->playPrologue("finale2", 1, 0, false, 4);
-			_animation->playPrologue("finale3", 1, 0, false, 4);
+			_animation->play("finale1", 1, 0, false, 4);
+			_animation->play("finale2", 1, 0, false, 4);
+			_animation->play("finale3", 1, 0, false, 4);
 
 			_useEpilogue2 = true;
-			_animation->playPrologue("finale4", 1, 0, false, 4);
+			_animation->play("finale4", 1, 0, false, 4);
 			_useEpilogue2 = false;
 			break;
 
@@ -587,9 +587,9 @@ void ScalpelEngine::startScene() {
 			_res->addToCache("SUBWAY3.vda", "epilogue.lib");
 			_res->addToCache("SUBWAY3.vdx", "epilogue.lib");
 
-			_animation->playPrologue("SUBWAY1", 1, 3, true, 4);
-			_animation->playPrologue("SUBWAY2", 1, 0, false, 4);
-			_animation->playPrologue("SUBWAY3", 1, 0, false, 4);
+			_animation->play("SUBWAY1", 1, 3, true, 4);
+			_animation->play("SUBWAY2", 1, 0, false, 4);
+			_animation->play("SUBWAY3", 1, 0, false, 4);
 
 			// Set fading to direct fade temporary so the transition goes quickly.
 			_scene->_tempFadeStyle = _screen->_fadeStyle ? 257 : 256;
@@ -598,7 +598,7 @@ void ScalpelEngine::startScene() {
 
 		case 70:
 			// Brumwell suicide
-			_animation->playPrologue("suicid", 1, 3, true, 4);
+			_animation->play("suicid", 1, 3, true, 4);
 			break;
 		default:
 			break;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 7464e4d341..603f47a446 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1353,7 +1353,7 @@ void Talk::doScript(const Common::String &script) {
 				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
 					tempString += str[idx];
 
-				anim.playPrologue(tempString, 1, 3, true, 4);
+				anim.play(tempString, 1, 3, true, 4);
 				break;
 
 			case ADD_ITEM_TO_INVENTORY:
-- 
cgit v1.2.3


From b4c3d9840c99ce5d4e23eb0f646bd995f7d2c002 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 17:17:24 -1000
Subject: SHERLOCK: Extra method comments

---
 engines/sherlock/animation.cpp      |  3 +++
 engines/sherlock/debugger.cpp       |  6 ++++++
 engines/sherlock/detection.cpp      | 30 ++++++++++++++++++++++++++++++
 engines/sherlock/events.cpp         |  5 +++--
 engines/sherlock/graphics.cpp       |  9 +++++++--
 engines/sherlock/inventory.cpp      |  3 +++
 engines/sherlock/journal.cpp        |  3 +++
 engines/sherlock/objects.cpp        | 19 ++++++++++++++-----
 engines/sherlock/people.cpp         | 14 ++++++++++----
 engines/sherlock/scene.cpp          |  5 ++++-
 engines/sherlock/screen.cpp         | 15 +++++++++++++++
 engines/sherlock/sherlock.cpp       | 14 +++++++++++++-
 engines/sherlock/talk.cpp           |  6 ++++++
 engines/sherlock/user_interface.cpp | 17 +++++++++++++++--
 14 files changed, 132 insertions(+), 17 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 1d84a30c0f..aea4793a76 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -64,6 +64,9 @@ static const int NO_FRAMES = FRAMES_END;
 Animation::Animation(SherlockEngine *vm): _vm(vm) {
 }
 
+/**
+ * Play a full-screen animation
+ */
 bool Animation::play(const Common::String &filename, int minDelay, int fade, 
 		bool setPalette, int speed) {
 	Events &events = *_vm->_events;
diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
index b8ac8bef6a..b3dac71d5e 100644
--- a/engines/sherlock/debugger.cpp
+++ b/engines/sherlock/debugger.cpp
@@ -30,6 +30,9 @@ Debugger::Debugger(SherlockEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("scene", WRAP_METHOD(Debugger, cmd_scene));
 }
 
+/**
+ * Converts a decimal or hexadecimal string into a number
+ */
 static int strToInt(const char *s) {
 	if (!*s)
 		// No string at all
@@ -46,6 +49,9 @@ static int strToInt(const char *s) {
 	return (int)tmp;
 }
 
+/**
+ * Switch to another scene
+ */
 bool Debugger::cmd_scene(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Format: scene <room>\n");
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index c4d1c65fd5..14fc04cc73 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -36,14 +36,23 @@ struct SherlockGameDescription {
 	uint32 features;
 };
 
+/**
+ * Returns the Id of the game
+ */
 uint32 SherlockEngine::getGameID() const {
 	return _gameDescription->gameID;
 }
 
+/**
+ * Returns the features the currently playing game has
+ */
 uint32 SherlockEngine::getGameFeatures() const {
 	return _gameDescription->features;
 }
 
+/**
+ * Return's the platform the game's datafiles are for
+ */
 Common::Platform SherlockEngine::getPlatform() const {
 	return _gameDescription->desc.platform;
 }
@@ -79,6 +88,9 @@ public:
 	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
 };
 
+/**
+ * Creates an instance of the game engine
+ */
 bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Sherlock::SherlockGameDescription *gd = (const Sherlock::SherlockGameDescription *)desc;
 	if (gd) {
@@ -97,6 +109,9 @@ bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
 	return gd != 0;
 }
 
+/**
+ * Returns a list of features the game's MetaEngine support
+ */
 bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
 		(f == kSupportsListSaves) ||
@@ -106,6 +121,9 @@ bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesSupportThumbnail);
 }
 
+/**
+ * Returns a list of features the game itself supports
+ */
 bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsRTL) ||
@@ -113,19 +131,31 @@ bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsSavingDuringRuntime);
 }
 
+/**
+ * Return a list of savegames
+ */
 SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
 	return Sherlock::SaveManager(nullptr, "").getSavegameList(target);
 }
 
+/**
+ * Returns the maximum number of allowed save slots
+ */
 int SherlockMetaEngine::getMaximumSaveSlot() const {
 	return MAX_SAVEGAME_SLOTS;
 }
 
+/**
+ * Deletes a savegame in the specified slot
+ */
 void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {	
 	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	g_system->getSavefileManager()->removeSavefile(filename);
 }
 
+/**
+ * Given a specified savegame slot, returns extended information for the save 
+ */
 SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(filename);
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index f7cbdd301e..a4fc93edd9 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -208,7 +208,6 @@ Common::KeyState Events::getKey() {
 	return keyState;
 }
 
-
 /**
  * Clear any current keypress or mouse click
  */
@@ -227,7 +226,6 @@ void Events::clearKeyboard() {
 	_pendingKeys.clear();
 }
 
-
 /**
  * Delay for a given number of game frames, where each frame is 1/60th of a second
  */
@@ -236,6 +234,9 @@ void Events::wait(int numFrames) {
 	delay(totalMilli);
 }
 
+/**
+ * Does a delay of the specified number of milliseconds
+ */
 bool Events::delay(uint32 time, bool interruptable) {
 	// Different handling for really short versus extended times
 	if (time < 10) {
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 6fd046e458..2095e7d35d 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -47,6 +47,10 @@ Surface::~Surface() {
 		free();
 }
 
+/**
+ * Sets up an internal surface with the specified dimensions that will be automatically freed
+ * when the surface object is destroyed
+ */
 void Surface::create(uint16 width, uint16 height) {
 	if (_freePixels)
 		free();
@@ -55,7 +59,6 @@ void Surface::create(uint16 width, uint16 height) {
 	_freePixels = true;
 }
 
-
 /**
  * Copy a surface into this one
  */
@@ -159,6 +162,9 @@ void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
 	fillRect(Common::Rect(x1, y1, x2, y2), color);
 }
 
+/**
+ * Fill a given area of the surface with a given color
+ */
 void Surface::fillRect(const Common::Rect &r, byte color) {
     Graphics::Surface::fillRect(r, color);
 	addDirtyRect(r);
@@ -196,5 +202,4 @@ bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
 	return true;
 }
 
-
 } // End of namespace Sherlock
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 798531ea14..935a306619 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -358,6 +358,9 @@ void Inventory::highlight(int index, byte color) {
 	screen.slamArea(8 + slot * 52, 165, 44, 30);
 }
 
+/**
+ * Support method for updating the screen
+ */
 void Inventory::doInvJF() {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 67cff15218..25b0bb5451 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -91,6 +91,9 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) {
 	}
 }
 
+/**
+ * Load the list of location names that the journal will make reference to
+ */
 void Journal::loadJournalLocations() {
 	Resources &res = *_vm->_res;
 	char c;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index ff8f6393db..fa5dfee26c 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -361,6 +361,9 @@ void Sprite::checkSprite() {
 
 /*----------------------------------------------------------------*/
 
+/**
+ * Synchronize the data for a savegame 
+ */
 void ActionType::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
 	
@@ -384,6 +387,9 @@ UseType::UseType() {
 	_lFlag[0] = _lFlag[1] = 0;
 }
 
+/**
+ * Synchronize the data for a savegame 
+ */
 void UseType::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
 
@@ -816,11 +822,11 @@ void Object::setObjSequence(int seq, bool wait) {
 }
 
 /**
-* Checks for codes
-* @param name		The name to check for codes
-* @param messages	Provides a lookup list of messages that can be printed
-* @returns		0 if no codes are found, 1 if codes were found
-*/
+ * Checks for codes
+ * @param name		The name to check for codes
+ * @param messages	Provides a lookup list of messages that can be printed
+ * @returns		0 if no codes are found, 1 if codes were found
+ */
 int Object::checkNameForCodes(const Common::String &name, const char *const messages[]) {
 	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
@@ -1090,6 +1096,9 @@ const Common::Rect Object::getOldBounds() const {
 
 /*----------------------------------------------------------------*/
 
+/**
+ * Synchronize the data for a savegame 
+ */
 void CAnim::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
 	s.read(buffer, 12);
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index ed6e0607bd..5c4014f1a2 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -217,6 +217,9 @@ People::~People() {
 	delete[] _portrait._sequences;
 }
 
+/**
+ * Reset the player data
+ */
 void People::reset() {
 	Sprite &p = _data[PLAYER];
 
@@ -239,6 +242,9 @@ void People::reset() {
 	p._status = 0;
 }
 
+/**
+ * Load the walking images for Sherlock
+ */
 bool People::loadWalk() {
 	if (_walkLoaded) {
 		return false;
@@ -267,10 +273,10 @@ bool People::freeWalk() {
 }
 
 /**
-* Set the variables for moving a character from one poisition to another
-* in a straight line - goAllTheWay must have been previously called to
-* check for any obstacles in the path.
-*/
+ * Set the variables for moving a character from one poisition to another
+ * in a straight line - goAllTheWay must have been previously called to
+ * check for any obstacles in the path.
+ */
 void People::setWalking() {
 	Map &map = *_vm->_map;
 	Scene &scene = *_vm->_scene;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 497a8d551c..c714574e08 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -559,7 +559,7 @@ void Scene::checkSceneFlags(bool flag) {
  */
 void Scene::checkInventory() {
 	for (uint shapeIdx = 0; shapeIdx < _bgShapes.size(); ++shapeIdx) {
-		for (uint invIdx = 0; invIdx < _vm->_inventory->_holdings; ++invIdx) {
+		for (int invIdx = 0; invIdx < _vm->_inventory->_holdings; ++invIdx) {
 			if (scumm_stricmp(_bgShapes[shapeIdx]._name.c_str(),
 				(*_vm->_inventory)[invIdx]._name.c_str()) == 0) {
 				_bgShapes[shapeIdx]._type = INVALID;
@@ -802,6 +802,9 @@ void Scene::updateBackground() {
 	screen.resetDisplayBounds();
 }
 
+/**
+ * Check whether the passed area intersects with one of the scene's exits
+ */
 Exit *Scene::checkForExit(const Common::Rect &r) {
 	for (uint idx = 0; idx < _exits.size(); ++idx) {
 		if (_exits[idx]._bounds.intersects(r))
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 01d3b9155a..97b23e7c8e 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -50,6 +50,9 @@ Screen::~Screen() {
 	delete _font;
 }
 
+/**
+ * Set the font to use for writing text on the screen
+ */
 void Screen::setFont(int fontNumber) {
 	_fontNumber = fontNumber;
 	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber + 1);
@@ -64,6 +67,9 @@ void Screen::setFont(int fontNumber) {
 		_fontHeight = MAX((uint16)_fontHeight, (*_font)[idx]._frame.h);
 }
 
+/**
+ * Handles updating any dirty areas of the screen Surface object to the physical screen
+ */
 void Screen::update() {
 	// Merge the dirty rects
 	mergeDirtyRects();
@@ -82,14 +88,23 @@ void Screen::update() {
 	_dirtyRects.clear();
 }
 
+/**
+ * Return the currently active palette
+ */
 void Screen::getPalette(byte palette[PALETTE_SIZE]) {
 	g_system->getPaletteManager()->grabPalette(palette, 0, PALETTE_COUNT);
 }
 
+/**
+ * Set the palette
+ */
 void Screen::setPalette(const byte palette[PALETTE_SIZE]) {
 	g_system->getPaletteManager()->setPalette(palette, 0, PALETTE_COUNT);
 }
 
+/**
+ * Fades from the currently active palette to the passed palette
+ */
 int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
 	int total = 0;
 	byte tempPalette[PALETTE_SIZE];
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 49230f22de..e3d137a3a3 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -69,6 +69,9 @@ SherlockEngine::~SherlockEngine() {
 	delete _res;
 }
 
+/**
+ * Does basic initialization of the game engine
+ */
 void SherlockEngine::initialize() {
 	initGraphics(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, false);
 
@@ -93,7 +96,11 @@ void SherlockEngine::initialize() {
 	_ui = new UserInterface(this);
 }
 
+/**
+ * Main method for running the game
+ */
 Common::Error SherlockEngine::run() {
+	// Initialize the engine
 	initialize();
 
 	// If requested, load a savegame instead of showing the intro
@@ -133,6 +140,9 @@ Common::Error SherlockEngine::run() {
 	return Common::kNoError;
 }
 
+/**
+ * Main loop for displaying a scene and handling all that occurs within it
+ */
 void SherlockEngine::sceneLoop() {
 	while (!shouldQuit() && _scene->_goToScene == -1) {
 		// See if a script needs to be completed from either a goto room code,
@@ -171,7 +181,6 @@ void SherlockEngine::handleInput() {
 	_ui->handleInput();
 }
 
-
 /**
  * Read the state of a global flag
  */
@@ -193,6 +202,9 @@ void SherlockEngine::setFlags(int flagNum) {
 	_scene->checkSceneFlags(true);
 }
 
+/**
+ * Saves game configuration information
+ */
 void SherlockEngine::saveConfig() {
 	// TODO
 }
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 603f47a446..d05c09ab38 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -100,6 +100,9 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_scriptCurrentIndex = -1;
 }
 
+/**
+ * Sets talk sequences
+ */
 void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, int maxPeople) {
 	for (int idx = 0; idx < maxPeople; ++idx) {
 		STILL_SEQUENCES.push_back(TalkSequences(stillSequences));
@@ -1726,6 +1729,9 @@ int Talk::waitForMore(int delay) {
 	return key2;
 }
 
+/**
+ * Pops an entry off of the script stack
+ */
 void Talk::popStack() {
 	if (!_scriptStack.empty()) {
 		ScriptStackEntry scriptEntry = _scriptStack.pop();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index e7e7981966..f60e63a574 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -188,6 +188,9 @@ void Settings::drawInteface(bool flag) {
 	}
 }
 
+/**
+ * Draws the buttons for the settings dialog
+ */
 int Settings::drawButtons(const Common::Point &pt, int _key) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -259,7 +262,6 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 	return found;
 }
 
-
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
@@ -298,6 +300,9 @@ UserInterface::~UserInterface() {
 	delete _controlPanel;
 }
 
+/**
+ * Resets the user interface
+ */
 void UserInterface::reset() {
 	_oldKey = -1;
 	_help = _oldHelp = -1;
@@ -1962,6 +1967,12 @@ void UserInterface::doTalkControl() {
 	}
 }
 
+/**
+ * Handles events when the Journal is active.
+ * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+ *		the user interface, it uses so many internal UI fields, that it sort of made some sense 
+ *		to put it in the UserInterface class.
+ */
 void UserInterface::journalControl() {
 	Events &events = *_vm->_events;
 	Journal &journal = *_vm->_journal;
@@ -2013,6 +2024,9 @@ void UserInterface::journalControl() {
 
 /**
  * Handles input when the settings window is being shown
+ * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+ *		the user interface, it uses so many internal UI fields, that it sort of made some sense
+ *		to put it in the UserInterface class.
  */
 void UserInterface::doControls() {
 	Events &events = *_vm->_events;
@@ -2702,5 +2716,4 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 	events.setCursor(ARROW);
 }
 
-
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From d9a42a80ffeb9eaee957bbc858f714e5cf362946 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 17:27:59 -1000
Subject: SHERLOCK: Fix some remaining TODOs

---
 engines/sherlock/scene.cpp          | 4 +---
 engines/sherlock/sound.cpp          | 6 ++++++
 engines/sherlock/sound.h            | 1 +
 engines/sherlock/user_interface.cpp | 1 -
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index c714574e08..e69fb49766 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1127,9 +1127,7 @@ void Scene::doBgAnim() {
 
 	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
 		// Loaded sound just finished playing
-		// TODO: This is horrible.. refactor into the Sound class
-		delete[] sound._digiBuf;
-		sound._diskSoundPlaying = false;
+		sound.freeDigiSound();
 	}
 
 	if (_restoreFlag) {
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 1a6472a9e9..a452efd890 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -99,4 +99,10 @@ void Sound::waitTimerRoland(uint time) {
 	// TODO
 }
 
+void Sound::freeDigiSound() {
+	delete[] _digiBuf;
+	_digiBuf = nullptr;
+	_diskSoundPlaying = false;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 28de692109..c85af2ac2a 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -67,6 +67,7 @@ public:
 	void stopMusic();
 	void stopSndFuncPtr(int v1, int v2);
 	void waitTimerRoland(uint time);
+	void freeDigiSound();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index f60e63a574..21a53c32ff 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2019,7 +2019,6 @@ void UserInterface::journalControl() {
 	screen._backBuffer1.blitFrom(screen._backBuffer2);
 	scene.updateBackground();
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	// TODO
 }
 
 /**
-- 
cgit v1.2.3


From 12d3976c380e00f22c6f7a930ff56c215a7bd9ab Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 18:21:13 -1000
Subject: SHERLOCK: Implement configuration settings save/load

---
 engines/sherlock/sherlock.cpp     | 42 ++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/sherlock.h       |  3 +++
 engines/sherlock/sound.cpp        | 22 ++++++++++++++++----
 engines/sherlock/sound.h          |  7 ++++---
 engines/sherlock/user_interface.h |  2 +-
 5 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index e3d137a3a3..3ab2caabc4 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -94,6 +94,9 @@ void SherlockEngine::initialize() {
 	_sound = new Sound(this);
 	_talk = new Talk(this);
 	_ui = new UserInterface(this);
+
+	// Load game settings
+	loadConfig();
 }
 
 /**
@@ -202,11 +205,48 @@ void SherlockEngine::setFlags(int flagNum) {
 	_scene->checkSceneFlags(true);
 }
 
+/**
+ * Load game configuration esttings
+ */
+void SherlockEngine::loadConfig() {
+	// Load sound settings
+	syncSoundSettings();
+
+	// Load other settings
+	if (ConfMan.hasKey("font"))
+		_screen->setFont(ConfMan.getInt("font"));
+	if (ConfMan.hasKey("help_style"))
+		_ui->_helpStyle = ConfMan.getInt("help_style");
+	if (ConfMan.hasKey("window_style"))
+		_ui->_windowStyle = ConfMan.getInt("window_style");
+	if (ConfMan.hasKey("portraits_on"))
+		_people->_portraitsOn = ConfMan.getBool("portraits_on");
+}
+
 /**
  * Saves game configuration information
  */
 void SherlockEngine::saveConfig() {
-	// TODO
+	ConfMan.setBool("mute", _sound->_digitized);
+	ConfMan.setBool("music_mute", _sound->_music);
+	ConfMan.setBool("speech_mute", _sound->_voices);
+
+	ConfMan.setInt("font", _screen->fontNumber());
+	ConfMan.setInt("help_style", _ui->_helpStyle);
+	ConfMan.setInt("window_style", _ui->_windowStyle);
+	ConfMan.setBool("portraits_on", _people->_portraitsOn);
+
+	ConfMan.flushToDisk();
+}
+
+/**
+ * Called by the engine when sound settings are updated
+ */
+void SherlockEngine::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
+	// Load sound-related settings
+	_sound->syncSoundSettings();
 }
 
 /**
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 3f0779421c..02e2e99229 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -74,6 +74,8 @@ private:
 	void sceneLoop();
 
 	void handleInput();
+
+	void loadConfig();
 protected:
 	virtual void initialize();
 
@@ -117,6 +119,7 @@ public:
 	virtual bool canSaveGameStateCurrently();
 	virtual Common::Error loadGameState(int slot);
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
+	virtual void syncSoundSettings();
 
 	int getGameType() const;
 	uint32 getGameID() const;
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index a452efd890..e66f82e5c4 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -21,20 +21,34 @@
  */
 
 #include "sherlock/sound.h"
+#include "common/config-manager.h"
 
 namespace Sherlock {
 
 Sound::Sound(SherlockEngine *vm): _vm(vm) {
+	_digitized = false;
+	_music = false;
+	_voices = 0;
 	_soundOn = false;
 	_musicOn = false;
 	_speechOn = false;
-	_voices = 0;
 	_playingEpilogue = false;
-	_music = false;
-	_digitized = false;
 	_diskSoundPlaying = false;
 	_soundIsOn = nullptr;
-	_digiBuf = nullptr;
+}
+
+/**
+ * Saves sound-related settings
+ */
+void Sound::syncSoundSettings() {
+	_digitized = !ConfMan.getBool("mute");
+	_music = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
+	_voices = !ConfMan.getBool("mute") && !ConfMan.getBool("speech_mute") ? 1 : 0;
+
+	// TODO: For now, keep sound completely mute until sound is implemented
+	_digitized = false;
+	_music = false;
+	_voices = 0;
 }
 
 void Sound::loadSound(const Common::String &name, int priority) {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index c85af2ac2a..3bd3a99f07 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -38,19 +38,20 @@ class Sound {
 private:
 	SherlockEngine *_vm;
 public:
+	bool _digitized;
+	bool _music;
+	int _voices;
 	bool _soundOn;
 	bool _musicOn;
 	bool _speechOn;
-	int _voices;
 	bool _playingEpilogue;
-	bool _music;
-	bool _digitized;
 	bool _diskSoundPlaying;
 	byte *_soundIsOn;
 	byte *_digiBuf;
 public:
 	Sound(SherlockEngine *vm);
 
+	void syncSoundSettings();
 	void loadSound(const Common::String &name, int priority);
 	bool playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
 	void cacheSound(const Common::String &name, int index);
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 99612b218b..ac2c16d7c2 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -85,7 +85,6 @@ private:
 	int _bgFound;
 	int _oldBgFound;
 	int _keycode;
-	int _helpStyle;
 	int _lookHelp;
 	int _help, _oldHelp;
 	int _key, _oldKey;
@@ -137,6 +136,7 @@ public:
 	int _invLookFlag;
 	int _temp1;
 	int _windowStyle;
+	int _helpStyle;
 public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
-- 
cgit v1.2.3


From 7d50c49f5942d2a2e6cfaf32ddc182bcff5c4327 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 18:22:25 -1000
Subject: SHERLOCK: Fix intro sequence crash

---
 engines/sherlock/screen.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 97b23e7c8e..d170772c98 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -35,7 +35,6 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 	_transitionSeed = 1;
 	_fadeStyle = false;
 	_font = nullptr;
-	_backBuffer = nullptr;
 	_fontHeight = 0;
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
-- 
cgit v1.2.3


From a2ef3e240225940308c54243589014c922c38274 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 18:29:42 -1000
Subject: SHERLOCK: Moved Settings dialog into it's own class

---
 engines/sherlock/module.mk          |   1 +
 engines/sherlock/settings.cpp       | 211 ++++++++++++++++++++++++++++++++++++
 engines/sherlock/settings.h         |  45 ++++++++
 engines/sherlock/user_interface.cpp | 186 +------------------------------
 engines/sherlock/user_interface.h   |  11 --
 5 files changed, 258 insertions(+), 196 deletions(-)
 create mode 100644 engines/sherlock/settings.cpp
 create mode 100644 engines/sherlock/settings.h

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 44ba63f1e2..9334ebfd9c 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -19,6 +19,7 @@ MODULE_OBJS = \
 	saveload.o \
 	scene.o \
 	screen.o \
+	settings.o \
 	sherlock.o \
 	sound.o \
 	talk.o \
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
new file mode 100644
index 0000000000..fb7730fc1d
--- /dev/null
+++ b/engines/sherlock/settings.cpp
@@ -0,0 +1,211 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sherlock.h"
+#include "sherlock/settings.h"
+
+namespace Sherlock {
+
+const int SETUP_POINTS[12][4]  = { 
+	{ 4, 154, 101, 53 },		// Exit
+	{ 4, 165, 101, 53 },		// Music Toggle
+	{ 219, 165, 316, 268 },		// Voice Toggle
+	{ 103, 165, 217, 160 },		// Sound Effects Toggle
+	{ 219, 154, 316, 268 },		// Help Button Left/Right
+	{ 103, 154, 217, 160 },		// New Font Style
+	{ 4, 187, 101, 53 },		// Joystick Toggle
+	{ 103, 187, 217, 160 },		// Calibrate Joystick
+	{ 219, 176, 316, 268 },		// Fade Style
+	{ 103, 176, 217, 160 },		// Window Open Style
+	{ 4, 176, 101, 53 }, 		// Portraits Toggle
+	{ 219, 187, 316, 268 }		// _key Pad Accel. Toggle
+};
+
+const char *const SETUP_STRS0[2] = { "off", "on" };
+const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
+const char *const SETUP_STRS2[2] = { "Left", "Right" };
+const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
+const char *const SETUP_STRS4[2] = { "Slow", "Fast" };
+const char *const SETUP_STRS5[2] = { "Left", "Right" };
+const char *const SETUP_NAMES[12] = {
+	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
+};
+
+/*----------------------------------------------------------------*/
+
+/**
+ * Draws the interface for the settings window
+ */
+void Settings::drawInteface(bool flag) {
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	Common::String tempStr;
+
+	if (!flag) {
+		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 1), BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1 + 1, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen._backBuffer1.hLine(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH - 1, BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH - 2,
+			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+	}
+
+	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
+		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
+
+	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10), 
+		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10), 
+		SETUP_POINTS[2][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10), 
+		SETUP_POINTS[3][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Auto Help %s", SETUP_STRS5[ui._helpStyle]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10), 
+		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), 
+		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
+
+	// WORKAROUND: We don't support the joystick in ScummVM, so draw the next two buttons as disabled
+	tempStr = "Joystick Off";
+	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), 
+		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[6][3], SETUP_POINTS[6][1]), COMMAND_NULL, false, tempStr);
+
+	tempStr = "Calibrate Joystick";
+	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), 
+		SETUP_POINTS[7][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[7][3], SETUP_POINTS[7][1]), COMMAND_NULL, false, tempStr);
+
+	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
+	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10), 
+		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	
+	tempStr = Common::String::format("Windows %s", ui._windowStyle ? "Slide" : "Appear");
+	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10), 
+		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
+		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
+
+	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
+		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	// Show the window immediately, or slide it on-screen 
+	if (!flag) {
+		if (!ui._windowStyle) {
+			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		} else {
+			ui.summonWindow(true, CONTROLS_Y1);
+		}
+
+		ui._windowOpen = true;
+	} else {
+		screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	}
+}
+
+/**
+ * Draws the buttons for the settings dialog
+ */
+int Settings::drawButtons(const Common::Point &pt, int _key) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	int found = -1;
+	byte color;
+	Common::String tempStr;
+
+	for (int idx = 0; idx < 12; ++idx) {
+		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
+				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released)) 
+				|| (_key == SETUP_NAMES[idx][0])) {
+			found = idx;
+			color = COMMAND_HIGHLIGHTED;
+		} else {
+			color = COMMAND_FOREGROUND;
+		}
+
+		// Print the button text
+		switch (idx) {
+		case 1: 
+			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 2: 
+			tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 3: 
+			tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 4: 
+			tempStr = Common::String::format("Auto Help %s", SETUP_STRS2[ui._helpStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 6: 
+			tempStr = "Joystick Off";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
+			break;
+		case 7:
+			tempStr = "Calibrate Joystick";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
+			break;
+		case 8: 
+			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 9: 
+			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._windowStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 10: 
+			tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 11: 
+			tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		default: 
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
+			break;
+		}
+	}
+
+	return found;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/settings.h b/engines/sherlock/settings.h
new file mode 100644
index 0000000000..51157f4cae
--- /dev/null
+++ b/engines/sherlock/settings.h
@@ -0,0 +1,45 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SETTINGS_H
+#define SHERLOCK_SETTINGS_H
+
+#include "common/scummsys.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+class Settings {
+private:
+	SherlockEngine *_vm;
+public:
+	Settings(SherlockEngine *vm) : _vm(vm) {}
+
+	void drawInteface(bool flag);
+
+	int drawButtons(const Common::Point &pt, int key);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 21a53c32ff..313f035bd5 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/user_interface.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/settings.h"
 
 namespace Sherlock {
 
@@ -53,23 +54,6 @@ const int INVENTORY_POINTS[8][3] = {
 	{ 285, 315, 294 } 
 };
 
-const int SETUP_POINTS[12][4]  = { 
-	{ 4, 154, 101, 53 },		// Exit
-	{ 4, 165, 101, 53 },		// Music Toggle
-	{ 219, 165, 316, 268 },		// Voice Toggle
-	{ 103, 165, 217, 160 },		// Sound Effects Toggle
-	{ 219, 154, 316, 268 },		// Help Button Left/Right
-	{ 103, 154, 217, 160 },		// New Font Style
-	{ 4, 187, 101, 53 },		// Joystick Toggle
-	{ 103, 187, 217, 160 },		// Calibrate Joystick
-	{ 219, 176, 316, 268 },		// Fade Style
-	{ 103, 176, 217, 160 },		// Window Open Style
-	{ 4, 176, 101, 53 }, 		// Portraits Toggle
-	{ 219, 187, 316, 268 }		// _key Pad Accel. Toggle
-};
-
-
-
 const char COMMANDS[13] = "LMTPOCIUGJFS";
 const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
 const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
@@ -94,174 +78,6 @@ const char *const MUSE[] = {
 	"Doors don't smoke" 
 };
 
-const char *const SETUP_STRS0[2] = { "off", "on" };
-const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
-const char *const SETUP_STRS2[2] = { "Left", "Right" };
-const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
-const char *const SETUP_STRS4[2] = { "Slow", "Fast" };
-const char *const SETUP_STRS5[2] = { "Left", "Right" };
-const char *const SETUP_NAMES[12] = {
-	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
-};
-
-/*----------------------------------------------------------------*/
-
-/**
- * Draws the interface for the settings window
- */
-void Settings::drawInteface(bool flag) {
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
-	UserInterface &ui = *_vm->_ui;
-	Common::String tempStr;
-
-	if (!flag) {
-		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 1), BORDER_COLOR);
-		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1 + 1, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-		screen._backBuffer1.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH,
-			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-		screen._backBuffer1.hLine(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH - 1, BORDER_COLOR);
-		screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH - 2,
-			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
-	}
-
-	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
-		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
-
-	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10), 
-		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10), 
-		SETUP_POINTS[2][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10), 
-		SETUP_POINTS[3][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Auto Help %s", SETUP_STRS5[ui._helpStyle]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10), 
-		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), 
-		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
-
-	// WORKAROUND: We don't support the joystick in ScummVM, so draw the next two buttons as disabled
-	tempStr = "Joystick Off";
-	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), 
-		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.buttonPrint(Common::Point(SETUP_POINTS[6][3], SETUP_POINTS[6][1]), COMMAND_NULL, false, tempStr);
-
-	tempStr = "Calibrate Joystick";
-	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), 
-		SETUP_POINTS[7][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.buttonPrint(Common::Point(SETUP_POINTS[7][3], SETUP_POINTS[7][1]), COMMAND_NULL, false, tempStr);
-
-	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
-	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10), 
-		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	
-	tempStr = Common::String::format("Windows %s", ui._windowStyle ? "Slide" : "Appear");
-	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10), 
-		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
-		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
-
-	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
-		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	// Show the window immediately, or slide it on-screen 
-	if (!flag) {
-		if (!ui._windowStyle) {
-			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-		} else {
-			ui.summonWindow(true, CONTROLS_Y1);
-		}
-
-		ui._windowOpen = true;
-	} else {
-		screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-	}
-}
-
-/**
- * Draws the buttons for the settings dialog
- */
-int Settings::drawButtons(const Common::Point &pt, int _key) {
-	Events &events = *_vm->_events;
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
-	UserInterface &ui = *_vm->_ui;
-	int found = -1;
-	byte color;
-	Common::String tempStr;
-
-	for (int idx = 0; idx < 12; ++idx) {
-		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
-				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released)) 
-				|| (_key == SETUP_NAMES[idx][0])) {
-			found = idx;
-			color = COMMAND_HIGHLIGHTED;
-		} else {
-			color = COMMAND_FOREGROUND;
-		}
-
-		// Print the button text
-		switch (idx) {
-		case 1: 
-			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 2: 
-			tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 3: 
-			tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 4: 
-			tempStr = Common::String::format("Auto Help %s", SETUP_STRS2[ui._helpStyle]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 6: 
-			tempStr = "Joystick Off";
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
-			break;
-		case 7:
-			tempStr = "Calibrate Joystick";
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
-			break;
-		case 8: 
-			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 9: 
-			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._windowStyle]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 10: 
-			tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 11: 
-			tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		default: 
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
-			break;
-		}
-	}
-
-	return found;
-}
-
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index ac2c16d7c2..4e8753199b 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -63,17 +63,6 @@ class Inventory;
 class Talk;
 class UserInterface;
 
-class Settings {
-private:
-	SherlockEngine *_vm;
-public:
-	Settings(SherlockEngine *vm) : _vm(vm) {}
-
-	void drawInteface(bool flag);
-
-	int drawButtons(const Common::Point &pt, int key);
-};
-
 class UserInterface {
 	friend class Inventory;
 	friend class Settings;
-- 
cgit v1.2.3


From 86dab70eae4791b84ca3891cad7db70a9683679a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 18:34:51 -1000
Subject: SHERLOCK: Remove unused key pad speed field

---
 engines/sherlock/settings.cpp       | 7 ++++---
 engines/sherlock/sherlock.cpp       | 1 -
 engines/sherlock/sherlock.h         | 1 -
 engines/sherlock/user_interface.cpp | 7 -------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index fb7730fc1d..769c2c82e3 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -115,10 +115,11 @@ void Settings::drawInteface(bool flag) {
 	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
 	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
 		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
 
+	tempStr = "Key Pad Slow";
 	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
 		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[11][3], SETUP_POINTS[11][1]), COMMAND_NULL, false, tempStr);
 
 	// Show the window immediately, or slide it on-screen 
 	if (!flag) {
@@ -196,8 +197,8 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 11: 
-			tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			tempStr = "Key Pad Slow";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
 			break;
 		default: 
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 3ab2caabc4..0282d3e5f0 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -47,7 +47,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_ui = nullptr;
 	_useEpilogue2 = false;
 	_loadingSavedGame = false;
-	_keyPadSpeed = 0;
 	_loadGameSlot = -1;
 	_canLoadSave = false;
 }
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 02e2e99229..dfaaa70806 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -106,7 +106,6 @@ public:
 	Common::String _titleOverride;
 	bool _useEpilogue2;
 	bool _loadingSavedGame;
-	int _keyPadSpeed;
 	int _loadGameSlot;
 	bool _canLoadSave;
 public:
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 313f035bd5..cab0fb0ad8 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1968,13 +1968,6 @@ void UserInterface::doControls() {
 			updateConfig = true;
 			settings.drawInteface(true);
 		}
-
-		if ((found == 11 && events._released) || _key == 'K') {
-			// Toggle keypad acceleration speed
-			_vm->_keyPadSpeed ^= 1;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
 	} while (!_vm->shouldQuit());
 
 	banishWindow();
-- 
cgit v1.2.3


From 850bd739687129542c37db0beebd17369c71ed15 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 18:47:13 -1000
Subject: SHERLOCK: Move Settings dialog event handling into Settings class

---
 engines/sherlock/settings.cpp       | 138 ++++++++++++++++++++++++++++++++++
 engines/sherlock/settings.h         |   5 +-
 engines/sherlock/sherlock.cpp       |   3 +
 engines/sherlock/user_interface.cpp | 146 +-----------------------------------
 engines/sherlock/user_interface.h   |   2 -
 5 files changed, 146 insertions(+), 148 deletions(-)

diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index 769c2c82e3..aeeb92d3c1 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -209,4 +209,142 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 	return found;
 }
 
+
+/**
+* Handles input when the settings window is being shown
+* @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+*		the user interface, it uses so many internal UI fields, that it sort of made some sense
+*		to put it in the UserInterface class.
+*/
+void Settings::show(SherlockEngine *vm) {
+	Events &events = *vm->_events;
+	People &people = *vm->_people;
+	Scene &scene = *vm->_scene;
+	Screen &screen = *vm->_screen;
+	Sound &sound = *vm->_sound;
+	Talk &talk = *vm->_talk;
+	UserInterface &ui = *vm->_ui;
+	int found;
+	bool updateConfig = false;
+
+	Settings settings(vm);
+	settings.drawInteface(false);
+
+	do {
+		if (ui._menuCounter)
+			ui.whileMenuCounter();
+
+		found = -1;
+		ui._key = -1;
+
+		scene.doBgAnim();
+		if (talk._talkToAbort)
+			return;
+
+		events.setButtonState();
+		Common::Point pt = events.mousePos();
+
+		if (events._pressed || events._released || events.kbHit()) {
+			ui.clearInfo();
+			ui._key = -1;
+
+			if (events.kbHit()) {
+				Common::KeyState keyState = events.getKey();
+				ui._key = toupper(keyState.keycode);
+
+				if (ui._key == Common::KEYCODE_RETURN || ui._key == Common::KEYCODE_SPACE) {
+					events._pressed = false;
+					events._oldButtons = 0;
+					ui._keycode = Common::KEYCODE_INVALID;
+					events._released = true;
+				}
+			}
+
+			// Handle highlighting button under mouse
+			found = settings.drawButtons(pt, ui._key);
+		}
+
+		if ((found == 0 && events._released) || (ui._key == 'E' || ui._key == Common::KEYCODE_ESCAPE))
+			// Exit
+			break;
+
+		if ((found == 1 && events._released) || ui._key == 'M') {
+			// Toggle music
+			if (sound._music) {
+				sound.stopSound();
+				sound._music = false;
+			}
+			else {
+				sound._music = true;
+				sound.startSong();
+			}
+
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 2 && events._released) || ui._key == 'V') {
+			sound._voices = !sound._voices;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 3 && events._released) || ui._key == 'S') {
+			// Toggle sound effects
+			sound._digitized = !sound._digitized;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 4 && events._released) || ui._key == 'A') {
+			// Help button style
+			ui._helpStyle ^= 1;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 5 && events._released) || ui._key == 'N') {
+			// New font style
+			int fontNum = screen.fontNumber() + 1;
+			if (fontNum == 3)
+				fontNum = 0;
+
+			screen.setFont(fontNum);
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 8 && events._released) || ui._key == 'F') {
+			// Toggle fade style
+			screen._fadeStyle = !screen._fadeStyle;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 9 && events._released) || ui._key == 'W') {
+			// Window style
+			ui._windowStyle ^= 1;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 10 && events._released) || ui._key == 'P') {
+			// Toggle portraits being shown
+			people._portraitsOn = !people._portraitsOn;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+	} while (!vm->shouldQuit());
+
+	ui.banishWindow();
+
+	if (updateConfig)
+		vm->saveConfig();
+
+	ui._keycode = Common::KEYCODE_INVALID;
+	ui._keyboardInput = false;
+	ui._windowBounds.top = CONTROLS_Y1;
+	ui._key = -1;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/settings.h b/engines/sherlock/settings.h
index 51157f4cae..90928452c4 100644
--- a/engines/sherlock/settings.h
+++ b/engines/sherlock/settings.h
@@ -28,16 +28,19 @@
 namespace Sherlock {
 
 class SherlockEngine;
+class UserInterface;
 
 class Settings {
 private:
 	SherlockEngine *_vm;
-public:
+
 	Settings(SherlockEngine *vm) : _vm(vm) {}
 
 	void drawInteface(bool flag);
 
 	int drawButtons(const Common::Point &pt, int key);
+public:
+	static void show(SherlockEngine *vm);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 0282d3e5f0..f546e0d878 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -214,6 +214,8 @@ void SherlockEngine::loadConfig() {
 	// Load other settings
 	if (ConfMan.hasKey("font"))
 		_screen->setFont(ConfMan.getInt("font"));
+	if (ConfMan.hasKey("fade_style"))
+		_screen->_fadeStyle = ConfMan.getBool("fade_style");
 	if (ConfMan.hasKey("help_style"))
 		_ui->_helpStyle = ConfMan.getInt("help_style");
 	if (ConfMan.hasKey("window_style"))
@@ -231,6 +233,7 @@ void SherlockEngine::saveConfig() {
 	ConfMan.setBool("speech_mute", _sound->_voices);
 
 	ConfMan.setInt("font", _screen->fontNumber());
+	ConfMan.setBool("fade_style", _screen->_fadeStyle);
 	ConfMan.setInt("help_style", _ui->_helpStyle);
 	ConfMan.setInt("window_style", _ui->_windowStyle);
 	ConfMan.setBool("portraits_on", _people->_portraitsOn);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index cab0fb0ad8..73058e8fd8 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1440,7 +1440,7 @@ void UserInterface::doMainControl() {
 		case 'S':
 			pushButton(11);
 			_menuMode = SETUP_MODE;
-			doControls();
+			Settings::show(_vm);
 			break;
 		default:
 			break;
@@ -1837,150 +1837,6 @@ void UserInterface::journalControl() {
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
-/**
- * Handles input when the settings window is being shown
- * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
- *		the user interface, it uses so many internal UI fields, that it sort of made some sense
- *		to put it in the UserInterface class.
- */
-void UserInterface::doControls() {
-	Events &events = *_vm->_events;
-	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
-	Talk &talk = *_vm->_talk;
-	UserInterface &ui = *_vm->_ui;
-	int found;
-	bool updateConfig = false;
-
-	Settings settings(_vm);
-	settings.drawInteface(false);
-
-	do {
-		if (_menuCounter)
-			whileMenuCounter();
-
-		found = -1;
-		_key = -1;
-
-		scene.doBgAnim();
-		if (talk._talkToAbort)
-			return;
-
-		events.setButtonState();
-		Common::Point pt = events.mousePos();
-
-		if (events._pressed || events._released || events.kbHit()) {
-			clearInfo();
-			_key = -1;
-
-			if (events.kbHit()) {
-				Common::KeyState keyState = events.getKey();
-				_key = toupper(keyState.keycode);
-
-				if (_key == Common::KEYCODE_RETURN || _key == Common::KEYCODE_SPACE) {
-					events._pressed = false;
-					events._oldButtons = 0;
-					_keycode = Common::KEYCODE_INVALID;
-					events._released = true;
-				}
-			}
-
-			// Handle highlighting button under mouse
-			found = settings.drawButtons(pt, _key);
-		}
-
-		if ((found == 0 && events._released) || (_key == 'E' || _key == Common::KEYCODE_ESCAPE))
-			// Exit
-			break;
-
-		if ((found == 1 && events._released) || _key == 'M') {
-			// Toggle music
-			if (sound._music) {
-				sound.stopSound();
-				sound._music = false;
-			} else {
-				sound._music = true;
-				sound.startSong();
-			}
-
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 2 && events._released) || _key == 'V') {
-			sound._voices = !sound._voices;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 3 && events._released) || _key == 'S') {
-			// Toggle sound effects
-			sound._digitized = !sound._digitized;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 4 && events._released) || _key == 'A') {
-			// Help button style
-			ui._helpStyle ^= 1;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 5 && events._released) || _key == 'N') {
-			// New font style
-			int fontNum = screen.fontNumber() + 1;
-			if (fontNum == 3)
-				fontNum = 0;
-
-			screen.setFont(fontNum);
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 6 && events._released) || _key == 'J') {
-			// Toggle joystick - not implemented under ScummVM
-		}
-
-		if ((found == 7 && events._released) || _key == 'C') {
-			// Calibrate joystick - No implementation in ScummVM
-		}
-
-		if ((found == 8 && events._released) || _key == 'F') {
-			// Toggle fade style
-			screen._fadeStyle = !screen._fadeStyle;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 9 && events._released) || _key == 'W') {
-			// Window style
-			ui._windowStyle ^= 1;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 10 && events._released) || _key == 'P') {
-			// Toggle portraits being shown
-			people._portraitsOn = !people._portraitsOn;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-	} while (!_vm->shouldQuit());
-
-	banishWindow();
-	
-	if (updateConfig)
-		_vm->saveConfig();
-	
-	_keycode = Common::KEYCODE_INVALID;
-	_keyboardInput = false;
-	_windowBounds.top = CONTROLS_Y1;
-	_key = -1;
-}
-
 /**
 * Print the description of an object
 */
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 4e8753199b..89a33801dd 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -111,8 +111,6 @@ private:
 	void doTalkControl();
 	void journalControl();
 
-	void doControls();
-
 	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
 		int objNum, int giveMode);
 	void checkAction(ActionType &action, const char *const messages[], int objNum);
-- 
cgit v1.2.3


From 7cf9fcd44e58a5a4b1988bb5ca6ec6862170c3d8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 19:13:53 -1000
Subject: SHERLOCK: Change _helpStyle from int to bool

---
 engines/sherlock/settings.cpp       | 2 +-
 engines/sherlock/sherlock.cpp       | 4 ++--
 engines/sherlock/user_interface.cpp | 2 +-
 engines/sherlock/user_interface.h   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index aeeb92d3c1..1673eca389 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -298,7 +298,7 @@ void Settings::show(SherlockEngine *vm) {
 
 		if ((found == 4 && events._released) || ui._key == 'A') {
 			// Help button style
-			ui._helpStyle ^= 1;
+			ui._helpStyle = !ui._helpStyle;
 			updateConfig = true;
 			settings.drawInteface(true);
 		}
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index f546e0d878..c33ecb6d49 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -217,7 +217,7 @@ void SherlockEngine::loadConfig() {
 	if (ConfMan.hasKey("fade_style"))
 		_screen->_fadeStyle = ConfMan.getBool("fade_style");
 	if (ConfMan.hasKey("help_style"))
-		_ui->_helpStyle = ConfMan.getInt("help_style");
+		_ui->_helpStyle = ConfMan.getBool("help_style");
 	if (ConfMan.hasKey("window_style"))
 		_ui->_windowStyle = ConfMan.getInt("window_style");
 	if (ConfMan.hasKey("portraits_on"))
@@ -234,7 +234,7 @@ void SherlockEngine::saveConfig() {
 
 	ConfMan.setInt("font", _screen->fontNumber());
 	ConfMan.setBool("fade_style", _screen->_fadeStyle);
-	ConfMan.setInt("help_style", _ui->_helpStyle);
+	ConfMan.setBool("help_style", _ui->_helpStyle);
 	ConfMan.setInt("window_style", _ui->_windowStyle);
 	ConfMan.setBool("portraits_on", _people->_portraitsOn);
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 73058e8fd8..d75e0770b9 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -86,7 +86,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_bgFound = 0;
 	_oldBgFound = -1;
 	_keycode = Common::KEYCODE_INVALID;
-	_helpStyle = 0;
+	_helpStyle = false;
 	_menuCounter = 0;
 	_menuMode = STD_MODE;
 	_help = _oldHelp = 0;
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 89a33801dd..a0b854af36 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -123,7 +123,7 @@ public:
 	int _invLookFlag;
 	int _temp1;
 	int _windowStyle;
-	int _helpStyle;
+	bool _helpStyle;
 public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
-- 
cgit v1.2.3


From 8fab80ce4750ad65b6e289614034478cebdf7854 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 20:31:43 -1000
Subject: SHERLOCK: Tweak doBgAnim delays to better match original game

---
 engines/sherlock/scene.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e69fb49766..ab57e9cfd2 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1387,9 +1387,9 @@ void Scene::doBgAnim() {
 	}
 
 	_restoreFlag = true;
-
-	events.wait(1);
 	_doBgAnimDone = true;
+
+	events.wait(3);
 	screen.resetDisplayBounds();
 
 	// Check if the method was called for calling a portrait, and a talk was
-- 
cgit v1.2.3


From 90b35d2381488daa4cf54101ebd8f4b9e8ca0083 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 1 May 2015 20:33:56 -1000
Subject: SHERLOCK: Allow fast quitting when randomTransition in progress

---
 engines/sherlock/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index d170772c98..1f56261150 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -216,7 +216,7 @@ void Screen::randomTransition() {
 	const int TRANSITION_MULTIPLIER = 0x15a4e35;
 	_dirtyRects.clear();
 
-	for (int idx = 0; idx <= 65535; ++idx) {
+	for (int idx = 0; idx <= 65535 && !_vm->shouldQuit(); ++idx) {
 		_transitionSeed = _transitionSeed * TRANSITION_MULTIPLIER + 1;
 		int offset = _transitionSeed & 65535;
 
-- 
cgit v1.2.3


From cd2ead0a78d2f78cd0b4aecddf4e54520483855f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 2 May 2015 21:41:19 +0200
Subject: SCI: lsl5 script patch to fix game breaking bug

fixes green card phone number also calling limo
at the same time bug for the English PC 1.000
release.
---
 engines/sci/engine/script_patches.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 173641f7ee..4011273ca3 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1425,6 +1425,37 @@ static const SciScriptPatcherEntry larry2Signatures[] = {
 
 // ===========================================================================
 // Leisure Suit Larry 5
+// In Miami the player can call the green card telephone number and get
+//  green card including limo at the same time in the English 1.000 PC release.
+// This results later in a broken game in case the player doesn't read
+//  the second telephone number for the actual limousine service, because
+//  in that case it's impossible for the player to get back to the airport.
+//
+// We disable the code, that is responsible to make the limo arrive.
+//
+// This bug was fixed in the European (dual language) versions of the game.
+//
+// Applies to at least: English PC floppy (1.000)
+// Responsible method: sPhone::changeState(40)
+static const uint16 larry5SignatureGreenCardLimoBug[] = {
+	0x7a,                               // push2
+	SIG_MAGICDWORD,
+	0x39, 0x07,                         // pushi 07
+	0x39, 0x0c,                         // pushi 0Ch
+	0x45, 0x0a, 0x04,                   // call export 10 of script 0
+	0x78,                               // push1
+	0x39, 0x26,                         // pushi 26h (limo arrived flag)
+	0x45, 0x07, 0x02,                   // call export 7 of script 0 (sets flag)
+	SIG_END
+};
+
+static const uint16 larry5PatchGreenCardLimoBug[] = {
+	PATCH_ADDTOOFFSET(+8),
+	0x34, PATCH_UINT16(0),              // ldi 0000 (dummy)
+	0x34, PATCH_UINT16(0),              // ldi 0000 (dummy)
+	PATCH_END
+};
+
 // In one of the conversations near the end (to be exact - room 380 and the text
 //  about using champagne on Reverse Biaz - only used when you actually did that
 //  in the game), the German text is too large, causing the textbox to get too large.
@@ -1448,6 +1479,7 @@ static const uint16 larry5PatchGermanEndingPattiTalker[] = {
 
 //          script, description,                                      signature                               patch
 static const SciScriptPatcherEntry larry5Signatures[] = {
+	{  true,   280, "English-only: fix green card limo bug",       1, larry5SignatureGreenCardLimoBug,        larry5PatchGreenCardLimoBug },
 	{  true,   380, "German-only: Enlarge Patti Textbox",          1, larry5SignatureGermanEndingPattiTalker, larry5PatchGermanEndingPattiTalker },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
-- 
cgit v1.2.3


From dceff029220aff2efcb7a533d2403c90b5651870 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 May 2015 13:53:20 -1000
Subject: SHERLOCK: Fix trying to enter theatre without talking to Lestrade

---
 engines/sherlock/user_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index d75e0770b9..93dd03316d 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1469,7 +1469,7 @@ void UserInterface::doMiscControl(int allowed) {
 				switch (allowed) {
 				case ALLOW_OPEN:
 					checkAction(obj._aOpen, MOPEN, _temp);
-					if (_menuMode && !talk._talkToAbort) {
+					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
 						_menuMode = STD_MODE;
 						restoreButton(OPEN_MODE - 1);
 						_key = _oldKey = -1;
-- 
cgit v1.2.3


From eb4757d6e31171bde9b03fa44c20ab490639b5c0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 May 2015 14:34:49 -1000
Subject: SHERLOCK: Fix original game bug when testing powdery substance

---
 engines/sherlock/talk.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index d05c09ab38..9af8a29c1e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -433,6 +433,12 @@ void Talk::talkTo(const Common::String &filename) {
 	// previous script can continue
 	popStack();
 
+	if (_vm->getGameID() == GType_SerratedScalpel && filename == "Tube59c") {
+		// WORKAROUND: Original game bug causes the results of testing the powdery substance
+		// to disappear too quickly. Introduce a delay to allow it to be properly displayed
+		ui._menuCounter = 30;
+	}
+
 	events.setCursor(ARROW);
 }
 
-- 
cgit v1.2.3


From 9ff445497fe53b72193dcf944b54091080c90964 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 May 2015 16:29:08 -1000
Subject: SHERLOCK: Properly close door when entering Sarah's flat

---
 engines/sherlock/objects.cpp | 2 +-
 engines/sherlock/scene.cpp   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index fa5dfee26c..6f4795de7e 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -728,7 +728,7 @@ bool Object::checkEndOfSequence() {
 					// Save details before shape is removed
 					_delta.x = _imageFrame->_frame.w;
 					_delta.y = _imageFrame->_frame.h;
-					_position = _imageFrame->_offset;
+					_position += _imageFrame->_offset;
 
 					// Free the images
 					delete _images;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index ab57e9cfd2..2c5859024c 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -931,7 +931,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	cObj._frameNumber = -1;
 	cObj._sequenceNumber = cAnimNum;
 	cObj._oldPosition = Common::Point(0, 0);
-	cObj._oldPosition = Common::Point(0, 0);
+	cObj._oldSize = Common::Point(0, 0);
 	cObj._goto = Common::Point(0, 0);
 	cObj._status = 0;
 	cObj._misc = 0;
@@ -1050,6 +1050,10 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	cObj.checkObject();
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (&_canimShapes[idx] == &cObj) {
+			// Do a final call to doBgAnim to erase the anim shape before it's erased
+			doBgAnim();
+
+			// Remove the completed sprite from the animation shapes array
 			_canimShapes.remove_at(idx);
 			break;
 		}
@@ -1372,7 +1376,7 @@ void Scene::doBgAnim() {
 			}
 		}
 
-		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
+		for (uint idx = 0; idx <  _canimShapes.size(); ++idx) {
 			Object &o = _canimShapes[idx];
 			if (o._type == REMOVE) {
 				if (_goToScene == -1)
-- 
cgit v1.2.3


From f97e550d8631bc1821da1c126ae545db15769c9c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 May 2015 17:48:07 -1000
Subject: SHERLOCK: Don't mark leaving scene as visited during savegame loads

---
 engines/sherlock/saveload.cpp |  1 -
 engines/sherlock/scene.cpp    | 11 +++++++----
 engines/sherlock/scene.h      |  1 +
 engines/sherlock/sherlock.cpp |  2 --
 engines/sherlock/sherlock.h   |  1 -
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 86a4e8417a..71e21618ae 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -388,7 +388,6 @@ void SaveManager::synchronize(Common::Serializer &s) {
 	if (screen.fontNumber() != oldFont)
 		journal.resetPosition();
 
-	_vm->_loadingSavedGame = true;
 	_justLoaded = true;
 }
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 2c5859024c..e3c1799d66 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -88,6 +88,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 		Common::fill(&_sceneStats[idx][0], &_sceneStats[idx][65], false);
 	_currentScene = -1;
 	_goToScene = -1;
+	_loadingSavedGame = false;
 	_changes = false;
 	_keyboardInput = 0;
 	_walkedInScene = false;
@@ -162,10 +163,10 @@ void Scene::freeScene() {
 	_vm->_sound->freeSong();
 	_vm->_sound->freeLoadedSounds();
 
-	if (!_vm->_loadingSavedGame)
+	if (!_loadingSavedGame)
 		saveSceneStatus();
 	else
-		_vm->_loadingSavedGame = false;
+		_loadingSavedGame = false;
 
 	_sequenceBuffer.clear();
 	_descText.clear();
@@ -1494,10 +1495,12 @@ void Scene::synchronize(Common::Serializer &s) {
 	if (s.isSaving())
 		saveSceneStatus();
 
-	if (s.isSaving())
+	if (s.isSaving()) {
 		s.syncAsSint16LE(_currentScene);
-	else
+	} else {
 		s.syncAsSint16LE(_goToScene);
+		_loadingSavedGame = true;
+	}
 
 	for (int sceneNum = 0; sceneNum < SCENES_COUNT; ++sceneNum) {
 		for (int flag = 0; flag < 65; ++flag) {
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 4fb7ac228a..7ee7db1119 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -89,6 +89,7 @@ private:
 	Common::String _rrmName;
 	int _selector;
 	bool _lookHelp;
+	bool _loadingSavedGame;
 
 	bool loadScene(const Common::String &filename);
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index c33ecb6d49..b8948f99d8 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -46,7 +46,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_talk = nullptr;
 	_ui = nullptr;
 	_useEpilogue2 = false;
-	_loadingSavedGame = false;
 	_loadGameSlot = -1;
 	_canLoadSave = false;
 }
@@ -164,7 +163,6 @@ void SherlockEngine::sceneLoop() {
 		}
 	}
 
-	_scene->freeScene();
 	_people->freeWalk();
 
 }
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index dfaaa70806..95fe514e0c 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -105,7 +105,6 @@ public:
 	Common::String _soundOverride;
 	Common::String _titleOverride;
 	bool _useEpilogue2;
-	bool _loadingSavedGame;
 	int _loadGameSlot;
 	bool _canLoadSave;
 public:
-- 
cgit v1.2.3


From 0a2c50deb5c61500410a91556ed5e3ceb0cc9742 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 May 2015 18:15:24 -1000
Subject: SHERLOCK: Revised door close fix due to new bug when entering morgue

---
 engines/sherlock/scene.cpp | 31 +++++++++++++++++--------------
 engines/sherlock/scene.h   |  7 ++++++-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e3c1799d66..6e7f628616 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -83,6 +83,17 @@ void SceneSound::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
+int ObjectArray::indexOf(const Object &obj) const {
+	for (uint idx = 0; idx < size(); ++idx) {
+		if (&(*this)[idx] == &obj)
+			return idx;
+	}
+
+	return -1;
+}
+
+/*----------------------------------------------------------------*/
+
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_sceneStats[idx][0], &_sceneStats[idx][65], false);
@@ -1047,18 +1058,9 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	if (cObj._frameNumber <= 26)
 		gotoCode = cObj._sequences[cObj._frameNumber + 3];
 
-	// Set canim to REMOVE type and free memory
-	cObj.checkObject();
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		if (&_canimShapes[idx] == &cObj) {
-			// Do a final call to doBgAnim to erase the anim shape before it's erased
-			doBgAnim();
-
-			// Remove the completed sprite from the animation shapes array
-			_canimShapes.remove_at(idx);
-			break;
-		}
-	}
+	// Unless anim shape has already been freed, set it to REMOVE so doBgAnim can free it
+	if (_canimShapes.indexOf(cObj) != -1)
+		cObj.checkObject();
 
 	if (gotoCode > 0 && !talk._talkToAbort) {
 		_goToScene = gotoCode;
@@ -1377,13 +1379,14 @@ void Scene::doBgAnim() {
 			}
 		}
 
-		for (uint idx = 0; idx <  _canimShapes.size(); ++idx) {
+		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
 			Object &o = _canimShapes[idx];
 			if (o._type == REMOVE) {
 				if (_goToScene == -1)
 					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
 
-				_canimShapes[idx]._type = INVALID;
+				// Shape for an animation is no longer needed, so remove it completely
+				_canimShapes.remove_at(idx);
 			} else if (o._type == ACTIVE_BG_SHAPE) {
 				screen.flushImage(o._imageFrame, o._position,
 					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 7ee7db1119..c2cca8bad2 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -83,6 +83,11 @@ struct SceneSound {
 	void synchronize(Common::SeekableReadStream &s);
 };
 
+class ObjectArray: public Common::Array<Object> {
+public:
+	int indexOf(const Object &obj) const;
+};
+
 class Scene {
 private:
 	SherlockEngine *_vm;
@@ -127,7 +132,7 @@ public:
 	Common::Array<Exit> _exits;
 	SceneEntry _entrance;
 	Common::Array<SceneSound> _sounds;
-	Common::Array<Object> _canimShapes;
+	ObjectArray _canimShapes;
 	bool _restoreFlag;
 	int _animating;
 	bool _doBgAnimDone;
-- 
cgit v1.2.3


From c5d5694883a48974cf85f5d2a854d3a7c5d8b1d4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 May 2015 18:51:13 -1000
Subject: SHERLOCK: Fix gfx glitch when returning to morgue for a second time

---
 engines/sherlock/scene.cpp    | 5 +++++
 engines/sherlock/sherlock.cpp | 1 +
 2 files changed, 6 insertions(+)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 6e7f628616..8a47707aea 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -169,6 +169,9 @@ void Scene::selectScene() {
  * Fres all the graphics and other dynamically allocated data for the scene
  */
 void Scene::freeScene() {
+	if (_currentScene == -1)
+		return;
+
 	_vm->_talk->freeTalkVars();
 	_vm->_inventory->freeInv();
 	_vm->_sound->freeSong();
@@ -190,6 +193,8 @@ void Scene::freeScene() {
 	for (uint idx = 0; idx < _images.size(); ++idx)
 		delete _images[idx]._images;
 	_images.clear();
+
+	_currentScene = -1;
 }
 
 /**
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index b8948f99d8..8b25615792 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -163,6 +163,7 @@ void SherlockEngine::sceneLoop() {
 		}
 	}
 
+	_scene->freeScene();
 	_people->freeWalk();
 
 }
-- 
cgit v1.2.3


From 30b5497e24965849469be0ff5c2620eef5ebfa0e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 3 May 2015 13:44:07 +0200
Subject: SCI: Clarify function name

---
 engines/sci/engine/savegame.cpp | 2 +-
 engines/sci/graphics/screen.cpp | 4 ++--
 engines/sci/graphics/screen.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 8fca7eabca..93b3a997cc 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -923,7 +923,7 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 		g_sci->_gfxPorts->reset();
 	// clear screen
 	if (g_sci->_gfxScreen)
-		g_sci->_gfxScreen->clear();
+		g_sci->_gfxScreen->clearForRestoreGame();
 #ifdef ENABLE_SCI32
 	// Also clear any SCI32 planes/screen items currently showing so they
 	// don't show up after the load.
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index dfcb5dbc14..ca5b5b3b8c 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -251,8 +251,8 @@ GfxScreen::~GfxScreen() {
 	free(_displayScreen);
 }
 
-// should not used regulary, only meant for restore game
-void GfxScreen::clear() {
+// should not be used regularly; only meant for restore game
+void GfxScreen::clearForRestoreGame() {
 	// reset all screen data
 	memset(_visualScreen, 0, _pixels);
 	memset(_priorityScreen, 0, _pixels);
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 587d2ef3bc..1c946ef02f 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -76,7 +76,7 @@ public:
 	byte getColorWhite() { return _colorWhite; }
 	byte getColorDefaultVectorData() { return _colorDefaultVectorData; }
 
-	void clear();
+	void clearForRestoreGame();
 	void copyToScreen();
 	void copyFromScreen(byte *buffer);
 	void kernelSyncWithFramebuffer();
-- 
cgit v1.2.3


From 3d0c691694ddcf00a5bfc347626d38625f057dee Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 3 May 2015 17:17:25 +0200
Subject: SCI: Handle pronouns in parser

When parsing a sentence, its type 0x142 word (presumably the object) is
now stored. Any pronouns (type 0x080) are then automatically replaced by
this stored word.
---
 engines/sci/engine/kparse.cpp     |  3 ++
 engines/sci/parser/vocabulary.cpp | 77 +++++++++++++++++++++++++++++++++++++++
 engines/sci/parser/vocabulary.h   | 12 ++++++
 3 files changed, 92 insertions(+)

diff --git a/engines/sci/engine/kparse.cpp b/engines/sci/engine/kparse.cpp
index aa89b963cc..f85f33e3e8 100644
--- a/engines/sci/engine/kparse.cpp
+++ b/engines/sci/engine/kparse.cpp
@@ -117,6 +117,8 @@ reg_t kParse(EngineState *s, int argc, reg_t *argv) {
 		}
 #endif
 
+		voc->replacePronouns(words);
+
 		int syntax_fail = voc->parseGNF(words);
 
 		if (syntax_fail) {
@@ -130,6 +132,7 @@ reg_t kParse(EngineState *s, int argc, reg_t *argv) {
 
 		} else {
 			voc->parserIsValid = true;
+			voc->storePronounReference();
 			writeSelectorValue(segMan, event, SELECTOR(claimed), 0);
 
 #ifdef DEBUG_PARSER
diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 000b037b44..828a57abeb 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -74,6 +74,8 @@ Vocabulary::Vocabulary(ResourceManager *resMan, bool foreign) : _resMan(resMan),
 
 	parser_event = NULL_REG;
 	parserIsValid = false;
+
+	_pronounReference = 0x1000; // Non-existent word
 }
 
 Vocabulary::~Vocabulary() {
@@ -738,4 +740,79 @@ int Vocabulary::parseNodes(int *i, int *pos, int type, int nr, int argc, const c
 	return oldPos;
 }
 
+
+// FIXME: Duplicated from said.cpp
+static int node_major(ParseTreeNode* node) {
+	assert(node->type == kParseTreeBranchNode);
+	assert(node->left->type == kParseTreeLeafNode);
+	return node->left->value;
+}
+static bool node_is_terminal(ParseTreeNode* node) {
+	return (node->right->right &&
+            node->right->right->type != kParseTreeBranchNode);
+}
+static int node_terminal_value(ParseTreeNode* node) {
+	assert(node_is_terminal(node));
+	return node->right->right->value;
+}
+
+static ParseTreeNode* scanForMajor(ParseTreeNode *tree, int major) {
+	assert(tree);
+
+	if (node_is_terminal(tree)) {
+		if (node_major(tree) == major)
+			return tree;
+		else
+			return 0;
+	}
+
+	ParseTreeNode* ptr = tree->right;
+
+	// Scan children
+	while (ptr->right) {
+		ptr = ptr->right;
+
+		if (node_major(ptr->left) == major)
+			return ptr->left;
+	}
+
+	if (major == 0x141)
+		return 0;
+
+	// If not found, go into a 0x141 and try again
+	tree = scanForMajor(tree, 0x141);
+	if (!tree)
+		return 0;
+	return scanForMajor(tree, major);
+}
+
+bool Vocabulary::storePronounReference() {
+	assert(parserIsValid);
+
+	ParseTreeNode *ptr = scanForMajor(_parserNodes, 0x142); // 0x142 = object?
+
+	while (ptr && !node_is_terminal(ptr))
+		ptr = scanForMajor(ptr, 0x141);
+
+	if (!ptr)
+		return false;
+
+	_pronounReference = node_terminal_value(ptr);
+
+	debugC(kDebugLevelParser, "Stored pronoun reference: %x", _pronounReference);
+	return true;
+}
+
+void Vocabulary::replacePronouns(ResultWordListList &words) {
+	if (_pronounReference == 0x1000)
+		return;
+
+	for (ResultWordListList::iterator i = words.begin(); i != words.end(); ++i)
+		for (ResultWordList::iterator j = i->begin(); j != i->end(); ++j)
+			if (j->_class & (VOCAB_CLASS_PRONOUN << 4)) {
+				j->_class = VOCAB_CLASS_NOUN << 4;
+				j->_group = _pronounReference;
+			}
+}
+
 } // End of namespace Sci
diff --git a/engines/sci/parser/vocabulary.h b/engines/sci/parser/vocabulary.h
index 09499946cb..f4adee6e55 100644
--- a/engines/sci/parser/vocabulary.h
+++ b/engines/sci/parser/vocabulary.h
@@ -232,6 +232,16 @@ public:
 	 */
 	int parseGNF(const ResultWordListList &words, bool verbose = false);
 
+	/**
+	 * Find and store reference for future pronouns
+	 */
+	bool storePronounReference();
+
+	/**
+	 * Replace pronouns by stored reference
+	 */
+	void replacePronouns(ResultWordListList &words);
+
 	/**
 	 * Constructs the Greibach Normal Form of the grammar supplied in 'branches'.
 	 * @param verbose	Set to true for debugging. If true, the list is
@@ -360,6 +370,8 @@ private:
 	SynonymList _synonyms; /**< The list of synonyms */
 	Common::Array<Common::List<AltInput> > _altInputs;
 
+	int _pronounReference;
+
 public:
 	// Accessed by said()
 	ParseTreeNode _parserNodes[VOCAB_TREE_NODES]; /**< The parse tree */
-- 
cgit v1.2.3


From 32d46dc00ab82bebc46f57dba8eb1be7e226d6f2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 May 2015 18:17:50 -1000
Subject: SHERLOCK: Fix crash when moving crates

---
 engines/sherlock/talk.cpp | 8 ++++++++
 engines/sherlock/talk.h   | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 9af8a29c1e..953f884625 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -26,6 +26,14 @@
 
 namespace Sherlock {
 
+SequenceEntry::SequenceEntry() {
+	_objNum = 0;
+	_frameNumber = 0;
+	_seqTo = 0;
+}
+
+/*----------------------------------------------------------------*/
+
 /**
  * Load the data for a single statement within a talk file
  */
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index d545d31351..f96c3176d2 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -77,6 +77,8 @@ struct SequenceEntry {
 	Common::Array<byte> _sequences;
 	int _frameNumber;
 	int _seqTo;
+
+	SequenceEntry();
 };
 
 struct ScriptStackEntry {
-- 
cgit v1.2.3


From 0554e893cef70dc7fd4bbdad8227d17b14d076d1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 3 May 2015 18:19:12 -1000
Subject: SHERLOCK: Fix picking up knife in taxidermy

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 953f884625..11385ca978 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -184,7 +184,7 @@ void Talk::talkTo(const Common::String &filename) {
 	if (_savedSequences.size() > 0) {
 		for (uint idx = 0; idx < _savedSequences.size(); ++idx) {
 			SequenceEntry &ss = _savedSequences[idx];
-			for (uint idx2 = 0; idx2 < _savedSequences.size(); ++idx2)
+			for (uint idx2 = 0; idx2 < ss._sequences.size(); ++idx2)
 				scene._bgShapes[ss._objNum]._sequences[idx2] = ss._sequences[idx2];
 		
 			// Reset the object's frame to the beginning of the sequence
-- 
cgit v1.2.3


From ed7007162a092e4b9e3d9306b078af5a8984cad0 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 4 May 2015 21:19:05 +0200
Subject: SCI: Scripts: identify strings + debug command

debug command is called "script_strings" / "scrs"
---
 engines/sci/console.cpp       |  67 +++++++++++++++
 engines/sci/console.h         |   1 +
 engines/sci/engine/script.cpp | 187 ++++++++++++++++++++++++++++++++++++++++++
 engines/sci/engine/script.h   |  19 +++++
 4 files changed, 274 insertions(+)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 3f5548aac7..bc9ad362ab 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -209,6 +209,8 @@ Console::Console(SciEngine *engine) : GUI::Debugger(),
 	registerCmd("bpe",				WRAP_METHOD(Console, cmdBreakpointFunction));		// alias
 	// VM
 	registerCmd("script_steps",		WRAP_METHOD(Console, cmdScriptSteps));
+	registerCmd("script_strings",   WRAP_METHOD(Console, cmdScriptStrings));
+	registerCmd("scrs",             WRAP_METHOD(Console, cmdScriptStrings));
 	registerCmd("vm_varlist",			WRAP_METHOD(Console, cmdVMVarlist));
 	registerCmd("vmvarlist",			WRAP_METHOD(Console, cmdVMVarlist));				// alias
 	registerCmd("vl",					WRAP_METHOD(Console, cmdVMVarlist));				// alias
@@ -2828,6 +2830,71 @@ bool Console::cmdScriptSteps(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdScriptStrings(int argc, const char **argv) {
+	SegManager *segMan = _engine->_gamestate->_segMan;
+	int curScriptNr = -1;
+	SegmentId curSegmentNr;
+	Common::List<SegmentId> segmentNrList;
+
+	SegmentType curSegmentType = SEG_TYPE_INVALID;
+	SegmentObj *curSegmentObj = NULL;
+	Script *curScriptObj = NULL;
+
+	if (argc < 2) {
+		debugPrintf("Shows the strings inside a specified script.\n");
+		debugPrintf("Usage: %s <script number>\n", argv[0]);
+		debugPrintf("Example: %s 999\n", argv[0]);
+		debugPrintf("<script number> may be * to show strings inside all loaded scripts\n");
+		return true;
+	}
+	
+	segmentNrList.clear();
+
+	if (strcmp(argv[1], "*") == 0) {
+		// get strings of all currently loaded scripts
+		for (curSegmentNr = 0; curSegmentNr < segMan->_heap.size(); curSegmentNr++) {
+			curSegmentObj = segMan->_heap[curSegmentNr];
+			if (curSegmentObj && curSegmentObj->getType() == SEG_TYPE_SCRIPT) {
+				segmentNrList.push_back(curSegmentNr);
+			}
+		}
+
+	} else {
+		curScriptNr = atoi(argv[1]);
+		curSegmentNr = segMan->getScriptSegment(curScriptNr);
+		if (!curSegmentNr) {
+			debugPrintf("Script %d is currently not loaded/available\n", curScriptNr);
+			return true;
+		}
+		segmentNrList.push_back(curSegmentNr);
+	}
+
+	Common::List<SegmentId>::iterator it;
+	const Common::List<SegmentId>::iterator end = segmentNrList.end();
+
+	for (it = segmentNrList.begin(); it != end; it++) {
+		curSegmentNr = *it;
+		// get object of this segment
+		curSegmentObj = segMan->getSegmentObj(curSegmentNr);
+		if (!curSegmentObj)
+			continue;
+
+		curSegmentType = curSegmentObj->getType();
+		if (curSegmentType != SEG_TYPE_SCRIPT) // safety check
+			continue;
+
+		curScriptObj = (Script *)curSegmentObj;
+		debugPrintf("=== SCRIPT %d from Segment %d ===\n", curScriptObj->getScriptNumber(), curSegmentNr);
+		debugN("=== SCRIPT %d from Segment %d ===\n", curScriptObj->getScriptNumber(), curSegmentNr);
+
+		// now print the string list
+		curScriptObj->debugPrintStrings(this);
+		debugPrintf("\n");
+		debugN("\n");
+	}
+	return true;
+}
+
 bool Console::cmdBacktrace(int argc, const char **argv) {
 	debugPrintf("Call stack (current base: 0x%x):\n", _engine->_gamestate->executionStackBase);
 	Common::List<ExecStack>::const_iterator iter;
diff --git a/engines/sci/console.h b/engines/sci/console.h
index 6d024082b5..00d95b511f 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -147,6 +147,7 @@ private:
 	bool cmdBreakpointFunction(int argc, const char **argv);
 	// VM
 	bool cmdScriptSteps(int argc, const char **argv);
+	bool cmdScriptStrings(int argc, const char **argv);
 	bool cmdVMVarlist(int argc, const char **argv);
 	bool cmdVMVars(int argc, const char **argv);
 	bool cmdStack(int argc, const char **argv);
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 88becc82cc..70e558854b 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "sci/console.h"
 #include "sci/sci.h"
 #include "sci/resource.h"
 #include "sci/util.h"
@@ -64,6 +65,7 @@ void Script::freeScript() {
 	_lockers = 1;
 	_markedAsDeleted = false;
 	_objects.clear();
+	_stringLookupList.clear();
 }
 
 void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptPatcher) {
@@ -204,6 +206,191 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 			//_localsCount = (_bufSize - _localsOffset) >> 1;
 		}
 	}
+
+	// find all strings of this script
+	identifyStrings();
+}
+
+void Script::identifyStrings() {
+	stringLookupListEntry listEntry;
+	byte *scriptDataPtr  = NULL;
+	byte *stringStartPtr = NULL;
+	byte *stringDataPtr  = NULL;
+	int scriptDataLeft   = 0;
+	int stringDataLeft   = 0;
+	byte stringDataByte  = 0;
+
+	_stringLookupList.clear();
+	//stringLookupListType _stringLookupList; // Table of string data, that is inside the currently loaded script
+
+	if (getSciVersion() < SCI_VERSION_1_1) {
+		scriptDataPtr  = _buf;
+		scriptDataLeft = _bufSize;
+
+		// Go through all SCI_OBJ_STRINGS blocks
+		if (getSciVersion() == SCI_VERSION_0_EARLY) {
+			if (scriptDataLeft < 2)
+				error("Script::identifyStrings(): unexpected end of script");
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+		}
+		
+		uint16 blockType;
+		uint16 blockSize;
+
+		do {
+			if (scriptDataLeft < 2)
+				error("Script::identifyStrings(): unexpected end of script");
+
+			blockType = READ_LE_UINT16(scriptDataPtr);
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+			if (blockType == 0) // end of blocks detected
+				break;
+
+			if (scriptDataLeft < 2)
+				error("Script::identifyStrings(): unexpected end of script");
+
+			blockSize = READ_LE_UINT16(scriptDataPtr);
+			if (blockSize < 4)
+				error("Script::identifyStrings(): invalid block size");
+			blockSize      -= 4; // block size includes block-type UINT16 and block-size UINT16
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+
+			if (scriptDataLeft < blockSize)
+				error("Script::identifyStrings(): invalid block size");
+			
+			if (blockType == SCI_OBJ_STRINGS) {
+				// string block detected, we now grab all NUL terminated strings out of this block
+				stringDataPtr  = scriptDataPtr;
+				stringDataLeft = blockSize;
+
+				do {
+					if (stringDataLeft < 1) // no more bytes left
+						break;
+
+					stringStartPtr = stringDataPtr;
+					listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
+					// now look for terminating [NUL]
+					do {
+						stringDataByte = READ_SCI11ENDIAN_UINT16(stringDataPtr);
+						stringDataPtr++;
+						stringDataLeft--;
+						if (!stringDataByte) // NUL found, exit this loop
+							break;
+						if (stringDataLeft < 1) // no more bytes left
+							error("Script::identifyStrings(): string without terminating NUL");
+					} while (1);
+
+					listEntry.stringSize = stringDataPtr - stringStartPtr;
+					_stringLookupList.push_back(listEntry);
+				} while (1);
+			}
+
+			scriptDataPtr  += blockSize;
+			scriptDataLeft -= blockSize;
+		} while (1);
+
+	} else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
+		// Strings in SCI1.1 come after the object instances
+		scriptDataPtr = _heapStart;
+		scriptDataLeft = _heapSize;
+
+		if (scriptDataLeft < 4)
+			error("Script::identifyStrings(): unexpected end of script");
+
+		uint16 endOfStringOffset = READ_SCI11ENDIAN_UINT16(scriptDataPtr);
+		uint16 objectStartOffset = READ_SCI11ENDIAN_UINT16(scriptDataPtr + 2) * 2 + 4;
+
+		if (scriptDataLeft < objectStartOffset)
+			error("Script::identifyStrings(): object start is beyond heap size");
+		if (scriptDataLeft < endOfStringOffset)
+			error("Script::identifyStrings(): end of string is beyond heap size");
+
+		byte  *endOfStringPtr    = scriptDataPtr + endOfStringOffset;
+
+		scriptDataPtr  += objectStartOffset;
+		scriptDataLeft -= objectStartOffset;
+
+		uint16 blockType;
+		uint16 blockSize;
+
+		// skip all objects
+		do {
+			if (scriptDataLeft < 2)
+				error("Script::identifyStrings(): unexpected end of script");
+
+			blockType = READ_SCI11ENDIAN_UINT16(scriptDataPtr);
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+			if (blockType != SCRIPT_OBJECT_MAGIC_NUMBER)
+				break;
+
+			if (scriptDataLeft < 2)
+				error("Script::identifyStrings(): unexpected end of script");
+
+			blockSize = READ_SCI11ENDIAN_UINT16(scriptDataPtr) * 2;
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+			blockSize -= 4; // blocksize contains UINT16 type and UINT16 size
+			if (scriptDataLeft < blockSize)
+				error("Script::identifyStrings(): invalid block size");
+
+			scriptDataPtr  += blockSize;
+			scriptDataLeft -= blockSize;
+		} while (1);
+
+		// now scriptDataPtr points to right at the start of the strings
+		if (scriptDataPtr > endOfStringPtr)
+			error("Script::identifyStrings(): string block / end-of-string block mismatch");
+
+		stringDataPtr  = scriptDataPtr;
+		stringDataLeft = endOfStringPtr - scriptDataPtr; // Calculate byte count within string-block
+
+		do {
+			if (stringDataLeft < 1) // no more bytes left
+				break;
+
+			stringStartPtr = stringDataPtr;
+			listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
+			// now look for terminating [NUL]
+			do {
+				stringDataByte = READ_SCI11ENDIAN_UINT16(stringDataPtr);
+				stringDataPtr++;
+				stringDataLeft--;
+				if (!stringDataByte) // NUL found, exit this loop
+					break;
+				if (stringDataLeft < 1) // no more bytes left
+					error("Script::identifyStrings(): string without terminating NUL");
+			} while (1);
+
+			listEntry.stringSize = stringDataPtr - stringStartPtr;
+			_stringLookupList.push_back(listEntry);
+		} while (1);
+
+	} else if (getSciVersion() == SCI_VERSION_3) {
+		warning("TODO: identifyStrings(): Implement SCI3 variant");
+		return;
+	}
+}
+
+void Script::debugPrintStrings(Console *con) {
+	stringLookupListType::iterator it;
+	const stringLookupListType::iterator end = _stringLookupList.end();
+	byte *stringPtr;
+
+	if (!_stringLookupList.size()) {
+		con->debugPrintf(" no strings\n");
+		debugN(" no strings\n");
+		return;
+	}
+
+	for (it = _stringLookupList.begin(); it != end; ++it) {
+		stringPtr = _buf + it->ptrOffset;
+		con->debugPrintf(" %04x: '%s' (size %d)\n", it->ptrOffset, stringPtr, it->stringSize);
+		debugN(" %04x: '%s' (size %d)\n", it->ptrOffset, stringPtr, it->stringSize);
+	}
 }
 
 const byte *Script::getSci3ObjectsPointer() {
diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index 46d6ace917..fe774aeab5 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -49,6 +49,13 @@ enum ScriptObjectTypes {
 
 typedef Common::HashMap<uint16, Object> ObjMap;
 
+struct stringLookupListEntry {
+	uint16    ptrOffset;  // offset of the string
+	uint16    stringSize; // size of string, including terminating [NUL]
+};
+
+typedef Common::List<stringLookupListEntry> stringLookupListType;
+
 class Script : public SegmentObj {
 private:
 	int _nr; /**< Script number */
@@ -75,6 +82,8 @@ private:
 
 	ObjMap _objects;	/**< Table for objects, contains property variables */
 
+	stringLookupListType _stringLookupList; // Table of string data, that is inside the currently loaded script
+
 public:
 	int getLocalsOffset() const { return _localsOffset; }
 	uint16 getLocalsCount() const { return _localsCount; }
@@ -248,6 +257,11 @@ public:
 	 */
 	int getCodeBlockOffsetSci3() { return READ_SCI11ENDIAN_UINT32(_buf); }
 
+	/**
+	 * Print string lookup table (list) to debug console
+	 */
+	void debugPrintStrings(Console *con);
+
 private:
 	/**
 	 * Processes a relocation block within a SCI0-SCI2.1 script
@@ -294,6 +308,11 @@ private:
 	void initializeObjectsSci3(SegManager *segMan, SegmentId segmentId);
 
 	LocalVariables *allocLocalsSegment(SegManager *segMan);
+
+	/**
+	 * Identifies strings within script data and set up lookup-table
+	 */
+	void identifyStrings();
 };
 
 } // End of namespace Sci
-- 
cgit v1.2.3


From f1a75991edcb810c8034af8d797f5fc139c9be57 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 4 May 2015 21:50:42 +0200
Subject: SCI: fix bug in new string identifying code

fixes string identifying in mac SCI1.1 games
---
 engines/sci/engine/script.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 70e558854b..69f52495e0 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -274,7 +274,7 @@ void Script::identifyStrings() {
 					listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
 					// now look for terminating [NUL]
 					do {
-						stringDataByte = READ_SCI11ENDIAN_UINT16(stringDataPtr);
+						stringDataByte = *stringDataPtr;
 						stringDataPtr++;
 						stringDataLeft--;
 						if (!stringDataByte) // NUL found, exit this loop
@@ -356,7 +356,7 @@ void Script::identifyStrings() {
 			listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
 			// now look for terminating [NUL]
 			do {
-				stringDataByte = READ_SCI11ENDIAN_UINT16(stringDataPtr);
+				stringDataByte = *stringDataPtr;
 				stringDataPtr++;
 				stringDataLeft--;
 				if (!stringDataByte) // NUL found, exit this loop
-- 
cgit v1.2.3


From 8a9467b09aab38649a891934c17a7b15608ddf0a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 4 May 2015 13:22:43 -1000
Subject: SHERLOCK: Check _talkToAbort after calling pickupObject

---
 engines/sherlock/user_interface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 93dd03316d..d40e1cced1 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1508,6 +1508,7 @@ void UserInterface::doMiscControl(int allowed) {
 void UserInterface::doPickControl() {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
 
 	if (events._released) {
 		if ((_temp = _bgFound) != -1) {
@@ -1517,7 +1518,7 @@ void UserInterface::doPickControl() {
 			if (_bgFound < 1000) {
 				scene._bgShapes[_bgFound].pickUpObject(MPICK);
 
-				if (_menuMode != TALK_MODE) {
+				if (!talk._talkToAbort && _menuMode != TALK_MODE) {
 					_key = _oldKey = -1;
 					_menuMode = STD_MODE;
 					restoreButton(PICKUP_MODE - 1);
-- 
cgit v1.2.3


From 034e1384aad1ed91bb8879cded8e0247ae6f9000 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 4 May 2015 13:41:01 -1000
Subject: SHERLOCK: Fix picking up Sarah's effects in Morgue

---
 engines/sherlock/scene.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 8a47707aea..857dff4951 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1386,7 +1386,11 @@ void Scene::doBgAnim() {
 
 		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
 			Object &o = _canimShapes[idx];
-			if (o._type == REMOVE) {
+
+			if (o._type == INVALID) {
+				// Anim shape was invalidated by checkEndOfSequence, so at this point we can remove it
+				_canimShapes.remove_at(idx);
+			} else  if (o._type == REMOVE) {
 				if (_goToScene == -1)
 					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
 
-- 
cgit v1.2.3


From 0c12b85d4b67b022b227774db0cd531cf20d528e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 5 May 2015 07:00:24 +0200
Subject: SHERLOCK: Fix checkForSoundFrames, add some warning TODOs

---
 engines/sherlock/animation.cpp |  2 +-
 engines/sherlock/sherlock.h    |  1 +
 engines/sherlock/sound.cpp     | 32 +++++++++++++++++++++++---------
 engines/sherlock/sound.h       |  3 ++-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index aea4793a76..b1ec6590b1 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -182,7 +182,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 const int *Animation::checkForSoundFrames(const Common::String &filename) {
 	const int *frames = &NO_FRAMES;
 
-	if (!_vm->_soundOverride.empty()) {
+	if (_vm->_soundOverride.empty()) {
 		for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
 			if (!scumm_stricmp(filename.c_str(), PROLOGUE_NAMES[idx])) {
 				frames = &PROLOGUE_FRAMES[idx][0];
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 95fe514e0c..06d38cbf89 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -27,6 +27,7 @@
 #include "common/array.h"
 #include "common/endian.h"
 #include "common/hash-str.h"
+#include "common/serializer.h"
 #include "common/random.h"
 #include "common/savefile.h"
 #include "common/util.h"
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index e66f82e5c4..1ee9535f31 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "sherlock/sherlock.h"
 #include "sherlock/sound.h"
 #include "common/config-manager.h"
 
@@ -29,12 +30,14 @@ Sound::Sound(SherlockEngine *vm): _vm(vm) {
 	_digitized = false;
 	_music = false;
 	_voices = 0;
-	_soundOn = false;
-	_musicOn = false;
-	_speechOn = false;
 	_playingEpilogue = false;
 	_diskSoundPlaying = false;
-	_soundIsOn = nullptr;
+	_soundPlaying = false;
+	_soundIsOn = &_soundPlaying;
+
+	_soundOn = true;
+	_musicOn = true;
+	_speechOn = true;
 }
 
 /**
@@ -44,79 +47,90 @@ void Sound::syncSoundSettings() {
 	_digitized = !ConfMan.getBool("mute");
 	_music = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
 	_voices = !ConfMan.getBool("mute") && !ConfMan.getBool("speech_mute") ? 1 : 0;
-
-	// TODO: For now, keep sound completely mute until sound is implemented
-	_digitized = false;
-	_music = false;
-	_voices = 0;
 }
 
 void Sound::loadSound(const Common::String &name, int priority) {
 	// TODO
+	warning("TODO: Sound::loadSound");
 }
 
 bool Sound::playSound(const Common::String &name, WaitType waitType) {
 	// TODO
+	warning("TODO: Sound::playSound");
 	return true;
 }
 
 void Sound::cacheSound(const Common::String &name, int index) {
 	// TODO
+	warning("TODO: Sound::cacheSound");
 }
 
 void Sound::playLoadedSound(int bufNum, int waitMode) {
 	// TODO
+	warning("TODO: Sound::playLoadedSound");
 }
 
 void Sound::playCachedSound(int index) {
 	// TODO
+	warning("TODO: Sound::playCachedSound");
 }
 
 void Sound::freeLoadedSounds() {
 	// TODO
+	warning("TODO: Sound::clearLoadedSound");
 }
 
 void Sound::clearCache() {
 	// TODO
+	warning("TODO: Sound::clearCache");
 }
 
 void Sound::stopSound() {
 	// TODO
+	warning("TODO: Sound::stopSound");
 }
 
 void Sound::playMusic(const Common::String &name) {
 	// TODO
+	warning("TODO: Sound::playMusic");
 }
 
 void Sound::stopMusic() {
 	// TODO
+	warning("TODO: Sound::stopMusic");
 }
 
 int Sound::loadSong(int songNumber) {
 	// TODO
+	warning("TODO: Sound::loadSong");
 	return 0;
 }
 
 void Sound::startSong() {
 	// TODO
+	warning("TODO: Sound::startSong");
 }
 
 void Sound::freeSong() {
 	// TODO
+	warning("TODO: Sound::freeSong");
 }
 
 void Sound::stopSndFuncPtr(int v1, int v2) {
 	// TODO
+	warning("TODO: Sound::stopSndFuncPtr");
 }
 
 void Sound::waitTimerRoland(uint time) {
 	// TODO
+	warning("TODO: Sound::waitTimerRoland");
 }
 
 void Sound::freeDigiSound() {
 	delete[] _digiBuf;
 	_digiBuf = nullptr;
 	_diskSoundPlaying = false;
+	_soundPlaying = false;
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 3bd3a99f07..1fd4c29b12 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -46,7 +46,8 @@ public:
 	bool _speechOn;
 	bool _playingEpilogue;
 	bool _diskSoundPlaying;
-	byte *_soundIsOn;
+	bool _soundPlaying;
+	bool *_soundIsOn;
 	byte *_digiBuf;
 public:
 	Sound(SherlockEngine *vm);
-- 
cgit v1.2.3


From 66a4b3c8058b7e36a49a143a03fc299b99d1d625 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 5 May 2015 13:36:25 +0200
Subject: SCI: add qfg2 airElemental workaround - bug #6859

---
 engines/sci/engine/workarounds.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index c5d85b8c5b..ea3443e551 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -333,6 +333,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_QFG1VGA,        16,    16,  0,        "lassoFailed", "changeState",                     NULL,    -1, { WORKAROUND_FAKE,   0 } }, // qfg1vga: casting the "fetch" spell in the screen with the flowers, temps 0 and 1 - bug #5309
 	{ GID_QFG1VGA,        -1,   210,  0,          "Encounter", "init",        sig_uninitread_qfg1vga_1,     0, { WORKAROUND_FAKE,   0 } }, // qfg1vga: going to the brigands hideout - bug #5515
 	{ GID_QFG2,           -1,    71,  0,        "theInvSheet", "doit",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // accessing the inventory
+	{ GID_QFG2,           -1,    79,  0,        "TryToMoveTo", "onTarget",                        NULL,     0, { WORKAROUND_FAKE,   0 } }, // when throwing pot at air elemental, happens when client coordinates are the same as airElemental coordinates. happened to me right after room change - bug #6859
 	{ GID_QFG2,           -1,   701, -1,              "Alley", "at",                              NULL,     0, { WORKAROUND_FAKE,   0 } }, // when walking inside the alleys in the town - bug #5019 & #5106
 	{ GID_QFG2,           -1,   990,  0,            "Restore", "doit",                            NULL,   364, { WORKAROUND_FAKE,   0 } }, // when pressing enter in restore dialog w/o any saved games present
 	{ GID_QFG2,          260,   260,  0,             "abdulS", "changeState",    sig_uninitread_qfg2_1,    -1, { WORKAROUND_FAKE,   0 } }, // During the thief's first mission (in the house), just before Abdul is about to enter the house (where you have to hide in the wardrobe), bug #5153, temps 1 and 2
-- 
cgit v1.2.3


From 5bec0cbb9d9b2d29e7ffab4d1c0a0db803960754 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 7 May 2015 00:29:34 +0200
Subject: GOB: Make coordinate parameters in Surface::fillRect() signed

And clip to [0, width), [0, height) before drawing.

This fixes bug #6864, which is a regression I introduced in
51fd528fe56e00466255d54e1e71b19f34729bfd when I changed all
the drawing code to use the Surface class.

I thought that having unsigned coordinates makes sense, but
for some reason, Fascination sets _destSpriteX (which maps
to left in fillRect()) to -1, expecting the drawing code to
clip.
---
 engines/gob/surface.cpp | 7 ++++++-
 engines/gob/surface.h   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp
index 42ac2b0d74..ed83e8255c 100644
--- a/engines/gob/surface.cpp
+++ b/engines/gob/surface.cpp
@@ -470,7 +470,7 @@ void Surface::blitScaled(const Surface &from, Common::Rational scale, int32 tran
 	blitScaled(from, 0, 0, from._width - 1, from._height - 1, 0, 0, scale, transp);
 }
 
-void Surface::fillRect(uint16 left, uint16 top, uint16 right, uint16 bottom, uint32 color) {
+void Surface::fillRect(int16 left, int16 top, int16 right, int16 bottom, uint32 color) {
 	// Just in case those are swapped
 	if (left > right)
 		SWAP(left, right);
@@ -481,6 +481,11 @@ void Surface::fillRect(uint16 left, uint16 top, uint16 right, uint16 bottom, uin
 		// Nothing to do
 		return;
 
+	left   = CLIP<int32>(left  , 0, _width  - 1);
+	top    = CLIP<int32>(top   , 0, _height - 1);
+	right  = CLIP<int32>(right , 0, _width  - 1);
+	bottom = CLIP<int32>(bottom, 0, _height - 1);
+
 	// Area to actually fill
 	uint16 width  = CLIP<int32>(right  - left + 1, 0, _width  - left);
 	uint16 height = CLIP<int32>(bottom - top  + 1, 0, _height - top);
diff --git a/engines/gob/surface.h b/engines/gob/surface.h
index c931731908..eb0a5bf1a4 100644
--- a/engines/gob/surface.h
+++ b/engines/gob/surface.h
@@ -121,7 +121,7 @@ public:
 	void blitScaled(const Surface &from, int16 x, int16 y, Common::Rational scale, int32 transp = -1);
 	void blitScaled(const Surface &from, Common::Rational scale, int32 transp = -1);
 
-	void fillRect(uint16 left, uint16 top, uint16 right, uint16 bottom, uint32 color);
+	void fillRect(int16 left, int16 top, int16 right, int16 bottom, uint32 color);
 	void fill(uint32 color);
 	void clear();
 
-- 
cgit v1.2.3


From 8b82090c91cf10d231d232a1a29ebb3936d61618 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Thu, 7 May 2015 10:23:11 +1000
Subject: SCUMM: Add UK version of Pajama Sam 2 for Windows.

---
 devtools/scumm-md5.txt    | 1 +
 engines/scumm/scumm-md5.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 7a1a22b600..47c1dd3cce 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -666,6 +666,7 @@ pajama2	Pajama Sam 2: Thunder and Lightning Aren't so Frightening
 	d4e79c3d8645b8266cd78c325bc35154	60557	us	All	-	-	-	Kirben
 	6a60d395b78b205c93a956100b1bf5ae	-1	de	All	HE 98.5	-	-	EdDammer
 	513f91a9dbe8d5490b39e56a3ac5bbdf	-1	nl	All	HE 98.5	-	-	daniel9
+	2328be0317008ef047eed7912a4b0850	-1	gb	Windows	HE 98.5	-	-	Saleck
 	55f4e9402bec2bded383843123f37c5c	-1	de	Windows	HE 98.5	-	-	WindlePoons
 	e5563c8358443c4352fcddf7402a5e0a	-1	fr	Windows	HE 98.5	-	-	gist974
 	c6907d44f1166941d982864cd42cdc89	-1	de	All	HE 99	-	-	nachbarnebenan
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index bc3548c150..4353fe2969 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu Apr 16 04:45:24 2015
+  This file was generated by the md5table tool on Thu May 07 00:21:21 2015
   DO NOT EDIT MANUALLY!
  */
 
@@ -120,6 +120,7 @@ static const MD5Table md5table[] = {
 	{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", "HE 70", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "22de86b2f7ec6e5db745ed1123310b44", "spyfox2", "", "Demo", 15832, Common::FR_FRA, Common::kPlatformWindows },
 	{ "22f4ea88a09da12df9308ba30bcb7d0f", "loom", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformDOS },
+	{ "2328be0317008ef047eed7912a4b0850", "pajama2", "HE 98.5", "", -1, Common::EN_GRB, Common::kPlatformWindows },
 	{ "23394c8d29cc63c61313959431a12476", "spyfox", "HE 100", "Updated", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "24942a4200d99bdb4bdb78f9c7e07027", "pajama3", "", "Mini Game", 13911, Common::NL_NLD, Common::kPlatformWindows },
 	{ "254fede2f15dbb32a23760d601b01816", "zak", "V1", "", -1, Common::EN_ANY, Common::kPlatformC64 },
-- 
cgit v1.2.3


From d8673cfe44126f1d24ec0cff82a3407e9f891d7b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 May 2015 20:46:03 -0400
Subject: SHERLOCK: Dropped _saveSeqNum in favor of _savedSequences size

---
 engines/sherlock/talk.cpp | 3 +--
 engines/sherlock/talk.h   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 11385ca978..b1f4d4e546 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -94,7 +94,6 @@ void TalkSequences::clear() {
 Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_talkCounter = 0;
 	_talkToAbort = false;
-	_saveSeqNum = 0;
 	_speaker = 0;
 	_talkIndex = 0;
 	_talkTo = 0;
@@ -1008,7 +1007,7 @@ void Talk::doScript(const Common::String &script) {
 	int obj;
 	int seqCount;
 
-	_saveSeqNum = 0;
+	_savedSequences.clear();
 
 	const byte *scriptStart = (const byte *)script.c_str();
 	const byte *str = scriptStart;
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index f96c3176d2..b44bccaab6 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -129,7 +129,6 @@ private:
 	Common::Array<TalkSequences> TALK_SEQUENCES;
 private:
 	SherlockEngine *_vm;
-	int _saveSeqNum;
 	Common::Stack<SequenceEntry> _savedSequences;
 	Common::Stack<SequenceEntry> _sequenceStack;
 	Common::Stack<ScriptStackEntry> _scriptStack;
-- 
cgit v1.2.3


From 2456163f5dd08a72e88c4af9e76f646406ae7d36 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Thu, 7 May 2015 11:04:08 +1000
Subject: SCUMM: SCUMM: Add English 1.4 version of Indiana Jones and the Last
 Crusade for DOS.

---
 devtools/scumm-md5.txt    | 1 +
 engines/scumm/scumm-md5.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 47c1dd3cce..5bb3b79cad 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -127,6 +127,7 @@ indy3	Indiana Jones and the Last Crusade
 	66236cd1aec24e1d4aff4c4cc93b7e18	-1	fr	DOS	EGA	EGA	?? v1.3, 25 Aug 89	Andrea Petrucci, Peter Eckerlein
 	89cfc425566003ff74b7dc7b3e6fd469	-1	fr	DOS	EGA	EGA	?? v1.3, 25 Aug 89	Jorpho
 	69d70269fafc4445adbb0d223e4f9a3f	5361	en	DOS	EGA	EGA	v1.4, 11/07/89 (5.25\")	Petr Maruska
+	56e8c37a0a08c3a7076f82417461a877	-1	en	DOS	EGA	EGA	v1.4, 7 Nov 89 (3.5\")	Paulo Vicente		
 	6f6ef668c608c7f534fea6e6d3878dde	-1	de	DOS	EGA	EGA	v1.4 from 19 Oct 89	dhewg, Peter Eckerlein
 	eb700bb73ca1cc44a1ad5e4b1a4bdeaf	5361	de	DOS	EGA	EGA	PC-Spiele	a.borque
 	d62d248c3df6ec177405e2cb23d923b2	-1	it	DOS	EGA	EGA	v1.4 from 25 Nov 89	Andrea Petrucci, Peter Eckerlein
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 4353fe2969..a9043e80a5 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu May 07 00:21:21 2015
+  This file was generated by the md5table tool on Thu May 07 00:45:51 2015
   DO NOT EDIT MANUALLY!
  */
 
@@ -253,6 +253,7 @@ static const MD5Table md5table[] = {
 	{ "55f4e9402bec2bded383843123f37c5c", "pajama2", "HE 98.5", "", -1, Common::DE_DEU, Common::kPlatformWindows },
 	{ "566165a7338fa11029e7c14d94fa70d0", "freddi", "HE 73", "Demo", 9800, Common::EN_ANY, Common::kPlatformWindows },
 	{ "56b5922751be7ffd771b38dda56b028b", "freddi", "HE 100", "", 34837, Common::NL_NLD, Common::kPlatformWii },
+	{ "56e8c37a0a08c3a7076f82417461a877", "indy3", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "5719fc8a13b4638b78d9d8d12f091f94", "puttrace", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "5798972220cd458be2626d54c80f71d7", "atlantis", "Floppy", "Floppy", -1, Common::IT_ITA, Common::kPlatformAmiga },
 	{ "57a17febe2183f521250e55d55b83e60", "PuttTime", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformWindows },
-- 
cgit v1.2.3


From 3f3ad61927874f5565242211acad12fcdf83b136 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Thu, 7 May 2015 11:12:59 +1000
Subject: SCUMM: SCUMM: Add English 1.6 disk version of Day of the Tentacle for
 DOS.

---
 devtools/scumm-md5.txt    | 1 +
 engines/scumm/scumm-md5.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 5bb3b79cad..d8ace64c62 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -300,6 +300,7 @@ atlantis	Indiana Jones and the Fate of Atlantis
 tentacle	Day of the Tentacle
 	acad97ab1c6fc2a5b2d98abf6db4a190	-1	en	All?	Floppy	Floppy	Version A ?	
 	2723fea3dae0cb47768c424b145ae0e7	7932	en	DOS	Floppy	Floppy	Version B ?	Andrej Sinicyn, Andrea Petrucci, Fingolfin
+	f0ccc12a8704bf57706b42a37f877128	-1	en	DOS	Floppy	Floppy	1.6	Paulo Vicente
 	92b078d9d6d9d751da9c26b8b3075779	-1	fr	DOS	Floppy	Floppy	-	Nicolas Sauz&egrave;de, Andrea Petrucci
 	94aaedbb8f26d71ed3ad6dd34490e29e	-1	fr	DOS	Floppy	Floppy	alt?	Nicolas Joly
 	57b0d89af79befe1cabce3bece869e7f	-1	de	DOS	Floppy	Floppy	-	Andrej Sinicyn, Andrea Petrucci
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index a9043e80a5..1158aaa980 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu May 07 00:45:51 2015
+  This file was generated by the md5table tool on Thu May 07 01:11:26 2015
   DO NOT EDIT MANUALLY!
  */
 
@@ -656,6 +656,7 @@ static const MD5Table md5table[] = {
 	{ "f049e38c1f8302b5db6170f1872af89a", "monkey", "CD", "CD", 8955, Common::ES_ESP, Common::kPlatformDOS },
 	{ "f06e66fd45b2f8b0f4a2833ff4476050", "fbpack", "", "", -1, Common::HE_ISR, Common::kPlatformDOS },
 	{ "f08145577e4f13584cc90b3d6e9caa55", "pajama3", "", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
+	{ "f0ccc12a8704bf57706b42a37f877128", "tentacle", "Floppy", "Floppy", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "f1b0e0d587b85052de5534a3847e68fe", "water", "HE 99", "Updated", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "f237bf8a5ef9af78b2a6a4f3901da341", "pajama", "", "Demo", 18354, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "f27b1ba0eadaf2a6617b2b58192d1dbf", "samnmax", "Floppy", "Floppy", -1, Common::DE_DEU, Common::kPlatformDOS },
-- 
cgit v1.2.3


From 6c41a9be524385f16c33041885a7f5c4603a0f0e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 May 2015 23:34:57 -0400
Subject: SHERLOCK: Fix looking at Paul's Cap immediately after entering a
 scene

---
 engines/sherlock/people.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 5c4014f1a2..8f7b957db6 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -240,6 +240,9 @@ void People::reset() {
 	p._noShapeSize = Common::Point(0, 0);
 	p._goto = Common::Point(0, 0);
 	p._status = 0;
+
+	// Reset any walk path in progress when Sherlock leaves scenes
+	_walkTo.clear();
 }
 
 /**
-- 
cgit v1.2.3


From 97bec43799aa85b9ef49e4e26016de95dd054e71 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 May 2015 23:39:23 -0400
Subject: SHERLOCK: Minor comment updates

---
 engines/sherlock/people.cpp   | 2 ++
 engines/sherlock/sherlock.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 8f7b957db6..9c264b4754 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -221,6 +221,8 @@ People::~People() {
  * Reset the player data
  */
 void People::reset() {
+	// Note: The engine has theoretical support for two player charactersm but only the first one is used.
+	// Watson is, instead, handled by a different sprite in each scene, with a very simple initial movement, if any
 	Sprite &p = _data[PLAYER];
 
 	p._description = "Sherlock Holmes!";
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 8b25615792..5a73b4fd1d 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -128,7 +128,7 @@ Common::Error SherlockEngine::run() {
 		// Reset UI flags
 		_ui->reset();
 
-		// Reset the active characters to initially just Sherlock
+		// Reset the data for the player character (Sherlock)
 		_people->reset();
 
 		// Initialize and load the scene. 
-- 
cgit v1.2.3


From 4884762e0471e358bc6416d8baf97e0685b1aa3c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 7 May 2015 18:21:25 +0200
Subject: SHERLOCK: Reduce the scope of some variables

---
 engines/sherlock/animation.cpp |  3 +--
 engines/sherlock/journal.cpp   | 17 +++++++----------
 engines/sherlock/map.cpp       |  5 +++--
 engines/sherlock/objects.cpp   |  5 ++---
 engines/sherlock/people.cpp    |  2 +-
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index b1ec6590b1..62e6e4bebf 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -109,12 +109,11 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	}
 
 	int frameNumber = 0;
-	int imageFrame;
 	Common::Point pt;
 	bool skipped = false;
 	while (!_vm->shouldQuit()) {
 		// Get the next sprite to display
-		imageFrame = stream->readSint16LE();
+		int imageFrame = stream->readSint16LE();
 
 		if (imageFrame == -2) {
 			// End of animation reached
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 25b0bb5451..dfff6e9bb7 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -96,7 +96,6 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) {
  */
 void Journal::loadJournalLocations() {
 	Resources &res = *_vm->_res;
-	char c;
 
 	_directory.clear();
 
@@ -123,6 +122,7 @@ void Journal::loadJournalLocations() {
 	_locations.clear();
 	while (loc->pos() < loc->size()) {
 		Common::String line;
+		char c;
 		while ((c = loc->readByte()) != 0)
 			line += c;
 
@@ -564,9 +564,7 @@ bool Journal::doJournal(int direction, int howFar) {
 	int lineNum = 0;
 	int maxLines;
 	int savedIndex;
-	int savedSub;
 	int temp;
-	bool inc;
 	const char *matchP;
 	int width;
 
@@ -663,7 +661,7 @@ bool Journal::doJournal(int direction, int howFar) {
 
 			lineNum = 0;
 			savedIndex = _index;
-			savedSub = _sub;
+			int savedSub = _sub;
 
 			// Move a single page ahead
 			do {
@@ -725,7 +723,7 @@ bool Journal::doJournal(int direction, int howFar) {
 	lineNum = 0;
 
 	do {
-		inc = true;
+		bool inc = true;
 
 		// If there wasn't any line to print at the top of the page, we won't need to
 		// increment the y position
@@ -955,9 +953,9 @@ bool Journal::handleEvents(int key) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
 		bool notFound = false;
 	
-		int dir;
 
 		do {
+			int dir;
 			if ((dir = getFindName(notFound)) != 0) {
 				int savedIndex = _index;
 				int savedSub = _sub;
@@ -1016,6 +1014,8 @@ bool Journal::handleEvents(int key) {
  * Show the search submenu
  */
 int Journal::getFindName(bool printError) {
+	enum Button { BTN_NONE, BTN_EXIT, BTN_BACKWARD, BTN_FORWARD };
+
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
@@ -1023,8 +1023,6 @@ int Journal::getFindName(bool printError) {
 	int yp = 174;
 	bool flag = false;
 	Common::String name;
-	enum Button { BTN_NONE, BTN_EXIT, BTN_BACKWARD, BTN_FORWARD };
-	Button found = BTN_NONE;
 	int done = 0;
 	byte color;
 
@@ -1062,7 +1060,6 @@ int Journal::getFindName(bool printError) {
 		for (int idx = 0; idx < 40 && !_vm->shouldQuit() && !events.kbHit() && !events._released; ++idx) {
 			events.pollEvents();
 			events.setButtonState();
-
 			events.wait(2);
 		}
 
@@ -1082,7 +1079,7 @@ int Journal::getFindName(bool printError) {
 	
 	do {
 		events._released = false;
-		found = BTN_NONE;
+		Button found = BTN_NONE;
 
 		while (!_vm->shouldQuit() && !events.kbHit() && !events._released) {
 			found = BTN_NONE;
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index f572e3771a..4f04312ba7 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -95,10 +95,10 @@ void Map::loadSequences(int count, const byte *seq) {
 void Map::loadData() {
 	// Load the list of location names
 	Common::SeekableReadStream *txtStream = _vm->_res->load("chess.txt");
-	char c;
 
 	while (txtStream->pos() < txtStream->size()) {
 		Common::String line;
+		char c;
 		while ((c = txtStream->readByte()) != '\0')
 			line += c;
 
@@ -442,7 +442,6 @@ void Map::updateMap(bool flushScreen) {
  */
 void Map::walkTheStreets() {
 	People &people = *_vm->_people;
-	bool reversePath = false;
 	Common::Array<Common::Point> tempPath;
 
 	// Get indexes into the path lists for the start and destination scenes
@@ -463,6 +462,8 @@ void Map::walkTheStreets() {
 		if (_charPoint == 51 || _oldCharPoint == 51) {
 			people.setWalking();
 		} else {
+			bool reversePath = false;
+
 			// Check for moving the path backwards or forwards
 			if (path[0] == 255) {
 				reversePath = true;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 6f4795de7e..f22bedfc44 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -835,15 +835,13 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
 	bool printed = false;
-	char ch;
-	const char *p;
 
 	scene.toggleObject(name);
 
 	if (name.hasPrefix("*")) {
 		// A code was found
 		printed = true;
-		ch = (name == "*") ? 0 : toupper(name[1]);
+		char ch = (name == "*") ? 0 : toupper(name[1]);
 
 		switch (ch) {
 		case 'C':
@@ -880,6 +878,7 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 					map._overPos.y = map[scene._goToScene].y * 100 + 900;
 				}
 
+				const char *p;
 				if ((p = strchr(name.c_str(), ',')) != nullptr) {
 					++p;
 
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 9c264b4754..84194059e1 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -287,7 +287,6 @@ void People::setWalking() {
 	Scene &scene = *_vm->_scene;
 	int oldDirection, oldFrame;
 	Common::Point speed, delta;
-	int temp;
 
 	// Flag that player has now walked in the scene
 	scene._walkedInScene = true;
@@ -311,6 +310,7 @@ void People::setWalking() {
 		// Since we want the player to be centered on the destination they
 		// clicked, but characters draw positions start at their left, move
 		// the destination half the character width to draw him centered
+		int temp;
 		if (_walkDest.x >= (temp = _player._imageFrame->_frame.w / 2))
 			_walkDest.x -= temp;
 
-- 
cgit v1.2.3


From f6b6b4c7289d128d5784d809baf1b20ba42aae03 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 7 May 2015 18:24:50 +0200
Subject: SHERLOCK: Fix the way the sprite frames are freed

---
 engines/sherlock/resources.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 788cacf82a..0be5bc814d 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -328,7 +328,7 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 		byte *data = new byte[frame._size];
 		stream.read(data, frame._size);
         decompressFrame(frame, data);		
-		delete data;
+		delete[] data;
 
 		push_back(frame);
     }
-- 
cgit v1.2.3


From a0661c8d5a970791a6fac3e304fe975e8e61b5f9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 7 May 2015 19:21:55 +0200
Subject: SHERLOCK: Reduce some more variable scopes

---
 engines/sherlock/objects.cpp        |  2 +-
 engines/sherlock/scalpel/darts.cpp  |  5 ++---
 engines/sherlock/settings.cpp       |  3 +--
 engines/sherlock/user_interface.cpp | 25 ++++++++++---------------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index f22bedfc44..8a7ae49e34 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -989,7 +989,6 @@ int Object::pickUpObject(const char *const messages[]) {
 	UserInterface &ui = *_vm->_ui;
 	int pickup = _pickup & 0x7f;
 	bool printed = false;
-	bool takeFlag = true;
 	int numObjects = 0;
 
 	if (pickup == 99) {
@@ -1014,6 +1013,7 @@ int Object::pickUpObject(const char *const messages[]) {
 		ui._menuCounter = 30;
 	} else {
 		// Pick it up
+		bool takeFlag = true;
 		if ((_pickup & 0x80) == 0) {
 			// Play an animation
 			if (pickup > 80) {
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 476a3071c5..4b48a1dacf 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -69,7 +69,6 @@ Darts::Darts(ScalpelEngine *vm) : _vm(vm) {
 void Darts::playDarts() {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
-	int score, roundStartScore;
 	int playerNumber = 0;
 	int lastDart;
 
@@ -82,6 +81,7 @@ void Darts::playDarts() {
 
 	bool done = false;
 	do {
+		int score, roundStartScore;
 		roundStartScore = score = playerNumber == 0 ? _dartScore1 : _dartScore2;
 		
 		// Show player details
@@ -502,7 +502,6 @@ int Darts::dartScore(const Common::Point &pt) {
  */
 Common::Point Darts::getComputerDartDest(int playerNum) {
 	Common::Point target;
-	int aim;
 	int score = playerNum == 0 ? _dartScore1 : _dartScore2;
 
 	if (score > 50) {
@@ -515,7 +514,7 @@ Common::Point Darts::getComputerDartDest(int playerNum) {
 			target.y += _vm->getRandomNumber(21) - 10;
 		}
 	} else {
-		aim = score;
+		int aim = score;
 
 		bool done;
 		Common::Point pt;
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index 1673eca389..e19aefd9c5 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -224,7 +224,6 @@ void Settings::show(SherlockEngine *vm) {
 	Sound &sound = *vm->_sound;
 	Talk &talk = *vm->_talk;
 	UserInterface &ui = *vm->_ui;
-	int found;
 	bool updateConfig = false;
 
 	Settings settings(vm);
@@ -234,7 +233,7 @@ void Settings::show(SherlockEngine *vm) {
 		if (ui._menuCounter)
 			ui.whileMenuCounter();
 
-		found = -1;
+		int found = -1;
 		ui._key = -1;
 
 		scene.doBgAnim();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index d40e1cced1..a134b95196 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -531,13 +531,12 @@ void UserInterface::examine() {
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
 	Common::Point pt = events.mousePos();
-	int canimSpeed;
 
 	if (pt.y < (CONTROLS_Y + 9)) {
 		Object &obj = scene._bgShapes[_bgFound];
 		
 		if (obj._lookcAnim != 0) {
-			canimSpeed = ((obj._lookcAnim & 0xe0) >> 5) + 1;
+			int canimSpeed = ((obj._lookcAnim & 0xe0) >> 5) + 1;
 			scene._cAnimFramePause = obj._lookFrames;
 			_cAnimStr = obj._examine;
 			_cNum = (obj._lookcAnim & 0x1f) - 1;
@@ -587,7 +586,6 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 	Common::Point mousePos = events.mousePos();
 	int temp;
 	Common::String tempStr;
-	int x, width;
 
 	// Don't display anything for right button command
 	if ((events._rightPressed || events._rightPressed) && !events._pressed)
@@ -612,7 +610,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
 						(inv._invMode == 2 || inv._invMode == 3)) {
 					int width1 = 0, width2 = 0;
-
+					int x, width;
 					if (inv._invMode == 2) {
 						// Using an object
 						x = width = screen.stringWidth("Use ");
@@ -743,9 +741,9 @@ void UserInterface::doEnvControl() {
 		events.clearKeyboard();
 
 		// Check for a filename entry being highlighted
-		int found1 = 0;
 		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10))
 		{
+			int found1 = 0;
 			for (_selector = 0; (_selector < 5) && !found1; ++_selector)
 				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
 					found1 = 1;
@@ -1540,7 +1538,6 @@ void UserInterface::doTalkControl() {
 	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
 	Common::Point mousePos = events.mousePos();
-	int select;
 
 	_key = _oldKey = -1;
 	_keyboardInput = false;
@@ -1728,7 +1725,7 @@ void UserInterface::doTalkControl() {
 						talk.loadTalkFile(linkFilename);
 
 						// Find the first new statement
-						select = _selector = _oldSelector = -1;
+						int select = _selector = _oldSelector = -1;
 						for (uint idx = 0; idx < talk._statements.size() && select == -1; ++idx) {
 							if (!talk._statements[idx]._talkMap)
 								select = talk._talkIndex = idx;
@@ -1795,7 +1792,6 @@ void UserInterface::journalControl() {
 	Journal &journal = *_vm->_journal;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	int found;
 	bool doneFlag = false;
 
 	// Draw the journal screen
@@ -1803,7 +1799,7 @@ void UserInterface::journalControl() {
 
 	// Handle journal events
 	do {
-		found = _key = -1;
+		_key = -1;
 		events.setButtonState();
 		
 		// Handle keypresses
@@ -1846,12 +1842,11 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	Inventory &inv = *_vm->_inventory;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	int savedSelector;
 
 	if (str.hasPrefix("_")) {
 		_lookScriptFlag = true;
 		events.setCursor(MAGNIFY);
-		savedSelector = _selector;
+		int savedSelector = _selector;
 		talk.talkTo(str.c_str() + 1);
 		_lookScriptFlag = false;
 
@@ -2255,11 +2250,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	bool printed = false;
-	bool doCAnim = true;
-	int cAnimNum;
 	Common::Point pt(-1, -1);
-	int dir = -1;
 
 	if (objNum >= 1000)
 		// Ignore actions done on characters
@@ -2277,12 +2268,14 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 	} else {
 		Object &obj = scene._bgShapes[objNum];
 
+		int cAnimNum;
 		if (action._cAnimNum == 0)
 			// Really a 10
 			cAnimNum = 9;
 		else
 			cAnimNum = action._cAnimNum - 1;
 	
+		int dir = -1;
 		if (action._cAnimNum != 99) {
 			CAnim &anim = scene._cAnim[cAnimNum];
 
@@ -2303,6 +2296,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		// Has a value, so do action
 		// Show wait cursor whilst walking to object and doing action
 		events.setCursor(WAIT);
+		bool printed = false;
 
 		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
 			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2 
@@ -2314,6 +2308,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 			}
 		}
 
+		bool doCAnim = true;
 		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
 			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2) {
 				char ch = toupper(action._names[nameIdx][1]);
-- 
cgit v1.2.3


From d9e93f8e015ce27a95090e854494c4b3f7d1c0d4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 7 May 2015 19:33:44 +0200
Subject: SHERLOCK: some code formatting

---
 engines/sherlock/animation.cpp       |  22 +++---
 engines/sherlock/decompress.cpp      |  78 ++++++++++-----------
 engines/sherlock/detection.cpp       |   4 +-
 engines/sherlock/events.cpp          |   4 +-
 engines/sherlock/graphics.cpp        |   8 +--
 engines/sherlock/inventory.cpp       |  52 +++++++-------
 engines/sherlock/journal.cpp         |  32 ++++-----
 engines/sherlock/map.cpp             |   8 +--
 engines/sherlock/objects.cpp         |  28 ++++----
 engines/sherlock/objects.h           |   4 +-
 engines/sherlock/people.cpp          |  10 +--
 engines/sherlock/people.h            |  16 ++---
 engines/sherlock/resources.cpp       |  12 ++--
 engines/sherlock/resources.h         |   2 +-
 engines/sherlock/saveload.cpp        |  18 ++---
 engines/sherlock/scalpel/darts.cpp   |  18 ++---
 engines/sherlock/scalpel/scalpel.cpp |  38 +++++-----
 engines/sherlock/scene.cpp           |  34 ++++-----
 engines/sherlock/screen.cpp          |  16 ++---
 engines/sherlock/settings.cpp        |  46 ++++++-------
 engines/sherlock/sherlock.cpp        |   4 +-
 engines/sherlock/sound.h             |   2 +-
 engines/sherlock/talk.cpp            |  50 +++++++-------
 engines/sherlock/user_interface.cpp  | 130 +++++++++++++++++------------------
 24 files changed, 318 insertions(+), 318 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 62e6e4bebf..fc84680d5e 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -26,30 +26,30 @@
 
 namespace Sherlock {
 
-// The following are a list of filenames played in the prologue that have 
+// The following are a list of filenames played in the prologue that have
 // special effects associated with them at specific frames
 
 #define FRAMES_END 32000
 #define PROLOGUE_NAMES_COUNT 6
 #define TITLE_NAMES_COUNT 7
-static const char *const PROLOGUE_NAMES[6] = { 
-	"subway1", "subway2", "finale2", "suicid", "coff3", "coff4" 
+static const char *const PROLOGUE_NAMES[6] = {
+	"subway1", "subway2", "finale2", "suicid", "coff3", "coff4"
 };
-static const int PROLOGUE_FRAMES[6][9] = { 
+static const int PROLOGUE_FRAMES[6][9] = {
 	{ 4, 26, 54, 72, 92, 134, FRAMES_END },
 	{ 2, 80, 95, 117, 166, FRAMES_END },
 	{ 1, FRAMES_END },
 	{ 42, FRAMES_END },
 	{ FRAMES_END },
-	{ FRAMES_END } 
+	{ FRAMES_END }
 };
 
 // Title animations file list
-static const char *const TITLE_NAMES[7] = { 
-	"27pro1", "14note", "coff1", "coff2", "coff3", "coff4", "14kick" 
+static const char *const TITLE_NAMES[7] = {
+	"27pro1", "14note", "coff1", "coff2", "coff3", "coff4", "14kick"
 };
 
-static const int TITLE_FRAMES[7][9] = { 
+static const int TITLE_FRAMES[7][9] = {
 	{ 29, 131, FRAMES_END },
 	{ 55, 80, 95, 117, 166, FRAMES_END },
 	{ 15, FRAMES_END },
@@ -67,7 +67,7 @@ Animation::Animation(SherlockEngine *vm): _vm(vm) {
 /**
  * Play a full-screen animation
  */
-bool Animation::play(const Common::String &filename, int minDelay, int fade, 
+bool Animation::play(const Common::String &filename, int minDelay, int fade,
 		bool setPalette, int speed) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -98,7 +98,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	// Load initial image
 	Common::String vdaName = baseName + ".vda";
 	ImageFile images(vdaName, true, true);
-	
+
 	events.wait(minDelay);
 	if (fade != 0 && fade != 255)
 		screen.fadeToBlack();
@@ -166,7 +166,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 			break;
 		}
 	}
-	
+
 	events.clearEvents();
 	sound.stopSound();
 	delete stream;
diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index 61110be840..b319bc90c8 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -36,47 +36,47 @@ Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int
 		outSize = source.readSint32LE();
 	}
 
-    byte lzWindow[4096];
-    uint16 lzWindowPos;
-    uint16 cmd;
-    
-    byte *outBuffer = new byte[outSize];
-    byte *outBufferEnd = outBuffer + outSize;
-    Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
-    
-    memset(lzWindow, 0xFF, 0xFEE);
-    lzWindowPos = 0xFEE;
-    cmd = 0;
+	byte lzWindow[4096];
+	uint16 lzWindowPos;
+	uint16 cmd;
 
-    while (1) {
-        cmd >>= 1;
-        if (!(cmd & 0x100)) {
-            cmd = source.readByte() | 0xFF00;
-        }
-        if (cmd & 1) {
-            byte literal = source.readByte();
-            *outBuffer++ = literal;
-            lzWindow[lzWindowPos] = literal;
-            lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
-        } else {
-            int copyPos, copyLen;
-            copyPos = source.readByte();
-            copyLen = source.readByte();
-            copyPos = copyPos | ((copyLen & 0xF0) << 4);
-            copyLen = (copyLen & 0x0F) + 3;
-            while (copyLen--) {
-                byte literal = lzWindow[copyPos];
-                copyPos = (copyPos + 1) & 0x0FFF;
-                *outBuffer++ = literal;
-                lzWindow[lzWindowPos] = literal;
-                lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
-            }
-        }
-        if (outBuffer >= outBufferEnd)
-            break;
-    }
+	byte *outBuffer = new byte[outSize];
+	byte *outBufferEnd = outBuffer + outSize;
+	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
 
-    return outS;
+	memset(lzWindow, 0xFF, 0xFEE);
+	lzWindowPos = 0xFEE;
+	cmd = 0;
+
+	while (1) {
+		cmd >>= 1;
+		if (!(cmd & 0x100))
+			cmd = source.readByte() | 0xFF00;
+
+		if (cmd & 1) {
+			byte literal = source.readByte();
+			*outBuffer++ = literal;
+			lzWindow[lzWindowPos] = literal;
+			lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+		} else {
+			int copyPos, copyLen;
+			copyPos = source.readByte();
+			copyLen = source.readByte();
+			copyPos = copyPos | ((copyLen & 0xF0) << 4);
+			copyLen = (copyLen & 0x0F) + 3;
+			while (copyLen--) {
+				byte literal = lzWindow[copyPos];
+				copyPos = (copyPos + 1) & 0x0FFF;
+				*outBuffer++ = literal;
+				lzWindow[lzWindowPos] = literal;
+				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+			}
+		}
+		if (outBuffer >= outBufferEnd)
+			break;
+	}
+
+	return outS;
 }
 
 } // namespace Sherlock
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 14fc04cc73..734db007ba 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -148,13 +148,13 @@ int SherlockMetaEngine::getMaximumSaveSlot() const {
 /**
  * Deletes a savegame in the specified slot
  */
-void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {	
+void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {
 	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	g_system->getSavefileManager()->removeSavefile(filename);
 }
 
 /**
- * Given a specified savegame slot, returns extended information for the save 
+ * Given a specified savegame slot, returns extended information for the save
  */
 SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index a4fc93edd9..4e3f81e588 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -95,7 +95,7 @@ void Events::hideCursor() {
 }
 
 /**
- * Returns the cursor 
+ * Returns the cursor
  */
 CursorId Events::getCursor() const {
 	return _cursorId;
@@ -200,7 +200,7 @@ bool Events::checkForNextFrameCounter() {
 /**
  * Get a pending keypress
  */
-Common::KeyState Events::getKey() { 
+Common::KeyState Events::getKey() {
 	Common::KeyState keyState = _pendingKeys.pop();
 	if ((keyState.flags & Common::KBD_SHIFT) != 0)
 		keyState.ascii = toupper(keyState.ascii);
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 2095e7d35d..132d3fa089 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -72,7 +72,7 @@ void Surface::blitFrom(const Graphics::Surface &src) {
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
 	Common::Point destPt = pt;
-	
+
 	if (destPt.x < 0) {
 		drawRect.left += -destPt.x;
 		destPt.x = 0;
@@ -125,7 +125,7 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 		bool flipped, int overrideColor) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
 	Common::Rect destRect(pt.x, pt.y, pt.x + src.w, pt.y + src.h);
-	
+
 	// Clip the display area to on-screen
 	if (!clip(drawRect, destRect))
 		// It's completely off-screen
@@ -166,7 +166,7 @@ void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
  * Fill a given area of the surface with a given color
  */
 void Surface::fillRect(const Common::Rect &r, byte color) {
-    Graphics::Surface::fillRect(r, color);
+	Graphics::Surface::fillRect(r, color);
 	addDirtyRect(r);
 }
 
@@ -198,7 +198,7 @@ bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
 		srcBounds.left += -destBounds.left;
 		destBounds.left = 0;
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 935a306619..99db461ea4 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -26,8 +26,8 @@
 namespace Sherlock {
 
 InventoryItem::InventoryItem(int requiredFlag, const Common::String &name,
-		const Common::String &description, const Common::String &examine) : 
-		_requiredFlag(requiredFlag), _name(name), _description(description), 
+		const Common::String &description, const Common::String &examine) :
+		_requiredFlag(requiredFlag), _name(name), _description(description),
 		_examine(examine), _lookFlag(0) {
 }
 
@@ -74,7 +74,7 @@ void Inventory::freeInv() {
 void Inventory::freeGraphics() {
 	for (uint idx = 0; idx < MAX_VISIBLE_INVENTORY; ++idx)
 		delete _invShapes[idx];
-	
+
 	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
 	_invGraphicsLoaded = false;
 }
@@ -98,7 +98,7 @@ void Inventory::loadInv() {
 
 		_names.push_back(name);
 	}
-	
+
 	delete stream;
 
 	loadGraphics();
@@ -181,7 +181,7 @@ void Inventory::putInv(int slamIt) {
 
 		// Draw the item image
 		Graphics::Surface &img = (*_invShapes[itemNum])[0]._frame;
-		bb.transBlitFrom(img, Common::Point(6 + itemNum * 52 + ((47 - img.w) / 2), 
+		bb.transBlitFrom(img, Common::Point(6 + itemNum * 52 + ((47 - img.w) / 2),
 			163 + ((33 - img.h) / 2)));
 	}
 
@@ -206,7 +206,7 @@ void Inventory::putInv(int slamIt) {
  * 0   = plain inventory mode
  * 2   = use inventory mode
  * 3   = give inventory mode
- * 128 = Draw window in the back buffer, but don't display it 
+ * 128 = Draw window in the back buffer, but don't display it
  */
 void Inventory::drawInventory(int flag) {
 	Screen &screen = *_vm->_screen;
@@ -224,7 +224,7 @@ void Inventory::drawInventory(int flag) {
 	Surface &bb = *screen._backBuffer;
 	bb.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 10), BORDER_COLOR);
 	bb.fillRect(Common::Rect(0, CONTROLS_Y1 + 10, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-	bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 10, 
+	bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 10,
 		SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
 	bb.fillRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 2, SHERLOCK_SCREEN_WIDTH,
 		SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
@@ -232,21 +232,21 @@ void Inventory::drawInventory(int flag) {
 		INV_BACKGROUND);
 
 	// Draw the buttons
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[0][0], CONTROLS_Y1, INVENTORY_POINTS[0][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[0][0], CONTROLS_Y1, INVENTORY_POINTS[0][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[1][0], CONTROLS_Y1, INVENTORY_POINTS[1][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[1][2] - screen.stringWidth("Look") / 2, "Look");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[2][0], CONTROLS_Y1, INVENTORY_POINTS[2][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[2][0], CONTROLS_Y1, INVENTORY_POINTS[2][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[2][2] - screen.stringWidth("Use") / 2, "Use");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[3][0], CONTROLS_Y1, INVENTORY_POINTS[3][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[3][0], CONTROLS_Y1, INVENTORY_POINTS[3][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[3][2] - screen.stringWidth("Give") / 2, "Give");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[4][0], CONTROLS_Y1, INVENTORY_POINTS[4][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[4][0], CONTROLS_Y1, INVENTORY_POINTS[4][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[4][2], "^^");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[5][0], CONTROLS_Y1, INVENTORY_POINTS[5][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[5][0], CONTROLS_Y1, INVENTORY_POINTS[5][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[5][2], "^");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[6][0], CONTROLS_Y1, INVENTORY_POINTS[6][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[6][0], CONTROLS_Y1, INVENTORY_POINTS[6][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[6][2], "_");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[7][0], CONTROLS_Y1, INVENTORY_POINTS[7][1], 
+	screen.makeButton(Common::Rect(INVENTORY_POINTS[7][0], CONTROLS_Y1, INVENTORY_POINTS[7][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[7][2], "__");
 
 	if (tempFlag == 128)
@@ -289,43 +289,43 @@ void Inventory::invCommands(bool slamIt) {
 	UserInterface &ui = *_vm->_ui;
 
 	if (slamIt) {
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
 			_invMode == 0 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
 			true, "Exit");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1),
 			_invMode == 1 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
 			true, "Look");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1),
 			_invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Use");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1),
 			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Give");
-		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), 
+		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^^");
-		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1), 
+		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^");
-		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), 
+		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"_");
-		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), 
+		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"__");
 		if (_invMode != 1)
 			ui.clearInfo();
 	} else {
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
 			_invMode == 0 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Exit");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1),
 			_invMode == 1 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Look");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1),
 			_invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Use");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), 
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1),
 			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Give");
 		screen.gPrint(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1),
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index dfff6e9bb7..26aaa7a1a0 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -29,7 +29,7 @@ namespace Sherlock {
 #define LINES_PER_PAGE 11
 
 // Positioning of buttons in the journal view
-const int JOURNAL_POINTS[9][3] = { 
+const int JOURNAL_POINTS[9][3] = {
 	{ 6, 68, 37 },
 	{ 69, 131, 100 },
 	{ 132, 192, 162 },
@@ -38,7 +38,7 @@ const int JOURNAL_POINTS[9][3] = {
 	{ 6, 82, 44 },
 	{ 83, 159, 121 },
 	{ 160, 236, 198 },
-	{ 237, 313, 275 } 
+	{ 237, 313, 275 }
 };
 
 const int SEARCH_POINTS[3][3] = {
@@ -101,7 +101,7 @@ void Journal::loadJournalLocations() {
 
 	Common::SeekableReadStream *dir = res.load("talk.lib");
 	dir->skip(4);		// Skip header
-	
+
 	// Get the numer of entries
 	_directory.resize(dir->readUint16LE());
 
@@ -198,8 +198,8 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			const char *lineP = journalString.c_str() + journalString.size() - 1;
 			while (width > 230 || *lineP != ' ')
 				width -= screen.charWidth(*lineP--);
-			
-			// Split the header into two lines, and add a '@' prefix 
+
+			// Split the header into two lines, and add a '@' prefix
 			// to the second line as well
 			journalString = Common::String(journalString.c_str(), lineP) + "\n@" +
 				Common::String(lineP + 1);
@@ -217,7 +217,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 			journalString += "asked ";
 		else
 			journalString += "said to ";
-	
+
 		switch (talk._talkTo) {
 		case 1:
 			journalString += "me";
@@ -364,7 +364,7 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 
 			case WALK_TO_COORDS:
 			case MOVE_MOUSE:
-				replyP += 4; 
+				replyP += 4;
 				break;
 
 			case SET_FLAG:
@@ -422,13 +422,13 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 		// past it, so the @ won't be included in the line width calculation
 		if (*startP == '@')
 			++startP;
-	
+
 		// Build up chacters until a full line is found
 		int width = 0;
 		const char *endP = startP;
 		while (width < 230 && *endP && *endP != '\n' && (endP - startP) < 79)
 			width += screen.charWidth(*endP++);
-		
+
 		// If word wrapping, move back to end of prior word
 		if (width >= 230 || (endP - startP) >= 79) {
 			while (*--endP != ' ')
@@ -520,7 +520,7 @@ void Journal::drawInterface() {
 	}
 
 	doArrows();
-		
+
 	// Show the entire screen
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
@@ -650,7 +650,7 @@ bool Journal::doJournal(int direction, int howFar) {
 
 	case 2:
 	case 3:
-		// Move howFar lines ahead unless the end of the journal is reached, 
+		// Move howFar lines ahead unless the end of the journal is reached,
 		// or a searched for keyword is found
 		for (temp = 0; (temp < (howFar / LINES_PER_PAGE)) && !endJournal && !searchSuccessful; ++temp) {
 			// Handle animating mouse cursor
@@ -687,7 +687,7 @@ bool Journal::doJournal(int direction, int howFar) {
 								_sub = 0;
 								maxLines = loadJournalFile(false);
 							}
-						} while (!endJournal && !maxLines);						
+						} while (!endJournal && !maxLines);
 					}
 
 					++lineNum;
@@ -919,7 +919,7 @@ bool Journal::handleEvents(int key) {
 			doJournal(1, (_page - 1) * LINES_PER_PAGE);
 		else
 			doJournal(1, 10 * LINES_PER_PAGE);
-	
+
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
@@ -952,7 +952,7 @@ bool Journal::handleEvents(int key) {
 	if (((found == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
 		bool notFound = false;
-	
+
 
 		do {
 			int dir;
@@ -1076,7 +1076,7 @@ int Journal::getFindName(bool printError) {
 
 	xp = 15 + screen.stringWidth(name);
 	yp = 186;
-	
+
 	do {
 		events._released = false;
 		Button found = BTN_NONE;
@@ -1141,7 +1141,7 @@ int Journal::getFindName(bool printError) {
 			}
 
 			if (keyState.keycode >= Common::KEYCODE_SPACE && keyState.keycode <= Common::KEYCODE_z
-					&& keyState.keycode != Common::KEYCODE_AT && name.size() < 50 
+					&& keyState.keycode != Common::KEYCODE_AT && name.size() < 50
 					&& (xp + screen.charWidth(keyState.keycode)) < 296) {
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", (char)keyState.keycode);
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 4f04312ba7..3879e904fa 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -180,7 +180,7 @@ int Map::show() {
 		// Ignore scrolling attempts until the screen is drawn
 		if (!_drawMap) {
 			Common::Point pt = events.mousePos();
-			
+
 			// Check for vertical map scrolling
 			if ((pt.y > (SHERLOCK_SCREEN_HEIGHT - 10) && _bigPos.y < 200) || (pt.y < 10 && _bigPos.y > 0)) {
 				if (pt.y > (SHERLOCK_SCREEN_HEIGHT - 10))
@@ -336,7 +336,7 @@ void Map::showPlaces() {
 			if (pt.x >= _bigPos.x && (pt.x - _bigPos.x) < SHERLOCK_SCREEN_WIDTH
 					&& pt.y >= _bigPos.y && (pt.y - _bigPos.y) < SHERLOCK_SCREEN_HEIGHT) {
 				if (_vm->readFlags(idx)) {
-					screen._backBuffer1.transBlitFrom((*_iconShapes)[pt._translate], 
+					screen._backBuffer1.transBlitFrom((*_iconShapes)[pt._translate],
 						Common::Point(pt.x - _bigPos.x - 6, pt.y - _bigPos.y - 12));
 				}
 			}
@@ -372,7 +372,7 @@ void Map::showPlaceName(int idx, bool highlighted) {
 
 	if (!_cursorIndex) {
 		saveIcon(people[AL]._imageFrame, _lDrawnPos);
-		
+
 		bool flipped = people[AL]._sequenceNumber == MAP_DOWNLEFT || people[AL]._sequenceNumber == MAP_LEFT
 			|| people[AL]._sequenceNumber == MAP_UPLEFT;
 		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, _lDrawnPos, flipped);
@@ -510,7 +510,7 @@ void Map::saveIcon(ImageFrame *src, const Common::Point &pt) {
 		size.x += pos.x;
 		pos.x = 0;
 	}
-	
+
 	if (pos.y < 0) {
 		size.y += pos.y;
 		pos.y = 0;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 8a7ae49e34..40c8b954cb 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -72,7 +72,7 @@ void Sprite::clear() {
  * Updates the image frame poiner for the sprite
  */
 void Sprite::setImageFrame() {
-	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber] + 
+	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber] +
 		(*_sequences)[_sequenceNumber][0] - 2;
 	_imageFrame = &(*_images)[imageNumber];
 }
@@ -171,7 +171,7 @@ void Sprite::adjustSprite() {
 				if (people._hSavedFacing > 100 && people._hSavedPos.x < 1)
 					people._hSavedPos.x = 100;
 			}
-		}		
+		}
 	}
 }
 
@@ -241,7 +241,7 @@ void Sprite::checkSprite() {
 								if (obj._aType == PAL_CHANGE)
 									// Invert percentage
 									palPercent = 100 - palPercent;
-								
+
 								for (int idx = palStart; idx < (palStart + palLength); ++idx)
 									screen._sMap[idx] = screen._cMap[idx] * palPercent / 100;
 
@@ -320,7 +320,7 @@ void Sprite::checkSprite() {
 										walkPos.x = objBounds.left - CLEAR_DIST_X;
 								}
 
-								walkPos.y = (_delta.y >= 0) ? objBounds.top - CLEAR_DIST_Y : 
+								walkPos.y = (_delta.y >= 0) ? objBounds.top - CLEAR_DIST_Y :
 									objBounds.bottom + CLEAR_DIST_Y;
 							} else {
 								// Impact occurred due to horizontal movement
@@ -362,11 +362,11 @@ void Sprite::checkSprite() {
 /*----------------------------------------------------------------*/
 
 /**
- * Synchronize the data for a savegame 
+ * Synchronize the data for a savegame
  */
 void ActionType::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
-	
+
 	_cAnimNum = s.readByte();
 	_cAnimSpeed = s.readByte();
 	if (_cAnimSpeed & 0x80)
@@ -388,7 +388,7 @@ UseType::UseType() {
 }
 
 /**
- * Synchronize the data for a savegame 
+ * Synchronize the data for a savegame
  */
 void UseType::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
@@ -489,7 +489,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_oldSize.y = s.readUint16LE();
 	_goto.x = s.readSint16LE();
 	_goto.y = s.readSint16LE();
-	
+
 	_pickup = s.readByte();
 	_defaultCommand = s.readByte();
 	_lookFlag = s.readUint16LE();
@@ -500,7 +500,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_status = s.readUint16LE();
 	_misc = s.readByte();
 	_maxFrames = s.readUint16LE();
-	_flags = s.readByte();	
+	_flags = s.readByte();
 	_aOpen.synchronize(s);
 	_aType = (AType)s.readByte();
 	_lookFrames = s.readByte();
@@ -518,7 +518,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	s.skip(1);
 	_aMove.synchronize(s);
 	s.skip(8);
-	
+
 	for (int idx = 0; idx < 4; ++idx)
 		_use[idx].synchronize(s);
 }
@@ -861,8 +861,8 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 			// A: Add onto existing co-ordinates
 			Common::String sx(name.c_str() + 2, name.c_str() + 5);
 			Common::String sy(name.c_str() + 6, name.c_str() + 9);
-			
-			if (ch == 'G')			
+
+			if (ch == 'G')
 				_position = Common::Point(atoi(sx.c_str()), atoi(sy.c_str()));
 			else
 				_position += Common::Point(atoi(sx.c_str()), atoi(sy.c_str()));
@@ -1055,7 +1055,7 @@ int Object::pickUpObject(const char *const messages[]) {
 		if (!printed) {
 			ui._infoFlag++;
 			ui.clearInfo();
-			
+
 			Common::String itemName = _description;
 			itemName.setChar(tolower(itemName[0]), 0);
 			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Picked up %s", itemName.c_str());
@@ -1096,7 +1096,7 @@ const Common::Rect Object::getOldBounds() const {
 /*----------------------------------------------------------------*/
 
 /**
- * Synchronize the data for a savegame 
+ * Synchronize the data for a savegame
  */
 void CAnim::synchronize(Common::SeekableReadStream &s) {
 	char buffer[12];
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 10b491e5d7..861858c58e 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -75,7 +75,7 @@ enum {
 #define MAX_FRAME 30
 
 // code put into sequences to defines 1-10 type seqs
-#define SEQ_TO_CODE 67			
+#define SEQ_TO_CODE 67
 #define FLIP_CODE (64 + 128)
 #define SOUND_CODE (34 + 128)
 
@@ -216,7 +216,7 @@ public:
 	int _seqTo;						// Allows 1-5, 8-3 type sequences encoded in 2 bytes
 	uint _descOffset;					// Tells where description starts in DescText
 	int _seqCounter2;				// Counter of calling frame sequence
-	uint _seqSize;					// Tells where description starts 
+	uint _seqSize;					// Tells where description starts
 	ActionType _aMove;
 	UseType _use[4];
 
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 84194059e1..ee5f3bcb80 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -33,7 +33,7 @@ namespace Sherlock {
 // Characer animation sequences
 static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 	{ 29, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Right
-	{ 22, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Down 
+	{ 22, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Down
 	{ 29, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Left
 	{ 15, 1, 2, 3, 4, 5, 6, 7, 0 },		// Walk Up
 	{ 42, 1, 2, 3, 4, 5, 0 },			// Goto Stand Right
@@ -116,7 +116,7 @@ const char PORTRAITS[MAX_PEOPLE][5] = {
 	{ "NIGE" },			// Nigel Jameson
 	{ "JONA" },			// Jonas (newspaper seller)
 	{ "DUGA" },			// Constable Dugan
-	{ "INSP" }			// Inspector Lestrade (Scotland Yard) 
+	{ "INSP" }			// Inspector Lestrade (Scotland Yard)
 };
 
 const char  *const NAMES[MAX_PEOPLE] = {
@@ -421,7 +421,7 @@ void People::setWalking() {
 	if (!_player._walkCount)
 		gotoStand(_player);
 
-	// If the sequence is the same as when we started, then Holmes was 
+	// If the sequence is the same as when we started, then Holmes was
 	// standing still and we're trying to re-stand him, so reset Holmes'
 	// rame to the old frame number from before it was reset to 0
 	if (_player._sequenceNumber == oldDirection)
@@ -429,7 +429,7 @@ void People::setWalking() {
 }
 
 /**
- * Bring a moving character to a standing position. If the Scalpel chessboard 
+ * Bring a moving character to a standing position. If the Scalpel chessboard
  * is being displayed, then the chraracter will always face down.
  */
 void People::gotoStand(Sprite &sprite) {
@@ -516,7 +516,7 @@ void People::walkToCoords(const Common::Point &destPos, int destDir) {
  */
 void People::goAllTheWay() {
 	Scene &scene = *_vm->_scene;
-	Common::Point srcPt(_player._position.x / 100 + _player.frameWidth() / 2, 
+	Common::Point srcPt(_player._position.x / 100 + _player.frameWidth() / 2,
 		_player._position.y / 100);
 
 	// Get the zone the player is currently in
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index f1ed3496a1..01ecd1a09a 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -32,11 +32,11 @@ namespace Sherlock {
 
 // People definitions
 enum PeopleId {
-	PLAYER	= 0,
-	AL		= 0,
-	PEG		= 1,
+	PLAYER        = 0,
+	AL            = 0,
+	PEG           = 1,
 	NUM_OF_PEOPLE = 2,		// Holmes and Watson
-	MAX_PEOPLE = 66			// Total of all NPCs
+	MAX_PEOPLE    = 66		// Total of all NPCs
 };
 
 // Animation sequence identifiers for characters
@@ -92,13 +92,13 @@ public:
 	People(SherlockEngine *vm);
 	~People();
 
-	Person &operator[](PeopleId id) { 
+	Person &operator[](PeopleId id) {
 		assert(id < NUM_OF_PEOPLE);
-		return _data[id]; 
+		return _data[id];
 	}
-	Person &operator[](int idx) { 
+	Person &operator[](int idx) {
 		assert(idx < NUM_OF_PEOPLE);
-		return _data[idx]; 
+		return _data[idx];
 	}
 
 	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 0be5bc814d..715ca492ae 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -116,8 +116,8 @@ Resources::Resources() {
  * Adds the specified file to the cache. If it's a library file, takes care of
  * loading it's index for future use
  */
-void Resources::addToCache(const Common::String &filename) { 
-	_cache.load(filename); 
+void Resources::addToCache(const Common::String &filename) {
+	_cache.load(filename);
 
 	// Check to see if the file is a library
 	Common::SeekableReadStream *stream = load(filename);
@@ -270,10 +270,10 @@ void ImageFile::setVm(SherlockEngine *vm) {
 
 ImageFile::ImageFile(const Common::String &name, bool skipPal, bool animImages) {
 	Common::SeekableReadStream *stream = _vm->_res->load(name);
-	
+
 	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
 	load(*stream, skipPal, animImages);
-	
+
 	delete stream;
 }
 
@@ -327,7 +327,7 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 		// Load data for frame and decompress it
 		byte *data = new byte[frame._size];
 		stream.read(data, frame._size);
-        decompressFrame(frame, data);		
+        decompressFrame(frame, data);
 		delete[] data;
 
 		push_back(frame);
@@ -344,7 +344,7 @@ void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
 	stream.skip(1);		// Skip paletteBase byte
 	bool rleEncoded = stream.readByte() == 1;
 	int size = v1 * v2;
-	
+
 	if ((size - 12) == PALETTE_SIZE && !rleEncoded) {
 		// Found palette, so read it in
 		stream.seek(2 + 12, SEEK_CUR);
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index b173884322..d53351e085 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -42,7 +42,7 @@ struct LibraryEntry {
 	int _index;
 
 	LibraryEntry() : _index(0), _offset(0), _size(0) {}
-	LibraryEntry(int index, uint32 offset, uint32 size) : 
+	LibraryEntry(int index, uint32 offset, uint32 size) :
 		_index(index), _offset(offset), _size(size) {}
 };
 typedef Common::HashMap<Common::String, LibraryEntry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> LibraryIndex;
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 71e21618ae..61fe9f30bf 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -40,7 +40,7 @@ const int ENV_POINTS[6][3] = {
 
 /*----------------------------------------------------------------*/
 
-SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) : 
+SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) :
 		_vm(vm), _target(target) {
 	_saveThumb = nullptr;
 	_envMode = SAVEMODE_NONE;
@@ -71,7 +71,7 @@ void SaveManager::drawInterface() {
 	screen._backBuffer1.fillRect(Common::Rect(0, 199, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
 	screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
 
-	screen.makeButton(Common::Rect(ENV_POINTS[0][0], CONTROLS_Y, ENV_POINTS[0][1], CONTROLS_Y + 10), 
+	screen.makeButton(Common::Rect(ENV_POINTS[0][0], CONTROLS_Y, ENV_POINTS[0][1], CONTROLS_Y + 10),
 		ENV_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
 	screen.makeButton(Common::Rect(ENV_POINTS[1][0], CONTROLS_Y, ENV_POINTS[1][1], CONTROLS_Y + 10),
 		ENV_POINTS[1][2] - screen.stringWidth("Load") / 2, "Load");
@@ -92,9 +92,9 @@ void SaveManager::drawInterface() {
 
 	for (int idx = _savegameIndex; idx < _savegameIndex + 5; ++idx)
 	{
-		screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
+		screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
 			INV_FOREGROUND, "%d.", idx + 1);
-		screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
+		screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
 			INV_FOREGROUND, "%s", _savegames[idx].c_str());
 	}
 
@@ -317,7 +317,7 @@ void SaveManager::loadGame(int slot) {
 		generateSaveName(slot));
 	if (!saveFile)
 		return;
-	
+
 	// Load the savaegame header
 	SherlockSavegameHeader header;
 	if (!readSavegameHeader(saveFile, header))
@@ -405,12 +405,12 @@ bool SaveManager::checkGameOnScreen(int slot) {
 			SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
 
 		for (int idx = _savegameIndex; idx < (_savegameIndex + 5); ++idx) {
-			screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10), 
+			screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
 				INV_FOREGROUND, "%d.", idx + 1);
 			screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
 				INV_FOREGROUND, "%s", _savegames[idx].c_str());
 		}
-		
+
 		screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, 318, SHERLOCK_SCREEN_HEIGHT));
 
 		byte color = !_savegameIndex ? COMMAND_NULL : COMMAND_FOREGROUND;
@@ -432,7 +432,7 @@ bool SaveManager::getFilename(int slot) {
 	Talk &talk = *_vm->_talk;
 	int xp, yp;
 	bool flag = false;
-	
+
 	screen.buttonPrint(Common::Point(ENV_POINTS[0][2], CONTROLS_Y), COMMAND_NULL, true, "Exit");
 	screen.buttonPrint(Common::Point(ENV_POINTS[1][2], CONTROLS_Y), COMMAND_NULL, true, "Load");
 	screen.buttonPrint(Common::Point(ENV_POINTS[2][2], CONTROLS_Y), COMMAND_NULL, true, "Save");
@@ -480,7 +480,7 @@ bool SaveManager::getFilename(int slot) {
 
 		if (keyState.keycode == Common::KEYCODE_BACKSPACE && saveName.size() > 0) {
 			// Delete character of save name
-			screen.vgaBar(Common::Rect(xp - screen.charWidth(saveName.lastChar()), yp - 1, 
+			screen.vgaBar(Common::Rect(xp - screen.charWidth(saveName.lastChar()), yp - 1,
 				xp + 8, yp + 9), INV_BACKGROUND);
 			xp -= screen.charWidth(saveName.lastChar());
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 4b48a1dacf..3516a7ae78 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -45,8 +45,8 @@ enum {
 	PLAYER_COLOR = 11
 };
 
-const char *const OPPONENT_NAMES[5] = { 
-	"Skipper", "Willy", "Micky", "Tom", "Bartender" 
+const char *const OPPONENT_NAMES[5] = {
+	"Skipper", "Willy", "Micky", "Tom", "Bartender"
 };
 
 /*----------------------------------------------------------------*/
@@ -83,7 +83,7 @@ void Darts::playDarts() {
 	do {
 		int score, roundStartScore;
 		roundStartScore = score = playerNumber == 0 ? _dartScore1 : _dartScore2;
-		
+
 		// Show player details
 		showNames(playerNumber);
 		showStatus(playerNumber);
@@ -296,7 +296,7 @@ int Darts::throwDart(int dartNum, int computer) {
 	int width, height;
 
 	events.clearKeyboard();
-	
+
 	erasePowerBars();
 	screen.print(Common::Point(DART_INFO_X, DART_INFO_Y), DART_COL_FORE, "Dart # %d", dartNum);
 
@@ -322,10 +322,10 @@ int Darts::throwDart(int dartNum, int computer) {
 	// If it's a computer player, choose a dart destination
 	if (computer)
 		targetNum = getComputerDartDest(computer - 1);
-	
+
 	width = doPowerBar(Common::Point(DARTBARHX, DARTHORIZY), DART_BAR_FORE, targetNum.x, false);
 	height = 101 - doPowerBar(Common::Point(DARTBARVX, DARTHEIGHTY), DART_BAR_FORE, targetNum.y, true);
-	
+
 	// For human players, slight y adjustment
 	if (computer == 0)
 		height += 2;
@@ -429,7 +429,7 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 			// Reached target power for a computer player
 			done = true;
 		else if (goToPower == 0) {
-			// Check for pres 
+			// Check for pres
 			if (dartHit())
 				done = true;
 		}
@@ -472,7 +472,7 @@ bool Darts::dartHit() {
 		events.clearKeyboard();
 		return true;
 	}
-	
+
 	_oldDartButtons = events._pressed;
 	events.setButtonState();
 
@@ -497,7 +497,7 @@ int Darts::dartScore(const Common::Point &pt) {
 }
 
 /**
- * Calculates where a computer player is trying to throw their dart, and choose the actual 
+ * Calculates where a computer player is trying to throw their dart, and choose the actual
  * point that was hit with some margin of error
  */
 Common::Point Darts::getComputerDartDest(int playerNum) {
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 3fe094bcf4..6ba6b33340 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -28,21 +28,21 @@ namespace Sherlock {
 namespace Scalpel {
 
 #define NUM_PLACES 100
-const int MAP_X[NUM_PLACES] = { 
-	0, 368, 0, 219, 0, 282, 0, 43, 0, 0, 396, 408, 0, 0, 0, 568, 37, 325, 
-	28, 0, 263, 36, 148, 469, 342, 143, 443, 229, 298, 0, 157, 260, 432, 
-	174, 0, 351, 0, 528, 0, 136, 0, 0, 0, 555, 165, 0, 506, 0, 0, 344, 0, 0 
+const int MAP_X[NUM_PLACES] = {
+	0, 368, 0, 219, 0, 282, 0, 43, 0, 0, 396, 408, 0, 0, 0, 568, 37, 325,
+	28, 0, 263, 36, 148, 469, 342, 143, 443, 229, 298, 0, 157, 260, 432,
+	174, 0, 351, 0, 528, 0, 136, 0, 0, 0, 555, 165, 0, 506, 0, 0, 344, 0, 0
 };
-const int MAP_Y[NUM_PLACES] = { 
+const int MAP_Y[NUM_PLACES] = {
 	0, 147, 0, 166, 0, 109, 0, 61, 0, 0, 264, 70, 0, 0, 0, 266, 341, 30, 275,
-	0, 294, 146, 311, 230, 184, 268, 133, 94, 207, 0, 142, 142, 330, 255, 0, 
-	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0 
+	0, 294, 146, 311, 230, 184, 268, 133, 94, 207, 0, 142, 142, 330, 255, 0,
+	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0
 };
 
 const int MAP_TRANSLATE[NUM_PLACES] = {
 	0, 0, 0, 1, 0, 2, 0, 3, 4, 0, 4, 6, 0, 0, 0, 8, 9, 10, 11, 0, 12, 13, 14, 7,
 	15, 16, 17, 18, 19, 0, 20, 21, 22, 23, 0, 24, 0, 25, 0, 26, 0, 0, 0, 27,
-	28, 0, 29, 0, 0, 30, 0 
+	28, 0, 29, 0, 0, 30, 0
 };
 
 const byte MAP_SEQUENCES[3][MAX_FRAME] = {
@@ -251,7 +251,7 @@ void ScalpelEngine::showOpening() {
  */
 bool ScalpelEngine::showCityCutscene() {
 	byte palette[PALETTE_SIZE];
-	
+
 	_sound->playMusic("prolog1.mus");
 	_titleOverride = "title.lib";
 	_soundOverride = "title.snd";
@@ -286,7 +286,7 @@ bool ScalpelEngine::showCityCutscene() {
 		ImageFile titleImages("title.vgs", true);
 		_screen->_backBuffer1.copyFrom(*_screen);
 		_screen->_backBuffer2.copyFrom(*_screen);
-		
+
 		// The Lost Files of
 		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(75, 6));
 		// Sherlock Holmes
@@ -473,7 +473,7 @@ void ScalpelEngine::loadInventory() {
 	inv._holdings = 2;
 	inv.push_back(InventoryItem(0, "Message", "A message requesting help", "_ITEM03A"));
 	inv.push_back(InventoryItem(0, "Holmes Card", "A number of business cards", "_ITEM07A"));
-	
+
 	// Hidden items
 	inv.push_back(InventoryItem(95, "Tickets", "Opera Tickets", "_ITEM10A"));
 	inv.push_back(InventoryItem(138, "Cuff Link", "Cuff Link", "_ITEM04A"));
@@ -524,7 +524,7 @@ void ScalpelEngine::startScene() {
 	//  2: Blackwood's capture
 	// 52: Rescuing Anna
 	// 53: Moorehead's death / subway train
-	// 55: Fade out and exit 
+	// 55: Fade out and exit
 	// 70: Brumwell suicide
 	switch (_scene->_goToScene) {
 	case 2:
@@ -678,7 +678,7 @@ void ScalpelEngine::eraseMirror12() {
 void ScalpelEngine::doMirror12() {
 	People &people = *_people;
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
-	int frameNum = (*people[AL]._sequences)[people[AL]._sequenceNumber][people[AL]._frameNumber] + 
+	int frameNum = (*people[AL]._sequences)[people[AL]._sequenceNumber][people[AL]._frameNumber] +
 		(*people[AL]._sequences)[people[AL]._sequenceNumber][0] - 2;
 
 	switch ((*_people)[AL]._sequenceNumber) {
@@ -733,17 +733,17 @@ void ScalpelEngine::doMirror12() {
 		_screen->_backBuffer1.transBlitFrom(imageFrame, pt + Common::Point(38, -imageFrame._frame.h - 25), flipped);
 
 		// Redraw the mirror borders to prevent the drawn image of Holmes from appearing outside of the mirror
-		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(114, 18), 
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(114, 18),
 			Common::Rect(114, 18, 137, 114));
-		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(137, 70), 
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(137, 70),
 			Common::Rect(137, 70, 142, 114));
-		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(142, 71), 
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(142, 71),
 			Common::Rect(142, 71, 159, 114));
-		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(159, 72), 
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(159, 72),
 			Common::Rect(159, 72, 170, 116));
-		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(170, 73), 
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(170, 73),
 			Common::Rect(170, 73, 184, 114));
-		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(184, 18), 
+		_screen->_backBuffer1.blitFrom(_screen->_backBuffer2, Common::Point(184, 18),
 			Common::Rect(184, 18, 212, 114));
 	}
 }
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 857dff4951..c1a73fee90 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -256,7 +256,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		// Read information
 		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, bgHeader._numImages * 569 + 
+			decompressLZ(*rrmStream, bgHeader._numImages * 569 +
 				bgHeader._descSize + bgHeader._seqSize);
 
 		_bgShapes.resize(bgHeader._numStructs);
@@ -271,7 +271,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		if (bgHeader._seqSize) {
 			_sequenceBuffer.resize(bgHeader._seqSize);
 			infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
-		}			
+		}
 
 		if (_lzwMode)
 			delete infoStream;
@@ -390,7 +390,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		rrmStream->read(screen._cMap, PALETTE_SIZE);
 		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
 			screen._cMap[idx] = VGA_COLOR_TRANS(screen._cMap[idx]);
-		
+
 		Common::copy(screen._cMap, screen._cMap + PALETTE_SIZE, screen._sMap);
 
 		// Read in the background
@@ -522,7 +522,7 @@ void Scene::checkSceneFlags(bool flag) {
 
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
-		
+
 		if (o._requiredFlag) {
 			if (!_vm->readFlags(_bgShapes[idx]._requiredFlag)) {
 				// Kill object
@@ -655,7 +655,7 @@ void Scene::transitionToScene() {
 			if (obj._type != NO_SHAPE) {
 				topLeft += obj._imageFrame->_offset;
 				bottomRight.x = topLeft.x + obj._imageFrame->_frame.w;
-				bottomRight.y = topLeft.y + obj._imageFrame->_frame.h;			
+				bottomRight.y = topLeft.y + obj._imageFrame->_frame.h;
 			} else {
 				bottomRight = topLeft + obj._noShapeSize;
 			}
@@ -768,7 +768,7 @@ void Scene::updateBackground() {
 	// Draw all canimations which are normal and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == NORMAL_BEHIND)
-			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
 				_canimShapes[idx]._flags & 2);
 	}
 
@@ -778,7 +778,7 @@ void Scene::updateBackground() {
 			player._sequenceNumber == WALK_UPLEFT || player._sequenceNumber == STOP_UPLEFT ||
 			player._sequenceNumber == WALK_DOWNRIGHT || player._sequenceNumber == STOP_DOWNRIGHT;
 
-		screen._backBuffer->transBlitFrom(*player._imageFrame, Common::Point(player._position.x / 100, 
+		screen._backBuffer->transBlitFrom(*player._imageFrame, Common::Point(player._position.x / 100,
 			player._position.y / 100 - player.frameHeight()), flipped);
 	}
 
@@ -793,7 +793,7 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_canimShapes[idx]._misc == NORMAL_FORWARD)
-			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
 				_canimShapes[idx]._flags & 2);
 	}
 
@@ -812,7 +812,7 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 			_canimShapes[idx]._misc == FORWARD)
-			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
 				_canimShapes[idx]._flags & 2);
 	}
 
@@ -966,7 +966,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 			rrmStream->seek(rrmStream->readUint32LE());
 
 			// Load the canimation into the cache
-			Common::SeekableReadStream *imgStream = !_lzwMode ? rrmStream->readStream(cAnim._size) : 
+			Common::SeekableReadStream *imgStream = !_lzwMode ? rrmStream->readStream(cAnim._size) :
 				decompressLZ(*rrmStream, cAnim._size);
 			res.addToCache(fname, *imgStream);
 
@@ -1059,7 +1059,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	if (playRate < 0)
 		// Reverse direction - set to end sequence
 		cObj._frameNumber = tFrames - 1;
-	
+
 	if (cObj._frameNumber <= 26)
 		gotoCode = cObj._sequences[cObj._frameNumber + 3];
 
@@ -1108,7 +1108,7 @@ void Scene::doBgAnim() {
 	Common::Point mousePos = events.mousePos();
 
 	talk._talkToAbort = false;
-	
+
 	// Animate the mouse cursor
 	if (cursorId >= WAIT) {
 		if (++cursorId > (WAIT + 2))
@@ -1229,7 +1229,7 @@ void Scene::doBgAnim() {
 		people[AL].adjustSprite();
 
 	// Flag the bg shapes which need to be redrawn
-	checkBgShapes(people[AL]._imageFrame, 
+	checkBgShapes(people[AL]._imageFrame,
 		Common::Point(people[AL]._position.x / 100, people[AL]._position.y / 100));
 
 	if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
@@ -1241,7 +1241,7 @@ void Scene::doBgAnim() {
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
 			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
 	}
-	
+
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
@@ -1335,7 +1335,7 @@ void Scene::doBgAnim() {
 				people[AL]._type = INVALID;
 			} else {
 				screen.flushImage(people[AL]._imageFrame,
-					Common::Point(people[AL]._position.x / 100, 
+					Common::Point(people[AL]._position.x / 100,
 						people[AL]._position.y / 100 - people[AL].frameHeight()),
 					&people[AL]._oldPosition.x, &people[AL]._oldPosition.y,
 					&people[AL]._oldSize.x, &people[AL]._oldSize.y);
@@ -1364,7 +1364,7 @@ void Scene::doBgAnim() {
 				screen.flushImage(people._portrait._imageFrame, people._portrait._position,
 					&people._portrait._oldPosition.x, &people._portrait._oldPosition.y,
 					&people._portrait._oldSize.x, &people._portrait._oldSize.y);
-				
+
 			if (people._portrait._type == REMOVE)
 				people._portrait._type = INVALID;
 		}
@@ -1410,7 +1410,7 @@ void Scene::doBgAnim() {
 	screen.resetDisplayBounds();
 
 	// Check if the method was called for calling a portrait, and a talk was
-	// interrupting it. This talk file would not have been executed at the time, 
+	// interrupting it. This talk file would not have been executed at the time,
 	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
 	if (people._clearingThePortrait && talk._scriptMoreFlag == 3) {
 		// Reset the flags and call to talk
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 1f56261150..72045a83fb 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -222,12 +222,12 @@ void Screen::randomTransition() {
 
 		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
 			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset);
-	
+
 		if (idx != 0 && (idx % 100) == 0) {
 			// Ensure there's a full screen dirty rect for the next frame update
 			if (_dirtyRects.empty())
 				addDirtyRect(Common::Rect(0, 0, this->w, this->h));
-			
+
 			events.pollEvents();
 			events.delay(1);
 		}
@@ -245,10 +245,10 @@ void Screen::verticalTransition() {
 
 	byte table[SHERLOCK_SCREEN_WIDTH];
 	Common::fill(&table[0], &table[SHERLOCK_SCREEN_WIDTH], 0);
-	
-	for (int yp = 0; yp < SHERLOCK_SCREEN_HEIGHT; ++yp) {		
+
+	for (int yp = 0; yp < SHERLOCK_SCREEN_HEIGHT; ++yp) {
 		for (int xp = 0; xp < SHERLOCK_SCREEN_WIDTH; ++xp) {
-			int temp = (table[xp] >= 197) ? SHERLOCK_SCREEN_HEIGHT - table[xp] : 
+			int temp = (table[xp] >= 197) ? SHERLOCK_SCREEN_HEIGHT - table[xp] :
 				_vm->getRandomNumber(3) + 1;
 
 			if (temp) {
@@ -384,7 +384,7 @@ void Screen::gPrint(const Common::Point &pt, byte color, const char *format, ...
 int Screen::stringWidth(const Common::String &str) {
 	int width = 0;
 
-	for (const char *c = str.c_str(); *c; ++c) 
+	for (const char *c = str.c_str(); *c; ++c)
 		width += charWidth(*c);
 
 	return width;
@@ -442,7 +442,7 @@ void Screen::makeButton(const Common::Rect &bounds, int textX,
 	bb.fillRect(Common::Rect(bounds.left + 1, bounds.top + 1, bounds.right - 1, bounds.bottom - 1), BUTTON_MIDDLE);
 
 	gPrint(Common::Point(textX, bounds.top), COMMAND_HIGHLIGHTED, "%c", str[0]);
-	gPrint(Common::Point(textX + charWidth(str[0]), bounds.top), 
+	gPrint(Common::Point(textX + charWidth(str[0]), bounds.top),
 		COMMAND_FOREGROUND, "%s", str.c_str() + 1);
 }
 
@@ -481,7 +481,7 @@ void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->hLine(r.left + 1, r.top + 1, r.right - 3, BUTTON_TOP);
 	_backBuffer->vLine(r.left, r.top, r.bottom - 1, BUTTON_TOP);
 	_backBuffer->vLine(r.left + 1, r.top + 1, r.bottom - 2, BUTTON_TOP);
-	
+
 	_backBuffer->vLine(r.right - 1, r.top, r.bottom - 1, BUTTON_BOTTOM);
 	_backBuffer->vLine(r.right - 2, r.top + 1, r.bottom - 2, BUTTON_BOTTOM);
 	_backBuffer->hLine(r.left, r.bottom - 1, r.right - 1, BUTTON_BOTTOM);
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index e19aefd9c5..2a4d332edf 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -25,7 +25,7 @@
 
 namespace Sherlock {
 
-const int SETUP_POINTS[12][4]  = { 
+const int SETUP_POINTS[12][4]  = {
 	{ 4, 154, 101, 53 },		// Exit
 	{ 4, 165, 101, 53 },		// Music Toggle
 	{ 219, 165, 316, 268 },		// Voice Toggle
@@ -76,40 +76,40 @@ void Settings::drawInteface(bool flag) {
 		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
 
 	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10),
 		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
 	tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10),
 		SETUP_POINTS[2][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
 	tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10),
 		SETUP_POINTS[3][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
 	tempStr = Common::String::format("Auto Help %s", SETUP_STRS5[ui._helpStyle]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10),
 		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10),
 		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
 
 	// WORKAROUND: We don't support the joystick in ScummVM, so draw the next two buttons as disabled
 	tempStr = "Joystick Off";
-	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10),
 		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
 	screen.buttonPrint(Common::Point(SETUP_POINTS[6][3], SETUP_POINTS[6][1]), COMMAND_NULL, false, tempStr);
 
 	tempStr = "Calibrate Joystick";
-	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10),
 		SETUP_POINTS[7][3] - screen.stringWidth(tempStr) / 2, tempStr);
 	screen.buttonPrint(Common::Point(SETUP_POINTS[7][3], SETUP_POINTS[7][1]), COMMAND_NULL, false, tempStr);
 
 	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
-	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10),
 		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	
+
 	tempStr = Common::String::format("Windows %s", ui._windowStyle ? "Slide" : "Appear");
-	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10), 
+	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10),
 		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
 	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
@@ -121,7 +121,7 @@ void Settings::drawInteface(bool flag) {
 		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
 	screen.buttonPrint(Common::Point(SETUP_POINTS[11][3], SETUP_POINTS[11][1]), COMMAND_NULL, false, tempStr);
 
-	// Show the window immediately, or slide it on-screen 
+	// Show the window immediately, or slide it on-screen
 	if (!flag) {
 		if (!ui._windowStyle) {
 			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
@@ -150,7 +150,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 
 	for (int idx = 0; idx < 12; ++idx) {
 		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
-				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released)) 
+				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released))
 				|| (_key == SETUP_NAMES[idx][0])) {
 			found = idx;
 			color = COMMAND_HIGHLIGHTED;
@@ -160,23 +160,23 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 
 		// Print the button text
 		switch (idx) {
-		case 1: 
+		case 1:
 			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 2: 
+		case 2:
 			tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 3: 
+		case 3:
 			tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 4: 
+		case 4:
 			tempStr = Common::String::format("Auto Help %s", SETUP_STRS2[ui._helpStyle]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 6: 
+		case 6:
 			tempStr = "Joystick Off";
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
 			break;
@@ -184,23 +184,23 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 			tempStr = "Calibrate Joystick";
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
 			break;
-		case 8: 
+		case 8:
 			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 9: 
+		case 9:
 			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._windowStyle]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 10: 
+		case 10:
 			tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
-		case 11: 
+		case 11:
 			tempStr = "Key Pad Slow";
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
 			break;
-		default: 
+		default:
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
 			break;
 		}
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 5a73b4fd1d..1a6e84b186 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -119,7 +119,7 @@ Common::Error SherlockEngine::run() {
 	}
 
 	while (!shouldQuit()) {
-		// Prepare for scene, and handle any game-specific scenes. This allows 
+		// Prepare for scene, and handle any game-specific scenes. This allows
 		// for game specific cutscenes or mini-games that aren't standard scenes
 		startScene();
 		if (shouldQuit())
@@ -131,7 +131,7 @@ Common::Error SherlockEngine::run() {
 		// Reset the data for the player character (Sherlock)
 		_people->reset();
 
-		// Initialize and load the scene. 
+		// Initialize and load the scene.
 		_scene->selectScene();
 
 		// Scene handling loop
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 1fd4c29b12..5c2e8808ee 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -64,7 +64,7 @@ public:
 	int loadSong(int songNumber);
 	void startSong();
 	void freeSong();
-	
+
 	void playMusic(const Common::String &name);
 	void stopMusic();
 	void stopSndFuncPtr(int v1, int v2);
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b1f4d4e546..55a79f8170 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -86,7 +86,7 @@ TalkSequences::TalkSequences(const byte *data) {
 }
 
 void TalkSequences::clear() {
-	Common::fill(&_data[0], &_data[MAX_TALK_SEQUENCES], 0); 
+	Common::fill(&_data[0], &_data[MAX_TALK_SEQUENCES], 0);
 }
 
 /*----------------------------------------------------------------*/
@@ -121,10 +121,10 @@ void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, i
 
 /**
  * Called whenever a conversation or item script needs to be run. For standard conversations,
- * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly 
- * instead of waiting for a statement option. 
+ * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly
+ * instead of waiting for a statement option.
  * @remarks		It seems that at some point, all item scripts were set up to use this as well.
- *	In their case, the conversation display is simply suppressed, and control is passed on to 
+ *	In their case, the conversation display is simply suppressed, and control is passed on to
  *	doScript to implement whatever action is required.
  */
 void Talk::talkTo(const Common::String &filename) {
@@ -185,7 +185,7 @@ void Talk::talkTo(const Common::String &filename) {
 			SequenceEntry &ss = _savedSequences[idx];
 			for (uint idx2 = 0; idx2 < ss._sequences.size(); ++idx2)
 				scene._bgShapes[ss._objNum]._sequences[idx2] = ss._sequences[idx2];
-		
+
 			// Reset the object's frame to the beginning of the sequence
 			scene._bgShapes[ss._objNum]._frameNumber = 0;
 		}
@@ -314,7 +314,7 @@ void Talk::talkTo(const Common::String &filename) {
 			ui.clearInfo();
 		}
 
-		// Handle replies until there's no further linked file, 
+		// Handle replies until there's no further linked file,
 		// or the link file isn't a reply first cnversation
 		while (!_vm->shouldQuit()) {
 			clearSequences();
@@ -336,7 +336,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 				setTalkMap();
 			}
-			
+
 			// Check for a linked file
 			if (!statement._linkFile.empty() && !_scriptMoreFlag) {
 				Common::String linkFilename = statement._linkFile;
@@ -385,7 +385,7 @@ void Talk::talkTo(const Common::String &filename) {
 						screen.buttonPrint(Common::Point(119, CONTROLS_Y), color, true, "Exit");
 					} else {
 						screen.buttonPrint(Common::Point(119, CONTROLS_Y), color, false, "Exit");
-					
+
 						if (!ui._windowStyle) {
 							screen.slamRect(Common::Rect(0, CONTROLS_Y,
 								SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
@@ -451,7 +451,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 /**
  * Main method for handling conversations when a character to talk to has been
- * selected. It will make Holmes walk to the person to talk to, draws the 
+ * selected. It will make Holmes walk to the person to talk to, draws the
  * interface window for the conversation and passes on control to give the
  * player a list of options to make a selection from
  */
@@ -497,7 +497,7 @@ void Talk::talk(int objNum) {
 		events.setCursor(WAIT);
 		if (obj._lookPosition.y != 0)
 			// Need to walk to character first
-			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100), 
+			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100),
 				obj._lookFacing);
 		events.setCursor(ARROW);
 
@@ -587,7 +587,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	_statements.resize(talkStream->readByte());
 	for (uint idx = 0; idx < _statements.size(); ++idx)
 		_statements[idx].synchronize(*talkStream);
-	
+
 	delete talkStream;
 
 	if (!sound._voices)
@@ -607,7 +607,7 @@ void Talk::stripVoiceCommands() {
 			if (statement._reply[idx] == SFX_COMMAND) {
 				// Replace instruction character with a space, and delete the
 				// rest of the name following it
-				statement._reply = Common::String(statement._reply.c_str(), 
+				statement._reply = Common::String(statement._reply.c_str(),
 					statement._reply.c_str() + idx) + " " +
 					Common::String(statement._reply.c_str() + 9);
 			}
@@ -673,7 +673,7 @@ void Talk::drawInterface() {
 }
 
 /**
- * Display a list of statements in a window at the bottom of the scren that the 
+ * Display a list of statements in a window at the bottom of the scren that the
  * player can select from.
  */
 bool Talk::displayTalk(bool slamIt) {
@@ -681,7 +681,7 @@ bool Talk::displayTalk(bool slamIt) {
 	int yp = CONTROLS_Y + 14;
 	int lineY = -1;
 	_moreTalkDown = _moreTalkUp = false;
-	
+
 	for (uint idx = 0; idx < _statements.size(); ++idx) {
 		_statements[idx]._talkPos.top = _statements[idx]._talkPos.bottom = -1;
 	}
@@ -708,7 +708,7 @@ bool Talk::displayTalk(bool slamIt) {
 			screen.vgaBar(Common::Rect(5, CONTROLS_Y + 11, 15, CONTROLS_Y + 22), INV_BACKGROUND);
 		} else {
 			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
-			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, 
+			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11,
 				15, CONTROLS_Y + 22), INV_BACKGROUND);
 		}
 	}
@@ -720,9 +720,9 @@ bool Talk::displayTalk(bool slamIt) {
 
 		if (statement._talkMap != -1) {
 			bool flag = _talkHistory[_converseNum][idx];
-			lineY = talkLine(idx, statement._talkMap, flag ? TALK_NULL : INV_FOREGROUND, 
+			lineY = talkLine(idx, statement._talkMap, flag ? TALK_NULL : INV_FOREGROUND,
 				yp, slamIt);
-		
+
 			if (lineY != -1) {
 				statement._talkPos.top = yp;
 				yp = lineY;
@@ -834,7 +834,7 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
 			// Move to next line, if any
 			lineY += 9;
 			lineStartP = lineEndP;
-			
+
 			if (!*lineEndP)
 				break;
 		} else {
@@ -911,7 +911,7 @@ void Talk::pushSequence(int speaker) {
 			seqEntry._seqTo = obj._seqTo;
 		}
 	}
-	
+
 	_sequenceStack.push(seqEntry);
 	if (_scriptStack.size() >= 5)
 		error("script stack overflow");
@@ -923,7 +923,7 @@ void Talk::pushSequence(int speaker) {
 void Talk::setSequence(int speaker) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
-	
+
 	// If no speaker is specified, then nothing needs to be done
 	if (speaker == -1)
 		return;
@@ -965,7 +965,7 @@ void Talk::setStillSeq(int speaker) {
 		int objNum = people.findSpeaker(speaker);
 		if (objNum != -1) {
 			Object &obj = scene._bgShapes[objNum];
-			
+
 			if (obj._seqSize < MAX_TALK_SEQUENCES) {
 				warning("Tried to copy too few still frames");
 			} else {
@@ -1206,7 +1206,7 @@ void Talk::doScript(const Common::String &script) {
 				++str;
 				_scriptCurrentIndex = str - scriptStart;
 
-				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100, 
+				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100,
 					str[2] * 100), str[3] - 1);
 				if (_talkToAbort)
 					return;
@@ -1270,7 +1270,7 @@ void Talk::doScript(const Common::String &script) {
 				++str;
 				break;
 			}
-				
+
 			case SFX_COMMAND:
 				++str;
 				if (sound._voices) {
@@ -1305,7 +1305,7 @@ void Talk::doScript(const Common::String &script) {
 				int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				++str;
 				wait = 0;
-				
+
 				bool result = flag < 0x8000;
 				if (_vm->readFlags(flag & 0x7fff) != result) {
 					do {
@@ -1761,7 +1761,7 @@ void Talk::popStack() {
 void Talk::synchronize(Common::Serializer &s) {
 	for (int idx = 0; idx < MAX_TALK_FILES; ++idx) {
 		TalkHistoryEntry &he = _talkHistory[idx];
-		
+
 		for (int flag = 0; flag < 16; ++flag)
 			s.syncAsByte(he._data[flag]);
 	}
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index a134b95196..f048e280a8 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -27,7 +27,7 @@
 namespace Sherlock {
 
 // Main user interface menu control locations
-const int MENU_POINTS[12][4] = { 
+const int MENU_POINTS[12][4] = {
 	{ 13, 153, 72, 165 },
 	{ 13, 169, 72, 181 },
 	{ 13, 185, 72, 197 },
@@ -39,11 +39,11 @@ const int MENU_POINTS[12][4] = {
 	{ 165, 185, 233, 197 },
 	{ 249, 153, 305, 165 },
 	{ 249, 169, 305, 181 },
-	{ 249, 185, 305, 197 } 
+	{ 249, 185, 305, 197 }
 };
 
 // Inventory control locations */
-const int INVENTORY_POINTS[8][3] = { 
+const int INVENTORY_POINTS[8][3] = {
 	{ 4, 50, 29 },
 	{ 52, 99, 77 },
 	{ 101, 140, 123 },
@@ -51,7 +51,7 @@ const int INVENTORY_POINTS[8][3] = {
 	{ 189, 219, 198 },
 	{ 221, 251, 234 },
 	{ 253, 283, 266 },
-	{ 285, 315, 294 } 
+	{ 285, 315, 294 }
 };
 
 const char COMMANDS[13] = "LMTPOCIUGJFS";
@@ -59,23 +59,23 @@ const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
 const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
 const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
 
-const char *const MOPEN[] = { 
-	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "." 
+const char *const MOPEN[] = {
+	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "."
 };
-const char *const MCLOSE[] = { 
-	"This cannot be closed", "It is already closed", "The safe door is in the way" 
+const char *const MCLOSE[] = {
+	"This cannot be closed", "It is already closed", "The safe door is in the way"
 };
-const char *const MMOVE[] = { 
+const char *const MMOVE[] = {
 	"This cannot be moved", "It is bolted to the floor", "It is too heavy", "The other crate is in the way"
 };
 const char *const MPICK[] = {
 	"Nothing of interest here", "It is bolted down", "It is too big to carry", "It is too heavy",
-	"I think a girl would be more your type", "Those flowers belong to Penny", "She's far too young for you!", 
-	"I think a girl would be more your type!", "Government property for official use only" 
+	"I think a girl would be more your type", "Those flowers belong to Penny", "She's far too young for you!",
+	"I think a girl would be more your type!", "Government property for official use only"
 };
-const char *const MUSE[] = { 
-	"You can't do that", "It had no effect", "You can't reach it", "OK, the door looks bigger! Happy?", 
-	"Doors don't smoke" 
+const char *const MUSE[] = {
+	"You can't do that", "It had no effect", "You can't reach it", "OK, the door looks bigger! Happy?",
+	"Doors don't smoke"
 };
 
 /*----------------------------------------------------------------*/
@@ -198,7 +198,7 @@ void UserInterface::handleInput() {
 				} else if (pt.y < CONTROLS_Y &&
 					((events._rightReleased && _helpStyle) || (events._released && !_helpStyle)) &&
 					(_bgFound != -1 && _bgFound < 1000) &&
-					(scene._bgShapes[_bgFound]._defaultCommand || 
+					(scene._bgShapes[_bgFound]._defaultCommand ||
 					!scene._bgShapes[_bgFound]._description.empty())) {
 					// If there is no default command, set it to Look
 					if (scene._bgShapes[_bgFound]._defaultCommand)
@@ -208,7 +208,7 @@ void UserInterface::handleInput() {
 					events._released = true;
 					events._pressed = events._oldButtons = false;
 					_help = _oldHelp = -1;
-				
+
 					if (_menuMode == LOOK_MODE) {
 						// Set the flag to tell the game that this was a right-click
 						// call to look and should exit without the look button being pressed
@@ -323,7 +323,7 @@ void UserInterface::handleInput() {
 	//
 	// Do input processing
 	//
-	if (events._pressed || events._released || events._rightPressed || 
+	if (events._pressed || events._released || events._rightPressed ||
 			_keycode != Common::KEYCODE_INVALID || _pause) {
 		if (((events._released && (_helpStyle || _help == -1)) || (events._rightReleased && !_helpStyle)) &&
 				(pt.y <= CONTROLS_Y) && (_menuMode == STD_MODE)) {
@@ -390,7 +390,7 @@ void UserInterface::handleInput() {
 
 		// As long as there isn't an open window, do main input processing.
 		// Windows are opened when in TALK, USE, INV, and GIVE modes
-		if ((!_windowOpen && !_menuCounter && pt.y > CONTROLS_Y) || 
+		if ((!_windowOpen && !_menuCounter && pt.y > CONTROLS_Y) ||
 				_keycode != Common::KEYCODE_INVALID) {
 			if (events._pressed || events._released || _pause ||
 					_keycode != Common::KEYCODE_INVALID)
@@ -426,7 +426,7 @@ void UserInterface::restoreButton(int num) {
 	screen._backBuffer1.blitFrom(screen._backBuffer2, pt,
 		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
 	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);
-	
+
 	if (!_menuCounter) {
 		_infoFlag++;
 		clearInfo();
@@ -461,7 +461,7 @@ void UserInterface::pushButton(int num) {
  */
 void UserInterface::toggleButton(int num) {
 	Screen &screen = *_vm->_screen;
-	
+
 	if (_menuMode != (num + 1)) {
 		_menuMode = (MenuMode)(num + 1);
 		_oldKey = COMMANDS[num];
@@ -534,7 +534,7 @@ void UserInterface::examine() {
 
 	if (pt.y < (CONTROLS_Y + 9)) {
 		Object &obj = scene._bgShapes[_bgFound];
-		
+
 		if (obj._lookcAnim != 0) {
 			int canimSpeed = ((obj._lookcAnim & 0xe0) >> 5) + 1;
 			scene._cAnimFramePause = obj._lookFrames;
@@ -669,13 +669,13 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 						}
 
 						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
-						screen.print(Common::Point(xStart, INFO_LINE + 1), 
+						screen.print(Common::Point(xStart, INFO_LINE + 1),
 							INFO_FOREGROUND, "Give ");
-						screen.print(Common::Point(xStart + width, INFO_LINE + 1), 
+						screen.print(Common::Point(xStart + width, INFO_LINE + 1),
 							TALK_FOREGROUND, inv[_selector]._name.c_str());
-						screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1), 
+						screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
 							INFO_FOREGROUND, " to ");
-						screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1), 
+						screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
 							INFO_FOREGROUND, tempStr.c_str());
 					}
 				} else {
@@ -795,16 +795,16 @@ void UserInterface::doEnvControl() {
 
 	if (_selector != _oldSelector)  {
 		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + 5)) {
-			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
+			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
 				INV_FOREGROUND, "%d.", _oldSelector + 1);
-			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10), 
+			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
 				INV_FOREGROUND, "%s", saves._savegames[_oldSelector].c_str());
 		}
 
 		if (_selector != -1) {
-			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10), 
+			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10),
 				TALK_FOREGROUND, "%d.", _selector + 1);
-			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10), 
+			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10),
 				TALK_FOREGROUND, "%s", saves._savegames[_selector].c_str());
 		}
 
@@ -815,7 +815,7 @@ void UserInterface::doEnvControl() {
 		if ((found == 0 && events._released) || _key == 'E') {
 			banishWindow();
 			_windowBounds.top = CONTROLS_Y1;
-			
+
 			events._pressed = events._released = _keyboardInput = false;
 			_keycode = Common::KEYCODE_INVALID;
 		} else if ((found == 1 && events._released) || _key == 'L') {
@@ -839,13 +839,13 @@ void UserInterface::doEnvControl() {
 					_keyboardInput = false;
 				} else {
 					if (!talk._talkToAbort) {
-						screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 
+						screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10,
 							SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
-						screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND, 
+						screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND,
 							"%d.", _selector + 1);
-						screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND, 
+						screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND,
 							"%s", saves._savegames[_selector].c_str());
-						
+
 						screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
 						_selector = _oldSelector = -1;
 					}
@@ -887,7 +887,7 @@ void UserInterface::doEnvControl() {
 			bool moreKeys;
 			do {
 				saves._savegameIndex++;
-				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, 
+				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
 					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
 
 				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + 5); ++idx) {
@@ -898,10 +898,10 @@ void UserInterface::doEnvControl() {
 
 					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
 						"%d.", idx + 1);
-					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, 
+					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
 						"%s", saves._savegames[idx].c_str());
 				}
-				
+
 				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
 
 				color = (!saves._savegameIndex) ? COMMAND_NULL : COMMAND_FOREGROUND;
@@ -1007,11 +1007,11 @@ void UserInterface::doEnvControl() {
 						_keyboardInput = false;
 					} else {
 						if (!talk._talkToAbort) {
-							screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 
+							screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10,
 								317, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
-							screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), 
+							screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10),
 								INV_FOREGROUND, "%d.", _selector + 1);
-							screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), 
+							screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10),
 								INV_FOREGROUND, "%s", saves._savegames[_selector].c_str());
 							screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
 							_selector = _oldSelector = -1;
@@ -1201,14 +1201,14 @@ void UserInterface::doInvControl() {
 				// If it's -1, then no inventory item is highlighted yet. Otherwise,
 				// an object in the scene has been clicked.
 
-				if (_selector != -1 && inv._invMode == INVMODE_LOOK 
+				if (_selector != -1 && inv._invMode == INVMODE_LOOK
 						&& mousePos.y >(CONTROLS_Y1 + 11))
 					inv.doInvJF();
 
 				if (talk._talkToAbort)
 					return;
 
-				// Now check for the Use and Give actions. If inv_mode is 3, 
+				// Now check for the Use and Give actions. If inv_mode is 3,
 				// that means GIVE is in effect, _selector is the object being
 				// given, and _find is the target.
 				// The same applies to USE, except if _selector is -1, then USE
@@ -1242,7 +1242,7 @@ void UserInterface::doInvControl() {
 					else
 						// Now inv object has been highlighted
 						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF*", MUSE, _find, temp - 2);
-						
+
 					_selector = _oldSelector = -1;
 				}
 			}
@@ -1251,14 +1251,14 @@ void UserInterface::doInvControl() {
 }
 
 /**
- * Handles waiting whilst an object's description window is open. 
+ * Handles waiting whilst an object's description window is open.
  */
 void UserInterface::doLookControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Screen &screen = *_vm->_screen;
 
-	_key = _oldKey = -1;	
+	_key = _oldKey = -1;
 	_keyboardInput = _keycode != Common::KEYCODE_INVALID;
 
 	if (events._released || events._rightReleased || _keyboardInput) {
@@ -1268,7 +1268,7 @@ void UserInterface::doLookControl() {
 			if (!_descStr.empty()) {
 				printObjectDesc(_descStr, false);
 			} else if (!_lookHelp) {
-				// Need to close the window and depress the Look button 
+				// Need to close the window and depress the Look button
 				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
 				screen._backBuffer2.blitFrom((*_controls)[0]._frame, pt);
 				banishWindow(true);
@@ -1348,7 +1348,7 @@ void UserInterface::doMainControl() {
 
 		if (_temp == 12)
 			_key = -1;
-		
+
 		if (events._rightPressed) {
 			_temp = 12;
 			_key = -1;
@@ -1356,7 +1356,7 @@ void UserInterface::doMainControl() {
 	} else if (!events._released) {
 		_key = -1;
 	}
-	
+
 	// Check if the button being pointed to has changed
 	if (_oldKey != _key && !_windowOpen) {
 		// Clear the info line
@@ -1431,7 +1431,7 @@ void UserInterface::doMainControl() {
 
 			// Display the dialog
 			saves.drawInterface();
-			
+
 			_selector = _oldSelector = -1;
 			_windowOpen = true;
 			break;
@@ -1550,7 +1550,7 @@ void UserInterface::doTalkControl() {
 			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Exit");
 		else if (_endKeyActive)
 			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
-		
+
 		if (mousePos.x > 140 && mousePos.x < 170 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkUp)
 			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Up");
 		else if (talk._moreTalkUp)
@@ -1613,13 +1613,13 @@ void UserInterface::doTalkControl() {
 	}
 
 	if (events._released || _keyboardInput) {
-		if (((Common::Rect(99, CONTROLS_Y, 138, CONTROLS_Y + 10).contains(mousePos) && events._released) 
+		if (((Common::Rect(99, CONTROLS_Y, 138, CONTROLS_Y + 10).contains(mousePos) && events._released)
 				|| _key == 'E') && _endKeyActive) {
 			talk.freeTalkVars();
 			talk.pullSequence();
 			banishWindow();
 			_windowBounds.top = CONTROLS_Y1;
-		} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released) 
+		} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released)
 				|| _key == 'U') && talk._moreTalkUp) {
 			while (talk._statements[--talk._talkIndex]._talkMap == -1)
 				;
@@ -1655,7 +1655,7 @@ void UserInterface::doTalkControl() {
 
 			// Flag the response as having been used
 			talk._talkHistory[talk._converseNum][_selector] = true;
-		
+
 			clearWindow();
 			screen.print(Common::Point(16, CONTROLS_Y + 12), TALK_FOREGROUND, "Sherlock Holmes");
 			talk.talkLine(_selector + 128, talk._statements[_selector]._talkMap, COMMAND_FOREGROUND, CONTROLS_Y + 21, true);
@@ -1784,7 +1784,7 @@ void UserInterface::doTalkControl() {
 /**
  * Handles events when the Journal is active.
  * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
- *		the user interface, it uses so many internal UI fields, that it sort of made some sense 
+ *		the user interface, it uses so many internal UI fields, that it sort of made some sense
  *		to put it in the UserInterface class.
  */
 void UserInterface::journalControl() {
@@ -1801,7 +1801,7 @@ void UserInterface::journalControl() {
 	do {
 		_key = -1;
 		events.setButtonState();
-		
+
 		// Handle keypresses
 		if (events.kbHit()) {
 			Common::KeyState keyState = events.getKey();
@@ -1859,7 +1859,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		if (!_invLookFlag) {
 			// See if this look was called by a right button click or not
 			if (!_lookHelp) {
-				// If it wasn't a right button click, then we need depress 
+				// If it wasn't a right button click, then we need depress
 				// the look button before we close the window. So save a copy of the
 				// menu area, and draw the controls onto it
 				Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h);
@@ -1945,7 +1945,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		do {
 			width += screen.charWidth(*msgP++);
 		} while (width < 300 && *msgP);
-		
+
 		if (*msgP)
 			--msgP;
 		else
@@ -2036,7 +2036,7 @@ void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 	} else {
 		// Gradually slide down the display of the window
 		for (int idx = 1; idx <= bgSurface.h; idx += 2) {
-			screen._backBuffer->blitFrom(bgSurface, 
+			screen._backBuffer->blitFrom(bgSurface,
 				Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h),
 				Common::Rect(0, bgSurface.h - idx, bgSurface.w, bgSurface.h));
 			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h,
@@ -2047,7 +2047,7 @@ void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 	}
 
 	// Final display of the entire window
-	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, 
+	screen._backBuffer->blitFrom(bgSurface, Common::Point(0,
 		SHERLOCK_SCREEN_HEIGHT - bgSurface.h),
 		Common::Rect(0, 0, bgSurface.w, bgSurface.h));
 	screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h, bgSurface.w, bgSurface.h);
@@ -2100,7 +2100,7 @@ void UserInterface::banishWindow(bool slideUp) {
 						Common::Point(0, CONTROLS_Y),
 						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + idx));
 
-					screen.slamArea(0, CONTROLS_Y + idx - 2, SHERLOCK_SCREEN_WIDTH, 
+					screen.slamArea(0, CONTROLS_Y + idx - 2, SHERLOCK_SCREEN_WIDTH,
 						SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y - idx + 2);
 					events.delay(10);
 				}
@@ -2162,7 +2162,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 		_infoFlag = true;
 		clearInfo();
 		_infoFlag = true;
-		
+
 		// Display error message
 		_menuCounter = 30;
 		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that to yourself.");
@@ -2191,7 +2191,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 	if (targetNum != -1) {
 		// Found a target, so do the action
 		const UseType &action = use[targetNum];
-		
+
 		events.setCursor(WAIT);
 
 		if (action._useFlag)
@@ -2274,7 +2274,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 			cAnimNum = 9;
 		else
 			cAnimNum = action._cAnimNum - 1;
-	
+
 		int dir = -1;
 		if (action._cAnimNum != 99) {
 			CAnim &anim = scene._cAnim[cAnimNum];
@@ -2299,7 +2299,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		bool printed = false;
 
 		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2 
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
 					&& toupper(action._names[nameIdx][1]) == 'W') {
 				if (obj.checkNameForCodes(Common::String(action._names[nameIdx].c_str() + 2), messages)) {
 					if (!talk._talkToAbort)
@@ -2367,7 +2367,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
 
 				// Set how long to show the message
-				_menuCounter = 30;	
+				_menuCounter = 30;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 04931d040085d77d031290fda57ca2c5dc486f54 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Thu, 7 May 2015 21:30:25 +0100
Subject: SCUMM: Add DOS en demo for Indiana Jones and the Fate of Atlantis

This was reported by Paulo Vicente in bug  #6862.
---
 devtools/scumm-md5.txt    | 1 +
 engines/scumm/scumm-md5.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index d8ace64c62..e56f1a6a99 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -294,6 +294,7 @@ atlantis	Indiana Jones and the Fate of Atlantis
 
 	035deab53b47bc43abc763560d0f8d4b	-1	en	DOS	Floppy	Demo	-	
 	98744fe66ff730e8c2b3b1f58803ab0b	-1	en	DOS	Floppy	Demo	-	Simon Krumrein, sev
+	12cdc256eae5a461bcc9a49975999841	-1	en	DOS	Floppy	Demo	-	Paulo Vicente
 	99b6f822b0b2612415407865438697d6	-1	en	DOS	-	Demo	non-interactive	
 	28d24a33448fab6795850bc9f159a4a2	11170	jp	FM-TOWNS	FM-TOWNS	Demo	non-interactive	khalek, Fingolfin
 
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 1158aaa980..bac7a4665b 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu May 07 01:11:26 2015
+  This file was generated by the md5table tool on Thu May  7 20:24:51 2015
   DO NOT EDIT MANUALLY!
  */
 
@@ -68,6 +68,7 @@ static const MD5Table md5table[] = {
 	{ "114acdc2659a273c220f86ee9edb24c1", "maniac", "V2", "V2", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "11ddf1fde76e3156eb3a38da213f484e", "monkey2", "", "", -1, Common::IT_ITA, Common::kPlatformAmiga },
 	{ "11e6e244078ff09b0f3832e35420e0a7", "catalog", "", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
+	{ "12cdc256eae5a461bcc9a49975999841", "atlantis", "Floppy", "Demo", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "132bff65e6367c09cc69318ce1b59333", "monkey2", "", "", 11155, Common::EN_ANY, Common::kPlatformAmiga },
 	{ "1387d16aa620dc1c2d1fd87f8a9e7a09", "puttcircus", "", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "13d2a86a7290813a1c386490447d72db", "fbear", "HE 62", "", -1, Common::EN_ANY, Common::kPlatform3DO },
-- 
cgit v1.2.3


From 44f3ae5005a8bc79ecb8f0670e466904fc375d31 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 May 2015 21:01:33 -0400
Subject: SHERLOCK: Fix pink dot appearing in lower-left corner of some player
 frames

---
 engines/sherlock/graphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 132d3fa089..5dafb4cc76 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -143,7 +143,7 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 	const int TRANSPARENCY = 0xFF;
 	for (int yp = 0; yp < drawRect.height(); ++yp) {
 		const byte *srcP = (const byte *)src.getBasePtr(
-			flipped ? drawRect.right : drawRect.left, drawRect.top + yp);
+			flipped ? drawRect.right - 1 : drawRect.left, drawRect.top + yp);
 		byte *destP = (byte *)getBasePtr(destPt.x, destPt.y + yp);
 
 		for (int xp = 0; xp < drawRect.width(); ++xp, ++destP) {
-- 
cgit v1.2.3


From 01ed05f295b878758ecf24c02480b2be153a8cf7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 8 May 2015 06:56:09 +0200
Subject: SHERLOCK: Remove extra semi-column, some code formatting

---
 engines/sherlock/inventory.h |  2 +-
 engines/sherlock/people.cpp  | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 0dafdddde9..68b88bd978 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -50,7 +50,7 @@ enum InvMode {
 struct InventoryItem {
 	int _requiredFlag;
 	Common::String _name;
-	Common::String _description;;
+	Common::String _description;
 	Common::String _examine;
 	int _lookFlag;
 
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index ee5f3bcb80..0a3ef693a8 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -397,14 +397,13 @@ void People::setWalking() {
 
 			// If we're on the overhead map, set the sequence so we keep moving
 			// in the same direction
-			if (map._active) {
+			if (map._active)
 				_player._sequenceNumber = (oldDirection == -1) ? MAP_RIGHT : oldDirection;
-			}
 
 			// Set the delta x
 			_player._delta.x = (delta.x * 100) / (delta.y / speed.y);
 			if (_walkDest.x < (_player._position.x / 100))
-				_player._delta.x = -_player._delta.x;;
+				_player._delta.x = -_player._delta.x;
 
 			_player._walkCount = delta.y / speed.y;
 		}
@@ -439,23 +438,31 @@ void People::gotoStand(Sprite &sprite) {
 
 	switch (sprite._sequenceNumber) {
 	case WALK_UP:
-		sprite._sequenceNumber = STOP_UP; break;
+		sprite._sequenceNumber = STOP_UP;
+		break;
 	case WALK_DOWN:
-		sprite._sequenceNumber = STOP_DOWN; break;
+		sprite._sequenceNumber = STOP_DOWN;
+		break;
 	case TALK_LEFT:
 	case WALK_LEFT:
-		sprite._sequenceNumber = STOP_LEFT; break;
+		sprite._sequenceNumber = STOP_LEFT;
+		break;
 	case TALK_RIGHT:
 	case WALK_RIGHT:
-		sprite._sequenceNumber = STOP_RIGHT; break;
+		sprite._sequenceNumber = STOP_RIGHT;
+		break;
 	case WALK_UPRIGHT:
-		sprite._sequenceNumber = STOP_UPRIGHT; break;
+		sprite._sequenceNumber = STOP_UPRIGHT;
+		break;
 	case WALK_UPLEFT:
-		sprite._sequenceNumber = STOP_UPLEFT; break;
+		sprite._sequenceNumber = STOP_UPLEFT;
+		break;
 	case WALK_DOWNRIGHT:
-		sprite._sequenceNumber = STOP_DOWNRIGHT; break;
+		sprite._sequenceNumber = STOP_DOWNRIGHT;
+		break;
 	case WALK_DOWNLEFT:
-		sprite._sequenceNumber = STOP_DOWNLEFT; break;
+		sprite._sequenceNumber = STOP_DOWNLEFT;
+		break;
 	default:
 		break;
 	}
-- 
cgit v1.2.3


From 9114ca839d0ed46a8bb7123be950343a9ba36c4e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 8 May 2015 07:08:46 +0200
Subject: SHERLOCK: Fix the definition of Surface's destructor

---
 engines/sherlock/graphics.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 80b692130c..8e1bd438ea 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -41,7 +41,7 @@ protected:
 public:
     Surface(uint16 width, uint16 height);
 	Surface();
-	~Surface();
+	virtual ~Surface();
 
 	void create(uint16 width, uint16 height);
 	void blitFrom(const Graphics::Surface &src);
-- 
cgit v1.2.3


From 8b7ebf4269adda0dbd33e559ab5e3de047411f82 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 8 May 2015 07:15:40 +0200
Subject: SHERLOCK: Fix some compilation warnings using GCC

---
 engines/sherlock/map.h    | 2 +-
 engines/sherlock/people.h | 3 ++-
 engines/sherlock/screen.h | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index e4c6655db9..b4e92c600f 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -41,7 +41,7 @@ struct MapEntry : Common::Point {
 
 	MapEntry() : Common::Point(), _translate(-1) {}
 
-	MapEntry(int x, int y, int translate) : Common::Point(x, y), _translate(translate) {}
+	MapEntry(int posX, int posY, int translate) : Common::Point(posX, posY), _translate(translate) {}
 };
 
 class MapPaths {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 01ecd1a09a..02bb8dc950 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -45,8 +45,9 @@ enum {
 	STOP_DOWN = 5, STOP_RIGHT = 6, STOP_UP = 7, WALK_UPRIGHT = 8,
 	WALK_DOWNRIGHT = 9, WALK_UPLEFT = 10, WALK_DOWNLEFT = 11,
 	STOP_UPRIGHT = 12, STOP_UPLEFT = 13, STOP_DOWNRIGHT = 14,
-	STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4,
+	STOP_DOWNLEFT = 15, TALK_RIGHT = 6, TALK_LEFT = 4
 };
+
 enum {
 	MAP_UP = 1, MAP_UPRIGHT = 2, MAP_RIGHT = 1, MAP_DOWNRIGHT = 4,
 	MAP_DOWN = 5, MAP_DOWNLEFT = 6, MAP_LEFT = 2, MAP_UPLEFT = 8
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index bbfba1c575..b57f535983 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -82,7 +82,7 @@ public:
 	byte _sMap[PALETTE_SIZE];
 public:
 	Screen(SherlockEngine *vm);
-	~Screen();
+	virtual ~Screen();
 
 	void setFont(int fontNumber);
 
-- 
cgit v1.2.3


From fc5a0deb8915bb5bfc85626751539920752b386b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 8 May 2015 17:54:53 +0200
Subject: SHERLOCK: Fix some more GCC warnings

---
 engines/sherlock/journal.cpp | 2 +-
 engines/sherlock/objects.cpp | 7 +++++--
 engines/sherlock/people.cpp  | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 26aaa7a1a0..0c8864c302 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1125,7 +1125,7 @@ int Journal::getFindName(bool printError) {
 		if (events.kbHit()) {
 			Common::KeyState keyState = events.getKey();
 
-			if (keyState.keycode == Common::KEYCODE_BACKSPACE && name.c_str() > 0) {
+			if ((keyState.keycode == Common::KEYCODE_BACKSPACE) && (name.c_str() > 0)) {
 				screen.vgaBar(Common::Rect(xp - screen.charWidth(name.lastChar()), yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				xp -= screen.charWidth(name.lastChar());
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), INV_FOREGROUND);
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 40c8b954cb..488d1fcf83 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -242,8 +242,8 @@ void Sprite::checkSprite() {
 									// Invert percentage
 									palPercent = 100 - palPercent;
 
-								for (int idx = palStart; idx < (palStart + palLength); ++idx)
-									screen._sMap[idx] = screen._cMap[idx] * palPercent / 100;
+								for (int i = palStart; i < (palStart + palLength); ++i)
+									screen._sMap[i] = screen._cMap[i] * palPercent / 100;
 
 								events.pollEvents();
 								screen.setPalette(screen._sMap);
@@ -352,6 +352,9 @@ void Sprite::checkSprite() {
 					case DELTA:
 						_position.x += 200;
 						break;
+
+					default:
+						break;
 					}
 				}
 			}
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 0a3ef693a8..acc660b0c0 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -333,12 +333,12 @@ void People::setWalking() {
 		// See whether the major movement is horizontal or vertical
 		if (delta.x >= delta.y) {
 			// Set the initial frame sequence for the left and right, as well
-			// as settting the delta x depending on direction
+			// as setting the delta x depending on direction
 			if (_walkDest.x < (_player._position.x / 100)) {
-				_player._sequenceNumber = map._active ? MAP_LEFT : WALK_LEFT;
+				_player._sequenceNumber = (int) (map._active ? MAP_LEFT : WALK_LEFT);
 				_player._delta.x = speed.x * -100;
 			} else {
-				_player._sequenceNumber = map._active ? MAP_RIGHT : WALK_RIGHT;
+				_player._sequenceNumber = (int) (map._active ? MAP_RIGHT : WALK_RIGHT);
 				_player._delta.x = speed.x * 100;
 			}
 
-- 
cgit v1.2.3


From d34e5d1a5975e9fd525dfec8b9460cfa026378d4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 8 May 2015 18:01:51 +0200
Subject: SHERLOCK: Fix some more warnings

---
 engines/sherlock/scene.cpp  |  3 ++-
 engines/sherlock/screen.cpp | 18 +++++++++---------
 engines/sherlock/screen.h   |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index c1a73fee90..88f8674913 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1414,7 +1414,8 @@ void Scene::doBgAnim() {
 	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
 	if (people._clearingThePortrait && talk._scriptMoreFlag == 3) {
 		// Reset the flags and call to talk
-		people._clearingThePortrait = talk._scriptMoreFlag = 0;
+		people._clearingThePortrait = false;
+		talk._scriptMoreFlag = 0;
 		talk.talkTo(talk._scriptName);
 	}
 }
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 72045a83fb..5623224b97 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -52,9 +52,9 @@ Screen::~Screen() {
 /**
  * Set the font to use for writing text on the screen
  */
-void Screen::setFont(int fontNumber) {
-	_fontNumber = fontNumber;
-	Common::String fname = Common::String::format("FONT%d.VGS", fontNumber + 1);
+void Screen::setFont(int fontNumb) {
+	_fontNumber = fontNumb;
+	Common::String fname = Common::String::format("FONT%d.VGS", fontNumb + 1);
 
 	// Discard any previous font and read in new one
 	delete _font;
@@ -278,8 +278,8 @@ void Screen::restoreBackground(const Common::Rect &r) {
 /**
  * Copies a given area to the screen
  */
-void Screen::slamArea(int16 xp, int16 yp, int16 w, int16 h) {
-	slamRect(Common::Rect(xp, yp, xp + w, yp + h));
+void Screen::slamArea(int16 xp, int16 yp, int16 width, int16 height) {
+	slamRect(Common::Rect(xp, yp, xp + width, yp + height));
 }
 
 /**
@@ -300,10 +300,10 @@ void Screen::slamRect(const Common::Rect &r) {
  * new area covered by the shape as well as the old area, which must be restored
  */
 void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
-		int16 *xp, int16 *yp, int16 *w, int16 *h) {
+		int16 *xp, int16 *yp, int16 *width, int16 *height) {
 	Common::Point imgPos = pt + frame->_offset;
 	Common::Rect newBounds(imgPos.x, imgPos.y, imgPos.x + frame->_frame.w, imgPos.y + frame->_frame.h);
-	Common::Rect oldBounds(*xp, *yp, *xp + *w, *yp + *h);
+	Common::Rect oldBounds(*xp, *yp, *xp + *width, *yp + *height);
 
 	// See if the areas of the old and new overlap, and if so combine the areas
 	if (newBounds.intersects(oldBounds)) {
@@ -321,8 +321,8 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
 
 	*xp = newBounds.left;
 	*yp = newBounds.top;
-	*w = newBounds.width();
-	*h = newBounds.height();
+	*width = newBounds.width();
+	*height = newBounds.height();
 }
 
 /**
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index b57f535983..13a4549161 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -107,11 +107,11 @@ public:
 
 	void restoreBackground(const Common::Rect &r);
 
-	void slamArea(int16 xp, int16 yp, int16 w, int16 h);
+	void slamArea(int16 xp, int16 yp, int16 width, int16 height);
 	void slamRect(const Common::Rect &r);
 
 	void flushImage(ImageFrame *frame, const Common::Point &pt,
-		int16 *xp, int16 *yp, int16 *w, int16 *h);
+		int16 *xp, int16 *yp, int16 *width, int16 *height);
 
 	int stringWidth(const Common::String &str);
 
-- 
cgit v1.2.3


From bf0882badc0f29aa8df687fb6f2d0fddded209ab Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 8 May 2015 18:28:45 +0200
Subject: SHERLOCK: Fix some more GCC warnings

---
 engines/sherlock/screen.cpp | 18 +++++++++---------
 engines/sherlock/screen.h   |  4 ++--
 engines/sherlock/talk.cpp   | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 5623224b97..e22c4daad7 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -329,13 +329,13 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
  * Prints the text passed onto the back buffer at the given position and color.
  * The string is then blitted to the screen
  */
-void Screen::print(const Common::Point &pt, byte color, const char *format, ...) {
+void Screen::print(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
 	char buffer[100];
 	va_list args;
 
-	va_start(args, format);
-	vsprintf(buffer, format, args);
+	va_start(args, formatStr);
+	vsprintf(buffer, formatStr, args);
 	va_end(args);
 	Common::String str(buffer);
 
@@ -363,13 +363,13 @@ void Screen::print(const Common::Point &pt, byte color, const char *format, ...)
 /**
  * Print a strings onto the back buffer without blitting it to the screen
  */
-void Screen::gPrint(const Common::Point &pt, byte color, const char *format, ...) {
+void Screen::gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
 	char buffer[100];
 	va_list args;
 
-	va_start(args, format);
-	vsprintf(buffer, format, args);
+	va_start(args, formatStr);
+	vsprintf(buffer, formatStr, args);
 	va_end(args);
 	Common::String str(buffer);
 
@@ -519,10 +519,10 @@ Common::Rect Screen::getDisplayBounds() {
  * Synchronize the data for a savegame
  */
 void Screen::synchronize(Common::Serializer &s) {
-	int fontNumber = _fontNumber;
-	s.syncAsByte(fontNumber);
+	int fontNumb = _fontNumber;
+	s.syncAsByte(fontNumb);
 	if (s.isLoading())
-		setFont(fontNumber);
+		setFont(fontNumb);
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 13a4549161..7e33a12b7b 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -102,8 +102,8 @@ public:
 
 	void verticalTransition();
 
-	void print(const Common::Point &pt, byte color, const char *format, ...);
-	void gPrint(const Common::Point &pt, byte color, const char *format, ...);
+	void print(const Common::Point &pt, byte color, const char *formatStr, ...);
+	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...);
 
 	void restoreBackground(const Common::Rect &r);
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 55a79f8170..6d56149c6c 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -604,7 +604,7 @@ void Talk::stripVoiceCommands() {
 
 		// Scan for an sound effect byte, which indicates to play a sound
 		for (uint idx = 0; idx < statement._reply.size(); ++idx) {
-			if (statement._reply[idx] == SFX_COMMAND) {
+			if (statement._reply[idx] == (int)SFX_COMMAND) {
 				// Replace instruction character with a space, and delete the
 				// rest of the name following it
 				statement._reply = Common::String(statement._reply.c_str(),
@@ -1391,11 +1391,11 @@ void Talk::doScript(const Common::String &script) {
 				str += str[0] & 127;
 
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
-					Object &obj = scene._bgShapes[idx];
-					if (scumm_stricmp(tempString.c_str(), obj._name.c_str()) == 0) {
+					Object &object = scene._bgShapes[idx];
+					if (scumm_stricmp(tempString.c_str(), object._name.c_str()) == 0) {
 						// Only toggle the object if it's not in the desired state already
-						if ((obj._type == HIDDEN && state) || (obj._type != HIDDEN && !state))
-							obj.toggleHidden();
+						if ((object._type == HIDDEN && state) || (object._type != HIDDEN && !state))
+							object.toggleHidden();
 					}
 				}
 				break;
@@ -1460,13 +1460,13 @@ void Talk::doScript(const Common::String &script) {
 
 			case WALK_TO_CANIMATION: {
 				++str;
-				CAnim &anim = scene._cAnim[str[0] - 1];
+				CAnim &animation = scene._cAnim[str[0] - 1];
 
-				// Save the current point in the script, since it might be intterupted by
+				// Save the current point in the script, since it might be interrupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				_scriptCurrentIndex = (str + 1) - scriptStart;
 
-				people.walkToCoords(anim._goto, anim._gotoDir);
+				people.walkToCoords(animation._goto, animation._gotoDir);
 				if (_talkToAbort)
 					return;
 				break;
-- 
cgit v1.2.3


From 263f33a9f83f9d1d00a100b7532dd28e59ee3a6b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 May 2015 20:41:12 -0400
Subject: SHERLOCK: Fix some reads beyond script end in doScript

---
 engines/sherlock/talk.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 6d56149c6c..bbc61a3c13 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1010,6 +1010,7 @@ void Talk::doScript(const Common::String &script) {
 	_savedSequences.clear();
 
 	const byte *scriptStart = (const byte *)script.c_str();
+	const byte *scriptEnd = scriptStart + script.size();
 	const byte *str = scriptStart;
 
 	if (_scriptMoreFlag) {
@@ -1577,13 +1578,13 @@ void Talk::doScript(const Common::String &script) {
 			++line;
 
 			// Certain different conditions require a wait
-			if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
-					(line == 5 && str[0] != PAUSE && _speaker == -1) ||
+			if ((line == 4 && str < scriptEnd && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
+					(line == 5 && str < scriptEnd && str[0] != PAUSE && _speaker == -1) ||
 					endStr) {
 				wait = 1;
 			}
 
-			switch (str[0]) {
+			switch (str >= scriptEnd ? 0 : str[0]) {
 			case SWITCH_SPEAKER:
 			case ASSIGN_PORTRAIT_LOCATION:
 			case BANISH_WINDOW:
@@ -1631,7 +1632,7 @@ void Talk::doScript(const Common::String &script) {
 			}
 
 			// Clear the window unless the wait was due to a PAUSE command
-			if (!pauseFlag && wait != -1 && str[0] != SFX_COMMAND) {
+			if (!pauseFlag && wait != -1 && str < scriptEnd && str[0] != SFX_COMMAND) {
 				if (!_talkStealth)
 					ui.clearWindow();
 				yp = CONTROLS_Y + 12;
-- 
cgit v1.2.3


From 7ca37bef9f6b16f175f39908c8dfbb1761d42aa3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 May 2015 22:54:32 -0400
Subject: SHERLOCK: Simplify detection entry

---
 engines/sherlock/detection.cpp      | 8 --------
 engines/sherlock/detection_tables.h | 8 ++------
 engines/sherlock/sherlock.h         | 1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 734db007ba..aae8b0ad0e 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -33,7 +33,6 @@ struct SherlockGameDescription {
 	ADGameDescription desc;
 
 	int gameID;
-	uint32 features;
 };
 
 /**
@@ -43,13 +42,6 @@ uint32 SherlockEngine::getGameID() const {
 	return _gameDescription->gameID;
 }
 
-/**
- * Returns the features the currently playing game has
- */
-uint32 SherlockEngine::getGameFeatures() const {
-	return _gameDescription->features;
-}
-
 /**
  * Return's the platform the game's datafiles are for
  */
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 1d7326058e..401ede3b07 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -28,20 +28,16 @@ static const SherlockGameDescription gameDescriptions[] = {
 		{
 			"scalpel",
 			0,
-			{
-				{ "talk.lib", 0, "ad0c4d6865edf15da4e9204c08815875", 238928 },
-				AD_LISTEND
-			},
+			AD_ENTRY1s("talk.lib", "ad0c4d6865edf15da4e9204c08815875", 238928),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_SerratedScalpel,
-		0
 	},
 
-	{ AD_TABLE_END_MARKER, 0, 0 }
+	{ AD_TABLE_END_MARKER }
 };
 
 } // End of namespace MADS
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 06d38cbf89..79a3c11135 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -122,7 +122,6 @@ public:
 
 	int getGameType() const;
 	uint32 getGameID() const;
-	uint32 getGameFeatures() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 
-- 
cgit v1.2.3


From 4c7e840388afb4c573d9740614b75883688c55ec Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 8 May 2015 23:05:27 -0400
Subject: SHERLOCK: Fix meta engine initialization

---
 engines/sherlock/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index aae8b0ad0e..dd02bd7694 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -62,7 +62,7 @@ static const PlainGameDescriptor sherlockGames[] = {
 
 class SherlockMetaEngine : public AdvancedMetaEngine {
 public:
-	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::gameDescriptions), sherlockGames) {}
+	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription), sherlockGames) {}
 
 	virtual const char *getName() const {
 		return "Sherlock Engine";
-- 
cgit v1.2.3


From 8d89bf9bc6c067af4deaf86d4ae8c3430d584851 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 May 2015 09:42:16 +0200
Subject: SHERLOCK: Fix some more GCC warnings

---
 engines/sherlock/journal.cpp         |  4 ++--
 engines/sherlock/resources.cpp       | 14 +++++++-------
 engines/sherlock/scalpel/scalpel.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 0c8864c302..5ecb5ae26c 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -290,10 +290,10 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 							journalString += NAMES[talk._talkTo];
 
 						const byte *strP = replyP + 1;
-						char v;
+						byte v;
 						do {
 							v = *strP++;
-						} while (v && v < 128 && v != '.' && v != '!' && v != '?');
+						} while (v && (v < 128) && (v != '.') && (v != '!') && (v != '?'));
 
 						if (v == '?')
 							journalString += " asked, \"";
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 715ca492ae..c64f4e4923 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -343,9 +343,9 @@ void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
 	int v2 = stream.readUint16LE() + 1;
 	stream.skip(1);		// Skip paletteBase byte
 	bool rleEncoded = stream.readByte() == 1;
-	int size = v1 * v2;
+	int palSize = v1 * v2;
 
-	if ((size - 12) == PALETTE_SIZE && !rleEncoded) {
+	if ((palSize - 12) == PALETTE_SIZE && !rleEncoded) {
 		// Found palette, so read it in
 		stream.seek(2 + 12, SEEK_CUR);
 		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
@@ -373,21 +373,21 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 		// RLE encoded
 	    byte *dst = (byte *)frame._frame.getPixels();
 
-		int size = frame._width * frame._height;
-		while (size > 0) {
+		int frameSize = frame._width * frame._height;
+		while (frameSize > 0) {
 			if (*src == frame._rleMarker) {
 			    byte rleColor = src[1];
 			    byte rleCount = src[2];
 			    src += 3;
-			    size -= rleCount;
+			    frameSize -= rleCount;
 			    while (rleCount--)
 			        *dst++ = rleColor;
 			} else {
 				*dst++ = *src++;
-				--size;
+				--frameSize;
 			}
 		}
-		assert(size == 0);
+		assert(frameSize == 0);
 	} else {
 		// Uncompressed frame
 		Common::copy(src, src + frame._width * frame._height,
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 6ba6b33340..4cd613d48f 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -485,7 +485,7 @@ void ScalpelEngine::loadInventory() {
 	inv.push_back(InventoryItem(544, "Tarot", "Tarot Cards", "_ITEM71A"));
 	inv.push_back(InventoryItem(544, "Ornate Key", "An ornate key", "_ITEM70A"));
 	inv.push_back(InventoryItem(586, "Pawn ticket", "A pawn ticket", "_ITEM16A"));
-};
+}
 
 /**
  * Transition to show an image
-- 
cgit v1.2.3


From e3e4354f880d5f9354706b8f20d204960c48bb97 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 May 2015 10:21:46 +0200
Subject: SHERLOCK: Remove the use of ++ on boolean variables

---
 engines/sherlock/objects.cpp        |  8 ++++----
 engines/sherlock/user_interface.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 488d1fcf83..35b270dd13 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -909,13 +909,13 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 	} else if (name.hasPrefix("!")) {
 		// Message attached to canimation
 		int messageNum = atoi(name.c_str() + 1);
-		ui._infoFlag++;
+		ui._infoFlag = true;
 		ui.clearInfo();
 		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[messageNum]);
 		ui._menuCounter = 25;
 	} else if (name.hasPrefix("@")) {
 		// Message attached to canimation
-		ui._infoFlag++;
+		ui._infoFlag = true;
 		ui.clearInfo();
 		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, name.c_str() + 1);
 		printed = true;
@@ -1010,7 +1010,7 @@ int Object::pickUpObject(const char *const messages[]) {
 		if (message > 50)
 			message -= 50;
 
-		++ui._infoFlag;
+		ui._infoFlag = true;
 		ui.clearInfo();
 		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[message]);
 		ui._menuCounter = 30;
@@ -1056,7 +1056,7 @@ int Object::pickUpObject(const char *const messages[]) {
 			numObjects = inv.putItemInInventory(*this);
 
 		if (!printed) {
-			ui._infoFlag++;
+			ui._infoFlag = true;
 			ui.clearInfo();
 
 			Common::String itemName = _description;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index f048e280a8..ce282aa2c2 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -428,7 +428,7 @@ void UserInterface::restoreButton(int num) {
 	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);
 
 	if (!_menuCounter) {
-		_infoFlag++;
+		_infoFlag = true;
 		clearInfo();
 	}
 }
@@ -515,7 +515,7 @@ void UserInterface::clearWindow() {
 void UserInterface::whileMenuCounter() {
 	if (!(--_menuCounter) || _vm->_events->checkInput()) {
 		_menuCounter = 0;
-		++_infoFlag;
+		_infoFlag = true;
 		clearInfo();
 	}
 }
@@ -1259,7 +1259,7 @@ void UserInterface::doLookControl() {
 	Screen &screen = *_vm->_screen;
 
 	_key = _oldKey = -1;
-	_keyboardInput = _keycode != Common::KEYCODE_INVALID;
+	_keyboardInput = (_keycode != Common::KEYCODE_INVALID);
 
 	if (events._released || events._rightReleased || _keyboardInput) {
 		// Is an inventory object being looked at?
@@ -1360,7 +1360,7 @@ void UserInterface::doMainControl() {
 	// Check if the button being pointed to has changed
 	if (_oldKey != _key && !_windowOpen) {
 		// Clear the info line
-		_infoFlag++;
+		_infoFlag = true;
 		clearInfo();
 
 		// If there was an old button selected, restore it
@@ -2215,7 +2215,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 
 			// Print "Done..." as an ending, unless flagged for leaving scene or otherwise flagged
 			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
-				_infoFlag++;
+				_infoFlag = true;
 				clearInfo();
 				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
 				_menuCounter = 25;
-- 
cgit v1.2.3


From f622d7471e7f04f92c728cab7de9dd0a109886c3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 May 2015 13:08:36 +0200
Subject: SHERLOCK: Some more fixes

---
 engines/sherlock/journal.cpp |  2 +-
 engines/sherlock/people.cpp  |  4 ++--
 engines/sherlock/talk.cpp    | 33 +++++++++++++++++----------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 5ecb5ae26c..926ccee38a 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1125,7 +1125,7 @@ int Journal::getFindName(bool printError) {
 		if (events.kbHit()) {
 			Common::KeyState keyState = events.getKey();
 
-			if ((keyState.keycode == Common::KEYCODE_BACKSPACE) && (name.c_str() > 0)) {
+			if ((keyState.keycode == Common::KEYCODE_BACKSPACE) && (name.size() > 0)) {
 				screen.vgaBar(Common::Rect(xp - screen.charWidth(name.lastChar()), yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				xp -= screen.charWidth(name.lastChar());
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), INV_FOREGROUND);
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index acc660b0c0..f73ebd8cb0 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -335,10 +335,10 @@ void People::setWalking() {
 			// Set the initial frame sequence for the left and right, as well
 			// as setting the delta x depending on direction
 			if (_walkDest.x < (_player._position.x / 100)) {
-				_player._sequenceNumber = (int) (map._active ? MAP_LEFT : WALK_LEFT);
+				_player._sequenceNumber = (map._active ? (int)MAP_LEFT : (int)WALK_LEFT);
 				_player._delta.x = speed.x * -100;
 			} else {
-				_player._sequenceNumber = (int) (map._active ? MAP_RIGHT : WALK_RIGHT);
+				_player._sequenceNumber = (map._active ? (int)MAP_RIGHT : (int)WALK_RIGHT);
 				_player._delta.x = speed.x * 100;
 			}
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index bbc61a3c13..74bd98c4e1 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -604,7 +604,7 @@ void Talk::stripVoiceCommands() {
 
 		// Scan for an sound effect byte, which indicates to play a sound
 		for (uint idx = 0; idx < statement._reply.size(); ++idx) {
-			if (statement._reply[idx] == (int)SFX_COMMAND) {
+			if (statement._reply[idx] == (char)SFX_COMMAND) {
 				// Replace instruction character with a space, and delete the
 				// rest of the name following it
 				statement._reply = Common::String(statement._reply.c_str(),
@@ -1004,7 +1004,6 @@ void Talk::doScript(const Common::String &script) {
 	int line = 0;
 	bool noTextYet = true;
 	bool openTalkWindow = false;
-	int obj;
 	int seqCount;
 
 	_savedSequences.clear();
@@ -1164,18 +1163,19 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case ADJUST_OBJ_SEQUENCE:
+				{
 				// Get the name of the object to adjust
 				++str;
 				for (int idx = 0; idx < (str[0] & 127); ++idx)
 					tempString += str[idx + 2];
 
 				// Scan for object
-				obj = -1;
+				int objId = -1;
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
 					if (scumm_stricmp(tempString.c_str(), scene._bgShapes[idx]._name.c_str()) == 0)
-						obj = idx;
+						objId = idx;
 				}
-				if (obj == -1)
+				if (objId == -1)
 					error("Could not find object %s to change", tempString.c_str());
 
 				// Should the script be overwritten?
@@ -1183,10 +1183,10 @@ void Talk::doScript(const Common::String &script) {
 					// Save the current sequence
 					_savedSequences.push(SequenceEntry());
 					SequenceEntry &seqEntry = _savedSequences.top();
-					seqEntry._objNum = obj;
-					seqEntry._seqTo = scene._bgShapes[obj]._seqTo;
-					for (uint idx = 0; idx < scene._bgShapes[obj]._seqSize; ++idx)
-						seqEntry._sequences.push_back(scene._bgShapes[obj]._sequences[idx]);
+					seqEntry._objNum = objId;
+					seqEntry._seqTo = scene._bgShapes[objId]._seqTo;
+					for (uint idx = 0; idx < scene._bgShapes[objId]._seqSize; ++idx)
+						seqEntry._sequences.push_back(scene._bgShapes[objId]._sequences[idx]);
 				}
 
 				// Get number of bytes to change
@@ -1195,14 +1195,15 @@ void Talk::doScript(const Common::String &script) {
 
 				// Copy in the new sequence
 				for (int idx = 0; idx < seqCount; ++idx, ++str)
-					scene._bgShapes[obj]._sequences[idx] = str[0] - 1;
+					scene._bgShapes[objId]._sequences[idx] = str[0] - 1;
 
 				// Reset object back to beginning of new sequence
-				scene._bgShapes[obj]._frameNumber = 0;
+				scene._bgShapes[objId]._frameNumber = 0;
 				continue;
+				}
 
 			case WALK_TO_COORDS:
-				// Save the current point in the script, since it might be intterupted by
+				// Save the current point in the script, since it might be interrupted by
 				// doing bg anims in the next call, so we need to know where to return to
 				++str;
 				_scriptCurrentIndex = str - scriptStart;
@@ -1646,12 +1647,12 @@ void Talk::doScript(const Common::String &script) {
 	if (wait != -1) {
 		for (int ssIndex = 0; ssIndex < (int)_savedSequences.size(); ++ssIndex) {
 			SequenceEntry &seq = _savedSequences[ssIndex];
-			Object &obj = scene._bgShapes[seq._objNum];
+			Object &object = scene._bgShapes[seq._objNum];
 
 			for (uint idx = 0; idx < seq._sequences.size(); ++idx)
-				obj._sequences[idx] = seq._sequences[idx];
-			obj._frameNumber = seq._frameNumber;
-			obj._seqTo = seq._seqTo;
+				object._sequences[idx] = seq._sequences[idx];
+			object._frameNumber = seq._frameNumber;
+			object._seqTo = seq._seqTo;
 		}
 
 		pullSequence();
-- 
cgit v1.2.3


From 13c06c100e6eac2538de3ec178e654147c38bb1f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 08:41:13 -0400
Subject: SHERLOCK: Simplify animation loading filename handling

---
 engines/sherlock/animation.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index fc84680d5e..46568f8742 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -78,13 +78,8 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	// Check for any any sound frames for the given animation
 	const int *soundFrames = checkForSoundFrames(filename);
 
-	// Strip any extension off of the passed filename and add .vdx suffix
-	Common::String baseName = filename;
-	const char *p = strchr(baseName.c_str(), '.');
-	if (p)
-		baseName = Common::String(filename.c_str(), MIN(p - 1, baseName.c_str() + 7));
-
-	Common::String vdxName = baseName + ".vdx";
+	// Add on the VDX extension
+	Common::String vdxName = filename + ".vdx";
 
 	// Load the animation
 	Common::SeekableReadStream *stream;
@@ -96,7 +91,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 		stream = _vm->_res->load(vdxName, "epilogue.lib");
 
 	// Load initial image
-	Common::String vdaName = baseName + ".vda";
+	Common::String vdaName = filename + ".vda";
 	ImageFile images(vdaName, true, true);
 
 	events.wait(minDelay);
@@ -144,8 +139,8 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 				++soundNumber;
 				++soundFrames;
 				Common::String fname = _vm->_soundOverride.empty() ?
-					Common::String::format("%s%01d", baseName.c_str(), soundNumber) :
-					Common::String::format("%s%02d", baseName.c_str(), soundNumber);
+					Common::String::format("%s%01d", filename.c_str(), soundNumber) :
+					Common::String::format("%s%02d", filename.c_str(), soundNumber);
 
 				if (sound._voices)
 					sound.playSound(fname);
-- 
cgit v1.2.3


From 1ef5b667925d5813bde6aba2392e3cb19cb08f22 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 08:56:12 -0400
Subject: SHERLOCK: Cleanup fixes for animation player

---
 engines/sherlock/animation.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 46568f8742..ced03e8a49 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -127,7 +127,8 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 			// since we don't want the offsets in the image file to be used, just the explicit position we specify
 			screen.transBlitFrom(images[imageFrame]._frame, pt);
 		} else {
-			// No sprite to show for this animation frame
+			// At this point, either the sprites for the frame has been complete, or there weren't any sprites
+			// at all to draw for the frame
 			if (fade == 255) {
 				// Gradual fade in
 				if (screen.equalizePalette(images._palette) == 0)
@@ -178,14 +179,14 @@ const int *Animation::checkForSoundFrames(const Common::String &filename) {
 
 	if (_vm->_soundOverride.empty()) {
 		for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
-			if (!scumm_stricmp(filename.c_str(), PROLOGUE_NAMES[idx])) {
+			if (!filename.equalsIgnoreCase(PROLOGUE_NAMES[idx])) {
 				frames = &PROLOGUE_FRAMES[idx][0];
 				break;
 			}
 		}
 	} else {
 		for (int idx = 0; idx < TITLE_NAMES_COUNT; ++idx) {
-			if (!scumm_stricmp(filename.c_str(), TITLE_NAMES[idx])) {
+			if (!filename.equalsIgnoreCase(TITLE_NAMES[idx])) {
 				frames = &TITLE_FRAMES[idx][0];
 				break;
 			}
-- 
cgit v1.2.3


From 47bcb5358acddc3ef75f5a4af59ba43f06027490 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 09:09:10 -0400
Subject: SHERLOCK: Cleanup fix for decompress

---
 engines/sherlock/decompress.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index b319bc90c8..7c98b50543 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -48,7 +48,7 @@ Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int
 	lzWindowPos = 0xFEE;
 	cmd = 0;
 
-	while (1) {
+	do {
 		cmd >>= 1;
 		if (!(cmd & 0x100))
 			cmd = source.readByte() | 0xFF00;
@@ -72,9 +72,7 @@ Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int
 				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
 			}
 		}
-		if (outBuffer >= outBufferEnd)
-			break;
-	}
+	} while (outBuffer < outBufferEnd);
 
 	return outS;
 }
-- 
cgit v1.2.3


From 5d41f0f9aa5d4df586949362fcedec447d1d6094 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 09:17:30 -0400
Subject: SHERLOCK: Give the GTYPE constants an explicit enum type

---
 engines/sherlock/detection.cpp | 6 +++---
 engines/sherlock/sherlock.h    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index dd02bd7694..82ac5a4c3d 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -32,18 +32,18 @@ namespace Sherlock {
 struct SherlockGameDescription {
 	ADGameDescription desc;
 
-	int gameID;
+	GameType gameID;
 };
 
 /**
  * Returns the Id of the game
  */
-uint32 SherlockEngine::getGameID() const {
+GameType SherlockEngine::getGameID() const {
 	return _gameDescription->gameID;
 }
 
 /**
- * Return's the platform the game's datafiles are for
+ * Returns the platform the game's datafiles are for
  */
 Common::Platform SherlockEngine::getPlatform() const {
 	return _gameDescription->desc.platform;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 79a3c11135..a516e52ae7 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -57,7 +57,7 @@ enum {
 	kDebugScript = 1 << 0
 };
 
-enum {
+enum GameType {
 	GType_SerratedScalpel = 0,
 	GType_RoseTattoo = 1
 };
@@ -121,7 +121,7 @@ public:
 	virtual void syncSoundSettings();
 
 	int getGameType() const;
-	uint32 getGameID() const;
+	GameType getGameID() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 
-- 
cgit v1.2.3


From 4950deaf33dc46521e495d36b9d0f1933d007aa1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 09:24:22 -0400
Subject: SHERLOCK: Cleanup for Debugger class

---
 engines/sherlock/debugger.cpp | 6 +++---
 engines/sherlock/debugger.h   | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
index b3dac71d5e..ff9a8056b0 100644
--- a/engines/sherlock/debugger.cpp
+++ b/engines/sherlock/debugger.cpp
@@ -27,13 +27,13 @@ namespace Sherlock {
 
 Debugger::Debugger(SherlockEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("continue",		WRAP_METHOD(Debugger, cmdExit));
-	registerCmd("scene", WRAP_METHOD(Debugger, cmd_scene));
+	registerCmd("scene", WRAP_METHOD(Debugger, cmdScene));
 }
 
 /**
  * Converts a decimal or hexadecimal string into a number
  */
-static int strToInt(const char *s) {
+int Debugger::strToInt(const char *s) {
 	if (!*s)
 		// No string at all
 		return 0;
@@ -52,7 +52,7 @@ static int strToInt(const char *s) {
 /**
  * Switch to another scene
  */
-bool Debugger::cmd_scene(int argc, const char **argv) {
+bool Debugger::cmdScene(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Format: scene <room>\n");
 		return true;
diff --git a/engines/sherlock/debugger.h b/engines/sherlock/debugger.h
index 8c7291c9e6..fe77007975 100644
--- a/engines/sherlock/debugger.h
+++ b/engines/sherlock/debugger.h
@@ -33,8 +33,10 @@ class SherlockEngine;
 class Debugger : public GUI::Debugger {
 private:
 	SherlockEngine *_vm;
-protected:
-	bool cmd_scene(int argc, const char **argv);
+
+	int strToInt(const char *s);
+
+	bool cmdScene(int argc, const char **argv);
 public:
 	Debugger(SherlockEngine *vm);
 	virtual ~Debugger() {}
-- 
cgit v1.2.3


From ccb8c03737ef04dc7ec964cba3516652def3d077 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 09:29:06 -0400
Subject: SHERLOCK: Further cleanup fixes for detection

---
 engines/sherlock/detection.cpp      | 3 +--
 engines/sherlock/detection_tables.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 82ac5a4c3d..a6b980fea3 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -52,7 +52,6 @@ Common::Platform SherlockEngine::getPlatform() const {
 } // End of namespace Sherlock
 
 static const PlainGameDescriptor sherlockGames[] = {
-	{"sherlock", "The Lost Files of Sherlock Holmes"},
 	{ "scalpel", "The Case of the Serrated Scalpel" },
 	{ "rosetattoo", "The Case of the Rose Tattoo" },
 	{0, 0}
@@ -127,7 +126,7 @@ bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
  * Return a list of savegames
  */
 SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
-	return Sherlock::SaveManager(nullptr, "").getSavegameList(target);
+	return Sherlock::SaveManager::getSavegameList(target);
 }
 
 /**
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 401ede3b07..8f17e8f8ea 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -37,7 +37,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 		GType_SerratedScalpel,
 	},
 
-	{ AD_TABLE_END_MARKER }
+	{ AD_TABLE_END_MARKER, (GameType)0 }
 };
 
 } // End of namespace MADS
-- 
cgit v1.2.3


From 5dd69b4dd1be1dd8793111df089a4c737231a614 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 9 May 2015 15:56:27 +0200
Subject: MADS: Make GPL header consistent with what we normally use.

---
 engines/mads/action.cpp                           | 4 ++--
 engines/mads/action.h                             | 4 ++--
 engines/mads/animation.cpp                        | 4 ++--
 engines/mads/animation.h                          | 4 ++--
 engines/mads/assets.cpp                           | 4 ++--
 engines/mads/assets.h                             | 4 ++--
 engines/mads/audio.cpp                            | 4 ++--
 engines/mads/audio.h                              | 4 ++--
 engines/mads/compression.cpp                      | 4 ++--
 engines/mads/compression.h                        | 4 ++--
 engines/mads/debugger.cpp                         | 6 +++---
 engines/mads/debugger.h                           | 6 +++---
 engines/mads/detection.cpp                        | 4 ++--
 engines/mads/detection_tables.h                   | 4 ++--
 engines/mads/dialogs.cpp                          | 4 ++--
 engines/mads/dialogs.h                            | 4 ++--
 engines/mads/dragonsphere/dragonsphere_scenes.cpp | 4 ++--
 engines/mads/dragonsphere/dragonsphere_scenes.h   | 4 ++--
 engines/mads/dragonsphere/game_dragonsphere.cpp   | 4 ++--
 engines/mads/dragonsphere/game_dragonsphere.h     | 4 ++--
 engines/mads/events.cpp                           | 4 ++--
 engines/mads/events.h                             | 4 ++--
 engines/mads/font.cpp                             | 4 ++--
 engines/mads/font.h                               | 4 ++--
 engines/mads/game.cpp                             | 4 ++--
 engines/mads/game.h                               | 4 ++--
 engines/mads/game_data.cpp                        | 4 ++--
 engines/mads/game_data.h                          | 4 ++--
 engines/mads/globals.cpp                          | 4 ++--
 engines/mads/globals.h                            | 4 ++--
 engines/mads/hotspots.cpp                         | 6 +++---
 engines/mads/hotspots.h                           | 6 +++---
 engines/mads/inventory.cpp                        | 4 ++--
 engines/mads/inventory.h                          | 4 ++--
 engines/mads/mads.cpp                             | 4 ++--
 engines/mads/mads.h                               | 4 ++--
 engines/mads/menu_views.cpp                       | 4 ++--
 engines/mads/menu_views.h                         | 4 ++--
 engines/mads/messages.cpp                         | 4 ++--
 engines/mads/messages.h                           | 4 ++--
 engines/mads/msurface.cpp                         | 4 ++--
 engines/mads/msurface.h                           | 4 ++--
 engines/mads/nebular/dialogs_nebular.cpp          | 4 ++--
 engines/mads/nebular/dialogs_nebular.h            | 4 ++--
 engines/mads/nebular/game_nebular.cpp             | 4 ++--
 engines/mads/nebular/game_nebular.h               | 4 ++--
 engines/mads/nebular/globals_nebular.cpp          | 4 ++--
 engines/mads/nebular/globals_nebular.h            | 4 ++--
 engines/mads/nebular/menu_nebular.cpp             | 4 ++--
 engines/mads/nebular/menu_nebular.h               | 4 ++--
 engines/mads/nebular/nebular_scenes.cpp           | 4 ++--
 engines/mads/nebular/nebular_scenes.h             | 4 ++--
 engines/mads/nebular/nebular_scenes1.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes1.h            | 4 ++--
 engines/mads/nebular/nebular_scenes2.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes2.h            | 4 ++--
 engines/mads/nebular/nebular_scenes3.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes3.h            | 4 ++--
 engines/mads/nebular/nebular_scenes4.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes4.h            | 4 ++--
 engines/mads/nebular/nebular_scenes5.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes5.h            | 4 ++--
 engines/mads/nebular/nebular_scenes6.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes6.h            | 6 +++---
 engines/mads/nebular/nebular_scenes7.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes7.h            | 4 ++--
 engines/mads/nebular/nebular_scenes8.cpp          | 6 +++---
 engines/mads/nebular/nebular_scenes8.h            | 4 ++--
 engines/mads/nebular/sound_nebular.cpp            | 4 ++--
 engines/mads/nebular/sound_nebular.h              | 4 ++--
 engines/mads/palette.cpp                          | 4 ++--
 engines/mads/palette.h                            | 4 ++--
 engines/mads/phantom/game_phantom.cpp             | 4 ++--
 engines/mads/phantom/game_phantom.h               | 4 ++--
 engines/mads/phantom/phantom_scenes.cpp           | 4 ++--
 engines/mads/phantom/phantom_scenes.h             | 4 ++--
 engines/mads/player.cpp                           | 4 ++--
 engines/mads/player.h                             | 4 ++--
 engines/mads/rails.cpp                            | 4 ++--
 engines/mads/rails.h                              | 4 ++--
 engines/mads/resources.cpp                        | 4 ++--
 engines/mads/resources.h                          | 4 ++--
 engines/mads/scene.cpp                            | 4 ++--
 engines/mads/scene.h                              | 4 ++--
 engines/mads/screen.cpp                           | 4 ++--
 engines/mads/screen.h                             | 4 ++--
 engines/mads/sequence.cpp                         | 4 ++--
 engines/mads/sequence.h                           | 4 ++--
 engines/mads/sound.cpp                            | 4 ++--
 engines/mads/sound.h                              | 4 ++--
 engines/mads/sprites.cpp                          | 4 ++--
 engines/mads/sprites.h                            | 4 ++--
 engines/mads/staticres.cpp                        | 4 ++--
 engines/mads/staticres.h                          | 4 ++--
 engines/mads/user_interface.cpp                   | 4 ++--
 engines/mads/user_interface.h                     | 4 ++--
 96 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index 628f03526f..f1c562675f 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/action.h b/engines/mads/action.h
index cfd5a3be3f..3ea10cd964 100644
--- a/engines/mads/action.h
+++ b/engines/mads/action.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index cf02e7b0b5..e4f44fc308 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/animation.h b/engines/mads/animation.h
index 1c87273e62..46ef85c5eb 100644
--- a/engines/mads/animation.h
+++ b/engines/mads/animation.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp
index a2d495f311..1d4634e383 100644
--- a/engines/mads/assets.cpp
+++ b/engines/mads/assets.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/assets.h b/engines/mads/assets.h
index 155590f9bd..8a0dc2cd44 100644
--- a/engines/mads/assets.h
+++ b/engines/mads/assets.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/audio.cpp b/engines/mads/audio.cpp
index def2cd6c62..8f33f22243 100644
--- a/engines/mads/audio.cpp
+++ b/engines/mads/audio.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/audio.h b/engines/mads/audio.h
index 13c540bf85..5c3cd5e682 100644
--- a/engines/mads/audio.h
+++ b/engines/mads/audio.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/compression.cpp b/engines/mads/compression.cpp
index 79cd1786de..1f6f1ee202 100644
--- a/engines/mads/compression.cpp
+++ b/engines/mads/compression.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/compression.h b/engines/mads/compression.h
index f7381e4af3..b560ed33c1 100644
--- a/engines/mads/compression.h
+++ b/engines/mads/compression.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/debugger.cpp b/engines/mads/debugger.cpp
index 99251f9fbb..a6a4d3edbc 100644
--- a/engines/mads/debugger.cpp
+++ b/engines/mads/debugger.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/debugger.h b/engines/mads/debugger.h
index c8fee5f5b2..70b2cadc65 100644
--- a/engines/mads/debugger.h
+++ b/engines/mads/debugger.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index ea71fc8539..57f4776e82 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index faf73996ac..56df09577c 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 7f0b02bc65..d9b27ce926 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/dialogs.h b/engines/mads/dialogs.h
index 317c7bd792..efd2871d89 100644
--- a/engines/mads/dialogs.h
+++ b/engines/mads/dialogs.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes.cpp b/engines/mads/dragonsphere/dragonsphere_scenes.cpp
index f32d17d9c9..ff01c32174 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes.cpp
+++ b/engines/mads/dragonsphere/dragonsphere_scenes.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes.h b/engines/mads/dragonsphere/dragonsphere_scenes.h
index a6c778eca7..173cc667ce 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes.h
+++ b/engines/mads/dragonsphere/dragonsphere_scenes.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/dragonsphere/game_dragonsphere.cpp b/engines/mads/dragonsphere/game_dragonsphere.cpp
index 3836adb6d2..b07eab9daa 100644
--- a/engines/mads/dragonsphere/game_dragonsphere.cpp
+++ b/engines/mads/dragonsphere/game_dragonsphere.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/dragonsphere/game_dragonsphere.h b/engines/mads/dragonsphere/game_dragonsphere.h
index 7869dc87b4..b57f8833c6 100644
--- a/engines/mads/dragonsphere/game_dragonsphere.h
+++ b/engines/mads/dragonsphere/game_dragonsphere.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index 52569af375..7ba9098935 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/events.h b/engines/mads/events.h
index 1a92754f10..1a2579cae0 100644
--- a/engines/mads/events.h
+++ b/engines/mads/events.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/font.cpp b/engines/mads/font.cpp
index f7c1c52703..3e6d23fe6f 100644
--- a/engines/mads/font.cpp
+++ b/engines/mads/font.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/font.h b/engines/mads/font.h
index 47df647637..486cadcfff 100644
--- a/engines/mads/font.h
+++ b/engines/mads/font.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 3d1c194612..91f6cd5630 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/game.h b/engines/mads/game.h
index d246aa501e..95b54b0d1a 100644
--- a/engines/mads/game.h
+++ b/engines/mads/game.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/game_data.cpp b/engines/mads/game_data.cpp
index 70e9e6c30b..6421d057e8 100644
--- a/engines/mads/game_data.cpp
+++ b/engines/mads/game_data.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/game_data.h b/engines/mads/game_data.h
index 65a9ae1553..e9bf45d8a5 100644
--- a/engines/mads/game_data.h
+++ b/engines/mads/game_data.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/globals.cpp b/engines/mads/globals.cpp
index 1d088992ea..e4a681d551 100644
--- a/engines/mads/globals.cpp
+++ b/engines/mads/globals.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/globals.h b/engines/mads/globals.h
index a6c9b628dd..27553a2b06 100644
--- a/engines/mads/globals.h
+++ b/engines/mads/globals.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/hotspots.cpp b/engines/mads/hotspots.cpp
index 2af421a112..bd28645504 100644
--- a/engines/mads/hotspots.cpp
+++ b/engines/mads/hotspots.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/hotspots.h b/engines/mads/hotspots.h
index f9334eace8..902275bb21 100644
--- a/engines/mads/hotspots.h
+++ b/engines/mads/hotspots.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/inventory.cpp b/engines/mads/inventory.cpp
index ca05575ec5..fe1d24baea 100644
--- a/engines/mads/inventory.cpp
+++ b/engines/mads/inventory.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/inventory.h b/engines/mads/inventory.h
index cf82de59f1..2897f950e4 100644
--- a/engines/mads/inventory.h
+++ b/engines/mads/inventory.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 374e373035..8c7b6b1ce3 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 1d641e7c87..901035320a 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/menu_views.cpp b/engines/mads/menu_views.cpp
index 319f5b0f87..cfc3b09461 100644
--- a/engines/mads/menu_views.cpp
+++ b/engines/mads/menu_views.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index f39ea4c3b5..6c8a2a8bdd 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index 304c79aa46..d88806150d 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/messages.h b/engines/mads/messages.h
index 22ae0b24b5..764477a7fc 100644
--- a/engines/mads/messages.h
+++ b/engines/mads/messages.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index 702b9e5f08..f768624278 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index 754e70bf7f..80891afb83 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index 5b9942db07..960a2cc2f4 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h
index 0f086f6ec1..4935ee4b8c 100644
--- a/engines/mads/nebular/dialogs_nebular.h
+++ b/engines/mads/nebular/dialogs_nebular.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index e9a3d0b716..e8e0a4f42c 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h
index 1b89d11412..3cf7aefc18 100644
--- a/engines/mads/nebular/game_nebular.h
+++ b/engines/mads/nebular/game_nebular.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/globals_nebular.cpp b/engines/mads/nebular/globals_nebular.cpp
index 9f8b8a7888..c44506e546 100644
--- a/engines/mads/nebular/globals_nebular.cpp
+++ b/engines/mads/nebular/globals_nebular.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h
index 8d0c26d96d..7c7069892e 100644
--- a/engines/mads/nebular/globals_nebular.h
+++ b/engines/mads/nebular/globals_nebular.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 2fdef3443d..6fe17f3beb 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h
index 77b8b6fc6e..35af0bb34f 100644
--- a/engines/mads/nebular/menu_nebular.h
+++ b/engines/mads/nebular/menu_nebular.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes.cpp b/engines/mads/nebular/nebular_scenes.cpp
index 14cf71d0fc..eb6f7a5610 100644
--- a/engines/mads/nebular/nebular_scenes.cpp
+++ b/engines/mads/nebular/nebular_scenes.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index db7738f13b..58a6d1c98f 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index c9eda08859..fd97f71727 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes1.h b/engines/mads/nebular/nebular_scenes1.h
index 1afa7fccc1..d8c9059846 100644
--- a/engines/mads/nebular/nebular_scenes1.h
+++ b/engines/mads/nebular/nebular_scenes1.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 84910c4de3..1cbd6f56ef 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes2.h b/engines/mads/nebular/nebular_scenes2.h
index c860db9470..0ea4702eea 100644
--- a/engines/mads/nebular/nebular_scenes2.h
+++ b/engines/mads/nebular/nebular_scenes2.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 4e7781e7a2..5a6edbf995 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes3.h b/engines/mads/nebular/nebular_scenes3.h
index 9efd38e9a4..cf925b3867 100644
--- a/engines/mads/nebular/nebular_scenes3.h
+++ b/engines/mads/nebular/nebular_scenes3.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 29b17c42c0..c981f6a6e4 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes4.h b/engines/mads/nebular/nebular_scenes4.h
index fbd5ce81f0..de11bd4129 100644
--- a/engines/mads/nebular/nebular_scenes4.h
+++ b/engines/mads/nebular/nebular_scenes4.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 2470137b2e..95eb429193 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes5.h b/engines/mads/nebular/nebular_scenes5.h
index 2face26508..f314ae8513 100644
--- a/engines/mads/nebular/nebular_scenes5.h
+++ b/engines/mads/nebular/nebular_scenes5.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index d94fb17fd4..d97e37ea0b 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes6.h b/engines/mads/nebular/nebular_scenes6.h
index c5cac56626..4fc4a2e8ae 100644
--- a/engines/mads/nebular/nebular_scenes6.h
+++ b/engines/mads/nebular/nebular_scenes6.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index b40a8054f7..c2a249e5f8 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes7.h b/engines/mads/nebular/nebular_scenes7.h
index dfb3c0f16e..b5aeba818c 100644
--- a/engines/mads/nebular/nebular_scenes7.h
+++ b/engines/mads/nebular/nebular_scenes7.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 5f8417cee1..a904569624 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/nebular_scenes8.h b/engines/mads/nebular/nebular_scenes8.h
index 7f2c34a843..439815f05c 100644
--- a/engines/mads/nebular/nebular_scenes8.h
+++ b/engines/mads/nebular/nebular_scenes8.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 9716e6d522..240c18f6dc 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index d2fc552eec..9bc1a49458 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index b5ea136abd..36c9e5694f 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 5d3bc3a82e..6c98947384 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp
index 0b2531ef65..cbeb6b0d26 100644
--- a/engines/mads/phantom/game_phantom.cpp
+++ b/engines/mads/phantom/game_phantom.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/phantom/game_phantom.h b/engines/mads/phantom/game_phantom.h
index 99cc2c1230..5504054bcf 100644
--- a/engines/mads/phantom/game_phantom.h
+++ b/engines/mads/phantom/game_phantom.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/phantom/phantom_scenes.cpp b/engines/mads/phantom/phantom_scenes.cpp
index 7fd7ce642d..c2cec47bd9 100644
--- a/engines/mads/phantom/phantom_scenes.cpp
+++ b/engines/mads/phantom/phantom_scenes.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h
index cd295a28b6..0e22610086 100644
--- a/engines/mads/phantom/phantom_scenes.h
+++ b/engines/mads/phantom/phantom_scenes.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index f61a5a1592..bb747f4b52 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/player.h b/engines/mads/player.h
index 671ac9d16e..e5765a9bca 100644
--- a/engines/mads/player.h
+++ b/engines/mads/player.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/rails.cpp b/engines/mads/rails.cpp
index 322e6e7cb3..9b2ec71de6 100644
--- a/engines/mads/rails.cpp
+++ b/engines/mads/rails.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/rails.h b/engines/mads/rails.h
index e6cab08f85..c95f5c47a6 100644
--- a/engines/mads/rails.h
+++ b/engines/mads/rails.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/resources.cpp b/engines/mads/resources.cpp
index 1fb75e6ba2..d5352fb205 100644
--- a/engines/mads/resources.cpp
+++ b/engines/mads/resources.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/resources.h b/engines/mads/resources.h
index 8d9ab1e39f..95ea17d3c4 100644
--- a/engines/mads/resources.h
+++ b/engines/mads/resources.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 463d4a62fd..5662d8349a 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index 5927f4e70f..c0784c3812 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 3e2fe22611..3c27001ae0 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index 85c55419ca..d910e88633 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index ba0111a844..e5bf1631c2 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 8b236af15e..c3a277c5a5 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index 4036ee8112..7b9388eee3 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/sound.h b/engines/mads/sound.h
index 5884323474..16128f8284 100644
--- a/engines/mads/sound.h
+++ b/engines/mads/sound.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index f15d6456d3..0a1c0b710d 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/sprites.h b/engines/mads/sprites.h
index bb5fdbe964..3db922c40b 100644
--- a/engines/mads/sprites.h
+++ b/engines/mads/sprites.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/staticres.cpp b/engines/mads/staticres.cpp
index 189e5f72e7..b659d9a27c 100644
--- a/engines/mads/staticres.cpp
+++ b/engines/mads/staticres.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/staticres.h b/engines/mads/staticres.h
index 560fd12e67..b805729327 100644
--- a/engines/mads/staticres.h
+++ b/engines/mads/staticres.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 1e5a1d80d2..62fd036c03 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h
index 71c6f64c2a..1366aa2c32 100644
--- a/engines/mads/user_interface.h
+++ b/engines/mads/user_interface.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From c85b14b402ef03757c0a5ab320d8c0ef6dba5483 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 10:01:36 -0400
Subject: SHERLOCK: More comment fixes

---
 engines/sherlock/detection_tables.h | 2 +-
 engines/sherlock/events.cpp         | 2 +-
 engines/sherlock/objects.h          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 8f17e8f8ea..b369868741 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -40,4 +40,4 @@ static const SherlockGameDescription gameDescriptions[] = {
 	{ AD_TABLE_END_MARKER, (GameType)0 }
 };
 
-} // End of namespace MADS
+} // End of namespace Sherlock
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 4e3f81e588..1bc2e64f6e 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -296,4 +296,4 @@ bool Events::checkInput() {
 	return kbHit() || _pressed || _released || _rightPressed || _rightReleased;
 }
 
-} // End of namespace MADS
+} // End of namespace Sherlock
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 861858c58e..f6ad6beb0d 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -145,7 +145,7 @@ enum { REVERSE_DIRECTION = 0x80 };
 
 struct ActionType {
 	int _cAnimNum;
-	int _cAnimSpeed;				// if high bit set, play in reverse
+	int _cAnimSpeed;
 	Common::String _names[4];
 
 	void synchronize(Common::SeekableReadStream &s);
@@ -153,7 +153,7 @@ struct ActionType {
 
 struct UseType {
 	int _cAnimNum;
-	int _cAnimSpeed;				// if high bit set, play in reverse
+	int _cAnimSpeed;
 	Common::String _names[4];
 	int _useFlag;					// Which flag USE will set (if any)
 	int _dFlag[1];
-- 
cgit v1.2.3


From 8306451462e6ffa91ac3bf76e30b43f3777dbd89 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 9 May 2015 16:14:39 +0200
Subject: SHERLOCK: Fix string equality tests

---
 engines/sherlock/animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index ced03e8a49..299a8186d7 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -179,14 +179,14 @@ const int *Animation::checkForSoundFrames(const Common::String &filename) {
 
 	if (_vm->_soundOverride.empty()) {
 		for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
-			if (!filename.equalsIgnoreCase(PROLOGUE_NAMES[idx])) {
+			if (filename.equalsIgnoreCase(PROLOGUE_NAMES[idx])) {
 				frames = &PROLOGUE_FRAMES[idx][0];
 				break;
 			}
 		}
 	} else {
 		for (int idx = 0; idx < TITLE_NAMES_COUNT; ++idx) {
-			if (!filename.equalsIgnoreCase(TITLE_NAMES[idx])) {
+			if (filename.equalsIgnoreCase(TITLE_NAMES[idx])) {
 				frames = &TITLE_FRAMES[idx][0];
 				break;
 			}
-- 
cgit v1.2.3


From 00fb65c1dcfe97e0b5550bf805d87c736c5f19c6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 10:32:45 -0400
Subject: SHERLOCK: Cleanup fixes for event manager

---
 engines/sherlock/events.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 1bc2e64f6e..886306fc0e 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -188,9 +188,6 @@ bool Events::checkForNextFrameCounter() {
 		// Display the frame
 		_vm->_screen->update();
 
-		// Signal the ScummVM debugger
-		_vm->_debugger->onFrame();
-
 		return true;
 	}
 
@@ -267,7 +264,10 @@ bool Events::delay(uint32 time, bool interruptable) {
 }
 
 /**
- * Sets the pressed and released button flags depending on the value passed
+ * Sets the pressed and released button flags on the raw button state previously set in pollEvents calls.
+ * @remarks		The events manager has separate variables for the raw immediate and old button state
+ *		versus the current buttons states for the frame. This method is expected to be called only once
+ *		per game frame
  */
 void Events::setButtonState() {
 	_released = _rightReleased = false;
-- 
cgit v1.2.3


From 5f71643cba4937367182d3c6751fcfecfbb09573 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 10:35:43 -0400
Subject: SHERLOCK: Remove Surface constructor no longer being used

---
 engines/sherlock/graphics.cpp | 8 --------
 engines/sherlock/graphics.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index 5dafb4cc76..bdb4df6c83 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -31,14 +31,6 @@ Surface::Surface(uint16 width, uint16 height): _freePixels(true) {
 	create(width, height);
 }
 
-Surface::Surface(Surface &src, const Common::Rect &r) : _freePixels(false) {
-	setPixels(src.getBasePtr(r.left, r.top));
-	w = r.width();
-	h = r.height();
-	pitch = src.pitch;
-	format = Graphics::PixelFormat::createFormatCLUT8();
-}
-
 Surface::Surface() : _freePixels(false) {
 }
 
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 8e1bd438ea..8ed508fad0 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -36,8 +36,6 @@ private:
 	bool clip(Common::Rect &srcBounds, Common::Rect &destBounds);
 protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
-
-	Surface(Surface &src, const Common::Rect &r);
 public:
     Surface(uint16 width, uint16 height);
 	Surface();
-- 
cgit v1.2.3


From 1518d14c3412fa6cf5aaf2bb3bbedfe61d37c15e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 11:25:05 -0400
Subject: SHERLOCK: Cleanup fixes for Inventory

---
 engines/sherlock/inventory.cpp | 8 +++++---
 engines/sherlock/inventory.h   | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 99db461ea4..c3e2e14393 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -79,7 +79,9 @@ void Inventory::freeGraphics() {
 	_invGraphicsLoaded = false;
 }
 
-/** Load the list of names the inventory items correspond to.
+/**
+ * Load the list of names the inventory items correspond to, if not already loaded, 
+ * and then calls loadGraphics to load the associated graphics
  */
 void Inventory::loadInv() {
 	// Exit if the inventory names are already loaded
@@ -88,9 +90,9 @@ void Inventory::loadInv() {
 
 	// Load the inventory names
 	Common::SeekableReadStream *stream = _vm->_res->load("invent.txt");
-	_names.clear();
 
-	while (stream->pos() < stream->size()) {
+	int streamSize = stream->size();
+	while (stream->pos() < streamSize) {
 		Common::String name;
 		char c;
 		while ((c = stream->readByte()) != 0)
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 68b88bd978..bec26b333d 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -72,7 +72,8 @@ public:
 	bool _invGraphicsLoaded;
 	InvMode _invMode;
 	int _invIndex;
-	int _holdings;
+	int _holdings;		// Used to hold number of visible items in active inventory.
+						// Since Inventory array also contains some special hidden items
 	void freeGraphics();
 	int _oldFlag;
 	int _invFlag;
-- 
cgit v1.2.3


From 902b79116552b0605668f130e0695e4798ef87d5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 9 May 2015 18:04:13 +0200
Subject: SHERLOCK: Make copyright headers consistent

---
 engines/sherlock/animation.cpp       | 4 ++--
 engines/sherlock/animation.h         | 4 ++--
 engines/sherlock/debugger.cpp        | 6 +++---
 engines/sherlock/debugger.h          | 6 +++---
 engines/sherlock/decompress.cpp      | 4 ++--
 engines/sherlock/decompress.h        | 4 ++--
 engines/sherlock/detection.cpp       | 4 ++--
 engines/sherlock/detection_tables.h  | 4 ++--
 engines/sherlock/events.cpp          | 4 ++--
 engines/sherlock/events.h            | 4 ++--
 engines/sherlock/graphics.cpp        | 4 ++--
 engines/sherlock/graphics.h          | 4 ++--
 engines/sherlock/inventory.cpp       | 4 ++--
 engines/sherlock/inventory.h         | 4 ++--
 engines/sherlock/journal.cpp         | 4 ++--
 engines/sherlock/journal.h           | 4 ++--
 engines/sherlock/map.cpp             | 4 ++--
 engines/sherlock/map.h               | 4 ++--
 engines/sherlock/objects.cpp         | 4 ++--
 engines/sherlock/objects.h           | 4 ++--
 engines/sherlock/people.cpp          | 4 ++--
 engines/sherlock/people.h            | 4 ++--
 engines/sherlock/resources.cpp       | 4 ++--
 engines/sherlock/resources.h         | 4 ++--
 engines/sherlock/saveload.cpp        | 4 ++--
 engines/sherlock/saveload.h          | 4 ++--
 engines/sherlock/scalpel/darts.cpp   | 4 ++--
 engines/sherlock/scalpel/darts.h     | 4 ++--
 engines/sherlock/scalpel/scalpel.cpp | 4 ++--
 engines/sherlock/scalpel/scalpel.h   | 4 ++--
 engines/sherlock/scene.cpp           | 4 ++--
 engines/sherlock/scene.h             | 4 ++--
 engines/sherlock/screen.cpp          | 4 ++--
 engines/sherlock/screen.h            | 4 ++--
 engines/sherlock/settings.cpp        | 4 ++--
 engines/sherlock/settings.h          | 4 ++--
 engines/sherlock/sherlock.cpp        | 4 ++--
 engines/sherlock/sherlock.h          | 4 ++--
 engines/sherlock/sound.cpp           | 4 ++--
 engines/sherlock/sound.h             | 4 ++--
 engines/sherlock/talk.cpp            | 4 ++--
 engines/sherlock/talk.h              | 4 ++--
 engines/sherlock/tattoo/tattoo.cpp   | 4 ++--
 engines/sherlock/tattoo/tattoo.h     | 4 ++--
 engines/sherlock/user_interface.cpp  | 4 ++--
 engines/sherlock/user_interface.h    | 4 ++--
 46 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 299a8186d7..dac903a358 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index 3d87cb0a91..245d83789f 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
index ff9a8056b0..ecd3f2ee08 100644
--- a/engines/sherlock/debugger.cpp
+++ b/engines/sherlock/debugger.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/debugger.h b/engines/sherlock/debugger.h
index fe77007975..6021bb7d0d 100644
--- a/engines/sherlock/debugger.h
+++ b/engines/sherlock/debugger.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index 7c98b50543..fff9616c60 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/decompress.h b/engines/sherlock/decompress.h
index 330e018115..694f56aa65 100644
--- a/engines/sherlock/decompress.h
+++ b/engines/sherlock/decompress.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index a6b980fea3..c38580af41 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index b369868741..2f94f78f8a 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 886306fc0e..3b0b0dacc6 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 015c39580d..199e14f03a 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
index bdb4df6c83..234928156a 100644
--- a/engines/sherlock/graphics.cpp
+++ b/engines/sherlock/graphics.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 8ed508fad0..91a65c8c43 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index c3e2e14393..af2c4be0e4 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index bec26b333d..f4cea7729a 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 926ccee38a..2ce5f9968a 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 2ef0f94492..0ea5218558 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 3879e904fa..5ef6b9220f 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index b4e92c600f..4432ec8553 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 35b270dd13..ca8ba1759a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index f6ad6beb0d..52bd15cbbc 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index f73ebd8cb0..8bf3c1e4c3 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 02bb8dc950..ee16fab243 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index c64f4e4923..dd906ba132 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index d53351e085..e1f97f1def 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 61fe9f30bf..a78b89b00c 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index 0865fd3856..c9a7286c6b 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 3516a7ae78..6da8d6848e 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
index 50be572067..a9624442e2 100644
--- a/engines/sherlock/scalpel/darts.h
+++ b/engines/sherlock/scalpel/darts.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 4cd613d48f..6f7310f573 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 2ba47a49e1..40e4937b5d 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 88f8674913..0893afe4c4 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index c2cca8bad2..8ef5d74785 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index e22c4daad7..2713d192e7 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 7e33a12b7b..501506f8ec 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index 2a4d332edf..ffa1f056de 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/settings.h b/engines/sherlock/settings.h
index 90928452c4..25d27d48df 100644
--- a/engines/sherlock/settings.h
+++ b/engines/sherlock/settings.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 1a6e84b186..6bfc7ea7d4 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index a516e52ae7..8d02f7aa24 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 1ee9535f31..24147a0ab9 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 5c2e8808ee..56cd4ed0a8 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 74bd98c4e1..a1e124aa95 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index b44bccaab6..16cab493f0 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index b2b45bc310..d4059ac413 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index 6d3ec33967..b98395597c 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ce282aa2c2..ec92848c26 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index a0b854af36..79382a19fe 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From 1a485a44b8c265cb4e37e235659e1a4e7609d446 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 12:08:45 -0400
Subject: SHERLOCK: Cleanup and fixes for Journal

---
 engines/sherlock/journal.cpp        | 45 ++++++++++++++++++-------------------
 engines/sherlock/journal.h          |  2 +-
 engines/sherlock/user_interface.cpp |  1 +
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 2ce5f9968a..f7a11f0198 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -75,7 +75,7 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) {
 	_index = _journal.size() - 1;
 
 	// Load the text for the new entry to get the number of lines it will have
-	int newLines = loadJournalFile(true);
+	loadJournalFile(true);
 
 	// Restore old state
 	_index = saveIndex;
@@ -83,8 +83,8 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) {
 
 	// If new lines were added to the ournal, update the total number of lines
 	// the journal continues
-	if (newLines) {
-		_maxPage += newLines;
+	if (!_lines.empty()) {
+		_maxPage += _lines.size();
 	} else {
 		// No lines in entry, so remove the new entry from the journal
 		_journal.remove_at(_journal.size() - 1);
@@ -135,8 +135,10 @@ void Journal::loadJournalLocations() {
 /**
  * Loads the description for the current display index in the journal, and then
  * word wraps the result to prepare it for being displayed
+ * @param alreadyLoaded		Indicates whether the journal file is being loaded for the
+ *		first time, or being reloaded
  */
-int Journal::loadJournalFile(bool alreadyLoaded) {
+void Journal::loadJournalFile(bool alreadyLoaded) {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	JournalEntry &journalEntry = _journal[_index];
@@ -448,8 +450,6 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
 	} else {
 		_lines.clear();
 	}
-
-	return _lines.size();
 }
 
 /**
@@ -562,7 +562,6 @@ bool Journal::doJournal(int direction, int howFar) {
 	bool searchSuccessful = false;
 	bool endFlag = false;
 	int lineNum = 0;
-	int maxLines;
 	int savedIndex;
 	int temp;
 	const char *matchP;
@@ -573,18 +572,18 @@ bool Journal::doJournal(int direction, int howFar) {
 
 	do {
 		// Get the number of lines for the current journal entry
-		maxLines = loadJournalFile(false);
-		if (!maxLines) {
+		loadJournalFile(false);
+		if (_lines.empty()) {
 			// Entry has no text, so it must be a stealth eny. Move onto further journal entries
 			// until an entry with text is found
 			if (++_index == (int)_journal.size()) {
 				endJournal = true;
 			} else {
 				_sub = 0;
-				maxLines = loadJournalFile(false);
+				loadJournalFile(false);
 			}
 		}
-	} while (!endJournal && !maxLines);
+	} while (!endJournal && _lines.empty());
 
 	// Check if there no further pages with text until the end of the journal
 	if (endJournal) {
@@ -621,14 +620,14 @@ bool Journal::doJournal(int direction, int howFar) {
 						endJournal = true;
 					}
 					else {
-						maxLines = loadJournalFile(false);
-						_sub = maxLines - 1;
+						loadJournalFile(false);
+						_sub = _lines.size() - 1;
 					}
-				} while (!endJournal && !maxLines);
+				} while (!endJournal && _lines.empty());
 			}
 
 			// If it's search mode, check each line for the given keyword
-			if (direction >= 3 && maxLines && !endJournal && !searchSuccessful) {
+			if (direction >= 3 && !_lines.empty() && !endJournal && !searchSuccessful) {
 				Common::String line = _lines[_sub];
 				line.toUppercase();
 				if (strstr(line.c_str(), _find.c_str()) != nullptr) {
@@ -675,19 +674,19 @@ bool Journal::doJournal(int direction, int howFar) {
 
 				// Move forwards a line at a time, unless search word was found
 				if (!searchSuccessful) {
-					if (++_sub == maxLines) {
+					if (++_sub == (int)_lines.size()) {
 						// Reached end of page
 						do {
 							if (++_index == (int)_journal.size()) {
 								_index = savedIndex;
 								_sub = savedSub;
-								maxLines = loadJournalFile(false);
+								loadJournalFile(false);
 								endJournal = true;
 							} else {
 								_sub = 0;
-								maxLines = loadJournalFile(false);
+								loadJournalFile(false);
 							}
-						} while (!endJournal && !maxLines);
+						} while (!endJournal && _lines.empty());
 					}
 
 					++lineNum;
@@ -702,7 +701,7 @@ bool Journal::doJournal(int direction, int howFar) {
 				// Search found, so show top of the page it was found on
 				_index = savedIndex;
 				_sub = savedSub;
-				maxLines = loadJournalFile(false);
+				loadJournalFile(false);
 			}
 		}
 		break;
@@ -769,19 +768,19 @@ bool Journal::doJournal(int direction, int howFar) {
 			}
 		}
 
-		if (++temp == maxLines) {
+		if (++temp == (int)_lines.size()) {
 			// Move to next page
 			do {
 				if (_index < ((int)_journal.size() - 1) && lineNum < (LINES_PER_PAGE - 1)) {
 					++_index;
-					maxLines = loadJournalFile(false);
+					loadJournalFile(false);
 					temp = 0;
 				} else {
 					if (_index == ((int)_journal.size() - 1))
 						_down = false;
 					endFlag = true;
 				}
-			} while (!endFlag && !maxLines);
+			} while (!endFlag && _lines.empty());
 		}
 
 		if (inc) {
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 0ea5218558..c4112e5617 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -60,7 +60,7 @@ private:
 
 	void loadJournalLocations();
 
-	int loadJournalFile(bool alreadyLoaded);
+	void loadJournalFile(bool alreadyLoaded);
 
 	void doArrows();
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ec92848c26..674141f171 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1825,6 +1825,7 @@ void UserInterface::journalControl() {
 	_windowOpen = false;
 	_windowBounds.top = CONTROLS_Y1;
 	_key = -1;
+	_menuMode = STD_MODE;
 
 	// Reset the palette
 	screen.setPalette(screen._cMap);
-- 
cgit v1.2.3


From 825677415319486ed35c8591c106f66ad53b710f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 12:19:05 -0400
Subject: SHERLOCK: Method renames in Journal for better clarity

---
 engines/sherlock/journal.cpp | 44 ++++++++++++++++++++++----------------------
 engines/sherlock/journal.h   |  4 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index f7a11f0198..984a7a23f6 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -453,9 +453,9 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 }
 
 /**
- * Draw the journal frame
+ * Draw the journal background, frame, and interface buttons
  */
-void Journal::drawJournal() {
+void Journal::drawJournalFrame() {
 	Resources &res = *_vm->_res;
 	Screen &screen = *_vm->_screen;
 	byte palette[PALETTE_SIZE];
@@ -511,12 +511,12 @@ void Journal::drawJournal() {
 void Journal::drawInterface() {
 	Screen &screen = *_vm->_screen;
 
-	drawJournal();
+	drawJournalFrame();
 
 	if (_journal.size() == 0) {
 		_up = _down = 0;
 	} else {
-		doJournal(0, 0);
+		drawJournal(0, 0);
 	}
 
 	doArrows();
@@ -552,7 +552,7 @@ void Journal::doArrows() {
 /**
  * Displays a page of the journal at the current index
  */
-bool Journal::doJournal(int direction, int howFar) {
+bool Journal::drawJournal(int direction, int howFar) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	int yp = 37;
@@ -589,7 +589,7 @@ bool Journal::doJournal(int direction, int howFar) {
 	if (endJournal) {
 		// If moving forward or backwards, clear the page before printing
 		if (direction)
-			drawJournal();
+			drawJournalFrame();
 
 		screen.gPrint(Common::Point(235, 21), PEN_COLOR, "Page %d", _page);
 		return false;
@@ -712,7 +712,7 @@ bool Journal::doJournal(int direction, int howFar) {
 
 	if (direction) {
 		events.setCursor(ARROW);
-		drawJournal();
+		drawJournalFrame();
 	}
 
 	screen.gPrint(Common::Point(235, 21), PEN_COLOR, "Page %d", _page);
@@ -915,9 +915,9 @@ bool Journal::handleEvents(int key) {
 	if (((found == BTN_BACK10 && events._released) || key == 'B') && (_page > 1)) {
 		// Scrolll up 10 pages
 		if (_page < 11)
-			doJournal(1, (_page - 1) * LINES_PER_PAGE);
+			drawJournal(1, (_page - 1) * LINES_PER_PAGE);
 		else
-			doJournal(1, 10 * LINES_PER_PAGE);
+			drawJournal(1, 10 * LINES_PER_PAGE);
 
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
@@ -925,14 +925,14 @@ bool Journal::handleEvents(int key) {
 
 	if (((found == BTN_UP && events._released) || key =='U') && _up) {
 		// Scroll up
-		doJournal(1, LINES_PER_PAGE);
+		drawJournal(1, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
 
 	if (((found == BTN_DOWN && events._released) || key =='D') && _down) {
 		// Scroll down
-		doJournal(2, LINES_PER_PAGE);
+		drawJournal(2, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
@@ -940,9 +940,9 @@ bool Journal::handleEvents(int key) {
 	if (((found == BTN_AHEAD110 && events._released) || key == 'A') && _down) {
 		// Scroll down 10 pages
 		if ((_page + 10) > _maxPage)
-			doJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
+			drawJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
 		else
-			doJournal(2, 10 * LINES_PER_PAGE);
+			drawJournal(2, 10 * LINES_PER_PAGE);
 
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
@@ -960,13 +960,13 @@ bool Journal::handleEvents(int key) {
 				int savedSub = _sub;
 				int savedPage = _page;
 
-				if (doJournal(dir + 2, 1000 * LINES_PER_PAGE) == 0) {
+				if (drawJournal(dir + 2, 1000 * LINES_PER_PAGE) == 0) {
 					_index = savedIndex;
 					_sub = savedSub;
 					_page = savedPage;
 
-					drawJournal();
-					doJournal(0, 0);
+					drawJournalFrame();
+					drawJournal(0, 0);
 					notFound = true;
 				} else {
 					doneFlag = true;
@@ -987,8 +987,8 @@ bool Journal::handleEvents(int key) {
 		_up = _down = false;
 		_page = 1;
 
-		drawJournal();
-		doJournal(0, 0);
+		drawJournalFrame();
+		drawJournal(0, 0);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
@@ -996,9 +996,9 @@ bool Journal::handleEvents(int key) {
 	if (((found == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
 		// Last page
 		if ((_page + 10) > _maxPage)
-			doJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
+			drawJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
 		else
-			doJournal(2, 1000 * LINES_PER_PAGE);
+			drawJournal(2, 1000 * LINES_PER_PAGE);
 
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
@@ -1170,8 +1170,8 @@ int Journal::getFindName(bool printError) {
 	}
 
 	// Redisplay the journal screen
-	drawJournal();
-	doJournal(0, 0);
+	drawJournalFrame();
+	drawJournal(0, 0);
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 
 	return done;
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index c4112e5617..ac4391b8f3 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -64,11 +64,11 @@ private:
 
 	void doArrows();
 
-	bool doJournal(int direction, int howFar);
+	bool drawJournal(int direction, int howFar);
 
 	int getFindName(bool printError);
 
-	void drawJournal();
+	void drawJournalFrame();
 public:
 	Journal(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 0629ae4639651f546d6aeb56bac842fd07939b8f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 12:26:47 -0400
Subject: SHERLOCK: Fix display of Forward text in Journal

---
 engines/sherlock/journal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 984a7a23f6..71de9228e4 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1115,7 +1115,7 @@ int Journal::getFindName(bool printError) {
 				} else {
 					color = COMMAND_FOREGROUND;
 				}
-				screen.print(Common::Point(SEARCH_POINTS[1][2] - screen.stringWidth("Forward") / 2, 175), color, "Forward");
+				screen.print(Common::Point(SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, 175), color, "Forward");
 			}
 
 			events.wait(2);
-- 
cgit v1.2.3


From 66a1138d742bc96eb5abb81dea7aab39d89a8a04 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 12:34:08 -0400
Subject: SHERLOCK: Disable Journal Print Text button, since it isn't supported

---
 engines/sherlock/journal.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 71de9228e4..a9252d111a 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -500,9 +500,13 @@ void Journal::drawJournalFrame() {
 	screen.makeButton(Common::Rect(JOURNAL_POINTS[7][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[7][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[7][2] - screen.stringWidth("Last Page") / 2, "Last Page");
+
+	// WORKAROUND: Draw Print Text button as disabled, since we don't support it in ScummVM
 	screen.makeButton(Common::Rect(JOURNAL_POINTS[8][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[8][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[8][2] - screen.stringWidth("Print Text") / 2, "Print Text");
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), 
+		COMMAND_NULL, false, "Print Text");
 }
 
 /**
@@ -543,7 +547,7 @@ void Journal::doArrows() {
 
 	color = _journal.size() > 0 ? COMMAND_FOREGROUND : COMMAND_NULL;
 	screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), color, false, "Search");
-	screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), color, false, "Print Text");
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), COMMAND_NULL, false, "Print Text");
 
 	color = _page > 1 ? COMMAND_FOREGROUND : COMMAND_NULL;
 	screen.buttonPrint(Common::Point(JOURNAL_POINTS[6][2], JOURNAL_BUTTONS_Y + 11), color, false, "First Page");
@@ -899,13 +903,8 @@ bool Journal::handleEvents(int key) {
 		if (pt.x > JOURNAL_POINTS[8][0] && pt.x < JOURNAL_POINTS[8][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
 				pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty()) {
 			found = BTN_PRINT_TEXT;
-			color = COMMAND_HIGHLIGHTED;
-		} else if (_journal.empty()) {
-			color = COMMAND_NULL;
-		} else {
-			color = COMMAND_FOREGROUND;
 		}
-		screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), color, true, "Print Text");
+		screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), COMMAND_NULL, true, "Print Text");
 	}
 
 	if (found == BTN_EXIT && events._released)
-- 
cgit v1.2.3


From eeb53ca614823896ef6c43f9f9d7580cbb6e0d78 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 12:58:44 -0400
Subject: SHERLOCK: Remove duplicated _converseNum field from Journal

---
 engines/sherlock/journal.cpp | 10 +++++-----
 engines/sherlock/journal.h   |  1 -
 engines/sherlock/talk.h      |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index a9252d111a..2a7aeb4f2d 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -56,7 +56,6 @@ Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	_sub = 0;
 	_up = _down = false;
 	_page = 1;
-	_converseNum = -1;
 
 	// Load the journal directory and location names
 	loadJournalLocations();
@@ -151,11 +150,11 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 	// If not flagged as alrady loaded, load the conversation into script variables
 	if (!alreadyLoaded) {
 		// See if the file to be used is already loaded
-		if (journalEntry._converseNum != _converseNum) {
+		if (journalEntry._converseNum != talk._converseNum) {
 			// Nope. Free any previously loaded talk
 			talk.freeTalkVars();
 
-			// Find the person being talked to
+			// Find the person being referred to
 			talk._talkTo = -1;
 			for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
 				Common::String portrait = PORTRAITS[idx];
@@ -167,7 +166,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 				}
 			}
 
-			// Load the talk file
+			// Load their talk file
 			talk.loadTalkFile(dirFilename);
 		}
 	}
@@ -559,6 +558,7 @@ void Journal::doArrows() {
 bool Journal::drawJournal(int direction, int howFar) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
 	int yp = 37;
 	int startPage = _page;
 	bool endJournal = false;
@@ -571,7 +571,7 @@ bool Journal::drawJournal(int direction, int howFar) {
 	const char *matchP;
 	int width;
 
-	_converseNum = -1;
+	talk._converseNum = -1;
 	_down = true;
 
 	do {
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index ac4391b8f3..be5c4d77c3 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -55,7 +55,6 @@ private:
 	int _sub;
 	bool _up, _down;
 	int _page;
-	int _converseNum;
 	Common::String _find;
 
 	void loadJournalLocations();
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 16cab493f0..d81586228f 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -137,7 +137,6 @@ private:
 	int _speaker;
 	int _talkIndex;
 	int _scriptSelect;
-	int _converseNum;
 	int _talkStealth;
 	int _talkToFlag;
 	int _scriptSaveIndex;
@@ -160,6 +159,7 @@ public:
 	int _scriptMoreFlag;
 	Common::String _scriptName;
 	bool _moreTalkUp, _moreTalkDown;
+	int _converseNum;
 public:
 	Talk(SherlockEngine *vm);
 	void setSequences(const byte *talkSequences, const byte *stillSequences,
-- 
cgit v1.2.3


From 3e2b0bfb69027eaa3c4d47ac06dba3310b671c08 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 12:59:51 -0400
Subject: SHERLOCK: Remove unused getGameType method declaration

---
 engines/sherlock/sherlock.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 8d02f7aa24..5a3ed4bc1f 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -120,7 +120,6 @@ public:
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
 	virtual void syncSoundSettings();
 
-	int getGameType() const;
 	GameType getGameID() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
-- 
cgit v1.2.3


From d50fb7cb602e826cddf9ceb76608cba1a54d943b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 13:03:28 -0400
Subject: SHERLOCK: Updated module.mk to match that of other engines

---
 engines/sherlock/module.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 9334ebfd9c..babd0c49a0 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -26,7 +26,7 @@ MODULE_OBJS = \
 	user_interface.o
 
 # This module can be built as a plugin
-ifdef BUILD_PLUGINS
+ifeq ($(ENABLE_SHERLOCK), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
-- 
cgit v1.2.3


From 1ba94c93e98533f3bfc2970d6ae40356515b99b9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 13:07:14 -0400
Subject: SHERLOCK: Remove redundant shouldQuit call in loop

---
 engines/sherlock/people.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 8bf3c1e4c3..0eda40c03f 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -306,7 +306,7 @@ void People::setWalking() {
 	// If the player is already close to the given destination that no
 	// walking is needed, move to the next straight line segment in the
 	// overall walking route, if there is one
-	do {
+	for (;;) {
 		// Since we want the player to be centered on the destination they
 		// clicked, but characters draw positions start at their left, move
 		// the destination half the character width to draw him centered
@@ -326,7 +326,7 @@ void People::setWalking() {
 
 		// Pop next walk segment off the walk route stack
 		_walkDest = _walkTo.pop();
-	} while (!_vm->shouldQuit());
+	}
 
 	// If a sufficient move is being done, then start the move
 	if (delta.x > 3 || delta.y) {
-- 
cgit v1.2.3


From 6925b848d6bb8f93c6be3cc1d32780e729c6d242 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 15:48:19 -0400
Subject: SHERLOCK: Fix getting fresh mouse positions in loop showing quit
 dialog

---
 engines/sherlock/user_interface.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 674141f171..8b3ee426a4 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -936,6 +936,8 @@ void UserInterface::doEnvControl() {
 
 				events.pollEventsAndWait();
 				events.setButtonState();
+				mousePos = events.mousePos();
+
 				if (events.kbHit()) {
 					Common::KeyState keyState = events.getKey();
 					_key = toupper(keyState.keycode);
-- 
cgit v1.2.3


From 1ddbe9d720d96baf3f95373d264ff1218b34411f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 May 2015 21:31:12 +0200
Subject: SHERLOCK: Add some detection entries

---
 engines/sherlock/detection_tables.h | 47 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 2f94f78f8a..752ef8d5cf 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -24,7 +24,7 @@ namespace Sherlock {
 
 static const SherlockGameDescription gameDescriptions[] = {
 	{
-		// Case of the Serrated Scalpel - English
+		// Case of the Serrated Scalpel - English 3.5" Floppy
 		{
 			"scalpel",
 			0,
@@ -37,6 +37,51 @@ static const SherlockGameDescription gameDescriptions[] = {
 		GType_SerratedScalpel,
 	},
 
+	{
+		// Case of the Serrated Scalpel - Interactive English Demo
+		// Provided by Strangerke
+		{
+			"scalpel",
+			"Interactive Demo",
+			AD_ENTRY1s("talk.lib", "dbdc8a20c96900aa7e4d02f3fe8a274c", 121102),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOSPEECH)
+		},
+		GType_SerratedScalpel,
+	},
+
+	{
+		// Case of the Serrated Scalpel - Non-Interactive English Demo
+		// Provided by Strangerke
+		{
+			"scalpel",
+			"Non Interactive Demo",
+			AD_ENTRY1s("music.lib", "ec19a09b7fef6fd90b1ab812ce6e9739", 38563),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOSPEECH)
+		},
+		GType_SerratedScalpel,
+	},
+
+	{
+		// Case of the Rose Tattoo - French CD
+		// Provided by Strangerke
+		{
+			"rosetattoo",
+			0,
+			AD_ENTRY1s("talk.lib", "22e8e6406dd2fbbb238c9898928df42e", 770756),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+		GType_RoseTattoo,
+	},
+
 	{ AD_TABLE_END_MARKER, (GameType)0 }
 };
 
-- 
cgit v1.2.3


From 281d44706bfa2cb58b3de469d320f06f75a93c86 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 15:53:18 -0400
Subject: SHERLOCK: Refine comment for decompressLZ

---
 engines/sherlock/decompress.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index fff9616c60..dfa573209f 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -27,8 +27,8 @@ namespace Sherlock {
 /**
  * Decompresses an LZW compressed resource. If no outSize is specified, it will
  * decompress the entire resource. If, however, an explicit size is specified,
- * it will decompress only up to that many bytes from the stream starting at
- * whatever position it was previously.
+ * then it means we're already within a resource, and only want to decompress
+ * part of it.
  */
 Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int32 outSize) {
 	if (outSize == -1) {
-- 
cgit v1.2.3


From 7107789c473a96678f408902b1a3b6eb2c86f69f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 15:59:31 -0400
Subject: SHERLOCK: Further cleanup of detection entries and added Rose Tattoo
 English

---
 engines/sherlock/detection_tables.h | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 752ef8d5cf..0b41bfad0e 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -31,7 +31,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("talk.lib", "ad0c4d6865edf15da4e9204c08815875", 238928),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			ADGF_UNSTABLE | ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_SerratedScalpel,
@@ -46,7 +46,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("talk.lib", "dbdc8a20c96900aa7e4d02f3fe8a274c", 121102),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_DEMO,
+			ADGF_UNSTABLE | ADGF_DEMO,
 			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_SerratedScalpel,
@@ -61,7 +61,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("music.lib", "ec19a09b7fef6fd90b1ab812ce6e9739", 38563),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_DEMO,
+			ADGF_UNSTABLE | ADGF_DEMO,
 			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_SerratedScalpel,
@@ -72,12 +72,25 @@ static const SherlockGameDescription gameDescriptions[] = {
 		// Provided by Strangerke
 		{
 			"rosetattoo",
-			0,
+			"CD",
 			AD_ENTRY1s("talk.lib", "22e8e6406dd2fbbb238c9898928df42e", 770756),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			ADGF_UNSTABLE,
+			GUIO0()
+		}
+	},
+
+	{
+		// Case of the Rose Tattoo - English CD
+		{
+			"rosetattoo",
+			"CD",
+			AD_ENTRY1s("talk.lib", "9639a756b0993ebd71cb5f4d8b78b2dc", 765134),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_UNSTABLE,
+			GUIO0()
 		},
 		GType_RoseTattoo,
 	},
-- 
cgit v1.2.3


From 3b76b8634a8272caf6a188527d88a5c5eb9ae5d1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 16:46:39 -0400
Subject: SHERLOCK: Fix incorrect comment

---
 engines/sherlock/scalpel/scalpel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 6f7310f573..0b7a9be278 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -505,7 +505,7 @@ void ScalpelEngine::showLBV(const Common::String &filename) {
  */
 void ScalpelEngine::startScene() {
 	if (_scene->_goToScene == 100 || _scene->_goToScene == 98) {
-		// Chessboard selection
+		// Show the map
 		if (_sound->_musicOn) {
 			if (_sound->loadSong(100)) {
 				if (_sound->_music)
-- 
cgit v1.2.3


From 13c6feae3538aab7f5bffe2253d34ca256ac8314 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 May 2015 00:07:41 +0200
Subject: SHERLOCK: Add comment about HitSquad CD in the detection

---
 engines/sherlock/detection_tables.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 0b41bfad0e..260869660e 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -25,6 +25,7 @@ namespace Sherlock {
 static const SherlockGameDescription gameDescriptions[] = {
 	{
 		// Case of the Serrated Scalpel - English 3.5" Floppy
+		// The HitSquad CD version has the same MD5
 		{
 			"scalpel",
 			0,
-- 
cgit v1.2.3


From 6d110485bc2573db524ceb5aff9f4816d00460b2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 May 2015 18:19:28 -0400
Subject: SHERLOCK: Performance tweak for resource loading

---
 engines/sherlock/map.cpp       | 3 ++-
 engines/sherlock/resources.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 5ef6b9220f..ef262aabd3 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -96,7 +96,8 @@ void Map::loadData() {
 	// Load the list of location names
 	Common::SeekableReadStream *txtStream = _vm->_res->load("chess.txt");
 
-	while (txtStream->pos() < txtStream->size()) {
+	int streamSize = txtStream->size();
+	while (txtStream->pos() < streamSize) {
 		Common::String line;
 		char c;
 		while ((c = txtStream->readByte()) != '\0')
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index dd906ba132..3f74590386 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -293,7 +293,8 @@ ImageFile::~ImageFile() {
 void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool animImages) {
 	loadPalette(stream);
 
-    while (stream.pos() < stream.size()) {
+	int streamSize = stream.size();
+    while (stream.pos() < streamSize) {
 		ImageFrame frame;
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
-- 
cgit v1.2.3


From aee23fd7046622e18456d5e777bdf1c33b0f9b7d Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 10 May 2015 15:28:18 +0100
Subject: SCUMM: Add detection for Full Throttle French Mac

Also add file size for Sam & Max and DOTT French Mac versions.
---
 devtools/scumm-md5.txt    | 5 +++--
 engines/scumm/scumm-md5.h | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index e56f1a6a99..305c1724ed 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -314,7 +314,7 @@ tentacle	Day of the Tentacle
 	4fbbe9f64b8bc547503a379a301183ce	-1	it	All?	-	CD	-	Andrea Petrucci
 	883af4b0af4f77a92f1dcf1d0a283140	-1	es	All?	-	CD	-	Andrea Petrucci
 	cc04a076779379524ed4d9c5ee3c6fb1	282467632	en	Mac	-	CD	Mac bundle	Fingolfin, Joachim Eberhard
-	ede149fda3edfc1dbd7347e0737cb583	-1	fr	Mac	-	CD	Mac bundle	ThierryFR
+	ede149fda3edfc1dbd7347e0737cb583	282830409	fr	Mac	-	CD	Mac bundle	ThierryFR, Thierry Crozat
 	f73883f13b5a302749a5bad31d909780	-1	de	Mac	-	CD	Mac bundle	morrissey
 
 	c83079157ec765a28de445aec9768d60	7477	en	All	-	Demo	-	Fingolfin
@@ -337,7 +337,7 @@ samnmax	Sam &amp; Max Hit the Road
 	4ba7fb331296c283e73d8f5b2096e551	-1	es	All?	-	CD	-	Andrea Petrucci
 	d43352a805d78b5f4936c6d7779bf575	-1	ru	DOS	-	CD	-	
 	166553538ff320c69edafeee29525419	199195304	en	Mac	-	CD	Mac bundle	Joachim Eberhard
-	3a5d13675e9a23aedac0bac7730f0ac1	-1	fr	Mac	-	CD	Mac bundle	ThierryFR
+	3a5d13675e9a23aedac0bac7730f0ac1	228446581	fr	Mac	-	CD	Mac bundle	ThierryFR, Thierry Crozat
 
 	c3196c5349e53e387aaff1533d95e53a	-1	en	DOS	Floppy	Demo	-	
 	0e4c5d54a0ad4b26132e78b5ea76642a	6485	en	DOS	Floppy	Demo	WIP	Fingolfin
@@ -358,6 +358,7 @@ ft	Full Throttle
 	e72bb4c2b613db2cf50f89ff6350e70a	-1	es	All?	-	-	-	
 	fe381e45117878b1e942cb876b050fd6	513243679	en	Mac	-	-	Mac bundle	Fingolfin
 	04401d747f1a2c1c4b388daff71ed378	535405461	de	Mac	-	-	Mac bundle	Fingolfin
+	403d2ec4d60d3cdae925e6cbf67716d6	489436643	fr	Mac	-	-	Mac bundle	Thierry Crozat
 
 	32a433dea56b86a55b59e4ff7d755711	-1	en	DOS	Demo	Demo	-	
 	9d7b67be003fea60be4dcbd193611936	11164	en	Mac	Demo	Demo	-	Fingolfin
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index bac7a4665b..1cbefee105 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu May  7 20:24:51 2015
+  This file was generated by the md5table tool on Sun May 10 14:23:43 2015
   DO NOT EDIT MANUALLY!
  */
 
@@ -180,7 +180,7 @@ static const MD5Table md5table[] = {
 	{ "3a03dab514e4038df192d8a8de469788", "atlantis", "Floppy", "Floppy", -1, Common::EN_ANY, Common::kPlatformAmiga },
 	{ "3a0c35f3c147b98a2bdf8d400cfc4ab5", "indy3", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
 	{ "3a3e592b074f595489f7f11e150c398d", "puttzoo", "HE 99", "Updated", -1, Common::EN_USA, Common::kPlatformWindows },
-	{ "3a5d13675e9a23aedac0bac7730f0ac1", "samnmax", "", "CD", -1, Common::FR_FRA, Common::kPlatformMacintosh },
+	{ "3a5d13675e9a23aedac0bac7730f0ac1", "samnmax", "", "CD", 228446581, Common::FR_FRA, Common::kPlatformMacintosh },
 	{ "3a5ec90d556d4920976c5578bfbfaf79", "maniac", "NES", "", -1, Common::DE_DEU, Common::kPlatformNES },
 	{ "3ae7f002d9256b8bdf76aaf8a3a069f8", "freddi", "HE 100", "", 34837, Common::EN_GRB, Common::kPlatformWii },
 	{ "3af61c5edf8e15b43dbafd285b2e9777", "puttcircus", "", "Demo", -1, Common::HE_ISR, Common::kPlatformWindows },
@@ -193,6 +193,7 @@ static const MD5Table md5table[] = {
 	{ "3df6ead57930488bc61e6e41901d0e97", "fbear", "HE 62", "", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "3e48298920fab9b7aec5a971e1bd1fab", "pajama3", "", "Demo", -1, Common::EN_GRB, Common::kPlatformWindows },
 	{ "3e861421f494711bc6f619d4aba60285", "airport", "", "", 93231, Common::RU_RUS, Common::kPlatformWindows },
+	{ "403d2ec4d60d3cdae925e6cbf67716d6", "ft", "", "", 489436643, Common::FR_FRA, Common::kPlatformMacintosh },
 	{ "40564ec47da48a67787d1f9bd043902a", "maniac", "V2 Demo", "V2 Demo", 1988, Common::EN_ANY, Common::kPlatformDOS },
 	{ "4167a92a1d46baa4f4127d918d561f88", "tentacle", "", "CD", 7932, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "41958e24d03181ff9a381a66d048a581", "ft", "", "", -1, Common::PT_BRA, Common::kPlatformUnknown },
@@ -643,7 +644,7 @@ static const MD5Table md5table[] = {
 	{ "ecc4340c2b801f5af8da4e00c0e432d9", "puttcircus", "", "", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "ed2b074bc3166087a747acb2a3c6abb0", "freddi3", "HE 98.5", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "ed361270102e355afe5236954216aba2", "lost", "", "", -1, Common::EN_USA, Common::kPlatformUnknown },
-	{ "ede149fda3edfc1dbd7347e0737cb583", "tentacle", "", "CD", -1, Common::FR_FRA, Common::kPlatformMacintosh },
+	{ "ede149fda3edfc1dbd7347e0737cb583", "tentacle", "", "CD", 282830409, Common::FR_FRA, Common::kPlatformMacintosh },
 	{ "edfdb24a499d92c59f824c52987c0eec", "atlantis", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformDOS },
 	{ "ee41f6afbc5b26fa475754b56fe92048", "puttputt", "HE 61", "", 8032, Common::JA_JPN, Common::kPlatform3DO },
 	{ "ee785fe2569bc9965526e774f7ab86f1", "spyfox", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformMacintosh },
-- 
cgit v1.2.3


From 8e4c672d3816a4b41af7e2fe0c3c593ee252b330 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 4 May 2015 16:27:28 +0100
Subject: AGI: Use correct volume for PCjr output

This looks like a regression from commit 24bb5da: AGI: Add a layer of
abstraction between the sound chip and the two players
---
 engines/agi/sound_pcjr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 51b2d067a4..3654b97e78 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -411,7 +411,7 @@ int SoundGenPCJr::chanGen(int chan, int16 *stream, int len) {
 		if (tpcm->noteCount <= 0) {
 			// get new tone data
 			if ((tpcm->avail) && (getNextNote(chan) == 0)) {
-				tpcm->atten = _channel[chan].attenuation;
+				tpcm->atten = volumeCalc(&_channel[chan]);
 				tpcm->freqCount = _channel[chan].freqCount;
 				tpcm->genType = _channel[chan].genType;
 
-- 
cgit v1.2.3


From 65ed7e775e51f864897ccdd578b54423ab79aa6e Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 4 May 2015 17:30:07 +0100
Subject: AGI: Fix bug with music/SFX volume in PCjr

A higher volume in the GUI resulted in a lower music volume (and
lower volume in the GUI resulted in higher music volume).
---
 engines/agi/sound_pcjr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 3654b97e78..0dce276e33 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -207,7 +207,7 @@ int SoundGenPCJr::volumeCalc(SndGenChan *chan) {
 				chan->attenuationCopy = attenuation;
 
 				attenuation &= 0x0F;
-				attenuation += _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) / 17;
+				attenuation += (16 - _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) / 17);
 				if (attenuation > 0x0F)
 					attenuation = 0x0F;
 			}
-- 
cgit v1.2.3


From 830f8c42f51016ca7056b391478359453473042c Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 5 May 2015 20:03:38 +0100
Subject: AGI: Fix PCjr dissolve method used for early versions

This was a regression from ceb2909.
---
 engines/agi/sound_pcjr.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 0dce276e33..83adcac747 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -120,8 +120,6 @@ SoundGenPCJr::SoundGenPCJr(AgiBase *vm, Audio::Mixer *pMixer) : SoundGen(vm, pMi
 	else
 		_dissolveMethod = 0;
 
-	_dissolveMethod = 3;
-
 	memset(_channel, 0, sizeof(_channel));
 	memset(_tchannel, 0, sizeof(_tchannel));
 
-- 
cgit v1.2.3


From 0cb0a09c02f20626bbcf2bb89341b02b7b3ff12c Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 10 May 2015 16:04:26 +0100
Subject: AGI: Change the way the mixer volume is handled in the PCjr player

Instead of factoring the volume into the tone attenuation it now scales
the volume table. This way it still uses the full table when playing
at a low volume and therefore keeps the 16 attenuation levels.

Also use kMusicSoundType instead of kSFXSoundType to be coherent with what
the MIDI output is doing (volume for both music and SFX is controlled by
the Music volume slider).
---
 engines/agi/sound_pcjr.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 83adcac747..17370cb32f 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -205,7 +205,6 @@ int SoundGenPCJr::volumeCalc(SndGenChan *chan) {
 				chan->attenuationCopy = attenuation;
 
 				attenuation &= 0x0F;
-				attenuation += (16 - _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) / 17);
 				if (attenuation > 0x0F)
 					attenuation = 0x0F;
 			}
@@ -475,8 +474,9 @@ int SoundGenPCJr::fillSquare(ToneChan *t, int16 *buf, int len) {
 
 	count = len;
 
+	int16 amp = (int16)(volTable[t->atten] * _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / Audio::Mixer::kMaxMixerVolume);
 	while (count > 0) {
-		*(buf++) = t->sign ? volTable[t->atten] : -volTable[t->atten];
+		*(buf++) = t->sign ? amp : -amp;
 		count--;
 
 		// get next sample
@@ -513,8 +513,9 @@ int SoundGenPCJr::fillNoise(ToneChan *t, int16 *buf, int len) {
 
 	count = len;
 
+	int16 amp = (int16)(volTable[t->atten] * _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / Audio::Mixer::kMaxMixerVolume);
 	while (count > 0) {
-		*(buf++) = t->sign ? volTable[t->atten] : -volTable[t->atten];
+		*(buf++) = t->sign ? amp : -amp;
 		count--;
 
 		// get next sample
-- 
cgit v1.2.3


From 1f81f61cf9c6dffe5918f293627f7b8fa34be1cd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 May 2015 19:14:55 +0200
Subject: SHERLOCK: Add some code for the interactive demo (still crashing)

---
 engines/sherlock/detection.cpp       |  7 +++++++
 engines/sherlock/detection_tables.h  |  1 +
 engines/sherlock/map.cpp             |  3 ++-
 engines/sherlock/scalpel/scalpel.cpp | 10 +++++++++-
 engines/sherlock/scene.cpp           | 10 ++++++----
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index c38580af41..78ab33bfd0 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -122,6 +122,13 @@ bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsSavingDuringRuntime);
 }
 
+/**
+ * Returns whether the version is a demo
+ */
+bool Sherlock::SherlockEngine::getIsDemo() const {
+	return _gameDescription->desc.flags & ADGF_DEMO;
+}
+
 /**
  * Return a list of savegames
  */
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 260869660e..975b7323ec 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -84,6 +84,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 
 	{
 		// Case of the Rose Tattoo - English CD
+		// Provided by dreammaster
 		{
 			"rosetattoo",
 			"CD",
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index ef262aabd3..e178dece0c 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -69,7 +69,8 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
 
-	loadData();
+	if (!_vm->getIsDemo())
+		loadData();
 }
 
 /**
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0b7a9be278..8dc75c034f 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -215,9 +215,11 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
+	if (!getIsDemo()) {
 	// Load the map co-ordinates for each scene and sequence data
 	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
 	_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
+	}
 
 	// Load the inventory
 	loadInventory();
@@ -226,13 +228,19 @@ void ScalpelEngine::initialize() {
 	_talk->setSequences(&TALK_SEQUENCES[0][0], &STILL_SEQUENCES[0][0], MAX_PEOPLE);
 
 	// Starting scene
-	_scene->_goToScene = 4;
+	if (getIsDemo())
+		_scene->_goToScene = 3;
+	else
+		_scene->_goToScene = 4;
 }
 
 /**
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
+	if (getIsDemo())
+		return;
+
 	if (!showCityCutscene())
 		return;
 	if (!showAlleyCutscene())
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 0893afe4c4..ca9f19582c 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -457,10 +457,12 @@ bool Scene::loadScene(const Common::String &filename) {
 	_walkedInScene = false;
 	saves._justLoaded = false;
 
-	// Reset the previous map location and position on overhead map
-	map._oldCharPoint = _currentScene;
-	map._overPos.x = map[_currentScene].x * 100 - 600;
-	map._overPos.y = map[_currentScene].y * 100 + 900;
+	if (!_vm->getIsDemo()) {
+		// Reset the previous map location and position on overhead map
+		map._oldCharPoint = _currentScene;
+		map._overPos.x = map[_currentScene].x * 100 - 600;
+		map._overPos.y = map[_currentScene].y * 100 + 900;
+	}
 
 	events.clearEvents();
 	return flag;
-- 
cgit v1.2.3


From eae3ff961001b9ce071873978e29310947d2212b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 May 2015 19:46:15 +0200
Subject: SHERLOCK: Fix compilation (sorry for the noise)

---
 engines/sherlock/sherlock.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 5a3ed4bc1f..501fdcb292 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -119,6 +119,7 @@ public:
 	virtual Common::Error loadGameState(int slot);
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
 	virtual void syncSoundSettings();
+	virtual bool getIsDemo() const;
 
 	GameType getGameID() const;
 	Common::Language getLanguage() const;
-- 
cgit v1.2.3


From 0d3750a768c8f9457530344fa6871b98dd20276b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 11 May 2015 01:04:04 +0200
Subject: SHERLOCK: Add preliminar sound support

---
 engines/sherlock/sherlock.cpp |   2 +-
 engines/sherlock/sound.cpp    | 112 ++++++++++++++++++++++++++++++++++++++++--
 engines/sherlock/sound.h      |  13 ++++-
 3 files changed, 119 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 6bfc7ea7d4..2a5d9ec627 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -89,7 +89,7 @@ void SherlockEngine::initialize() {
 	_saves = new SaveManager(this, _targetName);
 	_scene = new Scene(this);
 	_screen = new Screen(this);
-	_sound = new Sound(this);
+	_sound = new Sound(this, _mixer);
 	_talk = new Talk(this);
 	_ui = new UserInterface(this);
 
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 24147a0ab9..51563d17a6 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -23,10 +23,14 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/sound.h"
 #include "common/config-manager.h"
+#include "audio/audiostream.h"
+#include "common/algorithm.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
 
 namespace Sherlock {
 
-Sound::Sound(SherlockEngine *vm): _vm(vm) {
+Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_digitized = false;
 	_music = false;
 	_voices = 0;
@@ -38,6 +42,9 @@ Sound::Sound(SherlockEngine *vm): _vm(vm) {
 	_soundOn = true;
 	_musicOn = true;
 	_speechOn = true;
+
+	_vm->_res->addToCache("MUSIC.LIB");
+	_vm->_res->addToCache("SND.SND");
 }
 
 /**
@@ -54,10 +61,91 @@ void Sound::loadSound(const Common::String &name, int priority) {
 	warning("TODO: Sound::loadSound");
 }
 
+char Sound::decodeSample(char sample, byte& prediction, int& step) {
+	char diff = ((sample & 0x07) << step);
+
+	if (sample & 0x08) {
+		if (prediction > diff)
+			prediction = prediction - ((sample & 0x07) << step);
+		else
+			prediction = 0;
+	} else {
+		if (prediction < 0xff - diff)
+			prediction = prediction + ((sample&0x07) << step);
+		else
+			prediction = 0xff;
+	}
+
+
+	if ((sample & 0x07) >= 5 && step < 3) {
+		step ++;
+	} else if ((sample & 0x07) == 0 && step > 0) {
+		step --;
+	}
+
+	return prediction;
+}
+
 bool Sound::playSound(const Common::String &name, WaitType waitType) {
-	// TODO
-	warning("TODO: Sound::playSound");
-	return true;
+	_mixer->stopHandle(_effectsHandle);
+
+	Common::String filename = name;
+	if (!filename.contains('.'))
+		filename += ".SND";
+	Common::SeekableReadStream *stream = _vm->_res->load(filename, "TITLE.SND");
+
+	stream->skip(2);
+	int size = stream->readUint32BE();
+	int rate = stream->readUint16BE();
+	byte *data = (byte *)malloc(size);
+	byte *ptr = data;
+	stream->read(ptr, size);
+
+	byte *decoded = (byte *)malloc((size - 1) * 2);
+
+	// +127 to eliminate the pop when the sound starts (signed vs unsignded PCM). Still does not help with the pop at the end
+	byte prediction = (ptr[0] & 0x0f) + 127;
+	int step = 0;
+	int counter = 0;
+
+	for(int i = 1; i < size; i++) {
+		decoded[counter++] = decodeSample((ptr[i]>>4)&0x0f, prediction, step);
+		decoded[counter++] = decodeSample((ptr[i]>>0)&0x0f, prediction, step);
+	}
+
+	free(data);
+
+	Audio::AudioStream *audioStream = Audio::makeRawStream(decoded, (size - 2) * 2, rate, Audio::FLAG_UNSIGNED, DisposeAfterUse::YES);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_effectsHandle, audioStream, -1,  Audio::Mixer::kMaxChannelVolume);
+	_soundPlaying = true;
+
+	if (waitType == WAIT_RETURN_IMMEDIATELY) {
+		_diskSoundPlaying = true;
+		return true;
+	}
+
+	bool retval = true;
+	do {
+		_vm->_events->pollEvents();
+		g_system->delayMillis(10);
+		if ((waitType == WAIT_KBD_OR_FINISH) && _vm->_events->kbHit()) {
+			retval = false;
+			break;
+		}
+	} while (!_vm->shouldQuit() && _mixer->isSoundHandleActive(_effectsHandle));
+	
+	_soundPlaying = false;
+	_mixer->stopHandle(_effectsHandle);
+
+#if 0
+	// Debug : used to dump files
+	Common::DumpFile outFile;
+	outFile.open(filename);
+	outFile.write(decoded, (size - 2) * 2);
+	outFile.flush();
+	outFile.close();
+#endif
+	return retval;
 }
 
 void Sound::cacheSound(const Common::String &name, int index) {
@@ -92,7 +180,21 @@ void Sound::stopSound() {
 
 void Sound::playMusic(const Common::String &name) {
 	// TODO
-	warning("TODO: Sound::playMusic");
+	warning("Sound::playMusic %s", name.c_str());
+	Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
+
+	byte *data = new byte[stream->size()];
+	byte *ptr = data;
+	stream->read(ptr, stream->size());
+	Common::DumpFile outFile;
+	outFile.open(name + ".RAW");
+	outFile.write(data, stream->size());
+	outFile.flush();
+	outFile.close();
+	delete[] data;
+
+	stopMusic();
+	startSong();
 }
 
 void Sound::stopMusic() {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 56cd4ed0a8..213a6f7a1e 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -25,6 +25,11 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "access/files.h"
+#include "audio/midiplayer.h"
+#include "audio/midiparser.h"
 
 namespace Sherlock {
 
@@ -37,6 +42,10 @@ enum WaitType {
 class Sound {
 private:
 	SherlockEngine *_vm;
+	Audio::Mixer *_mixer;
+	Audio::SoundHandle _effectsHandle;
+
+	char decodeSample(char sample, byte& prediction, int& step);
 public:
 	bool _digitized;
 	bool _music;
@@ -50,7 +59,7 @@ public:
 	bool *_soundIsOn;
 	byte *_digiBuf;
 public:
-	Sound(SherlockEngine *vm);
+	Sound(SherlockEngine *vm, Audio::Mixer *mixer);
 
 	void syncSoundSettings();
 	void loadSound(const Common::String &name, int priority);
@@ -64,7 +73,7 @@ public:
 	int loadSong(int songNumber);
 	void startSong();
 	void freeSong();
-
+	
 	void playMusic(const Common::String &name);
 	void stopMusic();
 	void stopSndFuncPtr(int v1, int v2);
-- 
cgit v1.2.3


From fc2ac47eabfa745a23cc97259d4f624caa916a59 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 11 May 2015 20:15:03 +0100
Subject: AGI: Remove dead code in PCjr code

I forgot to remove that code in commit 0cb0a09 when I removed the
line that preceded it.
---
 engines/agi/sound_pcjr.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 17370cb32f..ea7a2789e0 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -205,8 +205,6 @@ int SoundGenPCJr::volumeCalc(SndGenChan *chan) {
 				chan->attenuationCopy = attenuation;
 
 				attenuation &= 0x0F;
-				if (attenuation > 0x0F)
-					attenuation = 0x0F;
 			}
 		}
 		//if (computer_type == 2) && (attenuation < 8)
-- 
cgit v1.2.3


From 2e41909020ef2ccaf705f68737864fe50e31ef48 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 12 May 2015 00:29:20 +0300
Subject: QUEEN: Immediately stop actor movement when the game is exiting

This allows the engine to quit immediately while actors are moving,
e.g. while Joe is walking towards Lola's bedroom
---
 engines/queen/walk.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp
index dd7e46c765..17d12b0b9f 100644
--- a/engines/queen/walk.cpp
+++ b/engines/queen/walk.cpp
@@ -130,7 +130,7 @@ void Walk::animateJoe() {
 			_vm->logic()->joeScale(pbs->scale);
 			pbs->scaleWalkSpeed(6);
 			_vm->update(true);
-			if (_vm->input()->cutawayQuit() || _vm->logic()->joeWalk() == JWM_EXECUTE) {
+			if (_vm->input()->cutawayQuit() || _vm->logic()->joeWalk() == JWM_EXECUTE || _vm->shouldQuit()) {
 				stopJoe();
 				break;
 			}
@@ -249,7 +249,7 @@ void Walk::animatePerson(const MovePersonData *mpd, uint16 image, uint16 bobNum,
 			_vm->update();
 			pbs->scale = pwd->area->calcScale(pbs->y);
 			pbs->scaleWalkSpeed(mpd->moveSpeed);
-			if (_vm->input()->cutawayQuit()) {
+			if (_vm->input()->cutawayQuit() || _vm->shouldQuit()) {
 				stopPerson(bobNum);
 				break;
 			}
-- 
cgit v1.2.3


From 2e8e85310d245f273bb7c89c01d8eb5f0491c639 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 12 May 2015 00:32:57 +0300
Subject: SAGA: Only handle the puzzle scene for ITE

---
 engines/saga/scene.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index f19645dd99..9160131349 100644
--- a/engines/saga/scene.cpp
+++ b/engines/saga/scene.cpp
@@ -837,10 +837,10 @@ void Scene::loadScene(LoadSceneParams &loadSceneParams) {
 
 	// We probably don't want "followers" to go into scene -1 , 0. At the very
 	// least we don't want garbage to be drawn that early in the ITE intro.
-	if (_sceneNumber > 0 && _sceneNumber != ITE_SCENE_PUZZLE)
+	if (_sceneNumber > 0 && !(_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE))
 		_vm->_actor->updateActorsScene(loadSceneParams.actorsEntrance);
 
-	if (_sceneNumber == ITE_SCENE_PUZZLE)
+	if (_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE)
 		_vm->_puzzle->execute();
 
 	if (getFlags() & kSceneFlagShowCursor) {
-- 
cgit v1.2.3


From 7b2da2abc58866d6ad33730d2237bc0decf4ae0e Mon Sep 17 00:00:00 2001
From: sirlemonhead
Date: Tue, 12 May 2015 00:42:57 +0100
Subject: SHERLOCK: Re-factored Scalpel arrays out of Animation

---
 engines/sherlock/animation.cpp       | 87 ++++++++++++++++++++----------------
 engines/sherlock/animation.h         | 15 +++++++
 engines/sherlock/scalpel/scalpel.cpp | 41 +++++++++++++++++
 3 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index dac903a358..5c11c4f6fb 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -26,39 +26,6 @@
 
 namespace Sherlock {
 
-// The following are a list of filenames played in the prologue that have
-// special effects associated with them at specific frames
-
-#define FRAMES_END 32000
-#define PROLOGUE_NAMES_COUNT 6
-#define TITLE_NAMES_COUNT 7
-static const char *const PROLOGUE_NAMES[6] = {
-	"subway1", "subway2", "finale2", "suicid", "coff3", "coff4"
-};
-static const int PROLOGUE_FRAMES[6][9] = {
-	{ 4, 26, 54, 72, 92, 134, FRAMES_END },
-	{ 2, 80, 95, 117, 166, FRAMES_END },
-	{ 1, FRAMES_END },
-	{ 42, FRAMES_END },
-	{ FRAMES_END },
-	{ FRAMES_END }
-};
-
-// Title animations file list
-static const char *const TITLE_NAMES[7] = {
-	"27pro1", "14note", "coff1", "coff2", "coff3", "coff4", "14kick"
-};
-
-static const int TITLE_FRAMES[7][9] = {
-	{ 29, 131, FRAMES_END },
-	{ 55, 80, 95, 117, 166, FRAMES_END },
-	{ 15, FRAMES_END },
-	{ 4, 37, 92, FRAMES_END },
-	{ 2, 43, FRAMES_END },
-	{ 2, FRAMES_END },
-	{ 10, 50, FRAMES_END }
-};
-
 static const int NO_FRAMES = FRAMES_END;
 
 Animation::Animation(SherlockEngine *vm): _vm(vm) {
@@ -171,6 +138,48 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	return !skipped && !_vm->shouldQuit();
 }
 
+/**
+ * Load the prologue name array 
+ */
+void Animation::setPrologueNames(const char *const *names, int count) {
+	for (int idx = 0; idx < count; ++idx, names++) {
+		_prologueNames.push_back(*names);
+	}
+}
+
+/**
+ * Load the prologue frame array
+ */
+void Animation::setPrologueFrames(const int *frames, int count, int maxFrames) {
+	_prologueFrames.resize(count);
+
+	for (int idx = 0; idx < count; ++idx, frames + maxFrames) {
+		_prologueFrames[idx].resize(maxFrames);
+		Common::copy(frames, frames + maxFrames, &_prologueFrames[idx][0]);
+	}
+}
+
+/**
+ * Load the title name array
+ */
+void Animation::setTitleNames(const char *const *names, int count) {
+	for (int idx = 0; idx < count; ++idx, names++) {
+		_titleNames.push_back(*names);
+	}
+}
+
+/**
+ * Load the title frame array
+ */
+void Animation::setTitleFrames(const int *frames, int count, int maxFrames) {
+	_titleFrames.resize(count);
+
+	for (int idx = 0; idx < count; ++idx, frames + maxFrames) {
+		_titleFrames[idx].resize(maxFrames);
+		Common::copy(frames, frames + maxFrames, &_titleFrames[idx][0]);
+	}
+}
+
 /**
  * Checks for whether an animation is being played that has associated sound
  */
@@ -178,16 +187,16 @@ const int *Animation::checkForSoundFrames(const Common::String &filename) {
 	const int *frames = &NO_FRAMES;
 
 	if (_vm->_soundOverride.empty()) {
-		for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
-			if (filename.equalsIgnoreCase(PROLOGUE_NAMES[idx])) {
-				frames = &PROLOGUE_FRAMES[idx][0];
+		for (Common::Array<const char *>::size_type idx = 0; idx < _prologueNames.size(); ++idx) {
+			if (filename.equalsIgnoreCase(_prologueNames[idx])) {
+				frames = &_prologueFrames[idx][0];
 				break;
 			}
 		}
 	} else {
-		for (int idx = 0; idx < TITLE_NAMES_COUNT; ++idx) {
-			if (filename.equalsIgnoreCase(TITLE_NAMES[idx])) {
-				frames = &TITLE_FRAMES[idx][0];
+		for (Common::Array<const char *>::size_type idx = 0; idx < _titleNames.size(); ++idx) {
+			if (filename.equalsIgnoreCase(_titleNames[idx])) {
+				frames = &_titleFrames[idx][0];
 				break;
 			}
 		}
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index 245d83789f..5802ffcd88 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -25,20 +25,35 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
+#include "common/array.h"
 
 namespace Sherlock {
 
+#define FRAMES_END 32000
+
 class SherlockEngine;
 
 class Animation {
 private:
 	SherlockEngine *_vm;
 
+	Common::Array<const char *> _prologueNames;
+	Common::Array<Common::Array<int>> _prologueFrames;
+
+	Common::Array<const char *> _titleNames;
+	Common::Array<Common::Array<int>> _titleFrames;
+
 	const int *checkForSoundFrames(const Common::String &filename);
 public:
 public:
 	Animation(SherlockEngine *vm);
 
+	void setPrologueNames(const char *const *names, int count);
+	void setPrologueFrames(const int *frames, int count, int maxFrames);
+
+	void setTitleNames(const char *const *names, int count);
+	void setTitleFrames(const int *frames, int count, int maxFrames);
+
 	bool play(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
 };
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 8dc75c034f..5d84a7f5ed 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -22,11 +22,46 @@
 
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/animation.h"
 
 namespace Sherlock {
 
 namespace Scalpel {
 
+#define PROLOGUE_NAMES_COUNT 6
+
+// The following are a list of filenames played in the prologue that have
+// special effects associated with them at specific frames
+static const char *const PROLOGUE_NAMES[PROLOGUE_NAMES_COUNT] = {
+	"subway1", "subway2", "finale2", "suicid", "coff3", "coff4"
+};
+
+static const int PROLOGUE_FRAMES[6][9] = {
+	{ 4, 26, 54, 72, 92, 134, FRAMES_END },
+	{ 2, 80, 95, 117, 166, FRAMES_END },
+	{ 1, FRAMES_END },
+	{ 42, FRAMES_END },
+	{ FRAMES_END },
+	{ FRAMES_END }
+};
+
+#define TITLE_NAMES_COUNT 7
+
+// Title animations file list
+static const char *const TITLE_NAMES[TITLE_NAMES_COUNT] = {
+	"27pro1", "14note", "coff1", "coff2", "coff3", "coff4", "14kick"
+};
+
+static const int TITLE_FRAMES[7][9] = {
+	{ 29, 131, FRAMES_END },
+	{ 55, 80, 95, 117, 166, FRAMES_END },
+	{ 15, FRAMES_END },
+	{ 4, 37, 92, FRAMES_END },
+	{ 2, 43, FRAMES_END },
+	{ 2, FRAMES_END },
+	{ 10, 50, FRAMES_END }
+};
+
 #define NUM_PLACES 100
 const int MAP_X[NUM_PLACES] = {
 	0, 368, 0, 219, 0, 282, 0, 43, 0, 0, 396, 408, 0, 0, 0, 568, 37, 325,
@@ -227,6 +262,12 @@ void ScalpelEngine::initialize() {
 	// Set up constants used by the talk system
 	_talk->setSequences(&TALK_SEQUENCES[0][0], &STILL_SEQUENCES[0][0], MAX_PEOPLE);
 
+	_animation->setPrologueNames(&PROLOGUE_NAMES[0], PROLOGUE_NAMES_COUNT);
+	_animation->setPrologueFrames(&PROLOGUE_FRAMES[0][0], 6, 9);
+
+	_animation->setTitleNames(&TITLE_NAMES[0], TITLE_NAMES_COUNT);
+	_animation->setTitleFrames(&TITLE_FRAMES[0][0], 7, 9);
+
 	// Starting scene
 	if (getIsDemo())
 		_scene->_goToScene = 3;
-- 
cgit v1.2.3


From a0467ea60d7eac0839ff88f6fedf50007c7e48d1 Mon Sep 17 00:00:00 2001
From: sirlemonhead
Date: Tue, 12 May 2015 00:53:49 +0100
Subject: SHERLOCK: Correct some minor spelling mistakes

---
 engines/sherlock/inventory.cpp | 4 ++--
 engines/sherlock/talk.cpp      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index af2c4be0e4..d8c0104e6c 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -117,8 +117,8 @@ void Inventory::loadGraphics() {
 	Common::fill(&_invShapes[0], &_invShapes[MAX_VISIBLE_INVENTORY], (ImageFile *)nullptr);
 
 	for (int idx = _invIndex; (idx < _holdings) && (idx - _invIndex) < MAX_VISIBLE_INVENTORY; ++idx) {
-		// Get the name of the item to be dispalyed, figure out it's accompanying
-		// .VGS file with it's picture, and then load it
+		// Get the name of the item to be displayed, figure out its accompanying
+		// .VGS file with its picture, and then load it
 		int invNum = findInv((*this)[idx]._name);
 		Common::String fName = Common::String::format("item%02d.vgs", invNum + 1);
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a1e124aa95..3520a02296 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -379,7 +379,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 					byte color = ui._endKeyActive ? COMMAND_FOREGROUND : COMMAND_NULL;
 
-					// If the window is alraedy open, simply draw. Otherwise, do it
+					// If the window is already open, simply draw. Otherwise, do it
 					// to the back buffer and then summon the window
 					if (ui._windowOpen) {
 						screen.buttonPrint(Common::Point(119, CONTROLS_Y), color, true, "Exit");
-- 
cgit v1.2.3


From 7a46c84c0d02ec3fb5aa9d607519af8fbcd2715e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 22:02:59 -0400
Subject: SHERLOCK: Beginnings of Rose Tattoo engine

---
 engines/sherlock/decompress.cpp      | 48 +++++++++++++++++++++++
 engines/sherlock/map.cpp             | 10 ++++-
 engines/sherlock/objects.cpp         | 67 +++++++++++++++++++++++--------
 engines/sherlock/objects.h           | 23 ++++++++---
 engines/sherlock/resources.cpp       | 16 +++++---
 engines/sherlock/resources.h         |  3 +-
 engines/sherlock/scalpel/scalpel.cpp | 16 +++++---
 engines/sherlock/scene.cpp           | 67 ++++++++++++++++++++++++++-----
 engines/sherlock/scene.h             | 13 +++++-
 engines/sherlock/screen.cpp          | 76 +++++++++++++++++++++++++++---------
 engines/sherlock/screen.h            | 19 +++++++++
 engines/sherlock/sherlock.cpp        |  3 --
 engines/sherlock/sherlock.h          |  4 +-
 engines/sherlock/tattoo/tattoo.cpp   | 27 +++++++++++++
 engines/sherlock/tattoo/tattoo.h     |  5 +++
 engines/sherlock/user_interface.cpp  |  9 ++++-
 16 files changed, 336 insertions(+), 70 deletions(-)

diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index dfa573209f..8e02da3212 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -77,4 +77,52 @@ Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int
 	return outS;
 }
 
+
+/**
+ * Decompresses a Rose Tattoo resource
+ *
+Common::SeekableReadStream *decompress32(Common::SeekableReadStream &source, int32 outSize) {
+	if (outSize == -1) {
+		outSize = source.readSint32LE();
+	}
+
+	byte lzWindow[8192];
+	byte *outBuffer = new byte[outSize];
+	byte *outBufferEnd = outBuffer + outSize;
+	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+
+	memset(lzWindow, 0xFF, 8192);
+	int lzWindowPos = 0xFEE;
+	int cmd = 0;
+
+	do {
+		cmd >>= 1;
+		if (!(cmd & 0x100))
+			cmd = source.readByte() | 0xFF00;
+
+		if (cmd & 1) {
+			byte literal = source.readByte();
+			*outBuffer++ = literal;
+			lzWindow[lzWindowPos] = literal;
+			lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+		} else {
+			int copyPos, copyLen;
+			copyPos = source.readByte();
+			copyLen = source.readByte();
+			copyPos = copyPos | ((copyLen & 0xF0) << 4);
+			copyLen = (copyLen & 0x0F) + 3;
+			while (copyLen--) {
+				byte literal = lzWindow[copyPos];
+				copyPos = (copyPos + 1) & 0x0FFF;
+				*outBuffer++ = literal;
+				lzWindow[lzWindowPos] = literal;
+				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+			}
+		}
+	} while (outBuffer < outBufferEnd);
+
+	return outS;
+}
+*/
+
 } // namespace Sherlock
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index e178dece0c..c2eedd46ee 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/map.h"
 #include "sherlock/sherlock.h"
+#include "common/system.h"
 
 namespace Sherlock {
 
@@ -52,7 +53,7 @@ const byte *MapPaths::getPath(int srcLocation, int destLocation) {
 
 /*----------------------------------------------------------------*/
 
-Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
+Map::Map(SherlockEngine *vm): _vm(vm), _topLine(g_system->getWidth(), 12) {
 	_active = false;
 	_mapCursors = nullptr;
 	_shapes = nullptr;
@@ -94,8 +95,13 @@ void Map::loadSequences(int count, const byte *seq) {
  * Load data  needed for the map
  */
 void Map::loadData() {
+	// TODO: Remove this
+	if (_vm->getGameID() == GType_RoseTattoo)
+		return;
+
 	// Load the list of location names
-	Common::SeekableReadStream *txtStream = _vm->_res->load("chess.txt");
+	Common::SeekableReadStream *txtStream = _vm->_res->load(
+		_vm->getGameID() == GType_SerratedScalpel ? "chess.txt" : "map.txt");
 
 	int streamSize = txtStream->size();
 	while (txtStream->pos() < streamSize) {
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index b4371cd71b..772f9d23d1 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -122,8 +122,8 @@ void Sprite::adjustSprite() {
 			people.gotoStand(*this);
 		}
 	} else if (!map._active) {
-		_position.y = CLIP((int)_position.y, UPPER_LIMIT, LOWER_LIMIT);
-		_position.x = CLIP((int)_position.x, LEFT_LIMIT, RIGHT_LIMIT);
+		_position.y = CLIP((int)_position.y, (int)UPPER_LIMIT, (int)LOWER_LIMIT);
+		_position.x = CLIP((int)_position.x, (int)LEFT_LIMIT, (int)RIGHT_LIMIT);
 	}
 
 	if (!map._active || (map._frameChangeFlag = !map._frameChangeFlag))
@@ -393,9 +393,14 @@ UseType::UseType() {
 /**
  * Load the data for the UseType
  */
-void UseType::load(Common::SeekableReadStream &s) {
+void UseType::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	char buffer[12];
 
+	if (isRoseTattoo) {
+		s.read(buffer, 12);
+		_verb = Common::String(buffer);
+	}
+
 	_cAnimNum = s.readByte();
 	_cAnimSpeed = s.readByte();
 	if (_cAnimSpeed & 0x80)
@@ -407,9 +412,12 @@ void UseType::load(Common::SeekableReadStream &s) {
 	}
 
 	_useFlag = s.readSint16LE();
-	_dFlag[0] = s.readSint16LE();
-	_lFlag[0] = s.readSint16LE();
-	_lFlag[1] = s.readSint16LE();
+
+	if (!isRoseTattoo) {
+		_dFlag[0] = s.readSint16LE();
+		_lFlag[0] = s.readSint16LE();
+		_lFlag[1] = s.readSint16LE();
+	}
 
 	s.read(buffer, 12);
 	_target = Common::String(buffer);
@@ -456,12 +464,19 @@ Object::Object() {
 	_descOffset = 0;
 	_seqCounter2 = 0;
 	_seqSize = 0;
+
+	_quickDraw = 0;
+	_scaleVal = 0;
+	_requiredFlag1 = 0;
+	_gotoSeq = 0;
+	_talkSeq = 0;
+	_restoreSlot = 0;
 }
 
 /**
  * Load the data for the object
  */
-void Object::load(Common::SeekableReadStream &s) {
+void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	char buffer[41];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
@@ -496,7 +511,8 @@ void Object::load(Common::SeekableReadStream &s) {
 	_pickup = s.readByte();
 	_defaultCommand = s.readByte();
 	_lookFlag = s.readUint16LE();
-	_pickupFlag = s.readUint16LE();
+	if (!isRoseTattoo)
+		_pickupFlag = s.readUint16LE();
 	_requiredFlag = s.readSint16LE();
 	_noShapeSize.x = s.readUint16LE();
 	_noShapeSize.y = s.readUint16LE();
@@ -504,26 +520,45 @@ void Object::load(Common::SeekableReadStream &s) {
 	_misc = s.readByte();
 	_maxFrames = s.readUint16LE();
 	_flags = s.readByte();
-	_aOpen.load(s);
+
+	if (!isRoseTattoo)
+		_aOpen.load(s);
+
 	_aType = (AType)s.readByte();
 	_lookFrames = s.readByte();
 	_seqCounter = s.readByte();
 	_lookPosition.x = s.readUint16LE();
-	_lookPosition.y = s.readByte();
+	_lookPosition.y = isRoseTattoo ? s.readSint16LE() : s.readByte();
 	_lookFacing = s.readByte();
 	_lookcAnim = s.readByte();
-	_aClose.load(s);
+
+	if (!isRoseTattoo)
+		_aClose.load(s);
+
 	_seqStack = s.readByte();
 	_seqTo = s.readByte();
 	_descOffset = s.readUint16LE();
 	_seqCounter2 = s.readByte();
 	_seqSize = s.readUint16LE();
-	s.skip(1);
-	_aMove.load(s);
-	s.skip(8);
 
-	for (int idx = 0; idx < 4; ++idx)
-		_use[idx].load(s);
+	if (isRoseTattoo) {
+		for (int idx = 0; idx < 6; ++idx)
+			_use[idx].load(s, true);
+
+		_quickDraw = s.readByte();
+		_scaleVal = s.readUint16LE();
+		_requiredFlag1 = s.readUint16LE();
+		_gotoSeq = s.readByte();
+		_talkSeq = s.readByte();
+		_restoreSlot = s.readByte();
+	} else {
+		s.skip(1);
+		_aMove.load(s);
+		s.skip(8);
+
+		for (int idx = 0; idx < 4; ++idx)
+			_use[idx].load(s, false);
+	}
 }
 
 /**
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 4068973e58..2073f06f88 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -159,9 +159,10 @@ struct UseType {
 	int _dFlag[1];
 	int _lFlag[2];
 	Common::String _target;
+	Common::String _verb;
 
 	UseType();
-	void load(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
 };
 
 class Object {
@@ -197,32 +198,42 @@ public:
 	int _pickup;
 	int _defaultCommand;			// Default right-click command
 	int _lookFlag;					// Which flag LOOK   will set (if any)
-	int _pickupFlag;				// Which flag PICKUP will set (if any)
 	int _requiredFlag;				// Object will be hidden if not set
 	Common::Point _noShapeSize;		// Size of a NO_SHAPE
 	int _status;					// Status (open/closed, moved/not)
 	int8 _misc;						// Misc field -- use varies with type
 	int _maxFrames;					// Number of frames
 	int _flags;						// Tells if object can be walked behind
-	ActionType _aOpen;				// Holds data for moving object
 	AType _aType;					// Tells if this is an object, person, talk, etc.
 	int _lookFrames;				// How many frames to play of the look anim before pausing
 	int _seqCounter;				// How many times this sequence has been executed
 	Common::Point _lookPosition;	// Where to walk when examining object
 	int _lookFacing;				// Direction to face when examining object
 	int _lookcAnim;
-	ActionType _aClose;
 	int _seqStack;					// Allows gosubs to return to calling frame
 	int _seqTo;						// Allows 1-5, 8-3 type sequences encoded in 2 bytes
 	uint _descOffset;					// Tells where description starts in DescText
 	int _seqCounter2;				// Counter of calling frame sequence
 	uint _seqSize;					// Tells where description starts
+	UseType _use[6];				// Serrated Scalpel uses 4, Rose Tattoo 6
+
+	// Serrated Scalpel fields
+	int _pickupFlag;				// Which flag PICKUP will set (if any)
+	ActionType _aOpen;				// Holds data for moving object
+	ActionType _aClose;
 	ActionType _aMove;
-	UseType _use[4];
+
+	// Rose Tattoo fields
+	int _quickDraw;
+	int _scaleVal;
+	int _requiredFlag1;
+	int _gotoSeq;
+	int _talkSeq;
+	int _restoreSlot;
 
 	Object();
 
-	void load(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
 
 	void toggleHidden();
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index f50f780195..9f2704ac62 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -107,9 +107,7 @@ Resources::Resources() {
 
 	addToCache("vgs.lib");
 	addToCache("talk.lib");
-	addToCache("sequence.txt");
 	addToCache("journal.txt");
-	addToCache("portrait.lib");
 }
 
 /**
@@ -122,8 +120,11 @@ void Resources::addToCache(const Common::String &filename) {
 	// Check to see if the file is a library
 	Common::SeekableReadStream *stream = load(filename);
 	uint32 header = stream->readUint32BE();
+
 	if (header == MKTAG('L', 'I', 'B', 26))
-		loadLibraryIndex(filename, stream);
+		loadLibraryIndex(filename, stream, false);
+	else if (header == MKTAG('L', 'I', 'C', 26))
+		loadLibraryIndex(filename, stream, true);
 
 	delete stream;
 }
@@ -193,7 +194,7 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename, cons
 
 	// Check if the library has already had it's index read, and if not, load it
 	if (!_indexes.contains(libraryFile))
-		loadLibraryIndex(libraryFile, libStream);
+		loadLibraryIndex(libraryFile, libStream, false);
 
 	// Extract the data for the specified resource and return it
 	LibraryEntry &entry = _indexes[libraryFile][filename];
@@ -216,7 +217,7 @@ bool Resources::exists(const Common::String &filename) const {
  * Reads in the index from a library file, and caches it's index for later use
  */
 void Resources::loadLibraryIndex(const Common::String &libFilename,
-		Common::SeekableReadStream *stream) {
+		Common::SeekableReadStream *stream, bool isNewStyle) {
 	uint32 offset, nextOffset;
 
 	// Create an index entry
@@ -227,6 +228,9 @@ void Resources::loadLibraryIndex(const Common::String &libFilename,
 	stream->seek(4);
 	int count = stream->readUint16LE();
 
+	if (isNewStyle)
+		stream->seek((count + 1) * 8, SEEK_CUR);
+
 	// Loop through reading in the entries
 	for (int idx = 0; idx < count; ++idx) {
 		// Read the name of the resource
@@ -304,10 +308,12 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 			// Animation cutscene image files use a 16-bit x offset
 			frame._offset.x = stream.readUint16LE();
 			frame._rleEncoded = (frame._offset.x & 0xff) == 1;
+			frame._offset.y = stream.readByte();
 		} else {
 			// Standard image files have a separate byte for the RLE flag, and an 8-bit X offset
 			frame._rleEncoded = stream.readByte() == 1;
 			frame._offset.x = stream.readByte();
+			frame._offset.y = stream.readByte();
 		}
 
 		frame._offset.y = stream.readByte();
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index e1f97f1def..bbaac60a33 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -70,7 +70,8 @@ private:
 	LibraryIndexes _indexes;
 	int _resourceIndex;
 
-	void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream);
+	void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream,
+		bool isNewStyle);
 public:
 	Resources();
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 6959e435d2..b982079714 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -23,6 +23,7 @@
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/animation.h"
+#include "engines/util.h"
 
 namespace Sherlock {
 
@@ -242,6 +243,9 @@ ScalpelEngine::~ScalpelEngine() {
  * Game initialization
  */
 void ScalpelEngine::initialize() {
+	initGraphics(320, 200, false);
+
+	// Let the base engine intialize
 	SherlockEngine::initialize();
 
 	_darts = new Darts(this);
@@ -250,11 +254,13 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
-	if (!getIsDemo()) {
+	// Add some more files to the cache
+	_res->addToCache("sequence.txt");
+	_res->addToCache("portrait.lib");
+
 	// Load the map co-ordinates for each scene and sequence data
 	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
 	_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
-	}
 
 	// Load the inventory
 	loadInventory();
@@ -454,9 +460,9 @@ bool ScalpelEngine::scrollCredits() {
 			_screen->transBlitFrom(creditsImages[1], Common::Point(10, 400 - idx), false, 0);
 
 		// Don't show credit text on the top and bottom ten rows of the screen
-		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, 10));
-		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - 10),
-			Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 10, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, _screen->w, 10));
+		_screen->blitFrom(_screen->_backBuffer1, Common::Point(0, _screen->h - 10),
+			Common::Rect(0, _screen->h - 10, _screen->w, _screen->h));
 
 		_events->delay(100);
 	}
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index f473004d9a..d4662ed559 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -24,16 +24,42 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/decompress.h"
+#include "sherlock/screen.h"
 
 namespace Sherlock {
 
-void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
+BgFileHeader::BgFileHeader() {
+	_numStructs = -1;
+	_numImages = -1;
+	_numcAnimations = -1;
+	_descSize = -1;
+	_seqSize = -1;
+
+	// Serrated Scalpel
+	_fill = -1;
+
+	// Rose Tattoo
+	_scrollSize = -1;
+	_bytesWritten = -1;
+	_fadeStyle = -1;
+	Common::fill(&_palette[0], &_palette[PALETTE_SIZE], 0);
+}
+
+void BgFileHeader::synchronize(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	_numStructs = s.readUint16LE();
 	_numImages = s.readUint16LE();
 	_numcAnimations = s.readUint16LE();
 	_descSize = s.readUint16LE();
 	_seqSize = s.readUint16LE();
-	_fill = s.readUint16LE();
+
+	if (isRoseTattoo) {
+		_scrollSize = s.readUint16LE();
+		_bytesWritten = s.readUint32LE();
+		_fadeStyle = s.readByte();
+	} else {
+		_fill = s.readUint16LE();
+
+	}
 }
 
 /*----------------------------------------------------------------*/
@@ -215,6 +241,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	Sound &sound = *_vm->_sound;
 	UserInterface &ui = *_vm->_ui;
 	bool flag;
+	Common::Array<BgfileheaderInfo> bgInfo;
 
 	_walkedInScene = false;
 
@@ -229,7 +256,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	_sequenceBuffer.clear();
 
 	//
-	// Load background shapes from <filename>.rrm
+	// Load the room resource file for the scene
 	//
 
 	Common::String rrmFile = filename + ".rrm";
@@ -238,30 +265,52 @@ bool Scene::loadScene(const Common::String &filename) {
 		Common::SeekableReadStream *rrmStream = _vm->_res->load(rrmFile);
 
 		rrmStream->seek(39);
-		_version = rrmStream->readByte();
-		_lzwMode = _version == 10;
+		if (_vm->getGameID() == GType_SerratedScalpel) {
+			_version = rrmStream->readByte();
+			_lzwMode = _version == 10;
+		} else {
+			_lzwMode = rrmStream->readByte() > 0;
+		}
 
 		// Go to header and read it in
 		rrmStream->seek(rrmStream->readUint32LE());
+
 		BgFileHeader bgHeader;
-		bgHeader.synchronize(*rrmStream);
+		bgHeader.synchronize(*rrmStream, _vm->getGameID() == GType_RoseTattoo);
 		_invGraphicItems = bgHeader._numImages + 1;
 
+		if (_vm->getGameID() == GType_RoseTattoo) {
+			screen.initPaletteFade(bgHeader._bytesWritten);
+			screen.fadeRead(*rrmStream, screen._cMap, PALETTE_SIZE);
+			screen.setupBGArea(screen._cMap);
+
+			screen.initScrollVars();
+
+			// Read in background
+			if (_lzwMode) {
+				Common::SeekableReadStream *stream = decompressLZ(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT);
+				stream->read(screen._backBuffer1.getPixels(), stream->size());
+				delete stream;
+			} else {
+				rrmStream->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT);
+			}
+		} 
+
 		// Read in the shapes header info
-		Common::Array<BgfileheaderInfo> bgInfo;
 		bgInfo.resize(bgHeader._numStructs);
 
 		for (uint idx = 0; idx < bgInfo.size(); ++idx)
 			bgInfo[idx].synchronize(*rrmStream);
 
 		// Read information
+		int shapeSize = _vm->getGameID() == GType_SerratedScalpel ? 569 : 591;
 		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, bgHeader._numImages * 569 +
+			decompressLZ(*rrmStream, bgHeader._numImages * shapeSize +
 				bgHeader._descSize + bgHeader._seqSize);
 
 		_bgShapes.resize(bgHeader._numStructs);
 		for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-			_bgShapes[idx].load(*infoStream);
+			_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
 
 		if (bgHeader._descSize) {
 			_descText.resize(bgHeader._descSize);
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 96714c4a3a..b4b88fa0a1 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -29,6 +29,7 @@
 #include "common/serializer.h"
 #include "sherlock/objects.h"
 #include "sherlock/resources.h"
+#include "sherlock/screen.h"
 
 namespace Sherlock {
 
@@ -44,9 +45,19 @@ struct BgFileHeader {
 	int _numcAnimations;
 	int _descSize;
 	int _seqSize;
+
+	// Serrated Scalpel
 	int _fill;
 
-	void synchronize(Common::SeekableReadStream &s);
+	// Rose Tattoo
+	int _scrollSize;
+	int _bytesWritten;				// Size of the main body of the RRM
+	int _fadeStyle;					// Fade style
+	byte _palette[PALETTE_SIZE];	// Palette
+
+
+	BgFileHeader();
+	void synchronize(Common::SeekableReadStream &s, bool isRoseTattoo);
 };
 
 struct BgfileheaderInfo {
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index fb155bf502..0ca10b4a4a 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -28,9 +28,9 @@
 
 namespace Sherlock {
 
-Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), _vm(vm),
-		_backBuffer1(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
-		_backBuffer2(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT),
+Screen::Screen(SherlockEngine *vm) : Surface(g_system->getWidth(), g_system->getHeight()), _vm(vm),
+		_backBuffer1(g_system->getWidth(), g_system->getHeight()),
+		_backBuffer2(g_system->getWidth(), g_system->getHeight()),
 		_backBuffer(&_backBuffer1) {
 	_transitionSeed = 1;
 	_fadeStyle = false;
@@ -38,11 +38,19 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 	_fontHeight = 0;
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
+	Common::fill(&_tMap[0], &_tMap[PALETTE_SIZE], 0);
 	setFont(1);
 
 	// Set dummy surface used for restricted scene drawing
 	_sceneSurface.format = Graphics::PixelFormat::createFormatCLUT8();
-	_sceneSurface.pitch = SHERLOCK_SCREEN_WIDTH;
+	_sceneSurface.pitch = pitch;
+
+	// Rose Tattoo specific fields
+	_fadeBytesRead = _fadeBytesToRead = 0;
+	_oldFadePercent = 0;
+	_scrollSize = 0;
+	_currentScroll = 0;
+	_targetScroll = 0;
 }
 
 Screen::~Screen() {
@@ -213,7 +221,7 @@ void Screen::randomTransition() {
 		_transitionSeed = _transitionSeed * TRANSITION_MULTIPLIER + 1;
 		int offset = _transitionSeed & 65535;
 
-		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
+		if (offset < (this->w * this->h))
 			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset);
 
 		if (idx != 0 && (idx % 100) == 0) {
@@ -236,12 +244,12 @@ void Screen::randomTransition() {
 void Screen::verticalTransition() {
 	Events &events = *_vm->_events;
 
-	byte table[SHERLOCK_SCREEN_WIDTH];
-	Common::fill(&table[0], &table[SHERLOCK_SCREEN_WIDTH], 0);
+	byte table[640];
+	Common::fill(&table[0], &table[640], 0);
 
-	for (int yp = 0; yp < SHERLOCK_SCREEN_HEIGHT; ++yp) {
-		for (int xp = 0; xp < SHERLOCK_SCREEN_WIDTH; ++xp) {
-			int temp = (table[xp] >= 197) ? SHERLOCK_SCREEN_HEIGHT - table[xp] :
+	for (int yp = 0; yp < this->h; ++yp) {
+		for (int xp = 0; xp < this->w; ++xp) {
+			int temp = (table[xp] >= (this->h - 3)) ? this->h - table[xp] :
 				_vm->getRandomNumber(3) + 1;
 
 			if (temp) {
@@ -261,7 +269,7 @@ void Screen::verticalTransition() {
 void Screen::restoreBackground(const Common::Rect &r) {
 	if (r.width() > 0 && r.height() > 0) {
 		Common::Rect tempRect = r;
-		tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+		tempRect.clip(Common::Rect(0, 0, this->w, SHERLOCK_SCENE_HEIGHT));
 
 		if (tempRect.isValidRect())
 			_backBuffer1.blitFrom(_backBuffer2, Common::Point(tempRect.left, tempRect.top), tempRect);
@@ -281,7 +289,7 @@ void Screen::slamArea(int16 xp, int16 yp, int16 width, int16 height) {
 void Screen::slamRect(const Common::Rect &r) {
 	if (r.width() && r.height() > 0) {
 		Common::Rect tempRect = r;
-		tempRect.clip(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		tempRect.clip(Common::Rect(0, 0, this->w, this->h));
 
 		if (tempRect.isValidRect())
 			blitFrom(*_backBuffer, Common::Point(tempRect.left, tempRect.top), tempRect);
@@ -338,13 +346,13 @@ void Screen::print(const Common::Point &pt, byte color, const char *formatStr, .
 	pos.y--;		// Font is always drawing one line higher
 	if (!pos.x)
 		// Center text horizontally
-		pos.x = (SHERLOCK_SCREEN_WIDTH - width) / 2;
+		pos.x = (this->w - width) / 2;
 
 	Common::Rect textBounds(pos.x, pos.y, pos.x + width, pos.y + _fontHeight);
-	if (textBounds.right > SHERLOCK_SCREEN_WIDTH)
-		textBounds.moveTo(SHERLOCK_SCREEN_WIDTH - width, textBounds.top);
-	if (textBounds.bottom > SHERLOCK_SCREEN_HEIGHT)
-		textBounds.moveTo(textBounds.left, SHERLOCK_SCREEN_HEIGHT - _fontHeight);
+	if (textBounds.right > this->w)
+		textBounds.moveTo(this->w - width, textBounds.top);
+	if (textBounds.bottom > this->h)
+		textBounds.moveTo(textBounds.left, this->h - _fontHeight);
 
 	// Write out the string at the given position
 	writeString(str, Common::Point(textBounds.left, textBounds.top), color);
@@ -505,7 +513,7 @@ void Screen::resetDisplayBounds() {
  */
 Common::Rect Screen::getDisplayBounds() {
 	return (_backBuffer == &_sceneSurface) ? Common::Rect(0, 0, _sceneSurface.w, _sceneSurface.h) :
-		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+		Common::Rect(0, 0, this->w, this->h);
 }
 
 /**
@@ -518,4 +526,36 @@ void Screen::synchronize(Common::Serializer &s) {
 		setFont(fontNumb);
 }
 
+void Screen::initPaletteFade(int bytesToRead) {
+	Common::copy(&_cMap[0], &_cMap[PALETTE_SIZE], &_sMap[0]);
+	Common::copy(&_cMap[0], &_cMap[PALETTE_SIZE], &_tMap[0]);
+
+	// Set how many bytes need to be read / have been read
+	_fadeBytesRead = 0;
+	_fadeBytesToRead = bytesToRead;
+	_oldFadePercent = 0;
+}
+
+int Screen::fadeRead(Common::SeekableReadStream &stream, byte *buf, int totalSize) {
+	warning("TODO: fadeRead");
+	stream.read(buf, totalSize);
+	return totalSize;
+}
+
+/**
+ * Creates a grey-scale version of the passed palette
+ */
+void Screen::setupBGArea(const byte cMap[PALETTE_SIZE]) {
+	warning("TODO");
+}
+
+/**
+ * Initializes scroll variables
+ */
+void Screen::initScrollVars() {
+	_scrollSize = 0;
+	_currentScroll = 0;
+	_targetScroll = 0;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 501506f8ec..25389166d0 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -67,6 +67,15 @@ private:
 	int _fontHeight;
 	Surface _sceneSurface;
 
+	// Rose Tattoo fields
+	int _fadeBytesRead, _fadeBytesToRead;
+	int _oldFadePercent;
+	byte _lookupTable[PALETTE_COUNT];
+	byte _lookupTable1[PALETTE_COUNT];
+	int _scrollSize;
+	int _currentScroll;
+	int _targetScroll;
+private:
 	void mergeDirtyRects();
 
 	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
@@ -80,6 +89,7 @@ public:
 	bool _fadeStyle;
 	byte _cMap[PALETTE_SIZE];
 	byte _sMap[PALETTE_SIZE];
+	byte _tMap[PALETTE_SIZE];
 public:
 	Screen(SherlockEngine *vm);
 	virtual ~Screen();
@@ -132,6 +142,15 @@ public:
 	int fontNumber() const { return _fontNumber; }
 
 	void synchronize(Common::Serializer &s);
+
+	// Rose Tattoo specific methods
+	void initPaletteFade(int bytesToRead);
+
+	int fadeRead(Common::SeekableReadStream &stream, byte *buf, int totalSize);
+
+	void setupBGArea(const byte cMap[PALETTE_SIZE]);
+
+	void initScrollVars();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 2a5d9ec627..318267bb8f 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -25,7 +25,6 @@
 #include "common/scummsys.h"
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
-#include "engines/util.h"
 
 namespace Sherlock {
 
@@ -71,8 +70,6 @@ SherlockEngine::~SherlockEngine() {
  * Does basic initialization of the game engine
  */
 void SherlockEngine::initialize() {
-	initGraphics(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, false);
-
 	DebugMan.addDebugChannel(kDebugScript, "scripts", "Script debug level");
 
 	ImageFile::setVm(this);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 501fdcb292..e21ac8c6d6 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -62,8 +62,8 @@ enum GameType {
 	GType_RoseTattoo = 1
 };
 
-#define SHERLOCK_SCREEN_WIDTH 320
-#define SHERLOCK_SCREEN_HEIGHT 200
+#define SHERLOCK_SCREEN_WIDTH _vm->_screen->w
+#define SHERLOCK_SCREEN_HEIGHT _vm->_screen->h
 #define SHERLOCK_SCENE_HEIGHT 138
 
 struct SherlockGameDescription;
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index d4059ac413..9039e3f9d4 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "sherlock/tattoo/tattoo.h"
+#include "engines/util.h"
 
 namespace Sherlock {
 
@@ -30,6 +31,32 @@ void TattooEngine::showOpening() {
 	// TODO
 }
 
+/**
+ * Initialize the engine
+ */
+void TattooEngine::initialize() {
+	initGraphics(640, 480, true);
+
+	// Initialize the base engine
+	SherlockEngine::initialize();
+
+	_flags.resize(100 * 8);
+
+	// Add some more files to the cache
+	_res->addToCache("walk.lib");
+
+	// Starting scene
+	_scene->_goToScene = 91;
+}
+
+/**
+ * Starting a scene within the game
+ */
+void TattooEngine::startScene() {
+	// TODO
+}
+
+
 } // End of namespace Tattoo
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index b98395597c..7bdeec55d1 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -31,10 +31,15 @@ namespace Tattoo {
 
 class TattooEngine : public SherlockEngine {
 protected:
+	virtual void initialize();
+
 	virtual void showOpening();
+
+	virtual void startScene();
 public:
 	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
 		SherlockEngine(syst, gameDesc) {}
+
 	virtual ~TattooEngine() {}
 };
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 41505b89fc..8e7254026b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -81,8 +81,13 @@ const char *const MUSE[] = {
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
-	_controls = new ImageFile("menu.all");
-	_controlPanel = new ImageFile("controls.vgs");
+	if (_vm->getGameID() == GType_SerratedScalpel) {
+		_controls = new ImageFile("menu.all");
+		_controlPanel = new ImageFile("controls.vgs");
+	} else {
+		_controls = nullptr;
+		_controlPanel = nullptr;
+	}
 	_bgFound = 0;
 	_oldBgFound = -1;
 	_keycode = Common::KEYCODE_INVALID;
-- 
cgit v1.2.3


From 32d7690e549f5af8fb5f88d9434ae0f54c0e6c69 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 08:26:25 -0400
Subject: SHERLOCK: Update sound initialization for Rose Tattoo

---
 engines/sherlock/sound.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 09e55ec82b..70451a68da 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -45,7 +45,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_speechOn = true;
 
 	_vm->_res->addToCache("MUSIC.LIB");
-	_vm->_res->addToCache("SND.SND");
+	_vm->_res->addToCache(_vm->getGameID() == GType_SerratedScalpel ? "SND.SND" : "SOUND.LIB");
 }
 
 /**
-- 
cgit v1.2.3


From cf6276145b78e60d0cc3e20f12b78a16a8091c7d Mon Sep 17 00:00:00 2001
From: sirlemonhead
Date: Tue, 12 May 2015 18:00:35 +0100
Subject: SHERLOCK: Fix to correctly increment animation variables

---
 engines/sherlock/animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 5c11c4f6fb..de72de63f9 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -153,7 +153,7 @@ void Animation::setPrologueNames(const char *const *names, int count) {
 void Animation::setPrologueFrames(const int *frames, int count, int maxFrames) {
 	_prologueFrames.resize(count);
 
-	for (int idx = 0; idx < count; ++idx, frames + maxFrames) {
+	for (int idx = 0; idx < count; ++idx, frames += maxFrames) {
 		_prologueFrames[idx].resize(maxFrames);
 		Common::copy(frames, frames + maxFrames, &_prologueFrames[idx][0]);
 	}
@@ -174,7 +174,7 @@ void Animation::setTitleNames(const char *const *names, int count) {
 void Animation::setTitleFrames(const int *frames, int count, int maxFrames) {
 	_titleFrames.resize(count);
 
-	for (int idx = 0; idx < count; ++idx, frames + maxFrames) {
+	for (int idx = 0; idx < count; ++idx, frames += maxFrames) {
 		_titleFrames[idx].resize(maxFrames);
 		Common::copy(frames, frames + maxFrames, &_titleFrames[idx][0]);
 	}
-- 
cgit v1.2.3


From 3a74cb7b57e09e9826c6534c5d53a53753045524 Mon Sep 17 00:00:00 2001
From: sirlemonhead
Date: Tue, 12 May 2015 18:17:05 +0100
Subject: SHERLOCK: Fix GCC compilation with correct whitespace for nested
 Common:Array

---
 engines/sherlock/animation.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index 5802ffcd88..06614df6b1 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -38,10 +38,10 @@ private:
 	SherlockEngine *_vm;
 
 	Common::Array<const char *> _prologueNames;
-	Common::Array<Common::Array<int>> _prologueFrames;
+	Common::Array<Common::Array<int> > _prologueFrames;
 
 	Common::Array<const char *> _titleNames;
-	Common::Array<Common::Array<int>> _titleFrames;
+	Common::Array<Common::Array<int> > _titleFrames;
 
 	const int *checkForSoundFrames(const Common::String &filename);
 public:
-- 
cgit v1.2.3


From 72c9b9f56b99ca9c286de8618be4f473c0969983 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 12 May 2015 21:34:45 +0200
Subject: SHERLOCK: Implement sound priority

---
 engines/sherlock/animation.cpp      |  2 +-
 engines/sherlock/objects.cpp        |  2 +-
 engines/sherlock/scene.cpp          |  9 ++------
 engines/sherlock/sound.cpp          | 41 +++++++++++++++----------------------
 engines/sherlock/sound.h            |  9 ++++----
 engines/sherlock/talk.cpp           |  2 +-
 engines/sherlock/user_interface.cpp |  2 +-
 7 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index de72de63f9..a8edf77532 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -111,7 +111,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 					Common::String::format("%s%02d", filename.c_str(), soundNumber);
 
 				if (sound._voices)
-					sound.playSound(fname);
+					sound.playSound(fname, WAIT_RETURN_IMMEDIATELY);
 			}
 
 			events.wait(speed);
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index ca8ba1759a..acb13dd593 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -613,7 +613,7 @@ void Object::checkObject() {
 
 				if (sound._soundOn && !_countCAnimFrames) {
 					if (!scene._sounds[v - 1]._name.empty() && sound._digitized)
-						sound.playLoadedSound(v - 1, 0);
+						sound.playLoadedSound(v - 1, WAIT_RETURN_IMMEDIATELY);
 				}
 			} else if (v >= FLIP_CODE && v <= (FLIP_CODE + 2)) {
 				// Flip code
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index ca9f19582c..4b0cbee07d 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -378,13 +378,8 @@ bool Scene::loadScene(const Common::String &filename) {
 		for (int idx = 0; idx < numSounds; ++idx)
 			_sounds[idx].synchronize(*rrmStream);
 
-		// If sound is turned on, load the sounds into memory
-		if (sound._soundOn) {
-			for (int idx = 0; idx < numSounds; ++idx) {
-				sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
-				_sounds[idx]._name = "";
-			}
-		}
+		for (int idx = 0; idx < numSounds; ++idx)
+			sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
 
 		// Read in palette
 		rrmStream->read(screen._cMap, PALETTE_SIZE);
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 51563d17a6..09e55ec82b 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -38,6 +38,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_diskSoundPlaying = false;
 	_soundPlaying = false;
 	_soundIsOn = &_soundPlaying;
+	_curPriority = 0;
 
 	_soundOn = true;
 	_musicOn = true;
@@ -57,8 +58,7 @@ void Sound::syncSoundSettings() {
 }
 
 void Sound::loadSound(const Common::String &name, int priority) {
-	// TODO
-	warning("TODO: Sound::loadSound");
+	// No implementation required in ScummVM
 }
 
 char Sound::decodeSample(char sample, byte& prediction, int& step) {
@@ -86,8 +86,8 @@ char Sound::decodeSample(char sample, byte& prediction, int& step) {
 	return prediction;
 }
 
-bool Sound::playSound(const Common::String &name, WaitType waitType) {
-	_mixer->stopHandle(_effectsHandle);
+bool Sound::playSound(const Common::String &name, WaitType waitType, int priority) {
+	stopSound();
 
 	Common::String filename = name;
 	if (!filename.contains('.'))
@@ -103,7 +103,7 @@ bool Sound::playSound(const Common::String &name, WaitType waitType) {
 
 	byte *decoded = (byte *)malloc((size - 1) * 2);
 
-	// +127 to eliminate the pop when the sound starts (signed vs unsignded PCM). Still does not help with the pop at the end
+	// +127 to eliminate the pop when the sound starts (signed vs unsigned PCM). Still does not help with the pop at the end
 	byte prediction = (ptr[0] & 0x0f) + 127;
 	int step = 0;
 	int counter = 0;
@@ -118,6 +118,7 @@ bool Sound::playSound(const Common::String &name, WaitType waitType) {
 	Audio::AudioStream *audioStream = Audio::makeRawStream(decoded, (size - 2) * 2, rate, Audio::FLAG_UNSIGNED, DisposeAfterUse::YES);
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_effectsHandle, audioStream, -1,  Audio::Mixer::kMaxChannelVolume);
 	_soundPlaying = true;
+	_curPriority = priority;
 
 	if (waitType == WAIT_RETURN_IMMEDIATELY) {
 		_diskSoundPlaying = true;
@@ -148,34 +149,24 @@ bool Sound::playSound(const Common::String &name, WaitType waitType) {
 	return retval;
 }
 
-void Sound::cacheSound(const Common::String &name, int index) {
-	// TODO
-	warning("TODO: Sound::cacheSound");
-}
+void Sound::playLoadedSound(int bufNum, WaitType waitType) {
+	if (_mixer->isSoundHandleActive(_effectsHandle) && (_curPriority > _vm->_scene->_sounds[bufNum]._priority))
+		return;
 
-void Sound::playLoadedSound(int bufNum, int waitMode) {
-	// TODO
-	warning("TODO: Sound::playLoadedSound");
-}
+	stopSound();
+	playSound(_vm->_scene->_sounds[bufNum]._name, waitType, _vm->_scene->_sounds[bufNum]._priority);
 
-void Sound::playCachedSound(int index) {
-	// TODO
-	warning("TODO: Sound::playCachedSound");
+	return;
 }
 
 void Sound::freeLoadedSounds() {
-	// TODO
-	warning("TODO: Sound::clearLoadedSound");
-}
-
-void Sound::clearCache() {
-	// TODO
-	warning("TODO: Sound::clearCache");
+	// As sounds are played with DisposeAfterUse::YES, stopping the sounds also
+	// frees them
+	stopSound();
 }
 
 void Sound::stopSound() {
-	// TODO
-	warning("TODO: Sound::stopSound");
+	_mixer->stopHandle(_effectsHandle);
 }
 
 void Sound::playMusic(const Common::String &name) {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 213a6f7a1e..659df57bc3 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -44,6 +44,7 @@ private:
 	SherlockEngine *_vm;
 	Audio::Mixer *_mixer;
 	Audio::SoundHandle _effectsHandle;
+	int _curPriority;
 
 	char decodeSample(char sample, byte& prediction, int& step);
 public:
@@ -63,13 +64,11 @@ public:
 
 	void syncSoundSettings();
 	void loadSound(const Common::String &name, int priority);
-	bool playSound(const Common::String &name, WaitType waitType = WAIT_RETURN_IMMEDIATELY);
-	void cacheSound(const Common::String &name, int index);
-	void playLoadedSound(int bufNum, int waitMode);
-	void playCachedSound(int index);
+	bool playSound(const Common::String &name, WaitType waitType, int priority = 100);
+	void playLoadedSound(int bufNum, WaitType waitType);
 	void freeLoadedSounds();
-	void clearCache();
 	void stopSound();
+
 	int loadSong(int songNumber);
 	void startSong();
 	void freeSong();
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 3520a02296..61f0004fd6 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1278,7 +1278,7 @@ void Talk::doScript(const Common::String &script) {
 				if (sound._voices) {
 					for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
 						tempString += str[idx];
-					sound.playSound(tempString);
+					sound.playSound(tempString, WAIT_RETURN_IMMEDIATELY);
 
 					// Set voices to wait for more
 					sound._voices = 2;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 8b3ee426a4..d65bd9c01d 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1683,7 +1683,7 @@ void UserInterface::doTalkControl() {
 			people.setTalking(0);
 
 			if (!talk._statements[_selector]._voiceFile.empty() && sound._voices) {
-				sound.playSound(talk._statements[_selector]._voiceFile);
+				sound.playSound(talk._statements[_selector]._voiceFile, WAIT_RETURN_IMMEDIATELY);
 
 				// Set voices as an indicator for waiting
 				sound._voices = 2;
-- 
cgit v1.2.3


From 2824c8214a86927cd3532cc07b7bc7dedcab74a1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 19:14:39 -0400
Subject: SHERLOCK: Fix buffer reference in randomTransition

---
 engines/sherlock/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 2713d192e7..c236915992 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -234,7 +234,7 @@ void Screen::randomTransition() {
 	}
 
 	// Make sure everything has been transferred
-	blitFrom(_backBuffer1);
+	blitFrom(*_backBuffer);
 }
 
 /**
-- 
cgit v1.2.3


From f12fe46fad425ca451036f6af06beab5ec3a81c5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 19:19:49 -0400
Subject: SHERLOCK: Remove redundant check from mergeDirtyRects

---
 engines/sherlock/screen.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index c236915992..fb155bf502 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -170,13 +170,6 @@ void Screen::addDirtyRect(const Common::Rect &r) {
 void Screen::mergeDirtyRects() {
 	Common::List<Common::Rect>::iterator rOuter, rInner;
 
-	// Ensure dirty rect list has at least two entries
-	rOuter = _dirtyRects.begin();
-	for (int i = 0; i < 2; ++i, ++rOuter) {
-		if (rOuter == _dirtyRects.end())
-			return;
-	}
-
 	// Process the dirty rect list to find any rects to merge
 	for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
 		rInner = rOuter;
-- 
cgit v1.2.3


From 95212c5f0290b2cbebed6b179efa57397f08b39b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 19:50:16 -0400
Subject: SHERLOCK: Whitespace fixes

---
 engines/sherlock/graphics.h          |  2 +-
 engines/sherlock/people.h            | 10 +++++-----
 engines/sherlock/resources.cpp       | 28 ++++++++++++++--------------
 engines/sherlock/scalpel/scalpel.cpp |  2 +-
 engines/sherlock/scene.h             |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
index 91a65c8c43..d4a1584968 100644
--- a/engines/sherlock/graphics.h
+++ b/engines/sherlock/graphics.h
@@ -37,7 +37,7 @@ private:
 protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
 public:
-    Surface(uint16 width, uint16 height);
+	Surface(uint16 width, uint16 height);
 	Surface();
 	virtual ~Surface();
 
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index ee16fab243..f98c3db867 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -32,11 +32,11 @@ namespace Sherlock {
 
 // People definitions
 enum PeopleId {
-	PLAYER        = 0,
-	AL            = 0,
-	PEG           = 1,
-	NUM_OF_PEOPLE = 2,		// Holmes and Watson
-	MAX_PEOPLE    = 66		// Total of all NPCs
+	PLAYER			= 0,
+	AL				= 0,
+	PEG				= 1,
+	NUM_OF_PEOPLE	= 2,		// Holmes and Watson
+	MAX_PEOPLE		= 66		// Total of all NPCs
 };
 
 // Animation sequence identifiers for characters
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 3f74590386..f50f780195 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -294,7 +294,7 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 	loadPalette(stream);
 
 	int streamSize = stream.size();
-    while (stream.pos() < streamSize) {
+	while (stream.pos() < streamSize) {
 		ImageFrame frame;
 		frame._width = stream.readUint16LE() + 1;
 		frame._height = stream.readUint16LE() + 1;
@@ -309,30 +309,30 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 			frame._rleEncoded = stream.readByte() == 1;
 			frame._offset.x = stream.readByte();
 		}
-		frame._offset.y = stream.readByte();
 
+		frame._offset.y = stream.readByte();
 		frame._rleEncoded = !skipPalette && frame._rleEncoded;
 
 		if (frame._paletteBase) {
 			// Nibble packed frame data
 			frame._size = (frame._width * frame._height) / 2;
 		} else if (frame._rleEncoded) {
-            // this size includes the header size, which we subtract
+			// This size includes the header size, which we subtract
 			frame._size = stream.readUint16LE() - 11;
 			frame._rleMarker = stream.readByte();
-        } else {
+		} else {
 			// Uncompressed data
 			frame._size = frame._width * frame._height;
-        }
+		}
 
 		// Load data for frame and decompress it
 		byte *data = new byte[frame._size];
 		stream.read(data, frame._size);
-        decompressFrame(frame, data);
+		decompressFrame(frame, data);
 		delete[] data;
 
 		push_back(frame);
-    }
+	}
 }
 
 /**
@@ -372,17 +372,17 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 		}
 	} else if (frame._rleEncoded) {
 		// RLE encoded
-	    byte *dst = (byte *)frame._frame.getPixels();
+		byte *dst = (byte *)frame._frame.getPixels();
 
 		int frameSize = frame._width * frame._height;
 		while (frameSize > 0) {
 			if (*src == frame._rleMarker) {
-			    byte rleColor = src[1];
-			    byte rleCount = src[2];
-			    src += 3;
-			    frameSize -= rleCount;
-			    while (rleCount--)
-			        *dst++ = rleColor;
+				byte rleColor = src[1];
+				byte rleCount = src[2];
+				src += 3;
+				frameSize -= rleCount;
+				while (rleCount--)
+					*dst++ = rleColor;
 			} else {
 				*dst++ = *src++;
 				--frameSize;
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 5d84a7f5ed..6959e435d2 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -81,7 +81,7 @@ const int MAP_TRANSLATE[NUM_PLACES] = {
 };
 
 const byte MAP_SEQUENCES[3][MAX_FRAME] = {
-	{ 1, 1, 2, 3, 4, 0 },     // Overview Still
+	{ 1, 1, 2, 3, 4, 0 },		// Overview Still
 	{ 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 },
 	{ 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 }
 };
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 8ef5d74785..96714c4a3a 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -33,8 +33,8 @@
 namespace Sherlock {
 
 #define SCENES_COUNT 63
-#define MAX_ZONES    40
-#define INFO_LINE   140
+#define MAX_ZONES	40
+#define INFO_LINE	140
 
 class SherlockEngine;
 
-- 
cgit v1.2.3


From 2db576357f1a697d0a03e9fc32de6604bdf138ef Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 19:55:53 -0400
Subject: SHERLOCK: Rename object loading methods from synchronize to load

---
 engines/sherlock/objects.cpp | 24 ++++++++++++------------
 engines/sherlock/objects.h   |  8 ++++----
 engines/sherlock/scene.cpp   |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index acb13dd593..b4371cd71b 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -365,9 +365,9 @@ void Sprite::checkSprite() {
 /*----------------------------------------------------------------*/
 
 /**
- * Synchronize the data for a savegame
+ * Load the data for the action
  */
-void ActionType::synchronize(Common::SeekableReadStream &s) {
+void ActionType::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 
 	_cAnimNum = s.readByte();
@@ -391,9 +391,9 @@ UseType::UseType() {
 }
 
 /**
- * Synchronize the data for a savegame
+ * Load the data for the UseType
  */
-void UseType::synchronize(Common::SeekableReadStream &s) {
+void UseType::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 
 	_cAnimNum = s.readByte();
@@ -459,9 +459,9 @@ Object::Object() {
 }
 
 /**
- * Load the object data from the passed stream
+ * Load the data for the object
  */
-void Object::synchronize(Common::SeekableReadStream &s) {
+void Object::load(Common::SeekableReadStream &s) {
 	char buffer[41];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
@@ -504,7 +504,7 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_misc = s.readByte();
 	_maxFrames = s.readUint16LE();
 	_flags = s.readByte();
-	_aOpen.synchronize(s);
+	_aOpen.load(s);
 	_aType = (AType)s.readByte();
 	_lookFrames = s.readByte();
 	_seqCounter = s.readByte();
@@ -512,18 +512,18 @@ void Object::synchronize(Common::SeekableReadStream &s) {
 	_lookPosition.y = s.readByte();
 	_lookFacing = s.readByte();
 	_lookcAnim = s.readByte();
-	_aClose.synchronize(s);
+	_aClose.load(s);
 	_seqStack = s.readByte();
 	_seqTo = s.readByte();
 	_descOffset = s.readUint16LE();
 	_seqCounter2 = s.readByte();
 	_seqSize = s.readUint16LE();
 	s.skip(1);
-	_aMove.synchronize(s);
+	_aMove.load(s);
 	s.skip(8);
 
 	for (int idx = 0; idx < 4; ++idx)
-		_use[idx].synchronize(s);
+		_use[idx].load(s);
 }
 
 /**
@@ -1099,9 +1099,9 @@ const Common::Rect Object::getOldBounds() const {
 /*----------------------------------------------------------------*/
 
 /**
- * Synchronize the data for a savegame
+ * Load the data for the animation
  */
-void CAnim::synchronize(Common::SeekableReadStream &s) {
+void CAnim::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 52bd15cbbc..4068973e58 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -148,7 +148,7 @@ struct ActionType {
 	int _cAnimSpeed;
 	Common::String _names[4];
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 struct UseType {
@@ -161,7 +161,7 @@ struct UseType {
 	Common::String _target;
 
 	UseType();
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 class Object {
@@ -222,7 +222,7 @@ public:
 
 	Object();
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 
 	void toggleHidden();
 
@@ -255,7 +255,7 @@ struct CAnim {
 	Common::Point _teleportPos;		// Location Holmes shoul teleport to after
 	int _teleportDir;					// playing canim
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 struct SceneImage {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 4b0cbee07d..f473004d9a 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -261,7 +261,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		_bgShapes.resize(bgHeader._numStructs);
 		for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-			_bgShapes[idx].synchronize(*infoStream);
+			_bgShapes[idx].load(*infoStream);
 
 		if (bgHeader._descSize) {
 			_descText.resize(bgHeader._descSize);
@@ -318,7 +318,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 			_cAnim.resize(bgHeader._numcAnimations);
 			for (uint idx = 0; idx < _cAnim.size(); ++idx)
-				_cAnim[idx].synchronize(*canimStream);
+				_cAnim[idx].load(*canimStream);
 
 			delete canimStream;
 		}
-- 
cgit v1.2.3


From 0af230e9489df34d54f0ecdee062827b52182020 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 20:40:47 -0400
Subject: SHERLOCK: Fix speed of animations

---
 engines/sherlock/animation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index a8edf77532..1d6c12f668 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -114,7 +114,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 					sound.playSound(fname, WAIT_RETURN_IMMEDIATELY);
 			}
 
-			events.wait(speed);
+			events.wait(speed * 3);
 		}
 
 		if (events.kbHit()) {
-- 
cgit v1.2.3


From 44fbef5498070ee12fddb42c067d943e56d22f0e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 21:01:57 -0400
Subject: SHERLOCK: Add missing setting of _oldSelector

---
 engines/sherlock/user_interface.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index d65bd9c01d..41505b89fc 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1612,6 +1612,8 @@ void UserInterface::doTalkControl() {
 		if (_selector != -1)
 			talk.talkLine(_selector, talk._statements[_selector]._talkMap, TALK_FOREGROUND,
 				talk._statements[_selector]._talkPos.top, true);
+
+		_oldSelector = _selector;
 	}
 
 	if (events._released || _keyboardInput) {
-- 
cgit v1.2.3


From c1244623e084ab230aba3ad8cefb238f98575805 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 12 May 2015 22:06:39 -0400
Subject: SHERLOCK: More rename of synchronize methods to load

---
 engines/sherlock/scene.cpp | 38 ++++++++++++++++++++++++++++----------
 engines/sherlock/scene.h   | 10 +++++-----
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index f473004d9a..093c305a97 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -27,7 +27,10 @@
 
 namespace Sherlock {
 
-void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
+/**
+ * Load the data for the object
+ */
+void BgFileHeader::load(Common::SeekableReadStream &s) {
 	_numStructs = s.readUint16LE();
 	_numImages = s.readUint16LE();
 	_numcAnimations = s.readUint16LE();
@@ -38,7 +41,10 @@ void BgFileHeader::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-void BgfileheaderInfo::synchronize(Common::SeekableReadStream &s) {
+/**
+ * Load the data for the object
+ */
+void BgfileheaderInfo::load(Common::SeekableReadStream &s) {
 	_filesize = s.readUint32LE();
 	_maxFrames = s.readByte();
 
@@ -49,7 +55,10 @@ void BgfileheaderInfo::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-void Exit::synchronize(Common::SeekableReadStream &s) {
+/**
+ * Load the data for the object
+ */
+void Exit::load(Common::SeekableReadStream &s) {
 	int xp = s.readSint16LE();
 	int yp = s.readSint16LE();
 	int xSize = s.readSint16LE();
@@ -65,14 +74,20 @@ void Exit::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-void SceneEntry::synchronize(Common::SeekableReadStream &s) {
+/**
+ * Load the data for the object
+ */
+void SceneEntry::load(Common::SeekableReadStream &s) {
 	_startPosition.x = s.readSint16LE();
 	_startPosition.y = s.readSint16LE();
 	_startDir = s.readByte();
 	_allow = s.readByte();
 }
 
-void SceneSound::synchronize(Common::SeekableReadStream &s) {
+/**
+ * Load the data for the object
+ */
+void SceneSound::load(Common::SeekableReadStream &s) {
 	char buffer[9];
 	s.read(buffer, 8);
 	buffer[8] = '\0';
@@ -83,6 +98,9 @@ void SceneSound::synchronize(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
+/**
+ * Retuurn the index of the passed object in the array
+ */
 int ObjectArray::indexOf(const Object &obj) const {
 	for (uint idx = 0; idx < size(); ++idx) {
 		if (&(*this)[idx] == &obj)
@@ -244,7 +262,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Go to header and read it in
 		rrmStream->seek(rrmStream->readUint32LE());
 		BgFileHeader bgHeader;
-		bgHeader.synchronize(*rrmStream);
+		bgHeader.load(*rrmStream);
 		_invGraphicItems = bgHeader._numImages + 1;
 
 		// Read in the shapes header info
@@ -252,7 +270,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		bgInfo.resize(bgHeader._numStructs);
 
 		for (uint idx = 0; idx < bgInfo.size(); ++idx)
-			bgInfo[idx].synchronize(*rrmStream);
+			bgInfo[idx].load(*rrmStream);
 
 		// Read information
 		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
@@ -366,17 +384,17 @@ bool Scene::loadScene(const Common::String &filename) {
 		_exits.resize(numExits);
 
 		for (int idx = 0; idx < numExits; ++idx)
-			_exits[idx].synchronize(*rrmStream);
+			_exits[idx].load(*rrmStream);
 
 		// Read in the entrance
-		_entrance.synchronize(*rrmStream);
+		_entrance.load(*rrmStream);
 
 		// Initialize sound list
 		int numSounds = rrmStream->readByte();
 		_sounds.resize(numSounds);
 
 		for (int idx = 0; idx < numSounds; ++idx)
-			_sounds[idx].synchronize(*rrmStream);
+			_sounds[idx].load(*rrmStream);
 
 		for (int idx = 0; idx < numSounds; ++idx)
 			sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 96714c4a3a..665f5d28e4 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -46,7 +46,7 @@ struct BgFileHeader {
 	int _seqSize;
 	int _fill;
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 struct BgfileheaderInfo {
@@ -54,7 +54,7 @@ struct BgfileheaderInfo {
 	int _maxFrames;				// How many unique frames in object
 	Common::String _filename;	// Filename of object
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 struct Exit {
@@ -65,7 +65,7 @@ struct Exit {
 	Common::Point _people;
 	int _peopleDir;
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 struct SceneEntry {
@@ -73,14 +73,14 @@ struct SceneEntry {
 	int _startDir;
 	int _allow;
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 struct SceneSound {
 	Common::String _name;
 	int _priority;
 
-	void synchronize(Common::SeekableReadStream &s);
+	void load(Common::SeekableReadStream &s);
 };
 
 class ObjectArray: public Common::Array<Object> {
-- 
cgit v1.2.3


From 187b5838533b0a182b8b44c4bfd513eeaae6aaa0 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 13 May 2015 08:24:48 +0200
Subject: SHERLOCK: Handle multiple sound containers

---
 engines/sherlock/sound.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 09e55ec82b..7b8d6c69c6 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -45,6 +45,8 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_speechOn = true;
 
 	_vm->_res->addToCache("MUSIC.LIB");
+	_vm->_res->addToCache("TITLE.SND");
+	_vm->_res->addToCache("EPILOGUE.SND");
 	_vm->_res->addToCache("SND.SND");
 }
 
@@ -92,7 +94,18 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 	Common::String filename = name;
 	if (!filename.contains('.'))
 		filename += ".SND";
-	Common::SeekableReadStream *stream = _vm->_res->load(filename, "TITLE.SND");
+	
+	Common::SeekableReadStream *stream = nullptr;
+
+	if (_vm->_res->exists(filename))
+		stream = _vm->_res->load(filename, "TITLE.SND");
+	else if (_vm->_res->exists(filename))
+		stream = _vm->_res->load(filename, "EPILOGUE.SND");
+	else if (_vm->_res->exists(filename))
+		stream = _vm->_res->load(filename, "SND.SND");
+
+	if (!stream)
+		error("Unable to find sound file %s", filename.c_str());
 
 	stream->skip(2);
 	int size = stream->readUint32BE();
-- 
cgit v1.2.3


From c6c056133c7720fc83de0513acbf4b0cc96bc50e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 13 May 2015 22:54:03 +0200
Subject: SHERLOCK: Remove useless checks in playSound

---
 engines/sherlock/sound.cpp | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 7b8d6c69c6..59098c32cc 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -95,17 +95,10 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 	if (!filename.contains('.'))
 		filename += ".SND";
 	
-	Common::SeekableReadStream *stream = nullptr;
-
-	if (_vm->_res->exists(filename))
-		stream = _vm->_res->load(filename, "TITLE.SND");
-	else if (_vm->_res->exists(filename))
-		stream = _vm->_res->load(filename, "EPILOGUE.SND");
-	else if (_vm->_res->exists(filename))
-		stream = _vm->_res->load(filename, "SND.SND");
+	Common::SeekableReadStream *stream = _vm->_res->load(filename);
 
 	if (!stream)
-		error("Unable to find sound file %s", filename.c_str());
+		error("Unable to find sound file '%s'", filename.c_str());
 
 	stream->skip(2);
 	int size = stream->readUint32BE();
@@ -128,6 +121,15 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 
 	free(data);
 
+#if 0
+	// Debug : used to dump files
+	Common::DumpFile outFile;
+	outFile.open(filename);
+	outFile.write(decoded, (size - 2) * 2);
+	outFile.flush();
+	outFile.close();
+#endif
+
 	Audio::AudioStream *audioStream = Audio::makeRawStream(decoded, (size - 2) * 2, rate, Audio::FLAG_UNSIGNED, DisposeAfterUse::YES);
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_effectsHandle, audioStream, -1,  Audio::Mixer::kMaxChannelVolume);
 	_soundPlaying = true;
@@ -151,14 +153,6 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 	_soundPlaying = false;
 	_mixer->stopHandle(_effectsHandle);
 
-#if 0
-	// Debug : used to dump files
-	Common::DumpFile outFile;
-	outFile.open(filename);
-	outFile.write(decoded, (size - 2) * 2);
-	outFile.flush();
-	outFile.close();
-#endif
 	return retval;
 }
 
-- 
cgit v1.2.3


From 6f263e5774f7f4f8877932bb136621ac9606d11e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 13 May 2015 22:54:57 +0200
Subject: SHERLOCK: Fix a glitch in decompressLZ, when file size is unknown

---
 engines/sherlock/decompress.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index dfa573209f..b781285471 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -32,7 +32,7 @@ namespace Sherlock {
  */
 Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int32 outSize) {
 	if (outSize == -1) {
-		source.seek(5);
+		source.seek(4);
 		outSize = source.readSint32LE();
 	}
 
-- 
cgit v1.2.3


From fab0e75c292887254493f0efc6a5a40c851aba53 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 13 May 2015 22:57:15 +0200
Subject: SHERLOCK: Rework a bit Cache::load to use MKTAG, add support for
 compressed sub-files in Resources::load

---
 engines/sherlock/resources.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index f50f780195..e990013cb3 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -66,18 +66,15 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream)
 	if (_resources.contains(name))
 		return;
 
-	// Check whether the file is compressed
-	const char LZW_HEADER[5] = { "LZV\x1a" };
-	char header[5];
-	stream.read(header, 5);
-	bool isCompressed = !strncmp(header, LZW_HEADER, 5);
+	int32 signature = stream.readUint32BE();
 	stream.seek(0);
 
 	// Allocate a new cache entry
 	_resources[name] = CacheEntry();
 	CacheEntry &cacheEntry = _resources[name];
 
-	if (isCompressed) {
+	// Check whether the file is compressed
+	if (signature == MKTAG('L', 'Z', 'V', 26)) {
 		// It's compressed, so decompress the file and store it's data in the cache entry
 		Common::SeekableReadStream *decompressed = decompressLZ(stream);
 		cacheEntry.resize(decompressed->size());
@@ -168,8 +165,19 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 			stream->seek(entry._offset);
 			Common::SeekableReadStream *resStream = stream->readStream(entry._size);
 
-			delete stream;
-			return resStream;
+			// Check whether the file is compressed
+			if (resStream->readUint32BE() == MKTAG('L', 'Z', 'V', 26)) {
+				resStream->seek(0);
+				// It's compressed, so decompress the sub-file and return it
+				Common::SeekableReadStream *decompressed = decompressLZ(*resStream);
+				delete stream;
+				delete resStream;
+				return decompressed;
+			} else {
+				resStream->seek(0);
+				delete stream;
+				return resStream;
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 4cffb1c65fe9a1d8665d3303be8cb6f3acc1494d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 18:08:06 -0400
Subject: SHERLOCK: Simplify rect check in addDirtyRect

---
 engines/sherlock/screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index fb155bf502..4cc3ba92e7 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -161,7 +161,7 @@ void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) {
  */
 void Screen::addDirtyRect(const Common::Rect &r) {
 	_dirtyRects.push_back(r);
-	assert(r.isValidRect() && r.width() > 0 && r.height() > 0);
+	assert(r.width() > 0 && r.height() > 0);
 }
 
 /**
-- 
cgit v1.2.3


From 2a7019bd3d47c9e40b5e78ee83cc7bfb1c08bd1a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 18:33:23 -0400
Subject: SHERLOCK: Remove redundant _scriptCurrentIndex field

---
 engines/sherlock/talk.cpp           | 40 ++++---------------------------------
 engines/sherlock/talk.h             |  1 -
 engines/sherlock/user_interface.cpp |  3 ---
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 61f0004fd6..d656431823 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -104,7 +104,6 @@ Talk::Talk(SherlockEngine *vm): _vm(vm) {
 	_moreTalkDown = _moreTalkUp = false;
 	_scriptMoreFlag = 0;
 	_scriptSaveIndex = -1;
-	_scriptCurrentIndex = -1;
 }
 
 /**
@@ -1082,10 +1081,6 @@ void Talk::doScript(const Common::String &script) {
 			// Handle control code
 			switch (c) {
 			case SWITCH_SPEAKER:
-				// Save the current point in the script, since it might be intterupted by
-				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - scriptStart;
-
 				if (!(_speaker & 128))
 					people.clearTalking();
 				if (_talkToAbort)
@@ -1103,10 +1098,7 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case RUN_CANIMATION:
-				// Save the current point in the script, since it might be intterupted by
-				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = (str + 1) - scriptStart;
 				scene.startCAnim((str[0] - 1) & 127, (str[0] & 128) ? -1 : 1);
 				if (_talkToAbort)
 					return;
@@ -1143,10 +1135,6 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case REMOVE_PORTRAIT:
-				// Save the current point in the script, since it might be intterupted by
-				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - scriptStart;
-
 				if (_speaker >= 0 && _speaker < 128)
 					people.clearTalking();
 				pullSequence();
@@ -1203,10 +1191,7 @@ void Talk::doScript(const Common::String &script) {
 				}
 
 			case WALK_TO_COORDS:
-				// Save the current point in the script, since it might be interrupted by
-				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = str - scriptStart;
 
 				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100,
 					str[2] * 100), str[3] - 1);
@@ -1217,10 +1202,7 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case PAUSE_WITHOUT_CONTROL:
-				// Save the current point in the script, since it might be intterupted by
-				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = str - scriptStart;
 
 				for (int idx = 0; idx < (str[0] - 1); ++idx) {
 					scene.doBgAnim();
@@ -1234,10 +1216,6 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case BANISH_WINDOW:
-				// Save the current point in the script, since it might be intterupted by
-				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = str - scriptStart;
-
 				if (!(_speaker & 128))
 					people.clearTalking();
 				pullSequence();
@@ -1403,19 +1381,19 @@ void Talk::doScript(const Common::String &script) {
 				break;
 			}
 
-			case CALL_TALK_FILE:
+			case CALL_TALK_FILE: {
 				++str;
 				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
 					tempString += str[idx];
 				str += 8;
 
-				_scriptCurrentIndex = str - scriptStart;
+				int scriptCurrentIndex = str - scriptStart;
 
 				// Save the current script position and new talk file
 				if (_scriptStack.size() < 9) {
 					ScriptStackEntry rec1;
 					rec1._name = _scriptName;
-					rec1._currentIndex = _scriptCurrentIndex;
+					rec1._currentIndex = scriptCurrentIndex;
 					rec1._select = _scriptSelect;
 					_scriptStack.push(rec1);
 
@@ -1433,12 +1411,10 @@ void Talk::doScript(const Common::String &script) {
 				endStr = true;
 				wait = 0;
 				break;
+			}
 
 			case MOVE_MOUSE:
-				// Save the current point in the script, since it might be intterupted by
-				// doing bg anims in the next call, so we need to know where to return to
 				++str;
-				_scriptCurrentIndex = str - scriptStart;
 				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
 				if (_talkToAbort)
 					return;
@@ -1464,10 +1440,6 @@ void Talk::doScript(const Common::String &script) {
 				++str;
 				CAnim &animation = scene._cAnim[str[0] - 1];
 
-				// Save the current point in the script, since it might be interrupted by
-				// doing bg anims in the next call, so we need to know where to return to
-				_scriptCurrentIndex = (str + 1) - scriptStart;
-
 				people.walkToCoords(animation._goto, animation._gotoDir);
 				if (_talkToAbort)
 					return;
@@ -1614,10 +1586,6 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		if (wait) {
-			// Save the current point in the script, since it might be intterupted by
-			// doing bg anims in the next call, so we need to know where to return to
-			_scriptCurrentIndex = str - scriptStart;
-
 			// Handling pausing
 			if (!pauseFlag && charCount < 160)
 				charCount = 160;
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index d81586228f..b1a735827c 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -140,7 +140,6 @@ private:
 	int _talkStealth;
 	int _talkToFlag;
 	int _scriptSaveIndex;
-	int _scriptCurrentIndex;
 private:
 	void stripVoiceCommands();
 	void setTalkMap();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 41505b89fc..e4230cae83 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1694,9 +1694,6 @@ void UserInterface::doTalkControl() {
 				sound._speechOn = false;
 			}
 
-			// Set the _scriptCurrentIndex so if the statement is irrupted, the entire
-			// reply will be shown when it's restarted
-			talk._scriptCurrentIndex = 0;
 			talk.waitForMore(talk._statements[_selector]._statement.size());
 			if (talk._talkToAbort)
 				return;
-- 
cgit v1.2.3


From afa49212e8dab03a48ec50c900a942c2843bce07 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 19:00:52 -0400
Subject: SHERLOCK: Remove space/Enter handling for keyboard cursor

We don't implement the keyboard cursor movement anyway, and it was
stopping Space and Enter from working when showing dialogs
---
 engines/sherlock/user_interface.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index e4230cae83..aa6bf2ba81 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -167,11 +167,6 @@ void UserInterface::handleInput() {
 			_vm->quitGame();
 			events.pollEvents();
 			return;
-		} else if (keyState.keycode == Common::KEYCODE_SPACE ||
-				keyState.keycode == Common::KEYCODE_RETURN) {
-			events._pressed = false;
-			events._oldButtons = 0;
-			_keycode = Common::KEYCODE_INVALID;
 		}
 	}
 
-- 
cgit v1.2.3


From 24b93a14be56725d65983082592029ee6d24f3c1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 20:05:19 -0400
Subject: SHERLOCK: Renamed graphics.cpp to surface.cpp

---
 engines/sherlock/graphics.cpp     | 197 --------------------------------------
 engines/sherlock/graphics.h       |  60 ------------
 engines/sherlock/map.h            |   2 +-
 engines/sherlock/module.mk        |   2 +-
 engines/sherlock/saveload.cpp     |   2 +-
 engines/sherlock/screen.h         |   3 +-
 engines/sherlock/sherlock.cpp     |   2 +-
 engines/sherlock/surface.cpp      | 197 ++++++++++++++++++++++++++++++++++++++
 engines/sherlock/surface.h        |  60 ++++++++++++
 engines/sherlock/user_interface.h |   2 +-
 10 files changed, 263 insertions(+), 264 deletions(-)
 delete mode 100644 engines/sherlock/graphics.cpp
 delete mode 100644 engines/sherlock/graphics.h
 create mode 100644 engines/sherlock/surface.cpp
 create mode 100644 engines/sherlock/surface.h

diff --git a/engines/sherlock/graphics.cpp b/engines/sherlock/graphics.cpp
deleted file mode 100644
index 234928156a..0000000000
--- a/engines/sherlock/graphics.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/graphics.h"
-#include "sherlock/sherlock.h"
-#include "common/system.h"
-#include "graphics/palette.h"
-
-namespace Sherlock {
-
-Surface::Surface(uint16 width, uint16 height): _freePixels(true) {
-	create(width, height);
-}
-
-Surface::Surface() : _freePixels(false) {
-}
-
-Surface::~Surface() {
-	if (_freePixels)
-		free();
-}
-
-/**
- * Sets up an internal surface with the specified dimensions that will be automatically freed
- * when the surface object is destroyed
- */
-void Surface::create(uint16 width, uint16 height) {
-	if (_freePixels)
-		free();
-
-	Graphics::Surface::create(width, height, Graphics::PixelFormat::createFormatCLUT8());
-	_freePixels = true;
-}
-
-/**
- * Copy a surface into this one
- */
-void Surface::blitFrom(const Graphics::Surface &src) {
-	blitFrom(src, Common::Point(0, 0));
-}
-
-/**
- * Draws a surface at a given position within this surface
- */
-void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
-	Common::Rect drawRect(0, 0, src.w, src.h);
-	Common::Point destPt = pt;
-
-	if (destPt.x < 0) {
-		drawRect.left += -destPt.x;
-		destPt.x = 0;
-	}
-	if (destPt.y < 0) {
-		drawRect.top += -destPt.y;
-		destPt.y = 0;
-	}
-	int right = destPt.x + src.w;
-	if (right > this->w) {
-		drawRect.right -= (right - this->w);
-	}
-	int bottom = destPt.y + src.h;
-	if (bottom > this->h) {
-		drawRect.bottom -= (bottom - this->h);
-	}
-
-	if (drawRect.isValidRect())
-		blitFrom(src, destPt, drawRect);
-}
-
-/**
- * Draws a sub-section of a surface at a given position within this surface
- */
-void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		const Common::Rect &srcBounds) {
-	Common::Rect destRect(pt.x, pt.y, pt.x + srcBounds.width(),
-		pt.y + srcBounds.height());
-	Common::Rect srcRect = srcBounds;
-
-	if (clip(srcRect, destRect)) {
-		// Surface is at least partially or completely on-screen
-		addDirtyRect(destRect);
-		copyRectToSurface(src, destRect.left, destRect.top, srcRect);
-	}
-}
-
-/**
-* Draws an image frame at a given position within this surface with transparency
-*/
-void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
-		bool flipped, int overrideColor) {
-	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
-}
-
-/**
-* Draws a surface at a given position within this surface with transparency
-*/
-void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		bool flipped, int overrideColor) {
-	Common::Rect drawRect(0, 0, src.w, src.h);
-	Common::Rect destRect(pt.x, pt.y, pt.x + src.w, pt.y + src.h);
-
-	// Clip the display area to on-screen
-	if (!clip(drawRect, destRect))
-		// It's completely off-screen
-		return;
-
-	if (flipped)
-		drawRect = Common::Rect(src.w - drawRect.right, src.h - drawRect.bottom,
-			src.w - drawRect.left, src.h - drawRect.top);
-
-	Common::Point destPt(destRect.left, destRect.top);
-	addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
-		destPt.y + drawRect.height()));
-
-	// Draw loop
-	const int TRANSPARENCY = 0xFF;
-	for (int yp = 0; yp < drawRect.height(); ++yp) {
-		const byte *srcP = (const byte *)src.getBasePtr(
-			flipped ? drawRect.right - 1 : drawRect.left, drawRect.top + yp);
-		byte *destP = (byte *)getBasePtr(destPt.x, destPt.y + yp);
-
-		for (int xp = 0; xp < drawRect.width(); ++xp, ++destP) {
-			if (*srcP != TRANSPARENCY)
-				*destP = overrideColor ? overrideColor : *srcP;
-
-			srcP = flipped ? srcP - 1 : srcP + 1;
-		}
-	}
-}
-
-/**
- * Fill a given area of the surface with a given color
- */
-void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
-	fillRect(Common::Rect(x1, y1, x2, y2), color);
-}
-
-/**
- * Fill a given area of the surface with a given color
- */
-void Surface::fillRect(const Common::Rect &r, byte color) {
-	Graphics::Surface::fillRect(r, color);
-	addDirtyRect(r);
-}
-
-/**
- * Clips the given source bounds so the passed destBounds will be entirely on-screen
- */
-bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
-	if (destBounds.left >= this->w || destBounds.top >= this->h ||
-		destBounds.right <= 0 || destBounds.bottom <= 0)
-		return false;
-
-	// Clip the bounds if necessary to fit on-screen
-	if (destBounds.right > this->w) {
-		srcBounds.right -= destBounds.right - this->w;
-		destBounds.right = this->w;
-	}
-
-	if (destBounds.bottom > this->h) {
-		srcBounds.bottom -= destBounds.bottom - this->h;
-		destBounds.bottom = this->h;
-	}
-
-	if (destBounds.top < 0) {
-		srcBounds.top += -destBounds.top;
-		destBounds.top = 0;
-	}
-
-	if (destBounds.left < 0) {
-		srcBounds.left += -destBounds.left;
-		destBounds.left = 0;
-	}
-
-	return true;
-}
-
-} // End of namespace Sherlock
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h
deleted file mode 100644
index d4a1584968..0000000000
--- a/engines/sherlock/graphics.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_GRAPHICS_H
-#define SHERLOCK_GRAPHICS_H
-
-#include "common/rect.h"
-#include "graphics/surface.h"
-#include "sherlock/resources.h"
-
-namespace Sherlock {
-
-class Surface : public Graphics::Surface {
-private:
-	bool _freePixels;
-
-	bool clip(Common::Rect &srcBounds, Common::Rect &destBounds);
-protected:
-	virtual void addDirtyRect(const Common::Rect &r) {}
-public:
-	Surface(uint16 width, uint16 height);
-	Surface();
-	virtual ~Surface();
-
-	void create(uint16 width, uint16 height);
-	void blitFrom(const Graphics::Surface &src);
-	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
-	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		const Common::Rect &srcBounds);
-	void transBlitFrom(const ImageFrame &src, const Common::Point &pt,
-		bool flipped = false, int overrideColor = 0);
-	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		bool flipped = false, int overrideColor = 0);
-
-	void fillRect(int x1, int y1, int x2, int y2, byte color);
-	void fillRect(const Common::Rect &r, byte color);
-};
-
-} // End of namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 4432ec8553..4a418138b2 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -29,7 +29,7 @@
 #include "common/serializer.h"
 #include "common/str.h"
 #include "common/str-array.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/objects.h"
 
 namespace Sherlock {
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index babd0c49a0..630c4faf32 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -9,7 +9,6 @@ MODULE_OBJS = \
 	debugger.o \
 	detection.o \
 	events.o \
-	graphics.o \
 	inventory.o \
 	journal.o \
 	map.o \
@@ -22,6 +21,7 @@ MODULE_OBJS = \
 	settings.o \
 	sherlock.o \
 	sound.o \
+	surface.o \
 	talk.o \
 	user_interface.o
 
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index a78b89b00c..b9ac3e79d6 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "sherlock/saveload.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/sherlock.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 501506f8ec..1f3c23748f 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -26,8 +26,7 @@
 #include "common/list.h"
 #include "common/rect.h"
 #include "common/serializer.h"
-#include "graphics/surface.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/resources.h"
 
 namespace Sherlock {
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 2a5d9ec627..a9a17a99f8 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "sherlock/sherlock.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "common/scummsys.h"
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
new file mode 100644
index 0000000000..3e82f1dc5b
--- /dev/null
+++ b/engines/sherlock/surface.cpp
@@ -0,0 +1,197 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/surface.h"
+#include "sherlock/sherlock.h"
+#include "common/system.h"
+#include "graphics/palette.h"
+
+namespace Sherlock {
+
+Surface::Surface(uint16 width, uint16 height): _freePixels(true) {
+	create(width, height);
+}
+
+Surface::Surface() : _freePixels(false) {
+}
+
+Surface::~Surface() {
+	if (_freePixels)
+		free();
+}
+
+/**
+ * Sets up an internal surface with the specified dimensions that will be automatically freed
+ * when the surface object is destroyed
+ */
+void Surface::create(uint16 width, uint16 height) {
+	if (_freePixels)
+		free();
+
+	Graphics::Surface::create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+	_freePixels = true;
+}
+
+/**
+ * Copy a surface into this one
+ */
+void Surface::blitFrom(const Graphics::Surface &src) {
+	blitFrom(src, Common::Point(0, 0));
+}
+
+/**
+ * Draws a surface at a given position within this surface
+ */
+void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
+	Common::Rect drawRect(0, 0, src.w, src.h);
+	Common::Point destPt = pt;
+
+	if (destPt.x < 0) {
+		drawRect.left += -destPt.x;
+		destPt.x = 0;
+	}
+	if (destPt.y < 0) {
+		drawRect.top += -destPt.y;
+		destPt.y = 0;
+	}
+	int right = destPt.x + src.w;
+	if (right > this->w) {
+		drawRect.right -= (right - this->w);
+	}
+	int bottom = destPt.y + src.h;
+	if (bottom > this->h) {
+		drawRect.bottom -= (bottom - this->h);
+	}
+
+	if (drawRect.isValidRect())
+		blitFrom(src, destPt, drawRect);
+}
+
+/**
+ * Draws a sub-section of a surface at a given position within this surface
+ */
+void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		const Common::Rect &srcBounds) {
+	Common::Rect destRect(pt.x, pt.y, pt.x + srcBounds.width(),
+		pt.y + srcBounds.height());
+	Common::Rect srcRect = srcBounds;
+
+	if (clip(srcRect, destRect)) {
+		// Surface is at least partially or completely on-screen
+		addDirtyRect(destRect);
+		copyRectToSurface(src, destRect.left, destRect.top, srcRect);
+	}
+}
+
+/**
+* Draws an image frame at a given position within this surface with transparency
+*/
+void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
+		bool flipped, int overrideColor) {
+	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
+}
+
+/**
+* Draws a surface at a given position within this surface with transparency
+*/
+void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		bool flipped, int overrideColor) {
+	Common::Rect drawRect(0, 0, src.w, src.h);
+	Common::Rect destRect(pt.x, pt.y, pt.x + src.w, pt.y + src.h);
+
+	// Clip the display area to on-screen
+	if (!clip(drawRect, destRect))
+		// It's completely off-screen
+		return;
+
+	if (flipped)
+		drawRect = Common::Rect(src.w - drawRect.right, src.h - drawRect.bottom,
+			src.w - drawRect.left, src.h - drawRect.top);
+
+	Common::Point destPt(destRect.left, destRect.top);
+	addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),
+		destPt.y + drawRect.height()));
+
+	// Draw loop
+	const int TRANSPARENCY = 0xFF;
+	for (int yp = 0; yp < drawRect.height(); ++yp) {
+		const byte *srcP = (const byte *)src.getBasePtr(
+			flipped ? drawRect.right - 1 : drawRect.left, drawRect.top + yp);
+		byte *destP = (byte *)getBasePtr(destPt.x, destPt.y + yp);
+
+		for (int xp = 0; xp < drawRect.width(); ++xp, ++destP) {
+			if (*srcP != TRANSPARENCY)
+				*destP = overrideColor ? overrideColor : *srcP;
+
+			srcP = flipped ? srcP - 1 : srcP + 1;
+		}
+	}
+}
+
+/**
+ * Fill a given area of the surface with a given color
+ */
+void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
+	fillRect(Common::Rect(x1, y1, x2, y2), color);
+}
+
+/**
+ * Fill a given area of the surface with a given color
+ */
+void Surface::fillRect(const Common::Rect &r, byte color) {
+	Graphics::Surface::fillRect(r, color);
+	addDirtyRect(r);
+}
+
+/**
+ * Clips the given source bounds so the passed destBounds will be entirely on-screen
+ */
+bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
+	if (destBounds.left >= this->w || destBounds.top >= this->h ||
+		destBounds.right <= 0 || destBounds.bottom <= 0)
+		return false;
+
+	// Clip the bounds if necessary to fit on-screen
+	if (destBounds.right > this->w) {
+		srcBounds.right -= destBounds.right - this->w;
+		destBounds.right = this->w;
+	}
+
+	if (destBounds.bottom > this->h) {
+		srcBounds.bottom -= destBounds.bottom - this->h;
+		destBounds.bottom = this->h;
+	}
+
+	if (destBounds.top < 0) {
+		srcBounds.top += -destBounds.top;
+		destBounds.top = 0;
+	}
+
+	if (destBounds.left < 0) {
+		srcBounds.left += -destBounds.left;
+		destBounds.left = 0;
+	}
+
+	return true;
+}
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
new file mode 100644
index 0000000000..d4a1584968
--- /dev/null
+++ b/engines/sherlock/surface.h
@@ -0,0 +1,60 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_GRAPHICS_H
+#define SHERLOCK_GRAPHICS_H
+
+#include "common/rect.h"
+#include "graphics/surface.h"
+#include "sherlock/resources.h"
+
+namespace Sherlock {
+
+class Surface : public Graphics::Surface {
+private:
+	bool _freePixels;
+
+	bool clip(Common::Rect &srcBounds, Common::Rect &destBounds);
+protected:
+	virtual void addDirtyRect(const Common::Rect &r) {}
+public:
+	Surface(uint16 width, uint16 height);
+	Surface();
+	virtual ~Surface();
+
+	void create(uint16 width, uint16 height);
+	void blitFrom(const Graphics::Surface &src);
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		const Common::Rect &srcBounds);
+	void transBlitFrom(const ImageFrame &src, const Common::Point &pt,
+		bool flipped = false, int overrideColor = 0);
+	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		bool flipped = false, int overrideColor = 0);
+
+	void fillRect(int x1, int y1, int x2, int y2, byte color);
+	void fillRect(const Common::Rect &r, byte color);
+};
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 79382a19fe..2ff60715e3 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/events.h"
-#include "sherlock/graphics.h"
+#include "sherlock/surface.h"
 #include "sherlock/objects.h"
 #include "sherlock/resources.h"
 
-- 
cgit v1.2.3


From 91d69c7dc151fabdc17b240e525181485c99b807 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 21:24:42 -0400
Subject: SHERLOCK: Simplify blitFrom methods

---
 engines/sherlock/surface.cpp | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 3e82f1dc5b..2dfbdef77f 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -62,28 +62,7 @@ void Surface::blitFrom(const Graphics::Surface &src) {
  * Draws a surface at a given position within this surface
  */
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
-	Common::Rect drawRect(0, 0, src.w, src.h);
-	Common::Point destPt = pt;
-
-	if (destPt.x < 0) {
-		drawRect.left += -destPt.x;
-		destPt.x = 0;
-	}
-	if (destPt.y < 0) {
-		drawRect.top += -destPt.y;
-		destPt.y = 0;
-	}
-	int right = destPt.x + src.w;
-	if (right > this->w) {
-		drawRect.right -= (right - this->w);
-	}
-	int bottom = destPt.y + src.h;
-	if (bottom > this->h) {
-		drawRect.bottom -= (bottom - this->h);
-	}
-
-	if (drawRect.isValidRect())
-		blitFrom(src, destPt, drawRect);
+	blitFrom(src, pt, Common::Rect(0, 0, src.w, src.h));
 }
 
 /**
@@ -91,11 +70,10 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
  */
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds) {
-	Common::Rect destRect(pt.x, pt.y, pt.x + srcBounds.width(),
-		pt.y + srcBounds.height());
 	Common::Rect srcRect = srcBounds;
+	Common::Rect destRect(pt.x, pt.y, pt.x + srcRect.width(), pt.y + srcRect.height());
 
-	if (clip(srcRect, destRect)) {
+	if (srcRect.isValidRect() && clip(srcRect, destRect)) {
 		// Surface is at least partially or completely on-screen
 		addDirtyRect(destRect);
 		copyRectToSurface(src, destRect.left, destRect.top, srcRect);
-- 
cgit v1.2.3


From f987cda9f06e66962fb84b68fe060970c21d071f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 13 May 2015 21:39:08 -0400
Subject: SHERLOCK: Properly clear screen after fading to black

---
 engines/sherlock/screen.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 4cc3ba92e7..38bbb93800 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -141,6 +141,7 @@ void Screen::fadeToBlack(int speed) {
 	}
 
 	setPalette(tempPalette);
+	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
 }
 
 /**
-- 
cgit v1.2.3


From 8466c0f08da9b00408e6829ee948a62ec411de9d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 14 May 2015 16:45:53 +0200
Subject: SCI: Restore xs after calling run_vm from debugger

This fixes possible gamestate corruption when using 'send' in the
debugger to call methods.
---
 engines/sci/console.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index bc9ad362ab..dc017a7a70 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3374,6 +3374,7 @@ bool Console::cmdSend(int argc, const char **argv) {
 		// We call run_engine explictly so we can restore the value of r_acc
 		// after execution.
 		run_vm(_engine->_gamestate);
+		_engine->_gamestate->xs = old_xstack;
 
 	}
 
-- 
cgit v1.2.3


From 8919a8e8418a5dddaafda11b32c2d798ce8d8a40 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 14 May 2015 16:55:10 +0200
Subject: SAGA: Avoid code duplication

---
 engines/saga/scene.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index 9160131349..4fa15d09e5 100644
--- a/engines/saga/scene.cpp
+++ b/engines/saga/scene.cpp
@@ -835,13 +835,14 @@ void Scene::loadScene(LoadSceneParams &loadSceneParams) {
 		loadSceneParams.sceneProc(SCENE_BEGIN, this);
 	}
 
-	// We probably don't want "followers" to go into scene -1 , 0. At the very
-	// least we don't want garbage to be drawn that early in the ITE intro.
-	if (_sceneNumber > 0 && !(_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE))
-		_vm->_actor->updateActorsScene(loadSceneParams.actorsEntrance);
-
-	if (_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE)
+	if (_vm->getGameId() == GID_ITE && _sceneNumber == ITE_SCENE_PUZZLE) {
 		_vm->_puzzle->execute();
+	} else {
+		// We probably don't want "followers" to go into scene -1 , 0. At the very
+		// least we don't want garbage to be drawn that early in the ITE intro.
+		if (_sceneNumber > 0)
+			_vm->_actor->updateActorsScene(loadSceneParams.actorsEntrance);
+	}
 
 	if (getFlags() & kSceneFlagShowCursor) {
 		// Activate user interface
-- 
cgit v1.2.3


From fdfb7775a49ec6b93cbaa720b88fee37e052a86c Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 14 May 2015 17:58:31 +0200
Subject: SCI: change qfg2 saurus ride script patch

the original script patch messed up room changes
---
 engines/sci/engine/script_patches.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 4011273ca3..0eefe19854 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2335,29 +2335,37 @@ static const SciScriptPatcherEntry qfg1vgaSignatures[] = {
 //  which finally re-enables controls
 //
 // A fix is difficult to implement. The code in script 20 is generic and used by multiple objects
-//  That's why I have decided to change the responsible globals (66h and A1h) during mountSaurus::changeState(5)
 //
-// This fix could cause issues in case there is a cutscene, that contains ego getting on a saurus and
-//  requires controls not getting re-enabled after getting back up on the saurus.
+// Originally I decided to change the responsible globals (66h and A1h) during mountSaurus::changeState(5).
+//  This worked as far as for controls, but mountSaurus::init changes a few selectors of ego as well, which
+//  won't get restored in that situation, which then messes up room changes and other things.
+//
+// I have now decided to change sheepScript::changeState(2) in script 665 instead.
+//
+// This fix could cause issues in case there is a cutscene, where ego is supposed to get onto the saurus using
+//  sheepScript.
 //
 // Applies to at least: English PC Floppy, English Amiga Floppy
 // Responsible method: mountSaurus::changeState(), mountSaurus::init(), mountSaurus::dispose()
 // Fixes bug: #5156
 static const uint16 qfg2SignatureSaurusFreeze[] = {
 	0x3c,                               // dup
-	0x35, 0x05,                         // ldi 5
+	0x35, 0x02,                         // ldi 5
 	SIG_MAGICDWORD,
 	0x1a,                               // eq?
-	0x30, SIG_UINT16(0x004e),           // bnt [ret]
-	0x39, SIG_SELECTOR8(contains),      // pushi [selector contains]
-	0x78,                               // push1
+	0x30, SIG_UINT16(0x0043),           // bnt [ret]
+	0x76,                               // push0
+	SIG_ADDTOOFFSET(+61),               // skip to dispose code
+	0x39, SIG_SELECTOR8(dispose),       // pushi "dispose"
+	0x76,                               // push0
+	0x54, 0x04,                         // self 04
 	SIG_END
 };
 
 static const uint16 qfg2PatchSaurusFreeze[] = {
-	0x35, 0x01,                         // ldi 1
-	0xa1, 0x66,                         // sag 66h
-	0xa0, SIG_UINT16(0x00a1),           // sag 00A1h
+	0x81, 0x66,                         // lag 66h
+	0x2e, SIG_UINT16(0x0040),           // bt [to dispose code]
+	0x35, 0x00,                         // ldi 0 (waste 2 bytes)
 	PATCH_END
 };
 
@@ -2441,7 +2449,7 @@ static const uint16 qfg2PatchImportCharType[] = {
 
 //          script, description,                                      signature                    patch
 static const SciScriptPatcherEntry qfg2Signatures[] = {
-	{  true,   660, "getting back on saurus freeze fix",           1, qfg2SignatureSaurusFreeze,   qfg2PatchSaurusFreeze },
+	{  true,   665, "getting back on saurus freeze fix",           1, qfg2SignatureSaurusFreeze,   qfg2PatchSaurusFreeze },
 	{  true,   805, "import character type fix",                   1, qfg2SignatureImportCharType, qfg2PatchImportCharType },
 	{  true,   944, "import dialog continuous calls",              1, qfg2SignatureImportDialog,   qfg2PatchImportDialog },
 	SCI_SIGNATUREENTRY_TERMINATOR
-- 
cgit v1.2.3


From bfab4c4cbe3d857ef6a067440ea17baa8b30ec4d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 14 May 2015 20:33:21 +0200
Subject: SCI: debug commands scro, scrs and script_said

implement string collecting for SCI3
implement object offset collecting for SCI0-SCI2
implement said-str offset collecting for SCI0-SCI1
add new debug command scro / script_objects
add new debug command script_said
string without terminating NUL now a warning
the latter happens in qfg2 for amiga room 84
---
 engines/sci/console.cpp       | 151 ++++++++++++++++++++----
 engines/sci/console.h         |   3 +
 engines/sci/engine/script.cpp | 259 ++++++++++++++++++++++++++++++++++--------
 engines/sci/engine/script.h   |  26 ++++-
 4 files changed, 369 insertions(+), 70 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index dc017a7a70..c7069709d4 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -209,8 +209,11 @@ Console::Console(SciEngine *engine) : GUI::Debugger(),
 	registerCmd("bpe",				WRAP_METHOD(Console, cmdBreakpointFunction));		// alias
 	// VM
 	registerCmd("script_steps",		WRAP_METHOD(Console, cmdScriptSteps));
+	registerCmd("script_objects",   WRAP_METHOD(Console, cmdScriptObjects));
+	registerCmd("scro",             WRAP_METHOD(Console, cmdScriptObjects));
 	registerCmd("script_strings",   WRAP_METHOD(Console, cmdScriptStrings));
 	registerCmd("scrs",             WRAP_METHOD(Console, cmdScriptStrings));
+	registerCmd("script_said",      WRAP_METHOD(Console, cmdScriptSaid));
 	registerCmd("vm_varlist",			WRAP_METHOD(Console, cmdVMVarlist));
 	registerCmd("vmvarlist",			WRAP_METHOD(Console, cmdVMVarlist));				// alias
 	registerCmd("vl",					WRAP_METHOD(Console, cmdVMVarlist));				// alias
@@ -2830,28 +2833,85 @@ bool Console::cmdScriptSteps(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdScriptStrings(int argc, const char **argv) {
-	SegManager *segMan = _engine->_gamestate->_segMan;
+bool Console::cmdScriptObjects(int argc, const char **argv) {
 	int curScriptNr = -1;
-	SegmentId curSegmentNr;
-	Common::List<SegmentId> segmentNrList;
 
-	SegmentType curSegmentType = SEG_TYPE_INVALID;
-	SegmentObj *curSegmentObj = NULL;
-	Script *curScriptObj = NULL;
+	if (argc < 2) {
+		debugPrintf("Shows all objects inside a specified script.\n");
+		debugPrintf("Usage: %s <script number>\n", argv[0]);
+		debugPrintf("Example: %s 999\n", argv[0]);
+		debugPrintf("<script number> may be * to show objects inside all loaded scripts\n");
+		return true;
+	}
+	
+	if (strcmp(argv[1], "*") == 0) {
+		// get said-strings of all currently loaded scripts
+		curScriptNr = -1;
+	} else {
+		curScriptNr = atoi(argv[1]);
+	}
+
+	printOffsets(curScriptNr, SCI_SCR_OFFSET_TYPE_OBJECT);
+	return true;
+}
+
+bool Console::cmdScriptStrings(int argc, const char **argv) {
+	int curScriptNr = -1;
 
 	if (argc < 2) {
-		debugPrintf("Shows the strings inside a specified script.\n");
+		debugPrintf("Shows all strings inside a specified script.\n");
 		debugPrintf("Usage: %s <script number>\n", argv[0]);
 		debugPrintf("Example: %s 999\n", argv[0]);
 		debugPrintf("<script number> may be * to show strings inside all loaded scripts\n");
 		return true;
 	}
 	
-	segmentNrList.clear();
-
 	if (strcmp(argv[1], "*") == 0) {
 		// get strings of all currently loaded scripts
+		curScriptNr = -1;
+	} else {
+		curScriptNr = atoi(argv[1]);
+	}
+
+	printOffsets(curScriptNr, SCI_SCR_OFFSET_TYPE_STRING);
+	return true;
+}
+
+bool Console::cmdScriptSaid(int argc, const char **argv) {
+	int curScriptNr = -1;
+
+	if (argc < 2) {
+		debugPrintf("Shows all said-strings inside a specified script.\n");
+		debugPrintf("Usage: %s <script number>\n", argv[0]);
+		debugPrintf("Example: %s 999\n", argv[0]);
+		debugPrintf("<script number> may be * to show said-strings inside all loaded scripts\n");
+		return true;
+	}
+	
+	if (strcmp(argv[1], "*") == 0) {
+		// get said-strings of all currently loaded scripts
+		curScriptNr = -1;
+	} else {
+		curScriptNr = atoi(argv[1]);
+	}
+
+	printOffsets(curScriptNr, SCI_SCR_OFFSET_TYPE_SAID);
+	return true;
+}
+
+void Console::printOffsets(int scriptNr, uint16 showType) {
+	SegManager *segMan = _engine->_gamestate->_segMan;
+	SegmentId curSegmentNr;
+	Common::List<SegmentId> segmentNrList;
+
+	SegmentType curSegmentType = SEG_TYPE_INVALID;
+	SegmentObj *curSegmentObj = NULL;
+	Script *curScriptObj = NULL;
+	const byte *curScriptData = NULL;
+
+	segmentNrList.clear();
+	if (scriptNr < 0) {
+		// get offsets of all currently loaded scripts
 		for (curSegmentNr = 0; curSegmentNr < segMan->_heap.size(); curSegmentNr++) {
 			curSegmentObj = segMan->_heap[curSegmentNr];
 			if (curSegmentObj && curSegmentObj->getType() == SEG_TYPE_SCRIPT) {
@@ -2860,15 +2920,22 @@ bool Console::cmdScriptStrings(int argc, const char **argv) {
 		}
 
 	} else {
-		curScriptNr = atoi(argv[1]);
-		curSegmentNr = segMan->getScriptSegment(curScriptNr);
+		curSegmentNr = segMan->getScriptSegment(scriptNr);
 		if (!curSegmentNr) {
-			debugPrintf("Script %d is currently not loaded/available\n", curScriptNr);
-			return true;
+			debugPrintf("Script %d is currently not loaded/available\n", scriptNr);
+			return;
 		}
 		segmentNrList.push_back(curSegmentNr);
 	}
 
+	const offsetLookupArrayType *scriptOffsetLookupArray;
+	offsetLookupArrayType::const_iterator arrayIterator;
+	int showTypeCount = 0;
+
+	reg_t objectPos;
+	const char *objectNamePtr = NULL;
+	const byte *stringPtr = NULL;
+
 	Common::List<SegmentId>::iterator it;
 	const Common::List<SegmentId>::iterator end = segmentNrList.end();
 
@@ -2884,15 +2951,61 @@ bool Console::cmdScriptStrings(int argc, const char **argv) {
 			continue;
 
 		curScriptObj = (Script *)curSegmentObj;
-		debugPrintf("=== SCRIPT %d from Segment %d ===\n", curScriptObj->getScriptNumber(), curSegmentNr);
-		debugN("=== SCRIPT %d from Segment %d ===\n", curScriptObj->getScriptNumber(), curSegmentNr);
+		debugPrintf("=== SCRIPT %d inside Segment %d ===\n", curScriptObj->getScriptNumber(), curSegmentNr);
+		debugN("=== SCRIPT %d inside Segment %d ===\n", curScriptObj->getScriptNumber(), curSegmentNr);
+
+		// now print the list
+		scriptOffsetLookupArray = curScriptObj->getOffsetArray();
+		curScriptData = curScriptObj->getBuf();
+		showTypeCount = 0;
+
+		for (arrayIterator = scriptOffsetLookupArray->begin(); arrayIterator != scriptOffsetLookupArray->end(); arrayIterator++) {
+			if (arrayIterator->type == showType) {
+				switch (showType) {
+				case SCI_SCR_OFFSET_TYPE_OBJECT:
+					objectPos = make_reg(curSegmentNr, arrayIterator->offset);
+					objectNamePtr = segMan->getObjectName(objectPos);
+					debugPrintf(" %03d:%04x: %s\n", arrayIterator->id, arrayIterator->offset, objectNamePtr);
+					debugN(" %03d:%04x: %s\n", arrayIterator->id, arrayIterator->offset, objectNamePtr);
+					break;
+				case SCI_SCR_OFFSET_TYPE_STRING:
+					stringPtr = curScriptData + arrayIterator->offset;
+					debugPrintf(" %03d:%04x: '%s' (size %d)\n", arrayIterator->id, arrayIterator->offset, stringPtr, arrayIterator->stringSize);
+					debugN(" %03d:%04x: '%s' (size %d)\n", arrayIterator->id, arrayIterator->offset, stringPtr, arrayIterator->stringSize);
+					break;
+				case SCI_SCR_OFFSET_TYPE_SAID:
+					debugPrintf(" %03d:%04x:\n", arrayIterator->id, arrayIterator->offset);
+					debugN(" %03d:%04x:\n", arrayIterator->id, arrayIterator->offset);
+					break;
+				default:
+					break;
+				}
+				showTypeCount++;
+			}
+		}
+
+		if (showTypeCount == 0) {
+			switch (showType) {
+			case SCI_SCR_OFFSET_TYPE_OBJECT:
+				debugPrintf(" no objects\n");
+				debugN(" no objects\n");
+				break;
+			case SCI_SCR_OFFSET_TYPE_STRING:
+				debugPrintf(" no strings\n");
+				debugN(" no strings\n");
+				break;
+			case SCI_SCR_OFFSET_TYPE_SAID:
+				debugPrintf(" no said-strings\n");
+				debugN(" no said-strings\n");
+				break;
+			default:
+				break;
+			}
+		}
 
-		// now print the string list
-		curScriptObj->debugPrintStrings(this);
 		debugPrintf("\n");
 		debugN("\n");
 	}
-	return true;
 }
 
 bool Console::cmdBacktrace(int argc, const char **argv) {
diff --git a/engines/sci/console.h b/engines/sci/console.h
index 00d95b511f..8b10912fbe 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -147,7 +147,9 @@ private:
 	bool cmdBreakpointFunction(int argc, const char **argv);
 	// VM
 	bool cmdScriptSteps(int argc, const char **argv);
+	bool cmdScriptObjects(int argc, const char **argv);
 	bool cmdScriptStrings(int argc, const char **argv);
+	bool cmdScriptSaid(int argc, const char **argv);
 	bool cmdVMVarlist(int argc, const char **argv);
 	bool cmdVMVars(int argc, const char **argv);
 	bool cmdStack(int argc, const char **argv);
@@ -167,6 +169,7 @@ private:
 	void printList(List *list);
 	int printNode(reg_t addr);
 	void hexDumpReg(const reg_t *data, int len, int regsPerLine = 4, int startOffset = 0, bool isArray = false);
+	void printOffsets(int scriptNr, uint16 showType);
 
 private:
 	/**
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 69f52495e0..fbf00abf9b 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -65,7 +65,7 @@ void Script::freeScript() {
 	_lockers = 1;
 	_markedAsDeleted = false;
 	_objects.clear();
-	_stringLookupList.clear();
+	_offsetLookupArray.clear();
 }
 
 void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptPatcher) {
@@ -208,39 +208,41 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 	}
 
 	// find all strings of this script
-	identifyStrings();
+	identifyOffsets();
 }
 
-void Script::identifyStrings() {
-	stringLookupListEntry listEntry;
+void Script::identifyOffsets() {
+	offsetLookupArrayEntry arrayEntry;
 	byte *scriptDataPtr  = NULL;
 	byte *stringStartPtr = NULL;
 	byte *stringDataPtr  = NULL;
 	int scriptDataLeft   = 0;
 	int stringDataLeft   = 0;
 	byte stringDataByte  = 0;
+	uint16 typeObject_id = 0;
+	uint16 typeString_id = 0;
+	uint16 typeSaid_id   = 0;
 
-	_stringLookupList.clear();
-	//stringLookupListType _stringLookupList; // Table of string data, that is inside the currently loaded script
-
+	_offsetLookupArray.clear();
 	if (getSciVersion() < SCI_VERSION_1_1) {
+		// SCI0 + SCI1
 		scriptDataPtr  = _buf;
 		scriptDataLeft = _bufSize;
 
-		// Go through all SCI_OBJ_STRINGS blocks
+		// Go through all blocks
 		if (getSciVersion() == SCI_VERSION_0_EARLY) {
 			if (scriptDataLeft < 2)
-				error("Script::identifyStrings(): unexpected end of script");
+				error("Script::identifyOffsets(): unexpected end of script %d", _nr);
 			scriptDataPtr  += 2;
 			scriptDataLeft -= 2;
 		}
-		
+
 		uint16 blockType;
 		uint16 blockSize;
 
 		do {
 			if (scriptDataLeft < 2)
-				error("Script::identifyStrings(): unexpected end of script");
+				error("Script::identifyOffsets(): unexpected end of script %d", _nr);
 
 			blockType = READ_LE_UINT16(scriptDataPtr);
 			scriptDataPtr  += 2;
@@ -249,29 +251,49 @@ void Script::identifyStrings() {
 				break;
 
 			if (scriptDataLeft < 2)
-				error("Script::identifyStrings(): unexpected end of script");
+				error("Script::identifyOffsets(): unexpected end of script %d", _nr);
 
 			blockSize = READ_LE_UINT16(scriptDataPtr);
 			if (blockSize < 4)
-				error("Script::identifyStrings(): invalid block size");
+				error("Script::identifyOffsets(): invalid block size in script %d", _nr);
 			blockSize      -= 4; // block size includes block-type UINT16 and block-size UINT16
 			scriptDataPtr  += 2;
 			scriptDataLeft -= 2;
 
 			if (scriptDataLeft < blockSize)
-				error("Script::identifyStrings(): invalid block size");
-			
-			if (blockType == SCI_OBJ_STRINGS) {
+				error("Script::identifyOffsets(): invalid block size in script %d", _nr);
+
+			switch (blockType) {
+			case SCI_OBJ_OBJECT:
+			case SCI_OBJ_CLASS:
+				typeObject_id++;
+				arrayEntry.type       = SCI_SCR_OFFSET_TYPE_OBJECT;
+				arrayEntry.id         = typeObject_id;
+				arrayEntry.offset     = scriptDataPtr - _buf + 8; // Calculate offset inside script data (VM uses +8)
+				arrayEntry.stringSize = 0;
+				_offsetLookupArray.push_back(arrayEntry);
+				break;
+
+			case SCI_OBJ_STRINGS:
 				// string block detected, we now grab all NUL terminated strings out of this block
 				stringDataPtr  = scriptDataPtr;
 				stringDataLeft = blockSize;
 
+				arrayEntry.type       = SCI_SCR_OFFSET_TYPE_STRING;
+
 				do {
 					if (stringDataLeft < 1) // no more bytes left
 						break;
 
 					stringStartPtr = stringDataPtr;
-					listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
+
+					if (stringDataLeft == 1) {
+						// only 1 byte left and that byte is a [00], in that case we also exit
+						stringDataByte = *stringStartPtr;
+						if (stringDataByte == 0x00)
+							break;
+					}
+
 					// now look for terminating [NUL]
 					do {
 						stringDataByte = *stringDataPtr;
@@ -279,13 +301,75 @@ void Script::identifyStrings() {
 						stringDataLeft--;
 						if (!stringDataByte) // NUL found, exit this loop
 							break;
+						if (stringDataLeft < 1) {
+							// no more bytes left
+							warning("Script::identifyOffsets(): string without terminating NUL in script %d", _nr);
+							break;
+						}
+					} while (1);
+
+					if (stringDataByte)
+						break;
+
+					typeString_id++;
+					arrayEntry.id         = typeString_id;
+					arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
+					arrayEntry.stringSize = stringDataPtr - stringStartPtr;
+					_offsetLookupArray.push_back(arrayEntry);
+				} while (1);
+				break;
+
+			case SCI_OBJ_SAID:
+				// said block detected, we now try to find every single said "string" inside this block
+				// said strings are terminated with a 0xFF, the string itself may contain words (2 bytes), where
+				//  the second byte of a word may also be a 0xFF.
+				stringDataPtr  = scriptDataPtr;
+				stringDataLeft = blockSize;
+
+				arrayEntry.type       = SCI_SCR_OFFSET_TYPE_SAID;
+
+				do {
+					if (stringDataLeft < 1) // no more bytes left
+						break;
+
+					stringStartPtr = stringDataPtr;
+					if (stringDataLeft == 1) {
+						// only 1 byte left and that byte is a [00], in that case we also exit
+						// happens in some scripts, for example Conquests of Camelot, script 997
+						// may have been a bug in the compiler or just an intentional filler byte
+						stringDataByte = *stringStartPtr;
+						if (stringDataByte == 0x00)
+							break;
+					}
+
+					// now look for terminating 0xFF
+					do {
+						stringDataByte = *stringDataPtr;
+						stringDataPtr++;
+						stringDataLeft--;
+						if (stringDataByte == 0xFF) // Terminator found, exit this loop
+							break;
 						if (stringDataLeft < 1) // no more bytes left
-							error("Script::identifyStrings(): string without terminating NUL");
+							error("Script::identifyOffsets(): said-string without terminator in script %d", _nr);
+						if (stringDataByte < 0xF0) {
+							// Part of a word, skip second byte
+							stringDataPtr++;
+							stringDataLeft--;
+							if (stringDataLeft < 1) // no more bytes left
+								error("Script::identifyOffsets(): said-string without terminator in script %d", _nr);
+						}
 					} while (1);
 
-					listEntry.stringSize = stringDataPtr - stringStartPtr;
-					_stringLookupList.push_back(listEntry);
+					typeSaid_id++;
+					arrayEntry.id         = typeSaid_id;
+					arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
+					arrayEntry.stringSize = 0;
+					_offsetLookupArray.push_back(arrayEntry);
 				} while (1);
+				break;
+
+			default:
+				break;
 			}
 
 			scriptDataPtr  += blockSize;
@@ -293,20 +377,20 @@ void Script::identifyStrings() {
 		} while (1);
 
 	} else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
-		// Strings in SCI1.1 come after the object instances
+		// Strings in SCI1.1 up to SCI2 come after the object instances
 		scriptDataPtr = _heapStart;
 		scriptDataLeft = _heapSize;
 
 		if (scriptDataLeft < 4)
-			error("Script::identifyStrings(): unexpected end of script");
+			error("Script::identifyOffsets(): unexpected end of script in script %d", _nr);
 
 		uint16 endOfStringOffset = READ_SCI11ENDIAN_UINT16(scriptDataPtr);
 		uint16 objectStartOffset = READ_SCI11ENDIAN_UINT16(scriptDataPtr + 2) * 2 + 4;
 
 		if (scriptDataLeft < objectStartOffset)
-			error("Script::identifyStrings(): object start is beyond heap size");
+			error("Script::identifyOffsets(): object start is beyond heap size in script %d", _nr);
 		if (scriptDataLeft < endOfStringOffset)
-			error("Script::identifyStrings(): end of string is beyond heap size");
+			error("Script::identifyOffsets(): end of string is beyond heap size in script %d", _nr);
 
 		byte  *endOfStringPtr    = scriptDataPtr + endOfStringOffset;
 
@@ -316,10 +400,10 @@ void Script::identifyStrings() {
 		uint16 blockType;
 		uint16 blockSize;
 
-		// skip all objects
+		// go through all objects
 		do {
 			if (scriptDataLeft < 2)
-				error("Script::identifyStrings(): unexpected end of script");
+				error("Script::identifyOffsets(): unexpected end of script %d", _nr);
 
 			blockType = READ_SCI11ENDIAN_UINT16(scriptDataPtr);
 			scriptDataPtr  += 2;
@@ -327,15 +411,23 @@ void Script::identifyStrings() {
 			if (blockType != SCRIPT_OBJECT_MAGIC_NUMBER)
 				break;
 
+			// Object found, add offset of object
+			typeObject_id++;
+			arrayEntry.type       = SCI_SCR_OFFSET_TYPE_OBJECT;
+			arrayEntry.id         = typeObject_id;
+			arrayEntry.offset     = scriptDataPtr - _buf - 2; // the VM uses a pointer to the Magic-Number
+			arrayEntry.stringSize = 0;
+			_offsetLookupArray.push_back(arrayEntry);
+
 			if (scriptDataLeft < 2)
-				error("Script::identifyStrings(): unexpected end of script");
+				error("Script::identifyOffsets(): unexpected end of script in script %d", _nr);
 
 			blockSize = READ_SCI11ENDIAN_UINT16(scriptDataPtr) * 2;
 			scriptDataPtr  += 2;
 			scriptDataLeft -= 2;
 			blockSize -= 4; // blocksize contains UINT16 type and UINT16 size
 			if (scriptDataLeft < blockSize)
-				error("Script::identifyStrings(): invalid block size");
+				error("Script::identifyOffsets(): invalid block size in script %d", _nr);
 
 			scriptDataPtr  += blockSize;
 			scriptDataLeft -= blockSize;
@@ -343,17 +435,17 @@ void Script::identifyStrings() {
 
 		// now scriptDataPtr points to right at the start of the strings
 		if (scriptDataPtr > endOfStringPtr)
-			error("Script::identifyStrings(): string block / end-of-string block mismatch");
+			error("Script::identifyOffsets(): string block / end-of-string block mismatch in script %d", _nr);
 
 		stringDataPtr  = scriptDataPtr;
 		stringDataLeft = endOfStringPtr - scriptDataPtr; // Calculate byte count within string-block
 
+		arrayEntry.type       = SCI_SCR_OFFSET_TYPE_STRING;
 		do {
 			if (stringDataLeft < 1) // no more bytes left
 				break;
 
 			stringStartPtr = stringDataPtr;
-			listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
 			// now look for terminating [NUL]
 			do {
 				stringDataByte = *stringDataPtr;
@@ -361,35 +453,112 @@ void Script::identifyStrings() {
 				stringDataLeft--;
 				if (!stringDataByte) // NUL found, exit this loop
 					break;
-				if (stringDataLeft < 1) // no more bytes left
-					error("Script::identifyStrings(): string without terminating NUL");
+				if (stringDataLeft < 1) {
+				    // no more bytes left
+					warning("Script::identifyOffsets(): string without terminating NUL in script %d", _nr);
+					break;
+				}
 			} while (1);
 
-			listEntry.stringSize = stringDataPtr - stringStartPtr;
-			_stringLookupList.push_back(listEntry);
+			if (stringDataByte)
+				break;
+
+			typeString_id++;
+			arrayEntry.id         = typeString_id;
+			arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
+			arrayEntry.stringSize = stringDataPtr - stringStartPtr;
+			_offsetLookupArray.push_back(arrayEntry);
 		} while (1);
 
 	} else if (getSciVersion() == SCI_VERSION_3) {
-		warning("TODO: identifyStrings(): Implement SCI3 variant");
+		// SCI3
+		uint32 sci3stringOffset = 0;
+		uint32 sci3relocationOffset = 0;
+
+		if (_bufSize < 22)
+			error("Script::identifyOffsets(): script %d smaller than expected SCI3-header", _nr);
+
+		sci3stringOffset = READ_LE_UINT32(_buf + 4);
+		sci3relocationOffset = READ_LE_UINT32(_buf + 8);
+
+		if (sci3relocationOffset > _bufSize)
+			error("Script::identifyOffsets(): relocation offset is beyond end of script %d", _nr);
+
+		if (sci3stringOffset > 0) {
+			// string offset set, we expect strings
+			if (sci3stringOffset > _bufSize)
+				error("Script::identifyOffsets(): string offset is beyond end of script %d", _nr);
+
+			if (sci3relocationOffset < sci3stringOffset)
+				error("Script::identifyOffsets(): string offset points beyond relocation offset in script %d", _nr);
+
+			stringDataPtr  = _buf + sci3stringOffset;
+			stringDataLeft = sci3relocationOffset - sci3stringOffset;
+
+			arrayEntry.type       = SCI_SCR_OFFSET_TYPE_STRING;
+
+			do {
+				if (stringDataLeft < 1) // no more bytes left
+					break;
+
+				stringStartPtr = stringDataPtr;
+
+				if (stringDataLeft == 1) {
+					// only 1 byte left and that byte is a [00], in that case we also exit
+					stringDataByte = *stringStartPtr;
+					if (stringDataByte == 0x00)
+						break;
+				}
+
+				// now look for terminating [NUL]
+				do {
+					stringDataByte = *stringDataPtr;
+					stringDataPtr++;
+					stringDataLeft--;
+					if (!stringDataByte) // NUL found, exit this loop
+						break;
+					if (stringDataLeft < 1) {
+						// no more bytes left
+						warning("Script::identifyOffsets(): string without terminating NUL in script %d", _nr);
+						break;
+					}
+				} while (1);
+
+				if (stringDataByte)
+					break;
+
+				typeString_id++;
+				arrayEntry.id         = typeString_id;
+				arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
+				arrayEntry.stringSize = stringDataPtr - stringStartPtr;
+				_offsetLookupArray.push_back(arrayEntry);
+			} while (1);
+		}
+
+		// Figure out more stuff in SCI3 scripts
+		warning("TODO: identifyOffsets(): Implement SCI3 variant");
 		return;
 	}
 }
 
 void Script::debugPrintStrings(Console *con) {
-	stringLookupListType::iterator it;
-	const stringLookupListType::iterator end = _stringLookupList.end();
+	offsetLookupArrayType::iterator it;
+	const offsetLookupArrayType::iterator end = _offsetLookupArray.end();
 	byte *stringPtr;
+	int stringCount = 0;
+
+	for (it = _offsetLookupArray.begin(); it != end; ++it) {
+		if (it->type == SCI_SCR_OFFSET_TYPE_STRING) {
+			stringPtr = _buf + it->offset;
+			con->debugPrintf(" %03d:%04x: '%s' (size %d)\n", it->id, it->offset, stringPtr, it->stringSize);
+			debugN(" %03d:%04x: '%s' (size %d)\n", it->id, it->offset, stringPtr, it->stringSize);
+			stringCount++;
+		}
+	}
 
-	if (!_stringLookupList.size()) {
+	if (stringCount == 0) {
 		con->debugPrintf(" no strings\n");
 		debugN(" no strings\n");
-		return;
-	}
-
-	for (it = _stringLookupList.begin(); it != end; ++it) {
-		stringPtr = _buf + it->ptrOffset;
-		con->debugPrintf(" %04x: '%s' (size %d)\n", it->ptrOffset, stringPtr, it->stringSize);
-		debugN(" %04x: '%s' (size %d)\n", it->ptrOffset, stringPtr, it->stringSize);
 	}
 }
 
diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index fe774aeab5..3f24bb191b 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -49,12 +49,20 @@ enum ScriptObjectTypes {
 
 typedef Common::HashMap<uint16, Object> ObjMap;
 
-struct stringLookupListEntry {
-	uint16    ptrOffset;  // offset of the string
+enum ScriptOffsetEntryTypes {
+	SCI_SCR_OFFSET_TYPE_OBJECT = 0, // classes are handled by this type as well
+	SCI_SCR_OFFSET_TYPE_STRING,
+	SCI_SCR_OFFSET_TYPE_SAID
+};
+
+struct offsetLookupArrayEntry {
+	uint16    type;       // type of entry
+	uint16    id;         // id of this type, first item inside script data is 1, second item is 2, etc.
+	uint32    offset;     // offset of entry within script resource data
 	uint16    stringSize; // size of string, including terminating [NUL]
 };
 
-typedef Common::List<stringLookupListEntry> stringLookupListType;
+typedef Common::Array<offsetLookupArrayEntry> offsetLookupArrayType;
 
 class Script : public SegmentObj {
 private:
@@ -82,7 +90,8 @@ private:
 
 	ObjMap _objects;	/**< Table for objects, contains property variables */
 
-	stringLookupListType _stringLookupList; // Table of string data, that is inside the currently loaded script
+protected:
+	offsetLookupArrayType _offsetLookupArray; // Table of all elements of currently loaded script, that may get pointed to
 
 public:
 	int getLocalsOffset() const { return _localsOffset; }
@@ -257,6 +266,11 @@ public:
 	 */
 	int getCodeBlockOffsetSci3() { return READ_SCI11ENDIAN_UINT32(_buf); }
 
+	/**
+	 * Get the offset array
+	 */
+	const offsetLookupArrayType *getOffsetArray() { return &_offsetLookupArray; };
+
 	/**
 	 * Print string lookup table (list) to debug console
 	 */
@@ -310,9 +324,9 @@ private:
 	LocalVariables *allocLocalsSegment(SegManager *segMan);
 
 	/**
-	 * Identifies strings within script data and set up lookup-table
+	 * Identifies certain offsets within script data and set up lookup-table
 	 */
-	void identifyStrings();
+	void identifyOffsets();
 };
 
 } // End of namespace Sci
-- 
cgit v1.2.3


From 3183ef0854782fcdc8f7c0f32e4a0de4dc6e1c9a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 14 May 2015 20:41:21 +0200
Subject: SCI: add said-details to script_said debug cmd

---
 engines/sci/console.cpp       |  7 ++++++-
 engines/sci/engine/script.cpp | 21 ---------------------
 engines/sci/engine/script.h   |  5 -----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index c7069709d4..1e95393e4d 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -2901,6 +2901,7 @@ bool Console::cmdScriptSaid(int argc, const char **argv) {
 
 void Console::printOffsets(int scriptNr, uint16 showType) {
 	SegManager *segMan = _engine->_gamestate->_segMan;
+	Vocabulary *vocab = _engine->_vocabulary;
 	SegmentId curSegmentNr;
 	Common::List<SegmentId> segmentNrList;
 
@@ -2935,6 +2936,7 @@ void Console::printOffsets(int scriptNr, uint16 showType) {
 	reg_t objectPos;
 	const char *objectNamePtr = NULL;
 	const byte *stringPtr = NULL;
+	const byte *saidPtr = NULL;
 
 	Common::List<SegmentId>::iterator it;
 	const Common::List<SegmentId>::iterator end = segmentNrList.end();
@@ -2974,8 +2976,11 @@ void Console::printOffsets(int scriptNr, uint16 showType) {
 					debugN(" %03d:%04x: '%s' (size %d)\n", arrayIterator->id, arrayIterator->offset, stringPtr, arrayIterator->stringSize);
 					break;
 				case SCI_SCR_OFFSET_TYPE_SAID:
+					saidPtr = curScriptData + arrayIterator->offset;
 					debugPrintf(" %03d:%04x:\n", arrayIterator->id, arrayIterator->offset);
-					debugN(" %03d:%04x:\n", arrayIterator->id, arrayIterator->offset);
+					debugN(" %03d:%04x: ", arrayIterator->id, arrayIterator->offset);
+					vocab->debugDecipherSaidBlock(saidPtr);
+					debugN("\n");
 					break;
 				default:
 					break;
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index fbf00abf9b..f2d00d90dd 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -541,27 +541,6 @@ void Script::identifyOffsets() {
 	}
 }
 
-void Script::debugPrintStrings(Console *con) {
-	offsetLookupArrayType::iterator it;
-	const offsetLookupArrayType::iterator end = _offsetLookupArray.end();
-	byte *stringPtr;
-	int stringCount = 0;
-
-	for (it = _offsetLookupArray.begin(); it != end; ++it) {
-		if (it->type == SCI_SCR_OFFSET_TYPE_STRING) {
-			stringPtr = _buf + it->offset;
-			con->debugPrintf(" %03d:%04x: '%s' (size %d)\n", it->id, it->offset, stringPtr, it->stringSize);
-			debugN(" %03d:%04x: '%s' (size %d)\n", it->id, it->offset, stringPtr, it->stringSize);
-			stringCount++;
-		}
-	}
-
-	if (stringCount == 0) {
-		con->debugPrintf(" no strings\n");
-		debugN(" no strings\n");
-	}
-}
-
 const byte *Script::getSci3ObjectsPointer() {
 	const byte *ptr = 0;
 
diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index 3f24bb191b..abe6409b98 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -271,11 +271,6 @@ public:
 	 */
 	const offsetLookupArrayType *getOffsetArray() { return &_offsetLookupArray; };
 
-	/**
-	 * Print string lookup table (list) to debug console
-	 */
-	void debugPrintStrings(Console *con);
-
 private:
 	/**
 	 * Processes a relocation block within a SCI0-SCI2.1 script
-- 
cgit v1.2.3


From c787560acb27773c7c269869e02d799a3562057d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 14 May 2015 20:58:14 +0200
Subject: SCI: add SCI3 support for debug cmd scro

---
 engines/sci/engine/script.cpp | 57 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index f2d00d90dd..4adb1ea816 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -213,9 +213,9 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 
 void Script::identifyOffsets() {
 	offsetLookupArrayEntry arrayEntry;
-	byte *scriptDataPtr  = NULL;
-	byte *stringStartPtr = NULL;
-	byte *stringDataPtr  = NULL;
+	const byte *scriptDataPtr  = NULL;
+	const byte *stringStartPtr = NULL;
+	const byte *stringDataPtr  = NULL;
 	int scriptDataLeft   = 0;
 	int stringDataLeft   = 0;
 	byte stringDataByte  = 0;
@@ -223,6 +223,9 @@ void Script::identifyOffsets() {
 	uint16 typeString_id = 0;
 	uint16 typeSaid_id   = 0;
 
+	uint16 blockType = 0;
+	uint16 blockSize = 0;
+
 	_offsetLookupArray.clear();
 	if (getSciVersion() < SCI_VERSION_1_1) {
 		// SCI0 + SCI1
@@ -237,9 +240,6 @@ void Script::identifyOffsets() {
 			scriptDataLeft -= 2;
 		}
 
-		uint16 blockType;
-		uint16 blockSize;
-
 		do {
 			if (scriptDataLeft < 2)
 				error("Script::identifyOffsets(): unexpected end of script %d", _nr);
@@ -392,14 +392,11 @@ void Script::identifyOffsets() {
 		if (scriptDataLeft < endOfStringOffset)
 			error("Script::identifyOffsets(): end of string is beyond heap size in script %d", _nr);
 
-		byte  *endOfStringPtr    = scriptDataPtr + endOfStringOffset;
+		const byte *endOfStringPtr    = scriptDataPtr + endOfStringOffset;
 
 		scriptDataPtr  += objectStartOffset;
 		scriptDataLeft -= objectStartOffset;
 
-		uint16 blockType;
-		uint16 blockSize;
-
 		// go through all objects
 		do {
 			if (scriptDataLeft < 2)
@@ -423,6 +420,8 @@ void Script::identifyOffsets() {
 				error("Script::identifyOffsets(): unexpected end of script in script %d", _nr);
 
 			blockSize = READ_SCI11ENDIAN_UINT16(scriptDataPtr) * 2;
+			if (blockSize < 4)
+				error("Script::identifyOffsets(): invalid block size in script %d", _nr);
 			scriptDataPtr  += 2;
 			scriptDataLeft -= 2;
 			blockSize -= 4; // blocksize contains UINT16 type and UINT16 size
@@ -484,6 +483,44 @@ void Script::identifyOffsets() {
 		if (sci3relocationOffset > _bufSize)
 			error("Script::identifyOffsets(): relocation offset is beyond end of script %d", _nr);
 
+		// First we get all the objects
+		scriptDataPtr = getSci3ObjectsPointer();
+		scriptDataLeft = _bufSize - (scriptDataPtr - _buf);
+		do {
+			if (scriptDataLeft < 2)
+				error("Script::identifyOffsets(): unexpected end of script %d", _nr);
+
+			blockType = READ_SCI11ENDIAN_UINT16(scriptDataPtr);
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+			if (blockType != SCRIPT_OBJECT_MAGIC_NUMBER)
+				break;
+
+			// Object found, add offset of object
+			typeObject_id++;
+			arrayEntry.type       = SCI_SCR_OFFSET_TYPE_OBJECT;
+			arrayEntry.id         = typeObject_id;
+			arrayEntry.offset     = scriptDataPtr - _buf - 2; // the VM uses a pointer to the Magic-Number
+			arrayEntry.stringSize = 0;
+			_offsetLookupArray.push_back(arrayEntry);
+
+			if (scriptDataLeft < 2)
+				error("Script::identifyOffsets(): unexpected end of script in script %d", _nr);
+
+			blockSize = READ_SCI11ENDIAN_UINT16(scriptDataPtr);
+			if (blockSize < 4)
+				error("Script::identifyOffsets(): invalid block size in script %d", _nr);
+			scriptDataPtr  += 2;
+			scriptDataLeft -= 2;
+			blockSize -= 4; // blocksize contains UINT16 type and UINT16 size
+			if (scriptDataLeft < blockSize)
+				error("Script::identifyOffsets(): invalid block size in script %d", _nr);
+
+			scriptDataPtr  += blockSize;
+			scriptDataLeft -= blockSize;
+		} while (1);
+
+		// And now we get all the strings
 		if (sci3stringOffset > 0) {
 			// string offset set, we expect strings
 			if (sci3stringOffset > _bufSize)
-- 
cgit v1.2.3


From d3f1a76cc8336983d8bb36538fb8e6c520051935 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 14 May 2015 19:53:03 -0400
Subject: SHERLOCK: Default Files button to show GMM, with engine option to
 disable

---
 engines/sherlock/detection.cpp      | 21 ++++++++++++++++++++-
 engines/sherlock/detection_tables.h |  2 +-
 engines/sherlock/sherlock.cpp       |  4 ++++
 engines/sherlock/sherlock.h         |  1 +
 engines/sherlock/user_interface.cpp | 17 ++++++++++++-----
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 78ab33bfd0..34fd919770 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -25,6 +25,7 @@
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/tattoo/tattoo.h"
 #include "common/system.h"
+#include "common/translation.h"
 #include "engines/advancedDetector.h"
 
 namespace Sherlock {
@@ -57,11 +58,29 @@ static const PlainGameDescriptor sherlockGames[] = {
 	{0, 0}
 };
 
+
+#define GAMEOPTION_ORIGINAL_SAVES	GUIO_GAMEOPTIONS1
+
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_ORIGINAL_SAVES,
+		{
+			_s("Use original savegame dialog"),
+			_s("Files button in-game shows original savegame dialog rather than ScummVM menu"),
+			"OriginalSaves",
+			false
+		}
+	},
+
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
+};
+
 #include "sherlock/detection_tables.h"
 
 class SherlockMetaEngine : public AdvancedMetaEngine {
 public:
-	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription), sherlockGames) {}
+	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription), 
+		sherlockGames, optionsList) {}
 
 	virtual const char *getName() const {
 		return "Sherlock Engine";
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 975b7323ec..8300a0ffcf 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -33,7 +33,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_UNSTABLE | ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOSPEECH)
+			GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES)
 		},
 		GType_SerratedScalpel,
 	},
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a9a17a99f8..41c41473d7 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -48,6 +48,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_useEpilogue2 = false;
 	_loadGameSlot = -1;
 	_canLoadSave = false;
+	_showOriginalSavesDialog = false;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -104,6 +105,9 @@ Common::Error SherlockEngine::run() {
 	// Initialize the engine
 	initialize();
 
+	// Flag for whether to show original saves dialog rather than the ScummVM GMM
+	_showOriginalSavesDialog = ConfMan.hasKey("OriginalSaves") && ConfMan.getBool("OriginalSaves");
+
 	// If requested, load a savegame instead of showing the intro
 	if (ConfMan.hasKey("save_slot")) {
 		int saveSlot = ConfMan.getInt("save_slot");
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 501fdcb292..33e4a45b40 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -108,6 +108,7 @@ public:
 	bool _useEpilogue2;
 	int _loadGameSlot;
 	bool _canLoadSave;
+	bool _showOriginalSavesDialog;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index aa6bf2ba81..85838f8a93 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1420,17 +1420,24 @@ void UserInterface::doMainControl() {
 			break;
 		case 'F':
 			pushButton(10);
-			_menuMode = FILES_MODE;
 
 			// Create a thumbnail of the current screen before the files dialog is shown, in case
 			// the user saves the game
 			saves.createThumbnail();
 
-			// Display the dialog
-			saves.drawInterface();
-
 			_selector = _oldSelector = -1;
-			_windowOpen = true;
+
+			if (_vm->_showOriginalSavesDialog) {
+				// Show the original dialog
+				_menuMode = FILES_MODE;
+				saves.drawInterface();
+				_windowOpen = true;
+			} else {
+				// Show the ScummVM GMM instead
+				_vm->_canLoadSave = true;
+				_vm->openMainMenuDialog();
+				_vm->_canLoadSave = false;
+			}
 			break;
 		case 'S':
 			pushButton(11);
-- 
cgit v1.2.3


From e339cd66c118ad3764639f19381989791ab8932b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 15 May 2015 04:09:55 +0200
Subject: AGI: implement engine option to disable mouse

engine option gets disabled for all Amiga games
also disabled for certain fanmade games, which
require a mouse.
defaults to enabled mouse

Engine options are not shown for previously
detected games until those games get redetected
If there is a way to handle those cases, please
fix.
---
 engines/agi/agi.cpp            |  86 ++++++++++++--------
 engines/agi/agi.h              |   1 +
 engines/agi/detection.cpp      |  50 +++++++++++-
 engines/agi/detection_tables.h | 174 +++++++++++++++++++++++------------------
 4 files changed, 199 insertions(+), 112 deletions(-)

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 1e663ec29a..93a00ecb7e 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -97,50 +97,62 @@ void AgiEngine::processEvents() {
 			}
 			break;
 		case Common::EVENT_LBUTTONDOWN:
-			key = BUTTON_LEFT;
-			_mouse.button = kAgiMouseButtonLeft;
-			keyEnqueue(key);
-			_mouse.x = event.mouse.x;
-			_mouse.y = event.mouse.y;
+			if (_game.mouseEnabled) {
+				key = BUTTON_LEFT;
+				_mouse.button = kAgiMouseButtonLeft;
+				keyEnqueue(key);
+				_mouse.x = event.mouse.x;
+				_mouse.y = event.mouse.y;
+			}
 			break;
 		case Common::EVENT_RBUTTONDOWN:
-			key = BUTTON_RIGHT;
-			_mouse.button = kAgiMouseButtonRight;
-			keyEnqueue(key);
-			_mouse.x = event.mouse.x;
-			_mouse.y = event.mouse.y;
+			if (_game.mouseEnabled) {
+				key = BUTTON_RIGHT;
+				_mouse.button = kAgiMouseButtonRight;
+				keyEnqueue(key);
+				_mouse.x = event.mouse.x;
+				_mouse.y = event.mouse.y;
+			}
 			break;
 		case Common::EVENT_WHEELUP:
-			key = WHEEL_UP;
-			keyEnqueue(key);
+			if (_game.mouseEnabled) {
+				key = WHEEL_UP;
+				keyEnqueue(key);
+			}
 			break;
 		case Common::EVENT_WHEELDOWN:
-			key = WHEEL_DOWN;
-			keyEnqueue(key);
+			if (_game.mouseEnabled) {
+				key = WHEEL_DOWN;
+				keyEnqueue(key);
+			}
 			break;
 		case Common::EVENT_MOUSEMOVE:
-			_mouse.x = event.mouse.x;
-			_mouse.y = event.mouse.y;
-
-			if (!_game.mouseFence.isEmpty()) {
-				if (_mouse.x < _game.mouseFence.left)
-					_mouse.x = _game.mouseFence.left;
-				if (_mouse.x > _game.mouseFence.right)
-					_mouse.x = _game.mouseFence.right;
-				if (_mouse.y < _game.mouseFence.top)
-					_mouse.y = _game.mouseFence.top;
-				if (_mouse.y > _game.mouseFence.bottom)
-					_mouse.y = _game.mouseFence.bottom;
-
-				g_system->warpMouse(_mouse.x, _mouse.y);
+			if (_game.mouseEnabled) {
+				_mouse.x = event.mouse.x;
+				_mouse.y = event.mouse.y;
+
+				if (!_game.mouseFence.isEmpty()) {
+					if (_mouse.x < _game.mouseFence.left)
+						_mouse.x = _game.mouseFence.left;
+					if (_mouse.x > _game.mouseFence.right)
+						_mouse.x = _game.mouseFence.right;
+					if (_mouse.y < _game.mouseFence.top)
+						_mouse.y = _game.mouseFence.top;
+					if (_mouse.y > _game.mouseFence.bottom)
+						_mouse.y = _game.mouseFence.bottom;
+
+					g_system->warpMouse(_mouse.x, _mouse.y);
+				}
 			}
 
 			break;
 		case Common::EVENT_LBUTTONUP:
 		case Common::EVENT_RBUTTONUP:
-			_mouse.button = kAgiMouseButtonUp;
-			_mouse.x = event.mouse.x;
-			_mouse.y = event.mouse.y;
+			if (_game.mouseEnabled) {
+				_mouse.button = kAgiMouseButtonUp;
+				_mouse.x = event.mouse.x;
+				_mouse.y = event.mouse.y;
+			}
 			break;
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_d) {
@@ -496,6 +508,7 @@ AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(sys
 	// Assign default values to the config manager, in case settings are missing
 	ConfMan.registerDefault("originalsaveload", "false");
 	ConfMan.registerDefault("altamigapalette", "false");
+	ConfMan.registerDefault("enablemouse", "true");
 
 	_noSaveLoadAllowed = false;
 
@@ -550,6 +563,13 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
 	memset(&_debug, 0, sizeof(struct AgiDebug));
 	memset(&_mouse, 0, sizeof(struct Mouse));
 
+	_game.mouseEnabled = true;
+	if (!ConfMan.getBool("enablemouse")) {
+		// we actually do disable mouse instead of enabling it in case the option is set
+		//  that's because we do not show the option at all for all Amiga games and certain fanmade games
+		_game.mouseEnabled = false;
+	}
+
 	_game._vm = this;
 
 	_game.clockEnabled = false;
@@ -708,7 +728,9 @@ Common::Error AgiBase::init() {
 }
 
 Common::Error AgiEngine::go() {
-	CursorMan.showMouse(true);
+	if (_game.mouseEnabled) {
+		CursorMan.showMouse(true);
+	}
 	setTotalPlayTime(0);
 
 	if (_game.state < STATE_LOADED) {
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 6256de05d2..2cf70b3c89 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -643,6 +643,7 @@ struct AgiGame {
 	int simpleSave;					/**< select simple savegames */
 
 	Common::Rect mouseFence;		/**< rectangle set by fence.mouse command */
+	bool mouseEnabled;              /**< if mouse is supposed to be active */
 
 	// IF condition handling
 	int testResult;
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 3230b4e5d3..a44053dd14 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -152,8 +152,49 @@ static const ExtraGuiOption agiExtraGuiOptionAmiga = {
 	false
 };
 
+static const ExtraGuiOption agiExtraGuiOptionEnableMouse = {
+	_s("Enable mouse"),
+	_s("Enables mouse. Games, that require a mouse, will have mouse always enabled."),
+	"enablemouse",
+	true
+};
+
 #include "agi/detection_tables.h"
 
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_ORIGINAL_SAVELOAD,
+		{
+			_s("Use original save/load screens"),
+			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			"originalsaveload",
+			false
+		}
+	},
+
+	{
+		GAMEOPTION_AMIGA_ALTERNATIVE_PALETTE,
+		{
+			_s("Use an alternative palette"),
+			_s("Use an alternative palette, common for all Amiga games. This was the old behavior"),
+			"altamigapalette",
+			false
+		}
+	},
+
+	{
+		GAMEOPTION_DISABLE_MOUSE,
+		{
+			_s("Enable mouse"),
+			_s("Enables mouse. Games, that require a mouse, will have mouse always enabled."),
+			"enablemouse",
+			true
+		}
+	},
+
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
+};
+
 using namespace Agi;
 
 class AgiMetaEngine : public AdvancedMetaEngine {
@@ -161,7 +202,7 @@ class AgiMetaEngine : public AdvancedMetaEngine {
 	mutable Common::String	_extra;
 
 public:
-	AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames) {
+	AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) {
 		_singleid = "agi";
 		_guioptions = GUIO1(GUIO_NOSPEECH);
 	}
@@ -175,7 +216,7 @@ public:
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
 	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
-	virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
+	//virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
 	virtual SaveStateList listSaves(const char *target) const;
 	virtual int getMaximumSaveSlot() const;
 	virtual void removeSaveState(const char *target, int slot) const;
@@ -234,6 +275,10 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD
 	return res;
 }
 
+// TODO: original 2 gui engine options are not shown for games, that were detected before our change
+//        because gui-options from the detection-table are saved internally.
+//        I also can't set those 2 options manually in case they were not set by optionsList[]
+#if 0
 const ExtraGuiOptions AgiMetaEngine::getExtraGuiOptions(const Common::String &target) const {
 	ExtraGuiOptions options;
 	options.push_back(agiExtraGuiOption);
@@ -241,6 +286,7 @@ const ExtraGuiOptions AgiMetaEngine::getExtraGuiOptions(const Common::String &ta
 		options.push_back(agiExtraGuiOptionAmiga);
 	return options;
 }
+#endif
 
 SaveStateList AgiMetaEngine::listSaves(const char *target) const {
 	const uint32 AGIflag = MKTAG('A','G','I',':');
diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h
index 2d7fba3507..0ae822a538 100644
--- a/engines/agi/detection_tables.h
+++ b/engines/agi/detection_tables.h
@@ -22,7 +22,16 @@
 
 namespace Agi {
 
-#define GAME_LVFPN(id,extra,fname,md5,size,lang,ver,features,gid,platform,interp) { \
+#define GAMEOPTION_ORIGINAL_SAVELOAD          GUIO_GAMEOPTIONS1
+#define GAMEOPTION_AMIGA_ALTERNATIVE_PALETTE  GUIO_GAMEOPTIONS2
+#define GAMEOPTION_DISABLE_MOUSE               GUIO_GAMEOPTIONS3
+// TODO: properly implement GAMEOPTIONs
+
+#define GAMEOPTIONS_DEFAULT                   GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_DISABLE_MOUSE)
+#define GAMEOPTIONS_AMIGA                     GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD,GAMEOPTION_AMIGA_ALTERNATIVE_PALETTE)
+#define GAMEOPTIONS_FANMADE_MOUSE             GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD)
+
+#define GAME_LVFPN(id,extra,fname,md5,size,lang,ver,features,gid,platform,interp,guioptions) { \
 		{ \
 			id, \
 			extra, \
@@ -30,7 +39,7 @@ namespace Agi {
 			lang, \
 			platform, \
 			ADGF_NO_FLAGS,					\
-			GUIO0()			\
+			guioptions			\
 		}, \
 		gid, \
 		interp, \
@@ -38,7 +47,7 @@ namespace Agi {
 		ver \
 	}
 
-#define GAME_LVFPNF(id,name,fname,md5,size,lang,ver,features,gid,platform,interp) { \
+#define GAME_LVFPNF(id,name,fname,md5,size,lang,ver,features,gid,platform,interp,guioptions) { \
 		{ \
 			id, \
 			name, \
@@ -46,7 +55,7 @@ namespace Agi {
 			lang, \
 			platform, \
 			ADGF_USEEXTRAASTITLE,					\
-			GUIO0()					\
+			guioptions					\
 		}, \
 		gid, \
 		interp, \
@@ -54,43 +63,52 @@ namespace Agi {
 		ver \
 	}
 
-#define BOOTER2(id,extra,fname,md5,size,ver,gid) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,0,gid,Common::kPlatformDOS,GType_V2)
-#define GAME(id,extra,md5,ver,gid) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,0,gid,Common::kPlatformDOS,GType_V2)
-#define GAME3(id,extra,fname,md5,ver,gid) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,0,gid,Common::kPlatformDOS,GType_V3)
+#define BOOTER2(id,extra,fname,md5,size,ver,gid) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,0,gid,Common::kPlatformDOS,GType_V2,GAMEOPTIONS_DEFAULT)
+#define GAME(id,extra,md5,ver,gid) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,0,gid,Common::kPlatformDOS,GType_V2,GAMEOPTIONS_DEFAULT)
+#define GAME3(id,extra,fname,md5,ver,gid) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,0,gid,Common::kPlatformDOS,GType_V3,GAMEOPTIONS_DEFAULT)
 
-#define GAME_P(id,extra,md5,ver,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,0,gid,platform,GType_V2)
+#define GAME_P(id,extra,md5,ver,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,0,gid,platform,GType_V2,GAMEOPTIONS_DEFAULT)
+#define GAME_PO(id,extra,md5,ver,gid,platform,guioptions) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,0,gid,platform,GType_V2,guioptions)
 
-#define GAME_FP(id,extra,md5,ver,flags,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,flags,gid,platform,GType_V2)
+#define GAME_FP(id,extra,md5,ver,flags,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,flags,gid,platform,GType_V2,GAMEOPTIONS_DEFAULT)
+#define GAME_FPO(id,extra,md5,ver,flags,gid,platform,guioptions) GAME_LVFPN(id,extra,"logdir",md5,-1,Common::EN_ANY,ver,flags,gid,platform,GType_V2,guioptions)
 #define GAME_F(id,extra,md5,ver,flags,gid) GAME_FP(id,extra,md5,ver,flags,gid,Common::kPlatformDOS)
+#define GAME_FO(id,extra,md5,ver,flags,gid,guioptions) GAME_FPO(id,extra,md5,ver,flags,gid,Common::kPlatformDOS,guioptions)
 
-#define GAME_PS(id,extra,md5,size,ver,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,size,Common::EN_ANY,ver,0,gid,platform,GType_V2)
+#define GAME_PS(id,extra,md5,size,ver,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,size,Common::EN_ANY,ver,0,gid,platform,GType_V2,GAMEOPTIONS_DEFAULT)
 
-#define GAME_LPS(id,extra,md5,size,lang,ver,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,size,lang,ver,0,gid,platform,GType_V2)
+#define GAME_LPS(id,extra,md5,size,lang,ver,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,size,lang,ver,0,gid,platform,GType_V2,GAMEOPTIONS_DEFAULT)
 
-#define GAME_LFPS(id,extra,md5,size,lang,ver,flags,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,size,lang,ver,flags,gid,platform,GType_V2)
+#define GAME_LFPS(id,extra,md5,size,lang,ver,flags,gid,platform) GAME_LVFPN(id,extra,"logdir",md5,size,lang,ver,flags,gid,platform,GType_V2,GAMEOPTIONS_DEFAULT)
 
-#define GAME3_P(id,extra,fname,md5,ver,flags,gid,platform) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,flags,gid,platform,GType_V3)
+#define GAME3_P(id,extra,fname,md5,ver,flags,gid,platform) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,flags,gid,platform,GType_V3,GAMEOPTIONS_DEFAULT)
+#define GAME3_PO(id,extra,fname,md5,ver,flags,gid,platform,guioptions) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,flags,gid,platform,GType_V3,guioptions)
 
-#define GAMEpre_P(id,extra,fname,md5,ver,gid,platform) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,0,gid,platform,GType_PreAGI)
+#define GAMEpre_P(id,extra,fname,md5,ver,gid,platform) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,0,gid,platform,GType_PreAGI,GAMEOPTIONS_DEFAULT)
+#define GAMEpre_PO(id,extra,fname,md5,ver,gid,platform,guioptions) GAME_LVFPN(id,extra,fname,md5,-1,Common::EN_ANY,ver,0,gid,platform,GType_PreAGI,guioptions)
 
-#define GAMEpre_PS(id,extra,fname,md5,size,ver,gid,platform) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,0,gid,platform,GType_PreAGI)
+#define GAMEpre_PS(id,extra,fname,md5,size,ver,gid,platform) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,0,gid,platform,GType_PreAGI,GAMEOPTIONS_DEFAULT)
 
-#define GAME3_PS(id,extra,fname,md5,size,ver,flags,gid,platform) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,flags,gid,platform,GType_V3)
+#define GAME3_PS(id,extra,fname,md5,size,ver,flags,gid,platform) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,flags,gid,platform,GType_V3,GAMEOPTIONS_DEFAULT)
+#define GAME3_PSO(id,extra,fname,md5,size,ver,flags,gid,platform,guioptions) GAME_LVFPN(id,extra,fname,md5,size,Common::EN_ANY,ver,flags,gid,platform,GType_V3,guioptions)
 
-#define FANMADE_ILVF(id,name,md5,lang,ver,features) GAME_LVFPNF(id,name,"logdir",md5,-1,lang,ver,(GF_FANMADE|features),GID_FANMADE,Common::kPlatformDOS,GType_V2)
+#define FANMADE_ILVFO(id,name,md5,lang,ver,features,guioptions) GAME_LVFPNF(id,name,"logdir",md5,-1,lang,ver,(GF_FANMADE|features),GID_FANMADE,Common::kPlatformDOS,GType_V2,guioptions)
 
-#define FANMADE_ISVP(id,name,md5,size,ver,platform) GAME_LVFPNF(id,name,"logdir",md5,size,Common::EN_ANY,ver,GF_FANMADE,GID_FANMADE,platform,GType_V2)
-#define FANMADE_SVP(name,md5,size,ver,platform) FANMADE_ISVP("agi-fanmade",name,md5,size,ver,platform)
+#define FANMADE_ISVPO(id,name,md5,size,ver,platform,guioptions) GAME_LVFPNF(id,name,"logdir",md5,size,Common::EN_ANY,ver,GF_FANMADE,GID_FANMADE,platform,GType_V2,guioptions)
+#define FANMADE_SVP(name,md5,size,ver,platform) FANMADE_ISVPO("agi-fanmade",name,md5,size,ver,platform,GAMEOPTIONS_DEFAULT)
 
-#define FANMADE_LVF(name,md5,lang,ver,features) FANMADE_ILVF("agi-fanmade",name,md5,lang,ver,features)
+#define FANMADE_LVFO(name,md5,lang,ver,features,guioptions) FANMADE_ILVFO("agi-fanmade",name,md5,lang,ver,features,guioptions)
 
-#define FANMADE_LF(name,md5,lang,features) FANMADE_LVF(name,md5,lang,0x2917,features)
+#define FANMADE_LF(name,md5,lang,features) FANMADE_LVFO(name,md5,lang,0x2917,features,GAMEOPTIONS_DEFAULT)
+#define FANMADE_LFO(name,md5,lang,features,guioptions) FANMADE_LVFO(name,md5,lang,0x2917,features,guioptions)
 #define FANMADE_IF(id,name,md5,features) FANMADE_ILVF(id,name,md5,Common::EN_ANY,0x2917,features)
 
-#define FANMADE_V(name,md5,ver) FANMADE_LVF(name,md5,Common::EN_ANY,ver,0)
+#define FANMADE_V(name,md5,ver) FANMADE_LVFO(name,md5,Common::EN_ANY,ver,0,GAMEOPTIONS_DEFAULT)
 #define FANMADE_F(name,md5,features) FANMADE_LF(name,md5,Common::EN_ANY,features)
+#define FANMADE_FO(name,md5,features,guioptions) FANMADE_LFO(name,md5,Common::EN_ANY,features,guioptions)
 #define FANMADE_L(name,md5,lang) FANMADE_LF(name,md5,lang,0)
 #define FANMADE_I(id,name,md5) FANMADE_IF(id,name,md5,0)
+#define FANMADE_O(name,md5,guioptions) FANMADE_FO(name,md5,0,guioptions)
 
 #define FANMADE(name,md5) FANMADE_F(name,md5,0)
 
@@ -130,7 +148,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO0()
+			GAMEOPTIONS_DEFAULT
 		},
 		GID_BC,
 		GType_V1,
@@ -151,7 +169,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO0()
+			GAMEOPTIONS_DEFAULT
 		},
 		GID_BC,
 		GType_V1,
@@ -172,7 +190,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO0()
+			GAMEOPTIONS_DEFAULT
 		},
 		GID_BC,
 		GType_V1,
@@ -181,7 +199,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	},
 
 	// Black Cauldron (Amiga) 2.00 6/14/87
-	GAME_P("bc", "2.00 1987-06-14", "7b01694af21213b4727bb94476f64eb5", 0x2440, GID_BC, Common::kPlatformAmiga),
+	GAME_PO("bc", "2.00 1987-06-14", "7b01694af21213b4727bb94476f64eb5", 0x2440, GID_BC, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Black Cauldron (Apple IIgs) 1.0O 2/24/89 (CE)
 	// Menus not tested
@@ -210,7 +228,7 @@ static const AGIGameDescription gameDescriptions[] = {
 
 	// Donald Duck's Playground (Amiga) 1.0C
 	// Menus not tested
-	GAME_P("ddp", "1.0C 1987-04-27", "550971d196f65190a5c760d2479406ef", 0x2272, GID_DDP, Common::kPlatformAmiga),
+	GAME_PO("ddp", "1.0C 1987-04-27", "550971d196f65190a5c760d2479406ef", 0x2272, GID_DDP, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Donald Duck's Playground (ST) 1.0A 8/8/86
 	// Menus not tested
@@ -221,7 +239,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME_PS("ddp", "1.0C 1986-06-09", "550971d196f65190a5c760d2479406ef", 132, 0x2272, GID_DDP, Common::kPlatformDOS),
 
 	// Gold Rush! (Amiga) 1.01 1/13/89 aka 2.05 3/9/89	# 2.316
-	GAME3_PS("goldrush", "1.01 1989-01-13 aka 2.05 1989-03-09", "dirs", "a1d4de3e75c2688c1e2ca2634ffc3bd8", 2399, 0x3149, 0, GID_GOLDRUSH, Common::kPlatformAmiga),
+	GAME3_PSO("goldrush", "1.01 1989-01-13 aka 2.05 1989-03-09", "dirs", "a1d4de3e75c2688c1e2ca2634ffc3bd8", 2399, 0x3149, 0, GID_GOLDRUSH, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Gold Rush! (Apple IIgs) 1.0M 2/28/89 (CE) aka 2.01 12/22/88
 	// Menus not tested
@@ -252,7 +270,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_NO_FLAGS,
-			GUIO0()
+			GAMEOPTIONS_DEFAULT
 		},
 		GID_GOLDRUSH,
 		GType_V3,
@@ -269,7 +287,7 @@ static const AGIGameDescription gameDescriptions[] = {
 
 	// King's Quest 1 (Amiga) 1.0U		# 2.082
 	// The original game did not have menus, they are enabled under ScummVM
-	GAME_FP("kq1", "1.0U 1986", "246c695324f1c514aee2b904fa352fad", 0x2440, GF_MENUS, GID_KQ1, Common::kPlatformAmiga),
+	GAME_FPO("kq1", "1.0U 1986", "246c695324f1c514aee2b904fa352fad", 0x2440, GF_MENUS, GID_KQ1, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// King's Quest 1 (ST) 1.0V
 	// The original game did not have menus, they are enabled under ScummVM
@@ -298,7 +316,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME_P("kq2", "2.0A 1988-06-16 (CE)", "5203c8b95250a2ecfee93ddb99414753", 0x2917, GID_KQ2, Common::kPlatformApple2GS),
 
 	// King's Quest 2 (Amiga) 2.0J
-	GAME_P("kq2", "2.0J 1987-01-29", "b866f0fab2fad91433a637a828cfa410", 0x2440, GID_KQ2, Common::kPlatformAmiga),
+	GAME_PO("kq2", "2.0J 1987-01-29", "b866f0fab2fad91433a637a828cfa410", 0x2440, GID_KQ2, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// King's Quest 2 (Mac) 2.0R
 	GAME_P("kq2", "2.0R 1988-03-23", "cbdb0083317c8e7cfb7ac35da4bc7fdc", 0x2440, GID_KQ2, Common::kPlatformMacintosh),
@@ -324,7 +342,7 @@ static const AGIGameDescription gameDescriptions[] = {
 
 	// King's Quest 3 (Amiga) 1.01 11/8/86
 	// The original game did not have menus, they are enabled under ScummVM
-	GAME_FP("kq3", "1.01 1986-11-08", "8ab343306df0e2d98f136be4e8cfd0ef", 0x2440, GF_MENUS, GID_KQ3, Common::kPlatformAmiga),
+	GAME_FPO("kq3", "1.01 1986-11-08", "8ab343306df0e2d98f136be4e8cfd0ef", 0x2440, GF_MENUS, GID_KQ3, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// King's Quest 3 (ST) 1.02 11/18/86
 	// Does not have menus, crashes if menus are enforced. Therefore, ESC pauses the game
@@ -340,7 +358,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	// Original pauses with ESC, has menus accessible with mouse.
 	// ver = 0x3086 -> menus accessible with ESC or mouse, bug #2835581 (KQ3: Game Crash When Leaving Tavern as Fly).
 	// ver = 0x3149 -> menus accessible with mouse, ESC pauses game, bug #2835581 disappears.
-	GAME3_PS("kq3", "2.15 1989-11-15", "dirs", "8e35bded2bc5cf20f5eec2b15523b155", 1805, 0x3149, 0, GID_KQ3, Common::kPlatformAmiga),
+	GAME3_PSO("kq3", "2.15 1989-11-15", "dirs", "8e35bded2bc5cf20f5eec2b15523b155", 1805, 0x3149, 0, GID_KQ3, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// King's Quest 3 (PC) 1.01 11/08/86 [AGI 2.272]
 	// Does not have menus, crashes if menus are enforced. Therefore, ESC pauses the game
@@ -405,7 +423,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME_P("lsl1", "1.04 1987-06-18", "8b579f8673fe9448c2538f5ed9887cf0", 0x2440, GID_LSL1, Common::kPlatformAtariST),
 
 	// Leisure Suit Larry 1 (Amiga) 1.05 6/26/87	# x.yyy
-	GAME_P("lsl1", "1.05 1987-06-26", "3f5d26d8834ca49c147fb60936869d56", 0x2440, GID_LSL1, Common::kPlatformAmiga),
+	GAME_PO("lsl1", "1.05 1987-06-26", "3f5d26d8834ca49c147fb60936869d56", 0x2440, GID_LSL1, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Leisure Suit Larry 1 (IIgs) 1.0E
 	GAME_P("lsl1", "1.0E 1987", "5f9e1dd68d626c6d303131c119582ad4", 0x2440, GID_LSL1, Common::kPlatformApple2GS),
@@ -423,7 +441,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME3_P("mh1", "2.0E 1988-10-05 (CE)", "mhdir", "2f1509f76f24e6e7d213f2dadebbf156", 0x3149, 0, GID_MH1, Common::kPlatformApple2GS),
 
 	// Manhunter NY (Amiga) 1.06 3/18/89
-	GAME3_P("mh1", "1.06 1989-03-18", "dirs", "92c6183042d1c2bb76236236a7d7a847", 0x3149, GF_OLDAMIGAV20, GID_MH1, Common::kPlatformAmiga),
+	GAME3_PO("mh1", "1.06 1989-03-18", "dirs", "92c6183042d1c2bb76236236a7d7a847", 0x3149, GF_OLDAMIGAV20, GID_MH1, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// reported by Filippos (thebluegr) in bugreport #1654500
 	// Manhunter NY (PC 5.25") 1.22 8/31/88 [AGI 3.002.107]
@@ -442,7 +460,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME3_P("mh2", "1.0 1989-07-29", "mh2dir", "5e3581495708b952fea24438a6c7e040", 0x3149, 0, GID_MH1, Common::kPlatformAtariST),
 
 	// Manhunter SF (Amiga) 3.06 8/17/89		# 2.333
-	GAME3_PS("mh2", "3.06 1989-08-17", "dirs", "b412e8a126368b76696696f7632d4c16", 2573, 0x3086, GF_OLDAMIGAV20, GID_MH2, Common::kPlatformAmiga),
+	GAME3_PSO("mh2", "3.06 1989-08-17", "dirs", "b412e8a126368b76696696f7632d4c16", 2573, 0x3086, GF_OLDAMIGAV20, GID_MH2, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Manhunter SF (PC 5.25") 3.03 8/17/89 [AGI 3.002.149]
 	GAME3("mh2", "3.03 1989-08-17 5.25\"", "mh2dir", "b90e4795413c43de469a715fb3c1fa93", 0x3149, GID_MH2),
@@ -464,7 +482,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	// Mixed-Up Mother Goose (Amiga) 1.1
 	// Problematic: crashes
 	// Menus not tested
-	GAME3_PS("mixedup", "1.1 1986-12-10", "dirs", "5c1295fe6daaf95831195ba12894dbd9", 2021, 0x3086, 0, GID_MIXEDUP, Common::kPlatformAmiga),
+	GAME3_PSO("mixedup", "1.1 1986-12-10", "dirs", "5c1295fe6daaf95831195ba12894dbd9", 2021, 0x3086, 0, GID_MIXEDUP, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 #endif
 
 	// Mixed Up Mother Goose (IIgs)
@@ -486,7 +504,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME_P("pq1", "2.0B 1988-04-21", "e7c175918372336461e3811d594f482f", 0x2917, GID_PQ1, Common::kPlatformApple2GS),
 
 	// Police Quest 1 (Amiga) 2.0B 2/22/89	# 2.310
-	GAME3_PS("pq1", "2.0B 1989-02-22", "dirs", "cfa93e5f2aa7378bddd10ad6746a2ffb", 1613, 0x3149, 0, GID_PQ1, Common::kPlatformAmiga),
+	GAME3_PSO("pq1", "2.0B 1989-02-22", "dirs", "cfa93e5f2aa7378bddd10ad6746a2ffb", 1613, 0x3149, 0, GID_PQ1, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Police Quest 1 (IIgs) 2.0A-88318
 	GAME_P("pq1", "2.0A 1988-03-18", "8994e39d0901de3d07cecfb954075bb5", 0x2917, GID_PQ1, Common::kPlatformApple2GS),
@@ -524,7 +542,7 @@ static const AGIGameDescription gameDescriptions[] = {
 
 	// Space Quest 1 (Amiga) 1.2			# 2.082
 	// The original game did not have menus, they are enabled under ScummVM
-	GAME_FP("sq1", "1.2 1986", "0b216d931e95750f1f4837d6a4b821e5", 0x2440, GF_MENUS | GF_OLDAMIGAV20, GID_SQ1, Common::kPlatformAmiga),
+	GAME_FPO("sq1", "1.2 1986", "0b216d931e95750f1f4837d6a4b821e5", 0x2440, GF_MENUS | GF_OLDAMIGAV20, GID_SQ1, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Space Quest 1 (Mac) 1.5D
 	GAME_P("sq1", "1.5D 1987-04-02", "ce88419aadd073d1c6682d859b3d8aa2", 0x2440, GID_SQ1, Common::kPlatformMacintosh),
@@ -570,7 +588,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 			ADGF_NO_FLAGS,
-			GUIO0()
+			GAMEOPTIONS_AMIGA
 		},
 		GID_SQ2,
 		GType_V2,
@@ -616,7 +634,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAMEpre_P("winnie", "", "title.pic", "2e7900c1ccaa7671d65405f6d1efed30", 0x0000, GID_WINNIE, Common::kPlatformDOS),
 
 	// Winnie the Pooh in the Hundred Acre Wood (Amiga)
-	GAMEpre_P("winnie", "", "title", "2e7900c1ccaa7671d65405f6d1efed30", 0x0000, GID_WINNIE, Common::kPlatformAmiga),
+	GAMEpre_PO("winnie", "", "title", "2e7900c1ccaa7671d65405f6d1efed30", 0x0000, GID_WINNIE, Common::kPlatformAmiga, GAMEOPTIONS_AMIGA),
 
 	// Winnie the Pooh in the Hundred Acre Wood (C64)
 	GAMEpre_P("winnie", "", "title.pic", "d4eb97cffc866110f71e1ec9f84fe643", 0x0000, GID_WINNIE, Common::kPlatformC64),
@@ -630,15 +648,15 @@ static const AGIGameDescription gameDescriptions[] = {
 	// Xmas Card 1986 (CoCo3 360k) [AGI 2.072]
 	GAME_PS("xmascard", "", "25ad35e9628fc77e5e0dd35852a272b6", 768, 0x2440, GID_XMASCARD, Common::kPlatformCoCo3),
 
-	FANMADE_F("2 Player Demo", "4279f46b3cebd855132496476b1d2cca", GF_AGIMOUSE),
+	FANMADE_FO("2 Player Demo", "4279f46b3cebd855132496476b1d2cca", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("AGI Combat", "0be6a8a9e19203dcca0067d280798871"),
 	FANMADE("AGI Contest 1 Template", "d879aed25da6fc655564b29567358ae2"),
 	FANMADE("AGI Contest 2 Template", "5a2fb2894207eff36c72f5c1b08bcc07"),
-	FANMADE("AGI Mouse Demo 0.60 demo 1", "c07e2519de674c67386cb2cc6f2e3904"),
-	FANMADE("AGI Mouse Demo 0.60 demo 2", "cc49d8b88ed6faf4f53ce92c84e0fe1b"),
-	FANMADE("AGI Mouse Demo 0.70", "3497c291e4afb6f758e61740678a2aec"),
-	FANMADE_F("AGI Mouse Demo 1.00", "20397f0bf0ef936f416bb321fb768fc7", GF_AGIMOUSE),
-	FANMADE_F("AGI Mouse Demo 1.10", "f4ad396b496d6167635ad0b410312ab8", GF_AGIMOUSE|GF_AGIPAL),
+	FANMADE_O("AGI Mouse Demo 0.60 demo 1", "c07e2519de674c67386cb2cc6f2e3904", GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_O("AGI Mouse Demo 0.60 demo 2", "cc49d8b88ed6faf4f53ce92c84e0fe1b", GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_O("AGI Mouse Demo 0.70", "3497c291e4afb6f758e61740678a2aec", GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("AGI Mouse Demo 1.00", "20397f0bf0ef936f416bb321fb768fc7", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("AGI Mouse Demo 1.10", "f4ad396b496d6167635ad0b410312ab8", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("AGI Piano (v1.0)", "8778b3d89eb93c1d50a70ef06ef10310"),
 	FANMADE("AGI Quest (v1.46-TJ0)", "1cf1a5307c1a0a405f5039354f679814"),
 	GAME("tetris", "", "7a874e2db2162e7a4ce31c9130248d8a", 0x2917, GID_FANMADE),
@@ -657,15 +675,15 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("Al Pond 1 - Al Lives Forever (v1.0)", "e8921c3043b749b056ff51f56d1b451b"),
 	FANMADE("Al Pond 1 - Al Lives Forever (v1.3)", "fb4699474054962e0dbfb4cf12ca52f6"),
 	FANMADE("Apocalyptic Quest (v0.03 Teaser)", "42ced528b67965d3bc3b52c635f94a57"),
-	FANMADE_F("Apocalyptic Quest (v4.00 Alpha 1)", "e15581628d84949b8d352d224ec3184b", GF_AGIMOUSE),
-	FANMADE_F("Apocalyptic Quest (v4.00 Alpha 2)", "0eee850005860e46345b38fea093d194", GF_AGIMOUSE),
-	FANMADE_F("Band Quest (Demo)", "7326abefd793571cc17ed0db647bdf34", GF_AGIMOUSE),
-	FANMADE_F("Band Quest (Early Demo)", "de4758dd34676b248c8301b32d93bc6f", GF_AGIMOUSE),
+	FANMADE_FO("Apocalyptic Quest (v4.00 Alpha 1)", "e15581628d84949b8d352d224ec3184b", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("Apocalyptic Quest (v4.00 Alpha 2)", "0eee850005860e46345b38fea093d194", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("Band Quest (Demo)", "7326abefd793571cc17ed0db647bdf34", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("Band Quest (Early Demo)", "de4758dd34676b248c8301b32d93bc6f", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Beyond the Titanic 2", "9b8de38dc64ffb3f52b7877ea3ebcef9"),
 	FANMADE("Biri Quest 1", "1b08f34f2c43e626c775c9d6649e2f17"),
 	FANMADE("Bob The Farmboy", "e4b7df9d0830addee5af946d380e66d7"),
-	FANMADE_F("Boring Man 1: The Toad to Robinland", "d74481cbd227f67ace37ce6a5493039f", GF_AGIMOUSE),
-	FANMADE_F("Boring Man 2: Ho Man! This Game Sucks!", "250032ba105bdf7c1bc4fed767c2d37e", GF_AGIMOUSE),
+	FANMADE_FO("Boring Man 1: The Toad to Robinland", "d74481cbd227f67ace37ce6a5493039f", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("Boring Man 2: Ho Man! This Game Sucks!", "250032ba105bdf7c1bc4fed767c2d37e", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Botz", "a8fabe4e807adfe5ec02bfec6d983695"),
 	FANMADE("Brian's Quest (v1.0)", "0964aa79b9cdcff7f33a12b1d7e04b9c"),
 	FANMADE("CPU-21 (v1.0)", "35b7cdb4d17e890e4c52018d96e9cbf4"),
@@ -676,12 +694,12 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("Coco Coq (English) - Coco Coq In Grostesteing's Base (v.1.0.3)", "97631f8e710544a58bd6da9e780f9320"),
 	FANMADE_L("Coco Coq (French) - Coco Coq Dans la Base de Grostesteing (v1.0.2)", "ef579ebccfe5e356f9a557eb3b2d8649", Common::FR_FRA),
 	FANMADE("Corby's Murder Mystery (v1.0)", "4ebe62ac24c5a8c7b7898c8eb070efe5"),
-	FANMADE_F("DG: The AGIMouse Adventure (English v1.1)", "efe453b92bc1487ea69fbebede4d5f26", GF_AGIMOUSE|GF_AGIPAL),
-	FANMADE_LF("DG: The AGIMouse Adventure (French v1.1)", "eb3d17ca466d672cbb95947e8d6e846a", Common::FR_FRA, GF_AGIMOUSE|GF_AGIPAL),
+	FANMADE_FO("DG: The AGIMouse Adventure (English v1.1)", "efe453b92bc1487ea69fbebede4d5f26", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_LFO("DG: The AGIMouse Adventure (French v1.1)", "eb3d17ca466d672cbb95947e8d6e846a", Common::FR_FRA, GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("DG: The Adventure Game (English v1.1)", "0d6376d493fa7a21ec4da1a063e12b25"),
 	FANMADE_L("DG: The Adventure Game (French v1.1)", "258bdb3bb8e61c92b71f2f456cc69e23", Common::FR_FRA),
 	FANMADE("Dashiki (16 Colors)", "9b2c7b9b0283ab9f12bedc0cb6770a07"),
-	FANMADE_F("Dashiki (256 Colors)", "c68052bb209e23b39b55ff3d759958e6", GF_AGIMOUSE|GF_AGI256),
+	FANMADE_FO("Dashiki (256 Colors)", "c68052bb209e23b39b55ff3d759958e6", GF_AGIMOUSE|GF_AGI256, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Date Quest 1 (v1.0)", "ba3dcb2600645be53a13170aa1a12e69"),
 	FANMADE("Date Quest 2 (v1.0 Demo)", "1602d6a2874856e928d9a8c8d2d166e9"),
 	FANMADE("Date Quest 2 (v1.0)", "f13f6fc85aa3e6e02b0c20408fb63b47"),
@@ -708,20 +726,20 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("Good Man (demo v3.41)", "3facd8a8f856b7b6e0f6c3200274d88c"),
 
 	GAME_LVFPNF("agi-fanmade", "Groza (russian) [AGDS sample]", "logdir", "421da3a18004122a966d64ab6bd86d2e", -1,
-		Common::RU_RUS, 0x2440, GF_AGDS, GID_FANMADE, Common::kPlatformDOS,GType_V2),
+		Common::RU_RUS, 0x2440, GF_AGDS, GID_FANMADE, Common::kPlatformDOS,GType_V2,GAMEOPTIONS_DEFAULT),
 
 	GAME_LVFPNF("agi-fanmade", "Get Outta Space Quest", "logdir", "aaea5b4a348acb669d13b0e6f22d4dc9", -1,
-		Common::EN_ANY, 0x2440, GF_FANMADE, GID_GETOUTTASQ, Common::kPlatformDOS,GType_V2),
+		Common::EN_ANY, 0x2440, GF_FANMADE, GID_GETOUTTASQ, Common::kPlatformDOS,GType_V2,GAMEOPTIONS_DEFAULT),
 
-	FANMADE_F("Half-Death - Terror At White-Mesa", "b62c05d0ace878261392073f57ae788c", GF_AGIMOUSE),
+	FANMADE_FO("Half-Death - Terror At White-Mesa", "b62c05d0ace878261392073f57ae788c", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Hank's Quest (v1.0 English) - Victim of Society", "64c15b3d0483d17888129100dc5af213"),
 	FANMADE("Hank's Quest (v1.1 English) - Victim of Society", "86d1f1dd9b0c4858d096e2a60cca8a14"),
 	FANMADE_L("Hank's Quest (v1.81 Dutch) - Slachtoffer Van Het Gebeuren", "41e53972d55ff3dff9e90d15fe1b659f", Common::NL_NLD),
 	FANMADE("Hank's Quest (v1.81 English) - Victim of Society", "7a776383282f62a57c3a960dafca62d1"),
 	FANMADE("Herbao (v0.2)", "6a5186fc8383a9060517403e85214fc2"),
-	FANMADE_F("Hitler's Legacy (v.0004q)", "a412881269ba34584bd0a3268e5a9863", GF_AGIMOUSE),
+	FANMADE_FO("Hitler's Legacy (v.0004q)", "a412881269ba34584bd0a3268e5a9863", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Hobbits", "4a1c1ef3a7901baf0ab45fde0cfadd89"),
-	FANMADE_F("Isabella Coq - A Present For My Dad", "55c6819f2330c4d5d6459874c9f123d9", GF_AGIMOUSE),
+	FANMADE_FO("Isabella Coq - A Present For My Dad", "55c6819f2330c4d5d6459874c9f123d9", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Jack & Julia - VAMPYR", "8aa0b9a26f8d5a4421067ab8cc3706f6"),
 	FANMADE("Jeff's Quest (v.5 alpha Jun 1)", "10f1720eed40c12b02a0f32df3e72ded"),
 	FANMADE("Jeff's Quest (v.5 alpha May 31)", "51ff71c0ed90db4e987a488ed3bf0551"),
@@ -730,8 +748,8 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("Jiggy Jiggy Uh! Uh!", "bc331588a71e7a1c8840f6cc9b9487e4"),
 	FANMADE("Jimmy In: The Alien Attack (v0.1)", "a4e9db0564a494728de7873684a4307c"),
 	FANMADE("Joe McMuffin In \"What's Cooking, Doc\" (v1.0)", "8a3de7e61a99cb605fa6d233dd91c8e1"),
-	FANMADE_LVF("Jolimie, le Village Maudit (v0.5)", "21818501636b3cb8ad5de5c1a66de5c2", Common::FR_FRA, 0x2936, GF_AGIMOUSE|GF_AGIPAL),
-	FANMADE_LVF("Jolimie, le Village Maudit (v1.1)", "68d7aef1161bb5972fe03efdf29ccb7f", Common::FR_FRA, 0x2936, GF_AGIMOUSE|GF_AGIPAL),
+	FANMADE_LVFO("Jolimie, le Village Maudit (v0.5)", "21818501636b3cb8ad5de5c1a66de5c2", Common::FR_FRA, 0x2936, GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_LVFO("Jolimie, le Village Maudit (v1.1)", "68d7aef1161bb5972fe03efdf29ccb7f", Common::FR_FRA, 0x2936, GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Journey Of Chef", "aa0a0b5a6364801ae65fdb96d6741df5"),
 	FANMADE("Jukebox (v1.0)", "c4b9c5528cc67f6ba777033830de7751"),
 	FANMADE("Justin Quest (v1.0 in development)", "103050989da7e0ffdc1c5e1793a4e1ec"),
@@ -747,18 +765,18 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("MD Quest - The Search for Michiel (v0.10)", "2a6fcb21d2b5e4144c38ed817fabe8ee"),
 	FANMADE("Maale Adummin Quest", "ddfbeb33feb7cf78504fe4dba14ec63b"),
 	FANMADE("Monkey Man", "2322d03f997e8cc235d4578efff69cfa"),
-	FANMADE_F("Napalm Quest (v0.5)", "b659afb491d967bb34810d1c6ce22093", GF_AGIMOUSE),
+	FANMADE_FO("Napalm Quest (v0.5)", "b659afb491d967bb34810d1c6ce22093", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Naturette 1 (English v1.2)", "0a75884e7f010974a230bdf269651117"),
 	FANMADE("Naturette 1 (English v1.3)", "f15bbf999ac55ebd404aa1eb84f7c1d9"),
 	FANMADE_L("Naturette 1 (French v1.2)", "d3665622cc41aeb9c7ecf4fa43f20e53", Common::FR_FRA),
-	FANMADE_F("Naturette 2: Daughter of the Moon (v1.0)", "bdf76a45621c7f56d1c9d40292c6137a", GF_AGIMOUSE|GF_AGIPAL),
-	FANMADE_F("Naturette 3: Adventure in Treeworld (v1.0a)", "6dbb0e7fc75fec442e6d9e5a06f1530e", GF_AGIMOUSE|GF_AGIPAL),
-	FANMADE_F("Naturette 4: From a Planet to Another Planet (Not Finished)", "13be8cd9cf35aeff0a39b8757057fbc8", GF_AGIMOUSE),
+	FANMADE_FO("Naturette 2: Daughter of the Moon (v1.0)", "bdf76a45621c7f56d1c9d40292c6137a", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("Naturette 3: Adventure in Treeworld (v1.0a)", "6dbb0e7fc75fec442e6d9e5a06f1530e", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
+	FANMADE_FO("Naturette 4: From a Planet to Another Planet (Not Finished)", "13be8cd9cf35aeff0a39b8757057fbc8", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	// FIXME: Actually Naturette 4 has both English and French language support built into it. How to add that information?
-	FANMADE_F("Naturette 4: From a Planet to Another Planet (2007-10-05)", "8253706b6ef5423a79413b216760297c", GF_AGIMOUSE|GF_AGIPAL),
+	FANMADE_FO("Naturette 4: From a Planet to Another Planet (2007-10-05)", "8253706b6ef5423a79413b216760297c", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("New AGI Hangman Test", "d69c0e9050ccc29fd662b74d9fc73a15"),
 	FANMADE("Nick's Quest - In Pursuit of QuakeMovie (v2.1 Gold)", "e29cbf9222551aee40397fabc83eeca0"),
-	FANMADE_F("Open Mic Night (v0.1)", "70000a2f67aac27d1133d019df70246d", GF_AGIMOUSE|GF_AGIPAL),
+	FANMADE_FO("Open Mic Night (v0.1)", "70000a2f67aac27d1133d019df70246d", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Operation: Recon", "0679ce8405411866ccffc8a6743370d0"),
 	FANMADE("Patrick's Quest (Demo v1.0)", "f254f5b894b98fec5f92acc07fb62841"),
 	FANMADE("Phantasmagoria", "87d20c1c11aee99a4baad3797b63146b"),
@@ -802,14 +820,14 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("Save Santa (v1.3)", "f8afdb6efc5af5e7c0228b44633066af"),
 	FANMADE("Schiller (preview 1)", "ade39dea968c959cfebe1cf935d653e9"),
 	FANMADE("Schiller (preview 2)", "62cd1f8fc758bf6b4aa334e553624cef"),
-	GAME_F("serguei1", "v1.0", "b86725f067e456e10cdbdf5f58e01dec", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE),
+	GAME_FO("serguei1", "v1.0", "b86725f067e456e10cdbdf5f58e01dec", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE, GAMEOPTIONS_FANMADE_MOUSE),
 	// FIXME: The following two entries have identical MD5 checksums?
-	GAME_F("serguei1", "v1.1 2002 Sep 5", "91975c1fb4b13b0f9a8e9ff74731030d", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE),
-	GAME_F("serguei1", "v1.1 2003 Apr 10", "91975c1fb4b13b0f9a8e9ff74731030d", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE),
-	GAME_F("serguei2", "v0.1.1 Demo", "906ccbc2ddedb29b63141acc6d10cd28", 0x2917, GF_FANMADE|GF_AGIMOUSE, GID_FANMADE),
-	GAME_F("serguei2", "v1.3.1 Demo (March 22nd 2008)", "ad1308fcb8f48723cd388e012ebf5e20", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE),
+	GAME_FO("serguei1", "v1.1 2002 Sep 5", "91975c1fb4b13b0f9a8e9ff74731030d", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE, GAMEOPTIONS_FANMADE_MOUSE),
+	GAME_FO("serguei1", "v1.1 2003 Apr 10", "91975c1fb4b13b0f9a8e9ff74731030d", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE, GAMEOPTIONS_FANMADE_MOUSE),
+	GAME_FO("serguei2", "v0.1.1 Demo", "906ccbc2ddedb29b63141acc6d10cd28", 0x2917, GF_FANMADE|GF_AGIMOUSE, GID_FANMADE, GAMEOPTIONS_FANMADE_MOUSE),
+	GAME_FO("serguei2", "v1.3.1 Demo (March 22nd 2008)", "ad1308fcb8f48723cd388e012ebf5e20", 0x2917, GF_FANMADE|GF_AGIMOUSE|GF_AGIPAL, GID_FANMADE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Shifty (v1.0)", "2a07984d27b938364bf6bd243ac75080"),
-	FANMADE_F("Sliding Tile Game (v1.00)", "949bfff5d8a81c3139152eed4d84ca75", GF_AGIMOUSE),
+	FANMADE_FO("Sliding Tile Game (v1.00)", "949bfff5d8a81c3139152eed4d84ca75", GF_AGIMOUSE, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE("Snowboarding Demo (v1.0)", "24bb8f29f1eddb5c0a099705267c86e4"),
 	FANMADE("Solar System Tour", "b5a3d0f392dfd76a6aa63f3d5f578403"),
 	FANMADE("Sorceror's Appraisal", "fe62615557b3cb7b08dd60c9d35efef1"),
@@ -819,7 +837,7 @@ static const AGIGameDescription gameDescriptions[] = {
 	GAME("sqx", "v10.0 Feb 05", "c992ae2f8ab18360404efdf16fa9edd1", 0x2917, GID_FANMADE),
 	GAME("sqx", "v10.0 Jul 18", "812edec45cefad559d190ffde2f9c910", 0x2917, GID_FANMADE),
 	GAME_PS("sqx", "", "f0a59044475a5fa37c055d8c3eb4d1a7", 768, 0x2440, GID_FANMADE, Common::kPlatformCoCo3),
-	FANMADE_F("Space Quest 3.5", "c077bc28d7b36213dd99dc9ecb0147fc", GF_AGIMOUSE|GF_AGIPAL),
+	FANMADE_FO("Space Quest 3.5", "c077bc28d7b36213dd99dc9ecb0147fc", GF_AGIMOUSE|GF_AGIPAL, GAMEOPTIONS_FANMADE_MOUSE),
 	FANMADE_F("Space Trek (v1.0)", "807a1aeadb2ace6968831d36ab5ea37a", GF_CLIPCOORDS),
 	FANMADE("Special Delivery", "88764dfe61126b8e73612c851b510a33"),
 	FANMADE("Speeder Bike Challenge (v1.0)", "2deb25bab379285ca955df398d96c1e7"),
@@ -862,7 +880,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_USEEXTRAASTITLE,
-			GUIO0()
+			GAMEOPTIONS_DEFAULT
 		},
 		GID_FANMADE,
 		GType_V3,
@@ -890,7 +908,7 @@ static AGIGameDescription g_fallbackDesc = {
 		Common::UNK_LANG,
 		Common::kPlatformDOS,
 		ADGF_NO_FLAGS,
-		GUIO0()
+		GAMEOPTIONS_DEFAULT
 	},
 	GID_FANMADE,
 	GType_V2,
-- 
cgit v1.2.3


From b39b15485bbf4e53a248e04423ecd93f990d4740 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 15 May 2015 05:10:08 +0200
Subject: AGI: mouse support cleanup

---
 engines/agi/agi.cpp       |  7 +++----
 engines/agi/detection.cpp | 41 +++--------------------------------------
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 93a00ecb7e..85a8e175bd 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -508,7 +508,7 @@ AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(sys
 	// Assign default values to the config manager, in case settings are missing
 	ConfMan.registerDefault("originalsaveload", "false");
 	ConfMan.registerDefault("altamigapalette", "false");
-	ConfMan.registerDefault("enablemouse", "true");
+	ConfMan.registerDefault("mousesupport", "true");
 
 	_noSaveLoadAllowed = false;
 
@@ -564,9 +564,8 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
 	memset(&_mouse, 0, sizeof(struct Mouse));
 
 	_game.mouseEnabled = true;
-	if (!ConfMan.getBool("enablemouse")) {
-		// we actually do disable mouse instead of enabling it in case the option is set
-		//  that's because we do not show the option at all for all Amiga games and certain fanmade games
+	if (!ConfMan.getBool("mousesupport")) {
+		// we effectively disable the mouse for games, that explicitly do not want mouse support to be enabled
 		_game.mouseEnabled = false;
 	}
 
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index a44053dd14..823ec7be66 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -138,27 +138,6 @@ static const PlainGameDescriptor agiGames[] = {
 	{0, 0}
 };
 
-static const ExtraGuiOption agiExtraGuiOption = {
-	_s("Use original save/load screens"),
-	_s("Use the original save/load screens, instead of the ScummVM ones"),
-	"originalsaveload",
-	false
-};
-
-static const ExtraGuiOption agiExtraGuiOptionAmiga = {
-	_s("Use an alternative palette"),
-	_s("Use an alternative palette, common for all Amiga games. This was the old behavior"),
-	"altamigapalette",
-	false
-};
-
-static const ExtraGuiOption agiExtraGuiOptionEnableMouse = {
-	_s("Enable mouse"),
-	_s("Enables mouse. Games, that require a mouse, will have mouse always enabled."),
-	"enablemouse",
-	true
-};
-
 #include "agi/detection_tables.h"
 
 static const ADExtraGuiOptionsMap optionsList[] = {
@@ -185,9 +164,9 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 	{
 		GAMEOPTION_DISABLE_MOUSE,
 		{
-			_s("Enable mouse"),
-			_s("Enables mouse. Games, that require a mouse, will have mouse always enabled."),
-			"enablemouse",
+			_s("Mouse support"),
+			_s("Enables mouse support. Allows to use mouse for movement and in game menus."),
+			"mousesupport",
 			true
 		}
 	},
@@ -216,7 +195,6 @@ public:
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
 	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
-	//virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
 	virtual SaveStateList listSaves(const char *target) const;
 	virtual int getMaximumSaveSlot() const;
 	virtual void removeSaveState(const char *target, int slot) const;
@@ -275,19 +253,6 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD
 	return res;
 }
 
-// TODO: original 2 gui engine options are not shown for games, that were detected before our change
-//        because gui-options from the detection-table are saved internally.
-//        I also can't set those 2 options manually in case they were not set by optionsList[]
-#if 0
-const ExtraGuiOptions AgiMetaEngine::getExtraGuiOptions(const Common::String &target) const {
-	ExtraGuiOptions options;
-	options.push_back(agiExtraGuiOption);
-	if (target.contains("-amiga"))
-		options.push_back(agiExtraGuiOptionAmiga);
-	return options;
-}
-#endif
-
 SaveStateList AgiMetaEngine::listSaves(const char *target) const {
 	const uint32 AGIflag = MKTAG('A','G','I',':');
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-- 
cgit v1.2.3


From 915e65d949c7beb612207e8229cb1caa6f06f116 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 15 May 2015 05:45:15 +0200
Subject: AGI/SCI: add engine options to README file

---
 README | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README b/README
index 56b0a8423c..6b1a3cf2af 100644
--- a/README
+++ b/README
@@ -2264,6 +2264,10 @@ Sierra games using the AGI engine add the following non-standard keywords:
 
     originalsaveload   bool     If true, the original save/load screens are
                                 used instead of the enhanced ScummVM ones
+    altamigapalette    bool     Use an alternative palette, common for all
+                                Amiga games. This was the old behavior
+    mousesupport       bool     Enables mouse support. Allows to use mouse
+                                for movement and in game menus
 
 Sierra games using the SCI engine add the following non-standard keywords:
 
@@ -2275,6 +2279,12 @@ Sierra games using the SCI engine add the following non-standard keywords:
     native_fb01        bool     If true, the music driver for an IBM Music
                                 Feature card or a Yamaha FB-01 FM synth module
                                 is used for MIDI output
+    use_cdaudio        bool     Use CD audio instead of in-game audio,
+                                when available
+    windows_cursors    bool     Use the Windows cursors (smaller and monochrome)
+                                instead of the DOS ones (King's Quest 6)
+    silver_cursors     bool     Use the alternate set of silver cursors,
+                                instead of the normal golden ones (Space Quest 4)
 
 Broken Sword II adds the following non-standard keywords:
 
-- 
cgit v1.2.3


From 8d2ec6f9fa45fc17d517db36fa688b12eb809681 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 15 May 2015 09:55:35 +0200
Subject: SHERLOCK: Remove a couple of unused variables in inventory

---
 engines/sherlock/inventory.cpp | 5 -----
 engines/sherlock/inventory.h   | 2 --
 2 files changed, 7 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index d8c0104e6c..1997807d15 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -49,8 +49,6 @@ Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(v
 	_invGraphicsLoaded = false;
 	_invIndex = 0;
 	_holdings = 0;
-	_oldFlag = 0;
-	_invFlag = 0;
 	_invMode = INVMODE_EXIT;
 }
 
@@ -215,7 +213,6 @@ void Inventory::drawInventory(int flag) {
 	UserInterface &ui = *_vm->_ui;
 	int tempFlag = flag;
 
-	_oldFlag = 7;
 	loadInv();
 
 	if (flag == 128) {
@@ -257,10 +254,8 @@ void Inventory::drawInventory(int flag) {
 
 	if (flag) {
 		ui._oldKey = INVENTORY_COMMANDS[flag];
-		_oldFlag = flag;
 	} else {
 		ui._oldKey = -1;
-		_invFlag = 6;
 	}
 
 	invCommands(0);
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index f4cea7729a..eb5aebdd7c 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -75,8 +75,6 @@ public:
 	int _holdings;		// Used to hold number of visible items in active inventory.
 						// Since Inventory array also contains some special hidden items
 	void freeGraphics();
-	int _oldFlag;
-	int _invFlag;
 public:
 	Inventory(SherlockEngine *vm);
 	~Inventory();
-- 
cgit v1.2.3


From 404839bda620e27e99d4e9052ff02cbeb40406df Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 15 May 2015 11:13:13 +0200
Subject: TOON: Check for quitting in runEventScript()

This keeps the game from hanging when trying to quit during Jim's
gym demonstration. Hopefully any other effect of it is also good.
---
 engines/toon/toon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 09f865f798..9e2905f454 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -1785,7 +1785,7 @@ int32 ToonEngine::runEventScript(int32 x, int32 y, int32 mode, int32 id, int32 s
 	_currentScriptRegion++;
 
 	_script->start(status, 1);
-	while (_script->run(status))
+	while (_script->run(status) && !_shouldQuit)
 		waitForScriptStep();
 
 	_currentScriptRegion--;
-- 
cgit v1.2.3


From 574675e2e580819e17deadd1e5a882d9bbf24949 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 15 May 2015 15:27:56 +0200
Subject: AGI: added the ability to disable mouse in NEWS

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index a7e7d20ded..651f5eabaa 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ For a more comprehensive changelog of the latest experimental code, see:
  General:
    - Updated Munt MT-32 emulation code to version 1.5.0.
 
+ AGI:
+   - it is now possible to disable mouse support
+      (except for Amiga versions and fanmade games, that require a mouse)
+
  Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
      version (bug #6720).
-- 
cgit v1.2.3


From 2b59aa663533ba30f341e967073ff6d866d5922a Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 1 Feb 2015 00:25:47 +0100
Subject: FULLPIPE: Remove redundant debug output

---
 engines/fullpipe/scene.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 00dd70c1b2..5a3fbe34b6 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -672,11 +672,6 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) {
 
 	debug(1, "_bigPict: %d objlist: %d", _bigPictureArray1Count, _picObjList.size());
 
-	for (uint i = 0; i < _picObjList.size(); i++) {
-		debug(1, "%d: %d", i, ((PictureObject *)_picObjList[i])->_priority);
-	}
-
-
 	if (drawBg && _bigPictureArray1Count && _picObjList.size()) {
 
 		_bigPictureArray[0][0]->getDimensions(&point);
@@ -743,7 +738,6 @@ void Scene::drawContent(int minPri, int maxPri, bool drawBg) {
 	for (uint i = 1; i < _picObjList.size(); i++) {
 		PictureObject *obj = (PictureObject *)_picObjList[i];
 
-		debug(8, "pri: %d", obj->_priority);
 		if (obj->_priority < minPri || obj->_priority >= maxPri)
 			continue;
 
-- 
cgit v1.2.3


From 8ce3bd14639aa82d2063f0b6751c23036c5e9994 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 15 May 2015 20:00:45 +0200
Subject: NEWS: Small style fix.

---
 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 651f5eabaa..7f7397b01b 100644
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,8 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Updated Munt MT-32 emulation code to version 1.5.0.
 
  AGI:
-   - it is now possible to disable mouse support
-      (except for Amiga versions and fanmade games, that require a mouse)
+   - It is now possible to disable mouse support (except for Amiga versions
+     and fanmade games, that require a mouse).
 
  Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
-- 
cgit v1.2.3


From a270c6392b7c098bbe15d496b608017f616ff463 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Fri, 15 May 2015 20:49:32 +0100
Subject: NEWS: Mention the AGI PCjr sound volume fix.

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 7f7397b01b..0811ac4f8d 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  AGI:
    - It is now possible to disable mouse support (except for Amiga versions
      and fanmade games, that require a mouse).
+   - Fix incorrect volume attenuation in PCjr sound code (bug #6858).
 
  Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
-- 
cgit v1.2.3


From 3698ca8cf7e413687a65b72aebef8dc6804a585c Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 15 May 2015 23:46:25 +0200
Subject: SCI: adjust SCI3 offset identify thx lskovlun

---
 engines/sci/engine/script.cpp | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 4adb1ea816..292c0e0efc 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -216,8 +216,8 @@ void Script::identifyOffsets() {
 	const byte *scriptDataPtr  = NULL;
 	const byte *stringStartPtr = NULL;
 	const byte *stringDataPtr  = NULL;
-	int scriptDataLeft   = 0;
-	int stringDataLeft   = 0;
+	uint32 scriptDataLeft   = 0;
+	uint32 stringDataLeft   = 0;
 	byte stringDataByte  = 0;
 	uint16 typeObject_id = 0;
 	uint16 typeString_id = 0;
@@ -471,16 +471,17 @@ void Script::identifyOffsets() {
 
 	} else if (getSciVersion() == SCI_VERSION_3) {
 		// SCI3
-		uint32 sci3stringOffset = 0;
-		uint32 sci3relocationOffset = 0;
+		uint32 sci3StringOffset = 0;
+		uint32 sci3RelocationOffset = 0;
+		uint32 sci3BoundaryOffset = 0;
 
 		if (_bufSize < 22)
 			error("Script::identifyOffsets(): script %d smaller than expected SCI3-header", _nr);
 
-		sci3stringOffset = READ_LE_UINT32(_buf + 4);
-		sci3relocationOffset = READ_LE_UINT32(_buf + 8);
+		sci3StringOffset = READ_LE_UINT32(_buf + 4);
+		sci3RelocationOffset = READ_LE_UINT32(_buf + 8);
 
-		if (sci3relocationOffset > _bufSize)
+		if (sci3RelocationOffset > _bufSize)
 			error("Script::identifyOffsets(): relocation offset is beyond end of script %d", _nr);
 
 		// First we get all the objects
@@ -521,16 +522,16 @@ void Script::identifyOffsets() {
 		} while (1);
 
 		// And now we get all the strings
-		if (sci3stringOffset > 0) {
+		if (sci3StringOffset > 0) {
 			// string offset set, we expect strings
-			if (sci3stringOffset > _bufSize)
+			if (sci3StringOffset > _bufSize)
 				error("Script::identifyOffsets(): string offset is beyond end of script %d", _nr);
 
-			if (sci3relocationOffset < sci3stringOffset)
+			if (sci3RelocationOffset < sci3StringOffset)
 				error("Script::identifyOffsets(): string offset points beyond relocation offset in script %d", _nr);
 
-			stringDataPtr  = _buf + sci3stringOffset;
-			stringDataLeft = sci3relocationOffset - sci3stringOffset;
+			stringDataPtr  = _buf + sci3StringOffset;
+			stringDataLeft = sci3RelocationOffset - sci3StringOffset;
 
 			arrayEntry.type       = SCI_SCR_OFFSET_TYPE_STRING;
 
@@ -569,11 +570,20 @@ void Script::identifyOffsets() {
 				arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
 				arrayEntry.stringSize = stringDataPtr - stringStartPtr;
 				_offsetLookupArray.push_back(arrayEntry);
+
+				// SCI3 seems to have aligned all string on DWORD boundaries
+				sci3BoundaryOffset = stringDataPtr - _buf; // Calculate current offset inside script data
+				sci3BoundaryOffset = sci3BoundaryOffset & 3; // Check boundary offset
+				if (sci3BoundaryOffset) {
+					// lower 2 bits are set? Then we have to adjust the offset
+					sci3BoundaryOffset = 4 - sci3BoundaryOffset;
+					if (stringDataLeft < sci3BoundaryOffset)
+						error("Script::identifyOffsets(): SCI3 string boundary adjustment goes beyond end of string block in script %d", _nr);
+					stringDataLeft -= sci3BoundaryOffset;
+					stringDataPtr += sci3BoundaryOffset;
+				}
 			} while (1);
 		}
-
-		// Figure out more stuff in SCI3 scripts
-		warning("TODO: identifyOffsets(): Implement SCI3 variant");
 		return;
 	}
 }
-- 
cgit v1.2.3


From 07e9262ee7f38b31743d940fa8238dbbaeede864 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 19:36:39 -0400
Subject: SHERLOCK: Change save extra option to use more standard
 originalsaveload

---
 engines/sherlock/detection.cpp | 2 +-
 engines/sherlock/sherlock.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 34fd919770..2804ec1d31 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -67,7 +67,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		{
 			_s("Use original savegame dialog"),
 			_s("Files button in-game shows original savegame dialog rather than ScummVM menu"),
-			"OriginalSaves",
+			"originalsaveload",
 			false
 		}
 	},
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 41c41473d7..a84eedbd04 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -106,7 +106,7 @@ Common::Error SherlockEngine::run() {
 	initialize();
 
 	// Flag for whether to show original saves dialog rather than the ScummVM GMM
-	_showOriginalSavesDialog = ConfMan.hasKey("OriginalSaves") && ConfMan.getBool("OriginalSaves");
+	_showOriginalSavesDialog = ConfMan.hasKey("originalsaveload") && ConfMan.getBool("originalsaveload");
 
 	// If requested, load a savegame instead of showing the intro
 	if (ConfMan.hasKey("save_slot")) {
-- 
cgit v1.2.3


From a77c6dd43f797c33c7537df6e0cd1a79586087b5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 19:40:28 -0400
Subject: SHERLOCK: Fix mismatched alloc/free in decompressed resource buffers

---
 engines/sherlock/decompress.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index b781285471..2157d47eb8 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -40,7 +40,7 @@ Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int
 	uint16 lzWindowPos;
 	uint16 cmd;
 
-	byte *outBuffer = new byte[outSize];
+	byte *outBuffer = (byte *)malloc(outSize);
 	byte *outBufferEnd = outBuffer + outSize;
 	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
 
-- 
cgit v1.2.3


From 07907819c18d075c39158d2d35f5949e13497127 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 19:42:18 -0400
Subject: SHERLOCK: Fix saving mute flags in saveConfig

---
 engines/sherlock/sherlock.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index a84eedbd04..d6fe0c69aa 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -231,9 +231,9 @@ void SherlockEngine::loadConfig() {
  * Saves game configuration information
  */
 void SherlockEngine::saveConfig() {
-	ConfMan.setBool("mute", _sound->_digitized);
-	ConfMan.setBool("music_mute", _sound->_music);
-	ConfMan.setBool("speech_mute", _sound->_voices);
+	ConfMan.setBool("mute", !_sound->_digitized);
+	ConfMan.setBool("music_mute", !_sound->_music);
+	ConfMan.setBool("speech_mute", !_sound->_voices);
 
 	ConfMan.setInt("font", _screen->fontNumber());
 	ConfMan.setBool("fade_style", _screen->_fadeStyle);
-- 
cgit v1.2.3


From d9a7d87b1908da6f249a1b16110ae3fd3cc9ed07 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 19:46:29 -0400
Subject: SHERLOCK: Fix positioning of Quit Yes/No buttons

---
 engines/sherlock/user_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 85838f8a93..1521421c15 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -919,7 +919,7 @@ void UserInterface::doEnvControl() {
 			screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
 			screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
 
-			screen.makeButton(Common::Rect(112, CONTROLS_Y, 150, CONTROLS_Y + 10), 136 - screen.stringWidth("Yes") / 2, "Yes");
+			screen.makeButton(Common::Rect(112, CONTROLS_Y, 160, CONTROLS_Y + 10), 136 - screen.stringWidth("Yes") / 2, "Yes");
 			screen.makeButton(Common::Rect(161, CONTROLS_Y, 209, CONTROLS_Y + 10), 184 - screen.stringWidth("No") / 2, "No");
 			screen.slamArea(112, CONTROLS_Y, 97, 10);
 
-- 
cgit v1.2.3


From 62ce7a9c839f82121c14ce8357d107bc1ba70244 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 20:02:40 -0400
Subject: SHERLOCK: Use ConfMan.registerDefault to simply reading options

---
 engines/sherlock/sherlock.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index d6fe0c69aa..95da79d988 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -106,7 +106,7 @@ Common::Error SherlockEngine::run() {
 	initialize();
 
 	// Flag for whether to show original saves dialog rather than the ScummVM GMM
-	_showOriginalSavesDialog = ConfMan.hasKey("originalsaveload") && ConfMan.getBool("originalsaveload");
+	_showOriginalSavesDialog = ConfMan.getBool("originalsaveload");
 
 	// If requested, load a savegame instead of showing the intro
 	if (ConfMan.hasKey("save_slot")) {
@@ -214,17 +214,18 @@ void SherlockEngine::loadConfig() {
 	// Load sound settings
 	syncSoundSettings();
 
-	// Load other settings
-	if (ConfMan.hasKey("font"))
-		_screen->setFont(ConfMan.getInt("font"));
-	if (ConfMan.hasKey("fade_style"))
-		_screen->_fadeStyle = ConfMan.getBool("fade_style");
-	if (ConfMan.hasKey("help_style"))
-		_ui->_helpStyle = ConfMan.getBool("help_style");
-	if (ConfMan.hasKey("window_style"))
-		_ui->_windowStyle = ConfMan.getInt("window_style");
-	if (ConfMan.hasKey("portraits_on"))
-		_people->_portraitsOn = ConfMan.getBool("portraits_on");
+	ConfMan.registerDefault("font", 1);
+	ConfMan.registerDefault("fade_style", false);
+	ConfMan.registerDefault("help_style", false);
+	ConfMan.registerDefault("window_style", 1);
+	ConfMan.registerDefault("portraits_on", true);
+	ConfMan.registerDefault("originalsaveload", false);
+
+	_screen->setFont(ConfMan.getInt("font"));
+	_screen->_fadeStyle = ConfMan.getBool("fade_style");
+	_ui->_helpStyle = ConfMan.getBool("help_style");
+	_ui->_windowStyle = ConfMan.getInt("window_style");
+	_people->_portraitsOn = ConfMan.getBool("portraits_on");
 }
 
 /**
-- 
cgit v1.2.3


From 95ce29ac7470435dbec167df526cf4ff38fc8805 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 15 May 2015 20:44:12 -0400
Subject: SHERLOCK: Fix random pixel transitions, and make it the default fade
 style

---
 engines/sherlock/screen.cpp   | 2 +-
 engines/sherlock/sherlock.cpp | 3 +++
 engines/sherlock/surface.cpp  | 7 +++++++
 engines/sherlock/surface.h    | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 38bbb93800..cbf18f146f 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -217,7 +217,7 @@ void Screen::randomTransition() {
 		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
 			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset);
 
-		if (idx != 0 && (idx % 100) == 0) {
+		if (idx != 0 && (idx % 300) == 0) {
 			// Ensure there's a full screen dirty rect for the next frame update
 			if (_dirtyRects.empty())
 				addDirtyRect(Common::Rect(0, 0, this->w, this->h));
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 95da79d988..81d461b161 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -129,6 +129,9 @@ Common::Error SherlockEngine::run() {
 		if (shouldQuit())
 			break;
 
+		// Clear the screen
+		_screen->clear();
+
 		// Reset UI flags
 		_ui->reset();
 
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 2dfbdef77f..36e625794c 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -172,4 +172,11 @@ bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
 	return true;
 }
 
+/**
+ * Clear the screen
+ */
+void Surface::clear() {
+	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index d4a1584968..b2a759aa8d 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -53,6 +53,8 @@ public:
 
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
 	void fillRect(const Common::Rect &r, byte color);
+
+	void clear();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From ed3a32a91ab9d1d1880034e1e09de3d16c17ed4a Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Fri, 15 May 2015 23:30:02 -0400
Subject: SDL: Check for NULL when listing available modes via SDL_ListModes

It can be returned when there are no dimensions available for the currently selected pixel format
---
 backends/graphics/openglsdl/openglsdl-graphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index c71b9c9219..53868b86d8 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -57,7 +57,7 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint deskt
 	}
 #else
 	const SDL_Rect *const *availableModes = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);
-	if (availableModes != (void *)-1) {
+	if (availableModes != NULL && availableModes != (void *)-1) {
 		for (;*availableModes; ++availableModes) {
 			const SDL_Rect *mode = *availableModes;
 
-- 
cgit v1.2.3


From 40e019efd45a02261a7dbc69ceaa9188d8c7a269 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Fri, 15 May 2015 23:36:40 -0400
Subject: SDL: Restore the original video mode when unloading the Surface
 graphics manager

We set a custom video mode that might have a different BPP from the default. To ensure that other graphics managers will get the proper results when listing available video modes, we need to restore the initial BPP when unloading.

This fixes an issue when switching to OpenGL on Windows 8 and later. On those OSes, fullscreen OpenGL only has a 32bpp mode. It is correctly listed in the options but we call SLD_SetVideoMode later in the surface graphics manager. When we list the mode again after a switch, the internally selected BPP is still 16 and we fail to find any available fullscreen modes.
---
 backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 12 ++++++++++++
 backends/graphics/surfacesdl/surfacesdl-graphics.h   |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index d08925349a..d74a6082e3 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -144,6 +144,7 @@ SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSou
 #ifdef USE_SDL_DEBUG_FOCUSRECT
 	_enableFocusRectDebugCode(false), _enableFocusRect(false), _focusRect(),
 #endif
+	_originalBitsPerPixel(0),
 	_transactionMode(kTransactionNone) {
 
 	// allocate palette storage
@@ -797,6 +798,12 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
 	} else
 #endif
 		{
+		// Save the original bpp to be able to restore the video mode on unload
+		if (_originalBitsPerPixel == 0) {
+			const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
+			_originalBitsPerPixel = videoInfo->vfmt->BitsPerPixel;
+		}
+
 		_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 16,
 			_videoMode.fullscreen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
 			);
@@ -929,6 +936,11 @@ void SurfaceSdlGraphicsManager::unloadGFXMode() {
 	}
 #endif
 	DestroyScalers();
+
+	// Reset video mode to original
+	// This will ensure that any new graphic manager will use the initial BPP when listing available modes
+	if (_originalBitsPerPixel != 0)
+		SDL_SetVideoMode(_videoMode.screenWidth, _videoMode.screenHeight, _originalBitsPerPixel, _videoMode.fullscreen ? (SDL_FULLSCREEN | SDL_SWSURFACE) : SDL_SWSURFACE);
 }
 
 bool SurfaceSdlGraphicsManager::hotswapGFXMode() {
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h
index 4ba15a304b..2431ce8664 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.h
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h
@@ -236,6 +236,9 @@ protected:
 	};
 	VideoState _videoMode, _oldVideoMode;
 
+	// Original BPP to restore the video mode on unload
+	uint8 _originalBitsPerPixel;
+
 	/** Force full redraw on next updateScreen */
 	bool _forceFull;
 
-- 
cgit v1.2.3


From 8c7f5bf92fc3eadddf2e2dd69548ad9433e7fdb3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 07:18:36 -0400
Subject: SHERLOCK: Fix default fade style option

---
 engines/sherlock/sherlock.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 81d461b161..64fabc78df 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -218,7 +218,7 @@ void SherlockEngine::loadConfig() {
 	syncSoundSettings();
 
 	ConfMan.registerDefault("font", 1);
-	ConfMan.registerDefault("fade_style", false);
+	ConfMan.registerDefault("fade_style", true);
 	ConfMan.registerDefault("help_style", false);
 	ConfMan.registerDefault("window_style", 1);
 	ConfMan.registerDefault("portraits_on", true);
-- 
cgit v1.2.3


From 052e04c00574720192c2975c6549fd33c6a23390 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 08:56:50 -0400
Subject: SHERLOCK: Merged decompression code into Resources class

---
 engines/sherlock/decompress.cpp | 80 -----------------------------------------
 engines/sherlock/decompress.h   | 36 -------------------
 engines/sherlock/module.mk      |  1 -
 engines/sherlock/resources.cpp  | 66 +++++++++++++++++++++++++++++++---
 engines/sherlock/resources.h    |  9 +++--
 engines/sherlock/scene.cpp      | 15 ++++----
 engines/sherlock/sherlock.cpp   |  2 +-
 7 files changed, 77 insertions(+), 132 deletions(-)
 delete mode 100644 engines/sherlock/decompress.cpp
 delete mode 100644 engines/sherlock/decompress.h

diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
deleted file mode 100644
index 2157d47eb8..0000000000
--- a/engines/sherlock/decompress.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/decompress.h"
-
-namespace Sherlock {
-
-/**
- * Decompresses an LZW compressed resource. If no outSize is specified, it will
- * decompress the entire resource. If, however, an explicit size is specified,
- * then it means we're already within a resource, and only want to decompress
- * part of it.
- */
-Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int32 outSize) {
-	if (outSize == -1) {
-		source.seek(4);
-		outSize = source.readSint32LE();
-	}
-
-	byte lzWindow[4096];
-	uint16 lzWindowPos;
-	uint16 cmd;
-
-	byte *outBuffer = (byte *)malloc(outSize);
-	byte *outBufferEnd = outBuffer + outSize;
-	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
-
-	memset(lzWindow, 0xFF, 0xFEE);
-	lzWindowPos = 0xFEE;
-	cmd = 0;
-
-	do {
-		cmd >>= 1;
-		if (!(cmd & 0x100))
-			cmd = source.readByte() | 0xFF00;
-
-		if (cmd & 1) {
-			byte literal = source.readByte();
-			*outBuffer++ = literal;
-			lzWindow[lzWindowPos] = literal;
-			lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
-		} else {
-			int copyPos, copyLen;
-			copyPos = source.readByte();
-			copyLen = source.readByte();
-			copyPos = copyPos | ((copyLen & 0xF0) << 4);
-			copyLen = (copyLen & 0x0F) + 3;
-			while (copyLen--) {
-				byte literal = lzWindow[copyPos];
-				copyPos = (copyPos + 1) & 0x0FFF;
-				*outBuffer++ = literal;
-				lzWindow[lzWindowPos] = literal;
-				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
-			}
-		}
-	} while (outBuffer < outBufferEnd);
-
-	return outS;
-}
-
-} // namespace Sherlock
diff --git a/engines/sherlock/decompress.h b/engines/sherlock/decompress.h
deleted file mode 100644
index 694f56aa65..0000000000
--- a/engines/sherlock/decompress.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_DECOMPRESS_H
-#define SHERLOCK_DECOMPRESS_H
-
-#include "common/memstream.h"
-
-namespace Sherlock {
-
-#include "common/stream.h"
-
-Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int32 outSize = -1);
-
-} // namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 630c4faf32..2ded999ed1 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -5,7 +5,6 @@ MODULE_OBJS = \
 	scalpel/scalpel.o \
 	tattoo/tattoo.o \
 	animation.o \
-	decompress.o \
 	debugger.o \
 	detection.o \
 	events.o \
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index e990013cb3..b5f4f5f6dd 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -21,14 +21,14 @@
  */
 
 #include "sherlock/resources.h"
-#include "sherlock/decompress.h"
 #include "sherlock/screen.h"
 #include "sherlock/sherlock.h"
 #include "common/debug.h"
+#include "common/memstream.h"
 
 namespace Sherlock {
 
-Cache::Cache() {
+Cache::Cache(SherlockEngine *vm): _vm(vm) {
 }
 
 /**
@@ -76,7 +76,7 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream)
 	// Check whether the file is compressed
 	if (signature == MKTAG('L', 'Z', 'V', 26)) {
 		// It's compressed, so decompress the file and store it's data in the cache entry
-		Common::SeekableReadStream *decompressed = decompressLZ(stream);
+		Common::SeekableReadStream *decompressed = _vm->_res->decompressLZ(stream);
 		cacheEntry.resize(decompressed->size());
 		decompressed->read(&cacheEntry[0], decompressed->size());
 
@@ -99,7 +99,7 @@ Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
 
 /*----------------------------------------------------------------*/
 
-Resources::Resources() {
+Resources::Resources(SherlockEngine *vm): _vm(vm), _cache(vm) {
 	_resourceIndex = -1;
 
 	addToCache("vgs.lib");
@@ -404,4 +404,62 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 	}
 }
 
+/**
+ * Decompress an LZW compressed resource
+ */
+Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source) {
+	if (_vm->getGameID() == GType_SerratedScalpel) {
+		uint32 id = source.readUint32BE();
+		assert(id == MKTAG('L', 'Z', 'V', 0x1A));
+	}
+
+	uint32 size = source.readUint32LE();
+	return decompressLZ(source, size);
+}
+
+/**
+ * Decompresses an LZW block of data with a specified output size
+ */
+Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source, uint32 outSize) {
+	byte lzWindow[4096];
+	uint16 lzWindowPos;
+	uint16 cmd;
+
+	byte *outBuffer = (byte *)malloc(outSize);
+	byte *outBufferEnd = outBuffer + outSize;
+	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+
+	memset(lzWindow, 0xFF, 0xFEE);
+	lzWindowPos = 0xFEE;
+	cmd = 0;
+
+	do {
+		cmd >>= 1;
+		if (!(cmd & 0x100))
+			cmd = source.readByte() | 0xFF00;
+
+		if (cmd & 1) {
+			byte literal = source.readByte();
+			*outBuffer++ = literal;
+			lzWindow[lzWindowPos] = literal;
+			lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+		} else {
+			int copyPos, copyLen;
+			copyPos = source.readByte();
+			copyLen = source.readByte();
+			copyPos = copyPos | ((copyLen & 0xF0) << 4);
+			copyLen = (copyLen & 0x0F) + 3;
+			while (copyLen--) {
+				byte literal = lzWindow[copyPos];
+				copyPos = (copyPos + 1) & 0x0FFF;
+				*outBuffer++ = literal;
+				lzWindow[lzWindowPos] = literal;
+				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+			}
+		}
+	} while (outBuffer < outBufferEnd);
+
+	return outS;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index e1f97f1def..d5e83a1745 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -52,9 +52,10 @@ class SherlockEngine;
 
 class Cache {
 private:
+	SherlockEngine *_vm;
 	CacheHash _resources;
 public:
-	Cache();
+	Cache(SherlockEngine *_vm);
 
 	bool isCached(const Common::String &filename) const;
 
@@ -66,13 +67,14 @@ public:
 
 class Resources {
 private:
+	SherlockEngine *_vm;
 	Cache _cache;
 	LibraryIndexes _indexes;
 	int _resourceIndex;
 
 	void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream);
 public:
-	Resources();
+	Resources(SherlockEngine *vm);
 
 	void addToCache(const Common::String &filename);
 	void addToCache(const Common::String &filename, const Common::String &libFilename);
@@ -86,6 +88,9 @@ public:
 	bool exists(const Common::String &filename) const;
 
 	int resourceIndex() const;
+
+	static Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, uint32 outSize);
+	Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source);
 };
 
 struct ImageFrame {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 093c305a97..9fbf25ce98 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -23,7 +23,6 @@
 #include "sherlock/scene.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/scalpel/scalpel.h"
-#include "sherlock/decompress.h"
 
 namespace Sherlock {
 
@@ -274,7 +273,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		// Read information
 		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, bgHeader._numImages * 569 +
+			Resources::decompressLZ(*rrmStream, bgHeader._numImages * 569 +
 				bgHeader._descSize + bgHeader._seqSize);
 
 		_bgShapes.resize(bgHeader._numStructs);
@@ -302,7 +301,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 			// Read in the image data
 			Common::SeekableReadStream *imageStream = _lzwMode ?
-				decompressLZ(*rrmStream, bgInfo[idx]._filesize) :
+				Resources::decompressLZ(*rrmStream, bgInfo[idx]._filesize) :
 				rrmStream->readStream(bgInfo[idx]._filesize);
 
 			_images[idx + 1]._images = new ImageFile(*imageStream);
@@ -331,7 +330,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		_cAnim.clear();
 		if (bgHeader._numcAnimations) {
 			Common::SeekableReadStream *canimStream = _lzwMode ?
-				decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
+				Resources::decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
 				rrmStream->readStream(65 * bgHeader._numcAnimations);
 
 			_cAnim.resize(bgHeader._numcAnimations);
@@ -344,7 +343,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Read in the room bounding areas
 		int size = rrmStream->readUint16LE();
 		Common::SeekableReadStream *boundsStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, size);
+			Resources::decompressLZ(*rrmStream, size);
 
 		_zones.resize(size / 10);
 		for (uint idx = 0; idx < _zones.size(); ++idx) {
@@ -371,7 +370,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Read in the walk data
 		size = rrmStream->readUint16LE();
 		Common::SeekableReadStream *walkStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, size);
+			Resources::decompressLZ(*rrmStream, size);
 
 		_walkData.resize(size);
 		walkStream->read(&_walkData[0], size);
@@ -408,7 +407,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		// Read in the background
 		Common::SeekableReadStream *bgStream = !_lzwMode ? rrmStream :
-			decompressLZ(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
+			Resources::decompressLZ(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
 
 		bgStream->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
 
@@ -982,7 +981,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 
 			// Load the canimation into the cache
 			Common::SeekableReadStream *imgStream = !_lzwMode ? rrmStream->readStream(cAnim._size) :
-				decompressLZ(*rrmStream, cAnim._size);
+				Resources::decompressLZ(*rrmStream, cAnim._size);
 			res.addToCache(fname, *imgStream);
 
 			delete imgStream;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 64fabc78df..09a8ef18ef 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -79,7 +79,7 @@ void SherlockEngine::initialize() {
 	ImageFile::setVm(this);
 	Object::setVm(this);
 	Sprite::setVm(this);
-	_res = new Resources();
+	_res = new Resources(this);
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
 	_events = new Events(this);
-- 
cgit v1.2.3


From 96e929f5233b23917169c7d0121e9c1e264455c1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 09:03:53 -0400
Subject: SHERLOCK: Clear screen before transitioning to the map

---
 engines/sherlock/map.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index e178dece0c..7fca4ea5f3 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -140,6 +140,10 @@ int Map::show() {
 	int oldFont = screen.fontNumber();
 	screen.setFont(0);
 
+	// Initial screen clear
+	screen._backBuffer1.clear();
+	screen.clear();
+
 	// Load the entire map
 	ImageFile bigMap("bigmap.vgs");
 	screen.setPalette(bigMap._palette);
-- 
cgit v1.2.3


From 602741172d9e1b187228655f4361f8850d44155b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 09:33:42 -0400
Subject: SHERLOCK: Move caching Scalpel sound libraries from Sound to Scalpel
 engine

---
 engines/sherlock/scalpel/scalpel.cpp | 2 ++
 engines/sherlock/sound.cpp           | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 521aeb338b..eff589874d 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -257,7 +257,9 @@ void ScalpelEngine::initialize() {
 	// Add some more files to the cache
 	_res->addToCache("portrait.lib");
 	_res->addToCache("sequence.txt");
+	_res->addToCache("EPILOGUE.SND");
 	_res->addToCache("snd.snd");
+	_res->addToCache("title.snd");
 
 	// Load the map co-ordinates for each scene and sequence data
 	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 001907917f..3a308644a8 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -45,8 +45,6 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_speechOn = true;
 
 	_vm->_res->addToCache("MUSIC.LIB");
-	_vm->_res->addToCache("TITLE.SND");
-	_vm->_res->addToCache("EPILOGUE.SND");
 }
 
 /**
-- 
cgit v1.2.3


From 7897b72f655c8f65fd206aea12cfd06921d75124 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 10:52:38 -0400
Subject: SHERLOCK: Fix decompression for Rose Tattoo

---
 engines/sherlock/resources.cpp | 46 ++++++++++++++++++++++++++++--------------
 engines/sherlock/resources.h   |  4 +++-
 engines/sherlock/scene.cpp     |  4 +---
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index bff80c2347..02030119c0 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -76,7 +76,7 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream)
 	// Check whether the file is compressed
 	if (signature == MKTAG('L', 'Z', 'V', 26)) {
 		// It's compressed, so decompress the file and store it's data in the cache entry
-		Common::SeekableReadStream *decompressed = _vm->_res->decompressLZ(stream);
+		Common::SeekableReadStream *decompressed = _vm->_res->decompress(stream);
 		cacheEntry.resize(decompressed->size());
 		decompressed->read(&cacheEntry[0], decompressed->size());
 
@@ -170,7 +170,7 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 			if (resStream->readUint32BE() == MKTAG('L', 'Z', 'V', 26)) {
 				resStream->seek(0);
 				// It's compressed, so decompress the sub-file and return it
-				Common::SeekableReadStream *decompressed = decompressLZ(*resStream);
+				Common::SeekableReadStream *decompressed = decompress(*resStream);
 				delete stream;
 				delete resStream;
 				return decompressed;
@@ -413,27 +413,45 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 /**
  * Decompress an LZW compressed resource
  */
-Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source) {
-	if (_vm->getGameID() == GType_SerratedScalpel) {
-		uint32 id = source.readUint32BE();
-		assert(id == MKTAG('L', 'Z', 'V', 0x1A));
-	}
+Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &source) {
+	// This variation can't be used by Rose Tattoo, since compressed resources include the input size,
+	// not the output size. Which means their decompression has to be done via passed buffers
+	assert(_vm->getGameID() == GType_SerratedScalpel);
+
+	uint32 id = source.readUint32BE();
+	assert(id == MKTAG('L', 'Z', 'V', 0x1A));
+
+	uint32 outputSize = source.readUint32LE();
+	return decompressLZ(source, outputSize);
+}
+
+/**
+ * Decompress an LZW compressed resource
+ */
+void Resources::decompress(Common::SeekableReadStream &source, byte *buffer, uint32 outSize) {
+	assert(_vm->getGameID() == GType_RoseTattoo);
 
-	uint32 size = source.readUint32LE();
-	return decompressLZ(source, size);
+	uint32 inputSize = source.readUint32LE();
+	decompressLZ(source, buffer, outSize, inputSize);
 }
 
 /**
  * Decompresses an LZW block of data with a specified output size
  */
 Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source, uint32 outSize) {
+	byte *outBuffer = (byte *)malloc(outSize);
+	Common::MemoryReadStream *outStream = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+
+	decompressLZ(source, outSize);
+	return outStream;
+}
+
+void Resources::decompressLZ(Common::SeekableReadStream &source, byte *outBuffer, int32 outSize, int32 inSize) {
 	byte lzWindow[4096];
 	uint16 lzWindowPos;
 	uint16 cmd;
-
-	byte *outBuffer = (byte *)malloc(outSize);
 	byte *outBufferEnd = outBuffer + outSize;
-	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+	uint32 endPos = source.pos() + inSize;
 
 	memset(lzWindow, 0xFF, 0xFEE);
 	lzWindowPos = 0xFEE;
@@ -463,9 +481,7 @@ Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &
 				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
 			}
 		}
-	} while (outBuffer < outBufferEnd);
-
-	return outS;
+	} while ((!outSize || outBuffer < outBufferEnd) && (!inSize || source.pos() < endPos));
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 041f1c64a9..0765ce4642 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -90,8 +90,10 @@ public:
 
 	int resourceIndex() const;
 
+	Common::SeekableReadStream *decompress(Common::SeekableReadStream &source);
+	void decompress(Common::SeekableReadStream &source, byte *buffer, uint32 outSize);
+	static void decompressLZ(Common::SeekableReadStream &source, byte *outBuffer, int32 outSize, int32 inSize);
 	static Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, uint32 outSize);
-	Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source);
 };
 
 struct ImageFrame {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 0a25d3dd0f..e473217ba9 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -303,9 +303,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 			// Read in background
 			if (_lzwMode) {
-				Common::SeekableReadStream *stream = res.decompressLZ(*rrmStream);
-				stream->read(screen._backBuffer1.getPixels(), stream->size());
-				delete stream;
+				res.decompress(*rrmStream, (byte *)screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT);
 			} else {
 				rrmStream->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT);
 			}
-- 
cgit v1.2.3


From c30094433591a6f1ac5980875876f5c51f452ebf Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 16 May 2015 16:57:44 +0200
Subject: SDL: Add TODO about fullscreen modes to OpenGL SDL code.

---
 backends/graphics/openglsdl/openglsdl-graphics.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 53868b86d8..a2b172f14a 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -57,6 +57,9 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(uint desktopWidth, uint deskt
 	}
 #else
 	const SDL_Rect *const *availableModes = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);
+	// TODO: NULL means that there are no fullscreen modes supported. We
+	// should probably use this information and disable any fullscreen support
+	// in this case.
 	if (availableModes != NULL && availableModes != (void *)-1) {
 		for (;*availableModes; ++availableModes) {
 			const SDL_Rect *mode = *availableModes;
-- 
cgit v1.2.3


From 5f5051d7be5317153ae079c0c9c32ec2008c4a2c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 12:27:58 -0400
Subject: SHERLOCK: Scene loading for shapes, desc, scripts for Rose Tattoo

---
 engines/sherlock/resources.cpp | 20 ++++++++++++----
 engines/sherlock/resources.h   |  1 +
 engines/sherlock/scene.cpp     | 54 ++++++++++++++++++++++++++++++------------
 3 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 02030119c0..9acba0ba2f 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -425,13 +425,25 @@ Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &so
 	return decompressLZ(source, outputSize);
 }
 
+/**
+ * Decompress an LZW compressed resource
+ */
+Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &source, uint32 outSize) {
+	int inSize = (_vm->getGameID() == GType_RoseTattoo) ? source.readUint32LE() : -1;
+	byte *outBuffer = (byte *)malloc(outSize);
+	Common::MemoryReadStream *outStream = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+
+	decompressLZ(source, outBuffer, outSize, inSize);
+
+	return outStream;
+}
+
 /**
  * Decompress an LZW compressed resource
  */
 void Resources::decompress(Common::SeekableReadStream &source, byte *buffer, uint32 outSize) {
-	assert(_vm->getGameID() == GType_RoseTattoo);
+	int inputSize = (_vm->getGameID() == GType_RoseTattoo) ? source.readUint32LE() : -1;
 
-	uint32 inputSize = source.readUint32LE();
 	decompressLZ(source, buffer, outSize, inputSize);
 }
 
@@ -442,7 +454,7 @@ Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &
 	byte *outBuffer = (byte *)malloc(outSize);
 	Common::MemoryReadStream *outStream = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
 
-	decompressLZ(source, outSize);
+	decompressLZ(source, outBuffer, outSize, -1);
 	return outStream;
 }
 
@@ -451,7 +463,7 @@ void Resources::decompressLZ(Common::SeekableReadStream &source, byte *outBuffer
 	uint16 lzWindowPos;
 	uint16 cmd;
 	byte *outBufferEnd = outBuffer + outSize;
-	uint32 endPos = source.pos() + inSize;
+	int32 endPos = source.pos() + inSize;
 
 	memset(lzWindow, 0xFF, 0xFEE);
 	lzWindowPos = 0xFEE;
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 0765ce4642..a3208520ea 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -91,6 +91,7 @@ public:
 	int resourceIndex() const;
 
 	Common::SeekableReadStream *decompress(Common::SeekableReadStream &source);
+	Common::SeekableReadStream *decompress(Common::SeekableReadStream &source, uint32 outSize);
 	void decompress(Common::SeekableReadStream &source, byte *buffer, uint32 outSize);
 	static void decompressLZ(Common::SeekableReadStream &source, byte *outBuffer, int32 outSize, int32 inSize);
 	static Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, uint32 outSize);
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e473217ba9..54155db4bb 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -316,28 +316,52 @@ bool Scene::loadScene(const Common::String &filename) {
 			bgInfo[idx].load(*rrmStream);
 
 		// Read information
-		int shapeSize = _vm->getGameID() == GType_SerratedScalpel ? 569 : 591;
-		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-			Resources::decompressLZ(*rrmStream, bgHeader._numImages * shapeSize +
-				bgHeader._descSize + bgHeader._seqSize);
+		if (_vm->getGameID() == GType_SerratedScalpel) {
+			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
+				res.decompress(*rrmStream, bgHeader._numImages * 569 + bgHeader._descSize + bgHeader._seqSize);
+
+			_bgShapes.resize(bgHeader._numStructs);
+			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
+				_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
+
+			if (bgHeader._descSize) {
+				_descText.resize(bgHeader._descSize);
+				infoStream->read(&_descText[0], bgHeader._descSize);
+			}
+
+			if (bgHeader._seqSize) {
+				_sequenceBuffer.resize(bgHeader._seqSize);
+				infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
+			}
+
+			if (_lzwMode)
+				delete infoStream;
+		} else {
+			// Load shapes
+			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream : res.decompress(*rrmStream, bgHeader._numImages * 625);
+
+			_bgShapes.resize(bgHeader._numStructs);
+			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
+				_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
 
-		_bgShapes.resize(bgHeader._numStructs);
-		for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-			_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
+			if (_lzwMode)
+				delete infoStream;
 
-		if (bgHeader._descSize) {
+			// Load description text
 			_descText.resize(bgHeader._descSize);
-			infoStream->read(&_descText[0], bgHeader._descSize);
-		}
+			if (_lzwMode)
+				res.decompress(*rrmStream, (byte *)&_descText[0], bgHeader._descSize);
+			else
+				rrmStream->read(&_descText[0], bgHeader._descSize);
 
-		if (bgHeader._seqSize) {
+			// Load sequences
 			_sequenceBuffer.resize(bgHeader._seqSize);
-			infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
+			if (_lzwMode)
+				res.decompress(*rrmStream, &_sequenceBuffer[0], bgHeader._seqSize);
+			else
+				rrmStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
 		}
 
-		if (_lzwMode)
-			delete infoStream;
-
 		// Set up the list of images used by the scene
 		_images.resize(bgHeader._numImages + 1);
 		for (int idx = 0; idx < bgHeader._numImages; ++idx) {
-- 
cgit v1.2.3


From 998ae7887100a359ea0ee24e0830a0d774794418 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 16 May 2015 18:55:03 +0200
Subject: SCI: add some improvements to NEWS file

---
 NEWS | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 0811ac4f8d..b49aefa7b3 100644
--- a/NEWS
+++ b/NEWS
@@ -25,8 +25,11 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  SCI:
    - Handling of music priority has been greatly improved.
-   - A lot of fixes for original game script bugs, which are too numerous to
-     mention here.
+   - A lot of fixes for original game script bugs, that also occured when
+     using the original interpreter.
+     KQ6 (Dual Mode), LSL5, QfG1 (EGA), QfG1 (VGA), QfG2, QfG3, SQ1, SQ4 (CD)
+   - restoring from the ScummVM in-game menu should now work all the time
+   - improve support for Japanese PC-9801 games
 
  SCUMM:
    - It is now possible to play Maniac Mansion from within Day of the
-- 
cgit v1.2.3


From 55049c5bcddbb13b170936b020f59f775080bae9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 16 May 2015 21:37:55 +0200
Subject: NEWS: Fix typo and punctuation

---
 NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index b49aefa7b3..5572542f03 100644
--- a/NEWS
+++ b/NEWS
@@ -25,11 +25,11 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  SCI:
    - Handling of music priority has been greatly improved.
-   - A lot of fixes for original game script bugs, that also occured when
+   - A lot of fixes for original game script bugs that also occurred when
      using the original interpreter.
      KQ6 (Dual Mode), LSL5, QfG1 (EGA), QfG1 (VGA), QfG2, QfG3, SQ1, SQ4 (CD)
-   - restoring from the ScummVM in-game menu should now work all the time
-   - improve support for Japanese PC-9801 games
+   - Restoring from the ScummVM in-game menu should now work all the time.
+   - Improve support for Japanese PC-9801 games.
 
  SCUMM:
    - It is now possible to play Maniac Mansion from within Day of the
-- 
cgit v1.2.3


From 2cfc6a0a0c3e5ab1e65c7544da395ed8c8379b6b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 16:46:35 -0400
Subject: SHERLOCK: Fix broken Scalpel scene loading

---
 engines/sherlock/objects.cpp   | 13 +++++++------
 engines/sherlock/resources.cpp |  1 -
 engines/sherlock/scene.cpp     |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 772f9d23d1..9620a01806 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -477,6 +477,7 @@ Object::Object() {
  * Load the data for the object
  */
 void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
+	uint32 p = s.pos(); warning("%.4x", p);
 	char buffer[41];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
@@ -508,11 +509,10 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	_goto.x = s.readSint16LE();
 	_goto.y = s.readSint16LE();
 
-	_pickup = s.readByte();
-	_defaultCommand = s.readByte();
-	_lookFlag = s.readUint16LE();
-	if (!isRoseTattoo)
-		_pickupFlag = s.readUint16LE();
+	_pickup = isRoseTattoo ? 0 : s.readByte();
+	_defaultCommand = isRoseTattoo ? 0 : s.readByte();
+	_lookFlag = s.readSint16LE();
+	_pickupFlag = isRoseTattoo ? 0 : s.readSint16LE();
 	_requiredFlag = s.readSint16LE();
 	_noShapeSize.x = s.readUint16LE();
 	_noShapeSize.y = s.readUint16LE();
@@ -547,7 +547,7 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 
 		_quickDraw = s.readByte();
 		_scaleVal = s.readUint16LE();
-		_requiredFlag1 = s.readUint16LE();
+		_requiredFlag1 = s.readSint16LE();
 		_gotoSeq = s.readByte();
 		_talkSeq = s.readByte();
 		_restoreSlot = s.readByte();
@@ -559,6 +559,7 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 		for (int idx = 0; idx < 4; ++idx)
 			_use[idx].load(s, false);
 	}
+	warning("%.4x", s.pos() - p);
 }
 
 /**
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 9acba0ba2f..1c154a3a5f 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -324,7 +324,6 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 			frame._offset.y = stream.readByte();
 		}
 
-		frame._offset.y = stream.readByte();
 		frame._rleEncoded = !skipPalette && frame._rleEncoded;
 
 		if (frame._paletteBase) {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 54155db4bb..bf8d837f9e 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -318,11 +318,11 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Read information
 		if (_vm->getGameID() == GType_SerratedScalpel) {
 			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-				res.decompress(*rrmStream, bgHeader._numImages * 569 + bgHeader._descSize + bgHeader._seqSize);
+				res.decompress(*rrmStream, bgHeader._numStructs * 569 + bgHeader._descSize + bgHeader._seqSize);
 
 			_bgShapes.resize(bgHeader._numStructs);
 			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-				_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
+				_bgShapes[idx].load(*infoStream, false);
 
 			if (bgHeader._descSize) {
 				_descText.resize(bgHeader._descSize);
@@ -338,11 +338,11 @@ bool Scene::loadScene(const Common::String &filename) {
 				delete infoStream;
 		} else {
 			// Load shapes
-			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream : res.decompress(*rrmStream, bgHeader._numImages * 625);
+			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream : res.decompress(*rrmStream, bgHeader._numStructs * 625);
 
 			_bgShapes.resize(bgHeader._numStructs);
 			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-				_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
+				_bgShapes[idx].load(*infoStream, true);
 
 			if (_lzwMode)
 				delete infoStream;
-- 
cgit v1.2.3


From 7963c64c06e5765c5ca96917a8b4a2c7258c6f37 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 17:01:28 -0400
Subject: SHERLOCK: Remove accidentally committed debug info

---
 engines/sherlock/objects.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 9620a01806..c6254ee7b5 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -477,7 +477,6 @@ Object::Object() {
  * Load the data for the object
  */
 void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
-	uint32 p = s.pos(); warning("%.4x", p);
 	char buffer[41];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
@@ -559,7 +558,6 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 		for (int idx = 0; idx < 4; ++idx)
 			_use[idx].load(s, false);
 	}
-	warning("%.4x", s.pos() - p);
 }
 
 /**
-- 
cgit v1.2.3


From e909f1325f15482961e8b7c7b04018b582ea1046 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 17:03:48 -0400
Subject: SHERLOCK: Fix reading scene shapes when compressed

---
 engines/sherlock/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 9fbf25ce98..619c253bed 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -273,7 +273,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		// Read information
 		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-			Resources::decompressLZ(*rrmStream, bgHeader._numImages * 569 +
+			Resources::decompressLZ(*rrmStream, bgHeader._numStructs * 569 +
 				bgHeader._descSize + bgHeader._seqSize);
 
 		_bgShapes.resize(bgHeader._numStructs);
-- 
cgit v1.2.3


From 7aa804b5ccd3489c852bbde01362bd2ce91d6cf8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 22:27:36 -0400
Subject: SHERLOCK: Implement Tattoo version of image RLE compression

---
 engines/sherlock/resources.cpp | 22 ++++++++++++++++++++++
 engines/sherlock/scene.cpp     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 1c154a3a5f..24fef3f235 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -383,6 +383,28 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 			*pDest++ = *src & 0xF;
 			*pDest++ = (*src >> 4);
 		}
+	} else if (frame._rleEncoded && _vm->getGameID() == GType_RoseTattoo) {
+		// Rose Tattoo run length encoding doesn't use the RLE marker byte
+		byte *dst = (byte *)frame._frame.getPixels();
+
+		for (int yp = 0; yp < frame._height; ++yp) {
+			int xSize = frame._width;
+			while (xSize > 0) {
+				// Skip a given number of pixels
+				byte skip = *src++;
+				dst += skip;
+				xSize -= skip;
+				if (!xSize)
+					break;
+
+				// Get a run length, and copy the following number of pixels
+				int rleCount = *src++;
+				xSize -= rleCount;
+				while (rleCount-- > 0)
+					*dst++ = *src++;
+			}
+			assert(xSize == 0);
+		}
 	} else if (frame._rleEncoded) {
 		// RLE encoded
 		byte *dst = (byte *)frame._frame.getPixels();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index bf8d837f9e..034896486e 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -370,7 +370,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 			// Read in the image data
 			Common::SeekableReadStream *imageStream = _lzwMode ?
-				Resources::decompressLZ(*rrmStream, bgInfo[idx]._filesize) :
+				res.decompress(*rrmStream, bgInfo[idx]._filesize) :
 				rrmStream->readStream(bgInfo[idx]._filesize);
 
 			_images[idx + 1]._images = new ImageFile(*imageStream);
-- 
cgit v1.2.3


From 46e27b6293c0de767c9713c08e89e63dcf52fcc3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 16 May 2015 22:48:24 -0400
Subject: SHERLOCK: Update CAnim loading for Rose Tattoo

---
 engines/sherlock/objects.cpp | 23 ++++++++++++++++++-----
 engines/sherlock/objects.h   | 11 ++++++++---
 engines/sherlock/scene.cpp   |  7 ++++---
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index c6254ee7b5..2576ff04d6 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1135,17 +1135,30 @@ const Common::Rect Object::getOldBounds() const {
 /**
  * Load the data for the animation
  */
-void CAnim::load(Common::SeekableReadStream &s) {
+void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	char buffer[12];
 	s.read(buffer, 12);
 	_name = Common::String(buffer);
 
-	s.read(_sequences, 30);
+	if (isRoseTattoo) {
+		Common::fill(&_sequences[0], &_sequences[30], 0);
+		_size = s.readUint32LE();
+	} else {
+		s.read(_sequences, 30);
+	}
+
 	_position.x = s.readSint16LE();
 	_position.y = s.readSint16LE();
-	_size = s.readUint32LE();
-	_type = (SpriteType)s.readUint16LE();
-	_flags = s.readByte();
+	
+	if (isRoseTattoo) {
+		_flags = s.readByte();
+		_scaleVal = s.readSint16LE();
+	} else {
+		_size = s.readUint32LE();
+		_type = (SpriteType)s.readUint16LE();
+		_flags = s.readByte();
+	}
+
 	_goto.x = s.readSint16LE();
 	_goto.y = s.readSint16LE();
 	_gotoDir = s.readSint16LE();
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 2073f06f88..fd4a103a8d 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -256,17 +256,22 @@ public:
 
 struct CAnim {
 	Common::String _name;			// Name
-	byte _sequences[MAX_FRAME];		// Animation sequences
 	Common::Point _position;		// Position
 	int _size;						// Size of uncompressed animation
-	SpriteType _type;
 	int _flags;						// Tells if can be walked behind
 	Common::Point _goto;			// coords holmes should walk to before starting canim
 	int _gotoDir;
 	Common::Point _teleportPos;		// Location Holmes shoul teleport to after
 	int _teleportDir;					// playing canim
 
-	void load(Common::SeekableReadStream &s);
+	// Scalpel specific
+	byte _sequences[MAX_FRAME];		// Animation sequences
+	SpriteType _type;
+
+	// Rose Tattoo specific
+	int _scaleVal;					// How much the canim is scaled
+
+	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
 };
 
 struct SceneImage {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 034896486e..0ac2eec0ff 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -398,13 +398,14 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Load in cAnim list
 		_cAnim.clear();
 		if (bgHeader._numcAnimations) {
+			int animSize = _vm->getGameID() == GType_SerratedScalpel ? 65 : 47;
 			Common::SeekableReadStream *canimStream = _lzwMode ?
-				Resources::decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
-				rrmStream->readStream(65 * bgHeader._numcAnimations);
+				res.decompress(*rrmStream, animSize * bgHeader._numcAnimations) :
+				rrmStream->readStream(animSize * bgHeader._numcAnimations);
 
 			_cAnim.resize(bgHeader._numcAnimations);
 			for (uint idx = 0; idx < _cAnim.size(); ++idx)
-				_cAnim[idx].load(*canimStream);
+				_cAnim[idx].load(*canimStream, _vm->getGameID() == GType_RoseTattoo);
 
 			delete canimStream;
 		}
-- 
cgit v1.2.3


From 3d72bcfa64aeb9c11179edc66a1755d8d5532a40 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Sun, 17 May 2015 15:42:20 +1000
Subject: CINE: Add English DOS demo of Operation Stealth.

---
 engines/cine/detection_tables.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/engines/cine/detection_tables.h b/engines/cine/detection_tables.h
index 6069e3a99b..1188deb1a6 100644
--- a/engines/cine/detection_tables.h
+++ b/engines/cine/detection_tables.h
@@ -376,6 +376,20 @@ static const CINEGameDescription gameDescriptions[] = {
 		0,
 	},
 
+	{
+		{
+			"os",
+			"Demo",
+			AD_ENTRY1("demo_os", "043859e4cfe3977ad95b6efd00b21c62"),
+			Common::EN_GRB,
+			Common::kPlatformDOS,
+			ADGF_DEMO | ADGF_UNSTABLE,
+			GUIO0()
+		},
+		GType_OS,
+		GF_DEMO,
+	},
+
 	{
 		{
 			"os",
-- 
cgit v1.2.3


From a6ceee0d67dadb5300716e0f8b6c5ba7ac503a79 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 17 May 2015 11:54:27 +0200
Subject: SCI: qfg1vga: fix script patch sneak into castle

The original script patch only worked when speed
slider was all the way up.
---
 engines/sci/engine/script_patches.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 0eefe19854..a954d65a90 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2123,21 +2123,30 @@ static const uint16 qfg1vgaPatchMoveToCrusher[] = {
 
 // Same pathfinding bug as above, where Ego is set to move to an impossible
 // spot when sneaking. In GuardsTrumpet::changeState, we change the final
-// location where Ego is moved from 111, 111 to 114, 114.
+// location where Ego is moved from 111, 111 to 116, 116.
+// target coordinate is really problematic here.
+//
+// 114, 114 works when the speed slider is all the way up, but doesn't work
+// when the speed slider is not.
+//
+// It seems that this bug was fixed by Sierra for the Macintosh version.
+//
+// Applies to at least: English PC floppy
+// Responsible method: GuardsTrumpet::changeState(8)
 // Fixes bug: #6248
 static const uint16 qfg1vgaSignatureMoveToCastleGate[] = {
+	0x51, SIG_ADDTOOFFSET(+1),          // class MoveTo
 	SIG_MAGICDWORD,
-	0x51, 0x1f,                         // class MoveTo
 	0x36,                               // push
-	0x39, 0x6f,                         // pushi 6f (111 - x)
-	0x3c,                               // dup (111 - y)
+	0x39, 0x6f,                         // pushi 6f (111d)
+	0x3c,                               // dup (111d) - coordinates 111, 111
 	0x7c,                               // pushSelf
 	SIG_END
 };
 
 static const uint16 qfg1vgaPatchMoveToCastleGate[] = {
 	PATCH_ADDTOOFFSET(+3),
-	0x39, 0x72,                         // pushi 72 (114 - x)
+	0x39, 0x74,                         // pushi 74 (116d), changes coordinates to 116, 116
 	PATCH_END
 };
 
-- 
cgit v1.2.3


From 3683719932882ab60fa1a6c22d19889c9734c355 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 07:20:06 -0400
Subject: SHERLOCK: Implement remaining Rose Tattoo scene data loading

---
 engines/sherlock/scene.cpp  | 133 ++++++++++++++++++++++++++++++++------------
 engines/sherlock/scene.h    |  24 ++++++--
 engines/sherlock/sherlock.h |   3 +
 3 files changed, 120 insertions(+), 40 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 0ac2eec0ff..96cfac0683 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -80,18 +80,30 @@ void BgfileheaderInfo::load(Common::SeekableReadStream &s) {
 /**
  * Load the data for the object
  */
-void Exit::load(Common::SeekableReadStream &s) {
-	int xp = s.readSint16LE();
-	int yp = s.readSint16LE();
-	int xSize = s.readSint16LE();
-	int ySize = s.readSint16LE();
-	_bounds = Common::Rect(xp, yp, xp + xSize, yp + ySize);
+void Exit::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
+	if (isRoseTattoo) {
+		char buffer[41];
+		s.read(buffer, 41);
+		_dest = Common::String(buffer);
+	}
 
+	left = s.readSint16LE();
+	top = s.readSint16LE();
+	setWidth(s.readUint16LE());
+	setHeight(s.readUint16LE());
+
+	_image = isRoseTattoo ? s.readByte() : 0;
 	_scene = s.readSint16LE();
-	_allow = s.readSint16LE();
+
+	if (!isRoseTattoo)
+		_allow = s.readSint16LE();
+
 	_people.x = s.readSint16LE();
 	_people.y = s.readSint16LE();
 	_peopleDir = s.readUint16LE();
+
+	if (isRoseTattoo)
+		_allow = s.readSint16LE();
 }
 
 /*----------------------------------------------------------------*/
@@ -134,6 +146,21 @@ int ObjectArray::indexOf(const Object &obj) const {
 
 /*----------------------------------------------------------------*/
 
+/**
+ * Load the data for the object
+ */
+void ScaleZone::load(Common::SeekableReadStream &s) {
+	left = s.readSint16LE();
+	top = s.readSint16LE();
+	setWidth(s.readUint16LE());
+	setHeight(s.readUint16LE());
+
+	_topNumber = s.readByte();
+	_bottomNumber = s.readByte();
+}
+
+/*----------------------------------------------------------------*/
+
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_sceneStats[idx][0], &_sceneStats[idx][65], false);
@@ -153,6 +180,7 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	_animating = 0;
 	_doBgAnimDone = true;
 	_tempFadeStyle = 0;
+	_exitZone = -1;
 }
 
 Scene::~Scene() {
@@ -280,7 +308,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		Common::SeekableReadStream *rrmStream = _vm->_res->load(rrmFile);
 
 		rrmStream->seek(39);
-		if (_vm->getGameID() == GType_SerratedScalpel) {
+		if (IS_SERRATED_SCALPEL) {
 			_version = rrmStream->readByte();
 			_lzwMode = _version == 10;
 		} else {
@@ -291,10 +319,10 @@ bool Scene::loadScene(const Common::String &filename) {
 		rrmStream->seek(rrmStream->readUint32LE());
 
 		BgFileHeader bgHeader;
-		bgHeader.synchronize(*rrmStream, _vm->getGameID() == GType_RoseTattoo);
+		bgHeader.synchronize(*rrmStream, IS_ROSE_TATTOO);
 		_invGraphicItems = bgHeader._numImages + 1;
 
-		if (_vm->getGameID() == GType_RoseTattoo) {
+		if (IS_ROSE_TATTOO) {
 			screen.initPaletteFade(bgHeader._bytesWritten);
 			screen.fadeRead(*rrmStream, screen._cMap, PALETTE_SIZE);
 			screen.setupBGArea(screen._cMap);
@@ -316,7 +344,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			bgInfo[idx].load(*rrmStream);
 
 		// Read information
-		if (_vm->getGameID() == GType_SerratedScalpel) {
+		if (IS_SERRATED_SCALPEL) {
 			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
 				res.decompress(*rrmStream, bgHeader._numStructs * 569 + bgHeader._descSize + bgHeader._seqSize);
 
@@ -398,14 +426,14 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Load in cAnim list
 		_cAnim.clear();
 		if (bgHeader._numcAnimations) {
-			int animSize = _vm->getGameID() == GType_SerratedScalpel ? 65 : 47;
+			int animSize = IS_SERRATED_SCALPEL ? 65 : 47;
 			Common::SeekableReadStream *canimStream = _lzwMode ?
 				res.decompress(*rrmStream, animSize * bgHeader._numcAnimations) :
 				rrmStream->readStream(animSize * bgHeader._numcAnimations);
 
 			_cAnim.resize(bgHeader._numcAnimations);
 			for (uint idx = 0; idx < _cAnim.size(); ++idx)
-				_cAnim[idx].load(*canimStream, _vm->getGameID() == GType_RoseTattoo);
+				_cAnim[idx].load(*canimStream, IS_ROSE_TATTOO);
 
 			delete canimStream;
 		}
@@ -413,7 +441,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Read in the room bounding areas
 		int size = rrmStream->readUint16LE();
 		Common::SeekableReadStream *boundsStream = !_lzwMode ? rrmStream :
-			Resources::decompressLZ(*rrmStream, size);
+			res.decompress(*rrmStream, size);
 
 		_zones.resize(size / 10);
 		for (uint idx = 0; idx < _zones.size(); ++idx) {
@@ -428,10 +456,11 @@ bool Scene::loadScene(const Common::String &filename) {
 			delete boundsStream;
 
 		// Ensure we've reached the path version byte
-		if (rrmStream->readByte() != 254)
+		if (rrmStream->readByte() != (IS_SERRATED_SCALPEL ? 254 : 251))
 			error("Invalid scene path data");
 
 		// Load the walk directory
+		assert(_zones.size() < MAX_ZONES);
 		for (uint idx1 = 0; idx1 < _zones.size(); ++idx1) {
 			for (uint idx2 = 0; idx2 < _zones.size(); ++idx2)
 				_walkDirectory[idx1][idx2] = rrmStream->readSint16LE();
@@ -440,7 +469,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		// Read in the walk data
 		size = rrmStream->readUint16LE();
 		Common::SeekableReadStream *walkStream = !_lzwMode ? rrmStream :
-			Resources::decompressLZ(*rrmStream, size);
+			res.decompress(*rrmStream, size);
 
 		_walkData.resize(size);
 		walkStream->read(&_walkData[0], size);
@@ -448,15 +477,27 @@ bool Scene::loadScene(const Common::String &filename) {
 		if (_lzwMode)
 			delete walkStream;
 
+		if (IS_ROSE_TATTOO) {
+			// Read in the entrance
+			_entrance.load(*rrmStream);
+
+			// Load scale zones
+			_scaleZones.resize(rrmStream->readByte());
+			for (uint idx = 0; idx < _scaleZones.size(); ++idx)
+				_scaleZones[idx].load(*rrmStream);
+		}
+
 		// Read in the exits
+		_exitZone = -1;
 		int numExits = rrmStream->readByte();
 		_exits.resize(numExits);
 
 		for (int idx = 0; idx < numExits; ++idx)
-			_exits[idx].load(*rrmStream);
+			_exits[idx].load(*rrmStream, IS_ROSE_TATTOO);
 
-		// Read in the entrance
-		_entrance.load(*rrmStream);
+		if (IS_SERRATED_SCALPEL)
+			// Read in the entrance
+			_entrance.load(*rrmStream);
 
 		// Initialize sound list
 		int numSounds = rrmStream->readByte();
@@ -465,24 +506,34 @@ bool Scene::loadScene(const Common::String &filename) {
 		for (int idx = 0; idx < numSounds; ++idx)
 			_sounds[idx].load(*rrmStream);
 
-		for (int idx = 0; idx < numSounds; ++idx)
-			sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
+		loadSceneSounds();
 
-		// Read in palette
-		rrmStream->read(screen._cMap, PALETTE_SIZE);
-		for (int idx = 0; idx < PALETTE_SIZE; ++idx)
-			screen._cMap[idx] = VGA_COLOR_TRANS(screen._cMap[idx]);
+		if (IS_ROSE_TATTOO) {
+			// Load the object sound list
+			char buffer[27];
+			
+			_objSoundList.resize(rrmStream->readUint16LE());
+			for (uint idx = 0; idx < _objSoundList.size(); ++idx) {
+				rrmStream->read(buffer, 27);
+				_objSoundList[idx] = Common::String(buffer);
+			}
+		} else {
+			// Read in palette
+			rrmStream->read(screen._cMap, PALETTE_SIZE);
+			for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+				screen._cMap[idx] = VGA_COLOR_TRANS(screen._cMap[idx]);
 
-		Common::copy(screen._cMap, screen._cMap + PALETTE_SIZE, screen._sMap);
+			Common::copy(screen._cMap, screen._cMap + PALETTE_SIZE, screen._sMap);
 
-		// Read in the background
-		Common::SeekableReadStream *bgStream = !_lzwMode ? rrmStream :
-			Resources::decompressLZ(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
+			// Read in the background
+			Common::SeekableReadStream *bgStream = !_lzwMode ? rrmStream :
+				res.decompress(*rrmStream, SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
 
-		bgStream->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
+			bgStream->read(screen._backBuffer1.getPixels(), SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCENE_HEIGHT);
 
-		if (_lzwMode)
-			delete bgStream;
+			if (_lzwMode)
+				delete bgStream;
+		}
 
 		// Backup the image and set the palette
 		screen._backBuffer2.blitFrom(screen._backBuffer1);
@@ -550,6 +601,16 @@ bool Scene::loadScene(const Common::String &filename) {
 	return flag;
 }
 
+/**
+ * Load all the sound effects specified for the current scene
+ */
+void Scene::loadSceneSounds() {
+	Sound &sound = *_vm->_sound;
+
+	for (uint idx = 0; idx < _sounds.size(); ++idx)
+		sound.loadSound(_sounds[idx]._name, _sounds[idx]._priority);
+}
+
 /**
  * Set objects to their current persistent state. This includes things such as
  * opening or moving them
@@ -908,7 +969,7 @@ void Scene::updateBackground() {
  */
 Exit *Scene::checkForExit(const Common::Rect &r) {
 	for (uint idx = 0; idx < _exits.size(); ++idx) {
-		if (_exits[idx]._bounds.intersects(r))
+		if (_exits[idx].intersects(r))
 			return &_exits[idx];
 	}
 
@@ -1243,7 +1304,7 @@ void Scene::doBgAnim() {
 				_canimShapes[idx].checkObject();
 		}
 
-		if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
+		if (_currentScene == 12 && IS_SERRATED_SCALPEL)
 			((Scalpel::ScalpelEngine *)_vm)->eraseMirror12();
 
 		// Restore the back buffer from the back buffer 2 in the changed area
@@ -1316,7 +1377,7 @@ void Scene::doBgAnim() {
 	checkBgShapes(people[AL]._imageFrame,
 		Common::Point(people[AL]._position.x / 100, people[AL]._position.y / 100));
 
-	if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
+	if (_currentScene == 12 && IS_SERRATED_SCALPEL)
 		((Scalpel::ScalpelEngine *)_vm)->doMirror12();
 
 	// Draw all active shapes which are behind the person
@@ -1426,7 +1487,7 @@ void Scene::doBgAnim() {
 			}
 		}
 
-		if (_currentScene == 12 && _vm->getGameID() == GType_SerratedScalpel)
+		if (_currentScene == 12 && IS_SERRATED_SCALPEL)
 			((Scalpel::ScalpelEngine *)_vm)->flushMirror12();
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 86b1e3d063..9454a4e20b 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -68,15 +68,17 @@ struct BgfileheaderInfo {
 	void load(Common::SeekableReadStream &s);
 };
 
-struct Exit {
-	Common::Rect _bounds;
-
+class Exit: public Common::Rect {
+public:
 	int _scene;
 	int _allow;
 	Common::Point _people;
 	int _peopleDir;
 
-	void load(Common::SeekableReadStream &s);
+	Common::String _dest;
+	int _image;					// Arrow image to use
+
+	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
 };
 
 struct SceneEntry {
@@ -99,6 +101,14 @@ public:
 	int indexOf(const Object &obj) const;
 };
 
+class ScaleZone: public Common::Rect {
+public:
+	int _topNumber;		// Numerator of scale size at the top of the zone
+	int _bottomNumber;	// Numerator of scale size at the bottom of the zone
+
+	void load(Common::SeekableReadStream &s);
+};
+
 class Scene {
 private:
 	SherlockEngine *_vm;
@@ -109,6 +119,8 @@ private:
 
 	bool loadScene(const Common::String &filename);
 
+	void loadSceneSounds();
+
 	void checkSceneStatus();
 
 	void checkInventory();
@@ -118,6 +130,7 @@ private:
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
 
 	void saveSceneStatus();
+
 public:
 	int _currentScene;
 	int _goToScene;
@@ -141,9 +154,12 @@ public:
 	int _walkDirectory[MAX_ZONES][MAX_ZONES];
 	Common::Array<byte> _walkData;
 	Common::Array<Exit> _exits;
+	int _exitZone;
 	SceneEntry _entrance;
 	Common::Array<SceneSound> _sounds;
 	ObjectArray _canimShapes;
+	Common::Array<ScaleZone> _scaleZones;
+	Common::StringArray _objSoundList;
 	bool _restoreFlag;
 	int _animating;
 	bool _doBgAnimDone;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 9261ad5b05..2688b51d4c 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -139,6 +139,9 @@ public:
 	void synchronize(Common::Serializer &s);
 };
 
+#define IS_ROSE_TATTOO (_vm->getGameID() == GType_RoseTattoo)
+#define IS_SERRATED_SCALPEL (_vm->getGameID() == GType_SerratedScalpel)
+
 } // End of namespace Sherlock
 
 #endif
-- 
cgit v1.2.3


From 40f7fff42977d01c8bac81d462580c2c8ec39dc3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 08:09:14 -0400
Subject: SHERLOCK: Beginnings of UserInterface split for Scalpel vs Tattoo

---
 engines/sherlock/inventory.cpp      |  28 +------
 engines/sherlock/inventory.h        |   2 -
 engines/sherlock/settings.cpp       |   3 +-
 engines/sherlock/sherlock.cpp       |   2 +-
 engines/sherlock/talk.cpp           |   8 +-
 engines/sherlock/talk.h             |   4 +-
 engines/sherlock/user_interface.cpp | 150 +++++++++++++++++++++++-------------
 engines/sherlock/user_interface.h   |  96 +++++++++++++++--------
 8 files changed, 173 insertions(+), 120 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 1997807d15..397575dfd9 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -274,7 +274,8 @@ void Inventory::drawInventory(int flag) {
 		screen._backBuffer = &screen._backBuffer1;
 	}
 
-	ui._oldUse = -1;
+	assert(IS_SERRATED_SCALPEL);
+	((ScalpelUserInterface *)_vm->_ui)->_oldUse = -1;
 }
 
 /**
@@ -355,31 +356,6 @@ void Inventory::highlight(int index, byte color) {
 	screen.slamArea(8 + slot * 52, 165, 44, 30);
 }
 
-/**
- * Support method for updating the screen
- */
-void Inventory::doInvJF() {
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-	UserInterface &ui = *_vm->_ui;
-
-	ui._invLookFlag = true;
-	freeInv();
-
-	ui._infoFlag = true;
-	ui.clearInfo();
-
-	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(0, CONTROLS_Y),
-		Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-	ui.examine();
-
-	if (!talk._talkToAbort) {
-		screen._backBuffer2.blitFrom((*ui._controlPanel)[0]._frame,
-			Common::Point(0, CONTROLS_Y));
-		loadInv();
-	}
-}
-
 /**
  * Adds a shape from the scene to the player's inventory
  */
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index eb5aebdd7c..5b9374d7a7 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -95,8 +95,6 @@ public:
 
 	void highlight(int index, byte color);
 
-	void doInvJF();
-
 	int putNameInInventory(const Common::String &name);
 	int putItemInInventory(Object &obj);
 
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index ffa1f056de..73c99bfa82 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -223,9 +223,10 @@ void Settings::show(SherlockEngine *vm) {
 	Screen &screen = *vm->_screen;
 	Sound &sound = *vm->_sound;
 	Talk &talk = *vm->_talk;
-	UserInterface &ui = *vm->_ui;
+	ScalpelUserInterface &ui = *(ScalpelUserInterface *)vm->_ui;
 	bool updateConfig = false;
 
+	assert(vm->getGameID() == GType_SerratedScalpel);
 	Settings settings(vm);
 	settings.drawInteface(false);
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index eea3dcb867..80a4383bdf 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -89,7 +89,7 @@ void SherlockEngine::initialize() {
 	_screen = new Screen(this);
 	_sound = new Sound(this, _mixer);
 	_talk = new Talk(this);
-	_ui = new UserInterface(this);
+	_ui = UserInterface::init(this);
 
 	// Load game settings
 	loadConfig();
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index d656431823..c67b98b35e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -193,9 +193,11 @@ void Talk::talkTo(const Common::String &filename) {
 	while (!_sequenceStack.empty())
 		pullSequence();
 
-	// Restore any pressed button
-	if (!ui._windowOpen && savedMode != STD_MODE)
-		ui.restoreButton(savedMode - 1);
+	if (IS_SERRATED_SCALPEL) {
+		// Restore any pressed button
+		if (!ui._windowOpen && savedMode != STD_MODE)
+			((ScalpelUserInterface *)_vm->_ui)->restoreButton(savedMode - 1);
+	}
 
 	// Clear the ui counter so that anything displayed on the info line
 	// before the window was opened isn't cleared
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index b1a735827c..5c87d793f3 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -120,10 +120,10 @@ struct TalkSequences {
 };
 
 class SherlockEngine;
-class UserInterface;
+class ScalpelUserInterface;
 
 class Talk {
-	friend class UserInterface;
+	friend class ScalpelUserInterface;
 private:
 	Common::Array<TalkSequences> STILL_SEQUENCES;
 	Common::Array<TalkSequences> TALK_SEQUENCES;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 1ab8fe7294..efe6c8ef59 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -78,45 +78,53 @@ const char *const MUSE[] = {
 	"Doors don't smoke"
 };
 
-/*----------------------------------------------------------------*/
+
+
+UserInterface *UserInterface::init(SherlockEngine *vm) {
+	if (vm->getGameID() == GType_SerratedScalpel)
+		return new ScalpelUserInterface(vm);
+	else
+		return new TattooUserInterface(vm);
+}
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
-	if (_vm->getGameID() == GType_SerratedScalpel) {
-		_controls = new ImageFile("menu.all");
-		_controlPanel = new ImageFile("controls.vgs");
-	} else {
-		_controls = nullptr;
-		_controlPanel = nullptr;
-	}
-	_bgFound = 0;
-	_oldBgFound = -1;
-	_keycode = Common::KEYCODE_INVALID;
-	_helpStyle = false;
-	_menuCounter = 0;
 	_menuMode = STD_MODE;
-	_help = _oldHelp = 0;
-	_lookHelp = 0;
+	_menuCounter = 0;
+	_infoFlag = false;
+	_windowOpen = false;
+	_endKeyActive = true;
+	_invLookFlag = 0;
+	_windowStyle = 1;	// Sliding windows
+	_helpStyle = false;
+	_lookScriptFlag = false;
+
 	_key = _oldKey = 0;
+	_selector = _oldSelector = -1;
 	_temp = _oldTemp = 0;
 	_temp1 = 0;
-	_invLookFlag = 0;
-	_windowOpen = false;
+	_lookHelp = 0;
+}
+
+/*----------------------------------------------------------------*/
+
+ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) {
+	_controls = new ImageFile("menu.all");
+	_controlPanel = new ImageFile("controls.vgs");
+	_bgFound = 0;
+	_oldBgFound = -1;
+	_keycode = Common::KEYCODE_INVALID;
+	_help = _oldHelp = 0;
 	_oldLook = false;
 	_keyboardInput = false;
 	_pause = false;
 	_cNum = 0;
-	_selector = _oldSelector = -1;
 	_windowBounds = Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH - 1,
 		SHERLOCK_SCREEN_HEIGHT - 1);
-	_windowStyle = 1;	// Sliding windows
 	_find = 0;
 	_oldUse = 0;
-	_endKeyActive = true;
-	_lookScriptFlag = false;
-	_infoFlag = false;
 }
 
-UserInterface::~UserInterface() {
+ScalpelUserInterface::~ScalpelUserInterface() {
 	delete _controls;
 	delete _controlPanel;
 }
@@ -124,7 +132,7 @@ UserInterface::~UserInterface() {
 /**
  * Resets the user interface
  */
-void UserInterface::reset() {
+void ScalpelUserInterface::reset() {
 	_oldKey = -1;
 	_help = _oldHelp = -1;
 	_oldTemp = _temp = -1;
@@ -133,7 +141,7 @@ void UserInterface::reset() {
 /**
  * Draw the user interface onto the screen's back buffers
  */
-void UserInterface::drawInterface(int bufferNum) {
+void ScalpelUserInterface::drawInterface(int bufferNum) {
 	Screen &screen = *_vm->_screen;
 
 	if (bufferNum & 1)
@@ -147,7 +155,7 @@ void UserInterface::drawInterface(int bufferNum) {
 /**
  * Main input handler for the user interface
  */
-void UserInterface::handleInput() {
+void ScalpelUserInterface::handleInput() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
@@ -405,7 +413,7 @@ void UserInterface::handleInput() {
 /**
  * Draws the image for a user interface button in the down/pressed state.
  */
-void UserInterface::depressButton(int num) {
+void ScalpelUserInterface::depressButton(int num) {
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
 
@@ -418,7 +426,7 @@ void UserInterface::depressButton(int num) {
  * Draws the image for the given user interface button in the up
  * (not selected) position
  */
-void UserInterface::restoreButton(int num) {
+void ScalpelUserInterface::restoreButton(int num) {
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
 	Graphics::Surface &frame = (*_controls)[num]._frame;
@@ -437,7 +445,7 @@ void UserInterface::restoreButton(int num) {
  * If he mouse button is pressed, then calls depressButton to draw the button
  * as pressed; if not, it will show it as released with a call to "restoreButton".
  */
-void UserInterface::pushButton(int num) {
+void ScalpelUserInterface::pushButton(int num) {
 	Events &events = *_vm->_events;
 	_oldKey = -1;
 
@@ -459,7 +467,7 @@ void UserInterface::pushButton(int num) {
  * have already been drawn. This simply takes care of switching the mode around
  * accordingly
  */
-void UserInterface::toggleButton(int num) {
+void ScalpelUserInterface::toggleButton(int num) {
 	Screen &screen = *_vm->_screen;
 
 	if (_menuMode != (num + 1)) {
@@ -490,7 +498,7 @@ void UserInterface::toggleButton(int num) {
 /**
  * Clears the info line of the screen
  */
-void UserInterface::clearInfo() {
+void ScalpelUserInterface::clearInfo() {
 	if (_infoFlag) {
 		_vm->_screen->vgaBar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19,
 			INFO_LINE + 10), INFO_BLACK);
@@ -502,7 +510,7 @@ void UserInterface::clearInfo() {
 /**
  * Clear any active text window
  */
-void UserInterface::clearWindow() {
+void ScalpelUserInterface::clearWindow() {
 	if (_windowOpen) {
 		_vm->_screen->vgaBar(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
 			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
@@ -512,7 +520,7 @@ void UserInterface::clearWindow() {
 /**
  * Handles counting down whilst checking for input, then clears the info line.
  */
-void UserInterface::whileMenuCounter() {
+void ScalpelUserInterface::whileMenuCounter() {
 	if (!(--_menuCounter) || _vm->_events->checkInput()) {
 		_menuCounter = 0;
 		_infoFlag = true;
@@ -524,7 +532,7 @@ void UserInterface::whileMenuCounter() {
  * Creates a text window and uses it to display the in-depth description
  * of the highlighted object
  */
-void UserInterface::examine() {
+void ScalpelUserInterface::examine() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
@@ -578,7 +586,7 @@ void UserInterface::examine() {
 /**
  * Print the name of an object in the scene
  */
-void UserInterface::lookScreen(const Common::Point &pt) {
+void ScalpelUserInterface::lookScreen(const Common::Point &pt) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Scene &scene = *_vm->_scene;
@@ -694,7 +702,7 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 /**
  * Gets the item in the inventory the mouse is on and display's it's description
  */
-void UserInterface::lookInv() {
+void ScalpelUserInterface::lookInv() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Screen &screen = *_vm->_screen;
@@ -722,7 +730,7 @@ void UserInterface::lookInv() {
 /**
  * Handles input when the file list window is being displayed
  */
-void UserInterface::doEnvControl() {
+void ScalpelUserInterface::doEnvControl() {
 	Events &events = *_vm->_events;
 	SaveManager &saves = *_vm->_saves;
 	Scene &scene = *_vm->_scene;
@@ -1028,12 +1036,13 @@ void UserInterface::doEnvControl() {
 /**
  * Handle input whilst the inventory is active
  */
-void UserInterface::doInvControl() {
+void ScalpelUserInterface::doInvControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
+	UserInterface &ui = *_vm->_ui;
 	int colors[8];
 	Common::Point mousePos = events.mousePos();
 
@@ -1197,7 +1206,7 @@ void UserInterface::doInvControl() {
 			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == 1) && (_find >= 0) && (_find < 1000)) {
 				if (!scene._bgShapes[_find]._examine.empty() &&
 						scene._bgShapes[_find]._examine[0] >= ' ')
-					inv.doInvJF();
+					ui.doInvJF();
 			} else if (_selector != -1 || _find >= 0) {
 				// Selector is the inventory object that was clicked on, or selected.
 				// If it's -1, then no inventory item is highlighted yet. Otherwise,
@@ -1205,7 +1214,7 @@ void UserInterface::doInvControl() {
 
 				if (_selector != -1 && inv._invMode == INVMODE_LOOK
 						&& mousePos.y >(CONTROLS_Y1 + 11))
-					inv.doInvJF();
+					ui.doInvJF();
 
 				if (talk._talkToAbort)
 					return;
@@ -1255,7 +1264,7 @@ void UserInterface::doInvControl() {
 /**
  * Handles waiting whilst an object's description window is open.
  */
-void UserInterface::doLookControl() {
+void ScalpelUserInterface::doLookControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Screen &screen = *_vm->_screen;
@@ -1319,7 +1328,7 @@ void UserInterface::doLookControl() {
 /**
  * Handles input until one of the user interface buttons/commands is selected
  */
-void UserInterface::doMainControl() {
+void ScalpelUserInterface::doMainControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	SaveManager &saves = *_vm->_saves;
@@ -1460,7 +1469,7 @@ void UserInterface::doMainControl() {
 /**
  * Handles the input for the MOVE, OPEN, and CLOSE commands
  */
-void UserInterface::doMiscControl(int allowed) {
+void ScalpelUserInterface::doMiscControl(int allowed) {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
@@ -1512,7 +1521,7 @@ void UserInterface::doMiscControl(int allowed) {
 /**
  * Handles input for picking up items
  */
-void UserInterface::doPickControl() {
+void ScalpelUserInterface::doPickControl() {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
@@ -1539,7 +1548,7 @@ void UserInterface::doPickControl() {
  * Handles input when in talk mode. It highlights the buttons and available statements,
  * and handles allowing the user to click on them
  */
-void UserInterface::doTalkControl() {
+void ScalpelUserInterface::doTalkControl() {
 	Events &events = *_vm->_events;
 	Journal &journal = *_vm->_journal;
 	People &people = *_vm->_people;
@@ -1795,7 +1804,7 @@ void UserInterface::doTalkControl() {
  *		the user interface, it uses so many internal UI fields, that it sort of made some sense
  *		to put it in the UserInterface class.
  */
-void UserInterface::journalControl() {
+void ScalpelUserInterface::journalControl() {
 	Events &events = *_vm->_events;
 	Journal &journal = *_vm->_journal;
 	Scene &scene = *_vm->_scene;
@@ -1846,7 +1855,7 @@ void UserInterface::journalControl() {
 /**
 * Print the description of an object
 */
-void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
+void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Screen &screen = *_vm->_screen;
@@ -2017,14 +2026,14 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 /**
  * Print the previously selected object's decription
  */
-void UserInterface::printObjectDesc() {
+void ScalpelUserInterface::printObjectDesc() {
 	printObjectDesc(_cAnimStr, true);
 }
 
 /**
  * Displays a passed window by gradually scrolling it vertically on-screen
  */
-void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
+void ScalpelUserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 
@@ -2067,7 +2076,7 @@ void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 /**
  * Slide the window stored in the back buffer onto the screen
  */
-void UserInterface::summonWindow(bool slideUp, int height) {
+void ScalpelUserInterface::summonWindow(bool slideUp, int height) {
 	Screen &screen = *_vm->_screen;
 
 	// Extract the window that's been drawn on the back buffer
@@ -2088,7 +2097,7 @@ void UserInterface::summonWindow(bool slideUp, int height) {
  * Close a currently open window
  * @param flag	0 = slide old window down, 1 = slide prior UI back up
  */
-void UserInterface::banishWindow(bool slideUp) {
+void ScalpelUserInterface::banishWindow(bool slideUp) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 
@@ -2157,7 +2166,7 @@ void UserInterface::banishWindow(bool slideUp) {
 /**
  * Checks to see whether a USE action is valid on the given object
  */
-void UserInterface::checkUseAction(const UseType *use, const Common::String &invName,
+void ScalpelUserInterface::checkUseAction(const UseType *use, const Common::String &invName,
 		const char *const messages[], int objNum, int giveMode) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -2253,7 +2262,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 /**
  * Called for OPEN, CLOSE, and MOVE actions are being done
  */
-void UserInterface::checkAction(ActionType &action, const char *const messages[], int objNum) {
+void ScalpelUserInterface::checkAction(ActionType &action, const char *const messages[], int objNum) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
@@ -2385,4 +2394,39 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 	events.setCursor(ARROW);
 }
 
+/**
+ * Support method for updating the screen
+ */
+void ScalpelUserInterface::doInvJF() {
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	_invLookFlag = true;
+	inv.freeInv();
+
+	_infoFlag = true;
+	clearInfo();
+
+	screen._backBuffer2.blitFrom(screen._backBuffer1, Common::Point(0, CONTROLS_Y),
+		Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	examine();
+
+	if (!talk._talkToAbort) {
+		screen._backBuffer2.blitFrom((*_controlPanel)[0]._frame,
+			Common::Point(0, CONTROLS_Y));
+		inv.loadInv();
+	}
+}
+
+/*----------------------------------------------------------------*/
+
+TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm) {
+	//
+}
+
+void TattooUserInterface::handleInput() {
+	// TODO
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 2ff60715e3..acbb0c0ed0 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -61,31 +61,64 @@ extern const char *const PRESS_KEY_TO_CONTINUE;
 class SherlockEngine;
 class Inventory;
 class Talk;
-class UserInterface;
 
 class UserInterface {
+protected:
+	SherlockEngine *_vm;
+
+	UserInterface(SherlockEngine *vm);
+public:
+	MenuMode _menuMode;
+	int _menuCounter;
+	bool _infoFlag;
+	bool _windowOpen;
+	bool _endKeyActive;
+	int _invLookFlag;
+	int _windowStyle;
+	bool _helpStyle;
+	Common::Rect _windowBounds;
+	bool _lookScriptFlag;
+
+	// TODO: Not so sure these should be in the base class. May want to refactor them to SherlockEngine, or refactor
+	// various Scalpel dialogs to keep their own private state of key/selections
+	int _key, _oldKey;
+	int _selector, _oldSelector;
+	int _temp, _oldTemp;
+	int _temp1;
+	int _lookHelp;
+public:
+	static UserInterface *init(SherlockEngine *vm);
+
+	virtual void reset() {}
+	virtual void drawInterface(int bufferNum = 3) {}
+	virtual void handleInput() {}
+
+	virtual void doInvJF() {}
+	virtual void summonWindow(const Surface &bgSurface, bool slideUp = true) {}
+	virtual void summonWindow(bool slideUp = true, int height = CONTROLS_Y) {}
+	virtual void banishWindow(bool slideUp = true) {}
+	virtual void clearInfo() {}
+	virtual void clearWindow() {}
+
+	virtual void printObjectDesc() {}
+};
+
+class ScalpelUserInterface: public UserInterface {
 	friend class Inventory;
 	friend class Settings;
 	friend class Talk;
 private:
-	SherlockEngine *_vm;
 	ImageFile *_controlPanel;
 	ImageFile *_controls;
 	int _bgFound;
 	int _oldBgFound;
 	int _keycode;
-	int _lookHelp;
 	int _help, _oldHelp;
-	int _key, _oldKey;
-	int _temp, _oldTemp;
 	int _oldLook;
 	bool _keyboardInput;
 	bool _pause;
 	int _cNum;
-	int _selector, _oldSelector;
 	Common::String _cAnimStr;
-	bool _lookScriptFlag;
-	Common::Rect _windowBounds;
 	Common::String _descStr;
 	int _find;
 	int _oldUse;
@@ -114,39 +147,38 @@ private:
 	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
 		int objNum, int giveMode);
 	void checkAction(ActionType &action, const char *const messages[], int objNum);
+
+	void printObjectDesc(const Common::String &str, bool firstTime);
 public:
-	MenuMode _menuMode;
-	int _menuCounter;
-	bool _infoFlag;
-	bool _windowOpen;
-	bool _endKeyActive;
-	int _invLookFlag;
-	int _temp1;
-	int _windowStyle;
-	bool _helpStyle;
-public:
-	UserInterface(SherlockEngine *vm);
-	~UserInterface();
+	ScalpelUserInterface(SherlockEngine *vm);
+	~ScalpelUserInterface();
 
-	void reset();
+	void whileMenuCounter();
 
-	void drawInterface(int bufferNum = 3);
+	void restoreButton(int num);
+public:
+	virtual void reset();
 
-	void handleInput();
+	virtual void handleInput();
 
-	void clearInfo();
-	void clearWindow();
+	virtual void drawInterface(int bufferNum = 3);
 
-	void whileMenuCounter();
+	virtual void doInvJF();
 
-	void printObjectDesc(const Common::String &str, bool firstTime);
-	void printObjectDesc();
+	virtual void summonWindow(const Surface &bgSurface, bool slideUp = true);
+	virtual void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
+	virtual void banishWindow(bool slideUp = true);
+	virtual void clearInfo();
+	virtual void clearWindow();
 
-	void summonWindow(const Surface &bgSurface, bool slideUp = true);
-	void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
-	void banishWindow(bool slideUp = true);
+	virtual void printObjectDesc();
+};
 
-	void restoreButton(int num);
+class TattooUserInterface : public UserInterface {
+public:
+	TattooUserInterface(SherlockEngine *vm);
+public:
+	virtual void handleInput();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 239562fc01e113383cac8bb5b44e3a67d904538e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 May 2015 14:33:57 +0200
Subject: SHERLOCK: Better decoding of ADPCM 4bit sounds, courtesy of m_kiewitz

---
 engines/sherlock/sound.cpp | 72 +++++++++++++++++++++++++++++-----------------
 engines/sherlock/sound.h   |  3 +-
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 59098c32cc..9f36d6d9b7 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -63,29 +63,44 @@ void Sound::loadSound(const Common::String &name, int priority) {
 	// No implementation required in ScummVM
 }
 
-char Sound::decodeSample(char sample, byte& prediction, int& step) {
-	char diff = ((sample & 0x07) << step);
-
-	if (sample & 0x08) {
-		if (prediction > diff)
-			prediction = prediction - ((sample & 0x07) << step);
-		else
-			prediction = 0;
+static int8 creativeADPCM_ScaleMap[64] = {
+	0,  1,  2,  3,  4,  5,  6,  7,  0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,
+	1,  3,  5,  7,  9, 11, 13, 15, -1,  -3,  -5,  -7,  -9, -11, -13, -15,
+	2,  6, 10, 14, 18, 22, 26, 30, -2,  -6, -10, -14, -18, -22, -26, -30,
+	4, 12, 20, 28, 36, 44, 52, 60, -4, -12, -20, -28, -36, -44, -52, -60
+};
+
+static uint8 creativeADPCM_AdjustMap[64] = {
+	0, 0, 0, 0, 0, 16, 16, 16,
+	0, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0,  0,  0,  0,
+	240, 0, 0, 0, 0,  0,  0,  0
+};
+
+byte Sound::decodeSample(byte sample, byte& reference, int16& scale) {
+	int16 samp = sample + scale;
+	int16 ref = 0;
+
+	// clip bad ADPCM-4 sample
+	CLIP(samp, 0, 63);
+
+	ref = reference + creativeADPCM_ScaleMap[samp];
+	if (ref > 0xff) {
+		reference = 0xff;
 	} else {
-		if (prediction < 0xff - diff)
-			prediction = prediction + ((sample&0x07) << step);
-		else
-			prediction = 0xff;
-	}
-
-
-	if ((sample & 0x07) >= 5 && step < 3) {
-		step ++;
-	} else if ((sample & 0x07) == 0 && step > 0) {
-		step --;
+		if (ref < 0x00) {
+			reference = 0;
+		} else {
+			reference = (uint8)(ref & 0xff);
+		}
 	}
 
-	return prediction;
+	scale = (scale + creativeADPCM_AdjustMap[samp]) & 0xff;
+	return reference;
 }
 
 bool Sound::playSound(const Common::String &name, WaitType waitType, int priority) {
@@ -94,7 +109,7 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 	Common::String filename = name;
 	if (!filename.contains('.'))
 		filename += ".SND";
-	
+
 	Common::SeekableReadStream *stream = _vm->_res->load(filename);
 
 	if (!stream)
@@ -107,16 +122,18 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 	byte *ptr = data;
 	stream->read(ptr, size);
 
+	assert(size > 2);
+
 	byte *decoded = (byte *)malloc((size - 1) * 2);
 
-	// +127 to eliminate the pop when the sound starts (signed vs unsigned PCM). Still does not help with the pop at the end
-	byte prediction = (ptr[0] & 0x0f) + 127;
-	int step = 0;
+	// Holmes uses Creative ADPCM 4-bit data
 	int counter = 0;
+	byte reference = ptr[0];
+	int16 scale = 0;
 
 	for(int i = 1; i < size; i++) {
-		decoded[counter++] = decodeSample((ptr[i]>>4)&0x0f, prediction, step);
-		decoded[counter++] = decodeSample((ptr[i]>>0)&0x0f, prediction, step);
+		decoded[counter++] = decodeSample((ptr[i]>>4)&0x0f, reference, scale);
+		decoded[counter++] = decodeSample((ptr[i]>>0)&0x0f, reference, scale);
 	}
 
 	free(data);
@@ -149,7 +166,7 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 			break;
 		}
 	} while (!_vm->shouldQuit() && _mixer->isSoundHandleActive(_effectsHandle));
-	
+
 	_soundPlaying = false;
 	_mixer->stopHandle(_effectsHandle);
 
@@ -234,3 +251,4 @@ void Sound::freeDigiSound() {
 }
 
 } // End of namespace Sherlock
+
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 659df57bc3..4d94c58f6f 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -46,7 +46,7 @@ private:
 	Audio::SoundHandle _effectsHandle;
 	int _curPriority;
 
-	char decodeSample(char sample, byte& prediction, int& step);
+	byte decodeSample(byte sample, byte& reference, int16& scale);
 public:
 	bool _digitized;
 	bool _music;
@@ -83,3 +83,4 @@ public:
 } // End of namespace Sherlock
 
 #endif
+
-- 
cgit v1.2.3


From 4af7b58e94bfa505900d363d0bb5c31a0e1f7278 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 May 2015 15:04:22 +0200
Subject: SHERLOCK: Fix compilation for gcc

---
 engines/sherlock/sound.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 9f36d6d9b7..40aa4fa81a 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -86,7 +86,7 @@ byte Sound::decodeSample(byte sample, byte& reference, int16& scale) {
 	int16 ref = 0;
 
 	// clip bad ADPCM-4 sample
-	CLIP(samp, 0, 63);
+	CLIP<int16>(samp, 0, 63);
 
 	ref = reference + creativeADPCM_ScaleMap[samp];
 	if (ref > 0xff) {
-- 
cgit v1.2.3


From 7cd4d1561032104657544d3deda9aada5c06da45 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 11:50:39 -0400
Subject: SHERLOCK: Fix scene loading when using a Small installation

---
 engines/sherlock/scene.cpp | 58 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 619c253bed..3dcfddd428 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -272,26 +272,52 @@ bool Scene::loadScene(const Common::String &filename) {
 			bgInfo[idx].load(*rrmStream);
 
 		// Read information
-		Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-			Resources::decompressLZ(*rrmStream, bgHeader._numStructs * 569 +
-				bgHeader._descSize + bgHeader._seqSize);
-
-		_bgShapes.resize(bgHeader._numStructs);
-		for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-			_bgShapes[idx].load(*infoStream);
+		if (!_lzwMode) {
+			_bgShapes.resize(bgHeader._numStructs);
+			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
+				_bgShapes[idx].load(*rrmStream);
+
+			if (bgHeader._descSize) {
+				_descText.resize(bgHeader._descSize);
+				rrmStream->read(&_descText[0], bgHeader._descSize);
+			}
 
-		if (bgHeader._descSize) {
-			_descText.resize(bgHeader._descSize);
-			infoStream->read(&_descText[0], bgHeader._descSize);
-		}
+			if (bgHeader._seqSize) {
+				_sequenceBuffer.resize(bgHeader._seqSize);
+				rrmStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
+			}
+		} else {
+			Common::SeekableReadStream *infoStream;
+			
+			// Read shapes
+			infoStream = Resources::decompressLZ(*rrmStream, bgHeader._numStructs * 569);
 
-		if (bgHeader._seqSize) {
-			_sequenceBuffer.resize(bgHeader._seqSize);
-			infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
-		}
+			_bgShapes.resize(bgHeader._numStructs);
+			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
+				_bgShapes[idx].load(*infoStream);
 
-		if (_lzwMode)
 			delete infoStream;
+			
+			// Read description texts
+			if (bgHeader._descSize) {
+				infoStream = Resources::decompressLZ(*rrmStream, bgHeader._descSize);
+
+				_descText.resize(bgHeader._descSize);
+				infoStream->read(&_descText[0], bgHeader._descSize);
+
+				delete infoStream;
+			}
+
+			// Read sequences
+			if (bgHeader._seqSize) {
+				infoStream = Resources::decompressLZ(*rrmStream, bgHeader._seqSize);
+
+				_sequenceBuffer.resize(bgHeader._seqSize);
+				infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
+
+				delete infoStream;
+			}
+		}
 
 		// Set up the list of images used by the scene
 		_images.resize(bgHeader._numImages + 1);
-- 
cgit v1.2.3


From 3b092e5d60760de81ceecdad0901c51883fe077e Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 17 May 2015 18:51:22 +0200
Subject: SCI: identifyOffsets() counter variables

---
 engines/sci/engine/script.cpp | 15 +++++++++++++++
 engines/sci/engine/script.h   |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 292c0e0efc..6034378ef6 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -65,7 +65,11 @@ void Script::freeScript() {
 	_lockers = 1;
 	_markedAsDeleted = false;
 	_objects.clear();
+
 	_offsetLookupArray.clear();
+	_offsetLookupObjectCount = 0;
+	_offsetLookupStringCount = 0;
+	_offsetLookupSaidCount = 0;
 }
 
 void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptPatcher) {
@@ -227,6 +231,10 @@ void Script::identifyOffsets() {
 	uint16 blockSize = 0;
 
 	_offsetLookupArray.clear();
+	_offsetLookupObjectCount = 0;
+	_offsetLookupStringCount = 0;
+	_offsetLookupSaidCount = 0;
+
 	if (getSciVersion() < SCI_VERSION_1_1) {
 		// SCI0 + SCI1
 		scriptDataPtr  = _buf;
@@ -272,6 +280,7 @@ void Script::identifyOffsets() {
 				arrayEntry.offset     = scriptDataPtr - _buf + 8; // Calculate offset inside script data (VM uses +8)
 				arrayEntry.stringSize = 0;
 				_offsetLookupArray.push_back(arrayEntry);
+				_offsetLookupObjectCount++;
 				break;
 
 			case SCI_OBJ_STRINGS:
@@ -316,6 +325,7 @@ void Script::identifyOffsets() {
 					arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
 					arrayEntry.stringSize = stringDataPtr - stringStartPtr;
 					_offsetLookupArray.push_back(arrayEntry);
+					_offsetLookupStringCount++;
 				} while (1);
 				break;
 
@@ -365,6 +375,7 @@ void Script::identifyOffsets() {
 					arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
 					arrayEntry.stringSize = 0;
 					_offsetLookupArray.push_back(arrayEntry);
+					_offsetLookupSaidCount++;
 				} while (1);
 				break;
 
@@ -415,6 +426,7 @@ void Script::identifyOffsets() {
 			arrayEntry.offset     = scriptDataPtr - _buf - 2; // the VM uses a pointer to the Magic-Number
 			arrayEntry.stringSize = 0;
 			_offsetLookupArray.push_back(arrayEntry);
+			_offsetLookupObjectCount++;
 
 			if (scriptDataLeft < 2)
 				error("Script::identifyOffsets(): unexpected end of script in script %d", _nr);
@@ -467,6 +479,7 @@ void Script::identifyOffsets() {
 			arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
 			arrayEntry.stringSize = stringDataPtr - stringStartPtr;
 			_offsetLookupArray.push_back(arrayEntry);
+			_offsetLookupStringCount++;
 		} while (1);
 
 	} else if (getSciVersion() == SCI_VERSION_3) {
@@ -504,6 +517,7 @@ void Script::identifyOffsets() {
 			arrayEntry.offset     = scriptDataPtr - _buf - 2; // the VM uses a pointer to the Magic-Number
 			arrayEntry.stringSize = 0;
 			_offsetLookupArray.push_back(arrayEntry);
+			_offsetLookupObjectCount++;
 
 			if (scriptDataLeft < 2)
 				error("Script::identifyOffsets(): unexpected end of script in script %d", _nr);
@@ -570,6 +584,7 @@ void Script::identifyOffsets() {
 				arrayEntry.offset     = stringStartPtr - _buf; // Calculate offset inside script data
 				arrayEntry.stringSize = stringDataPtr - stringStartPtr;
 				_offsetLookupArray.push_back(arrayEntry);
+				_offsetLookupStringCount++;
 
 				// SCI3 seems to have aligned all string on DWORD boundaries
 				sci3BoundaryOffset = stringDataPtr - _buf; // Calculate current offset inside script data
diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index abe6409b98..755e2f3698 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -93,6 +93,11 @@ private:
 protected:
 	offsetLookupArrayType _offsetLookupArray; // Table of all elements of currently loaded script, that may get pointed to
 
+private:
+	uint16 _offsetLookupObjectCount;
+	uint16 _offsetLookupStringCount;
+	uint16 _offsetLookupSaidCount;
+
 public:
 	int getLocalsOffset() const { return _localsOffset; }
 	uint16 getLocalsCount() const { return _localsCount; }
@@ -270,6 +275,9 @@ public:
 	 * Get the offset array
 	 */
 	const offsetLookupArrayType *getOffsetArray() { return &_offsetLookupArray; };
+	uint16 getOffsetObjectCount() { return _offsetLookupObjectCount; };
+	uint16 getOffsetStringCount() { return _offsetLookupStringCount; };
+	uint16 getOffsetSaidCount() { return _offsetLookupSaidCount; };
 
 private:
 	/**
-- 
cgit v1.2.3


From 2abb5f19772125ec5b91619e39ffd2fd4b733641 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 14:01:35 -0400
Subject: SHERLOCK: Fix decompression of resources from library files

---
 engines/sherlock/resources.cpp | 32 +++++++++++++++++++-------------
 engines/sherlock/resources.h   |  2 ++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index b5f4f5f6dd..f6fbded9b1 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -164,20 +164,10 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 
 			stream->seek(entry._offset);
 			Common::SeekableReadStream *resStream = stream->readStream(entry._size);
+			decompressIfNecessary(resStream);
 
-			// Check whether the file is compressed
-			if (resStream->readUint32BE() == MKTAG('L', 'Z', 'V', 26)) {
-				resStream->seek(0);
-				// It's compressed, so decompress the sub-file and return it
-				Common::SeekableReadStream *decompressed = decompressLZ(*resStream);
-				delete stream;
-				delete resStream;
-				return decompressed;
-			} else {
-				resStream->seek(0);
-				delete stream;
-				return resStream;
-			}
+			delete stream;
+			return resStream;
 		}
 	}
 
@@ -188,10 +178,25 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 
 	Common::SeekableReadStream *stream = f.readStream(f.size());
 	f.close();
+	decompressIfNecessary(stream);
 
 	return stream;
 }
 
+/**
+ * Checks the passed stream, and if is compressed, deletes it and replaces it with it's uncompressed data
+ */
+void Resources::decompressIfNecessary(Common::SeekableReadStream *&stream) {
+	bool isCompressed = stream->readUint32BE() == MKTAG('L', 'Z', 'V', 26);
+	stream->seek(-4, SEEK_CUR);
+
+	if (isCompressed) {
+		Common::SeekableReadStream *newStream = decompressLZ(*stream);
+		delete stream;
+		stream = newStream;
+	}
+}
+
 /**
  * Loads a specific resource from a given library file
  */
@@ -207,6 +212,7 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename, cons
 	LibraryEntry &entry = _indexes[libraryFile][filename];
 	libStream->seek(entry._offset);
 	Common::SeekableReadStream *stream = libStream->readStream(entry._size);
+	decompressIfNecessary(stream);
 
 	delete libStream;
 	return stream;
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index d5e83a1745..6bb0682f8d 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -81,6 +81,8 @@ public:
 	void addToCache(const Common::String &filename, Common::SeekableReadStream &stream);
 	bool isInCache(const Common::String &filename) const { return _cache.isCached(filename); }
 
+	void decompressIfNecessary(Common::SeekableReadStream *&stream);
+
 	Common::SeekableReadStream *load(const Common::String &filename);
 
 	Common::SeekableReadStream *load(const Common::String &filename, const Common::String &libraryFile);
-- 
cgit v1.2.3


From 5e351b6bf3988b33a6af952331039083c3b2aff8 Mon Sep 17 00:00:00 2001
From: sirlemonhead
Date: Sun, 17 May 2015 20:41:42 +0100
Subject: SHERLOCK: Replace scumm_stricmp() with equalsIgnoreCase()

---
 engines/sherlock/inventory.cpp      | 10 +++++-----
 engines/sherlock/people.cpp         |  2 +-
 engines/sherlock/saveload.cpp       |  2 +-
 engines/sherlock/scene.cpp          |  5 ++---
 engines/sherlock/talk.cpp           |  4 ++--
 engines/sherlock/user_interface.cpp |  8 ++++----
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 1997807d15..8da83aa5da 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -132,7 +132,7 @@ void Inventory::loadGraphics() {
  */
 int Inventory::findInv(const Common::String &name) {
 	for (int idx = 0; idx < (int)_names.size(); ++idx) {
-		if (scumm_stricmp(name.c_str(), _names[idx].c_str()) == 0)
+		if (name.equalsIgnoreCase(_names[idx]))
 			return idx;
 	}
 
@@ -389,7 +389,7 @@ int Inventory::putNameInInventory(const Common::String &name) {
 
 	for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
 		Object &o = scene._bgShapes[idx];
-		if (scumm_stricmp(name.c_str(), o._name.c_str()) == 0 && o._type != INVALID) {
+		if (name.equalsIgnoreCase(o._name) && o._type != INVALID) {
 			putItemInInventory(o);
 			++matches;
 		}
@@ -411,13 +411,13 @@ int Inventory::putItemInInventory(Object &obj) {
 		_vm->setFlags(obj._pickupFlag);
 
 	for (int useNum = 0; useNum < 4; ++useNum) {
-		if (scumm_stricmp(obj._use[useNum]._target.c_str(), "*PICKUP*") == 0) {
+		if (obj._use[useNum]._target.equalsIgnoreCase("*PICKUP*")) {
 			pickupFound = true;
 
 			for (int namesNum = 0; namesNum < 4; ++namesNum) {
 				for (uint bgNum = 0; bgNum < scene._bgShapes.size(); ++bgNum) {
 					Object &bgObj = scene._bgShapes[bgNum];
-					if (scumm_stricmp(obj._use[useNum]._names[namesNum].c_str(), bgObj._name.c_str()) == 0) {
+					if (obj._use[useNum]._names[namesNum].equalsIgnoreCase(bgObj._name)) {
 						copyToInventory(bgObj);
 						if (bgObj._pickupFlag)
 							_vm->setFlags(bgObj._pickupFlag);
@@ -485,7 +485,7 @@ int Inventory::deleteItemFromInventory(const Common::String &name) {
 	int invNum = -1;
 
 	for (int idx = 0; idx < (int)size() && invNum == -1; ++idx) {
-		if (scumm_stricmp(name.c_str(), (*this)[idx]._name.c_str()) == 0)
+		if (name.equalsIgnoreCase((*this)[idx]._name))
 			invNum = idx;
 	}
 
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 0eda40c03f..9a42f94d4d 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -620,7 +620,7 @@ int People::findSpeaker(int speaker) {
 		if (obj._type == ACTIVE_BG_SHAPE) {
 			Common::String name(obj._name.c_str(), obj._name.c_str() + 4);
 
-			if (scumm_stricmp(PORTRAITS[speaker], name.c_str()) == 0
+			if (name.equalsIgnoreCase(PORTRAITS[speaker])
 				&& obj._name[4] >= '0' && obj._name[4] <= '9')
 				return idx;
 		}
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index b9ac3e79d6..0ac25a2f1a 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -441,7 +441,7 @@ bool SaveManager::getFilename(int slot) {
 	screen.buttonPrint(Common::Point(ENV_POINTS[5][2], CONTROLS_Y), COMMAND_NULL, true, "Quit");
 
 	Common::String saveName = _savegames[slot];
-	if (scumm_stricmp(saveName.c_str(), "-EMPTY-") == 0) {
+	if (saveName.equalsIgnoreCase("-EMPTY-")) {
 		// It's an empty slot, so start off with an empty save name
 		saveName = "";
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 3dcfddd428..8a906e9335 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -617,8 +617,7 @@ void Scene::checkSceneFlags(bool flag) {
 void Scene::checkInventory() {
 	for (uint shapeIdx = 0; shapeIdx < _bgShapes.size(); ++shapeIdx) {
 		for (int invIdx = 0; invIdx < _vm->_inventory->_holdings; ++invIdx) {
-			if (scumm_stricmp(_bgShapes[shapeIdx]._name.c_str(),
-				(*_vm->_inventory)[invIdx]._name.c_str()) == 0) {
+			if (_bgShapes[shapeIdx]._name.equalsIgnoreCase((*_vm->_inventory)[invIdx]._name)) {
 				_bgShapes[shapeIdx]._type = INVALID;
 				break;
 			}
@@ -757,7 +756,7 @@ int Scene::toggleObject(const Common::String &name) {
 	int count = 0;
 
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		if (scumm_stricmp(name.c_str(), _bgShapes[idx]._name.c_str()) == 0) {
+		if (name.equalsIgnoreCase(_bgShapes[idx]._name)) {
 			++count;
 			_bgShapes[idx].toggleHidden();
 		}
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index d656431823..b38b432e37 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1160,7 +1160,7 @@ void Talk::doScript(const Common::String &script) {
 				// Scan for object
 				int objId = -1;
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
-					if (scumm_stricmp(tempString.c_str(), scene._bgShapes[idx]._name.c_str()) == 0)
+					if (tempString.equalsIgnoreCase(scene._bgShapes[idx]._name))
 						objId = idx;
 				}
 				if (objId == -1)
@@ -1372,7 +1372,7 @@ void Talk::doScript(const Common::String &script) {
 
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
 					Object &object = scene._bgShapes[idx];
-					if (scumm_stricmp(tempString.c_str(), object._name.c_str()) == 0) {
+					if (tempString.equalsIgnoreCase(object._name)) {
 						// Only toggle the object if it's not in the desired state already
 						if ((object._type == HIDDEN && state) || (object._type != HIDDEN && !state))
 							object.toggleHidden();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 1521421c15..d5ff828aee 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2177,17 +2177,17 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 	int targetNum = -1;
 	if (giveMode) {
 		for (int idx = 0; idx < 4 && targetNum == -1; ++idx) {
-			if ((scumm_stricmp(use[idx]._target.c_str(), "*GIVE*") == 0 || scumm_stricmp(use[idx]._target.c_str(), "*GIVEP*") == 0)
-					&& scumm_stricmp(use[idx]._names[0].c_str(), invName.c_str()) == 0) {
+			if ((use[idx]._target.equalsIgnoreCase("*GIVE*") || use[idx]._target.equalsIgnoreCase("*GIVEP*"))
+					&& use[idx]._names[0].equalsIgnoreCase(invName)) {
 				// Found a match
 				targetNum = idx;
-				if (scumm_stricmp(use[idx]._target.c_str(), "*GIVE*") == 0)
+				if (use[idx]._target.equalsIgnoreCase("*GIVE*"))
 					inv.deleteItemFromInventory(invName);
 			}
 		}
 	} else {
 		for (int idx = 0; idx < 4 && targetNum == -1; ++idx) {
-			if (scumm_stricmp(use[idx]._target.c_str(), invName.c_str()) == 0)
+			if (use[idx]._target.equalsIgnoreCase(invName))
 				targetNum = idx;
 		}
 	}
-- 
cgit v1.2.3


From f724cfcd22e4303d3c28dcca4e4789f5a21a09d6 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 17 May 2015 22:55:58 +0200
Subject: SHERLOCK: Skip a couple of cached files for interactive demo

---
 engines/sherlock/sound.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 40aa4fa81a..e0552a8b5e 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -45,9 +45,12 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_speechOn = true;
 
 	_vm->_res->addToCache("MUSIC.LIB");
-	_vm->_res->addToCache("TITLE.SND");
-	_vm->_res->addToCache("EPILOGUE.SND");
 	_vm->_res->addToCache("SND.SND");
+
+	if (!_vm->getIsDemo()) {
+		_vm->_res->addToCache("TITLE.SND");
+		_vm->_res->addToCache("EPILOGUE.SND");
+	}
 }
 
 /**
-- 
cgit v1.2.3


From f55ff7ba2184168bcbb3131a7ae978bc75032ff0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 17:21:21 -0400
Subject: SHERLOCK: Fix display of beveled background when entering Journal
 search

---
 engines/sherlock/journal.cpp |  6 ++----
 engines/sherlock/screen.cpp  | 14 +++++++++++++-
 engines/sherlock/screen.h    |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 2a7aeb4f2d..d510738da0 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1033,9 +1033,7 @@ int Journal::getFindName(bool printError) {
 	screen.makeButton(Common::Rect(SEARCH_POINTS[2][0], yp, SEARCH_POINTS[2][1], yp + 10),
 		SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, "Forward");
 
-	screen.gPrint(Common::Point(SEARCH_POINTS[0][2] - screen.stringWidth("Exit") / 2, yp), COMMAND_FOREGROUND, "E");
-	screen.gPrint(Common::Point(SEARCH_POINTS[1][2] - screen.stringWidth("Backward") / 2, yp), COMMAND_FOREGROUND, "B");
-	screen.gPrint(Common::Point(SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, yp), COMMAND_FOREGROUND, "F");
+	screen.makeField(Common::Rect(12, 185, 307, 196));
 
 	screen.fillRect(Common::Rect(12, 185, 307, 186), BUTTON_BOTTOM);
 	screen.vLine(12, 185, 195, BUTTON_BOTTOM);
@@ -1160,7 +1158,7 @@ int Journal::getFindName(bool printError) {
 				break;
 			}
 		}
-	} while (!done);
+	} while (!done && !_vm->shouldQuit());
 
 	if (done != -1) {
 		_find = name;
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index cbf18f146f..c1c53fbe65 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -467,7 +467,7 @@ void Screen::buttonPrint(const Common::Point &pt, byte color, bool slamIt,
 }
 
 /**
- * Draw a panel in th eback buffer with a raised area effect around the edges
+ * Draw a panel in the back buffer with a raised area effect around the edges
  */
 void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->fillRect(r, BUTTON_MIDDLE);
@@ -482,6 +482,18 @@ void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->hLine(r.left + 1, r.bottom - 2, r.right - 1, BUTTON_BOTTOM);
 }
 
+/**
+ * Draw a field in the back buffer with a raised area effect around the edges,
+ * suitable for text input.
+ */
+void Screen::makeField(const Common::Rect &r) {
+	_backBuffer->fillRect(r, BUTTON_MIDDLE);
+	_backBuffer->hLine(r.left, r.top, r.right - 1, BUTTON_BOTTOM);
+	_backBuffer->hLine(r.left + 1, r.bottom - 1, r.right - 1, BUTTON_TOP);
+	_backBuffer->vLine(r.left, r.top + 1, r.bottom - 1, BUTTON_BOTTOM);
+	_backBuffer->vLine(r.right - 1, r.top + 1, r.bottom - 2, BUTTON_TOP);
+}
+
 /**
  * Sets the active back buffer pointer to a restricted sub-area of the first back buffer
  */
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 1f3c23748f..2103588fe0 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -123,6 +123,7 @@ public:
 	void buttonPrint(const Common::Point &pt, byte color, bool slamIt, const Common::String &str);
 
 	void makePanel(const Common::Rect &r);
+	void makeField(const Common::Rect &r);
 
 	void setDisplayBounds(const Common::Rect &r);
 	void resetDisplayBounds();
-- 
cgit v1.2.3


From 12f260d66ea3443dd4b0c599c42d02ed7d0324d1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 17:33:42 -0400
Subject: SHERLOCK: Journal searches are uppercase

---
 engines/sherlock/journal.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index d510738da0..b9b66e74ad 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1139,10 +1139,11 @@ int Journal::getFindName(bool printError) {
 			if (keyState.keycode >= Common::KEYCODE_SPACE && keyState.keycode <= Common::KEYCODE_z
 					&& keyState.keycode != Common::KEYCODE_AT && name.size() < 50
 					&& (xp + screen.charWidth(keyState.keycode)) < 296) {
+				char ch = toupper(keyState.keycode);
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
-				screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", (char)keyState.keycode);
-				xp += screen.charWidth((char)keyState.keycode);
-				name += (char)keyState.keycode;
+				screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", ch);
+				xp += screen.charWidth(ch);
+				name += ch;
 			}
 		}
 
-- 
cgit v1.2.3


From 46c68176f8311ca9ae1e5982da4520de20830431 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 17:50:13 -0400
Subject: SHERLOCK: Journal search buttons shouldn't have keyboard highlights

---
 engines/sherlock/journal.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index b9b66e74ad..9fad7bdfad 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1032,6 +1032,12 @@ int Journal::getFindName(bool printError) {
 		SEARCH_POINTS[1][2] - screen.stringWidth("Backward") / 2, "Backward");
 	screen.makeButton(Common::Rect(SEARCH_POINTS[2][0], yp, SEARCH_POINTS[2][1], yp + 10),
 		SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, "Forward");
+	screen.gPrint(Common::Point(SEARCH_POINTS[0][2] - screen.stringWidth("Exit") / 2, yp),
+		COMMAND_FOREGROUND, "E");
+	screen.gPrint(Common::Point(SEARCH_POINTS[1][2] - screen.stringWidth("Backward") / 2, yp),
+		COMMAND_FOREGROUND, "B");
+	screen.gPrint(Common::Point(SEARCH_POINTS[2][2] - screen.stringWidth("Forward") / 2, yp),
+		COMMAND_FOREGROUND, "F");
 
 	screen.makeField(Common::Rect(12, 185, 307, 196));
 
-- 
cgit v1.2.3


From b1b7ee33dfa3cf675f7c02daf825c0b0d277227d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 May 2015 18:02:49 -0400
Subject: SHERLOCK: Highlight found search matches in the journal

---
 engines/sherlock/journal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 9fad7bdfad..dc4ab9495f 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -562,7 +562,7 @@ bool Journal::drawJournal(int direction, int howFar) {
 	int yp = 37;
 	int startPage = _page;
 	bool endJournal = false;
-	bool firstOccurance = false;
+	bool firstOccurance = true;
 	bool searchSuccessful = false;
 	bool endFlag = false;
 	int lineNum = 0;
-- 
cgit v1.2.3


From 08744f4ebf140a826715af2c295f4c3cc393bce2 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Mon, 18 May 2015 16:09:44 +1000
Subject: AGOS: Fix restoring room state, when changing rooms in PC version of
 Waxworks.

---
 engines/agos/rooms.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index 6185653d42..0eac79e83f 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -446,13 +446,13 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
 
 							itemTmp = derefItem(itemTmp->next);
 						}
-					}
 
-					uint16 num = (itemNum - _itemArrayInited);
-					item->state = _roomStates[num].state;
-					item->classFlags = _roomStates[num].classFlags;
-					SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
-					subRoom->roomExitStates = _roomStates[num].roomExitStates;
+						uint16 num = (itemNum - _itemArrayInited);
+						item->state = _roomStates[num].state;
+						item->classFlags = _roomStates[num].classFlags;
+						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
+						subRoom->roomExitStates = _roomStates[num].roomExitStates;
+					 }
 				}
 				in.close();
 
-- 
cgit v1.2.3


From 1aa67cbc9630505452afa23e2db30c52a34178e4 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Mon, 18 May 2015 17:12:08 +1000
Subject: AGOS: Revert last change for PC version of Waxworks.

---
 engines/agos/rooms.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index 0eac79e83f..c79b029fdc 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -446,13 +446,14 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
 
 							itemTmp = derefItem(itemTmp->next);
 						}
+					}
+
+					uint16 num = (itemNum - _itemArrayInited);
+					item->state = _roomStates[num].state;
+					item->classFlags = _roomStates[num].classFlags;
+					SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
+					subRoom->roomExitStates = _roomStates[num].roomExitStates;
 
-						uint16 num = (itemNum - _itemArrayInited);
-						item->state = _roomStates[num].state;
-						item->classFlags = _roomStates[num].classFlags;
-						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
-						subRoom->roomExitStates = _roomStates[num].roomExitStates;
-					 }
 				}
 				in.close();
 
-- 
cgit v1.2.3


From 994195befa7a9c216267a14a02b4afa5ecac5968 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 18 May 2015 11:46:14 +0300
Subject: SCI: Reenable an English Amiga version of Hoyle 1 (bug #6870)

---
 engines/sci/detection_tables.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 312069025b..03282223aa 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -904,8 +904,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
-#if 0 // TODO: unknown if these files are corrupt
-	// Hoyle 1 - English Amiga (from www.back2roots.org)
+	// Hoyle 1 - English Amiga (from www.back2roots.org - verified by waltervn in bug report #6870)
 	// SCI interpreter version 0.000.519 - FIXME: some have 0.000.530, others x.yyy.zzz
 	{"hoyle1", "", {
 		{"resource.map", 0, "2a72b1aba65fa6e339370eb86d8601d1", 5166},
@@ -913,7 +912,6 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 439502},
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
-#endif
 
 	// Hoyle 2 - English DOS
 	// SCI interpreter version 0.000.572
-- 
cgit v1.2.3


From 158f491b445132cf8ebbb6fc184c8e08eaef657f Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 18 May 2015 10:52:37 +0200
Subject: SCI: add game & int version to hoyle 1 amiga

---
 engines/sci/detection_tables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 03282223aa..7cadcfc27e 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -905,7 +905,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
 	// Hoyle 1 - English Amiga (from www.back2roots.org - verified by waltervn in bug report #6870)
-	// SCI interpreter version 0.000.519 - FIXME: some have 0.000.530, others x.yyy.zzz
+	// Game version 1.000.139, SCI interpreter version x.yyy.zzz
 	{"hoyle1", "", {
 		{"resource.map", 0, "2a72b1aba65fa6e339370eb86d8601d1", 5166},
 		{"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 218755},
-- 
cgit v1.2.3


From f0ccd3f91a2a412f7e4a1cab067ef6d8dddf561b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 18 May 2015 19:15:35 +0200
Subject: SCI: sq4cd scriptpatch clothes change points #6866

script patch, so that points are awarded, when
changing back clothes. You have to clean out the
bank account again, because that's the problematic
script. Also happened in original interpreter.
Only happened for Space Quest 4 CD
worked in floppy
---
 engines/sci/engine/script_patches.cpp | 60 +++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index a954d65a90..6915e12a0e 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2775,9 +2775,64 @@ static const uint16 sq4CdSignatureWalkInFromBelowRoom45[] = {
 
 static const uint16 sq4CdPatchWalkInFromBelowRoom45[] = {
 	PATCH_ADDTOOFFSET(+2),
-	0x38, PATCH_UINT16(0x00bc),        // pushi 00BCh
+	0x38, PATCH_UINT16(0x00bc),         // pushi 00BCh
 	PATCH_ADDTOOFFSET(+15),
-	0x38, PATCH_UINT16(0x00bb),        // pushi 00BBh
+	0x38, PATCH_UINT16(0x00bb),         // pushi 00BBh
+	PATCH_END
+};
+
+// It seems that Sierra forgot to set a script flag, when cleaning out the bank account
+// in Space Quest 4 CD. This was probably caused by the whole bank account interaction
+// getting a rewrite and polish in the CD version.
+//
+// Because of this bug, points for changing back clothes will not get awarded, which
+// makes it impossible to get a perfect point score in the CD version of the game.
+// The points are awarded by rm371::doit in script 371.
+//
+// We fix this. Bug also happened, when using the original interpreter.
+// Bug does not happen for PC floppy.
+//
+// Attention: Some Let's Plays on youtube show that points are in fact awarded. Which is true.
+//            But those Let's Plays were actually created by playing a hacked Space Quest 4 version
+//            (which is part Floppy, part CD version - we consider it to be effectively pirated)
+//            and not the actual CD version of Space Quest 4.
+//            It's easy to identify - talkie + store called "Radio Shack" -> is hacked version.
+//
+// Applies to at least: English PC CD
+// Responsible method: but2Script::changeState(2)
+// Fixes bug: #6866
+static const uint16 sq4CdSignatureGetPointsForChangingBackClothes[] = {
+	0x35, 0x02,                         // ldi 02
+	SIG_MAGICDWORD,
+	0x1a,                               // eq?
+	0x30, SIG_UINT16(0x006a),           // bnt [state 3]
+	0x76,
+	SIG_ADDTOOFFSET(+46),               // jump over "withdraw funds" code
+	0x33, 0x33,                         // jmp [end of state 2, set cycles code]
+	SIG_ADDTOOFFSET(+51),               // jump over "clean bank account" code
+	0x35, 0x02,                         // ldi 02
+	0x65, 0x1a,                         // aTop cycles
+	0x33, 0x0b,                         // jmp [toss/ret]
+	0x3c,                               // dup
+	0x35, 0x03,                         // ldi 03
+	0x1a,                               // eq?
+	0x31, 0x05,                         // bnt [toss/ret]
+	SIG_END
+};
+
+static const uint16 sq4CdPatchGetPointsForChangingBackClothes[] = {
+	PATCH_ADDTOOFFSET(+3),
+	0x30, PATCH_UINT16(0x0070),         // bnt [state 3]
+	PATCH_ADDTOOFFSET(+47),             // "withdraw funds" code
+	0x33, 0x39,                         // jmp [end of state 2, set cycles code]
+	PATCH_ADDTOOFFSET(+51),
+	0x78,                               // push1
+	0x39, 0x1d,                         // ldi 1Dh
+	0x45, 0x07, 0x02,                   // call export 7 of script 0 (set flag) -> effectively sets global 73h, bit 2
+	0x35, 0x02,                         // ldi 02
+	0x65, 0x1c,                         // aTop cycles
+	0x33, 0x05,                         // jmp [toss/ret]
+	// check for state 3 code removed to save 6 bytes
 	PATCH_END
 };
 
@@ -2876,6 +2931,7 @@ static const SciScriptPatcherEntry sq4Signatures[] = {
 	{  true,   298, "Floppy: endless flight",                      1, sq4FloppySignatureEndlessFlight,               sq4FloppyPatchEndlessFlight },
 	{  true,   700, "Floppy: throw stuff at sequel police bug",    1, sq4FloppySignatureThrowStuffAtSequelPoliceBug, sq4FloppyPatchThrowStuffAtSequelPoliceBug },
 	{  true,    45, "CD: walk in from below for room 45 fix",      1, sq4CdSignatureWalkInFromBelowRoom45,           sq4CdPatchWalkInFromBelowRoom45 },
+	{  true,   396, "CD: get points for changing back clothes fix",1, sq4CdSignatureGetPointsForChangingBackClothes, sq4CdPatchGetPointsForChangingBackClothes },
 	{  true,     0, "CD: Babble icon speech and subtitles fix",    1, sq4CdSignatureBabbleIcon,                      sq4CdPatchBabbleIcon },
 	{  true,   818, "CD: Speech and subtitles option",             1, sq4CdSignatureTextOptions,                     sq4CdPatchTextOptions },
 	{  true,   818, "CD: Speech and subtitles option button",      1, sq4CdSignatureTextOptionsButton,               sq4CdPatchTextOptionsButton },
-- 
cgit v1.2.3


From da9333a924d945c3bd59eb1f8d3dd17d86b5d572 Mon Sep 17 00:00:00 2001
From: sirlemonhead
Date: Mon, 18 May 2015 18:20:54 +0100
Subject: SHERLOCK: Fix code formatting issues and comment spelling mistakes

---
 engines/sherlock/animation.cpp | 2 +-
 engines/sherlock/animation.h   | 1 -
 engines/sherlock/detection.cpp | 6 +++---
 engines/sherlock/inventory.cpp | 4 ++--
 engines/sherlock/journal.cpp   | 8 +++-----
 engines/sherlock/people.cpp    | 4 ++--
 engines/sherlock/people.h      | 4 ++--
 engines/sherlock/scene.cpp     | 2 +-
 8 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 1d6c12f668..6cdefaffbd 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -28,7 +28,7 @@ namespace Sherlock {
 
 static const int NO_FRAMES = FRAMES_END;
 
-Animation::Animation(SherlockEngine *vm): _vm(vm) {
+Animation::Animation(SherlockEngine *vm) : _vm(vm) {
 }
 
 /**
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index 06614df6b1..cd22a5c30a 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -44,7 +44,6 @@ private:
 	Common::Array<Common::Array<int> > _titleFrames;
 
 	const int *checkForSoundFrames(const Common::String &filename);
-public:
 public:
 	Animation(SherlockEngine *vm);
 
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 2804ec1d31..00f6a1256e 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -66,7 +66,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_ORIGINAL_SAVES,
 		{
 			_s("Use original savegame dialog"),
-			_s("Files button in-game shows original savegame dialog rather than ScummVM menu"),
+			_s("Files button in-game shows original savegame dialog rather than the ScummVM menu"),
 			"originalsaveload",
 			false
 		}
@@ -197,7 +197,7 @@ SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, i
 
 
 #if PLUGIN_ENABLED_DYNAMIC(SHERLOCK)
-REGISTER_PLUGIN_DYNAMIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine);
+	REGISTER_PLUGIN_DYNAMIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine);
 #else
-REGISTER_PLUGIN_STATIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine);
+	REGISTER_PLUGIN_STATIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine);
 #endif
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 8da83aa5da..5b548bb9e3 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -128,7 +128,7 @@ void Inventory::loadGraphics() {
 
 /**
  * Searches through the list of names that correspond to the inventory items
- * and returns the numer that matches the passed name
+ * and returns the number that matches the passed name
  */
 int Inventory::findInv(const Common::String &name) {
 	for (int idx = 0; idx < (int)_names.size(); ++idx) {
@@ -150,7 +150,7 @@ void Inventory::putInv(int slamIt) {
 	UserInterface &ui = *_vm->_ui;
 
 	// If an inventory item has disappeared (due to using it or giving it),
-	// a blank space slot may haave appeared. If so, adjust the inventory
+	// a blank space slot may have appeared. If so, adjust the inventory
 	if (_invIndex > 0 && _invIndex > (_holdings - 6)) {
 		--_invIndex;
 		freeGraphics();
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 2a7aeb4f2d..966ed55b81 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -248,7 +248,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 
 		// Is it a control character?
 		if (c < 128) {
-			// Nope. Set flag for allowing control coes to insert spaces
+			// Nope. Set flag for allowing control codes to insert spaces
 			ctrlSpace = true;
 			assert(c >= ' ');
 
@@ -898,7 +898,6 @@ bool Journal::handleEvents(int key) {
 		}
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[7][2], JOURNAL_BUTTONS_Y + 11), color, true, "Last Page");
 
-
 		// Print Text button
 		if (pt.x > JOURNAL_POINTS[8][0] && pt.x < JOURNAL_POINTS[8][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
 				pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty()) {
@@ -922,14 +921,14 @@ bool Journal::handleEvents(int key) {
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
 
-	if (((found == BTN_UP && events._released) || key =='U') && _up) {
+	if (((found == BTN_UP && events._released) || key == 'U') && _up) {
 		// Scroll up
 		drawJournal(1, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
 
-	if (((found == BTN_DOWN && events._released) || key =='D') && _down) {
+	if (((found == BTN_DOWN && events._released) || key == 'D') && _down) {
 		// Scroll down
 		drawJournal(2, LINES_PER_PAGE);
 		doArrows();
@@ -951,7 +950,6 @@ bool Journal::handleEvents(int key) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
 		bool notFound = false;
 
-
 		do {
 			int dir;
 			if ((dir = getFindName(notFound)) != 0) {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 9a42f94d4d..ad7c37a8c4 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -119,7 +119,7 @@ const char PORTRAITS[MAX_PEOPLE][5] = {
 	{ "INSP" }			// Inspector Lestrade (Scotland Yard)
 };
 
-const char  *const NAMES[MAX_PEOPLE] = {
+const char *const NAMES[MAX_PEOPLE] = {
 	"Sherlock Holmes",
 	"Dr. Watson",
 	"Inspector Lestrade",
@@ -221,7 +221,7 @@ People::~People() {
  * Reset the player data
  */
 void People::reset() {
-	// Note: The engine has theoretical support for two player charactersm but only the first one is used.
+	// Note: The engine has theoretical support for two player characters but only the first one is used.
 	// Watson is, instead, handled by a different sprite in each scene, with a very simple initial movement, if any
 	Sprite &p = _data[PLAYER];
 
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index f98c3db867..9ac1a797c6 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -53,12 +53,12 @@ enum {
 	MAP_DOWN = 5, MAP_DOWNLEFT = 6, MAP_LEFT = 2, MAP_UPLEFT = 8
 };
 
-extern const char  *const NAMES[MAX_PEOPLE];
+extern const char *const NAMES[MAX_PEOPLE];
 extern const char PORTRAITS[MAX_PEOPLE][5];
 
 class SherlockEngine;
 
-class Person: public Sprite {
+class Person : public Sprite {
 public:
 	Person() : Sprite() {}
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 8a906e9335..41d9284024 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -964,7 +964,7 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	if (talk._talkToAbort)
 		return 1;
 
-	// Add new anim shape entry for displaying the animationo
+	// Add new anim shape entry for displaying the animation
 	_canimShapes.push_back(Object());
 	Object &cObj = _canimShapes[_canimShapes.size() - 1];
 
-- 
cgit v1.2.3


From c64652bbb651a911e7cf23bfc6274f74388f7d3a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 18 May 2015 19:38:44 +0200
Subject: SCI: sq4cd: extend skateorama workaround bug #6853

---
 engines/sci/engine/workarounds.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index ea3443e551..aab32032f7 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -603,8 +603,8 @@ const SciWorkaroundEntry kGraphRedrawBox_workarounds[] = {
 	{ GID_SQ4,           405,   405,  0,       "swimAfterEgo", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
 	{ GID_SQ4,           405,   405,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
 	{ GID_SQ4,           406,   406,  0,        "egoFollowed", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // FLOPPY: when getting shot by the police - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,       "swimAndShoot", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-	{ GID_SQ4,           406,   406,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
+	{ GID_SQ4,            -1,   406,  0,       "swimAndShoot", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
+	{ GID_SQ4,            -1,   406,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573 (is for both egoFollowed and swimAndShoot)
 	{ GID_SQ4,           410,   410,  0,       "swimAfterEgo", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
 	{ GID_SQ4,           410,   410,  0,                   "", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air... Russian version - bug #5573
 	{ GID_SQ4,           411,   411,  0,       "swimAndShoot", "changeState",                      NULL,     0, { WORKAROUND_STILLCALL, 0 } }, // skateOrama when "swimming" in the air - accidental additional parameter specified
-- 
cgit v1.2.3


From d82d476b277f80b69514fcb360ec47e9482e4a28 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 18 May 2015 20:57:27 +0200
Subject: SHERLOCK: Add code to make non-interactive demo completable

---
 engines/sherlock/journal.cpp         |  6 ++++--
 engines/sherlock/resources.cpp       | 12 +++++++-----
 engines/sherlock/scalpel/scalpel.cpp | 10 +++++-----
 engines/sherlock/screen.cpp          |  4 ++++
 engines/sherlock/sherlock.cpp        | 10 ++++++++++
 engines/sherlock/sherlock.h          |  1 +
 engines/sherlock/sound.cpp           | 15 ++++++++++-----
 engines/sherlock/user_interface.cpp  | 10 ++++++++--
 8 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index dc4ab9495f..3b63294b06 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -57,8 +57,10 @@ Journal::Journal(SherlockEngine *vm): _vm(vm) {
 	_up = _down = false;
 	_page = 1;
 
-	// Load the journal directory and location names
-	loadJournalLocations();
+	if (_vm->_interactiveFl) {
+		// Load the journal directory and location names
+		loadJournalLocations();
+	}
 }
 
 /**
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index f6fbded9b1..456006a86a 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -102,11 +102,13 @@ Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
 Resources::Resources(SherlockEngine *vm): _vm(vm), _cache(vm) {
 	_resourceIndex = -1;
 
-	addToCache("vgs.lib");
-	addToCache("talk.lib");
-	addToCache("sequence.txt");
-	addToCache("journal.txt");
-	addToCache("portrait.lib");
+	if (_vm->_interactiveFl) {
+		addToCache("vgs.lib");
+		addToCache("talk.lib");
+		addToCache("sequence.txt");
+		addToCache("journal.txt");
+		addToCache("portrait.lib");
+	}
 }
 
 /**
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 6959e435d2..078677be65 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -251,9 +251,9 @@ void ScalpelEngine::initialize() {
 	_flags[39] = true;		// Turn on Baker Street
 
 	if (!getIsDemo()) {
-	// Load the map co-ordinates for each scene and sequence data
-	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
-	_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
+		// Load the map co-ordinates for each scene and sequence data
+		_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
+		_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
 	}
 
 	// Load the inventory
@@ -269,7 +269,7 @@ void ScalpelEngine::initialize() {
 	_animation->setTitleFrames(&TITLE_FRAMES[0][0], 7, 9);
 
 	// Starting scene
-	if (getIsDemo())
+	if (getIsDemo() && _interactiveFl)
 		_scene->_goToScene = 3;
 	else
 		_scene->_goToScene = 4;
@@ -279,7 +279,7 @@ void ScalpelEngine::initialize() {
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
-	if (getIsDemo())
+	if (getIsDemo() && _interactiveFl)
 		return;
 
 	if (!showCityCutscene())
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index c1c53fbe65..e98d9a51a9 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -53,6 +53,10 @@ Screen::~Screen() {
  * Set the font to use for writing text on the screen
  */
 void Screen::setFont(int fontNumb) {
+	// Interactive demo doesn't use fonts
+	if (!_vm->_interactiveFl)
+		return;
+
 	_fontNumber = fontNumb;
 	Common::String fname = Common::String::format("FONT%d.VGS", fontNumb + 1);
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 09a8ef18ef..5c7354e5f3 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -49,6 +49,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_loadGameSlot = -1;
 	_canLoadSave = false;
 	_showOriginalSavesDialog = false;
+	_interactiveFl = true;
 }
 
 SherlockEngine::~SherlockEngine() {
@@ -79,6 +80,15 @@ void SherlockEngine::initialize() {
 	ImageFile::setVm(this);
 	Object::setVm(this);
 	Sprite::setVm(this);
+
+	if (getIsDemo()) {
+		Common::File f;
+		// The interactive demo doesn't have an intro thus doesn't include TITLE.SND
+		// At the opposite, the non-interactive demo is only the intro.
+		if (f.exists("TITLE.SND"))
+			_interactiveFl = false;
+	}
+
 	_res = new Resources(this);
 	_animation = new Animation(this);
 	_debugger = new Debugger(this);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 33e4a45b40..bd6d4a4c8e 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -109,6 +109,7 @@ public:
 	int _loadGameSlot;
 	bool _canLoadSave;
 	bool _showOriginalSavesDialog;
+	bool _interactiveFl;
 public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index e0552a8b5e..5199fe7dc4 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -44,12 +44,16 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
 	_musicOn = true;
 	_speechOn = true;
 
-	_vm->_res->addToCache("MUSIC.LIB");
-	_vm->_res->addToCache("SND.SND");
-
-	if (!_vm->getIsDemo()) {
+	if (!_vm->_interactiveFl)
 		_vm->_res->addToCache("TITLE.SND");
-		_vm->_res->addToCache("EPILOGUE.SND");
+	else {
+		_vm->_res->addToCache("MUSIC.LIB");
+		_vm->_res->addToCache("SND.SND");
+
+		if (!_vm->getIsDemo()) {
+			_vm->_res->addToCache("TITLE.SND");
+			_vm->_res->addToCache("EPILOGUE.SND");
+		}
 	}
 }
 
@@ -64,6 +68,7 @@ void Sound::syncSoundSettings() {
 
 void Sound::loadSound(const Common::String &name, int priority) {
 	// No implementation required in ScummVM
+	warning("loadSound");
 }
 
 static int8 creativeADPCM_ScaleMap[64] = {
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index d5ff828aee..e2ad307aa4 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -81,8 +81,14 @@ const char *const MUSE[] = {
 /*----------------------------------------------------------------*/
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
-	_controls = new ImageFile("menu.all");
-	_controlPanel = new ImageFile("controls.vgs");
+	if (_vm->_interactiveFl) {
+		_controls = new ImageFile("menu.all");
+		_controlPanel = new ImageFile("controls.vgs");
+	} else {
+		_controls = nullptr;
+		_controlPanel = nullptr;
+	}
+
 	_bgFound = 0;
 	_oldBgFound = -1;
 	_keycode = Common::KEYCODE_INVALID;
-- 
cgit v1.2.3


From c4513607473ed6889445b08ea4f77165df126854 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 18 May 2015 21:29:50 +0200
Subject: SHERLOCK: Make loop non-interactive demo (intro)

---
 engines/sherlock/sherlock.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 5c7354e5f3..bdd2ec3588 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -129,7 +129,9 @@ Common::Error SherlockEngine::run() {
 		_saves->loadGame(_loadGameSlot);
 		_loadGameSlot = -1;
 	} else {
-		showOpening();
+		do
+			showOpening();
+		while (!shouldQuit() && !_interactiveFl);
 	}
 
 	while (!shouldQuit()) {
-- 
cgit v1.2.3


From 0aebac9174f935e535b8e133efde43bd94be5b27 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 18 May 2015 23:23:37 +0200
Subject: SHERLOCK: Fix some issues pointed by LordHoto

---
 engines/sherlock/objects.h  |  1 +
 engines/sherlock/scene.cpp  | 10 +++++-----
 engines/sherlock/scene.h    |  4 ++--
 engines/sherlock/screen.cpp |  5 ++---
 engines/sherlock/sherlock.h |  4 ----
 engines/sherlock/sound.cpp  |  2 +-
 engines/sherlock/talk.cpp   |  2 +-
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 4068973e58..7a1ef1aebe 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -164,6 +164,7 @@ struct UseType {
 	void load(Common::SeekableReadStream &s);
 };
 
+enum { TURNON_OBJ = 0x20, TURNOFF_OBJ = 0x40 };
 class Object {
 private:
 	static SherlockEngine *_vm;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 8a906e9335..fa5c5f439c 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -43,7 +43,7 @@ void BgFileHeader::load(Common::SeekableReadStream &s) {
 /**
  * Load the data for the object
  */
-void BgfileheaderInfo::load(Common::SeekableReadStream &s) {
+void BgFileHeaderInfo::load(Common::SeekableReadStream &s) {
 	_filesize = s.readUint32LE();
 	_maxFrames = s.readByte();
 
@@ -176,7 +176,7 @@ void Scene::selectScene() {
 	_restoreFlag = true;
 	events.clearEvents();
 
-	// If there were any scripst waiting to be run, but were interrupt by a running
+	// If there were any scripts waiting to be run, but were interrupt by a running
 	// canimation (probably the last scene's exit canim), clear the _scriptMoreFlag
 	if (talk._scriptMoreFlag == 3)
 		talk._scriptMoreFlag = 0;
@@ -265,7 +265,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		_invGraphicItems = bgHeader._numImages + 1;
 
 		// Read in the shapes header info
-		Common::Array<BgfileheaderInfo> bgInfo;
+		Common::Array<BgFileHeaderInfo> bgInfo;
 		bgInfo.resize(bgHeader._numStructs);
 
 		for (uint idx = 0; idx < bgInfo.size(); ++idx)
@@ -461,13 +461,13 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		// Check for TURNON objects
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			if (_bgShapes[idx]._type == HIDDEN && (_bgShapes[idx]._flags & 0x20))
+			if (_bgShapes[idx]._type == HIDDEN && (_bgShapes[idx]._flags & TURNON_OBJ))
 				_bgShapes[idx].toggleHidden();
 		}
 
 		// Check for TURNOFF objects
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			if (_bgShapes[idx]._type != HIDDEN && (_bgShapes[idx]._flags & 0x40) &&
+			if (_bgShapes[idx]._type != HIDDEN && (_bgShapes[idx]._flags & TURNOFF_OBJ) &&
 					_bgShapes[idx]._type != INVALID)
 				_bgShapes[idx].toggleHidden();
 			if (_bgShapes[idx]._type == HIDE_SHAPE)
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 665f5d28e4..78d41299e6 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -49,7 +49,7 @@ struct BgFileHeader {
 	void load(Common::SeekableReadStream &s);
 };
 
-struct BgfileheaderInfo {
+struct BgFileHeaderInfo {
 	int _filesize;				// How long images are
 	int _maxFrames;				// How many unique frames in object
 	Common::String _filename;	// Filename of object
@@ -83,7 +83,7 @@ struct SceneSound {
 	void load(Common::SeekableReadStream &s);
 };
 
-class ObjectArray: public Common::Array<Object> {
+class ObjectArray : public Common::Array<Object> {
 public:
 	int indexOf(const Object &obj) const;
 };
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index e98d9a51a9..d9ec1d745d 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -116,8 +116,7 @@ int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
 	// For any palette component that doesn't already match the given destination
 	// palette, change by 1 towards the reference palette component
 	for (int idx = 0; idx < PALETTE_SIZE; ++idx) {
-		if (tempPalette[idx] > palette[idx])
-		{
+		if (tempPalette[idx] > palette[idx]) {
 			tempPalette[idx] = MAX((int)palette[idx], (int)tempPalette[idx] - 4);
 			++total;
 		} else if (tempPalette[idx] < palette[idx]) {
@@ -216,7 +215,7 @@ void Screen::randomTransition() {
 
 	for (int idx = 0; idx <= 65535 && !_vm->shouldQuit(); ++idx) {
 		_transitionSeed = _transitionSeed * TRANSITION_MULTIPLIER + 1;
-		int offset = _transitionSeed & 65535;
+		int offset = _transitionSeed & 0xFFFF;
 
 		if (offset < (SHERLOCK_SCREEN_WIDTH * SHERLOCK_SCREEN_HEIGHT))
 			*((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset);
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index bd6d4a4c8e..68c8e8daca 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -49,10 +49,6 @@
 
 namespace Sherlock {
 
-enum {
-	kFileTypeHash
-};
-
 enum {
 	kDebugScript = 1 << 0
 };
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 5199fe7dc4..c79e179c1c 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -89,7 +89,7 @@ static uint8 creativeADPCM_AdjustMap[64] = {
 	240, 0, 0, 0, 0,  0,  0,  0
 };
 
-byte Sound::decodeSample(byte sample, byte& reference, int16& scale) {
+byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {
 	int16 samp = sample + scale;
 	int16 ref = 0;
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b38b432e37..dfcf9b912d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -672,7 +672,7 @@ void Talk::drawInterface() {
 }
 
 /**
- * Display a list of statements in a window at the bottom of the scren that the
+ * Display a list of statements in a window at the bottom of the screen that the
  * player can select from.
  */
 bool Talk::displayTalk(bool slamIt) {
-- 
cgit v1.2.3


From 0b50a077f7ef1308f3da8a0e6ac29e5bdff78c99 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 18:12:58 -0400
Subject: SHERLOCK: Fix spacing in constructors

---
 engines/sherlock/journal.cpp   | 2 +-
 engines/sherlock/map.cpp       | 2 +-
 engines/sherlock/resources.cpp | 4 ++--
 engines/sherlock/scene.cpp     | 2 +-
 engines/sherlock/sound.cpp     | 2 +-
 engines/sherlock/surface.cpp   | 2 +-
 engines/sherlock/talk.cpp      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 7e0120c67d..f288b43650 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -49,7 +49,7 @@ const int SEARCH_POINTS[3][3] = {
 
 /*----------------------------------------------------------------*/
 
-Journal::Journal(SherlockEngine *vm): _vm(vm) {
+Journal::Journal(SherlockEngine *vm) : _vm(vm) {
 	// Initialize fields
 	_maxPage = 0;
 	_index = 0;
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 7fca4ea5f3..dc9a0565cb 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -52,7 +52,7 @@ const byte *MapPaths::getPath(int srcLocation, int destLocation) {
 
 /*----------------------------------------------------------------*/
 
-Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
+Map::Map(SherlockEngine *vm) : _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_active = false;
 	_mapCursors = nullptr;
 	_shapes = nullptr;
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 456006a86a..fa68074c60 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -28,7 +28,7 @@
 
 namespace Sherlock {
 
-Cache::Cache(SherlockEngine *vm): _vm(vm) {
+Cache::Cache(SherlockEngine *vm) : _vm(vm) {
 }
 
 /**
@@ -99,7 +99,7 @@ Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
 
 /*----------------------------------------------------------------*/
 
-Resources::Resources(SherlockEngine *vm): _vm(vm), _cache(vm) {
+Resources::Resources(SherlockEngine *vm) : _vm(vm), _cache(vm) {
 	_resourceIndex = -1;
 
 	if (_vm->_interactiveFl) {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index a65c11b167..91c411db88 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -111,7 +111,7 @@ int ObjectArray::indexOf(const Object &obj) const {
 
 /*----------------------------------------------------------------*/
 
-Scene::Scene(SherlockEngine *vm): _vm(vm) {
+Scene::Scene(SherlockEngine *vm) : _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_sceneStats[idx][0], &_sceneStats[idx][65], false);
 	_currentScene = -1;
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index c79e179c1c..3270fbf7e4 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -30,7 +30,7 @@
 
 namespace Sherlock {
 
-Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) {
+Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_digitized = false;
 	_music = false;
 	_voices = 0;
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 36e625794c..eeaf304958 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -27,7 +27,7 @@
 
 namespace Sherlock {
 
-Surface::Surface(uint16 width, uint16 height): _freePixels(true) {
+Surface::Surface(uint16 width, uint16 height) : _freePixels(true) {
 	create(width, height);
 }
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index dfcf9b912d..dc5b9c5ba7 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -91,7 +91,7 @@ void TalkSequences::clear() {
 
 /*----------------------------------------------------------------*/
 
-Talk::Talk(SherlockEngine *vm): _vm(vm) {
+Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_talkCounter = 0;
 	_talkToAbort = false;
 	_speaker = 0;
-- 
cgit v1.2.3


From c24d0de8f6147ef31e015a3e642fcb1896013b50 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 18:21:41 -0400
Subject: SHERLOCK: Remove unused variable

---
 engines/sherlock/animation.cpp | 2 --
 engines/sherlock/sound.cpp     | 1 -
 engines/sherlock/sound.h       | 1 -
 3 files changed, 4 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 6cdefaffbd..3c7b2b7443 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -40,7 +40,6 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
 	int soundNumber = 0;
-	sound._playingEpilogue = true;
 
 	// Check for any any sound frames for the given animation
 	const int *soundFrames = checkForSoundFrames(filename);
@@ -133,7 +132,6 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	events.clearEvents();
 	sound.stopSound();
 	delete stream;
-	sound._playingEpilogue = false;
 
 	return !skipped && !_vm->shouldQuit();
 }
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 3270fbf7e4..b44eb17397 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -34,7 +34,6 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_digitized = false;
 	_music = false;
 	_voices = 0;
-	_playingEpilogue = false;
 	_diskSoundPlaying = false;
 	_soundPlaying = false;
 	_soundIsOn = &_soundPlaying;
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 4d94c58f6f..62d4aa24c4 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -54,7 +54,6 @@ public:
 	bool _soundOn;
 	bool _musicOn;
 	bool _speechOn;
-	bool _playingEpilogue;
 	bool _diskSoundPlaying;
 	bool _soundPlaying;
 	bool *_soundIsOn;
-- 
cgit v1.2.3


From 844d8012598bf1f43b7eff4c8d7b9a7be9287b18 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 18:30:31 -0400
Subject: SHERLOCK: Syntactic fixes

---
 engines/sherlock/animation.cpp       | 8 ++++----
 engines/sherlock/detection.cpp       | 2 +-
 engines/sherlock/detection_tables.h  | 2 +-
 engines/sherlock/inventory.cpp       | 3 ++-
 engines/sherlock/map.cpp             | 2 +-
 engines/sherlock/scalpel/scalpel.cpp | 6 +++---
 engines/sherlock/scene.cpp           | 2 +-
 engines/sherlock/sherlock.cpp        | 2 +-
 engines/sherlock/sherlock.h          | 2 +-
 engines/sherlock/sound.cpp           | 2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 3c7b2b7443..3c283636ca 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -140,7 +140,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
  * Load the prologue name array 
  */
 void Animation::setPrologueNames(const char *const *names, int count) {
-	for (int idx = 0; idx < count; ++idx, names++) {
+	for (int idx = 0; idx < count; ++idx, ++names) {
 		_prologueNames.push_back(*names);
 	}
 }
@@ -161,7 +161,7 @@ void Animation::setPrologueFrames(const int *frames, int count, int maxFrames) {
  * Load the title name array
  */
 void Animation::setTitleNames(const char *const *names, int count) {
-	for (int idx = 0; idx < count; ++idx, names++) {
+	for (int idx = 0; idx < count; ++idx, ++names) {
 		_titleNames.push_back(*names);
 	}
 }
@@ -185,14 +185,14 @@ const int *Animation::checkForSoundFrames(const Common::String &filename) {
 	const int *frames = &NO_FRAMES;
 
 	if (_vm->_soundOverride.empty()) {
-		for (Common::Array<const char *>::size_type idx = 0; idx < _prologueNames.size(); ++idx) {
+		for (uint idx = 0; idx < _prologueNames.size(); ++idx) {
 			if (filename.equalsIgnoreCase(_prologueNames[idx])) {
 				frames = &_prologueFrames[idx][0];
 				break;
 			}
 		}
 	} else {
-		for (Common::Array<const char *>::size_type idx = 0; idx < _titleNames.size(); ++idx) {
+		for (uint idx = 0; idx < _titleNames.size(); ++idx) {
 			if (filename.equalsIgnoreCase(_titleNames[idx])) {
 				frames = &_titleFrames[idx][0];
 				break;
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 00f6a1256e..e69887b5c7 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -144,7 +144,7 @@ bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
 /**
  * Returns whether the version is a demo
  */
-bool Sherlock::SherlockEngine::getIsDemo() const {
+bool Sherlock::SherlockEngine::isDemo() const {
 	return _gameDescription->desc.flags & ADGF_DEMO;
 }
 
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 8300a0ffcf..3960836f82 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -32,7 +32,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("talk.lib", "ad0c4d6865edf15da4e9204c08815875", 238928),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE | ADGF_NO_FLAGS,
+			ADGF_UNSTABLE,
 			GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES)
 		},
 		GType_SerratedScalpel,
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 5b548bb9e3..b7d973e289 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -136,7 +136,8 @@ int Inventory::findInv(const Common::String &name) {
 			return idx;
 	}
 
-	return 1;
+	// Couldn't find the desired item
+	error("Couldn't find inventory item - %s", name.c_str());
 }
 
 /**
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index dc9a0565cb..36c932d90d 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -69,7 +69,7 @@ Map::Map(SherlockEngine *vm) : _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
 		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
 
-	if (!_vm->getIsDemo())
+	if (!_vm->isDemo())
 		loadData();
 }
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 078677be65..0d62336283 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -250,7 +250,7 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
-	if (!getIsDemo()) {
+	if (!isDemo()) {
 		// Load the map co-ordinates for each scene and sequence data
 		_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
 		_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
@@ -269,7 +269,7 @@ void ScalpelEngine::initialize() {
 	_animation->setTitleFrames(&TITLE_FRAMES[0][0], 7, 9);
 
 	// Starting scene
-	if (getIsDemo() && _interactiveFl)
+	if (isDemo() && _interactiveFl)
 		_scene->_goToScene = 3;
 	else
 		_scene->_goToScene = 4;
@@ -279,7 +279,7 @@ void ScalpelEngine::initialize() {
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
-	if (getIsDemo() && _interactiveFl)
+	if (isDemo() && _interactiveFl)
 		return;
 
 	if (!showCityCutscene())
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 91c411db88..b75531baf6 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -495,7 +495,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	_walkedInScene = false;
 	saves._justLoaded = false;
 
-	if (!_vm->getIsDemo()) {
+	if (!_vm->isDemo()) {
 		// Reset the previous map location and position on overhead map
 		map._oldCharPoint = _currentScene;
 		map._overPos.x = map[_currentScene].x * 100 - 600;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index bdd2ec3588..eb80fb6e3b 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -81,7 +81,7 @@ void SherlockEngine::initialize() {
 	Object::setVm(this);
 	Sprite::setVm(this);
 
-	if (getIsDemo()) {
+	if (isDemo()) {
 		Common::File f;
 		// The interactive demo doesn't have an intro thus doesn't include TITLE.SND
 		// At the opposite, the non-interactive demo is only the intro.
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 68c8e8daca..571bd4dc61 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -117,7 +117,7 @@ public:
 	virtual Common::Error loadGameState(int slot);
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
 	virtual void syncSoundSettings();
-	virtual bool getIsDemo() const;
+	virtual bool isDemo() const;
 
 	GameType getGameID() const;
 	Common::Language getLanguage() const;
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index b44eb17397..bcc6c96e4f 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -49,7 +49,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 		_vm->_res->addToCache("MUSIC.LIB");
 		_vm->_res->addToCache("SND.SND");
 
-		if (!_vm->getIsDemo()) {
+		if (!_vm->isDemo()) {
 			_vm->_res->addToCache("TITLE.SND");
 			_vm->_res->addToCache("EPILOGUE.SND");
 		}
-- 
cgit v1.2.3


From 34227d1b545b12471341ae35e4b6a5c23bfa6338 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 18:34:10 -0400
Subject: SHERLOCK: Simplify Events::getKey

---
 engines/sherlock/events.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 3b0b0dacc6..7f57625a3b 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -198,11 +198,7 @@ bool Events::checkForNextFrameCounter() {
  * Get a pending keypress
  */
 Common::KeyState Events::getKey() {
-	Common::KeyState keyState = _pendingKeys.pop();
-	if ((keyState.flags & Common::KBD_SHIFT) != 0)
-		keyState.ascii = toupper(keyState.ascii);
-
-	return keyState;
+	return _pendingKeys.pop();
 }
 
 /**
-- 
cgit v1.2.3


From 437bcf3cfe4aabe99359d3b6db3cd8e13f3e8763 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 18:43:29 -0400
Subject: SHERLOCK: Simplify Events not to need it's own copy of the mouse pos

---
 engines/sherlock/events.cpp | 10 +++++++---
 engines/sherlock/events.h   |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 7f57625a3b..84794e6e6a 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -154,9 +154,6 @@ void Events::pollEvents() {
 		case Common::EVENT_RBUTTONUP:
 			_mouseButtons &= ~2;
 			return;
-		case Common::EVENT_MOUSEMOVE:
-			_mousePos = event.mouse;
-			break;
 		default:
  			break;
 		}
@@ -194,6 +191,13 @@ bool Events::checkForNextFrameCounter() {
 	return false;
 }
 
+/**
+ * Get the current mouse position 
+ */
+Common::Point Events::mousePos() const {
+	return g_system->getEventManager()->getMousePos();
+}
+
 /**
  * Get a pending keypress
  */
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index 199e14f03a..c6d155e472 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -42,7 +42,6 @@ private:
 	SherlockEngine *_vm;
 	uint32 _frameCounter;
 	uint32 _priorFrameTime;
-	Common::Point _mousePos;
 	ImageFile *_cursorImages;
 	int _mouseButtons;
 
@@ -79,7 +78,7 @@ public:
 
 	void pollEventsAndWait();
 
-	Common::Point mousePos() const { return _mousePos; }
+	Common::Point mousePos() const;
 
 	uint32 getFrameCounter() const { return _frameCounter; }
 
-- 
cgit v1.2.3


From 46293735c4e10d654d6195fce7781782f1024b26 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 18:52:20 -0400
Subject: SHERLOCK: Remove some redundant fields from UseType

---
 engines/sherlock/objects.cpp | 6 +-----
 engines/sherlock/objects.h   | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index b4371cd71b..05a058a3bb 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -386,8 +386,6 @@ void ActionType::load(Common::SeekableReadStream &s) {
 UseType::UseType() {
 	_cAnimNum = _cAnimSpeed = 0;
 	_useFlag = 0;
-	_dFlag[0] = 0;
-	_lFlag[0] = _lFlag[1] = 0;
 }
 
 /**
@@ -407,9 +405,7 @@ void UseType::load(Common::SeekableReadStream &s) {
 	}
 
 	_useFlag = s.readSint16LE();
-	_dFlag[0] = s.readSint16LE();
-	_lFlag[0] = s.readSint16LE();
-	_lFlag[1] = s.readSint16LE();
+	s.skip(6);
 
 	s.read(buffer, 12);
 	_target = Common::String(buffer);
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 7a1ef1aebe..4e7b006844 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -156,8 +156,6 @@ struct UseType {
 	int _cAnimSpeed;
 	Common::String _names[4];
 	int _useFlag;					// Which flag USE will set (if any)
-	int _dFlag[1];
-	int _lFlag[2];
 	Common::String _target;
 
 	UseType();
-- 
cgit v1.2.3


From 59993fdc74afad7b210da7849f8ce25631153201 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 19:15:17 -0400
Subject: SHERLOCK: Replace magic numbers with enums and constants

---
 engines/sherlock/inventory.cpp      | 46 +++++++++++++++----------------------
 engines/sherlock/inventory.h        | 12 ++++++++--
 engines/sherlock/objects.cpp        | 18 +++++++--------
 engines/sherlock/objects.h          |  9 +++++---
 engines/sherlock/scalpel/darts.cpp  |  9 ++++----
 engines/sherlock/scene.cpp          |  4 ++--
 engines/sherlock/user_interface.cpp | 34 +++++++++++++--------------
 7 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index b7d973e289..283164c534 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -142,11 +142,8 @@ int Inventory::findInv(const Common::String &name) {
 
 /**
  * Display the character's inventory. The slamIt parameter specifies:
- * 0 = Draw it on the back buffer, and don't display it
- * 1 = Draw it on the back buffer, and then display it
- * 2 = Draw it on the secondary back buffer, and don't display it
  */
-void Inventory::putInv(int slamIt) {
+void Inventory::putInv(InvSlamMode slamIt) {
 	Screen &screen = *_vm->_screen;
 	UserInterface &ui = *_vm->_ui;
 
@@ -158,7 +155,7 @@ void Inventory::putInv(int slamIt) {
 		loadGraphics();
 	}
 
-	if (slamIt != 2) {
+	if (slamIt != SLAM_SECONDARY_BUFFER) {
 		screen.makePanel(Common::Rect(6, 163, 54, 197));
 		screen.makePanel(Common::Rect(58, 163, 106, 197));
 		screen.makePanel(Common::Rect(110, 163, 158, 197));
@@ -170,13 +167,13 @@ void Inventory::putInv(int slamIt) {
 	// Iterate through displaying up to 6 objects at a time
 	for (int idx = _invIndex; idx < _holdings && (idx - _invIndex) < MAX_VISIBLE_INVENTORY; ++idx) {
 		int itemNum = idx - _invIndex;
-		Surface &bb = slamIt == 2 ? screen._backBuffer2 : screen._backBuffer1;
+		Surface &bb = slamIt == SLAM_SECONDARY_BUFFER ? screen._backBuffer2 : screen._backBuffer1;
 		Common::Rect r(8 + itemNum * 52, 165, 51 + itemNum * 52, 194);
 
 		// Draw the background
 		if (idx == ui._selector) {
 			bb.fillRect(r, 235);
-		} else if (slamIt == 2) {
+		} else if (slamIt == SLAM_SECONDARY_BUFFER) {
 			bb.fillRect(r, BUTTON_MIDDLE);
 		}
 
@@ -186,15 +183,15 @@ void Inventory::putInv(int slamIt) {
 			163 + ((33 - img.h) / 2)));
 	}
 
-	if (slamIt == 1)
+	if (slamIt == SLAM_DISPLAY)
 		screen.slamArea(6, 163, 308, 34);
 
-	if (slamIt != 2)
+	if (slamIt != SLAM_SECONDARY_BUFFER)
 		ui.clearInfo();
 
 	if (slamIt == 0) {
 		invCommands(0);
-	} else if (slamIt == 2) {
+	} else if (slamIt == SLAM_SECONDARY_BUFFER) {
 		screen._backBuffer = &screen._backBuffer2;
 		invCommands(0);
 		screen._backBuffer = &screen._backBuffer1;
@@ -203,20 +200,15 @@ void Inventory::putInv(int slamIt) {
 
 /**
  * Put the game into inventory mode and open the interface window.
- * The flag parameter specifies the mode:
- * 0   = plain inventory mode
- * 2   = use inventory mode
- * 3   = give inventory mode
- * 128 = Draw window in the back buffer, but don't display it
  */
-void Inventory::drawInventory(int flag) {
+void Inventory::drawInventory(InvNewMode mode) {
 	Screen &screen = *_vm->_screen;
 	UserInterface &ui = *_vm->_ui;
-	int tempFlag = flag;
+	InvNewMode tempMode = mode;
 
 	loadInv();
 
-	if (flag == 128) {
+	if (mode == INVENTORY_DONT_DISPLAY) {
 		screen._backBuffer = &screen._backBuffer2;
 	}
 
@@ -249,20 +241,20 @@ void Inventory::drawInventory(int flag) {
 	screen.makeButton(Common::Rect(INVENTORY_POINTS[7][0], CONTROLS_Y1, INVENTORY_POINTS[7][1],
 		CONTROLS_Y1 + 10), INVENTORY_POINTS[7][2], "__");
 
-	if (tempFlag == 128)
-		flag = 1;
-	_invMode = (InvMode)flag;
+	if (tempMode == INVENTORY_DONT_DISPLAY)
+		mode = LOOK_INVENTORY_MODE;
+	_invMode = (InvMode)mode;
 
-	if (flag) {
-		ui._oldKey = INVENTORY_COMMANDS[flag];
+	if (mode != PLAIN_INVENTORY) {
+		ui._oldKey = INVENTORY_COMMANDS[(int)mode];
 	} else {
 		ui._oldKey = -1;
 	}
 
 	invCommands(0);
-	putInv(0);
+	putInv(SLAM_DONT_DISPLAY);
 
-	if (tempFlag != 128) {
+	if (tempMode != INVENTORY_DONT_DISPLAY) {
 		if (!ui._windowStyle) {
 			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 		} else {
@@ -411,11 +403,11 @@ int Inventory::putItemInInventory(Object &obj) {
 	if (obj._pickupFlag)
 		_vm->setFlags(obj._pickupFlag);
 
-	for (int useNum = 0; useNum < 4; ++useNum) {
+	for (int useNum = 0; useNum < USE_COUNT; ++useNum) {
 		if (obj._use[useNum]._target.equalsIgnoreCase("*PICKUP*")) {
 			pickupFound = true;
 
-			for (int namesNum = 0; namesNum < 4; ++namesNum) {
+			for (int namesNum = 0; namesNum < NAMES_COUNT; ++namesNum) {
 				for (uint bgNum = 0; bgNum < scene._bgShapes.size(); ++bgNum) {
 					Object &bgObj = scene._bgShapes[bgNum];
 					if (obj._use[useNum]._names[namesNum].equalsIgnoreCase(bgObj._name)) {
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index eb5aebdd7c..979507a387 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -47,6 +47,14 @@ enum InvMode {
 	INVMODE_USE55 = 255
 };
 
+enum InvNewMode {
+	PLAIN_INVENTORY = 0, LOOK_INVENTORY_MODE = 1, USE_INVENTORY_MODE = 2,
+	GIVE_INVENTORY_MODE = 3, INVENTORY_DONT_DISPLAY = 128
+};
+
+enum InvSlamMode { SLAM_DONT_DISPLAY, SLAM_DISPLAY = 1, SLAM_SECONDARY_BUFFER };
+
+
 struct InventoryItem {
 	int _requiredFlag;
 	Common::String _name;
@@ -87,9 +95,9 @@ public:
 
 	int findInv(const Common::String &name);
 
-	void putInv(int slamIt);
+	void putInv(InvSlamMode slamIt);
 
-	void drawInventory(int flag);
+	void drawInventory(InvNewMode flag);
 
 	void invCommands(bool slamIt);
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 05a058a3bb..310afbf94b 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -375,7 +375,7 @@ void ActionType::load(Common::SeekableReadStream &s) {
 	if (_cAnimSpeed & 0x80)
 		_cAnimSpeed = -(_cAnimSpeed & 0x7f);
 
-	for (int idx = 0; idx < 4; ++idx) {
+	for (int idx = 0; idx < NAMES_COUNT; ++idx) {
 		s.read(buffer, 12);
 		_names[idx] = Common::String(buffer);
 	}
@@ -399,7 +399,7 @@ void UseType::load(Common::SeekableReadStream &s) {
 	if (_cAnimSpeed & 0x80)
 		_cAnimSpeed = -(_cAnimSpeed & 0x7f);
 
-	for (int idx = 0; idx < 4; ++idx) {
+	for (int idx = 0; idx < NAMES_COUNT; ++idx) {
 		s.read(buffer, 12);
 		_names[idx] = Common::String(buffer);
 	}
@@ -518,7 +518,7 @@ void Object::load(Common::SeekableReadStream &s) {
 	_aMove.load(s);
 	s.skip(8);
 
-	for (int idx = 0; idx < 4; ++idx)
+	for (int idx = 0; idx < USE_COUNT; ++idx)
 		_use[idx].load(s);
 }
 
@@ -671,8 +671,8 @@ void Object::checkObject() {
 
 					_delta = pt;
 					_frameNumber += 2;
-				} else if (v < 4) {
-					for (int idx = 0; idx < 4; ++idx) {
+				} else if (v < USE_COUNT) {
+					for (int idx = 0; idx < NAMES_COUNT; ++idx) {
 						checkNameForCodes(_use[v]._names[idx], nullptr);
 					}
 
@@ -928,7 +928,7 @@ void Object::setFlagsAndToggles() {
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
 
-	for (int useIdx = 0; useIdx < 4; ++useIdx) {
+	for (int useIdx = 0; useIdx < USE_COUNT; ++useIdx) {
 		if (_use[useIdx]._useFlag) {
 			if (!_vm->readFlags(_use[useIdx]._useFlag))
 				_vm->setFlags(_use[useIdx]._useFlag);
@@ -943,7 +943,7 @@ void Object::setFlagsAndToggles() {
 		}
 
 		if (!talk._talkToAbort) {
-			for (int idx = 0; idx < 4; ++idx)
+			for (int idx = 0; idx < NAMES_COUNT; ++idx)
 				scene.toggleObject(_use[useIdx]._names[idx]);
 		}
 	}
@@ -991,7 +991,7 @@ int Object::pickUpObject(const char *const messages[]) {
 	int numObjects = 0;
 
 	if (pickup == 99) {
-		for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
+		for (int idx = 0; idx < NAMES_COUNT && !talk._talkToAbort; ++idx) {
 			if (checkNameForCodes(_use[0]._names[idx], nullptr)) {
 				if (!talk._talkToAbort)
 					printed = true;
@@ -1038,7 +1038,7 @@ int Object::pickUpObject(const char *const messages[]) {
 			ui._temp1 = 1;
 		}
 
-		for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
+		for (int idx = 0; idx < NAMES_COUNT && !talk._talkToAbort; ++idx) {
 			if (checkNameForCodes(_use[0]._names[idx], nullptr)) {
 				if (!talk._talkToAbort)
 					printed = true;
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 4e7b006844..0b3a26f1f9 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -142,11 +142,12 @@ public:
 };
 
 enum { REVERSE_DIRECTION = 0x80 };
+#define NAMES_COUNT 4
 
 struct ActionType {
 	int _cAnimNum;
 	int _cAnimSpeed;
-	Common::String _names[4];
+	Common::String _names[NAMES_COUNT];
 
 	void load(Common::SeekableReadStream &s);
 };
@@ -154,7 +155,7 @@ struct ActionType {
 struct UseType {
 	int _cAnimNum;
 	int _cAnimSpeed;
-	Common::String _names[4];
+	Common::String _names[NAMES_COUNT];
 	int _useFlag;					// Which flag USE will set (if any)
 	Common::String _target;
 
@@ -163,6 +164,8 @@ struct UseType {
 };
 
 enum { TURNON_OBJ = 0x20, TURNOFF_OBJ = 0x40 };
+#define USE_COUNT 4
+
 class Object {
 private:
 	static SherlockEngine *_vm;
@@ -217,7 +220,7 @@ public:
 	int _seqCounter2;				// Counter of calling frame sequence
 	uint _seqSize;					// Tells where description starts
 	ActionType _aMove;
-	UseType _use[4];
+	UseType _use[USE_COUNT];
 
 	Object();
 
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 6da8d6848e..29b67216b9 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -44,9 +44,10 @@ enum {
 	DART_COL_FORE = 5,
 	PLAYER_COLOR = 11
 };
+#define OPPONENTS_COUNT 4
 
-const char *const OPPONENT_NAMES[5] = {
-	"Skipper", "Willy", "Micky", "Tom", "Bartender"
+const char *const OPPONENT_NAMES[OPPONENTS_COUNT] = {
+	"Skipper", "Willy", "Micky", "Tom"
 };
 
 /*----------------------------------------------------------------*/
@@ -118,7 +119,7 @@ void Darts::playDarts() {
 
 				if (playerNumber == 0) {
 					screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 30), PLAYER_COLOR, "Holmes Wins!");
-					if (_level < 4)
+					if (_level < OPPONENTS_COUNT)
 						setFlagsForDarts(318 + _level);
 				} else {
 					screen.print(Common::Point(DART_INFO_X, DART_INFO_Y + 30), PLAYER_COLOR, "%s Wins!", _opponent.c_str());
@@ -210,7 +211,7 @@ void Darts::initDarts() {
 		_computerPlayer = 2;
 	} else {
 		// Check flags for opponents
-		for (int idx = 0; idx < 4; ++idx) {
+		for (int idx = 0; idx < OPPONENTS_COUNT; ++idx) {
 			if (_vm->readFlags(314 + idx))
 				_level = idx;
 		}
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index b75531baf6..b092bbce65 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -706,14 +706,14 @@ void Scene::transitionToScene() {
 				// player is clear of the box
 				switch (obj._aType) {
 				case FLAG_SET:
-					for (int useNum = 0; useNum < 4; ++useNum) {
+					for (int useNum = 0; useNum < USE_COUNT; ++useNum) {
 						if (obj._use[useNum]._useFlag) {
 							if (!_vm->readFlags(obj._use[useNum]._useFlag))
 								_vm->setFlags(obj._use[useNum]._useFlag);
 						}
 
 						if (!talk._talkToAbort) {
-							for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+							for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
 								toggleObject(obj._use[useNum]._names[nameIdx]);
 							}
 						}
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index e2ad307aa4..ffcbddb920 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1156,7 +1156,7 @@ void UserInterface::doInvControl() {
 				COMMAND_HIGHLIGHTED, "^^");
 			inv.freeGraphics();
 			inv.loadGraphics();
-			inv.putInv(1);
+			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
 		} else if (((found == 5 && events._released) || _key == Common::KEYCODE_MINUS
 				|| _key == Common::KEYCODE_KP_MINUS) && inv._invIndex > 0) {
@@ -1164,7 +1164,7 @@ void UserInterface::doInvControl() {
 			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "^");
 			inv.freeGraphics();
 			inv.loadGraphics();
-			inv.putInv(1);
+			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
 		} else if (((found == 6 && events._released) || _key == Common::KEYCODE_PLUS
 				|| _key == Common::KEYCODE_KP_PLUS) &&  (inv._holdings - inv._invIndex) > 6) {
@@ -1172,7 +1172,7 @@ void UserInterface::doInvControl() {
 			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
 			inv.freeGraphics();
 			inv.loadGraphics();
-			inv.putInv(1);
+			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
 		} else if (((found == 7 && events._released) || _key == '.') && (inv._holdings - inv._invIndex) > 6) {
 			inv._invIndex += 6;
@@ -1182,7 +1182,7 @@ void UserInterface::doInvControl() {
 			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
 			inv.freeGraphics();
 			inv.loadGraphics();
-			inv.putInv(1);
+			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
 		} else {
 			// If something is being given, make sure it's to a person
@@ -1226,7 +1226,7 @@ void UserInterface::doInvControl() {
 					int temp = _selector;	// Save the selector
 					_selector = -1;
 
-					inv.putInv(1);
+					inv.putInv(SLAM_DISPLAY);
 					_selector = temp;		// Restore it
 					temp = inv._invMode;
 					inv._invMode = INVMODE_USE55;
@@ -1300,7 +1300,7 @@ void UserInterface::doLookControl() {
 			tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
 				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
-			inv.drawInventory(128);
+			inv.drawInventory(INVENTORY_DONT_DISPLAY);
 			banishWindow(true);
 
 			// Restore the ui
@@ -1405,19 +1405,19 @@ void UserInterface::doMainControl() {
 			pushButton(6);
 			_selector = _oldSelector = -1;
 			_menuMode = INV_MODE;
-			inv.drawInventory(1);
+			inv.drawInventory(PLAIN_INVENTORY);
 			break;
 		case 'U':
 			pushButton(7);
 			_selector = _oldSelector = -1;
 			_menuMode = USE_MODE;
-			inv.drawInventory(2);
+			inv.drawInventory(USE_INVENTORY_MODE);
 			break;
 		case 'G':
 			pushButton(8);
 			_selector = _oldSelector = -1;
 			_menuMode = GIVE_MODE;
-			inv.drawInventory(3);
+			inv.drawInventory(GIVE_INVENTORY_MODE);
 			break;
 		case 'J':
 			pushButton(9);
@@ -1904,7 +1904,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 
 			// Reload the inventory graphics and draw the inventory
 			inv.loadInv();
-			inv.putInv(2);
+			inv.putInv(SLAM_SECONDARY_BUFFER);
 			inv.freeInv();
 			banishWindow(1);
 
@@ -2182,7 +2182,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 	// Scan for target item
 	int targetNum = -1;
 	if (giveMode) {
-		for (int idx = 0; idx < 4 && targetNum == -1; ++idx) {
+		for (int idx = 0; idx < USE_COUNT && targetNum == -1; ++idx) {
 			if ((use[idx]._target.equalsIgnoreCase("*GIVE*") || use[idx]._target.equalsIgnoreCase("*GIVEP*"))
 					&& use[idx]._names[0].equalsIgnoreCase(invName)) {
 				// Found a match
@@ -2192,7 +2192,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 			}
 		}
 	} else {
-		for (int idx = 0; idx < 4 && targetNum == -1; ++idx) {
+		for (int idx = 0; idx < USE_COUNT && targetNum == -1; ++idx) {
 			if (use[idx]._target.equalsIgnoreCase(invName))
 				targetNum = idx;
 		}
@@ -2216,7 +2216,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 
 		if (!talk._talkToAbort) {
 			Object &obj = scene._bgShapes[objNum];
-			for (int idx = 0; idx < 4 && !talk._talkToAbort; ++idx) {
+			for (int idx = 0; idx < NAMES_COUNT && !talk._talkToAbort; ++idx) {
 				if (obj.checkNameForCodes(action._names[idx], messages)) {
 					if (!talk._talkToAbort)
 						printed = true;
@@ -2308,7 +2308,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		events.setCursor(WAIT);
 		bool printed = false;
 
-		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
 			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
 					&& toupper(action._names[nameIdx][1]) == 'W') {
 				if (obj.checkNameForCodes(Common::String(action._names[nameIdx].c_str() + 2), messages)) {
@@ -2319,7 +2319,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		}
 
 		bool doCAnim = true;
-		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
 			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2) {
 				char ch = toupper(action._names[nameIdx][1]);
 
@@ -2349,7 +2349,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 				people.walkToCoords(pt, dir);
 		}
 
-		for (int nameIdx = 0; nameIdx < 4; ++nameIdx) {
+		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
 			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
 					&& toupper(action._names[nameIdx][1]) == 'F') {
 				if (obj.checkNameForCodes(action._names[nameIdx].c_str() + 2, messages)) {
@@ -2363,7 +2363,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 			scene.startCAnim(cAnimNum, action._cAnimSpeed);
 
 		if (!talk._talkToAbort) {
-			for (int nameIdx = 0; nameIdx < 4 && !talk._talkToAbort; ++nameIdx) {
+			for (int nameIdx = 0; nameIdx < NAMES_COUNT && !talk._talkToAbort; ++nameIdx) {
 				if (obj.checkNameForCodes(action._names[nameIdx], messages)) {
 					if (!talk._talkToAbort)
 						printed = true;
-- 
cgit v1.2.3


From b760c7d360d206d39391875e26271098c63acdd3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 19:37:54 -0400
Subject: SHERLOCK: More replacing numbers with constants

---
 engines/sherlock/journal.cpp | 28 +++++++++++++++-------------
 engines/sherlock/journal.h   |  3 +++
 engines/sherlock/scene.cpp   |  2 +-
 engines/sherlock/talk.cpp    | 40 +++++++++++++++++++++-------------------
 4 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index f288b43650..71d104e3f7 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -29,7 +29,7 @@ namespace Sherlock {
 #define LINES_PER_PAGE 11
 
 // Positioning of buttons in the journal view
-const int JOURNAL_POINTS[9][3] = {
+static const int JOURNAL_POINTS[9][3] = {
 	{ 6, 68, 37 },
 	{ 69, 131, 100 },
 	{ 132, 192, 162 },
@@ -41,7 +41,7 @@ const int JOURNAL_POINTS[9][3] = {
 	{ 237, 313, 275 }
 };
 
-const int SEARCH_POINTS[3][3] = {
+static const int SEARCH_POINTS[3][3] = {
 	{ 51, 123, 86 },
 	{ 124, 196, 159 },
 	{ 197, 269, 232 }
@@ -146,6 +146,8 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 
 	Common::String dirFilename = _directory[journalEntry._converseNum];
 	bool replyOnly = journalEntry._replyOnly;
+
+	// Get the location number from within the filename
 	Common::String locStr(dirFilename.c_str() + 4, dirFilename.c_str() + 6);
 	int newLocation = atoi(locStr.c_str());
 
@@ -195,11 +197,11 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 
 		// See if title can fit into a single line, or requires splitting on 2 lines
 		int width = screen.stringWidth(journalString.c_str() + 1);
-		if (width > 230) {
+		if (width > JOURNAL_MAX_WIDTH) {
 			// Scan backwards from end of title to find a space between a word
 			// where the width is less than the maximum allowed for the line
 			const char *lineP = journalString.c_str() + journalString.size() - 1;
-			while (width > 230 || *lineP != ' ')
+			while (width > JOURNAL_MAX_WIDTH || *lineP != ' ')
 				width -= screen.charWidth(*lineP--);
 
 			// Split the header into two lines, and add a '@' prefix
@@ -249,7 +251,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 		byte c = *replyP++;
 
 		// Is it a control character?
-		if (c < 128) {
+		if (c < SWITCH_SPEAKER) {
 			// Nope. Set flag for allowing control codes to insert spaces
 			ctrlSpace = true;
 			assert(c >= ' ');
@@ -296,7 +298,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 						byte v;
 						do {
 							v = *strP++;
-						} while (v && (v < 128) && (v != '.') && (v != '!') && (v != '?'));
+						} while (v && (v < SWITCH_SPEAKER) && (v != '.') && (v != '!') && (v != '?'));
 
 						if (v == '?')
 							journalString += " asked, \"";
@@ -312,11 +314,11 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += c;
 				do {
 					journalString += *replyP++;
-				} while (*replyP && *replyP < 128 && *replyP != '{' && *replyP != '}');
+				} while (*replyP && *replyP < SWITCH_SPEAKER && *replyP != '{' && *replyP != '}');
 
 				commentJustPrinted = false;
 			}
-		} else if (c == 128) {
+		} else if (c == SWITCH_SPEAKER) {
 			if (!startOfReply) {
 				if (!commentFlag && !commentJustPrinted)
 					journalString += "\"\n";
@@ -343,7 +345,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			byte v;
 			do {
 				v = *strP++;
-			} while (v && v < 128 && v != '.' && v != '!' && v != '?');
+			} while (v && v < SWITCH_SPEAKER && v != '.' && v != '!' && v != '?');
 
 			if (v == '?')
 				journalString += " asked, \"";
@@ -403,7 +405,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 
 			// Put a space in the output for a control character, unless it's
 			// immediately coming after another control character
-			if (ctrlSpace && c != 130 && c != 161 && !commentJustPrinted) {
+			if (ctrlSpace && c != ASSIGN_PORTRAIT_LOCATION && c != CARRIAGE_RETURN && !commentJustPrinted) {
 				journalString += " ";
 				ctrlSpace = false;
 			}
@@ -429,11 +431,11 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 		// Build up chacters until a full line is found
 		int width = 0;
 		const char *endP = startP;
-		while (width < 230 && *endP && *endP != '\n' && (endP - startP) < 79)
+		while (width < JOURNAL_MAX_WIDTH && *endP && *endP != '\n' && (endP - startP) < (JOURNAL_MAX_CHARS - 1))
 			width += screen.charWidth(*endP++);
 
 		// If word wrapping, move back to end of prior word
-		if (width >= 230 || (endP - startP) >= 79) {
+		if (width >= JOURNAL_MAX_WIDTH || (endP - startP) >= (JOURNAL_MAX_CHARS - 1)) {
 			while (*--endP != ' ')
 				;
 		}
@@ -518,7 +520,7 @@ void Journal::drawInterface() {
 
 	drawJournalFrame();
 
-	if (_journal.size() == 0) {
+	if (_journal.empty()) {
 		_up = _down = 0;
 	} else {
 		drawJournal(0, 0);
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index be5c4d77c3..97696ef74f 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -31,6 +31,9 @@
 
 namespace Sherlock {
 
+#define JOURNAL_MAX_WIDTH 230
+#define JOURNAL_MAX_CHARS 80
+
 struct JournalEntry {
 	int _converseNum;
 	bool _replyOnly;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index b092bbce65..78858bc284 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1364,7 +1364,7 @@ void Scene::doBgAnim() {
 		_animating = 0;
 		screen.slamRect(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	} else {
-		if (people[AL]._type != INVALID && ((_goToScene == -1 || _canimShapes.size() == 0))) {
+		if (people[AL]._type != INVALID && ((_goToScene == -1 || _canimShapes.empty()))) {
 			if (people[AL]._type == REMOVE) {
 				screen.slamRect(Common::Rect(
 					people[AL]._oldPosition.x, people[AL]._oldPosition.y,
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index dc5b9c5ba7..78b52bc7a5 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -26,6 +26,8 @@
 
 namespace Sherlock {
 
+#define SPEAKER_REMOVE 0x80
+
 SequenceEntry::SequenceEntry() {
 	_objNum = 0;
 	_frameNumber = 0;
@@ -221,7 +223,7 @@ void Talk::talkTo(const Common::String &filename) {
 			break;
 
 		case TALK_MODE:
-			if (_speaker < 128)
+			if (_speaker < SPEAKER_REMOVE)
 				people.clearTalking();
 			if (_talkCounter)
 				return;
@@ -464,7 +466,7 @@ void Talk::talk(int objNum) {
 
 	ui._windowBounds.top = CONTROLS_Y;
 	ui._infoFlag = true;
-	_speaker = 128;
+	_speaker = SPEAKER_REMOVE;
 	loadTalkFile(scene._bgShapes[objNum]._name);
 
 	// Find the first statement with the correct flags
@@ -769,11 +771,11 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
 	bool numberFlag = false;
 
 	// Get the statement to display as well as optional number prefix
-	if (idx < 128) {
+	if (idx < SPEAKER_REMOVE) {
 		number = Common::String::format("%d.", stateNum + 1);
 		numberFlag = true;
 	} else {
-		idx -= 128;
+		idx -= SPEAKER_REMOVE;
 	}
 	msg = _statements[idx]._statement;
 
@@ -1019,7 +1021,7 @@ void Talk::doScript(const Common::String &script) {
 	// Check if the script begins with a Stealh Mode Active command
 	if (str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
 		_talkStealth = 2;
-		_speaker |= 128;
+		_speaker |= SPEAKER_REMOVE;
 	} else {
 		pushSequence(_speaker);
 		ui.clearWindow();
@@ -1077,11 +1079,11 @@ void Talk::doScript(const Common::String &script) {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (c >= 128) {
+		} else if (c >= SWITCH_SPEAKER) {
 			// Handle control code
 			switch (c) {
 			case SWITCH_SPEAKER:
-				if (!(_speaker & 128))
+				if (!(_speaker & SPEAKER_REMOVE))
 					people.clearTalking();
 				if (_talkToAbort)
 					return;
@@ -1099,7 +1101,7 @@ void Talk::doScript(const Common::String &script) {
 
 			case RUN_CANIMATION:
 				++str;
-				scene.startCAnim((str[0] - 1) & 127, (str[0] & 128) ? -1 : 1);
+				scene.startCAnim((str[0] - 1) & 127, (str[0] & 0x80) ? -1 : 1);
 				if (_talkToAbort)
 					return;
 
@@ -1135,13 +1137,13 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case REMOVE_PORTRAIT:
-				if (_speaker >= 0 && _speaker < 128)
+				if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
 					people.clearTalking();
 				pullSequence();
 				if (_talkToAbort)
 					return;
 
-				_speaker |= 128;
+				_speaker |= SPEAKER_REMOVE;
 				break;
 
 			case CLEAR_WINDOW:
@@ -1167,7 +1169,7 @@ void Talk::doScript(const Common::String &script) {
 					error("Could not find object %s to change", tempString.c_str());
 
 				// Should the script be overwritten?
-				if (str[0] > 128) {
+				if (str[0] > 0x80) {
 					// Save the current sequence
 					_savedSequences.push(SequenceEntry());
 					SequenceEntry &seqEntry = _savedSequences.top();
@@ -1216,14 +1218,14 @@ void Talk::doScript(const Common::String &script) {
 				break;
 
 			case BANISH_WINDOW:
-				if (!(_speaker & 128))
+				if (!(_speaker & SPEAKER_REMOVE))
 					people.clearTalking();
 				pullSequence();
 
 				if (_talkToAbort)
 					return;
 
-				_speaker |= 128;
+				_speaker |= SPEAKER_REMOVE;
 				ui.banishWindow();
 				ui._menuMode = TALK_MODE;
 				noTextYet = true;
@@ -1367,7 +1369,7 @@ void Talk::doScript(const Common::String &script) {
 					tempString += str[idx + 1];
 
 				// Set comparison state according to if we want to hide or unhide
-				bool state = (str[0] >= 128);
+				bool state = (str[0] >= SPEAKER_REMOVE);
 				str += str[0] & 127;
 
 				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
@@ -1501,10 +1503,10 @@ void Talk::doScript(const Common::String &script) {
 				width += screen.charWidth(str[idx]);
 				++idx;
 				++charCount;
-			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < 128);
+			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < SWITCH_SPEAKER);
 
 			if (str[idx] || width >= 298) {
-				if (str[idx] < 128 && str[idx] != '{') {
+				if (str[idx] < SWITCH_SPEAKER && str[idx] != '{') {
 					--idx;
 					--charCount;
 				}
@@ -1544,7 +1546,7 @@ void Talk::doScript(const Common::String &script) {
 			str += idx;
 
 			// If line wrap occurred, then move to after the separating space between the words
-			if (str[0] < 128 && str[0] != '{')
+			if (str[0] < SWITCH_SPEAKER && str[0] != '{')
 				++str;
 
 			yp += 9;
@@ -1574,7 +1576,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= 128 && str[0] != CARRIAGE_RETURN)) {
+		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= SWITCH_SPEAKER && str[0] != CARRIAGE_RETURN)) {
 			if (!ui._windowStyle) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
@@ -1624,7 +1626,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		pullSequence();
-		if (_speaker >= 0 && _speaker < 128)
+		if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
 			people.clearTalking();
 	}
 }
-- 
cgit v1.2.3


From 19d93325b1ccda2d02d708cbef20a49786f38d2b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 19:53:49 -0400
Subject: SHERLOCK: Move the override filename fields into the Animation class

---
 engines/sherlock/animation.cpp       | 10 +++++-----
 engines/sherlock/animation.h         |  3 +++
 engines/sherlock/scalpel/scalpel.cpp | 32 ++++++++++++++++----------------
 engines/sherlock/sherlock.h          |  2 --
 engines/sherlock/sound.cpp           |  6 ++++--
 engines/sherlock/sound.h             |  2 +-
 6 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 3c283636ca..8b891125cc 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -49,8 +49,8 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 
 	// Load the animation
 	Common::SeekableReadStream *stream;
-	if (!_vm->_titleOverride.empty())
-		stream = _vm->_res->load(vdxName, _vm->_titleOverride);
+	if (!_gfxLibraryFilename.empty())
+		stream = _vm->_res->load(vdxName, _gfxLibraryFilename);
 	else if (_vm->_useEpilogue2)
 		stream = _vm->_res->load(vdxName, "epilog2.lib");
 	else
@@ -105,12 +105,12 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 			if (frameNumber++ == *soundFrames) {
 				++soundNumber;
 				++soundFrames;
-				Common::String fname = _vm->_soundOverride.empty() ?
+				Common::String fname = _soundLibraryFilename.empty() ?
 					Common::String::format("%s%01d", filename.c_str(), soundNumber) :
 					Common::String::format("%s%02d", filename.c_str(), soundNumber);
 
 				if (sound._voices)
-					sound.playSound(fname, WAIT_RETURN_IMMEDIATELY);
+					sound.playSound(fname, WAIT_RETURN_IMMEDIATELY, 100, _soundLibraryFilename.c_str());
 			}
 
 			events.wait(speed * 3);
@@ -184,7 +184,7 @@ void Animation::setTitleFrames(const int *frames, int count, int maxFrames) {
 const int *Animation::checkForSoundFrames(const Common::String &filename) {
 	const int *frames = &NO_FRAMES;
 
-	if (_vm->_soundOverride.empty()) {
+	if (_soundLibraryFilename.empty()) {
 		for (uint idx = 0; idx < _prologueNames.size(); ++idx) {
 			if (filename.equalsIgnoreCase(_prologueNames[idx])) {
 				frames = &_prologueFrames[idx][0];
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index cd22a5c30a..2c47686efd 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -44,6 +44,9 @@ private:
 	Common::Array<Common::Array<int> > _titleFrames;
 
 	const int *checkForSoundFrames(const Common::String &filename);
+public:
+	Common::String _soundLibraryFilename;
+	Common::String _gfxLibraryFilename;
 public:
 	Animation(SherlockEngine *vm);
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0d62336283..fa55ca6013 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -302,8 +302,8 @@ bool ScalpelEngine::showCityCutscene() {
 	byte palette[PALETTE_SIZE];
 
 	_sound->playMusic("prolog1.mus");
-	_titleOverride = "title.lib";
-	_soundOverride = "title.snd";
+	_animation->_gfxLibraryFilename = "title.lib";
+	_animation->_soundLibraryFilename = "title.snd";
 	bool finished = _animation->play("26open1", 1, 255, true, 2);
 
 	if (finished) {
@@ -365,8 +365,8 @@ bool ScalpelEngine::showCityCutscene() {
 		}
 	}
 
-	_titleOverride = "";
-	_soundOverride = "";
+	_animation->_gfxLibraryFilename = "";
+	_animation->_soundLibraryFilename = "";
 	return finished;
 }
 
@@ -377,8 +377,8 @@ bool ScalpelEngine::showAlleyCutscene() {
 	byte palette[PALETTE_SIZE];
 	_sound->playMusic("prolog2.mus");
 
-	_titleOverride = "TITLE.LIB";
-	_soundOverride = "TITLE.SND";
+	_animation->_gfxLibraryFilename = "TITLE.LIB";
+	_animation->_soundLibraryFilename = "TITLE.SND";
 
 	bool finished = _animation->play("27PRO1", 1, 3, true, 2);
 	if (finished)
@@ -405,8 +405,8 @@ bool ScalpelEngine::showAlleyCutscene() {
 		finished = _events->delay(1000);
 	}
 
-	_titleOverride = "";
-	_soundOverride = "";
+	_animation->_gfxLibraryFilename = "";
+	_animation->_soundLibraryFilename = "";
 	return finished;
 }
 
@@ -414,8 +414,8 @@ bool ScalpelEngine::showAlleyCutscene() {
  * Show the Baker Street outside cutscene
  */
 bool ScalpelEngine::showStreetCutscene() {
-	_titleOverride = "TITLE.LIB";
-	_soundOverride = "TITLE.SND";
+	_animation->_gfxLibraryFilename = "TITLE.LIB";
+	_animation->_soundLibraryFilename = "TITLE.SND";
 
 	_sound->playMusic("PROLOG3.MUS");
 
@@ -424,8 +424,8 @@ bool ScalpelEngine::showStreetCutscene() {
 	if (finished)
 		finished = _animation->play("14NOTE", 1, 0, false, 2);
 
-	_titleOverride = "";
-	_soundOverride = "";
+	_animation->_gfxLibraryFilename = "";
+	_animation->_soundLibraryFilename = "";
 	return finished;
 }
 
@@ -469,8 +469,8 @@ bool ScalpelEngine::scrollCredits() {
  */
 bool ScalpelEngine::showOfficeCutscene() {
 	_sound->playMusic("PROLOG4.MUS");
-	_titleOverride = "TITLE2.LIB";
-	_soundOverride = "TITLE.SND";
+	_animation->_gfxLibraryFilename = "TITLE2.LIB";
+	_animation->_soundLibraryFilename = "TITLE.SND";
 
 	bool finished = _animation->play("COFF1", 1, 3, true, 3);
 	if (finished)
@@ -505,8 +505,8 @@ bool ScalpelEngine::showOfficeCutscene() {
 	if (finished)
 		_screen->fadeToBlack(3);
 
-	_titleOverride = "";
-	_soundOverride = "";
+	_animation->_gfxLibraryFilename = "";
+	_animation->_soundLibraryFilename = "";
 	return finished;
 }
 
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 571bd4dc61..830a255f5f 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -99,8 +99,6 @@ public:
 	UserInterface *_ui;
 	Common::RandomSource _randomSource;
 	Common::Array<bool> _flags;
-	Common::String _soundOverride;
-	Common::String _titleOverride;
 	bool _useEpilogue2;
 	int _loadGameSlot;
 	bool _canLoadSave;
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index bcc6c96e4f..9693ccbd94 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -110,14 +110,16 @@ byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {
 	return reference;
 }
 
-bool Sound::playSound(const Common::String &name, WaitType waitType, int priority) {
+bool Sound::playSound(const Common::String &name, WaitType waitType, int priority, const char *libraryFilename) {
+	Resources &res = *_vm->_res;
 	stopSound();
 
 	Common::String filename = name;
 	if (!filename.contains('.'))
 		filename += ".SND";
 
-	Common::SeekableReadStream *stream = _vm->_res->load(filename);
+	Common::String libFilename(libraryFilename);
+	Common::SeekableReadStream *stream = libFilename.empty() ? res.load(filename) : res.load(filename, libFilename);
 
 	if (!stream)
 		error("Unable to find sound file '%s'", filename.c_str());
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 62d4aa24c4..bff50d7a07 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -63,7 +63,7 @@ public:
 
 	void syncSoundSettings();
 	void loadSound(const Common::String &name, int priority);
-	bool playSound(const Common::String &name, WaitType waitType, int priority = 100);
+	bool playSound(const Common::String &name, WaitType waitType, int priority = 100, const char *libraryFilename = nullptr);
 	void playLoadedSound(int bufNum, WaitType waitType);
 	void freeLoadedSounds();
 	void stopSound();
-- 
cgit v1.2.3


From 8d426ca46435426c925007b08c933fdccdd75fa8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 20:43:26 -0400
Subject: SHERLOCK: Added more of the game options to the Engine tab

---
 engines/sherlock/detection.cpp      | 45 +++++++++++++++++++++++++++++++++++++
 engines/sherlock/detection_tables.h |  3 ++-
 engines/sherlock/inventory.cpp      |  2 +-
 engines/sherlock/saveload.cpp       |  2 +-
 engines/sherlock/settings.cpp       |  8 +++----
 engines/sherlock/sherlock.cpp       |  9 ++------
 engines/sherlock/talk.cpp           |  6 ++---
 engines/sherlock/user_interface.cpp |  8 +++----
 engines/sherlock/user_interface.h   |  2 +-
 9 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index e69887b5c7..096eb9f46e 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -60,6 +60,10 @@ static const PlainGameDescriptor sherlockGames[] = {
 
 
 #define GAMEOPTION_ORIGINAL_SAVES	GUIO_GAMEOPTIONS1
+#define GAMEOPTION_FADE_STYLE		GUIO_GAMEOPTIONS2
+#define GAMEOPTION_HELP_STYLE		GUIO_GAMEOPTIONS3
+#define GAMEOPTION_PORTRAITS_ON		GUIO_GAMEOPTIONS4
+#define GAMEOPTION_WINDOW_STYLE		GUIO_GAMEOPTIONS5
 
 static const ADExtraGuiOptionsMap optionsList[] = {
 	{
@@ -72,9 +76,50 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		}
 	},
 
+	{
+		GAMEOPTION_FADE_STYLE,
+		{
+			_s("Pixellated scene transitions"),
+			_s("When changing scenes, a randomized pixel transition is done"),
+			"fade_style",
+			true
+		}
+	},
+
+	{
+		GAMEOPTION_HELP_STYLE,
+		{
+			_s("Don't show hotspots when moving mouse"),
+			_s("Only show hotspot names after you actually click on a hotspot or action button"),
+			"help_style",
+			false
+		}
+	},
+
+	{
+		GAMEOPTION_PORTRAITS_ON,
+		{
+			_s("Show character portraits"),
+			_s("Show portraits for the characters when conversing"),
+			"portraits_on",
+			true
+		}
+	},
+
+	{
+		GAMEOPTION_WINDOW_STYLE,
+		{
+			_s("Slide dialogs into view"),
+			_s("Slide UI dialogs into view, rather than simply showing them immediately"),
+			"window_style",
+			true
+		}
+	},
+
 	AD_EXTRA_GUI_OPTIONS_TERMINATOR
 };
 
+
 #include "sherlock/detection_tables.h"
 
 class SherlockMetaEngine : public AdvancedMetaEngine {
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 3960836f82..a13231d3fc 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -33,7 +33,8 @@ static const SherlockGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_UNSTABLE,
-			GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES)
+			GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE,
+				GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE)
 		},
 		GType_SerratedScalpel,
 	},
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 283164c534..d41e4b9b3e 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -255,7 +255,7 @@ void Inventory::drawInventory(InvNewMode mode) {
 	putInv(SLAM_DONT_DISPLAY);
 
 	if (tempMode != INVENTORY_DONT_DISPLAY) {
-		if (!ui._windowStyle) {
+		if (!ui._slideWindows) {
 			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 		} else {
 			ui.summonWindow(false, CONTROLS_Y1);
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 0ac25a2f1a..6fb1dcc448 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -98,7 +98,7 @@ void SaveManager::drawInterface() {
 			INV_FOREGROUND, "%s", _savegames[idx].c_str());
 	}
 
-	if (!ui._windowStyle) {
+	if (!ui._slideWindows) {
 		screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 	} else {
 		ui.summonWindow();
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index ffa1f056de..b4110d593c 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -108,7 +108,7 @@ void Settings::drawInteface(bool flag) {
 	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10),
 		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
-	tempStr = Common::String::format("Windows %s", ui._windowStyle ? "Slide" : "Appear");
+	tempStr = Common::String::format("Windows %s", ui._slideWindows ? "Slide" : "Appear");
 	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10),
 		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
@@ -123,7 +123,7 @@ void Settings::drawInteface(bool flag) {
 
 	// Show the window immediately, or slide it on-screen
 	if (!flag) {
-		if (!ui._windowStyle) {
+		if (!ui._slideWindows) {
 			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 		} else {
 			ui.summonWindow(true, CONTROLS_Y1);
@@ -189,7 +189,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 9:
-			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._windowStyle]);
+			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._slideWindows]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 10:
@@ -322,7 +322,7 @@ void Settings::show(SherlockEngine *vm) {
 
 		if ((found == 9 && events._released) || ui._key == 'W') {
 			// Window style
-			ui._windowStyle ^= 1;
+			ui._slideWindows = !ui._slideWindows;
 			updateConfig = true;
 			settings.drawInteface(true);
 		}
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index eb80fb6e3b..bd8dcb69ee 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -230,16 +230,11 @@ void SherlockEngine::loadConfig() {
 	syncSoundSettings();
 
 	ConfMan.registerDefault("font", 1);
-	ConfMan.registerDefault("fade_style", true);
-	ConfMan.registerDefault("help_style", false);
-	ConfMan.registerDefault("window_style", 1);
-	ConfMan.registerDefault("portraits_on", true);
-	ConfMan.registerDefault("originalsaveload", false);
 
 	_screen->setFont(ConfMan.getInt("font"));
 	_screen->_fadeStyle = ConfMan.getBool("fade_style");
 	_ui->_helpStyle = ConfMan.getBool("help_style");
-	_ui->_windowStyle = ConfMan.getInt("window_style");
+	_ui->_slideWindows = ConfMan.getBool("window_style");
 	_people->_portraitsOn = ConfMan.getBool("portraits_on");
 }
 
@@ -254,7 +249,7 @@ void SherlockEngine::saveConfig() {
 	ConfMan.setInt("font", _screen->fontNumber());
 	ConfMan.setBool("fade_style", _screen->_fadeStyle);
 	ConfMan.setBool("help_style", _ui->_helpStyle);
-	ConfMan.setInt("window_style", _ui->_windowStyle);
+	ConfMan.setBool("window_style", _ui->_slideWindows);
 	ConfMan.setBool("portraits_on", _people->_portraitsOn);
 
 	ConfMan.flushToDisk();
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 78b52bc7a5..ec7e63e835 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -387,7 +387,7 @@ void Talk::talkTo(const Common::String &filename) {
 					} else {
 						screen.buttonPrint(Common::Point(119, CONTROLS_Y), color, false, "Exit");
 
-						if (!ui._windowStyle) {
+						if (!ui._slideWindows) {
 							screen.slamRect(Common::Rect(0, CONTROLS_Y,
 								SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 						} else {
@@ -534,7 +534,7 @@ void Talk::talk(int objNum) {
 				displayTalk(false);
 				ui._selector = ui._oldSelector = -1;
 
-				if (!ui._windowStyle) {
+				if (!ui._slideWindows) {
 					screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
 						SHERLOCK_SCREEN_HEIGHT));
 				} else {
@@ -1577,7 +1577,7 @@ void Talk::doScript(const Common::String &script) {
 
 		// Open window if it wasn't already open, and text has already been printed
 		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= SWITCH_SPEAKER && str[0] != CARRIAGE_RETURN)) {
-			if (!ui._windowStyle) {
+			if (!ui._slideWindows) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
 				ui.summonWindow();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ffcbddb920..1607c727eb 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -109,7 +109,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_selector = _oldSelector = -1;
 	_windowBounds = Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH - 1,
 		SHERLOCK_SCREEN_HEIGHT - 1);
-	_windowStyle = 1;	// Sliding windows
+	_slideWindows = true;
 	_find = 0;
 	_oldUse = 0;
 	_endKeyActive = true;
@@ -1999,7 +1999,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	}
 
 	if (firstTime) {
-		if (!_windowStyle) {
+		if (!_slideWindows) {
 			screen.slamRect(Common::Rect(0, CONTROLS_Y,
 				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 		} else {
@@ -2094,10 +2094,10 @@ void UserInterface::banishWindow(bool slideUp) {
 	Screen &screen = *_vm->_screen;
 
 	if (_windowOpen) {
-		if (slideUp || !_windowStyle) {
+		if (slideUp || !_slideWindows) {
 			// Slide window down
 			// Only slide the window if the window style allows it
-			if (_windowStyle) {
+			if (_slideWindows) {
 				for (int idx = 2; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
 					// Shift the window down by 2 lines
 					byte *pSrc = (byte *)screen._backBuffer1.getBasePtr(0, CONTROLS_Y + idx - 2);
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 2ff60715e3..fdaa323e5e 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -122,7 +122,7 @@ public:
 	bool _endKeyActive;
 	int _invLookFlag;
 	int _temp1;
-	int _windowStyle;
+	bool _slideWindows;
 	bool _helpStyle;
 public:
 	UserInterface(SherlockEngine *vm);
-- 
cgit v1.2.3


From a09937121c3844071ab992115f32b47d57a5d337 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 20:57:58 -0400
Subject: SHERLOCK: Syntactic fixes

---
 engines/sherlock/scene.cpp    | 12 +++++++-----
 engines/sherlock/screen.cpp   | 10 ++--------
 engines/sherlock/screen.h     |  4 ++--
 engines/sherlock/settings.cpp | 16 ++++++++--------
 engines/sherlock/sherlock.cpp |  2 ++
 engines/sherlock/sound.cpp    | 38 ++++++++++++++++++++------------------
 engines/sherlock/talk.cpp     |  2 +-
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 78858bc284..e71bc7eef7 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -26,6 +26,13 @@
 
 namespace Sherlock {
 
+static const int FS_TRANS[8] = {
+	STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN,
+	STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT
+};
+
+/*----------------------------------------------------------------*/
+
 /**
  * Load the data for the object
  */
@@ -637,11 +644,6 @@ void Scene::transitionToScene() {
 	Common::Point &hSavedPos = people._hSavedPos;
 	int &hSavedFacing = people._hSavedFacing;
 
-	const int FS_TRANS[8] = {
-		STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN,
-		STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT
-	};
-
 	if (hSavedPos.x < 1) {
 		// No exit information from last scene-check entrance info
 		if (_entrance._startPosition.x < 1) {
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index d9ec1d745d..4c70bf21c5 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -328,13 +328,10 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
  */
 void Screen::print(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
-	char buffer[100];
 	va_list args;
-
 	va_start(args, formatStr);
-	vsprintf(buffer, formatStr, args);
+	Common::String str = Common::String::vformat(formatStr, args);
 	va_end(args);
-	Common::String str(buffer);
 
 	// Figure out area to draw text in
 	Common::Point pos = pt;
@@ -362,13 +359,10 @@ void Screen::print(const Common::Point &pt, byte color, const char *formatStr, .
  */
 void Screen::gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
-	char buffer[100];
 	va_list args;
-
 	va_start(args, formatStr);
-	vsprintf(buffer, formatStr, args);
+	Common::String str = Common::String::vformat(formatStr, args);
 	va_end(args);
-	Common::String str(buffer);
 
 	// Print the text
 	writeString(str, pt, color);
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 2103588fe0..452a18631f 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -101,8 +101,8 @@ public:
 
 	void verticalTransition();
 
-	void print(const Common::Point &pt, byte color, const char *formatStr, ...);
-	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...);
+	void print(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5);
+	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5);
 
 	void restoreBackground(const Common::Rect &r);
 
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index b4110d593c..036177adbe 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -25,7 +25,7 @@
 
 namespace Sherlock {
 
-const int SETUP_POINTS[12][4]  = {
+static const int SETUP_POINTS[12][4]  = {
 	{ 4, 154, 101, 53 },		// Exit
 	{ 4, 165, 101, 53 },		// Music Toggle
 	{ 219, 165, 316, 268 },		// Voice Toggle
@@ -40,13 +40,13 @@ const int SETUP_POINTS[12][4]  = {
 	{ 219, 187, 316, 268 }		// _key Pad Accel. Toggle
 };
 
-const char *const SETUP_STRS0[2] = { "off", "on" };
-const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
-const char *const SETUP_STRS2[2] = { "Left", "Right" };
-const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
-const char *const SETUP_STRS4[2] = { "Slow", "Fast" };
-const char *const SETUP_STRS5[2] = { "Left", "Right" };
-const char *const SETUP_NAMES[12] = {
+static const char *const SETUP_STRS0[2] = { "off", "on" };
+static const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
+static const char *const SETUP_STRS2[2] = { "Left", "Right" };
+static const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
+static const char *const SETUP_STRS4[2] = { "Slow", "Fast" };
+static const char *const SETUP_STRS5[2] = { "Left", "Right" };
+static const char *const SETUP_NAMES[12] = {
 	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
 };
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index bd8dcb69ee..fd5c9a84d5 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -203,6 +203,8 @@ void SherlockEngine::handleInput() {
 
 /**
  * Read the state of a global flag
+ * @remarks		If a negative value is specified, it will return the inverse value
+ *		of the positive flag number
  */
 bool SherlockEngine::readFlags(int flagNum) {
 	bool value = _flags[ABS(flagNum)];
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 9693ccbd94..205178c0ec 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -30,6 +30,26 @@
 
 namespace Sherlock {
 
+static const int8 creativeADPCM_ScaleMap[64] = {
+	0,  1,  2,  3,  4,  5,  6,  7,  0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,
+	1,  3,  5,  7,  9, 11, 13, 15, -1,  -3,  -5,  -7,  -9, -11, -13, -15,
+	2,  6, 10, 14, 18, 22, 26, 30, -2,  -6, -10, -14, -18, -22, -26, -30,
+	4, 12, 20, 28, 36, 44, 52, 60, -4, -12, -20, -28, -36, -44, -52, -60
+};
+
+static const uint8 creativeADPCM_AdjustMap[64] = {
+	0, 0, 0, 0, 0, 16, 16, 16,
+	0, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0, 16, 16, 16,
+	240, 0, 0, 0, 0,  0,  0,  0,
+	240, 0, 0, 0, 0,  0,  0,  0
+};
+
+/*----------------------------------------------------------------*/
+
 Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_digitized = false;
 	_music = false;
@@ -70,24 +90,6 @@ void Sound::loadSound(const Common::String &name, int priority) {
 	warning("loadSound");
 }
 
-static int8 creativeADPCM_ScaleMap[64] = {
-	0,  1,  2,  3,  4,  5,  6,  7,  0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,
-	1,  3,  5,  7,  9, 11, 13, 15, -1,  -3,  -5,  -7,  -9, -11, -13, -15,
-	2,  6, 10, 14, 18, 22, 26, 30, -2,  -6, -10, -14, -18, -22, -26, -30,
-	4, 12, 20, 28, 36, 44, 52, 60, -4, -12, -20, -28, -36, -44, -52, -60
-};
-
-static uint8 creativeADPCM_AdjustMap[64] = {
-	0, 0, 0, 0, 0, 16, 16, 16,
-	0, 0, 0, 0, 0, 16, 16, 16,
-	240, 0, 0, 0, 0, 16, 16, 16,
-	240, 0, 0, 0, 0, 16, 16, 16,
-	240, 0, 0, 0, 0, 16, 16, 16,
-	240, 0, 0, 0, 0, 16, 16, 16,
-	240, 0, 0, 0, 0,  0,  0,  0,
-	240, 0, 0, 0, 0,  0,  0,  0
-};
-
 byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {
 	int16 samp = sample + scale;
 	int16 ref = 0;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ec7e63e835..79ed052c1e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1665,7 +1665,7 @@ int Talk::waitForMore(int delay) {
 
 			if (events.kbHit()) {
 				Common::KeyState keyState = events.getKey();
-				if (keyState.keycode >= 32 && keyState.keycode < 128)
+				if (keyState.keycode >= ' ' && keyState.keycode < '~')
 					key2 = keyState.keycode;
 			}
 
-- 
cgit v1.2.3


From 7c3ac25ac153a2934ee94c8aa83b72843bd56351 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 23:44:59 -0400
Subject: SHERLOCK: Further syntactic fixes

---
 engines/sherlock/journal.cpp   | 58 +++++++++++++++++++-----------------------
 engines/sherlock/journal.h     |  2 +-
 engines/sherlock/objects.cpp   |  6 ++---
 engines/sherlock/objects.h     |  4 +--
 engines/sherlock/resources.cpp |  9 +++----
 engines/sherlock/screen.cpp    |  4 +--
 engines/sherlock/talk.cpp      |  2 +-
 7 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 71d104e3f7..be2a013069 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -27,6 +27,10 @@ namespace Sherlock {
 
 #define JOURNAL_BUTTONS_Y 178
 #define LINES_PER_PAGE 11
+#define JOURNAL_SEARCH_LEFT 15
+#define JOURNAL_SEARCH_TOP 186
+#define JOURNAL_SEARCH_RIGHT 296
+#define JOURNAL_SEACRH_MAX_CHARS 50
 
 // Positioning of buttons in the journal view
 static const int JOURNAL_POINTS[9][3] = {
@@ -910,11 +914,11 @@ bool Journal::handleEvents(int key) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), COMMAND_NULL, true, "Print Text");
 	}
 
-	if (found == BTN_EXIT && events._released)
+	if (found == BTN_EXIT && events._released) {
 		// Exit button pressed
 		doneFlag = true;
 
-	if (((found == BTN_BACK10 && events._released) || key == 'B') && (_page > 1)) {
+	} else if (((found == BTN_BACK10 && events._released) || key == 'B') && (_page > 1)) {
 		// Scrolll up 10 pages
 		if (_page < 11)
 			drawJournal(1, (_page - 1) * LINES_PER_PAGE);
@@ -923,23 +927,20 @@ bool Journal::handleEvents(int key) {
 
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	}
 
-	if (((found == BTN_UP && events._released) || key == 'U') && _up) {
+	} else if (((found == BTN_UP && events._released) || key == 'U') && _up) {
 		// Scroll up
 		drawJournal(1, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	}
-
-	if (((found == BTN_DOWN && events._released) || key == 'D') && _down) {
+	
+	} else if (((found == BTN_DOWN && events._released) || key == 'D') && _down) {
 		// Scroll down
 		drawJournal(2, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	}
 
-	if (((found == BTN_AHEAD110 && events._released) || key == 'A') && _down) {
+	} else if (((found == BTN_AHEAD110 && events._released) || key == 'A') && _down) {
 		// Scroll down 10 pages
 		if ((_page + 10) > _maxPage)
 			drawJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
@@ -948,15 +949,14 @@ bool Journal::handleEvents(int key) {
 
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	}
-
-	if (((found == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
+	
+	} else if (((found == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
 		bool notFound = false;
 
 		do {
 			int dir;
-			if ((dir = getFindName(notFound)) != 0) {
+			if ((dir = getSearchString(notFound)) != 0) {
 				int savedIndex = _index;
 				int savedSub = _sub;
 				int savedPage = _page;
@@ -980,9 +980,8 @@ bool Journal::handleEvents(int key) {
 			}
 		} while (!doneFlag);
 		doneFlag = false;
-	}
-
-	if (((found == BTN_FIRST_PAGE && events._released) || key == 'F') && _up) {
+	
+	} else if (((found == BTN_FIRST_PAGE && events._released) || key == 'F') && _up) {
 		// First page
 		_index = _sub = 0;
 		_up = _down = false;
@@ -992,9 +991,8 @@ bool Journal::handleEvents(int key) {
 		drawJournal(0, 0);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	}
-
-	if (((found == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
+	
+	} else if (((found == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
 		// Last page
 		if ((_page + 10) > _maxPage)
 			drawJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
@@ -1011,9 +1009,9 @@ bool Journal::handleEvents(int key) {
 }
 
 /**
- * Show the search submenu
+ * Show the search submenu and allow the player to enter a search string
  */
-int Journal::getFindName(bool printError) {
+int Journal::getSearchString(bool printError) {
 	enum Button { BTN_NONE, BTN_EXIT, BTN_BACKWARD, BTN_FORWARD };
 
 	Events &events = *_vm->_events;
@@ -1078,8 +1076,8 @@ int Journal::getFindName(bool printError) {
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	}
 
-	xp = 15 + screen.stringWidth(name);
-	yp = 186;
+	xp = JOURNAL_SEARCH_LEFT + screen.stringWidth(name);
+	yp = JOURNAL_SEARCH_TOP;
 
 	do {
 		events._released = false;
@@ -1136,18 +1134,14 @@ int Journal::getFindName(bool printError) {
 				name.deleteLastChar();
 			}
 
-			if (keyState.keycode == Common::KEYCODE_RETURN)
+			if (keyState.keycode == Common::KEYCODE_RETURN) {
 				done = 1;
-
-			if (keyState.keycode == Common::KEYCODE_ESCAPE) {
+			}  else if (keyState.keycode == Common::KEYCODE_ESCAPE) {
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				done = -1;
-			}
-
-			if (keyState.keycode >= Common::KEYCODE_SPACE && keyState.keycode <= Common::KEYCODE_z
-					&& keyState.keycode != Common::KEYCODE_AT && name.size() < 50
-					&& (xp + screen.charWidth(keyState.keycode)) < 296) {
-				char ch = toupper(keyState.keycode);
+			} else if (keyState.ascii >= ' ' && keyState.keycode <= 'z' && keyState.keycode != Common::KEYCODE_AT && 
+				name.size() < JOURNAL_SEACRH_MAX_CHARS && (xp + screen.charWidth(keyState.keycode)) < JOURNAL_SEARCH_RIGHT) {
+				char ch = toupper(keyState.ascii);
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", ch);
 				xp += screen.charWidth(ch);
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 97696ef74f..026579bac2 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -68,7 +68,7 @@ private:
 
 	bool drawJournal(int direction, int howFar);
 
-	int getFindName(bool printError);
+	int getSearchString(bool printError);
 
 	void drawJournalFrame();
 public:
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 310afbf94b..eb4676dd5f 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -566,7 +566,7 @@ void Object::toggleHidden() {
 void Object::checkObject() {
 	Scene &scene = *_vm->_scene;
 	Sound &sound = *_vm->_sound;
-	int checkFrame = _allow ? MAX_FRAME : 32000;
+	int checkFrame = _allow ? MAX_FRAME : FRAMES_END;
 	bool codeFound;
 
 	if (_seqTo) {
@@ -693,7 +693,7 @@ void Object::checkObject() {
  */
 bool Object::checkEndOfSequence() {
 	Screen &screen = *_vm->_screen;
-	int checkFrame = _allow ? MAX_FRAME : 32000;
+	int checkFrame = _allow ? MAX_FRAME : FRAMES_END;
 	bool result = false;
 
 	if (_type == REMOVE || _type == INVALID)
@@ -749,7 +749,7 @@ bool Object::checkEndOfSequence() {
  */
 void Object::setObjSequence(int seq, bool wait) {
 	Scene &scene = *_vm->_scene;
-	int checkFrame = _allow ? MAX_FRAME : 32000;
+	int checkFrame = _allow ? MAX_FRAME : FRAMES_END;
 
 	if (seq >= 128) {
 		// Loop the sequence until the count exceeded
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 0b3a26f1f9..e3e07d89b7 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -102,8 +102,8 @@ class Sprite {
 private:
 	static SherlockEngine *_vm;
 public:
-	Common::String _name;				// Name
-	Common::String _description;		// Description
+	Common::String _name;				
+	Common::String _description;		
 	Common::StringArray _examine;		// Examine in-depth description
 	Common::String _pickUp;				// Message for if you can't pick up object
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index fa68074c60..5a98d57011 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -156,12 +156,11 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 
 	// Secondly, iterate through any loaded library file looking for a resource
 	// that has the same name
-	LibraryIndexes::iterator i;
-	for (i = _indexes.begin(); i != _indexes.end(); ++i) {
-		if ((*i)._value.contains(filename)) {
+	for (LibraryIndexes::iterator i = _indexes.begin(); i != _indexes.end(); ++i) {
+		if (i->_value.contains(filename)) {
 			// Get a stream reference to the given library file
-			Common::SeekableReadStream *stream = load((*i)._key);
-			LibraryEntry &entry = (*i)._value[filename];
+			Common::SeekableReadStream *stream = load(i->_key);
+			LibraryEntry &entry = i->_value[filename];
 			_resourceIndex = entry._index;
 
 			stream->seek(entry._offset);
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 4c70bf21c5..f43bf17288 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -387,7 +387,7 @@ int Screen::stringWidth(const Common::String &str) {
 int Screen::charWidth(char c) {
 	if (c == ' ')
 		return 5;
-	else if (c > ' ' && c <= '~')
+	else if (Common::isPrint(c))
 		return (*_font)[c - 33]._frame.w + 1;
 	else
 		return 0;
@@ -403,7 +403,7 @@ void Screen::writeString(const Common::String &str, const Common::Point &pt, byt
 		if (*c == ' ')
 			charPos.x += 5;
 		else {
-			assert(*c > ' ' && *c <= '~');
+			assert(Common::isPrint(*c));
 			ImageFrame &frame = (*_font)[*c - 33];
 			_backBuffer->transBlitFrom(frame, charPos, false, color);
 			charPos.x += frame._frame.w + 1;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 79ed052c1e..fd0b7cb378 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1665,7 +1665,7 @@ int Talk::waitForMore(int delay) {
 
 			if (events.kbHit()) {
 				Common::KeyState keyState = events.getKey();
-				if (keyState.keycode >= ' ' && keyState.keycode < '~')
+				if (Common::isPrint(keyState.ascii))
 					key2 = keyState.keycode;
 			}
 
-- 
cgit v1.2.3


From 338fd4697642dac417be53d21cfc537a30f74f3c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 May 2015 23:57:08 -0400
Subject: SHERLOCK: Cleanup of Journal::handleEvents

---
 engines/sherlock/journal.cpp | 106 +++++++++++++++++++++++++------------------
 engines/sherlock/journal.h   |   9 ++++
 2 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index be2a013069..34a58b5871 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -808,6 +808,49 @@ bool Journal::drawJournal(int direction, int howFar) {
 	return direction >= 3 && searchSuccessful;
 }
 
+/**
+ * Returns the button, if any, that is under the specified position
+ */
+JournalButton Journal::getHighlightedButton(const Common::Point &pt) {
+	if (pt.x > JOURNAL_POINTS[0][0] && pt.x < JOURNAL_POINTS[0][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+			pt.y < (JOURNAL_BUTTONS_Y + 10))
+		return BTN_EXIT;
+
+	if (pt.x > JOURNAL_POINTS[1][0] && pt.x < JOURNAL_POINTS[1][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+			pt.y < (JOURNAL_BUTTONS_Y + 10) && _page > 1)
+		return BTN_BACK10;
+
+	if (pt.x > JOURNAL_POINTS[2][0] && pt.x < JOURNAL_POINTS[2][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+			pt.y < (JOURNAL_BUTTONS_Y + 10) && _up)
+		return BTN_UP;
+
+	if (pt.x > JOURNAL_POINTS[3][0] && pt.x < JOURNAL_POINTS[3][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+			pt.y < (JOURNAL_BUTTONS_Y + 10) && _down)
+		return BTN_DOWN;
+
+	if (pt.x > JOURNAL_POINTS[4][0] && pt.x < JOURNAL_POINTS[4][1] && pt.y >= JOURNAL_BUTTONS_Y &&
+			pt.y < (JOURNAL_BUTTONS_Y + 10) && _down)
+		return BTN_AHEAD110;
+
+	if (pt.x > JOURNAL_POINTS[5][0] && pt.x < JOURNAL_POINTS[5][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+			pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty())
+		return BTN_SEARCH;
+
+	if (pt.x > JOURNAL_POINTS[6][0] && pt.x < JOURNAL_POINTS[6][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+			pt.y < (JOURNAL_BUTTONS_Y + 20) && _up)
+		return BTN_FIRST_PAGE;
+
+	if (pt.x > JOURNAL_POINTS[7][0] && pt.x < JOURNAL_POINTS[7][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+			pt.y < (JOURNAL_BUTTONS_Y + 20) && _down)
+		return BTN_LAST_PAGE;
+
+	if (pt.x > JOURNAL_POINTS[8][0] && pt.x < JOURNAL_POINTS[8][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
+			pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty())
+		return BTN_PRINT_TEXT;
+
+	return BTN_NONE;
+}
+
 /**
  * Handle events whilst the journal is being displayed
  */
@@ -815,65 +858,46 @@ bool Journal::handleEvents(int key) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	bool doneFlag = false;
+
 	Common::Point pt = events.mousePos();
+	JournalButton btn = getHighlightedButton(pt);
 	byte color;
-	enum Button {
-		BTN_NONE, BTN_EXIT, BTN_BACK10, BTN_UP, BTN_DOWN, BTN_AHEAD110, BTN_SEARCH,
-		BTN_FIRST_PAGE, BTN_LAST_PAGE, BTN_PRINT_TEXT
-	};
-	Button found = BTN_NONE;
 
 	if (events._pressed || events._released) {
 		// Exit button
-		if (pt.x > JOURNAL_POINTS[0][0] && pt.x < JOURNAL_POINTS[0][1] && pt.y >= JOURNAL_BUTTONS_Y &&
-				pt.y < (JOURNAL_BUTTONS_Y + 10)) {
-			found = BTN_EXIT;
-			color = COMMAND_HIGHLIGHTED;
-		} else {
-			color = COMMAND_FOREGROUND;
-		}
+		color = (btn == BTN_EXIT) ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND;
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[0][2], JOURNAL_BUTTONS_Y), color, true, "Exit");
 
 		// Back 10 button
-		if (pt.x > JOURNAL_POINTS[1][0] && pt.x < JOURNAL_POINTS[1][1] && pt.y >= JOURNAL_BUTTONS_Y &&
-				pt.y < (JOURNAL_BUTTONS_Y + 10) && _page > 1) {
-			found = BTN_BACK10;
+		if (btn == BTN_BACK10) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Back 10");
 		} else if (_page > 1) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[1][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Back 10");
 		}
 
 		// Up button
-		if (pt.x > JOURNAL_POINTS[2][0] && pt.x < JOURNAL_POINTS[2][1] && pt.y >= JOURNAL_BUTTONS_Y &&
-				pt.y < (JOURNAL_BUTTONS_Y + 10) && _up) {
-			found = BTN_UP;
+		if (btn == BTN_UP) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[2][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Up");
 		} else if (_up) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[2][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Up");
 		}
 
 		// Down button
-		if (pt.x > JOURNAL_POINTS[3][0] && pt.x < JOURNAL_POINTS[3][1] && pt.y >= JOURNAL_BUTTONS_Y &&
-				pt.y < (JOURNAL_BUTTONS_Y + 10) && _down) {
-			found = BTN_DOWN;
+		if (btn == BTN_DOWN) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[3][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Down");
 		} else if (_down) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[3][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Down");
 		}
 
 		// Ahead 10 button
-		if (pt.x > JOURNAL_POINTS[4][0] && pt.x < JOURNAL_POINTS[4][1] && pt.y >= JOURNAL_BUTTONS_Y &&
-				pt.y < (JOURNAL_BUTTONS_Y + 10) && _down) {
-			found = BTN_AHEAD110;
+		if (btn == BTN_AHEAD110) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[4][2], JOURNAL_BUTTONS_Y), COMMAND_HIGHLIGHTED, true, "Ahead 10");
 		} else if (_down) {
 			screen.buttonPrint(Common::Point(JOURNAL_POINTS[4][2], JOURNAL_BUTTONS_Y), COMMAND_FOREGROUND, true, "Ahead 10");
 		}
 
 		// Search button
-		if (pt.x > JOURNAL_POINTS[5][0] && pt.x < JOURNAL_POINTS[5][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
-				pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty()) {
-			found = BTN_SEARCH;
+		if (btn == BTN_SEARCH) {
 			color = COMMAND_HIGHLIGHTED;
 		} else if (_journal.empty()) {
 			color = COMMAND_NULL;
@@ -883,9 +907,7 @@ bool Journal::handleEvents(int key) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), color, true, "Search");
 
 		// First Page button
-		if (pt.x > JOURNAL_POINTS[6][0] && pt.x < JOURNAL_POINTS[6][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
-				pt.y < (JOURNAL_BUTTONS_Y + 20) && _up) {
-			found = BTN_FIRST_PAGE;
+		if (btn == BTN_FIRST_PAGE) {
 			color = COMMAND_HIGHLIGHTED;
 		} else if (_up) {
 			color = COMMAND_FOREGROUND;
@@ -895,9 +917,7 @@ bool Journal::handleEvents(int key) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[6][2], JOURNAL_BUTTONS_Y + 11), color, true, "First Page");
 
 		// Last Page button
-		if (pt.x > JOURNAL_POINTS[7][0] && pt.x < JOURNAL_POINTS[7][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
-				pt.y < (JOURNAL_BUTTONS_Y + 20) && _down) {
-			found = BTN_LAST_PAGE;
+		if (btn == BTN_LAST_PAGE) {
 			color = COMMAND_HIGHLIGHTED;
 		} else if (_down) {
 			color = COMMAND_FOREGROUND;
@@ -907,18 +927,14 @@ bool Journal::handleEvents(int key) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[7][2], JOURNAL_BUTTONS_Y + 11), color, true, "Last Page");
 
 		// Print Text button
-		if (pt.x > JOURNAL_POINTS[8][0] && pt.x < JOURNAL_POINTS[8][1] && pt.y >= (JOURNAL_BUTTONS_Y + 11) &&
-				pt.y < (JOURNAL_BUTTONS_Y + 20) && !_journal.empty()) {
-			found = BTN_PRINT_TEXT;
-		}
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), COMMAND_NULL, true, "Print Text");
 	}
 
-	if (found == BTN_EXIT && events._released) {
+	if (btn == BTN_EXIT && events._released) {
 		// Exit button pressed
 		doneFlag = true;
 
-	} else if (((found == BTN_BACK10 && events._released) || key == 'B') && (_page > 1)) {
+	} else if (((btn == BTN_BACK10 && events._released) || key == 'B') && (_page > 1)) {
 		// Scrolll up 10 pages
 		if (_page < 11)
 			drawJournal(1, (_page - 1) * LINES_PER_PAGE);
@@ -928,19 +944,19 @@ bool Journal::handleEvents(int key) {
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 
-	} else if (((found == BTN_UP && events._released) || key == 'U') && _up) {
+	} else if (((btn == BTN_UP && events._released) || key == 'U') && _up) {
 		// Scroll up
 		drawJournal(1, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	
-	} else if (((found == BTN_DOWN && events._released) || key == 'D') && _down) {
+	} else if (((btn == BTN_DOWN && events._released) || key == 'D') && _down) {
 		// Scroll down
 		drawJournal(2, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 
-	} else if (((found == BTN_AHEAD110 && events._released) || key == 'A') && _down) {
+	} else if (((btn == BTN_AHEAD110 && events._released) || key == 'A') && _down) {
 		// Scroll down 10 pages
 		if ((_page + 10) > _maxPage)
 			drawJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
@@ -950,7 +966,7 @@ bool Journal::handleEvents(int key) {
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	
-	} else if (((found == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
+	} else if (((btn == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
 		bool notFound = false;
 
@@ -981,7 +997,7 @@ bool Journal::handleEvents(int key) {
 		} while (!doneFlag);
 		doneFlag = false;
 	
-	} else if (((found == BTN_FIRST_PAGE && events._released) || key == 'F') && _up) {
+	} else if (((btn == BTN_FIRST_PAGE && events._released) || key == 'F') && _up) {
 		// First page
 		_index = _sub = 0;
 		_up = _down = false;
@@ -992,7 +1008,7 @@ bool Journal::handleEvents(int key) {
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 	
-	} else if (((found == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
+	} else if (((btn == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
 		// Last page
 		if ((_page + 10) > _maxPage)
 			drawJournal(2, (_maxPage - _page) * LINES_PER_PAGE);
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 026579bac2..54bc9457cf 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/array.h"
+#include "common/rect.h"
 #include "common/serializer.h"
 #include "common/str-array.h"
 #include "common/stream.h"
@@ -34,6 +35,12 @@ namespace Sherlock {
 #define JOURNAL_MAX_WIDTH 230
 #define JOURNAL_MAX_CHARS 80
 
+enum JournalButton {
+	BTN_NONE, BTN_EXIT, BTN_BACK10, BTN_UP, BTN_DOWN, BTN_AHEAD110, BTN_SEARCH,
+	BTN_FIRST_PAGE, BTN_LAST_PAGE, BTN_PRINT_TEXT
+};
+
+
 struct JournalEntry {
 	int _converseNum;
 	bool _replyOnly;
@@ -71,6 +78,8 @@ private:
 	int getSearchString(bool printError);
 
 	void drawJournalFrame();
+
+	JournalButton getHighlightedButton(const Common::Point &pt);
 public:
 	Journal(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 485214a831582bab79634555175a79a317039613 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 00:03:54 -0400
Subject: SHERLOCK: Further addition of enums and method renames

---
 engines/sherlock/events.cpp         | 10 ++++++----
 engines/sherlock/inventory.cpp      |  4 ++--
 engines/sherlock/inventory.h        |  2 +-
 engines/sherlock/user_interface.cpp |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 84794e6e6a..9d9c764fe5 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -30,6 +30,8 @@
 
 namespace Sherlock {
 
+enum ButtonFlag { LEFT_BUTTON = 1, RIGHT_BUTTON = 2 };
+
 Events::Events(SherlockEngine *vm) {
 	_vm = vm;
 	_cursorImages = nullptr;
@@ -143,16 +145,16 @@ void Events::pollEvents() {
 		case Common::EVENT_KEYUP:
 			return;
 		case Common::EVENT_LBUTTONDOWN:
-			_mouseButtons |= 1;
+			_mouseButtons |= LEFT_BUTTON;
 			return;
 		case Common::EVENT_RBUTTONDOWN:
-			_mouseButtons |= 2;
+			_mouseButtons |= RIGHT_BUTTON;
 			return;
 		case Common::EVENT_LBUTTONUP:
-			_mouseButtons &= ~1;
+			_mouseButtons &= ~LEFT_BUTTON;
 			return;
 		case Common::EVENT_RBUTTONUP:
-			_mouseButtons &= ~2;
+			_mouseButtons &= ~RIGHT_BUTTON;
 			return;
 		default:
  			break;
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index d41e4b9b3e..2e7791e5f8 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -349,9 +349,9 @@ void Inventory::highlight(int index, byte color) {
 }
 
 /**
- * Support method for updating the screen
+ * Support method for refreshing the display of the inventory
  */
-void Inventory::doInvJF() {
+void Inventory::refreshInv() {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index 979507a387..dd4c16b6c9 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -103,7 +103,7 @@ public:
 
 	void highlight(int index, byte color);
 
-	void doInvJF();
+	void refreshInv();
 
 	int putNameInInventory(const Common::String &name);
 	int putItemInInventory(Object &obj);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 1607c727eb..ef1da3b29f 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1198,7 +1198,7 @@ void UserInterface::doInvControl() {
 			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == 1) && (_find >= 0) && (_find < 1000)) {
 				if (!scene._bgShapes[_find]._examine.empty() &&
 						scene._bgShapes[_find]._examine[0] >= ' ')
-					inv.doInvJF();
+					inv.refreshInv();
 			} else if (_selector != -1 || _find >= 0) {
 				// Selector is the inventory object that was clicked on, or selected.
 				// If it's -1, then no inventory item is highlighted yet. Otherwise,
@@ -1206,7 +1206,7 @@ void UserInterface::doInvControl() {
 
 				if (_selector != -1 && inv._invMode == INVMODE_LOOK
 						&& mousePos.y >(CONTROLS_Y1 + 11))
-					inv.doInvJF();
+					inv.refreshInv();
 
 				if (talk._talkToAbort)
 					return;
-- 
cgit v1.2.3


From 1e78908d170688e046cf18be841ee3c4aa41e53b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 00:23:49 -0400
Subject: SHERLOCK: Replaced references to scene numbers with an enum

---
 engines/sherlock/map.cpp             |  2 +-
 engines/sherlock/scalpel/scalpel.cpp | 43 ++++++++++++++++++------------------
 engines/sherlock/scalpel/scalpel.h   |  4 ++++
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 36c932d90d..2102f6ae51 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -63,7 +63,7 @@ Map::Map(SherlockEngine *vm) : _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 	_drawMap = false;
 	_overPos = Common::Point(13000, 12600);
 	_charPoint = 0;
-	_oldCharPoint = 39;
+	_oldCharPoint = 0;
 	_frameChangeFlag = false;
 
 	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index fa55ca6013..e47be791f0 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -254,6 +254,7 @@ void ScalpelEngine::initialize() {
 		// Load the map co-ordinates for each scene and sequence data
 		_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
 		_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
+		_map->_oldCharPoint = BAKER_ST_EXTERIOR;
 	}
 
 	// Load the inventory
@@ -553,7 +554,7 @@ void ScalpelEngine::showLBV(const Common::String &filename) {
  * Starting a scene within the game
  */
 void ScalpelEngine::startScene() {
-	if (_scene->_goToScene == 100 || _scene->_goToScene == 98) {
+	if (_scene->_goToScene == OVERHEAD_MAP || _scene->_goToScene == OVERHEAD_MAP2) {
 		// Show the map
 		if (_sound->_musicOn) {
 			if (_sound->loadSong(100)) {
@@ -576,17 +577,17 @@ void ScalpelEngine::startScene() {
 	// 55: Fade out and exit
 	// 70: Brumwell suicide
 	switch (_scene->_goToScene) {
-	case 2:
-	case 52:
-	case 53:
-	case 70:
+	case BLACKWOOD_CAPTURE:
+	case RESCUE_ANNA:
+	case MOOREHEAD_DEATH:
+	case BRUMWELL_SUICIDE:
 		if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene)) {
 			if (_sound->_music)
 				_sound->startSong();
 		}
 
 		switch (_scene->_goToScene) {
-		case 2:
+		case BLACKWOOD_CAPTURE:
 			// Blackwood's capture
 			_res->addToCache("final2.vda", "epilogue.lib");
 			_res->addToCache("final2.vdx", "epilogue.lib");
@@ -594,7 +595,7 @@ void ScalpelEngine::startScene() {
 			_animation->play("final2", 1, 0, false, 4);
 			break;
 
-		case 52:
+		case RESCUE_ANNA:
 			// Rescuing Anna
 			_res->addToCache("finalr2.vda", "epilogue.lib");
 			_res->addToCache("finalr2.vdx", "epilogue.lib");
@@ -629,7 +630,7 @@ void ScalpelEngine::startScene() {
 			_useEpilogue2 = false;
 			break;
 
-		case 53:
+		case MOOREHEAD_DEATH:
 			// Moorehead's death / subway train
 			_res->addToCache("SUBWAY2.vda", "epilogue.lib");
 			_res->addToCache("SUBWAY2.vdx", "epilogue.lib");
@@ -645,7 +646,7 @@ void ScalpelEngine::startScene() {
 			_screen->_fadeStyle = false;
 			break;
 
-		case 70:
+		case BRUMWELL_SUICIDE:
 			// Brumwell suicide
 			_animation->play("suicid", 1, 3, true, 4);
 			break;
@@ -654,31 +655,31 @@ void ScalpelEngine::startScene() {
 		}
 
 		// Except for the Moorehead Murder scene, fade to black first
-		if (_scene->_goToScene != 53) {
+		if (_scene->_goToScene != MOOREHEAD_DEATH) {
 			_events->wait(40);
 			_screen->fadeToBlack(3);
 		}
 
 		switch (_scene->_goToScene) {
 		case 52:
-			_scene->_goToScene = 27;			// Go to the Lawyer's Office
+			_scene->_goToScene = LAWYER_OFFICE;		// Go to the Lawyer's Office
 			_map->_bigPos = Common::Point(0, 0);	// Overland scroll position
 			_map->_overPos = Common::Point(22900 - 600, 9400 + 900);	// Overland position
-			_map->_oldCharPoint = 27;
+			_map->_oldCharPoint = LAWYER_OFFICE;
 			break;
 
 		case 53:
-			_scene->_goToScene = 17;			// Go to St. Pancras Station
+			_scene->_goToScene = STATION;			// Go to St. Pancras Station
 			_map->_bigPos = Common::Point(0, 0);	// Overland scroll position
 			_map->_overPos = Common::Point(32500 - 600, 3000 + 900);	// Overland position
-			_map->_oldCharPoint = 17;
+			_map->_oldCharPoint = STATION;
 			break;
 
 		default:
-			_scene->_goToScene = 4;			// Back to Baker st.
+			_scene->_goToScene = BAKER_STREET;		// Back to Baker st.
 			_map->_bigPos = Common::Point(0, 0);	// Overland scroll position
 			_map->_overPos = Common::Point(14500 - 600, 8400 + 900);	// Overland position
-			_map->_oldCharPoint = 4;
+			_map->_oldCharPoint = BAKER_STREET;
 			break;
 		}
 
@@ -686,7 +687,7 @@ void ScalpelEngine::startScene() {
 		_sound->freeSong();
 		break;
 
-	case 55:
+	case EXIT_GAME:
 		// Exit game
 		_screen->fadeToBlack(3);
 		quitGame();
@@ -702,14 +703,14 @@ void ScalpelEngine::startScene() {
 	if (_scene->_goToScene == 99) {
 		// Darts Board minigame
 		_darts->playDarts();
-		_mapResult = _scene->_goToScene = 19;	// Go back to the bar
+		_mapResult = _scene->_goToScene = PUB_INTERIOR;
 	}
 
 	_mapResult = _scene->_goToScene;
 }
 
 /**
- * Takes care of clearing the mirror in scene 12, in case anything drew over it
+ * Takes care of clearing the mirror in scene 12 (mansion drawing room), in case anything drew over it
  */
 void ScalpelEngine::eraseMirror12() {
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
@@ -722,7 +723,7 @@ void ScalpelEngine::eraseMirror12() {
 }
 
 /**
- * Takes care of drawing Holme's reflection onto the mirror in scene 12
+ * Takes care of drawing Holme's reflection onto the mirror in scene 12 (mansion drawing room)
  */
 void ScalpelEngine::doMirror12() {
 	People &people = *_people;
@@ -798,7 +799,7 @@ void ScalpelEngine::doMirror12() {
 }
 
 /**
- * This clears the mirror  in scene 12 in case anything messed draw over it
+ * This clears the mirror in scene 12 (mansion drawing room) in case anything messed draw over it
  */
 void ScalpelEngine::flushMirror12() {
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 40e4937b5d..62875f1e90 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -30,6 +30,10 @@ namespace Sherlock {
 
 namespace Scalpel {
 
+enum { BLACKWOOD_CAPTURE = 2, BAKER_STREET = 4, DRAWING_ROOM = 12, STATION = 17, PUB_INTERIOR = 19,
+	LAWYER_OFFICE = 27, BAKER_ST_EXTERIOR = 39, RESCUE_ANNA = 52, MOOREHEAD_DEATH = 53, EXIT_GAME = 55, 
+	BRUMWELL_SUICIDE = 70, OVERHEAD_MAP2 = 98, DARTS_GAME = 99, OVERHEAD_MAP = 100 };
+ 
 class ScalpelEngine : public SherlockEngine {
 private:
 	Darts *_darts;
-- 
cgit v1.2.3


From 66f98c794cab091858954ee71a9b7680e4d6ef38 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 00:26:23 -0400
Subject: SHERLOCK: Remove GCC_PRINTF to fix gcc compilation

There are simply too many places that simply pass a string directly
to the print methods rather than a format string
---
 engines/sherlock/screen.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 452a18631f..2103588fe0 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -101,8 +101,8 @@ public:
 
 	void verticalTransition();
 
-	void print(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5);
-	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5);
+	void print(const Common::Point &pt, byte color, const char *formatStr, ...);
+	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...);
 
 	void restoreBackground(const Common::Rect &r);
 
-- 
cgit v1.2.3


From 0faf1c0b8f5c52cde1addae3e14469fc5fa9b9a2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 00:28:59 -0400
Subject: SHERLOCK: Remove unused typedef

---
 engines/sherlock/map.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 2102f6ae51..9b901e59f6 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -286,7 +286,6 @@ void Map::setupSprites() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
-	typedef byte Sequences[16][MAX_FRAME];
 	_savedPos.x = -1;
 
 	_mapCursors = new ImageFile("omouse.vgs");
-- 
cgit v1.2.3


From aba98e910c9acea7063e1d21072c9943b5f26f8c Mon Sep 17 00:00:00 2001
From: Kirben
Date: Tue, 19 May 2015 20:23:21 +1000
Subject: AGOS: Fix changing rooms in the PC version of Waxworks.

---
 engines/agos/rooms.cpp    | 2 +-
 engines/agos/saveload.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index c79b029fdc..d1d6f2b99d 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -383,7 +383,7 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
 			 for (uint16 z = minNum; z <= maxNum; z++) {
 				uint16 itemNum = z + 2;
 				item = derefItem(itemNum);
-				item->parent = 0;
+				_itemArrayPtr[itemNum] = 0;
 
 				uint16 num = (itemNum - _itemArrayInited);
 				_roomStates[num].state = item->state;
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 5d5e2d7b03..06ab60276d 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1293,8 +1293,7 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 
 					 for (uint16 z = minNum; z <= maxNum; z++) {
 						uint16 itemNum = z + 2;
-						Item *item = derefItem(itemNum);
-						item->parent = 0;
+						_itemArrayPtr[itemNum] = 0;
 					}
 				}
 			}
-- 
cgit v1.2.3


From a709596b48b93e46b36f2142f6d781a5198fe8a2 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 19 May 2015 12:39:39 +0200
Subject: AGI: implement original sierra font, fix bug #6405

custom font is still used for fanmade games
i cannot test preAGI games, because I don't own
those.
---
 engines/agi/agi.cpp      |   9 ++
 engines/agi/agi.h        |   4 +
 engines/agi/font.h       | 271 +++++++++++++++++++++++++++++++++++++++++++++--
 engines/agi/graphics.cpp |   6 +-
 engines/agi/graphics.h   |   2 +-
 engines/agi/preagi.cpp   |   8 +-
 engines/agi/text.cpp     |   4 +-
 7 files changed, 292 insertions(+), 12 deletions(-)

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 85a8e175bd..2b5d7137bc 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -515,6 +515,8 @@ AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(sys
 	_rnd = new Common::RandomSource("agi");
 	_sound = 0;
 
+	_fontData = NULL;
+
 	initFeatures();
 	initVersion();
 }
@@ -569,6 +571,13 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
 		_game.mouseEnabled = false;
 	}
 
+	// We are currently using the custom font for all fanmade games
+	if (!(getFeatures() & (GF_FANMADE | GF_AGDS))) {
+		_fontData = fontData_Sierra; // original Sierra font
+	} else {
+		_fontData = fontData_FanGames; // our (own?) custom font, that supports umlauts etc.
+	}
+
 	_game._vm = this;
 
 	_game.clockEnabled = false;
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 2cf70b3c89..04e02dcf87 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -781,6 +781,8 @@ protected:
 
 	void initRenderMode();
 
+	const uint8 *_fontData;
+
 public:
 	GfxMgr *_gfx;
 
@@ -840,6 +842,8 @@ public:
 
 	bool canLoadGameStateCurrently();
 	bool canSaveGameStateCurrently();
+
+	const uint8 *getFontData() { return _fontData; };
 };
 
 typedef void (*AgiCommand)(AgiGame *state, uint8 *p);
diff --git a/engines/agi/font.h b/engines/agi/font.h
index c77d8cf0c3..0e6b15f06b 100644
--- a/engines/agi/font.h
+++ b/engines/agi/font.h
@@ -26,7 +26,7 @@
 namespace Agi {
 
 // 8x8 font patterns
-static const uint8 curFont[] = {
+static const uint8 fontData_Sierra[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x7E, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7E,	// cursor hollow
 	0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E,	// cursor solid
@@ -59,6 +59,267 @@ static const uint8 curFont[] = {
 	0x00, 0x24, 0x42, 0xFF, 0x42, 0x24, 0x00, 0x00,
 	0x00, 0x10, 0x38, 0x7C, 0xFE, 0xFE, 0x00, 0x00,
 	0x00, 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00, 0x00,
+	// original sierra font starts here
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 Space
+	0x30, 0x78, 0x78, 0x30, 0x30, 0x00, 0x30, 0x00,
+	0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x6C, 0x6C, 0xFE, 0x6C, 0xFE, 0x6C, 0x6C, 0x00,
+	0x30, 0x7C, 0xC0, 0x78, 0x0C, 0xF8, 0x30, 0x00,
+	0x00, 0xC6, 0xCC, 0x18, 0x30, 0x66, 0xC6, 0x00,
+	0x38, 0x6C, 0x38, 0x76, 0xDC, 0xCC, 0x76, 0x00,
+	0x60, 0x60, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0x60, 0x60, 0x60, 0x30, 0x18, 0x00,
+	0x60, 0x30, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00,
+	0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00,
+	0x00, 0x30, 0x30, 0xFC, 0x30, 0x30, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x60,
+	0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00,
+	0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 0x80, 0x00,
+	0x7C, 0xC6, 0xCE, 0xDE, 0xF6, 0xE6, 0x7C, 0x00, // 0x30
+	0x30, 0x70, 0x30, 0x30, 0x30, 0x30, 0xFC, 0x00,
+	0x78, 0xCC, 0x0C, 0x38, 0x60, 0xCC, 0xFC, 0x00,
+	0x78, 0xCC, 0x0C, 0x38, 0x0C, 0xCC, 0x78, 0x00,
+	0x1C, 0x3C, 0x6C, 0xCC, 0xFE, 0x0C, 0x1E, 0x00,
+	0xFC, 0xC0, 0xF8, 0x0C, 0x0C, 0xCC, 0x78, 0x00,
+	0x38, 0x60, 0xC0, 0xF8, 0xCC, 0xCC, 0x78, 0x00,
+	0xFC, 0xCC, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00,
+	0x78, 0xCC, 0xCC, 0x78, 0xCC, 0xCC, 0x78, 0x00,
+	0x78, 0xCC, 0xCC, 0x7C, 0x0C, 0x18, 0x70, 0x00,
+	0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00,
+	0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x60,
+	0x18, 0x30, 0x60, 0xC0, 0x60, 0x30, 0x18, 0x00,
+	0x00, 0x00, 0xFC, 0x00, 0x00, 0xFC, 0x00, 0x00,
+	0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00,
+	0x78, 0xCC, 0x0C, 0x18, 0x30, 0x00, 0x30, 0x00,
+	0x7C, 0xC6, 0xDE, 0xDE, 0xDE, 0xC0, 0x78, 0x00, // 0x40
+	0x30, 0x78, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0x00,
+	0xFC, 0x66, 0x66, 0x7C, 0x66, 0x66, 0xFC, 0x00,
+	0x3C, 0x66, 0xC0, 0xC0, 0xC0, 0x66, 0x3C, 0x00,
+	0xF8, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0xF8, 0x00,
+	0xFE, 0x62, 0x68, 0x78, 0x68, 0x62, 0xFE, 0x00,
+	0xFE, 0x62, 0x68, 0x78, 0x68, 0x60, 0xF0, 0x00,
+	0x3C, 0x66, 0xC0, 0xC0, 0xCE, 0x66, 0x3E, 0x00,
+	0xCC, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0xCC, 0x00,
+	0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x1E, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00,
+	0xE6, 0x66, 0x6C, 0x78, 0x6C, 0x66, 0xE6, 0x00,
+	0xF0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xFE, 0x00,
+	0xC6, 0xEE, 0xFE, 0xFE, 0xD6, 0xC6, 0xC6, 0x00,
+	0xC6, 0xE6, 0xF6, 0xDE, 0xCE, 0xC6, 0xC6, 0x00,
+	0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, 0x00,
+	0xFC, 0x66, 0x66, 0x7C, 0x60, 0x60, 0xF0, 0x00, // 0x50
+	0x78, 0xCC, 0xCC, 0xCC, 0xDC, 0x78, 0x1C, 0x00,
+	0xFC, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0xE6, 0x00,
+	0x78, 0xCC, 0xE0, 0x70, 0x1C, 0xCC, 0x78, 0x00,
+	0xFC, 0xB4, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xFC, 0x00,
+	0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00,
+	0xC6, 0xC6, 0xC6, 0xD6, 0xFE, 0xEE, 0xC6, 0x00,
+	0xC6, 0xC6, 0x6C, 0x38, 0x38, 0x6C, 0xC6, 0x00,
+	0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x30, 0x78, 0x00,
+	0xFE, 0xC6, 0x8C, 0x18, 0x32, 0x66, 0xFE, 0x00,
+	0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x00,
+	0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x02, 0x00,
+	0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00,
+	0x10, 0x38, 0x6C, 0xC6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x60
+	0x00, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00,
+	0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, 0xDC, 0x00,
+	0x00, 0x00, 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x00,
+	0x1C, 0x0C, 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00,
+	0x38, 0x6C, 0x60, 0xF0, 0x60, 0x60, 0xF0, 0x00,
+	0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8,
+	0xE0, 0x60, 0x6C, 0x76, 0x66, 0x66, 0xE6, 0x00,
+	0x30, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x0C, 0x00, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78,
+	0xE0, 0x60, 0x66, 0x6C, 0x78, 0x6C, 0xE6, 0x00,
+	0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00,
+	0x00, 0x00, 0xCC, 0xFE, 0xFE, 0xD6, 0xC6, 0x00,
+	0x00, 0x00, 0xF8, 0xCC, 0xCC, 0xCC, 0xCC, 0x00,
+	0x00, 0x00, 0x78, 0xCC, 0xCC, 0xCC, 0x78, 0x00,
+	0x00, 0x00, 0xDC, 0x66, 0x66, 0x7C, 0x60, 0xF0, // 0x70
+	0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0x1E,
+	0x00, 0x00, 0xDC, 0x76, 0x66, 0x60, 0xF0, 0x00,
+	0x00, 0x00, 0x7C, 0xC0, 0x78, 0x0C, 0xF8, 0x00,
+	0x10, 0x30, 0x7C, 0x30, 0x30, 0x34, 0x18, 0x00,
+	0x00, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00,
+	0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00,
+	0x00, 0x00, 0xC6, 0xD6, 0xFE, 0xFE, 0x6C, 0x00,
+	0x00, 0x00, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0x00,
+	0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8,
+	0x00, 0x00, 0xFC, 0x98, 0x30, 0x64, 0xFC, 0x00,
+	0x1C, 0x30, 0x30, 0xE0, 0x30, 0x30, 0x1C, 0x00,
+	0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00,
+	0xE0, 0x30, 0x30, 0x1C, 0x30, 0x30, 0xE0, 0x00,
+	0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	// custom font starting here at 0x80
+	0x1E, 0x36, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x00, // 0x80
+	0x7C, 0x60, 0x60, 0x7C, 0x66, 0x66, 0x7C, 0x00,
+	0x7C, 0x66, 0x66, 0x7C, 0x66, 0x66, 0x7C, 0x00,
+	0x7E, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+	0x38, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0xFE, 0xC6,
+	0x7E, 0x60, 0x60, 0x7C, 0x60, 0x60, 0x7E, 0x00,
+	0xDB, 0xDB, 0x7E, 0x3C, 0x7E, 0xDB, 0xDB, 0x00,
+	0x3C, 0x66, 0x06, 0x1C, 0x06, 0x66, 0x3C, 0x00,
+	0x66, 0x66, 0x6E, 0x7E, 0x76, 0x66, 0x66, 0x00,
+	0x3C, 0x66, 0x6E, 0x7E, 0x76, 0x66, 0x66, 0x00,
+	0x66, 0x6C, 0x78, 0x70, 0x78, 0x6C, 0x66, 0x00,
+	0x1E, 0x36, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0xC6, 0xEE, 0xFE, 0xFE, 0xD6, 0xC6, 0xC6, 0x00,
+	0x66, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x66, 0x00,
+	0x3C, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00,
+	0x7E, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0x7C, 0x66, 0x66, 0x66, 0x7C, 0x60, 0x60, 0x00,
+	0x3C, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3C, 0x00,
+	0x7E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x3E, 0x06, 0x66, 0x3C, 0x00,
+	0x7E, 0xDB, 0xDB, 0xDB, 0x7E, 0x18, 0x18, 0x00,
+	0x66, 0x66, 0x3C, 0x18, 0x3C, 0x66, 0x66, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7F, 0x03,
+	0x66, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x06, 0x00,
+	0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xFF, 0x00,
+	0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xFF, 0x03,
+	0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, 0x7C, 0x00,
+	0xC6, 0xC6, 0xC6, 0xF6, 0xDE, 0xDE, 0xF6, 0x00,
+	0x60, 0x60, 0x60, 0x7C, 0x66, 0x66, 0x7C, 0x00,
+	0x78, 0x8C, 0x06, 0x3E, 0x06, 0x8C, 0x78, 0x00,
+	0xCE, 0xDB, 0xDB, 0xFB, 0xDB, 0xDB, 0xCE, 0x00,
+	0x3E, 0x66, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x00,
+	0x00, 0x00, 0x3C, 0x06, 0x3E, 0x66, 0x3A, 0x00,
+	0x00, 0x3C, 0x60, 0x3C, 0x66, 0x66, 0x3C, 0x00,
+	0x00, 0x00, 0x7C, 0x66, 0x7C, 0x66, 0x7C, 0x00,
+	0x00, 0x00, 0x7E, 0x60, 0x60, 0x60, 0x60, 0x00,
+	0x00, 0x00, 0x3C, 0x6C, 0x6C, 0x6C, 0xFE, 0xC6,
+	0x00, 0x00, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00,
+	0x00, 0x00, 0xDB, 0x7E, 0x3C, 0x7E, 0xDB, 0x00,
+	0x00, 0x00, 0x3C, 0x66, 0x0C, 0x66, 0x3C, 0x00,
+	0x00, 0x00, 0x66, 0x6E, 0x7E, 0x76, 0x66, 0x00,
+	0x00, 0x18, 0x66, 0x6E, 0x7E, 0x76, 0x66, 0x00,
+	0x00, 0x00, 0x66, 0x6C, 0x78, 0x6C, 0x66, 0x00,
+	0x00, 0x00, 0x1E, 0x36, 0x66, 0x66, 0x66, 0x00,
+	0x00, 0x00, 0xC6, 0xFE, 0xFE, 0xD6, 0xC6, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x00,
+	0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x00,
+	0x00, 0x00, 0x7E, 0x66, 0x66, 0x66, 0x66, 0x00,
+	0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44,
+	0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA,
+	0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xF8, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, 0x18,
+	0x36, 0x36, 0x36, 0xF6, 0x36, 0x36, 0x36, 0x36,
+	0x00, 0x00, 0x00, 0xFE, 0x36, 0x36, 0x36, 0x36,
+	0x00, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, 0x18,
+	0x36, 0xF6, 0x06, 0xF6, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+	0x00, 0xFE, 0x06, 0xF6, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0xF6, 0x06, 0xFE, 0x00, 0x00, 0x00, 0x00,
+	0x36, 0x36, 0x36, 0xFE, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0xF8, 0x18, 0xF8, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xF8, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x1F, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xFF, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x1F, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, 0x18,
+	0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0x37, 0x30, 0x3F, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3F, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xFF, 0x00, 0xF7, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
+	0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x36, 0xF7, 0x00, 0xF7, 0x36, 0x36, 0x36, 0x36,
+	0x18, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x36, 0x36, 0x36, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xFF, 0x00, 0xFF, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0xFF, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x36, 0x3F, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x1F, 0x18, 0x1F, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x3F, 0x36, 0x36, 0x36, 0x36,
+	0x36, 0x36, 0x36, 0xFF, 0x36, 0x36, 0x36, 0x36,
+	0x18, 0xFF, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xF8, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1F, 0x18, 0x18, 0x18, 0x18,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+	0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+	0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7C, 0x66, 0x66, 0x7C, 0x60, 0x00,
+	0x00, 0x00, 0x3C, 0x66, 0x60, 0x66, 0x3C, 0x00,
+	0x00, 0x00, 0x7E, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x3E, 0x06, 0x7C, 0x00,
+	0x00, 0x00, 0x7E, 0xDB, 0xDB, 0x7E, 0x18, 0x00,
+	0x00, 0x00, 0x66, 0x3C, 0x18, 0x3C, 0x66, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x7F, 0x03,
+	0x00, 0x00, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x00,
+	0x00, 0x00, 0xDB, 0xDB, 0xDB, 0xDB, 0xFF, 0x00,
+	0x00, 0x00, 0xDB, 0xDB, 0xDB, 0xDB, 0xFF, 0x03,
+	0x00, 0x00, 0xE0, 0x60, 0x7C, 0x66, 0x7C, 0x00,
+	0x00, 0x00, 0xC6, 0xC6, 0xF6, 0xDE, 0xF6, 0x00,
+	0x00, 0x00, 0x60, 0x60, 0x7C, 0x66, 0x7C, 0x00,
+	0x00, 0x00, 0x7C, 0x06, 0x3E, 0x06, 0x7C, 0x00,
+	0x00, 0x00, 0xCE, 0xDB, 0xFB, 0xDB, 0xCE, 0x00,
+	0x00, 0x00, 0x3E, 0x66, 0x3E, 0x36, 0x66, 0x00,
+	0x00, 0x00, 0xFE, 0x00, 0xFE, 0x00, 0xFE, 0x00,
+	0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x7C, 0x00,
+	0x00, 0x30, 0x18, 0x0C, 0x06, 0x0C, 0x18, 0x30,
+	0x00, 0x0C, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0C,
+	0x0E, 0x1B, 0x1B, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0xD8, 0xD8, 0x70,
+	0x00, 0x18, 0x18, 0x00, 0x7E, 0x00, 0x18, 0x18,
+	0x00, 0x76, 0xDC, 0x00, 0x76, 0xDC, 0x00, 0x00,
+	0x00, 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00,
+	0x03, 0x02, 0x06, 0x04, 0xCC, 0x68, 0x38, 0x10,
+	0x3C, 0x42, 0x99, 0xA1, 0xA1, 0x99, 0x42, 0x3C,
+	0x30, 0x48, 0x10, 0x20, 0x78, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7C, 0x7C, 0x7C, 0x7C, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x7E, 0x00
+};
+
+static const uint8 fontData_FanGames[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7E, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7E,	/* cursor hollow */
+	0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E,	/* cursor solid */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* cursor empty */
+	0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x10, 0x00,
+	0x3C, 0x3C, 0x18, 0xFF, 0xE7, 0x18, 0x3C, 0x00,
+	0x10, 0x38, 0x7C, 0xFE, 0xEE, 0x10, 0x38, 0x00,
+	0x00, 0x00, 0x18, 0x3C, 0x3C, 0x18, 0x00, 0x00,
+	0xFF, 0xFF, 0xE7, 0xC3, 0xC3, 0xE7, 0xFF, 0xFF,
+	0x00, 0x3C, 0x66, 0x42, 0x42, 0x66, 0x3C, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* \n */
+	0x0F, 0x07, 0x0F, 0x7D, 0xCC, 0xCC, 0xCC, 0x78,
+	0x3C, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x7E, 0x18,
+	0x08, 0x0C, 0x0A, 0x0A, 0x08, 0x78, 0xF0, 0x00,
+	0x18, 0x14, 0x1A, 0x16, 0x72, 0xE2, 0x0E, 0x1C,
+	0x10, 0x54, 0x38, 0xEE, 0x38, 0x54, 0x10, 0x00,
+	0x80, 0xE0, 0xF8, 0xFE, 0xF8, 0xE0, 0x80, 0x00,
+	0x02, 0x0E, 0x3E, 0xFE, 0x3E, 0x0E, 0x02, 0x00,
+	0x18, 0x3C, 0x5A, 0x18, 0x5A, 0x3C, 0x18, 0x00,
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00,
+	0x7F, 0xDB, 0xDB, 0xDB, 0x7B, 0x1B, 0x1B, 0x00,
+	0x1C, 0x22, 0x38, 0x44, 0x44, 0x38, 0x88, 0x70,
+	0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, 0x00,
+	0x18, 0x3C, 0x5A, 0x18, 0x5A, 0x3C, 0x18, 0x7E,
+	0x18, 0x3C, 0x5A, 0x18, 0x18, 0x18, 0x18, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x5A, 0x3C, 0x18, 0x00,
+	0x00, 0x18, 0x0C, 0xFE, 0x0C, 0x18, 0x00, 0x00,
+	0x00, 0x30, 0x60, 0xFE, 0x60, 0x30, 0x00, 0x00,
+	0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xFE, 0x00, 0x00,
+	0x00, 0x24, 0x42, 0xFF, 0x42, 0x24, 0x00, 0x00,
+	0x00, 0x10, 0x38, 0x7C, 0xFE, 0xFE, 0x00, 0x00,
+	0x00, 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00,
 	0x6C, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -154,9 +415,7 @@ static const uint8 curFont[] = {
 	0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00,
 	0xE0, 0x30, 0x30, 0x18, 0x30, 0x30, 0xE0, 0x00,
 	0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	//0x00, 0x10, 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0x00,
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,	//replacement 0x7F
-
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,	/*replacement 0x7F */
 	0x1E, 0x36, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x00,
 	0x7C, 0x60, 0x60, 0x7C, 0x66, 0x66, 0x7C, 0x00,
 	0x7C, 0x66, 0x66, 0x7C, 0x66, 0x66, 0x7C, 0x00,
@@ -287,7 +546,7 @@ static const uint8 curFont[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x7E, 0x00
 };
 
-static const uint8 mickey_fontdata[] = {
+static const uint8 fontData_Mickey[] = {
 	0x00, 0x36, 0x7F, 0x7F, 0x3E, 0x1C, 0x08, 0x00,
 	0x00, 0x00, 0x3F, 0x20, 0x2F, 0x28, 0x28, 0x28,
 	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
@@ -546,7 +805,7 @@ static const uint8 mickey_fontdata[] = {
 	0x10, 0x18, 0x1C, 0x1E, 0x1C, 0x18, 0x10, 0x00,
 };
 
-static const uint8 ibm_fontdata[] = {
+static const uint8 fontData_IBM[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x7E, 0x81, 0xA5, 0x81, 0xBD, 0x99, 0x81, 0x7E,
 	0x7E, 0xFF, 0xDB, 0xFF, 0xC3, 0xE7, 0xFF, 0x7E,
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 2b1bd8c829..32d0fdc06a 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -616,6 +616,8 @@ void GfxMgr::putTextCharacter(int l, int x, int y, unsigned char c, int fg, int
 	int x1, y1, xx, yy, cc;
 	const uint8 *p;
 
+	assert(font);
+
 	p = font + ((unsigned int)c * CHAR_LINES);
 	for (y1 = 0; y1 < CHAR_LINES; y1++) {
 		for (x1 = 0; x1 < CHAR_COLS; x1++) {
@@ -699,7 +701,7 @@ void GfxMgr::printCharacter(int x, int y, char c, int fg, int bg) {
 	x *= CHAR_COLS;
 	y *= CHAR_LINES;
 
-	putTextCharacter(0, x, y, c, fg, bg);
+	putTextCharacter(0, x, y, c, fg, bg, false, _vm->getFontData());
 	// redundant! already inside put_text_character!
 	// flush_block (x, y, x + CHAR_COLS - 1, y + CHAR_LINES - 1);
 }
@@ -754,7 +756,7 @@ void GfxMgr::rawDrawButton(int x, int y, const char *s, int fgcolor, int bgcolor
 	drawRectangle(x1, y1, x2, y2, border ? BUTTON_BORDER : MSG_BOX_COLOR);
 
 	while (*s) {
-		putTextCharacter(0, x + textOffset, y + textOffset, *s++, fgcolor, bgcolor);
+		putTextCharacter(0, x + textOffset, y + textOffset, *s++, fgcolor, bgcolor, false, _vm->getFontData());
 		x += CHAR_COLS;
 	}
 
diff --git a/engines/agi/graphics.h b/engines/agi/graphics.h
index 15668fbed3..506a9d93d6 100644
--- a/engines/agi/graphics.h
+++ b/engines/agi/graphics.h
@@ -56,7 +56,7 @@ public:
 
 	void gfxPutBlock(int x1, int y1, int x2, int y2);
 
-	void putTextCharacter(int, int, int, unsigned char, int, int, bool checkerboard = false, const uint8 *font = curFont);
+	void putTextCharacter(int, int, int, unsigned char, int, int, bool checkerboard = false, const uint8 *font = fontData_Sierra);
 	void shakeScreen(int);
 	void shakeStart();
 	void shakeEnd();
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index daadb5ffef..c368c7b195 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -59,6 +59,12 @@ void PreAgiEngine::initialize() {
 	_gfx = new GfxMgr(this);
 	_picture = new PictureMgr(this, _gfx);
 
+	if (getGameID() == GID_MICKEY) {
+		_fontData = fontData_Mickey;
+	} else {
+		_fontData = fontData_IBM;
+	}
+
 	_gfx->initMachine();
 
 	_game.gameFlags = 0;
@@ -137,7 +143,7 @@ void PreAgiEngine::drawStr(int row, int col, int attr, const char *buffer) {
 			break;
 
 		default:
-			_gfx->putTextCharacter(1, col * 8 , row * 8, static_cast<char>(code), attr & 0x0f, (attr & 0xf0) / 0x10, false, getGameID() == GID_MICKEY ? mickey_fontdata : ibm_fontdata);
+			_gfx->putTextCharacter(1, col * 8 , row * 8, static_cast<char>(code), attr & 0x0f, (attr & 0xf0) / 0x10, false, _fontData);
 
 			if (++col == 320 / 8) {
 				col = 0;
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index eb48857bf2..16c8284ce0 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -50,7 +50,7 @@ void AgiEngine::printText2(int l, const char *msg, int foff, int xoff, int yoff,
 
 	// FR: strings with len == 1 were not printed
 	if (len == 1) {
-		_gfx->putTextCharacter(l, xoff + foff, yoff, *msg, fg, bg, checkerboard);
+		_gfx->putTextCharacter(l, xoff + foff, yoff, *msg, fg, bg, checkerboard, _fontData);
 		maxx = 1;
 		minx = 0;
 		ofoff = foff;
@@ -74,7 +74,7 @@ void AgiEngine::printText2(int l, const char *msg, int foff, int xoff, int yoff,
 					if (xpos >= GFX_WIDTH)
 						continue;
 
-					_gfx->putTextCharacter(l, xpos, ypos, *m, fg, bg, checkerboard);
+					_gfx->putTextCharacter(l, xpos, ypos, *m, fg, bg, checkerboard, _fontData);
 
 					if (x1 > maxx)
 						maxx = x1;
-- 
cgit v1.2.3


From 1df183ffcb08a69ed414afd69284a0596fee4e82 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 07:37:55 -0400
Subject: SHERLOCK: Move method comments from cpp to headers

---
 engines/sherlock/animation.cpp       |  18 ----
 engines/sherlock/animation.h         |  21 ++++-
 engines/sherlock/debugger.cpp        |   6 --
 engines/sherlock/debugger.h          |   6 ++
 engines/sherlock/detection.cpp       |  53 +++++------
 engines/sherlock/events.cpp          |  62 -------------
 engines/sherlock/events.h            |  63 ++++++++++++++
 engines/sherlock/inventory.cpp       |  52 -----------
 engines/sherlock/inventory.h         |  53 +++++++++++
 engines/sherlock/journal.cpp         |  40 ---------
 engines/sherlock/journal.h           |  40 +++++++++
 engines/sherlock/map.cpp             |  54 ------------
 engines/sherlock/map.h               |  59 +++++++++++++
 engines/sherlock/objects.cpp         |  65 --------------
 engines/sherlock/objects.h           |  83 ++++++++++++++++++
 engines/sherlock/people.cpp          |  38 --------
 engines/sherlock/people.h            |  42 +++++++++
 engines/sherlock/resources.cpp       | 164 +++++++++++------------------------
 engines/sherlock/resources.h         |  66 ++++++++++++++
 engines/sherlock/saveload.cpp        |  40 ---------
 engines/sherlock/saveload.h          |  44 ++++++++++
 engines/sherlock/scalpel/darts.cpp   |  52 -----------
 engines/sherlock/scalpel/darts.h     |  58 +++++++++++++
 engines/sherlock/scalpel/scalpel.cpp |  42 +--------
 engines/sherlock/scalpel/scalpel.h   |  47 ++++++++++
 engines/sherlock/scene.cpp           |  99 ---------------------
 engines/sherlock/scene.h             | 101 ++++++++++++++++++++-
 engines/sherlock/screen.cpp          |  96 --------------------
 engines/sherlock/screen.h            | 100 +++++++++++++++++++++
 engines/sherlock/settings.cpp        |  13 ---
 engines/sherlock/settings.h          |  12 +++
 engines/sherlock/sherlock.cpp        |  45 ----------
 engines/sherlock/sherlock.h          |  69 ++++++++++++++-
 engines/sherlock/sound.cpp           |   3 -
 engines/sherlock/sound.h             |  42 +++++++++
 engines/sherlock/surface.cpp         |  31 -------
 engines/sherlock/surface.h           |  37 ++++++++
 engines/sherlock/talk.cpp            |  75 ----------------
 engines/sherlock/talk.h              |  85 ++++++++++++++++++
 engines/sherlock/user_interface.cpp  |  94 --------------------
 engines/sherlock/user_interface.h    | 106 ++++++++++++++++++++++
 41 files changed, 1205 insertions(+), 1071 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 8b891125cc..21d63633d3 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -31,9 +31,6 @@ static const int NO_FRAMES = FRAMES_END;
 Animation::Animation(SherlockEngine *vm) : _vm(vm) {
 }
 
-/**
- * Play a full-screen animation
- */
 bool Animation::play(const Common::String &filename, int minDelay, int fade,
 		bool setPalette, int speed) {
 	Events &events = *_vm->_events;
@@ -136,18 +133,12 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 	return !skipped && !_vm->shouldQuit();
 }
 
-/**
- * Load the prologue name array 
- */
 void Animation::setPrologueNames(const char *const *names, int count) {
 	for (int idx = 0; idx < count; ++idx, ++names) {
 		_prologueNames.push_back(*names);
 	}
 }
 
-/**
- * Load the prologue frame array
- */
 void Animation::setPrologueFrames(const int *frames, int count, int maxFrames) {
 	_prologueFrames.resize(count);
 
@@ -157,18 +148,12 @@ void Animation::setPrologueFrames(const int *frames, int count, int maxFrames) {
 	}
 }
 
-/**
- * Load the title name array
- */
 void Animation::setTitleNames(const char *const *names, int count) {
 	for (int idx = 0; idx < count; ++idx, ++names) {
 		_titleNames.push_back(*names);
 	}
 }
 
-/**
- * Load the title frame array
- */
 void Animation::setTitleFrames(const int *frames, int count, int maxFrames) {
 	_titleFrames.resize(count);
 
@@ -178,9 +163,6 @@ void Animation::setTitleFrames(const int *frames, int count, int maxFrames) {
 	}
 }
 
-/**
- * Checks for whether an animation is being played that has associated sound
- */
 const int *Animation::checkForSoundFrames(const Common::String &filename) {
 	const int *frames = &NO_FRAMES;
 
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index 2c47686efd..b7811d3fa8 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -39,10 +39,12 @@ private:
 
 	Common::Array<const char *> _prologueNames;
 	Common::Array<Common::Array<int> > _prologueFrames;
-
 	Common::Array<const char *> _titleNames;
 	Common::Array<Common::Array<int> > _titleFrames;
 
+	/**
+	 * Checks for whether an animation is being played that has associated sound
+	 */
 	const int *checkForSoundFrames(const Common::String &filename);
 public:
 	Common::String _soundLibraryFilename;
@@ -50,12 +52,29 @@ public:
 public:
 	Animation(SherlockEngine *vm);
 
+	/**
+	 * Load the prologue name array
+	 */
 	void setPrologueNames(const char *const *names, int count);
+	
+	/**
+	 * Load the prologue frame array
+	 */
 	void setPrologueFrames(const int *frames, int count, int maxFrames);
 
+	/**
+	 * Load the title name array
+	 */
 	void setTitleNames(const char *const *names, int count);
+	
+	/**
+	 * Load the title frame array
+	 */
 	void setTitleFrames(const int *frames, int count, int maxFrames);
 
+	/**
+	 * Play a full-screen animation
+	 */
 	bool play(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
 };
 
diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp
index ecd3f2ee08..cfbea2bc24 100644
--- a/engines/sherlock/debugger.cpp
+++ b/engines/sherlock/debugger.cpp
@@ -30,9 +30,6 @@ Debugger::Debugger(SherlockEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("scene", WRAP_METHOD(Debugger, cmdScene));
 }
 
-/**
- * Converts a decimal or hexadecimal string into a number
- */
 int Debugger::strToInt(const char *s) {
 	if (!*s)
 		// No string at all
@@ -49,9 +46,6 @@ int Debugger::strToInt(const char *s) {
 	return (int)tmp;
 }
 
-/**
- * Switch to another scene
- */
 bool Debugger::cmdScene(int argc, const char **argv) {
 	if (argc != 2) {
 		debugPrintf("Format: scene <room>\n");
diff --git a/engines/sherlock/debugger.h b/engines/sherlock/debugger.h
index 6021bb7d0d..e6a3aba828 100644
--- a/engines/sherlock/debugger.h
+++ b/engines/sherlock/debugger.h
@@ -34,8 +34,14 @@ class Debugger : public GUI::Debugger {
 private:
 	SherlockEngine *_vm;
 
+	/**
+	 * Converts a decimal or hexadecimal string into a number
+	 */
 	int strToInt(const char *s);
 
+	/**
+	 * Switch to another scene
+	 */
 	bool cmdScene(int argc, const char **argv);
 public:
 	Debugger(SherlockEngine *vm);
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 096eb9f46e..da3ad4628f 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -36,16 +36,10 @@ struct SherlockGameDescription {
 	GameType gameID;
 };
 
-/**
- * Returns the Id of the game
- */
 GameType SherlockEngine::getGameID() const {
 	return _gameDescription->gameID;
 }
 
-/**
- * Returns the platform the game's datafiles are for
- */
 Common::Platform SherlockEngine::getPlatform() const {
 	return _gameDescription->desc.platform;
 }
@@ -135,17 +129,37 @@ public:
 		return "Sherlock Engine (C) 1992-1996 Mythos Software, 1992-1996 (C) Electronic Arts";
 	}
 
+	/**
+	 * Creates an instance of the game engine
+	 */
 	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+
+	/**
+	 * Returns a list of features the game's MetaEngine support
+	 */
 	virtual bool hasFeature(MetaEngineFeature f) const;
+
+	/**
+	 * Return a list of savegames
+	 */
 	virtual SaveStateList listSaves(const char *target) const;
+
+	/**
+	 * Returns the maximum number of allowed save slots
+	 */
 	virtual int getMaximumSaveSlot() const;
+
+	/**
+	 * Deletes a savegame in the specified slot
+	 */
 	virtual void removeSaveState(const char *target, int slot) const;
+
+	/**
+	 * Given a specified savegame slot, returns extended information for the save
+	 */
 	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
 };
 
-/**
- * Creates an instance of the game engine
- */
 bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Sherlock::SherlockGameDescription *gd = (const Sherlock::SherlockGameDescription *)desc;
 	if (gd) {
@@ -164,9 +178,6 @@ bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
 	return gd != 0;
 }
 
-/**
- * Returns a list of features the game's MetaEngine support
- */
 bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
 		(f == kSupportsListSaves) ||
@@ -176,9 +187,6 @@ bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesSupportThumbnail);
 }
 
-/**
- * Returns a list of features the game itself supports
- */
 bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsRTL) ||
@@ -186,38 +194,23 @@ bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsSavingDuringRuntime);
 }
 
-/**
- * Returns whether the version is a demo
- */
 bool Sherlock::SherlockEngine::isDemo() const {
 	return _gameDescription->desc.flags & ADGF_DEMO;
 }
 
-/**
- * Return a list of savegames
- */
 SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
 	return Sherlock::SaveManager::getSavegameList(target);
 }
 
-/**
- * Returns the maximum number of allowed save slots
- */
 int SherlockMetaEngine::getMaximumSaveSlot() const {
 	return MAX_SAVEGAME_SLOTS;
 }
 
-/**
- * Deletes a savegame in the specified slot
- */
 void SherlockMetaEngine::removeSaveState(const char *target, int slot) const {
 	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	g_system->getSavefileManager()->removeSavefile(filename);
 }
 
-/**
- * Given a specified savegame slot, returns extended information for the save
- */
 SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot);
 	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(filename);
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 9d9c764fe5..38093a6c72 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -48,9 +48,6 @@ Events::~Events() {
 	delete _cursorImages;
 }
 
-/**
- * Load a set of cursors from the specified file
- */
 void Events::loadCursors(const Common::String &filename) {
 	hideCursor();
 	delete _cursorImages;
@@ -59,9 +56,6 @@ void Events::loadCursors(const Common::String &filename) {
 	_cursorId = INVALID_CURSOR;
 }
 
-/**
- * Set the cursor to show
- */
 void Events::setCursor(CursorId cursorId) {
 	if (cursorId == _cursorId)
 		return;
@@ -74,53 +68,31 @@ void Events::setCursor(CursorId cursorId) {
 	setCursor(s);
 }
 
-/**
- * Set the cursor to show from a passed frame
- */
 void Events::setCursor(const Graphics::Surface &src) {
 	CursorMan.replaceCursor(src.getPixels(), src.w, src.h, 0, 0, 0xff);
 	showCursor();
 }
 
-/**
- * Show the mouse cursor
- */
 void Events::showCursor() {
 	CursorMan.showMouse(true);
 }
 
-/**
- * Hide the mouse cursor
- */
 void Events::hideCursor() {
 	CursorMan.showMouse(false);
 }
 
-/**
- * Returns the cursor
- */
 CursorId Events::getCursor() const {
 	return _cursorId;
 }
 
-/**
- * Returns true if the mouse cursor is visible
- */
 bool Events::isCursorVisible() const {
 	return CursorMan.isVisible();
 }
 
-/**
- * Move the mouse
- */
 void Events::moveMouse(const Common::Point &pt) {
 	g_system->warpMouse(pt.x, pt.y);
 }
 
-
-/**
- * Check for any pending events
- */
 void Events::pollEvents() {
 	checkForNextFrameCounter();
 
@@ -162,18 +134,11 @@ void Events::pollEvents() {
 	}
 }
 
-/**
- * Poll for events and introduce a small delay, to allow the system to
- * yield to other running programs
- */
 void Events::pollEventsAndWait() {
 	pollEvents();
 	g_system->delayMillis(10);
 }
 
-/**
- * Check whether it's time to display the next screen frame
- */
 bool Events::checkForNextFrameCounter() {
 	// Check for next game frame
 	uint32 milli = g_system->getMillis();
@@ -193,23 +158,14 @@ bool Events::checkForNextFrameCounter() {
 	return false;
 }
 
-/**
- * Get the current mouse position 
- */
 Common::Point Events::mousePos() const {
 	return g_system->getEventManager()->getMousePos();
 }
 
-/**
- * Get a pending keypress
- */
 Common::KeyState Events::getKey() {
 	return _pendingKeys.pop();
 }
 
-/**
- * Clear any current keypress or mouse click
- */
 void Events::clearEvents() {
 	_pendingKeys.clear();
 	_mouseButtons = 0;
@@ -218,24 +174,15 @@ void Events::clearEvents() {
 	_oldButtons = _oldRightButton = false;
 }
 
-/**
- * Clear any pending keyboard inputs
- */
 void Events::clearKeyboard() {
 	_pendingKeys.clear();
 }
 
-/**
- * Delay for a given number of game frames, where each frame is 1/60th of a second
- */
 void Events::wait(int numFrames) {
 	uint32 totalMilli = numFrames * 1000 / GAME_FRAME_RATE;
 	delay(totalMilli);
 }
 
-/**
- * Does a delay of the specified number of milliseconds
- */
 bool Events::delay(uint32 time, bool interruptable) {
 	// Different handling for really short versus extended times
 	if (time < 10) {
@@ -265,12 +212,6 @@ bool Events::delay(uint32 time, bool interruptable) {
 	}
 }
 
-/**
- * Sets the pressed and released button flags on the raw button state previously set in pollEvents calls.
- * @remarks		The events manager has separate variables for the raw immediate and old button state
- *		versus the current buttons states for the frame. This method is expected to be called only once
- *		per game frame
- */
 void Events::setButtonState() {
 	_released = _rightReleased = false;
 	if (_mouseButtons & 1)
@@ -290,9 +231,6 @@ void Events::setButtonState() {
 	}
 }
 
-/**
- * Checks to see to see if a key or a mouse button is pressed.
- */
 bool Events::checkInput() {
 	setButtonState();
 	return kbHit() || _pressed || _released || _rightPressed || _rightReleased;
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index c6d155e472..c19a92de8c 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -45,6 +45,9 @@ private:
 	ImageFile *_cursorImages;
 	int _mouseButtons;
 
+	/**
+	 * Check whether it's time to display the next screen frame
+	 */
 	bool checkForNextFrameCounter();
 public:
 	CursorId _cursorId;
@@ -59,42 +62,102 @@ public:
 	Events(SherlockEngine *vm);
 	~Events();
 
+	/**
+	 * Load a set of cursors from the specified file
+	 */
 	void loadCursors(const Common::String &filename);
 
+	/**
+	 * Set the cursor to show
+	 */
 	void setCursor(CursorId cursorId);
+
+	/**
+	 * Set the cursor to show from a passed frame
+	 */
 	void setCursor(const Graphics::Surface &src);
 
+	/**
+	 * Show the mouse cursor
+	 */
 	void showCursor();
 
+	/**
+	 * Hide the mouse cursor
+	 */
 	void hideCursor();
 
+	/**
+	 * Returns the cursor
+	 */
 	CursorId getCursor() const;
 
+	/**
+	 * Returns true if the mouse cursor is visible
+	 */
 	bool isCursorVisible() const;
 
+	/**
+	 * Move the mouse
+	 */
 	void moveMouse(const Common::Point &pt);
 
+	/**
+	 * Check for any pending events
+	 */
 	void pollEvents();
 
+	/**
+	 * Poll for events and introduce a small delay, to allow the system to
+	 * yield to other running programs
+	 */
 	void pollEventsAndWait();
 
+	/**
+	 * Get the current mouse position
+	 */
 	Common::Point mousePos() const;
 
 	uint32 getFrameCounter() const { return _frameCounter; }
 
 	bool kbHit() const { return !_pendingKeys.empty(); }
 
+	/**
+	 * Get a pending keypress
+	 */
 	Common::KeyState getKey();
 
+	/**
+	 * Clear any current keypress or mouse click
+	 */
 	void clearEvents();
+
+	/**
+	 * Clear any pending keyboard inputs
+	 */
 	void clearKeyboard();
 
+	/**
+	 * Delay for a given number of game frames, where each frame is 1/60th of a second
+	 */
 	void wait(int numFrames);
 
+	/**
+	 * Does a delay of the specified number of milliseconds
+	 */
 	bool delay(uint32 time, bool interruptable = false);
 
+	/**
+	 * Sets the pressed and released button flags on the raw button state previously set in pollEvents calls.
+	 * @remarks		The events manager has separate variables for the raw immediate and old button state
+	 *		versus the current buttons states for the frame. This method is expected to be called only once
+	 *		per game frame
+	 */
 	void setButtonState();
 
+	/**
+	 * Checks to see to see if a key or a mouse button is pressed.
+	 */
 	bool checkInput();
 };
 
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 2e7791e5f8..28065a1b72 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -31,9 +31,6 @@ InventoryItem::InventoryItem(int requiredFlag, const Common::String &name,
 		_examine(examine), _lookFlag(0) {
 }
 
-/**
- * Synchronize the data for an inventory item
- */
 void InventoryItem::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_requiredFlag);
 	s.syncAsSint16LE(_lookFlag);
@@ -56,9 +53,6 @@ Inventory::~Inventory() {
 	freeGraphics();
 }
 
-/**
- * Free inventory data
- */
 void Inventory::freeInv() {
 	freeGraphics();
 
@@ -66,9 +60,6 @@ void Inventory::freeInv() {
 	_invGraphicsLoaded = false;
 }
 
-/**
- * Free any loaded inventory graphics
- */
 void Inventory::freeGraphics() {
 	for (uint idx = 0; idx < MAX_VISIBLE_INVENTORY; ++idx)
 		delete _invShapes[idx];
@@ -77,10 +68,6 @@ void Inventory::freeGraphics() {
 	_invGraphicsLoaded = false;
 }
 
-/**
- * Load the list of names the inventory items correspond to, if not already loaded, 
- * and then calls loadGraphics to load the associated graphics
- */
 void Inventory::loadInv() {
 	// Exit if the inventory names are already loaded
 	if (_names.size() > 0)
@@ -104,9 +91,6 @@ void Inventory::loadInv() {
 	loadGraphics();
 }
 
-/**
- * Load the list of names of graphics for the inventory
- */
 void Inventory::loadGraphics() {
 	if (_invGraphicsLoaded)
 		return;
@@ -126,10 +110,6 @@ void Inventory::loadGraphics() {
 	_invGraphicsLoaded = true;
 }
 
-/**
- * Searches through the list of names that correspond to the inventory items
- * and returns the number that matches the passed name
- */
 int Inventory::findInv(const Common::String &name) {
 	for (int idx = 0; idx < (int)_names.size(); ++idx) {
 		if (name.equalsIgnoreCase(_names[idx]))
@@ -140,9 +120,6 @@ int Inventory::findInv(const Common::String &name) {
 	error("Couldn't find inventory item - %s", name.c_str());
 }
 
-/**
- * Display the character's inventory. The slamIt parameter specifies:
- */
 void Inventory::putInv(InvSlamMode slamIt) {
 	Screen &screen = *_vm->_screen;
 	UserInterface &ui = *_vm->_ui;
@@ -198,9 +175,6 @@ void Inventory::putInv(InvSlamMode slamIt) {
 	}
 }
 
-/**
- * Put the game into inventory mode and open the interface window.
- */
 void Inventory::drawInventory(InvNewMode mode) {
 	Screen &screen = *_vm->_screen;
 	UserInterface &ui = *_vm->_ui;
@@ -270,10 +244,6 @@ void Inventory::drawInventory(InvNewMode mode) {
 	ui._oldUse = -1;
 }
 
-/**
- * Prints the line of inventory commands at the top of an inventory window with
- * the correct highlighting
- */
 void Inventory::invCommands(bool slamIt) {
 	Screen &screen = *_vm->_screen;
 	UserInterface &ui = *_vm->_ui;
@@ -333,9 +303,6 @@ void Inventory::invCommands(bool slamIt) {
 	}
 }
 
-/**
- * Set the highlighting color of a given inventory item
- */
 void Inventory::highlight(int index, byte color) {
 	Screen &screen = *_vm->_screen;
 	Surface &bb = *screen._backBuffer;
@@ -348,9 +315,6 @@ void Inventory::highlight(int index, byte color) {
 	screen.slamArea(8 + slot * 52, 165, 44, 30);
 }
 
-/**
- * Support method for refreshing the display of the inventory
- */
 void Inventory::refreshInv() {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
@@ -373,9 +337,6 @@ void Inventory::refreshInv() {
 	}
 }
 
-/**
- * Adds a shape from the scene to the player's inventory
- */
 int Inventory::putNameInInventory(const Common::String &name) {
 	Scene &scene = *_vm->_scene;
 	int matches = 0;
@@ -391,10 +352,6 @@ int Inventory::putNameInInventory(const Common::String &name) {
 	return matches;
 }
 
-/**
- * Moves a specified item into the player's inventory If the item has a *PICKUP* use action,
- * then the item in the use action are added to the inventory.
- */
 int Inventory::putItemInInventory(Object &obj) {
 	Scene &scene = *_vm->_scene;
 	int matches = 0;
@@ -456,9 +413,6 @@ int Inventory::putItemInInventory(Object &obj) {
 	return matches;
 }
 
-/**
- * Copy the passed object into the inventory
- */
 void Inventory::copyToInventory(Object &obj) {
 	InventoryItem invItem;
 	invItem._name = obj._name;
@@ -471,9 +425,6 @@ void Inventory::copyToInventory(Object &obj) {
 	++_holdings;
 }
 
-/**
- * Deletes a specified item from the player's inventory
- */
 int Inventory::deleteItemFromInventory(const Common::String &name) {
 	int invNum = -1;
 
@@ -493,9 +444,6 @@ int Inventory::deleteItemFromInventory(const Common::String &name) {
 	return 1;
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void Inventory::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_holdings);
 
diff --git a/engines/sherlock/inventory.h b/engines/sherlock/inventory.h
index dd4c16b6c9..02f570f5da 100644
--- a/engines/sherlock/inventory.h
+++ b/engines/sherlock/inventory.h
@@ -66,6 +66,9 @@ struct InventoryItem {
 	InventoryItem(int requiredFlag, const Common::String &name,
 		const Common::String &description, const Common::String &examine);
 
+	/**
+	 * Synchronize the data for an inventory item
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
@@ -74,6 +77,9 @@ private:
 	SherlockEngine *_vm;
 	Common::StringArray _names;
 
+	/**
+	 * Copy the passed object into the inventory
+	 */
 	void copyToInventory(Object &obj);
 public:
 	ImageFile *_invShapes[MAX_VISIBLE_INVENTORY];
@@ -82,34 +88,81 @@ public:
 	int _invIndex;
 	int _holdings;		// Used to hold number of visible items in active inventory.
 						// Since Inventory array also contains some special hidden items
+	/**
+	 * Free any loaded inventory graphics
+	 */
 	void freeGraphics();
 public:
 	Inventory(SherlockEngine *vm);
 	~Inventory();
 
+	/**
+	 * Free inventory data
+	 */
 	void freeInv();
 
+	/**
+	 * Load the list of names the inventory items correspond to, if not already loaded,
+	 * and then calls loadGraphics to load the associated graphics
+	 */
 	void loadInv();
 
+	/**
+	 * Load the list of names of graphics for the inventory
+	 */
 	void loadGraphics();
 
+	/**
+	 * Searches through the list of names that correspond to the inventory items
+	 * and returns the number that matches the passed name
+	 */
 	int findInv(const Common::String &name);
 
+	/**
+	 * Display the character's inventory. The slamIt parameter specifies:
+	 */
 	void putInv(InvSlamMode slamIt);
 
+	/**
+	 * Put the game into inventory mode and open the interface window.
+	 */
 	void drawInventory(InvNewMode flag);
 
+	/**
+	 * Prints the line of inventory commands at the top of an inventory window with
+	 * the correct highlighting
+	 */
 	void invCommands(bool slamIt);
 
+	/**
+	 * Set the highlighting color of a given inventory item
+	 */
 	void highlight(int index, byte color);
 
+	/**
+	 * Support method for refreshing the display of the inventory
+	 */
 	void refreshInv();
 
+	/**
+	 * Adds a shape from the scene to the player's inventory
+	 */
 	int putNameInInventory(const Common::String &name);
+
+	/**
+	 * Moves a specified item into the player's inventory If the item has a *PICKUP* use action,
+	 * then the item in the use action are added to the inventory.
+	 */
 	int putItemInInventory(Object &obj);
 
+	/**
+	 * Deletes a specified item from the player's inventory
+	 */
 	int deleteItemFromInventory(const Common::String &name);
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 34a58b5871..0a0144996d 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -67,10 +67,6 @@ Journal::Journal(SherlockEngine *vm) : _vm(vm) {
 	}
 }
 
-/**
- * Records statements that are said, in the order which they are said. The player
- * can then read the journal to review them
- */
 void Journal::record(int converseNum, int statementNum, bool replyOnly) {
 	int saveIndex = _index;
 	int saveSub = _sub;
@@ -96,9 +92,6 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) {
 	}
 }
 
-/**
- * Load the list of location names that the journal will make reference to
- */
 void Journal::loadJournalLocations() {
 	Resources &res = *_vm->_res;
 
@@ -137,12 +130,6 @@ void Journal::loadJournalLocations() {
 	delete loc;
 }
 
-/**
- * Loads the description for the current display index in the journal, and then
- * word wraps the result to prepare it for being displayed
- * @param alreadyLoaded		Indicates whether the journal file is being loaded for the
- *		first time, or being reloaded
- */
 void Journal::loadJournalFile(bool alreadyLoaded) {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
@@ -459,9 +446,6 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 	}
 }
 
-/**
- * Draw the journal background, frame, and interface buttons
- */
 void Journal::drawJournalFrame() {
 	Resources &res = *_vm->_res;
 	Screen &screen = *_vm->_screen;
@@ -516,9 +500,6 @@ void Journal::drawJournalFrame() {
 		COMMAND_NULL, false, "Print Text");
 }
 
-/**
- * Display the journal
- */
 void Journal::drawInterface() {
 	Screen &screen = *_vm->_screen;
 
@@ -536,9 +517,6 @@ void Journal::drawInterface() {
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
-/**
- * Display the arrows that can be used to scroll up and down pages
- */
 void Journal::doArrows() {
 	Screen &screen = *_vm->_screen;
 	byte color;
@@ -560,9 +538,6 @@ void Journal::doArrows() {
 	screen.buttonPrint(Common::Point(JOURNAL_POINTS[6][2], JOURNAL_BUTTONS_Y + 11), color, false, "First Page");
 }
 
-/**
- * Displays a page of the journal at the current index
- */
 bool Journal::drawJournal(int direction, int howFar) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -808,9 +783,6 @@ bool Journal::drawJournal(int direction, int howFar) {
 	return direction >= 3 && searchSuccessful;
 }
 
-/**
- * Returns the button, if any, that is under the specified position
- */
 JournalButton Journal::getHighlightedButton(const Common::Point &pt) {
 	if (pt.x > JOURNAL_POINTS[0][0] && pt.x < JOURNAL_POINTS[0][1] && pt.y >= JOURNAL_BUTTONS_Y &&
 			pt.y < (JOURNAL_BUTTONS_Y + 10))
@@ -851,9 +823,6 @@ JournalButton Journal::getHighlightedButton(const Common::Point &pt) {
 	return BTN_NONE;
 }
 
-/**
- * Handle events whilst the journal is being displayed
- */
 bool Journal::handleEvents(int key) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -1024,9 +993,6 @@ bool Journal::handleEvents(int key) {
 	return doneFlag;
 }
 
-/**
- * Show the search submenu and allow the player to enter a search string
- */
 int Journal::getSearchString(bool printError) {
 	enum Button { BTN_NONE, BTN_EXIT, BTN_BACKWARD, BTN_FORWARD };
 
@@ -1193,17 +1159,11 @@ int Journal::getSearchString(bool printError) {
 	return done;
 }
 
-/**
- * Reset viewing position to the start of the journal
- */
 void Journal::resetPosition() {
 	_index = _sub = _up = _down = 0;
 	_page = 1;
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void Journal::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_index);
 	s.syncAsSint16LE(_sub);
diff --git a/engines/sherlock/journal.h b/engines/sherlock/journal.h
index 54bc9457cf..d62b8338c0 100644
--- a/engines/sherlock/journal.h
+++ b/engines/sherlock/journal.h
@@ -67,30 +67,70 @@ private:
 	int _page;
 	Common::String _find;
 
+	/**
+	 * Load the list of location names that the journal will make reference to
+	 */
 	void loadJournalLocations();
 
+	/**
+	 * Loads the description for the current display index in the journal, and then
+	 * word wraps the result to prepare it for being displayed
+	 * @param alreadyLoaded		Indicates whether the journal file is being loaded for the
+	 *		first time, or being reloaded
+	 */
 	void loadJournalFile(bool alreadyLoaded);
 
+	/**
+	 * Display the arrows that can be used to scroll up and down pages
+	 */
 	void doArrows();
 
+	/**
+	 * Displays a page of the journal at the current index
+	 */
 	bool drawJournal(int direction, int howFar);
 
+	/**
+	 * Show the search submenu and allow the player to enter a search string
+	 */
 	int getSearchString(bool printError);
 
+	/**
+	 * Draw the journal background, frame, and interface buttons
+	 */
 	void drawJournalFrame();
 
+	/**
+	 * Returns the button, if any, that is under the specified position
+	 */
 	JournalButton getHighlightedButton(const Common::Point &pt);
 public:
 	Journal(SherlockEngine *vm);
 
+	/**
+	 * Records statements that are said, in the order which they are said. The player
+	 * can then read the journal to review them
+	 */
 	void record(int converseNum, int statementNum, bool replyOnly = false);
 
+	/**
+	 * Display the journal
+	 */
 	void drawInterface();
 
+	/**
+	 * Handle events whilst the journal is being displayed
+	 */
 	bool handleEvents(int key);
 
+	/**
+	 * Reset viewing position to the start of the journal
+	 */
 	void resetPosition();
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 9b901e59f6..737abb4895 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -25,9 +25,6 @@
 
 namespace Sherlock {
 
-/**
- * Load the data for the paths between locations on the map
- */
 void MapPaths::load(int numLocations, Common::SeekableReadStream &s) {
 	_numLocations = numLocations;
 	_paths.resize(_numLocations * _numLocations);
@@ -43,9 +40,6 @@ void MapPaths::load(int numLocations, Common::SeekableReadStream &s) {
 	}
 }
 
-/**
- * Get the path between two locations on the map
- */
 const byte *MapPaths::getPath(int srcLocation, int destLocation) {
 	return &_paths[srcLocation * _numLocations + destLocation][0];
 }
@@ -73,26 +67,17 @@ Map::Map(SherlockEngine *vm) : _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) {
 		loadData();
 }
 
-/**
- * Loads the list of points for locations on the map for each scene
- */
 void Map::loadPoints(int count, const int *xList, const int *yList, const int *transList) {
 	for (int idx = 0; idx < count; ++idx, ++xList, ++yList, ++transList) {
 		_points.push_back(MapEntry(*xList, *yList, *transList));
 	}
 }
 
-/**
- * Load the sequence data for player icon animations
- */
 void Map::loadSequences(int count, const byte *seq) {
 	for (int idx = 0; idx < count; ++idx, seq += MAX_FRAME)
 		Common::copy(seq, seq + MAX_FRAME, &_sequences[idx][0]);
 }
 
-/**
- * Load data  needed for the map
- */
 void Map::loadData() {
 	// Load the list of location names
 	Common::SeekableReadStream *txtStream = _vm->_res->load("chess.txt");
@@ -125,9 +110,6 @@ void Map::loadData() {
 	delete pathStream;
 }
 
-/**
- * Show the map
- */
 int Map::show() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -279,9 +261,6 @@ int Map::show() {
 	return _charPoint;
 }
 
-/**
- * Load and initialize all the sprites that are needed for the map display
- */
 void Map::setupSprites() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -318,9 +297,6 @@ void Map::setupSprites() {
 	scene._bgShapes.clear();
 }
 
-/**
- * Free the sprites and data used by the map
- */
 void Map::freeSprites() {
 	delete _mapCursors;
 	delete _shapes;
@@ -328,9 +304,6 @@ void Map::freeSprites() {
 	_iconSave.free();
 }
 
-/**
- * Draws an icon for every place that's currently known
- */
 void Map::showPlaces() {
 	Screen &screen = *_vm->_screen;
 
@@ -349,25 +322,16 @@ void Map::showPlaces() {
 	}
 }
 
-/**
- * Makes a copy of the top rows of the screen that are used to display location names
- */
 void Map::saveTopLine() {
 	_topLine.blitFrom(_vm->_screen->_backBuffer1, Common::Point(0, 0), Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, 12));
 }
 
-/**
- * Erases anything shown in the top line by restoring the previously saved original map background
- */
 void Map::eraseTopLine() {
 	Screen &screen = *_vm->_screen;
 	screen._backBuffer1.blitFrom(_topLine, Common::Point(0, 0));
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, _topLine.h);
 }
 
-/**
- * Prints the name of the specified icon
- */
 void Map::showPlaceName(int idx, bool highlighted) {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
@@ -393,9 +357,6 @@ void Map::showPlaceName(int idx, bool highlighted) {
 	}
 }
 
-/**
- * Update all on-screen sprites to account for any scrolling of the map
- */
 void Map::updateMap(bool flushScreen) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -442,9 +403,6 @@ void Map::updateMap(bool flushScreen) {
 	}
 }
 
-/**
- * Handle moving icon for player from their previous location on the map to a destination location
- */
 void Map::walkTheStreets() {
 	People &people = *_vm->_people;
 	Common::Array<Common::Point> tempPath;
@@ -503,9 +461,6 @@ void Map::walkTheStreets() {
 	people._walkTo.push(destPos);
 }
 
-/**
- * Save the area under the player's icon
- */
 void Map::saveIcon(ImageFrame *src, const Common::Point &pt) {
 	Screen &screen = *_vm->_screen;
 	Common::Point size(src->_width, src->_height);
@@ -540,9 +495,6 @@ void Map::saveIcon(ImageFrame *src, const Common::Point &pt) {
 	_savedSize = size;
 }
 
-/**
- * Restore the area under the player's icon
- */
 void Map::restoreIcon() {
 	Screen &screen = *_vm->_screen;
 
@@ -551,9 +503,6 @@ void Map::restoreIcon() {
 		screen._backBuffer1.blitFrom(_iconSave, _savedPos, Common::Rect(0, 0, _savedSize.x, _savedSize.y));
 }
 
-/**
- * Handles highlighting map icons, showing their names
- */
 void Map::highlightIcon(const Common::Point &pt) {
 	int oldPoint = _point;
 
@@ -592,9 +541,6 @@ void Map::highlightIcon(const Common::Point &pt) {
 	}
 }
 
-/**
-* Synchronize the data for a savegame
-*/
 void Map::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_bigPos.x);
 	s.syncAsSint16LE(_bigPos.y);
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 4a418138b2..2c8c02325b 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -49,8 +49,14 @@ private:
 	int _numLocations;
 	Common::Array< Common::Array<byte> > _paths;
 public:
+	/**
+	 * Load the data for the paths between locations on the map
+	 */
 	void load(int numLocations, Common::SeekableReadStream &s);
 
+	/**
+	 * Get the path between two locations on the map
+	 */
 	const byte *getPath(int srcLocation, int destLocation);
 };
 
@@ -75,24 +81,64 @@ private:
 	bool _drawMap;
 	Surface _iconSave;
 private:
+	/**
+	 * Load data  needed for the map
+	 */
 	void loadData();
 
+	/**
+	 * Load and initialize all the sprites that are needed for the map display
+	 */
 	void setupSprites();
+
+	/**
+	 * Free the sprites and data used by the map
+	 */
 	void freeSprites();
 
+	/**
+	 * Draws an icon for every place that's currently known
+	 */
 	void showPlaces();
 
+	/**
+	 * Makes a copy of the top rows of the screen that are used to display location names
+	 */
 	void saveTopLine();
+
+	/**
+	 * Erases anything shown in the top line by restoring the previously saved original map background
+	 */
 	void eraseTopLine();
+
+	/**
+	 * Prints the name of the specified icon
+	 */
 	void showPlaceName(int idx, bool highlighted);
 
+	/**
+	 * Update all on-screen sprites to account for any scrolling of the map
+	 */
 	void updateMap(bool flushScreen);
 
+	/**
+	 * Handle moving icon for player from their previous location on the map to a destination location
+	 */
 	void walkTheStreets();
 
+	/**
+	 * Save the area under the player's icon
+	 */
 	void saveIcon(ImageFrame *src, const Common::Point &pt);
+
+	/**
+	 * Restore the area under the player's icon
+	 */
 	void restoreIcon();
 
+	/**
+	 * Handles highlighting map icons, showing their names
+	 */
 	void highlightIcon(const Common::Point &pt);
 public:
 	bool _active;
@@ -105,11 +151,24 @@ public:
 
 	const MapEntry &operator[](int idx) { return _points[idx]; }
 
+	/**
+	 * Loads the list of points for locations on the map for each scene
+	 */
 	void loadPoints(int count, const int *xList, const int *yList, const int *transList);
+
+	/**
+	 * Load the sequence data for player icon animations
+	 */
 	void loadSequences(int count, const byte *seq);
 
+	/**
+	 * Show the map
+	 */
 	int show();
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index eb4676dd5f..e630b48f3a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -41,9 +41,6 @@ namespace Sherlock {
 
 SherlockEngine *Sprite::_vm;
 
-/**
- * Reset the data for the sprite
- */
 void Sprite::clear() {
 	_name = "";
 	_description = "";
@@ -68,18 +65,12 @@ void Sprite::clear() {
 	_numFrames = 0;
 }
 
-/**
- * Updates the image frame poiner for the sprite
- */
 void Sprite::setImageFrame() {
 	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber] +
 		(*_sequences)[_sequenceNumber][0] - 2;
 	_imageFrame = &(*_images)[imageNumber];
 }
 
-/**
- * This adjusts the sprites position, as well as it's animation sequence:
- */
 void Sprite::adjustSprite() {
 	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
@@ -175,9 +166,6 @@ void Sprite::adjustSprite() {
 	}
 }
 
-/**
- * Checks the sprite's position to see if it's collided with any special objects
- */
 void Sprite::checkSprite() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -364,9 +352,6 @@ void Sprite::checkSprite() {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for the action
- */
 void ActionType::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 
@@ -388,9 +373,6 @@ UseType::UseType() {
 	_useFlag = 0;
 }
 
-/**
- * Load the data for the UseType
- */
 void UseType::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 
@@ -454,9 +436,6 @@ Object::Object() {
 	_seqSize = 0;
 }
 
-/**
- * Load the data for the object
- */
 void Object::load(Common::SeekableReadStream &s) {
 	char buffer[41];
 	s.read(buffer, 12);
@@ -522,9 +501,6 @@ void Object::load(Common::SeekableReadStream &s) {
 		_use[idx].load(s);
 }
 
-/**
- * Toggle the type of an object between hidden and active
- */
 void Object::toggleHidden() {
 	if (_type != HIDDEN && _type != HIDE_SHAPE && _type != INVALID) {
 		if (_seqTo != 0)
@@ -560,9 +536,6 @@ void Object::toggleHidden() {
 	}
 }
 
-/**
- * Check the state of the object
- */
 void Object::checkObject() {
 	Scene &scene = *_vm->_scene;
 	Sound &sound = *_vm->_sound;
@@ -686,11 +659,6 @@ void Object::checkObject() {
 	} while (codeFound);
 }
 
-/**
- * This will check to see if the object has reached the end of a sequence.
- * If it has, it switch to whichever next sequence should be started.
- * @returns		true if the end of a sequence was reached
- */
 bool Object::checkEndOfSequence() {
 	Screen &screen = *_vm->_screen;
 	int checkFrame = _allow ? MAX_FRAME : FRAMES_END;
@@ -743,10 +711,6 @@ bool Object::checkEndOfSequence() {
 	return result;
 }
 
-/**
- * Scans through the sequences array and finds the designated sequence.
- * It then sets the frame number of the start of that sequence
- */
 void Object::setObjSequence(int seq, bool wait) {
 	Scene &scene = *_vm->_scene;
 	int checkFrame = _allow ? MAX_FRAME : FRAMES_END;
@@ -820,12 +784,6 @@ void Object::setObjSequence(int seq, bool wait) {
 	}
 }
 
-/**
- * Checks for codes
- * @param name		The name to check for codes
- * @param messages	Provides a lookup list of messages that can be printed
- * @returns		0 if no codes are found, 1 if codes were found
- */
 int Object::checkNameForCodes(const Common::String &name, const char *const messages[]) {
 	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
@@ -921,9 +879,6 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 	return printed;
 }
 
-/**
- * Handle setting any flags associated with the object
- */
 void Object::setFlagsAndToggles() {
 	Scene &scene = *_vm->_scene;
 	Talk &talk = *_vm->_talk;
@@ -949,10 +904,6 @@ void Object::setFlagsAndToggles() {
 	}
 }
 
-/**
- * Adjusts the sprite's position and animation sequence, advancing by 1 frame.
- * If the end of the sequence is reached, the appropriate action is taken.
- */
 void Object::adjustObject() {
 	if (_type == REMOVE)
 		return;
@@ -975,10 +926,6 @@ void Object::adjustObject() {
 	}
 }
 
-/**
- * Handles trying to pick up an object. If allowed, plays an y necessary animation for picking
- * up the item, and then adds it to the player's inventory
- */
 int Object::pickUpObject(const char *const messages[]) {
 	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
@@ -1065,9 +1012,6 @@ int Object::pickUpObject(const char *const messages[]) {
 	return numObjects;
 }
 
-/**
- * Returns the current bounds for the sprite
- */
 const Common::Rect Object::getNewBounds() const {
 	Common::Point pt = _position;
 	if (_imageFrame)
@@ -1076,17 +1020,11 @@ const Common::Rect Object::getNewBounds() const {
 	return Common::Rect(pt.x, pt.y, pt.x + frameWidth(), pt.y + frameHeight());
 }
 
-/**
- * Returns the bounds for a sprite without a shape
- */
 const Common::Rect Object::getNoShapeBounds() const {
 	return Common::Rect(_position.x, _position.y,
 		_position.x + _noShapeSize.x, _position.y + _noShapeSize.y);
 }
 
-/**
- * Returns the old bounsd for the sprite from the previous frame
- */
 const Common::Rect Object::getOldBounds() const {
 	return Common::Rect(_oldPosition.x, _oldPosition.y,
 		_oldPosition.x + _oldSize.x, _oldPosition.y + _oldSize.y);
@@ -1094,9 +1032,6 @@ const Common::Rect Object::getOldBounds() const {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for the animation
- */
 void CAnim::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 	s.read(buffer, 12);
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index e3e07d89b7..53752a7351 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -129,15 +129,34 @@ public:
 	Sprite() { clear(); }
 	static void setVm(SherlockEngine *vm) { _vm = vm; }
 
+	/**
+	 * Reset the data for the sprite
+	 */
 	void clear();
 
+	/**
+	 * Updates the image frame poiner for the sprite
+	 */
 	void setImageFrame();
 
+	/**
+	 * This adjusts the sprites position, as well as it's animation sequence:
+	 */
 	void adjustSprite();
 
+	/**
+	 * Checks the sprite's position to see if it's collided with any special objects
+	 */
 	void checkSprite();
 
+	/**
+	 * Return frame width
+	 */
 	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
+	
+	/**
+	 * Return frame height
+	 */
 	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
 };
 
@@ -149,6 +168,9 @@ struct ActionType {
 	int _cAnimSpeed;
 	Common::String _names[NAMES_COUNT];
 
+	/**
+	 * Load the data for the action
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
@@ -160,6 +182,10 @@ struct UseType {
 	Common::String _target;
 
 	UseType();
+
+	/**
+	 * Load the data for the UseType
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
@@ -170,8 +196,17 @@ class Object {
 private:
 	static SherlockEngine *_vm;
 
+	/**
+	 * This will check to see if the object has reached the end of a sequence.
+	 * If it has, it switch to whichever next sequence should be started.
+	 * @returns		true if the end of a sequence was reached
+	 */
 	bool checkEndOfSequence();
 
+	/**
+	 * Scans through the sequences array and finds the designated sequence.
+	 * It then sets the frame number of the start of that sequence
+	 */
 	void setObjSequence(int seq, bool wait);
 public:
 	static bool _countCAnimFrames;
@@ -224,24 +259,69 @@ public:
 
 	Object();
 
+	/**
+	 * Load the data for the object
+	 */
 	void load(Common::SeekableReadStream &s);
 
+	/**
+	 * Toggle the type of an object between hidden and active
+	 */
 	void toggleHidden();
 
+	/**
+	 * Check the state of the object
+	 */
 	void checkObject();
 
+	/**
+	 * Checks for codes
+	 * @param name		The name to check for codes
+	 * @param messages	Provides a lookup list of messages that can be printed
+	 * @returns		0 if no codes are found, 1 if codes were found
+	 */
 	int checkNameForCodes(const Common::String &name, const char *const messages[]);
 
+	/**
+	 * Handle setting any flags associated with the object
+	 */
 	void setFlagsAndToggles();
 
+	/**
+	 * Adjusts the sprite's position and animation sequence, advancing by 1 frame.
+	 * If the end of the sequence is reached, the appropriate action is taken.
+	 */
 	void adjustObject();
 
+	/**
+	 * Handles trying to pick up an object. If allowed, plays an y necessary animation for picking
+	 * up the item, and then adds it to the player's inventory
+	 */
 	int pickUpObject(const char *const messages[]);
 
+	/**
+	 * Return the frame width
+	 */
 	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
+	
+	/**
+	 * Return the frame height
+	 */
 	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
+
+	/**
+	 * Returns the current bounds for the sprite
+	 */
 	const Common::Rect getNewBounds() const;
+
+	/**
+	 * Returns the bounds for a sprite without a shape
+	 */
 	const Common::Rect getNoShapeBounds() const;
+
+	/**
+	 * Returns the old bounsd for the sprite from the previous frame
+	 */
 	const Common::Rect getOldBounds() const;
 };
 
@@ -257,6 +337,9 @@ struct CAnim {
 	Common::Point _teleportPos;		// Location Holmes shoul teleport to after
 	int _teleportDir;					// playing canim
 
+	/**
+	 * Load the data for the animation
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index ad7c37a8c4..3a169fa99c 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -217,9 +217,6 @@ People::~People() {
 	delete[] _portrait._sequences;
 }
 
-/**
- * Reset the player data
- */
 void People::reset() {
 	// Note: The engine has theoretical support for two player characters but only the first one is used.
 	// Watson is, instead, handled by a different sprite in each scene, with a very simple initial movement, if any
@@ -247,9 +244,6 @@ void People::reset() {
 	_walkTo.clear();
 }
 
-/**
- * Load the walking images for Sherlock
- */
 bool People::loadWalk() {
 	if (_walkLoaded) {
 		return false;
@@ -262,9 +256,6 @@ bool People::loadWalk() {
 	}
 }
 
-/**
- * If the walk data has been loaded, then it will be freed
- */
 bool People::freeWalk() {
 	if (_walkLoaded) {
 		delete _player._images;
@@ -277,11 +268,6 @@ bool People::freeWalk() {
 	}
 }
 
-/**
- * Set the variables for moving a character from one poisition to another
- * in a straight line - goAllTheWay must have been previously called to
- * check for any obstacles in the path.
- */
 void People::setWalking() {
 	Map &map = *_vm->_map;
 	Scene &scene = *_vm->_scene;
@@ -427,10 +413,6 @@ void People::setWalking() {
 		_player._frameNumber = oldFrame;
 }
 
-/**
- * Bring a moving character to a standing position. If the Scalpel chessboard
- * is being displayed, then the chraracter will always face down.
- */
 void People::gotoStand(Sprite &sprite) {
 	Map &map = *_vm->_map;
 	_walkTo.clear();
@@ -481,9 +463,6 @@ void People::gotoStand(Sprite &sprite) {
 	_allowWalkAbort = true;
 }
 
-/**
- * Walk to the co-ordinates passed, and then face the given direction
- */
 void People::walkToCoords(const Common::Point &destPos, int destDir) {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
@@ -516,11 +495,6 @@ void People::walkToCoords(const Common::Point &destPos, int destDir) {
 	}
 }
 
-/**
- * Called to set the character walking to the current cursor location.
- * It uses the zones and the inter-zone points to determine a series
- * of steps to walk to get to that position.
- */
 void People::goAllTheWay() {
 	Scene &scene = *_vm->_scene;
 	Common::Point srcPt(_player._position.x / 100 + _player.frameWidth() / 2,
@@ -608,9 +582,6 @@ void People::goAllTheWay() {
 	}
 }
 
-/**
- * Finds the scene background object corresponding to a specified speaker
- */
 int People::findSpeaker(int speaker) {
 	Scene &scene = *_vm->_scene;
 
@@ -629,9 +600,6 @@ int People::findSpeaker(int speaker) {
 	return -1;
 }
 
-/**
- * Turn off any currently active portraits, and removes them from being drawn
- */
 void People::clearTalking() {
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -662,9 +630,6 @@ void People::clearTalking() {
 	}
 }
 
-/**
- * Setup the data for an animating speaker portrait at the top of the screen
- */
 void People::setTalking(int speaker) {
 	Resources &res = *_vm->_res;
 
@@ -724,9 +689,6 @@ void People::setTalking(int speaker) {
 	}
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void People::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_holmesOn);
 	s.syncAsSint16LE(_player._position.x);
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 9ac1a797c6..f22070f5f9 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -102,27 +102,69 @@ public:
 		return _data[idx];
 	}
 
+	/**
+	 * Returns true if Sherlock is visible on the screen and enabled
+	 */
 	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
 
+	/**
+	 * Reset the player data
+	 */
 	void reset();
 
+	/**
+	 * Load the walking images for Sherlock
+	 */
 	bool loadWalk();
 
+	/**
+	 * If the walk data has been loaded, then it will be freed
+	 */
 	bool freeWalk();
 
+	/**
+	 * Set the variables for moving a character from one poisition to another
+	 * in a straight line - goAllTheWay must have been previously called to
+	 * check for any obstacles in the path.
+	 */
 	void setWalking();
 
+	/**
+	 * Bring a moving character to a standing position. If the Scalpel chessboard
+	 * is being displayed, then the chraracter will always face down.
+	 */
 	void gotoStand(Sprite &sprite);
 
+	/**
+	 * Walk to the co-ordinates passed, and then face the given direction
+	 */
 	void walkToCoords(const Common::Point &destPos, int destDir);
 
+	/**
+	 * Called to set the character walking to the current cursor location.
+	 * It uses the zones and the inter-zone points to determine a series
+	 * of steps to walk to get to that position.
+	 */
 	void goAllTheWay();
 
+	/**
+	 * Finds the scene background object corresponding to a specified speaker
+	 */
 	int findSpeaker(int speaker);
 
+	/**
+	 * Turn off any currently active portraits, and removes them from being drawn
+	 */
 	void clearTalking();
+
+	/**
+	 * Setup the data for an animating speaker portrait at the top of the screen
+	 */
 	void setTalking(int speaker);
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 5a98d57011..091ef3ea12 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -31,18 +31,10 @@ namespace Sherlock {
 Cache::Cache(SherlockEngine *vm) : _vm(vm) {
 }
 
-/**
- * Returns true if a given file is currently being cached
- */
 bool Cache::isCached(const Common::String &filename) const {
 	return _resources.contains(filename);
 }
 
-/**
- * Loads a file into the cache if it's not already present, and returns it.
- * If the file is LZW compressed, automatically decompresses it and loads
- * the uncompressed version into memory
- */
 void Cache::load(const Common::String &name) {
 	// First check if the entry already exists
 	if (_resources.contains(name))
@@ -58,9 +50,6 @@ void Cache::load(const Common::String &name) {
 	f.close();
 }
 
-/**
- * Load a cache entry based on a passed stream
- */
 void Cache::load(const Common::String &name, Common::SeekableReadStream &stream) {
 	// First check if the entry already exists
 	if (_resources.contains(name))
@@ -88,9 +77,6 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream)
 	}
 }
 
-/**
- * Get a file from the cache
- */
 Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
 	// Return a memory stream that encapsulates the data
 	const CacheEntry &cacheEntry = _resources[filename];
@@ -111,10 +97,6 @@ Resources::Resources(SherlockEngine *vm) : _vm(vm), _cache(vm) {
 	}
 }
 
-/**
- * Adds the specified file to the cache. If it's a library file, takes care of
- * loading it's index for future use
- */
 void Resources::addToCache(const Common::String &filename) {
 	_cache.load(filename);
 
@@ -127,9 +109,6 @@ void Resources::addToCache(const Common::String &filename) {
 	delete stream;
 }
 
-/**
- * Adds a resource from a library file to the cache
- */
 void Resources::addToCache(const Common::String &filename, const Common::String &libFilename) {
 	// Get the resource
 	Common::SeekableReadStream *stream = load(filename, libFilename);
@@ -139,16 +118,10 @@ void Resources::addToCache(const Common::String &filename, const Common::String
 	delete stream;
 }
 
-/**
- * Adds a given stream to the cache under the given name
- */
 void Resources::addToCache(const Common::String &filename, Common::SeekableReadStream &stream) {
 	_cache.load(filename, stream);
 }
 
-/**
- * Returns a stream for a given file
- */
 Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 	// First check if the file is directly in the cache
 	if (_cache.isCached(filename))
@@ -184,9 +157,6 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename) {
 	return stream;
 }
 
-/**
- * Checks the passed stream, and if is compressed, deletes it and replaces it with it's uncompressed data
- */
 void Resources::decompressIfNecessary(Common::SeekableReadStream *&stream) {
 	bool isCompressed = stream->readUint32BE() == MKTAG('L', 'Z', 'V', 26);
 	stream->seek(-4, SEEK_CUR);
@@ -198,9 +168,6 @@ void Resources::decompressIfNecessary(Common::SeekableReadStream *&stream) {
 	}
 }
 
-/**
- * Loads a specific resource from a given library file
- */
 Common::SeekableReadStream *Resources::load(const Common::String &filename, const Common::String &libraryFile) {
 	// Open up the library for access
 	Common::SeekableReadStream *libStream = load(libraryFile);
@@ -219,17 +186,11 @@ Common::SeekableReadStream *Resources::load(const Common::String &filename, cons
 	return stream;
 }
 
-/**
- * Returns true if the given file exists on disk or in the cache
- */
 bool Resources::exists(const Common::String &filename) const {
 	Common::File f;
 	return f.exists(filename) || _cache.isCached(filename);
 }
 
-/**
- * Reads in the index from a library file, and caches it's index for later use
- */
 void Resources::loadLibraryIndex(const Common::String &libFilename,
 		Common::SeekableReadStream *stream) {
 	uint32 offset, nextOffset;
@@ -266,15 +227,63 @@ void Resources::loadLibraryIndex(const Common::String &libFilename,
 	}
 }
 
-/**
- * Returns the index of the last loaded resource in it's given library file.
- * This will be used primarily when loading talk files, so the engine can
- * update the given conversation number in the journal
- */
 int Resources::resourceIndex() const {
 	return _resourceIndex;
 }
 
+Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source) {
+	if (_vm->getGameID() == GType_SerratedScalpel) {
+		uint32 id = source.readUint32BE();
+		assert(id == MKTAG('L', 'Z', 'V', 0x1A));
+	}
+
+	uint32 size = source.readUint32LE();
+	return decompressLZ(source, size);
+}
+
+Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source, uint32 outSize) {
+	byte lzWindow[4096];
+	uint16 lzWindowPos;
+	uint16 cmd;
+
+	byte *outBuffer = (byte *)malloc(outSize);
+	byte *outBufferEnd = outBuffer + outSize;
+	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
+
+	memset(lzWindow, 0xFF, 0xFEE);
+	lzWindowPos = 0xFEE;
+	cmd = 0;
+
+	do {
+		cmd >>= 1;
+		if (!(cmd & 0x100))
+			cmd = source.readByte() | 0xFF00;
+
+		if (cmd & 1) {
+			byte literal = source.readByte();
+			*outBuffer++ = literal;
+			lzWindow[lzWindowPos] = literal;
+			lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+		}
+		else {
+			int copyPos, copyLen;
+			copyPos = source.readByte();
+			copyLen = source.readByte();
+			copyPos = copyPos | ((copyLen & 0xF0) << 4);
+			copyLen = (copyLen & 0x0F) + 3;
+			while (copyLen--) {
+				byte literal = lzWindow[copyPos];
+				copyPos = (copyPos + 1) & 0x0FFF;
+				*outBuffer++ = literal;
+				lzWindow[lzWindowPos] = literal;
+				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+			}
+		}
+	} while (outBuffer < outBufferEnd);
+
+	return outS;
+}
+
 /*----------------------------------------------------------------*/
 
 SherlockEngine *ImageFile::_vm;
@@ -302,9 +311,6 @@ ImageFile::~ImageFile() {
 		(*this)[idx]._frame.free();
 }
 
-/**
- * Load the data of the sprite
- */
 void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool animImages) {
 	loadPalette(stream);
 
@@ -350,9 +356,6 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool
 	}
 }
 
-/**
- * Gets the palette at the start of the sprite file
- */
 void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
 	// Check for palette
 	int v1 = stream.readUint16LE() + 1;
@@ -372,9 +375,6 @@ void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
 	}
 }
 
-/**
- * Decompress a single frame for the sprite
- */
 void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 	frame._frame.create(frame._width, frame._height, Graphics::PixelFormat::createFormatCLUT8());
 
@@ -411,62 +411,4 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 	}
 }
 
-/**
- * Decompress an LZW compressed resource
- */
-Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source) {
-	if (_vm->getGameID() == GType_SerratedScalpel) {
-		uint32 id = source.readUint32BE();
-		assert(id == MKTAG('L', 'Z', 'V', 0x1A));
-	}
-
-	uint32 size = source.readUint32LE();
-	return decompressLZ(source, size);
-}
-
-/**
- * Decompresses an LZW block of data with a specified output size
- */
-Common::SeekableReadStream *Resources::decompressLZ(Common::SeekableReadStream &source, uint32 outSize) {
-	byte lzWindow[4096];
-	uint16 lzWindowPos;
-	uint16 cmd;
-
-	byte *outBuffer = (byte *)malloc(outSize);
-	byte *outBufferEnd = outBuffer + outSize;
-	Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
-
-	memset(lzWindow, 0xFF, 0xFEE);
-	lzWindowPos = 0xFEE;
-	cmd = 0;
-
-	do {
-		cmd >>= 1;
-		if (!(cmd & 0x100))
-			cmd = source.readByte() | 0xFF00;
-
-		if (cmd & 1) {
-			byte literal = source.readByte();
-			*outBuffer++ = literal;
-			lzWindow[lzWindowPos] = literal;
-			lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
-		} else {
-			int copyPos, copyLen;
-			copyPos = source.readByte();
-			copyLen = source.readByte();
-			copyPos = copyPos | ((copyLen & 0xF0) << 4);
-			copyLen = (copyLen & 0x0F) + 3;
-			while (copyLen--) {
-				byte literal = lzWindow[copyPos];
-				copyPos = (copyPos + 1) & 0x0FFF;
-				*outBuffer++ = literal;
-				lzWindow[lzWindowPos] = literal;
-				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
-			}
-		}
-	} while (outBuffer < outBufferEnd);
-
-	return outS;
-}
-
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 6bb0682f8d..4ca4038529 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -57,11 +57,26 @@ private:
 public:
 	Cache(SherlockEngine *_vm);
 
+	/**
+	 * Returns true if a given file is currently being cached
+	 */
 	bool isCached(const Common::String &filename) const;
 
+	/**
+	 * Loads a file into the cache if it's not already present, and returns it.
+	 * If the file is LZW compressed, automatically decompresses it and loads
+	 * the uncompressed version into memory
+	 */
 	void load(const Common::String &name);
+
+	/**
+	 * Load a cache entry based on a passed stream
+	 */
 	void load(const Common::String &name, Common::SeekableReadStream &stream);
 
+	/**
+	 * Get a file from the cache
+	 */
 	Common::SeekableReadStream *get(const Common::String &filename) const;
 };
 
@@ -72,26 +87,66 @@ private:
 	LibraryIndexes _indexes;
 	int _resourceIndex;
 
+	/**
+	 * Reads in the index from a library file, and caches it's index for later use
+	 */
 	void loadLibraryIndex(const Common::String &libFilename, Common::SeekableReadStream *stream);
 public:
 	Resources(SherlockEngine *vm);
 
+	/**
+	 * Adds the specified file to the cache. If it's a library file, takes care of
+	 * loading it's index for future use
+	 */
 	void addToCache(const Common::String &filename);
+	
+	/**
+	 * Adds a resource from a library file to the cache
+	 */
 	void addToCache(const Common::String &filename, const Common::String &libFilename);
+	
+	/**
+	 * Adds a given stream to the cache under the given name
+	 */
 	void addToCache(const Common::String &filename, Common::SeekableReadStream &stream);
+
 	bool isInCache(const Common::String &filename) const { return _cache.isCached(filename); }
 
+	/**
+	 * Checks the passed stream, and if is compressed, deletes it and replaces it with it's uncompressed data
+	 */
 	void decompressIfNecessary(Common::SeekableReadStream *&stream);
 
+	/**
+	 * Returns a stream for a given file
+	 */
 	Common::SeekableReadStream *load(const Common::String &filename);
 
+	/**
+	 * Loads a specific resource from a given library file
+	 */
 	Common::SeekableReadStream *load(const Common::String &filename, const Common::String &libraryFile);
 
+	/**
+	 * Returns true if the given file exists on disk or in the cache
+	 */
 	bool exists(const Common::String &filename) const;
 
+	/**
+	 * Returns the index of the last loaded resource in it's given library file.
+	 * This will be used primarily when loading talk files, so the engine can
+	 * update the given conversation number in the journal
+	 */
 	int resourceIndex() const;
 
+	/**
+	 * Decompresses an LZW block of data with a specified output size
+	 */
 	static Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, uint32 outSize);
+	
+	/**
+	 * Decompress an LZW compressed resource
+	 */
 	Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source);
 };
 
@@ -111,8 +166,19 @@ class ImageFile : public Common::Array<ImageFrame> {
 private:
 	static SherlockEngine *_vm;
 
+	/**
+	 * Load the data of the sprite
+	 */
 	void load(Common::SeekableReadStream &stream, bool skipPalette, bool animImages);
+
+	/**
+	 * Gets the palette at the start of the sprite file
+	 */
 	void loadPalette(Common::SeekableReadStream &stream);
+
+	/**
+	 * Decompress a single frame for the sprite
+	 */
 	void decompressFrame(ImageFrame  &frame, const byte *src);
 public:
 	byte _palette[256 * 3];
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 6fb1dcc448..bec832aa05 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -55,9 +55,6 @@ SaveManager::~SaveManager() {
 	}
 }
 
-/**
- * Shows the in-game dialog interface for loading and saving games
- */
 void SaveManager::drawInterface() {
 	Screen &screen = *_vm->_screen;
 	UserInterface &ui = *_vm->_ui;
@@ -107,9 +104,6 @@ void SaveManager::drawInterface() {
 	_envMode = SAVEMODE_NONE;
 }
 
-/**
- * Build up a savegame list, with empty slots given an explicit Empty message
- */
 void SaveManager::createSavegameList() {
 	Screen &screen = *_vm->_screen;
 
@@ -137,9 +131,6 @@ void SaveManager::createSavegameList() {
 	}
 }
 
-/**
- * Load a list of savegames
- */
 SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
 	Common::StringArray filenames;
@@ -175,9 +166,6 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 const char *const SAVEGAME_STR = "SHLK";
 #define SAVEGAME_STR_SIZE 4
 
-/**
- * Read in the header information for a savegame
- */
 bool SaveManager::readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header) {
 	char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
 	header._thumbnail = nullptr;
@@ -212,9 +200,6 @@ bool SaveManager::readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHea
 	return true;
 }
 
-/**
- * Write out the header information for a savegame
- */
 void SaveManager::writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegameHeader &header) {
 	// Write out a savegame header
 	out->write(SAVEGAME_STR, SAVEGAME_STR_SIZE + 1);
@@ -245,9 +230,6 @@ void SaveManager::writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegame
 	out->writeUint32LE(_vm->_events->getFrameCounter());
 }
 
-/**
- * Creates a thumbnail for the current on-screen contents
- */
 void SaveManager::createThumbnail() {
 	if (_saveThumb) {
 		_saveThumb->free();
@@ -260,9 +242,6 @@ void SaveManager::createThumbnail() {
 	::createThumbnail(_saveThumb, (const byte *)_vm->_screen->getPixels(), SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, thumbPalette);
 }
 
-/**
- * Return the index of the button the mouse is over, if any
- */
 int SaveManager::getHighlightedButton() const {
 	Common::Point pt = _vm->_events->mousePos();
 
@@ -275,9 +254,6 @@ int SaveManager::getHighlightedButton() const {
 	return -1;
 }
 
-/**
- * Handle highlighting buttons
- */
 void SaveManager::highlightButtons(int btnIndex) {
 	Screen &screen = *_vm->_screen;
 	byte color = (btnIndex == 0) ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND;
@@ -309,9 +285,6 @@ void SaveManager::highlightButtons(int btnIndex) {
 	screen.buttonPrint(Common::Point(ENV_POINTS[5][2], CONTROLS_Y), color, 1, "Quit");
 }
 
-/**
- * Load the game in the specified slot
- */
 void SaveManager::loadGame(int slot) {
 	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
 		generateSaveName(slot));
@@ -335,9 +308,6 @@ void SaveManager::loadGame(int slot) {
 	delete saveFile;
 }
 
-/**
- * Save the game in the specified slot with the given name
- */
 void SaveManager::saveGame(int slot, const Common::String &name) {
 	Common::OutSaveFile *out = g_system->getSavefileManager()->openForSaving(
 		generateSaveName(slot));
@@ -354,17 +324,10 @@ void SaveManager::saveGame(int slot, const Common::String &name) {
 	delete out;
 }
 
-/**
- * Support method that generates a savegame name
- * @param slot		Slot number
- */
 Common::String SaveManager::generateSaveName(int slot) {
 	return Common::String::format("%s.%03d", _target.c_str(), slot);
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void SaveManager::synchronize(Common::Serializer &s) {
 	Inventory &inv = *_vm->_inventory;
 	Journal &journal = *_vm->_journal;
@@ -391,9 +354,6 @@ void SaveManager::synchronize(Common::Serializer &s) {
 	_justLoaded = true;
 }
 
-/**
- * Make sure that the selected savegame is on-screen
- */
 bool SaveManager::checkGameOnScreen(int slot) {
 	Screen &screen = *_vm->_screen;
 
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index c9a7286c6b..371a6e4c79 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -56,8 +56,14 @@ private:
 	Common::String _target;
 	Graphics::Surface *_saveThumb;
 
+	/**
+	 * Build up a savegame list, with empty slots given an explicit Empty message
+	 */
 	void createSavegameList();
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 public:
 	Common::StringArray _savegames;
@@ -68,27 +74,65 @@ public:
 	SaveManager(SherlockEngine *vm, const Common::String &target);
 	~SaveManager();
 
+	/**
+	 * Shows the in-game dialog interface for loading and saving games
+	 */
 	void drawInterface();
 
+	/**
+	 * Creates a thumbnail for the current on-screen contents
+	 */
 	void createThumbnail();
 
+	/**
+	 * Load a list of savegames
+	 */
 	static SaveStateList getSavegameList(const Common::String &target);
 
+	/**
+	 * Support method that generates a savegame name
+	 * @param slot		Slot number
+	 */
 	Common::String generateSaveName(int slot);
 
+	/**
+	 * Write out the header information for a savegame
+	 */
 	void writeSavegameHeader(Common::OutSaveFile *out, SherlockSavegameHeader &header);
 
+	/**
+	 * Read in the header information for a savegame
+	 */
 	static bool readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header);
 
+	/**
+	 * Return the index of the button the mouse is over, if any
+	 */
 	int getHighlightedButton() const;
 
+	/**
+	 * Handle highlighting buttons
+	 */
 	void highlightButtons(int btnIndex);
 
+	/**
+	 * Load the game in the specified slot
+	 */
 	void loadGame(int slot);
+	
+	/**
+	 * Save the game in the specified slot with the given name
+	 */
 	void saveGame(int slot, const Common::String &name);
 
+	/**
+	 * Make sure that the selected savegame is on-screen
+	 */
 	bool checkGameOnScreen(int slot);
 
+	/**
+	 * Prompts the user to enter a filename in a given slot
+	 */
 	bool getFilename(int slot);
 };
 
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 29b67216b9..e861b9cd62 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -64,9 +64,6 @@ Darts::Darts(ScalpelEngine *vm) : _vm(vm) {
 	_oldDartButtons = false;
 }
 
-/**
- * Main method for playing darts game
- */
 void Darts::playDarts() {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -182,9 +179,6 @@ void Darts::playDarts() {
 	screen.setFont(oldFont);
 }
 
-/**
- * Load the graphics needed for the dart game
- */
 void Darts::loadDarts() {
 	Screen &screen = *_vm->_screen;
 
@@ -195,9 +189,6 @@ void Darts::loadDarts() {
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
-/**
- * Initializes the variables needed for the dart game
- */
 void Darts::initDarts() {
 	_dartScore1 = _dartScore2 = 301;
 	_roundNumber = 1;
@@ -220,17 +211,11 @@ void Darts::initDarts() {
 	_opponent = OPPONENT_NAMES[_level];
 }
 
-/**
- * Frees the images used by the dart game
- */
 void Darts::closeDarts() {
 	delete _dartImages;
 	_dartImages = nullptr;
 }
 
-/**
- * Show the names of the people playing, Holmes and his opponent
- */
 void Darts::showNames(int playerNum) {
 	Screen &screen = *_vm->_screen;
 	byte color = playerNum == 0 ? PLAYER_COLOR : DART_COL_FORE;
@@ -263,9 +248,6 @@ void Darts::showNames(int playerNum) {
 	screen._backBuffer2.blitFrom(screen._backBuffer1);
 }
 
-/**
- * Show the player score and game status
- */
 void Darts::showStatus(int playerNum) {
 	Screen &screen = *_vm->_screen;
 	byte color;
@@ -284,12 +266,6 @@ void Darts::showStatus(int playerNum) {
 	screen.slamRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, SHERLOCK_SCREEN_WIDTH, STATUS_INFO_Y + 48));
 }
 
-/**
- * Throws a single dart.
- * @param dartNum	Dart number
- * @param computer	0 = Player, 1 = 1st player computer, 2 = 2nd player computer
- * @returns			Score for what dart hit
- */
 int Darts::throwDart(int dartNum, int computer) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -348,9 +324,6 @@ int Darts::throwDart(int dartNum, int computer) {
 	return dartScore(dartPos);
 }
 
-/**
- * Draw a dart moving towards the board
- */
 void Darts::drawDartThrow(const Common::Point &pt) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -390,9 +363,6 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 	screen.slamRect(oldDrawBounds);
 }
 
-/**
- * Erases the power bars
- */
 void Darts::erasePowerBars() {
 	Screen &screen = *_vm->_screen;
 
@@ -404,11 +374,6 @@ void Darts::erasePowerBars() {
 	screen.slamArea(DARTBARVX - 1, DARTHEIGHTY - 1, 11, DARTBARSIZE + 3);
 }
 
-/**
- * Show a gradually incrementing incrementing power that bar. If goToPower is provided, it will
- * increment to that power level ignoring all keyboard input (ie. for computer throws).
- * Otherwise, it will increment until either a key/mouse button is pressed, or it reaches the end
- */
 int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool isVertical) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -459,9 +424,6 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 	return MIN(idx * 100 / DARTBARSIZE, 100);
 }
 
-/**
- * Returns true if a mouse button or key is pressed.
- */
 bool Darts::dartHit() {
 	Events &events = *_vm->_events;
 
@@ -481,9 +443,6 @@ bool Darts::dartHit() {
 	return (events._pressed && !_oldDartButtons) ? 1 : 0;
 }
 
-/**
- * Return the score of the given location on the dart-board
- */
 int Darts::dartScore(const Common::Point &pt) {
 	Common::Point pos(pt.x - 37, pt.y - 33);
 	Graphics::Surface &scoreImg = (*_dartImages)[1]._frame;
@@ -497,10 +456,6 @@ int Darts::dartScore(const Common::Point &pt) {
 	return score;
 }
 
-/**
- * Calculates where a computer player is trying to throw their dart, and choose the actual
- * point that was hit with some margin of error
- */
 Common::Point Darts::getComputerDartDest(int playerNum) {
 	Common::Point target;
 	int score = playerNum == 0 ? _dartScore1 : _dartScore2;
@@ -556,9 +511,6 @@ Common::Point Darts::getComputerDartDest(int playerNum) {
 	return target;
 }
 
-/**
- * Returns the center position for the area of the dartboard with a given number
- */
 bool Darts::findNumberOnBoard(int aim, Common::Point &pt) {
 	ImageFrame &board = (*_dartImages)[1];
 
@@ -598,10 +550,6 @@ bool Darts::findNumberOnBoard(int aim, Common::Point &pt) {
 	return done;
 }
 
-/**
- * Set a global flag to 0 or 1 depending on whether the passed flag is negative or positive.
- * @remarks		We don't use the global setFlags method because we don't want to check scene flags
- */
 void Darts::setFlagsForDarts(int flagNum) {
 	_vm->_flags[ABS(flagNum)] = flagNum >= 0;
 }
diff --git a/engines/sherlock/scalpel/darts.h b/engines/sherlock/scalpel/darts.h
index a9624442e2..42990f8056 100644
--- a/engines/sherlock/scalpel/darts.h
+++ b/engines/sherlock/scalpel/darts.h
@@ -44,30 +44,88 @@ private:
 	int _roundScore;
 	bool _oldDartButtons;
 
+	/**
+	 * Load the graphics needed for the dart game
+	 */
 	void loadDarts();
+
+	/**
+	 * Initializes the variables needed for the dart game
+	 */
 	void initDarts();
+	
+	/**
+	 * Frees the images used by the dart game
+	 */
 	void closeDarts();
 
+	/**
+	 * Show the names of the people playing, Holmes and his opponent
+	 */
 	void showNames(int playerNum);
+
+	/**
+	 * Show the player score and game status
+	 */
 	void showStatus(int playerNum);
 
+	/**
+	 * Throws a single dart.
+	 * @param dartNum	Dart number
+	 * @param computer	0 = Player, 1 = 1st player computer, 2 = 2nd player computer
+	 * @returns			Score for what dart hit
+	 */
 	int throwDart(int dartNum, int computer);
+
+	/**
+	 * Draw a dart moving towards the board
+	 */
 	void drawDartThrow(const Common::Point &pt);
 
+	/**
+	 * Erases the power bars
+	 */
 	void erasePowerBars();
+
+	/**
+	 * Show a gradually incrementing incrementing power that bar. If goToPower is provided, it will
+	 * increment to that power level ignoring all keyboard input (ie. for computer throws).
+	 * Otherwise, it will increment until either a key/mouse button is pressed, or it reaches the end
+	 */
 	int doPowerBar(const Common::Point &pt, byte color, int goToPower, bool isVertical);
 
+	/**
+	 * Returns true if a mouse button or key is pressed.
+	 */
 	bool dartHit();
+	
+	/**
+	 * Return the score of the given location on the dart-board
+	 */
 	int dartScore(const Common::Point &pt);
 
+	/**
+	 * Calculates where a computer player is trying to throw their dart, and choose the actual
+	 * point that was hit with some margin of error
+	 */
 	Common::Point getComputerDartDest(int playerNum);
 
+	/**
+	 * Returns the center position for the area of the dartboard with a given number
+	 */
 	bool findNumberOnBoard(int aim, Common::Point &pt);
 
+	/**
+	 * Set a global flag to 0 or 1 depending on whether the passed flag is negative or positive.
+	 * @remarks		We don't use the global setFlags method because we don't want to check scene flags
+	 */
 	void setFlagsForDarts(int flagNum);
 public:
 	Darts(ScalpelEngine *vm);
 
+	/**
+	 * Main method for playing darts game
+	 */
 	void playDarts();
 };
 
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index e47be791f0..170768d91d 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -238,9 +238,6 @@ ScalpelEngine::~ScalpelEngine() {
 	delete _darts;
 }
 
-/**
- * Game initialization
- */
 void ScalpelEngine::initialize() {
 	SherlockEngine::initialize();
 
@@ -276,9 +273,6 @@ void ScalpelEngine::initialize() {
 		_scene->_goToScene = 4;
 }
 
-/**
- * Show the opening sequence
- */
 void ScalpelEngine::showOpening() {
 	if (isDemo() && _interactiveFl)
 		return;
@@ -296,9 +290,6 @@ void ScalpelEngine::showOpening() {
 	_sound->stopMusic();
 }
 
-/**
- * Show the starting city cutscene which shows the game title
- */
 bool ScalpelEngine::showCityCutscene() {
 	byte palette[PALETTE_SIZE];
 
@@ -371,9 +362,6 @@ bool ScalpelEngine::showCityCutscene() {
 	return finished;
 }
 
-/**
- * Show the back alley where the initial murder takes place
- */
 bool ScalpelEngine::showAlleyCutscene() {
 	byte palette[PALETTE_SIZE];
 	_sound->playMusic("prolog2.mus");
@@ -411,9 +399,6 @@ bool ScalpelEngine::showAlleyCutscene() {
 	return finished;
 }
 
-/**
- * Show the Baker Street outside cutscene
- */
 bool ScalpelEngine::showStreetCutscene() {
 	_animation->_gfxLibraryFilename = "TITLE.LIB";
 	_animation->_soundLibraryFilename = "TITLE.SND";
@@ -430,9 +415,7 @@ bool ScalpelEngine::showStreetCutscene() {
 	return finished;
 }
 
-/**
- * Show the game credits
- */
+
 bool ScalpelEngine::scrollCredits() {
 	// Load the images for displaying credit text
 	Common::SeekableReadStream *stream = _res->load("credits.vgs", "title.lib");
@@ -465,9 +448,6 @@ bool ScalpelEngine::scrollCredits() {
 	return true;
 }
 
-/**
- * Show Holmes and Watson at the breakfast table, lestrade's note, and then the scrolling credits
- */
 bool ScalpelEngine::showOfficeCutscene() {
 	_sound->playMusic("PROLOG4.MUS");
 	_animation->_gfxLibraryFilename = "TITLE2.LIB";
@@ -511,11 +491,6 @@ bool ScalpelEngine::showOfficeCutscene() {
 	return finished;
 }
 
-/**
- * Load the default inventory for the game, which includes both the initial active inventory,
- * as well as special pending inventory items which can appear automatically in the player's
- * inventory once given required flags are set
- */
 void ScalpelEngine::loadInventory() {
 	Inventory &inv = *_inventory;
 
@@ -537,9 +512,6 @@ void ScalpelEngine::loadInventory() {
 	inv.push_back(InventoryItem(586, "Pawn ticket", "A pawn ticket", "_ITEM16A"));
 }
 
-/**
- * Transition to show an image
- */
 void ScalpelEngine::showLBV(const Common::String &filename) {
 	Common::SeekableReadStream *stream = _res->load(filename, "title.lib");
 	ImageFile images(*stream);
@@ -550,9 +522,6 @@ void ScalpelEngine::showLBV(const Common::String &filename) {
 	_screen->verticalTransition();
 }
 
-/**
- * Starting a scene within the game
- */
 void ScalpelEngine::startScene() {
 	if (_scene->_goToScene == OVERHEAD_MAP || _scene->_goToScene == OVERHEAD_MAP2) {
 		// Show the map
@@ -709,9 +678,6 @@ void ScalpelEngine::startScene() {
 	_mapResult = _scene->_goToScene;
 }
 
-/**
- * Takes care of clearing the mirror in scene 12 (mansion drawing room), in case anything drew over it
- */
 void ScalpelEngine::eraseMirror12() {
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
 
@@ -722,9 +688,6 @@ void ScalpelEngine::eraseMirror12() {
 	}
 }
 
-/**
- * Takes care of drawing Holme's reflection onto the mirror in scene 12 (mansion drawing room)
- */
 void ScalpelEngine::doMirror12() {
 	People &people = *_people;
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
@@ -798,9 +761,6 @@ void ScalpelEngine::doMirror12() {
 	}
 }
 
-/**
- * This clears the mirror in scene 12 (mansion drawing room) in case anything messed draw over it
- */
 void ScalpelEngine::flushMirror12() {
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
 
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 62875f1e90..14e30ff996 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -39,27 +39,74 @@ private:
 	Darts *_darts;
 	int _mapResult;
 
+	/**
+	 * Show the starting city cutscene which shows the game title
+	 */
 	bool showCityCutscene();
+
+	/**
+	 * Show the back alley where the initial murder takes place
+	 */
 	bool showAlleyCutscene();
+
+	/**
+	 * Show the Baker Street outside cutscene
+	 */
 	bool showStreetCutscene();
+
+	/**
+	 * Show Holmes and Watson at the breakfast table, lestrade's note, and then the scrolling credits
+	 */
 	bool showOfficeCutscene();
+
+	/**
+	 * Show the game credits
+	 */
 	bool scrollCredits();
 
+	/**
+	 * Load the default inventory for the game, which includes both the initial active inventory,
+	 * as well as special pending inventory items which can appear automatically in the player's
+	 * inventory once given required flags are set
+	 */
 	void loadInventory();
 
+	/**
+	 * Transition to show an image
+	 */
 	void showLBV(const Common::String &filename);
 protected:
+	/**
+	 * Game initialization
+	 */
 	virtual void initialize();
 
+	/**
+	 * Show the opening sequence
+	 */
 	virtual void showOpening();
 
+	/**
+	 * Starting a scene within the game
+	 */
 	virtual void startScene();
 public:
 	ScalpelEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~ScalpelEngine();
 
+	/**
+	 * Takes care of clearing the mirror in scene 12 (mansion drawing room), in case anything drew over it
+	 */
 	void eraseMirror12();
+
+	/**
+	 * Takes care of drawing Holme's reflection onto the mirror in scene 12 (mansion drawing room)
+	 */
 	void doMirror12();
+
+	/**
+	 * This clears the mirror in scene 12 (mansion drawing room) in case anything messed draw over it
+	 */
 	void flushMirror12();
 };
 
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e71bc7eef7..5ac43fc1be 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -33,9 +33,6 @@ static const int FS_TRANS[8] = {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for the object
- */
 void BgFileHeader::load(Common::SeekableReadStream &s) {
 	_numStructs = s.readUint16LE();
 	_numImages = s.readUint16LE();
@@ -47,9 +44,6 @@ void BgFileHeader::load(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for the object
- */
 void BgFileHeaderInfo::load(Common::SeekableReadStream &s) {
 	_filesize = s.readUint32LE();
 	_maxFrames = s.readByte();
@@ -61,9 +55,6 @@ void BgFileHeaderInfo::load(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for the object
- */
 void Exit::load(Common::SeekableReadStream &s) {
 	int xp = s.readSint16LE();
 	int yp = s.readSint16LE();
@@ -80,9 +71,6 @@ void Exit::load(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for the object
- */
 void SceneEntry::load(Common::SeekableReadStream &s) {
 	_startPosition.x = s.readSint16LE();
 	_startPosition.y = s.readSint16LE();
@@ -90,9 +78,6 @@ void SceneEntry::load(Common::SeekableReadStream &s) {
 	_allow = s.readByte();
 }
 
-/**
- * Load the data for the object
- */
 void SceneSound::load(Common::SeekableReadStream &s) {
 	char buffer[9];
 	s.read(buffer, 8);
@@ -104,9 +89,6 @@ void SceneSound::load(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Retuurn the index of the passed object in the array
- */
 int ObjectArray::indexOf(const Object &obj) const {
 	for (uint idx = 0; idx < size(); ++idx) {
 		if (&(*this)[idx] == &obj)
@@ -143,9 +125,6 @@ Scene::~Scene() {
 	freeScene();
 }
 
-/**
- * Handles loading the scene specified by _goToScene
- */
 void Scene::selectScene() {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -189,9 +168,6 @@ void Scene::selectScene() {
 		talk._scriptMoreFlag = 0;
 }
 
-/**
- * Fres all the graphics and other dynamically allocated data for the scene
- */
 void Scene::freeScene() {
 	if (_currentScene == -1)
 		return;
@@ -221,15 +197,6 @@ void Scene::freeScene() {
 	_currentScene = -1;
 }
 
-/**
- * Loads the data associated for a given scene. The .BGD file's format is:
- * BGHEADER: Holds an index for the rest of the file
- * STRUCTS:  The objects for the scene
- * IMAGES:   The graphic information for the structures
- *
- * The _misc field of the structures contains the number of the graphic image
- * that it should point to after loading; _misc is then set to 0.
- */
 bool Scene::loadScene(const Common::String &filename) {
 	Events &events = *_vm->_events;
 	Map &map = *_vm->_map;
@@ -513,10 +480,6 @@ bool Scene::loadScene(const Common::String &filename) {
 	return flag;
 }
 
-/**
- * Set objects to their current persistent state. This includes things such as
- * opening or moving them
- */
 void Scene::checkSceneStatus() {
 	if (_sceneStats[_currentScene][64]) {
 		for (uint idx = 0; idx < 64; ++idx) {
@@ -542,10 +505,6 @@ void Scene::checkSceneStatus() {
 	}
 }
 
-/**
- * Restores objects to the correct status. This ensures that things like being opened or moved
- * will remain the same on future visits to the scene
- */
 void Scene::saveSceneStatus() {
 	// Flag any objects for the scene that have been altered
 	int count = MIN((int)_bgShapes.size(), 64);
@@ -559,11 +518,6 @@ void Scene::saveSceneStatus() {
 	_sceneStats[_currentScene][64] = true;
 }
 
-/**
- * Check the scene's objects against the game flags. If false is passed,
- * it means the scene has just been loaded. A value of true means that the scene
- * is in use (ie. not just loaded)
- */
 void Scene::checkSceneFlags(bool flag) {
 	SpriteType mode = flag ? HIDE_SHAPE : HIDDEN;
 
@@ -616,11 +570,6 @@ void Scene::checkSceneFlags(bool flag) {
 	}
 }
 
-/**
- * Checks scene objects against the player's inventory items. If there are any
- * matching names, it means the given item has already been picked up, and should
- * be hidden in the scene.
- */
 void Scene::checkInventory() {
 	for (uint shapeIdx = 0; shapeIdx < _bgShapes.size(); ++shapeIdx) {
 		for (int invIdx = 0; invIdx < _vm->_inventory->_holdings; ++invIdx) {
@@ -632,10 +581,6 @@ void Scene::checkInventory() {
 	}
 }
 
-/**
- * Set up any entrance co-ordinates or entrance canimations, and then transition
- * in the scene
- */
 void Scene::transitionToScene() {
 	People &people = *_vm->_people;
 	SaveManager &saves = *_vm->_saves;
@@ -750,10 +695,6 @@ void Scene::transitionToScene() {
 	}
 }
 
-/**
- * Scans through the object list to find one with a matching name, and will
- * call toggleHidden with all matches found. Returns the numer of matches found
- */
 int Scene::toggleObject(const Common::String &name) {
 	int count = 0;
 
@@ -767,10 +708,6 @@ int Scene::toggleObject(const Common::String &name) {
 	return count;
 }
 
-/**
- * Update the screen back buffer with all of the scene objects which need
- * to be drawn
- */
 void Scene::updateBackground() {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
@@ -860,9 +797,6 @@ void Scene::updateBackground() {
 	screen.resetDisplayBounds();
 }
 
-/**
- * Check whether the passed area intersects with one of the scene's exits
- */
 Exit *Scene::checkForExit(const Common::Rect &r) {
 	for (uint idx = 0; idx < _exits.size(); ++idx) {
 		if (_exits[idx]._bounds.intersects(r))
@@ -872,11 +806,6 @@ Exit *Scene::checkForExit(const Common::Rect &r) {
 	return nullptr;
 }
 
-/**
- * Checks all the background shapes. If a background shape is animating,
- * it will flag it as needing to be drawn. If a non-animating shape is
- * colliding with another shape, it will also flag it as needing drawing
- */
 void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
 	// Iterate through the shapes
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
@@ -911,14 +840,6 @@ void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
 	}
 }
 
-/**
- * Attempt to start a canimation sequence. It will load the requisite graphics, and
- * then copy the canim object into the _canimShapes array to start the animation.
- *
- * @param cAnimNum		The canim object within the current scene
- * @param playRate		Play rate. 0 is invalid; 1=normal speed, 2=1/2 speed, etc.
- *		A negative playRate can also be specified to play the animation in reverse
- */
 int Scene::startCAnim(int cAnimNum, int playRate) {
 	Events &events = *_vm->_events;
 	Map &map = *_vm->_map;
@@ -1131,9 +1052,6 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	return 1;
 }
 
-/**
- * Animate all objects and people.
- */
 void Scene::doBgAnim() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -1461,10 +1379,6 @@ void Scene::doBgAnim() {
 	}
 }
 
-/**
- * Attempts to find a background shape within the passed bounds. If found,
- * it will return the shape number, or -1 on failure.
- */
 int Scene::findBgShape(const Common::Rect &r) {
 	if (!_doBgAnimDone)
 		// New frame hasn't been drawn yet
@@ -1485,10 +1399,6 @@ int Scene::findBgShape(const Common::Rect &r) {
 	return -1;
 }
 
-/**
- * Checks to see if the given position in the scene belongs to a given zone type.
- * If it is, the zone is activated and used just like a TAKL zone or aFLAG_SET zone.
- */
 int Scene::checkForZones(const Common::Point &pt, int zoneType) {
 	int matches = 0;
 
@@ -1508,9 +1418,6 @@ int Scene::checkForZones(const Common::Point &pt, int zoneType) {
 	return matches;
 }
 
-/**
- * Check which zone the the given position is located in.
- */
 int Scene::whichZone(const Common::Point &pt) {
 	for (uint idx = 0; idx < _zones.size(); ++idx) {
 		if (_zones[idx].contains(pt))
@@ -1520,9 +1427,6 @@ int Scene::whichZone(const Common::Point &pt) {
 	return -1;
 }
 
-/**
- * Returns the index of the closest zone to a given point.
- */
 int Scene::closestZone(const Common::Point &pt) {
 	int dist = 1000;
 	int zone = -1;
@@ -1542,9 +1446,6 @@ int Scene::closestZone(const Common::Point &pt) {
 	return zone;
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void Scene::synchronize(Common::Serializer &s) {
 	if (s.isSaving())
 		saveSceneStatus();
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 78d41299e6..243aba20f8 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -46,6 +46,9 @@ struct BgFileHeader {
 	int _seqSize;
 	int _fill;
 
+	/**
+	 * Load the data for the object
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
@@ -54,6 +57,9 @@ struct BgFileHeaderInfo {
 	int _maxFrames;				// How many unique frames in object
 	Common::String _filename;	// Filename of object
 
+	/**
+	 * Load the data for the object
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
@@ -65,6 +71,9 @@ struct Exit {
 	Common::Point _people;
 	int _peopleDir;
 
+	/**
+	 * Load the data for the object
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
@@ -73,6 +82,9 @@ struct SceneEntry {
 	int _startDir;
 	int _allow;
 
+	/**
+	 * Load the data for the object
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
@@ -80,11 +92,17 @@ struct SceneSound {
 	Common::String _name;
 	int _priority;
 
+	/**
+	 * Load the data for the object
+	 */
 	void load(Common::SeekableReadStream &s);
 };
 
 class ObjectArray : public Common::Array<Object> {
 public:
+	/**
+	 * Retuurn the index of the passed object in the array
+	 */
 	int indexOf(const Object &obj) const;
 };
 
@@ -96,16 +114,47 @@ private:
 	bool _lookHelp;
 	bool _loadingSavedGame;
 
+	/**
+	 * Loads the data associated for a given scene. The .BGD file's format is:
+	 * BGHEADER: Holds an index for the rest of the file
+	 * STRUCTS:  The objects for the scene
+	 * IMAGES:   The graphic information for the structures
+	 *
+	 * The _misc field of the structures contains the number of the graphic image
+	 * that it should point to after loading; _misc is then set to 0.
+	 */
 	bool loadScene(const Common::String &filename);
 
+	/**
+	 * Set objects to their current persistent state. This includes things such as
+	 * opening or moving them
+	 */
 	void checkSceneStatus();
 
+	/**
+	 * Checks scene objects against the player's inventory items. If there are any
+	 * matching names, it means the given item has already been picked up, and should
+	 * be hidden in the scene.
+	 */
 	void checkInventory();
 
+	/**
+	 * Set up any entrance co-ordinates or entrance canimations, and then transition
+	 * in the scene
+	 */
 	void transitionToScene();
 
+	/**
+	 * Checks all the background shapes. If a background shape is animating,
+	 * it will flag it as needing to be drawn. If a non-animating shape is
+	 * colliding with another shape, it will also flag it as needing drawing
+	 */
 	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
 
+	/**
+	 * Restores objects to the correct status. This ensures that things like being opened or moved
+	 * will remain the same on future visits to the scene
+	 */
 	void saveSceneStatus();
 public:
 	int _currentScene;
@@ -143,32 +192,80 @@ public:
 	Scene(SherlockEngine *vm);
 	~Scene();
 
+	/**
+	 * Handles loading the scene specified by _goToScene
+	 */
 	void selectScene();
 
+	/**
+	 * Fres all the graphics and other dynamically allocated data for the scene
+	 */
 	void freeScene();
 
+	/**
+	 * Check the scene's objects against the game flags. If false is passed,
+	 * it means the scene has just been loaded. A value of true means that the scene
+	 * is in use (ie. not just loaded)
+	 */
 	void checkSceneFlags(bool mode);
 
+	/**
+	 * Check whether the passed area intersects with one of the scene's exits
+	 */
 	Exit *checkForExit(const Common::Rect &r);
 
+	/**
+	 * Attempt to start a canimation sequence. It will load the requisite graphics, and
+	 * then copy the canim object into the _canimShapes array to start the animation.
+	 *
+	 * @param cAnimNum		The canim object within the current scene
+	 * @param playRate		Play rate. 0 is invalid; 1=normal speed, 2=1/2 speed, etc.
+	 *		A negative playRate can also be specified to play the animation in reverse
+	 */
 	int startCAnim(int cAnimNum, int playRate);
 
+	/**
+	 * Scans through the object list to find one with a matching name, and will
+	 * call toggleHidden with all matches found. Returns the numer of matches found
+	 */
 	int toggleObject(const Common::String &name);
 
+	/**
+	 * Animate all objects and people.
+	 */
 	void doBgAnim();
 
-	void clearInfo();
-
+	/**
+	 * Attempts to find a background shape within the passed bounds. If found,
+	 * it will return the shape number, or -1 on failure.
+	 */
 	int findBgShape(const Common::Rect &r);
 
+	/**
+	 * Checks to see if the given position in the scene belongs to a given zone type.
+	 * If it is, the zone is activated and used just like a TAKL zone or aFLAG_SET zone.
+	 */
 	int checkForZones(const Common::Point &pt, int zoneType);
 
+	/**
+	 * Check which zone the the given position is located in.
+	 */
 	int whichZone(const Common::Point &pt);
 
+	/**
+	 * Returns the index of the closest zone to a given point.
+	 */
 	int closestZone(const Common::Point &pt);
 
+	/**
+	 * Update the screen back buffer with all of the scene objects which need
+	 * to be drawn
+	 */
 	void updateBackground();
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index f43bf17288..583ac5b485 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -49,9 +49,6 @@ Screen::~Screen() {
 	delete _font;
 }
 
-/**
- * Set the font to use for writing text on the screen
- */
 void Screen::setFont(int fontNumb) {
 	// Interactive demo doesn't use fonts
 	if (!_vm->_interactiveFl)
@@ -70,9 +67,6 @@ void Screen::setFont(int fontNumb) {
 		_fontHeight = MAX((uint16)_fontHeight, (*_font)[idx]._frame.h);
 }
 
-/**
- * Handles updating any dirty areas of the screen Surface object to the physical screen
- */
 void Screen::update() {
 	// Merge the dirty rects
 	mergeDirtyRects();
@@ -91,23 +85,14 @@ void Screen::update() {
 	_dirtyRects.clear();
 }
 
-/**
- * Return the currently active palette
- */
 void Screen::getPalette(byte palette[PALETTE_SIZE]) {
 	g_system->getPaletteManager()->grabPalette(palette, 0, PALETTE_COUNT);
 }
 
-/**
- * Set the palette
- */
 void Screen::setPalette(const byte palette[PALETTE_SIZE]) {
 	g_system->getPaletteManager()->setPalette(palette, 0, PALETTE_COUNT);
 }
 
-/**
- * Fades from the currently active palette to the passed palette
- */
 int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
 	int total = 0;
 	byte tempPalette[PALETTE_SIZE];
@@ -132,9 +117,6 @@ int Screen::equalizePalette(const byte palette[PALETTE_SIZE]) {
 	return total;
 }
 
-/**
- * Fade out the palette to black
- */
 void Screen::fadeToBlack(int speed) {
 	byte tempPalette[PALETTE_SIZE];
 	Common::fill(&tempPalette[0], &tempPalette[PALETTE_SIZE], 0);
@@ -147,9 +129,6 @@ void Screen::fadeToBlack(int speed) {
 	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
 }
 
-/**
- * Fade in a given palette
- */
 void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) {
 	int count = 50;
 	while (equalizePalette(palette) && --count) {
@@ -159,18 +138,11 @@ void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) {
 	setPalette(palette);
 }
 
-/**
- * Adds a rectangle to the list of modified areas of the screen during the
- * current frame
- */
 void Screen::addDirtyRect(const Common::Rect &r) {
 	_dirtyRects.push_back(r);
 	assert(r.width() > 0 && r.height() > 0);
 }
 
-/**
- * Merges together overlapping dirty areas of the screen
- */
 void Screen::mergeDirtyRects() {
 	Common::List<Common::Rect>::iterator rOuter, rInner;
 
@@ -195,9 +167,6 @@ void Screen::mergeDirtyRects() {
 	}
 }
 
-/**
- * Returns the union of two dirty area rectangles
- */
 bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2) {
 	destRect = src1;
 	destRect.extend(src2);
@@ -205,9 +174,6 @@ bool Screen::unionRectangle(Common::Rect &destRect, const Common::Rect &src1, co
 	return !destRect.isEmpty();
 }
 
-/**
- * Do a random pixel transition in from _backBuffer surface to the screen
- */
 void Screen::randomTransition() {
 	Events &events = *_vm->_events;
 	const int TRANSITION_MULTIPLIER = 0x15a4e35;
@@ -234,9 +200,6 @@ void Screen::randomTransition() {
 	blitFrom(*_backBuffer);
 }
 
-/**
- * Transition to the surface from _backBuffer using a vertical transition
- */
 void Screen::verticalTransition() {
 	Events &events = *_vm->_events;
 
@@ -259,9 +222,6 @@ void Screen::verticalTransition() {
 	}
 }
 
-/**
- * Copies a section of the second back buffer into the main back buffer
- */
 void Screen::restoreBackground(const Common::Rect &r) {
 	if (r.width() > 0 && r.height() > 0) {
 		Common::Rect tempRect = r;
@@ -272,16 +232,10 @@ void Screen::restoreBackground(const Common::Rect &r) {
 	}
 }
 
-/**
- * Copies a given area to the screen
- */
 void Screen::slamArea(int16 xp, int16 yp, int16 width, int16 height) {
 	slamRect(Common::Rect(xp, yp, xp + width, yp + height));
 }
 
-/**
- * Copies a given area to the screen
- */
 void Screen::slamRect(const Common::Rect &r) {
 	if (r.width() && r.height() > 0) {
 		Common::Rect tempRect = r;
@@ -292,10 +246,6 @@ void Screen::slamRect(const Common::Rect &r) {
 	}
 }
 
-/**
- * Copy an image from the back buffer to the screen, taking care of both the
- * new area covered by the shape as well as the old area, which must be restored
- */
 void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
 		int16 *xp, int16 *yp, int16 *width, int16 *height) {
 	Common::Point imgPos = pt + frame->_offset;
@@ -322,10 +272,6 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
 	*height = newBounds.height();
 }
 
-/**
- * Prints the text passed onto the back buffer at the given position and color.
- * The string is then blitted to the screen
- */
 void Screen::print(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
 	va_list args;
@@ -354,9 +300,6 @@ void Screen::print(const Common::Point &pt, byte color, const char *formatStr, .
 	slamRect(textBounds);
 }
 
-/**
- * Print a strings onto the back buffer without blitting it to the screen
- */
 void Screen::gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
 	va_list args;
@@ -368,10 +311,6 @@ void Screen::gPrint(const Common::Point &pt, byte color, const char *formatStr,
 	writeString(str, pt, color);
 }
 
-
-/**
- * Returns the width of a string in pixels
- */
 int Screen::stringWidth(const Common::String &str) {
 	int width = 0;
 
@@ -381,9 +320,6 @@ int Screen::stringWidth(const Common::String &str) {
 	return width;
 }
 
-/**
- * Returns the width of a character in pixels
- */
 int Screen::charWidth(char c) {
 	if (c == ' ')
 		return 5;
@@ -393,9 +329,6 @@ int Screen::charWidth(char c) {
 		return 0;
 }
 
-/**
- * Draws the given string into the back buffer using the images stored in _font
- */
 void Screen::writeString(const Common::String &str, const Common::Point &pt, byte color) {
 	Common::Point charPos = pt;
 
@@ -411,17 +344,11 @@ void Screen::writeString(const Common::String &str, const Common::Point &pt, byt
 	}
 }
 
-/**
- * Fills an area on the back buffer, and then copies it to the screen
- */
 void Screen::vgaBar(const Common::Rect &r, int color) {
 	_backBuffer->fillRect(r, color);
 	slamRect(r);
 }
 
-/**
- * Draws a button for use in the inventory, talk, and examine dialogs.
- */
 void Screen::makeButton(const Common::Rect &bounds, int textX,
 		const Common::String &str) {
 
@@ -437,10 +364,6 @@ void Screen::makeButton(const Common::Rect &bounds, int textX,
 		COMMAND_FOREGROUND, "%s", str.c_str() + 1);
 }
 
-/**
- * Prints an interface command with the first letter highlighted to indicate
- * what keyboard shortcut is associated with it
- */
 void Screen::buttonPrint(const Common::Point &pt, byte color, bool slamIt,
 		const Common::String &str) {
 	int xStart = pt.x - stringWidth(str) / 2;
@@ -463,9 +386,6 @@ void Screen::buttonPrint(const Common::Point &pt, byte color, bool slamIt,
 	}
 }
 
-/**
- * Draw a panel in the back buffer with a raised area effect around the edges
- */
 void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->fillRect(r, BUTTON_MIDDLE);
 	_backBuffer->hLine(r.left, r.top, r.right - 2, BUTTON_TOP);
@@ -479,10 +399,6 @@ void Screen::makePanel(const Common::Rect &r) {
 	_backBuffer->hLine(r.left + 1, r.bottom - 2, r.right - 1, BUTTON_BOTTOM);
 }
 
-/**
- * Draw a field in the back buffer with a raised area effect around the edges,
- * suitable for text input.
- */
 void Screen::makeField(const Common::Rect &r) {
 	_backBuffer->fillRect(r, BUTTON_MIDDLE);
 	_backBuffer->hLine(r.left, r.top, r.right - 1, BUTTON_BOTTOM);
@@ -491,9 +407,6 @@ void Screen::makeField(const Common::Rect &r) {
 	_backBuffer->vLine(r.right - 1, r.top + 1, r.bottom - 2, BUTTON_TOP);
 }
 
-/**
- * Sets the active back buffer pointer to a restricted sub-area of the first back buffer
- */
 void Screen::setDisplayBounds(const Common::Rect &r) {
 	assert(r.left == 0 && r.top == 0);
 	_sceneSurface.setPixels(_backBuffer1.getPixels());
@@ -503,24 +416,15 @@ void Screen::setDisplayBounds(const Common::Rect &r) {
 	_backBuffer = &_sceneSurface;
 }
 
-/**
- * Resets the active buffer pointer to point back to the full first back buffer
- */
 void Screen::resetDisplayBounds() {
 	_backBuffer = &_backBuffer1;
 }
 
-/**
- * Return the size of the current display window
- */
 Common::Rect Screen::getDisplayBounds() {
 	return (_backBuffer == &_sceneSurface) ? Common::Rect(0, 0, _sceneSurface.w, _sceneSurface.h) :
 		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void Screen::synchronize(Common::Serializer &s) {
 	int fontNumb = _fontNumber;
 	s.syncAsByte(fontNumb);
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 2103588fe0..0369422bc3 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -66,12 +66,25 @@ private:
 	int _fontHeight;
 	Surface _sceneSurface;
 
+	/**
+	 * Merges together overlapping dirty areas of the screen
+	 */
 	void mergeDirtyRects();
 
+	/**
+	 * Returns the union of two dirty area rectangles
+	 */
 	bool unionRectangle(Common::Rect &destRect, const Common::Rect &src1, const Common::Rect &src2);
 
+	/**
+	 * Draws the given string into the back buffer using the images stored in _font
+	 */
 	void writeString(const Common::String &str, const Common::Point &pt, byte color);
 protected:
+	/**
+	 * Adds a rectangle to the list of modified areas of the screen during the
+	 * current frame
+	 */
 	virtual void addDirtyRect(const Common::Rect &r);
 public:
 	Surface _backBuffer1, _backBuffer2;
@@ -83,54 +96,141 @@ public:
 	Screen(SherlockEngine *vm);
 	virtual ~Screen();
 
+	/**
+	 * Set the font to use for writing text on the screen
+	 */
 	void setFont(int fontNumber);
 
+	/**
+	 * Handles updating any dirty areas of the screen Surface object to the physical screen
+	 */
 	void update();
 
+	/**
+	 * Return the currently active palette
+	 */
 	void getPalette(byte palette[PALETTE_SIZE]);
 
+	/**
+	 * Set the palette
+	 */
 	void setPalette(const byte palette[PALETTE_SIZE]);
 
+	/**
+	 * Fades from the currently active palette to the passed palette
+	 */
 	int equalizePalette(const byte palette[PALETTE_SIZE]);
 
+	/**
+	 * Fade out the palette to black
+	 */
 	void fadeToBlack(int speed = 2);
 
+	/**
+	 * Fade in a given palette
+	 */
 	void fadeIn(const byte palette[PALETTE_SIZE], int speed = 2);
 
+	/**
+	 * Do a random pixel transition in from _backBuffer surface to the screen
+	 */
 	void randomTransition();
 
+	/**
+	 * Transition to the surface from _backBuffer using a vertical transition
+	 */
 	void verticalTransition();
 
+	/**
+	 * Prints the text passed onto the back buffer at the given position and color.
+	 * The string is then blitted to the screen
+	 */
 	void print(const Common::Point &pt, byte color, const char *formatStr, ...);
+
+	/**
+	 * Print a strings onto the back buffer without blitting it to the screen
+	 */
 	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...);
 
+	/**
+	 * Copies a section of the second back buffer into the main back buffer
+	 */
 	void restoreBackground(const Common::Rect &r);
 
+	/**
+	 * Copies a given area to the screen
+	 */
 	void slamArea(int16 xp, int16 yp, int16 width, int16 height);
+
+	/**
+	 * Copies a given area to the screen
+	 */
 	void slamRect(const Common::Rect &r);
 
+	/**
+	 * Copy an image from the back buffer to the screen, taking care of both the
+	 * new area covered by the shape as well as the old area, which must be restored
+	 */
 	void flushImage(ImageFrame *frame, const Common::Point &pt,
 		int16 *xp, int16 *yp, int16 *width, int16 *height);
 
+	/**
+	 * Returns the width of a string in pixels
+	 */
 	int stringWidth(const Common::String &str);
 
+	/**
+	 * Returns the width of a character in pixels
+	 */
 	int charWidth(char c);
 
+	/**
+	 * Fills an area on the back buffer, and then copies it to the screen
+	 */
 	void vgaBar(const Common::Rect &r, int color);
 
+	/**
+	 * Draws a button for use in the inventory, talk, and examine dialogs.
+	 */
 	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
 
+	/**
+	 * Prints an interface command with the first letter highlighted to indicate
+	 * what keyboard shortcut is associated with it
+	 */
 	void buttonPrint(const Common::Point &pt, byte color, bool slamIt, const Common::String &str);
 
+	/**
+	 * Draw a panel in the back buffer with a raised area effect around the edges
+	 */
 	void makePanel(const Common::Rect &r);
+
+	/**
+	 * Draw a field in the back buffer with a raised area effect around the edges,
+	 * suitable for text input.
+	 */
 	void makeField(const Common::Rect &r);
 
+	/**
+	 * Sets the active back buffer pointer to a restricted sub-area of the first back buffer
+	 */
 	void setDisplayBounds(const Common::Rect &r);
+
+	/**
+	 * Resets the active buffer pointer to point back to the full first back buffer
+	 */
 	void resetDisplayBounds();
+
+	/**
+	 * Return the size of the current display window
+	 */
 	Common::Rect getDisplayBounds();
 
 	int fontNumber() const { return _fontNumber; }
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index 036177adbe..9f1549a0b8 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -52,9 +52,6 @@ static const char *const SETUP_NAMES[12] = {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Draws the interface for the settings window
- */
 void Settings::drawInteface(bool flag) {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
@@ -135,9 +132,6 @@ void Settings::drawInteface(bool flag) {
 	}
 }
 
-/**
- * Draws the buttons for the settings dialog
- */
 int Settings::drawButtons(const Common::Point &pt, int _key) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -209,13 +203,6 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 	return found;
 }
 
-
-/**
-* Handles input when the settings window is being shown
-* @remarks		Whilst this would in theory be better in the Journal class, since it displays in
-*		the user interface, it uses so many internal UI fields, that it sort of made some sense
-*		to put it in the UserInterface class.
-*/
 void Settings::show(SherlockEngine *vm) {
 	Events &events = *vm->_events;
 	People &people = *vm->_people;
diff --git a/engines/sherlock/settings.h b/engines/sherlock/settings.h
index 25d27d48df..fc5fb2959f 100644
--- a/engines/sherlock/settings.h
+++ b/engines/sherlock/settings.h
@@ -36,10 +36,22 @@ private:
 
 	Settings(SherlockEngine *vm) : _vm(vm) {}
 
+	/**
+	 * Draws the interface for the settings window
+	 */
 	void drawInteface(bool flag);
 
+	/**
+	 * Draws the buttons for the settings dialog
+	 */
 	int drawButtons(const Common::Point &pt, int key);
 public:
+	/**
+	 * Handles input when the settings window is being shown
+	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+	 *		the user interface, it uses so many internal UI fields, that it sort of made some sense
+	 *		to put it in the UserInterface class.
+	 */
 	static void show(SherlockEngine *vm);
 };
 
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index fd5c9a84d5..d4644d4d9d 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -69,9 +69,6 @@ SherlockEngine::~SherlockEngine() {
 	delete _res;
 }
 
-/**
- * Does basic initialization of the game engine
- */
 void SherlockEngine::initialize() {
 	initGraphics(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT, false);
 
@@ -108,9 +105,6 @@ void SherlockEngine::initialize() {
 	loadConfig();
 }
 
-/**
- * Main method for running the game
- */
 Common::Error SherlockEngine::run() {
 	// Initialize the engine
 	initialize();
@@ -160,9 +154,6 @@ Common::Error SherlockEngine::run() {
 	return Common::kNoError;
 }
 
-/**
- * Main loop for displaying a scene and handling all that occurs within it
- */
 void SherlockEngine::sceneLoop() {
 	while (!shouldQuit() && _scene->_goToScene == -1) {
 		// See if a script needs to be completed from either a goto room code,
@@ -187,9 +178,6 @@ void SherlockEngine::sceneLoop() {
 
 }
 
-/**
- * Handle all player input
- */
 void SherlockEngine::handleInput() {
 	_canLoadSave = true;
 	_events->pollEventsAndWait();
@@ -201,11 +189,6 @@ void SherlockEngine::handleInput() {
 	_ui->handleInput();
 }
 
-/**
- * Read the state of a global flag
- * @remarks		If a negative value is specified, it will return the inverse value
- *		of the positive flag number
- */
 bool SherlockEngine::readFlags(int flagNum) {
 	bool value = _flags[ABS(flagNum)];
 	if (flagNum < 0)
@@ -214,19 +197,12 @@ bool SherlockEngine::readFlags(int flagNum) {
 	return value;
 }
 
-/**
- * Sets a global flag to either true or false depending on whether the specified
- * flag is positive or negative
- */
 void SherlockEngine::setFlags(int flagNum) {
 	_flags[ABS(flagNum)] = flagNum >= 0;
 
 	_scene->checkSceneFlags(true);
 }
 
-/**
- * Load game configuration esttings
- */
 void SherlockEngine::loadConfig() {
 	// Load sound settings
 	syncSoundSettings();
@@ -240,9 +216,6 @@ void SherlockEngine::loadConfig() {
 	_people->_portraitsOn = ConfMan.getBool("portraits_on");
 }
 
-/**
- * Saves game configuration information
- */
 void SherlockEngine::saveConfig() {
 	ConfMan.setBool("mute", !_sound->_digitized);
 	ConfMan.setBool("music_mute", !_sound->_music);
@@ -257,9 +230,6 @@ void SherlockEngine::saveConfig() {
 	ConfMan.flushToDisk();
 }
 
-/**
- * Called by the engine when sound settings are updated
- */
 void SherlockEngine::syncSoundSettings() {
 	Engine::syncSoundSettings();
 
@@ -267,39 +237,24 @@ void SherlockEngine::syncSoundSettings() {
 	_sound->syncSoundSettings();
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void SherlockEngine::synchronize(Common::Serializer &s) {
 	for (uint idx = 0; idx < _flags.size(); ++idx)
 		s.syncAsByte(_flags[idx]);
 }
 
-/**
- * Returns true if a savegame can be loaded
- */
 bool SherlockEngine::canLoadGameStateCurrently() {
 	return _canLoadSave;
 }
 
-/**
- * Returns true if the game can be saved
- */
 bool SherlockEngine::canSaveGameStateCurrently() {
 	return _canLoadSave;
 }
 
-/**
- * Called by the GMM to load a savegame
- */
 Common::Error SherlockEngine::loadGameState(int slot) {
 	_saves->loadGame(slot);
 	return Common::kNoError;
 }
 
-/**
- * Called by the GMM to save the game
- */
 Common::Error SherlockEngine::saveGameState(int slot, const Common::String &desc) {
 	_saves->saveGame(slot, desc);
 	return Common::kNoError;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 830a255f5f..24a72076ef 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -68,18 +68,33 @@ class Resource;
 
 class SherlockEngine : public Engine {
 private:
+	/**
+	 * Main loop for displaying a scene and handling all that occurs within it
+	 */
 	void sceneLoop();
 
+	/**
+	 * Handle all player input
+	 */
 	void handleInput();
 
+	/**
+	 * Load game configuration esttings
+	 */
 	void loadConfig();
 protected:
+	/**
+	 * Does basic initialization of the game engine
+	 */
 	virtual void initialize();
 
 	virtual void showOpening() = 0;
 
 	virtual void startScene() {}
 
+	/**
+	 * Returns a list of features the game itself supports
+	 */
 	virtual bool hasFeature(EngineFeature f) const;
 public:
 	const SherlockGameDescription *_gameDescription;
@@ -108,29 +123,77 @@ public:
 	SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~SherlockEngine();
 
+	/**
+	 * Main method for running the game
+	 */
 	virtual Common::Error run();
 
+	/**
+	 * Returns true if a savegame can be loaded
+	 */
 	virtual bool canLoadGameStateCurrently();
+
+	/**
+	 * Returns true if the game can be saved
+	 */
 	virtual bool canSaveGameStateCurrently();
+
+	/**
+	 * Called by the GMM to load a savegame
+	 */
 	virtual Common::Error loadGameState(int slot);
+
+	/**
+	 * Called by the GMM to save the game
+	 */
 	virtual Common::Error saveGameState(int slot, const Common::String &desc);
+
+	/**
+	 * Called by the engine when sound settings are updated
+	 */
 	virtual void syncSoundSettings();
+
+	/**
+	 * Returns whether the version is a demo
+	 */
 	virtual bool isDemo() const;
 
+	/**
+	 * Returns the Id of the game
+	 */
 	GameType getGameID() const;
-	Common::Language getLanguage() const;
-	Common::Platform getPlatform() const;
 
-	Common::String getGameFile(int fileType);
+	/**
+	 * Returns the platform the game's datafiles are for
+	 */
+	Common::Platform getPlatform() const;
 
+	/**
+	 * Return a random number
+	 */
 	int getRandomNumber(int limit) { return _randomSource.getRandomNumber(limit - 1); }
 
+	/**
+	 * Read the state of a global flag
+	 * @remarks		If a negative value is specified, it will return the inverse value
+	 *		of the positive flag number
+	 */
 	bool readFlags(int flagNum);
 
+	/**
+	 * Sets a global flag to either true or false depending on whether the specified
+	 * flag is positive or negative
+	 */
 	void setFlags(int flagNum);
 
+	/**
+	 * Saves game configuration information
+	 */
 	void saveConfig();
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 205178c0ec..2ed6a1bbe8 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -76,9 +76,6 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	}
 }
 
-/**
- * Saves sound-related settings
- */
 void Sound::syncSoundSettings() {
 	_digitized = !ConfMan.getBool("mute");
 	_music = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index bff50d7a07..689e615a36 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -61,19 +61,61 @@ public:
 public:
 	Sound(SherlockEngine *vm, Audio::Mixer *mixer);
 
+	/**
+	 * Saves sound-related settings
+	 */
 	void syncSoundSettings();
+
+	/**
+	 * Load a sound
+	 */
 	void loadSound(const Common::String &name, int priority);
+	
+	/**
+	 * Play the sound in the specified resource
+	 */
 	bool playSound(const Common::String &name, WaitType waitType, int priority = 100, const char *libraryFilename = nullptr);
+	
+	/**
+	 * Play a previously loaded sound
+	 */
 	void playLoadedSound(int bufNum, WaitType waitType);
+	
+	/**
+	 * Free any previously loaded sounds
+	 */
 	void freeLoadedSounds();
+	
+	/**
+	 * Stop playing any active sound
+	 */
 	void stopSound();
 
+	/**
+	 * Load a specified song
+	 */
 	int loadSong(int songNumber);
+
+	/**
+	 * Start playing a song
+	 */
 	void startSong();
+	
+	/**
+	 * Free any currently loaded song
+	 */
 	void freeSong();
 	
+	/**
+	 * Play the specified music resource
+	 */
 	void playMusic(const Common::String &name);
+
+	/**
+	 * Stop playing the music
+	 */
 	void stopMusic();
+	
 	void stopSndFuncPtr(int v1, int v2);
 	void waitTimerRoland(uint time);
 	void freeDigiSound();
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index eeaf304958..b54f43bf52 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -39,10 +39,6 @@ Surface::~Surface() {
 		free();
 }
 
-/**
- * Sets up an internal surface with the specified dimensions that will be automatically freed
- * when the surface object is destroyed
- */
 void Surface::create(uint16 width, uint16 height) {
 	if (_freePixels)
 		free();
@@ -51,23 +47,14 @@ void Surface::create(uint16 width, uint16 height) {
 	_freePixels = true;
 }
 
-/**
- * Copy a surface into this one
- */
 void Surface::blitFrom(const Graphics::Surface &src) {
 	blitFrom(src, Common::Point(0, 0));
 }
 
-/**
- * Draws a surface at a given position within this surface
- */
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
 	blitFrom(src, pt, Common::Rect(0, 0, src.w, src.h));
 }
 
-/**
- * Draws a sub-section of a surface at a given position within this surface
- */
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds) {
 	Common::Rect srcRect = srcBounds;
@@ -80,17 +67,11 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 	}
 }
 
-/**
-* Draws an image frame at a given position within this surface with transparency
-*/
 void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
 }
 
-/**
-* Draws a surface at a given position within this surface with transparency
-*/
 void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
@@ -125,24 +106,15 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 	}
 }
 
-/**
- * Fill a given area of the surface with a given color
- */
 void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
 	fillRect(Common::Rect(x1, y1, x2, y2), color);
 }
 
-/**
- * Fill a given area of the surface with a given color
- */
 void Surface::fillRect(const Common::Rect &r, byte color) {
 	Graphics::Surface::fillRect(r, color);
 	addDirtyRect(r);
 }
 
-/**
- * Clips the given source bounds so the passed destBounds will be entirely on-screen
- */
 bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
 	if (destBounds.left >= this->w || destBounds.top >= this->h ||
 		destBounds.right <= 0 || destBounds.bottom <= 0)
@@ -172,9 +144,6 @@ bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
 	return true;
 }
 
-/**
- * Clear the screen
- */
 void Surface::clear() {
 	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
 }
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index b2a759aa8d..7049d8ae76 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -33,6 +33,9 @@ class Surface : public Graphics::Surface {
 private:
 	bool _freePixels;
 
+	/**
+	 * Clips the given source bounds so the passed destBounds will be entirely on-screen
+	 */
 	bool clip(Common::Rect &srcBounds, Common::Rect &destBounds);
 protected:
 	virtual void addDirtyRect(const Common::Rect &r) {}
@@ -41,19 +44,53 @@ public:
 	Surface();
 	virtual ~Surface();
 
+	/**
+	 * Sets up an internal surface with the specified dimensions that will be automatically freed
+	 * when the surface object is destroyed
+	 */
 	void create(uint16 width, uint16 height);
+
+	/**
+	 * Copy a surface into this one
+	 */
 	void blitFrom(const Graphics::Surface &src);
+
+	/**
+	 * Draws a surface at a given position within this surface
+	 */
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
+
+	/**
+	 * Draws a sub-section of a surface at a given position within this surface
+	 */
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds);
+	
+	/**
+	 * Draws an image frame at a given position within this surface with transparency
+	 */
 	void transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 		bool flipped = false, int overrideColor = 0);
+	
+	/**
+	 * Draws a surface at a given position within this surface with transparency
+	 */
 	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		bool flipped = false, int overrideColor = 0);
 
+	/**
+	 * Fill a given area of the surface with a given color
+	 */
 	void fillRect(int x1, int y1, int x2, int y2, byte color);
+	
+	/**
+	 * Fill a given area of the surface with a given color
+	 */
 	void fillRect(const Common::Rect &r, byte color);
 
+	/**
+	 * Clear the screen
+	 */
 	void clear();
 };
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index fd0b7cb378..734aa76e0a 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -36,9 +36,6 @@ SequenceEntry::SequenceEntry() {
 
 /*----------------------------------------------------------------*/
 
-/**
- * Load the data for a single statement within a talk file
- */
 void Statement::synchronize(Common::SeekableReadStream &s) {
 	int length;
 
@@ -108,9 +105,6 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_scriptSaveIndex = -1;
 }
 
-/**
- * Sets talk sequences
- */
 void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, int maxPeople) {
 	for (int idx = 0; idx < maxPeople; ++idx) {
 		STILL_SEQUENCES.push_back(TalkSequences(stillSequences));
@@ -120,14 +114,6 @@ void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, i
 	}
 }
 
-/**
- * Called whenever a conversation or item script needs to be run. For standard conversations,
- * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly
- * instead of waiting for a statement option.
- * @remarks		It seems that at some point, all item scripts were set up to use this as well.
- *	In their case, the conversation display is simply suppressed, and control is passed on to
- *	doScript to implement whatever action is required.
- */
 void Talk::talkTo(const Common::String &filename) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -450,12 +436,6 @@ void Talk::talkTo(const Common::String &filename) {
 	events.setCursor(ARROW);
 }
 
-/**
- * Main method for handling conversations when a character to talk to has been
- * selected. It will make Holmes walk to the person to talk to, draws the
- * interface window for the conversation and passes on control to give the
- * player a list of options to make a selection from
- */
 void Talk::talk(int objNum) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -549,17 +529,10 @@ void Talk::talk(int objNum) {
 	}
 }
 
-/**
- * Clear loaded talk data
- */
 void Talk::freeTalkVars() {
 	_statements.clear();
 }
 
-/**
- * Opens the talk file 'talk.tlk' and searches the index for the specified
- * conversation. If found, the data for that conversation is loaded
- */
 void Talk::loadTalkFile(const Common::String &filename) {
 	Resources &res = *_vm->_res;
 	Sound &sound = *_vm->_sound;
@@ -596,9 +569,6 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	setTalkMap();
 }
 
-/**
- * Remove any voice commands from a loaded statement list
- */
 void Talk::stripVoiceCommands() {
 	for (uint sIdx = 0; sIdx < _statements.size(); ++sIdx) {
 		Statement &statement = _statements[sIdx];
@@ -622,9 +592,6 @@ void Talk::stripVoiceCommands() {
 	}
 }
 
-/**
- * Form a table of the display indexes for statements
- */
 void Talk::setTalkMap() {
 	int statementNum = 0;
 
@@ -642,9 +609,6 @@ void Talk::setTalkMap() {
 	}
 }
 
-/**
- * Draws the interface for conversation display
- */
 void Talk::drawInterface() {
 	Screen &screen = *_vm->_screen;
 	Surface &bb = *screen._backBuffer;
@@ -673,10 +637,6 @@ void Talk::drawInterface() {
 	}
 }
 
-/**
- * Display a list of statements in a window at the bottom of the screen that the
- * player can select from.
- */
 bool Talk::displayTalk(bool slamIt) {
 	Screen &screen = *_vm->_screen;
 	int yp = CONTROLS_Y + 14;
@@ -761,9 +721,6 @@ bool Talk::displayTalk(bool slamIt) {
 	return done;
 }
 
-/**
- * Prints a single conversation option in the interface window
- */
 int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt) {
 	Screen &screen = *_vm->_screen;
 	int idx = lineNum;
@@ -852,17 +809,10 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
 	return lineY;
 }
 
-/**
- * Clears the stack of pending object sequences associated with speakers in the scene
- */
 void Talk::clearSequences() {
 	_sequenceStack.clear();
 }
 
-/**
- * Pulls a background object sequence from the sequence stack and restore's the
- * object's sequence
- */
 void Talk::pullSequence() {
 	Scene &scene = *_vm->_scene;
 
@@ -885,10 +835,6 @@ void Talk::pullSequence() {
 	}
 }
 
-/**
- * Push the sequence of a background object that's an NPC that needs to be
- * saved onto the sequence stack.
- */
 void Talk::pushSequence(int speaker) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
@@ -918,9 +864,6 @@ void Talk::pushSequence(int speaker) {
 		error("script stack overflow");
 }
 
-/**
- * Change the sequence of the scene background object associated with the current speaker.
- */
 void Talk::setSequence(int speaker) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
@@ -950,10 +893,6 @@ void Talk::setSequence(int speaker) {
 	}
 }
 
-/**
- * Change the sequence of a background object corresponding to a given speaker.
- * The new sequence will display the character as "listening"
- */
 void Talk::setStillSeq(int speaker) {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
@@ -983,10 +922,6 @@ void Talk::setStillSeq(int speaker) {
 	}
 }
 
-/**
- * Parses a reply for control codes and display text. The found text is printed within
- * the text window, handles delays, animations, and animating portraits.
- */
 void Talk::doScript(const Common::String &script) {
 	Animation &anim = *_vm->_animation;
 	Events &events = *_vm->_events;
@@ -1631,10 +1566,6 @@ void Talk::doScript(const Common::String &script) {
 	}
 }
 
-/**
- * When the talk window has been displayed, waits a period of time proportional to
- * the amount of text that's been displayed
- */
 int Talk::waitForMore(int delay) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
@@ -1714,9 +1645,6 @@ int Talk::waitForMore(int delay) {
 	return key2;
 }
 
-/**
- * Pops an entry off of the script stack
- */
 void Talk::popStack() {
 	if (!_scriptStack.empty()) {
 		ScriptStackEntry scriptEntry = _scriptStack.pop();
@@ -1727,9 +1655,6 @@ void Talk::popStack() {
 	}
 }
 
-/**
- * Synchronize the data for a savegame
- */
 void Talk::synchronize(Common::Serializer &s) {
 	for (int idx = 0; idx < MAX_TALK_FILES; ++idx) {
 		TalkHistoryEntry &he = _talkHistory[idx];
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index b1a735827c..71f093f66a 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -99,6 +99,9 @@ struct Statement {
 	int _talkMap;
 	Common::Rect _talkPos;
 
+	/**
+	 * Load the data for a single statement within a talk file
+	 */
 	void synchronize(Common::SeekableReadStream &s);
 };
 
@@ -141,15 +144,37 @@ private:
 	int _talkToFlag;
 	int _scriptSaveIndex;
 private:
+	/**
+	 * Remove any voice commands from a loaded statement list
+	 */
 	void stripVoiceCommands();
+	
+	/**
+	 * Form a table of the display indexes for statements
+	 */
 	void setTalkMap();
 
+	/**
+	 * Display a list of statements in a window at the bottom of the screen that the
+	 * player can select from.
+	 */
 	bool displayTalk(bool slamIt);
 
+	/**
+	 * Prints a single conversation option in the interface window
+	 */
 	int talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt);
 
+	/**
+	 * Parses a reply for control codes and display text. The found text is printed within
+	 * the text window, handles delays, animations, and animating portraits.
+	 */
 	void doScript(const Common::String &script);
 
+	/**
+	 * When the talk window has been displayed, waits a period of time proportional to
+	 * the amount of text that's been displayed
+	 */
 	int waitForMore(int delay);
 public:
 	bool _talkToAbort;
@@ -161,30 +186,90 @@ public:
 	int _converseNum;
 public:
 	Talk(SherlockEngine *vm);
+
+	/**
+	 * Sets talk sequences
+	 */
 	void setSequences(const byte *talkSequences, const byte *stillSequences,
 		int maxPeople);
 
 	Statement &operator[](int idx) { return _statements[idx]; }
 
+	/**
+	 * Called whenever a conversation or item script needs to be run. For standard conversations,
+	 * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly
+	 * instead of waiting for a statement option.
+	 * @remarks		It seems that at some point, all item scripts were set up to use this as well.
+	 *	In their case, the conversation display is simply suppressed, and control is passed on to
+	 *	doScript to implement whatever action is required.
+	 */
 	void talkTo(const Common::String &filename);
 
+	/**
+	 * Main method for handling conversations when a character to talk to has been
+	 * selected. It will make Holmes walk to the person to talk to, draws the
+	 * interface window for the conversation and passes on control to give the
+	 * player a list of options to make a selection from
+	 */
 	void talk(int objNum);
 
+	/**
+	 * Clear loaded talk data
+	 */
 	void freeTalkVars();
 
+	/**
+	 * Draws the interface for conversation display
+	 */
 	void drawInterface();
 
+	/**
+	 * Opens the talk file 'talk.tlk' and searches the index for the specified
+	 * conversation. If found, the data for that conversation is loaded
+	 */
 	void loadTalkFile(const Common::String &filename);
 
+	/**
+	 * Change the sequence of a background object corresponding to a given speaker.
+	 * The new sequence will display the character as "listening"
+	 */
 	void setStillSeq(int speaker);
+
+	/**
+	 * Clears the stack of pending object sequences associated with speakers in the scene
+	 */
 	void clearSequences();
+	
+	/**
+	 * Pulls a background object sequence from the sequence stack and restore's the
+	 * object's sequence
+	 */
 	void pullSequence();
+
+	/**
+	 * Push the sequence of a background object that's an NPC that needs to be
+	 * saved onto the sequence stack.
+	 */
 	void pushSequence(int speaker);
+	
+	/**
+	 * Change the sequence of the scene background object associated with the current speaker.
+	 */
 	void setSequence(int speaker);
+
+	/**
+	 * Returns true if the script stack is empty
+	 */
 	bool isSequencesEmpty() const { return _scriptStack.empty(); }
 
+	/**
+	 * Pops an entry off of the script stack
+	 */
 	void popStack();
 
+	/**
+	 * Synchronize the data for a savegame
+	 */
 	void synchronize(Common::Serializer &s);
 };
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ef1da3b29f..12054bd7fb 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -122,18 +122,12 @@ UserInterface::~UserInterface() {
 	delete _controlPanel;
 }
 
-/**
- * Resets the user interface
- */
 void UserInterface::reset() {
 	_oldKey = -1;
 	_help = _oldHelp = -1;
 	_oldTemp = _temp = -1;
 }
 
-/**
- * Draw the user interface onto the screen's back buffers
- */
 void UserInterface::drawInterface(int bufferNum) {
 	Screen &screen = *_vm->_screen;
 
@@ -145,9 +139,6 @@ void UserInterface::drawInterface(int bufferNum) {
 		screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
 }
 
-/**
- * Main input handler for the user interface
- */
 void UserInterface::handleInput() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -403,9 +394,6 @@ void UserInterface::handleInput() {
 	}
 }
 
-/**
- * Draws the image for a user interface button in the down/pressed state.
- */
 void UserInterface::depressButton(int num) {
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
@@ -415,10 +403,6 @@ void UserInterface::depressButton(int num) {
 	screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
 }
 
-/**
- * Draws the image for the given user interface button in the up
- * (not selected) position
- */
 void UserInterface::restoreButton(int num) {
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
@@ -434,10 +418,6 @@ void UserInterface::restoreButton(int num) {
 	}
 }
 
-/**
- * If he mouse button is pressed, then calls depressButton to draw the button
- * as pressed; if not, it will show it as released with a call to "restoreButton".
- */
 void UserInterface::pushButton(int num) {
 	Events &events = *_vm->_events;
 	_oldKey = -1;
@@ -455,11 +435,6 @@ void UserInterface::pushButton(int num) {
 	restoreButton(num);
 }
 
-/**
- * By the time this method has been called, the graphics for the button change
- * have already been drawn. This simply takes care of switching the mode around
- * accordingly
- */
 void UserInterface::toggleButton(int num) {
 	Screen &screen = *_vm->_screen;
 
@@ -488,9 +463,6 @@ void UserInterface::toggleButton(int num) {
 	}
 }
 
-/**
- * Clears the info line of the screen
- */
 void UserInterface::clearInfo() {
 	if (_infoFlag) {
 		_vm->_screen->vgaBar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19,
@@ -500,9 +472,6 @@ void UserInterface::clearInfo() {
 	}
 }
 
-/**
- * Clear any active text window
- */
 void UserInterface::clearWindow() {
 	if (_windowOpen) {
 		_vm->_screen->vgaBar(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
@@ -510,9 +479,6 @@ void UserInterface::clearWindow() {
 	}
 }
 
-/**
- * Handles counting down whilst checking for input, then clears the info line.
- */
 void UserInterface::whileMenuCounter() {
 	if (!(--_menuCounter) || _vm->_events->checkInput()) {
 		_menuCounter = 0;
@@ -521,10 +487,6 @@ void UserInterface::whileMenuCounter() {
 	}
 }
 
-/**
- * Creates a text window and uses it to display the in-depth description
- * of the highlighted object
- */
 void UserInterface::examine() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -576,9 +538,6 @@ void UserInterface::examine() {
 	}
 }
 
-/**
- * Print the name of an object in the scene
- */
 void UserInterface::lookScreen(const Common::Point &pt) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -692,9 +651,6 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 	}
 }
 
-/**
- * Gets the item in the inventory the mouse is on and display's it's description
- */
 void UserInterface::lookInv() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -720,9 +676,6 @@ void UserInterface::lookInv() {
 	}
 }
 
-/**
- * Handles input when the file list window is being displayed
- */
 void UserInterface::doEnvControl() {
 	Events &events = *_vm->_events;
 	SaveManager &saves = *_vm->_saves;
@@ -1026,9 +979,6 @@ void UserInterface::doEnvControl() {
 	}
 }
 
-/**
- * Handle input whilst the inventory is active
- */
 void UserInterface::doInvControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -1253,9 +1203,6 @@ void UserInterface::doInvControl() {
 	}
 }
 
-/**
- * Handles waiting whilst an object's description window is open.
- */
 void UserInterface::doLookControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -1317,9 +1264,6 @@ void UserInterface::doLookControl() {
 	}
 }
 
-/**
- * Handles input until one of the user interface buttons/commands is selected
- */
 void UserInterface::doMainControl() {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -1458,9 +1402,6 @@ void UserInterface::doMainControl() {
 	}
 }
 
-/**
- * Handles the input for the MOVE, OPEN, and CLOSE commands
- */
 void UserInterface::doMiscControl(int allowed) {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
@@ -1510,9 +1451,6 @@ void UserInterface::doMiscControl(int allowed) {
 	}
 }
 
-/**
- * Handles input for picking up items
- */
 void UserInterface::doPickControl() {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
@@ -1536,10 +1474,6 @@ void UserInterface::doPickControl() {
 	}
 }
 
-/**
- * Handles input when in talk mode. It highlights the buttons and available statements,
- * and handles allowing the user to click on them
- */
 void UserInterface::doTalkControl() {
 	Events &events = *_vm->_events;
 	Journal &journal = *_vm->_journal;
@@ -1790,12 +1724,6 @@ void UserInterface::doTalkControl() {
 	}
 }
 
-/**
- * Handles events when the Journal is active.
- * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
- *		the user interface, it uses so many internal UI fields, that it sort of made some sense
- *		to put it in the UserInterface class.
- */
 void UserInterface::journalControl() {
 	Events &events = *_vm->_events;
 	Journal &journal = *_vm->_journal;
@@ -1844,9 +1772,6 @@ void UserInterface::journalControl() {
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
-/**
-* Print the description of an object
-*/
 void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -2015,16 +1940,10 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	}
 }
 
-/**
- * Print the previously selected object's decription
- */
 void UserInterface::printObjectDesc() {
 	printObjectDesc(_cAnimStr, true);
 }
 
-/**
- * Displays a passed window by gradually scrolling it vertically on-screen
- */
 void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -2065,9 +1984,6 @@ void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 	_windowOpen = true;
 }
 
-/**
- * Slide the window stored in the back buffer onto the screen
- */
 void UserInterface::summonWindow(bool slideUp, int height) {
 	Screen &screen = *_vm->_screen;
 
@@ -2085,10 +2001,6 @@ void UserInterface::summonWindow(bool slideUp, int height) {
 	summonWindow(tempSurface, slideUp);
 }
 
-/**
- * Close a currently open window
- * @param flag	0 = slide old window down, 1 = slide prior UI back up
- */
 void UserInterface::banishWindow(bool slideUp) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
@@ -2155,9 +2067,6 @@ void UserInterface::banishWindow(bool slideUp) {
 	_menuMode = STD_MODE;
 }
 
-/**
- * Checks to see whether a USE action is valid on the given object
- */
 void UserInterface::checkUseAction(const UseType *use, const Common::String &invName,
 		const char *const messages[], int objNum, int giveMode) {
 	Events &events = *_vm->_events;
@@ -2251,9 +2160,6 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 	events.setCursor(ARROW);
 }
 
-/**
- * Called for OPEN, CLOSE, and MOVE actions are being done
- */
 void UserInterface::checkAction(ActionType &action, const char *const messages[], int objNum) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index fdaa323e5e..068d1eaa99 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -90,29 +90,93 @@ private:
 	int _find;
 	int _oldUse;
 private:
+	/**
+	 * Draws the image for a user interface button in the down/pressed state.
+	 */
 	void depressButton(int num);
 
+	/**
+	 * If he mouse button is pressed, then calls depressButton to draw the button
+	 * as pressed; if not, it will show it as released with a call to "restoreButton".
+	 */
 	void pushButton(int num);
 
+	/**
+	 * By the time this method has been called, the graphics for the button change
+	 * have already been drawn. This simply takes care of switching the mode around
+	 * accordingly
+	 */
 	void toggleButton(int num);
 
+	/**
+	 * Creates a text window and uses it to display the in-depth description
+	 * of the highlighted object
+	 */
 	void examine();
 
+	/**
+	 * Print the name of an object in the scene
+	 */
 	void lookScreen(const Common::Point &pt);
 
+	/**
+	 * Gets the item in the inventory the mouse is on and display's it's description
+	 */
 	void lookInv();
 
+	/**
+	 * Handles input when the file list window is being displayed
+	 */
 	void doEnvControl();
+	
+	/**
+	 * Handle input whilst the inventory is active
+	 */
 	void doInvControl();
+	
+	/**
+	 * Handles waiting whilst an object's description window is open.
+	 */
 	void doLookControl();
+	
+	/**
+	 * Handles input until one of the user interface buttons/commands is selected
+	 */
 	void doMainControl();
+	
+	/**
+	 * Handles the input for the MOVE, OPEN, and CLOSE commands
+	 */
 	void doMiscControl(int allowed);
+	
+	/**
+	 * Handles input for picking up items
+	 */
 	void doPickControl();
+	
+	/**
+	 * Handles input when in talk mode. It highlights the buttons and available statements,
+	 * and handles allowing the user to click on them
+	 */
 	void doTalkControl();
+	
+	/**
+	 * Handles events when the Journal is active.
+	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+	 *		the user interface, it uses so many internal UI fields, that it sort of made some sense
+	 *		to put it in the UserInterface class.
+	 */
 	void journalControl();
 
+	/**
+	 * Checks to see whether a USE action is valid on the given object
+	 */
 	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
 		int objNum, int giveMode);
+	
+	/**
+	 * Called for OPEN, CLOSE, and MOVE actions are being done
+	 */
 	void checkAction(ActionType &action, const char *const messages[], int objNum);
 public:
 	MenuMode _menuMode;
@@ -128,24 +192,66 @@ public:
 	UserInterface(SherlockEngine *vm);
 	~UserInterface();
 
+	/**
+	 * Resets the user interface
+	 */
 	void reset();
 
+	/**
+	 * Draw the user interface onto the screen's back buffers
+	 */
 	void drawInterface(int bufferNum = 3);
 
+	/**
+	 * Main input handler for the user interface
+	 */
 	void handleInput();
 
+	/**
+	 * Clears the info line of the screen
+	 */
 	void clearInfo();
+
+	/**
+	 * Clear any active text window
+	 */
 	void clearWindow();
 
+	/**
+	 * Handles counting down whilst checking for input, then clears the info line.
+	 */
 	void whileMenuCounter();
 
+	/**
+	 * Print the description of an object
+	 */
 	void printObjectDesc(const Common::String &str, bool firstTime);
+	
+	/**
+	 * Print the previously selected object's decription
+	 */
 	void printObjectDesc();
 
+	/**
+	 * Displays a passed window by gradually scrolling it vertically on-screen
+	 */
 	void summonWindow(const Surface &bgSurface, bool slideUp = true);
+	
+	/**
+	 * Slide the window stored in the back buffer onto the screen
+	 */
 	void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
+	
+	/**
+	 * Close a currently open window
+	 * @param flag	0 = slide old window down, 1 = slide prior UI back up
+	 */
 	void banishWindow(bool slideUp = true);
 
+	/**
+	 * Draws the image for the given user interface button in the up
+	 * (not selected) position
+	 */
 	void restoreButton(int num);
 };
 
-- 
cgit v1.2.3


From 2752db8103c2076bc7838f6306de338f986f68a4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 07:50:50 -0400
Subject: SHERLOCK: Remove iimplicit conversion operator from ImageFrame

---
 engines/sherlock/events.cpp  |  2 +-
 engines/sherlock/map.cpp     |  6 +++---
 engines/sherlock/resources.h |  2 --
 engines/sherlock/surface.cpp | 13 +++++++++++++
 engines/sherlock/surface.h   | 23 +++++++++++++++++++----
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 38093a6c72..b01437d54b 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -63,7 +63,7 @@ void Events::setCursor(CursorId cursorId) {
 	_cursorId = cursorId;
 
 	// Set the cursor data
-	Graphics::Surface &s = (*_cursorImages)[cursorId];
+	Graphics::Surface &s = (*_cursorImages)[cursorId]._frame;
 
 	setCursor(s);
 }
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 737abb4895..ae19e65280 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -228,7 +228,7 @@ int Map::show() {
 
 				// Show wait cursor
 				_cursorIndex = 1;
-				events.setCursor((*_mapCursors)[_cursorIndex]);
+				events.setCursor((*_mapCursors)[_cursorIndex]._frame);
 			}
 		}
 
@@ -269,7 +269,7 @@ void Map::setupSprites() {
 
 	_mapCursors = new ImageFile("omouse.vgs");
 	_cursorIndex = 0;
-	events.setCursor((*_mapCursors)[_cursorIndex]);
+	events.setCursor((*_mapCursors)[_cursorIndex]._frame);
 
 	_shapes = new ImageFile("mapicon.vgs");
 	_iconShapes = new ImageFile("overicon.vgs");
@@ -369,7 +369,7 @@ void Map::updateMap(bool flushScreen) {
 		if (++_cursorIndex > (1 + 8))
 			_cursorIndex = 1;
 
-		events.setCursor((*_mapCursors)[(_cursorIndex + 1) / 2]);
+		events.setCursor((*_mapCursors)[(_cursorIndex + 1) / 2]._frame);
 	}
 
 	if (!_drawMap && !flushScreen)
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 4ca4038529..fb91b30f94 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -158,8 +158,6 @@ struct ImageFrame {
 	Common::Point _offset;
 	byte _rleMarker;
 	Graphics::Surface _frame;
-
-	operator Graphics::Surface &() { return _frame; }
 };
 
 class ImageFile : public Common::Array<ImageFrame> {
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index b54f43bf52..83d4b78a0a 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/surface.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/resources.h"
 #include "common/system.h"
 #include "graphics/palette.h"
 
@@ -51,10 +52,18 @@ void Surface::blitFrom(const Graphics::Surface &src) {
 	blitFrom(src, Common::Point(0, 0));
 }
 
+void Surface::blitFrom(const ImageFrame &src) {
+	blitFrom(src._frame, Common::Point(0, 0));
+}
+
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
 	blitFrom(src, pt, Common::Rect(0, 0, src.w, src.h));
 }
 
+void Surface::blitFrom(const ImageFrame &src, const Common::Point &pt) {
+	blitFrom(src._frame, pt, Common::Rect(0, 0, src._frame.w, src._frame.h));
+}
+
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds) {
 	Common::Rect srcRect = srcBounds;
@@ -67,6 +76,10 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 	}
 }
 
+void Surface::blitFrom(const ImageFrame &src, const Common::Point &pt, const Common::Rect &srcBounds) {
+	blitFrom(src._frame, pt, srcBounds);
+}
+
 void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 7049d8ae76..4b7166b090 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -25,10 +25,11 @@
 
 #include "common/rect.h"
 #include "graphics/surface.h"
-#include "sherlock/resources.h"
 
 namespace Sherlock {
 
+struct ImageFrame;
+
 class Surface : public Graphics::Surface {
 private:
 	bool _freePixels;
@@ -55,17 +56,31 @@ public:
 	 */
 	void blitFrom(const Graphics::Surface &src);
 
+	/**
+	 * Copy an image frame into this surface
+	 */
+	void blitFrom(const ImageFrame &src);
+
 	/**
 	 * Draws a surface at a given position within this surface
 	 */
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
 
+	/**
+	 * Copy an image frame onto this surface at a given position
+	 */
+	void blitFrom(const ImageFrame &src, const Common::Point &pt);
+
 	/**
 	 * Draws a sub-section of a surface at a given position within this surface
 	 */
-	void blitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		const Common::Rect &srcBounds);
-	
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds);
+
+	/**
+	 * Copy a sub-area of a source image frame into this surface at a given position
+	 */
+	void blitFrom(const ImageFrame &src, const Common::Point &pt, const Common::Rect &srcBounds);
+
 	/**
 	 * Draws an image frame at a given position within this surface with transparency
 	 */
-- 
cgit v1.2.3


From dac49ddab496b9e5ca0f6589ea7b5ad906faa464 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 07:53:45 -0400
Subject: SHERLOCK: Syntactic fix and define for SaveManager

---
 engines/sherlock/saveload.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index bec832aa05..053c52c4e5 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -38,6 +38,10 @@ const int ENV_POINTS[6][3] = {
 	{ 241, 280, 261 }	// Quit
 };
 
+const char *const SAVEGAME_STR = "SHLK";
+#define SAVEGAME_STR_SIZE 4
+#define ONSCREEN_FILES_COUNT 5
+
 /*----------------------------------------------------------------*/
 
 SaveManager::SaveManager(SherlockEngine *vm, const Common::String &target) :
@@ -84,11 +88,10 @@ void SaveManager::drawInterface() {
 	if (!_savegameIndex)
 		screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), COMMAND_NULL, 0, "Up");
 
-	if (_savegameIndex == MAX_SAVEGAME_SLOTS - 5)
+	if (_savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT)
 		screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), COMMAND_NULL, 0, "Down");
 
-	for (int idx = _savegameIndex; idx < _savegameIndex + 5; ++idx)
-	{
+	for (int idx = _savegameIndex; idx < _savegameIndex + ONSCREEN_FILES_COUNT; ++idx) {
 		screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
 			INV_FOREGROUND, "%d.", idx + 1);
 		screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - _savegameIndex) * 10),
@@ -163,9 +166,6 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
 	return saveList;
 }
 
-const char *const SAVEGAME_STR = "SHLK";
-#define SAVEGAME_STR_SIZE 4
-
 bool SaveManager::readSavegameHeader(Common::InSaveFile *in, SherlockSavegameHeader &header) {
 	char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
 	header._thumbnail = nullptr;
-- 
cgit v1.2.3


From fa35249a240d7bdfe5f5b7eb9ae073126d5080c4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 08:01:06 -0400
Subject: SHERLOCK: More syntactic fixes

---
 engines/sherlock/journal.cpp         |  4 ++--
 engines/sherlock/saveload.cpp        |  6 +++---
 engines/sherlock/saveload.h          |  2 +-
 engines/sherlock/scalpel/scalpel.cpp | 17 +++++++++--------
 engines/sherlock/user_interface.cpp  |  4 ++--
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 0a0144996d..7afa60d396 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1121,8 +1121,8 @@ int Journal::getSearchString(bool printError) {
 			}  else if (keyState.keycode == Common::KEYCODE_ESCAPE) {
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				done = -1;
-			} else if (keyState.ascii >= ' ' && keyState.keycode <= 'z' && keyState.keycode != Common::KEYCODE_AT && 
-				name.size() < JOURNAL_SEACRH_MAX_CHARS && (xp + screen.charWidth(keyState.keycode)) < JOURNAL_SEARCH_RIGHT) {
+			} else if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && keyState.keycode != Common::KEYCODE_AT && 
+				name.size() < JOURNAL_SEACRH_MAX_CHARS && (xp + screen.charWidth(keyState.ascii)) < JOURNAL_SEARCH_RIGHT) {
 				char ch = toupper(keyState.ascii);
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				screen.print(Common::Point(xp, yp), TALK_FOREGROUND, "%c", ch);
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 053c52c4e5..63d3142262 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -385,7 +385,7 @@ bool SaveManager::checkGameOnScreen(int slot) {
 	return false;
 }
 
-bool SaveManager::getFilename(int slot) {
+bool SaveManager::promptForFilename(int slot) {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
@@ -455,8 +455,8 @@ bool SaveManager::getFilename(int slot) {
 			done = -1;
 		}
 
-		if (keyState.keycode >= ' ' && keyState.keycode <= 'z' && saveName.size() < 50
-				&& (xp + screen.charWidth(keyState.keycode)) < 308) {
+		if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && saveName.size() < 50
+				&& (xp + screen.charWidth(keyState.ascii)) < 308) {
 			char c = (char)keyState.ascii;
 
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index 371a6e4c79..07626a2082 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -133,7 +133,7 @@ public:
 	/**
 	 * Prompts the user to enter a filename in a given slot
 	 */
-	bool getFilename(int slot);
+	bool promptForFilename(int slot);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 170768d91d..1f83ca4872 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -63,24 +63,25 @@ static const int TITLE_FRAMES[7][9] = {
 };
 
 #define NUM_PLACES 100
-const int MAP_X[NUM_PLACES] = {
+
+static const int MAP_X[NUM_PLACES] = {
 	0, 368, 0, 219, 0, 282, 0, 43, 0, 0, 396, 408, 0, 0, 0, 568, 37, 325,
 	28, 0, 263, 36, 148, 469, 342, 143, 443, 229, 298, 0, 157, 260, 432,
 	174, 0, 351, 0, 528, 0, 136, 0, 0, 0, 555, 165, 0, 506, 0, 0, 344, 0, 0
 };
-const int MAP_Y[NUM_PLACES] = {
+static const int MAP_Y[NUM_PLACES] = {
 	0, 147, 0, 166, 0, 109, 0, 61, 0, 0, 264, 70, 0, 0, 0, 266, 341, 30, 275,
 	0, 294, 146, 311, 230, 184, 268, 133, 94, 207, 0, 142, 142, 330, 255, 0,
 	37, 0, 70, 0, 116, 0, 0, 0, 50, 21, 0, 303, 0, 0, 229, 0, 0
 };
 
-const int MAP_TRANSLATE[NUM_PLACES] = {
+static const int MAP_TRANSLATE[NUM_PLACES] = {
 	0, 0, 0, 1, 0, 2, 0, 3, 4, 0, 4, 6, 0, 0, 0, 8, 9, 10, 11, 0, 12, 13, 14, 7,
 	15, 16, 17, 18, 19, 0, 20, 21, 22, 23, 0, 24, 0, 25, 0, 26, 0, 0, 0, 27,
 	28, 0, 29, 0, 0, 30, 0
 };
 
-const byte MAP_SEQUENCES[3][MAX_FRAME] = {
+static const byte MAP_SEQUENCES[3][MAX_FRAME] = {
 	{ 1, 1, 2, 3, 4, 0 },		// Overview Still
 	{ 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 },
 	{ 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 }
@@ -88,7 +89,7 @@ const byte MAP_SEQUENCES[3][MAX_FRAME] = {
 
 #define MAX_PEOPLE 66
 
-const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
+static const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 	{ 1, 0, 0 },	// Sherlock Holmes
 	{ 6, 0, 0 },	// Dr. Watson
 	{ 4, 0, 0 },	// Inspector Lestrade
@@ -157,7 +158,7 @@ const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 	{ 4, 0, 0 }		// Inspector Lestrade (Yard)
 };
 
-byte TALK_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
+static const byte TALK_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 	{ 1, 0, 0 },					// Sherlock Holmes
 	{ 5, 5, 6, 7, 8, 7, 8, 6, 0, 0 },	// Dr. Watson
 	{ 2, 0, 0 },					// Inspector Lestrade
@@ -381,12 +382,12 @@ bool ScalpelEngine::showAlleyCutscene() {
 	if (finished)
 		finished = _animation->play("27PRO3", 1, 0, true, 2);
 
-	if(finished) {
+	if (finished) {
 		_screen->getPalette(palette);
 		_screen->fadeToBlack(2);
 	}
 
-	if(finished) {
+	if (finished) {
 		ImageFile titleImages("title3.vgs", true);
 		// "Early the following morning on Baker Street..."
 		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(35, 51), false, 0);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 12054bd7fb..861c1c695d 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -783,7 +783,7 @@ void UserInterface::doEnvControl() {
 				if (saves.checkGameOnScreen(_selector))
 					_oldSelector = _selector;
 
-				if (saves.getFilename(_selector)) {
+				if (saves.promptForFilename(_selector)) {
 					saves.saveGame(_selector + 1, saves._savegames[_selector]);
 
 					banishWindow(1);
@@ -954,7 +954,7 @@ void UserInterface::doEnvControl() {
 					if (saves.checkGameOnScreen(_selector))
 						_oldSelector = _selector;
 
-					if (saves.getFilename(_selector)) {
+					if (saves.promptForFilename(_selector)) {
 						saves.saveGame(_selector + 1, saves._savegames[_selector]);
 						banishWindow();
 						_windowBounds.top = CONTROLS_Y1;
-- 
cgit v1.2.3


From 1c395b4de91f3edb0ad7109da016eb42a32b434b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 08:13:46 -0400
Subject: SHERLOCK: Add extra constants for object bit-flags

---
 engines/sherlock/events.cpp  |  8 ++++----
 engines/sherlock/objects.cpp | 10 ++++-----
 engines/sherlock/objects.h   |  2 +-
 engines/sherlock/scene.cpp   | 48 +++++++++++++++++++++++---------------------
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index b01437d54b..94ddc9a792 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -214,18 +214,18 @@ bool Events::delay(uint32 time, bool interruptable) {
 
 void Events::setButtonState() {
 	_released = _rightReleased = false;
-	if (_mouseButtons & 1)
+	if (_mouseButtons & LEFT_BUTTON)
 		_pressed = _oldButtons = true;
 
-	if ((_mouseButtons & 1) == 0 && _oldButtons) {
+	if ((_mouseButtons & LEFT_BUTTON) == 0 && _oldButtons) {
 		_pressed = _oldButtons = false;
 		_released = true;
 	}
 
-	if (_mouseButtons & 2)
+	if (_mouseButtons & RIGHT_BUTTON)
 		_rightPressed = _oldRightButton = true;
 
-	if ((_mouseButtons & 2) == 0 && _oldRightButton) {
+	if ((_mouseButtons & RIGHT_BUTTON) == 0 && _oldRightButton) {
 		_rightPressed = _oldRightButton = false;
 		_rightReleased = true;
 	}
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index e630b48f3a..94457b3dd5 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -575,7 +575,7 @@ void Object::checkObject() {
 				_seqCounter2 = _seqCounter;
 				_seqStack = _frameNumber + 1;
 				setObjSequence(v, false);
-			} else if (v >= SOUND_CODE && (v <= (SOUND_CODE + 29))) {
+			} else if (v >= SOUND_CODE && (v < (SOUND_CODE + 30))) {
 				codeFound = true;
 				++_frameNumber;
 				v -= SOUND_CODE;
@@ -584,7 +584,7 @@ void Object::checkObject() {
 					if (!scene._sounds[v - 1]._name.empty() && sound._digitized)
 						sound.playLoadedSound(v - 1, WAIT_RETURN_IMMEDIATELY);
 				}
-			} else if (v >= FLIP_CODE && v <= (FLIP_CODE + 2)) {
+			} else if (v >= FLIP_CODE && v < (FLIP_CODE + 3)) {
 				// Flip code
 				codeFound = true;
 				++_frameNumber;
@@ -594,15 +594,15 @@ void Object::checkObject() {
 				switch (v) {
 				case 0:
 					// Clear the flag
-					_flags &= ~2;
+					_flags &= ~OBJ_FLIPPED;
 					break;
 				case 1:
 					// Set the flag
-					_flags |= 2;
+					_flags |= OBJ_FLIPPED;
 					break;
 				case 2:
 					// Toggle the flag
-					_flags ^= 2;
+					_flags ^= OBJ_FLIPPED;
 					break;
 				default:
 					break;
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 53752a7351..6dbe645d4b 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -189,7 +189,7 @@ struct UseType {
 	void load(Common::SeekableReadStream &s);
 };
 
-enum { TURNON_OBJ = 0x20, TURNOFF_OBJ = 0x40 };
+enum { OBJ_BEHIND = 1, OBJ_FLIPPED = 2, OBJ_FORWARD = 4, TURNON_OBJ = 0x20, TURNOFF_OBJ = 0x40 };
 #define USE_COUNT 4
 
 class Object {
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 5ac43fc1be..d835b5caa8 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -727,27 +727,27 @@ void Scene::updateBackground() {
 	// Draw all active shapes which are behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == BEHIND)
-			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == BEHIND)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame,
-				_canimShapes[idx]._position, _canimShapes[idx]._flags & 2);
+				_canimShapes[idx]._position, _canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all active shapes which are normal and behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE && _bgShapes[idx]._misc == NORMAL_BEHIND)
-			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all canimations which are normal and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == NORMAL_BEHIND)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
-				_canimShapes[idx]._flags & 2);
+				_canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw the player if he's active
@@ -764,7 +764,8 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == NORMAL_FORWARD)
-			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, 
+				_bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the player
@@ -772,7 +773,7 @@ void Scene::updateBackground() {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_canimShapes[idx]._misc == NORMAL_FORWARD)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
-				_canimShapes[idx]._flags & 2);
+				_canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active shapes that are FORWARD
@@ -783,7 +784,8 @@ void Scene::updateBackground() {
 
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == FORWARD)
-			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, _bgShapes[idx]._flags & 2);
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, 
+				_bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active canimations that are forward
@@ -791,7 +793,7 @@ void Scene::updateBackground() {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 			_canimShapes[idx]._misc == FORWARD)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
-				_canimShapes[idx]._flags & 2);
+				_canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	screen.resetDisplayBounds();
@@ -814,9 +816,9 @@ void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
 			if ((obj._flags & 5) == 1) {
 				obj._misc = (pt.y < (obj._position.y + obj.frameHeight() - 1)) ?
 					NORMAL_FORWARD : NORMAL_BEHIND;
-			} else if (!(obj._flags & 1)) {
+			} else if (!(obj._flags & OBJ_BEHIND)) {
 				obj._misc = BEHIND;
-			} else if (obj._flags & 4) {
+			} else if (obj._flags & OBJ_FORWARD) {
 				obj._misc = FORWARD;
 			}
 		}
@@ -1147,7 +1149,7 @@ void Scene::doBgAnim() {
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
-			if (o._type == NO_SHAPE && ((o._flags & 1) == 0)) {
+			if (o._type == NO_SHAPE && ((o._flags & OBJ_BEHIND) == 0)) {
 				// Restore screen area
 				screen._backBuffer->blitFrom(screen._backBuffer2, o._position,
 					Common::Rect(o._position.x, o._position.y,
@@ -1198,14 +1200,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all canimations which are behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 		}
 	}
 
@@ -1213,14 +1215,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all canimations which are NORMAL and behind the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 		}
 	}
 
@@ -1241,14 +1243,14 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 		}
 	}
 
@@ -1256,27 +1258,27 @@ void Scene::doBgAnim() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 	}
 
 	// Draw any active portrait
 	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
 		screen._backBuffer->transBlitFrom(*people._portrait._imageFrame,
-			people._portrait._position, people._portrait._flags & 2);
+			people._portrait._position, people._portrait._flags & OBJ_FLIPPED);
 
 	// Draw all static and active canimations that are in front of the person
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		Object &o = _canimShapes[idx];
 		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 		}
 	}
 
 	// Draw all NO_SHAPE shapes which have flag bit 0 clear
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &o = _bgShapes[idx];
-		if (o._type == NO_SHAPE && (o._flags & 1) == 0)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & 2);
+		if (o._type == NO_SHAPE && (o._flags & OBJ_BEHIND) == 0)
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
 	}
 
 	// Bring the newly built picture to the screen
@@ -1331,7 +1333,7 @@ void Scene::doBgAnim() {
 		if (_goToScene == -1) {
 			for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 				Object &o = _bgShapes[idx];
-				if (o._type == NO_SHAPE && (o._flags & 1) == 0) {
+				if (o._type == NO_SHAPE && (o._flags & OBJ_BEHIND) == 0) {
 					screen.slamArea(o._position.x, o._position.y, o._oldSize.x, o._oldSize.y);
 					screen.slamArea(o._oldPosition.x, o._oldPosition.y, o._oldSize.x, o._oldSize.y);
 				} else if (o._type == HIDE_SHAPE) {
-- 
cgit v1.2.3


From 8ae0014bc25e42e519d5a6a31279ee22580aaba9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 09:10:35 -0400
Subject: SHERLOCK: Refactor Surface  not to descend directly from
 Graphics::Surface

---
 engines/sherlock/animation.cpp       |  2 +-
 engines/sherlock/inventory.cpp       | 15 ++++-----
 engines/sherlock/map.cpp             | 10 +++---
 engines/sherlock/scalpel/darts.cpp   |  8 ++---
 engines/sherlock/scalpel/scalpel.cpp | 10 +++---
 engines/sherlock/screen.cpp          | 16 +++------
 engines/sherlock/surface.cpp         | 63 +++++++++++++++++++++++++-----------
 engines/sherlock/surface.h           | 56 ++++++++++++++++++++++++++++----
 engines/sherlock/user_interface.cpp  | 39 +++++++++++-----------
 9 files changed, 139 insertions(+), 80 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 21d63633d3..7c1f2cd229 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -88,7 +88,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 
 			// Draw the sprite. Note that we explicitly use the raw frame below, rather than the ImageFrame,
 			// since we don't want the offsets in the image file to be used, just the explicit position we specify
-			screen.transBlitFrom(images[imageFrame]._frame, pt);
+			screen.transBlitFrom(images[imageFrame], pt);
 		} else {
 			// At this point, either the sprites for the frame has been complete, or there weren't any sprites
 			// at all to draw for the frame
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 28065a1b72..63642f4e5a 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -155,9 +155,9 @@ void Inventory::putInv(InvSlamMode slamIt) {
 		}
 
 		// Draw the item image
-		Graphics::Surface &img = (*_invShapes[itemNum])[0]._frame;
-		bb.transBlitFrom(img, Common::Point(6 + itemNum * 52 + ((47 - img.w) / 2),
-			163 + ((33 - img.h) / 2)));
+		ImageFrame &frame = (*_invShapes[itemNum])[0];
+		bb.transBlitFrom(frame, Common::Point(6 + itemNum * 52 + ((47 - frame._width) / 2),
+			163 + ((33 - frame._height) / 2)));
 	}
 
 	if (slamIt == SLAM_DISPLAY)
@@ -307,11 +307,11 @@ void Inventory::highlight(int index, byte color) {
 	Screen &screen = *_vm->_screen;
 	Surface &bb = *screen._backBuffer;
 	int slot = index - _invIndex;
-	Graphics::Surface &img = (*_invShapes[slot])[0]._frame;
+	ImageFrame &frame = (*_invShapes[slot])[0];
 
 	bb.fillRect(Common::Rect(8 + slot * 52, 165, (slot + 1) * 52, 194), color);
-	bb.transBlitFrom(img, Common::Point(6 + slot * 52 + ((47 - img.w) / 2),
-		163 + ((33 - img.h) / 2)));
+	bb.transBlitFrom(frame, Common::Point(6 + slot * 52 + ((47 - frame._width) / 2),
+		163 + ((33 - frame._height) / 2)));
 	screen.slamArea(8 + slot * 52, 165, 44, 30);
 }
 
@@ -331,8 +331,7 @@ void Inventory::refreshInv() {
 	ui.examine();
 
 	if (!talk._talkToAbort) {
-		screen._backBuffer2.blitFrom((*ui._controlPanel)[0]._frame,
-			Common::Point(0, CONTROLS_Y));
+		screen._backBuffer2.blitFrom((*ui._controlPanel)[0], Common::Point(0, CONTROLS_Y));
 		loadInv();
 	}
 }
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index ae19e65280..ed2912edc9 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -329,7 +329,7 @@ void Map::saveTopLine() {
 void Map::eraseTopLine() {
 	Screen &screen = *_vm->_screen;
 	screen._backBuffer1.blitFrom(_topLine, Common::Point(0, 0));
-	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, _topLine.h);
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, _topLine.h());
 }
 
 void Map::showPlaceName(int idx, bool highlighted) {
@@ -344,7 +344,7 @@ void Map::showPlaceName(int idx, bool highlighted) {
 
 		bool flipped = people[AL]._sequenceNumber == MAP_DOWNLEFT || people[AL]._sequenceNumber == MAP_LEFT
 			|| people[AL]._sequenceNumber == MAP_UPLEFT;
-		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, _lDrawnPos, flipped);
+		screen._backBuffer1.transBlitFrom(*people[AL]._imageFrame, _lDrawnPos, flipped);
 	}
 
 	if (highlighted) {
@@ -386,9 +386,9 @@ void Map::updateMap(bool flushScreen) {
 	saveIcon(people[AL]._imageFrame, hPos);
 	if (people[AL]._sequenceNumber == MAP_DOWNLEFT || people[AL]._sequenceNumber == MAP_LEFT
 			|| people[AL]._sequenceNumber == MAP_UPLEFT)
-		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, hPos, true);
+		screen._backBuffer1.transBlitFrom(*people[AL]._imageFrame, hPos, true);
 	else
-		screen._backBuffer1.transBlitFrom(people[AL]._imageFrame->_frame, hPos, false);
+		screen._backBuffer1.transBlitFrom(*people[AL]._imageFrame, hPos, false);
 
 	if (flushScreen) {
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
@@ -488,7 +488,7 @@ void Map::saveIcon(ImageFrame *src, const Common::Point &pt) {
 		return;
 	}
 
-	assert(size.x <= _iconSave.w && size.y <= _iconSave.h);
+	assert(size.x <= _iconSave.w() && size.y <= _iconSave.h());
 	_iconSave.blitFrom(screen._backBuffer1, Common::Point(0, 0),
 		Common::Rect(pos.x, pos.y, pos.x + size.x, pos.y + size.y));
 	_savedPos = pos;
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index e861b9cd62..23ca95454f 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -332,7 +332,7 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 	int delta = 9;
 
 	for (int idx = 4; idx < 23; ++idx) {
-		Graphics::Surface &frame = (*_dartImages)[idx]._frame;
+		ImageFrame &frame = (*_dartImages)[idx];
 
 		// Adjust draw position for animating dart
 		if (idx < 13)
@@ -343,15 +343,15 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 			pos.y += delta++;
 
 		// Draw the dart
-		Common::Point drawPos(pos.x - frame.w / 2, pos.y - frame.h);
+		Common::Point drawPos(pos.x - frame._width / 2, pos.y - frame._height);
 		screen._backBuffer1.transBlitFrom(frame, drawPos);
-		screen.slamArea(drawPos.x, drawPos.y, frame.w, frame.h);
+		screen.slamArea(drawPos.x, drawPos.y, frame._width, frame._height);
 
 		// Handle erasing old dart strs
 		if (!oldDrawBounds.isEmpty())
 			screen.slamRect(oldDrawBounds);
 
-		oldDrawBounds = Common::Rect(drawPos.x, drawPos.y, drawPos.x + frame.w, drawPos.y + frame.h);
+		oldDrawBounds = Common::Rect(drawPos.x, drawPos.y, drawPos.x + frame._width, drawPos.y + frame._height);
 		screen._backBuffer1.blitFrom(screen._backBuffer2, drawPos, oldDrawBounds);
 
 		events.wait(2);
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 1f83ca4872..56c1e28dbe 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -301,8 +301,8 @@ bool ScalpelEngine::showCityCutscene() {
 
 	if (finished) {
 		ImageFile titleImages("title2.vgs", true);
-		_screen->_backBuffer1.copyFrom(*_screen);
-		_screen->_backBuffer2.copyFrom(*_screen);
+		_screen->_backBuffer1.blitFrom(*_screen);
+		_screen->_backBuffer2.blitFrom(*_screen);
 
 		// London, England
 		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(10, 11));
@@ -326,8 +326,8 @@ bool ScalpelEngine::showCityCutscene() {
 
 	if (finished) {
 		ImageFile titleImages("title.vgs", true);
-		_screen->_backBuffer1.copyFrom(*_screen);
-		_screen->_backBuffer2.copyFrom(*_screen);
+		_screen->_backBuffer1.blitFrom(*_screen);
+		_screen->_backBuffer2.blitFrom(*_screen);
 
 		// The Lost Files of
 		_screen->_backBuffer1.transBlitFrom(titleImages[0], Common::Point(75, 6));
@@ -519,7 +519,7 @@ void ScalpelEngine::showLBV(const Common::String &filename) {
 	delete stream;
 
 	_screen->setPalette(images._palette);
-	_screen->_backBuffer1.blitFrom(images[0]._frame);
+	_screen->_backBuffer1.blitFrom(images[0]);
 	_screen->verticalTransition();
 }
 
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 583ac5b485..1d3c0e0dbf 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -39,10 +39,6 @@ Screen::Screen(SherlockEngine *vm) : Surface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCR
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
 	setFont(1);
-
-	// Set dummy surface used for restricted scene drawing
-	_sceneSurface.format = Graphics::PixelFormat::createFormatCLUT8();
-	_sceneSurface.pitch = SHERLOCK_SCREEN_WIDTH;
 }
 
 Screen::~Screen() {
@@ -76,7 +72,7 @@ void Screen::update() {
 	for (i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
 		const Common::Rect &r = *i;
 		const byte *srcP = (const byte *)getBasePtr(r.left, r.top);
-		g_system->copyRectToScreen(srcP, this->pitch, r.left, r.top,
+		g_system->copyRectToScreen(srcP, _surface.pitch, r.left, r.top,
 			r.width(), r.height());
 	}
 
@@ -126,7 +122,7 @@ void Screen::fadeToBlack(int speed) {
 	}
 
 	setPalette(tempPalette);
-	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
+	fillRect(Common::Rect(0, 0, _surface.w, _surface.h), 0);
 }
 
 void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) {
@@ -189,7 +185,7 @@ void Screen::randomTransition() {
 		if (idx != 0 && (idx % 300) == 0) {
 			// Ensure there's a full screen dirty rect for the next frame update
 			if (_dirtyRects.empty())
-				addDirtyRect(Common::Rect(0, 0, this->w, this->h));
+				addDirtyRect(Common::Rect(0, 0, _surface.w, _surface.h));
 
 			events.pollEvents();
 			events.delay(1);
@@ -409,9 +405,7 @@ void Screen::makeField(const Common::Rect &r) {
 
 void Screen::setDisplayBounds(const Common::Rect &r) {
 	assert(r.left == 0 && r.top == 0);
-	_sceneSurface.setPixels(_backBuffer1.getPixels());
-	_sceneSurface.w = r.width();
-	_sceneSurface.h = r.height();
+	_sceneSurface.setPixels(_backBuffer1.getPixels(), r.width(), r.height());
 
 	_backBuffer = &_sceneSurface;
 }
@@ -421,7 +415,7 @@ void Screen::resetDisplayBounds() {
 }
 
 Common::Rect Screen::getDisplayBounds() {
-	return (_backBuffer == &_sceneSurface) ? Common::Rect(0, 0, _sceneSurface.w, _sceneSurface.h) :
+	return (_backBuffer == &_sceneSurface) ? Common::Rect(0, 0, _sceneSurface.w(), _sceneSurface.h()) :
 		Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 }
 
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 83d4b78a0a..9214a75ded 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -37,18 +37,18 @@ Surface::Surface() : _freePixels(false) {
 
 Surface::~Surface() {
 	if (_freePixels)
-		free();
+		_surface.free();
 }
 
 void Surface::create(uint16 width, uint16 height) {
 	if (_freePixels)
-		free();
+		_surface.free();
 
-	Graphics::Surface::create(width, height, Graphics::PixelFormat::createFormatCLUT8());
+	_surface.create(width, height, Graphics::PixelFormat::createFormatCLUT8());
 	_freePixels = true;
 }
 
-void Surface::blitFrom(const Graphics::Surface &src) {
+void Surface::blitFrom(const Surface &src) {
 	blitFrom(src, Common::Point(0, 0));
 }
 
@@ -56,23 +56,30 @@ void Surface::blitFrom(const ImageFrame &src) {
 	blitFrom(src._frame, Common::Point(0, 0));
 }
 
-void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
-	blitFrom(src, pt, Common::Rect(0, 0, src.w, src.h));
+void Surface::blitFrom(const Graphics::Surface &src) {
+	blitFrom(src, Common::Point(0, 0));
+}
+
+void Surface::blitFrom(const Surface &src, const Common::Point &pt) {
+	blitFrom(src, pt, Common::Rect(0, 0, src._surface.w, src._surface.h));
 }
 
 void Surface::blitFrom(const ImageFrame &src, const Common::Point &pt) {
 	blitFrom(src._frame, pt, Common::Rect(0, 0, src._frame.w, src._frame.h));
 }
 
-void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		const Common::Rect &srcBounds) {
+void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
+	blitFrom(src, pt, Common::Rect(0, 0, src.w, src.h));
+}
+
+void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds) {
 	Common::Rect srcRect = srcBounds;
 	Common::Rect destRect(pt.x, pt.y, pt.x + srcRect.width(), pt.y + srcRect.height());
 
 	if (srcRect.isValidRect() && clip(srcRect, destRect)) {
 		// Surface is at least partially or completely on-screen
 		addDirtyRect(destRect);
-		copyRectToSurface(src, destRect.left, destRect.top, srcRect);
+		_surface.copyRectToSurface(src, destRect.left, destRect.top, srcRect);
 	}
 }
 
@@ -80,6 +87,10 @@ void Surface::blitFrom(const ImageFrame &src, const Common::Point &pt, const Com
 	blitFrom(src._frame, pt, srcBounds);
 }
 
+void Surface::blitFrom(const Surface &src, const Common::Point &pt, const Common::Rect &srcBounds) {
+	blitFrom(src._surface, pt, srcBounds);
+}
+
 void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
@@ -124,24 +135,24 @@ void Surface::fillRect(int x1, int y1, int x2, int y2, byte color) {
 }
 
 void Surface::fillRect(const Common::Rect &r, byte color) {
-	Graphics::Surface::fillRect(r, color);
+	_surface.fillRect(r, color);
 	addDirtyRect(r);
 }
 
 bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
-	if (destBounds.left >= this->w || destBounds.top >= this->h ||
-		destBounds.right <= 0 || destBounds.bottom <= 0)
+	if (destBounds.left >= _surface.w || destBounds.top >= _surface.h ||
+			destBounds.right <= 0 || destBounds.bottom <= 0)
 		return false;
 
 	// Clip the bounds if necessary to fit on-screen
-	if (destBounds.right > this->w) {
-		srcBounds.right -= destBounds.right - this->w;
-		destBounds.right = this->w;
+	if (destBounds.right > _surface.w) {
+		srcBounds.right -= destBounds.right - _surface.w;
+		destBounds.right = _surface.w;
 	}
 
-	if (destBounds.bottom > this->h) {
-		srcBounds.bottom -= destBounds.bottom - this->h;
-		destBounds.bottom = this->h;
+	if (destBounds.bottom > _surface.h) {
+		srcBounds.bottom -= destBounds.bottom - _surface.h;
+		destBounds.bottom = _surface.h;
 	}
 
 	if (destBounds.top < 0) {
@@ -158,7 +169,21 @@ bool Surface::clip(Common::Rect &srcBounds, Common::Rect &destBounds) {
 }
 
 void Surface::clear() {
-	fillRect(Common::Rect(0, 0, this->w, this->h), 0);
+	fillRect(Common::Rect(0, 0, _surface.w, _surface.h), 0);
+}
+
+void Surface::free() {
+	if (_freePixels) {
+		_surface.free();
+		_freePixels = false;
+	}
+}
+
+void Surface::setPixels(byte *pixels, int w, int h) {
+	_surface.format = Graphics::PixelFormat::createFormatCLUT8();
+	_surface.w = _surface.pitch = w;
+	_surface.h = h;
+	_surface.setPixels(pixels);
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 4b7166b090..f3b1b393bb 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -30,7 +30,7 @@ namespace Sherlock {
 
 struct ImageFrame;
 
-class Surface : public Graphics::Surface {
+class Surface {
 private:
 	bool _freePixels;
 
@@ -38,7 +38,30 @@ private:
 	 * Clips the given source bounds so the passed destBounds will be entirely on-screen
 	 */
 	bool clip(Common::Rect &srcBounds, Common::Rect &destBounds);
+
+	/**
+	 * Copy a surface into this one
+	 */
+	void blitFrom(const Graphics::Surface &src);
+
+	/**
+	 * Draws a surface at a given position within this surface
+	 */
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
+
+	/**
+	 * Draws a sub-section of a surface at a given position within this surface
+	 */
+	void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds);
+
+	/**
+	 * Draws a surface at a given position within this surface with transparency
+	 */
+	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		bool flipped = false, int overrideColor = 0);
 protected:
+	Graphics::Surface _surface;
+
 	virtual void addDirtyRect(const Common::Rect &r) {}
 public:
 	Surface(uint16 width, uint16 height);
@@ -54,7 +77,7 @@ public:
 	/**
 	 * Copy a surface into this one
 	 */
-	void blitFrom(const Graphics::Surface &src);
+	void blitFrom(const Surface &src);
 
 	/**
 	 * Copy an image frame into this surface
@@ -64,7 +87,7 @@ public:
 	/**
 	 * Draws a surface at a given position within this surface
 	 */
-	void blitFrom(const Graphics::Surface &src, const Common::Point &pt);
+	void blitFrom(const Surface &src, const Common::Point &pt);
 
 	/**
 	 * Copy an image frame onto this surface at a given position
@@ -74,7 +97,7 @@ public:
 	/**
 	 * Draws a sub-section of a surface at a given position within this surface
 	 */
-	void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds);
+	void blitFrom(const Surface &src, const Common::Point &pt, const Common::Rect &srcBounds);
 
 	/**
 	 * Copy a sub-area of a source image frame into this surface at a given position
@@ -88,9 +111,9 @@ public:
 		bool flipped = false, int overrideColor = 0);
 	
 	/**
-	 * Draws a surface at a given position within this surface with transparency
-	 */
-	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+	* Draws a surface at a given position within this surface with transparency
+	*/
+	void transBlitFrom(const Surface &src, const Common::Point &pt,
 		bool flipped = false, int overrideColor = 0);
 
 	/**
@@ -107,6 +130,25 @@ public:
 	 * Clear the screen
 	 */
 	void clear();
+
+	/**
+	 * Free the underlying surface
+	 */
+	void free();
+
+	/**
+	 * Set the pixels for the surface to an existing data block
+	 */
+	void setPixels(byte *pixels, int w, int h);
+
+	inline uint16 w() const { return _surface.w; }
+	inline uint16 h() const { return _surface.h; }
+	inline const byte *getPixels() const { return (const byte *)_surface.getPixels(); }
+	inline byte *getPixels() { return (byte *)_surface.getPixels(); }
+	inline byte *getBasePtr(int x, int y) { return (byte *)_surface.getBasePtr(x, y); }
+	inline const byte *getBasePtr(int x, int y) const { return (const byte *)_surface.getBasePtr(x, y); }
+	inline void hLine(int x, int y, int x2, uint32 color) { _surface.hLine(x, y, x2, color); }
+	inline void vLine(int x, int y, int y2, uint32 color) { _surface.vLine(x, y, y2, color); }
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 861c1c695d..d36be4ed76 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -398,9 +398,9 @@ void UserInterface::depressButton(int num) {
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
 
-	Graphics::Surface &s = (*_controls)[num]._frame;
-	screen._backBuffer1.transBlitFrom(s, pt);
-	screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
+	ImageFrame &frame = (*_controls)[num];
+	screen._backBuffer1.transBlitFrom(frame, pt);
+	screen.slamArea(pt.x, pt.y, pt.x + frame._width, pt.y + frame._height);
 }
 
 void UserInterface::restoreButton(int num) {
@@ -451,10 +451,10 @@ void UserInterface::toggleButton(int num) {
 
 			_keyboardInput = false;
 
-			Graphics::Surface &s = (*_controls)[num]._frame;
+			ImageFrame &frame = (*_controls)[num];
 			Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
-			screen._backBuffer1.transBlitFrom(s, pt);
-			screen.slamArea(pt.x, pt.y, pt.x + s.w, pt.y + s.h);
+			screen._backBuffer1.transBlitFrom(frame, pt);
+			screen.slamArea(pt.x, pt.y, pt.x + frame._width, pt.y + frame._height);
 		}
 	} else {
 		_menuMode = STD_MODE;
@@ -1220,7 +1220,7 @@ void UserInterface::doLookControl() {
 			} else if (!_lookHelp) {
 				// Need to close the window and depress the Look button
 				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
-				screen._backBuffer2.blitFrom((*_controls)[0]._frame, pt);
+				screen._backBuffer2.blitFrom((*_controls)[0], pt);
 				banishWindow(true);
 
 				_windowBounds.top = CONTROLS_Y1;
@@ -1801,8 +1801,8 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
 
 				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
-					Common::Rect(pt.x, pt.y, pt.x + tempSurface.w, pt.y + tempSurface.h));
-				screen._backBuffer2.transBlitFrom((*_controls)[0]._frame, pt);
+					Common::Rect(pt.x, pt.y, pt.x + tempSurface.w(), pt.y + tempSurface.h()));
+				screen._backBuffer2.transBlitFrom((*_controls)[0], pt);
 
 				banishWindow(1);
 				events.setCursor(MAGNIFY);
@@ -1954,9 +1954,9 @@ void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 
 	if (slideUp) {
 		// Gradually slide up the display of the window
-		for (int idx = 1; idx <= bgSurface.h; idx += 2) {
+		for (int idx = 1; idx <= bgSurface.h(); idx += 2) {
 			screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
-				Common::Rect(0, 0, bgSurface.w, idx));
+				Common::Rect(0, 0, bgSurface.w(), idx));
 			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
 				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
@@ -1964,22 +1964,21 @@ void UserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
 		}
 	} else {
 		// Gradually slide down the display of the window
-		for (int idx = 1; idx <= bgSurface.h; idx += 2) {
+		for (int idx = 1; idx <= bgSurface.h(); idx += 2) {
 			screen._backBuffer->blitFrom(bgSurface,
-				Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h),
-				Common::Rect(0, bgSurface.h - idx, bgSurface.w, bgSurface.h));
-			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h,
-				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - bgSurface.h + idx));
+				Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h()),
+				Common::Rect(0, bgSurface.h() - idx, bgSurface.w(), bgSurface.h()));
+			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h(),
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - bgSurface.h() + idx));
 
 			events.delay(10);
 		}
 	}
 
 	// Final display of the entire window
-	screen._backBuffer->blitFrom(bgSurface, Common::Point(0,
-		SHERLOCK_SCREEN_HEIGHT - bgSurface.h),
-		Common::Rect(0, 0, bgSurface.w, bgSurface.h));
-	screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h, bgSurface.w, bgSurface.h);
+	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h()),
+		Common::Rect(0, 0, bgSurface.w(), bgSurface.h()));
+	screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h(), bgSurface.w(), bgSurface.h());
 
 	_windowOpen = true;
 }
-- 
cgit v1.2.3


From 06b39671e30ecd39585f2f7312af53abb9d27d1c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 09:17:04 -0400
Subject: SHERLOCK: Further cleanup for SaveManager

---
 engines/sherlock/saveload.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 63d3142262..5033a3b16d 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -38,7 +38,8 @@ const int ENV_POINTS[6][3] = {
 	{ 241, 280, 261 }	// Quit
 };
 
-const char *const SAVEGAME_STR = "SHLK";
+static const char *const EMPTY_SAVEGAME_SLOT = "-EMPTY-";
+static const char *const SAVEGAME_STR = "SHLK";
 #define SAVEGAME_STR_SIZE 4
 #define ONSCREEN_FILES_COUNT 5
 
@@ -112,7 +113,7 @@ void SaveManager::createSavegameList() {
 
 	_savegames.clear();
 	for (int idx = 0; idx < MAX_SAVEGAME_SLOTS; ++idx)
-		_savegames.push_back("-EMPTY-");
+		_savegames.push_back(EMPTY_SAVEGAME_SLOT);
 
 	SaveStateList saveList = getSavegameList(_target);
 	for (uint idx = 0; idx < saveList.size(); ++idx) {
@@ -401,7 +402,7 @@ bool SaveManager::promptForFilename(int slot) {
 	screen.buttonPrint(Common::Point(ENV_POINTS[5][2], CONTROLS_Y), COMMAND_NULL, true, "Quit");
 
 	Common::String saveName = _savegames[slot];
-	if (saveName.equalsIgnoreCase("-EMPTY-")) {
+	if (saveName.equalsIgnoreCase(EMPTY_SAVEGAME_SLOT)) {
 		// It's an empty slot, so start off with an empty save name
 		saveName = "";
 
@@ -445,17 +446,15 @@ bool SaveManager::promptForFilename(int slot) {
 			xp -= screen.charWidth(saveName.lastChar());
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
 			saveName.deleteLastChar();
-		}
-
-		if (keyState.keycode == Common::KEYCODE_RETURN)
+		
+		} else if (keyState.keycode == Common::KEYCODE_RETURN && saveName.compareToIgnoreCase(EMPTY_SAVEGAME_SLOT)) {
 			done = 1;
 
-		if (keyState.keycode == Common::KEYCODE_ESCAPE) {
+		} else if (keyState.keycode == Common::KEYCODE_ESCAPE) {
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
 			done = -1;
-		}
-
-		if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && saveName.size() < 50
+		
+		} else if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && saveName.size() < 50
 				&& (xp + screen.charWidth(keyState.ascii)) < 308) {
 			char c = (char)keyState.ascii;
 
-- 
cgit v1.2.3


From 033241eb434ff4916c140885a6cda84a593406d5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 09:19:42 -0400
Subject: SHERLOCK: Corrected incorrect method name in SaveManager

---
 engines/sherlock/saveload.cpp       | 2 +-
 engines/sherlock/saveload.h         | 4 ++--
 engines/sherlock/user_interface.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 5033a3b16d..3c8f3e4f60 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -386,7 +386,7 @@ bool SaveManager::checkGameOnScreen(int slot) {
 	return false;
 }
 
-bool SaveManager::promptForFilename(int slot) {
+bool SaveManager::promptForDescription(int slot) {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index 07626a2082..a86d5be035 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -131,9 +131,9 @@ public:
 	bool checkGameOnScreen(int slot);
 
 	/**
-	 * Prompts the user to enter a filename in a given slot
+	 * Prompts the user to enter a description in a given slot
 	 */
-	bool promptForFilename(int slot);
+	bool promptForDescription(int slot);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index d36be4ed76..7ac44ee99e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -783,7 +783,7 @@ void UserInterface::doEnvControl() {
 				if (saves.checkGameOnScreen(_selector))
 					_oldSelector = _selector;
 
-				if (saves.promptForFilename(_selector)) {
+				if (saves.promptForDescription(_selector)) {
 					saves.saveGame(_selector + 1, saves._savegames[_selector]);
 
 					banishWindow(1);
@@ -954,7 +954,7 @@ void UserInterface::doEnvControl() {
 					if (saves.checkGameOnScreen(_selector))
 						_oldSelector = _selector;
 
-					if (saves.promptForFilename(_selector)) {
+					if (saves.promptForDescription(_selector)) {
 						saves.saveGame(_selector + 1, saves._savegames[_selector]);
 						banishWindow();
 						_windowBounds.top = CONTROLS_Y1;
-- 
cgit v1.2.3


From 6f9693102f99843501822f27431d839777fb43d5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 09:35:53 -0400
Subject: SHERLOCK: Further minor cleanups

---
 engines/sherlock/journal.cpp        | 7 ++++---
 engines/sherlock/saveload.cpp       | 1 -
 engines/sherlock/saveload.h         | 1 +
 engines/sherlock/user_interface.cpp | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 7afa60d396..f3754db95f 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1114,13 +1114,14 @@ int Journal::getSearchString(bool printError) {
 				xp -= screen.charWidth(name.lastChar());
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), INV_FOREGROUND);
 				name.deleteLastChar();
-			}
-
-			if (keyState.keycode == Common::KEYCODE_RETURN) {
+			
+			} else  if (keyState.keycode == Common::KEYCODE_RETURN) {
 				done = 1;
+			
 			}  else if (keyState.keycode == Common::KEYCODE_ESCAPE) {
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				done = -1;
+			
 			} else if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && keyState.keycode != Common::KEYCODE_AT && 
 				name.size() < JOURNAL_SEACRH_MAX_CHARS && (xp + screen.charWidth(keyState.ascii)) < JOURNAL_SEARCH_RIGHT) {
 				char ch = toupper(keyState.ascii);
diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 3c8f3e4f60..9848f8160f 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -41,7 +41,6 @@ const int ENV_POINTS[6][3] = {
 static const char *const EMPTY_SAVEGAME_SLOT = "-EMPTY-";
 static const char *const SAVEGAME_STR = "SHLK";
 #define SAVEGAME_STR_SIZE 4
-#define ONSCREEN_FILES_COUNT 5
 
 /*----------------------------------------------------------------*/
 
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index a86d5be035..066d983b26 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -33,6 +33,7 @@
 namespace Sherlock {
 
 #define MAX_SAVEGAME_SLOTS 99
+#define ONSCREEN_FILES_COUNT 5
 #define SHERLOCK_SAVEGAME_VERSION 1
 
 enum SaveMode { SAVEMODE_NONE = 0, SAVEMODE_LOAD = 1, SAVEMODE_SAVE = 2 };
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 7ac44ee99e..fbedbb9005 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -714,7 +714,7 @@ void UserInterface::doEnvControl() {
 		// Handle selecting buttons, if any
 		saves.highlightButtons(found);
 
-		if (found == 0 || found == 5)
+		if (found == 0 || found == ONSCREEN_FILES_COUNT)
 			saves._envMode = SAVEMODE_NONE;
 	}
 
-- 
cgit v1.2.3


From 4849e008977d87b707d70c836c7abcd0c79eb9de Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 May 2015 19:06:44 +0200
Subject: SHERLOCK: Fix some issues pointed by eriktorbjorn

---
 engines/sherlock/surface.cpp        |  6 +++---
 engines/sherlock/surface.h          |  2 +-
 engines/sherlock/user_interface.cpp | 18 ++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 9214a75ded..80495a398c 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -179,10 +179,10 @@ void Surface::free() {
 	}
 }
 
-void Surface::setPixels(byte *pixels, int w, int h) {
+void Surface::setPixels(byte *pixels, int width, int height) {
 	_surface.format = Graphics::PixelFormat::createFormatCLUT8();
-	_surface.w = _surface.pitch = w;
-	_surface.h = h;
+	_surface.w = _surface.pitch = width;
+	_surface.h = height;
 	_surface.setPixels(pixels);
 }
 
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index f3b1b393bb..1cb78db072 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -139,7 +139,7 @@ public:
 	/**
 	 * Set the pixels for the surface to an existing data block
 	 */
-	void setPixels(byte *pixels, int w, int h);
+	void setPixels(byte *pixels, int width, int height);
 
 	inline uint16 w() const { return _surface.w; }
 	inline uint16 h() const { return _surface.h; }
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index fbedbb9005..e1d6619ed7 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -523,7 +523,7 @@ void UserInterface::examine() {
 	}
 
 	if (_invLookFlag) {
-		// Dont close the inventory window when starting an examine display, since it's
+		// Don't close the inventory window when starting an examine display, since its
 		// window will slide up to replace the inventory display
 		_windowOpen = false;
 		_menuMode = LOOK_MODE;
@@ -690,13 +690,11 @@ void UserInterface::doEnvControl() {
 	_keyboardInput = false;
 	int found = saves.getHighlightedButton();
 
-	if (events._pressed || events._released)
-	{
+	if (events._pressed || events._released) {
 		events.clearKeyboard();
 
 		// Check for a filename entry being highlighted
-		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10))
-		{
+		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10)) {
 			int found1 = 0;
 			for (_selector = 0; (_selector < 5) && !found1; ++_selector)
 				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
@@ -828,7 +826,7 @@ void UserInterface::doEnvControl() {
 				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - 5) ? COMMAND_NULL : COMMAND_FOREGROUND;
 				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
 
-				// Check for there are more pending U keys pressed
+				// Check whether there are more pending U keys pressed
 				moreKeys = false;
 				if (events.kbHit()) {
 					Common::KeyState keyState = events.getKey();
@@ -864,7 +862,7 @@ void UserInterface::doEnvControl() {
 				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - 5) ? COMMAND_NULL : COMMAND_FOREGROUND;
 				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
 
-				// Check for there are more pending D keys pressed
+				// Check whether there are more pending D keys pressed
 				moreKeys = false;
 				if (events.kbHit()) {
 					Common::KeyState keyState;
@@ -950,7 +948,7 @@ void UserInterface::doEnvControl() {
 				if (saves._envMode == SAVEMODE_LOAD) {
 					saves.loadGame(_selector + 1);
 				} else if (saves._envMode == SAVEMODE_SAVE || _selector == MAX_SAVEGAME_SLOTS) {
-					// We're alreaady in save mode, or pointed to an empty save slot
+					// We're already in save mode, or pointing to an empty save slot
 					if (saves.checkGameOnScreen(_selector))
 						_oldSelector = _selector;
 
@@ -1007,7 +1005,7 @@ void UserInterface::doInvControl() {
 		events.clearKeyboard();
 
 		if (found != -1)
-			// If a slot highlighted, set it's color
+			// If a slot highlighted, set its color
 			colors[found] = COMMAND_HIGHLIGHTED;
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), colors[0], true, "Exit");
 
@@ -1135,7 +1133,7 @@ void UserInterface::doInvControl() {
 			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
 		} else {
-			// If something is being given, make sure it's to a person
+			// If something is being given, make sure it's being given to a person
 			if (inv._invMode == 3) {
 				if (_bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON)
 					_find = _bgFound;
-- 
cgit v1.2.3


From 85081b7702e7571a144ff57accd5ac9123f4123f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 May 2015 19:37:33 +0200
Subject: SHERLOCK: Systematically use InvMode values when it's appropriate

---
 engines/sherlock/inventory.cpp      | 18 +++++++++---------
 engines/sherlock/user_interface.cpp | 31 ++++++++++++++++---------------
 engines/sherlock/user_interface.h   |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 63642f4e5a..265b12ce76 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -250,16 +250,16 @@ void Inventory::invCommands(bool slamIt) {
 
 	if (slamIt) {
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
-			_invMode == 0 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
+			_invMode == INVMODE_EXIT ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
 			true, "Exit");
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1),
-			_invMode == 1 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
+			_invMode == INVMODE_LOOK ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
 			true, "Look");
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1),
-			_invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			_invMode == INVMODE_USE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Use");
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1),
-			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			_invMode == INVMODE_GIVE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Give");
 		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
@@ -273,20 +273,20 @@ void Inventory::invCommands(bool slamIt) {
 		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"__");
-		if (_invMode != 1)
+		if (_invMode != INVMODE_LOOK)
 			ui.clearInfo();
 	} else {
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
-			_invMode == 0 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			_invMode == INVMODE_EXIT ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Exit");
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1),
-			_invMode == 1 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			_invMode == INVMODE_LOOK ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Look");
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1),
-			_invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			_invMode == INVMODE_USE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Use");
 		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1),
-			_invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
+			_invMode == INVMODE_GIVE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Give");
 		screen.gPrint(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index e1d6619ed7..943d3498b2 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -300,7 +300,7 @@ void UserInterface::handleInput() {
 	case USE_MODE:
 	case GIVE_MODE:
 	case INV_MODE:
-		if (inv._invMode == 1 || inv._invMode == 2 || inv._invMode == 3) {
+		if (inv._invMode == INVMODE_LOOK || inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE) {
 			if (pt.y > CONTROLS_Y)
 				lookInv();
 			else
@@ -568,10 +568,10 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 			if (!tempStr.empty() && tempStr[0] != ' ') {
 				// If inventory is active and an item is selected for a Use or Give action
 				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
-						(inv._invMode == 2 || inv._invMode == 3)) {
+						(inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE)) {
 					int width1 = 0, width2 = 0;
 					int x, width;
-					if (inv._invMode == 2) {
+					if (inv._invMode == INVMODE_USE) {
 						// Using an object
 						x = width = screen.stringWidth("Use ");
 
@@ -1028,7 +1028,7 @@ void UserInterface::doInvControl() {
 		}
 
 		bool flag = false;
-		if (inv._invMode == 1 || inv._invMode == 2 || inv._invMode == 3) {
+		if (inv._invMode == INVMODE_LOOK || inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE) {
 			Common::Rect r(15, CONTROLS_Y1 + 11, 314, SHERLOCK_SCREEN_HEIGHT - 2);
 			if (r.contains(mousePos)) {
 				_selector = (mousePos.x - 6) / 52 + inv._invIndex;
@@ -1050,13 +1050,13 @@ void UserInterface::doInvControl() {
 
 		if (_key == 'E' || _key == 'L' || _key == 'U' || _key == 'G'
 				|| _key == '-' || _key == '+') {
-			int temp = inv._invMode;
+			InvMode temp = inv._invMode;
 
 			const char *chP = strchr(INVENTORY_COMMANDS, _key);
 			inv._invMode = !chP ? INVMODE_INVALID : (InvMode)(chP - INVENTORY_COMMANDS);
 			inv.invCommands(true);
 
-			inv._invMode = (InvMode)temp;
+			inv._invMode = temp;
 			_keyboardInput = true;
 			if (_key == 'E')
 				inv._invMode = INVMODE_EXIT;
@@ -1134,7 +1134,7 @@ void UserInterface::doInvControl() {
 			inv.invCommands(true);
 		} else {
 			// If something is being given, make sure it's being given to a person
-			if (inv._invMode == 3) {
+			if (inv._invMode == INVMODE_GIVE) {
 				if (_bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON)
 					_find = _bgFound;
 				else
@@ -1143,7 +1143,7 @@ void UserInterface::doInvControl() {
 				_find = _bgFound;
 			}
 
-			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == 1) && (_find >= 0) && (_find < 1000)) {
+			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == INVMODE_LOOK) && (_find >= 0) && (_find < 1000)) {
 				if (!scene._bgShapes[_find]._examine.empty() &&
 						scene._bgShapes[_find]._examine[0] >= ' ')
 					inv.refreshInv();
@@ -1166,17 +1166,17 @@ void UserInterface::doInvControl() {
 				// is being tried on an object in the scene without an inventory
 				// object being highlighted first.
 
-				if ((inv._invMode == 2 || (_selector != -1 && inv._invMode == 3)) && _find >= 0) {
+				if ((inv._invMode == INVMODE_USE || (_selector != -1 && inv._invMode == INVMODE_GIVE)) && _find >= 0) {
 					events._pressed = events._released = false;
 					_infoFlag = true;
 					clearInfo();
 
-					int temp = _selector;	// Save the selector
+					int tempSel = _selector;	// Save the selector
 					_selector = -1;
 
 					inv.putInv(SLAM_DISPLAY);
-					_selector = temp;		// Restore it
-					temp = inv._invMode;
+					_selector = tempSel;		// Restore it
+					InvMode tempMode = inv._invMode;
 					inv._invMode = INVMODE_USE55;
 					inv.invCommands(true);
 
@@ -1187,12 +1187,13 @@ void UserInterface::doInvControl() {
 
 					inv.freeInv();
 
+					bool giveFl = (tempMode >= INVMODE_GIVE);
 					if (_selector >= 0)
 						// Use/Give inv object with scene object
-						checkUseAction(&scene._bgShapes[_find]._use[0], inv[_selector]._name, MUSE, _find, temp - 2);
+						checkUseAction(&scene._bgShapes[_find]._use[0], inv[_selector]._name, MUSE, _find, giveFl);
 					else
 						// Now inv object has been highlighted
-						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF*", MUSE, _find, temp - 2);
+						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF*", MUSE, _find, giveFl);
 
 					_selector = _oldSelector = -1;
 				}
@@ -2065,7 +2066,7 @@ void UserInterface::banishWindow(bool slideUp) {
 }
 
 void UserInterface::checkUseAction(const UseType *use, const Common::String &invName,
-		const char *const messages[], int objNum, int giveMode) {
+		const char *const messages[], int objNum, bool giveMode) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
 	Scene &scene = *_vm->_scene;
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 068d1eaa99..9fe69cde18 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -172,7 +172,7 @@ private:
 	 * Checks to see whether a USE action is valid on the given object
 	 */
 	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
-		int objNum, int giveMode);
+		int objNum, bool giveMode);
 	
 	/**
 	 * Called for OPEN, CLOSE, and MOVE actions are being done
-- 
cgit v1.2.3


From 456e0c584f2497b82b6be5f531f655b9681a11b8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 May 2015 20:07:24 +0200
Subject: SHERLOCK: Use a bit more MenuMode and SaveMode

---
 engines/sherlock/saveload.cpp       |  4 ++--
 engines/sherlock/scene.cpp          |  2 +-
 engines/sherlock/screen.h           | 32 ++++++++++++++++----------------
 engines/sherlock/talk.cpp           |  7 +++++--
 engines/sherlock/user_interface.cpp |  8 ++++----
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 9848f8160f..c13d6dd9ee 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -260,12 +260,12 @@ void SaveManager::highlightButtons(int btnIndex) {
 
 	screen.buttonPrint(Common::Point(ENV_POINTS[0][2], CONTROLS_Y), color, 1, "Exit");
 
-	if ((btnIndex == 1) || ((_envMode == 1) && (btnIndex != 2)))
+	if ((btnIndex == 1) || ((_envMode == SAVEMODE_LOAD) && (btnIndex != 2)))
 		screen.buttonPrint(Common::Point(ENV_POINTS[1][2], CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Load");
 	else
 		screen.buttonPrint(Common::Point(ENV_POINTS[1][2], CONTROLS_Y), COMMAND_FOREGROUND, true, "Load");
 
-	if ((btnIndex == 2) || ((_envMode == 2) && (btnIndex != 1)))
+	if ((btnIndex == 2) || ((_envMode == SAVEMODE_SAVE) && (btnIndex != 1)))
 		screen.buttonPrint(Common::Point(ENV_POINTS[2][2], CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Save");
 	else
 		screen.buttonPrint(Common::Point(ENV_POINTS[2][2], CONTROLS_Y), COMMAND_FOREGROUND, true, "Save");
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index d835b5caa8..573dfff2b1 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -150,7 +150,7 @@ void Scene::selectScene() {
 
 	loadScene(sceneFile);
 
-	// If the fade style was changed from running amovie, then reset it
+	// If the fade style was changed from running a movie, then reset it
 	if (_tempFadeStyle) {
 		screen._fadeStyle = _tempFadeStyle;
 		_tempFadeStyle = 0;
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 0369422bc3..ee9e800cdc 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -36,22 +36,22 @@ namespace Sherlock {
 #define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
 
 enum {
-	INFO_BLACK		= 1,
-	INFO_FOREGROUND	= 11,
-	INFO_BACKGROUND	= 1,
-	BORDER_COLOR	= 237,
-	INV_FOREGROUND	= 14,
-	INV_BACKGROUND	= 1,
-	COMMAND_HIGHLIGHTED = 10,
-	COMMAND_FOREGROUND = 15,
-	COMMAND_BACKGROUND = 4,
-	COMMAND_NULL = 248,
-	BUTTON_TOP = 233,
-	BUTTON_MIDDLE	= 244,
-	BUTTON_BOTTOM	= 248,
-	TALK_FOREGROUND = 12,
-	TALK_NULL		= 16,
-	PEN_COLOR		= 250
+	INFO_BLACK			= 1,
+	INFO_FOREGROUND		= 11,
+	INFO_BACKGROUND		= 1,
+	BORDER_COLOR		= 237,
+	INV_FOREGROUND		= 14,
+	INV_BACKGROUND		= 1,
+	COMMAND_HIGHLIGHTED	= 10,
+	COMMAND_FOREGROUND	= 15,
+	COMMAND_BACKGROUND	= 4,
+	COMMAND_NULL		= 248,
+	BUTTON_TOP			= 233,
+	BUTTON_MIDDLE		= 244,
+	BUTTON_BOTTOM		= 248,
+	TALK_FOREGROUND		= 12,
+	TALK_NULL			= 16,
+	PEN_COLOR			= 250
 };
 
 class SherlockEngine;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 734aa76e0a..47b9f6f277 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -146,7 +146,7 @@ void Talk::talkTo(const Common::String &filename) {
 	}
 
 	// Save the ui mode temporarily and switch to talk mode
-	int savedMode = ui._menuMode;
+	MenuMode savedMode = ui._menuMode;
 	ui._menuMode = TALK_MODE;
 
 	// Turn on the Exit option
@@ -183,7 +183,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 	// Restore any pressed button
 	if (!ui._windowOpen && savedMode != STD_MODE)
-		ui.restoreButton(savedMode - 1);
+		ui.restoreButton((int)(savedMode - 1));
 
 	// Clear the ui counter so that anything displayed on the info line
 	// before the window was opened isn't cleared
@@ -258,6 +258,9 @@ void Talk::talkTo(const Common::String &filename) {
 			events._pressed = events._released = events._oldButtons = 0;
 			abortFlag = true;
 			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 943d3498b2..c42829167b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -389,7 +389,7 @@ void UserInterface::handleInput() {
 				doMainControl();
 		}
 
-		if (pt.y < CONTROLS_Y && events._pressed && _oldTemp != (_menuMode - 1) && _oldKey != -1)
+		if (pt.y < CONTROLS_Y && events._pressed && _oldTemp != (int)(_menuMode - 1) && _oldKey != -1)
 			restoreButton(_oldTemp);
 	}
 }
@@ -438,7 +438,7 @@ void UserInterface::pushButton(int num) {
 void UserInterface::toggleButton(int num) {
 	Screen &screen = *_vm->_screen;
 
-	if (_menuMode != (num + 1)) {
+	if (_menuMode != (MenuMode)(num + 1)) {
 		_menuMode = (MenuMode)(num + 1);
 		_oldKey = COMMANDS[num];
 		_oldTemp = num;
@@ -700,7 +700,7 @@ void UserInterface::doEnvControl() {
 				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
 					found1 = 1;
 
-			if (_selector + saves._savegameIndex - 1 < MAX_SAVEGAME_SLOTS + (saves._envMode != 1))
+			if (_selector + saves._savegameIndex - 1 < MAX_SAVEGAME_SLOTS + (saves._envMode != SAVEMODE_LOAD))
 				_selector = _selector + saves._savegameIndex - 1;
 			else
 				_selector = -1;
@@ -734,7 +734,7 @@ void UserInterface::doEnvControl() {
 			} else if (_key >= '1' && _key <= '9') {
 				_keyboardInput = true;
 				_selector = _key - '1';
-				if (_selector >= MAX_SAVEGAME_SLOTS + (saves._envMode == 1 ? 0 : 1))
+				if (_selector >= MAX_SAVEGAME_SLOTS + (saves._envMode == SAVEMODE_LOAD ? 0 : 1))
 					_selector = -1;
 
 				if (saves.checkGameOnScreen(_selector))
-- 
cgit v1.2.3


From 20d859377df416cee0da460d1bac600df09058bb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 May 2015 22:30:47 +0200
Subject: SHERLOCK: Trim useless spaces and tabs

---
 engines/sherlock/detection.cpp     |  2 +-
 engines/sherlock/journal.cpp       | 18 +++++++++---------
 engines/sherlock/scalpel/darts.cpp |  8 +++-----
 engines/sherlock/scalpel/scalpel.h |  4 ++--
 engines/sherlock/scene.cpp         |  8 ++++----
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index da3ad4628f..ea68d79a1b 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -118,7 +118,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 
 class SherlockMetaEngine : public AdvancedMetaEngine {
 public:
-	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription), 
+	SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription),
 		sherlockGames, optionsList) {}
 
 	virtual const char *getName() const {
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index f3754db95f..ba6a809b44 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -496,7 +496,7 @@ void Journal::drawJournalFrame() {
 	screen.makeButton(Common::Rect(JOURNAL_POINTS[8][0], JOURNAL_BUTTONS_Y + 11,
 		JOURNAL_POINTS[8][1], JOURNAL_BUTTONS_Y + 21),
 		JOURNAL_POINTS[8][2] - screen.stringWidth("Print Text") / 2, "Print Text");
-	screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11), 
+	screen.buttonPrint(Common::Point(JOURNAL_POINTS[8][2], JOURNAL_BUTTONS_Y + 11),
 		COMMAND_NULL, false, "Print Text");
 }
 
@@ -918,7 +918,7 @@ bool Journal::handleEvents(int key) {
 		drawJournal(1, LINES_PER_PAGE);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	
+
 	} else if (((btn == BTN_DOWN && events._released) || key == 'D') && _down) {
 		// Scroll down
 		drawJournal(2, LINES_PER_PAGE);
@@ -934,7 +934,7 @@ bool Journal::handleEvents(int key) {
 
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	
+
 	} else if (((btn == BTN_SEARCH && events._released) || key == 'S') && !_journal.empty()) {
 		screen.buttonPrint(Common::Point(JOURNAL_POINTS[5][2], JOURNAL_BUTTONS_Y + 11), COMMAND_FOREGROUND, true, "Search");
 		bool notFound = false;
@@ -965,7 +965,7 @@ bool Journal::handleEvents(int key) {
 			}
 		} while (!doneFlag);
 		doneFlag = false;
-	
+
 	} else if (((btn == BTN_FIRST_PAGE && events._released) || key == 'F') && _up) {
 		// First page
 		_index = _sub = 0;
@@ -976,7 +976,7 @@ bool Journal::handleEvents(int key) {
 		drawJournal(0, 0);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	
+
 	} else if (((btn == BTN_LAST_PAGE && events._released) || key == 'L') && _down) {
 		// Last page
 		if ((_page + 10) > _maxPage)
@@ -1114,15 +1114,15 @@ int Journal::getSearchString(bool printError) {
 				xp -= screen.charWidth(name.lastChar());
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), INV_FOREGROUND);
 				name.deleteLastChar();
-			
+
 			} else  if (keyState.keycode == Common::KEYCODE_RETURN) {
 				done = 1;
-			
+
 			}  else if (keyState.keycode == Common::KEYCODE_ESCAPE) {
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
 				done = -1;
-			
-			} else if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && keyState.keycode != Common::KEYCODE_AT && 
+
+			} else if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && keyState.keycode != Common::KEYCODE_AT &&
 				name.size() < JOURNAL_SEACRH_MAX_CHARS && (xp + screen.charWidth(keyState.ascii)) < JOURNAL_SEARCH_RIGHT) {
 				char ch = toupper(keyState.ascii);
 				screen.vgaBar(Common::Rect(xp, yp, xp + 8, yp + 9), BUTTON_MIDDLE);
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 23ca95454f..96d272fed0 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -413,11 +413,9 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 		if (sound._musicOn) {
 			if (!(idx % 3))
 				sound.waitTimerRoland(1);
-		} else {
-			if (!(idx % 8))
-				events.wait(1);
-		}
-
+		} else if (!(idx % 8))
+			events.wait(1);
+	
 		++idx;
 	} while (!done);
 
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 14e30ff996..8743bfb7a9 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -31,9 +31,9 @@ namespace Sherlock {
 namespace Scalpel {
 
 enum { BLACKWOOD_CAPTURE = 2, BAKER_STREET = 4, DRAWING_ROOM = 12, STATION = 17, PUB_INTERIOR = 19,
-	LAWYER_OFFICE = 27, BAKER_ST_EXTERIOR = 39, RESCUE_ANNA = 52, MOOREHEAD_DEATH = 53, EXIT_GAME = 55, 
+	LAWYER_OFFICE = 27, BAKER_ST_EXTERIOR = 39, RESCUE_ANNA = 52, MOOREHEAD_DEATH = 53, EXIT_GAME = 55,
 	BRUMWELL_SUICIDE = 70, OVERHEAD_MAP2 = 98, DARTS_GAME = 99, OVERHEAD_MAP = 100 };
- 
+
 class ScalpelEngine : public SherlockEngine {
 private:
 	Darts *_darts;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 573dfff2b1..f97b791724 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -262,7 +262,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			}
 		} else {
 			Common::SeekableReadStream *infoStream;
-			
+
 			// Read shapes
 			infoStream = Resources::decompressLZ(*rrmStream, bgHeader._numStructs * 569);
 
@@ -271,7 +271,7 @@ bool Scene::loadScene(const Common::String &filename) {
 				_bgShapes[idx].load(*infoStream);
 
 			delete infoStream;
-			
+
 			// Read description texts
 			if (bgHeader._descSize) {
 				infoStream = Resources::decompressLZ(*rrmStream, bgHeader._descSize);
@@ -764,7 +764,7 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == NORMAL_FORWARD)
-			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position,
 				_bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
@@ -784,7 +784,7 @@ void Scene::updateBackground() {
 
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
 				_bgShapes[idx]._misc == FORWARD)
-			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position, 
+			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position,
 				_bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
-- 
cgit v1.2.3


From ed698701d76f055b035f4b7fef0ed0d88d0374da Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 20 May 2015 00:08:42 +0200
Subject: SDL: Fix compilation with SDL2.

---
 backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index d74a6082e3..9cb14525ee 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -125,6 +125,8 @@ SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSou
 	_hwscreen(0),
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	_renderer(nullptr), _screenTexture(nullptr),
+#else
+	_originalBitsPerPixel(0),
 #endif
 	_screen(0), _tmpscreen(0),
 #ifdef USE_RGB_COLOR
@@ -144,7 +146,6 @@ SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSou
 #ifdef USE_SDL_DEBUG_FOCUSRECT
 	_enableFocusRectDebugCode(false), _enableFocusRect(false), _focusRect(),
 #endif
-	_originalBitsPerPixel(0),
 	_transactionMode(kTransactionNone) {
 
 	// allocate palette storage
@@ -797,12 +798,14 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
 		_hwscreen = g_eventRec.getSurface(_videoMode.hardwareWidth, _videoMode.hardwareHeight);
 	} else
 #endif
-		{
+	{
 		// Save the original bpp to be able to restore the video mode on unload
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
 		if (_originalBitsPerPixel == 0) {
 			const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
 			_originalBitsPerPixel = videoInfo->vfmt->BitsPerPixel;
 		}
+#endif
 
 		_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 16,
 			_videoMode.fullscreen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
@@ -937,10 +940,12 @@ void SurfaceSdlGraphicsManager::unloadGFXMode() {
 #endif
 	DestroyScalers();
 
+#if !SDL_VERSION_ATLEAST(2, 0, 0)
 	// Reset video mode to original
 	// This will ensure that any new graphic manager will use the initial BPP when listing available modes
 	if (_originalBitsPerPixel != 0)
 		SDL_SetVideoMode(_videoMode.screenWidth, _videoMode.screenHeight, _originalBitsPerPixel, _videoMode.fullscreen ? (SDL_FULLSCREEN | SDL_SWSURFACE) : SDL_SWSURFACE);
+#endif
 }
 
 bool SurfaceSdlGraphicsManager::hotswapGFXMode() {
-- 
cgit v1.2.3


From 9c56d616b0031980011cd0e685082d8782b36bc2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 19:08:48 -0400
Subject: SHERLOCK: Fix regression in intro sequence display

---
 engines/sherlock/animation.cpp |  2 +-
 engines/sherlock/surface.h     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 7c1f2cd229..21d63633d3 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -88,7 +88,7 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
 
 			// Draw the sprite. Note that we explicitly use the raw frame below, rather than the ImageFrame,
 			// since we don't want the offsets in the image file to be used, just the explicit position we specify
-			screen.transBlitFrom(images[imageFrame], pt);
+			screen.transBlitFrom(images[imageFrame]._frame, pt);
 		} else {
 			// At this point, either the sprites for the frame has been complete, or there weren't any sprites
 			// at all to draw for the frame
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 1cb78db072..ccabf02a23 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -53,12 +53,6 @@ private:
 	 * Draws a sub-section of a surface at a given position within this surface
 	 */
 	void blitFrom(const Graphics::Surface &src, const Common::Point &pt, const Common::Rect &srcBounds);
-
-	/**
-	 * Draws a surface at a given position within this surface with transparency
-	 */
-	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		bool flipped = false, int overrideColor = 0);
 protected:
 	Graphics::Surface _surface;
 
@@ -116,6 +110,12 @@ public:
 	void transBlitFrom(const Surface &src, const Common::Point &pt,
 		bool flipped = false, int overrideColor = 0);
 
+	/**
+	 * Draws a surface at a given position within this surface with transparency
+	 */
+	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
+		bool flipped = false, int overrideColor = 0);
+
 	/**
 	 * Fill a given area of the surface with a given color
 	 */
-- 
cgit v1.2.3


From de08eb071e37013627dd4de941a50b8e45441c71 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 19:11:57 -0400
Subject: SHERLOCK: Use more constants in doEnvControl

---
 engines/sherlock/user_interface.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index c42829167b..8121eee7bc 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -696,7 +696,7 @@ void UserInterface::doEnvControl() {
 		// Check for a filename entry being highlighted
 		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10)) {
 			int found1 = 0;
-			for (_selector = 0; (_selector < 5) && !found1; ++_selector)
+			for (_selector = 0; (_selector < ONSCREEN_FILES_COUNT) && !found1; ++_selector)
 				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
 					found1 = 1;
 
@@ -746,7 +746,7 @@ void UserInterface::doEnvControl() {
 	}
 
 	if (_selector != _oldSelector)  {
-		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + 5)) {
+		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + ONSCREEN_FILES_COUNT)) {
 			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
 				INV_FOREGROUND, "%d.", _oldSelector + 1);
 			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
@@ -810,9 +810,9 @@ void UserInterface::doEnvControl() {
 				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
 					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
 
-				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + 5); ++idx) {
+				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT); ++idx) {
 					color = INV_FOREGROUND;
-					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + 5))
+					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT))
 						color = TALK_FOREGROUND;
 
 					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%d.", idx + 1);
@@ -823,7 +823,7 @@ void UserInterface::doEnvControl() {
 
 				color = !saves._savegameIndex ? COMMAND_NULL : COMMAND_FOREGROUND;
 				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
-				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - 5) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) ? COMMAND_NULL : COMMAND_FOREGROUND;
 				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
 
 				// Check whether there are more pending U keys pressed
@@ -835,15 +835,15 @@ void UserInterface::doEnvControl() {
 					moreKeys = _key == 'U';
 				}
 			} while ((saves._savegameIndex) && moreKeys);
-		} else if (((found == 4 && events._released) || _key == 'D') && saves._savegameIndex < (MAX_SAVEGAME_SLOTS - 5)) {
+		} else if (((found == 4 && events._released) || _key == 'D') && saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT)) {
 			bool moreKeys;
 			do {
 				saves._savegameIndex++;
 				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
 					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
 
-				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + 5); ++idx) {
-					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + 5))
+				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT); ++idx) {
+					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT))
 						color = TALK_FOREGROUND;
 					else
 						color = INV_FOREGROUND;
@@ -859,7 +859,7 @@ void UserInterface::doEnvControl() {
 				color = (!saves._savegameIndex) ? COMMAND_NULL : COMMAND_FOREGROUND;
 				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
 
-				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - 5) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) ? COMMAND_NULL : COMMAND_FOREGROUND;
 				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
 
 				// Check whether there are more pending D keys pressed
@@ -870,8 +870,8 @@ void UserInterface::doEnvControl() {
 
 					moreKeys = _key == 'D';
 				}
-			} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - 5) && moreKeys);
-		} else if ((found == 5 && events._released) || _key == 'Q') {
+			} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) && moreKeys);
+		} else if ((found == ONSCREEN_FILES_COUNT && events._released) || _key == 'Q') {
 			clearWindow();
 			screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
 			screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
-- 
cgit v1.2.3


From 4a13462db2401c9f90e2bc1675162aeff147662f Mon Sep 17 00:00:00 2001
From: Kirben
Date: Wed, 20 May 2015 11:48:31 +1000
Subject: AGOS: Fix regression when loading saved games in PC version of
 Waxworks.

---
 engines/agos/saveload.cpp | 87 ++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 06ab60276d..5c54e4874b 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1201,6 +1201,7 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 	char ident[100];
 	Common::SeekableReadStream *f = NULL;
 	uint num, item_index, i, j;
+	uint16 room = _currentRoom;
 
 	_videoLockOut |= 0x100;
 
@@ -1259,50 +1260,7 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 		}
 		f->readUint16BE();
 
-		uint16 room = _currentRoom;
 		_currentRoom = f->readUint16BE();
-
-		if (_roomsListPtr) {
-			byte *p = _roomsListPtr;
-			if (room == _currentRoom) {
-				for (;;) {
-					uint16 minNum = READ_BE_UINT16(p); p += 2;
-					if (minNum == 0)
-						break;
-
-					uint16 maxNum = READ_BE_UINT16(p); p += 2;
-
-					 for (uint16 z = minNum; z <= maxNum; z++) {
-						uint16 itemNum = z + 2;
-						Item *item = derefItem(itemNum);
-
-						num = (itemNum - _itemArrayInited);
-						item->state = _roomStates[num].state;
-						item->classFlags = _roomStates[num].classFlags;
-						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
-						subRoom->roomExitStates = _roomStates[num].roomExitStates;
-					}
-				}
-			} else {
-				for (;;) {
-					uint16 minNum = READ_BE_UINT16(p); p += 2;
-					if (minNum == 0)
-						break;
-
-					uint16 maxNum = READ_BE_UINT16(p); p += 2;
-
-					 for (uint16 z = minNum; z <= maxNum; z++) {
-						uint16 itemNum = z + 2;
-						_itemArrayPtr[itemNum] = 0;
-					}
-				}
-			}
-		}
-
-		if (room != _currentRoom) {
-			_roomsListPtr = 0;
-			loadRoomItems(_currentRoom);
-		}
 	}
 
 	item_index = 1;
@@ -1361,6 +1319,49 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 		}
 	}
 
+	if (getGameType() == GType_WW && getPlatform() == Common::kPlatformDOS) {
+		if (_roomsListPtr) {
+			byte *p = _roomsListPtr;
+			if (room == _currentRoom) {
+				for (;;) {
+					uint16 minNum = READ_BE_UINT16(p); p += 2;
+					if (minNum == 0)
+						break;
+
+					uint16 maxNum = READ_BE_UINT16(p); p += 2;
+
+					 for (uint16 z = minNum; z <= maxNum; z++) {
+						uint16 itemNum = z + 2;
+						Item *item = derefItem(itemNum);
+
+						num = (itemNum - _itemArrayInited);
+						item->state = _roomStates[num].state;
+						item->classFlags = _roomStates[num].classFlags;
+						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
+						subRoom->roomExitStates = _roomStates[num].roomExitStates;
+					}
+				}
+			} else {
+				for (;;) {
+					uint16 minNum = READ_BE_UINT16(p); p += 2;
+					if (minNum == 0)
+						break;
+
+					uint16 maxNum = READ_BE_UINT16(p); p += 2;
+
+					 for (uint16 z = minNum; z <= maxNum; z++) {
+						uint16 itemNum = z + 2;
+						_itemArrayPtr[itemNum] = 0;
+					}
+				}
+			}
+		}
+
+		if (room != _currentRoom) {
+			_roomsListPtr = 0;
+			loadRoomItems(_currentRoom);
+		}
+	}
 	// read the variables
 	for (i = 0; i != _numVars; i++) {
 		writeVariable(i, f->readUint16BE());
-- 
cgit v1.2.3


From 0ca72189fd7bef87892839461e59fe94fc239ced Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 19 May 2015 23:16:31 -0400
Subject: TSAGE: Beginnings of game & scene classes for Sherlock Holmes Logo
 display

---
 engines/tsage/detection_tables.h         |  16 ++++
 engines/tsage/globals.cpp                |   7 ++
 engines/tsage/module.mk                  |   1 +
 engines/tsage/sherlock/sherlock_logo.cpp | 149 +++++++++++++++++++++++++++++++
 engines/tsage/sherlock/sherlock_logo.h   |  73 +++++++++++++++
 engines/tsage/tsage.h                    |   3 +-
 6 files changed, 248 insertions(+), 1 deletion(-)
 create mode 100644 engines/tsage/sherlock/sherlock_logo.cpp
 create mode 100644 engines/tsage/sherlock/sherlock_logo.h

diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index da283a27e7..1ff0cde18c 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -185,6 +185,22 @@ static const tSageGameDescription gameDescriptions[] = {
 		GType_Ringworld2,
 		GF_CD | GF_ALT_REGIONS | GF_DEMO
 	},
+
+	// The Lost Files of Sherlock Holmes - The Case of the Serrated Scalpel (Logo)
+	{
+		{
+			"sherlock1",
+			"Logo",
+			AD_ENTRY1s("sf3.rlb", "c8e1a82c67c3caf57368eadde13dc15f", 0),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO0()
+		},
+		GType_Sherlock1,
+		GF_FLOPPY
+	},
+
 	{ AD_TABLE_END_MARKER, 0, 0 }
 };
 
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index e75febfdbc..3b78af3e3e 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -27,6 +27,7 @@
 #include "tsage/ringworld/ringworld_logic.h"
 #include "tsage/ringworld2/ringworld2_logic.h"
 #include "tsage/ringworld2/ringworld2_scenes0.h"
+#include "tsage/sherlock/sherlock_logo.h"
 #include "tsage/staticres.h"
 
 namespace TsAGE {
@@ -156,6 +157,12 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface
 		_game = new Ringworld2::Ringworld2Game();
 		_sceneHandler = new Ringworld2::SceneHandlerExt();
 		break;
+
+	case GType_Sherlock1:
+		_inventory = nullptr;
+		_sceneHandler = new SceneHandler();
+		_game = new Sherlock::SherlockLogo();
+		break;
 	}
 
 }
diff --git a/engines/tsage/module.mk b/engines/tsage/module.mk
index d62f398c20..e23b157a95 100644
--- a/engines/tsage/module.mk
+++ b/engines/tsage/module.mk
@@ -47,6 +47,7 @@ MODULE_OBJS := \
 	ringworld2/ringworld2_vampire.o \
 	saveload.o \
 	scenes.o \
+	sherlock/sherlock_logo.o \
 	sound.o \
 	staticres.o \
 	tsage.o \
diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
new file mode 100644
index 0000000000..cca6982210
--- /dev/null
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -0,0 +1,149 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "tsage/sherlock/sherlock_logo.h"
+#include "tsage/scenes.h"
+#include "tsage/tsage.h"
+
+namespace TsAGE {
+
+namespace Sherlock {
+
+void SherlockLogo::start() {
+	// Start the demo's single scene
+	g_globals->_sceneManager.changeScene(1);
+
+	g_globals->_events.setCursor(CURSOR_NONE);
+}
+
+Scene *SherlockLogo::createScene(int sceneNumber) {
+	// The demo only has a single scene, so ignore the scene number and always return it
+	return new SherlockLogoScene();
+}
+
+bool SherlockLogo::canLoadGameStateCurrently() {
+	return false;
+}
+
+bool SherlockLogo::canSaveGameStateCurrently() {
+	return false;
+}
+
+void SherlockLogo::processEvent(Event &event) {
+	if (event.eventType == EVENT_BUTTON_DOWN || (event.eventType == EVENT_KEYPRESS &&
+			event.kbd.keycode == Common::KEYCODE_ESCAPE))
+		quitGame();
+}
+
+void SherlockLogo::quitGame() {
+	g_vm->quitGame();
+}
+
+/*--------------------------------------------------------------------------*/
+
+void SherlockLogoScene::Action1::signal() {
+	SherlockLogoScene &scene = *(SherlockLogoScene *)GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		GLOBALS._scenePalette.loadPalette(1111);
+		GLOBALS._scenePalette.loadPalette(1);
+		GLOBALS._scenePalette.refresh();
+		setDelay(1);
+		break;
+
+	case 1:
+		GLOBALS._scenePalette.addFader(scene._palette1._palette, 256, 6, this);
+		break;
+
+	case 2:
+		scene._object1.postInit();
+		scene._object1.setVisage("0016.vis");
+		scene._object1._strip = 1;
+		scene._object1._frame = 1;
+		scene._object1.setPosition(Common::Point(169, 107));
+		scene._object1.changeZoom(100);
+		scene._object1._numFrames = 7;
+		scene._object1.animate(ANIM_MODE_5, this);
+		break;
+
+	case 3:
+		scene._object1._strip = 2;
+		scene._object1._strip = 1;
+		scene._object1.changeZoom(100);
+		scene._object1.animate(ANIM_MODE_4, 4, 11, 1, this);
+		break;
+
+	case 4:
+		GLOBALS._scenePalette.addFader(scene._palette2._palette, 256, 6, this);
+		break;
+
+	case 5:
+		scene._rect1 = Rect(0, 26, 312, 190);
+		scene._gfxManager2.activate();
+		scene._gfxManager2.fillRect(scene._rect1, 0);
+		scene._gfxManager2.deactivate();
+		//word_2B4AA = 3;
+
+		setDelay(10);
+		break;
+
+	case 6:
+		GLOBALS._scenePalette.loadPalette(12);
+		GLOBALS._scenePalette.refresh();
+		break;
+
+	// TODO
+
+	default:
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+void SherlockLogoScene::postInit(SceneObjectList *OwnerList) {
+	loadScene(10);
+	Scene::postInit(OwnerList);
+
+	_palette1.loadPalette(10);
+	_palette2.loadPalette(1111);
+	_palette2.loadPalette(1);
+	_palette3.loadPalette(1111);
+	_palette3.loadPalette(14);
+
+	_object4.postInit();
+	_object4.setVisage("0019.vis");
+	_object4._strip = 1;
+	_object4._frame = 1;
+	_object4.setPosition(Common::Point(155, 94));
+	_object4.changeZoom(100);
+	_object4.animate(ANIM_MODE_NONE, nullptr);
+	_object4.hide();
+
+	setAction(&_action1);
+}
+
+
+} // End of namespace Sherlock
+
+} // End of namespace TsAGE
diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h
new file mode 100644
index 0000000000..947ea086bc
--- /dev/null
+++ b/engines/tsage/sherlock/sherlock_logo.h
@@ -0,0 +1,73 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef TSAGE_SHERLOCK_LOGO_H
+#define TSAGE_SHERLOCK_LOGO_H
+
+#include "common/scummsys.h"
+#include "tsage/events.h"
+#include "tsage/core.h"
+#include "tsage/scenes.h"
+#include "tsage/globals.h"
+#include "tsage/sound.h"
+
+namespace TsAGE {
+
+namespace Sherlock {
+
+using namespace TsAGE;
+
+class Object : public SceneObject {
+public:
+	void setVisage(const Common::String &name) {}
+};
+
+class SherlockLogo: public Game {
+public:
+	virtual void start();
+	virtual Scene *createScene(int sceneNumber);
+	virtual void quitGame();
+	virtual void processEvent(Event &event);
+	virtual bool canSaveGameStateCurrently();
+	virtual bool canLoadGameStateCurrently();
+};
+
+class SherlockLogoScene: public Scene {
+	class Action1 : public Action {
+	public:
+		virtual void signal();
+	};
+public:
+	ScenePalette _palette1, _palette2, _palette3;
+	Object _object1, _object2, _object3, _object4;
+	Action1 _action1;
+	Rect _rect1;
+	GfxManager _gfxManager2;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+};
+
+} // End of namespace Sherlock
+
+} // End of namespace TsAGE
+
+#endif
diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h
index ea4f5da6ea..667a8daa59 100644
--- a/engines/tsage/tsage.h
+++ b/engines/tsage/tsage.h
@@ -42,7 +42,8 @@ namespace TsAGE {
 enum {
 	GType_Ringworld = 0,
 	GType_BlueForce = 1,
-	GType_Ringworld2 = 2
+	GType_Ringworld2 = 2,
+	GType_Sherlock1 = 5
 };
 
 enum {
-- 
cgit v1.2.3


From ed7dd6823f878238b86f1006ab438588751b6634 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 20 May 2015 07:12:56 +0200
Subject: SHERLOCK: Add missing game type in detection

---
 engines/sherlock/detection_tables.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index a13231d3fc..9315fa1bdd 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -80,7 +80,8 @@ static const SherlockGameDescription gameDescriptions[] = {
 			Common::kPlatformDOS,
 			ADGF_UNSTABLE,
 			GUIO0()
-		}
+		},
+		GType_RoseTattoo
 	},
 
 	{
-- 
cgit v1.2.3


From fe8139b57168bbb85eb1d4bb0d2c62219ee6383d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 20 May 2015 07:13:18 +0200
Subject: SHERLOCK: Improve comment as suggested by LordHoto

---
 engines/sherlock/user_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 8121eee7bc..ed6558c6dd 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1159,7 +1159,7 @@ void UserInterface::doInvControl() {
 				if (talk._talkToAbort)
 					return;
 
-				// Now check for the Use and Give actions. If inv_mode is 3,
+				// Now check for the Use and Give actions. If inv_mode is INVMODE_GIVE,
 				// that means GIVE is in effect, _selector is the object being
 				// given, and _find is the target.
 				// The same applies to USE, except if _selector is -1, then USE
-- 
cgit v1.2.3


From 30133cef0e2a840325c1b46b106628c3cccd7d04 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 08:28:12 -0400
Subject: SHERLOCK: Re-add GCC_PRINTF and fix resulting GCC warnings

---
 engines/sherlock/journal.cpp        | 20 ++++++++++----------
 engines/sherlock/map.cpp            |  6 +++---
 engines/sherlock/objects.cpp        |  6 +++---
 engines/sherlock/scalpel/darts.cpp  |  4 ++--
 engines/sherlock/screen.cpp         |  8 ++++----
 engines/sherlock/screen.h           |  4 ++--
 engines/sherlock/talk.cpp           | 26 +++++++++++++-------------
 engines/sherlock/user_interface.cpp | 22 +++++++++++-----------
 8 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index ba6a809b44..5a8338bdc8 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -732,26 +732,26 @@ bool Journal::drawJournal(int direction, int howFar) {
 					screen.gPrint(Common::Point(53, yp), 15, "%s", lineStart.c_str() + 1);
 				} else {
 					width = screen.stringWidth(lineStart.c_str());
-					screen.gPrint(Common::Point(53, yp), PEN_COLOR, lineStart.c_str());
-				}
+					screen.gPrint(Common::Point(53, yp), PEN_COLOR, "%s", lineStart.c_str());
+				 }
 
 				// Print out the found keyword
 				Common::String lineMatch(matchP, matchP + _find.size());
-				screen.gPrint(Common::Point(53 + width, yp), INV_FOREGROUND, lineMatch.c_str());
+				screen.gPrint(Common::Point(53 + width, yp), INV_FOREGROUND, "%s", lineMatch.c_str());
 				width += screen.stringWidth(lineMatch.c_str());
 
 				// Print remainder of line
-				screen.gPrint(Common::Point(53 + width, yp), PEN_COLOR, matchP + _find.size());
+				screen.gPrint(Common::Point(53 + width, yp), PEN_COLOR, "%s", matchP + _find.size());
 			} else if (_lines[temp].hasPrefix("@")) {
-				screen.gPrint(Common::Point(53, yp), 15, _lines[temp].c_str() + 1);
+				screen.gPrint(Common::Point(53, yp), 15, "%s", _lines[temp].c_str() + 1);
 			} else {
-				screen.gPrint(Common::Point(53, yp), PEN_COLOR, _lines[temp].c_str());
+				screen.gPrint(Common::Point(53, yp), PEN_COLOR, "%s", _lines[temp].c_str());
 			}
 		} else {
 			if (_lines[temp].hasPrefix("@")) {
-				screen.gPrint(Common::Point(53, yp), 15, _lines[temp].c_str() + 1);
+				screen.gPrint(Common::Point(53, yp), 15, "%s", _lines[temp].c_str() + 1);
 			} else {
-				screen.gPrint(Common::Point(53, yp), PEN_COLOR, _lines[temp].c_str());
+				screen.gPrint(Common::Point(53, yp), PEN_COLOR, "%s", _lines[temp].c_str());
 			}
 		}
 
@@ -1033,7 +1033,7 @@ int Journal::getSearchString(bool printError) {
 			INV_FOREGROUND, "Text Not Found !");
 	} else if (!_find.empty()) {
 		// There's already a search term, display it already
-		screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, _find.c_str());
+		screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, "%s", _find.c_str());
 		name = _find;
 	}
 
@@ -1051,7 +1051,7 @@ int Journal::getSearchString(bool printError) {
 		screen.fillRect(Common::Rect(13, 186, 306, 195), BUTTON_MIDDLE);
 
 		if (!_find.empty()) {
-			screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, _find.c_str());
+			screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, "%s", _find.c_str());
 			name = _find;
 		}
 
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index ed2912edc9..96442893ef 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -349,9 +349,9 @@ void Map::showPlaceName(int idx, bool highlighted) {
 
 	if (highlighted) {
 		int xp = (SHERLOCK_SCREEN_WIDTH - screen.stringWidth(name)) / 2;
-		screen.gPrint(Common::Point(xp + 2, 2), 0, name.c_str());
-		screen.gPrint(Common::Point(xp + 1, 1), 0, name.c_str());
-		screen.gPrint(Common::Point(xp, 0), 12, name.c_str());
+		screen.gPrint(Common::Point(xp + 2, 2), 0, "%s", name.c_str());
+		screen.gPrint(Common::Point(xp + 1, 1), 0, "%s", name.c_str());
+		screen.gPrint(Common::Point(xp, 0), 12, "%s", name.c_str());
 
 		screen.slamArea(xp, 0, width + 2, 15);
 	}
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 94457b3dd5..02f2526ae9 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -865,13 +865,13 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 		int messageNum = atoi(name.c_str() + 1);
 		ui._infoFlag = true;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[messageNum]);
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[messageNum]);
 		ui._menuCounter = 25;
 	} else if (name.hasPrefix("@")) {
 		// Message attached to canimation
 		ui._infoFlag = true;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, name.c_str() + 1);
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", name.c_str() + 1);
 		printed = true;
 		ui._menuCounter = 25;
 	}
@@ -955,7 +955,7 @@ int Object::pickUpObject(const char *const messages[]) {
 
 		ui._infoFlag = true;
 		ui.clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[message]);
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[message]);
 		ui._menuCounter = 30;
 	} else {
 		// Pick it up
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index 96d272fed0..de93621e2f 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -235,10 +235,10 @@ void Darts::showNames(int playerNum) {
 
 	if (playerNum != 0)
 		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y), PLAYER_COLOR + 3,
-			_opponent.c_str());
+			"%s", _opponent.c_str());
 	else
 		screen.print(Common::Point(STATUS_INFO_X + 50, STATUS_INFO_Y), color,
-			_opponent.c_str());
+			"%s", _opponent.c_str());
 
 	screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X + 50, STATUS_INFO_Y + 10,
 		STATUS_INFO_X + 81, STATUS_INFO_Y + 12), color);
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 1d3c0e0dbf..e70d0614d1 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -369,16 +369,16 @@ void Screen::buttonPrint(const Common::Point &pt, byte color, bool slamIt,
 		if (slamIt) {
 			print(Common::Point(xStart, pt.y + 1), COMMAND_HIGHLIGHTED, "%c", str[0]);
 			print(Common::Point(xStart + charWidth(str[0]), pt.y + 1),
-				COMMAND_FOREGROUND, str.c_str() + 1);
+				COMMAND_FOREGROUND, "%s", str.c_str() + 1);
 		} else {
 			gPrint(Common::Point(xStart, pt.y), COMMAND_HIGHLIGHTED, "%c", str[0]);
 			gPrint(Common::Point(xStart + charWidth(str[0]), pt.y),
-				COMMAND_FOREGROUND, str.c_str() + 1);
+				COMMAND_FOREGROUND, "%s", str.c_str() + 1);
 		}
 	} else if (slamIt) {
-		print(Common::Point(xStart, pt.y + 1), color, str.c_str());
+		print(Common::Point(xStart, pt.y + 1), color, "%s", str.c_str());
 	} else {
-		gPrint(Common::Point(xStart, pt.y), color, str.c_str());
+		gPrint(Common::Point(xStart, pt.y), color, "%s", str.c_str());
 	}
 }
 
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index ee9e800cdc..a2c0aa3c84 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -145,12 +145,12 @@ public:
 	 * Prints the text passed onto the back buffer at the given position and color.
 	 * The string is then blitted to the screen
 	 */
-	void print(const Common::Point &pt, byte color, const char *formatStr, ...);
+	void print(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5);
 
 	/**
 	 * Print a strings onto the back buffer without blitting it to the screen
 	 */
-	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...);
+	void gPrint(const Common::Point &pt, byte color, const char *formatStr, ...) GCC_PRINTF(4, 5);
 
 	/**
 	 * Copies a section of the second back buffer into the main back buffer
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 47b9f6f277..bd4e8c2e78 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -772,23 +772,23 @@ int Talk::talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt
 					// Are we drawing the first line?
 					if (lineStartP == msg.c_str()) {
 						// We are, so print the number and then the text
-						screen.print(Common::Point(16, lineY), color, number.c_str());
+						screen.print(Common::Point(16, lineY), color, "%s", number.c_str());
 					}
 
 					// Draw the line with an indent
-					screen.print(Common::Point(30, lineY), color, sLine.c_str());
+					screen.print(Common::Point(30, lineY), color, "%s", sLine.c_str());
 				} else {
-					screen.print(Common::Point(16, lineY), color, sLine.c_str());
+					screen.print(Common::Point(16, lineY), color, "%s", sLine.c_str());
 				}
 			} else {
 				if (numberFlag) {
 					if (lineStartP == msg.c_str()) {
-						screen.gPrint(Common::Point(16, lineY - 1), color, number.c_str());
+						screen.gPrint(Common::Point(16, lineY - 1), color, "%s", number.c_str());
 					}
 
-					screen.gPrint(Common::Point(30, lineY - 1), color, sLine.c_str());
+					screen.gPrint(Common::Point(30, lineY - 1), color, "%s", sLine.c_str());
 				} else {
-					screen.gPrint(Common::Point(16, lineY - 1), color, sLine.c_str());
+					screen.gPrint(Common::Point(16, lineY - 1), color, "%s", sLine.c_str());
 				}
 			}
 
@@ -1367,7 +1367,7 @@ void Talk::doScript(const Common::String &script) {
 					tempString += str[idx + 1];
 				str += str[0];
 
-				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, tempString.c_str());
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempString.c_str());
 				ui._menuCounter = 30;
 				break;
 
@@ -1426,9 +1426,9 @@ void Talk::doScript(const Common::String &script) {
 				// If the window is open, display the name directly on-screen.
 				// Otherwise, simply draw it on the back buffer
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), TALK_FOREGROUND, NAMES[_speaker & 127]);
+					screen.print(Common::Point(16, yp), TALK_FOREGROUND, "%s", NAMES[_speaker & 127]);
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, NAMES[_speaker & 127]);
+					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, "%s", NAMES[_speaker & 127]);
 					openTalkWindow = true;
 				}
 
@@ -1466,16 +1466,16 @@ void Talk::doScript(const Common::String &script) {
 			// If the speaker indicates a description file, print it in yellow
 			if (_speaker != -1) {
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, lineStr.c_str());
+					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, lineStr.c_str());
+					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 					openTalkWindow = true;
 				}
 			} else {
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, lineStr.c_str());
+					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, lineStr.c_str());
+					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 					openTalkWindow = true;
 				}
 			}
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index ed6558c6dd..940fcbca03 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -230,7 +230,7 @@ void UserInterface::handleInput() {
 					if (_help != -1 && !scene._bgShapes[_bgFound]._description.empty()
 							&& scene._bgShapes[_bgFound]._description[0] != ' ')
 						screen.print(Common::Point(0, INFO_LINE + 1),
-						INFO_FOREGROUND, scene._bgShapes[_bgFound]._description.c_str());
+						INFO_FOREGROUND, "%s", scene._bgShapes[_bgFound]._description.c_str());
 
 					_oldBgFound = _bgFound;
 				}
@@ -603,14 +603,14 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 
 						if (_selector != -1) {
 							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
-								TALK_FOREGROUND, inv[_selector]._name.c_str());
+								TALK_FOREGROUND, "%s", inv[_selector]._name.c_str());
 							screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
 								INFO_FOREGROUND, " on ");
 							screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
-								INFO_FOREGROUND, tempStr.c_str());
+								INFO_FOREGROUND, "%s", tempStr.c_str());
 						} else {
 							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
-								INFO_FOREGROUND, tempStr.c_str());
+								INFO_FOREGROUND, "%s", tempStr.c_str());
 						}
 					} else if (temp >= 0 && temp < 1000 && _selector != -1 &&
 							scene._bgShapes[temp]._aType == PERSON) {
@@ -632,14 +632,14 @@ void UserInterface::lookScreen(const Common::Point &pt) {
 						screen.print(Common::Point(xStart, INFO_LINE + 1),
 							INFO_FOREGROUND, "Give ");
 						screen.print(Common::Point(xStart + width, INFO_LINE + 1),
-							TALK_FOREGROUND, inv[_selector]._name.c_str());
+							TALK_FOREGROUND, "%s", inv[_selector]._name.c_str());
 						screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
 							INFO_FOREGROUND, " to ");
 						screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
-							INFO_FOREGROUND, tempStr.c_str());
+							INFO_FOREGROUND, "%s", tempStr.c_str());
 					}
 				} else {
-					screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, tempStr.c_str());
+					screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempStr.c_str());
 				}
 
 				_infoFlag = true;
@@ -664,7 +664,7 @@ void UserInterface::lookInv() {
 			if (temp < inv._holdings) {
 				clearInfo();
 				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
-					inv[temp]._description.c_str());
+					"%s", inv[temp]._description.c_str());
 				_infoFlag = true;
 				_oldLook = temp;
 			}
@@ -1896,7 +1896,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 		// Print out the line
 		Common::String line(lineStartP, msgP);
 		screen.gPrint(Common::Point(16, CONTROLS_Y + 12 + lineNum * 9),
-			INV_FOREGROUND, line.c_str());
+			INV_FOREGROUND, "%s", line.c_str());
 
 		if (!endOfStr)
 			// Start next line at start of the nxet word after space
@@ -2148,7 +2148,7 @@ void UserInterface::checkUseAction(const UseType *use, const Common::String &inv
 		} else if (messages == nullptr) {
 			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that.");
 		} else {
-			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[0]);
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[0]);
 		}
 
 		_infoFlag = true;
@@ -2174,7 +2174,7 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
 		// Invalid action, to print error message
 		_infoFlag = true;
 		clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, messages[action._cAnimNum]);
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[action._cAnimNum]);
 		_infoFlag = true;
 
 		// Set how long to show the message
-- 
cgit v1.2.3


From e115da8f3dd4622cf0f89f55ce00af415eac251e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 20:32:04 -0400
Subject: SHERLOCK: Standardised keypress fields as char type

---
 engines/sherlock/settings.cpp       |  4 +--
 engines/sherlock/user_interface.cpp | 56 +++++++++++++++++--------------------
 engines/sherlock/user_interface.h   |  4 +--
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index 9f1549a0b8..b26acde615 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -241,7 +241,7 @@ void Settings::show(SherlockEngine *vm) {
 				if (ui._key == Common::KEYCODE_RETURN || ui._key == Common::KEYCODE_SPACE) {
 					events._pressed = false;
 					events._oldButtons = 0;
-					ui._keycode = Common::KEYCODE_INVALID;
+					ui._keyPress = '\0';
 					events._released = true;
 				}
 			}
@@ -327,7 +327,7 @@ void Settings::show(SherlockEngine *vm) {
 	if (updateConfig)
 		vm->saveConfig();
 
-	ui._keycode = Common::KEYCODE_INVALID;
+	ui._keyPress = '\0';
 	ui._keyboardInput = false;
 	ui._windowBounds.top = CONTROLS_Y1;
 	ui._key = -1;
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 940fcbca03..92fc89305e 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -91,13 +91,13 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 
 	_bgFound = 0;
 	_oldBgFound = -1;
-	_keycode = Common::KEYCODE_INVALID;
+	_keyPress = '\0';
 	_helpStyle = false;
 	_menuCounter = 0;
 	_menuMode = STD_MODE;
 	_help = _oldHelp = 0;
 	_lookHelp = 0;
-	_key = _oldKey = 0;
+	_key = _oldKey = '\0';
 	_temp = _oldTemp = 0;
 	_temp1 = 0;
 	_invLookFlag = 0;
@@ -152,13 +152,13 @@ void UserInterface::handleInput() {
 
 	Common::Point pt = events.mousePos();
 	_bgFound = scene.findBgShape(Common::Rect(pt.x, pt.y, pt.x + 1, pt.y + 1));
-	_keycode = Common::KEYCODE_INVALID;
+	_keyPress = '\0';
 
 	// Check kbd and set the mouse released flag if Enter or space is pressed.
 	// Otherwise, the pressed _key is stored for later use
 	if (events.kbHit()) {
 		Common::KeyState keyState = events.getKey();
-		_keycode = keyState.ascii;
+		_keyPress = keyState.ascii;
 
 		if (keyState.keycode == Common::KEYCODE_x && keyState.flags & Common::KBD_ALT) {
 			_vm->quitGame();
@@ -315,8 +315,7 @@ void UserInterface::handleInput() {
 	//
 	// Do input processing
 	//
-	if (events._pressed || events._released || events._rightPressed ||
-			_keycode != Common::KEYCODE_INVALID || _pause) {
+	if (events._pressed || events._released || events._rightPressed || _keyPress || _pause) {
 		if (((events._released && (_helpStyle || _help == -1)) || (events._rightReleased && !_helpStyle)) &&
 				(pt.y <= CONTROLS_Y) && (_menuMode == STD_MODE)) {
 			// The mouse was clicked in the playing area with no action buttons down.
@@ -383,9 +382,8 @@ void UserInterface::handleInput() {
 		// As long as there isn't an open window, do main input processing.
 		// Windows are opened when in TALK, USE, INV, and GIVE modes
 		if ((!_windowOpen && !_menuCounter && pt.y > CONTROLS_Y) ||
-				_keycode != Common::KEYCODE_INVALID) {
-			if (events._pressed || events._released || _pause ||
-					_keycode != Common::KEYCODE_INVALID)
+				_keyPress) {
+			if (events._pressed || events._released || _pause || _keyPress)
 				doMainControl();
 		}
 
@@ -716,8 +714,8 @@ void UserInterface::doEnvControl() {
 			saves._envMode = SAVEMODE_NONE;
 	}
 
-	if (_keycode) {
-		_key = toupper(_keycode);
+	if (_keyPress) {
+		_key = toupper(_keyPress);
 
 		// Escape _key will close the dialog
 		if (_key == Common::KEYCODE_ESCAPE)
@@ -769,7 +767,7 @@ void UserInterface::doEnvControl() {
 			_windowBounds.top = CONTROLS_Y1;
 
 			events._pressed = events._released = _keyboardInput = false;
-			_keycode = Common::KEYCODE_INVALID;
+			_keyPress = '\0';
 		} else if ((found == 1 && events._released) || _key == 'L') {
 			saves._envMode = SAVEMODE_LOAD;
 			if (_selector != -1) {
@@ -787,7 +785,7 @@ void UserInterface::doEnvControl() {
 					banishWindow(1);
 					_windowBounds.top = CONTROLS_Y1;
 					_key = _oldKey = -1;
-					_keycode = Common::KEYCODE_INVALID;
+					_keyPress = '\0';
 					_keyboardInput = false;
 				} else {
 					if (!talk._talkToAbort) {
@@ -903,11 +901,11 @@ void UserInterface::doEnvControl() {
 					if (_key == Common::KEYCODE_ESCAPE)
 						_key = 'N';
 
-					if (_key == Common::KEYCODE_RETURN || _key == Common::KEYCODE_SPACE) {
+					if (_key == Common::KEYCODE_RETURN || _key == ' ') {
 						events._pressed = false;
 						events._released = true;
 						events._oldButtons = 0;
-						_keycode = Common::KEYCODE_INVALID;
+						_keyPress = '\0';
 					}
 				}
 
@@ -957,7 +955,7 @@ void UserInterface::doEnvControl() {
 						banishWindow();
 						_windowBounds.top = CONTROLS_Y1;
 						_key = _oldKey = -1;
-						_keycode = Common::KEYCODE_INVALID;
+						_keyPress = '\0';
 						_keyboardInput = false;
 					} else {
 						if (!talk._talkToAbort) {
@@ -1041,12 +1039,12 @@ void UserInterface::doInvControl() {
 			_selector = -1;
 	}
 
-	if (_keycode != Common::KEYCODE_INVALID) {
-		_key = toupper(_keycode);
+	if (_keyPress) {
+		_key = toupper(_keyPress);
 
 		if (_key == Common::KEYCODE_ESCAPE)
 			// Escape will also 'E'xit out of inventory display
-			_key = Common::KEYCODE_e;
+			_key = 'E';
 
 		if (_key == 'E' || _key == 'L' || _key == 'U' || _key == 'G'
 				|| _key == '-' || _key == '+') {
@@ -1106,16 +1104,14 @@ void UserInterface::doInvControl() {
 			inv.loadGraphics();
 			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
-		} else if (((found == 5 && events._released) || _key == Common::KEYCODE_MINUS
-				|| _key == Common::KEYCODE_KP_MINUS) && inv._invIndex > 0) {
+		} else if (((found == 5 && events._released) || _key == '-') && inv._invIndex > 0) {
 			--inv._invIndex;
 			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "^");
 			inv.freeGraphics();
 			inv.loadGraphics();
 			inv.putInv(SLAM_DISPLAY);
 			inv.invCommands(true);
-		} else if (((found == 6 && events._released) || _key == Common::KEYCODE_PLUS
-				|| _key == Common::KEYCODE_KP_PLUS) &&  (inv._holdings - inv._invIndex) > 6) {
+		} else if (((found == 6 && events._released) || _key == '+') &&  (inv._holdings - inv._invIndex) > 6) {
 			++inv._invIndex;
 			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
 			inv.freeGraphics();
@@ -1208,7 +1204,7 @@ void UserInterface::doLookControl() {
 	Screen &screen = *_vm->_screen;
 
 	_key = _oldKey = -1;
-	_keyboardInput = (_keycode != Common::KEYCODE_INVALID);
+	_keyboardInput = (_keyPress != '\0');
 
 	if (events._released || events._rightReleased || _keyboardInput) {
 		// Is an inventory object being looked at?
@@ -1281,12 +1277,12 @@ void UserInterface::doMainControl() {
 				_key = COMMANDS[_temp];
 		}
 		--_temp;
-	} else if (_keycode != Common::KEYCODE_INVALID) {
+	} else if (_keyPress) {
 		// Keyboard control
 		_keyboardInput = true;
 
-		if (_keycode >= Common::KEYCODE_a && _keycode <= Common::KEYCODE_z) {
-			const char *c = strchr(COMMANDS, _keycode);
+		if (_keyPress >= 'A' && _keyPress <= 'Z') {
+			const char *c = strchr(COMMANDS, _keyPress);
 			_temp = !c ? 12 : c - COMMANDS;
 		} else {
 			_temp = 12;
@@ -1515,8 +1511,8 @@ void UserInterface::doTalkControl() {
 			_selector = -1;
 	}
 
-	if (_keycode != Common::KEYCODE_INVALID) {
-		_key = toupper(_keycode);
+	if (_keyPress) {
+		_key = toupper(_keyPress);
 		if (_key == Common::KEYCODE_ESCAPE)
 			_key = 'E';
 
@@ -1757,7 +1753,7 @@ void UserInterface::journalControl() {
 
 	// Finish up
 	_infoFlag = _keyboardInput = false;
-	_keycode = Common::KEYCODE_INVALID;
+	_keyPress = '\0';
 	_windowOpen = false;
 	_windowBounds.top = CONTROLS_Y1;
 	_key = -1;
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 9fe69cde18..1f7b5feaab 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -73,10 +73,10 @@ private:
 	ImageFile *_controls;
 	int _bgFound;
 	int _oldBgFound;
-	int _keycode;
+	char _keyPress;
 	int _lookHelp;
 	int _help, _oldHelp;
-	int _key, _oldKey;
+	char _key, _oldKey;
 	int _temp, _oldTemp;
 	int _oldLook;
 	bool _keyboardInput;
-- 
cgit v1.2.3


From a57f569244b9d402e689de5e5f488da935bc4bed Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 20:56:04 -0400
Subject: SHERLOCK: Fix display of 'Text Not Found' when doing journal searches

---
 engines/sherlock/journal.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 5a8338bdc8..7ff4272b82 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -1041,6 +1041,7 @@ int Journal::getSearchString(bool printError) {
 
 	if (printError) {
 		// Give time for user to see the message
+		events.setButtonState();
 		for (int idx = 0; idx < 40 && !_vm->shouldQuit() && !events.kbHit() && !events._released; ++idx) {
 			events.pollEvents();
 			events.setButtonState();
@@ -1048,7 +1049,7 @@ int Journal::getSearchString(bool printError) {
 		}
 
 		events.clearKeyboard();
-		screen.fillRect(Common::Rect(13, 186, 306, 195), BUTTON_MIDDLE);
+		screen._backBuffer1.fillRect(Common::Rect(13, 186, 306, 195), BUTTON_MIDDLE);
 
 		if (!_find.empty()) {
 			screen.gPrint(Common::Point(15, 185), TALK_FOREGROUND, "%s", _find.c_str());
-- 
cgit v1.2.3


From 6a8e3173555c7a34749bcf4b905dec20178bbf5f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 21:02:58 -0400
Subject: SHERLOCK: Constants fixes in UserInterface

---
 engines/sherlock/user_interface.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 92fc89305e..4781f4811b 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -682,6 +682,7 @@ void UserInterface::doEnvControl() {
 	Talk &talk = *_vm->_talk;
 	Common::Point mousePos = events.mousePos();
 	static const char ENV_COMMANDS[7] = "ELSUDQ";
+
 	byte color;
 
 	_key = _oldKey = -1;
@@ -710,7 +711,7 @@ void UserInterface::doEnvControl() {
 		// Handle selecting buttons, if any
 		saves.highlightButtons(found);
 
-		if (found == 0 || found == ONSCREEN_FILES_COUNT)
+		if (found == 0 || found == 5)
 			saves._envMode = SAVEMODE_NONE;
 	}
 
@@ -869,7 +870,7 @@ void UserInterface::doEnvControl() {
 					moreKeys = _key == 'D';
 				}
 			} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) && moreKeys);
-		} else if ((found == ONSCREEN_FILES_COUNT && events._released) || _key == 'Q') {
+		} else if ((found == 5 && events._released) || _key == 'Q') {
 			clearWindow();
 			screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
 			screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
@@ -1867,7 +1868,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
 	// Loop through displaying up to five lines
 	bool endOfStr = false;
 	const char *msgP = str.c_str();
-	for (int lineNum = 0; lineNum < 5 && !endOfStr; ++lineNum) {
+	for (int lineNum = 0; lineNum < ONSCREEN_FILES_COUNT && !endOfStr; ++lineNum) {
 		int width = 0;
 		const char *lineStartP = msgP;
 
-- 
cgit v1.2.3


From 46e85f389f4fb9f3d956c42e77345f79701d7a93 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 21:15:33 -0400
Subject: SHERLOCK: Go to save mode when clicking empty save slot

---
 engines/sherlock/saveload.cpp       | 6 +++++-
 engines/sherlock/saveload.h         | 5 +++++
 engines/sherlock/user_interface.cpp | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index c13d6dd9ee..077df7494f 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -401,7 +401,7 @@ bool SaveManager::promptForDescription(int slot) {
 	screen.buttonPrint(Common::Point(ENV_POINTS[5][2], CONTROLS_Y), COMMAND_NULL, true, "Quit");
 
 	Common::String saveName = _savegames[slot];
-	if (saveName.equalsIgnoreCase(EMPTY_SAVEGAME_SLOT)) {
+	if (isSlotEmpty(slot)) {
 		// It's an empty slot, so start off with an empty save name
 		saveName = "";
 
@@ -477,4 +477,8 @@ bool SaveManager::promptForDescription(int slot) {
 	return done == 1;
 }
 
+bool SaveManager::isSlotEmpty(int slot) const {
+	return _savegames[slot].equalsIgnoreCase(EMPTY_SAVEGAME_SLOT);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index 066d983b26..a7ed852a5f 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -135,6 +135,11 @@ public:
 	 * Prompts the user to enter a description in a given slot
 	 */
 	bool promptForDescription(int slot);
+
+	/**
+	 * Returns true if the given save slot is empty
+	 */
+	bool isSlotEmpty(int slot) const;
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 4781f4811b..524ecf3d2f 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -946,7 +946,7 @@ void UserInterface::doEnvControl() {
 				// Are we already in Load mode?
 				if (saves._envMode == SAVEMODE_LOAD) {
 					saves.loadGame(_selector + 1);
-				} else if (saves._envMode == SAVEMODE_SAVE || _selector == MAX_SAVEGAME_SLOTS) {
+				} else if (saves._envMode == SAVEMODE_SAVE || saves.isSlotEmpty(_selector)) {
 					// We're already in save mode, or pointing to an empty save slot
 					if (saves.checkGameOnScreen(_selector))
 						_oldSelector = _selector;
-- 
cgit v1.2.3


From feff241ef7bd4552d44d1e3fa7b3e16f259ca749 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 21:18:49 -0400
Subject: SHERLOCK: Replace another ONSCREEN_FILES_COUNT value

---
 engines/sherlock/saveload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/saveload.cpp b/engines/sherlock/saveload.cpp
index 077df7494f..ddf4917a34 100644
--- a/engines/sherlock/saveload.cpp
+++ b/engines/sherlock/saveload.cpp
@@ -358,7 +358,7 @@ bool SaveManager::checkGameOnScreen(int slot) {
 	Screen &screen = *_vm->_screen;
 
 	// Check if it's already on-screen
-	if (slot != -1 && (slot < _savegameIndex || slot >= (_savegameIndex + 5))) {
+	if (slot != -1 && (slot < _savegameIndex || slot >= (_savegameIndex + ONSCREEN_FILES_COUNT))) {
 		_savegameIndex = slot;
 
 		screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
-- 
cgit v1.2.3


From 3fea1f49937410c671d3155eb785fc382a08757d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 20 May 2015 22:20:52 -0400
Subject: TSAGE: Implemented scene logic for Sherlock Logo

---
 engines/tsage/sherlock/sherlock_logo.cpp | 178 ++++++++++++++++++++++++++++++-
 engines/tsage/sherlock/sherlock_logo.h   |   1 +
 2 files changed, 177 insertions(+), 2 deletions(-)

diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index cca6982210..e2c5629bfc 100644
--- a/engines/tsage/sherlock/sherlock_logo.cpp
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -103,18 +103,189 @@ void SherlockLogoScene::Action1::signal() {
 		scene._gfxManager2.fillRect(scene._rect1, 0);
 		scene._gfxManager2.deactivate();
 		//word_2B4AA = 3;
-
 		setDelay(10);
 		break;
 
 	case 6:
 		GLOBALS._scenePalette.loadPalette(12);
 		GLOBALS._scenePalette.refresh();
+		setDelay(1);
+		break;
+
+	case 7:
+		scene._object1.setVisage("0012.vis");
+		scene._object1._strip = 1;
+		scene._object1._frame = 1;
+		scene._object1.changeZoom(100);
+		scene._object1.setPosition(Common::Point(170, 142));
+		scene._object1._numFrames = 7;
+		scene._object1.animate(ANIM_MODE_5, nullptr);
+		ADD_MOVER(scene._object1, 158, 71);
+		break;
+
+	case 8:
+		GLOBALS._scenePalette.addFader(scene._palette3._palette, 256, 40, this);
+		break;
+
+	case 9:
+		scene._object2.postInit(nullptr);
+		scene._object2.setVisage("0014.vis");
+		scene._object2._strip = 1;
+		scene._object2._frame = 1;
+		scene._object2.setPosition(Common::Point(152, 98));
+		scene._object2.changeZoom(100);
+		scene._object2.animate(ANIM_MODE_NONE, nullptr);
+		setDelay(120);
+		break;
+
+	case 10:
+		scene._object3.postInit();
+		scene._object2.setVisage("0018.vis");
+		scene._object2._strip = 1;
+		scene._object2._frame = 1;
+		scene._object2.setPosition(Common::Point(33, 91));
+		scene._object2.changeZoom(100);
+		scene._object2.animate(ANIM_MODE_NONE, nullptr);
+		setDelay(5);
+		break;
+
+	case 11:
+		scene._object3._frame = 2;
+		scene._object3.setPosition(Common::Point(44, 124));
+		setDelay(5);
+		break;
+
+	case 12:
+		scene._object3._frame = 3;
+		scene._object3.setPosition(Common::Point(64, 153));
+		setDelay(5);
+		break;
+
+	case 13:
+		scene._object3._frame = 4;
+		scene._object3.setPosition(Common::Point(87, 174));
+		setDelay(5);
+		break;
+
+	case 14:
+		scene._object3._frame = 5;
+		scene._object3.setPosition(Common::Point(114, 191));
+		setDelay(5);
+		break;
+
+	case 15:
+		scene._object3._frame = 6;
+		scene._object3.setPosition(Common::Point(125, 184));
+		setDelay(5);
+		break;
+
+	case 16:
+		scene._object3._frame = 7;
+		scene._object3.setPosition(Common::Point(154, 187));
+		setDelay(5);
+		break;
+
+	case 17:
+		scene._object3._frame = 8;
+		scene._object3.setPosition(Common::Point(181, 182));
+		setDelay(5);
+		break;
+
+	case 18:
+		scene._object3._frame = 9;
+		scene._object3.setPosition(Common::Point(191, 167));
+		setDelay(5);
+		break;
+
+	case 19:
+		scene._object3._frame = 10;
+		scene._object3.setPosition(Common::Point(190, 150));
+		setDelay(5);
 		break;
 
-	// TODO
+	case 20:
+		scene._object3._frame = 11;
+		scene._object3.setPosition(Common::Point(182, 139));
+		setDelay(5);
+		break;
+
+	case 21:
+		scene._object3._frame = 11;
+		scene._object3.setPosition(Common::Point(170, 130));
+		setDelay(5);
+		break;
+
+	case 22:
+		scene._object3._frame = 11;
+		scene._object3.setPosition(Common::Point(158, 121));
+		setDelay(8);
+		break;
+
+	case 23:
+		scene._object3.hide();
+		scene._object4.show();
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+
+	case 24:
+		scene._object4._frame = 2;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+
+	case 25:
+		scene._object2.remove();
+		setDelay(1);
+		break;
+
+	case 26:
+		scene._object4._frame = 3;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+
+	case 27:
+		scene._object4._frame = 4;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+		break;
+
+	case 28:
+		scene._object4._frame = 5;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+		break;
+
+	case 29:
+		scene._object4._frame = 6;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+		break;
+
+	case 30:
+		scene._object4._frame = 7;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+		break;
+
+	case 31:
+		scene._object4._frame = 8;
+		scene._object4.setPosition(Common::Point(155, 94));
+		setDelay(8);
+		break;
+
+	case 32:
+		setDelay(180);
+		break;
 
 	default:
+		scene.finish();
+		remove();
 		break;
 	}
 }
@@ -143,6 +314,9 @@ void SherlockLogoScene::postInit(SceneObjectList *OwnerList) {
 	setAction(&_action1);
 }
 
+void SherlockLogoScene::finish() {
+	g_vm->quitGame();
+}
 
 } // End of namespace Sherlock
 
diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h
index 947ea086bc..1f3eb15c53 100644
--- a/engines/tsage/sherlock/sherlock_logo.h
+++ b/engines/tsage/sherlock/sherlock_logo.h
@@ -64,6 +64,7 @@ public:
 	GfxManager _gfxManager2;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	void finish();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 61f0d247aa5151381fa242327ff219790d25363d Mon Sep 17 00:00:00 2001
From: Kirben
Date: Thu, 21 May 2015 14:24:52 +1000
Subject: AGOS: Add proper fix for regression when loading saved games in PC
 version of Waxworks.

---
 engines/agos/saveload.cpp | 89 ++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 5c54e4874b..b968ae645c 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1201,7 +1201,6 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 	char ident[100];
 	Common::SeekableReadStream *f = NULL;
 	uint num, item_index, i, j;
-	uint16 room = _currentRoom;
 
 	_videoLockOut |= 0x100;
 
@@ -1260,7 +1259,49 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 		}
 		f->readUint16BE();
 
+		uint16 room = _currentRoom;
 		_currentRoom = f->readUint16BE();
+		if (_roomsListPtr) {
+			byte *p = _roomsListPtr;
+			if (room == _currentRoom) {
+				for (;;) {
+					uint16 minNum = READ_BE_UINT16(p); p += 2;
+					if (minNum == 0)
+						break;
+
+					uint16 maxNum = READ_BE_UINT16(p); p += 2;
+
+					 for (uint16 z = minNum; z <= maxNum; z++) {
+						uint16 itemNum = z + 2;
+						Item *item = derefItem(itemNum);
+
+						num = (itemNum - _itemArrayInited);
+						item->state = _roomStates[num].state;
+						item->classFlags = _roomStates[num].classFlags;
+						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
+						subRoom->roomExitStates = _roomStates[num].roomExitStates;
+					}
+				}
+			} else {
+				for (;;) {
+					uint16 minNum = READ_BE_UINT16(p); p += 2;
+					if (minNum == 0)
+						break;
+
+					uint16 maxNum = READ_BE_UINT16(p); p += 2;
+
+					 for (uint16 z = minNum; z <= maxNum; z++) {
+						uint16 itemNum = z + 2;
+						_itemArrayPtr[itemNum] = 0;
+					}
+				}
+			}
+		}
+
+		if (room != _currentRoom) {
+			_roomsListPtr = 0;
+			loadRoomItems(_currentRoom);
+		}
 	}
 
 	item_index = 1;
@@ -1275,6 +1316,9 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 			uint parent = f->readUint16BE();
 			uint next = f->readUint16BE();
 
+			if (getGameType() == GType_WW && getPlatform() == Common::kPlatformDOS && derefItem(item->parent) == NULL)
+				item->parent = 0;
+						
 			parent_item = derefItem(parent);
 			setItemParent(item, parent_item);
 
@@ -1319,49 +1363,6 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 		}
 	}
 
-	if (getGameType() == GType_WW && getPlatform() == Common::kPlatformDOS) {
-		if (_roomsListPtr) {
-			byte *p = _roomsListPtr;
-			if (room == _currentRoom) {
-				for (;;) {
-					uint16 minNum = READ_BE_UINT16(p); p += 2;
-					if (minNum == 0)
-						break;
-
-					uint16 maxNum = READ_BE_UINT16(p); p += 2;
-
-					 for (uint16 z = minNum; z <= maxNum; z++) {
-						uint16 itemNum = z + 2;
-						Item *item = derefItem(itemNum);
-
-						num = (itemNum - _itemArrayInited);
-						item->state = _roomStates[num].state;
-						item->classFlags = _roomStates[num].classFlags;
-						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
-						subRoom->roomExitStates = _roomStates[num].roomExitStates;
-					}
-				}
-			} else {
-				for (;;) {
-					uint16 minNum = READ_BE_UINT16(p); p += 2;
-					if (minNum == 0)
-						break;
-
-					uint16 maxNum = READ_BE_UINT16(p); p += 2;
-
-					 for (uint16 z = minNum; z <= maxNum; z++) {
-						uint16 itemNum = z + 2;
-						_itemArrayPtr[itemNum] = 0;
-					}
-				}
-			}
-		}
-
-		if (room != _currentRoom) {
-			_roomsListPtr = 0;
-			loadRoomItems(_currentRoom);
-		}
-	}
 	// read the variables
 	for (i = 0; i != _numVars; i++) {
 		writeVariable(i, f->readUint16BE());
-- 
cgit v1.2.3


From 6d08055db3368dbaadb22e82d78c86bcb1026950 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 21 May 2015 22:47:02 +0200
Subject: KYRA: Update comment since the file it pointed to moved

Also, ScummVM does have a more modern FMOPL implementation now, so
there's no need to bring up other implementations.
---
 engines/kyra/sound_adlib.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 89ee41e859..c0e0f67b8e 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -947,15 +947,10 @@ void AdLibDriver::unkOutput2(uint8 chan) {
 	//
 	// This is very strange behavior, and causes problems with the ancient
 	// FMOPL code we borrowed from AdPlug. I've added a workaround. See
-	// fmopl.cpp for more details.
+	// audio/softsynth/opl/mame.cpp for more details.
 	//
-	// More recent versions of the MAME FMOPL don't seem to have this
-	// problem, but cannot currently be used because of licensing and
-	// performance issues.
-	//
-	// Ken Silverman's AdLib emulator (which can be found on his Web page -
-	// http://www.advsys.net/ken - and as part of AdPlug) also seems to be
-	// immune, but is apparently not as feature complete as MAME's.
+	// Fortunately, the more modern DOSBox FMOPL code does not seem to have
+	// any trouble with this.
 
 	writeOPL(0xB0 + chan, 0x20);
 }
-- 
cgit v1.2.3


From 08dc811baa587e40af720eeb3e2fe98d4dbd22d7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 May 2015 18:48:21 -0400
Subject: TSAGE: Implemented game startup code for Sherlock Logo

---
 engines/tsage/detection.cpp              |  1 +
 engines/tsage/detection_tables.h         |  6 +++---
 engines/tsage/globals.cpp                |  2 +-
 engines/tsage/sherlock/sherlock_logo.cpp | 13 +++++++++++++
 engines/tsage/sherlock/sherlock_logo.h   |  5 +++++
 engines/tsage/tsage.cpp                  | 10 ++++++++--
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index 9d61b4d182..388967931d 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -62,6 +62,7 @@ static const PlainGameDescriptor tSageGameTitles[] = {
 	{ "ringworld", "Ringworld: Revenge of the Patriarch" },
 	{ "blueforce", "Blue Force" },
 	{ "ringworld2", "Return to Ringworld" },
+	{ "sherlock-logo", "The Lost Files of Sherlock Holmes (Logo)" },
 	{ 0, 0 }
 };
 
diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index 1ff0cde18c..1dfc3e6fd2 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -189,9 +189,9 @@ static const tSageGameDescription gameDescriptions[] = {
 	// The Lost Files of Sherlock Holmes - The Case of the Serrated Scalpel (Logo)
 	{
 		{
-			"sherlock1",
-			"Logo",
-			AD_ENTRY1s("sf3.rlb", "c8e1a82c67c3caf57368eadde13dc15f", 0),
+			"sherlock-logo",
+			"",
+			AD_ENTRY1s("sf3.rlb", "153f9b93eda4e95578e31be30e69b5e5", 50419),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 3b78af3e3e..1be3e2b6da 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -160,7 +160,7 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface
 
 	case GType_Sherlock1:
 		_inventory = nullptr;
-		_sceneHandler = new SceneHandler();
+		_sceneHandler = new Sherlock::SherlockSceneHandler();
 		_game = new Sherlock::SherlockLogo();
 		break;
 	}
diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index e2c5629bfc..58cefe551b 100644
--- a/engines/tsage/sherlock/sherlock_logo.cpp
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -60,6 +60,19 @@ void SherlockLogo::quitGame() {
 
 /*--------------------------------------------------------------------------*/
 
+void SherlockSceneHandler::postInit(SceneObjectList *OwnerList) {
+	_delayTicks = 2;
+
+	GLOBALS._soundManager.postInit();
+	GLOBALS._soundManager.buildDriverList(true);
+	GLOBALS._soundManager.installConfigDrivers();
+
+	GLOBALS._sceneManager.setNewScene(10);
+	GLOBALS._game->start();
+}
+
+/*--------------------------------------------------------------------------*/
+
 void SherlockLogoScene::Action1::signal() {
 	SherlockLogoScene &scene = *(SherlockLogoScene *)GLOBALS._sceneManager._scene;
 
diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h
index 1f3eb15c53..c9fb50e6ef 100644
--- a/engines/tsage/sherlock/sherlock_logo.h
+++ b/engines/tsage/sherlock/sherlock_logo.h
@@ -51,6 +51,11 @@ public:
 	virtual bool canLoadGameStateCurrently();
 };
 
+class SherlockSceneHandler : public SceneHandler {
+public:
+	virtual void postInit(SceneObjectList *OwnerList);
+};
+
 class SherlockLogoScene: public Scene {
 	class Action1 : public Action {
 	public:
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index 0b882d5cbf..4412d0670f 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -44,11 +44,12 @@ TSageEngine::TSageEngine(OSystem *system, const tSageGameDescription *gameDesc)
 			_debugger = new DemoDebugger();
 		else
 			_debugger = new RingworldDebugger();
-	}
-	else if (g_vm->getGameID() == GType_BlueForce)
+	} else if (g_vm->getGameID() == GType_BlueForce)
 		_debugger = new BlueForceDebugger();
 	else if (g_vm->getGameID() == GType_Ringworld2)
 		_debugger = new Ringworld2Debugger();
+	else if (g_vm->getGameID() == GType_Sherlock1)
+		_debugger = new DemoDebugger();
 }
 
 Common::Error TSageEngine::init() {
@@ -110,6 +111,11 @@ void TSageEngine::initialize() {
 
 		// Reset all global variables
 		R2_GLOBALS.reset();
+	} else if (g_vm->getGameID() == GType_Sherlock1) {
+		g_resourceManager->addLib("SF3.RLB");
+		g_globals = new Globals();
+	
+		return;
 	}
 
 	g_globals->gfxManager().setDefaults();
-- 
cgit v1.2.3


From 87fe6a14a069dd5cd02276c2e8e85d25117680d2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 May 2015 19:00:22 -0400
Subject: SHERLOCK: Correct some comments

---
 engines/sherlock/scalpel/darts.cpp | 2 +-
 engines/sherlock/talk.cpp          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index de93621e2f..b567d58ab4 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -347,7 +347,7 @@ void Darts::drawDartThrow(const Common::Point &pt) {
 		screen._backBuffer1.transBlitFrom(frame, drawPos);
 		screen.slamArea(drawPos.x, drawPos.y, frame._width, frame._height);
 
-		// Handle erasing old dart strs
+		// Handle erasing old dart frame area
 		if (!oldDrawBounds.isEmpty())
 			screen.slamRect(oldDrawBounds);
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index bd4e8c2e78..5fbf7cc185 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1435,7 +1435,7 @@ void Talk::doScript(const Common::String &script) {
 				yp += 9;
 			}
 
-			// Find amound of text that will fit on the line
+			// Find amount of text that will fit on the line
 			int width = 0, idx = 0;
 			do {
 				width += screen.charWidth(str[idx]);
-- 
cgit v1.2.3


From 5c30a2c5772049702e1c65d10ae32dec8e6f1cdc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 May 2015 20:07:54 -0400
Subject: SHERLOCK: Clean up initialization and handling of NPC data

---
 engines/sherlock/journal.cpp         |   9 ++-
 engines/sherlock/people.cpp          | 142 +--------------------------------
 engines/sherlock/people.h            |  12 ++-
 engines/sherlock/scalpel/scalpel.cpp | 148 ++++++++++++++++++++++++++++++++++-
 engines/sherlock/talk.cpp            |  27 +++----
 engines/sherlock/talk.h              |   8 +-
 6 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 7ff4272b82..50802f1625 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -131,6 +131,7 @@ void Journal::loadJournalLocations() {
 }
 
 void Journal::loadJournalFile(bool alreadyLoaded) {
+	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	JournalEntry &journalEntry = _journal[_index];
@@ -152,7 +153,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			// Find the person being referred to
 			talk._talkTo = -1;
 			for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
-				Common::String portrait = PORTRAITS[idx];
+				Common::String portrait = people[idx]._portrait;
 				Common::String numStr(portrait.c_str(), portrait.c_str() + 4);
 
 				if (locStr == numStr) {
@@ -222,7 +223,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			journalString += "the Inspector";
 			break;
 		default:
-			journalString += NAMES[talk._talkTo];
+			journalString += people._characters[talk._talkTo]._name;
 			break;
 		}
 		journalString += ", \"";
@@ -283,7 +284,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 						else if (talk._talkTo == 2)
 							journalString += "The Inspector";
 						else
-							journalString += NAMES[talk._talkTo];
+							journalString += people._characters[talk._talkTo]._name;
 
 						const byte *strP = replyP + 1;
 						byte v;
@@ -330,7 +331,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			else if (c == 2)
 				journalString += "the Inspector";
 			else
-				journalString += NAMES[c];
+				journalString += people._characters[c]._name;
 
 			const byte *strP = replyP;
 			byte v;
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 3a169fa99c..3a630fdd99 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -50,144 +50,6 @@ static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 	{ 52, 1, 2, 3, 4, 0 }				// Goto Stand Down Left
 };
 
-const char PORTRAITS[MAX_PEOPLE][5] = {
-	{ "HOLM" },			// Sherlock Holmes
-	{ "WATS" },			// Dr. Watson
-	{ "LEST" },			// Inspector Lestrade
-	{ "CON1" },			// Constable O'Brien
-	{ "CON2" },			// Constable Lewis
-	{ "SHEI" },			// Sheila Parker
-	{ "HENR" },			// Henry Carruthers
-	{ "LESL" },			// Lesley (flower girl)
-	{ "USH1" },			// Usher #1
-	{ "USH2" },			// Usher #2
-	{ "FRED" },			// Fredrick Epstein
-	{ "WORT" },			// Mrs. Worthington
-	{ "COAC" },			// Coach
-	{ "PLAY" },			// Player
-	{ "WBOY" },			// Tim (Waterboy)
-	{ "JAME" },			// James Sanders
-	{ "BELL" },			// Belle (perfumerie)
-	{ "GIRL" },			// Cleaning Girl (perfumerie)
-	{ "EPST" },			// Epstien in the Opera Balcony
-	{ "WIGG" },			// Wiggins
-	{ "PAUL" },			// Paul (Brumwell / Carroway)
-	{ "BART" },			// Bartender
-	{ "DIRT" },			// Dirty Drunk
-	{ "SHOU" },			// Shouting Drunk
-	{ "STAG" },			// Staggering Drunk
-	{ "BOUN" },			// Bouncer
-	{ "SAND" },			// James Sanders - At Home
-	{ "CORO" },			// The Coroner
-	{ "EQUE" },			// The Equestrian Shop Keeper
-	{ "GEOR" },			// George Blackwood
-	{ "LARS" },			// Lars
-	{ "PARK" },			// Sheila Parker (happy)
-	{ "CHEM" },			// Chemist
-	{ "GREG" },			// Inspector Gregson
-	{ "LAWY" },			// Jacob Farthington Lawyer
-	{ "MYCR" },			// Mycroft
-	{ "SHER" },			// Old Sherman
-	{ "CHMB" },			// Richard Chemist Stock boy
-	{ "BARM" },			// Barman
-	{ "DAND" },			// Dandy Player
-	{ "ROUG" },			// Rough-looking Player
-	{ "SPEC" },			// Spectator
-	{ "HUNT" },			// Robert Hunt
-	{ "VIOL" },			// Violet Secretary
-	{ "PETT" },			// Pettigrew
-	{ "APPL" },			// Augie (apple seller)
-	{ "ANNA" },			// Anna Carroway
-	{ "GUAR" },			// Guard
-	{ "ANTO" },			// Antonio Caruso
-	{ "TOBY" },			// Toby the Dog
-	{ "KING" },			// Simon Kingsley
-	{ "ALFR" },			// Alfred Tobacco Clerk
-	{ "LADY" },			// Lady Brumwell
-	{ "ROSA" },			// Madame Rosa
-	{ "LADB" },			// Lady Brumwell
-	{ "MOOR" },			// Joseph Moorehead
-	{ "BEAL" },			// Mrs. Beale
-	{ "LION" },			// Felix the Lion
-	{ "HOLL" },			// Hollingston
-	{ "CALL" },			// Constable Callaghan
-	{ "JERE" },			// Sergeant Jeremy Duncan
-	{ "LORD" },			// Lord Brumwell
-	{ "NIGE" },			// Nigel Jameson
-	{ "JONA" },			// Jonas (newspaper seller)
-	{ "DUGA" },			// Constable Dugan
-	{ "INSP" }			// Inspector Lestrade (Scotland Yard)
-};
-
-const char *const NAMES[MAX_PEOPLE] = {
-	"Sherlock Holmes",
-	"Dr. Watson",
-	"Inspector Lestrade",
-	"Constable O'Brien",
-	"Constable Lewis",
-	"Sheila Parker",
-	"Henry Carruthers",
-	"Lesley",
-	"An Usher",
-	"An Usher",
-	"Fredrick Epstein",
-	"Mrs. Worthington",
-	"The Coach",
-	"A Player",
-	"Tim",
-	"James Sanders",
-	"Belle",
-	"Cleaning Girl",
-	"Fredrick Epstein",
-	"Wiggins",
-	"Paul",
-	"The Bartender",
-	"A Dirty Drunk",
-	"A Shouting Drunk",
-	"A Staggering Drunk",
-	"The Bouncer",
-	"James Sanders",
-	"The Coroner",
-	"Reginald Snipes",
-	"George Blackwood",
-	"Lars",
-	"Sheila Parker",
-	"The Chemist",
-	"Inspector Gregson",
-	"Jacob Farthington",
-	"Mycroft",
-	"Old Sherman",
-	"Richard",
-	"The Barman",
-	"A Dandy Player",
-	"A Rough-looking Player",
-	"A Spectator",
-	"Robert Hunt",
-	"Violet",
-	"Pettigrew",
-	"Augie",
-	"Anna Carroway",
-	"A Guard",
-	"Antonio Caruso",
-	"Toby the Dog",
-	"Simon Kingsley",
-	"Alfred",
-	"Lady Brumwell",
-	"Madame Rosa",
-	"Lady Brumwell",
-	"Joseph Moorehead",
-	"Mrs. Beale",
-	"Felix",
-	"Hollingston",
-	"Constable Callaghan",
-	"Sergeant Duncan",
-	"Lord Brumwell",
-	"Nigel Jaimeson",
-	"Jonas",
-	"Constable Dugan",
-	"Inspector Lestrade"
-};
-
 /*----------------------------------------------------------------*/
 
 People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
@@ -591,7 +453,7 @@ int People::findSpeaker(int speaker) {
 		if (obj._type == ACTIVE_BG_SHAPE) {
 			Common::String name(obj._name.c_str(), obj._name.c_str() + 4);
 
-			if (name.equalsIgnoreCase(PORTRAITS[speaker])
+			if (name.equalsIgnoreCase(_characters[speaker]._portrait)
 				&& obj._name[4] >= '0' && obj._name[4] <= '9')
 				return idx;
 		}
@@ -639,7 +501,7 @@ void People::setTalking(int speaker) {
 
 	if (_portraitsOn) {
 		delete _talkPics;
-		Common::String filename = Common::String::format("%s.vgs", PORTRAITS[speaker]);
+		Common::String filename = Common::String::format("%s.vgs", _characters[speaker]._portrait);
 		_talkPics = new ImageFile(filename);
 
 		// Load portrait sequences
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index f22070f5f9..74c057e542 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -53,8 +53,15 @@ enum {
 	MAP_DOWN = 5, MAP_DOWNLEFT = 6, MAP_LEFT = 2, MAP_UPLEFT = 8
 };
 
-extern const char *const NAMES[MAX_PEOPLE];
-extern const char PORTRAITS[MAX_PEOPLE][5];
+struct PersonData {
+	const char *_name;
+	const char *_portrait;
+	const byte *_stillSequences;
+	const byte *_talkSequences;
+
+	PersonData(const char *name, const char *portrait, const byte *stillSequences, const byte *talkSequences) :
+		_name(name), _portrait(portrait), _stillSequences(stillSequences), _talkSequences(talkSequences) {}
+};
 
 class SherlockEngine;
 
@@ -73,6 +80,7 @@ private:
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
 public:
+	Common::Array<PersonData> _characters;
 	ImageFile *_talkPics;
 	Common::Point _walkDest;
 	Common::Point _hSavedPos;
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 56c1e28dbe..d55517cdc3 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -89,7 +89,145 @@ static const byte MAP_SEQUENCES[3][MAX_FRAME] = {
 
 #define MAX_PEOPLE 66
 
-static const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
+const char PEOPLE_PORTRAITS[MAX_PEOPLE][5] = {
+	{ "HOLM" },			// Sherlock Holmes
+	{ "WATS" },			// Dr. Watson
+	{ "LEST" },			// Inspector Lestrade
+	{ "CON1" },			// Constable O'Brien
+	{ "CON2" },			// Constable Lewis
+	{ "SHEI" },			// Sheila Parker
+	{ "HENR" },			// Henry Carruthers
+	{ "LESL" },			// Lesley (flower girl)
+	{ "USH1" },			// Usher #1
+	{ "USH2" },			// Usher #2
+	{ "FRED" },			// Fredrick Epstein
+	{ "WORT" },			// Mrs. Worthington
+	{ "COAC" },			// Coach
+	{ "PLAY" },			// Player
+	{ "WBOY" },			// Tim (Waterboy)
+	{ "JAME" },			// James Sanders
+	{ "BELL" },			// Belle (perfumerie)
+	{ "GIRL" },			// Cleaning Girl (perfumerie)
+	{ "EPST" },			// Epstien in the Opera Balcony
+	{ "WIGG" },			// Wiggins
+	{ "PAUL" },			// Paul (Brumwell / Carroway)
+	{ "BART" },			// Bartender
+	{ "DIRT" },			// Dirty Drunk
+	{ "SHOU" },			// Shouting Drunk
+	{ "STAG" },			// Staggering Drunk
+	{ "BOUN" },			// Bouncer
+	{ "SAND" },			// James Sanders - At Home
+	{ "CORO" },			// The Coroner
+	{ "EQUE" },			// The Equestrian Shop Keeper
+	{ "GEOR" },			// George Blackwood
+	{ "LARS" },			// Lars
+	{ "PARK" },			// Sheila Parker (happy)
+	{ "CHEM" },			// Chemist
+	{ "GREG" },			// Inspector Gregson
+	{ "LAWY" },			// Jacob Farthington Lawyer
+	{ "MYCR" },			// Mycroft
+	{ "SHER" },			// Old Sherman
+	{ "CHMB" },			// Richard Chemist Stock boy
+	{ "BARM" },			// Barman
+	{ "DAND" },			// Dandy Player
+	{ "ROUG" },			// Rough-looking Player
+	{ "SPEC" },			// Spectator
+	{ "HUNT" },			// Robert Hunt
+	{ "VIOL" },			// Violet Secretary
+	{ "PETT" },			// Pettigrew
+	{ "APPL" },			// Augie (apple seller)
+	{ "ANNA" },			// Anna Carroway
+	{ "GUAR" },			// Guard
+	{ "ANTO" },			// Antonio Caruso
+	{ "TOBY" },			// Toby the Dog
+	{ "KING" },			// Simon Kingsley
+	{ "ALFR" },			// Alfred Tobacco Clerk
+	{ "LADY" },			// Lady Brumwell
+	{ "ROSA" },			// Madame Rosa
+	{ "LADB" },			// Lady Brumwell
+	{ "MOOR" },			// Joseph Moorehead
+	{ "BEAL" },			// Mrs. Beale
+	{ "LION" },			// Felix the Lion
+	{ "HOLL" },			// Hollingston
+	{ "CALL" },			// Constable Callaghan
+	{ "JERE" },			// Sergeant Jeremy Duncan
+	{ "LORD" },			// Lord Brumwell
+	{ "NIGE" },			// Nigel Jameson
+	{ "JONA" },			// Jonas (newspaper seller)
+	{ "DUGA" },			// Constable Dugan
+	{ "INSP" }			// Inspector Lestrade (Scotland Yard)
+};
+
+const char *const PEOPLE_NAMES[MAX_PEOPLE] = {
+	"Sherlock Holmes",
+	"Dr. Watson",
+	"Inspector Lestrade",
+	"Constable O'Brien",
+	"Constable Lewis",
+	"Sheila Parker",
+	"Henry Carruthers",
+	"Lesley",
+	"An Usher",
+	"An Usher",
+	"Fredrick Epstein",
+	"Mrs. Worthington",
+	"The Coach",
+	"A Player",
+	"Tim",
+	"James Sanders",
+	"Belle",
+	"Cleaning Girl",
+	"Fredrick Epstein",
+	"Wiggins",
+	"Paul",
+	"The Bartender",
+	"A Dirty Drunk",
+	"A Shouting Drunk",
+	"A Staggering Drunk",
+	"The Bouncer",
+	"James Sanders",
+	"The Coroner",
+	"Reginald Snipes",
+	"George Blackwood",
+	"Lars",
+	"Sheila Parker",
+	"The Chemist",
+	"Inspector Gregson",
+	"Jacob Farthington",
+	"Mycroft",
+	"Old Sherman",
+	"Richard",
+	"The Barman",
+	"A Dandy Player",
+	"A Rough-looking Player",
+	"A Spectator",
+	"Robert Hunt",
+	"Violet",
+	"Pettigrew",
+	"Augie",
+	"Anna Carroway",
+	"A Guard",
+	"Antonio Caruso",
+	"Toby the Dog",
+	"Simon Kingsley",
+	"Alfred",
+	"Lady Brumwell",
+	"Madame Rosa",
+	"Lady Brumwell",
+	"Joseph Moorehead",
+	"Mrs. Beale",
+	"Felix",
+	"Hollingston",
+	"Constable Callaghan",
+	"Sergeant Duncan",
+	"Lord Brumwell",
+	"Nigel Jaimeson",
+	"Jonas",
+	"Constable Dugan",
+	"Inspector Lestrade"
+};
+
+static const byte PEOPLE_STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 	{ 1, 0, 0 },	// Sherlock Holmes
 	{ 6, 0, 0 },	// Dr. Watson
 	{ 4, 0, 0 },	// Inspector Lestrade
@@ -158,7 +296,7 @@ static const byte STILL_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 	{ 4, 0, 0 }		// Inspector Lestrade (Yard)
 };
 
-static const byte TALK_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
+static const byte PEOPLE_TALK_SEQUENCES[MAX_PEOPLE][MAX_TALK_SEQUENCES] = {
 	{ 1, 0, 0 },					// Sherlock Holmes
 	{ 5, 5, 6, 7, 8, 7, 8, 6, 0, 0 },	// Dr. Watson
 	{ 2, 0, 0 },					// Inspector Lestrade
@@ -258,8 +396,10 @@ void ScalpelEngine::initialize() {
 	// Load the inventory
 	loadInventory();
 
-	// Set up constants used by the talk system
-	_talk->setSequences(&TALK_SEQUENCES[0][0], &STILL_SEQUENCES[0][0], MAX_PEOPLE);
+	// Set up list of people
+	for (int idx = 0; idx < MAX_PEOPLE; ++idx)
+		_people->_characters.push_back(PersonData(PEOPLE_NAMES[idx], PEOPLE_PORTRAITS[idx],
+			PEOPLE_STILL_SEQUENCES[idx], PEOPLE_TALK_SEQUENCES[idx]));
 
 	_animation->setPrologueNames(&PROLOGUE_NAMES[0], PROLOGUE_NAMES_COUNT);
 	_animation->setPrologueFrames(&PROLOGUE_FRAMES[0][0], 6, 9);
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 5fbf7cc185..6bac16c9bf 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -105,15 +105,6 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_scriptSaveIndex = -1;
 }
 
-void Talk::setSequences(const byte *talkSequences, const byte *stillSequences, int maxPeople) {
-	for (int idx = 0; idx < maxPeople; ++idx) {
-		STILL_SEQUENCES.push_back(TalkSequences(stillSequences));
-		TALK_SEQUENCES.push_back(TalkSequences(talkSequences));
-		stillSequences += MAX_TALK_SEQUENCES;
-		talkSequences += MAX_TALK_SEQUENCES;
-	}
-}
-
 void Talk::talkTo(const Common::String &filename) {
 	Events &events = *_vm->_events;
 	Inventory &inv = *_vm->_inventory;
@@ -537,6 +528,7 @@ void Talk::freeTalkVars() {
 }
 
 void Talk::loadTalkFile(const Common::String &filename) {
+	People &people = *_vm->_people;
 	Resources &res = *_vm->_res;
 	Sound &sound = *_vm->_sound;
 
@@ -546,7 +538,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	// Check for an existing person being talked to
 	_talkTo = -1;
 	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
-		if (!scumm_strnicmp(filename.c_str(), PORTRAITS[idx], 4)) {
+		if (!scumm_strnicmp(filename.c_str(), people._characters[idx]._portrait, 4)) {
 			_talkTo = idx;
 			break;
 		}
@@ -884,8 +876,8 @@ void Talk::setSequence(int speaker) {
 				warning("Tried to copy too many talk frames");
 			} else {
 				for (int idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) {
-					obj._sequences[idx] = TALK_SEQUENCES[speaker][idx];
-					if (idx > 0 && !TALK_SEQUENCES[speaker][idx] && !TALK_SEQUENCES[speaker][idx - 1])
+					obj._sequences[idx] = people._characters[speaker]._talkSequences[idx];
+					if (idx > 0 && !obj._sequences[idx] && !obj._sequences[idx - 1])
 						return;
 
 					obj._frameNumber = 0;
@@ -913,8 +905,9 @@ void Talk::setStillSeq(int speaker) {
 				warning("Tried to copy too few still frames");
 			} else {
 				for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) {
-					obj._sequences[idx] = STILL_SEQUENCES[speaker][idx];
-					if (idx > 0 && !TALK_SEQUENCES[speaker][idx] && !TALK_SEQUENCES[speaker][idx - 1])
+					obj._sequences[idx] = people._characters[speaker]._stillSequences[idx];
+					if (idx > 0 && !people._characters[speaker]._talkSequences[idx] &&
+							!people._characters[speaker]._talkSequences[idx - 1])
 						break;
 				}
 
@@ -1426,9 +1419,11 @@ void Talk::doScript(const Common::String &script) {
 				// If the window is open, display the name directly on-screen.
 				// Otherwise, simply draw it on the back buffer
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), TALK_FOREGROUND, "%s", NAMES[_speaker & 127]);
+					screen.print(Common::Point(16, yp), TALK_FOREGROUND, "%s",
+						people._characters[_speaker & 127]._name);
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, "%s", NAMES[_speaker & 127]);
+					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, "%s", 
+						people._characters[_speaker & 127]._name);
 					openTalkWindow = true;
 				}
 
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 71f093f66a..d26259dbfd 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -127,9 +127,6 @@ class UserInterface;
 
 class Talk {
 	friend class UserInterface;
-private:
-	Common::Array<TalkSequences> STILL_SEQUENCES;
-	Common::Array<TalkSequences> TALK_SEQUENCES;
 private:
 	SherlockEngine *_vm;
 	Common::Stack<SequenceEntry> _savedSequences;
@@ -188,11 +185,8 @@ public:
 	Talk(SherlockEngine *vm);
 
 	/**
-	 * Sets talk sequences
+	 * Return a given talk statement
 	 */
-	void setSequences(const byte *talkSequences, const byte *stillSequences,
-		int maxPeople);
-
 	Statement &operator[](int idx) { return _statements[idx]; }
 
 	/**
-- 
cgit v1.2.3


From f58be61a3d914566f02189d4f49410d8c917d5b5 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Fri, 22 May 2015 10:29:50 +1000
Subject: AUDIO: Add patch from madmoose to fix arpeggio effect in ProTracker
 modules.

---
 audio/mods/protracker.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/audio/mods/protracker.cpp b/audio/mods/protracker.cpp
index 82067f67bd..2578e9488a 100644
--- a/audio/mods/protracker.cpp
+++ b/audio/mods/protracker.cpp
@@ -219,11 +219,10 @@ void ProtrackerStream::updateRow() {
 		case 0x0:
 			if (exy) {
 				_track[track].arpeggio = true;
-				if (note.period) {
-					_track[track].arpeggioNotes[0] = note.note;
-					_track[track].arpeggioNotes[1] = note.note + ex;
-					_track[track].arpeggioNotes[2] = note.note + ey;
-				}
+				byte trackNote = _module.periodToNote(_track[track].period);
+				_track[track].arpeggioNotes[0] = trackNote;
+				_track[track].arpeggioNotes[1] = trackNote + ex;
+				_track[track].arpeggioNotes[2] = trackNote + ey;
 			}
 			break;
 		case 0x1:
-- 
cgit v1.2.3


From bfbeed4f5eb8986f93a3248251b3740e3b9ed6ad Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 May 2015 21:23:09 -0400
Subject: SHERLOCK: Replaced second MAX_PEOPLE definition with
 _characters.size()

---
 engines/sherlock/journal.cpp | 2 +-
 engines/sherlock/people.h    | 1 -
 engines/sherlock/talk.cpp    | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 50802f1625..564db59042 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -152,7 +152,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 
 			// Find the person being referred to
 			talk._talkTo = -1;
-			for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+			for (int idx = 0; idx < (int)people._characters.size(); ++idx) {
 				Common::String portrait = people[idx]._portrait;
 				Common::String numStr(portrait.c_str(), portrait.c_str() + 4);
 
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 74c057e542..c32681fdd1 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -36,7 +36,6 @@ enum PeopleId {
 	AL				= 0,
 	PEG				= 1,
 	NUM_OF_PEOPLE	= 2,		// Holmes and Watson
-	MAX_PEOPLE		= 66		// Total of all NPCs
 };
 
 // Animation sequence identifiers for characters
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 6bac16c9bf..319d1a383f 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -537,7 +537,7 @@ void Talk::loadTalkFile(const Common::String &filename) {
 
 	// Check for an existing person being talked to
 	_talkTo = -1;
-	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+	for (int idx = 0; idx < (int)people._characters.size(); ++idx) {
 		if (!scumm_strnicmp(filename.c_str(), people._characters[idx]._portrait, 4)) {
 			_talkTo = idx;
 			break;
@@ -1415,7 +1415,7 @@ void Talk::doScript(const Common::String &script) {
 			}
 
 			// If it's the first line, display the speaker
-			if (!line && _speaker >= 0 && _speaker < MAX_PEOPLE) {
+			if (!line && _speaker >= 0 && _speaker < (int)people._characters.size()) {
 				// If the window is open, display the name directly on-screen.
 				// Otherwise, simply draw it on the back buffer
 				if (ui._windowOpen) {
-- 
cgit v1.2.3


From 50f985217cabb4f5d8912db7071f0822f1899e38 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 21 May 2015 21:26:53 -0400
Subject: SHERLOCK: Rename NUM_OF_PEOPLE for better clarity

---
 engines/sherlock/people.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index c32681fdd1..8244fd9b59 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -30,12 +30,13 @@
 
 namespace Sherlock {
 
-// People definitions
+// Player definitions. The game has theoretical support for two player characters but only the first one is used.
+// Watson is, instead, handled by a different sprite in each scene, with a very simple initial movement, if any
 enum PeopleId {
 	PLAYER			= 0,
 	AL				= 0,
 	PEG				= 1,
-	NUM_OF_PEOPLE	= 2,		// Holmes and Watson
+	MAX_PLAYERS		= 2
 };
 
 // Animation sequence identifiers for characters
@@ -74,7 +75,7 @@ public:
 class People {
 private:
 	SherlockEngine *_vm;
-	Person _data[NUM_OF_PEOPLE];
+	Person _data[MAX_PLAYERS];
 	bool _walkLoaded;
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
@@ -101,11 +102,11 @@ public:
 	~People();
 
 	Person &operator[](PeopleId id) {
-		assert(id < NUM_OF_PEOPLE);
+		assert(id < MAX_PLAYERS);
 		return _data[id];
 	}
 	Person &operator[](int idx) {
-		assert(idx < NUM_OF_PEOPLE);
+		assert(idx < MAX_PLAYERS);
 		return _data[idx];
 	}
 
-- 
cgit v1.2.3


From d822f5703385a4e7212880434994ce4e8e14bb6f Mon Sep 17 00:00:00 2001
From: Kirben
Date: Fri, 22 May 2015 13:46:38 +1000
Subject: NEWS: Add recent AGOS fixes to the news.

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 5572542f03..1a8bde46b0 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,10 @@ For a more comprehensive changelog of the latest experimental code, see:
      and fanmade games, that require a mouse).
    - Fix incorrect volume attenuation in PCjr sound code (bug #6858).
 
+ AGOS:
+ - Fixed arpeggio effect used in music of Amiga version of Elvira 1.
+ - Fixed loading and saving progress in the PC version of Waxworks.
+
  Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
      version (bug #6720).
-- 
cgit v1.2.3


From 735831add2dbb6049316fa4b6e7a61723a286c04 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Fri, 22 May 2015 13:54:26 +1000
Subject: README: Add known sound issues in Lure of the Temptress.

---
 README | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 6b1a3cf2af..ca65ba7b69 100644
--- a/README
+++ b/README
@@ -1013,7 +1013,11 @@ site, please see the section on reporting bugs.
   Inherit the Earth: Quest for the Orb
     - Amiga versions aren't supported
 
-  Simon the Sorcerer 1:
+  Lure of the Temptress
+    - No Roland MT-32 support
+    - Sound support is incomplete and doesn't sound like original
+
+	Simon the Sorcerer 1:
     - Subtitles aren't available in the English and German CD versions
       as they are missing the majority of subtitles.
 
-- 
cgit v1.2.3


From 40cdc1ccb048f8c4d73030e387531758a26c905e Mon Sep 17 00:00:00 2001
From: Kirben
Date: Fri, 22 May 2015 13:57:03 +1000
Subject: README: Spacing.

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index ca65ba7b69..7116536222 100644
--- a/README
+++ b/README
@@ -1017,7 +1017,7 @@ site, please see the section on reporting bugs.
     - No Roland MT-32 support
     - Sound support is incomplete and doesn't sound like original
 
-	Simon the Sorcerer 1:
+ Simon the Sorcerer 1:
     - Subtitles aren't available in the English and German CD versions
       as they are missing the majority of subtitles.
 
-- 
cgit v1.2.3


From ca4793dabdaea4a34ef41fb30a44b9ffd9ffc3b6 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 22 May 2015 12:23:22 +0200
Subject: NEWS: Spacing.

---
 NEWS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 1a8bde46b0..1422ec2818 100644
--- a/NEWS
+++ b/NEWS
@@ -17,8 +17,8 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix incorrect volume attenuation in PCjr sound code (bug #6858).
 
  AGOS:
- - Fixed arpeggio effect used in music of Amiga version of Elvira 1.
- - Fixed loading and saving progress in the PC version of Waxworks.
+   - Fixed arpeggio effect used in music of Amiga version of Elvira 1.
+   - Fixed loading and saving progress in the PC version of Waxworks.
 
  Broken Sword 1:
    - Fix speech endianness detection on big endian systems for the mac
-- 
cgit v1.2.3


From 0dc565641d444ef537f4a550c88fbd2c1af023f7 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 22 May 2015 14:16:52 +0200
Subject: SHERLOCK: add detection entry Sherlock 2 German

---
 engines/sherlock/detection_tables.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 9315fa1bdd..208b6710af 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -99,6 +99,21 @@ static const SherlockGameDescription gameDescriptions[] = {
 		GType_RoseTattoo,
 	},
 
+	{
+		// Case of the Rose Tattoo - German CD
+		// Provided by m_kiewitz
+		{
+			"rosetattoo",
+			"CD",
+			AD_ENTRY1s("talk.lib", "5027aa72f0d263ed3b1c764a6c397911", 873864),
+  			Common::DE_DEU,
+			Common::kPlatformDOS,
+			ADGF_UNSTABLE,
+			GUIO0()
+		},
+		GType_RoseTattoo,
+	},
+
 	{ AD_TABLE_END_MARKER, (GameType)0 }
 };
 
-- 
cgit v1.2.3


From 74814d20dc2a2ab86532ff66282302a488b9953c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 22 May 2015 08:18:46 -0400
Subject: SHERLOCK: Remove unused variable and field

---
 engines/sherlock/scene.h      | 1 -
 engines/sherlock/settings.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 243aba20f8..5ce3702ad1 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -110,7 +110,6 @@ class Scene {
 private:
 	SherlockEngine *_vm;
 	Common::String _rrmName;
-	int _selector;
 	bool _lookHelp;
 	bool _loadingSavedGame;
 
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index b26acde615..44735d9c82 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -44,7 +44,6 @@ static const char *const SETUP_STRS0[2] = { "off", "on" };
 static const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
 static const char *const SETUP_STRS2[2] = { "Left", "Right" };
 static const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
-static const char *const SETUP_STRS4[2] = { "Slow", "Fast" };
 static const char *const SETUP_STRS5[2] = { "Left", "Right" };
 static const char *const SETUP_NAMES[12] = {
 	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
-- 
cgit v1.2.3


From 57b106d41793f91f571c7bd29b71165f875c1372 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 22 May 2015 17:52:51 +0200
Subject: SHERLOCK: sound: fix CLIP

---
 engines/sherlock/sound.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 2ed6a1bbe8..4f27481f5b 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -92,7 +92,7 @@ byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {
 	int16 ref = 0;
 
 	// clip bad ADPCM-4 sample
-	CLIP<int16>(samp, 0, 63);
+	samp = CLIP<int16>(samp, 0, 63);
 
 	ref = reference + creativeADPCM_ScaleMap[samp];
 	if (ref > 0xff) {
-- 
cgit v1.2.3


From 68c7c158e93e27919d0b63d537b3b18ba35543ca Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 22 May 2015 19:25:52 +0200
Subject: SHERLOCK: Fix OR check with identical operands

---
 engines/sherlock/settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index 44735d9c82..ea4dc56eb2 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -143,7 +143,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 
 	for (int idx = 0; idx < 12; ++idx) {
 		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
-				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._released || events._released))
+				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._presed || events._released))
 				|| (_key == SETUP_NAMES[idx][0])) {
 			found = idx;
 			color = COMMAND_HIGHLIGHTED;
-- 
cgit v1.2.3


From 9a58e485bfeb97c2a282f809386350e697790db5 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 22 May 2015 19:52:00 +0200
Subject: SHERLOCK: Fix some uninitialized values and unused variables

---
 engines/sherlock/inventory.cpp | 2 ++
 engines/sherlock/map.cpp       | 4 ++++
 engines/sherlock/map.h         | 3 +++
 engines/sherlock/objects.h     | 1 -
 engines/sherlock/scene.cpp     | 8 --------
 engines/sherlock/scene.h       | 6 ------
 engines/sherlock/settings.cpp  | 2 +-
 7 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 265b12ce76..7f216a35c3 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -47,6 +47,8 @@ Inventory::Inventory(SherlockEngine *vm) : Common::Array<InventoryItem>(), _vm(v
 	_invIndex = 0;
 	_holdings = 0;
 	_invMode = INVMODE_EXIT;
+	for (int i = 0; i < 6; ++i)
+		_invShapes[i] = nullptr;
 }
 
 Inventory::~Inventory() {
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 96442893ef..42775ae4b0 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -25,6 +25,10 @@
 
 namespace Sherlock {
 
+MapPaths::MapPaths() {
+	_numLocations = 0;
+}
+
 void MapPaths::load(int numLocations, Common::SeekableReadStream &s) {
 	_numLocations = numLocations;
 	_paths.resize(_numLocations * _numLocations);
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 2c8c02325b..ab70b0885f 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -48,7 +48,10 @@ class MapPaths {
 private:
 	int _numLocations;
 	Common::Array< Common::Array<byte> > _paths;
+
 public:
+	MapPaths();
+
 	/**
 	 * Load the data for the paths between locations on the map
 	 */
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 6dbe645d4b..bbd068eef7 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -120,7 +120,6 @@ public:
 	Common::Point _oldSize;				// Image's old size
 	Common::Point _goto;				// Walk destination
 	SpriteType _type;					// Type of object
-	int _pickup;
 	Common::Point _noShapeSize;			// Size of a NO_SHAPE
 	int _status;						// Status: open/closed, moved/not moved
 	int8 _misc;							// Miscellaneous use
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index f97b791724..5ae7e25258 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -106,16 +106,12 @@ Scene::Scene(SherlockEngine *vm) : _vm(vm) {
 	_currentScene = -1;
 	_goToScene = -1;
 	_loadingSavedGame = false;
-	_changes = false;
-	_keyboardInput = 0;
 	_walkedInScene = false;
 	_version = 0;
 	_lzwMode = false;
 	_invGraphicItems = 0;
 	_cAnimFramePause = 0;
 	_restoreFlag = false;
-	_invLookFlag = false;
-	_lookHelp = false;
 	_animating = 0;
 	_doBgAnimDone = true;
 	_tempFadeStyle = 0;
@@ -135,9 +131,6 @@ void Scene::selectScene() {
 	// Reset fields
 	ui._windowOpen = ui._infoFlag = false;
 	ui._menuMode = STD_MODE;
-	_keyboardInput = 0;
-	_oldKey = _help = _oldHelp = 0;
-	_oldTemp = _temp = 0;
 
 	// Free any previous scene
 	freeScene();
@@ -424,7 +417,6 @@ bool Scene::loadScene(const Common::String &filename) {
 	// Clear user interface area and draw controls
 	ui.drawInterface();
 
-	_changes = false;
 	checkSceneStatus();
 
 	if (!saves._justLoaded) {
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 5ce3702ad1..88d12a3fb0 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -110,7 +110,6 @@ class Scene {
 private:
 	SherlockEngine *_vm;
 	Common::String _rrmName;
-	bool _lookHelp;
 	bool _loadingSavedGame;
 
 	/**
@@ -158,12 +157,8 @@ private:
 public:
 	int _currentScene;
 	int _goToScene;
-	bool _changes;
 	bool _sceneStats[SCENES_COUNT][65];
 	bool _savedStats[SCENES_COUNT][9];
-	int _keyboardInput;
-	int _oldKey, _help, _oldHelp;
-	int _oldTemp, _temp;
 	bool _walkedInScene;
 	int _version;
 	bool _lzwMode;
@@ -186,7 +181,6 @@ public:
 	bool _doBgAnimDone;
 	int _tempFadeStyle;
 	int _cAnimFramePause;
-	bool _invLookFlag;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index ea4dc56eb2..bf5294f08b 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -143,7 +143,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 
 	for (int idx = 0; idx < 12; ++idx) {
 		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
-				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._presed || events._released))
+				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._pressed || events._released))
 				|| (_key == SETUP_NAMES[idx][0])) {
 			found = idx;
 			color = COMMAND_HIGHLIGHTED;
-- 
cgit v1.2.3


From 2db07a9d39cc9557d292908d84d3fc146635fd75 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 22 May 2015 19:55:45 +0200
Subject: SHERLOCK: Skip delay when intro is skipped

---
 engines/sherlock/scalpel/scalpel.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index d55517cdc3..7875f22c47 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -611,8 +611,10 @@ bool ScalpelEngine::showOfficeCutscene() {
 		} else
 			finished = _events->delay(19000);
 
-		_events->clearEvents();
-		finished = _events->delay(500);
+		if (finished) {
+			_events->clearEvents();
+			finished = _events->delay(500);
+		}
 	}
 
 	if (finished)
-- 
cgit v1.2.3


From 1e58f3d9258ee6c98e48b3f246b922c786d1b14c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 22 May 2015 22:23:40 +0200
Subject: SHERLOCK: Rework use of music flags

---
 engines/sherlock/scalpel/scalpel.cpp | 14 ++++----------
 engines/sherlock/scene.cpp           |  6 ++----
 engines/sherlock/settings.cpp        | 15 ++++++---------
 engines/sherlock/sherlock.cpp        |  2 +-
 engines/sherlock/sound.cpp           | 14 ++++++++++++--
 engines/sherlock/sound.h             |  2 +-
 6 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 7875f22c47..8354b22c2a 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -668,12 +668,8 @@ void ScalpelEngine::showLBV(const Common::String &filename) {
 void ScalpelEngine::startScene() {
 	if (_scene->_goToScene == OVERHEAD_MAP || _scene->_goToScene == OVERHEAD_MAP2) {
 		// Show the map
-		if (_sound->_musicOn) {
-			if (_sound->loadSong(100)) {
-				if (_sound->_music)
-					_sound->startSong();
-			}
-		}
+		if (_sound->_musicOn && _sound->loadSong(100))
+			_sound->startSong();
 
 		_scene->_goToScene = _map->show();
 
@@ -693,10 +689,8 @@ void ScalpelEngine::startScene() {
 	case RESCUE_ANNA:
 	case MOOREHEAD_DEATH:
 	case BRUMWELL_SUICIDE:
-		if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene)) {
-			if (_sound->_music)
-				_sound->startSong();
-		}
+		if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene))
+			_sound->startSong();
 
 		switch (_scene->_goToScene) {
 		case BLACKWOOD_CAPTURE:
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 5ae7e25258..39ec16ca7e 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -446,10 +446,8 @@ bool Scene::loadScene(const Common::String &filename) {
 	checkInventory();
 
 	// Handle starting any music for the scene
-	if (sound._musicOn && sound.loadSong(_currentScene)) {
-		if (sound._music)
-			sound.startSong();
-	}
+	if (sound._musicOn && sound.loadSong(_currentScene))
+		sound.startSong();
 
 	// Load walking images if not already loaded
 	people.loadWalk();
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index bf5294f08b..e61f7a2246 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -71,7 +71,7 @@ void Settings::drawInteface(bool flag) {
 	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
 		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
 
-	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._musicOn]);
 	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10),
 		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
@@ -154,7 +154,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 		// Print the button text
 		switch (idx) {
 		case 1:
-			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._musicOn]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 2:
@@ -255,14 +255,11 @@ void Settings::show(SherlockEngine *vm) {
 
 		if ((found == 1 && events._released) || ui._key == 'M') {
 			// Toggle music
-			if (sound._music) {
-				sound.stopSound();
-				sound._music = false;
-			}
-			else {
-				sound._music = true;
+			sound._musicOn = !sound._musicOn;
+			if (!sound._musicOn)
+				sound.stopMusic();
+			else
 				sound.startSong();
-			}
 
 			updateConfig = true;
 			settings.drawInteface(true);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index d4644d4d9d..db1083d195 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -218,7 +218,7 @@ void SherlockEngine::loadConfig() {
 
 void SherlockEngine::saveConfig() {
 	ConfMan.setBool("mute", !_sound->_digitized);
-	ConfMan.setBool("music_mute", !_sound->_music);
+	ConfMan.setBool("music_mute", !_sound->_musicOn);
 	ConfMan.setBool("speech_mute", !_sound->_voices);
 
 	ConfMan.setInt("font", _screen->fontNumber());
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 4f27481f5b..1441b4c4aa 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -52,7 +52,7 @@ static const uint8 creativeADPCM_AdjustMap[64] = {
 
 Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_digitized = false;
-	_music = false;
+	_musicPlaying = false;
 	_voices = 0;
 	_diskSoundPlaying = false;
 	_soundPlaying = false;
@@ -78,7 +78,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 
 void Sound::syncSoundSettings() {
 	_digitized = !ConfMan.getBool("mute");
-	_music = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
+	_musicOn = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
 	_voices = !ConfMan.getBool("mute") && !ConfMan.getBool("speech_mute") ? 1 : 0;
 }
 
@@ -202,6 +202,9 @@ void Sound::stopSound() {
 }
 
 void Sound::playMusic(const Common::String &name) {
+	if (!_musicOn)
+		return;
+
 	// TODO
 	warning("Sound::playMusic %s", name.c_str());
 	Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
@@ -223,6 +226,8 @@ void Sound::playMusic(const Common::String &name) {
 void Sound::stopMusic() {
 	// TODO
 	warning("TODO: Sound::stopMusic");
+
+	_musicPlaying = false;
 }
 
 int Sound::loadSong(int songNumber) {
@@ -232,8 +237,13 @@ int Sound::loadSong(int songNumber) {
 }
 
 void Sound::startSong() {
+	if (!_musicOn)
+		return;
+
 	// TODO
 	warning("TODO: Sound::startSong");
+
+	_musicPlaying = true;
 }
 
 void Sound::freeSong() {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 689e615a36..e0e56bc13c 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -49,7 +49,7 @@ private:
 	byte decodeSample(byte sample, byte& reference, int16& scale);
 public:
 	bool _digitized;
-	bool _music;
+	bool _musicPlaying;
 	int _voices;
 	bool _soundOn;
 	bool _musicOn;
-- 
cgit v1.2.3


From c8cfca749a5da09aead4ca0c499def9afab5317c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 May 2015 10:39:47 -0400
Subject: SHERLOCK: Fix Rose Tattoo scene loading problems from merge

---
 engines/sherlock/resources.cpp       |  9 ++++++---
 engines/sherlock/scalpel/scalpel.cpp |  7 -------
 engines/sherlock/scene.cpp           | 32 +++++++++++++++++++-------------
 engines/sherlock/sound.cpp           | 13 +++++++++----
 engines/sherlock/tattoo/tattoo.cpp   |  1 -
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 864622e74b..4e10ba97c9 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -91,9 +91,12 @@ Resources::Resources(SherlockEngine *vm) : _vm(vm), _cache(vm) {
 	if (_vm->_interactiveFl) {
 		addToCache("vgs.lib");
 		addToCache("talk.lib");
-		addToCache("sequence.txt");
 		addToCache("journal.txt");
-		addToCache("portrait.lib");
+
+		if (IS_SERRATED_SCALPEL) {
+			addToCache("sequence.txt");
+			addToCache("portrait.lib");
+		}
 	}
 }
 
@@ -310,7 +313,7 @@ void Resources::decompressLZ(Common::SeekableReadStream &source, byte *outBuffer
 				lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
 			}
 		}
-	} while ((outSize == -1 || outBuffer < outBufferEnd) || (inSize == -1 || source.pos() < endPos));
+	} while ((outSize == -1 || outBuffer < outBufferEnd) && (inSize == -1 || source.pos() < endPos));
 }
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index ccc9c8abca..7209c34218 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -390,13 +390,6 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
-	// Add some more files to the cache
-	_res->addToCache("portrait.lib");
-	_res->addToCache("sequence.txt");
-	_res->addToCache("EPILOGUE.SND");
-	_res->addToCache("snd.snd");
-	_res->addToCache("title.snd");
-
 	if (!isDemo()) {
 		// Load the map co-ordinates for each scene and sequence data
 		_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 2c80bfbd39..933e60d96d 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -311,27 +311,32 @@ bool Scene::loadScene(const Common::String &filename) {
 			bgInfo[idx].load(*rrmStream);
 
 		// Read information
-		if (IS_SERRATED_SCALPEL) {
-			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream :
-				res.decompress(*rrmStream, bgHeader._numStructs * 569 + bgHeader._descSize + bgHeader._seqSize);
+		if (IS_ROSE_TATTOO) {
+			// Load shapes
+			Common::SeekableReadStream *infoStream = !_lzwMode ? rrmStream : res.decompress(*rrmStream, bgHeader._numStructs * 625);
 
 			_bgShapes.resize(bgHeader._numStructs);
 			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
-				_bgShapes[idx].load(*infoStream, false);
+				_bgShapes[idx].load(*infoStream, _vm->getGameID() == GType_RoseTattoo);
 
-			if (bgHeader._descSize) {
-				_descText.resize(bgHeader._descSize);
-				infoStream->read(&_descText[0], bgHeader._descSize);
-			}
+			if (_lzwMode)
+				delete infoStream;
 
-			if (bgHeader._seqSize) {
-				_sequenceBuffer.resize(bgHeader._seqSize);
-				infoStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
-			}
+			// Load description text
+			_descText.resize(bgHeader._descSize);
+			if (_lzwMode)
+				res.decompress(*rrmStream, (byte *)&_descText[0], bgHeader._descSize);
+			else
+				rrmStream->read(&_descText[0], bgHeader._descSize);
 
+			// Load sequences
+			_sequenceBuffer.resize(bgHeader._seqSize);
 			if (_lzwMode)
-				delete infoStream;
+				res.decompress(*rrmStream, &_sequenceBuffer[0], bgHeader._seqSize);
+			else
+				rrmStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
 		} else if (!_lzwMode) {
+			// Serrated Scalpel uncompressed info
 			_bgShapes.resize(bgHeader._numStructs);
 			for (int idx = 0; idx < bgHeader._numStructs; ++idx)
 				_bgShapes[idx].load(*rrmStream, false);
@@ -346,6 +351,7 @@ bool Scene::loadScene(const Common::String &filename) {
 				rrmStream->read(&_sequenceBuffer[0], bgHeader._seqSize);
 			}
 		} else {
+			// Serrated Scalpel compressed info
 			Common::SeekableReadStream *infoStream;
 
 			// Read shapes
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 06f6a0f264..b8fe61dd29 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -68,11 +68,16 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 		_vm->_res->addToCache("TITLE.SND");
 	else {
 		_vm->_res->addToCache("MUSIC.LIB");
-		_vm->_res->addToCache("SND.SND");
+		
+		if (IS_ROSE_TATTOO) {
+			_vm->_res->addToCache("SOUND.LIB");
+		} else {
+			_vm->_res->addToCache("SND.SND");
 
-		if (!_vm->isDemo()) {
-			_vm->_res->addToCache("TITLE.SND");
-			_vm->_res->addToCache("EPILOGUE.SND");
+			if (!_vm->isDemo()) {
+				_vm->_res->addToCache("TITLE.SND");
+				_vm->_res->addToCache("EPILOGUE.SND");
+			}
 		}
 	}
 }
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 3c684ff3ee..9039e3f9d4 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -44,7 +44,6 @@ void TattooEngine::initialize() {
 
 	// Add some more files to the cache
 	_res->addToCache("walk.lib");
-	_res->addToCache("sound.lib");
 
 	// Starting scene
 	_scene->_goToScene = 91;
-- 
cgit v1.2.3


From bcc31b2a663545ec448d886d8ed16546593f849e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 May 2015 16:06:29 -0400
Subject: SHERLOCK: Implemented Tattoo loadWalk changes

---
 engines/sherlock/map.cpp             |  12 ++-
 engines/sherlock/map.h               |   2 +-
 engines/sherlock/objects.cpp         |  19 +++--
 engines/sherlock/objects.h           |  28 +++++-
 engines/sherlock/people.cpp          | 160 ++++++++++++++++++++++++++++++-----
 engines/sherlock/people.h            |  22 +++--
 engines/sherlock/scalpel/scalpel.cpp |   6 +-
 engines/sherlock/scene.cpp           |   4 +-
 8 files changed, 207 insertions(+), 46 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 44ca7cd44c..4f034d8889 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -65,8 +65,12 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(g_system->getWidth(), 12) {
 	_oldCharPoint = 0;
 	_frameChangeFlag = false;
 
-	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx)
-		Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0);
+	// Initialise the initial walk sequence set
+	_walkSequences.resize(MAX_HOLMES_SEQUENCE);
+	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) {
+		_walkSequences[idx]._sequences.resize(MAX_FRAME);
+		Common::fill(&_walkSequences[idx]._sequences[0], &_walkSequences[idx]._sequences[0] + MAX_FRAME, 0);
+	}
 
 	if (!_vm->isDemo())
 		loadData();
@@ -80,7 +84,7 @@ void Map::loadPoints(int count, const int *xList, const int *yList, const int *t
 
 void Map::loadSequences(int count, const byte *seq) {
 	for (int idx = 0; idx < count; ++idx, seq += MAX_FRAME)
-		Common::copy(seq, seq + MAX_FRAME, &_sequences[idx][0]);
+		Common::copy(seq, seq + MAX_FRAME, &_walkSequences[idx]._sequences[0]);
 }
 
 void Map::loadData() {
@@ -289,7 +293,7 @@ void Map::setupSprites() {
 	p._type = CHARACTER;
 	p._position = Common::Point(12400, 5000);
 	p._sequenceNumber = 0;
-	p._sequences = &_sequences;
+	p._walkSequences = _walkSequences;
 	p._images = _shapes;
 	p._imageFrame = nullptr;
 	p._frameNumber = 0;
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index ab70b0885f..198b31e7d3 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -76,7 +76,7 @@ private:
 	ImageFile *_mapCursors;
 	ImageFile *_shapes;
 	ImageFile *_iconShapes;
-	byte _sequences[MAX_HOLMES_SEQUENCE][MAX_FRAME];
+	Common::Array<WalkSequence> _walkSequences;
 	Point32 _lDrawnPos;
 	int _point;
 	bool _placesShown;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index f3803518ee..0709f6b7a9 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -46,7 +46,7 @@ void Sprite::clear() {
 	_description = "";
 	_examine.clear();
 	_pickUp = "";
-	_sequences = nullptr;
+	_walkSequences.clear();
 	_images = nullptr;
 	_imageFrame = nullptr;
 	_walkCount = 0;
@@ -63,12 +63,21 @@ void Sprite::clear() {
 	_status = 0;
 	_misc = 0;
 	_numFrames = 0;
+	_altImages = nullptr;
+	_altSequences = false;
+	Common::fill(&_stopFrames[0], &_stopFrames[8], (ImageFrame *)nullptr);
 }
 
 void Sprite::setImageFrame() {
-	int imageNumber = (*_sequences)[_sequenceNumber][_frameNumber] +
-		(*_sequences)[_sequenceNumber][0] - 2;
-	_imageFrame = &(*_images)[imageNumber];
+	int frameNum = MAX(_frameNumber, 0);
+	int imageNumber = _walkSequences[_sequenceNumber][frameNum];
+	
+	if (IS_SERRATED_SCALPEL)
+		imageNumber = imageNumber + +_walkSequences[_sequenceNumber][0] - 2;
+	else if (imageNumber > _numFrames)
+		imageNumber = 1;
+
+	_imageFrame = &(_altSequences ? *_altImages : *_images)[imageNumber];
 }
 
 void Sprite::adjustSprite() {
@@ -120,7 +129,7 @@ void Sprite::adjustSprite() {
 	if (!map._active || (map._frameChangeFlag = !map._frameChangeFlag))
 		++_frameNumber;
 
-	if ((*_sequences)[_sequenceNumber][_frameNumber] == 0) {
+	if (_walkSequences[_sequenceNumber][_frameNumber] == 0) {
 		switch (_sequenceNumber) {
 		case STOP_UP:
 		case STOP_DOWN:
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index b61e7e24fe..761c03d501 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -46,7 +46,10 @@ enum SpriteType {
 	REMOVE = 5,					// Object should be removed next frame
 	NO_SHAPE = 6,				// Background object with no shape
 	HIDDEN = 7,					// Hidden backgruond object
-	HIDE_SHAPE = 8				// Object needs to be hidden
+	HIDE_SHAPE = 8,				// Object needs to be hidden
+
+	// Rose Tattoo
+	HIDDEN_CHARACTER = 128
 };
 
 enum AType {
@@ -98,16 +101,31 @@ public:
 	void operator-=(const Point32 &delta) { x -= delta.x; y -= delta.y; }
 };
 
+
+struct WalkSequence {
+	Common::String _vgsName;
+	bool _horizFlip;
+	Common::Array<byte> _sequences;
+
+	WalkSequence() : _vgsName(nullptr), _horizFlip(false) {}
+	const byte &operator[](int idx) { return _sequences[idx]; }
+
+	/**
+	 * Load data for the sequence from a stream
+	 */
+	void load(Common::SeekableReadStream &s);
+};
+
 class Sprite {
 private:
 	static SherlockEngine *_vm;
 public:
 	Common::String _name;				
 	Common::String _description;		
-	Common::StringArray _examine;		// Examine in-depth description
+	Common::String _examine;			// Examine in-depth description
 	Common::String _pickUp;				// Message for if you can't pick up object
 
-	const uint8 (*_sequences)[MAX_HOLMES_SEQUENCE][MAX_FRAME];  // Holds animation sequences
+	Common::Array<WalkSequence> _walkSequences;	// Holds animation sequences
 	ImageFile *_images;					// Sprite images
 	ImageFrame *_imageFrame;			// Pointer to shape in the images
 	int _walkCount;						// Character walk counter
@@ -124,8 +142,12 @@ public:
 	int _status;						// Status: open/closed, moved/not moved
 	int8 _misc;							// Miscellaneous use
 	int _numFrames;						// How many frames the object has
+	ImageFile *_altImages;
+	bool _altSequences;
+	ImageFrame *_stopFrames[8];			// Stop/rest frame for each direction
 public:
 	Sprite() { clear(); }
+
 	static void setVm(SherlockEngine *vm) { _vm = vm; }
 
 	/**
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 3a630fdd99..638cbf662b 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -50,10 +50,37 @@ static const uint8 CHARACTER_SEQUENCES[MAX_HOLMES_SEQUENCE][MAX_FRAME] = {
 	{ 52, 1, 2, 3, 4, 0 }				// Goto Stand Down Left
 };
 
+// Rose Tattoo walk image libraries
+// Walk resources within WALK.LIB
+#define NUM_IN_WALK_LIB 10            
+const char *const WALK_LIB_NAMES[10] = {
+	"SVGAWALK.VGS",
+	"COATWALK.VGS",
+	"WATSON.VGS",
+	"NOHAT.VGS",
+	"TUPRIGHT.VGS",
+	"TRIGHT.VGS",
+	"TDOWNRG.VGS",
+	"TWUPRIGH.VGS",
+	"TWRIGHT.VGS",
+	"TWDOWNRG.VGS"
+};
+
+/*----------------------------------------------------------------*/
+
+void WalkSequence::load(Common::SeekableReadStream &s) {
+	char buffer[9];
+	s.read(buffer, 9);
+	_vgsName = Common::String(buffer);
+	_horizFlip = s.readByte() != 0;
+
+	_sequences.resize(s.readUint16LE());
+	s.read(&_sequences[0], _sequences.size());
+}
+
 /*----------------------------------------------------------------*/
 
 People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
-	_walkLoaded = false;
 	_holmesOn = true;
 	_oldWalkSequence = -1;
 	_allowWalkAbort = false;
@@ -68,13 +95,18 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_holmesQuotient = 0;
 	_hSavedPos = Common::Point(-1, -1);
 	_hSavedFacing = -1;
+	_forceWalkReload = false;
+	_useWalkLib = false;
 
 	_portrait._sequences = new byte[32];
 }
 
 People::~People() {
-	if (_walkLoaded)
-		delete _data[PLAYER]._images;
+	for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+		if (_data[idx]._walkLoaded)
+			delete _data[PLAYER]._images;
+	}
+
 	delete _talkPics;
 	delete[] _portrait._sequences;
 }
@@ -88,7 +120,6 @@ void People::reset() {
 	p._type = CHARACTER;
 	p._position = Common::Point(10000, 11000);
 	p._sequenceNumber = STOP_DOWNRIGHT;
-	p._sequences = &CHARACTER_SEQUENCES;
 	p._imageFrame = nullptr;
 	p._frameNumber = 1;
 	p._delta = Common::Point(0, 0);
@@ -102,32 +133,106 @@ void People::reset() {
 	p._goto = Common::Point(0, 0);
 	p._status = 0;
 
+	// Load the default walk sequences
+	p._walkSequences.resize(MAX_HOLMES_SEQUENCE);
+	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) {
+		p._walkSequences[idx]._sequences.clear();
+		
+		const byte *pSrc = &CHARACTER_SEQUENCES[idx][0];
+		do {
+			p._walkSequences[idx]._sequences.push_back(*pSrc);
+		} while (*pSrc++);
+	}
+
 	// Reset any walk path in progress when Sherlock leaves scenes
 	_walkTo.clear();
 }
 
 bool People::loadWalk() {
-	if (_walkLoaded) {
-		return false;
+	Resources &res = *_vm->_res;
+	bool result = false;
+
+	if (IS_SERRATED_SCALPEL) {
+		if (_data[PLAYER]._walkLoaded) {
+			return false;
+		} else {
+			_data[PLAYER]._images = new ImageFile("walk.vgs");
+			_data[PLAYER].setImageFrame();
+			_data[PLAYER]._walkLoaded = true;
+
+			result = true;
+		}
 	} else {
-		_data[PLAYER]._images = new ImageFile("walk.vgs");
-		_data[PLAYER].setImageFrame();
-		_walkLoaded = true;
+		for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+			if (!_data[idx]._walkLoaded && (_data[idx]._type == CHARACTER || _data[idx]._type == HIDDEN_CHARACTER)) {
+				if (_data[idx]._type == HIDDEN_CHARACTER)
+					_data[idx]._type = INVALID;
+
+				// See if this is one of the more used Walk Graphics stored in WALK.LIB
+				for (int libNum = 0; libNum < NUM_IN_WALK_LIB; ++libNum) {
+					if (!_data[0]._walkVGSName.compareToIgnoreCase(WALK_LIB_NAMES[libNum])) {
+						_useWalkLib = true;
+						break;
+					}
+				}
+
+				// Load the images for the character
+				_data[idx]._images = new ImageFile(_data[idx]._walkVGSName, false);
+				_data[idx]._numFrames = _data[idx]._images->size();
+
+				// Load walk sequence data
+				Common::String fname = Common::String(_data[idx]._walkVGSName.c_str(), strchr(_data[idx]._walkVGSName.c_str(), '.'));
+				fname += ".SEQ";
+
+				// Load the walk sequence data
+				Common::SeekableReadStream *stream = res.load(fname, _useWalkLib ? "walk.lib" : "vgs.lib");
+				
+				_data[idx]._walkSequences.resize(stream->readByte());
+
+				for (uint seqNum = 0; seqNum < _data[idx]._walkSequences.size(); ++seqNum)
+					_data[idx]._walkSequences[seqNum].load(*stream);
+
+				// Close the sequences resource
+				delete stream;
+				_useWalkLib = false;
+
+				_data[idx]._frameNumber = 0;
+				_data[idx].setImageFrame();
+
+				// Set the stop Frames pointers
+				for (int dirNum = 0; dirNum < 8; ++dirNum) {
+					int count = 0;
+					while (_data[idx]._walkSequences[dirNum + 8][count] != 0)
+						++count;
+					count += 2;
+					count = _data[idx]._walkSequences[dirNum + 8][count] - 1;
+					_data[idx]._stopFrames[dirNum] = &(*_data[idx]._images)[count];
+				}
 
-		return true;
+				result = true;
+				_data[idx]._walkLoaded = true;
+			} else if (_data[idx]._type != CHARACTER) {
+				_data[idx]._walkLoaded = false;
+			}
+		}
 	}
+
+	_forceWalkReload = false;
+	return result;
 }
 
 bool People::freeWalk() {
-	if (_walkLoaded) {
-		delete _player._images;
-		_player._images = nullptr;
+	bool result = false;
 
-		_walkLoaded = false;
-		return true;
-	} else {
-		return false;
+	for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+		if (_data[idx]._walkLoaded) {
+			delete _data[idx]._images;
+			_data[idx]._images = nullptr;
+			result = true;
+		}
 	}
+
+	return result;
 }
 
 void People::setWalking() {
@@ -553,9 +658,24 @@ void People::setTalking(int speaker) {
 
 void People::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_holmesOn);
-	s.syncAsSint16LE(_player._position.x);
-	s.syncAsSint16LE(_player._position.y);
-	s.syncAsSint16LE(_player._sequenceNumber);
+
+	if (IS_SERRATED_SCALPEL) {
+		s.syncAsSint16LE(_player._position.x);
+		s.syncAsSint16LE(_player._position.y);
+		s.syncAsSint16LE(_player._sequenceNumber);
+	} else {
+		for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+			Person &p = _data[idx];
+			s.syncAsSint16LE(p._position.x);
+			s.syncAsSint16LE(p._position.y);
+			s.syncAsSint16LE(p._sequenceNumber);
+			s.syncAsSint16LE(p._type);
+			s.syncString(p._walkVGSName);
+			s.syncString(p._description);
+			s.syncString(p._examine);
+		}
+	}
+
 	s.syncAsSint16LE(_holmesQuotient);
 
 	if (s.isLoading()) {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 8244fd9b59..f3e7950400 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -30,13 +30,11 @@
 
 namespace Sherlock {
 
-// Player definitions. The game has theoretical support for two player characters but only the first one is used.
-// Watson is, instead, handled by a different sprite in each scene, with a very simple initial movement, if any
 enum PeopleId {
 	PLAYER			= 0,
 	AL				= 0,
 	PEG				= 1,
-	MAX_PLAYERS		= 2
+	MAX_PLAYERS		= 6
 };
 
 // Animation sequence identifiers for characters
@@ -63,20 +61,24 @@ struct PersonData {
 		_name(name), _portrait(portrait), _stillSequences(stillSequences), _talkSequences(talkSequences) {}
 };
 
-class SherlockEngine;
-
 class Person : public Sprite {
 public:
-	Person() : Sprite() {}
-
+	bool _walkLoaded;
 	Common::String _portrait;
+
+	// Rose Tattoo fields
+	Common::String _walkVGSName;		// Name of walk library person is using
+	Common::Array<WalkSequence> _walkSequences;
+public:
+	Person() : Sprite(), _walkLoaded(false) {}
 };
 
+class SherlockEngine;
+
 class People {
 private:
 	SherlockEngine *_vm;
 	Person _data[MAX_PLAYERS];
-	bool _walkLoaded;
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
 public:
@@ -97,6 +99,8 @@ public:
 	bool _speakerFlip;
 	bool _holmesFlip;
 	int _holmesQuotient;
+	bool _forceWalkReload;
+	bool _useWalkLib;
 public:
 	People(SherlockEngine *vm);
 	~People();
@@ -113,7 +117,7 @@ public:
 	/**
 	 * Returns true if Sherlock is visible on the screen and enabled
 	 */
-	bool isHolmesActive() const { return _walkLoaded && _holmesOn; }
+	bool isHolmesActive() const { return _data[0]._walkLoaded && _holmesOn; }
 
 	/**
 	 * Reset the player data
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 7209c34218..2a107b4d5e 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -837,9 +837,11 @@ void ScalpelEngine::eraseMirror12() {
 
 void ScalpelEngine::doMirror12() {
 	People &people = *_people;
+	Person &player = people._player;
+
 	Common::Point pt((*_people)[AL]._position.x / 100, (*_people)[AL]._position.y / 100);
-	int frameNum = (*people[AL]._sequences)[people[AL]._sequenceNumber][people[AL]._frameNumber] +
-		(*people[AL]._sequences)[people[AL]._sequenceNumber][0] - 2;
+	int frameNum = player._walkSequences[player._sequenceNumber][player._frameNumber] +
+		player._walkSequences[player._sequenceNumber][0] - 2;
 
 	switch ((*_people)[AL]._sequenceNumber) {
 	case WALK_DOWN:
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 933e60d96d..4672e3e7b1 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -536,7 +536,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		delete rrmStream;
 	}
 
-	// Clear user interface area and draw controls
+	// Handle drawing any on-screen interface
 	ui.drawInterface();
 
 	checkSceneStatus();
@@ -568,7 +568,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	checkInventory();
 
 	// Handle starting any music for the scene
-	if (sound._musicOn && sound.loadSong(_currentScene)) {
+	if (IS_SERRATED_SCALPEL && sound._musicOn && sound.loadSong(_currentScene)) {
 		if (sound._music)
 			sound.startSong();
 	}
-- 
cgit v1.2.3


From 5407d996b448ab6b81fe19100a0b8f2728211487 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 24 May 2015 01:20:42 +0200
Subject: SHERLOCK: Split sound class in two, add WIP music player

---
 engines/sherlock/module.mk           |   1 +
 engines/sherlock/music.cpp           | 284 +++++++++++++++++++++++++++++++++++
 engines/sherlock/music.h             |  95 ++++++++++++
 engines/sherlock/scalpel/darts.cpp   |  10 +-
 engines/sherlock/scalpel/scalpel.cpp |  23 +--
 engines/sherlock/scene.cpp           |   7 +-
 engines/sherlock/settings.cpp        |  15 +-
 engines/sherlock/sherlock.cpp        |   6 +-
 engines/sherlock/sherlock.h          |   2 +
 engines/sherlock/sound.cpp           |  59 --------
 engines/sherlock/sound.h             |  28 ----
 11 files changed, 417 insertions(+), 113 deletions(-)
 create mode 100644 engines/sherlock/music.cpp
 create mode 100644 engines/sherlock/music.h

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 2ded999ed1..701753d679 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -11,6 +11,7 @@ MODULE_OBJS = \
 	inventory.o \
 	journal.o \
 	map.o \
+	music.o \
 	objects.o \
 	people.o \
 	resources.o \
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
new file mode 100644
index 0000000000..e52b22b977
--- /dev/null
+++ b/engines/sherlock/music.cpp
@@ -0,0 +1,284 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/config-manager.h"
+#include "sherlock/sherlock.h"
+#include "sherlock/music.h"
+
+namespace Sherlock {
+
+#define NUM_SONGS 45
+
+/* This tells which song to play in each room, 0 = no song played */
+static const char ROOM_SONG[62] = {
+	 0, 20, 43,  6, 11,  2,  8, 15,  6, 28,
+	 6, 38,  7, 32, 16,  5,  8, 41,  9, 22,
+	10, 23,  4, 39, 19, 24, 13, 27,  0, 30,
+	 3, 21, 26, 25, 16, 29,  1,  1, 18, 12,
+	 1, 17, 17, 31, 17, 34, 36,  7, 20, 20,
+	33,  8, 44, 40, 42, 35,  0,  0,  0, 12,
+	12
+};
+
+static const char *const SONG_NAMES[NUM_SONGS] = {
+	"SINGERF",  "CHEMIST",  "TOBAC",   "EQUEST",  "MORTUARY", "DOCKS",    "LSTUDY",
+	"LORD",     "BOY",      "PERFUM1", "BAKER1",  "BAKER2",   "OPERA1",   "HOLMES",
+	"FFLAT",    "OP1FLAT",  "ZOO",     "SROOM",   "FLOWERS",  "YARD",     "TAXID",
+	"PUB1",     "VICTIM",   "RUGBY",   "DORM",    "SHERMAN",  "LAWYER",   "THEATRE",
+	"DETECT",   "OPERA4",   "POOL",    "SOOTH",   "ANNA1",    "ANNA2",    "PROLOG3",
+	"PAWNSHOP", "MUSICBOX", "MOZART1", "ROBHUNT", "PANCRAS1", "PANCRAS2", "LORDKILL",
+	"BLACKWEL", "RESCUE",   "MAP"
+};
+
+MidiParser_SH::MidiParser_SH() {
+	_ppqn = 1;
+	setTempo(16667);
+	_data = nullptr;
+}
+
+void MidiParser_SH::parseNextEvent(EventInfo &info) {
+	warning("parseNextEvent");
+
+	// An attempt to remap MT32 instruments to GMIDI. Only partially successful, it still
+	// does not sound even close to the real MT32. Oddly enough, on the actual hardware MT32
+	// and SB sound very differently.
+	static const byte mt32Map[128] = {
+		0,     1,   0,   2,   4,   4,   5,   3, /* 0-7 */
+		16,   17,  18,  16,  16,  19,  20,  21, /* 8-15 */
+		6,     6,   6,   7,   7,   7,   8, 112, /* 16-23 */
+		62,   62,  63,  63 , 38,  38,  39,  39, /* 24-31 */
+		88,   95,  52,  98,  97,  99,  14,  54, /* 32-39 */
+		102,  96,  53, 102,  81, 100,  14,  80, /* 40-47 */
+		48,   48,  49,  45,  41,  40,  42,  42, /* 48-55 */
+		43,   46,  45,  24,  25,  28,  27, 104, /* 56-63 */
+		32,   32,  34,  33,  36,  37,  35,  35, /* 64-71 */
+		79,   73,  72,  72,  74,  75,  64,  65, /* 72-79 */
+		66,   67,  71,  71,  68,  69,  70,  22, /* 80-87 */
+		56,   59,  57,  57,  60,  60,  58,  61, /* 88-95 */
+		61,   11,  11,  98,  14,   9,  14,  13, /* 96-103 */
+		12,  107, 107,  77,  78,  78,  76,  76, /* 104-111 */
+		47,  117, 127, 118, 118, 116, 115, 119, /* 112-119 */
+		115, 112,  55, 124, 123,   0,  14, 117  /* 120-127 */
+	};
+
+
+	info.start = _position._playPos;
+	info.delta = 0;
+
+	info.event = *_position._playPos++;
+	warning("Event %x", info.event);
+	_position._runningStatus = info.event;
+
+	switch (info.command()) {
+	case 0xC: {
+		int idx = *_position._playPos++;
+		info.basic.param1 = mt32Map[idx & 0x7f]; // remap MT32 to GM
+		info.basic.param2 = 0;
+		}
+		break;
+	case 0xD:
+		info.basic.param1 = *_position._playPos++;
+		info.basic.param2 = 0;
+		break;
+
+	case 0xB:
+		info.basic.param1 = *_position._playPos++;
+		info.basic.param2 = *_position._playPos++;
+		info.length = 0;
+		break;
+
+	case 0x8:
+	case 0x9:
+	case 0xA:
+	case 0xE:
+		info.basic.param1 = *(_position._playPos++);
+		info.basic.param2 = *(_position._playPos++);
+		if (info.command() == 0x9 && info.basic.param2 == 0) {
+			// NoteOn with param2==0 is a NoteOff
+			info.event = info.channel() | 0x80;
+		}
+		info.length = 0;
+		break;
+	case 0xF:
+		if (info.event == 0xFF) {
+			byte type = *(_position._playPos++);
+			switch(type) {
+			case 0x2F:
+				// End of Track
+				allNotesOff();
+				stopPlaying();
+				unloadMusic();
+				return;
+			case 0x51:
+				warning("TODO: 0xFF / 0x51");
+				return;
+			default:
+				warning("TODO: 0xFF / %x Unknown", type);
+				break;
+			}
+		} else if (info.event == 0xFC) {
+			allNotesOff();
+			stopPlaying();
+			unloadMusic();
+			return;
+		} else {
+			warning("TODO: %x / Unknown", info.event);
+			break;
+		}
+		break;
+	default:
+		warning("MidiParser_SH::parseNextEvent: Unsupported event code %x", info.event);
+		break;
+	}// switch (info.command())
+
+	info.delta = *(_position._playPos++);
+}
+
+bool MidiParser_SH::loadMusic(byte *data, uint32 size) {
+	warning("loadMusic");
+	unloadMusic();
+
+	byte *pos = data;
+
+	if (memcmp("            ", pos, 12)) {
+		warning("Expected header not found in music file");
+		return false;
+	}
+	pos += 12;
+	byte headerSize = *pos;
+	pos += headerSize;
+
+	_lastEvent = 0;
+	_trackEnd = data + size;
+
+	_numTracks = 1;
+	_tracks[0] = pos;
+	
+	_ppqn = 1;
+	setTempo(16667);
+	setTrack(0);
+
+	return true;
+}
+
+/*----------------------------------------------------------------*/
+
+Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
+	if (_vm->_interactiveFl)
+		_vm->_res->addToCache("MUSIC.LIB");
+
+	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
+	_driver = MidiDriver::createMidi(dev);
+	assert(_driver);
+
+	int ret = _driver->open();
+	if (ret == 0) {
+		_driver->sendGMReset();
+		_driver->setTimerCallback(&_midiParser, &_midiParser.timerCallback);
+	}
+	_midiParser.setMidiDriver(_driver);
+	_midiParser.setTimerRate(_driver->getBaseTempo());
+}
+
+bool Music::loadSong(int songNumber) {
+	warning("loadSong");
+
+	if(songNumber == 100)
+		songNumber = 55;
+	else if(songNumber == 70)
+		songNumber = 54;
+
+	if((songNumber > 60) || (songNumber < 1))
+		return false;
+
+	songNumber = ROOM_SONG[songNumber];
+
+	if(songNumber == 0)
+		songNumber = 12;
+
+	if((songNumber > NUM_SONGS) || (songNumber < 1))
+		return false;
+
+	Common::String songName = Common::String(SONG_NAMES[songNumber - 1]) + ".MUS";
+
+	freeSong();  // free any song that is currently loaded
+	
+	if (!playMusic(songName))
+		return false;
+
+	stopMusic();
+	startSong();
+	return true;
+}
+
+void Music::syncMusicSettings() {
+	_musicOn = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
+}
+
+bool Music::playMusic(const Common::String &name) {
+	if (!_musicOn)
+		return false;
+
+	warning("Sound::playMusic %s", name.c_str());
+	Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
+
+	byte *data = new byte[stream->size()];
+	byte *ptr = data;
+
+	stream->read(ptr, stream->size());
+	Common::DumpFile outFile;
+	outFile.open(name + ".RAW");
+	outFile.write(data, stream->size());
+	outFile.flush();
+	outFile.close();
+
+	_midiParser.loadMusic(data, stream->size());
+
+	return true;
+}
+
+void Music::stopMusic() {
+	// TODO
+	warning("TODO: Sound::stopMusic");
+
+	_musicPlaying = false;
+}
+
+void Music::startSong() {
+	if (!_musicOn)
+		return;
+
+	// TODO
+	warning("TODO: Sound::startSong");
+	_musicPlaying = true;
+}
+
+void Music::freeSong() {
+	// TODO
+	warning("TODO: Sound::freeSong");
+}
+
+void Music::waitTimerRoland(uint time) {
+	// TODO
+	warning("TODO: Sound::waitTimerRoland");
+}} // End of namespace Sherlock
+
diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h
new file mode 100644
index 0000000000..51ee7bb84f
--- /dev/null
+++ b/engines/sherlock/music.h
@@ -0,0 +1,95 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_MUSIC_H
+#define SHERLOCK_MUSIC_H
+
+#include "audio/midiplayer.h"
+#include "audio/midiparser.h"
+#include "audio/mididrv.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+class MidiParser_SH : public MidiParser {
+protected:
+	virtual void parseNextEvent(EventInfo &info);
+
+	uint8 _beats;
+	uint8 _lastEvent;
+	byte *_data;
+	byte *_trackEnd;
+public:
+	MidiParser_SH();
+	virtual bool loadMusic(byte *data, uint32 size);
+};
+
+class Music : public Audio::MidiPlayer {
+private:
+	SherlockEngine *_vm;
+	Audio::Mixer *_mixer;
+	MidiParser_SH _midiParser;
+
+public:
+	bool _musicPlaying;
+	bool _musicOn;
+public:
+	Music(SherlockEngine *vm, Audio::Mixer *mixer);
+
+	/**
+	 * Saves sound-related settings
+	 */
+	void syncMusicSettings();
+
+	/**
+	 * Load a specified song
+	 */
+	bool loadSong(int songNumber);
+
+	/**
+	 * Start playing a song
+	 */
+	void startSong();
+	
+	/**
+	 * Free any currently loaded song
+	 */
+	void freeSong();
+	
+	/**
+	 * Play the specified music resource
+	 */
+	bool playMusic(const Common::String &name);
+
+	/**
+	 * Stop playing the music
+	 */
+	void stopMusic();
+	
+	void waitTimerRoland(uint time);
+};
+
+} // End of namespace Sherlock
+
+#endif
+
diff --git a/engines/sherlock/scalpel/darts.cpp b/engines/sherlock/scalpel/darts.cpp
index b567d58ab4..8d78335a55 100644
--- a/engines/sherlock/scalpel/darts.cpp
+++ b/engines/sherlock/scalpel/darts.cpp
@@ -377,13 +377,13 @@ void Darts::erasePowerBars() {
 int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool isVertical) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
+	Music &music = *_vm->_music;
 	bool done;
 	int idx = 0;
 
 	events.clearEvents();
-	if (sound._musicOn)
-		sound.waitTimerRoland(10);
+	if (music._musicOn)
+		music.waitTimerRoland(10);
 	else
 		events.delay(100);
 
@@ -410,9 +410,9 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 			screen.slamArea(pt.x + idx, pt.y, 1, 8);
 		}
 
-		if (sound._musicOn) {
+		if (music._musicOn) {
 			if (!(idx % 3))
-				sound.waitTimerRoland(1);
+				music.waitTimerRoland(1);
 		} else if (!(idx % 8))
 			events.wait(1);
 	
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 8354b22c2a..bee44bfb7d 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/music.h"
 #include "sherlock/animation.h"
 
 namespace Sherlock {
@@ -428,13 +429,13 @@ void ScalpelEngine::showOpening() {
 		return;
 
 	_events->clearEvents();
-	_sound->stopMusic();
+	_music->stopMusic();
 }
 
 bool ScalpelEngine::showCityCutscene() {
 	byte palette[PALETTE_SIZE];
 
-	_sound->playMusic("prolog1.mus");
+	_music->playMusic("prolog1.mus");
 	_animation->_gfxLibraryFilename = "title.lib";
 	_animation->_soundLibraryFilename = "title.snd";
 	bool finished = _animation->play("26open1", 1, 255, true, 2);
@@ -505,7 +506,7 @@ bool ScalpelEngine::showCityCutscene() {
 
 bool ScalpelEngine::showAlleyCutscene() {
 	byte palette[PALETTE_SIZE];
-	_sound->playMusic("prolog2.mus");
+	_music->playMusic("prolog2.mus");
 
 	_animation->_gfxLibraryFilename = "TITLE.LIB";
 	_animation->_soundLibraryFilename = "TITLE.SND";
@@ -544,7 +545,7 @@ bool ScalpelEngine::showStreetCutscene() {
 	_animation->_gfxLibraryFilename = "TITLE.LIB";
 	_animation->_soundLibraryFilename = "TITLE.SND";
 
-	_sound->playMusic("PROLOG3.MUS");
+	_music->playMusic("PROLOG3.MUS");
 
 	bool finished = _animation->play("14KICK", 1, 3, true, 2);
 
@@ -590,7 +591,7 @@ bool ScalpelEngine::scrollCredits() {
 }
 
 bool ScalpelEngine::showOfficeCutscene() {
-	_sound->playMusic("PROLOG4.MUS");
+	_music->playMusic("PROLOG4.MUS");
 	_animation->_gfxLibraryFilename = "TITLE2.LIB";
 	_animation->_soundLibraryFilename = "TITLE.SND";
 
@@ -668,12 +669,12 @@ void ScalpelEngine::showLBV(const Common::String &filename) {
 void ScalpelEngine::startScene() {
 	if (_scene->_goToScene == OVERHEAD_MAP || _scene->_goToScene == OVERHEAD_MAP2) {
 		// Show the map
-		if (_sound->_musicOn && _sound->loadSong(100))
-			_sound->startSong();
+		if (_music->_musicOn && _music->loadSong(100))
+			_music->startSong();
 
 		_scene->_goToScene = _map->show();
 
-		_sound->freeSong();
+		_music->freeSong();
 		_people->_hSavedPos = Common::Point(-1, -1);
 		_people->_hSavedFacing = -1;
 	}
@@ -689,8 +690,8 @@ void ScalpelEngine::startScene() {
 	case RESCUE_ANNA:
 	case MOOREHEAD_DEATH:
 	case BRUMWELL_SUICIDE:
-		if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene))
-			_sound->startSong();
+		if (_music->_musicOn && _music->loadSong(_scene->_goToScene))
+			_music->startSong();
 
 		switch (_scene->_goToScene) {
 		case BLACKWOOD_CAPTURE:
@@ -790,7 +791,7 @@ void ScalpelEngine::startScene() {
 		}
 
 		// Free any song from the previous scene
-		_sound->freeSong();
+		_music->freeSong();
 		break;
 
 	case EXIT_GAME:
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 39ec16ca7e..781e596f40 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -167,7 +167,7 @@ void Scene::freeScene() {
 
 	_vm->_talk->freeTalkVars();
 	_vm->_inventory->freeInv();
-	_vm->_sound->freeSong();
+	_vm->_music->freeSong();
 	_vm->_sound->freeLoadedSounds();
 
 	if (!_loadingSavedGame)
@@ -197,6 +197,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	SaveManager &saves = *_vm->_saves;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
+	Music &music = *_vm->_music;
 	UserInterface &ui = *_vm->_ui;
 	bool flag;
 
@@ -446,8 +447,8 @@ bool Scene::loadScene(const Common::String &filename) {
 	checkInventory();
 
 	// Handle starting any music for the scene
-	if (sound._musicOn && sound.loadSong(_currentScene))
-		sound.startSong();
+	if (music._musicOn && music.loadSong(_currentScene))
+		music.startSong();
 
 	// Load walking images if not already loaded
 	people.loadWalk();
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index e61f7a2246..397d882e0f 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -55,6 +55,7 @@ void Settings::drawInteface(bool flag) {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
+	Music &music = *_vm->_music;
 	UserInterface &ui = *_vm->_ui;
 	Common::String tempStr;
 
@@ -71,7 +72,7 @@ void Settings::drawInteface(bool flag) {
 	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
 		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
 
-	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._musicOn]);
+	tempStr = Common::String::format("Music %s", SETUP_STRS0[music._musicOn]);
 	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10),
 		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
 
@@ -135,6 +136,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
+	Music &music = *_vm->_music;
 	Sound &sound = *_vm->_sound;
 	UserInterface &ui = *_vm->_ui;
 	int found = -1;
@@ -154,7 +156,7 @@ int Settings::drawButtons(const Common::Point &pt, int _key) {
 		// Print the button text
 		switch (idx) {
 		case 1:
-			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._musicOn]);
+			tempStr = Common::String::format("Music %s", SETUP_STRS0[music._musicOn]);
 			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
 			break;
 		case 2:
@@ -208,6 +210,7 @@ void Settings::show(SherlockEngine *vm) {
 	Scene &scene = *vm->_scene;
 	Screen &screen = *vm->_screen;
 	Sound &sound = *vm->_sound;
+	Music &music = *vm->_music;
 	Talk &talk = *vm->_talk;
 	UserInterface &ui = *vm->_ui;
 	bool updateConfig = false;
@@ -255,11 +258,11 @@ void Settings::show(SherlockEngine *vm) {
 
 		if ((found == 1 && events._released) || ui._key == 'M') {
 			// Toggle music
-			sound._musicOn = !sound._musicOn;
-			if (!sound._musicOn)
-				sound.stopMusic();
+			music._musicOn = !music._musicOn;
+			if (!music._musicOn)
+				music.stopMusic();
 			else
-				sound.startSong();
+				music.startSong();
 
 			updateConfig = true;
 			settings.drawInteface(true);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index db1083d195..9807c23fee 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -37,6 +37,7 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
 	_inventory = nullptr;
 	_journal = nullptr;
 	_map = nullptr;
+	_music = nullptr;
 	_people = nullptr;
 	_res = nullptr;
 	_saves = nullptr;
@@ -58,6 +59,7 @@ SherlockEngine::~SherlockEngine() {
 	delete _events;
 	delete _journal;
 	delete _map;
+	delete _music;
 	delete _people;
 	delete _saves;
 	delete _scene;
@@ -92,6 +94,7 @@ void SherlockEngine::initialize() {
 	_events = new Events(this);
 	_inventory = new Inventory(this);
 	_map = new Map(this);
+	_music = new Music(this, _mixer);
 	_journal = new Journal(this);
 	_people = new People(this);
 	_saves = new SaveManager(this, _targetName);
@@ -218,7 +221,7 @@ void SherlockEngine::loadConfig() {
 
 void SherlockEngine::saveConfig() {
 	ConfMan.setBool("mute", !_sound->_digitized);
-	ConfMan.setBool("music_mute", !_sound->_musicOn);
+	ConfMan.setBool("music_mute", !_music->_musicOn);
 	ConfMan.setBool("speech_mute", !_sound->_voices);
 
 	ConfMan.setInt("font", _screen->fontNumber());
@@ -235,6 +238,7 @@ void SherlockEngine::syncSoundSettings() {
 
 	// Load sound-related settings
 	_sound->syncSoundSettings();
+	_music->syncMusicSettings();
 }
 
 void SherlockEngine::synchronize(Common::Serializer &s) {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 24a72076ef..2e85651700 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -38,6 +38,7 @@
 #include "sherlock/inventory.h"
 #include "sherlock/journal.h"
 #include "sherlock/map.h"
+#include "sherlock/music.h"
 #include "sherlock/people.h"
 #include "sherlock/resources.h"
 #include "sherlock/saveload.h"
@@ -104,6 +105,7 @@ public:
 	Inventory *_inventory;
 	Journal *_journal;
 	Map *_map;
+	Music *_music;
 	People *_people;
 	Resources *_res;
 	SaveManager *_saves;
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 1441b4c4aa..b9762d22de 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -52,7 +52,6 @@ static const uint8 creativeADPCM_AdjustMap[64] = {
 
 Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_digitized = false;
-	_musicPlaying = false;
 	_voices = 0;
 	_diskSoundPlaying = false;
 	_soundPlaying = false;
@@ -60,13 +59,11 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_curPriority = 0;
 
 	_soundOn = true;
-	_musicOn = true;
 	_speechOn = true;
 
 	if (!_vm->_interactiveFl)
 		_vm->_res->addToCache("TITLE.SND");
 	else {
-		_vm->_res->addToCache("MUSIC.LIB");
 		_vm->_res->addToCache("SND.SND");
 
 		if (!_vm->isDemo()) {
@@ -78,7 +75,6 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 
 void Sound::syncSoundSettings() {
 	_digitized = !ConfMan.getBool("mute");
-	_musicOn = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
 	_voices = !ConfMan.getBool("mute") && !ConfMan.getBool("speech_mute") ? 1 : 0;
 }
 
@@ -201,66 +197,11 @@ void Sound::stopSound() {
 	_mixer->stopHandle(_effectsHandle);
 }
 
-void Sound::playMusic(const Common::String &name) {
-	if (!_musicOn)
-		return;
-
-	// TODO
-	warning("Sound::playMusic %s", name.c_str());
-	Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
-
-	byte *data = new byte[stream->size()];
-	byte *ptr = data;
-	stream->read(ptr, stream->size());
-	Common::DumpFile outFile;
-	outFile.open(name + ".RAW");
-	outFile.write(data, stream->size());
-	outFile.flush();
-	outFile.close();
-	delete[] data;
-
-	stopMusic();
-	startSong();
-}
-
-void Sound::stopMusic() {
-	// TODO
-	warning("TODO: Sound::stopMusic");
-
-	_musicPlaying = false;
-}
-
-int Sound::loadSong(int songNumber) {
-	// TODO
-	warning("TODO: Sound::loadSong");
-	return 0;
-}
-
-void Sound::startSong() {
-	if (!_musicOn)
-		return;
-
-	// TODO
-	warning("TODO: Sound::startSong");
-
-	_musicPlaying = true;
-}
-
-void Sound::freeSong() {
-	// TODO
-	warning("TODO: Sound::freeSong");
-}
-
 void Sound::stopSndFuncPtr(int v1, int v2) {
 	// TODO
 	warning("TODO: Sound::stopSndFuncPtr");
 }
 
-void Sound::waitTimerRoland(uint time) {
-	// TODO
-	warning("TODO: Sound::waitTimerRoland");
-}
-
 void Sound::freeDigiSound() {
 	delete[] _digiBuf;
 	_digiBuf = nullptr;
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index e0e56bc13c..2351bebd6e 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -49,10 +49,8 @@ private:
 	byte decodeSample(byte sample, byte& reference, int16& scale);
 public:
 	bool _digitized;
-	bool _musicPlaying;
 	int _voices;
 	bool _soundOn;
-	bool _musicOn;
 	bool _speechOn;
 	bool _diskSoundPlaying;
 	bool _soundPlaying;
@@ -91,33 +89,7 @@ public:
 	 */
 	void stopSound();
 
-	/**
-	 * Load a specified song
-	 */
-	int loadSong(int songNumber);
-
-	/**
-	 * Start playing a song
-	 */
-	void startSong();
-	
-	/**
-	 * Free any currently loaded song
-	 */
-	void freeSong();
-	
-	/**
-	 * Play the specified music resource
-	 */
-	void playMusic(const Common::String &name);
-
-	/**
-	 * Stop playing the music
-	 */
-	void stopMusic();
-	
 	void stopSndFuncPtr(int v1, int v2);
-	void waitTimerRoland(uint time);
 	void freeDigiSound();
 };
 
-- 
cgit v1.2.3


From 1e291b0b25719f61f7173d9f8ae7e0da5164b526 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 07:46:25 -0400
Subject: SHERLOCK: Implemented initial RT palette loading

---
 engines/sherlock/scene.cpp         |  4 +---
 engines/sherlock/screen.cpp        |  7 ++++++-
 engines/sherlock/screen.h          |  6 ++++++
 engines/sherlock/tattoo/tattoo.cpp | 12 ++++++++++++
 engines/sherlock/tattoo/tattoo.h   |  5 +++++
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 4672e3e7b1..e625dae7aa 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -514,9 +514,7 @@ bool Scene::loadScene(const Common::String &filename) {
 		} else {
 			// Read in palette
 			rrmStream->read(screen._cMap, PALETTE_SIZE);
-			for (int idx = 0; idx < PALETTE_SIZE; ++idx)
-				screen._cMap[idx] = VGA_COLOR_TRANS(screen._cMap[idx]);
-
+			screen.translatePalette(screen._cMap);
 			Common::copy(screen._cMap, screen._cMap + PALETTE_SIZE, screen._sMap);
 
 			// Read in the background
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 24f7660743..bb9dbd7ec4 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -39,7 +39,7 @@ Screen::Screen(SherlockEngine *vm) : Surface(g_system->getWidth(), g_system->get
 	Common::fill(&_cMap[0], &_cMap[PALETTE_SIZE], 0);
 	Common::fill(&_sMap[0], &_sMap[PALETTE_SIZE], 0);
 	Common::fill(&_tMap[0], &_tMap[PALETTE_SIZE], 0);
-	setFont(1);
+	setFont(IS_SERRATED_SCALPEL ? 1 : 4);
 
 	// Rose Tattoo specific fields
 	_fadeBytesRead = _fadeBytesToRead = 0;
@@ -466,4 +466,9 @@ void Screen::initScrollVars() {
 	_targetScroll = 0;
 }
 
+void Screen::translatePalette(byte palette[PALETTE_SIZE]) {
+	for (int idx = 0; idx < PALETTE_SIZE; ++idx)
+		palette[idx] = VGA_COLOR_TRANS(palette[idx]);
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index f4cd6fd955..58c7d8f152 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -251,6 +251,12 @@ public:
 	void setupBGArea(const byte cMap[PALETTE_SIZE]);
 
 	void initScrollVars();
+
+	/**
+	 * Translate a palette from 6-bit RGB values to full 8-bit values suitable for passing
+	 * to the underlying palette manager
+	 */
+	static void translatePalette(byte palette[PALETTE_SIZE]);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 9039e3f9d4..47a7c2a9ba 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -47,6 +47,9 @@ void TattooEngine::initialize() {
 
 	// Starting scene
 	_scene->_goToScene = 91;
+
+	// Load an initial palette
+	loadInitialPalette();
 }
 
 /**
@@ -56,6 +59,15 @@ void TattooEngine::startScene() {
 	// TODO
 }
 
+void TattooEngine::loadInitialPalette() {
+	byte palette[768];
+	Common::SeekableReadStream *stream = _res->load("room.pal");
+	stream->read(palette, PALETTE_SIZE);
+	_screen->translatePalette(palette);
+	_screen->setPalette(palette);
+
+	delete stream;
+}
 
 } // End of namespace Tattoo
 
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index 7bdeec55d1..b9224e06ba 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -30,6 +30,11 @@ namespace Sherlock {
 namespace Tattoo {
 
 class TattooEngine : public SherlockEngine {
+private:
+	/**
+	 * Loads the initial palette for the game
+	 */
+	void loadInitialPalette();
 protected:
 	virtual void initialize();
 
-- 
cgit v1.2.3


From 1ede08405595cafe5792aa514a4bc3309602e40f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 10:56:22 -0400
Subject: SHERLOCK: Implement more scene loading and setNPCPath

---
 engines/sherlock/objects.h  |  2 +-
 engines/sherlock/people.cpp | 12 ++++++++++
 engines/sherlock/people.h   | 18 +++++++++++++--
 engines/sherlock/scene.cpp  | 53 +++++++++++++++++++++++++++++++++++++++++++++
 engines/sherlock/scene.h    | 18 +++++++++++++++
 engines/sherlock/sound.cpp  | 17 +++++++++++++--
 engines/sherlock/sound.h    |  7 +++++-
 7 files changed, 121 insertions(+), 6 deletions(-)

diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 761c03d501..f1047628e4 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -107,7 +107,7 @@ struct WalkSequence {
 	bool _horizFlip;
 	Common::Array<byte> _sequences;
 
-	WalkSequence() : _vgsName(nullptr), _horizFlip(false) {}
+	WalkSequence() : _horizFlip(false) {}
 	const byte &operator[](int idx) { return _sequences[idx]; }
 
 	/**
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 638cbf662b..7879f29105 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -80,6 +80,18 @@ void WalkSequence::load(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
+Person::Person() : Sprite(), _walkLoaded(false), _npcIndex(0), _npcStack(0), _npcPause(false)  {
+	Common::fill(&_npcPath[0], &_npcPath[MAX_NPC_PATH], 0);
+}
+
+void Person::clearNPC() {
+	Common::fill(&_npcPath[0], &_npcPath[MAX_NPC_PATH], 0);
+	_npcIndex = _npcStack = 0;
+	_npcName = "";
+}
+
+/*----------------------------------------------------------------*/
+
 People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_holmesOn = true;
 	_oldWalkSequence = -1;
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index f3e7950400..a1968785db 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -34,7 +34,9 @@ enum PeopleId {
 	PLAYER			= 0,
 	AL				= 0,
 	PEG				= 1,
-	MAX_PLAYERS		= 6
+	MAX_PLAYERS		= 6,
+	MAX_NPC			= 5,
+	MAX_NPC_PATH	= 200
 };
 
 // Animation sequence identifiers for characters
@@ -66,11 +68,23 @@ public:
 	bool _walkLoaded;
 	Common::String _portrait;
 
+	// NPC related fields
+	int _npcIndex;
+	int _npcStack;
+	bool _npcPause;
+	byte _npcPath[MAX_NPC_PATH];
+	Common::String _npcName;
+
 	// Rose Tattoo fields
 	Common::String _walkVGSName;		// Name of walk library person is using
 	Common::Array<WalkSequence> _walkSequences;
 public:
-	Person() : Sprite(), _walkLoaded(false) {}
+	Person();
+
+	/**
+	 * Clear the NPC related data
+	 */
+	void clearNPC();
 };
 
 class SherlockEngine;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index e625dae7aa..0f679d732f 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -249,6 +249,7 @@ bool Scene::loadScene(const Common::String &filename) {
 	SaveManager &saves = *_vm->_saves;
 	Screen &screen = *_vm->_screen;
 	Sound &sound = *_vm->_sound;
+	Talk &talk = *_vm->_talk;
 	UserInterface &ui = *_vm->_ui;
 	bool flag;
 
@@ -264,6 +265,36 @@ bool Scene::loadScene(const Common::String &filename) {
 	_cAnim.clear();
 	_sequenceBuffer.clear();
 
+	// Check if it's a scene we need to keep trakc track of how many times we've visited
+	for (int idx = (int)_sceneTripCounters.size() - 1; idx >= 0; --idx) {
+		if (_sceneTripCounters[idx]._sceneNumber == _currentScene) {
+			if (--_sceneTripCounters[idx]._numTimes == 0) {
+				_vm->setFlags(_sceneTripCounters[idx]._flag);
+				_sceneTripCounters.remove_at(idx);
+			}
+		}
+	}
+
+	if (IS_ROSE_TATTOO) {
+		// Set the NPC paths for the scene
+		setNPCPath(0);
+
+		// Handle loading music for the scene
+		if (sound._midiDrvLoaded) {
+			if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3)
+				sound._nextSongName = Common::String::format("res%02d", _currentScene);
+
+			// If it's a new song, then start it up
+			if (sound._currentSongName.compareToIgnoreCase(sound._nextSongName)) {
+				if (sound.loadSong(sound._nextSongName)) {
+					sound.setMIDIVolume(sound._musicVolume);
+					if (sound._musicOn)
+						sound.startSong();
+				}
+			}
+		}
+	}
+
 	//
 	// Load the room resource file for the scene
 	//
@@ -1585,4 +1616,26 @@ void Scene::synchronize(Common::Serializer &s) {
 	}
 }
 
+void Scene::setNPCPath(int npc) {
+	People &people = *_vm->_people;
+	Talk &talk = *_vm->_talk;
+	
+	people[npc].clearNPC();
+	people[npc]._name = Common::String::format("WATS%.2dA", _currentScene);
+
+	// If we're in the middle of a script that will continue once the scene is loaded,
+	// return without calling the path script
+	if (talk._scriptMoreFlag == 1 || talk._scriptMoreFlag == 3)
+		return;
+
+	// Turn off all the NPCs, since the talk script will turn them back on as needed
+	for (uint idx = 0; idx < MAX_NPC; ++idx)
+		people[idx + 1]._type = INVALID;
+
+	// Call the path script for the scene
+	Common::String pathFile = Common::String::format("PATH%.2dA", _currentScene);
+	talk.talkTo(pathFile);
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 0cbd775c56..b0b5624840 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -128,6 +128,16 @@ public:
 	void load(Common::SeekableReadStream &s);
 };
 
+struct SceneTripEntry {
+	bool _flag;
+	int _sceneNumber;
+	int _numTimes;
+
+	SceneTripEntry() : _flag(false), _sceneNumber(0), _numTimes(0) {}
+	SceneTripEntry(bool flag, int sceneNumber, int numTimes) : _flag(flag),
+		_sceneNumber(sceneNumber), _numTimes(numTimes) {}
+};
+
 class Scene {
 private:
 	SherlockEngine *_vm;
@@ -212,6 +222,7 @@ public:
 	bool _doBgAnimDone;
 	int _tempFadeStyle;
 	int _cAnimFramePause;
+	Common::Array<SceneTripEntry> _sceneTripCounters;
 public:
 	Scene(SherlockEngine *vm);
 	~Scene();
@@ -291,6 +302,13 @@ public:
 	 * Synchronize the data for a savegame
 	 */
 	void synchronize(Common::Serializer &s);
+
+	/**
+	 * Resets the NPC path information when entering a new scene.
+	 * @remarks		The default talk file for the given NPC is set to WATS##A, where ## is
+	 *		the scene number being entered
+	 */
+	void setNPCPath(int npc);
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index b8fe61dd29..279dd44157 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -58,6 +58,8 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_soundPlaying = false;
 	_soundIsOn = &_soundPlaying;
 	_curPriority = 0;
+	_midiDrvLoaded = false;
+	_musicVolume = 0;
 
 	_soundOn = true;
 	_musicOn = true;
@@ -231,12 +233,19 @@ void Sound::stopMusic() {
 	warning("TODO: Sound::stopMusic");
 }
 
-int Sound::loadSong(int songNumber) {
+bool Sound::loadSong(int songNumber) {
 	// TODO
 	warning("TODO: Sound::loadSong");
-	return 0;
+	return false;
 }
 
+bool Sound::loadSong(const Common::String &name) {
+	// TODO
+	warning("TODO: Sound::loadSong");
+	return false;
+}
+
+
 void Sound::startSong() {
 	// TODO
 	warning("TODO: Sound::startSong");
@@ -264,5 +273,9 @@ void Sound::freeDigiSound() {
 	_soundPlaying = false;
 }
 
+void Sound::setMIDIVolume(int volume) {
+	// TODO
+}
+
 } // End of namespace Sherlock
 
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 689e615a36..06450ff50d 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -58,6 +58,9 @@ public:
 	bool _soundPlaying;
 	bool *_soundIsOn;
 	byte *_digiBuf;
+	bool _midiDrvLoaded;
+	Common::String _currentSongName, _nextSongName;
+	int _musicVolume;
 public:
 	Sound(SherlockEngine *vm, Audio::Mixer *mixer);
 
@@ -94,7 +97,8 @@ public:
 	/**
 	 * Load a specified song
 	 */
-	int loadSong(int songNumber);
+	bool loadSong(int songNumber);
+	bool loadSong(const Common::String &name);
 
 	/**
 	 * Start playing a song
@@ -119,6 +123,7 @@ public:
 	void stopSndFuncPtr(int v1, int v2);
 	void waitTimerRoland(uint time);
 	void freeDigiSound();
+	void setMIDIVolume(int volume);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 79f11bd381b468a8fcca860ee3c2232606324fa5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 10:58:00 -0400
Subject: SHERLOCK: Make virtual destructors for user interface classes

---
 engines/sherlock/user_interface.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 8a0f4f5613..2203ddf05e 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -88,6 +88,7 @@ public:
 	int _lookHelp;
 public:
 	static UserInterface *init(SherlockEngine *vm);
+	virtual ~UserInterface() {}
 
 	/**
 	 * Resets the user interface
@@ -253,7 +254,7 @@ private:
 	void printObjectDesc(const Common::String &str, bool firstTime);
 public:
 	ScalpelUserInterface(SherlockEngine *vm);
-	~ScalpelUserInterface();
+	virtual ~ScalpelUserInterface();
 
 	/**
 	 * Handles counting down whilst checking for input, then clears the info line.
@@ -317,6 +318,8 @@ class TattooUserInterface : public UserInterface {
 public:
 	TattooUserInterface(SherlockEngine *vm);
 public:
+	virtual ~TattooUserInterface() {}
+
 	/**
 	 * Main input handler for the user interface
 	 */
-- 
cgit v1.2.3


From 79a33dc3b6e4717ae519405893169af81dcc2335 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 12:23:25 -0400
Subject: SHERLOCK: Create separate opcode list for Scalpel vs Tattoo

---
 engines/sherlock/journal.cpp |  60 ++++-------
 engines/sherlock/talk.cpp    | 241 +++++++++++++++++++++----------------------
 engines/sherlock/talk.h      |  70 +++++++------
 3 files changed, 177 insertions(+), 194 deletions(-)

diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 564db59042..b4b05da991 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -135,6 +135,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
 	JournalEntry &journalEntry = _journal[_index];
+	const byte *opcodes = talk._opcodes;
 
 	Common::String dirFilename = _directory[journalEntry._converseNum];
 	bool replyOnly = journalEntry._replyOnly;
@@ -243,7 +244,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 		byte c = *replyP++;
 
 		// Is it a control character?
-		if (c < SWITCH_SPEAKER) {
+		if (c < opcodes[0]) {
 			// Nope. Set flag for allowing control codes to insert spaces
 			ctrlSpace = true;
 			assert(c >= ' ');
@@ -290,7 +291,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 						byte v;
 						do {
 							v = *strP++;
-						} while (v && (v < SWITCH_SPEAKER) && (v != '.') && (v != '!') && (v != '?'));
+						} while (v && (v < opcodes[0]) && (v != '.') && (v != '!') && (v != '?'));
 
 						if (v == '?')
 							journalString += " asked, \"";
@@ -306,11 +307,11 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += c;
 				do {
 					journalString += *replyP++;
-				} while (*replyP && *replyP < SWITCH_SPEAKER && *replyP != '{' && *replyP != '}');
+				} while (*replyP && *replyP < opcodes[0] && *replyP != '{' && *replyP != '}');
 
 				commentJustPrinted = false;
 			}
-		} else if (c == SWITCH_SPEAKER) {
+		} else if (c == opcodes[OP_SWITCH_SPEAKER]) {
 			if (!startOfReply) {
 				if (!commentFlag && !commentJustPrinted)
 					journalString += "\"\n";
@@ -337,7 +338,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			byte v;
 			do {
 				v = *strP++;
-			} while (v && v < SWITCH_SPEAKER && v != '.' && v != '!' && v != '?');
+			} while (v && v < opcodes[0] && v != '.' && v != '!' && v != '?');
 
 			if (v == '?')
 				journalString += " asked, \"";
@@ -345,59 +346,42 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 				journalString += " said, \"";
 		} else {
 			// Control code, so move past it and any parameters
-			switch (c) {
-			case RUN_CANIMATION:
-			case ASSIGN_PORTRAIT_LOCATION:
-			case PAUSE:
-			case PAUSE_WITHOUT_CONTROL:
-			case WALK_TO_CANIMATION:
+			if (c == opcodes[OP_RUN_CANIMATION] || c == opcodes[OP_ASSIGN_PORTRAIT_LOCATION] ||
+					c == opcodes[OP_PAUSE] || c == opcodes[OP_PAUSE_WITHOUT_CONTROL] ||
+					c == opcodes[OP_WALK_TO_CANIMATION]) {
 				// These commands have a single parameter
 				++replyP;
-				break;
 
-			case ADJUST_OBJ_SEQUENCE:
+			} else if (c == opcodes[OP_ADJUST_OBJ_SEQUENCE]) {
 				replyP += (replyP[0] & 127) + replyP[1] + 2;
-				break;
 
-			case WALK_TO_COORDS:
-			case MOVE_MOUSE:
+			} else if (c == opcodes[OP_WALK_TO_COORDS] || c == opcodes[OP_MOVE_MOUSE]) {
 				replyP += 4;
-				break;
-
-			case SET_FLAG:
-			case IF_STATEMENT:
+				
+			} else if (c == opcodes[OP_SET_FLAG] || c == opcodes[OP_IF_STATEMENT]) {
 				replyP += 2;
-				break;
 
-			case SFX_COMMAND:
-			case PLAY_PROLOGUE:
-			case CALL_TALK_FILE:
+			} else if (c == opcodes[OP_SFX_COMMAND] || c == opcodes[OP_PLAY_PROLOGUE] ||
+				c == opcodes[OP_CALL_TALK_FILE]) {
 				replyP += 8;
 				break;
 
-			case TOGGLE_OBJECT:
-			case ADD_ITEM_TO_INVENTORY:
-			case SET_OBJECT:
-			case DISPLAY_INFO_LINE:
-			case REMOVE_ITEM_FROM_INVENTORY:
+			} else if (c == opcodes[OP_TOGGLE_OBJECT] || c == opcodes[OP_ADD_ITEM_TO_INVENTORY] ||
+				c == opcodes[OP_SET_OBJECT] || c == opcodes[OP_DISPLAY_INFO_LINE] ||
+				c == opcodes[OP_REMOVE_ITEM_FROM_INVENTORY]) {
 				replyP += (*replyP & 127) + 1;
-				break;
 
-			case GOTO_SCENE:
+			} else if (c == opcodes[OP_GOTO_SCENE]) {
 				replyP += 5;
-				break;
 
-			case CARRIAGE_RETURN:
+			} else if (c == opcodes[OP_CARRIAGE_RETURN]) {
 				journalString += "\n";
-				break;
-
-			default:
-				break;
 			}
 
 			// Put a space in the output for a control character, unless it's
 			// immediately coming after another control character
-			if (ctrlSpace && c != ASSIGN_PORTRAIT_LOCATION && c != CARRIAGE_RETURN && !commentJustPrinted) {
+			if (ctrlSpace && c != opcodes[OP_ASSIGN_PORTRAIT_LOCATION] && c != opcodes[OP_CARRIAGE_RETURN] && 
+					!commentJustPrinted) {
 				journalString += " ";
 				ctrlSpace = false;
 			}
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 1a926a543d..7379d04b5f 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -28,6 +28,51 @@ namespace Sherlock {
 
 #define SPEAKER_REMOVE 0x80
 
+const byte SCALPEL_OPCODES[] = {
+	128,	// OP_SWITCH_SPEAKER
+	129,	// OP_RUN_CANIMATION
+	130,	// OP_ASSIGN_PORTRAIT_LOCATION
+	131,	// OP_PAUSE
+	132,	// OP_REMOVE_PORTRAIT
+	133,	// OP_CLEAR_WINDOW
+	134,	// OP_ADJUST_OBJ_SEQUENCE
+	135,	// OP_WALK_TO_COORDS
+	136,	// OP_PAUSE_WITHOUT_CONTROL
+	137,	// OP_BANISH_WINDOW
+	138,	// OP_SUMMON_WINDOW
+	139,	// OP_SET_FLAG
+	140,	// OP_SFX_COMMAND
+	141,	// OP_TOGGLE_OBJECT
+	142,	// OP_STEALTH_MODE_ACTIVE
+	143,	// OP_IF_STATEMENT
+	144,	// OP_ELSE_STATEMENT
+	145,	// OP_END_IF_STATEMENT
+	146,	// OP_STEALTH_MODE_DEACTIVATE
+	147,	// OP_TURN_HOLMES_OFF
+	148,	// OP_TURN_HOLMES_ON
+	149,	// OP_GOTO_SCENE
+	150,	// OP_PLAY_PROLOGUE
+	151,	// OP_ADD_ITEM_TO_INVENTORY
+	152,	// OP_SET_OBJECT
+	153,	// OP_CALL_TALK_FILE
+	143,	// OP_MOVE_MOUSE
+	155,	// OP_DISPLAY_INFO_LINE
+	156,	// OP_CLEAR_INFO_LINE
+	157,	// OP_WALK_TO_CANIMATION
+	158,	// OP_REMOVE_ITEM_FROM_INVENTORY
+	159,	// OP_ENABLE_END_KEY
+	160,	// OP_DISABLE_END_KEY
+	161		// OP_CARRIAGE_RETURN
+};
+
+const byte TATTOO_OPCODES[] = {
+	170,	// OP_SWITCH_SPEAKER
+	171,	// OP_RUN_CANIMATION
+	0	// TODO reset of opcodes
+};
+
+/*----------------------------------------------------------------*/
+
 SequenceEntry::SequenceEntry() {
 	_objNum = 0;
 	_frameNumber = 0;
@@ -103,6 +148,7 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_moreTalkDown = _moreTalkUp = false;
 	_scriptMoreFlag = 0;
 	_scriptSaveIndex = -1;
+	_opcodes = IS_SERRATED_SCALPEL ? SCALPEL_OPCODES : TATTOO_OPCODES;
 }
 
 void Talk::talkTo(const Common::String &filename) {
@@ -572,7 +618,7 @@ void Talk::stripVoiceCommands() {
 
 		// Scan for an sound effect byte, which indicates to play a sound
 		for (uint idx = 0; idx < statement._reply.size(); ++idx) {
-			if (statement._reply[idx] == (char)SFX_COMMAND) {
+			if (statement._reply[idx] == (char)_opcodes[OP_SFX_COMMAND]) {
 				// Replace instruction character with a space, and delete the
 				// rest of the name following it
 				statement._reply = Common::String(statement._reply.c_str(),
@@ -952,7 +998,7 @@ void Talk::doScript(const Common::String &script) {
 	}
 
 	// Check if the script begins with a Stealh Mode Active command
-	if (str[0] == STEALTH_MODE_ACTIVE || _talkStealth) {
+	if (str[0] == _opcodes[OP_STEALTH_MODE_ACTIVE] || _talkStealth) {
 		_talkStealth = 2;
 		_speaker |= SPEAKER_REMOVE;
 	} else {
@@ -960,7 +1006,7 @@ void Talk::doScript(const Common::String &script) {
 		ui.clearWindow();
 
 		// Need to switch speakers?
-		if (str[0] == SWITCH_SPEAKER) {
+		if (str[0] == _opcodes[OP_SWITCH_SPEAKER]) {
 			_speaker = str[1] - 1;
 			str += 2;
 			pullSequence();
@@ -971,7 +1017,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Assign portrait location?
-		if (str[0] == ASSIGN_PORTRAIT_LOCATION) {
+		if (str[0] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]) {
 			switch (str[1] & 15) {
 			case 1:
 				people._portraitSide = 20;
@@ -993,7 +1039,7 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		// Remove portrait?
-		if (str[0] == REMOVE_PORTRAIT) {
+		if (str[0] == _opcodes[OP_REMOVE_PORTRAIT]) {
 			_speaker = 255;
 		} else {
 			// Nope, so set the first speaker
@@ -1012,10 +1058,9 @@ void Talk::doScript(const Common::String &script) {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (c >= SWITCH_SPEAKER) {
+		} else if (c >= _opcodes[0]) {
 			// Handle control code
-			switch (c) {
-			case SWITCH_SPEAKER:
+			if (c == _opcodes[OP_SWITCH_SPEAKER]) {
 				if (!(_speaker & SPEAKER_REMOVE))
 					people.clearTalking();
 				if (_talkToAbort)
@@ -1030,20 +1075,18 @@ void Talk::doScript(const Common::String &script) {
 				pullSequence();
 				pushSequence(_speaker);
 				setSequence(_speaker);
-				break;
 
-			case RUN_CANIMATION:
+			} else if (c == _opcodes[OP_RUN_CANIMATION]) {
 				++str;
 				scene.startCAnim((str[0] - 1) & 127, (str[0] & 0x80) ? -1 : 1);
 				if (_talkToAbort)
 					return;
 
 				// Check if next character is changing side or changing portrait
-				if (charCount && (str[1] == SWITCH_SPEAKER || str[1] == ASSIGN_PORTRAIT_LOCATION))
+				if (charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]))
 					wait = 1;
-				break;
 
-			case ASSIGN_PORTRAIT_LOCATION:
+			} else if (c == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]) {
 				++str;
 				switch (str[0] & 15) {
 				case 1:
@@ -1061,15 +1104,13 @@ void Talk::doScript(const Common::String &script) {
 
 				if (str[0] > 15)
 					people._speakerFlip = true;
-				break;
 
-			case PAUSE:
+			} else if (c == _opcodes[OP_PAUSE]) {
 				// Pause
 				charCount = *++str;
 				wait = pauseFlag = true;
-				break;
 
-			case REMOVE_PORTRAIT:
+			} else if (c == _opcodes[OP_REMOVE_PORTRAIT]) {
 				if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
 					people.clearTalking();
 				pullSequence();
@@ -1077,16 +1118,13 @@ void Talk::doScript(const Common::String &script) {
 					return;
 
 				_speaker |= SPEAKER_REMOVE;
-				break;
 
-			case CLEAR_WINDOW:
+			} else if (c == _opcodes[OP_CLEAR_WINDOW]) {
 				ui.clearWindow();
 				yp = CONTROLS_Y + 12;
 				charCount = line = 0;
-				break;
 
-			case ADJUST_OBJ_SEQUENCE:
-				{
+			} else if (c == _opcodes[OP_ADJUST_OBJ_SEQUENCE]) {
 				// Get the name of the object to adjust
 				++str;
 				for (int idx = 0; idx < (str[0] & 127); ++idx)
@@ -1123,9 +1161,8 @@ void Talk::doScript(const Common::String &script) {
 				// Reset object back to beginning of new sequence
 				scene._bgShapes[objId]._frameNumber = 0;
 				continue;
-				}
 
-			case WALK_TO_COORDS:
+			} else if (c == _opcodes[OP_WALK_TO_COORDS]) {
 				++str;
 
 				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100,
@@ -1134,9 +1171,8 @@ void Talk::doScript(const Common::String &script) {
 					return;
 
 				str += 3;
-				break;
-
-			case PAUSE_WITHOUT_CONTROL:
+			
+			} else if (c == _opcodes[OP_PAUSE_WITHOUT_CONTROL]) {
 				++str;
 
 				for (int idx = 0; idx < (str[0] - 1); ++idx) {
@@ -1148,9 +1184,8 @@ void Talk::doScript(const Common::String &script) {
 					events.pollEvents();
 					events.setButtonState();
 				}
-				break;
 
-			case BANISH_WINDOW:
+			} else if (c == _opcodes[OP_BANISH_WINDOW]) {
 				if (!(_speaker & SPEAKER_REMOVE))
 					people.clearTalking();
 				pullSequence();
@@ -1162,9 +1197,8 @@ void Talk::doScript(const Common::String &script) {
 				ui.banishWindow();
 				ui._menuMode = TALK_MODE;
 				noTextYet = true;
-				break;
-
-			case SUMMON_WINDOW:
+				
+			} else if (c == _opcodes[OP_SUMMON_WINDOW]) {
 				drawInterface();
 				events._pressed = events._released = false;
 				events.clearKeyboard();
@@ -1175,18 +1209,15 @@ void Talk::doScript(const Common::String &script) {
 					screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
 					screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, false, "Down");
 				}
-				break;
 
-			case SET_FLAG: {
+			} else if (c == _opcodes[OP_SET_FLAG]) {
 				++str;
 				int flag1 = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				int flag = (flag1 & 0x3fff) * (flag1 >= 0x4000 ? -1 : 1);
 				_vm->setFlags(flag);
 				++str;
-				break;
-			}
 
-			case SFX_COMMAND:
+			} else if (c == _opcodes[OP_SFX_COMMAND]) {
 				++str;
 				if (sound._voices) {
 					for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
@@ -1200,22 +1231,19 @@ void Talk::doScript(const Common::String &script) {
 
 				wait = 1;
 				str += 7;
-				break;
-
-			case TOGGLE_OBJECT:
+				
+			} else if (c == _opcodes[OP_TOGGLE_OBJECT]) {
 				++str;
 				for (int idx = 0; idx < str[0]; ++idx)
 					tempString += str[idx + 1];
 
 				scene.toggleObject(tempString);
 				str += str[0];
-				break;
-
-			case STEALTH_MODE_ACTIVE:
+				
+			} else if (c == _opcodes[OP_STEALTH_MODE_ACTIVE]) {
 				_talkStealth = 2;
-				break;
 
-			case IF_STATEMENT: {
+			} else if (c == _opcodes[OP_IF_STATEMENT]) {
 				++str;
 				int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
 				++str;
@@ -1225,38 +1253,32 @@ void Talk::doScript(const Common::String &script) {
 				if (_vm->readFlags(flag & 0x7fff) != result) {
 					do {
 						++str;
-					} while (str[0] && str[0] != ELSE_STATEMENT && str[0] != END_IF_STATEMENT);
+					} while (str[0] && str[0] != _opcodes[OP_ELSE_STATEMENT] && str[0] != _opcodes[OP_END_IF_STATEMENT]);
 
 					if (!str[0])
 						endStr = true;
 				}
-				break;
-			}
 
-			case ELSE_STATEMENT:
+			} else if (c == _opcodes[OP_ELSE_STATEMENT]) {
 				// If this is encountered here, it means that a preceeding IF statement was found,
 				// and evaluated to true. Now all the statements for the true block are finished,
 				// so skip over the block of code that would have executed if the result was false
 				wait = 0;
 				do {
 					++str;
-				} while (str[0] && str[0] != END_IF_STATEMENT);
-				break;
+				} while (str[0] && str[0] != _opcodes[OP_END_IF_STATEMENT]);
 
-			case STEALTH_MODE_DEACTIVATE:
+			} else if (c == _opcodes[OP_STEALTH_MODE_DEACTIVATE]) {
 				_talkStealth = 0;
 				events.clearKeyboard();
-				break;
-
-			case TURN_HOLMES_OFF:
+				
+			} else if (c == _opcodes[OP_TURN_HOLMES_OFF]) {
 				people._holmesOn = false;
-				break;
-
-			case TURN_HOLMES_ON:
+				
+			} else if (c == _opcodes[OP_TURN_HOLMES_ON]) {
 				people._holmesOn = true;
-				break;
 
-			case GOTO_SCENE:
+			} else if (c == _opcodes[OP_GOTO_SCENE]) {
 				scene._goToScene = str[1] - 1;
 
 				if (scene._goToScene != 100) {
@@ -1277,26 +1299,23 @@ void Talk::doScript(const Common::String &script) {
 				_scriptSaveIndex = str - scriptStart;
 				endStr = true;
 				wait = 0;
-				break;
-
-			case PLAY_PROLOGUE:
+				
+			} else if (c == _opcodes[OP_PLAY_PROLOGUE]) {
 				++str;
 				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
 					tempString += str[idx];
 
 				anim.play(tempString, 1, 3, true, 4);
-				break;
-
-			case ADD_ITEM_TO_INVENTORY:
+				
+			} else if (c == _opcodes[OP_ADD_ITEM_TO_INVENTORY]) {
 				++str;
 				for (int idx = 0; idx < str[0]; ++idx)
 					tempString += str[idx + 1];
 				str += str[0];
 
 				inv.putNameInInventory(tempString);
-				break;
-
-			case SET_OBJECT: {
+				
+			} else if (c == _opcodes[OP_SET_OBJECT]) {
 				++str;
 				for (int idx = 0; idx < (str[0] & 127); ++idx)
 					tempString += str[idx + 1];
@@ -1313,10 +1332,8 @@ void Talk::doScript(const Common::String &script) {
 							object.toggleHidden();
 					}
 				}
-				break;
-			}
-
-			case CALL_TALK_FILE: {
+				
+			} else if (c == _opcodes[OP_CALL_TALK_FILE]) {
 				++str;
 				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
 					tempString += str[idx];
@@ -1345,18 +1362,15 @@ void Talk::doScript(const Common::String &script) {
 				_scriptMoreFlag = 1;
 				endStr = true;
 				wait = 0;
-				break;
-			}
-
-			case MOVE_MOUSE:
+				
+			} else if (c == _opcodes[OP_MOVE_MOUSE]) {
 				++str;
 				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
 				if (_talkToAbort)
 					return;
 				str += 3;
-				break;
-
-			case DISPLAY_INFO_LINE:
+				
+			} else if (c == _opcodes[OP_DISPLAY_INFO_LINE]) {
 				++str;
 				for (int idx = 0; idx < str[0]; ++idx)
 					tempString += str[idx + 1];
@@ -1364,42 +1378,35 @@ void Talk::doScript(const Common::String &script) {
 
 				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempString.c_str());
 				ui._menuCounter = 30;
-				break;
-
-			case CLEAR_INFO_LINE:
+				
+			} else if (c == _opcodes[OP_CLEAR_INFO_LINE]) {
 				ui._infoFlag = true;
 				ui.clearInfo();
-				break;
-
-			case WALK_TO_CANIMATION: {
+				
+			} else if (c == _opcodes[OP_WALK_TO_CANIMATION]) {
 				++str;
 				CAnim &animation = scene._cAnim[str[0] - 1];
 
 				people.walkToCoords(animation._goto, animation._gotoDir);
 				if (_talkToAbort)
 					return;
-				break;
-			}
-
-			case REMOVE_ITEM_FROM_INVENTORY:
+				
+			} else if (c == _opcodes[OP_REMOVE_ITEM_FROM_INVENTORY]) {
 				++str;
 				for (int idx = 0; idx < str[0]; ++idx)
 					tempString += str[idx + 1];
 				str += str[0];
 
 				inv.deleteItemFromInventory(tempString);
-				break;
-
-			case ENABLE_END_KEY:
+				
+			} else if (c == _opcodes[OP_ENABLE_END_KEY]) {
 				ui._endKeyActive = true;
-				break;
-
-			case DISABLE_END_KEY:
+				
+			} else if (c == _opcodes[OP_DISABLE_END_KEY]) {
 				ui._endKeyActive = false;
-				break;
-
-			default:
-				break;
+				
+			} else {
+				error("Unknown opcode encountered");
 			}
 
 			++str;
@@ -1438,10 +1445,10 @@ void Talk::doScript(const Common::String &script) {
 				width += screen.charWidth(str[idx]);
 				++idx;
 				++charCount;
-			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < SWITCH_SPEAKER);
+			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < _opcodes[0]);
 
 			if (str[idx] || width >= 298) {
-				if (str[idx] < SWITCH_SPEAKER && str[idx] != '{') {
+				if (str[idx] < _opcodes[0] && str[idx] != '{') {
 					--idx;
 					--charCount;
 				}
@@ -1481,37 +1488,27 @@ void Talk::doScript(const Common::String &script) {
 			str += idx;
 
 			// If line wrap occurred, then move to after the separating space between the words
-			if (str[0] < SWITCH_SPEAKER && str[0] != '{')
+			if (str[0] < _opcodes[0] && str[0] != '{')
 				++str;
 
 			yp += 9;
 			++line;
 
 			// Certain different conditions require a wait
-			if ((line == 4 && str < scriptEnd && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
-					(line == 5 && str < scriptEnd && str[0] != PAUSE && _speaker == -1) ||
+			if ((line == 4 && str < scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND] && str[0] != _opcodes[OP_PAUSE] && _speaker != -1) ||
+					(line == 5 && str < scriptEnd && str[0] != _opcodes[OP_PAUSE] && _speaker == -1) ||
 					endStr) {
 				wait = 1;
 			}
 
-			switch (str >= scriptEnd ? 0 : str[0]) {
-			case SWITCH_SPEAKER:
-			case ASSIGN_PORTRAIT_LOCATION:
-			case BANISH_WINDOW:
-			case IF_STATEMENT:
-			case ELSE_STATEMENT:
-			case END_IF_STATEMENT:
-			case GOTO_SCENE:
-			case CALL_TALK_FILE:
-				wait = 1;
-				break;
-			default:
-				break;
-			}
+			byte v = (str >= scriptEnd ? 0 : str[0]);
+			wait = v == _opcodes[OP_SWITCH_SPEAKER] || v == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION] ||
+				v == _opcodes[OP_BANISH_WINDOW] || _opcodes[OP_IF_STATEMENT] || v == _opcodes[OP_ELSE_STATEMENT] ||
+				v == _opcodes[OP_END_IF_STATEMENT] || v == _opcodes[OP_GOTO_SCENE] || v == _opcodes[OP_CALL_TALK_FILE];
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= SWITCH_SPEAKER && str[0] != CARRIAGE_RETURN)) {
+		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= _opcodes[0] && str[0] != _opcodes[OP_CARRIAGE_RETURN])) {
 			if (!ui._slideWindows) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
@@ -1533,12 +1530,12 @@ void Talk::doScript(const Common::String &script) {
 
 			// If a key was pressed to finish the window, see if further voice files should be skipped
 			if (wait >= 0 && wait < 254) {
-				if (str[0] == SFX_COMMAND)
+				if (str[0] == _opcodes[OP_SFX_COMMAND])
 					str += 9;
 			}
 
 			// Clear the window unless the wait was due to a PAUSE command
-			if (!pauseFlag && wait != -1 && str < scriptEnd && str[0] != SFX_COMMAND) {
+			if (!pauseFlag && wait != -1 && str < scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND]) {
 				if (!_talkStealth)
 					ui.clearWindow();
 				yp = CONTROLS_Y + 12;
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 48290e965e..bead67983b 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -36,42 +36,43 @@ namespace Sherlock {
 #define MAX_TALK_FILES 500
 
 enum {
-	SWITCH_SPEAKER				= 128,
-	RUN_CANIMATION				= 129,
-	ASSIGN_PORTRAIT_LOCATION	= 130,
-	PAUSE						= 131,
-	REMOVE_PORTRAIT				= 132,
-	CLEAR_WINDOW				= 133,
-	ADJUST_OBJ_SEQUENCE			= 134,
-	WALK_TO_COORDS				= 135,
-	PAUSE_WITHOUT_CONTROL		= 136,
-	BANISH_WINDOW				= 137,
-	SUMMON_WINDOW				= 138,
-	SET_FLAG					= 139,
-	SFX_COMMAND					= 140,
-	TOGGLE_OBJECT				= 141,
-	STEALTH_MODE_ACTIVE			= 142,
-	IF_STATEMENT				= 143,
-	ELSE_STATEMENT				= 144,
-	END_IF_STATEMENT			= 145,
-	STEALTH_MODE_DEACTIVATE		= 146,
-	TURN_HOLMES_OFF				= 147,
-	TURN_HOLMES_ON				= 148,
-	GOTO_SCENE					= 149,
-	PLAY_PROLOGUE				= 150,
-	ADD_ITEM_TO_INVENTORY		= 151,
-	SET_OBJECT					= 152,
-	CALL_TALK_FILE				= 153,
-	MOVE_MOUSE					= 154,
-	DISPLAY_INFO_LINE			= 155,
-	CLEAR_INFO_LINE				= 156,
-	WALK_TO_CANIMATION			= 157,
-	REMOVE_ITEM_FROM_INVENTORY	= 158,
-	ENABLE_END_KEY				= 159,
-	DISABLE_END_KEY				= 160,
-	CARRIAGE_RETURN				= 161
+	OP_SWITCH_SPEAKER				= 128,
+	OP_RUN_CANIMATION = 129,
+	OP_ASSIGN_PORTRAIT_LOCATION = 130,
+	OP_PAUSE = 131,
+	OP_REMOVE_PORTRAIT = 132,
+	OP_CLEAR_WINDOW = 133,
+	OP_ADJUST_OBJ_SEQUENCE = 134,
+	OP_WALK_TO_COORDS = 135,
+	OP_PAUSE_WITHOUT_CONTROL = 136,
+	OP_BANISH_WINDOW = 137,
+	OP_SUMMON_WINDOW = 138,
+	OP_SET_FLAG = 139,
+	OP_SFX_COMMAND = 140,
+	OP_TOGGLE_OBJECT = 141,
+	OP_STEALTH_MODE_ACTIVE = 142,
+	OP_IF_STATEMENT = 143,
+	OP_ELSE_STATEMENT = 144,
+	OP_END_IF_STATEMENT = 145,
+	OP_STEALTH_MODE_DEACTIVATE = 146,
+	OP_TURN_HOLMES_OFF = 147,
+	OP_TURN_HOLMES_ON = 148,
+	OP_GOTO_SCENE = 149,
+	OP_PLAY_PROLOGUE = 150,
+	OP_ADD_ITEM_TO_INVENTORY = 151,
+	OP_SET_OBJECT = 152,
+	OP_CALL_TALK_FILE = 153,
+	OP_MOVE_MOUSE = 154,
+	OP_DISPLAY_INFO_LINE = 155,
+	OP_CLEAR_INFO_LINE = 156,
+	OP_WALK_TO_CANIMATION = 157,
+	OP_REMOVE_ITEM_FROM_INVENTORY = 158,
+	OP_ENABLE_END_KEY = 159,
+	OP_DISABLE_END_KEY = 160,
+	OP_CARRIAGE_RETURN = 161
 };
 
+
 struct SequenceEntry {
 	int _objNum;
 	Common::Array<byte> _sequences;
@@ -181,6 +182,7 @@ public:
 	Common::String _scriptName;
 	bool _moreTalkUp, _moreTalkDown;
 	int _converseNum;
+	const byte *_opcodes;
 public:
 	Talk(SherlockEngine *vm);
 
-- 
cgit v1.2.3


From 55ab34b981cf58e3e650926713bf72729adaa311 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 15:17:05 -0400
Subject: SHERLOCK: Fully implemented RT opcodes array

---
 engines/sherlock/talk.cpp | 100 ++++++++++++++++++++++++++++++++++++++++++++-
 engines/sherlock/talk.h   | 101 ++++++++++++++++++++++++++++++----------------
 2 files changed, 165 insertions(+), 36 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 7379d04b5f..bc473f755f 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -62,13 +62,109 @@ const byte SCALPEL_OPCODES[] = {
 	158,	// OP_REMOVE_ITEM_FROM_INVENTORY
 	159,	// OP_ENABLE_END_KEY
 	160,	// OP_DISABLE_END_KEY
-	161		// OP_CARRIAGE_RETURN
+	161,	// OP_CARRIAGE_RETURN
+	0,		// OP_MOUSE_ON_OFF
+	0,		// OP_SET_WALK_CONTROL
+	0,		// OP_SET_TALK_SEQUENCE
+	0,		// OP_PLAY_SONG
+	0,		// OP_WALK_HOLMES_AND_NPC_TO_CANIM
+	0,		// OP_SET_NPC_PATH_DEST
+	0,		// OP_NEXT_SONG
+	0,		// OP_SET_NPC_PATH_PAUSE
+	0,		// OP_PASSWORD
+	0,		// OP_SET_SCENE_ENTRY_FLAG
+	0,		// OP_WALK_NPC_TO_CANIM
+	0,		// OP_WALK_HOLMES_AND_NPC_TO_COORDS
+	0,		// OP_WALK_HOLMES_AND_NPC_TO_COORDS
+	0,		// OP_SET_NPC_TALK_FILE
+	0,		// OP_TURN_NPC_OFF
+	0,		// OP_TURN_NPC_ON
+	0,		// OP_NPC_DESC_ON_OFF
+	0,		// OP_NPC_PATH_PAUSE_TAKING_NOTES
+	0,		// OP_NPC_PATH_PAUSE_LOOKING_HOLMES
+	0,		// OP_ENABLE_TALK_INTERRUPTS
+	0,		// OP_DISABLE_TALK_INTERRUPTS
+	0,		// OP_SET_NPC_INFO_LINE
+	0,		// OP_SET_NPC_POSITION
+	0,		// OP_NPC_PATH_LABEL
+	0,		// OP_PATH_GOTO_LABEL
+	0,		// OP_PATH_IF_FLAG_GOTO_LABEL
+	0,		// OP_NPC_WALK_GRAPHICS
+	0,		// OP_NPC_VERB
+	0,		// OP_NPC_VERB_CANIM
+	0,		// OP_NPC_VERB_SCRIPT
+	0,		// OP_RESTORE_PEOPLE_SEQUENCE
+	0,		// OP_NPC_VERB_TARGET
+	0		// OP_TURN_SOUNDS_OFF
 };
 
 const byte TATTOO_OPCODES[] = {
 	170,	// OP_SWITCH_SPEAKER
 	171,	// OP_RUN_CANIMATION
-	0	// TODO reset of opcodes
+	0,	// OP_ASSIGN_PORTRAIT_LOCATION
+	173,	// OP_PAUSE
+	0,	// OP_REMOVE_PORTRAIT
+	0,	// OP_CLEAR_WINDOW
+	176,	// OP_ADJUST_OBJ_SEQUENCE
+	177,	// OP_WALK_TO_COORDS
+	178,	// OP_PAUSE_WITHOUT_CONTROL
+	179,	// OP_BANISH_WINDOW
+	0,		// OP_SUMMON_WINDOW
+	181,	// OP_SET_FLAG
+	0,		// OP_SFX_COMMAND
+	183,	// OP_TOGGLE_OBJECT
+	184,	// OP_STEALTH_MODE_ACTIVE
+	0,		// OP_IF_STATEMENT
+	0,		// OP_ELSE_STATEMENT
+	0,		// OP_END_IF_STATEMENT
+	188,	// OP_STEALTH_MODE_DEACTIVATE
+	189,	// OP_TURN_HOLMES_OFF
+	190,	// OP_TURN_HOLMES_ON
+	191,	// OP_GOTO_SCENE
+	0,		// OP_PLAY_PROLOGUE
+	193,	// OP_ADD_ITEM_TO_INVENTORY
+	194,	// OP_SET_OBJECT
+	172,	// OP_CALL_TALK_FILE
+	0,		// OP_MOVE_MOUSE
+	0,		// OP_DISPLAY_INFO_LINE
+	0,		// OP_CLEAR_INFO_LINE
+	199,	// OP_WALK_TO_CANIMATION
+	200,	// OP_REMOVE_ITEM_FROM_INVENTORY
+	201,	// OP_ENABLE_END_KEY
+	202,	// OP_DISABLE_END_KEY
+	0,		// OP_CARRIAGE_RETURN
+	174,	// OP_MOUSE_ON_OFF
+	175,	// OP_SET_WALK_CONTROL
+	180,	// OP_SET_TALK_SEQUENCE
+	182,	// OP_PLAY_SONG
+	187,	// OP_WALK_HOLMES_AND_NPC_TO_CANIM
+	192,	// OP_SET_NPC_PATH_DEST
+	195,	// OP_NEXT_SONG
+	196,	// OP_SET_NPC_PATH_PAUSE
+	197,	// OP_PASSWORD
+	198,	// OP_SET_SCENE_ENTRY_FLAG
+	185,	// OP_WALK_NPC_TO_CANIM
+	204,	// OP_WALK_HOLMES_AND_NPC_TO_COORDS
+	205,	// OP_SET_NPC_TALK_FILE
+	206,	// OP_TURN_NPC_OFF
+	207,	// OP_TURN_NPC_ON
+	208,	// OP_NPC_DESC_ON_OFF
+	209,	// OP_NPC_PATH_PAUSE_TAKING_NOTES
+	210,	// OP_NPC_PATH_PAUSE_LOOKING_HOLMES
+	211,	// OP_ENABLE_TALK_INTERRUPTS
+	212,	// OP_DISABLE_TALK_INTERRUPTS
+	213,	// OP_SET_NPC_INFO_LINE
+	214,	// OP_SET_NPC_POSITION
+	215,	// OP_NPC_PATH_LABEL
+	216,	// OP_PATH_GOTO_LABEL
+	217,	// OP_PATH_IF_FLAG_GOTO_LABEL
+	218,	// OP_NPC_WALK_GRAPHICS
+	220,	// OP_NPC_VERB
+	221,	// OP_NPC_VERB_CANIM
+	222,	// OP_NPC_VERB_SCRIPT
+	224,	// OP_RESTORE_PEOPLE_SEQUENCE
+	226,	// OP_NPC_VERB_TARGET
+	227		// OP_TURN_SOUNDS_OFF
 };
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index bead67983b..b30b4ad714 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -36,40 +36,73 @@ namespace Sherlock {
 #define MAX_TALK_FILES 500
 
 enum {
-	OP_SWITCH_SPEAKER				= 128,
-	OP_RUN_CANIMATION = 129,
-	OP_ASSIGN_PORTRAIT_LOCATION = 130,
-	OP_PAUSE = 131,
-	OP_REMOVE_PORTRAIT = 132,
-	OP_CLEAR_WINDOW = 133,
-	OP_ADJUST_OBJ_SEQUENCE = 134,
-	OP_WALK_TO_COORDS = 135,
-	OP_PAUSE_WITHOUT_CONTROL = 136,
-	OP_BANISH_WINDOW = 137,
-	OP_SUMMON_WINDOW = 138,
-	OP_SET_FLAG = 139,
-	OP_SFX_COMMAND = 140,
-	OP_TOGGLE_OBJECT = 141,
-	OP_STEALTH_MODE_ACTIVE = 142,
-	OP_IF_STATEMENT = 143,
-	OP_ELSE_STATEMENT = 144,
-	OP_END_IF_STATEMENT = 145,
-	OP_STEALTH_MODE_DEACTIVATE = 146,
-	OP_TURN_HOLMES_OFF = 147,
-	OP_TURN_HOLMES_ON = 148,
-	OP_GOTO_SCENE = 149,
-	OP_PLAY_PROLOGUE = 150,
-	OP_ADD_ITEM_TO_INVENTORY = 151,
-	OP_SET_OBJECT = 152,
-	OP_CALL_TALK_FILE = 153,
-	OP_MOVE_MOUSE = 154,
-	OP_DISPLAY_INFO_LINE = 155,
-	OP_CLEAR_INFO_LINE = 156,
-	OP_WALK_TO_CANIMATION = 157,
-	OP_REMOVE_ITEM_FROM_INVENTORY = 158,
-	OP_ENABLE_END_KEY = 159,
-	OP_DISABLE_END_KEY = 160,
-	OP_CARRIAGE_RETURN = 161
+	OP_SWITCH_SPEAKER			= 0,
+	OP_RUN_CANIMATION			= 1,
+	OP_ASSIGN_PORTRAIT_LOCATION = 2,
+	OP_PAUSE					= 3,
+	OP_REMOVE_PORTRAIT			= 4,
+	OP_CLEAR_WINDOW				= 5,
+	OP_ADJUST_OBJ_SEQUENCE		= 6,
+	OP_WALK_TO_COORDS			= 7,
+	OP_PAUSE_WITHOUT_CONTROL	= 8,
+	OP_BANISH_WINDOW			= 9,
+	OP_SUMMON_WINDOW			= 10,
+	OP_SET_FLAG					= 11,
+	OP_SFX_COMMAND				= 12,
+	OP_TOGGLE_OBJECT			= 13,
+	OP_STEALTH_MODE_ACTIVE		= 14,
+	OP_IF_STATEMENT				= 15,
+	OP_ELSE_STATEMENT			= 16,
+	OP_END_IF_STATEMENT			= 17,
+	OP_STEALTH_MODE_DEACTIVATE	= 18,
+	OP_TURN_HOLMES_OFF			= 19,
+	OP_TURN_HOLMES_ON			= 20,
+	OP_GOTO_SCENE				= 21,
+	OP_PLAY_PROLOGUE			= 22,
+	OP_ADD_ITEM_TO_INVENTORY	= 23,
+	OP_SET_OBJECT				= 24,
+	OP_CALL_TALK_FILE			= 25,
+	OP_MOVE_MOUSE				= 26,
+	OP_DISPLAY_INFO_LINE		= 27,
+	OP_CLEAR_INFO_LINE			= 28,
+	OP_WALK_TO_CANIMATION		= 29,
+	OP_REMOVE_ITEM_FROM_INVENTORY = 30,
+	OP_ENABLE_END_KEY			= 31,
+	OP_DISABLE_END_KEY			= 32,
+	OP_CARRIAGE_RETURN			= 33,
+	
+	OP_MOUSE_OFF_ON				= 34,
+	OP_SET_WALK_CONTROL			= 35,
+	OP_SET_TALK_SEQUENCE		= 36,
+	OP_PLAY_SONG				= 37,
+	OP_WALK_HOLMES_AND_NPC_TO_CANIM = 38,
+	OP_SET_NPC_PATH_DEST		= 39,
+	OP_NEXT_SONG				= 40,
+	OP_SET_NPC_PATH_PAUSE		= 41,
+	OP_NEED_PASSWORD			= 42,
+	OP_SET_SCENE_ENTRY_FLAG		= 43,
+	OP_WALK_NPC_TO_CANIM		= 44,
+	OP_WALK_HOLMES_AND_NPC_TO_COORDS = 45,
+	OP_SET_NPC_TALK_FILE		= 46,
+	OP_TURN_NPC_OFF				= 47,
+	OP_TURN_NPC_ON				= 48,
+	OP_NPC_DESC_ON_OFF			= 49,
+	OP_NPC_PATH_PAUSE_TAKING_NOTES	= 50,
+	OP_NPC_PATH_PAUSE_LOOKING_HOLMES = 51,
+	OP_ENABLE_TALK_INTERRUPTS	= 52,
+	OP_DISABLE_TALK_INTERRUPTS	= 53,
+	OP_SET_NPC_INFO_LINE		= 54,
+	OP_SET_NPC_POSITION			= 54,
+	OP_NPC_PATH_LABEL			= 55,
+	OP_PATH_GOTO_LABEL			= 56,
+	OP_PATH_IF_FLAG_GOTO_LABEL	= 57,
+	OP_NPC_WALK_GRAPHICS		= 58,
+	OP_NPC_VERB					= 59,
+	OP_NPC_VERB_CANIM			= 60,
+	OP_NPC_VERB_SCRIPT			= 61,
+	OP_RESTORE_PEOPLE_SEQUENCE	= 62,
+	OP_NPC_VERB_TARGET			= 63,
+	OP_TURN_SOUNDS_OFF			= 64
 };
 
 
-- 
cgit v1.2.3


From 8a808654c8a342711fa34bdfbee29296496902d8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 18:59:25 -0400
Subject: SHERLOCK: Splitting Talk up to implement individual opcode methods

---
 engines/sherlock/sherlock.cpp |    2 +-
 engines/sherlock/talk.cpp     | 1029 +++++++++++++++++++++++++----------------
 engines/sherlock/talk.h       |  101 +++-
 3 files changed, 712 insertions(+), 420 deletions(-)

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 5973823f96..14f24333e0 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -95,7 +95,7 @@ void SherlockEngine::initialize() {
 	_scene = new Scene(this);
 	_screen = new Screen(this);
 	_sound = new Sound(this, _mixer);
-	_talk = new Talk(this);
+	_talk = Talk::init(this);
 	_ui = UserInterface::init(this);
 
 	// Load game settings
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index bc473f755f..9b22ee1c82 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -231,6 +231,13 @@ void TalkSequences::clear() {
 
 /*----------------------------------------------------------------*/
 
+Talk *Talk::init(SherlockEngine *vm) {
+	if (vm->getGameID() == GType_SerratedScalpel)
+		return new ScalpelTalk(vm);
+	else
+		return new TattooTalk(vm);
+}
+
 Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_talkCounter = 0;
 	_talkToAbort = false;
@@ -245,6 +252,14 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_scriptMoreFlag = 0;
 	_scriptSaveIndex = -1;
 	_opcodes = IS_SERRATED_SCALPEL ? SCALPEL_OPCODES : TATTOO_OPCODES;
+
+	_charCount = 0;
+	_line = 0;
+	_yp = 0;
+	_wait = 0;
+	_pauseFlag = false;
+	_seqCount = 0;
+	_scriptStart = _scriptEnd = nullptr;
 }
 
 void Talk::talkTo(const Common::String &filename) {
@@ -1063,34 +1078,29 @@ void Talk::setStillSeq(int speaker) {
 }
 
 void Talk::doScript(const Common::String &script) {
-	Animation &anim = *_vm->_animation;
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Map &map = *_vm->_map;
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
 	UserInterface &ui = *_vm->_ui;
-	int wait = 0;
-	bool pauseFlag = false;
-	bool endStr = false;
-	int yp = CONTROLS_Y + 12;
-	int charCount = 0;
-	int line = 0;
-	bool noTextYet = true;
 	bool openTalkWindow = false;
-	int seqCount;
 
 	_savedSequences.clear();
 
-	const byte *scriptStart = (const byte *)script.c_str();
-	const byte *scriptEnd = scriptStart + script.size();
-	const byte *str = scriptStart;
+	_scriptStart = (const byte *)script.c_str();
+	_scriptEnd = _scriptStart + script.size();
+	const byte *str = _scriptStart;
+	_yp = CONTROLS_Y + 12;
+	_charCount = 0;
+	_line = 0;
+	_wait = 0;
+	_pauseFlag = false;
+	_seqCount = 0;
+	_noTextYet = true;
+	_endStr = false;
 
 	if (_scriptMoreFlag) {
 		_scriptMoreFlag = 0;
-		str = scriptStart + _scriptSaveIndex;
+		str = _scriptStart + _scriptSaveIndex;
 	}
 
 	// Check if the script begins with a Stealh Mode Active command
@@ -1145,371 +1155,31 @@ void Talk::doScript(const Common::String &script) {
 
 	do {
 		Common::String tempString;
-		wait = 0;
+		_wait = 0;
 
 		byte c = str[0];
 		if (!c) {
-			endStr = true;
+			_endStr = true;
 		} else if (c == '{') {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (c >= _opcodes[0]) {
+		} else if (_opcodeTable[c]) {
 			// Handle control code
-			if (c == _opcodes[OP_SWITCH_SPEAKER]) {
-				if (!(_speaker & SPEAKER_REMOVE))
-					people.clearTalking();
-				if (_talkToAbort)
-					return;
-
-				ui.clearWindow();
-				yp = CONTROLS_Y + 12;
-				charCount = line = 0;
-
-				_speaker = *++str - 1;
-				people.setTalking(_speaker);
-				pullSequence();
-				pushSequence(_speaker);
-				setSequence(_speaker);
-
-			} else if (c == _opcodes[OP_RUN_CANIMATION]) {
-				++str;
-				scene.startCAnim((str[0] - 1) & 127, (str[0] & 0x80) ? -1 : 1);
-				if (_talkToAbort)
-					return;
-
-				// Check if next character is changing side or changing portrait
-				if (charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]))
-					wait = 1;
-
-			} else if (c == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]) {
-				++str;
-				switch (str[0] & 15) {
-				case 1:
-					people._portraitSide = 20;
-					break;
-				case 2:
-					people._portraitSide = 220;
-					break;
-				case 3:
-					people._portraitSide = 120;
-					break;
-				default:
-					break;
-				}
-
-				if (str[0] > 15)
-					people._speakerFlip = true;
-
-			} else if (c == _opcodes[OP_PAUSE]) {
-				// Pause
-				charCount = *++str;
-				wait = pauseFlag = true;
-
-			} else if (c == _opcodes[OP_REMOVE_PORTRAIT]) {
-				if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
-					people.clearTalking();
-				pullSequence();
-				if (_talkToAbort)
-					return;
-
-				_speaker |= SPEAKER_REMOVE;
-
-			} else if (c == _opcodes[OP_CLEAR_WINDOW]) {
-				ui.clearWindow();
-				yp = CONTROLS_Y + 12;
-				charCount = line = 0;
-
-			} else if (c == _opcodes[OP_ADJUST_OBJ_SEQUENCE]) {
-				// Get the name of the object to adjust
-				++str;
-				for (int idx = 0; idx < (str[0] & 127); ++idx)
-					tempString += str[idx + 2];
-
-				// Scan for object
-				int objId = -1;
-				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
-					if (tempString.equalsIgnoreCase(scene._bgShapes[idx]._name))
-						objId = idx;
-				}
-				if (objId == -1)
-					error("Could not find object %s to change", tempString.c_str());
-
-				// Should the script be overwritten?
-				if (str[0] > 0x80) {
-					// Save the current sequence
-					_savedSequences.push(SequenceEntry());
-					SequenceEntry &seqEntry = _savedSequences.top();
-					seqEntry._objNum = objId;
-					seqEntry._seqTo = scene._bgShapes[objId]._seqTo;
-					for (uint idx = 0; idx < scene._bgShapes[objId]._seqSize; ++idx)
-						seqEntry._sequences.push_back(scene._bgShapes[objId]._sequences[idx]);
-				}
-
-				// Get number of bytes to change
-				seqCount = str[1];
-				str += (str[0] & 127) + 2;
-
-				// Copy in the new sequence
-				for (int idx = 0; idx < seqCount; ++idx, ++str)
-					scene._bgShapes[objId]._sequences[idx] = str[0] - 1;
-
-				// Reset object back to beginning of new sequence
-				scene._bgShapes[objId]._frameNumber = 0;
+			switch ((this->*_opcodeTable[c - 128])(str)) {
+			case RET_EXIT:
+				return;
+			case RET_CONTINUE:
 				continue;
-
-			} else if (c == _opcodes[OP_WALK_TO_COORDS]) {
-				++str;
-
-				people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100,
-					str[2] * 100), str[3] - 1);
-				if (_talkToAbort)
-					return;
-
-				str += 3;
-			
-			} else if (c == _opcodes[OP_PAUSE_WITHOUT_CONTROL]) {
-				++str;
-
-				for (int idx = 0; idx < (str[0] - 1); ++idx) {
-					scene.doBgAnim();
-					if (_talkToAbort)
-						return;
-
-					// Check for button press
-					events.pollEvents();
-					events.setButtonState();
-				}
-
-			} else if (c == _opcodes[OP_BANISH_WINDOW]) {
-				if (!(_speaker & SPEAKER_REMOVE))
-					people.clearTalking();
-				pullSequence();
-
-				if (_talkToAbort)
-					return;
-
-				_speaker |= SPEAKER_REMOVE;
-				ui.banishWindow();
-				ui._menuMode = TALK_MODE;
-				noTextYet = true;
-				
-			} else if (c == _opcodes[OP_SUMMON_WINDOW]) {
-				drawInterface();
-				events._pressed = events._released = false;
-				events.clearKeyboard();
-				noTextYet = false;
-
-				if (_speaker != -1) {
-					screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, false, "Exit");
-					screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
-					screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, false, "Down");
-				}
-
-			} else if (c == _opcodes[OP_SET_FLAG]) {
-				++str;
-				int flag1 = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
-				int flag = (flag1 & 0x3fff) * (flag1 >= 0x4000 ? -1 : 1);
-				_vm->setFlags(flag);
-				++str;
-
-			} else if (c == _opcodes[OP_SFX_COMMAND]) {
-				++str;
-				if (sound._voices) {
-					for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
-						tempString += str[idx];
-					sound.playSound(tempString, WAIT_RETURN_IMMEDIATELY);
-
-					// Set voices to wait for more
-					sound._voices = 2;
-					sound._speechOn = (*sound._soundIsOn);
-				}
-
-				wait = 1;
-				str += 7;
-				
-			} else if (c == _opcodes[OP_TOGGLE_OBJECT]) {
-				++str;
-				for (int idx = 0; idx < str[0]; ++idx)
-					tempString += str[idx + 1];
-
-				scene.toggleObject(tempString);
-				str += str[0];
-				
-			} else if (c == _opcodes[OP_STEALTH_MODE_ACTIVE]) {
-				_talkStealth = 2;
-
-			} else if (c == _opcodes[OP_IF_STATEMENT]) {
-				++str;
-				int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
-				++str;
-				wait = 0;
-
-				bool result = flag < 0x8000;
-				if (_vm->readFlags(flag & 0x7fff) != result) {
-					do {
-						++str;
-					} while (str[0] && str[0] != _opcodes[OP_ELSE_STATEMENT] && str[0] != _opcodes[OP_END_IF_STATEMENT]);
-
-					if (!str[0])
-						endStr = true;
-				}
-
-			} else if (c == _opcodes[OP_ELSE_STATEMENT]) {
-				// If this is encountered here, it means that a preceeding IF statement was found,
-				// and evaluated to true. Now all the statements for the true block are finished,
-				// so skip over the block of code that would have executed if the result was false
-				wait = 0;
-				do {
-					++str;
-				} while (str[0] && str[0] != _opcodes[OP_END_IF_STATEMENT]);
-
-			} else if (c == _opcodes[OP_STEALTH_MODE_DEACTIVATE]) {
-				_talkStealth = 0;
-				events.clearKeyboard();
-				
-			} else if (c == _opcodes[OP_TURN_HOLMES_OFF]) {
-				people._holmesOn = false;
-				
-			} else if (c == _opcodes[OP_TURN_HOLMES_ON]) {
-				people._holmesOn = true;
-
-			} else if (c == _opcodes[OP_GOTO_SCENE]) {
-				scene._goToScene = str[1] - 1;
-
-				if (scene._goToScene != 100) {
-					// Not going to the map overview
-					map._oldCharPoint = scene._goToScene;
-					map._overPos.x = map[scene._goToScene].x * 100 - 600;
-					map._overPos.y = map[scene._goToScene].y * 100 + 900;
-
-					// Run a canimation?
-					if (str[2] > 100) {
-						people._hSavedFacing = str[2];
-						people._hSavedPos = Common::Point(160, 100);
-					}
-				}
-				str += 6;
-
-				_scriptMoreFlag = (scene._goToScene == 100) ? 2 : 1;
-				_scriptSaveIndex = str - scriptStart;
-				endStr = true;
-				wait = 0;
-				
-			} else if (c == _opcodes[OP_PLAY_PROLOGUE]) {
-				++str;
-				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
-					tempString += str[idx];
-
-				anim.play(tempString, 1, 3, true, 4);
-				
-			} else if (c == _opcodes[OP_ADD_ITEM_TO_INVENTORY]) {
-				++str;
-				for (int idx = 0; idx < str[0]; ++idx)
-					tempString += str[idx + 1];
-				str += str[0];
-
-				inv.putNameInInventory(tempString);
-				
-			} else if (c == _opcodes[OP_SET_OBJECT]) {
-				++str;
-				for (int idx = 0; idx < (str[0] & 127); ++idx)
-					tempString += str[idx + 1];
-
-				// Set comparison state according to if we want to hide or unhide
-				bool state = (str[0] >= SPEAKER_REMOVE);
-				str += str[0] & 127;
-
-				for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
-					Object &object = scene._bgShapes[idx];
-					if (tempString.equalsIgnoreCase(object._name)) {
-						// Only toggle the object if it's not in the desired state already
-						if ((object._type == HIDDEN && state) || (object._type != HIDDEN && !state))
-							object.toggleHidden();
-					}
-				}
-				
-			} else if (c == _opcodes[OP_CALL_TALK_FILE]) {
-				++str;
-				for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
-					tempString += str[idx];
-				str += 8;
-
-				int scriptCurrentIndex = str - scriptStart;
-
-				// Save the current script position and new talk file
-				if (_scriptStack.size() < 9) {
-					ScriptStackEntry rec1;
-					rec1._name = _scriptName;
-					rec1._currentIndex = scriptCurrentIndex;
-					rec1._select = _scriptSelect;
-					_scriptStack.push(rec1);
-
-					// Push the new talk file onto the stack
-					ScriptStackEntry rec2;
-					rec2._name = tempString;
-					rec2._currentIndex = 0;
-					rec2._select = 100;
-					_scriptStack.push(rec2);
-				} else {
-					error("Script stack overflow");
-				}
-
-				_scriptMoreFlag = 1;
-				endStr = true;
-				wait = 0;
-				
-			} else if (c == _opcodes[OP_MOVE_MOUSE]) {
-				++str;
-				events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
-				if (_talkToAbort)
-					return;
-				str += 3;
-				
-			} else if (c == _opcodes[OP_DISPLAY_INFO_LINE]) {
-				++str;
-				for (int idx = 0; idx < str[0]; ++idx)
-					tempString += str[idx + 1];
-				str += str[0];
-
-				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempString.c_str());
-				ui._menuCounter = 30;
-				
-			} else if (c == _opcodes[OP_CLEAR_INFO_LINE]) {
-				ui._infoFlag = true;
-				ui.clearInfo();
-				
-			} else if (c == _opcodes[OP_WALK_TO_CANIMATION]) {
-				++str;
-				CAnim &animation = scene._cAnim[str[0] - 1];
-
-				people.walkToCoords(animation._goto, animation._gotoDir);
-				if (_talkToAbort)
-					return;
-				
-			} else if (c == _opcodes[OP_REMOVE_ITEM_FROM_INVENTORY]) {
-				++str;
-				for (int idx = 0; idx < str[0]; ++idx)
-					tempString += str[idx + 1];
-				str += str[0];
-
-				inv.deleteItemFromInventory(tempString);
-				
-			} else if (c == _opcodes[OP_ENABLE_END_KEY]) {
-				ui._endKeyActive = true;
-				
-			} else if (c == _opcodes[OP_DISABLE_END_KEY]) {
-				ui._endKeyActive = false;
-				
-			} else {
-				error("Unknown opcode encountered");
+			default:
+				break;
 			}
 
 			++str;
 		} else {
 			// If the window isn't yet open, draw the window before printing starts
-			if (!ui._windowOpen && noTextYet) {
-				noTextYet = false;
+			if (!ui._windowOpen && _noTextYet) {
+				_noTextYet = false;
 				drawInterface();
 
 				if (_talkTo != -1) {
@@ -1520,19 +1190,19 @@ void Talk::doScript(const Common::String &script) {
 			}
 
 			// If it's the first line, display the speaker
-			if (!line && _speaker >= 0 && _speaker < (int)people._characters.size()) {
+			if (!_line && _speaker >= 0 && _speaker < (int)people._characters.size()) {
 				// If the window is open, display the name directly on-screen.
 				// Otherwise, simply draw it on the back buffer
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), TALK_FOREGROUND, "%s",
+					screen.print(Common::Point(16, _yp), TALK_FOREGROUND, "%s",
 						people._characters[_speaker & 127]._name);
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), TALK_FOREGROUND, "%s", 
+					screen.gPrint(Common::Point(16, _yp - 1), TALK_FOREGROUND, "%s", 
 						people._characters[_speaker & 127]._name);
 					openTalkWindow = true;
 				}
 
-				yp += 9;
+				_yp += 9;
 			}
 
 			// Find amount of text that will fit on the line
@@ -1540,23 +1210,23 @@ void Talk::doScript(const Common::String &script) {
 			do {
 				width += screen.charWidth(str[idx]);
 				++idx;
-				++charCount;
+				++_charCount;
 			} while (width < 298 && str[idx] && str[idx] != '{' && str[idx] < _opcodes[0]);
 
 			if (str[idx] || width >= 298) {
 				if (str[idx] < _opcodes[0] && str[idx] != '{') {
 					--idx;
-					--charCount;
+					--_charCount;
 				}
 			} else {
-				endStr = true;
+				_endStr = true;
 			}
 
 			// If word wrap is needed, find the start of the current word
 			if (width >= 298) {
 				while (str[idx] != ' ') {
 					--idx;
-					--charCount;
+					--_charCount;
 				}
 			}
 
@@ -1566,16 +1236,16 @@ void Talk::doScript(const Common::String &script) {
 			// If the speaker indicates a description file, print it in yellow
 			if (_speaker != -1) {
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
+					screen.print(Common::Point(16, _yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
+					screen.gPrint(Common::Point(16, _yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 					openTalkWindow = true;
 				}
 			} else {
 				if (ui._windowOpen) {
-					screen.print(Common::Point(16, yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
+					screen.print(Common::Point(16, _yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 				} else {
-					screen.gPrint(Common::Point(16, yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
+					screen.gPrint(Common::Point(16, _yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 					openTalkWindow = true;
 				}
 			}
@@ -1587,24 +1257,24 @@ void Talk::doScript(const Common::String &script) {
 			if (str[0] < _opcodes[0] && str[0] != '{')
 				++str;
 
-			yp += 9;
-			++line;
+			_yp += 9;
+			++_line;
 
 			// Certain different conditions require a wait
-			if ((line == 4 && str < scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND] && str[0] != _opcodes[OP_PAUSE] && _speaker != -1) ||
-					(line == 5 && str < scriptEnd && str[0] != _opcodes[OP_PAUSE] && _speaker == -1) ||
-					endStr) {
-				wait = 1;
+			if ((_line == 4 && str < _scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND] && str[0] != _opcodes[OP_PAUSE] && _speaker != -1) ||
+					(_line == 5 && str < _scriptEnd && str[0] != _opcodes[OP_PAUSE] && _speaker == -1) ||
+					_endStr) {
+				_wait = 1;
 			}
 
-			byte v = (str >= scriptEnd ? 0 : str[0]);
-			wait = v == _opcodes[OP_SWITCH_SPEAKER] || v == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION] ||
+			byte v = (str >= _scriptEnd ? 0 : str[0]);
+			_wait = v == _opcodes[OP_SWITCH_SPEAKER] || v == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION] ||
 				v == _opcodes[OP_BANISH_WINDOW] || _opcodes[OP_IF_STATEMENT] || v == _opcodes[OP_ELSE_STATEMENT] ||
 				v == _opcodes[OP_END_IF_STATEMENT] || v == _opcodes[OP_GOTO_SCENE] || v == _opcodes[OP_CALL_TALK_FILE];
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-		if ((openTalkWindow && wait) || (openTalkWindow && str[0] >= _opcodes[0] && str[0] != _opcodes[OP_CARRIAGE_RETURN])) {
+		if ((openTalkWindow && _wait) || (openTalkWindow && str[0] >= _opcodes[0] && str[0] != _opcodes[OP_CARRIAGE_RETURN])) {
 			if (!ui._slideWindows) {
 				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 			} else {
@@ -1615,34 +1285,34 @@ void Talk::doScript(const Common::String &script) {
 			openTalkWindow = false;
 		}
 
-		if (wait) {
+		if (_wait) {
 			// Handling pausing
-			if (!pauseFlag && charCount < 160)
-				charCount = 160;
+			if (!_pauseFlag && _charCount < 160)
+				_charCount = 160;
 
-			wait = waitForMore(charCount);
-			if (wait == -1)
-				endStr = true;
+			_wait = waitForMore(_charCount);
+			if (_wait == -1)
+				_endStr = true;
 
 			// If a key was pressed to finish the window, see if further voice files should be skipped
-			if (wait >= 0 && wait < 254) {
+			if (_wait >= 0 && _wait < 254) {
 				if (str[0] == _opcodes[OP_SFX_COMMAND])
 					str += 9;
 			}
 
 			// Clear the window unless the wait was due to a PAUSE command
-			if (!pauseFlag && wait != -1 && str < scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND]) {
+			if (!_pauseFlag && _wait != -1 && str < _scriptEnd && str[0] != _opcodes[OP_SFX_COMMAND]) {
 				if (!_talkStealth)
 					ui.clearWindow();
-				yp = CONTROLS_Y + 12;
-				charCount = line = 0;
+				_yp = CONTROLS_Y + 12;
+				_charCount = _line = 0;
 			}
 
-			pauseFlag = false;
+			_pauseFlag = false;
 		}
-	} while (!_vm->shouldQuit() && !endStr);
+	} while (!_vm->shouldQuit() && !_endStr);
 
-	if (wait != -1) {
+	if (_wait != -1) {
 		for (int ssIndex = 0; ssIndex < (int)_savedSequences.size(); ++ssIndex) {
 			SequenceEntry &seq = _savedSequences[ssIndex];
 			Object &object = scene._bgShapes[seq._objNum];
@@ -1757,4 +1427,559 @@ void Talk::synchronize(Common::Serializer &s) {
 	}
 }
 
+OpcodeReturn Talk::cmdAddItemToInventory(const byte *&str) {
+	Inventory &inv = *_vm->_inventory;
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < str[0]; ++idx)
+		tempString += str[idx + 1];
+	str += str[0];
+
+	inv.putNameInInventory(tempString);
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdAdjustObjectSequence(const byte *&str) {
+	Scene &scene = *_vm->_scene;
+	Common::String tempString;
+
+	// Get the name of the object to adjust
+	++str;
+	for (int idx = 0; idx < (str[0] & 127); ++idx)
+		tempString += str[idx + 2];
+
+	// Scan for object
+	int objId = -1;
+	for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
+		if (tempString.equalsIgnoreCase(scene._bgShapes[idx]._name))
+			objId = idx;
+	}
+	if (objId == -1)
+		error("Could not find object %s to change", tempString.c_str());
+
+	// Should the script be overwritten?
+	if (str[0] > 0x80) {
+		// Save the current sequence
+		_savedSequences.push(SequenceEntry());
+		SequenceEntry &seqEntry = _savedSequences.top();
+		seqEntry._objNum = objId;
+		seqEntry._seqTo = scene._bgShapes[objId]._seqTo;
+		for (uint idx = 0; idx < scene._bgShapes[objId]._seqSize; ++idx)
+			seqEntry._sequences.push_back(scene._bgShapes[objId]._sequences[idx]);
+	}
+
+	// Get number of bytes to change
+	_seqCount = str[1];
+	str += (str[0] & 127) + 2;
+
+	// Copy in the new sequence
+	for (int idx = 0; idx < _seqCount; ++idx, ++str)
+		scene._bgShapes[objId]._sequences[idx] = str[0] - 1;
+
+	// Reset object back to beginning of new sequence
+	scene._bgShapes[objId]._frameNumber = 0;
+
+	return RET_CONTINUE;
+}
+
+OpcodeReturn Talk::cmdBanishWindow(const byte *&str) {
+	People &people = *_vm->_people;
+	UserInterface &ui = *_vm->_ui;
+
+	if (!(_speaker & SPEAKER_REMOVE))
+		people.clearTalking();
+	pullSequence();
+
+	if (_talkToAbort)
+		return RET_EXIT;
+
+	_speaker |= SPEAKER_REMOVE;
+	ui.banishWindow();
+	ui._menuMode = TALK_MODE;
+	_noTextYet = true;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdDisableEndKey(const byte *&str) {
+	_vm->_ui->_endKeyActive = false;
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdEnableEndKey(const byte *&str) {
+	_vm->_ui->_endKeyActive = true;
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdGotoScene(const byte *&str) {
+	Map &map = *_vm->_map;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	scene._goToScene = str[1] - 1;
+
+	if (scene._goToScene != 100) {
+		// Not going to the map overview
+		map._oldCharPoint = scene._goToScene;
+		map._overPos.x = map[scene._goToScene].x * 100 - 600;
+		map._overPos.y = map[scene._goToScene].y * 100 + 900;
+
+		// Run a canimation?
+		if (str[2] > 100) {
+			people._hSavedFacing = str[2];
+			people._hSavedPos = Common::Point(160, 100);
+		}
+	}
+	str += 6;
+
+	_scriptMoreFlag = (scene._goToScene == 100) ? 2 : 1;
+	_scriptSaveIndex = str - _scriptStart;
+	_endStr = true;
+	_wait = 0;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdHolmesOff(const byte *&str) {
+	_vm->_people->_holmesOn = false;
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdHolmesOn(const byte *&str) {
+	_vm->_people->_holmesOn = true;
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdPause(const byte *&str) {
+	_charCount = *++str;
+	_wait = _pauseFlag = true;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdPauseWithoutControl(const byte *&str) {
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	++str;
+
+	for (int idx = 0; idx < (str[0] - 1); ++idx) {
+		scene.doBgAnim();
+		if (_talkToAbort)
+			return RET_EXIT;
+
+		// Check for button press
+		events.pollEvents();
+		events.setButtonState();
+	}
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdRemoveItemFromInventory(const byte *&str) {
+	Inventory &inv = *_vm->_inventory;
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < str[0]; ++idx)
+		tempString += str[idx + 1];
+	str += str[0];
+
+	inv.deleteItemFromInventory(tempString);
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdRunCAnimation(const byte *&str) {
+	Scene &scene = *_vm->_scene;
+
+	++str;
+	scene.startCAnim((str[0] - 1) & 127, (str[0] & 0x80) ? -1 : 1);
+	if (_talkToAbort)
+		return RET_EXIT;
+
+	// Check if next character is changing side or changing portrait
+	if (_charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]))
+		_wait = 1;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdSetFlag(const byte *&str) {
+	++str;
+	int flag1 = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
+	int flag = (flag1 & 0x3fff) * (flag1 >= 0x4000 ? -1 : 1);
+	_vm->setFlags(flag);
+	++str;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdSetObject(const byte *&str) {
+	Scene &scene = *_vm->_scene;
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < (str[0] & 127); ++idx)
+		tempString += str[idx + 1];
+
+	// Set comparison state according to if we want to hide or unhide
+	bool state = (str[0] >= SPEAKER_REMOVE);
+	str += str[0] & 127;
+
+	for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
+		Object &object = scene._bgShapes[idx];
+		if (tempString.equalsIgnoreCase(object._name)) {
+			// Only toggle the object if it's not in the desired state already
+			if ((object._type == HIDDEN && state) || (object._type != HIDDEN && !state))
+				object.toggleHidden();
+		}
+	}
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdStealthModeActivate(const byte *&str) {
+	_talkStealth = 2;
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdStealthModeDeactivate(const byte *&str) {
+	Events &events = *_vm->_events;
+
+	_talkStealth = 0;
+	events.clearKeyboard();
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdSwitchSpeaker(const byte *&str) {
+	People &people = *_vm->_people;
+	UserInterface &ui = *_vm->_ui;
+
+	if (!(_speaker & SPEAKER_REMOVE))
+		people.clearTalking();
+	if (_talkToAbort)
+		return RET_EXIT;
+
+	ui.clearWindow();
+	_yp = CONTROLS_Y + 12;
+	_charCount = _line = 0;
+
+	_speaker = *++str - 1;
+	people.setTalking(_speaker);
+	pullSequence();
+	pushSequence(_speaker);
+	setSequence(_speaker);
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdToggleObject(const byte *&str) {
+	Scene &scene = *_vm->_scene;
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < str[0]; ++idx)
+		tempString += str[idx + 1];
+
+	scene.toggleObject(tempString);
+	str += str[0];
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdWalkToCAnimation(const byte *&str) {
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+
+	++str;
+	CAnim &animation = scene._cAnim[str[0] - 1];
+	people.walkToCoords(animation._goto, animation._gotoDir);
+	
+	return _talkToAbort ? RET_EXIT : RET_SUCCESS;
+}
+
+OpcodeReturn Talk::cmdWalkToCoords(const byte *&str) {
+	People &people = *_vm->_people;
+	++str;
+
+	people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100,
+		str[2] * 100), str[3] - 1);
+	if (_talkToAbort)
+		return RET_EXIT;
+
+	str += 3;
+	return RET_SUCCESS;
+}
+
+/*----------------------------------------------------------------*/
+
+ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) {
+	static OpcodeMethod OPCODE_METHODS[] = {
+		(OpcodeMethod)&ScalpelTalk::cmdSwitchSpeaker,
+		(OpcodeMethod)&ScalpelTalk::cmdRunCAnimation,
+		(OpcodeMethod)&ScalpelTalk::cmdAssignPortraitLocation,
+
+		(OpcodeMethod)&ScalpelTalk::cmdPause,
+		(OpcodeMethod)&ScalpelTalk::cmdRemovePortrait,
+		(OpcodeMethod)&ScalpelTalk::cmdClearWindow,
+		(OpcodeMethod)&ScalpelTalk::cmdAdjustObjectSequence,
+		(OpcodeMethod)&ScalpelTalk::cmdWalkToCoords,
+		(OpcodeMethod)&ScalpelTalk::cmdPauseWithoutControl,
+		(OpcodeMethod)&ScalpelTalk::cmdBanishWindow,
+		(OpcodeMethod)&ScalpelTalk::cmdSummonWindow,
+		(OpcodeMethod)&ScalpelTalk::cmdSetFlag,
+		(OpcodeMethod)&ScalpelTalk::cmdSfxCommand,
+
+		(OpcodeMethod)&ScalpelTalk::cmdToggleObject,
+		(OpcodeMethod)&ScalpelTalk::cmdStealthModeActivate,
+		(OpcodeMethod)&ScalpelTalk::cmdIf,
+		(OpcodeMethod)&ScalpelTalk::cmdElse,
+		nullptr,
+		(OpcodeMethod)&ScalpelTalk::cmdStealthModeDeactivate,
+		(OpcodeMethod)&ScalpelTalk::cmdHolmesOff,
+		(OpcodeMethod)&ScalpelTalk::cmdHolmesOn,
+		(OpcodeMethod)&ScalpelTalk::cmdGotoScene,
+		(OpcodeMethod)&ScalpelTalk::cmdPlayPrologue,
+		
+		(OpcodeMethod)&ScalpelTalk::cmdAddItemToInventory,
+		(OpcodeMethod)&ScalpelTalk::cmdSetObject,
+		(OpcodeMethod)&ScalpelTalk::cmdCallTalkFile,
+		(OpcodeMethod)&ScalpelTalk::cmdMoveMouse,
+		(OpcodeMethod)&ScalpelTalk::cmdDisplayInfoLine,
+		(OpcodeMethod)&ScalpelTalk::cmdClearInfoLine,
+		(OpcodeMethod)&ScalpelTalk::cmdWalkToCAnimation,
+		(OpcodeMethod)&ScalpelTalk::cmdRemoveItemFromInventory,
+		(OpcodeMethod)&ScalpelTalk::cmdEnableEndKey,
+		(OpcodeMethod)&ScalpelTalk::cmdDisableEndKey,
+		
+		(OpcodeMethod)&ScalpelTalk::cmdCarriageReturn
+	};
+
+	_opcodeTable = OPCODE_METHODS;
+}
+
+OpcodeReturn ScalpelTalk::cmdAssignPortraitLocation(const byte *&str) {
+	People &people = *_vm->_people;
+
+	++str;
+	switch (str[0] & 15) {
+	case 1:
+		people._portraitSide = 20;
+		break;
+	case 2:
+		people._portraitSide = 220;
+		break;
+	case 3:
+		people._portraitSide = 120;
+		break;
+	default:
+		break;
+	}
+
+	if (str[0] > 15)
+		people._speakerFlip = true;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdCallTalkFile(const byte *&str) {
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+		tempString += str[idx];
+	str += 8;
+
+	int scriptCurrentIndex = str - _scriptStart;
+
+	// Save the current script position and new talk file
+	if (_scriptStack.size() < 9) {
+		ScriptStackEntry rec1;
+		rec1._name = _scriptName;
+		rec1._currentIndex = scriptCurrentIndex;
+		rec1._select = _scriptSelect;
+		_scriptStack.push(rec1);
+
+		// Push the new talk file onto the stack
+		ScriptStackEntry rec2;
+		rec2._name = tempString;
+		rec2._currentIndex = 0;
+		rec2._select = 100;
+		_scriptStack.push(rec2);
+	} else {
+		error("Script stack overflow");
+	}
+
+	_scriptMoreFlag = 1;
+	_endStr = true;
+	_wait = 0;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdClearInfoLine(const byte *&str) {
+	UserInterface &ui = *_vm->_ui;
+
+	ui._infoFlag = true;
+	ui.clearInfo();
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdClearWindow(const byte *&str) {
+	UserInterface &ui = *_vm->_ui;
+	
+	ui.clearWindow();
+	_yp = CONTROLS_Y + 12;
+	_charCount = _line = 0;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdDisplayInfoLine(const byte *&str) {
+	Screen &screen = *_vm->_screen;
+	UserInterface &ui = *_vm->_ui;
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < str[0]; ++idx)
+		tempString += str[idx + 1];
+	str += str[0];
+
+	screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempString.c_str());
+	ui._menuCounter = 30;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdElse(const byte *&str) {
+	// If this is encountered here, it means that a preceeding IF statement was found,
+	// and evaluated to true. Now all the statements for the true block are finished,
+	// so skip over the block of code that would have executed if the result was false
+	_wait = 0;
+	do {
+		++str;
+	} while (str[0] && str[0] != _opcodes[OP_END_IF_STATEMENT]);
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdIf(const byte *&str) {
+	++str;
+	int flag = (str[0] - 1) * 256 + str[1] - 1 - (str[1] == 1 ? 1 : 0);
+	++str;
+	_wait = 0;
+
+	bool result = flag < 0x8000;
+	if (_vm->readFlags(flag & 0x7fff) != result) {
+		do {
+			++str;
+		} while (str[0] && str[0] != _opcodes[OP_ELSE_STATEMENT] && str[0] != _opcodes[OP_END_IF_STATEMENT]);
+
+		if (!str[0])
+			_endStr = true;
+	}
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdMoveMouse(const byte *&str) {
+	Events &events = *_vm->_events;
+
+	++str;
+	events.moveMouse(Common::Point((str[0] - 1) * 256 + str[1] - 1, str[2]));
+	if (_talkToAbort)
+		return RET_EXIT;
+	str += 3;
+	
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdPlayPrologue(const byte *&str) {
+	Animation &anim = *_vm->_animation;
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+		tempString += str[idx];
+
+	anim.play(tempString, 1, 3, true, 4);
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdRemovePortrait(const byte *&str) {
+	People &people = *_vm->_people;
+
+	if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
+		people.clearTalking();
+	pullSequence();
+	if (_talkToAbort)
+		return RET_EXIT;
+
+	_speaker |= SPEAKER_REMOVE;
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdSfxCommand(const byte *&str) {
+	Sound &sound = *_vm->_sound;
+	Common::String tempString;
+
+	++str;
+	if (sound._voices) {
+		for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+			tempString += str[idx];
+		sound.playSound(tempString, WAIT_RETURN_IMMEDIATELY);
+
+		// Set voices to wait for more
+		sound._voices = 2;
+		sound._speechOn = (*sound._soundIsOn);
+	}
+
+	_wait = 1;
+	str += 7;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdSummonWindow(const byte *&str) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+
+	drawInterface();
+	events._pressed = events._released = false;
+	events.clearKeyboard();
+	_noTextYet = false;
+
+	if (_speaker != -1) {
+		screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, false, "Exit");
+		screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, false, "Up");
+		screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, false, "Down");
+	}
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn ScalpelTalk::cmdCarriageReturn(const byte *&str) {
+	return RET_SUCCESS;
+}
+
+/*----------------------------------------------------------------*/
+
+TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm) {
+	static OpcodeMethod OPCODE_METHODS[] = {
+		nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		(OpcodeMethod)&TattooTalk::cmdSwitchSpeaker,
+		(OpcodeMethod)&TattooTalk::cmdRunCAnimation,
+		// TODO: Implement opcode methods for new Tattoo opcodes
+	};
+
+	_opcodeTable = OPCODE_METHODS;
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index b30b4ad714..02d141db75 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -105,6 +105,13 @@ enum {
 	OP_TURN_SOUNDS_OFF			= 64
 };
 
+enum OpcodeReturn { RET_EXIT = -1, RET_SUCCESS = 0, RET_CONTINUE = 1 };
+
+class SherlockEngine;
+class ScalpelUserInterface;
+class Talk;
+
+typedef OpcodeReturn(Talk::*OpcodeMethod)(const byte *&str);
 
 struct SequenceEntry {
 	int _objNum;
@@ -156,24 +163,8 @@ struct TalkSequences {
 	void clear();
 };
 
-class SherlockEngine;
-class ScalpelUserInterface;
-
 class Talk {
 	friend class ScalpelUserInterface;
-private:
-	SherlockEngine *_vm;
-	Common::Stack<SequenceEntry> _savedSequences;
-	Common::Stack<SequenceEntry> _sequenceStack;
-	Common::Stack<ScriptStackEntry> _scriptStack;
-	Common::Array<Statement> _statements;
-	TalkHistoryEntry _talkHistory[MAX_TALK_FILES];
-	int _speaker;
-	int _talkIndex;
-	int _scriptSelect;
-	int _talkStealth;
-	int _talkToFlag;
-	int _scriptSaveIndex;
 private:
 	/**
 	 * Remove any voice commands from a loaded statement list
@@ -207,6 +198,54 @@ private:
 	 * the amount of text that's been displayed
 	 */
 	int waitForMore(int delay);
+protected:
+	SherlockEngine *_vm;
+	OpcodeMethod *_opcodeTable;
+	Common::Stack<SequenceEntry> _savedSequences;
+	Common::Stack<SequenceEntry> _sequenceStack;
+	Common::Stack<ScriptStackEntry> _scriptStack;
+	Common::Array<Statement> _statements;
+	TalkHistoryEntry _talkHistory[MAX_TALK_FILES];
+	int _speaker;
+	int _talkIndex;
+	int _scriptSelect;
+	int _talkStealth;
+	int _talkToFlag;
+	int _scriptSaveIndex;
+
+	// These fields are used solely by doScript, but are fields because all the script opcodes are
+	// separate methods now, and need access to these fields
+	int _yp;
+	int _charCount;
+	int _line;
+	int _wait;
+	bool _pauseFlag;
+	bool _endStr, _noTextYet;
+	int _seqCount;
+	const byte *_scriptStart, *_scriptEnd;
+protected:
+	Talk(SherlockEngine *vm);
+
+	OpcodeReturn cmdAddItemToInventory(const byte *&str);
+	OpcodeReturn cmdAdjustObjectSequence(const byte *&str);
+	OpcodeReturn cmdBanishWindow(const byte *&str);
+	OpcodeReturn cmdDisableEndKey(const byte *&str);
+	OpcodeReturn cmdEnableEndKey(const byte *&str);
+	OpcodeReturn cmdGotoScene(const byte *&str);
+	OpcodeReturn cmdHolmesOff(const byte *&str);
+	OpcodeReturn cmdHolmesOn(const byte *&str);
+	OpcodeReturn cmdPause(const byte *&str);
+	OpcodeReturn cmdPauseWithoutControl(const byte *&str);
+	OpcodeReturn cmdRemoveItemFromInventory(const byte *&str);
+	OpcodeReturn cmdRunCAnimation(const byte *&str);
+	OpcodeReturn cmdSetFlag(const byte *&str);
+	OpcodeReturn cmdSetObject(const byte *&str);
+	OpcodeReturn cmdStealthModeActivate(const byte *&str);
+	OpcodeReturn cmdStealthModeDeactivate(const byte *&str);
+	OpcodeReturn cmdSwitchSpeaker(const byte *&str);
+	OpcodeReturn cmdToggleObject(const byte *&str);
+	OpcodeReturn cmdWalkToCAnimation(const byte *&str);
+	OpcodeReturn cmdWalkToCoords(const byte *&str);
 public:
 	bool _talkToAbort;
 	int _talkCounter;
@@ -216,8 +255,10 @@ public:
 	bool _moreTalkUp, _moreTalkDown;
 	int _converseNum;
 	const byte *_opcodes;
+
 public:
-	Talk(SherlockEngine *vm);
+	static Talk *init(SherlockEngine *vm);
+	virtual ~Talk() {}
 
 	/**
 	 * Return a given talk statement
@@ -302,6 +343,32 @@ public:
 	void synchronize(Common::Serializer &s);
 };
 
+class ScalpelTalk : public Talk {
+protected:
+	OpcodeReturn cmdAssignPortraitLocation(const byte *&str);
+	OpcodeReturn cmdCallTalkFile(const byte *&str);
+	OpcodeReturn cmdClearInfoLine(const byte *&str);
+	OpcodeReturn cmdClearWindow(const byte *&str);
+	OpcodeReturn cmdDisplayInfoLine(const byte *&str);
+	OpcodeReturn cmdElse(const byte *&str);
+	OpcodeReturn cmdIf(const byte *&str);
+	OpcodeReturn cmdMoveMouse(const byte *&str);
+	OpcodeReturn cmdPlayPrologue(const byte *&str);
+	OpcodeReturn cmdRemovePortrait(const byte *&str);
+	OpcodeReturn cmdSfxCommand(const byte *&str);
+	OpcodeReturn cmdSummonWindow(const byte *&str);
+	OpcodeReturn cmdCarriageReturn(const byte *&str);
+public:
+	ScalpelTalk(SherlockEngine *vm);
+	virtual ~ScalpelTalk() {}
+};
+
+class TattooTalk : public Talk {
+public:
+	TattooTalk(SherlockEngine *vm);
+	virtual ~TattooTalk() {}
+};
+
 } // End of namespace Sherlock
 
 #endif
-- 
cgit v1.2.3


From b4849f21d27a296f0150937a0d833f2ffd1be507 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 20:33:14 -0400
Subject: SHERLOCK: Implement method stubs for Tattoo opcodes

---
 engines/sherlock/talk.cpp | 167 ++++++++++++++++++++++++++++++++++++----------
 engines/sherlock/talk.h   |  36 +++++++++-
 2 files changed, 166 insertions(+), 37 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 9b22ee1c82..15b64090c7 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1502,6 +1502,42 @@ OpcodeReturn Talk::cmdBanishWindow(const byte *&str) {
 	return RET_SUCCESS;
 }
 
+OpcodeReturn Talk::cmdCallTalkFile(const byte *&str) {
+	Common::String tempString;
+
+	++str;
+	for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
+		tempString += str[idx];
+	str += 8;
+
+	int scriptCurrentIndex = str - _scriptStart;
+
+	// Save the current script position and new talk file
+	if (_scriptStack.size() < 9) {
+		ScriptStackEntry rec1;
+		rec1._name = _scriptName;
+		rec1._currentIndex = scriptCurrentIndex;
+		rec1._select = _scriptSelect;
+		_scriptStack.push(rec1);
+
+		// Push the new talk file onto the stack
+		ScriptStackEntry rec2;
+		rec2._name = tempString;
+		rec2._currentIndex = 0;
+		rec2._select = 100;
+		_scriptStack.push(rec2);
+	}
+	else {
+		error("Script stack overflow");
+	}
+
+	_scriptMoreFlag = 1;
+	_endStr = true;
+	_wait = 0;
+
+	return RET_SUCCESS;
+}
+
 OpcodeReturn Talk::cmdDisableEndKey(const byte *&str) {
 	_vm->_ui->_endKeyActive = false;
 	return RET_SUCCESS;
@@ -1783,41 +1819,6 @@ OpcodeReturn ScalpelTalk::cmdAssignPortraitLocation(const byte *&str) {
 	return RET_SUCCESS;
 }
 
-OpcodeReturn ScalpelTalk::cmdCallTalkFile(const byte *&str) {
-	Common::String tempString;
-
-	++str;
-	for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
-		tempString += str[idx];
-	str += 8;
-
-	int scriptCurrentIndex = str - _scriptStart;
-
-	// Save the current script position and new talk file
-	if (_scriptStack.size() < 9) {
-		ScriptStackEntry rec1;
-		rec1._name = _scriptName;
-		rec1._currentIndex = scriptCurrentIndex;
-		rec1._select = _scriptSelect;
-		_scriptStack.push(rec1);
-
-		// Push the new talk file onto the stack
-		ScriptStackEntry rec2;
-		rec2._name = tempString;
-		rec2._currentIndex = 0;
-		rec2._select = 100;
-		_scriptStack.push(rec2);
-	} else {
-		error("Script stack overflow");
-	}
-
-	_scriptMoreFlag = 1;
-	_endStr = true;
-	_wait = 0;
-
-	return RET_SUCCESS;
-}
-
 OpcodeReturn ScalpelTalk::cmdClearInfoLine(const byte *&str) {
 	UserInterface &ui = *_vm->_ui;
 
@@ -1975,11 +1976,105 @@ TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm) {
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 		(OpcodeMethod)&TattooTalk::cmdSwitchSpeaker,
+
 		(OpcodeMethod)&TattooTalk::cmdRunCAnimation,
-		// TODO: Implement opcode methods for new Tattoo opcodes
+		(OpcodeMethod)&TattooTalk::cmdCallTalkFile,
+		(OpcodeMethod)&TattooTalk::cmdPause,
+		(OpcodeMethod)&TattooTalk::cmdMouseOnOff,
+		(OpcodeMethod)&TattooTalk::cmdSetWalkControl,
+		(OpcodeMethod)&TattooTalk::cmdAdjustObjectSequence,
+		(OpcodeMethod)&TattooTalk::cmdWalkToCoords,
+		(OpcodeMethod)&TattooTalk::cmdPauseWithoutControl,
+		(OpcodeMethod)&TattooTalk::cmdBanishWindow,
+		(OpcodeMethod)&TattooTalk::cmdSetTalkSequence,
+
+		(OpcodeMethod)&TattooTalk::cmdSetFlag,
+		(OpcodeMethod)&TattooTalk::cmdPlaySong,
+		(OpcodeMethod)&TattooTalk::cmdToggleObject,
+		(OpcodeMethod)&TattooTalk::cmdStealthModeActivate,
+		(OpcodeMethod)&TattooTalk::cmdWalkNPCToCAnimation,
+		(OpcodeMethod)&TattooTalk::cmdWalkNPCToCoords,
+		(OpcodeMethod)&TattooTalk::cmdWalkHomesAndNPCToCoords,
+		(OpcodeMethod)&TattooTalk::cmdStealthModeDeactivate,
+		(OpcodeMethod)&TattooTalk::cmdHolmesOff,
+		(OpcodeMethod)&TattooTalk::cmdHolmesOn,
+
+		(OpcodeMethod)&TattooTalk::cmdGotoScene,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCPathDest,
+		(OpcodeMethod)&TattooTalk::cmdAddItemToInventory,
+		(OpcodeMethod)&TattooTalk::cmdSetObject,
+		(OpcodeMethod)&TattooTalk::cmdNextSong,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCPathPause,
+		(OpcodeMethod)&TattooTalk::cmdPassword,
+		(OpcodeMethod)&TattooTalk::cmdSetSceneEntryFlag,
+		(OpcodeMethod)&TattooTalk::cmdWalkToCAnimation,
+		(OpcodeMethod)&TattooTalk::cmdRemoveItemFromInventory,
+
+		(OpcodeMethod)&TattooTalk::cmdEnableEndKey,
+		(OpcodeMethod)&TattooTalk::cmdDisableEndKey,
+		nullptr,
+		(OpcodeMethod)&TattooTalk::cmdWalkHomesAndNPCToCoords,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCTalkFile,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCOff,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCOn,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCDescOnOff,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCPathPauseTakingNotes,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCPathPauseLookingHolmes,
+
+		(OpcodeMethod)&TattooTalk::cmdTalkInterruptsEnable,
+		(OpcodeMethod)&TattooTalk::cmdTalkInterruptsDisable,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCInfoLine,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCPosition,
+		(OpcodeMethod)&TattooTalk::cmdNPCLabelSet,
+		(OpcodeMethod)&TattooTalk::cmdNPCLabelGoto,
+		(OpcodeMethod)&TattooTalk::cmdNPCLabelIfFlagGoto,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCWalkGraphics,
+		nullptr,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCVerb,
+
+		(OpcodeMethod)&TattooTalk::cmdSetNPCVerbCAnimation,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCVerbScript,
+		nullptr,
+		(OpcodeMethod)&TattooTalk::cmdRestorePeopleSequence,
+		(OpcodeMethod)&TattooTalk::cmdSetNPCVerbTarget,
+		(OpcodeMethod)&TattooTalk::cmdTurnSoundsOff
 	};
 
 	_opcodeTable = OPCODE_METHODS;
 }
 
+OpcodeReturn TattooTalk::cmdMouseOnOff(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdNextSong(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdNPCLabelGoto(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdNPCLabelIfFlagGoto(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdPassword(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCDescOnOff(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCInfoLine(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCOff(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCPathDest(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCPathPause(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCPathPauseTakingNotes(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCPathPauseLookingHolmes(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCPosition(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCTalkFile(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCVerb(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCVerbCAnimation(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCVerbScript(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCVerbTarget(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetNPCWalkGraphics(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetSceneEntryFlag(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetTalkSequence(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetWalkControl(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdTalkInterruptsDisable(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdTalkInterruptsEnable(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdTurnSoundsOff(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdWalkHolmesAndNPCToCAnimation(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdWalkNPCToCAnimation(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdWalkNPCToCoords(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdWalkHomesAndNPCToCoords(const byte *&str) { error("TODO: script opcode"); }
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 02d141db75..dc6789cd9d 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -229,6 +229,7 @@ protected:
 	OpcodeReturn cmdAddItemToInventory(const byte *&str);
 	OpcodeReturn cmdAdjustObjectSequence(const byte *&str);
 	OpcodeReturn cmdBanishWindow(const byte *&str);
+	OpcodeReturn cmdCallTalkFile(const byte *&str);
 	OpcodeReturn cmdDisableEndKey(const byte *&str);
 	OpcodeReturn cmdEnableEndKey(const byte *&str);
 	OpcodeReturn cmdGotoScene(const byte *&str);
@@ -346,7 +347,6 @@ public:
 class ScalpelTalk : public Talk {
 protected:
 	OpcodeReturn cmdAssignPortraitLocation(const byte *&str);
-	OpcodeReturn cmdCallTalkFile(const byte *&str);
 	OpcodeReturn cmdClearInfoLine(const byte *&str);
 	OpcodeReturn cmdClearWindow(const byte *&str);
 	OpcodeReturn cmdDisplayInfoLine(const byte *&str);
@@ -364,6 +364,40 @@ public:
 };
 
 class TattooTalk : public Talk {
+protected:
+	OpcodeReturn cmdMouseOnOff(const byte *&str);
+	OpcodeReturn cmdNextSong(const byte *&str);
+	OpcodeReturn cmdPassword(const byte *&str);
+	OpcodeReturn cmdPlaySong(const byte *&str);
+	OpcodeReturn cmdRestorePeopleSequence(const byte *&str);
+	OpcodeReturn cmdSetNPCDescOnOff(const byte *&str);
+	OpcodeReturn cmdSetNPCInfoLine(const byte *&str);
+	OpcodeReturn cmdNPCLabelGoto(const byte *&str);
+	OpcodeReturn cmdNPCLabelIfFlagGoto(const byte *&str);
+	OpcodeReturn cmdNPCLabelSet(const byte *&str);
+	OpcodeReturn cmdSetNPCOff(const byte *&str);
+	OpcodeReturn cmdSetNPCOn(const byte *&str);
+	OpcodeReturn cmdSetNPCPathDest(const byte *&str);
+	OpcodeReturn cmdSetNPCPathPause(const byte *&str);
+	OpcodeReturn cmdSetNPCPathPauseTakingNotes(const byte *&str);
+	OpcodeReturn cmdSetNPCPathPauseLookingHolmes(const byte *&str);
+	OpcodeReturn cmdSetNPCPosition(const byte *&str);
+	OpcodeReturn cmdSetNPCTalkFile(const byte *&str);
+	OpcodeReturn cmdSetNPCVerb(const byte *&str);
+	OpcodeReturn cmdSetNPCVerbCAnimation(const byte *&str);
+	OpcodeReturn cmdSetNPCVerbScript(const byte *&str);
+	OpcodeReturn cmdSetNPCVerbTarget(const byte *&str);
+	OpcodeReturn cmdSetNPCWalkGraphics(const byte *&str);
+	OpcodeReturn cmdSetSceneEntryFlag(const byte *&str);
+	OpcodeReturn cmdSetTalkSequence(const byte *&str);
+	OpcodeReturn cmdSetWalkControl(const byte *&str);
+	OpcodeReturn cmdTalkInterruptsDisable(const byte *&str);
+	OpcodeReturn cmdTalkInterruptsEnable(const byte *&str);
+	OpcodeReturn cmdTurnSoundsOff(const byte *&str);
+	OpcodeReturn cmdWalkHolmesAndNPCToCAnimation(const byte *&str);
+	OpcodeReturn cmdWalkNPCToCAnimation(const byte *&str);
+	OpcodeReturn cmdWalkNPCToCoords(const byte *&str);
+	OpcodeReturn cmdWalkHomesAndNPCToCoords(const byte *&str);
 public:
 	TattooTalk(SherlockEngine *vm);
 	virtual ~TattooTalk() {}
-- 
cgit v1.2.3


From f9a2d091e9d3174b767221ce2f1379a6e86e80d0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 21:06:21 -0400
Subject: SHERLOCK: Fix script opcode table lookup

---
 engines/sherlock/talk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 15b64090c7..8d553d65d0 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1164,7 +1164,7 @@ void Talk::doScript(const Common::String &script) {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (_opcodeTable[c]) {
+		} else if (_opcodeTable[c - 128]) {
 			// Handle control code
 			switch ((this->*_opcodeTable[c - 128])(str)) {
 			case RET_EXIT:
-- 
cgit v1.2.3


From 5513f725102ad95b748810328a123d7a90ddd24a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 21:28:12 -0400
Subject: SHERLOCK: Implement cmdSetNPCWalkGraphics method

---
 engines/sherlock/talk.cpp | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 8d553d65d0..3e3fccee30 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1164,7 +1164,7 @@ void Talk::doScript(const Common::String &script) {
 			// Start of comment, so skip over it
 			while (*str++ != '}')
 				;
-		} else if (_opcodeTable[c - 128]) {
+		} else if (c >= 128 && c <= 227 && _opcodeTable[c - 128]) {
 			// Handle control code
 			switch ((this->*_opcodeTable[c - 128])(str)) {
 			case RET_EXIT:
@@ -1789,7 +1789,14 @@ ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) {
 		(OpcodeMethod)&ScalpelTalk::cmdEnableEndKey,
 		(OpcodeMethod)&ScalpelTalk::cmdDisableEndKey,
 		
-		(OpcodeMethod)&ScalpelTalk::cmdCarriageReturn
+		(OpcodeMethod)&ScalpelTalk::cmdCarriageReturn,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 	};
 
 	_opcodeTable = OPCODE_METHODS;
@@ -2065,7 +2072,29 @@ OpcodeReturn TattooTalk::cmdSetNPCVerb(const byte *&str) { error("TODO: script o
 OpcodeReturn TattooTalk::cmdSetNPCVerbCAnimation(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetNPCVerbScript(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetNPCVerbTarget(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdSetNPCWalkGraphics(const byte *&str) { error("TODO: script opcode"); }
+
+OpcodeReturn TattooTalk::cmdSetNPCWalkGraphics(const byte *&str) {
+	++str;
+	int npc = *str - 1;
+	People &people = *_vm->_people;
+	Person &person = people[npc];
+
+	// Build up walk library name for the given NPC
+	person._walkVGSName = "";
+	for (int idx = 0; idx < 8; ++idx) {
+		if (str[idx + 1] != '~')
+			person._walkVGSName += str[idx + 1];
+		else
+			break;
+	}
+	person._walkVGSName += ".VGS";
+
+	people._forceWalkReload = true;
+	str += 8;
+
+	return RET_SUCCESS;
+}
+
 OpcodeReturn TattooTalk::cmdSetSceneEntryFlag(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetTalkSequence(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetWalkControl(const byte *&str) { error("TODO: script opcode"); }
-- 
cgit v1.2.3


From 1f9f01c5714930e96eb7713c74fe826fe85d1457 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 21:34:35 -0400
Subject: SHERLOCK: Implement cmdNextSong

---
 engines/sherlock/talk.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 3e3fccee30..22e77fb869 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -2051,7 +2051,24 @@ TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm) {
 }
 
 OpcodeReturn TattooTalk::cmdMouseOnOff(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdNextSong(const byte *&str) { error("TODO: script opcode"); }
+
+OpcodeReturn TattooTalk::cmdNextSong(const byte *&str) {
+	Sound &sound = *_vm->_sound;
+
+	// Get the name of the next song to play
+	++str;
+	sound._nextSongName = "";
+	for (int idx = 0; idx < 8; ++idx) {
+		if (str[idx] != '~')
+			sound._nextSongName += str[idx];
+		else
+			break;
+	}
+	str += 7;
+
+	return RET_SUCCESS;
+}
+
 OpcodeReturn TattooTalk::cmdNPCLabelGoto(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdNPCLabelIfFlagGoto(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) { error("TODO: script opcode"); }
-- 
cgit v1.2.3


From 8331fa886f4fa9031de17652632b3a12e1f84f06 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 22:33:41 -0400
Subject: SHERLOCK: Fix People data initialization and general start fixes

---
 engines/sherlock/events.cpp          |   2 +
 engines/sherlock/objects.h           | 121 +++++++++++++++++++++--------------
 engines/sherlock/people.cpp          |  79 ++++++++++++++---------
 engines/sherlock/scalpel/scalpel.cpp |   1 -
 engines/sherlock/talk.cpp            |  12 +++-
 5 files changed, 135 insertions(+), 80 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 94ddc9a792..c2015079a8 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -42,6 +42,8 @@ Events::Events(SherlockEngine *vm) {
 	_pressed = _released = false;
 	_rightPressed = _rightReleased = false;
 	_oldButtons = _oldRightButton = false;
+
+	loadCursors("rmouse.vgs");
 }
 
 Events::~Events() {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index f1047628e4..2a0de7f26e 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -116,12 +116,43 @@ struct WalkSequence {
 	void load(Common::SeekableReadStream &s);
 };
 
+enum { REVERSE_DIRECTION = 0x80 };
+#define NAMES_COUNT 4
+
+struct ActionType {
+	int _cAnimNum;
+	int _cAnimSpeed;
+	Common::String _names[NAMES_COUNT];
+
+	/**
+	 * Load the data for the action
+	 */
+	void load(Common::SeekableReadStream &s);
+};
+
+struct UseType {
+	int _cAnimNum;
+	int _cAnimSpeed;
+	Common::String _names[NAMES_COUNT];
+	int _useFlag;					// Which flag USE will set (if any)
+	Common::String _target;
+	Common::String _verb;
+
+	UseType();
+
+	/**
+	 * Load the data for the UseType
+	 */
+	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
+};
+
+
 class Sprite {
 private:
 	static SherlockEngine *_vm;
 public:
-	Common::String _name;				
-	Common::String _description;		
+	Common::String _name;
+	Common::String _description;
 	Common::String _examine;			// Examine in-depth description
 	Common::String _pickUp;				// Message for if you can't pick up object
 
@@ -142,73 +173,69 @@ public:
 	int _status;						// Status: open/closed, moved/not moved
 	int8 _misc;							// Miscellaneous use
 	int _numFrames;						// How many frames the object has
-	ImageFile *_altImages;
-	bool _altSequences;
+
+	// Rose Tattoo fields
+	int _startSeq;						// Frame sequence starts at
+	int _flags;							// Flags for the sprite
+	int _aType;							// Tells if this is an object, person, talk, etc.
+	int _lookFrames;					// How many frames to play of a canim before pausing
+	int _seqCounter;					// How many times the sequence has been run
+	Common::Point _lookPosition;		// Where to look when examining object
+	int _lookFacing;					// Direction to face when examining object
+	int _lookCAnim;
+	int _seqStack;						// Allow gosubs to return to calling frame
+	int _seqTo;							// Allows 1-5, 8-3 type sequences encoded in 2 bytes
+	uint _descOffset;					// Tells where description starts in description text for scene
+	int _seqCounter2;					// Counter of calling frame sequence
+	uint _seqSize;						// Size of sequence
+	UseType _use[6];
+	int _quickDraw;						// Flag telling whether to use quick draw routine or not
+	int _scaleVal;						// Tells how to scale the sprite
+	int _requiredFlags1;				// This flag must also be set, or the sprite is hidden
+	int _gotoSeq;						// Used by Talk to tell which sequence to goto when able
+	int _talkSeq;						// Tells which talk sequence currently in use (Talk or Listen)
+	int _restoreSlot;					// Used when talk returns to the previous sequence
+
 	ImageFrame *_stopFrames[8];			// Stop/rest frame for each direction
+	ImageFile *_altImages;				// Images used for alternate NPC sequences
+	bool _altSequences;					// Which of the sequences the alt graphics apply to (0: main, 1=NPC seq)
+	int _centerWalk;					// Flag telling the walk code to offset the walk destination
+	Common::Point _adjust;				// Fine tuning adjustment to position when drawn
+	int _oldWalkSequence;
 public:
 	Sprite() { clear(); }
 
 	static void setVm(SherlockEngine *vm) { _vm = vm; }
 
 	/**
-	 * Reset the data for the sprite
-	 */
+	* Reset the data for the sprite
+	*/
 	void clear();
 
 	/**
-	 * Updates the image frame poiner for the sprite
-	 */
+	* Updates the image frame poiner for the sprite
+	*/
 	void setImageFrame();
 
 	/**
-	 * This adjusts the sprites position, as well as it's animation sequence:
-	 */
+	* This adjusts the sprites position, as well as it's animation sequence:
+	*/
 	void adjustSprite();
 
 	/**
-	 * Checks the sprite's position to see if it's collided with any special objects
-	 */
+	* Checks the sprite's position to see if it's collided with any special objects
+	*/
 	void checkSprite();
 
 	/**
-	 * Return frame width
-	 */
+	* Return frame width
+	*/
 	int frameWidth() const { return _imageFrame ? _imageFrame->_frame.w : 0; }
-	
-	/**
-	 * Return frame height
-	 */
-	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
-};
-
-enum { REVERSE_DIRECTION = 0x80 };
-#define NAMES_COUNT 4
-
-struct ActionType {
-	int _cAnimNum;
-	int _cAnimSpeed;
-	Common::String _names[NAMES_COUNT];
-
-	/**
-	 * Load the data for the action
-	 */
-	void load(Common::SeekableReadStream &s);
-};
-
-struct UseType {
-	int _cAnimNum;
-	int _cAnimSpeed;
-	Common::String _names[NAMES_COUNT];
-	int _useFlag;					// Which flag USE will set (if any)
-	Common::String _target;
-	Common::String _verb;
-
-	UseType();
 
 	/**
-	 * Load the data for the UseType
-	 */
-	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
+	* Return frame height
+	*/
+	int frameHeight() const { return _imageFrame ? _imageFrame->_frame.h : 0; }
 };
 
 enum { OBJ_BEHIND = 1, OBJ_FLIPPED = 2, OBJ_FORWARD = 4, TURNON_OBJ = 0x20, TURNOFF_OBJ = 0x40 };
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 7879f29105..c03dde80ad 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -124,36 +124,55 @@ People::~People() {
 }
 
 void People::reset() {
-	// Note: The engine has theoretical support for two player characters but only the first one is used.
-	// Watson is, instead, handled by a different sprite in each scene, with a very simple initial movement, if any
-	Sprite &p = _data[PLAYER];
-
-	p._description = "Sherlock Holmes!";
-	p._type = CHARACTER;
-	p._position = Common::Point(10000, 11000);
-	p._sequenceNumber = STOP_DOWNRIGHT;
-	p._imageFrame = nullptr;
-	p._frameNumber = 1;
-	p._delta = Common::Point(0, 0);
-	p._oldPosition = Common::Point(0, 0);
-	p._oldSize = Common::Point(0, 0);
-	p._misc = 0;
-	p._walkCount = 0;
-	p._pickUp = "";
-	p._allow = 0;
-	p._noShapeSize = Common::Point(0, 0);
-	p._goto = Common::Point(0, 0);
-	p._status = 0;
-
-	// Load the default walk sequences
-	p._walkSequences.resize(MAX_HOLMES_SEQUENCE);
-	for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) {
-		p._walkSequences[idx]._sequences.clear();
-		
-		const byte *pSrc = &CHARACTER_SEQUENCES[idx][0];
-		do {
-			p._walkSequences[idx]._sequences.push_back(*pSrc);
-		} while (*pSrc++);
+	_data[0]._description = "Sherlock Holmes!";
+
+	// Note: Serrated Scalpel only uses a single Person slot for Sherlock.. Watson is handled by scene sprites
+	int count = IS_SERRATED_SCALPEL ? 1 : MAX_PLAYERS;
+	for (int idx = 0; idx < count; ++idx) {
+		Sprite &p = _data[idx];
+
+		p._type = (idx == 0) ? CHARACTER : INVALID;
+		if (IS_SERRATED_SCALPEL)
+			p._position = Point32(10000, 11000);
+		else
+			p._position = Point32(36000, 29000);
+
+		p._sequenceNumber = STOP_DOWNRIGHT;
+		p._imageFrame = nullptr;
+		p._frameNumber = 1;
+		p._delta = Common::Point(0, 0);
+		p._oldPosition = Common::Point(0, 0);
+		p._oldSize = Common::Point(0, 0);
+		p._misc = 0;
+		p._walkCount = 0;
+		p._pickUp = "";
+		p._allow = 0;
+		p._noShapeSize = Common::Point(0, 0);
+		p._goto = Common::Point(0, 0);
+		p._status = 0;
+		p._seqTo = 0;
+		p._seqCounter = p._seqCounter2 = 0;
+		p._seqStack = 0;
+		p._gotoSeq = p._talkSeq = 0;
+		p._restoreSlot = 0;
+		p._startSeq = 0;
+		p._walkSequences.clear();
+		p._altImages = nullptr;
+		p._altSequences = 0;
+		p._centerWalk = true;
+		p._adjust = Common::Point(0, 0);
+
+		// Load the default walk sequences
+		p._oldWalkSequence = -1;
+		p._walkSequences.resize(MAX_HOLMES_SEQUENCE);
+		for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) {
+			p._walkSequences[idx]._sequences.clear();
+
+			const byte *pSrc = &CHARACTER_SEQUENCES[idx][0];
+			do {
+				p._walkSequences[idx]._sequences.push_back(*pSrc);
+			} while (*pSrc++);
+		}
 	}
 
 	// Reset any walk path in progress when Sherlock leaves scenes
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 2a107b4d5e..6b72188146 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -813,7 +813,6 @@ void ScalpelEngine::startScene() {
 		break;
 	}
 
-	_events->loadCursors("rmouse.vgs");
 	_events->setCursor(ARROW);
 
 	if (_scene->_goToScene == 99) {
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 22e77fb869..e3f8c7b8dd 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1577,12 +1577,20 @@ OpcodeReturn Talk::cmdGotoScene(const byte *&str) {
 }
 
 OpcodeReturn Talk::cmdHolmesOff(const byte *&str) {
-	_vm->_people->_holmesOn = false;
+	People &people = *_vm->_people;
+	people._holmesOn = false;
+	if (IS_ROSE_TATTOO)
+		people[PLAYER]._type = REMOVE;
+
 	return RET_SUCCESS;
 }
 
 OpcodeReturn Talk::cmdHolmesOn(const byte *&str) {
-	_vm->_people->_holmesOn = true;
+	People &people = *_vm->_people;
+	people._holmesOn = true;
+	if (IS_ROSE_TATTOO)
+		people[PLAYER]._type = CHARACTER;
+
 	return RET_SUCCESS;
 }
 
-- 
cgit v1.2.3


From ef4d8be853cf681f3c58db6daec78209982e5f5a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 23:15:33 -0400
Subject: SHERLOCK: Fix display of first RT scene background

---
 engines/sherlock/scene.cpp          | 8 ++++++--
 engines/sherlock/screen.cpp         | 1 +
 engines/sherlock/sherlock.cpp       | 4 +++-
 engines/sherlock/user_interface.cpp | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 0f679d732f..0b4cd4edda 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -615,8 +615,12 @@ bool Scene::loadScene(const Common::String &filename) {
 	if (!_vm->isDemo()) {
 		// Reset the previous map location and position on overhead map
 		map._oldCharPoint = _currentScene;
-		map._overPos.x = map[_currentScene].x * 100 - 600;
-		map._overPos.y = map[_currentScene].y * 100 + 900;
+
+		if (IS_SERRATED_SCALPEL) {
+			map._overPos.x = map[_currentScene].x * 100 - 600;
+			map._overPos.y = map[_currentScene].y * 100 + 900;
+
+		}
 	}
 
 	events.clearEvents();
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index bb9dbd7ec4..4dd91cfa78 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -182,6 +182,7 @@ void Screen::randomTransition() {
 	Events &events = *_vm->_events;
 	const int TRANSITION_MULTIPLIER = 0x15a4e35;
 	_dirtyRects.clear();
+	assert(IS_SERRATED_SCALPEL);
 
 	for (int idx = 0; idx <= 65535 && !_vm->shouldQuit(); ++idx) {
 		_transitionSeed = _transitionSeed * TRANSITION_MULTIPLIER + 1;
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 14f24333e0..497841faac 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -207,7 +207,9 @@ void SherlockEngine::loadConfig() {
 	ConfMan.registerDefault("font", 1);
 
 	_screen->setFont(ConfMan.getInt("font"));
-	_screen->_fadeStyle = ConfMan.getBool("fade_style");
+	if (getGameID() == GType_SerratedScalpel)
+		_screen->_fadeStyle = ConfMan.getBool("fade_style");
+
 	_ui->_helpStyle = ConfMan.getBool("help_style");
 	_ui->_slideWindows = ConfMan.getBool("window_style");
 	_people->_portraitsOn = ConfMan.getBool("portraits_on");
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 7a6722a218..4f83e9151a 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2304,6 +2304,7 @@ TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm)
 
 void TattooUserInterface::handleInput() {
 	// TODO
+	_vm->_events->pollEventsAndWait();
 }
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 40afa013696a5cebd88c3fd566175ca001d6f310 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 24 May 2015 23:38:23 -0400
Subject: SHERLOCK: Fix palette for RT scene

---
 engines/sherlock/scene.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 0b4cd4edda..989927b9ba 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -321,7 +321,8 @@ bool Scene::loadScene(const Common::String &filename) {
 
 		if (IS_ROSE_TATTOO) {
 			screen.initPaletteFade(bgHeader._bytesWritten);
-			screen.fadeRead(*rrmStream, screen._cMap, PALETTE_SIZE);
+			rrmStream->read(screen._cMap, PALETTE_SIZE);
+			screen.translatePalette(screen._cMap);
 			screen.setupBGArea(screen._cMap);
 
 			screen.initScrollVars();
-- 
cgit v1.2.3


From bcb8c02ba178b79b8352bb58f38f429f7f39928c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 May 2015 08:21:57 -0400
Subject: SHERLOCK: Free freeing and resetting People list

---
 engines/sherlock/objects.cpp |  9 +++++++--
 engines/sherlock/people.cpp  | 21 +++++++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 0709f6b7a9..31a209fea3 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -73,11 +73,16 @@ void Sprite::setImageFrame() {
 	int imageNumber = _walkSequences[_sequenceNumber][frameNum];
 	
 	if (IS_SERRATED_SCALPEL)
-		imageNumber = imageNumber + +_walkSequences[_sequenceNumber][0] - 2;
+		imageNumber = imageNumber + _walkSequences[_sequenceNumber][0] - 2;
 	else if (imageNumber > _numFrames)
 		imageNumber = 1;
 
-	_imageFrame = &(_altSequences ? *_altImages : *_images)[imageNumber];
+	// Get the images to use
+	ImageFile *images = _altSequences ? _altImages : _images;
+	assert(images);
+
+	// Set the frame pointer
+	_imageFrame = &(*images)[imageNumber];
 }
 
 void Sprite::adjustSprite() {
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index c03dde80ad..083e3c8d4c 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -164,14 +164,17 @@ void People::reset() {
 
 		// Load the default walk sequences
 		p._oldWalkSequence = -1;
-		p._walkSequences.resize(MAX_HOLMES_SEQUENCE);
-		for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) {
-			p._walkSequences[idx]._sequences.clear();
-
-			const byte *pSrc = &CHARACTER_SEQUENCES[idx][0];
-			do {
-				p._walkSequences[idx]._sequences.push_back(*pSrc);
-			} while (*pSrc++);
+		
+		if (IS_SERRATED_SCALPEL) {
+			p._walkSequences.resize(MAX_HOLMES_SEQUENCE);
+			for (int seqIdx = 0; seqIdx < MAX_HOLMES_SEQUENCE; ++seqIdx) {
+				p._walkSequences[seqIdx]._sequences.clear();
+
+				const byte *pSrc = &CHARACTER_SEQUENCES[seqIdx][0];
+				do {
+					p._walkSequences[seqIdx]._sequences.push_back(*pSrc);
+				} while (*pSrc++);
+			}
 		}
 	}
 
@@ -259,6 +262,8 @@ bool People::freeWalk() {
 		if (_data[idx]._walkLoaded) {
 			delete _data[idx]._images;
 			_data[idx]._images = nullptr;
+			
+			_data[idx]._walkLoaded = false;
 			result = true;
 		}
 	}
-- 
cgit v1.2.3


From 1a1010f0ab4164bb615283f9c332afbf97f702ca Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 May 2015 11:04:34 -0400
Subject: SHERLOCK: Cleanup of checkBgShapes and updateBackground

---
 engines/sherlock/people.cpp | 10 +++---
 engines/sherlock/people.h   | 13 +++-----
 engines/sherlock/scene.cpp  | 81 +++++++++++++++++++++++++++------------------
 engines/sherlock/scene.h    |  6 +++-
 engines/sherlock/sherlock.h |  2 +-
 engines/sherlock/talk.cpp   |  8 ++---
 6 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 083e3c8d4c..bac147f489 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -114,7 +114,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 }
 
 People::~People() {
-	for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
 		if (_data[idx]._walkLoaded)
 			delete _data[PLAYER]._images;
 	}
@@ -127,7 +127,7 @@ void People::reset() {
 	_data[0]._description = "Sherlock Holmes!";
 
 	// Note: Serrated Scalpel only uses a single Person slot for Sherlock.. Watson is handled by scene sprites
-	int count = IS_SERRATED_SCALPEL ? 1 : MAX_PLAYERS;
+	int count = IS_SERRATED_SCALPEL ? 1 : MAX_CHARACTERS;
 	for (int idx = 0; idx < count; ++idx) {
 		Sprite &p = _data[idx];
 
@@ -197,7 +197,7 @@ bool People::loadWalk() {
 			result = true;
 		}
 	} else {
-		for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+		for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
 			if (!_data[idx]._walkLoaded && (_data[idx]._type == CHARACTER || _data[idx]._type == HIDDEN_CHARACTER)) {
 				if (_data[idx]._type == HIDDEN_CHARACTER)
 					_data[idx]._type = INVALID;
@@ -258,7 +258,7 @@ bool People::loadWalk() {
 bool People::freeWalk() {
 	bool result = false;
 
-	for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
 		if (_data[idx]._walkLoaded) {
 			delete _data[idx]._images;
 			_data[idx]._images = nullptr;
@@ -700,7 +700,7 @@ void People::synchronize(Common::Serializer &s) {
 		s.syncAsSint16LE(_player._position.y);
 		s.syncAsSint16LE(_player._sequenceNumber);
 	} else {
-		for (int idx = 0; idx < MAX_PLAYERS; ++idx) {
+		for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
 			Person &p = _data[idx];
 			s.syncAsSint16LE(p._position.x);
 			s.syncAsSint16LE(p._position.y);
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index a1968785db..72bdc515b7 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -34,7 +34,7 @@ enum PeopleId {
 	PLAYER			= 0,
 	AL				= 0,
 	PEG				= 1,
-	MAX_PLAYERS		= 6,
+	MAX_CHARACTERS		= 6,
 	MAX_NPC			= 5,
 	MAX_NPC_PATH	= 200
 };
@@ -92,7 +92,7 @@ class SherlockEngine;
 class People {
 private:
 	SherlockEngine *_vm;
-	Person _data[MAX_PLAYERS];
+	Person _data[MAX_CHARACTERS];
 	int _oldWalkSequence;
 	int _srcZone, _destZone;
 public:
@@ -120,19 +120,14 @@ public:
 	~People();
 
 	Person &operator[](PeopleId id) {
-		assert(id < MAX_PLAYERS);
+		assert(id < MAX_CHARACTERS);
 		return _data[id];
 	}
 	Person &operator[](int idx) {
-		assert(idx < MAX_PLAYERS);
+		assert(idx < MAX_CHARACTERS);
 		return _data[idx];
 	}
 
-	/**
-	 * Returns true if Sherlock is visible on the screen and enabled
-	 */
-	bool isHolmesActive() const { return _data[0]._walkLoaded && _holmesOn; }
-
 	/**
 	 * Reset the player data
 	 */
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 989927b9ba..d7519d5c47 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -833,11 +833,14 @@ void Scene::transitionToScene() {
 
 	updateBackground();
 
+	// Actually do the transition
 	if (screen._fadeStyle)
 		screen.randomTransition();
 	else
 		screen.blitFrom(screen._backBuffer1);
+	screen.update();
 
+	// Start any initial animation for the scene
 	if (cAnimNum != -1) {
 		CAnim &c = _cAnim[cAnimNum];
 		Common::Point pt = c._goto;
@@ -865,19 +868,26 @@ int Scene::toggleObject(const Common::String &name) {
 
 void Scene::updateBackground() {
 	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Sprite &player = people[AL];
-
-	// Restrict drawing window
-	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 
 	// Update Holmes if he's turned on
-	if (people._holmesOn)
-		player.adjustSprite();
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+		if (people[idx]._type == CHARACTER)
+			people[idx].adjustSprite();
+	}
 
 	// Flag the bg shapes which need to be redrawn
-	checkBgShapes(player._imageFrame, Common::Point(player._position.x / 100,
-		player._position.y / 100));
+	checkBgShapes();
+
+	// Draw the shapes for the scene
+	drawAllShapes();
+}
+
+void Scene::drawAllShapes() {
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+
+	// Restrict drawing window
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 
 	// Draw all active shapes which are behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
@@ -889,7 +899,7 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == BEHIND)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame,
-				_canimShapes[idx]._position, _canimShapes[idx]._flags & OBJ_FLIPPED);
+			_canimShapes[idx]._position, _canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all active shapes which are normal and behind the person
@@ -902,33 +912,37 @@ void Scene::updateBackground() {
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if (_canimShapes[idx]._type == ACTIVE_BG_SHAPE && _canimShapes[idx]._misc == NORMAL_BEHIND)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
-				_canimShapes[idx]._flags & OBJ_FLIPPED);
+			_canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
-	// Draw the player if he's active
-	if (player._type == CHARACTER && people.isHolmesActive()) {
-		bool flipped = player._sequenceNumber == WALK_LEFT || player._sequenceNumber == STOP_LEFT ||
-			player._sequenceNumber == WALK_UPLEFT || player._sequenceNumber == STOP_UPLEFT ||
-			player._sequenceNumber == WALK_DOWNRIGHT || player._sequenceNumber == STOP_DOWNRIGHT;
+	// Draw any active characters
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+		Person &p = people[idx];
+		if (p._type == CHARACTER && p._walkLoaded) {
+			bool flipped = IS_SERRATED_SCALPEL && (
+				p._sequenceNumber == WALK_LEFT || p._sequenceNumber == STOP_LEFT ||
+				p._sequenceNumber == WALK_UPLEFT || p._sequenceNumber == STOP_UPLEFT ||
+				p._sequenceNumber == WALK_DOWNRIGHT || p._sequenceNumber == STOP_DOWNRIGHT);
 
-		screen._backBuffer->transBlitFrom(*player._imageFrame, Common::Point(player._position.x / 100,
-			player._position.y / 100 - player.frameHeight()), flipped);
+			screen._backBuffer->transBlitFrom(*p._imageFrame, Common::Point(p._position.x / 100,
+				p._position.y / 100 - p.frameHeight()), flipped);
+		}
 	}
 
 	// Draw all static and active shapes that are NORMAL and are in front of the player
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
-				_bgShapes[idx]._misc == NORMAL_FORWARD)
+			_bgShapes[idx]._misc == NORMAL_FORWARD)
 			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position,
-				_bgShapes[idx]._flags & OBJ_FLIPPED);
+			_bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active canimations that are NORMAL and are in front of the player
 	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
-				_canimShapes[idx]._misc == NORMAL_FORWARD)
+			_canimShapes[idx]._misc == NORMAL_FORWARD)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
-				_canimShapes[idx]._flags & OBJ_FLIPPED);
+			_canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active shapes that are FORWARD
@@ -938,9 +952,9 @@ void Scene::updateBackground() {
 			_bgShapes[idx].frameHeight());
 
 		if ((_bgShapes[idx]._type == ACTIVE_BG_SHAPE || _bgShapes[idx]._type == STATIC_BG_SHAPE) &&
-				_bgShapes[idx]._misc == FORWARD)
+			_bgShapes[idx]._misc == FORWARD)
 			screen._backBuffer->transBlitFrom(*_bgShapes[idx]._imageFrame, _bgShapes[idx]._position,
-				_bgShapes[idx]._flags & OBJ_FLIPPED);
+			_bgShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	// Draw all static and active canimations that are forward
@@ -948,7 +962,7 @@ void Scene::updateBackground() {
 		if ((_canimShapes[idx]._type == ACTIVE_BG_SHAPE || _canimShapes[idx]._type == STATIC_BG_SHAPE) &&
 			_canimShapes[idx]._misc == FORWARD)
 			screen._backBuffer->transBlitFrom(*_canimShapes[idx]._imageFrame, _canimShapes[idx]._position,
-				_canimShapes[idx]._flags & OBJ_FLIPPED);
+			_canimShapes[idx]._flags & OBJ_FLIPPED);
 	}
 
 	screen.resetDisplayBounds();
@@ -963,7 +977,11 @@ Exit *Scene::checkForExit(const Common::Rect &r) {
 	return nullptr;
 }
 
-void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
+void Scene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / 100, holmes._position.y / 100);
+
 	// Iterate through the shapes
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		Object &obj = _bgShapes[idx];
@@ -986,11 +1004,9 @@ void Scene::checkBgShapes(ImageFrame *frame, const Common::Point &pt) {
 			if ((obj._flags & 5) == 1) {
 				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
 				NORMAL_FORWARD : NORMAL_BEHIND;
-			}
-			else if (!(obj._flags & 1)) {
+			} else if (!(obj._flags & 1)) {
 				obj._misc = BEHIND;
-			}
-			else if (obj._flags & 4) {
+			} else if (obj._flags & 4) {
 				obj._misc = FORWARD;
 			}
 		}
@@ -1345,8 +1361,7 @@ void Scene::doBgAnim() {
 		people[AL].adjustSprite();
 
 	// Flag the bg shapes which need to be redrawn
-	checkBgShapes(people[AL]._imageFrame,
-		Common::Point(people[AL]._position.x / 100, people[AL]._position.y / 100));
+	checkBgShapes();
 
 	if (_currentScene == 12 && IS_SERRATED_SCALPEL)
 		((Scalpel::ScalpelEngine *)_vm)->doMirror12();
@@ -1382,7 +1397,7 @@ void Scene::doBgAnim() {
 	}
 
 	// Draw the person if not animating
-	if (people[AL]._type == CHARACTER && people.isHolmesActive()) {
+	if (people[AL]._type == CHARACTER && people[AL]._walkLoaded) {
 		// If Holmes is too far to the right, move him back so he's on-screen
 		int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[AL]._imageFrame->_frame.w;
 		int tempX = MIN(people[AL]._position.x / 100, xRight);
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index b0b5624840..806726868a 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -184,7 +184,7 @@ private:
 	 * it will flag it as needing to be drawn. If a non-animating shape is
 	 * colliding with another shape, it will also flag it as needing drawing
 	 */
-	void checkBgShapes(ImageFrame *frame, const Common::Point &pt);
+	void checkBgShapes();
 
 	/**
 	 * Restores objects to the correct status. This ensures that things like being opened or moved
@@ -192,6 +192,10 @@ private:
 	 */
 	void saveSceneStatus();
 
+	/**
+	 * Draw all the shapes, people and NPCs in the correct order
+	 */
+	void drawAllShapes();
 public:
 	int _currentScene;
 	int _goToScene;
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index bf8c0d6aaf..467f20e381 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -60,7 +60,7 @@ enum GameType {
 
 #define SHERLOCK_SCREEN_WIDTH _vm->_screen->w()
 #define SHERLOCK_SCREEN_HEIGHT _vm->_screen->h()
-#define SHERLOCK_SCENE_HEIGHT 138
+#define SHERLOCK_SCENE_HEIGHT (IS_SERRATED_SCALPEL ? 138 : 480)
 
 struct SherlockGameDescription;
 
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index e3f8c7b8dd..b4be5eed8b 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1578,18 +1578,14 @@ OpcodeReturn Talk::cmdGotoScene(const byte *&str) {
 
 OpcodeReturn Talk::cmdHolmesOff(const byte *&str) {
 	People &people = *_vm->_people;
-	people._holmesOn = false;
-	if (IS_ROSE_TATTOO)
-		people[PLAYER]._type = REMOVE;
+	people[PLAYER]._type = REMOVE;
 
 	return RET_SUCCESS;
 }
 
 OpcodeReturn Talk::cmdHolmesOn(const byte *&str) {
 	People &people = *_vm->_people;
-	people._holmesOn = true;
-	if (IS_ROSE_TATTOO)
-		people[PLAYER]._type = CHARACTER;
+	people[PLAYER]._type = CHARACTER;
 
 	return RET_SUCCESS;
 }
-- 
cgit v1.2.3


From e1e39ea3d2e358b47fc26cc52244f536ee2a0a01 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 25 May 2015 23:07:11 -0400
Subject: SHERLOCK: Add define for fixed integer multiplier

---
 engines/sherlock/objects.h |  1 +
 engines/sherlock/scene.cpp | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 2a0de7f26e..7fe44c0a23 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -76,6 +76,7 @@ enum {
 
 #define MAX_HOLMES_SEQUENCE 16
 #define MAX_FRAME 30
+#define FIXED_INT_MULTIPLIER 100
 
 // code put into sequences to defines 1-10 type seqs
 #define SEQ_TO_CODE 67
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index d7519d5c47..a1a165e805 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -200,8 +200,8 @@ void Scene::selectScene() {
 		_tempFadeStyle = 0;
 	}
 
-	people._walkDest = Common::Point(people[AL]._position.x / 100,
-		people[AL]._position.y / 100);
+	people._walkDest = Common::Point(people[AL]._position.x / FIXED_INT_MULTIPLIER,
+		people[AL]._position.y / FIXED_INT_MULTIPLIER);
 
 	_restoreFlag = true;
 	events.clearEvents();
@@ -618,8 +618,8 @@ bool Scene::loadScene(const Common::String &filename) {
 		map._oldCharPoint = _currentScene;
 
 		if (IS_SERRATED_SCALPEL) {
-			map._overPos.x = map[_currentScene].x * 100 - 600;
-			map._overPos.y = map[_currentScene].y * 100 + 900;
+			map._overPos.x = (map[_currentScene].x - 6) * FIXED_INT_MULTIPLIER;
+			map._overPos.y = (map[_currentScene].y + 9) * FIXED_INT_MULTIPLIER;
 
 		}
 	}
@@ -761,8 +761,8 @@ void Scene::transitionToScene() {
 		// Otherwise, this is a linked scene or entrance info, and must be translated
 		if (hSavedFacing < 8 && !saves._justLoaded) {
 			hSavedFacing = FS_TRANS[hSavedFacing];
-			hSavedPos.x *= 100;
-			hSavedPos.y *= 100;
+			hSavedPos.x *= FIXED_INT_MULTIPLIER;
+			hSavedPos.y *= FIXED_INT_MULTIPLIER;
 		}
 	}
 
@@ -802,7 +802,8 @@ void Scene::transitionToScene() {
 			}
 
 			if (Common::Rect(topLeft.x, topLeft.y, bottomRight.x, bottomRight.y).contains(
-				Common::Point(people[PLAYER]._position.x / 100, people[PLAYER]._position.y / 100))) {
+					Common::Point(people[PLAYER]._position.x / FIXED_INT_MULTIPLIER, 
+					people[PLAYER]._position.y / FIXED_INT_MULTIPLIER))) {
 				// Current point is already inside box - impact occurred on
 				// a previous call. So simply do nothing except talk until the
 				// player is clear of the box
@@ -924,8 +925,8 @@ void Scene::drawAllShapes() {
 				p._sequenceNumber == WALK_UPLEFT || p._sequenceNumber == STOP_UPLEFT ||
 				p._sequenceNumber == WALK_DOWNRIGHT || p._sequenceNumber == STOP_DOWNRIGHT);
 
-			screen._backBuffer->transBlitFrom(*p._imageFrame, Common::Point(p._position.x / 100,
-				p._position.y / 100 - p.frameHeight()), flipped);
+			screen._backBuffer->transBlitFrom(*p._imageFrame, Common::Point(p._position.x / FIXED_INT_MULTIPLIER,
+				p._position.y / FIXED_INT_MULTIPLIER - p.frameHeight()), flipped);
 		}
 	}
 
@@ -980,7 +981,7 @@ Exit *Scene::checkForExit(const Common::Rect &r) {
 void Scene::checkBgShapes() {
 	People &people = *_vm->_people;
 	Person &holmes = people._player;
-	Common::Point pt(holmes._position.x / 100, holmes._position.y / 100);
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
 
 	// Iterate through the shapes
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
@@ -1400,13 +1401,13 @@ void Scene::doBgAnim() {
 	if (people[AL]._type == CHARACTER && people[AL]._walkLoaded) {
 		// If Holmes is too far to the right, move him back so he's on-screen
 		int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[AL]._imageFrame->_frame.w;
-		int tempX = MIN(people[AL]._position.x / 100, xRight);
+		int tempX = MIN(people[AL]._position.x / FIXED_INT_MULTIPLIER, xRight);
 
 		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT ||
 			people[AL]._sequenceNumber == WALK_UPLEFT || people[AL]._sequenceNumber == STOP_UPLEFT ||
 			people[AL]._sequenceNumber == WALK_DOWNRIGHT || people[AL]._sequenceNumber == STOP_DOWNRIGHT;
 		screen._backBuffer->transBlitFrom(*people[AL]._imageFrame,
-			Common::Point(tempX, people[AL]._position.y / 100 - people[AL]._imageFrame->_frame.h), flipped);
+			Common::Point(tempX, people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL]._imageFrame->_frame.h), flipped);
 	}
 
 	// Draw all static and active shapes are NORMAL and are in front of the person
@@ -1466,8 +1467,8 @@ void Scene::doBgAnim() {
 				people[AL]._type = INVALID;
 			} else {
 				screen.flushImage(people[AL]._imageFrame,
-					Common::Point(people[AL]._position.x / 100,
-						people[AL]._position.y / 100 - people[AL].frameHeight()),
+					Common::Point(people[AL]._position.x / FIXED_INT_MULTIPLIER,
+						people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL].frameHeight()),
 					&people[AL]._oldPosition.x, &people[AL]._oldPosition.y,
 					&people[AL]._oldSize.x, &people[AL]._oldSize.y);
 			}
-- 
cgit v1.2.3


From 06addfc4041b3e20fd89dee46227e04f1c66fe52 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Tue, 26 May 2015 13:23:20 +1000
Subject: AGOS: Add updated patch for #647 - Simon 1 DOS Adlib instrument bank

---
 engines/agos/midi.cpp | 67 ++++++++++++++++++++++++++++++++++++++++++++++++---
 engines/agos/midi.h   |  4 +++
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 045fd9dac5..e5875a8353 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -42,6 +42,8 @@ MidiPlayer::MidiPlayer() {
 	_driver = 0;
 	_map_mt32_to_gm = false;
 
+	_adlibPatches = NULL;
+
 	_enable_sfx = true;
 	_current = 0;
 
@@ -68,6 +70,7 @@ MidiPlayer::~MidiPlayer() {
 	}
 	_driver = NULL;
 	clearConstructs();
+	unloadAdlibPatches();
 }
 
 int MidiPlayer::open(int gameType) {
@@ -85,6 +88,12 @@ int MidiPlayer::open(int gameType) {
 	if (_nativeMT32)
 		_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 
+	/* Disabled due to not sounding right, and low volume level
+	if (gameType == GType_SIMON1 && MidiDriver::getMusicType(dev) == MT_ADLIB) {
+			loadAdlibPatches();
+	}
+	*/
+
 	_map_mt32_to_gm = (gameType != GType_SIMON2 && !_nativeMT32);
 
 	int ret = _driver->open();
@@ -114,8 +123,10 @@ void MidiPlayer::send(uint32 b) {
 		else if (_current == &_music)
 			volume = volume * _musicVolume / 255;
 		b = (b & 0xFF00FFFF) | (volume << 16);
-	} else if ((b & 0xF0) == 0xC0 && _map_mt32_to_gm) {
-		b = (b & 0xFFFF00FF) | (MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8);
+	} else if ((b & 0xF0) == 0xC0) {
+		if (_map_mt32_to_gm && !_adlibPatches) {
+			b = (b & 0xFFFF00FF) | (MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8);
+		}
 	} else if ((b & 0xFFF0) == 0x007BB0) {
 		// Only respond to an All Notes Off if this channel
 		// has already been allocated.
@@ -144,7 +155,16 @@ void MidiPlayer::send(uint32 b) {
 			else if (_current == &_music)
 				_current->channel[9]->volume(_current->volume[9] * _musicVolume / 255);
 		}
-		_current->channel[channel]->send(b);
+
+		if ((b & 0xF0) == 0xC0 && _adlibPatches) {
+			// NOTE: In the percussion channel, this function is a
+			//       no-op. Any percussion instruments you hear may
+			//       be the stock ones from adlib.cpp.
+			_driver->sysEx_customInstrument(_current->channel[channel]->getNumber(), 'ADL ', _adlibPatches + 30 * ((b >> 8) & 0xFF));
+		} else {
+			_current->channel[channel]->send(b);
+		}
+
 		if ((b & 0xFFF0) == 0x79B0) {
 			// We have received a "Reset All Controllers" message
 			// and passed it on to the MIDI driver. This may or may
@@ -355,6 +375,47 @@ void MidiPlayer::resetVolumeTable() {
 	}
 }
 
+void MidiPlayer::loadAdlibPatches() {
+	Common::File ibk;
+
+	if (!ibk.open("mt_fm.ibk"))
+		return;
+
+	if (ibk.readUint32BE() == 0x49424b1a) {
+		_adlibPatches = new byte[128 * 30];
+		byte *ptr = _adlibPatches;
+
+		memset(_adlibPatches, 0, 128 * 30);
+
+		for (int i = 0; i < 128; i++) {
+			byte instr[16];
+
+			ibk.read(instr, 16);
+
+			ptr[0] = instr[0];   // Modulator Sound Characteristics
+			ptr[1] = instr[2];   // Modulator Scaling/Output Level
+			ptr[2] = ~instr[4];  // Modulator Attack/Decay
+			ptr[3] = ~instr[6];  // Modulator Sustain/Release
+			ptr[4] = instr[8];   // Modulator Wave Select
+			ptr[5] = instr[1];   // Carrier Sound Characteristics
+			ptr[6] = instr[3];   // Carrier Scaling/Output Level
+			ptr[7] = ~instr[5];  // Carrier Attack/Delay
+			ptr[8] = ~instr[7];  // Carrier Sustain/Release
+			ptr[9] = instr[9];   // Carrier Wave Select
+			ptr[10] = instr[10]; // Feedback/Connection
+
+			// The remaining six bytes are reserved for future use
+
+			ptr += 30;
+		}
+	}
+}
+
+void MidiPlayer::unloadAdlibPatches() {
+	delete[] _adlibPatches;
+	_adlibPatches = NULL;
+}
+
 static const int simon1_gmf_size[] = {
 	8900, 12166, 2848, 3442, 4034, 4508, 7064, 9730, 6014, 4742, 3138,
 	6570, 5384, 8909, 6457, 16321, 2742, 8968, 4804, 8442, 7717,
diff --git a/engines/agos/midi.h b/engines/agos/midi.h
index 398e445535..7e78bfef28 100644
--- a/engines/agos/midi.h
+++ b/engines/agos/midi.h
@@ -77,11 +77,15 @@ protected:
 	byte _queuedTrack;
 	bool _loopQueuedTrack;
 
+	byte *_adlibPatches;
+
 protected:
 	static void onTimer(void *data);
 	void clearConstructs();
 	void clearConstructs(MusicInfo &info);
 	void resetVolumeTable();
+	void loadAdlibPatches();
+	void unloadAdlibPatches();
 
 public:
 	bool _enable_sfx;
-- 
cgit v1.2.3


From 0cc79979fc27a097037ca580dda78607080d5ac4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 26 May 2015 08:18:50 -0400
Subject: SHERLOCK: Fix map display

---
 engines/sherlock/map.cpp     |  3 +--
 engines/sherlock/map.h       |  2 +-
 engines/sherlock/objects.cpp | 28 ++++++++++++++++++++++++++++
 engines/sherlock/objects.h   |  7 ++++++-
 engines/sherlock/people.cpp  | 15 +--------------
 engines/sherlock/people.h    |  1 -
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index 4f034d8889..ffbca3fb42 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -293,7 +293,6 @@ void Map::setupSprites() {
 	p._type = CHARACTER;
 	p._position = Common::Point(12400, 5000);
 	p._sequenceNumber = 0;
-	p._walkSequences = _walkSequences;
 	p._images = _shapes;
 	p._imageFrame = nullptr;
 	p._frameNumber = 0;
@@ -306,8 +305,8 @@ void Map::setupSprites() {
 	p._noShapeSize = Common::Point(0, 0);
 	p._goto = Common::Point(28000, 15000);
 	p._status = 0;
+	p._walkSequences = _walkSequences;
 	p.setImageFrame();
-
 	scene._bgShapes.clear();
 }
 
diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h
index 198b31e7d3..e0c7d038c4 100644
--- a/engines/sherlock/map.h
+++ b/engines/sherlock/map.h
@@ -76,7 +76,7 @@ private:
 	ImageFile *_mapCursors;
 	ImageFile *_shapes;
 	ImageFile *_iconShapes;
-	Common::Array<WalkSequence> _walkSequences;
+	WalkSequences _walkSequences;
 	Point32 _lDrawnPos;
 	int _point;
 	bool _placesShown;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 31a209fea3..73387261c8 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -366,6 +366,34 @@ void Sprite::checkSprite() {
 
 /*----------------------------------------------------------------*/
 
+void WalkSequence::load(Common::SeekableReadStream &s) {
+	char buffer[9];
+	s.read(buffer, 9);
+	_vgsName = Common::String(buffer);
+	_horizFlip = s.readByte() != 0;
+
+	_sequences.resize(s.readUint16LE());
+	s.read(&_sequences[0], _sequences.size());
+}
+
+/*----------------------------------------------------------------*/
+
+WalkSequences &WalkSequences::operator=(const WalkSequences &src) {
+	resize(src.size());
+	for (uint idx = 0; idx < size(); ++idx) {
+		const WalkSequence &wSrc = src[idx];
+		WalkSequence &wDest = (*this)[idx];
+		wDest._horizFlip = wSrc._horizFlip;
+
+		wDest._sequences.resize(wSrc._sequences.size());
+		Common::copy(&wSrc._sequences[0], &wSrc._sequences[0] + wSrc._sequences.size(), &wDest._sequences[0]);
+	}
+
+	return *this;
+}
+
+/*----------------------------------------------------------------*/
+
 void ActionType::load(Common::SeekableReadStream &s) {
 	char buffer[12];
 
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 7fe44c0a23..99746c9956 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -117,6 +117,11 @@ struct WalkSequence {
 	void load(Common::SeekableReadStream &s);
 };
 
+class WalkSequences : public Common::Array < WalkSequence > {
+public:
+	WalkSequences &operator=(const WalkSequences &src);
+};
+
 enum { REVERSE_DIRECTION = 0x80 };
 #define NAMES_COUNT 4
 
@@ -157,7 +162,7 @@ public:
 	Common::String _examine;			// Examine in-depth description
 	Common::String _pickUp;				// Message for if you can't pick up object
 
-	Common::Array<WalkSequence> _walkSequences;	// Holds animation sequences
+	WalkSequences _walkSequences;		// Holds animation sequences
 	ImageFile *_images;					// Sprite images
 	ImageFrame *_imageFrame;			// Pointer to shape in the images
 	int _walkCount;						// Character walk counter
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index bac147f489..6beae4817e 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -68,18 +68,6 @@ const char *const WALK_LIB_NAMES[10] = {
 
 /*----------------------------------------------------------------*/
 
-void WalkSequence::load(Common::SeekableReadStream &s) {
-	char buffer[9];
-	s.read(buffer, 9);
-	_vgsName = Common::String(buffer);
-	_horizFlip = s.readByte() != 0;
-
-	_sequences.resize(s.readUint16LE());
-	s.read(&_sequences[0], _sequences.size());
-}
-
-/*----------------------------------------------------------------*/
-
 Person::Person() : Sprite(), _walkLoaded(false), _npcIndex(0), _npcStack(0), _npcPause(false)  {
 	Common::fill(&_npcPath[0], &_npcPath[MAX_NPC_PATH], 0);
 }
@@ -156,7 +144,6 @@ void People::reset() {
 		p._gotoSeq = p._talkSeq = 0;
 		p._restoreSlot = 0;
 		p._startSeq = 0;
-		p._walkSequences.clear();
 		p._altImages = nullptr;
 		p._altSequences = 0;
 		p._centerWalk = true;
@@ -164,7 +151,7 @@ void People::reset() {
 
 		// Load the default walk sequences
 		p._oldWalkSequence = -1;
-		
+		p._walkSequences.clear();
 		if (IS_SERRATED_SCALPEL) {
 			p._walkSequences.resize(MAX_HOLMES_SEQUENCE);
 			for (int seqIdx = 0; seqIdx < MAX_HOLMES_SEQUENCE; ++seqIdx) {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 72bdc515b7..272c418a42 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -77,7 +77,6 @@ public:
 
 	// Rose Tattoo fields
 	Common::String _walkVGSName;		// Name of walk library person is using
-	Common::Array<WalkSequence> _walkSequences;
 public:
 	Person();
 
-- 
cgit v1.2.3


From 508dc14e30c1d30c90a0632ffdaf4a916755d58d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 26 May 2015 23:46:28 +0200
Subject: SHERLOCK: Initialize some variables

---
 engines/sherlock/music.cpp | 6 ++++++
 engines/sherlock/sound.cpp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index e52b22b977..c1aebda2b3 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -53,6 +53,9 @@ MidiParser_SH::MidiParser_SH() {
 	_ppqn = 1;
 	setTempo(16667);
 	_data = nullptr;
+	_beats = 0;
+	_lastEvent = 0;
+	_trackEnd = nullptr;
 }
 
 void MidiParser_SH::parseNextEvent(EventInfo &info) {
@@ -197,6 +200,9 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	}
 	_midiParser.setMidiDriver(_driver);
 	_midiParser.setTimerRate(_driver->getBaseTempo());
+
+	_musicPlaying = false;
+	_musicOn = true;
 }
 
 bool Music::loadSong(int songNumber) {
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index b9762d22de..a923cf9e57 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -57,6 +57,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_soundPlaying = false;
 	_soundIsOn = &_soundPlaying;
 	_curPriority = 0;
+	_digiBuf = nullptr;
 
 	_soundOn = true;
 	_speechOn = true;
-- 
cgit v1.2.3


From 30edd4efb80e203d7315e0fad41989c40dfe68ff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 26 May 2015 21:18:45 -0400
Subject: SHERLOCK: Starting to split Scene class, implemented checkBgShapes
 changes

---
 engines/sherlock/objects.cpp  |  12 +++++
 engines/sherlock/objects.h    |  18 +++++++
 engines/sherlock/scene.cpp    | 118 +++++++++++++++++++++++++++++-------------
 engines/sherlock/scene.h      |  49 ++++++++++++++----
 engines/sherlock/sherlock.cpp |   2 +-
 5 files changed, 152 insertions(+), 47 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 73387261c8..3e8838cb79 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1141,6 +1141,18 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 
 /*----------------------------------------------------------------*/
 
+CAnimStream::CAnimStream() {
+	_stream = nullptr;
+	_frameSize = 0;
+	_images = nullptr;
+	_imageFrame = nullptr;
+	_flags = 0;
+	_scaleVal = 0;
+	_zPlacement = 0;
+}
+
+/*----------------------------------------------------------------*/
+
 SceneImage::SceneImage() {
 	_images = nullptr;
 	_maxFrames = 0;
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 99746c9956..ec5c2e7897 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -413,6 +413,24 @@ struct CAnim {
 	void load(Common::SeekableReadStream &s, bool isRoseTattoo);
 };
 
+struct CAnimStream {
+	Common::SeekableReadStream *_stream;	// Stream to read frames from
+	int _frameSize;					// Temporary used to store the frame size
+
+	void *_images;					// TOOD: FIgure out hwo to hook up ImageFile with streaming support
+	ImageFrame *_imageFrame;
+
+	Common::Point _position;		// Animation position
+	Common::Rect _oldBounds;		// Bounds of previous frame
+	Common::Rect _removeBounds;		// Remove area for just drawn frame
+
+	int _flags;						// Flags
+	int _scaleVal;					// Specifies the scale amount
+	int _zPlacement;				// Used by doBgAnim for determining Z order
+
+	CAnimStream();
+};
+
 struct SceneImage {
 	ImageFile *_images;				// Object images
 	int _maxFrames;					// How many frames in object
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index a1a165e805..63203e1859 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -150,6 +150,13 @@ void ScaleZone::load(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
+Scene *Scene::init(SherlockEngine *vm) {
+	if (vm->getGameID() == GType_SerratedScalpel)
+		return new ScalpelScene(vm);
+	else
+		return new TattooScene(vm);
+}
+
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
 	for (int idx = 0; idx < SCENES_COUNT; ++idx)
 		Common::fill(&_sceneStats[idx][0], &_sceneStats[idx][65], false);
@@ -978,42 +985,6 @@ Exit *Scene::checkForExit(const Common::Rect &r) {
 	return nullptr;
 }
 
-void Scene::checkBgShapes() {
-	People &people = *_vm->_people;
-	Person &holmes = people._player;
-	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
-
-	// Iterate through the shapes
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &obj = _bgShapes[idx];
-		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
-			if ((obj._flags & 5) == 1) {
-				obj._misc = (pt.y < (obj._position.y + obj.frameHeight() - 1)) ?
-					NORMAL_FORWARD : NORMAL_BEHIND;
-			} else if (!(obj._flags & OBJ_BEHIND)) {
-				obj._misc = BEHIND;
-			} else if (obj._flags & OBJ_FORWARD) {
-				obj._misc = FORWARD;
-			}
-		}
-	}
-
-	// Iterate through the canimshapes
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &obj = _canimShapes[idx];
-		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
-			if ((obj._flags & 5) == 1) {
-				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
-				NORMAL_FORWARD : NORMAL_BEHIND;
-			} else if (!(obj._flags & 1)) {
-				obj._misc = BEHIND;
-			} else if (obj._flags & 4) {
-				obj._misc = FORWARD;
-			}
-		}
-	}
-}
-
 int Scene::startCAnim(int cAnimNum, int playRate) {
 	Events &events = *_vm->_events;
 	Map &map = *_vm->_map;
@@ -1658,5 +1629,80 @@ void Scene::setNPCPath(int npc) {
 	talk.talkTo(pathFile);
 }
 
+void Scene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Iterate through the shapes
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+		if (obj._type == ACTIVE_BG_SHAPE || (IS_SERRATED_SCALPEL && obj._type == STATIC_BG_SHAPE)) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj.frameHeight() - 1)) ?
+					NORMAL_FORWARD : NORMAL_BEHIND;
+			} else if (!(obj._flags & OBJ_BEHIND)) {
+				obj._misc = BEHIND;
+			} else if (obj._flags & OBJ_FORWARD) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+}
+
+/*----------------------------------------------------------------*/
+
+void ScalpelScene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Call the base scene method to handle bg shapes
+	Scene::checkBgShapes();
+
+	// Iterate through the canim list
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &obj = _canimShapes[idx];
+		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
+				NORMAL_FORWARD : NORMAL_BEHIND;
+			} else if (!(obj._flags & 1)) {
+				obj._misc = BEHIND;
+			} else if (obj._flags & 4) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+}
+
+/*----------------------------------------------------------------*/
+
+void TattooScene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Call the base scene method to handle bg shapes
+	Scene::checkBgShapes();
+
+	// Check for any active playing animation
+	if (_activeCAnim._images && _activeCAnim._zPlacement != REMOVE) {
+		switch (_activeCAnim._flags & 3) {
+		case 0:
+			_activeCAnim._zPlacement = BEHIND;
+			break;
+		case 1:
+			_activeCAnim._zPlacement = ((_activeCAnim._position.y + _activeCAnim._imageFrame->_frame.h - 1)) ?
+				NORMAL_FORWARD : NORMAL_BEHIND;
+			break;
+		case 2:
+			_activeCAnim._zPlacement = FORWARD;
+			break;
+		default:
+			break;
+		}
+	}
+}
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 806726868a..50f8f07ef4 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -140,7 +140,6 @@ struct SceneTripEntry {
 
 class Scene {
 private:
-	SherlockEngine *_vm;
 	Common::String _rrmName;
 	bool _loadingSavedGame;
 
@@ -179,13 +178,6 @@ private:
 	 */
 	void transitionToScene();
 
-	/**
-	 * Checks all the background shapes. If a background shape is animating,
-	 * it will flag it as needing to be drawn. If a non-animating shape is
-	 * colliding with another shape, it will also flag it as needing drawing
-	 */
-	void checkBgShapes();
-
 	/**
 	 * Restores objects to the correct status. This ensures that things like being opened or moved
 	 * will remain the same on future visits to the scene
@@ -196,6 +188,17 @@ private:
 	 * Draw all the shapes, people and NPCs in the correct order
 	 */
 	void drawAllShapes();
+protected:
+	SherlockEngine *_vm;
+
+	/**
+	 * Checks all the background shapes. If a background shape is animating,
+	 * it will flag it as needing to be drawn. If a non-animating shape is
+	 * colliding with another shape, it will also flag it as needing drawing
+	 */
+	virtual void checkBgShapes();
+
+	Scene(SherlockEngine *vm);
 public:
 	int _currentScene;
 	int _goToScene;
@@ -228,8 +231,8 @@ public:
 	int _cAnimFramePause;
 	Common::Array<SceneTripEntry> _sceneTripCounters;
 public:
-	Scene(SherlockEngine *vm);
-	~Scene();
+	static Scene *init(SherlockEngine *vm);
+	virtual ~Scene();
 
 	/**
 	 * Handles loading the scene specified by _goToScene
@@ -315,6 +318,32 @@ public:
 	void setNPCPath(int npc);
 };
 
+class ScalpelScene : public Scene {
+protected:
+	/**
+	 * Checks all the background shapes. If a background shape is animating,
+	 * it will flag it as needing to be drawn. If a non-animating shape is
+	 * colliding with another shape, it will also flag it as needing drawing
+	 */
+	virtual void checkBgShapes();
+public:
+	ScalpelScene(SherlockEngine *vm) : Scene(vm) {}
+};
+
+class TattooScene : public Scene {
+private:
+	CAnimStream _activeCAnim;
+protected:
+	/**
+	 * Checks all the background shapes. If a background shape is animating,
+	 * it will flag it as needing to be drawn. If a non-animating shape is
+	 * colliding with another shape, it will also flag it as needing drawing
+	 */
+	virtual void checkBgShapes();
+public:
+	TattooScene(SherlockEngine *vm) : Scene(vm) {}
+};
+
 } // End of namespace Sherlock
 
 #endif
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 497841faac..03c10554e8 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -92,7 +92,7 @@ void SherlockEngine::initialize() {
 	_journal = new Journal(this);
 	_people = new People(this);
 	_saves = new SaveManager(this, _targetName);
-	_scene = new Scene(this);
+	_scene = Scene::init(this);
 	_screen = new Screen(this);
 	_sound = new Sound(this, _mixer);
 	_talk = Talk::init(this);
-- 
cgit v1.2.3


From 483a72b8b840a9ebbb7009b3dcd20878d0ffad58 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 26 May 2015 22:05:27 -0400
Subject: SHERLOK: Beginnings of split of doBgAnim logic

---
 engines/sherlock/events.cpp |   8 ++++
 engines/sherlock/events.h   |   7 ++-
 engines/sherlock/scene.cpp  | 112 ++++++++++++++++++++++++++++----------------
 engines/sherlock/scene.h    |  17 +++++--
 4 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index c2015079a8..a02a06cafc 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -75,6 +75,14 @@ void Events::setCursor(const Graphics::Surface &src) {
 	showCursor();
 }
 
+void Events::animateCursorIfNeeded() {
+	if (_cursorId >= WAIT && _cursorId < (WAIT + 3)) {
+		CursorId newId = (WAIT + 2) ? WAIT : (CursorId)((int)_cursorId + 1);
+		setCursor(newId);
+	}
+}
+
+
 void Events::showCursor() {
 	CursorMan.showMouse(true);
 }
diff --git a/engines/sherlock/events.h b/engines/sherlock/events.h
index c19a92de8c..b35109fefe 100644
--- a/engines/sherlock/events.h
+++ b/engines/sherlock/events.h
@@ -33,7 +33,7 @@ namespace Sherlock {
 #define GAME_FRAME_RATE 60
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
-enum CursorId { ARROW = 0, MAGNIFY = 1, WAIT = 2, INVALID_CURSOR = -1 };
+enum CursorId { ARROW = 0, MAGNIFY = 1, WAIT = 2, EXIT_ZONES_START = 5, INVALID_CURSOR = -1 };
 
 class SherlockEngine;
 
@@ -77,6 +77,11 @@ public:
 	 */
 	void setCursor(const Graphics::Surface &src);
 
+	/**
+	 * Animates the mouse cursor if the Wait cursor is showing
+	 */
+	void animateCursorIfNeeded();
+
 	/**
 	 * Show the mouse cursor
 	 */
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 63203e1859..41aafff8c3 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1199,53 +1199,15 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 
 void Scene::doBgAnim() {
 	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
 	Talk &talk = *_vm->_talk;
-	UserInterface &ui = *_vm->_ui;
-
-	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
-
-	int cursorId = events.getCursor();
 	Common::Point mousePos = events.mousePos();
+	events.animateCursorIfNeeded();
 
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	talk._talkToAbort = false;
 
-	// Animate the mouse cursor
-	if (cursorId >= WAIT) {
-		if (++cursorId > (WAIT + 2))
-			cursorId = WAIT;
-
-		events.setCursor((CursorId)cursorId);
-	}
-
-	if (ui._menuMode == LOOK_MODE) {
-		if (mousePos.y > CONTROLS_Y1)
-			events.setCursor(ARROW);
-		else if (mousePos.y < CONTROLS_Y)
-			events.setCursor(MAGNIFY);
-	}
-
-	// Check for setting magnifying glass cursor
-	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
-		if (inv._invMode == INVMODE_LOOK) {
-			// Only show Magnifying glass cursor if it's not on the inventory command line
-			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
-				events.setCursor(MAGNIFY);
-			else
-				events.setCursor(ARROW);
-		} else {
-			events.setCursor(ARROW);
-		}
-	}
-
-	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
-		// Loaded sound just finished playing
-		sound.freeDigiSound();
-	}
-
 	if (_restoreFlag) {
 		if (people[AL]._type == CHARACTER)
 			people[AL].checkSprite();
@@ -1676,8 +1638,48 @@ void ScalpelScene::checkBgShapes() {
 	}
 }
 
+void ScalpelScene::doBgAnim() {
+	Inventory &inv = *_vm->_inventory;
+	Events &events = *_vm->_events;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	Common::Point mousePos = events.mousePos();
+
+	if (ui._menuMode == LOOK_MODE) {
+		if (mousePos.y > CONTROLS_Y1)
+			events.setCursor(ARROW);
+		else if (mousePos.y < CONTROLS_Y)
+			events.setCursor(MAGNIFY);
+	}
+
+	// Check for setting magnifying glass cursor
+	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
+		if (inv._invMode == INVMODE_LOOK) {
+			// Only show Magnifying glass cursor if it's not on the inventory command line
+			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
+				events.setCursor(MAGNIFY);
+			else
+				events.setCursor(ARROW);
+		} else {
+			events.setCursor(ARROW);
+		}
+	}
+
+	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
+		// Loaded sound just finished playing
+		sound.freeDigiSound();
+	}
+
+	// Handle doing the actual drawing
+	Scene::doBgAnim();
+}
+
 /*----------------------------------------------------------------*/
 
+TattooScene::TattooScene(SherlockEngine *vm) : Scene(vm) {
+	_arrowZone = -1;
+}
+
 void TattooScene::checkBgShapes() {
 	People &people = *_vm->_people;
 	Person &holmes = people._player;
@@ -1705,4 +1707,34 @@ void TattooScene::checkBgShapes() {
 	}
 }
 
+void TattooScene::doBgAnim() {
+	Events &events = *_vm->_events;
+	UserInterface &ui = *_vm->_ui;
+	Common::Point mousePos = events.mousePos();
+
+	// If we're in Look Mode, make sure the cursor is the magnifying glass
+	if (ui._menuMode == LOOK_MODE && events.getCursor() != MAGNIFY)
+		events.setCursor(MAGNIFY);
+
+	// See if the mouse is over any of the arrow zones, and if so, change the cursor to the correct
+	// arrow cursor indicating the direcetion of the exit
+	if (events.getCursor() == ARROW || events.getCursor() >= EXIT_ZONES_START) {
+		CursorId cursorId = ARROW;
+
+		if (ui._menuMode == STD_MODE && _arrowZone != -1 && _currentScene != 90) {
+			for (uint idx = 0; idx < _exits.size(); ++idx) {
+				Exit &exit = _exits[idx];
+				if (exit.contains(mousePos))
+					cursorId = (CursorId)(exit._image + EXIT_ZONES_START);
+			}
+		}
+
+		events.setCursor(cursorId);
+	}
+
+	// Handle doing the actual drawing
+	_restoreFlag = true;
+	Scene::doBgAnim();
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 50f8f07ef4..2aecdfa3b2 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -273,9 +273,9 @@ public:
 	int toggleObject(const Common::String &name);
 
 	/**
-	 * Animate all objects and people.
+	 * Draw all objects and characters.
 	 */
-	void doBgAnim();
+	virtual void doBgAnim();
 
 	/**
 	 * Attempts to find a background shape within the passed bounds. If found,
@@ -328,11 +328,17 @@ protected:
 	virtual void checkBgShapes();
 public:
 	ScalpelScene(SherlockEngine *vm) : Scene(vm) {}
+
+	/**
+	 * Draw all objects and characters.
+	 */
+	virtual void doBgAnim();
 };
 
 class TattooScene : public Scene {
 private:
 	CAnimStream _activeCAnim;
+	int _arrowZone;
 protected:
 	/**
 	 * Checks all the background shapes. If a background shape is animating,
@@ -341,7 +347,12 @@ protected:
 	 */
 	virtual void checkBgShapes();
 public:
-	TattooScene(SherlockEngine *vm) : Scene(vm) {}
+	TattooScene(SherlockEngine *vm);
+
+	/**
+	 * Draw all objects and characters.
+	 */
+	virtual void doBgAnim();
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3


From 0d4163c6e932bed2b85843f6ab3b5066d0353df6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 27 May 2015 20:26:40 -0400
Subject: SHERLOCK: Implemented initial background clearing of RT doBgAnim

---
 engines/sherlock/inventory.cpp      |   4 +-
 engines/sherlock/scene.cpp          | 511 ++++++++++++++++++++++--------------
 engines/sherlock/scene.h            |  22 +-
 engines/sherlock/screen.h           |   2 +-
 engines/sherlock/settings.cpp       |   4 +
 engines/sherlock/settings.h         |   5 +-
 engines/sherlock/talk.cpp           |   2 +-
 engines/sherlock/talk.h             |   4 +-
 engines/sherlock/tattoo/tattoo.cpp  |  15 +-
 engines/sherlock/tattoo/tattoo.h    |  17 +-
 engines/sherlock/user_interface.cpp |  53 +++-
 engines/sherlock/user_interface.h   |  19 ++
 12 files changed, 433 insertions(+), 225 deletions(-)

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index bbb7c75aea..7ec0b6421d 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -244,7 +244,7 @@ void Inventory::drawInventory(InvNewMode mode) {
 	}
 
 	assert(IS_SERRATED_SCALPEL);
-	((ScalpelUserInterface *)_vm->_ui)->_oldUse = -1;
+	((Scalpel::ScalpelUserInterface *)_vm->_ui)->_oldUse = -1;
 }
 
 void Inventory::invCommands(bool slamIt) {
@@ -324,7 +324,7 @@ void Inventory::refreshInv() {
 	
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	ScalpelUserInterface &ui = *(ScalpelUserInterface *)_vm->_ui;
+	Scalpel::ScalpelUserInterface &ui = *(Scalpel::ScalpelUserInterface *)_vm->_ui;
 
 	ui._invLookFlag = true;
 	freeInv();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 41aafff8c3..18690fb414 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -24,6 +24,7 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/scalpel/scalpel.h"
 #include "sherlock/screen.h"
+#include "sherlock/tattoo/tattoo.h"
 
 namespace Sherlock {
 
@@ -152,9 +153,9 @@ void ScaleZone::load(Common::SeekableReadStream &s) {
 
 Scene *Scene::init(SherlockEngine *vm) {
 	if (vm->getGameID() == GType_SerratedScalpel)
-		return new ScalpelScene(vm);
+		return new Scalpel::ScalpelScene(vm);
 	else
-		return new TattooScene(vm);
+		return new Tattoo::TattooScene(vm);
 }
 
 Scene::Scene(SherlockEngine *vm): _vm(vm) {
@@ -1197,20 +1198,209 @@ int Scene::startCAnim(int cAnimNum, int playRate) {
 	return 1;
 }
 
-void Scene::doBgAnim() {
+int Scene::findBgShape(const Common::Rect &r) {
+	if (!_doBgAnimDone)
+		// New frame hasn't been drawn yet
+		return -1;
+
+	for (int idx = (int)_bgShapes.size() - 1; idx >= 0; --idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN
+			&& o._aType <= PERSON) {
+			if (r.intersects(o.getNewBounds()))
+				return idx;
+		} else if (o._type == NO_SHAPE) {
+			if (r.intersects(o.getNoShapeBounds()))
+				return idx;
+		}
+	}
+
+	return -1;
+}
+
+int Scene::checkForZones(const Common::Point &pt, int zoneType) {
+	int matches = 0;
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if ((o._aType == zoneType && o._type != INVALID) && o._type != HIDDEN) {
+			Common::Rect r = o._type == NO_SHAPE ? o.getNoShapeBounds() : o.getNewBounds();
+
+			if (r.contains(pt)) {
+				++matches;
+				o.setFlagsAndToggles();
+				_vm->_talk->talkTo(o._use[0]._target);
+			}
+		}
+	}
+
+	return matches;
+}
+
+int Scene::whichZone(const Common::Point &pt) {
+	for (uint idx = 0; idx < _zones.size(); ++idx) {
+		if (_zones[idx].contains(pt))
+			return idx;
+	}
+
+	return -1;
+}
+
+int Scene::closestZone(const Common::Point &pt) {
+	int dist = 1000;
+	int zone = -1;
+
+	for (uint idx = 0; idx < _zones.size(); ++idx) {
+		Common::Point zc((_zones[idx].left + _zones[idx].right) / 2,
+			(_zones[idx].top + _zones[idx].bottom) / 2);
+		int d = ABS(zc.x - pt.x) + ABS(zc.y - pt.y);
+
+		if (d < dist) {
+			// Found a closer zone
+			dist = d;
+			zone = idx;
+		}
+	}
+
+	return zone;
+}
+
+void Scene::synchronize(Common::Serializer &s) {
+	if (s.isSaving())
+		saveSceneStatus();
+
+	if (s.isSaving()) {
+		s.syncAsSint16LE(_currentScene);
+	} else {
+		s.syncAsSint16LE(_goToScene);
+		_loadingSavedGame = true;
+	}
+
+	for (int sceneNum = 0; sceneNum < SCENES_COUNT; ++sceneNum) {
+		for (int flag = 0; flag < 65; ++flag) {
+			s.syncAsByte(_sceneStats[sceneNum][flag]);
+		}
+	}
+}
+
+void Scene::setNPCPath(int npc) {
+	People &people = *_vm->_people;
+	Talk &talk = *_vm->_talk;
+	
+	people[npc].clearNPC();
+	people[npc]._name = Common::String::format("WATS%.2dA", _currentScene);
+
+	// If we're in the middle of a script that will continue once the scene is loaded,
+	// return without calling the path script
+	if (talk._scriptMoreFlag == 1 || talk._scriptMoreFlag == 3)
+		return;
+
+	// Turn off all the NPCs, since the talk script will turn them back on as needed
+	for (uint idx = 0; idx < MAX_NPC; ++idx)
+		people[idx + 1]._type = INVALID;
+
+	// Call the path script for the scene
+	Common::String pathFile = Common::String::format("PATH%.2dA", _currentScene);
+	talk.talkTo(pathFile);
+}
+
+void Scene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Iterate through the shapes
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+		if (obj._type == ACTIVE_BG_SHAPE || (IS_SERRATED_SCALPEL && obj._type == STATIC_BG_SHAPE)) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj.frameHeight() - 1)) ?
+					NORMAL_FORWARD : NORMAL_BEHIND;
+			} else if (!(obj._flags & OBJ_BEHIND)) {
+				obj._misc = BEHIND;
+			} else if (obj._flags & OBJ_FORWARD) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+}
+
+/*----------------------------------------------------------------*/
+
+namespace Scalpel {
+
+void ScalpelScene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Call the base scene method to handle bg shapes
+	Scene::checkBgShapes();
+
+	// Iterate through the canim list
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &obj = _canimShapes[idx];
+		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
+				NORMAL_FORWARD : NORMAL_BEHIND;
+			} else if (!(obj._flags & 1)) {
+				obj._misc = BEHIND;
+			} else if (obj._flags & 4) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+}
+
+void ScalpelScene::doBgAnimCheckCursor() {
+	Inventory &inv = *_vm->_inventory;
+	Events &events = *_vm->_events;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	Common::Point mousePos = events.mousePos();
+
+	if (ui._menuMode == LOOK_MODE) {
+		if (mousePos.y > CONTROLS_Y1)
+			events.setCursor(ARROW);
+		else if (mousePos.y < CONTROLS_Y)
+			events.setCursor(MAGNIFY);
+	}
+
+	// Check for setting magnifying glass cursor
+	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
+		if (inv._invMode == INVMODE_LOOK) {
+			// Only show Magnifying glass cursor if it's not on the inventory command line
+			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
+				events.setCursor(MAGNIFY);
+			else
+				events.setCursor(ARROW);
+		} else {
+			events.setCursor(ARROW);
+		}
+	}
+
+	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
+		// Loaded sound just finished playing
+		sound.freeDigiSound();
+	}
+}
+
+void ScalpelScene::doBgAnim() {
+	Scalpel::ScalpelEngine &vm = *((Scalpel::ScalpelEngine *)_vm);
 	Events &events = *_vm->_events;
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 	Talk &talk = *_vm->_talk;
-	Common::Point mousePos = events.mousePos();
-	events.animateCursorIfNeeded();
 
 	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	talk._talkToAbort = false;
 
 	if (_restoreFlag) {
-		if (people[AL]._type == CHARACTER)
-			people[AL].checkSprite();
+		for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+			if (people[idx]._type == CHARACTER)
+				people[idx].checkSprite();
+		}
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
@@ -1225,8 +1415,8 @@ void Scene::doBgAnim() {
 				_canimShapes[idx].checkObject();
 		}
 
-		if (_currentScene == 12 && IS_SERRATED_SCALPEL)
-			((Scalpel::ScalpelEngine *)_vm)->eraseMirror12();
+		if (_currentScene == 12)
+			vm.eraseMirror12();
 
 		// Restore the back buffer from the back buffer 2 in the changed area
 		Common::Rect bounds(people[AL]._oldPosition.x, people[AL]._oldPosition.y,
@@ -1297,8 +1487,8 @@ void Scene::doBgAnim() {
 	// Flag the bg shapes which need to be redrawn
 	checkBgShapes();
 
-	if (_currentScene == 12 && IS_SERRATED_SCALPEL)
-		((Scalpel::ScalpelEngine *)_vm)->doMirror12();
+	if (_currentScene == 12)
+		vm.doMirror12();
 
 	// Draw all active shapes which are behind the person
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
@@ -1407,8 +1597,8 @@ void Scene::doBgAnim() {
 			}
 		}
 
-		if (_currentScene == 12 && IS_SERRATED_SCALPEL)
-			((Scalpel::ScalpelEngine *)_vm)->flushMirror12();
+		if (_currentScene == 12)
+			vm.flushMirror12();
 
 		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 			Object &o = _bgShapes[idx];
@@ -1485,199 +1675,16 @@ void Scene::doBgAnim() {
 	}
 }
 
-int Scene::findBgShape(const Common::Rect &r) {
-	if (!_doBgAnimDone)
-		// New frame hasn't been drawn yet
-		return -1;
-
-	for (int idx = (int)_bgShapes.size() - 1; idx >= 0; --idx) {
-		Object &o = _bgShapes[idx];
-		if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN
-			&& o._aType <= PERSON) {
-			if (r.intersects(o.getNewBounds()))
-				return idx;
-		} else if (o._type == NO_SHAPE) {
-			if (r.intersects(o.getNoShapeBounds()))
-				return idx;
-		}
-	}
-
-	return -1;
-}
-
-int Scene::checkForZones(const Common::Point &pt, int zoneType) {
-	int matches = 0;
-
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if ((o._aType == zoneType && o._type != INVALID) && o._type != HIDDEN) {
-			Common::Rect r = o._type == NO_SHAPE ? o.getNoShapeBounds() : o.getNewBounds();
-
-			if (r.contains(pt)) {
-				++matches;
-				o.setFlagsAndToggles();
-				_vm->_talk->talkTo(o._use[0]._target);
-			}
-		}
-	}
-
-	return matches;
-}
-
-int Scene::whichZone(const Common::Point &pt) {
-	for (uint idx = 0; idx < _zones.size(); ++idx) {
-		if (_zones[idx].contains(pt))
-			return idx;
-	}
-
-	return -1;
-}
-
-int Scene::closestZone(const Common::Point &pt) {
-	int dist = 1000;
-	int zone = -1;
-
-	for (uint idx = 0; idx < _zones.size(); ++idx) {
-		Common::Point zc((_zones[idx].left + _zones[idx].right) / 2,
-			(_zones[idx].top + _zones[idx].bottom) / 2);
-		int d = ABS(zc.x - pt.x) + ABS(zc.y - pt.y);
-
-		if (d < dist) {
-			// Found a closer zone
-			dist = d;
-			zone = idx;
-		}
-	}
-
-	return zone;
-}
-
-void Scene::synchronize(Common::Serializer &s) {
-	if (s.isSaving())
-		saveSceneStatus();
-
-	if (s.isSaving()) {
-		s.syncAsSint16LE(_currentScene);
-	} else {
-		s.syncAsSint16LE(_goToScene);
-		_loadingSavedGame = true;
-	}
-
-	for (int sceneNum = 0; sceneNum < SCENES_COUNT; ++sceneNum) {
-		for (int flag = 0; flag < 65; ++flag) {
-			s.syncAsByte(_sceneStats[sceneNum][flag]);
-		}
-	}
-}
-
-void Scene::setNPCPath(int npc) {
-	People &people = *_vm->_people;
-	Talk &talk = *_vm->_talk;
-	
-	people[npc].clearNPC();
-	people[npc]._name = Common::String::format("WATS%.2dA", _currentScene);
-
-	// If we're in the middle of a script that will continue once the scene is loaded,
-	// return without calling the path script
-	if (talk._scriptMoreFlag == 1 || talk._scriptMoreFlag == 3)
-		return;
-
-	// Turn off all the NPCs, since the talk script will turn them back on as needed
-	for (uint idx = 0; idx < MAX_NPC; ++idx)
-		people[idx + 1]._type = INVALID;
-
-	// Call the path script for the scene
-	Common::String pathFile = Common::String::format("PATH%.2dA", _currentScene);
-	talk.talkTo(pathFile);
-}
-
-void Scene::checkBgShapes() {
-	People &people = *_vm->_people;
-	Person &holmes = people._player;
-	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
-
-	// Iterate through the shapes
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &obj = _bgShapes[idx];
-		if (obj._type == ACTIVE_BG_SHAPE || (IS_SERRATED_SCALPEL && obj._type == STATIC_BG_SHAPE)) {
-			if ((obj._flags & 5) == 1) {
-				obj._misc = (pt.y < (obj._position.y + obj.frameHeight() - 1)) ?
-					NORMAL_FORWARD : NORMAL_BEHIND;
-			} else if (!(obj._flags & OBJ_BEHIND)) {
-				obj._misc = BEHIND;
-			} else if (obj._flags & OBJ_FORWARD) {
-				obj._misc = FORWARD;
-			}
-		}
-	}
-}
+} // End of namespace Scalpel
 
 /*----------------------------------------------------------------*/
 
-void ScalpelScene::checkBgShapes() {
-	People &people = *_vm->_people;
-	Person &holmes = people._player;
-	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
-
-	// Call the base scene method to handle bg shapes
-	Scene::checkBgShapes();
-
-	// Iterate through the canim list
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &obj = _canimShapes[idx];
-		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
-			if ((obj._flags & 5) == 1) {
-				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
-				NORMAL_FORWARD : NORMAL_BEHIND;
-			} else if (!(obj._flags & 1)) {
-				obj._misc = BEHIND;
-			} else if (obj._flags & 4) {
-				obj._misc = FORWARD;
-			}
-		}
-	}
-}
-
-void ScalpelScene::doBgAnim() {
-	Inventory &inv = *_vm->_inventory;
-	Events &events = *_vm->_events;
-	Sound &sound = *_vm->_sound;
-	UserInterface &ui = *_vm->_ui;
-	Common::Point mousePos = events.mousePos();
-
-	if (ui._menuMode == LOOK_MODE) {
-		if (mousePos.y > CONTROLS_Y1)
-			events.setCursor(ARROW);
-		else if (mousePos.y < CONTROLS_Y)
-			events.setCursor(MAGNIFY);
-	}
-
-	// Check for setting magnifying glass cursor
-	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
-		if (inv._invMode == INVMODE_LOOK) {
-			// Only show Magnifying glass cursor if it's not on the inventory command line
-			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
-				events.setCursor(MAGNIFY);
-			else
-				events.setCursor(ARROW);
-		} else {
-			events.setCursor(ARROW);
-		}
-	}
-
-	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
-		// Loaded sound just finished playing
-		sound.freeDigiSound();
-	}
-
-	// Handle doing the actual drawing
-	Scene::doBgAnim();
-}
-
-/*----------------------------------------------------------------*/
+namespace Tattoo {
 
 TattooScene::TattooScene(SherlockEngine *vm) : Scene(vm) {
 	_arrowZone = -1;
+	_mask = _mask1 = nullptr;
+	_maskCounter = 0;
 }
 
 void TattooScene::checkBgShapes() {
@@ -1707,7 +1714,7 @@ void TattooScene::checkBgShapes() {
 	}
 }
 
-void TattooScene::doBgAnim() {
+void TattooScene::doBgAnimCheckCursor() {
 	Events &events = *_vm->_events;
 	UserInterface &ui = *_vm->_ui;
 	Common::Point mousePos = events.mousePos();
@@ -1731,10 +1738,106 @@ void TattooScene::doBgAnim() {
 
 		events.setCursor(cursorId);
 	}
+}
 
-	// Handle doing the actual drawing
-	_restoreFlag = true;
-	Scene::doBgAnim();
+void TattooScene::doBgAnimHandleMask() {
+	TattooEngine &vm = *((TattooEngine *)_vm);
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	TattooUserInterface &ui = *((TattooUserInterface *)_vm->_ui);
+	
+	static const int16 OFFSETS[16] = { -1, -2, -3, -3, -2, -1, -1, 0, 1, 2, 3, 3, 2, 1, 0, 0 };
+
+	if (_mask != nullptr) {
+		if (screen._backBuffer1.w() > screen.w())
+			screen.blitFrom(screen._backBuffer1, Common::Point(0, 0), Common::Rect(screen._currentScroll, 0,
+			screen._currentScroll + screen.w(), screen.h()));
+		else
+			screen.blitFrom(screen._backBuffer1);
+
+		switch (_currentScene) {
+		case 7:
+			if (++_maskCounter == 2) {
+				_maskCounter = 0;
+				if (--_maskOffset.x < 0)
+					_maskOffset.x = SHERLOCK_SCREEN_WIDTH - 1;
+			}
+			break;
+
+		case 8:
+			_maskOffset.x += 2;
+			if (_maskOffset.x >= SHERLOCK_SCREEN_WIDTH)
+				_maskOffset.x = 0;
+			break;
+
+		case 18:
+		case 68:
+			++_maskCounter;
+			if (_maskCounter / 4 >= 16)
+				_maskCounter = 0;
+
+			_maskOffset.x = OFFSETS[_maskCounter / 4];
+			break;
+
+		case 53:
+			if (++_maskCounter == 2) {
+				_maskCounter = 0;
+				if (++_maskOffset.x == screen._backBuffer1.w())
+					_maskOffset.x = 0;
+			}
+			break;
+
+		default:
+			break;
+		}
+	} else {
+		// Standard scene without mask, so call user interface to erase any UI elements as necessary
+		ui.doBgAnimRestoreUI();
+		
+		// Restore background for any areas covered by characters and shapes
+		for (uint idx = 0; idx < MAX_CHARACTERS; ++idx)
+			screen.restoreBackground(Common::Rect(people[idx]._oldPosition.x, people[idx]._oldPosition.y,
+				people[idx]._oldPosition.x + people[idx]._oldSize.x, people[idx]._oldPosition.y + people[idx]._oldSize.y));
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &obj = _bgShapes[idx];
+						
+			if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || 
+					obj._type == HIDE_SHAPE || obj._type == REMOVE)
+				screen._backBuffer1.blitFrom(*obj._imageFrame, obj._oldPosition, 
+					Common::Rect(obj._oldPosition.x, obj._oldPosition.y, obj._oldPosition.x + obj._oldSize.x,
+						obj._oldPosition.y + obj._oldSize.y));
+		}
+
+		// If credits are active, erase the area they cover
+		if (vm._creditsActive)
+			vm.eraseCredits();
+	}
+}
+
+void TattooScene::doBgAnim() {
+	doBgAnimCheckCursor();
+
+//	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+//	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	talk._talkToAbort = false;
+
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+		if (people[idx]._type == CHARACTER)
+			people[idx].checkSprite();
+	}
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
+			_bgShapes[idx].checkObject();
+	}
 }
 
+} // End of namespace Tattoo
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 2aecdfa3b2..1bd23fcde7 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -275,7 +275,7 @@ public:
 	/**
 	 * Draw all objects and characters.
 	 */
-	virtual void doBgAnim();
+	virtual void doBgAnim() = 0;
 
 	/**
 	 * Attempts to find a background shape within the passed bounds. If found,
@@ -318,7 +318,11 @@ public:
 	void setNPCPath(int npc);
 };
 
+namespace Scalpel {
+
 class ScalpelScene : public Scene {
+private:
+	void doBgAnimCheckCursor();
 protected:
 	/**
 	 * Checks all the background shapes. If a background shape is animating,
@@ -335,10 +339,19 @@ public:
 	virtual void doBgAnim();
 };
 
+} // End of namespace Scalpel
+
+namespace Tattoo {
+
 class TattooScene : public Scene {
 private:
-	CAnimStream _activeCAnim;
 	int _arrowZone;
+	int _maskCounter;
+	Common::Point _maskOffset;
+private:
+	void doBgAnimCheckCursor();
+
+	void doBgAnimHandleMask();
 protected:
 	/**
 	 * Checks all the background shapes. If a background shape is animating,
@@ -346,6 +359,9 @@ protected:
 	 * colliding with another shape, it will also flag it as needing drawing
 	 */
 	virtual void checkBgShapes();
+public:
+	ImageFile *_mask, *_mask1;
+	CAnimStream _activeCAnim;
 public:
 	TattooScene(SherlockEngine *vm);
 
@@ -355,6 +371,8 @@ public:
 	virtual void doBgAnim();
 };
 
+} // End of namespace Tattoo
+
 } // End of namespace Sherlock
 
 #endif
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 58c7d8f152..e730329ab4 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -72,7 +72,6 @@ private:
 	byte _lookupTable[PALETTE_COUNT];
 	byte _lookupTable1[PALETTE_COUNT];
 	int _scrollSize;
-	int _currentScroll;
 	int _targetScroll;
 private:
 	/**
@@ -102,6 +101,7 @@ public:
 	byte _cMap[PALETTE_SIZE];
 	byte _sMap[PALETTE_SIZE];
 	byte _tMap[PALETTE_SIZE];
+	int _currentScroll;
 public:
 	Screen(SherlockEngine *vm);
 	virtual ~Screen();
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index cae5c6c67a..98a13a3e76 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -25,6 +25,8 @@
 
 namespace Sherlock {
 
+namespace Scalpel {
+
 static const int SETUP_POINTS[12][4]  = {
 	{ 4, 154, 101, 53 },		// Exit
 	{ 4, 165, 101, 53 },		// Music Toggle
@@ -333,4 +335,6 @@ void Settings::show(SherlockEngine *vm) {
 	ui._key = -1;
 }
 
+} // End of namespace Scalpel
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/settings.h b/engines/sherlock/settings.h
index fc5fb2959f..ff2e647a62 100644
--- a/engines/sherlock/settings.h
+++ b/engines/sherlock/settings.h
@@ -28,7 +28,8 @@
 namespace Sherlock {
 
 class SherlockEngine;
-class UserInterface;
+
+namespace Scalpel {
 
 class Settings {
 private:
@@ -55,6 +56,8 @@ public:
 	static void show(SherlockEngine *vm);
 };
 
+} // End of namespace Scalpel
+
 } // End of namespace Sherlock
 
 #endif
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b4be5eed8b..5e9cb02a3d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -332,7 +332,7 @@ void Talk::talkTo(const Common::String &filename) {
 	if (IS_SERRATED_SCALPEL) {
 		// Restore any pressed button
 		if (!ui._windowOpen && savedMode != STD_MODE)
-			((ScalpelUserInterface *)_vm->_ui)->restoreButton((int)(savedMode - 1));
+			((Scalpel::ScalpelUserInterface *)_vm->_ui)->restoreButton((int)(savedMode - 1));
 	}
 
 	// Clear the ui counter so that anything displayed on the info line
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index dc6789cd9d..a5f81f38ba 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -108,8 +108,8 @@ enum {
 enum OpcodeReturn { RET_EXIT = -1, RET_SUCCESS = 0, RET_CONTINUE = 1 };
 
 class SherlockEngine;
-class ScalpelUserInterface;
 class Talk;
+namespace Scalpel { class ScalpelUserInterface; };
 
 typedef OpcodeReturn(Talk::*OpcodeMethod)(const byte *&str);
 
@@ -164,7 +164,7 @@ struct TalkSequences {
 };
 
 class Talk {
-	friend class ScalpelUserInterface;
+	friend class Scalpel::ScalpelUserInterface;
 private:
 	/**
 	 * Remove any voice commands from a loaded statement list
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 47a7c2a9ba..6d90416c34 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -27,13 +27,15 @@ namespace Sherlock {
 
 namespace Tattoo {
 
+TattooEngine::TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
+		SherlockEngine(syst, gameDesc) {
+	_creditsActive = false;
+}
+
 void TattooEngine::showOpening() {
 	// TODO
 }
 
-/**
- * Initialize the engine
- */
 void TattooEngine::initialize() {
 	initGraphics(640, 480, true);
 
@@ -52,9 +54,6 @@ void TattooEngine::initialize() {
 	loadInitialPalette();
 }
 
-/**
- * Starting a scene within the game
- */
 void TattooEngine::startScene() {
 	// TODO
 }
@@ -69,6 +68,10 @@ void TattooEngine::loadInitialPalette() {
 	delete stream;
 }
 
+void TattooEngine::eraseCredits() {
+	// TODO
+}
+
 } // End of namespace Tattoo
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index b9224e06ba..b6a85108e4 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -36,16 +36,27 @@ private:
 	 */
 	void loadInitialPalette();
 protected:
+	/**
+	 * Initialize the engine
+	 */
 	virtual void initialize();
 
 	virtual void showOpening();
 
+	/**
+	 * Starting a scene within the game
+	 */
 	virtual void startScene();
 public:
-	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
-		SherlockEngine(syst, gameDesc) {}
-
+	bool _creditsActive;
+public:
+	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~TattooEngine() {}
+
+	/**
+	 * Erase any area of the screen covered by credits
+	 */
+	void eraseCredits();
 };
 
 } // End of namespace Tattoo
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 4f83e9151a..06ec62b6a2 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -82,9 +82,9 @@ const char *const MUSE[] = {
 
 UserInterface *UserInterface::init(SherlockEngine *vm) {
 	if (vm->getGameID() == GType_SerratedScalpel)
-		return new ScalpelUserInterface(vm);
+		return new Scalpel::ScalpelUserInterface(vm);
 	else
-		return new TattooUserInterface(vm);
+		return new Tattoo::TattooUserInterface(vm);
 }
 
 UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
@@ -108,6 +108,8 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 
 /*----------------------------------------------------------------*/
 
+namespace Scalpel {
+
 ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) {
 	_controls = new ImageFile("menu.all");
 	_controlPanel = new ImageFile("controls.vgs");
@@ -2296,10 +2298,15 @@ void ScalpelUserInterface::checkAction(ActionType &action, const char *const mes
 	events.setCursor(ARROW);
 }
 
+}
+
 /*----------------------------------------------------------------*/
 
+namespace Tattoo {
+
 TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm) {
-	//
+	_menuBuffer = nullptr;
+	_invMenuBuffer = nullptr;
 }
 
 void TattooUserInterface::handleInput() {
@@ -2307,4 +2314,44 @@ void TattooUserInterface::handleInput() {
 	_vm->_events->pollEventsAndWait();
 }
 
+void TattooUserInterface::doBgAnimRestoreUI() {
+	TattooScene &scene = *((TattooScene *)_vm->_scene);
+	Screen &screen = *_vm->_screen;
+
+	// If _oldMenuBounds was set, then either a new menu has been opened or the current menu has been closed.
+	// Either way, we need to restore the area where the menu was displayed
+	if (_oldMenuBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldMenuBounds.left, _oldMenuBounds.top),
+			_oldMenuBounds);
+
+	if (_oldInvMenuBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldInvMenuBounds.left, _oldInvMenuBounds.top),
+			_oldInvMenuBounds);
+
+	if (_menuBuffer != nullptr)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_menuBounds.left, _menuBounds.top), _menuBounds);
+	if (_invMenuBuffer != nullptr)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_invMenuBounds.left, _invMenuBounds.top), _invMenuBounds);
+
+	// If there is a Text Tag being display, restore the area underneath it
+	if (_oldTagBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldTagBounds.left, _oldTagBounds.top), 
+			_oldTagBounds);
+
+	// If there is an Inventory being shown, restore the graphics underneath it
+	if (_oldInvGraphicBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldInvGraphicBounds.left, _oldInvGraphicBounds.top), 
+			_oldInvGraphicBounds);
+
+	// If a canimation is active, restore the graphics underneath it
+	if (scene._activeCAnim._images != nullptr)
+		screen.restoreBackground(scene._activeCAnim._oldBounds);
+
+	// If a canimation just ended, remove it's graphics from the backbuffer
+	if (scene._activeCAnim._removeBounds.width() > 0)
+		screen.restoreBackground(scene._activeCAnim._removeBounds);
+}
+
+} // End of namespace Tattoo
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 2203ddf05e..7a640efea1 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -137,6 +137,8 @@ public:
 	virtual void printObjectDesc() {}
 };
 
+namespace Scalpel {
+
 class ScalpelUserInterface: public UserInterface {
 	friend class Inventory;
 	friend class Settings;
@@ -314,9 +316,24 @@ public:
 	virtual void printObjectDesc();
 };
 
+} // End of namespace Scalpel
+
+namespace Tattoo {
+
 class TattooUserInterface : public UserInterface {
+private:
+	Common::Rect _menuBounds;
+	Common::Rect _oldMenuBounds;
+	Common::Rect _invMenuBounds;
+	Common::Rect _oldInvMenuBounds;
+	Common::Rect _oldTagBounds;
+	Common::Rect _oldInvGraphicBounds;
+	Surface *_menuBuffer;
+	Surface *_invMenuBuffer;
 public:
 	TattooUserInterface(SherlockEngine *vm);
+
+	void doBgAnimRestoreUI();
 public:
 	virtual ~TattooUserInterface() {}
 
@@ -326,6 +343,8 @@ public:
 	virtual void handleInput();
 };
 
+} // End of namespace Tattoo
+
 } // End of namespace Sherlock
 
 #endif
-- 
cgit v1.2.3


From 45b4989b55a043a9d2f1806db375d9f91476ed89 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 27 May 2015 22:36:51 -0400
Subject: SHERLOCK: Implement RT scrolling code

---
 engines/sherlock/people.cpp         |  1 +
 engines/sherlock/people.h           |  2 ++
 engines/sherlock/scene.cpp          | 37 ++++++++++++++++++++++++++++++++++++-
 engines/sherlock/scene.h            |  2 +-
 engines/sherlock/screen.cpp         |  2 ++
 engines/sherlock/screen.h           |  6 +++---
 engines/sherlock/user_interface.cpp | 25 +++++++++++++++++++++++++
 engines/sherlock/user_interface.h   |  8 ++++++++
 8 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 6beae4817e..f8dd8e299b 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -97,6 +97,7 @@ People::People(SherlockEngine *vm) : _vm(vm), _player(_data[0]) {
 	_hSavedFacing = -1;
 	_forceWalkReload = false;
 	_useWalkLib = false;
+	_walkControl = 0;
 
 	_portrait._sequences = new byte[32];
 }
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index 272c418a42..f4aba5aa98 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -114,6 +114,8 @@ public:
 	int _holmesQuotient;
 	bool _forceWalkReload;
 	bool _useWalkLib;
+
+	int _walkControl;
 public:
 	People(SherlockEngine *vm);
 	~People();
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 18690fb414..06bbabf6e0 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1740,7 +1740,7 @@ void TattooScene::doBgAnimCheckCursor() {
 	}
 }
 
-void TattooScene::doBgAnimHandleMask() {
+void TattooScene::doBgAnimEraseBackground() {
 	TattooEngine &vm = *((TattooEngine *)_vm);
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
@@ -1813,6 +1813,37 @@ void TattooScene::doBgAnimHandleMask() {
 		if (vm._creditsActive)
 			vm.eraseCredits();
 	}
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+
+		if (obj._type == NO_SHAPE && (obj._flags & 1) == 0) {
+			screen._backBuffer1.blitFrom(screen._backBuffer2, obj._position, obj.getNoShapeBounds());
+
+			obj._oldPosition = obj._position;
+			obj._oldSize = obj._noShapeSize;
+		}
+	}
+
+	// Adjust the Target Scroll if needed
+	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll) < 
+			(SHERLOCK_SCREEN_WIDTH / 8) && people[people._walkControl]._delta.x < 0) {
+		
+		screen._targetScroll = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
+				SHERLOCK_SCREEN_WIDTH / 8 - 250);
+		if (screen._targetScroll < 0)
+			screen._targetScroll = 0;
+	}
+
+	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll) > (SHERLOCK_SCREEN_WIDTH / 4 * 3) 
+			&& people[people._walkControl]._delta.x > 0)
+		screen._targetScroll = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
+			SHERLOCK_SCREEN_WIDTH / 4 * 3 + 250);
+
+	if (screen._targetScroll > screen._scrollSize)
+		screen._targetScroll = screen._scrollSize;
+
+	ui.doScroll();
 }
 
 void TattooScene::doBgAnim() {
@@ -1827,6 +1858,7 @@ void TattooScene::doBgAnim() {
 	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
 	talk._talkToAbort = false;
 
+	// Check the characters and sprites for updates
 	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
 		if (people[idx]._type == CHARACTER)
 			people[idx].checkSprite();
@@ -1836,6 +1868,9 @@ void TattooScene::doBgAnim() {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
 			_bgShapes[idx].checkObject();
 	}
+
+	// Erase any affected background areas
+	doBgAnimEraseBackground();
 }
 
 } // End of namespace Tattoo
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 1bd23fcde7..ce0785063d 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -351,7 +351,7 @@ private:
 private:
 	void doBgAnimCheckCursor();
 
-	void doBgAnimHandleMask();
+	void doBgAnimEraseBackground();
 protected:
 	/**
 	 * Checks all the background shapes. If a background shape is animating,
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 4dd91cfa78..350341f608 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -45,8 +45,10 @@ Screen::Screen(SherlockEngine *vm) : Surface(g_system->getWidth(), g_system->get
 	_fadeBytesRead = _fadeBytesToRead = 0;
 	_oldFadePercent = 0;
 	_scrollSize = 0;
+	_scrollSpeed = 0;
 	_currentScroll = 0;
 	_targetScroll = 0;
+	_flushScreen = false;
 }
 
 Screen::~Screen() {
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index e730329ab4..ae368cf633 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -71,8 +71,6 @@ private:
 	int _oldFadePercent;
 	byte _lookupTable[PALETTE_COUNT];
 	byte _lookupTable1[PALETTE_COUNT];
-	int _scrollSize;
-	int _targetScroll;
 private:
 	/**
 	 * Merges together overlapping dirty areas of the screen
@@ -101,7 +99,9 @@ public:
 	byte _cMap[PALETTE_SIZE];
 	byte _sMap[PALETTE_SIZE];
 	byte _tMap[PALETTE_SIZE];
-	int _currentScroll;
+	int _currentScroll, _targetScroll;
+	int _scrollSize, _scrollSpeed;
+	bool _flushScreen;
 public:
 	Screen(SherlockEngine *vm);
 	virtual ~Screen();
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 06ec62b6a2..5858daffc5 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2352,6 +2352,31 @@ void TattooUserInterface::doBgAnimRestoreUI() {
 		screen.restoreBackground(scene._activeCAnim._removeBounds);
 }
 
+void TattooUserInterface::doScroll() {
+	Screen &screen = *_vm->_screen;
+	int oldScroll = screen._currentScroll;
+
+	// If we're already at the target scroll position, nothing needs to be done
+	if (screen._targetScroll == screen._currentScroll)
+		return;
+
+	screen._flushScreen = true;
+	if (screen._targetScroll > screen._currentScroll) {
+		screen._currentScroll += screen._scrollSpeed;
+		if (screen._currentScroll > screen._targetScroll)
+			screen._currentScroll = screen._targetScroll;
+	} else if (screen._targetScroll < screen._currentScroll) {
+		screen._currentScroll -= screen._scrollSpeed;
+		if (screen._currentScroll < screen._targetScroll)
+			screen._currentScroll = screen._targetScroll;
+	}
+
+	if (_menuBuffer != nullptr)
+		_menuBounds.translate(screen._currentScroll - oldScroll, 0);
+	if (_invMenuBuffer != nullptr)
+		_invMenuBounds.translate(screen._currentScroll - oldScroll, 0);
+}
+
 } // End of namespace Tattoo
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index 7a640efea1..dfd6d02efd 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -333,7 +333,15 @@ private:
 public:
 	TattooUserInterface(SherlockEngine *vm);
 
+	/**
+	 * Handles restoring any areas of the back buffer that were/are covered by UI elements
+	 */
 	void doBgAnimRestoreUI();
+
+	/**
+	 * Checks to see if the screen needs to be scrolled. If so, scrolls it towards the target position
+	 */
+	void doScroll();
 public:
 	virtual ~TattooUserInterface() {}
 
-- 
cgit v1.2.3


From f4902b516ec8486338b777354809171112671e5b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 May 2015 08:31:53 -0400
Subject: SHERLOCK: Moving split up classes into their own files

---
 engines/sherlock/inventory.cpp                     |   67 +-
 engines/sherlock/module.mk                         |    6 +-
 engines/sherlock/scalpel/scalpel_scene.cpp         |  381 ++++
 engines/sherlock/scalpel/scalpel_scene.h           |   61 +
 .../sherlock/scalpel/scalpel_user_interface.cpp    | 2276 +++++++++++++++++++
 engines/sherlock/scalpel/scalpel_user_interface.h  |  227 ++
 engines/sherlock/scalpel/settings.cpp              |  341 +++
 engines/sherlock/scalpel/settings.h                |   63 +
 engines/sherlock/scene.cpp                         |  552 +----
 engines/sherlock/scene.h                           |   55 -
 engines/sherlock/settings.cpp                      |  340 ---
 engines/sherlock/settings.h                        |   63 -
 engines/sherlock/talk.cpp                          |    7 +-
 engines/sherlock/tattoo/tattoo_scene.cpp           |  227 ++
 engines/sherlock/tattoo/tattoo_scene.h             |   65 +
 engines/sherlock/tattoo/tattoo_user_interface.cpp  |  106 +
 engines/sherlock/tattoo/tattoo_user_interface.h    |   68 +
 engines/sherlock/user_interface.cpp                | 2330 +-------------------
 engines/sherlock/user_interface.h                  |  228 --
 19 files changed, 3862 insertions(+), 3601 deletions(-)
 create mode 100644 engines/sherlock/scalpel/scalpel_scene.cpp
 create mode 100644 engines/sherlock/scalpel/scalpel_scene.h
 create mode 100644 engines/sherlock/scalpel/scalpel_user_interface.cpp
 create mode 100644 engines/sherlock/scalpel/scalpel_user_interface.h
 create mode 100644 engines/sherlock/scalpel/settings.cpp
 create mode 100644 engines/sherlock/scalpel/settings.h
 delete mode 100644 engines/sherlock/settings.cpp
 delete mode 100644 engines/sherlock/settings.h
 create mode 100644 engines/sherlock/tattoo/tattoo_scene.cpp
 create mode 100644 engines/sherlock/tattoo/tattoo_scene.h
 create mode 100644 engines/sherlock/tattoo/tattoo_user_interface.cpp
 create mode 100644 engines/sherlock/tattoo/tattoo_user_interface.h

diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp
index 7ec0b6421d..a8ecb64102 100644
--- a/engines/sherlock/inventory.cpp
+++ b/engines/sherlock/inventory.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/inventory.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/scalpel/scalpel_user_interface.h"
 
 namespace Sherlock {
 
@@ -200,29 +201,29 @@ void Inventory::drawInventory(InvNewMode mode) {
 		INV_BACKGROUND);
 
 	// Draw the buttons
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[0][0], CONTROLS_Y1, INVENTORY_POINTS[0][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[1][0], CONTROLS_Y1, INVENTORY_POINTS[1][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[1][2] - screen.stringWidth("Look") / 2, "Look");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[2][0], CONTROLS_Y1, INVENTORY_POINTS[2][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[2][2] - screen.stringWidth("Use") / 2, "Use");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[3][0], CONTROLS_Y1, INVENTORY_POINTS[3][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[3][2] - screen.stringWidth("Give") / 2, "Give");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[4][0], CONTROLS_Y1, INVENTORY_POINTS[4][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[4][2], "^^");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[5][0], CONTROLS_Y1, INVENTORY_POINTS[5][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[5][2], "^");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[6][0], CONTROLS_Y1, INVENTORY_POINTS[6][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[6][2], "_");
-	screen.makeButton(Common::Rect(INVENTORY_POINTS[7][0], CONTROLS_Y1, INVENTORY_POINTS[7][1],
-		CONTROLS_Y1 + 10), INVENTORY_POINTS[7][2], "__");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[0][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[0][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[0][2] - screen.stringWidth("Exit") / 2, "Exit");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[1][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[1][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[1][2] - screen.stringWidth("Look") / 2, "Look");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[2][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[2][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[2][2] - screen.stringWidth("Use") / 2, "Use");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[3][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[3][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[3][2] - screen.stringWidth("Give") / 2, "Give");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[4][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[4][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[4][2], "^^");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[5][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[5][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[5][2], "^");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[6][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[6][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[6][2], "_");
+	screen.makeButton(Common::Rect(Scalpel::INVENTORY_POINTS[7][0], CONTROLS_Y1, Scalpel::INVENTORY_POINTS[7][1],
+		CONTROLS_Y1 + 10), Scalpel::INVENTORY_POINTS[7][2], "__");
 
 	if (tempMode == INVENTORY_DONT_DISPLAY)
 		mode = LOOK_INVENTORY_MODE;
 	_invMode = (InvMode)mode;
 
 	if (mode != PLAIN_INVENTORY) {
-		ui._oldKey = INVENTORY_COMMANDS[(int)mode];
+		ui._oldKey = Scalpel::INVENTORY_COMMANDS[(int)mode];
 	} else {
 		ui._oldKey = -1;
 	}
@@ -252,55 +253,55 @@ void Inventory::invCommands(bool slamIt) {
 	UserInterface &ui = *_vm->_ui;
 
 	if (slamIt) {
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[0][2], CONTROLS_Y1),
 			_invMode == INVMODE_EXIT ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
 			true, "Exit");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[1][2], CONTROLS_Y1),
 			_invMode == INVMODE_LOOK ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND,
 			true, "Look");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[2][2], CONTROLS_Y1),
 			_invMode == INVMODE_USE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Use");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[3][2], CONTROLS_Y1),
 			_invMode == INVMODE_GIVE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			true, "Give");
-		screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
+		screen.print(Common::Point(Scalpel::INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^^");
-		screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
+		screen.print(Common::Point(Scalpel::INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^");
-		screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
+		screen.print(Common::Point(Scalpel::INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"_");
-		screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
+		screen.print(Common::Point(Scalpel::INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1),
 			(_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"__");
 		if (_invMode != INVMODE_LOOK)
 			ui.clearInfo();
 	} else {
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[0][2], CONTROLS_Y1),
 			_invMode == INVMODE_EXIT ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Exit");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[1][2], CONTROLS_Y1),
 			_invMode == INVMODE_LOOK ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Look");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[2][2], CONTROLS_Y1),
 			_invMode == INVMODE_USE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Use");
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1),
+		screen.buttonPrint(Common::Point(Scalpel::INVENTORY_POINTS[3][2], CONTROLS_Y1),
 			_invMode == INVMODE_GIVE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND,
 			false, "Give");
-		screen.gPrint(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1),
+		screen.gPrint(Common::Point(Scalpel::INVENTORY_POINTS[4][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^^");
-		screen.gPrint(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1),
+		screen.gPrint(Common::Point(Scalpel::INVENTORY_POINTS[5][2], CONTROLS_Y1),
 			_invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"^");
-		screen.gPrint(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1),
+		screen.gPrint(Common::Point(Scalpel::INVENTORY_POINTS[6][2], CONTROLS_Y1),
 			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"_");
-		screen.gPrint(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1),
+		screen.gPrint(Common::Point(Scalpel::INVENTORY_POINTS[7][2], CONTROLS_Y1),
 			(_holdings - _invIndex < 7) ? COMMAND_NULL : COMMAND_FOREGROUND,
 			"__");
 	}
diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 2ded999ed1..cee48ae2d3 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -3,7 +3,12 @@ MODULE := engines/sherlock
 MODULE_OBJS = \
 	scalpel/darts.o \
 	scalpel/scalpel.o \
+	scalpel/scalpel_scene.o \
+	scalpel/scalpel_user_interface.o \
+	scalpel/settings.o \
 	tattoo/tattoo.o \
+	tattoo/tattoo_scene.o \
+	tattoo/tattoo_user_interface.o \
 	animation.o \
 	debugger.o \
 	detection.o \
@@ -17,7 +22,6 @@ MODULE_OBJS = \
 	saveload.o \
 	scene.o \
 	screen.o \
-	settings.o \
 	sherlock.o \
 	sound.o \
 	surface.o \
diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp
new file mode 100644
index 0000000000..b6a42419d8
--- /dev/null
+++ b/engines/sherlock/scalpel/scalpel_scene.cpp
@@ -0,0 +1,381 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scalpel/scalpel_scene.h"
+#include "sherlock/scalpel/scalpel.h"
+#include "sherlock/events.h"
+#include "sherlock/people.h"
+#include "sherlock/screen.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+void ScalpelScene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Call the base scene method to handle bg shapes
+	Scene::checkBgShapes();
+
+	// Iterate through the canim list
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &obj = _canimShapes[idx];
+		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
+			if ((obj._flags & 5) == 1) {
+				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
+				NORMAL_FORWARD : NORMAL_BEHIND;
+			} else if (!(obj._flags & 1)) {
+				obj._misc = BEHIND;
+			} else if (obj._flags & 4) {
+				obj._misc = FORWARD;
+			}
+		}
+	}
+}
+
+void ScalpelScene::doBgAnimCheckCursor() {
+	Inventory &inv = *_vm->_inventory;
+	Events &events = *_vm->_events;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	Common::Point mousePos = events.mousePos();
+
+	if (ui._menuMode == LOOK_MODE) {
+		if (mousePos.y > CONTROLS_Y1)
+			events.setCursor(ARROW);
+		else if (mousePos.y < CONTROLS_Y)
+			events.setCursor(MAGNIFY);
+	}
+
+	// Check for setting magnifying glass cursor
+	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
+		if (inv._invMode == INVMODE_LOOK) {
+			// Only show Magnifying glass cursor if it's not on the inventory command line
+			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
+				events.setCursor(MAGNIFY);
+			else
+				events.setCursor(ARROW);
+		} else {
+			events.setCursor(ARROW);
+		}
+	}
+
+	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
+		// Loaded sound just finished playing
+		sound.freeDigiSound();
+	}
+}
+
+void ScalpelScene::doBgAnim() {
+	ScalpelEngine &vm = *((ScalpelEngine *)_vm);
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	talk._talkToAbort = false;
+
+	if (_restoreFlag) {
+		for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+			if (people[idx]._type == CHARACTER)
+				people[idx].checkSprite();
+		}
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
+				_bgShapes[idx].checkObject();
+		}
+
+		if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
+			people._portrait.checkObject();
+
+		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+			if (_canimShapes[idx]._type != INVALID && _canimShapes[idx]._type != REMOVE)
+				_canimShapes[idx].checkObject();
+		}
+
+		if (_currentScene == 12)
+			vm.eraseMirror12();
+
+		// Restore the back buffer from the back buffer 2 in the changed area
+		Common::Rect bounds(people[AL]._oldPosition.x, people[AL]._oldPosition.y,
+			people[AL]._oldPosition.x + people[AL]._oldSize.x,
+			people[AL]._oldPosition.y + people[AL]._oldSize.y);
+		Common::Point pt(bounds.left, bounds.top);
+
+		if (people[AL]._type == CHARACTER)
+			screen.restoreBackground(bounds);
+		else if (people[AL]._type == REMOVE)
+			screen._backBuffer->blitFrom(screen._backBuffer2, pt, bounds);
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &o = _bgShapes[idx];
+			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
+				screen.restoreBackground(o.getOldBounds());
+		}
+
+		if (people._portraitLoaded)
+			screen.restoreBackground(Common::Rect(
+				people._portrait._oldPosition.x, people._portrait._oldPosition.y,
+				people._portrait._oldPosition.x + people._portrait._oldSize.x,
+				people._portrait._oldPosition.y + people._portrait._oldSize.y
+			));
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &o = _bgShapes[idx];
+			if (o._type == NO_SHAPE && ((o._flags & OBJ_BEHIND) == 0)) {
+				// Restore screen area
+				screen._backBuffer->blitFrom(screen._backBuffer2, o._position,
+					Common::Rect(o._position.x, o._position.y,
+					o._position.x + o._noShapeSize.x, o._position.y + o._noShapeSize.y));
+
+				o._oldPosition = o._position;
+				o._oldSize = o._noShapeSize;
+			}
+		}
+
+		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+			Object &o = _canimShapes[idx];
+			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
+				screen.restoreBackground(Common::Rect(o._oldPosition.x, o._oldPosition.y,
+					o._oldPosition.x + o._oldSize.x, o._oldPosition.y + o._oldSize.y));
+		}
+	}
+
+	//
+	// Update the background objects and canimations
+	//
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE || o._type == NO_SHAPE)
+			o.adjustObject();
+	}
+
+	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
+		people._portrait.adjustObject();
+
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		if (_canimShapes[idx]._type != INVALID)
+			_canimShapes[idx].adjustObject();
+	}
+
+	if (people[AL]._type == CHARACTER && people._holmesOn)
+		people[AL].adjustSprite();
+
+	// Flag the bg shapes which need to be redrawn
+	checkBgShapes();
+
+	if (_currentScene == 12)
+		vm.doMirror12();
+
+	// Draw all active shapes which are behind the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+	}
+
+	// Draw all canimations which are behind the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+		}
+	}
+
+	// Draw all active shapes which are HAPPEN and behind the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+	}
+
+	// Draw all canimations which are NORMAL and behind the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+		}
+	}
+
+	// Draw the person if not animating
+	if (people[AL]._type == CHARACTER && people[AL]._walkLoaded) {
+		// If Holmes is too far to the right, move him back so he's on-screen
+		int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[AL]._imageFrame->_frame.w;
+		int tempX = MIN(people[AL]._position.x / FIXED_INT_MULTIPLIER, xRight);
+
+		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT ||
+			people[AL]._sequenceNumber == WALK_UPLEFT || people[AL]._sequenceNumber == STOP_UPLEFT ||
+			people[AL]._sequenceNumber == WALK_DOWNRIGHT || people[AL]._sequenceNumber == STOP_DOWNRIGHT;
+		screen._backBuffer->transBlitFrom(*people[AL]._imageFrame,
+			Common::Point(tempX, people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL]._imageFrame->_frame.h), flipped);
+	}
+
+	// Draw all static and active shapes are NORMAL and are in front of the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+	}
+
+	// Draw all static and active canimations that are NORMAL and are in front of the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD) {
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+		}
+	}
+
+	// Draw all static and active shapes that are in front of the person
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+	}
+
+	// Draw any active portrait
+	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
+		screen._backBuffer->transBlitFrom(*people._portrait._imageFrame,
+			people._portrait._position, people._portrait._flags & OBJ_FLIPPED);
+
+	// Draw all static and active canimations that are in front of the person
+	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
+		Object &o = _canimShapes[idx];
+		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+		}
+	}
+
+	// Draw all NO_SHAPE shapes which have flag bit 0 clear
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &o = _bgShapes[idx];
+		if (o._type == NO_SHAPE && (o._flags & OBJ_BEHIND) == 0)
+			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
+	}
+
+	// Bring the newly built picture to the screen
+	if (_animating == 2) {
+		_animating = 0;
+		screen.slamRect(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	} else {
+		if (people[AL]._type != INVALID && ((_goToScene == -1 || _canimShapes.empty()))) {
+			if (people[AL]._type == REMOVE) {
+				screen.slamRect(Common::Rect(
+					people[AL]._oldPosition.x, people[AL]._oldPosition.y,
+					people[AL]._oldPosition.x + people[AL]._oldSize.x,
+					people[AL]._oldPosition.y + people[AL]._oldSize.y
+				));
+				people[AL]._type = INVALID;
+			} else {
+				screen.flushImage(people[AL]._imageFrame,
+					Common::Point(people[AL]._position.x / FIXED_INT_MULTIPLIER,
+						people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL].frameHeight()),
+					&people[AL]._oldPosition.x, &people[AL]._oldPosition.y,
+					&people[AL]._oldSize.x, &people[AL]._oldSize.y);
+			}
+		}
+
+		if (_currentScene == 12)
+			vm.flushMirror12();
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &o = _bgShapes[idx];
+			if ((o._type == ACTIVE_BG_SHAPE || o._type == REMOVE) && _goToScene == -1) {
+				screen.flushImage(o._imageFrame, o._position,
+					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+			}
+		}
+
+		if (people._portraitLoaded) {
+			if (people._portrait._type == REMOVE)
+				screen.slamRect(Common::Rect(
+					people._portrait._position.x, people._portrait._position.y,
+					people._portrait._position.x + people._portrait._delta.x,
+					people._portrait._position.y + people._portrait._delta.y
+				));
+			else
+				screen.flushImage(people._portrait._imageFrame, people._portrait._position,
+					&people._portrait._oldPosition.x, &people._portrait._oldPosition.y,
+					&people._portrait._oldSize.x, &people._portrait._oldSize.y);
+
+			if (people._portrait._type == REMOVE)
+				people._portrait._type = INVALID;
+		}
+
+		if (_goToScene == -1) {
+			for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+				Object &o = _bgShapes[idx];
+				if (o._type == NO_SHAPE && (o._flags & OBJ_BEHIND) == 0) {
+					screen.slamArea(o._position.x, o._position.y, o._oldSize.x, o._oldSize.y);
+					screen.slamArea(o._oldPosition.x, o._oldPosition.y, o._oldSize.x, o._oldSize.y);
+				} else if (o._type == HIDE_SHAPE) {
+					// Hiding shape, so flush it out and mark it as hidden
+					screen.flushImage(o._imageFrame, o._position,
+						&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+					o._type = HIDDEN;
+				}
+			}
+		}
+
+		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
+			Object &o = _canimShapes[idx];
+
+			if (o._type == INVALID) {
+				// Anim shape was invalidated by checkEndOfSequence, so at this point we can remove it
+				_canimShapes.remove_at(idx);
+			} else  if (o._type == REMOVE) {
+				if (_goToScene == -1)
+					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
+
+				// Shape for an animation is no longer needed, so remove it completely
+				_canimShapes.remove_at(idx);
+			} else if (o._type == ACTIVE_BG_SHAPE) {
+				screen.flushImage(o._imageFrame, o._position,
+					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
+			}
+		}
+	}
+
+	_restoreFlag = true;
+	_doBgAnimDone = true;
+
+	events.wait(3);
+	screen.resetDisplayBounds();
+
+	// Check if the method was called for calling a portrait, and a talk was
+	// interrupting it. This talk file would not have been executed at the time,
+	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
+	if (people._clearingThePortrait && talk._scriptMoreFlag == 3) {
+		// Reset the flags and call to talk
+		people._clearingThePortrait = false;
+		talk._scriptMoreFlag = 0;
+		talk.talkTo(talk._scriptName);
+	}
+}
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel_scene.h b/engines/sherlock/scalpel/scalpel_scene.h
new file mode 100644
index 0000000000..e5a442f44f
--- /dev/null
+++ b/engines/sherlock/scalpel/scalpel_scene.h
@@ -0,0 +1,61 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCALPEL_SCENE_H
+#define SHERLOCK_SCALPEL_SCENE_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/rect.h"
+#include "common/serializer.h"
+#include "sherlock/objects.h"
+#include "sherlock/scene.h"
+#include "sherlock/screen.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+class ScalpelScene : public Scene {
+private:
+	void doBgAnimCheckCursor();
+protected:
+	/**
+	 * Checks all the background shapes. If a background shape is animating,
+	 * it will flag it as needing to be drawn. If a non-animating shape is
+	 * colliding with another shape, it will also flag it as needing drawing
+	 */
+	virtual void checkBgShapes();
+public:
+	ScalpelScene(SherlockEngine *vm) : Scene(vm) {}
+
+	/**
+	 * Draw all objects and characters.
+	 */
+	virtual void doBgAnim();
+};
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
new file mode 100644
index 0000000000..f9ec8bb1bb
--- /dev/null
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -0,0 +1,2276 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/scalpel/scalpel_user_interface.h"
+#include "sherlock/sherlock.h"
+#include "sherlock/scalpel/settings.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+// Main user interface menu control locations
+const int MENU_POINTS[12][4] = {
+	{ 13, 153, 72, 165 },
+	{ 13, 169, 72, 181 },
+	{ 13, 185, 72, 197 },
+	{ 88, 153, 152, 165 },
+	{ 88, 169, 152, 181 },
+	{ 88, 185, 152, 197 },
+	{ 165, 153, 232, 165 },
+	{ 165, 169, 232, 181 },
+	{ 165, 185, 233, 197 },
+	{ 249, 153, 305, 165 },
+	{ 249, 169, 305, 181 },
+	{ 249, 185, 305, 197 }
+};
+
+// Inventory control locations */
+const int INVENTORY_POINTS[8][3] = {
+	{ 4, 50, 29 },
+	{ 52, 99, 77 },
+	{ 101, 140, 123 },
+	{ 142, 187, 166 },
+	{ 189, 219, 198 },
+	{ 221, 251, 234 },
+	{ 253, 283, 266 },
+	{ 285, 315, 294 }
+};
+
+const char COMMANDS[13] = "LMTPOCIUGJFS";
+const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
+const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
+const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
+
+const char *const MOPEN[] = {
+	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "."
+};
+const char *const MCLOSE[] = {
+	"This cannot be closed", "It is already closed", "The safe door is in the way"
+};
+const char *const MMOVE[] = {
+	"This cannot be moved", "It is bolted to the floor", "It is too heavy", "The other crate is in the way"
+};
+const char *const MPICK[] = {
+	"Nothing of interest here", "It is bolted down", "It is too big to carry", "It is too heavy",
+	"I think a girl would be more your type", "Those flowers belong to Penny", "She's far too young for you!",
+	"I think a girl would be more your type!", "Government property for official use only"
+};
+const char *const MUSE[] = {
+	"You can't do that", "It had no effect", "You can't reach it", "OK, the door looks bigger! Happy?",
+	"Doors don't smoke"
+};
+
+/*----------------------------------------------------------------*/
+
+
+ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) {
+	_controls = new ImageFile("menu.all");
+	_controlPanel = new ImageFile("controls.vgs");
+	_keyPress = '\0';
+	_lookHelp = 0;
+	_bgFound = 0;
+	_oldBgFound = -1;
+	_help = _oldHelp = 0;
+	_key = _oldKey = '\0';
+	_temp = _oldTemp = 0;
+	_oldLook = 0;
+	_keyboardInput = false;
+	_pause = false;
+	_cNum = 0;
+	_find = 0;
+	_oldUse = 0;
+}
+
+ScalpelUserInterface::~ScalpelUserInterface() {
+	delete _controls;
+	delete _controlPanel;
+}
+
+void ScalpelUserInterface::reset() {
+	_oldKey = -1;
+	_help = _oldHelp = -1;
+	_oldTemp = _temp = -1;
+}
+
+void ScalpelUserInterface::drawInterface(int bufferNum) {
+	Screen &screen = *_vm->_screen;
+
+	if (bufferNum & 1)
+		screen._backBuffer1.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	if (bufferNum & 2)
+		screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
+	if (bufferNum == 3)
+		screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
+}
+
+void ScalpelUserInterface::handleInput() {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	if (_menuCounter)
+		whileMenuCounter();
+
+	Common::Point pt = events.mousePos();
+	_bgFound = scene.findBgShape(Common::Rect(pt.x, pt.y, pt.x + 1, pt.y + 1));
+	_keyPress = '\0';
+
+	// Check kbd and set the mouse released flag if Enter or space is pressed.
+	// Otherwise, the pressed _key is stored for later use
+	if (events.kbHit()) {
+		Common::KeyState keyState = events.getKey();
+		_keyPress = keyState.ascii;
+
+		if (keyState.keycode == Common::KEYCODE_x && keyState.flags & Common::KBD_ALT) {
+			_vm->quitGame();
+			events.pollEvents();
+			return;
+		}
+	}
+
+	// Do button highlighting check
+	if (!talk._scriptMoreFlag) {	// Don't if scripts are running
+		if (((events._rightPressed || events._rightReleased) && _helpStyle) ||
+				(!_helpStyle && !_menuCounter)) {
+			// Handle any default commands if we're in STD_MODE
+			if (_menuMode == STD_MODE) {
+				if (pt.y < CONTROLS_Y &&
+					(events._rightPressed || (!_helpStyle && !events._released)) &&
+					(_bgFound != -1) && (_bgFound < 1000) &&
+					(scene._bgShapes[_bgFound]._defaultCommand ||
+					!scene._bgShapes[_bgFound]._description.empty())) {
+					// If there is no default command, so set it to Look
+					if (scene._bgShapes[_bgFound]._defaultCommand)
+						_help = scene._bgShapes[_bgFound]._defaultCommand - 1;
+					else
+						_help = 0;
+
+					// Reset 'help' if it is an invalid command
+					if (_help > 5)
+						_help = -1;
+				} else if (pt.y < CONTROLS_Y &&
+					((events._rightReleased && _helpStyle) || (events._released && !_helpStyle)) &&
+					(_bgFound != -1 && _bgFound < 1000) &&
+					(scene._bgShapes[_bgFound]._defaultCommand ||
+					!scene._bgShapes[_bgFound]._description.empty())) {
+					// If there is no default command, set it to Look
+					if (scene._bgShapes[_bgFound]._defaultCommand)
+						_menuMode = (MenuMode)scene._bgShapes[_bgFound]._defaultCommand;
+					else
+						_menuMode = LOOK_MODE;
+					events._released = true;
+					events._pressed = events._oldButtons = false;
+					_help = _oldHelp = -1;
+
+					if (_menuMode == LOOK_MODE) {
+						// Set the flag to tell the game that this was a right-click
+						// call to look and should exit without the look button being pressed
+						_lookHelp = true;
+					}
+				} else {
+					_help = -1;
+				}
+
+				// Check if highlighting a different button than last time
+				if (_help != _oldHelp) {
+					// If another button was highlighted previously, restore it
+					if (_oldHelp != -1)
+						restoreButton(_oldHelp);
+
+					// If we're highlighting a new button, then draw it pressed
+					if (_help != -1)
+						depressButton(_help);
+
+					_oldHelp = _help;
+				}
+
+				if (_bgFound != _oldBgFound || _oldBgFound == -1) {
+					_infoFlag = true;
+					clearInfo();
+
+					if (_help != -1 && !scene._bgShapes[_bgFound]._description.empty()
+							&& scene._bgShapes[_bgFound]._description[0] != ' ')
+						screen.print(Common::Point(0, INFO_LINE + 1),
+						INFO_FOREGROUND, "%s", scene._bgShapes[_bgFound]._description.c_str());
+
+					_oldBgFound = _bgFound;
+				}
+			} else {
+				// We're not in STD_MODE
+				// If there isn't a window open, then revert back to STD_MODE
+				if (!_windowOpen && events._rightReleased) {
+					// Restore all buttons
+					for (int idx = 0; idx < 12; ++idx)
+						restoreButton(idx);
+
+					_menuMode = STD_MODE;
+					_key = _oldKey = -1;
+					_temp = _oldTemp = _lookHelp = _invLookFlag = 0;
+					events.clearEvents();
+				}
+			}
+		}
+	}
+
+	// Reset the old bgshape number if the mouse button is released, so that
+	// it can e re-highlighted when we come back here
+	if ((events._rightReleased && _helpStyle) || (events._released && !_helpStyle))
+		_oldBgFound = -1;
+
+	// Do routines that should be done before input processing
+	switch (_menuMode) {
+	case LOOK_MODE:
+		if (!_windowOpen) {
+			if (events._released && _bgFound >= 0 && _bgFound < 1000) {
+				if (!scene._bgShapes[_bgFound]._examine.empty())
+					examine();
+			} else {
+				lookScreen(pt);
+			}
+		}
+		break;
+
+	case MOVE_MODE:
+	case OPEN_MODE:
+	case CLOSE_MODE:
+	case PICKUP_MODE:
+		lookScreen(pt);
+		break;
+
+	case TALK_MODE:
+		if (!_windowOpen) {
+			bool personFound;
+
+			if (_bgFound >= 1000) {
+				personFound = false;
+				if (!events._released)
+					lookScreen(pt);
+			} else {
+				personFound = _bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON;
+			}
+
+			if (events._released && personFound)
+				talk.talk(_bgFound);
+			else if (personFound)
+				lookScreen(pt);
+			else if (_bgFound < 1000)
+				clearInfo();
+		}
+		break;
+
+	case USE_MODE:
+	case GIVE_MODE:
+	case INV_MODE:
+		if (inv._invMode == INVMODE_LOOK || inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE) {
+			if (pt.y > CONTROLS_Y)
+				lookInv();
+			else
+				lookScreen(pt);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	//
+	// Do input processing
+	//
+	if (events._pressed || events._released || events._rightPressed || _keyPress || _pause) {
+		if (((events._released && (_helpStyle || _help == -1)) || (events._rightReleased && !_helpStyle)) &&
+				(pt.y <= CONTROLS_Y) && (_menuMode == STD_MODE)) {
+			// The mouse was clicked in the playing area with no action buttons down.
+			// Check if the mouse was clicked in a script zone. If it was,
+			// then execute the script. Otherwise, walk to the given position
+			if (scene.checkForZones(pt, SCRIPT_ZONE) != 0 ||
+					scene.checkForZones(pt, NOWALK_ZONE) != 0) {
+				// Mouse clicked in script zone
+				events._pressed = events._released = false;
+			} else {
+				people._walkDest = pt;
+				people._allowWalkAbort = false;
+				people.goAllTheWay();
+			}
+
+			if (_oldKey != -1) {
+				restoreButton(_oldTemp);
+				_oldKey = -1;
+			}
+		}
+
+		// Handle action depending on selected mode
+		switch (_menuMode) {
+		case LOOK_MODE:
+			if (_windowOpen)
+				doLookControl();
+			break;
+
+		case MOVE_MODE:
+			doMiscControl(ALLOW_MOVE);
+			break;
+
+		case TALK_MODE:
+			if (_windowOpen)
+				doTalkControl();
+			break;
+
+		case OPEN_MODE:
+			doMiscControl(ALLOW_OPEN);
+			break;
+
+		case CLOSE_MODE:
+			doMiscControl(ALLOW_CLOSE);
+			break;
+
+		case PICKUP_MODE:
+			doPickControl();
+			break;
+
+		case USE_MODE:
+		case GIVE_MODE:
+		case INV_MODE:
+			doInvControl();
+			break;
+
+		case FILES_MODE:
+			doEnvControl();
+			break;
+
+		default:
+			break;
+		}
+
+		// As long as there isn't an open window, do main input processing.
+		// Windows are opened when in TALK, USE, INV, and GIVE modes
+		if ((!_windowOpen && !_menuCounter && pt.y > CONTROLS_Y) ||
+				_keyPress) {
+			if (events._pressed || events._released || _pause || _keyPress)
+				doMainControl();
+		}
+
+		if (pt.y < CONTROLS_Y && events._pressed && _oldTemp != (int)(_menuMode - 1) && _oldKey != -1)
+			restoreButton(_oldTemp);
+	}
+}
+
+void ScalpelUserInterface::depressButton(int num) {
+	Screen &screen = *_vm->_screen;
+	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+
+	ImageFrame &frame = (*_controls)[num];
+	screen._backBuffer1.transBlitFrom(frame, pt);
+	screen.slamArea(pt.x, pt.y, pt.x + frame._width, pt.y + frame._height);
+}
+
+void ScalpelUserInterface::restoreButton(int num) {
+	Screen &screen = *_vm->_screen;
+	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+	Graphics::Surface &frame = (*_controls)[num]._frame;
+
+	screen._backBuffer1.blitFrom(screen._backBuffer2, pt,
+		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
+	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);
+
+	if (!_menuCounter) {
+		_infoFlag = true;
+		clearInfo();
+	}
+}
+
+void ScalpelUserInterface::pushButton(int num) {
+	Events &events = *_vm->_events;
+	_oldKey = -1;
+
+	if (!events._released) {
+		if (_oldHelp != -1)
+			restoreButton(_oldHelp);
+		if (_help != -1)
+			restoreButton(_help);
+
+		depressButton(num);
+		events.wait(6);
+	}
+
+	restoreButton(num);
+}
+
+void ScalpelUserInterface::toggleButton(int num) {
+	Screen &screen = *_vm->_screen;
+
+	if (_menuMode != (MenuMode)(num + 1)) {
+		_menuMode = (MenuMode)(num + 1);
+		_oldKey = COMMANDS[num];
+		_oldTemp = num;
+
+		if (_keyboardInput) {
+			if (_oldHelp != -1 && _oldHelp != num)
+				restoreButton(_oldHelp);
+			if (_help != -1 && _help != num)
+				restoreButton(_help);
+
+			_keyboardInput = false;
+
+			ImageFrame &frame = (*_controls)[num];
+			Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
+			screen._backBuffer1.transBlitFrom(frame, pt);
+			screen.slamArea(pt.x, pt.y, pt.x + frame._width, pt.y + frame._height);
+		}
+	} else {
+		_menuMode = STD_MODE;
+		_oldKey = -1;
+		restoreButton(num);
+	}
+}
+
+void ScalpelUserInterface::clearInfo() {
+	if (_infoFlag) {
+		_vm->_screen->vgaBar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19,
+			INFO_LINE + 10), INFO_BLACK);
+		_infoFlag = false;
+		_oldLook = -1;
+	}
+}
+
+void ScalpelUserInterface::clearWindow() {
+	if (_windowOpen) {
+		_vm->_screen->vgaBar(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+	}
+}
+
+void ScalpelUserInterface::whileMenuCounter() {
+	if (!(--_menuCounter) || _vm->_events->checkInput()) {
+		_menuCounter = 0;
+		_infoFlag = true;
+		clearInfo();
+	}
+}
+
+void ScalpelUserInterface::examine() {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+	Common::Point pt = events.mousePos();
+
+	if (pt.y < (CONTROLS_Y + 9)) {
+		Object &obj = scene._bgShapes[_bgFound];
+
+		if (obj._lookcAnim != 0) {
+			int canimSpeed = ((obj._lookcAnim & 0xe0) >> 5) + 1;
+			scene._cAnimFramePause = obj._lookFrames;
+			_cAnimStr = obj._examine;
+			_cNum = (obj._lookcAnim & 0x1f) - 1;
+
+			scene.startCAnim(_cNum, canimSpeed);
+		} else if (obj._lookPosition.y != 0) {
+			// Need to walk to the object to be examined
+			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100), obj._lookFacing);
+		}
+
+		if (!talk._talkToAbort) {
+			_cAnimStr = obj._examine;
+			if (obj._lookFlag)
+				_vm->setFlags(obj._lookFlag);
+		}
+	} else {
+		// Looking at an inventory item
+		_cAnimStr = inv[_selector]._examine;
+		if (inv[_selector]._lookFlag)
+			_vm->setFlags(inv[_selector]._lookFlag);
+	}
+
+	if (_invLookFlag) {
+		// Don't close the inventory window when starting an examine display, since its
+		// window will slide up to replace the inventory display
+		_windowOpen = false;
+		_menuMode = LOOK_MODE;
+	}
+
+	if (!talk._talkToAbort) {
+		if (!scene._cAnimFramePause)
+			printObjectDesc(_cAnimStr, true);
+		else
+			// description was already printed in startCAnimation
+			scene._cAnimFramePause = 0;
+	}
+}
+
+void ScalpelUserInterface::lookScreen(const Common::Point &pt) {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Common::Point mousePos = events.mousePos();
+	int temp;
+	Common::String tempStr;
+
+	// Don't display anything for right button command
+	if ((events._rightPressed || events._rightPressed) && !events._pressed)
+		return;
+
+	if (mousePos.y < CONTROLS_Y && (temp = _bgFound) != -1) {
+		if (temp != _oldLook) {
+			_infoFlag = true;
+			clearInfo();
+
+			if (temp < 1000)
+				tempStr = scene._bgShapes[temp]._description;
+			else
+				tempStr = scene._bgShapes[temp - 1000]._description;
+
+			_infoFlag = true;
+			clearInfo();
+
+			// Only print description if there is one
+			if (!tempStr.empty() && tempStr[0] != ' ') {
+				// If inventory is active and an item is selected for a Use or Give action
+				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
+						(inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE)) {
+					int width1 = 0, width2 = 0;
+					int x, width;
+					if (inv._invMode == INVMODE_USE) {
+						// Using an object
+						x = width = screen.stringWidth("Use ");
+
+						if (temp < 1000 && scene._bgShapes[temp]._aType != PERSON)
+							// It's not a person, so make it lowercase
+							tempStr.setChar(tolower(tempStr[0]), 0);
+
+						x += screen.stringWidth(tempStr);
+
+						// If we're using an inventory object, add in the width
+						// of the object name and the " on "
+						if (_selector != -1) {
+							width1 = screen.stringWidth(inv[_selector]._name);
+							x += width1;
+							width2 = screen.stringWidth(" on ");
+							x += width2;
+						}
+
+						// If the line will be too long, keep cutting off characters
+						// until the string will fit
+						while (x > 280) {
+							x -= screen.charWidth(tempStr.lastChar());
+							tempStr.deleteLastChar();
+						}
+
+						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
+						screen.print(Common::Point(xStart, INFO_LINE + 1),
+							INFO_FOREGROUND, "Use ");
+
+						if (_selector != -1) {
+							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
+								TALK_FOREGROUND, "%s", inv[_selector]._name.c_str());
+							screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
+								INFO_FOREGROUND, " on ");
+							screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
+								INFO_FOREGROUND, "%s", tempStr.c_str());
+						} else {
+							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
+								INFO_FOREGROUND, "%s", tempStr.c_str());
+						}
+					} else if (temp >= 0 && temp < 1000 && _selector != -1 &&
+							scene._bgShapes[temp]._aType == PERSON) {
+						// Giving an object to a person
+						width1 = screen.stringWidth(inv[_selector]._name);
+						x = width = screen.stringWidth("Give ");
+						x += width1;
+						width2 = screen.stringWidth(" to ");
+						x += width2;
+						x += screen.stringWidth(tempStr);
+
+						// Ensure string will fit on-screen
+						while (x > 280) {
+							x -= screen.charWidth(tempStr.lastChar());
+							tempStr.deleteLastChar();
+						}
+
+						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
+						screen.print(Common::Point(xStart, INFO_LINE + 1),
+							INFO_FOREGROUND, "Give ");
+						screen.print(Common::Point(xStart + width, INFO_LINE + 1),
+							TALK_FOREGROUND, "%s", inv[_selector]._name.c_str());
+						screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
+							INFO_FOREGROUND, " to ");
+						screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
+							INFO_FOREGROUND, "%s", tempStr.c_str());
+					}
+				} else {
+					screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempStr.c_str());
+				}
+
+				_infoFlag = true;
+				_oldLook = temp;
+			}
+		}
+	} else {
+		clearInfo();
+	}
+}
+
+void ScalpelUserInterface::lookInv() {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+	Common::Point mousePos = events.mousePos();
+
+	if (mousePos.x > 15 && mousePos.x < 314 && mousePos.y > (CONTROLS_Y1 + 11)
+			&& mousePos.y < (SHERLOCK_SCREEN_HEIGHT - 2)) {
+		int temp = (mousePos.x - 6) / 52 + inv._invIndex;
+		if (temp < inv._holdings) {
+			if (temp < inv._holdings) {
+				clearInfo();
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
+					"%s", inv[temp]._description.c_str());
+				_infoFlag = true;
+				_oldLook = temp;
+			}
+		} else {
+			clearInfo();
+		}
+	} else {
+		clearInfo();
+	}
+}
+
+void ScalpelUserInterface::doEnvControl() {
+	Events &events = *_vm->_events;
+	SaveManager &saves = *_vm->_saves;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	Common::Point mousePos = events.mousePos();
+	static const char ENV_COMMANDS[7] = "ELSUDQ";
+
+	byte color;
+
+	_key = _oldKey = -1;
+	_keyboardInput = false;
+	int found = saves.getHighlightedButton();
+
+	if (events._pressed || events._released) {
+		events.clearKeyboard();
+
+		// Check for a filename entry being highlighted
+		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10)) {
+			int found1 = 0;
+			for (_selector = 0; (_selector < ONSCREEN_FILES_COUNT) && !found1; ++_selector)
+				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
+					found1 = 1;
+
+			if (_selector + saves._savegameIndex - 1 < MAX_SAVEGAME_SLOTS + (saves._envMode != SAVEMODE_LOAD))
+				_selector = _selector + saves._savegameIndex - 1;
+			else
+				_selector = -1;
+
+			if (!found1)
+				_selector = -1;
+		}
+
+		// Handle selecting buttons, if any
+		saves.highlightButtons(found);
+
+		if (found == 0 || found == 5)
+			saves._envMode = SAVEMODE_NONE;
+	}
+
+	if (_keyPress) {
+		_key = toupper(_keyPress);
+
+		// Escape _key will close the dialog
+		if (_key == Common::KEYCODE_ESCAPE)
+			_key = 'E';
+
+		if (_key == 'E' || _key == 'L' || _key == 'S' || _key == 'U' || _key == 'D' || _key == 'Q') {
+			const char *chP = strchr(ENV_COMMANDS, _key);
+			int btnIndex = !chP ? -1 : chP - ENV_COMMANDS;
+			saves.highlightButtons(btnIndex);
+			_keyboardInput = true;
+
+			if (_key == 'E' || _key == 'Q') {
+				saves._envMode = SAVEMODE_NONE;
+			} else if (_key >= '1' && _key <= '9') {
+				_keyboardInput = true;
+				_selector = _key - '1';
+				if (_selector >= MAX_SAVEGAME_SLOTS + (saves._envMode == SAVEMODE_LOAD ? 0 : 1))
+					_selector = -1;
+
+				if (saves.checkGameOnScreen(_selector))
+					_oldSelector = _selector;
+			} else {
+				_selector = -1;
+			}
+		}
+	}
+
+	if (_selector != _oldSelector)  {
+		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + ONSCREEN_FILES_COUNT)) {
+			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
+				INV_FOREGROUND, "%d.", _oldSelector + 1);
+			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
+				INV_FOREGROUND, "%s", saves._savegames[_oldSelector].c_str());
+		}
+
+		if (_selector != -1) {
+			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10),
+				TALK_FOREGROUND, "%d.", _selector + 1);
+			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10),
+				TALK_FOREGROUND, "%s", saves._savegames[_selector].c_str());
+		}
+
+		_oldSelector = _selector;
+	}
+
+	if (events._released || _keyboardInput) {
+		if ((found == 0 && events._released) || _key == 'E') {
+			banishWindow();
+			_windowBounds.top = CONTROLS_Y1;
+
+			events._pressed = events._released = _keyboardInput = false;
+			_keyPress = '\0';
+		} else if ((found == 1 && events._released) || _key == 'L') {
+			saves._envMode = SAVEMODE_LOAD;
+			if (_selector != -1) {
+				saves.loadGame(_selector + 1);
+			}
+		} else if ((found == 2 && events._released) || _key == 'S') {
+			saves._envMode = SAVEMODE_SAVE;
+			if (_selector != -1) {
+				if (saves.checkGameOnScreen(_selector))
+					_oldSelector = _selector;
+
+				if (saves.promptForDescription(_selector)) {
+					saves.saveGame(_selector + 1, saves._savegames[_selector]);
+
+					banishWindow(1);
+					_windowBounds.top = CONTROLS_Y1;
+					_key = _oldKey = -1;
+					_keyPress = '\0';
+					_keyboardInput = false;
+				} else {
+					if (!talk._talkToAbort) {
+						screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10,
+							SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
+						screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND,
+							"%d.", _selector + 1);
+						screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND,
+							"%s", saves._savegames[_selector].c_str());
+
+						screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
+						_selector = _oldSelector = -1;
+					}
+				}
+			}
+		} else if (((found == 3 && events._released) || _key == 'U') && saves._savegameIndex) {
+			bool moreKeys;
+			do {
+				saves._savegameIndex--;
+				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+
+				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT); ++idx) {
+					color = INV_FOREGROUND;
+					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT))
+						color = TALK_FOREGROUND;
+
+					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%d.", idx + 1);
+					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%s", saves._savegames[idx].c_str());
+				}
+
+				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
+
+				color = !saves._savegameIndex ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
+				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
+
+				// Check whether there are more pending U keys pressed
+				moreKeys = false;
+				if (events.kbHit()) {
+					Common::KeyState keyState = events.getKey();
+
+					_key = toupper(keyState.keycode);
+					moreKeys = _key == 'U';
+				}
+			} while ((saves._savegameIndex) && moreKeys);
+		} else if (((found == 4 && events._released) || _key == 'D') && saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT)) {
+			bool moreKeys;
+			do {
+				saves._savegameIndex++;
+				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+
+				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT); ++idx) {
+					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT))
+						color = TALK_FOREGROUND;
+					else
+						color = INV_FOREGROUND;
+
+					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
+						"%d.", idx + 1);
+					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
+						"%s", saves._savegames[idx].c_str());
+				}
+
+				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
+
+				color = (!saves._savegameIndex) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
+
+				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) ? COMMAND_NULL : COMMAND_FOREGROUND;
+				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
+
+				// Check whether there are more pending D keys pressed
+				moreKeys = false;
+				if (events.kbHit()) {
+					Common::KeyState keyState;
+					_key = toupper(keyState.keycode);
+
+					moreKeys = _key == 'D';
+				}
+			} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) && moreKeys);
+		} else if ((found == 5 && events._released) || _key == 'Q') {
+			clearWindow();
+			screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
+			screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
+
+			screen.makeButton(Common::Rect(112, CONTROLS_Y, 160, CONTROLS_Y + 10), 136 - screen.stringWidth("Yes") / 2, "Yes");
+			screen.makeButton(Common::Rect(161, CONTROLS_Y, 209, CONTROLS_Y + 10), 184 - screen.stringWidth("No") / 2, "No");
+			screen.slamArea(112, CONTROLS_Y, 97, 10);
+
+			do {
+				scene.doBgAnim();
+
+				if (talk._talkToAbort)
+					return;
+
+				events.pollEventsAndWait();
+				events.setButtonState();
+				mousePos = events.mousePos();
+
+				if (events.kbHit()) {
+					Common::KeyState keyState = events.getKey();
+					_key = toupper(keyState.keycode);
+
+					if (_key == 'X' && (keyState.flags & Common::KBD_ALT) != 0) {
+						_vm->quitGame();
+						events.pollEvents();
+						return;
+					}
+
+					if (_key == Common::KEYCODE_ESCAPE)
+						_key = 'N';
+
+					if (_key == Common::KEYCODE_RETURN || _key == ' ') {
+						events._pressed = false;
+						events._released = true;
+						events._oldButtons = 0;
+						_keyPress = '\0';
+					}
+				}
+
+				if (events._pressed || events._released) {
+					if (mousePos.x > 112 && mousePos.x < 159 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9))
+						color = COMMAND_HIGHLIGHTED;
+					else
+						color = COMMAND_FOREGROUND;
+					screen.buttonPrint(Common::Point(136, CONTROLS_Y), color, true, "Yes");
+
+					if (mousePos.x > 161 && mousePos.x < 208 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9))
+						color = COMMAND_HIGHLIGHTED;
+					else
+						color = COMMAND_FOREGROUND;
+					screen.buttonPrint(Common::Point(184, CONTROLS_Y), color, true, "No");
+				}
+
+				if (mousePos.x > 112 && mousePos.x < 159 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9) && events._released)
+					_key = 'Y';
+
+				if (mousePos.x > 161 && mousePos.x < 208 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9) && events._released)
+					_key = 'N';
+			} while (!_vm->shouldQuit() && _key != 'Y' && _key != 'N');
+
+			if (_key == 'Y') {
+				_vm->quitGame();
+				events.pollEvents();
+				return;
+			} else {
+				screen.buttonPrint(Common::Point(184, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "No");
+				banishWindow(1);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = -1;
+			}
+		} else {
+			if (_selector != -1) {
+				// Are we already in Load mode?
+				if (saves._envMode == SAVEMODE_LOAD) {
+					saves.loadGame(_selector + 1);
+				} else if (saves._envMode == SAVEMODE_SAVE || saves.isSlotEmpty(_selector)) {
+					// We're already in save mode, or pointing to an empty save slot
+					if (saves.checkGameOnScreen(_selector))
+						_oldSelector = _selector;
+
+					if (saves.promptForDescription(_selector)) {
+						saves.saveGame(_selector + 1, saves._savegames[_selector]);
+						banishWindow();
+						_windowBounds.top = CONTROLS_Y1;
+						_key = _oldKey = -1;
+						_keyPress = '\0';
+						_keyboardInput = false;
+					} else {
+						if (!talk._talkToAbort) {
+							screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10,
+								317, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
+							screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10),
+								INV_FOREGROUND, "%d.", _selector + 1);
+							screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10),
+								INV_FOREGROUND, "%s", saves._savegames[_selector].c_str());
+							screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
+							_selector = _oldSelector = -1;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void ScalpelUserInterface::doInvControl() {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	int colors[8];
+	Common::Point mousePos = events.mousePos();
+
+	_key = _oldKey = -1;
+	_keyboardInput = false;
+
+	// Check whether any inventory slot is highlighted
+	int found = -1;
+	Common::fill(&colors[0], &colors[8], (int)COMMAND_FOREGROUND);
+	for (int idx = 0; idx < 8; ++idx) {
+		Common::Rect r(INVENTORY_POINTS[idx][0], CONTROLS_Y1,
+			INVENTORY_POINTS[idx][1], CONTROLS_Y1 + 10);
+		if (r.contains(mousePos)) {
+			found = idx;
+			break;
+		}
+	}
+
+	if (events._pressed || events._released) {
+		events.clearKeyboard();
+
+		if (found != -1)
+			// If a slot highlighted, set its color
+			colors[found] = COMMAND_HIGHLIGHTED;
+		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), colors[0], true, "Exit");
+
+		if (found >= 0 && found <= 3) {
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[2], true, "Use");
+			screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[3], true, "Give");
+			inv._invMode = (InvMode)found;
+			_selector = -1;
+		}
+
+		if (inv._invIndex) {
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), colors[4], "^^");
+			screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1), colors[5], "^");
+		}
+
+		if ((inv._holdings - inv._invIndex) > 6) {
+			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), colors[6], "_");
+			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), colors[7], "__");
+		}
+
+		bool flag = false;
+		if (inv._invMode == INVMODE_LOOK || inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE) {
+			Common::Rect r(15, CONTROLS_Y1 + 11, 314, SHERLOCK_SCREEN_HEIGHT - 2);
+			if (r.contains(mousePos)) {
+				_selector = (mousePos.x - 6) / 52 + inv._invIndex;
+				if (_selector < inv._holdings)
+					flag = true;
+			}
+		}
+
+		if (!flag && mousePos.y >(CONTROLS_Y1 + 11))
+			_selector = -1;
+	}
+
+	if (_keyPress) {
+		_key = toupper(_keyPress);
+
+		if (_key == Common::KEYCODE_ESCAPE)
+			// Escape will also 'E'xit out of inventory display
+			_key = 'E';
+
+		if (_key == 'E' || _key == 'L' || _key == 'U' || _key == 'G'
+				|| _key == '-' || _key == '+') {
+			InvMode temp = inv._invMode;
+
+			const char *chP = strchr(INVENTORY_COMMANDS, _key);
+			inv._invMode = !chP ? INVMODE_INVALID : (InvMode)(chP - INVENTORY_COMMANDS);
+			inv.invCommands(true);
+
+			inv._invMode = temp;
+			_keyboardInput = true;
+			if (_key == 'E')
+				inv._invMode = INVMODE_EXIT;
+			_selector = -1;
+		} else {
+			_selector = -1;
+		}
+	}
+
+	if (_selector != _oldSelector) {
+		if (_oldSelector != -1) {
+			// Un-highlight
+			if (_oldSelector >= inv._invIndex && _oldSelector < (inv._invIndex + 6))
+				inv.highlight(_oldSelector, BUTTON_MIDDLE);
+		}
+
+		if (_selector != -1)
+			inv.highlight(_selector, 235);
+
+		_oldSelector = _selector;
+	}
+
+	if (events._released || _keyboardInput) {
+		if ((found == 0 && events._released) || _key == 'E') {
+			inv.freeInv();
+			_infoFlag = true;
+			clearInfo();
+			banishWindow(false);
+			_key = -1;
+			events.clearEvents();
+			events.setCursor(ARROW);
+		} else if ((found == 1 && events._released) || (_key == 'L')) {
+			inv._invMode = INVMODE_LOOK;
+		} else if ((found == 2 && events._released) || (_key == 'U')) {
+			inv._invMode = INVMODE_USE;
+		} else if ((found == 3 && events._released) || (_key == 'G')) {
+			inv._invMode = INVMODE_GIVE;
+		} else if (((found == 4 && events._released) || _key == ',') && inv._invIndex) {
+			if (inv._invIndex >= 6)
+				inv._invIndex -= 6;
+			else
+				inv._invIndex = 0;
+
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
+				COMMAND_HIGHLIGHTED, "^^");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(SLAM_DISPLAY);
+			inv.invCommands(true);
+		} else if (((found == 5 && events._released) || _key == '-') && inv._invIndex > 0) {
+			--inv._invIndex;
+			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "^");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(SLAM_DISPLAY);
+			inv.invCommands(true);
+		} else if (((found == 6 && events._released) || _key == '+') &&  (inv._holdings - inv._invIndex) > 6) {
+			++inv._invIndex;
+			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(SLAM_DISPLAY);
+			inv.invCommands(true);
+		} else if (((found == 7 && events._released) || _key == '.') && (inv._holdings - inv._invIndex) > 6) {
+			inv._invIndex += 6;
+			if ((inv._holdings - 6) < inv._invIndex)
+				inv._invIndex = inv._holdings - 6;
+
+			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
+			inv.freeGraphics();
+			inv.loadGraphics();
+			inv.putInv(SLAM_DISPLAY);
+			inv.invCommands(true);
+		} else {
+			// If something is being given, make sure it's being given to a person
+			if (inv._invMode == INVMODE_GIVE) {
+				if (_bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON)
+					_find = _bgFound;
+				else
+					_find = -1;
+			} else {
+				_find = _bgFound;
+			}
+
+			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == INVMODE_LOOK) && (_find >= 0) && (_find < 1000)) {
+				if (!scene._bgShapes[_find]._examine.empty() &&
+						scene._bgShapes[_find]._examine[0] >= ' ')
+					inv.refreshInv();
+			} else if (_selector != -1 || _find >= 0) {
+				// Selector is the inventory object that was clicked on, or selected.
+				// If it's -1, then no inventory item is highlighted yet. Otherwise,
+				// an object in the scene has been clicked.
+
+				if (_selector != -1 && inv._invMode == INVMODE_LOOK
+						&& mousePos.y >(CONTROLS_Y1 + 11))
+					inv.refreshInv();
+
+				if (talk._talkToAbort)
+					return;
+
+				// Now check for the Use and Give actions. If inv_mode is INVMODE_GIVE,
+				// that means GIVE is in effect, _selector is the object being
+				// given, and _find is the target.
+				// The same applies to USE, except if _selector is -1, then USE
+				// is being tried on an object in the scene without an inventory
+				// object being highlighted first.
+
+				if ((inv._invMode == INVMODE_USE || (_selector != -1 && inv._invMode == INVMODE_GIVE)) && _find >= 0) {
+					events._pressed = events._released = false;
+					_infoFlag = true;
+					clearInfo();
+
+					int tempSel = _selector;	// Save the selector
+					_selector = -1;
+
+					inv.putInv(SLAM_DISPLAY);
+					_selector = tempSel;		// Restore it
+					InvMode tempMode = inv._invMode;
+					inv._invMode = INVMODE_USE55;
+					inv.invCommands(true);
+
+					_infoFlag = true;
+					clearInfo();
+					banishWindow(false);
+					_key = -1;
+
+					inv.freeInv();
+
+					bool giveFl = (tempMode >= INVMODE_GIVE);
+					if (_selector >= 0)
+						// Use/Give inv object with scene object
+						checkUseAction(&scene._bgShapes[_find]._use[0], inv[_selector]._name, MUSE, _find, giveFl);
+					else
+						// Now inv object has been highlighted
+						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF*", MUSE, _find, giveFl);
+
+					_selector = _oldSelector = -1;
+				}
+			}
+		}
+	}
+}
+
+void ScalpelUserInterface::doLookControl() {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+
+	_key = _oldKey = -1;
+	_keyboardInput = (_keyPress != '\0');
+
+	if (events._released || events._rightReleased || _keyboardInput) {
+		// Is an inventory object being looked at?
+		if (!_invLookFlag) {
+			// Is there any remaining text to display?
+			if (!_descStr.empty()) {
+				printObjectDesc(_descStr, false);
+			} else if (!_lookHelp) {
+				// Need to close the window and depress the Look button
+				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
+				screen._backBuffer2.blitFrom((*_controls)[0], pt);
+				banishWindow(true);
+
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+				_temp = _oldTemp = 0;
+				_menuMode = LOOK_MODE;
+				events.clearEvents();
+
+				// Restore UI
+				drawInterface();
+			} else {
+				events.setCursor(ARROW);
+				banishWindow(true);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = -1;
+				_temp = _oldTemp = 0;
+				_menuMode = STD_MODE;
+				events.clearEvents();
+			}
+		} else {
+			// Looking at an inventory object
+			// Backup the user interface
+			Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1);
+			tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
+				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+			inv.drawInventory(INVENTORY_DONT_DISPLAY);
+			banishWindow(true);
+
+			// Restore the ui
+			screen._backBuffer2.blitFrom(tempSurface, Common::Point(0, CONTROLS_Y1));
+
+			_windowBounds.top = CONTROLS_Y1;
+			_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+			_temp = _oldTemp = 0;
+			events.clearEvents();
+			_invLookFlag = false;
+			_menuMode = INV_MODE;
+			_windowOpen = true;
+		}
+	}
+}
+
+void ScalpelUserInterface::doMainControl() {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	SaveManager &saves = *_vm->_saves;
+	Common::Point pt = events.mousePos();
+
+	if ((events._pressed || events._released) && pt.y > CONTROLS_Y) {
+		events.clearKeyboard();
+		_key = -1;
+
+		// Check whether the mouse is in any of the command areas
+		for (_temp = 0; (_temp < 12) && (_key == -1); ++_temp) {
+			Common::Rect r(MENU_POINTS[_temp][0], MENU_POINTS[_temp][1],
+				MENU_POINTS[_temp][2], MENU_POINTS[_temp][3]);
+			if (r.contains(pt))
+				_key = COMMANDS[_temp];
+		}
+		--_temp;
+	} else if (_keyPress) {
+		// Keyboard control
+		_keyboardInput = true;
+
+		if (_keyPress >= 'A' && _keyPress <= 'Z') {
+			const char *c = strchr(COMMANDS, _keyPress);
+			_temp = !c ? 12 : c - COMMANDS;
+		} else {
+			_temp = 12;
+		}
+
+		if (_temp == 12)
+			_key = -1;
+
+		if (events._rightPressed) {
+			_temp = 12;
+			_key = -1;
+		}
+	} else if (!events._released) {
+		_key = -1;
+	}
+
+	// Check if the button being pointed to has changed
+	if (_oldKey != _key && !_windowOpen) {
+		// Clear the info line
+		_infoFlag = true;
+		clearInfo();
+
+		// If there was an old button selected, restore it
+		if (_oldKey != -1) {
+			_menuMode = STD_MODE;
+			restoreButton(_oldTemp);
+		}
+
+		// If a new button is being pointed to, highlight it
+		if (_key != -1 && _temp < 12 && !_keyboardInput)
+			depressButton(_temp);
+
+		// Save the new button selection
+		_oldKey = _key;
+		_oldTemp = _temp;
+	}
+
+	if (!events._pressed && !_windowOpen) {
+		switch (_key) {
+		case 'L':
+			toggleButton(0);
+			break;
+		case 'M':
+			toggleButton(1);
+			break;
+		case 'T':
+			toggleButton(2);
+			break;
+		case 'P':
+			toggleButton(3);
+			break;
+		case 'O':
+			toggleButton(4);
+			break;
+		case 'C':
+			toggleButton(5);
+			break;
+		case 'I':
+			pushButton(6);
+			_selector = _oldSelector = -1;
+			_menuMode = INV_MODE;
+			inv.drawInventory(PLAIN_INVENTORY);
+			break;
+		case 'U':
+			pushButton(7);
+			_selector = _oldSelector = -1;
+			_menuMode = USE_MODE;
+			inv.drawInventory(USE_INVENTORY_MODE);
+			break;
+		case 'G':
+			pushButton(8);
+			_selector = _oldSelector = -1;
+			_menuMode = GIVE_MODE;
+			inv.drawInventory(GIVE_INVENTORY_MODE);
+			break;
+		case 'J':
+			pushButton(9);
+			_menuMode = JOURNAL_MODE;
+			journalControl();
+			break;
+		case 'F':
+			pushButton(10);
+
+			// Create a thumbnail of the current screen before the files dialog is shown, in case
+			// the user saves the game
+			saves.createThumbnail();
+
+			_selector = _oldSelector = -1;
+
+			if (_vm->_showOriginalSavesDialog) {
+				// Show the original dialog
+				_menuMode = FILES_MODE;
+				saves.drawInterface();
+				_windowOpen = true;
+			} else {
+				// Show the ScummVM GMM instead
+				_vm->_canLoadSave = true;
+				_vm->openMainMenuDialog();
+				_vm->_canLoadSave = false;
+			}
+			break;
+		case 'S':
+			pushButton(11);
+			_menuMode = SETUP_MODE;
+			Settings::show(_vm);
+			break;
+		default:
+			break;
+		}
+
+		_help = _oldHelp = _oldBgFound = -1;
+	}
+}
+
+void ScalpelUserInterface::doMiscControl(int allowed) {
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+
+	if (events._released) {
+		_temp = _bgFound;
+		if (_bgFound != -1) {
+			// Only allow pointing to objects, not people
+			if (_bgFound < 1000) {
+				events.clearEvents();
+				Object &obj = scene._bgShapes[_bgFound];
+
+				switch (allowed) {
+				case ALLOW_OPEN:
+					checkAction(obj._aOpen, MOPEN, _temp);
+					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
+						_menuMode = STD_MODE;
+						restoreButton(OPEN_MODE - 1);
+						_key = _oldKey = -1;
+					}
+					break;
+
+				case ALLOW_CLOSE:
+					checkAction(obj._aClose, MCLOSE, _temp);
+					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
+						_menuMode = STD_MODE;
+						restoreButton(CLOSE_MODE - 1);
+						_key = _oldKey = -1;
+					}
+					break;
+
+				case ALLOW_MOVE:
+					checkAction(obj._aMove, MMOVE, _temp);
+					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
+						_menuMode = STD_MODE;
+						restoreButton(MOVE_MODE - 1);
+						_key = _oldKey = -1;
+					}
+					break;
+
+				default:
+					break;
+				}
+			}
+		}
+	}
+}
+
+void ScalpelUserInterface::doPickControl() {
+	Events &events = *_vm->_events;
+	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
+
+	if (events._released) {
+		if ((_temp = _bgFound) != -1) {
+			events.clearEvents();
+
+			// Don't allow characters to be picked up
+			if (_bgFound < 1000) {
+				scene._bgShapes[_bgFound].pickUpObject(MPICK);
+
+				if (!talk._talkToAbort && _menuMode != TALK_MODE) {
+					_key = _oldKey = -1;
+					_menuMode = STD_MODE;
+					restoreButton(PICKUP_MODE - 1);
+				}
+			}
+		}
+	}
+}
+
+void ScalpelUserInterface::doTalkControl() {
+	Events &events = *_vm->_events;
+	Journal &journal = *_vm->_journal;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	Talk &talk = *_vm->_talk;
+	Common::Point mousePos = events.mousePos();
+
+	_key = _oldKey = -1;
+	_keyboardInput = false;
+
+	if (events._pressed || events._released) {
+		events.clearKeyboard();
+
+		// Handle button printing
+		if (mousePos.x > 99 && mousePos.x < 138 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && !_endKeyActive)
+			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Exit");
+		else if (_endKeyActive)
+			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
+
+		if (mousePos.x > 140 && mousePos.x < 170 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkUp)
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Up");
+		else if (talk._moreTalkUp)
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_FOREGROUND, true, "Up");
+
+		if (mousePos.x > 181&& mousePos.x < 220 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkDown)
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Down");
+		else if (talk._moreTalkDown)
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, true, "Down");
+
+		bool found = false;
+		for (_selector = talk._talkIndex; _selector < (int)talk._statements.size() && !found; ++_selector) {
+			if (mousePos.y > talk._statements[_selector]._talkPos.top &&
+					mousePos.y < talk._statements[_selector]._talkPos.bottom)
+				found = true;
+		}
+		--_selector;
+		if (!found)
+			_selector = -1;
+	}
+
+	if (_keyPress) {
+		_key = toupper(_keyPress);
+		if (_key == Common::KEYCODE_ESCAPE)
+			_key = 'E';
+
+		// Check for number press indicating reply line
+		if (_key >= '1' && _key <= ('1' + (int)talk._statements.size() - 1)) {
+			for (uint idx = 0; idx < talk._statements.size(); ++idx) {
+				if (talk._statements[idx]._talkMap == (_key - '1')) {
+					// Found the given statement
+					_selector = idx;
+					_key = -1;
+					_keyboardInput = true;
+					break;
+				}
+			}
+		} else if (_key == 'E' || _key == 'U' || _key == 'D') {
+			_keyboardInput = true;
+		} else {
+			_selector = -1;
+		}
+	}
+
+	if (_selector != _oldSelector) {
+		// Remove highlighting from previous line, if any
+		if (_oldSelector != -1) {
+			if (!((talk._talkHistory[talk._converseNum][_oldSelector] >> (_oldSelector & 7)) & 1))
+				talk.talkLine(_oldSelector, talk._statements[_oldSelector]._talkMap, INV_FOREGROUND,
+					talk._statements[_oldSelector]._talkPos.top, true);
+			else
+				talk.talkLine(_oldSelector, talk._statements[_oldSelector]._talkMap, TALK_NULL,
+					talk._statements[_oldSelector]._talkPos.top, true);
+		}
+
+		// Add highlighting to new line, if any
+		if (_selector != -1)
+			talk.talkLine(_selector, talk._statements[_selector]._talkMap, TALK_FOREGROUND,
+				talk._statements[_selector]._talkPos.top, true);
+
+		_oldSelector = _selector;
+	}
+
+	if (events._released || _keyboardInput) {
+		if (((Common::Rect(99, CONTROLS_Y, 138, CONTROLS_Y + 10).contains(mousePos) && events._released)
+				|| _key == 'E') && _endKeyActive) {
+			talk.freeTalkVars();
+			talk.pullSequence();
+			banishWindow();
+			_windowBounds.top = CONTROLS_Y1;
+		} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released)
+				|| _key == 'U') && talk._moreTalkUp) {
+			while (talk._statements[--talk._talkIndex]._talkMap == -1)
+				;
+			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+				SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+			talk.displayTalk(false);
+
+			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
+		} else if (((Common::Rect(181, CONTROLS_Y, 220, CONTROLS_Y + 10).contains(mousePos) && events._released)
+				|| _key == 'D') && talk._moreTalkDown) {
+			do {
+				++talk._talkIndex;
+			} while (talk._talkIndex < (int)talk._statements.size() && talk._statements[talk._talkIndex]._talkMap == -1);
+
+			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
+				SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
+			talk.displayTalk(false);
+
+			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
+		} else if (_selector != -1) {
+			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, true, "Exit");
+			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, true, "Up");
+			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, true, "Down");
+
+			// If the reply is new, add it to the journal
+			if (!talk._talkHistory[talk._converseNum][_selector]) {
+				journal.record(talk._converseNum, _selector);
+
+				// Add any Holmes point to Holmes' total, if any
+				if (talk._statements[_selector]._quotient)
+					people._holmesQuotient += talk._statements[_selector]._quotient;
+			}
+
+			// Flag the response as having been used
+			talk._talkHistory[talk._converseNum][_selector] = true;
+
+			clearWindow();
+			screen.print(Common::Point(16, CONTROLS_Y + 12), TALK_FOREGROUND, "Sherlock Holmes");
+			talk.talkLine(_selector + 128, talk._statements[_selector]._talkMap, COMMAND_FOREGROUND, CONTROLS_Y + 21, true);
+
+			switch (talk._statements[_selector]._portraitSide & 3) {
+			case 0:
+			case 1:
+				people._portraitSide = 20;
+				break;
+			case 2:
+				people._portraitSide = 220;
+				break;
+			case 3:
+				people._portraitSide = 120;
+				break;
+			}
+
+			// Check for flipping Holmes
+			if (talk._statements[_selector]._portraitSide & REVERSE_DIRECTION)
+				people._holmesFlip = true;
+
+			talk._speaker = 0;
+			people.setTalking(0);
+
+			if (!talk._statements[_selector]._voiceFile.empty() && sound._voices) {
+				sound.playSound(talk._statements[_selector]._voiceFile, WAIT_RETURN_IMMEDIATELY);
+
+				// Set voices as an indicator for waiting
+				sound._voices = 2;
+				sound._speechOn = *sound._soundIsOn;
+			} else {
+				sound._speechOn = false;
+			}
+
+			talk.waitForMore(talk._statements[_selector]._statement.size());
+			if (talk._talkToAbort)
+				return;
+
+			people.clearTalking();
+			if (talk._talkToAbort)
+				return;
+
+			while (!_vm->shouldQuit()) {
+				talk._scriptSelect = _selector;
+				talk._speaker = talk._talkTo;
+				talk.doScript(talk._statements[_selector]._reply);
+
+				if (!talk._talkToAbort) {
+					if (!talk._talkStealth)
+						clearWindow();
+
+					if (!talk._statements[_selector]._modified.empty()) {
+						for (uint idx = 0; idx < talk._statements[_selector]._modified.size(); ++idx) {
+							_vm->setFlags(talk._statements[_selector]._modified[idx]);
+						}
+
+						talk.setTalkMap();
+					}
+
+					// Check for another linked talk file
+					Common::String linkFilename = talk._statements[_selector]._linkFile;
+					if (!linkFilename.empty() && !talk._scriptMoreFlag) {
+						talk.freeTalkVars();
+						talk.loadTalkFile(linkFilename);
+
+						// Find the first new statement
+						int select = _selector = _oldSelector = -1;
+						for (uint idx = 0; idx < talk._statements.size() && select == -1; ++idx) {
+							if (!talk._statements[idx]._talkMap)
+								select = talk._talkIndex = idx;
+						}
+
+						// See if the new statement is a stealth reply
+						talk._talkStealth = talk._statements[select]._statement.hasPrefix("^") ? 2 : 0;
+
+						// Is the new talk file a standard file, reply first file, or a stealth file
+						if (!talk._statements[select]._statement.hasPrefix("*") &&
+								!talk._statements[select]._statement.hasPrefix("^")) {
+							// Not a reply first file, so display the new selections
+							if (_endKeyActive)
+								screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
+							else
+								screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, true, "Exit");
+
+							talk.displayTalk(true);
+							events.setCursor(ARROW);
+							break;
+						} else {
+							_selector = select;
+
+							if (!talk._talkHistory[talk._converseNum][_selector])
+								journal.record(talk._converseNum, _selector);
+
+							talk._talkHistory[talk._converseNum][_selector] = true;
+						}
+					} else {
+						talk.freeTalkVars();
+						talk.pullSequence();
+						banishWindow();
+						_windowBounds.top = CONTROLS_Y1;
+						break;
+					}
+				} else {
+					break;
+				}
+			}
+
+			events._pressed = events._released = false;
+			events._oldButtons = 0;
+			talk._talkStealth = 0;
+
+			// If a script was pushed onto the script stack, restore it
+			if (!talk._scriptStack.empty()) {
+				ScriptStackEntry stackEntry = talk._scriptStack.pop();
+				talk._scriptName = stackEntry._name;
+				talk._scriptSaveIndex = stackEntry._currentIndex;
+				talk._scriptSelect = stackEntry._select;
+			}
+		}
+	}
+}
+
+void ScalpelUserInterface::journalControl() {
+	Events &events = *_vm->_events;
+	Journal &journal = *_vm->_journal;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	bool doneFlag = false;
+
+	// Draw the journal screen
+	journal.drawInterface();
+
+	// Handle journal events
+	do {
+		_key = -1;
+		events.setButtonState();
+
+		// Handle keypresses
+		if (events.kbHit()) {
+			Common::KeyState keyState = events.getKey();
+			if (keyState.keycode == Common::KEYCODE_x && (keyState.flags & Common::KBD_ALT)) {
+				_vm->quitGame();
+				return;
+			} else if (keyState.keycode == Common::KEYCODE_e || keyState.keycode == Common::KEYCODE_ESCAPE) {
+				doneFlag = true;
+			} else {
+				_key = toupper(keyState.keycode);
+			}
+		}
+
+		if (!doneFlag)
+			doneFlag = journal.handleEvents(_key);
+	} while (!_vm->shouldQuit() && !doneFlag);
+
+	// Finish up
+	_infoFlag = _keyboardInput = false;
+	_keyPress = '\0';
+	_windowOpen = false;
+	_windowBounds.top = CONTROLS_Y1;
+	_key = -1;
+	_menuMode = STD_MODE;
+
+	// Reset the palette
+	screen.setPalette(screen._cMap);
+
+	screen._backBuffer1.blitFrom(screen._backBuffer2);
+	scene.updateBackground();
+	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+}
+
+void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	if (str.hasPrefix("_")) {
+		_lookScriptFlag = true;
+		events.setCursor(MAGNIFY);
+		int savedSelector = _selector;
+		talk.talkTo(str.c_str() + 1);
+		_lookScriptFlag = false;
+
+		if (talk._talkToAbort) {
+			events.setCursor(ARROW);
+			return;
+		}
+
+		// Check if looking at an inventory object
+		if (!_invLookFlag) {
+			// See if this look was called by a right button click or not
+			if (!_lookHelp) {
+				// If it wasn't a right button click, then we need depress
+				// the look button before we close the window. So save a copy of the
+				// menu area, and draw the controls onto it
+				Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h);
+				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
+
+				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
+					Common::Rect(pt.x, pt.y, pt.x + tempSurface.w(), pt.y + tempSurface.h()));
+				screen._backBuffer2.transBlitFrom((*_controls)[0], pt);
+
+				banishWindow(1);
+				events.setCursor(MAGNIFY);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = COMMANDS[LOOK_MODE - 1];
+				_temp = _oldTemp = 0;
+				_menuMode = LOOK_MODE;
+				events.clearEvents();
+
+				screen._backBuffer2.blitFrom(tempSurface, pt);
+			} else {
+				events.setCursor(ARROW);
+				banishWindow(true);
+				_windowBounds.top = CONTROLS_Y1;
+				_key = _oldKey = -1;
+				_temp = _oldTemp = 0;
+				_menuMode = STD_MODE;
+				_lookHelp = 0;
+				events.clearEvents();
+			}
+		} else {
+			// Looking at an inventory object
+			_selector = _oldSelector = savedSelector;
+
+			// Reload the inventory graphics and draw the inventory
+			inv.loadInv();
+			inv.putInv(SLAM_SECONDARY_BUFFER);
+			inv.freeInv();
+			banishWindow(1);
+
+			_windowBounds.top = CONTROLS_Y1;
+			_key = _oldKey = COMMANDS[INV_MODE - 1];
+			_temp = _oldTemp = 0;
+			events.clearEvents();
+
+			_invLookFlag = 0;
+			_menuMode = INV_MODE;
+			_windowOpen = true;
+		}
+
+		return;
+	}
+
+	Surface &bb = *screen._backBuffer;
+	if (firstTime) {
+		// Only draw the border on the first call
+		_infoFlag = true;
+		clearInfo();
+
+		bb.fillRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+			CONTROLS_Y1 + 10), BORDER_COLOR);
+		bb.fillRect(Common::Rect(0, CONTROLS_Y + 10, 1, SHERLOCK_SCREEN_HEIGHT - 1),
+			BORDER_COLOR);
+		bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 10,
+			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		bb.fillRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+	}
+
+	// Clear background
+	bb.fillRect(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2,
+		SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+
+	_windowBounds.top = CONTROLS_Y;
+	events.clearEvents();
+
+	// Loop through displaying up to five lines
+	bool endOfStr = false;
+	const char *msgP = str.c_str();
+	for (int lineNum = 0; lineNum < ONSCREEN_FILES_COUNT && !endOfStr; ++lineNum) {
+		int width = 0;
+		const char *lineStartP = msgP;
+
+		// Determine how much can be displayed on the line
+		do {
+			width += screen.charWidth(*msgP++);
+		} while (width < 300 && *msgP);
+
+		if (*msgP)
+			--msgP;
+		else
+			endOfStr = true;
+
+		// If the line needs to be wrapped, scan backwards to find
+		// the end of the previous word as a splitting point
+		if (width >= 300) {
+			while (*msgP != ' ')
+				--msgP;
+			endOfStr = false;
+		}
+
+		// Print out the line
+		Common::String line(lineStartP, msgP);
+		screen.gPrint(Common::Point(16, CONTROLS_Y + 12 + lineNum * 9),
+			INV_FOREGROUND, "%s", line.c_str());
+
+		if (!endOfStr)
+			// Start next line at start of the nxet word after space
+			++msgP;
+	}
+
+	// Handle display depending on whether all the message was shown
+	if (!endOfStr) {
+		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
+			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2,
+			PRESS_KEY_FOR_MORE);
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
+			screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2, CONTROLS_Y),
+			COMMAND_FOREGROUND, "P");
+		_descStr = msgP;
+	} else {
+		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
+			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2,
+			PRESS_KEY_TO_CONTINUE);
+		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
+			screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, CONTROLS_Y),
+			COMMAND_FOREGROUND, "P");
+		_descStr = "";
+	}
+
+	if (firstTime) {
+		if (!_slideWindows) {
+			screen.slamRect(Common::Rect(0, CONTROLS_Y,
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		} else {
+			// Display the window
+			summonWindow();
+		}
+
+		_selector = _oldSelector = -1;
+		_windowOpen = true;
+	} else {
+		screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT));
+	}
+}
+
+void ScalpelUserInterface::printObjectDesc() {
+	printObjectDesc(_cAnimStr, true);
+}
+
+void ScalpelUserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+
+	if (_windowOpen)
+		// A window is already open, so can't open another one
+		return;
+
+	if (slideUp) {
+		// Gradually slide up the display of the window
+		for (int idx = 1; idx <= bgSurface.h(); idx += 2) {
+			screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
+				Common::Rect(0, 0, bgSurface.w(), idx));
+			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+
+			events.delay(10);
+		}
+	} else {
+		// Gradually slide down the display of the window
+		for (int idx = 1; idx <= bgSurface.h(); idx += 2) {
+			screen._backBuffer->blitFrom(bgSurface,
+				Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h()),
+				Common::Rect(0, bgSurface.h() - idx, bgSurface.w(), bgSurface.h()));
+			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h(),
+				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - bgSurface.h() + idx));
+
+			events.delay(10);
+		}
+	}
+
+	// Final display of the entire window
+	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h()),
+		Common::Rect(0, 0, bgSurface.w(), bgSurface.h()));
+	screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h(), bgSurface.w(), bgSurface.h());
+
+	_windowOpen = true;
+}
+
+void ScalpelUserInterface::summonWindow(bool slideUp, int height) {
+	Screen &screen = *_vm->_screen;
+
+	// Extract the window that's been drawn on the back buffer
+	Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
+		(SHERLOCK_SCREEN_HEIGHT - height));
+	Common::Rect r(0, height, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
+	tempSurface.blitFrom(screen._backBuffer1, Common::Point(0, 0), r);
+
+	// Remove drawn window with original user interface
+	screen._backBuffer1.blitFrom(screen._backBuffer2,
+		Common::Point(0, height), r);
+
+	// Display the window gradually on-screen
+	summonWindow(tempSurface, slideUp);
+}
+
+void ScalpelUserInterface::banishWindow(bool slideUp) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+
+	if (_windowOpen) {
+		if (slideUp || !_slideWindows) {
+			// Slide window down
+			// Only slide the window if the window style allows it
+			if (_slideWindows) {
+				for (int idx = 2; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
+					// Shift the window down by 2 lines
+					byte *pSrc = (byte *)screen._backBuffer1.getBasePtr(0, CONTROLS_Y + idx - 2);
+					byte *pSrcEnd = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - 2);
+					byte *pDest = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT);
+					Common::copy_backward(pSrc, pSrcEnd, pDest);
+
+					// Restore lines from the ui in the secondary back buffer
+					screen._backBuffer1.blitFrom(screen._backBuffer2,
+						Common::Point(0, CONTROLS_Y),
+						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + idx));
+
+					screen.slamArea(0, CONTROLS_Y + idx - 2, SHERLOCK_SCREEN_WIDTH,
+						SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y - idx + 2);
+					events.delay(10);
+				}
+
+				// Restore final two old lines
+				screen._backBuffer1.blitFrom(screen._backBuffer2,
+					Common::Point(0, SHERLOCK_SCREEN_HEIGHT - 2),
+					Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 2,
+						SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - 2, SHERLOCK_SCREEN_WIDTH, 2);
+			} else {
+				// Restore old area to completely erase window
+				screen._backBuffer1.blitFrom(screen._backBuffer2,
+					Common::Point(0, CONTROLS_Y),
+					Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
+					SHERLOCK_SCREEN_HEIGHT));
+			}
+		} else {
+			// Slide the original user interface up to cover the dialog
+			for (int idx = 1; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); idx += 2) {
+				byte *pSrc = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1);
+				byte *pSrcEnd = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1 + idx);
+				byte *pDest = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - idx);
+				Common::copy(pSrc, pSrcEnd, pDest);
+
+				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - idx, SHERLOCK_SCREEN_WIDTH,
+					SHERLOCK_SCREEN_HEIGHT);
+				events.delay(10);
+			}
+
+			// Show entire final area
+			screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(0, CONTROLS_Y1),
+				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		}
+
+		_infoFlag = false;
+		_windowOpen = false;
+	}
+
+	_menuMode = STD_MODE;
+}
+
+void ScalpelUserInterface::checkUseAction(const UseType *use, const Common::String &invName,
+		const char *const messages[], int objNum, bool giveMode) {
+	Events &events = *_vm->_events;
+	Inventory &inv = *_vm->_inventory;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	bool printed = messages == nullptr;
+
+	if (objNum >= 1000) {
+		// Holmes was specified, so do nothing
+		_infoFlag = true;
+		clearInfo();
+		_infoFlag = true;
+
+		// Display error message
+		_menuCounter = 30;
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that to yourself.");
+		return;
+	}
+
+	// Scan for target item
+	int targetNum = -1;
+	if (giveMode) {
+		for (int idx = 0; idx < USE_COUNT && targetNum == -1; ++idx) {
+			if ((use[idx]._target.equalsIgnoreCase("*GIVE*") || use[idx]._target.equalsIgnoreCase("*GIVEP*"))
+					&& use[idx]._names[0].equalsIgnoreCase(invName)) {
+				// Found a match
+				targetNum = idx;
+				if (use[idx]._target.equalsIgnoreCase("*GIVE*"))
+					inv.deleteItemFromInventory(invName);
+			}
+		}
+	} else {
+		for (int idx = 0; idx < USE_COUNT && targetNum == -1; ++idx) {
+			if (use[idx]._target.equalsIgnoreCase(invName))
+				targetNum = idx;
+		}
+	}
+
+	if (targetNum != -1) {
+		// Found a target, so do the action
+		const UseType &action = use[targetNum];
+
+		events.setCursor(WAIT);
+
+		if (action._useFlag)
+			_vm->setFlags(action._useFlag);
+
+		if (action._cAnimNum != 99) {
+			if (action._cAnimNum == 0)
+				scene.startCAnim(9, action._cAnimSpeed);
+			else
+				scene.startCAnim(action._cAnimNum - 1, action._cAnimSpeed);
+		}
+
+		if (!talk._talkToAbort) {
+			Object &obj = scene._bgShapes[objNum];
+			for (int idx = 0; idx < NAMES_COUNT && !talk._talkToAbort; ++idx) {
+				if (obj.checkNameForCodes(action._names[idx], messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+
+			// Print "Done..." as an ending, unless flagged for leaving scene or otherwise flagged
+			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
+				_infoFlag = true;
+				clearInfo();
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
+				_menuCounter = 25;
+			}
+		}
+	} else {
+		// Couldn't find target, so print error
+		_infoFlag = true;
+		clearInfo();
+
+		if (giveMode) {
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "No, thank you.");
+		} else if (messages == nullptr) {
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that.");
+		} else {
+			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[0]);
+		}
+
+		_infoFlag = true;
+		_menuCounter = 30;
+	}
+
+	events.setCursor(ARROW);
+}
+
+void ScalpelUserInterface::checkAction(ActionType &action, const char *const messages[], int objNum) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+	Common::Point pt(-1, -1);
+
+	if (objNum >= 1000)
+		// Ignore actions done on characters
+		return;
+
+	if (!action._cAnimSpeed) {
+		// Invalid action, to print error message
+		_infoFlag = true;
+		clearInfo();
+		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[action._cAnimNum]);
+		_infoFlag = true;
+
+		// Set how long to show the message
+		_menuCounter = 30;
+	} else {
+		Object &obj = scene._bgShapes[objNum];
+
+		int cAnimNum;
+		if (action._cAnimNum == 0)
+			// Really a 10
+			cAnimNum = 9;
+		else
+			cAnimNum = action._cAnimNum - 1;
+
+		int dir = -1;
+		if (action._cAnimNum != 99) {
+			CAnim &anim = scene._cAnim[cAnimNum];
+
+			if (action._cAnimNum != 99) {
+				if (action._cAnimSpeed & REVERSE_DIRECTION) {
+					pt = anim._teleportPos;
+					dir = anim._teleportDir;
+				} else {
+					pt = anim._goto;
+					dir = anim._gotoDir;
+				}
+			}
+		} else {
+			pt = Common::Point(-1, -1);
+			dir = -1;
+		}
+
+		// Has a value, so do action
+		// Show wait cursor whilst walking to object and doing action
+		events.setCursor(WAIT);
+		bool printed = false;
+
+		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
+					&& toupper(action._names[nameIdx][1]) == 'W') {
+				if (obj.checkNameForCodes(Common::String(action._names[nameIdx].c_str() + 2), messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+		}
+
+		bool doCAnim = true;
+		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2) {
+				char ch = toupper(action._names[nameIdx][1]);
+
+				if (ch == 'T' || ch == 'B') {
+					printed = true;
+					if (pt.x != -1)
+						// Holmes needs to walk to object before the action is done
+						people.walkToCoords(pt, dir);
+
+					if (!talk._talkToAbort) {
+						// Ensure Holmes is on the exact intended location
+						people[AL]._position = pt;
+						people[AL]._sequenceNumber = dir;
+						people.gotoStand(people[AL]);
+
+						talk.talkTo(action._names[nameIdx].c_str() + 2);
+						if (ch == 'T')
+							doCAnim = false;
+					}
+				}
+			}
+		}
+
+		if (doCAnim && !talk._talkToAbort) {
+			if (pt.x != -1)
+				// Holmes needs to walk to object before the action is done
+				people.walkToCoords(pt, dir);
+		}
+
+		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
+			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
+					&& toupper(action._names[nameIdx][1]) == 'F') {
+				if (obj.checkNameForCodes(action._names[nameIdx].c_str() + 2, messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+		}
+
+		if (doCAnim && !talk._talkToAbort && action._cAnimNum != 99)
+			scene.startCAnim(cAnimNum, action._cAnimSpeed);
+
+		if (!talk._talkToAbort) {
+			for (int nameIdx = 0; nameIdx < NAMES_COUNT && !talk._talkToAbort; ++nameIdx) {
+				if (obj.checkNameForCodes(action._names[nameIdx], messages)) {
+					if (!talk._talkToAbort)
+						printed = true;
+				}
+			}
+
+			// Unless we're leaving the scene, print a "Done" message unless the printed flag has been set
+			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
+				_infoFlag = true;
+				clearInfo();
+				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
+
+				// Set how long to show the message
+				_menuCounter = 30;
+			}
+		}
+	}
+
+	// Reset cursor back to arrow
+	events.setCursor(ARROW);
+}
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
new file mode 100644
index 0000000000..8ed69ac8b5
--- /dev/null
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -0,0 +1,227 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCALPEL_UI_H
+#define SHERLOCK_SCALPEL_UI_H
+
+#include "common/scummsys.h"
+#include "sherlock/user_interface.h"
+
+namespace Sherlock {
+
+class Inventory;
+class Talk;
+
+namespace Scalpel {
+
+extern const char COMMANDS[13];
+extern const int MENU_POINTS[12][4];
+
+extern const int INVENTORY_POINTS[8][3];
+extern const char INVENTORY_COMMANDS[9];
+extern const char *const PRESS_KEY_FOR_MORE;
+extern const char *const PRESS_KEY_TO_CONTINUE;
+
+class Settings;
+
+class ScalpelUserInterface: public UserInterface {
+	friend class Inventory;
+	friend class Settings;
+	friend class Talk;
+private:
+	ImageFile *_controlPanel;
+	ImageFile *_controls;
+	char _keyPress;
+	int _lookHelp;
+	int _bgFound, _oldBgFound;
+	int _help, _oldHelp;
+	char _key, _oldKey;
+	int _temp, _oldTemp;
+	int _oldLook;
+	bool _keyboardInput;
+	bool _pause;
+	int _cNum;
+	Common::String _cAnimStr;
+	Common::String _descStr;
+	int _find;
+	int _oldUse;
+private:
+	/**
+	 * Draws the image for a user interface button in the down/pressed state.
+	 */
+	void depressButton(int num);
+
+	/**
+	 * If he mouse button is pressed, then calls depressButton to draw the button
+	 * as pressed; if not, it will show it as released with a call to "restoreButton".
+	 */
+	void pushButton(int num);
+
+	/**
+	 * By the time this method has been called, the graphics for the button change
+	 * have already been drawn. This simply takes care of switching the mode around
+	 * accordingly
+	 */
+	void toggleButton(int num);
+
+	/**
+	 * Creates a text window and uses it to display the in-depth description
+	 * of the highlighted object
+	 */
+	void examine();
+
+	/**
+	 * Print the name of an object in the scene
+	 */
+	void lookScreen(const Common::Point &pt);
+
+	/**
+	 * Gets the item in the inventory the mouse is on and display's it's description
+	 */
+	void lookInv();
+
+	/**
+	 * Handles input when the file list window is being displayed
+	 */
+	void doEnvControl();
+	
+	/**
+	 * Handle input whilst the inventory is active
+	 */
+	void doInvControl();
+	
+	/**
+	 * Handles waiting whilst an object's description window is open.
+	 */
+	void doLookControl();
+	
+	/**
+	 * Handles input until one of the user interface buttons/commands is selected
+	 */
+	void doMainControl();
+	
+	/**
+	 * Handles the input for the MOVE, OPEN, and CLOSE commands
+	 */
+	void doMiscControl(int allowed);
+	
+	/**
+	 * Handles input for picking up items
+	 */
+	void doPickControl();
+	
+	/**
+	 * Handles input when in talk mode. It highlights the buttons and available statements,
+	 * and handles allowing the user to click on them
+	 */
+	void doTalkControl();
+	
+	/**
+	 * Handles events when the Journal is active.
+	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+	 *		the user interface, it uses so many internal UI fields, that it sort of made some sense
+	 *		to put it in the UserInterface class.
+	 */
+	void journalControl();
+
+	/**
+	 * Checks to see whether a USE action is valid on the given object
+	 */
+	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
+		int objNum, bool giveMode);
+	
+	/**
+	 * Called for OPEN, CLOSE, and MOVE actions are being done
+	 */
+	void checkAction(ActionType &action, const char *const messages[], int objNum);
+
+	/**
+	 * Print the previously selected object's decription
+	 */
+	void printObjectDesc(const Common::String &str, bool firstTime);
+public:
+	ScalpelUserInterface(SherlockEngine *vm);
+	virtual ~ScalpelUserInterface();
+
+	/**
+	 * Handles counting down whilst checking for input, then clears the info line.
+	 */
+	void whileMenuCounter();
+
+	/**
+	 * Draws the image for the given user interface button in the up
+	 * (not selected) position
+	 */
+	void restoreButton(int num);
+public:
+	/**
+	 * Resets the user interface
+	 */
+	virtual void reset();
+
+	/**
+	 * Main input handler for the user interface
+	 */
+	virtual void handleInput();
+
+	/**
+	 * Draw the user interface onto the screen's back buffers
+	 */	
+	virtual void drawInterface(int bufferNum = 3);
+
+	/**
+	 * Displays a passed window by gradually scrolling it vertically on-screen
+	 */
+	virtual void summonWindow(const Surface &bgSurface, bool slideUp = true);
+
+	/**
+	 * Slide the window stored in the back buffer onto the screen
+	 */
+	virtual void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
+
+	/**
+	 * Close a currently open window
+	 * @param flag	0 = slide old window down, 1 = slide prior UI back up
+	 */
+	virtual void banishWindow(bool slideUp = true);
+
+	/**
+	 * Clears the info line of the screen
+	 */
+	virtual void clearInfo();
+
+	/**
+	 * Clear any active text window
+	 */
+	virtual void clearWindow();
+
+	/**
+	 * Print the previously selected object's decription
+	 */	
+	virtual void printObjectDesc();
+};
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scalpel/settings.cpp b/engines/sherlock/scalpel/settings.cpp
new file mode 100644
index 0000000000..44597862f5
--- /dev/null
+++ b/engines/sherlock/scalpel/settings.cpp
@@ -0,0 +1,341 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sherlock.h"
+#include "sherlock/scalpel/settings.h"
+#include "sherlock/scalpel/scalpel_user_interface.h"
+
+namespace Sherlock {
+
+namespace Scalpel {
+
+static const int SETUP_POINTS[12][4]  = {
+	{ 4, 154, 101, 53 },		// Exit
+	{ 4, 165, 101, 53 },		// Music Toggle
+	{ 219, 165, 316, 268 },		// Voice Toggle
+	{ 103, 165, 217, 160 },		// Sound Effects Toggle
+	{ 219, 154, 316, 268 },		// Help Button Left/Right
+	{ 103, 154, 217, 160 },		// New Font Style
+	{ 4, 187, 101, 53 },		// Joystick Toggle
+	{ 103, 187, 217, 160 },		// Calibrate Joystick
+	{ 219, 176, 316, 268 },		// Fade Style
+	{ 103, 176, 217, 160 },		// Window Open Style
+	{ 4, 176, 101, 53 }, 		// Portraits Toggle
+	{ 219, 187, 316, 268 }		// _key Pad Accel. Toggle
+};
+
+static const char *const SETUP_STRS0[2] = { "off", "on" };
+static const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
+static const char *const SETUP_STRS2[2] = { "Left", "Right" };
+static const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
+static const char *const SETUP_STRS5[2] = { "Left", "Right" };
+static const char *const SETUP_NAMES[12] = {
+	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
+};
+
+/*----------------------------------------------------------------*/
+
+void Settings::drawInteface(bool flag) {
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	Common::String tempStr;
+
+	if (!flag) {
+		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 1), BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1 + 1, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH,
+			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
+		screen._backBuffer1.hLine(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH - 1, BORDER_COLOR);
+		screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH - 2,
+			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
+	}
+
+	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
+		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
+
+	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10),
+		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10),
+		SETUP_POINTS[2][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10),
+		SETUP_POINTS[3][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Auto Help %s", SETUP_STRS5[ui._helpStyle]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10),
+		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10),
+		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
+
+	// WORKAROUND: We don't support the joystick in ScummVM, so draw the next two buttons as disabled
+	tempStr = "Joystick Off";
+	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10),
+		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[6][3], SETUP_POINTS[6][1]), COMMAND_NULL, false, tempStr);
+
+	tempStr = "Calibrate Joystick";
+	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10),
+		SETUP_POINTS[7][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[7][3], SETUP_POINTS[7][1]), COMMAND_NULL, false, tempStr);
+
+	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
+	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10),
+		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Windows %s", ui._slideWindows ? "Slide" : "Appear");
+	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10),
+		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
+	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
+		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
+
+	tempStr = "Key Pad Slow";
+	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
+		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
+	screen.buttonPrint(Common::Point(SETUP_POINTS[11][3], SETUP_POINTS[11][1]), COMMAND_NULL, false, tempStr);
+
+	// Show the window immediately, or slide it on-screen
+	if (!flag) {
+		if (!ui._slideWindows) {
+			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+		} else {
+			ui.summonWindow(true, CONTROLS_Y1);
+		}
+
+		ui._windowOpen = true;
+	} else {
+		screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
+	}
+}
+
+int Settings::drawButtons(const Common::Point &pt, int _key) {
+	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	Sound &sound = *_vm->_sound;
+	UserInterface &ui = *_vm->_ui;
+	int found = -1;
+	byte color;
+	Common::String tempStr;
+
+	for (int idx = 0; idx < 12; ++idx) {
+		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
+				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._pressed || events._released))
+				|| (_key == SETUP_NAMES[idx][0])) {
+			found = idx;
+			color = COMMAND_HIGHLIGHTED;
+		} else {
+			color = COMMAND_FOREGROUND;
+		}
+
+		// Print the button text
+		switch (idx) {
+		case 1:
+			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 2:
+			tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 3:
+			tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 4:
+			tempStr = Common::String::format("Auto Help %s", SETUP_STRS2[ui._helpStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 6:
+			tempStr = "Joystick Off";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
+			break;
+		case 7:
+			tempStr = "Calibrate Joystick";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
+			break;
+		case 8:
+			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 9:
+			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._slideWindows]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 10:
+			tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+			break;
+		case 11:
+			tempStr = "Key Pad Slow";
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
+			break;
+		default:
+			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
+			break;
+		}
+	}
+
+	return found;
+}
+
+void Settings::show(SherlockEngine *vm) {
+	Events &events = *vm->_events;
+	People &people = *vm->_people;
+	Scene &scene = *vm->_scene;
+	Screen &screen = *vm->_screen;
+	Sound &sound = *vm->_sound;
+	Talk &talk = *vm->_talk;
+	ScalpelUserInterface &ui = *(ScalpelUserInterface *)vm->_ui;
+	bool updateConfig = false;
+
+	assert(vm->getGameID() == GType_SerratedScalpel);
+	Settings settings(vm);
+	settings.drawInteface(false);
+
+	do {
+		if (ui._menuCounter)
+			ui.whileMenuCounter();
+
+		int found = -1;
+		ui._key = -1;
+
+		scene.doBgAnim();
+		if (talk._talkToAbort)
+			return;
+
+		events.setButtonState();
+		Common::Point pt = events.mousePos();
+
+		if (events._pressed || events._released || events.kbHit()) {
+			ui.clearInfo();
+			ui._key = -1;
+
+			if (events.kbHit()) {
+				Common::KeyState keyState = events.getKey();
+				ui._key = toupper(keyState.keycode);
+
+				if (ui._key == Common::KEYCODE_RETURN || ui._key == Common::KEYCODE_SPACE) {
+					events._pressed = false;
+					events._oldButtons = 0;
+					ui._keyPress = '\0';
+					events._released = true;
+				}
+			}
+
+			// Handle highlighting button under mouse
+			found = settings.drawButtons(pt, ui._key);
+		}
+
+		if ((found == 0 && events._released) || (ui._key == 'E' || ui._key == Common::KEYCODE_ESCAPE))
+			// Exit
+			break;
+
+		if ((found == 1 && events._released) || ui._key == 'M') {
+			// Toggle music
+			if (sound._music) {
+				sound.stopSound();
+				sound._music = false;
+			}
+			else {
+				sound._music = true;
+				sound.startSong();
+			}
+
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 2 && events._released) || ui._key == 'V') {
+			sound._voices = !sound._voices;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 3 && events._released) || ui._key == 'S') {
+			// Toggle sound effects
+			sound._digitized = !sound._digitized;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 4 && events._released) || ui._key == 'A') {
+			// Help button style
+			ui._helpStyle = !ui._helpStyle;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 5 && events._released) || ui._key == 'N') {
+			// New font style
+			int fontNum = screen.fontNumber() + 1;
+			if (fontNum == 3)
+				fontNum = 0;
+
+			screen.setFont(fontNum);
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 8 && events._released) || ui._key == 'F') {
+			// Toggle fade style
+			screen._fadeStyle = !screen._fadeStyle;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 9 && events._released) || ui._key == 'W') {
+			// Window style
+			ui._slideWindows = !ui._slideWindows;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+
+		if ((found == 10 && events._released) || ui._key == 'P') {
+			// Toggle portraits being shown
+			people._portraitsOn = !people._portraitsOn;
+			updateConfig = true;
+			settings.drawInteface(true);
+		}
+	} while (!vm->shouldQuit());
+
+	ui.banishWindow();
+
+	if (updateConfig)
+		vm->saveConfig();
+
+	ui._keyPress = '\0';
+	ui._keyboardInput = false;
+	ui._windowBounds.top = CONTROLS_Y1;
+	ui._key = -1;
+}
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/settings.h b/engines/sherlock/scalpel/settings.h
new file mode 100644
index 0000000000..ff2e647a62
--- /dev/null
+++ b/engines/sherlock/scalpel/settings.h
@@ -0,0 +1,63 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SETTINGS_H
+#define SHERLOCK_SETTINGS_H
+
+#include "common/scummsys.h"
+
+namespace Sherlock {
+
+class SherlockEngine;
+
+namespace Scalpel {
+
+class Settings {
+private:
+	SherlockEngine *_vm;
+
+	Settings(SherlockEngine *vm) : _vm(vm) {}
+
+	/**
+	 * Draws the interface for the settings window
+	 */
+	void drawInteface(bool flag);
+
+	/**
+	 * Draws the buttons for the settings dialog
+	 */
+	int drawButtons(const Common::Point &pt, int key);
+public:
+	/**
+	 * Handles input when the settings window is being shown
+	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
+	 *		the user interface, it uses so many internal UI fields, that it sort of made some sense
+	 *		to put it in the UserInterface class.
+	 */
+	static void show(SherlockEngine *vm);
+};
+
+} // End of namespace Scalpel
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 06bbabf6e0..0f0187e215 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -23,8 +23,10 @@
 #include "sherlock/scene.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/scalpel/scalpel.h"
+#include "sherlock/scalpel/scalpel_scene.h"
 #include "sherlock/screen.h"
 #include "sherlock/tattoo/tattoo.h"
+#include "sherlock/tattoo/tattoo_scene.h"
 
 namespace Sherlock {
 
@@ -1325,554 +1327,4 @@ void Scene::checkBgShapes() {
 	}
 }
 
-/*----------------------------------------------------------------*/
-
-namespace Scalpel {
-
-void ScalpelScene::checkBgShapes() {
-	People &people = *_vm->_people;
-	Person &holmes = people._player;
-	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
-
-	// Call the base scene method to handle bg shapes
-	Scene::checkBgShapes();
-
-	// Iterate through the canim list
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &obj = _canimShapes[idx];
-		if (obj._type == STATIC_BG_SHAPE || obj._type == ACTIVE_BG_SHAPE) {
-			if ((obj._flags & 5) == 1) {
-				obj._misc = (pt.y < (obj._position.y + obj._imageFrame->_frame.h - 1)) ?
-				NORMAL_FORWARD : NORMAL_BEHIND;
-			} else if (!(obj._flags & 1)) {
-				obj._misc = BEHIND;
-			} else if (obj._flags & 4) {
-				obj._misc = FORWARD;
-			}
-		}
-	}
-}
-
-void ScalpelScene::doBgAnimCheckCursor() {
-	Inventory &inv = *_vm->_inventory;
-	Events &events = *_vm->_events;
-	Sound &sound = *_vm->_sound;
-	UserInterface &ui = *_vm->_ui;
-	Common::Point mousePos = events.mousePos();
-
-	if (ui._menuMode == LOOK_MODE) {
-		if (mousePos.y > CONTROLS_Y1)
-			events.setCursor(ARROW);
-		else if (mousePos.y < CONTROLS_Y)
-			events.setCursor(MAGNIFY);
-	}
-
-	// Check for setting magnifying glass cursor
-	if (ui._menuMode == INV_MODE || ui._menuMode == USE_MODE || ui._menuMode == GIVE_MODE) {
-		if (inv._invMode == INVMODE_LOOK) {
-			// Only show Magnifying glass cursor if it's not on the inventory command line
-			if (mousePos.y < CONTROLS_Y || mousePos.y >(CONTROLS_Y1 + 13))
-				events.setCursor(MAGNIFY);
-			else
-				events.setCursor(ARROW);
-		} else {
-			events.setCursor(ARROW);
-		}
-	}
-
-	if (sound._diskSoundPlaying && !*sound._soundIsOn) {
-		// Loaded sound just finished playing
-		sound.freeDigiSound();
-	}
-}
-
-void ScalpelScene::doBgAnim() {
-	Scalpel::ScalpelEngine &vm = *((Scalpel::ScalpelEngine *)_vm);
-	Events &events = *_vm->_events;
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-
-	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
-	talk._talkToAbort = false;
-
-	if (_restoreFlag) {
-		for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
-			if (people[idx]._type == CHARACTER)
-				people[idx].checkSprite();
-		}
-
-		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
-				_bgShapes[idx].checkObject();
-		}
-
-		if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-			people._portrait.checkObject();
-
-		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-			if (_canimShapes[idx]._type != INVALID && _canimShapes[idx]._type != REMOVE)
-				_canimShapes[idx].checkObject();
-		}
-
-		if (_currentScene == 12)
-			vm.eraseMirror12();
-
-		// Restore the back buffer from the back buffer 2 in the changed area
-		Common::Rect bounds(people[AL]._oldPosition.x, people[AL]._oldPosition.y,
-			people[AL]._oldPosition.x + people[AL]._oldSize.x,
-			people[AL]._oldPosition.y + people[AL]._oldSize.y);
-		Common::Point pt(bounds.left, bounds.top);
-
-		if (people[AL]._type == CHARACTER)
-			screen.restoreBackground(bounds);
-		else if (people[AL]._type == REMOVE)
-			screen._backBuffer->blitFrom(screen._backBuffer2, pt, bounds);
-
-		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			Object &o = _bgShapes[idx];
-			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
-				screen.restoreBackground(o.getOldBounds());
-		}
-
-		if (people._portraitLoaded)
-			screen.restoreBackground(Common::Rect(
-				people._portrait._oldPosition.x, people._portrait._oldPosition.y,
-				people._portrait._oldPosition.x + people._portrait._oldSize.x,
-				people._portrait._oldPosition.y + people._portrait._oldSize.y
-			));
-
-		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			Object &o = _bgShapes[idx];
-			if (o._type == NO_SHAPE && ((o._flags & OBJ_BEHIND) == 0)) {
-				// Restore screen area
-				screen._backBuffer->blitFrom(screen._backBuffer2, o._position,
-					Common::Rect(o._position.x, o._position.y,
-					o._position.x + o._noShapeSize.x, o._position.y + o._noShapeSize.y));
-
-				o._oldPosition = o._position;
-				o._oldSize = o._noShapeSize;
-			}
-		}
-
-		for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-			Object &o = _canimShapes[idx];
-			if (o._type == ACTIVE_BG_SHAPE || o._type == HIDE_SHAPE || o._type == REMOVE)
-				screen.restoreBackground(Common::Rect(o._oldPosition.x, o._oldPosition.y,
-					o._oldPosition.x + o._oldSize.x, o._oldPosition.y + o._oldSize.y));
-		}
-	}
-
-	//
-	// Update the background objects and canimations
-	//
-
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if (o._type == ACTIVE_BG_SHAPE || o._type == NO_SHAPE)
-			o.adjustObject();
-	}
-
-	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-		people._portrait.adjustObject();
-
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		if (_canimShapes[idx]._type != INVALID)
-			_canimShapes[idx].adjustObject();
-	}
-
-	if (people[AL]._type == CHARACTER && people._holmesOn)
-		people[AL].adjustSprite();
-
-	// Flag the bg shapes which need to be redrawn
-	checkBgShapes();
-
-	if (_currentScene == 12)
-		vm.doMirror12();
-
-	// Draw all active shapes which are behind the person
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-	}
-
-	// Draw all canimations which are behind the person
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &o = _canimShapes[idx];
-		if (o._type == ACTIVE_BG_SHAPE && o._misc == BEHIND) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-		}
-	}
-
-	// Draw all active shapes which are HAPPEN and behind the person
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-	}
-
-	// Draw all canimations which are NORMAL and behind the person
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &o = _canimShapes[idx];
-		if (o._type == ACTIVE_BG_SHAPE && o._misc == NORMAL_BEHIND) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-		}
-	}
-
-	// Draw the person if not animating
-	if (people[AL]._type == CHARACTER && people[AL]._walkLoaded) {
-		// If Holmes is too far to the right, move him back so he's on-screen
-		int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[AL]._imageFrame->_frame.w;
-		int tempX = MIN(people[AL]._position.x / FIXED_INT_MULTIPLIER, xRight);
-
-		bool flipped = people[AL]._sequenceNumber == WALK_LEFT || people[AL]._sequenceNumber == STOP_LEFT ||
-			people[AL]._sequenceNumber == WALK_UPLEFT || people[AL]._sequenceNumber == STOP_UPLEFT ||
-			people[AL]._sequenceNumber == WALK_DOWNRIGHT || people[AL]._sequenceNumber == STOP_DOWNRIGHT;
-		screen._backBuffer->transBlitFrom(*people[AL]._imageFrame,
-			Common::Point(tempX, people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL]._imageFrame->_frame.h), flipped);
-	}
-
-	// Draw all static and active shapes are NORMAL and are in front of the person
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-	}
-
-	// Draw all static and active canimations that are NORMAL and are in front of the person
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &o = _canimShapes[idx];
-		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == NORMAL_FORWARD) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-		}
-	}
-
-	// Draw all static and active shapes that are in front of the person
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-	}
-
-	// Draw any active portrait
-	if (people._portraitLoaded && people._portrait._type == ACTIVE_BG_SHAPE)
-		screen._backBuffer->transBlitFrom(*people._portrait._imageFrame,
-			people._portrait._position, people._portrait._flags & OBJ_FLIPPED);
-
-	// Draw all static and active canimations that are in front of the person
-	for (uint idx = 0; idx < _canimShapes.size(); ++idx) {
-		Object &o = _canimShapes[idx];
-		if ((o._type == ACTIVE_BG_SHAPE || o._type == STATIC_BG_SHAPE) && o._misc == FORWARD) {
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-		}
-	}
-
-	// Draw all NO_SHAPE shapes which have flag bit 0 clear
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &o = _bgShapes[idx];
-		if (o._type == NO_SHAPE && (o._flags & OBJ_BEHIND) == 0)
-			screen._backBuffer->transBlitFrom(*o._imageFrame, o._position, o._flags & OBJ_FLIPPED);
-	}
-
-	// Bring the newly built picture to the screen
-	if (_animating == 2) {
-		_animating = 0;
-		screen.slamRect(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
-	} else {
-		if (people[AL]._type != INVALID && ((_goToScene == -1 || _canimShapes.empty()))) {
-			if (people[AL]._type == REMOVE) {
-				screen.slamRect(Common::Rect(
-					people[AL]._oldPosition.x, people[AL]._oldPosition.y,
-					people[AL]._oldPosition.x + people[AL]._oldSize.x,
-					people[AL]._oldPosition.y + people[AL]._oldSize.y
-				));
-				people[AL]._type = INVALID;
-			} else {
-				screen.flushImage(people[AL]._imageFrame,
-					Common::Point(people[AL]._position.x / FIXED_INT_MULTIPLIER,
-						people[AL]._position.y / FIXED_INT_MULTIPLIER - people[AL].frameHeight()),
-					&people[AL]._oldPosition.x, &people[AL]._oldPosition.y,
-					&people[AL]._oldSize.x, &people[AL]._oldSize.y);
-			}
-		}
-
-		if (_currentScene == 12)
-			vm.flushMirror12();
-
-		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			Object &o = _bgShapes[idx];
-			if ((o._type == ACTIVE_BG_SHAPE || o._type == REMOVE) && _goToScene == -1) {
-				screen.flushImage(o._imageFrame, o._position,
-					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
-			}
-		}
-
-		if (people._portraitLoaded) {
-			if (people._portrait._type == REMOVE)
-				screen.slamRect(Common::Rect(
-					people._portrait._position.x, people._portrait._position.y,
-					people._portrait._position.x + people._portrait._delta.x,
-					people._portrait._position.y + people._portrait._delta.y
-				));
-			else
-				screen.flushImage(people._portrait._imageFrame, people._portrait._position,
-					&people._portrait._oldPosition.x, &people._portrait._oldPosition.y,
-					&people._portrait._oldSize.x, &people._portrait._oldSize.y);
-
-			if (people._portrait._type == REMOVE)
-				people._portrait._type = INVALID;
-		}
-
-		if (_goToScene == -1) {
-			for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-				Object &o = _bgShapes[idx];
-				if (o._type == NO_SHAPE && (o._flags & OBJ_BEHIND) == 0) {
-					screen.slamArea(o._position.x, o._position.y, o._oldSize.x, o._oldSize.y);
-					screen.slamArea(o._oldPosition.x, o._oldPosition.y, o._oldSize.x, o._oldSize.y);
-				} else if (o._type == HIDE_SHAPE) {
-					// Hiding shape, so flush it out and mark it as hidden
-					screen.flushImage(o._imageFrame, o._position,
-						&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
-					o._type = HIDDEN;
-				}
-			}
-		}
-
-		for (int idx = _canimShapes.size() - 1; idx >= 0; --idx) {
-			Object &o = _canimShapes[idx];
-
-			if (o._type == INVALID) {
-				// Anim shape was invalidated by checkEndOfSequence, so at this point we can remove it
-				_canimShapes.remove_at(idx);
-			} else  if (o._type == REMOVE) {
-				if (_goToScene == -1)
-					screen.slamArea(o._position.x, o._position.y, o._delta.x, o._delta.y);
-
-				// Shape for an animation is no longer needed, so remove it completely
-				_canimShapes.remove_at(idx);
-			} else if (o._type == ACTIVE_BG_SHAPE) {
-				screen.flushImage(o._imageFrame, o._position,
-					&o._oldPosition.x, &o._oldPosition.y, &o._oldSize.x, &o._oldSize.y);
-			}
-		}
-	}
-
-	_restoreFlag = true;
-	_doBgAnimDone = true;
-
-	events.wait(3);
-	screen.resetDisplayBounds();
-
-	// Check if the method was called for calling a portrait, and a talk was
-	// interrupting it. This talk file would not have been executed at the time,
-	// since we needed to finish the 'doBgAnim' to finish clearing the portrait
-	if (people._clearingThePortrait && talk._scriptMoreFlag == 3) {
-		// Reset the flags and call to talk
-		people._clearingThePortrait = false;
-		talk._scriptMoreFlag = 0;
-		talk.talkTo(talk._scriptName);
-	}
-}
-
-} // End of namespace Scalpel
-
-/*----------------------------------------------------------------*/
-
-namespace Tattoo {
-
-TattooScene::TattooScene(SherlockEngine *vm) : Scene(vm) {
-	_arrowZone = -1;
-	_mask = _mask1 = nullptr;
-	_maskCounter = 0;
-}
-
-void TattooScene::checkBgShapes() {
-	People &people = *_vm->_people;
-	Person &holmes = people._player;
-	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
-
-	// Call the base scene method to handle bg shapes
-	Scene::checkBgShapes();
-
-	// Check for any active playing animation
-	if (_activeCAnim._images && _activeCAnim._zPlacement != REMOVE) {
-		switch (_activeCAnim._flags & 3) {
-		case 0:
-			_activeCAnim._zPlacement = BEHIND;
-			break;
-		case 1:
-			_activeCAnim._zPlacement = ((_activeCAnim._position.y + _activeCAnim._imageFrame->_frame.h - 1)) ?
-				NORMAL_FORWARD : NORMAL_BEHIND;
-			break;
-		case 2:
-			_activeCAnim._zPlacement = FORWARD;
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-void TattooScene::doBgAnimCheckCursor() {
-	Events &events = *_vm->_events;
-	UserInterface &ui = *_vm->_ui;
-	Common::Point mousePos = events.mousePos();
-
-	// If we're in Look Mode, make sure the cursor is the magnifying glass
-	if (ui._menuMode == LOOK_MODE && events.getCursor() != MAGNIFY)
-		events.setCursor(MAGNIFY);
-
-	// See if the mouse is over any of the arrow zones, and if so, change the cursor to the correct
-	// arrow cursor indicating the direcetion of the exit
-	if (events.getCursor() == ARROW || events.getCursor() >= EXIT_ZONES_START) {
-		CursorId cursorId = ARROW;
-
-		if (ui._menuMode == STD_MODE && _arrowZone != -1 && _currentScene != 90) {
-			for (uint idx = 0; idx < _exits.size(); ++idx) {
-				Exit &exit = _exits[idx];
-				if (exit.contains(mousePos))
-					cursorId = (CursorId)(exit._image + EXIT_ZONES_START);
-			}
-		}
-
-		events.setCursor(cursorId);
-	}
-}
-
-void TattooScene::doBgAnimEraseBackground() {
-	TattooEngine &vm = *((TattooEngine *)_vm);
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	TattooUserInterface &ui = *((TattooUserInterface *)_vm->_ui);
-	
-	static const int16 OFFSETS[16] = { -1, -2, -3, -3, -2, -1, -1, 0, 1, 2, 3, 3, 2, 1, 0, 0 };
-
-	if (_mask != nullptr) {
-		if (screen._backBuffer1.w() > screen.w())
-			screen.blitFrom(screen._backBuffer1, Common::Point(0, 0), Common::Rect(screen._currentScroll, 0,
-			screen._currentScroll + screen.w(), screen.h()));
-		else
-			screen.blitFrom(screen._backBuffer1);
-
-		switch (_currentScene) {
-		case 7:
-			if (++_maskCounter == 2) {
-				_maskCounter = 0;
-				if (--_maskOffset.x < 0)
-					_maskOffset.x = SHERLOCK_SCREEN_WIDTH - 1;
-			}
-			break;
-
-		case 8:
-			_maskOffset.x += 2;
-			if (_maskOffset.x >= SHERLOCK_SCREEN_WIDTH)
-				_maskOffset.x = 0;
-			break;
-
-		case 18:
-		case 68:
-			++_maskCounter;
-			if (_maskCounter / 4 >= 16)
-				_maskCounter = 0;
-
-			_maskOffset.x = OFFSETS[_maskCounter / 4];
-			break;
-
-		case 53:
-			if (++_maskCounter == 2) {
-				_maskCounter = 0;
-				if (++_maskOffset.x == screen._backBuffer1.w())
-					_maskOffset.x = 0;
-			}
-			break;
-
-		default:
-			break;
-		}
-	} else {
-		// Standard scene without mask, so call user interface to erase any UI elements as necessary
-		ui.doBgAnimRestoreUI();
-		
-		// Restore background for any areas covered by characters and shapes
-		for (uint idx = 0; idx < MAX_CHARACTERS; ++idx)
-			screen.restoreBackground(Common::Rect(people[idx]._oldPosition.x, people[idx]._oldPosition.y,
-				people[idx]._oldPosition.x + people[idx]._oldSize.x, people[idx]._oldPosition.y + people[idx]._oldSize.y));
-
-		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-			Object &obj = _bgShapes[idx];
-						
-			if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || 
-					obj._type == HIDE_SHAPE || obj._type == REMOVE)
-				screen._backBuffer1.blitFrom(*obj._imageFrame, obj._oldPosition, 
-					Common::Rect(obj._oldPosition.x, obj._oldPosition.y, obj._oldPosition.x + obj._oldSize.x,
-						obj._oldPosition.y + obj._oldSize.y));
-		}
-
-		// If credits are active, erase the area they cover
-		if (vm._creditsActive)
-			vm.eraseCredits();
-	}
-
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		Object &obj = _bgShapes[idx];
-
-		if (obj._type == NO_SHAPE && (obj._flags & 1) == 0) {
-			screen._backBuffer1.blitFrom(screen._backBuffer2, obj._position, obj.getNoShapeBounds());
-
-			obj._oldPosition = obj._position;
-			obj._oldSize = obj._noShapeSize;
-		}
-	}
-
-	// Adjust the Target Scroll if needed
-	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll) < 
-			(SHERLOCK_SCREEN_WIDTH / 8) && people[people._walkControl]._delta.x < 0) {
-		
-		screen._targetScroll = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
-				SHERLOCK_SCREEN_WIDTH / 8 - 250);
-		if (screen._targetScroll < 0)
-			screen._targetScroll = 0;
-	}
-
-	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll) > (SHERLOCK_SCREEN_WIDTH / 4 * 3) 
-			&& people[people._walkControl]._delta.x > 0)
-		screen._targetScroll = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
-			SHERLOCK_SCREEN_WIDTH / 4 * 3 + 250);
-
-	if (screen._targetScroll > screen._scrollSize)
-		screen._targetScroll = screen._scrollSize;
-
-	ui.doScroll();
-}
-
-void TattooScene::doBgAnim() {
-	doBgAnimCheckCursor();
-
-//	Events &events = *_vm->_events;
-	People &people = *_vm->_people;
-//	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-
-	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
-	talk._talkToAbort = false;
-
-	// Check the characters and sprites for updates
-	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
-		if (people[idx]._type == CHARACTER)
-			people[idx].checkSprite();
-	}
-
-	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
-		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
-			_bgShapes[idx].checkObject();
-	}
-
-	// Erase any affected background areas
-	doBgAnimEraseBackground();
-}
-
-} // End of namespace Tattoo
-
 } // End of namespace Sherlock
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index ce0785063d..b5e27ff99d 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -318,61 +318,6 @@ public:
 	void setNPCPath(int npc);
 };
 
-namespace Scalpel {
-
-class ScalpelScene : public Scene {
-private:
-	void doBgAnimCheckCursor();
-protected:
-	/**
-	 * Checks all the background shapes. If a background shape is animating,
-	 * it will flag it as needing to be drawn. If a non-animating shape is
-	 * colliding with another shape, it will also flag it as needing drawing
-	 */
-	virtual void checkBgShapes();
-public:
-	ScalpelScene(SherlockEngine *vm) : Scene(vm) {}
-
-	/**
-	 * Draw all objects and characters.
-	 */
-	virtual void doBgAnim();
-};
-
-} // End of namespace Scalpel
-
-namespace Tattoo {
-
-class TattooScene : public Scene {
-private:
-	int _arrowZone;
-	int _maskCounter;
-	Common::Point _maskOffset;
-private:
-	void doBgAnimCheckCursor();
-
-	void doBgAnimEraseBackground();
-protected:
-	/**
-	 * Checks all the background shapes. If a background shape is animating,
-	 * it will flag it as needing to be drawn. If a non-animating shape is
-	 * colliding with another shape, it will also flag it as needing drawing
-	 */
-	virtual void checkBgShapes();
-public:
-	ImageFile *_mask, *_mask1;
-	CAnimStream _activeCAnim;
-public:
-	TattooScene(SherlockEngine *vm);
-
-	/**
-	 * Draw all objects and characters.
-	 */
-	virtual void doBgAnim();
-};
-
-} // End of namespace Tattoo
-
 } // End of namespace Sherlock
 
 #endif
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
deleted file mode 100644
index 98a13a3e76..0000000000
--- a/engines/sherlock/settings.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sherlock/sherlock.h"
-#include "sherlock/settings.h"
-
-namespace Sherlock {
-
-namespace Scalpel {
-
-static const int SETUP_POINTS[12][4]  = {
-	{ 4, 154, 101, 53 },		// Exit
-	{ 4, 165, 101, 53 },		// Music Toggle
-	{ 219, 165, 316, 268 },		// Voice Toggle
-	{ 103, 165, 217, 160 },		// Sound Effects Toggle
-	{ 219, 154, 316, 268 },		// Help Button Left/Right
-	{ 103, 154, 217, 160 },		// New Font Style
-	{ 4, 187, 101, 53 },		// Joystick Toggle
-	{ 103, 187, 217, 160 },		// Calibrate Joystick
-	{ 219, 176, 316, 268 },		// Fade Style
-	{ 103, 176, 217, 160 },		// Window Open Style
-	{ 4, 176, 101, 53 }, 		// Portraits Toggle
-	{ 219, 187, 316, 268 }		// _key Pad Accel. Toggle
-};
-
-static const char *const SETUP_STRS0[2] = { "off", "on" };
-static const char *const SETUP_STRS1[2] = { "Directly", "by Pixel" };
-static const char *const SETUP_STRS2[2] = { "Left", "Right" };
-static const char *const SETUP_STRS3[2] = { "Appear", "Slide" };
-static const char *const SETUP_STRS5[2] = { "Left", "Right" };
-static const char *const SETUP_NAMES[12] = {
-	"Exit", "M", "V", "S", "B", "New Font Style", "J", "Calibrate Joystick", "F", "W", "P", "K"
-};
-
-/*----------------------------------------------------------------*/
-
-void Settings::drawInteface(bool flag) {
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
-	UserInterface &ui = *_vm->_ui;
-	Common::String tempStr;
-
-	if (!flag) {
-		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y1 + 1), BORDER_COLOR);
-		screen._backBuffer1.fillRect(Common::Rect(0, CONTROLS_Y1 + 1, 2, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-		screen._backBuffer1.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH,
-			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-		screen._backBuffer1.hLine(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH - 1, BORDER_COLOR);
-		screen._backBuffer1.fillRect(Common::Rect(2, CONTROLS_Y1 + 1, SHERLOCK_SCREEN_WIDTH - 2,
-			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
-	}
-
-	screen.makeButton(Common::Rect(SETUP_POINTS[0][0], SETUP_POINTS[0][1], SETUP_POINTS[0][2], SETUP_POINTS[0][1] + 10),
-		SETUP_POINTS[0][3] - screen.stringWidth("Exit") / 2, "Exit");
-
-	tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[1][0], SETUP_POINTS[1][1], SETUP_POINTS[1][2], SETUP_POINTS[1][1] + 10),
-		SETUP_POINTS[1][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[2][0], SETUP_POINTS[2][1], SETUP_POINTS[2][2], SETUP_POINTS[2][1] + 10),
-		SETUP_POINTS[2][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[3][0], SETUP_POINTS[3][1], SETUP_POINTS[3][2], SETUP_POINTS[3][1] + 10),
-		SETUP_POINTS[3][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Auto Help %s", SETUP_STRS5[ui._helpStyle]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[4][0], SETUP_POINTS[4][1], SETUP_POINTS[4][2], SETUP_POINTS[4][1] + 10),
-		SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10),
-		SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
-
-	// WORKAROUND: We don't support the joystick in ScummVM, so draw the next two buttons as disabled
-	tempStr = "Joystick Off";
-	screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10),
-		SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.buttonPrint(Common::Point(SETUP_POINTS[6][3], SETUP_POINTS[6][1]), COMMAND_NULL, false, tempStr);
-
-	tempStr = "Calibrate Joystick";
-	screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10),
-		SETUP_POINTS[7][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.buttonPrint(Common::Point(SETUP_POINTS[7][3], SETUP_POINTS[7][1]), COMMAND_NULL, false, tempStr);
-
-	tempStr = Common::String::format("Fade %s", screen._fadeStyle ? "by Pixel" : "Directly");
-	screen.makeButton(Common::Rect(SETUP_POINTS[8][0], SETUP_POINTS[8][1], SETUP_POINTS[8][2], SETUP_POINTS[8][1] + 10),
-		SETUP_POINTS[8][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Windows %s", ui._slideWindows ? "Slide" : "Appear");
-	screen.makeButton(Common::Rect(SETUP_POINTS[9][0], SETUP_POINTS[9][1], SETUP_POINTS[9][2], SETUP_POINTS[9][1] + 10),
-		SETUP_POINTS[9][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
-	screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
-		SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
-
-	tempStr = "Key Pad Slow";
-	screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
-		SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
-	screen.buttonPrint(Common::Point(SETUP_POINTS[11][3], SETUP_POINTS[11][1]), COMMAND_NULL, false, tempStr);
-
-	// Show the window immediately, or slide it on-screen
-	if (!flag) {
-		if (!ui._slideWindows) {
-			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-		} else {
-			ui.summonWindow(true, CONTROLS_Y1);
-		}
-
-		ui._windowOpen = true;
-	} else {
-		screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-	}
-}
-
-int Settings::drawButtons(const Common::Point &pt, int _key) {
-	Events &events = *_vm->_events;
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
-	UserInterface &ui = *_vm->_ui;
-	int found = -1;
-	byte color;
-	Common::String tempStr;
-
-	for (int idx = 0; idx < 12; ++idx) {
-		if ((pt.x > SETUP_POINTS[idx][0] && pt.x < SETUP_POINTS[idx][2] && pt.y > SETUP_POINTS[idx][1]
-				&& pt.y < (SETUP_POINTS[idx][1] + 10) && (events._pressed || events._released))
-				|| (_key == SETUP_NAMES[idx][0])) {
-			found = idx;
-			color = COMMAND_HIGHLIGHTED;
-		} else {
-			color = COMMAND_FOREGROUND;
-		}
-
-		// Print the button text
-		switch (idx) {
-		case 1:
-			tempStr = Common::String::format("Music %s", SETUP_STRS0[sound._music]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 2:
-			tempStr = Common::String::format("Voices %s", SETUP_STRS0[sound._voices]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 3:
-			tempStr = Common::String::format("Sound Effects %s", SETUP_STRS0[sound._digitized]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 4:
-			tempStr = Common::String::format("Auto Help %s", SETUP_STRS2[ui._helpStyle]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 6:
-			tempStr = "Joystick Off";
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
-			break;
-		case 7:
-			tempStr = "Calibrate Joystick";
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
-			break;
-		case 8:
-			tempStr = Common::String::format("Fade %s", SETUP_STRS1[screen._fadeStyle]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 9:
-			tempStr = Common::String::format("Windows %s", SETUP_STRS3[ui._slideWindows]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 10:
-			tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
-			break;
-		case 11:
-			tempStr = "Key Pad Slow";
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
-			break;
-		default:
-			screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
-			break;
-		}
-	}
-
-	return found;
-}
-
-void Settings::show(SherlockEngine *vm) {
-	Events &events = *vm->_events;
-	People &people = *vm->_people;
-	Scene &scene = *vm->_scene;
-	Screen &screen = *vm->_screen;
-	Sound &sound = *vm->_sound;
-	Talk &talk = *vm->_talk;
-	ScalpelUserInterface &ui = *(ScalpelUserInterface *)vm->_ui;
-	bool updateConfig = false;
-
-	assert(vm->getGameID() == GType_SerratedScalpel);
-	Settings settings(vm);
-	settings.drawInteface(false);
-
-	do {
-		if (ui._menuCounter)
-			ui.whileMenuCounter();
-
-		int found = -1;
-		ui._key = -1;
-
-		scene.doBgAnim();
-		if (talk._talkToAbort)
-			return;
-
-		events.setButtonState();
-		Common::Point pt = events.mousePos();
-
-		if (events._pressed || events._released || events.kbHit()) {
-			ui.clearInfo();
-			ui._key = -1;
-
-			if (events.kbHit()) {
-				Common::KeyState keyState = events.getKey();
-				ui._key = toupper(keyState.keycode);
-
-				if (ui._key == Common::KEYCODE_RETURN || ui._key == Common::KEYCODE_SPACE) {
-					events._pressed = false;
-					events._oldButtons = 0;
-					ui._keyPress = '\0';
-					events._released = true;
-				}
-			}
-
-			// Handle highlighting button under mouse
-			found = settings.drawButtons(pt, ui._key);
-		}
-
-		if ((found == 0 && events._released) || (ui._key == 'E' || ui._key == Common::KEYCODE_ESCAPE))
-			// Exit
-			break;
-
-		if ((found == 1 && events._released) || ui._key == 'M') {
-			// Toggle music
-			if (sound._music) {
-				sound.stopSound();
-				sound._music = false;
-			}
-			else {
-				sound._music = true;
-				sound.startSong();
-			}
-
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 2 && events._released) || ui._key == 'V') {
-			sound._voices = !sound._voices;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 3 && events._released) || ui._key == 'S') {
-			// Toggle sound effects
-			sound._digitized = !sound._digitized;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 4 && events._released) || ui._key == 'A') {
-			// Help button style
-			ui._helpStyle = !ui._helpStyle;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 5 && events._released) || ui._key == 'N') {
-			// New font style
-			int fontNum = screen.fontNumber() + 1;
-			if (fontNum == 3)
-				fontNum = 0;
-
-			screen.setFont(fontNum);
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 8 && events._released) || ui._key == 'F') {
-			// Toggle fade style
-			screen._fadeStyle = !screen._fadeStyle;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 9 && events._released) || ui._key == 'W') {
-			// Window style
-			ui._slideWindows = !ui._slideWindows;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-
-		if ((found == 10 && events._released) || ui._key == 'P') {
-			// Toggle portraits being shown
-			people._portraitsOn = !people._portraitsOn;
-			updateConfig = true;
-			settings.drawInteface(true);
-		}
-	} while (!vm->shouldQuit());
-
-	ui.banishWindow();
-
-	if (updateConfig)
-		vm->saveConfig();
-
-	ui._keyPress = '\0';
-	ui._keyboardInput = false;
-	ui._windowBounds.top = CONTROLS_Y1;
-	ui._key = -1;
-}
-
-} // End of namespace Scalpel
-
-} // End of namespace Sherlock
diff --git a/engines/sherlock/settings.h b/engines/sherlock/settings.h
deleted file mode 100644
index ff2e647a62..0000000000
--- a/engines/sherlock/settings.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SHERLOCK_SETTINGS_H
-#define SHERLOCK_SETTINGS_H
-
-#include "common/scummsys.h"
-
-namespace Sherlock {
-
-class SherlockEngine;
-
-namespace Scalpel {
-
-class Settings {
-private:
-	SherlockEngine *_vm;
-
-	Settings(SherlockEngine *vm) : _vm(vm) {}
-
-	/**
-	 * Draws the interface for the settings window
-	 */
-	void drawInteface(bool flag);
-
-	/**
-	 * Draws the buttons for the settings dialog
-	 */
-	int drawButtons(const Common::Point &pt, int key);
-public:
-	/**
-	 * Handles input when the settings window is being shown
-	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
-	 *		the user interface, it uses so many internal UI fields, that it sort of made some sense
-	 *		to put it in the UserInterface class.
-	 */
-	static void show(SherlockEngine *vm);
-};
-
-} // End of namespace Scalpel
-
-} // End of namespace Sherlock
-
-#endif
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 5e9cb02a3d..dd6e776082 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -23,6 +23,7 @@
 #include "sherlock/talk.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/screen.h"
+#include "sherlock/scalpel/scalpel_user_interface.h"
 
 namespace Sherlock {
 
@@ -547,7 +548,7 @@ void Talk::talkTo(const Common::String &filename) {
 
 				}
 
-				ui._key = ui._oldKey = COMMANDS[TALK_MODE - 1];
+				ui._key = ui._oldKey = Scalpel::COMMANDS[TALK_MODE - 1];
 				ui._temp = ui._oldTemp = 0;
 				ui._menuMode = TALK_MODE;
 				_talkToFlag = 2;
@@ -784,9 +785,9 @@ void Talk::drawInterface() {
 		screen.makeButton(Common::Rect(181, CONTROLS_Y, 221, CONTROLS_Y + 10),
 			200 - screen.stringWidth("Down") / 2, "Down");
 	} else {
-		int strWidth = screen.stringWidth(PRESS_KEY_TO_CONTINUE);
+		int strWidth = screen.stringWidth(Scalpel::PRESS_KEY_TO_CONTINUE);
 		screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
-			160 - strWidth / 2, PRESS_KEY_TO_CONTINUE);
+			160 - strWidth / 2, Scalpel::PRESS_KEY_TO_CONTINUE);
 		screen.gPrint(Common::Point(160 - strWidth / 2, CONTROLS_Y), COMMAND_FOREGROUND, "P");
 	}
 }
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
new file mode 100644
index 0000000000..f03e791c52
--- /dev/null
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -0,0 +1,227 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/tattoo/tattoo_scene.h"
+#include "sherlock/tattoo/tattoo.h"
+#include "sherlock/tattoo/tattoo_user_interface.h"
+#include "sherlock/events.h"
+#include "sherlock/people.h"
+
+namespace Sherlock {
+
+namespace Tattoo {
+
+TattooScene::TattooScene(SherlockEngine *vm) : Scene(vm) {
+	_arrowZone = -1;
+	_mask = _mask1 = nullptr;
+	_maskCounter = 0;
+}
+
+void TattooScene::checkBgShapes() {
+	People &people = *_vm->_people;
+	Person &holmes = people._player;
+	Common::Point pt(holmes._position.x / FIXED_INT_MULTIPLIER, holmes._position.y / FIXED_INT_MULTIPLIER);
+
+	// Call the base scene method to handle bg shapes
+	Scene::checkBgShapes();
+
+	// Check for any active playing animation
+	if (_activeCAnim._images && _activeCAnim._zPlacement != REMOVE) {
+		switch (_activeCAnim._flags & 3) {
+		case 0:
+			_activeCAnim._zPlacement = BEHIND;
+			break;
+		case 1:
+			_activeCAnim._zPlacement = ((_activeCAnim._position.y + _activeCAnim._imageFrame->_frame.h - 1)) ?
+				NORMAL_FORWARD : NORMAL_BEHIND;
+			break;
+		case 2:
+			_activeCAnim._zPlacement = FORWARD;
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+void TattooScene::doBgAnimCheckCursor() {
+	Events &events = *_vm->_events;
+	UserInterface &ui = *_vm->_ui;
+	Common::Point mousePos = events.mousePos();
+
+	// If we're in Look Mode, make sure the cursor is the magnifying glass
+	if (ui._menuMode == LOOK_MODE && events.getCursor() != MAGNIFY)
+		events.setCursor(MAGNIFY);
+
+	// See if the mouse is over any of the arrow zones, and if so, change the cursor to the correct
+	// arrow cursor indicating the direcetion of the exit
+	if (events.getCursor() == ARROW || events.getCursor() >= EXIT_ZONES_START) {
+		CursorId cursorId = ARROW;
+
+		if (ui._menuMode == STD_MODE && _arrowZone != -1 && _currentScene != 90) {
+			for (uint idx = 0; idx < _exits.size(); ++idx) {
+				Exit &exit = _exits[idx];
+				if (exit.contains(mousePos))
+					cursorId = (CursorId)(exit._image + EXIT_ZONES_START);
+			}
+		}
+
+		events.setCursor(cursorId);
+	}
+}
+
+void TattooScene::doBgAnimEraseBackground() {
+	TattooEngine &vm = *((TattooEngine *)_vm);
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+	TattooUserInterface &ui = *((TattooUserInterface *)_vm->_ui);
+	
+	static const int16 OFFSETS[16] = { -1, -2, -3, -3, -2, -1, -1, 0, 1, 2, 3, 3, 2, 1, 0, 0 };
+
+	if (_mask != nullptr) {
+		if (screen._backBuffer1.w() > screen.w())
+			screen.blitFrom(screen._backBuffer1, Common::Point(0, 0), Common::Rect(screen._currentScroll, 0,
+			screen._currentScroll + screen.w(), screen.h()));
+		else
+			screen.blitFrom(screen._backBuffer1);
+
+		switch (_currentScene) {
+		case 7:
+			if (++_maskCounter == 2) {
+				_maskCounter = 0;
+				if (--_maskOffset.x < 0)
+					_maskOffset.x = SHERLOCK_SCREEN_WIDTH - 1;
+			}
+			break;
+
+		case 8:
+			_maskOffset.x += 2;
+			if (_maskOffset.x >= SHERLOCK_SCREEN_WIDTH)
+				_maskOffset.x = 0;
+			break;
+
+		case 18:
+		case 68:
+			++_maskCounter;
+			if (_maskCounter / 4 >= 16)
+				_maskCounter = 0;
+
+			_maskOffset.x = OFFSETS[_maskCounter / 4];
+			break;
+
+		case 53:
+			if (++_maskCounter == 2) {
+				_maskCounter = 0;
+				if (++_maskOffset.x == screen._backBuffer1.w())
+					_maskOffset.x = 0;
+			}
+			break;
+
+		default:
+			break;
+		}
+	} else {
+		// Standard scene without mask, so call user interface to erase any UI elements as necessary
+		ui.doBgAnimRestoreUI();
+		
+		// Restore background for any areas covered by characters and shapes
+		for (uint idx = 0; idx < MAX_CHARACTERS; ++idx)
+			screen.restoreBackground(Common::Rect(people[idx]._oldPosition.x, people[idx]._oldPosition.y,
+				people[idx]._oldPosition.x + people[idx]._oldSize.x, people[idx]._oldPosition.y + people[idx]._oldSize.y));
+
+		for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+			Object &obj = _bgShapes[idx];
+						
+			if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || 
+					obj._type == HIDE_SHAPE || obj._type == REMOVE)
+				screen._backBuffer1.blitFrom(*obj._imageFrame, obj._oldPosition, 
+					Common::Rect(obj._oldPosition.x, obj._oldPosition.y, obj._oldPosition.x + obj._oldSize.x,
+						obj._oldPosition.y + obj._oldSize.y));
+		}
+
+		// If credits are active, erase the area they cover
+		if (vm._creditsActive)
+			vm.eraseCredits();
+	}
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+
+		if (obj._type == NO_SHAPE && (obj._flags & 1) == 0) {
+			screen._backBuffer1.blitFrom(screen._backBuffer2, obj._position, obj.getNoShapeBounds());
+
+			obj._oldPosition = obj._position;
+			obj._oldSize = obj._noShapeSize;
+		}
+	}
+
+	// Adjust the Target Scroll if needed
+	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll) < 
+			(SHERLOCK_SCREEN_WIDTH / 8) && people[people._walkControl]._delta.x < 0) {
+		
+		screen._targetScroll = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
+				SHERLOCK_SCREEN_WIDTH / 8 - 250);
+		if (screen._targetScroll < 0)
+			screen._targetScroll = 0;
+	}
+
+	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll) > (SHERLOCK_SCREEN_WIDTH / 4 * 3) 
+			&& people[people._walkControl]._delta.x > 0)
+		screen._targetScroll = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
+			SHERLOCK_SCREEN_WIDTH / 4 * 3 + 250);
+
+	if (screen._targetScroll > screen._scrollSize)
+		screen._targetScroll = screen._scrollSize;
+
+	ui.doScroll();
+}
+
+void TattooScene::doBgAnim() {
+	doBgAnimCheckCursor();
+
+//	Events &events = *_vm->_events;
+	People &people = *_vm->_people;
+//	Scene &scene = *_vm->_scene;
+	Screen &screen = *_vm->_screen;
+	Talk &talk = *_vm->_talk;
+
+	screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT));
+	talk._talkToAbort = false;
+
+	// Check the characters and sprites for updates
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+		if (people[idx]._type == CHARACTER)
+			people[idx].checkSprite();
+	}
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
+			_bgShapes[idx].checkObject();
+	}
+
+	// Erase any affected background areas
+	doBgAnimEraseBackground();
+}
+
+} // End of namespace Tattoo
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
new file mode 100644
index 0000000000..34e87f41a8
--- /dev/null
+++ b/engines/sherlock/tattoo/tattoo_scene.h
@@ -0,0 +1,65 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_TATTOO_SCENE_H
+#define SHERLOCK_TATTOO_SCENE_H
+
+#include "common/scummsys.h"
+#include "sherlock/scene.h"
+
+namespace Sherlock {
+
+namespace Tattoo {
+
+class TattooScene : public Scene {
+private:
+	int _arrowZone;
+	int _maskCounter;
+	Common::Point _maskOffset;
+private:
+	void doBgAnimCheckCursor();
+
+	void doBgAnimEraseBackground();
+protected:
+	/**
+	 * Checks all the background shapes. If a background shape is animating,
+	 * it will flag it as needing to be drawn. If a non-animating shape is
+	 * colliding with another shape, it will also flag it as needing drawing
+	 */
+	virtual void checkBgShapes();
+public:
+	ImageFile *_mask, *_mask1;
+	CAnimStream _activeCAnim;
+public:
+	TattooScene(SherlockEngine *vm);
+
+	/**
+	 * Draw all objects and characters.
+	 */
+	virtual void doBgAnim();
+};
+
+} // End of namespace Tattoo
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
new file mode 100644
index 0000000000..98ec34d62c
--- /dev/null
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -0,0 +1,106 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/tattoo/tattoo_user_interface.h"
+#include "sherlock/tattoo/tattoo_scene.h"
+#include "sherlock/sherlock.h"
+
+namespace Sherlock {
+
+namespace Tattoo {
+
+TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm) {
+	_menuBuffer = nullptr;
+	_invMenuBuffer = nullptr;
+}
+
+void TattooUserInterface::handleInput() {
+	// TODO
+	_vm->_events->pollEventsAndWait();
+}
+
+void TattooUserInterface::doBgAnimRestoreUI() {
+	TattooScene &scene = *((TattooScene *)_vm->_scene);
+	Screen &screen = *_vm->_screen;
+
+	// If _oldMenuBounds was set, then either a new menu has been opened or the current menu has been closed.
+	// Either way, we need to restore the area where the menu was displayed
+	if (_oldMenuBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldMenuBounds.left, _oldMenuBounds.top),
+			_oldMenuBounds);
+
+	if (_oldInvMenuBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldInvMenuBounds.left, _oldInvMenuBounds.top),
+			_oldInvMenuBounds);
+
+	if (_menuBuffer != nullptr)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_menuBounds.left, _menuBounds.top), _menuBounds);
+	if (_invMenuBuffer != nullptr)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_invMenuBounds.left, _invMenuBounds.top), _invMenuBounds);
+
+	// If there is a Text Tag being display, restore the area underneath it
+	if (_oldTagBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldTagBounds.left, _oldTagBounds.top), 
+			_oldTagBounds);
+
+	// If there is an Inventory being shown, restore the graphics underneath it
+	if (_oldInvGraphicBounds.width() > 0)
+		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldInvGraphicBounds.left, _oldInvGraphicBounds.top), 
+			_oldInvGraphicBounds);
+
+	// If a canimation is active, restore the graphics underneath it
+	if (scene._activeCAnim._images != nullptr)
+		screen.restoreBackground(scene._activeCAnim._oldBounds);
+
+	// If a canimation just ended, remove it's graphics from the backbuffer
+	if (scene._activeCAnim._removeBounds.width() > 0)
+		screen.restoreBackground(scene._activeCAnim._removeBounds);
+}
+
+void TattooUserInterface::doScroll() {
+	Screen &screen = *_vm->_screen;
+	int oldScroll = screen._currentScroll;
+
+	// If we're already at the target scroll position, nothing needs to be done
+	if (screen._targetScroll == screen._currentScroll)
+		return;
+
+	screen._flushScreen = true;
+	if (screen._targetScroll > screen._currentScroll) {
+		screen._currentScroll += screen._scrollSpeed;
+		if (screen._currentScroll > screen._targetScroll)
+			screen._currentScroll = screen._targetScroll;
+	} else if (screen._targetScroll < screen._currentScroll) {
+		screen._currentScroll -= screen._scrollSpeed;
+		if (screen._currentScroll < screen._targetScroll)
+			screen._currentScroll = screen._targetScroll;
+	}
+
+	if (_menuBuffer != nullptr)
+		_menuBounds.translate(screen._currentScroll - oldScroll, 0);
+	if (_invMenuBuffer != nullptr)
+		_invMenuBounds.translate(screen._currentScroll - oldScroll, 0);
+}
+
+} // End of namespace Tattoo
+
+} // End of namespace Sherlock
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
new file mode 100644
index 0000000000..c7a4c4cf77
--- /dev/null
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -0,0 +1,68 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_TATTOO_UI_H
+#define SHERLOCK_TATTOO_UI_H
+
+#include "common/scummsys.h"
+#include "sherlock/user_interface.h"
+
+namespace Sherlock {
+
+namespace Tattoo {
+
+class TattooUserInterface : public UserInterface {
+private:
+	Common::Rect _menuBounds;
+	Common::Rect _oldMenuBounds;
+	Common::Rect _invMenuBounds;
+	Common::Rect _oldInvMenuBounds;
+	Common::Rect _oldTagBounds;
+	Common::Rect _oldInvGraphicBounds;
+	Surface *_menuBuffer;
+	Surface *_invMenuBuffer;
+public:
+	TattooUserInterface(SherlockEngine *vm);
+
+	/**
+	 * Handles restoring any areas of the back buffer that were/are covered by UI elements
+	 */
+	void doBgAnimRestoreUI();
+
+	/**
+	 * Checks to see if the screen needs to be scrolled. If so, scrolls it towards the target position
+	 */
+	void doScroll();
+public:
+	virtual ~TattooUserInterface() {}
+
+	/**
+	 * Main input handler for the user interface
+	 */
+	virtual void handleInput();
+};
+
+} // End of namespace Tattoo
+
+} // End of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 5858daffc5..9fff7cc999 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -22,64 +22,11 @@
 
 #include "sherlock/user_interface.h"
 #include "sherlock/sherlock.h"
-#include "sherlock/settings.h"
+#include "sherlock/scalpel/scalpel_user_interface.h"
+#include "sherlock/tattoo/tattoo_user_interface.h"
 
 namespace Sherlock {
 
-// Main user interface menu control locations
-const int MENU_POINTS[12][4] = {
-	{ 13, 153, 72, 165 },
-	{ 13, 169, 72, 181 },
-	{ 13, 185, 72, 197 },
-	{ 88, 153, 152, 165 },
-	{ 88, 169, 152, 181 },
-	{ 88, 185, 152, 197 },
-	{ 165, 153, 232, 165 },
-	{ 165, 169, 232, 181 },
-	{ 165, 185, 233, 197 },
-	{ 249, 153, 305, 165 },
-	{ 249, 169, 305, 181 },
-	{ 249, 185, 305, 197 }
-};
-
-// Inventory control locations */
-const int INVENTORY_POINTS[8][3] = {
-	{ 4, 50, 29 },
-	{ 52, 99, 77 },
-	{ 101, 140, 123 },
-	{ 142, 187, 166 },
-	{ 189, 219, 198 },
-	{ 221, 251, 234 },
-	{ 253, 283, 266 },
-	{ 285, 315, 294 }
-};
-
-const char COMMANDS[13] = "LMTPOCIUGJFS";
-const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
-const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
-const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
-
-const char *const MOPEN[] = {
-	"This cannot be opened", "It is already open", "It is locked", "Wait for Watson", " ", "."
-};
-const char *const MCLOSE[] = {
-	"This cannot be closed", "It is already closed", "The safe door is in the way"
-};
-const char *const MMOVE[] = {
-	"This cannot be moved", "It is bolted to the floor", "It is too heavy", "The other crate is in the way"
-};
-const char *const MPICK[] = {
-	"Nothing of interest here", "It is bolted down", "It is too big to carry", "It is too heavy",
-	"I think a girl would be more your type", "Those flowers belong to Penny", "She's far too young for you!",
-	"I think a girl would be more your type!", "Government property for official use only"
-};
-const char *const MUSE[] = {
-	"You can't do that", "It had no effect", "You can't reach it", "OK, the door looks bigger! Happy?",
-	"Doors don't smoke"
-};
-
-
-
 UserInterface *UserInterface::init(SherlockEngine *vm) {
 	if (vm->getGameID() == GType_SerratedScalpel)
 		return new Scalpel::ScalpelUserInterface(vm);
@@ -106,2277 +53,4 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) {
 	_lookHelp = 0;
 }
 
-/*----------------------------------------------------------------*/
-
-namespace Scalpel {
-
-ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) {
-	_controls = new ImageFile("menu.all");
-	_controlPanel = new ImageFile("controls.vgs");
-	_keyPress = '\0';
-	_lookHelp = 0;
-	_bgFound = 0;
-	_oldBgFound = -1;
-	_help = _oldHelp = 0;
-	_key = _oldKey = '\0';
-	_temp = _oldTemp = 0;
-	_oldLook = 0;
-	_keyboardInput = false;
-	_pause = false;
-	_cNum = 0;
-	_find = 0;
-	_oldUse = 0;
-}
-
-ScalpelUserInterface::~ScalpelUserInterface() {
-	delete _controls;
-	delete _controlPanel;
-}
-
-void ScalpelUserInterface::reset() {
-	_oldKey = -1;
-	_help = _oldHelp = -1;
-	_oldTemp = _temp = -1;
-}
-
-void ScalpelUserInterface::drawInterface(int bufferNum) {
-	Screen &screen = *_vm->_screen;
-
-	if (bufferNum & 1)
-		screen._backBuffer1.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
-	if (bufferNum & 2)
-		screen._backBuffer2.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y));
-	if (bufferNum == 3)
-		screen._backBuffer2.fillRect(0, INFO_LINE, SHERLOCK_SCREEN_WIDTH, INFO_LINE + 10, INFO_BLACK);
-}
-
-void ScalpelUserInterface::handleInput() {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-
-	if (_menuCounter)
-		whileMenuCounter();
-
-	Common::Point pt = events.mousePos();
-	_bgFound = scene.findBgShape(Common::Rect(pt.x, pt.y, pt.x + 1, pt.y + 1));
-	_keyPress = '\0';
-
-	// Check kbd and set the mouse released flag if Enter or space is pressed.
-	// Otherwise, the pressed _key is stored for later use
-	if (events.kbHit()) {
-		Common::KeyState keyState = events.getKey();
-		_keyPress = keyState.ascii;
-
-		if (keyState.keycode == Common::KEYCODE_x && keyState.flags & Common::KBD_ALT) {
-			_vm->quitGame();
-			events.pollEvents();
-			return;
-		}
-	}
-
-	// Do button highlighting check
-	if (!talk._scriptMoreFlag) {	// Don't if scripts are running
-		if (((events._rightPressed || events._rightReleased) && _helpStyle) ||
-				(!_helpStyle && !_menuCounter)) {
-			// Handle any default commands if we're in STD_MODE
-			if (_menuMode == STD_MODE) {
-				if (pt.y < CONTROLS_Y &&
-					(events._rightPressed || (!_helpStyle && !events._released)) &&
-					(_bgFound != -1) && (_bgFound < 1000) &&
-					(scene._bgShapes[_bgFound]._defaultCommand ||
-					!scene._bgShapes[_bgFound]._description.empty())) {
-					// If there is no default command, so set it to Look
-					if (scene._bgShapes[_bgFound]._defaultCommand)
-						_help = scene._bgShapes[_bgFound]._defaultCommand - 1;
-					else
-						_help = 0;
-
-					// Reset 'help' if it is an invalid command
-					if (_help > 5)
-						_help = -1;
-				} else if (pt.y < CONTROLS_Y &&
-					((events._rightReleased && _helpStyle) || (events._released && !_helpStyle)) &&
-					(_bgFound != -1 && _bgFound < 1000) &&
-					(scene._bgShapes[_bgFound]._defaultCommand ||
-					!scene._bgShapes[_bgFound]._description.empty())) {
-					// If there is no default command, set it to Look
-					if (scene._bgShapes[_bgFound]._defaultCommand)
-						_menuMode = (MenuMode)scene._bgShapes[_bgFound]._defaultCommand;
-					else
-						_menuMode = LOOK_MODE;
-					events._released = true;
-					events._pressed = events._oldButtons = false;
-					_help = _oldHelp = -1;
-
-					if (_menuMode == LOOK_MODE) {
-						// Set the flag to tell the game that this was a right-click
-						// call to look and should exit without the look button being pressed
-						_lookHelp = true;
-					}
-				} else {
-					_help = -1;
-				}
-
-				// Check if highlighting a different button than last time
-				if (_help != _oldHelp) {
-					// If another button was highlighted previously, restore it
-					if (_oldHelp != -1)
-						restoreButton(_oldHelp);
-
-					// If we're highlighting a new button, then draw it pressed
-					if (_help != -1)
-						depressButton(_help);
-
-					_oldHelp = _help;
-				}
-
-				if (_bgFound != _oldBgFound || _oldBgFound == -1) {
-					_infoFlag = true;
-					clearInfo();
-
-					if (_help != -1 && !scene._bgShapes[_bgFound]._description.empty()
-							&& scene._bgShapes[_bgFound]._description[0] != ' ')
-						screen.print(Common::Point(0, INFO_LINE + 1),
-						INFO_FOREGROUND, "%s", scene._bgShapes[_bgFound]._description.c_str());
-
-					_oldBgFound = _bgFound;
-				}
-			} else {
-				// We're not in STD_MODE
-				// If there isn't a window open, then revert back to STD_MODE
-				if (!_windowOpen && events._rightReleased) {
-					// Restore all buttons
-					for (int idx = 0; idx < 12; ++idx)
-						restoreButton(idx);
-
-					_menuMode = STD_MODE;
-					_key = _oldKey = -1;
-					_temp = _oldTemp = _lookHelp = _invLookFlag = 0;
-					events.clearEvents();
-				}
-			}
-		}
-	}
-
-	// Reset the old bgshape number if the mouse button is released, so that
-	// it can e re-highlighted when we come back here
-	if ((events._rightReleased && _helpStyle) || (events._released && !_helpStyle))
-		_oldBgFound = -1;
-
-	// Do routines that should be done before input processing
-	switch (_menuMode) {
-	case LOOK_MODE:
-		if (!_windowOpen) {
-			if (events._released && _bgFound >= 0 && _bgFound < 1000) {
-				if (!scene._bgShapes[_bgFound]._examine.empty())
-					examine();
-			} else {
-				lookScreen(pt);
-			}
-		}
-		break;
-
-	case MOVE_MODE:
-	case OPEN_MODE:
-	case CLOSE_MODE:
-	case PICKUP_MODE:
-		lookScreen(pt);
-		break;
-
-	case TALK_MODE:
-		if (!_windowOpen) {
-			bool personFound;
-
-			if (_bgFound >= 1000) {
-				personFound = false;
-				if (!events._released)
-					lookScreen(pt);
-			} else {
-				personFound = _bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON;
-			}
-
-			if (events._released && personFound)
-				talk.talk(_bgFound);
-			else if (personFound)
-				lookScreen(pt);
-			else if (_bgFound < 1000)
-				clearInfo();
-		}
-		break;
-
-	case USE_MODE:
-	case GIVE_MODE:
-	case INV_MODE:
-		if (inv._invMode == INVMODE_LOOK || inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE) {
-			if (pt.y > CONTROLS_Y)
-				lookInv();
-			else
-				lookScreen(pt);
-		}
-		break;
-
-	default:
-		break;
-	}
-
-	//
-	// Do input processing
-	//
-	if (events._pressed || events._released || events._rightPressed || _keyPress || _pause) {
-		if (((events._released && (_helpStyle || _help == -1)) || (events._rightReleased && !_helpStyle)) &&
-				(pt.y <= CONTROLS_Y) && (_menuMode == STD_MODE)) {
-			// The mouse was clicked in the playing area with no action buttons down.
-			// Check if the mouse was clicked in a script zone. If it was,
-			// then execute the script. Otherwise, walk to the given position
-			if (scene.checkForZones(pt, SCRIPT_ZONE) != 0 ||
-					scene.checkForZones(pt, NOWALK_ZONE) != 0) {
-				// Mouse clicked in script zone
-				events._pressed = events._released = false;
-			} else {
-				people._walkDest = pt;
-				people._allowWalkAbort = false;
-				people.goAllTheWay();
-			}
-
-			if (_oldKey != -1) {
-				restoreButton(_oldTemp);
-				_oldKey = -1;
-			}
-		}
-
-		// Handle action depending on selected mode
-		switch (_menuMode) {
-		case LOOK_MODE:
-			if (_windowOpen)
-				doLookControl();
-			break;
-
-		case MOVE_MODE:
-			doMiscControl(ALLOW_MOVE);
-			break;
-
-		case TALK_MODE:
-			if (_windowOpen)
-				doTalkControl();
-			break;
-
-		case OPEN_MODE:
-			doMiscControl(ALLOW_OPEN);
-			break;
-
-		case CLOSE_MODE:
-			doMiscControl(ALLOW_CLOSE);
-			break;
-
-		case PICKUP_MODE:
-			doPickControl();
-			break;
-
-		case USE_MODE:
-		case GIVE_MODE:
-		case INV_MODE:
-			doInvControl();
-			break;
-
-		case FILES_MODE:
-			doEnvControl();
-			break;
-
-		default:
-			break;
-		}
-
-		// As long as there isn't an open window, do main input processing.
-		// Windows are opened when in TALK, USE, INV, and GIVE modes
-		if ((!_windowOpen && !_menuCounter && pt.y > CONTROLS_Y) ||
-				_keyPress) {
-			if (events._pressed || events._released || _pause || _keyPress)
-				doMainControl();
-		}
-
-		if (pt.y < CONTROLS_Y && events._pressed && _oldTemp != (int)(_menuMode - 1) && _oldKey != -1)
-			restoreButton(_oldTemp);
-	}
-}
-
-void ScalpelUserInterface::depressButton(int num) {
-	Screen &screen = *_vm->_screen;
-	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
-
-	ImageFrame &frame = (*_controls)[num];
-	screen._backBuffer1.transBlitFrom(frame, pt);
-	screen.slamArea(pt.x, pt.y, pt.x + frame._width, pt.y + frame._height);
-}
-
-void ScalpelUserInterface::restoreButton(int num) {
-	Screen &screen = *_vm->_screen;
-	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
-	Graphics::Surface &frame = (*_controls)[num]._frame;
-
-	screen._backBuffer1.blitFrom(screen._backBuffer2, pt,
-		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
-	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);
-
-	if (!_menuCounter) {
-		_infoFlag = true;
-		clearInfo();
-	}
-}
-
-void ScalpelUserInterface::pushButton(int num) {
-	Events &events = *_vm->_events;
-	_oldKey = -1;
-
-	if (!events._released) {
-		if (_oldHelp != -1)
-			restoreButton(_oldHelp);
-		if (_help != -1)
-			restoreButton(_help);
-
-		depressButton(num);
-		events.wait(6);
-	}
-
-	restoreButton(num);
-}
-
-void ScalpelUserInterface::toggleButton(int num) {
-	Screen &screen = *_vm->_screen;
-
-	if (_menuMode != (MenuMode)(num + 1)) {
-		_menuMode = (MenuMode)(num + 1);
-		_oldKey = COMMANDS[num];
-		_oldTemp = num;
-
-		if (_keyboardInput) {
-			if (_oldHelp != -1 && _oldHelp != num)
-				restoreButton(_oldHelp);
-			if (_help != -1 && _help != num)
-				restoreButton(_help);
-
-			_keyboardInput = false;
-
-			ImageFrame &frame = (*_controls)[num];
-			Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
-			screen._backBuffer1.transBlitFrom(frame, pt);
-			screen.slamArea(pt.x, pt.y, pt.x + frame._width, pt.y + frame._height);
-		}
-	} else {
-		_menuMode = STD_MODE;
-		_oldKey = -1;
-		restoreButton(num);
-	}
-}
-
-void ScalpelUserInterface::clearInfo() {
-	if (_infoFlag) {
-		_vm->_screen->vgaBar(Common::Rect(16, INFO_LINE, SHERLOCK_SCREEN_WIDTH - 19,
-			INFO_LINE + 10), INFO_BLACK);
-		_infoFlag = false;
-		_oldLook = -1;
-	}
-}
-
-void ScalpelUserInterface::clearWindow() {
-	if (_windowOpen) {
-		_vm->_screen->vgaBar(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
-			SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
-	}
-}
-
-void ScalpelUserInterface::whileMenuCounter() {
-	if (!(--_menuCounter) || _vm->_events->checkInput()) {
-		_menuCounter = 0;
-		_infoFlag = true;
-		clearInfo();
-	}
-}
-
-void ScalpelUserInterface::examine() {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
-	Talk &talk = *_vm->_talk;
-	Common::Point pt = events.mousePos();
-
-	if (pt.y < (CONTROLS_Y + 9)) {
-		Object &obj = scene._bgShapes[_bgFound];
-
-		if (obj._lookcAnim != 0) {
-			int canimSpeed = ((obj._lookcAnim & 0xe0) >> 5) + 1;
-			scene._cAnimFramePause = obj._lookFrames;
-			_cAnimStr = obj._examine;
-			_cNum = (obj._lookcAnim & 0x1f) - 1;
-
-			scene.startCAnim(_cNum, canimSpeed);
-		} else if (obj._lookPosition.y != 0) {
-			// Need to walk to the object to be examined
-			people.walkToCoords(Common::Point(obj._lookPosition.x, obj._lookPosition.y * 100), obj._lookFacing);
-		}
-
-		if (!talk._talkToAbort) {
-			_cAnimStr = obj._examine;
-			if (obj._lookFlag)
-				_vm->setFlags(obj._lookFlag);
-		}
-	} else {
-		// Looking at an inventory item
-		_cAnimStr = inv[_selector]._examine;
-		if (inv[_selector]._lookFlag)
-			_vm->setFlags(inv[_selector]._lookFlag);
-	}
-
-	if (_invLookFlag) {
-		// Don't close the inventory window when starting an examine display, since its
-		// window will slide up to replace the inventory display
-		_windowOpen = false;
-		_menuMode = LOOK_MODE;
-	}
-
-	if (!talk._talkToAbort) {
-		if (!scene._cAnimFramePause)
-			printObjectDesc(_cAnimStr, true);
-		else
-			// description was already printed in startCAnimation
-			scene._cAnimFramePause = 0;
-	}
-}
-
-void ScalpelUserInterface::lookScreen(const Common::Point &pt) {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Common::Point mousePos = events.mousePos();
-	int temp;
-	Common::String tempStr;
-
-	// Don't display anything for right button command
-	if ((events._rightPressed || events._rightPressed) && !events._pressed)
-		return;
-
-	if (mousePos.y < CONTROLS_Y && (temp = _bgFound) != -1) {
-		if (temp != _oldLook) {
-			_infoFlag = true;
-			clearInfo();
-
-			if (temp < 1000)
-				tempStr = scene._bgShapes[temp]._description;
-			else
-				tempStr = scene._bgShapes[temp - 1000]._description;
-
-			_infoFlag = true;
-			clearInfo();
-
-			// Only print description if there is one
-			if (!tempStr.empty() && tempStr[0] != ' ') {
-				// If inventory is active and an item is selected for a Use or Give action
-				if ((_menuMode == INV_MODE || _menuMode == USE_MODE || _menuMode == GIVE_MODE) &&
-						(inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE)) {
-					int width1 = 0, width2 = 0;
-					int x, width;
-					if (inv._invMode == INVMODE_USE) {
-						// Using an object
-						x = width = screen.stringWidth("Use ");
-
-						if (temp < 1000 && scene._bgShapes[temp]._aType != PERSON)
-							// It's not a person, so make it lowercase
-							tempStr.setChar(tolower(tempStr[0]), 0);
-
-						x += screen.stringWidth(tempStr);
-
-						// If we're using an inventory object, add in the width
-						// of the object name and the " on "
-						if (_selector != -1) {
-							width1 = screen.stringWidth(inv[_selector]._name);
-							x += width1;
-							width2 = screen.stringWidth(" on ");
-							x += width2;
-						}
-
-						// If the line will be too long, keep cutting off characters
-						// until the string will fit
-						while (x > 280) {
-							x -= screen.charWidth(tempStr.lastChar());
-							tempStr.deleteLastChar();
-						}
-
-						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
-						screen.print(Common::Point(xStart, INFO_LINE + 1),
-							INFO_FOREGROUND, "Use ");
-
-						if (_selector != -1) {
-							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
-								TALK_FOREGROUND, "%s", inv[_selector]._name.c_str());
-							screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
-								INFO_FOREGROUND, " on ");
-							screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
-								INFO_FOREGROUND, "%s", tempStr.c_str());
-						} else {
-							screen.print(Common::Point(xStart + width, INFO_LINE + 1),
-								INFO_FOREGROUND, "%s", tempStr.c_str());
-						}
-					} else if (temp >= 0 && temp < 1000 && _selector != -1 &&
-							scene._bgShapes[temp]._aType == PERSON) {
-						// Giving an object to a person
-						width1 = screen.stringWidth(inv[_selector]._name);
-						x = width = screen.stringWidth("Give ");
-						x += width1;
-						width2 = screen.stringWidth(" to ");
-						x += width2;
-						x += screen.stringWidth(tempStr);
-
-						// Ensure string will fit on-screen
-						while (x > 280) {
-							x -= screen.charWidth(tempStr.lastChar());
-							tempStr.deleteLastChar();
-						}
-
-						int xStart = (SHERLOCK_SCREEN_WIDTH - x) / 2;
-						screen.print(Common::Point(xStart, INFO_LINE + 1),
-							INFO_FOREGROUND, "Give ");
-						screen.print(Common::Point(xStart + width, INFO_LINE + 1),
-							TALK_FOREGROUND, "%s", inv[_selector]._name.c_str());
-						screen.print(Common::Point(xStart + width + width1, INFO_LINE + 1),
-							INFO_FOREGROUND, " to ");
-						screen.print(Common::Point(xStart + width + width1 + width2, INFO_LINE + 1),
-							INFO_FOREGROUND, "%s", tempStr.c_str());
-					}
-				} else {
-					screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", tempStr.c_str());
-				}
-
-				_infoFlag = true;
-				_oldLook = temp;
-			}
-		}
-	} else {
-		clearInfo();
-	}
-}
-
-void ScalpelUserInterface::lookInv() {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Screen &screen = *_vm->_screen;
-	Common::Point mousePos = events.mousePos();
-
-	if (mousePos.x > 15 && mousePos.x < 314 && mousePos.y > (CONTROLS_Y1 + 11)
-			&& mousePos.y < (SHERLOCK_SCREEN_HEIGHT - 2)) {
-		int temp = (mousePos.x - 6) / 52 + inv._invIndex;
-		if (temp < inv._holdings) {
-			if (temp < inv._holdings) {
-				clearInfo();
-				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND,
-					"%s", inv[temp]._description.c_str());
-				_infoFlag = true;
-				_oldLook = temp;
-			}
-		} else {
-			clearInfo();
-		}
-	} else {
-		clearInfo();
-	}
-}
-
-void ScalpelUserInterface::doEnvControl() {
-	Events &events = *_vm->_events;
-	SaveManager &saves = *_vm->_saves;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-	Common::Point mousePos = events.mousePos();
-	static const char ENV_COMMANDS[7] = "ELSUDQ";
-
-	byte color;
-
-	_key = _oldKey = -1;
-	_keyboardInput = false;
-	int found = saves.getHighlightedButton();
-
-	if (events._pressed || events._released) {
-		events.clearKeyboard();
-
-		// Check for a filename entry being highlighted
-		if ((events._pressed || events._released) && mousePos.y > (CONTROLS_Y + 10)) {
-			int found1 = 0;
-			for (_selector = 0; (_selector < ONSCREEN_FILES_COUNT) && !found1; ++_selector)
-				if (mousePos.y > (CONTROLS_Y + 11 + _selector * 10) && mousePos.y < (CONTROLS_Y + 21 + _selector * 10))
-					found1 = 1;
-
-			if (_selector + saves._savegameIndex - 1 < MAX_SAVEGAME_SLOTS + (saves._envMode != SAVEMODE_LOAD))
-				_selector = _selector + saves._savegameIndex - 1;
-			else
-				_selector = -1;
-
-			if (!found1)
-				_selector = -1;
-		}
-
-		// Handle selecting buttons, if any
-		saves.highlightButtons(found);
-
-		if (found == 0 || found == 5)
-			saves._envMode = SAVEMODE_NONE;
-	}
-
-	if (_keyPress) {
-		_key = toupper(_keyPress);
-
-		// Escape _key will close the dialog
-		if (_key == Common::KEYCODE_ESCAPE)
-			_key = 'E';
-
-		if (_key == 'E' || _key == 'L' || _key == 'S' || _key == 'U' || _key == 'D' || _key == 'Q') {
-			const char *chP = strchr(ENV_COMMANDS, _key);
-			int btnIndex = !chP ? -1 : chP - ENV_COMMANDS;
-			saves.highlightButtons(btnIndex);
-			_keyboardInput = true;
-
-			if (_key == 'E' || _key == 'Q') {
-				saves._envMode = SAVEMODE_NONE;
-			} else if (_key >= '1' && _key <= '9') {
-				_keyboardInput = true;
-				_selector = _key - '1';
-				if (_selector >= MAX_SAVEGAME_SLOTS + (saves._envMode == SAVEMODE_LOAD ? 0 : 1))
-					_selector = -1;
-
-				if (saves.checkGameOnScreen(_selector))
-					_oldSelector = _selector;
-			} else {
-				_selector = -1;
-			}
-		}
-	}
-
-	if (_selector != _oldSelector)  {
-		if (_oldSelector != -1 && _oldSelector >= saves._savegameIndex && _oldSelector < (saves._savegameIndex + ONSCREEN_FILES_COUNT)) {
-			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
-				INV_FOREGROUND, "%d.", _oldSelector + 1);
-			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_oldSelector - saves._savegameIndex) * 10),
-				INV_FOREGROUND, "%s", saves._savegames[_oldSelector].c_str());
-		}
-
-		if (_selector != -1) {
-			screen.print(Common::Point(6, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10),
-				TALK_FOREGROUND, "%d.", _selector + 1);
-			screen.print(Common::Point(24, CONTROLS_Y + 12 + (_selector - saves._savegameIndex) * 10),
-				TALK_FOREGROUND, "%s", saves._savegames[_selector].c_str());
-		}
-
-		_oldSelector = _selector;
-	}
-
-	if (events._released || _keyboardInput) {
-		if ((found == 0 && events._released) || _key == 'E') {
-			banishWindow();
-			_windowBounds.top = CONTROLS_Y1;
-
-			events._pressed = events._released = _keyboardInput = false;
-			_keyPress = '\0';
-		} else if ((found == 1 && events._released) || _key == 'L') {
-			saves._envMode = SAVEMODE_LOAD;
-			if (_selector != -1) {
-				saves.loadGame(_selector + 1);
-			}
-		} else if ((found == 2 && events._released) || _key == 'S') {
-			saves._envMode = SAVEMODE_SAVE;
-			if (_selector != -1) {
-				if (saves.checkGameOnScreen(_selector))
-					_oldSelector = _selector;
-
-				if (saves.promptForDescription(_selector)) {
-					saves.saveGame(_selector + 1, saves._savegames[_selector]);
-
-					banishWindow(1);
-					_windowBounds.top = CONTROLS_Y1;
-					_key = _oldKey = -1;
-					_keyPress = '\0';
-					_keyboardInput = false;
-				} else {
-					if (!talk._talkToAbort) {
-						screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10,
-							SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
-						screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND,
-							"%d.", _selector + 1);
-						screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10), INV_FOREGROUND,
-							"%s", saves._savegames[_selector].c_str());
-
-						screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
-						_selector = _oldSelector = -1;
-					}
-				}
-			}
-		} else if (((found == 3 && events._released) || _key == 'U') && saves._savegameIndex) {
-			bool moreKeys;
-			do {
-				saves._savegameIndex--;
-				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
-					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
-
-				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT); ++idx) {
-					color = INV_FOREGROUND;
-					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT))
-						color = TALK_FOREGROUND;
-
-					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%d.", idx + 1);
-					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color, "%s", saves._savegames[idx].c_str());
-				}
-
-				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
-
-				color = !saves._savegameIndex ? COMMAND_NULL : COMMAND_FOREGROUND;
-				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
-				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) ? COMMAND_NULL : COMMAND_FOREGROUND;
-				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
-
-				// Check whether there are more pending U keys pressed
-				moreKeys = false;
-				if (events.kbHit()) {
-					Common::KeyState keyState = events.getKey();
-
-					_key = toupper(keyState.keycode);
-					moreKeys = _key == 'U';
-				}
-			} while ((saves._savegameIndex) && moreKeys);
-		} else if (((found == 4 && events._released) || _key == 'D') && saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT)) {
-			bool moreKeys;
-			do {
-				saves._savegameIndex++;
-				screen._backBuffer1.fillRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
-					SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
-
-				for (int idx = saves._savegameIndex; idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT); ++idx) {
-					if (idx == _selector && idx >= saves._savegameIndex && idx < (saves._savegameIndex + ONSCREEN_FILES_COUNT))
-						color = TALK_FOREGROUND;
-					else
-						color = INV_FOREGROUND;
-
-					screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
-						"%d.", idx + 1);
-					screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (idx - saves._savegameIndex) * 10), color,
-						"%s", saves._savegames[idx].c_str());
-				}
-
-				screen.slamRect(Common::Rect(3, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2, SHERLOCK_SCREEN_HEIGHT));
-
-				color = (!saves._savegameIndex) ? COMMAND_NULL : COMMAND_FOREGROUND;
-				screen.buttonPrint(Common::Point(ENV_POINTS[3][2], CONTROLS_Y), color, true, "Up");
-
-				color = (saves._savegameIndex == MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) ? COMMAND_NULL : COMMAND_FOREGROUND;
-				screen.buttonPrint(Common::Point(ENV_POINTS[4][2], CONTROLS_Y), color, true, "Down");
-
-				// Check whether there are more pending D keys pressed
-				moreKeys = false;
-				if (events.kbHit()) {
-					Common::KeyState keyState;
-					_key = toupper(keyState.keycode);
-
-					moreKeys = _key == 'D';
-				}
-			} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) && moreKeys);
-		} else if ((found == 5 && events._released) || _key == 'Q') {
-			clearWindow();
-			screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
-			screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
-
-			screen.makeButton(Common::Rect(112, CONTROLS_Y, 160, CONTROLS_Y + 10), 136 - screen.stringWidth("Yes") / 2, "Yes");
-			screen.makeButton(Common::Rect(161, CONTROLS_Y, 209, CONTROLS_Y + 10), 184 - screen.stringWidth("No") / 2, "No");
-			screen.slamArea(112, CONTROLS_Y, 97, 10);
-
-			do {
-				scene.doBgAnim();
-
-				if (talk._talkToAbort)
-					return;
-
-				events.pollEventsAndWait();
-				events.setButtonState();
-				mousePos = events.mousePos();
-
-				if (events.kbHit()) {
-					Common::KeyState keyState = events.getKey();
-					_key = toupper(keyState.keycode);
-
-					if (_key == 'X' && (keyState.flags & Common::KBD_ALT) != 0) {
-						_vm->quitGame();
-						events.pollEvents();
-						return;
-					}
-
-					if (_key == Common::KEYCODE_ESCAPE)
-						_key = 'N';
-
-					if (_key == Common::KEYCODE_RETURN || _key == ' ') {
-						events._pressed = false;
-						events._released = true;
-						events._oldButtons = 0;
-						_keyPress = '\0';
-					}
-				}
-
-				if (events._pressed || events._released) {
-					if (mousePos.x > 112 && mousePos.x < 159 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9))
-						color = COMMAND_HIGHLIGHTED;
-					else
-						color = COMMAND_FOREGROUND;
-					screen.buttonPrint(Common::Point(136, CONTROLS_Y), color, true, "Yes");
-
-					if (mousePos.x > 161 && mousePos.x < 208 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9))
-						color = COMMAND_HIGHLIGHTED;
-					else
-						color = COMMAND_FOREGROUND;
-					screen.buttonPrint(Common::Point(184, CONTROLS_Y), color, true, "No");
-				}
-
-				if (mousePos.x > 112 && mousePos.x < 159 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9) && events._released)
-					_key = 'Y';
-
-				if (mousePos.x > 161 && mousePos.x < 208 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 9) && events._released)
-					_key = 'N';
-			} while (!_vm->shouldQuit() && _key != 'Y' && _key != 'N');
-
-			if (_key == 'Y') {
-				_vm->quitGame();
-				events.pollEvents();
-				return;
-			} else {
-				screen.buttonPrint(Common::Point(184, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "No");
-				banishWindow(1);
-				_windowBounds.top = CONTROLS_Y1;
-				_key = -1;
-			}
-		} else {
-			if (_selector != -1) {
-				// Are we already in Load mode?
-				if (saves._envMode == SAVEMODE_LOAD) {
-					saves.loadGame(_selector + 1);
-				} else if (saves._envMode == SAVEMODE_SAVE || saves.isSlotEmpty(_selector)) {
-					// We're already in save mode, or pointing to an empty save slot
-					if (saves.checkGameOnScreen(_selector))
-						_oldSelector = _selector;
-
-					if (saves.promptForDescription(_selector)) {
-						saves.saveGame(_selector + 1, saves._savegames[_selector]);
-						banishWindow();
-						_windowBounds.top = CONTROLS_Y1;
-						_key = _oldKey = -1;
-						_keyPress = '\0';
-						_keyboardInput = false;
-					} else {
-						if (!talk._talkToAbort) {
-							screen._backBuffer1.fillRect(Common::Rect(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10,
-								317, CONTROLS_Y + 20 + (_selector - saves._savegameIndex) * 10), INV_BACKGROUND);
-							screen.gPrint(Common::Point(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10),
-								INV_FOREGROUND, "%d.", _selector + 1);
-							screen.gPrint(Common::Point(24, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10),
-								INV_FOREGROUND, "%s", saves._savegames[_selector].c_str());
-							screen.slamArea(6, CONTROLS_Y + 11 + (_selector - saves._savegameIndex) * 10, 311, 10);
-							_selector = _oldSelector = -1;
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-void ScalpelUserInterface::doInvControl() {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-	int colors[8];
-	Common::Point mousePos = events.mousePos();
-
-	_key = _oldKey = -1;
-	_keyboardInput = false;
-
-	// Check whether any inventory slot is highlighted
-	int found = -1;
-	Common::fill(&colors[0], &colors[8], (int)COMMAND_FOREGROUND);
-	for (int idx = 0; idx < 8; ++idx) {
-		Common::Rect r(INVENTORY_POINTS[idx][0], CONTROLS_Y1,
-			INVENTORY_POINTS[idx][1], CONTROLS_Y1 + 10);
-		if (r.contains(mousePos)) {
-			found = idx;
-			break;
-		}
-	}
-
-	if (events._pressed || events._released) {
-		events.clearKeyboard();
-
-		if (found != -1)
-			// If a slot highlighted, set its color
-			colors[found] = COMMAND_HIGHLIGHTED;
-		screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), colors[0], true, "Exit");
-
-		if (found >= 0 && found <= 3) {
-			screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), colors[1], true, "Look");
-			screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), colors[2], true, "Use");
-			screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), colors[3], true, "Give");
-			inv._invMode = (InvMode)found;
-			_selector = -1;
-		}
-
-		if (inv._invIndex) {
-			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), colors[4], "^^");
-			screen.print(Common::Point(INVENTORY_POINTS[5][2], CONTROLS_Y1 + 1), colors[5], "^");
-		}
-
-		if ((inv._holdings - inv._invIndex) > 6) {
-			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), colors[6], "_");
-			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), colors[7], "__");
-		}
-
-		bool flag = false;
-		if (inv._invMode == INVMODE_LOOK || inv._invMode == INVMODE_USE || inv._invMode == INVMODE_GIVE) {
-			Common::Rect r(15, CONTROLS_Y1 + 11, 314, SHERLOCK_SCREEN_HEIGHT - 2);
-			if (r.contains(mousePos)) {
-				_selector = (mousePos.x - 6) / 52 + inv._invIndex;
-				if (_selector < inv._holdings)
-					flag = true;
-			}
-		}
-
-		if (!flag && mousePos.y >(CONTROLS_Y1 + 11))
-			_selector = -1;
-	}
-
-	if (_keyPress) {
-		_key = toupper(_keyPress);
-
-		if (_key == Common::KEYCODE_ESCAPE)
-			// Escape will also 'E'xit out of inventory display
-			_key = 'E';
-
-		if (_key == 'E' || _key == 'L' || _key == 'U' || _key == 'G'
-				|| _key == '-' || _key == '+') {
-			InvMode temp = inv._invMode;
-
-			const char *chP = strchr(INVENTORY_COMMANDS, _key);
-			inv._invMode = !chP ? INVMODE_INVALID : (InvMode)(chP - INVENTORY_COMMANDS);
-			inv.invCommands(true);
-
-			inv._invMode = temp;
-			_keyboardInput = true;
-			if (_key == 'E')
-				inv._invMode = INVMODE_EXIT;
-			_selector = -1;
-		} else {
-			_selector = -1;
-		}
-	}
-
-	if (_selector != _oldSelector) {
-		if (_oldSelector != -1) {
-			// Un-highlight
-			if (_oldSelector >= inv._invIndex && _oldSelector < (inv._invIndex + 6))
-				inv.highlight(_oldSelector, BUTTON_MIDDLE);
-		}
-
-		if (_selector != -1)
-			inv.highlight(_selector, 235);
-
-		_oldSelector = _selector;
-	}
-
-	if (events._released || _keyboardInput) {
-		if ((found == 0 && events._released) || _key == 'E') {
-			inv.freeInv();
-			_infoFlag = true;
-			clearInfo();
-			banishWindow(false);
-			_key = -1;
-			events.clearEvents();
-			events.setCursor(ARROW);
-		} else if ((found == 1 && events._released) || (_key == 'L')) {
-			inv._invMode = INVMODE_LOOK;
-		} else if ((found == 2 && events._released) || (_key == 'U')) {
-			inv._invMode = INVMODE_USE;
-		} else if ((found == 3 && events._released) || (_key == 'G')) {
-			inv._invMode = INVMODE_GIVE;
-		} else if (((found == 4 && events._released) || _key == ',') && inv._invIndex) {
-			if (inv._invIndex >= 6)
-				inv._invIndex -= 6;
-			else
-				inv._invIndex = 0;
-
-			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1),
-				COMMAND_HIGHLIGHTED, "^^");
-			inv.freeGraphics();
-			inv.loadGraphics();
-			inv.putInv(SLAM_DISPLAY);
-			inv.invCommands(true);
-		} else if (((found == 5 && events._released) || _key == '-') && inv._invIndex > 0) {
-			--inv._invIndex;
-			screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "^");
-			inv.freeGraphics();
-			inv.loadGraphics();
-			inv.putInv(SLAM_DISPLAY);
-			inv.invCommands(true);
-		} else if (((found == 6 && events._released) || _key == '+') &&  (inv._holdings - inv._invIndex) > 6) {
-			++inv._invIndex;
-			screen.print(Common::Point(INVENTORY_POINTS[6][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
-			inv.freeGraphics();
-			inv.loadGraphics();
-			inv.putInv(SLAM_DISPLAY);
-			inv.invCommands(true);
-		} else if (((found == 7 && events._released) || _key == '.') && (inv._holdings - inv._invIndex) > 6) {
-			inv._invIndex += 6;
-			if ((inv._holdings - 6) < inv._invIndex)
-				inv._invIndex = inv._holdings - 6;
-
-			screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), COMMAND_HIGHLIGHTED, "_");
-			inv.freeGraphics();
-			inv.loadGraphics();
-			inv.putInv(SLAM_DISPLAY);
-			inv.invCommands(true);
-		} else {
-			// If something is being given, make sure it's being given to a person
-			if (inv._invMode == INVMODE_GIVE) {
-				if (_bgFound != -1 && scene._bgShapes[_bgFound]._aType == PERSON)
-					_find = _bgFound;
-				else
-					_find = -1;
-			} else {
-				_find = _bgFound;
-			}
-
-			if ((mousePos.y < CONTROLS_Y1) && (inv._invMode == INVMODE_LOOK) && (_find >= 0) && (_find < 1000)) {
-				if (!scene._bgShapes[_find]._examine.empty() &&
-						scene._bgShapes[_find]._examine[0] >= ' ')
-					inv.refreshInv();
-			} else if (_selector != -1 || _find >= 0) {
-				// Selector is the inventory object that was clicked on, or selected.
-				// If it's -1, then no inventory item is highlighted yet. Otherwise,
-				// an object in the scene has been clicked.
-
-				if (_selector != -1 && inv._invMode == INVMODE_LOOK
-						&& mousePos.y >(CONTROLS_Y1 + 11))
-					inv.refreshInv();
-
-				if (talk._talkToAbort)
-					return;
-
-				// Now check for the Use and Give actions. If inv_mode is INVMODE_GIVE,
-				// that means GIVE is in effect, _selector is the object being
-				// given, and _find is the target.
-				// The same applies to USE, except if _selector is -1, then USE
-				// is being tried on an object in the scene without an inventory
-				// object being highlighted first.
-
-				if ((inv._invMode == INVMODE_USE || (_selector != -1 && inv._invMode == INVMODE_GIVE)) && _find >= 0) {
-					events._pressed = events._released = false;
-					_infoFlag = true;
-					clearInfo();
-
-					int tempSel = _selector;	// Save the selector
-					_selector = -1;
-
-					inv.putInv(SLAM_DISPLAY);
-					_selector = tempSel;		// Restore it
-					InvMode tempMode = inv._invMode;
-					inv._invMode = INVMODE_USE55;
-					inv.invCommands(true);
-
-					_infoFlag = true;
-					clearInfo();
-					banishWindow(false);
-					_key = -1;
-
-					inv.freeInv();
-
-					bool giveFl = (tempMode >= INVMODE_GIVE);
-					if (_selector >= 0)
-						// Use/Give inv object with scene object
-						checkUseAction(&scene._bgShapes[_find]._use[0], inv[_selector]._name, MUSE, _find, giveFl);
-					else
-						// Now inv object has been highlighted
-						checkUseAction(&scene._bgShapes[_find]._use[0], "*SELF*", MUSE, _find, giveFl);
-
-					_selector = _oldSelector = -1;
-				}
-			}
-		}
-	}
-}
-
-void ScalpelUserInterface::doLookControl() {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Screen &screen = *_vm->_screen;
-
-	_key = _oldKey = -1;
-	_keyboardInput = (_keyPress != '\0');
-
-	if (events._released || events._rightReleased || _keyboardInput) {
-		// Is an inventory object being looked at?
-		if (!_invLookFlag) {
-			// Is there any remaining text to display?
-			if (!_descStr.empty()) {
-				printObjectDesc(_descStr, false);
-			} else if (!_lookHelp) {
-				// Need to close the window and depress the Look button
-				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
-				screen._backBuffer2.blitFrom((*_controls)[0], pt);
-				banishWindow(true);
-
-				_windowBounds.top = CONTROLS_Y1;
-				_key = _oldKey = COMMANDS[LOOK_MODE - 1];
-				_temp = _oldTemp = 0;
-				_menuMode = LOOK_MODE;
-				events.clearEvents();
-
-				// Restore UI
-				drawInterface();
-			} else {
-				events.setCursor(ARROW);
-				banishWindow(true);
-				_windowBounds.top = CONTROLS_Y1;
-				_key = _oldKey = -1;
-				_temp = _oldTemp = 0;
-				_menuMode = STD_MODE;
-				events.clearEvents();
-			}
-		} else {
-			// Looking at an inventory object
-			// Backup the user interface
-			Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1);
-			tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
-				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-
-			inv.drawInventory(INVENTORY_DONT_DISPLAY);
-			banishWindow(true);
-
-			// Restore the ui
-			screen._backBuffer2.blitFrom(tempSurface, Common::Point(0, CONTROLS_Y1));
-
-			_windowBounds.top = CONTROLS_Y1;
-			_key = _oldKey = COMMANDS[LOOK_MODE - 1];
-			_temp = _oldTemp = 0;
-			events.clearEvents();
-			_invLookFlag = false;
-			_menuMode = INV_MODE;
-			_windowOpen = true;
-		}
-	}
-}
-
-void ScalpelUserInterface::doMainControl() {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	SaveManager &saves = *_vm->_saves;
-	Common::Point pt = events.mousePos();
-
-	if ((events._pressed || events._released) && pt.y > CONTROLS_Y) {
-		events.clearKeyboard();
-		_key = -1;
-
-		// Check whether the mouse is in any of the command areas
-		for (_temp = 0; (_temp < 12) && (_key == -1); ++_temp) {
-			Common::Rect r(MENU_POINTS[_temp][0], MENU_POINTS[_temp][1],
-				MENU_POINTS[_temp][2], MENU_POINTS[_temp][3]);
-			if (r.contains(pt))
-				_key = COMMANDS[_temp];
-		}
-		--_temp;
-	} else if (_keyPress) {
-		// Keyboard control
-		_keyboardInput = true;
-
-		if (_keyPress >= 'A' && _keyPress <= 'Z') {
-			const char *c = strchr(COMMANDS, _keyPress);
-			_temp = !c ? 12 : c - COMMANDS;
-		} else {
-			_temp = 12;
-		}
-
-		if (_temp == 12)
-			_key = -1;
-
-		if (events._rightPressed) {
-			_temp = 12;
-			_key = -1;
-		}
-	} else if (!events._released) {
-		_key = -1;
-	}
-
-	// Check if the button being pointed to has changed
-	if (_oldKey != _key && !_windowOpen) {
-		// Clear the info line
-		_infoFlag = true;
-		clearInfo();
-
-		// If there was an old button selected, restore it
-		if (_oldKey != -1) {
-			_menuMode = STD_MODE;
-			restoreButton(_oldTemp);
-		}
-
-		// If a new button is being pointed to, highlight it
-		if (_key != -1 && _temp < 12 && !_keyboardInput)
-			depressButton(_temp);
-
-		// Save the new button selection
-		_oldKey = _key;
-		_oldTemp = _temp;
-	}
-
-	if (!events._pressed && !_windowOpen) {
-		switch (_key) {
-		case 'L':
-			toggleButton(0);
-			break;
-		case 'M':
-			toggleButton(1);
-			break;
-		case 'T':
-			toggleButton(2);
-			break;
-		case 'P':
-			toggleButton(3);
-			break;
-		case 'O':
-			toggleButton(4);
-			break;
-		case 'C':
-			toggleButton(5);
-			break;
-		case 'I':
-			pushButton(6);
-			_selector = _oldSelector = -1;
-			_menuMode = INV_MODE;
-			inv.drawInventory(PLAIN_INVENTORY);
-			break;
-		case 'U':
-			pushButton(7);
-			_selector = _oldSelector = -1;
-			_menuMode = USE_MODE;
-			inv.drawInventory(USE_INVENTORY_MODE);
-			break;
-		case 'G':
-			pushButton(8);
-			_selector = _oldSelector = -1;
-			_menuMode = GIVE_MODE;
-			inv.drawInventory(GIVE_INVENTORY_MODE);
-			break;
-		case 'J':
-			pushButton(9);
-			_menuMode = JOURNAL_MODE;
-			journalControl();
-			break;
-		case 'F':
-			pushButton(10);
-
-			// Create a thumbnail of the current screen before the files dialog is shown, in case
-			// the user saves the game
-			saves.createThumbnail();
-
-			_selector = _oldSelector = -1;
-
-			if (_vm->_showOriginalSavesDialog) {
-				// Show the original dialog
-				_menuMode = FILES_MODE;
-				saves.drawInterface();
-				_windowOpen = true;
-			} else {
-				// Show the ScummVM GMM instead
-				_vm->_canLoadSave = true;
-				_vm->openMainMenuDialog();
-				_vm->_canLoadSave = false;
-			}
-			break;
-		case 'S':
-			pushButton(11);
-			_menuMode = SETUP_MODE;
-			Settings::show(_vm);
-			break;
-		default:
-			break;
-		}
-
-		_help = _oldHelp = _oldBgFound = -1;
-	}
-}
-
-void ScalpelUserInterface::doMiscControl(int allowed) {
-	Events &events = *_vm->_events;
-	Scene &scene = *_vm->_scene;
-	Talk &talk = *_vm->_talk;
-
-	if (events._released) {
-		_temp = _bgFound;
-		if (_bgFound != -1) {
-			// Only allow pointing to objects, not people
-			if (_bgFound < 1000) {
-				events.clearEvents();
-				Object &obj = scene._bgShapes[_bgFound];
-
-				switch (allowed) {
-				case ALLOW_OPEN:
-					checkAction(obj._aOpen, MOPEN, _temp);
-					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
-						_menuMode = STD_MODE;
-						restoreButton(OPEN_MODE - 1);
-						_key = _oldKey = -1;
-					}
-					break;
-
-				case ALLOW_CLOSE:
-					checkAction(obj._aClose, MCLOSE, _temp);
-					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
-						_menuMode = STD_MODE;
-						restoreButton(CLOSE_MODE - 1);
-						_key = _oldKey = -1;
-					}
-					break;
-
-				case ALLOW_MOVE:
-					checkAction(obj._aMove, MMOVE, _temp);
-					if (_menuMode != TALK_MODE && !talk._talkToAbort) {
-						_menuMode = STD_MODE;
-						restoreButton(MOVE_MODE - 1);
-						_key = _oldKey = -1;
-					}
-					break;
-
-				default:
-					break;
-				}
-			}
-		}
-	}
-}
-
-void ScalpelUserInterface::doPickControl() {
-	Events &events = *_vm->_events;
-	Scene &scene = *_vm->_scene;
-	Talk &talk = *_vm->_talk;
-
-	if (events._released) {
-		if ((_temp = _bgFound) != -1) {
-			events.clearEvents();
-
-			// Don't allow characters to be picked up
-			if (_bgFound < 1000) {
-				scene._bgShapes[_bgFound].pickUpObject(MPICK);
-
-				if (!talk._talkToAbort && _menuMode != TALK_MODE) {
-					_key = _oldKey = -1;
-					_menuMode = STD_MODE;
-					restoreButton(PICKUP_MODE - 1);
-				}
-			}
-		}
-	}
-}
-
-void ScalpelUserInterface::doTalkControl() {
-	Events &events = *_vm->_events;
-	Journal &journal = *_vm->_journal;
-	People &people = *_vm->_people;
-	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
-	Talk &talk = *_vm->_talk;
-	Common::Point mousePos = events.mousePos();
-
-	_key = _oldKey = -1;
-	_keyboardInput = false;
-
-	if (events._pressed || events._released) {
-		events.clearKeyboard();
-
-		// Handle button printing
-		if (mousePos.x > 99 && mousePos.x < 138 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && !_endKeyActive)
-			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Exit");
-		else if (_endKeyActive)
-			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
-
-		if (mousePos.x > 140 && mousePos.x < 170 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkUp)
-			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Up");
-		else if (talk._moreTalkUp)
-			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_FOREGROUND, true, "Up");
-
-		if (mousePos.x > 181&& mousePos.x < 220 && mousePos.y > CONTROLS_Y && mousePos.y < (CONTROLS_Y + 10) && talk._moreTalkDown)
-			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, "Down");
-		else if (talk._moreTalkDown)
-			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_FOREGROUND, true, "Down");
-
-		bool found = false;
-		for (_selector = talk._talkIndex; _selector < (int)talk._statements.size() && !found; ++_selector) {
-			if (mousePos.y > talk._statements[_selector]._talkPos.top &&
-					mousePos.y < talk._statements[_selector]._talkPos.bottom)
-				found = true;
-		}
-		--_selector;
-		if (!found)
-			_selector = -1;
-	}
-
-	if (_keyPress) {
-		_key = toupper(_keyPress);
-		if (_key == Common::KEYCODE_ESCAPE)
-			_key = 'E';
-
-		// Check for number press indicating reply line
-		if (_key >= '1' && _key <= ('1' + (int)talk._statements.size() - 1)) {
-			for (uint idx = 0; idx < talk._statements.size(); ++idx) {
-				if (talk._statements[idx]._talkMap == (_key - '1')) {
-					// Found the given statement
-					_selector = idx;
-					_key = -1;
-					_keyboardInput = true;
-					break;
-				}
-			}
-		} else if (_key == 'E' || _key == 'U' || _key == 'D') {
-			_keyboardInput = true;
-		} else {
-			_selector = -1;
-		}
-	}
-
-	if (_selector != _oldSelector) {
-		// Remove highlighting from previous line, if any
-		if (_oldSelector != -1) {
-			if (!((talk._talkHistory[talk._converseNum][_oldSelector] >> (_oldSelector & 7)) & 1))
-				talk.talkLine(_oldSelector, talk._statements[_oldSelector]._talkMap, INV_FOREGROUND,
-					talk._statements[_oldSelector]._talkPos.top, true);
-			else
-				talk.talkLine(_oldSelector, talk._statements[_oldSelector]._talkMap, TALK_NULL,
-					talk._statements[_oldSelector]._talkPos.top, true);
-		}
-
-		// Add highlighting to new line, if any
-		if (_selector != -1)
-			talk.talkLine(_selector, talk._statements[_selector]._talkMap, TALK_FOREGROUND,
-				talk._statements[_selector]._talkPos.top, true);
-
-		_oldSelector = _selector;
-	}
-
-	if (events._released || _keyboardInput) {
-		if (((Common::Rect(99, CONTROLS_Y, 138, CONTROLS_Y + 10).contains(mousePos) && events._released)
-				|| _key == 'E') && _endKeyActive) {
-			talk.freeTalkVars();
-			talk.pullSequence();
-			banishWindow();
-			_windowBounds.top = CONTROLS_Y1;
-		} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released)
-				|| _key == 'U') && talk._moreTalkUp) {
-			while (talk._statements[--talk._talkIndex]._talkMap == -1)
-				;
-			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
-				SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
-			talk.displayTalk(false);
-
-			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
-		} else if (((Common::Rect(181, CONTROLS_Y, 220, CONTROLS_Y + 10).contains(mousePos) && events._released)
-				|| _key == 'D') && talk._moreTalkDown) {
-			do {
-				++talk._talkIndex;
-			} while (talk._talkIndex < (int)talk._statements.size() && talk._statements[talk._talkIndex]._talkMap == -1);
-
-			screen._backBuffer1.fillRect(Common::Rect(5, CONTROLS_Y + 11, SHERLOCK_SCREEN_WIDTH - 2,
-				SHERLOCK_SCREEN_HEIGHT - 1), INV_BACKGROUND);
-			talk.displayTalk(false);
-
-			screen.slamRect(Common::Rect(5, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH - 5, SHERLOCK_SCREEN_HEIGHT - 2));
-		} else if (_selector != -1) {
-			screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, true, "Exit");
-			screen.buttonPrint(Common::Point(159, CONTROLS_Y), COMMAND_NULL, true, "Up");
-			screen.buttonPrint(Common::Point(200, CONTROLS_Y), COMMAND_NULL, true, "Down");
-
-			// If the reply is new, add it to the journal
-			if (!talk._talkHistory[talk._converseNum][_selector]) {
-				journal.record(talk._converseNum, _selector);
-
-				// Add any Holmes point to Holmes' total, if any
-				if (talk._statements[_selector]._quotient)
-					people._holmesQuotient += talk._statements[_selector]._quotient;
-			}
-
-			// Flag the response as having been used
-			talk._talkHistory[talk._converseNum][_selector] = true;
-
-			clearWindow();
-			screen.print(Common::Point(16, CONTROLS_Y + 12), TALK_FOREGROUND, "Sherlock Holmes");
-			talk.talkLine(_selector + 128, talk._statements[_selector]._talkMap, COMMAND_FOREGROUND, CONTROLS_Y + 21, true);
-
-			switch (talk._statements[_selector]._portraitSide & 3) {
-			case 0:
-			case 1:
-				people._portraitSide = 20;
-				break;
-			case 2:
-				people._portraitSide = 220;
-				break;
-			case 3:
-				people._portraitSide = 120;
-				break;
-			}
-
-			// Check for flipping Holmes
-			if (talk._statements[_selector]._portraitSide & REVERSE_DIRECTION)
-				people._holmesFlip = true;
-
-			talk._speaker = 0;
-			people.setTalking(0);
-
-			if (!talk._statements[_selector]._voiceFile.empty() && sound._voices) {
-				sound.playSound(talk._statements[_selector]._voiceFile, WAIT_RETURN_IMMEDIATELY);
-
-				// Set voices as an indicator for waiting
-				sound._voices = 2;
-				sound._speechOn = *sound._soundIsOn;
-			} else {
-				sound._speechOn = false;
-			}
-
-			talk.waitForMore(talk._statements[_selector]._statement.size());
-			if (talk._talkToAbort)
-				return;
-
-			people.clearTalking();
-			if (talk._talkToAbort)
-				return;
-
-			while (!_vm->shouldQuit()) {
-				talk._scriptSelect = _selector;
-				talk._speaker = talk._talkTo;
-				talk.doScript(talk._statements[_selector]._reply);
-
-				if (!talk._talkToAbort) {
-					if (!talk._talkStealth)
-						clearWindow();
-
-					if (!talk._statements[_selector]._modified.empty()) {
-						for (uint idx = 0; idx < talk._statements[_selector]._modified.size(); ++idx) {
-							_vm->setFlags(talk._statements[_selector]._modified[idx]);
-						}
-
-						talk.setTalkMap();
-					}
-
-					// Check for another linked talk file
-					Common::String linkFilename = talk._statements[_selector]._linkFile;
-					if (!linkFilename.empty() && !talk._scriptMoreFlag) {
-						talk.freeTalkVars();
-						talk.loadTalkFile(linkFilename);
-
-						// Find the first new statement
-						int select = _selector = _oldSelector = -1;
-						for (uint idx = 0; idx < talk._statements.size() && select == -1; ++idx) {
-							if (!talk._statements[idx]._talkMap)
-								select = talk._talkIndex = idx;
-						}
-
-						// See if the new statement is a stealth reply
-						talk._talkStealth = talk._statements[select]._statement.hasPrefix("^") ? 2 : 0;
-
-						// Is the new talk file a standard file, reply first file, or a stealth file
-						if (!talk._statements[select]._statement.hasPrefix("*") &&
-								!talk._statements[select]._statement.hasPrefix("^")) {
-							// Not a reply first file, so display the new selections
-							if (_endKeyActive)
-								screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_FOREGROUND, true, "Exit");
-							else
-								screen.buttonPrint(Common::Point(119, CONTROLS_Y), COMMAND_NULL, true, "Exit");
-
-							talk.displayTalk(true);
-							events.setCursor(ARROW);
-							break;
-						} else {
-							_selector = select;
-
-							if (!talk._talkHistory[talk._converseNum][_selector])
-								journal.record(talk._converseNum, _selector);
-
-							talk._talkHistory[talk._converseNum][_selector] = true;
-						}
-					} else {
-						talk.freeTalkVars();
-						talk.pullSequence();
-						banishWindow();
-						_windowBounds.top = CONTROLS_Y1;
-						break;
-					}
-				} else {
-					break;
-				}
-			}
-
-			events._pressed = events._released = false;
-			events._oldButtons = 0;
-			talk._talkStealth = 0;
-
-			// If a script was pushed onto the script stack, restore it
-			if (!talk._scriptStack.empty()) {
-				ScriptStackEntry stackEntry = talk._scriptStack.pop();
-				talk._scriptName = stackEntry._name;
-				talk._scriptSaveIndex = stackEntry._currentIndex;
-				talk._scriptSelect = stackEntry._select;
-			}
-		}
-	}
-}
-
-void ScalpelUserInterface::journalControl() {
-	Events &events = *_vm->_events;
-	Journal &journal = *_vm->_journal;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	bool doneFlag = false;
-
-	// Draw the journal screen
-	journal.drawInterface();
-
-	// Handle journal events
-	do {
-		_key = -1;
-		events.setButtonState();
-
-		// Handle keypresses
-		if (events.kbHit()) {
-			Common::KeyState keyState = events.getKey();
-			if (keyState.keycode == Common::KEYCODE_x && (keyState.flags & Common::KBD_ALT)) {
-				_vm->quitGame();
-				return;
-			} else if (keyState.keycode == Common::KEYCODE_e || keyState.keycode == Common::KEYCODE_ESCAPE) {
-				doneFlag = true;
-			} else {
-				_key = toupper(keyState.keycode);
-			}
-		}
-
-		if (!doneFlag)
-			doneFlag = journal.handleEvents(_key);
-	} while (!_vm->shouldQuit() && !doneFlag);
-
-	// Finish up
-	_infoFlag = _keyboardInput = false;
-	_keyPress = '\0';
-	_windowOpen = false;
-	_windowBounds.top = CONTROLS_Y1;
-	_key = -1;
-	_menuMode = STD_MODE;
-
-	// Reset the palette
-	screen.setPalette(screen._cMap);
-
-	screen._backBuffer1.blitFrom(screen._backBuffer2);
-	scene.updateBackground();
-	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-}
-
-void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-
-	if (str.hasPrefix("_")) {
-		_lookScriptFlag = true;
-		events.setCursor(MAGNIFY);
-		int savedSelector = _selector;
-		talk.talkTo(str.c_str() + 1);
-		_lookScriptFlag = false;
-
-		if (talk._talkToAbort) {
-			events.setCursor(ARROW);
-			return;
-		}
-
-		// Check if looking at an inventory object
-		if (!_invLookFlag) {
-			// See if this look was called by a right button click or not
-			if (!_lookHelp) {
-				// If it wasn't a right button click, then we need depress
-				// the look button before we close the window. So save a copy of the
-				// menu area, and draw the controls onto it
-				Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h);
-				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
-
-				tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0),
-					Common::Rect(pt.x, pt.y, pt.x + tempSurface.w(), pt.y + tempSurface.h()));
-				screen._backBuffer2.transBlitFrom((*_controls)[0], pt);
-
-				banishWindow(1);
-				events.setCursor(MAGNIFY);
-				_windowBounds.top = CONTROLS_Y1;
-				_key = _oldKey = COMMANDS[LOOK_MODE - 1];
-				_temp = _oldTemp = 0;
-				_menuMode = LOOK_MODE;
-				events.clearEvents();
-
-				screen._backBuffer2.blitFrom(tempSurface, pt);
-			} else {
-				events.setCursor(ARROW);
-				banishWindow(true);
-				_windowBounds.top = CONTROLS_Y1;
-				_key = _oldKey = -1;
-				_temp = _oldTemp = 0;
-				_menuMode = STD_MODE;
-				_lookHelp = 0;
-				events.clearEvents();
-			}
-		} else {
-			// Looking at an inventory object
-			_selector = _oldSelector = savedSelector;
-
-			// Reload the inventory graphics and draw the inventory
-			inv.loadInv();
-			inv.putInv(SLAM_SECONDARY_BUFFER);
-			inv.freeInv();
-			banishWindow(1);
-
-			_windowBounds.top = CONTROLS_Y1;
-			_key = _oldKey = COMMANDS[INV_MODE - 1];
-			_temp = _oldTemp = 0;
-			events.clearEvents();
-
-			_invLookFlag = 0;
-			_menuMode = INV_MODE;
-			_windowOpen = true;
-		}
-
-		return;
-	}
-
-	Surface &bb = *screen._backBuffer;
-	if (firstTime) {
-		// Only draw the border on the first call
-		_infoFlag = true;
-		clearInfo();
-
-		bb.fillRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
-			CONTROLS_Y1 + 10), BORDER_COLOR);
-		bb.fillRect(Common::Rect(0, CONTROLS_Y + 10, 1, SHERLOCK_SCREEN_HEIGHT - 1),
-			BORDER_COLOR);
-		bb.fillRect(Common::Rect(SHERLOCK_SCREEN_WIDTH - 2, CONTROLS_Y + 10,
-			SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-		bb.fillRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 1, SHERLOCK_SCREEN_WIDTH,
-			SHERLOCK_SCREEN_HEIGHT), BORDER_COLOR);
-	}
-
-	// Clear background
-	bb.fillRect(Common::Rect(2, CONTROLS_Y + 10, SHERLOCK_SCREEN_WIDTH - 2,
-		SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND);
-
-	_windowBounds.top = CONTROLS_Y;
-	events.clearEvents();
-
-	// Loop through displaying up to five lines
-	bool endOfStr = false;
-	const char *msgP = str.c_str();
-	for (int lineNum = 0; lineNum < ONSCREEN_FILES_COUNT && !endOfStr; ++lineNum) {
-		int width = 0;
-		const char *lineStartP = msgP;
-
-		// Determine how much can be displayed on the line
-		do {
-			width += screen.charWidth(*msgP++);
-		} while (width < 300 && *msgP);
-
-		if (*msgP)
-			--msgP;
-		else
-			endOfStr = true;
-
-		// If the line needs to be wrapped, scan backwards to find
-		// the end of the previous word as a splitting point
-		if (width >= 300) {
-			while (*msgP != ' ')
-				--msgP;
-			endOfStr = false;
-		}
-
-		// Print out the line
-		Common::String line(lineStartP, msgP);
-		screen.gPrint(Common::Point(16, CONTROLS_Y + 12 + lineNum * 9),
-			INV_FOREGROUND, "%s", line.c_str());
-
-		if (!endOfStr)
-			// Start next line at start of the nxet word after space
-			++msgP;
-	}
-
-	// Handle display depending on whether all the message was shown
-	if (!endOfStr) {
-		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
-			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2,
-			PRESS_KEY_FOR_MORE);
-		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
-			screen.stringWidth(PRESS_KEY_FOR_MORE)) / 2, CONTROLS_Y),
-			COMMAND_FOREGROUND, "P");
-		_descStr = msgP;
-	} else {
-		screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
-			(SHERLOCK_SCREEN_WIDTH - screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2,
-			PRESS_KEY_TO_CONTINUE);
-		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH -
-			screen.stringWidth(PRESS_KEY_TO_CONTINUE)) / 2, CONTROLS_Y),
-			COMMAND_FOREGROUND, "P");
-		_descStr = "";
-	}
-
-	if (firstTime) {
-		if (!_slideWindows) {
-			screen.slamRect(Common::Rect(0, CONTROLS_Y,
-				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-		} else {
-			// Display the window
-			summonWindow();
-		}
-
-		_selector = _oldSelector = -1;
-		_windowOpen = true;
-	} else {
-		screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
-			SHERLOCK_SCREEN_HEIGHT));
-	}
-}
-
-void ScalpelUserInterface::printObjectDesc() {
-	printObjectDesc(_cAnimStr, true);
-}
-
-void ScalpelUserInterface::summonWindow(const Surface &bgSurface, bool slideUp) {
-	Events &events = *_vm->_events;
-	Screen &screen = *_vm->_screen;
-
-	if (_windowOpen)
-		// A window is already open, so can't open another one
-		return;
-
-	if (slideUp) {
-		// Gradually slide up the display of the window
-		for (int idx = 1; idx <= bgSurface.h(); idx += 2) {
-			screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - idx),
-				Common::Rect(0, 0, bgSurface.w(), idx));
-			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - idx,
-				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-
-			events.delay(10);
-		}
-	} else {
-		// Gradually slide down the display of the window
-		for (int idx = 1; idx <= bgSurface.h(); idx += 2) {
-			screen._backBuffer->blitFrom(bgSurface,
-				Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h()),
-				Common::Rect(0, bgSurface.h() - idx, bgSurface.w(), bgSurface.h()));
-			screen.slamRect(Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h(),
-				SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - bgSurface.h() + idx));
-
-			events.delay(10);
-		}
-	}
-
-	// Final display of the entire window
-	screen._backBuffer->blitFrom(bgSurface, Common::Point(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h()),
-		Common::Rect(0, 0, bgSurface.w(), bgSurface.h()));
-	screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - bgSurface.h(), bgSurface.w(), bgSurface.h());
-
-	_windowOpen = true;
-}
-
-void ScalpelUserInterface::summonWindow(bool slideUp, int height) {
-	Screen &screen = *_vm->_screen;
-
-	// Extract the window that's been drawn on the back buffer
-	Surface tempSurface(SHERLOCK_SCREEN_WIDTH,
-		(SHERLOCK_SCREEN_HEIGHT - height));
-	Common::Rect r(0, height, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
-	tempSurface.blitFrom(screen._backBuffer1, Common::Point(0, 0), r);
-
-	// Remove drawn window with original user interface
-	screen._backBuffer1.blitFrom(screen._backBuffer2,
-		Common::Point(0, height), r);
-
-	// Display the window gradually on-screen
-	summonWindow(tempSurface, slideUp);
-}
-
-void ScalpelUserInterface::banishWindow(bool slideUp) {
-	Events &events = *_vm->_events;
-	Screen &screen = *_vm->_screen;
-
-	if (_windowOpen) {
-		if (slideUp || !_slideWindows) {
-			// Slide window down
-			// Only slide the window if the window style allows it
-			if (_slideWindows) {
-				for (int idx = 2; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y); idx += 2) {
-					// Shift the window down by 2 lines
-					byte *pSrc = (byte *)screen._backBuffer1.getBasePtr(0, CONTROLS_Y + idx - 2);
-					byte *pSrcEnd = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - 2);
-					byte *pDest = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT);
-					Common::copy_backward(pSrc, pSrcEnd, pDest);
-
-					// Restore lines from the ui in the secondary back buffer
-					screen._backBuffer1.blitFrom(screen._backBuffer2,
-						Common::Point(0, CONTROLS_Y),
-						Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + idx));
-
-					screen.slamArea(0, CONTROLS_Y + idx - 2, SHERLOCK_SCREEN_WIDTH,
-						SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y - idx + 2);
-					events.delay(10);
-				}
-
-				// Restore final two old lines
-				screen._backBuffer1.blitFrom(screen._backBuffer2,
-					Common::Point(0, SHERLOCK_SCREEN_HEIGHT - 2),
-					Common::Rect(0, SHERLOCK_SCREEN_HEIGHT - 2,
-						SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - 2, SHERLOCK_SCREEN_WIDTH, 2);
-			} else {
-				// Restore old area to completely erase window
-				screen._backBuffer1.blitFrom(screen._backBuffer2,
-					Common::Point(0, CONTROLS_Y),
-					Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-				screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH,
-					SHERLOCK_SCREEN_HEIGHT));
-			}
-		} else {
-			// Slide the original user interface up to cover the dialog
-			for (int idx = 1; idx < (SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); idx += 2) {
-				byte *pSrc = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1);
-				byte *pSrcEnd = (byte *)screen._backBuffer2.getBasePtr(0, CONTROLS_Y1 + idx);
-				byte *pDest = (byte *)screen._backBuffer1.getBasePtr(0, SHERLOCK_SCREEN_HEIGHT - idx);
-				Common::copy(pSrc, pSrcEnd, pDest);
-
-				screen.slamArea(0, SHERLOCK_SCREEN_HEIGHT - idx, SHERLOCK_SCREEN_WIDTH,
-					SHERLOCK_SCREEN_HEIGHT);
-				events.delay(10);
-			}
-
-			// Show entire final area
-			screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(0, CONTROLS_Y1),
-				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-			screen.slamRect(Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
-		}
-
-		_infoFlag = false;
-		_windowOpen = false;
-	}
-
-	_menuMode = STD_MODE;
-}
-
-void ScalpelUserInterface::checkUseAction(const UseType *use, const Common::String &invName,
-		const char *const messages[], int objNum, bool giveMode) {
-	Events &events = *_vm->_events;
-	Inventory &inv = *_vm->_inventory;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-	bool printed = messages == nullptr;
-
-	if (objNum >= 1000) {
-		// Holmes was specified, so do nothing
-		_infoFlag = true;
-		clearInfo();
-		_infoFlag = true;
-
-		// Display error message
-		_menuCounter = 30;
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that to yourself.");
-		return;
-	}
-
-	// Scan for target item
-	int targetNum = -1;
-	if (giveMode) {
-		for (int idx = 0; idx < USE_COUNT && targetNum == -1; ++idx) {
-			if ((use[idx]._target.equalsIgnoreCase("*GIVE*") || use[idx]._target.equalsIgnoreCase("*GIVEP*"))
-					&& use[idx]._names[0].equalsIgnoreCase(invName)) {
-				// Found a match
-				targetNum = idx;
-				if (use[idx]._target.equalsIgnoreCase("*GIVE*"))
-					inv.deleteItemFromInventory(invName);
-			}
-		}
-	} else {
-		for (int idx = 0; idx < USE_COUNT && targetNum == -1; ++idx) {
-			if (use[idx]._target.equalsIgnoreCase(invName))
-				targetNum = idx;
-		}
-	}
-
-	if (targetNum != -1) {
-		// Found a target, so do the action
-		const UseType &action = use[targetNum];
-
-		events.setCursor(WAIT);
-
-		if (action._useFlag)
-			_vm->setFlags(action._useFlag);
-
-		if (action._cAnimNum != 99) {
-			if (action._cAnimNum == 0)
-				scene.startCAnim(9, action._cAnimSpeed);
-			else
-				scene.startCAnim(action._cAnimNum - 1, action._cAnimSpeed);
-		}
-
-		if (!talk._talkToAbort) {
-			Object &obj = scene._bgShapes[objNum];
-			for (int idx = 0; idx < NAMES_COUNT && !talk._talkToAbort; ++idx) {
-				if (obj.checkNameForCodes(action._names[idx], messages)) {
-					if (!talk._talkToAbort)
-						printed = true;
-				}
-			}
-
-			// Print "Done..." as an ending, unless flagged for leaving scene or otherwise flagged
-			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
-				_infoFlag = true;
-				clearInfo();
-				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
-				_menuCounter = 25;
-			}
-		}
-	} else {
-		// Couldn't find target, so print error
-		_infoFlag = true;
-		clearInfo();
-
-		if (giveMode) {
-			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "No, thank you.");
-		} else if (messages == nullptr) {
-			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "You can't do that.");
-		} else {
-			screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[0]);
-		}
-
-		_infoFlag = true;
-		_menuCounter = 30;
-	}
-
-	events.setCursor(ARROW);
-}
-
-void ScalpelUserInterface::checkAction(ActionType &action, const char *const messages[], int objNum) {
-	Events &events = *_vm->_events;
-	People &people = *_vm->_people;
-	Scene &scene = *_vm->_scene;
-	Screen &screen = *_vm->_screen;
-	Talk &talk = *_vm->_talk;
-	Common::Point pt(-1, -1);
-
-	if (objNum >= 1000)
-		// Ignore actions done on characters
-		return;
-
-	if (!action._cAnimSpeed) {
-		// Invalid action, to print error message
-		_infoFlag = true;
-		clearInfo();
-		screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "%s", messages[action._cAnimNum]);
-		_infoFlag = true;
-
-		// Set how long to show the message
-		_menuCounter = 30;
-	} else {
-		Object &obj = scene._bgShapes[objNum];
-
-		int cAnimNum;
-		if (action._cAnimNum == 0)
-			// Really a 10
-			cAnimNum = 9;
-		else
-			cAnimNum = action._cAnimNum - 1;
-
-		int dir = -1;
-		if (action._cAnimNum != 99) {
-			CAnim &anim = scene._cAnim[cAnimNum];
-
-			if (action._cAnimNum != 99) {
-				if (action._cAnimSpeed & REVERSE_DIRECTION) {
-					pt = anim._teleportPos;
-					dir = anim._teleportDir;
-				} else {
-					pt = anim._goto;
-					dir = anim._gotoDir;
-				}
-			}
-		} else {
-			pt = Common::Point(-1, -1);
-			dir = -1;
-		}
-
-		// Has a value, so do action
-		// Show wait cursor whilst walking to object and doing action
-		events.setCursor(WAIT);
-		bool printed = false;
-
-		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
-					&& toupper(action._names[nameIdx][1]) == 'W') {
-				if (obj.checkNameForCodes(Common::String(action._names[nameIdx].c_str() + 2), messages)) {
-					if (!talk._talkToAbort)
-						printed = true;
-				}
-			}
-		}
-
-		bool doCAnim = true;
-		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2) {
-				char ch = toupper(action._names[nameIdx][1]);
-
-				if (ch == 'T' || ch == 'B') {
-					printed = true;
-					if (pt.x != -1)
-						// Holmes needs to walk to object before the action is done
-						people.walkToCoords(pt, dir);
-
-					if (!talk._talkToAbort) {
-						// Ensure Holmes is on the exact intended location
-						people[AL]._position = pt;
-						people[AL]._sequenceNumber = dir;
-						people.gotoStand(people[AL]);
-
-						talk.talkTo(action._names[nameIdx].c_str() + 2);
-						if (ch == 'T')
-							doCAnim = false;
-					}
-				}
-			}
-		}
-
-		if (doCAnim && !talk._talkToAbort) {
-			if (pt.x != -1)
-				// Holmes needs to walk to object before the action is done
-				people.walkToCoords(pt, dir);
-		}
-
-		for (int nameIdx = 0; nameIdx < NAMES_COUNT; ++nameIdx) {
-			if (action._names[nameIdx].hasPrefix("*") && action._names[nameIdx].size() >= 2
-					&& toupper(action._names[nameIdx][1]) == 'F') {
-				if (obj.checkNameForCodes(action._names[nameIdx].c_str() + 2, messages)) {
-					if (!talk._talkToAbort)
-						printed = true;
-				}
-			}
-		}
-
-		if (doCAnim && !talk._talkToAbort && action._cAnimNum != 99)
-			scene.startCAnim(cAnimNum, action._cAnimSpeed);
-
-		if (!talk._talkToAbort) {
-			for (int nameIdx = 0; nameIdx < NAMES_COUNT && !talk._talkToAbort; ++nameIdx) {
-				if (obj.checkNameForCodes(action._names[nameIdx], messages)) {
-					if (!talk._talkToAbort)
-						printed = true;
-				}
-			}
-
-			// Unless we're leaving the scene, print a "Done" message unless the printed flag has been set
-			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
-				_infoFlag = true;
-				clearInfo();
-				screen.print(Common::Point(0, INFO_LINE + 1), INFO_FOREGROUND, "Done...");
-
-				// Set how long to show the message
-				_menuCounter = 30;
-			}
-		}
-	}
-
-	// Reset cursor back to arrow
-	events.setCursor(ARROW);
-}
-
-}
-
-/*----------------------------------------------------------------*/
-
-namespace Tattoo {
-
-TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm) {
-	_menuBuffer = nullptr;
-	_invMenuBuffer = nullptr;
-}
-
-void TattooUserInterface::handleInput() {
-	// TODO
-	_vm->_events->pollEventsAndWait();
-}
-
-void TattooUserInterface::doBgAnimRestoreUI() {
-	TattooScene &scene = *((TattooScene *)_vm->_scene);
-	Screen &screen = *_vm->_screen;
-
-	// If _oldMenuBounds was set, then either a new menu has been opened or the current menu has been closed.
-	// Either way, we need to restore the area where the menu was displayed
-	if (_oldMenuBounds.width() > 0)
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldMenuBounds.left, _oldMenuBounds.top),
-			_oldMenuBounds);
-
-	if (_oldInvMenuBounds.width() > 0)
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldInvMenuBounds.left, _oldInvMenuBounds.top),
-			_oldInvMenuBounds);
-
-	if (_menuBuffer != nullptr)
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_menuBounds.left, _menuBounds.top), _menuBounds);
-	if (_invMenuBuffer != nullptr)
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_invMenuBounds.left, _invMenuBounds.top), _invMenuBounds);
-
-	// If there is a Text Tag being display, restore the area underneath it
-	if (_oldTagBounds.width() > 0)
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldTagBounds.left, _oldTagBounds.top), 
-			_oldTagBounds);
-
-	// If there is an Inventory being shown, restore the graphics underneath it
-	if (_oldInvGraphicBounds.width() > 0)
-		screen._backBuffer1.blitFrom(screen._backBuffer2, Common::Point(_oldInvGraphicBounds.left, _oldInvGraphicBounds.top), 
-			_oldInvGraphicBounds);
-
-	// If a canimation is active, restore the graphics underneath it
-	if (scene._activeCAnim._images != nullptr)
-		screen.restoreBackground(scene._activeCAnim._oldBounds);
-
-	// If a canimation just ended, remove it's graphics from the backbuffer
-	if (scene._activeCAnim._removeBounds.width() > 0)
-		screen.restoreBackground(scene._activeCAnim._removeBounds);
-}
-
-void TattooUserInterface::doScroll() {
-	Screen &screen = *_vm->_screen;
-	int oldScroll = screen._currentScroll;
-
-	// If we're already at the target scroll position, nothing needs to be done
-	if (screen._targetScroll == screen._currentScroll)
-		return;
-
-	screen._flushScreen = true;
-	if (screen._targetScroll > screen._currentScroll) {
-		screen._currentScroll += screen._scrollSpeed;
-		if (screen._currentScroll > screen._targetScroll)
-			screen._currentScroll = screen._targetScroll;
-	} else if (screen._targetScroll < screen._currentScroll) {
-		screen._currentScroll -= screen._scrollSpeed;
-		if (screen._currentScroll < screen._targetScroll)
-			screen._currentScroll = screen._targetScroll;
-	}
-
-	if (_menuBuffer != nullptr)
-		_menuBounds.translate(screen._currentScroll - oldScroll, 0);
-	if (_invMenuBuffer != nullptr)
-		_invMenuBounds.translate(screen._currentScroll - oldScroll, 0);
-}
-
-} // End of namespace Tattoo
-
 } // End of namespace Sherlock
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index dfd6d02efd..042997a3e2 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -50,18 +50,6 @@ enum MenuMode {
 	SETUP_MODE		= 12
 };
 
-extern const char COMMANDS[13];
-extern const int MENU_POINTS[12][4];
-
-extern const int INVENTORY_POINTS[8][3];
-extern const char INVENTORY_COMMANDS[9];
-extern const char *const PRESS_KEY_FOR_MORE;
-extern const char *const PRESS_KEY_TO_CONTINUE;
-
-class SherlockEngine;
-class Inventory;
-class Talk;
-
 class UserInterface {
 protected:
 	SherlockEngine *_vm;
@@ -137,222 +125,6 @@ public:
 	virtual void printObjectDesc() {}
 };
 
-namespace Scalpel {
-
-class ScalpelUserInterface: public UserInterface {
-	friend class Inventory;
-	friend class Settings;
-	friend class Talk;
-private:
-	ImageFile *_controlPanel;
-	ImageFile *_controls;
-	char _keyPress;
-	int _lookHelp;
-	int _bgFound, _oldBgFound;
-	int _help, _oldHelp;
-	char _key, _oldKey;
-	int _temp, _oldTemp;
-	int _oldLook;
-	bool _keyboardInput;
-	bool _pause;
-	int _cNum;
-	Common::String _cAnimStr;
-	Common::String _descStr;
-	int _find;
-	int _oldUse;
-private:
-	/**
-	 * Draws the image for a user interface button in the down/pressed state.
-	 */
-	void depressButton(int num);
-
-	/**
-	 * If he mouse button is pressed, then calls depressButton to draw the button
-	 * as pressed; if not, it will show it as released with a call to "restoreButton".
-	 */
-	void pushButton(int num);
-
-	/**
-	 * By the time this method has been called, the graphics for the button change
-	 * have already been drawn. This simply takes care of switching the mode around
-	 * accordingly
-	 */
-	void toggleButton(int num);
-
-	/**
-	 * Creates a text window and uses it to display the in-depth description
-	 * of the highlighted object
-	 */
-	void examine();
-
-	/**
-	 * Print the name of an object in the scene
-	 */
-	void lookScreen(const Common::Point &pt);
-
-	/**
-	 * Gets the item in the inventory the mouse is on and display's it's description
-	 */
-	void lookInv();
-
-	/**
-	 * Handles input when the file list window is being displayed
-	 */
-	void doEnvControl();
-	
-	/**
-	 * Handle input whilst the inventory is active
-	 */
-	void doInvControl();
-	
-	/**
-	 * Handles waiting whilst an object's description window is open.
-	 */
-	void doLookControl();
-	
-	/**
-	 * Handles input until one of the user interface buttons/commands is selected
-	 */
-	void doMainControl();
-	
-	/**
-	 * Handles the input for the MOVE, OPEN, and CLOSE commands
-	 */
-	void doMiscControl(int allowed);
-	
-	/**
-	 * Handles input for picking up items
-	 */
-	void doPickControl();
-	
-	/**
-	 * Handles input when in talk mode. It highlights the buttons and available statements,
-	 * and handles allowing the user to click on them
-	 */
-	void doTalkControl();
-	
-	/**
-	 * Handles events when the Journal is active.
-	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
-	 *		the user interface, it uses so many internal UI fields, that it sort of made some sense
-	 *		to put it in the UserInterface class.
-	 */
-	void journalControl();
-
-	/**
-	 * Checks to see whether a USE action is valid on the given object
-	 */
-	void checkUseAction(const UseType *use, const Common::String &invName, const char *const messages[],
-		int objNum, bool giveMode);
-	
-	/**
-	 * Called for OPEN, CLOSE, and MOVE actions are being done
-	 */
-	void checkAction(ActionType &action, const char *const messages[], int objNum);
-
-	/**
-	 * Print the previously selected object's decription
-	 */
-	void printObjectDesc(const Common::String &str, bool firstTime);
-public:
-	ScalpelUserInterface(SherlockEngine *vm);
-	virtual ~ScalpelUserInterface();
-
-	/**
-	 * Handles counting down whilst checking for input, then clears the info line.
-	 */
-	void whileMenuCounter();
-
-	/**
-	 * Draws the image for the given user interface button in the up
-	 * (not selected) position
-	 */
-	void restoreButton(int num);
-public:
-	/**
-	 * Resets the user interface
-	 */
-	virtual void reset();
-
-	/**
-	 * Main input handler for the user interface
-	 */
-	virtual void handleInput();
-
-	/**
-	 * Draw the user interface onto the screen's back buffers
-	 */	
-	virtual void drawInterface(int bufferNum = 3);
-
-	/**
-	 * Displays a passed window by gradually scrolling it vertically on-screen
-	 */
-	virtual void summonWindow(const Surface &bgSurface, bool slideUp = true);
-
-	/**
-	 * Slide the window stored in the back buffer onto the screen
-	 */
-	virtual void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
-
-	/**
-	 * Close a currently open window
-	 * @param flag	0 = slide old window down, 1 = slide prior UI back up
-	 */
-	virtual void banishWindow(bool slideUp = true);
-
-	/**
-	 * Clears the info line of the screen
-	 */
-	virtual void clearInfo();
-
-	/**
-	 * Clear any active text window
-	 */
-	virtual void clearWindow();
-
-	/**
-	 * Print the previously selected object's decription
-	 */	
-	virtual void printObjectDesc();
-};
-
-} // End of namespace Scalpel
-
-namespace Tattoo {
-
-class TattooUserInterface : public UserInterface {
-private:
-	Common::Rect _menuBounds;
-	Common::Rect _oldMenuBounds;
-	Common::Rect _invMenuBounds;
-	Common::Rect _oldInvMenuBounds;
-	Common::Rect _oldTagBounds;
-	Common::Rect _oldInvGraphicBounds;
-	Surface *_menuBuffer;
-	Surface *_invMenuBuffer;
-public:
-	TattooUserInterface(SherlockEngine *vm);
-
-	/**
-	 * Handles restoring any areas of the back buffer that were/are covered by UI elements
-	 */
-	void doBgAnimRestoreUI();
-
-	/**
-	 * Checks to see if the screen needs to be scrolled. If so, scrolls it towards the target position
-	 */
-	void doScroll();
-public:
-	virtual ~TattooUserInterface() {}
-
-	/**
-	 * Main input handler for the user interface
-	 */
-	virtual void handleInput();
-};
-
-} // End of namespace Tattoo
-
 } // End of namespace Sherlock
 
 #endif
-- 
cgit v1.2.3


From 88d245814314b9e452d02ce8ce8e2aa89bc3ecea Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 May 2015 19:59:03 -0400
Subject: SHERLOCK: Implement additions to updateBackground, some method stubs

---
 engines/sherlock/people.cpp              |   1 +
 engines/sherlock/people.h                |   2 +
 engines/sherlock/resources.cpp           |  10 +++
 engines/sherlock/resources.h             |   4 ++
 engines/sherlock/scene.h                 |  22 +++----
 engines/sherlock/screen.cpp              |  33 ++++++----
 engines/sherlock/screen.h                |   3 +
 engines/sherlock/surface.cpp             |   6 ++
 engines/sherlock/surface.h               |   2 +
 engines/sherlock/tattoo/tattoo_scene.cpp | 108 +++++++++++++++++++++++++++++++
 engines/sherlock/tattoo/tattoo_scene.h   |   7 ++
 11 files changed, 174 insertions(+), 24 deletions(-)

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index f8dd8e299b..0ef49ffefb 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -70,6 +70,7 @@ const char *const WALK_LIB_NAMES[10] = {
 
 Person::Person() : Sprite(), _walkLoaded(false), _npcIndex(0), _npcStack(0), _npcPause(false)  {
 	Common::fill(&_npcPath[0], &_npcPath[MAX_NPC_PATH], 0);
+	_tempX = _tempScaleVal = 0;
 }
 
 void Person::clearNPC() {
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index f4aba5aa98..013727d8ba 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -74,6 +74,8 @@ public:
 	bool _npcPause;
 	byte _npcPath[MAX_NPC_PATH];
 	Common::String _npcName;
+	int _tempX;
+	int _tempScaleVal;
 
 	// Rose Tattoo fields
 	Common::String _walkVGSName;		// Name of walk library person is using
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 4e10ba97c9..961286fcf4 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -466,4 +466,14 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 	}
 }
 
+/*----------------------------------------------------------------*/
+
+int ImageFrame::sDrawXSize(int scaleVal) const {
+	error("TODO: sDrawXSize");
+}
+
+int ImageFrame::sDrawYSize(int scaleVal) const {
+	error("TODO: sDrawYSize");
+}
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 659ecf0110..c5b76ac151 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -173,6 +173,10 @@ struct ImageFrame {
 	Common::Point _offset;
 	byte _rleMarker;
 	Graphics::Surface _frame;
+
+	int sDrawXSize(int scaleVal) const;
+
+	int sDrawYSize(int scaleVal) const;
 };
 
 class ImageFile : public Common::Array<ImageFrame> {
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index b5e27ff99d..624e4d3c99 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -272,11 +272,6 @@ public:
 	 */
 	int toggleObject(const Common::String &name);
 
-	/**
-	 * Draw all objects and characters.
-	 */
-	virtual void doBgAnim() = 0;
-
 	/**
 	 * Attempts to find a background shape within the passed bounds. If found,
 	 * it will return the shape number, or -1 on failure.
@@ -299,12 +294,6 @@ public:
 	 */
 	int closestZone(const Common::Point &pt);
 
-	/**
-	 * Update the screen back buffer with all of the scene objects which need
-	 * to be drawn
-	 */
-	void updateBackground();
-
 	/**
 	 * Synchronize the data for a savegame
 	 */
@@ -316,6 +305,17 @@ public:
 	 *		the scene number being entered
 	 */
 	void setNPCPath(int npc);
+public:
+	/**
+	 * Draw all objects and characters.
+	 */
+	virtual void doBgAnim() = 0;
+
+	/**
+	 * Update the screen back buffer with all of the scene objects which need
+	 * to be drawn
+	 */
+	virtual void updateBackground();
 };
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 350341f608..e826a10fc0 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -253,24 +253,26 @@ void Screen::slamRect(const Common::Rect &r) {
 	}
 }
 
-void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
-		int16 *xp, int16 *yp, int16 *width, int16 *height) {
+void Screen::flushImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp, 
+		int16 *width, int16 *height) {
 	Common::Point imgPos = pt + frame->_offset;
 	Common::Rect newBounds(imgPos.x, imgPos.y, imgPos.x + frame->_frame.w, imgPos.y + frame->_frame.h);
 	Common::Rect oldBounds(*xp, *yp, *xp + *width, *yp + *height);
 
-	// See if the areas of the old and new overlap, and if so combine the areas
-	if (newBounds.intersects(oldBounds)) {
-		Common::Rect mergedBounds = newBounds;
-		mergedBounds.extend(oldBounds);
-		mergedBounds.right += 1;
-		mergedBounds.bottom += 1;
+	if (!_flushScreen) {
+		// See if the areas of the old and new overlap, and if so combine the areas
+		if (newBounds.intersects(oldBounds)) {
+			Common::Rect mergedBounds = newBounds;
+			mergedBounds.extend(oldBounds);
+			mergedBounds.right += 1;
+			mergedBounds.bottom += 1;
 
-		slamRect(mergedBounds);
-	} else {
-		// The two areas are independent, so copy them both
-		slamRect(newBounds);
-		slamRect(oldBounds);
+			slamRect(mergedBounds);
+		} else {
+			// The two areas are independent, so copy them both
+			slamRect(newBounds);
+			slamRect(oldBounds);
+		}
 	}
 
 	*xp = newBounds.left;
@@ -279,6 +281,11 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt,
 	*height = newBounds.height();
 }
 
+void Screen::flushScaleImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp,
+		int16 *width, int16 *height, int scaleVal) {
+	error("TODO");
+}
+
 void Screen::print(const Common::Point &pt, byte color, const char *formatStr, ...) {
 	// Create the string to display
 	va_list args;
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index ae368cf633..949f9debf8 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -184,6 +184,9 @@ public:
 	void flushImage(ImageFrame *frame, const Common::Point &pt,
 		int16 *xp, int16 *yp, int16 *width, int16 *height);
 
+	void flushScaleImage(ImageFrame *frame, const Common::Point &pt,
+		int16 *xp, int16 *yp, int16 *width, int16 *height, int scaleVal);
+
 	/**
 	 * Returns the width of a string in pixels
 	 */
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 80495a398c..6cf479c962 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -186,4 +186,10 @@ void Surface::setPixels(byte *pixels, int width, int height) {
 	_surface.setPixels(pixels);
 }
 
+void Surface::maskArea(const ImageFrame &src, const Common::Point &pt, int scrollX) {
+	// TODO
+	error("TODO: maskArea");
+}
+
+
 } // End of namespace Sherlock
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index ccabf02a23..663f87f37f 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -126,6 +126,8 @@ public:
 	 */
 	void fillRect(const Common::Rect &r, byte color);
 
+	void maskArea(const ImageFrame &src, const Common::Point &pt, int scrollX);
+
 	/**
 	 * Clear the screen
 	 */
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index f03e791c52..1effd60682 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -222,6 +222,114 @@ void TattooScene::doBgAnim() {
 	doBgAnimEraseBackground();
 }
 
+void TattooScene::updateBackground() {
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+
+	Scene::updateBackground();
+
+	if (_mask != nullptr) {
+		switch (_currentScene) {
+		case 7:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x - SHERLOCK_SCREEN_WIDTH, 110), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 110), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x + SHERLOCK_SCREEN_WIDTH, 110), screen._currentScroll);
+			break;
+
+		case 8:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x - SHERLOCK_SCREEN_WIDTH, 180), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 180), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x + SHERLOCK_SCREEN_WIDTH, 180), screen._currentScroll);
+			if (!_vm->readFlags(880))
+				screen._backBuffer1.maskArea((*_mask1)[0], Common::Point(940, 300), screen._currentScroll);
+			break;
+
+		case 18:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(0, 203), screen._currentScroll);
+			if (!_vm->readFlags(189))
+				screen._backBuffer1.maskArea((*_mask1)[0], Common::Point(124, 239), screen._currentScroll);
+			break;
+
+		case 53:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 110), screen._currentScroll);
+			break;
+
+		case 68:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(0, 203), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask1)[0], Common::Point(124, 239), screen._currentScroll);
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	screen._flushScreen = true;
+
+	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+		Person &p = people[idx];
+
+		if (p._type != INVALID) {
+			if (_goToScene == -1 || _cAnim.size() == 0) {
+				if (p._type == REMOVE) {
+					screen.slamArea(p._oldPosition.x, p._oldPosition.y, p._oldSize.x, p._oldSize.y);
+					p._type = INVALID;
+				} else {
+					if (p._tempScaleVal == 256) {
+						screen.flushImage(p._imageFrame, Common::Point(p._tempX, p._position.y / FIXED_INT_MULTIPLIER
+							- p._imageFrame->_width), &p._oldPosition.x, &p._oldPosition.y, &p._oldSize.x, &p._oldSize.y);
+					}  else {
+						int ts = p._imageFrame->sDrawYSize(p._tempScaleVal);
+						int ty = p._position.y / FIXED_INT_MULTIPLIER - ts;
+						screen.flushScaleImage(p._imageFrame, Common::Point(p._tempX, ty),
+							&p._oldPosition.x, &p._oldPosition.y, &p._oldSize.x, &p._oldSize.y, p._tempScaleVal);
+					}
+				}
+			}
+		}
+	}
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+
+		if (obj._type == ACTIVE_BG_SHAPE || obj._type == REMOVE) {
+			if (_goToScene == -1) {
+				if (obj._scaleVal == 256)
+					screen.flushImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y,
+						&obj._oldSize.x, &obj._oldSize.y);
+				else
+					screen.flushScaleImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y,
+						&obj._oldSize.x, &obj._oldSize.y, obj._scaleVal);
+
+				if (obj._type == REMOVE)
+					obj._type = INVALID;
+			}
+		}
+	}
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+
+		if (_goToScene == -1) {
+			if (obj._type == NO_SHAPE && (obj._flags & 1) == 0) {
+				screen.slamRect(obj.getNoShapeBounds());
+				screen.slamRect(obj.getOldBounds());
+			} else if (obj._type == HIDE_SHAPE) {
+				if (obj._scaleVal == 256)
+					screen.flushImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y,
+						&obj._oldSize.x, &obj._oldSize.y);
+				else
+					screen.flushScaleImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y,
+						&obj._oldSize.x, &obj._oldSize.y, obj._scaleVal);
+				obj._type = HIDDEN;
+			}
+		}
+	}
+
+	screen._flushScreen = false;
+}
+
+
 } // End of namespace Tattoo
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
index 34e87f41a8..5e26eaa455 100644
--- a/engines/sherlock/tattoo/tattoo_scene.h
+++ b/engines/sherlock/tattoo/tattoo_scene.h
@@ -56,6 +56,13 @@ public:
 	 * Draw all objects and characters.
 	 */
 	virtual void doBgAnim();
+
+	/**
+	 * Update the screen back buffer with all of the scene objects which need
+	 * to be drawn
+	 */
+	virtual void updateBackground();
+
 };
 
 } // End of namespace Tattoo
-- 
cgit v1.2.3


From a6607ff2d60e7951594a6a2ad8fd319fb776e35b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 28 May 2015 21:47:52 -0400
Subject: SHERLOCK: Implemented flushScaleImage and scale calculations

---
 engines/sherlock/resources.cpp | 24 ++++++++++++++++++++++--
 engines/sherlock/resources.h   |  6 ++++++
 engines/sherlock/screen.cpp    | 26 +++++++++++++++++++++++++-
 engines/sherlock/screen.h      | 12 ++++++++----
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 961286fcf4..f1c705b522 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -469,11 +469,31 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
 /*----------------------------------------------------------------*/
 
 int ImageFrame::sDrawXSize(int scaleVal) const {
-	error("TODO: sDrawXSize");
+	int width = _width;
+	int scale = scaleVal == 0 ? 1 : scaleVal;
+
+	if (scaleVal >= 256)
+		--width;
+
+	int result = width * 256 / scale;
+	if (scaleVal >= 256)
+		++result;
+
+	return result;
 }
 
 int ImageFrame::sDrawYSize(int scaleVal) const {
-	error("TODO: sDrawYSize");
+	int height = _height;
+	int scale = scaleVal == 0 ? 1 : scaleVal;
+
+	if (scaleVal >= 256)
+		--height;
+
+	int result = height * 256 / scale;
+	if (scaleVal >= 256)
+		++result;
+
+	return result;
 }
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index c5b76ac151..5c071e3922 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -174,8 +174,14 @@ struct ImageFrame {
 	byte _rleMarker;
 	Graphics::Surface _frame;
 
+	/**
+	 * Return the frame width adjusted by a specified scale amount
+	 */
 	int sDrawXSize(int scaleVal) const;
 
+	/**
+	 * Return the frame height adjusted by a specified scale amount
+	 */
 	int sDrawYSize(int scaleVal) const;
 };
 
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index e826a10fc0..a3af5559c7 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -283,7 +283,31 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, i
 
 void Screen::flushScaleImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp,
 		int16 *width, int16 *height, int scaleVal) {
-	error("TODO");
+	Common::Point imgPos = pt + frame->_offset;
+	Common::Rect newBounds(imgPos.x, imgPos.y, imgPos.x + frame->sDrawXSize(scaleVal), 
+		imgPos.y + frame->sDrawYSize(scaleVal));
+	Common::Rect oldBounds(*xp, *yp, *xp + *width, *yp + *height);
+
+	if (!_flushScreen) {
+		// See if the areas of the old and new overlap, and if so combine the areas
+		if (newBounds.intersects(oldBounds)) {
+			Common::Rect mergedBounds = newBounds;
+			mergedBounds.extend(oldBounds);
+			mergedBounds.right += 1;
+			mergedBounds.bottom += 1;
+
+			slamRect(mergedBounds);
+		} else {
+			// The two areas are independent, so copy them both
+			slamRect(newBounds);
+			slamRect(oldBounds);
+		}
+	}
+
+	*xp = newBounds.left;
+	*yp = newBounds.top;
+	*width = newBounds.width();
+	*height = newBounds.height();
 }
 
 void Screen::print(const Common::Point &pt, byte color, const char *formatStr, ...) {
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 949f9debf8..8fda9cbb9c 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -181,11 +181,15 @@ public:
 	 * Copy an image from the back buffer to the screen, taking care of both the
 	 * new area covered by the shape as well as the old area, which must be restored
 	 */
-	void flushImage(ImageFrame *frame, const Common::Point &pt,
-		int16 *xp, int16 *yp, int16 *width, int16 *height);
+	void flushImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp, 
+		int16 *width, int16 *height);
 
-	void flushScaleImage(ImageFrame *frame, const Common::Point &pt,
-		int16 *xp, int16 *yp, int16 *width, int16 *height, int scaleVal);
+	/**
+	 * Similar to flushImage, this method takes in an extra parameter for the scale proporation,
+	 * which affects the calculated bounds accordingly
+	 */
+	void flushScaleImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp, 
+		int16 *width, int16 *height, int scaleVal);
 
 	/**
 	 * Returns the width of a string in pixels
-- 
cgit v1.2.3


From f80cc4a84d9a1ff4e761438164e94425b4239908 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 01:48:30 +0200
Subject: SHERLOCK: add (unfinished) adlib driver

---
 engines/sherlock/music.cpp                    | 112 ++++--
 engines/sherlock/music.h                      |  11 +-
 engines/sherlock/scalpel/drivers/adlib.cpp    | 532 ++++++++++++++++++++++++++
 engines/sherlock/scalpel/drivers/mididriver.h |  91 +++++
 4 files changed, 722 insertions(+), 24 deletions(-)
 create mode 100644 engines/sherlock/scalpel/drivers/adlib.cpp
 create mode 100644 engines/sherlock/scalpel/drivers/mididriver.h

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index c1aebda2b3..ed047f61f8 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -23,11 +23,14 @@
 #include "common/config-manager.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/music.h"
+#include "sherlock/scalpel/drivers/mididriver.h"
 
 namespace Sherlock {
 
 #define NUM_SONGS 45
 
+#define USE_SCI_MIDI_PLAYER 1
+
 /* This tells which song to play in each room, 0 = no song played */
 static const char ROOM_SONG[62] = {
 	 0, 20, 43,  6, 11,  2,  8, 15,  6, 28,
@@ -59,7 +62,7 @@ MidiParser_SH::MidiParser_SH() {
 }
 
 void MidiParser_SH::parseNextEvent(EventInfo &info) {
-	warning("parseNextEvent");
+//	warning("parseNextEvent");
 
 	// An attempt to remap MT32 instruments to GMIDI. Only partially successful, it still
 	// does not sound even close to the real MT32. Oddly enough, on the actual hardware MT32
@@ -88,13 +91,15 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 	info.delta = 0;
 
 	info.event = *_position._playPos++;
-	warning("Event %x", info.event);
+	//warning("Event %x", info.event);
 	_position._runningStatus = info.event;
 
 	switch (info.command()) {
-	case 0xC: {
+	case 0xC: { // program change
 		int idx = *_position._playPos++;
-		info.basic.param1 = mt32Map[idx & 0x7f]; // remap MT32 to GM
+		info.basic.param1 = idx & 0x7f;
+		// don't do this here, it breaks adlib
+		//info.basic.param1 = mt32Map[idx & 0x7f]; // remap MT32 to GM
 		info.basic.param2 = 0;
 		}
 		break;
@@ -160,14 +165,12 @@ bool MidiParser_SH::loadMusic(byte *data, uint32 size) {
 	warning("loadMusic");
 	unloadMusic();
 
-	byte *pos = data;
+	byte  *headerPtr  = data;
+	byte  *pos        = data;
+	uint16 headerSize = READ_LE_UINT16(headerPtr);
+	assert(headerSize == 0x7F);
 
-	if (memcmp("            ", pos, 12)) {
-		warning("Expected header not found in music file");
-		return false;
-	}
-	pos += 12;
-	byte headerSize = *pos;
+	// Skip over header
 	pos += headerSize;
 
 	_lastEvent = 0;
@@ -190,16 +193,49 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 		_vm->_res->addToCache("MUSIC.LIB");
 
 	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
-	_driver = MidiDriver::createMidi(dev);
-	assert(_driver);
 
-	int ret = _driver->open();
-	if (ret == 0) {
-		_driver->sendGMReset();
-		_driver->setTimerCallback(&_midiParser, &_midiParser.timerCallback);
+	_musicType = MidiDriver::getMusicType(dev);
+
+#if USE_SCI_MIDI_PLAYER
+	_pMidiDrv = NULL;
+#endif
+	_driver = NULL;
+
+	switch (_musicType) {
+	case MT_ADLIB:
+#if USE_SCI_MIDI_PLAYER
+		_pMidiDrv = MidiPlayer_AdLib_create();
+#else
+		_driver = MidiDriver_AdLib_create();
+#endif
+		break;
+	default:
+		_driver = MidiDriver::createMidi(dev);
+		break;
+	}
+#if USE_SCI_MIDI_PLAYER
+	if (_pMidiDrv) {
+		assert(_pMidiDrv);
+		int ret = _pMidiDrv->open();
+		if (ret == 0) {
+			_pMidiDrv->setTimerCallback(&_midiParser, &_midiParser.timerCallback);
+		}
+		_midiParser.setMidiDriver(_pMidiDrv);
+		_midiParser.setTimerRate(_pMidiDrv->getBaseTempo());
+	}
+#endif
+
+	if (_driver) {
+		assert(_driver);
+
+		int ret = _driver->open();
+		if (ret == 0) {
+			_driver->sendGMReset();
+			_driver->setTimerCallback(&_midiParser, &_midiParser.timerCallback);
+		}
+		_midiParser.setMidiDriver(_driver);
+		_midiParser.setTimerRate(_driver->getBaseTempo());
 	}
-	_midiParser.setMidiDriver(_driver);
-	_midiParser.setTimerRate(_driver->getBaseTempo());
 
 	_musicPlaying = false;
 	_musicOn = true;
@@ -248,17 +284,49 @@ bool Music::playMusic(const Common::String &name) {
 	Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
 
 	byte *data = new byte[stream->size()];
-	byte *ptr = data;
+	int32 dataSize = stream->size();
+	assert(data);
+
+	stream->read(data, dataSize);
 
-	stream->read(ptr, stream->size());
+	// for dumping the music tracks
+#if 0
 	Common::DumpFile outFile;
 	outFile.open(name + ".RAW");
 	outFile.write(data, stream->size());
 	outFile.flush();
 	outFile.close();
+#endif
 
-	_midiParser.loadMusic(data, stream->size());
+	if (dataSize < 14) {
+		warning("not enough data in music file");
+		return false;
+	}
+
+	byte *dataPos = data;
+	if (memcmp("            ", dataPos, 12)) {
+		warning("Expected header not found in music file");
+		return false;
+	}
+	dataPos += 12;
+	dataSize -= 12;
+
+	uint16 headerSize = READ_LE_UINT16(dataPos);
+	if (headerSize != 0x7F) {
+		warning("music header is not as expected");
+		return false;
+	}
+
+	if (_musicType == MT_ADLIB) {
+		if (_driver)
+			MidiDriver_AdLib_newMusicData(_driver, dataPos, dataSize);
+#if USE_SCI_MIDI_PLAYER
+		if (_pMidiDrv)
+			MidiPlayer_AdLib_newMusicData(_pMidiDrv, dataPos, dataSize);
+#endif
+	}
 
+	_midiParser.loadMusic(dataPos, dataSize);
 	return true;
 }
 
diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h
index 51ee7bb84f..a195b26b68 100644
--- a/engines/sherlock/music.h
+++ b/engines/sherlock/music.h
@@ -25,7 +25,8 @@
 
 #include "audio/midiplayer.h"
 #include "audio/midiparser.h"
-#include "audio/mididrv.h"
+//#include "audio/mididrv.h"
+#include "sherlock/scalpel/drivers/mididriver.h"
 
 namespace Sherlock {
 
@@ -44,15 +45,21 @@ public:
 	virtual bool loadMusic(byte *data, uint32 size);
 };
 
-class Music : public Audio::MidiPlayer {
+class Music {
 private:
 	SherlockEngine *_vm;
 	Audio::Mixer *_mixer;
 	MidiParser_SH _midiParser;
+	MidiPlayer *_pMidiDrv;
+	MidiDriver *_driver;
 
 public:
 	bool _musicPlaying;
 	bool _musicOn;
+
+private:
+	MusicType _musicType;
+
 public:
 	Music(SherlockEngine *vm, Audio::Mixer *mixer);
 
diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
new file mode 100644
index 0000000000..7ee5256138
--- /dev/null
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -0,0 +1,532 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sherlock/sherlock.h"
+#include "sherlock/scalpel/drivers/mididriver.h"
+
+#include "common/file.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
+
+namespace Sherlock {
+
+#define USE_SCI_MIDI_PLAYER 1
+
+#define SHERLOCK_ADLIB_VOICES_COUNT 9
+#define SHERLOCK_ADLIB_NOTES_COUNT 96
+
+byte adlib_Operator1Register[SHERLOCK_ADLIB_VOICES_COUNT] = {
+	0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12
+};
+
+byte adlib_Operator2Register[SHERLOCK_ADLIB_VOICES_COUNT] = {
+	0x03, 0x04, 0x05, 0x0B, 0x0C, 0x0D, 0x13, 0x14, 0x15
+};
+
+struct adlib_InstrumentEntry {
+	byte reg20op1;
+	byte reg40op1;
+	byte reg60op1;
+	byte reg80op1;
+	byte regE0op1;
+	byte reg20op2;
+	byte reg40op2;
+	byte reg60op2;
+	byte reg80op2;
+	byte regE0op2;
+	byte regC0;
+	byte frequencyAdjust;
+};
+
+// hardcoded, dumped from ADHOM.DRV
+const adlib_InstrumentEntry adlib_instrumentTable[] = {
+	{ 0x71, 0x89, 0x51, 0x11, 0x00, 0x61, 0x23, 0x42, 0x15, 0x01, 0x02, 0xF4 },
+	{ 0x22, 0x20, 0x97, 0x89, 0x00, 0xA2, 0x1F, 0x70, 0x07, 0x00, 0x0A, 0xF4 },
+	{ 0x70, 0x1A, 0x64, 0x13, 0x00, 0x20, 0x1F, 0x53, 0x46, 0x00, 0x0E, 0xF4 },
+	{ 0xB6, 0x4A, 0xB6, 0x32, 0x00, 0x11, 0x2B, 0xD1, 0x31, 0x00, 0x0E, 0xE8 },
+	{ 0x71, 0x8B, 0x51, 0x11, 0x00, 0x61, 0x20, 0x32, 0x35, 0x01, 0x02, 0xF4 },
+	{ 0x71, 0x8A, 0x51, 0x11, 0x00, 0x61, 0x20, 0x32, 0x25, 0x01, 0x02, 0xF4 },
+	{ 0x23, 0x0F, 0xF4, 0x04, 0x02, 0x2F, 0x25, 0xF0, 0x43, 0x00, 0x06, 0xE8 },
+	{ 0x71, 0x1C, 0x71, 0x03, 0x00, 0x21, 0x1F, 0x54, 0x17, 0x00, 0x0E, 0xF4 },
+	{ 0x71, 0x8A, 0x6E, 0x17, 0x00, 0x25, 0x27, 0x6B, 0x0E, 0x00, 0x02, 0xF4 },
+	{ 0x71, 0x1D, 0x81, 0x03, 0x00, 0x21, 0x1F, 0x64, 0x17, 0x00, 0x0E, 0xF4 },
+	{ 0x01, 0x4B, 0xF1, 0x50, 0x00, 0x01, 0x23, 0xD2, 0x76, 0x00, 0x06, 0xF4 },
+	{ 0x2F, 0xCA, 0xF8, 0xE5, 0x00, 0x21, 0x1F, 0xC0, 0xFF, 0x00, 0x00, 0xF4 },
+	{ 0x29, 0xCD, 0xF0, 0x91, 0x00, 0x21, 0x1F, 0xE0, 0x86, 0x00, 0x02, 0xF4 },
+	{ 0x24, 0xD0, 0xF0, 0x01, 0x00, 0x21, 0x1F, 0xE0, 0x86, 0x00, 0x02, 0xF4 },
+	{ 0x23, 0xC8, 0xF0, 0x01, 0x00, 0x21, 0x1F, 0xE0, 0x86, 0x00, 0x02, 0xF4 },
+	{ 0x64, 0xC9, 0xB0, 0x01, 0x00, 0x61, 0x1F, 0xF0, 0x86, 0x00, 0x02, 0xF4 },
+	{ 0x33, 0x85, 0xA1, 0x10, 0x00, 0x15, 0x9F, 0x72, 0x23, 0x00, 0x08, 0xF4 },
+	{ 0x31, 0x85, 0xA1, 0x10, 0x00, 0x15, 0x9F, 0x73, 0x33, 0x00, 0x08, 0xF4 },
+	{ 0x31, 0x81, 0xA1, 0x30, 0x00, 0x16, 0x9F, 0xC2, 0x74, 0x00, 0x08, 0xF4 },
+	{ 0x03, 0x8A, 0xF0, 0x7B, 0x00, 0x02, 0x9F, 0xF4, 0x7B, 0x00, 0x08, 0xF4 },
+	{ 0x03, 0x8A, 0xF0, 0x7B, 0x00, 0x01, 0x9F, 0xF4, 0x7B, 0x00, 0x08, 0xF4 },
+	{ 0x23, 0x8A, 0xF2, 0x7B, 0x00, 0x01, 0x9F, 0xF4, 0x7B, 0x00, 0x08, 0xF4 },
+	{ 0x32, 0x80, 0x01, 0x10, 0x00, 0x12, 0x9F, 0x72, 0x33, 0x00, 0x08, 0xF4 },
+	{ 0x32, 0x80, 0x01, 0x10, 0x00, 0x14, 0x9F, 0x73, 0x33, 0x00, 0x08, 0xF4 },
+	{ 0x31, 0x16, 0x73, 0x8E, 0x00, 0x21, 0x1F, 0x80, 0x9E, 0x00, 0x0E, 0xF4 },
+	{ 0x30, 0x16, 0x73, 0x7E, 0x00, 0x21, 0x1F, 0x80, 0x9E, 0x00, 0x0E, 0x00 },
+	{ 0x31, 0x94, 0x33, 0x73, 0x00, 0x21, 0x1F, 0xA0, 0x97, 0x00, 0x0E, 0xF4 },
+	{ 0x31, 0x94, 0xD3, 0x73, 0x00, 0x21, 0x20, 0xA0, 0x97, 0x00, 0x0E, 0xF4 },
+	{ 0x31, 0x45, 0xF1, 0x53, 0x00, 0x32, 0x1F, 0xF2, 0x27, 0x00, 0x06, 0xF4 },
+	{ 0x13, 0x0C, 0xF2, 0x01, 0x00, 0x15, 0x2F, 0xF2, 0xB6, 0x00, 0x08, 0xF4 },
+	{ 0x11, 0x0C, 0xF2, 0x01, 0x00, 0x11, 0x1F, 0xF2, 0xB6, 0x00, 0x08, 0xF4 },
+	{ 0x11, 0x0A, 0xFE, 0x04, 0x00, 0x11, 0x1F, 0xF2, 0xBD, 0x00, 0x08, 0xF4 },
+	{ 0x16, 0x4D, 0xFA, 0x11, 0x00, 0xE1, 0x20, 0xF1, 0xF1, 0x00, 0x08, 0xF4 },
+	{ 0x16, 0x40, 0xBA, 0x11, 0x00, 0xF1, 0x20, 0x24, 0x31, 0x00, 0x08, 0xF4 },
+	{ 0x61, 0xA7, 0x72, 0x8E, 0x00, 0xE1, 0x9F, 0x50, 0x1A, 0x00, 0x02, 0xF4 },
+	{ 0x18, 0x4D, 0x32, 0x13, 0x00, 0xE1, 0x20, 0x51, 0xE3, 0x00, 0x08, 0xF4 },
+	{ 0x17, 0xC0, 0x12, 0x41, 0x00, 0x31, 0x9F, 0x13, 0x31, 0x00, 0x06, 0xF4 },
+	{ 0x03, 0x8F, 0xF5, 0x55, 0x00, 0x21, 0x9F, 0xF3, 0x33, 0x00, 0x00, 0xF4 },
+	{ 0x13, 0x4D, 0xFA, 0x11, 0x00, 0xE1, 0x20, 0xF1, 0xF1, 0x00, 0x08, 0xF4 },
+	{ 0x11, 0x43, 0x20, 0x15, 0x00, 0xF1, 0x20, 0x31, 0xF8, 0x00, 0x08, 0xF4 },
+	{ 0x11, 0x03, 0x82, 0x97, 0x00, 0xE4, 0x60, 0xF0, 0xF2, 0x00, 0x08, 0xF4 },
+	{ 0x05, 0x40, 0xD1, 0x53, 0x00, 0x14, 0x1F, 0x51, 0x71, 0x00, 0x06, 0xF4 },
+	{ 0xF1, 0x01, 0x77, 0x17, 0x00, 0x21, 0x1F, 0x81, 0x18, 0x00, 0x02, 0xF4 },
+	{ 0xF1, 0x18, 0x32, 0x11, 0x00, 0xE1, 0x1F, 0xF1, 0x13, 0x00, 0x00, 0xF4 },
+	{ 0x73, 0x48, 0xF1, 0x53, 0x00, 0x71, 0x1F, 0xF1, 0x06, 0x00, 0x08, 0xF4 },
+	{ 0x71, 0x8D, 0x71, 0x11, 0x00, 0x61, 0x5F, 0x72, 0x15, 0x00, 0x06, 0xF4 },
+	{ 0xD7, 0x4F, 0xF2, 0x61, 0x00, 0xD2, 0x1F, 0xF1, 0xB2, 0x00, 0x08, 0xF4 },
+	{ 0x01, 0x11, 0xF0, 0xFF, 0x00, 0x01, 0x1F, 0xF0, 0xF8, 0x00, 0x0A, 0xF4 },
+	{ 0x31, 0x8B, 0x41, 0x11, 0x00, 0x61, 0x1F, 0x22, 0x13, 0x00, 0x06, 0xF4 },
+	{ 0x71, 0x1C, 0x71, 0x03, 0x00, 0x21, 0x1F, 0x64, 0x07, 0x00, 0x0E, 0xF4 },
+	{ 0x31, 0x8B, 0x41, 0x11, 0x00, 0x61, 0x1F, 0x32, 0x15, 0x00, 0x02, 0xF4 },
+	{ 0x71, 0x1C, 0xFD, 0x13, 0x00, 0x21, 0x1F, 0xE7, 0xD6, 0x00, 0x0E, 0xF4 },
+	{ 0x71, 0x1C, 0x51, 0x03, 0x00, 0x21, 0x1F, 0x54, 0x67, 0x00, 0x0E, 0xF4 },
+	{ 0x71, 0x1C, 0x51, 0x03, 0x00, 0x21, 0x1F, 0x54, 0x17, 0x00, 0x0E, 0xF4 },
+	{ 0x71, 0x1C, 0x54, 0x15, 0x00, 0x21, 0x1F, 0x53, 0x49, 0x00, 0x0E, 0xF4 },
+	{ 0x71, 0x56, 0x51, 0x03, 0x00, 0x61, 0x1F, 0x54, 0x17, 0x00, 0x0E, 0xF4 },
+	{ 0x71, 0x1C, 0x51, 0x03, 0x00, 0x21, 0x1F, 0x54, 0x17, 0x00, 0x0E, 0xF4 },
+	{ 0x02, 0x29, 0xF5, 0x75, 0x00, 0x01, 0x9F, 0xF2, 0xF3, 0x00, 0x00, 0xF4 },
+	{ 0x02, 0x29, 0xF0, 0x75, 0x00, 0x01, 0x9F, 0xF4, 0x33, 0x00, 0x00, 0xF4 },
+	{ 0x01, 0x49, 0xF1, 0x53, 0x00, 0x11, 0x1F, 0xF1, 0x74, 0x00, 0x06, 0xF4 },
+	{ 0x01, 0x89, 0xF1, 0x53, 0x00, 0x11, 0x1F, 0xF1, 0x74, 0x00, 0x06, 0xF4 },
+	{ 0x02, 0x89, 0xF1, 0x53, 0x00, 0x11, 0x1F, 0xF1, 0x74, 0x00, 0x06, 0xF4 },
+	{ 0x02, 0x80, 0xF1, 0x53, 0x00, 0x11, 0x1F, 0xF1, 0x74, 0x00, 0x06, 0xF4 },
+	{ 0x01, 0x40, 0xF1, 0x53, 0x00, 0x08, 0x5F, 0xF1, 0x53, 0x00, 0x00, 0xF4 },
+	{ 0x21, 0x15, 0xD3, 0x2C, 0x00, 0x21, 0x9F, 0xC3, 0x2C, 0x00, 0x0A, 0xF4 },
+	{ 0x01, 0x18, 0xD4, 0xF2, 0x00, 0x21, 0x9F, 0xC4, 0x8A, 0x00, 0x0A, 0xF4 },
+	{ 0x01, 0x4E, 0xF0, 0x7B, 0x00, 0x11, 0x1F, 0xF4, 0xC8, 0x00, 0x04, 0xF4 },
+	{ 0x01, 0x44, 0xF0, 0xAB, 0x00, 0x11, 0x1F, 0xF3, 0xAB, 0x00, 0x04, 0xF4 },
+	{ 0x53, 0x0E, 0xF4, 0xC8, 0x00, 0x11, 0x1F, 0xF1, 0xBB, 0x00, 0x04, 0xF4 },
+	{ 0x53, 0x0B, 0xF2, 0xC8, 0x00, 0x11, 0x1F, 0xF2, 0xC5, 0x00, 0x04, 0xF4 },
+	{ 0x21, 0x15, 0xB4, 0x4C, 0x00, 0x21, 0x1F, 0x94, 0xAC, 0x00, 0x0A, 0xF4 },
+	{ 0x21, 0x15, 0x94, 0x1C, 0x00, 0x21, 0x1F, 0x64, 0xAC, 0x00, 0x0A, 0xF4 },
+	{ 0x22, 0x1B, 0x97, 0x89, 0x00, 0xA2, 0x1F, 0x70, 0x07, 0x00, 0x0A, 0xF4 },
+	{ 0x21, 0x19, 0x77, 0xBF, 0x00, 0xA1, 0x9F, 0x60, 0x2A, 0x00, 0x06, 0xF4 },
+	{ 0xA1, 0x13, 0xD6, 0xAF, 0x00, 0xE2, 0x9F, 0x60, 0x2A, 0x00, 0x02, 0xF4 },
+	{ 0xA2, 0x1D, 0x95, 0x24, 0x00, 0xE2, 0x9F, 0x60, 0x2A, 0x00, 0x02, 0xF4 },
+	{ 0x32, 0x9A, 0x51, 0x19, 0x00, 0x61, 0x9F, 0x60, 0x39, 0x00, 0x0C, 0xF4 },
+	{ 0xA4, 0x12, 0xF4, 0x30, 0x00, 0xE2, 0x9F, 0x60, 0x2A, 0x00, 0x02, 0xF4 },
+	{ 0x21, 0x16, 0x63, 0x0E, 0x00, 0x21, 0x1F, 0x63, 0x0E, 0x00, 0x0C, 0xF4 },
+	{ 0x31, 0x16, 0x63, 0x0A, 0x00, 0x21, 0x1F, 0x63, 0x0B, 0x00, 0x0C, 0xF4 },
+	{ 0x21, 0x1B, 0x63, 0x0A, 0x00, 0x21, 0x1F, 0x63, 0x0B, 0x00, 0x0C, 0xF4 },
+	{ 0x20, 0x1B, 0x63, 0x0A, 0x00, 0x21, 0x1F, 0x63, 0x0B, 0x00, 0x0C, 0xF4 },
+	{ 0x32, 0x1C, 0x82, 0x18, 0x00, 0x61, 0x9F, 0x60, 0x07, 0x00, 0x0C, 0xF4 },
+	{ 0x32, 0x18, 0x61, 0x14, 0x00, 0xE1, 0x9F, 0x72, 0x16, 0x00, 0x0C, 0xF4 },
+	{ 0x31, 0xC0, 0x77, 0x17, 0x00, 0x22, 0x1F, 0x6B, 0x09, 0x00, 0x02, 0xF4 },
+	{ 0x71, 0xC3, 0x8E, 0x17, 0x00, 0x22, 0x24, 0x8B, 0x0E, 0x00, 0x02, 0xF4 },
+	{ 0x70, 0x8D, 0x6E, 0x17, 0x00, 0x22, 0x1F, 0x6B, 0x0E, 0x00, 0x02, 0xF4 },
+	{ 0x24, 0x4F, 0xF2, 0x06, 0x00, 0x31, 0x1F, 0x52, 0x06, 0x00, 0x0E, 0xF4 },
+	{ 0x31, 0x1B, 0x64, 0x07, 0x00, 0x61, 0x1F, 0xD0, 0x67, 0x00, 0x0E, 0xF4 },
+	{ 0x31, 0x1B, 0x61, 0x06, 0x00, 0x61, 0x1F, 0xD2, 0x36, 0x00, 0x0C, 0xF4 },
+	{ 0x31, 0x1F, 0x31, 0x06, 0x00, 0x61, 0x1F, 0x50, 0x36, 0x00, 0x0C, 0xF4 },
+	{ 0x31, 0x1F, 0x41, 0x06, 0x00, 0x61, 0x1F, 0xA0, 0x36, 0x00, 0x0C, 0xF4 },
+	{ 0x21, 0x9A, 0x53, 0x56, 0x00, 0x21, 0x9F, 0xA0, 0x16, 0x00, 0x0E, 0xF4 },
+	{ 0x21, 0x9A, 0x53, 0x56, 0x00, 0x21, 0x9F, 0xA0, 0x16, 0x00, 0x0E, 0xF4 },
+	{ 0x61, 0x19, 0x53, 0x58, 0x00, 0x21, 0x1F, 0xA0, 0x18, 0x00, 0x0C, 0xF4 },
+	{ 0x61, 0x19, 0x73, 0x57, 0x00, 0x21, 0x1F, 0xA0, 0x17, 0x00, 0x0C, 0xF4 },
+	{ 0x21, 0x1B, 0x71, 0xA6, 0x00, 0x21, 0x1F, 0xA1, 0x96, 0x00, 0x0E, 0xF4 },
+	{ 0x85, 0x91, 0xF5, 0x44, 0x00, 0xA1, 0x1F, 0xF0, 0x45, 0x00, 0x06, 0xF4 },
+	{ 0x07, 0x51, 0xF5, 0x33, 0x00, 0x61, 0x1F, 0xF0, 0x25, 0x00, 0x06, 0xF4 },
+	{ 0x13, 0x8C, 0xFF, 0x21, 0x00, 0x11, 0x9F, 0xFF, 0x03, 0x00, 0x0E, 0xF4 },
+	{ 0x38, 0x8C, 0xF3, 0x0D, 0x00, 0xB1, 0x5F, 0xF5, 0x33, 0x00, 0x0E, 0xF4 },
+	{ 0x87, 0x91, 0xF5, 0x55, 0x00, 0x22, 0x1F, 0xF0, 0x54, 0x00, 0x06, 0xF4 },
+	{ 0xB6, 0x4A, 0xB6, 0x32, 0x00, 0x11, 0x2B, 0xD1, 0x31, 0x00, 0x0E, 0xF4 },
+	{ 0x04, 0x00, 0xFE, 0xF0, 0x00, 0xC2, 0x1F, 0xF6, 0xB5, 0x00, 0x0E, 0xF4 },
+	{ 0x05, 0x4E, 0xDA, 0x15, 0x00, 0x01, 0x9F, 0xF0, 0x13, 0x00, 0x0A, 0xF4 },
+	{ 0x31, 0x44, 0xF2, 0x9A, 0x00, 0x32, 0x1F, 0xF0, 0x27, 0x00, 0x06, 0xF4 },
+	{ 0xB0, 0xC4, 0xA4, 0x02, 0x00, 0xD7, 0x9F, 0x40, 0x42, 0x00, 0x00, 0xF4 },
+	{ 0xCA, 0x84, 0xF0, 0xF0, 0x00, 0xCF, 0x1F, 0x59, 0x62, 0x00, 0x0C, 0xF4 },
+	{ 0x30, 0x35, 0xF5, 0xF0, 0x00, 0x35, 0x1F, 0xF0, 0x9B, 0x00, 0x02, 0xF4 },
+	{ 0x63, 0x0F, 0xF4, 0x04, 0x02, 0x6F, 0x1F, 0xF0, 0x43, 0x00, 0x06, 0xF4 },
+	{ 0x07, 0x40, 0x09, 0x53, 0x00, 0x05, 0x1F, 0xF6, 0x94, 0x00, 0x0E, 0xF4 },
+	{ 0x09, 0x4E, 0xDA, 0x25, 0x00, 0x01, 0x1F, 0xF1, 0x15, 0x00, 0x0A, 0xF4 },
+	{ 0x04, 0x00, 0xF3, 0xA0, 0x02, 0x04, 0x1F, 0xF8, 0x46, 0x00, 0x0E, 0xF4 },
+	{ 0x07, 0x00, 0xF0, 0xF0, 0x00, 0x00, 0x1F, 0x5C, 0xDC, 0x00, 0x0E, 0xF4 },
+	{ 0x1F, 0x1E, 0xE5, 0x5B, 0x00, 0x0F, 0x1F, 0x5D, 0xFA, 0x00, 0x0E, 0xF4 },
+	{ 0x11, 0x8A, 0xF1, 0x11, 0x00, 0x01, 0x5F, 0xF1, 0xB3, 0x00, 0x06, 0xF4 },
+	{ 0x00, 0x40, 0xD1, 0x53, 0x00, 0x00, 0x1F, 0xF2, 0x56, 0x00, 0x0E, 0xF4 },
+	{ 0x32, 0x44, 0xF8, 0xFF, 0x00, 0x11, 0x1F, 0xF5, 0x7F, 0x00, 0x0E, 0xF4 },
+	{ 0x00, 0x40, 0x09, 0x53, 0x00, 0x02, 0x1F, 0xF7, 0x94, 0x00, 0x0E, 0xF4 },
+	{ 0x11, 0x86, 0xF2, 0xA8, 0x00, 0x01, 0x9F, 0xA0, 0xA8, 0x00, 0x08, 0xF4 },
+	{ 0x00, 0x50, 0xF2, 0x70, 0x00, 0x13, 0x1F, 0xF2, 0x72, 0x00, 0x0E, 0xF4 },
+	{ 0xF0, 0x00, 0x11, 0x11, 0x00, 0xE0, 0xDF, 0x11, 0x11, 0x00, 0x0E, 0xF4 }
+};
+
+// hardcoded, dumped from ADHOM.DRV
+uint16 adlib_FrequencyLookUpTable[SHERLOCK_ADLIB_NOTES_COUNT] = {
+	0x0158, 0x016C, 0x0182, 0x0199, 0x01B1, 0x01CB, 0x01E6, 0x0203, 0x0222, 0x0242,
+	0x0265, 0x0289, 0x0558, 0x056C, 0x0582, 0x0599, 0x05B1, 0x05CB, 0x05E6, 0x0603,
+	0x0622, 0x0642, 0x0665, 0x0689, 0x0958, 0x096C, 0x0982, 0x0999, 0x09B1, 0x09CB,
+	0x09E6, 0x0A03, 0x0A22, 0x0A42, 0x0A65, 0x0A89, 0x0D58, 0x0D6C, 0x0D82, 0x0D99,
+	0x0DB1, 0x0DCB, 0x0DE6, 0x0E03, 0x0E22, 0x0E42, 0x0E65, 0x0E89, 0x1158, 0x116C,
+	0x1182, 0x1199, 0x11B1, 0x11CB, 0x11E6, 0x1203, 0x1222, 0x1242, 0x1265, 0x1289,
+	0x1558, 0x156C, 0x1582, 0x1599, 0x15B1, 0x15CB, 0x15E6, 0x1603, 0x1622, 0x1642,
+	0x1665, 0x1689, 0x1958, 0x196C, 0x1982, 0x1999, 0x19B1, 0x19CB, 0x19E6, 0x1A03,
+	0x1A22, 0x1A42, 0x1A65, 0x1A89, 0x1D58, 0x1D6C, 0x1D82, 0x1D99, 0x1DB1, 0x1DCB,
+	0x1DE6, 0x1E03, 0x1E22, 0x1E42, 0x1E65, 0x1E89
+};
+
+class MidiDriver_AdLib : public MidiDriver_Emulated {
+public:
+	MidiDriver_AdLib(Audio::Mixer *mixer)
+		: MidiDriver_Emulated(mixer), _masterVolume(15), _rhythmKeyMap(0), _opl(0) {
+		memset(_voiceChannelMapping, 0, sizeof(_voiceChannelMapping));
+	}
+	virtual ~MidiDriver_AdLib() { }
+
+	// MidiDriver
+	int open();
+	void close();
+	void send(uint32 b);
+	MidiChannel *allocateChannel() { return NULL; }
+	MidiChannel *getPercussionChannel() { return NULL; }
+
+	// AudioStream
+	bool isStereo() const { return false; }
+	int getRate() const { return _mixer->getOutputRate(); }
+	int getPolyphony() const { return SHERLOCK_ADLIB_VOICES_COUNT; }
+	bool hasRhythmChannel() const { return false; }
+
+	// MidiDriver_Emulated
+	void generateSamples(int16 *buf, int len);
+
+	void setVolume(byte volume);
+	virtual uint32 property(int prop, uint32 param);
+
+	bool useRhythmChannel() const { return _rhythmKeyMap != NULL; }
+
+	void newMusicData(byte *musicData, int32 musicDataSize);
+
+private:
+	struct adlib_ChannelEntry {
+		bool inUse;
+		const adlib_InstrumentEntry *currentInstrumentPtr;
+		byte currentNote;
+		byte currentA0hReg;
+		byte currentB0hReg;
+
+		adlib_ChannelEntry() : inUse(false), currentInstrumentPtr(NULL), currentNote(0),
+								currentA0hReg(0), currentB0hReg(0) { }
+	};
+
+	OPL::OPL *_opl;
+	int _masterVolume;
+	byte *_rhythmKeyMap;
+
+	// points to a MIDI channel for each of the new voice channels
+	byte _voiceChannelMapping[SHERLOCK_ADLIB_VOICES_COUNT];
+
+	// stores information about all FM voice channels
+	adlib_ChannelEntry _channels[SHERLOCK_ADLIB_VOICES_COUNT];
+
+	void programChange(byte channel, byte parameter);
+	void setRegister(int reg, int value);
+	void noteOn(byte channel, byte note, byte velocity);
+	void noteOff(byte channel, byte note);
+	void voiceOnOff(byte FMVoiceChannel, bool KeyOn, byte note, byte velocity);
+};
+
+#if USE_SCI_MIDI_PLAYER
+class MidiPlayer_AdLib : public MidiPlayer {
+public:
+	MidiPlayer_AdLib() : MidiPlayer() { _driver = new MidiDriver_AdLib(g_system->getMixer()); }
+	~MidiPlayer_AdLib() {
+		delete _driver;
+		_driver = 0;
+	}
+
+	int open();
+	void close();
+
+	byte getPlayId() const;
+	int getPolyphony() const { return SHERLOCK_ADLIB_VOICES_COUNT; }
+	bool hasRhythmChannel() const { return false; }
+	void setVolume(byte volume) { static_cast<MidiDriver_AdLib *>(_driver)->setVolume(volume); }
+
+	//int getLastChannel() const { return (static_cast<const MidiDriver_AdLib *>(_driver)->useRhythmChannel() ? 8 : 15); }
+
+	void newMusicData(byte *musicData, int32 musicDataSize) { static_cast<MidiDriver_AdLib *>(_driver)->newMusicData(musicData, musicDataSize); }
+};
+#endif
+
+int MidiDriver_AdLib::open() {
+	int rate = _mixer->getOutputRate();
+
+	debug(3, "ADLIB: Starting driver");
+
+	_opl = OPL::Config::create(OPL::Config::kOpl2);
+
+	if (!_opl)
+		return -1;
+
+	_opl->init(rate);
+
+	setRegister(0xBD, 0);
+	setRegister(0x08, 0);
+	setRegister(0x01, 0x20);
+
+	MidiDriver_Emulated::open();
+
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO);
+
+	return 0;
+}
+
+void MidiDriver_AdLib::close() {
+	_mixer->stopHandle(_mixerSoundHandle);
+
+	delete _opl;
+	delete[] _rhythmKeyMap;
+}
+
+void MidiDriver_AdLib::setVolume(byte volume) {
+	_masterVolume = volume;
+	//renewNotes(-1, true);
+}
+
+// Called when a music track got loaded into memory
+void MidiDriver_AdLib::newMusicData(byte *musicData, int32 musicDataSize) {
+	assert(musicDataSize >= 0x7F);
+	// MIDI Channel <-> FM Voice Channel mapping at offset 0x22 of music data
+	memcpy(&_voiceChannelMapping, musicData + 0x22, 9);
+
+	// reset OPL here?
+	// reset current channel data
+	memset(&_channels, 0, sizeof(_channels));
+}
+
+// MIDI messages can be found at http://www.midi.org/techspecs/midimessages.php
+void MidiDriver_AdLib::send(uint32 b) {
+	byte command = b & 0xf0;
+	byte channel = b & 0xf;
+	byte op1 = (b >> 8) & 0xff;
+	byte op2 = (b >> 16) & 0xff;
+
+	switch (command) {
+	case 0x80:
+		noteOff(channel, op1);
+		break;
+	case 0x90:
+		noteOn(channel, op1, op2);
+		break;
+	case 0xb0: // Control change
+		// Doesn't seem to be implemented in the Sherlock Holmes adlib driver
+		break;
+	case 0xc0: // Program Change
+		programChange(channel, op1);
+		break;
+	case 0xa0: // Polyphonic key pressure (aftertouch)
+	case 0xd0: // Channel pressure (aftertouch)
+		// Aftertouch doesn't seem to be implemented in the Sherlock Holmes adlib driver
+		break;
+	case 0xe0:
+		// TODO: Implement this, occurs right in the intro, second scene
+		warning("pitch bend change");
+		break;
+	case 0xf0: // SysEx
+		warning("SysEx: %lx", b);
+		break;
+	default:
+		warning("ADLIB: Unknown event %02x", command);
+	}
+}
+
+void MidiDriver_AdLib::generateSamples(int16 *data, int len) {
+	_opl->readBuffer(data, len);
+}
+
+void MidiDriver_AdLib::noteOn(byte MIDIchannel, byte note, byte velocity) {
+	if (velocity == 0)
+		return noteOff(MIDIchannel, note);
+
+	if (MIDIchannel != 9) {
+		// Not Percussion
+		for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+			if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
+				if (!_channels[FMvoiceChannel].inUse) {
+					_channels[FMvoiceChannel].inUse = true;
+					_channels[FMvoiceChannel].currentNote = note;
+
+					voiceOnOff(FMvoiceChannel, true, note, velocity);
+					return;
+				}
+			}
+		}
+	}
+	warning("MIDI channel not mapped/all FM voice channels busy %d", MIDIchannel);
+}
+
+void MidiDriver_AdLib::noteOff(byte MIDIchannel, byte note) {
+	for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+		if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
+			if (_channels[FMvoiceChannel].currentNote == note) {
+				_channels[FMvoiceChannel].inUse = false;
+
+				voiceOnOff(FMvoiceChannel, false, note, 0);
+				return;
+			}
+		}
+	}
+}
+
+void MidiDriver_AdLib::voiceOnOff(byte FMvoiceChannel, bool keyOn, byte note, byte velocity) {
+	byte frequencyOffset = 0;
+	uint16 frequency = 0;
+	byte op2RegAdjust = 0;
+	byte regValue40h = 0;
+	byte regValueA0h = 0;
+	byte regValueB0h = 0;
+
+	// Look up frequency
+	if (_channels[FMvoiceChannel].currentInstrumentPtr) {
+		frequencyOffset = note + _channels[FMvoiceChannel].currentInstrumentPtr->frequencyAdjust;
+	} else {
+		frequencyOffset = note;
+	}
+	if (frequencyOffset >= SHERLOCK_ADLIB_NOTES_COUNT) {
+		error("bad note!");
+	}
+	frequency = adlib_FrequencyLookUpTable[frequencyOffset];
+
+	if (keyOn) {
+		// adjust register 40h
+		if (_channels[FMvoiceChannel].currentInstrumentPtr) {
+			regValue40h = _channels[FMvoiceChannel].currentInstrumentPtr->reg40op2;
+		}
+		regValue40h = regValue40h - (velocity >> 3);
+		op2RegAdjust = adlib_Operator2Register[FMvoiceChannel];
+		setRegister(0x40 + op2RegAdjust, regValue40h);
+	}
+
+	regValueA0h = frequency & 0xFF;
+	regValueB0h = frequency >> 8;
+	if (keyOn) {
+		regValueB0h |= 0x20; // set Key-On flag
+	}
+
+	setRegister(0xA0 + FMvoiceChannel, regValueA0h);
+	setRegister(0xB0 + FMvoiceChannel, regValueB0h);
+	_channels[FMvoiceChannel].currentA0hReg = regValueA0h;
+	_channels[FMvoiceChannel].currentB0hReg = regValueB0h;
+}
+
+void MidiDriver_AdLib::programChange(byte MIDIchannel, byte op1) {
+	const adlib_InstrumentEntry *instrumentPtr;
+	byte op1Reg = 0;
+	byte op2Reg = 0;
+
+	// setup instrument
+	instrumentPtr = &adlib_instrumentTable[op1];
+	//warning("program change for MIDI channel %d, instrument id %d", MIDIchannel, op1);
+
+	for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+		if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
+
+			op1Reg = adlib_Operator1Register[FMvoiceChannel];
+			op2Reg = adlib_Operator2Register[FMvoiceChannel];
+
+			setRegister(0x20 + op1Reg, instrumentPtr->reg20op1);
+			setRegister(0x40 + op1Reg, instrumentPtr->reg40op1);
+			setRegister(0x60 + op1Reg, instrumentPtr->reg60op1);
+			setRegister(0x80 + op1Reg, instrumentPtr->reg80op1);
+			setRegister(0xE0 + op1Reg, instrumentPtr->regE0op1);
+
+			setRegister(0x20 + op2Reg, instrumentPtr->reg20op2);
+			setRegister(0x40 + op2Reg, instrumentPtr->reg40op2);
+			setRegister(0x60 + op2Reg, instrumentPtr->reg60op2);
+			setRegister(0x80 + op2Reg, instrumentPtr->reg80op2);
+			setRegister(0xE0 + op2Reg, instrumentPtr->regE0op2);
+
+			setRegister(0xC0 + FMvoiceChannel, instrumentPtr->regC0);
+
+			// Remember instrument
+			_channels[FMvoiceChannel].currentInstrumentPtr = instrumentPtr;
+		}
+	}
+}
+void MidiDriver_AdLib::setRegister(int reg, int value) {
+	_opl->write(0x220, reg);
+	_opl->write(0x221, value);
+}
+
+uint32 MidiDriver_AdLib::property(int prop, uint32 param) {
+#if 0
+	switch(prop) {
+	case MIDI_PROP_MASTER_VOLUME:
+		if (param != 0xffff)
+			_masterVolume = param;
+		return _masterVolume;
+	default:
+		break;
+	}
+#endif
+	return 0;
+}
+
+#if USE_SCI_MIDI_PLAYER
+int MidiPlayer_AdLib::open() {
+	return static_cast<MidiDriver_AdLib *>(_driver)->open();
+}
+
+void MidiPlayer_AdLib::close() {
+	if (_driver) {
+		_driver->close();
+	}
+}
+
+byte MidiPlayer_AdLib::getPlayId() const {
+	return 0x00;
+}
+
+MidiPlayer *MidiPlayer_AdLib_create() {
+	return new MidiPlayer_AdLib();
+}
+
+void MidiPlayer_AdLib_newMusicData(MidiPlayer *driver, byte *musicData, int32 musicDataSize) {
+	static_cast<MidiPlayer_AdLib *>(driver)->newMusicData(musicData, musicDataSize);
+}
+#endif
+
+MidiDriver *MidiDriver_AdLib_create() {
+	return new MidiDriver_AdLib(g_system->getMixer());
+}
+
+void MidiDriver_AdLib_newMusicData(MidiDriver *driver, byte *musicData, int32 musicDataSize) {
+	static_cast<MidiDriver_AdLib *>(driver)->newMusicData(musicData, musicDataSize);
+}
+
+} // End of namespace Sci
diff --git a/engines/sherlock/scalpel/drivers/mididriver.h b/engines/sherlock/scalpel/drivers/mididriver.h
new file mode 100644
index 0000000000..f1366f8ebc
--- /dev/null
+++ b/engines/sherlock/scalpel/drivers/mididriver.h
@@ -0,0 +1,91 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SOFTSEQ_MIDIDRIVER_H
+#define SHERLOCK_SOFTSEQ_MIDIDRIVER_H
+
+#include "sherlock/sherlock.h"
+//#include "audio/mididrv.h"
+#include "common/error.h"
+
+namespace Sherlock {
+
+#define USE_SCI_MIDIPLAYER 1
+
+#if USE_SCI_MIDIPLAYER
+enum {
+	MIDI_CHANNELS = 16,
+	MIDI_PROP_MASTER_VOLUME = 0
+};
+
+#define MIDI_RHYTHM_CHANNEL 9
+
+class MidiPlayer : public MidiDriver_BASE {
+protected:
+	MidiDriver *_driver;
+	int8 _reverb;
+
+public:
+	MidiPlayer() : _driver(0), _reverb(-1) { }
+
+	virtual int open() { return _driver->open(); }
+	virtual void close() { _driver->close(); }
+	virtual void send(uint32 b) { _driver->send(b); }
+	virtual uint32 getBaseTempo() { return _driver->getBaseTempo(); }
+	virtual bool hasRhythmChannel() const = 0;
+	virtual void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) { _driver->setTimerCallback(timer_param, timer_proc); }
+
+	virtual byte getPlayId() const = 0;
+	virtual int getPolyphony() const = 0;
+	virtual int getFirstChannel() const { return 0; }
+	//virtual int getLastChannel() const { return 15; }
+
+	virtual void setVolume(byte volume) {
+		if(_driver)
+			_driver->property(MIDI_PROP_MASTER_VOLUME, volume);
+	}
+
+	virtual int getVolume() {
+		return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0;
+	}
+
+	// Returns the current reverb, or -1 when no reverb is active
+	int8 getReverb() const { return _reverb; }
+	// Sets the current reverb, used mainly in MT-32
+	virtual void setReverb(int8 reverb) { _reverb = reverb; }
+
+	// Special stuff for Sherlock Holmes
+//	virtual void newMusicData(byte *musicData, int32 musicDataSize);
+
+//protected:
+};
+
+extern MidiPlayer *MidiPlayer_AdLib_create();
+extern void MidiPlayer_AdLib_newMusicData(MidiPlayer *driver, byte *musicData, int32 musicDataSize);
+#endif
+
+extern MidiDriver *MidiDriver_AdLib_create();
+extern void MidiDriver_AdLib_newMusicData(MidiDriver *driver, byte *musicData, int32 musicDataSize);
+
+} // End of namespace Sci
+
+#endif // SHERLOCK_SOFTSEQ_MIDIDRIVER_H
-- 
cgit v1.2.3


From 21d77e80fc0f5994191998e0d5a6048b869e042d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 01:55:55 +0200
Subject: SHERLOCK: add adlib.cpp to module.mk

---
 engines/sherlock/module.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 701753d679..d8c1d781a9 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/sherlock
 MODULE_OBJS = \
 	scalpel/darts.o \
 	scalpel/scalpel.o \
+	scalpel/drivers/adlib.o \
 	tattoo/tattoo.o \
 	animation.o \
 	debugger.o \
-- 
cgit v1.2.3


From 895189e3ffd1931ca01991731f98bbf74796e05d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 29 May 2015 22:56:34 -0400
Subject: SHERLOCK: More RT doBgAnim code, interface draw

---
 engines/sherlock/objects.cpp                      |  4 ++
 engines/sherlock/objects.h                        |  2 +
 engines/sherlock/scene.h                          | 10 ++--
 engines/sherlock/surface.cpp                      |  6 ++
 engines/sherlock/tattoo/tattoo.cpp                |  4 ++
 engines/sherlock/tattoo/tattoo.h                  |  5 ++
 engines/sherlock/tattoo/tattoo_scene.cpp          | 69 ++++++++++++++++++++++-
 engines/sherlock/tattoo/tattoo_scene.h            |  5 ++
 engines/sherlock/tattoo/tattoo_user_interface.cpp | 46 ++++++++++++++-
 engines/sherlock/tattoo/tattoo_user_interface.h   | 15 +++++
 10 files changed, 159 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 3e8838cb79..8818f805a5 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1151,6 +1151,10 @@ CAnimStream::CAnimStream() {
 	_zPlacement = 0;
 }
 
+void CAnimStream::getNextFrame() {
+	// TODO
+}
+
 /*----------------------------------------------------------------*/
 
 SceneImage::SceneImage() {
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index ec5c2e7897..d671066a23 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -429,6 +429,8 @@ struct CAnimStream {
 	int _zPlacement;				// Used by doBgAnim for determining Z order
 
 	CAnimStream();
+
+	void getNextFrame();
 };
 
 struct SceneImage {
diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h
index 624e4d3c99..37a1b32740 100644
--- a/engines/sherlock/scene.h
+++ b/engines/sherlock/scene.h
@@ -183,11 +183,6 @@ private:
 	 * will remain the same on future visits to the scene
 	 */
 	void saveSceneStatus();
-
-	/**
-	 * Draw all the shapes, people and NPCs in the correct order
-	 */
-	void drawAllShapes();
 protected:
 	SherlockEngine *_vm;
 
@@ -198,6 +193,11 @@ protected:
 	 */
 	virtual void checkBgShapes();
 
+	/**
+	 * Draw all the shapes, people and NPCs in the correct order
+	 */
+	void drawAllShapes();
+
 	Scene(SherlockEngine *vm);
 public:
 	int _currentScene;
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 6cf479c962..5a9e59e01b 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -96,6 +96,12 @@ void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);
 }
 
+void Surface::transBlitFrom(const Surface &src, const Common::Point &pt,
+		bool flipped, int overrideColor) {
+	const Graphics::Surface &s = src._surface;
+	transBlitFrom(s, pt, flipped, overrideColor);
+}
+
 void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	Common::Rect drawRect(0, 0, src.w, src.h);
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 6d90416c34..368b24bfcd 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -68,6 +68,10 @@ void TattooEngine::loadInitialPalette() {
 	delete stream;
 }
 
+void TattooEngine::drawCredits() {
+	// TODO
+}
+
 void TattooEngine::eraseCredits() {
 	// TODO
 }
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index b6a85108e4..bb6310dbe3 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -53,6 +53,11 @@ public:
 	TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc);
 	virtual ~TattooEngine() {}
 
+	/**
+	 * Draw credits on the screen
+	 */
+	void drawCredits();
+
 	/**
 	 * Erase any area of the screen covered by credits
 	 */
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 1effd60682..dd96f3358e 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -196,6 +196,8 @@ void TattooScene::doBgAnimEraseBackground() {
 }
 
 void TattooScene::doBgAnim() {
+	TattooUserInterface &ui = *((TattooUserInterface *)_vm->_ui);
+
 	doBgAnimCheckCursor();
 
 //	Events &events = *_vm->_events;
@@ -208,7 +210,7 @@ void TattooScene::doBgAnim() {
 	talk._talkToAbort = false;
 
 	// Check the characters and sprites for updates
-	for (int idx = 0; idx < MAX_CHARACTERS; ++idx) {
+	for (uint idx = 0; idx < MAX_CHARACTERS; ++idx) {
 		if (people[idx]._type == CHARACTER)
 			people[idx].checkSprite();
 	}
@@ -220,8 +222,73 @@ void TattooScene::doBgAnim() {
 
 	// Erase any affected background areas
 	doBgAnimEraseBackground();
+
+	doBgAnimUpdateBgObjectsAndAnim();
+
+	ui.drawInterface();
+}
+
+void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
+	TattooEngine &vm = *((TattooEngine *)_vm);
+	People &people = *_vm->_people;
+	Screen &screen = *_vm->_screen;
+
+	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
+		Object &obj = _bgShapes[idx];
+		if (obj._type == ACTIVE_BG_SHAPE || obj._type == NO_SHAPE)
+			obj.adjustObject();
+	}
+
+	for (uint idx = 0; idx < MAX_CHARACTERS; ++idx) {
+		if (people[idx]._type == CHARACTER)
+			people[idx].adjustSprite();
+	}
+
+	if (_activeCAnim._images != nullptr != _activeCAnim._zPlacement != REMOVE) {
+		_activeCAnim.getNextFrame();
+	}
+
+	// Flag the bg shapes which need to be redrawn
+	checkBgShapes();
+	drawAllShapes();
+
+
+	if (_mask != nullptr) {
+		switch (_currentScene) {
+		case 7:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x - SHERLOCK_SCREEN_WIDTH, 110), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 110), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x + SHERLOCK_SCREEN_WIDTH, 110), screen._currentScroll);
+			break;
+
+		case 8:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x - SHERLOCK_SCREEN_WIDTH, 180), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 180), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x + SHERLOCK_SCREEN_WIDTH, 180), screen._currentScroll);
+			if (!_vm->readFlags(880))
+				screen._backBuffer1.maskArea((*_mask1)[0], Common::Point(940, 300), screen._currentScroll);
+			break;
+
+		case 18:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 203), screen._currentScroll);
+			if (!_vm->readFlags(189))
+				screen._backBuffer1.maskArea((*_mask1)[0], Common::Point(124 + _maskOffset.x, 239), screen._currentScroll);
+			break;
+
+		case 53:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 110), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x - SHERLOCK_SCREEN_WIDTH, 110), screen._currentScroll);
+			break;
+
+		case 68:
+			screen._backBuffer1.maskArea((*_mask)[0], Common::Point(_maskOffset.x, 203), screen._currentScroll);
+			screen._backBuffer1.maskArea((*_mask1)[0], Common::Point(124 + _maskOffset.x, 239), screen._currentScroll);
+			break;
+		}
+	}
 }
 
+
 void TattooScene::updateBackground() {
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
diff --git a/engines/sherlock/tattoo/tattoo_scene.h b/engines/sherlock/tattoo/tattoo_scene.h
index 5e26eaa455..de28306c1b 100644
--- a/engines/sherlock/tattoo/tattoo_scene.h
+++ b/engines/sherlock/tattoo/tattoo_scene.h
@@ -39,6 +39,11 @@ private:
 	void doBgAnimCheckCursor();
 
 	void doBgAnimEraseBackground();
+
+	/**
+	 * Update the background objects and canimations as part of doBgAnim
+	 */
+	void doBgAnimUpdateBgObjectsAndAnim();
 protected:
 	/**
 	 * Checks all the background shapes. If a background shape is animating,
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 98ec34d62c..e76322833f 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -22,7 +22,7 @@
 
 #include "sherlock/tattoo/tattoo_user_interface.h"
 #include "sherlock/tattoo/tattoo_scene.h"
-#include "sherlock/sherlock.h"
+#include "sherlock/tattoo/tattoo.h"
 
 namespace Sherlock {
 
@@ -31,6 +31,8 @@ namespace Tattoo {
 TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm) {
 	_menuBuffer = nullptr;
 	_invMenuBuffer = nullptr;
+	_tagBuffer = nullptr;
+	_invGraphic = nullptr;
 }
 
 void TattooUserInterface::handleInput() {
@@ -38,6 +40,44 @@ void TattooUserInterface::handleInput() {
 	_vm->_events->pollEventsAndWait();
 }
 
+void TattooUserInterface::drawInterface(int bufferNum) {
+	Screen &screen = *_vm->_screen;
+	TattooEngine &vm = *((TattooEngine *)_vm);
+	
+	if (_invMenuBuffer != nullptr) {
+		Common::Rect r = _invMenuBounds;
+		r.grow(-3);
+		r.translate(-screen._currentScroll, 0);
+		_grayAreas.clear();
+		_grayAreas.push_back(r);
+
+		drawGrayAreas();
+		screen._backBuffer1.transBlitFrom(*_invMenuBuffer, Common::Point(_invMenuBounds.left, _invMenuBounds.top));
+	}
+
+	if (_menuBuffer != nullptr) {
+		Common::Rect r = _menuBounds;
+		r.grow(-3);
+		r.translate(-screen._currentScroll, 0);
+		_grayAreas.clear();
+		_grayAreas.push_back(r);
+
+		drawGrayAreas();
+		screen._backBuffer1.transBlitFrom(*_menuBuffer, Common::Point(_invMenuBounds.left, _invMenuBounds.top));
+	}
+
+	// See if we need to draw a Text Tag floating with the cursor
+	if (_tagBuffer != nullptr)
+		screen._backBuffer1.transBlitFrom(*_tagBuffer, Common::Point(_tagBounds.left, _tagBounds.top));
+
+	// See if we need to draw an Inventory Item Graphic floating with the cursor
+	if (_invGraphic != nullptr)
+		screen._backBuffer1.transBlitFrom(*_invGraphic, Common::Point(_invGraphicBounds.left, _invGraphicBounds.top));
+
+	if (vm._creditsActive)
+		vm.drawCredits();
+}
+
 void TattooUserInterface::doBgAnimRestoreUI() {
 	TattooScene &scene = *((TattooScene *)_vm->_scene);
 	Screen &screen = *_vm->_screen;
@@ -101,6 +141,10 @@ void TattooUserInterface::doScroll() {
 		_invMenuBounds.translate(screen._currentScroll - oldScroll, 0);
 }
 
+void TattooUserInterface::drawGrayAreas() {
+	// TODO
+}
+
 } // End of namespace Tattoo
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
index c7a4c4cf77..2125f1ba07 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.h
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -36,10 +36,20 @@ private:
 	Common::Rect _oldMenuBounds;
 	Common::Rect _invMenuBounds;
 	Common::Rect _oldInvMenuBounds;
+	Common::Rect _tagBounds;
 	Common::Rect _oldTagBounds;
+	Common::Rect _invGraphicBounds;
 	Common::Rect _oldInvGraphicBounds;
 	Surface *_menuBuffer;
 	Surface *_invMenuBuffer;
+	Surface *_tagBuffer;
+	Surface *_invGraphic;
+	Common::Array<Common::Rect> _grayAreas;
+private:
+	/**
+	 * Draws designated areas of the screen that are meant to be grayed out using grayscale colors
+	 */
+	void drawGrayAreas();
 public:
 	TattooUserInterface(SherlockEngine *vm);
 
@@ -59,6 +69,11 @@ public:
 	 * Main input handler for the user interface
 	 */
 	virtual void handleInput();
+
+	/**
+	 * Draw the user interface onto the screen's back buffers
+	 */	
+	virtual void drawInterface(int bufferNum = 3);
 };
 
 } // End of namespace Tattoo
-- 
cgit v1.2.3


From 0141dd1af3ac63801d3fcb80d200b8a4719ba55f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 29 May 2015 23:31:23 -0400
Subject: TSAGE: Showing background of Sherlock Logo scene

---
 engines/tsage/core.cpp                   | 2 +-
 engines/tsage/sherlock/sherlock_logo.cpp | 7 +++++++
 engines/tsage/sherlock/sherlock_logo.h   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 3105a9008e..e8fef014c0 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1521,7 +1521,7 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) {
 	}
 
 	Rect tempRect = bounds;
-	if (g_vm->getGameID() != GType_Ringworld)
+	if (g_vm->getGameID() != GType_Ringworld && g_vm->getGameID() != GType_Sherlock1)
 		tempRect.setHeight(T2_GLOBALS._interfaceY);
 
 	g_globals->_screenSurface.copyFrom(g_globals->_sceneManager._scene->_backSurface,
diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index 58cefe551b..13594c8de0 100644
--- a/engines/tsage/sherlock/sherlock_logo.cpp
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -73,6 +73,13 @@ void SherlockSceneHandler::postInit(SceneObjectList *OwnerList) {
 
 /*--------------------------------------------------------------------------*/
 
+void Object::setVisage(const Common::String &name) {
+	int visageNum = atoi(name.c_str());
+	SceneObject::setVisage(visageNum);
+}
+
+/*--------------------------------------------------------------------------*/
+
 void SherlockLogoScene::Action1::signal() {
 	SherlockLogoScene &scene = *(SherlockLogoScene *)GLOBALS._sceneManager._scene;
 
diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h
index c9fb50e6ef..fcc96386e0 100644
--- a/engines/tsage/sherlock/sherlock_logo.h
+++ b/engines/tsage/sherlock/sherlock_logo.h
@@ -38,7 +38,7 @@ using namespace TsAGE;
 
 class Object : public SceneObject {
 public:
-	void setVisage(const Common::String &name) {}
+	void setVisage(const Common::String &name);
 };
 
 class SherlockLogo: public Game {
-- 
cgit v1.2.3


From bb9586de9e0da450bbc18119bbcd82975f146c27 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 09:40:04 -0400
Subject: TSAGE: Fixes for display of Sherlock Logo scene

---
 engines/tsage/core.cpp                   |  2 +-
 engines/tsage/graphics.cpp               |  3 ++-
 engines/tsage/sherlock/sherlock_logo.cpp | 33 ++++++++++++++++++++++----------
 engines/tsage/sherlock/sherlock_logo.h   |  1 -
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index e8fef014c0..c1c4c27e32 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2806,7 +2806,7 @@ void SceneObject::updateScreen() {
 	srcRect.right = ((srcRect.right + 3) / 4) * 4;
 	srcRect.clip(g_globals->_sceneManager._scene->_sceneBounds);
 
-	if (g_vm->getGameID() != GType_Ringworld) {
+	if (g_vm->getGameID() != GType_Ringworld && g_vm->getGameID() != GType_Sherlock1) {
 		if (T2_GLOBALS._uiElements._visible)
 			srcRect.bottom = MIN<int16>(srcRect.bottom, T2_GLOBALS._interfaceY);
 	}
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index ce24c76290..156503fb51 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1289,7 +1289,8 @@ void GfxManager::setDefaults() {
 
 	_font._edgeSize = Common::Point(1, 1);
 	_font._colors = g_globals->_fontColors;
-	_font.setFontNumber(g_globals->_gfxFontNumber);
+	if (g_globals->_gfxFontNumber >= 0)
+		_font.setFontNumber(g_globals->_gfxFontNumber);
 }
 
 void GfxManager::activate() {
diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index 13594c8de0..437fdc6d94 100644
--- a/engines/tsage/sherlock/sherlock_logo.cpp
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -29,6 +29,9 @@ namespace TsAGE {
 namespace Sherlock {
 
 void SherlockLogo::start() {
+	GLOBALS._gfxFontNumber = -1;
+	GLOBALS.gfxManager().setDefaults();
+
 	// Start the demo's single scene
 	g_globals->_sceneManager.changeScene(1);
 
@@ -85,6 +88,7 @@ void SherlockLogoScene::Action1::signal() {
 
 	switch (_actionIndex++) {
 	case 0:
+		// Load scene palette
 		GLOBALS._scenePalette.loadPalette(1111);
 		GLOBALS._scenePalette.loadPalette(1);
 		GLOBALS._scenePalette.refresh();
@@ -92,10 +96,12 @@ void SherlockLogoScene::Action1::signal() {
 		break;
 
 	case 1:
+		// Fade in the spotlight background
 		GLOBALS._scenePalette.addFader(scene._palette1._palette, 256, 6, this);
 		break;
 
 	case 2:
+		// First half of square, circle, and triangle bouncing
 		scene._object1.postInit();
 		scene._object1.setVisage("0016.vis");
 		scene._object1._strip = 1;
@@ -107,20 +113,22 @@ void SherlockLogoScene::Action1::signal() {
 		break;
 
 	case 3:
+		// Remainder of bouncing square, circle, and triangle coming to rest
 		scene._object1._strip = 2;
-		scene._object1._strip = 1;
+		scene._object1._frame = 1;
 		scene._object1.changeZoom(100);
-		scene._object1.animate(ANIM_MODE_4, 4, 11, 1, this);
+		scene._object1.animate(ANIM_MODE_4, 11, 1, this);
 		break;
 
 	case 4:
+		// Fade out background without fading out the shapes
 		GLOBALS._scenePalette.addFader(scene._palette2._palette, 256, 6, this);
 		break;
 
 	case 5:
-		scene._rect1 = Rect(0, 26, 312, 190);
+		scene._backSurface.fillRect(scene._sceneBounds, 0);
 		scene._gfxManager2.activate();
-		scene._gfxManager2.fillRect(scene._rect1, 0);
+		scene._gfxManager2.fillRect(scene._sceneBounds, 0);
 		scene._gfxManager2.deactivate();
 		//word_2B4AA = 3;
 		setDelay(10);
@@ -133,6 +141,7 @@ void SherlockLogoScene::Action1::signal() {
 		break;
 
 	case 7:
+		// Animation of shapes expanding upwards to form larger EA logo
 		scene._object1.setVisage("0012.vis");
 		scene._object1._strip = 1;
 		scene._object1._frame = 1;
@@ -148,6 +157,7 @@ void SherlockLogoScene::Action1::signal() {
 		break;
 
 	case 9:
+		// Show 'Electronic Arts' company name
 		scene._object2.postInit(nullptr);
 		scene._object2.setVisage("0014.vis");
 		scene._object2._strip = 1;
@@ -159,13 +169,14 @@ void SherlockLogoScene::Action1::signal() {
 		break;
 
 	case 10:
+		// Remainder of steps is positioning and sizing hand cursorin an arc
 		scene._object3.postInit();
-		scene._object2.setVisage("0018.vis");
-		scene._object2._strip = 1;
-		scene._object2._frame = 1;
-		scene._object2.setPosition(Common::Point(33, 91));
-		scene._object2.changeZoom(100);
-		scene._object2.animate(ANIM_MODE_NONE, nullptr);
+		scene._object3.setVisage("0018.vis");
+		scene._object3._strip = 1;
+		scene._object3._frame = 1;
+		scene._object3.setPosition(Common::Point(33, 91));
+		scene._object3.changeZoom(100);
+		scene._object3.animate(ANIM_MODE_NONE, nullptr);
 		setDelay(5);
 		break;
 
@@ -242,6 +253,7 @@ void SherlockLogoScene::Action1::signal() {
 		break;
 
 	case 23:
+		// Show a highlighting of the company name
 		scene._object3.hide();
 		scene._object4.show();
 		scene._object4.setPosition(Common::Point(155, 94));
@@ -316,6 +328,7 @@ void SherlockLogoScene::postInit(SceneObjectList *OwnerList) {
 	loadScene(10);
 	Scene::postInit(OwnerList);
 
+	_palette1.loadPalette(1111);
 	_palette1.loadPalette(10);
 	_palette2.loadPalette(1111);
 	_palette2.loadPalette(1);
diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h
index fcc96386e0..95fc0e272f 100644
--- a/engines/tsage/sherlock/sherlock_logo.h
+++ b/engines/tsage/sherlock/sherlock_logo.h
@@ -65,7 +65,6 @@ public:
 	ScenePalette _palette1, _palette2, _palette3;
 	Object _object1, _object2, _object3, _object4;
 	Action1 _action1;
-	Rect _rect1;
 	GfxManager _gfxManager2;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 37900b18ee177845b70b1a7dc5c7d86c87887640 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 16:23:46 +0200
Subject: SHERLOCK: adlib driver: pitch bend + proper reset

---
 engines/sherlock/scalpel/drivers/adlib.cpp | 105 ++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index 7ee5256138..5786a33234 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -253,11 +253,17 @@ private:
 	// stores information about all FM voice channels
 	adlib_ChannelEntry _channels[SHERLOCK_ADLIB_VOICES_COUNT];
 
-	void programChange(byte channel, byte parameter);
+	void resetAdLib();
+	void resetAdLib_OperatorRegisters(byte baseRegister, byte value);
+	void resetAdLib_FMVoiceChannelRegisters(byte baseRegister, byte value);
+
+	void programChange(byte MIDIchannel, byte parameter);
 	void setRegister(int reg, int value);
-	void noteOn(byte channel, byte note, byte velocity);
-	void noteOff(byte channel, byte note);
+	void noteOn(byte MIDIchannel, byte note, byte velocity);
+	void noteOff(byte MIDIchannel, byte note);
 	void voiceOnOff(byte FMVoiceChannel, bool KeyOn, byte note, byte velocity);
+
+	void pitchBendChange(byte MIDIchannel, byte parameter1, byte parameter2);
 };
 
 #if USE_SCI_MIDI_PLAYER
@@ -295,10 +301,6 @@ int MidiDriver_AdLib::open() {
 
 	_opl->init(rate);
 
-	setRegister(0xBD, 0);
-	setRegister(0x08, 0);
-	setRegister(0x01, 0x20);
-
 	MidiDriver_Emulated::open();
 
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO);
@@ -324,11 +326,56 @@ void MidiDriver_AdLib::newMusicData(byte *musicData, int32 musicDataSize) {
 	// MIDI Channel <-> FM Voice Channel mapping at offset 0x22 of music data
 	memcpy(&_voiceChannelMapping, musicData + 0x22, 9);
 
-	// reset OPL here?
+	// reset OPL
+	resetAdLib();
+
 	// reset current channel data
 	memset(&_channels, 0, sizeof(_channels));
 }
 
+void MidiDriver_AdLib::resetAdLib() {
+
+	setRegister(0x01, 0x20); // enable waveform control on both operators
+	setRegister(0x04, 0xE0); // Timer control
+
+	setRegister(0x08, 0); // select FM music mode
+	setRegister(0xBD, 0); // disable Rhythm
+
+	// reset FM voice instrument data
+	resetAdLib_OperatorRegisters(0x20, 0);
+	resetAdLib_OperatorRegisters(0x60, 0);
+	resetAdLib_OperatorRegisters(0x80, 0);
+	resetAdLib_FMVoiceChannelRegisters(0xA0, 0);
+	resetAdLib_FMVoiceChannelRegisters(0xB0, 0);
+	resetAdLib_FMVoiceChannelRegisters(0xC0, 0);
+	resetAdLib_OperatorRegisters(0xE0, 0);
+	resetAdLib_OperatorRegisters(0x40, 0x3F);
+}
+
+void MidiDriver_AdLib::resetAdLib_OperatorRegisters(byte baseRegister, byte value) {
+	byte operatorIndex;
+
+	for (operatorIndex = 0; operatorIndex < 0x16; operatorIndex++) {
+		switch (operatorIndex) {
+		case 0x06:
+		case 0x07:
+		case 0x0E:
+		case 0x0F:
+			break;
+		default:
+			setRegister(baseRegister + operatorIndex, value);
+		}
+	}
+}
+
+void MidiDriver_AdLib::resetAdLib_FMVoiceChannelRegisters(byte baseRegister, byte value) {
+	byte FMvoiceChannel;
+
+	for (FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+		setRegister(baseRegister + FMvoiceChannel, value);
+	}
+}
+
 // MIDI messages can be found at http://www.midi.org/techspecs/midimessages.php
 void MidiDriver_AdLib::send(uint32 b) {
 	byte command = b & 0xf0;
@@ -354,8 +401,8 @@ void MidiDriver_AdLib::send(uint32 b) {
 		// Aftertouch doesn't seem to be implemented in the Sherlock Holmes adlib driver
 		break;
 	case 0xe0:
-		// TODO: Implement this, occurs right in the intro, second scene
 		warning("pitch bend change");
+		pitchBendChange(channel, op1, op2);
 		break;
 	case 0xf0: // SysEx
 		warning("SysEx: %lx", b);
@@ -395,6 +442,7 @@ void MidiDriver_AdLib::noteOff(byte MIDIchannel, byte note) {
 		if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
 			if (_channels[FMvoiceChannel].currentNote == note) {
 				_channels[FMvoiceChannel].inUse = false;
+				_channels[FMvoiceChannel].currentNote = 0;
 
 				voiceOnOff(FMvoiceChannel, false, note, 0);
 				return;
@@ -444,6 +492,45 @@ void MidiDriver_AdLib::voiceOnOff(byte FMvoiceChannel, bool keyOn, byte note, by
 	_channels[FMvoiceChannel].currentB0hReg = regValueB0h;
 }
 
+void MidiDriver_AdLib::pitchBendChange(byte MIDIchannel, byte parameter1, byte parameter2) {
+	uint16 channelFrequency              = 0;
+	byte   channelRegB0hWithoutFrequency = 0;
+	uint16 parameter                     = 0;
+	byte   regValueA0h = 0;
+	byte   regValueB0h = 0;
+
+	for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+		if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
+			if (_channels[FMvoiceChannel].inUse) {
+				// FM voice channel found and it's currently in use -> apply pitch bend change
+
+				// Remove frequency bits from current channel B0h-register
+				channelFrequency              = ((_channels[FMvoiceChannel].currentB0hReg << 8) | (_channels[FMvoiceChannel].currentA0hReg)) & 0x3FF;
+				channelRegB0hWithoutFrequency = _channels[FMvoiceChannel].currentB0hReg & 0xFC;
+
+				if (parameter2 < 0x40) {
+					channelFrequency = channelFrequency / 2;
+				} else {
+					parameter2 = parameter2 - 0x40;
+				}
+				parameter1 = parameter1 * 2;
+				parameter = parameter1 | (parameter2 << 8);
+				parameter = parameter * 4;
+
+				parameter = (parameter >> 8) + 0xFF;
+				channelFrequency = channelFrequency * parameter;
+				channelFrequency = (channelFrequency >> 8) | (parameter << 8);
+
+				regValueA0h = channelFrequency & 0xFF;
+				regValueB0h = (channelFrequency >> 8) | channelRegB0hWithoutFrequency;
+
+				setRegister(0xA0 + FMvoiceChannel, regValueA0h);
+				setRegister(0xB0 + FMvoiceChannel, regValueB0h);
+			}
+		}
+	}
+}
+
 void MidiDriver_AdLib::programChange(byte MIDIchannel, byte op1) {
 	const adlib_InstrumentEntry *instrumentPtr;
 	byte op1Reg = 0;
-- 
cgit v1.2.3


From 4e404416146c43d8a3aa2175b33e95f84a348eff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 11:17:07 -0400
Subject: TSAGE: Fix incorrectly named header defines

---
 engines/tsage/graphics.h  | 4 ++--
 engines/tsage/resources.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index d65d0bcf8b..25f7aea8cd 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef RING_GRAPHICS_H
-#define RING_GRAPHICS_H
+#ifndef TSAGE_GRAPHICS_H
+#define TSAGE_GRAPHICS_H
 
 #include "tsage/events.h"
 #include "tsage/saveload.h"
diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h
index a7536a3c2d..7aa0c49dd4 100644
--- a/engines/tsage/resources.h
+++ b/engines/tsage/resources.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef RING_RESOURCES_H
-#define RING_RESOURCES_H
+#ifndef TSAGE_RESOURCES_H
+#define TSAGE_RESOURCES_H
 
 #include "common/scummsys.h"
 #include "common/array.h"
-- 
cgit v1.2.3


From 0cc5313689d980fc9855eba6bbdc973c7a9d9e96 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 17:42:36 +0200
Subject: SHERLOCK: midi parser delta reading changed

---
 engines/sherlock/music.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 3e31bcc83d..884fbd6221 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -86,9 +86,15 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 		115, 112,  55, 124, 123,   0,  14, 117  /* 120-127 */
 	};
 
+	// there is no delta right at the start of the music data
+	// this order is essential, otherwise notes will get delayed or even go missing
+	if (_position._playPos != _tracks[0]) {
+		info.delta = *(_position._playPos++);
+	} else {
+		info.delta = 0;
+	}
 
 	info.start = _position._playPos;
-	info.delta = 0;
 
 	info.event = *_position._playPos++;
 	//warning("Event %x", info.event);
@@ -157,8 +163,6 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 		warning("MidiParser_SH::parseNextEvent: Unsupported event code %x", info.event);
 		break;
 	}// switch (info.command())
-
-	info.delta = *(_position._playPos++);
 }
 
 bool MidiParser_SH::loadMusic(byte *data, uint32 size) {
-- 
cgit v1.2.3


From 17aeb5264921ca55f77d190d6ff146e9a54ee5b6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 11:42:21 -0400
Subject: SHERLOCK: Fix non-interactive Scalpel demo

---
 engines/sherlock/events.cpp                         |  6 +++---
 engines/sherlock/scalpel/scalpel_user_interface.cpp | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index a02a06cafc..b238605e13 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -32,8 +32,7 @@ namespace Sherlock {
 
 enum ButtonFlag { LEFT_BUTTON = 1, RIGHT_BUTTON = 2 };
 
-Events::Events(SherlockEngine *vm) {
-	_vm = vm;
+Events::Events(SherlockEngine *vm): _vm(vm) {
 	_cursorImages = nullptr;
 	_cursorId = INVALID_CURSOR;
 	_frameCounter = 1;
@@ -43,7 +42,8 @@ Events::Events(SherlockEngine *vm) {
 	_rightPressed = _rightReleased = false;
 	_oldButtons = _oldRightButton = false;
 
-	loadCursors("rmouse.vgs");
+	if (_vm->_interactiveFl)
+		loadCursors("rmouse.vgs");
 }
 
 Events::~Events() {
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index f9ec8bb1bb..69ab6ecb6b 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -84,8 +84,14 @@ const char *const MUSE[] = {
 
 
 ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) {
-	_controls = new ImageFile("menu.all");
-	_controlPanel = new ImageFile("controls.vgs");
+	if (_vm->_interactiveFl) {
+		_controls = new ImageFile("menu.all");
+		_controlPanel = new ImageFile("controls.vgs");
+	} else {
+		_controls = nullptr;
+		_controlPanel = nullptr;
+	}
+
 	_keyPress = '\0';
 	_lookHelp = 0;
 	_bgFound = 0;
-- 
cgit v1.2.3


From a7f9e4c317aecc179bca6b698922c3b835ca02cc Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 30 May 2015 17:45:39 +0200
Subject: SHERLOCK: Fix compilation with GCC

---
 engines/sherlock/scalpel/scalpel_user_interface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index 8ed69ac8b5..262cd291ed 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -44,7 +44,7 @@ extern const char *const PRESS_KEY_TO_CONTINUE;
 class Settings;
 
 class ScalpelUserInterface: public UserInterface {
-	friend class Inventory;
+	friend class Sherlock::Inventory;
 	friend class Settings;
 	friend class Talk;
 private:
-- 
cgit v1.2.3


From 560bc65fc4e70dfc8f2df3affe2c6ab31afc5a74 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 30 May 2015 17:46:35 +0200
Subject: SHERLOCK: Silence GCC warning.

---
 engines/sherlock/talk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index a5f81f38ba..ebfe8f1732 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -109,7 +109,7 @@ enum OpcodeReturn { RET_EXIT = -1, RET_SUCCESS = 0, RET_CONTINUE = 1 };
 
 class SherlockEngine;
 class Talk;
-namespace Scalpel { class ScalpelUserInterface; };
+namespace Scalpel { class ScalpelUserInterface; }
 
 typedef OpcodeReturn(Talk::*OpcodeMethod)(const byte *&str);
 
-- 
cgit v1.2.3


From 25551111491e216ac4b46741beea13cbaa511b66 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 11:49:34 -0400
Subject: SHERLOCK: Fix incorrect if statement

---
 engines/sherlock/tattoo/tattoo_scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index dd96f3358e..66a66bad74 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -244,7 +244,7 @@ void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
 			people[idx].adjustSprite();
 	}
 
-	if (_activeCAnim._images != nullptr != _activeCAnim._zPlacement != REMOVE) {
+	if (_activeCAnim._images != nullptr && _activeCAnim._zPlacement != REMOVE) {
 		_activeCAnim.getNextFrame();
 	}
 
-- 
cgit v1.2.3


From 442fb847683aa789ae75dcf990040a13691293b6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 12:56:07 -0400
Subject: SHERLOCK: Make some of the scalpel user interface fields public

---
 engines/sherlock/scalpel/scalpel_user_interface.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index 262cd291ed..dbc3945582 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -44,12 +44,9 @@ extern const char *const PRESS_KEY_TO_CONTINUE;
 class Settings;
 
 class ScalpelUserInterface: public UserInterface {
-	friend class Sherlock::Inventory;
 	friend class Settings;
 	friend class Talk;
 private:
-	ImageFile *_controlPanel;
-	ImageFile *_controls;
 	char _keyPress;
 	int _lookHelp;
 	int _bgFound, _oldBgFound;
@@ -63,7 +60,6 @@ private:
 	Common::String _cAnimStr;
 	Common::String _descStr;
 	int _find;
-	int _oldUse;
 private:
 	/**
 	 * Draws the image for a user interface button in the down/pressed state.
@@ -158,6 +154,10 @@ private:
 	 * Print the previously selected object's decription
 	 */
 	void printObjectDesc(const Common::String &str, bool firstTime);
+public:
+	ImageFile *_controlPanel;
+        ImageFile *_controls;
+	int _oldUse;
 public:
 	ScalpelUserInterface(SherlockEngine *vm);
 	virtual ~ScalpelUserInterface();
-- 
cgit v1.2.3


From 1f7555c2ca753c4b68c3a53c651dead981e7b81d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 13:04:22 -0400
Subject: SHERLOCK: Further compilation fixes

---
 engines/sherlock/scalpel/drivers/adlib.cpp        |  2 +-
 engines/sherlock/scalpel/scalpel_user_interface.h | 12 ++++++------
 engines/sherlock/tattoo/tattoo_scene.cpp          |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index 5786a33234..2a56d6a264 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -405,7 +405,7 @@ void MidiDriver_AdLib::send(uint32 b) {
 		pitchBendChange(channel, op1, op2);
 		break;
 	case 0xf0: // SysEx
-		warning("SysEx: %lx", b);
+		warning("SysEx: %x", b);
 		break;
 	default:
 		warning("ADLIB: Unknown event %02x", command);
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index dbc3945582..552bcf00c5 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -79,12 +79,6 @@ private:
 	 */
 	void toggleButton(int num);
 
-	/**
-	 * Creates a text window and uses it to display the in-depth description
-	 * of the highlighted object
-	 */
-	void examine();
-
 	/**
 	 * Print the name of an object in the scene
 	 */
@@ -172,6 +166,12 @@ public:
 	 * (not selected) position
 	 */
 	void restoreButton(int num);
+
+	/**
+	 * Creates a text window and uses it to display the in-depth description
+	 * of the highlighted object
+	 */
+	void examine();
 public:
 	/**
 	 * Resets the user interface
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 66a66bad74..2a13b2a450 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -229,7 +229,6 @@ void TattooScene::doBgAnim() {
 }
 
 void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
-	TattooEngine &vm = *((TattooEngine *)_vm);
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 
@@ -244,7 +243,7 @@ void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
 			people[idx].adjustSprite();
 	}
 
-	if (_activeCAnim._images != nullptr && _activeCAnim._zPlacement != REMOVE) {
+	if ((_activeCAnim._images != nullptr) && (_activeCAnim._zPlacement != REMOVE)) {
 		_activeCAnim.getNextFrame();
 	}
 
-- 
cgit v1.2.3


From a3008e8f010704207f39a857641be3d4c564ccb1 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 30 May 2015 19:18:29 +0200
Subject: FMOPL: Fix confusing "opl_driver" behavior

The way I've configured ScummVM, the default is to use FluidSynth
for MIDI, and any game where I want AdLib overrides that setting.
I have set the DOSBox OPL emulator as the default.

However, this causes the game's "opl_driver" setting to be "auto",
which overrides the default setting, and usually picks the MAME
OPL emulator. To counter this, if it sees that "opl_driver" is
"auto", it will check the default setting.

In other words, only use "auto" if "opl_driver" isn't set on any
level. I think this is the behaviour that should cause the least
amount of astonishment.
---
 audio/fmopl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/audio/fmopl.cpp b/audio/fmopl.cpp
index c18e544410..30229ea6bf 100644
--- a/audio/fmopl.cpp
+++ b/audio/fmopl.cpp
@@ -80,6 +80,12 @@ Config::DriverId Config::detect(OplType type) {
 	}
 
 	DriverId drv = parse(ConfMan.get("opl_driver"));
+	if (drv == kAuto) {
+		// Since the "auto" can be explicitly set for a game, and this
+		// driver shows up in the GUI as "<default>", check if there is
+		// a global setting for it before resorting to auto-detection.
+		drv = parse(ConfMan.get("opl_driver", Common::ConfigManager::kApplicationDomain));
+	}
 
 	// When a valid driver is selected, check whether it supports
 	// the requested OPL chip.
-- 
cgit v1.2.3


From 8b9de5cdc9e59e1eee634f636c0c415044361c7a Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 20:15:20 +0200
Subject: SHERLOCK: implement SysEx 0xFC loop/not loop

---
 engines/sherlock/music.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 884fbd6221..cc66f4c9e1 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -134,6 +134,8 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 		break;
 	case 0xF:
 		if (info.event == 0xFF) {
+			warning("SysEx 0xFF");
+
 			byte type = *(_position._playPos++);
 			switch(type) {
 			case 0x2F:
@@ -150,10 +152,24 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 				break;
 			}
 		} else if (info.event == 0xFC) {
-			allNotesOff();
-			stopPlaying();
-			unloadMusic();
-			return;
+			// Official End-Of-Track signal
+			warning("SysEx 0xFC");
+
+			byte type = *(_position._playPos++);
+			switch (type) {
+			case 0x80: // end of track, triggers looping
+				warning("SysEx triggered looping");
+				jumpToTick(0, true, true, false);
+				break;
+			case 0x81: // end of track, stop playing
+				warning("SysEx triggered music stop");
+				stopPlaying();
+				unloadMusic();
+				break;
+			default:
+				error("MidiParser_SH::parseNextEvent: Unknown SysEx 0xFC type %x", type);
+				break;
+			}
 		} else {
 			warning("TODO: %x / Unknown", info.event);
 			break;
-- 
cgit v1.2.3


From 3dd81bfb355542f27a589ec1267fc495588e3734 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 20:26:03 +0200
Subject: SHERLOCK: renamed SysEx to System META event

---
 engines/sherlock/music.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index cc66f4c9e1..3c85f63e7c 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -153,21 +153,21 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 			}
 		} else if (info.event == 0xFC) {
 			// Official End-Of-Track signal
-			warning("SysEx 0xFC");
+			warning("System META event 0xFC");
 
 			byte type = *(_position._playPos++);
 			switch (type) {
 			case 0x80: // end of track, triggers looping
-				warning("SysEx triggered looping");
+				warning("META event triggered looping");
 				jumpToTick(0, true, true, false);
 				break;
 			case 0x81: // end of track, stop playing
-				warning("SysEx triggered music stop");
+				warning("META event triggered music stop");
 				stopPlaying();
 				unloadMusic();
 				break;
 			default:
-				error("MidiParser_SH::parseNextEvent: Unknown SysEx 0xFC type %x", type);
+				error("MidiParser_SH::parseNextEvent: Unknown META event 0xFC type %x", type);
 				break;
 			}
 		} else {
-- 
cgit v1.2.3


From f3d1ffdaaf74b3ca1b01da16ec85d44d054e2f92 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 21:01:59 +0200
Subject: SHERLOCK: adlib: add support for percussion

---
 engines/sherlock/scalpel/drivers/adlib.cpp | 43 ++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index 2a56d6a264..ca11012b1a 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -45,6 +45,24 @@ byte adlib_Operator2Register[SHERLOCK_ADLIB_VOICES_COUNT] = {
 	0x03, 0x04, 0x05, 0x0B, 0x0C, 0x0D, 0x13, 0x14, 0x15
 };
 
+struct adlib_percussionChannelEntry {
+	byte requiredNote;
+	byte replacementNote;
+};
+
+// hardcoded, dumped from ADHOM.DRV
+const adlib_percussionChannelEntry adlib_percussionChannelTable[SHERLOCK_ADLIB_VOICES_COUNT] = {
+	{ 0x00, 0x00 },
+	{ 0x00, 0x00 },
+	{ 0x00, 0x00 },
+	{ 0x00, 0x00 },
+	{ 0x00, 0x00 },
+	{ 0x00, 0x00 },
+	{ 0x24, 0x0C },
+	{ 0x38, 0x01 },
+	{ 0x26, 0x1E }
+};
+
 struct adlib_InstrumentEntry {
 	byte reg20op1;
 	byte reg40op1;
@@ -433,8 +451,24 @@ void MidiDriver_AdLib::noteOn(byte MIDIchannel, byte note, byte velocity) {
 				}
 			}
 		}
+		warning("MIDI channel not mapped/all FM voice channels busy %d", MIDIchannel);
+	} else {
+		// Percussion channel
+		warning("percussion!");
+		for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+			if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
+				if (note == adlib_percussionChannelTable[FMvoiceChannel].requiredNote) {
+					_channels[FMvoiceChannel].inUse = true;
+					_channels[FMvoiceChannel].currentNote = note;
+
+					voiceOnOff(FMvoiceChannel, true, adlib_percussionChannelTable[FMvoiceChannel].replacementNote, velocity);
+					return;
+				}
+			}
+		}
+		// TODO: driver does some extra things in case no channel is found
+		warning("percussion MIDI channel not mapped/all FM voice channels busy");
 	}
-	warning("MIDI channel not mapped/all FM voice channels busy %d", MIDIchannel);
 }
 
 void MidiDriver_AdLib::noteOff(byte MIDIchannel, byte note) {
@@ -444,7 +478,12 @@ void MidiDriver_AdLib::noteOff(byte MIDIchannel, byte note) {
 				_channels[FMvoiceChannel].inUse = false;
 				_channels[FMvoiceChannel].currentNote = 0;
 
-				voiceOnOff(FMvoiceChannel, false, note, 0);
+				if (MIDIchannel != 9) {
+					// not-percussion
+					voiceOnOff(FMvoiceChannel, false, note, 0);
+				} else {
+					voiceOnOff(FMvoiceChannel, false, adlib_percussionChannelTable[FMvoiceChannel].replacementNote, 0);
+				}
 				return;
 			}
 		}
-- 
cgit v1.2.3


From 52ca97fe63aa1032d32fefab4397df34b825e63b Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 30 May 2015 22:56:13 +0200
Subject: SHERLOCK: midiparser block META event 0xFF for now

---
 engines/sherlock/music.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 3c85f63e7c..c793b4a2ae 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -134,7 +134,7 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 		break;
 	case 0xF:
 		if (info.event == 0xFF) {
-			warning("SysEx 0xFF");
+			error("SysEx META event 0xFF");
 
 			byte type = *(_position._playPos++);
 			switch(type) {
-- 
cgit v1.2.3


From fd33a100a12f4cb5256e5060a231012f17284261 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 17:55:22 -0400
Subject: SHERLOCK: Beginnings of Scalpel logo display

---
 engines/sherlock/module.mk                   |   2 +
 engines/sherlock/resources.cpp               |   4 +-
 engines/sherlock/scalpel/scalpel.cpp         |   5 +-
 engines/sherlock/scalpel/tsage/logo.cpp      | 139 ++++++++++
 engines/sherlock/scalpel/tsage/logo.h        |  77 ++++++
 engines/sherlock/scalpel/tsage/resources.cpp | 373 +++++++++++++++++++++++++++
 engines/sherlock/scalpel/tsage/resources.h   | 139 ++++++++++
 7 files changed, 736 insertions(+), 3 deletions(-)
 create mode 100644 engines/sherlock/scalpel/tsage/logo.cpp
 create mode 100644 engines/sherlock/scalpel/tsage/logo.h
 create mode 100644 engines/sherlock/scalpel/tsage/resources.cpp
 create mode 100644 engines/sherlock/scalpel/tsage/resources.h

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index 9ebe416c4b..1a38d56511 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -4,6 +4,8 @@ MODULE_OBJS = \
 	scalpel/darts.o \
 	scalpel/scalpel.o \
 	scalpel/drivers/adlib.o \
+	scalpel/tsage/logo.o \
+	scalpel/tsage/resources.o \
 	scalpel/scalpel_scene.o \
 	scalpel/scalpel_user_interface.o \
 	scalpel/settings.o \
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index f1c705b522..2e6a0c2d7c 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -255,7 +255,7 @@ Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &so
 }
 
 Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &source, uint32 outSize) {
-	int inSize = (_vm->getGameID() == GType_RoseTattoo) ? source.readUint32LE() : -1;
+	int inSize = (_vm->getGameID() == GType_RoseTattoo) ? source.readSint32LE() : -1;
 	byte *outBuffer = (byte *)malloc(outSize);
 	Common::MemoryReadStream *outStream = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
 
@@ -265,7 +265,7 @@ Common::SeekableReadStream *Resources::decompress(Common::SeekableReadStream &so
 }
 
 void Resources::decompress(Common::SeekableReadStream &source, byte *buffer, uint32 outSize) {
-	int inputSize = (_vm->getGameID() == GType_RoseTattoo) ? source.readUint32LE() : -1;
+	int inputSize = (_vm->getGameID() == GType_RoseTattoo) ? source.readSint32LE() : -1;
 
 	decompressLZ(source, buffer, outSize, inputSize);
 }
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 304445df76..43b69068ab 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -20,11 +20,12 @@
  *
  */
 
+#include "engines/util.h"
 #include "sherlock/scalpel/scalpel.h"
+#include "sherlock/scalpel/tsage/logo.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/music.h"
 #include "sherlock/animation.h"
-#include "engines/util.h"
 
 namespace Sherlock {
 
@@ -423,6 +424,8 @@ void ScalpelEngine::showOpening() {
 	if (isDemo() && _interactiveFl)
 		return;
 
+	if (!TsAGE::Logo::show(this))
+		return;
 	if (!showCityCutscene())
 		return;
 	if (!showAlleyCutscene())
diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
new file mode 100644
index 0000000000..fb8566229e
--- /dev/null
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -0,0 +1,139 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "sherlock/scalpel/tsage/logo.h"
+#include "sherlock/scalpel/scalpel.h"
+
+namespace Sherlock {
+namespace Scalpel {
+namespace TsAGE {
+
+bool Logo::show(ScalpelEngine *vm) {
+	Events &events = *vm->_events;
+	Logo *logo = new Logo(vm);
+	bool interrupted = false;
+
+	while (!logo->finished()) {
+		logo->nextFrame();
+
+		events.wait(2);
+		events.setButtonState();
+
+		interrupted = vm->shouldQuit() || events.kbHit() || events._pressed;
+		if (interrupted) {
+			events.clearEvents();
+			break;
+		}
+	}
+
+	delete logo;
+	return !interrupted;
+}
+
+Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb"), _surface(vm->_screen->w(), vm->_screen->h()) {
+	// Initialize frame counter
+	_counter = 0;
+	
+	// Set up the palettes
+	Common::fill(&_palette1[0], &_palette1[PALETTE_SIZE], 0);
+	Common::fill(&_palette1[0], &_palette2[PALETTE_SIZE], 0);
+	Common::fill(&_palette1[0], &_palette3[PALETTE_SIZE], 0);
+
+	_lib.getPalette(_palette1, 1111);
+	_lib.getPalette(_palette1, 10);
+	_lib.getPalette(_palette2, 1111);
+	_lib.getPalette(_palette2, 1);
+	_lib.getPalette(_palette3, 1111);
+	_lib.getPalette(_palette3, 14);
+}
+
+bool Logo::finished() const {
+	return false;
+}
+
+void Logo::nextFrame() {
+
+	switch (_counter++) {
+	case 0:
+		loadBackground();
+		fade(_palette1);
+		break;
+
+	default:
+		break;
+	}
+}
+
+void Logo::loadBackground() {
+	Screen &screen = *_vm->_screen;
+	
+	for (int idx = 0; idx < 4; ++idx) {
+		// Get the portion of the screen
+		Common::SeekableReadStream *stream = _lib.getResource(RES_BITMAP, 10, idx);
+
+		// Load it onto the surface
+		Common::Point pt((idx / 2) * (_surface.w() / 2), (idx % 2) * (_surface.h() / 2));
+		for (int y = 0; y < (_surface.h() / 2); ++y, ++pt.y) {
+			byte *pDest = (byte *)_surface.getBasePtr(pt.x, pt.y);
+			stream->read(pDest, _surface.w() / 2);
+		}
+
+		//	_backgroundBounds = Rect(0, 0, READ_LE_UINT16(data), READ_LE_UINT16(data + 2));
+		delete stream;
+	}
+
+	// Default to a blank palette
+	byte palette[PALETTE_SIZE];
+	Common::fill(&palette[0], &palette[PALETTE_SIZE], 0);
+	screen.setPalette(palette);
+
+	// Copy the surface to the screen
+	screen.blitFrom(_surface);
+}
+
+void Logo::fade(const byte palette[PALETTE_SIZE]) {
+	Events &events = *_vm->_events;
+	Screen &screen = *_vm->_screen;
+	byte tempPalette[PALETTE_SIZE];
+
+	for (int percent = 0; percent < 100; percent += 6) {
+		for (int palIndex = 0; palIndex < 256; ++palIndex) {
+			const byte *palP = (const byte *)&palette[palIndex * 3];
+			byte *destP = &tempPalette[palIndex * 3];
+
+			for (int rgbIndex = 0; rgbIndex < 3; ++rgbIndex, ++palP, ++destP) {
+				*destP = (int)*palP * percent / 100;
+			}
+		}
+
+		screen.setPalette(tempPalette);
+		events.wait(1);
+	}
+
+	// Set final palette
+	screen.setPalette(palette);
+}
+
+} // end of namespace TsAGE
+} // end of namespace Scalpel
+} // end of namespace Sherlock
diff --git a/engines/sherlock/scalpel/tsage/logo.h b/engines/sherlock/scalpel/tsage/logo.h
new file mode 100644
index 0000000000..4adbe95ff4
--- /dev/null
+++ b/engines/sherlock/scalpel/tsage/logo.h
@@ -0,0 +1,77 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCALPEL_TSAGE_LOGO_H
+#define SHERLOCK_SCALPEL_TSAGE_LOGO_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/file.h"
+#include "common/list.h"
+#include "common/str.h"
+#include "common/str-array.h"
+#include "common/util.h"
+#include "graphics/surface.h"
+#include "sherlock/scalpel/tsage/resources.h"
+#include "sherlock/screen.h"
+
+namespace Sherlock {
+namespace Scalpel {
+
+class ScalpelEngine;
+
+namespace TsAGE {
+
+class Logo {
+private:
+	ScalpelEngine *_vm;
+	TLib _lib;
+	Surface _surface;
+	int _counter;
+	byte _palette1[PALETTE_SIZE];
+	byte _palette2[PALETTE_SIZE];
+	byte _palette3[PALETTE_SIZE];
+
+	Logo(ScalpelEngine *vm);
+
+	void nextFrame();
+
+	bool finished() const;
+
+	/**
+	 * Load the background for the scene
+	 */
+	void loadBackground();
+
+	/**
+	 * Fade from the current palette to a new one
+	 */
+	void fade(const byte palette[PALETTE_SIZE]);
+public:
+	static bool show(ScalpelEngine *vm);
+};
+
+} // end of namespace TsAGE
+} // end of namespace Scalpel
+} // end of namespace Sherlock
+
+#endif
diff --git a/engines/sherlock/scalpel/tsage/resources.cpp b/engines/sherlock/scalpel/tsage/resources.cpp
new file mode 100644
index 0000000000..56b7021563
--- /dev/null
+++ b/engines/sherlock/scalpel/tsage/resources.cpp
@@ -0,0 +1,373 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/memstream.h"
+#include "common/stack.h"
+#include "sherlock/scalpel/tsage/resources.h"
+
+namespace Sherlock {
+namespace Scalpel {
+namespace TsAGE {
+
+static uint16 bitMasks[4] = {0x1ff, 0x3ff, 0x7ff, 0xfff};
+
+uint16 BitReader::readToken() {
+	assert((numBits >= 9) && (numBits <= 12));
+	uint16 result = _remainder;
+	int bitsLeft = numBits - _bitsLeft;
+	int bitOffset = _bitsLeft;
+	_bitsLeft = 0;
+
+	while (bitsLeft >= 0) {
+		_remainder = readByte();
+		result |= _remainder << bitOffset;
+		bitsLeft -= 8;
+		bitOffset += 8;
+	}
+
+	_bitsLeft = -bitsLeft;
+	_remainder >>= 8 - _bitsLeft;
+	return result & bitMasks[numBits - 9];
+}
+
+/*-------------------------------------------------------------------------*/
+
+TLib::TLib(const Common::String &filename) : _filename(filename) {
+
+	// If the resource strings list isn't yet loaded, load them
+	if (_resStrings.size() == 0) {
+		Common::File f;
+		if (f.open("tsage.cfg")) {
+			while (!f.eos()) {
+				_resStrings.push_back(f.readLine());
+			}
+			f.close();
+		}
+	}
+
+	if (!_file.open(filename))
+		error("Missing file %s", filename.c_str());
+
+	loadIndex();
+}
+
+TLib::~TLib() {
+	_resStrings.clear();
+}
+
+/**
+ * Load a section index from the given position in the file
+ */
+void TLib::loadSection(uint32 fileOffset) {
+	_resources.clear();
+	_file.seek(fileOffset);
+	_sections.fileOffset = fileOffset;
+
+	loadSection(_file, _resources);
+}
+
+struct DecodeReference {
+	uint16 vWord;
+	uint8 vByte;
+};
+
+/**
+ * Gets a resource from the currently loaded section
+ */
+Common::SeekableReadStream *TLib::getResource(uint16 id, bool suppressErrors) {
+	// Scan for an entry for the given Id
+	ResourceEntry *re = nullptr;
+	ResourceList::iterator iter;
+	for (iter = _resources.begin(); iter != _resources.end(); ++iter) {
+		if ((*iter).id == id) {
+			re = &(*iter);
+			break;
+		}
+	}
+	if (!re) {
+		if (suppressErrors)
+			return nullptr;
+		error("Could not find resource Id #%d", id);
+	}
+
+	if (!re->isCompressed) {
+		// Read in the resource data and return it
+		byte *dataP = (byte *)malloc(re->size);
+		_file.seek(_sections.fileOffset + re->fileOffset);
+		_file.read(dataP, re->size);
+
+		return new Common::MemoryReadStream(dataP, re->size, DisposeAfterUse::YES);
+	}
+
+	/*
+	 * Decompress the data block
+	 */
+
+	_file.seek(_sections.fileOffset + re->fileOffset);
+	Common::ReadStream *compStream = _file.readStream(re->size);
+	BitReader bitReader(*compStream);
+
+	byte *dataOut = (byte *)malloc(re->uncompressedSize);
+	byte *destP = dataOut;
+	uint bytesWritten = 0;
+
+	uint16 ctrCurrent = 0x102, ctrMax = 0x200;
+	uint16 word_48050 = 0, currentToken = 0, word_48054 =0;
+	byte byte_49068 = 0, byte_49069 = 0;
+
+	const uint tableSize = 0x1000;
+	DecodeReference *table = (DecodeReference *)malloc(tableSize * sizeof(DecodeReference));
+	if (!table)
+		error("[TLib::getResource] Cannot allocate table buffer");
+
+	for (uint i = 0; i < tableSize; ++i) {
+		table[i].vByte = table[i].vWord = 0;
+	}
+	Common::Stack<uint16> tokenList;
+
+	for (;;) {
+		// Get the next decode token
+		uint16 token = bitReader.readToken();
+
+		// Handle the token
+		if (token == 0x101) {
+			// End of compressed stream
+			break;
+		} else if (token == 0x100) {
+			// Reset bit-rate
+			bitReader.numBits = 9;
+			ctrMax = 0x200;
+			ctrCurrent = 0x102;
+
+			// Set variables with next token
+			currentToken = word_48050 = bitReader.readToken();
+			byte_49069 = byte_49068 = (byte)currentToken;
+
+			++bytesWritten;
+			assert(bytesWritten <= re->uncompressedSize);
+			*destP++ = byte_49069;
+		} else {
+			word_48054 = word_48050 = token;
+
+			if (token >= ctrCurrent) {
+				word_48050 = currentToken;
+				tokenList.push(byte_49068);
+			}
+
+			while (word_48050 >= 0x100) {
+				assert(word_48050 < 0x1000);
+				tokenList.push(table[word_48050].vByte);
+				word_48050 = table[word_48050].vWord;
+			}
+
+			byte_49069 = byte_49068 = (byte)word_48050;
+			tokenList.push(word_48050);
+
+			// Write out any cached tokens
+			while (!tokenList.empty()) {
+				++bytesWritten;
+				assert(bytesWritten <= re->uncompressedSize);
+				*destP++ = tokenList.pop();
+			}
+
+			assert(ctrCurrent < 0x1000);
+			table[ctrCurrent].vByte = byte_49069;
+			table[ctrCurrent].vWord = currentToken;
+			++ctrCurrent;
+
+			currentToken = word_48054;
+			if ((ctrCurrent >= ctrMax) && (bitReader.numBits != 12)) {
+				// Move to the next higher bit-rate
+				++bitReader.numBits;
+				ctrMax <<= 1;
+			}
+		}
+	}
+
+	free(table);
+
+	assert(bytesWritten == re->uncompressedSize);
+	delete compStream;
+	return new Common::MemoryReadStream(dataOut, re->uncompressedSize, DisposeAfterUse::YES);
+}
+
+/**
+ * Finds the correct section and loads the specified resource within it
+ */
+Common::SeekableReadStream *TLib::getResource(ResourceType resType, uint16 resNum, uint16 rlbNum, bool suppressErrors) {
+	SectionList::iterator i = _sections.begin();
+	while ((i != _sections.end()) && ((*i).resType != resType || (*i).resNum != resNum))
+		++i;
+	if (i == _sections.end()) {
+		if (suppressErrors)
+			return nullptr;
+		error("Unknown resource type %d num %d", resType, resNum);
+	}
+
+	loadSection((*i).fileOffset);
+
+	return getResource(rlbNum, suppressErrors);
+}
+
+/**
+ * Gets the offset of the start of a resource in the resource file
+ */
+uint32 TLib::getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum, ResourceEntry &entry) {
+	// Find the correct section
+	SectionList::iterator i = _sections.begin();
+	while ((i != _sections.end()) && ((*i).resType != resType || (*i).resNum != resNum))
+		++i;
+	if (i == _sections.end()) {
+		error("Unknown resource type %d num %d", resType, resNum);
+	}
+
+	// Load in the section index
+	loadSection((*i).fileOffset);
+
+	// Scan for an entry for the given Id
+	ResourceEntry *re = nullptr;
+	ResourceList::iterator iter;
+	for (iter = _resources.begin(); iter != _resources.end(); ++iter) {
+		if ((*iter).id == rlbNum) {
+			re = &(*iter);
+			break;
+		}
+	}
+
+	// Throw an error if no resource was found, or the resource is compressed
+	if (!re || re->isCompressed)
+		error("Invalid resource Id #%d", rlbNum);
+
+	// Return the resource entry as well as the file offset
+	entry = *re;
+	return _sections.fileOffset + entry.fileOffset;
+}
+
+void TLib::loadIndex() {
+	uint16 resNum, configId, fileOffset;
+
+	// Load the root resources section
+	loadSection(0);
+
+	// Get the single resource from it
+	Common::SeekableReadStream *stream = getResource(0);
+
+	_sections.clear();
+
+	// Loop through reading the entries
+	while ((resNum = stream->readUint16LE()) != 0xffff) {
+		configId = stream->readUint16LE();
+		fileOffset = stream->readUint16LE();
+
+		SectionEntry se;
+		se.resNum = resNum;
+		se.resType = (ResourceType)(configId & 0x1f);
+		se.fileOffset = (((configId >> 5) & 0x7ff) << 16) | fileOffset;
+
+		_sections.push_back(se);
+	}
+
+	delete stream;
+}
+
+/**
+ * Retrieves the specified palette resource and returns it's data
+ *
+ * @paletteNum Specefies the palette number
+ */
+void TLib::getPalette(byte palette[PALETTE_SIZE], int paletteNum) {
+	// Get the specified palette
+	Common::SeekableReadStream *stream = getResource(RES_PALETTE, paletteNum, 0, true);
+	if (!stream)
+		return;
+
+	int startNum = stream->readUint16LE();
+	int numEntries = stream->readUint16LE();
+	assert((startNum < 256) && ((startNum + numEntries) <= 256));
+	stream->skip(2);
+
+	// Copy over the data
+	stream->read(&palette[startNum * 3], numEntries * 3);
+
+	delete stream;
+}
+
+/**
+ * Open up the given resource file using a passed file object. If the desired entry is found
+ * in the index, return the index entry for it, and move the file to the start of the resource
+ */
+bool TLib::scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum,
+									  ResourceEntry &resEntry) {
+	// Load the root section index
+	ResourceList resList;
+	loadSection(f, resList);
+
+	// Loop through the index for the desired entry
+	ResourceList::iterator iter;
+	for (iter = resList.begin(); iter != resList.end(); ++iter) {
+		ResourceEntry &re = *iter;
+		if (re.id == resNum) {
+			// Found it, so exit
+			resEntry = re;
+			f.seek(re.fileOffset);
+			return true;
+		}
+	}
+
+	// No matching entry found
+	return false;
+}
+
+/**
+ * Inner logic for decoding a section index into a passed resource list object
+ */
+void TLib::loadSection(Common::File &f, ResourceList &resources) {
+	if (f.readUint32BE() != 0x544D492D)
+		error("Data block is not valid Rlb data");
+
+	/*uint8 unknown1 = */f.readByte();
+	uint16 numEntries = f.readByte();
+
+	for (uint i = 0; i < numEntries; ++i) {
+		uint16 id = f.readUint16LE();
+		uint16 size = f.readUint16LE();
+		uint16 uncSize = f.readUint16LE();
+		uint8 sizeHi = f.readByte();
+		uint8 type = f.readByte() >> 5;
+		assert(type <= 1);
+		uint32 offset = f.readUint32LE();
+
+		ResourceEntry re;
+		re.id = id;
+		re.fileOffset = offset;
+		re.isCompressed = type != 0;
+		re.size = ((sizeHi & 0xF) << 16) | size;
+		re.uncompressedSize = ((sizeHi & 0xF0) << 12) | uncSize;
+
+		resources.push_back(re);
+	}
+}
+
+} // end of namespace TsAGE
+} // end of namespace Scalpel
+} // end of namespace Sherlock
diff --git a/engines/sherlock/scalpel/tsage/resources.h b/engines/sherlock/scalpel/tsage/resources.h
new file mode 100644
index 0000000000..3e09b6b0b1
--- /dev/null
+++ b/engines/sherlock/scalpel/tsage/resources.h
@@ -0,0 +1,139 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SHERLOCK_SCALPEL_TSAGE_RESOURCES_H
+#define SHERLOCK_SCALPEL_TSAGE_RESOURCES_H
+
+#include "common/scummsys.h"
+#include "common/array.h"
+#include "common/file.h"
+#include "common/list.h"
+#include "common/str.h"
+#include "common/str-array.h"
+#include "common/util.h"
+#include "graphics/surface.h"
+#include "sherlock/screen.h"
+
+namespace Sherlock {
+namespace Scalpel {
+namespace TsAGE {
+
+// Magic number used by original game to identify valid memory blocks
+const uint32 MEMORY_ENTRY_ID = 0xE11DA722;
+
+const int MEMORY_POOL_SIZE = 1000;
+
+enum ResourceType { RES_LIBRARY, RES_STRIP, RES_IMAGE, RES_PALETTE, RES_VISAGE, RES_SOUND, RES_MESSAGE,
+		RES_FONT, RES_POINTER, RES_BANK, RES_SND_DRIVER, RES_PRIORITY, RES_CONTROL, RES_WALKRGNS,
+		RES_BITMAP, RES_SAVE, RES_SEQUENCE,
+		// Return to Ringworld specific resource types
+		RT17, RT18, RT19, RT20, RT21, RT22, RT23, RT24, RT25, RT26, RT27, RT28, RT29, RT30, RT31
+};
+
+class SectionEntry {
+public:
+	ResourceType resType;
+	uint16 resNum;
+	uint32 fileOffset;
+
+	SectionEntry() {
+		resType = RES_LIBRARY;
+		resNum = 0;
+		fileOffset = 0;
+	}
+};
+
+class ResourceEntry {
+public:
+	uint16 id;
+	bool isCompressed;
+	uint32 fileOffset;
+	uint32 size;
+	uint32 uncompressedSize;
+
+	ResourceEntry() {
+		id = 0;
+		isCompressed = false;
+		fileOffset = 0;
+		size = 0;
+		uncompressedSize = 0;
+	}
+};
+
+typedef Common::List<ResourceEntry> ResourceList;
+
+class SectionList : public Common::List<SectionEntry> {
+public:
+	uint32 fileOffset;
+
+	SectionList() {
+		fileOffset = 0;
+	}
+};
+
+class BitReader {
+private:
+	Common::ReadStream &_stream;
+	uint8 _remainder, _bitsLeft;
+	byte readByte() { return _stream.eos() ? 0 : _stream.readByte(); }
+public:
+	BitReader(Common::ReadStream &s) : _stream(s) {
+		numBits = 9;
+		_remainder = 0;
+		_bitsLeft = 0;
+	}
+	uint16 readToken();
+
+	int numBits;
+};
+
+class TLib {
+private:
+	Common::StringArray _resStrings;
+private:
+	Common::File _file;
+	Common::String _filename;
+	ResourceList _resources;
+	SectionList _sections;
+
+	void loadSection(uint32 fileOffset);
+	void loadIndex();
+
+	static bool scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum, ResourceEntry &resEntry);
+	static void loadSection(Common::File &f, ResourceList &resources);
+public:
+	TLib(const Common::String &filename);
+	~TLib();
+
+	const Common::String &getFilename() { return _filename; }
+	const SectionList &getSections() { return _sections; }
+	Common::SeekableReadStream *getResource(uint16 id, bool suppressErrors = false);
+	Common::SeekableReadStream *getResource(ResourceType resType, uint16 resNum, uint16 rlbNum, bool suppressErrors = false);
+	uint32 getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum, ResourceEntry &entry);
+	void getPalette(byte palette[PALETTE_SIZE], int paletteNum);
+};
+
+} // end of namespace TsAGE
+} // end of namespace Scalpel
+} // end of namespace Sherlock
+
+#endif
-- 
cgit v1.2.3


From 9da6a9071398711b05790c9a5c3b3cdbe125032c Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 31 May 2015 00:34:29 +0200
Subject: SHERLOCK: adlib: implement in-use-channel usage

---
 engines/sherlock/scalpel/drivers/adlib.cpp | 63 ++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index ca11012b1a..c1dbddbc04 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -221,7 +221,7 @@ uint16 adlib_FrequencyLookUpTable[SHERLOCK_ADLIB_NOTES_COUNT] = {
 class MidiDriver_AdLib : public MidiDriver_Emulated {
 public:
 	MidiDriver_AdLib(Audio::Mixer *mixer)
-		: MidiDriver_Emulated(mixer), _masterVolume(15), _rhythmKeyMap(0), _opl(0) {
+		: MidiDriver_Emulated(mixer), _masterVolume(15), _opl(0) {
 		memset(_voiceChannelMapping, 0, sizeof(_voiceChannelMapping));
 	}
 	virtual ~MidiDriver_AdLib() { }
@@ -245,25 +245,23 @@ public:
 	void setVolume(byte volume);
 	virtual uint32 property(int prop, uint32 param);
 
-	bool useRhythmChannel() const { return _rhythmKeyMap != NULL; }
-
 	void newMusicData(byte *musicData, int32 musicDataSize);
 
 private:
 	struct adlib_ChannelEntry {
-		bool inUse;
-		const adlib_InstrumentEntry *currentInstrumentPtr;
-		byte currentNote;
-		byte currentA0hReg;
-		byte currentB0hReg;
-
-		adlib_ChannelEntry() : inUse(false), currentInstrumentPtr(NULL), currentNote(0),
+		bool   inUse;
+		uint16 inUseTimer;
+		const  adlib_InstrumentEntry *currentInstrumentPtr;
+		byte   currentNote;
+		byte   currentA0hReg;
+		byte   currentB0hReg;
+
+		adlib_ChannelEntry() : inUse(false), inUseTimer(0), currentInstrumentPtr(NULL), currentNote(0),
 								currentA0hReg(0), currentB0hReg(0) { }
 	};
 
 	OPL::OPL *_opl;
 	int _masterVolume;
-	byte *_rhythmKeyMap;
 
 	// points to a MIDI channel for each of the new voice channels
 	byte _voiceChannelMapping[SHERLOCK_ADLIB_VOICES_COUNT];
@@ -271,6 +269,8 @@ private:
 	// stores information about all FM voice channels
 	adlib_ChannelEntry _channels[SHERLOCK_ADLIB_VOICES_COUNT];
 
+	void updateChannelInUseTimers();
+
 	void resetAdLib();
 	void resetAdLib_OperatorRegisters(byte baseRegister, byte value);
 	void resetAdLib_FMVoiceChannelRegisters(byte baseRegister, byte value);
@@ -330,7 +330,6 @@ void MidiDriver_AdLib::close() {
 	_mixer->stopHandle(_mixerSoundHandle);
 
 	delete _opl;
-	delete[] _rhythmKeyMap;
 }
 
 void MidiDriver_AdLib::setVolume(byte volume) {
@@ -338,6 +337,17 @@ void MidiDriver_AdLib::setVolume(byte volume) {
 	//renewNotes(-1, true);
 }
 
+// this should normally get called per tick
+// but calling it per send() shouldn't be a problem
+// TODO: maybe change inUseTimer to a 32-bit integer to make sure there are no overruns?!?!
+void MidiDriver_AdLib::updateChannelInUseTimers() {
+	for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+		if (_channels[FMvoiceChannel].inUse) {
+			_channels[FMvoiceChannel].inUseTimer++;
+		}
+	}
+}
+
 // Called when a music track got loaded into memory
 void MidiDriver_AdLib::newMusicData(byte *musicData, int32 musicDataSize) {
 	assert(musicDataSize >= 0x7F);
@@ -401,6 +411,8 @@ void MidiDriver_AdLib::send(uint32 b) {
 	byte op1 = (b >> 8) & 0xff;
 	byte op2 = (b >> 16) & 0xff;
 
+	updateChannelInUseTimers();
+
 	switch (command) {
 	case 0x80:
 		noteOff(channel, op1);
@@ -435,6 +447,9 @@ void MidiDriver_AdLib::generateSamples(int16 *data, int len) {
 }
 
 void MidiDriver_AdLib::noteOn(byte MIDIchannel, byte note, byte velocity) {
+	int16  oldestInUseChannel = -1;
+	uint16 oldestInUseTimer   = 0;
+
 	if (velocity == 0)
 		return noteOff(MIDIchannel, note);
 
@@ -451,7 +466,29 @@ void MidiDriver_AdLib::noteOn(byte MIDIchannel, byte note, byte velocity) {
 				}
 			}
 		}
+
+		// Look for oldest in-use channel
+		for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
+			if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
+				if (_channels[FMvoiceChannel].inUseTimer > oldestInUseTimer) {
+					oldestInUseTimer   = _channels[FMvoiceChannel].inUseTimer;
+					oldestInUseChannel = FMvoiceChannel;
+				}
+			}
+		}
+		if (oldestInUseChannel >= 0) {
+			// channel found
+			warning("used In-Use channel");
+			voiceOnOff(oldestInUseChannel, false, 0, 0);
+
+			_channels[oldestInUseChannel].inUse       = true;
+			_channels[oldestInUseChannel].inUseTimer  = 0; // safety, original driver also did this
+			_channels[oldestInUseChannel].currentNote = note;
+			voiceOnOff(oldestInUseChannel, true, note, velocity);
+			return;
+		}
 		warning("MIDI channel not mapped/all FM voice channels busy %d", MIDIchannel);
+
 	} else {
 		// Percussion channel
 		warning("percussion!");
@@ -466,7 +503,6 @@ void MidiDriver_AdLib::noteOn(byte MIDIchannel, byte note, byte velocity) {
 				}
 			}
 		}
-		// TODO: driver does some extra things in case no channel is found
 		warning("percussion MIDI channel not mapped/all FM voice channels busy");
 	}
 }
@@ -476,6 +512,7 @@ void MidiDriver_AdLib::noteOff(byte MIDIchannel, byte note) {
 		if (_voiceChannelMapping[FMvoiceChannel] == MIDIchannel) {
 			if (_channels[FMvoiceChannel].currentNote == note) {
 				_channels[FMvoiceChannel].inUse = false;
+				_channels[FMvoiceChannel].inUseTimer  = 0;
 				_channels[FMvoiceChannel].currentNote = 0;
 
 				if (MIDIchannel != 9) {
-- 
cgit v1.2.3


From ec56344ed706f81df3701b0b18f7194c319fde6c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 18:44:48 -0400
Subject: SHERLOCK: Free memory leaks from unreleased sound resources

---
 engines/sherlock/music.cpp | 1 +
 engines/sherlock/sound.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index c793b4a2ae..a97e55d66b 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -313,6 +313,7 @@ bool Music::playMusic(const Common::String &name) {
 	assert(data);
 
 	stream->read(data, dataSize);
+	delete stream;
 
 	// for dumping the music tracks
 #if 0
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index e7f4fe8a9a..390576e98e 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -135,6 +135,7 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
 	byte *data = (byte *)malloc(size);
 	byte *ptr = data;
 	stream->read(ptr, size);
+	delete stream;
 
 	assert(size > 2);
 
-- 
cgit v1.2.3


From 6ce9be24046b1cfd886d020758f083155a930155 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 31 May 2015 00:58:49 +0200
Subject: SHERLOCK: adlib: in-use timer, thx LordHoto

---
 engines/sherlock/scalpel/drivers/adlib.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index c1dbddbc04..8dee5019f4 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -269,8 +269,10 @@ private:
 	// stores information about all FM voice channels
 	adlib_ChannelEntry _channels[SHERLOCK_ADLIB_VOICES_COUNT];
 
-	void updateChannelInUseTimers();
+protected:
+	void onTimer();
 
+private:
 	void resetAdLib();
 	void resetAdLib_OperatorRegisters(byte baseRegister, byte value);
 	void resetAdLib_FMVoiceChannelRegisters(byte baseRegister, byte value);
@@ -337,10 +339,10 @@ void MidiDriver_AdLib::setVolume(byte volume) {
 	//renewNotes(-1, true);
 }
 
-// this should normally get called per tick
-// but calling it per send() shouldn't be a problem
-// TODO: maybe change inUseTimer to a 32-bit integer to make sure there are no overruns?!?!
-void MidiDriver_AdLib::updateChannelInUseTimers() {
+// this should/must get called per tick
+// original driver did this before MIDI data processing on each tick
+// we do it atm after MIDI data processing
+void MidiDriver_AdLib::onTimer() {
 	for (byte FMvoiceChannel = 0; FMvoiceChannel < SHERLOCK_ADLIB_VOICES_COUNT; FMvoiceChannel++) {
 		if (_channels[FMvoiceChannel].inUse) {
 			_channels[FMvoiceChannel].inUseTimer++;
@@ -411,8 +413,6 @@ void MidiDriver_AdLib::send(uint32 b) {
 	byte op1 = (b >> 8) & 0xff;
 	byte op2 = (b >> 16) & 0xff;
 
-	updateChannelInUseTimers();
-
 	switch (command) {
 	case 0x80:
 		noteOff(channel, op1);
-- 
cgit v1.2.3


From 4942571e63589919dada0de3d225e78e60e6dcb6 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 31 May 2015 01:04:24 +0200
Subject: SHERLOCK: adlib: fix "in-use" usage voiceOnOff()

---
 engines/sherlock/scalpel/drivers/adlib.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index 8dee5019f4..29ca1ba2bc 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -479,7 +479,9 @@ void MidiDriver_AdLib::noteOn(byte MIDIchannel, byte note, byte velocity) {
 		if (oldestInUseChannel >= 0) {
 			// channel found
 			warning("used In-Use channel");
-			voiceOnOff(oldestInUseChannel, false, 0, 0);
+			// original driver used note 0, we use the current note
+			// because using note 0 could create a bad note (out of index) and we check that. Original driver didn't.
+			voiceOnOff(oldestInUseChannel, false, _channels[oldestInUseChannel].currentNote, 0);
 
 			_channels[oldestInUseChannel].inUse       = true;
 			_channels[oldestInUseChannel].inUseTimer  = 0; // safety, original driver also did this
@@ -542,7 +544,8 @@ void MidiDriver_AdLib::voiceOnOff(byte FMvoiceChannel, bool keyOn, byte note, by
 		frequencyOffset = note;
 	}
 	if (frequencyOffset >= SHERLOCK_ADLIB_NOTES_COUNT) {
-		error("bad note!");
+		warning("CRITICAL - bad note!!!");
+		return;
 	}
 	frequency = adlib_FrequencyLookUpTable[frequencyOffset];
 
-- 
cgit v1.2.3


From 6796444f0861d0a689a0076cb9d7b43ed976ca74 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 20:14:38 -0400
Subject: SHERLOCK: Fix restoring info line when talk window closes

---
 engines/sherlock/scalpel/scalpel_user_interface.cpp | 2 ++
 engines/sherlock/talk.cpp                           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 69ab6ecb6b..295cddb3c9 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1549,6 +1549,8 @@ void ScalpelUserInterface::doTalkControl() {
 				|| _key == 'E') && _endKeyActive) {
 			talk.freeTalkVars();
 			talk.pullSequence();
+
+			drawInterface(2);
 			banishWindow();
 			_windowBounds.top = CONTROLS_Y1;
 		} else if (((Common::Rect(140, CONTROLS_Y, 179, CONTROLS_Y + 10).contains(mousePos) && events._released)
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index dd6e776082..96e4d0d41c 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -556,6 +556,7 @@ void Talk::talkTo(const Common::String &filename) {
 				freeTalkVars();
 
 				if (!ui._lookScriptFlag) {
+					ui.drawInterface(2);
 					ui.banishWindow();
 					ui._windowBounds.top = CONTROLS_Y1;
 					ui._menuMode = STD_MODE;
-- 
cgit v1.2.3


From 59d81c0aa1595fed6de169d89f44fbab8fcf068c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 30 May 2015 22:33:40 -0400
Subject: SHERLOCK: Added lightweight TsAGE object for handling logo animations

---
 engines/sherlock/scalpel/tsage/logo.cpp | 261 ++++++++++++++++++++++++++++++--
 engines/sherlock/scalpel/tsage/logo.h   |  98 +++++++++++-
 2 files changed, 349 insertions(+), 10 deletions(-)

diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index fb8566229e..bf1c0f522a 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -28,6 +28,216 @@ namespace Sherlock {
 namespace Scalpel {
 namespace TsAGE {
 
+TLib *Visage::_tLib;
+
+Visage::Visage() {
+	_resNum = -1;
+	_rlbNum = -1;
+	_stream = nullptr;
+}
+
+void Visage::setVisage(int resNum, int rlbNum) {
+	if ((_resNum != resNum) || (_rlbNum != rlbNum)) {
+		_resNum = resNum;
+		_rlbNum = rlbNum;
+		delete _stream;
+
+		// Games after Ringworld have an extra indirection via the visage index file
+		Common::SeekableReadStream *stream = _tLib->getResource(RES_VISAGE, resNum, 9999);
+		if (rlbNum == 0)
+			rlbNum = 1;
+
+		// Check how many slots there are
+		uint16 count = stream->readUint16LE();
+		if (rlbNum > count)
+			rlbNum = count;
+
+		// Get the flags/rlbNum to use
+		stream->seek((rlbNum - 1) * 4 + 2);
+		uint32 v = stream->readUint32LE();
+		int flags = v >> 30;
+
+		if (flags & 3) {
+			rlbNum = (int)(v & 0xff);
+		}
+		assert((flags & 3) == 0);
+		delete stream;
+
+		_stream = _tLib->getResource(RES_VISAGE, resNum, rlbNum);
+	}
+}
+
+Visage::~Visage() {
+	delete _stream;
+}
+
+void Visage::getFrame(ObjectSurface &s, int frameNum) {
+	_stream->seek(0);
+	int numFrames = _stream->readUint16LE();
+	if (frameNum > numFrames)
+		frameNum = numFrames;
+	if (frameNum > 0)
+		--frameNum;
+
+	_stream->seek(frameNum * 4 + 2);
+	int offset = _stream->readUint32LE();
+	_stream->seek(offset);
+
+	surfaceFromRes(s);
+}
+
+int Visage::getFrameCount() const {
+	_stream->seek(0);
+	return _stream->readUint16LE();
+}
+
+bool Visage::isLoaded() const {
+	return _stream != nullptr;
+}
+
+void Visage::surfaceFromRes(ObjectSurface &s) {
+	int frameWidth = _stream->readUint16LE();
+	int frameHeight = _stream->readUint16LE();
+	Common::Rect r(0, 0, frameWidth, frameHeight);
+	s.create(r.width(), r.height());
+
+	s._centroid.x = _stream->readSint16LE();
+	s._centroid.y = _stream->readSint16LE();
+
+	_stream->skip(1);
+	byte flags = _stream->readByte();
+	bool rleEncoded = (flags & 2) != 0;
+
+	byte *destP = (byte *)s.getPixels();
+
+	if (!rleEncoded) {
+		_stream->read(destP, r.width() * r.height());
+	} else {
+		Common::fill(destP, destP + (r.width() * r.height()), 0xff);
+
+		for (int yp = 0; yp < r.height(); ++yp) {
+			int width = r.width();
+			destP = (byte *)s.getBasePtr(0, yp);
+
+			while (width > 0) {
+				uint8 controlVal = _stream->readByte();
+				if ((controlVal & 0x80) == 0) {
+					// Copy specified number of bytes
+					_stream->read(destP, controlVal);
+					width -= controlVal;
+					destP += controlVal;
+				} else if ((controlVal & 0x40) == 0) {
+					// Skip a specified number of output pixels
+					destP += controlVal & 0x3f;
+					width -= controlVal & 0x3f;
+				} else {
+					// Copy a specified pixel a given number of times
+					controlVal &= 0x3f;
+					int pixel = _stream->readByte();
+
+					Common::fill(destP, destP + controlVal, pixel);
+					destP += controlVal;
+					width -= controlVal;
+				}
+			}
+			assert(width == 0);
+		}
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+ScalpelEngine *Object::_vm;
+
+Object::Object() {
+	_vm = nullptr;
+	_animMode = ANIM_MODE_NONE;
+	_frame = 0;
+	_numFrames = 0;
+	_frameChange = 0;
+}
+
+void Object::setVisage(int visage, int strip) {
+	_visage.setVisage(visage, strip);
+}
+
+void Object::setAnimMode(AnimationMode mode) {
+	_animMode = mode;
+	_finished = false;
+
+	_updateStartFrame = _vm->_events->getFrameCounter();
+	if (_numFrames)
+		_updateStartFrame += 60 / _numFrames;
+	_frameChange = 1;
+}
+
+void Object::update() {
+	Screen &screen = *_vm->_screen;
+
+	if (_visage.isLoaded()) {
+		switch (_animMode) {
+		case ANIM_MODE_5:
+			if (_frame < _visage.getFrameCount())
+				_frame = changeFrame();
+			else
+				_finished = true;
+			break;
+
+		default:
+			break;
+		}
+
+		// Erase previous frame, if any
+		if (!_oldBounds.isEmpty())
+			screen.blitFrom(screen._backBuffer1, Common::Point(_oldBounds.left, _oldBounds.top), _oldBounds);
+
+		// Get the new frame
+		ObjectSurface s;
+		_visage.getFrame(s, _frame);
+
+		// Display the frame
+		_oldBounds = Common::Rect(_position.x, _position.y, _position.x + s.w(), _position.y + s.h());
+		_oldBounds.translate(-s._centroid.x, -s._centroid.y);
+		screen.transBlitFrom(s, Common::Point(_oldBounds.left, _oldBounds.top));
+	}
+}
+
+int Object::changeFrame() {
+	int frameNum = _frame;
+	uint32 currentFrame = _vm->_events->getFrameCounter();
+
+	if (_updateStartFrame <= currentFrame) {
+		if (_numFrames > 0) {
+			int v = 60 / _numFrames;
+			_updateStartFrame = currentFrame + v;
+
+			frameNum = getNewFrame();
+		}
+	}
+
+	return frameNum;
+}
+
+int Object::getNewFrame() {
+	int frameNum = _frame + _frameChange;
+
+	if (_frameChange > 0) {
+		if (frameNum > _visage.getFrameCount()) {
+			frameNum = 1;
+		}
+	} else if (frameNum < 1) {
+		frameNum = _visage.getFrameCount();
+	}
+
+	return frameNum;
+}
+
+bool Object::isAnimEnded() const {
+	return _finished;
+}
+
+/*----------------------------------------------------------------*/
+
 bool Logo::show(ScalpelEngine *vm) {
 	Events &events = *vm->_events;
 	Logo *logo = new Logo(vm);
@@ -39,6 +249,9 @@ bool Logo::show(ScalpelEngine *vm) {
 		events.wait(2);
 		events.setButtonState();
 
+		for (int idx = 0; idx < 4; ++idx)
+			logo->_objects[idx].update();
+
 		interrupted = vm->shouldQuit() || events.kbHit() || events._pressed;
 		if (interrupted) {
 			events.clearEvents();
@@ -50,10 +263,16 @@ bool Logo::show(ScalpelEngine *vm) {
 	return !interrupted;
 }
 
-Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb"), _surface(vm->_screen->w(), vm->_screen->h()) {
-	// Initialize frame counter
+Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb") {
+	Object::_vm = vm;
+	Visage::_tLib = &_lib;
+
+	// Initialize counter
 	_counter = 0;
 	
+	// Save a copy of the original palette
+	_vm->_screen->getPalette(_originalPalette);
+
 	// Set up the palettes
 	Common::fill(&_palette1[0], &_palette1[PALETTE_SIZE], 0);
 	Common::fill(&_palette1[0], &_palette2[PALETTE_SIZE], 0);
@@ -67,18 +286,42 @@ Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb"), _surface(vm->_screen->
 	_lib.getPalette(_palette3, 14);
 }
 
+Logo::~Logo() {
+	// Restore the original palette
+	_vm->_screen->setPalette(_originalPalette);
+}
+
 bool Logo::finished() const {
-	return false;
+	return _counter >= 4;
 }
 
 void Logo::nextFrame() {
-
 	switch (_counter++) {
 	case 0:
+		// Load the background and fade it in
 		loadBackground();
 		fade(_palette1);
 		break;
 
+	case 1:
+		// First half of square, circle, and triangle arranging themselves
+		_objects[0].setVisage(16, 1);
+		_objects[0]._frame = 1;
+		_objects[0]._position = Common::Point(169, 107);
+		_objects[0]._numFrames = 7;
+		_objects[0].setAnimMode(ANIM_MODE_5);
+		break;
+
+	case 2:
+		// Keep waiting until first animation ends
+		if (!_objects[0].isAnimEnded())
+			--_counter;
+		break;
+
+	case 3:
+		// Keep waiting until second animation of shapes ordering themselves ends
+		return;
+
 	default:
 		break;
 	}
@@ -92,10 +335,10 @@ void Logo::loadBackground() {
 		Common::SeekableReadStream *stream = _lib.getResource(RES_BITMAP, 10, idx);
 
 		// Load it onto the surface
-		Common::Point pt((idx / 2) * (_surface.w() / 2), (idx % 2) * (_surface.h() / 2));
-		for (int y = 0; y < (_surface.h() / 2); ++y, ++pt.y) {
-			byte *pDest = (byte *)_surface.getBasePtr(pt.x, pt.y);
-			stream->read(pDest, _surface.w() / 2);
+		Common::Point pt((idx / 2) * (SHERLOCK_SCREEN_WIDTH / 2), (idx % 2) * (SHERLOCK_SCREEN_HEIGHT / 2));
+		for (int y = 0; y < (SHERLOCK_SCREEN_HEIGHT / 2); ++y, ++pt.y) {
+			byte *pDest = (byte *)screen._backBuffer1.getBasePtr(pt.x, pt.y);
+			stream->read(pDest, SHERLOCK_SCREEN_WIDTH / 2);
 		}
 
 		//	_backgroundBounds = Rect(0, 0, READ_LE_UINT16(data), READ_LE_UINT16(data + 2));
@@ -108,7 +351,7 @@ void Logo::loadBackground() {
 	screen.setPalette(palette);
 
 	// Copy the surface to the screen
-	screen.blitFrom(_surface);
+	screen.blitFrom(screen._backBuffer1);
 }
 
 void Logo::fade(const byte palette[PALETTE_SIZE]) {
diff --git a/engines/sherlock/scalpel/tsage/logo.h b/engines/sherlock/scalpel/tsage/logo.h
index 4adbe95ff4..0b1f0a0500 100644
--- a/engines/sherlock/scalpel/tsage/logo.h
+++ b/engines/sherlock/scalpel/tsage/logo.h
@@ -41,17 +41,113 @@ class ScalpelEngine;
 
 namespace TsAGE {
 
+enum AnimationMode { ANIM_MODE_NONE = 0, ANIM_MODE_4 = 4, ANIM_MODE_5 = 5 };
+
+class ObjectSurface : public Surface {
+public:
+	Common::Point _centroid;
+public:
+	ObjectSurface() : Surface() {}
+	virtual ~ObjectSurface() {}
+};
+
+class Visage {
+private:
+	Common::SeekableReadStream *_stream;
+
+	/**
+	 * Translates a raw image resource into a graphics surface
+	 */
+	void surfaceFromRes(ObjectSurface &s);
+public:
+	static TLib *_tLib;
+	int _resNum;
+	int _rlbNum;
+public:
+	Visage();
+	~Visage();
+
+	/**
+	 * Set the visage number
+	 */
+	void setVisage(int resNum, int rlbNum = 9999);
+
+	/**
+	 * Get a frame from the visage
+	 */
+	void getFrame(ObjectSurface &s, int frameNum);
+	
+	/**
+	 * Return the number of frames
+	 */
+	int getFrameCount() const;
+
+	/**
+	 * Returns whether the visage is loaded
+	 */
+	bool isLoaded() const;
+};
+
+class Object {
+private:
+	Visage _visage;
+	uint32 _updateStartFrame;
+	int _animMode;
+	bool _finished;
+
+	/**
+	 * Return the next frame when the object is animating
+	 */
+	int changeFrame();
+
+	/**
+	 * Gets the next frame in the sequence
+	 */
+	int getNewFrame();
+public:
+	static ScalpelEngine *_vm;
+	Common::Point _position;
+	Common::Rect _oldBounds;
+	int _frame;
+	int _numFrames;
+	int _frameChange;
+public:
+	Object();
+
+	/**
+	 * Load the data for the object
+	 */
+	void setVisage(int visage, int strip);
+
+	/**
+	 * Sets the animation mode
+	 */
+	void setAnimMode(AnimationMode mode);
+
+	/**
+	 * Returns true if an animation is ended
+	 */
+	bool isAnimEnded() const;
+
+	/**
+	 * Update the frame
+	 */
+	void update();
+};
+
 class Logo {
 private:
 	ScalpelEngine *_vm;
 	TLib _lib;
-	Surface _surface;
 	int _counter;
+	byte _originalPalette[PALETTE_SIZE];
 	byte _palette1[PALETTE_SIZE];
 	byte _palette2[PALETTE_SIZE];
 	byte _palette3[PALETTE_SIZE];
+	Object _objects[4];
 
 	Logo(ScalpelEngine *vm);
+	~Logo();
 
 	void nextFrame();
 
-- 
cgit v1.2.3


From 40f5d26c92b524e50f33be57d8fff929cc225705 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 31 May 2015 09:18:30 +0200
Subject: TSAGE: Fix typo in comment

---
 engines/tsage/core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c1c4c27e32..d4068c25c9 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1465,7 +1465,7 @@ void ScenePalette::fade(const byte *adjustData, bool fullAdjust, int percent) {
 			adjustData += 3;
 	}
 
-	// Set the altered pale4tte
+	// Set the altered palette
 	g_system->getPaletteManager()->setPalette((const byte *)&tempPalette[0], 0, 256);
 	GLOBALS._screenSurface.updateScreen();
 }
-- 
cgit v1.2.3


From 3c9a5f02d2555dec0b2e2192a6ae96a224f05d50 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 31 May 2015 09:21:23 +0200
Subject: MADS: Remove unnecessary semicolon

---
 engines/mads/palette.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 36c9e5694f..7651fe8e65 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -497,7 +497,7 @@ void Fader::fadeIn(byte palette[PALETTE_SIZE], byte destPalette[PALETTE_SIZE],
 	int baseColor, int numColors, int baseGrey, int numGreys,
 	int tickDelay, int steps) {
 	GreyEntry map[PALETTE_COUNT];
-	byte tempPal[PALETTE_SIZE];;
+	byte tempPal[PALETTE_SIZE];
 	int8 signs[PALETTE_COUNT][3];
 	byte palIndex[PALETTE_COUNT][3];
 	int intensity;
-- 
cgit v1.2.3


From 742b04cc49b499397e8b8e7e426e4d313ffcdc98 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 31 May 2015 09:21:47 +0200
Subject: VOYEUR: Remove unnecessary semicolon

---
 engines/voyeur/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 320c92283c..34ef507ad3 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -76,7 +76,7 @@ EventsManager::EventsManager(VoyeurEngine *vm) : _intPtr(_gameData),
 
 	_leftClick = _rightClick = false;
 	_mouseClicked = _newMouseClicked = false;
-	_newLeftClick = _newRightClick = false;;
+	_newLeftClick = _newRightClick = false;
 
 	_videoDead = 0;
 
-- 
cgit v1.2.3


From 35fe594133e3b68f5f77db9416d4a73f5924ba3e Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 31 May 2015 12:16:30 +0200
Subject: SHERLOCK: clean up adlib driver

---
 engines/sherlock/music.cpp                    | 24 -----------
 engines/sherlock/music.h                      |  1 -
 engines/sherlock/scalpel/drivers/adlib.cpp    | 59 ---------------------------
 engines/sherlock/scalpel/drivers/mididriver.h | 56 +------------------------
 4 files changed, 1 insertion(+), 139 deletions(-)

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index a97e55d66b..0735f41d9a 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -29,8 +29,6 @@ namespace Sherlock {
 
 #define NUM_SONGS 45
 
-#define USE_SCI_MIDI_PLAYER 1
-
 /* This tells which song to play in each room, 0 = no song played */
 static const char ROOM_SONG[62] = {
 	 0, 20, 43,  6, 11,  2,  8, 15,  6, 28,
@@ -216,34 +214,16 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 
 	_musicType = MidiDriver::getMusicType(dev);
 
-#if USE_SCI_MIDI_PLAYER
-	_pMidiDrv = NULL;
-#endif
 	_driver = NULL;
 
 	switch (_musicType) {
 	case MT_ADLIB:
-#if USE_SCI_MIDI_PLAYER
-		_pMidiDrv = MidiPlayer_AdLib_create();
-#else
 		_driver = MidiDriver_AdLib_create();
-#endif
 		break;
 	default:
 		_driver = MidiDriver::createMidi(dev);
 		break;
 	}
-#if USE_SCI_MIDI_PLAYER
-	if (_pMidiDrv) {
-		assert(_pMidiDrv);
-		int ret = _pMidiDrv->open();
-		if (ret == 0) {
-			_pMidiDrv->setTimerCallback(&_midiParser, &_midiParser.timerCallback);
-		}
-		_midiParser.setMidiDriver(_pMidiDrv);
-		_midiParser.setTimerRate(_pMidiDrv->getBaseTempo());
-	}
-#endif
 
 	if (_driver) {
 		assert(_driver);
@@ -346,10 +326,6 @@ bool Music::playMusic(const Common::String &name) {
 	if (_musicType == MT_ADLIB) {
 		if (_driver)
 			MidiDriver_AdLib_newMusicData(_driver, dataPos, dataSize);
-#if USE_SCI_MIDI_PLAYER
-		if (_pMidiDrv)
-			MidiPlayer_AdLib_newMusicData(_pMidiDrv, dataPos, dataSize);
-#endif
 	}
 
 	_midiParser.loadMusic(dataPos, dataSize);
diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h
index c3710603cc..0ebc3e94e2 100644
--- a/engines/sherlock/music.h
+++ b/engines/sherlock/music.h
@@ -50,7 +50,6 @@ private:
 	SherlockEngine *_vm;
 	Audio::Mixer *_mixer;
 	MidiParser_SH _midiParser;
-	MidiPlayer *_pMidiDrv;
 	MidiDriver *_driver;
 
 public:
diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
index 29ca1ba2bc..db1151c841 100644
--- a/engines/sherlock/scalpel/drivers/adlib.cpp
+++ b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -32,8 +32,6 @@
 
 namespace Sherlock {
 
-#define USE_SCI_MIDI_PLAYER 1
-
 #define SHERLOCK_ADLIB_VOICES_COUNT 9
 #define SHERLOCK_ADLIB_NOTES_COUNT 96
 
@@ -286,29 +284,6 @@ private:
 	void pitchBendChange(byte MIDIchannel, byte parameter1, byte parameter2);
 };
 
-#if USE_SCI_MIDI_PLAYER
-class MidiPlayer_AdLib : public MidiPlayer {
-public:
-	MidiPlayer_AdLib() : MidiPlayer() { _driver = new MidiDriver_AdLib(g_system->getMixer()); }
-	~MidiPlayer_AdLib() {
-		delete _driver;
-		_driver = 0;
-	}
-
-	int open();
-	void close();
-
-	byte getPlayId() const;
-	int getPolyphony() const { return SHERLOCK_ADLIB_VOICES_COUNT; }
-	bool hasRhythmChannel() const { return false; }
-	void setVolume(byte volume) { static_cast<MidiDriver_AdLib *>(_driver)->setVolume(volume); }
-
-	//int getLastChannel() const { return (static_cast<const MidiDriver_AdLib *>(_driver)->useRhythmChannel() ? 8 : 15); }
-
-	void newMusicData(byte *musicData, int32 musicDataSize) { static_cast<MidiDriver_AdLib *>(_driver)->newMusicData(musicData, musicDataSize); }
-};
-#endif
-
 int MidiDriver_AdLib::open() {
 	int rate = _mixer->getOutputRate();
 
@@ -650,43 +625,9 @@ void MidiDriver_AdLib::setRegister(int reg, int value) {
 }
 
 uint32 MidiDriver_AdLib::property(int prop, uint32 param) {
-#if 0
-	switch(prop) {
-	case MIDI_PROP_MASTER_VOLUME:
-		if (param != 0xffff)
-			_masterVolume = param;
-		return _masterVolume;
-	default:
-		break;
-	}
-#endif
 	return 0;
 }
 
-#if USE_SCI_MIDI_PLAYER
-int MidiPlayer_AdLib::open() {
-	return static_cast<MidiDriver_AdLib *>(_driver)->open();
-}
-
-void MidiPlayer_AdLib::close() {
-	if (_driver) {
-		_driver->close();
-	}
-}
-
-byte MidiPlayer_AdLib::getPlayId() const {
-	return 0x00;
-}
-
-MidiPlayer *MidiPlayer_AdLib_create() {
-	return new MidiPlayer_AdLib();
-}
-
-void MidiPlayer_AdLib_newMusicData(MidiPlayer *driver, byte *musicData, int32 musicDataSize) {
-	static_cast<MidiPlayer_AdLib *>(driver)->newMusicData(musicData, musicDataSize);
-}
-#endif
-
 MidiDriver *MidiDriver_AdLib_create() {
 	return new MidiDriver_AdLib(g_system->getMixer());
 }
diff --git a/engines/sherlock/scalpel/drivers/mididriver.h b/engines/sherlock/scalpel/drivers/mididriver.h
index f1366f8ebc..64213315e8 100644
--- a/engines/sherlock/scalpel/drivers/mididriver.h
+++ b/engines/sherlock/scalpel/drivers/mididriver.h
@@ -24,65 +24,11 @@
 #define SHERLOCK_SOFTSEQ_MIDIDRIVER_H
 
 #include "sherlock/sherlock.h"
-//#include "audio/mididrv.h"
+#include "audio/mididrv.h"
 #include "common/error.h"
 
 namespace Sherlock {
 
-#define USE_SCI_MIDIPLAYER 1
-
-#if USE_SCI_MIDIPLAYER
-enum {
-	MIDI_CHANNELS = 16,
-	MIDI_PROP_MASTER_VOLUME = 0
-};
-
-#define MIDI_RHYTHM_CHANNEL 9
-
-class MidiPlayer : public MidiDriver_BASE {
-protected:
-	MidiDriver *_driver;
-	int8 _reverb;
-
-public:
-	MidiPlayer() : _driver(0), _reverb(-1) { }
-
-	virtual int open() { return _driver->open(); }
-	virtual void close() { _driver->close(); }
-	virtual void send(uint32 b) { _driver->send(b); }
-	virtual uint32 getBaseTempo() { return _driver->getBaseTempo(); }
-	virtual bool hasRhythmChannel() const = 0;
-	virtual void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) { _driver->setTimerCallback(timer_param, timer_proc); }
-
-	virtual byte getPlayId() const = 0;
-	virtual int getPolyphony() const = 0;
-	virtual int getFirstChannel() const { return 0; }
-	//virtual int getLastChannel() const { return 15; }
-
-	virtual void setVolume(byte volume) {
-		if(_driver)
-			_driver->property(MIDI_PROP_MASTER_VOLUME, volume);
-	}
-
-	virtual int getVolume() {
-		return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0;
-	}
-
-	// Returns the current reverb, or -1 when no reverb is active
-	int8 getReverb() const { return _reverb; }
-	// Sets the current reverb, used mainly in MT-32
-	virtual void setReverb(int8 reverb) { _reverb = reverb; }
-
-	// Special stuff for Sherlock Holmes
-//	virtual void newMusicData(byte *musicData, int32 musicDataSize);
-
-//protected:
-};
-
-extern MidiPlayer *MidiPlayer_AdLib_create();
-extern void MidiPlayer_AdLib_newMusicData(MidiPlayer *driver, byte *musicData, int32 musicDataSize);
-#endif
-
 extern MidiDriver *MidiDriver_AdLib_create();
 extern void MidiDriver_AdLib_newMusicData(MidiDriver *driver, byte *musicData, int32 musicDataSize);
 
-- 
cgit v1.2.3


From 2826a06bc56386f845fd6551ba422f1baf5e3ecd Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 31 May 2015 16:05:31 +0200
Subject: SHERLOCK: Fix regression in conversations

This causes replies to once again be shown in their entirety,
instead of one line at a time.

There were two errors: First of all, _wait was always set to 1,
because one of the conditions was "|| _opcodes[OP_IF_STATEMENT]"
instead of "|| v == _opcodes[OP_IF_STATEMENT]".

Secondly, judging by the older version, this part of the code
should only be allowed to set _wait to 1, never to 0, because we
may have already set it to 1 for other reasons.
---
 engines/sherlock/talk.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 96e4d0d41c..59897e2c2a 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1270,9 +1270,12 @@ void Talk::doScript(const Common::String &script) {
 			}
 
 			byte v = (str >= _scriptEnd ? 0 : str[0]);
-			_wait = v == _opcodes[OP_SWITCH_SPEAKER] || v == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION] ||
-				v == _opcodes[OP_BANISH_WINDOW] || _opcodes[OP_IF_STATEMENT] || v == _opcodes[OP_ELSE_STATEMENT] ||
-				v == _opcodes[OP_END_IF_STATEMENT] || v == _opcodes[OP_GOTO_SCENE] || v == _opcodes[OP_CALL_TALK_FILE];
+			if (v == _opcodes[OP_SWITCH_SPEAKER] || v == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION] ||
+					v == _opcodes[OP_BANISH_WINDOW] || v == _opcodes[OP_IF_STATEMENT] ||
+					v == _opcodes[OP_ELSE_STATEMENT] || v == _opcodes[OP_END_IF_STATEMENT] ||
+					v == _opcodes[OP_GOTO_SCENE] || v == _opcodes[OP_CALL_TALK_FILE]) {
+				_wait = 1;
+			}
 		}
 
 		// Open window if it wasn't already open, and text has already been printed
-- 
cgit v1.2.3


From 656906da4276bdb0783f58be6e84164b2bf0ecbb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 31 May 2015 10:29:13 -0400
Subject: SHERLOCK: More of the Scalpel logo implemented

---
 engines/sherlock/scalpel/tsage/logo.cpp | 222 ++++++++++++++++++++++++++++----
 engines/sherlock/scalpel/tsage/logo.h   |  36 +++++-
 2 files changed, 230 insertions(+), 28 deletions(-)

diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index bf1c0f522a..0fa8bf808a 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -67,6 +67,11 @@ void Visage::setVisage(int resNum, int rlbNum) {
 	}
 }
 
+void Visage::clear() {
+	delete _stream;
+	_stream = nullptr;
+}
+
 Visage::~Visage() {
 	delete _stream;
 }
@@ -151,7 +156,7 @@ ScalpelEngine *Object::_vm;
 
 Object::Object() {
 	_vm = nullptr;
-	_animMode = ANIM_MODE_NONE;
+	_isAnimating = false;
 	_frame = 0;
 	_numFrames = 0;
 	_frameChange = 0;
@@ -161,8 +166,8 @@ void Object::setVisage(int visage, int strip) {
 	_visage.setVisage(visage, strip);
 }
 
-void Object::setAnimMode(AnimationMode mode) {
-	_animMode = mode;
+void Object::setAnimMode(bool isAnimating) {
+	_isAnimating = isAnimating;
 	_finished = false;
 
 	_updateStartFrame = _vm->_events->getFrameCounter();
@@ -171,26 +176,24 @@ void Object::setAnimMode(AnimationMode mode) {
 	_frameChange = 1;
 }
 
+void Object::erase() {
+	Screen &screen = *_vm->_screen;
+	
+	if (_visage.isLoaded() && !_oldBounds.isEmpty())
+		screen.blitFrom(screen._backBuffer1, Common::Point(_oldBounds.left, _oldBounds.top), _oldBounds);
+}
+
 void Object::update() {
 	Screen &screen = *_vm->_screen;
 
 	if (_visage.isLoaded()) {
-		switch (_animMode) {
-		case ANIM_MODE_5:
+		if (_isAnimating) {
 			if (_frame < _visage.getFrameCount())
 				_frame = changeFrame();
 			else
 				_finished = true;
-			break;
-
-		default:
-			break;
 		}
 
-		// Erase previous frame, if any
-		if (!_oldBounds.isEmpty())
-			screen.blitFrom(screen._backBuffer1, Common::Point(_oldBounds.left, _oldBounds.top), _oldBounds);
-
 		// Get the new frame
 		ObjectSurface s;
 		_visage.getFrame(s, _frame);
@@ -236,6 +239,10 @@ bool Object::isAnimEnded() const {
 	return _finished;
 }
 
+bool Object::isMoving() const {
+	return (_destination.x != 0) && (_destination != _position);
+}
+
 /*----------------------------------------------------------------*/
 
 bool Logo::show(ScalpelEngine *vm) {
@@ -249,11 +256,15 @@ bool Logo::show(ScalpelEngine *vm) {
 		events.wait(2);
 		events.setButtonState();
 
+		// Erase areas from previous frame, and update and re-draw objects
+		for (int idx = 0; idx < 4; ++idx)
+			logo->_objects[idx].erase();
 		for (int idx = 0; idx < 4; ++idx)
 			logo->_objects[idx].update();
 
 		interrupted = vm->shouldQuit() || events.kbHit() || events._pressed;
 		if (interrupted) {
+			// Keyboard or mouse button pressed, so break out of logo display
 			events.clearEvents();
 			break;
 		}
@@ -292,10 +303,12 @@ Logo::~Logo() {
 }
 
 bool Logo::finished() const {
-	return _counter >= 4;
+	return _counter >= 442;
 }
 
 void Logo::nextFrame() {
+	Screen &screen = *_vm->_screen;
+
 	switch (_counter++) {
 	case 0:
 		// Load the background and fade it in
@@ -309,18 +322,179 @@ void Logo::nextFrame() {
 		_objects[0]._frame = 1;
 		_objects[0]._position = Common::Point(169, 107);
 		_objects[0]._numFrames = 7;
-		_objects[0].setAnimMode(ANIM_MODE_5);
+		_objects[0].setAnimMode(true);
 		break;
 
 	case 2:
 		// Keep waiting until first animation ends
-		if (!_objects[0].isAnimEnded())
+		if (!_objects[0].isAnimEnded()) {
 			--_counter;
+		} else {
+			// Start second half of the shapes animation
+			_objects[0].setVisage(16, 2);
+			_objects[0]._frame = 1;
+			_objects[0]._numFrames = 11;
+			_objects[0].setAnimMode(true);
+		}
 		break;
 
 	case 3:
 		// Keep waiting until second animation of shapes ordering themselves ends
-		return;
+		if (!_objects[0].isAnimEnded()) {
+			--_counter;
+		} else {
+			// Fade out the background but keep the shapes visible
+			fade(_palette2);
+			screen._backBuffer1.clear();
+			screen.clear();
+		}
+		break;
+
+	case 13: {
+		// Load the new palette
+		byte palette[PALETTE_SIZE];
+		_lib.getPalette(palette, 12);
+		screen.setPalette(palette);
+		break;
+	}
+
+	case 14:
+		_objects[0].setVisage(12, 1);
+		_objects[0]._frame = 1;
+		_objects[0]._numFrames = 7;
+		_objects[0]._position = Common::Point(170, 142);
+		_objects[0].setDestination(Common::Point(158, 71));
+		break;
+
+	case 15:
+		// Wait until the logo has expanded upwards to form EA logo
+		if (_objects[0].isMoving())
+			--_counter;
+		break;
+
+	case 16:
+		fade(_palette3, 40);
+		break;
+
+	case 20:
+		// Show the 'Electronic Arts' company name
+		_objects[1].setVisage(14, 1);
+		_objects[1]._frame = 1;
+		_objects[1]._position = Common::Point(152, 98);
+		break;
+
+	case 140:
+		// Start sequence of positioning and size hand cursor in an arc
+		_objects[2].setVisage(18, 1);
+		_objects[2]._frame = 1;
+		_objects[2]._position = Common::Point(33, 91);
+		break;
+
+	case 145:
+		_objects[2]._frame = 2;
+		_objects[2]._position = Common::Point(44, 124);
+		break;
+
+	case 150:
+		_objects[2]._frame = 3;
+		_objects[2]._position = Common::Point(64, 153);
+		break;
+
+	case 155:
+		_objects[2]._frame = 4;
+		_objects[2]._position = Common::Point(87, 174);
+		break;
+
+	case 160:
+		_objects[2]._frame = 5;
+		_objects[2]._position = Common::Point(114, 191);
+		break;
+
+	case 165:
+		_objects[2]._frame = 6;
+		_objects[2]._position = Common::Point(125, 184);
+		break;
+
+	case 170:
+		_objects[2]._frame = 7;
+		_objects[2]._position = Common::Point(154, 187);
+		break;
+
+	case 175:
+		_objects[2]._frame = 8;
+		_objects[2]._position = Common::Point(181, 182);
+		break;
+
+	case 180:
+		_objects[2]._frame = 9;
+		_objects[2]._position = Common::Point(191, 167);
+		break;
+
+	case 185:
+		_objects[2]._frame = 10;
+		_objects[2]._position = Common::Point(190, 150);
+		break;
+
+	case 190:
+		_objects[2]._frame = 11;
+		_objects[2]._position = Common::Point(182, 139);
+		break;
+
+	case 195:
+		_objects[2]._frame = 11;
+		_objects[2]._position = Common::Point(170, 130);
+		break;
+
+	case 200:
+		_objects[2]._frame = 11;
+		_objects[2]._position = Common::Point(158, 121);
+		break;
+
+	case 205:
+		// Show a highlighting of the company name
+		_objects[2].remove();
+		_objects[3].setVisage(19, 1);
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 213:
+		_objects[3]._frame = 2;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 221:
+		_objects[1].remove();
+		break;
+
+	case 222:
+		_objects[3]._frame = 3;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 230:
+		_objects[3]._frame = 4;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 238:
+		_objects[3]._frame = 5;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 246:
+		_objects[3]._frame = 6;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 254:
+		_objects[3]._frame = 7;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
+
+	case 262:
+		_objects[3]._frame = 8;
+		_objects[3]._position = Common::Point(155, 94);
+		break;
 
 	default:
 		break;
@@ -354,18 +528,22 @@ void Logo::loadBackground() {
 	screen.blitFrom(screen._backBuffer1);
 }
 
-void Logo::fade(const byte palette[PALETTE_SIZE]) {
+void Logo::fade(const byte palette[PALETTE_SIZE], int step) {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
+	byte startPalette[PALETTE_SIZE];
 	byte tempPalette[PALETTE_SIZE];
 
-	for (int percent = 0; percent < 100; percent += 6) {
+	screen.getPalette(startPalette);
+
+	for (int percent = 0; percent < 100; percent += step) {
 		for (int palIndex = 0; palIndex < 256; ++palIndex) {
-			const byte *palP = (const byte *)&palette[palIndex * 3];
+			const byte *pal1P = (const byte *)&startPalette[palIndex * 3];
+			const byte *pal2P = (const byte *)&palette[palIndex * 3];
 			byte *destP = &tempPalette[palIndex * 3];
 
-			for (int rgbIndex = 0; rgbIndex < 3; ++rgbIndex, ++palP, ++destP) {
-				*destP = (int)*palP * percent / 100;
+			for (int rgbIndex = 0; rgbIndex < 3; ++rgbIndex, ++pal1P, ++pal2P, ++destP) {
+				*destP = (int)*pal1P + ((int)*pal2P - (int)*pal1P) * percent / 100;
 			}
 		}
 
diff --git a/engines/sherlock/scalpel/tsage/logo.h b/engines/sherlock/scalpel/tsage/logo.h
index 0b1f0a0500..0dcd35e281 100644
--- a/engines/sherlock/scalpel/tsage/logo.h
+++ b/engines/sherlock/scalpel/tsage/logo.h
@@ -41,8 +41,6 @@ class ScalpelEngine;
 
 namespace TsAGE {
 
-enum AnimationMode { ANIM_MODE_NONE = 0, ANIM_MODE_4 = 4, ANIM_MODE_5 = 5 };
-
 class ObjectSurface : public Surface {
 public:
 	Common::Point _centroid;
@@ -72,6 +70,11 @@ public:
 	 */
 	void setVisage(int resNum, int rlbNum = 9999);
 
+	/**
+	 * Clear the visage
+	 */
+	void clear();
+
 	/**
 	 * Get a frame from the visage
 	 */
@@ -92,7 +95,7 @@ class Object {
 private:
 	Visage _visage;
 	uint32 _updateStartFrame;
-	int _animMode;
+	bool _isAnimating;
 	bool _finished;
 
 	/**
@@ -107,6 +110,7 @@ private:
 public:
 	static ScalpelEngine *_vm;
 	Common::Point _position;
+	Common::Point _destination;
 	Common::Rect _oldBounds;
 	int _frame;
 	int _numFrames;
@@ -120,19 +124,39 @@ public:
 	void setVisage(int visage, int strip);
 
 	/**
-	 * Sets the animation mode
+	 * Sets whether the object is animating
 	 */
-	void setAnimMode(AnimationMode mode);
+	void setAnimMode(bool isAnimating);
+
+	/**
+	 * Starts an object moving to a given destination
+	 */
+	void setDestination(const Common::Point &pt) { _destination = pt; }
 
 	/**
 	 * Returns true if an animation is ended
 	 */
 	bool isAnimEnded() const;
 
+	/**
+	 * Return true if object is moving
+	 */
+	bool isMoving() const;
+
+	/**
+	 * Erase the area the object was previously drawn at, by restoring the background
+	 */
+	void erase();
+
 	/**
 	 * Update the frame
 	 */
 	void update();
+
+	/**
+	 * Remove an object from being displayed
+	 */
+	void remove() { _visage.clear(); }
 };
 
 class Logo {
@@ -161,7 +185,7 @@ private:
 	/**
 	 * Fade from the current palette to a new one
 	 */
-	void fade(const byte palette[PALETTE_SIZE]);
+	void fade(const byte palette[PALETTE_SIZE], int step = 6);
 public:
 	static bool show(ScalpelEngine *vm);
 };
-- 
cgit v1.2.3


From 53f6e1903b9f4247b231955b16dc49cb7d40d3e9 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 31 May 2015 11:49:06 -0400
Subject: SHERLOCK: Implement TsAGE object mover code for Scalpel logo display

---
 engines/sherlock/scalpel/tsage/logo.cpp | 134 ++++++++++++++++++++++++++++++++
 engines/sherlock/scalpel/tsage/logo.h   |  28 ++++++-
 2 files changed, 161 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index 0fa8bf808a..3fc9973499 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -160,6 +160,7 @@ Object::Object() {
 	_frame = 0;
 	_numFrames = 0;
 	_frameChange = 0;
+	_angle = _changeCtr = 0;
 }
 
 void Object::setVisage(int visage, int strip) {
@@ -176,6 +177,39 @@ void Object::setAnimMode(bool isAnimating) {
 	_frameChange = 1;
 }
 
+void Object::setDestination(const Common::Point &pt) {
+	_destination = pt; 
+
+	int moveRate = 10;
+	_walkStartFrame = _vm->_events->getFrameCounter();
+	_walkStartFrame += 60 / moveRate;
+
+	calculateMoveAngle();
+
+	// Get the difference
+	int diffX = _destination.x - _position.x;
+	int diffY = _destination.y - _position.y;
+	int xSign = (diffX < 0) ? -1 : (diffX > 0 ? 1 : 0);
+	int ySign = (diffY < 0) ? -1 : (diffY > 0 ? 1 : 0);
+	diffX = ABS(diffX);
+	diffY = ABS(diffY);
+
+	if (diffX < diffY) {
+		_minorDiff = diffX / 2;
+		_majorDiff = diffY;
+	} else {
+		_minorDiff = diffY / 2;
+		_majorDiff = diffX;
+	}
+
+	// Set the destination position
+	_moveDelta = Common::Point(diffX, diffY);
+	_moveSign = Common::Point(xSign, ySign);
+	_changeCtr = 0;
+
+	assert(diffX || diffY);
+}
+
 void Object::erase() {
 	Screen &screen = *_vm->_screen;
 	
@@ -187,6 +221,9 @@ void Object::update() {
 	Screen &screen = *_vm->_screen;
 
 	if (_visage.isLoaded()) {
+		if (isMoving())
+			move();
+		
 		if (_isAnimating) {
 			if (_frame < _visage.getFrameCount())
 				_frame = changeFrame();
@@ -235,6 +272,27 @@ int Object::getNewFrame() {
 	return frameNum;
 }
 
+void Object::calculateMoveAngle() {
+	int xDiff = _destination.x - _position.x, yDiff = _position.y - _destination.y;
+
+	if (!xDiff && !yDiff)
+		_angle = 0;
+	else if (!xDiff)
+		_angle = (_destination.y >= _position.y) ? 180 : 0;
+	else if (!yDiff)
+		_angle = (_destination.x >= _position.x) ? 90 : 270;
+	else {
+		int result = (((xDiff * 100) / ((abs(xDiff) + abs(yDiff))) * 90) / 100);
+
+		if (yDiff < 0)
+			result = 180 - result;
+		else if (xDiff < 0)
+			result += 360;
+
+		_angle = result;
+	}
+}
+
 bool Object::isAnimEnded() const {
 	return _finished;
 }
@@ -243,6 +301,82 @@ bool Object::isMoving() const {
 	return (_destination.x != 0) && (_destination != _position);
 }
 
+void Object::move() {
+	Common::Point currPos = _position;
+	Common::Point moveDiff(5, 3);
+	int yDiff = 0;
+	int percent = 100;
+
+	if (dontMove())
+		return;
+
+	if (_moveDelta.x >= _moveDelta.y) {
+		int xAmount = _moveSign.x * moveDiff.x * percent / 100;
+		if (!xAmount)
+			xAmount = _moveSign.x;
+		currPos.x += xAmount;
+
+		int yAmount = ABS(_destination.y - currPos.y);
+		int yChange = _majorDiff / ABS(xAmount);
+		int ySign;
+
+		if (!yChange)
+			ySign = _moveSign.y;
+		else {
+			int v = yAmount / yChange;
+			_changeCtr += yAmount % yChange;
+			if (_changeCtr >= yChange) {
+				++v;
+				_changeCtr -= yChange;
+			}
+
+			ySign = _moveSign.y * v;
+		}
+
+		currPos.y += ySign;
+		_majorDiff -= ABS(xAmount);
+
+	}
+	else {
+		int yAmount = _moveSign.y * moveDiff.y * percent / 100;
+		if (!yAmount)
+			yAmount = _moveSign.y;
+		currPos.y += yAmount;
+
+		int xAmount = ABS(_destination.x - currPos.x);
+		int xChange = _majorDiff / ABS(yAmount);
+		int xSign;
+
+		if (!xChange)
+			xSign = _moveSign.x;
+		else {
+			int v = xAmount / xChange;
+			_changeCtr += xAmount % xChange;
+			if (_changeCtr >= xChange) {
+				++v;
+				_changeCtr -= xChange;
+			}
+
+			xSign = _moveSign.x * v;
+		}
+
+		currPos.x += xSign;
+		_majorDiff -= ABS(yAmount);
+	}
+
+	_position = currPos;
+	if (dontMove())
+		_position = _destination;
+}
+
+bool Object::dontMove() const {
+	return (_majorDiff <= 0);
+}
+
+void Object::endMove() {
+	_position = _destination;
+}
+
 /*----------------------------------------------------------------*/
 
 bool Logo::show(ScalpelEngine *vm) {
diff --git a/engines/sherlock/scalpel/tsage/logo.h b/engines/sherlock/scalpel/tsage/logo.h
index 0dcd35e281..68b7353a15 100644
--- a/engines/sherlock/scalpel/tsage/logo.h
+++ b/engines/sherlock/scalpel/tsage/logo.h
@@ -97,6 +97,12 @@ private:
 	uint32 _updateStartFrame;
 	bool _isAnimating;
 	bool _finished;
+	uint32 _walkStartFrame;
+	int _angle;
+	int _changeCtr;
+	int _majorDiff, _minorDiff;
+	Common::Point _moveDelta;
+	Common::Point _moveSign;
 
 	/**
 	 * Return the next frame when the object is animating
@@ -107,6 +113,26 @@ private:
 	 * Gets the next frame in the sequence
 	 */
 	int getNewFrame();
+
+	/**
+	 * Calculate the angle between the current position and a designated destination
+	 */
+	void calculateMoveAngle();
+
+	/**
+	 * Handle any object movement
+	 */
+	void move();
+
+	/**
+	 * Returns whether not to make any movement
+	 */
+	bool dontMove() const;
+
+	/**
+	 * Ends any current movement
+	 */
+	void endMove();
 public:
 	static ScalpelEngine *_vm;
 	Common::Point _position;
@@ -131,7 +157,7 @@ public:
 	/**
 	 * Starts an object moving to a given destination
 	 */
-	void setDestination(const Common::Point &pt) { _destination = pt; }
+	void setDestination(const Common::Point &pt);
 
 	/**
 	 * Returns true if an animation is ended
-- 
cgit v1.2.3


From 141ff4d08dc24b6bb17098bd71801e2a58e6a38f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 31 May 2015 11:58:07 -0400
Subject: SHERLOCK: Fix white screen on Sclapel logo

---
 engines/sherlock/scalpel/tsage/logo.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index 3fc9973499..239543b017 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -487,6 +487,7 @@ void Logo::nextFrame() {
 	case 13: {
 		// Load the new palette
 		byte palette[PALETTE_SIZE];
+		Common::copy(&_palette2[0], &_palette2[PALETTE_SIZE], &palette[0]);
 		_lib.getPalette(palette, 12);
 		screen.setPalette(palette);
 		break;
-- 
cgit v1.2.3